gentoo resync : 14.07.2019

8 files changed, 70 insertions, 100 deletions

diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index e8c57facb119..a7998138535c 100644
--- a/app-portage/Manifest.gz
+++ b/app-portage/Manifest.gz
diff --git a/app-portage/emerge-delta-webrsync/Manifest b/app-portage/emerge-delta-webrsync/Manifest
index 2cba23a13998..1f01cc0dfba4 100644
--- a/app-portage/emerge-delta-webrsync/Manifest
+++ b/app-portage/emerge-delta-webrsync/Manifest
@@ -1,9 +1,5 @@
-DIST emerge-delta-webrsync-3.7.2 22344 BLAKE2B f0c6054c0bbc32760eb3339ef121a3aafd32b6fecfb1474d46258ab48473ec5392e0e3b92d84f9d02bc061fd91b467020fbe4dbbb69a6f0625ea765cb013c706 SHA512 36b65e0f550b5b0a3a5cf271126bf0d44bd182c06148d72c5ed9e105394a38be5dd0845e2d674df246b4436a10f15033bdc857526f664656f1cdb79dd8b7a18c
-DIST emerge-delta-webrsync-3.7.3 22348 BLAKE2B 7f89d71c2621bb3f2ebacaf1a5cdc66f3783d4704f9bd31adb8d7affd37e696a020712807f15c978025bb31fbdf95d6fc9b005a88cad132112f32b0d97ae99ab SHA512 987dabb5013233a164651564cfbf27ea7bea9057c810c3497b830a3fd58b89317791f1fb6d12f5e3e4aee58954a8aa6abe22eb8a5384b398239d4b28b665b2dd
-DIST emerge-delta-webrsync-3.7.4 22568 BLAKE2B fc85c4cf7dc1aef83ee591258adf1b2d6c949883f36cb8d1db68abe0d6b43ac7f6ad816aeb92bd3615eb5104adeea015fe7440af12fc60b8d2b8cbe21ade46d1 SHA512 acd443abdfadc15c1f6ee405395839311b5afc63f2fb4fe1842b7f222bcd9455c8c402ba7e624ecf0a43f908a237aa7ea76e14655b5b7f6933677dd20d05619a
 DIST emerge-delta-webrsync-3.7.5 23446 BLAKE2B e4cecea69d4ddc3eff21130b45661bb942cd8f66443b8e55bea1340bab801176ccfcbbe41e762bab4e318e17dae6bfaaa9d98656b276838d782b94ef9c2bf0fc SHA512 dc64754ca3a2b5956b6ad017dbf987de6a45fd227a498c00f677c4c85ad6e3e02cdfb9b22b413ad10d077e509e47b0dd8d6116fc2ca03dd3e9f74e465c4e2527
-EBUILD emerge-delta-webrsync-3.7.2-r1.ebuild 1223 BLAKE2B eb7b371e2584645e623e31fbc395f52dee2754825165032406ccfa3c4b505d826f1cec1d90792391612b75983b2400d09bb58cba66c8b2726e7bd553ac65af33 SHA512 84208b781a603717b8f22f1a111949279aeb44b693fedb7d0e823f9dbd6c8a21037f353f8ea12c2d7694cb484f20af448688a2f75976288ac73afd9213a3c728
-EBUILD emerge-delta-webrsync-3.7.3-r1.ebuild 1116 BLAKE2B fe5fc83614cbca1bd32bddc821c5fe2561ecf7266199205e72fda69eccd21c4d9a4e7fb81e41e0826dcaecaf93f213ca3dddc0e1e93df5fcc90d093d780df25c SHA512 fa446dd98a2d63abaad4d3daa6237e981014a55be33591df35f57f0c06b451e76a40c6df31a20a9829ad62e3f6de7cbf8fe40ff4c6b3bee40581b30840770399
-EBUILD emerge-delta-webrsync-3.7.4.ebuild 1116 BLAKE2B 8edb580b357d0d1d66cd1f12185be3b1be9af4ef625057ed9c70c0506d07dc40345ec72607af9cf8be1c4309e08e0691b47713d46e06dd3de6eec5b19477049a SHA512 1477e4f4f1b1e7acafc9677a4715c2f5ff3ddb38719a2818b344cbeaf36e9667fb569e2eab421dc8520988571c462057d4dc93ba92341189ecfe34bd26804c40
+DIST emerge-delta-webrsync-3.7.6 24117 BLAKE2B 05bc77b6454e057247f225404cbf6f7b8fac8b54b19137434a4df028d5b6e8330ee853f4fa0f94a6c56e97ea088c7eac3f486c0013059b475f1ff36c858ad0a3 SHA512 85e5c2b5fffe952f6642507dd9dfd960725e86f385a5fc0ac289c5fcfe4666f0a50efdf7621342f8ae29f7623b8431f697ea33afe0fe2d6a837c820feefccae8
 EBUILD emerge-delta-webrsync-3.7.5.ebuild 1108 BLAKE2B 6256ac7a8233ba7ba20b376563008f9b5f8ee8303aa55088630533d52982e38ff6dd218e278dd7c81abfc0e9791e2eae48c2dbedad6cc75f0d4a6637393f861f SHA512 4238088ad85b5bca771c9cc2745ff11a2cefdc30aac7899f69e1927590f87fa831c6dcc5bf26001ed0f137b0f0d716832abeeed01d330bb9c0a67434002b6340
