gentoo auto-resync : 29:07:2022 - 15:07:44

13 files changed, 92 insertions, 269 deletions

diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 1725c9477c3a..f08f25bcda63 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/ansible-lint/Manifest b/app-admin/ansible-lint/Manifest
index 7adb00c8887a..dfeacf073cb6 100644
--- a/app-admin/ansible-lint/Manifest
+++ b/app-admin/ansible-lint/Manifest
@@ -4,5 +4,5 @@ DIST ansible-lint-6.2.2.tar.gz 232952 BLAKE2B 571dce6dc348c1158fed396fc29054421d
 DIST ansible-lint-6.3.0.tar.gz 268331 BLAKE2B 00ea2dbc7bb5e71d63a737ac99d4116441f6b1eee2fa476d9aa4d78068064e53975df00950f337e7c9e25dacf8778ddd2e40eb5d3ea1301f56a80dfd90d42c20 SHA512 3e9d480cb90f3022a4b001c061c3e76b753620776a009b1563dce335c13ee38b7ac334725592ac644a2808d85ceb98b618a451c193bc7c4961474d4e7fbbb88e
 EBUILD ansible-lint-5.4.0.ebuild 1852 BLAKE2B 913794c189a58ed0fa3cd0febde7b0ac4788294bee7b1309eb1d70f5619289d4c80f57a8227a7a834ce299c6a24a7c59285425c737d7b0cbd1e53c47ac570650 SHA512 5ca55f7c4d72b01d95813ecef1f3e984ff92993fb0cbf7e5090d938349dba942b88e695e6e34e022385c5a4d6e1fb457766d19aee606ceddedc458fa84c91bb4
 EBUILD ansible-lint-6.2.2.ebuild 2443 BLAKE2B 65f93d1523c1cea6ceab40516c4b228881660718f4f7a4a2d98ffe205e7aa4e1b43d57ba6f081ff0d8e291889ba470f701e479fa24848eb0ad561fc85def2b5a SHA512 ddd4cfcf1940a27b3af62bd440e81c21c5fc7a6faaec5875398396bfc1dda54ee00023199e8d6f0e10f3c225a3d5ee26c5fd21edd1d59e3cb51e2342e8b8c1f5
-EBUILD ansible-lint-6.3.0.ebuild 2443 BLAKE2B b545898fa4aa33755f8741030b4b38cd6b9ab6b0bcee20f5625f8e6403a6c046d14b52882c1bdbc39c037bce6f48eb1cbd4a2c04f713a9b473254052ffe90f59 SHA512 78ae5e916712528aa349f3bd811f7302b2a364797e3eb8962f354d8d7420b0fdcf8d8a85f6477bfa9d8dd31c8f1addc0e3e736ff130245ae8fd7ea9abfb0c3aa
+EBUILD ansible-lint-6.3.0.ebuild 2579 BLAKE2B ec7b5653eed42701af8469791f48b7c3a82efa6a2fa5369aa89ca01e613a977b6ba2b5b4c9abaf825475a89360d4498c0408dca0573681309790a3a96195d73f SHA512 b975db3ada230a8a6b24e211b6aa5818bc1e99a9bdb0cdfa2672a05f65b9a8f8ba53c64107451c9acf63b895ae5be5b33eafc498ef90747a31bf92ef657a785c
 MISC metadata.xml 561 BLAKE2B 0f55fc4da270c495c445e5afff0a8f7aaedd01abf3640f848cd9dc21e01fa7324c78846ee4bf917e4869b6c377fef61254a2288fa3d572c1bb77279571fb6631 SHA512 bd6bf6b916a0b736a0bfdd633f6569ce3124458169d77ef1cd86d6dda4099774088871560ce0106e11f139a2b48f13445e7a844e03a8669160c7e3fa44be5f36
diff --git a/app-admin/ansible-lint/ansible-lint-6.3.0.ebuild b/app-admin/ansible-lint/ansible-lint-6.3.0.ebuild
index 6a378c69fa29..4aea510b329c 100644
--- a/app-admin/ansible-lint/ansible-lint-6.3.0.ebuild
+++ b/app-admin/ansible-lint/ansible-lint-6.3.0.ebuild
@@ -17,12 +17,6 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~riscv"
 
