Sync with portage [Fri Aug 18 09:08:14 MSK 2017].

mhiretskiy 952
root 7 years ago
parent 68a4447574
commit 4ec223f241

@ -26,7 +26,7 @@ RDEPEND="
dev-qt/qtgui:4
dev-qt/qtscript:4
dev-qt/qtsql:4
kde-frameworks/kdelibs:4
kde-frameworks/kdelibs:4[plasma(+)]
media-libs/alsa-lib
x11-libs/libX11
x11-libs/libXtst

@ -1,5 +1,3 @@
DIST augeas-1.3.0.tar.gz 1983656 SHA256 80763031af76515a8ea66013ddc3c466742a15d2e907c7c8e2e3b7410262e2af SHA512 92cc2cf83faa42e83621fe0f73fe9f7247d802f17da781e51d068056d20b1645de1f0ea0d5070c0d5729a3f6554d64a95e31111bf3e44b959386559619843e79 WHIRLPOOL 4e4c3374adca662ce90f94eb204028526ec0c3a9b0bc6644515994b88e289f3e1aa5f2b6ce7c28103a2a64e5185c8ba64d55e1a448e14f745d53aec4bf20e8b3
DIST augeas-1.5.0.tar.gz 2072169 SHA256 223bb6e6fe3e9e92277dafd5d34e623733eb969a72a382998d204feab253f73f SHA512 4683668c6562e14cd39bda69f2fa7f6db5f5a76386521a9b10c41fa2031c10ff158f682b56066d0525554c4229677c64e92f6453f75d185d367bc7481fc10695 WHIRLPOOL e4bd492320cdfcf5c8470b8e4c0fb35077b1190bb8c18b245d54f532badc4975ac564fca97ec6f8f039a77a771b16d0354ef53d02ccd5c912ab9f91ca391d282
DIST augeas-1.6.0.tar.gz 2076723 SHA256 8ba0d9bf059e7ef52118826d1285f097b399fc7a56756ce28e053da0b3ab69b5 SHA512 c07f8638b9d22ceedb2951d658eb578d5757376e0cda8d7d0e075ae0c3347ef98542fb99e18956d404588befe1c92702388cf33337f4b4ee45f830d85c04b06d WHIRLPOOL 39698ab73e2828e906b9a508643e25ed08beea1464821fb56012ed3c0b721aa8c2feacdfa6254f93eae1963d1d2ecdf2b3aeb75897722243f6b9662ecff8bf7f
DIST augeas-1.7.0.tar.gz 2156168 SHA256 b9315575d07f7ba28ca2f9f60b4987dfe77b5970c98b59dc6ca7873fc4979763 SHA512 d2a5580ffa69c0229cfae85261cf7740b268ceac35f076aef6a7e8631497e5726530adfdb85f715ebb102f28af98861b4fa29d7e3eaa37a5dafff8eaf817befb WHIRLPOOL 29a8aca382592a4492e0d5153525fe26998729f1a7a482dede5275af712dce49ee08f700549dc8f96790ec6031a0a32e5017e059cf4feea0067f1424b80021d5
DIST augeas-1.8.0.tar.gz 2164146 SHA256 515ce904138d99ff51d45ba7ed0d809bdee6c42d3bc538c8c820e010392d4cc5 SHA512 bc7b450b7ef20b7c5bac1b500c89569673a164d32e0f29b5ca100657d0100fcdbb14027d559e206b5ada2c389ac3641181a97cc0c5dcceb1ae1e9932b2decf2c WHIRLPOOL 5f5dffac092bc241bc81b853ce05dd57530aab54e83668007e67dd29ca95583d7dfaebae75f96a822d5231d6bfd16aca30dc17b5b4d7ee6c2096fb9b917a4536
DIST augeas-1.8.1.tar.gz 2165325 SHA256 65cf75b5a573fee2a5c6c6e3c95cad05f0101e70d3f9db10d53f6cc5b11bc9f9 SHA512 80be6dc75e86e2a00c56cb668824ffbe54105b64fad64a2737d980c8ee5ba347a97ddd190a1c712bd07a768ed23a8d07b0eb676033b367632036a8e7f98c976b WHIRLPOOL 71955a1a42294021f69bb9715439b248f341d06b7c2d72a72537abe3f77c8e990453a12ee99ab3ba0c979ad6fd21ef5056c6e85dc8bc01a2e9c5405389030df0

@ -1,4 +1,4 @@
# Copyright 1999-2015 Gentoo Foundation
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@ -22,6 +22,10 @@ DEPEND="${RDEPEND}
>=app-doc/NaturalDocs-1.40
test? ( dev-lang/ruby )"
PATCHES=(
"${FILESDIR}/cve-2017-7555.patch"
)
#PATCHES=(
# "${FILESDIR}"/${P}-gets.patch
# "${FILESDIR}"/${P}-test.patch