+EBUILD emerge-delta-webrsync-3.7.6.ebuild 1113 BLAKE2B b10d7574ff050876971fb3d3ac006e155a6b00047a727c339268d4f6e36c366cf7823588fec6b3a86cd1cc6e00ecf8647f0eba992fc5c2f7c9cb97b05a7ebf7d SHA512 d618b3fd89559fedd8b639f49dc03402b854b6dceeea9c8fe45b9786c0eba0205da51c2cf9dbf4b999f61039796a641eca84bc5990003cd593a049043e7938e5
 MISC metadata.xml 294 BLAKE2B a26f2f113f9a9b66edbc88a0ab73a5da655fd240a97668cf1884e9192c4425cc478ab3f187ae1ba12b351c3de5b79d37b771e139cc51909d683decdc945454f5 SHA512 c4cdfd8350418cd0c231874c709d1fdf2c8132309dcd621682ebb77abd77ed57ce0d484a387b75f4762e58193150ca744e51b560d9b5a8cf631b4faef1465555
diff --git a/app-portage/emerge-delta-webrsync/emerge-delta-webrsync-3.7.2-r1.ebuild b/app-portage/emerge-delta-webrsync/emerge-delta-webrsync-3.7.2-r1.ebuild
deleted file mode 100644
index 4f574f0ad868..000000000000
--- a/app-portage/emerge-delta-webrsync/emerge-delta-webrsync-3.7.2-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-DESCRIPTION="emerge-webrsync using patches to minimize bandwidth"
-HOMEPAGE="https://www.gentoo.org/proj/en/portage/index.xml"
-SRC_URI="https://raw.githubusercontent.com/gentoo/portage/779a9e686d89e31af43e33b1163b01aeff65d7ea/misc/emerge-delta-webrsync -> ${P}"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ~hppa ia64 ~mips ppc ~sparc x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND=""
-RDEPEND="
-	app-shells/bash
-	>=sys-apps/portage-2.1.10
-	>=dev-util/diffball-0.6.5"
-
-S=${WORKDIR}
-
-src_unpack() {
-	cp "${DISTDIR}/${P}" "${WORKDIR}/" || die
-}
-
-src_prepare() {
-	# Remove premature `rm -fr "${TMPDIR}"` for bug #506192.
-	sed -e '334,336d' -i ${P} || die
-}
-
-src_install() {
-	newbin ${P} ${PN}
-	keepdir /var/delta-webrsync
-	fperms 0770 /var/delta-webrsync
-}
-
-pkg_preinst() {
-	# Failure here is non-fatal, since the "portage" group
-	# doesn't necessarily exist on prefix systems.
-	chgrp portage "${ED}"/var/delta-webrsync 2>/dev/null
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]] && \
-		! has_version app-arch/tarsync ; then
-		elog "For maximum emerge-delta-webrsync" \
-			"performance, install app-arch/tarsync."
-	fi
-}
diff --git a/app-portage/emerge-delta-webrsync/emerge-delta-webrsync-3.7.4.ebuild b/app-portage/emerge-delta-webrsync/emerge-delta-webrsync-3.7.4.ebuild
deleted file mode 100644
index 0221d4cf315b..000000000000
--- a/app-portage/emerge-delta-webrsync/emerge-delta-webrsync-3.7.4.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-DESCRIPTION="emerge-webrsync using patches to minimize bandwidth"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
-SRC_URI="https://gitweb.gentoo.org/proj/portage.git/plain/misc/emerge-delta-webrsync?id=52d5d444ffb144911ca9b6e70b383405a8bd8af6 -> ${P}"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~sparc ~x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND=""
-RDEPEND="
-	app-shells/bash
-	>=sys-apps/portage-2.1.10
-	>=dev-util/diffball-0.6.5"
-
-S=${WORKDIR}
-
-src_unpack() {
-	cp "${DISTDIR}/${P}" "${WORKDIR}/" || die
-}
-
-src_install() {
-	newbin ${P} ${PN}
-	keepdir /var/delta-webrsync
-	fperms 0770 /var/delta-webrsync
-}
-
-pkg_preinst() {
-	# Failure here is non-fatal, since the "portage" group
-	# doesn't necessarily exist on prefix systems.
-	chgrp portage "${ED}"/var/delta-webrsync 2>/dev/null
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]] && \
-		! has_version app-arch/tarsync ; then
-		elog "For maximum emerge-delta-webrsync" \
-			"performance, install app-arch/tarsync."
-	fi
-}
diff --git a/app-portage/emerge-delta-webrsync/emerge-delta-webrsync-3.7.3-r1.ebuild b/app-portage/emerge-delta-webrsync/emerge-delta-webrsync-3.7.6.ebuild
index 53f1e8469e3e..65533f9f804d 100644
--- a/app-portage/emerge-delta-webrsync/emerge-delta-webrsync-3.7.3-r1.ebuild
+++ b/app-portage/emerge-delta-webrsync/emerge-delta-webrsync-3.7.6.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 DESCRIPTION="emerge-webrsync using patches to minimize bandwidth"
 HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