-# Since 6.2.0 ansible-lint once again does not need access to Ansible Galaxy
-# even to get the test suite started, however quite a large fraction of tests
-# fails without network access. Needs more work.
-PROPERTIES="test_network"
-RESTRICT="test"
-
 RDEPEND="
 	>=app-admin/ansible-base-2.12.0[${PYTHON_USEDEP}]
 	>=dev-python/ansible-compat-2.1.0[${PYTHON_USEDEP}]
@@ -47,18 +41,26 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-6.0.2_test-module-check.patch
 )
 
-# Skip problematic tests (TODO: update this list for ansible-lint-6.2.0+):
+# Skip problematic tests:
 #  - test_call_from_outside_venv doesn't play nicely with the sandbox
-#  - all test_eco and some test_prerun tests require Internet access
-#  - as of 5.4.0, test_cli_auto_detect fails even when run manually with tox
+#  - all the others require Internet access, mostly in order to access Ansible Galaxy
 EPYTEST_DESELECT=(
+	test/test_cli_role_paths.py::test_run_playbook_github
 	test/test_eco.py
+	test/test_examples.py::test_custom_kinds
+	test/test_import_playbook.py::test_task_hook_import_playbook
+	test/test_list_rules.py::test_list_rules_includes_opt_in_rules
+	test/test_list_rules.py::test_list_rules_with_format_option
+	test/test_list_rules.py::test_list_tags_includes_opt_in_rules
 	test/test_main.py::test_call_from_outside_venv
 	test/test_prerun.py::test_install_collection
 	test/test_prerun.py::test_prerun_reqs_v1
 	test/test_prerun.py::test_prerun_reqs_v2
 	test/test_prerun.py::test_require_collection_wrong_version
+	test/test_rules_collection.py::test_rich_rule_listing
 	test/test_utils.py::test_cli_auto_detect
+	test/test_utils.py::test_template_lookup
+	test/test_verbosity.py::test_default_verbosity
 )
 
 distutils_enable_tests pytest
diff --git a/app-admin/awscli/Manifest b/app-admin/awscli/Manifest
index 84ed4ff87476..4b955631e1a4 100644
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@@ -2,8 +2,10 @@ DIST aws-cli-1.25.26.gh.tar.gz 2230449 BLAKE2B bb792fb2e4ba25870168e4fc3301d4b92
 DIST aws-cli-1.25.31.gh.tar.gz 2233721 BLAKE2B 791bd78851c5643ee72faddc8e4d4e39c94a91e4879d749bcf2cadbe4797cdd448a95dd2b3c626b76e648303ec93fc0338d08f79227f05ff467754810166731b SHA512 586f0fa0f81ec8acc0b79fba5372a37ebcf162981c8fbab31633f63736337cae0b4788bb7a4cdabf6e04800fb63ed6804a6a73a7d5552a9b4c85b4eb273ee6d8
 DIST aws-cli-1.25.36.gh.tar.gz 2237211 BLAKE2B fbab136a1c1211646c1213357cd80068da376e4aceb38007c14b2fb670a694b37aaa0157d58eb4edf10c3a9b5a700575a42b48c06db1c4034f39ccda584be19a SHA512 b66ba357085c82dcefc4ed9a6d0765d8768c8d216cd255056be055d3b5f604b62bace3eacccac83275d7c9487847f7de542efa804f8e0f454947cfe453d6e705
 DIST aws-cli-1.25.37.gh.tar.gz 2237143 BLAKE2B 3c51a5e56964fb8c4e5374892e185da7817f798a66fac2fd181acf068e1419bf4e8749590c9cbeb0d4344b82de4ecc44ce8b4eaf8b133895d60055783f1a6263 SHA512 533459e94db747fe4a6daad598b2b0d894202e60080505ad3d0864c54c8286c7d56d615cb1232cfadd1bd1181aede327d3fed3eca863dcfc92efb4867736b7fb
