gentoo resync : 09.03.2018

11 files changed, 74 insertions, 17 deletions

diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index 99a2973ebd5b..3cd06512f09e 100644
--- a/app-portage/Manifest.gz
+++ b/app-portage/Manifest.gz
diff --git a/app-portage/eix/Manifest b/app-portage/eix/Manifest
index 63dc117df4e3..7a9ef23b2ced 100644
--- a/app-portage/eix/Manifest
+++ b/app-portage/eix/Manifest
@@ -3,5 +3,5 @@ DIST eix-0.33.0.tar.xz 610600 BLAKE2B 484d70c3efcceebf54f2a2e0af69b701716d6c6c45
 DIST eix-0.33.2.tar.xz 614192 BLAKE2B dcbbdb9b9ccf6f780d89c791c34cc588700720b7f015fb0db7ea86dd78a383892266b0e96c49282fdea58e78293c69e8acc153cea631443c35d3ee29dd4c016f SHA512 28ca4cc57e5c7ef81feb37fa90d598e681e192c442c7446c93a442908d2a9744340f7a93c71135ec3083fb85c48a65638c8929b6e1e632464132f4320225d637
 EBUILD eix-0.32.9.ebuild 2897 BLAKE2B 25b666ca91a0d72d8a58d610e7162194a81fb3010f0c8475b0fd66ad2354bc420063080843df75aef7f1a331ecc3329b9f8c1665464c39014cb7609d1b88a770 SHA512 528cdba7e083e90458390c08a85ff790c242cc4d371572ebf5459b5c37f9676d1e3a6df5cfba3c558347d4f94454c7ef9254256c00cea57edfd41b5a0dee7a01
 EBUILD eix-0.33.0-r1.ebuild 2803 BLAKE2B d6f6529df6b609003e9c5b49e9c732e8bbedec446936d4b53b13c45b69df03b7a5ee830d3c9dd8c7e450543129bb9e61bc8e2cf839c11cfd079bc2722918b5ca SHA512 31bcf38358758e013484fb86b43bfee405d51361bc0df1162044085c724a8eb1f98184469038f20579069e5cc3e86352cc25515858747af2e1758b0148d26a8b
