gentoo resync : 16.04.2022

6 files changed, 107 insertions, 53 deletions

diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index 7d71d85bfe92..9a15fc43bb5c 100644
--- a/app-portage/Manifest.gz
+++ b/app-portage/Manifest.gz
diff --git a/app-portage/eix/Manifest b/app-portage/eix/Manifest
index 2f60bdcb0d27..2078dc59258e 100644
--- a/app-portage/eix/Manifest
+++ b/app-portage/eix/Manifest
@@ -1,5 +1,7 @@
 DIST eix-0.36.0.tar.xz 640820 BLAKE2B 952e6a354cc5fd1145ef36fed6047bc6f10dd7a51166028581e3b392be66b5df07eabb96cba362dc4f7a50fbe19e6ccb3744d30928c4763a91af21ad02cee38d SHA512 891e343b01d3887cbc7e61933b43e79949ff702dcd8ada2f15ff57a628dc6ebc9a4b6817d3aa3d814474db3131aefcbbf56cec2520868dcb2182cbee780125b5
 DIST eix-0.36.1.tar.xz 640084 BLAKE2B 10014bb847d71b803967354f3a415dc1c74ad37385b7b440f0c162c573453042d06bbc575582831ffc0aad6b0f7abeedbcb4e23b869505d4f85d6bd6b7cfbba4 SHA512 915a364b0f63124c53e43eb35165ce553f6eadaf8708f0c075dc2f4871fe83378cd0c8650d5605c1f87c512563fdd62f28efdc586b358fc7cd63ae42a404981d
+DIST eix-0.36.2.tar.xz 639632 BLAKE2B 962b998f91233e799421c1ea3325d5b9c727bdfdda6a9567ba4a9ea0f4f36798f5ba32ef2ba43043668aaf0829d9c2f50158f97d5ebfca40a58da612141c47a8 SHA512 813a19f9561bfd65a401a4dcf9884e39eedf5f971be1800411ba977d84af0c5b5498cab50f69566bff75cf254f1d4971acc5dab72af34162f8b5dd29cd6ffaea
 EBUILD eix-0.36.0.ebuild 2526 BLAKE2B 1d11b56a81b9d87108fe73937060719706a442b876aeecc1ddf4c2901f59cb0b95f74198fa73792c889076c9743a489e9d9f6b06f93aaae22ac175379ef95e98 SHA512 4895eb3f06f19680a23762e14611345dbf6e2669f0401cf412d6ff6babb2da8f489f33ed1edd0832dfbb269e9a3532c2d9d9f30b74f90abee8f15176e52ea9fe
 EBUILD eix-0.36.1.ebuild 2527 BLAKE2B 5f0192eb0b45924f242e09c238d761853ac20214fe558e68e1e45e621261f6312b8a12e2533af314821a8025e40c7840353b7946d2d005da34d4393dfe0aac23 SHA512 4c98adfdd07616b609dd9eae2e58543f35c9ab92d6d1a1ad4325331b7ae773ed23bd432c0ceda377ff0083458b0f099a4217502151c55243418100f26f85b26a
+EBUILD eix-0.36.2.ebuild 2534 BLAKE2B a09c23044975974fc35ea667fdf504a94b265f01a44ce88018a98568a53724e7a9d1d6e308a71d9a8e57a2be755d6638dbe5422be153f718ef5a5e5cce47ca7f SHA512 d7212d1f29a71140fc8b184bdd5741871b74051059253ad6c0efdf99df625f4a154471c53e190209b73ffb0a3d80e25ada998628b5fa067bf69ffdf6f5e68d6c
 MISC metadata.xml 1066 BLAKE2B d86d5ac2b57cb98b85fb31719d76cfa74d8ca4e18473d4bea8c4c9c63ce35e6b1e1c0e41b3a6dc20f5ba464e3273f51035929ae1d37d36d0da8a3e8a30ca7a68 SHA512 c161c1e63cc7e9ca25bea3902f5c5806e6cde1253d74b8f2fbb876667b9fb8502edc81a309b0bde4a5de033594927da6b12254784fceb8e9a7452ae914ee5373