@ -1,9 +1,9 @@
# Copyright 1999-2015 Gentoo Foundation
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
EAPI=6
inherit autotools-utils
inherit autotools
DESCRIPTION="A library for changing configuration files"
HOMEPAGE="http://augeas.net/"
@ -11,7 +11,7 @@ SRC_URI="http://download.augeas.net/${P}.tar.gz"
SLOT="0"
LICENSE="LGPL-2.1"
KEYWORDS="alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
IUSE="static-libs test"
RDEPEND="
@ -22,12 +22,9 @@ DEPEND="${RDEPEND}
>=app-doc/NaturalDocs-1.40
test? ( dev-lang/ruby )"
#PATCHES=(
# "${FILESDIR}"/${P}-gets.patch
# "${FILESDIR}"/${P}-test.patch
# "${FILESDIR}"/${P}-test2.patch
# "${FILESDIR}"/${P}-libxml2-pkgconfig.patch
# )
PATCHES=(
"${FILESDIR}/cve-2017-7555.patch"
)
src_prepare() {
if [ -f /usr/share/NaturalDocs/Config/Languages.txt ] ; then
@ -36,13 +33,15 @@ src_prepare() {
if [ -f /usr/share/NaturalDocs/Config/Topics.txt ] ; then
addwrite /usr/share/NaturalDocs/Config/Topics.txt
fi
autotools-utils_src_prepare
default
}
src_configure() {
# Needs to implemented
local myeconfargs=( --without-selinux )
autotools-utils_src_configure
local myeconfargs="--without-selinux
$(use_enable !static-libs shared)
$(use_enable static-libs static)"
eautoreconf
econf ${myeconfargs}
default
}
AUTOTOOLS_IN_SOURCE_BUILD=1

@ -1,9 +1,9 @@
# Copyright 1999-2016 Gentoo Foundation
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
EAPI=6
inherit autotools-utils
inherit autotools
DESCRIPTION="A library for changing configuration files"
HOMEPAGE="http://augeas.net/"
@ -11,23 +11,19 @@ SRC_URI="http://download.augeas.net/${P}.tar.gz"
SLOT="0"
LICENSE="LGPL-2.1"
KEYWORDS="~alpha amd64 hppa ia64 ppc ~ppc64 sparc x86"
KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
IUSE="static-libs test"
RDEPEND="
dev-libs/libxml2
sys-libs/readline"
sys-libs/readline:="
DEPEND="${RDEPEND}
virtual/pkgconfig
>=app-doc/NaturalDocs-1.40
test? ( dev-lang/ruby )"
#PATCHES=(
# "${FILESDIR}"/${P}-gets.patch
# "${FILESDIR}"/${P}-test.patch
# "${FILESDIR}"/${P}-test2.patch
# "${FILESDIR}"/${P}-libxml2-pkgconfig.patch
# )
PATCHES=(
)
src_prepare() {
if [ -f /usr/share/NaturalDocs/Config/Languages.txt ] ; then
@ -36,13 +32,15 @@ src_prepare() {
if [ -f /usr/share/NaturalDocs/Config/Topics.txt ] ; then
addwrite /usr/share/NaturalDocs/Config/Topics.txt
fi
autotools-utils_src_prepare
default
}
src_configure() {
# Needs to implemented
local myeconfargs=( --without-selinux )
autotools-utils_src_configure
local myeconfargs="--without-selinux
$(use_enable !static-libs shared)
$(use_enable static-libs static)"
eautoreconf
econf ${myeconfargs}
default
}
AUTOTOOLS_IN_SOURCE_BUILD=1

@ -0,0 +1,159 @@
From 4cca923b732990bec0c699b2e69911c2221b2498 Mon Sep 17 00:00:00 2001
From: David Lutterkort <lutter@watzmann.net>
Date: Fri, 4 Aug 2017 17:13:52 -0700
Subject: [PATCH] * src/pathx.c (parse_name): correctly handle trailing
whitespace in names
When a name ended in whitespace, we incorrectly assumed it was always ok to
trim that whitespace. That is not true if that whitespace is escaped,
i.e. if the path expression is something like '/x\ '. In that case, the
name really needs to be literally 'x ', i.e., we can not trim that
whitespace.
The incorrect behavior led to turning '/x\ ' first into 'x\' and then,
because we assume that '\' is always followed by a character inside the
string, when we removed the escaping '\', we would read beyond the end of
the intermediate string result; if we were lucky, that would lead to a
crash, otherwise we'd continue with junk.
We now make sure that escaped whitespace at the end of a string does not
get stripped, avoiding all these headaches.
Fixes RHBZ https://bugzilla.redhat.com/show_bug.cgi?id=1475621
---
src/pathx.c | 27 +++++++++++++++++++------
tests/test-xpath.c | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 80 insertions(+), 6 deletions(-)
diff --git a/src/pathx.c b/src/pathx.c
index d292cb30..9a2f9c76 100644
--- a/src/pathx.c
+++ b/src/pathx.c
@@ -1710,6 +1710,16 @@ int pathx_escape_name(const char *in, char **out) {
return 0;
}
+/* Return true if POS is preceded by an odd number of backslashes, i.e., if
+ * POS is escaped. Stop the search when we get to START */
+static bool backslash_escaped(const char *pos, const char *start) {
+ bool result=false;
+ while (pos-- > start && *pos == '\\') {
+ result = !result;
+ }
+ return result;
+}
+
/*
* NameNoWS ::= [^][|/\= \t\n] | \\.
* NameWS ::= [^][|/\=] | \\.
@@ -1719,11 +1729,14 @@ static char *parse_name(struct state *state) {
const char *s = state->pos;
char *result;
+ /* Advance state->pos until it points to the first character that is
+ * not part of a name. */
while (*state->pos != '\0' && strchr(name_follow, *state->pos) == NULL) {
- /* This is a hack: since we allow spaces in names, we need to avoid
- * gobbling up stuff that is in follow(Name), e.g. 'or' so that
- * things like [name1 or name2] still work.
- */
+ /* Since we allow spaces in names, we need to avoid gobbling up
+ * stuff that is in follow(Name), e.g. 'or' so that things like
+ * [name1 or name2] still work. In other words, we'll parse 'x frob
+ * y' as one name, but for 'x or y', we consider 'x' a name in its
+ * own right. */
if (STREQLEN(state->pos, " or ", strlen(" or ")) ||
STREQLEN(state->pos, " and ", strlen(" and ")))
break;
@@ -1738,10 +1751,12 @@ static char *parse_name(struct state *state) {
state->pos += 1;
}
- /* Strip trailing white space */
+ /* Strip trailing white space. Make sure we respect escaped whitespace
+ * and don't strip it as in "x\\ " */
if (state->pos > s) {
state->pos -= 1;
- while (isspace(*state->pos) && state->pos >= s)
+ while (isspace(*state->pos) && state->pos > s
+ && !backslash_escaped(state->pos, s))
state->pos -= 1;
state->pos += 1;
}
diff --git a/tests/test-xpath.c b/tests/test-xpath.c
index 3e418e5f..82986474 100644
--- a/tests/test-xpath.c
+++ b/tests/test-xpath.c
@@ -355,6 +355,62 @@ static int test_wrong_regexp_flag(struct augeas *aug) {
return -1;
}
+static int test_trailing_ws_in_name(struct augeas *aug) {
+ int r;
+
+ printf("%-30s ... ", "trailing_ws_in_name");
+
+ /* We used to incorrectly lop escaped whitespace off the end of a
+ * name. Make sure that we really create a tree node with label 'x '
+ * with the below set, and look for it in a number of ways to ensure we
+ * are not lopping off trailing whitespace. */
+ r = aug_set(aug, "/ws\\ ", "1");
+ if (r < 0) {
+ fprintf(stderr, "failed to set '/ws ': %d\n", r);
+ goto fail;
+ }
+ /* We did not create a node with label 'ws' */
+ r = aug_get(aug, "/ws", NULL);
+ if (r != 0) {
+ fprintf(stderr, "created '/ws' instead: %d\n", r);
+ goto fail;
+ }
+
+ /* We did not create a node with label 'ws\t' (this also checks that we
+ * don't create something like 'ws\\' by dropping the last whitespace
+ * character. */
+ r = aug_get(aug, "/ws\\\t", NULL);
+ if (r != 0) {
+ fprintf(stderr, "found '/ws\\t': %d\n", r);
+ goto fail;
+ }
+
+ /* But we did create 'ws ' */
+ r = aug_get(aug, "/ws\\ ", NULL);
+ if (r != 1) {
+ fprintf(stderr, "could not find '/ws ': %d\n", r);
+ goto fail;
+ }
+
+ /* If the whitespace is preceded by an even number of '\\' chars,
+ * whitespace must be stripped */
+ r = aug_set(aug, "/nows\\\\ ", "1");
+ if (r < 0) {
+ fprintf(stderr, "set of '/nows' failed: %d\n", r);
+ goto fail;
+ }
+ r = aug_get(aug, "/nows\\\\", NULL);
+ if (r != 1) {
+ fprintf(stderr, "could not get '/nows\\'\n");
+ goto fail;
+ }
+ printf("PASS\n");
+ return 0;
+ fail:
+ printf("FAIL\n");
+ return -1;
+}
+
static int run_tests(struct test *tests, int argc, char **argv) {
char *lensdir;
struct augeas *aug = NULL;
@@ -398,6 +454,9 @@ static int run_tests(struct test *tests, int argc, char **argv) {
if (test_wrong_regexp_flag(aug) < 0)
result = EXIT_FAILURE;
+
+ if (test_trailing_ws_in_name(aug) < 0)
+ result = EXIT_FAILURE;
}
aug_close(aug);
free(lensdir);

@ -1 +1 @@
DIST lastpass-binary-component-4.1.4.tar.bz2 1623477 SHA256 adb0e91f8d212d34dbb85db0b11738fe36db1a741ad5674d7070c4019a9fc75e SHA512 6fd518fa19f7206a1007376460c61e5a5c8d868126a767b3978309f0cc7ccd069e743cb12364e6841d8d3cb29452d058122b95f42bcfd2bd4deb4b8c77dc5f75 WHIRLPOOL c50bde0ee3f82abe56803beb2bda09786f7806b5e480eb8401fe0302ee984465f2682af66243095f3ea83744d59d6d3548806c423b69a8603abed9fc3ba3d00c
DIST lastpass-binary-component-4.1.44.tar.bz2 1623477 SHA256 adb0e91f8d212d34dbb85db0b11738fe36db1a741ad5674d7070c4019a9fc75e SHA512 6fd518fa19f7206a1007376460c61e5a5c8d868126a767b3978309f0cc7ccd069e743cb12364e6841d8d3cb29452d058122b95f42bcfd2bd4deb4b8c77dc5f75 WHIRLPOOL c50bde0ee3f82abe56803beb2bda09786f7806b5e480eb8401fe0302ee984465f2682af66243095f3ea83744d59d6d3548806c423b69a8603abed9fc3ba3d00c

@ -1,2 +1,2 @@
DIST sudo-1.8.20p2.tar.gz 2930769 SHA256 bd42ae1059e935f795c69ea97b3de09fe9410a58a74b5d5e6836eb5067a445d9 SHA512 8bf67e687f7a84605fdef8d547b5cd661141b6c8fd25820c33c7e37e97ca7f21f564c3bae691f8a8cd08df7d80338e36a8f06bb5086cc104509d71d6ab1bceda WHIRLPOOL 4e9b6ddaba8cdb4d82358e01252136af56ae50f656f9802285471c7c1e5c831d26aa07cb78205f63ea6098f98846911938681a89256afe5419372039d0e4e792
DIST sudo-1.8.21b1.tar.gz 2949206 SHA256 b7d5d5d0447566d1203542eb427b9822669c82fc57c0110e4d5de38c1232a659 SHA512 baab9e93ab28fd8410f6d5df6b6904791facd0de8e442407834ba95c7e5008cce9e7bc34e0ceb6044c17ecc05cb78cf90ef3c684c86290a0988b36472a2438e2 WHIRLPOOL 145f2601660f71f2a14274fe9cf7a360e798341f76eb81701bddd44be0bd8e9d483bf43965410e89b011dc13bfb5e6fe6142aefe73a5e7baa236b606f31232e8
DIST sudo-1.8.21b3.tar.gz 2972665 SHA256 d46a5567410f3d72ef8a92e0dfc1c74bd162616ce4f1645384b98e3da0039241 SHA512 22cfbd08b1123fe61a22be7fce961fcd7e88bbeca10dccda68fef2629b87eb2a629ae007cae804e15af3191b898e9751f016661594b01ac28731da12a3aa0e8b WHIRLPOOL 9a10d12ffc5257cec0d70f93998ecbb0822b5b47038d4b347a82ff4174d44760d114397c956f4f2b392db3102f60dfeba43999a9b8a18ea28b73cf6e01ec595e

@ -1 +1,2 @@
DIST brasero-3.12.1.tar.xz 3683836 SHA256 9a5eea53e57b66de3c7c8c2393ac21a58d5afa81c6cfb16b3c7f010a3d147127 SHA512 c9a78b9bc627f4420f5cf70825aa8de6e42497e63e293a0382916c9cd1a2bb3ae0beb2b95b624b7203ab17dfd8c8bb10c18c16848079b82077663abe34674eda WHIRLPOOL d7a5cd528d2c7ab37c5adeaf894646c989a29d806f6384e3a3cbcc6044785905f80907b9dec32e8228ade8558c227fe6ecbccf4bc0871e6d7a1581300a0e0550
DIST brasero-3.12.2.tar.xz 3742120 SHA256 6822166f9d08efcf8d900cab6f563e87f49f0e078ca10595dcd908498ef12041 SHA512 14886e772123f179f79d3172b59e21ced990fd8834cd27e8717eb635a75163c44c1d5084818b53da559a0c2ef25e7c0da4a3a7d3781e2ea74b59cfe98987384f WHIRLPOOL 1cf33d7ea5c50f4faed0648f37a1a127af08831ca8b899ac1ba12cfa1f21671ede4f83a7cccb8edce79b077373ebe3bbba73f11a163887d6fd6b970eb789e002

@ -0,0 +1,77 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
GNOME2_LA_PUNT="yes"
inherit gnome2
DESCRIPTION="CD/DVD burning application for the GNOME desktop"
HOMEPAGE="https://wiki.gnome.org/Apps/Brasero"
LICENSE="GPL-2+ CC-BY-SA-3.0"
SLOT="0/3.1" # subslot is 3.suffix of libbrasero-burn3
IUSE="+css +introspection +libburn mp3 nautilus packagekit playlist test tracker"
KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
COMMON_DEPEND="
>=dev-libs/glib-2.29.14:2
>=x11-libs/gtk+-3:3[introspection?]
media-libs/gstreamer:1.0
media-libs/gst-plugins-base:1.0
>=dev-libs/libxml2-2.6:2
>=x11-libs/libnotify-0.6.1:=
media-libs/libcanberra[gtk3]
x11-libs/libICE
x11-libs/libSM
introspection? ( >=dev-libs/gobject-introspection-1.30:= )
libburn? (
>=dev-libs/libburn-0.4:=
>=dev-libs/libisofs-0.6.4:= )
nautilus? ( >=gnome-base/nautilus-2.91.90 )
playlist? ( >=dev-libs/totem-pl-parser-2.29.1:= )
tracker? ( >=app-misc/tracker-1:0= )
"
RDEPEND="${COMMON_DEPEND}
media-libs/gst-plugins-good:1.0
media-plugins/gst-plugins-meta:1.0
x11-themes/hicolor-icon-theme
css? ( media-libs/libdvdcss:1.2 )
!libburn? (
app-cdr/cdrdao
app-cdr/dvd+rw-tools
virtual/cdrtools )
mp3? (
media-libs/gst-plugins-ugly:1.0
media-plugins/gst-plugins-mad:1.0 )
packagekit? ( app-admin/packagekit-base )
"
DEPEND="${COMMON_DEPEND}
>=dev-util/intltool-0.50
dev-util/itstool
>=dev-util/gtk-doc-am-1.12
sys-devel/gettext
virtual/pkgconfig
test? ( app-text/docbook-xml-dtd:4.3 )
"
# eautoreconf deps
# app-text/yelp-tools
# gnome-base/gnome-common
PDEPEND="gnome-base/gvfs"
src_configure() {
gnome2_src_configure \
--disable-caches \
$(use_enable !libburn cdrtools) \
$(use_enable !libburn cdrkit) \
$(use_enable !libburn cdrdao) \
$(use_enable !libburn growisofs) \
$(use_enable introspection) \
$(use_enable libburn libburnia) \
$(use_enable nautilus) \
$(use_enable playlist) \
$(use_enable tracker search)
}

@ -1 +1,2 @@
DIST rhash-1.3.4-src.tar.gz 249357 SHA256 406662c4703bd4cb1caae26f32700951a5e12adf39f141d3f40e0b461b1e9e49 SHA512 a78be309011798d5e55023eb93f898c10254a42270288fa5ec68ad446b5f3d001e8c6f893683e5171e3858c86d45ce2ce16eefde1173209e1925420c27a7ff7a WHIRLPOOL 5883dcbf0c2bf51036434d1906b85b615eae65ef2729a68d7ac637e2bea3c494cd3ee7fa9a60d3c4f3241bc4fd5c62c8f7e058c0e53649d50dade241e06dda2e
DIST rhash-1.3.5-src.tar.gz 316867 SHA256 98e0688acae29e68c298ffbcdbb0f838864105f9b2bd8857980664435b1f1f2e SHA512 e8450aab0c16bfb975bf4aeee218740fb4d86d5514e426b70c3edb84e4d63865cd4051939aa95c24a87a78baaedc49e40bb509b2610e89ca3745930808b3ef6c WHIRLPOOL 80540e96b554fad8c18da431677a0bdc361f7c406b746050bd25ad0b2eeb9d318f1ef0d87ef002d8b8c6fa7db6d789391115358a1676358afd478564d193b229

@ -0,0 +1,89 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
inherit toolchain-funcs multilib-minimal
DESCRIPTION="Console utility and library for computing and verifying file hash sums"
HOMEPAGE="http://rhash.anz.ru/"
SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.gz"
LICENSE="MIT"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
IUSE="debug nls openssl static-libs"
RDEPEND="openssl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )"
DEPEND="${RDEPEND}
nls? ( sys-devel/gettext )"
S="${WORKDIR}/RHash-${PV}"
src_prepare() {
default
# Install /etc stuff inside the Prefix
sed -i -e 's:\$(DESTDIR)/etc:\$(DESTDIR)/$(SYSCONFDIR):g' Makefile || die
if [[ ${CHOST} == *-darwin* ]] ; then
local ver_script='-Wl,--version-script,exports.sym,-soname,$(SONAME)'
local install_name='-install_name $(LIBDIR)/$(SONAME)'
sed -i -e '/^\(SONAME\|SHAREDLIB\)/s/\.so\.\([0-9]\+\)/.\1.dylib/' \
-e '/^SOLINK/s/\.so/.dylib/' \
-e "s:${ver_script}:${install_name}:" \
librhash/Makefile \
Makefile || die
fi
if [[ ${CHOST} == *-solaris* ]] ; then
# https://sourceware.org/bugzilla/show_bug.cgi?id=12548
# skip the export.sym for now
sed -i -e 's/,--version-script,exports.sym//' librhash/Makefile || die
fi
multilib_copy_sources
}
multilib_src_compile() {
local ADDCFLAGS=(
$(use debug || echo -DNDEBUG)
$(use nls && echo -DUSE_GETTEXT)
$(use openssl && echo -DOPENSSL_RUNTIME -rdynamic)
)
local ADDLDFLAGS=(
$(use openssl && echo -ldl)
)
[[ ${CHOST} == *-darwin* || ${CHOST} == *-solaris* ]] \
&& ADDLDFLAGS+=( $(use nls && echo -lintl) )
emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" \
ADDCFLAGS="${ADDCFLAGS[*]}" ADDLDFLAGS="${ADDLDFLAGS[*]}" \
PREFIX="${EPREFIX}"/usr LIBDIR='$(PREFIX)'/$(get_libdir) \
build-shared $(use static-libs && echo lib-static)
}
myemake() {
emake DESTDIR="${D}" PREFIX="${EPREFIX}"/usr \
LIBDIR='$(PREFIX)'/$(get_libdir) SYSCONFDIR="${EPREFIX}"/etc "${@}"
}
multilib_src_install() {
myemake -C librhash install-lib-shared install-so-link
multilib_is_native_abi && myemake install-shared
use static-libs && myemake install-lib-static
}
multilib_src_install_all() {
myemake -C librhash install-headers
use nls && myemake install-gmo
einstalldocs
}
multilib_src_test() {
cd tests || die
LD_LIBRARY_PATH=$(pwd)/../librhash ./test_rhash.sh --full ../rhash_shared || die "tests failed"
}

@ -0,0 +1,25 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
DESCRIPTION="A compendium of hacker slang illuminating many aspects of hackish tradition"
HOMEPAGE="http://www.catb.org/~esr/jargon"
SRC_URI="http://www.catb.org/~esr/jargon/${P}.tar.gz"
LICENSE="public-domain"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
IUSE=""
src_prepare() {
find "${S}" -name .xvpics | xargs rm -rf || die
cd "${S}/html" || die
sed -i -e 's#\.\./\.\.#..#' */* \
|| die "sed failed"
default
}
src_install() {
dodoc -r html/*
}

@ -1,4 +1,4 @@
# Copyright 1999-2016 Gentoo Foundation
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@ -6,8 +6,8 @@ EAPI=6
inherit autotools eutils
DESCRIPTION="Library for emulating CAC cards"
HOMEPAGE="http://spice-space.org/"
SRC_URI="http://spice-space.org/download/${PN}/${P}.tar.bz2"
HOMEPAGE="https://www.spice-space.org/"
SRC_URI="https://www.spice-space.org/download/libcacard/${P}.tar.bz2"
LICENSE="GPL-3"
SLOT="0"

@ -4,8 +4,8 @@
EAPI="5"
DESCRIPTION="virtual Common Access Card (CAC) library emulator"
HOMEPAGE="http://spice-space.org/"
SRC_URI="http://spice-space.org/download/${PN}/${P}.tar.xz"
HOMEPAGE="https://www.spice-space.org/"
SRC_URI="https://www.spice-space.org/download/libcacard/${P}.tar.xz"
LICENSE="GPL-3"
SLOT="0"

@ -4,8 +4,8 @@
EAPI=6
DESCRIPTION="Headers defining the SPICE protocol"
HOMEPAGE="http://spice-space.org/"
SRC_URI="http://spice-space.org/download/releases/${P}.tar.bz2"
HOMEPAGE="https://www.spice-space.org/"
SRC_URI="https://www.spice-space.org/download/releases/${P}.tar.bz2"
LICENSE="BSD"
SLOT="0"

@ -4,8 +4,8 @@
EAPI=6
DESCRIPTION="Headers defining the SPICE protocol"
HOMEPAGE="http://spice-space.org/"
SRC_URI="http://spice-space.org/download/releases/${P}.tar.bz2"
HOMEPAGE="https://www.spice-space.org/"
SRC_URI="https://www.spice-space.org/download/releases/${P}.tar.bz2"
LICENSE="BSD"
SLOT="0"

@ -1,20 +1,20 @@
# Copyright 1999-2016 Gentoo Foundation
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
if [[ ${PV} = *9999* ]]; then
inherit git-r3 autotools
EGIT_REPO_URI="git://anongit.freedesktop.org/spice/spice-protocol"
EGIT_REPO_URI="https://anongit.freedesktop.org/git/spice/spice-protocol.git"
SRC_URI=""
KEYWORDS=""
else
SRC_URI="http://spice-space.org/download/releases/${P}.tar.bz2"
SRC_URI="https://www.spice-space.org/download/releases/${P}.tar.bz2"
KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
fi
DESCRIPTION="Headers defining the SPICE protocol"
HOMEPAGE="http://spice-space.org/"
HOMEPAGE="https://spice-space.org/"
LICENSE="BSD"
SLOT="0"

@ -6,8 +6,8 @@ EAPI=6
inherit linux-info
DESCRIPTION="SPICE VD Linux Guest Agent"
HOMEPAGE="http://spice-space.org/"
SRC_URI="http://spice-space.org/download/releases/${P}.tar.bz2"
HOMEPAGE="https://www.spice-space.org/"
SRC_URI="https://www.spice-space.org/download/releases/${P}.tar.bz2"
LICENSE="LGPL-2.1"
SLOT="0"

@ -7,8 +7,8 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
inherit autotools ltprune python-any-r1 readme.gentoo-r1 xdg-utils
DESCRIPTION="SPICE server"
HOMEPAGE="http://spice-space.org/"
SRC_URI="http://spice-space.org/download/releases/${P}.tar.bz2"
HOMEPAGE="https://www.spice-space.org/"
SRC_URI="https://www.spice-space.org/download/releases/${P}.tar.bz2"
LICENSE="LGPL-2.1"
SLOT="0"

@ -7,8 +7,8 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
inherit autotools ltprune python-any-r1 readme.gentoo-r1 xdg-utils
DESCRIPTION="SPICE server"
HOMEPAGE="http://spice-space.org/"
SRC_URI="http://spice-space.org/download/releases/${P}.tar.bz2"
HOMEPAGE="https://www.spice-space.org/"
SRC_URI="https://www.spice-space.org/download/releases/${P}.tar.bz2"
LICENSE="LGPL-2.1"
SLOT="0"

@ -7,9 +7,9 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
inherit autotools eutils git-r3 ltprune python-any-r1 readme.gentoo-r1 xdg-utils
DESCRIPTION="SPICE server"
HOMEPAGE="http://spice-space.org/"
HOMEPAGE="https://www.spice-space.org/"
SRC_URI=""
EGIT_REPO_URI="git://git.freedesktop.org/git/spice/spice"
EGIT_REPO_URI="https://anongit.freedesktop.org/git/spice/spice.git"
LICENSE="LGPL-2.1"
SLOT="0"

@ -131,7 +131,9 @@ src_compile() {
fi
# Create the doc output dirs if requested
use doc && mkdir -p "${T}"/doc/{api-docs,jni-docs} || die
if use doc; then
mkdir -p "${T}"/doc/{api-docs,jni-docs} || die
fi
emake all $(usex doc api-docs "")
}

@ -7,7 +7,7 @@ inherit cmake-utils
DESCRIPTION="An encoding detector library"
HOMEPAGE="https://www.freedesktop.org/wiki/Software/uchardet/"
SRC_URI="https://www.freedesktop.org/software/${PN}/releases/${P}.tar.xz"
SRC_URI="https://www.freedesktop.org/software/uchardet/releases/${P}.tar.xz"
LICENSE="|| ( MPL-1.1 GPL-2+ LGPL-2.1+ )"
SLOT="0"

@ -1,4 +1,4 @@
# Copyright 1999-2016 Gentoo Foundation
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@ -7,10 +7,7 @@ inherit cmake-utils git-r3
DESCRIPTION="An encoding detector library"
HOMEPAGE="https://www.freedesktop.org/wiki/Software/uchardet/"
EGIT_REPO_URI=(
https://anongit.freedesktop.org/git/${PN}/${PN}.git
git://anongit.freedesktop.org/${PN}/${PN}
)
EGIT_REPO_URI="https://anongit.freedesktop.org/git/uchardet/uchardet.git"
LICENSE="|| ( MPL-1.1 GPL-2+ LGPL-2.1+ )"
SLOT="0"

@ -1,3 +1,4 @@
DIST bijiben-3.20.2.tar.xz 779580 SHA256 5774dfdedb79f5ffe5bac3cebe0816dc7e6410381744dcb999815061dee6a981 SHA512 11c00602ba5d10b30c6ce2a32f6ba854e93f2b5eecb9a6eb10ecfa5c700f59b1e96359290771afe72d01bc6275ef6e29d34cbcb5b32e4bed225749e01ad7626d WHIRLPOOL 3905d6e3a52f9a82088b9a8428a86da0d232978ef26fe1652d80a3cf8dec86c2b481b695157e08cea4c8295f53ebb39af4c0783c9912fb5a053c72205addde8f
DIST bijiben-3.21.2.tar.xz 786676 SHA256 d7f05abd82da837d8d48d9f7acc6035a289d934c722fc89870d17007ba158e0d SHA512 3de700ec9474402062b831460d5178a8bad11580fa8aa9082f325df382b7ed6ae6cede209d6494b09a6292f8babc7f6fd56611e7404f19c8a5335ae697b76b70 WHIRLPOOL 566e230536a2ddcee695e3a84b47bfb9c00612f1af24f3e2ce49eb98b235628ca164fbf04dd537e098c87067d04adde7f8a36bb2944d807025a7792c418b097f
DIST bijiben-3.24.0.tar.xz 830884 SHA256 2582c083e18b51c1c5743376c2adc1f8c68a1b912d14171a9d655ffe3d31abb6 SHA512 aba794d275b05f2267b7dfdd3f3933c5197d3596e06e72b0ae3d1f9855310761e5ff1b42ec7088fe7c90f55a6ffc64f6c508d72edc389d74256a9bcec90767d1 WHIRLPOOL b52996d7f7f061aa58548d7f199566f624ce6b154d2e4441f7b5d8a84478bc4c459339e9cd18338b171405025cded66c16d38dac736ac74b198b23999319956c
DIST bijiben-3.24.1.tar.xz 837840 SHA256 2602fc3f8ce5c39813b4273ceed7bdb014b1cf1fa82a6757fc25e5078be4f741 SHA512 c1b14823d291b96b5ce4172d129f696905bc2349ef94ae98473b675358ca7672d5e0b7af66fe1b3288b5bcbc25820531e7229204fdf0b789abfb6d3572e52af1 WHIRLPOOL 8fadf2aaca38fcdd7d4df7d0155ad58929ab9b4d28a21ab18b25ae8073bf4aede30a993634c78c87ca069eeaaeb5e170117a0f25d5f0611b216217fa12c5e0c7

@ -0,0 +1,40 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
inherit gnome2
DESCRIPTION="Note editor designed to remain simple to use"
HOMEPAGE="https://wiki.gnome.org/Apps/Bijiben"
LICENSE="GPL-3+"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="zeitgeist"
# XXX: raise glib dependency when Gnome 3.26 enters tree
RDEPEND="
>=dev-libs/glib-2.28:2
>=x11-libs/gtk+-3.11.4:3
>=gnome-extra/evolution-data-server-3.13.90:=
>=net-libs/webkit-gtk-2.10.0:4
net-libs/gnome-online-accounts:=
dev-libs/libxml2
>=app-misc/tracker-1:=
sys-apps/util-linux
zeitgeist? ( gnome-extra/zeitgeist )
"
DEPEND="${RDEPEND}
app-text/yelp-tools
dev-libs/appstream-glib
dev-util/gdbus-codegen
>=dev-util/intltool-0.50.1
sys-devel/gettext
virtual/pkgconfig
"
# Needed if eautoreconf:
# sys-devel/autoconf-archive
src_configure() {
gnome2_src_configure $(use_enable zeitgeist)
}

@ -0,0 +1,30 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
DESCRIPTION="dailystrips automatically downloads your favorite online comics from the web"
HOMEPAGE="http://dailystrips.sourceforge.net/"
SRC_URI="mirror://sourceforge/dailystrips/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~ppc ~x86"
IUSE=""
RDEPEND=">=dev-perl/libwww-perl-5.50
dev-perl/DateTime
dev-perl/TimeDate"
src_prepare() {
sed -i -e "s:/usr/share/dailystrips/strips.def:/etc/strips.def:" \
dailystrips || die "sed dailystrips failed"
default
}
src_install() {
dobin dailystrips dailystrips-clean dailystrips-update
dodoc BUGS CHANGELOG CONTRIBUTORS README* TODO
insinto /etc
doins strips.def
}

@ -1 +1 @@
DIST ddcutil-0.7.1.tar.gz 429744 SHA256 e73e2332d4b8c861026fed3886630b975e85fbda5efeba2866214ef16eaef5c6 SHA512 1bae833298d3d5dbdb235c09905c7325d98e090ee5a2c61abb843680ce1c8e13e700f2b04055d68f72f8e44a930e748e0214adc969909510fc8dcd32431323b6 WHIRLPOOL dcfc663d3e3bcdfa687c069b0c2b7ec8381505cab18e3c4b98b30f6629d2b45ff2a715547087fbaa26b8ba281d1f3c87bd4f670e3b861696041c296fded835e0
DIST ddcutil-0.8.4.tar.gz 558405 SHA256 7bfa9bd1dad7aac1853cf1070d2becf47156c158b84ae874cd77e8fd7d4e44d5 SHA512 e7bf78295a008607ef520e055873acc0bac6d94b850a6ea1f7d4a4ea9e080d23b4b7d82e5725a220ff120ab1523aa320265ba22671982625c10088521c72a14c WHIRLPOOL 3637a3a03a5a4d402f1ca3dcf0ecee8cd361735cff1ffce4a2e862ad9c87fe12cd09a782c5c2b6bfd53e94547eecf29c344ce918217931593e07a4a207bf241a

@ -7,7 +7,6 @@ inherit autotools linux-info udev user
DESCRIPTION="Program for querying and changing monitor settings"
HOMEPAGE="http://www.ddcutil.com/"
SRC_URI="https://github.com/rockowitz/ddcutil/archive/v${PV}.tar.gz -> ${P}.tar.gz"
# Binary drivers need special instructions compared to the open source counterparts.
@ -16,7 +15,7 @@ SRC_URI="https://github.com/rockowitz/ddcutil/archive/v${PV}.tar.gz -> ${P}.tar.
# the different drivers.
# Remove ATI/AMD driver since it's masked for removal.
# Will most likely need to set this for AMDGPU when in portage.
IUSE="enable-api-libs usb-monitor user-permissions video_cards_nvidia"
IUSE="usb-monitor user-permissions video_cards_nvidia"
LICENSE="GPL-2"
SLOT="0"
@ -39,7 +38,7 @@ pkg_pretend() {
CONFIG_CHECK="~I2C_CHARDEV"
ERROR_I2C_CHARDEV="You must enable I2C_CHARDEV in your kernel to continue"
if use usb-monitor; then
CONFIG_CHECK+="~HIDRAW ~USB_HIDDEV"
CONFIG_CHECK+=" ~HIDRAW ~USB_HIDDEV"
ERROR_HIDRAW="HIDRAW is needed to support USB monitors"
ERROR_I2C_CHARDEV="USB_HIDDEV is needed to support USB monitors"
fi
@ -56,9 +55,9 @@ src_prepare() {
src_configure() {
# Python API is still very experimental.
local myeconfargs=(
$(use_enable enable-api-libs lib)
$(use_enable usb-monitor usb)
--disable-swig
--enable-lib
)
econf "${myeconfargs[@]}"
@ -96,9 +95,7 @@ pkg_postinst() {
fi
if use video_cards_nvidia; then
einfo "=================================================================="
einfo "Please read the following webpage on proper usage with the nVidia "
einfo "binary drivers, or it may not work: http://www.ddcutil.com/nvidia/"
einfo "=================================================================="
ewarn "Please read the following webpage on proper usage with the nVidia "
ewarn "binary drivers, or it may not work: http://www.ddcutil.com/nvidia/"
fi
}

@ -18,9 +18,6 @@
a USB connection.
</longdescription>
<use>
<flag name="enable-api-libs" restrict="&gt;=app-misc/ddcutil-0.7.0">
Enables the C/C++ API.
</flag>
<flag name="user-permissions">
Adds a udev rules to allow non-root users in the i2c group to
access the /dev/i2c-* devices. If usb-monitor is selected, users

@ -1,5 +1,2 @@
DIST fdutils-5.4-20020222.diff.gz 25310 SHA256 259c340a5956272e60385d0b8ae0a04b3d2ae0fc395114672536cba5f50bf903 SHA512 069583e796f86266e486ad65009d6a8163fc56b59f957f34ab144cc25188b868c950a48e2fd25fc876cd5b1fa3faa40bdc4c16e4690fe3a2a47f933f85e31094 WHIRLPOOL 9b679a1a0b7254a1d72de083c3ae3fa9c329234c6da6138ad08649cde8fbff002e31ba8f0d4de504c3a98404a88ab23a3dc76a60b51599ee18af786f157e2d12
DIST fdutils-5.4.tar.gz 190535 SHA256 20ebb4fa9ec74e669eb0377819fafbf177325e930906032649aa8344bb34b9e9 SHA512 3c2dde9d2e14f771f6916851827df5b2dde62e3522b6ceb411bf0772800a4d8ed4721d99ad170b81de0cc8dba41a60817232993f3d69eb07141e1929ac626570 WHIRLPOOL 20626366bc1ad4334184de97c8ef43d50a00496be80f298a59eeb1144f493750cea61a39cc43ff8d251794854ec0a635141bc39d43cba9fad36c411bd0710da2
DIST fdutils-5.5.tar.gz 222801 SHA256 87d5bbe8094558463acc5902664c58afd794322b0ea3ab3c2ed7b362c583a48a SHA512 c9eab0b8931bbd11fcacfeff54c87059844b068595725abb00c7c605cba0bdc7c9abcd31d0a0186786306a9136eac2ec3bad43842f0383acdb162ccbb39a73b8 WHIRLPOOL 622ded0b8f56257f42fdb7ab7ce648a3d813882c2b05ab30cc36c1b447b66e8c51757ce972b43ffd65d7929be7b7aed72ff3fe235c8fa47a263739ae1daace14
DIST fdutils_5.5-20060227-6.debian.tar.gz 54489 SHA256 51fae03acb4f087b09c076dc3ec4e7b31362f1e1a9fa7b2b17d6dade1cd512fb SHA512 db6759bd2b98ae65bca39cf5b09fdb250371e02daa7665d8d21f93c3ab968cfe345cecb20faedaf2600104b22e2fb4df6868860dac3ead0ffb28d2141c8d7149 WHIRLPOOL f34a8d5d98a5b89544270dad4c3198881062aef7bec99e2dbfc186bfeab2e24f5ac741b487fac8136d7bddce907527645116d26d21f5f1af9e6d4f6c581196e8
DIST fdutils_5.5-20060227.orig.tar.gz 222915 SHA256 a867b381adc3596ca9a0c9139773bef18a38ceb5fa0e7401af46813c3a4b8d58 SHA512 a25d23827b9178a9a54d0012ad20248072e07aa5798bb3661fd0412d2441239b7bbf1778b5e34acb1a09a25a76e44c1801b706a242ce3b2337c06757e0ac02dd WHIRLPOOL 4baa17276258669d950a0b3199db23521ebcd63ebe069f9ad94ec1903dd62e142314ad411c6d40a7323f5cc4869f3fab147ca3eb930f4ae0c7dcaaea3362c442

@ -1,48 +0,0 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
inherit eutils
S=${WORKDIR}/${PN}-5.4
DESCRIPTION="utilities for configuring and debugging the Linux floppy driver"
HOMEPAGE="http://fdutils.linux.lu/"
SRC_URI="http://fdutils.linux.lu/${PN}-5.4.tar.gz
http://fdutils.linux.lu/${PN}-5.4-20020222.diff.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="x86"
IUSE="doc"
DEPEND=">=sys-fs/mtools-3
doc? ( virtual/texi2dvi )"
src_unpack() {
unpack ${A}
epatch "${WORKDIR}/${PN}-5.4-20020222.diff"
# the man 4 fd manpage is better in the man-pages package, so stop it
# from installing
epatch "${FILESDIR}/${PN}-no-fd.4-manpage.diff"
}
src_compile() {
econf --enable-fdmount-floppy-only || die
if use doc
then
make || die
else
make compile || die
fi
}
src_install() {
dodir /usr/bin /usr/share/man/man1
einstall || die
insinto /etc
doins src/mediaprm
dodoc Changelog
}

@ -1,41 +0,0 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
inherit eutils flag-o-matic
DESCRIPTION="utilities for configuring and debugging the Linux floppy driver"
HOMEPAGE="http://fdutils.linux.lu/"
SRC_URI="http://fdutils.linux.lu/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~ppc ~x86"
IUSE="doc"
RDEPEND=">=sys-fs/mtools-3"
DEPEND="${RDEPEND}
doc? ( virtual/texi2dvi )"
src_unpack() {
unpack ${A}
cd "${S}"
# the man 4 fd manpage is better in the man-pages package, so stop it
# from installing
epatch "${FILESDIR}/${PN}-no-fd.4-manpage.diff"
epatch "${FILESDIR}/${P}-destdirfix.patch"
sed -i -e '/\$(INSTALL) -c/s/ -s / /' src/Makefile.in || die "Failed to sed upstream src/Makefile.in to prevent premature strip"
}
src_compile() {
econf --enable-fdmount-floppy-only || die
# parallel make unsafe (bug#315577)
emake -j1 $(use doc || echo compile) || die "emake failed"
}
src_install() {
dodoc Changelog
use doc && dodir /usr/share/info/
dodir /etc
emake -j1 DESTDIR="${D}" install || die
}

@ -1,4 +1,4 @@
# Copyright 1999-2013 Gentoo Foundation
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@ -13,7 +13,7 @@ SRC_URI="mirror://debian/pool/main/f/${PN}/${MY_P}.orig.tar.gz
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~x86"
KEYWORDS="~amd64 ~ppc x86"
IUSE="doc"
RDEPEND=">=sys-fs/mtools-4"

@ -1,140 +0,0 @@
--- fdutils-5.5/doc/Makefile.in.orig 2005-07-16 19:54:56.000000000 +1000
+++ fdutils-5.5/doc/Makefile.in 2005-07-16 20:00:42.000000000 +1000
@@ -79,68 +79,68 @@
# Don't cd, to avoid breaking install-sh references.
install-info: info
- $(top_srcdir)/mkinstalldirs $(infodir)
+ $(top_srcdir)/mkinstalldirs $(DESTDIR)$(infodir)
if test -f fdutils.info; then \
for i in fdutils.info*; do \
- $(INSTALL_DATA) $$i $(infodir)/$$i; \
+ $(INSTALL_DATA) $$i $(DESTDIR)$(infodir)/$$i; \
done; \
else \
for i in $(srcdir)/fdutils.info*; do \
- $(INSTALL_DATA) $$i $(infodir)/`echo $$i | sed 's|^$(srcdir)/||'`; \
+ $(INSTALL_DATA) $$i $(DESTDIR)$(infodir)/`echo $$i | sed 's|^$(srcdir)/||'`; \
done; \
fi; \
if [ -n "$(INSTALL_INFO)" ] ; then \
if [ -f $(infodir)/dir.info ] ; then \
- $(INSTALL_INFO) $(infodir)/fdutils.info $(infodir)/dir.info; \
+ $(INSTALL_INFO) $(DESTDIR)$(infodir)/fdutils.info $(DESTDIR)$(infodir)/dir.info; \
fi; \
if [ -f $(infodir)/dir ] ; then \
- $(INSTALL_INFO) $(infodir)/fdutils.info $(infodir)/dir; \
+ $(INSTALL_INFO) $(DESTDIR)$(infodir)/fdutils.info $(DESTDIR)$(infodir)/dir; \
fi; \
fi
install-man:
- $(top_srcdir)/mkinstalldirs $(mandir1)
- $(top_srcdir)/mkinstalldirs $(mandir4)
- $(top_srcdir)/mkinstalldirs $(mandir8)
+ $(top_srcdir)/mkinstalldirs $(DESTDIR)$(mandir1)
+ $(top_srcdir)/mkinstalldirs $(DESTDIR)$(mandir4)
+ $(top_srcdir)/mkinstalldirs $(DESTDIR)$(mandir8)
for i in $(MANPAGES1); do \
install -c -m $(MANPERM) -o $(UID) -g $(GID) \
- $(srcdir)/$$i $(mandir1)/$$i; \
+ $(srcdir)/$$i $(DESTDIR)$(mandir1)/$$i; \
done
for i in $(MANPAGES4); do \
install -c -m $(MANPERM) -o $(UID) -g $(GID) \
- $(srcdir)/$$i $(mandir4)/$$i; \
+ $(srcdir)/$$i $(DESTDIR)$(mandir4)/$$i; \
done
# for i in $(MANPAGES8); do \
# install -c -m $(MANPERM) -o $(UID) -g $(GID) \
-# $(srcdir)/$$i $(mandir8)/$$i; \
+# $(srcdir)/$$i $(DESTDIR)$(mandir8)/$$i; \
# done
- ( cd $(mandir1); \
- ln -sf fdmount.1 $(mandir1)/fdumount.1; \
- ln -sf fdmount.1 $(mandir1)/fdlist.1; \
- ln -sf fdmount.1 $(mandir1)/fdmountd.1; \
- ln -sf xdfcopy.1 $(mandir1)/xdfformat.1 \
+ ( cd $(DESTDIR)$(mandir1); \
+ ln -sf fdmount.1 $(DESTDIR)$(mandir1)/fdumount.1; \
+ ln -sf fdmount.1 $(DESTDIR)$(mandir1)/fdlist.1; \
+ ln -sf fdmount.1 $(DESTDIR)$(mandir1)/fdmountd.1; \
+ ln -sf xdfcopy.1 $(DESTDIR)$(mandir1)/xdfformat.1 \
)
install-zman:
for i in $(MANPAGES1); do \
gzip < $(srcdir)/$$i >_; \
install -c -m $(MANPERM) -o $(UID) -g $(GID) \
- _ $(mandir1)/$$i.gz; \
+ _ $(DESTDIR)$(mandir1)/$$i.gz; \
done
for i in $(MANPAGES4); do \
gzip < $(srcdir)/$$i >_; \
install -c -m $(MANPERM) -o $(UID) -g $(GID) \
- _ $(mandir4)/$$i.gz; \
+ _ $(DESTDIR)$(mandir4)/$$i.gz; \
done
for i in $(MANPAGES8); do \
gzip < $(srcdir)/$$i >_; \
install -c -m $(MANPERM) -o $(UID) -g $(GID) \
- _ $(mandir8)/$$i.gz; \
+ _ $(DESTDIR)$(mandir8)/$$i.gz; \
done
rm _
--- fdutils-5.5/src/Makefile.in.orig 2005-07-16 19:51:09.000000000 +1000
+++ fdutils-5.5/src/Makefile.in 2005-07-16 19:54:39.000000000 +1000
@@ -116,27 +116,27 @@
install-conf:
- $(top_srcdir)/mkinstalldirs $(syconfdir)
+ $(top_srcdir)/mkinstalldirs $(DESTDIR)$(syconfdir)
if [ ! -f $(sysconfdir)/mediaprm ] ; then \
- cp $(srcdir)/mediaprm $(sysconfdir) ; \
+ cp $(srcdir)/mediaprm $(DESTDIR)$(sysconfdir) ; \
fi
install-bin: all
- $(top_srcdir)/mkinstalldirs $(bindir)
- $(INSTALL) -c -m $(PERM) -o $(UID) -g $(GID) $(srcdir)/MAKEFLOPPIES $(bindir)
- $(INSTALL) -c -s -m $(PERM) -o $(UID) -g $(GID) diskd $(bindir)
- $(INSTALL) -c -s -m $(PERM) -o $(UID) -g $(GID) diskseekd $(bindir)
- $(INSTALL) -c -s -m $(PERM) -o $(UID) -g $(GID) floppycontrol $(bindir)
- $(INSTALL) -c -s -m $(PERM) -o $(UID) -g $(GID) floppymeter $(bindir)
- $(INSTALL) -c -s -m $(PERM) -o $(UID) -g $(GID) getfdprm $(bindir)
- $(INSTALL) -c -s -m $(PERM) -o $(UID) -g $(GID) setfdprm $(bindir)
- $(INSTALL) -c -s -m $(PERM) -o $(UID) -g $(GID) fdrawcmd $(bindir)
- $(INSTALL) -c -s -m $(PERM) -o $(UID) -g $(GID) superformat $(bindir)
- $(INSTALL) -c -s -m $(PERM) -o $(UID) -g $(GID) xdfcopy $(bindir)
- $(INSTALL) -c -s -m $(SPERM) -o $(UID) -g $(GID) fdmount $(bindir)
- $(INSTALL) -c -s -m $(SPERM) -o $(UID) -g $(GID) fdmount $(bindir)/fdumount
- ( cd $(bindir); \
- ln -sf xdfcopy $(bindir)/xdfformat; \
- ln -sf fdmount $(bindir)/fdumount; \
- ln -sf fdmount $(bindir)/fdlist; \
- ln -sf fdmount $(bindir)/fdmountd )
+ $(top_srcdir)/mkinstalldirs $(DESTDIR)$(bindir)
+ $(INSTALL) -c -m $(PERM) -o $(UID) -g $(GID) $(srcdir)/MAKEFLOPPIES $(DESTDIR)$(bindir)
+ $(INSTALL) -c -s -m $(PERM) -o $(UID) -g $(GID) diskd $(DESTDIR)$(bindir)
+ $(INSTALL) -c -s -m $(PERM) -o $(UID) -g $(GID) diskseekd $(DESTDIR)$(bindir)
+ $(INSTALL) -c -s -m $(PERM) -o $(UID) -g $(GID) floppycontrol $(DESTDIR)$(bindir)
+ $(INSTALL) -c -s -m $(PERM) -o $(UID) -g $(GID) floppymeter $(DESTDIR)$(bindir)
+ $(INSTALL) -c -s -m $(PERM) -o $(UID) -g $(GID) getfdprm $(DESTDIR)$(bindir)
+ $(INSTALL) -c -s -m $(PERM) -o $(UID) -g $(GID) setfdprm $(DESTDIR)$(bindir)
+ $(INSTALL) -c -s -m $(PERM) -o $(UID) -g $(GID) fdrawcmd $(DESTDIR)$(bindir)
+ $(INSTALL) -c -s -m $(PERM) -o $(UID) -g $(GID) superformat $(DESTDIR)$(bindir)
+ $(INSTALL) -c -s -m $(PERM) -o $(UID) -g $(GID) xdfcopy $(DESTDIR)$(bindir)
+ $(INSTALL) -c -s -m $(SPERM) -o $(UID) -g $(GID) fdmount $(DESTDIR)$(bindir)
+ $(INSTALL) -c -s -m $(SPERM) -o $(UID) -g $(GID) fdmount $(DESTDIR)$(bindir)/fdumount
+ ( cd $(DESTDIR)$(bindir); \
+ ln -sf xdfcopy xdfformat; \
+ ln -sf fdmount fdumount; \
+ ln -sf fdmount fdlist; \
+ ln -sf fdmount fdmountd )

@ -1,12 +0,0 @@
diff -urN fdutils-5.4.old/doc/Makefile.in fdutils-5.4/doc/Makefile.in
--- fdutils-5.4.old/doc/Makefile.in 1999-07-02 15:03:25.000000000 -0700
+++ fdutils-5.4/doc/Makefile.in 2003-12-10 00:24:36.000000000 -0800
@@ -22,7 +22,7 @@
floppycontrol.1 makefloppies.1 xdfcopy.1 fdmount.1 \
floppymeter.1 setfdprm.1
-MANPAGES4 = fd.4
+MANPAGES4 =
MANPERM = 644
UID = root
GID = root

@ -1,59 +0,0 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
inherit autotools eutils
DESCRIPTION="A lightweight and flexible command-line JSON processor"
HOMEPAGE="https://stedolan.github.com/jq/"
SRC_URI="https://github.com/stedolan/jq/releases/download/${P}/${P}.tar.gz"
LICENSE="MIT CC-BY-3.0"
SLOT="0"
KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x64-macos"
IUSE="oniguruma static-libs test"
DEPEND="
>=sys-devel/bison-3.0
sys-devel/flex
oniguruma? ( dev-libs/oniguruma:=[static-libs?] )
test? ( dev-util/valgrind )
"
RDEPEND="
!static-libs? (
oniguruma? ( dev-libs/oniguruma[static-libs?] )
)
"
src_prepare() {
local PATCHES=(
"${FILESDIR}"/${PN}-1.5-dynamic-link.patch
"${FILESDIR}"/${PN}-1.5-remove-automagic-dep-on-oniguruma.patch
"${FILESDIR}"/${PN}-1.5-heap_buffer_overflow_in_tokenadd.patch
)
sed -i '/^dist_doc_DATA/d' Makefile.am || die
sed -i -r "s:(m4_define\(\[jq_version\],) .+\):\1 \[${PV}\]):" \
configure.ac || die
default
eautoreconf
}
src_configure() {
local econfargs=(
# don't try to rebuild docs
--disable-docs
$(use_enable static-libs static)
$(use_with oniguruma)
)
econf "${econfargs[@]}"
}
src_install() {
local DOCS=( AUTHORS README )
default
use static-libs || prune_libtool_files
}

@ -11,7 +11,7 @@ SRC_URI="https://github.com/stedolan/jq/releases/download/${P}/${P}.tar.gz"
LICENSE="MIT CC-BY-3.0"
SLOT="0"
KEYWORDS="~amd64 ~arm ~ia64 ~x86 ~amd64-linux ~x64-macos"
KEYWORDS="amd64 ~arm ~ia64 x86 ~amd64-linux ~x64-macos"
IUSE="oniguruma static-libs test +valgrind"
DEPEND="

@ -1,2 +1,2 @@
DIST physlock-0.4.5.tar.gz 12804 SHA256 5ddb42553142c5e2b8744d086bb8f5bf131a29fc58b8886e825b80e6a456961c SHA512 ab2e71bdc0004d97e3742cf8155602c036dafa22156147cc3cd4050c1665e54d4ca04ee8dc1f763e6369a5d6592524cbc8e10c56870905a1b13385640f4ec476 WHIRLPOOL e770cc9e4448c3407c12d51e1bb2d1fec5f74cdc5be4d6503fa89a297b3a40b7f5bb67466fbb641e2af249339aacdf2abb5de9ac145482c1b283604abbb51533
DIST physlock-0.5.tar.gz 13547 SHA256 395873abe9bfb3879df796bd9d857be024c4ca01c5b6e83cfd3253647b558782 SHA512 0e22d2c1093556e2ca52da4ee36e53a7eebf9c2cf8e10592c95971aa3479c3ee1a31b9d71e52fca715a483f22740f6cf9a3c167fb61e4c6034a2ecf900fd5f9d WHIRLPOOL 4dbfea803043a691e16a515fede273a27360923808aa2d1c6bd281282bc24b24113cc39915ba2f90723dd15322ac930297605f7cc2c6b1fc51cb7794ee46796a
DIST physlock-11.tar.gz 13791 SHA256 f03031a6f4c6a08d62098457834d04b8835082a76609059451397356a83d4442 SHA512 d3badf5c99e4e3e16f4e7ec5c59ee8320c845f1b180463900d816206362ce1aa8652f2489453ad5e190cceee2ed61a90acc52e25bb6b4c4a9dc8c4ebd3054938 WHIRLPOOL e74513bf5c60db1669dfa11496f98cd4100753ce1a9aa93c603235680adb3ff4b7f2bffff134e8f2f27534e1a5fffff15a4cd17627dd2761f6b67d3903a166f4

@ -1,16 +0,0 @@
--- physlock-0.4.4/Makefile
+++ physlock-0.4.4/Makefile
@@ -2,10 +2,10 @@
VERSION = 0.4.4
-CC = gcc
+CC ?= gcc
PREFIX = /usr/local
-CFLAGS = -Wall -pedantic -DVERSION=\"$(VERSION)\"
-LDFLAGS =
+CFLAGS += -Wall -pedantic -DVERSION=\"$(VERSION)\"
+LDFLAGS +=
LIBS = -lcrypt
SRC = auth.c main.c options.c util.c vt.c

@ -1,18 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
<longdescription lang="en">
Control physical access to a linux computer by locking all of its virtual
terminals / consoles.
<!-- maintainer-needed -->
<longdescription lang="en">
Control physical access to a linux computer by locking all of its virtual
terminals / consoles.
physlock is an alternative to vlock, it is equivalent to `vlock -an'. It is
written because vlock blocks some linux kernel mechanisms like hibernate and
suspend and can therefore only be used with some limitations. physlock is
designed to be more lightweight, it does not have a plugin interface and it is
not started using a shell script wrapper.
physlock is an alternative to vlock, it is equivalent to `vlock -an'. It is
written because vlock blocks some linux kernel mechanisms like hibernate and
suspend and can therefore only be used with some limitations. physlock is
designed to be more lightweight, it does not have a plugin interface and it is
not started using a shell script wrapper.
</longdescription>
<upstream>
<remote-id type="github">muennich/physlock</remote-id>
</upstream>
<upstream>
<remote-id type="github">muennich/physlock</remote-id>
</upstream>
</pkgmetadata>

@ -1,9 +1,9 @@
# Copyright 1999-2015 Gentoo Foundation
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
EAPI=6
inherit toolchain-funcs eutils
inherit toolchain-funcs
DESCRIPTION="lightweight Linux console locking tool"
HOMEPAGE="https://github.com/muennich/physlock"
@ -13,8 +13,11 @@ LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~arm ~x86"
RDEPEND="virtual/pam"
DEPEND="${RDEPEND}"
src_prepare() {
epatch "${FILESDIR}"/${PN}-0.4.4-makefile.patch
default
tc-export CC
}

@ -6,6 +6,7 @@ EAPI=6
KDE_LINGUAS="bs ca ca@valencia cs da de el en_GB es et eu fi fr gl
hu it kk nds nl pl pt pt_BR ro ru sk sv tr uk zh_CN zh_TW"
KDE_HANDBOOK="optional"
SQL_REQUIRED="always"
VIRTUALX_REQUIRED="test"
VIRTUALDBUS_TEST="true"
inherit kde4-base

@ -1,10 +1,12 @@
# Copyright 1999-2016 Gentoo Foundation
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
KDE_LINGUAS="ast bg bs cs da de en_GB eo es et fi fr ga gl hu it ja lt mai mr nds
nl pl pt pt_BR ru sk sv tr ug uk zh_CN"
QT3SUPPORT_REQUIRED="true"
SQL_REQUIRED="always"
inherit kde4-base
DESCRIPTION="Software for operating a small business, creating documents such as invoices"

@ -14,11 +14,11 @@ PYTHON_REQ_USE="threads,xml"
# Usually the tarballs are moved a lot so this should make
# everyone happy.
DEV_URI="
http://dev-builds.libreoffice.org/pre-releases/src
http://download.documentfoundation.org/libreoffice/src/${PV:0:5}/
http://download.documentfoundation.org/libreoffice/old/${PV}/
https://dev-builds.libreoffice.org/pre-releases/src
https://download.documentfoundation.org/libreoffice/src/${PV:0:5}/
https://download.documentfoundation.org/libreoffice/old/${PV}/
"
ADDONS_URI="http://dev-www.libreoffice.org/src/"
ADDONS_URI="https://dev-www.libreoffice.org/src/"
BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
# PATCHSET="${P}-patchset-01.tar.xz"
@ -28,8 +28,8 @@ inherit multiprocessing autotools bash-completion-r1 check-reqs eutils java-pkg-
unset SCM_ECLASS
DESCRIPTION="A full office productivity suite"
HOMEPAGE="http://www.libreoffice.org"
SRC_URI="branding? ( http://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
HOMEPAGE="https://www.libreoffice.org"
SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
[[ -n ${PATCHSET} ]] && SRC_URI+=" http://dev.gentooexperimental.org/~scarabeus/${PATCHSET}"
# Split modules following git/tarballs
@ -313,7 +313,7 @@ src_unpack() {
done
else
local base_uri branch checkout mypv
base_uri="git://anongit.freedesktop.org"
base_uri="https://anongit.freedesktop.org"
for mod in ${MODULES}; do
branch="master"
mypv=${PV/.9999}
@ -373,7 +373,7 @@ src_configure() {
local java_opts
local ext_opts
# Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys
# Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys
# Note: these are for Gentoo use ONLY. For your own distribution, please get
# your own set of keys. Feel free to contact chromium@gentoo.org for more info.
local google_default_client_id="329227923882.apps.googleusercontent.com"

@ -14,11 +14,11 @@ PYTHON_REQ_USE="threads,xml"
# Usually the tarballs are moved a lot so this should make
# everyone happy.
DEV_URI="
http://dev-builds.libreoffice.org/pre-releases/src
http://download.documentfoundation.org/libreoffice/src/${PV:0:5}/
http://download.documentfoundation.org/libreoffice/old/${PV}/
https://dev-builds.libreoffice.org/pre-releases/src
https://download.documentfoundation.org/libreoffice/src/${PV:0:5}/
https://download.documentfoundation.org/libreoffice/old/${PV}/
"
ADDONS_URI="http://dev-www.libreoffice.org/src/"
ADDONS_URI="https://dev-www.libreoffice.org/src/"
BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
# PATCHSET="${P}-patchset-01.tar.xz"
@ -28,8 +28,8 @@ inherit multiprocessing autotools bash-completion-r1 check-reqs eutils java-pkg-
unset SCM_ECLASS
DESCRIPTION="A full office productivity suite"
HOMEPAGE="http://www.libreoffice.org"
SRC_URI="branding? ( http://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
HOMEPAGE="https://www.libreoffice.org"
SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
[[ -n ${PATCHSET} ]] && SRC_URI+=" http://dev.gentooexperimental.org/~scarabeus/${PATCHSET}"
# Split modules following git/tarballs
@ -301,7 +301,7 @@ src_unpack() {
done
else
local base_uri branch checkout mypv
base_uri="git://anongit.freedesktop.org"
base_uri="https://anongit.freedesktop.org"
for mod in ${MODULES}; do
branch="master"
mypv=${PV/.9999}
@ -361,7 +361,7 @@ src_configure() {
local java_opts
local ext_opts
# Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys
# Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys
# Note: these are for Gentoo use ONLY. For your own distribution, please get
# your own set of keys. Feel free to contact chromium@gentoo.org for more info.
local google_default_client_id="329227923882.apps.googleusercontent.com"

@ -14,11 +14,11 @@ PYTHON_REQ_USE="threads,xml"
# Usually the tarballs are moved a lot so this should make
# everyone happy.
DEV_URI="
http://dev-builds.libreoffice.org/pre-releases/src
http://download.documentfoundation.org/libreoffice/src/${PV:0:5}/
http://download.documentfoundation.org/libreoffice/old/${PV}/
https://dev-builds.libreoffice.org/pre-releases/src
https://download.documentfoundation.org/libreoffice/src/${PV:0:5}/
https://download.documentfoundation.org/libreoffice/old/${PV}/
"
ADDONS_URI="http://dev-www.libreoffice.org/src/"
ADDONS_URI="https://dev-www.libreoffice.org/src/"
BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
# PATCHSET="${P}-patchset-01.tar.xz"
@ -28,8 +28,8 @@ inherit multiprocessing autotools bash-completion-r1 check-reqs eutils java-pkg-
unset SCM_ECLASS
DESCRIPTION="A full office productivity suite"
HOMEPAGE="http://www.libreoffice.org"
SRC_URI="branding? ( http://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
HOMEPAGE="https://www.libreoffice.org"
SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
[[ -n ${PATCHSET} ]] && SRC_URI+=" http://dev.gentooexperimental.org/~scarabeus/${PATCHSET}"
# Split modules following git/tarballs
@ -306,7 +306,7 @@ src_unpack() {
done
else
local base_uri branch checkout mypv
base_uri="git://anongit.freedesktop.org"
base_uri="https://anongit.freedesktop.org"
for mod in ${MODULES}; do
branch="master"
mypv=${PV/.9999}
@ -366,7 +366,7 @@ src_configure() {
local java_opts
local ext_opts
# Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys
# Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys
# Note: these are for Gentoo use ONLY. For your own distribution, please get
# your own set of keys. Feel free to contact chromium@gentoo.org for more info.
local google_default_client_id="329227923882.apps.googleusercontent.com"

@ -14,11 +14,11 @@ PYTHON_REQ_USE="threads,xml"
# Usually the tarballs are moved a lot so this should make
# everyone happy.
DEV_URI="
http://dev-builds.libreoffice.org/pre-releases/src
http://download.documentfoundation.org/libreoffice/src/${PV:0:5}/
http://download.documentfoundation.org/libreoffice/old/${PV}/
https://dev-builds.libreoffice.org/pre-releases/src
https://download.documentfoundation.org/libreoffice/src/${PV:0:5}/
https://download.documentfoundation.org/libreoffice/old/${PV}/
"
ADDONS_URI="http://dev-www.libreoffice.org/src/"
ADDONS_URI="https://dev-www.libreoffice.org/src/"
BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
# PATCHSET="${P}-patchset-01.tar.xz"
@ -28,8 +28,8 @@ inherit multiprocessing autotools bash-completion-r1 check-reqs eutils java-pkg-
unset SCM_ECLASS
DESCRIPTION="A full office productivity suite"
HOMEPAGE="http://www.libreoffice.org"
SRC_URI="branding? ( http://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
HOMEPAGE="https://www.libreoffice.org"
SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
[[ -n ${PATCHSET} ]] && SRC_URI+=" http://dev.gentooexperimental.org/~scarabeus/${PATCHSET}"
# Split modules following git/tarballs
@ -306,7 +306,7 @@ src_unpack() {
done
else
local base_uri branch checkout mypv
base_uri="git://anongit.freedesktop.org"
base_uri="https://anongit.freedesktop.org"
for mod in ${MODULES}; do
branch="master"
mypv=${PV/.9999}
@ -366,7 +366,7 @@ src_configure() {
local java_opts
local ext_opts
# Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys
# Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys
# Note: these are for Gentoo use ONLY. For your own distribution, please get
# your own set of keys. Feel free to contact chromium@gentoo.org for more info.
local google_default_client_id="329227923882.apps.googleusercontent.com"

@ -14,11 +14,11 @@ PYTHON_REQ_USE="threads,xml"
# Usually the tarballs are moved a lot so this should make
# everyone happy.
DEV_URI="
http://dev-builds.libreoffice.org/pre-releases/src
http://download.documentfoundation.org/libreoffice/src/${PV:0:5}/
http://download.documentfoundation.org/libreoffice/old/${PV}/
https://dev-builds.libreoffice.org/pre-releases/src
https://download.documentfoundation.org/libreoffice/src/${PV:0:5}/
https://download.documentfoundation.org/libreoffice/old/${PV}/
"
ADDONS_URI="http://dev-www.libreoffice.org/src/"
ADDONS_URI="https://dev-www.libreoffice.org/src/"
BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
# PATCHSET="${P}-patchset-01.tar.xz"
@ -28,8 +28,8 @@ inherit multiprocessing autotools bash-completion-r1 check-reqs eutils java-pkg-
unset SCM_ECLASS
DESCRIPTION="A full office productivity suite"
HOMEPAGE="http://www.libreoffice.org"
SRC_URI="branding? ( http://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
HOMEPAGE="https://www.libreoffice.org"
SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
[[ -n ${PATCHSET} ]] && SRC_URI+=" http://dev.gentooexperimental.org/~scarabeus/${PATCHSET}"
# Split modules following git/tarballs
@ -306,7 +306,7 @@ src_unpack() {
done
else
local base_uri branch checkout mypv
base_uri="git://anongit.freedesktop.org"
base_uri="https://anongit.freedesktop.org"
for mod in ${MODULES}; do
branch="master"
mypv=${PV/.9999}
@ -366,7 +366,7 @@ src_configure() {
local java_opts
local ext_opts
# Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys
# Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys
# Note: these are for Gentoo use ONLY. For your own distribution, please get
# your own set of keys. Feel free to contact chromium@gentoo.org for more info.
local google_default_client_id="329227923882.apps.googleusercontent.com"

@ -9,7 +9,7 @@ SRC_URI="https://dev.gentoo.org/~mgorny/dist/${P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~x86-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~arm64-linux ~ppc64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~x86-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~arm64-linux ~ppc64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE=""
RDEPEND="sys-apps/gentoo-functions"

@ -3,6 +3,7 @@
EAPI=6
QT3SUPPORT_REQUIRED="true"
inherit kde4-base
DESCRIPTION="Graphical Portage frontend based on KDELibs4/Qt4"
@ -18,6 +19,6 @@ DEPEND="dev-db/sqlite:3"
RDEPEND="${DEPEND}
app-portage/gentoolkit
|| ( kde-plasma/kde-cli-tools[kdesu] $(add_kdeapps_dep kdesu) )
kde-apps/kompare:*
kde-plasma/kde-cli-tools[kdesu]
"

@ -1,15 +1,15 @@
# Copyright 1999-2016 Gentoo Foundation
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
EGIT_REPO_URI="git://anongit.freedesktop.org/git/libreoffice/libetonyek"
EGIT_REPO_URI="https://anongit.freedesktop.org/git/libreoffice/libetonyek.git"
inherit autotools
[[ ${PV} == 9999 ]] && inherit git-r3
DESCRIPTION="Library parsing Apple Keynote presentations"
HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libetonyek"
[[ ${PV} == 9999 ]] || SRC_URI="http://dev-www.libreoffice.org/src/${PN}/${P}.tar.xz"
[[ ${PV} == 9999 ]] || SRC_URI="https://dev-www.libreoffice.org/src/libetonyek/${P}.tar.xz"
LICENSE="|| ( GPL-2+ LGPL-2.1 MPL-1.1 )"
SLOT="0"

@ -1,14 +1,14 @@
# Copyright 1999-2016 Gentoo Foundation
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
EGIT_REPO_URI="git://anongit.freedesktop.org/git/libreoffice/libetonyek"
EGIT_REPO_URI="https://anongit.freedesktop.org/git/libreoffice/libetonyek.git"
[[ ${PV} == 9999 ]] && inherit autotools git-r3
DESCRIPTION="Library parsing Apple Keynote presentations"
HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libetonyek"
[[ ${PV} == 9999 ]] || SRC_URI="http://dev-www.libreoffice.org/src/${PN}/${P}.tar.xz"
[[ ${PV} == 9999 ]] || SRC_URI="https://dev-www.libreoffice.org/src/libetonyek/${P}.tar.xz"
LICENSE="|| ( GPL-2+ LGPL-2.1 MPL-1.1 )"
SLOT="0"

@ -1 +1,2 @@
DIST libgxps-0.2.5.tar.xz 346532 SHA256 3e7594c5c9b077171ec9ccd3ff2b4f4c4b29884d26d4f35e740c8887b40199a0 SHA512 f449c4cb989910797c84614ce9f141d4e9adcda0c18f309f656de397ba5deabfa9b4c558c81be7f52bc44c048c401616775989cd1ff9408eeea44f46ef56635b WHIRLPOOL db7514e785f46a3fbf32db9962c2644837855116acbbf37373388c3cfed3b88645c4a574fe8e2ae41913b68250d9448dd3566d9b15b258c74810262f4411f9b8
DIST libgxps-0.3.0.tar.xz 93000 SHA256 412b1343bd31fee41f7204c47514d34c563ae34dafa4cc710897366bd6cd0fae SHA512 283ce3041f0238ef1dcae30ce2adbc3f843677e00ae22f20ed3459828f3edaab6d05d87c20dddb613925ab248ed0b29855a94198b982606c3dcb2e59f800b013 WHIRLPOOL 00b8544245bc6be3d2a8d183a35f3f4936951fdc3772d1c7ee893ce5fe97712bc472d0ab3ff670c35655bb8f93941e9687d54e3b503075929958bc492c6fa42e

@ -0,0 +1,50 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
inherit gnome.org meson xdg-utils
DESCRIPTION="Library for handling and rendering XPS documents"
HOMEPAGE="https://wiki.gnome.org/Projects/libgxps"
LICENSE="LGPL-2.1"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
IUSE="+introspection jpeg lcms tiff"
RDEPEND="
>=app-arch/libarchive-2.8
>=dev-libs/glib-2.36:2
media-libs/freetype:2
media-libs/libpng:0
>=x11-libs/cairo-1.10[svg]
introspection? ( >=dev-libs/gobject-introspection-0.10.1:= )
jpeg? ( virtual/jpeg:0 )
lcms? ( media-libs/lcms:2 )
tiff? ( media-libs/tiff:0[zlib] )
"
DEPEND="${RDEPEND}
app-text/docbook-xsl-stylesheets
dev-libs/libxslt
dev-util/gtk-doc-am
virtual/pkgconfig
"
# There is no automatic test suite, only an interactive test application
RESTRICT="test"
src_configure() {
local emesonargs=(
-Denable-test=false
-Denable-gtk-doc=false
-Denable-man=true
-Ddisable-introspection=$(usex introspection false true)
-Dwith-liblcms2=$(usex lcms true false)
-Dwith-libjpeg=$(usex jpeg true false)
-Dwith-libtiff=$(usex tiff true false)
)
xdg_environment_reset
meson_src_configure
}

@ -3,12 +3,12 @@
EAPI=6
EGIT_REPO_URI="git://anongit.freedesktop.org/git/libreoffice/${PN}/"
EGIT_REPO_URI="https://anongit.freedesktop.org/git/libreoffice/libmspub.git"
[[ ${PV} == 9999 ]] && inherit autotools git-r3
DESCRIPTION="Library parsing Microsoft Publisher documents"
HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libmspub"
[[ ${PV} == 9999 ]] || SRC_URI="http://dev-www.libreoffice.org/src/${PN}/${P}.tar.xz"
[[ ${PV} == 9999 ]] || SRC_URI="https://dev-www.libreoffice.org/src/libmspub/${P}.tar.xz"
LICENSE="LGPL-2.1"
SLOT="0"

@ -1,14 +1,14 @@
# Copyright 1999-2016 Gentoo Foundation
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
EGIT_REPO_URI="git://anongit.freedesktop.org/git/libreoffice/${PN}/"
EGIT_REPO_URI="https://anongit.freedesktop.org/git/libreoffice/libmspub.git"
[[ ${PV} == 9999 ]] && inherit autotools git-r3
DESCRIPTION="Library parsing Microsoft Publisher documents"
HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libmspub"
[[ ${PV} == 9999 ]] || SRC_URI="http://dev-www.libreoffice.org/src/${PN}/${P}.tar.xz"
[[ ${PV} == 9999 ]] || SRC_URI="https://dev-www.libreoffice.org/src/libmspub/${P}.tar.xz"
LICENSE="LGPL-2.1"
SLOT="0"

@ -7,7 +7,7 @@ inherit cmake-utils toolchain-funcs xdg-utils
if [[ "${PV}" == "9999" ]] ; then
inherit git-r3
EGIT_REPO_URI="git://git.freedesktop.org/git/${PN}/${PN}"
EGIT_REPO_URI="https://anongit.freedesktop.org/git/poppler/poppler.git"
SLOT="0/9999"
else
SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"

@ -7,7 +7,7 @@ inherit cmake-utils toolchain-funcs xdg-utils
if [[ "${PV}" == "9999" ]] ; then
inherit git-r3
EGIT_REPO_URI="git://git.freedesktop.org/git/${PN}/${PN}"
EGIT_REPO_URI="https://anongit.freedesktop.org/git/poppler/poppler.git"
SLOT="0/9999"
else
SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"

@ -7,7 +7,7 @@ inherit cmake-utils toolchain-funcs xdg-utils
if [[ "${PV}" == "9999" ]] ; then
inherit git-r3
EGIT_REPO_URI="git://git.freedesktop.org/git/${PN}/${PN}"
EGIT_REPO_URI="https://anongit.freedesktop.org/git/poppler/poppler.git"
SLOT="0/9999"
else
SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"

@ -1,3 +1 @@
DIST bufexplorer-7.4.12.tar.gz 24777 SHA256 bcd8549fdd64d149356f1995eaf3f7cd6e0996d8c9128b41085772a24e13a00a SHA512 4767b735e041620e7410866a8ab62932803a248aa2cc311dda8d9a56421d26edede56d56a6329eb2a2b95d7962cc7084ac1606f92485dfb87ba6d647ca4f5c20 WHIRLPOOL 70b3fe6cdfb37bc040100aed89c34e48e0cc7996a0c35170cc20cd8f31a6eab61e87889c3500727b29d41a476e07a2e51d8b7dbe22e8d7c8228e2a6327129095
DIST bufexplorer-7.4.14.tar.gz 25041 SHA256 bfbda1e8ae93da697e5dba39310632bd7138a34d3876ee583d9950873d7edc0a SHA512 a78c12e01727132fdb5baf97aa901ce9619efe9a03e35688de1b5c2357050089e352c78e6e33eef3c861b1f5b12b014eeb70af34b3d8305ad3c79e595fd98436 WHIRLPOOL e06414069524266228ae6cca56167916bf96ebab6f84bacc22266415a5d44f6ecd2ce84c7364a41b125a65340ff1ad2e27f23eb47b35eec977f25030b9880ab7
DIST bufexplorer-7.4.18.tar.gz 25117 SHA256 6cf21e3d36d8832cca9c53bbd44021aba437d0cebef5cf95576ade79750d8280 SHA512 420e3d352bb31a80311c3ab8ad62f7a6530fdcf78eb0bc45717e075f81a3d1a42fef18d756c129d2c25e8d5f7d8e1161affae905cfa7d8b0d1d3c9245c9f1bea WHIRLPOOL 798e5c61c0eafaeec73729dccfd9be38637174d32b958fa729893785d946b31cc9c593f2bd86d9a24b5d18e06850ffe5b5803cb0328396cf7bb5d46250ddfa74

@ -1,19 +0,0 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
inherit vim-plugin
DESCRIPTION="vim plugin: easily browse vim buffers"
HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=42 https://github.com/jlanzarotta/bufexplorer"
SRC_URI="https://github.com/jlanzarotta/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD"
KEYWORDS="amd64 x86"
VIM_PLUGIN_HELPFILES="${PN}.txt"
src_prepare() {
default
rm LICENSE README.md || die
}

@ -9,7 +9,7 @@ DESCRIPTION="vim plugin: easily browse vim buffers"
HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=42 https://github.com/jlanzarotta/bufexplorer"
SRC_URI="https://github.com/jlanzarotta/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD"
KEYWORDS="~amd64 ~x86"
KEYWORDS="amd64 x86"
VIM_PLUGIN_HELPFILES="${PN}.txt"

@ -5,11 +5,17 @@ EAPI=6
inherit vim-plugin
if [[ ${PV} == "9999" ]] ; then
EGIT_REPO_URI="https://github.com/jlanzarotta/bufexplorer.git"
inherit git-r3
else
SRC_URI="https://github.com/jlanzarotta/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
KEYWORDS="~amd64 ~x86"
fi
DESCRIPTION="vim plugin: easily browse vim buffers"
HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=42 https://github.com/jlanzarotta/bufexplorer"
SRC_URI="https://github.com/jlanzarotta/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD"
KEYWORDS="~amd64 ~x86"
VIM_PLUGIN_HELPFILES="${PN}.txt"

@ -1,2 +1 @@
DIST dbext-24.0.tar.bz2 106023 SHA256 77fba040a3badd9475dac109171f42148d28b32b664c04a8ea60cba4af5c3d9d SHA512 2f11ec45d980714ccbb1dec32b6b231551edf5fe67a7394aa917b83c3b6f197f9c9a53fe12f7e7e43ef963eb31370bf5efd723fe23b2aadf065ec29914112cd8 WHIRLPOOL 22e521c47ef394a7c8b99c57b77ddc192bc81afaec375abed981506312e6ed362a7c6ad0d5111bf717f23ae34d2a68ec05f9cdf6164ed52a036c298866d57b4f
DIST dbext-25.0.tar.bz2 108580 SHA256 2e9efdd5161c4225aaf6649990cbcf1d8dfa3dab7dbeb468a3329138cc229dff SHA512 715d9d41be46f691ea5e635bf564c4f16d16a74e5b65d9ae12f794406a2a7815df836e34d0c415e8696847e8f36f2ceed1fda4bc688ebe0db8826dc3f0493340 WHIRLPOOL dbb0eef4c9bbcbef6218537b77f989fe4717c9b6b25cbd7509abd8e6708a4755df0fd3555a5131d5efb5550f18f340c55149eb8487987dc3bfc263e370759416

@ -1,13 +0,0 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
inherit vim-plugin
DESCRIPTION="vim plugin: easy access to databases"
HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=356"
LICENSE="GPL-2"
KEYWORDS="amd64 ~mips ppc x86"
VIM_PLUGIN_HELPFILES="${PN}.txt"

@ -8,6 +8,6 @@ inherit vim-plugin
DESCRIPTION="vim plugin: easy access to databases"
HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=356"
LICENSE="GPL-2"
KEYWORDS="~amd64 ~mips ~ppc ~x86"
KEYWORDS="amd64 ~mips ppc x86"
VIM_PLUGIN_HELPFILES="${PN}.txt"

@ -1 +1,2 @@
DIST diffchar-6.4.tar.bz2 16824 SHA256 b6d1b21c88119662959263bf717d6559ba38579ffb79a572cf4a6593cbe9ffcc SHA512 aee6ec2225c80306eabc5e18ad1e29ef0a007fb830608ced27e209c26166990354f156f95c210895dcdd7408ff02415be69528fd2062cbb42751a5c5d87aafd7 WHIRLPOOL f65c1fe819c5aaded4a8ff9c1ec775b44f7a7b3059bcee9f9b4b2d352d0a6f9dfaf618060dde5ed80f2d9ed9e20872d1ff85466b2f03853258a15e07deb0242e
DIST diffchar-6.8.tar.bz2 18005 SHA256 4fbdae53dbbbe61cb08e7f72661ae9bc11b8d0aadd156a478cce837eb854bccf SHA512 e32430b0295d60a92b963270ce7d14e956dab99e470257876164e9e9f8c4c55366eb6bdf0eb429f7ba0e63034b67cc48f97eecef1708d9091f2fb9f2c2e3d492 WHIRLPOOL 1bfc7edb666adf37ae14dd3ff0ae378e3445934dee7621969bb461330ffc61ceb221892a377d34c31ce3ec8bde1c60901960e4086e354f357911c33e1b8d7142

@ -0,0 +1,13 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
inherit vim-plugin
DESCRIPTION="vim plugin: highlight the exact differences, based on characters and words"
HOMEPAGE="https://github.com/rickhowe/diffchar.vim http://www.vim.org/scripts/script.php?script_id=4932"
LICENSE="vim.org"
KEYWORDS="~amd64 ~x86"
VIM_PLUGIN_HELPFILES="${PN}.txt"

@ -1,2 +1 @@
DIST gitgutter-20161027.tar.bz2 40930 SHA256 7943ad643d0b015663b7c85e2c247716f9321926f1437e15b8c0ad810ff2f8a9 SHA512 d935dab24530a0562784030e2167e09de374d4f5cb01d77918bc7f97675498bd636a81b42d1e82f1dc34fc70f0d32f824aa6eb9f8baa6582cf22e5d0a0d81098 WHIRLPOOL abcd3449e11d09f81539e579f0bc5a7293701c4d15ccb50a8c2fd7a9d8d9963cf9eeab5776c46c2b84077292e07b131c78088839408441ceca603bf2a238c8c9
DIST gitgutter-20170222.tar.bz2 41819 SHA256 10ff5c0c4fc7c4fca857b98df92f0e94efb43c79b1077aaf7e7c54ea59e08e29 SHA512 970a956a839c2eaa05b699e8507b239d36ad623c40d3d05d9ce82320ec93ae733de2d40619898c5ff43074e2c8f95611b94879424767fac4f2b1fe2747611f4e WHIRLPOOL f201c0edbdf0978f0b48f2caed305343424bd2d97951902a0df9ce6f6c499ae3f0e506dc917a230db5f42c34022b170bb54baa682a2e75805af724b919d1f35c

@ -1,25 +0,0 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
inherit vim-plugin
if [[ ${PV} == 9999* ]]; then
EGIT_REPO_URI="https://github.com/airblade/vim-gitgutter.git"
inherit git-r3
else
KEYWORDS="amd64 x86"
fi
DESCRIPTION="vim plugin: shows a git diff in the sign column and stages/reverts hunks"
HOMEPAGE="https://github.com/airblade/vim-gitgutter/"
LICENSE="MIT"
VIM_PLUGIN_HELPFILES="${PN}.txt"
RDEPEND="dev-vcs/git"
src_prepare() {
default
rm README* screenshot.png || die
rm -rf test || die
}

@ -8,7 +8,7 @@ if [[ ${PV} == 9999* ]]; then
EGIT_REPO_URI="https://github.com/airblade/vim-gitgutter.git"
inherit git-r3
else
KEYWORDS="~amd64 ~x86"
KEYWORDS="amd64 x86"
fi
DESCRIPTION="vim plugin: shows a git diff in the sign column and stages/reverts hunks"

@ -1 +1,2 @@
DIST gitlog-5.1.0.tar.gz 29684 SHA256 7305176d205635479a4373349ae4e3115e4f9f8f20d2ce7c8ea74da6d3c058b1 SHA512 1c2bd363ce5341fcdaa80955af350084903da7e7cac1e20583d05f8812ef11e562137e2ef3bd198f787a6cc1e322f7d942135341c27186a7c987cd9d631a0eeb WHIRLPOOL 577d8b598b44216beaa2bf95e43f313f0fb88981cae8701b39fb99dc54d2ce874818cdee8cf725f4bb059317283ffe6ffeca521e5aa5e42fd5eba9d8d4eaaf81
DIST gitlog-6.0.0.tar.gz 33956 SHA256 ff64dfc23278e45d8d5ae9a92f4785675db8caff1fbe303ec598f54b3d93304a SHA512 17016057df69b22e72548d00bd8c253ace864f0551890f64e6b9a91c1411b1e0a479d6c04028583edf9f9c366418b50b758f60d197fe0a62a75c7799b68a4069 WHIRLPOOL 15598129669f02afb5b1be24490733b0856132392d1fbd84f64774d64c9473a5adf8a202b836a665912ca331b453009d5e3b798b470c9b4363d7e1d50d32bbb5

@ -0,0 +1,21 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
inherit vim-plugin
if [[ ${PV} == "9999" ]] ; then
EGIT_REPO_URI="https://github.com/PAntoine/vimgitlog.git"
inherit git-r3
else
SRC_URI="https://github.com/PAntoine/vimgitlog/archive/version_${PV}.tar.gz -> ${P}.tar.gz"
KEYWORDS="~amd64 ~x86"
S=${WORKDIR}/vim${PN}-version_${PV}
fi
DESCRIPTION="vim plugin: git log and diff plugin for vim"
HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=4294 https://github.com/PAntoine/vimgitlog/"
LICENSE="Artistic"
VIM_PLUGIN_HELPFILES="${PN}.txt"

@ -0,0 +1,21 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
inherit vim-plugin
if [[ ${PV} == "9999" ]] ; then
EGIT_REPO_URI="https://github.com/PAntoine/vimgitlog.git"
inherit git-r3
else
SRC_URI="https://github.com/PAntoine/vimgitlog/archive/version_${PV}.tar.gz -> ${P}.tar.gz"
KEYWORDS="~amd64 ~x86"
S=${WORKDIR}/vim${PN}-version_${PV}
fi
DESCRIPTION="vim plugin: git log and diff plugin for vim"
HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=4294 https://github.com/PAntoine/vimgitlog/"
LICENSE="Artistic"
VIM_PLUGIN_HELPFILES="${PN}.txt"

@ -1 +1,2 @@
DIST gitv-1.3.1.tar.gz 553719 SHA256 ad65999e64d1924a6c540efe7a3adebb949cf30be2dcb23a3ce41175ed21170c SHA512 e6a6773dcac18fdc36c891bd592d4dcb2eb20af6253df5886582fd223e040fb8296dc606d4fb25abd7a14f9dc1a712fe0e354821e234c8f54b1b5914af55dcbc WHIRLPOOL a200640371fce5a2af8be014b08a578a8e555a8b1a1ac1db138fe0f08cf8ffe4e36e24080043b61448f4653b0dc5d2df26ae56ec937219bb69b7159bb6e825d6
DIST gitv-1.3.tar.gz 21319 SHA256 6533196f9f2688846c7f4035ab1af82713f5e0e4aaf5c18335fa5007e0ad6555 SHA512 1a13d98ae9dd3e50a559d98881b6b0a8150186573e8f9fcdd9bd5cfdba1a679ea1c02b57f7d7be712dbfb5ec1bffbc4c0e8e1330cd64acf095c88400c499bfaf WHIRLPOOL 7c99b3e697c1e92ae829ad75a85ff2c777014420ed986a93d9d23a7df96af082d0c8c8a35949b1075fcbf8a754c203dd3055e787df075352f9d0fcafce199257

@ -0,0 +1,28 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
inherit vim-plugin
if [[ ${PV} == 9999 ]]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/gregsexton/gitv.git"
else
SRC_URI="https://github.com/gregsexton/gitv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
KEYWORDS="~amd64 ~x86 ~ppc-macos"
fi
DESCRIPTION="vim plugin: gitk for vim"
HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=3574 https://github.com/gregsexton/gitv/"
LICENSE="vim"
VIM_PLUGIN_HELPFILES="gitv"
RDEPEND="dev-vcs/git
app-vim/fugitive"
src_prepare() {
rm -f doc/tags addon-info.json roadmap.md || die
rm -r img || die
default
}

@ -1,7 +1,7 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
EAPI=6
inherit vim-plugin
if [[ ${PV} == 9999 ]]; then
@ -20,3 +20,9 @@ VIM_PLUGIN_HELPFILES="gitv"
RDEPEND="dev-vcs/git
app-vim/fugitive"
src_prepare() {
rm -f doc/tags addon-info.json roadmap.md || die
rm -r img || die
default
}

@ -0,0 +1,31 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
inherit vim-plugin
MY_PN=vim-${PN}
MY_P=${MY_PN}-${PV}
if [[ ${PV} == "9999" ]] ; then
EGIT_REPO_URI="https://github.com/idanarye/${MY_PN}.git"
inherit git-r3
else
SRC_URI="https://github.com/idanarye/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
KEYWORDS="~amd64 ~x86"
S="${WORKDIR}/${MY_P}"
fi
DESCRIPTION="vim script: fugitive extension to manage and merge git branches"
HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=4955 https://github.com/idanarye/vim-merginal/"
LICENSE="vim"
RDEPEND="app-vim/fugitive"
VIM_PLUGIN_HELPFILES="${PN}"
src_prepare() {
rm README.md || die
default
}

@ -1 +1,2 @@
DIST nerdcommenter-2.4.0.tar.gz 34755 SHA256 cb2c14c8c002fd5db5bcb126a836c5057537f4e4efeb229232a742433140ac51 SHA512 ec389cd3f6f1f2093debe2e2d5a09573324d9f8459b4f6c3528bf7b46f9b84fad08718e140be6d39bb8c990778de89fda7f9bb06704c1ea6ff319e6ac431fcdd WHIRLPOOL 511b70b1a04be7f6a1e58884369fae3868d90214a6f542dd542bc539bc624141ddacec15ba28aa7a6af804442de56bd0b48d434903253d098af9dae657332e58
DIST nerdcommenter-2.5.0.tar.gz 36834 SHA256 c6611cd24cf7c9c9aee49f14f6060495c39d29e69030d5dbdc1525d6ba2b6ac7 SHA512 8616f56d90dfe2fece0a82b888700c4c762c75b7d1cd30e32a3294d1fe7b65d506a13cfead534ae0f11a2384593d246a723e9a0042421691a5d6fb44969e7ead WHIRLPOOL 88e1b2fd26e1598c411e482cb4e0969a33829d361031efa280ee896ed45f2892aa6198333cd802f8a24bdd75dd1840e3e5e69731b4f3fac37dd11cd2c47a6bc0

@ -0,0 +1,25 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
inherit vim-plugin
if [[ ${PV} == "9999" ]] ; then
EGIT_REPO_URI="https://github.com/scrooloose/nerdcommenter.git"
inherit git-r3
else
SRC_URI="https://github.com/scrooloose/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
KEYWORDS="~amd64 ~x86 ~x86-linux ~x86-macos ~sparc64-solaris"
fi
DESCRIPTION="vim plugin: easy commenting of code for many filetypes"
HOMEPAGE="https://github.com/scrooloose/nerdcommenter http://www.vim.org/scripts/script.php?script_id=1218"
LICENSE="WTFPL-2 "
VIM_PLUGIN_HELPFILES="NERD_commenter.txt"
src_prepare() {
default
rm README.md Rakefile || die
}

@ -0,0 +1,25 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
inherit vim-plugin
if [[ ${PV} == "9999" ]] ; then
EGIT_REPO_URI="https://github.com/scrooloose/nerdcommenter.git"
inherit git-r3
else
SRC_URI="https://github.com/scrooloose/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
KEYWORDS="~amd64 ~x86 ~x86-linux ~x86-macos ~sparc64-solaris"
fi
DESCRIPTION="vim plugin: easy commenting of code for many filetypes"
HOMEPAGE="https://github.com/scrooloose/nerdcommenter http://www.vim.org/scripts/script.php?script_id=1218"
LICENSE="WTFPL-2 "
VIM_PLUGIN_HELPFILES="NERD_commenter.txt"
src_prepare() {
default
rm README.md Rakefile || die
}

@ -0,0 +1,25 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
inherit vim-plugin
if [[ ${PV} == "9999" ]] ; then
EGIT_REPO_URI="https://github.com/scrooloose/nerdtree.git"
inherit git-r3
else
SRC_URI="https://github.com/scrooloose/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
KEYWORDS="~amd64 ~x86 ~x64-macos"
fi
DESCRIPTION="vim plugin: A tree explorer plugin for navigating the filesystem"
HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=1658 https://github.com/scrooloose/nerdtree"
LICENSE="WTFPL-2"
VIM_PLUGIN_HELPFILES="NERD_tree"
src_prepare() {
rm LICENCE screenshot.png || die
default
}

@ -0,0 +1 @@
DIST vim-hoogle-1.3.tar.gz 3337 SHA256 e1a9b3d9f0741cec04d59cc8ce7806a0e801236e4f25b06d508270bd3b01d2a4 SHA512 ea0d2b723e913836dbff5947e7de4fb5dda19ab1d3bd51cd315b28499f1b6c771b037b16eec6a88862d27f675a9ddac11eb5d8d5a5b3ee3e2eeb7620ed4d565a WHIRLPOOL 641109deddbde97f4d31e3542256e392f72845239f235710b877bad06efd2af9ec9e3718ba7797f01bd8b8c461bef7491a195a3695e773c0a1b9744a52fae1d4

@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>vim@gentoo.org</email>
<name>Gentoo Vim Project</name>
</maintainer>
<upstream>
<remote-id type="github">Twinside/vim-hoogle</remote-id>
</upstream>
</pkgmetadata>

@ -0,0 +1,16 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
inherit vim-plugin
MASTER_COMMIT_HASH="31823f830843385f53a3da7a5bfaf678494383c4"
DESCRIPTION="vim plugin: use hoogle within vim"
HOMEPAGE="https://github.com/Twinside/vim-hoogle"
SRC_URI="https://github.com/Twinside/${PN}/archive/${MASTER_COMMIT_HASH}.tar.gz -> ${P}.tar.gz"
LICENSE="vim.org"
KEYWORDS="~amd64 ~x86"
S="${WORKDIR}/${PN}-${MASTER_COMMIT_HASH}"

@ -1 +1,2 @@
DIST vimagit-1.7.1.tar.gz 35302 SHA256 96b61af002f31f1a73bb67ced06e8aced696e6c9539f0d5be9f25c469f1a16c4 SHA512 8ce2959c135da90b880ccdcd66e71661c7908f250d47a24ede025762a6e9422cebcf8fd516bf99e475605f4278e232713c66293781ceb95f47a22031e9260a71 WHIRLPOOL 8331ab3736017b8930934e8661002edf3d24efe92032f7e0656338ae44f21b02037a9673f91e6733b4ef09b15a75b413419b91a656a54224317d5aba24aa1f9d
DIST vimagit-1.7.2.tar.gz 37398 SHA256 bac4b3b3e91815699ae34374874e2fd181f31108f8dd4be6c434d79c8eb462d5 SHA512 8b825da4b411732db022b1a3f25f6f779ba5e58df5ca4d404e985b16a4811f911c626674f1a7f4a285d78369f4c7ad3a33b7ffa2b50f1a4a94372a3c5fb29a15 WHIRLPOOL e1376e9fd3652812a963eb94840022a513ef2ef563ad81329e601db956c40ccdb18d2ecfc2d3995aef4648768ade73883c9c0f4cc35b712e102e18ec812aba24

@ -0,0 +1,25 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
inherit vim-plugin
if [[ ${PV} == 9999* ]] ; then
inherit git-r3
EGIT_REPO_URI="https://github.com/jreybert/vimagit.git"
else
SRC_URI="https://github.com/jreybert/vimagit/archive/${PV}.tar.gz -> ${P}.tar.gz"
KEYWORDS="~amd64 ~x86"
fi
DESCRIPTION="vim plugin: ease your git workflow within vim"
HOMEPAGE="https://github.com/jreybert/vimagit"
LICENSE="vim"
VIM_PLUGIN_HELPFILES="${PN}"
RDEPEND="dev-vcs/git"
src_prepare() {
rm _config.yml || die
default
}

@ -18,3 +18,8 @@ LICENSE="vim"
VIM_PLUGIN_HELPFILES="${PN}"
RDEPEND="dev-vcs/git"
src_prepare() {
rm _config.yml || die
default
}

@ -16,7 +16,7 @@ inherit mysql-multilib-r1
IUSE="$IUSE"
# REMEMBER: also update eclass/mysql*.eclass before committing!
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )"
RDEPEND="${RDEPEND}"

@ -2,3 +2,4 @@ DIST redis-3.0.7.tar.gz 1375200 SHA256 b2a791c4ea3bb7268795c45c6321ea5abcc244571
DIST redis-3.2.5.tar.gz 1544040 SHA256 8509ceb1efd849d6b2346a72a8e926b5a4f6ed3cc7c3cd8d9f36b2e9ba085315 SHA512 4ecf6277c8fdf4411223b9f5a5c8308829da9bd756b45de5217d469e9def8faad8c05b6348c06aef99eca9245d45abfd52df056c3c819723da66a2ca20c381dd WHIRLPOOL db1eecac5e407734002d39cc16f708fcb1f506829df4dabda53bffc7012746a23ea2342cded4d90f39db72ba61eda349b80b4a3e4f1eba06dbaa6cad8c50264e
DIST redis-3.2.6.tar.gz 1544806 SHA256 2e1831c5a315e400d72bda4beaa98c0cfbe3f4eb8b20c269371634390cf729fa SHA512 15f2e55a7cc56e7e652a3a8d344fceb6d0d33cf53caa81854e6b1977ec68f7e92ac06d0d66999bfc577f185eba19e0927a81014bdb5cd484eecb080b6a6e16bc WHIRLPOOL a3dd92e565cdfbc65bfccd452efde8fc4124ede1133ca74a30c69f68eb5021b5fb1bbc7dc30d3ea9993c42bc9c4ce2716564329bd5be142a5764a9ab807a9d14
DIST redis-3.2.8.tar.gz 1547237 SHA256 61b373c23d18e6cc752a69d5ab7f676c6216dc2853e46750a8c4ed791d68482c SHA512 7334faf73af3644f7f9dcaddd322955d5df1e88a1640b509ae623f322615a20f6dc143eb57dd89ff3a278557df309ac4215c3fb458235682ce28e16c817068ba WHIRLPOOL 50ffecd1891051a3e28028065bfaf090b2eec42a757cdf61c6d22b051c8ba4fc78809b3198182d2333bedb4715d9a8d70bf04f605030abe6e33cc6b9b7161cf7
DIST redis-4.0.1.tar.gz 1711660 SHA256 2049cd6ae9167f258705081a6ef23bb80b7eff9ff3d0d7481e89510f27457591 SHA512 62dec537aebd12340b9642f5f8b07fd98757c9e648dcd539a0411f207db3495923c5a6a9941036c56b2d574ee38b46d08558668111e322345ef549f93fada26f WHIRLPOOL 90b6a7a81e6d5302a28c49a8a1ea479f80f7924eb2f69d0b17d48cf15c9ba769a8ef425ae9bec44d3cbd81816b43fe7997adeb73caa6d2b64f7657e60cb2fb82

@ -0,0 +1,32 @@
diff --git a/src/Makefile b/src/Makefile
index 86e0b3fe..c7db0ee9 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -29,14 +29,7 @@ INSTALL_BIN=$(PREFIX)/bin
INSTALL=install
# Default allocator defaults to Jemalloc if it's not an ARM
-MALLOC=libc
-ifneq ($(uname_M),armv6l)
-ifneq ($(uname_M),armv7l)
-ifeq ($(uname_S),Linux)
- MALLOC=jemalloc
-endif
-endif
-endif
+MALLOC?=jemalloc
# To get ARM stack traces if Redis crashes we need a special C flag.
ifneq (,$(findstring armv,$(uname_M)))
@@ -120,9 +113,8 @@ ifeq ($(MALLOC),tcmalloc_minimal)
endif
ifeq ($(MALLOC),jemalloc)
- DEPENDENCY_TARGETS+= jemalloc
- FINAL_CFLAGS+= -DUSE_JEMALLOC -I../deps/jemalloc/include
- FINAL_LIBS+= ../deps/jemalloc/lib/libjemalloc.a
+ FINAL_CFLAGS+= -DUSE_JEMALLOC -DJEMALLOC_NO_DEMANGLE
+ FINAL_LIBS+= -ljemalloc -ldl
endif
REDIS_CC=$(QUIET_CC)$(CC) $(FINAL_CFLAGS)

@ -0,0 +1,60 @@
diff --git a/deps/lua/src/lua_cjson.c b/deps/lua/src/lua_cjson.c
index c26c0d7b..fa50c410 100644
--- a/deps/lua/src/lua_cjson.c
+++ b/deps/lua/src/lua_cjson.c
@@ -46,7 +46,7 @@
#include "strbuf.h"
#include "fpconv.h"
-#include "../../../src/solarisfixes.h"
+#include "solarisfixes.h"
#ifndef CJSON_MODNAME
#define CJSON_MODNAME "cjson"
diff --git a/src/Makefile b/src/Makefile
index 86e0b3fe..09630321 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -16,7 +16,7 @@ release_hdr := $(shell sh -c './mkreleasehdr.sh')
uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not')
uname_M := $(shell sh -c 'uname -m 2>/dev/null || echo not')
OPTIMIZATION?=-O2
-DEPENDENCY_TARGETS=hiredis linenoise lua
+DEPENDENCY_TARGETS=hiredis linenoise
NODEPS:=clean distclean
# Default settings
@@ -66,6 +66,7 @@ endif
FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(REDIS_CFLAGS)
FINAL_LDFLAGS=$(LDFLAGS) $(REDIS_LDFLAGS) $(DEBUG)
FINAL_LIBS=-lm
+FINAL_LIBS+=@LUA_LIBS@
DEBUG=-g -ggdb
ifeq ($(uname_S),SunOS)
@@ -107,7 +108,7 @@ endif
endif
endif
# Include paths to dependencies
-FINAL_CFLAGS+= -I../deps/hiredis -I../deps/linenoise -I../deps/lua/src
+FINAL_CFLAGS+= -I../deps/hiredis -I../deps/linenoise @LUA_CFLAGS@
ifeq ($(MALLOC),tcmalloc)
FINAL_CFLAGS+= -DUSE_TCMALLOC
@@ -145,6 +146,7 @@ endif
REDIS_SERVER_NAME=redis-server
REDIS_SENTINEL_NAME=redis-sentinel
REDIS_SERVER_OBJ=adlist.o quicklist.o ae.o anet.o dict.o server.o sds.o zmalloc.o lzf_c.o lzf_d.o pqsort.o zipmap.o sha1.o ziplist.o release.o networking.o util.o object.o db.o replication.o rdb.o t_string.o t_list.o t_set.o t_zset.o t_hash.o config.o aof.o pubsub.o multi.o debug.o sort.o intset.o syncio.o cluster.o crc16.o endianconv.o slowlog.o scripting.o bio.o rio.o rand.o memtest.o crc64.o bitops.o sentinel.o notify.o setproctitle.o blocked.o hyperloglog.o latency.o sparkline.o redis-check-rdb.o redis-check-aof.o geo.o lazyfree.o module.o evict.o expire.o geohash.o geohash_helper.o childinfo.o defrag.o siphash.o rax.o
+REDIS_SERVER_OBJ+=fpconv.o strbuf.o lua_bit.o lua_cjson.o lua_cmsgpack.o lua_struct.o
REDIS_CLI_NAME=redis-cli
REDIS_CLI_OBJ=anet.o adlist.o redis-cli.o zmalloc.o release.o anet.o ae.o crc64.o
REDIS_BENCHMARK_NAME=redis-benchmark
@@ -196,7 +198,7 @@ endif
# redis-server
$(REDIS_SERVER_NAME): $(REDIS_SERVER_OBJ)
- $(REDIS_LD) -o $@ $^ ../deps/hiredis/libhiredis.a ../deps/lua/src/liblua.a $(FINAL_LIBS)
+ $(REDIS_LD) -o $@ $^ ../deps/hiredis/libhiredis.a $(FINAL_LIBS)
# redis-sentinel
$(REDIS_SENTINEL_NAME): $(REDIS_SERVER_NAME)

@ -0,0 +1,128 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
inherit autotools eutils flag-o-matic systemd toolchain-funcs user
DESCRIPTION="A persistent caching system, key-value and data structures database"
HOMEPAGE="http://redis.io/"
SRC_URI="http://download.redis.io/releases/${P}.tar.gz"
LICENSE="BSD"
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
IUSE="+jemalloc tcmalloc luajit test"
SLOT="0"
# Does NOT build with Lua 5.2 or newer at this time.
RDEPEND="luajit? ( dev-lang/luajit:2 )
!luajit? ( || ( dev-lang/lua:5.1 =dev-lang/lua-5.1*:0 ) )
tcmalloc? ( dev-util/google-perftools )
jemalloc? ( >=dev-libs/jemalloc-3.2 )"
DEPEND="virtual/pkgconfig
>=sys-devel/autoconf-2.63
test? ( dev-lang/tcl:0= )
${RDEPEND}"
REQUIRED_USE="?? ( tcmalloc jemalloc )"
S="${WORKDIR}/${PN}-${PV/_/-}"
pkg_setup() {
enewgroup redis 75
enewuser redis 75 -1 /var/lib/redis redis
}
src_prepare() {
epatch \
"${FILESDIR}"/${PN}-4.0.1-shared.patch \
"${FILESDIR}"/${PN}-3.2.3-config.patch \
"${FILESDIR}"/${PN}-4.0.1-sharedlua.patch
eapply_user
# Copy lua modules into build dir
cp "${S}"/deps/lua/src/{fpconv,lua_bit,lua_cjson,lua_cmsgpack,lua_struct,strbuf}.c "${S}"/src || die
cp "${S}"/deps/lua/src/{fpconv,strbuf}.h "${S}"/src || die
# Append cflag for lua_cjson
# https://github.com/antirez/redis/commit/4fdcd213#diff-3ba529ae517f6b57803af0502f52a40bL61
append-cflags "-DENABLE_CJSON_GLOBAL"
# now we will rewrite present Makefiles
local makefiles=""
for MKF in $(find -name 'Makefile' | cut -b 3-); do
mv "${MKF}" "${MKF}.in"
sed -i -e 's:$(CC):@CC@:g' \
-e 's:$(CFLAGS):@AM_CFLAGS@:g' \
-e 's: $(DEBUG)::g' \
-e 's:$(OBJARCH)::g' \
-e 's:ARCH:TARCH:g' \
-e '/^CCOPT=/s:$: $(LDFLAGS):g' \
"${MKF}.in" \
|| die "Sed failed for ${MKF}"
makefiles+=" ${MKF}"
done
# autodetection of compiler and settings; generates the modified Makefiles
cp "${FILESDIR}"/configure.ac-3.2 configure.ac
# Use the correct pkgconfig name for Lua
has_version 'dev-lang/lua:5.1' \
&& LUAPKGCONFIG=lua5.1 \
|| LUAPKGCONFIG=lua
sed -i \
-e "/^AC_INIT/s|, [0-9].+, |, $PV, |" \
-e "s:AC_CONFIG_FILES(\[Makefile\]):AC_CONFIG_FILES([${makefiles}]):g" \
-e "/PKG_CHECK_MODULES.*\<LUA\>/s,lua5.1,${LUAPKGCONFIG},g" \
configure.ac || die "Sed failed for configure.ac"
eautoreconf
}
src_configure() {
econf \
$(use_with luajit)
# Linenoise can't be built with -std=c99, see https://bugs.gentoo.org/451164
# also, don't define ANSI/c99 for lua twice
sed -i -e "s:-std=c99::g" deps/linenoise/Makefile deps/Makefile || die
}
src_compile() {
tc-export CC AR RANLIB
local myconf=""
if use tcmalloc ; then
myconf="${myconf} USE_TCMALLOC=yes"
elif use jemalloc ; then
myconf="${myconf} JEMALLOC_SHARED=yes"
else
myconf="${myconf} MALLOC=yes"
fi
emake ${myconf} V=1 CC="${CC}" AR="${AR} rcu" RANLIB="${RANLIB}"
}
src_install() {
insinto /etc/
doins redis.conf sentinel.conf
use prefix || fowners redis:redis /etc/{redis,sentinel}.conf
fperms 0644 /etc/{redis,sentinel}.conf
newconfd "${FILESDIR}/redis.confd" redis
newinitd "${FILESDIR}/redis.initd-4" redis
systemd_newunit "${FILESDIR}/redis.service-2" redis.service
systemd_newtmpfilesd "${FILESDIR}/redis.tmpfiles" redis.conf
dodoc 00-RELEASENOTES BUGS CONTRIBUTING MANIFESTO README.md
dobin src/redis-cli
dosbin src/redis-benchmark src/redis-server src/redis-check-aof src/redis-check-rdb
fperms 0750 /usr/sbin/redis-benchmark
dosym /usr/sbin/redis-server /usr/sbin/redis-sentinel
if use prefix; then
diropts -m0750
else
diropts -m0750 -o redis -g redis
fi
keepdir /var/{log,lib}/redis
}

@ -0,0 +1,122 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
inherit autotools eutils flag-o-matic systemd toolchain-funcs user
DESCRIPTION="A persistent caching system, key-value and data structures database"
HOMEPAGE="http://redis.io/"
SRC_URI="http://download.redis.io/releases/${P}.tar.gz"
LICENSE="BSD"
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
IUSE="+jemalloc tcmalloc luajit test"
SLOT="0"
RDEPEND="luajit? ( dev-lang/luajit:2 )
!luajit? ( >=dev-lang/lua-5.1:* )
tcmalloc? ( dev-util/google-perftools )
jemalloc? ( >=dev-libs/jemalloc-3.2 )"
DEPEND="virtual/pkgconfig
>=sys-devel/autoconf-2.63
test? ( dev-lang/tcl:0= )
${RDEPEND}"
REQUIRED_USE="?? ( tcmalloc jemalloc )"
S="${WORKDIR}/${PN}-${PV/_/-}"
pkg_setup() {
enewgroup redis 75
enewuser redis 75 -1 /var/lib/redis redis
}
src_prepare() {
epatch \
"${FILESDIR}"/${PN}-4.0.1-shared.patch \
"${FILESDIR}"/${PN}-3.2.3-config.patch \
"${FILESDIR}"/${PN}-4.0.1-sharedlua.patch
eapply_user
# Copy lua modules into build dir
cp "${S}"/deps/lua/src/{fpconv,lua_bit,lua_cjson,lua_cmsgpack,lua_struct,strbuf}.c "${S}"/src || die
cp "${S}"/deps/lua/src/{fpconv,strbuf}.h "${S}"/src || die
# Append cflag for lua_cjson
# https://github.com/antirez/redis/commit/4fdcd213#diff-3ba529ae517f6b57803af0502f52a40bL61
append-cflags "-DENABLE_CJSON_GLOBAL"
# now we will rewrite present Makefiles
local makefiles=""
for MKF in $(find -name 'Makefile' | cut -b 3-); do
mv "${MKF}" "${MKF}.in"
sed -i -e 's:$(CC):@CC@:g' \
-e 's:$(CFLAGS):@AM_CFLAGS@:g' \
-e 's: $(DEBUG)::g' \
-e 's:$(OBJARCH)::g' \
-e 's:ARCH:TARCH:g' \
-e '/^CCOPT=/s:$: $(LDFLAGS):g' \
"${MKF}.in" \
|| die "Sed failed for ${MKF}"
makefiles+=" ${MKF}"
done
# autodetection of compiler and settings; generates the modified Makefiles
cp "${FILESDIR}"/configure.ac-3.2 configure.ac
sed -i \
-e "/^AC_INIT/s|, [0-9].+, |, $PV, |" \
-e "s:AC_CONFIG_FILES(\[Makefile\]):AC_CONFIG_FILES([${makefiles}]):g" \
-e "/PKG_CHECK_MODULES.*\<LUA\>/s,lua5.1,lua,g" \
configure.ac || die "Sed failed for configure.ac"
eautoreconf
}
src_configure() {
econf \
$(use_with luajit)
# Linenoise can't be built with -std=c99, see https://bugs.gentoo.org/451164
# also, don't define ANSI/c99 for lua twice
sed -i -e "s:-std=c99::g" deps/linenoise/Makefile deps/Makefile || die
}
src_compile() {
tc-export CC AR RANLIB
local myconf=""
if use tcmalloc ; then
myconf="${myconf} USE_TCMALLOC=yes"
elif use jemalloc ; then
myconf="${myconf} JEMALLOC_SHARED=yes"
else
myconf="${myconf} MALLOC=yes"
fi
emake ${myconf} V=1 CC="${CC}" AR="${AR} rcu" RANLIB="${RANLIB}"
}
src_install() {
insinto /etc/
doins redis.conf sentinel.conf
use prefix || fowners redis:redis /etc/{redis,sentinel}.conf
fperms 0644 /etc/{redis,sentinel}.conf
newconfd "${FILESDIR}/redis.confd" redis
newinitd "${FILESDIR}/redis.initd-4" redis
systemd_newunit "${FILESDIR}/redis.service-2" redis.service
systemd_newtmpfilesd "${FILESDIR}/redis.tmpfiles" redis.conf
dodoc 00-RELEASENOTES BUGS CONTRIBUTING MANIFESTO README.md
dobin src/redis-cli
dosbin src/redis-benchmark src/redis-server src/redis-check-aof src/redis-check-rdb
fperms 0750 /usr/sbin/redis-benchmark
dosym /usr/sbin/redis-server /usr/sbin/redis-sentinel
if use prefix; then
diropts -m0750
else
diropts -m0750 -o redis -g redis
fi
keepdir /var/{log,lib}/redis
}

@ -6,6 +6,7 @@ DIST apache-tomcat-6.0.45-src.tar.gz 3494054 SHA256 d464b3e770197f026bf802d19be0
DIST apache-tomcat-6.0.53-src.tar.gz 3522914 SHA256 0392a1d04554c91b8efc3c62becbda634de2031f0366925378047062a2098d30 SHA512 915a0a18f5c2883625c9441eed6465973eff4f6bf41e08e925c7edaea89ef8f6ee9476d3e06fa38228d4bcb4decaf53e3a7bdb7ec7e899e6250db3e12a9f5f2c WHIRLPOOL 1892d71346e9261afabe5a42ee961c9b61379ac17a91d98da5dda8136aedb406c57cb42ba2fa1b7e35d1cf142d7132456a065fbdf34a35452462bb7140fce675
DIST apache-tomcat-7.0.77-src.tar.gz 4664884 SHA256 7db04b3bf8898d9f9facee9c53ae7a2c78f13dfd4d14e931d78cee2d0813cc43 SHA512 19507de7f499df7269d8f819c30dc8194528555e9d6d430dad4b7ff3dc0c5c865d432eaef75bb2c157170cc5ebf76da5884296bf4e089c118448088a46f5e428 WHIRLPOOL c17fe412d5c1db530287111624dbebfffe100639cd4bbc78be8e7e5b9be130ac23dd2978bbababd2981c1c91c00570f80e05b34e505af9a49646835334867bc6
DIST apache-tomcat-7.0.79-src.tar.gz 4682119 SHA256 b5373951afe41ffd27348bb57cff80bc7d86a5669bdedb0b4bbe1d567009dc32 SHA512 75c29fd7de8c245502cae4db845a508f320739625d726fe892924b639e7333b76b3446f36cb67b9ad9500e95823b5eadaf056c4cb6bea962a59eb5491696e0b2 WHIRLPOOL 5db799cfbd061a199270b0ebb971c4fe43632522a23f590b7a46e021af5c8b0bce4a711e16bd0416b5baa6f2556cf8178bf14abadf4d493ece44c9eb2c4cdae2
DIST apache-tomcat-7.0.81-src.tar.gz 4689428 SHA256 fca79afb210cfbc8f9ebcdebdd048ecb7ea370ac0f94040cbcc0287fe5d85e66 SHA512 25e237aa7189cf9a9617badf8936fd7ec64550bcac3bab2e2afe51d5e199eddfe17e0d6d27ac7ebf3543d1601467fcd8362ddf9a5b708c50b223d7c8d18bbb3b WHIRLPOOL 1016a02b4a30b7e02eb2f7fad3080153012dd3e3f84df34d006c89bc2c89b7b3d370334800170008482d3dbf339c62f249064eb48ab24ca17588026ba515d487
DIST apache-tomcat-8.0.43-src.tar.gz 4962788 SHA256 5ca1feb8ae5bd637a379ed409300fac0d463a8ec878d60f1ca54d3e7f2013f43 SHA512 aa15046ba3404c206b7983f42837d30debca69b18b85345d1376a853ad6e9fb5c0cbf42732f835779b10d39e2eae77f6d1688dadc5280b50236bf3432e251e9b WHIRLPOOL d1517c25b56a2ef4dd41977daf4ab5639b991ce38b6f5279a4e09f9232d73625be623beb678de8b3ec4e718cb50284cbebae67726622699738ad28be6d735414
DIST apache-tomcat-8.0.45-src.tar.gz 4978313 SHA256 450fd2890b12e56692cb203f95651f9a873dce056b7b4362e142bc817032b291 SHA512 80e4281f5b6e4d6bf607179840bc6cb923ea9f57ec8231a451c3b5a1f8938f72ec1097290059afba0ef7b56edeb56d63636849517b69b91c7093cb15ff0eaa04 WHIRLPOOL c893cd5c26637f8881c19353e269145e33fa11e02eb10ef93a41590ad2e1e6c6ffa1b3f6c3c7c318630765f666be07447fd3a21c70c2c381e75c458b60383ea0
DIST apache-tomcat-8.5.11-src.tar.gz 4996153 SHA256 81fb94243600d950375c4622f76b39c06c5615b7a8a6f70d387ea249bed1dddf SHA512 d1a9513535773805c26825f8843fa502e044c9f1ccc22176db5418a7a0abb6d1bcff3db401b449a5867065359abbc8277d14085d807fe00c95dd267d9091620d WHIRLPOOL 41ff9daec144c2481d3bb7a49bcd071eb2d21b34c11356a9911a139b404779971c31282f73b7b336b7e02d16156749e8e816dca8d5c727ef871ff0216577398d

@ -0,0 +1,38 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
JAVA_PKG_IUSE="source"
inherit eutils java-pkg-2 java-ant-2
MY_A="apache-${P}-src"
MY_P="${MY_A/-servlet-api/}"
DESCRIPTION="Tomcat's Servlet API 3.0/JSP API 2.2 implementation"
HOMEPAGE="http://tomcat.apache.org/"
SRC_URI="mirror://apache/tomcat/tomcat-7/v${PV}/src/${MY_P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="3.0"
KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND=">=virtual/jdk-1.6"
RDEPEND=">=virtual/jre-1.6"
S="${WORKDIR}/${MY_P}/"
src_prepare() {
default
cp "${FILESDIR}/${SLOT}-build.xml" build.xml || die "Could not replace build.xml"
rm -fR */*/build.xml ||die
java-pkg_clean
java-pkg-2_src_prepare
}
src_install() {
java-pkg_dojar "${S}"/output/build/lib/*.jar
use source && java-pkg_dosrc java/javax/servlet/
}

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save