+DIST aws-cli-1.25.40.gh.tar.gz 2238762 BLAKE2B 62d4db7d25ca82f744726a7daef740bc9726b5c99098c5f6d45cc469dba73000371c76cdb19a7bedb2fbc3196a11c31ff4701f9ca26d39127fbe10210dd5b480 SHA512 e7f1c368ecbdb75440072e0bbe2f839713b49922be0375e2c9df3d3e99e42c71e266c39923694b143685ce5f5d3dc719aa0baf1dd190f3d0a83c20d4e905db21
 EBUILD awscli-1.25.26.ebuild 1834 BLAKE2B 8dd7abd62571c499386dcc73967b693b028c094797cb10c43b7719b7ad2af01e683c056e9888e6ab6119204362dd2e61b6a465d3d115045130075d54c16295aa SHA512 84785cb46646fc3c97a504a712db51fc68d92739732fe696c1d5e198b99fc5665776629400cb99cb17fcebc47f6a426cc3678c827ebf28912854b8f9b5960906
 EBUILD awscli-1.25.31.ebuild 1836 BLAKE2B dae7d5415e625d711cf8b71492dfe80e2ffe77da7c538f4a7b04e2777c942973ad985fdb2f65a96511ce7486c3a4e78daed6110194672b19651191f7db2f484a SHA512 8454d269cfbca202e068c39704fdf48b9e21985e6ee1e825399620585707d315c867ef26f9726c2d8b8f55054980bd5f8e88ffaa0ed8cf45a4eedb5c410325d2
 EBUILD awscli-1.25.36.ebuild 1836 BLAKE2B dae7d5415e625d711cf8b71492dfe80e2ffe77da7c538f4a7b04e2777c942973ad985fdb2f65a96511ce7486c3a4e78daed6110194672b19651191f7db2f484a SHA512 8454d269cfbca202e068c39704fdf48b9e21985e6ee1e825399620585707d315c867ef26f9726c2d8b8f55054980bd5f8e88ffaa0ed8cf45a4eedb5c410325d2
 EBUILD awscli-1.25.37.ebuild 1836 BLAKE2B dae7d5415e625d711cf8b71492dfe80e2ffe77da7c538f4a7b04e2777c942973ad985fdb2f65a96511ce7486c3a4e78daed6110194672b19651191f7db2f484a SHA512 8454d269cfbca202e068c39704fdf48b9e21985e6ee1e825399620585707d315c867ef26f9726c2d8b8f55054980bd5f8e88ffaa0ed8cf45a4eedb5c410325d2
+EBUILD awscli-1.25.40.ebuild 1836 BLAKE2B dae7d5415e625d711cf8b71492dfe80e2ffe77da7c538f4a7b04e2777c942973ad985fdb2f65a96511ce7486c3a4e78daed6110194672b19651191f7db2f484a SHA512 8454d269cfbca202e068c39704fdf48b9e21985e6ee1e825399620585707d315c867ef26f9726c2d8b8f55054980bd5f8e88ffaa0ed8cf45a4eedb5c410325d2
 MISC metadata.xml 334 BLAKE2B 84c9f50e6c0d015aad36a7f625cddf90cf1137a8c2d445cc641cd4890d64261187c10fde59ee1a6c19b98cfdb6ff534c66ae7a7a48a00ec62d6984c9a1891750 SHA512 a845de531df2cd75abf23cdbfa613e586855b95ac4e96566ef193708d7ecf2ec7f7db72fd31b8af0ac4ccd57e51da9c6d129d426bfdc6c4feb57d7df8647f160
