gentoo resync : 02.02.2022

5 files changed, 3 insertions, 59 deletions

diff --git a/app-eselect/Manifest.gz b/app-eselect/Manifest.gz
index 18a3f168a0fc..b0e828b7bd13 100644
--- a/app-eselect/Manifest.gz
+++ b/app-eselect/Manifest.gz
diff --git a/app-eselect/eselect-php/Manifest b/app-eselect/eselect-php/Manifest
index 7e632cab94ca..092b9e60dca0 100644
--- a/app-eselect/eselect-php/Manifest
+++ b/app-eselect/eselect-php/Manifest
@@ -5,6 +5,6 @@ DIST eselect-php-0.9.8.tar.xz 62048 BLAKE2B 7938053be5d3893d1b3b399decb9fb90ecc1
 EBUILD eselect-php-0.9.6.ebuild 1085 BLAKE2B a944549cb5f6b77bc2dac62da22eedb58dc0ddf4cdf45e90996830b4ab585d9a15edfb3a8e0f56b29b25e296e80e0b635cd822a9e5707c9ea4c400934511c414 SHA512 53bc5e237bf484adb1ea3cae1c5be68545c2e532c75be85fb070bedc05f3a5bc940c08dec9e00505ccb6982afe557506832a5e7a47f116d6a11e0c3c8b092fd0
 EBUILD eselect-php-0.9.7-r1.ebuild 1213 BLAKE2B 134401996bd58666344052c5bc5ffda9c9cf7d7b0ac3ef9e1ddb27714be8a2f6fed27b5364fa07b2ae7c0c28bb0739e1cf504c79c7631b93fadc63b7be722122 SHA512 4aa1b52b014f1f49c156778db2aaed19bbeeeac4cd54336b19243806caa9be525bbee9cd380cc54863c5d377d4c1bf408895774a64ae86b4f9a9991b2b7c904f
 EBUILD eselect-php-0.9.7.ebuild 1149 BLAKE2B 42b0e8f6411a2897d51329af1c884f2ef2a83787c3e4b3828227c002f3762f9f024562dd2f02a78186e2f3157f6dcaf3d1b5aaf55e5e30d44499468d0d9523fa SHA512 71a0347ac32643458075e6cec11affc56fe548f36c8c08aa8e80869578a8a73d640dedf8657d6cbbe4dcda31bb974e50d08dd9ecbe4559d92cd2fa64b7663aa6
-EBUILD eselect-php-0.9.8.ebuild 1218 BLAKE2B 999b2b7590070f98bca317f1ebc0da463409ebf8e31c10768ac9931404099f512384882d5a8571fa48931230ddc06d780a69f7e08105dfebb5488a1088e31271 SHA512 223f99e7acfb00e9eb21e01eb1e4d2bd3060a9bdb64ec10ef882a0cbdfbf2be9a2e2af35217d22b1b9b7c0d34339d0211dd3542b7865acbc33c3072ef6ad4169
+EBUILD eselect-php-0.9.8.ebuild 1211 BLAKE2B 1eeabc041327897e99f401e74e5d187860ceed3f4aa4aa2da4208a807dfc1f340aa3d12706cb4dc730b97bc0e8def1a441fb1b5f0a3e49f4b8dfc5dbbefada1a SHA512 bef600f792cc3ff9eb6e5924db73133876f10a64d5804121295de77e2bffbd6912f9cdc5a5edd73a599f75d1173ca55fb8b05decc0d58e85b0b3fb6350166edc
 EBUILD eselect-php-9999.ebuild 1153 BLAKE2B ade19fc85e3e4d3c4212d9ca7c3b921fcd543f335ffa413952df2a8e50c37f49b6bead740932a530f0715dd8eb530fa15d40ccf1e75e23e99e10f434f065b8e3 SHA512 4bd50376d44d4a740ea11268b8c890ed6d7bc430e84c48042c182c7b48ab4eaa438b525480f21053b4a75bfe94b31012b848a5da17fb019e9ba673182ab783a8
 MISC metadata.xml 469 BLAKE2B 5673844c7acdf9d8c0670aa386e49864d4d96a393e0589561a6d31cc9ced135119622d35cf8e5296adeae1bcb5e5b3f23fc75f447bc288547a1bda6dc0266cc7 SHA512 f2570073ee901fd2ac92ca20bd0faca521007eb57b9fd9368b99dc5d8f97131f0eb044d75cf16b8b0ef600f2d6368498a968552b4696b2d46cf040529c05d15e
diff --git a/app-eselect/eselect-php/eselect-php-0.9.8.ebuild b/app-eselect/eselect-php/eselect-php-0.9.8.ebuild
index a316d2866307..0b16cb3a69dd 100644
--- a/app-eselect/eselect-php/eselect-php-0.9.8.ebuild
+++ b/app-eselect/eselect-php/eselect-php-0.9.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="https://dev.gentoo.org/~grknight/distfiles/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="fpm apache2"
 
 # The "DirectoryIndex" line in 70_mod_php.conf requires mod_dir.