-SRC_URI="https://gitweb.gentoo.org/proj/portage.git/plain/misc/emerge-delta-webrsync?id=d2ae2f85a34e27a6b458cb51cac008686911e8ce -> ${P}"
+SRC_URI="https://gitweb.gentoo.org/proj/portage.git/plain/misc/emerge-delta-webrsync?id=829623eadbeda97d37c0ea50dc5f08f19bf4561b -> ${P}"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~sparc ~x86 ~x86-fbsd"
@@ -13,7 +13,7 @@ IUSE=""
 DEPEND=""
 RDEPEND="
 	app-shells/bash
-	>=sys-apps/portage-2.1.10
+	>=sys-apps/portage-2.3.69
 	>=dev-util/diffball-0.6.5"
 
 S=${WORKDIR}
diff --git a/app-portage/pfl/Manifest b/app-portage/pfl/Manifest
index 7a94deb778a3..1904f9fc6135 100644
--- a/app-portage/pfl/Manifest
+++ b/app-portage/pfl/Manifest
@@ -1,5 +1,7 @@
+AUX e-file-function.patch 535 BLAKE2B 507a9a8a83585613e37fb9810ad65c04f0d78be5fd24cb8cacf41cd56c4bc878b1562dfd65c65a0d0f8e59dd112d20b7f62ab62acfb1a3a2420b9da2f3433c5e SHA512 23b7b4b8d3d894b79973b4c5484bdbeeae13398b33d2316774e9da43e072da0d5a55d47774e3f201e71147a29857818b4b3a40cf9f7b868d642bf5db72eb4dbc
 DIST pfl-3.0.1.tar.bz2 4635 BLAKE2B 9610c46e3096bc5f2ff212980026b36b99056a9839b179c2618c3c7d508b90ecb21b0fa566eef54e6a24957251934b04b0013af41b88de57e7e1db558831d883 SHA512 f045ca21360f33f87816e72a4564d862275ea1415b3a79e32815aaa20d7548da3f38ca9ee9247db3150adbdd54155b330c4ae6d3bee878db6cd5cf78dada81b5
 DIST pfl-3.0.tar.bz2 4332 BLAKE2B 8e1dd17d0017cd972c02a9e8d3610a036447d7b898c6f0a9557ef2c598c0581a09ee7a72ca04860f3695d06d3fe3ee9426a99b1158db71e232ccaff69479d068 SHA512 94f7cc575689f46a0b9ce50c3de7d6a42767766c8c447616c7f3587438a6b3c09e5d00b3b80cd71b0d386ead1e396d49aa266ff408146f85b18e25ebfe887108
 EBUILD pfl-3.0-r2.ebuild 1000 BLAKE2B 6402e058d0d3bbd14f4af7f629fc7e2daa04f529c1a49aa6cbe0b0e52220e05f6b43c1ac007bcbc86b2a9f84b477b006e0d739695406b1766198c16a8f94414a SHA512 9eb518f909fcfbd50643dbc581a0109ac7acfd2c4756d0f8ae208d2af21a5bae0b8526da7468e79b8ce8373fc9e67d43649f74f7bb435573398a832cbfa75cd4