diff --git a/app-admin/awscli/awscli-1.25.40.ebuild b/app-admin/awscli/awscli-1.25.40.ebuild
new file mode 100644
index 000000000000..9f176fa05cc8
--- /dev/null
+++ b/app-admin/awscli/awscli-1.25.40.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit bash-completion-r1 distutils-r1 multiprocessing
+
+MY_P=aws-cli-${PV}
+DESCRIPTION="Universal Command Line Environment for AWS"
+HOMEPAGE="
+	https://github.com/aws/aws-cli/
+	https://pypi.org/project/awscli/
+"
+SRC_URI="
+	https://github.com/aws/aws-cli/archive/${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+# botocore is x.(y+2).z
+BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(ver_cut 3-)"
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	dev-python/colorama[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/rsa[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	!app-admin/awscli-bin
+"
+BDEPEND="
+	test? (
+		dev-python/pytest-forked[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# do not rely on bundled deps in botocore (sic!)
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+	# strip overzealous upper bounds on requirements
+	sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# integration tests require AWS credentials and Internet access
+	epytest tests/{functional,unit} -n "$(makeopts_jobs)" --forked
+}
+
+python_install_all() {
+	newbashcomp bin/aws_bash_completer aws
+
+	insinto /usr/share/zsh/site-functions
+	newins bin/aws_zsh_completer.sh _aws
+
+	distutils-r1_python_install_all
+
+	rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
+}
diff --git a/app-admin/chrpath/Manifest b/app-admin/chrpath/Manifest
index b762d7fffea7..b8c13e4dbd52 100644
--- a/app-admin/chrpath/Manifest
+++ b/app-admin/chrpath/Manifest
@@ -1,11 +1,6 @@
-AUX chrpath-0.13-multilib.patch 4129 BLAKE2B d6a2405751bba1774bd62ad3244928e0243c24825e986ed9e1531d28bd7521fb67fd5523365e574bfed1f8b404002afb76b89ec3e855fb6f5eababe042b5e360 SHA512 45f1a25a7abee84e955ffb13485480efb1f768cb225d35a57fae5fa6a75dac7d633aa7221aad81aa6fef2cf8f27f221dcaee972ad82e70677049f2f2fc6e9ff3
-AUX chrpath-0.13-testsuite-1.patch 575 BLAKE2B 0fa870a459c564a48ec82a86af46ca25afd52b98e9342b4690b876fcac18357fabe996fdb638378128596271f2855219de48b651903ec655316a166b746921e7 SHA512 0969af4defcf4b3650e4416c8d17d747f6a785b6a2f0cdd2105e6ff111c04ecbfc236c073e6f48096494b08c41d6077a332b02104ff3e07e60c542d706f7ef6c
 AUX chrpath-0.16-multilib.patch 3814 BLAKE2B 354a0fdadc5e18a5e6736bf8a2796c91e82d90e6e7053d8a37080a7a1bc5e7893f28ee0bfe19d4f9dace032af91924bf6a3e63e74cb0e82cd51cac2faabf594a SHA512 db577ae0801f031bf4a143ed4f7770e087d1ee27520dff22948c90d97495d9bb73a48f47012b81deef71b863953e1bd6debbdfb3c5356eda6c4e5a91a8d830b1
 AUX chrpath-0.16-solaris.patch 349 BLAKE2B 5199c9800f649cc93b70eea782a41d26481ff64556c1348cc843b2a98a769d100bf50fb1af93f745a5021c28e65ba8b8832028df3e370c5910c1623e6af09ccc SHA512 7f6722c35fb95079ac2ef8f6973e1f719744b63eab9805d5ad6a0dfc9184e9a6527124cb1cb004e328eb7cc0b2ef881c2e1d4f471833049052f69ded9bce23e7
 AUX chrpath-0.16-testsuite-1.patch 547 BLAKE2B a6b579d54dff49736474afdcf8a7a069411c6f38d7fa370b247b26d0889787ae89d910f16124cb32f1a1e9e202c2f0422ea98fe751f9dc88eb31c97e46eb325e SHA512 197bf3d89da437dee8d8fac2c80fd683a5ed6d5310e8af87c0d89f4b5390a3b37fac7591d7df183ff6eef9502ccf0734502ad9d87fa0ebe38bee3543498e1eff
-AUX chrpath-keepgoing.patch 1041 BLAKE2B d5ec2b6d482fbd42b2d3cd04626984c1d6ea0c5ca35d5aa25160bb6781a0bd534c637d90e19f8c873e12ad477b2f0d17d57f066401afd95fc0d82c4e3319ff12 SHA512 7bd459313f3cd83c86c63adf8a39df41c0454f6a689aab803d3211b5ffa295a72ce45a8ed7c3f61af0f705fc614c4ce48d86c6a5706b20c4d45265bbeafceb9c
-DIST chrpath-0.13.tar.gz 125129 BLAKE2B 004db7e3567ceeb700d018e7e32036843413605466c218bf40252927b169775c5a86f81f8ea355f0d141821313d114ec24654ed62d75443e31739118e31bc497 SHA512 9ec2ab2731fb553497996939b421130ae221d478dab8887c184ae91f7d3ae697688e7a30e3bea30cc0cf765f1dc8c7f47d2a1f4369b36079b4033e8d0303d75e
 DIST chrpath-0.16.tar.gz 134506 BLAKE2B 7003cc1cb2332ffbe6fe0873c6d30cbc3ea696e041be33b39c3d36ae34a2497b8dd40bb373773c546b8d63cfd8534e796fd7d7cbc99d37fb8751fc960907070f SHA512 aa04d490f78bff20a56fe20539cec10218c0772a668909eda8324ca825f51e8ef92001e95d9c316e79a145a043c9c327ec94d1a82e104ab408ca1021832745aa
-EBUILD chrpath-0.13-r2.ebuild 1109 BLAKE2B 1dcaff7b62d98ef82bdf7afb09428ddbba33b14c36eaa37a44799150f2e7b981a2ee9e769cbb25356d2531e0d321e449414edcdc213c2643f966b4d864a5c63a SHA512 2e22eb2ae3d951c4cbe283a0aeb4e4fb0582db6f2229c22037f75ac5bb90dc08b6df46e1092fb1892c8a3a11c81f3c3267a83dd7efe373bdd43f74e65634fdce
-EBUILD chrpath-0.16.ebuild 1050 BLAKE2B b18bf1c2123cae1f6d422e2d79186f95941fef87949685d646207c0b18a0bff746d019eb47a7b64a4e65e33a7d86c4b2062c1111782cb8be06873aac35c5b5e4 SHA512 b7c7b1bee6f9fb2139355bad7ee4973f0c862e9074be3ddd2bb0b5f9ddc1c65f5306392d3481a0cca6f6bd12f594af54395d4d72b27326ec7ba80971c83b6751
+EBUILD chrpath-0.16-r1.ebuild 937 BLAKE2B 546a1d52ba5ca94af50838be64b8b5bc940b7d8c290ab2cd1cf525978d72642e8515f1128882137f072333115fea0df4d49c4e9fac2266f847bad1d1e39e099c SHA512 21d25f62af238957a95df66153758f2d07e85885bf566d8b8e87080726d7fa983f36b115313979097d03600f0593970a5dd79d5e3a2bbe6c9dce7bd7d6015783
 MISC metadata.xml 327 BLAKE2B 666c7327826c5b52e20272cd33b5cbd984955ad06f87ff25431aa588c85dad5b8c2756b44046c51fb039df924c7f45c1b322dbcb4d42aa97894a175984e13356 SHA512 962e2bc7783c7e7b666956bc746691c295a41aa52720809b3c91afc2691d5a8fb8954fe993954112afd4ceb51af59b68564b52fbeeb9c86be480cf788c60d667
diff --git a/app-admin/chrpath/chrpath-0.13-r2.ebuild b/app-admin/chrpath/chrpath-0.13-r2.ebuild
deleted file mode 100644
index 89d26b3b7e07..000000000000
--- a/app-admin/chrpath/chrpath-0.13-r2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="Chrpath can modify the rpath and runpath of ELF executables"
-HOMEPAGE="https://directory.fsf.org/wiki/Chrpath"
-# original upstream no longer exists (ftp://ftp.hungry.com/pub/hungry)
-SRC_URI="https://alioth-archive.debian.org/releases/${PN}/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 arm ~mips ppc ppc64 x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="static-libs"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-multilib.patch
-	"${FILESDIR}"/${PN}-keepgoing.patch
-	"${FILESDIR}"/${P}-testsuite-1.patch
-)
-
-src_prepare() {
-	default
-	# disable installing redundant docs in the wrong dir
-	sed -i -e '/doc_DATA/d' Makefile.am || die
-	# fix for automake-1.13, #467538
-	sed -i -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' configure.ac || die
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_enable static-libs static)
-}
-
-src_install() {
-	default
-	if ! use static-libs; then
-		find "${D}" -name "*.la" -delete || die
-	fi
-}
diff --git a/app-admin/chrpath/chrpath-0.16.ebuild b/app-admin/chrpath/chrpath-0.16-r1.ebuild
index 70462428ff6c..287cacc4a7d6 100644
--- a/app-admin/chrpath/chrpath-0.16.ebuild
+++ b/app-admin/chrpath/chrpath-0.16-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit autotools
 
@@ -11,8 +11,7 @@ SRC_URI="https://alioth-archive.debian.org/releases/${PN}/${PN}/${PV}/${P}.tar.g
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~mips ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="static-libs"
+KEYWORDS="amd64 arm ~arm64 ~mips ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-multilib.patch
@@ -29,13 +28,7 @@ src_prepare() {
 	eautoreconf
 }
 
-src_configure() {
-	econf $(use_enable static-libs static)
-}
-
 src_install() {
 	default
-	if ! use static-libs; then
-		find "${D}" -name "*.la" -delete || die
-	fi
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/app-admin/chrpath/files/chrpath-0.13-multilib.patch b/app-admin/chrpath/files/chrpath-0.13-multilib.patch
deleted file mode 100644
index e7db0a124053..000000000000
--- a/app-admin/chrpath/files/chrpath-0.13-multilib.patch
+++ /dev/null
@@ -1,160 +0,0 @@
-Index: chrpath-0.13/Makefile.am
-===================================================================
---- chrpath-0.13.orig/Makefile.am
-+++ chrpath-0.13/Makefile.am
-@@ -12,12 +12,19 @@ debs:
- 	fakeroot debian/rules binary
- 
- chrpath_SOURCES = \
--	chrpath.c	\
--	killrpath.c	\
- 	main.c		\
--	elf.c		\
- 	protos.h
- 
-+chrpath_LDADD = $(LDLIBS)
-+
-+lib_LTLIBRARIES = libchrpath32.la libchrpath64.la
-+libchrpath32_la_SOURCES = chrpath.c killrpath.c elf.c protos.h
-+libchrpath32_la_CFLAGS = -DSIZEOF_VOID_P=4
-+libchrpath32_la_LDFLAGS = -avoid-version
-+libchrpath64_la_SOURCES = chrpath.c killrpath.c elf.c protos.h
-+libchrpath64_la_CFLAGS = -DSIZEOF_VOID_P=8
-+libchrpath64_la_LDFLAGS = -avoid-version
-+
- EXTRA_DIST = ChangeLog.usermap $(man_MANS)
- 
- CLEANFILES = *.bb *.bbg *.da *.gcov testsuite/*.bb testsuite/*.bbg
-Index: chrpath-0.13/configure.ac
-===================================================================
---- chrpath-0.13.orig/configure.ac
-+++ chrpath-0.13/configure.ac
-@@ -16,6 +16,7 @@ CHRPATH_LDRPATH_OPTION
- dnl Checks for programs.
- AC_PROG_CC
- AC_PROG_INSTALL
-+AC_PROG_LIBTOOL
- 
- dnl Checks for libraries.
- 
-@@ -26,11 +27,19 @@ AC_CHECK_HEADERS([getopt.h elf.h fcntl.h
- dnl Checks for typedefs, structures, and compiler characteristics.
- AC_C_CONST
- AC_C_BIGENDIAN
--AC_CHECK_SIZEOF(void *)
- 
- dnl Checks for library functions.
- AC_CHECK_FUNCS(getopt_long)
- 
-+dnl See if we need -ldl on this platform for dlopen
-+LDLIBS=
-+save_LIBS="$LIBS"
-+LIBS=
-+AC_SEARCH_LIBS([dlopen], [dl])
-+LDLIBS=${LIBS}
-+LIBS="${save_LIBS}"
-+AC_SUBST([LDLIBS])
-+
- if eval "test x$GCC = xyes"; then
-   for flag in \
-       -ansi \
-Index: chrpath-0.13/main.c
-===================================================================
---- chrpath-0.13.orig/main.c
-+++ chrpath-0.13/main.c
-@@ -12,13 +12,19 @@
- #  include "config.h"
- #endif
- 
-+#include <dlfcn.h>
-+#include <elf.h>
-+#include <fcntl.h>
- #include <stdio.h>
- #include <stdlib.h>
-+#include <string.h>
- #include <unistd.h>
- #ifdef HAVE_GETOPT_H
- #include <getopt.h>
- #endif
--#include "protos.h"
-+
-+typedef int (*killrpath_t)(const char *filename);
-+typedef int (*chrpath_t)(const char *filename, const char *newpath, int convert);
- 
- #ifdef HAVE_GETOPT_LONG
- #  define GETOPT_LONG getopt_long
-@@ -61,6 +67,30 @@ usage(char *progname)
-   printf("\n");
- }
- 
-+static unsigned
-+elf_class(const char *filename)
-+{
-+   Elf32_Ehdr ehdr;
-+   int fd;
-+
-+   fd = open(filename, O_RDONLY);
-+   if (fd == -1)
-+     return 0;
-+   if (read(fd, &ehdr, sizeof(ehdr)) != sizeof(ehdr))
-+   {
-+     close(fd);
-+     return 0;
-+   }
-+   close(fd);
-+   if ((memcmp(ehdr.e_ident, ELFMAG, SELFMAG) != 0)
-+       || (ehdr.e_ident[EI_VERSION] != EV_CURRENT))
-+   {
-+     fprintf(stderr, "`%s' probably isn't an ELF file.\n", filename);
-+     return 0;
-+   }
-+   return ehdr.e_ident[EI_CLASS];
-+}
-+
- int
- main(int argc, char * const argv[])
- {
-@@ -73,6 +103,9 @@ main(int argc, char * const argv[])
- #ifdef HAVE_GETOPT_LONG
-   int option_index = 0;
- #endif /* HAVE_GETOPT_LONG */
-+  void* dll[2];
-+  killrpath_t killrpath[2];
-+  chrpath_t chrpath[2];
- 
-   if (argc < 2)
-     {
-@@ -116,14 +149,31 @@ main(int argc, char * const argv[])
-       }
-   } while (-1 != opt);
- 
-+  dll[0] = dlopen("libchrpath32.so", RTLD_LAZY);
-+  killrpath[0] = (killrpath_t)dlsym(dll[0], "killrpath");
-+  chrpath[0] = (chrpath_t)dlsym(dll[0], "chrpath");
-+
-+  dll[1] = dlopen("libchrpath64.so", RTLD_LAZY);
-+  killrpath[1] = (killrpath_t)dlsym(dll[1], "killrpath");
-+  chrpath[1] = (chrpath_t)dlsym(dll[1], "chrpath");
-+
-   while (optind < argc && (!retval || keep_going))
-     {
-+      const char* program = argv[optind++];
-+      unsigned eclass = elf_class(program);
-+      if (!eclass)
-+      {
-+        retval = 1;
-+        continue;
-+      }
-       if (remove)
--        retval |= killrpath(argv[optind++]);
-+        retval |= killrpath[eclass - ELFCLASS32](program);
-       else
-         /* list by default, replace if path is set */
--        retval |= chrpath(argv[optind++], newpath, convert);
-+        retval |= chrpath[eclass - ELFCLASS32](program, newpath, convert);
-     }
- 
-+  dlclose(dll[0]);
-+  dlclose(dll[1]);
-   return retval;
- }
diff --git a/app-admin/chrpath/files/chrpath-0.13-testsuite-1.patch b/app-admin/chrpath/files/chrpath-0.13-testsuite-1.patch
deleted file mode 100644
index 1a30ce1eb94a..000000000000
--- a/app-admin/chrpath/files/chrpath-0.13-testsuite-1.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Submitted By: Mario Fetka (geos_one) (mario dot fetka at gmail dot com)
-Date: 2010-04-04
-Initial Package Version: 0.13
-Origin: me
-Upstream Status: unknown
-Description: make the testsuite run with the new mltilib design
- 
-diff -Naur chrpath-0.13.orig/testsuite/runtest.sh chrpath-0.13/testsuite/runtest.sh
---- chrpath-0.13.orig/testsuite/runtest.sh	2010-04-04 09:02:21.859114159 +0000
-+++ chrpath-0.13/testsuite/runtest.sh	2010-04-04 09:42:08.762112560 +0000
-@@ -2,6 +2,8 @@
- 
- set -x
- 
-+export LD_LIBRARY_PATH=$PWD/../.libs:$LD_LIBRARY_PATH
-+
- CHRPATH=../chrpath
- 
- retval=0
diff --git a/app-admin/chrpath/files/chrpath-keepgoing.patch b/app-admin/chrpath/files/chrpath-keepgoing.patch
deleted file mode 100644
index d8f6965729ff..000000000000
--- a/app-admin/chrpath/files/chrpath-keepgoing.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- chrpath-0.13/main.c.orig	2006-02-27 20:21:06.000000000 +0100
-+++ chrpath-0.13/main.c	2006-02-27 21:07:16.027641500 +0100
-@@ -57,6 +57,7 @@
-   printf("   -r <path>|--replace <path>  Replace current rpath/runpath setting\n");
-   printf("                               with the path given\n");
-   printf("   -l|--list                   List the current rpath/runpath (default)\n");
-+  printf("   -k|--keepgoing              Continue as much as possible after an error.\n");
-   printf("   -h|--help                   Show this usage information.\n");
- #ifndef HAVE_GETOPT_LONG
-   printf("\n *** The long options are not available on this platform");
---- chrpath-0.13/chrpath.1.orig	2004-09-19 10:35:44.000000000 +0200
-+++ chrpath-0.13/chrpath.1	2006-02-28 10:06:28.187060500 +0100
-@@ -22,6 +22,7 @@
- [ \fB-r\fP \fI<path>\fP |\  \fB--replace\fP \fI<path>\fP ]
- [ \fB-c\fP | \fB--convert\fP ]
- [ \fB-l\fP | \fB--list\fP ]
-+[ \fB-k\fP | \fB--keepgoing\fP ]
- [ \fB-h\fP | \fB--help\fP ]
- \fI<program>\fP [ \fI<program>\fP ... ]
- .SH DESCRIPTION
diff --git a/app-admin/lib_users/Manifest b/app-admin/lib_users/Manifest
index 8d0b048a3e60..00ca5949775d 100644
--- a/app-admin/lib_users/Manifest
+++ b/app-admin/lib_users/Manifest
@@ -1,5 +1,5 @@
 DIST lib_users-0.14.tar.gz 25746 BLAKE2B 4aa2dbbd7c53be13f79988a62c7997f0787ea9b773fc57681a021ff75ba9ff0988ac3032b21150c4e4958849a6195df09d388b6341e1ac139f34ce9555786233 SHA512 533c6e8f486e58d0fd22aea9a30adf91c3a8340a8a3719f6374ddfa8120d402c8202ab8ceb0e78aedd46e3e5875795392ed40497a66d51de5c2ca6a275a1a777
 DIST lib_users-0.15.tar.gz 25899 BLAKE2B e54dfe20cf5e3e3da3bddcf044cda36a5d51dec9baa808202d81ed0ef8a8b434b3c6f31a279b544308a32e6ebf91008ac2db49278da7624a6037ffdf1db309b6 SHA512 f9eab0d7c634602c496154dc20bd8374842df77c6abfaf69a0c34013f01c3a7541a006cb2b027539f6c088a55bea78682bf156723899d614f39ee48773fb9ea8
 EBUILD lib_users-0.14-r2.ebuild 1094 BLAKE2B 9e5e78a2856eb557d720f6ef6b8f955b9b61222a4defe146d5d92dc59122aa0464bd2a8f35b4c9efb7a98110048c6a1d7dde6f3264c04843a21a705190cc0e1a SHA512 522f398f0e0f803bff7a3c82887105216219dc5924740d1f68f061c8083626c446abb99ab8dc7ab0aed1150f84c000b6c062f4eb85ab4360efdad288981214a7