-EBUILD eix-0.33.2.ebuild 2844 BLAKE2B 68bcf7f48fef57dd878b94123641d09bb8819dc9baef1fa5f6d4f6bfbd128e064e721d9c330c188ab603ccd181377f8031b52e3be249fbb019a077adb62cf4db SHA512 2bbe8fd4e4dfb6eae49a1dc50ad78f2030a91e59e061620c6e094c6bafbde6b5dc80c7e68abc14f997b2c10def2ab4395269449a3c6e7cc7e112b51db2487d24
-MISC metadata.xml 1077 BLAKE2B acb9def7c56fcb8ec8be4960fb583000bae7ec6d7e974045588d4e0a6d5c6056cb16de31256fd1cf06828f0058c9251e88e50c70632b9cfa16e04ac7eed01e22 SHA512 a1bd36f9e321f87136b2b0e41bcb24b652354e7ade0806b16534841fa3dc3a964b442a8c91319a6506d35a29bfccde1137101bad896f55d1ad0cf26a17d0928f
+EBUILD eix-0.33.2.ebuild 2803 BLAKE2B d6f6529df6b609003e9c5b49e9c732e8bbedec446936d4b53b13c45b69df03b7a5ee830d3c9dd8c7e450543129bb9e61bc8e2cf839c11cfd079bc2722918b5ca SHA512 31bcf38358758e013484fb86b43bfee405d51361bc0df1162044085c724a8eb1f98184469038f20579069e5cc3e86352cc25515858747af2e1758b0148d26a8b
+MISC metadata.xml 933 BLAKE2B 50fb01d14ad0ce00114dc8b6d9c70fdc2c5ee036d9883cd307721bc0abfa1ef9a74a826b5ab74dab7f9c9579e20c9b222cce33e04c065eb3310d230578fe9f42 SHA512 e5272580ca0631bcb1150f8a879150e8ae9c90948b3c90ef8ee42631e7345b99c2a6db64ce199a02e86f83ede5f8b41134d50136746d836fe68ae97429a6b550
diff --git a/app-portage/eix/eix-0.33.2.ebuild b/app-portage/eix/eix-0.33.2.ebuild
index 8e590ea981da..3f61ef866261 100644
--- a/app-portage/eix/eix-0.33.2.ebuild
+++ b/app-portage/eix/eix-0.33.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/vaeth/eix/releases/download/v${PV}/${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 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="debug doc +jumbo-build nls sqlite"
+IUSE="debug doc nls sqlite"
 
 BOTHDEPEND="nls? ( virtual/libintl )
 	sqlite? ( >=dev-db/sqlite-3:= )"
@@ -47,7 +47,6 @@ src_configure() {
 	local myconf=(
 		$(use_enable debug paranoic-asserts)
 		$(use_enable nls)
-		$(use_enable jumbo-build)
 		$(use_with doc extra-doc)
 		$(use_with sqlite)
 
diff --git a/app-portage/eix/metadata.xml b/app-portage/eix/metadata.xml
index 9a3193359954..f07795f51987 100644
--- a/app-portage/eix/metadata.xml
+++ b/app-portage/eix/metadata.xml
@@ -14,7 +14,6 @@
   <use>
     <flag name="debug">Build with upstream's CXXFLAGS/LDFLAGS for debugging support; not recommended for normal use.</flag>
     <flag name="doc">Create description of the eix cache file additionally in html format</flag>
-    <flag name="jumbo-build">Compile faster and produce better binary. Recommended unless compiling on a quite memory-restricted system.</flag>
     <flag name="sqlite">Compile in support for portage's sqlite backend; to actually use it you need additional configuration of portage and eix</flag>
   </use>
   <upstream>
diff --git a/app-portage/etc-proposals/Manifest b/app-portage/etc-proposals/Manifest
index d4be5439117c..f34aa4096f56 100644
--- a/app-portage/etc-proposals/Manifest
+++ b/app-portage/etc-proposals/Manifest
@@ -1,3 +1,3 @@
 DIST etc-proposals-1.4.3.tar.gz 53696 BLAKE2B aa86d4b55d53ea269bfeb58cb1db9877fab224c5387fd91ac377d757814580b8c4561c868d9c2d97c465b332041c67fdfe7a5e196fe329b92a768d542257a9ff SHA512 9de117b96908bbde87e8ee9c326525961547ba779ae571071c57571d039f3e01f9d0ec6be5eefc1ea40abdfe73631b4c750964dc94dbb6348119b83afbc556a1
-EBUILD etc-proposals-1.4.3-r3.ebuild 1422 BLAKE2B f99fea4c9b301e5ef01d77563ae6cedee8f707a6a3dc9071fdc8d046138f9f246d864b31d6c0b2be24fe319d0d3ab861def60ebe4e965e14f3db1188828a7713 SHA512 8e85c645dfec3349f14dedabdac4b3b7c26a6c5a84261ea3a05c144bf575f0ff197e72cc430e4fd0b9b118bb719bcfc0026855ccf44e4b4dea5c53b9c063f6db
+EBUILD etc-proposals-1.4.3-r3.ebuild 1272 BLAKE2B b99b4f39bc3c08f433fd93d90f24f3f8e953bd1d4c091d81fcf8fcbda045b670bbcf93bca0835164cf3c0307fa43f3a1b688653f913b9d45f51eb93e69f5eaa8 SHA512 1d85af758807a3d7eb94041528c29c48566809a4c5a975562b153f62fe40a91d61c912629c4f9792ce53cecfa72a0e241c7b395d173509420d37ef48146ade07
 MISC metadata.xml 463 BLAKE2B fc408f9701b4ffee390c6d5983b94e5913d28dca4c0ec97a7f0fe5758797b767d3fce8738208a869b5134907c066d5dfdd15fab70f0de821f69e587b7361453c SHA512 8e858c382a8880509a3f8964a2d94e64899a842d7c0368069eb8f58c041863a3a6d6a3d586cfd12d411de21bd990b685ebfa3d2d97ac460c0eb2a6dbf6aa91d1
diff --git a/app-portage/etc-proposals/etc-proposals-1.4.3-r3.ebuild b/app-portage/etc-proposals/etc-proposals-1.4.3-r3.ebuild
index 798238739380..8ec312a94438 100644
--- a/app-portage/etc-proposals/etc-proposals-1.4.3-r3.ebuild
+++ b/app-portage/etc-proposals/etc-proposals-1.4.3-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -10,13 +10,12 @@ DESCRIPTION="a set of tools for updating gentoo config files"
 HOMEPAGE="https://sourceforge.net/projects/etc-proposals.berlios/"
 SRC_URI="mirror://sourceforge/${PN}.berlios/${P}.tar.gz"
 
-IUSE="gtk qt4"
+IUSE=""
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc ~sparc x86"
 
-DEPEND="gtk? ( >=dev-python/pygtk-2.10 )
-		qt4? ( >=dev-python/PyQt4-4.1.1[X] )"
+DEPEND=">=dev-python/pygtk-2.10"
 RDEPEND="${DEPEND}"
 
 python_install_all() {
@@ -27,9 +26,8 @@ python_install_all() {
 	mv "${ED%/}/usr/bin/etc-proposals" "${ED%/}/usr/sbin/etc-proposals" || die
 	rmdir "${ED%/}/usr/bin" || die
 
-	# Bug 308725: Filter out the "PreferedFrontends" based on USE Flags:
-	use qt4 || sed -i -e '/^PreferedFrontends=/ s/qt4,//' "${D}"/etc/etc-proposals.conf
-	use gtk || sed -i -e '/^PreferedFrontends=/ s/gtk2,//' "${D}"/etc/etc-proposals.conf
+	# Package has PyQt4 support no one ported to PyQt5 so far, bug #634956
+	sed -i -e '/^PreferedFrontends=/ s/qt4,//' "${D}"/etc/etc-proposals.conf
 }
 
 pkg_postinst() {
diff --git a/app-portage/hashgen/Manifest b/app-portage/hashgen/Manifest
index 55c49f7c62c9..c3198d5db1ed 100644
--- a/app-portage/hashgen/Manifest
+++ b/app-portage/hashgen/Manifest
@@ -1,3 +1,5 @@
 DIST hashgen-1.0.c 36299 BLAKE2B 4419ffd2b4c8435b05b0cf2d9e54e2df5c539f945166da8305c910ec267e5d93cd26822ef189777cf952bb8644193fbfeaafefa4e98c5b7561845fb9a1f40c0a SHA512 4f8df94e91b02ebc611553d2dd9776de4ba77989869ed1ce411b91cc7fed224c3d8715d15cce6234caa25f2143962949dfd59da79d8f1ab211c287c604c22fff
-EBUILD hashgen-1.0.ebuild 1151 BLAKE2B 33933f28906de456e321d72639dec65bf20c1c7844dbeb34b2c209c38dd574929cb1d8e4ca42ce043157c3c8181c7ef0a79303d26ae02ea2a2f35f83a91e8e27 SHA512 0a1e2813e109ed5c05db9ff540e242341c49838f359079872e54d63bdee63d8dc03b000488ba93756398479127c0857d83f2843ac32ce2a74047007fe50f169b
+DIST hashgen-1.1.c 38543 BLAKE2B 8830fa1ebd3494ef6e42b12bb750e4b45f0ebb975de8aacc29e67200144cc9110532846b349cf36b0a060c3b2770095a65bc24be2eb7ea997adfd5be309328d2 SHA512 84c44689e2d0061566ce990b943ea76824f5cf257d611571cd0b5932154a079670f186b7e97d3e16de3e991a629db595a63c21336c6a57f48b967b5ebb40eea8
+EBUILD hashgen-1.0.ebuild 1277 BLAKE2B 6532dedc635b96156633fc402c02656c0211d991adcecb2ab1d9c977e26a647d502b8e0137eccf48ddb626cfc9add057e2ceb2a5a898bda4939852e185611fe1 SHA512 535cf69887158b5b1c3fe764a5b14c20fbe267d6fb48ceac097f09791f8b6beb0444347ec32a1ef9e418f716c755132bec05c0b6e8e783a87a7202fabf7197e9
+EBUILD hashgen-1.1.ebuild 1277 BLAKE2B bc660f5981efc90aa771766d47e85e7822a66ebe49c7aed90fe3831dec599ab165325fe73d90479b01dd280222fad1a2ffa4fd65f0c282739f5807c076d0eadf SHA512 fb8713b4e4da5ad0a1a18df533d9f6780ef35f58dd1624a1b0340470ee389eeb8748c1d8129869c40f9f7519dfd5f421bd4dc57369e2f6962ee97a7fe2b9c61d
 MISC metadata.xml 248 BLAKE2B 60e4295b22f6f36039547e98305ae072755044f6516df2e29e65768732900ffc93dac9cbcf1da9e6c731403a62cf272f2f378d0641bd466974f8a234235c862a SHA512 f6fee7363592cb9dcd666011806321b791fb84bf0719fb2454d1f3ceb738650184286c17a13684c077bacd1a93581a71accfe9cef74adcaf40dfda7d8a167d13
diff --git a/app-portage/hashgen/hashgen-1.0.ebuild b/app-portage/hashgen/hashgen-1.0.ebuild
index a27739de9e50..26a83a7bc513 100644
--- a/app-portage/hashgen/hashgen-1.0.ebuild
+++ b/app-portage/hashgen/hashgen-1.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit toolchain-funcs
+inherit toolchain-funcs flag-o-matic
 
 DESCRIPTION="Manifest generation and verification tool written in C"
 HOMEPAGE="https://prefix.gentoo.org/"
@@ -40,6 +40,9 @@ src_compile() {
 	local openmp=
 	use openmp && tc-has-openmp && openmp=-fopenmp
 
+	[[ ${CHOST} == sparc-*-solaris2* || ${CHOST} == i?86-*-solaris2* ]] \
+		&& append-flags -D_FILE_OFFSET_BITS=64
+
 	v $(tc-getCC) -o hashgen ${openmp} ${CFLAGS} \
 		$(pkg-config openssl --libs) \
 		$(gpgme-config --libs) \
diff --git a/app-portage/hashgen/hashgen-1.1.ebuild b/app-portage/hashgen/hashgen-1.1.ebuild
new file mode 100644
index 000000000000..eacb1653fc3e
--- /dev/null
+++ b/app-portage/hashgen/hashgen-1.1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs flag-o-matic
+
+DESCRIPTION="Manifest generation and verification tool written in C"
+HOMEPAGE="https://prefix.gentoo.org/"
+GITHASH="2ea68e88531288c29c5533440d63da6c8136d477"
+SRC_URI="https://gitweb.gentoo.org/repo/proj/prefix.git/plain/scripts/rsync-generation/hashgen.c?id=${GITHASH} -> ${P}.c"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x64-macos ~sparc-solaris ~x64-solaris"
+IUSE="+openmp"
+
+DEPEND="
+	openmp? (
+		|| ( >=sys-devel/gcc-4.2:*[openmp] sys-devel/clang-runtime:*[openmp] )
+	)
+	app-crypt/libb2
+	dev-libs/openssl:*
+	sys-libs/zlib
+	app-crypt/gpgme
+"
+RDEPEND="${DEPEND}"
+
+src_unpack() {
+	mkdir "${S}" || die
+	cp "${DISTDIR}"/${P}.c "${S}"/${PN}.c || die
+}
+
+src_compile() {
+	v() {
+		echo "$@"
+		"$@"
+	}
+
+	local openmp=
+	use openmp && tc-has-openmp && openmp=-fopenmp
+
+	[[ ${CHOST} == sparc-*-solaris2* || ${CHOST} == i?86-*-solaris2* ]] \
+		&& append-flags -D_FILE_OFFSET_BITS=64
+
+	v $(tc-getCC) -o hashgen ${openmp} ${CFLAGS} \
+		$(pkg-config openssl --libs) \
+		$(gpgme-config --libs) \
+		-lb2 -lz ${LDFLAGS} ${PN}.c || die
+}
+
+src_install() {
+	dobin hashgen
+	cd "${ED}"/usr/bin || die
+	ln -s hashgen hashverify || die
+}
diff --git a/app-portage/repoman/Manifest b/app-portage/repoman/Manifest
index e66b3d8f9e51..0ae3da2abbd5 100644
--- a/app-portage/repoman/Manifest
+++ b/app-portage/repoman/Manifest
@@ -7,6 +7,6 @@ DIST repoman-2.3.6.tar.bz2 78961 BLAKE2B c11953ced4d6bcd5e6e6a5b2dacb8802446f3ac
 EBUILD repoman-2.3.0-r1.ebuild 2512 BLAKE2B b46e14ed46d556e731a348c8dc212ca42d20b0703edfe6322bb9475c1e46cd69ced238b9a567f9b441433a2a2a3ad9c04dddce646427f5ea71d80dcbb8865c1c SHA512 a80325ec9455f6210eaf2af3fee60035dc2dfab7f153fc345e1c034b67238b6de94754493768336ed0b9126ad32dec7ca711ca1200f879dad726e64aa9237da0
 EBUILD repoman-2.3.3.ebuild 2308 BLAKE2B 3137f513fa55c654bc92dd7aedb363ce6e40f1c873923df80a836113fb60ffc387c73605fd5367246634c01e14fe63a52f88949c1949164c3e91fcd8434f449a SHA512 e69402b9ab7776b06b872f3ddfa9a8c62411119ed656bebc572494c964a973ce3906b738e307e3d200e053e7f8b8c7e21ff928457b24623031b4e8b3e156b9c4
 EBUILD repoman-2.3.4.ebuild 1899 BLAKE2B 1dd1adc861a1c22dc4adb3e9fdb4020bbc6f7fb5f6d4d3d325290033bb355afd3bbb4658d6211dd947bb54fdcef3e72677fa35075f8b2338d9042723de289183 SHA512 7ee0da85857483d03cc4ae36539e04d812a40ea771624ac64102217aef868ef4a73ed704ddfe7066a029b03f6cb9c577d3fb458fecc2c5b89cd2fafab0b9bce3
-EBUILD repoman-2.3.6.ebuild 1854 BLAKE2B 026d7f6f305cae074aaf02ae89153de632d5b9571ddfe8f65b39f6a6b9050730c2e37a129db3beb5283d97fc29c715b8c5b601b1b475323879a6272ceb7a479b SHA512 7a5bbfd57cd6b5599b118a5dbb889e90cdc2abc58cf898005d96b75c61ea672b24fe1e4588d72a5367a5c62fb2a628e68a9b5adf66141d04e269a5c2c1e0866f
+EBUILD repoman-2.3.6.ebuild 1853 BLAKE2B 4ad785f83a1623ef06795b29fd7176758695d55c468b96a802faab5aac36287b73cfb827f8fd8446472c813f8fc97958466a17ed0e3acedbf07a17fe8b696617 SHA512 fcde93d0e9c7ee5a229348c90b9b68b677b3b95967b582c9863abe3f57c6b1a532fb9fb95d03af27749b4ab7efb58b111ebc280fe0a072eea5e089cea0ec9862
 EBUILD repoman-9999.ebuild 1899 BLAKE2B 1dd1adc861a1c22dc4adb3e9fdb4020bbc6f7fb5f6d4d3d325290033bb355afd3bbb4658d6211dd947bb54fdcef3e72677fa35075f8b2338d9042723de289183 SHA512 7ee0da85857483d03cc4ae36539e04d812a40ea771624ac64102217aef868ef4a73ed704ddfe7066a029b03f6cb9c577d3fb458fecc2c5b89cd2fafab0b9bce3
 MISC metadata.xml 472 BLAKE2B 7433ca0ddf5b8554caba0893b28e5681419f18e7f8d28c1c202c98b9a198ea4222958dd537247e29e2f3300ee051860315b15ca7fbd92ba2c4fe614a43171942 SHA512 53566a405056159de7412ea3b447ce6a7b73833fe927a04b5576bc77b2f4b181de8413956ff2b0b1836025352566b0a44252c2ebaf313cfea4020ea5490f3ab0
diff --git a/app-portage/repoman/repoman-2.3.6.ebuild b/app-portage/repoman/repoman-2.3.6.ebuild
index 305cf38d5502..ce48f49684c4 100644
--- a/app-portage/repoman/repoman-2.3.6.ebuild
+++ b/app-portage/repoman/repoman-2.3.6.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999 ]]; then
 	S="${WORKDIR}/${P}/repoman"
 else
 	SRC_URI="https://dev.gentoo.org/~zmedico/portage/archives/${P}.tar.bz2"
-	KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="Repoman is a Quality Assurance tool for Gentoo ebuilds"