+EBUILD pfl-3.0.1-r1.ebuild 1070 BLAKE2B d2f61338842eb15b5f345ff46b3440fce2f3312d70bd7996c0fd0bc88d019fe0eb60b21c11993151b989b595b926ec9e169254325e68c7a7ca448a21355c2564 SHA512 ef505fd1d7bc2db87343c4dcd79a1fb2478398adbae83846e087b85d7a8b76b6bc2bca94a91ab9c6867d0f36234765c6a1c9d99b1f53f8e4436074ea26e17566
 EBUILD pfl-3.0.1.ebuild 1020 BLAKE2B cfb1f9d9850ded79b63727887f1b97978a6a4ebc8c737f166a26a5a6b28e13447f5941cb39706286ef0db4d711cdedd7e55eccf88bc0409e6a59188031033442 SHA512 53a262e921fdebd4512d17b13e6ff32a984ceef05ba8bf77650888914160cbf69c5ae40ea257be2c0fb09e73c4a3608a0976d33f1518c717ba53375eb45c4849
 MISC metadata.xml 495 BLAKE2B ef70490d091bdd595de1f73ab32dfa8d537c32bf8b5362d7ba19529d7f8c4cc8252702ab781fee5021f13a36b1724f471ff9b6358ddfb77cf7c31f2c4ff56b0d SHA512 b556cae880b209d43627f462f429c4aa71f023e96f6bef4eb2fbed854d28e94be98a3f07e65b980dbc22e6ad9b7da6fc284402329119a47538a2eb1158ce942b
diff --git a/app-portage/pfl/files/e-file-function.patch b/app-portage/pfl/files/e-file-function.patch
new file mode 100644
index 000000000000..2f554c926b37
--- /dev/null
+++ b/app-portage/pfl/files/e-file-function.patch
@@ -0,0 +1,15 @@
+--- pfl-3.0.1/bin/e-file.old	2019-06-22 20:32:10.437137086 +0200
++++ pfl-3.0.1/bin/e-file	2019-07-13 14:19:47.383823446 +0200
+@@ -3,10 +3,10 @@
+ #License: GPL
+ #e-file is like apt-file in debian,it's used to search package name via filename for gentoo
+ #thanks for portagefilelist.de and Daniel
+-VERSION=20110906
++VERSION=20190713
+ 
+ coloropt=always
+-function usage () {
++usage () {
+ 	echo "This is e-file ($VERSION)"
+ 	echo "Usage: $(basename ${0})   [-c] [-h] filename"
+ 	echo "  -c color output could be either [always|never|auto]"
diff --git a/app-portage/pfl/pfl-3.0.1-r1.ebuild b/app-portage/pfl/pfl-3.0.1-r1.ebuild
new file mode 100644
index 000000000000..e766bbbfde0a
--- /dev/null
+++ b/app-portage/pfl/pfl-3.0.1-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_REQ_USE="xml"
+
+inherit distutils-r1
+
+DESCRIPTION="Searchable online file/package database for Gentoo"
+HOMEPAGE="http://www.portagefilelist.de"
+SRC_URI="https://dev.gentoo.org/~billie/distfiles/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+IUSE="+network-cron"
+
+DEPEND=""
+RDEPEND="
+	${DEPEND}
+	net-misc/curl
+	sys-apps/portage[${PYTHON_USEDEP}]
+	>=dev-python/ssl-fetch-0.4[${PYTHON_USEDEP}]
+"
+
+PATCHES=(
+	"${FILESDIR}/e-file-function.patch"
+)
+
+python_install_all() {
+	if use network-cron ; then
+		exeinto /etc/cron.weekly
+		doexe cron/pfl
+	fi
+
+	keepdir /var/lib/${PN}
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	if [[ ! -e "${EROOT}/var/lib/${PN}/pfl.info" ]]; then
+		touch "${EROOT}/var/lib/${PN}/pfl.info" || die
+	fi
+	chown -R portage:portage "${EROOT}/var/lib/${PN}" || die
+	chmod 775 "${EROOT}/var/lib/${PN}" || die
+}