diff --git a/app-portage/eix/eix-0.36.2.ebuild b/app-portage/eix/eix-0.36.2.ebuild
new file mode 100644
index 000000000000..ec2244f1a53b
--- /dev/null
+++ b/app-portage/eix/eix-0.36.2.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools bash-completion-r1 tmpfiles
+
+DESCRIPTION="Search and query ebuilds"
+HOMEPAGE="https://github.com/vaeth/eix/"
+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 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="debug doc nls sqlite"
+
+DEPEND="
+	nls? ( virtual/libintl )
+	sqlite? ( >=dev-db/sqlite-3:= )"
+RDEPEND="${DEPEND}
+	>=app-shells/push-2.0-r1
+	>=app-shells/quoter-3.0_p2-r1"
+BDEPEND="
+	app-arch/xz-utils
+	nls? ( sys-devel/gettext )"
+
+pkg_setup() {
+	# remove stale cache file to prevent collisions
+	local old_cache=${EROOT}/var/cache/${PN}
+	if [[ -f ${old_cache} ]]; then
+		rm "${old_cache}" || die
+	fi
+}
+
+src_prepare() {
+	default
+	sed -i -e "s:/:${EPREFIX}/:" tmpfiles.d/eix.conf || die
+
+	sed -e "/eixf_source=/s:push.sh:cat \"${EPREFIX}/usr/share/push/push.sh\":" \
+		-e "/eixf_source=/s:quoter_pipe.sh:cat \"${EPREFIX}/usr/share/quoter/quoter_pipe.sh\":" \
+		-i src/eix-functions.sh.in || die
+	sed -e "s:'\$(bindir)/eix-functions.sh':cat \\\\\"${EPREFIX}/usr/share/eix/eix-functions\\\\\":" \
+		-i src/Makefile.am || die
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=(
+		$(use_enable debug paranoic-asserts)
+		$(use_enable nls)
+		$(use_with doc extra-doc)
+		$(use_with sqlite)
+		--without-protobuf
+
+		# default configuration
+		$(use_with prefix always-accept-keywords)
+		--with-dep-default
+		--with-required-use-default
+
+		# paths
+		--with-portage-rootpath="${ROOTPATH}"
+		--with-eprefix-default="${EPREFIX}"
+
+		# build a single executable with symlinks
+		--disable-separate-binaries
+		--disable-separate-tools
+
+		# used purely to control/disrespect *FLAGS
+		--disable-debugging
+		--disable-new_dialect
+		--disable-optimization
+		--disable-strong-optimization
+		--disable-security
+		--disable-nopie-security
+		--disable-strong-security
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+	dobashcomp bash/eix
+	dotmpfiles tmpfiles.d/eix.conf
+
+	rm -r "${ED}"/usr/bin/eix-functions.sh || die
+}
+
+pkg_postinst() {
+	tmpfiles_process eix.conf
+
+	local obs=${EROOT}/var/cache/eix.previous
+	if [[ -f ${obs} ]]; then
+		ewarn "Found obsolete ${obs}, please remove it"
+	fi
+}
+
+pkg_postrm() {
+	if [[ ! -n ${REPLACED_BY_VERSION} ]]; then
+		rm -rf "${EROOT}/var/cache/${PN}" || die
+	fi
+}
diff --git a/app-portage/pfl/Manifest b/app-portage/pfl/Manifest
index 759329a4ea87..74318b9f96f0 100644
--- a/app-portage/pfl/Manifest
+++ b/app-portage/pfl/Manifest
@@ -1,6 +1,5 @@
 DIST pfl-3.1.tar.gz 5521 BLAKE2B fdc6e82c5d61d694a188c479b0566aafc507bcc2bbd1f176cd2771586b13de86a43a5d2e156beb4c9b5d10cd718046a05fce099894430c8f3d04c0922078e988 SHA512 b2bf79445a5b15caf339106f376d64accf5aad2c60038ba88180d64ce49e23dc3015efa2fcbeec886ba591cada053dfdc96873bda71b092be4622608062b6dcc
 DIST pfl-3.2.tar.gz 5373 BLAKE2B 3fcb771a6d67ec7198b83eeeb161d7caea7ccbc3933ff3ef7a48b106e9c86c331f2ac1a4c589135a4f57f40bfcd668f075f17865ff58feb027cd02d90b52bc2a SHA512 e424b5a5c6dbb848057fe357ae98196f2c238351dfe7fd19a9b7f423c245b1372ec270c6b8d2e8265a05a442d7afc2c5feef6dbe5eed5e240e78c88a6748d1d5
 EBUILD pfl-3.1-r1.ebuild 1237 BLAKE2B 1a7d996b467166a8b5316608fd8d67ce07ea7efecd3515aba191f3799b9e8f0c8962037f723f3fd4f88818622f404a8406a46edc4cc61969e99fb47e0243d9b4 SHA512 4be1fb60b06394dad3ace70b8c4fc4ad7558ba98510376a7df2eb7a6d7b98ded243277c31346a8ab314b8e017cd31e4db941def29be389890ebd5cb293bca652
-EBUILD pfl-3.2-r1.ebuild 1266 BLAKE2B b00c9e430659099a828ce93653028c8d87ed8793e9ca936df0e362835a49727fac055cf18224145d794d134eefcb8785970a158cba442a8fe92f0610dfc7d035 SHA512 222dca8cc37824953ea24ee79e51b8c34f38cfd34edae78081e6e4d4918bee5aa6bc4794afb3fd9fc1e34a8e63be98160e4fb172e6b266084b6e7efcd383afc4
-EBUILD pfl-3.2-r2.ebuild 1270 BLAKE2B 0ba80c1c509b78f73faf66e8981b24f23a4d3018f453bd4224e45e68e9aff704f3342c9f62b9931b215a1f56928dac97c8a228c844fdc44f1c788b95a0f6c2ea SHA512 97db8c180a24c966757538789e67129118d87f8bd0a2b20378151dc36d5ff4a2d23ddf86fffe3fbed79d641d94861abc32f6564ea56a4e7ea8e27c4c32f3ea2d
+EBUILD pfl-3.2-r2.ebuild 1263 BLAKE2B 3e944538d2f83fe09d8feaa73e88dc32f8e9bafa52f1b9e564683c6f53fa02e89400e40e4186461fafdbacc4b288bc6509d1f40a545c0d2c37fc0c13c323dc29 SHA512 2e8629542b3f1f048b33a311d1cc30dbf3264987a4fd315af6006d1e1742af550fe4ed2cd74d8f0fde75dc44685be4dac4750c8a9a570718af75ab347b4da02d
 MISC metadata.xml 520 BLAKE2B d00ce805891280e0f73e051f0083e511ec670101253995b437d3e352fa0e390b1bbe65de02d4b501a965f330f5c6b30b218af26b327bb31c9c1e50b7d65b86a5 SHA512 8d11818801dae3dcc52ab93ca33fce7842c2a9ba159fd85fce19c316781a4e611c166672e640ac56e34cea34a92500f958b06335e27e3804e5becc645ce11d42
diff --git a/app-portage/pfl/pfl-3.2-r1.ebuild b/app-portage/pfl/pfl-3.2-r1.ebuild
deleted file mode 100644
index 28f10306a4f3..000000000000
--- a/app-portage/pfl/pfl-3.2-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{8,9,10} )
-PYTHON_REQ_USE="xml"
-
-inherit distutils-r1 systemd
-
-DESCRIPTION="Searchable online file/package database for Gentoo"
-HOMEPAGE="http://www.portagefilelist.de https://github.com/portagefilelist/client"
-SRC_URI="https://github.com/portagefilelist/client/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="+network-cron"
-
-DEPEND=""
-RDEPEND="
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/termcolor[${PYTHON_USEDEP}]
-	sys-apps/portage[${PYTHON_USEDEP}]
-	network-cron? ( sys-apps/util-linux[caps] )
-"
-
-S="${WORKDIR}/client-${PV}"
-
-python_install_all() {
-	if use network-cron ; then
-		exeinto /etc/cron.weekly
-		doexe cron/pfl
-	fi
-
-	systemd_dounit systemd/pfl.{service,timer}
-
-	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
-}
diff --git a/app-portage/pfl/pfl-3.2-r2.ebuild b/app-portage/pfl/pfl-3.2-r2.ebuild
index a6828df22df9..9f223b9971d5 100644
--- a/app-portage/pfl/pfl-3.2-r2.ebuild
+++ b/app-portage/pfl/pfl-3.2-r2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/portagefilelist/client/archive/${PV}.tar.gz -> ${P}.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="+network-cron"
 
 DEPEND=""