-EBUILD lib_users-0.15.ebuild 1067 BLAKE2B 5f631e538f69ee04c74b9c573ad66350abd377165ae48d530bf6e4c80dcd998cbcdd1d038c790cbfaa1a72ebc83cea29cbfb26c968ad4ecae48c7a2859df0b9f SHA512 333f5a8d2fd9cf5601e0cd9af122699f97921ca34f66dc4107c6522dc0b71d7613c2868419a41e5523cb7940466dbd1c0e23e4294cd5cf3cd354de8cfcb31b7e
+EBUILD lib_users-0.15.ebuild 1066 BLAKE2B 45c42237e3b4bed50d24504a0466d32e77989e63666fc72c7744aa6b1140ee7151dd28b590103626c07ead50c5ca40e82d4b7f6404484d10670fbd09f500b52e SHA512 8c55b3e67cf5254a944aeebda1bbaad24308bef61d014f875cd03d61dfebc1ab79e7ce03de4773378608a6e6d315c4771be4eea3b92873cf96b0e637da13017d
 MISC metadata.xml 344 BLAKE2B b11cff8e0077d50cf43e98a4c0502afec9c3c966f83513f392b97c1009fdaecbd73cb58ee8851e993e8e751f75f10adad6db97bf305d4f47afc016bb4b30f8d9 SHA512 ed9a5449f5efc28cdc6a615c889e2a312841db90524d3e12899c10824896f82535cc5c302b26525ed523f7e90cdf133edda0e3ee77f32563f3bfaad7b997301a
diff --git a/app-admin/lib_users/lib_users-0.15.ebuild b/app-admin/lib_users/lib_users-0.15.ebuild
index a3102436405a..e3c38729169c 100644
--- a/app-admin/lib_users/lib_users-0.15.ebuild
+++ b/app-admin/lib_users/lib_users-0.15.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/klausman/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ppc ppc64 ~sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"