diff --git a/app-eselect/eselect-wxwidgets/Manifest b/app-eselect/eselect-wxwidgets/Manifest
index 7dfa7e28488f..d0f0f5691ffb 100644
--- a/app-eselect/eselect-wxwidgets/Manifest
+++ b/app-eselect/eselect-wxwidgets/Manifest
@@ -1,6 +1,4 @@
-DIST eselect-wxwidgets-20140423.tar.xz 6792 BLAKE2B ee94e98b9f2473b8e8356ecab483224c027f26a170e02fa8b4e94f18227abb2f1a8f2acd6c5b33dcbf22d4cdadb0421ae487890f9501410559510f3b28ded6c0 SHA512 0d83e0b6979803c8a02c20ac33a42c91fd8d350c095e26704a80c1913309f0e7d741cc466ab22e0a6ce4773deab21ca80756299a12a83d441ded968531003d0e
 DIST eselect-wxwidgets-20180529.tar.xz 2380 BLAKE2B 2f5d5e79b9cd85442b0aa0d1453d84651308d4c33711b919802b383bb98865b615a9afd0493b4d34232c3d986e68246e35943d96a31e25a3fb2778b6483ec764 SHA512 d91e87f23c7feb807ed75fcfd363b61fadd8c305e3aa82c5e3dfa3d9fbc2c18a8b7e6404bcac9ebd6c34269406712d453e5bd877509f26f3648cb864df36e281
 DIST eselect-wxwidgets-files.tar.bz2 9126 BLAKE2B 47ec94aec721d325fc483ece28e84b48c35b103078415447b6e79e68ab44af9356955c960b9464713396f4cbbf663522e5a4493516414641aa5b99e7cdca0ac8 SHA512 c5aba3bf4bbb891534e0c7a444da6cb90a947dab407e436a1eccd13ddb33251816ce95b5fb6826aa9a64ec2b3d9be09c9852859597b0b8ce91cbaf0f6ed6da5e
-EBUILD eselect-wxwidgets-20140423.ebuild 1479 BLAKE2B 51bdaa7b909a55b5b83c12212c1ed1e067db114e1c4517742e0586898365f23116305963376442937241ebc2e72914b877e95adf6f2b2cbf1099f578531d9c5d SHA512 0751d77bc667e6231aef507135c9a709c63a21cf800a3e1fe9822ccbf8572e8095daddb6b7ba6675b352a9a7cab891ee85e22476e0b80c7989fb0cc1fd47b2ce
 EBUILD eselect-wxwidgets-20180529.ebuild 1486 BLAKE2B ac7eb160477f0ab7e0e92f660a6bbd7371ceef3b0eec437af81ff50ceb1b4a597c530c3f2b602ee41e26d93eeeb0b545c9e18a69120a7faace038ddccf5a955d SHA512 4363afa242eee96cbd868ae3264518c3a1ac295ee836640ad7962f8949554b6d8c6646861994deb40f0d6b4572e409f4a9cf8f35a904cc95bb65b98ee065fbea
 MISC metadata.xml 286 BLAKE2B 91c8e29e8be49c7c6771d57afcc8e56318257f45486adcc9c783b8e658b144306cf9afb5e40ec85a9efd83d1b94e7d849234aaf9c19fe161d18d7a4dce548d5e SHA512 8c4c678d180c83ab8b5235d415a740593795675c74118aa927965a2edb18fa411b17797b0d4049cc67428420f6dcd40636267a7784b61bc5dacd27fb59bcc5fb
diff --git a/app-eselect/eselect-wxwidgets/eselect-wxwidgets-20140423.ebuild b/app-eselect/eselect-wxwidgets/eselect-wxwidgets-20140423.ebuild
deleted file mode 100644
index 78ce320a1d34..000000000000
--- a/app-eselect/eselect-wxwidgets/eselect-wxwidgets-20140423.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit multilib
-
-WXWRAP_VER=1.4
-
-DESCRIPTION="Eselect module and wrappers for wxWidgets"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-SRC_URI="https://dev.gentoo.org/~junghans/dist/${P}.tar.xz
-	https://dev.gentoo.org/~mgorny/dist/${PN}-files.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-IUSE=""
-
-RDEPEND="app-admin/eselect"
-
-src_prepare() {
-	cp "${WORKDIR}"/eselect-wxwidgets-files/{wx-config,wxrc}-${WXWRAP_VER} . || die
-	sed \
-		-e "/^LIBDIR=/s:lib:$(get_libdir):" \
-		-e "/^EPREFIX=/s:'':'${EPREFIX}':" \
-		-i {wx-config,wxrc}-${WXWRAP_VER} || die
-}
-
-src_install() {
-	insinto /usr/share/eselect/modules
-	doins wxwidgets.eselect
-
-	insinto /usr/share/aclocal
-	newins "${WORKDIR}"/eselect-wxwidgets-files/wxwin.m4-3.0 wxwin.m4
-
-	newbin wx-config-${WXWRAP_VER} wx-config
-	newbin wxrc-${WXWRAP_VER} wxrc
-
-	keepdir /var/lib/wxwidgets
-	keepdir /usr/share/bakefile/presets
-}
-
-pkg_postinst() {
-	if [[ ! -e ${EROOT}/var/lib/wxwidgets/current ]]; then
-		echo 'WXCONFIG="none"' > "${EROOT}"/var/lib/wxwidgets/current
-	fi
-
-	echo
-	elog "This eselect module only controls the version of wxGTK used when"
-	elog "building packages outside of portage.  If you are not doing development"
-	elog "with wxWidgets or bakefile you will never need to use it."
-	echo
-}