diff --git a/Manifest b/Manifest
index 5869c3f96787..636d0c1e98e2 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512
-MANIFEST Manifest.files.gz 29287 BLAKE2B d5a91fef5ee5f2965cad81e5069836dec60ed19c44871312cb4fdca07e049958d1c66b654afc90e3d81cb6bd2aaa97681a37d7e4283df25081fc7468ac3e4425 SHA512 17ca0a44dd7ace5d7a4ebd2fc38e38801523bd94e07c0cee529a493d9106534ff3e2ec912617a3f24e6137c7d0014dbd1eb52648998a167d7f3ae8b90282c9e9
-TIMESTAMP 2020-12-15T04:38:41Z
+MANIFEST Manifest.files.gz 29321 BLAKE2B fa225b52626830ca95eda835122ad6a89ea1317509e1ce644c678e7614a89dcac5b4acdb171fbe9c2f050bb0421d1fda198a294844de66d5c2b6f0339189d509 SHA512 037f0f746f50c23f6645275ccac290fa40fca0f40abfd75ce606e05f821751e1ea33ba3c8d733df02fa560cd93654724004a259525adfcd9245ecdea425867f1
+TIMESTAMP 2020-12-17T12:08:41Z
-----BEGIN PGP SIGNATURE-----
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAl/YPdFfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAl/bSklfFIAAAAAALgAo
aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klDnrg/+MbmMq1ptZvU/cRyKfLqMycJ1nXLJ4I2uriSrq5CM0TP7klExtrKbSvfA
-+KepzbnOP2DEr8sDS5F88WPHWSrSNDHRaTg3+RWVD9oL1Wc/hWY6hsHA+gmDyjPB
-pEHb9z7qLWk0hqnvWPHGtXtlZtKeanOp+GKf0pJLC/Sf+Tn0dNTsAPFtZ/j3cKw7
-NzvRN0LwgqVU3mxDJ0GSxKb0SWjWXj8FxzIXBYu9+qwK+sTBcD9bgnU6d8D847Ex
-uteXHDKHpSWkNA1fbf/qITIikSwNUCUb5gTU0aCb29h2hPmc+mB4aP1BnYTn6g18
-F1G4bU2u4gjYg3aWc0i07FVQLjlTqJaXi7v76UmmG7BdxgVd/nco+DDrB8uuFCUe
-pTUgcGiURQpdkp3bHMg7wob3jZ7zSX/JWbdfaotAIyhlhg1TXxNPDeG3/M/QEfEP
-SXp61bf3Q5H2vHupsM+43nwxdpLFJWx6yxdkqBXExhbErkqRYwdFu/ECfUHHbOWp
-EBS0F4dSXDIM9dJAPtpRVTs5FwEFuz7ZldtYbdy5/zcd1HspK1cn6PIP++1yrJg9
-f9tc+yIy8FbRApfrgUcQ2AixqoF3Af/Iki424UFtyZsKppKiZSphmcsxdlZtf5pJ
-opJJyOYhL9ffjyG6W5q9touWTWfzgVbxfBdJiPaQvFmrYxPGM0Y=
-=Vimd
+klBgBxAAl42n/caYDxb2qIz43+rlhiH9/RjWbZuM91ZH2/R3Z+bTDgGzTiVSUDbl
+RtS8ly7QMmONH8hFGfmyxBmY9HT5zdxliFPlCbJeIRH7yWJaQtIc2nITni7cp0IY
+febY4guhc33+/QMWFoBbMiKJfiyj83+oE8Hhx0rpyc2sBu5ygmiAKE9Vx98WihRw
+LFG01AkLQceI/fB7NMGqK8L/EAnpBt6kfnflobmw0qjuB4lcDogULKIbmn6e5n4I
+JuR45EjMt79cicKnJzYtImYLAsOUwTDbQauxbD2B9X0oAUMyasrFFbGelV1X5Qwg
+xMAH2+plobtNCD2g4dR1Von5Mq+YiqDkI8DDM1PblbHeyMpygzElysJ3g24vKsv3
+xNc8VGHIhXNUOeX6xo5LZZ4xeSCyhuMQ8q4BPiVDwOGCOh/WkedRSnmgsA6X/Qll
+AGdGt1R/tx9X7ZZqSbvuBkCpUJWi0/RdxHQ+q0i2jeMq9hTg0++tO7xXm4HB89uU
+XsqGu+P8sJcilPCCU5OJePEM79eXPId3qoepmwos8xYqBIbgu/W87iGKkZiFnNTr
+K/Kz39e8rINJ8HLqTYmtqzu7fXL2aVsI98WT6hzHI/38oCYcYRFF+hEfskq8tabh
+xbZCcXglRcGxnyuGfcghkWffOeuR/sz9dS+iBD1Ydvk/RhSgfv8=
+=XBEU
-----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index 7de0438bbc76..8105b6e03e1a 100644
Binary files a/Manifest.files.gz and b/Manifest.files.gz differ
diff --git a/acct-group/Manifest.gz b/acct-group/Manifest.gz
index cd9baca08ce1..a333d92f8a09 100644
Binary files a/acct-group/Manifest.gz and b/acct-group/Manifest.gz differ
diff --git a/acct-group/dehydrated/Manifest b/acct-group/dehydrated/Manifest
new file mode 100644
index 000000000000..cccd70d0c415
--- /dev/null
+++ b/acct-group/dehydrated/Manifest
@@ -0,0 +1,2 @@
+EBUILD dehydrated-0.ebuild 186 BLAKE2B 3a6d7001e2bde0eb1ac13d0d2c6c0c2dff2c1407a67cf864cfc41e56a91af5a352d2d72d6dc1b44ef80be212d186a7ab761f54f7bc82d3387feeb457ed840c0c SHA512 8c363fd226513afc25e67ba1d12a0da8c0d67241bade538d275f99115099a0fa2378f52afe0df084f5d7eee2748f317d35716d71337c66d7a0ca1dec4617292e
+MISC metadata.xml 330 BLAKE2B c81d760282a51be25e323f15d24dc8a84a4c9b5f9474f1e02d99ea782882deb8448863cfab00e4604cfe9c23690fb1da8e4214ca4226117254d4f8cd3ae1976e SHA512 54134569aa4a1a0d3a29e8375b9b90add38c0db08643554cfb3b0e26e6f6f3a6d08a6e2738a607d422341ab811534ac4af36550fd854cbc19ba5ca70614fb30c
diff --git a/acct-group/dehydrated/dehydrated-0.ebuild b/acct-group/dehydrated/dehydrated-0.ebuild
new file mode 100644
index 000000000000..4edd9bf28a24
--- /dev/null
+++ b/acct-group/dehydrated/dehydrated-0.ebuild
@@ -0,0 +1,10 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="dehydrated program group"
+
+ACCT_GROUP_ID=361
diff --git a/acct-group/dehydrated/metadata.xml b/acct-group/dehydrated/metadata.xml
new file mode 100644
index 000000000000..6f3f53de9753
--- /dev/null
+++ b/acct-group/dehydrated/metadata.xml
@@ -0,0 +1,11 @@
+
+
+
+
+ mschiff@gentoo.org
+
+
+ whissi@gentoo.org
+ Thomas Deutschmann
+
+
diff --git a/acct-user/Manifest.gz b/acct-user/Manifest.gz
index 64b34e5ba808..7df778f09920 100644
Binary files a/acct-user/Manifest.gz and b/acct-user/Manifest.gz differ
diff --git a/acct-user/dehydrated/Manifest b/acct-user/dehydrated/Manifest
new file mode 100644
index 000000000000..217f69ff05a1
--- /dev/null
+++ b/acct-user/dehydrated/Manifest
@@ -0,0 +1,2 @@
+EBUILD dehydrated-0.ebuild 260 BLAKE2B c53c4c0dbe46d2b5f8770f8bf7bf09f58899c0e46dcca83e4ecdcca8bb7b55b8e346081262d7f4178880ccd36464d08d67f17c437767c73e10b4688d29ceff75 SHA512 30938b6c4957fb99e82727331755f8c3edbd05502e4eaf4f24359d26d589dce0bbcbe7e6f12761fb5ee3505d5c4365b4ff8acc62235136cb0e15a27ddc0d52cc
+MISC metadata.xml 330 BLAKE2B c81d760282a51be25e323f15d24dc8a84a4c9b5f9474f1e02d99ea782882deb8448863cfab00e4604cfe9c23690fb1da8e4214ca4226117254d4f8cd3ae1976e SHA512 54134569aa4a1a0d3a29e8375b9b90add38c0db08643554cfb3b0e26e6f6f3a6d08a6e2738a607d422341ab811534ac4af36550fd854cbc19ba5ca70614fb30c
diff --git a/acct-user/dehydrated/dehydrated-0.ebuild b/acct-user/dehydrated/dehydrated-0.ebuild
new file mode 100644
index 000000000000..a6ec59958704
--- /dev/null
+++ b/acct-user/dehydrated/dehydrated-0.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="dehydrated program user"
+
+ACCT_USER_ID=361
+ACCT_USER_GROUPS=( ${PN} )
+ACCT_USER_HOME=/var/lib/${PN}
+
+acct-user_add_deps
diff --git a/acct-user/dehydrated/metadata.xml b/acct-user/dehydrated/metadata.xml
new file mode 100644
index 000000000000..6f3f53de9753
--- /dev/null
+++ b/acct-user/dehydrated/metadata.xml
@@ -0,0 +1,11 @@
+
+
+
+
+ mschiff@gentoo.org
+
+
+ whissi@gentoo.org
+ Thomas Deutschmann
+
+
diff --git a/app-accessibility/Manifest.gz b/app-accessibility/Manifest.gz
index c39868eb2e12..02a3377a900f 100644
Binary files a/app-accessibility/Manifest.gz and b/app-accessibility/Manifest.gz differ
diff --git a/app-accessibility/caribou/Manifest b/app-accessibility/caribou/Manifest
index 1060d44cb7f4..12ea8d850830 100644
--- a/app-accessibility/caribou/Manifest
+++ b/app-accessibility/caribou/Manifest
@@ -1,3 +1,3 @@
DIST caribou-0.4.21.tar.xz 426516 BLAKE2B bd5e27bbbdb08fc31edce3b65124177e30b6d51e0071601bcd84c325b5794ce936b3f782ac8639dca332c246e329773f462dcecc0f236f52aeb0dcc7c5607a24 SHA512 5fc0cf54a1cad50d41e659adbbb932b51d69d18951562f87497e99aaae17ac72b453b759dd7289ff8f68a79574dfce510b9de6bedc61408c14cb48b83eaf08da
-EBUILD caribou-0.4.21-r1.ebuild 2398 BLAKE2B baccc4746af76a4f359379e35f8c5db963f5dcf72802253ace4782304103550f4c545def8f1c742a252bbdb5b1acf79cc930fb882abbe918bb92cd47b5b1ba7f SHA512 6b46e0fcfe31fdf6ecb190f358c887f0e281a0d5a8004550e2e0ec368b86bdc04a56766ef9d688a09262440370766fb649ac78dcbcc73c7884f7dd94b940c67c
+EBUILD caribou-0.4.21-r1.ebuild 2405 BLAKE2B 68724aee9ce59e22b4f352f4353bfc9e8e19f1e1caa15afabf51fcc26e1b8359223d6ed732d661a3839513a027a3d64af349cf9a388039035de56cc6b6ac0ee5 SHA512 7998924380de3cc98ffead892849ae4142d04133c5605e3ad2f931bb8239f7b7528516faa2e1a547ed357a8221392327ed5cec8ef1c7c4f97d648ed67db7e069
MISC metadata.xml 682 BLAKE2B 4ff796697db62d8c6a21ff62794c5fef391691685cece76ee7b8c38178f775a145b9a457df9bf959ab6af03559ceb4d9ad97a2ab835d63b70e58b4894f71fa5d SHA512 bec00e1cbb64bfec610e3f4e724e8afb8539a4b676b1e443a17b7eaf2263bef1fbf5787d77de253d84ebb0a54b3ca4bd386ba421826c0bb903164bb7ecf5223d
diff --git a/app-accessibility/caribou/caribou-0.4.21-r1.ebuild b/app-accessibility/caribou/caribou-0.4.21-r1.ebuild
index 158a322739f6..bf5e58e6dca1 100644
--- a/app-accessibility/caribou/caribou-0.4.21-r1.ebuild
+++ b/app-accessibility/caribou/caribou-0.4.21-r1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Caribou"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
IUSE=""
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 8c5bf9b6b2d5..cbb5254310d1 100644
Binary files a/app-admin/Manifest.gz and b/app-admin/Manifest.gz differ
diff --git a/app-admin/ansible-base/Manifest b/app-admin/ansible-base/Manifest
index f86415be6250..dbcad9d41370 100644
--- a/app-admin/ansible-base/Manifest
+++ b/app-admin/ansible-base/Manifest
@@ -1,5 +1,7 @@
DIST ansible-base-2.10.2.tar.gz 6023200 BLAKE2B 80abfa3fab56d3f997cbe90b557ffd5004b216709d6ba2c6d50ea0fb7a2e5a2ad49ce83bfc7a17054582e786f53ce29814d8b5a3fc2408a1e729b1647619080c SHA512 2ee60303841e88d3451ddbcc4c18473d3a37253873406b0783816b1bbf9d8404599ebed12bac7c7f32693314048668b84f3a1c593621c7b8c37a7b48687c769b
DIST ansible-base-2.10.3.tar.gz 5836841 BLAKE2B 000ee1e369beb450a9a58680030fc7605f62020a28f0ec4634569be0b12ca54c79d0c36a6022895f93b6f8449b8f8483e07590eeea233383490600bbce600aff SHA512 4da2c79c7d990bbe07e136447643484d947e512693194017623deadd88d6556dac67865069182059ae2daf82a13876600dc5472712d6ab6e0556cb829fce3b5b
+DIST ansible-base-2.10.4.tar.gz 5708083 BLAKE2B dcae17dd84dd1985703bf55bffd4a7907ecf072fcc52c76633fd2fc1d3461901b284002f69ce542ab8447f7aa6a2f65ff4c9abca1a7c1c8df3ad69a4179b1c33 SHA512 50dcccc0b40f47590d3ea56907f987bddbb858952b0d6a999db0b706232a571037dc31e66a773370be57ca14d11a7091c53a480d7f3cecf4a5e7f91895661100
EBUILD ansible-base-2.10.2.ebuild 1678 BLAKE2B e2ea250401ab8e5a12ae93e07788844ed90dcbc430137b3298c215d2efb56e1e6156d87d7fbe1c99826d0fd4d4cb087e6c1d11a1509e27fc11c582542d76e76c SHA512 e8da7dd4f6bf332a1138b4ce2f0eab40be05d4a5d5e932692877158c6e579eb4ea8e9daaac147f6dfc27c8ecf3f68604cf0429996b88f8b005294cec29b8c272
EBUILD ansible-base-2.10.3.ebuild 1679 BLAKE2B 7a0df030842dd19e042b56cb771802b0eff897739456dcbda6fc85749b4806d9277f59fa8815618a6147c11006b574d9466386f8160d466124531ee2303dd6cb SHA512 178689c5fa8db63ea02da55fd552ede89e8b2cadad9ee0d72f9d3bf92cebb383a48f7a38ff1085c140d0c977740df5630b786f6a94c7a4b4737cddba449f23fd
+EBUILD ansible-base-2.10.4.ebuild 1681 BLAKE2B 8951247229c2713c1399a2236bf7ed8fcfcaa1c91b6365f5f7928be3da9e5419e855c7ab55ac5778ffcab0584d767b27f21696cf6c9e85c4fc156efe0bc14a6f SHA512 df4909f9d68a5fc78220eaba10f473bd65c839ac65e453f4e890fc52a16179feb9f988552c64d1fab8e9756a359c3483aaafd1f90117b184f8103b4e4fd3138f
MISC metadata.xml 1266 BLAKE2B 449ac5109e0fb6b64d32185f0660ce6e8c3828a830f8516d680f47ebc25aef880ab5116103d67cfba02e04b1ad496917fbf67252b7bfc062d828e22f15b961fd SHA512 95d52b68b5b3efad6d8575741430b2d1c18a7c7b41a1374229763fea7c599f3ff2b46dee51845e20388829faa4246e5a05011e61254e91d10709457a4b822f0f
diff --git a/app-admin/ansible-base/ansible-base-2.10.4.ebuild b/app-admin/ansible-base/ansible-base-2.10.4.ebuild
new file mode 100644
index 000000000000..f376ff42569a
--- /dev/null
+++ b/app-admin/ansible-base/ansible-base-2.10.4.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit distutils-r1 eutils
+
+DESCRIPTION="Model-driven deployment, config management, and command execution framework"
+HOMEPAGE="https://ansible.com/"
+SRC_URI="https://releases.ansible.com/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos"
+IUSE="test"
+RESTRICT="test"
+# doc removed due to https://github.com/ansible/ansible/issues/71395
+
+RDEPEND="
+ dev-python/paramiko[${PYTHON_USEDEP}]
+ dev-python/jinja[${PYTHON_USEDEP}]
+ dev-python/pyyaml[${PYTHON_USEDEP}]
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ dev-python/cryptography[${PYTHON_USEDEP}]
+ dev-python/httplib2[${PYTHON_USEDEP}]
+ dev-python/six[${PYTHON_USEDEP}]
+ dev-python/netaddr[${PYTHON_USEDEP}]
+ dev-python/pexpect[${PYTHON_USEDEP}]
+ net-misc/sshpass
+ virtual/ssh
+ !=dev-python/packaging-16.6[${PYTHON_USEDEP}]
+ test? (
+ ${RDEPEND}
+ dev-python/nose[${PYTHON_USEDEP}]
+ >=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
+ dev-python/passlib[${PYTHON_USEDEP}]
+ dev-python/coverage[${PYTHON_USEDEP}]
+ dev-python/unittest2[${PYTHON_USEDEP}]
+ dev-vcs/git
+ )"
+
+python_compile() {
+ # disable version checks on upgrade
+ export ANSIBLE_SKIP_CONFLICT_CHECK=1
+ distutils-r1_python_compile
+}
+
+python_test() {
+ nosetests -d -w test/units -v --with-coverage --cover-package=ansible --cover-branches || die
+}
+
+python_install_all() {
+ distutils-r1_python_install_all
+ dodoc -r examples
+}
diff --git a/app-admin/ansible/Manifest b/app-admin/ansible/Manifest
index 9206e9df00d6..7d4b14540d15 100644
--- a/app-admin/ansible/Manifest
+++ b/app-admin/ansible/Manifest
@@ -1,7 +1,9 @@
AUX ansible-2.10.0-CVE-2020-25635-6.patch 2961 BLAKE2B bd023424bb075a743881056d6e0c0c194ae56cde0ed3b9aad2ef5a2f75d6a63994a0455a896e6e9f16cacd0f1c3438eb45cd2352d4f4b53810f19728b5a7de5e SHA512 36bb9321e9524d04f06d7156ad6f7f72ce4bd75332437a33ff49c226e12e8e4f8cd82976ccb0c02076ee95de762988d6783a2ed00453b1b8893fe8127847bc30
DIST ansible-2.10.0.tar.gz 25454980 BLAKE2B 91f930518b90b36aa2c21f553092233059fada86fd1674c9c6e881484b1bd4e68a3eaa05d82e15115906e55da99c43394c3de36a898e26bb222f780b82f8a5bd SHA512 878036f06e1705e4392223bda210b2acae0232069d0cec02a47f13f6b3bc6c9538fb515a2d2dc6003695bcf0915fdd3dfc5b8dc59355e37e2ca8fa48bbd79657
DIST ansible-2.10.1.tar.gz 25851704 BLAKE2B f9f42ab9f7864a48f0d960b4e8149dfba3ece6c4b01c08db59f9ba5fbcd39771c7b315bf7c9853641d15c2bb6319c9b9ebc791440fc8933780895024c9b74c12 SHA512 46bbbfb22e5c3715df0069d420b174877dffd59f91613779e7057648d15751d528a9cb57357709d0c04a507a60e20c87b109ba1904e1f313441cf5832ba93b5e
+DIST ansible-2.10.4.tar.gz 28622006 BLAKE2B 94551986f5e8ef54dd4f806a264f8373b19564f74b32bfc6d852d49b7b9ff1030ad3c2fdda2f16bc78c0dae5e07cc750a3992bca23fd9bff0f2466716ac32374 SHA512 da9517ad1f478eb8ccab3bad15f3f6ca4d6151798b5aab6db261c4b19a0ac023db1e294745a06748788820ece8980bf1c2c6274314fa0a2943b76c0658383b72
EBUILD ansible-2.10.0-r2.ebuild 1985 BLAKE2B 30885a55981450ae698183239f9659e770e5afafb774722dc4dfeb48789c3b4e8985f39e917ff497911f84363dceaf1bdf7c2d45537c8f6e3bf21e57fc88a67e SHA512 e48e28eaf5ee8bfa2e54e3245b448105e6687cca172ba1f3fba5b68b2c165a16045d94f5794b936426658bdc53883342aaf7fc7a4eb4bb7ef7b3bb8bc0e014b9
EBUILD ansible-2.10.1.ebuild 1908 BLAKE2B 009631ae1683884cc6f0c7ee1de1849944e8ab6d967554fa19904a9d959dd6e63603a40ff2fb6b70b20c22211b03efb5ac65932d4aafb0e39aefff3017c4e8f3 SHA512 a53a5352f6f13e295bf93d27fba404b59ead3dfadd9d51472c22c9a6b2b3638c95961e262d55e8345de41f3ad76c2190c2bc852bbdfc57e4c1d614eaf33f7a2b
+EBUILD ansible-2.10.4.ebuild 1910 BLAKE2B 8cddbaa1cdb8e6065afcd660c67cc41ec8088dcc494743a4d2280abf4168dc8cb05b819f6cb86a40d239e48ba0d170484f6b6f5d29f88fd5f9637e74f1e594b5 SHA512 7aa0ada42be21117db9fd4eeeaaa6649935a2e046fa8849005a230b37c20fcd3e28a65feedc7846fe7950ba953fcdbb5c6ded018dbabd015c76f37ac905d77bc
EBUILD ansible-9999.ebuild 1937 BLAKE2B 98ab62b10f1d118b9d491639800cf12c61d89c76d7c825bee3f944baec488d7de3ac699e8e4ee024ce80b97ecc5625fdffa04c32b1a6590c3c2dd73103b9ca60 SHA512 c067bbb92042d932316ee2a26f43f974586eff96b8f5f679a8b51e4a66f2e6a7c532edc0d0bf996bf665a875c7af61e29d6fb5ac1b4ac10896140e77004778c8
MISC metadata.xml 952 BLAKE2B 53640d081ebb558274f8c10095aa6e477820e28a7fdf62c169f5fb3b82153223a7f8ecd1807d14646eae2ec2262b50341919bbb13255293d379ba017b30b20bd SHA512 03b75d65cd0a4b32021b34d9f7ba21b6c4c6893cf185a36dbe6fc10728e0f18c65fc5b6a4c197be8c2b1dadb7243ddce02dbe2f504034a2df1c621f8ba6e26a7
diff --git a/app-admin/ansible/ansible-2.10.4.ebuild b/app-admin/ansible/ansible-2.10.4.ebuild
new file mode 100644
index 000000000000..86e5af4dd8f5
--- /dev/null
+++ b/app-admin/ansible/ansible-2.10.4.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+DISTUTILS_USE_SETUPTOOLS=bdepend
+
+inherit distutils-r1 eutils
+
+DESCRIPTION="Model-driven deployment, config management, and command execution framework"
+HOMEPAGE="https://ansible.com/"
+
+if [[ ${PV} == 9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/ansible/ansible.git"
+ EGIT_BRANCH="devel"
+else
+ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+ KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="doc test"
+RESTRICT="test"
+
+RDEPEND="
+ dev-python/paramiko[${PYTHON_USEDEP}]
+ dev-python/jinja[${PYTHON_USEDEP}]
+ dev-python/pyyaml[${PYTHON_USEDEP}]
+ dev-python/cryptography[${PYTHON_USEDEP}]
+ dev-python/httplib2[${PYTHON_USEDEP}]
+ dev-python/six[${PYTHON_USEDEP}]
+ dev-python/netaddr[${PYTHON_USEDEP}]
+ dev-python/pexpect[${PYTHON_USEDEP}]
+ net-misc/sshpass
+ virtual/ssh
+ app-admin/ansible-base
+"
+DEPEND="
+ >=dev-python/packaging-16.6[${PYTHON_USEDEP}]
+ app-admin/ansible-base
+ doc? (
+ dev-python/sphinx[${PYTHON_USEDEP}]
+ dev-python/sphinx-notfound-page[${PYTHON_USEDEP}]
+ >=dev-python/pygments-2.4.0[${PYTHON_USEDEP}]
+ )
+ test? (
+ ${RDEPEND}
+ dev-python/nose[${PYTHON_USEDEP}]
+ >=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
+ dev-python/passlib[${PYTHON_USEDEP}]
+ dev-python/coverage[${PYTHON_USEDEP}]
+ dev-python/unittest2[${PYTHON_USEDEP}]
+ dev-vcs/git
+ )"
+
+python_compile() {
+ export ANSIBLE_SKIP_CONFLICT_CHECK=1
+ distutils-r1_python_compile
+}
+
+python_compile_all() {
+ if use doc; then
+ cd docs/docsite || die
+ export CPUS=4
+ emake -f Makefile.sphinx html
+ fi
+}
+
+python_test() {
+ nosetests -d -w test/units -v --with-coverage --cover-package=ansible --cover-branches || die
+}
+
+python_install_all() {
+ use doc && local HTML_DOCS=( docs/docsite/_build/html/. )
+ distutils-r1_python_install_all
+}
diff --git a/app-admin/eselect/Manifest b/app-admin/eselect/Manifest
index 216693c16bb6..143baff43ad8 100644
--- a/app-admin/eselect/Manifest
+++ b/app-admin/eselect/Manifest
@@ -1,6 +1,8 @@
DIST eselect-1.4.15.tar.xz 178996 BLAKE2B 4354d975c8af2e1de0f0c6efe2badc92584e947f9b73c05aac144caf8f9d74c850d366c7c225112322a504262b5f285f6e2e8d32223f1b2d4bac87db740a148c SHA512 ceb55fecc2bf70e816679af9b20653b29aa9ce24ca2d4cd0c6e02ab214689459bc2ccd5b3968ac49249b8fb6613c6055e7e76598b86c6a114a9abf847c4a2b58
DIST eselect-1.4.16.tar.xz 178660 BLAKE2B dae97ee324cb67983c5395b5dc54c4b84d2da43f6a0c5c8ab81ff402ab211e9d1f1d3fe5c174b130ac1e11d3dd19e3812056274145415ee029e649cda880cd95 SHA512 264fb6122f5f7c9e73bb2250a94c3c0377e5263e2e5ae653ed58e08ebf6ed1b4aa165ae5c1d70b0156081c4db5672d1ec9d379782919d5b40a2f3e862378ce62
+DIST eselect-1.4.17.tar.xz 178980 BLAKE2B d905ac88bc009080912af75e64c7920d745788866fa3cb35466d68a652efbbd6984d6e1efeed76d9a344aed94705b74c85aa43e9c037d4d548d2e24afa69bd7a SHA512 35dc4c52f44c4f64db9c0dc2aec57b3055a6d36760b1bbbd094ad11b3f9e71a731444802632817b89c3b511f1dc9bb92046b59322d177e13fdc501ed767b591e
EBUILD eselect-1.4.15.ebuild 1579 BLAKE2B 1cfc3648f6725ef91c4eb5144451088987a5d4e39ea65d56d83f6bfb202ba1e6b5f78e0ca5130196b96b9860296420194a5027f72bf02ca49bb0fa09d1d1e107 SHA512 fdc708d34cab0d77e5661c641f58e3d0994fb65dea43caacc1f0992e1d30e246810f6c97d53a545d9143f66e80a1027a81c4f2d2328f855cc31caf1a40b5909a
EBUILD eselect-1.4.16.ebuild 1579 BLAKE2B 30c0f10f18b2e18609fe55b090a9b3d76e72fa5e5b29faa87c83995630a3beef8f69f687996a5fbb3ebefd89cf34b8c167169173082e4df8955c47e6e7ef2daf SHA512 9b7c26d5e1bca87f058b0ab2e115eee42caf42659a37356c5fe5e8e6e20e0cb2c79b08f35c80638aa2c1486bce79f053118604eb11bb5e8e38c918daa4ef1cc0
-EBUILD eselect-9999.ebuild 1408 BLAKE2B 428612d4adcac6611b23df171bdf8b7ac578e3ad36f968de94fb978b2df8d8af9d8e487d78d8f6cd41823c68e495caa834fbf309607b5689b85784dc9cd39895 SHA512 3ace7d1f05535b475b2401f37b2e1c74a3fa60d2ce92931169e3da32df31c063ba8bbc0c8431b1b1dca55b9f56fb73c1fb8a2045d7de410084eada71fa68c062
+EBUILD eselect-1.4.17.ebuild 1574 BLAKE2B f631125e558869456c30acd8b8a8673d9ff1d90542daaea5a12f070153b75296a3430e974e107a1477d9314de0d8a6573717da188846bd906e5c61437af20ffa SHA512 0a6cf61b206181a10d6a66c5341725ec57eedb9c3ebccbe47cc00115ebe471a9d923d19cef809f6c2697d0747e456f5f3952b42b92a3af60f0841e9520d49b57
+EBUILD eselect-9999.ebuild 1394 BLAKE2B fb62991371b697680959344974f4d7d4cdedba39337b12d004588d118632be5cd26c2026024fd6a2cc1e448f196c3367b82ba3fe347617149602c4730f8083d1 SHA512 78c75a30e9a8bfb370620b25cd200be9c6a8724858548cd1ab76926194f9d96a25c7441463d1dcb7a2aa3a6c947b1a656d6a0b455eb95e9ad9a1535f8cb349ce
MISC metadata.xml 272 BLAKE2B 68f9c1edf77cdf1dc46891129ed694307cab4e954c6cb002c3fc32fba216949c83a21dc0618f4bf24fd8e1da5558043709210e6697fda3881adeb69a30eb569f SHA512 55cba722900834986e0ea0c9cd8463c3b69d3ada26227d45c8cc3aa07f6ca40919457f80b03a559a8f9ad55636d931cc2101b928b438aeca19b0531c90ec40a3
diff --git a/app-admin/eselect/eselect-1.4.17.ebuild b/app-admin/eselect/eselect-1.4.17.ebuild
new file mode 100644
index 000000000000..0ed9a1b499a1
--- /dev/null
+++ b/app-admin/eselect/eselect-1.4.17.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit bash-completion-r1
+
+DESCRIPTION="Gentoo's multi-purpose configuration and management tool"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Eselect"
+SRC_URI="https://dev.gentoo.org/~ulm/eselect/${P}.tar.xz"
+
+LICENSE="GPL-2+ || ( GPL-2+ CC-BY-SA-4.0 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~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"
+IUSE="doc emacs vim-syntax"
+
+DEPEND="sys-apps/sed
+ || (
+ sys-apps/coreutils
+ app-misc/realpath
+ )"
+RDEPEND="${DEPEND}
+ sys-apps/file
+ sys-libs/ncurses:0"
+BDEPEND="doc? ( dev-python/docutils )"
+PDEPEND="emacs? ( app-emacs/eselect-mode )
+ vim-syntax? ( app-vim/eselect-syntax )"
+
+src_compile() {
+ emake
+ use doc && emake html
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+ newbashcomp misc/${PN}.bashcomp ${PN}
+ dodoc AUTHORS ChangeLog NEWS README TODO doc/*.txt
+ if use doc; then
+ docinto html
+ dodoc *.html doc/*.html doc/*.css
+ fi
+
+ # needed by news module
+ keepdir /var/lib/gentoo/news
+ if ! use prefix; then
+ fowners root:portage /var/lib/gentoo/news
+ fperms g+w /var/lib/gentoo/news
+ fi
+}
+
+pkg_postinst() {
+ # fowners in src_install doesn't work for the portage group:
+ # merging changes the group back to root
+ if ! use prefix; then
+ chgrp portage "${EROOT}/var/lib/gentoo/news" \
+ && chmod g+w "${EROOT}/var/lib/gentoo/news"
+ fi
+}
diff --git a/app-admin/eselect/eselect-9999.ebuild b/app-admin/eselect/eselect-9999.ebuild
index 6710d08068a8..5922f93c46e0 100644
--- a/app-admin/eselect/eselect-9999.ebuild
+++ b/app-admin/eselect/eselect-9999.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/eselect.git"
@@ -10,21 +10,19 @@ inherit autotools git-r3 bash-completion-r1
DESCRIPTION="Gentoo's multi-purpose configuration and management tool"
HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Eselect"
-LICENSE="GPL-2+ || ( GPL-2+ CC-BY-SA-3.0 )"
+LICENSE="GPL-2+ || ( GPL-2+ CC-BY-SA-4.0 )"
SLOT="0"
IUSE="doc emacs vim-syntax"
-RDEPEND="sys-apps/sed
+DEPEND="sys-apps/sed
|| (
sys-apps/coreutils
app-misc/realpath
)"
-DEPEND="${RDEPEND}
- doc? ( dev-python/docutils )"
-RDEPEND="${RDEPEND}
+RDEPEND="${DEPEND}
sys-apps/file
sys-libs/ncurses:0"
-
+BDEPEND="doc? ( dev-python/docutils )"
PDEPEND="emacs? ( app-emacs/eselect-mode )
vim-syntax? ( app-vim/eselect-syntax )"
diff --git a/app-admin/exo/Manifest b/app-admin/exo/Manifest
index c943fcfc3800..d237c9f0eac4 100644
--- a/app-admin/exo/Manifest
+++ b/app-admin/exo/Manifest
@@ -1,5 +1,3 @@
-DIST exo-1.21.0.tar.gz 4625218 BLAKE2B f73c18f1de5a8e8063e66ec11352d9221268289d298bb6ecaa9cb625c00685b68d0f7760614df8cf783bb123bbdb52d3fd9d8c482933445bb089d6e9d493882c SHA512 0a2279ef368e13286082813ebbae38cd5c2e185e43e5d2b2fb851382be8b8a5c08512124638d987401d0e821042bafba50f955a672eec6ce0951f0149d2ec34a
DIST exo-1.22.0.tar.gz 4684873 BLAKE2B a143517a99fde17c237c25dcdd4b54570d6ce9760157d24c8f09c26851b5fb65c6ac56506179a008f32cc657cf40fb781eb304375e3f3422a5166e6b1c194164 SHA512 f68d1524c8a1dc44aca4ab1999ebbc93a980a58344c1b39c68eb54b4651d9471b310541c2d34a43e67ad956ed93e2d3ce89c3ebeb450b620c641907684572799
-EBUILD exo-1.21.0.ebuild 704 BLAKE2B 1c1f293aa7248dc68579928c50601f02a25c36ed19e06ccddf459918b9608a127329a7ff4dbefc70bd24dbf368a62471f766fd8d8f0ff2699f439577bc150a65 SHA512 af225c3d9bda0a2735056531edcc435efae64e2fc45a68487d81893c1cba118a74110562859e7dd962d79b8d39e8682c93b9a5fe8ed7953d2a5121d360fddc85
EBUILD exo-1.22.0.ebuild 704 BLAKE2B 1c1f293aa7248dc68579928c50601f02a25c36ed19e06ccddf459918b9608a127329a7ff4dbefc70bd24dbf368a62471f766fd8d8f0ff2699f439577bc150a65 SHA512 af225c3d9bda0a2735056531edcc435efae64e2fc45a68487d81893c1cba118a74110562859e7dd962d79b8d39e8682c93b9a5fe8ed7953d2a5121d360fddc85
MISC metadata.xml 333 BLAKE2B 7158aba785c9b503c94098e7d68a820475660172b369a4adce5c68a50f21741db69e58ed9e946b792cd30a8e7b9506efaad35e48f508c4e292ee224be9b34c1b SHA512 0a6b2be31cf0944ea9077c8b2cd9da50dfd87568be72bc00f44822930487f8bcaf2da4324c5a3a35cbdfd69173673122660f3dba3e4189205d45e6b75c1c1f67
diff --git a/app-admin/exo/exo-1.21.0.ebuild b/app-admin/exo/exo-1.21.0.ebuild
deleted file mode 100644
index 0c2c8d861fe4..000000000000
--- a/app-admin/exo/exo-1.21.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Command-line tool for everything at Exoscale: compute, storage, dns."
-HOMEPAGE="https://github.com/exoscale/cli"
-SRC_URI="https://github.com/exoscale/cli/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-IUSE=""
-DEPEND="dev-lang/go:="
-RESTRICT="strip"
-QA_FLAGS_IGNORED=".*"
-
-S="${WORKDIR}/cli-${PV}"
-
-src_compile() {
- go build -mod vendor -o ${PN} || die "build failed"
-}
-
-src_test() {
- # run at least 'exo version' for test
- ./exo version > /dev/null 2>&1
- if [[ $? -ne 0 ]]
- then
- die "Test failed"
- fi
-}
-
-src_install() {
- dobin ${PN}
-}
diff --git a/app-admin/gentoo-perl-helpers/Manifest b/app-admin/gentoo-perl-helpers/Manifest
index 8cf90ca79291..55efebd85d85 100644
--- a/app-admin/gentoo-perl-helpers/Manifest
+++ b/app-admin/gentoo-perl-helpers/Manifest
@@ -1,5 +1,5 @@
DIST gentoo-perl-helpers-0.3.1.tar.xz 9420 BLAKE2B dea001473832f4412ae090afbc458720ec1d40d19ac3db3a6a57b26115603f224f2f1c4155ecd3190866dfa0ab648fdd3a98a90e9ed576e7bd3ad8bdaf9a73c6 SHA512 dce6addfebbdfd16da3b580776c34346eb60b2eaef9cc7bed03d5ae0bf028de7a0175fbf7f68113d44b645c3d5ca7f5175389478655b08c115a5342ff930e096
DIST gentoo-perl-helpers-0.4.0.tar.xz 9580 BLAKE2B daea9e3f43bcd24ea34c9448294fb730595e8a021dffcbbf7f123ff5439455aa362c623affee29341266a0494f4744df0bf195d2db422d6276eb54fdca07149c SHA512 fbbd33122028ad12cbec7adbc97faaa32aa485ef21ca38dc2e1906610fdea7709e5da7e8164f5f86afa3607928837f3b35468274b6c626e3bd843432d780701b
EBUILD gentoo-perl-helpers-0.3.1-r1.ebuild 1255 BLAKE2B 59495c331a5363515ee725ca8ed048454023aa5b68db0d28e11d3d10df091a06b8790e5af778da55525bd04266e8107060f0a626c318582bfee92dcfe4f3aca5 SHA512 2dad7ad8fb595480d533a31e6c4b2c79b0975aec0e1782e17e3ead8e10ea3298217f66f2665977f511d9feb5aae536e74979a9d5cddca8250008a157c8aa937c
-EBUILD gentoo-perl-helpers-0.4.0.ebuild 1282 BLAKE2B 3ea08b23c7e605a60b4a8492fda7eb065aa1e8d1dcdff2dc823af1e308f378dadb501d8f1808a5788defb41b7a045a4f427132d5a04411c319d0d6437b51c4fb SHA512 2acaa107856071b49e7c389c64c0cb5328eee72080d3efe7453bab8ee5f0a66e1111c5b62e00641f5841d586e1feae89a620364dc3b086f554d5440e10e4077f
+EBUILD gentoo-perl-helpers-0.4.0.ebuild 1281 BLAKE2B 431c26224e45a47e6d66d61740a25d9ab0bc766d59104f967629fc597e88b56d49429d877e692d50962e41cf1ed3b69bf6eae11c90b7b2561da35408569ca77b SHA512 6ac9e6aea376c5d848282e67a55f0eb67deb9fda41da79e9565784dc338e6a51cdd3c3966a9e17f7c408cb117ab73a3c701bfc706b4bc585e4c668f424033f82
MISC metadata.xml 453 BLAKE2B 0a9ea49a54e1b0ac4c4d98615b15251770556bfe672eea650b8b52ac7dc9a0492d3456b894b8724c033aa272567bb0c7ad4847451ed3f29fd5aa365ea2e2d315 SHA512 a32d375d6aa0ac38a20cdec805c887be0d6493be5d47572a0e950e1f4a8b28018ab364cd06668ff59c52fe89487853c9c4bffdf05b79913c691d99fdc848b201
diff --git a/app-admin/gentoo-perl-helpers/gentoo-perl-helpers-0.4.0.ebuild b/app-admin/gentoo-perl-helpers/gentoo-perl-helpers-0.4.0.ebuild
index 4304f8dd6662..230e202e58f7 100644
--- a/app-admin/gentoo-perl-helpers/gentoo-perl-helpers-0.4.0.ebuild
+++ b/app-admin/gentoo-perl-helpers/gentoo-perl-helpers-0.4.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="
"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
IUSE=""
# Assumed System:
diff --git a/app-admin/passwordsafe/Manifest b/app-admin/passwordsafe/Manifest
index 32500526021f..58d9aba048c1 100644
--- a/app-admin/passwordsafe/Manifest
+++ b/app-admin/passwordsafe/Manifest
@@ -1,4 +1,4 @@
AUX passwordsafe-1.06_beta-system-gtest.patch 2962 BLAKE2B 1ef77391d355364e55da568c2686c1988916da9eadc312c37d01016df3449535b88b503dfd3aeac2bf3c8e613141552bb1d97f5f5a733becc33f3c565a610940 SHA512 2fc6745b84ad810a550c2b221aca4cd10f87d4bc77282cb31b3d3070b61a3958c126ce0d3da4eaf550d80be470ca4c5aefaeb863caaf2f9fb285bf844f5705bb
DIST passwordsafe-1.12.0.tar.gz 14937705 BLAKE2B 523e4496ffb99f8a53e62252117d43b771af867b3505f3a5b8c8f1119e8365f0661090e410a832abca89e2ce35816d2046d4bff0ba1e0f06c52c01eaac9051b2 SHA512 c20cb754a2174e3b3ab61edf99f2a31c333144550103fac50cc26cea89669fa3574db3bdd59996fcd87b83c7bf6dd1e9d2b087c17615183cd7111f151be5a94a
-EBUILD passwordsafe-1.12.0.ebuild 1954 BLAKE2B 7963630f9fdbe48dab3011995c9ee7a2f7bc6dc1f6e04bfc7be42906bf2b7a3a154f7ba1823a87627dbae0cc2b5bb9a634d27f0e0e2e116c3e75e8481d844293 SHA512 5d1b41d11705aa67d10e2073989fea4917ae2dd525360b3a486f687e846de7d6480e6bd665ed014b2e6a2c31f0e81fba23eabb6732d9df502de02356fe3394e8
+EBUILD passwordsafe-1.12.0-r1.ebuild 1943 BLAKE2B b60a1515c0e5c81f9f50f2094dde557ecae2af25fcca8d931a88d97ef896a7fecd1f6313c0ac5ff7cfadf989c5a484fd2a3bac0d1d1955651ea9fcc7b3c51776 SHA512 6ffda611e68e73f476ff1693f4be186344f64b9f3238ec38ba33bf3cceca71777a1128d327273c7b921f075951e092644a7d3c538b0442ced3571cd1063fd84e
MISC metadata.xml 683 BLAKE2B 9db2240d92f852ed50085280e3ddb947261ed7aaa9ed04784cbdf71c8e29ae79e1730cae298bcbcb75f82ebb69bab96695ba1a519487c92da399e1c7a98014a4 SHA512 12f06658b68b46cec87fe6842a8b94cd3c35b9e1d81e4aa447ec488358dcd37f5b3779c87d9fe0e4271f5f7e69550aa44cb815653acd502e10446e1842899e82
diff --git a/app-admin/passwordsafe/passwordsafe-1.12.0.ebuild b/app-admin/passwordsafe/passwordsafe-1.12.0-r1.ebuild
similarity index 97%
rename from app-admin/passwordsafe/passwordsafe-1.12.0.ebuild
rename to app-admin/passwordsafe/passwordsafe-1.12.0-r1.ebuild
index a8f86f8a1e5c..df1f621a56ef 100644
--- a/app-admin/passwordsafe/passwordsafe-1.12.0.ebuild
+++ b/app-admin/passwordsafe/passwordsafe-1.12.0-r1.ebuild
@@ -84,7 +84,7 @@ src_install() {
insinto /usr/share/${PN}
doins -r xml
- newicon install/graphics/pwsafe.png ${PN}.png
+ doicon install/graphics/pwsafe.png
newmenu install/desktop/pwsafe.desktop ${PN}.desktop
}
diff --git a/app-admin/rsyslog/Manifest b/app-admin/rsyslog/Manifest
index 581ab82a1c90..e348b98cafdd 100644
--- a/app-admin/rsyslog/Manifest
+++ b/app-admin/rsyslog/Manifest
@@ -6,8 +6,11 @@ AUX rsyslog.confd-r1 1145 BLAKE2B 06e63c7500238dd31abddd105269714387b990a3530ad1
AUX rsyslog.initd-r1 1755 BLAKE2B 768dc0d2bcbf240b7a09e814d681ce65a319cd128ef40b9427edb3bc4def5239415f16b67629de70d61e12dc835a3e8e7049c183f0c667d301919ffa7e6a22e7 SHA512 e6de86a72e11d37427a17e07cebdfc26b5c6108b413d853255108acf3c55882fd79d03ed41c0a6c1a23babd55f2e4bf36e5c7fc3e98c19bc07dc4593cd2a07c3
DIST rsyslog-8.2008.0.tar.gz 3051049 BLAKE2B abf9b7ec81cf62841c448f22c7aff45bc85ea6cdc7552e74295aac752c86380039bb28836e78e35e6eba3d0a062a0ae99ea22ba3d6e978175411a43ec9af6f9a SHA512 a077832de7076ac5e7d4c8f33edd044d0c18fd171a697ef68c1cd0f81f1938b3f008cddc1a61084181de512b643c15004744f0e79e6a44e9d239cec3d35f74fe
DIST rsyslog-8.2010.0.tar.gz 3097606 BLAKE2B 06bfd54edc2126567ff9a460c272583d388a16a4db6f56603c8b9d2dd54bf4fe3b3b402eb4a9523b68e9d3a7602759fad57b35351d7cadab0b7f02771db5c40c SHA512 e3c8ed6b631053e38abfe8ce183a1544d04a0207dc988d36f5141a7ea8c987915f4c0429ccd094b7e374c277b7ee5b50e65e7205c156af01ffe9bdf8338831c8
+DIST rsyslog-8.2012.0.tar.gz 3118101 BLAKE2B 26550c90ff5502c051c30996f7a1eabfdd9e5ce229dbb33f91ac40f9af5c2d2b15f9dd8a3b0a31b00b1b510d91fe5ce177ceab5fa2af416a9de9acc4e4b24f6a SHA512 d279295c8d399be140bd5c30786c6a32b2ddfd0d90ca4cd285aa33622c66ad9e3a5b979c8041f6e736670fef8f2cd5571980eef1b1395d4ab30a112f2dd1270d
DIST rsyslog-doc-8.2008.0.tar.gz 8378149 BLAKE2B 0f6bc116a03821899d33c7960e517725487b89ea2aabc7f5d0fbd4962d82a06558737bcee67af02105006c670ec736eb5ba0b7811b25a1e627a99555121b2999 SHA512 5b8bed19017c65469eb8ea7725ef162595b30f520605f37447498ab69b5cfe8f939cee7e7915ecbf3c025871408fd7af6d45ba960a83096f83a397df4cefef09
DIST rsyslog-doc-8.2010.0.tar.gz 8428326 BLAKE2B ee8eb2bdbb1f6c7122559b63ddc1ae6ac7fbfb23d661410feb39d7ddce332851e785bb447fb67dd2de8ff62e91fe865fbf7dec8bf62d7fe51181e3c6bbbe64db SHA512 072fb05a0117dc0970a4e5e302abbaf5dc065c2a0962c4160e7efb86fedad89a2caa546cd2bf4af07b7f5e2fa5267cf02889d911f7a6916725e6aea1760ab253
+DIST rsyslog-doc-8.2012.0.tar.gz 6417145 BLAKE2B d8377f40b0311e8e7dcca274c251c0de7706490e3048c8d69d479120e06ca1e0b3ec9fce0a04928984d440da3aef196965f8c1b45afe8931c893b4baa72f4e87 SHA512 5647f499230276066abced34c2ca352268ba24fbd00cb7b5e3d0a2494977dd6f781cf8d1e7c7a9210d23c451ff162acda81ee93afa3f8f08fd555123e9daeece
EBUILD rsyslog-8.2008.0.ebuild 12547 BLAKE2B 3b7a46c45c3f1ee34a9df9abacb853c1280d1ec6e5210ba81dabc047ab4d6b1c39b872755740e8c5cf5b2e1b015b898bc3ba6ef699701eaf7c0e55e486a4af51 SHA512 b553347e296c0594c263577dbb9cb99c76bc28acf615b60ab187c14c68a2ce408210dcbc4eed88ebe94ac5d101c8a7b57f2979ba1dcd95310efb662ba570a08c
EBUILD rsyslog-8.2010.0.ebuild 12887 BLAKE2B 592f765f2dadf2fb3276ffbc8e784429c1bf3c1269bf94c726884130ea590ef3102e86287c6e63cc0558043043c494694db9506cd871de8ace9e387ebb9aed9b SHA512 f8f1a023062f9f9db098f615d4b5b5d55df384db83af944dfa676a3865a9b93e194ae359da21e42c8e048ef6e7730f349192c9884dde050ac85418c3ea3583f7
+EBUILD rsyslog-8.2012.0.ebuild 12887 BLAKE2B 592f765f2dadf2fb3276ffbc8e784429c1bf3c1269bf94c726884130ea590ef3102e86287c6e63cc0558043043c494694db9506cd871de8ace9e387ebb9aed9b SHA512 f8f1a023062f9f9db098f615d4b5b5d55df384db83af944dfa676a3865a9b93e194ae359da21e42c8e048ef6e7730f349192c9884dde050ac85418c3ea3583f7
MISC metadata.xml 4070 BLAKE2B 3fde04df2bf0b93058d14787780f7f78b5014cdaa303101ef0fb637d1f0b165e453885ae307f137d98052719f992cd1a3f46da2f923bc97030ba629801190d5d SHA512 df868d04339eade02eb55b218f43c85c9efe2bf70cadf2ec1d59dc9f0d546ba9dbcd9ac5e3f9cbad05a8f4629ce5979668aba1fb8b027c51c7f8468b2e9b732a
diff --git a/app-admin/rsyslog/rsyslog-8.2012.0.ebuild b/app-admin/rsyslog/rsyslog-8.2012.0.ebuild
new file mode 100644
index 000000000000..6ab89acda633
--- /dev/null
+++ b/app-admin/rsyslog/rsyslog-8.2012.0.ebuild
@@ -0,0 +1,481 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit autotools linux-info python-any-r1 systemd
+
+DESCRIPTION="An enhanced multi-threaded syslogd with database support and more"
+HOMEPAGE="https://www.rsyslog.com/"
+
+if [[ ${PV} == "9999" ]]; then
+ EGIT_REPO_URI="https://github.com/rsyslog/${PN}.git"
+
+ DOC_REPO_URI="https://github.com/rsyslog/${PN}-doc.git"
+
+ inherit git-r3
+else
+ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86"
+
+ SRC_URI="
+ https://www.rsyslog.com/files/download/${PN}/${P}.tar.gz
+ doc? ( https://www.rsyslog.com/files/download/${PN}/${PN}-doc-${PV}.tar.gz )
+ "
+fi
+
+LICENSE="GPL-3 LGPL-3 Apache-2.0"
+SLOT="0"
+
+IUSE="clickhouse curl dbi debug doc elasticsearch +gcrypt gnutls imhttp"
+IUSE+=" impcap jemalloc kafka kerberos kubernetes libressl mdblookup"
+IUSE+=" mongodb mysql normalize omhttp omhttpfs omudpspoof +openssl"
+IUSE+=" postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp +ssl"
+IUSE+=" systemd test usertools +uuid xxhash zeromq"
+
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="
+ kubernetes? ( normalize )
+ ssl? ( || ( gnutls openssl ) )
+"
+
+BDEPEND=">=sys-devel/autoconf-archive-2015.02.24
+ virtual/pkgconfig
+ elibc_musl? ( sys-libs/queue-standalone )
+ test? (
+ jemalloc? ( =dev-libs/libfastjson-0.99.8:=
+ >=dev-libs/libestr-0.1.9
+ >=sys-libs/zlib-1.2.5
+ curl? ( >=net-misc/curl-7.35.0 )
+ dbi? ( >=dev-db/libdbi-0.8.3 )
+ elasticsearch? ( >=net-misc/curl-7.35.0 )
+ gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= )
+ imhttp? ( www-servers/civetweb )
+ impcap? ( net-libs/libpcap )
+ jemalloc? ( >=dev-libs/jemalloc-3.3.1:= )
+ kafka? ( >=dev-libs/librdkafka-0.9.0.99:= )
+ kerberos? ( virtual/krb5 )
+ kubernetes? ( >=net-misc/curl-7.35.0 )
+ mdblookup? ( dev-libs/libmaxminddb:= )
+ mongodb? ( >=dev-libs/mongo-c-driver-1.1.10:= )
+ mysql? ( dev-db/mysql-connector-c:= )
+ normalize? (
+ >=dev-libs/liblognorm-2.0.3:=
+ )
+ clickhouse? ( >=net-misc/curl-7.35.0 )
+ omhttpfs? ( >=net-misc/curl-7.35.0 )
+ omudpspoof? ( >=net-libs/libnet-1.1.6 )
+ postgres? ( >=dev-db/postgresql-8.4.20:= )
+ rabbitmq? ( >=net-libs/rabbitmq-c-0.3.0:= )
+ redis? ( >=dev-libs/hiredis-0.11.0:= )
+ relp? ( >=dev-libs/librelp-1.2.17:= )
+ rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] )
+ rfc5424hmac? (
+ !libressl? ( >=dev-libs/openssl-0.9.8y:0= )
+ libressl? ( dev-libs/libressl:= )
+ )
+ snmp? ( >=net-analyzer/net-snmp-5.7.2 )
+ ssl? (
+ gnutls? ( >=net-libs/gnutls-2.12.23:0= )
+ openssl? (
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl:0= )
+ )
+ )
+ systemd? ( >=sys-apps/systemd-234 )
+ uuid? ( sys-apps/util-linux:0= )
+ xxhash? ( dev-libs/xxhash:= )
+ zeromq? (
+ >=net-libs/czmq-4:=[drafts]
+ )"
+DEPEND="${RDEPEND}
+ test? (
+ >=dev-libs/liblogging-1.0.1[stdlog]
+ )"
+
+if [[ ${PV} == "9999" ]]; then
+ BDEPEND+=" doc? ( >=dev-python/sphinx-1.1.3-r7 )"
+ BDEPEND+=" >=sys-devel/flex-2.5.39-r1"
+ BDEPEND+=" >=sys-devel/bison-2.4.3"
+ BDEPEND+=" >=dev-python/docutils-0.12"
+fi
+
+CONFIG_CHECK="~INOTIFY_USER"
+WARNING_INOTIFY_USER="CONFIG_INOTIFY_USER isn't set. Imfile module on this system will only support polling mode!"
+
+pkg_setup() {
+ use test && python-any-r1_pkg_setup
+}
+
+src_unpack() {
+ if [[ ${PV} == "9999" ]]; then
+ git-r3_fetch
+ git-r3_checkout
+ else
+ unpack ${P}.tar.gz
+ fi
+
+ if use doc; then
+ if [[ ${PV} == "9999" ]]; then
+ local _EGIT_BRANCH=
+ if [[ -n "${EGIT_BRANCH}" ]]; then
+ # Cannot use rsyslog commits/branches for documentation repository
+ _EGIT_BRANCH=${EGIT_BRANCH}
+ unset EGIT_BRANCH
+ fi
+
+ git-r3_fetch "${DOC_REPO_URI}"
+ git-r3_checkout "${DOC_REPO_URI}" "${S}"/docs
+
+ if [[ -n "${_EGIT_BRANCH}" ]]; then
+ # Restore previous EGIT_BRANCH information
+ EGIT_BRANCH=${_EGIT_BRANCH}
+ fi
+ else
+ cd "${S}" || die "Cannot change dir into '${S}'"
+ mkdir docs || die "Failed to create docs directory"
+ cd docs || die "Failed to change dir into '${S}/docs'"
+ unpack ${PN}-doc-${PV}.tar.gz
+ fi
+ fi
+}
+
+src_prepare() {
+ default
+
+ # https://github.com/rsyslog/rsyslog/issues/3626
+ sed -i \
+ -e '\|^#!/bin/bash$|a exit 77' \
+ tests/mmkubernetes-cache-expir*.sh \
+ || die "Failed to disabled known test failure mmkubernetes-cache-expir*.sh"
+
+ eautoreconf
+}
+
+src_configure() {
+ # Maintainer notes:
+ # * Guardtime support is missing because libgt isn't yet available
+ # in portage.
+ # * Hadoop's HDFS file system output module is currently not
+ # supported in Gentoo because nobody is able to test it
+ # (JAVA dependency).
+ # * dev-libs/hiredis doesn't provide pkg-config (see #504614,
+ # upstream PR 129 and 136) so we need to export HIREDIS_*
+ # variables because rsyslog's build system depends on pkg-config.
+
+ if use redis; then
+ export HIREDIS_LIBS="-L${EPREFIX}/usr/$(get_libdir) -lhiredis"
+ export HIREDIS_CFLAGS="-I${EPREFIX}/usr/include"
+ fi
+
+ local myeconfargs=(
+ --disable-debug-symbols
+ --disable-generate-man-pages
+ --without-valgrind-testbench
+ --disable-liblogging-stdlog
+ $(use_enable test testbench)
+ $(use_enable test libfaketime)
+ $(use_enable test extended-tests)
+ # Input Plugins without depedencies
+ --enable-imbatchreport
+ --enable-imdiag
+ --enable-imfile
+ --enable-improg
+ --enable-impstats
+ --enable-imptcp
+ # Message Modificiation Plugins without depedencies
+ --enable-mmanon
+ --enable-mmaudit
+ --enable-mmcount
+ --enable-mmfields
+ --enable-mmjsonparse
+ --enable-mmpstrucdata
+ --enable-mmrm1stspace
+ --enable-mmsequence
+ --enable-mmtaghostname
+ --enable-mmutf8fix
+ # Output Modification Plugins without dependencies
+ --enable-mail
+ --enable-omprog
+ --enable-omruleset
+ --enable-omstdout
+ --enable-omuxsock
+ # Misc
+ --enable-fmhash
+ $(use_enable xxhash fmhash-xxhash)
+ --enable-pmaixforwardedfrom
+ --enable-pmciscoios
+ --enable-pmcisconames
+ --enable-pmdb2diag
+ --enable-pmlastmsg
+ $(use_enable normalize pmnormalize)
+ --enable-pmnull
+ --enable-pmpanngfw
+ --enable-pmsnare
+ # DB
+ $(use_enable dbi libdbi)
+ $(use_enable mongodb ommongodb)
+ $(use_enable mysql)
+ $(use_enable postgres pgsql)
+ $(use_enable redis omhiredis)
+ # Debug
+ $(use_enable debug)
+ $(use_enable debug diagtools)
+ $(use_enable debug valgrind)
+ # Misc
+ $(use_enable clickhouse)
+ $(use_enable curl fmhttp)
+ $(use_enable elasticsearch)
+ $(use_enable gcrypt libgcrypt)
+ $(use_enable imhttp)
+ $(use_enable impcap)
+ $(use_enable jemalloc)
+ $(use_enable kafka imkafka)
+ $(use_enable kafka omkafka)
+ $(use_enable kerberos gssapi-krb5)
+ $(use_enable kubernetes mmkubernetes)
+ $(use_enable normalize mmnormalize)
+ $(use_enable mdblookup mmdblookup)
+ $(use_enable omhttp)
+ $(use_enable omhttpfs)
+ $(use_enable omudpspoof)
+ $(use_enable rabbitmq omrabbitmq)
+ $(use_enable relp)
+ $(use_enable rfc3195)
+ $(use_enable rfc5424hmac mmrfc5424addhmac)
+ $(use_enable snmp)
+ $(use_enable snmp mmsnmptrapd)
+ $(use_enable gnutls)
+ $(use_enable openssl)
+ $(use_enable systemd imjournal)
+ $(use_enable systemd omjournal)
+ $(use_enable usertools)
+ $(use_enable uuid)
+ $(use_enable zeromq imczmq)
+ $(use_enable zeromq omczmq)
+ --with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
+ )
+
+ econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+ default
+
+ if use doc && [[ "${PV}" == "9999" ]]; then
+ einfo "Building documentation ..."
+ local doc_dir="${S}/docs"
+ cd "${doc_dir}" || die "Cannot chdir into \"${doc_dir}\"!"
+ sphinx-build -b html source build || die "Building documentation failed!"
+ fi
+}
+
+src_test() {
+ local _has_increased_ulimit=
+
+ # Sometimes tests aren't executable (i.e. when added via patch)
+ einfo "Adjusting permissions of test scripts ..."
+ find "${S}"/tests -type f -name '*.sh' \! -perm -111 -exec chmod a+x '{}' \; || \
+ die "Failed to adjust test scripts permission"
+
+ if ulimit -n 3072; then
+ _has_increased_ulimit="true"
+ fi
+
+ if ! emake --jobs 1 check; then
+ eerror "Test suite failed! :("
+
+ if [[ -z "${_has_increased_ulimit}" ]]; then
+ eerror "Probably because open file limit couldn't be set to 3072."
+ fi
+
+ if has userpriv ${FEATURES}; then
+ eerror "Please try to reproduce the test suite failure with FEATURES=-userpriv " \
+ "before you submit a bug report."
+ fi
+
+ fi
+}
+
+src_install() {
+ local DOCS=(
+ AUTHORS
+ ChangeLog
+ "${FILESDIR}"/README.gentoo
+ )
+
+ use doc && local HTML_DOCS=( "${S}/docs/build/." )
+
+ default
+
+ newconfd "${FILESDIR}/${PN}.confd-r1" ${PN}
+ newinitd "${FILESDIR}/${PN}.initd-r1" ${PN}
+
+ keepdir /var/empty/dev
+ keepdir /var/spool/${PN}
+ keepdir /etc/ssl/${PN}
+ keepdir /etc/${PN}.d
+
+ insinto /etc
+ newins "${FILESDIR}/${PN}.conf" ${PN}.conf
+
+ insinto /etc/rsyslog.d/
+ newins "${FILESDIR}/50-default-r1.conf" 50-default.conf
+
+ insinto /etc/logrotate.d/
+ newins "${FILESDIR}/${PN}-r1.logrotate" ${PN}
+
+ if use mysql; then
+ insinto /usr/share/${PN}/scripts/mysql
+ doins plugins/ommysql/createDB.sql
+ fi
+
+ if use postgres; then
+ insinto /usr/share/${PN}/scripts/pgsql
+ doins plugins/ompgsql/createDB.sql
+ fi
+
+ find "${ED}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+ local advertise_readme=0
+
+ if [[ -z "${REPLACING_VERSIONS}" ]]; then
+ # This is a new installation
+
+ advertise_readme=1
+
+ if use mysql || use postgres; then
+ echo
+ elog "Sample SQL scripts for MySQL & PostgreSQL have been installed to:"
+ elog " /usr/share/doc/${PF}/scripts"
+ fi
+
+ if use ssl; then
+ echo
+ elog "To create a default CA and certificates for your server and clients, run:"
+ elog " emerge --config =${PF}"
+ elog "on your logging server. You can run it several times,"
+ elog "once for each logging client. The client certificates will be signed"
+ elog "using the CA certificate generated during the first run."
+ fi
+ fi
+
+ if [[ ${advertise_readme} -gt 0 ]]; then
+ # We need to show the README file location
+
+ echo ""
+ elog "Please read"
+ elog ""
+ elog " ${EPREFIX}/usr/share/doc/${PF}/README.gentoo*"
+ elog ""
+ elog "for more details."
+ fi
+}
+
+pkg_config() {
+ if ! use ssl; then
+ einfo "There is nothing to configure for rsyslog unless you"
+ einfo "used USE=ssl to build it."
+ return 0
+ fi
+
+ if ! hash certtool &>/dev/null; then
+ die "certtool not found! Is net-libs/gnutls[tools] is installed?"
+ fi
+
+ # Make sure the certificates directory exists
+ local CERTDIR="${EROOT}/etc/ssl/${PN}"
+ if [[ ! -d "${CERTDIR}" ]]; then
+ mkdir "${CERTDIR}" || die
+ fi
+ einfo "Your certificates will be stored in ${CERTDIR}"
+
+ # Create a default CA if needed
+ if [[ ! -f "${CERTDIR}/${PN}_ca.cert.pem" ]]; then
+ einfo "No CA key and certificate found in ${CERTDIR}, creating them for you..."
+ certtool --generate-privkey \
+ --outfile "${CERTDIR}/${PN}_ca.privkey.pem" || die
+ chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem"
+
+ cat > "${T}/${PF}.$$" <<- _EOF
+ cn = Portage automated CA
+ ca
+ cert_signing_key
+ expiration_days = 3650
+ _EOF
+
+ certtool --generate-self-signed \
+ --load-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
+ --outfile "${CERTDIR}/${PN}_ca.cert.pem" \
+ --template "${T}/${PF}.$$" || die
+ chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem"
+
+ # Create the server certificate
+ echo
+ einfon "Please type the Common Name of the SERVER you wish to create a certificate for: "
+ read -r CN
+
+ einfo "Creating private key and certificate for server ${CN}..."
+ certtool --generate-privkey \
+ --outfile "${CERTDIR}/${PN}_${CN}.key.pem" || die
+ chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem"
+
+ cat > "${T}/${PF}.$$" <<- _EOF
+ cn = ${CN}
+ tls_www_server
+ dns_name = ${CN}
+ expiration_days = 3650
+ _EOF
+
+ certtool --generate-certificate \
+ --outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \
+ --load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \
+ --load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \
+ --load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
+ --template "${T}/${PF}.$$" &>/dev/null
+ chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem"
+
+ else
+ einfo "Found existing ${CERTDIR}/${PN}_ca.cert.pem, skipping CA and SERVER creation."
+ fi
+
+ # Create a client certificate
+ echo
+ einfon "Please type the Common Name of the CLIENT you wish to create a certificate for: "
+ read -r CN
+
+ einfo "Creating private key and certificate for client ${CN}..."
+ certtool --generate-privkey \
+ --outfile "${CERTDIR}/${PN}_${CN}.key.pem" || die
+ chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem"
+
+ cat > "${T}/${PF}.$$" <<- _EOF
+ cn = ${CN}
+ tls_www_client
+ dns_name = ${CN}
+ expiration_days = 3650
+ _EOF
+
+ certtool --generate-certificate \
+ --outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \
+ --load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \
+ --load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \
+ --load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
+ --template "${T}/${PF}.$$" || die
+ chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem"
+
+ rm -f "${T}/${PF}.$$"
+
+ echo
+ einfo "Here is the documentation on how to encrypt your log traffic:"
+ einfo " https://www.rsyslog.com/doc/rsyslog_tls.html"
+}
diff --git a/app-admin/salt/Manifest b/app-admin/salt/Manifest
index b953fc56ef67..042b0adf38c7 100644
--- a/app-admin/salt/Manifest
+++ b/app-admin/salt/Manifest
@@ -10,6 +10,7 @@ AUX salt-2019.2.0-skip-tests-that-oom-machine.patch 739 BLAKE2B c0e1b18c528ddcdc
AUX salt-2019.2.0-tests.patch 2793 BLAKE2B c609564673db7388a876902deb57f0aec70531ea26536954efdabdd8849eee314e840cc299f6e1fbd6a18740847a9ee8d217426adee38d36ae569f6e2e9c85ae SHA512 eb1d61f5410b36d0749cce5fc7dc08a8950061f7fb3497a122702eba7638ec3e635750b25ad5cacc4839d4828f13785ea122df43e8aff7635d79283be0392f02
AUX salt-2019.2.2-newer-deps.patch 6635 BLAKE2B 377b06231914bbbfc0ca279bb169e0167f5dec0d421e221f7441a237c11d9670e5fd378d294c02fe16bd5989f2cb0db9864eb2270dbe09755475e9e6fcc059de SHA512 24faf550a0de753eb605df8fe658b71972048be781bb77df0c11f3ed7eda6b423897d1f88d84dad3f5d9e8d3db0784cbfe8d1a017c950661de56deb7edb23eaf
AUX salt-2019.2.2-workaround-broken-mock-on-py2.patch 1224 BLAKE2B ea81b3a699220fd0084eb1f259e59d28c75b5bafb9ce0988b987f373265f58d8184a4703c5b2f36fddf7dad5e7be666280c1b4f5c4d6d11ce71c636cbc380b94 SHA512 2078c489080aa0731d0304835fbf9fdfa88bba4fca4fa8d19d708927e1583d3e3a17d49fbb233b6a41d079a921eb2cdf2f7fa9bd606005ca7259548cff7f66ae
+AUX salt-2019.2.8-ansible-roster-fix.patch 572 BLAKE2B c11106be76626673a0e6365dea7ac8593f420ffa2bc0ca02c24520240d863d69a7f0449f10b5d53f6292c247f434636a0f188338ffa3d81a27abc8db18059c92 SHA512 86a2fc107882855ef60b2722e7282de8e6ad57c5fe6809ff99843f934a193445da599d57d1cbc3d7d3443f93d52a7ba5922c6bd76579f85648f6256ce7a81c66
AUX salt-3000.1-tests.patch 2390 BLAKE2B f46b8a4aa2c57307385d6e56b54b54ebeb18bfa298b66804a64c7e64608fb07a8fea8eabeebb8ba1772936cf50541d6bea81eefcf9617ccb8074b534ac0ec1af SHA512 5e3a212995f8f4fae4e3c4c51519fd2e7bfa20b39492485e10788b3cf72ff9344681fdff4a2d6364e7e4b9c9554fd3efffb9d197aad445423950ce72c6455b2b
AUX salt-3000.2-py38-abc.patch 2641 BLAKE2B 054fae62aee23528beaad9e4c9c8ac72c1f9a208e2b5d2d17af08ef0e810e7b2ba93522c110bf052a4d3d8831aa772eb3ab7fcb378034634a4b46f10af5c5c20 SHA512 b4feaa17cdbbb9cdf4ec7759b9fa201d731680939e199edd2e683ca6dc5b2cf99aa6fa8f87517dfbd5b6af2ccafbdb50cf9744345149131941f1bd107145cf69
AUX salt-3000.2-py38-logwarn.patch 4875 BLAKE2B f0ced7bad98983296561d223405d512077c0b70de12a8af613d4069842d3cb6167dd0da49c30fc881e985594f755ce0b063df311bbe84ae9cfc37896670aca52 SHA512 94ca1f73cbeb9d3ab93cb1c7afd4abce5318022a267342e4b348066c5508016891a3c05bd0ea867ae868794684bdc1bfd3e7779c4ea2a9cd60626d6513f8ba4e
@@ -25,14 +26,18 @@ AUX salt-syndic.service 169 BLAKE2B 0d00f20b4663804eaa4b6a1a1b32ed87b04d1f4df6a8
AUX syndic-confd-1 188 BLAKE2B ad20094c30f9aa573397d347f9fb11acafba2f724b6c836d7ec57f10d4182c300a4b0ec572b5f3301174febdfc69c30752c3b0eabdfdf9f4963b03531db23523 SHA512 0051e13351cef8db81dc075a194bb384723f07d5591b5b4d3f3adf4180afaf7beced470ab79ceca9d1ec0dae62dbd72084eb76af009fc78411a011050a94a2ed
AUX syndic-initd-4 311 BLAKE2B aab3b44f65dedb30ea4eb573872c0253e4d7b438a533f22a4e887c1e6487682efce7f5b75d3bcf366ef706a9fb1578dce537ac5b50324239378cecbd0715ad5d SHA512 69cc10fa7d9f0f4a68d223272c08ee33af242a50eb9bbea919d61f6cb5baf1ce986b07d69fc0e47e2f6dffc0a11100c3bc0d836d2938c46aa364beecb47f07ef
DIST salt-2019.2.7.tar.gz 14576515 BLAKE2B 4b2476c874a806de8664abd7852d5f856fc1946cc021d3ec8d206f69ec3cd809fe156d4d916d00304c36aad1dfab3a60309eb87d21ce7bb9afc7e8ea77ac23aa SHA512 e9a0d1ada0172239a31c6a8a628e71367aba072c06fe5420f4b864b9c67da89edd03f95abd46fd9ae414c2262b4e7e5c7f53c606f9f3f58e4c84129f2ed43c9e
+DIST salt-2019.2.8.tar.gz 14595964 BLAKE2B 7551bbfffe6e4f3107806ef95c9ad1b3fdff6274e8fa679bee143be203929df6d51dcc1e704d1e9458e8051197277257c68c7fd18cf54cad1c49314574c8471b SHA512 e4b45ee264a4e663c6039ca6c89ea0aeff1273b2b40b4d799a30cdb6b23cf568be81e4807ecb2832b2a596993f1512ef45d68e444f3b32e6f5a38d8ce548ddac
DIST salt-3000.2-py38-misc.patch.gz 6250 BLAKE2B 68fff80a042e6bf208ea2d9692da7a7b1e29572f1ec3c850c14743bbf2821d231f933ec4e6d6eaad12acee0b7666888a37a72872b2b082c92d8db9de988fbbec SHA512 6d4a66323a423e630f7cc73b566ed96c452c8fc3d72c25a2dd86033c4774c1c8e8b8701e1d4ee92994d4148c398d704f419023e26d8b40c8fdd63f9d79d9d52f
DIST salt-3000.5.tar.gz 15229450 BLAKE2B 135e9b9dcc461ac898231ce46e6a1359e6d60a43822320950bc0b83057f768dadf55320dd73df72d5bc917f324eef4661e6f75d8eb8e84aef958bd2df8924cfc SHA512 2579f65c24d22d77132057bd8cf37040d7d149624745dd68b4c44318be786580dcc34bf563f90d7de9ef5b726b2453bef4d8639bc8fbd9c5e691500520335317
-DIST salt-3001.3.tar.gz 14553356 BLAKE2B 50d073d39826fb15cb424df3e55c2308dd18391c13a5c4a3fb01c1e1ecd8636dd45fdf34b1937563d069e51141fc40f48f77eaec6b1e1d6f9802418e611b20b1 SHA512 a3c0f019fbe1f1edac11af291667f06597dbf4badeb0026107dcab4937efcb306ca6d3ba20195ff9fea5ee7a995db1c3a79236de3e990fc809c305e7f05e1c9d
+DIST salt-3000.6.tar.gz 15236781 BLAKE2B 5a532a6915b331fb532dc6e1651cf8fca3e1a5e9f29f6d75260fdb1162dbfeec755c65f7c6fc28b1cc7dc3ace978547830af31aafc1eee8419bbc7e695725787 SHA512 739e3671766c45a0ef1eb45933c7f00f14586e91f4c4a79cbed913a48961a48baee853206ba569491756e8a872d22f3635eb6bc1a366020e551c567b2334c508
+DIST salt-3001.4.tar.gz 15716372 BLAKE2B cc33b29b0da9cfaae22726b2b471245880aafa106187b531872a9ae5ee773a94e0d550a68b11b74826bc0b35197a311f690535f2280931ccb5050275ad967c2d SHA512 b7f343c65917280a96d8a3eaa6b508121b11b9f9b0bfffa5b4c79af0023bdecf4581f76014847d97f48d9677edb6f632adec3850153c3048c3114128a250b84b
DIST salt-3002.1.tar.gz 15753988 BLAKE2B d084dc650b8bc92b4ebdb145a41a39bfbd034064fad65e364260eca84d7105fb645ad8f6cea2cc1b6affb1abf21a9858ab6fb526eaf4ecd8f76c70d1384c7edc SHA512 8fc02d0b47dad60f96eb4442b0e8a31f04d796f12b845c8142135593af4c7ea9c2d9335a3f520f8858951f87b0e8cc6be70d383fde2d93a6d529e077bcc87114
DIST salt-3002.2.tar.gz 15765855 BLAKE2B b26895ababc8551e01baa806c5a0e41dab9a379e47d2289b5c3c529ef762c69631d7ed8b32339ec66c3929c5883782131eb56d1bfbcc743829c4f0199a900ca1 SHA512 0f617a07475347b1bb0d1c6059de541e102103182820dfd6f64f4c281d660e68358eb1ab7171a637e16cef9fea2517c8356df9c449f9bbc92538aa86c316f652
EBUILD salt-2019.2.7.ebuild 4910 BLAKE2B 67e56a9029c3157a31525c8ea41a957b82a3d2c846ae68756c8ea67261d6ea6346a98bbafd785fe519640ceef2e3495e58b0ec262858be30016eba10f1392567 SHA512 75e9eb392f3619b714a0ba43d64c5e08c51f512e71d98f1be763cb443d1c8a6c429ef5c2d272c162db34f3e274aebdf2f0c4866a32925232d134b9f91a4765ef
+EBUILD salt-2019.2.8.ebuild 4959 BLAKE2B 0a86fee2e9454eeec09b4329d2cd647f95398e7e5d274c2a631b8a0c8616e46fcd7fc08d9d15c0568e7b6305ac10bb3ca99903e505f292a4ab7e6858641c8624 SHA512 f11a149f3e979a909d5c46697117f4f30a6cd9aa57adcb0e031d1df22e48d7f99bc30d3796139a99ddc0b1ce5537042098e55907840dd0b32634056462680c71
EBUILD salt-3000.5.ebuild 6321 BLAKE2B ddaa02503b5d8301697bae784a4901348eec72152e9d91d21eff82640d3609b093aa2acd818554d96edf86921cfcdbf9cc39b3e0f9292fff919f903919a6c250 SHA512 6b405a1bd5234500907b8da8865ec0aa2583efe7700fb3f09776297a4592352fe13ab199ff1fd9bf50421e2f11b363b804f41823d6fbf8d993d56bf6a1d07ed6
-EBUILD salt-3001.3.ebuild 5998 BLAKE2B 271ed69190cc3582ef29fc731693e5fc97ec4984d60735fc9e77f082c9a848a44934d00e7161b7f53cb7c8e4f3c92f52f09a0dceb5ac6deb8a5e1c46c9c45932 SHA512 dff46b7448eb7a1a2b11dc2018d1f46813dd1f23643b78d2e32ebfe658b88e658807b0f2b3838a0fbf08d353f64195dc67ff9c282861ac55a2763116515aa7d6
+EBUILD salt-3000.6.ebuild 6377 BLAKE2B 39cb9ce06b9eed29d75ae8747f780221487565da34475b35659f4f5208910216016a02b1cfd52fe5df7662df20e2741f0028c67f3114b2d8d5833a7bca962b88 SHA512 24ce6c7b9364cb3824c218c8bad4fcc6c103767599e3b0c054391cc908ffc81aacc586039de3855bb5f862fe572971fede0890d79ad755e5bf9c9eaea5edb84d
+EBUILD salt-3001.4.ebuild 5998 BLAKE2B 271ed69190cc3582ef29fc731693e5fc97ec4984d60735fc9e77f082c9a848a44934d00e7161b7f53cb7c8e4f3c92f52f09a0dceb5ac6deb8a5e1c46c9c45932 SHA512 dff46b7448eb7a1a2b11dc2018d1f46813dd1f23643b78d2e32ebfe658b88e658807b0f2b3838a0fbf08d353f64195dc67ff9c282861ac55a2763116515aa7d6
EBUILD salt-3002.1.ebuild 5956 BLAKE2B 3471c7185550aa6719893059d435c17a2f33252afc3634b81dfbe42a5c43cbe9676473d6e36d9b1c5853da9521d2cae0686da44578b8262d6bbabb79201962b9 SHA512 af287ce3fbe3b070753fa7e63d99283a25f3ca776a854c052890c5638f70de1147758ceeb73c89dfa1f903adf27500a46ce268a786c9e4fd95c115a652de764a
EBUILD salt-3002.2.ebuild 5956 BLAKE2B 3471c7185550aa6719893059d435c17a2f33252afc3634b81dfbe42a5c43cbe9676473d6e36d9b1c5853da9521d2cae0686da44578b8262d6bbabb79201962b9 SHA512 af287ce3fbe3b070753fa7e63d99283a25f3ca776a854c052890c5638f70de1147758ceeb73c89dfa1f903adf27500a46ce268a786c9e4fd95c115a652de764a
MISC metadata.xml 2361 BLAKE2B 37b7fc2f2981e2f09ecb22804831dbbeaa03d74436df5fd34d65b241330ab760b3618b3e3f497ae81e91714c1b6a4913b1305e49ef157896ef1c1e1a309cae4f SHA512 703ccabd91e0ecb08190f8349ec3588e4effe3ef295ae4e05b1d077399cc4aa52fee5f6a533ad4d29f0cfeac8221878f63fbd2e5af8604ab37ec00a68c940ef5
diff --git a/app-admin/salt/files/salt-2019.2.8-ansible-roster-fix.patch b/app-admin/salt/files/salt-2019.2.8-ansible-roster-fix.patch
new file mode 100644
index 000000000000..597c97e87774
--- /dev/null
+++ b/app-admin/salt/files/salt-2019.2.8-ansible-roster-fix.patch
@@ -0,0 +1,13 @@
+diff --git a/salt/roster/ansible.py b/salt/roster/ansible.py
+index f4a2a23e0b..e6b9e80247 100644
+--- a/salt/roster/ansible.py
++++ b/salt/roster/ansible.py
+@@ -129,7 +129,7 @@ def targets(tgt, tgt_type='glob', **kwargs):
+
+ def _get_hosts_from_group(group):
+ inventory = __context__['inventory']
+- hosts = [host for host in inventory[group].get('hosts', [])]
++ hosts = [host for host in inventory.setdefault(group, {}).get('hosts', [])]
+ for child in inventory[group].get('children', []):
+ hosts.extend(_get_hosts_from_group(child))
+ return hosts
diff --git a/app-admin/salt/salt-2019.2.8.ebuild b/app-admin/salt/salt-2019.2.8.ebuild
new file mode 100644
index 000000000000..2a0b207dfeeb
--- /dev/null
+++ b/app-admin/salt/salt-2019.2.8.ebuild
@@ -0,0 +1,151 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_6 )
+DISTUTILS_USE_SETUPTOOLS=no
+inherit systemd distutils-r1
+
+DESCRIPTION="Salt is a remote execution and configuration manager"
+HOMEPAGE="https://www.saltstack.com/resources/community/
+ https://github.com/saltstack"
+
+if [[ ${PV} == 9999* ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="git://github.com/${PN}stack/${PN}.git"
+ EGIT_BRANCH="develop"
+ SRC_URI=""
+else
+ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+ KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="cherrypy ldap libcloud libvirt gnupg keyring mako mongodb neutron nova
+ openssl portage profile redis selinux test vim-syntax"
+
+RDEPEND="
+ sys-apps/pciutils
+ dev-python/jinja[${PYTHON_USEDEP}]
+ dev-python/libnacl[${PYTHON_USEDEP}]
+ >=dev-python/msgpack-0.3[${PYTHON_USEDEP}]
+ =dev-python/pyzmq-2.2.0[${PYTHON_USEDEP}]
+ >=dev-python/requests-1.0.0[${PYTHON_USEDEP}]
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ >=www-servers/tornado-4.2.1[${PYTHON_USEDEP}]
+ =dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] )
+ mako? ( dev-python/mako[${PYTHON_USEDEP}] )
+ ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] )
+ libvirt? ( dev-python/libvirt-python[${PYTHON_USEDEP}] )
+ openssl? (
+ dev-libs/openssl:0=[-bindist]
+ dev-python/pyopenssl[${PYTHON_USEDEP}]
+ )
+ cherrypy? ( >=dev-python/cherrypy-3.2.2[${PYTHON_USEDEP}] )
+ mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] )
+ portage? ( sys-apps/portage[${PYTHON_USEDEP}] )
+ keyring? ( dev-python/keyring[${PYTHON_USEDEP}] )
+ redis? ( dev-python/redis-py[${PYTHON_USEDEP}] )
+ selinux? ( sec-policy/selinux-salt )
+ nova? ( >=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}] )
+ neutron? ( >=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}] )
+ gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] )
+ profile? ( dev-python/yappi[${PYTHON_USEDEP}] )
+ vim-syntax? ( app-vim/salt-vim )"
+BDEPEND="
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ test? (
+ >=dev-python/boto-2.32.1[${PYTHON_USEDEP}]
+ >=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
+ >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}]
+ >=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
+ >=dev-python/moto-0.3.6[${PYTHON_USEDEP}]
+ dev-python/pip[${PYTHON_USEDEP}]
+ dev-python/pytest-helpers-namespace[${PYTHON_USEDEP}]
+ >=dev-python/pytest-salt-2018.12.8[${PYTHON_USEDEP}]
+ =dev-python/SaltTesting-2016.5.11[${PYTHON_USEDEP}]
+ dev-python/virtualenv[${PYTHON_USEDEP}]
+ !x86? ( >=dev-python/boto3-1.2.1[${PYTHON_USEDEP}] )
+ ${RDEPEND}
+ )"
+
+DOCS=( README.rst AUTHORS )
+
+RESTRICT="!test? ( test ) x86? ( test )"
+
+PATCHES=(
+ "${FILESDIR}/salt-2017.7.0-dont-realpath-tmpdir.patch"
+ "${FILESDIR}/salt-2019.2.0-tests.patch"
+ "${FILESDIR}/salt-2019.2.0-skip-tests-that-oom-machine.patch"
+ "${FILESDIR}/salt-2019.2.2-newer-deps.patch"
+ "${FILESDIR}/salt-2019.2.2-workaround-broken-mock-on-py2.patch"
+ "${FILESDIR}/salt-2019.2.0-remove-raet-tests.patch"
+ "${FILESDIR}/salt-2019.2.8-ansible-roster-fix.patch"
+)
+
+python_prepare() {
+ # remove tests with external dependencies that may not be available
+ rm tests/unit/{test_zypp_plugins.py,utils/test_extend.py} || die
+ rm tests/unit/modules/test_{file,boto_{vpc,secgroup,elb}}.py || die
+ rm tests/unit/states/test_boto_vpc.py || die
+
+ # breaks with permission errors
+ rm tests/unit/utils/test_cache.py || die
+
+ # remove raet due to deps being dropped
+ rm tests/unit/modules/test_raet_publish.py \
+ salt/transport/raet.py \
+ salt/daemons/test/test_raetkey.py || die
+
+ # allow the use of the renamed msgpack
+ sed -i '/^msgpack/d' requirements/base.txt || die
+}
+
+python_install_all() {
+ local svc
+ USE_SETUPTOOLS=1 distutils-r1_python_install_all
+
+ for svc in minion master syndic api; do
+ newinitd "${FILESDIR}"/${svc}-initd-4 salt-${svc}
+ newconfd "${FILESDIR}"/${svc}-confd-1 salt-${svc}
+ systemd_dounit "${FILESDIR}"/salt-${svc}.service
+ done
+
+ insinto /etc/${PN}
+ doins -r conf/*
+}
+
+python_test() {
+ local tempdir
+ # testsuite likes lots of files
+ ulimit -n 3072 || die
+
+ # ${T} is too long a path for the tests to work
+ tempdir="$(mktemp -du --tmpdir=/tmp salt-XXX)"
+ mkdir "${T}/$(basename "${tempdir}")"
+ mkdir "${BUILD_DIR}"/../{templates,conf/cloud.{providers,profiles,maps}.d} || die
+
+ (
+ cleanup() { rm -f "${tempdir}" || die; }
+
+ trap cleanup EXIT
+
+ addwrite "${tempdir}"
+ ln -s "$(realpath --relative-to=/tmp "${T}/$(basename "${tempdir}")")" "${tempdir}" || die
+
+ USE_SETUPTOOLS=1 SHELL="/bin/bash" \
+ TMPDIR="${tempdir}" \
+ ${EPYTHON} tests/runtests.py \
+ --unit-tests --no-report --verbose \
+ || die "testing failed with ${EPYTHON}"
+ )
+}
diff --git a/app-admin/salt/salt-3000.6.ebuild b/app-admin/salt/salt-3000.6.ebuild
new file mode 100644
index 000000000000..14cbe4757bec
--- /dev/null
+++ b/app-admin/salt/salt-3000.6.ebuild
@@ -0,0 +1,194 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7,8} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+inherit systemd distutils-r1
+
+DESCRIPTION="Salt is a remote execution and configuration manager"
+HOMEPAGE="https://www.saltstack.com/resources/community/
+ https://github.com/saltstack"
+
+if [[ ${PV} == 9999* ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="git://github.com/${PN}stack/${PN}.git"
+ EGIT_BRANCH="develop"
+ SRC_URI=""
+else
+ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
+ https://dev.gentoo.org/~chutzpah/dist/salt/salt-3000.2-py38-misc.patch.gz"
+ KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="cheetah cherrypy ldap libcloud libvirt genshi gnupg keyring mako
+ mongodb neutron nova openssl portage profile redis selinux test raet
+ +zeromq vim-syntax"
+
+RDEPEND="
+ sys-apps/pciutils
+ dev-python/distro[${PYTHON_USEDEP}]
+ dev-python/jinja[${PYTHON_USEDEP}]
+ dev-python/libnacl[${PYTHON_USEDEP}]
+ >=dev-python/msgpack-0.5[${PYTHON_USEDEP}]
+ =dev-python/requests-1.0.0[${PYTHON_USEDEP}]
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ libcloud? ( >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] )
+ mako? ( dev-python/mako[${PYTHON_USEDEP}] )
+ ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] )
+ libvirt? (
+ $(python_gen_cond_dep 'dev-python/libvirt-python[${PYTHON_USEDEP}]' python3_7)
+ )
+ openssl? (
+ dev-libs/openssl:0=[-bindist]
+ dev-python/pyopenssl[${PYTHON_USEDEP}]
+ )
+ raet? (
+ >=dev-python/libnacl-1.0.0[${PYTHON_USEDEP}]
+ >=dev-python/ioflo-1.1.7[${PYTHON_USEDEP}]
+ >=dev-python/raet-0.6.0[${PYTHON_USEDEP}]
+ )
+ cherrypy? ( >=dev-python/cherrypy-3.2.2[${PYTHON_USEDEP}] )
+ cheetah? ( dev-python/cheetah3[${PYTHON_USEDEP}] )
+ mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] )
+ portage? ( sys-apps/portage[${PYTHON_USEDEP}] )
+ keyring? ( dev-python/keyring[${PYTHON_USEDEP}] )
+ redis? ( dev-python/redis-py[${PYTHON_USEDEP}] )
+ selinux? ( sec-policy/selinux-salt )
+ nova? (
+ $(python_gen_cond_dep '>=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}]' python3_7)
+ )
+ neutron? (
+ $(python_gen_cond_dep '>=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}]' python3_7)
+ )
+ gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] )
+ profile? ( dev-python/yappi[${PYTHON_USEDEP}] )
+ vim-syntax? ( app-vim/salt-vim )
+ zeromq? ( >=dev-python/pyzmq-2.2.0[${PYTHON_USEDEP}] )
+"
+BDEPEND="
+ test? (
+ ${RDEPEND}
+ >=dev-python/boto-2.32.1[${PYTHON_USEDEP}]
+ >=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
+ >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}]
+ >=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
+ >=dev-python/moto-0.3.6[${PYTHON_USEDEP}]
+ dev-python/pip[${PYTHON_USEDEP}]
+ dev-python/psutil[${PYTHON_USEDEP}]
+ dev-python/pytest[${PYTHON_USEDEP}]
+ dev-python/pytest-helpers-namespace[${PYTHON_USEDEP}]
+ dev-python/pytest-helpers-namespace[${PYTHON_USEDEP}]
+ >=dev-python/pytest-salt-2018.12.8[${PYTHON_USEDEP}]
+ dev-python/pytest-tempdir[${PYTHON_USEDEP}]
+ >=dev-python/SaltTesting-2016.5.11[${PYTHON_USEDEP}]
+ dev-python/virtualenv[${PYTHON_USEDEP}]
+ !x86? ( >=dev-python/boto3-1.2.1[${PYTHON_USEDEP}] )
+ )"
+
+DOCS=( README.rst AUTHORS )
+
+REQUIRED_USE="|| ( raet zeromq )
+ test? ( cheetah genshi )"
+RESTRICT="!test? ( test ) x86? ( test )"
+
+PATCHES=(
+ "${FILESDIR}/salt-2017.7.0-dont-realpath-tmpdir.patch"
+ "${FILESDIR}/salt-2019.2.0-skip-tests-that-oom-machine.patch"
+ "${FILESDIR}/salt-3000.1-tests.patch"
+ "${FILESDIR}/salt-3000.2-tests.patch"
+
+ # https://github.com/saltstack/salt/pull/55410
+ "${FILESDIR}/salt-3000.2-py38.patch"
+
+ # https://github.com/saltstack/salt/pull/55900
+ "${FILESDIR}/salt-3000.2-py38-abc.patch"
+
+ # misc py38 fixups
+ "${WORKDIR}/salt-3000.2-py38-misc.patch"
+ "${FILESDIR}/salt-3000.2-py38-logwarn.patch"
+ "${FILESDIR}/salt-2019.2.8-ansible-roster-fix.patch"
+)
+
+python_prepare() {
+ # remove tests with external dependencies that may not be available
+ rm tests/unit/{test_zypp_plugins.py,utils/test_extend.py} || die
+ rm tests/unit/modules/test_{file,boto_{vpc,secgroup,elb}}.py || die
+ rm tests/unit/states/test_boto_vpc.py || die
+
+ # tests that require network access
+ rm tests/unit/{states,modules}/test_zcbuildout.py || die
+
+ # make sure pkg_resources doesn't bomb because pycrypto isn't installed
+ find . -name '*.txt' -print0 | xargs -0 sed -e '/pycrypto>/ d' -i || die
+
+ einfo "Fixing collections.abc warnings for ${EPYTHON}"
+ local abc
+ abc="$("${EPYTHON}" -c 'import collections.abc; print("|".join((c for c in dir(collections.abc) if not c.startswith("_"))))')" || die
+ find -name '*.py' -type f -print0 | xargs -0 sed -r -e "s:collections\\.(${abc}):collections.abc.\\1:g" -i || die
+
+ # allow the use of the renamed msgpack
+ sed -i '/^msgpack/d' requirements/base.txt || die
+}
+
+python_install_all() {
+ local svc
+ USE_SETUPTOOLS=1 distutils-r1_python_install_all
+
+ for svc in minion master syndic api; do
+ newinitd "${FILESDIR}"/${svc}-initd-4 salt-${svc}
+ newconfd "${FILESDIR}"/${svc}-confd-1 salt-${svc}
+ systemd_dounit "${FILESDIR}"/salt-${svc}.service
+ done
+
+ insinto /etc/${PN}
+ doins -r conf/*
+}
+
+python_test() {
+ local tempdir
+ # testsuite likes lots of files
+ ulimit -n 3072 || die
+
+ # ${T} is too long a path for the tests to work
+ tempdir="$(mktemp -du --tmpdir=/tmp salt-XXX)"
+ mkdir "${T}/$(basename "${tempdir}")"
+
+ (
+ cleanup() { rm -f "${tempdir}" || die; }
+
+ trap cleanup EXIT
+
+ addwrite "${tempdir}"
+ ln -s "$(realpath --relative-to=/tmp "${T}/$(basename "${tempdir}")")" "${tempdir}" || die
+
+ USE_SETUPTOOLS=1 SHELL="/bin/bash" \
+ TMPDIR="${tempdir}" \
+ ${EPYTHON} tests/runtests.py \
+ --unit-tests --no-report --verbose \
+ || die "testing failed with ${EPYTHON}"
+ )
+}
+
+pkg_postinst() {
+ if use python_targets_python3_8; then
+ if use nova; then
+ ewarn "Salt's nova functionality will not work with python3.8 since"
+ ewarn "dev-python/python-novaclient does not support it yet"
+ fi
+ if use neutron; then
+ ewarn "Salt's neutron functionality will not work with python3.8 since"
+ ewarn "dev-python/python-neutronclient does not support it yet"
+ fi
+ if use libvirt; then
+ ewarn "Salt's libvirt functionality will not work with python3.8 since"
+ ewarn "dev-python/libvirt-python does not support it yet"
+ fi
+ fi
+}
diff --git a/app-admin/salt/salt-3001.3.ebuild b/app-admin/salt/salt-3001.4.ebuild
similarity index 100%
rename from app-admin/salt/salt-3001.3.ebuild
rename to app-admin/salt/salt-3001.4.ebuild
diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index 75a70eb0dac1..44c198cce2c5 100644
Binary files a/app-arch/Manifest.gz and b/app-arch/Manifest.gz differ
diff --git a/app-arch/lz4/Manifest b/app-arch/lz4/Manifest
index 39feef084099..14884f6fc4e1 100644
--- a/app-arch/lz4/Manifest
+++ b/app-arch/lz4/Manifest
@@ -1,5 +1,5 @@
DIST lz4-1.9.2.tar.gz 305796 BLAKE2B 0021487bee8657bc825fdd2b98a6dc8a6d10be3240fe0bebf6563e9c855a15bf5440a02d5cd6ee1f1e8502743348bcec1e866d3287b07e623887e9eb9da35eee SHA512 ae714c61ec8e33ed91359b63f2896cfa102d66b730dce112b74696ec5850e59d88bd5527173e01e354a70fbe8f036557a47c767ee0766bc5f9c257978116c3c1
DIST lz4-1.9.3.tar.gz 320958 BLAKE2B 9a194bd18ff52f780aa03a8a53fe7fab7b58117d768f4ba8e5005830c935d16328d0f7cc54f9413b58faf245017c0ac85fb4e709a9db150cb150a0a2a3c21645 SHA512 c246b0bda881ee9399fa1be490fa39f43b291bb1d9db72dba8a85db1a50aad416a97e9b300eee3d2a4203c2bd88bda2762e81bc229c3aa409ad217eb306a454c
EBUILD lz4-1.9.2.ebuild 914 BLAKE2B eaf423bafb37abee6dc5424d551449c359ca6e70790bfe35c5b28975c66064e84981b8d238492ffa080a2674b2937aebe9bb5d87b020e40bf048b9ee4cf36beb SHA512 76279d4ea35b063ea239f0124d60a0abd94e818ddf7aedbb2f44b80e504fb502cb8dddfa49e35ac9058bc377f5d2aaa9fa4bd322f22ffaa269f940edb78602dd
-EBUILD lz4-1.9.3.ebuild 789 BLAKE2B 1ed48b7ae722b9b52aa7aa2af699b5b5a2243006d1ebe6cfd0c0b77491abe9ce8aa33b467cbb7d92aed8cd371b0d033fb05dafb35477c9bd78ed209738cd2fb7 SHA512 a09fc7d38763dea2abc58797aefbf1e217b66d48cf85340100ead835128bc2803d5c72f3fb45dd51ca2b2e84214cdaac607fc00e3cefd5a8da8d7968d10726b0
+EBUILD lz4-1.9.3.ebuild 787 BLAKE2B 3a3d253fb0e42fb15013371324df0ff35cf0ac08075fd36de1e78634c74375575fdbd45fbfe22dcf45f1a3ab5e59227359ab4e42fa11f6d433b6b217a0b49a03 SHA512 5e7a3586684c5618d7822d3566561eed91bd16281d017590e3027bea5a33623ba5af2fd80442058d04d9eec53c583ba719dfeb77cc715b772988d89f49e63f86
MISC metadata.xml 596 BLAKE2B f79116c2ed40f870c688d9843c6d54da4fa6d33313d2a42d2d6162e1f2b5a6e93f119354a7ad97c67d66be6ba2437ffc0e91d6a9077fbc5b02b19420155375ca SHA512 bc5a6081ed4c2c6b7c7e4de5ef0ada5a4692e1e0833a01d8e596b7891cb2f612418350643ce6b764d8170b5632afc78143dd50bb4a34565384fd4b89ee34786b
diff --git a/app-arch/lz4/lz4-1.9.3.ebuild b/app-arch/lz4/lz4-1.9.3.ebuild
index dbf92b78579c..c91422a56345 100644
--- a/app-arch/lz4/lz4-1.9.3.ebuild
+++ b/app-arch/lz4/lz4-1.9.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/lz4/lz4/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD-2 GPL-2"
# https://abi-laboratory.pro/tracker/timeline/lz4/
SLOT="0/r132"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="static-libs"
CMAKE_USE_DIR=${S}/build/cmake
diff --git a/app-arch/zstd/Manifest b/app-arch/zstd/Manifest
index ae6bbaa13455..9e42efa94575 100644
--- a/app-arch/zstd/Manifest
+++ b/app-arch/zstd/Manifest
@@ -3,6 +3,8 @@ AUX zstd-1.4.4-pkgconfig_libdir.patch 8322 BLAKE2B 2c7bcc57cbbf549919d0f7ce4538a
AUX zstd-1.4.5-fix-uclibc-ng.patch 762 BLAKE2B 3ead6b2ca56a6109b984a7e4b73d80b8a92e10f8ff20547e27fe897d70dac7bff15f1acedf6cca3ab0ea9ded07c2cdb8ac2ee5665eeb7a095c742c5614c73604 SHA512 e4de6367b47b016d9a0179b57cc06c9e232d0a736e20ff0cf8132d36512a5a232d8583d91b1453f7a122d63b85df96688053f02552b2717ff2f22bf30a0c0002
DIST zstd-1.4.4.tar.gz 1962617 BLAKE2B e21841a53b6c60703e5500cfc2a02923c4c3e57975aa57e1060310171e0d83d7c8eda1bd0510d5736db5c310d76847d2105ac5f614867fc3a9dc3086a035dfd7 SHA512 8209837e8eb14e474dfe21d5511085f46cef93b03ab77613fd41e7b8be652418231c38852669c8e0b55b78ad41ea2cb8008d0da122a83f8f27e32b5c86f045cf
DIST zstd-1.4.5.tar.gz 1987927 BLAKE2B 1497d4e87040e5c71466468ebf1a57f4073666f2b005229925bc1d95a4b4fcb2a51d88bb79be20f21860e5750da42f8aac21d2997421d07ba37bd6bb12a28b55 SHA512 b03c497c3e0590c3d384cb856e3024f144b2bfac0d805d80e68deafa612c68237f12a2d657416d476a28059e80936c79f099fc42331464b417593895ea214387
+DIST zstd-1.4.7.tar.gz 1817193 BLAKE2B 8a307fa7efca8baa45c61eb0e46c5b6eedff1459a9493d81ad7033b9050ccf96e39cfc0f5b913ea20fb64d5efa26063b70e36e6cc47077b17106f3b5135fd999 SHA512 720941fc484e36e2f2bd74f120966fc598781a7abb945ed2f553d4cb035fa007117d00b72979b037817fbaff60b0d72f698fc16561ccbd46b16ae2888b044548
EBUILD zstd-1.4.4-r4.ebuild 1840 BLAKE2B 09aa07c4d2a068cb60e83d9796c7fe636d9e97c72e1efe731a2a2dc1f559874e9fa68dd06684135d18fe9f6dc67dcbddb69e34dd6ef0a510dc9355221acdf2a8 SHA512 7c55534e5feffae25bc9d1cfc9475404fa2387dbc44b788084df219d3cd26dfde0e47ccc015d89ab13bef1c5d261d2942d5745862221685fe5b80eb6613a73f3
EBUILD zstd-1.4.5.ebuild 1750 BLAKE2B 3718289304a862bc8a5cd78159409ea00847af3d11e8906a45061ad76ee3cda3cdbcc072da6f2a8e20e6594aed841533bedf1195d4d01b0e43530ddb176160bf SHA512 b745133038280fcd31de024704934bf72d619087ed7d48efedf64d47758ca4987c26b0b9bd0ffbaf31b0321dd08796ec8e2d6a70c1a5a9b136ccf33f08960fd0
+EBUILD zstd-1.4.7.ebuild 1757 BLAKE2B 0e35a47390e0040e064966609d324018db0683f911dee36b357d72cd52da8c250c55fa583a5d8468ce0eeb24589b78c85b049e1c7315303112d74f60c9addc7b SHA512 4186ed99f97c69a4434ffce087327fd32f7fb9455be786e82c83417bbfec018409dd1d3da8907c0112f2de6e5c466b5f46d93a1a5c51d6ac093d3c16cbcb0e67
MISC metadata.xml 335 BLAKE2B b5522206853292786178f23747d3f8145cd21a9e1d9d545aea8ff424910d9f9ab6d35c66c098edac809baa4e87239d36d4d987308481b265fe30460d54f415b9 SHA512 9269829ff4dcad03a604ea00c7f9a3bcd937195b711ab52f813d39b8ebb921585293cb3cb97fbea75921df9a673d49c8a8b39dc13b54f9b171c08d6ac0c31bc6
diff --git a/app-arch/zstd/zstd-1.4.7.ebuild b/app-arch/zstd/zstd-1.4.7.ebuild
new file mode 100644
index 000000000000..96469d5a7f84
--- /dev/null
+++ b/app-arch/zstd/zstd-1.4.7.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic multilib-minimal toolchain-funcs
+
+DESCRIPTION="zstd fast compression library"
+HOMEPAGE="https://facebook.github.io/zstd/"
+SRC_URI="https://github.com/facebook/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="|| ( BSD GPL-2 )"
+SLOT="0/1"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="lz4 static-libs +threads"
+
+RDEPEND="app-arch/xz-utils
+ lz4? ( app-arch/lz4 )"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-1.4.5-fix-uclibc-ng.patch" #741972
+)
+
+src_prepare() {
+ default
+ multilib_copy_sources
+
+ # Workaround #713940 / https://github.com/facebook/zstd/issues/2045
+ # where upstream build system does not add -pthread for Makefile-based
+ # build system.
+ use threads && append-flags $(test-flags-CCLD -pthread)
+}
+
+mymake() {
+ emake \
+ CC="$(tc-getCC)" \
+ CXX="$(tc-getCXX)" \
+ AR="$(tc-getAR)" \
+ PREFIX="${EPREFIX}/usr" \
+ LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
+ "${@}"
+}
+
+multilib_src_compile() {
+ local libzstd_targets=( libzstd{,.a}$(usex threads '-mt' '') )
+
+ mymake -C lib ${libzstd_targets[@]} libzstd.pc
+
+ if multilib_is_native_abi ; then
+ mymake HAVE_LZ4="$(usex lz4 1 0)" zstd
+
+ mymake -C contrib/pzstd
+ fi
+}
+
+multilib_src_install() {
+ mymake -C lib DESTDIR="${D}" install
+
+ if multilib_is_native_abi ; then
+ mymake -C programs DESTDIR="${D}" install
+
+ mymake -C contrib/pzstd DESTDIR="${D}" install
+ fi
+}
+
+multilib_src_install_all() {
+ einstalldocs
+
+ if ! use static-libs; then
+ find "${ED}" -name "*.a" -delete || die
+ fi
+}
diff --git a/app-backup/Manifest.gz b/app-backup/Manifest.gz
index 8da5e7422e4e..206afa4ee726 100644
Binary files a/app-backup/Manifest.gz and b/app-backup/Manifest.gz differ
diff --git a/app-backup/bareos/Manifest b/app-backup/bareos/Manifest
index 9202bec20c97..c51e6d433267 100644
--- a/app-backup/bareos/Manifest
+++ b/app-backup/bareos/Manifest
@@ -15,9 +15,9 @@ AUX bareos-sd.initd 481 BLAKE2B c14f2640be1685aaa0304dcfff2c272e37cb55cce92c7e28
AUX bareos-sd.service 243 BLAKE2B 198c1f93f63fc015989523bae1932637c9e25d9b02719dfaa8aa1900d0a408ff686bf25f3966645d5c09d6ec6c78f3326a70c5c53cae42f1dd5fdbd88a164541 SHA512 efd8ee4abfde37cf0c9c660ba714b22cf5bd7ce895af20deb80c1d2747b985e2a61ddfa76a557374d78feeec3c68f855976bd9af5f7d61c9588b8db41287211d
AUX tmpfiles.d-bareos.conf 35 BLAKE2B b670a9951d736618456644aacb28fbd2784c640efdc8aadd85e78d091d6d1655fc93e7dbf7df72c563f07baaf3802a4fa9d836a56766030b86b103a6b4715c4b SHA512 dbda57d059cb9e2e12e1e0c50cf8e58ab63b4ee0eff7ab6330d1dd5226483eb5be6b15b92dc996c979c4cec5586b97084f0687cb43e1f3b0edf742ff072975f4
DIST bareos-17.2.10.tar.gz 4190783 BLAKE2B d2deb9368438b5281ea36768b80cc15840135a77a19952daa895c4e30ee6ad231d9ecf28a6d860bd372eb08c1c34f9f827843745c87f465d3a59ab048aecc001 SHA512 3e145627a08927790deb8f75e5167e6e69710733eb1866a93adb34617c274c2b51145a6b1253388784f67bc4886fec7fbb423893a36d377bb96334a2dc7768f2
-DIST bareos-18.2.9.tar.gz 10554581 BLAKE2B 1277956a87794e707050c119a0e2d6a879f47bd67bde7fa230796b6f9a8c0b6ca1cddf35f12b6e53d0841f6cfbb86c586157b9705d36c515adaf1021bb23edc1 SHA512 f40c0bc696f31ee4eb443cc7a76a5810620a2fbb5fa421afc580e047879ce86b1288de92679695e00074a3bfd5a5ac2a4cb4fb8f8acbb39e615df19ad9cf7934
-DIST bareos-19.2.8.tar.gz 12604929 BLAKE2B c3af2d0a62b861a4ad5ca5c115a2039356009b7524505e1beb9004636fd09dd2b6ca784a5aae8c1cec3db518fb047cde429c469b8298a6bb473b097012358302 SHA512 60bbbbd949a63f978cf1ed7d0cfc22c22f117d8c2700eb47531e15b2d91fc700c522519f0b816cd1040283f09b4c81f36910c66c8b6f4bf1ff22180e979bdeb5
+DIST bareos-18.2.10.tar.gz 10558902 BLAKE2B ffeac4169131dfc28ec0c9cd9816962492a920b3309ba41a48eec37641fc35027e5f1d1f7d9bf3a7fc2ce2982899e991f4d846f42852e7fbf0643090cccf7096 SHA512 2c31029fdcabe26d36d5aab5ed91686bb0b497eef707ca8fbf82a72a62259651aae4a7516a8812141f6a8e0e2de97e16e5f008d11bb1e483f176f67397e5f69e
+DIST bareos-19.2.9.tar.gz 12886739 BLAKE2B 93b01a71e0824efc8a82c62107de03a0e6df23f600e005c9a98f5f0e541b13c4181dbb11b79fdd2a6f144e1cdbc25a95b1b310576bd3b79721f757c652881626 SHA512 b480a9a8dd459b8af3ab353bc5de2f8d1498d5754416972990add8cc6c8ea40462f6bde01ae92ca23f91c96d8ac2e6daf1dae085de80f021d52c5c87dc9a103e
EBUILD bareos-17.2.10.ebuild 10373 BLAKE2B dfb04bc664c47f10a7fcaa77d61f3432f14c53c585d0ea2b46e9a997995a7c0d181870402f920179c37928384a439aa92d98df27a2ebc4d75a03fe52c39a4350 SHA512 fdfae478a86f778f26667200a8b85b3f9453cdb240b8b02c7d0a01ce8c56f86ae7f16b3923db0a3a1ff4bccb5168191cf26f147316bd356bcbbe2b025bfe43a5
-EBUILD bareos-18.2.9.ebuild 11428 BLAKE2B 0266b5f4143431436bf8fcdeea238b6c080adb1180ee8fb14f42c2f1664dafa74cefee35f8c1dac544794f49ce6463ef8c7c5aa6b7604dee1ccff1c212fb5edd SHA512 ed8964a3a79470c3c8e4d88c79afd11dcfa6f5f5b83e0ad6feff9f17179dbe9151b95f6600e4e1fbf152ede80ea751c96768dfc2e719b4bfc8e088e69e65e0dc
-EBUILD bareos-19.2.8.ebuild 11052 BLAKE2B ad851f4d0bdd768ebb4bc5ab15591103f49c216a966bd028a5bbd4895c83f9da62bdec70ae17f9b056839cf1a58e936700f7cf95ca138b4f6b21eb64b5959e5c SHA512 f5e1e0a29224b0301379bc5307654bdf3e893aeef50a3fc35b9ddbd913ccf0c924ca5cc634ee472f145b68c6147aff360d2ba9c90148442eb98b4e08747593c0
+EBUILD bareos-18.2.10.ebuild 11428 BLAKE2B 0266b5f4143431436bf8fcdeea238b6c080adb1180ee8fb14f42c2f1664dafa74cefee35f8c1dac544794f49ce6463ef8c7c5aa6b7604dee1ccff1c212fb5edd SHA512 ed8964a3a79470c3c8e4d88c79afd11dcfa6f5f5b83e0ad6feff9f17179dbe9151b95f6600e4e1fbf152ede80ea751c96768dfc2e719b4bfc8e088e69e65e0dc
+EBUILD bareos-19.2.9.ebuild 11052 BLAKE2B ad851f4d0bdd768ebb4bc5ab15591103f49c216a966bd028a5bbd4895c83f9da62bdec70ae17f9b056839cf1a58e936700f7cf95ca138b4f6b21eb64b5959e5c SHA512 f5e1e0a29224b0301379bc5307654bdf3e893aeef50a3fc35b9ddbd913ccf0c924ca5cc634ee472f145b68c6147aff360d2ba9c90148442eb98b4e08747593c0
MISC metadata.xml 1489 BLAKE2B 3ede9b0a6d7a72e455da20ee3c84e5e37afa8c935d1b7bc9c7048d469315cc73160fe4c9014563812a9bab361cad51bd31cc29d73d9e085b0e3606011b84a36b SHA512 29b3c02f4333ee70177b6e0205304fe6f7b785c2ac9684352f9e6464c6dec266fa0213ae198f146c907df0f2c3af1f7e0da2a8cd67c04299cac6df44443a8872
diff --git a/app-backup/bareos/bareos-18.2.9.ebuild b/app-backup/bareos/bareos-18.2.10.ebuild
similarity index 100%
rename from app-backup/bareos/bareos-18.2.9.ebuild
rename to app-backup/bareos/bareos-18.2.10.ebuild
diff --git a/app-backup/bareos/bareos-19.2.8.ebuild b/app-backup/bareos/bareos-19.2.9.ebuild
similarity index 100%
rename from app-backup/bareos/bareos-19.2.8.ebuild
rename to app-backup/bareos/bareos-19.2.9.ebuild
diff --git a/app-benchmarks/Manifest.gz b/app-benchmarks/Manifest.gz
index ccebd59b580a..214befe3aac9 100644
Binary files a/app-benchmarks/Manifest.gz and b/app-benchmarks/Manifest.gz differ
diff --git a/app-benchmarks/geekbench/Manifest b/app-benchmarks/geekbench/Manifest
index 94f45bc1e27f..e89d1eee7f81 100644
--- a/app-benchmarks/geekbench/Manifest
+++ b/app-benchmarks/geekbench/Manifest
@@ -2,12 +2,10 @@ DIST Geekbench-2.4.2-LinuxARM.tar.gz 1921401 BLAKE2B 34d86178e35d586b79182b33203
DIST Geekbench-2.4.3-Linux.tar.gz 3337551 BLAKE2B cb660f3c08cc812cb23374032490a148449a36845fe63320788432493581ec6bd5958bf178d83d68b532ffbe5c7ee13e92b0bb00c0aca968bb2e499453f1b7a7 SHA512 d84e13eb5fd28fb232a5f93aa76f4855adcb9ccffbcd90dacc3e2b45231afd82e78d40c63f729391e5d00e95c14653e83757faca4e543c6306dd913c4e0edb87
DIST Geekbench-3.4.2-Linux.tar.gz 9986039 BLAKE2B 63d7e768d65bc033260a0d99da17df2e518750f19882e63dbc9bbe6ff0b52a8cddb35b9143e85c01838bf5d77a04599578fc0a57a3e6fd89e7aec8c8ffdd4f5b SHA512 a61a5d5481682baefdce64f6054c3373900e8cd585dcbfa2feabbf386032986b40b603619c552102401a83e0b748831d00af5b5b5278e88ef42dee176adf06e9
DIST Geekbench-4.4.1-Linux.tar.gz 71076124 BLAKE2B 14c2b80c971798e7d2bb256e76c7ab9c48e8c1c389e2f7547a436f706ac4f21c1e52e564cd584893071ee2f9f0a4747cd03ea72cc728ff8e4f369d5cc794d77a SHA512 fa687d33a7d7a2d09c544e3d17de93f41cfa77915c708cd1ef0743f84f7f83df9d3f8df2872a8f85ed2c4c872e3cd41932685ffeb19cdb0ea047ab5116713420
-DIST Geekbench-5.2.3-Linux.tar.gz 93047726 BLAKE2B 22cf414d89ef8854b8797ed7ad6b674ff6162daa003745d94c0481a71a2b7c1b7fbfd06d7a0e997b41da2107feb27a69af768196bf4114681c8bce39d2640112 SHA512 cacc1014b1522de281704e5210c44b81a51b24b63fb4c4be3c28e729261af2f12c5a52ad2a79b10bf597a1b24378cf03d7483d032d5e0c483069f8dc2695339e
DIST Geekbench-5.3.1-Linux.tar.gz 93054604 BLAKE2B bf8c2ecb0eeed5c74868499a1bf0cd248b5d8a92888c5df37f674d98e79af4ba636971fe1007edc368a463ce391d273b79ea33cbfa2ed8564a751962e928d2fc SHA512 14f8112b9e76dee726074863dc321b63956804b2666d42835cb863b9c61548168b9cb80f2e45a64695706c77afc91e792e874b4451b7b503f18b194804c16bdf
EBUILD geekbench-2.4.2.ebuild 1029 BLAKE2B 325e02bfccabae6f54f24fd7a5f601517eebaec7e51f6d9c4fb15adead8eaa255423fd69a2ed0788fa6e407c4cc7c228e23c2357f4d3699f2f1f725770eee79b SHA512 19d8807a97e5bfbea9155857740c2c3c6138c6366f426defde44976a224f89c48b7dd366bd1ec1079b49b45df0c0aaefaae6e5ca8d367a3034c2c26296385a53
EBUILD geekbench-2.4.3.ebuild 1089 BLAKE2B 010a26131e1de8b5eb4d7735f10603dc9bcef864ee688b9ba71e6d20c79424b9818b0a99a33d0ad48804872964b4ecce0e69c5a6bafaba865c03a057a6f76e97 SHA512 58ced2485af8de54dfc1a6736b0ddac21089f208c895665aa043efc381a9f04db359bcc0c2db360455b6a55b02d0bcc489c7a65c9414f43d9006b821ce3e6a02
EBUILD geekbench-3.4.2.ebuild 1089 BLAKE2B 8512afa8c9dc00969d53b4b743158ddc1f5abb94dcfca1312a55e5a75b4204abc67ad86d4902dd95fd1139934c7d2c3c83389434b5466cec490608b76870118a SHA512 ecb7293edca2f48939fe0736dc24c1b4ab71601ff434dfdb0b3e85fabeca6f6f64c343d49edc8ab4bd69a09a598bc7122e3b34be30a91de0aebd2521136a17b2
EBUILD geekbench-4.4.1.ebuild 1083 BLAKE2B 58703fd44f5a9276dcb69c0a976e25afad4e3ff39eb4657dc2650fc804242193618ae6187d526343db8534396e91954d5bbda75a1c6f50ef49471f2c33ea47fb SHA512 82f9440171735d13befa0aa0120d4e722c416d7633ee08a46e7f8089bc177d8b206f546d34265dfd54428cd4c9a17d589f4b322ebd87434183e05c0592c268c3
-EBUILD geekbench-5.2.3.ebuild 1030 BLAKE2B 942a330df0da458054979c0137d63a06ffd94aaa139a29c5cf291438cc64f7b1563df1d66ecf3e6d3779c860ea060f84efb66daf48871d22f51d798d43c12f10 SHA512 8885a9815bf0788ca460fe8f063c68fb215c0d8888649a49c05d0331182d98f05ae82cff35efec13366a2bb07a480d08fb578d17e01d6fc04b304db7c9d9ebbf
-EBUILD geekbench-5.3.1.ebuild 1031 BLAKE2B 9ed111d7e9a060d502d7056da19f99b7606f3b037cb0503c2f68e9f3e6907248f4ae123d740a90a2ce4977ca554dcd616cb67ecaf73c244c8857ea19d91587fa SHA512 d6a4212be1eae1094b32ed614b436c199f7a952d6b151321ed79237b3d4694691812ad0881c63984d17b1da9f6403a40f226ad7e65ea19d46db4265fc2491e5f
+EBUILD geekbench-5.3.1.ebuild 1030 BLAKE2B 942a330df0da458054979c0137d63a06ffd94aaa139a29c5cf291438cc64f7b1563df1d66ecf3e6d3779c860ea060f84efb66daf48871d22f51d798d43c12f10 SHA512 8885a9815bf0788ca460fe8f063c68fb215c0d8888649a49c05d0331182d98f05ae82cff35efec13366a2bb07a480d08fb578d17e01d6fc04b304db7c9d9ebbf
MISC metadata.xml 250 BLAKE2B d57634b040c498296655940e3ee580c8580075a4190e2600113cee5548ff44a2025568380f3d5d9f3ca0fcd1ea5d41c9871395ffbcf4bd32d8df6a494852a885 SHA512 c225bdf339347a1768b255d905f3831904cdc375f3d4e90e41c68645b8bcfe2dfdf8e6aa4c67063103f459808a387c8edd9b35b073b8be175f7a3bd490fe3dca
diff --git a/app-benchmarks/geekbench/geekbench-5.2.3.ebuild b/app-benchmarks/geekbench/geekbench-5.2.3.ebuild
deleted file mode 100644
index 7349eb155416..000000000000
--- a/app-benchmarks/geekbench/geekbench-5.2.3.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="A Cross-Platform Benchmark for Android, iOS, Linux, MacOS and Windows"
-HOMEPAGE="https://www.geekbench.com/"
-SRC_URI="https://cdn.geekbench.com/Geekbench-${PV}-Linux.tar.gz"
-
-KEYWORDS="-* amd64"
-LICENSE="geekbench"
-SLOT="5"
-
-RESTRICT="bindist mirror"
-
-S="${WORKDIR}/Geekbench-${PV}-Linux"
-
-QA_PREBUILT="
- opt/geekbench5/geekbench5
- opt/geekbench5/geekbench_x86_64
-"
-
-pkg_nofetch() {
- elog "Please download ${A} from ${HOMEPAGE}/download/linux"
- elog "and place it in your DISTDIR directory."
-}
-
-src_install() {
- exeinto /opt/geekbench5
- doexe geekbench5 geekbench_x86_64
-
- insinto /opt/geekbench5
- doins geekbench.plar
-
- dodir /opt/bin
- dosym ../geekbench5/geekbench5 /opt/bin/geekbench5
-}
-
-pkg_postinst() {
- elog "If you have purchased a commercial license, you can enter"
- elog "your email address and your license key with the following command:"
- elog "geekbench5 -r "
-}
diff --git a/app-benchmarks/geekbench/geekbench-5.3.1.ebuild b/app-benchmarks/geekbench/geekbench-5.3.1.ebuild
index 82d4a4a67fbf..7349eb155416 100644
--- a/app-benchmarks/geekbench/geekbench-5.3.1.ebuild
+++ b/app-benchmarks/geekbench/geekbench-5.3.1.ebuild
@@ -7,7 +7,7 @@ DESCRIPTION="A Cross-Platform Benchmark for Android, iOS, Linux, MacOS and Windo
HOMEPAGE="https://www.geekbench.com/"
SRC_URI="https://cdn.geekbench.com/Geekbench-${PV}-Linux.tar.gz"
-KEYWORDS="-* ~amd64"
+KEYWORDS="-* amd64"
LICENSE="geekbench"
SLOT="5"
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index ae59ca783adf..301da3178244 100644
Binary files a/app-crypt/Manifest.gz and b/app-crypt/Manifest.gz differ
diff --git a/app-crypt/dehydrated/Manifest b/app-crypt/dehydrated/Manifest
index 49ee4bc796d3..0c025e26f6a9 100644
--- a/app-crypt/dehydrated/Manifest
+++ b/app-crypt/dehydrated/Manifest
@@ -1,5 +1,8 @@
AUX 00_gentoo.sh 115 BLAKE2B f24fe757e45d9af58adb9417ef6dbd36c5db85bdc50af1403048a01625dac68e649fee2913ed2c9f199ec285666cb4b9100650b3b1b54929005260c2182adb49 SHA512 2092f8bffbc6b34fa806276194873fed42146d8c8a434bb68088e03ec9eb0a2e0c1862a9ade67d56a6bd553119cd00f8815353b71345e451039254708430e52b
AUX cron 71 BLAKE2B 88ec5a0d8618bc9e058d4cb3fedb0f74a530828bf63dd58a267386bd3ed2c3b647a642bfca14f6b05161d13266983bf5672787c7fc5c44e55d953ebebf346259 SHA512 0a8ac29abf2ce84b7b429ec969a3fcbfbab3ba0ed854237efa9bc86eb62859138b027f8879e016d4bedabc788ead0bb5d55ea5b629687c0c980cb63b225852b6
+AUX dehydrated-0.7.0-fix-CN-extraction-for-older-openssl-versions.patch 1179 BLAKE2B d4925675e868e24e2bd38aa0444e9b934e351fb706be5b66e71315d213186719260c20ebb976c160b1458eed1f14416ed6d27dad79a6b39b08cca50285802cb9 SHA512 2f18fa75ea6674b9b8746645395317046012f01032e35736580d87ac9a410ec4641e81c5f307d31bb238a53886b30820cde778bf83e3d04083ae1b6323777307
DIST dehydrated-0.6.5.tar.gz 82274 BLAKE2B 3c8138bafdaab9c60db1463860d6c16dd0fb8e686f368e55a4fa010d004f350d03cdd161dde38361411506959f896a25ef802b76432c0fcd89a69d75fe1be9c9 SHA512 da8ff3ecb7ddeb25356469fa272aef4e7c3705049caf88d09656dbc4baf29e0efa135e6f154c78cec82da17a27a78f2145ee3b7bd71521a080e10550d09b8a53
+DIST dehydrated-0.7.0.tar.gz 86574 BLAKE2B 35a3b0b7592126ca65003a6c9eb8934a76584710d028057e5add7f77bb2fa3799e89a060306da3b98a62d291229a2a78f23e0f95f19e033796aee31e97b94488 SHA512 47740d2d31ca73482a4fc5ed0dfce986af907dd5449cb3a5230bf9683845686c8122fc32e6219a4439574ef11d6fb104ee09591c5ff667927a2c9c13ba005511
EBUILD dehydrated-0.6.5.ebuild 1670 BLAKE2B a56a2e470747449996491568e960a663b9b45d58d22e0ae242ecb91d4b3b03024c4b7ba74b632cffc945094a55b2f03c25ed2b281f973e27431c4ca343b942be SHA512 619518a0d6224ac0cac0d08e796ab34d456b500f39afe54fc226c191d26bcdf2f7acaa11e50f96b798ff8e6d0930193872613b04b8ffbaf9b83370e9f1342bac
+EBUILD dehydrated-0.7.0.ebuild 1259 BLAKE2B a489aee59c6fc77010fff133552e86d178dbac6ea18014d244620e3421acf8fcb324b0071db4a1242b443f639d71553a9e79b2173023e1cdfa2b83bae6df7f94 SHA512 f2d1089bd25f484f96dd423fe4cddd5fe4e203d067f43440818641ebf496a4cc87da70e0708eb6ff2cd17b53d43f416a8bc1fc0e890bd0481d89471c5839daf6
MISC metadata.xml 531 BLAKE2B dcd597fde3bafe2970275a99609546b1a2ef764729cd410a62389a29f8ce95e269f2155970503e041c937a28026c3d70763c86f492c4a8a3478026125eb5eecc SHA512 fe42f3b7b8ca0d2f18d389348599f468eaa80928a05fa7151bae23f5dd73d260fca6ebd3a701eed450b639438e44ca038aef420732e92ab9ddc672c0022bfbdd
diff --git a/app-crypt/dehydrated/dehydrated-0.7.0.ebuild b/app-crypt/dehydrated/dehydrated-0.7.0.ebuild
new file mode 100644
index 000000000000..a0b9dd29497c
--- /dev/null
+++ b/app-crypt/dehydrated/dehydrated-0.7.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+DESCRIPTION="a client for signing certificates with an ACME-server"
+HOMEPAGE="https://github.com/lukas2511/dehydrated"
+SRC_URI="https://github.com/lukas2511/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="+cron"
+
+RDEPEND="acct-group/dehydrated
+ acct-user/dehydrated
+ app-shells/bash
+ net-misc/curl
+ cron? ( virtual/cron )"
+
+PATCHES=( "${FILESDIR}"/${P}-fix-CN-extraction-for-older-openssl-versions.patch )
+
+src_configure() {
+ default
+ sed -i 's,^#CONFIG_D=.*,CONFIG_D="/etc/dehydrated/config.d",' docs/examples/config || die "could not set config (CONFIG_D)"
+}
+
+src_install() {
+ dobin ${PN}
+ insinto /etc/${PN}
+ doins docs/examples/{config,domains.txt,hook.sh}
+ fperms u+x /etc/${PN}/hook.sh
+ dodoc docs/*.md
+
+ insinto /etc/${PN}/config.d
+ doins "${FILESDIR}"/00_gentoo.sh
+
+ if use cron ; then
+ insinto /etc/cron.d
+ newins "${FILESDIR}"/cron ${PN}
+ fi
+}
+
+pkg_postinst() {
+ if [[ -z "${REPLACING_VERSIONS}" ]] ; then
+ einfo "See /etc/dehydrated/config for configuration."
+
+ use cron && einfo "After finishing setup you should enable the cronjob in /etc/cron.d/dehydrated."
+ fi
+}
diff --git a/app-crypt/dehydrated/files/dehydrated-0.7.0-fix-CN-extraction-for-older-openssl-versions.patch b/app-crypt/dehydrated/files/dehydrated-0.7.0-fix-CN-extraction-for-older-openssl-versions.patch
new file mode 100644
index 000000000000..91188fbe3587
--- /dev/null
+++ b/app-crypt/dehydrated/files/dehydrated-0.7.0-fix-CN-extraction-for-older-openssl-versions.patch
@@ -0,0 +1,30 @@
+From 29b67962ac07d5d2b24f69c863a9ef31e8ac53ee Mon Sep 17 00:00:00 2001
+From: Lukas Schauer
+Date: Fri, 11 Dec 2020 18:02:51 +0100
+Subject: [PATCH] fix CN extraction for older openssl versions
+
+---
+ dehydrated | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/dehydrated b/dehydrated
+index 622165e..37e0ab6 100755
+--- a/dehydrated
++++ b/dehydrated
+@@ -926,14 +926,14 @@ extract_altnames() {
+ printf "%s" "${altnames}" | tr '\n' ' '
+ else
+ # No SANs, extract CN
+- altnames="$( <<<"${reqtext}" grep '^[[:space:]]*Subject:' | _sed -e 's/.* CN ?= ?([^ /,]*).*/\1/' )"
++ altnames="$( <<<"${reqtext}" grep '^[[:space:]]*Subject:' | _sed -e 's/.*[ /]CN ?= ?([^ /,]*).*/\1/' )"
+ printf "%s" "${altnames}"
+ fi
+ }
+
+ # Get last issuer CN in certificate chain
+ get_last_cn() {
+- <<<"${1}" _sed 'H;/-----BEGIN CERTIFICATE-----/h;$!d;x' | "${OPENSSL}" x509 -noout -issuer | head -n1 | _sed -e 's/.* CN ?= ?([^/,]*).*/\1/'
++ <<<"${1}" _sed 'H;/-----BEGIN CERTIFICATE-----/h;$!d;x' | "${OPENSSL}" x509 -noout -issuer | head -n1 | _sed -e 's/.*[ /]CN ?= ?([^/,]*).*/\1/'
+ }
+
+ # Create certificate for domain(s) and outputs it FD 3
diff --git a/app-crypt/libmd/Manifest b/app-crypt/libmd/Manifest
index 1a4c935c4222..fa3d961a1557 100644
--- a/app-crypt/libmd/Manifest
+++ b/app-crypt/libmd/Manifest
@@ -2,6 +2,6 @@ DIST libmd-1.0.0.tar.xz 254852 BLAKE2B af0d3c645a18262965e708d678cb30c7ed168af80
DIST libmd-1.0.1.tar.xz 257372 BLAKE2B e954ab6b1247952abcf6964d8d714c2a47a644e206a455db547a0159a97ebbc323cf1258a24c744cea3106f267f1a319a689fe545b672580f4e134d96cc7cb3d SHA512 6f343101f9ad8f927d862e6bae948d35ba596ecfd375c255fefb86efc621cf6e9de3597770ad66e0a48e8f4ea018df78debb571ea6746a7457d8900fec87069b
EBUILD libmd-1.0.0-r1.ebuild 614 BLAKE2B 9d33178bd6faa47c60573c9f1b067cb4243074b42b5d7bc644f6cbfd47fd492081b0a7bcb169db21f0fab0edf3d3f8caf5e500a634ac0292a479f9ee9d766730 SHA512 aa0fdde5ba65459296370927e0c179f55a8aa9abb67ee3ee03eb803dd7760b8c695b826f5a876d89e460c0157bf0cf4f8d2fd5b81ed4ca89cce2d97b1c91aa99
EBUILD libmd-1.0.0.ebuild 386 BLAKE2B 03798470d2403edab2cb52c6dd7f36abf86ae1590642b7a46c5166adac60e272fae28f72f0384a2bf80763f2d814211b0aa4d562a43829a9236b1a47f4637107 SHA512 6a7cdfc8a8a1a271e328d03f60634b94e3901684af86659996b082a3ecdc858c7b8345d66edfcd0667863bb964f61d116ceb5e9850599409d362906692762b74
-EBUILD libmd-1.0.1.ebuild 658 BLAKE2B 8ebd5931106e0ebc15c965a0b65433856ce4cccc1f9d00598ae7251e45940728423f48a07c264e105ea94b4e755d940ce1a94fe30c126a384f313e726ea79c24 SHA512 01b56857bc7118e94ec6bf321420b6eff57563b589b4f193601808009173251bc44d4958ea1db2523eca06c0d61c5f5d1e3a2655c4474072413275a6b9236adb
+EBUILD libmd-1.0.1.ebuild 657 BLAKE2B 5dc57ed2d5302413f0d6fa0e6c9f39c623ae7509ee5c9b061f3a76b5777b9275a96a29c393c50b94faf452b26286de31a17e3194eb33b8068fb2b98f8c47b3be SHA512 75e35cb72a8a1e53f6543d71bc24fcf72460152955b2001530740136ce0f578df5b449ac18e7f7b7d0093da516c0676dcba0b489375dd2413bb04b6bfc9ca402
EBUILD libmd-99999.ebuild 568 BLAKE2B f3e942f902160f0fbf840e0c082a3dd07f57c2fe1a9d785a5d7b26c429f2baf6be48e4420b65d3c6b9b15684d6043576e989b15d188a167b016f8d404669d59f SHA512 d8479e0df2f68c33deece78037021a2dd26d75ed623b3fc486837b6bb53bd33fb49d4401e9dc5f938f161a296adeb2e7da8ca6294aaed56b8f9e8adf2fb2f759
MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-crypt/libmd/libmd-1.0.1.ebuild b/app-crypt/libmd/libmd-1.0.1.ebuild
index 0081b4d97e23..98cc38a54e2f 100644
--- a/app-crypt/libmd/libmd-1.0.1.ebuild
+++ b/app-crypt/libmd/libmd-1.0.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://archive.hadrons.org/software/libmd/${P}.tar.xz"
LICENSE="|| ( BSD BSD-2 ISC BEER-WARE public-domain )"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
IUSE="static-libs"
src_configure() {
diff --git a/app-crypt/nwipe/Manifest b/app-crypt/nwipe/Manifest
index 9d987c985593..36ec16ffd6b9 100644
--- a/app-crypt/nwipe/Manifest
+++ b/app-crypt/nwipe/Manifest
@@ -1,3 +1,3 @@
-DIST nwipe-0.28.tar.gz 849147 BLAKE2B de81c526edc9ce106d48297796e1d42689bafae20be8ac20f6a8eb6474c8202dffdfbad2f91c8282bf5f747921b90402a3a84e411d8a8b2adb0c2e785bfaf315 SHA512 2b6cb6dbcbb51960f726d8ec6c1629fb4675af4b3f7b39ee1fc91244fc9391f4ea23bae5c8794cc92a675ce202be60df900658b6d9a95b5bb399c0e6f009ce69
-EBUILD nwipe-0.28.ebuild 555 BLAKE2B 67a7107da39bb4a079ec50dcc278056bd0c9f39d9e6ea6a5aee585603137ecb593652595547dd11264459f069fd5336f13c067df6d085af2ce6b9cc2b5bca7f8 SHA512 1d70f17660ece4b2e85cf73a2a94eeb431f40922dd2049d49ae1430d7ad4b4f5d532aa454c7085f61f3eac13f72a510e52779c9f10d64751952f974eb43df933
+DIST nwipe-0.30.tar.gz 6358657 BLAKE2B 69fdcfaacb32aacc27b375a793bff5b7014979c8097ef3b48c2c307e4bc3a828de7c01b6a58e46346dc58a1b4beee4a408074706175098c364dff7ecf67771d3 SHA512 b6d86d78dafbe6c5e27b00b183673dc77dedcf849ecd169b616c90bcda5180bc10fe072580c13f027abaa5fd840e73034ac75af75fe1cf6eb0756273bf46975f
+EBUILD nwipe-0.30.ebuild 542 BLAKE2B 58bf4c9fb2f0280e34e8c626377f9ac49b06a94565f2bd7f75c4ed2af75040e09f1db8ce8ce894ebf0d07e4852e92fb5c89740410c37fd49f17b806e612ee0a8 SHA512 a625f460573dacd84cf11b97d87294b63753063383333183b977136d4001d4dee6f61778e337068488038e4725706aaff14070ff5882395dc214038c4d6a8f5e
MISC metadata.xml 458 BLAKE2B a42de1e61e183e78050015563f293f8cae433af086d3afde066624dd56b024a35b590590dc728cc181e5ab0912ab94e48af4a3db9117498084423e7134a9743b SHA512 63e500333fff449b1e2e91fed9492ee3c5b33aea0116009cceca1b50d744b87cbe7a86c01a5cf19979425f56ccf746e487b8ec03c55f988f377b326c95a1dfb8
diff --git a/app-crypt/nwipe/nwipe-0.28.ebuild b/app-crypt/nwipe/nwipe-0.30.ebuild
similarity index 88%
rename from app-crypt/nwipe/nwipe-0.28.ebuild
rename to app-crypt/nwipe/nwipe-0.30.ebuild
index 3c580a709883..ab47d6428c80 100644
--- a/app-crypt/nwipe/nwipe-0.28.ebuild
+++ b/app-crypt/nwipe/nwipe-0.30.ebuild
@@ -13,8 +13,9 @@ LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-RDEPEND=">=sys-block/parted-2.3
- >=sys-libs/ncurses-5.7-r7:="
+RDEPEND="
+ sys-block/parted
+ sys-libs/ncurses:="
DEPEND="${RDEPEND}"
BDEPEND="virtual/pkgconfig"
diff --git a/app-crypt/p11-kit/Manifest b/app-crypt/p11-kit/Manifest
index 4ceaead5a75e..70c0782f4cda 100644
--- a/app-crypt/p11-kit/Manifest
+++ b/app-crypt/p11-kit/Manifest
@@ -1,7 +1,3 @@
-DIST p11-kit-0.23.19.tar.xz 822652 BLAKE2B c1750e2d0b8ebdfcf70695259401a029b2d5739d8222c37f128f94f8a4313321956e120dcba5c7cb882d16e1a6b12398f9dfa88ef601e826f0dfec5acbf438c8 SHA512 1a7feb2c14381f2ca87386b6a81f46cfb27ccce70ad87a2fc86726e2827b49971958e40c4fc54df01df7570d82058afe82d21c5b3c59fb8310aa641d3b370da2
-DIST p11-kit-0.23.20.tar.xz 822588 BLAKE2B adda58acc121d38d3520d20daf8f59c3c46f81afe807d9277fae70e836d194d08cfea0405d2186d548ea91be56eee63d576a318c330fa844a0cf1889960db384 SHA512 1eb88773fdd49dd48c7e089744e9dbbf6c1033a4863f3bfe75a68d842804baa3c373cb1b28ee625dd69a6e16c89df4ac755e0928495dccf38c007c530f6cfa57
-DIST p11-kit-0.23.21.tar.xz 827064 BLAKE2B 31a19b80c1ba41db0115bd3ea8381f6c0ad66b173b5d07f2b8f9e3222c83ea5703ec12539b13448e4b1b929b912ce3af88536b30a73ddf7979470282954b0efd SHA512 4c796ca2c72a650f105a7a70aa62e55edb12e1c151e91ef92bfeee6c5c68982b36023400b42c4efcb1d351b7848e8618c26607cdb0f77b48ae40e2ecfd713e3e
-EBUILD p11-kit-0.23.19-r1.ebuild 2018 BLAKE2B 890a27c5ef1e0b4d6ff362c132cc282593fd29359d4361a342e216c0a4064c26aa84df9ff6b3d2ff9ace5c9e2ae07b335862d3dd5873aa4648830deba5ea468f SHA512 8f5e4bdfd46f723625b38cba86e519eb39a14fec08be6f5becce7105de0357c040cf624f76ee3d18067e4953c8a19c3769a6b5041889b2ac7a1e4e3b97db15f1
-EBUILD p11-kit-0.23.20-r1.ebuild 2027 BLAKE2B 9845b1a32e30709b88bde8ddef685bd6a041995d7d1ae7427f0dfb2d80f89561de50f7cb9d4fa959e07e0615a0e27f894b3a2b6666901b14453058e238c8c338 SHA512 2d2a340c26a76783faf0c5f41ff96802989efa3c553dab209756d15ed5926b115d1e7501430ef19e42654f876c6ca9e376f9ce4633b8e0520bad877dac6587c5
-EBUILD p11-kit-0.23.21.ebuild 2027 BLAKE2B 9845b1a32e30709b88bde8ddef685bd6a041995d7d1ae7427f0dfb2d80f89561de50f7cb9d4fa959e07e0615a0e27f894b3a2b6666901b14453058e238c8c338 SHA512 2d2a340c26a76783faf0c5f41ff96802989efa3c553dab209756d15ed5926b115d1e7501430ef19e42654f876c6ca9e376f9ce4633b8e0520bad877dac6587c5
+DIST p11-kit-0.23.22.tar.xz 830016 BLAKE2B 4e1edfd9e2441d237c07a16c003aee5ffde38f1cf545c26e435645429f2cfa4fe7ca61cdc3c3940390aa040ba991f2ee3995b14cc31bb886d5eeffa8ed5e1721 SHA512 098819e6ca4ad9cc2a0bc2e478aea67354d051a4f03e6c7d75d13d2469b6dc7654f26b15530052f6ed51acb35531c2539e0f971b31e29e6673e857c903afb080
+EBUILD p11-kit-0.23.22.ebuild 2018 BLAKE2B 890a27c5ef1e0b4d6ff362c132cc282593fd29359d4361a342e216c0a4064c26aa84df9ff6b3d2ff9ace5c9e2ae07b335862d3dd5873aa4648830deba5ea468f SHA512 8f5e4bdfd46f723625b38cba86e519eb39a14fec08be6f5becce7105de0357c040cf624f76ee3d18067e4953c8a19c3769a6b5041889b2ac7a1e4e3b97db15f1
MISC metadata.xml 461 BLAKE2B 4e2b3a011845a7f8c6e4afc0f176615b5badbb64f73a6f83854c4b40babc1b2cafafd0dc26ea65a16d2b96a314600218271e63aeb58f5fb1a3dec3fbffd4973c SHA512 947edc1be15e91e32b12b75b95ba95ea3db9528c2e6bbaf3006f9d9c842bf63256614b1da3129b5a8dd9f2c57771523a79d02febdc17ce9214cbe91276eee82a
diff --git a/app-crypt/p11-kit/p11-kit-0.23.20-r1.ebuild b/app-crypt/p11-kit/p11-kit-0.23.20-r1.ebuild
deleted file mode 100644
index 955332bd5e51..000000000000
--- a/app-crypt/p11-kit/p11-kit-0.23.20-r1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib-minimal
-
-DESCRIPTION="Provides a standard configuration setup for installing PKCS#11"
-HOMEPAGE="https://p11-glue.github.io/p11-glue/p11-kit.html"
-SRC_URI="https://github.com/p11-glue/p11-kit/releases/download/${PV}/${P}.tar.xz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="+asn1 debug +libffi systemd +trust"
-REQUIRED_USE="trust? ( asn1 )"
-
-RDEPEND="asn1? ( >=dev-libs/libtasn1-3.4:=[${MULTILIB_USEDEP}] )
- libffi? ( dev-libs/libffi:=[${MULTILIB_USEDEP}] )
- systemd? ( sys-apps/systemd:= )
- trust? ( app-misc/ca-certificates )"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-pkg_setup() {
- # disable unsafe tests, bug#502088
- export FAKED_MODE=1
-}
-
-src_prepare() {
- if [[ ${CHOST} == *-solaris2.* && ${CHOST##*-solaris2.} -lt 11 ]] ; then
- # Solaris 10 and before doesn't know about XPG7 (XOPEN_SOURCE=700)
- # drop to XPG6 to make feature_tests.h happy
- sed -i -e '/define _XOPEN_SOURCE/s/700/600/' common/compat.c || die
- # paths.h isn't available, oddly enough also not used albeit included
- sed -i -e '/#include /d' trust/test-trust.c || die
- # we don't have SUN_LEN here
- sed -i -e 's/SUN_LEN \(([^)]\+)\)/strlen (\1->sun_path)/' \
- p11-kit/server.c || die
- fi
- default
-}
-
-multilib_src_configure() {
- ECONF_SOURCE="${S}" econf \
- $(use_enable trust trust-module) \
- $(use_with trust trust-paths ${EPREFIX}/etc/ssl/certs/ca-certificates.crt) \
- $(use_enable debug) \
- $(use_with libffi) \
- $(use_with asn1 libtasn1) \
- $(multilib_native_use_with systemd)
-
- if multilib_is_native_abi; then
- # re-use provided documentation
- ln -s "${S}"/doc/manual/html doc/manual/html || die
- fi
-}
-
-multilib_src_install_all() {
- einstalldocs
- find "${D}" -name '*.la' -delete || die
-}
diff --git a/app-crypt/p11-kit/p11-kit-0.23.21.ebuild b/app-crypt/p11-kit/p11-kit-0.23.21.ebuild
deleted file mode 100644
index 955332bd5e51..000000000000
--- a/app-crypt/p11-kit/p11-kit-0.23.21.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib-minimal
-
-DESCRIPTION="Provides a standard configuration setup for installing PKCS#11"
-HOMEPAGE="https://p11-glue.github.io/p11-glue/p11-kit.html"
-SRC_URI="https://github.com/p11-glue/p11-kit/releases/download/${PV}/${P}.tar.xz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="+asn1 debug +libffi systemd +trust"
-REQUIRED_USE="trust? ( asn1 )"
-
-RDEPEND="asn1? ( >=dev-libs/libtasn1-3.4:=[${MULTILIB_USEDEP}] )
- libffi? ( dev-libs/libffi:=[${MULTILIB_USEDEP}] )
- systemd? ( sys-apps/systemd:= )
- trust? ( app-misc/ca-certificates )"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-pkg_setup() {
- # disable unsafe tests, bug#502088
- export FAKED_MODE=1
-}
-
-src_prepare() {
- if [[ ${CHOST} == *-solaris2.* && ${CHOST##*-solaris2.} -lt 11 ]] ; then
- # Solaris 10 and before doesn't know about XPG7 (XOPEN_SOURCE=700)
- # drop to XPG6 to make feature_tests.h happy
- sed -i -e '/define _XOPEN_SOURCE/s/700/600/' common/compat.c || die
- # paths.h isn't available, oddly enough also not used albeit included
- sed -i -e '/#include /d' trust/test-trust.c || die
- # we don't have SUN_LEN here
- sed -i -e 's/SUN_LEN \(([^)]\+)\)/strlen (\1->sun_path)/' \
- p11-kit/server.c || die
- fi
- default
-}
-
-multilib_src_configure() {
- ECONF_SOURCE="${S}" econf \
- $(use_enable trust trust-module) \
- $(use_with trust trust-paths ${EPREFIX}/etc/ssl/certs/ca-certificates.crt) \
- $(use_enable debug) \
- $(use_with libffi) \
- $(use_with asn1 libtasn1) \
- $(multilib_native_use_with systemd)
-
- if multilib_is_native_abi; then
- # re-use provided documentation
- ln -s "${S}"/doc/manual/html doc/manual/html || die
- fi
-}
-
-multilib_src_install_all() {
- einstalldocs
- find "${D}" -name '*.la' -delete || die
-}
diff --git a/app-crypt/p11-kit/p11-kit-0.23.19-r1.ebuild b/app-crypt/p11-kit/p11-kit-0.23.22.ebuild
similarity index 100%
rename from app-crypt/p11-kit/p11-kit-0.23.19-r1.ebuild
rename to app-crypt/p11-kit/p11-kit-0.23.22.ebuild
diff --git a/app-crypt/ssss/Manifest b/app-crypt/ssss/Manifest
index f5f6d21c3ede..ef883e6cf30a 100644
--- a/app-crypt/ssss/Manifest
+++ b/app-crypt/ssss/Manifest
@@ -1,5 +1,7 @@
DIST ssss-0.5.6.tar.gz 20128 BLAKE2B d42fff5878e2ebcc62cd86b86f0f8a3e522c089cbb5e8fb2585cf375ff133da7d9ccf00e62cc6888e00abe5d64f87ac19ddbb3f6e6a0d86913e6a6aa5a8a1d4c SHA512 964af01610a7a269d19ae1fa1712ef12ca1afab02636ba83dd84ec5aeb185210a1247d932ee39d2869aa76e54ffb051d802800d295d17355d6fe2a8010edd509
+DIST ssss-0.5.7.tar.gz 21774 BLAKE2B 923f9e0c46e82261dc4f293635aa318c986cee221a93e9df3d232e4b923a7828f0301c8729a5beb72b66e1646e5a0694cfa9546ea26b0e06fa16a8a0c7487ef6 SHA512 aca85b7a63e6d009fffe5540b0c8e3190c364aa2070e8d8487fd42d7ac76143e404b226b28f3630022d102679371673cc7c08b8c5d3bcf63e3676b7293d2ba00
DIST ssss-0.5.tar.gz 17435 BLAKE2B 76aae463ce11341f8b0336526f7d19c9921025cabc05bc9e00005b0bdeb676ed5e069226962232f277de2fecb1cd71bafbd4b2fa0c03ef4faf0f66daa24599d1 SHA512 be8df1666ac61d4097b5fd54f2cee3640db8f85ec21411f1b208a35b671c5699bc692079525d8d313d1cf2500da31bfb03771829a9fdccc0bb6d806749526ec9
EBUILD ssss-0.5-r1.ebuild 774 BLAKE2B 08fa8b0d2c88ba22cb3a74bd728a32c2e54ff9cd92b88c8345e407b035bc2916f547ed18ab90d76efb401e6cd7aa015f0262bdb9b9629039091aef5c19725dd6 SHA512 364456d49bf4625c632e42dfee4013b84cb4dee6df747b113dcc11362c4bbb9cbbc2c5b460411986c751c4fd0a4c34a288464b383601bc2eb6c331ad295224f8
EBUILD ssss-0.5.6.ebuild 809 BLAKE2B 5025aae75562b85423ff9996c9a83da107ea53bd0e0e0485ee86a35094c64705171ee82471a99ef89ddbe896f4ad36f908ac72c78ea01f90b812462ecd2112aa SHA512 e686cfc6579e2cafa17bf03d8d03a11cae0306f16dff410792cdd8bc4dcbae1ddb6a4c8693bb1021c5d8deaa2abe45fb2ff1cc6f454cc5e920af97eeca2730b4
+EBUILD ssss-0.5.7.ebuild 810 BLAKE2B 353efe544e4d85bf4cb3d7c400fbb9c9d351efd30aa50a276838db169add2c5c2ff01dbe742722c96dd65cef569314111305a65874422b803efda80f55274b29 SHA512 f1133c11c1c54777ab0ece70c2dabcec82cd599ba95c063648255aad6aeb2d55d6876bbace45d3aa754b08b4c1a8795bba443538aeaea7c56e86724422765efe
MISC metadata.xml 571 BLAKE2B 8e5b2a9efdbac1e9cf15c2e7c60e6c6a9c41300a6ec65df5751043ac85536ba31ace97f033aac89e47f9792b8003c134e1b8a8c3af6513e3406e38027d413e42 SHA512 daebb2e758087ee3cb49c5c89c0bafe3bdf57e2f7c3b64e1053e465b765ad8e95594065a7e236cf8072a406f7d92702a84807393820fcaec26ff29bee73ceff6
diff --git a/app-crypt/ssss/ssss-0.5.7.ebuild b/app-crypt/ssss/ssss-0.5.7.ebuild
new file mode 100644
index 000000000000..724f2c160f99
--- /dev/null
+++ b/app-crypt/ssss/ssss-0.5.7.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="Shamir's Secret Sharing Scheme"
+HOMEPAGE="https://github.com/MrJoy/ssss"
+SRC_URI="https://github.com/MrJoy/${PN}/archive/releases/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-releases-v${PV}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-libs/gmp:0="
+DEPEND="${RDEPEND}"
+BDEPEND="app-doc/xmltoman"
+
+HTML_DOCS=( "doc.html" "ssss.1.html" )
+
+src_prepare() {
+ default
+
+ tc-export CC
+
+ # Respect users [CL]FLAGS and don't strip, as portage does this part
+ sed -e 's/-O2/$(CFLAGS) -lgmp $(LDFLAGS)/g' -e '/strip/d' -i Makefile || die
+}
+
+src_install() {
+ dobin ssss-split
+ dosym ssss-split /usr/bin/ssss-combine
+
+ doman ssss.1
+
+ einstalldocs
+}
diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index bf64d9b16403..1a0204796e41 100644
Binary files a/app-editors/Manifest.gz and b/app-editors/Manifest.gz differ
diff --git a/app-editors/nano/Manifest b/app-editors/nano/Manifest
index d7356c06469d..c8511f42fa75 100644
--- a/app-editors/nano/Manifest
+++ b/app-editors/nano/Manifest
@@ -3,8 +3,8 @@ AUX nano-4.9.3-minimal_build_fix.patch 1357 BLAKE2B d204314118779f7e433cea11ea07
DIST nano-4.9.3.tar.gz 2999198 BLAKE2B a96f707936934a965a9a41dfe13ac1ebbe1a5e38db714df6d219b2c6539f24924d4c4f0451508718f66259854806032b84dc89850a7fd55d157f28ae23531d0e SHA512 233e6ed103441bd2c85ed21c50547f85dc0838cc750a5e9b16ecfb393e3b7b978e971af4a4164062c7c267c98895ecb696c02cbd2e4c2eb1ceee657fd026c30a
DIST nano-5.3.tar.gz 2874796 BLAKE2B d266018f2508153369e10c6f9cf4c53eaeafdf0efe88da6de19efd76ef13fedebe4b9339ae594b751a12cf18a8c4dcd57466ceedfabf61406f63b69c75fceff1 SHA512 019b58779f5a7d9a9472b415715876d0daac313a02b794900339469ee0b5a27ce202e397c00ad6396b7e26a7c303e52c28d981fff85cf774c79a5a8a9835836d
DIST nano-5.4.tar.gz 2898561 BLAKE2B 7e5e48f1e85253a7a4a9be2be2b7663e8798655d9e9e2505df1d1752512058734062af953652c1d11dca464ca06d7c90faf2e54cdb65ba01d0f76cfca0282c18 SHA512 711b1a890649e3a2b62c778e6d54813ed98a8261c47a92aa6d7baa690f86d8563813a764f5dffcc6c259fe9b05f8fe76cf48a3178b09666ba55ee035c91cbe28
-EBUILD nano-4.9.3.ebuild 2334 BLAKE2B a46bb4bc1a3cb5d62c0f7db03c7ad1785d168daae307275b198e7f4527d98d84c7b7557ee1cfe2f70e4aa5e60f8cda4abb5fd8261decdcd4f7ff11f54f25e686 SHA512 a8dab8ae77a332ca5576b907e8a73fd288f3da0f8fdd4c2d52ab4e747c911c30425b81db7958a6b3a256ce4b1a2d6a480a728991e67b66d6d09434f36aaad1ef
-EBUILD nano-5.3-r1.ebuild 2448 BLAKE2B dd73412350ac462c24a68e3a980eeac058b1825fa24da42af21f35cb0f2dab33f7d536109628feeb12b6cca08670469260c5d2e7d0b6188dbfa6c20d46bcc53d SHA512 ecedf5bd813403b285c9994f86f5bc49cdae932d6ef1d27e96e5fd329c4f312c373c1f6344fd834401cc768e6d8fdf864787ca8653d5bbec589563d0d4ebd40a
-EBUILD nano-5.4.ebuild 2457 BLAKE2B d39aeabb27f649c9ee0c9b968b4dc0cafcd67c8acec27d71caeb151b70cb299a1ef9a152a5aa942676ae1af85837040ab7fcf6106fa54f54e381745efa821fa7 SHA512 38dfc0422a8d2821de4f5100edb23a3e797b75858a7cfcf29f1ef75d29f94730dc810569561e8c97efed3db3320b5714df77577c2d59a35cbc46598a062f07b4
-EBUILD nano-9999.ebuild 2457 BLAKE2B d39aeabb27f649c9ee0c9b968b4dc0cafcd67c8acec27d71caeb151b70cb299a1ef9a152a5aa942676ae1af85837040ab7fcf6106fa54f54e381745efa821fa7 SHA512 38dfc0422a8d2821de4f5100edb23a3e797b75858a7cfcf29f1ef75d29f94730dc810569561e8c97efed3db3320b5714df77577c2d59a35cbc46598a062f07b4
+EBUILD nano-4.9.3.ebuild 2325 BLAKE2B d8f51722079de13ec0a7e005a16c1212c049983e6f587e2a8430ae3e1b930882b70fced4f71683832b0dc35c748b732b0d93803c5930b6e09996b7ee6c848778 SHA512 d694d05908e499e60220878185d4124cc8a7ee96acd73a0104d022f5197e8a819cc9ad6bdf35ae34506128d6f36d91be6df73a3fbf43b6897467def4d31727ab
+EBUILD nano-5.3-r1.ebuild 2439 BLAKE2B cd37b00bb63a0e8845cc580e16df795113c5bde9e1fbcb35c9a0406d3b3810d4012a2d6a0d04c646822abc50c0670170fb9f98ba4712c068d2f49291de235502 SHA512 690070b4f1bb4c50aa637dbdc44f34790903cc4e469ed2b66150ee1ce3554a1b645866b6d31b92583d148157d0fd6e2b2c8d49f671965f1402c2aaece161cdc6
+EBUILD nano-5.4.ebuild 2448 BLAKE2B a164684c73c661d538666b68b08c2a2b06d82bcb1b6f0814bd7ad32d4682ecd6d2b3a408ef4f0bcdd367a112b142fb789b55425fd31f38e52018376027627209 SHA512 606b6d254f60e1ea7487441063b698636c9e605a04d9305579a95a9fa49370dcfb0bcb4d0ef7f70080ec84c05bd234a28cad852d64fde5b4d9133e948303d828
+EBUILD nano-9999.ebuild 2448 BLAKE2B a164684c73c661d538666b68b08c2a2b06d82bcb1b6f0814bd7ad32d4682ecd6d2b3a408ef4f0bcdd367a112b142fb789b55425fd31f38e52018376027627209 SHA512 606b6d254f60e1ea7487441063b698636c9e605a04d9305579a95a9fa49370dcfb0bcb4d0ef7f70080ec84c05bd234a28cad852d64fde5b4d9133e948303d828
MISC metadata.xml 1642 BLAKE2B bd201f1a56bd864dbf7ce5e8dd8b9e0f1a34c236543d8bffa096da1f53460e824171ec629fa84a0a31919fa128e248397671129b8c0a23dfdda9d685e789bf87 SHA512 1b9eac65c24ddc6b917a8bbd1849a7dfd7f29cfa6430eb5945b1a09ec036e68023159882c632fe3dfe04038673cac68ecc74fb128a8bbdf1a2b0aa6cfd3a398c
diff --git a/app-editors/nano/nano-4.9.3.ebuild b/app-editors/nano/nano-4.9.3.ebuild
index 5e77b11f1a70..73e6b12a0ce9 100644
--- a/app-editors/nano/nano-4.9.3.ebuild
+++ b/app-editors/nano/nano-4.9.3.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
else
MY_P="${PN}-${PV/_}"
SRC_URI="https://www.nano-editor.org/dist/v${PV:0:1}/${MY_P}.tar.gz"
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~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 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
DESCRIPTION="GNU GPL'd Pico clone with more functionality"
diff --git a/app-editors/nano/nano-5.3-r1.ebuild b/app-editors/nano/nano-5.3-r1.ebuild
index 25cf3962ed7e..2afee8b5c491 100644
--- a/app-editors/nano/nano-5.3-r1.ebuild
+++ b/app-editors/nano/nano-5.3-r1.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
else
MY_P="${PN}-${PV/_}"
SRC_URI="https://www.nano-editor.org/dist/v${PV:0:1}/${MY_P}.tar.gz"
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~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 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
DESCRIPTION="GNU GPL'd Pico clone with more functionality"
diff --git a/app-editors/nano/nano-5.4.ebuild b/app-editors/nano/nano-5.4.ebuild
index 58e6b0821478..28951995bd22 100644
--- a/app-editors/nano/nano-5.4.ebuild
+++ b/app-editors/nano/nano-5.4.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
else
MY_P="${PN}-${PV/_}"
SRC_URI="https://www.nano-editor.org/dist/v${PV:0:1}/${MY_P}.tar.gz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~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 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
DESCRIPTION="GNU GPL'd Pico clone with more functionality"
diff --git a/app-editors/nano/nano-9999.ebuild b/app-editors/nano/nano-9999.ebuild
index 58e6b0821478..28951995bd22 100644
--- a/app-editors/nano/nano-9999.ebuild
+++ b/app-editors/nano/nano-9999.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
else
MY_P="${PN}-${PV/_}"
SRC_URI="https://www.nano-editor.org/dist/v${PV:0:1}/${MY_P}.tar.gz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~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 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
DESCRIPTION="GNU GPL'd Pico clone with more functionality"
diff --git a/app-editors/neovim/Manifest b/app-editors/neovim/Manifest
index 01db5fae6627..dd464b16da49 100644
--- a/app-editors/neovim/Manifest
+++ b/app-editors/neovim/Manifest
@@ -6,6 +6,6 @@ DIST neovim-0.4.3.tar.gz 9556199 BLAKE2B 831f4d4950f4fa2cd9c7393824bbb5eb571ae57
DIST neovim-0.4.4.tar.gz 9558246 BLAKE2B b1d44898bb1e1ab40a7e1d7fb4448076c991ebe1a0956674548de82fe7a931d9eaffbf35ba03cf9c88466dcd628a55f1d7bf9e7a13f3dad74424d6d653ded60c SHA512 ca5c2fe1784ac7b0d2117948ba2e9ae5d94e36d22ff9e0967047e1e03e605537672d85543897af335103215ad462c86962f25267d352a77d61bc3d1cafb3c183
EBUILD neovim-0.4.3.ebuild 1896 BLAKE2B ba5466ec3e33e1e13da42edaf4c13003f62ca0ccb7495d1e76cd716c28619444bfe4c6fa61f49aef1982296553e04c504c33cb93ff7366702728438768ca9853 SHA512 c6d6ec282f937beab1171f57bcf55a3efb97f8d0676a57c43a477f44586c2ee7fa9c59967fee332ddb3164ba754be5f26af9be2f249a31968fada653235432d1
EBUILD neovim-0.4.4-r100.ebuild 2726 BLAKE2B 162e67550f15f0e5ca5d161c4d0b8cc67dc0889c20d83d1beaa0675b2523262a5d4e597ac2099e6584b3d9876934c95e5ac99a3ac9a1b63d6b878d33ae37c720 SHA512 98a0bc6486c5bf9d82baaf49e2a5844c59e7d480a7541f133e121470e6d998fb4d0b3d7168fed53bf7ec28ce3fbf2b11756e1ca0742e518d09a10b7874fbafea
-EBUILD neovim-0.4.4.ebuild 2348 BLAKE2B 449d78658d067df46ec85097b9730653e45e7def1cfefbe3a8967c4bbd3864b3db37c348f66382baff8788a1f5e76083fcc27327794bf78a14db565874f86c00 SHA512 58c9992a9621ee2932f440a9b18c67ca9982338c164c95d4cb16274cd4f42dc91c6d5bf1aa9bf6178d2ff7a5ace75ba168635638e1b44d1add0607ac16eb5dc5
+EBUILD neovim-0.4.4.ebuild 2347 BLAKE2B 9684c3b66c5f8c69c495f7a14fe4222def4c8b574866e5e1d5575d953659e7e08a8dc6c7d6a56b7754a44eae1be9d108b3daedb49f35a13e360c065f7741d7c5 SHA512 bae47cc54f45ef5e1ed7d394bdf8f04e7b226265956b534fcd39509c50a4be91ba997c0c75bdf429a85bbcc1073113f2bae29482668f0440c1b6eb25d16a51b8
EBUILD neovim-9999.ebuild 2774 BLAKE2B 33139cd79cec2f8ef864d3b779bbb84a859065d471a56520f9f6e40be625a2902079c445693336ef0d2edfd68f185f3d9261ebe065d695dab143800d93c1f25c SHA512 4873649e3c097077e949f66099704692209ff725c7408b1242f14584f0abdccc7af08285740ec6d3eb050f7185f032979c5b69e74756058f3d99bac7d2755d61
MISC metadata.xml 535 BLAKE2B 7cebdc1b7adafafdcc2fe266f8696ad0dff927e8a9383ee34ac66e2c8910d3863d1f7603f2a82dec75f586ab22814d7268475ae3ce02fc3dca12a665e1e8ce5e SHA512 71fcf593a1b9587e6af0e30e851fb17e8552568a4e8bd38341c150ada7dbf72f962250f3306403c0be2d334932f63fe183850efe1c67d515ba79577cdf7aa561
diff --git a/app-editors/neovim/neovim-0.4.4.ebuild b/app-editors/neovim/neovim-0.4.4.ebuild
index 4bb6be68f96e..2b8b289784e9 100644
--- a/app-editors/neovim/neovim-0.4.4.ebuild
+++ b/app-editors/neovim/neovim-0.4.4.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
EGIT_REPO_URI="https://github.com/neovim/neovim.git"
else
SRC_URI="https://github.com/neovim/neovim/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~arm ~arm64 x86"
+ KEYWORDS="amd64 ~arm ~arm64 x86"
fi
LICENSE="Apache-2.0 vim"
diff --git a/app-editors/vis/Manifest b/app-editors/vis/Manifest
index 4a4e6e6317f8..1f1d8e4b1cd5 100644
--- a/app-editors/vis/Manifest
+++ b/app-editors/vis/Manifest
@@ -1,8 +1,8 @@
DIST vis-0.5.tar.gz 390461 BLAKE2B e628891c48dbbd11ed706768a3c625ffe9edf4fea3cd77452b4b41ae0d50194a31647e4cc945b69fb3af8fe7fd76ebf5f7afd8c2baa356f5f9fd3cc04be129ca SHA512 fe6b0394006562177efdf06713d7b95cd12fabf90b171c262eb2620d2b0944e73d3d8bb61f4f0d43d32154f0490c338bbc161a89455b14bb8a9d22cd75097780
-DIST vis-0.6.tar.gz 397707 BLAKE2B 9768f3d5586afd261f3e82721c08bdfddcd1c51a4f76d45c2f75eb954feed49d1ebeb1ee2cb31675cf68b356a0d32bcc33454aa2fbf0fd5c77afeea0a73465cd SHA512 3809b40f75816e03e47e0c2c16d2681cc1c01ad50a3d051285d5f1e9ff0a333160e668228a129a1596109aa079dc8364d3ad060b88e9dba33bb1d60a15eaf4e2
+DIST vis-0.7.tar.gz 403918 BLAKE2B 5e4930fdb14ed42a2daf6682a99107ee6eb59e99e348abab5262bdbc53956dd9ccd094695d7f53c6770d10e46b2812b0e07ff90184ff920790f5b95f4091a610 SHA512 ccc6a054fea6917e7751882468a74c30c712f7ec400a913c95c0084691f706e2bee54efb86b75be8b121c9a209c7e587e72e5474c55271d9943e91fc8aaf9bac
DIST vis-test-0.3.tar.gz 97814 BLAKE2B f62b216df3d846bb8bfdb14f6092309b55f6571cbc980e7a9aed46b1672fbaa65c007ac4617266dff3d5ad0293e3f5e7bd8390252817ebcdd6f64edb350f82ee SHA512 5f68a70cf6f1fb64f9b50c1a56940c966f205e51240c7dd1175bc15f3e42b475fb6842a53e36547113955c2efa359de0cc71e0800305b0e45881c319a14564e5
-DIST vis-test-0.4.tar.gz 98703 BLAKE2B dc9df00ae97ecd58022f885b25cb8163dd8b86f93d95cf93bbe1bd1efcc7690393efc4d47e3dccedc5f0ac6c33519136e6f13e6b9b9707f870b421aa3101537e SHA512 446eea2fdb7b15fd4962901e2076649964981217b9cf47112f16d1404da7cc024ba4b13164df0afa763363cef4f82db4ad9d7283a7554aead2165f29ca0bc9a5
+DIST vis-test-0.5.tar.gz 99314 BLAKE2B 988d7e93d0f3c58d2fc8fbe9293049c6a3cc44dfcbfbd4f42f7992815cf33a604340b59171dcd880f7180ae56e3f73f46684b7aacd96438480db6c4592851f2c SHA512 c41b40f23a45a7ebd9c16aa853d9c3b517767cb88ff8dc268da44276a02aa8c77de0fc6aa243a1e4cdfbc27182870b82d0b9bc892bb87ea74d5275d76c554ed1
EBUILD vis-0.5.ebuild 1896 BLAKE2B 203ac7e00c94255e5566e2f446cda5749ffaf9eb563de663b3a1bec49a1bced3dd660ed0501b82d8f4cd399511b595aa62a6e6b6dee4e6fdabe2bd2286e0f28f SHA512 ccc982bb70fb8485a4fa44ed6a561305d4a8e016ee5ed0b1f671502a0c7e7f60b30718b61d2154e036a92300c280fa03c4edd7f46de319ee3ff44812dd14a41b
-EBUILD vis-0.6.ebuild 1824 BLAKE2B 18aa9ce42e49017d27d5f8e6cbf23637b1b8b6a7898de585ad9207cce202ba654cd1dfb820ca75094bab3bb788e163b640bb06437374da14ee60fc6e8d7fad33 SHA512 08e3396687189cc71665b96e64017fa0eec55b6354aedb4a8c6ecaea47d9a5fb846f8670aad4fcabb124c914b1751d93e6e16da181322a011d50d10f596a0025
-EBUILD vis-9999.ebuild 1391 BLAKE2B c5184f951e9d5504f46a2d1230b5b6152520846d2de9d0369365d3cf08a7fbf7eb62698c51b11d931af4d6c739e456288b7ce4f810467247ca0e68c20b591425 SHA512 a36953764bd71e88cf4378c4d63c805fef4f1de2c0601503f9c56a9865fce852168b81f915745b28b0327b9c84fb4a87ecc63aeba4ba12fcdf573d46f60bb1b8
+EBUILD vis-0.7.ebuild 1973 BLAKE2B de9a8704f0de91e7ccb53206c39fd99348f72afeb6a694442baaed20696e2820302806ec90ff55acc9753272e0a84f74492aeff17d1280c156aa662bb3542ad9 SHA512 bcc4496f6a6ee2161b2f245bc72425e292453cc49b1e7cd246520495f8dd986bb35376fa80e0add0fe75fcf806f0eb49e0b54a2573dc0841726280a1194923e4
+EBUILD vis-9999.ebuild 1398 BLAKE2B 0697e80ce72ffbffedba444987fd63a009d7fed1974ac57ed85d5226998987dbaecd0d0d99d4050d807960c063238cf8aae627805bc2cf642f678949d79eb2df SHA512 9528fefb1cc797475443ffd08fb531a83179841b3bc91bcf375d6da216e62ef0e29ffce41185835313d733856f33ab13126e344365c51a369df14e66f35df27d
MISC metadata.xml 593 BLAKE2B c1f2c845ed329592118b0424bdbd4ff75d690fc657b60d6c1340fb668f2dc32cc34d807e3be77916630ea1db55c8d8d84db5d98b7763f6c1a69555c7b028230c SHA512 c9fce79e630218ffd9300592ca35a700bc5291a2a8453b30a1e33a4e64d03d9c5cf4f95357fdd87fc7b206a5d113b52b182dfb34ae713273992dc5d295a89730
diff --git a/app-editors/vis/vis-0.6.ebuild b/app-editors/vis/vis-0.7.ebuild
similarity index 90%
rename from app-editors/vis/vis-0.6.ebuild
rename to app-editors/vis/vis-0.7.ebuild
index 722f5a71fc9c..4d2ac5754f60 100644
--- a/app-editors/vis/vis-0.6.ebuild
+++ b/app-editors/vis/vis-0.7.ebuild
@@ -3,8 +3,8 @@
EAPI=7
-MY_PTV=0.4
-LUA_COMPAT=( lua5-2 lua5-3 )
+MY_PTV=0.5
+LUA_COMPAT=( lua5-2 lua5-3 lua5-4 )
inherit lua-single optfeature
@@ -38,6 +38,9 @@ src_prepare() {
# https://bugs.gentoo.org/722014 https://github.com/martanne/vis-test/pull/22
sed -i 's;./ccan-config > config.h;./ccan-config "${CC}" ${CFLAGS} > config.h;' test/core/Makefile || die
+
+ # https://github.com/martanne/vis-test/issues/27 a Werror clone
+ sed -i 's;|| strstr(output, "warning");;' test/core/ccan-config.c || die
fi
sed -i 's|STRIP?=.*|STRIP=true|' Makefile || die
diff --git a/app-editors/vis/vis-9999.ebuild b/app-editors/vis/vis-9999.ebuild
index 38ea0ff6ecd6..bb8d1be8d88a 100644
--- a/app-editors/vis/vis-9999.ebuild
+++ b/app-editors/vis/vis-9999.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-LUA_COMPAT=( lua5-2 lua5-3 )
+LUA_COMPAT=( lua5-2 lua5-3 lua5-4 )
inherit lua-single git-r3 optfeature
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index f2f6f27db59e..74853f5a23ca 100644
Binary files a/app-emulation/Manifest.gz and b/app-emulation/Manifest.gz differ
diff --git a/app-emulation/diskimage-builder/Manifest b/app-emulation/diskimage-builder/Manifest
index 3e7e4acff47f..55dc0baa8d24 100644
--- a/app-emulation/diskimage-builder/Manifest
+++ b/app-emulation/diskimage-builder/Manifest
@@ -1,6 +1,8 @@
DIST diskimage-builder-3.3.1.tar.gz 450130 BLAKE2B 09f3b3549527d726f8479e1f8dc89ae50fdeacf6969e43f5b35591fa0a9d38ae0dd03b7292633604a938b0ef14e31b4e655645643bae22df4f3519c75d9dde83 SHA512 095c0968f5ceeb220c3871ccd14c7bf7c1b3d883bcb02f9cfe7406d5a336c36a813c8290bf133441a2a59972f485596aa5620b755016aba348afe3b7fc723c9f
DIST diskimage-builder-3.4.0.tar.gz 477142 BLAKE2B 998c4769f8b1e973628a6ab790c78afa32d3de23df6dda62e94917916aa92419d16a58ba3029bad6641508de2f404bfb16101197720ed050a1db6a92434e3144 SHA512 a05fc9b836cf8273d0c73ab1e95ecbd2172c56e457ba8ae00cb3a5f13b499dc1e8d81f262d155e8e2005bdc14af25370af9dfb3b2bf29342d5110edc7e630a87
+DIST diskimage-builder-3.5.0.tar.gz 477918 BLAKE2B 0621a4af9bc68a19c45d88ddbe636ae3e6e86cc1668023b0f10020bff51929a03c12edfced248fc138a114ad4b538d7b71828ed44a5d18b54e39bd47919b9699 SHA512 bea42f47078966686af9774ef34300f326e2ddf4b536af53d1378cf413e6675df9f71c54d90fdb55fbdeeefc708264350a48d4a4b2824d0bc3263df04742d768
EBUILD diskimage-builder-3.3.1.ebuild 1123 BLAKE2B 864def556b24d1d5f048ca54bc1e437c8a17a3eac033ab5c87e3a46d3ae96aba2a3830d5b2c3ac15b01e59cee88a4b7b9aac1a0642cbdb9e3a7140966d9edfee SHA512 07bfc8bb21aa626cae72ff38b2bb422963fabe83e93842d0bb9408e5e6a33b4b35df1fdceee8b2387fb946884c8bec41fe8ac5071bd660b6e8c12c0c780f9c24
EBUILD diskimage-builder-3.4.0.ebuild 1125 BLAKE2B beae746e25dd0a358a5eb8151176adc2f089352c91bb05ebe34b0b720dd4a33a1c28bfa6c9436a23bf6c682e5fe118814434181e0d98e3fe9ff25c6ac1ec884a SHA512 46e20a6883aad54feeceb035e4eb7cd30aec2de300541ce018227a578d03221d5259e128969370b0c7e82b2eec9a35d781ec9ae28c1f2907bc0d355d560a3683
+EBUILD diskimage-builder-3.5.0.ebuild 1125 BLAKE2B beae746e25dd0a358a5eb8151176adc2f089352c91bb05ebe34b0b720dd4a33a1c28bfa6c9436a23bf6c682e5fe118814434181e0d98e3fe9ff25c6ac1ec884a SHA512 46e20a6883aad54feeceb035e4eb7cd30aec2de300541ce018227a578d03221d5259e128969370b0c7e82b2eec9a35d781ec9ae28c1f2907bc0d355d560a3683
EBUILD diskimage-builder-9999.ebuild 1125 BLAKE2B beae746e25dd0a358a5eb8151176adc2f089352c91bb05ebe34b0b720dd4a33a1c28bfa6c9436a23bf6c682e5fe118814434181e0d98e3fe9ff25c6ac1ec884a SHA512 46e20a6883aad54feeceb035e4eb7cd30aec2de300541ce018227a578d03221d5259e128969370b0c7e82b2eec9a35d781ec9ae28c1f2907bc0d355d560a3683
MISC metadata.xml 718 BLAKE2B 04a2c90bcae79f187feb346d0b73f1d6dd1c1581123ca26bfd3182d97239a37e81875d7a3a7b03c4aa08f2974bd25be5f3021e2e48195d5d09e18b606b5b4c87 SHA512 8e16e9d92a81049d414ae54eaf7a4467982cbd949230adcfab22b636ba2b91885d80e9b047788ccd07eab547ae2f85a56d989b971b64bd926e6ca70972398277
diff --git a/app-emulation/diskimage-builder/diskimage-builder-3.5.0.ebuild b/app-emulation/diskimage-builder/diskimage-builder-3.5.0.ebuild
new file mode 100644
index 000000000000..eb082f7274ea
--- /dev/null
+++ b/app-emulation/diskimage-builder/diskimage-builder-3.5.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+inherit distutils-r1
+
+DESCRIPTION="Golden Disk Image builder."
+HOMEPAGE="http://docs.openstack.org/developer/diskimage-builder/"
+if [[ ${PV} == 9999* ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://opendev.org/openstack/diskimage-builder.git"
+else
+ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+ KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+ !~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
+DEPEND="${CDEPEND}"
+RDEPEND="${CDEPEND}
+ >=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
+ !~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
+ >=dev-python/networkx-1.10[${PYTHON_USEDEP}]
+ >=dev-python/pyyaml-3.12[${PYTHON_USEDEP}]
+ >=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+ >=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
+ app-emulation/qemu
+ sys-block/parted
+ sys-fs/multipath-tools
+ sys-fs/dosfstools
+ sys-apps/gptfdisk
+ !dev-python/dib-utils[${PYTHON_USEDEP}]"
diff --git a/app-emulation/lxd/Manifest b/app-emulation/lxd/Manifest
index ad70d2c8ca9b..dfe12073763c 100644
--- a/app-emulation/lxd/Manifest
+++ b/app-emulation/lxd/Manifest
@@ -4,10 +4,7 @@ AUX lxd-4.0.0.service 519 BLAKE2B 5314820c25e52449aad8db6584739cbe0f2654111e4b42
AUX lxd-4.0.0.socket 197 BLAKE2B 8c0d2dee71c14ee5f34b2bd0804adfa06ab3ae2a73bcf8d122184434c42b7f91f66fe610bddda93c458e0f171b505fe79a4f268d8243aabdf226f47e95027e71 SHA512 d70dc867b2e92b69928c83fc5feca4e387808adbc267b9fe4ecf0c8befdf3ca13366b229c6eefcb5667e51405fb0aa4e6bb8f59a0b5b5fb3895c46b4aaab0661
AUX lxd-4.0.0_apparmor.service 567 BLAKE2B e5951c31f90b842f5b625060326d9611ed67fb50360b11791cbd1ab1953fdfe5eb726e22b7091bb8e45c294b772e6b00e9ca65833512eb5b570627fa3234812e SHA512 364764d007f4800138c712fce70fe28b096b6e35dc6d2e4f8aa9aff4b335ecec7dfc9600a1a16cd38e69a96534b7462daf5f6e946a2ee81bce17977b8d5911db
AUX lxd-containers-4.0.0.service 322 BLAKE2B a38cffd4b5809946abdac858564dcab2c2967c295d671df0d315d790df1849e25f0bc052e20cd0d9e4c23403289050b4538f5a52437ab8ae9ca3b40c6a9a1571 SHA512 a55f2c1a367c5c3c5eb6880e01893977de18c6e9463949236ee3247715fbf53641bbe1b69404362dd6cb6ba2a30ac6539fd362b21059e529dc4dac4ec5ca6718
-DIST lxd-4.0.3.tar.gz 25468067 BLAKE2B 5c3d8a2841d3222d070be39fb6cb63c99450a7edea86915a808230012f1a3b7a66c2c4a3c56be378f586c8ca033c4f547ed6eeb14bb09a091b3ae28c62fda7ae SHA512 aaf7fe7473e04765263ff99f02041748f0e57abdd0311d734fbf1cbc461516bf6adad1bc42c9cfa58b4e87c28efb5186d9436fb0a1d309b23eb37fe95299ad6f
-DIST lxd-4.0.3.tar.gz.asc 833 BLAKE2B b889b7c3a85f325a4c47319b45c4828c4fc0cac2bae77341734827e737243802852c20a766ab72ce1a12e643502d108fec41b715d8eb820ec273c651b7745fb2 SHA512 993ad833832a551e0804f9e565542b5779352cad2bb32989a440a0be11b1ae6539e46fa3332d35e8be365026dacc21d847db544b62b3e11493100d3c9cb313e1
DIST lxd-4.0.4.tar.gz 14166577 BLAKE2B 5a04efa1bf70d416b328f5f85379a7c697667978a2b7571c05f8d834ccea51c65ce3df447787ccad5c0a9cc524bc396eb5c90b26b92d6252fc07a5be0157e0ea SHA512 800768b923de920e04d676d9c87beedd2ddd164661799c429616f6fa00b36f23ae1d9cff56f2ed16172585b9b3c058ee955eb3e5f8d98c84109c4405c5aae23f
DIST lxd-4.0.4.tar.gz.asc 833 BLAKE2B bac0b63fc7fe61290bd399ef09eaf0bae12ac962b1188c49fa94c9132b002c278dcdb271d35a1784848591a315a8e88eab823c1c653ef814d454a0af607e461b SHA512 7fc9b9b27305d7637efeaf4024a8a26e2f891599fe50fa22e2f9defa6d451a015d74d068f63a9547fce312ed5fb5da82b99be9dc13601f807695cf1b675baf15
-EBUILD lxd-4.0.3-r2.ebuild 6216 BLAKE2B a27e6e7fd7299cc7b6ec7a388d34dcca5b511f09908332ae75e161fe30ee3597880abc8b1eeb9e45e0b922fc5e3a2895563372864c6ddc6721478d82d76c46e8 SHA512 dcdf83c6cad0b3ad373b855d997fb57a5848ab689eb84ca9dedf82b738c79219499315f32ee6e3fbbf989b03c5008d10d0124dc9dd03161aac59b955cdfd8b6c
EBUILD lxd-4.0.4-r1.ebuild 3511 BLAKE2B 8dabc47cc1b4ae2b165d5e1f4027816a31a7c7bf1069f198a90859c0b68b94ff9b3f273345a58156cd6771860a4c4eac96d364ade2efeda71dcd1a7ca459d474 SHA512 8a60709dbc465933c2de7c7097dc06e131b3a69b1535fb1af90dd9fbb2ffb05fa524e458bd80394437ad652138c07be9cde45f602f69d85930f3322433020889
MISC metadata.xml 776 BLAKE2B 5f8e6d2639982bf6564567a9775e55b777d4bd9cb01818770b5089071262ceda815e5d94e853b7c08a470234729c08e313685610b3da457a23bb7edbf5b3ff52 SHA512 050d500629b4331f2f8bd2fa5cbcabadc988d737c891edb66ad8b2ee2fd378690b2fee4c70e0b380c2579cb9a39453768242d7acbead4c5390c7f01131b939c0
diff --git a/app-emulation/lxd/lxd-4.0.3-r2.ebuild b/app-emulation/lxd/lxd-4.0.3-r2.ebuild
deleted file mode 100644
index fa42646855b0..000000000000
--- a/app-emulation/lxd/lxd-4.0.3-r2.ebuild
+++ /dev/null
@@ -1,212 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools bash-completion-r1 linux-info optfeature systemd verify-sig
-
-DESCRIPTION="Fast, dense and secure container management"
-HOMEPAGE="https://linuxcontainers.org/lxd/introduction/ https://github.com/lxc/lxd"
-SRC_URI="https://linuxcontainers.org/downloads/lxd/${P}.tar.gz
- verify-sig? ( https://linuxcontainers.org/downloads/lxd/${P}.tar.gz.asc )"
-
-# Needs to include licenses for all bundled programs and libraries.
-LICENSE="Apache-2.0 BSD BSD-2 LGPL-3 MIT MPL-2.0"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="apparmor +ipv6 nls verify-sig"
-
-DEPEND="app-arch/xz-utils
- >=app-emulation/lxc-3.0.0[apparmor?,seccomp]
- dev-lang/tcl
- dev-libs/libuv
- dev-libs/lzo
- net-dns/dnsmasq[dhcp,ipv6?]"
-RDEPEND="${DEPEND}
- acct-group/lxd
- net-firewall/ebtables
- net-firewall/iptables[ipv6?]
- sys-apps/iproute2[ipv6?]
- sys-fs/fuse:0=
- sys-fs/lxcfs
- sys-fs/squashfs-tools
- virtual/acl"
-BDEPEND=">=dev-lang/go-1.13
- nls? ( sys-devel/gettext )
- verify-sig? ( app-crypt/openpgp-keys-linuxcontainers )"
-
-CONFIG_CHECK="
- ~BRIDGE
- ~DUMMY
- ~IP6_NF_NAT
- ~IP6_NF_TARGET_MASQUERADE
- ~IPV6
- ~IP_NF_NAT
- ~IP_NF_TARGET_MASQUERADE
- ~MACVLAN
- ~NETFILTER_XT_MATCH_COMMENT
- ~NET_IPGRE
- ~NET_IPGRE_DEMUX
- ~NET_IPIP
- ~NF_NAT_MASQUERADE
- ~VSOCKETS
- ~VXLAN
-"
-
-# 4.0.3: Network fetching fixed, but tests don't work when ran inside container.
-RESTRICT="test"
-
-# Go magic.
-QA_PREBUILT="/usr/lib/lxd/libdqlite.so.0.0.1
- /usr/bin/fuidshift
- /usr/bin/lxc
- /usr/bin/lxc-to-lxd
- /usr/bin/lxd-agent
- /usr/bin/lxd-benchmark
- /usr/bin/lxd-p2c
- /usr/sbin/lxd"
-
-EGO_PN="github.com/lxc/lxd"
-GOPATH="${S}/_dist" # this seems to reset every now and then, though
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/linuxcontainers.asc
-
-common_op() {
- local i
- for i in dqlite raft; do
- cd "${GOPATH}"/deps/${i} || die "failed to switch dir to ${i}"
- "${@}"
- cd "${S}" || die "failed to switch dir back from ${i} to ${S}"
- done
-}
-
-src_prepare() {
- default
-
- export GOPATH="${S}/_dist"
-
- sed -i \
- -e "s:\./configure:./configure --prefix=/usr --libdir=${EPREFIX}/usr/lib/lxd:g" \
- -e "s:make:make ${MAKEOPTS}:g" \
- Makefile || die
-
- sed -i 's#lib$#lib/lxd#' "${GOPATH}"/deps/libco/Makefile || die
- sed -i 's#zfs version 2>/dev/null | cut -f 2 -d - | head -1#< /sys/module/zfs/version cut -f 1#' "${GOPATH}"/deps/raft/configure.ac || die
-
- common_op eautoreconf
-}
-
-src_configure() {
- export GOPATH="${S}/_dist"
-
- export CO_CFLAGS="-I${GOPATH}/deps/libco/"
- export CO_LIBS="${GOPATH}/deps/libco/"
-
- export RAFT_CFLAGS="-I${GOPATH}/deps/raft/include/"
- export RAFT_LIBS="${GOPATH}/deps/raft/.libs"
-
- export SQLITE_CFLAGS="-I${GOPATH}/deps/sqlite"
- export SQLITE_LIBS="${GOPATH}/deps/sqlite/.libs"
-
- export PKG_CONFIG_PATH="${GOPATH}/sqlite/:${GOPATH}/libco/:${GOPATH}/raft/"
-
- cd "${GOPATH}/deps/sqlite" || die
- econf --enable-replication --disable-amalgamation --disable-tcl --libdir="${EPREFIX}/usr/lib/lxd"
-
- common_op econf --libdir="${EPREFIX}"/usr/lib/lxd
-}
-
-src_compile() {
- export GOPATH="${S}/_dist"
-
- export CGO_CFLAGS="${CGO_CFLAGS} -I${GOPATH}/deps/sqlite/ -I${GOPATH}/deps/dqlite/include/ -I${GOPATH}/deps/raft/include/ -I${GOPATH}/deps/libco/"
- export CGO_LDFLAGS="${CGO_LDFLAGS} -L${GOPATH}/deps/sqlite/.libs/ -L${GOPATH}/deps/dqlite/.libs/ -L${GOPATH}/deps/raft/.libs -L${GOPATH}/deps/libco/ -Wl,-rpath,${EPREFIX}/usr/lib/lxd"
- export LD_LIBRARY_PATH="${GOPATH}/deps/sqlite/.libs/:${GOPATH}/deps/dqlite/.libs/:${GOPATH}/deps/raft/.libs:${GOPATH}/deps/libco/:${LD_LIBRARY_PATH}"
-
- local j
- for j in sqlite raft libco; do
- cd "${GOPATH}"/deps/${j} || die
- emake
- done
-
- ln -s libco.so.0.1.0 libco.so || die
- ln -s libco.so.0.1.0 libco.so.0 || die
-
- cd "${GOPATH}/deps/dqlite" || die
- emake CFLAGS="-I${GOPATH}/deps/sqlite -I${GOPATH}/deps/raft/include" LDFLAGS="-L${GOPATH}/deps/sqlite -L${GOPATH}/deps/raft"
-
- cd "${S}" || die
-
- for k in fuidshift lxd-agent lxd-benchmark lxd-p2c lxc lxc-to-lxd; do
- go install -v -x ${EGO_PN}/${k} || die "failed compiling ${k}"
- done
-
- go install -v -x -tags libsqlite3 ${EGO_PN}/lxd || die "Failed to build the daemon"
-
- use nls && emake build-mo
-}
-
-src_test() {
- export GOPATH="${S}/_dist"
-
- export CGO_CFLAGS="${CGO_CFLAGS} -I${GOPATH}/deps/sqlite/ -I${GOPATH}/deps/dqlite/include/ -I${GOPATH}/deps/raft/include/ -I${GOPATH}/deps/libco/"
- export CGO_LDFLAGS="${CGO_LDFLAGS} -L${GOPATH}/deps/sqlite/.libs/ -L${GOPATH}/deps/dqlite/.libs/ -L${GOPATH}/deps/raft/.libs -L${GOPATH}/deps/libco/ -Wl,-rpath,${EPREFIX}/usr/lib/lxd"
- export LD_LIBRARY_PATH="${GOPATH}/deps/sqlite/.libs/:${GOPATH}/deps/dqlite/.libs/:${GOPATH}/deps/raft/.libs:${GOPATH}/deps/libco/:${LD_LIBRARY_PATH}"
-
- go test -v ${EGO_PN}/lxd || die
-}
-
-src_install() {
- local bindir="_dist/bin"
- export GOPATH="${S}/_dist"
-
- dosbin ${bindir}/lxd
-
- for l in fuidshift lxd-agent lxd-benchmark lxd-p2c lxc lxc-to-lxd; do
- dobin ${bindir}/${l}
- done
-
- for m in dqlite libco raft sqlite; do
- cd "${GOPATH}"/deps/${m} || die "failed switching into ${GOPATH}/${m}"
- emake DESTDIR="${D}" install
- done
-
- cd "${S}" || die
-
- # We only need bundled libs during src_compile, and we don't want anything
- # to link against these.
- rm "${ED}"/usr/bin/sqlite3 || die
- rm -r "${ED}"/usr/include || die
- rm -r "${ED}"/usr/lib/lxd/*.a || die
- rm -r "${ED}"/usr/lib/lxd/pkgconfig || die
-
- newbashcomp scripts/bash/lxd-client lxc
-
- newconfd "${FILESDIR}"/lxd-4.0.0.confd lxd
- newinitd "${FILESDIR}"/lxd-4.0.0.initd lxd
-
- if use apparmor; then
- systemd_newunit "${FILESDIR}"/lxd-4.0.0_apparmor.service lxd.service
- else
- systemd_newunit "${FILESDIR}"/lxd-4.0.0.service lxd.service
- fi
-
- systemd_newunit "${FILESDIR}"/lxd-containers-4.0.0.service lxd-containers.service
- systemd_newunit "${FILESDIR}"/lxd-4.0.0.socket lxd.socket
-
- dodoc AUTHORS doc/*
- use nls && domo po/*.mo
-}
-
-pkg_postinst() {
- elog
- elog "Consult https://wiki.gentoo.org/wiki/LXD for more information,"
- elog "including a Quick Start."
- elog
- elog "Optional features:"
- optfeature "btrfs storage backend" sys-fs/btrfs-progs
- optfeature "lvm2 storage backend" sys-fs/lvm2
- optfeature "zfs storage backend" sys-fs/zfs
- elog
- elog "Be sure to add your local user to the lxd group."
-}
diff --git a/app-eselect/Manifest.gz b/app-eselect/Manifest.gz
index 431963ade69f..cbfda970e66b 100644
Binary files a/app-eselect/Manifest.gz and b/app-eselect/Manifest.gz differ
diff --git a/app-eselect/eselect-lua/Manifest b/app-eselect/eselect-lua/Manifest
index ce5733625904..eb90296df138 100644
--- a/app-eselect/eselect-lua/Manifest
+++ b/app-eselect/eselect-lua/Manifest
@@ -1,3 +1,3 @@
AUX lua.eselect-2 4192 BLAKE2B 90c8241a3dcc822466aa9a95420143bcdcd5a9aed3d8688958cc2bd30005f298399f8d34834ffb7a727a1186acfd9e98b765cc5a949ef81e39ca96e83c028afa SHA512 fa7dfa52542d9410dcc5f60bc4ef63db7b8396c7ba6115f2d83951a171d996aea3c13530ac2d7ef5025b5047aacb2e4936527377aec0d53229f46d518bd79845
-EBUILD eselect-lua-2.ebuild 595 BLAKE2B a89b6d46ac6f07c95c29d1f99c76f0e1e8912bb149b6c65b81bb391d627e87165cb22153b9644760dac343f7aedb00e4e6e88a25900c46a1f8eab8310ccb1100 SHA512 5c656e7fdea22e198f4609176b1007b39e3fd120a0b640b6362b86eaa7950dce562e05b76c81326b39d325ef098eff8cbb9d364066160293b1e7564813988986
+EBUILD eselect-lua-2.ebuild 602 BLAKE2B 4a1c3ca6d59532d64a2b608706bb9be2e614330a01d5b4ff06b5e98d102e7a205b182862577303c87d39911d5a53f44bf2290bdf449d2c8b4dd1bbdccc10ab6d SHA512 76e3c7bcd7b565f54eee8c0c068e3e5a3724cab720b083affcd983252e3424215c458d9be98a3ab2aee286f3ba44547165ffe24ee51703d73cd6fd796ca66c54
MISC metadata.xml 361 BLAKE2B 8202a11a4a9534a7dcdcaacd6018aa2a0fa02f914fd630782b536ce4d7f5182e9315038544eff0c3ab30d01959ff87b25390e5fb1a4ad1057ad68d6e91c0239f SHA512 a382c700bed10e7c62c6f66560551c3f152de4f57d7ebc3ee127d57eb06a72df3d214fa39dde03f431b881250cf80de5e0a2b3528f6c4365bf5fbbe950e982ad
diff --git a/app-eselect/eselect-lua/eselect-lua-2.ebuild b/app-eselect/eselect-lua/eselect-lua-2.ebuild
index 461ba343b7bf..3529ad194141 100644
--- a/app-eselect/eselect-lua/eselect-lua-2.ebuild
+++ b/app-eselect/eselect-lua/eselect-lua-2.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND="app-admin/eselect
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index 03d0c52f9865..a63e626b8f71 100644
Binary files a/app-misc/Manifest.gz and b/app-misc/Manifest.gz differ
diff --git a/app-misc/golly/Manifest b/app-misc/golly/Manifest
index 19db43c46816..a027a8303890 100644
--- a/app-misc/golly/Manifest
+++ b/app-misc/golly/Manifest
@@ -6,5 +6,5 @@ AUX golly-4.0-CFLAGS.patch 686 BLAKE2B 1d82b951bee9f336931ad2589bae03bd8e52ac2f9
DIST golly-3.4-src.tar.gz 5480295 BLAKE2B 6bd0c71083d021adb660ed8fd333399865e5f486b6d95d2851aefd31fd2ad09a04419e6e3b2e0ff38b1d934ebb975525c07ca841210cc05f60f9ecf92362bc48 SHA512 bb2b1a653f9556901aa18d2d56c75c2c5e55bd7451b2b5bfb6268793758c12a6b00d30fa52c08ebd47e5db98fbec6fb80c64194cd93a1a41846adbd824c7af47
DIST golly-4.0-src.tar.gz 5579026 BLAKE2B fc6c9d4db80e92635ac466250ca65c5cbe496c668f2fbd583226a2ecd686ac022aa4d47f453628284bceeb16554b91340b442216eab8412506243e30085a3a32 SHA512 3a39e170ceddfa4f8c261a81f7b45039e9cc2aef901915d83d3227231514bf66e254d307802cb0afddd7458722b8cbf2ce527cb9ee84a2710b52bf5bdb15484d
EBUILD golly-3.4.ebuild 1364 BLAKE2B 4e3ec9e4fd7a5746b30dca2a01d4e3b77eb0728a56aaf7936c5ff58372461e13076bbff0755ad2e375b35f65e3d3f0abe68743a55c45da48970e33548e108cfb SHA512 88bede339f2178bcdf8f83c33813495d45e51a301abd8796c93da7a7b39a97a049079efeaddf13b61f84229efd6384ce9387b882f1bdf112153c3c67e56b34a0
-EBUILD golly-4.0.ebuild 1382 BLAKE2B a0f68d1b52f96b1720c5eb6c9b1c76b98d85b3a520d76d7ff7b8db9a3576fd4788c88517427675ae9910f640ac3c756021157dae4232ef72d473f3c60419c6d1 SHA512 ae21035d11f692ba999286e4ddfcef0211da37353211fe2992778e49ff12214ade434a354928f46d3c184e5e8f227e7284f72d58333541a1b2df1d12daa50ae0
+EBUILD golly-4.0.ebuild 1381 BLAKE2B 182a9f197db7e0634c1baf06eb38b1bc923ab6bd39b90f529badfd3c3072b3f8597df57eb6ae5273545875b58f88fa2e6695f668cfcc869ca7e45341344cefb2 SHA512 394c3b8217a3fcc4be09391ffb504289fbbda991f9c7682defdacdc4a4570d6516d5c106690b9643912b5fcfce7f61725f5d963f3ac60e49fda86b480835082f
MISC metadata.xml 326 BLAKE2B 6064832ecd0867971a46cd3c998419df96a09aea31c361b98cc81212e1a84bb99053f14a86321b194196df7e74d1859d7c82c2f55adcf0dd887224754aed381e SHA512 be4d2ed3256cbb48987657dc4a6569c4fa415a495488f17bffe0954bd54127bfc4f6652912b18666a02887bfe31769d1b0c1a67c311e286abca347a9b756301f
diff --git a/app-misc/golly/golly-4.0.ebuild b/app-misc/golly/golly-4.0.ebuild
index c6e352c091fb..e62cf1408e20 100644
--- a/app-misc/golly/golly-4.0.ebuild
+++ b/app-misc/golly/golly-4.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
IUSE=""
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/app-misc/mc/Manifest b/app-misc/mc/Manifest
index 236068216ad4..442578e614d0 100644
--- a/app-misc/mc/Manifest
+++ b/app-misc/mc/Manifest
@@ -4,6 +4,6 @@ DIST mc-4.8.24.tar.xz 2434988 BLAKE2B 18bd730d5bfbad19fa5e70fb578cf587a3df8da338
DIST mc-4.8.25.tar.xz 2488324 BLAKE2B 47047c85fbe3ce1c54b9a3477c35fb05d76b3688205bfd13db03844bb9d8b3e74498ef4d6b449cfcf79c0188687accd93602274b7e8c0cbffc5247d433e33272 SHA512 51913fd41df18b49498b97ad8e13aa4365cec24ab24169b1abe93209263e4cfea4b52e0faccaf934182c84e8eb5dc49336c885358b4b66c48d38900f890fde5e
EBUILD mc-4.8.24.ebuild 2855 BLAKE2B 74fdf3aac3459a98b10520e036f3c752866b105c81c875245341960c28d77981cf6cdd3bfd7cc4b244689feb7008f9297f6028e394bfba60693f593c9021176e SHA512 457dd712e0ecc24c8a6d1ea180b49ff53b56ba8cbd27b74cf63041c47cf5671e6fa5b934ef37a3ad57fca74502c249100337a46b28d91956e755aae9405f3ea8
EBUILD mc-4.8.25-r1.ebuild 2871 BLAKE2B 5d9fc7fcdf3d9d6c3a7f8d31799d82d471f9259098724bc0ab0298c4888faa121f852035e1b95c2a7bfcdaf1072e09b380fa99dce47d456ab5b0313553cec16f SHA512 77b2f606b468b292ee958159166436e067cb082a6a5302b5271fc034ca97ba2eb35365f900f47c51503c4fb642a9e502cba1d2b8f0c47447d843ed302e458c64
-EBUILD mc-4.8.25.ebuild 2802 BLAKE2B 604a07ddd8285551e0e0a4b283d891b6ddf6e778c51cba8868a5b976a91915b5403fafb362cc721c2573829d794d7da286f17089125d8e3c7b010464a8912af5 SHA512 236127c33c8d21c694dfb36bcc1ff9e526692eeef68ff20e281c4919a05af52c7bccd2600d8a67b8c20a296988cc6a4fdb4f94323cf9765507a9aa99c9111510
+EBUILD mc-4.8.25.ebuild 2801 BLAKE2B e7d9bf37ea23557b49bb7862175aae72ec932ef1f03e965db0cddd86c97507adb826ea49dfbb6ea12f102b5558abc39f8d729cb99c6d51a9779ac238094ba02f SHA512 7aa941058c2b8236123787e527c37311245122a61d2524a35c5905807fef45accc4227e2475adba5b2bc1e9a9e6010a84afa603a301f1ea5ca7b628f599adb79
EBUILD mc-9999.ebuild 3050 BLAKE2B 101a2fa59995345bbca727af306f2dc367ebb30028137f52bcc618235914e80fc8c2c8411fa859092a1fd1d4014c1d20b675f25f4a2d744f11db304c14b95e1f SHA512 ad30cbbe132a4e3ab2477e03fd4a4eaa2a518d3b237b27b90a37178288278211ff90af7a6d111442990ea055586bd181641ef8147e4e56b83aed4ef3263c4dfd
MISC metadata.xml 773 BLAKE2B c7f3bb9bfb49c380a0493eabadcedec215df8696c5d52433aaccdffa0bf5ba3b89c77c291e19ed88c5ac29718e34eece1d3dabbc3ba6c1ec7862970f3900e204 SHA512 c5c0ca5a41a78cf746e14264b291f81ccffaa9c34a4149d27a9293cca8d304cb4844c07979b31218b250c3baeaccef2cba529c2ab43e81dc5552dca34ddbd4da
diff --git a/app-misc/mc/mc-4.8.25.ebuild b/app-misc/mc/mc-4.8.25.ebuild
index 75d0a3f5c742..50564c23a106 100644
--- a/app-misc/mc/mc-4.8.25.ebuild
+++ b/app-misc/mc/mc-4.8.25.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://ftp.midnight-commander.org/${MY_P}.tar.xz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
IUSE="+edit gpm nls samba sftp +slang spell test unicode X +xdg"
REQUIRED_USE="spell? ( edit )"
diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index 325344279178..0b4da475ae13 100644
Binary files a/app-office/Manifest.gz and b/app-office/Manifest.gz differ
diff --git a/app-office/moneydance/Manifest b/app-office/moneydance/Manifest
index 26dccba94bcb..556cd9edb60a 100644
--- a/app-office/moneydance/Manifest
+++ b/app-office/moneydance/Manifest
@@ -1,4 +1,4 @@
AUX moneydance-bin 567 BLAKE2B 4a1f80df1e5e20c08ba95168b680f8e0cdd7413fdc7991b12d40048dde6465db8c4d3a18c7b3f70bb829a2f5d2002258a8e6ccefcc64afbf419633ff948f3e15 SHA512 344e05050f28ea61264899b62f3e14844371ef452b0b84c6146abdecd2b9fc1230102bf2685b6c0649e014048c82ecd5dd7ce3117e65a9a22a2737eb39f4ca9a
-DIST moneydance-2020.2.1929-amd64.tar.gz 146171665 BLAKE2B b211265f3b6f51aa07a8d3fcd4945dd76a5a6775722fd938782bc53f5b920e13d1acf721f822bc64fde790ab8449d975be0f6e954b80049583278649e2487e91 SHA512 7017b06c50f9814005aaefb522f4e2b6f0011af08bb0daced7fa7d64a0f4a39cb81a01d62d72e9d06062529d5e4056811ab0129fb54bad52a83a99fccb0a546b
-EBUILD moneydance-2020.2.1929.ebuild 1075 BLAKE2B 3c9b00c967a7305e87383cb8a1ba4b3e17370d2ea293621522f88b58672d7eef0b38764473163c33df826702b3fc268e2b5f090e9b4723f162820243d2ffd064 SHA512 6441f8aa1d06179493e11c053520b98691231c53dcc74415743dc43f265886c2cf1880d407c4e58f20443a281a3601d8ebeca655ea90e14a366723faf9413d1c
+DIST moneydance-2021.2006-amd64.tar.gz 154878776 BLAKE2B 89327c48f6a5794f2272956ef39a8c1a2da3b6cccc380d83df6973cd89245108e6eecb22938036db94442d4f88d109a89c5055085737063a3268638140ae231a SHA512 13f09c4410ac60f9e9d3a8dced47e5f66cf55e83274302d60ca4cab0e04b7de38f8004886c6b8fc96f3e30b938fe9394a946627346741436e2e52c301ae23e0c
+EBUILD moneydance-2021.2006.ebuild 1073 BLAKE2B 5e84a843d3c29e574acd986f357e4fde3739ac36c432b898f50b9c635e7c583976410c49d5727f3dbd5965185eb7708d1296fd818c463b162a0ae254586bd73c SHA512 3c0b10480a5cdab30670dce00720c54ecb613a24ae982668bfb0ab2f633f99a7eda68176bd7d9cc6d0615ee688242b9dfac81aa5bf3dcc5c1a4d380264ee24f3
MISC metadata.xml 482 BLAKE2B 1ecfa1f0e8d8f5d67c8b60ddbcae821ac1ea776e984a3db7c0480e7e16872ef29c562bfd2963252ebc9f23b208ae70a1d9391fd5ae592074a2d4bcbbde637b78 SHA512 5b4c0c6b163ddce368d7f64e64550f988fd0b302024a50e4f07b5f13826e9fc7407109d4b04129fb01d62cd1f1d69de3d4814ce0e0fb1b744455ac2e2bf725d2
diff --git a/app-office/moneydance/moneydance-2020.2.1929.ebuild b/app-office/moneydance/moneydance-2021.2006.ebuild
similarity index 96%
rename from app-office/moneydance/moneydance-2020.2.1929.ebuild
rename to app-office/moneydance/moneydance-2021.2006.ebuild
index 6917a58332e4..a2134d7b3e9d 100644
--- a/app-office/moneydance/moneydance-2020.2.1929.ebuild
+++ b/app-office/moneydance/moneydance-2021.2006.ebuild
@@ -6,7 +6,7 @@ EAPI=7
inherit desktop java-pkg-2 xdg-utils
MY_PN="Moneydance"
-MY_PV="$(ver_cut 1-2)_$(ver_cut 3)"
+MY_PV="$(ver_cut 1)_$(ver_cut 2)"
DESCRIPTION="A cross-platform personal finance application"
HOMEPAGE="https://moneydance.com/"
diff --git a/app-office/scribus/Manifest b/app-office/scribus/Manifest
index 319ce5fe896d..34b86d64e08d 100644
--- a/app-office/scribus/Manifest
+++ b/app-office/scribus/Manifest
@@ -5,6 +5,6 @@ AUX scribus-1.5.6-findhyphen.patch 597 BLAKE2B 166e71a1efd00262b9eead90e6b47457e
DIST scribus-1.5.5_p20200626.tar.gz 87557791 BLAKE2B 183b035901f5a19ffbf5890acc6037eb5483a0b5837b244b39838ca03d13bd4afc76c3c41345123aec402c602177c5fff7183deba10f8e33e980659c4ef7881e SHA512 ff6cf0d86c874b7f03c8be9675f92c6cc7797e3a344326824e4f01f0b02ec02d6fdf5b52924e51b3436d9a6d78eda47a5e9987507721d18985768cc5a3c77245
DIST scribus-1.5.6.1.tar.gz 87557791 BLAKE2B 183b035901f5a19ffbf5890acc6037eb5483a0b5837b244b39838ca03d13bd4afc76c3c41345123aec402c602177c5fff7183deba10f8e33e980659c4ef7881e SHA512 ff6cf0d86c874b7f03c8be9675f92c6cc7797e3a344326824e4f01f0b02ec02d6fdf5b52924e51b3436d9a6d78eda47a5e9987507721d18985768cc5a3c77245
EBUILD scribus-1.5.5_p20200626.ebuild 4078 BLAKE2B 28b48945c2f0cfbe409a1b390c42eeaed0db28a0592284c67c62855c11f52415ded2b0eeb2f65d359c6af6535ebc74928d7786a4abcde191ffdeb02b5870b661 SHA512 ff283fe98f0ce8929a7456316ced12d97d0e8df373af0fde09e49af37ccf5f29a0569ceb65ef21a03ea3444ccaa4c65d33d3753a5ba6390fa1f6f87d47ce273a
-EBUILD scribus-1.5.6.1.ebuild 4050 BLAKE2B 6d746819a616616131ed4f93d81cceb5801fc9bad73a22eb6db4f9f0cbcd7e857d8369e9d3aa11936e974251a5c1e491db01b865c95cbba46d70670761225dd2 SHA512 68dc9fea1fb36db63c3ee1ede3301dd94b8555c0a0b4a4730e31d3aced715d6516322806abd379bb642e46186c3529182bbc3968ddd1d50feda05cebab214f1c
+EBUILD scribus-1.5.6.1.ebuild 4049 BLAKE2B fb58b3ba2c8733ff24e1d779accb661c18062ec957da198a0bc1ca81a779242e4aa793ab5da9c39cd2ba99de59a2009322c0952e5eed954470d357b0736d55e0 SHA512 896a52a31532db4602a42d286a3c57543df1e50bcf2a71400422367b2f299e4d95353761a0120b79bf3a3e50e1c0e3d7d4a75948410311ed08603e2a1940bab2
EBUILD scribus-9999.ebuild 3954 BLAKE2B b6907c836200ad7a775bf0e9866c2a324e61890923db880be545b3f142e63f102d2f52471a2c93da3b5825b36fa1abf9a1a7750746cd1c39b02511160c6fa65a SHA512 08b6477bd65533a70cae2f07e1e41f5ec713052dd1ccd164de489cc91b3f2a84644bd526e7c55357cca4833eedfa76016f7d7174521360361f49085bbcb0134e
MISC metadata.xml 882 BLAKE2B 87f52990c93874472eeb73cbf7b46b4c1fa41d25e17d179f5cb9f5067d21aea18ac4ac323e5878c2bf49d075f67230353860cd6b45b9458435ca7b0fae9854b0 SHA512 403eb2874bccc2929284f1e44042e1fa84c2ad9d6abcb1b9600f327060e1b476366ab40cf6f8876aa18bf8195c21f82e2deaecfa7e1868b2fcfeba42c72e9d58
diff --git a/app-office/scribus/scribus-1.5.6.1.ebuild b/app-office/scribus/scribus-1.5.6.1.ebuild
index a535eb5a50b5..82470486f2b1 100644
--- a/app-office/scribus/scribus-1.5.6.1.ebuild
+++ b/app-office/scribus/scribus-1.5.6.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/${PN}project/${PN}/archive/${COMMIT}.tar.gz -> ${P}.
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ppc ~ppc64 ~x86"
IUSE="+boost debug examples graphicsmagick hunspell +minimal osg +pdf scripts +templates tk"
REQUIRED_USE="${PYTHON_REQUIRED_USE}
diff --git a/app-office/texstudio/Manifest b/app-office/texstudio/Manifest
index 266de1e8ba38..d624fd4acc51 100644
--- a/app-office/texstudio/Manifest
+++ b/app-office/texstudio/Manifest
@@ -1,7 +1,7 @@
AUX texmakerx_my.pri 439 BLAKE2B a520129f6a0630ea5032f619b425847bc58956553840dbe1c9a97d1587f9eebc4958450b264a124a8342fb839276314854af3bf41d18084deee0a49b45320904 SHA512 859bd280c5d5c319fe0c4c5af04a2ec8118babeef3b22d14a03384ab25e8d0721145b453179e1f16b989068bfe79d5831efcab545069a9cb5018382e2e8c6d8b
DIST texstudio-3.0.0_pre20200601.tar.gz 35982392 BLAKE2B 1eed56fe21aac141df41f251621a902a20153b0eaafc995b56fa8c3fbcc213685710e45202fbb90a071a0efac591c86588d4c5fe3727e603e0a58e149ed6864e SHA512 d922f576055fc345e7e0125074c6dbb473c6fb95aa06ae1ffc15f3b89fbdc7c5a44a13d4a32b770bef10c7bae7211a4bf3a269996eda1b3a0c8fd1ed8f3c4bb1
-DIST texstudio-3.0.1.tar.gz 35982392 BLAKE2B 1eed56fe21aac141df41f251621a902a20153b0eaafc995b56fa8c3fbcc213685710e45202fbb90a071a0efac591c86588d4c5fe3727e603e0a58e149ed6864e SHA512 d922f576055fc345e7e0125074c6dbb473c6fb95aa06ae1ffc15f3b89fbdc7c5a44a13d4a32b770bef10c7bae7211a4bf3a269996eda1b3a0c8fd1ed8f3c4bb1
+DIST texstudio-3.0.1-r1.tar.gz 36144393 BLAKE2B 63dad681a56ce60a90c44ab71930e8a14a7f335eb7d40f906aab2f5ca10375f768bafc3ae9023574b04c2b5196bc495ef47fb5fc9d4f6438da0a747ebd857972 SHA512 aba57d9f45af259131d3ab47463a30bec24d8fa5b30a9c574308b8a7d6c1117acb1553df20ebe5855281510f82c4d55700a0db0dffeee1b69f2afec234e18b93
EBUILD texstudio-3.0.0_pre20200601.ebuild 1761 BLAKE2B 4806704703f464d461fa388870fb6ab6c9f81140edaacb323ddbf312d41422e9e64239b84d38ddc38b1ed1a24b5c288a0d905e484600dd24f217f65276418458 SHA512 d9ddc869ea4295259c907b2124e3685353c0939b6c1c65d494d9c201a39b0f31afb5d81f18220d768284c5ce5d4eca0eca0f99690636aa166d204ee9358385b4
-EBUILD texstudio-3.0.1.ebuild 1763 BLAKE2B 07467ce7354ec27afa459d9af5eb0a66dc5be2a5baedfe9c7c2d8ce08b0a6debc566bff74b5e08fc4ffd721d8be18f110b26b3e09947cf5ed0f6555b8115be7a SHA512 b1d4f77572331862f6edb6657ff17892769aa030e937727c13e9789c1087e87c3a0a483644bc5201b4a11aaba6e0a4b88d83214c75e3d40473c4f16fac5aff5b
+EBUILD texstudio-3.0.1-r1.ebuild 1664 BLAKE2B 83065785ff8ec7f81ed53ac411d36d8a281961a13daa2448598d0c84452097f0d5aea7506705a06d61cc5c76b5152b3f6f3aadb56cdf1ab27fb21545080b4dee SHA512 8376e6faf386a9031b90a83452dea1261593e6c6640464aa256c7effa47df5fe55bf90a6067d16575f712d7f50e6d9fc465a79c9db4530970400dd4bc2f693c2
EBUILD texstudio-9999.ebuild 1884 BLAKE2B 381765c70b04066aa53d50c402ace018ec79adb50e9af9a198ad867167b5f2f131f4aaa4c836f6a4267da96fcc2d0b75dfa6a8f2707d74a896af25e20aea82e7 SHA512 90966c2bb60be15fab68db843edc48b89edb0db76e0fd7c3bac9fd853e3097c2938511472c4fb84f749d36fbddc5d91b3562ed7fcbe8459fbe11570a4b7679e9
MISC metadata.xml 411 BLAKE2B e545d68a6bb26046f5e43df2bcc64371e5a4237ef20a83c8811675ddde9dfec1eee8f5dc6405e7005a3ea35e39e2f3bf019d92bbd4b68e5c74524c7e785a2214 SHA512 c82d3d1b0b50af84b34a1c6cc17e19ab50afd45206939abe3c96c2d8b93a69201eeef81c72e1eef56dc717ecdf1d0c67637b59bea94160188a673f233d57458b
diff --git a/app-office/texstudio/texstudio-3.0.1.ebuild b/app-office/texstudio/texstudio-3.0.1-r1.ebuild
similarity index 84%
rename from app-office/texstudio/texstudio-3.0.1.ebuild
rename to app-office/texstudio/texstudio-3.0.1-r1.ebuild
index 549dc6356a4c..4b285ee4a888 100644
--- a/app-office/texstudio/texstudio-3.0.1.ebuild
+++ b/app-office/texstudio/texstudio-3.0.1-r1.ebuild
@@ -3,13 +3,15 @@
EAPI=7
-inherit prefix qmake-utils xdg-utils desktop
-
-MY_PV="3.0.0alpha6"
+inherit desktop prefix qmake-utils xdg
+# NOTE: Drop -r1 from SRC_URI on bump!
+# #740220
+MY_PV="${PV/_/}"
DESCRIPTION="Free cross-platform LaTeX editor (fork from texmakerX)"
HOMEPAGE="https://www.texstudio.org https://github.com/texstudio-org/texstudio"
-SRC_URI="https://github.com/texstudio-org/texstudio/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/texstudio-org/texstudio/archive/${MY_PV}.tar.gz -> ${P}-r1.tar.gz"
+S="${WORKDIR}/${PN}-${MY_PV}"
LICENSE="GPL-2"
SLOT="0"
@@ -45,8 +47,6 @@ DEPEND="${COMMON_DEPEND}"
BDEPEND="virtual/pkgconfig"
-S=${WORKDIR}/${PN}-${MY_PV}
-
src_prepare() {
default
@@ -73,13 +73,3 @@ src_install() {
done
emake DESTDIR="${D}" INSTALL_ROOT="${ED}" install
}
-
-pkg_postinst() {
- xdg_icon_cache_update
- xdg_desktop_database_update
-}
-
-pkg_postrm() {
- xdg_icon_cache_update
- xdg_desktop_database_update
-}
diff --git a/app-pda/Manifest.gz b/app-pda/Manifest.gz
index 5808f998f0dc..9fd0e000b645 100644
Binary files a/app-pda/Manifest.gz and b/app-pda/Manifest.gz differ
diff --git a/app-pda/libimobiledevice/Manifest b/app-pda/libimobiledevice/Manifest
index bc3a2c90fd4c..a0159f0ad361 100644
--- a/app-pda/libimobiledevice/Manifest
+++ b/app-pda/libimobiledevice/Manifest
@@ -7,5 +7,5 @@ DIST libimobiledevice-1.2.1_pre20200220.tar.bz2 193582 BLAKE2B 7fab2101ee96a5fcc
DIST libimobiledevice-1.3.0.tar.bz2 733949 BLAKE2B 40717280bb3424c7431aa93d06d10de817e6761acf2b19948d80b691cfb4dd4ef0e31b81c8458eed29a43c8c8aa256da7baa3648fb785cfbdb7316daaba119a3 SHA512 7b22040552a6561729c79c0846f571b0e608abb7c297567d2ecfdd1718ce86df08a5e34ba51f209bdee96a1917da15e7ba3aaef1d289a951d1d3470b1f89e6a8
EBUILD libimobiledevice-1.2.0-r1.ebuild 3251 BLAKE2B 4250165b98dadb3c8c9c40205cfdc2751faa8a6865e58be8fb933b560d1001d9e4f41a81adea9099ed38cfc58f9a1fef61c1a61a1c84389f1436c713170acc30 SHA512 742efd5fdb8bcab38ac94af62e5a6c22f18128e43345d444cd96777a1fda4d46ca5bbb87b47a3fb3bcdb6011633e75ca876e372ce16969fe14394068b4f395d3
EBUILD libimobiledevice-1.2.1_pre20200220.ebuild 2599 BLAKE2B 7378479cb0050d0c9ce2fbbe07b1aba1976e6c1d275753bf33d644230c49834865f721ad86aa84b86ce7247c8766363d2f03bd5aed1ecb5816d1d6431938bbde SHA512 ea49d0257645a50966102b5cd72950db1c84daf3a82327e3e2d2de3e9540a655999541dc628c59b4ebb7461dab593e2e3b3409a3120202453626d308006ba190
-EBUILD libimobiledevice-1.3.0-r1.ebuild 2553 BLAKE2B bc3a7541538cca50ded42582e606e6a39523a08e15b50756fd61ad5f00749671dff7ef5b113a2f812b91e8511d930857531abc90c3626cb3ecfc3ee2f32b9e7d SHA512 2e55d1a7ae682ea87cf1f6e38d839a921d31c5c5b585c4df4d33d0906717fcdcb02adf995cd8f720b76635814010e52f12698d096e3b2d9fa31fe061622c3420
+EBUILD libimobiledevice-1.3.0-r1.ebuild 2552 BLAKE2B 5fd370b0ed94294fb5e3d6280ed71166ce0eba9e8cc8fa69ba33cb98abc4732440563fad1012863952b85032d1738b19300ddeb32eb169a60b4cd689d2954acc SHA512 d10d3090998b084d2fb898e1ffd5feaeb0f1eab1972e0392ab453d48fba684aeebacf196223eab4bda58e6ea48dbb5ebb562232ed7a6cca7b8896fa28f9d9748
MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-pda/libimobiledevice/libimobiledevice-1.3.0-r1.ebuild b/app-pda/libimobiledevice/libimobiledevice-1.3.0-r1.ebuild
index 8ff61a7c4d2e..4289ff28a883 100644
--- a/app-pda/libimobiledevice/libimobiledevice-1.3.0-r1.ebuild
+++ b/app-pda/libimobiledevice/libimobiledevice-1.3.0-r1.ebuild
@@ -15,7 +15,7 @@ LICENSE="GPL-2+ LGPL-2.1+"
SLOT="0/1.0-6" # based on SONAME of libimobiledevice-1.0.so
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ppc ~ppc64 ~x86"
IUSE="doc gnutls libressl python static-libs"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/app-pda/libplist/Manifest b/app-pda/libplist/Manifest
index b04546d6b87a..74a1e520c975 100644
--- a/app-pda/libplist/Manifest
+++ b/app-pda/libplist/Manifest
@@ -4,5 +4,5 @@ DIST libplist-2.1.0.tar.bz2 120602 BLAKE2B 8abfe3c295c4ebd242f2c4d49c80d1f214097
DIST libplist-2.2.0.tar.bz2 126808 BLAKE2B 7c3ec04aaa52eca33ae28851a6524c9ea531df939feef0f10827c8c2de78a6ccd856ea4d8a568b146ccb5de96f70dd5accec34aa2fdd61f9e6eba01256c0b518 SHA512 641bfd3ec0565f104d3a2d1ebdf6137bc9252b67ce90550e24ab0deeee4e820e119ba4f8f1ba04a0358d995d196fa61e35f2f0ee8ba37fc0270752ae842ab1f5
EBUILD libplist-2.1.0.ebuild 2145 BLAKE2B 666212cfa479b9855390170df691006230daeebad437fa6599427fea3f7b6f25db4079cbd47d87453ad23eacfa8103f45e834d8c472db3b4cc6ce4a37c0fa9ed SHA512 f73c7808e738a970fd5edd8ef657558dcf97ac73cda3b2470ba3856edb0aa831e9338d349ce35330caa1c56a3713fd1d3d5046c965ecc8715f837479596a5a47
EBUILD libplist-2.2.0-r1.ebuild 2150 BLAKE2B f4019c675f045e06bf35f4badf4738708b3afaf229087b7f0c3d8ef62a4051c7d9d6d40a44eb2a3b828c3fdabab40920af75890f08e6385a01ef561d6ecc3ef7 SHA512 8776a7558f87372514d6bdf21bbc4ef73f0c9dbac29c1bbd2b9b54f2fa66e9b40b91d309dc2cb8209c794696b2ea70972327abee5978dbf78848e54f55704c93
-EBUILD libplist-2.2.0-r2.ebuild 2715 BLAKE2B 4b4fb6aeaab88462ace8ed04e3b8b49b5934a1173d8c4c0e889bd3bec5c2ed5cf18c14d4789360ca63b1fc99a157ec0c227f4c820547b08eb75737695969b6fc SHA512 2ad8f9f92458cfe1be5d9927a5753bddb511e6da84c1ad3f6b717ac6837e957e09902c51b56f1e0f5a192f6266ec5da65010f720e41abf8d8c79c2adbc372ad0
+EBUILD libplist-2.2.0-r2.ebuild 2714 BLAKE2B 462125ccbc9fdf540f9e8cafc7af0f692aff01e4d571251082f3eedeeabc4f36065f88c927fd353e62fab01abc14a9c55e3df085353bedef4b41f63a831f79f0 SHA512 17a20a907c41fa7e3a7ecaf6cff5ca9cf07c7a090e264e00222c91ae1376784f517d781cd17e80d467e4f20f0f4857aed77cf14d82ea8c234db8a826cc4a4c6c
MISC metadata.xml 329 BLAKE2B accbb4a0f223b37358e54635e61f1488abf2148d89e166e4a68e8ddfc90e0d4c3438c52d75c24aeced91c2246e537cb0b1d64e6e9c63425c6392148cbc3bcd58 SHA512 69d57118df488610f977fe8722d463bb858e8329855cf439ae3c1c7c52260dec96505535e9424041d71d000951db199312e382d24f66296c9c408113ead5219d
diff --git a/app-pda/libplist/libplist-2.2.0-r2.ebuild b/app-pda/libplist/libplist-2.2.0-r2.ebuild
index 31d8621f1cee..6bc482a2b68e 100644
--- a/app-pda/libplist/libplist-2.2.0-r2.ebuild
+++ b/app-pda/libplist/libplist-2.2.0-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://cgit.libimobiledevice.org/${PN}.git/snapshot/${P}.tar.bz2"
LICENSE="GPL-2 LGPL-2.1"
SLOT="0/2.0-3"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ppc ~ppc64 ~x86"
IUSE="python static-libs"
RDEPEND="python? ( ${PYTHON_DEPS} )"
diff --git a/app-pda/libusbmuxd/Manifest b/app-pda/libusbmuxd/Manifest
index 3525e39ec29d..0b53597adf33 100644
--- a/app-pda/libusbmuxd/Manifest
+++ b/app-pda/libusbmuxd/Manifest
@@ -3,5 +3,5 @@ DIST libusbmuxd-2.0.1.tar.bz2 37373 BLAKE2B 3d7d8b4ccc5331f1f3868e67ac9726281dcc
DIST libusbmuxd-2.0.2.tar.bz2 43162 BLAKE2B e3559583e691a5f87a61ffece0ebf944d4aed48d37f83a504ee4d7a245e05511c6620c4a82d29bea2a10686910a14f7a730afec0f2cfc9435f748499e35df433 SHA512 3086ce1a05026afeabcdb5364ec30f4a6a5c84fe6f09e15ef6ff438bd3dfdb262ebdff94e5e0d0828b6d946bc8bdf01760271ba0d1fbf98d743dce149764a519
EBUILD libusbmuxd-1.0.10-r1.ebuild 937 BLAKE2B a5c8eb29f27bc1a75a13c81e916eee108803a6a0827ba57edb76e2d06c89655852d021ef164efcd11e95c59ff95210b52bd417cb33404fff243d0b916553f44c SHA512 66a0254d202427c87f8188076a2602b200da3ba7e31b19e88c573269126ca075574e8d8b02da451c3f6bb348a74341365736b738271d8ab49d7d6060f8b9fc8b
EBUILD libusbmuxd-2.0.1.ebuild 859 BLAKE2B fa38081bd37fe5f5f5d674623dd549e5456db0cd5586e29d2e1422e4b0e7d1507e6ea8cb6f87147204a44d6dcc097c0f536fa6304e01f05a64fbc67746ff24db SHA512 1ababb683971d59ddddc67fa34e3adf37af52a8ba805337e74f262175c7451307517a774911fb7f7a6cc4bfcb6d8008ba659e4ac209a23a64a0d6df4ee664746
-EBUILD libusbmuxd-2.0.2-r1.ebuild 842 BLAKE2B 3a113abda2ce14644a5790be3e00a2e9b59adc35d40d2025b5b189bbb57c7dc7ab569b9cfb2bbb15c2801faa4c5fd4fbe25d93b47ab57bf85657968ad58be88e SHA512 b5ad699909491ffdffe14b296a820c54159a509428fd6720e1b044512fd2c7561d0f30c628fe416363b3028dcfb0ee10788561d7311bee79449accfdc2d0fe30
+EBUILD libusbmuxd-2.0.2-r1.ebuild 841 BLAKE2B 6338b7f938dfff0154e0966a1007bcd1cffa46c6bca8ed464d7037fe2dc14a3ff78464614de0efbee9d956a9ddbf59b8e990a241f863f517103cc7887b82e259 SHA512 176bc61bf4cc0436b8ae3798c4750ad6269b85b51c976154b4e5f14089c1bd62bcd87605e8ddca0eda0d8d2a1fa2dd18c1b1a8bfc0e7c44fc626a7d9724312a7
MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-pda/libusbmuxd/libusbmuxd-2.0.2-r1.ebuild b/app-pda/libusbmuxd/libusbmuxd-2.0.2-r1.ebuild
index 7692c22ec8a0..8c2602d386b1 100644
--- a/app-pda/libusbmuxd/libusbmuxd-2.0.2-r1.ebuild
+++ b/app-pda/libusbmuxd/libusbmuxd-2.0.2-r1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.libimobiledevice.org/"
SRC_URI="https://cgit.libimobiledevice.org/${PN}.git/snapshot/${P}.tar.bz2"
LICENSE="GPL-2+ LGPL-2.1+" # tools/*.c is GPL-2+, rest is LGPL-2.1+
SLOT="0/2.0-6" # based on SONAME of libusbmuxd-2.0.so
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ppc ~ppc64 ~x86"
IUSE="static-libs"
RDEPEND="
diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index d66568d9862e..a9b7ed9e0e01 100644
Binary files a/app-portage/Manifest.gz and b/app-portage/Manifest.gz differ
diff --git a/app-portage/eix/Manifest b/app-portage/eix/Manifest
index a8f893203c6e..5cbb73f1bc72 100644
--- a/app-portage/eix/Manifest
+++ b/app-portage/eix/Manifest
@@ -2,6 +2,6 @@ DIST eix-0.34.10.tar.xz 630356 BLAKE2B 6336652dbb3703295693dea40cb2d2a2d5c7fc17d
DIST eix-0.34.11.tar.xz 629932 BLAKE2B 7b203a4763a880379e5bafe086f70aeca6ad508cd558cc53d53683d8ee4a85111ba9fdea9fa81cd9c3939dd01ea392876b2714257138fd40a2c6b124e0fdbc90 SHA512 518dee499ed27acd39ea4c26e7b94a1098408b1d8cf6bc593e5e4b06aa973ae664e155886681c1e90e4a89afe8b54e05f8bd08d6ace2a2e1559fa613e5a351e7
DIST eix-0.34.9.tar.xz 629672 BLAKE2B ba9a5de98f74baa711e7483e284980c0fe5e956512de590954bf848f6cf6baad5db899256e927e7cb984d7276157fa9c42052cc8fb1ccc52e5e530cc31d39d84 SHA512 5cb00c813bc31971a0cfd77cae0c676040d33f24963cb241274918d2e381956ca949593e0637d81040a9751db0a925552913188cc25ada9a90c6007c31f72e43
EBUILD eix-0.34.10.ebuild 2585 BLAKE2B 6749db82fc458fc9cf06ec50e3c1060dfd38c115d1215ff3ee550cb217583e01124bf8c898e89def83125531e5d020e217c19a23b921eed7f531a7fb10711b10 SHA512 46c33084b670cca3ff22602fc3f17da750ffca4f7503a51523f74edc89fd564cd7ed22f86a9065239bb49ed0e3a8e527fbab4e4b1f0f9074b6f6e02f49fc11b9
-EBUILD eix-0.34.11.ebuild 2585 BLAKE2B 6749db82fc458fc9cf06ec50e3c1060dfd38c115d1215ff3ee550cb217583e01124bf8c898e89def83125531e5d020e217c19a23b921eed7f531a7fb10711b10 SHA512 46c33084b670cca3ff22602fc3f17da750ffca4f7503a51523f74edc89fd564cd7ed22f86a9065239bb49ed0e3a8e527fbab4e4b1f0f9074b6f6e02f49fc11b9
+EBUILD eix-0.34.11.ebuild 2582 BLAKE2B 4a5f85f24369b96dece2545fce99fb231b01f9b978eb79074a14e5e1b0baad2193f0b0d211288c06a4e3ef99d28f4700bbf5f869e465fe2e940fe05249b1ea18 SHA512 2db4bae27273cab1ca8d195fa7ecc36ef3aa6566e2e72587acafe023f44069221e99e27eabb61f267aa49cc19effb14fc6dddb7775c0e70eb641bf2c1d7fccba
EBUILD eix-0.34.9.ebuild 2576 BLAKE2B 746fd28cc0f30bb051721dd6b45868650af05fa624931a16999090da378033547b0ebfbd10c0704db68cae4df120540b2b2c63f361e3a3a44be6f08e27dbb802 SHA512 0fd779fc7effddc026db782ccbd5d891fdd954136ed7f1d9f10d7dde0d32b20042edcb1393698a79ae2b79d3fd7570c92009e7d76b29c66edae6efdf197b2020
MISC metadata.xml 1051 BLAKE2B b77439c3a8d8eab9fc711c96ce2b2ccaf307f2eca4cfee32bfb75279ff4da31fd05b3319136af38e70d274c28cb2f1c2567916390d81425b7b7daf956815c7e4 SHA512 208b3db2b2e5afb5667a29e6b18538f3cea5e3fb2758d3c9b30823d7b2a22f31f150d6a01abec6a6c8ca62486c975b47002de9e1bac89ded31eb7013bdbb38c6
diff --git a/app-portage/eix/eix-0.34.11.ebuild b/app-portage/eix/eix-0.34.11.ebuild
index f11bcd6edbb7..449465c8e9a8 100644
--- a/app-portage/eix/eix-0.34.11.ebuild
+++ b/app-portage/eix/eix-0.34.11.ebuild
@@ -11,7 +11,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 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="debug doc nls sqlite"
BOTHDEPEND="nls? ( virtual/libintl )
diff --git a/app-portage/kuroo/Manifest b/app-portage/kuroo/Manifest
index 405b7c8308bb..bd61c58725b9 100644
--- a/app-portage/kuroo/Manifest
+++ b/app-portage/kuroo/Manifest
@@ -1,5 +1,4 @@
-AUX kuroo-0.90.5_p20180410-qt-5.11.patch 1178 BLAKE2B 944d08100d9b3a75bddc9fa44127ed4d71c043c96c1ed267ec2ecd4a4ccffad4f7c65f0be539ebc40392834b4217e057c611dd6912b33d2904a7b4ba2484a0ba SHA512 fb7e746ce8354ce71a38d4a850ffa7cb270727b26d08353cb5d8661583e02e7e0b45013f03aac71a0058e2f0a567ab963669336bde8819bc212083eb19be2c1d
-DIST kuroo-0.90.5_p20180410.tar.xz 241920 BLAKE2B d182df57f0c6628b849f6f6e4d7919281117396ea30360e6eb0993b3c61ba67956a8e0648926f77e23d8222a8337108599f657cb7e49091fd51b98febb6593ce SHA512 f1894c90b8b6df06818cab6cc3fb55a3348f8a9df669b515796dabe9a0df3773d69ba89a4aa3569250b2fb379c1169d8789c82fcd3868ddb9f640f010aee811d
-EBUILD kuroo-0.90.5_p20180410.ebuild 1384 BLAKE2B 644a144a5a39494938163492fd9b812116ca0758561bb8e2203b99ec2dbac7c4175e7f892480bb751ac3fd91c9a0e3124de2f0a3344021e8aee594ff14fbd1ed SHA512 bd034155f09c646e6c8c9ccf8d6bd7ea597f9546b3a821cd83b2cb4a1bb503ee5e3cf2615ae225f96a3bc21d24f3a6759fd129bb3f11aabf7eea4211391ad1a2
-EBUILD kuroo-9999.ebuild 1133 BLAKE2B 5a0366878956d76cbf889aba9f644d7347381c3652ad4c5ea819b0e7c4c6a33a505eee697270a2e8b41a9ca6db6f6fd6f1ab77381f9c643b562a8e42e78b266b SHA512 c984911f4c74eec46a55046dfef46bddb0d42c0374a07185a9b773370fceaab54dbaa5e3b48c0bc8af1100727420b84302beefc3c2f9ebb01473ef7094a082e6
+DIST kuroo-1.0.0.tar.xz 248912 BLAKE2B b7b556fb833052890038a8186d0d5c9eae127633449b542ccad3e38c8c888f31b1dc73bd6b5ecbbfe332917c72f0b1511e25df4360b8057c95172188cee8ae12 SHA512 af90554604aa9ae4776f207202a6a1313e104a9a0883fa924241dc5b14b7d39a4c60b226d2606f55a210b7dfe80c84b952ab3cdca14da77c150e7ae6e7782bc2
+EBUILD kuroo-1.0.0.ebuild 1082 BLAKE2B dfe189437085e3705b9992a48f1209d423552281115e57fb66a244ac44622f4684617021a9cc865fd5ca694bb6d2f6e9b87e1387c24be388e235488c8b20e3ff SHA512 d5c3e0d33b7f84a73e1b17e23119cec37d1b3a3f5b7dc13c76a1a6679d632ca925a2881785db70301626566bacd933e11e484ef5e2c74cad21e738ebc6000424
+EBUILD kuroo-9999.ebuild 1099 BLAKE2B c042dd6f8b908e40471974decb763dd405ba689e3fd57e9527562b690ea7f27d6540974b7588f5164bed5b9e64f01e25c2c29b66a886b4725e4dfb9c5a35ee22 SHA512 659d25f521e86e616974a17a11ea69079d8fe6cb456c4edc41f2ad6c6d4a934e1a9217a86392dd872335ad6fe6d3b0c09851def2ecedb5a5acb99f4c0a75eab1
MISC metadata.xml 757 BLAKE2B 338d2d4cb0c2d198f8d38ccaa33dac9b9b745baaecbd642f6a0cbf4a3471642db421918eb292a1e7ebed9305429decd70c1cb27f98328cea17f3dc87c893fc53 SHA512 86b24f163496aff68fdfe3ad7fb1648100d1f9757dd18194899b512242236b8e3130b70f74576adbdcc7f570ddccea6655714875f39b52fb6bf4c2bc46b55b11
diff --git a/app-portage/kuroo/files/kuroo-0.90.5_p20180410-qt-5.11.patch b/app-portage/kuroo/files/kuroo-0.90.5_p20180410-qt-5.11.patch
deleted file mode 100644
index b7a146e20095..000000000000
--- a/app-portage/kuroo/files/kuroo-0.90.5_p20180410-qt-5.11.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 77941829f2aba22e05142a47b689e17d594da610 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner
-Date: Tue, 10 Apr 2018 16:27:47 +0200
-Subject: [PATCH] Fix build with Qt 5.11
-
----
- src/core/categorieslistview.cpp | 5 +++--
- src/core/versionview.cpp | 1 +
- 2 files changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/src/core/categorieslistview.cpp b/src/core/categorieslistview.cpp
-index d499397..1246aad 100644
---- a/src/core/categorieslistview.cpp
-+++ b/src/core/categorieslistview.cpp
-@@ -22,9 +22,10 @@
- #include "categorieslistview.h"
-
- #include
--#include
--#include
- #include
-+#include
-+#include
-+#include
-
- #include
-
-diff --git a/src/core/versionview.cpp b/src/core/versionview.cpp
-index 1a2b701..e83e265 100644
---- a/src/core/versionview.cpp
-+++ b/src/core/versionview.cpp
-@@ -21,6 +21,7 @@
- #include "common.h"
- #include "versionview.h"
-
-+#include
- #include
-
- VersionView::VersionItem::VersionItem( QTreeWidget* parent, const QString& version, const bool& isInstalled, const int& stability )
---
-2.17.0
-
diff --git a/app-portage/kuroo/kuroo-0.90.5_p20180410.ebuild b/app-portage/kuroo/kuroo-1.0.0.ebuild
similarity index 68%
rename from app-portage/kuroo/kuroo-0.90.5_p20180410.ebuild
rename to app-portage/kuroo/kuroo-1.0.0.ebuild
index c48facaa7beb..cff3675995b0 100644
--- a/app-portage/kuroo/kuroo-0.90.5_p20180410.ebuild
+++ b/app-portage/kuroo/kuroo-1.0.0.ebuild
@@ -1,28 +1,27 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
-inherit cmake-utils xdg-utils
+inherit ecm
DESCRIPTION="Graphical Portage frontend based on KDE Frameworks"
HOMEPAGE="https://sourceforge.net/projects/kuroo/"
-SRC_URI="https://dev.gentoo.org/~asturm/distfiles/${P}.tar.xz"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
SLOT="0"
+KEYWORDS="~amd64 ~x86"
IUSE=""
-COMMON_DEPEND="
+DEPEND="
dev-db/sqlite:3
- dev-qt/qtcore:5
dev-qt/qtgui:5
dev-qt/qtwidgets:5
+ kde-frameworks/kauth:5
kde-frameworks/kconfig:5
kde-frameworks/kconfigwidgets:5
kde-frameworks/kcoreaddons:5
- kde-frameworks/kdelibs4support:5
kde-frameworks/ki18n:5
kde-frameworks/kio:5
kde-frameworks/kitemviews:5
@@ -32,16 +31,11 @@ COMMON_DEPEND="
kde-frameworks/kxmlgui:5
kde-frameworks/threadweaver:5
"
-RDEPEND="${COMMON_DEPEND}
+RDEPEND="${DEPEND}
app-portage/gentoolkit
kde-apps/kompare:5
kde-plasma/kde-cli-tools:5[kdesu]
"
-DEPEND="${COMMON_DEPEND}
- kde-frameworks/extra-cmake-modules:5
-"
-
-PATCHES=( "${FILESDIR}/${P}-qt-5.11.patch" )
pkg_postinst() {
if ! has_version app-admin/logrotate ; then
@@ -49,11 +43,5 @@ pkg_postinst() {
elog "portage's summary.log size reasonable to view in the history page."
fi
- xdg_mimeinfo_database_update
- xdg_desktop_database_update
-}
-
-pkg_postrm() {
- xdg_mimeinfo_database_update
- xdg_desktop_database_update
+ ecm_pkg_postinst
}
diff --git a/app-portage/kuroo/kuroo-9999.ebuild b/app-portage/kuroo/kuroo-9999.ebuild
index 6a24d09cce3a..c61ccf8e1e7a 100644
--- a/app-portage/kuroo/kuroo-9999.ebuild
+++ b/app-portage/kuroo/kuroo-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -10,8 +10,8 @@ DESCRIPTION="Graphical Portage frontend based on KDE Frameworks"
HOMEPAGE="https://sourceforge.net/projects/kuroo/"
LICENSE="GPL-2"
-KEYWORDS=""
SLOT="0"
+KEYWORDS=""
IUSE=""
DEPEND="
@@ -22,7 +22,6 @@ DEPEND="
kde-frameworks/kconfig:5
kde-frameworks/kconfigwidgets:5
kde-frameworks/kcoreaddons:5
- kde-frameworks/kdelibs4support:5
kde-frameworks/ki18n:5
kde-frameworks/kio:5
kde-frameworks/kitemviews:5
diff --git a/app-shells/Manifest.gz b/app-shells/Manifest.gz
index 5d2abcc05351..f0ec39efaa7d 100644
Binary files a/app-shells/Manifest.gz and b/app-shells/Manifest.gz differ
diff --git a/app-shells/fzf/Manifest b/app-shells/fzf/Manifest
index bacd6fe55799..d62810d939d6 100644
--- a/app-shells/fzf/Manifest
+++ b/app-shells/fzf/Manifest
@@ -1,48 +1,25 @@
-AUX fzf-0.21.0-makefile.patch 584 BLAKE2B 314673211be6170b0afc0d95ffa49f78afbc2bc2ca99295b109652b5d03f4664cbbef707dcd04ffbba4fd0e0ff21e54680fadc3f4b4ca34fdf950439e30974d4 SHA512 ca42041bf35405b07c9d9dda2b67590f22bfe4a12bba7116a7d138f730b288c916bd41df3302f9401cc46e03ddda5ec36a260b9a4b977f2eafd1d48ea3dc288f
-DIST fzf-0.21.0.tar.gz 161819 BLAKE2B 2da6b62425e88c10fa8d3ce3b7d2d25c67a9bd99bf3c402a8e0c84e567f931393fb914e365d0840d4a21409b06b6c76b7f622b68fe99fa5edd9fba8817eefea7 SHA512 8c3b7eb14ac98b386c26bd6621c54a27e904985f2e87c37ae8f31c3596196f32a817be17aa5e7dd399757cb90b5f25c35ce4a240453eb28f7d1d2fd837d8900d
-DIST fzf-0.21.1.tar.gz 163978 BLAKE2B 2f05379049229ca01570b3a58bbcaeab48f85330a556efccca2a19b6fbc80da160dd6cada27d35c3fbac3983e71141f408069e70916663aa3b5f40ed5ad22165 SHA512 db816446a2d562148f7bfe4fc99696e0786d4acfe021ba9bf31344c81219b8a61cae03ec7d4b279ab3dba9ca93fc883e655fc71a750fb6f1905612db071ac831
-DIST fzf-0.22.0.tar.gz 168483 BLAKE2B 0be859b9b5b0f4990273e1254b2530f0d651ea612af12a690c570b0fcfbdc23e3b1df8356aaa6bc3d9d042c3cf6c87fc35efe6becdc992bdbcb1b94695961b42 SHA512 003b187c93f0ab2e8a1adbd4eb9586e05e12fb9a86e445ac8ff48ba391ae16f104d60d18934bb46765537d5007035f549c15d6970c901f72813d55001d3bc6e5
DIST fzf-0.24.0.tar.gz 173438 BLAKE2B bb990ea3f819ae83c13e71ff2b2e8f312b532f634375a137178afca943defe20177a3ec6751acd92debfa434fd02d1ebc24901cc40edf63f016f4cee97f2b856 SHA512 0746aee0542574488ee17dbc86618a74a01aa2d7e9042219db37112584f74be7e1686494bd7e3307f161b480053496a58cac18c67a6eec7e2a992f5dea2569a0
-DIST github.com%2F!d!a!t!a-!d!o!g%2Fgo-sqlmock%2F@v%2Fv1.3.3.mod 38 BLAKE2B eb94b6f6f4bf332f916cb642fae50486c6ad9f6a7aa1bb57aade3ed640bc98236ae167d30c140c106cee0ada737eca6bdf54d36bcab0751a940f283f55f08c5c SHA512 43bc64732c4ca2ff23bb09cd67f002b05a1b68963116fb42cf9bd60ac8dade8b2efa1cab798217a73b221ea86fb4e219e36912ffe338c7bd505f2a877be05c09
+DIST fzf-0.24.4.tar.gz 175421 BLAKE2B 8c06f6abb2e8a8a407f36e613efc084d63cc9797bb8c076c7d9a497b52b86865243b3cf3e80147cd2db0f6a98e850a28dc58dc949109a152ca6adf330dd41ff1 SHA512 348cc000b4e28054bff56a37171ef4dd7ac22c7c292c19c3c0b95f3d30856b443887447604e1e38cfd71b421a22c1135a13cb40c78e5b34d477acaa3dcadb821
DIST github.com%2Fgdamore%2Fencoding%2F@v%2Fv1.0.0.mod 77 BLAKE2B 1b81c4c20a890027242b50f1566f4dfdaf120ee26d3dc56d0c2b6465df2ba79b208289eb40c3d7b666a4e7e874210f59aea545d5125c9a55c5597a3ca7f37feb SHA512 fb153c4e481c073133f0c933c67eba8a1f160ab146921f2c77125b6ff5c348cea57e3a5701a557c8db2212d32e3cba1c09b9509210660c17b66c2a45ba97cb75
DIST github.com%2Fgdamore%2Fencoding%2F@v%2Fv1.0.0.zip 19867 BLAKE2B a772206ce6dc48b32d7125a25b26694325d367ebcbad85466b2e6cfdb9fc9f0e08b98b7ecede5397344e5f7e623c4c76edcf69dcee99917adccf5b31aad80bf8 SHA512 127767c725e376b43fe4e2003ddc12fe89693d6d7e52b01e6d47d73fd04496decc0fd60b64c7a65303428e00a52ece1848610ea35231789a814187ef8503bee3
-DIST github.com%2Fgdamore%2Ftcell%2F@v%2Fv1.3.0.mod 250 BLAKE2B 27970513f459c49bf9bccb001157a605c14e5546d6459e3f6e2bb3851cd8fcffefd12fb2f6f918c01a06c6aede2532656d809b80b46ef4dccb838fd40bef7930 SHA512 7fdc52fea1b91ab1c81f426948f7153c0c16cfcf1f79c64a695b62f5195f25468b08c4e1b2358ab834c94efd7b9ab9a2edddf1b00ee22ea5454b46cee19302df
-DIST github.com%2Fgdamore%2Ftcell%2F@v%2Fv1.3.0.zip 219885 BLAKE2B 1a8e3a5a8543b871d30c9fec272a50adac9755de8945cfc0ce553e7163e942d6a1ffd22b4e2de6d8e24785d906d86ec2f18afae04d27e3065115ca5436064e85 SHA512 69c17dbdf99d75b54ef71fa2c856a72b24a50cec0a34d8b99ce3bff01d32c6f325bb1e8dd747e3d448ba73fd5af66c1cc1f6042b0b12e292441234e7ed928658
DIST github.com%2Fgdamore%2Ftcell%2F@v%2Fv1.4.0.mod 250 BLAKE2B 46093e9211011e814962ba2eafec4392948f185d27a202a8b626e16299e3a3fa4554a604933ceab584b27cca2b7a6b1f51d4e5fe10d673e875e38eca08de64ec SHA512 412dee57c525bd5a3c0ce9c482e7933814758e36ebb226a16392e648f57e280485f86e30f17be2339eed427b52e4b0b601401503d0bd324c7fa874e2fcba2b60
DIST github.com%2Fgdamore%2Ftcell%2F@v%2Fv1.4.0.zip 226363 BLAKE2B e690c6673285d12ffbf0d3ee6ff39f0bb1d072c872767c709150ef34b8ea40f0c8adc8196388a704126596051c3e1b722aae96fa54ee2baccdbca4f7683316ba SHA512 5fdd7b7b3b2826de6142d2dc0e6b19372636c4442c8878925f8c2af8bdfd2eef3c0cdbe331d0889345eb1e5a1d8c04ac80b3e46be7203d2475df86e04819af80
-DIST github.com%2Flucasb-eyer%2Fgo-colorful%2F@v%2Fv1.0.2.mod 98 BLAKE2B 074cd6d5ef6f25ec043afc4f23272f5fad1d7bf100e75122f85c49ee93fc3c6205c72a1e5b4227ca45f3267be1b2001e743b51e54ca5f11302c2610e93630858 SHA512 f7ddb2f6ef35b65ae4a9106e31cbbbd08a7d011d3d9d5827445bf35ec0243041c3e4881a850161134d62ff822610d3aeeab2941472dc7ff0d664edabf2ec4eb9
-DIST github.com%2Flucasb-eyer%2Fgo-colorful%2F@v%2Fv1.0.2.zip 442733 BLAKE2B 17af8168c2253f09f1ff15c5d78359bd8449c84027b10594eb5878fbba0ed2ecb250b34809693ab75869ab02d7677f874029e85ed352295896f9658293ecf4ea SHA512 b1515c6fce781a653025c41ef164ca2a625879b2f7ba1349c470cb9afab9b92b173a89513bf601ef7dcf53e0665010a12d44311f75c9282c244d58a154af781b
DIST github.com%2Flucasb-eyer%2Fgo-colorful%2F@v%2Fv1.0.3.mod 51 BLAKE2B be532e33c9a0e83b9d0b760b21d97ac83850299adb329f754f31e4b46dc7fb7a7157d2a41cdc258924ef8ee5c111a95ac3b0037d749cc936e1988a46612522cd SHA512 270b19446ac9a396f5ce7a000873928a44edb1457f86d294971dae08be37cd64ddb8edc0293e100ee60d56c504851aa69ab11db0b4cfd46649c5f79459e40011
DIST github.com%2Flucasb-eyer%2Fgo-colorful%2F@v%2Fv1.0.3.zip 442291 BLAKE2B 02ee4982a588e0fd1575206340bd97663147459664a2942edf151c4aec2bd20da83984c68c76e1c505c1ef930b77f934a8210f6c0ca106a0c0c91ff63733b92d SHA512 8e275955eb9e5034c155c6e469e2a3117bee30fbe42e8ae394f496b83f473a1568847707707716dd5a3c57dd0e0a4bb4f4cc9af04940218ce24420493e923f14
DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.mod 104 BLAKE2B a8f54d5566d54ac27763dd535705d64dddd862f32d23f234b1ffbf759cbf4aa16886c90a96198ae2f4c0d0bc892932f1b8244e8ff0f8150bb87123947d734016 SHA512 7bd9f6a38aa9a16c3569142164389d1c4046170f66b5e9044f7aaa3192e9d2e2ccec486e3bc7fbac868c9693b6d333068c1a34ccd9e79dec1746a86348951503
DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.zip 8902 BLAKE2B 7257687403b9f8f066147fdd4ee1bec7e4b02cfd3fddda8349a89d9b9ea5b93d9bef61280ed48d68adac4dfed7e382ee96886aa0d65d85406fb93dc6fe0c53b1 SHA512 79ba14a04838c509500e6098553e8aadcd7105445387160a8aa1a6d7b0e70f0e807c99036c31faf51920544da2156195174c8530e317a72728719cb0a9a66098
-DIST github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.4.mod 37 BLAKE2B f36ba4b667bc5bebbf49062ee5be234891ecc0a2be075c7bf57f5e39ee7fa2657d6bc086ba9a89728468ddd0623d27edb3c357ba4e91f79563bc9747d1d9ae63 SHA512 b891712f639a850e41582c15bcb384a985fad4f8aa86ce2d3f4d2554354aa1a9619667f60837a8280f869fc07dd58dc676c222bac23aaa5b2b00c06284b2f475
-DIST github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.4.zip 22344 BLAKE2B 9dcfe0ef5fb4f7e493f29ed3e5edc8ef2744351a4e2a5b70f5a8931b503925ed58b5f5f58e3512fe5fb5fb8d2e7bd1598037f29dac4520e7d966f60ce5f2d307 SHA512 fb2bd143a0eb1be1faacc0069ec8c2d53b16b6969e6c4dd7ae4802f16606a80ff1c362712f0836b97f1453df468e7e12bb5dfabf9161436fbe9b87231f593068
DIST github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.7.mod 45 BLAKE2B a7d3b1ffaf20b96cc98161ea6756d62d8380e7557859606dc7975b3de91a2d4142932d5008caf40b41d8ff2ac1ff33f672dbfac351f3e518922a036d7c116a93 SHA512 0cfd4101dd8ed90f80b7f4ce2928cd322b93855764abae65d66c5ff9888a7c8aec6ee6581c7f05d1c80db5c78003ee2afc8537fda8a3855e2349bfb8267aba61
-DIST github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.8.mod 45 BLAKE2B a7d3b1ffaf20b96cc98161ea6756d62d8380e7557859606dc7975b3de91a2d4142932d5008caf40b41d8ff2ac1ff33f672dbfac351f3e518922a036d7c116a93 SHA512 0cfd4101dd8ed90f80b7f4ce2928cd322b93855764abae65d66c5ff9888a7c8aec6ee6581c7f05d1c80db5c78003ee2afc8537fda8a3855e2349bfb8267aba61
-DIST github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.8.zip 19769 BLAKE2B 0e0f4d4ad5d19d5a0c7ffec0007cb04d9703c8d27f90db5f5c5a367477bdff68feb50278ce3d9f01be1b6e44f579c15e9f65a88b0e9bfb83b4ad4beac6a62ca3 SHA512 e34dcc87f0141e505d455ef9ccb83c11fb0d4625bdef6f30ed3ed21957dc4356cbcd370b005c2c9aac25763e36b367866690682c0bb4ae4cab24b799e70f2b99
DIST github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.9.mod 45 BLAKE2B a7d3b1ffaf20b96cc98161ea6756d62d8380e7557859606dc7975b3de91a2d4142932d5008caf40b41d8ff2ac1ff33f672dbfac351f3e518922a036d7c116a93 SHA512 0cfd4101dd8ed90f80b7f4ce2928cd322b93855764abae65d66c5ff9888a7c8aec6ee6581c7f05d1c80db5c78003ee2afc8537fda8a3855e2349bfb8267aba61
DIST github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.9.zip 20005 BLAKE2B c0f71323efd262296b78867d2b387a74491cfae3f4498e0dd22c036b20dd6fc1b6569171eebf267effd140ec009527fa5ccbcedda4f8cebab2679582766331ea SHA512 fad08292597cbd4a359e06f85bc7cc37b3d3d84b8046e47828259e36872063069c4ab17b7c89f2a5de4b5d0ab1ca5cc66cc515847a7887339a3a04b5f44e3c92
DIST github.com%2Fmattn%2Fgo-shellwords%2F@v%2Fv1.0.10.mod 47 BLAKE2B 4a848f4f2e5cc615dfc3fc62a9523eb7b3d79244393ce8203978051a34f981b0219f13f10bbae5169e03d919404f0ed6502b39c536218f8c8c8a5492561c1112 SHA512 c1a6d910b914ceef7ffea53c61f2225ebffeba2fc87c290aebdb739bf520494e35fef046eb9ced4fc9a3767523efefcce41ef5026fe11bad97c005b8e55d96f8
DIST github.com%2Fmattn%2Fgo-shellwords%2F@v%2Fv1.0.10.zip 7653 BLAKE2B 634fa4a231f31f291e49731e9a5e5d57aa289c86ec8c8fe879e6d03a28291dac034547b6bcc239539cf67f36d6e6e6990bd4e03a92621ecdf01ec899e1c03325 SHA512 075011dfc750263fdc03e80c69feaea71db12c9af8c99b49ebb35c494f5e3ac5a4faab3bdc1530322ea38ff3eb2671f0a3871097dea918f736f757e50cb05b4f
-DIST github.com%2Fmattn%2Fgo-shellwords%2F@v%2Fv1.0.9.mod 47 BLAKE2B 4a848f4f2e5cc615dfc3fc62a9523eb7b3d79244393ce8203978051a34f981b0219f13f10bbae5169e03d919404f0ed6502b39c536218f8c8c8a5492561c1112 SHA512 c1a6d910b914ceef7ffea53c61f2225ebffeba2fc87c290aebdb739bf520494e35fef046eb9ced4fc9a3767523efefcce41ef5026fe11bad97c005b8e55d96f8
-DIST github.com%2Fmattn%2Fgo-shellwords%2F@v%2Fv1.0.9.zip 8150 BLAKE2B 50fbd50001b69238741ba79fc1021387ebdfcfe54fb4853c0e3c2c551d5e427b4311d9fa2062860fb26e42573367442ae58446cb8823f3fabca8228d9df47288 SHA512 896aed87f7b0c4c30c2e8e37e3cd290cd6bc1a427a4ea03c7189bb59cae8a4447754b20e51e6bb9002245365cc5c03ae019e7090d8e08a028c40ee080e997c6d
-DIST github.com%2Fsaracen%2Fwalker%2F@v%2Fv0.0.0-20191201085201-324a081bae7e.mod 164 BLAKE2B c6b2db494ca0da1bb96078d7fd39d30237562fe19609be4436df562afed900c63fc3cee28198a27327fd0f64f1e2bab529ac38ca57d51df48ba1ed6e5d0369a1 SHA512 22f6ea96071109063fd7bceb7295a56bc4da40d603cee238bd969b95dc74b4c6a93a3a88b8474a83dc9082ddc4fb0607e987e79ab7c1f3839578bc6c998936d6
-DIST github.com%2Fsaracen%2Fwalker%2F@v%2Fv0.0.0-20191201085201-324a081bae7e.zip 18356 BLAKE2B 9bb0230c260701c5294153c7a0b98e1886e12110289395e6e7a9bb613682e0036bc5e2156372b9b1e5cdc34b8e5cb50e1526e7e6350e5b7d3bdc17428bd70d46 SHA512 17969e66c37a990b2c761dfd8b93a3fa51d12be201e4576e35d805e5aa7c0d75a9f8bfb826f55d6ce5fae18c7d2bf11a7952f6d9940326003db5fde4954a905a
DIST github.com%2Fsaracen%2Fwalker%2F@v%2Fv0.1.1.mod 104 BLAKE2B dd83516b0472a51d68d638c72db945b5640bae9fb4a81687b7c406f7bb67eb086161b99fd7f69ff13476b352c90ced4906b7a30db52a6adfbb3c862a1185a37d SHA512 21f6fea86dafb4b32ef61014700a7563e6c273fa8c23c6ce0a8776408511a8b4ab2d3391e21628054be2a94062f72aa7e9cc2f133b7ba1b2b10a758dce783d43
DIST github.com%2Fsaracen%2Fwalker%2F@v%2Fv0.1.1.zip 16956 BLAKE2B e948f2d90376ac6a14e890d4e39b035e0cfa00eec384977126adcad7e8064e6d1da57b709ac1943b67a7d94b9aca71b276effdcce1866dfa026fb5c984a6d806 SHA512 05597cd8812d21477152a021a982405d18e65884ca5658bca43bc4c933eccdc9450ec9d57a3dc6a39da72a7a7a821f5c953cbd2b35c6e04f1d757df1cb0be453
DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod 88 BLAKE2B aec7d0eea1278eb3d1568d5bfb4041267501ad14457ebfcbdbc5fe21473170b8616ca4028f52af2edbfd85922cbe04540b4b0df7f69f63197698143cc5557a7a SHA512 2df49895053b36fed7ea905aa73f86568fbafd79ff0a7976679d8c77cf15025129435d9dbfd89367b611b1aadbea4f4bd1835eb4efa9ea702466e443638d379e
DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.zip 1776515 BLAKE2B 5833fc2a16dec541a1362c9df7c02abe04a54e92e04eaafd5767c1a923e3a9cf90bc8d8ae0ee3c60b9745f5f0e3234350be1cafd984052353594d6e6b9fba041 SHA512 a1418dbc50d1e41495fd68ccba2ac84fed5edfd3e613c68850068afcce1136c3456e99d226674908a77c9648f16d7861edacb70afebcf3a7e73ea3dcdf8edbe7
-DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200128174031-69ecbb4d6d5d.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
-DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200128174031-69ecbb4d6d5d.zip 1859245 BLAKE2B e33051036e462284bf672b92f35863014e4740917c856eaf5aeaea6530dc5ff77fcbac4d797aeb8131cd013bac525e502e582f7139ccea4d3c226fdcff83ba0b SHA512 7c0734618d52ac2f0e2fe9245fc15208d13f05e6ab3e89b4a76bbb94e2895376f3d5a7d71d36a020c8861a0ed94a344a534f4d3b6bd9003d153e4e4b80abaf05
DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20201016220609-9e8e0b390897.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20201016220609-9e8e0b390897.zip 1878103 BLAKE2B 6fd01482411bd53a283186c07bc0b84b11186b0b1ed95b385389d967095fd99924059c3b02fb66bd5392e2c53da2c8c91dc0b41c0507be7a8ca9149a17bfc365 SHA512 4290ed77e7ccfd512faccf2b9a07ba2c8b3770646436f5318cb93b549f798dde3188735595100be1ca4964af378083a662edb872b99e6e7febeb2b6cfd1eb7e8
DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod 119 BLAKE2B e042b2716739483252c3340451b2c3c7b421fdf8d6b3e0333e979802fca66159596982ea63a24b6a64457b2757a0ad24cbb9ea032bab4c5377edf84a3ea18b97 SHA512 26b6c92eecd2208967336d4d23f8a71f77f9a73643ad1e5cd84dee36b2f626fffc806e4dd33acc284831a0961e2b363d898a747903235945fbfb665c5b4d5ef2
-DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190620200207-3b0461eec859.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
-DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190620200207-3b0461eec859.zip 1421786 BLAKE2B 15782d84b4fd3576df5ae0c6540880b3a87f5ed47d66527ad88bbdd5e96cd1b0fb321b896b686de67d4518d3c6eecd008f1e49f48fa29df962a4d01f6e08653f SHA512 e79353b8f6b6866a14236eed278aae32ccb02eed040a557dda219cd96eecdc0174a8ac29a5509a33f6f0f9e5aa16f7d1c6861167d9798a5cb1eb01aabcee56f2
-DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
-DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
-DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.zip 26635 BLAKE2B a464a4ad04b36e50cfe966e6e6dc299c0f8b45d0f4198ba64483bb70ab815d033cec5cde60753b76dd1fbb16fed087b41179100a2002b0a61cd4a08f9de779fc SHA512 ae6f29d5f7790b37d1722d65f31708670bf19f429c60b2f6633756ecd40e47c1fab40fc128e0d70b3b6ed0ba47ce5f970ce5f4e55b8f1fa407d2efee7444b646
DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20200317015054-43a5402ce75a.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20201020160332-67f06af15bc9.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20201020160332-67f06af15bc9.zip 28627 BLAKE2B 616de462c5c7d1ad7d5b792caf2e3c9d45c5095d723dace2038e012672055b6c052a043414db7b87b26f43c1688d8c353fc63b666ebd9569f832fc08f7ac99ca SHA512 eda82aa21a23db9ccdf960f6fb0583223839623643525410764e5684d8551e725c3bf76fcf68a4b4ef1d1fb48505d248b9600c736e0e9497d9efd4bfe5bd059e
@@ -51,22 +28,13 @@ DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190412213103-97732733099d.mod 33 BLAKE
DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190626150813-e07cf5db2756.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190626150813-e07cf5db2756.zip 1810550 BLAKE2B e0bcc6235d88e1728797c178d10261e851b18814ecad679674349596f5fc0aa2784b0b4fee440488ffe8188b47dbf8474e5a5078b1220188ac6c25b0c371068d SHA512 98442115bb11ccc8061eb7c39e2e7efcc809d45ed6051456d6ec5439e20823b4b4d2ce16f4ba02530b58f74e9c1b9f3bf0d3dd0b4327b1b8158f395022ab2d80
DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200116001909-b77594299b42.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200202164722-d101bd2416d5.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200202164722-d101bd2416d5.zip 1916427 BLAKE2B e6030582f47eb0fc2049d9fbf73b03afae4d95a506988d9538d1f094a27ae63c20d5a5ce79d63f09cdd8c0bdf80e80c6de498960c0173e170dd31c8060f89f30 SHA512 62ce13928c6379717545387d68beba5106ef3b745ae7b458ea457889e5c6d186bf96dbbcf8cf4e81f9e6180260b8c60ca34a4bc58c434d7e9150d51fc72540b5
DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201026173827-119d4633e4d1.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201026173827-119d4633e4d1.zip 1496749 BLAKE2B 6f665574261f31847b1fafb76bf05483808610124bdf9bb22b976b93ef0d722a8cfd4892f48320ee0e7404b0876f65c37d945ce4466547d692d6fc00f4802c63 SHA512 604c6790250b7d05360cbd341cde88fc5c2a499bae119d51de5b073df0704089abd3b1536c5ef7008db7a5ef6dd8512824e77553ee8216134a2daa6cacb357c2
DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod 25 BLAKE2B 31009af0fdcd0f8730c9985287e6e364ec4e5183e57e92560dbc80a2010eced51b8a90f01a82b49384268c8a0adbf69d179c205d3f68e0eb459169d2ea9528f0 SHA512 ca081ef7cccd7bbedc6843fbe0c452352661a07e1298cd02ff338ed79d807c6401d613a3cf20011189d2f98a794ffa410547b3e352eb58a6f0a84822285d391d
DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.zip 6349244 BLAKE2B 0aa464ac7b7d17fa7ec0627b64cd2301ed4f2819f837807db7a55725950dacb40be899b5148b07ea31b51530818edcccc6444a9800755e1d369ba8f1bce949b0 SHA512 982d78f580a7eac99a0c51e6f1fd2b2c3b91f56cd5e2b96fe960510049f7daf5915264f73f55f05675eee232a52998f9667fa84a9ccba15ed7819e4c93f583a7
-DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.mod 88 BLAKE2B f3dd520e0e4e9b57feab62ecabb9169f37f1ce49b2846b949f9266f807767d38f55e4aa8ea006229c6f81cfc1e2c9dc0d1e3c186235e416dfb90fe7e04751d07 SHA512 d9361afb453b10c9d02787568ec33ea4c97a115899c6b3d1a1246547a749244e9218475ae5ae9f741d9b355260d2d3c33852673e805fcdd5f26f3ca40f035884
-DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.zip 7430601 BLAKE2B d2403817cb6b7e32462b90995412c4e63cfdeaf3710fc9386f4b708e0ae2be9593649e923f0d844dc4420b177e42e7abfa7657e03e27fa08be9e98d76da4cb9c SHA512 8d8dad296f1497f352e94c416711dbb1f468901a3fd2dfd0a9c67f2d59306ea611d77917289521d2845f6958f571f6c3fe2d3dab289524d8145489d5b386fbaa
DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.mod 97 BLAKE2B ed93c1d43f199d8cbd43cb25edac5de569cb78773d7f3232d59a0a4de6d174c5c100db2b02ca42c51f3e17e0f5e781ba9b5641a512b0dc72dcfaa5f6bd7d451b SHA512 f3f68808ccf5223453f765f59db1ef551b2130069eb83518878961c2d4a2044f9049f8d49df6e67699fcd2645cf90b84d35626590b2cfbca302fcf0eac76dc8b
DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.zip 8010747 BLAKE2B 78d999113a75f84966ffd23356e7cf60811b614754936851f197e547657cb6ff40acd074593c9cb6a2ae39ba625b36731c2fc0bc4b2b5ff68a2d377a6c7192db SHA512 024719305765ca737b225fec6268f84fc4c7d17c04e31eadfacafbb24a5f30af61920f4633e95d74dd2a266de40d1d2d13587881a3c22829ffeafb01fd75959f
DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0
-DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191011211836-4c025a95b26e.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
-DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191011211836-4c025a95b26e.zip 2877934 BLAKE2B 193ec7c3e8b82001b06f630dbda8afb9383ac66d7a23fdfe27414f91a2f2e17490b98605023a8a990f5f9fc5f10144fd01b1854fdb1a39d608cd305b0243dceb SHA512 553de87d4a0fdf45e1ce5128ee704ef92c23d0dce1182671c80e324c0f0ef680732bd82b02d8d202d2c1ae7d4d1bb61a944b60d92d0f99f716a5dcc09ea4701d
-DIST golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20190717185122-a985d3407aa7.mod 37 BLAKE2B 7449be81e1998a6439070de1a0ddf5bfd1e4971c90c2e358590a9c1c41128bfc1daa42a9bbc3709506df2442ec8420e6354343a095c837be46335c180083f28a SHA512 659d18a7a3a1be45ff6dc9e7475276b82ee7f11c47d39b0c237d7f872836a1dbdfff0902f21d6cd8093663997865da92e3e5a4acf1ad6129f972dc5e667b4f05
-EBUILD fzf-0.21.0.ebuild 6480 BLAKE2B fceb229edd21b31974dd52688cab359ad194dbf95ec631ad8bca5036e74f1c51f052701d75077d60d9c2f1aeeb8a4c0bc69c7cc02d2c26087037d3963eeb3e17 SHA512 3ef56e2bfd929308399ec9ff5877cbda95780ede4651a3b2380ddb0f9d35dc14120c94dda1b59443bd8677db3352fd5977e13ce7e4b2a3cd70a6e05a593a13f2
-EBUILD fzf-0.21.1.ebuild 4117 BLAKE2B a461ff1ccb839ca31ba79e72ac2825fdf8b5ba3d7246160c1e6581c71575a0e00d1fabb72984518b677d565bdb7cc6767455093e793af2281c2a264042bc2830 SHA512 050c6952140386b356e966c7600e300e805222d8adefe027c8b18422c4805841b17aa400d490d35a125ee494ce013f510e8b7ab259ae70ef7b5f90480e03ac83
-EBUILD fzf-0.22.0.ebuild 3863 BLAKE2B 03d8d3b3f8db71e5832b78ba0ff1ecd0569d3db75034157a6880df5fbe6c1605d2838d6fcefb438d6f99bc328cecc152652560374dde32e3df4a81cf5d3bc72f SHA512 8a6d1ca80495c9b0112d08ef1337f78011767b79fb1200245eb4371ce6b823f307e07b36d6a9c1a819138b872f2ac731d94b2c3249f3120ee532f1cdb177b9b5
-EBUILD fzf-0.24.0.ebuild 3725 BLAKE2B 9060e61f7f36ce9b23d6393b61105f35098f0c8ccaa66886414abf0f67058ad16c06b361c2807e2d3098512f3e3a9e720f49fc422a72c53f4e3382822bfcb462 SHA512 35b5bb588117961c26cf1dcbf688a6efb501118736dc8a449d651454ed4be5dfce6b35eba897642e31c3379917f03947a01b93b4e2fa96b01d0f93f42fecef32
-MISC metadata.xml 469 BLAKE2B df319557fdd83e04c5f471b9cc059d69058940fb61c36b44a8f3d6812ed84e41785d4cc4d3dba31c971d56c25838cad7aff7d5345dbe30f91a91bcfc18cbf889 SHA512 f7bdc23ef9995377b31f0f383b6f08245e2d42648a99c73dee623da7e5ff085546279d43033af00e2108166993476183617c0fe9e142c7d617a96c7700f25367
+EBUILD fzf-0.24.0.ebuild 3402 BLAKE2B 2ee9945e33370f3d120eef1941d9567c07f3462e589b49c5b9994c572a60ba212852246edd69c4439264e82a35a4f6e367dbbc342022650fd9af26c7f74acb49 SHA512 d3bdc6b66c7e99e4ca15acfaef78106e45da65ace9e3f306ad98665c9581ccd2791aa428e2d849203363da89ca0a187d707f68ad821a74defca3955f9e76c0c9
+EBUILD fzf-0.24.4.ebuild 3402 BLAKE2B d1dd4807695d3b53a8b103f65f736090da52d882a8c3060d0a878033c17d50c50764476c701db57c77b1a7bfe9089fcddc25d79fdf1265ae7bfe29175ec3eb3d SHA512 771227334e51ad4226ed2fa332870f91af52c044de2cd65f3f04c6d15eb10f8814ae97089033dca38f67b0a7d77a9dcd6afb6c573e449cd6a34d5758dc86bf8f
+MISC metadata.xml 575 BLAKE2B d6fa25687111f71da6dbe80c20e8387ef699e5d8022a903b1d8c60a3c0c58692166141fbf4bdc55f305e31a87aaa2a4dcaf0d4429f8b94dc71fdb9305675694c SHA512 14efc2b0b44734d0092306392b5dba2e0745dbdca7801fd6507f1739d5e6431fad622c15cb5b2f7d297abea58b54ebd09391ff9fd9b01c9778b067b9f88ff98b
diff --git a/app-shells/fzf/files/fzf-0.21.0-makefile.patch b/app-shells/fzf/files/fzf-0.21.0-makefile.patch
deleted file mode 100644
index 24653a7b8219..000000000000
--- a/app-shells/fzf/files/fzf-0.21.0-makefile.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/Makefile b/Makefile
-index 037b19b..60283d0 100644
---- a/Makefile
-+++ b/Makefile
-@@ -6,7 +6,7 @@ ROOT_DIR := $(shell dirname $(MAKEFILE))
- SOURCES := $(wildcard *.go src/*.go src/*/*.go) $(MAKEFILE)
-
- REVISION := $(shell git log -n 1 --pretty=format:%h -- $(SOURCES))
--BUILD_FLAGS := -a -ldflags "-X main.revision=$(REVISION) -w -extldflags=$(LDFLAGS)" -tags "$(TAGS)"
-+BUILD_FLAGS := -a -ldflags "-X main.revision=$(REVISION) -w '-extldflags=$(LDFLAGS)'" -tags "$(TAGS)"
-
- BINARY32 := fzf-$(GOOS)_386
- BINARY64 := fzf-$(GOOS)_amd64
diff --git a/app-shells/fzf/fzf-0.21.0.ebuild b/app-shells/fzf/fzf-0.21.0.ebuild
deleted file mode 100644
index 152023cd3d54..000000000000
--- a/app-shells/fzf/fzf-0.21.0.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit bash-completion-r1 go-module optfeature
-
-DESCRIPTION="A general-purpose command-line fuzzy finder, written in GoLang"
-HOMEPAGE="https://github.com/junegunn/fzf"
-
-EGO_SUM=(
- "github.com/DATA-DOG/go-sqlmock v1.3.3/go.mod h1:f/Ixk793poVmq4qj/V1dPUg2JEAKC73Q5eFN3EC/SaM="
- "github.com/gdamore/encoding v1.0.0 h1:+7OoQ1Bc6eTm5niUzBa0Ctsh6JbMW6Ra+YNuAtDBdko="
- "github.com/gdamore/encoding v1.0.0/go.mod h1:alR0ol34c49FCSBLjhosxzcPHQbf2trDkoo5dl+VrEg="
- "github.com/gdamore/tcell v1.3.0 h1:r35w0JBADPZCVQijYebl6YMWWtHRqVEGt7kL2eBADRM="
- "github.com/gdamore/tcell v1.3.0/go.mod h1:Hjvr+Ofd+gLglo7RYKxxnzCBmev3BzsS67MebKS4zMM="
- "github.com/lucasb-eyer/go-colorful v1.0.2 h1:mCMFu6PgSozg9tDNMMK3g18oJBX7oYGrC09mS6CXfO4="
- "github.com/lucasb-eyer/go-colorful v1.0.2/go.mod h1:0MS4r+7BZKSJ5mw4/S5MPN+qHFF1fYclkSPilDOKW0s="
- "github.com/lucasb-eyer/go-colorful v1.0.3 h1:QIbQXiugsb+q10B+MI+7DI1oQLdmnep86tWFlaaUAac="
- "github.com/lucasb-eyer/go-colorful v1.0.3/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0="
- "github.com/mattn/go-isatty v0.0.12 h1:wuysRhFDzyxgEmMf5xjvJ2M9dZoWAXNNr5LSBS7uHXY="
- "github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU="
- "github.com/mattn/go-runewidth v0.0.4 h1:2BvfKmzob6Bmd4YsL0zygOqfdFnK7GR4QL06Do4/p7Y="
- "github.com/mattn/go-runewidth v0.0.4/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU="
- "github.com/mattn/go-runewidth v0.0.8 h1:3tS41NlGYSmhhe/8fhGRzc+z3AYCw1Fe1WAyLuujKs0="
- "github.com/mattn/go-runewidth v0.0.8/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI="
- "github.com/mattn/go-shellwords v1.0.9 h1:eaB5JspOwiKKcHdqcjbfe5lA9cNn/4NRRtddXJCimqk="
- "github.com/mattn/go-shellwords v1.0.9/go.mod h1:EZzvwXDESEeg03EKmM+RmDnNOPKG4lLtQsUlTZDWQ8Y="
- "github.com/saracen/walker v0.0.0-20191201085201-324a081bae7e h1:NO86zOn5ScSKW8wRbMaSIcjDZUFpWdCQQnexRqZ9h9A="
- "github.com/saracen/walker v0.0.0-20191201085201-324a081bae7e/go.mod h1:G0Z6yVPru183i2MuRJx1DcR4dgIZtLcTdaaE/pC1BJU="
- "golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2 h1:VklqNMn3ovrHsnt90PveolxSbWFaJdECFbxSq0Mqo2M="
- "golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w="
- "golang.org/x/crypto v0.0.0-20200128174031-69ecbb4d6d5d h1:9FCpayM9Egr1baVnV1SX0H87m+XB0B8S0hAMi99X/3U="
- "golang.org/x/crypto v0.0.0-20200128174031-69ecbb4d6d5d/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto="
- "golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg="
- "golang.org/x/net v0.0.0-20190620200207-3b0461eec859 h1:R/3boaszxrf1GEUWTVDzSKVwLmSJpwZ1yqXm8j0v2QI="
- "golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s="
- "golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM="
- "golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e h1:vcxGaoTs7kV8m5Np9uUNQin4BrLOthgV7252N8V+FwY="
- "golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM="
- "golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY="
- "golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs="
- "golang.org/x/sys v0.0.0-20190626150813-e07cf5db2756 h1:9nuHUbU8dRnRRfj9KjWUVrJeoexdbeMjttk6Oh1rD10="
- "golang.org/x/sys v0.0.0-20190626150813-e07cf5db2756/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs="
- "golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs="
- "golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5 h1:LfCXLvNmTYH9kEmVgqbnsWfruoXZIrh4YBgqVHtDvw0="
- "golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs="
- "golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg="
- "golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ="
- "golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs="
- "golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk="
- "golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ="
- "golang.org/x/tools v0.0.0-20191011211836-4c025a95b26e h1:1o2bDs9pCd2xFhdwqJTrCIswAeEsn4h/PCNelWpfcsI="
- "golang.org/x/tools v0.0.0-20191011211836-4c025a95b26e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo="
- "golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0="
-)
-go-module_set_globals
-
-EGO_PN="github.com/junegunn/${PN}"
-SRC_URI="https://${EGO_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
- ${EGO_SUM_SRC_URI}"
-
-LICENSE="MIT BSD-with-disclosure"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-S="${WORKDIR}/${P/_/-}"
-
-src_prepare() {
- # Temporary fix for upstream building issue: https://github.com/junegunn/fzf/issues/1994
- eapply "${FILESDIR}"/${P}-makefile.patch
- eapply_user
-}
-
-src_install() {
- default
- # Install fzf binary
- dobin bin/*
-
- # Install TMUX utils
- dobin bin/${PN}-tmux
- doman man/man1/${PN}-tmux.1
-
- # Install Neovim plugin
- insinto /usr/share/nvim/runtime/plugin
- doins plugin/${PN}.vim
-
- # Install VIM plugin
- insinto /usr/share/vim/vimfiles/plugin
- doins plugin/${PN}.vim
-
- # Install zsh completion file and key-bindings
- insinto /usr/share/zsh/site-functions
- newins shell/completion.zsh _${PN}
-
- # Install bash completion file
- newbashcomp shell/completion.bash ${PN}
-
- # Install key-bindings for Fish, Zsh and Bash
- insinto /usr/share/fzf/
- newins shell/key-bindings.fish ${PN}.fish
- newins shell/key-bindings.zsh ${PN}.zsh
- newins shell/key-bindings.bash ${PN}.sh
-}
-
-pkg_postinst() {
- optfeature "bash-completion support" app-shells/bash-completion
- optfeature "fish-completion support" app-shells/fish
- optfeature "fzf plugin for vim" app-editors/vim
- optfeature "neovim support" app-editors/neovim
- optfeature "tmux support" app-misc/tmux
- optfeature "zsh-completion support" app-shells/zsh
- einfo ""
- einfo "To use the fzf key-binding for your shell, make sure to use"
- einfo "the right file for your shell from /usr/share/fzf/"
- einfo "For bash, add the following line to ~/.bashrc"
- einfo "# source /usr/share/fzf/fzf.sh"
- einfo ""
- einfo "Or symlink the fzf bash script"
- einfo "# ln -s /usr/share/fzf/fzf.sh /etc/bash/bashrc.d/fzf.sh"
-}
diff --git a/app-shells/fzf/fzf-0.21.1.ebuild b/app-shells/fzf/fzf-0.21.1.ebuild
deleted file mode 100644
index 54e6dff35dfa..000000000000
--- a/app-shells/fzf/fzf-0.21.1.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit bash-completion-r1 go-module
-
-DESCRIPTION="A general-purpose command-line fuzzy finder, written in GoLang"
-HOMEPAGE="https://github.com/junegunn/fzf"
-
-EGO_SUM=(
- "github.com/DATA-DOG/go-sqlmock v1.3.3/go.mod"
- "github.com/gdamore/encoding v1.0.0"
- "github.com/gdamore/encoding v1.0.0/go.mod"
- "github.com/gdamore/tcell v1.3.0"
- "github.com/gdamore/tcell v1.3.0/go.mod"
- "github.com/lucasb-eyer/go-colorful v1.0.2"
- "github.com/lucasb-eyer/go-colorful v1.0.2/go.mod"
- "github.com/lucasb-eyer/go-colorful v1.0.3"
- "github.com/lucasb-eyer/go-colorful v1.0.3/go.mod"
- "github.com/mattn/go-isatty v0.0.12"
- "github.com/mattn/go-isatty v0.0.12/go.mod"
- "github.com/mattn/go-runewidth v0.0.4"
- "github.com/mattn/go-runewidth v0.0.4/go.mod"
- "github.com/mattn/go-runewidth v0.0.8"
- "github.com/mattn/go-runewidth v0.0.8/go.mod"
- "github.com/mattn/go-shellwords v1.0.9"
- "github.com/mattn/go-shellwords v1.0.9/go.mod"
- "github.com/saracen/walker v0.0.0-20191201085201-324a081bae7e"
- "github.com/saracen/walker v0.0.0-20191201085201-324a081bae7e/go.mod"
- "golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2"
- "golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod"
- "golang.org/x/crypto v0.0.0-20200128174031-69ecbb4d6d5d"
- "golang.org/x/crypto v0.0.0-20200128174031-69ecbb4d6d5d/go.mod"
- "golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod"
- "golang.org/x/net v0.0.0-20190620200207-3b0461eec859"
- "golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod"
- "golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod"
- "golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e"
- "golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod"
- "golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod"
- "golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod"
- "golang.org/x/sys v0.0.0-20190626150813-e07cf5db2756"
- "golang.org/x/sys v0.0.0-20190626150813-e07cf5db2756/go.mod"
- "golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod"
- "golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5"
- "golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod"
- "golang.org/x/text v0.3.0"
- "golang.org/x/text v0.3.0/go.mod"
- "golang.org/x/text v0.3.2"
- "golang.org/x/text v0.3.2/go.mod"
- "golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod"
- "golang.org/x/tools v0.0.0-20191011211836-4c025a95b26e"
- "golang.org/x/tools v0.0.0-20191011211836-4c025a95b26e/go.mod"
- "golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod"
-)
-go-module_set_globals
-
-EGO_PN="github.com/junegunn/${PN}"
-SRC_URI="https://${EGO_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
- ${EGO_SUM_SRC_URI}"
-
-LICENSE="MIT BSD-with-disclosure"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-PATCHES=( ${FILESDIR}/${PN}-0.21.0-makefile.patch )
-
-src_install() {
- default
-
- # Install fzf binary
- dobin bin/${PN}
- doman man/man1/${PN}.1
-
- # Install TMUX utils
- dobin bin/${PN}-tmux
- doman man/man1/${PN}-tmux.1
-
- # Install Neovim plugin
- insinto /usr/share/nvim/runtime/plugin
- doins plugin/${PN}.vim
-
- # Install VIM plugin
- insinto /usr/share/vim/vimfiles/plugin
- doins plugin/${PN}.vim
-
- # Install bash completion file
- newbashcomp shell/completion.bash ${PN}
-
- # Install zsh completion file
- insinto /usr/share/zsh/site-functions
- newins shell/completion.zsh _${PN}
-
- # Install key-bindings for bash, fish and zsh
- insinto /usr/share/fzf
- doins shell/key-bindings.bash
- doins shell/key-bindings.fish
- doins shell/key-bindings.zsh
-}
-
-pkg_postinst() {
- if [[ -z "${REPLACING_VERSIONS}" ]]; then
- elog "To add fzf support to your shell, make sure to use the right file"
- elog "from /usr/share/fzf."
- elog
- elog "For bash, add the following line to ~/.bashrc:"
- elog
- elog " # source /usr/share/fzf/key-bindings.bash"
- elog
- elog "Or create a symlink:"
- elog
- elog " # ln -s /usr/share/fzf/key-bindings.bash /etc/bash/bashrc.d/fzf.bash"
- elog
- elog "Plugins for Vim and Neovim are installed to respective directories"
- elog "and will work out of the box."
- elog
- elog "For fzf support in tmux see fzf-tmux(1)."
- fi
-}
diff --git a/app-shells/fzf/fzf-0.24.0.ebuild b/app-shells/fzf/fzf-0.24.0.ebuild
index e0d2cf7f604b..b2573fddd82a 100644
--- a/app-shells/fzf/fzf-0.24.0.ebuild
+++ b/app-shells/fzf/fzf-0.24.0.ebuild
@@ -12,54 +12,56 @@ HOMEPAGE="https://github.com/junegunn/fzf"
MY_GIT_REV=0d5f862
EGO_SUM=(
- "github.com/gdamore/encoding v1.0.0"
- "github.com/gdamore/encoding v1.0.0/go.mod"
- "github.com/gdamore/tcell v1.4.0"
- "github.com/gdamore/tcell v1.4.0/go.mod"
- "github.com/lucasb-eyer/go-colorful v1.0.3"
- "github.com/lucasb-eyer/go-colorful v1.0.3/go.mod"
- "github.com/mattn/go-isatty v0.0.12"
- "github.com/mattn/go-isatty v0.0.12/go.mod"
- "github.com/mattn/go-runewidth v0.0.7/go.mod"
- "github.com/mattn/go-runewidth v0.0.9"
- "github.com/mattn/go-runewidth v0.0.9/go.mod"
- "github.com/mattn/go-shellwords v1.0.10"
- "github.com/mattn/go-shellwords v1.0.10/go.mod"
- "github.com/saracen/walker v0.1.1"
- "github.com/saracen/walker v0.1.1/go.mod"
- "golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2"
- "golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod"
- "golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897"
- "golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897/go.mod"
- "golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod"
- "golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod"
- "golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9"
- "golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod"
- "golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod"
- "golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod"
- "golang.org/x/sys v0.0.0-20190626150813-e07cf5db2756"
- "golang.org/x/sys v0.0.0-20190626150813-e07cf5db2756/go.mod"
- "golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod"
- "golang.org/x/sys v0.0.0-20201026173827-119d4633e4d1"
- "golang.org/x/sys v0.0.0-20201026173827-119d4633e4d1/go.mod"
- "golang.org/x/text v0.3.0"
- "golang.org/x/text v0.3.0/go.mod"
- "golang.org/x/text v0.3.3"
- "golang.org/x/text v0.3.3/go.mod"
- "golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod"
+ "github.com/gdamore/encoding v1.0.0"
+ "github.com/gdamore/encoding v1.0.0/go.mod"
+ "github.com/gdamore/tcell v1.4.0"
+ "github.com/gdamore/tcell v1.4.0/go.mod"
+ "github.com/lucasb-eyer/go-colorful v1.0.3"
+ "github.com/lucasb-eyer/go-colorful v1.0.3/go.mod"
+ "github.com/mattn/go-isatty v0.0.12"
+ "github.com/mattn/go-isatty v0.0.12/go.mod"
+ "github.com/mattn/go-runewidth v0.0.7/go.mod"
+ "github.com/mattn/go-runewidth v0.0.9"
+ "github.com/mattn/go-runewidth v0.0.9/go.mod"
+ "github.com/mattn/go-shellwords v1.0.10"
+ "github.com/mattn/go-shellwords v1.0.10/go.mod"
+ "github.com/saracen/walker v0.1.1"
+ "github.com/saracen/walker v0.1.1/go.mod"
+ "golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2"
+ "golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod"
+ "golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897"
+ "golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897/go.mod"
+ "golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod"
+ "golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod"
+ "golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9"
+ "golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod"
+ "golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod"
+ "golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod"
+ "golang.org/x/sys v0.0.0-20190626150813-e07cf5db2756"
+ "golang.org/x/sys v0.0.0-20190626150813-e07cf5db2756/go.mod"
+ "golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod"
+ "golang.org/x/sys v0.0.0-20201026173827-119d4633e4d1"
+ "golang.org/x/sys v0.0.0-20201026173827-119d4633e4d1/go.mod"
+ "golang.org/x/text v0.3.0"
+ "golang.org/x/text v0.3.0/go.mod"
+ "golang.org/x/text v0.3.3"
+ "golang.org/x/text v0.3.3/go.mod"
+ "golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod"
)
+
go-module_set_globals
-EGO_PN="github.com/junegunn/${PN}"
-SRC_URI="https://${EGO_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
- ${EGO_SUM_SRC_URI}"
+SRC_URI="
+ https://github.com/junegunn/fzf/archive/${PV}.tar.gz -> ${P}.tar.gz
+ ${EGO_SUM_SRC_URI}
+"
LICENSE="MIT BSD-with-disclosure"
SLOT="0"
KEYWORDS="~amd64 ~x86"
src_compile() {
- emake PREFIX=${EPREFIX}/usr VERSION=${PV} REVISION=${MY_GIT_REV} bin/${PN}
+ emake PREFIX="${EPREFIX}"/usr VERSION=${PV} REVISION=${MY_GIT_REV} bin/${PN}
}
src_install() {
@@ -87,18 +89,15 @@ src_install() {
}
pkg_postinst() {
- if [[ -z "${REPLACING_VERSIONS}" ]]; then
+ if [[ -z ${REPLACING_VERSIONS} ]]; then
elog "To add fzf support to your shell, make sure to use the right file"
elog "from /usr/share/fzf."
elog
elog "For bash, add the following line to ~/.bashrc:"
elog
+ elog " # source /usr/share/bash-completion/completions/fzf"
elog " # source /usr/share/fzf/key-bindings.bash"
elog
- elog "Or create a symlink:"
- elog
- elog " # ln -s /usr/share/fzf/key-bindings.bash /etc/bash/bashrc.d/fzf.bash"
- elog
elog "Plugins for Vim and Neovim are installed to respective directories"
elog "and will work out of the box."
elog
diff --git a/app-shells/fzf/fzf-0.22.0.ebuild b/app-shells/fzf/fzf-0.24.4.ebuild
similarity index 55%
rename from app-shells/fzf/fzf-0.22.0.ebuild
rename to app-shells/fzf/fzf-0.24.4.ebuild
index ede17a3ea609..9ed9b93f02fb 100644
--- a/app-shells/fzf/fzf-0.22.0.ebuild
+++ b/app-shells/fzf/fzf-0.24.4.ebuild
@@ -8,65 +8,63 @@ inherit bash-completion-r1 go-module
DESCRIPTION="A general-purpose command-line fuzzy finder, written in GoLang"
HOMEPAGE="https://github.com/junegunn/fzf"
+# For fancy versioning only. Bump on the next release!
+MY_GIT_REV=00a3610
+
EGO_SUM=(
- "github.com/DATA-DOG/go-sqlmock v1.3.3/go.mod"
"github.com/gdamore/encoding v1.0.0"
"github.com/gdamore/encoding v1.0.0/go.mod"
- "github.com/gdamore/tcell v1.3.0"
- "github.com/gdamore/tcell v1.3.0/go.mod"
- "github.com/lucasb-eyer/go-colorful v1.0.2"
- "github.com/lucasb-eyer/go-colorful v1.0.2/go.mod"
+ "github.com/gdamore/tcell v1.4.0"
+ "github.com/gdamore/tcell v1.4.0/go.mod"
"github.com/lucasb-eyer/go-colorful v1.0.3"
"github.com/lucasb-eyer/go-colorful v1.0.3/go.mod"
"github.com/mattn/go-isatty v0.0.12"
"github.com/mattn/go-isatty v0.0.12/go.mod"
- "github.com/mattn/go-runewidth v0.0.4"
- "github.com/mattn/go-runewidth v0.0.4/go.mod"
- "github.com/mattn/go-runewidth v0.0.8"
- "github.com/mattn/go-runewidth v0.0.8/go.mod"
- "github.com/mattn/go-shellwords v1.0.9"
- "github.com/mattn/go-shellwords v1.0.9/go.mod"
- "github.com/saracen/walker v0.0.0-20191201085201-324a081bae7e"
- "github.com/saracen/walker v0.0.0-20191201085201-324a081bae7e/go.mod"
+ "github.com/mattn/go-runewidth v0.0.7/go.mod"
+ "github.com/mattn/go-runewidth v0.0.9"
+ "github.com/mattn/go-runewidth v0.0.9/go.mod"
+ "github.com/mattn/go-shellwords v1.0.10"
+ "github.com/mattn/go-shellwords v1.0.10/go.mod"
+ "github.com/saracen/walker v0.1.1"
+ "github.com/saracen/walker v0.1.1/go.mod"
"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2"
"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod"
- "golang.org/x/crypto v0.0.0-20200128174031-69ecbb4d6d5d"
- "golang.org/x/crypto v0.0.0-20200128174031-69ecbb4d6d5d/go.mod"
+ "golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897"
+ "golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897/go.mod"
"golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod"
- "golang.org/x/net v0.0.0-20190620200207-3b0461eec859"
- "golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod"
- "golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod"
- "golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e"
- "golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod"
+ "golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod"
+ "golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9"
+ "golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod"
"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod"
"golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod"
"golang.org/x/sys v0.0.0-20190626150813-e07cf5db2756"
"golang.org/x/sys v0.0.0-20190626150813-e07cf5db2756/go.mod"
"golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod"
- "golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5"
- "golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod"
+ "golang.org/x/sys v0.0.0-20201026173827-119d4633e4d1"
+ "golang.org/x/sys v0.0.0-20201026173827-119d4633e4d1/go.mod"
"golang.org/x/text v0.3.0"
"golang.org/x/text v0.3.0/go.mod"
- "golang.org/x/text v0.3.2"
- "golang.org/x/text v0.3.2/go.mod"
+ "golang.org/x/text v0.3.3"
+ "golang.org/x/text v0.3.3/go.mod"
"golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod"
- "golang.org/x/tools v0.0.0-20191011211836-4c025a95b26e"
- "golang.org/x/tools v0.0.0-20191011211836-4c025a95b26e/go.mod"
- "golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod"
)
+
go-module_set_globals
-EGO_PN="github.com/junegunn/${PN}"
-SRC_URI="https://${EGO_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
- ${EGO_SUM_SRC_URI}"
+SRC_URI="
+ https://github.com/junegunn/fzf/archive/${PV}.tar.gz -> ${P}.tar.gz
+ ${EGO_SUM_SRC_URI}
+"
LICENSE="MIT BSD-with-disclosure"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-src_install() {
- default
+src_compile() {
+ emake PREFIX="${EPREFIX}"/usr VERSION=${PV} REVISION=${MY_GIT_REV} bin/${PN}
+}
+src_install() {
dobin bin/${PN}
doman man/man1/${PN}.1
@@ -91,18 +89,15 @@ src_install() {
}
pkg_postinst() {
- if [[ -z "${REPLACING_VERSIONS}" ]]; then
+ if [[ -z ${REPLACING_VERSIONS} ]]; then
elog "To add fzf support to your shell, make sure to use the right file"
elog "from /usr/share/fzf."
elog
elog "For bash, add the following line to ~/.bashrc:"
elog
+ elog " # source /usr/share/bash-completion/completions/fzf"
elog " # source /usr/share/fzf/key-bindings.bash"
elog
- elog "Or create a symlink:"
- elog
- elog " # ln -s /usr/share/fzf/key-bindings.bash /etc/bash/bashrc.d/fzf.bash"
- elog
elog "Plugins for Vim and Neovim are installed to respective directories"
elog "and will work out of the box."
elog
diff --git a/app-shells/fzf/metadata.xml b/app-shells/fzf/metadata.xml
index 901adef50a78..1ca0de6d4247 100644
--- a/app-shells/fzf/metadata.xml
+++ b/app-shells/fzf/metadata.xml
@@ -5,6 +5,10 @@
rafspiny@gmail.com
Raffaele Spinelli
+
+ telans@posteo.de
+ Theo Anderson
+
proxy-maint@gentoo.org
Proxy Maintainers
diff --git a/app-shells/mksh/Manifest b/app-shells/mksh/Manifest
index 6656454ec8d8..766ed40f4458 100644
--- a/app-shells/mksh/Manifest
+++ b/app-shells/mksh/Manifest
@@ -1,8 +1,10 @@
DIST mksh-R57.tgz 419604 BLAKE2B 11af09535ace3fdd982189fb7d7f3e5961776c3bdbf6b981f4f1506a66ebdbd893efb9aa50a5a36fd8b3b7bd3e149021aad154888dc81e0de29f41e91eeb583c SHA512 7d7fa557c17da4f1f62f82877a136439efb6d4f9fde52b2df39214db09868982e756df6e4fe83498f9013cbcf3252dc383b00ddfafaa4c9f143ffded7cd255b3
DIST mksh-R58.tgz 435617 BLAKE2B c5dd16effc8c08ac5f4a3986a14d786990b64d9da76b1b7d27de8a2dfbfa6fe172e9c58681df8f428a1e3548e54b5f6b037714a924f1053bfa3eedacc8eba173 SHA512 711351f8bbe8e44fcf9e7963f8e749938ec3ccb362fafd5350d44593841c2acb6d54ffa115dbb6b83c30865728a4c5274c05feedb063e293361e2830d263d80f
DIST mksh-R59.tgz 438821 BLAKE2B 4a737b47ab58a99707d93b680ec5474b7b6e190241778010879d0b20028f97bfca9b526c807ed0b37d03b6aef9a2eaf2506d73d1a00ac14b60b21e57791d8d4f SHA512 be5009ce8f02eab1392f95d7f85f5aad57b1445684b4fe8cd0284a7d79386170979303ef19f039fdbb53bd2a791f3e3603d2fe57e015fed4cb4a24ab710bcfbb
+DIST mksh-R59c.tgz 442736 BLAKE2B 4e1b6e6fc69b27d01e262a5622191515fa71d29e81a3f10fb60458542506874b49f60f9af1e28c1cd266c63c91e3287579ab6bda00c39b7388445b19c969fa22 SHA512 f56b6956f9e1dd88ddce2294301a5eb698050d9d4f49286fdcd8f9df8554eabbcc71d37e2bf3eb7234e3968a17231cc6de8aa7efbf17768834a90b14e8cdf340
EBUILD mksh-57-r2.ebuild 1634 BLAKE2B d52a0e303f6497382783afef1022ae09ae2a7a0a8d8cd070bbc23aaeb2f24c318540713fa476a267e8b91a074349065b5ed803b08b9de0beddd23d4f392d87d2 SHA512 2175d226c2e61da5dfa3d38930302e448971be92c6db47567edc82bf36a7db296db9e3fe0f6ff340d2b38c0f93e6d97ad5490eb269ed6f3c031685604f9f20b1
EBUILD mksh-58.ebuild 1592 BLAKE2B d446f1a29cd10d3d9d19f88eab9a37a3e2ef38eccaa210d4366156fb5498f4e7e2752ea8dd51ba52179072e206a88c974cbf4387ca32f6256683e6086b5098e6 SHA512 149e584f485bc1a49dafe104946a569ad6f167217773cf25d680864abfb000d11a028e1b89ae59148955eb7d6c4c20e9a2220962bef138d171c151269e270d59
-EBUILD mksh-59.ebuild 1611 BLAKE2B b46357f845cf618cc6066ddb8aedc5e344b056047cad4434ce733a0c0024c9ed4bde68c95ea98bc91a47af2e88336e91b8e12c40c12ec960f45da0b789afdd01 SHA512 50f881b316c31ebf86c121c5c961e91d53da47f2879dab4a9fd30597d65d3b71b986011328da330a9b1e3b46c411b2eb44d87d34b7e544829d3c68dafcb10602
-EBUILD mksh-9999.ebuild 1615 BLAKE2B f3e78819674ff13d6e7562bc7c8cf9969bc479f8f12e23ce9f7ae136749e12d2149c1f48522902a46077210af5b64a90720413f10aabfd04cfd82d3d03a7f0b6 SHA512 38da9578d15a8541107e596fd2df28cfa19e9c28446fbd312133afad0d2a78ebc8b157076776e8736f5feb6c5fc9cad9cd79a105e8a57a7bb935caff1022a1f9
+EBUILD mksh-59.ebuild 1608 BLAKE2B 1eb58f889cae37ed38ca3ad86c0d4b74659c209695a9d72c32931808cc60f2d4bcf59648b6073d7b96c0a12431ce2b989bcecdd36ec73d45150cd460151c312c SHA512 4155e31d97fcf0b3a008e4fb947d7cc85108d2a978280b2232b60e51964a6675d82ee85db80996bc35936085549e828a00781cdceb51e0e78138871cc8e90cb6
+EBUILD mksh-59c.ebuild 1677 BLAKE2B 680d6c778fbce6a2df62ab7a970ecae860be7a2b3e7d8a4193b3ae924ec56552087e5e1b88bed4241ceefd25298260662ba1ddb9602452aac45874eefb8f9f25 SHA512 510abec2465dab2ebc0279ff8984ee4b0fd44e871dd735878552654fa82d13a59a234d9d2525e894ca34ebb3b2fb0049344c8b8d371be6e90c81f01c80cd5bd3
+EBUILD mksh-9999.ebuild 1677 BLAKE2B 680d6c778fbce6a2df62ab7a970ecae860be7a2b3e7d8a4193b3ae924ec56552087e5e1b88bed4241ceefd25298260662ba1ddb9602452aac45874eefb8f9f25 SHA512 510abec2465dab2ebc0279ff8984ee4b0fd44e871dd735878552654fa82d13a59a234d9d2525e894ca34ebb3b2fb0049344c8b8d371be6e90c81f01c80cd5bd3
MISC metadata.xml 565 BLAKE2B 7bbb94f30f910e5a73f6fca91db59bd8b9825e358903bfc3116222c9bcb9927b5609b4c31bb5f36db5898023631a0d8dd2ad8d6a218136bb2e1786337db58fed SHA512 a10bf827859a6176fef847313a096d8ce04dfb6a271452602f8fe3638c8aeb7da11a5ea7a9d30257e516d8344365e30372e4c16d31d23c19e97c3d7ddd333914
diff --git a/app-shells/mksh/mksh-59.ebuild b/app-shells/mksh/mksh-59.ebuild
index 6054ce4415ca..c8ea10cc1684 100644
--- a/app-shells/mksh/mksh-59.ebuild
+++ b/app-shells/mksh/mksh-59.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]] ; then
ECVS_AUTH="ext"
else
SRC_URI="https://www.mirbsd.org/MirOS/dist/mir/mksh/${PN}-R${PV}.tgz"
- KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
+ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
fi
DESCRIPTION="MirBSD Korn Shell"
diff --git a/app-shells/mksh/mksh-59c.ebuild b/app-shells/mksh/mksh-59c.ebuild
new file mode 100644
index 000000000000..d1e1e13e083f
--- /dev/null
+++ b/app-shells/mksh/mksh-59c.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+if [[ ${PV} == *9999 ]] ; then
+ inherit cvs
+ ECVS_SERVER="anoncvs.mirbsd.org:/cvs"
+ ECVS_MODULE="mksh"
+ ECVS_USER="_anoncvs"
+ ECVS_AUTH="ext"
+else
+ SRC_URI="https://www.mirbsd.org/MirOS/dist/mir/mksh/${PN}-R${PV}.tgz"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+DESCRIPTION="MirBSD Korn Shell"
+# Host is TLSv1.0-only, keep to http for compatibility with modern browsers
+HOMEPAGE="http://mirbsd.de/mksh"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="lksh static test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+ test? (
+ dev-lang/perl
+ sys-apps/ed
+ )
+"
+
+S="${WORKDIR}/${PN}"
+
+src_prepare() {
+ default
+ if use lksh; then
+ cp -pr "${S}" "${S}"_lksh || die
+ fi
+}
+
+src_compile() {
+ tc-export CC
+ use static && export LDSTATIC="-static"
+ export CPPFLAGS="${CPPFLAGS} -DMKSH_DEFAULT_PROFILEDIR=\\\"${EPREFIX}/etc\\\""
+
+ if use lksh; then
+ pushd "${S}"_lksh >/dev/null || die
+ CPPFLAGS="${CPPFLAGS} -DMKSH_BINSHPOSIX -DMKSH_BINSHREDUCED" \
+ sh Build.sh -r -L || die
+ popd >/dev/null || die
+ fi
+
+ sh Build.sh -r || die
+ sh FAQ2HTML.sh || die
+}
+
+src_install() {
+ into /
+ dobin mksh
+ dosym mksh /bin/rmksh
+ doman mksh.1
+ dodoc dot.mkshrc
+ dodoc FAQ.htm
+
+ if use lksh; then
+ dobin "${S}"_lksh/lksh
+ dosym lksh /bin/rlksh
+ doman "${S}"_lksh/lksh.1
+ fi
+}
+
+src_test() {
+ einfo "Testing regular mksh."
+ ./mksh test.sh -v || die
+
+ if use lksh; then
+ einfo "Testing lksh, POSIX long-bit mksh."
+ pushd "${S}"_lksh >/dev/null || die
+ ./lksh test.sh -v || die
+ popd >/dev/null || die
+ fi
+}
diff --git a/app-shells/mksh/mksh-9999.ebuild b/app-shells/mksh/mksh-9999.ebuild
index 42d3bbb2ec9c..d1e1e13e083f 100644
--- a/app-shells/mksh/mksh-9999.ebuild
+++ b/app-shells/mksh/mksh-9999.ebuild
@@ -54,17 +54,20 @@ src_compile() {
fi
sh Build.sh -r || die
+ sh FAQ2HTML.sh || die
}
src_install() {
into /
dobin mksh
+ dosym mksh /bin/rmksh
doman mksh.1
dodoc dot.mkshrc
- dosym mksh /bin/rmksh
+ dodoc FAQ.htm
if use lksh; then
dobin "${S}"_lksh/lksh
+ dosym lksh /bin/rlksh
doman "${S}"_lksh/lksh.1
fi
}
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index d6d435f9f2e7..ba56d417cd68 100644
Binary files a/app-text/Manifest.gz and b/app-text/Manifest.gz differ
diff --git a/app-text/convmv/Manifest b/app-text/convmv/Manifest
index faf8cd79e36b..342ce1fb4836 100644
--- a/app-text/convmv/Manifest
+++ b/app-text/convmv/Manifest
@@ -2,6 +2,6 @@ AUX convmv-2.05-manpage_nocompress.patch 495 BLAKE2B e1f3b981d99cbd44aca2cac0d18
DIST convmv-2.04.tar.gz 30082 BLAKE2B 51521e5e44c635b72c406b6b732850e7f5e50b64d30bfd8770ca1ab49e3fd10d45447114f8adbf8b79fd381dfaf6b4782246d3e10aae471a49a52a20c8ce0405 SHA512 987411047af0b1e952cd11937c70ddd972b2e3534f4fcc6c659243dedef69af4aad90ceaa3789aec6bad6cba0999c38839451f90844b171773165b6e5899f6ac
DIST convmv-2.05.tar.gz 30680 BLAKE2B b0d4bb14995e42e55fa34cbdaa8cb8881e48972abb296af44eebfdf76664e837b05398e0cc4e9208ddee41213bc1dd7f11c3f503e39f9a6791d08797864776a1 SHA512 7fb0d1e2b64c3105c48d8a2cbb59fa4ea23202f17abc7cbf63acfca785683f00955fdcb03517e9dd8fe01be0171458ab2583e1c52d62c6081684462b0fec4125
EBUILD convmv-2.04.ebuild 696 BLAKE2B 4b4bcd977727970df9ad3f760e7612b4fb39f55ea60bfd30a973a21f65864ab2470ae7222ad015aaf8ac66b57b8520285e7b87d8b37be22309c7c822bc81dbba SHA512 f69f37a90cce7e27142523d2124d2708706387a0c034435972ecc4af2e8d1f80615c9b0855adb6907234a719205b61b7354fde5394cdd47438c71c7dd242ca74
-EBUILD convmv-2.05-r1.ebuild 801 BLAKE2B 3b6d6da040354faac8599cf483751f1d009fb8a00ec6f9b307b872f9327a768c9cc8040ddf011a4ca5704be991a368a9e44061693142b3da8841d1bf65c140f6 SHA512 0e828ac5896b76a7404ee3cfd16c057f1e2d03b1f68968100a4baf2bf0cd701765ff1217b90eb489d5e11fb10b2c9a7c2c47746c18292e2994a643da8a97b100
+EBUILD convmv-2.05-r1.ebuild 808 BLAKE2B f047ed37c8b98470f34b2960e0e0a9dd1fe45ef59920e5a4648ad41d49d947ce1be2eaec77fec003f9bdf12ceffd2c1894eb80effdd79b1fca908ce2ff4fbd85 SHA512 1f52846d6ff72002b7442c356f610ecf7c66f60620fe26e0f2627b81889a42423ce1c70c338f77ae556c32d4e563ad311dffd8bfb60b987c69f81029e5fa44d5
EBUILD convmv-2.05.ebuild 712 BLAKE2B 0c338bcf39f82f15cb1e72fa53e7702a926f22890f548af0ae1aee2827ff1010dc5e809c012afab3e1a51dd4ddc4a0aed07fd0b1bb534d29c8f613b35f4a1f2c SHA512 fa5230e72fdf9e78df8c6b0e1d1c1170d96005660cedb3c829005312af4ab44ae7f9067adc8f6cdf30828b37e2cd6dbaa44731092f9540a53ab861705b57ffd5
MISC metadata.xml 257 BLAKE2B 35c1b06807230338ceb9de70f79760d55e93dcdba508da3c663e785ab3966781edc2098abd8df084b2ecabbf40ff8e8e4a0d0a6e131daf648ff58e101cf27587 SHA512 ff078cacb115b8f3624b45d883d8ed72701e3d2fccae06c04c633eb60821b23681cc151e00689d1b6035c94570535e7ac0de51a55dae99f606886164883185ea
diff --git a/app-text/convmv/convmv-2.05-r1.ebuild b/app-text/convmv/convmv-2.05-r1.ebuild
index 3384fadada92..12ab21e7e29b 100644
--- a/app-text/convmv/convmv-2.05-r1.ebuild
+++ b/app-text/convmv/convmv-2.05-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://www.j3e.de/linux/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
IUSE=""
DEPEND="dev-lang/perl"
diff --git a/app-text/epspdf/Manifest b/app-text/epspdf/Manifest
index 9a0428df7701..96548cb3d13f 100644
--- a/app-text/epspdf/Manifest
+++ b/app-text/epspdf/Manifest
@@ -1,5 +1,5 @@
DIST epspdf.0.6.0.tgz 352989 BLAKE2B 633e2ed29d8ec28f679b00095d335cea4bd1996cf6fdf3950b97084a73044eca9371ac6964ad48e98ea8ddba38d91acad2137ee8d3122ea03df3ce25f08196ce SHA512 44a7015fa0b7298429567e998068864419fd396f6b0781bf7877c6599d3bb2f254b7a0f976500655851a95d727880d106d9e1df9086306eef74db0b109a63506
DIST epspdf.0.6.3.tgz 335975 BLAKE2B aacd6e222bfe74636dba796fd6e878fa9970f469d096eb77acf4a336a0ab5620629de7ba1c763afa62b181887724db55be57d1929a041a945c7d74ea3028d6de SHA512 ddb0d8c17b6b0bbb934312e6253a2b689d2545c892af989efac9782022c501109f2ff57bb2ea7c26d63d7747e2a510c18bd22a6076bb7137fe0252c38b2125ea
EBUILD epspdf-0.6.0-r1.ebuild 1258 BLAKE2B cb0329c1fa96eb8ea1c66a58fb6c0941abaf76a8f724ad86ad5813f98fa616591e4398ac36820fa8f83d8b11c13a161ae4289d7a5d192745edd78312208b7437 SHA512 cb07774f9cf78f5b3d81770b8bf26cbcdbe08d170d12700c2d28f7022d150bcd0d2a88d4cdc4089eb981a68fcfb4e4bad54763aa248e700a4e74ca9cb21cf52b
-EBUILD epspdf-0.6.3-r1.ebuild 1361 BLAKE2B 0235b16bf07b93688d2d70a3bce5b2a77bfc69d2d265bee434b62c1ab18bf0be596b8e0f1d8bbe5f8c56e4eb8b8e912ad88d994781a76acd912d47d6b1bb486c SHA512 4e3fe579440ca50b638473d760952997279c664494964a110cad006ad2234f58b8a4fa11bfd96b7ee50a9b2e6ae7622abe8348773a07dd5b7b5c6daec3625561
+EBUILD epspdf-0.6.3-r1.ebuild 1360 BLAKE2B 782357b1a81fed7e44654b999c8570317cab1f3989138577a3d6219378ca76cc0865a44e6ae7fb9200ecef029a596999fb3a7f3536e6de7644f1215535fad60d SHA512 9c33d9eed9594078e437fbec2f6e9141f939922ff89cc0eccff44030ecba89dafbe12871065740705047b8340ffd404622bcaab5dc45650486d0af14d08cca19
MISC metadata.xml 245 BLAKE2B ee3a163cfe0a4bc59c0dfb46f9ddb580e2d259b4d0e33cb4e684eb9e6d4b901bf97c6edd891f3b75a613a782f1b89318d0ee3ec9bee4e34c4441d9e8f4267678 SHA512 1653777623e2c15e1ce13229e396723b2cc9c214983e0f8592de98c01a31badc6c38c6735ed44f937d145883b43fb6f049af3eddb9ff96b18c96ccf8f67dd690
diff --git a/app-text/epspdf/epspdf-0.6.3-r1.ebuild b/app-text/epspdf/epspdf-0.6.3-r1.ebuild
index 7b1952a9e402..131a100c873f 100644
--- a/app-text/epspdf/epspdf-0.6.3-r1.ebuild
+++ b/app-text/epspdf/epspdf-0.6.3-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://tex.aanhet.net/epspdf/${PN}.${PV}.tgz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="doc tk"
DEPEND="sys-apps/texinfo"
diff --git a/app-text/epstool/Manifest b/app-text/epstool/Manifest
index f288cbe636b9..9137209c728a 100644
--- a/app-text/epstool/Manifest
+++ b/app-text/epstool/Manifest
@@ -4,5 +4,5 @@ AUX gcc43.patch 632 BLAKE2B 3f4537c7b4e20e50aafa3d8e07379eb8db2e68c1abbe6e096b2e
DIST epstool-3.08.tar.gz 191567 BLAKE2B 6ef2912e10e65809f60444d09facc1ea3800e492e55e87a4f00c95f7dbabd45c4d48b447fd92879e97e9dc2fe9698c1ff7d4cb06bdf3724f16ed89f76a829a8d SHA512 d6d70825c7d08cca318503bd8c12b48408b6d6cd3a64f26df94890373a3e73b68dc09a4eb454b81893c7ee3c11da791cdfed7466eb1410414cd1b97d80e8abf1
DIST epstool-3.09.tar.gz 191023 BLAKE2B becb264bf93bdb1244550e0707eb2d513d8c4b8d9eee09356bd2ddaf25bc8b97e0c5e73a02839a0f66f18bd1949cb549525967ec430104c33067d9ca57984a6f SHA512 cb9519be0879ff791f0e243a541538254e24949683aa792f673334d2d1dbd3e449ec36890ccbb3852563cf8da997a035a80df605b395a1b84cbced7522dce291
EBUILD epstool-3.08-r1.ebuild 904 BLAKE2B 50b366747cd1c79275a6a7c82dfd937ed5d052f81be2ce1c48c0d1f10cf8c59c7dead1ac8e1026fbd8566709ee5aff180c947c26f2b650469128f05a7053b570 SHA512 34323645e925827275dfd63f016a7578eb3d6c0a7bcfa71597afb7b010081caf0bb6e65b8c529dbd7ebb144c6242e71186f6187e76cb3daccdaad3c613016400
-EBUILD epstool-3.09.ebuild 892 BLAKE2B 48f00d7d90a637afa6cafe3721a1fa21c948d78c7c2f1ff165e959d491458aff9859c5197b42d1b22b574941d08487e523113131191181c545ccc582820c97a5 SHA512 a710c0dfe1fdf64c30a2a8da6947e5e372d20fcb8408e87778a4af0633f972cf636690df5e4145f0a32b62cd38e8d1daf1a5d28e751815254dabac633f7439ac
+EBUILD epstool-3.09.ebuild 887 BLAKE2B 779e634d9963d0d29956508ec24d915c89abc5ae87a80138d404d9f48642b7a6350a71cf58526a58a59c527c3888dbb77f82de6a27066c685afc1cf6a8bf3a90 SHA512 dfe52e2478b570ecdd6956331d3c0dcf009325bbf5561d73de15fca4a5942e8fa8a73e986b3a52388809007a84f741ed3c05da825f92aeb36e8b4611a1d5e002
MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-text/epstool/epstool-3.09.ebuild b/app-text/epstool/epstool-3.09.ebuild
index 7bbbe381f000..7e62a5baddfd 100644
--- a/app-text/epstool/epstool-3.09.ebuild
+++ b/app-text/epstool/epstool-3.09.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.ghostgum.com.au/download/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 arm arm64 hppa ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
DEPEND="app-text/ghostscript-gpl"
RDEPEND="${DEPEND}"
diff --git a/app-text/ghostscript-gpl/Manifest b/app-text/ghostscript-gpl/Manifest
index c53781cb0e68..590405af0649 100644
--- a/app-text/ghostscript-gpl/Manifest
+++ b/app-text/ghostscript-gpl/Manifest
@@ -5,5 +5,5 @@ DIST ghostscript-9.53.3.tar.xz 41368160 BLAKE2B 6b5840a420d7527c7155bfb707fe19b3
DIST ghostscript-gpl-9.52-patchset-01.tar.xz 3292 BLAKE2B b6ac4f06c149301b07f57a5dd1f4507cc1e6d17ea60132b64177972ca58a29b2f6ff2f034b20b8ac083b60ea999f50ff75b74f86eec0cd73179741ed8a1486a8 SHA512 2498c5f396807a282727a7a9bd678e2008a1e4112722745aab48a12601661b08557c5d49f0a5ee67fb636f8c2b00c737640e894523b904ef3600f66d107999cb
DIST ghostscript-gpl-9.53-patchset-01.tar.xz 2340 BLAKE2B 55d82c88f1b57c084318839e1382ffa112461d074411b1f6586a5a9ace37772b144abdda9f742defd077ce937df590d63bd7a2306bad52438949d1036bb7900c SHA512 ab58485df9152bb32c6f0eb25bd45689089bd17ffb0323c54e1977c5f810ec5eb09f358637251c428591749bfb42c6f8489c74d4bd0a7ae5d696eb2346503c44
EBUILD ghostscript-gpl-9.52-r1.ebuild 5175 BLAKE2B 83b725c22dfae426de0735f8195e6e4477b47d3fff6fb0f3108d344ffee6eba03bdb875078c472a048c2be7ed1f3347cea7e22707bbc1c0c77629ad11a3c5106 SHA512 f242c79f3ac85c147ee9d6ea203b716ebf44170e5574db68fecb04940b2e7c6146631bb2e1a46cf06673d91fc6cad18bf4828ef97af91896815cceb5efba0e17
-EBUILD ghostscript-gpl-9.53.3-r4.ebuild 5245 BLAKE2B d186dea50712499529a91b12b919837a91c2be4433b92c65762af961686bc93fb5cb95521481db07dc92d85c6b1721c44b85685b66aa1c01fd02854d2f318f41 SHA512 7f6f1c4851deec9b604fdf7595694f733a750a31a37268b657537dd803d7c29bceb879bb80e7f9bc3e51f055bafa8d321e162bb7320e2f9ecf2b0f6ed787ee82
+EBUILD ghostscript-gpl-9.53.3-r4.ebuild 5244 BLAKE2B c4ce99a6f5b282795eb6cad4ef5152473ef23225161994f709a3082de0f28ada92bd96e4c8ed65ad25190d8805a61d727c9d45f12dd43e43b8a6121e2926f915 SHA512 ab17af467aed5f02353f8ce5e212d4c693d0b3ba41883eb4eb9ba4a574f3d9b83c1e3bbd193a95fe971e9bdc9e727c45a4dd6eb8014c3813710a26fb2fb2499c
MISC metadata.xml 583 BLAKE2B cc9bd976a53f467582f4657d0f08862454c53783d1eeedf90dfe9fab7e074a8903a48632b03847e4aeba4d9f6cf821ebda120c1de1e64740641e4849278646a8 SHA512 3de9e76a9a3b6fff971d0760b3590a60448014268f45faa742327a90b1cd8c40eae1426026cda590dd9f91c96580eabbba85125c88ed250479b8df675f45bb15
diff --git a/app-text/ghostscript-gpl/ghostscript-gpl-9.53.3-r4.ebuild b/app-text/ghostscript-gpl/ghostscript-gpl-9.53.3-r4.ebuild
index e4d3e176be9e..a9535a0c9765 100644
--- a/app-text/ghostscript-gpl/ghostscript-gpl-9.53.3-r4.ebuild
+++ b/app-text/ghostscript-gpl/ghostscript-gpl-9.53.3-r4.ebuild
@@ -23,7 +23,7 @@ fi
LICENSE="AGPL-3 CPL-1.0"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="cups dbus gtk l10n_de static-libs unicode X"
LANGS="ja ko zh-CN zh-TW"
diff --git a/app-text/goldendict/Manifest b/app-text/goldendict/Manifest
deleted file mode 100644
index 70614d8072bd..000000000000
--- a/app-text/goldendict/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX goldendict-1.5.0-ffmpeg-4.patch 6184 BLAKE2B 17b8bddeab5bbb6e373c3ee3bfda695ddd363ec733955364b3973f9538cc86bfa5907156704444e31d0c1a99768ff5cc2b577ed2b129100dd1273bbeea1f1eb8 SHA512 596e7ee22e210978ec1f787fd1bb6051f7f9a4d4eb88edb7af40d2e3ba9e66403edb932876a6738c0471c5fe439245e0de61e3c7b57039e0dfd0560f20fd5b8b
-AUX goldendict-1.5.0-qt-5.11.patch 1532 BLAKE2B cd6869c59d2afef21d92660173516b56a880cd245e5b928096d9d3d6e8e4fc915694a5dedd762400be091dca6a86fed2b553ce11688e84117ef4653ab1124ce3 SHA512 25721bf8cca9e0abb3f04dd912520577f7c3a31d34883887286476895263049495e3286c520549409ec8244f99b632b4a76f0ce514b8509e5e16a12adc3a5ac6
-AUX goldendict-1.5.0-qtsingleapplication-unbundle.patch 341 BLAKE2B 7f5b2c715d41d50d358a8cca5f259f8b70266b9037dac9f5f6c9c0b1323b46cb42f68fd73725a6f25903e35a83582b32015b3401f1aa3a8f9c8bb1a05c54b531 SHA512 86a08b1333a61fee7559028f68779f45cf17da6f7e6f3ea9cae46184279469b91e38f825ad072e0557bcd4188b87fe8f0bd696c4819e3bc96874439d1290e5a3
-DIST goldendict-1.5.0_rc2.tar.gz 19413751 BLAKE2B 17fb0140e6ce392800a05d36a41f2a42c813990eaecabf55f765d5583118be694e66c5438b90e46853070a782086422b533b0f653461dd81cecd23f2deec40b7 SHA512 b88067a90df42b07d926231f624be8796f031b872443a45f9744ceeea27f39325bc665090f773528a26ad8391ae2423a29c602068bf2cc4ed5870a07646d2362
-EBUILD goldendict-1.5.0_rc2-r2.ebuild 1733 BLAKE2B 32cc3ef1affb914a3b939765ecf656bf48167352c54863dcc1def0abbe287ae0148863b18af19c7ffad38677141bac148803b69f9321048375c4f900949a80fb SHA512 fde5f8df0b18a7c7f325cf0a8f4052345f604425028120eadbc21d812c807615d1580a1dc68cbfe965223074779ce46ed5912742cdb33c09f2bf77cfa9622051
-MISC metadata.xml 388 BLAKE2B 229d847f632fe3da3df10913551df5ee6ee386768c52aef7c436336476c7e837272decbe34a7e9322504e6d97e7319afb61815539494ef5faa8c93411ce7215d SHA512 c9be98ab768c3c13ff4b03336fc90314ec0e233d0860501d85b5c65250965d994a3f8ab4cf8f58cee3da27fdc37964c10854bc66b9cc16e5f558f0b7a4a39f42
diff --git a/app-text/goldendict/files/goldendict-1.5.0-ffmpeg-4.patch b/app-text/goldendict/files/goldendict-1.5.0-ffmpeg-4.patch
deleted file mode 100644
index 6e6d03675a4f..000000000000
--- a/app-text/goldendict/files/goldendict-1.5.0-ffmpeg-4.patch
+++ /dev/null
@@ -1,167 +0,0 @@
-From 03bbe01b79a1f07a6780cb60f23a087104c5d77b Mon Sep 17 00:00:00 2001
-From: Abs62
-Date: Fri, 30 Mar 2018 22:53:24 +0300
-Subject: [PATCH] Fix warnings while compile with FFMpeg 3.4.2 (issue #978)
-
----
- ffmpegaudio.cc | 68 +++++++++++++++++++++++++++++++++++++++++++++-----
- 1 file changed, 62 insertions(+), 6 deletions(-)
-
-diff --git a/ffmpegaudio.cc b/ffmpegaudio.cc
-index ed1172bd..56e8f788 100644
---- a/ffmpegaudio.cc
-+++ b/ffmpegaudio.cc
-@@ -91,6 +91,7 @@ struct DecoderContext
- QByteArray audioData_;
- QDataStream audioDataStream_;
- AVFormatContext * formatContext_;
-+ AVCodec * codec_;
- AVCodecContext * codecContext_;
- AVIOContext * avioContext_;
- AVStream * audioStream_;
-@@ -114,6 +115,7 @@ DecoderContext::DecoderContext( QByteArray const & audioData, QAtomicInt & isCan
- audioData_( audioData ),
- audioDataStream_( audioData_ ),
- formatContext_( NULL ),
-+ codec_( NULL ),
- codecContext_( NULL ),
- avioContext_( NULL ),
- audioStream_( NULL ),
-@@ -143,7 +145,11 @@ bool DecoderContext::openCodec( QString & errorString )
- return false;
- }
-
-+#if LIBAVCODEC_VERSION_MAJOR < 56 || ( LIBAVCODEC_VERSION_MAJOR == 56 && LIBAVCODEC_VERSION_MINOR < 56 )
- unsigned char * avioBuffer = ( unsigned char * )av_malloc( kBufferSize + FF_INPUT_BUFFER_PADDING_SIZE );
-+#else
-+ unsigned char * avioBuffer = ( unsigned char * )av_malloc( kBufferSize + AV_INPUT_BUFFER_PADDING_SIZE );
-+#endif
- if ( !avioBuffer )
- {
- errorString = QObject::tr( "av_malloc() failed." );
-@@ -186,7 +192,11 @@ bool DecoderContext::openCodec( QString & errorString )
- // Find audio stream, use the first audio stream if available
- for ( unsigned i = 0; i < formatContext_->nb_streams; i++ )
- {
-+#if LIBAVCODEC_VERSION_MAJOR < 57 || ( LIBAVCODEC_VERSION_MAJOR == 57 && LIBAVCODEC_VERSION_MINOR < 33 )
- if ( formatContext_->streams[i]->codec->codec_type == AVMEDIA_TYPE_AUDIO )
-+#else
-+ if ( formatContext_->streams[i]->codecpar->codec_type == AVMEDIA_TYPE_AUDIO )
-+#endif
- {
- audioStream_ = formatContext_->streams[i];
- break;
-@@ -198,22 +208,38 @@ bool DecoderContext::openCodec( QString & errorString )
- return false;
- }
-
-+#if LIBAVCODEC_VERSION_MAJOR < 57 || ( LIBAVCODEC_VERSION_MAJOR == 57 && LIBAVCODEC_VERSION_MINOR < 33 )
- codecContext_ = audioStream_->codec;
-- AVCodec * codec = avcodec_find_decoder( codecContext_->codec_id );
-- if ( !codec )
-+ codec_ = avcodec_find_decoder( codecContext_->codec_id );
-+ if ( !codec_ )
- {
- errorString = QObject::tr( "Codec [id: %1] not found." ).arg( codecContext_->codec_id );
- return false;
- }
-+#else
-+ codec_ = avcodec_find_decoder( audioStream_->codecpar->codec_id );
-+ if ( !codec_ )
-+ {
-+ errorString = QObject::tr( "Codec [id: %1] not found." ).arg( audioStream_->codecpar->codec_id );
-+ return false;
-+ }
-+ codecContext_ = avcodec_alloc_context3( codec_ );
-+ if ( !codecContext_ )
-+ {
-+ errorString = QObject::tr( "avcodec_alloc_context3() failed." );
-+ return false;
-+ }
-+ avcodec_parameters_to_context( codecContext_, audioStream_->codecpar );
-+#endif
-
-- ret = avcodec_open2( codecContext_, codec, NULL );
-+ ret = avcodec_open2( codecContext_, codec_, NULL );
- if ( ret < 0 )
- {
- errorString = QObject::tr( "avcodec_open2() failed: %1." ).arg( avErrorString( ret ) );
- return false;
- }
-
-- av_log( NULL, AV_LOG_INFO, "Codec open: %s: channels: %d, rate: %d, format: %s\n", codec->long_name,
-+ av_log( NULL, AV_LOG_INFO, "Codec open: %s: channels: %d, rate: %d, format: %s\n", codec_->long_name,
- codecContext_->channels, codecContext_->sample_rate, av_get_sample_fmt_name( codecContext_->sample_fmt ) );
- return true;
- }
-@@ -252,10 +278,13 @@ void DecoderContext::closeCodec()
-
- // Closing a codec context without prior avcodec_open2() will result in
- // a crash in ffmpeg
-- if ( audioStream_ && audioStream_->codec && audioStream_->codec->codec )
-+ if ( audioStream_ && codecContext_ && codec_ )
- {
- audioStream_->discard = AVDISCARD_ALL;
-- avcodec_close( audioStream_->codec );
-+ avcodec_close( codecContext_ );
-+#if LIBAVCODEC_VERSION_MAJOR > 57 || ( LIBAVCODEC_VERSION_MAJOR == 57 && LIBAVCODEC_VERSION_MINOR >= 33 )
-+ avcodec_free_context( &codecContext_ );
-+#endif
- }
-
- avformat_close_input( &formatContext_ );
-@@ -356,6 +385,7 @@ bool DecoderContext::play( QString & errorString )
- if ( packet.stream_index == audioStream_->index )
- {
- AVPacket pack = packet;
-+#if LIBAVCODEC_VERSION_MAJOR < 57 || ( LIBAVCODEC_VERSION_MAJOR == 57 && LIBAVCODEC_VERSION_MINOR < 37 )
- int gotFrame = 0;
- do
- {
-@@ -370,6 +400,19 @@ bool DecoderContext::play( QString & errorString )
- pack.data += len;
- }
- while( pack.size > 0 );
-+#else
-+ int ret = avcodec_send_packet( codecContext_, &pack );
-+ /* read all the output frames (in general there may be any number of them) */
-+ while( ret >= 0 )
-+ {
-+ ret = avcodec_receive_frame( codecContext_, frame);
-+
-+ if ( Qt4x5::AtomicInt::loadAcquire( isCancelled_ ) || ret < 0 )
-+ break;
-+
-+ playFrame( frame );
-+ }
-+#endif
- }
- // av_free_packet() must be called after each call to av_read_frame()
- #if LIBAVCODEC_VERSION_MAJOR < 57 || ( LIBAVCODEC_VERSION_MAJOR == 57 && LIBAVCODEC_VERSION_MINOR < 7 )
-@@ -379,6 +422,7 @@ bool DecoderContext::play( QString & errorString )
- #endif
- }
-
-+#if LIBAVCODEC_VERSION_MAJOR < 57 || ( LIBAVCODEC_VERSION_MAJOR == 57 && LIBAVCODEC_VERSION_MINOR < 37 )
- if ( !Qt4x5::AtomicInt::loadAcquire( isCancelled_ ) &&
- codecContext_->codec->capabilities & CODEC_CAP_DELAY )
- {
-@@ -391,6 +435,18 @@ bool DecoderContext::play( QString & errorString )
- playFrame( frame );
- }
- }
-+#else
-+ /* flush the decoder */
-+ av_init_packet( &packet );
-+ int ret = avcodec_send_packet(codecContext_, &packet );
-+ while( ret >= 0 )
-+ {
-+ ret = avcodec_receive_frame(codecContext_, frame);
-+ if ( Qt4x5::AtomicInt::loadAcquire( isCancelled_ ) || ret < 0 )
-+ break;
-+ playFrame( frame );
-+ }
-+#endif
-
- #if LIBAVCODEC_VERSION_MAJOR < 54
- av_free( frame );
diff --git a/app-text/goldendict/files/goldendict-1.5.0-qt-5.11.patch b/app-text/goldendict/files/goldendict-1.5.0-qt-5.11.patch
deleted file mode 100644
index 247ec52931b9..000000000000
--- a/app-text/goldendict/files/goldendict-1.5.0-qt-5.11.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 3d4a468b6c8cb154c88cf4592a5845973999dc29 Mon Sep 17 00:00:00 2001
-From: Abs62
-Date: Tue, 10 Apr 2018 18:44:43 +0300
-Subject: [PATCH] Qt5: Fix compilation with Qt 5.11 (issue #991)
-
----
- fulltextsearch.hh | 1 +
- initializing.cc | 1 +
- 2 files changed, 2 insertions(+)
-
-diff --git a/fulltextsearch.hh b/fulltextsearch.hh
-index da7e2943..adf9619f 100644
---- a/fulltextsearch.hh
-+++ b/fulltextsearch.hh
-@@ -6,6 +6,7 @@
- #include
- #include
- #include
-+#include
-
- #include "dictionary.hh"
- #include "ui_fulltextsearch.h"
-diff --git a/initializing.cc b/initializing.cc
-index 0db6909b..59e605d6 100644
---- a/initializing.cc
-+++ b/initializing.cc
-@@ -1,6 +1,7 @@
- /* This file is (c) 2008-2012 Konstantin Isakov
- * Part of GoldenDict. Licensed under GPLv3 or later, see the LICENSE file */
-
-+#include
- #include "initializing.hh"
- #include
-
-From a65967805ab424b299bdfa1d1f9c7ebb8a7fd517 Mon Sep 17 00:00:00 2001
-From: Perfect Gentleman
-Date: Wed, 11 Apr 2018 00:04:12 +0700
-Subject: [PATCH] Update groups_widgets.hh
-
-fixes https://github.com/goldendict/goldendict/issues/991
----
- groups_widgets.hh | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/groups_widgets.hh b/groups_widgets.hh
-index ce442fa2..2064e3bb 100644
---- a/groups_widgets.hh
-+++ b/groups_widgets.hh
-@@ -8,6 +8,7 @@
-
- #include
-
-+#include
- #include
- #include
-
diff --git a/app-text/goldendict/files/goldendict-1.5.0-qtsingleapplication-unbundle.patch b/app-text/goldendict/files/goldendict-1.5.0-qtsingleapplication-unbundle.patch
deleted file mode 100644
index 01fdb3b2a297..000000000000
--- a/app-text/goldendict/files/goldendict-1.5.0-qtsingleapplication-unbundle.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/goldendict.pro
-+++ b/goldendict.pro
-@@ -36,7 +36,8 @@
- QT += sql
- CONFIG += exceptions \
- rtti \
-- stl
-+ stl \
-+ qtsingleapplication
- OBJECTS_DIR = build
- UI_DIR = build
- MOC_DIR = build
-@@ -632,5 +633,3 @@
- TS_OUT ~= s/.ts/.qm/g
- PRE_TARGETDEPS += $$TS_OUT
-
--include( qtsingleapplication/src/qtsingleapplication.pri )
--
diff --git a/app-text/goldendict/goldendict-1.5.0_rc2-r2.ebuild b/app-text/goldendict/goldendict-1.5.0_rc2-r2.ebuild
deleted file mode 100644
index d8de78923963..000000000000
--- a/app-text/goldendict/goldendict-1.5.0_rc2-r2.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PV=${PV^^}
-MY_PV=${MY_PV/_/-}
-inherit desktop qmake-utils
-
-DESCRIPTION="Feature-rich dictionary lookup program"
-HOMEPAGE="http://goldendict.org/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="debug ffmpeg "
-
-RDEPEND="
- app-arch/bzip2
- >=app-text/hunspell-1.2:=
- dev-libs/eb
- dev-libs/lzo
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qthelp:5
- dev-qt/qtnetwork:5
- dev-qt/qtprintsupport:5
- dev-qt/qtsingleapplication[qt5(+),X]
- dev-qt/qtsvg:5
- dev-qt/qtwebkit:5
- dev-qt/qtwidgets:5
- dev-qt/qtx11extras:5
- dev-qt/qtxml:5
- media-libs/libvorbis
- media-libs/tiff:0
- sys-libs/zlib
- x11-libs/libX11
- x11-libs/libXtst
- ffmpeg? (
- media-libs/libao
- media-video/ffmpeg:0=
- )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
- dev-qt/linguist-tools:5
- virtual/pkgconfig
-"
-
-PATCHES=(
- "${FILESDIR}/${PN}-1.5.0-qtsingleapplication-unbundle.patch"
- "${FILESDIR}/${PN}-1.5.0-qt-5.11.patch"
- "${FILESDIR}/${PN}-1.5.0-ffmpeg-4.patch"
-)
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-src_prepare() {
- default
-
- # disable git
- sed -i \
- -e '/git describe/s/^/#/' \
- ${PN}.pro || die
-
- # fix installation path
- sed -i \
- -e '/PREFIX = /s:/usr/local:/usr:' \
- ${PN}.pro || die
-
- # add trailing semicolon
- sed -i -e '/^Categories/s/$/;/' redist/${PN}.desktop || die
-}
-
-src_configure() {
- local myconf=()
- use ffmpeg || myconf+=( DISABLE_INTERNAL_PLAYER=1 )
-
- eqmake5 "${myconf[@]}"
-}
-
-src_install() {
- dobin ${PN}
- domenu redist/${PN}.desktop
- doicon redist/icons/${PN}.png
-
- insinto /usr/share/apps/${PN}/locale
- doins locale/*.qm
-
- insinto /usr/share/${PN}/help
- doins help/*.qch
-}
diff --git a/app-text/goldendict/metadata.xml b/app-text/goldendict/metadata.xml
deleted file mode 100644
index 54e5ea46ce69..000000000000
--- a/app-text/goldendict/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
- qt@gentoo.org
- Gentoo Qt Project
-
-
- goldendict/goldendict
- goldendict
-
-
diff --git a/app-text/highlight/Manifest b/app-text/highlight/Manifest
index c542aea228ff..a30bd47c5417 100644
--- a/app-text/highlight/Manifest
+++ b/app-text/highlight/Manifest
@@ -1,4 +1,4 @@
DIST highlight-3.57.tar.bz2 1412857 BLAKE2B c0ee8189294feac3b5e8c6d356634d8074a8960f2010918de52f23515ad4a13626971e9106ecc6d2adbdb45e0ebb66ff60eb3cbe86d2449666e3424f1c0dc3a6 SHA512 a086f6b8c4a4fc0b6651d456b178350a6c59a32cd613451d81b53fe3294eb0f80d673cb64fb615ef91d6c4d4bbc8a57413aec2490d2a5ad67e695ec6e92b3d99
-EBUILD highlight-3.57-r1.ebuild 2805 BLAKE2B 7f99799eb755da57d7540a9af08a183867ed558b343cb4013f2611937faf54a28f69cd10d03fa407334a5004ae3ca69c53a74ffdf2dda0ac385d7383e1fef80d SHA512 87a986128536dc5a9cf74ba08fedeeff4646dc7ad03ed3b02659c836ec5c7580fce5a6356a654582c5ca98c36fd911957f9ba31f6cdeb087bf42791c231717dd
+EBUILD highlight-3.57-r1.ebuild 2802 BLAKE2B 77a110463363ab7ed5e347075b19d68c56494a8185e149816bd5d43eff721b45a716f132082be6e95743dd0a6db9d674a2676934360a167275019e70fae401ed SHA512 ea7721d294e3d8b8207c17151d3dabbe8e0d1df203e925b737546cf12b880337277a4811e79406407ea41506de3ff936b42c8e0629ea6b464e7eacfaecc2fa2a
EBUILD highlight-3.57.ebuild 2179 BLAKE2B 361a74f80a3b8d9ffca9528b15a644911712ea3da02acb6afaf354a2900302aa25d7c5484e75c8e9327d61df2a239e630cdb526ebd1a9f45a8a022852ac4ee7f SHA512 b5c3296235114c356d3abcd187a12ef00cc3ffb0f374a009da088a085b9af9e27b08b4eaa68692e37e8e34156901ba7a953cf693cf5c2a58c13ebdbead80810e
MISC metadata.xml 249 BLAKE2B 1b34ce77c092c0664a18f32525d158d41bf36ab7ab7a4b9d01ed37e1e3dda3d58849d5b1375065c4e5591f6b09b2a93e88a624d399c495a0b1125edb30ec172f SHA512 895325641a176c848988fb5f36cdb567b584d22f6e778b3de674de480cbca30b7cf8f12ecbbe1173a63e3229889e1e0f5efd5afea4f0d4c429ac236598f80f1e
diff --git a/app-text/highlight/highlight-3.57-r1.ebuild b/app-text/highlight/highlight-3.57-r1.ebuild
index 079ca0895c88..a54516df1e7f 100644
--- a/app-text/highlight/highlight-3.57-r1.ebuild
+++ b/app-text/highlight/highlight-3.57-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.andre-simon.de/zip/${P}.tar.bz2"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ppc ~ppc64 s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE="examples qt5"
RDEPEND="
diff --git a/app-text/nfoview/Manifest b/app-text/nfoview/Manifest
index 55fd952b377a..f4acb604101c 100644
--- a/app-text/nfoview/Manifest
+++ b/app-text/nfoview/Manifest
@@ -1,6 +1,6 @@
DIST nfoview-1.27.1.tar.gz 60211 BLAKE2B 777d9f42a08a17d3790996ff76819a0b74c6e1f01625019259524e6e5cee9afc72ae463085071e4a23cefeebaf5b14f1bbeae949446356ed1aaebebaaf53e230 SHA512 7066995954997a20aec27ff820c0f0a067835e219f9029f696b2885a85c4714b32fc8d474291433f64d9b28e81e5f4c24989a6447affc7b206cef453342a05d2
DIST nfoview-1.28.tar.gz 61164 BLAKE2B 7fb1f150d343d5133e411486f3bff7315765187920dc5821de7d717f3381b6126263585a23fdb7847403ae992ee98b7503f7313a312adb0e6b2fb992e69da4a8 SHA512 652ed3a5dd3cad547c6c0f93a0c686c42e9fc58e2f90a682432cbcb865a1b6ab6cb55424ed68128718c0c867ad353d170ecf54619f7006445cb9761bced2bbd3
EBUILD nfoview-1.27.1.ebuild 872 BLAKE2B 7b70a94c6144642e519476ccf2f44d1a07168493ff23b460237bbe9d62569f98fc0d812a46bc45674198ff0cbee091275fb63bf98369d42915c257f9b41f85dc SHA512 1b0b399f1ef009998b47d46f0d45f2130ef1cc6d62d50c993eb2be95f118e4d1afce962868763d4c177a74744a8b968312c2910c92a4723a29409f0741544f61
-EBUILD nfoview-1.28.ebuild 872 BLAKE2B 0e0ea4b94556b7221137cbf1d4bde727854a8318b0d0e32f60951acf3df9f9945986ff1d31b2b41d6328d073bc1ea5aed073ed4a575711a7b694cc4003c67393 SHA512 3595e083ab06bcc9fdd85e6035e4ad380416e6484534e142b1e15b416ed98ce0627af3ab6093bff01bf467a8bf4c6267c2bdb47d649c664719fb6cf043586ae7
-EBUILD nfoview-9999.ebuild 817 BLAKE2B 47ada35bd06c2a1c43d78f598de8858e6a7bafcd9dc79987515155bbccdb4922288fb8374db2b3413c545bf7f2055f70a1eeda8b2f35009f6314424dec48b276 SHA512 56111d9d3a08543a698ef7319ca3ed2312955f0b611ce7069f24d6ce3957d30cc884b4ea9ec37f8749d31956b76c17786221c5829a9cce6e1dd0dbce640d1386
+EBUILD nfoview-1.28.ebuild 718 BLAKE2B cbeb8357b83d22d0521b2bf287d6b9fa107998d11a43beae35e93d8eebfa0f3c73d2372822a381053fc994d511e205d59fc1c54822e3aeb18298358512e5e04a SHA512 959081bf5947e081502adce69c1694dea4cc0cae0aee82abf4e7eb43990308d80707861dbfef2a67ab2443cd1c31b254e4675baa2db68532d85cc7f2d6f41ff9
+EBUILD nfoview-9999.ebuild 718 BLAKE2B cbeb8357b83d22d0521b2bf287d6b9fa107998d11a43beae35e93d8eebfa0f3c73d2372822a381053fc994d511e205d59fc1c54822e3aeb18298358512e5e04a SHA512 959081bf5947e081502adce69c1694dea4cc0cae0aee82abf4e7eb43990308d80707861dbfef2a67ab2443cd1c31b254e4675baa2db68532d85cc7f2d6f41ff9
MISC metadata.xml 457 BLAKE2B fc1b77e74af5461b5ff1e772f60ef2c222f95860b1afb21828aa39d26342c241658e731d80bb937e694ff1195b0a079fb4134e60207539fa799ffdb6cd601c52 SHA512 65cd8b6021811a13d3a319b930afd8a090c5d15fe232e10d403c3ca8258685f6e118a224bdda7e6cbcff17bf72a409f5213a919554d20525c75efca06b1fcfc1
diff --git a/app-text/nfoview/nfoview-1.28.ebuild b/app-text/nfoview/nfoview-1.28.ebuild
index ac3f5a722095..7118320a0467 100644
--- a/app-text/nfoview/nfoview-1.28.ebuild
+++ b/app-text/nfoview/nfoview-1.28.ebuild
@@ -4,9 +4,9 @@
EAPI=7
DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
-inherit distutils-r1 xdg-utils
+inherit distutils-r1 xdg
if [[ ${PV} == *9999 ]] ; then
EGIT_REPO_URI="https://github.com/otsaloma/nfoview.git"
@@ -21,20 +21,9 @@ HOMEPAGE="https://otsaloma.io/nfoview/"
LICENSE="GPL-3+"
SLOT="0"
-IUSE=""
BDEPEND="${PYTHON_DEPS}
sys-devel/gettext"
DEPEND="dev-python/pygobject:3[${PYTHON_USEDEP}]"
RDEPEND="${DEPEND}
media-fonts/cascadia-code"
-
-pkg_postinst() {
- xdg_icon_cache_update
- xdg_desktop_database_update
-}
-
-pkg_postrm() {
- xdg_icon_cache_update
- xdg_desktop_database_update
-}
diff --git a/app-text/nfoview/nfoview-9999.ebuild b/app-text/nfoview/nfoview-9999.ebuild
index a6e9e5a10d68..7118320a0467 100644
--- a/app-text/nfoview/nfoview-9999.ebuild
+++ b/app-text/nfoview/nfoview-9999.ebuild
@@ -1,11 +1,12 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
+DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_COMPAT=( python3_{6,7,8,9} )
-inherit distutils-r1 gnome2-utils xdg-utils
+inherit distutils-r1 xdg
if [[ ${PV} == *9999 ]] ; then
EGIT_REPO_URI="https://github.com/otsaloma/nfoview.git"
@@ -20,18 +21,9 @@ HOMEPAGE="https://otsaloma.io/nfoview/"
LICENSE="GPL-3+"
SLOT="0"
-IUSE=""
+BDEPEND="${PYTHON_DEPS}
+ sys-devel/gettext"
DEPEND="dev-python/pygobject:3[${PYTHON_USEDEP}]"
RDEPEND="${DEPEND}
- media-fonts/terminus-font"
-
-pkg_postinst() {
- gnome2_icon_cache_update
- xdg_desktop_database_update
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
- xdg_desktop_database_update
-}
+ media-fonts/cascadia-code"
diff --git a/app-text/xchm/Manifest b/app-text/xchm/Manifest
index 5ee968c4735a..3ac0fce18f33 100644
--- a/app-text/xchm/Manifest
+++ b/app-text/xchm/Manifest
@@ -4,6 +4,6 @@ AUX xchm.xml 257 BLAKE2B 0b32e654afe5af057c219830f61989e2266d55c726b90cc73795ab2
DIST xchm-1.23.tar.gz 474274 BLAKE2B de73c04e68b876edefb1d45d9e982bcce6fd3afa06f8704d05fa5cae710d9724ed20ca50be9022570832da9954ba2af141a66e5b3ab02554441c84bac1d6ffed SHA512 c0df4362ff6db8136b20f62a76e7e93185375f6ef9eeeb1001e27ead9806d486332573ba8c3ca1863a70ce6b1d3bcc6d3af48d42add719312774dccfd7d18c90
DIST xchm-1.31.tar.gz 981450 BLAKE2B c0c1908332f4d76f2c4dcf64ed713ae500d1b2022dedb5cb0df294fcdd1ce87d5144ca7347d6bc70b43af29f047ee270ffe05f1ee8da2dae5a5e0586c342900a SHA512 b5e1e979948d202163265f99357b361bb78371a2cc7cdedcc2d2c78207466c3f8291f720c92405913c7c5b9f607d3951a8bb3be3ece3ba1f408ceeb79199e9b5
EBUILD xchm-1.23-r1.ebuild 1089 BLAKE2B 58c42b1eb68d2f84a421e511504b476eaf20e4033c54c032c438ec91a01ea3dc5afdc401ee0b15d650c8df1fcedd07a0a146c172f1d5cffcd4d8074575c561be SHA512 1e2ea33bb90588ba970930ccd7ab8f4fc696e03e1088dec1f65da5be8f139627cac104d9b53a6131a2c0ad2efca0747e0d17d77a684762967a688fba98016ace
-EBUILD xchm-1.31.ebuild 947 BLAKE2B 2e5fe64c1009644c937f5001dbee0225753261825fee7ff78b59e851ad326962d2e508784461f15f092057b3ba970a4a09d520399f831b0f9a19d6b9d18bddb9 SHA512 8416e9df53ea552ac898762b3dd3e26bdd64fb27cf49e996864f557f3245c8d56bbb52c5a85e6c50e7f5dad54e60c9ff7e1c2f83c723986eddf5ccf2db5d5e5e
+EBUILD xchm-1.31.ebuild 946 BLAKE2B 3a79a20c9adc1a6263549c3449fa1c1f36ed7c99808b08007b34d15006de214c0bd34e1b134ef3c77350ab84c890bebfac4a9b78e43f251353b0315f507042c3 SHA512 03e41fdc435f95c64017bd39177997b2e6c40c17f4de4fd9fa295ac050203f9c156913fb8e333b267279d151276a718e070a2f24d76dbda1846c408b9ef307a5
EBUILD xchm-9999.ebuild 1107 BLAKE2B 735bd0f230d0ea1a8cf34805dccbe600b29dd11fca03ac34dc9c96f96064214667f772a2fb2a67c58cf9a7184688282dab944955df83560426e0954510935e25 SHA512 82a8f548dbae62af0df893eed30cb3b332c1bba1ca1ec3af3a82a1f272fec3b57f159e9bdadfb916f422e822aeb0f55be0563d022b9300fe75642a55d4ea5e6b
MISC metadata.xml 370 BLAKE2B b7a2c5ee6e02f758f53ae1f67a982d8e3c0ceffed66524c9072801bc3cb803419824ce0a30b59f9dd16cae6381ae3b1a28a9b084c6dd71ab8d68a3a9be36e5a9 SHA512 f926ec5a7690046f0c1e73da64d5ab9eb662491cdb2ad24d44455ee5a4e94693188a3c8c17f777a0da120a44d57ca00f5713f5472c75f44215213ce41aceef2d
diff --git a/app-text/xchm/xchm-1.31.ebuild b/app-text/xchm/xchm-1.31.ebuild
index 276ca9d35624..de5c0956e1ac 100644
--- a/app-text/xchm/xchm-1.31.ebuild
+++ b/app-text/xchm/xchm-1.31.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/rzvncj/xCHM/releases/download/${PV}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ppc x86"
+KEYWORDS="amd64 ppc x86"
IUSE="nls"
RDEPEND=">=dev-libs/chmlib-0.36
diff --git a/app-vim/Manifest.gz b/app-vim/Manifest.gz
index 0fb9dcd050f3..4948080acfd8 100644
Binary files a/app-vim/Manifest.gz and b/app-vim/Manifest.gz differ
diff --git a/app-vim/gentoo-syntax/Manifest b/app-vim/gentoo-syntax/Manifest
index 5e4623d3c516..4a765255cfab 100644
--- a/app-vim/gentoo-syntax/Manifest
+++ b/app-vim/gentoo-syntax/Manifest
@@ -1,6 +1,4 @@
-DIST gentoo-syntax-20200120.tar.bz2 18593 BLAKE2B c29dd3b3896bdb78e5c07b40474434c5ba6fa8b3a89f8ec237136d0474e8eaace8a72c7e3974ff63eaa24d3e57a1e61785bfc7889a93f7263ef9387caa651936 SHA512 ab57707b4a44f33c085a39eb745ca206312d84ca49680e24a462eb75d65cc37694a545f4a31b4ee2919d0f6b30276ce25f6caa7e20782511c7534bf2319e8a4f
-DIST gentoo-syntax-20201007.tar.bz2 18645 BLAKE2B 5ec28f03dde8d0be7dc24b337fabc02b0fbd53f4a97e4f22b9d042c0d3631f1be3a1e6e7d270b39e43688eb414f04525014acc3ac6e450dc9737341471fc15a7 SHA512 7b5554fdc68616177c906f6185c7c0843a75aac14ed28516d86ab7a37f67c5934e84c15b88c23e39c34665c1a3bb43deeff53e09ec665a4b4822309f77110ca9
-EBUILD gentoo-syntax-20200120.ebuild 1268 BLAKE2B 17f1fcdb03331841097b2a5b7fddff0a8eabff9f95e7fb1e0605887e6a4257757b1cb657085f8cd396ee7a1694177a9cd32899f1944f4786f423d840c42d0e9f SHA512 a3366af4ff69b7e46312c9326ff238c47ae7bc83433d6189bfe17f8e91685604d43154caf343db21b9541c1f49291feb6497fad4ba28f42d91eb5180dcb6fa98
-EBUILD gentoo-syntax-20201007.ebuild 1276 BLAKE2B 7fedf5d7d85ce73923da1974b4e6ea6b7b09f060146e44357acb38f3b1ec0500c081546759b19a5f9f5ca74acf29b2487e37175c2cc7c603a81ee4cb11c153e3 SHA512 990d9dbe0b21ab506676ee36a65f49590a5a804f4e48a17056f904a3c6f343828ead9f5b314b35f374e01fd039d24564f5258335f97bccdd12fdb67d8479d0e9
+DIST gentoo-syntax-20201216.tar.bz2 18631 BLAKE2B 9b68329ae2a64fba1d2a7a9fa6bb60b3a982dc2ebd5b84cf4d95052b3c8c138d7789a25c571e16cde371248e27dd8b28a7b73874749ec26e165724a43bbfaa9e SHA512 f7a6967c28aa669c8bfb114b0c60d52d970b68cd5b02a44f165f85ed5d8f42cff97ceccf4011481a84ab131c06f02725b4d9b53e3cbc0dc116dccb4ce55bd2f6
+EBUILD gentoo-syntax-20201216.ebuild 1268 BLAKE2B 17f1fcdb03331841097b2a5b7fddff0a8eabff9f95e7fb1e0605887e6a4257757b1cb657085f8cd396ee7a1694177a9cd32899f1944f4786f423d840c42d0e9f SHA512 a3366af4ff69b7e46312c9326ff238c47ae7bc83433d6189bfe17f8e91685604d43154caf343db21b9541c1f49291feb6497fad4ba28f42d91eb5180dcb6fa98
EBUILD gentoo-syntax-99999999.ebuild 1087 BLAKE2B 9b7c64f1ec0215aa53e39c0c4db8352c47b19ee89a894dc95ef4a867415337ff901befaadf2ce468804e4167410c1d034002ca476c90925096875b3dc27b8868 SHA512 5f0e991bcc491e807ea86d89c47dcc8d6879c35d0f42d191a4e2cd4d40f117022e70cfb92503184e638273daed9780363066d07667c138592be1e1b6f4435b99
MISC metadata.xml 585 BLAKE2B 7f904a47ab12627ae911fa96328c50af2cb16b785fa0b60cace8a586b17de344625b749b52ef6b89b4751aba74bc25339b3e6c9105ee47d15b5c6539b5d902ee SHA512 dfed3c4c2b3697b00896591dc4b23eb6433ce77b4aaaab05119ca0b11e355e321b2cf5f0ab5e0b2dd075abd1a266908e07b80846a11d50f17155d7ab35e6c742
diff --git a/app-vim/gentoo-syntax/gentoo-syntax-20201007.ebuild b/app-vim/gentoo-syntax/gentoo-syntax-20201007.ebuild
deleted file mode 100644
index 4651f7723a99..000000000000
--- a/app-vim/gentoo-syntax/gentoo-syntax-20201007.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit vim-plugin
-
-DESCRIPTION="vim plugin: Gentoo and Portage syntax highlighting"
-HOMEPAGE="https://github.com/gentoo/gentoo-syntax"
-SRC_URI="https://gitweb.gentoo.org/proj/gentoo-syntax.git/snapshot/${P}.tar.bz2"
-
-LICENSE="vim"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~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"
-IUSE="ignore-glep31"
-
-VIM_PLUGIN_HELPFILES="gentoo-syntax"
-VIM_PLUGIN_MESSAGES="filetype"
-
-src_prepare() {
- default
- if use ignore-glep31 ; then
- for f in ftplugin/*.vim ; do
- ebegin "Removing UTF-8 rules from ${f} ..."
- sed -i -e 's~\(setlocal fileencoding=utf-8\)~" \1~' ${f} \
- || die "waah! bad sed voodoo. need more goats."
- eend $?
- done
- fi
-}
-
-pkg_postinst() {
- vim-plugin_pkg_postinst
-
- if [[ -z ${REPLACING_VERSIONS} ]] ; then
- if use ignore-glep31 1>/dev/null ; then
- ewarn "You have chosen to disable the rules which ensure GLEP 31"
- ewarn "compliance. When editing ebuilds, please make sure you get"
- ewarn "the character set correct."
- fi
- fi
-}
diff --git a/app-vim/gentoo-syntax/gentoo-syntax-20200120.ebuild b/app-vim/gentoo-syntax/gentoo-syntax-20201216.ebuild
similarity index 100%
rename from app-vim/gentoo-syntax/gentoo-syntax-20200120.ebuild
rename to app-vim/gentoo-syntax/gentoo-syntax-20201216.ebuild
diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index 7dbc0d8007fe..09a379de0af6 100644
Binary files a/dev-cpp/Manifest.gz and b/dev-cpp/Manifest.gz differ
diff --git a/dev-cpp/eigen/Manifest b/dev-cpp/eigen/Manifest
index d3e6ffd43c21..2cc1ecb5aa64 100644
--- a/dev-cpp/eigen/Manifest
+++ b/dev-cpp/eigen/Manifest
@@ -1,6 +1,5 @@
AUX eigen-3.3.7-gentoo-cmake.patch 910 BLAKE2B 9cad2b9c54fb1299dfe45f9a94a427d1c7980fa0e5372db69465ccf964e7294213ae459e200a39f2721849df94a8433febcfb225813af3b43bc204b0edd3d64c SHA512 b8c4701f22c483078fb7d25df60c8f002f47573ec434a309b1a3739aecc1c51f79852b06f46c1ed9ae4cbec0e7d70aaabd06bc59e561c19d81b05388d3cedc61
AUX eigen-3.3.8-no-error-counting-in-openmp-parallelize_gemm.patch 2382 BLAKE2B 99d69381ebb3ecf8b097eef69916bde88ab5cec075df623a46537281b37059876ce39e687de4ca441ebe6459c66438f3282d051d0e85b0574df98205be8cf6d0 SHA512 26cdf877d4d3378b322cc08c0430b0628a07279a030732661ba4acb85d6c835956c99474fc4587a170d11437ca6715e56d8eaabb625a1eba7c46ce4d6e4d66f9
-AUX eigen-3.3.9-disable-cholmod_support.patch 655 BLAKE2B 437de3e3bc52df313598c07d3c7c9750dba2750c1975e451c7748dfa8dcb9f3762dcb110334690b9c46fa06453e3d43dde578e6ac4ae49c4cb600e259996e85c SHA512 3e09aeb9bb9ff3538f46a5a41108744886b3541f120d646b69d3b3c49960c370704e07f1a3ac5de92d53224fe5063c02617d1b4a14ba8688039300cd7bb48dee
AUX eigen-3.3.9-max-macro.patch 476 BLAKE2B aa2e810a7be5a934a8bf5844b7e24633ab8f6b6a58388d6d9cb9b4b925f68311443f79cb3f94c8c50adc14f2165530c43b735abc4aa21340868d9330c1e9b4fa SHA512 ad8d10c90136188ffda547b8d8781e9d26bc43d1dba7e9c3ff12f8a73725d1b331dd47bccdd331f998a0b03251eb2e3373a8cb39284f82c4bc63a5a703f21a46
DIST eigen-3.3.7-gitlab.tar.bz2 1663474 BLAKE2B 70c2f6305ca205d62755cf5e90961088938b8daf56b7cc27abf52f0731064858ada523009d6bf5f014e24b34ceeafe59f918c385d12ccfe249ddb675e13d37a8 SHA512 ea3f1570de3be9ec230d2fbd0f2ae246bf5fd13da79835bf546eb31524796f26f9f633ee779f77942b370a8d540c5cbbd8dd033ccec53a44b692c7e407d6266f
DIST eigen-3.3.7.tar.bz2 1665168 BLAKE2B 544d35d1c7a4125affa094c6aa372c2aeca4e99bc60c496ff393d538c1c467b454491a772121450e3a1a43a582d073b4b7584918354d0b9175121fde88947c4b SHA512 c12bfd034d0a1112bf2df3f773ad98f36b2b53fbbfceac5f143ee1793322746fb8a6546d7db7da2a1000da6a535bd8cea0c4125b549afc90a6570743b02dcf3d
@@ -9,5 +8,5 @@ DIST eigen-3.3.9.tar.gz 2142379 BLAKE2B 437dc190fdf7a416d0a5cf81703ef4cc73c195f0
EBUILD eigen-3.3.7-r1.ebuild 2251 BLAKE2B d8470d733ed8c1762e6759e28f96c7559e08d2bec7a80590bb504dcabbbf3e262d655c4bce660e7f6611b6f75095125b9ddb62229d46a535343e6343b257912a SHA512 f839c91a430acfb91c641575eaa9e375e227a8dfc19d0600015819955efb25ea148ff42614b9fbb39129e22038d6711fbf55f4e3cc67fa087a6dc628dc89e1c7
EBUILD eigen-3.3.7.ebuild 2432 BLAKE2B 2312d5d606907923882c74f4842128d95f9fa25eff68ab7217a58131c2fab11f42d8e1658129f29a7dbc68d3ab42510f6289ff1fe9ec7987596f691aebb67fd6 SHA512 e411a3a4c08776dc667d2145e52b23225d88b6bc9e6b36e664392fc26bd34195fcfcf2b54d0b20dec4ad8597f6e262d4dd7671513ab3581b10d0a16ed2713701
EBUILD eigen-3.3.8-r1.ebuild 2292 BLAKE2B ec49dbace8c35444eb8a823270845eca371973500d187d91dbc897329fbe295c0ffdd5bc566301a51b1cc1ac26d51618762fd41c2d958ab4d7d813860df7ad45 SHA512 1aa8b8db7450a986fd3df736de11f7b1060523e30173d0240dc5bbdf18db0cbaf6b5657f2517e8dcdf4dd34b55efba88b3e51686c145b7c0a97502424be2aab8
-EBUILD eigen-3.3.9.ebuild 2514 BLAKE2B 4885159b7021201a54b909c69ed51801aa219d564f2b64387ced79dee1982e9d74dfa71774f8782e9cf7636d37bdd76a46e392a5d5fe286d939576d229d25857 SHA512 4ade209f6e21cf78193704130fdddf171a3b456e98a0622e58d0397986d900d9ef349b0522391766f795f836317fa18b7dfe021241e4c9d8e4b81235ccf71906
+EBUILD eigen-3.3.9.ebuild 2501 BLAKE2B d8023d9f110252fc44f50a8388e53bda2e2e4451838087bbfc048bc95245ec8dabfe4247ab0faa38a84b59bac7afd972cf19a5d7bdd07f19b9c8e5e8c19360dd SHA512 83ea4237d3c482b22ae6396ba4027a41112997af1d635a38ddc7640f6e2b35e6aad6b3a36539a1ddec0adc29b9040d0caa54fb0113ff1af75346489f6d8ad026
MISC metadata.xml 945 BLAKE2B 11864f5eb57e7a8ecfa9d1869536fbfbd9fcb24bc965edad51ec5013bea87a48d63c1b6427b5bffe26191de7e24b950a1c7ad1f0a801fed6b77a41bad4786334 SHA512 99fe52d30c344b957a76a7f6add1dd4251c606f47befa6f517fa50cbd8ba1ef325e66051ff799093cef8281bf1099709e86d3f3a896b078267c665ad68063203
diff --git a/dev-cpp/eigen/eigen-3.3.9.ebuild b/dev-cpp/eigen/eigen-3.3.9.ebuild
index 27c31cc35507..58854ef77aaa 100644
--- a/dev-cpp/eigen/eigen-3.3.9.ebuild
+++ b/dev-cpp/eigen/eigen-3.3.9.ebuild
@@ -53,8 +53,6 @@ DEPEND="
PATCHES=(
"${FILESDIR}"/${PN}-3.3.7-gentoo-cmake.patch
"${FILESDIR}"/${PN}-3.3.9-max-macro.patch
- # disable the cholmod tests, they always fail
- "${FILESDIR}"/${PN}-3.3.9-disable-cholmod_support.patch
)
src_prepare() {
@@ -79,6 +77,8 @@ src_configure() {
use test && mycmakeargs+=(
# the OpenGL testsuite is extremely brittle, bug #712808
-DEIGEN_TEST_NO_OPENGL=ON
+ # the cholmod tests are broken and always fail
+ -DCMAKE_DISABLE_FIND_PACKAGE_Cholmod=ON
-DEIGEN_TEST_CXX11=ON
-DEIGEN_TEST_NOQT=ON
-DEIGEN_TEST_ALTIVEC=$(usex cpu_flags_ppc_altivec)
diff --git a/dev-cpp/eigen/files/eigen-3.3.9-disable-cholmod_support.patch b/dev-cpp/eigen/files/eigen-3.3.9-disable-cholmod_support.patch
deleted file mode 100644
index e3b9db5a1707..000000000000
--- a/dev-cpp/eigen/files/eigen-3.3.9-disable-cholmod_support.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/test/CMakeLists.txt
-+++ b/test/CMakeLists.txt
-@@ -46,16 +46,7 @@
-
- set(SPARSE_LIBS " ")
-
--find_package(Cholmod)
--if(CHOLMOD_FOUND)
-- add_definitions("-DEIGEN_CHOLMOD_SUPPORT")
-- include_directories(${CHOLMOD_INCLUDES})
-- set(SPARSE_LIBS ${SPARSE_LIBS} ${CHOLMOD_LIBRARIES} ${EIGEN_BLAS_LIBRARIES} ${EIGEN_LAPACK_LIBRARIES})
-- set(CHOLMOD_ALL_LIBS ${CHOLMOD_LIBRARIES} ${EIGEN_BLAS_LIBRARIES} ${EIGEN_LAPACK_LIBRARIES})
-- ei_add_property(EIGEN_TESTED_BACKENDS "Cholmod, ")
--else()
-- ei_add_property(EIGEN_MISSING_BACKENDS "Cholmod, ")
--endif()
-+ei_add_property(EIGEN_MISSING_BACKENDS "Cholmod, ")
-
- find_package(Umfpack)
- if(UMFPACK_FOUND)
diff --git a/dev-cpp/nlohmann_json/Manifest b/dev-cpp/nlohmann_json/Manifest
index 57a8f4814969..16e266bbff34 100644
--- a/dev-cpp/nlohmann_json/Manifest
+++ b/dev-cpp/nlohmann_json/Manifest
@@ -7,5 +7,5 @@ DIST nlohmann_json-3.9.1.tar.gz 6882818 BLAKE2B 97276dc2345ac2070ac2d30d0a2e1953
EBUILD nlohmann_json-3.6.1-r1.ebuild 798 BLAKE2B 65d37e21588513c043122349c2e89450565b16c534d58849c8af36a9f14695296c624664db03585f0dfa5e8ec935dabf765290155a38714a28fc749bf66c02ea SHA512 b693e518ec9a21edbba894628d31db72463f0c54a4ae7aee190c680abec3b5197937367f44d6aaf5673a31e7a86114760ae3016a9acbec4463038dd8abbbf4c7
EBUILD nlohmann_json-3.7.0.ebuild 802 BLAKE2B a224e06c3ef1199734674a2f693c448a1c621a2426887912510d5a09fdca0e9a108adf982bf074306098b428e5eef0d4b2ac02697038bdf41ab4c0dc38e39e82 SHA512 8499faa38a4de2f8733bfaeb2484cf7a125819db48836df2a72cefc7c107d88db5574f8096243d91f4c3e4b97a5f56e53c4fe98bb471636ff3f50d6bb107215b
EBUILD nlohmann_json-3.7.3.ebuild 858 BLAKE2B 852622cec3d775387e1a63bd1c7fdec647d5aebb7d672dd90f780e04cfd3c254f76a56363d4b955277b80aa48dd99e8e044680735fa5a3ff05b575f64e2cdc8f SHA512 4a9435489e2fb3840ef663a915004056d3faa0ea2b6bc24d9d77d74e5c7ccdf2700a1a568938a27e7bc071bb5a9068165369e8f51d20b6217151c578c146ea55
-EBUILD nlohmann_json-3.9.1.ebuild 1373 BLAKE2B c05bb8b6fc2eb75656eee312a21a9221c580a4cdd82ea1d94f1b670d099d236b9dbb0e20f7c3ecc54cd622a967df79b466979f052d149cfe84fe5d60ac5be5f4 SHA512 4b822a87f22569ccb338da02dfb2077cfa644dfcc77046fbcd86397cd3268f64bb6a6079fd4b3f0fd09f06c902830cf4a2ffa40a986f1cef52533a6b1c3e63c8
+EBUILD nlohmann_json-3.9.1.ebuild 1372 BLAKE2B fc3932b18b1a6bc51d9a31f894444e2b4605b0fa35bc326ceb5208ac80f440a9f91b640fb504e3389b464fe395a63f5000efb24d09d22f66991e0365385a3b5c SHA512 eb4f31474af6344b6c0548b1501d01af6876a0eb9b60fb21c806179ee5e295b67f10d3fcd8611d1771ebeff97ac1e0d225e122a9c335993202621c7093467e93
MISC metadata.xml 337 BLAKE2B a929f6f116c9b0bdf3415325cc710b4b2afa1bb2b6a74c8df9531ad0358d8141054cee8be2be7b380574a8c59359f1c9e9bd8b7fcb607b8da251b787d75dcf43 SHA512 d6ae8564e57c1062487634fb7d4e2c0fa4c79a38d89c06c3514d3459cfd08500634a5fc8add1e126f3181b711dae74931c906b67f6aac51d6400cd2800f293df
diff --git a/dev-cpp/nlohmann_json/nlohmann_json-3.9.1.ebuild b/dev-cpp/nlohmann_json/nlohmann_json-3.9.1.ebuild
index c040d31592de..cbad769efb0c 100644
--- a/dev-cpp/nlohmann_json/nlohmann_json-3.9.1.ebuild
+++ b/dev-cpp/nlohmann_json/nlohmann_json-3.9.1.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/json-${PV}"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ppc ppc64 x86"
+KEYWORDS="amd64 ~arm64 ppc ppc64 x86"
IUSE="doc test"
#RESTRICT="!test? ( test )"
# Need to report failing tests upstream
diff --git a/dev-cpp/sparsehash/Manifest b/dev-cpp/sparsehash/Manifest
index e91245feb26e..5088b6b8523d 100644
--- a/dev-cpp/sparsehash/Manifest
+++ b/dev-cpp/sparsehash/Manifest
@@ -2,5 +2,5 @@ AUX sparsehash-2.0.3-fix-buildsystem.patch 2649 BLAKE2B d7a5e7d4343279af069e0b8e
DIST sparsehash-2.0.3.tar.gz 322046 BLAKE2B 3749875bfbfa0ec9b92cfe68496a318208539745ca1b76910193879cb9ac790952b390cfbd941ff6e9714bd61546844e8f2d958d9b24845efeb54743facac136 SHA512 bb00d0acb8eba65f7da8015ea4f6bebf8bba36ed6777881960ee215f22b7be17b069c59838d210551ce67a34baccfc7b2fed603677ec53c0c32714d8e76f5d6c
DIST sparsehash-2.0.4.tar.gz 323154 BLAKE2B 8e0da89a6ae684271293f048092d6c79d14818f7ab9d4fa449414b3354f9e7769d9b0cc724227c47a1be7c7357cdac5cf6f3873047a08c8f085cc457858a8826 SHA512 40c007bc5814dd5f2bdacd5ec884bc5424f7126f182d4c7b34371f88b674456fc193b947fdd283dbd0c7eb044d8f06baf8caec6c93e73b1b587282b9026ea877
EBUILD sparsehash-2.0.3-r1.ebuild 520 BLAKE2B 13fdb6d8404479aa367344b2f5c49bb12074856d164123793240577aa3133214246549485cbfcf064aaf25045f2e3085ba5a1a696976b5d8a39d68ada4ffe273 SHA512 805380e93b7ef20ed633ac1971b76c0d1dba9a27687772cb1bfb067d63a575a8c59d95ffb9658a9b550b14d04927685d66dbaec00a93426c64c18dea1ff9b284
-EBUILD sparsehash-2.0.4.ebuild 529 BLAKE2B db5ccdd48cabf615f997783def9208ff17bbec1ef235910e87b29e737cc75a1ba45833d2f3eca109cf7a4cb673ab180b402da7993d2ca3c9a5e566af5338fb71 SHA512 76281fee711765bc9e19b181739517541e73e117dd4d3320f8d17717c780ffad08df1b0d73698cf88d19132e92da520b4227d5438bffb6bd469f093ec24e09ff
+EBUILD sparsehash-2.0.4.ebuild 528 BLAKE2B 89c1b8bedcf6d66eacd627958da7dd5497443424de827f8890a5b05b56c4d4036a0d33ec8fddc7df5a902cc3c9a38225957ce61b129e60ac29056d6c5ae3d249 SHA512 ab0e061281066be125f9318c3b74c919f3f2e50627ecc992bbbc439be4ae36e8f3592647815412c4dcfa119a1bdbbfb6c543354afdc756e5b5cca284e05b5a17
MISC metadata.xml 454 BLAKE2B 051ab33e4a21fbe135aa5b8ad470e5f6c896ffee33b3b17f99f26c77af09bb7171da7e5860bd2fd303d73533614c0c129f9147579cedc97f884b6b6945870778 SHA512 db6bbd6617ffefcec0f70a1112abd1a57d836fa5d1285eb0a9dad86c782695035d26b75fbb56f83a5a47a76d7a1f96bae5d9a52713b9f1406f437a68d19d3346
diff --git a/dev-cpp/sparsehash/sparsehash-2.0.4.ebuild b/dev-cpp/sparsehash/sparsehash-2.0.4.ebuild
index ba450049d43e..bbfba1ff0074 100644
--- a/dev-cpp/sparsehash/sparsehash-2.0.4.ebuild
+++ b/dev-cpp/sparsehash/sparsehash-2.0.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/sparsehash/sparsehash/archive/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
S="${WORKDIR}/${PN}-${P}"
diff --git a/dev-cpp/tclap/Manifest b/dev-cpp/tclap/Manifest
index 0b9850ed3457..3f8c8870e176 100644
--- a/dev-cpp/tclap/Manifest
+++ b/dev-cpp/tclap/Manifest
@@ -1,5 +1,5 @@
DIST tclap-1.2.1.tar.gz 442387 BLAKE2B 413d77f59224dd7751621f32a5712178c4954cb532095203a1eb839c97d20e8651f94f90d4961a47f654d5b478946fb988db66df0d17c8230fde0b771af77405 SHA512 8bd6ee724600880840048c7b36f02d31b1aa4910b17f80fb04aef89b1f1917856d9979ec488edbd457b66d9d689aea97540abb842a8b902bbd75c66a6e07b9b1
DIST tclap-1.2.2.tar.gz 231714 BLAKE2B 94fc3d5253c08a305e5f75f6b4b7ab556e94980193502b64665ff828609cde20f340e3fe18cef12011da07ae2db2c2bb52a08f112d052d74c45be8290d525092 SHA512 516ec17f82a61277922bc8c0ed66973300bf42a738847fbbd2912c6405c34f94a13e47dc964854a5b26a9a9f1f518cce682ca54e769d6016851656c647866107
EBUILD tclap-1.2.1.ebuild 566 BLAKE2B bd3c30004fb51a75d05638dc278b5df220d7df31e2c59466b8e62b9053a591b7ff0e46a1bd5a2ec357667893c983e020eb41fffc2ab06cf992c9c8760bc7d159 SHA512 9b8c12bb936f420fb787032854fafa929f1b84b7d6794559a5abf4eb776f51583c41be3a3b780d1272bb4aff3788259f9d324529f1e78059914a9c6f80419a44
-EBUILD tclap-1.2.2.ebuild 551 BLAKE2B 29a37192e9d844be8c6c5f6f7eb20ba2c2a98fa852435c1339614577be0c83c273dbbf4f8f42f5b458d5a8d52a865a2fbfd8bffb03eb7c59cbd84a1ea4e2d262 SHA512 d3fd3f6034d82343f1313e40a3053628a7a127c19034b9598f9066fae9f0c092a37a81075d0f4a47cf4a3ca4c71c4d95be3ae69edb116a47f19b30483da6af8e
+EBUILD tclap-1.2.2.ebuild 550 BLAKE2B 1389a2ff6c4d1c94e6efd98a0d51e7bc52b4c002f5e94847f7c6445242eab77ce15506b3b90d6991c22f8364799c0e17935b530857e33d891224cede3ed073a0 SHA512 0dac667042f9ab5026c56b0ded8a8aa0a9c44c93d82af8295f094ffe2f87d2d40f3bd8c613cf2abae9cee5d2023c5320b5ba7a2c15a2cfb1800822bdd98e9a13
MISC metadata.xml 438 BLAKE2B e325bd7ec0e700a1880e240b8dc045da9cc393b755180b529594e1b65cd888156b059c0391673f69379851f7ffbede7cb49c8749baf8164292fb9926ba372445 SHA512 892cde44dd9d835b40d08872c00b4d5ed9090f1ee6bdfe706a3d387b49a9e3552b3f899653a88a39732601de8ae9be9b8f6057d5d4b06f77d4d5f4b277c49583
diff --git a/dev-cpp/tclap/tclap-1.2.2.ebuild b/dev-cpp/tclap/tclap-1.2.2.ebuild
index d71a13881861..2aa9fa40d0c1 100644
--- a/dev-cpp/tclap/tclap-1.2.2.ebuild
+++ b/dev-cpp/tclap/tclap-1.2.2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm ~arm64 ppc x86 ~amd64-linux"
IUSE="doc"
DEPEND="doc? ( app-doc/doxygen )"
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index 213ad946c0cf..ce8c13b4fe56 100644
Binary files a/dev-db/Manifest.gz and b/dev-db/Manifest.gz differ
diff --git a/dev-db/mysql-connector-c++/Manifest b/dev-db/mysql-connector-c++/Manifest
index ae992e29152b..3e96dba6c1e9 100644
--- a/dev-db/mysql-connector-c++/Manifest
+++ b/dev-db/mysql-connector-c++/Manifest
@@ -13,5 +13,5 @@ EBUILD mysql-connector-c++-1.1.12-r1.ebuild 1636 BLAKE2B e0e977f956845c46bc99a00
EBUILD mysql-connector-c++-8.0.19.ebuild 1067 BLAKE2B 8407348e0e4da0ea8acca8ec0caa33a0c2e863c9a95d6951ce500b6306b77687e76ca867eeeb580dc5e9b8a9df3dff7ca0a8cb8ae95403a9a117d50d2dc8d869 SHA512 83d72ab1104a0ebd014d8b3e1f475944f16a18dc4836386e3ebf7b16df547f35cf7db42c586411fcef80ec6273f15a0f9531b197eaecb991a62301d9a9d3ff4b
EBUILD mysql-connector-c++-8.0.20.ebuild 1070 BLAKE2B bd6b438aa0a660bc19a50695ed77fa5f952aabfb6ff1996244eed5846476bb0c725cf2d4899105c88f1409725ebe80970655ac4f51b7012d1fccc3539a69a062 SHA512 d54363d3172c98ef6d500a336fc98c8d8abdd28e443e09e2ce50e85353c374cdd95739b9d6ab636d4aad3a8647bca1eb99329a761a10ff3ffb2040c1ec3796e8
EBUILD mysql-connector-c++-8.0.21.ebuild 1055 BLAKE2B 7a85e4631367e2a34989a8fc998d80d87c5b6b0220296e7f2f75121766db9c10f66b8838e633c0fc51b43c8314e3521a7cbc1fc0ed2a6fec87e67a6a18b0e91c SHA512 7661f1404a55a3342d90c26fbc36e0f1dc060301f82aadf4b814eedfdeeb7a9698f05e3ab8c552b1be03490e6a4591ac36ca28a7a60604a98844a9136ae063cc
-EBUILD mysql-connector-c++-8.0.22.ebuild 1056 BLAKE2B 1e1ab96e6aef2ebc122b6234ade2ae7463b4bd0fe78aa15317e3045246e561e09516b5d08396453cb2f7f92fd4c20ae41f93b0517e1201b23bcff89c958fcfe5 SHA512 293337b5b82fc9dbcfb9af999bfbb3a1bdcd8e30455d9cb24deb827491f84c0f2ad98fa6c6a812c61efa122e26f16c64146552df2b7aa6c57540330fdda52bf5
+EBUILD mysql-connector-c++-8.0.22.ebuild 1055 BLAKE2B 38dbc920d1e67aa065f6f8dfef6c56a515df757c8939e5f893941e66ae2ad361e350abbbe51b824ab4e24017dd55b0a68f588f99d0cb6d74b8713ddbbea10734 SHA512 1390b0edd15b93ec2446278ff70c043fb4ea2a1311e66099b5e7d558d1de2a6698e59ca609c933319c51a47c042a1724faef0eb70dc25a1e7fc5e19cd668e836
MISC metadata.xml 378 BLAKE2B 43fdbbc8d3b6ef99e51da96ddfefbdeaa70ef5fcb2fc6067305f75f75b7ee2fd21b79ca76704d8752bf59ae057b28efb187b063770964246f93fea629b58b467 SHA512 c6e545fb60d306792421ea26a937aaa6aea53d2a4100c9cafe78cf695c9dd0620cf3e770d43ff42749ae42bbe3a35212407ea84edee9af2dcb0255c2b763ddfc
diff --git a/dev-db/mysql-connector-c++/mysql-connector-c++-8.0.22.ebuild b/dev-db/mysql-connector-c++/mysql-connector-c++-8.0.22.ebuild
index e72e5f0274e1..3f0eadd2941b 100644
--- a/dev-db/mysql-connector-c++/mysql-connector-c++-8.0.22.ebuild
+++ b/dev-db/mysql-connector-c++/mysql-connector-c++-8.0.22.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://dev.mysql.com/get/Downloads/${URI_DIR}/${P}-src.tar.gz"
LICENSE="Artistic GPL-2"
SLOT="0"
-KEYWORDS="~amd64 arm ~arm64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="amd64 arm ~arm64 ~ppc ~ppc64 ~sparc x86"
IUSE="+legacy libressl"
RDEPEND="
diff --git a/dev-db/mytop/Manifest b/dev-db/mytop/Manifest
index f0ace263f7a7..fea746ad785d 100644
--- a/dev-db/mytop/Manifest
+++ b/dev-db/mytop/Manifest
@@ -6,5 +6,5 @@ AUX mytop-1.9.1-queries-vs-questions-mysql-5.0.76.patch 3431 BLAKE2B 4d1d18cd3c9
DIST mytop-1.6.tar.gz 19720 BLAKE2B c7cd4e75283a52e505e09ee3f1618877832be16154e2d313f3a9a71c53a604f67180c892b13209b85c584db0c67c66461064b9c5c99352685518a65f2d3cefc5 SHA512 672209d828c70fd740a791f2e4dfac1e4c594adff197b8bc43322249f03f6c7b18a750da0892c1519fe29e24b661e41d40cdad3a29b546dec4b3a747155566e2
DIST mytop-1.9.1.tar.gz 22095 BLAKE2B d0281fce93d9165593d5a94229a5de0d2b18d38b02e69329322e62611b5d9546d08626ea60ea7ede4d6ee88fc7df08c733cb5437fb47c468e0d591d7dde00595 SHA512 e6d38812dd69f5e330e5fe9206abe7e00c9e08dd61ba52a9dbd18a823bb09715832d27fb8db6fe1146d78eb56845cc0a7e2a72989ee56267d6482238fee84bc5
EBUILD mytop-1.6-r4.ebuild 895 BLAKE2B 86cc5ec6b0b390c1270daef2ead374f51ced6102cd50cc3cb5b4fb03dffdb6843ca705396c5b8d264c6c921b5535ebf41e194eb72b7836f1563748cdcfa3d2d4 SHA512 6e55cb2898e98fc3d363af7ee8c36b232d8c3b1bf5321893b11343a0e60897e135f6ad39d796e4c7872e6a934eb5e4c2921e04c21590a7067b47aeaa4b105378
-EBUILD mytop-1.9.1.ebuild 819 BLAKE2B 875526378cde5b771663733fb81be9d2a63d2ae60178aef424c055c23772365a874566daa0dde3911be2c46c74482b226c2156e4e4fcc4a5d7b573e4e0ff28da SHA512 59e2bc37d7ac1861a21a090c2e493fecdbe68a047686a9e361b98f70fdc04e659470b31253c1d9bb652584a0a481c7a1ded24dcc4789b2c7f12546d77fece892
+EBUILD mytop-1.9.1.ebuild 818 BLAKE2B 69e693945e30b7f5ec6a37c03abcce2ed8affbbeebdb355ee5e1a0932cd3cc0b77707fd14bd73772431dfcb610989fc242edbb706593176d40d54cd5073f5fe5 SHA512 973a39bfc22fbe8b86415295d12f323d4a1ccc930a90bce53f24f5f2657cc34c9991cc04874335d6311c87b6a961e79f590d867a4ac19a4464ffe2e6dd878ddf
MISC metadata.xml 239 BLAKE2B c4d6706d083b72927d239f41a644a4009c054c1c1a388af7733d3a2daf47d354009eb472573304a6be272601f05535297bcd9ceaea811a741cd905577ffe53d1 SHA512 e6e2fafe2f503db1d12e3d2368a99631ee8d014b7ea802d9879e7e3e2c0f9378675fffccd78ed09b914ae781ac3902567b1a53a721906e3ea63ceb51d0a1654b
diff --git a/dev-db/mytop/mytop-1.9.1.ebuild b/dev-db/mytop/mytop-1.9.1.ebuild
index abf078984e41..004f5b3371ee 100644
--- a/dev-db/mytop/mytop-1.9.1.ebuild
+++ b/dev-db/mytop/mytop-1.9.1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="http://www.mysqlfanboy.com/mytop-3/"
SRC_URI="http://www.mysqlfanboy.com/mytop-3/${P}.tar.gz"
LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ppc sparc x86"
+KEYWORDS="~alpha amd64 ppc sparc x86"
SLOT="0"
IUSE=""
diff --git a/dev-db/pg_top/Manifest b/dev-db/pg_top/Manifest
index b7f3e56d1ce7..79f18eeb9935 100644
--- a/dev-db/pg_top/Manifest
+++ b/dev-db/pg_top/Manifest
@@ -3,5 +3,5 @@ DIST pg_top-3.7.0.tar.bz2 236076 BLAKE2B 87a29d0237aad48b683c17ba56fdbc4a90f854f
DIST pg_top-4.0.0.tar.xz 117920 BLAKE2B 5c13fd868804492ccce3b660875602df958f065126f9dc17f45ebcac7961384cd1d3d3313da49832a1219ea7e86ae78cbbdb975467b13b32d5f836f5cd33a443 SHA512 b7a016137495ceecdcf0ac0e95c73b7eca20b57264f7b63b0a38c3f31db742c704ed0094e07f6df051bce9bc26214f5a8f66ced1e923bb66e0c86fff1e2ffc19
EBUILD pg_top-3.7.0.ebuild 621 BLAKE2B 3f411c73e55bdbe3db445d6cb23de24d478d7edeb18e8657da639f73400655eb1dfd95036f469b014ca8e467b02438640a0495ab60697478896735004f15d1f1 SHA512 b78758656bc4e2a1fa702bf2e03f108aa91c7815db10da22a16ca1e6f8939e443577b82d4458f741c991d8742c5d8ebfbf22ca977a638b9e224d1dc425b61564
EBUILD pg_top-4.0.0-r1.ebuild 503 BLAKE2B 63696aa64d340b27d60fa544cf064dfaacf1e3f710aa86042068cea7cf30b040779f2b147f250cc7b019ffe74cc0ccd92d539fa5bac9b39dc0711e4b45190f9c SHA512 ada49d5653fd5c2e722f1e26ff1f7a7cc75f0191140b2f2383318baf01f397d484693080e769dc284f4ad92e719646cb25404b80f0a101685122ff268a2d3796
-EBUILD pg_top-4.0.0.ebuild 401 BLAKE2B 5df7c89bac799f355746deae2b915d1572b0e4292f062a1dde7f7c99c44ae03141042689b2606964cfc7dc3ab9c4c170d2d91757443391c9024843a71299dfcd SHA512 34d7e8a2e95e14046e8ed55861ffe0bb6b2b837860a03df1163757da75671052d92562354fca5187ef0146e8fc2023cf4a8c3aa74a3f0e980262971bf6a8a4cd
+EBUILD pg_top-4.0.0.ebuild 400 BLAKE2B d5ac60a50fa11db849c9457077ad063151772d9c95e43c85b7267e056b011c54226f867fd2d6190775f6cd95ab78f6dc46bd88318bc1ab3f21ba54b5393344f1 SHA512 92e5c7de0b037b57a75e995953fd26f4ff4f1651f5945b95c1af61d4e708349a2f262c3dbc1a019bb56b4f6541bc51f3d607893e5dd0bb0b2f6b7ec78a50b53c
MISC metadata.xml 461 BLAKE2B e6f8d76b546b6b6b6cb13dc1158f71d20f3c68fc9ecc9b37ccf8d8581ec8699e5faab5bd4b10100a0897f668e04449e8f67622e3e3eeb3fdbc54023af536ec0a SHA512 ef6740e37b9d51eb8d303e393d826c91519e8fbd2fe66930486bfbf16bf3bfe09f1a90040a044428841ed61dd6885eefefa2fc9bc43a08e6d4e2dec4a67ba9fc
diff --git a/dev-db/pg_top/pg_top-4.0.0.ebuild b/dev-db/pg_top/pg_top-4.0.0.ebuild
index 28d2942c81e7..45ca3ea8b48b 100644
--- a/dev-db/pg_top/pg_top-4.0.0.ebuild
+++ b/dev-db/pg_top/pg_top-4.0.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://pg_top.gitlab.io/source/${P}.tar.xz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
IUSE=""
RDEPEND="dev-db/postgresql:="
diff --git a/dev-db/pgagent/Manifest b/dev-db/pgagent/Manifest
index f8f4b90cbb99..ba8bf38fdf3e 100644
--- a/dev-db/pgagent/Manifest
+++ b/dev-db/pgagent/Manifest
@@ -9,6 +9,6 @@ AUX save-stderr-jobstep-output.patch 2626 BLAKE2B 8a0eb06fecb9450e027219f2ede7b9
DIST pgAgent-3.4.0-Source.tar.gz 45081 BLAKE2B 81f074213285253743127188d9e203cb01d8492ce502dc5215279c7c557fdd7f532fa383a4578a8d9cc8ea46668ea971015e4cc5989d1b8022ed8924a92b988b SHA512 3b068fc6f5e51ff20604f8cec3e067d04b5b1537229da15ee442000f5fe834697a4eae86be0e9a58b8ee5da24cc985c8c9804d71cb2a50e93ec4cf9a424a4ff0
DIST pgAgent-4.0.0-Source.tar.gz 63561 BLAKE2B 1731e748a6a5e76cd8b177162eb5b82ae633d1b507739e3193a8857a0eee0fe775fdaadb871eb5d708c0f7e80558680b5d7d246f4cb5d2bc1c10955bdf9cc09e SHA512 df2d6f5817d83d4cf60f0f1106718225870bcfd2f5b882765e5fd459e1614208225f90b29de492bec5284f3727f3d4be9f724b92ef503fea08029fab22a8fbb4
EBUILD pgagent-3.4.0-r3.ebuild 2059 BLAKE2B 3ecbee255f034b6d9f8110a951148fe30175ea680b12991a9a7924d9b703f7323935ba0378c2168bc490b99f0d6ea41e065a59f2f96d09dccca5ef27b6bedf39 SHA512 c1c7a60dca4cfbd71eaf3af8fd05737b06274e9575846db33ec062de9c6f8e766866dfc3b9f5d4642543eb8b243e8e967185ad51fadf61b520eee28a0c566ea4
-EBUILD pgagent-4.0.0-r1.ebuild 1240 BLAKE2B 29669c503503e31f3553eb4011653ff36f8e068f3add1722c9ed5b6ab82ecbb45ffd4246ce901d2aa2eb6ba7e51987f29fc839eee57d7598947aa9728deaadf8 SHA512 07c544c2f6823186d341584b75b80c195d817bcc64aa036bc4f22a5e7a5dacc29afc19969604e89e08410a7801e8c643a75413b7b3a043ef68c83276f0ee71d7
+EBUILD pgagent-4.0.0-r1.ebuild 1239 BLAKE2B 765398f1d00a72a30ab9b676d5688ddd9370b4e29324938fff1b85694c8732d64302ab0d3b6b7e91f3d44ef5f7c42492553b5581aa7422e0a9f6c617db6eb72e SHA512 b2054c28cd377fd4b69e895ae8a5494cf78fd15f23d67171f91f15c7369ae9ba51a0bd832ab8a889b50e7ab5debad98e9a5a21f693460404052f4ced3a98e236
EBUILD pgagent-4.0.0.ebuild 1177 BLAKE2B 8db48f73f87790fa3fde33b846bb62093757ae6b70735743081b36eddd99bbdd7d8f4a094546d889362bb2f00c13b49a266776d6828547db4853b078c48c52f1 SHA512 2a732df46d076d08a9934d73a4ed1ee15d0de5e1f94b141f0a64eb80fcd77800c06db4baaec333da36a509a7ec7ed5e59d57e673fadc25d5b64d6da8da700ff1
MISC metadata.xml 298 BLAKE2B 40abb765b052aa2cbbf749c54c686f1c98968cb1af2e93c149bfbfe6244d3c17e827189d7a1da90a566016758bfbed63b16ad0a0328725349748d1b18b2437b1 SHA512 167896d1d92ccb4b171cce16d63405369a9e28b0d01c12b2ed94fcec1f982892e179c007287fc3386e1c00393d6570a2ae9e8efe9420e53a82308426075d5c89
diff --git a/dev-db/pgagent/pgagent-4.0.0-r1.ebuild b/dev-db/pgagent/pgagent-4.0.0-r1.ebuild
index 588908c4b242..50120fe2593b 100644
--- a/dev-db/pgagent/pgagent-4.0.0-r1.ebuild
+++ b/dev-db/pgagent/pgagent-4.0.0-r1.ebuild
@@ -8,7 +8,7 @@ inherit cmake-utils user
MY_PN=${PN/a/A}
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
DESCRIPTION="${MY_PN} is a job scheduler for PostgreSQL"
HOMEPAGE="https://www.pgadmin.org/download/pgagent-source-code/"
diff --git a/dev-db/pgcli/Manifest b/dev-db/pgcli/Manifest
index 49d67b4514a2..3bade1fb664d 100644
--- a/dev-db/pgcli/Manifest
+++ b/dev-db/pgcli/Manifest
@@ -1,5 +1,4 @@
-DIST pgcli-2.2.0.tar.gz 436991 BLAKE2B 9041240952a8ba9a770705850bf4281eaa89ac5b970366c7ec27e705bec65d9c3c455fb2c9d2220d53f4a9ff31142501437faa6974839f6fe59e6fc1618d8a6d SHA512 239a3278b604248b7bd5cdaf4d0b0f3e62188617b04c358d123e2fa2ad1449c3854ef84995b89239fcf559ce010ee0dd80e12ddd72b27dcb89f92ac08d34c49b
+AUX pgcli-3.0.0-sqlparse.patch 1258 BLAKE2B bb899fcd3e059e3380d3bdba12765a1709af9cdb7f9da7358a436afc7229c8b33a2c83e27895321b6fe327ba2e81a35166a04649928d52215fc429df09d16b63 SHA512 c2e40269a65fe07140329c70d063e23dbf6853939005a35b209d1f32bb60786ece4fc37c760fc25ecf4859cde0cf7a4df158caaf6e40660a158bd102ecf15173
DIST pgcli-3.0.0.tar.gz 437733 BLAKE2B 5db69997f675812c3ef847b220b66e7872b134b4d8debd668154bdfa6020432ac08829e7c2ce42adc4cf124e84de5eb9aacbe19636216502f81373a71f21b68f SHA512 7ac52cbfc492dc85163dac7df7a5dde6bfa0327ac1ef6580891cb76d617b998d74c2a59b27d2f8abf8699eb5a69aba30bf13e95ad7bee75c83350730ac061262
-EBUILD pgcli-2.2.0.ebuild 1227 BLAKE2B 08be8bcd8eda124c8255abce36cf761a4e3f3575895ecc74d07d1a502db90b8e8d7342f659582b8bf178ad3eda913aba8ebe1e9996ab4eaa41241dc066debb21 SHA512 cc67eeb6889411784bd79f226d8a000fb54f040b25be2f5a1dbffb39331b28a92d9385c09cb5129638e44a3610492b399ea58754a5ff858fb37706d9d2fb5ff7
-EBUILD pgcli-3.0.0.ebuild 1190 BLAKE2B 5372491093076a14591371c22fe76f4f267a3cf33a3ee4bec09987b343ab1ca427007aee6120859af33e1bc6e8296971b483d3cb1732db67050fa7298acae38f SHA512 c4e5711dfc90fd80d3b3327d8381e5aae7e1a07757b1bff9c4163d7827398b42b29b8ea7f12117a07b6a1588aa516c0a9e99049ef9eeefa6463f9bc94b6f438e
+EBUILD pgcli-3.0.0-r1.ebuild 1066 BLAKE2B c879ab11069b87424a5c9118e27f0b0ec06f9dc2d9d5584d13d25f2c52dc4365e37656ab9c0d0df2fc00713fa8a3840f7796a4af4452cda23ee5948d79d563bf SHA512 85b78c0153202b25ea0b3900a9c26579655f4fcfbe735ae271f0a32f3544791348f82d8a758794071b895863538fa47fa973169d2d92f1630e7f4f57615b9e0d
MISC metadata.xml 460 BLAKE2B c6dc837776eb72ba61b0b0e00cd3f3adc022b70385204346eb2aa0eb8229636ab230be67b194993b22e18cda08b4f968ff02b96d390b8782aac2a4f4de92d7ee SHA512 a3b44f66861c5f8b66cda0fcac6b1d3418bf04835e7ed202ae22faca50ee22187fda785c6e7e7c0848f31b88e1cd9c8c6b4be1999eb600d48965edff2e959c35
diff --git a/dev-db/pgcli/files/pgcli-3.0.0-sqlparse.patch b/dev-db/pgcli/files/pgcli-3.0.0-sqlparse.patch
new file mode 100644
index 000000000000..4403a2e9c037
--- /dev/null
+++ b/dev-db/pgcli/files/pgcli-3.0.0-sqlparse.patch
@@ -0,0 +1,37 @@
+Taken from: https://github.com/dbcli/pgcli/pull/1224
+Author: Kevin Marsh
+
+--- a/pgcli/packages/parseutils/ctes.py
++++ b/pgcli/packages/parseutils/ctes.py
+@@ -16,7 +16,7 @@
+ def isolate_query_ctes(full_text, text_before_cursor):
+ """Simplify a query by converting CTEs into table metadata objects"""
+
+- if not full_text:
++ if not full_text or not full_text.strip():
+ return full_text, text_before_cursor, tuple()
+
+ ctes, remainder = extract_ctes(full_text)
+--- a/setup.py
++++ b/setup.py
+@@ -13,7 +13,7 @@
+ # see: https://github.com/dbcli/pgcli/pull/1197
+ "prompt_toolkit>=2.0.6,<4.0.0",
+ "psycopg2 >= 2.8",
+- "sqlparse >=0.3.0,<0.4",
++ "sqlparse >=0.3.0,<0.5",
+ "configobj >= 5.0.6",
+ "pendulum>=2.1.0",
+ "cli_helpers[styles] >= 2.0.0",
+--- a/tests/test_sqlcompletion.py
++++ b/tests/test_sqlcompletion.py
+@@ -816,7 +816,7 @@ def test_create_db_with_template():
+ assert set(suggestions) == set((Database(),))
+
+
+-@pytest.mark.parametrize("initial_text", ("", " ", "\t \t"))
++@pytest.mark.parametrize("initial_text", ("", " ", "\t \t", "\n"))
+ def test_specials_included_for_initial_completion(initial_text):
+ suggestions = suggest_type(initial_text, initial_text)
+
+
diff --git a/dev-db/pgcli/pgcli-2.2.0.ebuild b/dev-db/pgcli/pgcli-2.2.0.ebuild
deleted file mode 100644
index 54f699d3aa06..000000000000
--- a/dev-db/pgcli/pgcli-2.2.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-inherit distutils-r1
-
-DESCRIPTION="CLI for Postgres with auto-completion and syntax highlighting"
-HOMEPAGE="https://www.pgcli.com https://github.com/dbcli/pgcli"
-SRC_URI="https://github.com/dbcli/pgcli/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
- >=dev-python/prompt_toolkit-2.0.6[${PYTHON_USEDEP}]
- =dev-python/psycopg-2.8.0[${PYTHON_USEDEP}]
- >=dev-python/sqlparse-0.3.0[${PYTHON_USEDEP}]
- =dev-python/cli_helpers-1.2.0[${PYTHON_USEDEP}]
- >=dev-python/click-4.1[${PYTHON_USEDEP}]
- >=dev-python/configobj-5.0.6[${PYTHON_USEDEP}]
- >=dev-python/humanize-0.5.1[${PYTHON_USEDEP}]
- >=dev-python/pgspecial-1.11.8[${PYTHON_USEDEP}]
- >=dev-python/pygments-2.0[${PYTHON_USEDEP}]
- >=dev-python/setproctitle-1.1.9[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-
-BDEPEND="
- test? (
- dev-db/postgresql
- dev-python/mock[${PYTHON_USEDEP}]
- )
-"
-
-# there is a flaky test, so no tests for now
-RESTRICT="test"
-
-distutils_enable_tests pytest
diff --git a/dev-db/pgcli/pgcli-3.0.0.ebuild b/dev-db/pgcli/pgcli-3.0.0-r1.ebuild
similarity index 53%
rename from dev-db/pgcli/pgcli-3.0.0.ebuild
rename to dev-db/pgcli/pgcli-3.0.0-r1.ebuild
index b5da66f7a3dd..8b0fa47c6b88 100644
--- a/dev-db/pgcli/pgcli-3.0.0.ebuild
+++ b/dev-db/pgcli/pgcli-3.0.0-r1.ebuild
@@ -13,29 +13,26 @@ SRC_URI="https://github.com/dbcli/pgcli/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD MIT"
SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
RDEPEND="
+ dev-python/click[${PYTHON_USEDEP}]
+ dev-python/cli_helpers[${PYTHON_USEDEP}]
+ dev-python/configobj[${PYTHON_USEDEP}]
+ dev-python/humanize[${PYTHON_USEDEP}]
+ dev-python/pgspecial[${PYTHON_USEDEP}]
>=dev-python/prompt_toolkit-3.0.0[${PYTHON_USEDEP}]
- =dev-python/psycopg-2.8.0[${PYTHON_USEDEP}]
- >=dev-python/sqlparse-0.3.0[${PYTHON_USEDEP}]
- =dev-python/cli_helpers-1.2.0[${PYTHON_USEDEP}]
- >=dev-python/click-4.1[${PYTHON_USEDEP}]
- >=dev-python/configobj-5.0.6[${PYTHON_USEDEP}]
- >=dev-python/humanize-0.5.1[${PYTHON_USEDEP}]
- >=dev-python/pgspecial-1.11.8[${PYTHON_USEDEP}]
- >=dev-python/pygments-2.0[${PYTHON_USEDEP}]
- >=dev-python/setproctitle-1.1.9[${PYTHON_USEDEP}]
-"
+ dev-python/psycopg[${PYTHON_USEDEP}]
+ dev-python/pygments[${PYTHON_USEDEP}]
+ dev-python/setproctitle[${PYTHON_USEDEP}]
+ dev-python/sqlparse[${PYTHON_USEDEP}]"
DEPEND="${RDEPEND}"
-
BDEPEND="
test? (
dev-db/postgresql
dev-python/mock[${PYTHON_USEDEP}]
- )
-"
+ )"
+
+PATCHES=( "${FILESDIR}"/${P}-sqlparse.patch )
distutils_enable_tests pytest
diff --git a/dev-db/pgpool2/Manifest b/dev-db/pgpool2/Manifest
index 68d41114c1f9..668091e4cf05 100644
--- a/dev-db/pgpool2/Manifest
+++ b/dev-db/pgpool2/Manifest
@@ -1,3 +1,6 @@
+AUX pgpool-4.2.0-configure-memcached.patch 2023 BLAKE2B 6216bb0e83f2e66ab3b46d6fca08ec151ad18821b2ca3dba1f5444c553874ded5d839c11efe5031979c3f4d11aa8c2db0e68c35b77c415daf2b622fe332821dd SHA512 34de23f441a8b0ad4cc727ac450132c43b91d015ac4488f243b86305749a8cf1df967c19ddf9e6a5e3beb6dafff7680c7273dac316ee2d10b97b6c340b5cd5eb
+AUX pgpool-4.2.0-configure-pthread.patch 471 BLAKE2B 789cbcb435d64ef87d12379dc4d4e66b38e253286321d4994480c04635713bc272f0e70b25493189cea891f8a33be86a882c682cf7394c75cadf6c5ab5919e10 SHA512 3ba36eec9c2d22c4abc18aaa5a60a7713ed807f5d7d69c129ba16875082553875ab0ee9f03f59b490ac1973a1cf7c7adafabac8d2e3788c356a84eb399532fb6
+AUX pgpool-4.2.0-run_paths.patch 19114 BLAKE2B 1a3f545774b9389cdb16a09741e39d6b470580aa7e26d17ed32bcaf0d83e83e6772a3e6bbfbb4ec894088347d05d06f59a8ebacea6a1fe9ded4bd0d0ac184359 SHA512 65a4c32d2061608dea10f0a38dd6043a3f95ad087aea3867c3501bc56babb739c9f71ed3d9138fd7343a4d27049224eb4828ebb2aa79c8205bab3052be117ada
AUX pgpool-configure-memcached.patch 2137 BLAKE2B c557fe1f00dfca7b3927bfe43175f4c26823ac95da79f75ad197be955211530f3823a860a4b6fc7a9b68db6b2d49ba7c1a5e90aecfc7fb8a614a04d061916c9e SHA512 e8f53dadd71117878a18d3e2237d3777abc5bb648977a1aca7cf78d629745539a062cea69de4771b07bb8e0f534ddcb47baff987f9fdc6fefa69c2cc3c4e6d13
AUX pgpool-configure-pam.patch 1077 BLAKE2B 4dad8c20faf2ecb1c65e95b87d394d1c17c363d0337e830ea25efb88b1cb07d1a19fc1169ed9fbf69807347eba59296c276b33e0f786d32300e6c518b7a8c4ea SHA512 7c3b3f02977c7d9b1dbf7fb8905cca3a405ab856b8884bb9016dccb70650ed074af76ee81ee6cf2c1d4c366283af07ddb5c473960d81f7528d9d7afe762f9d4e
AUX pgpool-configure-pthread.patch 251 BLAKE2B 69ae31095583e4615117fbeb08ceff520b9462955c3986a675971215a6ac109e6b5bebee9b5b9c49f8005a8c68c144a741307fbe3c0aab318ae324b2d8527261 SHA512 b6cae4159919d22cd63aa13efae31d1270b07da203c0abc3ea96387570543134397873668484db205a0221dbd9f87d74dcf19f3f6d103d586b3c8f21e7f4000c
@@ -6,7 +9,9 @@ AUX pgpool2.initd 2162 BLAKE2B b04f6b952507b8e4815c7b27f09b59ffe64f6262719c54903
AUX pgpool_run_paths-3.7.10.patch 14548 BLAKE2B 89a18a3c3d4426d82978e303836ff4fafc8d7b4c36154a015c0dadf2e3eb1fa8f19ecf75f39a513b15bca8bfb543ea99e718fff0fa8ef5fde39ecbbe40469df9 SHA512 ea9541a5f9d27011005ab0fd04e2945dea1befaf060429c6a66e0c2091ac8b73a74b01174e5e409c189420405734e73fe2458fce56f4d7b56303957c450bd42d
DIST pgpool-II-3.7.10.tar.gz 3375419 BLAKE2B 96d589e9a3eff631bd4bffdcf321b3b532e5f0985dd4a5948fabc3228400305dc98fbf17ba64e162ecbaecca400e1bb3cad6fc954b2d624292f6f22deb48a789 SHA512 a89c392e336f5dd608c6876011f996fa1e4d7cb4b0eef31c24b2338ac287b72b73948e82429715d38fd9a7a6598f56828192722a2a8ee0d473738b804c4a2a48
DIST pgpool-II-4.0.5.tar.gz 3768842 BLAKE2B 2756d23db950a037a9203aae41293535de25d11bf9860f509040bf5b483ae5fb9e651c8189ee5f0a9398a45d20d2c54566769945e38c52361c160a1162a8e3af SHA512 897df553dba3a1800adae5d22ed4f4fe210a3013fb533730837591244877eeaf0e4090d1a0c65e189b71798b5c303ea22e2198f6317b54f74f10ba48fa2188c6
+DIST pgpool-II-4.2.0.tar.gz 4707623 BLAKE2B 9aa54fe0230d5dab303e9b20f35c242f9fe7f09c4c506c72be3a5d789f4e5c23b6e6fdf529ddafd5b1a0c0697a1e1b0f0106f965a8409f8e012633b8be0a58a9 SHA512 73179c3968441b592503512c5e0dfcc95ef778ecfd077024df0485fe831c9af12e708b51607c96c7bebf26f3cc81aefc53f50c7ad0a670d304cbbcf852170abf
EBUILD pgpool2-3.7.10.ebuild 2640 BLAKE2B 34a3a8a7a0c24f8bd357fc2929f4ea565be60c8c0cf22b3f30cbe94ae46f22d9fd2a8911f93fb5d0df483cae30cc3c658a28c5cea8c3e21fcdc54938bc195ae3 SHA512 af618abfbb7f5a11e8b83e6ff0b5a6c52f424edcdc44211dda557973b09fe67cee5a6a6494dabd8783333981e2ab30410c2a20486489108d51b1a2444c4502e2
EBUILD pgpool2-4.0.5.ebuild 2646 BLAKE2B ec1fb6883162ddf238c4b8c812d234ee190cbd72030c0157cff601fdadeb60756bcb0a3547b7bd356f51b96a6f8cb0a7ece67e8bb3e803127b3f861d35878993 SHA512 992a4c52dc6eb33c7125ce073b79aefc9baafb9eb0bf4d9dec2ad2ea10f48267138649309e68acf1291dd3f084d93e6455d28c124cf1deea4061520e3ca0664c
-EBUILD pgpool2-9999.ebuild 2723 BLAKE2B 78d14708c61e3f5f8a36d1c8822c7c3fa59eb4dc2a86c118ac73fa2b99859c54f46488d9775ca5bb3fb2a7e83bf745ac1c5e282a9718d6d8ec93f13344eaabda SHA512 731de61fccb5b793c9a451359cbb3f8b730eea5b69525a02ada0f2772b2bbb3c64e7714d51a00c2b27add38ece48b30dc24060971a6f0b3ca321038d150429d9
+EBUILD pgpool2-4.2.0.ebuild 2417 BLAKE2B 37d9881c35087d18708378cef7ab3e12a1998b72e44af393515b9bf8fbad0de5c8f7ea33652cb577bd9e5c2ebcdd817d88a70111ca696c238614a5268c687ba7 SHA512 cf414f1f51dea2a985795d413ac14a8bbe0524556756ee446fff67cc54e7b3aa8d4ec2b46bbd5e4578b1baae11dd6ed10e2c4e34644cae62f021ebffac3b2cb6
+EBUILD pgpool2-9999.ebuild 2492 BLAKE2B 10c0c2e076704a8ebce86ae1c01797ef25809b23f7f4757df2536aa63e1eff4eb6b0789b167760685ac0423e76b878833b642bbc1a1c8afe1bd6cc5dfa6ff3e7 SHA512 6755c3d2ba9260069fec61878f800627a19b7606ad600d703e97c327a6917373bddd677a6daba9fabcbed419766d81917b307c00163c3b2b09622cb252681487
MISC metadata.xml 390 BLAKE2B d6a0560051449e95bb43e81589eee966a477a75d7ec8211ae96b15f2d51ce9555181b8640d9d830f2b42f8159989e9126423c6ccbbc2bf2dd8121f4920a87a16 SHA512 ce26ee116c3c7ff77a771294ed07f38d8f940dc380915c339eb4c543d86fa5bde025ba83e70af2b7bf4a1bef1e51957f151131836855e0dae2e1daed73ffae8d
diff --git a/dev-db/pgpool2/files/pgpool-4.2.0-configure-memcached.patch b/dev-db/pgpool2/files/pgpool-4.2.0-configure-memcached.patch
new file mode 100644
index 000000000000..9854e45e3a22
--- /dev/null
+++ b/dev-db/pgpool2/files/pgpool-4.2.0-configure-memcached.patch
@@ -0,0 +1,60 @@
+diff -Naruw pgpool-II-4.2.0.orig/configure.ac pgpool-II-4.2.0/configure.ac
+--- pgpool-II-4.2.0.orig/configure.ac 2020-11-25 20:25:42.000000000 -0500
++++ pgpool-II-4.2.0/configure.ac 2020-12-16 06:36:26.051076452 -0500
+@@ -392,37 +392,24 @@
+ fi
+
+
+-AC_ARG_WITH(memcached,
+- [ --with-memcached=DIR site header files for libmemcached in DIR],
+- [
+- case "$withval" in
+- "" | y | ye | yes | n | no)
+- AC_MSG_ERROR([*** You must supply an argument to the --with-memcached option.])
+- ;;
+- *)
+-
+- MEMCACHED_INCLUDE_DIR="$withval"/include
+- MEMCACHED_LIB_DIR="$withval"/lib
+- OLD_CFLAGS="$CFLAGS"
+- CFLAGS="$CFLAGS -I$MEMCACHED_INCLUDE_DIR"
++AC_ARG_WITH([memcached],
++ AS_HELP_STRING([--with-memcached], [Build with memcached support]))
++AS_IF([test "x$with_memcached" = "xyes"], [
++ PKG_CHECK_MODULES([MEMCACHED], [libmemcached])
++ CFLAGS="$CFLAGS $MEMCACHED_CFLAGS"
++ LIBS="$LIBS $MEMCACHED_LIBS"
++
+ AC_CHECK_HEADERS(
+ [libmemcached/memcached.h],
+ [AC_DEFINE([USE_MEMCACHED], 1, [Define to 1 to build with memcached support])],
+- [AC_MSG_ERROR([header file is required for memcached support])])
+- CFLAGS=$OLD_CFLAGS
+- AC_CHECK_LIB(memcached, memcached_create, [], [AC_MSG_ERROR(libmemcached is not installed)])
+- MEMCACHED_INCLUDE_OPT="-I $MEMCACHED_INCLUDE_DIR"
+- MEMCACHED_LINK_OPT="-L$MEMCACHED_LIB_DIR"
+- MEMCACHED_RPATH_OPT="-rpath $MEMCACHED_LIB_DIR"
+- ;;
+- esac
++ [AC_MSG_ERROR([Couldn't find ])])
++
++ AC_SEARCH_LIBS(memcached_create, [], [],
++ [AC_MSG_ERROR(libmemcached is not installed)])
+ ])
+
+ CFLAGS="$CFLAGS -fno-strict-aliasing"
+
+-AC_SUBST(MEMCACHED_INCLUDE_OPT)
+-AC_SUBST(MEMCACHED_LINK_OPT)
+-AC_SUBST(MEMCACHED_RPATH_OPT)
+
+ OLD_LDFLAGS="$LDFLAGS"
+ LDFLAGS="-L$PGSQL_LIB_DIR $LDFLAGS"
+@@ -435,7 +422,6 @@
+ AC_SUBST(PGSQL_INCLUDE_DIR)
+ AC_SUBST(PGSQL_LIB_DIR)
+ AC_SUBST(PGSQL_BIN_DIR)
+-AC_SUBST(MEMCACHED_DIR)
+
+ # --enable(disable)-rpath option
+ AC_ARG_ENABLE(rpath,
diff --git a/dev-db/pgpool2/files/pgpool-4.2.0-configure-pthread.patch b/dev-db/pgpool2/files/pgpool-4.2.0-configure-pthread.patch
new file mode 100644
index 000000000000..842fd5fbad73
--- /dev/null
+++ b/dev-db/pgpool2/files/pgpool-4.2.0-configure-pthread.patch
@@ -0,0 +1,14 @@
+diff -Naruw pgpool-II-4.2.0.orig/configure.ac pgpool-II-4.2.0/configure.ac
+--- pgpool-II-4.2.0.orig/configure.ac 2020-11-25 20:25:42.000000000 -0500
++++ pgpool-II-4.2.0/configure.ac 2020-12-16 06:40:11.150611861 -0500
+@@ -4,6 +4,10 @@
+ dnl Checks for programs.
+ AC_PROG_CC
+ AC_PROG_CC_C99()
++AX_PTHREAD
++LIBS="$PTHREAD_LIBS $LIBS"
++CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
++CC="$PTHREAD_CC"
+
+ # Error out if the compiler does not support C99, as the codebase
+ # relies on that.
diff --git a/dev-db/pgpool2/files/pgpool-4.2.0-run_paths.patch b/dev-db/pgpool2/files/pgpool-4.2.0-run_paths.patch
new file mode 100644
index 000000000000..2eca0fd59185
--- /dev/null
+++ b/dev-db/pgpool2/files/pgpool-4.2.0-run_paths.patch
@@ -0,0 +1,432 @@
+diff -Naruw a/src/include/parser/pg_config_manual.h b/src/include/parser/pg_config_manual.h
+--- a/src/include/parser/pg_config_manual.h
++++ b/src/include/parser/pg_config_manual.h
+@@ -228,7 +228,7 @@
+ * support them yet.
+ */
+ #ifndef WIN32
+-#define DEFAULT_PGSOCKET_DIR "/tmp"
++#define DEFAULT_PGSOCKET_DIR "/run/postgresql"
+ #else
+ #define DEFAULT_PGSOCKET_DIR ""
+ #endif
+diff -Naruw a/src/include/pcp/pcp_stream.h b/src/include/pcp/pcp_stream.h
+--- a/src/include/pcp/pcp_stream.h
++++ b/src/include/pcp/pcp_stream.h
+@@ -49,6 +49,6 @@
+ extern int pcp_write(PCP_CONNECTION * pc, void *buf, int len);
+ extern int pcp_flush(PCP_CONNECTION * pc);
+
+-#define UNIX_DOMAIN_PATH "/tmp"
++#define UNIX_DOMAIN_PATH "/run/pgpool"
+
+ #endif /* PCP_STREAM_H */
+diff -Naruw a/src/include/pool.h b/src/include/pool.h
+--- a/src/include/pool.h
++++ b/src/include/pool.h
+@@ -69,16 +69,16 @@
+ #define HBA_CONF_FILE_NAME "pool_hba.conf"
+
+ /* pid file directory */
+-#define DEFAULT_LOGDIR "/tmp"
++#define DEFAULT_LOGDIR "/run/pgpool"
+
+ /* Unix domain socket directory */
+-#define DEFAULT_SOCKET_DIR "/tmp"
++#define DEFAULT_SOCKET_DIR "/run/postgresql"
+
+ /* Unix domain socket directory for watchdog IPC */
+-#define DEFAULT_WD_IPC_SOCKET_DIR "/tmp"
++#define DEFAULT_WD_IPC_SOCKET_DIR "/run/pgpool"
+
+ /* pid file name */
+-#define DEFAULT_PID_FILE_NAME "/var/run/pgpool/pgpool.pid"
++#define DEFAULT_PID_FILE_NAME "/run/pgpool/pgpool.pid"
+
+ /* status file name */
+ #define STATUS_FILE_NAME "pgpool_status"
+diff -Naruw a/src/sample/pgpool.conf.sample b/src/sample/pgpool.conf.sample
+--- a/src/sample/pgpool.conf.sample
++++ b/src/sample/pgpool.conf.sample
+@@ -39,10 +39,8 @@
+ port = 9999
+ # Port number
+ # (change requires restart)
+-socket_dir = '/tmp'
++socket_dir = '/run/postgresql'
+ # Unix domain socket path
+- # The Debian package defaults to
+- # /var/run/postgresql
+ # (change requires restart)
+ reserved_connections = 0
+ # Number of reserved connections.
+@@ -59,10 +57,8 @@
+ pcp_port = 9898
+ # Port number for pcp
+ # (change requires restart)
+-pcp_socket_dir = '/tmp'
++pcp_socket_dir = '/run/pgpool'
+ # Unix domain socket path for pcp
+- # The Debian package defaults to
+- # /var/run/postgresql
+ # (change requires restart)
+ listen_backlog_multiplier = 2
+ # Set the backlog parameter of listen(2) to
+@@ -286,13 +282,13 @@
+ # FILE LOCATIONS
+ #------------------------------------------------------------------------------
+
+-pid_file_name = '/var/run/pgpool/pgpool.pid'
++pid_file_name = '/run/pgpool/pgpool.pid'
+ # PID file name
+ # Can be specified as relative to the"
+ # location of pgpool.conf file or
+ # as an absolute path
+ # (change requires restart)
+-logdir = '/tmp'
++logdir = '/run/pgpool'
+ # Directory of pgPool status file
+ # (change requires restart)
+
+@@ -659,10 +655,8 @@
+ # Authentication key for watchdog communication
+ # (change requires restart)
+
+-wd_ipc_socket_dir = '/tmp'
++wd_ipc_socket_dir = '/run/pgpool'
+ # Unix domain socket path for watchdog IPC socket
+- # The Debian package defaults to
+- # /var/run/postgresql
+ # (change requires restart)
+
+
+diff -Naruw a/src/sample/pgpool.conf.sample-logical b/src/sample/pgpool.conf.sample-logical
+--- a/src/sample/pgpool.conf.sample-logical
++++ b/src/sample/pgpool.conf.sample-logical
+@@ -38,10 +38,8 @@
+ port = 9999
+ # Port number
+ # (change requires restart)
+-socket_dir = '/tmp'
++socket_dir = '/run/postgresql'
+ # Unix domain socket path
+- # The Debian package defaults to
+- # /var/run/postgresql
+ # (change requires restart)
+ reserved_connections = 0
+ # Number of reserved connections.
+@@ -58,10 +56,8 @@
+ pcp_port = 9898
+ # Port number for pcp
+ # (change requires restart)
+-pcp_socket_dir = '/tmp'
++pcp_socket_dir = '/run/pgpool'
+ # Unix domain socket path for pcp
+- # The Debian package defaults to
+- # /var/run/postgresql
+ # (change requires restart)
+ listen_backlog_multiplier = 2
+ # Set the backlog parameter of listen(2) to
+@@ -286,13 +282,13 @@
+ # FILE LOCATIONS
+ #------------------------------------------------------------------------------
+
+-pid_file_name = '/var/run/pgpool/pgpool.pid'
++pid_file_name = '/run/pgpool/pgpool.pid'
+ # PID file name
+ # Can be specified as relative to the"
+ # location of pgpool.conf file or
+ # as an absolute path
+ # (change requires restart)
+-logdir = '/tmp'
++logdir = '/run/pgpool'
+ # Directory of pgPool status file
+ # (change requires restart)
+
+@@ -621,10 +617,8 @@
+ # Authentication key for watchdog communication
+ # (change requires restart)
+
+-wd_ipc_socket_dir = '/tmp'
++wd_ipc_socket_dir = '/run/pgpool'
+ # Unix domain socket path for watchdog IPC socket
+- # The Debian package defaults to
+- # /var/run/postgresql
+ # (change requires restart)
+
+
+diff -Naruw a/src/sample/pgpool.conf.sample-raw b/src/sample/pgpool.conf.sample-raw
+--- a/src/sample/pgpool.conf.sample-raw
++++ b/src/sample/pgpool.conf.sample-raw
+@@ -39,10 +39,8 @@
+ port = 9999
+ # Port number
+ # (change requires restart)
+-socket_dir = '/tmp'
++socket_dir = '/run/postgresql'
+ # Unix domain socket path
+- # The Debian package defaults to
+- # /var/run/postgresql
+ # (change requires restart)
+ reserved_connections = 0
+ # Number of reserved connections.
+@@ -59,10 +57,8 @@
+ pcp_port = 9898
+ # Port number for pcp
+ # (change requires restart)
+-pcp_socket_dir = '/tmp'
++pcp_socket_dir = '/run/pgpool'
+ # Unix domain socket path for pcp
+- # The Debian package defaults to
+- # /var/run/postgresql
+ # (change requires restart)
+ listen_backlog_multiplier = 2
+ # Set the backlog parameter of listen(2) to
+@@ -287,13 +283,13 @@
+ # FILE LOCATIONS
+ #------------------------------------------------------------------------------
+
+-pid_file_name = '/var/run/pgpool/pgpool.pid'
++pid_file_name = '/run/pgpool/pgpool.pid'
+ # PID file name
+ # Can be specified as relative to the"
+ # location of pgpool.conf file or
+ # as an absolute path
+ # (change requires restart)
+-logdir = '/tmp'
++logdir = '/run/pgpool'
+ # Directory of pgPool status file
+ # (change requires restart)
+
+@@ -660,10 +656,8 @@
+ # Authentication key for watchdog communication
+ # (change requires restart)
+
+-wd_ipc_socket_dir = '/tmp'
++wd_ipc_socket_dir = '/run/pgpool'
+ # Unix domain socket path for watchdog IPC socket
+- # The Debian package defaults to
+- # /var/run/postgresql
+ # (change requires restart)
+
+ # - Virtual IP control Setting -
+diff -Naruw a/src/sample/pgpool.conf.sample-replication b/src/sample/pgpool.conf.sample-replication
+--- a/src/sample/pgpool.conf.sample-replication
++++ b/src/sample/pgpool.conf.sample-replication
+@@ -39,10 +39,8 @@
+ port = 9999
+ # Port number
+ # (change requires restart)
+-socket_dir = '/tmp'
++socket_dir = '/run/postgresql'
+ # Unix domain socket path
+- # The Debian package defaults to
+- # /var/run/postgresql
+ # (change requires restart)
+ listen_backlog_multiplier = 2
+ # Set the backlog parameter of listen(2) to
+@@ -65,10 +63,8 @@
+ pcp_port = 9898
+ # Port number for pcp
+ # (change requires restart)
+-pcp_socket_dir = '/tmp'
++pcp_socket_dir = '/run/pgpool'
+ # Unix domain socket path for pcp
+- # The Debian package defaults to
+- # /var/run/postgresql
+ # (change requires restart)
+
+ # - Backend Connection Settings -
+@@ -282,13 +278,13 @@
+ # FILE LOCATIONS
+ #------------------------------------------------------------------------------
+
+-pid_file_name = '/var/run/pgpool/pgpool.pid'
++pid_file_name = '/run/pgpool/pgpool.pid'
+ # PID file name
+ # Can be specified as relative to the"
+ # location of pgpool.conf file or
+ # as an absolute path
+ # (change requires restart)
+-logdir = '/tmp'
++logdir = '/run/pgpool'
+ # Directory of pgPool status file
+ # (change requires restart)
+
+@@ -657,10 +653,8 @@
+ # Authentication key for watchdog communication
+ # (change requires restart)
+
+-wd_ipc_socket_dir = '/tmp'
++wd_ipc_socket_dir = '/run/pgpool'
+ # Unix domain socket path for watchdog IPC socket
+- # The Debian package defaults to
+- # /var/run/postgresql
+ # (change requires restart)
+
+
+diff -Naruw a/src/sample/pgpool.conf.sample-slony b/src/sample/pgpool.conf.sample-slony
+--- a/src/sample/pgpool.conf.sample-slony
++++ b/src/sample/pgpool.conf.sample-slony
+@@ -39,10 +39,8 @@
+ port = 9999
+ # Port number
+ # (change requires restart)
+-socket_dir = '/tmp'
++socket_dir = '/run/postgresql'
+ # Unix domain socket path
+- # The Debian package defaults to
+- # /var/run/postgresql
+ # (change requires restart)
+ listen_backlog_multiplier = 2
+ # Set the backlog parameter of listen(2) to
+@@ -65,10 +63,8 @@
+ pcp_port = 9898
+ # Port number for pcp
+ # (change requires restart)
+-pcp_socket_dir = '/tmp'
++pcp_socket_dir = '/run/pgpool'
+ # Unix domain socket path for pcp
+- # The Debian package defaults to
+- # /var/run/postgresql
+ # (change requires restart)
+
+ # - Backend Connection Settings -
+@@ -283,13 +279,13 @@
+ # FILE LOCATIONS
+ #------------------------------------------------------------------------------
+
+-pid_file_name = '/var/run/pgpool/pgpool.pid'
++pid_file_name = '/run/pgpool/pgpool.pid'
+ # PID file name
+ # Can be specified as relative to the"
+ # location of pgpool.conf file or
+ # as an absolute path
+ # (change requires restart)
+-logdir = '/tmp'
++logdir = '/run/pgpool'
+ # Directory of pgPool status file
+ # (change requires restart)
+
+@@ -658,10 +654,8 @@
+ # Authentication key for watchdog communication
+ # (change requires restart)
+
+-wd_ipc_socket_dir = '/tmp'
++wd_ipc_socket_dir = '/run/pgpool'
+ # Unix domain socket path for watchdog IPC socket
+- # The Debian package defaults to
+- # /var/run/postgresql
+ # (change requires restart)
+
+ # - Virtual IP control Setting -
+diff -Naruw a/src/sample/pgpool.conf.sample-snapshot b/src/sample/pgpool.conf.sample-snapshot
+--- a/src/sample/pgpool.conf.sample-snapshot
++++ b/src/sample/pgpool.conf.sample-snapshot
+@@ -39,10 +39,8 @@
+ port = 9999
+ # Port number
+ # (change requires restart)
+-socket_dir = '/tmp'
++socket_dir = '/run/postgresql'
+ # Unix domain socket path
+- # The Debian package defaults to
+- # /var/run/postgresql
+ # (change requires restart)
+ listen_backlog_multiplier = 2
+ # Set the backlog parameter of listen(2) to
+@@ -65,10 +63,8 @@
+ pcp_port = 9898
+ # Port number for pcp
+ # (change requires restart)
+-pcp_socket_dir = '/tmp'
++pcp_socket_dir = '/run/pgpool'
+ # Unix domain socket path for pcp
+- # The Debian package defaults to
+- # /var/run/postgresql
+ # (change requires restart)
+
+ # - Backend Connection Settings -
+@@ -280,13 +276,13 @@
+ # FILE LOCATIONS
+ #------------------------------------------------------------------------------
+
+-pid_file_name = '/var/run/pgpool/pgpool.pid'
++pid_file_name = '/run/pgpool/pgpool.pid'
+ # PID file name
+ # Can be specified as relative to the"
+ # location of pgpool.conf file or
+ # as an absolute path
+ # (change requires restart)
+-logdir = '/tmp'
++logdir = '/run/pgpool'
+ # Directory of pgPool status file
+ # (change requires restart)
+
+@@ -655,10 +651,8 @@
+ # Authentication key for watchdog communication
+ # (change requires restart)
+
+-wd_ipc_socket_dir = '/tmp'
++wd_ipc_socket_dir = '/run/pgpool'
+ # Unix domain socket path for watchdog IPC socket
+- # The Debian package defaults to
+- # /var/run/postgresql
+ # (change requires restart)
+
+
+diff -Naruw a/src/sample/pgpool.conf.sample-stream b/src/sample/pgpool.conf.sample-stream
+--- a/src/sample/pgpool.conf.sample-stream
++++ b/src/sample/pgpool.conf.sample-stream
+@@ -39,10 +39,8 @@
+ port = 9999
+ # Port number
+ # (change requires restart)
+-socket_dir = '/tmp'
++socket_dir = '/run/postgresql'
+ # Unix domain socket path
+- # The Debian package defaults to
+- # /var/run/postgresql
+ # (change requires restart)
+ reserved_connections = 0
+ # Number of reserved connections.
+@@ -59,10 +57,8 @@
+ pcp_port = 9898
+ # Port number for pcp
+ # (change requires restart)
+-pcp_socket_dir = '/tmp'
++pcp_socket_dir = '/run/pgpool'
+ # Unix domain socket path for pcp
+- # The Debian package defaults to
+- # /var/run/postgresql
+ # (change requires restart)
+ listen_backlog_multiplier = 2
+ # Set the backlog parameter of listen(2) to
+@@ -286,13 +282,13 @@
+ # FILE LOCATIONS
+ #------------------------------------------------------------------------------
+
+-pid_file_name = '/var/run/pgpool/pgpool.pid'
++pid_file_name = '/run/pgpool/pgpool.pid'
+ # PID file name
+ # Can be specified as relative to the"
+ # location of pgpool.conf file or
+ # as an absolute path
+ # (change requires restart)
+-logdir = '/tmp'
++logdir = '/run/pgpool'
+ # Directory of pgPool status file
+ # (change requires restart)
+
+@@ -659,10 +655,8 @@
+ # Authentication key for watchdog communication
+ # (change requires restart)
+
+-wd_ipc_socket_dir = '/tmp'
++wd_ipc_socket_dir = '/run/pgpool'
+ # Unix domain socket path for watchdog IPC socket
+- # The Debian package defaults to
+- # /var/run/postgresql
+ # (change requires restart)
+
+
diff --git a/dev-db/pgpool2/pgpool2-4.2.0.ebuild b/dev-db/pgpool2/pgpool2-4.2.0.ebuild
new file mode 100644
index 000000000000..4c93ba916e09
--- /dev/null
+++ b/dev-db/pgpool2/pgpool2-4.2.0.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+POSTGRES_COMPAT=( 9.{5..6} {10..13} )
+
+inherit autotools postgres-multi
+
+MY_P="${PN/2/-II}-${PV}"
+
+DESCRIPTION="Connection pool server for PostgreSQL"
+HOMEPAGE="https://www.pgpool.net/"
+SRC_URI="https://www.pgpool.net/download.php?f=${MY_P}.tar.gz -> ${MY_P}.tar.gz"
+LICENSE="BSD"
+SLOT="0"
+
+KEYWORDS="~amd64 ~x86"
+
+IUSE="doc libressl memcached pam ssl static-libs"
+
+RDEPEND="
+ ${POSTGRES_DEP}
+ net-libs/libnsl:0=
+ memcached? ( dev-libs/libmemcached )
+ pam? ( sys-auth/pambase )
+ ssl? (
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl:= )
+ )
+"
+DEPEND="${RDEPEND}
+ sys-devel/bison
+ virtual/pkgconfig
+"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+ postgres_new_user pgpool
+
+ postgres-multi_pkg_setup
+}
+
+src_prepare() {
+ eapply \
+ "${FILESDIR}/pgpool-4.2.0-configure-memcached.patch" \
+ "${FILESDIR}/pgpool-configure-pam.patch" \
+ "${FILESDIR}/pgpool-4.2.0-configure-pthread.patch" \
+ "${FILESDIR}/pgpool-4.2.0-run_paths.patch"
+
+ eautoreconf
+
+ postgres-multi_src_prepare
+}
+
+src_configure() {
+ postgres-multi_foreach econf \
+ --disable-rpath \
+ --sysconfdir="${EROOT}/etc/${PN}" \
+ --with-pgsql-includedir='/usr/include/postgresql-@PG_SLOT@' \
+ --with-pgsql-libdir="/usr/$(get_libdir)/postgresql-@PG_SLOT@/$(get_libdir)" \
+ $(use_enable static-libs static) \
+ $(use_with memcached) \
+ $(use_with pam) \
+ $(use_with ssl openssl)
+}
+
+src_compile() {
+ # Even though we're only going to do an install for the best slot
+ # available, the extension bits in src/sql need some things outside
+ # of that directory built, too.
+ postgres-multi_foreach emake
+ postgres-multi_foreach emake -C src/sql
+}
+
+src_install() {
+ # We only need the best stuff installed
+ postgres-multi_forbest emake DESTDIR="${D}" install
+
+ # Except for the extension and .so files that each PostgreSQL slot needs
+ postgres-multi_foreach emake DESTDIR="${D}" -C src/sql install
+
+ newinitd "${FILESDIR}/${PN}.initd" ${PN}
+ newconfd "${FILESDIR}/${PN}.confd" ${PN}
+
+ # Documentation!
+ dodoc NEWS TODO
+ doman doc/src/sgml/man{1,8}/*
+ use doc && dodoc -r doc/src/sgml/html
+
+ # mv some files that get installed to /usr/share/pgpool-II so that
+ # they all wind up in the same place
+ mv "${ED}/usr/share/${PN/2/-II}" "${ED}/usr/share/${PN}" || die
+
+ # One more thing: Evil la files!
+ find "${ED}" -name '*.la' -exec rm -f {} +
+}
diff --git a/dev-db/pgpool2/pgpool2-9999.ebuild b/dev-db/pgpool2/pgpool2-9999.ebuild
index 042e87ed4a92..2b63038d42ff 100644
--- a/dev-db/pgpool2/pgpool2-9999.ebuild
+++ b/dev-db/pgpool2/pgpool2-9999.ebuild
@@ -1,11 +1,11 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
EGIT_REPO_URI="https://git.postgresql.org/git/pgpool2.git"
-POSTGRES_COMPAT=( 9.{5..6} {10..11} )
+POSTGRES_COMPAT=( 9.{5..6} {10..13} )
inherit autotools git-r3 postgres-multi
@@ -30,7 +30,6 @@ RDEPEND="
)
"
DEPEND="${RDEPEND}
- !!dev-db/pgpool
sys-devel/bison
virtual/pkgconfig
doc? (
@@ -48,10 +47,10 @@ pkg_setup() {
src_prepare() {
eapply \
- "${FILESDIR}/pgpool-configure-memcached.patch" \
+ "${FILESDIR}/pgpool-4.2.0-configure-memcached.patch" \
"${FILESDIR}/pgpool-configure-pam.patch" \
- "${FILESDIR}/pgpool-configure-pthread.patch" \
- "${FILESDIR}/pgpool_run_paths-3.7.10.patch"
+ "${FILESDIR}/pgpool-4.2.0-configure-pthread.patch" \
+ "${FILESDIR}/pgpool-4.2.0-run_paths.patch"
eautoreconf
@@ -61,7 +60,7 @@ src_prepare() {
src_configure() {
postgres-multi_foreach econf \
--disable-rpath \
- --sysconfdir="${EROOT%/}/etc/${PN}" \
+ --sysconfdir="${EROOT}/etc/${PN}" \
--with-pgsql-includedir='/usr/include/postgresql-@PG_SLOT@' \
--with-pgsql-libdir="/usr/$(get_libdir)/postgresql-@PG_SLOT@/$(get_libdir)" \
$(use_enable static-libs static) \
@@ -93,14 +92,9 @@ src_install() {
dodoc NEWS TODO
use doc && postgres-multi_forbest emake DESTDIR="${D}" -C doc install
- # Examples and extras
# mv some files that get installed to /usr/share/pgpool-II so that
# they all wind up in the same place
- mv "${ED%/}/usr/share/${PN/2/-II}" "${ED%/}/usr/share/${PN}" || die
- into "/usr/share/${PN}"
- dobin src/sample/{pgpool_recovery,pgpool_recovery_pitr,pgpool_remote_start}
- insinto "/usr/share/${PN}"
- doins src/sample/{{pcp,pgpool,pool_hba}.conf.sample*,pgpool.pam}
+ mv "${ED}/usr/share/${PN/2/-II}" "${ED}/usr/share/${PN}" || die
# One more thing: Evil la files!
find "${ED}" -name '*.la' -exec rm -f {} +
diff --git a/dev-db/redis/Manifest b/dev-db/redis/Manifest
index 0427837eb339..c7b720f08e35 100644
--- a/dev-db/redis/Manifest
+++ b/dev-db/redis/Manifest
@@ -19,5 +19,5 @@ DIST redis-5.0.9.tar.gz 1986574 BLAKE2B 7802d0556d11c9be8577b9bb3f4dbad8c2419b38
DIST redis-6.0.9.tar.gz 2261418 BLAKE2B 93e64e2c682320d11e468021fd13a2888dd6b15430c15eaaa9468242d9b4d8b60e29dfe656e677774dc88ed751471284d1adf94c723521085019b375785abe7a SHA512 ebae2b09637fdbdc71dd22b72ccea24e2c21beb81c6ff5c4bae8b341886a7d847ce868f52dc917079bab8aa250ff61c83efe8acbb8a1cbc5e285c7842b0aefa3
EBUILD redis-5.0.10.ebuild 4744 BLAKE2B 911a324ae75ab43090425efbb15fec52b2568e09944656450d13eb82d730466466b638adab70bf71378726d08da982a05d1a7b0bf0db7e8d7fc65606ded549de SHA512 270f9e9b8037799c2e59037c968796155d9c5dcbb29a69e72e1544cd310f0921a9e26101e37b6d4d6701b40ad6114bd1f931d36d8be2d96994ad861ce6cc39ac
EBUILD redis-5.0.9-r1.ebuild 4738 BLAKE2B ca5644ba5a17e2f982623cc242a9058dd04b682e850b88f6821168d80dded518b176d690087d0f8e4d9e021b01d4c37a3c08bc98a4080c954e028a87c697bb1d SHA512 174942f2f4de53a3dbca64f9100dea33e3570535b1fe0019257d651289fff82da42949403481bdfb5eca0eebf8ec32b8893a56a9cec59a2c5fc61c215293733c
-EBUILD redis-6.0.9.ebuild 4949 BLAKE2B e67312a51b324b149eb6bebdf0da4a23ac5d07d39c60d18e072ff829188403c7d831594ae71f388376954fc91f0fec40e193dae52dbd4da0ff8779547e06c67e SHA512 034a2f4936d283f7c491f2299aecff576e4cbe3337f4d830ac6be655ffadef3c3dd003b680c4b9224da06c3d2f61df23704279985119a409dd009164c77a65d2
+EBUILD redis-6.0.9.ebuild 4948 BLAKE2B 133202bf499aaa91fc22217fd70fd8ef97c76ca45c1d7bfb2211cf512559b030db697ec5c968257bf1a249cbb3913a5cc5b854749f39e84769ca0db2eb613ac8 SHA512 e5e540b806c82a0750985086fb184f977bcb34f894f7ed20e3bae004913123b03f89a05926b69e686c25f32cc9fe9ef1ad9b58c1db26f2bc30af3e65a3ccd9cd
MISC metadata.xml 356 BLAKE2B 19e27b12be84927b990fc2f481d8dd1f88f05b5e029fdd91c7ce9517e7fd378d6e1df1eb55052a04fefe781da09b371da1c28fd269c72f4222aa896897222bf7 SHA512 ab06f694c5b20072f40e85b3a8e05d2c333f3b29fc145733fde1e3f42ea78ac7c51550afc29e671ef9b4a163597ac9f44bc182344c18db52036595e5d65f7e22
diff --git a/dev-db/redis/redis-6.0.9.ebuild b/dev-db/redis/redis-6.0.9.ebuild
index 4248e34c7462..992380fb720c 100644
--- a/dev-db/redis/redis-6.0.9.ebuild
+++ b/dev-db/redis/redis-6.0.9.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://redis.io"
SRC_URI="http://download.redis.io/releases/${P}.tar.gz"
LICENSE="BSD"
-KEYWORDS="amd64 arm arm64 ~hppa ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
IUSE="+jemalloc luajit tcmalloc test"
RESTRICT="!test? ( test )"
SLOT="0"
diff --git a/dev-db/slony1/Manifest b/dev-db/slony1/Manifest
index 5725ac95ee75..b223b43b86d6 100644
--- a/dev-db/slony1/Manifest
+++ b/dev-db/slony1/Manifest
@@ -1,11 +1,14 @@
AUX slony1.conf 249 BLAKE2B ec214fb9a7d51bcaa58dc191d7e943c0d07be85c0f31dadbf199f5b309fb61c631d62eac659f4473120ee67649029c45cab606205fd62e1679413d2077fedac6 SHA512 3ef2b9a326cb237aa6ceaf4f161d9ff183c291f423b7ad29cb9102a67de849dbf5a52120ecc756efc5a8d226f0860a2517ced64ab44f135e62cb2e53611775a8
AUX slony1.init 615 BLAKE2B f1b3fc27ad3c4087713cceb6c2bb9451004b70e87c0347274c75e1c3ed8d439bb99f51d5e6e904d3957150e62760272312423a47235ff4e76792e0661b683bb3 SHA512 d450bba5f65372509e542f138d297202371bcaf78332ba13de72ddf937fcffe419083dddc5032c7bafd51993fbc677b37262e1b1e938e9e3c927e130c0a7c693
+DIST slony1-2.2.10-docs.tar.bz2 1445193 BLAKE2B 071f5faf2f7cae822b484f13ede6a8ede5278a065c55d2199f38e2dd195922cbc78982633316792978b968295d69e36651ae0367682ad45afab295e61e5329fa SHA512 d603abccc1ec7922fe8025ab178e6d12b28ffc763848be8d1f9fc93519b9928aa65ed6bcc1d678f2ad9f79818de06da39ec1f69d60de61c5e6fe42137c7c3112
+DIST slony1-2.2.10.tar.bz2 1464652 BLAKE2B a07a830501be13f33fc189128851cee02c8d8ca51a8a54f6b97028d65eb17937817c9ab6b5ebbcaa092e96fb00f57959806e5003e016df5e7034583de601084c SHA512 1b41addb7a0be0a130c2efcab1b241e3158d10a5a6e203d83f28353e303dd524e224ab9c04a7e37a0f89cd944237b90feeb8910eb35f717926aa3ad28dbe2d0f
DIST slony1-2.2.6-docs.tar.bz2 1450956 BLAKE2B 949d0736eb9ab021767b80b4240e30a8cd11daa218cac6d722827a8db98f2b54cc093031e02d0cd14cb1eb60d56dc160dcd1c2e0708e7228fdac31ef26d2fcf4 SHA512 b5a870d5688ca24c0a9012d7da539917c74ee697f1b1ae663ead3cb1032345c0d8f5fc5bddc2ca2fec5d738fb9ca74822343cce8739b3b4b478928f26d214a0d
DIST slony1-2.2.6.tar.bz2 1465709 BLAKE2B 87e581638aab5ac9f51437fc43b65f200c29e012fa2b5331d4a7972359bb345c8d5aec9917fbc348ce8338115f8270d6e55025905aa5aba642090a8486d0a3fc SHA512 5aeadb9ed72b83d303596e4f8513409a1f826f25fe283ca6aa969a7563172bbc5f5360f876fa87780f6a6fc70cb55688a2daf678b9cf91972a3c403cb76184b8
DIST slony1-2.2.7-docs.tar.bz2 252020 BLAKE2B 315d54c008fca121fac12385602e729c7bb6a7a90db502165625c1138da6b87f147410555ca6bc315ba766fd6fed22b6c5dcbe06c9481dd37b9e9c8832209b02 SHA512 7735aae634788acae77eb2cc64f51a851e3b804fb1ca860eddc237734aa6182bd7dfcdae485cd89682c413f55003ea67d91c4c24922b4fdef79ac34793022e56
DIST slony1-2.2.7.tar.bz2 1464923 BLAKE2B aee11f92d634a6c2eaf84dd48faf6cac7a27956474aaa9070f1d4fad3e70b0af09475abda149e096f1b238d68237c0b43b18880440bd4c2d66f5c0f4ad789e99 SHA512 22700e1574c91d4a4be5b78aac967eebc039440897364780891c2c76ed5b8e07c03205f0fbcd4870ee7c620d62b175987c46c43750524c6e5f9009044cc24f9a
DIST slony1-2.2.9-docs.tar.bz2 1445251 BLAKE2B eafd17370e333a706fd563440b7948513db19a05e23f6a0a118e0f8927b5b52c99f46953c3c9ce2d8e9f04371a35ff390e0e542f295f4e926b7002642fc913b0 SHA512 88d1c26d668b4a021c7b53cb5c2a9b140485595460d1444997ae49e4b77910f58860d603777f1836fdfa1231d2e44ad5cdf8e82c0a03df5278c9de7de3101c5b
DIST slony1-2.2.9.tar.bz2 1464548 BLAKE2B 6a2f3e21679ed1542066016bdc9e97aa7b5885fe15770d5015f26deb16e4d9634b930d9f13a8dbba6b1e89bf28cdcc28b3181f12efbf9b549a75c6e62755c099 SHA512 c42d7604ae2eda9b83bfa608ca13a4a25b2a4b77301a591b9308eda964d263490a02acdfd5b1a7e7751c24b2a7cb5d9410c58deaf82bdb3c422456af65c2b3f5
+EBUILD slony1-2.2.10.ebuild 1941 BLAKE2B 6e10b4c4952f637f2a79adbd8487e09bfb1333d07adbdf0391a014a352e9b43a26b1a8c03ffc4741a868ae4e6ed1a8f3adcb600a5ff26bd5ea4ccca1306aaf31 SHA512 dfcfd92604100b4934dc270fd74be4f239c2adaef6e999509ce3af9f8798033b30766273093731c876c7dcb3655baa788daa29b58b3712f7ef4d854f6f411ce0
EBUILD slony1-2.2.6.ebuild 1643 BLAKE2B f9c9cce6671b1a5c613a6950ee34df5627db305c83709af4a1a76d25b8f0520ee73d679db0d974531062f83d4bb085f65165ba0ca46059908839de639385d41a SHA512 9ee213f0628031c5b670a0a8533c19c43b45694e64bfd7c23ddf5a9d8a09d9d048898214536cde6303b81134504c0e11412e9e28705abe649982e2d4bb69841c
EBUILD slony1-2.2.7.ebuild 1635 BLAKE2B c3d2307c14aaec2a9ae999e31ef5ec3b090857d59e50eb09e17c175b4d92f92ba12e15b6a43823a79c9e95d0be94f31218b17ca17f8dfc0c966b87fdb713932a SHA512 767988ade2ba9f7203b1142767d43dfb8fb11f34d9555fc86dec8a2c2360bd423112aaae4a5632b44b8e01610a0f8dbfd3af23a8972adb5d686b9b38eb7d56ea
EBUILD slony1-2.2.9.ebuild 1941 BLAKE2B 6e10b4c4952f637f2a79adbd8487e09bfb1333d07adbdf0391a014a352e9b43a26b1a8c03ffc4741a868ae4e6ed1a8f3adcb600a5ff26bd5ea4ccca1306aaf31 SHA512 dfcfd92604100b4934dc270fd74be4f239c2adaef6e999509ce3af9f8798033b30766273093731c876c7dcb3655baa788daa29b58b3712f7ef4d854f6f411ce0
diff --git a/dev-db/slony1/slony1-2.2.10.ebuild b/dev-db/slony1/slony1-2.2.10.ebuild
new file mode 100644
index 000000000000..0e854d2ba2ca
--- /dev/null
+++ b/dev-db/slony1/slony1-2.2.10.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+POSTGRES_COMPAT=( 9.{5..6} {10..13} )
+POSTGRES_USEDEP="server,threads"
+
+inherit postgres-multi
+
+IUSE="doc perl"
+
+DESCRIPTION="A replication system for the PostgreSQL Database Management System"
+HOMEPAGE="https://slony.info/"
+
+MAJ_PV=$(ver_cut 1-2)
+SRC_URI="https://slony.info/downloads/${MAJ_PV}/source/${P}.tar.bz2
+ doc? ( https://slony.info/downloads/${MAJ_PV}/source/${P}-docs.tar.bz2 )
+"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+DEPEND="${POSTGRES_DEP}
+ perl? ( dev-perl/DBD-Pg )
+"
+RDEPEND=${DEPEND}
+
+REQUIRE_USE="${POSTGRES_REQ_USE}"
+
+# Testing requires a more complex setup than we benefit from being able
+# to perform.
+# https://slony.info/documentation/2.2/testing.html
+RESTRICT="test"
+
+src_unpack() {
+ unpack ${P}.tar.bz2
+
+ if use doc ; then
+ # The docs tarball will unpack over the source directory. So, we
+ # clear the adminguide directory now to make it easier to
+ # install later.
+ rm ${P}/doc/adminguide/* || die
+ unpack ${P}-docs.tar.bz2
+ fi
+}
+
+src_configure() {
+ local slot_bin_dir="/usr/$(get_libdir)/postgresql-@PG_SLOT@/bin"
+ use perl && myconf=" --with-perltools=\"${slot_bin_dir}\""
+ postgres-multi_foreach econf ${myconf} \
+ --with-pgconfigdir="${slot_bin_dir}" \
+ --with-slonybindir="${slot_bin_dir}"
+}
+
+src_install() {
+ postgres-multi_foreach emake DESTDIR="${D}" install
+
+ dodoc README SAMPLE TODO UPGRADING share/slon.conf-sample
+ use doc && postgres-multi_forbest dodoc -r doc/adminguide
+
+ newinitd "${FILESDIR}"/slony1.init slony1
+ newconfd "${FILESDIR}"/slony1.conf slony1
+}
+
+pkg_postinst() {
+ # Slony-I installs its executables into a directory that is
+ # processed by the PostgreSQL eselect module. Call it here so that
+ # the symlinks will be created.
+ ebegin "Refreshing PostgreSQL $(postgresql-config show) symlinks"
+ postgresql-config update
+ eend $?
+}
diff --git a/dev-embedded/Manifest.gz b/dev-embedded/Manifest.gz
index 1724cd068df0..1ce73130cb8d 100644
Binary files a/dev-embedded/Manifest.gz and b/dev-embedded/Manifest.gz differ
diff --git a/dev-embedded/avra/Manifest b/dev-embedded/avra/Manifest
index 787d4905f88d..bdd4f5cd0f70 100644
--- a/dev-embedded/avra/Manifest
+++ b/dev-embedded/avra/Manifest
@@ -1,5 +1,5 @@
DIST avra-1.4.1.tar.gz 386055 BLAKE2B 64bf96e6fac6e04869e94ae2cac81fc0c67f871abc2ad0e2728bf5530f53e8ff9ce9e0119edfc8d39187ca2e8e5a58922aa0e8d0ea7d91b730965fef365c0c25 SHA512 2ee5edb6f8b2a39d1197970121ce3313f99b2137c590ab963f6943958d3a761f4bb37b80d54f727e1a4a4afc62ea4ac576af9ef85a71f741739a6ce4a60a9a1c
DIST avra-1.4.2.tar.gz 392445 BLAKE2B 6b556583838e0e5bef0207f7291da7c5e6dad01e695d9592b3de8f528bc7a5dafc3015f75934bcc8f9e0b6baca39ff0ae13c88ee290e657868bbb522d27da068 SHA512 f51a43b1b28102d6180ce27e74b50642de8f3d18fa35a82904fddaac993e87e1096667f2245bebfad92e4ba3283330f6ac4b6083e486be5af9edca7b7e90e56f
EBUILD avra-1.4.1.ebuild 567 BLAKE2B 6c374a5ec439e71a58f8bbaf0ce135fd66717e04fe4e03a8a6804bf3abb66964e8f41c8d63442ed9e30caa82a71edbdd16ecec5d730a455b4226725add80a588 SHA512 1903e839232c6b83e401ab24207921b1aa5da561aa2f986ae534840c346738daf326b9dcd631c03f96f0cf69b2001961a7ad93ef7c68a7e64588806257b8cd74
-EBUILD avra-1.4.2.ebuild 568 BLAKE2B b42497f73a8fce4340548da8d4c0655329447f3cf45b3ef45a1e0b9af6fa04ff08ff063fd13909fc6921a4c3f1b8ed0f296fbf60e5b33774903ed63887f6e481 SHA512 73bdf7bfbc9dbd11e2e73faff80054629140c5e7bc608b9d714b8281294333ccf5f2d3aab0841354b732cb7b30d99c1c1d9e598c775b1fef3dc9b956f07153f2
+EBUILD avra-1.4.2.ebuild 567 BLAKE2B 6c374a5ec439e71a58f8bbaf0ce135fd66717e04fe4e03a8a6804bf3abb66964e8f41c8d63442ed9e30caa82a71edbdd16ecec5d730a455b4226725add80a588 SHA512 1903e839232c6b83e401ab24207921b1aa5da561aa2f986ae534840c346738daf326b9dcd631c03f96f0cf69b2001961a7ad93ef7c68a7e64588806257b8cd74
MISC metadata.xml 443 BLAKE2B 54e313793f71742c73eb9733326a26578971843a9af53f9104c897181c759ba6f589b49f744f7fe0c86a4fa4d0db0be9a3e44a9b5517be5830483e014ce47c24 SHA512 97aad2214c0b9e8fd3fa35393eff597d71cdce159ff291f0f1780eaefe68c5d4b0ef66f48b7036da3e3a32a8d9903c473491fdb483aef02703f6979f8d93b583
diff --git a/dev-embedded/avra/avra-1.4.2.ebuild b/dev-embedded/avra/avra-1.4.2.ebuild
index b0af0cf057ae..f39b49bd9b5d 100644
--- a/dev-embedded/avra/avra-1.4.2.ebuild
+++ b/dev-embedded/avra/avra-1.4.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/hsoft/avra/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
+KEYWORDS="amd64 ~ppc x86"
src_compile() {
emake \
diff --git a/dev-games/Manifest.gz b/dev-games/Manifest.gz
index 3735e23cd635..d949abfe3a47 100644
Binary files a/dev-games/Manifest.gz and b/dev-games/Manifest.gz differ
diff --git a/dev-games/tiled/Manifest b/dev-games/tiled/Manifest
index 6afd7c5ed136..1e35497428f5 100644
--- a/dev-games/tiled/Manifest
+++ b/dev-games/tiled/Manifest
@@ -2,6 +2,6 @@ AUX tiled-1.4.3-python-38.patch 479 BLAKE2B ec7a36fbaddb9cd5b954285e25cd02e1c169
DIST tiled-1.4.2.tar.gz 17806729 BLAKE2B 9f9e6b97c6d95b1f8a1ad6da3540aaf9310a705b412005752afe72c3ce8e35025559ed0e7aaf36a1d65284c29d8406bdc58121f6c13bb658ff84ff43fde7f403 SHA512 1fddd8c8d67e4eaf116c82e276b0941e6dae7c529f2132e49da77d7e215fc7106d5fd3ef55d118f799153b57340effcf2481a131a436be7f00f61c4fc4bd45d2
DIST tiled-1.4.3.tar.gz 17806808 BLAKE2B 81b5a32cc1e6f5f3b4af5520752d34572f0e78aad90df435d075b53ac18b39961aa22d23cff614cd83f0883fd2fd2bca69026160cb8b1b727fddaeff5764babe SHA512 1e75e323733e05563bf542364778d95f2f22484ec0d85b4a9e7fac782c117934b37b049724979be5c83de86a3900c7ca2e9f3c5a660c530d2ecd0f023eb22c2e
EBUILD tiled-1.4.2.ebuild 1371 BLAKE2B f617f685c1798996af236f5de5323c50ee7d179a5003b0b53b66a8c6e5de310958c39feeaa4cb17db26aa00c5bbda62b2cc0a1ab69bbf2c3dd4f25ed81aa716d SHA512 ec75cea172395dd2bf0a76728950dc1888ebe1b5e37048bf213a7bedbf2183e5be0472992bf533de22c6bf3039254e18979ef431cb61fe3eb59a4063177feac1
-EBUILD tiled-1.4.3-r1.ebuild 1452 BLAKE2B 1aa12b44b088f964216be058bca1fbad703a80d3f1bc2d799184417a4c93fbbf1c94fd42ab4121e96a7d60aebd0c3e6801e001a6595dc88651a2d15b88583267 SHA512 788e52cb3288ebf213b83de1568f3bbbe4147a714d5a8714bc50f50ca0824c79a241cf64df3f86b6a0105e89f1f58a6936da81c7d5467f86659f7df0810d8389
+EBUILD tiled-1.4.3-r1.ebuild 1451 BLAKE2B 2d5b0cbf458d5b8a97db44f654ed96d52951e797a0e32d7b5035cf15348b93c7f2603bf127749e0c030a8f0c2b9c87603edf6ebbab330dadab97d99ea7c6c2d0 SHA512 7538908c51d88d1644163d1539001e2f3038fda95292864673d28a2d79d8223db0cbc27e0de53330ce3fe4476092fa13b9b88d826efad19a79bd8392e0e6225f
EBUILD tiled-1.4.3.ebuild 1372 BLAKE2B 06303c0bf6943dbdbd0d450e00bc81897b999d445a40934b582bfd5a4199d91a7de96d2c634d13749fa895533d59c32b69194facc723090a93ab166fc536c4ad SHA512 fa8137e781cb3334dd2f1f9d98b29c684d192444c13207e6880411f32622e7db7dd5699f2e48b46fc701212e7efad951d21ecf64a913f5f7e14e9dde6b6f78bf
MISC metadata.xml 297 BLAKE2B aaa357a6b59433dc43e1d4c13d13e700e56bb2cb54806defc8defb0880abe067ada43f24a0ca5e02e0acf2be8d294a907d066599cabc1873881092d2fd86fe38 SHA512 0875fcc01853efe23097a84f854432b8450ef0419a6329a813dc0e3d4eee46943ed7e80ff2df52700c822bba60cf56f2dbdac99a54cb2a3f58bf18db0baea069
diff --git a/dev-games/tiled/tiled-1.4.3-r1.ebuild b/dev-games/tiled/tiled-1.4.3-r1.ebuild
index 0a20032a23ba..0f0e25021a49 100644
--- a/dev-games/tiled/tiled-1.4.3-r1.ebuild
+++ b/dev-games/tiled/tiled-1.4.3-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/bjorn/tiled/archive/v${PV}/${P}.tar.gz"
LICENSE="BSD BSD-2 GPL-2+"
SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
IUSE="examples python"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/dev-haskell/Manifest.gz b/dev-haskell/Manifest.gz
index 33ec1403c1f6..74a742f17407 100644
Binary files a/dev-haskell/Manifest.gz and b/dev-haskell/Manifest.gz differ
diff --git a/dev-haskell/comonad/Manifest b/dev-haskell/comonad/Manifest
index 065ff1b87650..1fb3128d1f7e 100644
--- a/dev-haskell/comonad/Manifest
+++ b/dev-haskell/comonad/Manifest
@@ -1,3 +1,3 @@
-DIST comonad-5.0.6.tar.gz 18154 BLAKE2B 4654a76ccc51c1cb1f7a96db54dd211148b8afcada19d0153356f203ea93cd0b914f6771f4407f5a81e312a7060cf11d9720a9eb96760b35c38567a34ac1a44a SHA512 0b7fc727a2b972203d1651049a4f4c371a8f134d64d36409d60fbc4d11b7eb9650c79cf917abaa3f66084d7c5e9f32b288862a5e93c3d93c16c11533a446cfa5
-EBUILD comonad-5.0.6.ebuild 1265 BLAKE2B ef5a649e52c4f4d1c3d7dc25a6b794d1e9f5814491979295de8365c922dfb5d82c2ed7a67df8aca88e8712f9046b232c896c7116bf4e6119598d8a37225288f4 SHA512 ef888caa6299a34c5175fb228190b056eff5c28725981d095f47a185ee75308b497adbc1aaa1243e38a80a236213587ee2daf7d295ef53fbab0b6709cf62f534
-MISC metadata.xml 328 BLAKE2B 4f5fd750a0fe1892c472f9f0f7214c231a7ee4f7c00f0d7caca409a296b606f3fb02799d501613c94454ff2b4178d964515e111d23b31d6a6c8e0791338d6a91 SHA512 991c06b275f0f832b1d23fd411a31870a2f235291f05d810d5b4baab2f0202d6de87179ad290172d91be1039efecba8cff132643cf5a0cee38ab0f4931504e37
+DIST comonad-5.0.7.tar.gz 18108 BLAKE2B b7d415a2b7eb48f53727fa9ada77078de538d5cf477997a2953095d7410dff1a82f7ab2f53b2bf01b21671a6e5e938962a2ae2a6d50351d77a4dd8b3ae18a9e1 SHA512 6377f13b651c30aaba1f68448394a4048b15c4f8e97fe714281d15a51190b8ec6e1157a6fb332abfb75060bb2f4948db22fb35c537bf01836ed94ece99fdccce
+EBUILD comonad-5.0.7.ebuild 1448 BLAKE2B 27a498b27e7dbeb84a37c6e428de4afdc92e4f958f4976a9eb4edc4c016f2ca51959d8f278b9e665ce189f114b5db8f2668c9351b0455ebf5c067b04a7e7f3fc SHA512 5e7a19291c8336d3a3e266abff528d14f9296295c9fd3c921f648e0209c4e943e70ab74d05786bfc07c9d6d54f6c9ff6b86a68de6bcfbac303ca6daa3ba21a1e
+MISC metadata.xml 588 BLAKE2B eca11a9b96f2d0a128b79b5ee3d0df7bfd204845fb6be99a596a11ccdccb7d49800fb92c97e43478e5c337cf6281fb48c90b8314995cfe6bf8f4d0cbe54db73a SHA512 bb9cb0e3c2b9c135f6413549f3853ea75d26313e7032fe7564ce2aba22523f980d65c93ddac4c566f04a9af2c7f48d627c18a870e955019e77a6d9dcad06c662
diff --git a/dev-haskell/comonad/comonad-5.0.6.ebuild b/dev-haskell/comonad/comonad-5.0.7.ebuild
similarity index 68%
rename from dev-haskell/comonad/comonad-5.0.6.ebuild
rename to dev-haskell/comonad/comonad-5.0.7.ebuild
index a7adcec857d8..3480cf6e57e2 100644
--- a/dev-haskell/comonad/comonad-5.0.6.ebuild
+++ b/dev-haskell/comonad/comonad-5.0.7.ebuild
@@ -4,37 +4,39 @@
EAPI=7
# ebuild generated by hackport 0.6.6.9999
-#hackport: flags: +distributive,+containers
+#hackport: flags: +distributive,+containers,test-doctests:test
CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
inherit haskell-cabal
-DESCRIPTION="Haskell 98 compatible comonads"
+DESCRIPTION="Haskell package providing comonads"
HOMEPAGE="https://github.com/ekmett/comonad/"
SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
KEYWORDS="~amd64 ~x86"
-IUSE="+test-doctests"
+IUSE="+indexed-traversable"
-RESTRICT=test # broken on USE=doc
+RESTRICT=test # fails on USE=doc
RDEPEND=">=dev-haskell/distributive-0.2.2:=[profile?] =dev-haskell/semigroups-0.16.2:=[profile?] =dev-haskell/tagged-0.7:=[profile?] =dev-haskell/transformers-compat-0.3:=[profile?] =dev-lang/ghc-7.8.2:=
+ indexed-traversable? ( >=dev-haskell/indexed-traversable-0.1:=[profile?] Gentoo Haskell
diff --git a/dev-haskell/cpphs/Manifest b/dev-haskell/cpphs/Manifest
index 57a3de9b49e7..cde07920debe 100644
--- a/dev-haskell/cpphs/Manifest
+++ b/dev-haskell/cpphs/Manifest
@@ -1,3 +1,5 @@
DIST cpphs-1.20.8.tar.gz 45108 BLAKE2B 8e373db64d0d2a21e123eb136aadfd45cb373411e0684c445e25eb6062ecf4c29ccce3214986680ab886a71bccade3ac381f8f82916002388af3103bc38e797d SHA512 ec9323f9e1cb6de450d8af6b6b98005bf46427c2926694e1cba942fd54a03d9d36a7e8f2541eb095949110ddaf6317597699b7c4472942a509d496cb9b4da747
+DIST cpphs-1.20.9.1.tar.gz 45496 BLAKE2B 1a964c011628f260d1c7ad6653c03776a36a014ff6717f877796de0d0139dcd3454bd8d935e3fffda2d6dd9823fd5fc5be58b73bb9590de248381755b446148e SHA512 bc5cd86c1e42061ae5c940612542dbea420344fb8596495d71ff2dc724bc1a3785f830e51c3ae99394488a122deabacd6433a5c919e3682c4129f3b296b7931f
EBUILD cpphs-1.20.8.ebuild 673 BLAKE2B c205975691d2d6f7aad241a50b17935703861669a2c8fa679ac9cd36fe8b17fdd09d4c26a72cf4815255d000c95040a1e6b7f0411e73f756bc9bda78c29754e1 SHA512 97d1974d04c80c43cac995a6e324dd96cf992c7a24fe827edbccf8dcbd6fc894e905302af515df60ca0c4bc728e86c52ab7f514e551b27d16b40e24912871513
+EBUILD cpphs-1.20.9.1.ebuild 730 BLAKE2B 69402ad22c90e8a13bf0b3af94d6cb8cf49eef4c28b0a322c70d98716b00784996bfb8faac510f243c68df8422578cee42e24267b7aa7446ddb8128564431423 SHA512 ffd0cf05f07645cf5b1d8e2e0b71194f9b81787b191920e962f02f7bd0780b871c823180e98f30b4148aaa22de653b94ff73ec83c0c5c12c512b160adfcc74df
MISC metadata.xml 217 BLAKE2B 41b11b7399431ee96c40a11373f20b12940ed7bb1fc77b1619212b2a57a3b34b11b77838d4ac51c1ddb80caab1030224e28567836e5d0a17b4ea6bd1afa2523c SHA512 63f267082f4ba17f6a1226d1c5a14d85d17e0f7a84857605933418d875d09cfffe2a0ca304b8a171dcae59169330fcc3cfca9d6f4c9ce24d135f1125a6d06c70
diff --git a/dev-haskell/cpphs/cpphs-1.20.9.1.ebuild b/dev-haskell/cpphs/cpphs-1.20.9.1.ebuild
new file mode 100644
index 000000000000..3a05d030dc34
--- /dev/null
+++ b/dev-haskell/cpphs/cpphs-1.20.9.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="A liberalised re-implementation of cpp, the C pre-processor"
+HOMEPAGE="http://projects.haskell.org/cpphs/"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/old-locale-1.0.0.2:=[profile?] =dev-haskell/polyparse-1.13:=[profile?] =dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.8
+"
diff --git a/dev-haskell/indexed-traversable/Manifest b/dev-haskell/indexed-traversable/Manifest
new file mode 100644
index 000000000000..beaf5df2e11d
--- /dev/null
+++ b/dev-haskell/indexed-traversable/Manifest
@@ -0,0 +1,3 @@
+DIST indexed-traversable-0.1.tar.gz 8261 BLAKE2B 872042f6a153daa7e862d9de04d18b18689550c64a750631956e778c59ac918165d2d55f0e4306ed146c873af01f97b54bc9bac15f9ddc0982db3860146d5069 SHA512 46ef672659685fd30be7a0ef62aa9b9cc63582acf97d44d6a43557f94116a90d5457d1efe20593caad5ab348c688f4b935e1595aff750fdf671bb20942ac7320
+EBUILD indexed-traversable-0.1.ebuild 931 BLAKE2B 847cab458f19c947ff211eda8385ebd980cfd47a62aa352ef443cf2f2b5a9c7529f2926f02594d1cf84dfdc1d7c3bb29c2ae9bcb3cf933490098ca93a73fa648 SHA512 a65f0c0a63efad4f6accbec70640c22d373ed39f7ac623dceae4829a5cad2d020042fc98fb684d7ad867355d3fa7cc98138a17af40e89cff7ea9f617e40fc8ee
+MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/indexed-traversable/indexed-traversable-0.1.ebuild b/dev-haskell/indexed-traversable/indexed-traversable-0.1.ebuild
new file mode 100644
index 000000000000..5c2c92466fbe
--- /dev/null
+++ b/dev-haskell/indexed-traversable/indexed-traversable-0.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="FunctorWithIndex, FoldableWithIndex, TraversableWithIndex"
+HOMEPAGE="https://hackage.haskell.org/package/indexed-traversable"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/base-orphans-0.8.3:=[profile?] =dev-haskell/semigroups-0.18.4:=[profile?] =dev-haskell/transformers-compat-0.6.6:=[profile?] =dev-haskell/void-0.7.2:=[profile?] =dev-lang/ghc-7.8.2:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.18.1.3
+"
diff --git a/media-video/cinelerra/metadata.xml b/dev-haskell/indexed-traversable/metadata.xml
similarity index 70%
rename from media-video/cinelerra/metadata.xml
rename to dev-haskell/indexed-traversable/metadata.xml
index 17f11a20c014..b7878815d80d 100644
--- a/media-video/cinelerra/metadata.xml
+++ b/dev-haskell/indexed-traversable/metadata.xml
@@ -2,7 +2,7 @@
- media-video@gentoo.org
- Gentoo Video project
+ haskell@gentoo.org
+ Gentoo Haskell
diff --git a/dev-haskell/transformers-compat/Manifest b/dev-haskell/transformers-compat/Manifest
index d50157f21615..75e1904e84f6 100644
--- a/dev-haskell/transformers-compat/Manifest
+++ b/dev-haskell/transformers-compat/Manifest
@@ -1,5 +1,3 @@
-DIST transformers-compat-0.5.1.4.tar.gz 18574 BLAKE2B e08bbb9b6104a9e46b17478b156d4e5b9198ab9e93ecc1e0faec4402a8b403b19ee517bb81a1f4c0d8633ff6a74ec59470d6a27a3c3df947ee25ce11312a84a0 SHA512 7e4ff75cdae7afbf640b3ddbfc0a260be8bb3b06cdb1be803bfd7cdb333d289919164923ab4fcde4b270883548cce115643f908410ed394aec67efa389d5aeb2
-DIST transformers-compat-0.6.5.tar.gz 40421 BLAKE2B c3d4b55bef310f717cdf2069a4d8b58cc38ea037bbd982f21c11ddbfd3175689f681fed615f30f7026e826e90a0ee6bee51e7448ad2468a084ed00ad6311a643 SHA512 86ce6e81baf4e71cc4ac854066543a8777628ae67182e8059e582754608b279a053f7f98a539ec5cc07e1771d8173a6de6ebe5df4eee2b4c41278734774c3958
-EBUILD transformers-compat-0.5.1.4.ebuild 929 BLAKE2B f4a90457d4eb899f7be2d80906741bc8d98c0222cfe2895b6ccf37221f3c4c63af43933fa57c6fd2c38ebf94bcd0c6ac145c0c934f59e9e26e1814a49279d4f6 SHA512 4845e19b8b6591c2af5768ec3fe1b63ff4f7ee87914ca1924e94a12779e466f23db1c6d9082428bade694f8ec360b716fe28665068fd82d864f64a0347949e9c
-EBUILD transformers-compat-0.6.5.ebuild 1501 BLAKE2B 5edcdbbe10fd4e7f7373e91e5b52d0821b43b1e6f7cf30be8cdb8e5666ccb09423dc33a4e4d0aa5481e3cae26a10b87273d146e945abf84bb230c8d06f354ecd SHA512 145064625386656ba68628b032b32f6df0295c20f2c2aca45e8de08036d3f658077bfac69524a7a356ecd383c51fa08473394123c5ba7b309fce9ba85fdc52a0
+DIST transformers-compat-0.6.6.tar.gz 41347 BLAKE2B e0d49ac7fdb035e6255f8124cf7a2e734bc9d36bcadded33e79e237603a5f9d1e4609fd50b673fc1f3353e20816a7c94a784bb0aa0feb3243c70151f8023d5b7 SHA512 1f34e40e17e7c19c889e58101f5ed6a019b5bb08be4c798a1f233158b27b6a2cd05b9260d2cf7065cd2bdfb4df4cbbda463abee69c4ba00b6f445392659e920d
+EBUILD transformers-compat-0.6.6.ebuild 1554 BLAKE2B 78c47d71ba3f58ebdd3cd3916c11901ab1dcd3c3f7d9cc6174c4d2d8d21cba3bcaf5abe8c94e81b8f7f10c517d70109f864e4f889203748dc084720c87066f1c SHA512 d96d049c1b777f22b034a6c0f4d6dc97f09957915259dbc55683055cdae45af5df66bd313798a9f4b00b33c805b8696150f383fb481728e40e5d2dfd5a96621e
MISC metadata.xml 812 BLAKE2B 56376ba85c38bf223334fdd52801f7fbb19d14a451166e4315a803da2401a6f04b328f96fc822f101bd6cece987ff31e717e2f29d5497dade8edde5870c9bd5a SHA512 9b7109fa74ac8b60851cad5a47001754d00ca9faa93d00d579c7ee236dd313839f52212d2fc2bd561f0330a2277a726c54f2afdb2f601785041b5b107c099d1b
diff --git a/dev-haskell/transformers-compat/transformers-compat-0.5.1.4.ebuild b/dev-haskell/transformers-compat/transformers-compat-0.5.1.4.ebuild
deleted file mode 100644
index 547747d38deb..000000000000
--- a/dev-haskell/transformers-compat/transformers-compat-0.5.1.4.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.4.7.9999
-#hackport: flags: -two,+mtl
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A small compatibility shim for dev-haskell/transformers"
-HOMEPAGE="https://github.com/ekmett/transformers-compat/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
- >=dev-haskell/mtl-2.1:=[profile?]
- >=dev-haskell/transformers-0.3:=[profile?]
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.8
-"
-
-src_configure() {
- local tf_arg=()
-
- if has_version '=dev-haskell/transformers-0.3*'; then
- tf_arg+=(--flag=three)
- else
- tf_arg+=(--flag=-three)
- fi
-
- haskell-cabal_src_configure \
- --flag=mtl \
- --flag=-two \
- ${tf_arg[@]}
-}
diff --git a/dev-haskell/transformers-compat/transformers-compat-0.6.5.ebuild b/dev-haskell/transformers-compat/transformers-compat-0.6.6.ebuild
similarity index 83%
rename from dev-haskell/transformers-compat/transformers-compat-0.6.5.ebuild
rename to dev-haskell/transformers-compat/transformers-compat-0.6.6.ebuild
index 5ac53b6cbadc..f547bb95cb47 100644
--- a/dev-haskell/transformers-compat/transformers-compat-0.6.5.ebuild
+++ b/dev-haskell/transformers-compat/transformers-compat-0.6.6.ebuild
@@ -3,8 +3,8 @@
EAPI=7
-# ebuild generated by hackport 0.6.1.9999
-#hackport: flags: -two,+mtl,-generic-deriving"
+# ebuild generated by hackport 0.6.6.9999
+#hackport: flags: -two,+mtl,-generic-deriving
CABAL_FEATURES="lib profile haddock hoogle hscolour"
# break circular dependencies:
@@ -12,13 +12,13 @@ CABAL_FEATURES="lib profile haddock hoogle hscolour"
CABAL_FEATURES+=" nocabaldep"
inherit haskell-cabal
-DESCRIPTION="A small compatibility shim for dev-haskell/transformers"
+DESCRIPTION="A small compatibility shim for the transformers library"
HOMEPAGE="https://github.com/ekmett/transformers-compat/"
SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
IUSE=""
RDEPEND=">=dev-haskell/fail-4.9:=[profile?]
+
+
+
+ haskell@gentoo.org
+ Gentoo Haskell
+
+
+
diff --git a/dev-haskell/uri-encode/uri-encode-1.5.0.5.ebuild b/dev-haskell/uri-encode/uri-encode-1.5.0.5.ebuild
new file mode 100644
index 000000000000..d1b052679fe3
--- /dev/null
+++ b/dev-haskell/uri-encode/uri-encode-1.5.0.5.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.4
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Unicode aware uri-encoding"
+HOMEPAGE="https://hackage.haskell.org/package/uri-encode"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+network-uri tools"
+
+RDEPEND=">=dev-haskell/text-0.7:=[profile?] =dev-haskell/utf8-string-0.3:=[profile?] =dev-lang/ghc-7.4.1:=
+ network-uri? ( >=dev-haskell/network-uri-2.6:=[profile?] )
+ !network-uri? ( >dev-haskell/network-2.4.1.0:=[profile?] =dev-haskell/cabal-1.8
+"
+
+src_configure() {
+ haskell-cabal_src_configure \
+ $(cabal_flag network-uri network-uri) \
+ $(cabal_flag tools tools)
+}
diff --git a/dev-haskell/yesod-test/Manifest b/dev-haskell/yesod-test/Manifest
index 9f67cb8cecb7..d87b829b12cf 100644
--- a/dev-haskell/yesod-test/Manifest
+++ b/dev-haskell/yesod-test/Manifest
@@ -1,3 +1,3 @@
-DIST yesod-test-1.6.10.tar.gz 27593 BLAKE2B ed6b5be35032246a0e233a985cc7a739a38cd4b81db42ac000c823ff0975ed642d6e4dc7e8dafb6679d6acb53c8cfb2f438f84d4e73c9ab79ecac4c7d3adb681 SHA512 badbd76b9a345c86f9dcf8b5d6043f173eec60bf6f39bdcb4a60d17d95ad693991a1c7b4061a1e86d61fb9efe3f2f29b3129e6b9ffef4b07d5b563116959b016
-EBUILD yesod-test-1.6.10.ebuild 1508 BLAKE2B 5cfe40446ddcfbd2720daca265f576ab9246035a4e3852489e0bbd9797d57433a1c66d31650c9aa13176c7bde5960fb7e50e8549dcc4af42986a21021fe951c2 SHA512 80d3978706c2470e4aed127090da310baece9289528a5d178cb8537387815965684898543095e0e18b465d9564591178e797abe490ca3d1fbc0563b49f59176c
+DIST yesod-test-1.6.12.tar.gz 27738 BLAKE2B 53cc4dc136b4d08c932812f2bd0b7f46ccc4acc3b0b0a2020386092006010859d3c0b14d9e4b36e91ae46617941d008d1795d652ccd1068437e537de83a4e4c3 SHA512 777d112d8c5ae77d667da2b8d1ed91a1cf751850d5b3678e787e7123aca8666d0a4b6d6161b7109491012d56c160603d62563b881a136ccc76a1edd006c423d6
+EBUILD yesod-test-1.6.12.ebuild 1509 BLAKE2B 467e0fc3888c9cd6094dbf2394c1d22890633e87c7f9309166dace51660983a635f8cd1e5c1a2effb0d4a8556077cc661b8e530dabd45aaea160e65750fee8c1 SHA512 2117b91e63eaa5775e29a82ea3b9367849e6d990c441ac708f692b6e99e5c16d122b642f232cc00da835129af9189c1804604a96ee538556c9b5c8cb65032c31
MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/yesod-test/yesod-test-1.6.10.ebuild b/dev-haskell/yesod-test/yesod-test-1.6.12.ebuild
similarity index 94%
rename from dev-haskell/yesod-test/yesod-test-1.6.10.ebuild
rename to dev-haskell/yesod-test/yesod-test-1.6.12.ebuild
index 8e3c91fc2713..60de493bb0df 100644
--- a/dev-haskell/yesod-test/yesod-test-1.6.10.ebuild
+++ b/dev-haskell/yesod-test/yesod-test-1.6.12.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-# ebuild generated by hackport 0.6.4.9999
+# ebuild generated by hackport 0.6.6.9999
CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
inherit haskell-cabal
@@ -29,9 +29,9 @@ RDEPEND="dev-haskell/aeson:=[profile?]
>=dev-haskell/http-types-0.7:=[profile?]
>=dev-haskell/hunit-1.2:=[profile?]
dev-haskell/memory:=[profile?]
+ >=dev-haskell/mtl-2.0.0:=[profile?]
>=dev-haskell/network-2.2:=[profile?]
>=dev-haskell/pretty-show-1.6:=[profile?]
- dev-haskell/semigroups:=[profile?]
dev-haskell/text:=[profile?]
>=dev-haskell/wai-3.0:=[profile?]
dev-haskell/wai-extra:=[profile?]
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index c54422da7570..220fbf3cfded 100644
Binary files a/dev-java/Manifest.gz and b/dev-java/Manifest.gz differ
diff --git a/dev-java/java-config/Manifest b/dev-java/java-config/Manifest
index 361c6f3a2a7f..eb4e46c29092 100644
--- a/dev-java/java-config/Manifest
+++ b/dev-java/java-config/Manifest
@@ -1,4 +1,4 @@
DIST java-config-2.3.1.tar.gz 26165 BLAKE2B 948506663513db369d0ed8ffdfaa54c643989431430ea03440551a6a4b6725d8eec38f5cb4fde3b64e8936c0f43de0e65a7368469032c646c7b6b3bb7ec3ed13 SHA512 62db555b2d8a37a03b6a03aa133010848d54be33ba6e3c43807abefe665a9d8ff2790baf1af79b98d4a7bd3e9ba6bc64382a24c3fcf7038338123dabd146b7b4
-EBUILD java-config-2.3.1.ebuild 979 BLAKE2B 2029c0220fb368462a057f3b6f6fc68e7d8754b7f3d9a49af6e70c8c213af4ab63d546cae822b0df2e1e15745b9a032591fb999c93e1cc7f4fe3177ad41eed4a SHA512 6e1ea605acf67757d27f31a9c14771d3f7d3f71705f0c70eb32291cd87d4719d1cc7c854035118b11fef6f2c7ad28834fc7a2996bb68987cbfe754dae5bd0510
-EBUILD java-config-9999.ebuild 1104 BLAKE2B 830f732cd34402a73b926f689e7e2812b6653eba77e9a8989c89f62a56a36e517132072b1c3f8f2afef1dd48926b0449b2d6ac14d5efd4345ec20d005823e033 SHA512 ddfa3421ff2c657f49e1d5db449988e0a1156de2e232521193bc139f86852557ae91b40e8233fd253a6f758f996cec60d5a9746b1fe31193bf64e00ed7c6299a
+EBUILD java-config-2.3.1.ebuild 1094 BLAKE2B cecebc371ca2d2e74dc51f7f93a2af103793c0e99b2e04c530dfa048dfcfde2660ec784b7668306a8640acc4b6a055f7c0105b8e63aac9402a3199488710f639 SHA512 aebcaedecfbde203d4ca857f4dc3f1848553f91fa404059c2a63d6266a02b3968b63b1dc364576807c2f3ec92d67296000136dbc7fa5ea2a629a408f87dc06d1
+EBUILD java-config-9999.ebuild 1219 BLAKE2B 8661e165198b6a62744808cb0ce24b2e01ad43841519eba6dabb456da0132b711f153551c06abbab36de4f0d52c3e009a3e7679a780a6d692ce544f73000805f SHA512 2b3ceab1c45194c994887a27d7fceac6e039518d67c702954cf9465de088681f784a05bbd30e2871d19032a0937732c987fe0e8cd6d74501a960029f7a2c9064
MISC metadata.xml 560 BLAKE2B a2cc44cb88cb8e0b80ef1fb56ed610fc10257a0858725fc01f793ae9275fc5ef6e37708c377ccf56425c08eacceea6e52a84eee35a7b2c239484080b6203c4d7 SHA512 9bd085048548f98faa638b23333ee0cf83b870c962b1aba62fa2df897393ce37c2b2e60736c988230252f29fc42e9dbe58ab8e720f7ec05a3e0b3d4c999e2c8a
diff --git a/dev-java/java-config/java-config-2.3.1.ebuild b/dev-java/java-config/java-config-2.3.1.ebuild
index 51075d6fd153..dc9ffcad70ce 100644
--- a/dev-java/java-config/java-config-2.3.1.ebuild
+++ b/dev-java/java-config/java-config-2.3.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="2"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-java/java-config/java-config-9999.ebuild b/dev-java/java-config/java-config-9999.ebuild
index e60c556878bf..5d6a98ef9770 100644
--- a/dev-java/java-config/java-config-9999.ebuild
+++ b/dev-java/java-config/java-config-9999.ebuild
@@ -14,7 +14,7 @@ if [[ $PV = *9999 ]]; then
EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/java-config.git"
else
SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.gz"
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+ KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
DESCRIPTION="Java environment configuration query tool"
diff --git a/dev-java/javatoolkit/Manifest b/dev-java/javatoolkit/Manifest
index b81756c1de7c..4f04c52c051e 100644
--- a/dev-java/javatoolkit/Manifest
+++ b/dev-java/javatoolkit/Manifest
@@ -1,5 +1,5 @@
DIST javatoolkit-0.6.3.tar.bz2 26071 BLAKE2B 50adb0871e814ad1716fedec1e1429b1da69349ea502139bed75c175a89142e1f10abbecfb434875eda46e21c86ae49d273beeb5aaddd10a903ffe153a1adc4b SHA512 b4e57d26e30455587c7bc8273420c3300c1a776f3321d8ed36638f6aae41c13ba785b37650be5577908e24aa2bf4fa4e11d3157211dc64b6e3c814c4df3b7d6a
-DIST javatoolkit-0.6.4.tar.bz2 24363 BLAKE2B a740bf92dfab4250033e71075d5ddfce1f049c225e05197eb5169189e4bb95982b3c4c64dd676f8a1478c1df13bfab4d16cbd822b4aa8472ab8aa7af8c7f80ff SHA512 e1d45b7f754680887296a7b3770fd371d91738f8e9b806dc37b6559a317ddb9646b113a9dd8715f7d5f2b19813d9a936ae4ca2d867fc6e0bfc3f131977ba2674
+DIST javatoolkit-0.6.5.tar.bz2 24380 BLAKE2B 69442b45e32e63e9f4f8104570ae644d6dd5571b6b909fd751a7060abddfedf84cc147f342a40ade8c4e04764f1a8362d853fae91353171708d5daf68ef3f8e1 SHA512 8a9cf0f2b7951bfe9ab544b48eecf5857ae4bddf129a1a0b928a2b37df7960b082495c44f42954cffe885d48f850b070781593352f09221d1b35b9a94ba5b55b
EBUILD javatoolkit-0.6.3.ebuild 828 BLAKE2B b8284438bba4f9539b4435d98ca0aa83676f6a51ba5ea6efbfcc061990b128de0997f061f2efb0f3724729cc1079878c688f6cfa6b0159c519d5139ece1aa1a7 SHA512 a8f2167aac2ce4d33be6906250ed3e02bf2ec3a03cf28c4b6946289176581741d95c1836da783fdac9b90598e3e4552cd13b038660d8683e4e1b53d191fab0e1
-EBUILD javatoolkit-0.6.4.ebuild 835 BLAKE2B 5ea4e9da5188d8732efd7b2083f9602fc3819582ceabd8d9a73b2f166c8e26808fa0a5b7232a42d70b0be1a4d2ec46e166d4c0ab619e06252ad7c7cecacd2524 SHA512 a2ddb04978fb8b49aac4eaafe43293c4aded094d20389694c2f5a07a379b7abf83122b33ecfeb8570b8a6c96f18de02bfed5f04e1a3ba2850081c778fcdaf85e
+EBUILD javatoolkit-0.6.5.ebuild 835 BLAKE2B 5ea4e9da5188d8732efd7b2083f9602fc3819582ceabd8d9a73b2f166c8e26808fa0a5b7232a42d70b0be1a4d2ec46e166d4c0ab619e06252ad7c7cecacd2524 SHA512 a2ddb04978fb8b49aac4eaafe43293c4aded094d20389694c2f5a07a379b7abf83122b33ecfeb8570b8a6c96f18de02bfed5f04e1a3ba2850081c778fcdaf85e
MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/javatoolkit/javatoolkit-0.6.4.ebuild b/dev-java/javatoolkit/javatoolkit-0.6.5.ebuild
similarity index 100%
rename from dev-java/javatoolkit/javatoolkit-0.6.4.ebuild
rename to dev-java/javatoolkit/javatoolkit-0.6.5.ebuild
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index a79aaaf3fa04..983c04305f58 100644
Binary files a/dev-lang/Manifest.gz and b/dev-lang/Manifest.gz differ
diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index 3861fe8479e2..3817c3166f7e 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -5,30 +5,12 @@ AUX php-fpm_at-simple.service 316 BLAKE2B 0ba10f3e3b004fbf14956e1e4f04f59b8a127e
AUX php-fpm_at.service 317 BLAKE2B f13fc38fcc0575a8517ee8d07b120efda37eabd2355061d0fdc303604c6b02ad42d7301180d86c977d5e585f5dd685343c592e37a6e0f44933707be79e0b77e0 SHA512 27982f9e2d958bfa75c89c7d3531e48d17fc388b1cdcbc8e09051b236b1184ee2baabdfcc567c19d9fcd067d4b3b86f171015616d8da42fccdabd89432d865e8
AUX php-freetype-2.9.1.patch 7667 BLAKE2B efc8f829bbad11b3e7b654d0882213ecb9aae766060d51f93446a6293a2f607339faba484c7b0b2f9318a5c5442da3c09e25aeda20dbc5e3258bf1009f8625b4 SHA512 0a06189f6fb3513cd2dcf9ddb590360475e2dd9a7aa8b13ab66c389c1ed40ce2361681f017cd3c6219f5b40a0a9d4978e57ca3ee4bacb7657db3285136fd2875
AUX php-iodbc-header-location.patch 481 BLAKE2B 9ea6a5d529dc7a8c78eeee800900372bc14309a05e352b2838da32e1384b61b507fdb623c9400094aa5b637eb1a87da92c72600eff79b18b8989ef90af56a0fa SHA512 86469f657d8807f005c28fd2149770c881add8f243fdfea087956c7987277597fe400a7af23f624f26da270356604717ed9cd04771154d7cf2ffe7237972372b
-DIST php-7.2.33.tar.xz 12310624 BLAKE2B 3eca6a2aee79b791abb6b0427496e6041b63800ac1aeea86b4465e9326fdcde5d7a69e6323902b6874f27cf6197b705397381319d0b5ff6f93605e791bf0eb86 SHA512 1c28e741fc6de88a33e1307bc88ba8dddf1ba767ce6eb9c1f0da35482c7d3ee1154831b997fa746340c4b7ec8de9196b21a9b1cf319c8e69eca2c92602ceee4a
DIST php-7.2.34.tar.xz 12309432 BLAKE2B 50522786d39296bc7411931c4f357d53c7a25da264192a6a6e7f7594f3dee108e22974e00a4bdc4d3af269ab63d07b28045ff6b4f4f0c79672ed059882647b93 SHA512 7ecc3de3b5db41ec4ff6a5ce6c7e77dc330753c6f3fd87db4d07d6bb763a0b047e83afeef2251b4c6a5d2ff53fd9f3d7e99d091ef2e2c6ab8f18db7447d8a97d
-DIST php-7.3.21.tar.xz 12123192 BLAKE2B ff5fca092f6c4e92c009ade9f4bee01ec07686645a4844297cee0518f12b3ebc16a7322b64579d9ee2d3a3f7cd62ed9184d0afbe77dbcf2d24a11139242c88c5 SHA512 fc2b9a40c92a6e79522a49cd025e56c0a52c2c2bd3f7379aaf004ca6b67957cf4ad059c40a5daac45665710abd07962562870430338f700f573856d797df3ff4
-DIST php-7.3.22.tar.xz 12134212 BLAKE2B 2a299d0e1a69425e06b71fcdd471bc659747a1a4adce276c0d42715045ee81a5241982b2408daa8122b8737d9dccc898847406dd007ea583a76cf29b893bc555 SHA512 7f06473e394e3236dff1376c8c9e6d15b998eef8b8b1148b103bd13dfd27785c01e1c6b15414ff64ea511f3f5e59e925831a7546f235d7c58bd47dcf46f6ff00
-DIST php-7.3.23.tar.xz 12133616 BLAKE2B 6a241443d75a0b404d4d65580208b67a425b91cf1951050752e5e7d653f439200514efa65ae9d9ae3a6c5375c711b8cc53dde9cb89b87dd68ff533b25a8dc04a SHA512 b5e318bd59951b470a22b2ef2db19cd542d42bed72cf4abe4344c0521eeba606eac31a38ff49d2ab0cb7ed17441655e029d5984584d86b935f576515179777af
-DIST php-7.3.24.tar.xz 12138212 BLAKE2B d1a056423d8b88dd042c7e794c4dfe97338e8f397cce65cfeb8b253caabd1108a84a9b6301eccd1c4abc693a78845ba3ba6a2ee37afce81dba82fd116ab78b81 SHA512 0ebc2fb7d58ded231ff5f55e9e033ca5c7865a13cc496884082b126cf2b31fb4486f61ad93ac9fe3592433e43d652cac2add96b2ad276dad937d458fd186d633
DIST php-7.3.25.tar.xz 12136668 BLAKE2B b9bfb1de15a3f02bf5d228a2cf9b307c9eeadaea10cac22d40647db0147f4f93b41858ea4affa0701478dd397f0a87cae4e2f29a378f7c6730fdf7da5c48e0e8 SHA512 30b27deab12cf2544671afbbdaefd4bfea308eeed8e9c2150751c5bc9ece18d981bcc020eace35cbdbe88b45cffba8a1fca718fc4e74c3a7903d8b038015d31e
-DIST php-7.4.10.tar.xz 10298480 BLAKE2B ef5e051da37c0bddc6819459c2e2b00b28bbfe6efbdc7ad9651200d2e453c434e59cb91642d775334db86a95afd9255012c4a57d57dac4d6cf7e1692067d0f90 SHA512 c7beb2d821f4e28b0444c8653c360d210a924e0638cc4b4ebc71bf2c22ef83caedfc880275329c3ffa644adc5858ccff59d35bf36255d57218774089d3376a21
-DIST php-7.4.11.tar.xz 10302076 BLAKE2B e32e77057ddd7b12553766e30366262812d4342742e6dabd0084a261f3d8e82d7c76924e26ead4c9295609f913d34903b9b1c271af76d8d9725f10cd108b7681 SHA512 9bdd29a4a6c1ac55ed75d8fb2203ae5ef41992c518cb7e3b84cf74db62b03cfbe0ef4ea5614a684a37fcd2ae727376022ce49ed3ff32fc3a728e2f1e2474fb92
-DIST php-7.4.12.tar.xz 10311980 BLAKE2B 11052d59881f84d4012fa993e5969abf52d4419877bf595ba524b31f5971f623adc382f49d4f7ed75f33dcf85c903a66d88b7c983807ee5f79152314334061c5 SHA512 6c06fb74f8e479ead000b0e2e56602c217d012f1a80e47e151543c033bb5426e56aaa5e8acfcd19fd49ae14c4ca827c8e57a5b56386b20002dbc80fbd07ab04f
DIST php-7.4.13.tar.xz 10319848 BLAKE2B c1da97eb605f1fc2b36190bfe92feb1fd527f4aaf1483865561a08cf990e70445f5520c8abcea7d9c6482dc47e500507644e0cd2cc756cfa99adfec0359cd795 SHA512 3525f4fd4ea6d97ed75ed8360d2a851e8577c09247ae3c6eb7e7b43265ee418297d91c1022bf5bbb64d1eecdebbbc2e0f6d42b560f584a741b475db2c6897ea7
-DIST php-7.4.9.tar.xz 10289560 BLAKE2B 0fd9d82539a46f7ce58857560f5aeb4be6dfe5f5a05f8b8c55c30d6000d19408b4ecc460c9135736298cdb8312ec958ab8358110b2b265bb8c185f80b1522dc6 SHA512 6179c2d867d6775d7f41785003c36d06ce620e7746ea7e6a4d275264e814a66d465776b47b04e2926ed1228cf58f2c15cdda74faf10372435c74ede7aeb79e18
DIST php-8.0.0.tar.xz 10726788 BLAKE2B 16c4aa075ba5dee6d47086323cd152b33dc7b62ac6b3ab6637ec386c1048e256a160d72e72cbc88450af1e84389042ebf2d644d3361c9a34879cc494d5b9b64f SHA512 65630940c95436f3e3ecb71b9f1ca15bb4118267dbda604ed1ee009d528c21a3ec21f48a15e4dd3529fe9cd2b354c211a7b4975b5de43e1f2afa6656cabe1fd0
-EBUILD php-7.2.33.ebuild 22651 BLAKE2B 9431a6e26752b96101826946c969e4ac1a2a1c04b9b42ad7f2b8f4733d8e3ec0614b75dddb2a54c40868d76e7a9b3a46001dc0b2a5152ac540175b0875753603 SHA512 bb61083533a443fe07b76c30028a3b7b8657a7c51ece6003ebc44a5e53224a70e8cad6d82fadcd509ea1ae4e4383ddad1c8d7edea7f200c5d37e445a88913d41
EBUILD php-7.2.34.ebuild 22651 BLAKE2B 9431a6e26752b96101826946c969e4ac1a2a1c04b9b42ad7f2b8f4733d8e3ec0614b75dddb2a54c40868d76e7a9b3a46001dc0b2a5152ac540175b0875753603 SHA512 bb61083533a443fe07b76c30028a3b7b8657a7c51ece6003ebc44a5e53224a70e8cad6d82fadcd509ea1ae4e4383ddad1c8d7edea7f200c5d37e445a88913d41
-EBUILD php-7.3.21.ebuild 22664 BLAKE2B 2191d27cc589cf5b0d85c33c3c81cddec0389719973c82b2665b4ae5be145e08c427fe4d59978ba07d04e3b3026f54c5471a51f20ce8ab02e55f4e6a269a3e47 SHA512 70a1783a530b13c38f1a9ecb8c381cd34ae9cad6124ff96cf7b28bdb97c447f133acbdd9bbe515b799eecfdc201d7d3524079a405fa989d07e7b9661916b374b
-EBUILD php-7.3.22.ebuild 22671 BLAKE2B 9fbccafac097a447241ed68db51ecf147059b1b55c31c829c7c40e01657916d376801096d8e273a4157435f0b489f776240114160d50c9399d4795ed9f7018d7 SHA512 a9f5c18c1b4667fa1730801877872434a5c146c34941da1a3b6348c7ec1bfbf152041e128faf8d962f77db17e2f94f704bfc67db71838d3f6ac3dfb0a846d4d5
-EBUILD php-7.3.23.ebuild 22664 BLAKE2B 2191d27cc589cf5b0d85c33c3c81cddec0389719973c82b2665b4ae5be145e08c427fe4d59978ba07d04e3b3026f54c5471a51f20ce8ab02e55f4e6a269a3e47 SHA512 70a1783a530b13c38f1a9ecb8c381cd34ae9cad6124ff96cf7b28bdb97c447f133acbdd9bbe515b799eecfdc201d7d3524079a405fa989d07e7b9661916b374b
-EBUILD php-7.3.24.ebuild 22671 BLAKE2B 9fbccafac097a447241ed68db51ecf147059b1b55c31c829c7c40e01657916d376801096d8e273a4157435f0b489f776240114160d50c9399d4795ed9f7018d7 SHA512 a9f5c18c1b4667fa1730801877872434a5c146c34941da1a3b6348c7ec1bfbf152041e128faf8d962f77db17e2f94f704bfc67db71838d3f6ac3dfb0a846d4d5
-EBUILD php-7.3.25.ebuild 22665 BLAKE2B 4b92afb683bb04d4c4b64065851c40a815947f2a64458b1979c97e51ed35c845488fe185d7b6498778b2d064a648e3bbc03a4e91d6636c42d4360b5684fd9a94 SHA512 132f96f206aa1cee9392b4b30093da343db03b1e38b1833f195fce217a4ac64b8558bc5e021987d25d66a656a49fa8682309df6c80f11d63c505adcc700feea2
-EBUILD php-7.4.10.ebuild 21382 BLAKE2B 936caa37281c2b79d2d7550de422c32a0dbf41e2f1530aa5709dfd6a0d92f7c5c6b82ead5b14f27a314df5311dce7c726a6571ecdd9aa497812c0e9e71f397fe SHA512 380075433cbb7d639765fa6907c3006612901b051d48311cabd85d653b8e8105044f703a129b8d90bcfd48a29a8365de3053bad81d9561dafc5c5974d7420082
-EBUILD php-7.4.11.ebuild 21375 BLAKE2B 20a4c51fdc08852c87aa86a08b8f8f2928bff2054aebcf59c8b8afbfd70a7afda2cbddc5843f4bfdd2b922651e1867059dcd34c52d45467e29eb4416c99b58f6 SHA512 45b523ac3a47c481eb8fa5d8b812a90e186b5997fe2e192898970feefe9e6d3cb846f0324927175833d3949bc0427c545f48e0c2212155f62fc8ce00e5749acb
-EBUILD php-7.4.12.ebuild 21382 BLAKE2B 936caa37281c2b79d2d7550de422c32a0dbf41e2f1530aa5709dfd6a0d92f7c5c6b82ead5b14f27a314df5311dce7c726a6571ecdd9aa497812c0e9e71f397fe SHA512 380075433cbb7d639765fa6907c3006612901b051d48311cabd85d653b8e8105044f703a129b8d90bcfd48a29a8365de3053bad81d9561dafc5c5974d7420082
-EBUILD php-7.4.13.ebuild 21414 BLAKE2B 291a323943eb1d9c0b2e2cdca45dc490295838df2bcc66edcbb6669fc450aec7d5a6d9e69f43d6eecb71b441c218b159876919c2c9a2493431929bdbad3f9fe9 SHA512 f2c2d6bd1b317ba43c9877bf32925c76d9a9cd5bd1d0aea1f3a759c38ce2e6354f4517b5fe079f20f63bb9dd7af6b95a578bbbfe42f56e959c4f0bfdf48472e5
-EBUILD php-7.4.9.ebuild 21375 BLAKE2B 20a4c51fdc08852c87aa86a08b8f8f2928bff2054aebcf59c8b8afbfd70a7afda2cbddc5843f4bfdd2b922651e1867059dcd34c52d45467e29eb4416c99b58f6 SHA512 45b523ac3a47c481eb8fa5d8b812a90e186b5997fe2e192898970feefe9e6d3cb846f0324927175833d3949bc0427c545f48e0c2212155f62fc8ce00e5749acb
+EBUILD php-7.3.25.ebuild 22664 BLAKE2B 2191d27cc589cf5b0d85c33c3c81cddec0389719973c82b2665b4ae5be145e08c427fe4d59978ba07d04e3b3026f54c5471a51f20ce8ab02e55f4e6a269a3e47 SHA512 70a1783a530b13c38f1a9ecb8c381cd34ae9cad6124ff96cf7b28bdb97c447f133acbdd9bbe515b799eecfdc201d7d3524079a405fa989d07e7b9661916b374b
+EBUILD php-7.4.13.ebuild 21413 BLAKE2B 274ac296e7874ec14d3f458672156dc127c83d6627419856ddf762cd66e2ddb2b081a671d7f135e8827b5f718508b4cee016d52c93e759cc1dacb364f945cfdb SHA512 2be6393ecc2d877ccd13c7731794c1fbd817594ac33576e04e7d1510d8c6f1e8fbf49a6d4dd00e7e65e266853e12c9042fb94d1e4cf12d7ad2999fc1b85a4979
EBUILD php-8.0.0.ebuild 21276 BLAKE2B e58d02e2c685bd56435360a6c3801c1c6e1f7d27f9614cac40737efefc62e8e62c168556a7c139b7e3b49171f6f3d2f65dc9f0de77848362dc8be0a7af22517b SHA512 5f4a494f280fd5079d80ea27ea25b6bf14a4cfc33380cefbdfd9f5b92367eb734bcc7fcf0cd4bc75740113e73531449d77b0af1c748701034845cbf19aaf1be4
MISC metadata.xml 3216 BLAKE2B 6118c94f2ac3a2f283eb035cbbacb12343476b4ce22594a00cb7ebf063abb106a0ed5557d311127b8c1e2a53263103ded790cd12d20c6b410ab6f7d218d95ed8 SHA512 ffb0b46b30b1add0fc166e3afe1317e70041a0fe849d4c05ceee011c1b5e130fbde3b86eaf876a4c8a2d23fbd7824f95299642b4f60e129436befb00f4b124cc
diff --git a/dev-lang/php/php-7.2.33.ebuild b/dev-lang/php/php-7.2.33.ebuild
deleted file mode 100644
index 07f0645b8d80..000000000000
--- a/dev-lang/php/php-7.2.33.ebuild
+++ /dev/null
@@ -1,759 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit flag-o-matic systemd autotools
-
-DESCRIPTION="The PHP language runtime engine"
-HOMEPAGE="https://www.php.net/"
-SRC_URI="https://www.php.net/distributions/${P}.tar.xz"
-
-LICENSE="PHP-3.01
- BSD
- Zend-2.0
- bcmath? ( LGPL-2.1+ )
- fpm? ( BSD-2 )
- gd? ( gd )
- unicode? ( BSD-2 LGPL-2.1 )"
-
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-
-# We can build the following SAPIs in the given order
-SAPIS="embed cli cgi fpm apache2 phpdbg"
-
-# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
-IUSE="${IUSE}
- ${SAPIS/cli/+cli}
- threads"
-
-IUSE="${IUSE} acl argon2 bcmath berkdb bzip2 calendar cdb cjk
- coverage +ctype curl debug
- enchant exif +fileinfo +filter firebird
- +flatfile ftp gd gdbm gmp +hash +iconv imap inifile
- intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit libressl lmdb
- mhash mssql mysql mysqli nls
- oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm
- readline recode selinux +session session-mm sharedmem
- +simplexml snmp soap sockets sodium spell sqlite ssl
- sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode wddx webp
- +xml xmlreader xmlwriter xmlrpc xpm xslt zip zip-encryption zlib"
-
-# The supported (that is, autodetected) versions of BDB are listed in
-# the ./configure script. Other versions *work*, but we need to stick to
-# the ones that can be detected to avoid a repeat of bug #564824.
-COMMON_DEPEND="
- >=app-eselect/eselect-php-0.9.1[apache2?,fpm?]
- >=dev-libs/libpcre-8.32[unicode]
- fpm? ( acl? ( sys-apps/acl ) )
- apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] )
- argon2? ( app-crypt/argon2:= )
- berkdb? ( || ( sys-libs/db:5.3
- sys-libs/db:5.1
- sys-libs/db:4.8
- sys-libs/db:4.7
- sys-libs/db:4.6
- sys-libs/db:4.5 ) )
- bzip2? ( app-arch/bzip2:0= )
- cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
- coverage? ( dev-util/lcov )
- curl? ( >=net-misc/curl-7.10.5 )
- enchant? ( =virtual/jpeg-0-r3:0 media-libs/libpng:0= sys-libs/zlib )
- gdbm? ( >=sys-libs/gdbm-1.8.0:0= )
- gmp? ( dev-libs/gmp:0= )
- iconv? ( virtual/libiconv )
- imap? ( >=virtual/imap-c-client-2[kerberos=,ssl=] )
- intl? ( dev-libs/icu:= )
- iodbc? ( dev-db/libiodbc )
- kerberos? ( virtual/krb5 )
- ldap? ( >=net-nds/openldap-1.2.11 )
- ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 )
- libedit? ( dev-libs/libedit )
- lmdb? ( dev-db/lmdb:= )
- mssql? ( dev-db/freetds[mssql] )
- nls? ( sys-devel/gettext )
- oci8-instant-client? ( dev-db/oracle-instantclient-basic )
- odbc? ( >=dev-db/unixODBC-1.8.13 )
- postgres? ( dev-db/postgresql:* )
- qdbm? ( dev-db/qdbm )
- readline? ( sys-libs/readline:0= )
- recode? ( app-text/recode )
- session-mm? ( dev-libs/mm )
- simplexml? ( >=dev-libs/libxml2-2.6.8 )
- snmp? ( >=net-analyzer/net-snmp-5.2 )
- soap? ( >=dev-libs/libxml2-2.6.8 )
- sodium? ( dev-libs/libsodium:= )
- spell? ( >=app-text/aspell-0.50 )
- sqlite? ( >=dev-db/sqlite-3.7.6.3 )
- ssl? (
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:0= )
- )
- tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) )
- tokyocabinet? ( dev-db/tokyocabinet )
- truetype? ( =media-libs/freetype-2* )
- unicode? ( dev-libs/oniguruma:= )
- wddx? ( >=dev-libs/libxml2-2.6.8 )
- webp? ( media-libs/libwebp:0= )
- xml? ( >=dev-libs/libxml2-2.6.8 )
- xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv )
- xmlreader? ( >=dev-libs/libxml2-2.6.8 )
- xmlwriter? ( >=dev-libs/libxml2-2.6.8 )
- xpm? ( x11-libs/libXpm )
- xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 )
- zip? ( sys-libs/zlib:0= )
- zip-encryption? ( >=dev-libs/libzip-1.2.0:= )
- zlib? ( sys-libs/zlib:0= )
-"
-
-RDEPEND="${COMMON_DEPEND}
- virtual/mta
- fpm? (
- selinux? ( sec-policy/selinux-phpfpm )
- systemd? ( sys-apps/systemd ) )"
-
-# Bison isn't actually needed when building from a release tarball
-# However, the configure script will warn if it's absent or if you
-# have an incompatible version installed. See bug 593278.
-DEPEND="${COMMON_DEPEND}
- app-arch/xz-utils
- >=sys-devel/bison-3.0.1"
-
-BDEPEND="virtual/pkgconfig"
-
-# Without USE=readline or libedit, the interactive "php -a" CLI will hang.
-REQUIRED_USE="
- || ( cli cgi fpm apache2 embed phpdbg )
- cli? ( ^^ ( readline libedit ) )
- truetype? ( gd zlib )
- webp? ( gd zlib )
- cjk? ( gd zlib )
- exif? ( gd zlib )
- xpm? ( gd zlib )
- gd? ( zlib )
- simplexml? ( xml )
- soap? ( xml )
- wddx? ( xml )
- xmlrpc? ( || ( xml iconv ) )
- xmlreader? ( xml )
- xslt? ( xml )
- ldap-sasl? ( ldap )
- mhash? ( hash )
- phar? ( hash )
- qdbm? ( !gdbm )
- readline? ( !libedit )
- recode? ( !imap !mysqli !mysql )
- session-mm? ( session !threads )
- mysql? ( hash || ( mysqli pdo ) )
- mysqli? ( hash )
- zip-encryption? ( zip )
-"
-
-RESTRICT="!test? ( test )"
-
-PATCHES=(
- "${FILESDIR}/php-freetype-2.9.1.patch"
- "${FILESDIR}/php-7.2.13-intl-use-icu-namespace.patch"
-)
-
-PHP_MV="$(ver_cut 1)"
-
-php_install_ini() {
- local phpsapi="${1}"
-
- # work out where we are installing the ini file
- php_set_ini_dir "${phpsapi}"
-
- # Always install the production INI file, bug 611214.
- local phpinisrc="php.ini-production-${phpsapi}"
- cp php.ini-production "${phpinisrc}" || die
-
- # default to /tmp for save_path, bug #282768
- sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}" || die
-
- # Set the extension dir
- sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" \
- -i "${phpinisrc}" || die
-
- # Set the include path to point to where we want to find PEAR packages
- sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}" || die
-
- insinto "${PHP_INI_DIR#${EPREFIX}}"
- newins "${phpinisrc}" php.ini
-
- elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}"
- elog
-
- dodir "${PHP_EXT_INI_DIR#${EPREFIX}}"
- dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}"
-
- if use opcache; then
- elog "Adding opcache to $PHP_EXT_INI_DIR"
- echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> \
- "${D}/${PHP_EXT_INI_DIR}"/opcache.ini
- dosym "../ext/opcache.ini" \
- "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/opcache.ini"
- fi
-
- # SAPI-specific handling
- if [[ "${sapi}" == "fpm" ]] ; then
- einfo "Installing FPM config files php-fpm.conf and www.conf"
- insinto "${PHP_INI_DIR#${EPREFIX}}"
- doins sapi/fpm/php-fpm.conf
- insinto "${PHP_INI_DIR#${EPREFIX}}/fpm.d"
- doins sapi/fpm/www.conf
- fi
-
- dodoc php.ini-{development,production}
-}
-
-php_set_ini_dir() {
- PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}"
- PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext"
- PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active"
-}
-
-src_prepare() {
- default
-
- # In php-7.x, the FPM pool configuration files have been split off
- # of the main config. By default the pool config files go in
- # e.g. /etc/php-fpm.d, which isn't slotted. So here we move the
- # include directory to a subdirectory "fpm.d" of $PHP_INI_DIR. Later
- # we'll install the pool configuration file "www.conf" there.
- php_set_ini_dir fpm
- sed -i "s~^include=.*$~include=${PHP_INI_DIR}/fpm.d/*.conf~" \
- sapi/fpm/php-fpm.conf.in \
- || die 'failed to move the include directory in php-fpm.conf'
-
- # Bug 669566 - necessary so that build tools are updated for commands like pecl
- # Force rebuilding aclocal.m4
- rm -f aclocal.m4 || die "failed to remove aclocal.m4 in src_prepare"
- eautoreconf
-}
-
-src_configure() {
- addpredict /usr/share/snmp/mibs/.index #nowarn
- addpredict /var/lib/net-snmp/mib_indexes #nowarn
-
- PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}"
-
- # The php-fpm config file wants localstatedir to be ${EPREFIX}/var
- # and not the Gentoo default ${EPREFIX}/var/lib. See bug 572002.
- local our_conf=(
- --prefix="${PHP_DESTDIR}"
- --mandir="${PHP_DESTDIR}/man"
- --infodir="${PHP_DESTDIR}/info"
- --libdir="${PHP_DESTDIR}/lib"
- --with-libdir="$(get_libdir)"
- --localstatedir="${EPREFIX}/var"
- --without-pear
- $(use_enable threads maintainer-zts)
- )
-
- our_conf+=(
- $(use_with argon2 password-argon2 "${EPREFIX}/usr")
- $(use_enable bcmath bcmath)
- $(use_with bzip2 bz2 "${EPREFIX}/usr")
- $(use_enable calendar calendar)
- $(use_enable coverage gcov)
- $(use_enable ctype ctype)
- $(use_with curl curl "${EPREFIX}/usr")
- $(use_enable xml dom)
- $(use_with enchant enchant "${EPREFIX}/usr")
- $(use_enable exif exif)
- $(use_enable fileinfo fileinfo)
- $(use_enable filter filter)
- $(use_enable ftp ftp)
- $(use_with nls gettext "${EPREFIX}/usr")
- $(use_with gmp gmp "${EPREFIX}/usr")
- $(use_enable hash hash)
- $(use_with mhash mhash "${EPREFIX}/usr")
- $(use_with iconv iconv \
- $(use elibc_glibc || use elibc_musl || use elibc_FreeBSD || echo "${EPREFIX}/usr"))
- $(use_enable intl intl)
- $(use_enable ipv6 ipv6)
- $(use_enable json json)
- $(use_with kerberos kerberos "${EPREFIX}/usr")
- $(use_enable xml libxml)
- $(use_with xml libxml-dir "${EPREFIX}/usr")
- $(use_enable unicode mbstring)
- $(use_with unicode onig "${EPREFIX}/usr")
- $(use_with ssl openssl "${EPREFIX}/usr")
- $(use_with ssl openssl-dir "${EPREFIX}/usr")
- $(use_enable pcntl pcntl)
- $(use_enable phar phar)
- $(use_enable pdo pdo)
- $(use_enable opcache opcache)
- $(use_with postgres pgsql "${EPREFIX}/usr")
- $(use_enable posix posix)
- $(use_with spell pspell "${EPREFIX}/usr")
- $(use_with recode recode "${EPREFIX}/usr")
- $(use_enable simplexml simplexml)
- $(use_enable sharedmem shmop)
- $(use_with snmp snmp "${EPREFIX}/usr")
- $(use_enable soap soap)
- $(use_enable sockets sockets)
- $(use_with sodium sodium "${EPREFIX}/usr")
- $(use_with sqlite sqlite3 "${EPREFIX}/usr")
- $(use_enable sysvipc sysvmsg)
- $(use_enable sysvipc sysvsem)
- $(use_enable sysvipc sysvshm)
- $(use_with tidy tidy "${EPREFIX}/usr")
- $(use_enable tokenizer tokenizer)
- $(use_enable wddx wddx)
- $(use_enable xml xml)
- $(use_enable xmlreader xmlreader)
- $(use_enable xmlwriter xmlwriter)
- $(use_with xmlrpc xmlrpc)
- $(use_with xslt xsl "${EPREFIX}/usr")
- $(use_enable zip zip)
- $(use_with zip-encryption libzip "${EPREFIX}/usr")
- $(use_with zlib zlib "${EPREFIX}/usr")
- $(use_enable debug debug)
- )
-
- # DBA support
- if use cdb || use berkdb || use flatfile || use gdbm || use inifile \
- || use qdbm || use lmdb || use tokyocabinet ; then
- our_conf+=( "--enable-dba${shared}" )
- fi
-
- # DBA drivers support
- our_conf+=(
- $(use_with cdb cdb)
- $(use_with berkdb db4 "${EPREFIX}/usr")
- $(use_enable flatfile flatfile)
- $(use_with gdbm gdbm "${EPREFIX}/usr")
- $(use_enable inifile inifile)
- $(use_with qdbm qdbm "${EPREFIX}/usr")
- $(use_with lmdb lmdb "${EPREFIX}/usr")
- )
-
- # Support for the GD graphics library
- our_conf+=(
- $(use_with truetype freetype-dir "${EPREFIX}/usr")
- $(use_enable cjk gd-jis-conv)
- $(use_with gd jpeg-dir "${EPREFIX}/usr")
- $(use_with gd png-dir "${EPREFIX}/usr")
- $(use_with xpm xpm-dir "${EPREFIX}/usr")
- )
- if use webp; then
- our_conf+=( --with-webp-dir="${EPREFIX}/usr" )
- fi
- # enable gd last, so configure can pick up the previous settings
- our_conf+=( $(use_with gd gd) )
-
- # IMAP support
- if use imap ; then
- our_conf+=(
- $(use_with imap imap "${EPREFIX}/usr")
- $(use_with ssl imap-ssl "${EPREFIX}/usr")
- )
- fi
-
- # Interbase/firebird support
- our_conf+=( $(use_with firebird interbase "${EPREFIX}/usr") )
-
- # LDAP support
- if use ldap ; then
- our_conf+=(
- $(use_with ldap ldap "${EPREFIX}/usr")
- $(use_with ldap-sasl ldap-sasl "${EPREFIX}/usr")
- )
- fi
-
- # MySQL support
- local mysqllib="mysqlnd"
- local mysqlilib="mysqlnd"
-
- our_conf+=( $(use_with mysqli mysqli "${mysqlilib}") )
-
- local mysqlsock="${EPREFIX}/var/run/mysqld/mysqld.sock"
- if use mysql || use mysqli ; then
- our_conf+=( $(use_with mysql mysql-sock "${mysqlsock}") )
- fi
-
- # ODBC support
- our_conf+=(
- $(use_with odbc unixODBC "${EPREFIX}/usr")
- $(use_with iodbc iodbc "${EPREFIX}/usr")
- )
-
- # Oracle support
- our_conf+=( $(use_with oci8-instant-client oci8) )
-
- # PDO support
- if use pdo ; then
- our_conf+=(
- $(use_with mssql pdo-dblib "${EPREFIX}/usr")
- $(use_with mysql pdo-mysql "${mysqllib}")
- $(use_with postgres pdo-pgsql)
- $(use_with sqlite pdo-sqlite "${EPREFIX}/usr")
- $(use_with firebird pdo-firebird "${EPREFIX}/usr")
- $(use_with odbc pdo-odbc "unixODBC,${EPREFIX}/usr")
- $(use_with oci8-instant-client pdo-oci)
- )
- fi
-
- # readline/libedit support
- our_conf+=(
- $(use_with readline readline "${EPREFIX}/usr")
- $(use_with libedit libedit "${EPREFIX}/usr")
- )
-
- # Session support
- if use session ; then
- our_conf+=( $(use_with session-mm mm "${EPREFIX}/usr") )
- else
- our_conf+=( $(use_enable session session) )
- fi
-
- # Use pic for shared modules such as apache2's mod_php
- our_conf+=( --with-pic )
-
- # we use the system copy of pcre
- # --with-pcre-regex affects ext/pcre
- # --with-pcre-dir affects ext/filter and ext/zip
- # --with-pcre-valgrind cannot be enabled with system pcre
- # Many arches don't support pcre-jit
- our_conf+=(
- --with-pcre-regex="${EPREFIX}/usr"
- --with-pcre-dir="${EPREFIX}/usr"
- --without-pcre-valgrind
- --without-pcre-jit
- )
-
- # Catch CFLAGS problems
- # Fixes bug #14067.
- # Changed order to run it in reverse for bug #32022 and #12021.
- replace-cpu-flags "k6*" "i586"
-
- # Cache the ./configure test results between SAPIs.
- our_conf+=( --cache-file="${T}/config.cache" )
-
- # Support user-passed configuration parameters
- our_conf+=( ${EXTRA_ECONF:-} )
-
- # Support the Apache2 extras, they must be set globally for all
- # SAPIs to work correctly, especially for external PHP extensions
-
- local one_sapi
- local sapi
- mkdir -p "${WORKDIR}/sapis-build" || die
- for one_sapi in $SAPIS ; do
- use "${one_sapi}" || continue
- php_set_ini_dir "${one_sapi}"
-
- # The BUILD_DIR variable is used to determine where to output
- # the files that autotools creates. This was all originally
- # based on the autotools-utils eclass.
- BUILD_DIR="${WORKDIR}/sapis-build/${one_sapi}"
- cp -a "${S}" "${BUILD_DIR}" || die
- cd "${BUILD_DIR}" || die
-
- local sapi_conf=(
- --with-config-file-path="${PHP_INI_DIR}"
- --with-config-file-scan-dir="${PHP_EXT_INI_DIR_ACTIVE}"
- )
-
- for sapi in $SAPIS ; do
- case "$sapi" in
- cli|cgi|embed|fpm|phpdbg)
- if [[ "${one_sapi}" == "${sapi}" ]] ; then
- sapi_conf+=( "--enable-${sapi}" )
- if [[ "fpm" == "${sapi}" ]] ; then
- sapi_conf+=(
- $(use_with acl fpm-acl)
- $(use_with systemd fpm-systemd)
- )
- fi
- else
- sapi_conf+=( "--disable-${sapi}" )
- fi
- ;;
-
- apache2)
- if [[ "${one_sapi}" == "${sapi}" ]] ; then
- sapi_conf+=( --with-apxs2="${EPREFIX}/usr/bin/apxs" )
- else
- sapi_conf+=( --without-apxs2 )
- fi
- ;;
- esac
- done
-
- # Construct the $myeconfargs array by concatenating $our_conf
- # (the common args) and $sapi_conf (the SAPI-specific args).
- local myeconfargs=( "${our_conf[@]}" )
- myeconfargs+=( "${sapi_conf[@]}" )
-
- pushd "${BUILD_DIR}" > /dev/null || die
- econf "${myeconfargs[@]}"
- popd > /dev/null || die
- done
-}
-
-src_compile() {
- # snmp seems to run during src_compile, too (bug #324739)
- addpredict /usr/share/snmp/mibs/.index #nowarn
- addpredict /var/lib/net-snmp/mib_indexes #nowarn
-
- local sapi
- for sapi in ${SAPIS} ; do
- if use "${sapi}"; then
- cd "${WORKDIR}/sapis-build/$sapi" || \
- die "Failed to change dir to ${WORKDIR}/sapis-build/$1"
- emake
- fi
- done
-}
-
-src_install() {
- # see bug #324739 for what happens when we don't have that
- addpredict /usr/share/snmp/mibs/.index #nowarn
-
- # grab the first SAPI that got built and install common files from there
- local first_sapi="",sapi=""
- for sapi in $SAPIS ; do
- if use $sapi ; then
- first_sapi=$sapi
- break
- fi
- done
-
- # Makefile forgets to create this before trying to write to it...
- dodir "${PHP_DESTDIR#${EPREFIX}}/bin"
-
- # Install php environment (without any sapis)
- cd "${WORKDIR}/sapis-build/$first_sapi" || die
- emake INSTALL_ROOT="${D}" \
- install-build install-headers install-programs
-
- local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)"
-
- # Create the directory where we'll put version-specific php scripts
- keepdir "/usr/share/php${PHP_MV}"
-
- local file=""
- local sapi_list=""
-
- for sapi in ${SAPIS}; do
- if use "${sapi}" ; then
- einfo "Installing SAPI: ${sapi}"
- cd "${WORKDIR}/sapis-build/${sapi}" || die
-
- if [[ "${sapi}" == "apache2" ]] ; then
- # We're specifically not using emake install-sapi as libtool
- # may cause unnecessary relink failures (see bug #351266)
- insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/"
- newins ".libs/libphp${PHP_MV}$(get_libname)" \
- "libphp${PHP_MV}$(get_libname)"
- keepdir "/usr/$(get_libdir)/apache2/modules"
- else
- # needed each time, php_install_ini would reset it
- local dest="${PHP_DESTDIR#${EPREFIX}}"
- into "${dest}"
- case "$sapi" in
- cli)
- source="sapi/cli/php"
- # Install the "phar" archive utility.
- if use phar ; then
- emake INSTALL_ROOT="${D}" install-pharcmd
- dosym "..${dest#/usr}/bin/phar" "/usr/bin/phar${SLOT}"
- fi
- ;;
- cgi)
- source="sapi/cgi/php-cgi"
- ;;
- fpm)
- source="sapi/fpm/php-fpm"
- ;;
- embed)
- source="libs/libphp${PHP_MV}$(get_libname)"
- ;;
- phpdbg)
- source="sapi/phpdbg/phpdbg"
- ;;
- *)
- die "unhandled sapi in src_install"
- ;;
- esac
-
- if [[ "${source}" == *"$(get_libname)" ]]; then
- dolib.so "${source}"
- else
- dobin "${source}"
- local name="$(basename ${source})"
- dosym "..${dest#/usr}/bin/${name}" "/usr/bin/${name}${SLOT}"
- fi
- fi
-
- php_install_ini "${sapi}"
-
- # construct correct SAPI string for php-config
- # thanks to ferringb for the bash voodoo
- if [[ "${sapi}" == "apache2" ]]; then
- sapi_list="${sapi_list:+${sapi_list} }apache2handler"
- else
- sapi_list="${sapi_list:+${sapi_list} }${sapi}"
- fi
- fi
- done
-
- # Installing opcache module
- if use opcache ; then
- into "${PHP_DESTDIR#${EPREFIX}}"
- dolib.so "modules/opcache$(get_libname)"
- fi
-
- # Install env.d files
- newenvd "${FILESDIR}/20php5-envd" "20php${SLOT}"
- sed -e "s|/lib/|/$(get_libdir)/|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
- sed -e "s|php5|php${SLOT}|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
-
- # set php-config variable correctly (bug #278439)
- sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \
- "${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config" || die
-
- if use fpm ; then
- if use systemd; then
- systemd_newunit "${FILESDIR}/php-fpm_at.service" \
- "php-fpm@${SLOT}.service"
- else
- systemd_newunit "${FILESDIR}/php-fpm_at-simple.service" \
- "php-fpm@${SLOT}.service"
- fi
- fi
-}
-
-src_test() {
- echo ">>> Test phase [test]: ${CATEGORY}/${PF}"
- PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php"
- if [[ ! -x "${PHP_BIN}" ]] ; then
- ewarn "Test phase requires USE=cli, skipping"
- return
- else
- export TEST_PHP_EXECUTABLE="${PHP_BIN}"
- fi
-
- if [[ -x "${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi" ]] ; then
- export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi"
- fi
-
- if [[ -x "${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg" ]] ; then
- export TEST_PHPDBG_EXECUTABLE="${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg"
- fi
-
- REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n -d \
- "session.save_path=${T}" \
- "${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d \
- "session.save_path=${T}"
-
- for name in ${EXPECTED_TEST_FAILURES}; do
- mv "${name}.out" "${name}.out.orig" 2>/dev/null || die
- done
-
- local failed="$(find -name '*.out')"
- if [[ ${failed} != "" ]] ; then
- ewarn "The following test cases failed unexpectedly:"
- for name in ${failed}; do
- ewarn " ${name/.out/}"
- done
- else
- einfo "No unexpected test failures, all fine"
- fi
-
- if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then
- local passed=""
- for name in ${EXPECTED_TEST_FAILURES}; do
- [[ -f "${name}.diff" ]] && continue
- passed="${passed} ${name}"
- done
- if [[ ${passed} != "" ]] ; then
- einfo "The following test cases passed unexpectedly:"
- for name in ${passed}; do
- ewarn " ${passed}"
- done
- else
- einfo "None of the known-to-fail tests passed, all fine"
- fi
- fi
-}
-
-pkg_postinst() {
- # Output some general info to the user
- if use apache2 ; then
- elog
- elog "To enable PHP in apache, you will need to add \"-D PHP\" to"
- elog "your apache2 command. OpenRC users can append that string to"
- elog "APACHE2_OPTS in /etc/conf.d/apache2."
- elog
- elog "The apache module configuration file 70_mod_php.conf is"
- elog "provided (and maintained) by eselect-php."
- elog
- fi
-
- # Create the symlinks for php
- local m
- for m in ${SAPIS}; do
- [[ ${m} == 'embed' ]] && continue;
- if use $m ; then
- local ci=$(eselect php show $m)
- if [[ -z $ci ]]; then
- eselect php set $m php${SLOT} || die
- einfo "Switched ${m} to use php:${SLOT}"
- einfo
- elif [[ $ci != "php${SLOT}" ]] ; then
- elog "To switch $m to use php:${SLOT}, run"
- elog " eselect php set $m php${SLOT}"
- elog
- fi
- fi
- done
-
- # Remove dead symlinks for SAPIs that were just disabled. For
- # example, if the user has the cgi SAPI enabled, then he has an
- # eselect-php symlink for it. If he later reinstalls PHP with
- # USE="-cgi", that symlink will break. This call to eselect is
- # supposed to remove that dead link per bug 572436.
- eselect php cleanup || die
-
- if ! has "php${SLOT/./-}" ${PHP_TARGETS}; then
- elog "To build extensions for this version of PHP, you will need to"
- elog "add php${SLOT/./-} to your PHP_TARGETS USE_EXPAND variable."
- elog
- fi
-
- # Warn about the removal of PHP_INI_VERSION if the user has it set.
- if [[ -n "${PHP_INI_VERSION}" ]]; then
- ewarn 'The PHP_INI_VERSION variable has been phased out. You may'
- ewarn 'remove it from your configuration at your convenience. See'
- ewarn
- ewarn ' https://bugs.gentoo.org/611214'
- ewarn
- ewarn 'for more information.'
- fi
-
- elog "For details on how version slotting works, please see"
- elog "the wiki:"
- elog
- elog " https://wiki.gentoo.org/wiki/PHP"
- elog
-}
-
-pkg_postrm() {
- # This serves two purposes. First, if we have just removed the last
- # installed version of PHP, then this will remove any dead symlinks
- # belonging to eselect-php. Second, if a user upgrades slots from
- # (say) 5.6 to 7.0 and depcleans the old slot, then this will update
- # his existing symlinks to point to the new 7.0 installation. The
- # latter is bug 432962.
- #
- # Note: the eselect-php package may not be installed at this point,
- # so we can't die() if this command fails.
- eselect php cleanup
-}
diff --git a/dev-lang/php/php-7.3.21.ebuild b/dev-lang/php/php-7.3.21.ebuild
deleted file mode 100644
index 9c97e02a635a..000000000000
--- a/dev-lang/php/php-7.3.21.ebuild
+++ /dev/null
@@ -1,760 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit flag-o-matic systemd autotools
-
-MY_PV=${PV/_rc/RC}
-DESCRIPTION="The PHP language runtime engine"
-HOMEPAGE="https://www.php.net/"
-SRC_URI="https://www.php.net/distributions/${P}.tar.xz"
-
-LICENSE="PHP-3.01
- BSD
- Zend-2.0
- bcmath? ( LGPL-2.1+ )
- fpm? ( BSD-2 )
- gd? ( gd )
- unicode? ( BSD-2 LGPL-2.1 )"
-
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-# We can build the following SAPIs in the given order
-SAPIS="embed cli cgi fpm apache2 phpdbg"
-
-# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
-IUSE="${IUSE}
- ${SAPIS/cli/+cli}
- threads"
-
-IUSE="${IUSE} acl argon2 bcmath berkdb bzip2 calendar cdb cjk
- coverage +ctype curl debug
- enchant exif +fileinfo +filter firebird
- +flatfile ftp gd gdbm gmp +hash +iconv imap inifile
- intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit libressl lmdb
- mhash mssql mysql mysqli nls
- oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm
- readline recode selinux +session session-mm sharedmem
- +simplexml snmp soap sockets sodium spell sqlite ssl
- sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode wddx webp
- +xml xmlreader xmlwriter xmlrpc xpm xslt zip zip-encryption zlib"
-
-# The supported (that is, autodetected) versions of BDB are listed in
-# the ./configure script. Other versions *work*, but we need to stick to
-# the ones that can be detected to avoid a repeat of bug #564824.
-COMMON_DEPEND="
- >=app-eselect/eselect-php-0.9.1[apache2?,fpm?]
- >=dev-libs/libpcre2-10.30[unicode]
- fpm? ( acl? ( sys-apps/acl ) )
- apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] )
- argon2? ( app-crypt/argon2:= )
- berkdb? ( || ( sys-libs/db:5.3
- sys-libs/db:5.1
- sys-libs/db:4.8
- sys-libs/db:4.7
- sys-libs/db:4.6
- sys-libs/db:4.5 ) )
- bzip2? ( app-arch/bzip2:0= )
- cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
- coverage? ( dev-util/lcov )
- curl? ( >=net-misc/curl-7.10.5 )
- enchant? ( =virtual/jpeg-0-r3:0 media-libs/libpng:0= >=sys-libs/zlib-1.2.0.4 )
- gdbm? ( >=sys-libs/gdbm-1.8.0:0= )
- gmp? ( dev-libs/gmp:0= )
- iconv? ( virtual/libiconv )
- imap? ( >=virtual/imap-c-client-2[kerberos=,ssl=] )
- intl? ( dev-libs/icu:= )
- iodbc? ( dev-db/libiodbc )
- kerberos? ( virtual/krb5 )
- ldap? ( >=net-nds/openldap-1.2.11 )
- ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 )
- libedit? ( dev-libs/libedit )
- lmdb? ( dev-db/lmdb:= )
- mssql? ( dev-db/freetds[mssql] )
- nls? ( sys-devel/gettext )
- oci8-instant-client? ( dev-db/oracle-instantclient-basic )
- odbc? ( >=dev-db/unixODBC-1.8.13 )
- postgres? ( dev-db/postgresql:* )
- qdbm? ( dev-db/qdbm )
- readline? ( sys-libs/readline:0= )
- recode? ( app-text/recode )
- session-mm? ( dev-libs/mm )
- simplexml? ( >=dev-libs/libxml2-2.6.8 )
- snmp? ( >=net-analyzer/net-snmp-5.2 )
- soap? ( >=dev-libs/libxml2-2.6.8 )
- sodium? ( dev-libs/libsodium:= )
- spell? ( >=app-text/aspell-0.50 )
- sqlite? ( >=dev-db/sqlite-3.7.6.3 )
- ssl? (
- !libressl? ( >=dev-libs/openssl-1.0.1:0= )
- libressl? ( dev-libs/libressl:0= )
- )
- tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) )
- tokyocabinet? ( dev-db/tokyocabinet )
- truetype? ( =media-libs/freetype-2* )
- unicode? ( dev-libs/oniguruma:= )
- wddx? ( >=dev-libs/libxml2-2.6.8 )
- webp? ( media-libs/libwebp:0= )
- xml? ( >=dev-libs/libxml2-2.6.8 )
- xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv )
- xmlreader? ( >=dev-libs/libxml2-2.6.8 )
- xmlwriter? ( >=dev-libs/libxml2-2.6.8 )
- xpm? ( x11-libs/libXpm )
- xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 )
- zip? ( >=sys-libs/zlib-1.2.0.4:0= )
- zip-encryption? ( >=dev-libs/libzip-1.2.0:= )
- zlib? ( >=sys-libs/zlib-1.2.0.4:0= )
-"
-
-RDEPEND="${COMMON_DEPEND}
- virtual/mta
- fpm? (
- selinux? ( sec-policy/selinux-phpfpm )
- systemd? ( sys-apps/systemd ) )"
-
-# Bison isn't actually needed when building from a release tarball
-# However, the configure script will warn if it's absent or if you
-# have an incompatible version installed. See bug 593278.
-DEPEND="${COMMON_DEPEND}
- app-arch/xz-utils
- >=sys-devel/bison-3.0.1"
-
-BDEPEND="virtual/pkgconfig"
-
-# Without USE=readline or libedit, the interactive "php -a" CLI will hang.
-REQUIRED_USE="
- || ( cli cgi fpm apache2 embed phpdbg )
- cli? ( ^^ ( readline libedit ) )
- truetype? ( gd zlib )
- webp? ( gd zlib )
- cjk? ( gd zlib )
- exif? ( gd zlib )
- xpm? ( gd zlib )
- gd? ( zlib )
- simplexml? ( xml )
- soap? ( xml )
- wddx? ( xml )
- xmlrpc? ( || ( xml iconv ) )
- xmlreader? ( xml )
- xslt? ( xml )
- ldap-sasl? ( ldap )
- mhash? ( hash )
- phar? ( hash )
- qdbm? ( !gdbm )
- readline? ( !libedit )
- recode? ( !imap !mysqli !mysql )
- session-mm? ( session !threads )
- mysql? ( || ( mysqli pdo ) )
- zip-encryption? ( zip )
-"
-
-RESTRICT="!test? ( test )"
-
-PATCHES=(
- "${FILESDIR}/php-freetype-2.9.1.patch"
-)
-
-PHP_MV="$(ver_cut 1)"
-
-php_install_ini() {
- local phpsapi="${1}"
-
- # work out where we are installing the ini file
- php_set_ini_dir "${phpsapi}"
-
- # Always install the production INI file, bug 611214.
- local phpinisrc="php.ini-production-${phpsapi}"
- cp php.ini-production "${phpinisrc}" || die
-
- # default to /tmp for save_path, bug #282768
- sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}" || die
-
- # Set the extension dir
- sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" \
- -i "${phpinisrc}" || die
-
- # Set the include path to point to where we want to find PEAR packages
- sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}" || die
-
- insinto "${PHP_INI_DIR#${EPREFIX}}"
- newins "${phpinisrc}" php.ini
-
- elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}"
- elog
-
- dodir "${PHP_EXT_INI_DIR#${EPREFIX}}"
- dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}"
-
- if use opcache; then
- elog "Adding opcache to $PHP_EXT_INI_DIR"
- echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> \
- "${D}/${PHP_EXT_INI_DIR}"/opcache.ini
- dosym "../ext/opcache.ini" \
- "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/opcache.ini"
- fi
-
- # SAPI-specific handling
- if [[ "${sapi}" == "fpm" ]] ; then
- einfo "Installing FPM config files php-fpm.conf and www.conf"
- insinto "${PHP_INI_DIR#${EPREFIX}}"
- doins sapi/fpm/php-fpm.conf
- insinto "${PHP_INI_DIR#${EPREFIX}}/fpm.d"
- doins sapi/fpm/www.conf
- fi
-
- dodoc php.ini-{development,production}
-}
-
-php_set_ini_dir() {
- PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}"
- PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext"
- PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active"
-}
-
-src_prepare() {
- default
-
- # In php-7.x, the FPM pool configuration files have been split off
- # of the main config. By default the pool config files go in
- # e.g. /etc/php-fpm.d, which isn't slotted. So here we move the
- # include directory to a subdirectory "fpm.d" of $PHP_INI_DIR. Later
- # we'll install the pool configuration file "www.conf" there.
- php_set_ini_dir fpm
- sed -i "s~^include=.*$~include=${PHP_INI_DIR}/fpm.d/*.conf~" \
- sapi/fpm/php-fpm.conf.in \
- || die 'failed to move the include directory in php-fpm.conf'
-
- # Bug 669566 - necessary so that build tools are updated for commands like pecl
- # Force rebuilding aclocal.m4
- rm -f aclocal.m4 || die "failed to remove aclocal.m4 in src_prepare"
- eautoreconf
-}
-
-src_configure() {
- addpredict /usr/share/snmp/mibs/.index #nowarn
- addpredict /var/lib/net-snmp/mib_indexes #nowarn
-
- PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}"
-
- # The php-fpm config file wants localstatedir to be ${EPREFIX}/var
- # and not the Gentoo default ${EPREFIX}/var/lib. See bug 572002.
- local our_conf=(
- --prefix="${PHP_DESTDIR}"
- --mandir="${PHP_DESTDIR}/man"
- --infodir="${PHP_DESTDIR}/info"
- --libdir="${PHP_DESTDIR}/lib"
- --with-libdir="$(get_libdir)"
- --localstatedir="${EPREFIX}/var"
- --without-pear
- $(use_enable threads maintainer-zts)
- )
-
- our_conf+=(
- $(use_with argon2 password-argon2 "${EPREFIX}/usr")
- $(use_enable bcmath bcmath)
- $(use_with bzip2 bz2 "${EPREFIX}/usr")
- $(use_enable calendar calendar)
- $(use_enable coverage gcov)
- $(use_enable ctype ctype)
- $(use_with curl curl "${EPREFIX}/usr")
- $(use_enable xml dom)
- $(use_with enchant enchant "${EPREFIX}/usr")
- $(use_enable exif exif)
- $(use_enable fileinfo fileinfo)
- $(use_enable filter filter)
- $(use_enable ftp ftp)
- $(use_with nls gettext "${EPREFIX}/usr")
- $(use_with gmp gmp "${EPREFIX}/usr")
- $(use_enable hash hash)
- $(use_with mhash mhash "${EPREFIX}/usr")
- $(use_with iconv iconv \
- $(use elibc_glibc || use elibc_musl || use elibc_FreeBSD || echo "${EPREFIX}/usr"))
- $(use_enable intl intl)
- $(use_enable ipv6 ipv6)
- $(use_enable json json)
- $(use_with kerberos kerberos "${EPREFIX}/usr")
- $(use_enable xml libxml)
- $(use_with xml libxml-dir "${EPREFIX}/usr")
- $(use_enable unicode mbstring)
- $(use_with unicode onig "${EPREFIX}/usr")
- $(use_with ssl openssl "${EPREFIX}/usr")
- $(use_with ssl openssl-dir "${EPREFIX}/usr")
- $(use_enable pcntl pcntl)
- $(use_enable phar phar)
- $(use_enable pdo pdo)
- $(use_enable opcache opcache)
- $(use_with postgres pgsql "${EPREFIX}/usr")
- $(use_enable posix posix)
- $(use_with spell pspell "${EPREFIX}/usr")
- $(use_with recode recode "${EPREFIX}/usr")
- $(use_enable simplexml simplexml)
- $(use_enable sharedmem shmop)
- $(use_with snmp snmp "${EPREFIX}/usr")
- $(use_enable soap soap)
- $(use_enable sockets sockets)
- $(use_with sodium sodium "${EPREFIX}/usr")
- $(use_with sqlite sqlite3 "${EPREFIX}/usr")
- $(use_enable sysvipc sysvmsg)
- $(use_enable sysvipc sysvsem)
- $(use_enable sysvipc sysvshm)
- $(use_with tidy tidy "${EPREFIX}/usr")
- $(use_enable tokenizer tokenizer)
- $(use_enable wddx wddx)
- $(use_enable xml xml)
- $(use_enable xmlreader xmlreader)
- $(use_enable xmlwriter xmlwriter)
- $(use_with xmlrpc xmlrpc)
- $(use_with xslt xsl "${EPREFIX}/usr")
- $(use_enable zip zip)
- $(use_with zip-encryption libzip "${EPREFIX}/usr")
- $(use_with zlib zlib "${EPREFIX}/usr")
- $(use_enable debug debug)
- )
-
- # DBA support
- if use cdb || use berkdb || use flatfile || use gdbm || use inifile \
- || use qdbm || use lmdb || use tokyocabinet ; then
- our_conf+=( "--enable-dba${shared}" )
- fi
-
- # DBA drivers support
- our_conf+=(
- $(use_with cdb cdb)
- $(use_with berkdb db4 "${EPREFIX}/usr")
- $(use_enable flatfile flatfile)
- $(use_with gdbm gdbm "${EPREFIX}/usr")
- $(use_enable inifile inifile)
- $(use_with qdbm qdbm "${EPREFIX}/usr")
- $(use_with lmdb lmdb "${EPREFIX}/usr")
- )
-
- # Support for the GD graphics library
- our_conf+=(
- $(use_with truetype freetype-dir "${EPREFIX}/usr")
- $(use_enable cjk gd-jis-conv)
- $(use_with gd jpeg-dir "${EPREFIX}/usr")
- $(use_with gd png-dir "${EPREFIX}/usr")
- $(use_with xpm xpm-dir "${EPREFIX}/usr")
- )
- if use webp; then
- our_conf+=( --with-webp-dir="${EPREFIX}/usr" )
- fi
- # enable gd last, so configure can pick up the previous settings
- our_conf+=( $(use_with gd gd) )
-
- # IMAP support
- if use imap ; then
- our_conf+=(
- $(use_with imap imap "${EPREFIX}/usr")
- $(use_with ssl imap-ssl "${EPREFIX}/usr")
- )
- fi
-
- # Interbase/firebird support
- our_conf+=( $(use_with firebird interbase "${EPREFIX}/usr") )
-
- # LDAP support
- if use ldap ; then
- our_conf+=(
- $(use_with ldap ldap "${EPREFIX}/usr")
- $(use_with ldap-sasl ldap-sasl "${EPREFIX}/usr")
- )
- fi
-
- # MySQL support
- local mysqllib="mysqlnd"
- local mysqlilib="mysqlnd"
-
- our_conf+=( $(use_with mysqli mysqli "${mysqlilib}") )
-
- local mysqlsock="${EPREFIX}/var/run/mysqld/mysqld.sock"
- if use mysql || use mysqli ; then
- our_conf+=( $(use_with mysql mysql-sock "${mysqlsock}") )
- fi
-
- # ODBC support
- our_conf+=(
- $(use_with odbc unixODBC "${EPREFIX}/usr")
- $(use_with iodbc iodbc "${EPREFIX}/usr")
- )
-
- # Oracle support
- our_conf+=( $(use_with oci8-instant-client oci8) )
-
- # PDO support
- if use pdo ; then
- our_conf+=(
- $(use_with mssql pdo-dblib "${EPREFIX}/usr")
- $(use_with mysql pdo-mysql "${mysqllib}")
- $(use_with postgres pdo-pgsql)
- $(use_with sqlite pdo-sqlite "${EPREFIX}/usr")
- $(use_with firebird pdo-firebird "${EPREFIX}/usr")
- $(use_with odbc pdo-odbc "unixODBC,${EPREFIX}/usr")
- $(use_with oci8-instant-client pdo-oci)
- )
- fi
-
- # readline/libedit support
- our_conf+=(
- $(use_with readline readline "${EPREFIX}/usr")
- $(use_with libedit libedit "${EPREFIX}/usr")
- )
-
- # Session support
- if use session ; then
- our_conf+=( $(use_with session-mm mm "${EPREFIX}/usr") )
- else
- our_conf+=( $(use_enable session session) )
- fi
-
- # Use pic for shared modules such as apache2's mod_php
- our_conf+=( --with-pic )
-
- # we use the system copy of pcre
- # --with-pcre-regex affects ext/pcre
- # --with-pcre-dir affects ext/filter and ext/zip
- # --with-pcre-valgrind cannot be enabled with system pcre
- # Many arches don't support pcre-jit
- our_conf+=(
- --with-pcre-regex="${EPREFIX}/usr"
- --with-pcre-dir="${EPREFIX}/usr"
- --without-pcre-valgrind
- --without-pcre-jit
- )
-
- # Catch CFLAGS problems
- # Fixes bug #14067.
- # Changed order to run it in reverse for bug #32022 and #12021.
- replace-cpu-flags "k6*" "i586"
-
- # Cache the ./configure test results between SAPIs.
- our_conf+=( --cache-file="${T}/config.cache" )
-
- # Support user-passed configuration parameters
- our_conf+=( ${EXTRA_ECONF:-} )
-
- # Support the Apache2 extras, they must be set globally for all
- # SAPIs to work correctly, especially for external PHP extensions
-
- local one_sapi
- local sapi
- mkdir -p "${WORKDIR}/sapis-build" || die
- for one_sapi in $SAPIS ; do
- use "${one_sapi}" || continue
- php_set_ini_dir "${one_sapi}"
-
- # The BUILD_DIR variable is used to determine where to output
- # the files that autotools creates. This was all originally
- # based on the autotools-utils eclass.
- BUILD_DIR="${WORKDIR}/sapis-build/${one_sapi}"
- cp -a "${S}" "${BUILD_DIR}" || die
- cd "${BUILD_DIR}" || die
-
- local sapi_conf=(
- --with-config-file-path="${PHP_INI_DIR}"
- --with-config-file-scan-dir="${PHP_EXT_INI_DIR_ACTIVE}"
- )
-
- for sapi in $SAPIS ; do
- case "$sapi" in
- cli|cgi|embed|fpm|phpdbg)
- if [[ "${one_sapi}" == "${sapi}" ]] ; then
- sapi_conf+=( "--enable-${sapi}" )
- if [[ "fpm" == "${sapi}" ]] ; then
- sapi_conf+=(
- $(use_with acl fpm-acl)
- $(use_with systemd fpm-systemd)
- )
- fi
- else
- sapi_conf+=( "--disable-${sapi}" )
- fi
- ;;
-
- apache2)
- if [[ "${one_sapi}" == "${sapi}" ]] ; then
- sapi_conf+=( --with-apxs2="${EPREFIX}/usr/bin/apxs" )
- else
- sapi_conf+=( --without-apxs2 )
- fi
- ;;
- esac
- done
-
- # Construct the $myeconfargs array by concatenating $our_conf
- # (the common args) and $sapi_conf (the SAPI-specific args).
- local myeconfargs=( "${our_conf[@]}" )
- myeconfargs+=( "${sapi_conf[@]}" )
-
- pushd "${BUILD_DIR}" > /dev/null || die
- econf "${myeconfargs[@]}"
- popd > /dev/null || die
- done
-}
-
-src_compile() {
- # snmp seems to run during src_compile, too (bug #324739)
- addpredict /usr/share/snmp/mibs/.index #nowarn
- addpredict /var/lib/net-snmp/mib_indexes #nowarn
-
- local sapi
- for sapi in ${SAPIS} ; do
- if use "${sapi}"; then
- cd "${WORKDIR}/sapis-build/$sapi" || \
- die "Failed to change dir to ${WORKDIR}/sapis-build/$1"
- emake
- fi
- done
-}
-
-src_install() {
- # see bug #324739 for what happens when we don't have that
- addpredict /usr/share/snmp/mibs/.index #nowarn
-
- # grab the first SAPI that got built and install common files from there
- local first_sapi="", sapi=""
- for sapi in $SAPIS ; do
- if use $sapi ; then
- first_sapi=$sapi
- break
- fi
- done
-
- # Makefile forgets to create this before trying to write to it...
- dodir "${PHP_DESTDIR#${EPREFIX}}/bin"
-
- # Install php environment (without any sapis)
- cd "${WORKDIR}/sapis-build/$first_sapi" || die
- emake INSTALL_ROOT="${D}" \
- install-build install-headers install-programs
-
- local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)"
-
- # Create the directory where we'll put version-specific php scripts
- keepdir "/usr/share/php${PHP_MV}"
-
- local file=""
- local sapi_list=""
-
- for sapi in ${SAPIS}; do
- if use "${sapi}" ; then
- einfo "Installing SAPI: ${sapi}"
- cd "${WORKDIR}/sapis-build/${sapi}" || die
-
- if [[ "${sapi}" == "apache2" ]] ; then
- # We're specifically not using emake install-sapi as libtool
- # may cause unnecessary relink failures (see bug #351266)
- insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/"
- newins ".libs/libphp${PHP_MV}$(get_libname)" \
- "libphp${PHP_MV}$(get_libname)"
- keepdir "/usr/$(get_libdir)/apache2/modules"
- else
- # needed each time, php_install_ini would reset it
- local dest="${PHP_DESTDIR#${EPREFIX}}"
- into "${dest}"
- case "$sapi" in
- cli)
- source="sapi/cli/php"
- # Install the "phar" archive utility.
- if use phar ; then
- emake INSTALL_ROOT="${D}" install-pharcmd
- dosym "..${dest#/usr}/bin/phar" "/usr/bin/phar${SLOT}"
- fi
- ;;
- cgi)
- source="sapi/cgi/php-cgi"
- ;;
- fpm)
- source="sapi/fpm/php-fpm"
- ;;
- embed)
- source="libs/libphp${PHP_MV}$(get_libname)"
- ;;
- phpdbg)
- source="sapi/phpdbg/phpdbg"
- ;;
- *)
- die "unhandled sapi in src_install"
- ;;
- esac
-
- if [[ "${source}" == *"$(get_libname)" ]]; then
- dolib.so "${source}"
- else
- dobin "${source}"
- local name="$(basename ${source})"
- dosym "..${dest#/usr}/bin/${name}" "/usr/bin/${name}${SLOT}"
- fi
- fi
-
- php_install_ini "${sapi}"
-
- # construct correct SAPI string for php-config
- # thanks to ferringb for the bash voodoo
- if [[ "${sapi}" == "apache2" ]]; then
- sapi_list="${sapi_list:+${sapi_list} }apache2handler"
- else
- sapi_list="${sapi_list:+${sapi_list} }${sapi}"
- fi
- fi
- done
-
- # Installing opcache module
- if use opcache ; then
- into "${PHP_DESTDIR#${EPREFIX}}"
- dolib.so "modules/opcache$(get_libname)"
- fi
-
- # Install env.d files
- newenvd "${FILESDIR}/20php5-envd" "20php${SLOT}"
- sed -e "s|/lib/|/$(get_libdir)/|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
- sed -e "s|php5|php${SLOT}|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
-
- # set php-config variable correctly (bug #278439)
- sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \
- "${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config" || die
-
- if use fpm ; then
- if use systemd; then
- systemd_newunit "${FILESDIR}/php-fpm_at.service" \
- "php-fpm@${SLOT}.service"
- else
- systemd_newunit "${FILESDIR}/php-fpm_at-simple.service" \
- "php-fpm@${SLOT}.service"
- fi
- fi
-}
-
-src_test() {
- echo ">>> Test phase [test]: ${CATEGORY}/${PF}"
- PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php"
- if [[ ! -x "${PHP_BIN}" ]] ; then
- ewarn "Test phase requires USE=cli, skipping"
- return
- else
- export TEST_PHP_EXECUTABLE="${PHP_BIN}"
- fi
-
- if [[ -x "${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi" ]] ; then
- export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi"
- fi
-
- if [[ -x "${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg" ]] ; then
- export TEST_PHPDBG_EXECUTABLE="${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg"
- fi
-
- REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n -d \
- "session.save_path=${T}" \
- "${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d \
- "session.save_path=${T}"
-
- for name in ${EXPECTED_TEST_FAILURES}; do
- mv "${name}.out" "${name}.out.orig" 2>/dev/null || die
- done
-
- local failed="$(find -name '*.out')"
- if [[ ${failed} != "" ]] ; then
- ewarn "The following test cases failed unexpectedly:"
- for name in ${failed}; do
- ewarn " ${name/.out/}"
- done
- else
- einfo "No unexpected test failures, all fine"
- fi
-
- if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then
- local passed=""
- for name in ${EXPECTED_TEST_FAILURES}; do
- [[ -f "${name}.diff" ]] && continue
- passed="${passed} ${name}"
- done
- if [[ ${passed} != "" ]] ; then
- einfo "The following test cases passed unexpectedly:"
- for name in ${passed}; do
- ewarn " ${passed}"
- done
- else
- einfo "None of the known-to-fail tests passed, all fine"
- fi
- fi
-}
-
-pkg_postinst() {
- # Output some general info to the user
- if use apache2 ; then
- elog
- elog "To enable PHP in apache, you will need to add \"-D PHP\" to"
- elog "your apache2 command. OpenRC users can append that string to"
- elog "APACHE2_OPTS in /etc/conf.d/apache2."
- elog
- elog "The apache module configuration file 70_mod_php.conf is"
- elog "provided (and maintained) by eselect-php."
- elog
- fi
-
- # Create the symlinks for php
- local m
- for m in ${SAPIS}; do
- [[ ${m} == 'embed' ]] && continue;
- if use $m ; then
- local ci=$(eselect php show $m)
- if [[ -z $ci ]]; then
- eselect php set $m php${SLOT} || die
- einfo "Switched ${m} to use php:${SLOT}"
- einfo
- elif [[ $ci != "php${SLOT}" ]] ; then
- elog "To switch $m to use php:${SLOT}, run"
- elog " eselect php set $m php${SLOT}"
- elog
- fi
- fi
- done
-
- # Remove dead symlinks for SAPIs that were just disabled. For
- # example, if the user has the cgi SAPI enabled, then he has an
- # eselect-php symlink for it. If he later reinstalls PHP with
- # USE="-cgi", that symlink will break. This call to eselect is
- # supposed to remove that dead link per bug 572436.
- eselect php cleanup || die
-
- if ! has "php${SLOT/./-}" ${PHP_TARGETS}; then
- elog "To build extensions for this version of PHP, you will need to"
- elog "add php${SLOT/./-} to your PHP_TARGETS USE_EXPAND variable."
- elog
- fi
-
- # Warn about the removal of PHP_INI_VERSION if the user has it set.
- if [[ -n "${PHP_INI_VERSION}" ]]; then
- ewarn 'The PHP_INI_VERSION variable has been phased out. You may'
- ewarn 'remove it from your configuration at your convenience. See'
- ewarn
- ewarn ' https://bugs.gentoo.org/611214'
- ewarn
- ewarn 'for more information.'
- fi
-
- elog "For details on how version slotting works, please see"
- elog "the wiki:"
- elog
- elog " https://wiki.gentoo.org/wiki/PHP"
- elog
-}
-
-pkg_postrm() {
- # This serves two purposes. First, if we have just removed the last
- # installed version of PHP, then this will remove any dead symlinks
- # belonging to eselect-php. Second, if a user upgrades slots from
- # (say) 5.6 to 7.0 and depcleans the old slot, then this will update
- # his existing symlinks to point to the new 7.0 installation. The
- # latter is bug 432962.
- #
- # Note: the eselect-php package may not be installed at this point,
- # so we can't die() if this command fails.
- eselect php cleanup
-}
diff --git a/dev-lang/php/php-7.3.22.ebuild b/dev-lang/php/php-7.3.22.ebuild
deleted file mode 100644
index 705d68d153f3..000000000000
--- a/dev-lang/php/php-7.3.22.ebuild
+++ /dev/null
@@ -1,760 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit flag-o-matic systemd autotools
-
-MY_PV=${PV/_rc/RC}
-DESCRIPTION="The PHP language runtime engine"
-HOMEPAGE="https://www.php.net/"
-SRC_URI="https://www.php.net/distributions/${P}.tar.xz"
-
-LICENSE="PHP-3.01
- BSD
- Zend-2.0
- bcmath? ( LGPL-2.1+ )
- fpm? ( BSD-2 )
- gd? ( gd )
- unicode? ( BSD-2 LGPL-2.1 )"
-
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-# We can build the following SAPIs in the given order
-SAPIS="embed cli cgi fpm apache2 phpdbg"
-
-# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
-IUSE="${IUSE}
- ${SAPIS/cli/+cli}
- threads"
-
-IUSE="${IUSE} acl argon2 bcmath berkdb bzip2 calendar cdb cjk
- coverage +ctype curl debug
- enchant exif +fileinfo +filter firebird
- +flatfile ftp gd gdbm gmp +hash +iconv imap inifile
- intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit libressl lmdb
- mhash mssql mysql mysqli nls
- oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm
- readline recode selinux +session session-mm sharedmem
- +simplexml snmp soap sockets sodium spell sqlite ssl
- sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode wddx webp
- +xml xmlreader xmlwriter xmlrpc xpm xslt zip zip-encryption zlib"
-
-# The supported (that is, autodetected) versions of BDB are listed in
-# the ./configure script. Other versions *work*, but we need to stick to
-# the ones that can be detected to avoid a repeat of bug #564824.
-COMMON_DEPEND="
- >=app-eselect/eselect-php-0.9.1[apache2?,fpm?]
- >=dev-libs/libpcre2-10.30[unicode]
- fpm? ( acl? ( sys-apps/acl ) )
- apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] )
- argon2? ( app-crypt/argon2:= )
- berkdb? ( || ( sys-libs/db:5.3
- sys-libs/db:5.1
- sys-libs/db:4.8
- sys-libs/db:4.7
- sys-libs/db:4.6
- sys-libs/db:4.5 ) )
- bzip2? ( app-arch/bzip2:0= )
- cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
- coverage? ( dev-util/lcov )
- curl? ( >=net-misc/curl-7.10.5 )
- enchant? ( =virtual/jpeg-0-r3:0 media-libs/libpng:0= >=sys-libs/zlib-1.2.0.4 )
- gdbm? ( >=sys-libs/gdbm-1.8.0:0= )
- gmp? ( dev-libs/gmp:0= )
- iconv? ( virtual/libiconv )
- imap? ( >=virtual/imap-c-client-2[kerberos=,ssl=] )
- intl? ( dev-libs/icu:= )
- iodbc? ( dev-db/libiodbc )
- kerberos? ( virtual/krb5 )
- ldap? ( >=net-nds/openldap-1.2.11 )
- ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 )
- libedit? ( dev-libs/libedit )
- lmdb? ( dev-db/lmdb:= )
- mssql? ( dev-db/freetds[mssql] )
- nls? ( sys-devel/gettext )
- oci8-instant-client? ( dev-db/oracle-instantclient-basic )
- odbc? ( >=dev-db/unixODBC-1.8.13 )
- postgres? ( dev-db/postgresql:* )
- qdbm? ( dev-db/qdbm )
- readline? ( sys-libs/readline:0= )
- recode? ( app-text/recode )
- session-mm? ( dev-libs/mm )
- simplexml? ( >=dev-libs/libxml2-2.6.8 )
- snmp? ( >=net-analyzer/net-snmp-5.2 )
- soap? ( >=dev-libs/libxml2-2.6.8 )
- sodium? ( dev-libs/libsodium:= )
- spell? ( >=app-text/aspell-0.50 )
- sqlite? ( >=dev-db/sqlite-3.7.6.3 )
- ssl? (
- !libressl? ( >=dev-libs/openssl-1.0.1:0= )
- libressl? ( dev-libs/libressl:0= )
- )
- tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) )
- tokyocabinet? ( dev-db/tokyocabinet )
- truetype? ( =media-libs/freetype-2* )
- unicode? ( dev-libs/oniguruma:= )
- wddx? ( >=dev-libs/libxml2-2.6.8 )
- webp? ( media-libs/libwebp:0= )
- xml? ( >=dev-libs/libxml2-2.6.8 )
- xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv )
- xmlreader? ( >=dev-libs/libxml2-2.6.8 )
- xmlwriter? ( >=dev-libs/libxml2-2.6.8 )
- xpm? ( x11-libs/libXpm )
- xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 )
- zip? ( >=sys-libs/zlib-1.2.0.4:0= )
- zip-encryption? ( >=dev-libs/libzip-1.2.0:= )
- zlib? ( >=sys-libs/zlib-1.2.0.4:0= )
-"
-
-RDEPEND="${COMMON_DEPEND}
- virtual/mta
- fpm? (
- selinux? ( sec-policy/selinux-phpfpm )
- systemd? ( sys-apps/systemd ) )"
-
-# Bison isn't actually needed when building from a release tarball
-# However, the configure script will warn if it's absent or if you
-# have an incompatible version installed. See bug 593278.
-DEPEND="${COMMON_DEPEND}
- app-arch/xz-utils
- >=sys-devel/bison-3.0.1"
-
-BDEPEND="virtual/pkgconfig"
-
-# Without USE=readline or libedit, the interactive "php -a" CLI will hang.
-REQUIRED_USE="
- || ( cli cgi fpm apache2 embed phpdbg )
- cli? ( ^^ ( readline libedit ) )
- truetype? ( gd zlib )
- webp? ( gd zlib )
- cjk? ( gd zlib )
- exif? ( gd zlib )
- xpm? ( gd zlib )
- gd? ( zlib )
- simplexml? ( xml )
- soap? ( xml )
- wddx? ( xml )
- xmlrpc? ( || ( xml iconv ) )
- xmlreader? ( xml )
- xslt? ( xml )
- ldap-sasl? ( ldap )
- mhash? ( hash )
- phar? ( hash )
- qdbm? ( !gdbm )
- readline? ( !libedit )
- recode? ( !imap !mysqli !mysql )
- session-mm? ( session !threads )
- mysql? ( || ( mysqli pdo ) )
- zip-encryption? ( zip )
-"
-
-RESTRICT="!test? ( test )"
-
-PATCHES=(
- "${FILESDIR}/php-freetype-2.9.1.patch"
-)
-
-PHP_MV="$(ver_cut 1)"
-
-php_install_ini() {
- local phpsapi="${1}"
-
- # work out where we are installing the ini file
- php_set_ini_dir "${phpsapi}"
-
- # Always install the production INI file, bug 611214.
- local phpinisrc="php.ini-production-${phpsapi}"
- cp php.ini-production "${phpinisrc}" || die
-
- # default to /tmp for save_path, bug #282768
- sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}" || die
-
- # Set the extension dir
- sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" \
- -i "${phpinisrc}" || die
-
- # Set the include path to point to where we want to find PEAR packages
- sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}" || die
-
- insinto "${PHP_INI_DIR#${EPREFIX}}"
- newins "${phpinisrc}" php.ini
-
- elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}"
- elog
-
- dodir "${PHP_EXT_INI_DIR#${EPREFIX}}"
- dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}"
-
- if use opcache; then
- elog "Adding opcache to $PHP_EXT_INI_DIR"
- echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> \
- "${D}/${PHP_EXT_INI_DIR}"/opcache.ini
- dosym "../ext/opcache.ini" \
- "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/opcache.ini"
- fi
-
- # SAPI-specific handling
- if [[ "${sapi}" == "fpm" ]] ; then
- einfo "Installing FPM config files php-fpm.conf and www.conf"
- insinto "${PHP_INI_DIR#${EPREFIX}}"
- doins sapi/fpm/php-fpm.conf
- insinto "${PHP_INI_DIR#${EPREFIX}}/fpm.d"
- doins sapi/fpm/www.conf
- fi
-
- dodoc php.ini-{development,production}
-}
-
-php_set_ini_dir() {
- PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}"
- PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext"
- PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active"
-}
-
-src_prepare() {
- default
-
- # In php-7.x, the FPM pool configuration files have been split off
- # of the main config. By default the pool config files go in
- # e.g. /etc/php-fpm.d, which isn't slotted. So here we move the
- # include directory to a subdirectory "fpm.d" of $PHP_INI_DIR. Later
- # we'll install the pool configuration file "www.conf" there.
- php_set_ini_dir fpm
- sed -i "s~^include=.*$~include=${PHP_INI_DIR}/fpm.d/*.conf~" \
- sapi/fpm/php-fpm.conf.in \
- || die 'failed to move the include directory in php-fpm.conf'
-
- # Bug 669566 - necessary so that build tools are updated for commands like pecl
- # Force rebuilding aclocal.m4
- rm -f aclocal.m4 || die "failed to remove aclocal.m4 in src_prepare"
- eautoreconf
-}
-
-src_configure() {
- addpredict /usr/share/snmp/mibs/.index #nowarn
- addpredict /var/lib/net-snmp/mib_indexes #nowarn
-
- PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}"
-
- # The php-fpm config file wants localstatedir to be ${EPREFIX}/var
- # and not the Gentoo default ${EPREFIX}/var/lib. See bug 572002.
- local our_conf=(
- --prefix="${PHP_DESTDIR}"
- --mandir="${PHP_DESTDIR}/man"
- --infodir="${PHP_DESTDIR}/info"
- --libdir="${PHP_DESTDIR}/lib"
- --with-libdir="$(get_libdir)"
- --localstatedir="${EPREFIX}/var"
- --without-pear
- $(use_enable threads maintainer-zts)
- )
-
- our_conf+=(
- $(use_with argon2 password-argon2 "${EPREFIX}/usr")
- $(use_enable bcmath bcmath)
- $(use_with bzip2 bz2 "${EPREFIX}/usr")
- $(use_enable calendar calendar)
- $(use_enable coverage gcov)
- $(use_enable ctype ctype)
- $(use_with curl curl "${EPREFIX}/usr")
- $(use_enable xml dom)
- $(use_with enchant enchant "${EPREFIX}/usr")
- $(use_enable exif exif)
- $(use_enable fileinfo fileinfo)
- $(use_enable filter filter)
- $(use_enable ftp ftp)
- $(use_with nls gettext "${EPREFIX}/usr")
- $(use_with gmp gmp "${EPREFIX}/usr")
- $(use_enable hash hash)
- $(use_with mhash mhash "${EPREFIX}/usr")
- $(use_with iconv iconv \
- $(use elibc_glibc || use elibc_musl || use elibc_FreeBSD || echo "${EPREFIX}/usr"))
- $(use_enable intl intl)
- $(use_enable ipv6 ipv6)
- $(use_enable json json)
- $(use_with kerberos kerberos "${EPREFIX}/usr")
- $(use_enable xml libxml)
- $(use_with xml libxml-dir "${EPREFIX}/usr")
- $(use_enable unicode mbstring)
- $(use_with unicode onig "${EPREFIX}/usr")
- $(use_with ssl openssl "${EPREFIX}/usr")
- $(use_with ssl openssl-dir "${EPREFIX}/usr")
- $(use_enable pcntl pcntl)
- $(use_enable phar phar)
- $(use_enable pdo pdo)
- $(use_enable opcache opcache)
- $(use_with postgres pgsql "${EPREFIX}/usr")
- $(use_enable posix posix)
- $(use_with spell pspell "${EPREFIX}/usr")
- $(use_with recode recode "${EPREFIX}/usr")
- $(use_enable simplexml simplexml)
- $(use_enable sharedmem shmop)
- $(use_with snmp snmp "${EPREFIX}/usr")
- $(use_enable soap soap)
- $(use_enable sockets sockets)
- $(use_with sodium sodium "${EPREFIX}/usr")
- $(use_with sqlite sqlite3 "${EPREFIX}/usr")
- $(use_enable sysvipc sysvmsg)
- $(use_enable sysvipc sysvsem)
- $(use_enable sysvipc sysvshm)
- $(use_with tidy tidy "${EPREFIX}/usr")
- $(use_enable tokenizer tokenizer)
- $(use_enable wddx wddx)
- $(use_enable xml xml)
- $(use_enable xmlreader xmlreader)
- $(use_enable xmlwriter xmlwriter)
- $(use_with xmlrpc xmlrpc)
- $(use_with xslt xsl "${EPREFIX}/usr")
- $(use_enable zip zip)
- $(use_with zip-encryption libzip "${EPREFIX}/usr")
- $(use_with zlib zlib "${EPREFIX}/usr")
- $(use_enable debug debug)
- )
-
- # DBA support
- if use cdb || use berkdb || use flatfile || use gdbm || use inifile \
- || use qdbm || use lmdb || use tokyocabinet ; then
- our_conf+=( "--enable-dba${shared}" )
- fi
-
- # DBA drivers support
- our_conf+=(
- $(use_with cdb cdb)
- $(use_with berkdb db4 "${EPREFIX}/usr")
- $(use_enable flatfile flatfile)
- $(use_with gdbm gdbm "${EPREFIX}/usr")
- $(use_enable inifile inifile)
- $(use_with qdbm qdbm "${EPREFIX}/usr")
- $(use_with lmdb lmdb "${EPREFIX}/usr")
- )
-
- # Support for the GD graphics library
- our_conf+=(
- $(use_with truetype freetype-dir "${EPREFIX}/usr")
- $(use_enable cjk gd-jis-conv)
- $(use_with gd jpeg-dir "${EPREFIX}/usr")
- $(use_with gd png-dir "${EPREFIX}/usr")
- $(use_with xpm xpm-dir "${EPREFIX}/usr")
- )
- if use webp; then
- our_conf+=( --with-webp-dir="${EPREFIX}/usr" )
- fi
- # enable gd last, so configure can pick up the previous settings
- our_conf+=( $(use_with gd gd) )
-
- # IMAP support
- if use imap ; then
- our_conf+=(
- $(use_with imap imap "${EPREFIX}/usr")
- $(use_with ssl imap-ssl "${EPREFIX}/usr")
- )
- fi
-
- # Interbase/firebird support
- our_conf+=( $(use_with firebird interbase "${EPREFIX}/usr") )
-
- # LDAP support
- if use ldap ; then
- our_conf+=(
- $(use_with ldap ldap "${EPREFIX}/usr")
- $(use_with ldap-sasl ldap-sasl "${EPREFIX}/usr")
- )
- fi
-
- # MySQL support
- local mysqllib="mysqlnd"
- local mysqlilib="mysqlnd"
-
- our_conf+=( $(use_with mysqli mysqli "${mysqlilib}") )
-
- local mysqlsock="${EPREFIX}/var/run/mysqld/mysqld.sock"
- if use mysql || use mysqli ; then
- our_conf+=( $(use_with mysql mysql-sock "${mysqlsock}") )
- fi
-
- # ODBC support
- our_conf+=(
- $(use_with odbc unixODBC "${EPREFIX}/usr")
- $(use_with iodbc iodbc "${EPREFIX}/usr")
- )
-
- # Oracle support
- our_conf+=( $(use_with oci8-instant-client oci8) )
-
- # PDO support
- if use pdo ; then
- our_conf+=(
- $(use_with mssql pdo-dblib "${EPREFIX}/usr")
- $(use_with mysql pdo-mysql "${mysqllib}")
- $(use_with postgres pdo-pgsql)
- $(use_with sqlite pdo-sqlite "${EPREFIX}/usr")
- $(use_with firebird pdo-firebird "${EPREFIX}/usr")
- $(use_with odbc pdo-odbc "unixODBC,${EPREFIX}/usr")
- $(use_with oci8-instant-client pdo-oci)
- )
- fi
-
- # readline/libedit support
- our_conf+=(
- $(use_with readline readline "${EPREFIX}/usr")
- $(use_with libedit libedit "${EPREFIX}/usr")
- )
-
- # Session support
- if use session ; then
- our_conf+=( $(use_with session-mm mm "${EPREFIX}/usr") )
- else
- our_conf+=( $(use_enable session session) )
- fi
-
- # Use pic for shared modules such as apache2's mod_php
- our_conf+=( --with-pic )
-
- # we use the system copy of pcre
- # --with-pcre-regex affects ext/pcre
- # --with-pcre-dir affects ext/filter and ext/zip
- # --with-pcre-valgrind cannot be enabled with system pcre
- # Many arches don't support pcre-jit
- our_conf+=(
- --with-pcre-regex="${EPREFIX}/usr"
- --with-pcre-dir="${EPREFIX}/usr"
- --without-pcre-valgrind
- --without-pcre-jit
- )
-
- # Catch CFLAGS problems
- # Fixes bug #14067.
- # Changed order to run it in reverse for bug #32022 and #12021.
- replace-cpu-flags "k6*" "i586"
-
- # Cache the ./configure test results between SAPIs.
- our_conf+=( --cache-file="${T}/config.cache" )
-
- # Support user-passed configuration parameters
- our_conf+=( ${EXTRA_ECONF:-} )
-
- # Support the Apache2 extras, they must be set globally for all
- # SAPIs to work correctly, especially for external PHP extensions
-
- local one_sapi
- local sapi
- mkdir -p "${WORKDIR}/sapis-build" || die
- for one_sapi in $SAPIS ; do
- use "${one_sapi}" || continue
- php_set_ini_dir "${one_sapi}"
-
- # The BUILD_DIR variable is used to determine where to output
- # the files that autotools creates. This was all originally
- # based on the autotools-utils eclass.
- BUILD_DIR="${WORKDIR}/sapis-build/${one_sapi}"
- cp -a "${S}" "${BUILD_DIR}" || die
- cd "${BUILD_DIR}" || die
-
- local sapi_conf=(
- --with-config-file-path="${PHP_INI_DIR}"
- --with-config-file-scan-dir="${PHP_EXT_INI_DIR_ACTIVE}"
- )
-
- for sapi in $SAPIS ; do
- case "$sapi" in
- cli|cgi|embed|fpm|phpdbg)
- if [[ "${one_sapi}" == "${sapi}" ]] ; then
- sapi_conf+=( "--enable-${sapi}" )
- if [[ "fpm" == "${sapi}" ]] ; then
- sapi_conf+=(
- $(use_with acl fpm-acl)
- $(use_with systemd fpm-systemd)
- )
- fi
- else
- sapi_conf+=( "--disable-${sapi}" )
- fi
- ;;
-
- apache2)
- if [[ "${one_sapi}" == "${sapi}" ]] ; then
- sapi_conf+=( --with-apxs2="${EPREFIX}/usr/bin/apxs" )
- else
- sapi_conf+=( --without-apxs2 )
- fi
- ;;
- esac
- done
-
- # Construct the $myeconfargs array by concatenating $our_conf
- # (the common args) and $sapi_conf (the SAPI-specific args).
- local myeconfargs=( "${our_conf[@]}" )
- myeconfargs+=( "${sapi_conf[@]}" )
-
- pushd "${BUILD_DIR}" > /dev/null || die
- econf "${myeconfargs[@]}"
- popd > /dev/null || die
- done
-}
-
-src_compile() {
- # snmp seems to run during src_compile, too (bug #324739)
- addpredict /usr/share/snmp/mibs/.index #nowarn
- addpredict /var/lib/net-snmp/mib_indexes #nowarn
-
- local sapi
- for sapi in ${SAPIS} ; do
- if use "${sapi}"; then
- cd "${WORKDIR}/sapis-build/$sapi" || \
- die "Failed to change dir to ${WORKDIR}/sapis-build/$1"
- emake
- fi
- done
-}
-
-src_install() {
- # see bug #324739 for what happens when we don't have that
- addpredict /usr/share/snmp/mibs/.index #nowarn
-
- # grab the first SAPI that got built and install common files from there
- local first_sapi="", sapi=""
- for sapi in $SAPIS ; do
- if use $sapi ; then
- first_sapi=$sapi
- break
- fi
- done
-
- # Makefile forgets to create this before trying to write to it...
- dodir "${PHP_DESTDIR#${EPREFIX}}/bin"
-
- # Install php environment (without any sapis)
- cd "${WORKDIR}/sapis-build/$first_sapi" || die
- emake INSTALL_ROOT="${D}" \
- install-build install-headers install-programs
-
- local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)"
-
- # Create the directory where we'll put version-specific php scripts
- keepdir "/usr/share/php${PHP_MV}"
-
- local file=""
- local sapi_list=""
-
- for sapi in ${SAPIS}; do
- if use "${sapi}" ; then
- einfo "Installing SAPI: ${sapi}"
- cd "${WORKDIR}/sapis-build/${sapi}" || die
-
- if [[ "${sapi}" == "apache2" ]] ; then
- # We're specifically not using emake install-sapi as libtool
- # may cause unnecessary relink failures (see bug #351266)
- insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/"
- newins ".libs/libphp${PHP_MV}$(get_libname)" \
- "libphp${PHP_MV}$(get_libname)"
- keepdir "/usr/$(get_libdir)/apache2/modules"
- else
- # needed each time, php_install_ini would reset it
- local dest="${PHP_DESTDIR#${EPREFIX}}"
- into "${dest}"
- case "$sapi" in
- cli)
- source="sapi/cli/php"
- # Install the "phar" archive utility.
- if use phar ; then
- emake INSTALL_ROOT="${D}" install-pharcmd
- dosym "..${dest#/usr}/bin/phar" "/usr/bin/phar${SLOT}"
- fi
- ;;
- cgi)
- source="sapi/cgi/php-cgi"
- ;;
- fpm)
- source="sapi/fpm/php-fpm"
- ;;
- embed)
- source="libs/libphp${PHP_MV}$(get_libname)"
- ;;
- phpdbg)
- source="sapi/phpdbg/phpdbg"
- ;;
- *)
- die "unhandled sapi in src_install"
- ;;
- esac
-
- if [[ "${source}" == *"$(get_libname)" ]]; then
- dolib.so "${source}"
- else
- dobin "${source}"
- local name="$(basename ${source})"
- dosym "..${dest#/usr}/bin/${name}" "/usr/bin/${name}${SLOT}"
- fi
- fi
-
- php_install_ini "${sapi}"
-
- # construct correct SAPI string for php-config
- # thanks to ferringb for the bash voodoo
- if [[ "${sapi}" == "apache2" ]]; then
- sapi_list="${sapi_list:+${sapi_list} }apache2handler"
- else
- sapi_list="${sapi_list:+${sapi_list} }${sapi}"
- fi
- fi
- done
-
- # Installing opcache module
- if use opcache ; then
- into "${PHP_DESTDIR#${EPREFIX}}"
- dolib.so "modules/opcache$(get_libname)"
- fi
-
- # Install env.d files
- newenvd "${FILESDIR}/20php5-envd" "20php${SLOT}"
- sed -e "s|/lib/|/$(get_libdir)/|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
- sed -e "s|php5|php${SLOT}|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
-
- # set php-config variable correctly (bug #278439)
- sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \
- "${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config" || die
-
- if use fpm ; then
- if use systemd; then
- systemd_newunit "${FILESDIR}/php-fpm_at.service" \
- "php-fpm@${SLOT}.service"
- else
- systemd_newunit "${FILESDIR}/php-fpm_at-simple.service" \
- "php-fpm@${SLOT}.service"
- fi
- fi
-}
-
-src_test() {
- echo ">>> Test phase [test]: ${CATEGORY}/${PF}"
- PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php"
- if [[ ! -x "${PHP_BIN}" ]] ; then
- ewarn "Test phase requires USE=cli, skipping"
- return
- else
- export TEST_PHP_EXECUTABLE="${PHP_BIN}"
- fi
-
- if [[ -x "${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi" ]] ; then
- export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi"
- fi
-
- if [[ -x "${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg" ]] ; then
- export TEST_PHPDBG_EXECUTABLE="${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg"
- fi
-
- REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n -d \
- "session.save_path=${T}" \
- "${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d \
- "session.save_path=${T}"
-
- for name in ${EXPECTED_TEST_FAILURES}; do
- mv "${name}.out" "${name}.out.orig" 2>/dev/null || die
- done
-
- local failed="$(find -name '*.out')"
- if [[ ${failed} != "" ]] ; then
- ewarn "The following test cases failed unexpectedly:"
- for name in ${failed}; do
- ewarn " ${name/.out/}"
- done
- else
- einfo "No unexpected test failures, all fine"
- fi
-
- if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then
- local passed=""
- for name in ${EXPECTED_TEST_FAILURES}; do
- [[ -f "${name}.diff" ]] && continue
- passed="${passed} ${name}"
- done
- if [[ ${passed} != "" ]] ; then
- einfo "The following test cases passed unexpectedly:"
- for name in ${passed}; do
- ewarn " ${passed}"
- done
- else
- einfo "None of the known-to-fail tests passed, all fine"
- fi
- fi
-}
-
-pkg_postinst() {
- # Output some general info to the user
- if use apache2 ; then
- elog
- elog "To enable PHP in apache, you will need to add \"-D PHP\" to"
- elog "your apache2 command. OpenRC users can append that string to"
- elog "APACHE2_OPTS in /etc/conf.d/apache2."
- elog
- elog "The apache module configuration file 70_mod_php.conf is"
- elog "provided (and maintained) by eselect-php."
- elog
- fi
-
- # Create the symlinks for php
- local m
- for m in ${SAPIS}; do
- [[ ${m} == 'embed' ]] && continue;
- if use $m ; then
- local ci=$(eselect php show $m)
- if [[ -z $ci ]]; then
- eselect php set $m php${SLOT} || die
- einfo "Switched ${m} to use php:${SLOT}"
- einfo
- elif [[ $ci != "php${SLOT}" ]] ; then
- elog "To switch $m to use php:${SLOT}, run"
- elog " eselect php set $m php${SLOT}"
- elog
- fi
- fi
- done
-
- # Remove dead symlinks for SAPIs that were just disabled. For
- # example, if the user has the cgi SAPI enabled, then he has an
- # eselect-php symlink for it. If he later reinstalls PHP with
- # USE="-cgi", that symlink will break. This call to eselect is
- # supposed to remove that dead link per bug 572436.
- eselect php cleanup || die
-
- if ! has "php${SLOT/./-}" ${PHP_TARGETS}; then
- elog "To build extensions for this version of PHP, you will need to"
- elog "add php${SLOT/./-} to your PHP_TARGETS USE_EXPAND variable."
- elog
- fi
-
- # Warn about the removal of PHP_INI_VERSION if the user has it set.
- if [[ -n "${PHP_INI_VERSION}" ]]; then
- ewarn 'The PHP_INI_VERSION variable has been phased out. You may'
- ewarn 'remove it from your configuration at your convenience. See'
- ewarn
- ewarn ' https://bugs.gentoo.org/611214'
- ewarn
- ewarn 'for more information.'
- fi
-
- elog "For details on how version slotting works, please see"
- elog "the wiki:"
- elog
- elog " https://wiki.gentoo.org/wiki/PHP"
- elog
-}
-
-pkg_postrm() {
- # This serves two purposes. First, if we have just removed the last
- # installed version of PHP, then this will remove any dead symlinks
- # belonging to eselect-php. Second, if a user upgrades slots from
- # (say) 5.6 to 7.0 and depcleans the old slot, then this will update
- # his existing symlinks to point to the new 7.0 installation. The
- # latter is bug 432962.
- #
- # Note: the eselect-php package may not be installed at this point,
- # so we can't die() if this command fails.
- eselect php cleanup
-}
diff --git a/dev-lang/php/php-7.3.23.ebuild b/dev-lang/php/php-7.3.23.ebuild
deleted file mode 100644
index 9c97e02a635a..000000000000
--- a/dev-lang/php/php-7.3.23.ebuild
+++ /dev/null
@@ -1,760 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit flag-o-matic systemd autotools
-
-MY_PV=${PV/_rc/RC}
-DESCRIPTION="The PHP language runtime engine"
-HOMEPAGE="https://www.php.net/"
-SRC_URI="https://www.php.net/distributions/${P}.tar.xz"
-
-LICENSE="PHP-3.01
- BSD
- Zend-2.0
- bcmath? ( LGPL-2.1+ )
- fpm? ( BSD-2 )
- gd? ( gd )
- unicode? ( BSD-2 LGPL-2.1 )"
-
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-# We can build the following SAPIs in the given order
-SAPIS="embed cli cgi fpm apache2 phpdbg"
-
-# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
-IUSE="${IUSE}
- ${SAPIS/cli/+cli}
- threads"
-
-IUSE="${IUSE} acl argon2 bcmath berkdb bzip2 calendar cdb cjk
- coverage +ctype curl debug
- enchant exif +fileinfo +filter firebird
- +flatfile ftp gd gdbm gmp +hash +iconv imap inifile
- intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit libressl lmdb
- mhash mssql mysql mysqli nls
- oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm
- readline recode selinux +session session-mm sharedmem
- +simplexml snmp soap sockets sodium spell sqlite ssl
- sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode wddx webp
- +xml xmlreader xmlwriter xmlrpc xpm xslt zip zip-encryption zlib"
-
-# The supported (that is, autodetected) versions of BDB are listed in
-# the ./configure script. Other versions *work*, but we need to stick to
-# the ones that can be detected to avoid a repeat of bug #564824.
-COMMON_DEPEND="
- >=app-eselect/eselect-php-0.9.1[apache2?,fpm?]
- >=dev-libs/libpcre2-10.30[unicode]
- fpm? ( acl? ( sys-apps/acl ) )
- apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] )
- argon2? ( app-crypt/argon2:= )
- berkdb? ( || ( sys-libs/db:5.3
- sys-libs/db:5.1
- sys-libs/db:4.8
- sys-libs/db:4.7
- sys-libs/db:4.6
- sys-libs/db:4.5 ) )
- bzip2? ( app-arch/bzip2:0= )
- cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
- coverage? ( dev-util/lcov )
- curl? ( >=net-misc/curl-7.10.5 )
- enchant? ( =virtual/jpeg-0-r3:0 media-libs/libpng:0= >=sys-libs/zlib-1.2.0.4 )
- gdbm? ( >=sys-libs/gdbm-1.8.0:0= )
- gmp? ( dev-libs/gmp:0= )
- iconv? ( virtual/libiconv )
- imap? ( >=virtual/imap-c-client-2[kerberos=,ssl=] )
- intl? ( dev-libs/icu:= )
- iodbc? ( dev-db/libiodbc )
- kerberos? ( virtual/krb5 )
- ldap? ( >=net-nds/openldap-1.2.11 )
- ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 )
- libedit? ( dev-libs/libedit )
- lmdb? ( dev-db/lmdb:= )
- mssql? ( dev-db/freetds[mssql] )
- nls? ( sys-devel/gettext )
- oci8-instant-client? ( dev-db/oracle-instantclient-basic )
- odbc? ( >=dev-db/unixODBC-1.8.13 )
- postgres? ( dev-db/postgresql:* )
- qdbm? ( dev-db/qdbm )
- readline? ( sys-libs/readline:0= )
- recode? ( app-text/recode )
- session-mm? ( dev-libs/mm )
- simplexml? ( >=dev-libs/libxml2-2.6.8 )
- snmp? ( >=net-analyzer/net-snmp-5.2 )
- soap? ( >=dev-libs/libxml2-2.6.8 )
- sodium? ( dev-libs/libsodium:= )
- spell? ( >=app-text/aspell-0.50 )
- sqlite? ( >=dev-db/sqlite-3.7.6.3 )
- ssl? (
- !libressl? ( >=dev-libs/openssl-1.0.1:0= )
- libressl? ( dev-libs/libressl:0= )
- )
- tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) )
- tokyocabinet? ( dev-db/tokyocabinet )
- truetype? ( =media-libs/freetype-2* )
- unicode? ( dev-libs/oniguruma:= )
- wddx? ( >=dev-libs/libxml2-2.6.8 )
- webp? ( media-libs/libwebp:0= )
- xml? ( >=dev-libs/libxml2-2.6.8 )
- xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv )
- xmlreader? ( >=dev-libs/libxml2-2.6.8 )
- xmlwriter? ( >=dev-libs/libxml2-2.6.8 )
- xpm? ( x11-libs/libXpm )
- xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 )
- zip? ( >=sys-libs/zlib-1.2.0.4:0= )
- zip-encryption? ( >=dev-libs/libzip-1.2.0:= )
- zlib? ( >=sys-libs/zlib-1.2.0.4:0= )
-"
-
-RDEPEND="${COMMON_DEPEND}
- virtual/mta
- fpm? (
- selinux? ( sec-policy/selinux-phpfpm )
- systemd? ( sys-apps/systemd ) )"
-
-# Bison isn't actually needed when building from a release tarball
-# However, the configure script will warn if it's absent or if you
-# have an incompatible version installed. See bug 593278.
-DEPEND="${COMMON_DEPEND}
- app-arch/xz-utils
- >=sys-devel/bison-3.0.1"
-
-BDEPEND="virtual/pkgconfig"
-
-# Without USE=readline or libedit, the interactive "php -a" CLI will hang.
-REQUIRED_USE="
- || ( cli cgi fpm apache2 embed phpdbg )
- cli? ( ^^ ( readline libedit ) )
- truetype? ( gd zlib )
- webp? ( gd zlib )
- cjk? ( gd zlib )
- exif? ( gd zlib )
- xpm? ( gd zlib )
- gd? ( zlib )
- simplexml? ( xml )
- soap? ( xml )
- wddx? ( xml )
- xmlrpc? ( || ( xml iconv ) )
- xmlreader? ( xml )
- xslt? ( xml )
- ldap-sasl? ( ldap )
- mhash? ( hash )
- phar? ( hash )
- qdbm? ( !gdbm )
- readline? ( !libedit )
- recode? ( !imap !mysqli !mysql )
- session-mm? ( session !threads )
- mysql? ( || ( mysqli pdo ) )
- zip-encryption? ( zip )
-"
-
-RESTRICT="!test? ( test )"
-
-PATCHES=(
- "${FILESDIR}/php-freetype-2.9.1.patch"
-)
-
-PHP_MV="$(ver_cut 1)"
-
-php_install_ini() {
- local phpsapi="${1}"
-
- # work out where we are installing the ini file
- php_set_ini_dir "${phpsapi}"
-
- # Always install the production INI file, bug 611214.
- local phpinisrc="php.ini-production-${phpsapi}"
- cp php.ini-production "${phpinisrc}" || die
-
- # default to /tmp for save_path, bug #282768
- sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}" || die
-
- # Set the extension dir
- sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" \
- -i "${phpinisrc}" || die
-
- # Set the include path to point to where we want to find PEAR packages
- sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}" || die
-
- insinto "${PHP_INI_DIR#${EPREFIX}}"
- newins "${phpinisrc}" php.ini
-
- elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}"
- elog
-
- dodir "${PHP_EXT_INI_DIR#${EPREFIX}}"
- dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}"
-
- if use opcache; then
- elog "Adding opcache to $PHP_EXT_INI_DIR"
- echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> \
- "${D}/${PHP_EXT_INI_DIR}"/opcache.ini
- dosym "../ext/opcache.ini" \
- "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/opcache.ini"
- fi
-
- # SAPI-specific handling
- if [[ "${sapi}" == "fpm" ]] ; then
- einfo "Installing FPM config files php-fpm.conf and www.conf"
- insinto "${PHP_INI_DIR#${EPREFIX}}"
- doins sapi/fpm/php-fpm.conf
- insinto "${PHP_INI_DIR#${EPREFIX}}/fpm.d"
- doins sapi/fpm/www.conf
- fi
-
- dodoc php.ini-{development,production}
-}
-
-php_set_ini_dir() {
- PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}"
- PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext"
- PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active"
-}
-
-src_prepare() {
- default
-
- # In php-7.x, the FPM pool configuration files have been split off
- # of the main config. By default the pool config files go in
- # e.g. /etc/php-fpm.d, which isn't slotted. So here we move the
- # include directory to a subdirectory "fpm.d" of $PHP_INI_DIR. Later
- # we'll install the pool configuration file "www.conf" there.
- php_set_ini_dir fpm
- sed -i "s~^include=.*$~include=${PHP_INI_DIR}/fpm.d/*.conf~" \
- sapi/fpm/php-fpm.conf.in \
- || die 'failed to move the include directory in php-fpm.conf'
-
- # Bug 669566 - necessary so that build tools are updated for commands like pecl
- # Force rebuilding aclocal.m4
- rm -f aclocal.m4 || die "failed to remove aclocal.m4 in src_prepare"
- eautoreconf
-}
-
-src_configure() {
- addpredict /usr/share/snmp/mibs/.index #nowarn
- addpredict /var/lib/net-snmp/mib_indexes #nowarn
-
- PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}"
-
- # The php-fpm config file wants localstatedir to be ${EPREFIX}/var
- # and not the Gentoo default ${EPREFIX}/var/lib. See bug 572002.
- local our_conf=(
- --prefix="${PHP_DESTDIR}"
- --mandir="${PHP_DESTDIR}/man"
- --infodir="${PHP_DESTDIR}/info"
- --libdir="${PHP_DESTDIR}/lib"
- --with-libdir="$(get_libdir)"
- --localstatedir="${EPREFIX}/var"
- --without-pear
- $(use_enable threads maintainer-zts)
- )
-
- our_conf+=(
- $(use_with argon2 password-argon2 "${EPREFIX}/usr")
- $(use_enable bcmath bcmath)
- $(use_with bzip2 bz2 "${EPREFIX}/usr")
- $(use_enable calendar calendar)
- $(use_enable coverage gcov)
- $(use_enable ctype ctype)
- $(use_with curl curl "${EPREFIX}/usr")
- $(use_enable xml dom)
- $(use_with enchant enchant "${EPREFIX}/usr")
- $(use_enable exif exif)
- $(use_enable fileinfo fileinfo)
- $(use_enable filter filter)
- $(use_enable ftp ftp)
- $(use_with nls gettext "${EPREFIX}/usr")
- $(use_with gmp gmp "${EPREFIX}/usr")
- $(use_enable hash hash)
- $(use_with mhash mhash "${EPREFIX}/usr")
- $(use_with iconv iconv \
- $(use elibc_glibc || use elibc_musl || use elibc_FreeBSD || echo "${EPREFIX}/usr"))
- $(use_enable intl intl)
- $(use_enable ipv6 ipv6)
- $(use_enable json json)
- $(use_with kerberos kerberos "${EPREFIX}/usr")
- $(use_enable xml libxml)
- $(use_with xml libxml-dir "${EPREFIX}/usr")
- $(use_enable unicode mbstring)
- $(use_with unicode onig "${EPREFIX}/usr")
- $(use_with ssl openssl "${EPREFIX}/usr")
- $(use_with ssl openssl-dir "${EPREFIX}/usr")
- $(use_enable pcntl pcntl)
- $(use_enable phar phar)
- $(use_enable pdo pdo)
- $(use_enable opcache opcache)
- $(use_with postgres pgsql "${EPREFIX}/usr")
- $(use_enable posix posix)
- $(use_with spell pspell "${EPREFIX}/usr")
- $(use_with recode recode "${EPREFIX}/usr")
- $(use_enable simplexml simplexml)
- $(use_enable sharedmem shmop)
- $(use_with snmp snmp "${EPREFIX}/usr")
- $(use_enable soap soap)
- $(use_enable sockets sockets)
- $(use_with sodium sodium "${EPREFIX}/usr")
- $(use_with sqlite sqlite3 "${EPREFIX}/usr")
- $(use_enable sysvipc sysvmsg)
- $(use_enable sysvipc sysvsem)
- $(use_enable sysvipc sysvshm)
- $(use_with tidy tidy "${EPREFIX}/usr")
- $(use_enable tokenizer tokenizer)
- $(use_enable wddx wddx)
- $(use_enable xml xml)
- $(use_enable xmlreader xmlreader)
- $(use_enable xmlwriter xmlwriter)
- $(use_with xmlrpc xmlrpc)
- $(use_with xslt xsl "${EPREFIX}/usr")
- $(use_enable zip zip)
- $(use_with zip-encryption libzip "${EPREFIX}/usr")
- $(use_with zlib zlib "${EPREFIX}/usr")
- $(use_enable debug debug)
- )
-
- # DBA support
- if use cdb || use berkdb || use flatfile || use gdbm || use inifile \
- || use qdbm || use lmdb || use tokyocabinet ; then
- our_conf+=( "--enable-dba${shared}" )
- fi
-
- # DBA drivers support
- our_conf+=(
- $(use_with cdb cdb)
- $(use_with berkdb db4 "${EPREFIX}/usr")
- $(use_enable flatfile flatfile)
- $(use_with gdbm gdbm "${EPREFIX}/usr")
- $(use_enable inifile inifile)
- $(use_with qdbm qdbm "${EPREFIX}/usr")
- $(use_with lmdb lmdb "${EPREFIX}/usr")
- )
-
- # Support for the GD graphics library
- our_conf+=(
- $(use_with truetype freetype-dir "${EPREFIX}/usr")
- $(use_enable cjk gd-jis-conv)
- $(use_with gd jpeg-dir "${EPREFIX}/usr")
- $(use_with gd png-dir "${EPREFIX}/usr")
- $(use_with xpm xpm-dir "${EPREFIX}/usr")
- )
- if use webp; then
- our_conf+=( --with-webp-dir="${EPREFIX}/usr" )
- fi
- # enable gd last, so configure can pick up the previous settings
- our_conf+=( $(use_with gd gd) )
-
- # IMAP support
- if use imap ; then
- our_conf+=(
- $(use_with imap imap "${EPREFIX}/usr")
- $(use_with ssl imap-ssl "${EPREFIX}/usr")
- )
- fi
-
- # Interbase/firebird support
- our_conf+=( $(use_with firebird interbase "${EPREFIX}/usr") )
-
- # LDAP support
- if use ldap ; then
- our_conf+=(
- $(use_with ldap ldap "${EPREFIX}/usr")
- $(use_with ldap-sasl ldap-sasl "${EPREFIX}/usr")
- )
- fi
-
- # MySQL support
- local mysqllib="mysqlnd"
- local mysqlilib="mysqlnd"
-
- our_conf+=( $(use_with mysqli mysqli "${mysqlilib}") )
-
- local mysqlsock="${EPREFIX}/var/run/mysqld/mysqld.sock"
- if use mysql || use mysqli ; then
- our_conf+=( $(use_with mysql mysql-sock "${mysqlsock}") )
- fi
-
- # ODBC support
- our_conf+=(
- $(use_with odbc unixODBC "${EPREFIX}/usr")
- $(use_with iodbc iodbc "${EPREFIX}/usr")
- )
-
- # Oracle support
- our_conf+=( $(use_with oci8-instant-client oci8) )
-
- # PDO support
- if use pdo ; then
- our_conf+=(
- $(use_with mssql pdo-dblib "${EPREFIX}/usr")
- $(use_with mysql pdo-mysql "${mysqllib}")
- $(use_with postgres pdo-pgsql)
- $(use_with sqlite pdo-sqlite "${EPREFIX}/usr")
- $(use_with firebird pdo-firebird "${EPREFIX}/usr")
- $(use_with odbc pdo-odbc "unixODBC,${EPREFIX}/usr")
- $(use_with oci8-instant-client pdo-oci)
- )
- fi
-
- # readline/libedit support
- our_conf+=(
- $(use_with readline readline "${EPREFIX}/usr")
- $(use_with libedit libedit "${EPREFIX}/usr")
- )
-
- # Session support
- if use session ; then
- our_conf+=( $(use_with session-mm mm "${EPREFIX}/usr") )
- else
- our_conf+=( $(use_enable session session) )
- fi
-
- # Use pic for shared modules such as apache2's mod_php
- our_conf+=( --with-pic )
-
- # we use the system copy of pcre
- # --with-pcre-regex affects ext/pcre
- # --with-pcre-dir affects ext/filter and ext/zip
- # --with-pcre-valgrind cannot be enabled with system pcre
- # Many arches don't support pcre-jit
- our_conf+=(
- --with-pcre-regex="${EPREFIX}/usr"
- --with-pcre-dir="${EPREFIX}/usr"
- --without-pcre-valgrind
- --without-pcre-jit
- )
-
- # Catch CFLAGS problems
- # Fixes bug #14067.
- # Changed order to run it in reverse for bug #32022 and #12021.
- replace-cpu-flags "k6*" "i586"
-
- # Cache the ./configure test results between SAPIs.
- our_conf+=( --cache-file="${T}/config.cache" )
-
- # Support user-passed configuration parameters
- our_conf+=( ${EXTRA_ECONF:-} )
-
- # Support the Apache2 extras, they must be set globally for all
- # SAPIs to work correctly, especially for external PHP extensions
-
- local one_sapi
- local sapi
- mkdir -p "${WORKDIR}/sapis-build" || die
- for one_sapi in $SAPIS ; do
- use "${one_sapi}" || continue
- php_set_ini_dir "${one_sapi}"
-
- # The BUILD_DIR variable is used to determine where to output
- # the files that autotools creates. This was all originally
- # based on the autotools-utils eclass.
- BUILD_DIR="${WORKDIR}/sapis-build/${one_sapi}"
- cp -a "${S}" "${BUILD_DIR}" || die
- cd "${BUILD_DIR}" || die
-
- local sapi_conf=(
- --with-config-file-path="${PHP_INI_DIR}"
- --with-config-file-scan-dir="${PHP_EXT_INI_DIR_ACTIVE}"
- )
-
- for sapi in $SAPIS ; do
- case "$sapi" in
- cli|cgi|embed|fpm|phpdbg)
- if [[ "${one_sapi}" == "${sapi}" ]] ; then
- sapi_conf+=( "--enable-${sapi}" )
- if [[ "fpm" == "${sapi}" ]] ; then
- sapi_conf+=(
- $(use_with acl fpm-acl)
- $(use_with systemd fpm-systemd)
- )
- fi
- else
- sapi_conf+=( "--disable-${sapi}" )
- fi
- ;;
-
- apache2)
- if [[ "${one_sapi}" == "${sapi}" ]] ; then
- sapi_conf+=( --with-apxs2="${EPREFIX}/usr/bin/apxs" )
- else
- sapi_conf+=( --without-apxs2 )
- fi
- ;;
- esac
- done
-
- # Construct the $myeconfargs array by concatenating $our_conf
- # (the common args) and $sapi_conf (the SAPI-specific args).
- local myeconfargs=( "${our_conf[@]}" )
- myeconfargs+=( "${sapi_conf[@]}" )
-
- pushd "${BUILD_DIR}" > /dev/null || die
- econf "${myeconfargs[@]}"
- popd > /dev/null || die
- done
-}
-
-src_compile() {
- # snmp seems to run during src_compile, too (bug #324739)
- addpredict /usr/share/snmp/mibs/.index #nowarn
- addpredict /var/lib/net-snmp/mib_indexes #nowarn
-
- local sapi
- for sapi in ${SAPIS} ; do
- if use "${sapi}"; then
- cd "${WORKDIR}/sapis-build/$sapi" || \
- die "Failed to change dir to ${WORKDIR}/sapis-build/$1"
- emake
- fi
- done
-}
-
-src_install() {
- # see bug #324739 for what happens when we don't have that
- addpredict /usr/share/snmp/mibs/.index #nowarn
-
- # grab the first SAPI that got built and install common files from there
- local first_sapi="", sapi=""
- for sapi in $SAPIS ; do
- if use $sapi ; then
- first_sapi=$sapi
- break
- fi
- done
-
- # Makefile forgets to create this before trying to write to it...
- dodir "${PHP_DESTDIR#${EPREFIX}}/bin"
-
- # Install php environment (without any sapis)
- cd "${WORKDIR}/sapis-build/$first_sapi" || die
- emake INSTALL_ROOT="${D}" \
- install-build install-headers install-programs
-
- local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)"
-
- # Create the directory where we'll put version-specific php scripts
- keepdir "/usr/share/php${PHP_MV}"
-
- local file=""
- local sapi_list=""
-
- for sapi in ${SAPIS}; do
- if use "${sapi}" ; then
- einfo "Installing SAPI: ${sapi}"
- cd "${WORKDIR}/sapis-build/${sapi}" || die
-
- if [[ "${sapi}" == "apache2" ]] ; then
- # We're specifically not using emake install-sapi as libtool
- # may cause unnecessary relink failures (see bug #351266)
- insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/"
- newins ".libs/libphp${PHP_MV}$(get_libname)" \
- "libphp${PHP_MV}$(get_libname)"
- keepdir "/usr/$(get_libdir)/apache2/modules"
- else
- # needed each time, php_install_ini would reset it
- local dest="${PHP_DESTDIR#${EPREFIX}}"
- into "${dest}"
- case "$sapi" in
- cli)
- source="sapi/cli/php"
- # Install the "phar" archive utility.
- if use phar ; then
- emake INSTALL_ROOT="${D}" install-pharcmd
- dosym "..${dest#/usr}/bin/phar" "/usr/bin/phar${SLOT}"
- fi
- ;;
- cgi)
- source="sapi/cgi/php-cgi"
- ;;
- fpm)
- source="sapi/fpm/php-fpm"
- ;;
- embed)
- source="libs/libphp${PHP_MV}$(get_libname)"
- ;;
- phpdbg)
- source="sapi/phpdbg/phpdbg"
- ;;
- *)
- die "unhandled sapi in src_install"
- ;;
- esac
-
- if [[ "${source}" == *"$(get_libname)" ]]; then
- dolib.so "${source}"
- else
- dobin "${source}"
- local name="$(basename ${source})"
- dosym "..${dest#/usr}/bin/${name}" "/usr/bin/${name}${SLOT}"
- fi
- fi
-
- php_install_ini "${sapi}"
-
- # construct correct SAPI string for php-config
- # thanks to ferringb for the bash voodoo
- if [[ "${sapi}" == "apache2" ]]; then
- sapi_list="${sapi_list:+${sapi_list} }apache2handler"
- else
- sapi_list="${sapi_list:+${sapi_list} }${sapi}"
- fi
- fi
- done
-
- # Installing opcache module
- if use opcache ; then
- into "${PHP_DESTDIR#${EPREFIX}}"
- dolib.so "modules/opcache$(get_libname)"
- fi
-
- # Install env.d files
- newenvd "${FILESDIR}/20php5-envd" "20php${SLOT}"
- sed -e "s|/lib/|/$(get_libdir)/|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
- sed -e "s|php5|php${SLOT}|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
-
- # set php-config variable correctly (bug #278439)
- sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \
- "${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config" || die
-
- if use fpm ; then
- if use systemd; then
- systemd_newunit "${FILESDIR}/php-fpm_at.service" \
- "php-fpm@${SLOT}.service"
- else
- systemd_newunit "${FILESDIR}/php-fpm_at-simple.service" \
- "php-fpm@${SLOT}.service"
- fi
- fi
-}
-
-src_test() {
- echo ">>> Test phase [test]: ${CATEGORY}/${PF}"
- PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php"
- if [[ ! -x "${PHP_BIN}" ]] ; then
- ewarn "Test phase requires USE=cli, skipping"
- return
- else
- export TEST_PHP_EXECUTABLE="${PHP_BIN}"
- fi
-
- if [[ -x "${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi" ]] ; then
- export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi"
- fi
-
- if [[ -x "${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg" ]] ; then
- export TEST_PHPDBG_EXECUTABLE="${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg"
- fi
-
- REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n -d \
- "session.save_path=${T}" \
- "${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d \
- "session.save_path=${T}"
-
- for name in ${EXPECTED_TEST_FAILURES}; do
- mv "${name}.out" "${name}.out.orig" 2>/dev/null || die
- done
-
- local failed="$(find -name '*.out')"
- if [[ ${failed} != "" ]] ; then
- ewarn "The following test cases failed unexpectedly:"
- for name in ${failed}; do
- ewarn " ${name/.out/}"
- done
- else
- einfo "No unexpected test failures, all fine"
- fi
-
- if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then
- local passed=""
- for name in ${EXPECTED_TEST_FAILURES}; do
- [[ -f "${name}.diff" ]] && continue
- passed="${passed} ${name}"
- done
- if [[ ${passed} != "" ]] ; then
- einfo "The following test cases passed unexpectedly:"
- for name in ${passed}; do
- ewarn " ${passed}"
- done
- else
- einfo "None of the known-to-fail tests passed, all fine"
- fi
- fi
-}
-
-pkg_postinst() {
- # Output some general info to the user
- if use apache2 ; then
- elog
- elog "To enable PHP in apache, you will need to add \"-D PHP\" to"
- elog "your apache2 command. OpenRC users can append that string to"
- elog "APACHE2_OPTS in /etc/conf.d/apache2."
- elog
- elog "The apache module configuration file 70_mod_php.conf is"
- elog "provided (and maintained) by eselect-php."
- elog
- fi
-
- # Create the symlinks for php
- local m
- for m in ${SAPIS}; do
- [[ ${m} == 'embed' ]] && continue;
- if use $m ; then
- local ci=$(eselect php show $m)
- if [[ -z $ci ]]; then
- eselect php set $m php${SLOT} || die
- einfo "Switched ${m} to use php:${SLOT}"
- einfo
- elif [[ $ci != "php${SLOT}" ]] ; then
- elog "To switch $m to use php:${SLOT}, run"
- elog " eselect php set $m php${SLOT}"
- elog
- fi
- fi
- done
-
- # Remove dead symlinks for SAPIs that were just disabled. For
- # example, if the user has the cgi SAPI enabled, then he has an
- # eselect-php symlink for it. If he later reinstalls PHP with
- # USE="-cgi", that symlink will break. This call to eselect is
- # supposed to remove that dead link per bug 572436.
- eselect php cleanup || die
-
- if ! has "php${SLOT/./-}" ${PHP_TARGETS}; then
- elog "To build extensions for this version of PHP, you will need to"
- elog "add php${SLOT/./-} to your PHP_TARGETS USE_EXPAND variable."
- elog
- fi
-
- # Warn about the removal of PHP_INI_VERSION if the user has it set.
- if [[ -n "${PHP_INI_VERSION}" ]]; then
- ewarn 'The PHP_INI_VERSION variable has been phased out. You may'
- ewarn 'remove it from your configuration at your convenience. See'
- ewarn
- ewarn ' https://bugs.gentoo.org/611214'
- ewarn
- ewarn 'for more information.'
- fi
-
- elog "For details on how version slotting works, please see"
- elog "the wiki:"
- elog
- elog " https://wiki.gentoo.org/wiki/PHP"
- elog
-}
-
-pkg_postrm() {
- # This serves two purposes. First, if we have just removed the last
- # installed version of PHP, then this will remove any dead symlinks
- # belonging to eselect-php. Second, if a user upgrades slots from
- # (say) 5.6 to 7.0 and depcleans the old slot, then this will update
- # his existing symlinks to point to the new 7.0 installation. The
- # latter is bug 432962.
- #
- # Note: the eselect-php package may not be installed at this point,
- # so we can't die() if this command fails.
- eselect php cleanup
-}
diff --git a/dev-lang/php/php-7.3.24.ebuild b/dev-lang/php/php-7.3.24.ebuild
deleted file mode 100644
index 705d68d153f3..000000000000
--- a/dev-lang/php/php-7.3.24.ebuild
+++ /dev/null
@@ -1,760 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit flag-o-matic systemd autotools
-
-MY_PV=${PV/_rc/RC}
-DESCRIPTION="The PHP language runtime engine"
-HOMEPAGE="https://www.php.net/"
-SRC_URI="https://www.php.net/distributions/${P}.tar.xz"
-
-LICENSE="PHP-3.01
- BSD
- Zend-2.0
- bcmath? ( LGPL-2.1+ )
- fpm? ( BSD-2 )
- gd? ( gd )
- unicode? ( BSD-2 LGPL-2.1 )"
-
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-# We can build the following SAPIs in the given order
-SAPIS="embed cli cgi fpm apache2 phpdbg"
-
-# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
-IUSE="${IUSE}
- ${SAPIS/cli/+cli}
- threads"
-
-IUSE="${IUSE} acl argon2 bcmath berkdb bzip2 calendar cdb cjk
- coverage +ctype curl debug
- enchant exif +fileinfo +filter firebird
- +flatfile ftp gd gdbm gmp +hash +iconv imap inifile
- intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit libressl lmdb
- mhash mssql mysql mysqli nls
- oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm
- readline recode selinux +session session-mm sharedmem
- +simplexml snmp soap sockets sodium spell sqlite ssl
- sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode wddx webp
- +xml xmlreader xmlwriter xmlrpc xpm xslt zip zip-encryption zlib"
-
-# The supported (that is, autodetected) versions of BDB are listed in
-# the ./configure script. Other versions *work*, but we need to stick to
-# the ones that can be detected to avoid a repeat of bug #564824.
-COMMON_DEPEND="
- >=app-eselect/eselect-php-0.9.1[apache2?,fpm?]
- >=dev-libs/libpcre2-10.30[unicode]
- fpm? ( acl? ( sys-apps/acl ) )
- apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] )
- argon2? ( app-crypt/argon2:= )
- berkdb? ( || ( sys-libs/db:5.3
- sys-libs/db:5.1
- sys-libs/db:4.8
- sys-libs/db:4.7
- sys-libs/db:4.6
- sys-libs/db:4.5 ) )
- bzip2? ( app-arch/bzip2:0= )
- cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
- coverage? ( dev-util/lcov )
- curl? ( >=net-misc/curl-7.10.5 )
- enchant? ( =virtual/jpeg-0-r3:0 media-libs/libpng:0= >=sys-libs/zlib-1.2.0.4 )
- gdbm? ( >=sys-libs/gdbm-1.8.0:0= )
- gmp? ( dev-libs/gmp:0= )
- iconv? ( virtual/libiconv )
- imap? ( >=virtual/imap-c-client-2[kerberos=,ssl=] )
- intl? ( dev-libs/icu:= )
- iodbc? ( dev-db/libiodbc )
- kerberos? ( virtual/krb5 )
- ldap? ( >=net-nds/openldap-1.2.11 )
- ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 )
- libedit? ( dev-libs/libedit )
- lmdb? ( dev-db/lmdb:= )
- mssql? ( dev-db/freetds[mssql] )
- nls? ( sys-devel/gettext )
- oci8-instant-client? ( dev-db/oracle-instantclient-basic )
- odbc? ( >=dev-db/unixODBC-1.8.13 )
- postgres? ( dev-db/postgresql:* )
- qdbm? ( dev-db/qdbm )
- readline? ( sys-libs/readline:0= )
- recode? ( app-text/recode )
- session-mm? ( dev-libs/mm )
- simplexml? ( >=dev-libs/libxml2-2.6.8 )
- snmp? ( >=net-analyzer/net-snmp-5.2 )
- soap? ( >=dev-libs/libxml2-2.6.8 )
- sodium? ( dev-libs/libsodium:= )
- spell? ( >=app-text/aspell-0.50 )
- sqlite? ( >=dev-db/sqlite-3.7.6.3 )
- ssl? (
- !libressl? ( >=dev-libs/openssl-1.0.1:0= )
- libressl? ( dev-libs/libressl:0= )
- )
- tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) )
- tokyocabinet? ( dev-db/tokyocabinet )
- truetype? ( =media-libs/freetype-2* )
- unicode? ( dev-libs/oniguruma:= )
- wddx? ( >=dev-libs/libxml2-2.6.8 )
- webp? ( media-libs/libwebp:0= )
- xml? ( >=dev-libs/libxml2-2.6.8 )
- xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv )
- xmlreader? ( >=dev-libs/libxml2-2.6.8 )
- xmlwriter? ( >=dev-libs/libxml2-2.6.8 )
- xpm? ( x11-libs/libXpm )
- xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 )
- zip? ( >=sys-libs/zlib-1.2.0.4:0= )
- zip-encryption? ( >=dev-libs/libzip-1.2.0:= )
- zlib? ( >=sys-libs/zlib-1.2.0.4:0= )
-"
-
-RDEPEND="${COMMON_DEPEND}
- virtual/mta
- fpm? (
- selinux? ( sec-policy/selinux-phpfpm )
- systemd? ( sys-apps/systemd ) )"
-
-# Bison isn't actually needed when building from a release tarball
-# However, the configure script will warn if it's absent or if you
-# have an incompatible version installed. See bug 593278.
-DEPEND="${COMMON_DEPEND}
- app-arch/xz-utils
- >=sys-devel/bison-3.0.1"
-
-BDEPEND="virtual/pkgconfig"
-
-# Without USE=readline or libedit, the interactive "php -a" CLI will hang.
-REQUIRED_USE="
- || ( cli cgi fpm apache2 embed phpdbg )
- cli? ( ^^ ( readline libedit ) )
- truetype? ( gd zlib )
- webp? ( gd zlib )
- cjk? ( gd zlib )
- exif? ( gd zlib )
- xpm? ( gd zlib )
- gd? ( zlib )
- simplexml? ( xml )
- soap? ( xml )
- wddx? ( xml )
- xmlrpc? ( || ( xml iconv ) )
- xmlreader? ( xml )
- xslt? ( xml )
- ldap-sasl? ( ldap )
- mhash? ( hash )
- phar? ( hash )
- qdbm? ( !gdbm )
- readline? ( !libedit )
- recode? ( !imap !mysqli !mysql )
- session-mm? ( session !threads )
- mysql? ( || ( mysqli pdo ) )
- zip-encryption? ( zip )
-"
-
-RESTRICT="!test? ( test )"
-
-PATCHES=(
- "${FILESDIR}/php-freetype-2.9.1.patch"
-)
-
-PHP_MV="$(ver_cut 1)"
-
-php_install_ini() {
- local phpsapi="${1}"
-
- # work out where we are installing the ini file
- php_set_ini_dir "${phpsapi}"
-
- # Always install the production INI file, bug 611214.
- local phpinisrc="php.ini-production-${phpsapi}"
- cp php.ini-production "${phpinisrc}" || die
-
- # default to /tmp for save_path, bug #282768
- sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}" || die
-
- # Set the extension dir
- sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" \
- -i "${phpinisrc}" || die
-
- # Set the include path to point to where we want to find PEAR packages
- sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}" || die
-
- insinto "${PHP_INI_DIR#${EPREFIX}}"
- newins "${phpinisrc}" php.ini
-
- elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}"
- elog
-
- dodir "${PHP_EXT_INI_DIR#${EPREFIX}}"
- dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}"
-
- if use opcache; then
- elog "Adding opcache to $PHP_EXT_INI_DIR"
- echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> \
- "${D}/${PHP_EXT_INI_DIR}"/opcache.ini
- dosym "../ext/opcache.ini" \
- "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/opcache.ini"
- fi
-
- # SAPI-specific handling
- if [[ "${sapi}" == "fpm" ]] ; then
- einfo "Installing FPM config files php-fpm.conf and www.conf"
- insinto "${PHP_INI_DIR#${EPREFIX}}"
- doins sapi/fpm/php-fpm.conf
- insinto "${PHP_INI_DIR#${EPREFIX}}/fpm.d"
- doins sapi/fpm/www.conf
- fi
-
- dodoc php.ini-{development,production}
-}
-
-php_set_ini_dir() {
- PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}"
- PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext"
- PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active"
-}
-
-src_prepare() {
- default
-
- # In php-7.x, the FPM pool configuration files have been split off
- # of the main config. By default the pool config files go in
- # e.g. /etc/php-fpm.d, which isn't slotted. So here we move the
- # include directory to a subdirectory "fpm.d" of $PHP_INI_DIR. Later
- # we'll install the pool configuration file "www.conf" there.
- php_set_ini_dir fpm
- sed -i "s~^include=.*$~include=${PHP_INI_DIR}/fpm.d/*.conf~" \
- sapi/fpm/php-fpm.conf.in \
- || die 'failed to move the include directory in php-fpm.conf'
-
- # Bug 669566 - necessary so that build tools are updated for commands like pecl
- # Force rebuilding aclocal.m4
- rm -f aclocal.m4 || die "failed to remove aclocal.m4 in src_prepare"
- eautoreconf
-}
-
-src_configure() {
- addpredict /usr/share/snmp/mibs/.index #nowarn
- addpredict /var/lib/net-snmp/mib_indexes #nowarn
-
- PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}"
-
- # The php-fpm config file wants localstatedir to be ${EPREFIX}/var
- # and not the Gentoo default ${EPREFIX}/var/lib. See bug 572002.
- local our_conf=(
- --prefix="${PHP_DESTDIR}"
- --mandir="${PHP_DESTDIR}/man"
- --infodir="${PHP_DESTDIR}/info"
- --libdir="${PHP_DESTDIR}/lib"
- --with-libdir="$(get_libdir)"
- --localstatedir="${EPREFIX}/var"
- --without-pear
- $(use_enable threads maintainer-zts)
- )
-
- our_conf+=(
- $(use_with argon2 password-argon2 "${EPREFIX}/usr")
- $(use_enable bcmath bcmath)
- $(use_with bzip2 bz2 "${EPREFIX}/usr")
- $(use_enable calendar calendar)
- $(use_enable coverage gcov)
- $(use_enable ctype ctype)
- $(use_with curl curl "${EPREFIX}/usr")
- $(use_enable xml dom)
- $(use_with enchant enchant "${EPREFIX}/usr")
- $(use_enable exif exif)
- $(use_enable fileinfo fileinfo)
- $(use_enable filter filter)
- $(use_enable ftp ftp)
- $(use_with nls gettext "${EPREFIX}/usr")
- $(use_with gmp gmp "${EPREFIX}/usr")
- $(use_enable hash hash)
- $(use_with mhash mhash "${EPREFIX}/usr")
- $(use_with iconv iconv \
- $(use elibc_glibc || use elibc_musl || use elibc_FreeBSD || echo "${EPREFIX}/usr"))
- $(use_enable intl intl)
- $(use_enable ipv6 ipv6)
- $(use_enable json json)
- $(use_with kerberos kerberos "${EPREFIX}/usr")
- $(use_enable xml libxml)
- $(use_with xml libxml-dir "${EPREFIX}/usr")
- $(use_enable unicode mbstring)
- $(use_with unicode onig "${EPREFIX}/usr")
- $(use_with ssl openssl "${EPREFIX}/usr")
- $(use_with ssl openssl-dir "${EPREFIX}/usr")
- $(use_enable pcntl pcntl)
- $(use_enable phar phar)
- $(use_enable pdo pdo)
- $(use_enable opcache opcache)
- $(use_with postgres pgsql "${EPREFIX}/usr")
- $(use_enable posix posix)
- $(use_with spell pspell "${EPREFIX}/usr")
- $(use_with recode recode "${EPREFIX}/usr")
- $(use_enable simplexml simplexml)
- $(use_enable sharedmem shmop)
- $(use_with snmp snmp "${EPREFIX}/usr")
- $(use_enable soap soap)
- $(use_enable sockets sockets)
- $(use_with sodium sodium "${EPREFIX}/usr")
- $(use_with sqlite sqlite3 "${EPREFIX}/usr")
- $(use_enable sysvipc sysvmsg)
- $(use_enable sysvipc sysvsem)
- $(use_enable sysvipc sysvshm)
- $(use_with tidy tidy "${EPREFIX}/usr")
- $(use_enable tokenizer tokenizer)
- $(use_enable wddx wddx)
- $(use_enable xml xml)
- $(use_enable xmlreader xmlreader)
- $(use_enable xmlwriter xmlwriter)
- $(use_with xmlrpc xmlrpc)
- $(use_with xslt xsl "${EPREFIX}/usr")
- $(use_enable zip zip)
- $(use_with zip-encryption libzip "${EPREFIX}/usr")
- $(use_with zlib zlib "${EPREFIX}/usr")
- $(use_enable debug debug)
- )
-
- # DBA support
- if use cdb || use berkdb || use flatfile || use gdbm || use inifile \
- || use qdbm || use lmdb || use tokyocabinet ; then
- our_conf+=( "--enable-dba${shared}" )
- fi
-
- # DBA drivers support
- our_conf+=(
- $(use_with cdb cdb)
- $(use_with berkdb db4 "${EPREFIX}/usr")
- $(use_enable flatfile flatfile)
- $(use_with gdbm gdbm "${EPREFIX}/usr")
- $(use_enable inifile inifile)
- $(use_with qdbm qdbm "${EPREFIX}/usr")
- $(use_with lmdb lmdb "${EPREFIX}/usr")
- )
-
- # Support for the GD graphics library
- our_conf+=(
- $(use_with truetype freetype-dir "${EPREFIX}/usr")
- $(use_enable cjk gd-jis-conv)
- $(use_with gd jpeg-dir "${EPREFIX}/usr")
- $(use_with gd png-dir "${EPREFIX}/usr")
- $(use_with xpm xpm-dir "${EPREFIX}/usr")
- )
- if use webp; then
- our_conf+=( --with-webp-dir="${EPREFIX}/usr" )
- fi
- # enable gd last, so configure can pick up the previous settings
- our_conf+=( $(use_with gd gd) )
-
- # IMAP support
- if use imap ; then
- our_conf+=(
- $(use_with imap imap "${EPREFIX}/usr")
- $(use_with ssl imap-ssl "${EPREFIX}/usr")
- )
- fi
-
- # Interbase/firebird support
- our_conf+=( $(use_with firebird interbase "${EPREFIX}/usr") )
-
- # LDAP support
- if use ldap ; then
- our_conf+=(
- $(use_with ldap ldap "${EPREFIX}/usr")
- $(use_with ldap-sasl ldap-sasl "${EPREFIX}/usr")
- )
- fi
-
- # MySQL support
- local mysqllib="mysqlnd"
- local mysqlilib="mysqlnd"
-
- our_conf+=( $(use_with mysqli mysqli "${mysqlilib}") )
-
- local mysqlsock="${EPREFIX}/var/run/mysqld/mysqld.sock"
- if use mysql || use mysqli ; then
- our_conf+=( $(use_with mysql mysql-sock "${mysqlsock}") )
- fi
-
- # ODBC support
- our_conf+=(
- $(use_with odbc unixODBC "${EPREFIX}/usr")
- $(use_with iodbc iodbc "${EPREFIX}/usr")
- )
-
- # Oracle support
- our_conf+=( $(use_with oci8-instant-client oci8) )
-
- # PDO support
- if use pdo ; then
- our_conf+=(
- $(use_with mssql pdo-dblib "${EPREFIX}/usr")
- $(use_with mysql pdo-mysql "${mysqllib}")
- $(use_with postgres pdo-pgsql)
- $(use_with sqlite pdo-sqlite "${EPREFIX}/usr")
- $(use_with firebird pdo-firebird "${EPREFIX}/usr")
- $(use_with odbc pdo-odbc "unixODBC,${EPREFIX}/usr")
- $(use_with oci8-instant-client pdo-oci)
- )
- fi
-
- # readline/libedit support
- our_conf+=(
- $(use_with readline readline "${EPREFIX}/usr")
- $(use_with libedit libedit "${EPREFIX}/usr")
- )
-
- # Session support
- if use session ; then
- our_conf+=( $(use_with session-mm mm "${EPREFIX}/usr") )
- else
- our_conf+=( $(use_enable session session) )
- fi
-
- # Use pic for shared modules such as apache2's mod_php
- our_conf+=( --with-pic )
-
- # we use the system copy of pcre
- # --with-pcre-regex affects ext/pcre
- # --with-pcre-dir affects ext/filter and ext/zip
- # --with-pcre-valgrind cannot be enabled with system pcre
- # Many arches don't support pcre-jit
- our_conf+=(
- --with-pcre-regex="${EPREFIX}/usr"
- --with-pcre-dir="${EPREFIX}/usr"
- --without-pcre-valgrind
- --without-pcre-jit
- )
-
- # Catch CFLAGS problems
- # Fixes bug #14067.
- # Changed order to run it in reverse for bug #32022 and #12021.
- replace-cpu-flags "k6*" "i586"
-
- # Cache the ./configure test results between SAPIs.
- our_conf+=( --cache-file="${T}/config.cache" )
-
- # Support user-passed configuration parameters
- our_conf+=( ${EXTRA_ECONF:-} )
-
- # Support the Apache2 extras, they must be set globally for all
- # SAPIs to work correctly, especially for external PHP extensions
-
- local one_sapi
- local sapi
- mkdir -p "${WORKDIR}/sapis-build" || die
- for one_sapi in $SAPIS ; do
- use "${one_sapi}" || continue
- php_set_ini_dir "${one_sapi}"
-
- # The BUILD_DIR variable is used to determine where to output
- # the files that autotools creates. This was all originally
- # based on the autotools-utils eclass.
- BUILD_DIR="${WORKDIR}/sapis-build/${one_sapi}"
- cp -a "${S}" "${BUILD_DIR}" || die
- cd "${BUILD_DIR}" || die
-
- local sapi_conf=(
- --with-config-file-path="${PHP_INI_DIR}"
- --with-config-file-scan-dir="${PHP_EXT_INI_DIR_ACTIVE}"
- )
-
- for sapi in $SAPIS ; do
- case "$sapi" in
- cli|cgi|embed|fpm|phpdbg)
- if [[ "${one_sapi}" == "${sapi}" ]] ; then
- sapi_conf+=( "--enable-${sapi}" )
- if [[ "fpm" == "${sapi}" ]] ; then
- sapi_conf+=(
- $(use_with acl fpm-acl)
- $(use_with systemd fpm-systemd)
- )
- fi
- else
- sapi_conf+=( "--disable-${sapi}" )
- fi
- ;;
-
- apache2)
- if [[ "${one_sapi}" == "${sapi}" ]] ; then
- sapi_conf+=( --with-apxs2="${EPREFIX}/usr/bin/apxs" )
- else
- sapi_conf+=( --without-apxs2 )
- fi
- ;;
- esac
- done
-
- # Construct the $myeconfargs array by concatenating $our_conf
- # (the common args) and $sapi_conf (the SAPI-specific args).
- local myeconfargs=( "${our_conf[@]}" )
- myeconfargs+=( "${sapi_conf[@]}" )
-
- pushd "${BUILD_DIR}" > /dev/null || die
- econf "${myeconfargs[@]}"
- popd > /dev/null || die
- done
-}
-
-src_compile() {
- # snmp seems to run during src_compile, too (bug #324739)
- addpredict /usr/share/snmp/mibs/.index #nowarn
- addpredict /var/lib/net-snmp/mib_indexes #nowarn
-
- local sapi
- for sapi in ${SAPIS} ; do
- if use "${sapi}"; then
- cd "${WORKDIR}/sapis-build/$sapi" || \
- die "Failed to change dir to ${WORKDIR}/sapis-build/$1"
- emake
- fi
- done
-}
-
-src_install() {
- # see bug #324739 for what happens when we don't have that
- addpredict /usr/share/snmp/mibs/.index #nowarn
-
- # grab the first SAPI that got built and install common files from there
- local first_sapi="", sapi=""
- for sapi in $SAPIS ; do
- if use $sapi ; then
- first_sapi=$sapi
- break
- fi
- done
-
- # Makefile forgets to create this before trying to write to it...
- dodir "${PHP_DESTDIR#${EPREFIX}}/bin"
-
- # Install php environment (without any sapis)
- cd "${WORKDIR}/sapis-build/$first_sapi" || die
- emake INSTALL_ROOT="${D}" \
- install-build install-headers install-programs
-
- local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)"
-
- # Create the directory where we'll put version-specific php scripts
- keepdir "/usr/share/php${PHP_MV}"
-
- local file=""
- local sapi_list=""
-
- for sapi in ${SAPIS}; do
- if use "${sapi}" ; then
- einfo "Installing SAPI: ${sapi}"
- cd "${WORKDIR}/sapis-build/${sapi}" || die
-
- if [[ "${sapi}" == "apache2" ]] ; then
- # We're specifically not using emake install-sapi as libtool
- # may cause unnecessary relink failures (see bug #351266)
- insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/"
- newins ".libs/libphp${PHP_MV}$(get_libname)" \
- "libphp${PHP_MV}$(get_libname)"
- keepdir "/usr/$(get_libdir)/apache2/modules"
- else
- # needed each time, php_install_ini would reset it
- local dest="${PHP_DESTDIR#${EPREFIX}}"
- into "${dest}"
- case "$sapi" in
- cli)
- source="sapi/cli/php"
- # Install the "phar" archive utility.
- if use phar ; then
- emake INSTALL_ROOT="${D}" install-pharcmd
- dosym "..${dest#/usr}/bin/phar" "/usr/bin/phar${SLOT}"
- fi
- ;;
- cgi)
- source="sapi/cgi/php-cgi"
- ;;
- fpm)
- source="sapi/fpm/php-fpm"
- ;;
- embed)
- source="libs/libphp${PHP_MV}$(get_libname)"
- ;;
- phpdbg)
- source="sapi/phpdbg/phpdbg"
- ;;
- *)
- die "unhandled sapi in src_install"
- ;;
- esac
-
- if [[ "${source}" == *"$(get_libname)" ]]; then
- dolib.so "${source}"
- else
- dobin "${source}"
- local name="$(basename ${source})"
- dosym "..${dest#/usr}/bin/${name}" "/usr/bin/${name}${SLOT}"
- fi
- fi
-
- php_install_ini "${sapi}"
-
- # construct correct SAPI string for php-config
- # thanks to ferringb for the bash voodoo
- if [[ "${sapi}" == "apache2" ]]; then
- sapi_list="${sapi_list:+${sapi_list} }apache2handler"
- else
- sapi_list="${sapi_list:+${sapi_list} }${sapi}"
- fi
- fi
- done
-
- # Installing opcache module
- if use opcache ; then
- into "${PHP_DESTDIR#${EPREFIX}}"
- dolib.so "modules/opcache$(get_libname)"
- fi
-
- # Install env.d files
- newenvd "${FILESDIR}/20php5-envd" "20php${SLOT}"
- sed -e "s|/lib/|/$(get_libdir)/|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
- sed -e "s|php5|php${SLOT}|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
-
- # set php-config variable correctly (bug #278439)
- sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \
- "${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config" || die
-
- if use fpm ; then
- if use systemd; then
- systemd_newunit "${FILESDIR}/php-fpm_at.service" \
- "php-fpm@${SLOT}.service"
- else
- systemd_newunit "${FILESDIR}/php-fpm_at-simple.service" \
- "php-fpm@${SLOT}.service"
- fi
- fi
-}
-
-src_test() {
- echo ">>> Test phase [test]: ${CATEGORY}/${PF}"
- PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php"
- if [[ ! -x "${PHP_BIN}" ]] ; then
- ewarn "Test phase requires USE=cli, skipping"
- return
- else
- export TEST_PHP_EXECUTABLE="${PHP_BIN}"
- fi
-
- if [[ -x "${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi" ]] ; then
- export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi"
- fi
-
- if [[ -x "${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg" ]] ; then
- export TEST_PHPDBG_EXECUTABLE="${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg"
- fi
-
- REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n -d \
- "session.save_path=${T}" \
- "${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d \
- "session.save_path=${T}"
-
- for name in ${EXPECTED_TEST_FAILURES}; do
- mv "${name}.out" "${name}.out.orig" 2>/dev/null || die
- done
-
- local failed="$(find -name '*.out')"
- if [[ ${failed} != "" ]] ; then
- ewarn "The following test cases failed unexpectedly:"
- for name in ${failed}; do
- ewarn " ${name/.out/}"
- done
- else
- einfo "No unexpected test failures, all fine"
- fi
-
- if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then
- local passed=""
- for name in ${EXPECTED_TEST_FAILURES}; do
- [[ -f "${name}.diff" ]] && continue
- passed="${passed} ${name}"
- done
- if [[ ${passed} != "" ]] ; then
- einfo "The following test cases passed unexpectedly:"
- for name in ${passed}; do
- ewarn " ${passed}"
- done
- else
- einfo "None of the known-to-fail tests passed, all fine"
- fi
- fi
-}
-
-pkg_postinst() {
- # Output some general info to the user
- if use apache2 ; then
- elog
- elog "To enable PHP in apache, you will need to add \"-D PHP\" to"
- elog "your apache2 command. OpenRC users can append that string to"
- elog "APACHE2_OPTS in /etc/conf.d/apache2."
- elog
- elog "The apache module configuration file 70_mod_php.conf is"
- elog "provided (and maintained) by eselect-php."
- elog
- fi
-
- # Create the symlinks for php
- local m
- for m in ${SAPIS}; do
- [[ ${m} == 'embed' ]] && continue;
- if use $m ; then
- local ci=$(eselect php show $m)
- if [[ -z $ci ]]; then
- eselect php set $m php${SLOT} || die
- einfo "Switched ${m} to use php:${SLOT}"
- einfo
- elif [[ $ci != "php${SLOT}" ]] ; then
- elog "To switch $m to use php:${SLOT}, run"
- elog " eselect php set $m php${SLOT}"
- elog
- fi
- fi
- done
-
- # Remove dead symlinks for SAPIs that were just disabled. For
- # example, if the user has the cgi SAPI enabled, then he has an
- # eselect-php symlink for it. If he later reinstalls PHP with
- # USE="-cgi", that symlink will break. This call to eselect is
- # supposed to remove that dead link per bug 572436.
- eselect php cleanup || die
-
- if ! has "php${SLOT/./-}" ${PHP_TARGETS}; then
- elog "To build extensions for this version of PHP, you will need to"
- elog "add php${SLOT/./-} to your PHP_TARGETS USE_EXPAND variable."
- elog
- fi
-
- # Warn about the removal of PHP_INI_VERSION if the user has it set.
- if [[ -n "${PHP_INI_VERSION}" ]]; then
- ewarn 'The PHP_INI_VERSION variable has been phased out. You may'
- ewarn 'remove it from your configuration at your convenience. See'
- ewarn
- ewarn ' https://bugs.gentoo.org/611214'
- ewarn
- ewarn 'for more information.'
- fi
-
- elog "For details on how version slotting works, please see"
- elog "the wiki:"
- elog
- elog " https://wiki.gentoo.org/wiki/PHP"
- elog
-}
-
-pkg_postrm() {
- # This serves two purposes. First, if we have just removed the last
- # installed version of PHP, then this will remove any dead symlinks
- # belonging to eselect-php. Second, if a user upgrades slots from
- # (say) 5.6 to 7.0 and depcleans the old slot, then this will update
- # his existing symlinks to point to the new 7.0 installation. The
- # latter is bug 432962.
- #
- # Note: the eselect-php package may not be installed at this point,
- # so we can't die() if this command fails.
- eselect php cleanup
-}
diff --git a/dev-lang/php/php-7.3.25.ebuild b/dev-lang/php/php-7.3.25.ebuild
index c77f83e285f4..9c97e02a635a 100644
--- a/dev-lang/php/php-7.3.25.ebuild
+++ b/dev-lang/php/php-7.3.25.ebuild
@@ -19,7 +19,7 @@ LICENSE="PHP-3.01
unicode? ( BSD-2 LGPL-2.1 )"
SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
S="${WORKDIR}/${PN}-${MY_PV}"
diff --git a/dev-lang/php/php-7.4.10.ebuild b/dev-lang/php/php-7.4.10.ebuild
deleted file mode 100644
index 3ac0d8c9ace3..000000000000
--- a/dev-lang/php/php-7.4.10.ebuild
+++ /dev/null
@@ -1,750 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-WANT_AUTOMAKE="none"
-
-inherit flag-o-matic systemd autotools
-
-MY_PV=${PV/_rc/RC}
-DESCRIPTION="The PHP language runtime engine"
-HOMEPAGE="https://www.php.net/"
-SRC_URI="https://www.php.net/distributions/${P}.tar.xz"
-
-LICENSE="PHP-3.01
- BSD
- Zend-2.0
- bcmath? ( LGPL-2.1+ )
- fpm? ( BSD-2 )
- gd? ( gd )
- unicode? ( BSD-2 LGPL-2.1 )"
-
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-# We can build the following SAPIs in the given order
-SAPIS="embed cli cgi fpm apache2 phpdbg"
-
-# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
-IUSE="${IUSE}
- ${SAPIS/cli/+cli}
- threads"
-
-IUSE="${IUSE} acl argon2 bcmath berkdb bzip2 calendar cdb cjk
- coverage +ctype curl debug
- enchant exif ffi +fileinfo +filter firebird
- +flatfile ftp gd gdbm gmp +iconv imap inifile
- intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit libressl lmdb
- mhash mssql mysql mysqli nls
- oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm
- readline selinux +session session-mm sharedmem
- +simplexml snmp soap sockets sodium spell sqlite ssl
- sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode webp
- +xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib"
-
-# Without USE=readline or libedit, the interactive "php -a" CLI will hang.
-REQUIRED_USE="
- || ( cli cgi fpm apache2 embed phpdbg )
- cli? ( ^^ ( readline libedit ) )
- !cli? ( ?? ( readline libedit ) )
- truetype? ( gd zlib )
- webp? ( gd zlib )
- cjk? ( gd zlib )
- exif? ( gd zlib )
- xpm? ( gd zlib )
- gd? ( zlib )
- simplexml? ( xml )
- soap? ( xml )
- xmlrpc? ( xml iconv )
- xmlreader? ( xml )
- xmlwriter? ( xml )
- xslt? ( xml )
- ldap-sasl? ( ldap )
- qdbm? ( !gdbm )
- session-mm? ( session !threads )
- mysql? ( || ( mysqli pdo ) )
- firebird? ( pdo )
- mssql? ( pdo )
-"
-
-RESTRICT="!test? ( test )"
-
-# The supported (that is, autodetected) versions of BDB are listed in
-# the ./configure script. Other versions *work*, but we need to stick to
-# the ones that can be detected to avoid a repeat of bug #564824.
-COMMON_DEPEND="
- >=app-eselect/eselect-php-0.9.1[apache2?,fpm?]
- >=dev-libs/libpcre2-10.30[unicode]
- fpm? ( acl? ( sys-apps/acl ) )
- apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] )
- argon2? ( app-crypt/argon2:= )
- berkdb? ( || ( sys-libs/db:5.3
- sys-libs/db:5.1
- sys-libs/db:4.8
- sys-libs/db:4.7
- sys-libs/db:4.6
- sys-libs/db:4.5 ) )
- bzip2? ( app-arch/bzip2:0= )
- cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
- coverage? ( dev-util/lcov )
- curl? ( >=net-misc/curl-7.10.5 )
- enchant? ( =dev-libs/libffi-3.0.11 )
- firebird? ( dev-db/firebird )
- gd? ( >=virtual/jpeg-0-r3:0 media-libs/libpng:0= )
- gdbm? ( >=sys-libs/gdbm-1.8.0:0= )
- gmp? ( dev-libs/gmp:0= )
- iconv? ( virtual/libiconv )
- imap? ( >=virtual/imap-c-client-2[kerberos=,ssl=] )
- intl? ( dev-libs/icu:= )
- kerberos? ( virtual/krb5 )
- ldap? ( >=net-nds/openldap-1.2.11 )
- ldap-sasl? ( dev-libs/cyrus-sasl )
- libedit? ( dev-libs/libedit )
- lmdb? ( dev-db/lmdb:= )
- mssql? ( dev-db/freetds[mssql] )
- nls? ( sys-devel/gettext )
- oci8-instant-client? ( dev-db/oracle-instantclient-basic )
- odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( >=dev-db/unixODBC-1.8.13 ) )
- postgres? ( dev-db/postgresql:* )
- qdbm? ( dev-db/qdbm )
- readline? ( sys-libs/readline:0= )
- session-mm? ( dev-libs/mm )
- snmp? ( >=net-analyzer/net-snmp-5.2 )
- sodium? ( dev-libs/libsodium:= )
- spell? ( >=app-text/aspell-0.50 )
- sqlite? ( >=dev-db/sqlite-3.7.6.3 )
- ssl? (
- !libressl? ( >=dev-libs/openssl-1.0.1:0= )
- libressl? ( dev-libs/libressl:0= )
- )
- tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) )
- tokyocabinet? ( dev-db/tokyocabinet )
- truetype? ( =media-libs/freetype-2* )
- unicode? ( dev-libs/oniguruma:= )
- webp? ( media-libs/libwebp:0= )
- xml? ( >=dev-libs/libxml2-2.7.6 )
- xpm? ( x11-libs/libXpm )
- xslt? ( dev-libs/libxslt )
- zip? ( >=dev-libs/libzip-1.2.0:= )
- zlib? ( >=sys-libs/zlib-1.2.0.4:0= )
-"
-
-RDEPEND="${COMMON_DEPEND}
- virtual/mta
- fpm? (
- selinux? ( sec-policy/selinux-phpfpm )
- systemd? ( sys-apps/systemd ) )"
-
-# Bison isn't actually needed when building from a release tarball
-# However, the configure script will warn if it's absent or if you
-# have an incompatible version installed. See bug 593278.
-DEPEND="${COMMON_DEPEND}
- app-arch/xz-utils
- >=sys-devel/bison-3.0.1"
-
-BDEPEND="virtual/pkgconfig"
-
-PHP_MV="$(ver_cut 1)"
-
-PATCHES=( "${FILESDIR}/php-iodbc-header-location.patch" )
-
-php_install_ini() {
- local phpsapi="${1}"
-
- # work out where we are installing the ini file
- php_set_ini_dir "${phpsapi}"
-
- # Always install the production INI file, bug 611214.
- local phpinisrc="php.ini-production-${phpsapi}"
- cp php.ini-production "${phpinisrc}" || die
-
- # default to /tmp for save_path, bug #282768
- sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}" || die
-
- # Set the extension dir
- sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" \
- -i "${phpinisrc}" || die
-
- # Set the include path to point to where we want to find PEAR packages
- sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}" || die
-
- insinto "${PHP_INI_DIR#${EPREFIX}}"
- newins "${phpinisrc}" php.ini
-
- elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}"
- elog
-
- dodir "${PHP_EXT_INI_DIR#${EPREFIX}}"
- dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}"
-
- if use opcache; then
- elog "Adding opcache to $PHP_EXT_INI_DIR"
- echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> \
- "${D}/${PHP_EXT_INI_DIR}"/opcache.ini
- dosym "../ext/opcache.ini" \
- "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/opcache.ini"
- fi
-
- # SAPI-specific handling
- if [[ "${sapi}" == "fpm" ]] ; then
- einfo "Installing FPM config files php-fpm.conf and www.conf"
- insinto "${PHP_INI_DIR#${EPREFIX}}"
- doins sapi/fpm/php-fpm.conf
- insinto "${PHP_INI_DIR#${EPREFIX}}/fpm.d"
- doins sapi/fpm/www.conf
- fi
-
- dodoc php.ini-{development,production}
-}
-
-php_set_ini_dir() {
- PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}"
- PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext"
- PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active"
-}
-
-src_prepare() {
- default
-
- # In php-7.x, the FPM pool configuration files have been split off
- # of the main config. By default the pool config files go in
- # e.g. /etc/php-fpm.d, which isn't slotted. So here we move the
- # include directory to a subdirectory "fpm.d" of $PHP_INI_DIR. Later
- # we'll install the pool configuration file "www.conf" there.
- php_set_ini_dir fpm
- sed -i "s~^include=.*$~include=${PHP_INI_DIR}/fpm.d/*.conf~" \
- sapi/fpm/php-fpm.conf.in \
- || die 'failed to move the include directory in php-fpm.conf'
-
- # Emulate buildconf to support cross-compilation
- rm -fr aclocal.m4 autom4te.cache config.cache \
- configure main/php_config.h.in || die
- eautoconf --force
- eautoheader
-}
-
-src_configure() {
- addpredict /usr/share/snmp/mibs/.index #nowarn
- addpredict /var/lib/net-snmp/mib_indexes #nowarn
-
- PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}"
-
- # The php-fpm config file wants localstatedir to be ${EPREFIX}/var
- # and not the Gentoo default ${EPREFIX}/var/lib. See bug 572002.
- local our_conf=(
- --prefix="${PHP_DESTDIR}"
- --mandir="${PHP_DESTDIR}/man"
- --infodir="${PHP_DESTDIR}/info"
- --libdir="${PHP_DESTDIR}/lib"
- --with-libdir="$(get_libdir)"
- --localstatedir="${EPREFIX}/var"
- --without-pear
- $(use_enable threads maintainer-zts)
- )
-
- our_conf+=(
- $(use_with argon2 password-argon2 "${EPREFIX}/usr")
- $(use_enable bcmath)
- $(use_with bzip2 bz2 "${EPREFIX}/usr")
- $(use_enable calendar)
- $(use_enable coverage gcov)
- $(use_enable ctype)
- $(use_with curl)
- $(use_enable xml dom)
- $(use_with enchant)
- $(use_enable exif)
- $(use_with ffi)
- $(use_enable fileinfo)
- $(use_enable filter)
- $(use_enable ftp)
- $(use_with nls gettext "${EPREFIX}/usr")
- $(use_with gmp gmp "${EPREFIX}/usr")
- $(use_with mhash mhash "${EPREFIX}/usr")
- $(use_with iconv iconv \
- $(use elibc_glibc || use elibc_musl || use elibc_FreeBSD || echo "${EPREFIX}/usr"))
- $(use_enable intl)
- $(use_enable ipv6)
- $(use_enable json)
- $(use_with kerberos)
- $(use_with xml libxml)
- $(use_enable unicode mbstring)
- $(use_with ssl openssl)
- $(use_enable pcntl)
- $(use_enable phar)
- $(use_enable pdo)
- $(use_enable opcache)
- $(use_with postgres pgsql "${EPREFIX}/usr")
- $(use_enable posix)
- $(use_with spell pspell "${EPREFIX}/usr")
- $(use_enable simplexml)
- $(use_enable sharedmem shmop)
- $(use_with snmp snmp "${EPREFIX}/usr")
- $(use_enable soap)
- $(use_enable sockets)
- $(use_with sodium)
- $(use_with sqlite sqlite3)
- $(use_enable sysvipc sysvmsg)
- $(use_enable sysvipc sysvsem)
- $(use_enable sysvipc sysvshm)
- $(use_with tidy tidy "${EPREFIX}/usr")
- $(use_enable tokenizer)
- $(use_enable xml)
- $(use_enable xmlreader)
- $(use_enable xmlwriter)
- $(use_with xmlrpc)
- $(use_with xslt xsl)
- $(use_with zip)
- $(use_with zlib zlib "${EPREFIX}/usr")
- $(use_enable debug)
- )
-
- # DBA support
- if use cdb || use berkdb || use flatfile || use gdbm || use inifile \
- || use qdbm || use lmdb || use tokyocabinet ; then
- our_conf+=( "--enable-dba" )
- fi
-
- # DBA drivers support
- our_conf+=(
- $(use_with cdb)
- $(use_with berkdb db4 "${EPREFIX}/usr")
- $(use_enable flatfile)
- $(use_with gdbm gdbm "${EPREFIX}/usr")
- $(use_enable inifile)
- $(use_with qdbm qdbm "${EPREFIX}/usr")
- $(use_with tokyocabinet tcadb "${EPREFIX}/usr")
- $(use_with lmdb lmdb "${EPREFIX}/usr")
- )
-
- # Support for the GD graphics library
- our_conf+=(
- $(use_with truetype freetype)
- $(use_enable cjk gd-jis-conv)
- $(use_with gd jpeg)
- $(use_with xpm)
- $(use_with webp)
- )
- # enable gd last, so configure can pick up the previous settings
- our_conf+=( $(use_enable gd) )
-
- # IMAP support
- if use imap ; then
- our_conf+=(
- $(use_with imap imap "${EPREFIX}/usr")
- $(use_with ssl imap-ssl "${EPREFIX}/usr")
- )
- fi
-
- # LDAP support
- if use ldap ; then
- our_conf+=(
- $(use_with ldap ldap "${EPREFIX}/usr")
- $(use_with ldap-sasl)
- )
- fi
-
- # MySQL support
- local mysqllib="mysqlnd"
- local mysqlilib="mysqlnd"
-
- our_conf+=( $(use_with mysqli mysqli "${mysqlilib}") )
-
- local mysqlsock="${EPREFIX}/var/run/mysqld/mysqld.sock"
- if use mysql || use mysqli ; then
- our_conf+=( $(use_with mysql mysql-sock "${mysqlsock}") )
- fi
-
- # ODBC support
- if use odbc && use iodbc ; then
- our_conf+=(
- --without-unixODBC
- --with-iodbc
- $(use_with pdo pdo-odbc "iODBC,${EPREFIX}/usr")
- )
- elif use odbc ; then
- our_conf+=(
- --with-unixODBC="${EPREFIX}/usr"
- --without-iodbc
- $(use_with pdo pdo-odbc "unixODBC,${EPREFIX}/usr")
- )
- else
- our_conf+=(
- --without-unixODBC
- --without-iodbc
- --without-pdo-odbc
- )
- fi
-
- # Oracle support
- our_conf+=( $(use_with oci8-instant-client oci8) )
-
- # PDO support
- if use pdo ; then
- our_conf+=(
- $(use_with mssql pdo-dblib "${EPREFIX}/usr")
- $(use_with mysql pdo-mysql "${mysqllib}")
- $(use_with postgres pdo-pgsql)
- $(use_with sqlite pdo-sqlite)
- $(use_with firebird pdo-firebird "${EPREFIX}/usr")
- $(use_with oci8-instant-client pdo-oci)
- )
- fi
-
- # readline/libedit support
- our_conf+=(
- $(use_with readline readline "${EPREFIX}/usr")
- $(use_with libedit)
- )
-
- # Session support
- if use session ; then
- our_conf+=( $(use_with session-mm mm "${EPREFIX}/usr") )
- else
- our_conf+=( $(use_enable session) )
- fi
-
- # Use pic for shared modules such as apache2's mod_php
- our_conf+=( --with-pic )
-
- # we use the system copy of pcre
- # --with-external-pcre affects ext/pcre
- # Many arches don't support pcre-jit
- our_conf+=(
- --with-external-pcre
- --without-pcre-jit
- )
-
- # Catch CFLAGS problems
- # Fixes bug #14067.
- # Changed order to run it in reverse for bug #32022 and #12021.
- replace-cpu-flags "k6*" "i586"
-
- # Cache the ./configure test results between SAPIs.
- our_conf+=( --cache-file="${T}/config.cache" )
-
- # Support user-passed configuration parameters
- our_conf+=( ${EXTRA_ECONF:-} )
-
- # Support the Apache2 extras, they must be set globally for all
- # SAPIs to work correctly, especially for external PHP extensions
-
- local one_sapi
- local sapi
- mkdir -p "${WORKDIR}/sapis-build" || die
- for one_sapi in $SAPIS ; do
- use "${one_sapi}" || continue
- php_set_ini_dir "${one_sapi}"
-
- # The BUILD_DIR variable is used to determine where to output
- # the files that autotools creates. This was all originally
- # based on the autotools-utils eclass.
- BUILD_DIR="${WORKDIR}/sapis-build/${one_sapi}"
- cp -a "${S}" "${BUILD_DIR}" || die
- cd "${BUILD_DIR}" || die
-
- local sapi_conf=(
- --with-config-file-path="${PHP_INI_DIR}"
- --with-config-file-scan-dir="${PHP_EXT_INI_DIR_ACTIVE}"
- )
-
- for sapi in $SAPIS ; do
- case "$sapi" in
- cli|cgi|embed|fpm|phpdbg)
- if [[ "${one_sapi}" == "${sapi}" ]] ; then
- sapi_conf+=( "--enable-${sapi}" )
- if [[ "fpm" == "${sapi}" ]] ; then
- sapi_conf+=(
- $(use_with acl fpm-acl)
- $(use_with systemd fpm-systemd)
- )
- fi
- else
- sapi_conf+=( "--disable-${sapi}" )
- fi
- ;;
-
- apache2)
- if [[ "${one_sapi}" == "${sapi}" ]] ; then
- sapi_conf+=( --with-apxs2="${EPREFIX}/usr/bin/apxs" )
- else
- sapi_conf+=( --without-apxs2 )
- fi
- ;;
- esac
- done
-
- # Construct the $myeconfargs array by concatenating $our_conf
- # (the common args) and $sapi_conf (the SAPI-specific args).
- local myeconfargs=( "${our_conf[@]}" )
- myeconfargs+=( "${sapi_conf[@]}" )
-
- pushd "${BUILD_DIR}" > /dev/null || die
- econf "${myeconfargs[@]}"
- popd > /dev/null || die
- done
-}
-
-src_compile() {
- # snmp seems to run during src_compile, too (bug #324739)
- addpredict /usr/share/snmp/mibs/.index #nowarn
- addpredict /var/lib/net-snmp/mib_indexes #nowarn
-
- local sapi
- for sapi in ${SAPIS} ; do
- if use "${sapi}"; then
- cd "${WORKDIR}/sapis-build/$sapi" || \
- die "Failed to change dir to ${WORKDIR}/sapis-build/$1"
- emake
- fi
- done
-}
-
-src_install() {
- # see bug #324739 for what happens when we don't have that
- addpredict /usr/share/snmp/mibs/.index #nowarn
-
- # grab the first SAPI that got built and install common files from there
- local first_sapi="", sapi=""
- for sapi in $SAPIS ; do
- if use $sapi ; then
- first_sapi=$sapi
- break
- fi
- done
-
- # Makefile forgets to create this before trying to write to it...
- dodir "${PHP_DESTDIR#${EPREFIX}}/bin"
-
- # Install php environment (without any sapis)
- cd "${WORKDIR}/sapis-build/$first_sapi" || die
- emake INSTALL_ROOT="${D}" \
- install-build install-headers install-programs
-
- local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)"
-
- # Create the directory where we'll put version-specific php scripts
- keepdir "/usr/share/php${PHP_MV}"
-
- local file=""
- local sapi_list=""
-
- for sapi in ${SAPIS}; do
- if use "${sapi}" ; then
- einfo "Installing SAPI: ${sapi}"
- cd "${WORKDIR}/sapis-build/${sapi}" || die
-
- if [[ "${sapi}" == "apache2" ]] ; then
- # We're specifically not using emake install-sapi as libtool
- # may cause unnecessary relink failures (see bug #351266)
- insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/"
- newins ".libs/libphp${PHP_MV}$(get_libname)" \
- "libphp${PHP_MV}$(get_libname)"
- keepdir "/usr/$(get_libdir)/apache2/modules"
- else
- # needed each time, php_install_ini would reset it
- local dest="${PHP_DESTDIR#${EPREFIX}}"
- into "${dest}"
- case "$sapi" in
- cli)
- source="sapi/cli/php"
- # Install the "phar" archive utility.
- if use phar ; then
- emake INSTALL_ROOT="${D}" install-pharcmd
- dosym "..${dest#/usr}/bin/phar" "/usr/bin/phar${SLOT}"
- fi
- ;;
- cgi)
- source="sapi/cgi/php-cgi"
- ;;
- fpm)
- source="sapi/fpm/php-fpm"
- ;;
- embed)
- source="libs/libphp${PHP_MV}$(get_libname)"
- ;;
- phpdbg)
- source="sapi/phpdbg/phpdbg"
- ;;
- *)
- die "unhandled sapi in src_install"
- ;;
- esac
-
- if [[ "${source}" == *"$(get_libname)" ]]; then
- dolib.so "${source}"
- else
- dobin "${source}"
- local name="$(basename ${source})"
- dosym "..${dest#/usr}/bin/${name}" "/usr/bin/${name}${SLOT}"
- fi
- fi
-
- php_install_ini "${sapi}"
-
- # construct correct SAPI string for php-config
- # thanks to ferringb for the bash voodoo
- if [[ "${sapi}" == "apache2" ]]; then
- sapi_list="${sapi_list:+${sapi_list} }apache2handler"
- else
- sapi_list="${sapi_list:+${sapi_list} }${sapi}"
- fi
- fi
- done
-
- # Installing opcache module
- if use opcache ; then
- into "${PHP_DESTDIR#${EPREFIX}}"
- dolib.so "modules/opcache$(get_libname)"
- fi
-
- # Install env.d files
- newenvd "${FILESDIR}/20php5-envd" "20php${SLOT}"
- sed -e "s|/lib/|/$(get_libdir)/|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
- sed -e "s|php5|php${SLOT}|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
-
- # set php-config variable correctly (bug #278439)
- sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \
- "${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config" || die
-
- if use fpm ; then
- if use systemd; then
- systemd_newunit "${FILESDIR}/php-fpm_at.service" \
- "php-fpm@${SLOT}.service"
- else
- systemd_newunit "${FILESDIR}/php-fpm_at-simple.service" \
- "php-fpm@${SLOT}.service"
- fi
- fi
-}
-
-src_test() {
- echo ">>> Test phase [test]: ${CATEGORY}/${PF}"
- PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php"
- if [[ ! -x "${PHP_BIN}" ]] ; then
- ewarn "Test phase requires USE=cli, skipping"
- return
- else
- export TEST_PHP_EXECUTABLE="${PHP_BIN}"
- fi
-
- if [[ -x "${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi" ]] ; then
- export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi"
- fi
-
- if [[ -x "${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg" ]] ; then
- export TEST_PHPDBG_EXECUTABLE="${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg"
- fi
-
- REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n -d \
- "session.save_path=${T}" \
- "${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d \
- "session.save_path=${T}"
-
- for name in ${EXPECTED_TEST_FAILURES}; do
- mv "${name}.out" "${name}.out.orig" 2>/dev/null || die
- done
-
- local failed="$(find -name '*.out')"
- if [[ ${failed} != "" ]] ; then
- ewarn "The following test cases failed unexpectedly:"
- for name in ${failed}; do
- ewarn " ${name/.out/}"
- done
- else
- einfo "No unexpected test failures, all fine"
- fi
-
- if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then
- local passed=""
- for name in ${EXPECTED_TEST_FAILURES}; do
- [[ -f "${name}.diff" ]] && continue
- passed="${passed} ${name}"
- done
- if [[ ${passed} != "" ]] ; then
- einfo "The following test cases passed unexpectedly:"
- for name in ${passed}; do
- ewarn " ${passed}"
- done
- else
- einfo "None of the known-to-fail tests passed, all fine"
- fi
- fi
-}
-
-pkg_postinst() {
- # Output some general info to the user
- if use apache2 ; then
- elog
- elog "To enable PHP in apache, you will need to add \"-D PHP\" to"
- elog "your apache2 command. OpenRC users can append that string to"
- elog "APACHE2_OPTS in /etc/conf.d/apache2."
- elog
- elog "The apache module configuration file 70_mod_php.conf is"
- elog "provided (and maintained) by eselect-php."
- elog
- fi
-
- # Create the symlinks for php
- local m
- for m in ${SAPIS}; do
- [[ ${m} == 'embed' ]] && continue;
- if use $m ; then
- local ci=$(eselect php show $m)
- if [[ -z $ci ]]; then
- eselect php set $m php${SLOT} || die
- einfo "Switched ${m} to use php:${SLOT}"
- einfo
- elif [[ $ci != "php${SLOT}" ]] ; then
- elog "To switch $m to use php:${SLOT}, run"
- elog " eselect php set $m php${SLOT}"
- elog
- fi
- fi
- done
-
- # Remove dead symlinks for SAPIs that were just disabled. For
- # example, if the user has the cgi SAPI enabled, then he has an
- # eselect-php symlink for it. If he later reinstalls PHP with
- # USE="-cgi", that symlink will break. This call to eselect is
- # supposed to remove that dead link per bug 572436.
- eselect php cleanup || die
-
- if ! has "php${SLOT/./-}" ${PHP_TARGETS}; then
- elog "To build extensions for this version of PHP, you will need to"
- elog "add php${SLOT/./-} to your PHP_TARGETS USE_EXPAND variable."
- elog
- fi
-
- # Warn about the removal of PHP_INI_VERSION if the user has it set.
- if [[ -n "${PHP_INI_VERSION}" ]]; then
- ewarn 'The PHP_INI_VERSION variable has been phased out. You may'
- ewarn 'remove it from your configuration at your convenience. See'
- ewarn
- ewarn ' https://bugs.gentoo.org/611214'
- ewarn
- ewarn 'for more information.'
- fi
-
- elog "For details on how version slotting works, please see"
- elog "the wiki:"
- elog
- elog " https://wiki.gentoo.org/wiki/PHP"
- elog
-}
-
-pkg_postrm() {
- # This serves two purposes. First, if we have just removed the last
- # installed version of PHP, then this will remove any dead symlinks
- # belonging to eselect-php. Second, if a user upgrades slots from
- # (say) 5.6 to 7.0 and depcleans the old slot, then this will update
- # his existing symlinks to point to the new 7.0 installation. The
- # latter is bug 432962.
- #
- # Note: the eselect-php package may not be installed at this point,
- # so we can't die() if this command fails.
- eselect php cleanup
-}
diff --git a/dev-lang/php/php-7.4.11.ebuild b/dev-lang/php/php-7.4.11.ebuild
deleted file mode 100644
index de0cec9f7020..000000000000
--- a/dev-lang/php/php-7.4.11.ebuild
+++ /dev/null
@@ -1,750 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-WANT_AUTOMAKE="none"
-
-inherit flag-o-matic systemd autotools
-
-MY_PV=${PV/_rc/RC}
-DESCRIPTION="The PHP language runtime engine"
-HOMEPAGE="https://www.php.net/"
-SRC_URI="https://www.php.net/distributions/${P}.tar.xz"
-
-LICENSE="PHP-3.01
- BSD
- Zend-2.0
- bcmath? ( LGPL-2.1+ )
- fpm? ( BSD-2 )
- gd? ( gd )
- unicode? ( BSD-2 LGPL-2.1 )"
-
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-# We can build the following SAPIs in the given order
-SAPIS="embed cli cgi fpm apache2 phpdbg"
-
-# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
-IUSE="${IUSE}
- ${SAPIS/cli/+cli}
- threads"
-
-IUSE="${IUSE} acl argon2 bcmath berkdb bzip2 calendar cdb cjk
- coverage +ctype curl debug
- enchant exif ffi +fileinfo +filter firebird
- +flatfile ftp gd gdbm gmp +iconv imap inifile
- intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit libressl lmdb
- mhash mssql mysql mysqli nls
- oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm
- readline selinux +session session-mm sharedmem
- +simplexml snmp soap sockets sodium spell sqlite ssl
- sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode webp
- +xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib"
-
-# Without USE=readline or libedit, the interactive "php -a" CLI will hang.
-REQUIRED_USE="
- || ( cli cgi fpm apache2 embed phpdbg )
- cli? ( ^^ ( readline libedit ) )
- !cli? ( ?? ( readline libedit ) )
- truetype? ( gd zlib )
- webp? ( gd zlib )
- cjk? ( gd zlib )
- exif? ( gd zlib )
- xpm? ( gd zlib )
- gd? ( zlib )
- simplexml? ( xml )
- soap? ( xml )
- xmlrpc? ( xml iconv )
- xmlreader? ( xml )
- xmlwriter? ( xml )
- xslt? ( xml )
- ldap-sasl? ( ldap )
- qdbm? ( !gdbm )
- session-mm? ( session !threads )
- mysql? ( || ( mysqli pdo ) )
- firebird? ( pdo )
- mssql? ( pdo )
-"
-
-RESTRICT="!test? ( test )"
-
-# The supported (that is, autodetected) versions of BDB are listed in
-# the ./configure script. Other versions *work*, but we need to stick to
-# the ones that can be detected to avoid a repeat of bug #564824.
-COMMON_DEPEND="
- >=app-eselect/eselect-php-0.9.1[apache2?,fpm?]
- >=dev-libs/libpcre2-10.30[unicode]
- fpm? ( acl? ( sys-apps/acl ) )
- apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] )
- argon2? ( app-crypt/argon2:= )
- berkdb? ( || ( sys-libs/db:5.3
- sys-libs/db:5.1
- sys-libs/db:4.8
- sys-libs/db:4.7
- sys-libs/db:4.6
- sys-libs/db:4.5 ) )
- bzip2? ( app-arch/bzip2:0= )
- cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
- coverage? ( dev-util/lcov )
- curl? ( >=net-misc/curl-7.10.5 )
- enchant? ( =dev-libs/libffi-3.0.11 )
- firebird? ( dev-db/firebird )
- gd? ( >=virtual/jpeg-0-r3:0 media-libs/libpng:0= )
- gdbm? ( >=sys-libs/gdbm-1.8.0:0= )
- gmp? ( dev-libs/gmp:0= )
- iconv? ( virtual/libiconv )
- imap? ( >=virtual/imap-c-client-2[kerberos=,ssl=] )
- intl? ( dev-libs/icu:= )
- kerberos? ( virtual/krb5 )
- ldap? ( >=net-nds/openldap-1.2.11 )
- ldap-sasl? ( dev-libs/cyrus-sasl )
- libedit? ( dev-libs/libedit )
- lmdb? ( dev-db/lmdb:= )
- mssql? ( dev-db/freetds[mssql] )
- nls? ( sys-devel/gettext )
- oci8-instant-client? ( dev-db/oracle-instantclient-basic )
- odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( >=dev-db/unixODBC-1.8.13 ) )
- postgres? ( dev-db/postgresql:* )
- qdbm? ( dev-db/qdbm )
- readline? ( sys-libs/readline:0= )
- session-mm? ( dev-libs/mm )
- snmp? ( >=net-analyzer/net-snmp-5.2 )
- sodium? ( dev-libs/libsodium:= )
- spell? ( >=app-text/aspell-0.50 )
- sqlite? ( >=dev-db/sqlite-3.7.6.3 )
- ssl? (
- !libressl? ( >=dev-libs/openssl-1.0.1:0= )
- libressl? ( dev-libs/libressl:0= )
- )
- tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) )
- tokyocabinet? ( dev-db/tokyocabinet )
- truetype? ( =media-libs/freetype-2* )
- unicode? ( dev-libs/oniguruma:= )
- webp? ( media-libs/libwebp:0= )
- xml? ( >=dev-libs/libxml2-2.7.6 )
- xpm? ( x11-libs/libXpm )
- xslt? ( dev-libs/libxslt )
- zip? ( >=dev-libs/libzip-1.2.0:= )
- zlib? ( >=sys-libs/zlib-1.2.0.4:0= )
-"
-
-RDEPEND="${COMMON_DEPEND}
- virtual/mta
- fpm? (
- selinux? ( sec-policy/selinux-phpfpm )
- systemd? ( sys-apps/systemd ) )"
-
-# Bison isn't actually needed when building from a release tarball
-# However, the configure script will warn if it's absent or if you
-# have an incompatible version installed. See bug 593278.
-DEPEND="${COMMON_DEPEND}
- app-arch/xz-utils
- >=sys-devel/bison-3.0.1"
-
-BDEPEND="virtual/pkgconfig"
-
-PHP_MV="$(ver_cut 1)"
-
-PATCHES=( "${FILESDIR}/php-iodbc-header-location.patch" )
-
-php_install_ini() {
- local phpsapi="${1}"
-
- # work out where we are installing the ini file
- php_set_ini_dir "${phpsapi}"
-
- # Always install the production INI file, bug 611214.
- local phpinisrc="php.ini-production-${phpsapi}"
- cp php.ini-production "${phpinisrc}" || die
-
- # default to /tmp for save_path, bug #282768
- sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}" || die
-
- # Set the extension dir
- sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" \
- -i "${phpinisrc}" || die
-
- # Set the include path to point to where we want to find PEAR packages
- sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}" || die
-
- insinto "${PHP_INI_DIR#${EPREFIX}}"
- newins "${phpinisrc}" php.ini
-
- elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}"
- elog
-
- dodir "${PHP_EXT_INI_DIR#${EPREFIX}}"
- dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}"
-
- if use opcache; then
- elog "Adding opcache to $PHP_EXT_INI_DIR"
- echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> \
- "${D}/${PHP_EXT_INI_DIR}"/opcache.ini
- dosym "../ext/opcache.ini" \
- "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/opcache.ini"
- fi
-
- # SAPI-specific handling
- if [[ "${sapi}" == "fpm" ]] ; then
- einfo "Installing FPM config files php-fpm.conf and www.conf"
- insinto "${PHP_INI_DIR#${EPREFIX}}"
- doins sapi/fpm/php-fpm.conf
- insinto "${PHP_INI_DIR#${EPREFIX}}/fpm.d"
- doins sapi/fpm/www.conf
- fi
-
- dodoc php.ini-{development,production}
-}
-
-php_set_ini_dir() {
- PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}"
- PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext"
- PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active"
-}
-
-src_prepare() {
- default
-
- # In php-7.x, the FPM pool configuration files have been split off
- # of the main config. By default the pool config files go in
- # e.g. /etc/php-fpm.d, which isn't slotted. So here we move the
- # include directory to a subdirectory "fpm.d" of $PHP_INI_DIR. Later
- # we'll install the pool configuration file "www.conf" there.
- php_set_ini_dir fpm
- sed -i "s~^include=.*$~include=${PHP_INI_DIR}/fpm.d/*.conf~" \
- sapi/fpm/php-fpm.conf.in \
- || die 'failed to move the include directory in php-fpm.conf'
-
- # Emulate buildconf to support cross-compilation
- rm -fr aclocal.m4 autom4te.cache config.cache \
- configure main/php_config.h.in || die
- eautoconf --force
- eautoheader
-}
-
-src_configure() {
- addpredict /usr/share/snmp/mibs/.index #nowarn
- addpredict /var/lib/net-snmp/mib_indexes #nowarn
-
- PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}"
-
- # The php-fpm config file wants localstatedir to be ${EPREFIX}/var
- # and not the Gentoo default ${EPREFIX}/var/lib. See bug 572002.
- local our_conf=(
- --prefix="${PHP_DESTDIR}"
- --mandir="${PHP_DESTDIR}/man"
- --infodir="${PHP_DESTDIR}/info"
- --libdir="${PHP_DESTDIR}/lib"
- --with-libdir="$(get_libdir)"
- --localstatedir="${EPREFIX}/var"
- --without-pear
- $(use_enable threads maintainer-zts)
- )
-
- our_conf+=(
- $(use_with argon2 password-argon2 "${EPREFIX}/usr")
- $(use_enable bcmath)
- $(use_with bzip2 bz2 "${EPREFIX}/usr")
- $(use_enable calendar)
- $(use_enable coverage gcov)
- $(use_enable ctype)
- $(use_with curl)
- $(use_enable xml dom)
- $(use_with enchant)
- $(use_enable exif)
- $(use_with ffi)
- $(use_enable fileinfo)
- $(use_enable filter)
- $(use_enable ftp)
- $(use_with nls gettext "${EPREFIX}/usr")
- $(use_with gmp gmp "${EPREFIX}/usr")
- $(use_with mhash mhash "${EPREFIX}/usr")
- $(use_with iconv iconv \
- $(use elibc_glibc || use elibc_musl || use elibc_FreeBSD || echo "${EPREFIX}/usr"))
- $(use_enable intl)
- $(use_enable ipv6)
- $(use_enable json)
- $(use_with kerberos)
- $(use_with xml libxml)
- $(use_enable unicode mbstring)
- $(use_with ssl openssl)
- $(use_enable pcntl)
- $(use_enable phar)
- $(use_enable pdo)
- $(use_enable opcache)
- $(use_with postgres pgsql "${EPREFIX}/usr")
- $(use_enable posix)
- $(use_with spell pspell "${EPREFIX}/usr")
- $(use_enable simplexml)
- $(use_enable sharedmem shmop)
- $(use_with snmp snmp "${EPREFIX}/usr")
- $(use_enable soap)
- $(use_enable sockets)
- $(use_with sodium)
- $(use_with sqlite sqlite3)
- $(use_enable sysvipc sysvmsg)
- $(use_enable sysvipc sysvsem)
- $(use_enable sysvipc sysvshm)
- $(use_with tidy tidy "${EPREFIX}/usr")
- $(use_enable tokenizer)
- $(use_enable xml)
- $(use_enable xmlreader)
- $(use_enable xmlwriter)
- $(use_with xmlrpc)
- $(use_with xslt xsl)
- $(use_with zip)
- $(use_with zlib zlib "${EPREFIX}/usr")
- $(use_enable debug)
- )
-
- # DBA support
- if use cdb || use berkdb || use flatfile || use gdbm || use inifile \
- || use qdbm || use lmdb || use tokyocabinet ; then
- our_conf+=( "--enable-dba" )
- fi
-
- # DBA drivers support
- our_conf+=(
- $(use_with cdb)
- $(use_with berkdb db4 "${EPREFIX}/usr")
- $(use_enable flatfile)
- $(use_with gdbm gdbm "${EPREFIX}/usr")
- $(use_enable inifile)
- $(use_with qdbm qdbm "${EPREFIX}/usr")
- $(use_with tokyocabinet tcadb "${EPREFIX}/usr")
- $(use_with lmdb lmdb "${EPREFIX}/usr")
- )
-
- # Support for the GD graphics library
- our_conf+=(
- $(use_with truetype freetype)
- $(use_enable cjk gd-jis-conv)
- $(use_with gd jpeg)
- $(use_with xpm)
- $(use_with webp)
- )
- # enable gd last, so configure can pick up the previous settings
- our_conf+=( $(use_enable gd) )
-
- # IMAP support
- if use imap ; then
- our_conf+=(
- $(use_with imap imap "${EPREFIX}/usr")
- $(use_with ssl imap-ssl "${EPREFIX}/usr")
- )
- fi
-
- # LDAP support
- if use ldap ; then
- our_conf+=(
- $(use_with ldap ldap "${EPREFIX}/usr")
- $(use_with ldap-sasl)
- )
- fi
-
- # MySQL support
- local mysqllib="mysqlnd"
- local mysqlilib="mysqlnd"
-
- our_conf+=( $(use_with mysqli mysqli "${mysqlilib}") )
-
- local mysqlsock="${EPREFIX}/var/run/mysqld/mysqld.sock"
- if use mysql || use mysqli ; then
- our_conf+=( $(use_with mysql mysql-sock "${mysqlsock}") )
- fi
-
- # ODBC support
- if use odbc && use iodbc ; then
- our_conf+=(
- --without-unixODBC
- --with-iodbc
- $(use_with pdo pdo-odbc "iODBC,${EPREFIX}/usr")
- )
- elif use odbc ; then
- our_conf+=(
- --with-unixODBC="${EPREFIX}/usr"
- --without-iodbc
- $(use_with pdo pdo-odbc "unixODBC,${EPREFIX}/usr")
- )
- else
- our_conf+=(
- --without-unixODBC
- --without-iodbc
- --without-pdo-odbc
- )
- fi
-
- # Oracle support
- our_conf+=( $(use_with oci8-instant-client oci8) )
-
- # PDO support
- if use pdo ; then
- our_conf+=(
- $(use_with mssql pdo-dblib "${EPREFIX}/usr")
- $(use_with mysql pdo-mysql "${mysqllib}")
- $(use_with postgres pdo-pgsql)
- $(use_with sqlite pdo-sqlite)
- $(use_with firebird pdo-firebird "${EPREFIX}/usr")
- $(use_with oci8-instant-client pdo-oci)
- )
- fi
-
- # readline/libedit support
- our_conf+=(
- $(use_with readline readline "${EPREFIX}/usr")
- $(use_with libedit)
- )
-
- # Session support
- if use session ; then
- our_conf+=( $(use_with session-mm mm "${EPREFIX}/usr") )
- else
- our_conf+=( $(use_enable session) )
- fi
-
- # Use pic for shared modules such as apache2's mod_php
- our_conf+=( --with-pic )
-
- # we use the system copy of pcre
- # --with-external-pcre affects ext/pcre
- # Many arches don't support pcre-jit
- our_conf+=(
- --with-external-pcre
- --without-pcre-jit
- )
-
- # Catch CFLAGS problems
- # Fixes bug #14067.
- # Changed order to run it in reverse for bug #32022 and #12021.
- replace-cpu-flags "k6*" "i586"
-
- # Cache the ./configure test results between SAPIs.
- our_conf+=( --cache-file="${T}/config.cache" )
-
- # Support user-passed configuration parameters
- our_conf+=( ${EXTRA_ECONF:-} )
-
- # Support the Apache2 extras, they must be set globally for all
- # SAPIs to work correctly, especially for external PHP extensions
-
- local one_sapi
- local sapi
- mkdir -p "${WORKDIR}/sapis-build" || die
- for one_sapi in $SAPIS ; do
- use "${one_sapi}" || continue
- php_set_ini_dir "${one_sapi}"
-
- # The BUILD_DIR variable is used to determine where to output
- # the files that autotools creates. This was all originally
- # based on the autotools-utils eclass.
- BUILD_DIR="${WORKDIR}/sapis-build/${one_sapi}"
- cp -a "${S}" "${BUILD_DIR}" || die
- cd "${BUILD_DIR}" || die
-
- local sapi_conf=(
- --with-config-file-path="${PHP_INI_DIR}"
- --with-config-file-scan-dir="${PHP_EXT_INI_DIR_ACTIVE}"
- )
-
- for sapi in $SAPIS ; do
- case "$sapi" in
- cli|cgi|embed|fpm|phpdbg)
- if [[ "${one_sapi}" == "${sapi}" ]] ; then
- sapi_conf+=( "--enable-${sapi}" )
- if [[ "fpm" == "${sapi}" ]] ; then
- sapi_conf+=(
- $(use_with acl fpm-acl)
- $(use_with systemd fpm-systemd)
- )
- fi
- else
- sapi_conf+=( "--disable-${sapi}" )
- fi
- ;;
-
- apache2)
- if [[ "${one_sapi}" == "${sapi}" ]] ; then
- sapi_conf+=( --with-apxs2="${EPREFIX}/usr/bin/apxs" )
- else
- sapi_conf+=( --without-apxs2 )
- fi
- ;;
- esac
- done
-
- # Construct the $myeconfargs array by concatenating $our_conf
- # (the common args) and $sapi_conf (the SAPI-specific args).
- local myeconfargs=( "${our_conf[@]}" )
- myeconfargs+=( "${sapi_conf[@]}" )
-
- pushd "${BUILD_DIR}" > /dev/null || die
- econf "${myeconfargs[@]}"
- popd > /dev/null || die
- done
-}
-
-src_compile() {
- # snmp seems to run during src_compile, too (bug #324739)
- addpredict /usr/share/snmp/mibs/.index #nowarn
- addpredict /var/lib/net-snmp/mib_indexes #nowarn
-
- local sapi
- for sapi in ${SAPIS} ; do
- if use "${sapi}"; then
- cd "${WORKDIR}/sapis-build/$sapi" || \
- die "Failed to change dir to ${WORKDIR}/sapis-build/$1"
- emake
- fi
- done
-}
-
-src_install() {
- # see bug #324739 for what happens when we don't have that
- addpredict /usr/share/snmp/mibs/.index #nowarn
-
- # grab the first SAPI that got built and install common files from there
- local first_sapi="", sapi=""
- for sapi in $SAPIS ; do
- if use $sapi ; then
- first_sapi=$sapi
- break
- fi
- done
-
- # Makefile forgets to create this before trying to write to it...
- dodir "${PHP_DESTDIR#${EPREFIX}}/bin"
-
- # Install php environment (without any sapis)
- cd "${WORKDIR}/sapis-build/$first_sapi" || die
- emake INSTALL_ROOT="${D}" \
- install-build install-headers install-programs
-
- local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)"
-
- # Create the directory where we'll put version-specific php scripts
- keepdir "/usr/share/php${PHP_MV}"
-
- local file=""
- local sapi_list=""
-
- for sapi in ${SAPIS}; do
- if use "${sapi}" ; then
- einfo "Installing SAPI: ${sapi}"
- cd "${WORKDIR}/sapis-build/${sapi}" || die
-
- if [[ "${sapi}" == "apache2" ]] ; then
- # We're specifically not using emake install-sapi as libtool
- # may cause unnecessary relink failures (see bug #351266)
- insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/"
- newins ".libs/libphp${PHP_MV}$(get_libname)" \
- "libphp${PHP_MV}$(get_libname)"
- keepdir "/usr/$(get_libdir)/apache2/modules"
- else
- # needed each time, php_install_ini would reset it
- local dest="${PHP_DESTDIR#${EPREFIX}}"
- into "${dest}"
- case "$sapi" in
- cli)
- source="sapi/cli/php"
- # Install the "phar" archive utility.
- if use phar ; then
- emake INSTALL_ROOT="${D}" install-pharcmd
- dosym "..${dest#/usr}/bin/phar" "/usr/bin/phar${SLOT}"
- fi
- ;;
- cgi)
- source="sapi/cgi/php-cgi"
- ;;
- fpm)
- source="sapi/fpm/php-fpm"
- ;;
- embed)
- source="libs/libphp${PHP_MV}$(get_libname)"
- ;;
- phpdbg)
- source="sapi/phpdbg/phpdbg"
- ;;
- *)
- die "unhandled sapi in src_install"
- ;;
- esac
-
- if [[ "${source}" == *"$(get_libname)" ]]; then
- dolib.so "${source}"
- else
- dobin "${source}"
- local name="$(basename ${source})"
- dosym "..${dest#/usr}/bin/${name}" "/usr/bin/${name}${SLOT}"
- fi
- fi
-
- php_install_ini "${sapi}"
-
- # construct correct SAPI string for php-config
- # thanks to ferringb for the bash voodoo
- if [[ "${sapi}" == "apache2" ]]; then
- sapi_list="${sapi_list:+${sapi_list} }apache2handler"
- else
- sapi_list="${sapi_list:+${sapi_list} }${sapi}"
- fi
- fi
- done
-
- # Installing opcache module
- if use opcache ; then
- into "${PHP_DESTDIR#${EPREFIX}}"
- dolib.so "modules/opcache$(get_libname)"
- fi
-
- # Install env.d files
- newenvd "${FILESDIR}/20php5-envd" "20php${SLOT}"
- sed -e "s|/lib/|/$(get_libdir)/|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
- sed -e "s|php5|php${SLOT}|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
-
- # set php-config variable correctly (bug #278439)
- sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \
- "${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config" || die
-
- if use fpm ; then
- if use systemd; then
- systemd_newunit "${FILESDIR}/php-fpm_at.service" \
- "php-fpm@${SLOT}.service"
- else
- systemd_newunit "${FILESDIR}/php-fpm_at-simple.service" \
- "php-fpm@${SLOT}.service"
- fi
- fi
-}
-
-src_test() {
- echo ">>> Test phase [test]: ${CATEGORY}/${PF}"
- PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php"
- if [[ ! -x "${PHP_BIN}" ]] ; then
- ewarn "Test phase requires USE=cli, skipping"
- return
- else
- export TEST_PHP_EXECUTABLE="${PHP_BIN}"
- fi
-
- if [[ -x "${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi" ]] ; then
- export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi"
- fi
-
- if [[ -x "${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg" ]] ; then
- export TEST_PHPDBG_EXECUTABLE="${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg"
- fi
-
- REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n -d \
- "session.save_path=${T}" \
- "${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d \
- "session.save_path=${T}"
-
- for name in ${EXPECTED_TEST_FAILURES}; do
- mv "${name}.out" "${name}.out.orig" 2>/dev/null || die
- done
-
- local failed="$(find -name '*.out')"
- if [[ ${failed} != "" ]] ; then
- ewarn "The following test cases failed unexpectedly:"
- for name in ${failed}; do
- ewarn " ${name/.out/}"
- done
- else
- einfo "No unexpected test failures, all fine"
- fi
-
- if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then
- local passed=""
- for name in ${EXPECTED_TEST_FAILURES}; do
- [[ -f "${name}.diff" ]] && continue
- passed="${passed} ${name}"
- done
- if [[ ${passed} != "" ]] ; then
- einfo "The following test cases passed unexpectedly:"
- for name in ${passed}; do
- ewarn " ${passed}"
- done
- else
- einfo "None of the known-to-fail tests passed, all fine"
- fi
- fi
-}
-
-pkg_postinst() {
- # Output some general info to the user
- if use apache2 ; then
- elog
- elog "To enable PHP in apache, you will need to add \"-D PHP\" to"
- elog "your apache2 command. OpenRC users can append that string to"
- elog "APACHE2_OPTS in /etc/conf.d/apache2."
- elog
- elog "The apache module configuration file 70_mod_php.conf is"
- elog "provided (and maintained) by eselect-php."
- elog
- fi
-
- # Create the symlinks for php
- local m
- for m in ${SAPIS}; do
- [[ ${m} == 'embed' ]] && continue;
- if use $m ; then
- local ci=$(eselect php show $m)
- if [[ -z $ci ]]; then
- eselect php set $m php${SLOT} || die
- einfo "Switched ${m} to use php:${SLOT}"
- einfo
- elif [[ $ci != "php${SLOT}" ]] ; then
- elog "To switch $m to use php:${SLOT}, run"
- elog " eselect php set $m php${SLOT}"
- elog
- fi
- fi
- done
-
- # Remove dead symlinks for SAPIs that were just disabled. For
- # example, if the user has the cgi SAPI enabled, then he has an
- # eselect-php symlink for it. If he later reinstalls PHP with
- # USE="-cgi", that symlink will break. This call to eselect is
- # supposed to remove that dead link per bug 572436.
- eselect php cleanup || die
-
- if ! has "php${SLOT/./-}" ${PHP_TARGETS}; then
- elog "To build extensions for this version of PHP, you will need to"
- elog "add php${SLOT/./-} to your PHP_TARGETS USE_EXPAND variable."
- elog
- fi
-
- # Warn about the removal of PHP_INI_VERSION if the user has it set.
- if [[ -n "${PHP_INI_VERSION}" ]]; then
- ewarn 'The PHP_INI_VERSION variable has been phased out. You may'
- ewarn 'remove it from your configuration at your convenience. See'
- ewarn
- ewarn ' https://bugs.gentoo.org/611214'
- ewarn
- ewarn 'for more information.'
- fi
-
- elog "For details on how version slotting works, please see"
- elog "the wiki:"
- elog
- elog " https://wiki.gentoo.org/wiki/PHP"
- elog
-}
-
-pkg_postrm() {
- # This serves two purposes. First, if we have just removed the last
- # installed version of PHP, then this will remove any dead symlinks
- # belonging to eselect-php. Second, if a user upgrades slots from
- # (say) 5.6 to 7.0 and depcleans the old slot, then this will update
- # his existing symlinks to point to the new 7.0 installation. The
- # latter is bug 432962.
- #
- # Note: the eselect-php package may not be installed at this point,
- # so we can't die() if this command fails.
- eselect php cleanup
-}
diff --git a/dev-lang/php/php-7.4.12.ebuild b/dev-lang/php/php-7.4.12.ebuild
deleted file mode 100644
index 3ac0d8c9ace3..000000000000
--- a/dev-lang/php/php-7.4.12.ebuild
+++ /dev/null
@@ -1,750 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-WANT_AUTOMAKE="none"
-
-inherit flag-o-matic systemd autotools
-
-MY_PV=${PV/_rc/RC}
-DESCRIPTION="The PHP language runtime engine"
-HOMEPAGE="https://www.php.net/"
-SRC_URI="https://www.php.net/distributions/${P}.tar.xz"
-
-LICENSE="PHP-3.01
- BSD
- Zend-2.0
- bcmath? ( LGPL-2.1+ )
- fpm? ( BSD-2 )
- gd? ( gd )
- unicode? ( BSD-2 LGPL-2.1 )"
-
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-# We can build the following SAPIs in the given order
-SAPIS="embed cli cgi fpm apache2 phpdbg"
-
-# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
-IUSE="${IUSE}
- ${SAPIS/cli/+cli}
- threads"
-
-IUSE="${IUSE} acl argon2 bcmath berkdb bzip2 calendar cdb cjk
- coverage +ctype curl debug
- enchant exif ffi +fileinfo +filter firebird
- +flatfile ftp gd gdbm gmp +iconv imap inifile
- intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit libressl lmdb
- mhash mssql mysql mysqli nls
- oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm
- readline selinux +session session-mm sharedmem
- +simplexml snmp soap sockets sodium spell sqlite ssl
- sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode webp
- +xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib"
-
-# Without USE=readline or libedit, the interactive "php -a" CLI will hang.
-REQUIRED_USE="
- || ( cli cgi fpm apache2 embed phpdbg )
- cli? ( ^^ ( readline libedit ) )
- !cli? ( ?? ( readline libedit ) )
- truetype? ( gd zlib )
- webp? ( gd zlib )
- cjk? ( gd zlib )
- exif? ( gd zlib )
- xpm? ( gd zlib )
- gd? ( zlib )
- simplexml? ( xml )
- soap? ( xml )
- xmlrpc? ( xml iconv )
- xmlreader? ( xml )
- xmlwriter? ( xml )
- xslt? ( xml )
- ldap-sasl? ( ldap )
- qdbm? ( !gdbm )
- session-mm? ( session !threads )
- mysql? ( || ( mysqli pdo ) )
- firebird? ( pdo )
- mssql? ( pdo )
-"
-
-RESTRICT="!test? ( test )"
-
-# The supported (that is, autodetected) versions of BDB are listed in
-# the ./configure script. Other versions *work*, but we need to stick to
-# the ones that can be detected to avoid a repeat of bug #564824.
-COMMON_DEPEND="
- >=app-eselect/eselect-php-0.9.1[apache2?,fpm?]
- >=dev-libs/libpcre2-10.30[unicode]
- fpm? ( acl? ( sys-apps/acl ) )
- apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] )
- argon2? ( app-crypt/argon2:= )
- berkdb? ( || ( sys-libs/db:5.3
- sys-libs/db:5.1
- sys-libs/db:4.8
- sys-libs/db:4.7
- sys-libs/db:4.6
- sys-libs/db:4.5 ) )
- bzip2? ( app-arch/bzip2:0= )
- cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
- coverage? ( dev-util/lcov )
- curl? ( >=net-misc/curl-7.10.5 )
- enchant? ( =dev-libs/libffi-3.0.11 )
- firebird? ( dev-db/firebird )
- gd? ( >=virtual/jpeg-0-r3:0 media-libs/libpng:0= )
- gdbm? ( >=sys-libs/gdbm-1.8.0:0= )
- gmp? ( dev-libs/gmp:0= )
- iconv? ( virtual/libiconv )
- imap? ( >=virtual/imap-c-client-2[kerberos=,ssl=] )
- intl? ( dev-libs/icu:= )
- kerberos? ( virtual/krb5 )
- ldap? ( >=net-nds/openldap-1.2.11 )
- ldap-sasl? ( dev-libs/cyrus-sasl )
- libedit? ( dev-libs/libedit )
- lmdb? ( dev-db/lmdb:= )
- mssql? ( dev-db/freetds[mssql] )
- nls? ( sys-devel/gettext )
- oci8-instant-client? ( dev-db/oracle-instantclient-basic )
- odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( >=dev-db/unixODBC-1.8.13 ) )
- postgres? ( dev-db/postgresql:* )
- qdbm? ( dev-db/qdbm )
- readline? ( sys-libs/readline:0= )
- session-mm? ( dev-libs/mm )
- snmp? ( >=net-analyzer/net-snmp-5.2 )
- sodium? ( dev-libs/libsodium:= )
- spell? ( >=app-text/aspell-0.50 )
- sqlite? ( >=dev-db/sqlite-3.7.6.3 )
- ssl? (
- !libressl? ( >=dev-libs/openssl-1.0.1:0= )
- libressl? ( dev-libs/libressl:0= )
- )
- tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) )
- tokyocabinet? ( dev-db/tokyocabinet )
- truetype? ( =media-libs/freetype-2* )
- unicode? ( dev-libs/oniguruma:= )
- webp? ( media-libs/libwebp:0= )
- xml? ( >=dev-libs/libxml2-2.7.6 )
- xpm? ( x11-libs/libXpm )
- xslt? ( dev-libs/libxslt )
- zip? ( >=dev-libs/libzip-1.2.0:= )
- zlib? ( >=sys-libs/zlib-1.2.0.4:0= )
-"
-
-RDEPEND="${COMMON_DEPEND}
- virtual/mta
- fpm? (
- selinux? ( sec-policy/selinux-phpfpm )
- systemd? ( sys-apps/systemd ) )"
-
-# Bison isn't actually needed when building from a release tarball
-# However, the configure script will warn if it's absent or if you
-# have an incompatible version installed. See bug 593278.
-DEPEND="${COMMON_DEPEND}
- app-arch/xz-utils
- >=sys-devel/bison-3.0.1"
-
-BDEPEND="virtual/pkgconfig"
-
-PHP_MV="$(ver_cut 1)"
-
-PATCHES=( "${FILESDIR}/php-iodbc-header-location.patch" )
-
-php_install_ini() {
- local phpsapi="${1}"
-
- # work out where we are installing the ini file
- php_set_ini_dir "${phpsapi}"
-
- # Always install the production INI file, bug 611214.
- local phpinisrc="php.ini-production-${phpsapi}"
- cp php.ini-production "${phpinisrc}" || die
-
- # default to /tmp for save_path, bug #282768
- sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}" || die
-
- # Set the extension dir
- sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" \
- -i "${phpinisrc}" || die
-
- # Set the include path to point to where we want to find PEAR packages
- sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}" || die
-
- insinto "${PHP_INI_DIR#${EPREFIX}}"
- newins "${phpinisrc}" php.ini
-
- elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}"
- elog
-
- dodir "${PHP_EXT_INI_DIR#${EPREFIX}}"
- dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}"
-
- if use opcache; then
- elog "Adding opcache to $PHP_EXT_INI_DIR"
- echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> \
- "${D}/${PHP_EXT_INI_DIR}"/opcache.ini
- dosym "../ext/opcache.ini" \
- "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/opcache.ini"
- fi
-
- # SAPI-specific handling
- if [[ "${sapi}" == "fpm" ]] ; then
- einfo "Installing FPM config files php-fpm.conf and www.conf"
- insinto "${PHP_INI_DIR#${EPREFIX}}"
- doins sapi/fpm/php-fpm.conf
- insinto "${PHP_INI_DIR#${EPREFIX}}/fpm.d"
- doins sapi/fpm/www.conf
- fi
-
- dodoc php.ini-{development,production}
-}
-
-php_set_ini_dir() {
- PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}"
- PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext"
- PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active"
-}
-
-src_prepare() {
- default
-
- # In php-7.x, the FPM pool configuration files have been split off
- # of the main config. By default the pool config files go in
- # e.g. /etc/php-fpm.d, which isn't slotted. So here we move the
- # include directory to a subdirectory "fpm.d" of $PHP_INI_DIR. Later
- # we'll install the pool configuration file "www.conf" there.
- php_set_ini_dir fpm
- sed -i "s~^include=.*$~include=${PHP_INI_DIR}/fpm.d/*.conf~" \
- sapi/fpm/php-fpm.conf.in \
- || die 'failed to move the include directory in php-fpm.conf'
-
- # Emulate buildconf to support cross-compilation
- rm -fr aclocal.m4 autom4te.cache config.cache \
- configure main/php_config.h.in || die
- eautoconf --force
- eautoheader
-}
-
-src_configure() {
- addpredict /usr/share/snmp/mibs/.index #nowarn
- addpredict /var/lib/net-snmp/mib_indexes #nowarn
-
- PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}"
-
- # The php-fpm config file wants localstatedir to be ${EPREFIX}/var
- # and not the Gentoo default ${EPREFIX}/var/lib. See bug 572002.
- local our_conf=(
- --prefix="${PHP_DESTDIR}"
- --mandir="${PHP_DESTDIR}/man"
- --infodir="${PHP_DESTDIR}/info"
- --libdir="${PHP_DESTDIR}/lib"
- --with-libdir="$(get_libdir)"
- --localstatedir="${EPREFIX}/var"
- --without-pear
- $(use_enable threads maintainer-zts)
- )
-
- our_conf+=(
- $(use_with argon2 password-argon2 "${EPREFIX}/usr")
- $(use_enable bcmath)
- $(use_with bzip2 bz2 "${EPREFIX}/usr")
- $(use_enable calendar)
- $(use_enable coverage gcov)
- $(use_enable ctype)
- $(use_with curl)
- $(use_enable xml dom)
- $(use_with enchant)
- $(use_enable exif)
- $(use_with ffi)
- $(use_enable fileinfo)
- $(use_enable filter)
- $(use_enable ftp)
- $(use_with nls gettext "${EPREFIX}/usr")
- $(use_with gmp gmp "${EPREFIX}/usr")
- $(use_with mhash mhash "${EPREFIX}/usr")
- $(use_with iconv iconv \
- $(use elibc_glibc || use elibc_musl || use elibc_FreeBSD || echo "${EPREFIX}/usr"))
- $(use_enable intl)
- $(use_enable ipv6)
- $(use_enable json)
- $(use_with kerberos)
- $(use_with xml libxml)
- $(use_enable unicode mbstring)
- $(use_with ssl openssl)
- $(use_enable pcntl)
- $(use_enable phar)
- $(use_enable pdo)
- $(use_enable opcache)
- $(use_with postgres pgsql "${EPREFIX}/usr")
- $(use_enable posix)
- $(use_with spell pspell "${EPREFIX}/usr")
- $(use_enable simplexml)
- $(use_enable sharedmem shmop)
- $(use_with snmp snmp "${EPREFIX}/usr")
- $(use_enable soap)
- $(use_enable sockets)
- $(use_with sodium)
- $(use_with sqlite sqlite3)
- $(use_enable sysvipc sysvmsg)
- $(use_enable sysvipc sysvsem)
- $(use_enable sysvipc sysvshm)
- $(use_with tidy tidy "${EPREFIX}/usr")
- $(use_enable tokenizer)
- $(use_enable xml)
- $(use_enable xmlreader)
- $(use_enable xmlwriter)
- $(use_with xmlrpc)
- $(use_with xslt xsl)
- $(use_with zip)
- $(use_with zlib zlib "${EPREFIX}/usr")
- $(use_enable debug)
- )
-
- # DBA support
- if use cdb || use berkdb || use flatfile || use gdbm || use inifile \
- || use qdbm || use lmdb || use tokyocabinet ; then
- our_conf+=( "--enable-dba" )
- fi
-
- # DBA drivers support
- our_conf+=(
- $(use_with cdb)
- $(use_with berkdb db4 "${EPREFIX}/usr")
- $(use_enable flatfile)
- $(use_with gdbm gdbm "${EPREFIX}/usr")
- $(use_enable inifile)
- $(use_with qdbm qdbm "${EPREFIX}/usr")
- $(use_with tokyocabinet tcadb "${EPREFIX}/usr")
- $(use_with lmdb lmdb "${EPREFIX}/usr")
- )
-
- # Support for the GD graphics library
- our_conf+=(
- $(use_with truetype freetype)
- $(use_enable cjk gd-jis-conv)
- $(use_with gd jpeg)
- $(use_with xpm)
- $(use_with webp)
- )
- # enable gd last, so configure can pick up the previous settings
- our_conf+=( $(use_enable gd) )
-
- # IMAP support
- if use imap ; then
- our_conf+=(
- $(use_with imap imap "${EPREFIX}/usr")
- $(use_with ssl imap-ssl "${EPREFIX}/usr")
- )
- fi
-
- # LDAP support
- if use ldap ; then
- our_conf+=(
- $(use_with ldap ldap "${EPREFIX}/usr")
- $(use_with ldap-sasl)
- )
- fi
-
- # MySQL support
- local mysqllib="mysqlnd"
- local mysqlilib="mysqlnd"
-
- our_conf+=( $(use_with mysqli mysqli "${mysqlilib}") )
-
- local mysqlsock="${EPREFIX}/var/run/mysqld/mysqld.sock"
- if use mysql || use mysqli ; then
- our_conf+=( $(use_with mysql mysql-sock "${mysqlsock}") )
- fi
-
- # ODBC support
- if use odbc && use iodbc ; then
- our_conf+=(
- --without-unixODBC
- --with-iodbc
- $(use_with pdo pdo-odbc "iODBC,${EPREFIX}/usr")
- )
- elif use odbc ; then
- our_conf+=(
- --with-unixODBC="${EPREFIX}/usr"
- --without-iodbc
- $(use_with pdo pdo-odbc "unixODBC,${EPREFIX}/usr")
- )
- else
- our_conf+=(
- --without-unixODBC
- --without-iodbc
- --without-pdo-odbc
- )
- fi
-
- # Oracle support
- our_conf+=( $(use_with oci8-instant-client oci8) )
-
- # PDO support
- if use pdo ; then
- our_conf+=(
- $(use_with mssql pdo-dblib "${EPREFIX}/usr")
- $(use_with mysql pdo-mysql "${mysqllib}")
- $(use_with postgres pdo-pgsql)
- $(use_with sqlite pdo-sqlite)
- $(use_with firebird pdo-firebird "${EPREFIX}/usr")
- $(use_with oci8-instant-client pdo-oci)
- )
- fi
-
- # readline/libedit support
- our_conf+=(
- $(use_with readline readline "${EPREFIX}/usr")
- $(use_with libedit)
- )
-
- # Session support
- if use session ; then
- our_conf+=( $(use_with session-mm mm "${EPREFIX}/usr") )
- else
- our_conf+=( $(use_enable session) )
- fi
-
- # Use pic for shared modules such as apache2's mod_php
- our_conf+=( --with-pic )
-
- # we use the system copy of pcre
- # --with-external-pcre affects ext/pcre
- # Many arches don't support pcre-jit
- our_conf+=(
- --with-external-pcre
- --without-pcre-jit
- )
-
- # Catch CFLAGS problems
- # Fixes bug #14067.
- # Changed order to run it in reverse for bug #32022 and #12021.
- replace-cpu-flags "k6*" "i586"
-
- # Cache the ./configure test results between SAPIs.
- our_conf+=( --cache-file="${T}/config.cache" )
-
- # Support user-passed configuration parameters
- our_conf+=( ${EXTRA_ECONF:-} )
-
- # Support the Apache2 extras, they must be set globally for all
- # SAPIs to work correctly, especially for external PHP extensions
-
- local one_sapi
- local sapi
- mkdir -p "${WORKDIR}/sapis-build" || die
- for one_sapi in $SAPIS ; do
- use "${one_sapi}" || continue
- php_set_ini_dir "${one_sapi}"
-
- # The BUILD_DIR variable is used to determine where to output
- # the files that autotools creates. This was all originally
- # based on the autotools-utils eclass.
- BUILD_DIR="${WORKDIR}/sapis-build/${one_sapi}"
- cp -a "${S}" "${BUILD_DIR}" || die
- cd "${BUILD_DIR}" || die
-
- local sapi_conf=(
- --with-config-file-path="${PHP_INI_DIR}"
- --with-config-file-scan-dir="${PHP_EXT_INI_DIR_ACTIVE}"
- )
-
- for sapi in $SAPIS ; do
- case "$sapi" in
- cli|cgi|embed|fpm|phpdbg)
- if [[ "${one_sapi}" == "${sapi}" ]] ; then
- sapi_conf+=( "--enable-${sapi}" )
- if [[ "fpm" == "${sapi}" ]] ; then
- sapi_conf+=(
- $(use_with acl fpm-acl)
- $(use_with systemd fpm-systemd)
- )
- fi
- else
- sapi_conf+=( "--disable-${sapi}" )
- fi
- ;;
-
- apache2)
- if [[ "${one_sapi}" == "${sapi}" ]] ; then
- sapi_conf+=( --with-apxs2="${EPREFIX}/usr/bin/apxs" )
- else
- sapi_conf+=( --without-apxs2 )
- fi
- ;;
- esac
- done
-
- # Construct the $myeconfargs array by concatenating $our_conf
- # (the common args) and $sapi_conf (the SAPI-specific args).
- local myeconfargs=( "${our_conf[@]}" )
- myeconfargs+=( "${sapi_conf[@]}" )
-
- pushd "${BUILD_DIR}" > /dev/null || die
- econf "${myeconfargs[@]}"
- popd > /dev/null || die
- done
-}
-
-src_compile() {
- # snmp seems to run during src_compile, too (bug #324739)
- addpredict /usr/share/snmp/mibs/.index #nowarn
- addpredict /var/lib/net-snmp/mib_indexes #nowarn
-
- local sapi
- for sapi in ${SAPIS} ; do
- if use "${sapi}"; then
- cd "${WORKDIR}/sapis-build/$sapi" || \
- die "Failed to change dir to ${WORKDIR}/sapis-build/$1"
- emake
- fi
- done
-}
-
-src_install() {
- # see bug #324739 for what happens when we don't have that
- addpredict /usr/share/snmp/mibs/.index #nowarn
-
- # grab the first SAPI that got built and install common files from there
- local first_sapi="", sapi=""
- for sapi in $SAPIS ; do
- if use $sapi ; then
- first_sapi=$sapi
- break
- fi
- done
-
- # Makefile forgets to create this before trying to write to it...
- dodir "${PHP_DESTDIR#${EPREFIX}}/bin"
-
- # Install php environment (without any sapis)
- cd "${WORKDIR}/sapis-build/$first_sapi" || die
- emake INSTALL_ROOT="${D}" \
- install-build install-headers install-programs
-
- local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)"
-
- # Create the directory where we'll put version-specific php scripts
- keepdir "/usr/share/php${PHP_MV}"
-
- local file=""
- local sapi_list=""
-
- for sapi in ${SAPIS}; do
- if use "${sapi}" ; then
- einfo "Installing SAPI: ${sapi}"
- cd "${WORKDIR}/sapis-build/${sapi}" || die
-
- if [[ "${sapi}" == "apache2" ]] ; then
- # We're specifically not using emake install-sapi as libtool
- # may cause unnecessary relink failures (see bug #351266)
- insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/"
- newins ".libs/libphp${PHP_MV}$(get_libname)" \
- "libphp${PHP_MV}$(get_libname)"
- keepdir "/usr/$(get_libdir)/apache2/modules"
- else
- # needed each time, php_install_ini would reset it
- local dest="${PHP_DESTDIR#${EPREFIX}}"
- into "${dest}"
- case "$sapi" in
- cli)
- source="sapi/cli/php"
- # Install the "phar" archive utility.
- if use phar ; then
- emake INSTALL_ROOT="${D}" install-pharcmd
- dosym "..${dest#/usr}/bin/phar" "/usr/bin/phar${SLOT}"
- fi
- ;;
- cgi)
- source="sapi/cgi/php-cgi"
- ;;
- fpm)
- source="sapi/fpm/php-fpm"
- ;;
- embed)
- source="libs/libphp${PHP_MV}$(get_libname)"
- ;;
- phpdbg)
- source="sapi/phpdbg/phpdbg"
- ;;
- *)
- die "unhandled sapi in src_install"
- ;;
- esac
-
- if [[ "${source}" == *"$(get_libname)" ]]; then
- dolib.so "${source}"
- else
- dobin "${source}"
- local name="$(basename ${source})"
- dosym "..${dest#/usr}/bin/${name}" "/usr/bin/${name}${SLOT}"
- fi
- fi
-
- php_install_ini "${sapi}"
-
- # construct correct SAPI string for php-config
- # thanks to ferringb for the bash voodoo
- if [[ "${sapi}" == "apache2" ]]; then
- sapi_list="${sapi_list:+${sapi_list} }apache2handler"
- else
- sapi_list="${sapi_list:+${sapi_list} }${sapi}"
- fi
- fi
- done
-
- # Installing opcache module
- if use opcache ; then
- into "${PHP_DESTDIR#${EPREFIX}}"
- dolib.so "modules/opcache$(get_libname)"
- fi
-
- # Install env.d files
- newenvd "${FILESDIR}/20php5-envd" "20php${SLOT}"
- sed -e "s|/lib/|/$(get_libdir)/|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
- sed -e "s|php5|php${SLOT}|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
-
- # set php-config variable correctly (bug #278439)
- sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \
- "${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config" || die
-
- if use fpm ; then
- if use systemd; then
- systemd_newunit "${FILESDIR}/php-fpm_at.service" \
- "php-fpm@${SLOT}.service"
- else
- systemd_newunit "${FILESDIR}/php-fpm_at-simple.service" \
- "php-fpm@${SLOT}.service"
- fi
- fi
-}
-
-src_test() {
- echo ">>> Test phase [test]: ${CATEGORY}/${PF}"
- PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php"
- if [[ ! -x "${PHP_BIN}" ]] ; then
- ewarn "Test phase requires USE=cli, skipping"
- return
- else
- export TEST_PHP_EXECUTABLE="${PHP_BIN}"
- fi
-
- if [[ -x "${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi" ]] ; then
- export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi"
- fi
-
- if [[ -x "${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg" ]] ; then
- export TEST_PHPDBG_EXECUTABLE="${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg"
- fi
-
- REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n -d \
- "session.save_path=${T}" \
- "${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d \
- "session.save_path=${T}"
-
- for name in ${EXPECTED_TEST_FAILURES}; do
- mv "${name}.out" "${name}.out.orig" 2>/dev/null || die
- done
-
- local failed="$(find -name '*.out')"
- if [[ ${failed} != "" ]] ; then
- ewarn "The following test cases failed unexpectedly:"
- for name in ${failed}; do
- ewarn " ${name/.out/}"
- done
- else
- einfo "No unexpected test failures, all fine"
- fi
-
- if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then
- local passed=""
- for name in ${EXPECTED_TEST_FAILURES}; do
- [[ -f "${name}.diff" ]] && continue
- passed="${passed} ${name}"
- done
- if [[ ${passed} != "" ]] ; then
- einfo "The following test cases passed unexpectedly:"
- for name in ${passed}; do
- ewarn " ${passed}"
- done
- else
- einfo "None of the known-to-fail tests passed, all fine"
- fi
- fi
-}
-
-pkg_postinst() {
- # Output some general info to the user
- if use apache2 ; then
- elog
- elog "To enable PHP in apache, you will need to add \"-D PHP\" to"
- elog "your apache2 command. OpenRC users can append that string to"
- elog "APACHE2_OPTS in /etc/conf.d/apache2."
- elog
- elog "The apache module configuration file 70_mod_php.conf is"
- elog "provided (and maintained) by eselect-php."
- elog
- fi
-
- # Create the symlinks for php
- local m
- for m in ${SAPIS}; do
- [[ ${m} == 'embed' ]] && continue;
- if use $m ; then
- local ci=$(eselect php show $m)
- if [[ -z $ci ]]; then
- eselect php set $m php${SLOT} || die
- einfo "Switched ${m} to use php:${SLOT}"
- einfo
- elif [[ $ci != "php${SLOT}" ]] ; then
- elog "To switch $m to use php:${SLOT}, run"
- elog " eselect php set $m php${SLOT}"
- elog
- fi
- fi
- done
-
- # Remove dead symlinks for SAPIs that were just disabled. For
- # example, if the user has the cgi SAPI enabled, then he has an
- # eselect-php symlink for it. If he later reinstalls PHP with
- # USE="-cgi", that symlink will break. This call to eselect is
- # supposed to remove that dead link per bug 572436.
- eselect php cleanup || die
-
- if ! has "php${SLOT/./-}" ${PHP_TARGETS}; then
- elog "To build extensions for this version of PHP, you will need to"
- elog "add php${SLOT/./-} to your PHP_TARGETS USE_EXPAND variable."
- elog
- fi
-
- # Warn about the removal of PHP_INI_VERSION if the user has it set.
- if [[ -n "${PHP_INI_VERSION}" ]]; then
- ewarn 'The PHP_INI_VERSION variable has been phased out. You may'
- ewarn 'remove it from your configuration at your convenience. See'
- ewarn
- ewarn ' https://bugs.gentoo.org/611214'
- ewarn
- ewarn 'for more information.'
- fi
-
- elog "For details on how version slotting works, please see"
- elog "the wiki:"
- elog
- elog " https://wiki.gentoo.org/wiki/PHP"
- elog
-}
-
-pkg_postrm() {
- # This serves two purposes. First, if we have just removed the last
- # installed version of PHP, then this will remove any dead symlinks
- # belonging to eselect-php. Second, if a user upgrades slots from
- # (say) 5.6 to 7.0 and depcleans the old slot, then this will update
- # his existing symlinks to point to the new 7.0 installation. The
- # latter is bug 432962.
- #
- # Note: the eselect-php package may not be installed at this point,
- # so we can't die() if this command fails.
- eselect php cleanup
-}
diff --git a/dev-lang/php/php-7.4.13.ebuild b/dev-lang/php/php-7.4.13.ebuild
index 7df313533ce8..0823cddd0b4f 100644
--- a/dev-lang/php/php-7.4.13.ebuild
+++ b/dev-lang/php/php-7.4.13.ebuild
@@ -21,7 +21,7 @@ LICENSE="PHP-3.01
unicode? ( BSD-2 LGPL-2.1 )"
SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
S="${WORKDIR}/${PN}-${MY_PV}"
diff --git a/dev-lang/php/php-7.4.9.ebuild b/dev-lang/php/php-7.4.9.ebuild
deleted file mode 100644
index de0cec9f7020..000000000000
--- a/dev-lang/php/php-7.4.9.ebuild
+++ /dev/null
@@ -1,750 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-WANT_AUTOMAKE="none"
-
-inherit flag-o-matic systemd autotools
-
-MY_PV=${PV/_rc/RC}
-DESCRIPTION="The PHP language runtime engine"
-HOMEPAGE="https://www.php.net/"
-SRC_URI="https://www.php.net/distributions/${P}.tar.xz"
-
-LICENSE="PHP-3.01
- BSD
- Zend-2.0
- bcmath? ( LGPL-2.1+ )
- fpm? ( BSD-2 )
- gd? ( gd )
- unicode? ( BSD-2 LGPL-2.1 )"
-
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-# We can build the following SAPIs in the given order
-SAPIS="embed cli cgi fpm apache2 phpdbg"
-
-# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
-IUSE="${IUSE}
- ${SAPIS/cli/+cli}
- threads"
-
-IUSE="${IUSE} acl argon2 bcmath berkdb bzip2 calendar cdb cjk
- coverage +ctype curl debug
- enchant exif ffi +fileinfo +filter firebird
- +flatfile ftp gd gdbm gmp +iconv imap inifile
- intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit libressl lmdb
- mhash mssql mysql mysqli nls
- oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm
- readline selinux +session session-mm sharedmem
- +simplexml snmp soap sockets sodium spell sqlite ssl
- sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode webp
- +xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib"
-
-# Without USE=readline or libedit, the interactive "php -a" CLI will hang.
-REQUIRED_USE="
- || ( cli cgi fpm apache2 embed phpdbg )
- cli? ( ^^ ( readline libedit ) )
- !cli? ( ?? ( readline libedit ) )
- truetype? ( gd zlib )
- webp? ( gd zlib )
- cjk? ( gd zlib )
- exif? ( gd zlib )
- xpm? ( gd zlib )
- gd? ( zlib )
- simplexml? ( xml )
- soap? ( xml )
- xmlrpc? ( xml iconv )
- xmlreader? ( xml )
- xmlwriter? ( xml )
- xslt? ( xml )
- ldap-sasl? ( ldap )
- qdbm? ( !gdbm )
- session-mm? ( session !threads )
- mysql? ( || ( mysqli pdo ) )
- firebird? ( pdo )
- mssql? ( pdo )
-"
-
-RESTRICT="!test? ( test )"
-
-# The supported (that is, autodetected) versions of BDB are listed in
-# the ./configure script. Other versions *work*, but we need to stick to
-# the ones that can be detected to avoid a repeat of bug #564824.
-COMMON_DEPEND="
- >=app-eselect/eselect-php-0.9.1[apache2?,fpm?]
- >=dev-libs/libpcre2-10.30[unicode]
- fpm? ( acl? ( sys-apps/acl ) )
- apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] )
- argon2? ( app-crypt/argon2:= )
- berkdb? ( || ( sys-libs/db:5.3
- sys-libs/db:5.1
- sys-libs/db:4.8
- sys-libs/db:4.7
- sys-libs/db:4.6
- sys-libs/db:4.5 ) )
- bzip2? ( app-arch/bzip2:0= )
- cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
- coverage? ( dev-util/lcov )
- curl? ( >=net-misc/curl-7.10.5 )
- enchant? ( =dev-libs/libffi-3.0.11 )
- firebird? ( dev-db/firebird )
- gd? ( >=virtual/jpeg-0-r3:0 media-libs/libpng:0= )
- gdbm? ( >=sys-libs/gdbm-1.8.0:0= )
- gmp? ( dev-libs/gmp:0= )
- iconv? ( virtual/libiconv )
- imap? ( >=virtual/imap-c-client-2[kerberos=,ssl=] )
- intl? ( dev-libs/icu:= )
- kerberos? ( virtual/krb5 )
- ldap? ( >=net-nds/openldap-1.2.11 )
- ldap-sasl? ( dev-libs/cyrus-sasl )
- libedit? ( dev-libs/libedit )
- lmdb? ( dev-db/lmdb:= )
- mssql? ( dev-db/freetds[mssql] )
- nls? ( sys-devel/gettext )
- oci8-instant-client? ( dev-db/oracle-instantclient-basic )
- odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( >=dev-db/unixODBC-1.8.13 ) )
- postgres? ( dev-db/postgresql:* )
- qdbm? ( dev-db/qdbm )
- readline? ( sys-libs/readline:0= )
- session-mm? ( dev-libs/mm )
- snmp? ( >=net-analyzer/net-snmp-5.2 )
- sodium? ( dev-libs/libsodium:= )
- spell? ( >=app-text/aspell-0.50 )
- sqlite? ( >=dev-db/sqlite-3.7.6.3 )
- ssl? (
- !libressl? ( >=dev-libs/openssl-1.0.1:0= )
- libressl? ( dev-libs/libressl:0= )
- )
- tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) )
- tokyocabinet? ( dev-db/tokyocabinet )
- truetype? ( =media-libs/freetype-2* )
- unicode? ( dev-libs/oniguruma:= )
- webp? ( media-libs/libwebp:0= )
- xml? ( >=dev-libs/libxml2-2.7.6 )
- xpm? ( x11-libs/libXpm )
- xslt? ( dev-libs/libxslt )
- zip? ( >=dev-libs/libzip-1.2.0:= )
- zlib? ( >=sys-libs/zlib-1.2.0.4:0= )
-"
-
-RDEPEND="${COMMON_DEPEND}
- virtual/mta
- fpm? (
- selinux? ( sec-policy/selinux-phpfpm )
- systemd? ( sys-apps/systemd ) )"
-
-# Bison isn't actually needed when building from a release tarball
-# However, the configure script will warn if it's absent or if you
-# have an incompatible version installed. See bug 593278.
-DEPEND="${COMMON_DEPEND}
- app-arch/xz-utils
- >=sys-devel/bison-3.0.1"
-
-BDEPEND="virtual/pkgconfig"
-
-PHP_MV="$(ver_cut 1)"
-
-PATCHES=( "${FILESDIR}/php-iodbc-header-location.patch" )
-
-php_install_ini() {
- local phpsapi="${1}"
-
- # work out where we are installing the ini file
- php_set_ini_dir "${phpsapi}"
-
- # Always install the production INI file, bug 611214.
- local phpinisrc="php.ini-production-${phpsapi}"
- cp php.ini-production "${phpinisrc}" || die
-
- # default to /tmp for save_path, bug #282768
- sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}" || die
-
- # Set the extension dir
- sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" \
- -i "${phpinisrc}" || die
-
- # Set the include path to point to where we want to find PEAR packages
- sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}" || die
-
- insinto "${PHP_INI_DIR#${EPREFIX}}"
- newins "${phpinisrc}" php.ini
-
- elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}"
- elog
-
- dodir "${PHP_EXT_INI_DIR#${EPREFIX}}"
- dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}"
-
- if use opcache; then
- elog "Adding opcache to $PHP_EXT_INI_DIR"
- echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> \
- "${D}/${PHP_EXT_INI_DIR}"/opcache.ini
- dosym "../ext/opcache.ini" \
- "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/opcache.ini"
- fi
-
- # SAPI-specific handling
- if [[ "${sapi}" == "fpm" ]] ; then
- einfo "Installing FPM config files php-fpm.conf and www.conf"
- insinto "${PHP_INI_DIR#${EPREFIX}}"
- doins sapi/fpm/php-fpm.conf
- insinto "${PHP_INI_DIR#${EPREFIX}}/fpm.d"
- doins sapi/fpm/www.conf
- fi
-
- dodoc php.ini-{development,production}
-}
-
-php_set_ini_dir() {
- PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}"
- PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext"
- PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active"
-}
-
-src_prepare() {
- default
-
- # In php-7.x, the FPM pool configuration files have been split off
- # of the main config. By default the pool config files go in
- # e.g. /etc/php-fpm.d, which isn't slotted. So here we move the
- # include directory to a subdirectory "fpm.d" of $PHP_INI_DIR. Later
- # we'll install the pool configuration file "www.conf" there.
- php_set_ini_dir fpm
- sed -i "s~^include=.*$~include=${PHP_INI_DIR}/fpm.d/*.conf~" \
- sapi/fpm/php-fpm.conf.in \
- || die 'failed to move the include directory in php-fpm.conf'
-
- # Emulate buildconf to support cross-compilation
- rm -fr aclocal.m4 autom4te.cache config.cache \
- configure main/php_config.h.in || die
- eautoconf --force
- eautoheader
-}
-
-src_configure() {
- addpredict /usr/share/snmp/mibs/.index #nowarn
- addpredict /var/lib/net-snmp/mib_indexes #nowarn
-
- PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}"
-
- # The php-fpm config file wants localstatedir to be ${EPREFIX}/var
- # and not the Gentoo default ${EPREFIX}/var/lib. See bug 572002.
- local our_conf=(
- --prefix="${PHP_DESTDIR}"
- --mandir="${PHP_DESTDIR}/man"
- --infodir="${PHP_DESTDIR}/info"
- --libdir="${PHP_DESTDIR}/lib"
- --with-libdir="$(get_libdir)"
- --localstatedir="${EPREFIX}/var"
- --without-pear
- $(use_enable threads maintainer-zts)
- )
-
- our_conf+=(
- $(use_with argon2 password-argon2 "${EPREFIX}/usr")
- $(use_enable bcmath)
- $(use_with bzip2 bz2 "${EPREFIX}/usr")
- $(use_enable calendar)
- $(use_enable coverage gcov)
- $(use_enable ctype)
- $(use_with curl)
- $(use_enable xml dom)
- $(use_with enchant)
- $(use_enable exif)
- $(use_with ffi)
- $(use_enable fileinfo)
- $(use_enable filter)
- $(use_enable ftp)
- $(use_with nls gettext "${EPREFIX}/usr")
- $(use_with gmp gmp "${EPREFIX}/usr")
- $(use_with mhash mhash "${EPREFIX}/usr")
- $(use_with iconv iconv \
- $(use elibc_glibc || use elibc_musl || use elibc_FreeBSD || echo "${EPREFIX}/usr"))
- $(use_enable intl)
- $(use_enable ipv6)
- $(use_enable json)
- $(use_with kerberos)
- $(use_with xml libxml)
- $(use_enable unicode mbstring)
- $(use_with ssl openssl)
- $(use_enable pcntl)
- $(use_enable phar)
- $(use_enable pdo)
- $(use_enable opcache)
- $(use_with postgres pgsql "${EPREFIX}/usr")
- $(use_enable posix)
- $(use_with spell pspell "${EPREFIX}/usr")
- $(use_enable simplexml)
- $(use_enable sharedmem shmop)
- $(use_with snmp snmp "${EPREFIX}/usr")
- $(use_enable soap)
- $(use_enable sockets)
- $(use_with sodium)
- $(use_with sqlite sqlite3)
- $(use_enable sysvipc sysvmsg)
- $(use_enable sysvipc sysvsem)
- $(use_enable sysvipc sysvshm)
- $(use_with tidy tidy "${EPREFIX}/usr")
- $(use_enable tokenizer)
- $(use_enable xml)
- $(use_enable xmlreader)
- $(use_enable xmlwriter)
- $(use_with xmlrpc)
- $(use_with xslt xsl)
- $(use_with zip)
- $(use_with zlib zlib "${EPREFIX}/usr")
- $(use_enable debug)
- )
-
- # DBA support
- if use cdb || use berkdb || use flatfile || use gdbm || use inifile \
- || use qdbm || use lmdb || use tokyocabinet ; then
- our_conf+=( "--enable-dba" )
- fi
-
- # DBA drivers support
- our_conf+=(
- $(use_with cdb)
- $(use_with berkdb db4 "${EPREFIX}/usr")
- $(use_enable flatfile)
- $(use_with gdbm gdbm "${EPREFIX}/usr")
- $(use_enable inifile)
- $(use_with qdbm qdbm "${EPREFIX}/usr")
- $(use_with tokyocabinet tcadb "${EPREFIX}/usr")
- $(use_with lmdb lmdb "${EPREFIX}/usr")
- )
-
- # Support for the GD graphics library
- our_conf+=(
- $(use_with truetype freetype)
- $(use_enable cjk gd-jis-conv)
- $(use_with gd jpeg)
- $(use_with xpm)
- $(use_with webp)
- )
- # enable gd last, so configure can pick up the previous settings
- our_conf+=( $(use_enable gd) )
-
- # IMAP support
- if use imap ; then
- our_conf+=(
- $(use_with imap imap "${EPREFIX}/usr")
- $(use_with ssl imap-ssl "${EPREFIX}/usr")
- )
- fi
-
- # LDAP support
- if use ldap ; then
- our_conf+=(
- $(use_with ldap ldap "${EPREFIX}/usr")
- $(use_with ldap-sasl)
- )
- fi
-
- # MySQL support
- local mysqllib="mysqlnd"
- local mysqlilib="mysqlnd"
-
- our_conf+=( $(use_with mysqli mysqli "${mysqlilib}") )
-
- local mysqlsock="${EPREFIX}/var/run/mysqld/mysqld.sock"
- if use mysql || use mysqli ; then
- our_conf+=( $(use_with mysql mysql-sock "${mysqlsock}") )
- fi
-
- # ODBC support
- if use odbc && use iodbc ; then
- our_conf+=(
- --without-unixODBC
- --with-iodbc
- $(use_with pdo pdo-odbc "iODBC,${EPREFIX}/usr")
- )
- elif use odbc ; then
- our_conf+=(
- --with-unixODBC="${EPREFIX}/usr"
- --without-iodbc
- $(use_with pdo pdo-odbc "unixODBC,${EPREFIX}/usr")
- )
- else
- our_conf+=(
- --without-unixODBC
- --without-iodbc
- --without-pdo-odbc
- )
- fi
-
- # Oracle support
- our_conf+=( $(use_with oci8-instant-client oci8) )
-
- # PDO support
- if use pdo ; then
- our_conf+=(
- $(use_with mssql pdo-dblib "${EPREFIX}/usr")
- $(use_with mysql pdo-mysql "${mysqllib}")
- $(use_with postgres pdo-pgsql)
- $(use_with sqlite pdo-sqlite)
- $(use_with firebird pdo-firebird "${EPREFIX}/usr")
- $(use_with oci8-instant-client pdo-oci)
- )
- fi
-
- # readline/libedit support
- our_conf+=(
- $(use_with readline readline "${EPREFIX}/usr")
- $(use_with libedit)
- )
-
- # Session support
- if use session ; then
- our_conf+=( $(use_with session-mm mm "${EPREFIX}/usr") )
- else
- our_conf+=( $(use_enable session) )
- fi
-
- # Use pic for shared modules such as apache2's mod_php
- our_conf+=( --with-pic )
-
- # we use the system copy of pcre
- # --with-external-pcre affects ext/pcre
- # Many arches don't support pcre-jit
- our_conf+=(
- --with-external-pcre
- --without-pcre-jit
- )
-
- # Catch CFLAGS problems
- # Fixes bug #14067.
- # Changed order to run it in reverse for bug #32022 and #12021.
- replace-cpu-flags "k6*" "i586"
-
- # Cache the ./configure test results between SAPIs.
- our_conf+=( --cache-file="${T}/config.cache" )
-
- # Support user-passed configuration parameters
- our_conf+=( ${EXTRA_ECONF:-} )
-
- # Support the Apache2 extras, they must be set globally for all
- # SAPIs to work correctly, especially for external PHP extensions
-
- local one_sapi
- local sapi
- mkdir -p "${WORKDIR}/sapis-build" || die
- for one_sapi in $SAPIS ; do
- use "${one_sapi}" || continue
- php_set_ini_dir "${one_sapi}"
-
- # The BUILD_DIR variable is used to determine where to output
- # the files that autotools creates. This was all originally
- # based on the autotools-utils eclass.
- BUILD_DIR="${WORKDIR}/sapis-build/${one_sapi}"
- cp -a "${S}" "${BUILD_DIR}" || die
- cd "${BUILD_DIR}" || die
-
- local sapi_conf=(
- --with-config-file-path="${PHP_INI_DIR}"
- --with-config-file-scan-dir="${PHP_EXT_INI_DIR_ACTIVE}"
- )
-
- for sapi in $SAPIS ; do
- case "$sapi" in
- cli|cgi|embed|fpm|phpdbg)
- if [[ "${one_sapi}" == "${sapi}" ]] ; then
- sapi_conf+=( "--enable-${sapi}" )
- if [[ "fpm" == "${sapi}" ]] ; then
- sapi_conf+=(
- $(use_with acl fpm-acl)
- $(use_with systemd fpm-systemd)
- )
- fi
- else
- sapi_conf+=( "--disable-${sapi}" )
- fi
- ;;
-
- apache2)
- if [[ "${one_sapi}" == "${sapi}" ]] ; then
- sapi_conf+=( --with-apxs2="${EPREFIX}/usr/bin/apxs" )
- else
- sapi_conf+=( --without-apxs2 )
- fi
- ;;
- esac
- done
-
- # Construct the $myeconfargs array by concatenating $our_conf
- # (the common args) and $sapi_conf (the SAPI-specific args).
- local myeconfargs=( "${our_conf[@]}" )
- myeconfargs+=( "${sapi_conf[@]}" )
-
- pushd "${BUILD_DIR}" > /dev/null || die
- econf "${myeconfargs[@]}"
- popd > /dev/null || die
- done
-}
-
-src_compile() {
- # snmp seems to run during src_compile, too (bug #324739)
- addpredict /usr/share/snmp/mibs/.index #nowarn
- addpredict /var/lib/net-snmp/mib_indexes #nowarn
-
- local sapi
- for sapi in ${SAPIS} ; do
- if use "${sapi}"; then
- cd "${WORKDIR}/sapis-build/$sapi" || \
- die "Failed to change dir to ${WORKDIR}/sapis-build/$1"
- emake
- fi
- done
-}
-
-src_install() {
- # see bug #324739 for what happens when we don't have that
- addpredict /usr/share/snmp/mibs/.index #nowarn
-
- # grab the first SAPI that got built and install common files from there
- local first_sapi="", sapi=""
- for sapi in $SAPIS ; do
- if use $sapi ; then
- first_sapi=$sapi
- break
- fi
- done
-
- # Makefile forgets to create this before trying to write to it...
- dodir "${PHP_DESTDIR#${EPREFIX}}/bin"
-
- # Install php environment (without any sapis)
- cd "${WORKDIR}/sapis-build/$first_sapi" || die
- emake INSTALL_ROOT="${D}" \
- install-build install-headers install-programs
-
- local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)"
-
- # Create the directory where we'll put version-specific php scripts
- keepdir "/usr/share/php${PHP_MV}"
-
- local file=""
- local sapi_list=""
-
- for sapi in ${SAPIS}; do
- if use "${sapi}" ; then
- einfo "Installing SAPI: ${sapi}"
- cd "${WORKDIR}/sapis-build/${sapi}" || die
-
- if [[ "${sapi}" == "apache2" ]] ; then
- # We're specifically not using emake install-sapi as libtool
- # may cause unnecessary relink failures (see bug #351266)
- insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/"
- newins ".libs/libphp${PHP_MV}$(get_libname)" \
- "libphp${PHP_MV}$(get_libname)"
- keepdir "/usr/$(get_libdir)/apache2/modules"
- else
- # needed each time, php_install_ini would reset it
- local dest="${PHP_DESTDIR#${EPREFIX}}"
- into "${dest}"
- case "$sapi" in
- cli)
- source="sapi/cli/php"
- # Install the "phar" archive utility.
- if use phar ; then
- emake INSTALL_ROOT="${D}" install-pharcmd
- dosym "..${dest#/usr}/bin/phar" "/usr/bin/phar${SLOT}"
- fi
- ;;
- cgi)
- source="sapi/cgi/php-cgi"
- ;;
- fpm)
- source="sapi/fpm/php-fpm"
- ;;
- embed)
- source="libs/libphp${PHP_MV}$(get_libname)"
- ;;
- phpdbg)
- source="sapi/phpdbg/phpdbg"
- ;;
- *)
- die "unhandled sapi in src_install"
- ;;
- esac
-
- if [[ "${source}" == *"$(get_libname)" ]]; then
- dolib.so "${source}"
- else
- dobin "${source}"
- local name="$(basename ${source})"
- dosym "..${dest#/usr}/bin/${name}" "/usr/bin/${name}${SLOT}"
- fi
- fi
-
- php_install_ini "${sapi}"
-
- # construct correct SAPI string for php-config
- # thanks to ferringb for the bash voodoo
- if [[ "${sapi}" == "apache2" ]]; then
- sapi_list="${sapi_list:+${sapi_list} }apache2handler"
- else
- sapi_list="${sapi_list:+${sapi_list} }${sapi}"
- fi
- fi
- done
-
- # Installing opcache module
- if use opcache ; then
- into "${PHP_DESTDIR#${EPREFIX}}"
- dolib.so "modules/opcache$(get_libname)"
- fi
-
- # Install env.d files
- newenvd "${FILESDIR}/20php5-envd" "20php${SLOT}"
- sed -e "s|/lib/|/$(get_libdir)/|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
- sed -e "s|php5|php${SLOT}|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
-
- # set php-config variable correctly (bug #278439)
- sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \
- "${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config" || die
-
- if use fpm ; then
- if use systemd; then
- systemd_newunit "${FILESDIR}/php-fpm_at.service" \
- "php-fpm@${SLOT}.service"
- else
- systemd_newunit "${FILESDIR}/php-fpm_at-simple.service" \
- "php-fpm@${SLOT}.service"
- fi
- fi
-}
-
-src_test() {
- echo ">>> Test phase [test]: ${CATEGORY}/${PF}"
- PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php"
- if [[ ! -x "${PHP_BIN}" ]] ; then
- ewarn "Test phase requires USE=cli, skipping"
- return
- else
- export TEST_PHP_EXECUTABLE="${PHP_BIN}"
- fi
-
- if [[ -x "${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi" ]] ; then
- export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi"
- fi
-
- if [[ -x "${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg" ]] ; then
- export TEST_PHPDBG_EXECUTABLE="${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg"
- fi
-
- REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n -d \
- "session.save_path=${T}" \
- "${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d \
- "session.save_path=${T}"
-
- for name in ${EXPECTED_TEST_FAILURES}; do
- mv "${name}.out" "${name}.out.orig" 2>/dev/null || die
- done
-
- local failed="$(find -name '*.out')"
- if [[ ${failed} != "" ]] ; then
- ewarn "The following test cases failed unexpectedly:"
- for name in ${failed}; do
- ewarn " ${name/.out/}"
- done
- else
- einfo "No unexpected test failures, all fine"
- fi
-
- if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then
- local passed=""
- for name in ${EXPECTED_TEST_FAILURES}; do
- [[ -f "${name}.diff" ]] && continue
- passed="${passed} ${name}"
- done
- if [[ ${passed} != "" ]] ; then
- einfo "The following test cases passed unexpectedly:"
- for name in ${passed}; do
- ewarn " ${passed}"
- done
- else
- einfo "None of the known-to-fail tests passed, all fine"
- fi
- fi
-}
-
-pkg_postinst() {
- # Output some general info to the user
- if use apache2 ; then
- elog
- elog "To enable PHP in apache, you will need to add \"-D PHP\" to"
- elog "your apache2 command. OpenRC users can append that string to"
- elog "APACHE2_OPTS in /etc/conf.d/apache2."
- elog
- elog "The apache module configuration file 70_mod_php.conf is"
- elog "provided (and maintained) by eselect-php."
- elog
- fi
-
- # Create the symlinks for php
- local m
- for m in ${SAPIS}; do
- [[ ${m} == 'embed' ]] && continue;
- if use $m ; then
- local ci=$(eselect php show $m)
- if [[ -z $ci ]]; then
- eselect php set $m php${SLOT} || die
- einfo "Switched ${m} to use php:${SLOT}"
- einfo
- elif [[ $ci != "php${SLOT}" ]] ; then
- elog "To switch $m to use php:${SLOT}, run"
- elog " eselect php set $m php${SLOT}"
- elog
- fi
- fi
- done
-
- # Remove dead symlinks for SAPIs that were just disabled. For
- # example, if the user has the cgi SAPI enabled, then he has an
- # eselect-php symlink for it. If he later reinstalls PHP with
- # USE="-cgi", that symlink will break. This call to eselect is
- # supposed to remove that dead link per bug 572436.
- eselect php cleanup || die
-
- if ! has "php${SLOT/./-}" ${PHP_TARGETS}; then
- elog "To build extensions for this version of PHP, you will need to"
- elog "add php${SLOT/./-} to your PHP_TARGETS USE_EXPAND variable."
- elog
- fi
-
- # Warn about the removal of PHP_INI_VERSION if the user has it set.
- if [[ -n "${PHP_INI_VERSION}" ]]; then
- ewarn 'The PHP_INI_VERSION variable has been phased out. You may'
- ewarn 'remove it from your configuration at your convenience. See'
- ewarn
- ewarn ' https://bugs.gentoo.org/611214'
- ewarn
- ewarn 'for more information.'
- fi
-
- elog "For details on how version slotting works, please see"
- elog "the wiki:"
- elog
- elog " https://wiki.gentoo.org/wiki/PHP"
- elog
-}
-
-pkg_postrm() {
- # This serves two purposes. First, if we have just removed the last
- # installed version of PHP, then this will remove any dead symlinks
- # belonging to eselect-php. Second, if a user upgrades slots from
- # (say) 5.6 to 7.0 and depcleans the old slot, then this will update
- # his existing symlinks to point to the new 7.0 installation. The
- # latter is bug 432962.
- #
- # Note: the eselect-php package may not be installed at this point,
- # so we can't die() if this command fails.
- eselect php cleanup
-}
diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest
index 82aec9135799..9adbc28204d2 100644
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@@ -29,21 +29,21 @@ DIST python-gentoo-patches-3.8.6.tar.xz 10956 BLAKE2B e3241d97f886d0a37f85735102
DIST python-gentoo-patches-3.9.0-r1.tar.xz 13728 BLAKE2B 50e85194c6bafefb8a0ddc4c9dea39227fc2c170db37ab44fa1e068340fa2fc5a59489f50431f0792024df551fc54a20de594579b57717c89fa134b3f000bb6d SHA512 a38c2800e3a0740af79f75f4120c925c7a891aa1f14a71ab56ad97fbabca3573c571140da3f34050bd9f97bd854a704453a910fa6883162196e6d1335a965b61
DIST python-gentoo-patches-3.9.0rc1.tar.xz 8856 BLAKE2B 7bd032dfd047640c6a53633b5b9ee7b24199106b985230f772dda978d3b79fe0406eea64c4a842603a20afb71a90469befa7ec59a5ef1f793e4c901aa85952d1 SHA512 85a7d4397abf2a0f3c3d07a94a3e184ba3dcb347f3b70ee2cb77e81aac63846b01323a0228afd0fd1d32b3cafb64b18f82e6f5bfd88e4d564261ddae11e747eb
EBUILD python-2.7.18-r4.ebuild 10624 BLAKE2B 3981c0899d899e4dfbe198618e005bc9190af8cfbc6ca5b85911c717127bfa19ca546e0dcbf7b0317497e7f4d3fd8498e4b153f38468f31f83008c1f39da2067 SHA512 e3aee3d42db1539233a2a543818cd8a733dcb7c2a33a804d7f6b45cd1d087cd1e665e150ef308e61f49e969477fc1d3f8bd55ba5e9117a274e7e9645e65a3f3d
-EBUILD python-2.7.18-r5.ebuild 10632 BLAKE2B 5dfe277bce2a5360f028e5f72c57f2452ac86c65dfd74e443d80953011cae17886681fc2a98f92f23f246515c6436828ae80a051cf2f8a57e6f1244decb1f2c2 SHA512 f1e4c3db1750b5ce3f972b52a82965338f63baa1717f60042195b2d05c536faafdc96206a869e6be1068288714add636e43aba1e8d203f6e08f1d7a82e9baa2d
+EBUILD python-2.7.18-r5.ebuild 10628 BLAKE2B f32e660cba19a249cb56db7b9d8b50f86df80a98df23451bd59e7a620b16262955cd5ffa843cc001a02ccfbce68a7349cc00cd70b545177e4a5d339f5d138807 SHA512 46645265f815014399e7f83b5424dd03285d8eab9c513629243780e5a63fc118dc103c28f4729521b750c0cc105262a58c339decac683d09fa0f019dd64fe334
EBUILD python-3.10.0_alpha1.ebuild 9548 BLAKE2B 7f7fadcf9b5f9b09764229ee2c1a4d5be6fc4bc90da7555cafecb16d2690df9098cf28fe3bb719533ad9a608424ed389b17518091d130cd9e0ced7bcf3e787b9 SHA512 fb0e052eef6ba52360903b4112f30f1ea255ba9a56061079124fd7a6379ddce708efc1d2d9241f268f370f0c8158532a83e014d305c469e643ed74392181a301
EBUILD python-3.10.0_alpha3.ebuild 9548 BLAKE2B 7f7fadcf9b5f9b09764229ee2c1a4d5be6fc4bc90da7555cafecb16d2690df9098cf28fe3bb719533ad9a608424ed389b17518091d130cd9e0ced7bcf3e787b9 SHA512 fb0e052eef6ba52360903b4112f30f1ea255ba9a56061079124fd7a6379ddce708efc1d2d9241f268f370f0c8158532a83e014d305c469e643ed74392181a301
EBUILD python-3.6.11-r2.ebuild 10610 BLAKE2B d9074e767b11ed420c843665b87c466f0014713221c0db4a026fbd91a39debc69689a1674db8a0c0b80dc3eb8df7bc86fe92972918f4c95ef8a52da2936bf631 SHA512 693795866815e724267877e4f97e14d09eda9f321b5c2b481f54952fcefc0859072ab42306eb03b81bd8b3e0a2d71435367452330caabf6bfebbcd2062d1ced0
-EBUILD python-3.6.12-r1.ebuild 10630 BLAKE2B dbc7f586594973cba9961e5cd696de4c34b1da605bb8d03fa6dc5be8d00d573d3a5df079058d5eee666e9415d06e2b61a12adc867dddcb0b609f959fb76d2049 SHA512 1cd723cc0476fabb3a8c88e157686455e27d11129396baed7c7f03830585b62936518e3bded4949d16a02c7216e901c229a76bd1a3a38e7c136af60e05163390
-EBUILD python-3.6.12.ebuild 10608 BLAKE2B 5619848d7cc222aec96aa3590883f81a99418cb3c1ba277705a1f9f35d28e6323fc6a7d53a22186b620159caf683525ad067d64cdc6a684ad48fb3d1c235d75b SHA512 30fa11c3476e4acbfe1818103b996b86be8bdb20d1da5411c4121e3031f2c8e219b96aa746cc56f1bc01c00604504c649ca412b8a491bd084e99fc1a07edcaf7
+EBUILD python-3.6.12-r1.ebuild 10625 BLAKE2B 5ccce8aacd0eff19079975931a9e5bf0b53753ca75429a90e099dd0e42d9f390754541f1476d7ca26f2b7087c493a69af5eb450fc5c069a1cc37f8b270e438d0 SHA512 1c2a3dcdaacb23ef4227d8d3d212fb13065b1bf47e427e56d6da8fb8fe5c0e35f730a343f455ebf38b7535d412ca7f0b85a9a5d8426e52b54e1da83fbfdd3edd
+EBUILD python-3.6.12.ebuild 10607 BLAKE2B 8fb91060c126cce9d965ea75a5bdc0b8d107d55aeef37079bbd3b6537652ab769b38b8f037952bd160f602d3e206ce801eb3d2e8435bb222a2c36285619ddcac SHA512 85a15b371bab8ef783e48fa0a7780b5ac4b22ae05033b110957d072c5d5c326cc6faa2c5e2c6780b9da933a28dbd0eb4559f40cd10e82ddcc62e7344ccce1f02
EBUILD python-3.7.8-r2.ebuild 10157 BLAKE2B 9d802985fd19463a82452e390a7c20144c839075e307c1ddcdcce9ee0aa923d35e39501af27274cc93d7478ce9beb03e30104dfdc5e464ed1923c1af76f4384e SHA512 7372df64cf7d230bf0e307b442b29c617d062f7bed9032e1e2179e576b788db0c3c8426eae39e654f5eaea6f632a35927e2bf2e32d9f6d247c7359adcb22d322
-EBUILD python-3.7.9-r1.ebuild 10165 BLAKE2B d8efcebe7ba03cec2c4aca634fa6e3b2a8d30f039dde82d4145d4eaf787664c1f53ec3c2a2856fab2ac4e939d4f4ee211596f1c2e2fae327b33ed0ce86f8bae8 SHA512 a97ee2dc1e054f626e16486bb079346c284b452bab398101acfe2bc63c8d69cf4feb308e7e4137e43083321dbd09ced9c311b1b1cf451a6977ac6bcd6ca9661d
+EBUILD python-3.7.9-r1.ebuild 10160 BLAKE2B 4ef750b6a7a3ef151d5278f262a8bc90ccc5993bcc8c941259f77d5919b4d287296b166ce4f9abbdb36a0413af613418a3ca6f4de91bd0d434b1fd2258f46697 SHA512 b19cac888879b361021762dda61e5a15791eb8c87743c48001adde19274b2b321e0f7bb1015901fc79be2fd1b70464526e563d59fcda972afb6e641a5fd6583d
EBUILD python-3.7.9.ebuild 10156 BLAKE2B 1a71bd346866fcf9466a4a29e681a20c7d716f3d7bb5330008925f12e51f3bd2e1ab064a48438abbd6a23d21b3f563f5db50b4a82216ac89abfc9e913cae8071 SHA512 7aaef3db8a570cf09637ed9159611422d86536f84245f4ec771d613bcd3d3334fe4e9c43eb12b4d4d051ca6ddaa022e2d0a0446de16353c9513ba873fd24a451
EBUILD python-3.8.4-r1.ebuild 9928 BLAKE2B 9ebf074bef412756a79b6a9995f8eebdb92239e0558101b873e5d81a3ce74ef8bdcd0fcfb12f93a5d684d919b840912f91213351ef2db4e634feb00e3071ca81 SHA512 c3f9125df55adada570e75a521017e503e095335f98ef899b9d932ac731af8e21487e0710a70572c2766193ed02cc1e32f2350b457add36519762607c131a629
EBUILD python-3.8.5.ebuild 10256 BLAKE2B 63447912d09c28b3774d717a82ac6e275197de69fa00e3af7faf6e6eb09c60917480635035a71dbf3401fe8daeef62c4a130c64ccef7d47eed9607c2cf3d5b21 SHA512 fda9f806cac3c1019af06550f6ba2270993395f8cbf47da31771e0ae0a315282b5335bce91cb8d2ca95861ca50c316bd62ae8b7cf537624765e8359b11ce9ce4
-EBUILD python-3.8.6-r1.ebuild 10266 BLAKE2B 643e1534375995e5ff21a9d88a248cf07a734f60aaf37ce12272e0acfbdbdd26bca3ee569b0c59b10be8af4be658078c5354e4e4b3b745438f9a59b33bf299f1 SHA512 fd196fdf507bd96abdd47596f699288e27129b23e0a3908f401a9e5164296791d43094aa7ca3000712bd8867de556568527df6f0bf56a97f98125b86dfbb4e1e
+EBUILD python-3.8.6-r1.ebuild 10261 BLAKE2B 22fd9fa2595850cf8c7a0f3cf5e89b405c72f04f6e766d30204f6c7268682b5a69650216c4ed728b82afab68b1872e7df23a3f054f69390897bc78e0d2317bae SHA512 9d7f0eb2ce79592fd3121c82474d0b5669a430bd5c9ff32c8f0d3ad32f354a42045681e10b2aa379e5d55cfe098aa5e10e81b0b5b7747eab4df7f51648fa2ae2
EBUILD python-3.8.6.ebuild 10257 BLAKE2B b118a84fd01fe4b410264840ff22e14996e96b61ce672a5856a21d31664f0caa89f03264c780665d3ba5e7922e3984e0df667667f346f3907e9e175622a118da SHA512 f8369eb3bf704366b187202b6f883ff8d5a9585b4a1aedf281c3e76f9d4009d169bfb62ccaa7489726ea8af692a7fbf1e79264f5bb4aa4339fad202ba6bffb79
EBUILD python-3.8.7_rc1.ebuild 10276 BLAKE2B 5baaa0050d1c1fbbff68ff43f622a609678b40b7db953f7355edd5ffdbec38e1b6d922362ee6cd1c47cba9e050e94317417f8fd2e1b7d9394010f24c92d9e949 SHA512 cc84aa79891e1c0e26249f5c7bf7c63ccea625258ffff7d09e0d17404a866075ca0948fd910a9480f1c2447cb35cab090de2ccf26df63e3533b5680935bde771
-EBUILD python-3.9.0-r1.ebuild 9541 BLAKE2B e5ff34e8cee44437c4670fde4ada003096e9a572f5c43c3bae97db7f4f9c2999de9aec486fa1548b41a914e557a765d416f3b314105431e6703185c69af7c3bd SHA512 bfba1ed58a222ee08a6f60375d3fe2212151eb608e25c92a1c8c03d1c652c4ec7b23fc15a2bc87a9c3c99a0feb8401cde268524b2cc7a15e8f6bfc8f8f709f3b
+EBUILD python-3.9.0-r1.ebuild 9536 BLAKE2B 71ffd602605e2c311a97b842fa117974b89f29b625c22626eac0b2b650d2516022a749815bfecf486b62fdfb2737e0c21dbc95cde9680859ed96d2c02fa544b5 SHA512 5fab1557abcf3fd6ec2d5437f75f2a88e994ead37243bba40e00523ff91eefc44b2fde85b26ad39576992fcb9bb6368ed5051381e3768e295e261d50e7457f0e
EBUILD python-3.9.0.ebuild 9533 BLAKE2B b4efc6b65f8fa865aa9f16484866b5f385a8c70e5276ee9e8c06772e16c23c8f9c058b4dfc891fd44daefd8d66a932155a02028bfeeaae283ba9d9a7bd9e3b0d SHA512 e21249bdd74e0304cf813f99a00dbc618dc8b5a358e0ca8547e631ff2a3d40cebe8c91313d07b3c992373b7cfb06fb00123016c5870d787bca14377cceff0ce5
EBUILD python-3.9.1.ebuild 9542 BLAKE2B 7534f920099c3cfe5293ba093496a5858e4107f8e9e7f885c62a8d70e2c7ae4a0185b28d3753d07809b8bc99dc71ee7c4aef94880989ff43fc43fd77cbcae076 SHA512 f4fbf2530ea2c7c64d2aedaaa05890977d45709b5d6bfea2e8bf417996e59f6f8be41ac59b8811fc105b7c6f13ecb8b514fa7c4643a6871286f974190897db09
MISC metadata.xml 819 BLAKE2B 120c7c65d77488e726c5a0f4aa19469867ea6900e747169fae2f9cf8f14ec2936089d5edfe1935ce610bec26387273e261b1cc4b023680c8c4b229f2141a7223 SHA512 08f45707e5490067a21951b9d37c8ae67064ab67cccc5b8d8c204eab8d4a004fb910627b62989c67b849b89d301618f8f8f7996e99e1ef5bab38a239c49c124d
diff --git a/dev-lang/python/python-2.7.18-r5.ebuild b/dev-lang/python/python-2.7.18-r5.ebuild
index 598e46e62900..96ab96cf4a88 100644
--- a/dev-lang/python/python-2.7.18-r5.ebuild
+++ b/dev-lang/python/python-2.7.18-r5.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}"
LICENSE="PSF-2"
SLOT="${PYVER}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc x86"
+KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sparc x86"
IUSE="-berkdb bluetooth build elibc_uclibc examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl +threads tk +wide-unicode wininst +xml"
# Do not add a dependency on dev-lang/python to this ebuild.
diff --git a/dev-lang/python/python-3.6.12-r1.ebuild b/dev-lang/python/python-3.6.12-r1.ebuild
index 435713142e9d..d5d14b5159e1 100644
--- a/dev-lang/python/python-3.6.12-r1.ebuild
+++ b/dev-lang/python/python-3.6.12-r1.ebuild
@@ -19,7 +19,7 @@ S="${WORKDIR}/${MY_P}"
LICENSE="PSF-2"
SLOT="${PYVER}/${PYVER}m"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc x86"
+KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 sparc x86"
IUSE="bluetooth build examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl test +threads tk wininst +xml"
RESTRICT="!test? ( test )"
diff --git a/dev-lang/python/python-3.6.12.ebuild b/dev-lang/python/python-3.6.12.ebuild
index d9accf08e8a3..bc05b3831f25 100644
--- a/dev-lang/python/python-3.6.12.ebuild
+++ b/dev-lang/python/python-3.6.12.ebuild
@@ -19,7 +19,7 @@ S="${WORKDIR}/${MY_P}"
LICENSE="PSF-2"
SLOT="${PYVER}/${PYVER}m"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ~ppc64 s390 sparc x86"
IUSE="bluetooth build examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl test +threads tk wininst +xml"
RESTRICT="!test? ( test )"
diff --git a/dev-lang/python/python-3.7.9-r1.ebuild b/dev-lang/python/python-3.7.9-r1.ebuild
index 9cfc01d878ff..cead9f2ee000 100644
--- a/dev-lang/python/python-3.7.9-r1.ebuild
+++ b/dev-lang/python/python-3.7.9-r1.ebuild
@@ -19,7 +19,7 @@ S="${WORKDIR}/${MY_P}"
LICENSE="PSF-2"
SLOT="${PYVER}/${PYVER}m"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc x86"
IUSE="bluetooth build examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl test tk wininst +xml"
RESTRICT="!test? ( test )"
diff --git a/dev-lang/python/python-3.8.6-r1.ebuild b/dev-lang/python/python-3.8.6-r1.ebuild
index 739ad8e6a6a5..9b5c3e9dea22 100644
--- a/dev-lang/python/python-3.8.6-r1.ebuild
+++ b/dev-lang/python/python-3.8.6-r1.ebuild
@@ -19,7 +19,7 @@ S="${WORKDIR}/${MY_P}"
LICENSE="PSF-2"
SLOT="${PYVER}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc x86"
IUSE="bluetooth build examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl test tk wininst +xml"
RESTRICT="!test? ( test )"
diff --git a/dev-lang/python/python-3.9.0-r1.ebuild b/dev-lang/python/python-3.9.0-r1.ebuild
index d6f0e8fd055b..4c1442bcad7b 100644
--- a/dev-lang/python/python-3.9.0-r1.ebuild
+++ b/dev-lang/python/python-3.9.0-r1.ebuild
@@ -19,7 +19,7 @@ S="${WORKDIR}/${MY_P}"
LICENSE="PSF-2"
SLOT="${PYVER}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc x86"
IUSE="bluetooth build examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl test tk wininst +xml"
RESTRICT="!test? ( test )"
diff --git a/dev-lang/rust/Manifest b/dev-lang/rust/Manifest
index d066320ec4ea..7ede91133a53 100644
--- a/dev-lang/rust/Manifest
+++ b/dev-lang/rust/Manifest
@@ -52,6 +52,6 @@ DIST rustc-1.46.0-src.tar.xz 101868452 BLAKE2B da9798596b124a10d79c236a871228f05
DIST rustc-1.47.0-src.tar.xz 104143736 BLAKE2B 0454094dde35275488046826da87655e51bf0795481d6d08fd70d644bfc12481bca8641166106ef32f20494906025244715b16ff21a1c023f4bd2818aab42521 SHA512 6ba83c0158f8130ddeae7e070417a2121d8a548c8fe97e28bce116d84048636c75aaee78e0c92cd43a50f5679a1223fc226cc8c5ba9bbd1465e84c5c6034d5c9
DIST rustc-1.48.0-src.tar.xz 105951736 BLAKE2B 42468fc5ac5e80c4793cfe0913cbb8e43a8def28cc8cf5ed25ab989561e2bf33e155c83e180183362535cbc9008f341eb1273087a2364672b1a4032ac2d6ca45 SHA512 4e12baa6893238a8d336ec9ebe891477d18676f271b32763474fa7a6a8b58fb3187dd4e2aa95bce482989b692cc2e1360221669d6811eec71b326f22a1756c23
EBUILD rust-1.46.0.ebuild 17326 BLAKE2B b43d06f2b122762ce157174cfe821d4d1c93e5050d982ae2a29b9fea8a14744fdea755b5e98f49d66a87d1736a6457172193f4ca7e01cedc3469018daf46d28e SHA512 d1ac91bd59796b6f4b136cddffd404dee48ad00bb9c72b6bd9992b0a9950924c3f65d4df66a59f27b5522b01a54141df4b707db7d285d10cd10b2d1581358fe2
-EBUILD rust-1.47.0-r2.ebuild 18035 BLAKE2B 2eb52d7fc671048b1c7f7e066a4f542e4ee011b2509639c0b630bac683f8cc1b49921b686b3ca670dec1218f7501122ccf22b8d727c13894015e97471a0bac1a SHA512 33cda30b2b08eada1b809b42f8a839953edd6471b52f5dc0fa134e655e63cc5467de9b9804bc8a0e20c82bee1b327c67fd684b5353f82f1c5cac19de93513a7d
+EBUILD rust-1.47.0-r2.ebuild 18737 BLAKE2B 1f9295e1356bc3b64ed50650d0436da91121d4b998e2c89f60021f6d5b927b914a7c641cd88853df5c8a8de041e61bf85701229d158b629f52bacfc8272c6f43 SHA512 48760ec9a6ae193f81c0748184e955aa138decb91a0612c6e0da791517f09ca0b2ff383e89d4dcd4946bbbbf23fc2ef36011f18fd8cdf61f26a97ce53590385e
EBUILD rust-1.48.0.ebuild 18057 BLAKE2B b59c23dfad5f6be2fa654f955e14bb4838d0dd75aba5a53bd4dfa1347a996f2d54ac9a20bde5219df8fe1070c64111f46cdb91002b439fb7b5cc80ac553b5da6 SHA512 e2d9e47a57275cdeb4ea62f54067d7a3b301f380f0e467a87c6fb516e651e064f25d77f268578d45aa5bf750855a53f1bd7e545b4c103d5d7c967537d3d0cd26
MISC metadata.xml 1083 BLAKE2B 7a7b093c22dcaef58bd67f9c2fd84a000696b234d2bc27315999bf6751cfd2a79441fd22efc284a542ecc84ce1a12ff9ca3495d249eaffa5bc1722b385c6109e SHA512 bfe8c140753e93db67244c92e9a7d193691ceb67de796c30a851966a1262bc5c897ead6e13d728775fa524215b6851609dcbee582022d9d75bb8d1e6fabc4ef4
diff --git a/dev-lang/rust/rust-1.47.0-r2.ebuild b/dev-lang/rust/rust-1.47.0-r2.ebuild
index eb492a7361c1..841365e2bef7 100644
--- a/dev-lang/rust/rust-1.47.0-r2.ebuild
+++ b/dev-lang/rust/rust-1.47.0-r2.ebuild
@@ -169,21 +169,50 @@ boostrap_rust_version_check() {
}
pre_build_checks() {
- local M=6144
- M=$(( $(usex clippy 128 0) + ${M} ))
- M=$(( $(usex miri 128 0) + ${M} ))
+ # minimal useflags with system-llvm and system-bootstrap
+ local M=7680
+
+ # approximate component sizes
+ M=$(( $(usex clippy 256 0) + ${M} ))
+ M=$(( $(usex miri 256 0) + ${M} ))
M=$(( $(usex rls 512 0) + ${M} ))
- M=$(( $(usex rustfmt 256 0) + ${M} ))
- M=$(( $(usex system-llvm 0 2048) + ${M} ))
- M=$(( $(usex wasm 256 0) + ${M} ))
+ M=$(( $(usex rustfmt 512 0) + ${M} ))
+ M=$(( $(usex wasm 512 0) + ${M} ))
+
+ # multiply by 1.5 if debug enabled
M=$(( $(usex debug 15 10) * ${M} / 10 ))
+
+ # multiply by 1.5 if target-cpu in rustflags
+ case "${RUSTFLAGS}" in
+ *target-cpu=*)
+ M=$(( 15 * ${M} / 10 ))
+ ;;
+ esac
+
+ # count all enabled llvm targets
+ if ! use system-llvm; then
+ # base requirement is about 2G and 0.5 per llvm target
+ M=$(( 2048 + ${M} ))
+ local llvm_target
+ for llvm_target in ${ALL_LLVM_TARGETS}; do
+ use "${llvm_target}" && M=$(( 512 + ${M} ))
+ done
+ fi
+
+ # multiply by 1.5 if debugging *flags found
eshopts_push -s extglob
if is-flagq '-g?(gdb)?([1-9])'; then
M=$(( 15 * ${M} / 10 ))
fi
eshopts_pop
- M=$(( $(usex system-bootstrap 0 1024) + ${M} ))
- M=$(( $(usex doc 256 0) + ${M} ))
+
+ # account for bootstrap compiler
+ # on ppc64 we unpack both BE and LE archive, so double that.
+ M=$(( $(usex system-bootstrap 0 $(usex ppc64 2048 1024) ) + ${M} ))
+
+ # docs appended last as those usually don't depend on flags
+ M=$(( $(usex doc 512 0) + ${M} ))
+
CHECKREQS_DISK_BUILD=${M}M check-reqs_pkg_${EBUILD_PHASE}
}
diff --git a/dev-lang/spidermonkey/Manifest b/dev-lang/spidermonkey/Manifest
index a3b607152672..d23f0f163cfe 100644
--- a/dev-lang/spidermonkey/Manifest
+++ b/dev-lang/spidermonkey/Manifest
@@ -26,6 +26,6 @@ EBUILD spidermonkey-52.9.1_pre1-r2.ebuild 4591 BLAKE2B b8fe23279548903b66139d331
EBUILD spidermonkey-60.5.2_p0-r4.ebuild 4238 BLAKE2B a5f3d1bcb0c12a678795d2e632822687e2d025bbb679daf0a5ffc2d262118bd5120f0a112ed39cf1feda178b609c6a2395e3d424c9e796b824a048bcb7385deb SHA512 3961fce1b9984e3929005a4d0ce3e0494ff1de7d42d07c70023b57d4e45f2d3cca1c6c8d8c803b95dcacf5a56ef9a66a339fe891bef594d079f275861d16b035
EBUILD spidermonkey-68.12.0.ebuild 7310 BLAKE2B 9808f81f5adcd34331a2ae9db9c00303f13493e9a3dfdd007f89b8a87ce86c8626cd6041116ed0347f1675558363097c1d8727b36e92ed8dc76af2f2584a186d SHA512 c7ada8f749bf7fb5de92653730d54a1b1af32cce2486766606eae6cb3b592967c0fca37d43375250fa924ee9fdc275f923c0bd620cc25d21d51b8ba4be8587fc
EBUILD spidermonkey-78.4.1.ebuild 8097 BLAKE2B d8a3a67996d503b6e36294304817a76b04f86f767407a1207fe1362933f3a6f8fc1c6b8303daec733f6255e13628c4df1612a096a78059e20839949e0e73a4af SHA512 215a96406246d5b55cc991658d15c614c4a53774fe3bdfbe8d721d63e8671ec0971512884249ed4f4ad6967523f791177ede536809ee0b42fdbda1462a061111
-EBUILD spidermonkey-78.5.0.ebuild 8098 BLAKE2B b13a5cce3bf76cb0cb53de8ef8fd3c639a5ed3658a80b76a72dd5c4964c021260059dcad00bcfd034672e5690e50b14aeb941aaa16c29b03a21bcf02bf028900 SHA512 f5bc0a24a0e122cd5dd7f5e24a23a5ac8fd356d64277fa881dc55773c0950fea48b076cba35f0e996bce4da13f870b044964a1632684ae97d58cd7fabb1a8be5
-EBUILD spidermonkey-78.6.0.ebuild 11460 BLAKE2B 2cb501bb34081b71082995a074bdb94b32fe31b1012613fe09887c3528ab2d0c16b1083b095b2fc86a968654a9beea2523643d5fa26595f2de0d4ce0a03fd01b SHA512 b5498287e338a357aac2858e5567d481df7c1ac29de24bdc4cb5d7ee9955b25953972535514d2dc3a650708c65b12ad7ba10aaa3d273a568309d57e18c90e878
+EBUILD spidermonkey-78.5.0.ebuild 8097 BLAKE2B 787658a3bf3725197c49ba82cb5e9dfbf7393f4f5bc5d48bd772ec487df73c8cf0c03577d66cb2f216cd194ecb587f56424b1b744f463ec8d490afe419c8c4f3 SHA512 e34cd0087db8b2bc9366c708268d7664f961191b8c9f37a41fb45cc9066c7bda22fb70bb0db1b5e1022046e987c0ff0a284076459a15f6daaba0b8510db843ba
+EBUILD spidermonkey-78.6.0.ebuild 11482 BLAKE2B c9c6000fea277560d4052e92613c965bbcb900bc046a757a6f183bd084d5766b63af01400acd006a12dd9b1f8c6a74408cd1e16459702f8102b17fe3fd92adab SHA512 eb31ce503eee3f7e86d1465a169e0384293416c4a03539de4128bf6231f6194edc7c00dd669407e58af3c0e5a7fddd3f01d49fb3374590bd38d050c4b3765286
MISC metadata.xml 868 BLAKE2B ee529f60bc83af6c54188ab4db2a1e05cbc3fcebf7732580cb5e507afada8560cb8812d4f155ae94c2ec87724bdfafe7312de86b47a95f599655695836c9b806 SHA512 caf3c383cd8109391cbf81baf5e942630bfd84ca6bc2a78430e58e5b0a40428e08b8a3d7c9fadccebaf94fe1aa673df837246fc32d5932b7f60dd43431ee1575
diff --git a/dev-lang/spidermonkey/spidermonkey-78.5.0.ebuild b/dev-lang/spidermonkey/spidermonkey-78.5.0.ebuild
index a2df2c41b345..cf316804750b 100644
--- a/dev-lang/spidermonkey/spidermonkey-78.5.0.ebuild
+++ b/dev-lang/spidermonkey/spidermonkey-78.5.0.ebuild
@@ -58,7 +58,7 @@ SRC_URI="${MOZ_SRC_BASE_URI}/source/${MOZ_P}.source.tar.xz -> ${MOZ_P_DISTFILES}
DESCRIPTION="SpiderMonkey is Mozilla's JavaScript engine written in C and C++"
HOMEPAGE="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey"
-KEYWORDS="~amd64 arm arm64 ~mips ppc64 ~s390 x86"
+KEYWORDS="amd64 arm arm64 ~mips ppc64 ~s390 x86"
SLOT="78"
LICENSE="MPL-2.0"
diff --git a/dev-lang/spidermonkey/spidermonkey-78.6.0.ebuild b/dev-lang/spidermonkey/spidermonkey-78.6.0.ebuild
index e950feecaffa..84db6ea9778a 100644
--- a/dev-lang/spidermonkey/spidermonkey-78.6.0.ebuild
+++ b/dev-lang/spidermonkey/spidermonkey-78.6.0.ebuild
@@ -113,16 +113,18 @@ RDEPEND="${CDEPEND}"
S="${WORKDIR}/firefox-${MY_PV}/js/src"
llvm_check_deps() {
- if ! has_version -b "sys-devel/clang:${LLVM_SLOT}" ; then
- ewarn "sys-devel/clang:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
- return 1
- fi
-
- if use clang && use lto ; then
- if ! has_version -b "=sys-devel/lld-${LLVM_SLOT}*" ; then
- ewarn "=sys-devel/lld-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
+ if use clang ; then
+ if ! has_version -b "sys-devel/clang:${LLVM_SLOT}" ; then
+ ewarn "sys-devel/clang:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
return 1
fi
+
+ if use lto ; then
+ if ! has_version -b "=sys-devel/lld-${LLVM_SLOT}*" ; then
+ ewarn "=sys-devel/lld-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
+ return 1
+ fi
+ fi
fi
einfo "Using LLVM slot ${LLVM_SLOT} to build" >&2
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index a40ad3f2f145..e48dd31a4aba 100644
Binary files a/dev-libs/Manifest.gz and b/dev-libs/Manifest.gz differ
diff --git a/dev-libs/appstream/Manifest b/dev-libs/appstream/Manifest
index b175b41fe48a..8c10a762906d 100644
--- a/dev-libs/appstream/Manifest
+++ b/dev-libs/appstream/Manifest
@@ -2,7 +2,5 @@ AUX appstream-0.12.11-disable-Werror-flags.patch 512 BLAKE2B dcf8eece66122356743
AUX appstream-0.12.11-no-highlight.js.patch 3876 BLAKE2B 30176763dd0ec5b9b4e65e748749fee6e68371ba37872c6a2d2556621efd166c1202b4d180d1dd9e980b5e7e12ffebd2579883b370126dda1550873d880dd769 SHA512 4be2760971b7dcc58fd21c8e3cd67242eadd3b1e19067a14e279594a40fc8bffc3fddce0c7a90db01e19129ba7e3d09997615f5ab9cf3dda9a8b76eb4dbd0e0b
AUX appstream-0.12.11-qt-add-missing-provided-kindid-enum.patch 711 BLAKE2B cbca8047059f613dd6b4859b5f7982cfa09e22717982c7404e5375ec976dc03fa421e5b6103b0d399dbca9ce7a7ced02a822754ebe29f5d72a2d5da834219297 SHA512 1e9169aecce1073d851d2a22498586440d1eeb02e84ae362f381799ec244aa755cb58203f3873a566b07462be31fb1b3324c062b15cdadebc4253ab750363c66
DIST AppStream-0.12.11.tar.xz 2120548 BLAKE2B 6053d1d1bbe182c8e57f657ea5dda9c4a777d5a7955f39a57677502fbbe010d5c49a7872329d1ef716c41c7423bfb4d284e71af97f99ca6e466fbf369bf80272 SHA512 6000f4e9f995b2d481374db2409f212da9d48893c4a757cb7287e2731117f50d0ed284dedc0e24e505b3b7c9c9f38dd9a5f855eeb6c7445eb7203e74d4a5f790
-DIST AppStream-0.12.7.tar.xz 1958948 BLAKE2B 51a70395e4801ceeb3e97ac081f4c45be242cca14728f8efc5eec0d4b3cfa4cc9fab9ef7429c18e9bbb0dedb693a847258be1b11491155658a6ffa2a28358e35 SHA512 53ca7ebde3fcd345a895527da2ac5d829a09f25d28836a867b500282fba3465bde657cd75a4030cb831022f7a0d9f50aadb36078d62924e4d0edad6bfe3c5561
-EBUILD appstream-0.12.11-r1.ebuild 1987 BLAKE2B 02c477281a890e89340717691068bfda917d6cf6ee813446344cab007c08686e6f9081a08d5840f9cf876bf93ef1e267b8d39f39049789eb3b5fc8af2dfa4149 SHA512 a6c001e523e881cb13a5c68d1b8cef3d629a2d44544da96a47346eb058fefdfe956514e8b81a584e0839bb2a6ccdc09306aa4a113f9c470890094e36c9f9bb36
-EBUILD appstream-0.12.7.ebuild 1619 BLAKE2B 0355409cb6ed3d49aba5deee05dddb87dd000b45427a472a1ca39a9c887567ef7f26cbf777eb9b9a6ec50e90b5544c1c607636ec22f8227ac5f087e7b2d0bcec SHA512 90a0ab33c5cf51b48c4297da10e26765b18a55bf5d2b18c051d6119ef10bc94d6470cb708d3105af39349ec63de90c1f03883544dcecad6853bce85f09b9b4fb
+EBUILD appstream-0.12.11-r1.ebuild 1986 BLAKE2B 8ecc11e3c61e1d1e7edaf4904086e38e63a3eaaa079125435aa88188d1d173e455490a2f8aae79e7c0d10d15b621492cbc5bd366cb36b6cced52da79b892b3de SHA512 1e4574d879580cee470d87f7359a0d879675efcf72f7d3026e6a33bbf51b73abeeca26eeb79051a6702a14be1da87598635bdd65e331c903ff47fadb0f19b357
MISC metadata.xml 399 BLAKE2B 433fcfbb840f3efc4130de1a4b9a18ce3b1762363bfa67d994a063098da0397b6776a6154250ad5a35a4960241234f2ba3dc2464b760cf19cbb680590d559049 SHA512 1f81f3603fc34a3dbeb570fe83ed2ff97e4ea2391cda7d7ceef017624a8498052cda4a21dee1f6b8eb41407998dfcecd765bde556837d00b13caaa41989f934f
diff --git a/dev-libs/appstream/appstream-0.12.11-r1.ebuild b/dev-libs/appstream/appstream-0.12.11-r1.ebuild
index 622c2fe9a914..c6f2bbb71f20 100644
--- a/dev-libs/appstream/appstream-0.12.11-r1.ebuild
+++ b/dev-libs/appstream/appstream-0.12.11-r1.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} = *9999* ]]; then
EGIT_REPO_URI="https://github.com/ximion/${PN}"
else
SRC_URI="https://www.freedesktop.org/software/appstream/releases/AppStream-${PV}.tar.xz"
- KEYWORDS="~amd64 ~arm arm64 ~ppc64 x86"
+ KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
S="${WORKDIR}/AppStream-${PV}"
fi
diff --git a/dev-libs/appstream/appstream-0.12.7.ebuild b/dev-libs/appstream/appstream-0.12.7.ebuild
deleted file mode 100644
index 592863c75581..000000000000
--- a/dev-libs/appstream/appstream-0.12.7.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson xdg-utils
-
-if [[ ${PV} = *9999* ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/ximion/${PN}"
-else
- MY_PN="AppStream"
- SRC_URI="https://www.freedesktop.org/software/appstream/releases/${MY_PN}-${PV}.tar.xz"
- KEYWORDS="amd64 ~arm arm64 x86"
- S="${WORKDIR}/${MY_PN}-${PV}"
-fi
-
-DESCRIPTION="Cross-distro effort for providing metadata for software in the Linux ecosystem"
-HOMEPAGE="https://www.freedesktop.org/wiki/Distributions/AppStream/"
-
-LICENSE="LGPL-2.1+ GPL-2+"
-# check as_api_level
-SLOT="0/4"
-IUSE="apt +introspection qt5 test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
- app-text/docbook-xml-dtd:4.5
- dev-libs/appstream-glib
- dev-util/itstool
- >=dev-util/meson-0.42.0
- >=sys-devel/gettext-0.19.8
- test? (
- dev-qt/linguist-tools:5
- qt5? ( dev-qt/qttest:5 )
- )
-"
-DEPEND="
- dev-db/lmdb:=
- >=dev-libs/glib-2.54:2
- dev-libs/libxml2:2
- dev-libs/libyaml
- dev-libs/snowball-stemmer
- introspection? ( >=dev-libs/gobject-introspection-1.56:= )
- qt5? ( dev-qt/qtcore:5 )
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
- default
- sed -e "/^as_doc_target_dir/s/appstream/${PF}/" -i docs/meson.build || die
- if ! use test; then
- sed -e "/^subdir.*tests/s/^/#DONT /" -i {,qt/}meson.build || die # bug 675944
- fi
-}
-
-src_configure() {
- xdg_environment_reset
-
- local emesonargs=(
- -Dapidocs=false
- -Ddocs=false
- -Dmaintainer=false
- -Dstemming=true
- -Dvapi=false
- -Dapt-support=$(usex apt true false)
- -Dgir=$(usex introspection true false)
- -Dqt=$(usex qt5 true false)
- )
-
- meson_src_configure
-}
diff --git a/dev-libs/elfutils/Manifest b/dev-libs/elfutils/Manifest
index 0fe2c8eeb818..e6b45a1bef20 100644
--- a/dev-libs/elfutils/Manifest
+++ b/dev-libs/elfutils/Manifest
@@ -6,5 +6,5 @@ AUX elfutils-0.181-CC-in-tests-p2.patch 1390 BLAKE2B 1e790582925769ddf2346a6b3da
DIST elfutils-0.181.tar.bz2 9088984 BLAKE2B 3f35f1a494986ff23d755188aab2b8f5ca9729927dd0e01725abf8477ac09721f751ff79686aafeff3878cf52e0c3f3e06d794fdf6371382a1bffc85c0de3411 SHA512 d565541d5817f409dc89ebb1ee593366f69c371a1531308eeb67ff934b14a0fab0c9009fd7c23240efbaa1b4e04edac5c425e47d80e3e66ba03dcaf000afea36
DIST elfutils-0.182.tar.bz2 9096742 BLAKE2B 59efd76c921a90a5ac18a62a00845080b574f167ae633d32b14acce554523736d0ccfdf539ba61e8ec1511b3294b486e0fa512887582a2e5cc34e71954e87e73 SHA512 8ab0735bbe11b4383169341bf674ace360038b6ae5239f1d5a991c46260cd4bce545e078735b7de3b8fab132bb5da41f60689ff1b1d7ebccfada117a954a2c81
EBUILD elfutils-0.181.ebuild 2457 BLAKE2B a6284d30d68fcd9d7ada06c499fea705cf4407441a5d7d971b77a9303986379a58ad70054915e54694e97480824ac3bb800fd06206cf1ec40727cf9c0660727b SHA512 517519049ab656b6d86e3ef5188dbbbe04a9c19c6e374620df5c60d28967c4158d0f70d2b80d9bce9a4c0eed3c3e2fa43344f14b30bf63b43eeb3bc9218697d9
-EBUILD elfutils-0.182.ebuild 2546 BLAKE2B 7b0c520886ecb5ef6a96b22d6104ecf155df02dfe055d982c48a168c5c582c1e6a55b497c1a8fa0c04e7ce4af71488125ae26dc8b1518437085c913ecae5a126 SHA512 5e44638022ca23cd9b75b79699d98a809e14ab63ab0ebb1196d1358fa24ede64c96956bf5f723e162cd3e555d629000fb71a1cd9f653dd7336fba0c8316b31e8
+EBUILD elfutils-0.182.ebuild 2545 BLAKE2B 89299bc12196b2850a01426ce17afbf10066a2332ff0aefe2a91092e48f16e99b3ffb94757ad3cdda78276956ed34a180525a3b4c6916911268b2e653febadbd SHA512 c58bd0bbb091f7dcf885255269939ac28422fac08446f8409878e2cfe895e5895bb1efdbf7ce797e92e0575ebcc0968537d7f9437095570adeaedf00ce2d4f5a
MISC metadata.xml 729 BLAKE2B 7fb60c690ef99ef62b4cd4fbed802a48141b90e295f84fdad09cf18d061dd94a63086be119d733249b91fca67a1588bcea9ee442e3dd142921cb9c163d65a726 SHA512 2e5c223aad3d51f6ae770ae7feacd3731821c9de0b68f6ad2d89a4c7c8360ba6decbd6d73416648186f19d19b4aa6516302cba6554c9f4955024a19c082d0f85
diff --git a/dev-libs/elfutils/elfutils-0.182.ebuild b/dev-libs/elfutils/elfutils-0.182.ebuild
index fb94d66e0f1b..3a2d05609627 100644
--- a/dev-libs/elfutils/elfutils-0.182.ebuild
+++ b/dev-libs/elfutils/elfutils-0.182.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://sourceware.org/elfutils/ftp/${PV}/${P}.tar.bz2"
LICENSE="|| ( GPL-2+ LGPL-3+ ) utils? ( GPL-3+ )"
SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
IUSE="bzip2 lzma nls static-libs test +threads +utils valgrind zstd"
RDEPEND=">=sys-libs/zlib-1.2.8-r1[static-libs?,${MULTILIB_USEDEP}]
diff --git a/dev-libs/keybinder/Manifest b/dev-libs/keybinder/Manifest
index 5a3bcd069375..0a6c7472c7b8 100644
--- a/dev-libs/keybinder/Manifest
+++ b/dev-libs/keybinder/Manifest
@@ -1,5 +1,5 @@
DIST keybinder-0.3.1.tar.gz 391730 BLAKE2B ea286ab5bbd864709a1290ffd8d7d45468b1d525b4fdb8967159bbcf32ca8dc3d057ba39ad35dc19f5f68f67160fc48d805e107fcaea22f81fdd8bd1125db908 SHA512 aec4070b3d3b6c00900c3cb814e4b6a98beea09817eba3c3f7e6d5ce1ff68c091d183583f09b475e3e56bac67c94c1d912ebbe079dcece8195ac0ed9379d5f82
DIST keybinder-3.0-0.3.2.tar.gz 378942 BLAKE2B f998430a14e881b5b1802747ec15967d60bedf8e076e5ace886a665ad168eb297679f30289b6cae835f4b291a0744c12331e420dcafbfca7e63cc5e807e9cd46 SHA512 14171875e03ade88165f28c7267b66cf9efe34259d7a3072a786ba49dacf8f8d6d84753b1aeedec5dfb0a24028be86bceeebee2f6b1bf5ef2eb79ee45f909b11
-EBUILD keybinder-0.3.1-r201.ebuild 908 BLAKE2B 9b4f9ecae38e9ba46dea4df59528377a7b07888a035a200f6c22e3ed7586b54773553c3e2a944a58fa044e17918ec933610eb261d267411b4b14a9ad31ce4afc SHA512 cee265807061a943c6889d7b4af61c0f70721265cdac3f9e0a7af6d051c2eec29d2374eee8ccabfd9ce625f48cd6edfd76003359b9a559fced2f2d5534b4811f
+EBUILD keybinder-0.3.1-r201.ebuild 911 BLAKE2B eb81d635fceaca7cb9b0990820501771e088c0f11e0f4c697abf7bf8c278f7efe4d0b1c2cc37afe011279e5a9f5d31a3dd9881121ff0a17ac6a76e349535344e SHA512 2c944bf1571a00543d4d816d1fe91a1d1a8ca18fe93c04d00acfc6268a8c06b8922d4688804ee828828a0968fb4bff8f8683ca60b5528c7d7d8ffdd76f0fc92a
EBUILD keybinder-0.3.2-r300.ebuild 1073 BLAKE2B a7201d3f21433e4b269cb62d99b5f3738541d8499da5a2a5d20ebfd45a87dd00b630e6d05d8f31e620f0092b32fd4c2dc6eb87a21f6900ff16a5cd4017df722c SHA512 8474b7abfaa53072e284d92b311783c1ce8effe12f74cc45c5d42a9e7392fb856eb1ef77580ed11ad2f09c7b935193ba84d7130c48e03f9a27ad136878f989d5
MISC metadata.xml 327 BLAKE2B 61157058cd32bae91e1b8bbae3235e70fd34ec1c6f89af874e974e76e5daba3ddb9b34878271d96a4ac761126b3d596f257014f24d40130256a2fcfa491f86d1 SHA512 e2597d9b1771b6cc57c5b372c5fa3a5a51cea3e87bbe3aaee10eae1fd90c445859eca6f855eb34f079253da6a771a747257ffe8b3b1834597791c03b7d3752f8
diff --git a/dev-libs/keybinder/keybinder-0.3.1-r201.ebuild b/dev-libs/keybinder/keybinder-0.3.1-r201.ebuild
index 02e68ac665c5..e25af14fe258 100644
--- a/dev-libs/keybinder/keybinder-0.3.1-r201.ebuild
+++ b/dev-libs/keybinder/keybinder-0.3.1-r201.ebuild
@@ -17,7 +17,7 @@ RDEPEND=">=x11-libs/gtk+-2.20:2
x11-libs/libXext
x11-libs/libXrender
introspection? ( dev-libs/gobject-introspection )
- lua? ( >=dev-lang/lua-5.1 )"
+ lua? ( >=dev-lang/lua-5.1:0= )"
DEPEND="${RDEPEND}
virtual/pkgconfig"
diff --git a/dev-libs/leatherman/Manifest b/dev-libs/leatherman/Manifest
index e364d4322b0d..aac2cf127c40 100644
--- a/dev-libs/leatherman/Manifest
+++ b/dev-libs/leatherman/Manifest
@@ -3,6 +3,8 @@ AUX portage-sandbox-test-fix.patch 2010 BLAKE2B 8e9e180c180f2059f57c953a9c828164
AUX shared_nowide.patch 4627 BLAKE2B c29dae187c0056956498487e0b6c8a88b74253f5d221df3f274da9bea7ae5163b76f3027df99e06fec7999274751c6d173db6ca7ec896a687536d7199c1b4827 SHA512 cc05ed7250728490955cc464d3a32ce4d81cfd7a9518487fc7d0f7a397eb0ac522e474cfadc036f233080e508f148f644c41764e31f99b76ab75403a7ca78486
DIST leatherman-1.12.2.tar.gz 816010 BLAKE2B 4b7b00b88ef0ba5cb01405aa24fd5ff72918a122cc8a1c0a029e374152964f77afa29a1f503ed5863a39bd13aa808dba2a0b351f65756e97c8e2e8408358cbfc SHA512 9be8333b616bd9772f234474ae874c7214fa0c1bc4658ff042233d6e1683cc61b63d666d750297c79a8058490e42c8b2ff8999cb7f04aa329644f52540e43bde
DIST leatherman-1.12.3.tar.gz 816018 BLAKE2B 6245284856613b99df2ce412e497ba69fe1a016a82ca5ea7f78ba591dc287e2daef051214b303c1cc463efb537354a01ad6c57688f244382b3843b8bfdad6f3e SHA512 83f785ba7c69032e2c9c7f2fb07aa5c100ed9e1a81c88ece19d7a96647b9a46927b99fd7144c08d697863e44553f00adf6bc4964f45e900809827956c0949b36
+DIST leatherman-1.12.4.tar.gz 818043 BLAKE2B 7a8718d598bf48b70d555d2a21e2e930eba6b3407ad5414b43d30411acf4c9bf4193ad20058b63d3c8911b7c5b0d021f84d6eca6dd3d00165c7d145186f8177f SHA512 b2645a5049856f93c30bb89e87e3a47cf8137aeac73708248b2b228874818063fb31440ca2bd760783e8c95e880fe7ae34a387fcc448efee01dd0cda48089b55
EBUILD leatherman-1.12.2.ebuild 1329 BLAKE2B b182be7c996de4512b7b0861ef56e9465fc797890b483b9d168d2cf3fb2059ad7de01b6bdd94fdff8e63b1cab2fb544f71fed9442d8aa9e43ca1876babee05aa SHA512 438ec777192a6fa0bb1ac13e3312cd463b968f6747f3277b7d157a995a666bcd560772d47dbb4a07057f3cc6d8f848df33bf86ac472044c7d502e102b94aca9a
EBUILD leatherman-1.12.3.ebuild 1332 BLAKE2B ef44d85818f9602a06e77e6a252ee88fae8dad1f5dd36c546efddc48c824d99f7e5bc4caeceb08b5be4496743cb52a76951e20a72e2f93f699079db1b7fb0d88 SHA512 a52e48a284895fe447e2783fa302f4b64eadaa69025699193d69dcb1db8c27dcb48b7b1dbc69f55cd9ec1cf454cbfffeee2d9075d9b1aa2271e6048d24b1fb6a
+EBUILD leatherman-1.12.4.ebuild 1334 BLAKE2B 40cf1da626e9e0b83b91c76d432fa7793456406335f8029cafc96010a396d2e880b40dd6515daa7ab5e74955562d517415907fd8764c2daccf7b5f3d8a89053f SHA512 d99e688e02e91b83edffd89b08f722ea43b1b927545f24a994e380450f257a555c35587a0d8834fbcaa8941e9c826283a4877d61d8767c203fe66a5d589253c4
MISC metadata.xml 340 BLAKE2B 01f27cfaa9f6a13507f19e336f6171dd9b7321bd3ab7954b381d8200614a5e5e3706ab40d2472b6aaf2c0b2191c7d49c36fe9f8b218824101f85577fb700470c SHA512 f4b877e9d23996a6fca8d3c72c90bdc4a80e5218dcaea4f4c461473dff3d30db2aacc389bb156db6085ba02766ca69868842514ee6317c58373372cca4c48cf1
diff --git a/dev-libs/leatherman/leatherman-1.12.4.ebuild b/dev-libs/leatherman/leatherman-1.12.4.ebuild
new file mode 100644
index 000000000000..75314013d9e0
--- /dev/null
+++ b/dev-libs/leatherman/leatherman-1.12.4.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils multilib
+
+DESCRIPTION="A C++ toolkit"
+HOMEPAGE="https://github.com/puppetlabs/leatherman"
+SRC_URI="https://github.com/puppetlabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+IUSE="debug static-libs test"
+#RESTRICT="!test? ( test )"
+RESTRICT="test" # restricted til we don't need the shared_nowide patch
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+SLOT="0/${PV}"
+
+RDEPEND="net-misc/curl"
+DEPEND=">=dev-libs/boost-1.73:=[nls]
+ net-misc/curl
+ >=sys-devel/gcc-4.8:*"
+
+PATCHES=( "${FILESDIR}"/portage-sandbox-test-fix.patch )
+PATCHES+=( "${FILESDIR}"/1.12.2-shared_nowide.patch )
+
+src_prepare() {
+ sed -i 's/\-Werror\ //g' "cmake/cflags.cmake" || die
+ # vendored boost lib conflicts with boost 1.73 and above
+ cmake-utils_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DCMAKE_VERBOSE_MAKEFILE=ON
+ -DCMAKE_BUILD_TYPE=None
+ )
+ if ! use static-libs; then
+ mycmakeargs+=(
+ -DLEATHERMAN_SHARED=ON
+ )
+ else
+ mycmakeargs+=(
+ -DLEATHERMAN_SHARED=OFF
+ )
+ fi
+ if use debug; then
+ mycmakeargs+=(
+ -DCMAKE_BUILD_TYPE=Debug
+ )
+ fi
+ cmake-utils_src_configure
+}
+
+src_test() {
+ "${WORKDIR}/${P}"_build/bin/leatherman_test
+}
+
+src_install() {
+ cmake-utils_src_install
+}
diff --git a/dev-libs/libconfig/Manifest b/dev-libs/libconfig/Manifest
index 12479e17e83a..84604624f732 100644
--- a/dev-libs/libconfig/Manifest
+++ b/dev-libs/libconfig/Manifest
@@ -4,5 +4,5 @@ DIST libconfig-1.7.1.tar.gz 2290501 BLAKE2B 6c55e0d41c1475434bcc61203bda40c478d0
DIST libconfig-1.7.2.tar.gz 3017891 BLAKE2B 1b8bc54857feff506d5cd62312a35f0f8a123380567881bdb8241f2232c5281399e4283687a3254b8f43a92b8f7d5ff3f72ec4fd875bf1b9d5d6c7703014cc3c SHA512 9df57355c2d08381b4a0a6366f0db3633fbe8f73c2bb8c370c040b0bae96ce89ee4ac6c17a5a247fed855d890fa383e5b70cb5573fc9cfc62194d5b94e161cee
EBUILD libconfig-1.5.ebuild 1149 BLAKE2B 861f459cd4e24bd963bab3f40fc4cfe2dde2d6f12dfaa1126499104930116f3f137fc4b7660b3e501c8ca7c33ae1b0fd4c8ce4be0ead5e6ee742d882d89e92c3 SHA512 fb12451fbe810025ed30a7521ae7608ef231db463a786bd8a4068a9816bf650a3378702bb0df86006e630d8267212f03f712b80ae2dc355161ad3b162c491ac2
EBUILD libconfig-1.7.1.ebuild 1081 BLAKE2B 0159ec03bd1eda0dfb8c0879a0e0c7faf8c271d6c9f5e97f43faa5f61933b62c9de5e8c856f7484a2715ea7fc1d5bebb3d217c8dcaa63261f298fdf00b781e9f SHA512 b0d628091682d9035255b9bd0b41f1f4d41950b8c1e21ce16d052108590cc0e03e765169d5839d1725b9fe410233ae848d5b336c95c32e78a1cc0907c30b6881
-EBUILD libconfig-1.7.2.ebuild 1036 BLAKE2B 5f87e50f98f101cd3c789a56735aa4f57e69f8a5bb260eb7f569384342defdb52911a7f1ef5873b4fe43b47c4e1448c7b1a50b1bb38a30fbeb5b7bfe99051673 SHA512 baa7ba2726850ca7961085ed78b9ebe56641760912002aadb2a3b26e5d5b81b08cbfc7ffc2117d28d77531873c5906ec0d68c1c8ac63895f1e2000ed48d151ee
+EBUILD libconfig-1.7.2.ebuild 1035 BLAKE2B b90d31d4cd56c3e2d7cf5b234da5ca389ef3b5f62f9d55526614474afc9fab47a41ff5c07c912f56d9b996ce55f7941f32ff18f4b76e36a7ff01d5922a060e3a SHA512 c0b0161cc4de4982e461d36e74ca379291df3b1ea4d6f1726a4f4d7eca3e19fdf842140ff56d9094f8a3e759e96c337d8732f205f8875ddf8cbcf36ff5225ba1
MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-libs/libconfig/libconfig-1.7.2.ebuild b/dev-libs/libconfig/libconfig-1.7.2.ebuild
index 225468fb0c9c..374b0c9892b7 100644
--- a/dev-libs/libconfig/libconfig-1.7.2.ebuild
+++ b/dev-libs/libconfig/libconfig-1.7.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/hyperrealm/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
LICENSE="LGPL-2.1"
SLOT="0/11"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~mips ppc ~ppc64 ~s390 sparc x86 ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~mips ppc ~ppc64 ~s390 sparc x86 ~x86-linux"
IUSE="+cxx static-libs"
DEPEND="
diff --git a/dev-libs/libgit2-glib/Manifest b/dev-libs/libgit2-glib/Manifest
index 216e21286067..fc15150f5509 100644
--- a/dev-libs/libgit2-glib/Manifest
+++ b/dev-libs/libgit2-glib/Manifest
@@ -1,4 +1,4 @@
AUX libgit2-glib-0.99.0.1-vapilink.patch 848 BLAKE2B f37a6220afa807eb45c5e0fa45792c863c2b64d6217f40466f72771e0ff708b9952316c2f354d0d0b303cbf26615155d5ef75e494d9e92d6b1e93ffcfc61dcfb SHA512 86ba5754300ec4852aa09f475e6ad29fb8dcadb7634a919d14c88525b8299e0af6fd2a5640feff6c07ae94f2116584933e58466dd5ebc6bae09c17e58b3e0e34
DIST libgit2-glib-0.99.0.1.tar.xz 140996 BLAKE2B 0c163467ea43ab236b2c856416940b1ed7c93e6ed8ce9980d2d146f0633830ab3765d8bd34bdaab31efdb4096e88e0513c9585b9e06a3efc800d5c32a0d29479 SHA512 48b34ba84b5315d23d0429a684753c3a64c62086d70a67fdb4dfbf8f2ee883f5a90d7e59cfcfd229682794c455b668eb9bd7bf6159d6bfa45a99ddc2461d7c25
-EBUILD libgit2-glib-0.99.0.1-r1.ebuild 1326 BLAKE2B e08dae84a9c13cd52b37f0ec9db186f0f41f9dc4e9b04720365297576445cb28c0c29fa5394f9c03259a060648f68516eb76ca5a6095ae9e8e13d1595ee938a5 SHA512 8e89fc44aca4e6448490e31e0e71d19f55036333f6d6ede90069df648c909d5d37f06a8dd461433bb7aab6a3e14259a8783df72216cef08ba63a2382b2d32e5a
+EBUILD libgit2-glib-0.99.0.1-r2.ebuild 1296 BLAKE2B 51568ed6c65e52a9e6c589f420eed9879ea2fc1fbe6d0a7ebcb97b2c021b940c2f4791ad0850467ad8abe109fd2c4f4b6bd825b565b44d682e41d33c95c8a649 SHA512 415e66d98f658e10ce007e6d2fe4fcfbda70fc240f35ca09c8f0478397b86d9d2997a57feb77958413900e206d73b93d821587843fa3e635be10f2aeccc9fc6f
MISC metadata.xml 431 BLAKE2B b9cd78ab798b15be24933f218649464c25a768b6fda11d29190a18d49d2d5b2011555ee047a6b6d14df94cde89dd6bd83a85cf525215ff84ccaa2c8b5d64bbc4 SHA512 7ec17f350ff55331f7c502957be11244f629201769446e9900660f1573872a4425036feee58a9c82f05ed16d7e36820719818b7cf29bff4c37ab944c4c19c970
diff --git a/dev-libs/libgit2-glib/libgit2-glib-0.99.0.1-r1.ebuild b/dev-libs/libgit2-glib/libgit2-glib-0.99.0.1-r2.ebuild
similarity index 92%
rename from dev-libs/libgit2-glib/libgit2-glib-0.99.0.1-r1.ebuild
rename to dev-libs/libgit2-glib/libgit2-glib-0.99.0.1-r2.ebuild
index 9c356e90db4e..28d257951044 100644
--- a/dev-libs/libgit2-glib/libgit2-glib-0.99.0.1-r1.ebuild
+++ b/dev-libs/libgit2-glib/libgit2-glib-0.99.0.1-r2.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+PYTHON_COMPAT=( python3_{6..9} )
VALA_USE_DEPEND="vapigen"
inherit gnome.org meson python-r1 vala xdg
@@ -19,8 +19,7 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
RDEPEND="
>=dev-libs/gobject-introspection-1.54:=
>=dev-libs/glib-2.44.0:2
- =dev-libs/libgit2-0.26.0:0
+ >=dev-libs/libgit2-0.26.0:0=[ssh?]
python? (
${PYTHON_DEPS}
dev-python/pygobject:3[${PYTHON_USEDEP}] )
diff --git a/dev-libs/libgit2/Manifest b/dev-libs/libgit2/Manifest
index 5dffb370ad90..89f4edb80b22 100644
--- a/dev-libs/libgit2/Manifest
+++ b/dev-libs/libgit2/Manifest
@@ -1,5 +1,5 @@
DIST libgit2-1.0.1.tar.gz 5312878 BLAKE2B 7eb97bb97d66240ce135e21d348f6dea0c5626992b608f8944b75f9bae5de933fffa07edd536c0353841f8d02c950feec1451008003e35f53554f3c59b069a7f SHA512 7c307822b22e3771e5e908b115600310f7901b3250287532c498003b25a5b1e007bfa23592f16ec4d83c1567a9213710526f78cab7c120316e9a8fc74c5e57a9
DIST libgit2-1.1.0.tar.gz 5426975 BLAKE2B 2a1c1f71d2a2e06448c78eb46028fdcfd59682dccf2365851c4bd059cdd78842320f9a5ba7345e761611a5b4eba634faf2e26cc669097da0ba2e1c832c23059f SHA512 347bb68900181b44fa58a0417506c91383adb965607fce049a5b4c57ac9cc286e0a140d164c339b50fb6cd6951f47757c2917a2df44ba004bfaa4fb643946bb8
EBUILD libgit2-1.0.1-r1.ebuild 1723 BLAKE2B 66423a046e92f83e993832162461d1b667e4e76b0044e67b1951b5b589f2b3d42017a8390b8bc18365ada4f01cbbcfae4327f2001eeb3388b71839ffd406d029 SHA512 50a855668687a4eacac6d0bd61095b4523ed595b438d14854e03d6e06c4fe146164b415753bf252e7a8261327d017a65ae85ff5cda56fe9074e2b0b84d4e7b3c
-EBUILD libgit2-1.1.0-r2.ebuild 1729 BLAKE2B ee97f7f5e46fa12f4276999a91887c1bf4509f4158c286521d28c90fce843a52afb766ac4065cc250343069a7d468c08ae420aa73f27c1214e8c31f897918284 SHA512 27d5a32adc67491da4218ea07b4d2542cba6d90f2887e0e91dcf037787514455cee6143f423cd4a3fe588888706bec2f2c71701ad52eecc82873ce67d9d97950
+EBUILD libgit2-1.1.0-r2.ebuild 1727 BLAKE2B 85cad0924480ac8e9d2e18a67ab38845f860d1a27632e7af84b0b1ddbd602bef7d95fa583bd6e4be184f34f82d66ad00b517cca3ad8c9d86eb6a9f5d4391a0f3 SHA512 d9689240405d3ede70e84faf3560273297fc7bafd3180c818d1beb6a81a05388ceb7424f8d76888bba22522a7525f9812ce59f0d161567012bd0e70942b2a25d
MISC metadata.xml 915 BLAKE2B 1882bdcfaee50de784b4aebeaaad4f04ff3f2385721b354ed685f3353ea92b83344559905cff5a9adc2a316b684079b64d9930f14081c257c8066dd7d4c89a33 SHA512 5b6f2239f656f490b0961788f8047662fc00ee10bc5ad9ee3a326313285cd29514c1eda54d17b878abef3d73034f997aa814a64ff496dcbe9f05ef4708825c35
diff --git a/dev-libs/libgit2/libgit2-1.1.0-r2.ebuild b/dev-libs/libgit2/libgit2-1.1.0-r2.ebuild
index 40e1fb17fcef..8373476bf113 100644
--- a/dev-libs/libgit2/libgit2-1.1.0-r2.ebuild
+++ b/dev-libs/libgit2/libgit2-1.1.0-r2.ebuild
@@ -13,7 +13,7 @@ S=${WORKDIR}/${P/_/-}
LICENSE="GPL-2-with-linking-exception"
SLOT="0/1.1"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~ppc-macos"
+KEYWORDS="~amd64 ~arm arm64 ppc ~ppc64 ~x86 ~ppc-macos"
IUSE="examples gssapi libressl +ssh test +threads trace"
RESTRICT="!test? ( test )"
diff --git a/dev-libs/libprelude/Manifest b/dev-libs/libprelude/Manifest
index 69708b02e775..23824b51ae34 100644
--- a/dev-libs/libprelude/Manifest
+++ b/dev-libs/libprelude/Manifest
@@ -7,9 +7,9 @@ DIST libprelude-4.0.0.tar.gz 2864402 BLAKE2B 2e51eb1af74b63140bc66a358b112a753c1
DIST libprelude-4.1.0.tar.gz 2852916 BLAKE2B a18babb24795d17d72eb1c0755f4b0330125c8b289af0b52753f6f69b5e820f0f972019b57eaded3abfc45c69bd75c0d120fe29982887e55d75f2c4c8b6486f7 SHA512 073307ca070794b47643e2ef2db4788fa92374735558b466441f0663f420cab45aecc7a1d99bb487ad23ebe602d5668369ffa6ab29fa3b0504356420ab3a7878
DIST libprelude-5.1.1.tar.gz 2898350 BLAKE2B accc8610e8551f1c62156ea87748fa1dba2bd7d8bc0813782b2a91fde1cda5d64b404003846cd17af030486654cf48889dec5cf27c64874ac07c9cd905eb13ec SHA512 eddd6e1cf4fc4b2fa79a5132316576cc7205915fa19bf3a2a68cbc4eaf5abf50e5c594384aa1742d620304916da634e113a7c33e4ebca2bcee96e35c9796ed5f
DIST libprelude-5.2.0.tar.gz 2902019 BLAKE2B f4caecdc4d34a075fecef73e043e653943fb4af91f4ae5ec5bfdd2d00acccd2095087ba2e6e98aef786e801ba4396f7a66af2de64b5ab8de50921e078614e1a3 SHA512 e0dc0d7c06a4c250a5a12c5cddd8aa8db33d94f8afd85b1afdb264717d674e0dc0b4dc8a5336860df74ffe408023cc7a5356e3acc3c96876099659e33ce04dd0
-EBUILD libprelude-4.0.0.ebuild 1722 BLAKE2B 2b36c1e22214a06f031d3a98a97d189cb73a366cb8e96e897a1cc89a32908f4dd6fba4229112128571062ce09f4d730c0449a86067ecc2a5312edc388cb81ef1 SHA512 2f5d8c16260d0315e1f351943621b9021836596202f54397e6864e532ddc037a4374351399636c1450711d700e0d8e99524a43e4ba1d28873f981ad8ad8b33f4
-EBUILD libprelude-4.1.0.ebuild 1723 BLAKE2B a77bd79df9b56432009a6d94903891bc2bc1f207a2d3d5c088d58ac61ff1ecde897a184301aef80d9da7b10c202246ac18dea144a1d29ffeb10d2beafeff74a4 SHA512 44ceb27532b2bd81fc2d50c8258969a559be61249fb05080c350413c628e40e7d17e8e02d32c9c159f44ac0eb81c4b59d3236d39b8eaa999345cf632886f6f02
-EBUILD libprelude-5.1.1.ebuild 2006 BLAKE2B 82bffd675533d7ae41c4f660d0bfe4053b5dd820ae83337b582a17a030b807a1578be95bff26502c3e07bf0aa8048b352d79dd1a331921d45d3baee35057f594 SHA512 21deba252e8d04e8dfcf9815d54a77dadd731dc94e5bd246ea4483eb686feb93db02cd48aacf425e3cd589a3a4157e623982a83e445d4f0d9ecf360dd4aa462e
+EBUILD libprelude-4.0.0.ebuild 1723 BLAKE2B 83c34a0ae5a6223ee01fa76551b11c38cc77b48734a1cdd491e0593d94a690916804b36334606040c1f5aedea99074cee8a1273b4a03d5a767ebb55ee5f6e207 SHA512 1807a5c6905f69d40d3b309a43993c0214bc5c8cb22a212933288fb18463c528a2b7f4bf515eb3f7d4283114f23ed0c7ac504dbdde064ed74f93ab7ed39bb0b9
+EBUILD libprelude-4.1.0.ebuild 1724 BLAKE2B b5e68d2e461b569adc28ed64572c895c6f0b87ab8b8fd3aef014d980b6e4335cff56b2cd84e3e68e2e285b086fb00ee67f967745da62cbc9cea3fd3d582435be SHA512 e06bc4ad530a1235d017893f067ceb6cdfc282cdb4aad1398a66c3579d727699566322e7479f58a6eb2b4c338c4d0a13c5df6b69152d7cdb4af8a047ee1c38a6
+EBUILD libprelude-5.1.1.ebuild 2008 BLAKE2B 98c88b500c970efc07c29de27b6dae8011860f915cd3121613c751548078d34961681e9d6252f9646f952d34744770661cf856520291b7d3233e84f3c51e36b5 SHA512 0946b61534ed9da3a16ae6f972f581f02188a9ba64763fc81fae7ad237fea1b5c79371f200b6a83eba50ea3737d227939cfe296f5b6276e522a7deb49cd757e2
EBUILD libprelude-5.2.0-r10.ebuild 2064 BLAKE2B 296f12c0d9d66f15bd9861cd5cf8479a42c353deeed7e08d797c3b07b47691bf2b59fed720ae68325be69efd89bfa850544e67cf501f08b3b401ac12ecd08951 SHA512 e08374052c20ad7a8bc5fb996c6a5bce4cb581c91c55213dc4ae1d038aac939cfc113fd4ed16385f05979689a85f8af287da647ea457d0a8621632fd51f67d6e
-EBUILD libprelude-5.2.0.ebuild 1949 BLAKE2B f4bbc30333ed72d5373759868880742f4f0bf68fe2b2ecc3a6a47a59963b99e33cf87057ddd56249eb7266abb79d75e69d6beabe0f0da06e86fde4c512754082 SHA512 2e3971c1395f317bf3a32fedfc73bd2e5566d5ae889fff3609a77097d87d6a72fe32b523b42c1bb5bef8e59243396bbeeea381a8220b50f431f990ec669220ea
+EBUILD libprelude-5.2.0.ebuild 1951 BLAKE2B e522b51c691b1d0f85750b4d2affadd7a4d4a5a2d28b7fc54f83dc89330e03a7849592eaac2109668011608ef2a0b1e39a253cfa5b4c25b07b22ef50abac226f SHA512 68bb5a3a20f1f36c812640e6096a862e45501a2f0f12f5337f36610e922273a0511264e5b69ca798c0ea53e42dd1bee6e84885d2ddeeaa3c2248617f0250f691
MISC metadata.xml 871 BLAKE2B bf71e839f29918c8b71d3bd9e45c6afa99391f476ff8c94eb43d9378e754ddafb9cf4aeef69dce4fc2210819b08f62898d7ec4717a9d7f13d04ee3df24e0a734 SHA512 bf4e35e6d51f1797b24c262a6cfd38ef1ce06e80b504afabb2f3f0aa7f069335e96562f3716b819abaa1bcb1f8f88bcb1a72a11047cd87fd4d62d7903b200cec
diff --git a/dev-libs/libprelude/libprelude-4.0.0.ebuild b/dev-libs/libprelude/libprelude-4.0.0.ebuild
index f8d9794f1d45..9e81d89702cb 100644
--- a/dev-libs/libprelude/libprelude-4.0.0.ebuild
+++ b/dev-libs/libprelude/libprelude-4.0.0.ebuild
@@ -20,7 +20,7 @@ IUSE="lua perl python ruby"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
RDEPEND="net-libs/gnutls:=
- lua? ( dev-lang/lua:* )
+ lua? ( dev-lang/lua:0= )
perl? ( dev-lang/perl:= virtual/perl-ExtUtils-MakeMaker )
python? ( ${PYTHON_DEPS} )
ruby? ( ${RUBY_DEPS} )"
diff --git a/dev-libs/libprelude/libprelude-4.1.0.ebuild b/dev-libs/libprelude/libprelude-4.1.0.ebuild
index 4c32375c5be5..89be5ea06931 100644
--- a/dev-libs/libprelude/libprelude-4.1.0.ebuild
+++ b/dev-libs/libprelude/libprelude-4.1.0.ebuild
@@ -20,7 +20,7 @@ IUSE="lua perl python ruby"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
RDEPEND="net-libs/gnutls:=
- lua? ( dev-lang/lua:* )
+ lua? ( dev-lang/lua:0= )
perl? ( dev-lang/perl:= virtual/perl-ExtUtils-MakeMaker )
python? ( ${PYTHON_DEPS} )
ruby? ( ${RUBY_DEPS} )"
diff --git a/dev-libs/libprelude/libprelude-5.1.1.ebuild b/dev-libs/libprelude/libprelude-5.1.1.ebuild
index dbcd337b3b76..db91df92cb97 100644
--- a/dev-libs/libprelude/libprelude-5.1.1.ebuild
+++ b/dev-libs/libprelude/libprelude-5.1.1.ebuild
@@ -21,7 +21,7 @@ IUSE="lua perl python ruby"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
RDEPEND="net-libs/gnutls:=
- lua? ( dev-lang/lua:* )
+ lua? ( dev-lang/lua:0= )
perl? ( dev-lang/perl:= )
python? ( ${PYTHON_DEPS} )
ruby? ( ${RUBY_DEPS} )"
@@ -31,7 +31,7 @@ DEPEND="${RDEPEND}"
BDEPEND=">=dev-lang/swig-3.0.11
dev-util/gtk-doc-am
sys-devel/flex
- lua? ( dev-lang/lua:* )
+ lua? ( dev-lang/lua:0= )
perl? ( dev-lang/perl:= virtual/perl-ExtUtils-MakeMaker )
python? ( ${PYTHON_DEPS} )
ruby? ( ${RUBY_DEPS} )
diff --git a/dev-libs/libprelude/libprelude-5.2.0.ebuild b/dev-libs/libprelude/libprelude-5.2.0.ebuild
index b067890b2796..a7ab7b8c79c3 100644
--- a/dev-libs/libprelude/libprelude-5.2.0.ebuild
+++ b/dev-libs/libprelude/libprelude-5.2.0.ebuild
@@ -21,7 +21,7 @@ IUSE="lua perl python ruby"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
RDEPEND="net-libs/gnutls:=
- lua? ( dev-lang/lua:* )
+ lua? ( dev-lang/lua:0= )
perl? ( dev-lang/perl:= )
python? ( ${PYTHON_DEPS} )
ruby? ( ${RUBY_DEPS} )"
@@ -31,7 +31,7 @@ DEPEND="${RDEPEND}"
BDEPEND=">=dev-lang/swig-4.0.0
dev-util/gtk-doc-am
sys-devel/flex
- lua? ( dev-lang/lua:* )
+ lua? ( dev-lang/lua:0= )
perl? ( dev-lang/perl:= virtual/perl-ExtUtils-MakeMaker )
python? ( ${PYTHON_DEPS} )
ruby? ( ${RUBY_DEPS} )
diff --git a/dev-libs/libratbag/Manifest b/dev-libs/libratbag/Manifest
index 71da697aa1f3..61a8c2873377 100644
--- a/dev-libs/libratbag/Manifest
+++ b/dev-libs/libratbag/Manifest
@@ -1,4 +1,4 @@
AUX ratbagd.init 336 BLAKE2B c6f2ef095cd7d929c3097a18e912ae4b3615bd0ebbdfdaa9f4151b312614c016af2f3581c2fbb2853472cb70ce47d5f26f254772fb9f3dabba2ce93626b672b7 SHA512 3908b3481b49bcebc84e3023ff911dcbc1773e4322356def0067ed4aa426184cf43e12de702e98210157d17c2806d57c1cb4bc79ddb0b8660036a6fe3974607e
DIST libratbag-0.15.tar.gz 249492 BLAKE2B 0f5b35800cb9f82cb892dacd5e3b041843cf5513507ee4882ec5b3f8c8aec8a24594736f2eb1c8e373a0ee38ace1e6328cbd4816d6e5b2cd1f2154ebd803a5fa SHA512 add47a6b3d771de77c6307e128a549f5295e216059b5a2375aa6b2b6bbebcf9a93d7bf148181b3f39f855976e9b6f57072dd9198d07828bebe85409f4ad994aa
-EBUILD libratbag-0.15.ebuild 1943 BLAKE2B 439c567599d155a0071913113c96493a0ec33e1f2aca55f1f9311468b29a52ed75371b1b5e6019359a2619a9e46c4ae55339d9db9fe9f96c911baff4966936b1 SHA512 eda7ebd7afa9c9c55b5805bb4e82484a1c3657f4d08811d692d63282d1cc2a037da72a0f7d9dc58bf3cbc17b6440ab619a2490ac9eaada16d260cfae46977e4a
+EBUILD libratbag-0.15.ebuild 1983 BLAKE2B aae71f42742972516cb9686ca639136f3487d2f549507111f7d5eff6655d80914326c2c860be2c1de7a63e53fdb6e9c1159f360c5053d2420477921c7f48fe12 SHA512 cca5ee5d04144b96d3299a08940cdbd889167c4b20b7aac141e7481d0d07013be7ea377903f756bec82df546ebb0f4f8fca2fc0392e6cc7aee51d745de505248
MISC metadata.xml 634 BLAKE2B cc8a930132b186fe8acad18725ff2c621edd878cacf59a65491c3515061d5954bff2eb9be72ee0b3901aff82acb6aab0f88d814528a62358171a4288da2b38fb SHA512 6dabec3887b8958f6351c5fb7e33ee512bff8905d36d8002b088f02f0bf5474e97d33f017bb866b67cc6b6b82939fef25549625aefd87546dfa626bb596aa5d3
diff --git a/dev-libs/libratbag/libratbag-0.15.ebuild b/dev-libs/libratbag/libratbag-0.15.ebuild
index bd064182e849..ace62db4054b 100644
--- a/dev-libs/libratbag/libratbag-0.15.ebuild
+++ b/dev-libs/libratbag/libratbag-0.15.ebuild
@@ -27,6 +27,7 @@ BDEPEND="
virtual/pkgconfig
doc? ( app-doc/doxygen )
test? (
+ dev-libs/check
dev-libs/gobject-introspection
dev-util/valgrind
$(python_gen_cond_dep '
@@ -38,7 +39,7 @@ BDEPEND="
RDEPEND="
${PYTHON_DEPS}
acct-group/plugdev
- dev-libs/gobject-introspection
+ dev-libs/json-glib
dev-libs/libevdev
virtual/libudev
$(python_gen_cond_dep '
@@ -48,7 +49,10 @@ RDEPEND="
elogind? ( sys-auth/elogind )
systemd? ( sys-apps/systemd )
"
-DEPEND="${RDEPEND}"
+DEPEND="
+ ${RDEPEND}
+ dev-libs/gobject-introspection
+"
src_prepare() {
default
diff --git a/dev-libs/librdkafka/Manifest b/dev-libs/librdkafka/Manifest
index 42162ead2a77..71e77812e30f 100644
--- a/dev-libs/librdkafka/Manifest
+++ b/dev-libs/librdkafka/Manifest
@@ -1,7 +1,9 @@
DIST librdkafka-1.4.4.tar.gz 2734332 BLAKE2B 47c22f00d88d58eb6366e17a8f0ddaee4984bc65f01a627c5d3b8eee019519a2de9a7ae6e2ab2053354a5d72337107b7f515ad65ff205b6838e154b95d9f2331 SHA512 478d17f56efd39b312ea774695bc31d22a83aae3a94913fb0dd07e7f04f3f2a6e3f3610dc7501864dbacbcf4a3207603c6e1d5eebac4e5246ee868cde398021d
DIST librdkafka-1.5.0.tar.gz 2757553 BLAKE2B a9bbcdaa011944e43f9c70e2062199c5f12d1b92e40ba55707520002ed3a909ff13308336703924388625570d88a94d58b24cd19b5d6e9f79acd31dd92d0d7ed SHA512 ccd8dd3e90c9315833610745c28e0ffa60786324c938c7cbbb2ff847d7493d1b72d97adf5e5210bbc87970047cfd7e58a85141534d227187f2f17c492bef4262
DIST librdkafka-1.5.2.tar.gz 2771823 BLAKE2B 61a56d36ba49539eb52f89a0d5b48e0245b1cedd09c40e65063d65208b50bb95aa5f00ce3c050d4203b4720b2ce63a9f1d6eee7100fdf85c50e7a15457a52010 SHA512 6a796c58aef9d91fe85f3815ee523a0dcafad59f33c83e5c20c62d4e4337c21c2d223dd0d6a88f37cf86d14a8e55facfa87c651990e08d9522f7cf78b0d17446
+DIST librdkafka-1.5.3.tar.gz 2773929 BLAKE2B f23ed9fe04af5d17ee2066366d32701a07f1360d665fd06126008f42e2512434848829eeb2578b35bd7f8fb26663d72c3d2ee22a5b3f33b7029df28f919b2b77 SHA512 24c93658462f933766a026fede5f09e1056ee9532f27b56da64bdde5626ac6f2460bc92b950337a7c3a99d75201a3c3bc5aaa78e888ffd9665e248d62f2c87d9
EBUILD librdkafka-1.4.4.ebuild 1652 BLAKE2B d6b1f200c1beb20fafd794334ec4412dd962c818cc4d1ff340324ee804ab4edcf6654aecb95849555221d1795ac273ec90d3b10e9a48b37bda19f050a5f1c2f8 SHA512 5bdec28dbb294c2f5ea1f1b44de3ada493d3a1ef688362f9c0de377bfbae1db7b34e0357baf416f6585e2e50cd6c29b2efdaf39c3d400ec9d93cd5b9d5c38559
EBUILD librdkafka-1.5.0.ebuild 1776 BLAKE2B c4188c4cd760471cabfaa70b3a5366738429517fbce05e9932b7e2addfc9ec82f474514a396659bf71a82e6759543606ba3d65e5f11bc6422488774b6fa99481 SHA512 e677b13c10904c70a261efe4f189b4b244ef6c3ac6a18dac760638be29a3ee932bb8a90fd77c7bf6b8fb0183354d78d3eeec7636e2165f19ccc94b8a123ac870
EBUILD librdkafka-1.5.2.ebuild 1776 BLAKE2B c4188c4cd760471cabfaa70b3a5366738429517fbce05e9932b7e2addfc9ec82f474514a396659bf71a82e6759543606ba3d65e5f11bc6422488774b6fa99481 SHA512 e677b13c10904c70a261efe4f189b4b244ef6c3ac6a18dac760638be29a3ee932bb8a90fd77c7bf6b8fb0183354d78d3eeec7636e2165f19ccc94b8a123ac870
+EBUILD librdkafka-1.5.3.ebuild 1776 BLAKE2B c4188c4cd760471cabfaa70b3a5366738429517fbce05e9932b7e2addfc9ec82f474514a396659bf71a82e6759543606ba3d65e5f11bc6422488774b6fa99481 SHA512 e677b13c10904c70a261efe4f189b4b244ef6c3ac6a18dac760638be29a3ee932bb8a90fd77c7bf6b8fb0183354d78d3eeec7636e2165f19ccc94b8a123ac870
MISC metadata.xml 533 BLAKE2B 51fa8b199e9126c2942044008614a47915d17ea2e11edbc4254e995ceddf71649018feed0655fa3a5a73d6d7f2c17ab0b4e963bd0b7f4922f1a3fbcd85e04052 SHA512 7f859dce01869e64712cb9042a1ab982255ec524334f2a1fbaf3f0e50fbc08bd3dd21e4bdf2ccef5b539aef94e0bfa2b7af95ef215cfddea4202608005934308
diff --git a/dev-libs/librdkafka/librdkafka-1.5.3.ebuild b/dev-libs/librdkafka/librdkafka-1.5.3.ebuild
new file mode 100644
index 000000000000..86b1ca559964
--- /dev/null
+++ b/dev-libs/librdkafka/librdkafka-1.5.3.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit python-any-r1 toolchain-funcs
+
+DESCRIPTION="Apache Kafka C/C++ client library"
+HOMEPAGE="https://github.com/edenhill/librdkafka"
+
+if [[ ${PV} == "9999" ]]; then
+ EGIT_REPO_URI="https://github.com/edenhill/${PN}.git"
+
+ inherit git-r3
+else
+ SRC_URI="https://github.com/edenhill/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+LICENSE="BSD-2"
+
+# subslot = soname version
+SLOT="0/1"
+
+IUSE="lz4 sasl ssl static-libs zstd"
+
+LIB_DEPEND="
+ lz4? ( app-arch/lz4:=[static-libs(+)] )
+ sasl? ( dev-libs/cyrus-sasl:=[static-libs(+)] )
+ ssl? ( dev-libs/openssl:0=[static-libs(+)] )
+ zstd? ( app-arch/zstd:=[static-libs(+)] )
+ sys-libs/zlib:=[static-libs(+)]
+"
+
+BDEPEND="
+ virtual/pkgconfig
+ ${PYTHON_DEPS}
+"
+
+RDEPEND="!static-libs? ( ${LIB_DEPEND//\[static-libs(+)]} )"
+
+DEPEND="
+ ${RDEPEND}
+ static-libs? ( ${LIB_DEPEND} )
+"
+
+pkg_setup() {
+ python-any-r1_pkg_setup
+}
+
+src_prepare() {
+ default
+
+ if [[ ${PV} != "9999" ]]; then
+ sed -i \
+ -e "s/^\(export RDKAFKA_GITVER=\).*/\1\"${PV}@release\"/" \
+ tests/run-test.sh || die
+ fi
+}
+
+src_configure() {
+ tc-export AR CC CXX LD NM OBJDUMP PKG_CONFIG STRIP
+
+ local myeconf=(
+ --no-cache
+ --no-download
+ --disable-debug-symbols
+ $(use_enable lz4)
+ $(use_enable sasl)
+ $(usex static-libs '--enable-static' '')
+ $(use_enable ssl)
+ $(use_enable zstd)
+ )
+
+ econf ${myeconf[@]}
+}
+
+src_test() {
+ emake -C tests run_local
+}
+
+src_install() {
+ emake -j1 \
+ DESTDIR="${D}" \
+ docdir="/usr/share/doc/${PF}" \
+ install
+
+ if ! use static-libs; then
+ find "${ED}" -type f \( -name "*.a" -o -name "*.la" \) -delete || die
+ fi
+}
diff --git a/dev-libs/libtimezonemap/Manifest b/dev-libs/libtimezonemap/Manifest
index f84b95c2fd63..63eb4cbdfc00 100644
--- a/dev-libs/libtimezonemap/Manifest
+++ b/dev-libs/libtimezonemap/Manifest
@@ -1,3 +1,3 @@
DIST libtimezonemap_0.4.6.tar.gz 2872895 BLAKE2B ec9da9efe4f58cd7c3cd6cb502ffc23d1331f8b8352021d30c4157d4a6fec983702c049725af672136f332e450191e03bb0c36c752cbd496c37a7e0bf64c4514 SHA512 3cbd4f577684254a91f1e745ecb49e58fe3c75e28c172a6115fbe68e7868c33ff4c68b80ef1d7f5c759f67d288e29a2a057e00e1788a57c4e55e0cbfef351761
-EBUILD libtimezonemap-0.4.6.ebuild 638 BLAKE2B 2e9ffc90fdc52982dea9cea9a7f31bdc5c9cfc12809b5da485245000913acfbef085ccf683e12b44e70e9ae202f53d6d5f798fd0c9dacf3f9d4cc9b7b18c8bb5 SHA512 ac3593e35c1eba84ccb946ad15f2e832281b32114e0127468248d6aa3ce6543abb35e067b5a570f409172acce8eec3524ff6e4a77678d98cd29b4f4186623be1
+EBUILD libtimezonemap-0.4.6.ebuild 645 BLAKE2B 4b832ceedbedd387acc7988ff02d9f039ccf437b17c5bfe4b184232e573932fb0d3c05d52befefcf3061fd41252586ded5dc946bfcfa4b53e0cd89f6fb7e44bc SHA512 3733132c9b5ef62cae0b0538be8f65fb385057994cb433602bea8d9d9787270546bcd3a94229558b435dcf7d90a386115919a087f9ad725ec6cacca72349f25a
MISC metadata.xml 453 BLAKE2B 0ddfa1215414fea50844dcf5a72a5de4af39eca0b275fb95cccef077ba2c3717f0fa94e77ab8afa30196cd9f8c668b06ca9d09b5ba0974507d6dfb5a740544b3 SHA512 b0cf55d87a8efc69b49ea0f172016de1d6d9ed3fa9b86fc3d9713a42d2a36b4886bb5973a352fe0ab4ddeec8637dfa61f85c536a367de0a38a5e164f025bce1f
diff --git a/dev-libs/libtimezonemap/libtimezonemap-0.4.6.ebuild b/dev-libs/libtimezonemap/libtimezonemap-0.4.6.ebuild
index a109233b6fef..6f50ee3b5599 100644
--- a/dev-libs/libtimezonemap/libtimezonemap-0.4.6.ebuild
+++ b/dev-libs/libtimezonemap/libtimezonemap-0.4.6.ebuild
@@ -12,7 +12,7 @@ RESTRICT="mirror"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
DEPEND="dev-libs/glib:2
dev-libs/gobject-introspection:0=
diff --git a/dev-libs/libucl/Manifest b/dev-libs/libucl/Manifest
index 4353b48aca94..162d61e5eca8 100644
--- a/dev-libs/libucl/Manifest
+++ b/dev-libs/libucl/Manifest
@@ -1,5 +1,5 @@
DIST libucl-0.8.1.tar.gz 2028394 BLAKE2B 18fda317b4b4aed3d6b72c599d191f141bf4722d1c08244deda9c5e77300e2bef7de029889a05d9b4573472928d9d49a797123ac392a4cdd3b690ac277ad673d SHA512 36a059561eadb2dd7253ca22ff56f6a0c6cdd28580e28451c0cf47e1aec321a2e1589fc83ccb2033346f2dbca31a7e6afa9666ea544a0c190b7f80ed0e9f45af
-EBUILD libucl-0.8.1-r1.ebuild 1242 BLAKE2B 16135c6e37661c78ccfd62218b3d1ac08f782d6c41e391838c859d563675931297eaedeeec83c1c0c1940dd45b6f2ee5e006c8c073238a3c732a4e1a5eea3d6c SHA512 5247ea70efaed51aa54b3724d92f5ab46a7093db85c1b064b7ef4319b94bbd9454422e777b029bfe75114080d2d5c48fc41b6f4cf773e883bdff9da397bc4164
+EBUILD libucl-0.8.1-r1.ebuild 1243 BLAKE2B 3a846ca9e36f8569185d9a92e2832b3569cc19f67aa5f4aeeed721c05e18c8a156759e778a81fe8d810364f1a1e77963d6896133d4a3c2cdf2e8f548d68267cd SHA512 a0b9f074d9539f5274ad98acff55ceb14ed823e6f6ae7fd2aa07e26855044857348e0e78f282b5de0e5c29b858d2db9a257101219e2a57f96f0e81d9d09bf5b6
EBUILD libucl-0.8.1-r100.ebuild 1448 BLAKE2B 7da82d9389bd40244080445583f291882d1e722bb089c9f97642afa76821c046bad7da5f40199a8234bd700e2278d51c6971ed31e72a0fc56789059490bab625 SHA512 0a38bdc4e3118288411b06e63a5ed221581d3c40dfec5da03c402bcb82132470d28e0deff58621455a7787ece53e4ebb4944df4c7de0ad9bd02739969c1e4cf9
EBUILD libucl-9999.ebuild 1448 BLAKE2B 7da82d9389bd40244080445583f291882d1e722bb089c9f97642afa76821c046bad7da5f40199a8234bd700e2278d51c6971ed31e72a0fc56789059490bab625 SHA512 0a38bdc4e3118288411b06e63a5ed221581d3c40dfec5da03c402bcb82132470d28e0deff58621455a7787ece53e4ebb4944df4c7de0ad9bd02739969c1e4cf9
MISC metadata.xml 955 BLAKE2B 9bcc770371005f7b55c644a987e100572fc6c044ca38a862c817c1fd135864f1ffeb38b3a053a66bb1819ef0dd38f3a27432152779349f7b2af9528448ecfada SHA512 7742b29ef3cd909660e795a35859924f449dc18000ebdfc414e7620b9bf900112dde4ea053648b9490f45a56972a357c5a9645afcdc04211cfb4c3354fd1b8df
diff --git a/dev-libs/libucl/libucl-0.8.1-r1.ebuild b/dev-libs/libucl/libucl-0.8.1-r1.ebuild
index c4c4911fe043..8c59554dfc50 100644
--- a/dev-libs/libucl/libucl-0.8.1-r1.ebuild
+++ b/dev-libs/libucl/libucl-0.8.1-r1.ebuild
@@ -22,7 +22,7 @@ SLOT="0"
IUSE="lua +regex sign urls +utils static-libs"
DEPEND="!!dev-libs/ucl
- lua? ( >=dev-lang/lua-5.1:= )
+ lua? ( >=dev-lang/lua-5.1:0= )
urls? ( net-misc/curl )
sign? ( dev-libs/openssl:0 )
"
diff --git a/dev-libs/miniz/Manifest b/dev-libs/miniz/Manifest
index c5728404a647..3805dd7691a0 100644
--- a/dev-libs/miniz/Manifest
+++ b/dev-libs/miniz/Manifest
@@ -1,3 +1,7 @@
+AUX Config.cmake.in 65 BLAKE2B 520fd3e379b53671d4bb9cb62567ec0f569c711d18019b428914967c57189b5e5f55aa589d0469f1c2891a68f285626e88395c2fef04f677bdf4a26633651526 SHA512 040e97901dea4890625a5bf80db145af432dcb0aa6159ac35e496b027ab3d35132392f45e734ab74002505148c7f879efc72595c6cce99469b8526786af3e7de
+AUX miniz-2.1.0-export-cmake-build-targets.patch 6592 BLAKE2B 96b279e4ae5888e8604a99d40ae0000927f5c654b9ef6d0ea95a57e97dc0a43d87004e5bb9750b92926445b75dfcb6313994eb6b3db1cbbcf2e78d891c5bf3df SHA512 61cccaac9734183416320de302c06987db186930e455ad1b78ba2a87c10f6b2965ea9e70d192bf22a26b487c4592b70da7a99ffaeec9e132f0e5adf0f66ece9d
+AUX miniz.pc.in 315 BLAKE2B d05cd14a7acb4039e5f0521a68e6e5eeed00849a5b5d639fbbd4de45c1e0eab8ed33a22cc608761ab1dd1e1142021b8e5bfbf8e9bab589bfb2545701828f5f7b SHA512 8c1828759a45c58a96bebaac9fa5196d95be85a76be8d4fdd30eb2b4db5dbe582a7e0156fc9a4249c84426bbe69b30d31b2faf162c8d619810012afe6e1ad0ed
DIST miniz-2.1.0.tar.gz 104502 BLAKE2B 9a7b3818b454809cdfec523d98f13bef3a52e27b6d3857d289438978d12997e38c71aa97fffe060a6b765f8fbbdd8fe8cebced4a45d9f1f040dd3e39cf2a8055 SHA512 e0aba16afdf230d1e54d0a9cedd336b0b158b02744839f0547e14ee47a97fc1a6668f3a181bd46e969b01b158af18dc8ed3c0a4210b3b620242338a2788806b3
-EBUILD miniz-2.1.0.ebuild 636 BLAKE2B 517fbd2edb6ed5c3a7441f04e13a430f3099bd1bc5a494e1b20a96e17bebe37d58960da22412af2f642000f918b0101bbc7322f2f7d2097e0f2740dce03b6aaf SHA512 df07a3b77e72ec2f07178655e3cf4c3424440e14a081332e9437661316607ccc44a327e0acab7f4a3bdddb2518710c4e7c3104527a249ebf87d6ebe476a6d8a3
+EBUILD miniz-2.1.0-r1.ebuild 711 BLAKE2B 639316c2389f57bda50c675671aa829accfe17111a869c63d6defacc73f63562ead4f47f723e6dfec3216f2bd6e7e8a392bfb2d1bda3d20e320ed4f59d2b6f20 SHA512 756f4f758d18cb07dd5e3ebdb62722847360452b2526cddb7e015f3996b4049333342d26cd6d728d4c79b5e4792bc2052276e1fd8cbd0444d4f8eac49750edba
+EBUILD miniz-9999.ebuild 868 BLAKE2B 4c35c1ff7de11247e71860fbe61c973b77d456db29a87cf01b3e34a83df0d61b3a2b3d0f5a938081cf1f6f578a97a1489e292ee50b46d1e0ece1bc049b70b7b6 SHA512 9cfb04128eaa89af0a0d005ca8aa03a410addb3953d6522be5c480bbb93e765c1c2b6dbc145c91d57fc9931d7267bca47eb34e711561f4bc2ca7835cf98647bb
MISC metadata.xml 1067 BLAKE2B 4360a8656cd006529dd8955d1905daa17e2a51c2ec5dabe6bc692ebdca70ca2a06d588d9e6dc6989c773922172e32ded9a7c1d65e41907468a2df5d1f18b1abc SHA512 8e36cbda8ad79dccaf7cd95eb9675e306c276d2173b0e1944d21b924f518ab0085fc4262eafa23aa3870633f198d8622b1d05866336b5551111b8750f16f220c
diff --git a/dev-libs/miniz/files/Config.cmake.in b/dev-libs/miniz/files/Config.cmake.in
new file mode 100644
index 000000000000..0865ae961005
--- /dev/null
+++ b/dev-libs/miniz/files/Config.cmake.in
@@ -0,0 +1 @@
+include("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake")
diff --git a/dev-libs/miniz/files/miniz-2.1.0-export-cmake-build-targets.patch b/dev-libs/miniz/files/miniz-2.1.0-export-cmake-build-targets.patch
new file mode 100644
index 000000000000..6f8429222700
--- /dev/null
+++ b/dev-libs/miniz/files/miniz-2.1.0-export-cmake-build-targets.patch
@@ -0,0 +1,179 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1,5 +1,15 @@
+-PROJECT(miniz C)
+-cmake_minimum_required(VERSION 2.8)
++cmake_minimum_required(VERSION 3.12)
++
++project(miniz)
++
++include(GNUInstallDirs)
++
++set(MINIZ_API_VERSION 2)
++set(MINIZ_MINOR_VERSION 1)
++set(MINIZ_PATCH_VERSION 0)
++set(MINIZ_VERSION
++ ${MINIZ_API_VERSION}.${MINIZ_MINOR_VERSION}.${MINIZ_PATCH_VERSION})
++
+ if(CMAKE_BUILD_TYPE STREQUAL "")
+ # CMake defaults to leaving CMAKE_BUILD_TYPE empty. This screws up
+ # differentiation between debug and release builds.
+@@ -8,45 +18,122 @@
+ CMAKE_C_FLAGS used) Debug Release RelWithDebInfo MinSizeRel." FORCE)
+ endif ()
+
+-set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/bin)
++option(BUILD_EXAMPLES "Build examples" ON)
++option(BUILD_SHARED_LIBS "Build shared library instead of static" ON)
++
++set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/bin)
+
++include(GenerateExportHeader)
++
++set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
+ set(miniz_SOURCE miniz.c miniz_zip.c miniz_tinfl.c miniz_tdef.c)
++add_library(${PROJECT_NAME} ${miniz_SOURCE})
++generate_export_header(${PROJECT_NAME})
++
++if(NOT BUILD_SHARED_LIBS)
++string(TOUPPER ${PROJECT_NAME} PROJECT_UPPER)
++set_target_properties(${PROJECT_NAME}
++ PROPERTIES INTERFACE_COMPILE_DEFINITIONS ${PROJECT_UPPER}_STATIC_DEFINE)
++else()
++set_property(TARGET ${PROJECT_NAME} PROPERTY C_VISIBILITY_PRESET hidden)
++endif()
++
++set_property(TARGET ${PROJECT_NAME} PROPERTY VERSION ${MINIZ_VERSION})
++set_property(TARGET ${PROJECT_NAME} PROPERTY SOVERSION ${MINIZ_API_VERSION})
++
++file(GLOB INSTALL_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/*.h)
++
++target_compile_definitions(${PROJECT_NAME}
++ PRIVATE $<$:_GNU_SOURCE>)
+
+-add_library(miniz ${miniz_SOURCE})
+-target_include_directories(miniz PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}")
++# pkg-config file
++configure_file(miniz.pc.in ${CMAKE_BINARY_DIR}/miniz.pc @ONLY)
+
+-set(EXAMPLE1_SRC_LIST "${CMAKE_CURRENT_SOURCE_DIR}/examples/example1.c")
+-set(EXAMPLE2_SRC_LIST "${CMAKE_CURRENT_SOURCE_DIR}/examples/example2.c")
+-set(EXAMPLE3_SRC_LIST "${CMAKE_CURRENT_SOURCE_DIR}/examples/example3.c")
+-set(EXAMPLE4_SRC_LIST "${CMAKE_CURRENT_SOURCE_DIR}/examples/example4.c")
+-set(EXAMPLE5_SRC_LIST "${CMAKE_CURRENT_SOURCE_DIR}/examples/example5.c")
+-set(EXAMPLE6_SRC_LIST "${CMAKE_CURRENT_SOURCE_DIR}/examples/example6.c")
+-set(MINIZ_TESTER_SRC_LIST
+- "${CMAKE_CURRENT_SOURCE_DIR}/tests/miniz_tester.cpp"
+- "${CMAKE_CURRENT_SOURCE_DIR}/tests/timer.cpp")
++install(FILES
++ ${CMAKE_BINARY_DIR}/miniz.pc
++ DESTINATION ${CMAKE_INSTALL_DATADIR}/pkgconfig)
++
++
++set_property(TARGET ${PROJECT_NAME} PROPERTY
++ INTERFACE_${PROJECT_NAME}_MAJOR_VERSION ${MINIZ_API_VERSION})
++set_property(TARGET ${PROJECT_NAME} APPEND PROPERTY
++ COMPATIBLE_INTERFACE_STRING ${PROJECT_NAME}_MAJOR_VERSION
++)
++
++install(TARGETS ${PROJECT_NAME} EXPORT ${PROJECT_NAME}Targets
++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
++ # users can use or
++ INCLUDES DESTINATION include ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME}
++)
++
++include(CMakePackageConfigHelpers)
++write_basic_package_version_file(
++ "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}/${PROJECT_NAME}ConfigVersion.cmake"
++ VERSION ${MINIZ_VERSION}
++ COMPATIBILITY AnyNewerVersion
++)
++
++export(EXPORT ${PROJECT_NAME}Targets
++ FILE "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}/${PROJECT_NAME}Targets.cmake"
++ NAMESPACE ${PROJECT_NAME}::
++)
++configure_file(Config.cmake.in
++ "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}/${PROJECT_NAME}Config.cmake"
++ @ONLY
++)
++
++set(ConfigPackageLocation ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME})
++install(EXPORT ${PROJECT_NAME}Targets
++ FILE
++ ${PROJECT_NAME}Targets.cmake
++ NAMESPACE
++ ${PROJECT_NAME}::
++ DESTINATION
++ ${ConfigPackageLocation}
++)
++install(
++ FILES
++ "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}/${PROJECT_NAME}Config.cmake"
++ "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}/${PROJECT_NAME}ConfigVersion.cmake"
++ DESTINATION
++ ${ConfigPackageLocation}
++ COMPONENT
++ Devel
++)
++
++if(BUILD_EXAMPLES)
++ set(EXAMPLE1_SRC_LIST "${CMAKE_CURRENT_SOURCE_DIR}/examples/example1.c")
++ set(EXAMPLE2_SRC_LIST "${CMAKE_CURRENT_SOURCE_DIR}/examples/example2.c")
++ set(EXAMPLE3_SRC_LIST "${CMAKE_CURRENT_SOURCE_DIR}/examples/example3.c")
++ set(EXAMPLE4_SRC_LIST "${CMAKE_CURRENT_SOURCE_DIR}/examples/example4.c")
++ set(EXAMPLE5_SRC_LIST "${CMAKE_CURRENT_SOURCE_DIR}/examples/example5.c")
++ set(EXAMPLE6_SRC_LIST "${CMAKE_CURRENT_SOURCE_DIR}/examples/example6.c")
++ set(MINIZ_TESTER_SRC_LIST
++ "${CMAKE_CURRENT_SOURCE_DIR}/tests/miniz_tester.cpp"
++ "${CMAKE_CURRENT_SOURCE_DIR}/tests/timer.cpp")
+
+-add_executable(example1 ${EXAMPLE1_SRC_LIST})
+-target_link_libraries(example1 miniz)
+-add_executable(example2 ${EXAMPLE2_SRC_LIST})
+-target_link_libraries(example2 miniz)
+-add_executable(example3 ${EXAMPLE3_SRC_LIST})
+-target_link_libraries(example3 miniz)
+-add_executable(example4 ${EXAMPLE4_SRC_LIST})
+-target_link_libraries(example4 miniz)
+-add_executable(example5 ${EXAMPLE5_SRC_LIST})
+-target_link_libraries(example5 miniz)
+-add_executable(example6 ${EXAMPLE6_SRC_LIST})
+-target_link_libraries(example6 miniz)
+-if(${UNIX})
+- target_link_libraries(example6 m)
+-endif()
++ add_executable(example1 ${EXAMPLE1_SRC_LIST})
++ target_link_libraries(example1 miniz)
++ add_executable(example2 ${EXAMPLE2_SRC_LIST})
++ target_link_libraries(example2 miniz)
++ add_executable(example3 ${EXAMPLE3_SRC_LIST})
++ target_link_libraries(example3 miniz)
++ add_executable(example4 ${EXAMPLE4_SRC_LIST})
++ target_link_libraries(example4 miniz)
++ add_executable(example5 ${EXAMPLE5_SRC_LIST})
++ target_link_libraries(example5 miniz)
++ add_executable(example6 ${EXAMPLE6_SRC_LIST})
++ target_link_libraries(example6 miniz)
++ if(${UNIX})
++ target_link_libraries(example6 m)
++ endif()
+
+-# add_executable(miniz_tester ${MINIZ_TESTER_SRC_LIST})
+-# target_link_libraries(miniz_tester miniz)
++ # add_executable(miniz_tester ${MINIZ_TESTER_SRC_LIST})
++ # target_link_libraries(miniz_tester miniz)
++endif(BUILD_EXAMPLES)
+
+-install(TARGETS ${PROJECT_NAME} EXPORT ${PROJECT_NAME}Targets
+- ARCHIVE DESTINATION lib
+- LIBRARY DESTINATION lib
+- )
+-file(GLOB INSTALL_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/*.h)
+-install(FILES ${INSTALL_HEADERS} DESTINATION include/${PROJECT_NAME})
+\ No newline at end of file
++set(INCLUDE_INSTALL_DIR "include")
++
++install(FILES ${INSTALL_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME})
diff --git a/dev-libs/miniz/files/miniz.pc.in b/dev-libs/miniz/files/miniz.pc.in
new file mode 100644
index 000000000000..51128735847c
--- /dev/null
+++ b/dev-libs/miniz/files/miniz.pc.in
@@ -0,0 +1,13 @@
+prefix=@CMAKE_INSTALL_PREFIX@
+exec_prefix=${prefix}
+libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
+includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@
+
+Name: @PROJECT_NAME@
+Description: @PROJECT_DESCRIPTION@
+Version: @MINIZ_VERSION@
+URL: @PROJECT_HOMEPAGE_URL@
+
+Requires:
+Libs: -L${libdir} -lminiz
+Cflags: -I${includedir}
\ No newline at end of file
diff --git a/dev-libs/miniz/miniz-2.1.0.ebuild b/dev-libs/miniz/miniz-2.1.0-r1.ebuild
similarity index 64%
rename from dev-libs/miniz/miniz-2.1.0.ebuild
rename to dev-libs/miniz/miniz-2.1.0-r1.ebuild
index 1141b3f020ce..cc26fba366c0 100644
--- a/dev-libs/miniz/miniz-2.1.0.ebuild
+++ b/dev-libs/miniz/miniz-2.1.0-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
inherit cmake
-DESCRIPTION="A mesh slicer to generate G-code for fused-filament-fabrication (3D printers)"
+DESCRIPTION="A lossless, high performance data compression library"
HOMEPAGE="https://github.com/richgel999/miniz"
SRC_URI="https://github.com/richgel999/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
@@ -16,8 +16,13 @@ IUSE=""
DOCS=( ChangeLog.md LICENSE readme.md )
+PATCHES=(
+ "${FILESDIR}/${P}-export-cmake-build-targets.patch"
+)
+
src_prepare() {
- sed -i -e 's/DESTINATION lib/DESTINATION ${CMAKE_INSTALL_LIBDIR}/' CMakeLists.txt
+ cp "${FILESDIR}/Config.cmake.in" .
+ cp "${FILESDIR}/miniz.pc.in" .
cmake_src_prepare
}
@@ -25,5 +30,9 @@ src_prepare() {
src_configure() {
CMAKE_BUILD_TYPE=Release
+ local mycmakeargs=(
+ -DBUILD_EXAMPLES=OFF
+ )
+
cmake_src_configure
}
diff --git a/dev-libs/miniz/miniz-9999.ebuild b/dev-libs/miniz/miniz-9999.ebuild
new file mode 100644
index 000000000000..7bdf95f3cf88
--- /dev/null
+++ b/dev-libs/miniz/miniz-9999.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="A lossless, high performance data compression library"
+HOMEPAGE="https://github.com/richgel999/miniz"
+SRC_URI=""
+
+if [[ ${PV} == "9999" ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/richgel999/miniz.git"
+else
+ SRC_URI="https://github.com/richgel999/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="examples static-libs"
+
+DOCS=( ChangeLog.md LICENSE readme.md )
+
+src_prepare() {
+ sed -i -e 's/DESTINATION lib/DESTINATION ${CMAKE_INSTALL_LIBDIR}/' CMakeLists.txt
+
+ cmake_src_prepare
+}
+
+src_configure() {
+ CMAKE_BUILD_TYPE=Release
+
+ local mycmakeargs=(
+ -DBUILD_EXAMPLES=$(usex examples)
+ -DBUILD_SHARED_LIBS=$(usex static-libs OFF ON)
+ )
+
+ cmake_src_configure
+}
diff --git a/dev-libs/pugixml/Manifest b/dev-libs/pugixml/Manifest
index 707edde71245..f85bfa57ae4d 100644
--- a/dev-libs/pugixml/Manifest
+++ b/dev-libs/pugixml/Manifest
@@ -1,6 +1,6 @@
DIST pugixml-1.10.tar.gz 381990 BLAKE2B ea446d11fe5213a5250b7e737a9e80a3976454724e1a1c326b689214ad4d3e183abd417a7782b3d5c68a0aabce42228e121352e4d2dd33f5f2bb2334f6c72c27 SHA512 bfc80661005d0a0fb82ca6d5299e5efdd1bb468e11ee52d7ee9367e15776d28efb60266ce03842715cd43aae023afc2b369797bb3cbecd6d6a65c3ae3903e469
DIST pugixml-1.11.2.tar.gz 386166 BLAKE2B 21dee2f04e8f9d962cd6f0ebf54d608fb0434ed815a13807f5939dea47e98128009b6b918a761b80566b959f1c0651c4b771028515fd9e8b8b51a0e4e592d3dd SHA512 403ef9f642fba6aff2d642399516886c0cda44ca19c58eeb05594aa7220562afbee939a5edab0c85263596834c5bdaea82a346dd8ee00a712e97b564f0d1e52d
EBUILD pugixml-1.10.ebuild 571 BLAKE2B 882d1cf798f1b6f033d26204059fef59169588d7f939620f8a61dbbfe582d9c6888bc9918b657841cef5eba110dee6a977dab63a5a2c731ceb2d9a329635d447 SHA512 eefcb601ccfe5aa7c529ab220a1e21faaf3fdf4dfbac06f847e268ec6b784d7f6d3962d57d53b92c0645d735529d7f8ed56009ddbcecedc0f640b5f5f20420ef
-EBUILD pugixml-1.11.2.ebuild 628 BLAKE2B ac10e059167ea8ee686ef044b02da02c14844c9417c34b6362f6338ed01abf002fe1a1e5d47bcc0075c34ae95267654da651cd3db5694a1622aca4649882f43a SHA512 dfc4cb2782e8ee803195b53a3bda79c03a07e858e52867f1b2b8b57f18c1ba2c457cf81e4b344a024415e0d151b65692c9f850077cd634d1b6d987355a2ea297
+EBUILD pugixml-1.11.2.ebuild 576 BLAKE2B 03902967dd711c63b01b8e11c1769f769f7b4df57dd889b87f23c316abe8bf746339058de220644decefaf133d8032c45c480cfcf4d51addc164e8894543c800 SHA512 71bc00b077502f5592e41f36ab6faea344caaff4a8e5787c5ddf88f0ff151bc313811594d0ce83e6506a60879c2f8009c7e4c1f49532f2c8ba3a5f6b1499ec28
EBUILD pugixml-9999.ebuild 569 BLAKE2B 353fb5e610b766647e1e3bd921a05390dec00f185d193437f96d7a8cf0bbfda8813168243dc80bf0b3cc1fd8c4e1c9e8e83b27590e1a3018f3a5ef1947f66e41 SHA512 248a298f4cde950be75592de172fc89fd36d979fcd76684c63e652456a60cd84a6bc0f2312248de003e4bc0771ce3bf2c9b28ff5c72087be245c202af50fbc99
MISC metadata.xml 346 BLAKE2B 68e81d68ef327995169a33c1716bf546958902854870095704000abc97634073a87945a54968a1e167bb94b845032b5ab3d8822b1663e7fb3fdfdb5abaf0d789 SHA512 90152b3b666bf26a6b0be0a411aff980d340ab1b38e2068a170b809c883e7a1c29de6adc0c8aef90b5702682a8fe548ba59e2bf077cc3ad145f9d1e3699afcaa
diff --git a/dev-libs/pugixml/pugixml-1.11.2.ebuild b/dev-libs/pugixml/pugixml-1.11.2.ebuild
index ebdf4d377152..0750359ebd79 100644
--- a/dev-libs/pugixml/pugixml-1.11.2.ebuild
+++ b/dev-libs/pugixml/pugixml-1.11.2.ebuild
@@ -18,7 +18,3 @@ HOMEPAGE="https://pugixml.org/ https://github.com/zeux/pugixml/"
LICENSE="MIT"
SLOT="0"
-
-PATCHES=(
- "${FILESDIR}/${P}-cmake-config.patch"
-)
diff --git a/dev-libs/redland-bindings/Manifest b/dev-libs/redland-bindings/Manifest
index 39836e3ac670..e489cf3f6827 100644
--- a/dev-libs/redland-bindings/Manifest
+++ b/dev-libs/redland-bindings/Manifest
@@ -2,5 +2,5 @@ AUX redland-bindings-1.0.17.1-add-PHP7-support.patch 2359 BLAKE2B 04cc1122a8a226
AUX redland-bindings-1.0.17.1-bool.patch 502 BLAKE2B 09ab5d8b5b3cf2edd046830bbc88a275c2df804dbb9e09a411bada838afd7f30c592dc48f02995752822a5d738af35c208f124c9d9d008cbff3395bbcfd7b404 SHA512 158e06e58ad66ca88ac8eb4646df0628f423de8d22638e78a737be3ea12fd123fd3bcf63b75478ff7f82ec3b444773a2e8d467fd737b8de0ae9143ef79e60a65
AUX redland-bindings-1.0.17.1-php-config-r1.patch 2249 BLAKE2B 83d9a65d6db9411531b827d25aaaec721b6756c4a5503179a477fa3d452fff4deaa1fdcaa78c66f5cef0b4cb0d36e06a89050e520a2e0fd36694121eb8a71669 SHA512 406e0d0d97c7c181a16c2a72ec291582ada1c1dbec1cdb53ca62ec73f954a1116462b97f3cf85ada4adfc4ebff35081ac4ce0ce9e2b7155e61402dbb64f57c20
DIST redland-bindings-1.0.17.1.tar.gz 933290 BLAKE2B f58524c30958200af1fb3ec0f63b8aa9f3fd2120297321299cdd225ff9eb331f385c4418ed25987b955857e5046b5c6f0589210b807aae0dc6abe0b758d48cfc SHA512 c105d1232555d226d98efdc1e4edc1b6c953fdd004804e40926452b8f91d30159319a50af68fc3cfe242cf180d85383ef3ff925cc65ed5d0652096cc51f4d7c0
-EBUILD redland-bindings-1.0.17.1-r1.ebuild 2952 BLAKE2B 872f56f376ee4918f8d597a12ec0c86b8e8e3e1e72c05a58561a767011a28cccec02bc7914258b13cb8c4d6140de3e776f7476cb42671fbd55985063f3e080df SHA512 4a42ffc9335285405618fcaa1132bb11788ea19dd3efa5f0bad79df89505b486c3a833a336d23574e88625a44a044c257d8cf909a7c46cca05f741621ca1118d
+EBUILD redland-bindings-1.0.17.1-r1.ebuild 2953 BLAKE2B ee6830dfa326cbba54cdf2e3d9e60a7d39b0f7151cc42a376d1c226ec97388f183b1244b7f5f353228ceab8f4a62d867fd44a5a7070f5466579e7e21e42a4b3d SHA512 9a03375698491ec2b90527c6043a2c6c13388b6b1eff59322b14c70db27b444c96005e19e2d070cce527cdda8e58d2dff127e16a631fc3b0b17024c557dcdf63
MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/dev-libs/redland-bindings/redland-bindings-1.0.17.1-r1.ebuild b/dev-libs/redland-bindings/redland-bindings-1.0.17.1-r1.ebuild
index bd6a298e59e7..538a1bbab649 100644
--- a/dev-libs/redland-bindings/redland-bindings-1.0.17.1-r1.ebuild
+++ b/dev-libs/redland-bindings/redland-bindings-1.0.17.1-r1.ebuild
@@ -29,7 +29,7 @@ BDEPEND="sys-apps/sed
virtual/pkgconfig"
RDEPEND=">=dev-libs/redland-1.0.14
- lua? ( >=dev-lang/lua-5.1:= )
+ lua? ( >=dev-lang/lua-5.1:0= )
perl? ( dev-lang/perl:= )
python? ( ${PYTHON_DEPS} )
ruby? ( dev-lang/ruby:* dev-ruby/log4r )
diff --git a/dev-libs/weston/Manifest b/dev-libs/weston/Manifest
index 3dc32668c7c1..8241cd0f98f4 100644
--- a/dev-libs/weston/Manifest
+++ b/dev-libs/weston/Manifest
@@ -2,6 +2,6 @@ AUX README.gentoo 383 BLAKE2B a0d8fef2d1f0deebe46ed85065a09057a620aa7af4e7aa901f
DIST weston-8.0.0.tar.xz 1094904 BLAKE2B 858f892027f2f41687deb699770843bf962b8fab06bded4f9018ded01d87e2dc3388e371921229887d45f6c9c9e981ae5b28ad473660b9acce9107c7a63a14d5 SHA512 74853b0c9cabbabe942a2d057b65e4e97b48dc5f4df6d7b9ffc10ec52bc787009b12b900be6b426551902b920b7308baa967b7489761641dc9c31cf90440950c
DIST weston-9.0.0.tar.xz 1555212 BLAKE2B 6c5feb3959ebe894861c6dc0817633b23e8518baf1c359c2967f111c071e9d4f166ef1421ad6465b036b3f1c485cab5f442476e7a44e3ec722cff576dea73852 SHA512 ccc263f8279b7b23e5c593b4a8a023de2c3dc178b1b8d6593599171770bcfe97608de9fcb77aa1cab39255451d289d323e51c317dae190c7641282e085b84f90
EBUILD weston-8.0.0.ebuild 3660 BLAKE2B 3a0d81693f81fc132b4ffde6d5b13f77c2e7c61b0d9518523fd2106559708dc23f5b4be8158fd1417e68d76837f21b835818b01bedf6ac757f5fb064339f0347 SHA512 c17c246ec8b0a1159bf45747b58d8e063c939223c37b23a92242ad6649f97b1e16f8c6ff3a15bb50ef7b5679a907daa266c7f794bf63c7ce2c2a0b60e816c3a0
-EBUILD weston-9.0.0.ebuild 3718 BLAKE2B b72e130caec955fca9a896b3c653df1f047d7a10b858f3759c34f9885f63d991c4c0889138c2fed1ceba575924273cdcca20f4df8c4f0fb955e956bd9ca6188d SHA512 144f62271d7c30ada9db349b2f7b467e7de9f64f9c38824dcdd859648b559c435a41fc8df2ca3058141763bb651206b44da607879cc4499e9f72bcb6a63d4749
+EBUILD weston-9.0.0.ebuild 3724 BLAKE2B fb4cc1b0ed4cc8ed15b0d400ba4626b6e94a05e1734b24738a0321915bef767773885873e6dd1ec720229a0dfd475d86066c83e22110155671719d2d9dd310c3 SHA512 a68943c5a130350f185d347e7dae37cb2ed6a8341d251df84ab28d20a86a4921b4ce5a7d904c683583b7e2becc6bda10e122ee41107c61c6663266112d13c39d
EBUILD weston-9999.ebuild 3716 BLAKE2B 537fe56673b83e0c843be35ab95b1e154570a1bbb02a9cbede05e119de27e5e130fae91372c1c239ca5b77c762eb26db6e0c9e83523202d98e0aefe97f19ab45 SHA512 bd8b946e7dc6488b9f7586cdb263e64bf4bc87fc9936d635b79df9a27929fd621a26f1e2e918f2924bc3e11e7a0665934229cb5f5334503e1c02553fac273ab0
MISC metadata.xml 1484 BLAKE2B 0cf0554d570059077eedaf579dc65651c715a80520d89633cf1979af25014fd7817d7e4ded1d7bdbbc77346e58d026e6371cfec91f710abfdcdc5d360eec60ef SHA512 63e012a64c88b3c2aca3a5f109d468e3dd5e856b1bd42ad2a803e2881b0962f499f8b201e99e940f04b09a3618e9f3594ea2e8565b204cab4093030913222900
diff --git a/dev-libs/weston/weston-9.0.0.ebuild b/dev-libs/weston/weston-9.0.0.ebuild
index c01d4eda03b4..a65a36db98b6 100644
--- a/dev-libs/weston/weston-9.0.0.ebuild
+++ b/dev-libs/weston/weston-9.0.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://wayland.freedesktop.org/ https://gitlab.freedesktop.org/waylan
if [[ $PV = 9999* ]]; then
SRC_URI="${SRC_PATCHES}"
- KEYWORDS="x86"
+ KEYWORDS="amd64 x86"
else
SRC_URI="https://wayland.freedesktop.org/releases/${P}.tar.xz"
KEYWORDS="~amd64 ~arm x86"
diff --git a/dev-libs/xapian-bindings/Manifest b/dev-libs/xapian-bindings/Manifest
index c27d4b60f74b..2dddf4cedd32 100644
--- a/dev-libs/xapian-bindings/Manifest
+++ b/dev-libs/xapian-bindings/Manifest
@@ -2,8 +2,8 @@ DIST xapian-bindings-1.4.14.tar.xz 1132008 BLAKE2B 3057f8f98cfd11e82555df4b554ad
DIST xapian-bindings-1.4.15.tar.xz 1132248 BLAKE2B ba9f60263881ca558f9d3deab09bd07271e6f54e06a13d09bcb59bfaf9a637e959b3a62a9e9db0724ae2262e605fc3fd2160559d53702b2af5012f47177ea66a SHA512 dec8a0431c9070fc70d79b67bddc2e0adb10ef5366c4b9d7a135365ea6c6680d2e7682dbfd60c29eca51da48eaa0715509e30b13d5482d5a38bfd0d0156c43f9
DIST xapian-bindings-1.4.16.tar.xz 1133900 BLAKE2B cea310cea777f665feac3b0cac7189da66e596d245af0a3a6cc40d01e6b9862bae2b61d5b21e7d742c1e0eb1424603a47c44a4fab9d17125820ab793360a85f9 SHA512 afdc4379c8dc8381813eefcaf761ea560a23ba6718a54c61874c0d29786b9f49dd548ed3854fee38689c273acebb4637833b8cf5c75d0c2ed05df83384e59113
DIST xapian-bindings-1.4.17.tar.xz 1135100 BLAKE2B 8c45322725c341f6e6484e0aa8716798aa5b31e5bbc795d0f5c631022c69e96f472b3fd76609116a196431e5b069a710c3ebbfc989de8fb57d5e2d081008b89c SHA512 9cfd9809b8b13d47a7b50950c19b821d4ae902611eed3972d93cccda82d07d5858e37989bb9de31ede082c2574487e0bcd8c1e5f30f1479d47f4c28200ff76e7
-EBUILD xapian-bindings-1.4.14.ebuild 6446 BLAKE2B 2b98e0f1095d527c021792c20b7c5d6977025d16001ec1a82bbff83164adc9af27a8aa04f7b80ae7571bac2fe43bb248ad063e9ca4c28109408e5a562e35e3dd SHA512 ecf37332ea6f17c243447d81425389549a9549afc62e79602aaf9a51a96a2441d92848d85a7e63907af143b871b14f4f77470a7f0760f2a37a0752bdb10f07db
-EBUILD xapian-bindings-1.4.15.ebuild 6447 BLAKE2B 8cc17f4428e0c6376321a1d7fc0c79a1e9f9c0fa9c94d207587942a9909183d3b23f0a6189f3e79730c96082744b2f3d6d38e273c2be80bf9b63b6e5620a013d SHA512 dd19b3ddca4556c13023d6e749eeac696f87162410c192b3c15bff8636eade45ee9b110e0ad857f4f56e36ec620c3eeffd264331ad1c3dd564d15afa7902d8dd
-EBUILD xapian-bindings-1.4.16.ebuild 6447 BLAKE2B 8cc17f4428e0c6376321a1d7fc0c79a1e9f9c0fa9c94d207587942a9909183d3b23f0a6189f3e79730c96082744b2f3d6d38e273c2be80bf9b63b6e5620a013d SHA512 dd19b3ddca4556c13023d6e749eeac696f87162410c192b3c15bff8636eade45ee9b110e0ad857f4f56e36ec620c3eeffd264331ad1c3dd564d15afa7902d8dd
-EBUILD xapian-bindings-1.4.17.ebuild 6446 BLAKE2B e9ea51940945489174383fbdb5f328831eb2aca5425da9b0ac16fb64d5b8788f6dcc7a5f82f74d7ef79a55a54e232a96e4046af2059a9e10d5bb2212fde8712a SHA512 0a0684fc7836427cae1903b83bb21aa64a345aa31140ef774ba598254e5750c623518d0fe309f9483edde803efecaf6eaafafe1c30528389577057eadd43d08c
+EBUILD xapian-bindings-1.4.14.ebuild 6447 BLAKE2B 8c879c77362dd1a6de377899e37a7a45f3b10c84b3f8f30a85f37818b0fef560ba4ef76151ea231b9ef305025cddf8f18e6bd2dfa785b86d7a13fa5ed245b276 SHA512 acef1bef8b5c6d23899eca4960b1565ebe289b0b73dfaa551c27ebda73160e51eeddf53b9e2628f729b524a3e1e35646b41018f4e47f76bc834c49aa848faf0d
+EBUILD xapian-bindings-1.4.15.ebuild 6448 BLAKE2B 863f3a89cfc7656e07a25cb972456a45cd8d3da090ab4d0e5f830d39f4841ae04377dff6c93f798fd02ea01aefa5783cacd4a071b2eb95f6a215a8657540d6d5 SHA512 f59f5e58dabf13fe38e3d4dd35b1709feff7530fb3fb4fd29d48cd56d1148af6aa7fdacb0cfd8b7b1f59e6cd663eff2aa9ad82485b3ca3fd99ff6dedfbe5e360
+EBUILD xapian-bindings-1.4.16.ebuild 6448 BLAKE2B 863f3a89cfc7656e07a25cb972456a45cd8d3da090ab4d0e5f830d39f4841ae04377dff6c93f798fd02ea01aefa5783cacd4a071b2eb95f6a215a8657540d6d5 SHA512 f59f5e58dabf13fe38e3d4dd35b1709feff7530fb3fb4fd29d48cd56d1148af6aa7fdacb0cfd8b7b1f59e6cd663eff2aa9ad82485b3ca3fd99ff6dedfbe5e360
+EBUILD xapian-bindings-1.4.17.ebuild 6447 BLAKE2B 4c9f93b886563f6010bd2e60e7e429bc9ab7b914cb6c367a354e6c5dcf0e1bb1ce8f219a069b6ef9e40cad932b4e69bebd815b2878964bc333921485b21e65e7 SHA512 ebeebfb7223e7efa49b06ad076a82a99d03b836f18bd5dcb69ca512c4f5ac762443ea1e2ace41693e9bebe53e14810c5df4f1d7fa9b1c0c2c1d449e824ed4b4e
MISC metadata.xml 252 BLAKE2B f6282e2a99df668246ea8570c72345463f06d282b6adc6d9de2a08ef0827cf4572332c580caa594aad5ba8e200870d8d25494549ee4413798025f0d885b61a68 SHA512 cbda7bf9832872764ae776ce16b2966c37a2ba3a1982d9817006fd6b82d7b17146434cde428bf114062a483e9053d2acdcdd004695e6ebf428d19cdc09937c65
diff --git a/dev-libs/xapian-bindings/xapian-bindings-1.4.14.ebuild b/dev-libs/xapian-bindings/xapian-bindings-1.4.14.ebuild
index 347f3ff01145..9afbf0ca6ebd 100644
--- a/dev-libs/xapian-bindings/xapian-bindings-1.4.14.ebuild
+++ b/dev-libs/xapian-bindings/xapian-bindings-1.4.14.ebuild
@@ -30,7 +30,7 @@ REQUIRED_USE="|| ( java lua mono perl php python ruby tcl )
ruby? ( || ( $(ruby_get_use_targets) ) )"
COMMONDEPEND=">=dev-libs/xapian-1.4.14
- lua? ( dev-lang/lua:= )
+ lua? ( dev-lang/lua:0= )
perl? ( dev-lang/perl:= )
php? ( dev-lang/php:=[-threads] )
python? (
diff --git a/dev-libs/xapian-bindings/xapian-bindings-1.4.15.ebuild b/dev-libs/xapian-bindings/xapian-bindings-1.4.15.ebuild
index f1522bf0ac05..d611b5377dca 100644
--- a/dev-libs/xapian-bindings/xapian-bindings-1.4.15.ebuild
+++ b/dev-libs/xapian-bindings/xapian-bindings-1.4.15.ebuild
@@ -30,7 +30,7 @@ REQUIRED_USE="|| ( java lua mono perl php python ruby tcl )
ruby? ( || ( $(ruby_get_use_targets) ) )"
COMMONDEPEND=">=dev-libs/xapian-1.4.15
- lua? ( dev-lang/lua:= )
+ lua? ( dev-lang/lua:0= )
perl? ( dev-lang/perl:= )
php? ( dev-lang/php:=[-threads] )
python? (
diff --git a/dev-libs/xapian-bindings/xapian-bindings-1.4.16.ebuild b/dev-libs/xapian-bindings/xapian-bindings-1.4.16.ebuild
index f1522bf0ac05..d611b5377dca 100644
--- a/dev-libs/xapian-bindings/xapian-bindings-1.4.16.ebuild
+++ b/dev-libs/xapian-bindings/xapian-bindings-1.4.16.ebuild
@@ -30,7 +30,7 @@ REQUIRED_USE="|| ( java lua mono perl php python ruby tcl )
ruby? ( || ( $(ruby_get_use_targets) ) )"
COMMONDEPEND=">=dev-libs/xapian-1.4.15
- lua? ( dev-lang/lua:= )
+ lua? ( dev-lang/lua:0= )
perl? ( dev-lang/perl:= )
php? ( dev-lang/php:=[-threads] )
python? (
diff --git a/dev-libs/xapian-bindings/xapian-bindings-1.4.17.ebuild b/dev-libs/xapian-bindings/xapian-bindings-1.4.17.ebuild
index 7e936fad6ad1..6332e29debb9 100644
--- a/dev-libs/xapian-bindings/xapian-bindings-1.4.17.ebuild
+++ b/dev-libs/xapian-bindings/xapian-bindings-1.4.17.ebuild
@@ -30,7 +30,7 @@ REQUIRED_USE="|| ( java lua mono perl php python ruby tcl )
ruby? ( || ( $(ruby_get_use_targets) ) )"
COMMONDEPEND=">=dev-libs/xapian-1.4.15
- lua? ( dev-lang/lua:= )
+ lua? ( dev-lang/lua:0= )
perl? ( dev-lang/perl:= )
php? ( dev-lang/php:=[-threads] )
python? (
diff --git a/dev-lua/Manifest.gz b/dev-lua/Manifest.gz
index 223fcb346062..bbaeb1a92646 100644
Binary files a/dev-lua/Manifest.gz and b/dev-lua/Manifest.gz differ
diff --git a/dev-lua/inifile/Manifest b/dev-lua/inifile/Manifest
index 3cc7f2a0814a..fb322d02baf2 100644
--- a/dev-lua/inifile/Manifest
+++ b/dev-lua/inifile/Manifest
@@ -1,4 +1,4 @@
DIST inifile-1.0.tar.gz 2611 BLAKE2B cdda6d9b2de45b4bec4695029018e37fe22a993afe5a54df4f4c519457d00267338de5aa3379a72dc7ab962260cd39f49674c2685799e4ad5544fed938c1080b SHA512 d0a9aa825cd5cf4a3b0b562853f3593141f537388c3e3a4334317b2536aa2dd695bdea37058d3d907aad10162bb71ef5b324c769e65cbd18e4526e37275cb970
EBUILD inifile-1.0-r100.ebuild 645 BLAKE2B 56872cb0ccc71574d19ab5f44acf2eccd10f4ee2feb39e2c2bb409c5867a451a4abd965aca6e10c6045aefbff3e31ed406f07dbec63127112669d502e7b1f93a SHA512 8f5844e8aa6936a8c702ef8f1d1734895395346858f01983e0843895d4837f230350547aa331c58be9a20df589202184f2598e5a962cf04c1c67c0e1a46e47cc
-EBUILD inifile-1.0.ebuild 696 BLAKE2B 4f35c46a80b51447abb363ae09f1606865cb02c2abdfb418ea5f370826063c783234e4075728518f11c951423cf53c2fabf2a39b696aac0f7725484595bd5540 SHA512 5aff526d305006045861a5794b6d648553ceb14322d7976dd892a9f1568cf73e24071229de32224e6dbc49d169e24958cead64da07139d538812130ecc3437eb
+EBUILD inifile-1.0.ebuild 697 BLAKE2B 8d79f950528dd13fabb0407484ec3100d094346712801395fbad448068946d841427eaa28e4812f2d5e6375e614cc7219aa0e7df452742d120d0f3e0ec3a4188 SHA512 3a0ef75dd28985bf2234dad4d167c23665a2030eba4edc42128b37c46c55fec7fbc92211f657db2c01ded2d037b6670e9b453f170ff2692f1ed8d800271806ef
MISC metadata.xml 330 BLAKE2B 950a8b8109efc12fe3c96d1a3a2d58371849a984e9894325b36155a3d734e8c2e644b974553e31e029d8622972d6f932a58879525e5179ad4eac9d19c0f70a6b SHA512 0bd7146b86660e03f10927c0a2efa7d6298d2345483a16dcad46fb8f2e0e8b9cdbceae2b8d9dc7c282987ee8e82210f2c27d01df4a958e6c981e807bcb4ce7c3
diff --git a/dev-lua/inifile/inifile-1.0.ebuild b/dev-lua/inifile/inifile-1.0.ebuild
index 05056d9afbd7..172de3e5af4f 100644
--- a/dev-lua/inifile/inifile-1.0.ebuild
+++ b/dev-lua/inifile/inifile-1.0.ebuild
@@ -19,7 +19,7 @@ REQUIRED_USE="${LUA_REQUIRED_USE}"
RDEPEND="
luajit? ( dev-lang/luajit:2 )
- !luajit? ( >=dev-lang/lua-5.1:= )
+ !luajit? ( >=dev-lang/lua-5.1:0= )
"
BDEPEND="virtual/pkgconfig"
diff --git a/dev-ml/Manifest.gz b/dev-ml/Manifest.gz
index 38ce002ed14a..5240fe0ab725 100644
Binary files a/dev-ml/Manifest.gz and b/dev-ml/Manifest.gz differ
diff --git a/dev-ml/cairo-ocaml/Manifest b/dev-ml/cairo-ocaml/Manifest
index 70fc63a89309..c1eddc9a0890 100644
--- a/dev-ml/cairo-ocaml/Manifest
+++ b/dev-ml/cairo-ocaml/Manifest
@@ -4,6 +4,6 @@ AUX 0003-Fix-FTBFS-on-bytecode-architectures.patch 1135 BLAKE2B 90847d27617c1c63
AUX 0004-no-automagic.patch 1041 BLAKE2B 8cc95aabf25e768cbb03ea608b74a45aa36f7e86f72da7875bb19973512165a1e6ece9f80093ec887e49ffdbd86df23ae585317d2f65b791c186335b86fc2b50 SHA512 53bfa4cbc40b3725fa40454fb6e8521f21aaf61135dd6da1ec9fd3f1df256ceec1901022aa70dabd568c0291e37008b7c122d1d654856a13fe632f3bf2c271b8
AUX ocaml406.patch 830 BLAKE2B 662bc72ae0f51e6b6b11a475930847fb18a34c1a812c758b0d00fe156a0b1872dd0eb3d590a3be744ef7c4231aa637571631f0d3d61e9401a1b2164a8434e6ac SHA512 d2fc42aaaac76311cc78ee5c53df6e4c029534f424430465f18acb57988169ea240af2c1d08d84fefd5c8e64e5342e8e721e72eab2e1cf240507fcf0324aff72
DIST cairo-ocaml-1.2.0.tar.bz2 44483 BLAKE2B 49a8c811100e3167a8c32ca87a0a6c256862d276c3703082b944aa55f8def7b56d478c0ed44b9d7f5de9194603b688daa5e42949db00417b71daa7376e17410b SHA512 5cac319cf27b94d31e955885ae89b40342c2ae4ffd1aca7c52366f7c3679185f74e513e0c73bd01260f89da29d43bb420dadd059fa1cf5509997db8f935704b4
-EBUILD cairo-ocaml-1.2.0-r1.ebuild 1951 BLAKE2B f2f5d85f5ca53294fefcaad7ea08c45a3b6926ed3484a6cdfd9da01ec6d8f9cb57e8de938004b44ac9306959cf2e15649773ba93d5241150f957c72b0d24396f SHA512 05a793768810c7a114f73672e1e7a58f384c1a0a834e588700878eb41d989d50276ed822775d72dd3904a001be3ca192fbc8b86bfd6e305e5a8b604e5e225780
+EBUILD cairo-ocaml-1.2.0-r1.ebuild 1950 BLAKE2B fbe82ba03868919e71c3e55e20d38e443616458a3493a8a8ab598af78e481dde3ffd31c3aa0d347093961831ca05444f62c1eb4a58724207da812bdde928836a SHA512 a772d777572b0c7b17e416c636067718d2b71029a2c017ec7b8fa8c18c438b56f737742ef40b8ea2f0ac811de0893eb81c62f5af78c0facd480280b54b1aa304
EBUILD cairo-ocaml-1.2.0.ebuild 1896 BLAKE2B 50549894df7f733d386d7611fa9adde2325e20acb0731adc5b1eb760c385f6292acb0ffefabcd2a0bece62c7de481997fb1dd937f68fdc216d90b92319f5dfe3 SHA512 b1ce1ed398e94271e9a608b1abd3d3be2543065111c1d6826e19db71022f3b898de1c97d524884a460de9ba841b4c7074f68561d353c5142cb2bb7b83d569707
MISC metadata.xml 572 BLAKE2B 55d9ae52f939a260daa0e05c073fb0e574a44383414e04274d58ded73bc68ae6713039ed1f51998a307c166313d93755066a9d06f7fea3525a154de856854ad0 SHA512 7ca7f4c88e7343d1ac5acbacef33cde7a437c5e70df3bede08ee893c7bea317b444585f4d4e9e010509b2ebae9586bbe5d94a5229f656b6ce996cabb895a60d2
diff --git a/dev-ml/cairo-ocaml/cairo-ocaml-1.2.0-r1.ebuild b/dev-ml/cairo-ocaml/cairo-ocaml-1.2.0-r1.ebuild
index 19eead630c6c..f05710bc7330 100644
--- a/dev-ml/cairo-ocaml/cairo-ocaml-1.2.0-r1.ebuild
+++ b/dev-ml/cairo-ocaml/cairo-ocaml-1.2.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://cgit.freedesktop.org/cairo-ocaml/snapshot/${P}.tar.bz2"
LICENSE="LGPL-2.1"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux"
IUSE="doc examples gtk pango"
RDEPEND="dev-lang/ocaml:=
diff --git a/dev-ml/findlib/Manifest b/dev-ml/findlib/Manifest
index 8e023fa8d803..06206138a67c 100644
--- a/dev-ml/findlib/Manifest
+++ b/dev-ml/findlib/Manifest
@@ -3,6 +3,6 @@ AUX externalmeta5.patch 562 BLAKE2B 0618a1691472c3248f63f157f2ba36d886a7b34b1813
AUX externalmeta6.patch 546 BLAKE2B d0d5f75c46704b280ae4480ffe2ebca097adbc457c845615721888b45612da1a8e71b41bd6d8d9dadb16cdffa35108fc87a3dfd32313fa96d92f0021817e0112 SHA512 c112b7d44101e483d408c56dcd0d2524208b6e95b65a09dfe01f8ad6d09a20617020f9174cb4631473bab2550fec151329fb5e8d0e2e3378991f1ab88cce0301
AUX externalmeta7.patch 527 BLAKE2B bf4a4aec02096766f9741705fbf99201c742abc992ddb05c143378d7bb6d0b79f3c3541199eb5a81142fa1b317980646c3fe12528f792cbfaa7762f024bd88d1 SHA512 61c1e03e5b0d021f2cd7d013bed54edd610edb48cf9f6c063d3542abea2d2fc811c1cf7284b54a584491064dee8dd4e72656ba90a63c144586f40705b8443a1d
DIST findlib-1.8.1.tar.gz 261544 BLAKE2B acfa9d4e0d118ebbc0dd7b03da1fe5eaa994e5fec13dc54e60ba42f643d93968469a1a43fe4f832433dca6c3902e8846616fcf460c748bf037fe16cb2f93a847 SHA512 0d8e1ff21217fcc6823aab3ac71282789691e4ae8c3607703d0393468247f93e2d084bd4e2a8795b523f2c7f193521d3aae4b8122c934ebf8b58c3185a5bc9c1
-EBUILD findlib-1.8.1-r1.ebuild 1668 BLAKE2B 84307716d465e5d10b0df3f37ddd5a7533dd07bce02827d7c5fa2fafd1be51d26be90f4cccb78c1add70d00865fd812380a7cacd9445973ee7695f2272ed212e SHA512 e94c9836cb19b1eb59b33f7570b9104d697d73ca6af00d3a0986f7823ca726cc6106bf6f124aa9955e283bc9810ad85f32186345357f03438936f6d54323ca59
+EBUILD findlib-1.8.1-r1.ebuild 1667 BLAKE2B 70f92bca30da27070ffe15a04de2cb52c8de0fe2bd76207284d84fa58195fb9b90f7c5c3a4a0979c224478d02cdfec416f1ded56f6e676106c3d05766cef2605 SHA512 818a752320b0ab10807056010e8144c9e225956a0a16af5ea89ca70236ab69f7e1567d3a123f46a64b8d3e9841a5afe75a50734c7f4d5c7988d0ecf5c230f8e9
EBUILD findlib-1.8.1.ebuild 1681 BLAKE2B 3e4cca14ddb76b0dc5dcc5f2d94ca4bf4b7e8cdd26696a5b104434195a2b73fb43bcf27338ac7444a4d80ce58cf868d3d309bf1fca59b54d4b30aa398e27a9d4 SHA512 f2de64a87a1f859c2840a849246934052baad12cce4708eb592d63df20915569a6f69c87b9936c3951b2c856d42e50ab3ade8f2182197deb9631be14150e0862
MISC metadata.xml 244 BLAKE2B c82f45966666e095a27d4d8b14f01f93e202177ea8222c5fc806f4e243b8ca653a61232533a6dd10ed36a35f765dc94cfc651f9fade565b8eedfe1129b5c2d23 SHA512 756b8d091c29b6c4c621ba30588da62cf99e777243fbdd88cc668f3ec071353beea675c853f8c58752fbc6c01c795760cb10428d3a7fd087967a88b885d91149
diff --git a/dev-ml/findlib/findlib-1.8.1-r1.ebuild b/dev-ml/findlib/findlib-1.8.1-r1.ebuild
index 6880e1c5c7a4..b3b53b409f96 100644
--- a/dev-ml/findlib/findlib-1.8.1-r1.ebuild
+++ b/dev-ml/findlib/findlib-1.8.1-r1.ebuild
@@ -13,7 +13,7 @@ IUSE="doc +ocamlopt tk"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
DEPEND=">=dev-lang/ocaml-4.08.1-r1:=[ocamlopt?]
tk? ( dev-ml/labltk:= )"
diff --git a/dev-perl/App-cpanminus/App-cpanminus-1.704.400.ebuild b/dev-perl/App-cpanminus/App-cpanminus-1.704.400.ebuild
index f03a5a045953..e3a8b1ae6699 100644
--- a/dev-perl/App-cpanminus/App-cpanminus-1.704.400.ebuild
+++ b/dev-perl/App-cpanminus/App-cpanminus-1.704.400.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
DESCRIPTION="Get, unpack, build and install modules from CPAN"
SLOT="0"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="amd64 ~arm64 ppc x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/App-cpanminus/Manifest b/dev-perl/App-cpanminus/Manifest
index d6c5f2e967db..67fe3c2a1d8e 100644
--- a/dev-perl/App-cpanminus/Manifest
+++ b/dev-perl/App-cpanminus/Manifest
@@ -1,4 +1,4 @@
DIST App-cpanminus-1.7044.tar.gz 316368 BLAKE2B 093f48282349be882afbdb2480e42ea73ece061fe01919c8d7bbf8890ccb83a699be0a54126556620e03b1cf9da195a9c266186c9b84427d4bba57ebd11b62a9 SHA512 85e88de8fbefabdfd84fe8aeaa8294d58d63e27276cd6d8b8dfc5dc4cd6c30c12f5859f30e4930842d6d06af50c88d71358dee49c93821234c811aa39de822d7
-EBUILD App-cpanminus-1.704.400.ebuild 413 BLAKE2B 08185289122961c0098f02dfa285cf65043c4947796f365830042317f8620d8fe632da7f979cec8ebb46e05a90fd9c71441197bf4aa6039f5787ce0869360ae5 SHA512 340e4fb7ea693a1629d2c8b3777ab3651839c04ea2c79fbf99d77fb1bd3179a020cd71a99196dae8c774f466e492b27a328fe32084ad2588406dc347b13e02c9
+EBUILD App-cpanminus-1.704.400.ebuild 420 BLAKE2B bdc8096b2c3138702eeac8e66b5966867df045d8fe392da9183ea72e0535152f3eeea780588eaf69378893a3ef6879dd84a7352c4c5d1586c2373df48b0a73a2 SHA512 e71a9a471feb50528ef96e7ad457e059767073f3ae3d5c913b4c1f26bf1e65ab6a31edcbbdaff0cb9f3b9a0e24c6fc71577621a6002459bbb8f1edb22c709f03
EBUILD App-cpanminus-9999.ebuild 2820 BLAKE2B 22f2052c1fdf895a3a0bb26c3a403100082266766d3d4a3f3a19f6ca55e50897b2e4dd330e5f9d53b49a2739d7e221822277892d310ebe5e68d40bd7938c0413 SHA512 8344c27b6534c2dd21df5df340ecee380727576ac1facd9ef4db10fec6a7c85e7df9502931c294cf53c86ffa9037513e03be23f608914af46b01a65e38dcfcf4
MISC metadata.xml 422 BLAKE2B 93640a71db70d4e732c859d97d59f06550c053d4d964f90d99870bc4f8147e2c54a765e4a48fe71af6aa56906486e8e424fdb454d52db821edbc682d1c9af471 SHA512 a425a03857673eeb031ecbff9012a7d6f9d3fac567f39409f80df3891247cf820313a4499630b676b765a657d8f8bca0059cf776b7ed9e3761145b40da2fabb0
diff --git a/dev-perl/Manifest.gz b/dev-perl/Manifest.gz
index 02b79c27b408..fd5108293f16 100644
Binary files a/dev-perl/Manifest.gz and b/dev-perl/Manifest.gz differ
diff --git a/dev-perl/Parallel-ForkManager/Manifest b/dev-perl/Parallel-ForkManager/Manifest
index fae195fd7b06..d49f84d04ded 100644
--- a/dev-perl/Parallel-ForkManager/Manifest
+++ b/dev-perl/Parallel-ForkManager/Manifest
@@ -1,3 +1,3 @@
DIST Parallel-ForkManager-1.19.tar.gz 24381 BLAKE2B fbd92bdbf69012337419e7d28678dbde291a819ce310fdcd47d05fd150f57a65da3e9e582946adeb95a85b3539447dd315a17746ea9dfa346222ff5a14106e87 SHA512 fdd076de153a09e1e8fb681cadc6c36a05f4c8a6718df61937eb5d26729108a6f2f322a7fb9d4bf6166bbfe52cb857e3ea6cab8368c7b5959500018cc01747c6
-EBUILD Parallel-ForkManager-1.190.0.ebuild 696 BLAKE2B f8aadcc4c1b736f2f3ce7bb799371fbd85a4f081e3b0d35927dab00ea238e800d1fe68ed390a9642b1c2837b4faefdf78509b1893716de9fc3f0d5699c3f1de6 SHA512 450c3f1158e9141d4fd84f270e577c16b567a882f11b3b9298284f804d263b9e08ffc855bb9e4f2f7a0692ef1ecddf78c7db00070a48102aee44ed066bc06135
+EBUILD Parallel-ForkManager-1.190.0.ebuild 703 BLAKE2B fd036c5803289bfde76348f3b968ed84907f31d17e79b0dfa33e35f1e0d88788e5e00cb5ab87658f894671b7de634c4a7f025ebcf1b758e5b05473adb1a8ceb9 SHA512 f6993f9080e492813cbfbc39eb3df91041b9fd7faf5f759ecdb231e3aba402924d7d8b675b7432aa00611fe74455bbc171c77b7d7d1ca835758c727bcd3dc193
MISC metadata.xml 412 BLAKE2B f9685f233ad57dc03a506dad17ed7ca7db47574c9c86066925fb083917fee2d75de7b889a50be75a1a0497088b4ec87f8f0a44c3ba1c8cecad5320d10ced06f3 SHA512 3ece8329d77002aa4b494d3546d98dc46561326302daefbb46791da19e1ec0c6d9de654655ca434282202a3772baac665ea2cf4f47ce75464b2d17b5050c250e
diff --git a/dev-perl/Parallel-ForkManager/Parallel-ForkManager-1.190.0.ebuild b/dev-perl/Parallel-ForkManager/Parallel-ForkManager-1.190.0.ebuild
index 0d76f33131e6..42c50210b7e8 100644
--- a/dev-perl/Parallel-ForkManager/Parallel-ForkManager-1.190.0.ebuild
+++ b/dev-perl/Parallel-ForkManager/Parallel-ForkManager-1.190.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="A simple parallel processing fork manager"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 sparc x86 ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 sparc x86 ~sparc-solaris ~x86-solaris"
IUSE="test minimal"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Unicode-LineBreak/Manifest b/dev-perl/Unicode-LineBreak/Manifest
index dab13ae238dc..4e502fe8d84f 100644
--- a/dev-perl/Unicode-LineBreak/Manifest
+++ b/dev-perl/Unicode-LineBreak/Manifest
@@ -2,5 +2,5 @@ AUX Unicode-LineBreak-2017.004-dotinc.patch 4512 BLAKE2B e86fb471d296e642aedb254
DIST Unicode-LineBreak-2017.004.tar.gz 311366 BLAKE2B 7f4ff93365c0542ae1a8f9d17e0e9e20224b95949c4965e69f241ff949f625793a19bde4a81830f9f0214abe3d18fa6c52f43f9a04860ec4d13db55169d120f7 SHA512 f372174a761f87663761dc8b0f9bf387ffe289ba267fc0fb58353ac06dfa9418d4b0ac6e4e0d7833d842feacae4f8e90e521cd677ab22db1bf32e75f10f2e727
DIST Unicode-LineBreak-2019.001.tar.gz 312225 BLAKE2B e7bf274fcba3603acf93f520493d67b2ff113b4e098da39c8f5f5a180bcc75f403f04ede5248b8598f8b991498de9c19766c29e3ee25eea12e82aeac1241194b SHA512 2d285f928db2ed32aefa741629ce9f9bee82e69c247eaa2c9145fdb4e9bae4441bf822e108cbffc3955369539474c3299f0a8f69026a5f9686aa8458a1d87f27
EBUILD Unicode-LineBreak-2017.4.0-r1.ebuild 513 BLAKE2B 2291e26ba5cf3d2989e20941e2ea905310218d8cdf1759d3bd501f0c82a1f3b754f2c72e90d74d0abbe266df2c6286f7e6e30785236c9968ff11b3c8252c43fd SHA512 c847490977afe134fe4a19429dfe63716f08bffee94859885b80130905d55aa6e48ac35513e2fd8978271c2dff22e52dee0b9648e79b7d457662f2c53a15f1f7
-EBUILD Unicode-LineBreak-2019.1.0.ebuild 470 BLAKE2B e8d6453362eb2952f09bdf79f2bcd0444e84b45ce9280ea772e0672bda310c848524b024c74044479ab079aa1dbffb46f35ef2e8228490b908d5e1621d3fa4de SHA512 4805fbc3dc52cfcb2628c9aca03392d5f6552eb476dc1e71a312f75601a60222ef3e0c281e0541478fc3cc4348230d7017c03865a20ca32f4f0e027b1f0458d2
+EBUILD Unicode-LineBreak-2019.1.0.ebuild 467 BLAKE2B fc6c4f0a690f0cf639413f52aea34da12adeeaf66097e5bdc9e6025e6573336a102d159dda620b3f030b94e22bb04e5f8b86cc27c8a08405eed8bada26eaa771 SHA512 dfb127f23bfa5a9cf12fcafae61c1bef08f195fe4ee88bbbe9be842a294e3d2235146f0b9ef9ef6176e50001ae5efcce95efb45d4a5a0e6cadb480b4579a05f1
MISC metadata.xml 531 BLAKE2B 222c5b7ac9a391d440e8d2d74525ffe988ebfaaafeacbeb725b944bb688977ac2a44f5934ccdcf719ccf516d3580308f0cddb6b1f4c7d2b3ae2e2ceadd5cb1db SHA512 831c5152759f2a9b2c549295aec94a7a9a00f261fedeca2744aa5161ba4cc9c68efd59da63b80e3b70ea83fe16491f7438580fc614bfcf57fd813654307710ed
diff --git a/dev-perl/Unicode-LineBreak/Unicode-LineBreak-2019.1.0.ebuild b/dev-perl/Unicode-LineBreak/Unicode-LineBreak-2019.1.0.ebuild
index d741b6bb30da..41f6f60ab10b 100644
--- a/dev-perl/Unicode-LineBreak/Unicode-LineBreak-2019.1.0.ebuild
+++ b/dev-perl/Unicode-LineBreak/Unicode-LineBreak-2019.1.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="UAX #14 Unicode Line Breaking Algorithm"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~riscv s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
IUSE=""
RDEPEND="dev-perl/MIME-Charset
diff --git a/dev-php/Manifest.gz b/dev-php/Manifest.gz
index 082a3f476c80..16bdbb51a887 100644
Binary files a/dev-php/Manifest.gz and b/dev-php/Manifest.gz differ
diff --git a/dev-php/smarty/Manifest b/dev-php/smarty/Manifest
index 8e4131a90917..9356dcd40c92 100644
--- a/dev-php/smarty/Manifest
+++ b/dev-php/smarty/Manifest
@@ -1,4 +1,6 @@
DIST manual-en.3.1.14.zip 408414 BLAKE2B 03d4e7a386eb3bd5b19e5c555ec34b86812838a5b5fac8ec0ab9701fba89a5867714da57d950f68224a89bbe2267c18d638ee850681860de309c74bbfb3d0a0b SHA512 d384e3856b45ed3f992f3732a5465120abe9fb947cdf13ff67a9c4264f72987d24885ee61cd7309b728e64cdfe4f34c3e7f757096d35de56d962f3b78def9e58
DIST smarty-3.1.33.tar.gz 249999 BLAKE2B 1e174b190238c8b20d5dae9c0c9fdf264c4716ba850599a2a028fe6c307eb3d9d2611e3b928efb9471e051496e4e31502458cd7a71a9318e012d5af7eca2c50e SHA512 443473cf12c7e053744daef7a70d4172979d760278aa1593216d0b70f0c12ca2b48eb79486a1c10a1cf2264da671804b94ee9d538b9013ff0bdc42e28639ca5d
+DIST smarty-3.1.36.tar.gz 264169 BLAKE2B 56c1f361b5aa1fedca13546c717b85f6b54555761f45ba60959358433638714ec5136ad7b506696be3fa96fef14a29fb584e490e7a627ba9a1fd7d65e05cac42 SHA512 242014d4b39d162683bece8e8e29f1913f902c334a6ee0a4c84c1cfb7e06d1e0d7990b63833c8ffa7c4604306b5159caf00bcf2a4c0b6b379bf26768da75148d
EBUILD smarty-3.1.33.ebuild 1332 BLAKE2B 4218ffe53de5c781ec6dbdb050de8f96f9104f8c5634af309c6118c8d9aabb610a22c730c305ee5f769095211d21bc156df34a6cc75f1bf973f878d1891c6290 SHA512 86876128abc591cb852e75e7b7604f33913db3affe85dd0deafbe3d17571fd2c8608ca2e0021cb53310212befce855d3b74882ad77dec1c83691f92f34e32920
+EBUILD smarty-3.1.36.ebuild 1337 BLAKE2B c20ee31b207ea2842bd692f58b371a250ffd4fc8d65b4f84f52391d6c5f318457bcaff66989e713ebf859f44809aa078b22bec6761a3158e2383fbc09fd1aa96 SHA512 a68d084c774cf721d03ad7178684ff89dce46605c6bb88e8b606f4f254908546942627f7580c6c213e07e282a1b63dabae1f95c7c4f759d64974907e36b239e9
MISC metadata.xml 716 BLAKE2B 8abe288ed9a4ebaf525d4fe9bf2db14a9b345570298a4f024a034802326e5f87b99530380638eb06697a18e2aea2b605bac197bf2325d15c5f278b2a764b0e11 SHA512 eb97ed210a66eb9e46f228736008d207183f73b48ce5fa4947596935b9200f4444bd54726fa5ec01cd75c8d988e8d357d5d8c56055d3ce3d9f97e797365e8779
diff --git a/dev-php/smarty/smarty-3.1.36.ebuild b/dev-php/smarty/smarty-3.1.36.ebuild
new file mode 100644
index 000000000000..358ecbf11f61
--- /dev/null
+++ b/dev-php/smarty/smarty-3.1.36.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DOC_PV="3.1.14"
+
+DESCRIPTION="A template engine for PHP"
+HOMEPAGE="https://www.smarty.net/"
+SRC_URI="https://github.com/smarty-php/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+ doc? ( https://www.smarty.net/files/docs/manual-en.${DOC_PV}.zip )"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc"
+
+BDEPEND="doc? ( app-arch/unzip )"
+
+# PHP unicode support is detected at runtime, and the cached templates
+# that smarty generates depend on it. If, later on, PHP is reinstalled
+# without unicode support, all of the previously-generated cached
+# templates will begin to throw 500 errrors for missing mb_foo
+# functions. See bug #532618.
+RDEPEND="dev-lang/php:*[unicode]"
+
+src_install() {
+ insinto "/usr/share/php/${PN}"
+ doins -r libs/*
+
+ local DOCS=( *.txt README README.md )
+ local HTML_DOCS
+ use doc && HTML_DOCS="${WORKDIR}/manual-en/"*
+ einstalldocs
+}
+
+pkg_postinst() {
+ elog "${PN} has been installed in /usr/share/php/${PN}/."
+ elog
+ elog 'To use it in your scripts, include the Smarty.class.php file'
+ elog "from the \"${PN}\" directory; for example,"
+ elog
+ elog " require('${PN}/Smarty.class.php');"
+ elog
+ elog 'After that, the Smarty class will be available to you.'
+}
diff --git a/dev-python/Babel/Babel-2.8.0-r2.ebuild b/dev-python/Babel/Babel-2.8.0-r2.ebuild
deleted file mode 100644
index 6c6523761a40..000000000000
--- a/dev-python/Babel/Babel-2.8.0-r2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{6..9} )
-PYTHON_REQ_USE="threads(+)"
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="Collection of tools for internationalizing Python applications"
-HOMEPAGE="https://babel.pocoo.org/ https://pypi.org/project/Babel/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
-
-RDEPEND="dev-python/pytz[${PYTHON_USEDEP}]
- dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND="${DEPEND}
- test? ( dev-python/freezegun[${PYTHON_USEDEP}] )"
-
-distutils_enable_sphinx docs
-distutils_enable_tests pytest
-
-PATCHES=(
- "${FILESDIR}"/${P}-py39.patch
-)
-
-src_test() {
- local -x TZ=UTC
- distutils-r1_src_test
-}
diff --git a/dev-python/Babel/Babel-2.8.1.ebuild b/dev-python/Babel/Babel-2.8.1.ebuild
index 5bcb1eb4fb5d..e6bc5b44e761 100644
--- a/dev-python/Babel/Babel-2.8.1.ebuild
+++ b/dev-python/Babel/Babel-2.8.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
RDEPEND="dev-python/pytz[${PYTHON_USEDEP}]
dev-python/setuptools[${PYTHON_USEDEP}]"
@@ -27,6 +27,7 @@ distutils_enable_tests pytest
PATCHES=(
"${FILESDIR}"/Babel-2.8.0-py39.patch
+ "${FILESDIR}"/Babel-2.9.0-pypy3.patch
)
src_test() {
diff --git a/dev-python/Babel/Manifest b/dev-python/Babel/Manifest
index ad68b19c11c9..bf47685e3811 100644
--- a/dev-python/Babel/Manifest
+++ b/dev-python/Babel/Manifest
@@ -1,9 +1,7 @@
AUX Babel-2.8.0-py39.patch 7421 BLAKE2B 94a9b55504214b4c422cab61651dcc4c9192f438635e0ec6aa77ea1b53fefb782dd4a1d13ba89500fc2c2e13bebfc616529aaf74c18a55304fd23c2c53fb77cc SHA512 8d738bb0140c80bb2db8a2180c563f61500df42de1b69f0b2a36dea23aad889fe59451fca993161f6ca6a2f6006d98ce94ab139eb5be4a1a25f43e922e3fc9de
AUX Babel-2.9.0-pypy3.patch 1130 BLAKE2B 23abff434e982c8d8f8350c599b3b94ee07775e7244ce26f9bdd1d91b00ca0f25c03ee2b52b466b42de10036ad2004b6bfc53a1abf10bc328f5ad98a48604078 SHA512 8cae713129f7fb87d22b7cd5f5eb196a2f8990f83141bc9617f79b3e9c56e1873e1d74adaec79b4bacf0c6a7d721fb9ce5cd747fef355a55a1e518b94536d978
-DIST Babel-2.8.0.tar.gz 8444381 BLAKE2B ea3757182464770f47d3253e77bece7b64c84558e7a19fc55759198bfa55c6d8156d27e9de7b796b62eefd93e458c7e00b2014dd23e4ed7383f5bc9785d1a332 SHA512 f9687b36176c146a8ace073197111463d24fca343bb1dbee8b0e37a7f37b68b4cd77ffbe3bf14a20f8f64c701aa860e0b5e6076658a95dbee2556f0688d68d91
DIST Babel-2.8.1.tar.gz 8471453 BLAKE2B bc2e66a3c1c77e5b190cdb3f53d149268b6f49adde3040cbe6a3dd8eb98f6caffb3988232e76083e606186a87b9ee6b2b5352de89b7bc43d4f72905f1f594127 SHA512 ed39ad01b873d40d0bc611739761d412ff442b2df3d4c2363ec24501547da678cb752f640a02470c8513073a76c468c27fc16248820c779ef7adbe14d0f07199
DIST Babel-2.9.0.tar.gz 8682986 BLAKE2B 0e1e8fe647fdd27230ee9c97f0994772bd5877f262f9cd00eb450445c5780b278249f87d50f98c5ca3fa5eca287c6b4fc74c5e082c522c250d640912f0ebc581 SHA512 250d1a19741eb0d1bda9d6b862f2d4779b6c67f10b8e045f450a271a16587e30f26f35ccccfea8ca13bb519582d2ef83569fa4381d0590fb9b61bf3ebf67e5f6
-EBUILD Babel-2.8.0-r2.ebuild 931 BLAKE2B cc27c7f1f16a42da4e2f43682d94d45d6a48e64254e777b978ded1d1b73e2f047cf6918d8402fc255e681d3bb4afe208877e2f5fa49166af3ce42cb1c52fd4e6 SHA512 1d12e8f8523b20dfdaf5867277c2cf1ebbffb7c508a812391bf2551a8a846087139ed60393b3360d1090a479abb2f0b4948447c1ce423f2882519fe3822c22d5
-EBUILD Babel-2.8.1.ebuild 947 BLAKE2B a76a3a7c5354e9216f890460a28fe0db35976ac6d76fd1ece62dd79464fe04f317cf436dffbe6dfe45508cc8a8abcc8086d6124af9640e95ced202e2e290a2d1 SHA512 2cea5488b8a87d7967949de765817b70a013775b9053ba252ce6ee66e0d3643b45598bee19dd8bd0d6a26f31c18277a654971475cf11fd0ec97d3547a00f600b
+EBUILD Babel-2.8.1.ebuild 977 BLAKE2B da2189c23edb4ff4514ac122b7a011a090ba46a12814ef24a8767b75a49361a51dabdd4b2229d915a65f5b2438e09d809376f5edba67f689dd17aeb4aecfeaab SHA512 adeac488428e5d53d182635fe384dea49da15f155636314d2b0e812a6552fccdc8a72c1c7137ce7d704609cfe9d6cbb70fdbb33bfe641842396438a0db30f183
EBUILD Babel-2.9.0.ebuild 923 BLAKE2B e0513deaa1b26f367b104800479b919a63534b23072ff918a3822725050294249c6c9fee95f257fe95abaa7f9ffa95132069fea47279c276e7e72af9073c8b5c SHA512 28e1d946896fde2ad737a28cd36b0d576e57fe1fbfc0b3230928a939caa60382c196440a757bec269eeb7198ab6331aa571ce7c99c7e20ac6a81b261fdd7a934
MISC metadata.xml 839 BLAKE2B d9916ce88ce8436bb28d15300e78013e1c9e0f88f385a369c0ad6840f0fe81ad136052a3c257cef50a2fd86500bcde2b652ad0ed664f95d6affa4ccc8770445b SHA512 3688c1488c552b84c685d0aeb6251aea4f9d41be3db3aeb226291655107e1332df13445545b3742587e133de7468a40f22ca53fa67fd8d2e0db570069498654f
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index bdd050420df3..96c655729b85 100644
Binary files a/dev-python/Manifest.gz and b/dev-python/Manifest.gz differ
diff --git a/dev-python/PyQt5/Manifest b/dev-python/PyQt5/Manifest
index 634b94810d1c..7ed244b3b831 100644
--- a/dev-python/PyQt5/Manifest
+++ b/dev-python/PyQt5/Manifest
@@ -1,3 +1,5 @@
DIST PyQt5-5.15.1.tar.gz 3264559 BLAKE2B 20060297c52aa5d07ba28b50440bd3623b8648eef8502693f8175af9ba4edf9238b9be71c696ea2589556ad70e70e868dc9c286466af22867ab51d5c66e613db SHA512 a7378dd53337c58f5ba7e9f7510b57fe4affe578b68975ce1dd7ba5c2a1c77d08d51d11078ce782aab09509df934eb3e4d0588de87391f74ad99f9624644cc4e
+DIST PyQt5-5.15.2.tar.gz 3265445 BLAKE2B 7712d68aa54cf9e6836863d7aa645151254d79621e115ed314ba63c371d5e24577a0392311b31a73e45af45baa29eca1d7e9a03874beac1fbf043fa703af69f9 SHA512 6d48d2ed907b436131d46b0513d82e1069c76e873d395e4a6c0832ae3a20621b92d3abece046c5fcd14cb818d50ffb369153fca1ce9341f0db1b8c479b94e621
EBUILD PyQt5-5.15.1.ebuild 5645 BLAKE2B e4d0ea23235af95deb7532aaf613bbf2b23fbc032eb5fc26be89cda774774b552d7ed4a83329fb9b162eb9d1d6f9d4be7d7b00d67e0094a780c1a851e116180a SHA512 69dfc5e0d4a9c975a062a5deb20a7f48e18e56b42f137ff56544d3e6d610495a011d15a6eb231d9938892f4ebb15375b3a20452caed63d35ec5ed1a388fd62b3
+EBUILD PyQt5-5.15.2.ebuild 5649 BLAKE2B 9b1a083094162b8f06ba2ba4a412c95c21bd13fef1dbf4d8f5be2e73441c58e74c300c986c6999b100cd6aa7056c7e0cfbc62c580ec7d083ae2930ec3d54b9bc SHA512 2fdb6af98903a75a0374906d0fe0d817a7a2e3f9ff3aec91add72001143dd098ec0e3dca04e932952189768bb398296c06d66a5571ca82052ad52d936243a7b0
MISC metadata.xml 2354 BLAKE2B 765b65d4070c72689637e5f9cc2f5499ee4b8fa622ce75fc87a873e9b69079dc83474ce03a79b4c77ed6cf9c46881e0d1d629d518b6d14849b9ce5f72eafff04 SHA512 21444cee42058a0b134c27c67ab8219dcc96c5898de4112e8cd125a46e61ec7f421a2f58677991bc3bb2c330e55fe2382b561ead1a6623d549210e7ddf06b6ec
diff --git a/dev-python/PyQt5/PyQt5-5.15.2.ebuild b/dev-python/PyQt5/PyQt5-5.15.2.ebuild
new file mode 100644
index 000000000000..c98841322746
--- /dev/null
+++ b/dev-python/PyQt5/PyQt5-5.15.2.ebuild
@@ -0,0 +1,190 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+inherit multibuild python-r1 qmake-utils
+
+DESCRIPTION="Python bindings for the Qt framework"
+HOMEPAGE="https://www.riverbankcomputing.com/software/pyqt/intro"
+
+MY_P=${PN}-${PV/_pre/.dev}
+if [[ ${PV} == *_pre* ]]; then
+ SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.gz"
+else
+ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+
+# TODO: QtNfc, QtQuick3D, QtRemoteObjects, QtTextToSpeech
+IUSE="bluetooth dbus debug declarative designer examples gles2-only gui help location
+ multimedia network networkauth opengl positioning printsupport sensors serialport
+ sql +ssl svg testlib webchannel webkit websockets widgets x11extras xmlpatterns"
+
+# The requirements below were extracted from configure.py
+# and from the output of 'grep -r "%Import " "${S}"/sip'
+REQUIRED_USE="
+ ${PYTHON_REQUIRED_USE}
+ bluetooth? ( gui )
+ declarative? ( gui network )
+ designer? ( widgets )
+ help? ( gui widgets )
+ location? ( positioning )
+ multimedia? ( gui network )
+ networkauth? ( network )
+ opengl? ( gui widgets )
+ positioning? ( gui )
+ printsupport? ( gui widgets )
+ sensors? ( gui )
+ serialport? ( gui )
+ sql? ( widgets )
+ svg? ( gui widgets )
+ testlib? ( widgets )
+ webchannel? ( network )
+ webkit? ( gui network printsupport widgets )
+ websockets? ( network )
+ widgets? ( gui )
+ xmlpatterns? ( network )
+"
+
+# Minimal supported version of Qt.
+QT_PV="5.15:5"
+
+RDEPEND="${PYTHON_DEPS}
+ >=dev-python/PyQt5-sip-4.19.23:=[${PYTHON_USEDEP}]
+ >=dev-qt/qtcore-${QT_PV}
+ >=dev-qt/qtxml-${QT_PV}
+ bluetooth? ( >=dev-qt/qtbluetooth-${QT_PV} )
+ dbus? (
+ dev-python/dbus-python[${PYTHON_USEDEP}]
+ >=dev-qt/qtdbus-${QT_PV}
+ )
+ declarative? ( >=dev-qt/qtdeclarative-${QT_PV}[widgets?] )
+ designer? ( >=dev-qt/designer-${QT_PV} )
+ gui? ( >=dev-qt/qtgui-${QT_PV}[gles2-only=] )
+ help? ( >=dev-qt/qthelp-${QT_PV} )
+ location? ( >=dev-qt/qtlocation-${QT_PV} )
+ multimedia? ( >=dev-qt/qtmultimedia-${QT_PV}[widgets?] )
+ network? ( >=dev-qt/qtnetwork-${QT_PV}[ssl=] )
+ networkauth? ( >=dev-qt/qtnetworkauth-${QT_PV} )
+ opengl? ( >=dev-qt/qtopengl-${QT_PV} )
+ positioning? ( >=dev-qt/qtpositioning-${QT_PV} )
+ printsupport? ( >=dev-qt/qtprintsupport-${QT_PV} )
+ sensors? ( >=dev-qt/qtsensors-${QT_PV} )
+ serialport? ( >=dev-qt/qtserialport-${QT_PV} )
+ sql? ( >=dev-qt/qtsql-${QT_PV} )
+ svg? ( >=dev-qt/qtsvg-${QT_PV} )
+ testlib? ( >=dev-qt/qttest-${QT_PV} )
+ webchannel? ( >=dev-qt/qtwebchannel-${QT_PV} )
+ webkit? ( dev-qt/qtwebkit:5[printsupport] )
+ websockets? ( >=dev-qt/qtwebsockets-${QT_PV} )
+ widgets? ( >=dev-qt/qtwidgets-${QT_PV} )
+ x11extras? ( >=dev-qt/qtx11extras-${QT_PV} )
+ xmlpatterns? ( >=dev-qt/qtxmlpatterns-${QT_PV} )
+"
+DEPEND="${RDEPEND}
+ >=dev-python/sip-4.19.23[${PYTHON_USEDEP}]
+ dbus? ( virtual/pkgconfig )
+"
+
+S=${WORKDIR}/${MY_P}
+
+pyqt_use_enable() {
+ use "$1" || return
+
+ if [[ $# -eq 1 ]]; then
+ echo --enable=Qt$(tr 'a-z' 'A-Z' <<< ${1:0:1})${1:1}
+ else
+ shift
+ echo ${@/#/--enable=}
+ fi
+}
+
+src_configure() {
+ configuration() {
+ local myconf=(
+ "${PYTHON}"
+ "${S}"/configure.py
+ $(usex debug '--debug --qml-debug --trace' '')
+ --verbose
+ --confirm-license
+ --qmake="$(qt5_get_bindir)"/qmake
+ --bindir="${EPREFIX}/usr/bin"
+ --qsci-api
+ --enable=QtCore
+ --enable=QtXml
+ $(pyqt_use_enable bluetooth)
+ $(pyqt_use_enable dbus QtDBus)
+ $(usex dbus '' --no-python-dbus)
+ $(pyqt_use_enable declarative QtQml QtQuick $(usex widgets QtQuickWidgets ''))
+ $(usex declarative '' --no-qml-plugin)
+ $(pyqt_use_enable designer)
+ $(usex designer '' --no-designer-plugin)
+ $(usex gles2-only '--disable-feature=PyQt_Desktop_OpenGL' '')
+ $(pyqt_use_enable gui)
+ $(pyqt_use_enable gui $(use gles2-only && echo _QOpenGLFunctions_ES2 || echo _QOpenGLFunctions_{2_0,2_1,4_1_Core}))
+ $(pyqt_use_enable help)
+ $(pyqt_use_enable location)
+ $(pyqt_use_enable multimedia QtMultimedia $(usex widgets QtMultimediaWidgets ''))
+ $(pyqt_use_enable network)
+ $(pyqt_use_enable networkauth QtNetworkAuth)
+ $(pyqt_use_enable opengl QtOpenGL)
+ $(pyqt_use_enable positioning)
+ $(pyqt_use_enable printsupport QtPrintSupport)
+ $(pyqt_use_enable sensors)
+ $(pyqt_use_enable serialport QtSerialPort)
+ $(pyqt_use_enable sql)
+ $(usex ssl '' '--disable-feature=PyQt_SSL')
+ $(pyqt_use_enable svg)
+ $(pyqt_use_enable testlib QtTest)
+ $(pyqt_use_enable webchannel QtWebChannel)
+ $(pyqt_use_enable webkit QtWebKit QtWebKitWidgets)
+ $(pyqt_use_enable websockets QtWebSockets)
+ $(pyqt_use_enable widgets)
+ $(pyqt_use_enable x11extras QtX11Extras)
+ $(pyqt_use_enable xmlpatterns QtXmlPatterns)
+ )
+ echo "${myconf[@]}"
+ "${myconf[@]}" || die
+
+ # Run eqmake to respect toolchain and build flags
+ eqmake5 -recursive ${PN}.pro
+ }
+ python_foreach_impl run_in_build_dir configuration
+}
+
+src_compile() {
+ python_foreach_impl run_in_build_dir default
+}
+
+src_install() {
+ installation() {
+ local tmp_root=${D}/${PN}_tmp_root
+ # parallel install fails because mk_distinfo.py runs too early
+ emake -j1 INSTALL_ROOT="${tmp_root}" install
+
+ local bin_dir=${tmp_root}${EPREFIX}/usr/bin
+ local exe
+ for exe in pylupdate5 pyrcc5 pyuic5; do
+ python_doexe "${bin_dir}/${exe}"
+ rm "${bin_dir}/${exe}" || die
+ done
+
+ local uic_dir=${tmp_root}$(python_get_sitedir)/${PN}/uic
+ rm -r "${uic_dir}"/port_v2 || die
+
+ multibuild_merge_root "${tmp_root}" "${D}"
+ python_optimize
+ }
+ python_foreach_impl run_in_build_dir installation
+
+ einstalldocs
+
+ if use examples; then
+ dodoc -r examples
+ fi
+}
diff --git a/dev-python/PyQtWebEngine/Manifest b/dev-python/PyQtWebEngine/Manifest
index 31008acf1db3..5b7488c55bc7 100644
--- a/dev-python/PyQtWebEngine/Manifest
+++ b/dev-python/PyQtWebEngine/Manifest
@@ -1,3 +1,5 @@
DIST PyQtWebEngine-5.15.1.tar.gz 48520 BLAKE2B d4e4fcfb1066fcc274f4b3c8ccd7380435b9391586e3396fb5aa95ad7443c168ea9be3b85ec93e2dc28285aca18718afeb1487cb2c4ad5ed1a4f4d03010107ec SHA512 1efbea43bfd4a6de1c7aa2ab2ca124c4278b6b7ea0d6073c64a7ad83df676759d0747421cae5214017e3c61d8edddf9766f93660e13eee5d407a24fd11d8c21f
+DIST PyQtWebEngine-5.15.2.tar.gz 48608 BLAKE2B a03f77b0cde0d1031e8f1c4c6b5d13a342c28cf814ebaaf4a2cdb4608ce40cdd8163783932abc76cda583c0fed7191653b537598a9ab65f6509ef88008538e31 SHA512 7e6d95833b1a9e5bb5275eff01e1923419da35d13862fc4cbb231cbf950ed45e628bc7e161b0b6b66c718ee439a1a8e66dd754cee9adcdf69ab1b8ffab58901e
EBUILD PyQtWebEngine-5.15.1.ebuild 1665 BLAKE2B 09615c6e5e816dab50b4726d03efdcf4d62ad9dc2b550521e4120188edf9fa0939fcdf7eb9d04ba7015f114e23c49a4ccc8f64bf259bb9a3553930e667aa8775 SHA512 a643e883aeeff05cf7a42a2d5e506fdc62e755d7458bb7a82080bd9412f82ea7862cad03d556150167abfd2a9a72c3014a434763090a6caec80122da8f8ad5ed
+EBUILD PyQtWebEngine-5.15.2.ebuild 1668 BLAKE2B 18ba0ce56d43189b91d8d38109d8c55e43ebfad7bd037d48dbce6bbfa255b51b209fb9c519b9002e55ce25d6b0a88dc7a04f6ee9dea6a013d177ca777b2bd7ea SHA512 f1679dc7da76d09e86151674c35744388dd3bd0cfd38c279a0f04c932b03288a6be9fc8d937b22a051a8569ac7f351e1914e9683ef0481bd2d82f86d76ee784d
MISC metadata.xml 958 BLAKE2B 3d360762116d92a71aee391ba8bb5eaeb4f8347f22c0bad7c05211d82cf9bf9ce04e74baa1691c3a48c7be7c3906c180234a7b3c33b76e56c6b94982ad0045f5 SHA512 06ed8222b239484fdb7d1e7ab35b922b9eea81ec144bace571355302d1b01dbd6bd80d2d5c03d1ec7f7edad851050305d2e87232f5580e92276018c7c4e9753f
diff --git a/dev-python/PyQtWebEngine/PyQtWebEngine-5.15.2.ebuild b/dev-python/PyQtWebEngine/PyQtWebEngine-5.15.2.ebuild
new file mode 100644
index 000000000000..94183f43f9bb
--- /dev/null
+++ b/dev-python/PyQtWebEngine/PyQtWebEngine-5.15.2.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+inherit python-r1 qmake-utils
+
+DESCRIPTION="Python bindings for QtWebEngine"
+HOMEPAGE="https://www.riverbankcomputing.com/software/pyqtwebengine/intro"
+
+MY_P=${PN}-${PV/_pre/.dev}
+if [[ ${PV} == *_pre* ]]; then
+ SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.gz"
+else
+ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="debug"
+
+REQUIRED_USE="
+ ${PYTHON_REQUIRED_USE}
+"
+
+RDEPEND="
+ ${PYTHON_DEPS}
+ >=dev-python/PyQt5-5.14[gui,network,printsupport,ssl,webchannel,widgets,${PYTHON_USEDEP}]
+ >=dev-python/PyQt5-sip-4.19.22:=[${PYTHON_USEDEP}]
+ dev-qt/qtcore:5
+ dev-qt/qtwebengine:5[widgets]
+"
+DEPEND="${RDEPEND}
+ >=dev-python/sip-4.19.22[${PYTHON_USEDEP}]
+"
+
+S=${WORKDIR}/${MY_P}
+
+src_configure() {
+ configuration() {
+ local myconf=(
+ "${PYTHON}"
+ "${S}"/configure.py
+ --qmake="$(qt5_get_bindir)"/qmake
+ $(usex debug '--debug --trace' '')
+ --verbose
+ )
+ echo "${myconf[@]}"
+ "${myconf[@]}" || die
+
+ # Fix parallel install failure
+ sed -i -e '/INSTALLS += distinfo/i distinfo.depends = install_subtargets install_pep484_stubs install_api' \
+ ${PN}.pro || die
+
+ # Run eqmake to respect toolchain and build flags
+ eqmake5 -recursive ${PN}.pro
+ }
+ python_foreach_impl run_in_build_dir configuration
+}
+
+src_compile() {
+ python_foreach_impl run_in_build_dir default
+}
+
+src_install() {
+ installation() {
+ emake INSTALL_ROOT="${D}" install
+ python_optimize
+ }
+ python_foreach_impl run_in_build_dir installation
+
+ einstalldocs
+}
diff --git a/dev-python/arpeggio/Manifest b/dev-python/arpeggio/Manifest
index bb119f47cd73..9ea3e40e7b51 100644
--- a/dev-python/arpeggio/Manifest
+++ b/dev-python/arpeggio/Manifest
@@ -1,5 +1,3 @@
DIST Arpeggio-1.10.0.tar.gz 766416 BLAKE2B 75898c5be536998a12ec0efb8ca0729913e9ac7ac8481f614cb1bfd5332015bd2c22722cc6836511e1b77d933fe497538db1a00804e2cbf409af7cc153ba15c6 SHA512 368c478114ddedbf40c94b4e656945063df5661deacc9c75780ddca18198a9e3e504718fc6c9a1e84c11c5c8f2b454584d1cfc5a14ea2b783e97b8e317047023
-DIST arpeggio-1.9.2.tar.gz 761920 BLAKE2B ba8c8a5cb8965325c1c3be68a481e024b0ab703d5f60fd9ccb2589fe5efe2618fd24f2b9bc36823005897c83e233bc97372a0e3d2010cf2e2399b96aec58feb5 SHA512 fa1057caaa0b5d26937c6e5aed719f64b293d3332e3ce0277a586bd48ca136792a4811c292fd87f2e58148874e008a6f2f621630052c5dfaf0e0efe2e8039353
-EBUILD arpeggio-1.10.0.ebuild 728 BLAKE2B fef9aae528f38541ad0fd342932e1568f16d49278f09be86d5cacb8606aae5c4e36c5bbbaec4ca1f34fd51fff44a287fdff917e9aa3443ac819e5ff4e9402793 SHA512 85d78c149a939e05bbdde43845c5dc9aa29f6958b080ca7c0d9c83e52f675af42392d3dad59d7783794c5642217f4e9bad9d5af0c0a2d7e6ff177c3632f8b197
-EBUILD arpeggio-1.9.2.ebuild 974 BLAKE2B 8340254357d475a6914e5b245012598a08e0943f5ca6587b6882c7f4f0d1073bbb1d3cf91bd7ee1a5f577cde3157771fafb97ec8e99bb8fbfaff75bfe33fa902 SHA512 43128d92c47a4541cba32405a31d8bcae4fd4b283424af508f9a63a3f31fe5044f93b0a33c521b5e25c221107c0cde4acdd9a62fd11aab6b48b2f0121093f6d3
+EBUILD arpeggio-1.10.0.ebuild 726 BLAKE2B f164f957b1398c2b51bf65055aa4196c280ef61fdb7d5ad9408531918e5123bc94aad554da868c440192442cc0a010a89fe23046290847ad875c6f327a8a9b9f SHA512 7e8b1ee6c7b1e9c3caef957442c52874a1ca854ab5b7bf07dbd046e261b26455dba2d5f4b7a2ce8b9499eb1ea965a7f64e261e5aa1f2e4e0f3c0a6372054cc80
MISC metadata.xml 367 BLAKE2B da0bdb5ba0b94ed3181e6318742907c67a6d04b095011528cb5acf614a55d15ab107ba212dbc3868710976129e5d9790690cbfd0858b97456daad4dc1ce8df55 SHA512 67e3ca7fa1fb672313f0e86d852acb2fe19418605c661e54b9be464cce7d3ca4a57ca426e606095639f51a8d0d74c50344ba7b51d392035a633e1af752b64770
diff --git a/dev-python/arpeggio/arpeggio-1.10.0.ebuild b/dev-python/arpeggio/arpeggio-1.10.0.ebuild
index 13f0348512f8..f2f415a4f19b 100644
--- a/dev-python/arpeggio/arpeggio-1.10.0.ebuild
+++ b/dev-python/arpeggio/arpeggio-1.10.0.ebuild
@@ -13,7 +13,7 @@ S=${WORKDIR}/${P^}
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
RDEPEND=""
DEPEND="
diff --git a/dev-python/arpeggio/arpeggio-1.9.2.ebuild b/dev-python/arpeggio/arpeggio-1.9.2.ebuild
deleted file mode 100644
index 9cc5deeb5b0f..000000000000
--- a/dev-python/arpeggio/arpeggio-1.9.2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9} )
-DISTUTILS_USE_SETUPTOOLS=bdepend
-inherit distutils-r1
-
-MY_PN=Arpeggio
-MY_P=${MY_PN}-${PV}
-DESCRIPTION="Parser interpreter based on PEG grammars"
-HOMEPAGE="https://pypi.org/project/Arpeggio/ https://github.com/igordejanovic/Arpeggio"
-SRC_URI="https://github.com/igordejanovic/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=""
-DEPEND="
- test? (
- dev-python/pytest[${PYTHON_USEDEP}]
- dev-python/memory_profiler[${PYTHON_USEDEP}]
- )
-"
-S=${WORKDIR}/${MY_P}
-
-python_prepare_all() {
- distutils-r1_python_prepare_all
- sed -e 's:packages=find_packages(:\0exclude=["examples", "examples.*"]:' \
- -e "s:\\(setup_requires=\[\\)'pytest-runner'\\(\],\\):\\1\\2:" \
- -i setup.py || die
-}
-
-python_test() {
- pytest -vv || die "Testing failed"
-}
diff --git a/dev-python/attrs/Manifest b/dev-python/attrs/Manifest
index 49e76275ad70..60b6d6bc3efd 100644
--- a/dev-python/attrs/Manifest
+++ b/dev-python/attrs/Manifest
@@ -1,5 +1,3 @@
-DIST attrs-20.2.0.tar.gz 160604 BLAKE2B 1536366a943aa2d0517e3c0aa71230c378b20e731cbac78d1c5cc96f2500fb30203ee0939e25c80f8216bcc6dc7ed1fdfc2b23ab7f5d7c712fb05f5ba65739b1 SHA512 829030d8c1fe7bffbbb8d70fc56228f4c378d85a24c89d802e51f63a78abbfa24f46f5aa8b56cb7ba26ef0bf1fb272163873c45c994145de0be45b14c6fb29cd
DIST attrs-20.3.0.tar.gz 164523 BLAKE2B 66d2e038e485833f5033fbabe2ef9a6565e3f5f5e8530f2c70019e4f5bdfca51083ac6d0bbc9eb765f838070bc90e01db1c83ed6da113ced67300238e12b5f42 SHA512 640532c6b763fd96572e5d85e93c111bebc4c5e0ff9419fe92fb51280f03acb5f9f43339f57d30659e777d5578460675c60ec0a362f9ad433893e3624ce6a931
-EBUILD attrs-20.2.0-r1.ebuild 824 BLAKE2B 024e581795697e8095b830d8eb4eb7b8a68c2e9ff28e6f7397313886b26765c54a3c01c9b9d831e7252fb4f30fe7f97cc131ef4d45c7642666cc2b3fc1241cf9 SHA512 635e96242fe24eacea79ee7e04a0a3e7ac76a57f24e45846683ce8769a79bef8cea6db041507e86c3a5077c7abc4946d347fe0e16f02c83b958b2a68ba8e1907
-EBUILD attrs-20.3.0.ebuild 843 BLAKE2B 051a7049545266aee9dd05e5dbdfe80e91a95a65c3a3c979043109eebe29796e508dc48f6f8e1b5dbd8f4a8b3ab15580dd65f49b61cfb70a2731c719dc9b0d54 SHA512 f4d9e146977f34056262b90a5c92f1bacdae7f6ca11db434ddb7c7d44f6135b71c2b34e57a24321bc7427e2981910a7cc9395894d61588a536e5d89b32748f63
+EBUILD attrs-20.3.0.ebuild 834 BLAKE2B 273772a7fbd6193c5f34efbfcac9d1c470d1605fdd5ec8d4056009d92e6c87fd82eb388fbb52dda4681a72c08ecb2764231703c3a178465c4502c300541ebc68 SHA512 01cb0be99e5fa8c5669196d7949f4c63c5d31378f2ec24634c386d7a6638d576f15167542a8acc6df33d21ecceeaa794da105572c41298461bb6276b8dc74f76
MISC metadata.xml 520 BLAKE2B faeb38666d6eedb08951c10cc1affa171731fd5ccdc4ca482946aa9e94b887d493a43282c6fc48835af03badaf59af17f912a8d3d1481297dd5596c4784b4951 SHA512 a12b5bb882626a823475b64cd56ede72349b38ad19b70696a83558553a26499a85371e0c2996274b98b0e076e00fc2041dbb0a9af485780c54a3d9a36d7cdfe5
diff --git a/dev-python/attrs/attrs-20.2.0-r1.ebuild b/dev-python/attrs/attrs-20.2.0-r1.ebuild
deleted file mode 100644
index 51d40502f544..000000000000
--- a/dev-python/attrs/attrs-20.2.0-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Attributes without boilerplate"
-HOMEPAGE="
- https://github.com/python-attrs/attrs
- https://attrs.readthedocs.org/
- https://pypi.org/project/attrs/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND="
- dev-python/zope-interface[${PYTHON_USEDEP}]"
-BDEPEND="
- test? (
- $(python_gen_impl_dep sqlite)
- >=dev-python/hypothesis-3.6.0[${PYTHON_USEDEP}]
- >=dev-python/pytest-4.3.0[${PYTHON_USEDEP}]
- )"
-
-distutils_enable_tests pytest
diff --git a/dev-python/attrs/attrs-20.3.0.ebuild b/dev-python/attrs/attrs-20.3.0.ebuild
index 239b02ab9065..b854dd5cba6d 100644
--- a/dev-python/attrs/attrs-20.3.0.ebuild
+++ b/dev-python/attrs/attrs-20.3.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
dev-python/zope-interface[${PYTHON_USEDEP}]"
diff --git a/dev-python/autobahn/Manifest b/dev-python/autobahn/Manifest
index a8894c8ff34d..4bd8a1d7b469 100644
--- a/dev-python/autobahn/Manifest
+++ b/dev-python/autobahn/Manifest
@@ -1,9 +1,5 @@
-DIST autobahn-20.12.1.tar.gz 1269156 BLAKE2B ff763accde6a2929fd777364c926132b8317d80f137d67768bf192fb72f45597ac115824783f01debacc773dcc9a60325692ac420e55b6f67f4ebc2cdc6187ae SHA512 df7c7065e050efb5f315055c05aa9b4fcf8636e7208f17b583ed0823a071c6484adcf610308e83df3b5bbb91a4df19266e739abc8405e34483b1bf3d9f2c74c7
DIST autobahn-20.12.2.tar.gz 1269167 BLAKE2B f6ea51682c13690002796f2a45bd11fc2f8497eeee25a1786e942111f43f9dc1f7f806281e4dc37d1ed0aa302fc5c5e47a55d876e010580d7a08eb5ac7534ed0 SHA512 aa6d5e77ba6129931a07cad13f839d5c76267b8126a05ade4ed1c7183ce019faf6656105a853515b543e5ac34ab20d02821b29aa68eb51c385880ad3919d1dcc
-DIST autobahn-20.4.3.tar.gz 938992 BLAKE2B 259d18f4aa46f7eaeac75811c1c193f3046aca5c5e37627d9ac62eeaa3dc944d05a8d87a558e241bdef56c799be4d89f65d4c8ee7c1a2be20f892896227eb5f9 SHA512 c34f29951b8f9ff5161851cf3a7e964de136f6091b0231a8e78e7fe74cb085077be5078cee352b2c27412d9aa4303de1eb85aa1890b4fb583575638a9c47c6fb
DIST autobahn-20.7.1.tar.gz 1260579 BLAKE2B 925d148836348c068d179d4871267bf79c8c42d27cacc6be09cca11396dbd213a5b86344142df886d4ff69d1214a86b49900ca3552bcdb640377cb0d6af7d0f0 SHA512 e2c241194da90ada86a2804683cb063320f75a69b76ddc016349c11614e7f298619c2eeba4fcccb8f8d65d84375681fb339d9f92f94f45f1015f4f12fa0c39b0
-EBUILD autobahn-20.12.1.ebuild 3040 BLAKE2B 18f19f325b14341bdb6d272012de8e6582759a24811a74aea84b2ed36c865947b20fe1640c75438d7a3ddde965c35b72d5af3ac66972405e6e228a88ff03c96c SHA512 de18ea1f72d6505a7394ba167c818811eff99c756fee3898cc5400a6a605a56c040c2149edd16dddf3e69d5d549a19a9799afb8c399ed4250e65ecac59dd350a
EBUILD autobahn-20.12.2.ebuild 3040 BLAKE2B 18f19f325b14341bdb6d272012de8e6582759a24811a74aea84b2ed36c865947b20fe1640c75438d7a3ddde965c35b72d5af3ac66972405e6e228a88ff03c96c SHA512 de18ea1f72d6505a7394ba167c818811eff99c756fee3898cc5400a6a605a56c040c2149edd16dddf3e69d5d549a19a9799afb8c399ed4250e65ecac59dd350a
-EBUILD autobahn-20.4.3.ebuild 2451 BLAKE2B 3d5427b1164f94073c6da8724f11b9af14135f07bca9d2659c1d865fa646288cd50e980d51543cba6a53f039ebe12b17d30a692e96e90f324b135b7ae6502a33 SHA512 ea12ce096373c081376e66c26552e9f5a67822ed926a91e0726b9dba980cecdc9b8052aa2724fbe2a43d50e04cc0346d96d34b2c88f67ad157bd49f312bd54da
-EBUILD autobahn-20.7.1.ebuild 2998 BLAKE2B 4a9e8d1708a4065466fca23dbbe1d833dfcc3760e4db3153d68124b8923a234e22d84ddc980133aa44dab30f579e9bc89626fed6b4856afaeb2593e128ecabcd SHA512 568b312ebc0186914f203681256e221a9fe4b7d6752bb2cdb91c609a11e5453d4c812afecde160e917701984f545ad91b4378ac61252b0eb89c46f9f8c6edcb2
+EBUILD autobahn-20.7.1.ebuild 2997 BLAKE2B b16e929b6caed55f547b6221908ff8a937a0fa582a8fd16cee1736efe53de4b82025a116b5a0a66125bf4ba6792db00cb05458d8b6d9e8ead42c123aa984d072 SHA512 742fb89e3df365a06efa09462ba3c1552f1bfe15389d8f7bad08aaebb809ebbbb5f07fb5ec99f10f4911c3e662f05c6b4e14880920f369fdd0da23c10fddd14d
MISC metadata.xml 665 BLAKE2B 11ce0fe43744ff03c46a4e4b6b06733807a4674956dc885a3185bd353f0617841a6f6d1afbbc02c02b7e6718b5c0ccce69907920322e2966c8f7e9d1f63d6485 SHA512 9e154ce907c9868b86a70c4c2f6173e4fa8cc6e1f63380978d4a9c706f00316a9eda488fc39c32c5ea70f31a1a12187629665b590e79f64906ab982bf1401fbb
diff --git a/dev-python/autobahn/autobahn-20.12.1.ebuild b/dev-python/autobahn/autobahn-20.12.1.ebuild
deleted file mode 100644
index 3633e2beeaa0..000000000000
--- a/dev-python/autobahn/autobahn-20.12.1.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-MY_P=${PN}-$(ver_rs 3 -)
-
-DESCRIPTION="WebSocket and WAMP for Twisted and Asyncio"
-HOMEPAGE="https://pypi.org/project/autobahn/
- https://crossbar.io/autobahn/
- https://github.com/crossbario/autobahn-python"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="crypt scram test xbr"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- >=dev-python/cbor-1.0.0[${PYTHON_USEDEP}]
- >=dev-python/cbor2-5.1.0[${PYTHON_USEDEP}]
- >=dev-python/cryptography-2.9.2[${PYTHON_USEDEP}]
- >=dev-python/flatbuffers-1.10.0[${PYTHON_USEDEP}]
- >=dev-python/lz4-0.7.0[${PYTHON_USEDEP}]
- >=dev-python/msgpack-0.6.1[${PYTHON_USEDEP}]
- >=dev-python/py-ubjson-0.8.4[${PYTHON_USEDEP}]
- >=dev-python/snappy-0.5[${PYTHON_USEDEP}]
- >=dev-python/twisted-20.3.0[${PYTHON_USEDEP}]
- >=dev-python/txaio-20.4.1[${PYTHON_USEDEP}]
- >=dev-python/ujson-2.0.0[${PYTHON_USEDEP}]
- >=dev-python/wsaccel-0.6.2[${PYTHON_USEDEP}]
- >=dev-python/zope-interface-3.6[${PYTHON_USEDEP}]
- crypt? (
- >=dev-python/pyopenssl-16.2.0[${PYTHON_USEDEP}]
- >=dev-python/pynacl-1.0.1[${PYTHON_USEDEP}]
- >=dev-python/pytrie-0.2[${PYTHON_USEDEP}]
- >=dev-python/pyqrcode-1.1.0[${PYTHON_USEDEP}]
- >=dev-python/service_identity-18.1.0[${PYTHON_USEDEP}]
- )
- scram? (
- dev-python/cffi[${PYTHON_USEDEP}]
- dev-python/argon2-cffi[${PYTHON_USEDEP}]
- dev-python/passlib[${PYTHON_USEDEP}]
- )
- "
-BDEPEND="
- test? (
- dev-python/mock[${PYTHON_USEDEP}]
- dev-python/pytest[${PYTHON_USEDEP}]
- dev-python/pytest-asyncio[${PYTHON_USEDEP}]
- >=dev-python/pynacl-1.0.1[${PYTHON_USEDEP}]
- >=dev-python/pytrie-0.2[${PYTHON_USEDEP}]
- >=dev-python/pyqrcode-1.1.0[${PYTHON_USEDEP}]
- )"
-
-python_prepare_all() {
- if use xbr ; then
- eerror "***************"
- eerror "Required xbr dependencies are incomplete in Gentoo."
- eerror "So this functionality will not yet work"
- eerror "Please file a bug if this feature is needed"
- eerror "***************"
- else
- # remove xbr components
- export AUTOBAHN_STRIP_XBR="True"
- fi
- distutils-r1_python_prepare_all
-}
-
-python_test() {
- echo "Testing all, cryptosign using twisted"
- export USE_TWISTED=true
- cd "${BUILD_DIR}"/lib || die
- "${EPYTHON}" -m twisted.trial autobahn || die
- unset USE_TWISTED
- echo "RE-testing cryptosign and component_aio using asyncio"
- export USE_ASYNCIO=true
- py.test -v autobahn/wamp/test/test_cryptosign.py || die
- py.test -v autobahn/wamp/test/test_component_aio.py || die
- unset USE_ASYNCIO
- rm -r .pytest_cache || die
-}
-
-python_install_all() {
- distutils-r1_python_install_all
-
- # delete the dropin.cache so we don't have collisions if it exists
- rm "${D}"/usr/lib*/python*/site-packages/twisted/plugins//dropin.cache > /dev/null
-}
-
-pkg_postinst() {
- python_foreach_impl twisted-regen-cache || die
-}
-
-pkg_postrm() {
- python_foreach_impl twisted-regen-cache || die
-}
diff --git a/dev-python/autobahn/autobahn-20.4.3.ebuild b/dev-python/autobahn/autobahn-20.4.3.ebuild
deleted file mode 100644
index 61cfc0c4b7cd..000000000000
--- a/dev-python/autobahn/autobahn-20.4.3.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-MY_P=${PN}-$(ver_rs 3 -)
-
-DESCRIPTION="WebSocket and WAMP for Twisted and Asyncio"
-HOMEPAGE="https://pypi.org/project/autobahn/
- https://crossbar.io/autobahn/
- https://github.com/crossbario/autobahn-python"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="amd64 arm arm64 x86"
-IUSE="crypt test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- >=dev-python/cbor-1.0.0[${PYTHON_USEDEP}]
- >=dev-python/cbor2-5.1.0[${PYTHON_USEDEP}]
- >=dev-python/flatbuffers-1.10.0[${PYTHON_USEDEP}]
- >=dev-python/lz4-0.7.0[${PYTHON_USEDEP}]
- >=dev-python/msgpack-0.6.1[${PYTHON_USEDEP}]
- >=dev-python/py-ubjson-0.8.4[${PYTHON_USEDEP}]
- >=dev-python/snappy-0.5[${PYTHON_USEDEP}]
- >=dev-python/twisted-20.3.0[${PYTHON_USEDEP}]
- >=dev-python/txaio-20.3.1[${PYTHON_USEDEP}]
- >=dev-python/ujson-2.0.0[${PYTHON_USEDEP}]
- >=dev-python/wsaccel-0.6.2[${PYTHON_USEDEP}]
- >=dev-python/zope-interface-3.6[${PYTHON_USEDEP}]
- crypt? (
- >=dev-python/pyopenssl-16.2.0[${PYTHON_USEDEP}]
- >=dev-python/pynacl-1.0.1[${PYTHON_USEDEP}]
- >=dev-python/pytrie-0.2[${PYTHON_USEDEP}]
- >=dev-python/pyqrcode-1.1.0[${PYTHON_USEDEP}]
- >=dev-python/service_identity-18.1.0[${PYTHON_USEDEP}]
- )
- "
-DEPEND="${RDEPEND}
- test? (
- dev-python/mock[${PYTHON_USEDEP}]
- dev-python/pytest[${PYTHON_USEDEP}]
- dev-python/pytest-asyncio[${PYTHON_USEDEP}]
- >=dev-python/pynacl-1.0.1[${PYTHON_USEDEP}]
- >=dev-python/pytrie-0.2[${PYTHON_USEDEP}]
- >=dev-python/pyqrcode-1.1.0[${PYTHON_USEDEP}]
- )"
-
-S="${WORKDIR}"/${MY_P}
-
-python_test() {
- echo "Testing all, cryptosign using twisted"
- export USE_TWISTED=true
- cd "${BUILD_DIR}"/lib || die
- "${EPYTHON}" -m twisted.trial autobahn || die
- unset USE_TWISTED
- echo "RE-testing cryptosign and component_aio using asyncio"
- export USE_ASYNCIO=true
- py.test -v autobahn/wamp/test/test_cryptosign.py || die
- py.test -v autobahn/wamp/test/test_component_aio.py || die
- unset USE_ASYNCIO
- rm -r .pytest_cache || die
-}
-
-python_install_all() {
- distutils-r1_python_install_all
-
- # delete the dropin.cache so we don't have collisions if it exists
- rm "${D}"/usr/lib*/python*/site-packages/twisted/plugins//dropin.cache > /dev/null
-}
-
-pkg_postinst() {
- python_foreach_impl twisted-regen-cache || die
-}
-
-pkg_postrm() {
- python_foreach_impl twisted-regen-cache || die
-}
diff --git a/dev-python/autobahn/autobahn-20.7.1.ebuild b/dev-python/autobahn/autobahn-20.7.1.ebuild
index cf474b175441..67bd8a9ca1ee 100644
--- a/dev-python/autobahn/autobahn-20.7.1.ebuild
+++ b/dev-python/autobahn/autobahn-20.7.1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
SLOT="0"
LICENSE="MIT"
-KEYWORDS="~amd64 arm arm64 x86"
+KEYWORDS="amd64 arm arm64 x86"
IUSE="crypt scram test xbr"
RESTRICT="!test? ( test )"
diff --git a/dev-python/backports-csv/Manifest b/dev-python/backports-csv/Manifest
deleted file mode 100644
index 9e00be6d26e9..000000000000
--- a/dev-python/backports-csv/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST backports.csv-1.0.7.tar.gz 20836 BLAKE2B c9360890f4ace39564072afa6ee32d5ee5682f1703fbe87eea8b4a04c5575ab5bd63a813f0a86d3c5945429fb9e56693db38a80dec098e4ed7701684f1006570 SHA512 5b82b79ea865381a738f1d77a472d97118f853290fb4fd787537a8dcc7247b33cf8cf507519ad88d55419efa97f86ba9ef3f003b067b1f9cff87e08c2395969b
-EBUILD backports-csv-1.0.7.ebuild 825 BLAKE2B c156be95cbf535dcddcbfd9bd4e9454c39dcfee3d18c2400e189ffdfd7d490822537a4d2c9555ac3111d51a1025f41b593f18f10ec5e1c8dc0b6cc52206db536 SHA512 6311f959c8b74cee1fd0d6d6a8d86468a778b4cb20572a8738dba3a2b59f0da4cb04f253ea0528dbe9737a87de4f69aefad2c70725b39a0be67446624605cee4
-MISC metadata.xml 482 BLAKE2B fab9cf82120cae287eda87ebacd96e10a0ea271df200cffd224986f04d632f2cfe9ee82fd96dfa404410b8b930686a150ceafda98206b2d638b80ce26cc3c877 SHA512 3973cdc0242a097b7860ed221806a32bbe016a7e554745faec02394f5838f01ed2436569420b30b0410ba156ec0b3788397657aee1465beb983b4faeb1570cef
diff --git a/dev-python/backports-csv/backports-csv-1.0.7.ebuild b/dev-python/backports-csv/backports-csv-1.0.7.ebuild
deleted file mode 100644
index d9cce4776ba6..000000000000
--- a/dev-python/backports-csv/backports-csv-1.0.7.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{3_6,3_7} )
-
-inherit distutils-r1
-
-MY_PN=${PN/-/.}
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Backport of Python 3's 'csv' module"
-HOMEPAGE="https://github.com/ryanhiebert/backports.csv https://pypi.org/project/backports.csv/"
-SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="PSF-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/backports[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
- test? ( ${RDEPEND} )"
-
-S=${WORKDIR}/${MY_P}
-
-python_test() {
- "${EPYTHON}" tests.py -v || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
- distutils-r1_python_install_all
- find "${ED}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/backports-csv/metadata.xml b/dev-python/backports-csv/metadata.xml
deleted file mode 100644
index 51ed615faef8..000000000000
--- a/dev-python/backports-csv/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-
- grknight@gentoo.org
- Brian Evans
-
-
- python@gentoo.org
-
-
- ryanhiebert/backports.csv
- backports.csv
-
-
diff --git a/dev-python/backports-os/Manifest b/dev-python/backports-os/Manifest
deleted file mode 100644
index 3ef7847a6bcf..000000000000
--- a/dev-python/backports-os/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST backports-os-0.1.1.tar.gz 11359 BLAKE2B 8c1f9ba4d62d9b6b625d31c902feb7532919a0a42064133ef07756a3806a6423a479f5b3c4c9824ebb421a9e1901d8932aa024ced7dd7700119236c186d11137 SHA512 d17c5f6146401fa96c02f2d848d515a5d1dd587ee2199b5e45c177e1853e21e7e7c205a4d89322c5aada71e3a7b34bc7f9afe8183625f76e4ba26aedf2150268
-EBUILD backports-os-0.1.1.ebuild 1007 BLAKE2B 89b47e74cb3ef147a3aae4aa1bde24a3d3fcffbf185f942d82e85f85c22aa7a61904434289da6d97c4ff2696e378f4735c0e72eb74bc56786998d535b20060d7 SHA512 2890951152f6592f9e700c94d95f5cd75875701ee98efdd2d9db648062eca237e857f2c8c9edf2029c87daca275e685bc802dffa30b9612a07ab43bef0fa4f03
-MISC metadata.xml 318 BLAKE2B 37d5ccfc6c2e4b3ed73ea0ac1fc227f8b5d1a6ebe28f4dd6a43b3bfa0399ac1b698e867617c2fe1ac3db4972e1a43dd8aa44c10e8a1b4ee367fcddfa8d523bdf SHA512 316c8f478d06ae9f7c9e7509ec4f9a5d8aa57e409cebd83e8e21dd6ff90ca2f8b2e2f22250ee6c4be0a89374459e9788edf6f0f6ec44e90ec5ecf34d6f3fb12d
diff --git a/dev-python/backports-os/backports-os-0.1.1.ebuild b/dev-python/backports-os/backports-os-0.1.1.ebuild
deleted file mode 100644
index b7480cb7421c..000000000000
--- a/dev-python/backports-os/backports-os-0.1.1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-inherit distutils-r1
-
-DESCRIPTION="Backport of new features in Python's os module"
-HOMEPAGE="https://github.com/PiDelport/backports.os"
-SRC_URI="https://github.com/PiDelport/backports.os/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="PYTHON"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}
- dev-python/backports[${PYTHON_USEDEP}]
- dev-python/future[${PYTHON_USEDEP}]
- dev-python/setuptools_scm[${PYTHON_USEDEP}]
-"
-
-S="${WORKDIR}/${P/-/.}"
-
-src_prepare() {
- export SETUPTOOLS_SCM_PRETEND_VERSION="${PV}"
- distutils-r1_src_prepare
-}
-
-python_test() {
- esetup.py test
-}
-
-python_install() {
- distutils-r1_python_install
- # main namespace provided by dev-python/backports
- rm "${D}/$(python_get_sitedir)"/backports/__init__.py* || die
- rm -rf "${D}/$(python_get_sitedir)"/backports/__pycache__ || die
-}
diff --git a/dev-python/backports-os/metadata.xml b/dev-python/backports-os/metadata.xml
deleted file mode 100644
index 5f0a9236cf18..000000000000
--- a/dev-python/backports-os/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
- pacho@gentoo.org
- Pacho Ramos
-
-
- backports.os
-
-
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index e9d5b3c4cd80..202c54178fdb 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -11,6 +11,8 @@ DIST boto3-1.16.28.tar.gz 340709 BLAKE2B 3c5520531efbb5e20f679f28f4c60964a7be38a
DIST boto3-1.16.29.tar.gz 340743 BLAKE2B 1ef74d98aecf8dfd46bc340984d65e5dc2a70f320149b6bab18588a8371d0da6c93102da96f12950d0730c871fb6f13c7441f7ca148f974cb8678bd01b3af24a SHA512 59f8dba245c7525e4ddeec121d85919310e2bd6cf90419c19612434beff66bab4cca22968347512b0f9f2563ff3ee4d85e2d01bf10ce175c3a12a9a09c2e09a6
DIST boto3-1.16.30.tar.gz 340801 BLAKE2B fcf87b43d2c18ecf1e9d7f0c8c423143e44777a6249a9893d0ebb4016703a9d87a157ed71fca98c8bd73419e6dd2bd2621d42406220e67e6dd462e1088837334 SHA512 66d3e4ae6296b1fbd31187228246c99e472ccfba756d6ca304eca134271d43dd80d1bc35af1fb63336a7c63f2341212329dde307cbbb2dce25e2aa0705c6a436
DIST boto3-1.16.36.tar.gz 341458 BLAKE2B 7e4cf667cd59caa8433226eb6914412370bfa4c002f6f5d992fe49c93528d59d5740de6c8782af71d94461ea704a36d8ed46ccadfbf83982504ab507aab9b058 SHA512 06d9c6e721d1ab529e6a598b14ba6f740bec32a8165582853149b9aa294f0a272d0da4222f0dc7ef83055d91b4b0a0176e65bb34784990aca43e44db43650a2d
+DIST boto3-1.16.37.tar.gz 341684 BLAKE2B 4c9e7389ae4620edbb9cee2accfe6e7b520998b0a1110444d137387a098ed027a281e69a9bf6b2d3383a51b60b6dac16695b867ee27f44a9180459dd8a4b55b4 SHA512 1105b00d6aed4ebd36b77b21c6a3370dd1f34669df2621cd13dd776788d7fdd469086fd6956920632bf33a5291b14514518046983afd95441d54b35dc68347c2
+DIST boto3-1.16.38.tar.gz 341739 BLAKE2B 75cad4c53ae951b8f913e533dc73f6b5e0bfebe416cb28b7a7700b848a39f0e46e225a5d9c926a3343412d0ea90405c2f22ee6e2ba996c42fab3c62bc77cf5e6 SHA512 9f9edd5a9b3b9695c453e86d29b33271134d297772b0d1e6bc440bb6a87918144c4fee16a629d67be174b756392fa7417374e12dc866d19da24174ebbf31e368
DIST boto3-1.16.9.tar.gz 337905 BLAKE2B ed01e28fd7e62e5e5028307c93f92004bfbecffa77bc2ba1d6574b92ec2c515d910eb5107ac5ee03e0aca909f97f379aa65b5f839c8067634fa69266c58de33f SHA512 7343b8432788ef981819f91fe2ba27c4ec3947d01ff55914f7c89607250ecf60db2da8d25c8a2c7001ef546a9abed4cb744c5937ca09497aa1a983049648bd5e
EBUILD boto3-1.15.18.ebuild 1353 BLAKE2B acf7d5909ffe2c1b58d3c2438b8ce995f98e092b2a76977674ad1c0491b4e2093ea53d8a1cd45b225e3577ed28847b60319a1a682d1af74c71acde7a822c4da2 SHA512 fc2ac14ce0c1ce9e7ccac46bdc9fde2e84687a7c634a784cc0ac7e99556b84f4ef3d2d27e546c445b687b93dcc293b63a5e3716ae645b01a60d8550fda591c4c
EBUILD boto3-1.16.16.ebuild 1355 BLAKE2B b77544d9428e4a8306032b23d79f453bfd59e44a61fcc664506d8e3b8977478bebda0d6b7df403c5e2b00473f0b14bb8eff7ef2bd454597c7d5550a6c37e972e SHA512 e863b24a58b8a33b678c3bd7b9f26ae9fa924f9f9cbd6ae7e923f1f764c4c83852c6e15084e0614f6141ad4ba00596208c41e543b40cffa1eec9029b7ae09ed2
@@ -25,6 +27,8 @@ EBUILD boto3-1.16.28.ebuild 1355 BLAKE2B b77544d9428e4a8306032b23d79f453bfd59e44
EBUILD boto3-1.16.29.ebuild 1355 BLAKE2B b77544d9428e4a8306032b23d79f453bfd59e44a61fcc664506d8e3b8977478bebda0d6b7df403c5e2b00473f0b14bb8eff7ef2bd454597c7d5550a6c37e972e SHA512 e863b24a58b8a33b678c3bd7b9f26ae9fa924f9f9cbd6ae7e923f1f764c4c83852c6e15084e0614f6141ad4ba00596208c41e543b40cffa1eec9029b7ae09ed2
EBUILD boto3-1.16.30.ebuild 1355 BLAKE2B b77544d9428e4a8306032b23d79f453bfd59e44a61fcc664506d8e3b8977478bebda0d6b7df403c5e2b00473f0b14bb8eff7ef2bd454597c7d5550a6c37e972e SHA512 e863b24a58b8a33b678c3bd7b9f26ae9fa924f9f9cbd6ae7e923f1f764c4c83852c6e15084e0614f6141ad4ba00596208c41e543b40cffa1eec9029b7ae09ed2
EBUILD boto3-1.16.36.ebuild 1355 BLAKE2B b77544d9428e4a8306032b23d79f453bfd59e44a61fcc664506d8e3b8977478bebda0d6b7df403c5e2b00473f0b14bb8eff7ef2bd454597c7d5550a6c37e972e SHA512 e863b24a58b8a33b678c3bd7b9f26ae9fa924f9f9cbd6ae7e923f1f764c4c83852c6e15084e0614f6141ad4ba00596208c41e543b40cffa1eec9029b7ae09ed2
+EBUILD boto3-1.16.37.ebuild 1355 BLAKE2B b77544d9428e4a8306032b23d79f453bfd59e44a61fcc664506d8e3b8977478bebda0d6b7df403c5e2b00473f0b14bb8eff7ef2bd454597c7d5550a6c37e972e SHA512 e863b24a58b8a33b678c3bd7b9f26ae9fa924f9f9cbd6ae7e923f1f764c4c83852c6e15084e0614f6141ad4ba00596208c41e543b40cffa1eec9029b7ae09ed2
+EBUILD boto3-1.16.38.ebuild 1355 BLAKE2B b77544d9428e4a8306032b23d79f453bfd59e44a61fcc664506d8e3b8977478bebda0d6b7df403c5e2b00473f0b14bb8eff7ef2bd454597c7d5550a6c37e972e SHA512 e863b24a58b8a33b678c3bd7b9f26ae9fa924f9f9cbd6ae7e923f1f764c4c83852c6e15084e0614f6141ad4ba00596208c41e543b40cffa1eec9029b7ae09ed2
EBUILD boto3-1.16.9.ebuild 1353 BLAKE2B acf7d5909ffe2c1b58d3c2438b8ce995f98e092b2a76977674ad1c0491b4e2093ea53d8a1cd45b225e3577ed28847b60319a1a682d1af74c71acde7a822c4da2 SHA512 fc2ac14ce0c1ce9e7ccac46bdc9fde2e84687a7c634a784cc0ac7e99556b84f4ef3d2d27e546c445b687b93dcc293b63a5e3716ae645b01a60d8550fda591c4c
EBUILD boto3-9999.ebuild 1350 BLAKE2B 32d6cf48455240fb127d359f94ab09e45ec78655fbd63a5a1f29cd5a2b3de2941599c7d7068abc186b6e25baf13456b5e52958879871a5a8fc338b87e087fceb SHA512 58d3f3b2a1c04252e9c7527ccb094ec7ca41c9191de1aab85b4f6b2c6babe0c95d43f189031d2c8d1da2b35689d3ece1c27cdced6ecdec596a286893e05a5f55
MISC metadata.xml 711 BLAKE2B da283ea39f4540ad2445b1b88a12509a384e2f2a2ce0ffbc3845a475015c108de69b9e9868a0e43c0fb8c8b71a6ce498ece9676b0f623ed41b89efd92790be80 SHA512 80202cdc324464906b9ae7eae889d7d00c7c773aa5c49d22d8faab7deb621bbfe31cd4e66b289eadc7065e091b8615b284760736d915aa16ee15cf1c7f9e6b5d
diff --git a/dev-python/boto3/boto3-1.16.37.ebuild b/dev-python/boto3/boto3-1.16.37.ebuild
new file mode 100644
index 000000000000..ccc99e1c2415
--- /dev/null
+++ b/dev-python/boto3/boto3-1.16.37.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6..9} )
+DISTUTILS_USE_SETUPTOOLS=bdepend
+inherit distutils-r1
+
+DESCRIPTION="The AWS SDK for Python"
+HOMEPAGE="https://github.com/boto/boto3"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+ EGIT_REPO_URI="https://github.com/boto/boto3"
+ inherit git-r3
+ BOTOCORE_PV=${PV}
+else
+ SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+ # botocore is x.(y+3).z
+ BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
+fi
+
+RDEPEND="
+ >=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+ >=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+ >=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+ test? (
+ dev-python/mock[${PYTHON_USEDEP}]
+ )
+"
+
+distutils_enable_sphinx docs/source \
+ 'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+python_prepare_all() {
+ # don't lock versions to narrow ranges
+ sed -e '/botocore/ d' \
+ -e '/jmespath/ d' \
+ -e '/s3transfer/ d' \
+ -i setup.py || die
+
+ # prevent an infinite loop
+ rm tests/functional/docs/test_smoke.py || die
+
+ distutils-r1_python_prepare_all
+}
+
+python_test() {
+ nosetests -v tests/unit/ tests/functional/ || die "test failed under ${EPYTHON}"
+}
diff --git a/dev-python/boto3/boto3-1.16.38.ebuild b/dev-python/boto3/boto3-1.16.38.ebuild
new file mode 100644
index 000000000000..ccc99e1c2415
--- /dev/null
+++ b/dev-python/boto3/boto3-1.16.38.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6..9} )
+DISTUTILS_USE_SETUPTOOLS=bdepend
+inherit distutils-r1
+
+DESCRIPTION="The AWS SDK for Python"
+HOMEPAGE="https://github.com/boto/boto3"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+ EGIT_REPO_URI="https://github.com/boto/boto3"
+ inherit git-r3
+ BOTOCORE_PV=${PV}
+else
+ SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+ # botocore is x.(y+3).z
+ BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
+fi
+
+RDEPEND="
+ >=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+ >=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+ >=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+ test? (
+ dev-python/mock[${PYTHON_USEDEP}]
+ )
+"
+
+distutils_enable_sphinx docs/source \
+ 'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+python_prepare_all() {
+ # don't lock versions to narrow ranges
+ sed -e '/botocore/ d' \
+ -e '/jmespath/ d' \
+ -e '/s3transfer/ d' \
+ -i setup.py || die
+
+ # prevent an infinite loop
+ rm tests/functional/docs/test_smoke.py || die
+
+ distutils-r1_python_prepare_all
+}
+
+python_test() {
+ nosetests -v tests/unit/ tests/functional/ || die "test failed under ${EPYTHON}"
+}
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index e171ea3a87d2..ec7fe6cb213f 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -13,6 +13,8 @@ DIST botocore-1.19.28.tar.gz 7208608 BLAKE2B eab5731c530747421186c3e24cc0cb0f5b1
DIST botocore-1.19.29.tar.gz 7219708 BLAKE2B c5468be09300edf1acfb82780ad026ad78537b641b9f8f9384c41397e293a51559259c64925dac2852b888a28b49c23b7802b2c3adaca097424029fe9717044c SHA512 674f76a443541ff3665dbb1834ac69f8776e497526001db9bd229f22ea2137452c3bf954d8a6b74a732bd9e7212545cae19c9058357a38c357ed09d89c9c1cc5
DIST botocore-1.19.30.tar.gz 7224700 BLAKE2B 50712be7e6e4a8a22607d567a8d227bbc6d9a7156c245a9faa5adf0e94364d5e5738dd558534e072d071e88315fd79555454fd5f36dfb5d309effca6a39f2247 SHA512 8d9a0becad072ac01e04c1709e8851344bbcd35ecb6c269cace7c229e3b2e48b8fd91ca31be96c67831030a75a63027e8700772601a65eb529bcfd8a58434b6c
DIST botocore-1.19.36.tar.gz 7291325 BLAKE2B d1f79298a0f47d704418cac8390a5d500b1f300fc9bdbc0b215a3630adb70c29a951c6dff2a6ebfde42872cbc3af4c442d09fa0233b2c957521e6a5e05816c60 SHA512 420ad7c59496b2b74ba6ecde8dc40ac3e47c5676335f7471448fcdde5b70bda3bd7516963788d8a7a940aaa9cf488b6529e6fbd2842806f58520cd8e2dc15a60
+DIST botocore-1.19.37.tar.gz 7335789 BLAKE2B 3df00ad1f0d34f8f8408741b503fafdf9bdaacd9f5b0c52ffbc0b3172e7b0d01e741a076430268c55c39f1fe050a9b8bcc2d183eb54830886c7f3f050a22c408 SHA512 53ff17dcba3e72910709de7fe4504a04a507a708c2674039cfb682276ea7f8f46d3afeadbb41103d02141183d6216aab5964b0df98033cd12946ed1c83373aaf
+DIST botocore-1.19.38.tar.gz 7358201 BLAKE2B 16dee2bd0d27996fd761b19918c36de0475c827cb27d0c1505e438436872337f0a5b0ddceb3c4ffb3b5c15592a2aa328f8eec94e2e6ab55aa705299ea847c465 SHA512 51a6c7a0ab950c4a7f0d7859d90c39f30f4be2789b55f520f5318a00878c62a2f5eaa9741e53953d3226a23137415fc4318ca09d37d690e71b8f2078b2662cfe
DIST botocore-1.19.9.tar.gz 6972834 BLAKE2B 3407c056c7995cc1ccb1b5b4c5b3a6254e38672b52e7889a7a022520283416e4dfcabd05c8ca0ed78e4624c7a20c9f43bfde87a76d7a72660b4c95256e4f9ca4 SHA512 8433f22ae7652e524a82da8d2ccda48da9eef44788333898b7526335d57a7757b80754f0d5c6a2c84ec3bde2ec9fc7da5cf872cbda7286f620b4f4878fe9a583
EBUILD botocore-1.18.18.ebuild 1485 BLAKE2B ce1c4bcd1ffbe79d297935a669cdd3d888509e755b30ac19ae4f9eec6bbaaa7621cdf105eda31efacfb3ff053f74c172b31542022635e74312f32477a71611f3 SHA512 d21d2cdde75987519bcee104c049784d63a9491c2f458e78c05a4389b5add29960b5f3acaf1e2e27cc6efb590a8463fb329ace052a09e5c33200f45f1f18a6c7
EBUILD botocore-1.19.16.ebuild 1496 BLAKE2B 0eb45127ff4fac7d4993ef398b6ad1569cf2eaf8f3fcfee53a1a6072f59d6274ff54ca171015e1e04580c74ad2d4ddc60884d48218af8e2a017a6d8519e9a14d SHA512 d0482c33572812a938fd0631f8eec0f8ae42188f80d6238089d89ea49542f927146fe10f2fe15f672b79129b04328472000dc2a4ead9cb01aac7f5ffae6c80e1
@@ -27,6 +29,8 @@ EBUILD botocore-1.19.28.ebuild 1496 BLAKE2B 0eb45127ff4fac7d4993ef398b6ad1569cf2
EBUILD botocore-1.19.29.ebuild 1496 BLAKE2B 0eb45127ff4fac7d4993ef398b6ad1569cf2eaf8f3fcfee53a1a6072f59d6274ff54ca171015e1e04580c74ad2d4ddc60884d48218af8e2a017a6d8519e9a14d SHA512 d0482c33572812a938fd0631f8eec0f8ae42188f80d6238089d89ea49542f927146fe10f2fe15f672b79129b04328472000dc2a4ead9cb01aac7f5ffae6c80e1
EBUILD botocore-1.19.30.ebuild 1496 BLAKE2B 0eb45127ff4fac7d4993ef398b6ad1569cf2eaf8f3fcfee53a1a6072f59d6274ff54ca171015e1e04580c74ad2d4ddc60884d48218af8e2a017a6d8519e9a14d SHA512 d0482c33572812a938fd0631f8eec0f8ae42188f80d6238089d89ea49542f927146fe10f2fe15f672b79129b04328472000dc2a4ead9cb01aac7f5ffae6c80e1
EBUILD botocore-1.19.36.ebuild 1496 BLAKE2B 0eb45127ff4fac7d4993ef398b6ad1569cf2eaf8f3fcfee53a1a6072f59d6274ff54ca171015e1e04580c74ad2d4ddc60884d48218af8e2a017a6d8519e9a14d SHA512 d0482c33572812a938fd0631f8eec0f8ae42188f80d6238089d89ea49542f927146fe10f2fe15f672b79129b04328472000dc2a4ead9cb01aac7f5ffae6c80e1
+EBUILD botocore-1.19.37.ebuild 1496 BLAKE2B 0eb45127ff4fac7d4993ef398b6ad1569cf2eaf8f3fcfee53a1a6072f59d6274ff54ca171015e1e04580c74ad2d4ddc60884d48218af8e2a017a6d8519e9a14d SHA512 d0482c33572812a938fd0631f8eec0f8ae42188f80d6238089d89ea49542f927146fe10f2fe15f672b79129b04328472000dc2a4ead9cb01aac7f5ffae6c80e1
+EBUILD botocore-1.19.38.ebuild 1496 BLAKE2B 0eb45127ff4fac7d4993ef398b6ad1569cf2eaf8f3fcfee53a1a6072f59d6274ff54ca171015e1e04580c74ad2d4ddc60884d48218af8e2a017a6d8519e9a14d SHA512 d0482c33572812a938fd0631f8eec0f8ae42188f80d6238089d89ea49542f927146fe10f2fe15f672b79129b04328472000dc2a4ead9cb01aac7f5ffae6c80e1
EBUILD botocore-1.19.9.ebuild 1494 BLAKE2B 46144609fec0e6664898d9408afe9e31590c90653c092f160c4d2ec369f3b1189d49b94255dfd6fe3ed1a0390418d7109c87c6aecc341781eda27cf8da1a451d SHA512 fb88fed5c0e0f117547952237e4e097d52fb3009ccb2fad160d35061aef86ac88a6d0cd2a59ffc20c746da35685bf475f336f5a47ac55cbb625041003a486d6b
EBUILD botocore-9999.ebuild 1606 BLAKE2B 15b1624c806724dd4cf8f86099a4f9049214ab9c0afa47f0211c0a5f66fe37b6ecc03db5448bfb3b4764f8eda23e19ab9f37bbe1461837bf0dccfae7da17faa7 SHA512 b5e16cf97b370e96e814c413d80793684a1579d293bbaf16b435de83af274efb299dbe42fb824c955b28099c50841c46124c8212bd539861ff01b278e6a7ee3d
MISC metadata.xml 717 BLAKE2B 6b5923518aebfebb4ac5de56ccc51b6d665b81870d4cdd915265ddef063db42dc9b0a4814c8cec71b44cb1aec7050797f6e2ec8f2a499b6c2e16d9cf312f7fb2 SHA512 fef7663fe63c373d775e419b5b5cfc63a896adf32a177e856c42ebf1c7574b3956fa989c30428d9ce69b19ecf68e553f19885fef46cbcaf7b434e27b15022b54
diff --git a/dev-python/botocore/botocore-1.19.37.ebuild b/dev-python/botocore/botocore-1.19.37.ebuild
new file mode 100644
index 000000000000..ca40b64d111f
--- /dev/null
+++ b/dev-python/botocore/botocore-1.19.37.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Low-level, data-driven core of boto 3"
+HOMEPAGE="https://github.com/boto/botocore"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+ EGIT_REPO_URI="https://github.com/boto/botocore"
+ inherit git-r3
+else
+ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+ KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+ dev-python/six[${PYTHON_USEDEP}]
+ dev-python/jmespath[${PYTHON_USEDEP}]
+ dev-python/python-dateutil[${PYTHON_USEDEP}]
+ >=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+ test? (
+ dev-python/mock[${PYTHON_USEDEP}]
+ dev-python/jsonschema[${PYTHON_USEDEP}]
+ )
+"
+
+PATCHES=(
+ "${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
+)
+
+distutils_enable_sphinx docs/source \
+ 'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+src_prepare() {
+ # unpin deps
+ sed -i -e "s:>=.*':':" setup.py || die
+ # very unstable
+ sed -i -e 's:test_stress_test_token_bucket:_&:' \
+ tests/functional/retries/test_bucket.py || die
+ distutils-r1_src_prepare
+}
+
+python_test() {
+ # note: suites need to be run separately as one of the unit tests
+ # seems to be leaking mocks and breaking a few functional tests
+ nosetests -v tests/unit ||
+ die "unit tests failed under ${EPYTHON}"
+ nosetests -v tests/functional ||
+ die "functional tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/botocore/botocore-1.19.38.ebuild b/dev-python/botocore/botocore-1.19.38.ebuild
new file mode 100644
index 000000000000..ca40b64d111f
--- /dev/null
+++ b/dev-python/botocore/botocore-1.19.38.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Low-level, data-driven core of boto 3"
+HOMEPAGE="https://github.com/boto/botocore"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+ EGIT_REPO_URI="https://github.com/boto/botocore"
+ inherit git-r3
+else
+ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+ KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+ dev-python/six[${PYTHON_USEDEP}]
+ dev-python/jmespath[${PYTHON_USEDEP}]
+ dev-python/python-dateutil[${PYTHON_USEDEP}]
+ >=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+ test? (
+ dev-python/mock[${PYTHON_USEDEP}]
+ dev-python/jsonschema[${PYTHON_USEDEP}]
+ )
+"
+
+PATCHES=(
+ "${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
+)
+
+distutils_enable_sphinx docs/source \
+ 'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+src_prepare() {
+ # unpin deps
+ sed -i -e "s:>=.*':':" setup.py || die
+ # very unstable
+ sed -i -e 's:test_stress_test_token_bucket:_&:' \
+ tests/functional/retries/test_bucket.py || die
+ distutils-r1_src_prepare
+}
+
+python_test() {
+ # note: suites need to be run separately as one of the unit tests
+ # seems to be leaking mocks and breaking a few functional tests
+ nosetests -v tests/unit ||
+ die "unit tests failed under ${EPYTHON}"
+ nosetests -v tests/functional ||
+ die "functional tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/bottle/Manifest b/dev-python/bottle/Manifest
index 84f56c4ddbc0..df557ab23e77 100644
--- a/dev-python/bottle/Manifest
+++ b/dev-python/bottle/Manifest
@@ -1,6 +1,4 @@
AUX bottle-0.12.8-py3.5-backport.patch 1720 BLAKE2B 63081eee3765d060d7381a0eeca97fde17367273b0308449678301f0d2ed9357c90881aeeff31c6a26920ff256b76b0567a74628499fb4d9f2325bc75de6a2e8 SHA512 10f8b95d77d35db582be9bb937ca0c52050c22faa191f373b34039c6ddec24a8e71ce26f6bc9c3f3af7973670343b2f3131c02ed626e3d161a636f8c9e4cdd2b
-DIST bottle-0.12.18.tar.gz 71557 BLAKE2B a34cc1ab9a2a8505b7fda8bbddbae30b4e6c4829cae53f0f886237a21fdfa7f2b2463b216d7a16464539f41bdce4c1dabb5cc66027b8fdd19b10e9a78a3cdbb5 SHA512 db8a341cd80d755205518bb9eac5b79dca9e541ab3ad9d9d57f891d895f7df75a8facd16b068cbdf7c4f884f35e384449f4cbd565a43e9c5d000d3a9f5b7dcb0
DIST bottle-0.12.19.tar.gz 73142 BLAKE2B e59d7a507d3401869ba4953a48274062fc56226afa2f7aad596b4ef4352e4a79cea2d224dfe32d7ce014e4f4a3ba088d0e7a0886f64a84bb6b78571e953fa3c3 SHA512 e5d2f6a32d1b89ae3cc9607456c0614db2b58882c6d36273d695c51d3d77b1858cac4d914dbf19bca3b74be68c197aa6473f162e40d9b7ae2af3a084a28c2637
-EBUILD bottle-0.12.18-r1.ebuild 1386 BLAKE2B f029ada9337b48bc8c446eee4a9119f99fe2e3e11f8d9f850a0da49e6170fbfac111912fb526469b9099bef86d96d5814b0b645ebece21014f90c8f1d5b1af6b SHA512 2e89d8b724dfc229df65f6c6737e2feeba9126bc4fcbc7859978e4110c90d0e66760aa137e9caee308a06fb0facd35169217e8f208914bd247e06a4928170427
-EBUILD bottle-0.12.19.ebuild 1394 BLAKE2B d70d4be4a2dc0e4be191579086b0bcdbe494cef8a82ba5dd575710c099805549c9e893b9e739271a880c7f855084b546238c3d1ada4f9a543d995c51817de4d4 SHA512 1da095b842b375e55211ee0187077b9415c7e4e1fede43e50ac69dae6f35cc550f0de3126162b6593ecb682961059c794a477c7498b37ea4ea797040ceb60edb
-MISC metadata.xml 319 BLAKE2B 29a2c856ee0a0af9214a5cec842b697fcb095d2bcf4702225b2e81d4f715967c29a383da78c43ac60d4464e27e651e81f1b085684b0b6f39925a6df7c36a54c4 SHA512 2ff50f032ea6042a32a7d391906ff95d00115367770423874aa6ee638b1db03fc0b7fabc484e1ecc002eff1e5abf5d45075463b76b7d512535d4820c46b56251
+EBUILD bottle-0.12.19.ebuild 1386 BLAKE2B f029ada9337b48bc8c446eee4a9119f99fe2e3e11f8d9f850a0da49e6170fbfac111912fb526469b9099bef86d96d5814b0b645ebece21014f90c8f1d5b1af6b SHA512 2e89d8b724dfc229df65f6c6737e2feeba9126bc4fcbc7859978e4110c90d0e66760aa137e9caee308a06fb0facd35169217e8f208914bd247e06a4928170427
+MISC metadata.xml 344 BLAKE2B a32327435528170de24fa1b28d50cd730903e5be9d021de0dd232f4994e93e161d132ea10eacfc0a71bc3d44bcc8ac0dd35a59e9ef3709909bf699827b07e84c SHA512 1dfbf879e31f4e61e8c75193ea13d317c1175cf555d2e9c7e5465faf726e836d71f002cae67734adbe8819579ae29ceb785a2397192c6e313f886e2f613da9ff
diff --git a/dev-python/bottle/bottle-0.12.18-r1.ebuild b/dev-python/bottle/bottle-0.12.18-r1.ebuild
deleted file mode 100644
index 37b91cf668f8..000000000000
--- a/dev-python/bottle/bottle-0.12.18-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
-
-inherit distutils-r1 optfeature
-
-DESCRIPTION="A fast and simple micro-framework for small web-applications"
-HOMEPAGE="https://pypi.org/project/bottle/ https://bottlepy.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="test? ( dev-python/mako[${PYTHON_USEDEP}] )"
-RDEPEND=""
-
-PATCHES=(
- "${FILESDIR}"/${PN}-0.12.8-py3.5-backport.patch
-)
-
-python_prepare_all() {
- sed -i -e '/scripts/d' setup.py || die
-
- # Remove test file requring connection to network
- rm test/test_server.py || die
- distutils-r1_python_prepare_all
-}
-
-python_test() {
- # A few odd fails in the suite under pypy
- # https://github.com/bottlepy/bottle/issues/714
- "${EPYTHON}" test/testall.py || die "tests failed under ${EPYTHON}"
-}
-
-pkg_postinst() {
- optfeature "Templating support" dev-python/mako
- elog "Due to problems with bottle.py being in /usr/bin (see bug #474874)"
- elog "we do as most other distros and do not install the script anymore."
- elog "If you do want/have to call it directly rather than through your app,"
- elog "please use the following instead:"
- elog ' `python -m bottle`'
-}
diff --git a/dev-python/bottle/bottle-0.12.19.ebuild b/dev-python/bottle/bottle-0.12.19.ebuild
index 13d52c768417..37b91cf668f8 100644
--- a/dev-python/bottle/bottle-0.12.19.ebuild
+++ b/dev-python/bottle/bottle-0.12.19.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/bottle/metadata.xml b/dev-python/bottle/metadata.xml
index 0701f0aad2af..c2aa6a8771bf 100644
--- a/dev-python/bottle/metadata.xml
+++ b/dev-python/bottle/metadata.xml
@@ -5,6 +5,7 @@
python@gentoo.org
Python
+
bottle
diff --git a/dev-python/breathe/Manifest b/dev-python/breathe/Manifest
index 9d616abd646e..f8bc7d645562 100644
--- a/dev-python/breathe/Manifest
+++ b/dev-python/breathe/Manifest
@@ -1,3 +1,7 @@
DIST breathe-4.22.1.tar.gz 76241 BLAKE2B 1b410eefe47610abf2e55bba86d13169449a03be2503839fa7a0f4f351e79d2e5f24d208c95d06a58e2d8cacef55ef52ea5921d5d71ce50b94fb0eed207918a2 SHA512 3b49819821356929a18d8ad9e25edd93d91661f3baea452121afb74308e11afa9a3cc96e31a063d380cfc1b0973ac646d5917279d9b56131be25dbb13dd632bf
+DIST breathe-4.25.0.tar.gz 76814 BLAKE2B 5a31d8a85ffdff0d4e2547e541246046c1088247672e289bd90d3d9ef30970ae00160f375b0a3b805f8ce01f023d0df4bb2327136b4c4d330dd729a51d990556 SHA512 e3e21efd724f10c64194a3294a240f607b83d3ba425cc0c4c514810d6d34977df808c23d3005c10acd7abb914a910ecdd98123b247f0d1065e1f5fe266bd35da
+DIST breathe-4.25.1.tar.gz 76931 BLAKE2B 3f910042f3822e5887da8239ba1a65bf7b1c8903a514c359ad64c58928fe8fe6b867a99351e18fb394a0a56aa0dbecc040203406a1e64961266fbd69aaddacfa SHA512 417adc7facbd5ec9eb69ec79028987fde537cbd928e3d552e7020377b683816b1b670614daa24c2047d711043f0a9116a09e8c1ca7aecb82db97b1f6fac872d8
EBUILD breathe-4.22.1.ebuild 764 BLAKE2B 47c348271dfa7781288e5fcf37f4eab8ae31eac0c874f2ecdbdb205646a4d3a8730bca65d145d6f5030374b535051b9e2bfa6d8b0d9c96e13d6a6cfc640c5576 SHA512 5f1b3869b15ec36750fc9ed36fa0064ddd76f146e93c48cd194aae481a63880a69658cd5313943cd861cfc332ee1e267ed7388c4a5df95fffbf08e00e5dfca1c
+EBUILD breathe-4.25.0.ebuild 767 BLAKE2B 42347b4f359f92a9d229b9bc1e337021e59683f4bffacc8ea4aee9748c62bf7c5498fe4e15eec1fa54e09579223a03b7322062cb019a25e3915270183a849915 SHA512 a81c5ca8916c51614a82e123c414c62e99b9ef45538ae2ef55d3c513310693a0731015a5235d1385847252031f11442ea15e2d3c57b3449a825351b734c26d87
+EBUILD breathe-4.25.1.ebuild 767 BLAKE2B 42347b4f359f92a9d229b9bc1e337021e59683f4bffacc8ea4aee9748c62bf7c5498fe4e15eec1fa54e09579223a03b7322062cb019a25e3915270183a849915 SHA512 a81c5ca8916c51614a82e123c414c62e99b9ef45538ae2ef55d3c513310693a0731015a5235d1385847252031f11442ea15e2d3c57b3449a825351b734c26d87
MISC metadata.xml 821 BLAKE2B 5105f5b60fd5fb3852dcc4d9c6acbeeb2f15e561256799162b5db18c1dcd665f2ac94f9e766fbab3c17856da7936694700850f84e7ca3bab196a5d96454b5083 SHA512 15b0904261afeb1e16da06f81bc78ed099268c7119086e04899eb6735656d508f3eb1dcc8bc1d8a0f6ae59943f1b2aea4204382eb78474aadb72b9d2030bf3de
diff --git a/dev-python/breathe/breathe-4.25.0.ebuild b/dev-python/breathe/breathe-4.25.0.ebuild
new file mode 100644
index 000000000000..47e8e11f3e19
--- /dev/null
+++ b/dev-python/breathe/breathe-4.25.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Sphinx Doxygen renderer"
+HOMEPAGE="https://breathe.readthedocs.io/en/latest/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+ app-doc/doxygen
+ dev-python/docutils[${PYTHON_USEDEP}]
+ dev-python/sphinx[${PYTHON_USEDEP}]
+ dev-python/six[${PYTHON_USEDEP}]
+ dev-texlive/texlive-bibtexextra
+ dev-texlive/texlive-fontsextra
+ dev-texlive/texlive-fontutils
+ dev-texlive/texlive-latex
+ dev-texlive/texlive-latexextra
+"
diff --git a/dev-python/breathe/breathe-4.25.1.ebuild b/dev-python/breathe/breathe-4.25.1.ebuild
new file mode 100644
index 000000000000..47e8e11f3e19
--- /dev/null
+++ b/dev-python/breathe/breathe-4.25.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Sphinx Doxygen renderer"
+HOMEPAGE="https://breathe.readthedocs.io/en/latest/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+ app-doc/doxygen
+ dev-python/docutils[${PYTHON_USEDEP}]
+ dev-python/sphinx[${PYTHON_USEDEP}]
+ dev-python/six[${PYTHON_USEDEP}]
+ dev-texlive/texlive-bibtexextra
+ dev-texlive/texlive-fontsextra
+ dev-texlive/texlive-fontutils
+ dev-texlive/texlive-latex
+ dev-texlive/texlive-latexextra
+"
diff --git a/dev-python/cairocffi/Manifest b/dev-python/cairocffi/Manifest
index 9ac5d91dfcb1..630f3b86d726 100644
--- a/dev-python/cairocffi/Manifest
+++ b/dev-python/cairocffi/Manifest
@@ -1,7 +1,4 @@
AUX cairocffi-0.8.0-tests.patch 827 BLAKE2B 81e1228f054ccb46b6c3170319fbd47aead8bdbb0b7af8e60cf85391c673d86e3eb1218a393c9b454d3d94b88968421ed9f3d798cc1d28ba7510bc75ad3ec261 SHA512 3fc7c2785586f88b17864931528e8c8e25792855107e5e8b76aa79a198303b68bd8cc822a2a5ff7a646c9f11982a3b5992a9eeb3bd651bbde1792d13a1410021
-AUX cairocffi-1.0.2-test-deps.patch 671 BLAKE2B 489b14e3e9847f28c53211aedc9b3ef4089c4335cbc0cd5d655764682c7a28dbffdb66ea3bb4266782acb39e3e367dfe4f417d868ac32ea3acc85cdfe9991f41 SHA512 a34824aa886ef714464a727997b2226c8170fe1124c5f067ec881e35339a91c60da57505aa8bc551ccfe3ba6dddc59f27bdc79ec122c8fd36a6fbab06efefef5
-DIST cairocffi-1.1.0.tar.gz 68744 BLAKE2B 604812572bb1a39ab52e41e03714acc93ddc7532e07ac36b693f53ad71cf0bcfd5d2f3bceb56b8e352fe7f179b174a244238b9cfcee690cbc0cb96e5b2934c75 SHA512 a9bc9ec5be767388aad9d06cc3b386b474dbacf097d3558b4033834cfb2f5418eede2f4b4080bec7e4725c6821f6e54d6c3366e8c4ee73bd3fa1cf444b395197
DIST cairocffi-1.2.0.tar.gz 70393 BLAKE2B b5cc69ec2805524e8f66a6234c4e19502181fad18c754379d91b05c2d2a88c82742f2b2057afcaac93f4d23ee64b41b2e84f029b6cb4ce2e7b3fa81ae0e8a485 SHA512 0f5b58ae85b2cc880bfb8ede6cbfe4905737211dab5b080815eb59f7cdd9c580367b9e00e7216d68ea9cbb84bda3f21ddcbccb2e744b86d6da8b991cffb96caf
-EBUILD cairocffi-1.1.0.ebuild 781 BLAKE2B fd97362eea8415a40d9cc60e7bfca532b3f095c2ce3cac892269c6bfd6865ba8b79fddbcb1640ecf8ecb798d5295dc311a7fa47d3d50d87f601dab22257e2d8a SHA512 2a0e41a651bc2918ffe90624ede77ae31d6a7e6cba871ac0c416efcc22cff4f6032817438a67a8e9eb9af2d0230c9bac580cc5f79c29e64cff9d18f9003ee8a9
-EBUILD cairocffi-1.2.0.ebuild 898 BLAKE2B 483ef93a9b4682c99dc68a4adebda0290e95dc796888d5815d18917c0c871a7e224df87697acebded2f7f96b3d96650a0bc237bae1a5e4c500018a23f65980a3 SHA512 b7f14467d263f8d72aed1c170b07eb3b6ad574b3f113680e9809670cc1be89b099b2fa5dfb0d4c07d68f09b92ee7a56eec2c3cb8790d17d01402584c162a2721
+EBUILD cairocffi-1.2.0.ebuild 897 BLAKE2B 9390d3115ffa3c8c9e6e50220973ac67f3412a25eee05138115f286f55f875e46eb2417979b5cebf1cf4e02301d04d2fc32738cd9dc60ab634f46d3af1e8e06b SHA512 9f061d2ca184ff7455ba05e0ea788107ef59ec4038370a0347c2119adc0e68ad42aa13415483d41bd8e3037d53e3ace126cf3b2f58e40b2120ffc46dcc0ea34c
MISC metadata.xml 379 BLAKE2B 75baee69a9fff6d3c571bded0b1e6cfd8abbdfae7262faa2215fb3251ace498c33119ebe3bf74e4e4e0b2d1ba620b9bc60d4daf244917098e17c62af24d4b401 SHA512 b0bdbb3b144675f9e90a0421c694e0f0a782dbf315dd8203574bea69b9389d49d377797a28d9d86588d062e15071c1fe226dd4166a4fbf8e95a852d46cc20215
diff --git a/dev-python/cairocffi/cairocffi-1.1.0.ebuild b/dev-python/cairocffi/cairocffi-1.1.0.ebuild
deleted file mode 100644
index 29fbbca716f4..000000000000
--- a/dev-python/cairocffi/cairocffi-1.1.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6..9} )
-
-inherit distutils-r1 virtualx
-
-DESCRIPTION="CFFI-based drop-in replacement for Pycairo"
-HOMEPAGE="https://github.com/Kozea/cairocffi"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 x86"
-
-RDEPEND="
- $(python_gen_cond_dep '
- >=dev-python/cffi-1.1.0:=[${PYTHON_USEDEP}]
- ' 'python*')
- >=dev-python/xcffib-0.3.2[${PYTHON_USEDEP}]
- x11-libs/cairo:0=[X,xcb(+)]
- x11-libs/gdk-pixbuf[jpeg]"
-
-distutils_enable_tests pytest
-
-PATCHES=(
- "${FILESDIR}"/${PN}-0.8.0-tests.patch
- "${FILESDIR}"/${PN}-1.0.2-test-deps.patch
-)
-
-python_test() {
- virtx pytest -vv --pyargs cairocffi
-}
diff --git a/dev-python/cairocffi/cairocffi-1.2.0.ebuild b/dev-python/cairocffi/cairocffi-1.2.0.ebuild
index 904fb171ce2d..c8e301e9018c 100644
--- a/dev-python/cairocffi/cairocffi-1.2.0.ebuild
+++ b/dev-python/cairocffi/cairocffi-1.2.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~arm arm64 ~ppc ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 x86"
RDEPEND="
$(python_gen_cond_dep '
diff --git a/dev-python/cairocffi/files/cairocffi-1.0.2-test-deps.patch b/dev-python/cairocffi/files/cairocffi-1.0.2-test-deps.patch
deleted file mode 100644
index d6da32523d79..000000000000
--- a/dev-python/cairocffi/files/cairocffi-1.0.2-test-deps.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-Remove unnecessary test deps.
-
---- cairocffi-1.0.2/setup.cfg
-+++ cairocffi-1.0.2/setup.cfg
-@@ -36,16 +36,10 @@
- packages = find:
- setup_requires =
- cffi >= 1.1.0
-- pytest-runner
- setuptools
- install_requires =
- cffi >= 1.1.0
- setuptools >= 39.2.0
--tests_require =
-- pytest-cov
-- pytest-flake8
-- pytest-isort
-- pytest-runner
- python_requires = >= 3.5
-
- [options.package_data]
-@@ -58,11 +52,6 @@
- doc =
- sphinx
- sphinx_rtd_theme
--test =
-- pytest-runner
-- pytest-cov
-- pytest-flake8
-- pytest-isort
- xcb =
- xcffib >= 0.3.2
-
-@@ -74,7 +63,6 @@
- test = pytest
-
- [tool:pytest]
--addopts = --flake8 --isort
- norecursedirs = build dist .cache .eggs .git
-
- [flake8]
diff --git a/dev-python/cfn-python-lint/Manifest b/dev-python/cfn-python-lint/Manifest
index bc85d4b626e0..f025edcb25d5 100644
--- a/dev-python/cfn-python-lint/Manifest
+++ b/dev-python/cfn-python-lint/Manifest
@@ -3,8 +3,10 @@ DIST cfn-python-lint-0.39.0.tar.gz 5096885 BLAKE2B 50fe41b1dd533c10a011d4729e782
DIST cfn-python-lint-0.41.0.tar.gz 5192401 BLAKE2B 1f4c491446b552272cb9fea46d9d07ca559a4ac7526730663b0824d3ba631a333128ca45b2dbbe637286b0495d0198c45ce19b662bb1448125c919ab4fed57b1 SHA512 3ece6a39666dee395c78fed8e23d9228ec7e0cca67d9216b709300bccf48605903252202cb7d05e7c9b9122be11ed4ca39540aba891359633f1772af72a73fa6
DIST cfn-python-lint-0.42.0.tar.gz 5307120 BLAKE2B f54c4ae7fcefa6b56714a0cfdf89d9fbce20078daac0784c6169dfbe1a110da699e37b526f306ed9734504fb3387c660ccb997748579b65afe01438124361383 SHA512 ce2e6a0031e3d67953da6f5dc96f0b155f1a1144bee75a8a476490eca69fdb700c8a3d6fd89b0afa4c8d724956e5f86bc48417035d7c94f3eed00abda47f9931
DIST cfn-python-lint-0.43.0.tar.gz 5329573 BLAKE2B 94ea659e3df02fb3b269984cdf6d879d0e2719aadf3c95f15c2982606cde220493da0a7e34e16538170f96a2611e8693dbad73033bd842e91de613c8cdcb2009 SHA512 fdde4cdffd01d1e8011f44b4eaec0bfe28f2189f53bdc3054d563cf4657c5f828751d8a12e2050d8e04687fe05bf768b5db8cbd27d2ed1c5e0d8967ede70d0ae
+DIST cfn-python-lint-0.44.0.tar.gz 5339555 BLAKE2B 880f03384247f4d6af1e87850b367bdc0846e00205aa943480a3028760115e36b3f6180f536a7b16b9a1aaf9f824ceaea5ab69b7adb1da3f345506c0268b55c0 SHA512 15ee6cc0cb373f7104d9c32acb06433b5669ae89997de010f1c4f382514481f1c6b87ceb387236275299e13e63aae1a5345e71ee934f2d99c1b66e566e1ef245
EBUILD cfn-python-lint-0.39.0.ebuild 1339 BLAKE2B 0493cbc1361e663531bb80becb0e09edb3e5d8da4fa6258748e68061ba6765c1e324894000d8c5daa110680714d9ea045ff79bba27b3218e65a115ec1d0750e4 SHA512 75ff46b3bf5265045fbddb5fc0621b900767c999a03abcdc4bd3925b391927876c98431fd5bcb4199e261fde46cdce73dd555f795e7e37419a0ee800be461098
EBUILD cfn-python-lint-0.41.0.ebuild 1341 BLAKE2B ac10bcae4e7c4cca570f4fa1e66f35038fd340fbe6d69388bf6300ae7cfa275610f1a2f239cad3b6ab1bf1ca8308a0805c91db8896f5eff612e695ad179b8f6a SHA512 eb21732bf1dbd44eb434f6b056c61c04b82f67f685b62709b9ccb16d37990f9cbaccf828021fd27fdc518707c14cf7977133ba3a722376bf53220252b4695a06
EBUILD cfn-python-lint-0.42.0.ebuild 1341 BLAKE2B ac10bcae4e7c4cca570f4fa1e66f35038fd340fbe6d69388bf6300ae7cfa275610f1a2f239cad3b6ab1bf1ca8308a0805c91db8896f5eff612e695ad179b8f6a SHA512 eb21732bf1dbd44eb434f6b056c61c04b82f67f685b62709b9ccb16d37990f9cbaccf828021fd27fdc518707c14cf7977133ba3a722376bf53220252b4695a06
EBUILD cfn-python-lint-0.43.0.ebuild 1341 BLAKE2B ac10bcae4e7c4cca570f4fa1e66f35038fd340fbe6d69388bf6300ae7cfa275610f1a2f239cad3b6ab1bf1ca8308a0805c91db8896f5eff612e695ad179b8f6a SHA512 eb21732bf1dbd44eb434f6b056c61c04b82f67f685b62709b9ccb16d37990f9cbaccf828021fd27fdc518707c14cf7977133ba3a722376bf53220252b4695a06
+EBUILD cfn-python-lint-0.44.0.ebuild 1341 BLAKE2B ac10bcae4e7c4cca570f4fa1e66f35038fd340fbe6d69388bf6300ae7cfa275610f1a2f239cad3b6ab1bf1ca8308a0805c91db8896f5eff612e695ad179b8f6a SHA512 eb21732bf1dbd44eb434f6b056c61c04b82f67f685b62709b9ccb16d37990f9cbaccf828021fd27fdc518707c14cf7977133ba3a722376bf53220252b4695a06
MISC metadata.xml 596 BLAKE2B c9937cb001e177c18c65bff8b70940d241e54f58aae3818071510f1c73540fcac6c532c8700b4904d4e2c9382f8a5288a2cb8745e174b8ac0a4edfe114d78ff5 SHA512 40c20431d8132ee97311a23bba87d6b408297410573c191f8fc43282bd156884adc25b6ceb6f2168d3456d535c4d82fb3473dd9025bda276f6aad829f68a8e37
diff --git a/dev-python/cfn-python-lint/cfn-python-lint-0.44.0.ebuild b/dev-python/cfn-python-lint/cfn-python-lint-0.44.0.ebuild
new file mode 100644
index 000000000000..a83123122bcb
--- /dev/null
+++ b/dev-python/cfn-python-lint/cfn-python-lint-0.44.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6..9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+inherit distutils-r1
+
+DESCRIPTION="CloudFormation Linter"
+HOMEPAGE="https://pypi.org/project/cfn-lint/ https://github.com/aws-cloudformation/cfn-python-lint"
+SRC_URI="https://github.com/aws-cloudformation/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+ >=dev-python/aws-sam-translator-1.25.0[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ dev-python/importlib_resources[${PYTHON_USEDEP}]
+ ' python3_6)
+ dev-python/jsonpatch[${PYTHON_USEDEP}]
+ >=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
+ dev-python/junit-xml[${PYTHON_USEDEP}]
+ dev-python/networkx[${PYTHON_USEDEP}]
+ dev-python/pyyaml[${PYTHON_USEDEP}]
+ >=dev-python/requests-2.15.0[${PYTHON_USEDEP}]
+ >=dev-python/six-1.11[${PYTHON_USEDEP}]
+"
+BDEPEND="
+ test? (
+ dev-python/mock[${PYTHON_USEDEP}]
+ )
+"
+
+distutils_enable_tests --install unittest
+
+PATCHES=(
+ "${FILESDIR}/cfn-python-lint-0.30.1-tests.patch"
+)
+
+src_prepare() {
+ # unpin the deps
+ sed -e 's:~=[0-9.]*::' -i setup.py || die
+ # requires git checkout
+ sed -e 's:test_update_docs:_&:' \
+ -i test/unit/module/maintenance/test_update_documentation.py || die
+ distutils-r1_src_prepare
+}
diff --git a/dev-python/cheroot/Manifest b/dev-python/cheroot/Manifest
index 71428e07a0b2..bfabe5b2aefd 100644
--- a/dev-python/cheroot/Manifest
+++ b/dev-python/cheroot/Manifest
@@ -1,9 +1,7 @@
-DIST cheroot-8.4.4.tar.gz 107753 BLAKE2B 4e5d9c3a101876d76696a2e6e3c191f199810e734e25cdc07aac69c102eb28b90033c6fa749569e140c01dbd08a4b06f067b4f47d34ef483d48731c6372ee5eb SHA512 18e2c198a537abd740a868fc4055c1e1e0501392c5518ec345669d02511dac2d59aa2abe2670ffb1800c5aae7032b11445488ecf7fd63d02d5923ed08b82f216
DIST cheroot-8.4.5.tar.gz 109443 BLAKE2B f8dd7a053304c6be559862028ef306c742c015e98c236f3e154f863c3abbf7d261f85b9a7e880ba9f51e6a8bf25cdf96ed6f45f7758657ecbdc4d6b7dde7f6a9 SHA512 2e8c84a67e24772dfeea7fbb397807e6553912d32392c393ec85181ccb381b1f4d3e38cc2366710a5c789869cbc6d15a79bd1b20b6d3845e5c08496b4f4b0e9e
DIST cheroot-8.4.8.tar.gz 111377 BLAKE2B be020dd45fef980e7e7b10e19f1ff2bf076ddd30578a31371afd7b9c85a644d0fb4c4836401f17be8df3307071f3337359f611f9cb6d28b17fb5b7723d6b6f7d SHA512 fa0362d29adbcf0b06038d209e33d722ff2f0766d8f2dd46c8ca217195ef5b30bb51400a9615f11cc136683b146ab2c21c3f1974cb4e7ad55488762e31da40f5
DIST cheroot-8.5.0.tar.gz 112163 BLAKE2B f7105f7c2d5433b90832dff6404120f153783b644b5acab72a915899fd138df1ee9ecde6d4148a66472cfb31802e58d684256524a212c65c1c42a22ab7783ce2 SHA512 3e781bfaea0b1d0b339ddb1ef871505c7eb0f4a67873f3207ec3cbb703392f579de90785c196d77f7a484b675de1438def4ad91109e70ad5894d26e55c645a01
-EBUILD cheroot-8.4.4.ebuild 1524 BLAKE2B f960b663a86ac5d31ba5966f4618c4ea378ba8261861ef5da20e237877a7a225e0dbfc9b9ec2581dfa67a3968bcee21b79d5e0316f0d43c33ac641808ed8a5de SHA512 42d487dfa1ddaaa1b054e82df553d421af770160ab7ff3f0e60d7036bb6945dc69cf590d88baac39c1c04f36867a91ce435c7e8ef6bf9a7312fb1ff2cf0f5820
-EBUILD cheroot-8.4.5.ebuild 1529 BLAKE2B 9d0e3bda85a726d08e7e5f145e4a5e814239c6d7574bc93d9f15b4c04609b542693b728f35becb45657601f17e656e26e3167807418ad13f31539be01cf211ac SHA512 17db137994110789ff496c40a0b2d10efb7913de0c9902cd4bb5498483c704eaad09d808948767c805f9c9efd1a956fbf3fb3d0641cddef4f95b62edb9874cc7
+EBUILD cheroot-8.4.5.ebuild 1524 BLAKE2B f960b663a86ac5d31ba5966f4618c4ea378ba8261861ef5da20e237877a7a225e0dbfc9b9ec2581dfa67a3968bcee21b79d5e0316f0d43c33ac641808ed8a5de SHA512 42d487dfa1ddaaa1b054e82df553d421af770160ab7ff3f0e60d7036bb6945dc69cf590d88baac39c1c04f36867a91ce435c7e8ef6bf9a7312fb1ff2cf0f5820
EBUILD cheroot-8.4.8.ebuild 1529 BLAKE2B 9d0e3bda85a726d08e7e5f145e4a5e814239c6d7574bc93d9f15b4c04609b542693b728f35becb45657601f17e656e26e3167807418ad13f31539be01cf211ac SHA512 17db137994110789ff496c40a0b2d10efb7913de0c9902cd4bb5498483c704eaad09d808948767c805f9c9efd1a956fbf3fb3d0641cddef4f95b62edb9874cc7
EBUILD cheroot-8.5.0.ebuild 1532 BLAKE2B b1bb9a41ac047424b491eddfcba78474101c2bbce9375d6596cec6e5a60e4841ad0cc34557d2be3d5ce027f72b3acf0018efb387dfa7e060730982c7d7f890fb SHA512 09ff41f3021704044f689947787bf313aa954b582d42101ad6c581acacc21f9c6aba77a564ec56dd3644ee4fa2cff5fa2d7cf567377517dc5ab7f43501bd0f8b
MISC metadata.xml 495 BLAKE2B 4194775afacc99b4983275505dd45471a7ca4305a6cfb37d8fe80fdc00d196da1c2722940d2ae13408de0c13c92c7a2a01ef153b35f49f8ccb9d7df2f605dceb SHA512 710108fdb8ddda277cceea3d57a3ef716e7a67067e658f9719a793f9ba7fd04e8a1e4482c68c23ba458e29e85b9b233d72ec485ab8c585703f411fc32051f256
diff --git a/dev-python/cheroot/cheroot-8.4.4.ebuild b/dev-python/cheroot/cheroot-8.4.4.ebuild
deleted file mode 100644
index 2685ff644e7c..000000000000
--- a/dev-python/cheroot/cheroot-8.4.4.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6..9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-inherit distutils-r1
-
-DESCRIPTION="Cheroot is the high-performance, pure-Python HTTP server used by CherryPy."
-HOMEPAGE="https://cherrypy.org/ https://pypi.org/project/Cheroot/ https://github.com/cherrypy/cheroot"
-SRC_URI="mirror://pypi/C/${PN/c/C}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ia64 ppc ~ppc64 x86"
-
-RDEPEND="
- >=dev-python/six-1.11.0[${PYTHON_USEDEP}]
- >=dev-python/more-itertools-2.6[${PYTHON_USEDEP}]
- dev-python/jaraco-functools[${PYTHON_USEDEP}]
-"
-BDEPEND="
- test? (
- ${RDEPEND}
- dev-python/jaraco-context[${PYTHON_USEDEP}]
- dev-python/jaraco-text[${PYTHON_USEDEP}]
- dev-python/portend[${PYTHON_USEDEP}]
- dev-python/pytest-forked[${PYTHON_USEDEP}]
- >=dev-python/pytest-mock-1.11.0[${PYTHON_USEDEP}]
- dev-python/pyopenssl[${PYTHON_USEDEP}]
- dev-python/requests-toolbelt[${PYTHON_USEDEP}]
- dev-python/requests-unixsocket[${PYTHON_USEDEP}]
- dev-python/trustme[${PYTHON_USEDEP}]
- dev-python/urllib3[${PYTHON_USEDEP}]
- )
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
- sed -e "s/use_scm_version=True/version='${PV}'/" -i setup.py || die
- sed -e '/setuptools_scm/d' -i setup.cfg || die
- sed -e '/--cov/d' \
- -e '/--testmon/d' \
- -e '/--numproc/d' \
- -i pytest.ini || die
-
- # broken
- sed -e '/False.*localhost/d' \
- -i cheroot/test/test_ssl.py || die
-
- distutils-r1_python_prepare_all
-}
diff --git a/dev-python/cheroot/cheroot-8.4.5.ebuild b/dev-python/cheroot/cheroot-8.4.5.ebuild
index 467ee0e31e3f..2685ff644e7c 100644
--- a/dev-python/cheroot/cheroot-8.4.5.ebuild
+++ b/dev-python/cheroot/cheroot-8.4.5.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/C/${PN/c/C}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ~ia64 ppc ~ppc64 x86"
RDEPEND="
>=dev-python/six-1.11.0[${PYTHON_USEDEP}]
diff --git a/dev-python/cli_helpers/Manifest b/dev-python/cli_helpers/Manifest
index 88b1304dd0b5..2085aa7bca73 100644
--- a/dev-python/cli_helpers/Manifest
+++ b/dev-python/cli_helpers/Manifest
@@ -1,4 +1,4 @@
DIST cli_helpers-2.1.0.tar.gz 32967 BLAKE2B c2ee2a92dce4185f656415d6079196953c5e9dccf9de4e29d9de61bf72b041a6225ffe4afa866b0f78abcd5d0809ec739db489aee21e440575b7e2a6e09b916a SHA512 75c6b24ae1ed05cbdfddfc30c5e43aeb7129f5fa319d485e19be098691762ad681c4874449b2f339f833424a970965b5a28a3b66814cb556ea8ad6293740fdbe
-EBUILD cli_helpers-2.1.0.ebuild 659 BLAKE2B cf59956df021e929353c6aecf0185953b6934f1b08c91ad0ea32b960b8a06c1ea61f64a780d56f603ad676d43c5a09ffbcce9644df94d20575116ea4a0de8439 SHA512 98234f6f77b3a3e29b9ccd109559bb479b42f5b6f9ae05b51ebc8c690669a3fbfb5c6a784012f03bc0e2859f528474ffac11eea1f0e17c97e7d207fdae361683
+EBUILD cli_helpers-2.1.0.ebuild 658 BLAKE2B 095fb590154bd84be4d5131c982d67cae670f6b83c46ada522b36e285b9913a9f167def132d46d9e409a001467316cb30ad4ad09707b6f242a04a9c5a325ae93 SHA512 9bdc248b4d278fccceaebf172c5e00667dfd3324e4f67e2d6e3b844622709dad6b298246bd05fa1bcac63b7dc0125f9f46dab1ca2dd7538064e6017f453e56f7
EBUILD cli_helpers-9999.ebuild 640 BLAKE2B 1735334767048c032a78753bef7baec1e90be2f9791aaec3b1e288b2c1117c6f1bc7dc399f54df6c9a056a15b25fc3e0b67c61ab6c29a7132b0ac3db90935bcc SHA512 327f03e46233829c699f1c71cbff78cc354320d36a332d16622c96adb86a1803cc13c23136a7c6f521420221d2dea0af1dc11fd2b68f3a7cee3b51df12a83abe
MISC metadata.xml 456 BLAKE2B 3c7bef25195fc639bb4bcbf6edf7236e18c8b338e9327673da6b4aca9778363115ff3f271015d01b98fc4728028b751ae9d55f85f3375adff20862f6b6a9706d SHA512 c3d592c696302e6e11accf1b50853e6f114c5de063ceb02d22eb23d3e8af338a0222d9615ab689825f483aee1156acb939ccfb01c1fe768571ddf137a28e3e95
diff --git a/dev-python/cli_helpers/cli_helpers-2.1.0.ebuild b/dev-python/cli_helpers/cli_helpers-2.1.0.ebuild
index bb84eca13ff0..163f9c05bb29 100644
--- a/dev-python/cli_helpers/cli_helpers-2.1.0.ebuild
+++ b/dev-python/cli_helpers/cli_helpers-2.1.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/dbcli/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
RDEPEND="
>=dev-python/configobj-5.0.5[${PYTHON_USEDEP}]
diff --git a/dev-python/cliff/Manifest b/dev-python/cliff/Manifest
index 2b80f3bcbbfb..75029ecbc4e7 100644
--- a/dev-python/cliff/Manifest
+++ b/dev-python/cliff/Manifest
@@ -1,5 +1,3 @@
-DIST cliff-3.4.0.tar.gz 78990 BLAKE2B d7d8209e2fe24614cde6d3e113eb0dbbba981addef045fe318143e71f9a240188c0fb74e831d868b31b6dafb4289f7beabfbb5fe1dade1df196f670c53a55549 SHA512 d625588f4eed0aeee549b4a21e604f1cb886b8c10a12df7c546a5292223ec5bf9067352b4d326d5710673dab56eec47e2fb46c9c5d5df6e9fbf026d030bcde1c
DIST cliff-3.5.0.tar.gz 82997 BLAKE2B f169770a0a956e6091e56eccda8d10906bee09bdb03b474f3b17837b3eda858f3afd21beae1d6945bcdabfa89fc1555d13d70ddd0454a10fe05bfb63c8de75e7 SHA512 215f22e5dd2c4c17bd0f19866189b6b247377a7d5bddeb4a07b7536af7545bd0440b5fb0a98474fc018e3b12f6695f60028c012f3e7eeb6498b20f2923939d08
-EBUILD cliff-3.4.0.ebuild 1203 BLAKE2B 4bac1690e15c736c6ca79ed940a0459811e05e6264949aae242807d266c988fc09e2c0fcd69c8606ce5c54cc260b7b50a8c40cd15234d56f70ccc6f367a902e5 SHA512 26f04001fba369a2805f3e4c33ffc69953a8e1d921e88a1c63c861cebbcd1dc42204e629a3bb34b6afeeae04fc72e196192ff6b944b387299ece48562c29e9f7
-EBUILD cliff-3.5.0.ebuild 1209 BLAKE2B 06c8d877c1fe0181403667f586e99328dd67c1c2ba7fa34c06546e24e81a244182855e9b23e73183099fedef7dffe5a09c5b9e1b7e2af736a877387078a038bb SHA512 bb3d0f6698272acdfeee15d40a4daa5416ab631e327d1f14d94ae5bceef0e14033af5c4635aedde8bff2de13a56cc88ada596f4ce580a62f15fc87328f2a8efa
+EBUILD cliff-3.5.0.ebuild 1203 BLAKE2B 4bac1690e15c736c6ca79ed940a0459811e05e6264949aae242807d266c988fc09e2c0fcd69c8606ce5c54cc260b7b50a8c40cd15234d56f70ccc6f367a902e5 SHA512 26f04001fba369a2805f3e4c33ffc69953a8e1d921e88a1c63c861cebbcd1dc42204e629a3bb34b6afeeae04fc72e196192ff6b944b387299ece48562c29e9f7
MISC metadata.xml 766 BLAKE2B d1e77f1b381c58cc9d5c004cbc5062bc8b024bbd416ce4f3e44d6fc817252980193d7f3990b4f0248d23d763dc62a489fbc68093eacf8e3e7fd82cb596b6fcf5 SHA512 bdeca590929247212b707d2faf686d70102aae0fefd4904a9bd091e041d926740df1fe0556b485d0947c7ff879c190341fbc3cbca535aa0e2140104a8b618f1b
diff --git a/dev-python/cliff/cliff-3.4.0.ebuild b/dev-python/cliff/cliff-3.4.0.ebuild
deleted file mode 100644
index 8a9b0147ca33..000000000000
--- a/dev-python/cliff/cliff-3.4.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6..9} )
-# TODO: revert to rdepend once this is merged
-# https://github.com/openstack/cliff/pull/3
-DISTUTILS_USE_SETUPTOOLS=manual
-
-inherit distutils-r1
-
-DESCRIPTION="Command Line Interface Formulation Framework"
-HOMEPAGE="https://github.com/openstack/cliff"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm64 hppa ~ia64 ~mips ~ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
- >=dev-python/cmd2-0.8.0[${PYTHON_USEDEP}]
- =dev-python/pyparsing-2.1.0[${PYTHON_USEDEP}]
- dev-python/setuptools[${PYTHON_USEDEP}]
- >=dev-python/six-1.10.0[${PYTHON_USEDEP}]
- >=dev-python/stevedore-2.0.1[${PYTHON_USEDEP}]
- >=dev-python/pyyaml-3.12.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
- >=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
- !~dev-python/pbr-2.1.0
- dev-python/setuptools[${PYTHON_USEDEP}]
- test? (
- dev-python/sphinx[${PYTHON_USEDEP}]
- >=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
- >=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
- )
-"
-
-distutils_enable_tests unittest
diff --git a/dev-python/cliff/cliff-3.5.0.ebuild b/dev-python/cliff/cliff-3.5.0.ebuild
index 5e6f9629a908..8a9b0147ca33 100644
--- a/dev-python/cliff/cliff-3.5.0.ebuild
+++ b/dev-python/cliff/cliff-3.5.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm64 hppa ~ia64 ~mips ~ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
RDEPEND="
>=dev-python/cmd2-0.8.0[${PYTHON_USEDEP}]
diff --git a/dev-python/diff-cover/Manifest b/dev-python/diff-cover/Manifest
deleted file mode 100644
index 74be3f76f723..000000000000
--- a/dev-python/diff-cover/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST diff-cover-2.3.0.tar.gz 76738 BLAKE2B 467d8ed3cb2f4b0f76ad6b1928a87ad6f75ce46e555c061e30b56fc4856089fb270670ad9f704b9dc407e5c6cab2cf881696bd263befafbe3863bcda4ccd4ac2 SHA512 c47d64e1695596ba1244d687cdbbd6edf391b0c4a18b2550004bcfc36ce8798ef9e6a059e726e52eff45251b3bb27cca873be493c37b3b7eab9dec02f99953f6
-EBUILD diff-cover-2.3.0.ebuild 1307 BLAKE2B 073c6a05a8c788524d5b9285d81cfecf2dd1267ff0e437dd38f9480032beb36e781b4617c286abd6eb3a74eaaa36f7e0f6d4af2440ac99a858fdff47bc0488b9 SHA512 63760854cc71952a2e5cf046a8e2f5d8220bf3b61a506177da1752a49df9209cc7745afec49b838ac7ac38db9ec290004b536fd5f6d7a0df71cfd74e1dae238c
-MISC metadata.xml 303 BLAKE2B f8190e782cfb49bf6606495fc81881392b1863251eb055dfaf73fcf5d50fe721a29db44c335580b581178131f21e9103ee3e96e9b3a24c31b85a6c58a8ae9d61 SHA512 8b1d0ac7eeb65e2d5cea36525f265c4abdb556be10ae1cb39dfe2cbce9aeefd6c005634850fdf0af1e0ef92ffdd18cc36adb8952a6434db6815872ffba0a16cc
diff --git a/dev-python/diff-cover/diff-cover-2.3.0.ebuild b/dev-python/diff-cover/diff-cover-2.3.0.ebuild
deleted file mode 100644
index 61931388f524..000000000000
--- a/dev-python/diff-cover/diff-cover-2.3.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="Automatically find diff lines that need test coverage"
-HOMEPAGE="https://github.com/Bachmann1234/diff-cover"
-SRC_URI="https://github.com/Bachmann1234/diff-cover/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-python/jinja-2.7.1[${PYTHON_USEDEP}]
- dev-python/jinja2_pluralize[${PYTHON_USEDEP}]
- dev-python/pygments[${PYTHON_USEDEP}]
- dev-python/six[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
- test? (
- dev-python/coverage[${PYTHON_USEDEP}]
- dev-python/flake8[${PYTHON_USEDEP}]
- dev-python/mock[${PYTHON_USEDEP}]
- dev-python/nose[${PYTHON_USEDEP}]
- >=dev-python/pycodestyle-2.4.0[${PYTHON_USEDEP}]
- dev-python/pyflakes[${PYTHON_USEDEP}]
- )"
-
-MY_PN=${PN/-/_}
-S=${WORKDIR}/${MY_PN}-${PV}
-
-python_prepare_all() {
- # TypeError: test_parse_range_notation() takes exactly 2 arguments (1 given)
- sed -e 's|test_parse_range_notation|_\0|' \
- -i "${MY_PN}/tests/test_diff_cover_main.py" || die
-
- distutils-r1_python_prepare_all
-}
-
-python_test() {
- esetup.py test || die "tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/diff-cover/metadata.xml b/dev-python/diff-cover/metadata.xml
deleted file mode 100644
index a6669b8f3c23..000000000000
--- a/dev-python/diff-cover/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
- diff_cover
- Bachmann1234/diff-cover
-
-
diff --git a/dev-python/dogpile-cache/Manifest b/dev-python/dogpile-cache/Manifest
index 4a57a5c36645..ec1f948e0dd3 100644
--- a/dev-python/dogpile-cache/Manifest
+++ b/dev-python/dogpile-cache/Manifest
@@ -1,8 +1,6 @@
AUX dogpile-cache-1.0.2-pytest6.patch 703 BLAKE2B 308ef55e621c8521f15b716585355369af922447019da54c7eac368899e0133891fc2e336253faa5f71dca26a45d8e2271afd8bad0c1b3e8d8ec890d6123fb3f SHA512 97a3a7be1ed3dc84cff6e07b8c2492d3759e7070fe8c726f5a87cbd988dfb9706d4f2b60367a18fc97fd35b26107cff1a32a452ec29d94739336712d3630b577
-DIST dogpile.cache-1.0.2.tar.gz 351221 BLAKE2B 7cca7e0c260ca68fb26c0db5b736de1e3586f22a14558b8b294dfd12452cd55d70eb75b7a01041001d1d8f5300d4b7d5b5c9ff9e52dc066514d908ae188a6f97 SHA512 b49e9005916636aff0a25b9158923ea9362b3edf1f42704d06e65b14892d0cdb6b1da7d620f10d752efb1ae1987a9187b0f642cc30d07de3fc961921e1794a87
DIST dogpile.cache-1.1.0.tar.gz 365988 BLAKE2B c21b52d23566a9d1b607374a77e2b7cc0ff0705d02cd3fddee1f6110555cf082fc9e516ba37e8ddaf7c70253dd28301cc89c3d3ef5405728859263e2a763608c SHA512 48627e4124bd25678059985c49ffde75d49d987c429d1e9a02ddd60a77b20e41899da30ae78e0f2891ff76a9c3d72a6ec782e829d659c3048cdbc921022ebb55
DIST dogpile.cache-1.1.1.tar.gz 366464 BLAKE2B 95887bd73cce4cc8b017cee43182d94efeacdaa91ce94907e18c0e9a762065abb334866bd592f5e2010eb07fd33a049e330b4b925a4c9d8e14e22dee5f802446 SHA512 86d5620c746e48fc596137cdba85d91fb65def9f9dd13f85bbe5d9411db257edfcf119b8787673aa37efb965ce2895063906c1518c8b432af8b0ac16cec7941b
-EBUILD dogpile-cache-1.0.2.ebuild 829 BLAKE2B fd2c2ac587c0fb5d577349d5b7bba933259630dcaff74b14ae8985ee0abea193ea746f0c0192ff6435ad9ae3dc06cf1bb677961097451db870e11bf8698f96b8 SHA512 e5159963083a826d1128c71a870a2587bb049de9392b2e1baf7da02e981c6de6bfa04347fec5d34b7a1b586cfb1b40e5770ea8f8bcf425e8ae865afca33c203a
-EBUILD dogpile-cache-1.1.0.ebuild 729 BLAKE2B f77e2effa36a5532d502f70b0d1adb0d32f8751a0199e4f11b73a2524810550727ba9142f37a362694efb39f14057bea743e5115ca60c575161ce586c4dc0c26 SHA512 8ed601c58d23eb61b77aa6a0f80f768d48347906df2f1851b4fef1f3a1a0949e3da2ffb6e80653eefa8a3de8437db7df48bef7fe72cc1b2b495f37bf8aff90b4
+EBUILD dogpile-cache-1.1.0.ebuild 726 BLAKE2B 94a98f15a1e87c3258165c6dd6b8b51fb09d9deaa14bba2dacfe78fcd60ccb34722d1a02a6e46656ba78999770c5cf91fb24d201075d90b30f42cbdbe1283347 SHA512 77698e77945ab4a0f06115952868110ae89e92c5188ab1cb5c85abed57c03bd8f7cc6c0d3b5cc75aa26d3c507c3a877537ace8b552abf4d2e432a0999cd5b6af
EBUILD dogpile-cache-1.1.1.ebuild 729 BLAKE2B f77e2effa36a5532d502f70b0d1adb0d32f8751a0199e4f11b73a2524810550727ba9142f37a362694efb39f14057bea743e5115ca60c575161ce586c4dc0c26 SHA512 8ed601c58d23eb61b77aa6a0f80f768d48347906df2f1851b4fef1f3a1a0949e3da2ffb6e80653eefa8a3de8437db7df48bef7fe72cc1b2b495f37bf8aff90b4
MISC metadata.xml 842 BLAKE2B 563cbf5028020e4afaf810c0b47b98c9e4c44cece6ca57575e91d76014f25892306bedf1812df08634001fc099d26e83288874e2f9274d09dc523d53775a9d46 SHA512 9640c0603ffeefe661427c6dda9fbb2c1633693beda0da39afcd2f8a2cbdb6206cae75228d692a1ae11352306aea3a9fdf602d0cde4324d21642825620e20176
diff --git a/dev-python/dogpile-cache/dogpile-cache-1.0.2.ebuild b/dev-python/dogpile-cache/dogpile-cache-1.0.2.ebuild
deleted file mode 100644
index e6e677bcd8fd..000000000000
--- a/dev-python/dogpile-cache/dogpile-cache-1.0.2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="A locking API for expiring values while a single thread generates a new value."
-HOMEPAGE="https://github.com/sqlalchemy/dogpile.cache"
-SRC_URI="mirror://pypi/${PN:0:1}/dogpile.cache/dogpile.cache-${PV}.tar.gz"
-S="${WORKDIR}/dogpile.cache-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86"
-
-RDEPEND="
- >=dev-python/decorator-4.0.0[${PYTHON_USEDEP}]
- >=dev-python/stevedore-3.0.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
- test? (
- dev-python/mock[${PYTHON_USEDEP}]
- dev-python/mako[${PYTHON_USEDEP}]
- )
-"
-
-PATCHES=(
- # https://github.com/sqlalchemy/dogpile.cache/pull/193
- "${FILESDIR}/${P}-pytest6.patch"
-)
-
-distutils_enable_tests pytest
diff --git a/dev-python/dogpile-cache/dogpile-cache-1.1.0.ebuild b/dev-python/dogpile-cache/dogpile-cache-1.1.0.ebuild
index b7c24a92cab6..3fa5327b33c9 100644
--- a/dev-python/dogpile-cache/dogpile-cache-1.1.0.ebuild
+++ b/dev-python/dogpile-cache/dogpile-cache-1.1.0.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/dogpile.cache-${PV}"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 x86"
RDEPEND="
>=dev-python/decorator-4.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/ebuildtester/Manifest b/dev-python/ebuildtester/Manifest
index 024183b1eafd..3da8f02b8f7a 100644
--- a/dev-python/ebuildtester/Manifest
+++ b/dev-python/ebuildtester/Manifest
@@ -1,4 +1,5 @@
AUX ebuildtester.bash-completion 538 BLAKE2B b56fd67648a73b184c6965c1377066bfded9e3adc795a06e8a753dd27784b9171589119cc8c4e26dd0b03def5c0fb6668f9ef960f7f93da34e33c996373b923f SHA512 21c413a8aa7ddaae5e11c4f279f9c6ffd700e8fc3f64c1df6cd07087d5cd0e6097e193a01bc266ec669dbb3d516e1e6361c3e1461e8ee07ecd7cd4fae05482f5
DIST ebuildtester-0.1.16.tar.gz 15564 BLAKE2B ae9c304fcdb9450c0b99eb75128d7e17790b87c541c87ef484a04eb1e74b18df44996e6a2d2ecfea11568f1e028d9279ac708bfa61978b4d8f176dd0183b8a69 SHA512 3e30894f6260b82a97e0000e65ab6a556c2055ab50ebbc7140b6716166b783574b87f333738d87e3ff11672f1b055df2acf483384e616e7bd9ffa42467c79743
+EBUILD ebuildtester-0.1.16-r1.ebuild 747 BLAKE2B cc1d333d49273d9292fbc02ee649a71ccffb6d662d4d7831465b62d8d6d0318e45e662938e2c14a0838da6fdaabcda8f4972d5591c5d0553f1783b18b6fa6a4a SHA512 c2ea990de8586f1ad4f2449ba130510583c0ba4caf2e83cf70faccbbe82ac3314a2f18254f4fc9f87b9021bca8bdac118ef1e20ae32ba10abb8838d947022e07
EBUILD ebuildtester-0.1.16.ebuild 734 BLAKE2B d62712f0542ac3965562ae984955d31d6836931a8ba836c86853f6460746d6fc933c1c2653c9a91077f3e9ddb7c337bfa4785baf07a15fe6d0e9c873dec42cd4 SHA512 8eb83494cb57be6e300c552d5dbf5a1d8ba1be613ea360bbb5f69f394891c7f11174436768385d1ade1a02f34ce15d3439fc9cd8beb2802fb49ab5529f6f2c0b
MISC metadata.xml 297 BLAKE2B 05f415213e45849ac677a97c4cff26321825063b9a1026150831a64fc0b164001c13c8d8ac34048acca005e188796ce05b7150d97951cc861962a21da07d1436 SHA512 fbc9cabab9c3d9f281384b2c937d13602811023027cc1a30f31ccc13b1cb45fb1f60754ac5b7626b865c20be0dfe928b1b8890388a7642e452a227f99e0617c7
diff --git a/dev-python/ebuildtester/ebuildtester-0.1.16-r1.ebuild b/dev-python/ebuildtester/ebuildtester-0.1.16-r1.ebuild
new file mode 100644
index 000000000000..d155bc3888b9
--- /dev/null
+++ b/dev-python/ebuildtester/ebuildtester-0.1.16-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit bash-completion-r1 distutils-r1
+
+DESCRIPTION="A dockerized approach to test a Gentoo package within a clean stage3 container"
+HOMEPAGE="https://ebuildtester.readthedocs.io/"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ app-emulation/docker
+ sys-fs/fuse
+"
+
+DEPEND="
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ dev-python/setuptools_scm[${PYTHON_USEDEP}]
+ dev-python/sphinx[${PYTHON_USEDEP}]
+"
+
+src_install() {
+ distutils-r1_src_install
+ newbashcomp "${FILESDIR}/${PN}.bash-completion" "${PN}"
+}
diff --git a/dev-python/ecdsa/Manifest b/dev-python/ecdsa/Manifest
index c4858a7af2c4..9bc02e20f7bd 100644
--- a/dev-python/ecdsa/Manifest
+++ b/dev-python/ecdsa/Manifest
@@ -1,5 +1,3 @@
-DIST ecdsa-0.16.0.tar.gz 125851 BLAKE2B d7fce3fdb0b6e37edb62482bdfc1df6b02f9fba677a6370dd3cb19f04be9cac62900d8347b318bf1d1e39b2af5672d0dde620dedf7b2ed6aefad3392df5279fa SHA512 94ccefe19899a5e56393bb0e6624e9af66bdc60ad370d65900a24a0465c430a3a001ed9c25970e48834cb25ca730bc9279af98d17ecd3ad66189c64c8f864b42
DIST ecdsa-0.16.1.tar.gz 126935 BLAKE2B 84e04c0afe076c009a88f7ef1a0193329e3d4945e34c752b869cbf449667c424341fae7da2e7c908b773c6f4ab495d29dd40aa3a9be35b0c03d315ac330dc3e0 SHA512 935416ff25a71b1e6fe442b11e8d2c1463b1652d539274e094112a4847c2c749ff58eb9f5ed108ed5613b7363d3f2b1c07ba3d01af8cfed4e1b4bec407d3f5a6
-EBUILD ecdsa-0.16.0-r1.ebuild 790 BLAKE2B 5501b38a6e966b6b75080c5bc6f6d0e226bedb3ac808473c90c75c3758343170820c52a8566456f1d8f0e6a9c882b6da79f285f37f61783492b67906ff0b964c SHA512 1ac84af5efd056876ae16db32eb6649a849d5e80597e44a3b75621f6bbecd15f09625657096c92a1e1b76d256be96986e2d72329a06b8da39539900963135b52
-EBUILD ecdsa-0.16.1.ebuild 798 BLAKE2B 01d84745af87e33f479ac728b06c4e0a2df0809143264c37a96a6699fc543f4db097418c43d5bd562a8da90d7a689e8397b13641c3194d1c88f0048b0964f7e9 SHA512 118ede2303a870d2b0d1f00159b8b6d7e5a1d0acdaeeaa39def140456e111fe36cc5576a5d2af7f0067d44bcf429aa17c5bcaf6d47f5721e5fa08622e198c676
-MISC metadata.xml 404 BLAKE2B ef1491349f83c10a28862359dcac0fabf0cd453c75c1ddcf8598e66782e30917be40798f9816a96f0862f89ea2ecf2f77744cb939da4212a6a9dfb9ffa223a1e SHA512 a609ab61800cb403d82a0e63d5b44e26b8ffcb984ef216ce894aaf3a532fd124ac012a764d1b76b7ea03f3202f736ec3eafea20277b00f99d43e2b6c2e2ce299
+EBUILD ecdsa-0.16.1.ebuild 794 BLAKE2B 4b767e77d9cdceadf2c1dd2e8c7239ea25258d6bb633e92988f1499c4a40ecb7269338203bfc38cc4652649280d55444c4c7d9a4fb2bf448161c323157301320 SHA512 691a95a7f53ab89b0d8592968858fa1dc1628f1e5480678c2e716dd9fe0864715cba0a10f31cbba5c932bfc511aa97870943d2546993a5c35c38b28c72587e9c
+MISC metadata.xml 407 BLAKE2B d98041dd8990a7022e91da42ede0427fef163b3ba1635c98e3c671a4962e5ad027797ec3b843ce3699f15b38b46b55d14544a85aed17c4826fc327edd73fe826 SHA512 24ee11b3314fa4d3da1e8f0d886290a9a7c1db776b32a618a702e72f0c1f9cd13cbfd64f7699cf3209ab90621a71aa9876ead8f916507dd9128ae03e169c3770
diff --git a/dev-python/ecdsa/ecdsa-0.16.0-r1.ebuild b/dev-python/ecdsa/ecdsa-0.16.0-r1.ebuild
deleted file mode 100644
index 4be8a067653c..000000000000
--- a/dev-python/ecdsa/ecdsa-0.16.0-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="ECDSA cryptographic signature library in pure Python"
-HOMEPAGE="https://github.com/warner/python-ecdsa"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint"
-
-RDEPEND="
- $(python_gen_cond_dep '
- dev-python/gmpy[${PYTHON_USEDEP}]
- ' 'python*')
- dev-python/six[${PYTHON_USEDEP}]"
-BDEPEND="
- test? (
- dev-python/hypothesis[${PYTHON_USEDEP}]
- dev-python/pluggy[${PYTHON_USEDEP}]
- dev-python/wheel[${PYTHON_USEDEP}]
- )"
-
-distutils_enable_tests pytest
diff --git a/dev-python/ecdsa/ecdsa-0.16.1.ebuild b/dev-python/ecdsa/ecdsa-0.16.1.ebuild
index 75ba4679814e..daa308058adc 100644
--- a/dev-python/ecdsa/ecdsa-0.16.1.ebuild
+++ b/dev-python/ecdsa/ecdsa-0.16.1.ebuild
@@ -8,12 +8,12 @@ PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
inherit distutils-r1
DESCRIPTION="ECDSA cryptographic signature library in pure Python"
-HOMEPAGE="https://github.com/warner/python-ecdsa"
+HOMEPAGE="https://github.com/tlsfuzzer/python-ecdsa/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint"
RDEPEND="
$(python_gen_cond_dep '
diff --git a/dev-python/ecdsa/metadata.xml b/dev-python/ecdsa/metadata.xml
index 890dedd644e4..3fd22a806f25 100644
--- a/dev-python/ecdsa/metadata.xml
+++ b/dev-python/ecdsa/metadata.xml
@@ -8,6 +8,6 @@
ecdsa
- warner/python-ecdsa
+ tlsfuzzer/python-ecdsa
diff --git a/dev-python/exdown/Manifest b/dev-python/exdown/Manifest
index 911c07d39afa..56fba8e8cb97 100644
--- a/dev-python/exdown/Manifest
+++ b/dev-python/exdown/Manifest
@@ -1,3 +1,3 @@
-DIST exdown-0.7.0.tar.gz 4592 BLAKE2B 00d53d19a44775a486b2f2133dfc7956e0dc724397e4c2729ab20123aea4841b4f450d28d89b5ee93a540b775099e70d1eb4a9917bec88be784d916518b06c0d SHA512 25c99e219d722ba1280119b7affd4bc83aa2e3b83ad60f74a7dca24c0f64a14acd3d4a0b116474cc4a3d3e4507c7b1300d9afecc14d2e3f400a5d4234334c5ee
-EBUILD exdown-0.7.0.ebuild 952 BLAKE2B 0f696fd01e8307bef9da0962b93e9f65ea4512b8a61c0b0feb0d14b23635ed51331733bfdb5d243b4c72a5a1c82f5f567473a6fbea460898504648740bb44c40 SHA512 26b511a610da0f6ae791496aa2f5f62da209953905ed7a589aaa1af88cd3381dc9264d78df2682e453812fd29ce66828f0dba1bb2c90f7fa2892ceb6af9a0e07
+DIST exdown-0.7.1.tar.gz 4863 BLAKE2B 819e66bed1028a98293a4f30ec6dc70a8360bd018821e332719793b4c72e60f0ec09391825ee0c6eb5f4e1132f1c22d48fe0dc19fe8c42253e92a833b7821340 SHA512 4cd0abc734850b5bf8b4531f4c690400d0f5fa6a9e6efbd3e20f75f646f0373f47a04a1655ac86d95a0d6d55019a174e0361d3bdda91bdb9197e8d64ffadcab6
+EBUILD exdown-0.7.1.ebuild 952 BLAKE2B 0f696fd01e8307bef9da0962b93e9f65ea4512b8a61c0b0feb0d14b23635ed51331733bfdb5d243b4c72a5a1c82f5f567473a6fbea460898504648740bb44c40 SHA512 26b511a610da0f6ae791496aa2f5f62da209953905ed7a589aaa1af88cd3381dc9264d78df2682e453812fd29ce66828f0dba1bb2c90f7fa2892ceb6af9a0e07
MISC metadata.xml 498 BLAKE2B 1e328e87490d3e8c0eb1e34e83ef44dcf557851459015d87433fd892b012dbe805952e0f0fdefa68004f2024c7dc0a957de53e1458fa496a5bceaaab907da2c8 SHA512 52f4040fc042bf37b4f8d4d802d021bfb85ed2f510c1dea8dd1d2aa33674eebe6c5c4d24110609d200ef4b59529dd7ac1be30d2442381b6b36f5d3f11445026d
diff --git a/dev-python/exdown/exdown-0.7.0.ebuild b/dev-python/exdown/exdown-0.7.1.ebuild
similarity index 100%
rename from dev-python/exdown/exdown-0.7.0.ebuild
rename to dev-python/exdown/exdown-0.7.1.ebuild
diff --git a/dev-python/fasteners/Manifest b/dev-python/fasteners/Manifest
index 81bcd91fa08c..88b73b09eb89 100644
--- a/dev-python/fasteners/Manifest
+++ b/dev-python/fasteners/Manifest
@@ -1,3 +1,5 @@
DIST fasteners-0.15.tar.gz 17898 BLAKE2B 58da6de627024f6b50d2f35caddfa126ee5d45ea89e16c5f14f7c42fa72e47ca9f98e1f46806b6f5e06401b25132e89113043806db1b13c2d0a095a09aa9aa69 SHA512 756f2ee8aa82ec6fd548d6e4320123b7c0bede834d4e58ff9031e004a8d9d0c23f7df4026ec4195799baa459720ca02d69a981a4aae54713e190a71152f2df9b
+DIST fasteners-0.16.tar.gz 24824 BLAKE2B 5072c1e0633bcf83ad71176dd7f9e2a2179ce4abdddee4bdcfa28f90d7f617759dc855e7fd91afb8b734d5b455d2597e748c169538780927e4d17c93e829453c SHA512 aac91be8f732bcda238c40317359c7faaad632b26473eff940fef0c6c2c227cd83942122c0ec26da236ca8c19d3024798590244ec761c2d2700ffdc7142533da
EBUILD fasteners-0.15.ebuild 614 BLAKE2B 8aca1a40bd8724948f5418c72998fc7c1479ad3e7422cb0fab7cb23b8e1128faa33e72b9a8be5a0a7968bf3e6e82ad3dd6d79cb3ab229e62116011d107155fb9 SHA512 f1ce8e3fc7c14fe1c3aad7805ba1677a7e5e44a3663611a83caf31f4a2812758a2d197d77f12f7fa6b10f8b13ae3aa4c3031dce04b2ce36725e66411aa9d51ee
+EBUILD fasteners-0.16.ebuild 662 BLAKE2B bb4bbbef98c2f0d60b9b37cf1f46612b03576664ccd70e00367eb28cf0ad858dc1b307ac1eb56b952ba5d646543dc3674ffdb57d08d13caa5108a81df784f34a SHA512 235b0dc5324bd7538c240591077e02d3096d826859f4468e086e54d59c06a2130ee5bb6905e57697322881e2cc7cbcb5605a8ac2972317c36ad0052ca7880cb6
MISC metadata.xml 509 BLAKE2B a2ecd43c854cb670cc29c9bb6e663a46d33334f3e2ff45963730712eac8eb7b9059445dc798a73f89eb2c9e66c5de1caf9b6f4193df5c0552e8176355a325e0e SHA512 f72b52a24f4693ba6d534aecf039a616be7bd5efc83dcc76c8eebaef95edd247192c784caa7b001224786071e5dd3dec59758be0717330a71c4afb7718bc68b1
diff --git a/dev-python/fasteners/fasteners-0.16.ebuild b/dev-python/fasteners/fasteners-0.16.ebuild
new file mode 100644
index 000000000000..ffeba310bb0b
--- /dev/null
+++ b/dev-python/fasteners/fasteners-0.16.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python package that provides useful locks"
+HOMEPAGE="https://github.com/harlowja/fasteners"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+
+RDEPEND="
+ >=dev-python/monotonic-0.1[${PYTHON_USEDEP}]
+ dev-python/six[${PYTHON_USEDEP}]"
+
+BDEPEND="
+ test? (
+ dev-python/more-itertools[${PYTHON_USEDEP}]
+ dev-python/testtools[${PYTHON_USEDEP}]
+ )"
+
+distutils_enable_tests unittest
diff --git a/dev-python/feedparser/Manifest b/dev-python/feedparser/Manifest
index dfbdc7d6785f..27bd99eab8ff 100644
--- a/dev-python/feedparser/Manifest
+++ b/dev-python/feedparser/Manifest
@@ -1,7 +1,7 @@
AUX feedparser-5.2.1-sgmllib.patch 2748 BLAKE2B c7b4ce987f0067020e996134379ff0d30b151fc64a85ddf8a66748d118d748cc3552c2a889e3621c90221c37d1adcf8668e2e417566a6059a4a272ce1c3323cd SHA512 3ef63206b043179f5a09cf1f3d5256aed1ae0c559b99fc0ec4c1de756dd678af8a7672673f864f72c8162705056fb0011ff19b39debfcbd0faf402804869f681
DIST feedparser-5.2.1.tar.gz 252956 BLAKE2B 182ebefa8a44276e758f277c203c28b274c580b667b039e4fc6ed9bd059b15e35e775e9efb784a97d712dc57e7b176ff91d6e094ddd225735f4315ffa770ae83 SHA512 1fd0c4324e2eff8ef4b15e3793c767290bca562af4a5056fdbdfa12411095530c87a113bb1b9757e532ff63aecb399b18f1e6b753884798eb6b8d3fdf575af81
DIST feedparser-6.0.2.tar.gz 251508 BLAKE2B e571bbd1a26ff06536ce3a134a5f91ff2cfc65ef7074ba7d1e17f4ed57ba19f8db395991b0a8137f9a7db931d4bda2a8a9157588ea5764ffde3bfd0616c71a35 SHA512 8ffcfb2934070ed6f0fc1a3b3d7c6a055c8c8e29dee8d56fa489832b71b94bc70dd8c8360061a103894ea9a80c6a91a6708da16999e36619092674ccfda36a75
-EBUILD feedparser-5.2.1-r1.ebuild 1139 BLAKE2B 0dead1db6bea5c34764ac2a4d8ec536781054356151960c0fc24867b10a7c8cf1ab15212c076657314965384b3084eafb50c79080a649e4e6d7dc968c5cc4c3a SHA512 b339b0153c17dd8cdaba383a15d4b7f8a1866f7aaaa89dff0e6b4729e13fa929bffb8f5f55a00ac1671d068f0366505dd8ae51e2eb97367978a18823a58bac19
+EBUILD feedparser-5.2.1-r1.ebuild 1131 BLAKE2B 3e7d9ee086f5c5871e8076b445e3d7954d90ccd832c0158cff4dd5d8b0069f729d1efa32f8d7789f7945af907a0843b5ddbfa47d9560e9ed26033c47f1797e62 SHA512 1369270bab97899853fcc7625b8867c0db6a9285c9955f4517154436ee2fa3c9176b55a9a8bf85a6fa1bb7ac8980db621cd97e10ac2f382ca15c249a3acc70aa
EBUILD feedparser-5.2.1.ebuild 1194 BLAKE2B 8fa165bdf23171244f6d0fb6fdf2cb296c06515296150cee3a871ad09c9825a476802d176935f7eb459d130f7c0c43a4a4774ac8d913004bc63c960db25dbb6b SHA512 90b24aa7ffd61794fa22a9d530f7ade3aec69cc8f330a9f1979f6ff302aa2a6c94b5897e0e05ae7671b86dbceea9b63f540e221bc3d739d366192ae45dee77a4
EBUILD feedparser-6.0.2.ebuild 893 BLAKE2B 21b4df6b21a24d54ae9c6392cdec404fb664dee11f365871670c78f066e82ca82a8f11462d4de3e9a92df31427887ebe19753696ee3ca561781c0ef78f3be721 SHA512 1dfec37a2a8be9a53f9abb94f8e80457f265371f4267449e724a6637e82b896e3319a1f905f8e94a1b7a35338b00abb29091c38f37532ee64b1551bfd3b0dd7e
MISC metadata.xml 467 BLAKE2B 99c83112b5515f5fd591bedf71882a7445b064cd44dc1e8f6fb2654d31582ad310cf796e36cdb8e093ea80a8546dc34fe263ae1a77e34f56db968f174c1e3e6d SHA512 80c5b4647324ece6c83e748e8eb41002403308f75397f643a95c8c9f7682074a66256d0bae04c6a4040ce6d0c3bec564d2496aec15647bf5447b49c8917f2db0
diff --git a/dev-python/feedparser/feedparser-5.2.1-r1.ebuild b/dev-python/feedparser/feedparser-5.2.1-r1.ebuild
index 40f815e4b539..6845512fe6c6 100644
--- a/dev-python/feedparser/feedparser-5.2.1-r1.ebuild
+++ b/dev-python/feedparser/feedparser-5.2.1-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
# sgmllib is licensed under PSF-2.
LICENSE="BSD-2 PSF-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
IUSE=""
# Tests have issues with chardet installed, and are just kind of buggy.
diff --git a/dev-python/fonttools/Manifest b/dev-python/fonttools/Manifest
index 8c8468e0688f..d1aaf7eb1fe2 100644
--- a/dev-python/fonttools/Manifest
+++ b/dev-python/fonttools/Manifest
@@ -1,5 +1,7 @@
DIST fonttools-4.1.0.tar.gz 2253792 BLAKE2B 470207d74404851aa111142ad8541d45820ded0212029867c289f2e7741d4b41b4ac824f65555a23d4f3dcc974428537cd319a8787bc4d80f2fb67561a21d1ee SHA512 3d9485cd34b5ea3dfdcc26474e0b21a96811b84eda16341c39165aea72bb09c3cf3360a069b316ae6575a399e26f6518c199180caec7bb959f245ced7ca45e3b
DIST fonttools-4.18.1.tar.gz 2498166 BLAKE2B 9ea9fd372c71883e37756c9b0b5bcd193782d49a99df37e7245f788362b284af8e5b9456c31b1c6b84fb6cccd8bce0339e95c87cecc008f0130e47a40c74bfe5 SHA512 d87c466e87ffa70bb15ee40f889b25e1187d51a1074b6e47a259d5984d51d7ce988ef50db91796fcbd06b5692b2c627d0a4cd76e3be6d0da348c0872ff01317c
+DIST fonttools-4.18.2.tar.gz 2499129 BLAKE2B 1ae93418121942e4303e4b138b192a30195d25c87e8c6204b508cc6a5b7a87608fcde7acbb6a2e8fb3c71ea59938827dabbe1556b7edad537523f6f0b3615696 SHA512 ceec3656c674ff5c43f4dc7cdf1468ddaf5c8bbe569d865fb015a9251ac089caedcf3dcea82c93a0c367576fcd7d65451642a6ab5d3093d941aa391b50070d53
EBUILD fonttools-4.1.0.ebuild 1356 BLAKE2B b062425fc7bc10c18c3c44e0d29c946f0ddda6e24d4345429039c60323e9b9501f192894eebdc8aae1d39c195bd34e8717e9e8fd9716c8cbc0817c697bd2f5a7 SHA512 317ba31531366edbfe474592594dd8c9dbaf19dda856f90dd3e37f4a5fcec214e6a2197a85193ffd962967aeca32dc675785632d927f170ac03c83851fd63e27
EBUILD fonttools-4.18.1.ebuild 1392 BLAKE2B 740f06cc15d4902bb0ddf431911eb2940a98b6c395cac21f9863670d43f4f9ac82fcd9ec473542ee773b1abc7a71f5e51497a8f9e68b17adec8b62d130312ded SHA512 2b6c51fd2aab0c4099359a6c621f18fe0fafdcaf35de9e933c0985d63a8295f5d768f854bb39cde3f25ee4379160816ca7d7cd3551cc43ba6a8ffdc8e239a6cf
+EBUILD fonttools-4.18.2.ebuild 1392 BLAKE2B 740f06cc15d4902bb0ddf431911eb2940a98b6c395cac21f9863670d43f4f9ac82fcd9ec473542ee773b1abc7a71f5e51497a8f9e68b17adec8b62d130312ded SHA512 2b6c51fd2aab0c4099359a6c621f18fe0fafdcaf35de9e933c0985d63a8295f5d768f854bb39cde3f25ee4379160816ca7d7cd3551cc43ba6a8ffdc8e239a6cf
MISC metadata.xml 494 BLAKE2B 2bc2e69cfab3a180d7098efccd9059c14e8eaf75fe29d26272952a7e65a383ae060444f64892cc3b2c185405d59c2cfea5f7fc2e3dbdb68bebf6568cbc4770b7 SHA512 cf381a45630a10358adc449689ce496da052a18e5257c3426c8e52f333a90f254278c2cf9a18770fe08fc7d60b5b50c48fc77bb3b36bf73fba282a3eb8ad5e71
diff --git a/dev-python/fonttools/fonttools-4.18.2.ebuild b/dev-python/fonttools/fonttools-4.18.2.ebuild
new file mode 100644
index 000000000000..c1277db3ff69
--- /dev/null
+++ b/dev-python/fonttools/fonttools-4.18.2.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..8} )
+PYTHON_REQ_USE="xml(+)"
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1 virtualx
+
+DESCRIPTION="Library for manipulating TrueType, OpenType, AFM and Type1 fonts"
+HOMEPAGE="https://github.com/fonttools/fonttools/"
+SRC_URI="https://github.com/fonttools/fonttools/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+RESTRICT="!test? ( test )"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+ test? (
+ >=dev-python/pytest-2.8[${PYTHON_USEDEP}]
+
+ >=dev-python/fs-2.4.9[${PYTHON_USEDEP}]
+ app-arch/brotli[python,${PYTHON_USEDEP}]
+ app-arch/zopfli
+ )"
+
+python_prepare_all() {
+ # When dev-python/pytest-shutil is installed, we get weird import errors.
+ # This is due to incomplete nesting in the Tests/ tree:
+ #
+ # Tests/feaLib/__init__.py
+ # Tests/ufoLib/__init__.py
+ # Tests/svgLib/path/__init__.py
+ # Tests/otlLib/__init__.py
+ # Tests/varLib/__init__.py
+ #
+ # This tree requires an __init__.py in Tests/svgLib/ too, bug #701148.
+ touch Tests/svgLib/__init__.py || die
+
+ distutils-r1_python_prepare_all
+}
+
+python_test() {
+ # virtualx used when matplotlib is installed causing plot module tests to run
+ virtx pytest -vv Tests fontTools
+}
diff --git a/dev-python/fsspec/Manifest b/dev-python/fsspec/Manifest
index ab301a6bc631..7bb435436271 100644
--- a/dev-python/fsspec/Manifest
+++ b/dev-python/fsspec/Manifest
@@ -1,3 +1,6 @@
+AUX fsspec-0.8.2-test-cleanup.patch 3768 BLAKE2B 7c6467294e9295a02b5a7d001314335c96b1dd415903917750427fa55b2c178fd3d363f9b5bd7b9f54bca70f8e944afdeddbe125ec8ef6b03fc61fecce02d92d SHA512 99bf76a51bc7e5294b6e93e1ad4509039aeb614b87ad7eaf0005993345f57b68019fb4d16546cc6fff56d47b20e2648dd550e7aefda132da6883ef49cd6255cd
DIST filesystem_spec-0.8.2.tar.gz 238399 BLAKE2B f64f153dd303bd3ec44e5010507704b5cbb50a89ad4a7a2e50b38b139219896be543bcff0fe0a99e06f015450f4b0334a641fabeeeb23583b14665ef8f089159 SHA512 e30badc56871ef20cf4b2ce0f6353b4125632d9e253f68d4b08535c9e1ac5fe428745315cee89a9536bfd1b308a28cc65fff555a7b9d9511225357bf790b9aac
-EBUILD fsspec-0.8.2.ebuild 1125 BLAKE2B 0bccc38c8897fb91ed9b92bdb2c93cbf9533697e8fb7e2f7da99eb8f035abe2aca6ff5fdaca6cf3f208a5b95890aff53ea29e2d0ca6f9efb870a050953806168 SHA512 e46654cdfb0d7f48534c2a1c1b555788e0dbb36792a04aa2e03ded236eeeeceb41d5c4b684dad38236d02e9aa4577686d8ae0cd49be8b902c8822e987cfe58df
+DIST filesystem_spec-0.8.5.tar.gz 255904 BLAKE2B df400276dbc53a453e9e9a00acb2e93a86a5f239237533bab036a16bd48d6d709f68241febe75f6f72281162ba4a563a087405a1064e18805ce2501095d778fb SHA512 20001fd02348f15e764a9e20eab98267f6746bd7e86187914d3db3098061aa62cb296595c3519696ae1e99ef896d49df0fcec846aaf6e5c281dd1a344ef6c393
+EBUILD fsspec-0.8.2.ebuild 1185 BLAKE2B df4ff4b6fdd2fb7176108fe9df4113a6d8ebad7cc4312429bfac5e3f94066c614b785decb8c77479aa6f32ef74216b04796e6f389e0932ca363a485c8359aab3 SHA512 ffe725a452595176cd0a6282e84046c612b8043935838a37e9e1a155df8995501e53c5b04424ed0f783eb5cb2e63d4c5f827b05c435a61be4314244054d387c2
+EBUILD fsspec-0.8.5.ebuild 1187 BLAKE2B 9c0ab02a29ed6787c18b81ffcef77f538f22ec9d46418c0d4fb7d0563afd3c8fb7cea52355c49cc9dea34121eb36609ecb01dff85199b0b7c351a1911646eb5a SHA512 9d60ea2220db8b7d1d6f0efcf4d404d9dd5c87c5c95e3e2bb48b2e3f0e2ea026415d97ce8726f71961bb47f3bb2f0b350165e6be6617b0851f135db3f7542a1d
MISC metadata.xml 373 BLAKE2B 8932a3ec06759eeef7bb91a181e07ceeef606995e944a6396d21ee6f9b26a7958e9c40f9f54ae27ebdfb9c7974b1ad79963213bb7a5b9bbb282cf35967a1ffe9 SHA512 42e44963570b3b003550ef6f60d1557866a72f362a3d98ca2a7900377422921134e4c8b7bcb6af3ea8bc061b433e4aba96de4fa5643a1f424cc64665a7efd654
diff --git a/dev-python/fsspec/files/fsspec-0.8.2-test-cleanup.patch b/dev-python/fsspec/files/fsspec-0.8.2-test-cleanup.patch
new file mode 100644
index 000000000000..8227c2d23c66
--- /dev/null
+++ b/dev-python/fsspec/files/fsspec-0.8.2-test-cleanup.patch
@@ -0,0 +1,80 @@
+From f933694238f78fbef91367d5051d515e0f9d0635 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?=
+Date: Wed, 16 Dec 2020 11:32:04 +0100
+Subject: [PATCH] clean up properly after test_git
+
+Restore original directory after test_git. Otherwise, next tests
+are run in non-existing directory and fail:
+
+[...]
+> cwd = os.getcwd()
+E FileNotFoundError: [Errno 2] No such file or directory
+
+/usr/lib/python3.9/site-packages/gunicorn/util.py:443: FileNotFoundError
+
+While at it, reflow the logic so that the temporary directory is always
+cleaned, even if the test fails in middle of setup.
+---
+ fsspec/implementations/tests/test_git.py | 42 +++++++++++++-----------
+ 1 file changed, 22 insertions(+), 20 deletions(-)
+
+diff --git a/fsspec/implementations/tests/test_git.py b/fsspec/implementations/tests/test_git.py
+index 562b228..4cd4c3f 100644
+--- a/fsspec/implementations/tests/test_git.py
++++ b/fsspec/implementations/tests/test_git.py
+@@ -10,30 +10,32 @@ pygit2 = pytest.importorskip("pygit2")
+
+ @pytest.fixture()
+ def repo():
++ orig_dir = os.getcwd()
+ d = tempfile.mkdtemp()
+- os.chdir(d)
+- subprocess.call("git init", shell=True, cwd=d)
+- subprocess.call("git init", shell=True, cwd=d)
+- subprocess.call('git config user.email "you@example.com"', shell=True, cwd=d)
+- subprocess.call('git config user.name "Your Name"', shell=True, cwd=d)
+- open(os.path.join(d, "file1"), "wb").write(b"data0")
+- subprocess.call("git add file1", shell=True, cwd=d)
+- subprocess.call('git commit -m "init"', shell=True, cwd=d)
+- sha = open(os.path.join(d, ".git/refs/heads/master"), "r").read().strip()
+- open(os.path.join(d, "file1"), "wb").write(b"data00")
+- subprocess.check_output('git commit -a -m "tagger"', shell=True, cwd=d)
+- subprocess.call('git tag -a thetag -m "make tag"', shell=True, cwd=d)
+- open(os.path.join(d, "file2"), "wb").write(b"data000")
+- subprocess.call("git add file2", shell=True)
+- subprocess.call('git commit -m "master tip"', shell=True, cwd=d)
+- subprocess.call("git checkout -b abranch", shell=True, cwd=d)
+- os.mkdir("inner")
+- open(os.path.join(d, "inner", "file1"), "wb").write(b"data3")
+- subprocess.call("git add inner/file1", shell=True, cwd=d)
+- subprocess.call('git commit -m "branch tip"', shell=True, cwd=d)
+ try:
++ os.chdir(d)
++ subprocess.call("git init", shell=True, cwd=d)
++ subprocess.call("git init", shell=True, cwd=d)
++ subprocess.call('git config user.email "you@example.com"', shell=True, cwd=d)
++ subprocess.call('git config user.name "Your Name"', shell=True, cwd=d)
++ open(os.path.join(d, "file1"), "wb").write(b"data0")
++ subprocess.call("git add file1", shell=True, cwd=d)
++ subprocess.call('git commit -m "init"', shell=True, cwd=d)
++ sha = open(os.path.join(d, ".git/refs/heads/master"), "r").read().strip()
++ open(os.path.join(d, "file1"), "wb").write(b"data00")
++ subprocess.check_output('git commit -a -m "tagger"', shell=True, cwd=d)
++ subprocess.call('git tag -a thetag -m "make tag"', shell=True, cwd=d)
++ open(os.path.join(d, "file2"), "wb").write(b"data000")
++ subprocess.call("git add file2", shell=True)
++ subprocess.call('git commit -m "master tip"', shell=True, cwd=d)
++ subprocess.call("git checkout -b abranch", shell=True, cwd=d)
++ os.mkdir("inner")
++ open(os.path.join(d, "inner", "file1"), "wb").write(b"data3")
++ subprocess.call("git add inner/file1", shell=True, cwd=d)
++ subprocess.call('git commit -m "branch tip"', shell=True, cwd=d)
+ yield d, sha
+ finally:
++ os.chdir(orig_dir)
+ shutil.rmtree(d)
+
+
+--
+2.29.2
+
diff --git a/dev-python/fsspec/fsspec-0.8.2.ebuild b/dev-python/fsspec/fsspec-0.8.2.ebuild
index fe649f0feac4..7e7f5fb6a323 100644
--- a/dev-python/fsspec/fsspec-0.8.2.ebuild
+++ b/dev-python/fsspec/fsspec-0.8.2.ebuild
@@ -31,6 +31,10 @@ BDEPEND="
distutils_enable_tests pytest
+PATCHES=(
+ "${FILESDIR}"/fsspec-0.8.2-test-cleanup.patch
+)
+
src_test() {
git config --global user.email "you@example.com" || die
git config --global user.name "Your Name" || die
diff --git a/dev-python/fsspec/fsspec-0.8.5.ebuild b/dev-python/fsspec/fsspec-0.8.5.ebuild
new file mode 100644
index 000000000000..42f59375ae3e
--- /dev/null
+++ b/dev-python/fsspec/fsspec-0.8.5.ebuild
@@ -0,0 +1,50 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+inherit distutils-r1
+
+MY_P=filesystem_spec-${PV}
+
+DESCRIPTION="A specification that python filesystems should adhere to"
+HOMEPAGE="https://github.com/intake/filesystem_spec/
+ https://pypi.org/project/fsspec/"
+SRC_URI="
+ https://github.com/intake/filesystem_spec/archive/${PV}.tar.gz
+ -> ${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+BDEPEND="
+ dev-python/versioneer[${PYTHON_USEDEP}]
+ test? (
+ dev-python/aiohttp[${PYTHON_USEDEP}]
+ dev-python/numpy[${PYTHON_USEDEP}]
+ dev-python/requests[${PYTHON_USEDEP}]
+ dev-vcs/git
+ )"
+
+distutils_enable_tests pytest
+
+PATCHES=(
+ "${FILESDIR}"/fsspec-0.8.2-test-cleanup.patch
+)
+
+src_test() {
+ git config --global user.email "you@example.com" || die
+ git config --global user.name "Your Name" || die
+ distutils-r1_src_test
+}
+
+python_test() {
+ # sftp and smb require server started via docker
+ pytest -vv \
+ --ignore fsspec/implementations/tests/test_sftp.py \
+ --ignore fsspec/implementations/tests/test_smb.py ||
+ die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/funcsigs/Manifest b/dev-python/funcsigs/Manifest
deleted file mode 100644
index 1498805e4742..000000000000
--- a/dev-python/funcsigs/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX funcsigs-1.0.2-fix-pypy3-tests.patch 3154 BLAKE2B face7accdd8bc2c5d3ab9dbcf9fa172695901768849d9278b0b384819b4c6ca3409f8dba3d9ce058f16e88f0696d1fd7dd6d3b7ba119989fb8b3e97fa0399635 SHA512 f4f93b2587fe2b0a41dda070d827f663785c367fcb3a181c0f461175ebeff47147907cc901954cb98cb7cce25754535663fbefe9227462fa2963d3ed572a852a
-DIST funcsigs-1.0.2.tar.gz 27947 BLAKE2B 3006d46018ae040b930e397c3f11575ae0ef18a8b2c9b6c10075804d83d23bea1fb81179de85180146673e0bd4c775a68c0ff624cdaceb1894efe5b2c8fd753c SHA512 4e583bb7081bb1d6c0fe5a6935ca03032d562b93ef5c11b51a72ce9e7ac12902451cc2233c7e6f70440629d88d8e6e9625965ee408100b80b0024f3a6204afda
-EBUILD funcsigs-1.0.2-r2.ebuild 947 BLAKE2B 0075a72270bc94a362384ced4411b9cce64b48ac6b3cd2953591a94357f017f11d5ed7ed09017a9170efa339e58da6f80185b86850331d55248457d6d5d301da SHA512 48bd5fc1d90c5733b69ecec148a940686c6e975ff5f59b76239d6f210e7a3c68f383fcff04f94f7638042602af00c76ae60907f155ac87c54aed976078668da0
-MISC metadata.xml 321 BLAKE2B 8aa6245455756e5d3a197dfb37bb706551ff8ea0c6beb047d0c59c54d2ed74853e6d9857d37a531a5313a7a85a0849f5e0b308a58fa98a3cce6040b5b91a1a80 SHA512 a3df23a85e33881f6ac0da0b0e33fd69de760c79e636574982606964134d303bfa219f429006a54ad71622c05c07b6eb233a1e8918f4703257b0e8c389acb6d8
diff --git a/dev-python/funcsigs/files/funcsigs-1.0.2-fix-pypy3-tests.patch b/dev-python/funcsigs/files/funcsigs-1.0.2-fix-pypy3-tests.patch
deleted file mode 100644
index f4ecec3b6137..000000000000
--- a/dev-python/funcsigs/files/funcsigs-1.0.2-fix-pypy3-tests.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-diff --git a/tests/test_inspect.py b/tests/test_inspect.py
-index 98d6592..3a2a1f2 100644
---- a/tests/test_inspect.py
-+++ b/tests/test_inspect.py
-@@ -8,6 +8,7 @@ import unittest2 as unittest
-
- import funcsigs as inspect
-
-+import platform
-
- class TestSignatureObject(unittest.TestCase):
- @staticmethod
-@@ -409,7 +410,7 @@ def test_signature_on_decorated(self):
- Ellipsis))
- """)
-
-- if sys.version_info[0] > 2:
-+ if sys.version_info[0] > 2 and platform.python_implementation() != "PyPy":
- exec("""
- def test_signature_on_class(self):
- class C:
-@@ -493,41 +494,44 @@ def test_signature_on_class(self):
- Ellipsis))
- """)
-
-- def test_signature_on_callable_objects(self):
-- class Foo(object):
-- def __call__(self, a):
-- pass
-+ if platform.python_implementation() != "PyPy":
-+ exec("""
-+def test_signature_on_callable_objects(self):
-+ class Foo(object):
-+ def __call__(self, a):
-+ pass
-
-- self.assertEqual(self.signature(Foo()),
-- ((('a', Ellipsis, Ellipsis, "positional_or_keyword"),),
-- Ellipsis))
-+ self.assertEqual(self.signature(Foo()),
-+ ((('a', Ellipsis, Ellipsis, "positional_or_keyword"),),
-+ Ellipsis))
-
-- class Spam(object):
-- pass
-- with self.assertRaisesRegex(TypeError, "is not a callable object"):
-- inspect.signature(Spam())
-+ class Spam(object):
-+ pass
-+ with self.assertRaisesRegex(TypeError, "is not a callable object"):
-+ inspect.signature(Spam())
-
-- class Bar(Spam, Foo):
-- pass
-+ class Bar(Spam, Foo):
-+ pass
-
-- self.assertEqual(self.signature(Bar()),
-- ((('a', Ellipsis, Ellipsis, "positional_or_keyword"),),
-- Ellipsis))
-+ self.assertEqual(self.signature(Bar()),
-+ ((('a', Ellipsis, Ellipsis, "positional_or_keyword"),),
-+ Ellipsis))
-
-- class ToFail(object):
-- __call__ = type
-- with self.assertRaisesRegex(ValueError, "not supported by signature"):
-- inspect.signature(ToFail())
-+ class ToFail(object):
-+ __call__ = type
-+ with self.assertRaisesRegex(ValueError, "not supported by signature"):
-+ inspect.signature(ToFail())
-
-- if sys.version_info[0] < 3:
-- return
-+ if sys.version_info[0] < 3:
-+ return
-
-- class Wrapped(object):
-- pass
-- Wrapped.__wrapped__ = lambda a: None
-- self.assertEqual(self.signature(Wrapped),
-- ((('a', Ellipsis, Ellipsis, "positional_or_keyword"),),
-- Ellipsis))
-+ class Wrapped(object):
-+ pass
-+ Wrapped.__wrapped__ = lambda a: None
-+ self.assertEqual(self.signature(Wrapped),
-+ ((('a', Ellipsis, Ellipsis, "positional_or_keyword"),),
-+ Ellipsis))
-+""")
-
- def test_signature_on_lambdas(self):
- self.assertEqual(self.signature((lambda a=10: a)),
diff --git a/dev-python/funcsigs/funcsigs-1.0.2-r2.ebuild b/dev-python/funcsigs/funcsigs-1.0.2-r2.ebuild
deleted file mode 100644
index 0a8b618ac413..000000000000
--- a/dev-python/funcsigs/funcsigs-1.0.2-r2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{3_6,3_7} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python function signatures backport from PEP362 for Python 2.7-3.5"
-HOMEPAGE="https://pypi.org/project/funcsigs/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="Apache-2.0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
- dev-python/setuptools[${PYTHON_USEDEP}]
- test? ( dev-python/unittest2[${PYTHON_USEDEP}] )"
-
-PATCHES=(
- # This patch disables some tests for pypy as they do not work as expected.
- # This has been reported upstream
- # https://github.com/testing-cabal/funcsigs/issues/10
- "${FILESDIR}/${P}-fix-pypy3-tests.patch"
-)
-
-python_test() {
- esetup.py test
-}
diff --git a/dev-python/funcsigs/metadata.xml b/dev-python/funcsigs/metadata.xml
deleted file mode 100644
index bb74f00502a5..000000000000
--- a/dev-python/funcsigs/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
- python@gentoo.org
- Python
-
-
- funcsigs
-
-
diff --git a/dev-python/gitdb2/Manifest b/dev-python/gitdb2/Manifest
deleted file mode 100644
index f53a36a1ddb0..000000000000
--- a/dev-python/gitdb2/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST gitdb2-2.0.3.tar.gz 392632 BLAKE2B c1313a8f571706cfb651dc114df98e85e385fbd7df40688386faf290cf177d282e6e3760ee43eb54d1562582755b6070a992f1f55a1821fef1e0e015f5cd09b0 SHA512 4be643b933b47f5511702aa9df5c3210847f059dff9a4794779040660cd60c5af7de5072eb18bc17971edba9a5551e9ba51dbe360194b7d454ee4f23348c8063
-EBUILD gitdb2-2.0.3.ebuild 1245 BLAKE2B 964e568f29720532d69e88c6a9457704af410fcf89dc3d71a411cda507f6a79e7b55e046fc0c7c6d72456b6edffb8bb29c9dc67f674394856008683650cb882b SHA512 13baf45bdc389fedf3338ac74807f3d883c45f85cc8f189bcfa97a8c58b9624f2bfb73f5e0c8b1f48458221ed7097d6e2ae4240ec32a29e7453497ed45eaaef0
-MISC metadata.xml 387 BLAKE2B a311347a5b3a03d6941a6607e6c1368ce24f4ee3238ce4ea33072fc0c3dba3e5037843f82f1456e722ce93e449d8678dba2432bdd90f6d62b1dbfffd435e7c29 SHA512 09f4154dd271adbf328fcc0ef35267b1c3648c919f6c5d3de480a815f5d5b49b4c4f6661f9f1839bede87834c01c2b27145c6295b8f99804aa45df3eba669eeb
diff --git a/dev-python/gitdb2/gitdb2-2.0.3.ebuild b/dev-python/gitdb2/gitdb2-2.0.3.ebuild
deleted file mode 100644
index c55332a897fd..000000000000
--- a/dev-python/gitdb2/gitdb2-2.0.3.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="GitDB is a pure-Python git object database"
-HOMEPAGE="
- https://github.com/gitpython-developers/gitdb
- https://pypi.org/project/gitdb2/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- !dev-python/gitdb[${PYTHON_USEDEP}]
- >=dev-python/smmap2-2.0.1[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
- test? (
- dev-python/nose[${PYTHON_USEDEP}]
- dev-vcs/git
- )"
-
-src_test() {
- local i
-
- mkdir "${T}"/repo || die
- cd "${T}"/repo || die
-
- for (( i = 0; i < 2500; ++i )); do
- echo "${i}" > file"${i}" || die
- done
-
- git init || die
- git config user.email "you@example.com" || die
- git config user.name "Your Name" || die
- git add -A || die
- git commit -q -m ".." || die
- git clone --bare "${T}"/repo "${T}"/repo.git || die
- cd "${S}" || die
-
- distutils-r1_src_test
-}
-
-python_test() {
- #TRAVIS=1 disables performance tests which rely on the gitdb repo
- local -x TRAVIS=1
- local -x GITDB_TEST_GIT_REPO_BASE="${T}"/repo.git
- nosetests -v || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/gitdb2/metadata.xml b/dev-python/gitdb2/metadata.xml
deleted file mode 100644
index 005b63ca8056..000000000000
--- a/dev-python/gitdb2/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
- python@gentoo.org
- Python
-
-
- gitdb2
- gitpython-developers/gitdb
-
-
diff --git a/dev-python/graphviz/Manifest b/dev-python/graphviz/Manifest
index 93c0107404bf..81156a1781ec 100644
--- a/dev-python/graphviz/Manifest
+++ b/dev-python/graphviz/Manifest
@@ -1,5 +1,5 @@
DIST graphviz-0.14.2.zip 184157 BLAKE2B 668c200964867f416e2b15454793fdd0673a110461a85764699727b0430c812e18fb4285e031f5f611ff86bd205cbf927c695015d55ac169a594e616ab74067a SHA512 a8bcf395ebed7c43f5355bc167aae157c6eddb127860a6fb58eba0d882235e04a33a5bcf589245f484e3af9dce5eff8a5893ced73203901c92afd92c4f5b05be
DIST graphviz-0.15.zip 183103 BLAKE2B 81d4a121ca2654e6c08570ede7a1f5ef580b6a281358bf32f4178898fc12cfae21b10ce8f4f6fba4644e3275162cc09dbf5ae287a114fb8503be98d6a2fbf728 SHA512 c2a77f0d52595a70b4f8ccd906907453b59622560f0ff84e267e874f5a1dc9a4b721192d236b0519ee7ec85bae9b225b9919ae51bcf599c93bd5816934afd6cc
EBUILD graphviz-0.14.2.ebuild 712 BLAKE2B c109d4ff4e571328c7b88cf59727a82b22c14a0ffe499fa04be225a1f3f5b5714956831d297e775f049c324ca02464c4cb9d04171c5440a160f10620432cfc7a SHA512 baead7390ecb362bb8c6c488d4e1d895104fb893134b99b3a1df3fb5a58d3367e70476c26385ef09149bbaaf8a9f3fee380ec1742c12a7fe3488edefcc9741c5
-EBUILD graphviz-0.15.ebuild 714 BLAKE2B b729944979869343730ea20ce1fcc9536a714c0f7deca2b75bc5a156ac865972e2dc656e220f6eb339e4aec4942c4e4f9df5b7fcadf555e0c031d47dac83b288 SHA512 d8a4b832aea3751e214b82aed64c9fd6a185123f4e2a519d57b3baf6a7f57abbba11898a0c86e3a7c728afab0b0a58b1b3728d05a907d8115b02256c8183978e
+EBUILD graphviz-0.15.ebuild 744 BLAKE2B 4dfc7763153a86876674262908e7bc74d1dde08a97c4aebd214cdefc4b63f4d264994cacfbcbf6fa26c044783921e5f8708e3d0ce996c6827e46bdac5a2feee7 SHA512 7db71c37408aa5c67d8153e64d7ca26cf7f9e4c4c193c49441633f102c8489933ac2cb600124fae91785a958ba57140f929a5f174cad16bb386bbb3ee8e08a33
MISC metadata.xml 552 BLAKE2B e5a314fb4006a3081b0f54b84bb35243dc1e56e6cf19b8500dc683a02e48b687c8a086785fc1aadefb6301aa7112467820c1697b141010b96ee9504213d21a61 SHA512 d8513afc41a59f83476e98b296e6150d159096939645afc964d48a95dd36e6add4b2cda9a2ef2a5034050616c5c08d6c6222f71a0a0e0f83250f2be570c1c990
diff --git a/dev-python/graphviz/graphviz-0.15.ebuild b/dev-python/graphviz/graphviz-0.15.ebuild
index 3700d1003cf8..4af9d661d0e2 100644
--- a/dev-python/graphviz/graphviz-0.15.ebuild
+++ b/dev-python/graphviz/graphviz-0.15.ebuild
@@ -21,6 +21,7 @@ BDEPEND="
test? ( ${RDEPEND}
>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
>=dev-python/pytest-mock-1.8[${PYTHON_USEDEP}]
+ media-gfx/graphviz[gts,pdf]
)
"
diff --git a/dev-python/imagesize/Manifest b/dev-python/imagesize/Manifest
index d738c3c48e8f..4ba0dba65d71 100644
--- a/dev-python/imagesize/Manifest
+++ b/dev-python/imagesize/Manifest
@@ -1,5 +1,3 @@
-DIST imagesize-1.1.0.tar.gz 1275201 BLAKE2B 32169ccbfee5080d98b7304a2eb7c437d223a9e538281bd0a9ae1e35f5defb71d1abb7e6307057f7e41d199eda402ee91a2a91eb3d9f74cb8fb1df5c4c966072 SHA512 11af71a5120decb88450d1bc7609e25e560e448fcaef72c273690ffe3ad06856e6a172e20738a8dd5650efe1ba8d599e797692eb5cae2b7d74a71f1f55438a03
DIST imagesize-1.2.0.tar.gz 1274955 BLAKE2B 20293418635362f7360d2f02299f9392a96ca09773c97dd8eed38ca424008fa9d71139bbaf8d61e0daf5dbc90f3c46af9ee60d26e9fb1c2479eb8875ebcb7305 SHA512 c82a7fe433064c3a60ed664bad8ce4e602c527bcf2f7c9ab9be6ed650654626d9e0907028b2b0c5a484712bc989335b2b4f66494c8d445f5043ed4c2bc519700
-EBUILD imagesize-1.1.0.ebuild 520 BLAKE2B 1e50acd5071497d6c6c3ca758833778f341402b5960f518eb95425422462cb1ea8bcddf94515d5fb41375d2dbef1832b1e53fbb7b4a0b10ec43e28e059f4c8bb SHA512 e63fcb9d95299fbe5a0f0531defdf3e60d0b72cb26851ae27e4d8fe3713bfd2ccef33c9db8fe0a44a80363b2a059bc1b7f327e7c70fc2c0e22894907df52a868
-EBUILD imagesize-1.2.0.ebuild 529 BLAKE2B 66f61bd8ec557351699908f6945a47e7f05de45a9bad725f387573099daf0a2c65690098a8f0dff72d5d20ac9f7be6178c17dbbb5ac88d59f0b0833ac845ec19 SHA512 52cd673a70558355b159fde8937116732600eb6c62e3975429c3a0660a9d5d83aedc596368209c03a5134b4da0ba1b80a4eab06028fea8be91c46a7fc5510fc6
-MISC metadata.xml 434 BLAKE2B 946bd353c48c258821176debdb575437e538092c2b0d618355ed90883cb5b6e91a6de1f9f842c0c6df002e69ed6bf37bf9a087ab4fab4c57ca36bb918f67d723 SHA512 3c4d3637bad987db6e9c46a46d51cf59cef4e067b5bc6b6e47ab5da5f257db8dc67c35c0f52f7f4ec0522acb527beaacd22bddc6c47282be6e1552bdac5003eb
+EBUILD imagesize-1.2.0.ebuild 520 BLAKE2B 1e50acd5071497d6c6c3ca758833778f341402b5960f518eb95425422462cb1ea8bcddf94515d5fb41375d2dbef1832b1e53fbb7b4a0b10ec43e28e059f4c8bb SHA512 e63fcb9d95299fbe5a0f0531defdf3e60d0b72cb26851ae27e4d8fe3713bfd2ccef33c9db8fe0a44a80363b2a059bc1b7f327e7c70fc2c0e22894907df52a868
+MISC metadata.xml 459 BLAKE2B 5ed30d61f2b70d64d2dbaa60ebbb559e33bb9232e9119a8ff13c6aae6a5f4df361d2c497ad35570a9bcb1352d48e30623196c3758b2fc46e7b5327c2b0ef1eb5 SHA512 9073715f3624d37bf197b005d1998b96d05c0b876e29c3b4ab12aec5fef0a3739e78ffa0c45f4ace103a491f0a691f94624dca6256a5761b62abf6c828d420b2
diff --git a/dev-python/imagesize/imagesize-1.1.0.ebuild b/dev-python/imagesize/imagesize-1.1.0.ebuild
deleted file mode 100644
index 5ed08c4afb86..000000000000
--- a/dev-python/imagesize/imagesize-1.1.0.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{6..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Pure Python module for getting image size from png/jpeg/jpeg2000/gif files"
-HOMEPAGE="https://github.com/shibukawa/imagesize_py"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-solaris"
-
-distutils_enable_tests pytest
diff --git a/dev-python/imagesize/imagesize-1.2.0.ebuild b/dev-python/imagesize/imagesize-1.2.0.ebuild
index 68932c9e9297..5ed08c4afb86 100644
--- a/dev-python/imagesize/imagesize-1.2.0.ebuild
+++ b/dev-python/imagesize/imagesize-1.2.0.ebuild
@@ -13,6 +13,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-solaris"
distutils_enable_tests pytest
diff --git a/dev-python/imagesize/metadata.xml b/dev-python/imagesize/metadata.xml
index 5a1a7480cf2a..c4bbd550eece 100644
--- a/dev-python/imagesize/metadata.xml
+++ b/dev-python/imagesize/metadata.xml
@@ -4,6 +4,7 @@
python@gentoo.org
+
imagesize
shibukawa/imagesize_py
diff --git a/dev-python/isort/Manifest b/dev-python/isort/Manifest
index d66c2573f055..05c7e2635006 100644
--- a/dev-python/isort/Manifest
+++ b/dev-python/isort/Manifest
@@ -4,5 +4,5 @@ DIST isort-4.3.21_p2.tar.gz 158539 BLAKE2B 316703ca754c939e4af0db4a1060fb13a5164
DIST isort-5.6.3.tar.gz 161712 BLAKE2B ffbc2977016807d2bd5b1644377efad021af2ad27fd0e27feae1e5dfdfd112c7b5bf4b296ebf47ea6bfcbfe7f56cf3bfa8e1e7cf03963935660e678223397afb SHA512 fa2d9be306d03fc802aab3915bee2c41f4fe0c28353d9d99aa6604755e1602027cd81afca92b4302f80497c88a9dcb2701ec02ca55a5f9a2866669a68368d957
EBUILD isort-4.3.15.ebuild 447 BLAKE2B 05640fd2f8789ab7457e0081519c72d6998623a61d6f5c8c6e2a7d2b7c7928949a578f283723d89c6a63f08e7d81670fba6f9be2905a033bab32a23dbcd35955 SHA512 b719b23a49a47897d115d38448ec3ca32a1f3e762113ac2f7b1e0493413afa2127599ff0282eec818ad914b15c9093055657870ac7e4d329a53428fe4087acce
EBUILD isort-4.3.21_p2-r1.ebuild 789 BLAKE2B 555ce31eb81a5cc99196fb73c98472368f191aa3614bde3ecd9d06c5c9b7956d1d4211b0a08c2f626c8d7a24c8ad346e427b074884d9960a620dd7a49204fa2e SHA512 eb8e7ba2fe0b40a90bdab8b06a8ea71655c6bf2d84ce2119780cce907ffb09c4d3d50d9813e0390b98ec14603072c3307342e66fb72a494b578dd98aad8be57f
-EBUILD isort-5.6.3.ebuild 1669 BLAKE2B f3be16ba2614503915dc355caf0083a4ce349747840e011eba353582179286f700f6984e150ad3bcac6d294ac5d56e30f9ae8f20af489beaec014b55fbd4f0b2 SHA512 10e17791a219d62393d33ce53dafd0f2ebbfddda97f51409db8346c6b78f62301f8ab3e1356fab1109dc353f66ee365b8cf36393f898ebdb3a833ce12097aefb
+EBUILD isort-5.6.3.ebuild 1676 BLAKE2B 2817f632deb43f2029d4137329cb523643754bc0def41fd15d093a205b102028d483cc3892065b65dd494284b09ec55c7c03d2522aae05234860438d72fe76aa SHA512 4777ba69ad9611c00b13d85fa72eb0a1e0992cb959a01be4953d1ce103f198444604273623a22912d4310ac40c12b7d07ae9638c499a072a67c70ec542e984fc
MISC metadata.xml 573 BLAKE2B 025e9dc210ba42b2d385c75897d233aec2fa2810b5a2699339d1f33da94a8b5057001af48fe68af1a1c0a201c1ef73971433498e7f8c72cafaf306b51af17375 SHA512 369e47a3727a5c48720f9275ee6dd6b3dc5ee2fa05391da8bcb256d4c35af8a76bf33149a63eeae2a7259f59632f6cd56f32910ab10d652752c481609429238f
diff --git a/dev-python/isort/isort-5.6.3.ebuild b/dev-python/isort/isort-5.6.3.ebuild
index 5a17b30f6087..87d950a5c148 100644
--- a/dev-python/isort/isort-5.6.3.ebuild
+++ b/dev-python/isort/isort-5.6.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~x86 ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos"
BDEPEND="
test? (
diff --git a/dev-python/keep/Manifest b/dev-python/keep/Manifest
index b7076a59809f..3c4f549c7675 100644
--- a/dev-python/keep/Manifest
+++ b/dev-python/keep/Manifest
@@ -1,3 +1,3 @@
DIST keep-2.10.tar.gz 12959 BLAKE2B a6c7c507f3e6f905fcc4878909cfaa56c767266499a12fa12b6850a1dfade3b33d5ade1d2f53b69ecc0480816b496c75250742672fd1a9de14c747abeae7f3df SHA512 a72901e1f66d756626ceca1550b0e539e4c9f56ebb80d96f87696482420b7f75e07d06eded538acf8866e0d1e65e83da00a23ed328a4e37a6f82a607bd5c3bfc
-EBUILD keep-2.10.ebuild 625 BLAKE2B 695a288aae0642378e092ca5223014e676b3a4650242e6abd620a992a74a152cd56a5c8d8b1f6e5b3c2e55b52c1048df75d6df12b24463751fb155fd0c6b1d2e SHA512 5ce5923cb482f1242b77e6c28d682ebd2536cf85440cdbfb9e29c200bccb186ba888cd8c6f8f75aa260a9a1a5446a26d1cb31d959b676f140a67e81e09b36611
-MISC metadata.xml 343 BLAKE2B e768980bdf2f3b10c05892c41970b1a763cd7e4c4c405267496653beac320170bfa52c90798e6b4961245e22fe96802d3ea06acb3401400c920b162496b4de21 SHA512 55420d5e10ee9b5da9f15ab6faea642041d7a040410d3c1cd399d2ed8b0346948f3c45639cd38e5956c452cae00e530a85e4d71713785572e93506b61d3af67d
+EBUILD keep-2.10.ebuild 624 BLAKE2B d64e604a3feaa7f7441d02afa9d1a9e3241beb7f00921944088459a14dc81af6feac7c960e02e40e7b6226bc9a9f149252a4c472d38185d975c2b0c693cac4d7 SHA512 b9cd6774ef98a17f43c22394ef5d65f95f6367db674f3b34c2308968a0ec9f235f5041fb83b07411deb2f229732dc8726335473470a021472b5dc22a9d483ca1
+MISC metadata.xml 367 BLAKE2B 3cba0cfbd2305906c338a057e45e14275d6120d9f004016c6eea9d5b08e5e01cdb4527340bad20f3117f7a175f139e257ed5223d8f1464ad3b8d2ea8a527dc23 SHA512 823f4e5967d83aff2dfc677a4ce92a019fea8c3c2354c461bfbe0d97714c32db4c023f929c9a49b311433734148664616f66721da90d6ab6ae9957484506a823
diff --git a/dev-python/keep/keep-2.10.ebuild b/dev-python/keep/keep-2.10.ebuild
index 4017856890fa..0d9fe3384522 100644
--- a/dev-python/keep/keep-2.10.ebuild
+++ b/dev-python/keep/keep-2.10.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
IUSE=""
RDEPEND="
diff --git a/dev-python/keep/metadata.xml b/dev-python/keep/metadata.xml
index b54a40074238..52f276c864cd 100644
--- a/dev-python/keep/metadata.xml
+++ b/dev-python/keep/metadata.xml
@@ -4,6 +4,7 @@
kensington@gentoo.org
+
keep
orkohunter/keep
diff --git a/dev-python/libtmux/Manifest b/dev-python/libtmux/Manifest
index 5a3f2833ccbe..ed4c0c56c40a 100644
--- a/dev-python/libtmux/Manifest
+++ b/dev-python/libtmux/Manifest
@@ -2,4 +2,4 @@ DIST libtmux-v0.8.3.tar.gz 131928 BLAKE2B 7979dc907d5c7805cf56422aa0fed554c89f0b
DIST libtmux-v0.8.5.tar.gz 222445 BLAKE2B 5af148555eb89c66bdc66f3f214967f7e901d9b86ea85e02a9fba64f2eb3559828519ba8120eaee5eb86ec75bee2e599a08384dd096de8dc0969129c58172c1e SHA512 d456725c3ca41a672ee5239bfb5f42a262674638d308fa141627995be8b8fe348bb8713b735eb05c5a3cc73f35fe3f6fac12024f6254c950a3048b2e07606363
EBUILD libtmux-0.8.3.ebuild 904 BLAKE2B 8bfe4291e9a5f72b367ac75810efb7558d4f5daef054a702da55597f0e5f0a08962d9cbb281779770c30f061a52bd03a7d77073aedd51e67624b4b0d166d6b11 SHA512 bb462d811dc4af3658e37f109f88790d2e0dc2fbde1d5b6e4414b783ac10a5a85b62f5585cd6225bf639eebdf2a664a4f505b902360e68b3d670b26c53545106
EBUILD libtmux-0.8.5.ebuild 899 BLAKE2B 3aa62cc70d968e171b733c71ae82309c9977001f068da947639a164f10fb5f2ba733d502b77fe3c12b386071da39e25596395e63377d524e1fc1f5bd6b0cafe0 SHA512 547279cfe76093d7a729541189319bbbe80e74663c3effafb753fa4ef954496e84b9cf7d69305f7dcc9ddd741b74ef319ac06e0e667a3ce090e3b6d754fbd5cb
-MISC metadata.xml 319 BLAKE2B 9a43d483758dc4878ed0f0bcb6dfcfcc310ba7bbc62b0c081bd6c885b3072c7e008ef8996343507f1b5c9bd06e6e9e78ea30486abaa7c21a0f068cd6f6ad9da3 SHA512 3a03561417ce6c530cc3b05eabba72d8f4625e7fc56a330f62023a388137485c156f52684cdf1815da66dd526b9ff6c5704f4ed9c1c2ad3d2a9679846084485d
+MISC metadata.xml 343 BLAKE2B 66c3f5a64242dfaf69b7828e9e90de5eb93bd1d95a008cd41b748fe768280678f7be3d9e930690be44fa7f639de589074f056ec4d39bb882fdfff9dbc76f3558 SHA512 897920796a56516a2cd2455e689b364cf92080b65a3f7c0f8b40b56e2f4c1c693a29cd6eca755ff51e3b1b57a8be1136a5648f1ed8857933d6e7e20628eece5e
diff --git a/dev-python/libtmux/metadata.xml b/dev-python/libtmux/metadata.xml
index f8886f632e52..4ee013217330 100644
--- a/dev-python/libtmux/metadata.xml
+++ b/dev-python/libtmux/metadata.xml
@@ -5,6 +5,7 @@
chutzpah@gentoo.org
Patrick McLean
+
libtmux
diff --git a/dev-python/lxml/Manifest b/dev-python/lxml/Manifest
index b433c2427ea4..85812daca0c7 100644
--- a/dev-python/lxml/Manifest
+++ b/dev-python/lxml/Manifest
@@ -2,5 +2,6 @@ AUX lxml-4.6.0-tests-pypy.patch 17417 BLAKE2B fb4c8452f1401c5d617ebbb3a944772c4d
DIST lxml-4.6.1.tar.gz 946461 BLAKE2B b1ea8e15af1130b9f9683614bbc2480ec5008ad697f70536a332c1faf4bda4aa9525b2ef5d82d32c415c91e47ab54c7b3cb644e9a2933517946c3fc8ab7ec7c5 SHA512 3cc917e7535ac1be3db8939f72846313267c8b1f0adccc92a2155a160ed7299d0def718bdae1379e42398ca1b959b1130505597febca00f02cb87c8666f1f1c3
DIST lxml-4.6.2.tar.gz 948652 BLAKE2B df6ec7e183df48c0edc6cce0fbdd6ab78eb8d1b7e8fb81a76bd9f4a24f05923c757d5b21f508be9be50c7bb187927c4e3a66146d480f2d40efc05388d26d3bf5 SHA512 81dcf5cade7b05c0e831beae7cdfbdb21e876fa55b23da98b89cbfa7960a4737efc13346ea3ade22a2448f20e036173cf5e32d43df6656c3231bfba07981f9ed
EBUILD lxml-4.6.1.ebuild 2237 BLAKE2B fb05a57bbe17e7fa4f6f0e0aeb666ceadf4cbc3654ef331f3548cc5916900a3692d3eb748a0284ab053d91e6691a568d703b96c9a446b035413d617b9bc6608a SHA512 5bb200f0e1759dd660fe9fed714add77fef4c883eb804f40b0fd623f3c2de5d394b0dded79f39a78f5942872a1168cceda43690635cd764317eda196deec8fb6
+EBUILD lxml-4.6.2-r1.ebuild 2779 BLAKE2B fccc0cbd59579b228229530d236003ddea37d0bb5bd2d9a759d1568d5e6c5d57154edaefd5ebcd5f9b5994297deabd9c3dec763e4f3fa98b9b38ac66951c20b4 SHA512 dc6a5d865867ba81fdec01856d74e981170ed57e7ab1a1f82afd7d8c434abed81daebca1b319225abc26794cba271add708381d7523612f9baf0f1ab501fc8c3
EBUILD lxml-4.6.2.ebuild 2237 BLAKE2B fb05a57bbe17e7fa4f6f0e0aeb666ceadf4cbc3654ef331f3548cc5916900a3692d3eb748a0284ab053d91e6691a568d703b96c9a446b035413d617b9bc6608a SHA512 5bb200f0e1759dd660fe9fed714add77fef4c883eb804f40b0fd623f3c2de5d394b0dded79f39a78f5942872a1168cceda43690635cd764317eda196deec8fb6
MISC metadata.xml 356 BLAKE2B 2fec6d393695217c863df74503bb69c58a24e9fe8bee31f68ae9f4bf5bc290fce6fdb80389f2694f4b94f9b8c4fba6c5c90faf2a68cae21a01b105c5a99c9640 SHA512 36358d7b4791b190fd5e168aac89cb32581e056b417ecfdd04c3e9b83a9c90f2ae3ab89d2a671f2a5c09f39198264ee9c59f3fb587dc907185dcfa376fbea04f
diff --git a/dev-python/lxml/lxml-4.6.2-r1.ebuild b/dev-python/lxml/lxml-4.6.2-r1.ebuild
new file mode 100644
index 000000000000..4a5b6c3b8df7
--- /dev/null
+++ b/dev-python/lxml/lxml-4.6.2-r1.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
+
+inherit distutils-r1 optfeature toolchain-funcs
+
+DESCRIPTION="A Pythonic binding for the libxml2 and libxslt libraries"
+HOMEPAGE="https://lxml.de/ https://pypi.org/project/lxml/ https://github.com/lxml/lxml"
+SRC_URI="https://github.com/lxml/lxml/archive/${P}.tar.gz"
+S=${WORKDIR}/lxml-${P}
+
+LICENSE="BSD ElementTree GPL-2 PSF-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc examples +threads test"
+RESTRICT="!test? ( test )"
+
+# Note: lib{xml2,xslt} are used as C libraries, not Python modules.
+RDEPEND="
+ >=dev-libs/libxml2-2.9.5
+ >=dev-libs/libxslt-1.1.28"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ virtual/pkgconfig
+ dev-python/cython[${PYTHON_USEDEP}]
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ doc? (
+ $(python_gen_any_dep '
+ dev-python/docutils[${PYTHON_USEDEP}]
+ dev-python/pygments[${PYTHON_USEDEP}]
+ dev-python/sphinx[${PYTHON_USEDEP}]
+ dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
+ ')
+ )
+ test? ( dev-python/cssselect[${PYTHON_USEDEP}] )
+ "
+
+DISTUTILS_IN_SOURCE_BUILD=1
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-4.6.0-tests-pypy.patch
+)
+
+python_check_deps() {
+ use doc || return 0
+ has_version "dev-python/docutils[${PYTHON_USEDEP}]" &&
+ has_version "dev-python/pygments[${PYTHON_USEDEP}]" &&
+ has_version "dev-python/sphinx[${PYTHON_USEDEP}]" &&
+ has_version "dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]"
+}
+
+python_prepare_all() {
+ # avoid replacing PYTHONPATH in tests.
+ sed -i -e '/sys\.path/d' test.py || die
+
+ # don't use some random SDK on Darwin
+ sed -i -e '/_ldflags =/s/=.*isysroot.*darwin.*None/= None/' \
+ setupinfo.py || die
+
+ distutils-r1_python_prepare_all
+}
+
+python_compile() {
+ if ! python_is_python3; then
+ local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
+ fi
+ tc-export PKG_CONFIG
+ distutils-r1_python_compile
+}
+
+python_compile_all() {
+ use doc && emake html
+}
+
+python_test() {
+ cp -r -l src/lxml/tests "${BUILD_DIR}"/lib/lxml/ || die
+ cp -r -l src/lxml/html/tests "${BUILD_DIR}"/lib/lxml/html/ || die
+ ln -s "${S}"/doc "${BUILD_DIR}"/ || die
+
+ "${EPYTHON}" test.py -vv --all-levels -p || die "Test ${test} fails with ${EPYTHON}"
+}
+
+python_install_all() {
+ if use doc; then
+ local DOCS=( README.rst *.txt doc/*.txt )
+ local HTML_DOCS=( doc/html/. )
+ fi
+ if use examples; then
+ dodoc -r samples
+ fi
+
+ distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+ optfeature "Support for BeautifulSoup as a parser backend" dev-python/beautifulsoup
+ optfeature "Translates CSS selectors to XPath 1.0 expressions" dev-python/cssselect
+}
diff --git a/dev-python/miniupnpc/Manifest b/dev-python/miniupnpc/Manifest
index a9e68283555b..c8434bbaa6da 100644
--- a/dev-python/miniupnpc/Manifest
+++ b/dev-python/miniupnpc/Manifest
@@ -4,5 +4,5 @@ DIST miniupnpc-2.1.20201016.tar.gz.sig 543 BLAKE2B b8ddcadb58e7b8dc4646ea1ac4e10
DIST miniupnpc-2.2.0.tar.gz 98348 BLAKE2B 3464dc7f0b5416b558d0dd49121f3b851d9808a516c19d4f99fdb205e20149f27ef495d9f8da09ad3a28656580bfc16d1cf99ef993e41e9600cfe427b4a776d2 SHA512 b5bb674f162cae3d9e0205a9cdf6acc1fb334ab8ac5330be924411a8fd46833fb916d09f947d1e40d05224df7df1ecf6d812037185690e5022287c2024eb183f
DIST miniupnpc-2.2.0.tar.gz.sig 543 BLAKE2B c75dbc54debc77e63ea3534f8f424a3904131893fc31d6485163ee6ecdafdab02fc0db8e290d28c834ac0efc5a37c34cbca7f14e1c78f859d22abc4e0b2ae48f SHA512 54f8cccea5886e06fbdaa04d270c12bd95d219be0b275491d9168f1089b1efe96e8a6f30ebf428091a3bae4bc349c0b8c94a22e94d56845a0a8b9724b1f9f74d
EBUILD miniupnpc-2.1.20201016.ebuild 906 BLAKE2B 7719aef18f2ed3829e8005d67c6e6b3c381cf6de6c5012c5a2ca1a543057bb6a21aadafb04708a45814a28675582bbc0fa0fe899c1ac3c2fd0d1d5ced4d712ac SHA512 ca4c2772c17e29910d8cb90c2b5c9f611a395645f813b4daf81ea3cc8448e357c8082c669fc4500d67f92c35a998f5eced9defde665db117b2bc6e096069bbbb
-EBUILD miniupnpc-2.2.0.ebuild 910 BLAKE2B 590fca42dd99e1160c081fb36605cd9b4a8ae36c75b2e4bc90c9314524c0f8323ca129c3eb098f439f2f37476e8b89f7efa08ac93df568a83870cae12a6d9e25 SHA512 f0c00f3509b5e5479dd964282bbdcb960def37519725acc65a8d1f3da178970465299d87def8602d4290eae481a466df93107758e3234494c05addf34a230b43
+EBUILD miniupnpc-2.2.0.ebuild 909 BLAKE2B 8a31ea7664206646d32b328cd4816035165174385a87e1605226cd2739c97c49e6bdb299d94b2dc1cb8fc03812f19add9ee8fea2ed0b1e1e8662ca5ee0a96bdf SHA512 461f1c8e7c5ec9622ec1a8464dfaca6dbecf355628613a5efd2238aaf0e14b3b8b39f577be2768256ec0cb8ac9e06c7d4dd027474c6587bfb38abe8d79e08a26
MISC metadata.xml 319 BLAKE2B 7f3ef8f9588fa7c1f464aa78a5edc9b8d43d3d163ea0f1172b2f9bf2305e3cf0b92b60ac6c9155ace330c646f9ac9fe36e0e6829ce06508fbcb9a76e0483f032 SHA512 4d2f45df1390d755a9539ab1e94542b234df04ab89549be6d3f9e9cefb43985cd2d4506bce76db1a6b64d0eb8f43ac1f6c3f093ef27d004b001b16c02594c875
diff --git a/dev-python/miniupnpc/miniupnpc-2.2.0.ebuild b/dev-python/miniupnpc/miniupnpc-2.2.0.ebuild
index c64ff7be3356..fa7233e6e37a 100644
--- a/dev-python/miniupnpc/miniupnpc-2.2.0.ebuild
+++ b/dev-python/miniupnpc/miniupnpc-2.2.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ppc ~ppc64 ~x86"
IUSE=""
RDEPEND=">=net-libs/miniupnpc-${PV}:0="
diff --git a/dev-python/mongoengine/Manifest b/dev-python/mongoengine/Manifest
index 9677dee5dbff..d31a126739ed 100644
--- a/dev-python/mongoengine/Manifest
+++ b/dev-python/mongoengine/Manifest
@@ -1,5 +1,9 @@
DIST mongoengine-0.20.0.tar.gz 311698 BLAKE2B 11bae8d342a77bcc241884beb92d67a6d4f7112d0af3a467196eb94233b003aa27d019ab346140ce7430b4019879c8c86e01f3067677254559243b6d1f0ddc80 SHA512 ef973af9893f6e53811e1a47a131989f5a057af04ab9d512059f968af89fcd23f05d910c7de03330b5f4771db8e11ea2e48060f95ed790f8d238df6c6f7b9306
DIST mongoengine-0.21.0.tar.gz 320173 BLAKE2B 6c53c8dd967209039a3c2b6e279e6a27cf7073a6284b0df70aff25004c8499e88088d934eadf2e23dc3f43cd2ebc0d3c202cfbee618772b8a794a6ef933a9a75 SHA512 37642e9c9333fb4480262e916d678ef04a1f839b62e7d58528485b7df7cb9b22d3cb0b093084fcb92e331698c7d5bf2411df5d0c6e6b9324748189b9084c3f54
+DIST mongoengine-0.22.0.tar.gz 319893 BLAKE2B dc58cad3a93b5c391012fcbc7f0f9cc372bae970847c629bbe6dd158b8d6d9b032b26c118a7931f51f6754333fdbd890904699417076a84ff295233e33daa48c SHA512 293cf0124c18d4c67ecd70e129ab51a0a29a919fecddffbf24619275012534d7c5cb7ee97a65d933654cd582554a276772dc933b1fba357ddac8d3a295f4fda8
+DIST mongoengine-0.22.1.tar.gz 321227 BLAKE2B 933850eb85623a33b1f8e124b6c8375a9e0448c39f5cf44a3aa5b281746933043873d6ac32997121b15c611b9c1a50a1194fa8f364bae3009339d50f5ca98bb8 SHA512 a5188e854aede8feddc01c2d7cbaedd0af4faf5ac03d28f8df9d6dd2f7ae58d9de81eb9d4f3bb02daafb85b7fdf8d54ba38994af07bb338af2b27940cc3413ed
EBUILD mongoengine-0.20.0.ebuild 1497 BLAKE2B 0282934e3d29ee3944cb62e5de1cf7a26e64f3b08325c80fac6459a47c3740689f431051837789ed75ebf4d93c3c39f730aa512ddb5b1aa8ddc5aa1ab435c87b SHA512 62fccab4b550fc85724528571b476f5c901ca6cf86725914d416b5ed4ec7726d8c576d73fb3bc8051c805e2dd92d3da345933f5aaa0367a6eb7a9bd0a0c35c5a
EBUILD mongoengine-0.21.0.ebuild 1499 BLAKE2B e7e1f7991a765cd0e39accac336cc42484953a90f8ac8b0ac351b434d41610f301ee09e5076421ecb04ca21cf8329ac2edc2dcdcfcab2b2a4a56509f9f8c9e4a SHA512 03ec2d70d29d93b827f17cc7742184d6be0b76cf53ec3036772a39cdb8e7374bd5f949920411a653e12345e6c85cda3b4504ae02ef7cefe8023c74293951da4b
+EBUILD mongoengine-0.22.0.ebuild 1347 BLAKE2B a2b6783d3cb5c3516a9f9ac2cedfb2482b4a8dcea86da8308a6e8cad5b75af9a73d263e4becf6c5a057ea6cf3136376844f56ceb3fa053348ae95969c3ba8b81 SHA512 dfa3f9e9ca2c2b1e47707ce44974d928ffb29f3f8a56cad3f4070976420cae259293119616add7015f353d08af7266c7052fa887cbd2ceae8fc5e8d54243284f
+EBUILD mongoengine-0.22.1.ebuild 1347 BLAKE2B a2b6783d3cb5c3516a9f9ac2cedfb2482b4a8dcea86da8308a6e8cad5b75af9a73d263e4becf6c5a057ea6cf3136376844f56ceb3fa053348ae95969c3ba8b81 SHA512 dfa3f9e9ca2c2b1e47707ce44974d928ffb29f3f8a56cad3f4070976420cae259293119616add7015f353d08af7266c7052fa887cbd2ceae8fc5e8d54243284f
MISC metadata.xml 377 BLAKE2B 737ab5a0b7b3a591a55f04554e53f1f88396ea8e75f9025bcfee270be90e049f8c18e8d4fbd5e667dedba8634b4d0ac8582377b10fa96899ae69f71f3346bbc0 SHA512 60f782b55ccf2a21a5b92af459c6feb04d859bb74cc257be820fdd9bbd4adfb989daf8ca64fcc965b9f7f2f1798be109fdfb78c5e2d1f6a291beed497aba4f8f
diff --git a/dev-python/mongoengine/mongoengine-0.22.0.ebuild b/dev-python/mongoengine/mongoengine-0.22.0.ebuild
new file mode 100644
index 000000000000..bcf7043f3db3
--- /dev/null
+++ b/dev-python/mongoengine/mongoengine-0.22.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+inherit distutils-r1
+
+DESCRIPTION="A Python Object-Document-Mapper for working with MongoDB"
+HOMEPAGE="https://github.com/MongoEngine/mongoengine/"
+SRC_URI="https://github.com/MongoEngine/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+# TODO: make it run a local database server
+RESTRICT="test"
+
+RDEPEND="dev-python/blinker[${PYTHON_USEDEP}]
+ dev-python/pillow[${PYTHON_USEDEP}]
+ dev-python/pymongo[${PYTHON_USEDEP}]"
+BDEPEND="
+ test? ( dev-python/mongomock[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+ # TODO: investigate
+ sed -e 's:test_covered_index:_&:' \
+ -i tests/document/test_indexes.py || die
+ # no $eval
+ sed -e 's:test_exec_js_field_sub:_&:' \
+ -e 's:test_exec_js_query:_&:' \
+ -e 's:test_item_frequencies_normalize:_&:' \
+ -e 's:test_item_frequencies_with_0_values:_&:' \
+ -e 's:test_item_frequencies_with_False_values:_&:' \
+ -e 's:test_item_frequencies_with_null_embedded:_&:' \
+ -i tests/queryset/test_queryset.py || die
+ # TODO: investigate (wrong order? bad comparison?)
+ sed -e 's:test_distinct_ListField_EmbeddedDocumentField:_&:' \
+ -i tests/queryset/test_queryset.py || die
+
+ distutils-r1_src_prepare
+}
diff --git a/dev-python/mongoengine/mongoengine-0.22.1.ebuild b/dev-python/mongoengine/mongoengine-0.22.1.ebuild
new file mode 100644
index 000000000000..bcf7043f3db3
--- /dev/null
+++ b/dev-python/mongoengine/mongoengine-0.22.1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+inherit distutils-r1
+
+DESCRIPTION="A Python Object-Document-Mapper for working with MongoDB"
+HOMEPAGE="https://github.com/MongoEngine/mongoengine/"
+SRC_URI="https://github.com/MongoEngine/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+# TODO: make it run a local database server
+RESTRICT="test"
+
+RDEPEND="dev-python/blinker[${PYTHON_USEDEP}]
+ dev-python/pillow[${PYTHON_USEDEP}]
+ dev-python/pymongo[${PYTHON_USEDEP}]"
+BDEPEND="
+ test? ( dev-python/mongomock[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+ # TODO: investigate
+ sed -e 's:test_covered_index:_&:' \
+ -i tests/document/test_indexes.py || die
+ # no $eval
+ sed -e 's:test_exec_js_field_sub:_&:' \
+ -e 's:test_exec_js_query:_&:' \
+ -e 's:test_item_frequencies_normalize:_&:' \
+ -e 's:test_item_frequencies_with_0_values:_&:' \
+ -e 's:test_item_frequencies_with_False_values:_&:' \
+ -e 's:test_item_frequencies_with_null_embedded:_&:' \
+ -i tests/queryset/test_queryset.py || die
+ # TODO: investigate (wrong order? bad comparison?)
+ sed -e 's:test_distinct_ListField_EmbeddedDocumentField:_&:' \
+ -i tests/queryset/test_queryset.py || die
+
+ distutils-r1_src_prepare
+}
diff --git a/dev-python/mss/Manifest b/dev-python/mss/Manifest
index daf0f61fb639..d4983efe0afe 100644
--- a/dev-python/mss/Manifest
+++ b/dev-python/mss/Manifest
@@ -1,3 +1,5 @@
DIST mss-6.0.0.tar.gz 90010 BLAKE2B 0e4f0a2dbd720d83c496dc3fe618a2fa8057c378426a5b758ccaa931a819a354732d6ec6d220ec02292d08ddc111bbccf89676f32bd124ba084dbf5e4d1287ed SHA512 751fda0fd988ff14e80d7a8bb35c3ae9101a85f4e37dc297b6fc8ac23f7484faf19b07424081183157c7617c95a41f31f74f2dee0ff3bcc8d6bf1a699732af6d
+DIST mss-6.1.0.tar.gz 90421 BLAKE2B c99bc7a1950215402cc4fe3b512951a723fa1f5ffd8ab747fc29ed8d4e51f786ef84b69e3ef2238d7cf9d6ebb5765dcdb4d1d3cc3e9a2caf66cd658fa6753f5f SHA512 2b84fec6e162480cb608c0ff605f528f3122c8397a81bb0cb6cf9223cdf097a633ea2e29a95925297439dc038a0be4cc628d3455827a8548cb3d8e62cd68d9d7
EBUILD mss-6.0.0.ebuild 763 BLAKE2B 36e6e807fc17be6e38c4b9f54fb4de534787d76db17f074eb748ca7823a10fdbbb869b376f5349b65005f2a14b3831031661b3d4f680ac7b2e0d8716ac0795df SHA512 5f88720683c5988908b763742c88df4e67ecea223a9dd8ba6cafa2ab5f0ffcb62df77fc22c36116b8709f922380826072d21bf18621fc66789f46a7c9994e7c4
+EBUILD mss-6.1.0.ebuild 765 BLAKE2B 52bb296f532f5f536e415b008f8a58fcdb757e21550c1db04bd91386add1aa85bb6f950ab25591aaf766b9b267007d016cb832407105e7a3028f1bccf5524d6f SHA512 0960f09cd79912b4c4c678b157a1eba4031e53f96d7fa2b5e7de22a15f2c5f4c9b8a0e43f03fee0a7dcde466fca89e817c4c85f3125bcf135c1e742e3b747923
MISC metadata.xml 441 BLAKE2B 4d0da1440a36048c62588619ad04edc4a3229d7a36d68907f73c26abf1a989d082475b2773fa5647f73316cac6450d7af5e2511db98daeac177236e891f3f150 SHA512 d8b7b52688c123eff1038d6b7f612d05ff7eb06af37588d73474eddb225c3feb88832d1b2a1102dcd5d1a2207a766961b228610c80cd61e72f4feaee80d1310f
diff --git a/dev-python/mss/mss-6.1.0.ebuild b/dev-python/mss/mss-6.1.0.ebuild
new file mode 100644
index 000000000000..28a7a6fe0acc
--- /dev/null
+++ b/dev-python/mss/mss-6.1.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1 virtualx
+
+DESCRIPTION="An ultra fast cross-platform multiple screenshots module in python using ctypes"
+HOMEPAGE="https://github.com/BoboTiG/python-mss"
+SRC_URI="https://github.com/BoboTiG/python-mss/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+S="${WORKDIR}/python-${PN}-${PV}"
+
+BDEPEND="test? (
+ dev-python/flaky[${PYTHON_USEDEP}]
+ dev-python/wheel[${PYTHON_USEDEP}]
+ sys-process/lsof
+)"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs/source dev-python/sphinx_rtd_theme
+
+python_test() {
+ virtx pytest -vv
+}
diff --git a/dev-python/mypy/Manifest b/dev-python/mypy/Manifest
index 6a6f4bfb344d..27ead1a37200 100644
--- a/dev-python/mypy/Manifest
+++ b/dev-python/mypy/Manifest
@@ -6,5 +6,5 @@ DIST mypy-0.782.tar.gz 2529814 BLAKE2B c75771fb40524c2c8675236eaaddd6e39d13b4fd4
DIST mypy-0.790.tar.gz 2082487 BLAKE2B f8efcb701b4b7533306948721968c9a01ab6c6e56ec99fe6c36e35aca50b52f29f518aee2268a628539a372b8024094ef2d4d87da580b4dd667f41133351596e SHA512 be670456bb64cd197bb6a73832b7e0fd6439ae4af128212328a41cd93d9f644a82e79ffb05bf4695e99bd9788244a24916bf765cf30a6f162cf3b471f45c25b8
DIST mypy-typeshed-5be9c91.tar.gz 583006 BLAKE2B 08ab2b6d479ccc66493524482051e825c65c0a94ea5cac8e56a8ea1dca85eda6104e4ed3188b7d5ce1ea99058019d66a21a7e270e3ad9df694be67ea1e6a7ce9 SHA512 2912bcf66e0f550941eb9c1f34979644857448a4bec478cfc0d662e9a401ade93ccfb2f57b5348504b4d6f0f23e576da609167f1ec3a0861414fc9c7dea80243
EBUILD mypy-0.782.ebuild 1732 BLAKE2B 421a685a5fb0be2387eee68c456deec4f5192758005d50692a1dcf0eb99a07aefed0a042edc7c8463de571b72031f87773b3531c9a1a9033655acee54bffdbf1 SHA512 b56841be9080cdce87d8bd8b8ccac677dc0bf67a50e6390d6ea894ef2c528563f692d4cf278d78c6d7a1eec0daa198d7f3a05486d3067942009555302d6732d5
-EBUILD mypy-0.790.ebuild 2408 BLAKE2B 59eb841aa110a345b41cae5a6e50ec2b37067c4c8b16120c1fa303dacb3cabf141499bbd330568a51853c291c9dddb5bf988e9427b0a82aa8c6769d184f4dc3d SHA512 7bda31f31997f13d9fcb72a23595d855d53d92ca2869b3a0fa0a59af082e0e05ab319724979dbcae75b765827d3f281b941d5b7f189b6a79bff3449dcf56b9c7
+EBUILD mypy-0.790.ebuild 2415 BLAKE2B 5d8d03ba3d8c6c25d7f15a80b4d649d19e49010573f699ee39b9aa035ddcb0906e31b1a3460c6c75555669aba57503b7c1e8100b78f10072ffbb0273366631dd SHA512 ae355d32730312405ecea54fd99adb7b481b20bb96e7f93383e22bd4233701384815c3fd8e8fec8627375c808baff56bbedc11a5a4d87704853080bb1b63fe0c
MISC metadata.xml 586 BLAKE2B a75692d2b46a9bac5362c4a5111de861297ae5829654d14fa7eaeaaad8eee2ab784017e073423a0e4c8dc845f035884de80c72c73921c01d5fec5b05c3a71c2c SHA512 79916a4aa04010ce67ad08386f0b7e03dfdc6fc0a6195b376c4cd1207ccc408b275efbb3338313db467e3b8fef7abaf93445dc92defa8b9043e497216e0f1045
diff --git a/dev-python/mypy/mypy-0.790.ebuild b/dev-python/mypy/mypy-0.790.ebuild
index 47ab71ae5e49..a597b5917118 100644
--- a/dev-python/mypy/mypy-0.790.ebuild
+++ b/dev-python/mypy/mypy-0.790.ebuild
@@ -22,7 +22,7 @@ SRC_URI="
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
# stubgen collides with this package: https://bugs.gentoo.org/585594
RDEPEND="
diff --git a/dev-python/numpy/Manifest b/dev-python/numpy/Manifest
index 9546e268d61c..f797445d26a8 100644
--- a/dev-python/numpy/Manifest
+++ b/dev-python/numpy/Manifest
@@ -11,5 +11,5 @@ EBUILD numpy-1.19.0.ebuild 3726 BLAKE2B b7ff98d3782d037656a810490a46f8d6a1f9ffa4
EBUILD numpy-1.19.1.ebuild 3734 BLAKE2B 39e3d88c8f374fc7c6a3bfaaf71c33ffe711891e6bfab8074ee7bf65d39bcc71b1452397f770c56bd4adbe84ba994c5ae14e52eb0b7b3c89b06623eb271c3184 SHA512 7468e68b5e4c1e0a85566a1ecfab03127a06998b34a548202cc78be181219c90dde824a150293464d942ee6a8051d67815c7b968ccf9f4f351198ef20852a561
EBUILD numpy-1.19.2.ebuild 3734 BLAKE2B 516cb3fcdd3d26da409ef8bf3522f8638ecaf4e02fff6025311d3fe874f114e95cfb88a0b167c4058d214aea6d805ea6b914d574e2af90b859901b94dd109832 SHA512 4e77f799e2600998180438b6cc6f7f3a224f5b342f78cab23bce5abee59b36f16e9646829a3ef9f3bce7daec6eaf8a07625369924b87dd4829cd0f7b60f26e9e
EBUILD numpy-1.19.3.ebuild 3734 BLAKE2B 4b9b8959e74734c345637f661bd3b92bf05cd2c189cdb62867a1c535803e6081087d54f4287f8c678fb93ecbf392412d0f812f88c5cdca40eb00401945aa1b6c SHA512 5d09662fbfe7da320b3da3b39863f6f71383dc02b68aa20248fc377946757755e023b94ae267ee10c2e63dfd4e9bf03711a88c0b2f127ae4ed58fe6b70c412c7
-EBUILD numpy-1.19.4.ebuild 3736 BLAKE2B 0e594d617cc0c35831bf759debc03d3b0a865f7687badd41fe354b346e763a42b5158550bbb673a77baeb589be71f7a355f9b13f111881312f94c30bb11296e5 SHA512 15fd71fb0db0e5de1d10b09993079dd0572f282797014eaf844f03523c3c7f8e02d5564e7c0a31ada31106edde1e002fb7534d38257956dd3a34ef8e7fc6ed35
+EBUILD numpy-1.19.4.ebuild 3735 BLAKE2B 92e140e6010ebc0b866082b0da267c4ccdd2e6c824895fd70669adf866e7779457a977d74fa54972f113fcbd9fcbec0e538ef59f04afc5ade1ed44d4766334c4 SHA512 70e637310264d4d34db4084fbe508286acd233c72d59ae51aad6d9a9a1f27e4cfb61ae61457cff4cb3e639143fb6f33e7119b67644d4fc758d0b2381312e4136
MISC metadata.xml 876 BLAKE2B 5e257d6ea3c59c5819d854db7b7db3ebff53b5c87b5ce9348786085f09db12aa6fc8fa86393b9e6c06760ac0d9f36a52fdfb1865c9d1d9ad5526d74d3d53e8b1 SHA512 d35d0954ff8f21e370edeab3ce3e5ab501bf216c93399e807ede6f1910ba0ea41359425bf894d813a39442fb92a724fe83ec8a5c64e6bd97de9422f67700d549
diff --git a/dev-python/numpy/numpy-1.19.4.ebuild b/dev-python/numpy/numpy-1.19.4.ebuild
index e18320d1bf13..7dab416db9a1 100644
--- a/dev-python/numpy/numpy-1.19.4.ebuild
+++ b/dev-python/numpy/numpy-1.19.4.ebuild
@@ -24,7 +24,7 @@ SRC_URI="
)"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="doc lapack"
RDEPEND="
diff --git a/dev-python/opt-einsum/Manifest b/dev-python/opt-einsum/Manifest
index 31feebf31573..98e9a8cf9aed 100644
--- a/dev-python/opt-einsum/Manifest
+++ b/dev-python/opt-einsum/Manifest
@@ -1,5 +1,3 @@
-DIST opt_einsum-3.0.1.tar.gz 66204 BLAKE2B a8d2d1246e890d24ea73d129ed1ee99e8fbbca30771c96a48858acb5af5eac93bc73b9e8f1c5f1ece6e0872277de1f01fd1d0f7d27e044fa5f9de09060792565 SHA512 d6c2b95d17f523680e3f849ad2b0a4c36e7102e0540fddee365446bfddad4a26be2aed19060570ac0d1db42ccde8e15f0e7e4c066b9117024a58f8cc8978508a
DIST opt_einsum-3.3.0.tar.gz 73951 BLAKE2B c8e39c9589bb6b89150fd5699fafd77c5ac6022f66d1b778a55dd61e606067be4b6df85972dd4078df084e34a39463f5e59d69426b0ed9152e93f93798417eea SHA512 f34c58bd3aa4a15794cfc604167c0e3175b9826da2a2449bb48ea5c3095f8215e3f990daec51e77e505a03204201694df1a09360ee51b8a4a793b9844d9c2d5e
-EBUILD opt-einsum-3.0.1-r1.ebuild 465 BLAKE2B 2370a26e5968781a186cbf59671c0c25cacf3d6b0004f353a30d2fc7e46f7fe7b27cb924b587d22fd71dd51f0450da0519ce0fd327bc8be4f116945751e1136c SHA512 31f2702770b73ffa9d6ee3ce758e5f130d3816a8b11cc8ba73112ddb3a0482c20638bf18ff86f4308452ae45661cbc25157f5d951268f8ac7d49531a9c4c4c53
-EBUILD opt-einsum-3.3.0.ebuild 467 BLAKE2B a66a47c4c1c0dca4fb5ba352a272b3914362e667a5b4e844ef2dee5d4f346dc6f9e26e044ad83ef762840ce7167a05e7e4696b90696de680601765d566256129 SHA512 9a22177c4fc787d795d9590c3fc95f28f6997c1aa0dfe95a3be51318af8d1c807e6d2bba8b3647b4accbc2bd4cfca5a985cf3973a222823f9a44ccada61d20d0
+EBUILD opt-einsum-3.3.0.ebuild 465 BLAKE2B 2370a26e5968781a186cbf59671c0c25cacf3d6b0004f353a30d2fc7e46f7fe7b27cb924b587d22fd71dd51f0450da0519ce0fd327bc8be4f116945751e1136c SHA512 31f2702770b73ffa9d6ee3ce758e5f130d3816a8b11cc8ba73112ddb3a0482c20638bf18ff86f4308452ae45661cbc25157f5d951268f8ac7d49531a9c4c4c53
MISC metadata.xml 470 BLAKE2B 7dd0dfa92800286393d304a888994092cd7b3b673f84f2a542edd166e02c65f91f3248248f05f6cb5b4ac0bc34b557c55db50d4c1fbfdd1483c49b7b1c5db011 SHA512 090fd5fd8157e7118c60700974c6fc94736a23d529572de49ee57679d2dfe5091358e940e5ed34846d5bc6dd236363ec07800d7d12813342c388ce726cda7d58
diff --git a/dev-python/opt-einsum/opt-einsum-3.0.1-r1.ebuild b/dev-python/opt-einsum/opt-einsum-3.0.1-r1.ebuild
deleted file mode 100644
index 43682d8b0fdc..000000000000
--- a/dev-python/opt-einsum/opt-einsum-3.0.1-r1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-inherit distutils-r1
-
-DESCRIPTION="Optimized Einsum: A tensor contraction order optimizer"
-HOMEPAGE="https://pypi.org/project/opt-einsum/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P/-/_}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-S="${WORKDIR}/${P/-/_}"
-
-BDEPEND="dev-python/numpy[${PYTHON_USEDEP}]"
diff --git a/dev-python/opt-einsum/opt-einsum-3.3.0.ebuild b/dev-python/opt-einsum/opt-einsum-3.3.0.ebuild
index cbcf6d756d09..43682d8b0fdc 100644
--- a/dev-python/opt-einsum/opt-einsum-3.3.0.ebuild
+++ b/dev-python/opt-einsum/opt-einsum-3.3.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P/-/_}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
S="${WORKDIR}/${P/-/_}"
diff --git a/dev-python/os-brick/Manifest b/dev-python/os-brick/Manifest
index fe0a2eff5b49..b467f0114d36 100644
--- a/dev-python/os-brick/Manifest
+++ b/dev-python/os-brick/Manifest
@@ -1,7 +1,3 @@
-DIST os-brick-2.8.2.tar.gz 179510 BLAKE2B c72c1f0260fc541a9f6ca9f984b934f718dadd7ec0909a4b2483bb190e1ad587084174a33e1a7c81a52728817286bc3887474ea2c39d7f43e8e71a4a9a4baaef SHA512 0e9237f9baf5338d123bec1b22285ff8c4c31a89d60cf8480985a144c45c2766322cb359f3d548676b2631883664c5797e687bbe4d2d9ec5cd38e10e53d394ff
-DIST os-brick-3.0.1.tar.gz 189358 BLAKE2B 331e06a49afa6d973149425946ffc3fc2b2173cc15faa9b9a6cfb231eb9e806fe10902eb86302c6a020dd4a986f0725550f12b9f54f78b9cd4fd3302d83f5eee SHA512 5283cacd1aef10a7b470d5338801fbf5741ee26ba831d12887f829f7e5744c6a9eb2db4048586214f6ed64de867645e1a6f3b5841fff5328416c5548a66dcd00
DIST os-brick-4.0.1.tar.gz 192821 BLAKE2B da1037e33288a3a20c6858b8620c5905c9a1d218ab858659bce844445d6b33a9b9c629df21eab68419e755bddebc43bf20afc197eaaf4a29dcd7365d19b27b0b SHA512 7847cae82e1ef726eb1189d93f13325d57abdb52286887d6b55e256d9a9f62b0afe71580c5ff30008f5827ba76cac8e423ee5da0d2d01f5794fa3556a6c2cc64
-EBUILD os-brick-2.8.2.ebuild 1458 BLAKE2B aadfe1bb39d49f87e8da9f8bd14291eb8d414a1b38acca29fd12022fec5c0d58a944a46bb2eb29796ff65fb9a417fc2cb2e6493ca59fac90557891367e88c55c SHA512 46ff984e089bd29223627f368b31ec34e60ffa42fb22fe64525b4404de638dd8d9c6cbf1a6906d4a9bd68520bb7f31f7f5d19e6354f03fa342bbc89ba54eb73b
-EBUILD os-brick-3.0.1.ebuild 1598 BLAKE2B d22959e8795da0fbcb48f9ea06385585846d25be8713a3dbf806e04249670905d63d2b04dea87b1fe4369ecdca7b62c5f0fd3fb8739887a2014bf9a5988bc75b SHA512 355331e77ed709f4f7306e349afee02191256bef8f2c80ca7c3873cfe35240a5f65d53cdcf9246c969e8dcd759ee50f80b4305ce5735c55bb60d608e1739d3f7
EBUILD os-brick-4.0.1.ebuild 1218 BLAKE2B eabb2f15d2b80fa9fb548cf4e0c0c98f1c4280e198298c6e71ea11a5ee90ade7ae465db36dc95b7498d251a1a8747d3b23d0cf19ecefa64bf101fa922436ef0e SHA512 6cade2a5837947065d64acdc01f437a5d64b8b54599001fbfc981f9567797d8a635f99df1bec21c1424797b7ea63bcab36b9af0df9a21a4be1e567ed78b71ddb
MISC metadata.xml 405 BLAKE2B 136d3cf6a74f9d90ed05a9c80e83b168dce1012acb95f9c1281410894d695994318992798e719639d63e36c466d8bd66ac2f67eeeaba720f18933e0a65167cda SHA512 4bf564ca91331cdc58c0ab3f9f372ee155947124e43e4d44dc38d7aa4ce8c1a043537ec262fdb793759bd50ad8ae213a2817ca41dc95618e138e3523432be6db
diff --git a/dev-python/os-brick/os-brick-2.8.2.ebuild b/dev-python/os-brick/os-brick-2.8.2.ebuild
deleted file mode 100644
index a1766af0adcb..000000000000
--- a/dev-python/os-brick/os-brick-2.8.2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="OpenStack Cinder brick library for managing local volume attaches"
-HOMEPAGE="https://github.com/openstack/cinder"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
- !~dev-python/pbr-2.1.0"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
- ${CDEPEND}"
-RDEPEND="
- ${CDEPEND}
- >=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
- !~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
- >=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
- !~dev-python/eventlet-0.20.1[${PYTHON_USEDEP}]
- >=dev-python/oslo-concurrency-3.26.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-log-3.26.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-i18n-3.15.3.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-privsep-1.23.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-service-1.24.0[${PYTHON_USEDEP}]
- !~dev-python/oslo-service-1.28.1[${PYTHON_USEDEP}]
- >=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
- >=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
- >=dev-python/retrying-1.2.3[${PYTHON_USEDEP}]
- !~dev-python/retrying-1.3.0[${PYTHON_USEDEP}]
- >=dev-python/six-1.10.0[${PYTHON_USEDEP}]
- >=dev-python/os-win-3.0.0[${PYTHON_USEDEP}]"
-
-python_prepare_all() {
- sed -i '/^hacking/d' test-requirements.txt || die
- distutils-r1_python_prepare_all
-}
diff --git a/dev-python/os-brick/os-brick-3.0.1.ebuild b/dev-python/os-brick/os-brick-3.0.1.ebuild
deleted file mode 100644
index 7f6275304115..000000000000
--- a/dev-python/os-brick/os-brick-3.0.1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="OpenStack Cinder brick library for managing local volume attaches"
-HOMEPAGE="https://github.com/openstack/cinder"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
- !~dev-python/pbr-2.1.0"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
- ${CDEPEND}"
-RDEPEND="
- ${CDEPEND}
- >=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
- !~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
- >=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
- !~dev-python/eventlet-0.20.1[${PYTHON_USEDEP}]
- !~dev-python/eventlet-0.21.0[${PYTHON_USEDEP}]
- !~dev-python/eventlet-0.23.0[${PYTHON_USEDEP}]
- !~dev-python/eventlet-0.25.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-concurrency-3.26.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-log-3.26.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-i18n-3.15.3.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-privsep-1.32.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-service-1.24.0[${PYTHON_USEDEP}]
- !~dev-python/oslo-service-1.28.1[${PYTHON_USEDEP}]
- >=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
- >=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
- >=dev-python/retrying-1.2.3[${PYTHON_USEDEP}]
- !~dev-python/retrying-1.3.0[${PYTHON_USEDEP}]
- >=dev-python/six-1.10.0[${PYTHON_USEDEP}]
- >=dev-python/os-win-3.0.0[${PYTHON_USEDEP}]"
-
-python_prepare_all() {
- sed -i '/^hacking/d' test-requirements.txt || die
- distutils-r1_python_prepare_all
-}
diff --git a/dev-python/oslo-service/Manifest b/dev-python/oslo-service/Manifest
index 0dd75b453415..08f484dc2d22 100644
--- a/dev-python/oslo-service/Manifest
+++ b/dev-python/oslo-service/Manifest
@@ -1,5 +1,3 @@
-DIST oslo.service-2.1.1.tar.gz 81030 BLAKE2B f6221d9e3d7624dccb614b2dbe6529937fd00495db80cddd9412c53fdacd4a5c5a5fe33468ab53c65e0cb741e82519de971f19d662e633f658641c978dcf0b2b SHA512 8d2beba973444eb6ef32c011928376b6ba61388837178f9043105100f05644137d9bf6ae235c4c7260b05d956bfda42890dcd5727dd4d6f9559e7206f7139f95
DIST oslo.service-2.4.0.tar.gz 80999 BLAKE2B 813c67eceb303d76ef39fecf057a2304966a367704a1a86a00bb2de515ded862a4eb3684f1e0f7dd4a17aca654fc6571243176d53397f8f93b5ee4cf34849d20 SHA512 7942a913c598471e9a828dba5e624ff6829d061692526021b9ae872ab558f119612e8b7b09c43efa7596e8102fbff323f106f755eef9a0ac68324606bb539703
-EBUILD oslo-service-2.1.1.ebuild 1545 BLAKE2B 9b22ab4de3e533a7cc88426043fcb3ab266f00737abac4a4b6a1d584deb5d97632c629aec352b24979826b64b1576c3bbd7d55ab13f9e656dd1437bbaa745c43 SHA512 1ee5aa160b05cf432498546b737d8989f4d29051781aef36333f19d3f39693ac3d082a4d2c5f9630e5bc6ef94517ff153714cb38d83d88c310b53f17a20f4300
EBUILD oslo-service-2.4.0.ebuild 1342 BLAKE2B 3dc89f01ade286feafb64f5b49141828636f1d5ac3bae876cd76be9e87bc0c41d3dbb2c2992d513261a05eda9680359017f6c026d55a20841a85eacc1b9db592 SHA512 7518ff90fd282f032a7559be6703e91196b96f652846f068f1d3c520e2a89680c21d78151baa93611b69404dffb0828c28f6ff60a77a56c2876b3ff936936b32
MISC metadata.xml 353 BLAKE2B fae3760500e7c2dda109d011ba18c25cb676aef1ad4537e738e9ad1d9df29e345b9190b705afd6d5e505a75008bc213c657a39217ddca26920853a385e39bae9 SHA512 e32109ddf0d35d46b7ca6dbf0381ef61b3c4bfa69bbe6cf41c33908048ea7116e02a3aaf7647b1a494d3f7b739d396063f724bab448daae49c67c51d60e52cba
diff --git a/dev-python/oslo-service/oslo-service-2.1.1.ebuild b/dev-python/oslo-service/oslo-service-2.1.1.ebuild
deleted file mode 100644
index 26d50d44e7b8..000000000000
--- a/dev-python/oslo-service/oslo-service-2.1.1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Library for running OpenStack services"
-HOMEPAGE="https://pypi.org/project/oslo.service/"
-SRC_URI="mirror://pypi/${PN:0:1}/oslo.service/oslo.service-${PV}.tar.gz"
-S="${WORKDIR}/oslo.service-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
- !~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
- ${CDEPEND}"
-RDEPEND="
- ${CDEPEND}
- >=dev-python/webob-1.7.1[${PYTHON_USEDEP}]
- >=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
- >=dev-python/eventlet-0.22.0[${PYTHON_USEDEP}]
- !~dev-python/eventlet-0.23.0[${PYTHON_USEDEP}]
- !~dev-python/eventlet-0.25.0[${PYTHON_USEDEP}]
- >=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
- >=dev-python/greenlet-0.4.10[${PYTHON_USEDEP}]
- >=dev-python/oslo-utils-3.40.2[${PYTHON_USEDEP}]
- >=dev-python/oslo-concurrency-3.25.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-config-5.1.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
- >=dev-python/six-1.10.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
- >=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
- >=dev-python/routes-2.3.1[${PYTHON_USEDEP}]
- >=dev-python/paste-2.0.2[${PYTHON_USEDEP}]
- >=dev-python/yappi-1.0[${PYTHON_USEDEP}]
-"
-
-python_prepare_all() {
- sed -i '/^hacking/d' test-requirements.txt || die
- distutils-r1_python_prepare_all
-}
diff --git a/dev-python/parametrized/Manifest b/dev-python/parametrized/Manifest
deleted file mode 100644
index 3049fb0ec4de..000000000000
--- a/dev-python/parametrized/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST parametrized-0.1.tar.gz 2246 BLAKE2B 2d6296434aaed324c3b15492d212a9bae025ab0614d349cd1ddc621189a91e593ab84b7a7c4089d6245bf4b91dd48586cdb0d9eb562b99d8de697e66c19a2713 SHA512 ee9543b1c2f4e313ea3a74d91b97b6339770101b70317754006fde7568292d3f175d923896742339302d5e1e625b2c0f2beb05863c659ac3b81869a3f574f25b
-EBUILD parametrized-0.1.ebuild 480 BLAKE2B 4c2b0b43a9ad1fe767792ed52c9aad50768decfd975b43ec7ba64a6f072b9272e2e61bb5a82e4623a1e310cd632c84b294f87b48d6b230cf1d7ae06d388098a1 SHA512 33ade0a3cce73b671ba8a0ec8fe3f549a924f1e3e7c6ea15e7cb7c737dd85240ee32f31007cedb8cef3f4cd8aa3ad546b5e0f4791b2a14fe1e57ec64406bb25b
-MISC metadata.xml 292 BLAKE2B aadf38d6a2520fd68d40741553e59df1a6a247f0b02ea68466843d695b17e5ab8df26a1c914f6f144e64421d1860c2e36f1e56a3340014b02691a1c60981e037 SHA512 511e70e9b7bad3d16bb57acab9d28b65928d42debee194d3289942c593dd26cf6e84096b94646e7290c021612d2c1e46709717ea90704b8b4d5ba007d5e0d9a9
diff --git a/dev-python/parametrized/metadata.xml b/dev-python/parametrized/metadata.xml
deleted file mode 100644
index 4ee04ac6121b..000000000000
--- a/dev-python/parametrized/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
- amynka@gentoo.org
-
-
- parametrized
-
-
diff --git a/dev-python/parametrized/parametrized-0.1.ebuild b/dev-python/parametrized/parametrized-0.1.ebuild
deleted file mode 100644
index dd09c7ae337b..000000000000
--- a/dev-python/parametrized/parametrized-0.1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Parameterized testing with any Python test framework"
-HOMEPAGE="https://github.com/wolever/parameterized"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="dev-python/nose[${PYTHON_USEDEP}]"
diff --git a/dev-python/phonenumbers/Manifest b/dev-python/phonenumbers/Manifest
index 2ff557e83353..fbe9c1a65f20 100644
--- a/dev-python/phonenumbers/Manifest
+++ b/dev-python/phonenumbers/Manifest
@@ -1,9 +1,7 @@
-DIST phonenumbers-8.12.11.tar.gz 2254319 BLAKE2B 2a33978ab0e4e575aefe2f3ed4f5a89ea87f1b38881fa2f4b7a4a38d16c107c62f4e079521d579b8a5419c8b174cf51ae8c530a450b8a8f9ad200b13938f4039 SHA512 e9008086f9cbb13a5772f164b12d3446cd0122556d90522f1e49d0a0155355401f2348a44396c7c26b235e543135471b64c97d67f82406356787c3c636dd181c
-DIST phonenumbers-8.12.12.tar.gz 2257073 BLAKE2B c8e4d20962d53470bfa701ff59ad0d4ddfa5f4913ae2ad2bea83c5b0c3274bddc7ff1c57e555e3b7f877d9230c0fdab5d866e52f9285fdafd773afc2c840f42f SHA512 625746bcf08f4bb5849fda1accf1229a05406439c97228b3f0f38b6fd56a4cd53e719738bed305a9dd89ab94f5f60ff0d9d0dcd3e57d5055daad99cfb94982ac
DIST phonenumbers-8.12.13.tar.gz 2257015 BLAKE2B 93986ed663b4f78d0b48ff45bf6b5e2b3d360d9efd5a349f05cf24d5a6113d87334be2d72eb03a6925eabd5cd2dafdf51ffc16fe95c73bd164fcfc5bc07d171f SHA512 397eb41e17c0a49c5750bc909fef70d8e2844f872f317a74f306c406fc7d459fe7dc48615dbc82b0144781a89ad376e76fe390688fd227705a016adf19c848be
DIST phonenumbers-8.12.14.tar.gz 2256560 BLAKE2B 60fdcb14143d4ffb625d1c873a1e262053bb0bc3df6f2576212329726c4578367b817f1166dfbc561669e4e8486a411487627de479e66775968c05574a8beff6 SHA512 fc155095a00d5e776301dde134043dcc60dfdc6812399e92e92f319c568f7e06f3b294833dc385614b14c87cac15aafb76e7c27116445c7d8fc0ec0740314089
-EBUILD phonenumbers-8.12.11.ebuild 433 BLAKE2B 05a63352cb4e9522f74d8bedc829b3f01ca7396c2cafd311ccec56a4079539d9c6784abea36076454ddc5fc27911323130cda292240e3f18b5510f085e0c8cfc SHA512 58baa6deb1d024174a2d019e63420ed0a33817234b643530ed9006e62644873540fe8f8dc4e0fec7152fe153e0709db6d8e66b91c216980dacea323f6dcd6f5a
-EBUILD phonenumbers-8.12.12.ebuild 435 BLAKE2B 79b981b633b68fa232f0c431dbf4a180c9d4596931386e69046e2850e6f7aafc05600776af068613cbfd54484ecb2c5a3ee0653afd0338f12a18b43aeb9d6653 SHA512 e3f59e06254641b3ce2d4433ec1b1a74f786d0ae4ffcc1a407e30c8f4ec57f539925fdbaedbdaaf71ff4cecc9bcd95651f3b876affbf9e86c5b99546a122c17a
-EBUILD phonenumbers-8.12.13.ebuild 435 BLAKE2B 79b981b633b68fa232f0c431dbf4a180c9d4596931386e69046e2850e6f7aafc05600776af068613cbfd54484ecb2c5a3ee0653afd0338f12a18b43aeb9d6653 SHA512 e3f59e06254641b3ce2d4433ec1b1a74f786d0ae4ffcc1a407e30c8f4ec57f539925fdbaedbdaaf71ff4cecc9bcd95651f3b876affbf9e86c5b99546a122c17a
+DIST phonenumbers-8.12.15.tar.gz 2256651 BLAKE2B b3a583cb64ea1e4fc278f40cb78c7ad9aa66f1655e4483219f8d1e3384628b9b5cd672c584953c0233743d436fbc6723484d63724e466badf0b3fecf57791b87 SHA512 56c52ab736ce807609c79d5cc3d4e97cb3c5a3e59689cf3112c21ee672c04f095f1727fc37f4e3b1573dbcd4c9ccb00b3a5773c2c383264996e1761f46acfd0c
+EBUILD phonenumbers-8.12.13.ebuild 433 BLAKE2B 05a63352cb4e9522f74d8bedc829b3f01ca7396c2cafd311ccec56a4079539d9c6784abea36076454ddc5fc27911323130cda292240e3f18b5510f085e0c8cfc SHA512 58baa6deb1d024174a2d019e63420ed0a33817234b643530ed9006e62644873540fe8f8dc4e0fec7152fe153e0709db6d8e66b91c216980dacea323f6dcd6f5a
EBUILD phonenumbers-8.12.14.ebuild 435 BLAKE2B 79b981b633b68fa232f0c431dbf4a180c9d4596931386e69046e2850e6f7aafc05600776af068613cbfd54484ecb2c5a3ee0653afd0338f12a18b43aeb9d6653 SHA512 e3f59e06254641b3ce2d4433ec1b1a74f786d0ae4ffcc1a407e30c8f4ec57f539925fdbaedbdaaf71ff4cecc9bcd95651f3b876affbf9e86c5b99546a122c17a
+EBUILD phonenumbers-8.12.15.ebuild 435 BLAKE2B 79b981b633b68fa232f0c431dbf4a180c9d4596931386e69046e2850e6f7aafc05600776af068613cbfd54484ecb2c5a3ee0653afd0338f12a18b43aeb9d6653 SHA512 e3f59e06254641b3ce2d4433ec1b1a74f786d0ae4ffcc1a407e30c8f4ec57f539925fdbaedbdaaf71ff4cecc9bcd95651f3b876affbf9e86c5b99546a122c17a
MISC metadata.xml 517 BLAKE2B fbbefd64340f179046eff07f02cfc01416d9c99817d8bd4061aa908eaabf59560e704e40876b5d514389766b26697ee811a1a4ef9ee5a306790156892f45e8d1 SHA512 5246cff049767fba3892ae49499127453cc26806d3eca35de98012c71df29cca4192d104810ea21921a1160e736a2225e3538e829016d9712a0b489be0e5a17b
diff --git a/dev-python/phonenumbers/phonenumbers-8.12.11.ebuild b/dev-python/phonenumbers/phonenumbers-8.12.11.ebuild
deleted file mode 100644
index edac4c6caf91..000000000000
--- a/dev-python/phonenumbers/phonenumbers-8.12.11.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python port of Google's libphonenumber"
-HOMEPAGE="https://github.com/daviddrysdale/python-phonenumbers"
-SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-DOCS=(README.md)
-
-distutils_enable_tests setup.py
diff --git a/dev-python/phonenumbers/phonenumbers-8.12.13.ebuild b/dev-python/phonenumbers/phonenumbers-8.12.13.ebuild
index 4d3183b1591b..edac4c6caf91 100644
--- a/dev-python/phonenumbers/phonenumbers-8.12.13.ebuild
+++ b/dev-python/phonenumbers/phonenumbers-8.12.13.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
DOCS=(README.md)
diff --git a/dev-python/phonenumbers/phonenumbers-8.12.12.ebuild b/dev-python/phonenumbers/phonenumbers-8.12.15.ebuild
similarity index 100%
rename from dev-python/phonenumbers/phonenumbers-8.12.12.ebuild
rename to dev-python/phonenumbers/phonenumbers-8.12.15.ebuild
diff --git a/dev-python/pillow/Manifest b/dev-python/pillow/Manifest
index 4efdd32058e9..3b86ba608277 100644
--- a/dev-python/pillow/Manifest
+++ b/dev-python/pillow/Manifest
@@ -3,5 +3,5 @@ DIST pillow-7.2.0.tar.gz 39125407 BLAKE2B f49015922c34473590740c9fa63435f85f9a51
DIST pillow-8.0.1.tar.gz 44614653 BLAKE2B 0f8ec178e92a57a55d575fac61779d39e79ff18032a02ad93aa6eca1211436342944b1a5bbd29979b52f0e2df756936ade4bf637ac3c153b5dda5838b58087ac SHA512 41b4ea786990c834f77ad06b64f465bc8f3a65911cf14bb05f452316fdf504e5e49b2bb50a9346f207187e79f83c5b6d310d703d1588f678b606584b1f27ce6a
EBUILD pillow-7.0.0.ebuild 2638 BLAKE2B bc13ea32fd5b0a25aad6c976bc4776ebadddd6fd778126e0995391e684bab49aac9c8681face6a2ff9663203d820de77a9c18b895ab6ccf48862ad153cc01225 SHA512 a709259b589008d5e745b6011b10f503db7664fd9e52b858e3c45ef91e428b531bf461da9962a2807a5c0058980cbb7b70e0a22b84aa624ecf9690075c202ff0
EBUILD pillow-7.2.0.ebuild 2694 BLAKE2B 0c5ac7be9523a70ef6b0abda1bbaa1183fde635e608d76b0b99216256d4d63288ece9f9901176d2a405969143f86aa524e09f7a23fc64c53de01ab785e3b6ab3 SHA512 21573a1826123c84025e9706114f6cef7f6c21a8c88237957b23d0e05425ea477e468738af1cc8379e3b4e322d3f1c81248fc70d835dc333f90f7250c58c2ce2
-EBUILD pillow-8.0.1.ebuild 2623 BLAKE2B 22714cf4401d9b31e7e67daca7fe9af1d276f34c3e7fd62b5e26b463932fca22d64baec6628d677f707b30a33667cc272dd4d0bd4ab65c5960c06967d11e38bd SHA512 650f770994a703f7fd7dbab9f9af034f221a1fded6e140583530e1d3c1a25caf5e048a3b75b697b8816127d17a3e51d59f107f22edd7a0b2b9a0b774084d105d
+EBUILD pillow-8.0.1.ebuild 2622 BLAKE2B 9e304d33eb3dcb202c5e82ec74d71dc47d014ceee37711f071adb8b5e39b33aed66d67b055bc7cc3ee022d1cdf2afa057b985c8b619692829312b62e3a5dc5f7 SHA512 e65a4e6ca5d5259b05723727fdbbc76b1e99e341d8f3bd1072bb2222aa97b76789b3d2a272b8606374186a01addf040bddb10218ef7e461a085cdddab2f1b9ae
MISC metadata.xml 479 BLAKE2B 8573c3f71b8e0d548f50dcb630a7c36d773ca8bb80f210bec320dc85bf12b70e9f30068dea615925c401726f0a5430827baa0104300abfd85060b522065c8d37 SHA512 473a9aea70516087faba8abddcd02bb76cb62711a5446fc5c58cedc0f0beb70cdef32e928ec293698b524d2e49440be2328567f84efeea4333477b7b9bd7a7d2
diff --git a/dev-python/pillow/pillow-8.0.1.ebuild b/dev-python/pillow/pillow-8.0.1.ebuild
index 0229ec273851..79169c5b2c64 100644
--- a/dev-python/pillow/pillow-8.0.1.ebuild
+++ b/dev-python/pillow/pillow-8.0.1.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}"
LICENSE="HPND"
SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux"
IUSE="examples imagequant jpeg jpeg2k lcms test tiff tk truetype webp xcb zlib"
REQUIRED_USE="test? ( jpeg tiff )"
RESTRICT="!test? ( test )"
diff --git a/dev-python/pip/Manifest b/dev-python/pip/Manifest
index 1581b88d86aa..b94938e1d947 100644
--- a/dev-python/pip/Manifest
+++ b/dev-python/pip/Manifest
@@ -3,8 +3,12 @@ AUX pip-20.0.2-disable-system-install.patch 1298 BLAKE2B a384ee2114e59b8bc719fc1
AUX pip-20.2-no-coverage.patch 6154 BLAKE2B 743dcacd3107d9c6447197dd01bc85b1b16db5b1da3bf5f84e73801e645848a98854f350d958056eb17aa6b87f8bb2557a27e3bd78582958c3b37cb6ce61d7ce SHA512 67ea11c56b6a7b02faae28c9d941015ca2ba9c125dfcaf01eeaba7717cfb22f23fb84c28f993202f7b648ee64741baaf7545e9951be840d378e39d3af0a60fd0
DIST pip-20.2.4.tar.gz 8723163 BLAKE2B 4b892950b6752b61af2f6a9d2c0a6f5db124cb7605d6cb9d4787bdbd88911cc6013474dd299f6eb5b1af4a8fa0ab6d3c5253513af182045a50cb463ced8382ea SHA512 649fdc6baa1ebe741717bd1e5ed8f2450d79f8bc0d06f2804c27488be9018f6fa6cc2eccc3ec2801442073f59ac0b8c377612c25116126aa919aa95050f4214f
DIST pip-20.3.1.tar.gz 8753852 BLAKE2B dbcf719ed6a1e4f39f08c39df0cb4abf4284f6cd68c9fbd1282b17714aff9df9e33dd2a4a1af89f45ce5131a858f7d392c11447fe9aceba9d3be2ebe1529818d SHA512 6061004b51e57e428a7eef02968fbbde02311ee184019c491012758010bffcb49d371c7612bc43cfacf96fe8de37fdcad34e3cadefc46b3b5962b0c716ee5d59
+DIST pip-20.3.2.tar.gz 8757391 BLAKE2B 934e689dd42529269798fbd5e45e7392167492f5c723394f2fca3d12d7fa3408ca1108dd4ed517cd40cf2f20ded5a06344cb23cc22fbcc4eefeef74dd2024762 SHA512 aa794e57f440deb238215141854b58e67a682cd5ca70febde13d8e3b92c9897e7f5ef11be6bd2a9594a8233348e406402b91fd3caaadffc5ff377ede6fc4a480
+DIST pip-20.3.3.tar.gz 8757085 BLAKE2B dce60cd59669929957715d6be70da4924c3a89bb4129f0972516bde8ccca751b4f327dd2f44a06cd0b48d092f8d520d1ec236ee812f768282004b34f1fabb798 SHA512 362d20e5d2665fa6211cf3836ca02a0340fb34ecde1d5902eecae744eb655d7dcfed0bd464e9db186b87b63a7aaf275e43645cf6321bdddd44b62787de84d87b
DIST setuptools-44.0.0-py2.py3-none-any.whl 583230 BLAKE2B 823e6792471660f247e30a938aa869d345a63db7294e5f9b4bd88f15a7694779011d29740fe317149620985f705fc6e18cbb07a18e5680cc11d7c229ffbc74f6 SHA512 7006fd303181afbeeec0e30cafb9fd1e4d3c6f55cfdd6343fedbc32b17dbb96b3d96ae37f4db27bfb168738727474cf425904ec280ff1d2b789fc48077a8fa84
DIST wheel-0.34.2-py2.py3-none-any.whl 26502 BLAKE2B 3a1bd4571c582245b60ff33c9bf74ff8a2ebafb26e56fc7b9bd215058d059b6bd13bbe21ce46002af257813a54126f27e19253f211e21c4548c7cf84cd15caf7 SHA512 4f1a44f4691ed8baad777d7874f7f4da96a5019eb485fd3a9eed9259aa2a9d5acccc6dc63a72128664347c64ee039a6076c6ca9c3b75a1f94457967864e522ed
EBUILD pip-20.2.4.ebuild 4163 BLAKE2B cc26eb182a2e0c9c65946a251f9b2933b6a4622482bb1e434a278e1d103c7be044c23de588f5f79f487160672188b76dc580d1b5881d09301aef80d12873ad3e SHA512 403c5f8cf7375eac81ee208b3d5ded807a0c925a5e9bf95f54d17d3444e830e40687bf652657e58700bd71fd571a64298f5f321b2d69000ec75335d6eeac4c76
EBUILD pip-20.3.1.ebuild 4322 BLAKE2B f149a792176550728a21b30a4e670a9d292cbb06a492c8e023729697c7202a194a68de535bfb672fd1267911d13e3082d69bd07b73a8eabd1fbb14ba9e77fdd6 SHA512 94b10d3ebff504920c3aaa065421da9165edb5140ce00c01c8d61208858265662cb7dbe5fe22782cf934e59f13f185fbb693eb6b93015c6774a273fc8e6c734e
+EBUILD pip-20.3.2.ebuild 4322 BLAKE2B f149a792176550728a21b30a4e670a9d292cbb06a492c8e023729697c7202a194a68de535bfb672fd1267911d13e3082d69bd07b73a8eabd1fbb14ba9e77fdd6 SHA512 94b10d3ebff504920c3aaa065421da9165edb5140ce00c01c8d61208858265662cb7dbe5fe22782cf934e59f13f185fbb693eb6b93015c6774a273fc8e6c734e
+EBUILD pip-20.3.3.ebuild 4322 BLAKE2B f149a792176550728a21b30a4e670a9d292cbb06a492c8e023729697c7202a194a68de535bfb672fd1267911d13e3082d69bd07b73a8eabd1fbb14ba9e77fdd6 SHA512 94b10d3ebff504920c3aaa065421da9165edb5140ce00c01c8d61208858265662cb7dbe5fe22782cf934e59f13f185fbb693eb6b93015c6774a273fc8e6c734e
MISC metadata.xml 391 BLAKE2B d8537d1b2f8886d7c30dad3975568e0198a04f16a7ced44f3682f1b865e25f0b7552a640955dd915b2f059eec78eb3f920a0bea0f5f1503f366731a5d20a96c2 SHA512 27ee4b430cd0175c9eecc279765fd617ce5ab55d36932879a0710c2eb66ac2de449de303b1b70fc0ce925666c87008814d64e62d904fc3b9f800380c53478e69
diff --git a/dev-python/pip/pip-20.3.2.ebuild b/dev-python/pip/pip-20.3.2.ebuild
new file mode 100644
index 000000000000..7987289ca6ad
--- /dev/null
+++ b/dev-python/pip/pip-20.3.2.ebuild
@@ -0,0 +1,150 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
+PYTHON_REQ_USE="ssl(+),threads(+)"
+
+inherit bash-completion-r1 distutils-r1 multiprocessing
+
+SETUPTOOLS_PV="44.0.0"
+WHEEL_PV="0.34.2"
+
+DESCRIPTION="Installs python packages -- replacement for easy_install"
+HOMEPAGE="
+ https://pip.pypa.io/en/stable/
+ https://pypi.org/project/pip/
+ https://github.com/pypa/pip/"
+SRC_URI="
+ https://github.com/pypa/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+ test? (
+ https://files.pythonhosted.org/packages/py2.py3/s/setuptools/setuptools-${SETUPTOOLS_PV}-py2.py3-none-any.whl
+ https://files.pythonhosted.org/packages/py2.py3/w/wheel/wheel-${WHEEL_PV}-py2.py3-none-any.whl
+ )
+"
+# PyPI archive does not have tests, so we need to download from GitHub.
+# setuptools & wheel .whl files are required for testing, exact version is not very important.
+
+LICENSE="MIT"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+SLOT="0"
+IUSE="test -vanilla"
+
+# disable-system-install patch breaks tests
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ >=dev-python/setuptools-39.2.0[${PYTHON_USEDEP}]
+"
+DEPEND="
+ ${RDEPEND}
+ test? (
+ dev-python/cryptography[${PYTHON_USEDEP}]
+ dev-python/csv23[${PYTHON_USEDEP}]
+ dev-python/freezegun[${PYTHON_USEDEP}]
+ dev-python/mock[${PYTHON_USEDEP}]
+ dev-python/pretend[${PYTHON_USEDEP}]
+ dev-python/pytest[${PYTHON_USEDEP}]
+ dev-python/pyyaml[${PYTHON_USEDEP}]
+ dev-python/scripttest[${PYTHON_USEDEP}]
+ "${COMPLETION}" || die
+ newbashcomp "${COMPLETION}" ${PN}
+
+ ${PYTHON} -c "${pipcmd}" completion --zsh > "${COMPLETION}" || die
+ insinto /usr/share/zsh/site-functions
+ newins "${COMPLETION}" _pip
+}
diff --git a/dev-python/pip/pip-20.3.3.ebuild b/dev-python/pip/pip-20.3.3.ebuild
new file mode 100644
index 000000000000..7987289ca6ad
--- /dev/null
+++ b/dev-python/pip/pip-20.3.3.ebuild
@@ -0,0 +1,150 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
+PYTHON_REQ_USE="ssl(+),threads(+)"
+
+inherit bash-completion-r1 distutils-r1 multiprocessing
+
+SETUPTOOLS_PV="44.0.0"
+WHEEL_PV="0.34.2"
+
+DESCRIPTION="Installs python packages -- replacement for easy_install"
+HOMEPAGE="
+ https://pip.pypa.io/en/stable/
+ https://pypi.org/project/pip/
+ https://github.com/pypa/pip/"
+SRC_URI="
+ https://github.com/pypa/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+ test? (
+ https://files.pythonhosted.org/packages/py2.py3/s/setuptools/setuptools-${SETUPTOOLS_PV}-py2.py3-none-any.whl
+ https://files.pythonhosted.org/packages/py2.py3/w/wheel/wheel-${WHEEL_PV}-py2.py3-none-any.whl
+ )
+"
+# PyPI archive does not have tests, so we need to download from GitHub.
+# setuptools & wheel .whl files are required for testing, exact version is not very important.
+
+LICENSE="MIT"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+SLOT="0"
+IUSE="test -vanilla"
+
+# disable-system-install patch breaks tests
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ >=dev-python/setuptools-39.2.0[${PYTHON_USEDEP}]
+"
+DEPEND="
+ ${RDEPEND}
+ test? (
+ dev-python/cryptography[${PYTHON_USEDEP}]
+ dev-python/csv23[${PYTHON_USEDEP}]
+ dev-python/freezegun[${PYTHON_USEDEP}]
+ dev-python/mock[${PYTHON_USEDEP}]
+ dev-python/pretend[${PYTHON_USEDEP}]
+ dev-python/pytest[${PYTHON_USEDEP}]
+ dev-python/pyyaml[${PYTHON_USEDEP}]
+ dev-python/scripttest[${PYTHON_USEDEP}]
+ "${COMPLETION}" || die
+ newbashcomp "${COMPLETION}" ${PN}
+
+ ${PYTHON} -c "${pipcmd}" completion --zsh > "${COMPLETION}" || die
+ insinto /usr/share/zsh/site-functions
+ newins "${COMPLETION}" _pip
+}
diff --git a/dev-python/progressbar2/Manifest b/dev-python/progressbar2/Manifest
index 6e801173826b..4d8b74fef2dd 100644
--- a/dev-python/progressbar2/Manifest
+++ b/dev-python/progressbar2/Manifest
@@ -1,5 +1,5 @@
DIST progressbar2-3.39.3.tar.gz 131839 BLAKE2B 2cbf1ecf04947b3a393b5cc473a696528cdaf38f132a1b0faab5e45dff76aecdee497ca1b2810b9ec5e3b180acfa8e2af1d195e5804c058a7d8880fc3b0a330f SHA512 b8944b319f1133fe7abdd256bed8803e9f426208af5ddc58935121845e81b9f65878e536bd5a1e4810eaa6906b24d114e8681dddf1f77c1bf96cb231f6473a5e
DIST progressbar2-3.53.1.tar.gz 44741 BLAKE2B 80f406adf42c5c57ecad87002426115e1254339d5cd310dd42f560f48a1123702dffbba8f26114a01f2bd5be75a29cb12cc1c091d5554509b6282ceb2b66fb76 SHA512 4817bbb45d0f51ee2b3feceec56b3177ed5d0561894a13eea53a30e8b9aad5805483b5b669af93f3fd0cc958984b8a5c2a14ba3591e0a85be12180d057bc2f81
EBUILD progressbar2-3.39.3.ebuild 545 BLAKE2B 9fadb7be761358bd618b86efa15e3c86291570825ce82ba78ccc8c997035a3000a06b0a9df991fe5bd1902e6962362fda2797a342d9f7901829d9e57e2d84108 SHA512 8e3d076935d3036886d975032076230cca5119123f50133fddb628d2537c54e349361e90e6f29d14a07d16e7db2b207a81b1f0112b9cfcd1b16b9229042e1e7f
-EBUILD progressbar2-3.53.1.ebuild 767 BLAKE2B f84800023efe2c9283fd6e760c23eff303151dbf0c1ef9b22bee3411b671c1bf137171ad4efcde02b0ced63077096b161f87c498b7602461caca3293c26a960b SHA512 373dc5e7be262c9fec185b6860178fe7c68dcbe6ee86908780485eb533813bbe496c2a2c4179800850854cef2feee5c9eb5738ce0800798de37cae1170c2923a
+EBUILD progressbar2-3.53.1.ebuild 766 BLAKE2B 13ffec7e8d715a26f39f9bdcb3adbe3ab4ea8668b2edd1b0d0b96dea84b4f344367a1f76cc62e647249e43a47823a3b8ef6ecb3774533d4655e8303f679764b3 SHA512 2eb297e9552a9df6e2e225cfb5cdbb954d57903c27d53175b09d1438891515aba2c9f776da74bbd624c9c097a2d365070ec61a8ce1671263c569b9b8038c68f8
MISC metadata.xml 344 BLAKE2B 812c8fe2236cd0dfaa9ee6772f3753cef9ce3d58c29f1da23f31cb7d0a76db44b3b3369626940f09120e7ac491cf74b4cb31aab16c62d8ec66b4c9c4f493b18b SHA512 5b326b7408019457ec81d540c94bf092358c81ff873a9eac6fb60cc9bc624d2bb194d1d432c53e75673bd52e15fc4bd96a4d881e56c800d111e5faa6dcb9520d
diff --git a/dev-python/progressbar2/progressbar2-3.53.1.ebuild b/dev-python/progressbar2/progressbar2-3.53.1.ebuild
index fc89dd3b9547..70398a6536e4 100644
--- a/dev-python/progressbar2/progressbar2-3.53.1.ebuild
+++ b/dev-python/progressbar2/progressbar2-3.53.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
CDEPEND="!dev-python/progressbar[${PYTHON_USEDEP}]
dev-python/python-utils[${PYTHON_USEDEP}]"
diff --git a/dev-python/prometheus_client/Manifest b/dev-python/prometheus_client/Manifest
index 142116b399c0..20574f117cbb 100644
--- a/dev-python/prometheus_client/Manifest
+++ b/dev-python/prometheus_client/Manifest
@@ -2,4 +2,4 @@ DIST prometheus_client-0.8.0.tar.gz 67749 BLAKE2B 570c95de0d4e9e8bd625d55eb3dd45
DIST prometheus_client-0.9.0.tar.gz 68176 BLAKE2B e20f599e6a4d39226e48cafeca879b87389fdb5a6eda401161ce448cb0b46a89ce0cccc1b78e2fc8cb60cc461253345b9ba52809c861f0a187171c33095f625a SHA512 1d68ca35169972c50bb56ede88c47408ee27b3e795fcf03798313aed2dbc5db5532fe6886998c118258b76e431c6e49aa0ac19b9206cad63711901497258aaa5
EBUILD prometheus_client-0.8.0.ebuild 597 BLAKE2B 5ccbb036c4946393245e4efdd4e872c96425bb9d6e6ee45bc000bb7a4ad1a8bc3bd2af2e2e4f31385f9ff7f8511beaccbac06142ba7b911fadf6eb9215136086 SHA512 ba372c21521071a7d45fd71e1e1b24268a68e95250a83bd02e22ab08600623696393a0f68ed415c853a0d17952bb08c0d229a214ff92442c687d8b58e36f0656
EBUILD prometheus_client-0.9.0.ebuild 600 BLAKE2B baa3307aa9d5068028ee3ddac86c4c2c647498747973460bae5a22a7026ac9938c7d6caa3f566cca10f6d35bc7cb872bedec9a3a61cd50b64adaea06c1a5145e SHA512 3e15d2aff45803bc87207bda831ba751f140daae538bfd962c974e779abc01143e76e247e0e8d94e8ddebf8dfc9a3fa3b30746bc5af0de61785f18ee2a05dfab
-MISC metadata.xml 384 BLAKE2B 22013c3c22bf39fabc380ac09195f871c9fb4a91ff52f8b1ed5ff842a02c17fb0d6564790b539dc472577377198bf2709f6ab0b1e6cb42de985bb0d54887141e SHA512 769b34f552e8b01279ac612ba6716ff6f3824e51969a477a8366305bfc3d94066841255cd262914445366c12553d66fd1396ed714654717216eb01a15e3732ed
+MISC metadata.xml 408 BLAKE2B ea5035e286f836f3637d79b145f3d84e7dda07372ecfa66b32f9c4d4f553f584a28e5c421a1537da8d4495173dbcd1515013ccfcebf54d034e28cb8cbd864ac8 SHA512 ecad056ac13d4d78b2bedb19a6ed9c60d0c52078301a4e2397c3ee1f45fa435750c1a5c63ad95150129216201e821cb5ea9816726c0a3b383538f956ce7a3d40
diff --git a/dev-python/prometheus_client/metadata.xml b/dev-python/prometheus_client/metadata.xml
index 61e60a89a845..b128f04ee2be 100644
--- a/dev-python/prometheus_client/metadata.xml
+++ b/dev-python/prometheus_client/metadata.xml
@@ -5,6 +5,7 @@
python@gentoo.org
Python
+
prometheus/client_python
prometheus-client
diff --git a/dev-python/psycopg/Manifest b/dev-python/psycopg/Manifest
index 8e5b94899dc0..1427b49bbf5e 100644
--- a/dev-python/psycopg/Manifest
+++ b/dev-python/psycopg/Manifest
@@ -2,5 +2,5 @@ AUX psycopg-2.8.3-avoid-mxdatetime.patch 954 BLAKE2B 073eca8e49dd4d7fd2ec920dfe5
DIST psycopg2-2.8.5.tar.gz 380874 BLAKE2B 843321175499bf00b080d3e58ce0d586e674585af4be5a08866b5dbb68256ff9232d3c25e2603a3a0920a6c91927eb9fbb5942acd429be5dab9177c65da0c32e SHA512 d4cf9b94573b90fe56555ea5cf841aa0c4c806770f92f35a7ef2531999bb50f98eb1276e56f1540b5f2695e443bac7e9cb8bbfbd24ed82164f99663259d2da3e
DIST psycopg2-2.8.6.tar.gz 383797 BLAKE2B da0e3f1e143c51c940ba1f51d3e457b492d880ab71267dacd4747444bc767711ccd6c2f54d9e10ce5ad8fae0c3206fb4b6199f267e9bbaf12eb654227f59c2b0 SHA512 1e1d5d8755c6d1a153d84210bf29902afafe853659d709e13abc6bc5772def13779d2394690af1c544384c9c607edc0fe5cf2763244fb346febf9a9e0032b45f
EBUILD psycopg-2.8.5-r1.ebuild 1514 BLAKE2B 08f45229d2bf8d868ad9c16de2e33c070e17a53e6ea9f8804973935a8f76c81cae103368e9cf9da2456764ec3a54e71cab2c1a95c984f1499344d03d958bb470 SHA512 0d150dbf7d2fc85af31323f18f96710a8538b8030936aae379b4d95094c7e41e2a13a1d99f5de07a695468e7fa172cf3f340c1d44e86e63cd4a3753b433399b9
-EBUILD psycopg-2.8.6-r1.ebuild 1613 BLAKE2B 2927f71ac16c75981383f9991d8cff3ed60d2c842bc69f25d18f4c07b21cf52bf31016849d3935546f28741459bd8e48b7d3e8509695f6140ed2f2543c6a441b SHA512 c097c2a05ca0926628df5d2255818a4d8c0eb440a65da3a8fa3f947363a76f2ca139e6918d81d283c18de8f607716805f4df900635132fa0bdca924437523996
+EBUILD psycopg-2.8.6-r1.ebuild 1611 BLAKE2B 36a0a33fde22a54c3607d763b62ad8a18cddb54e016f3d8a8a6fb2e947599a3a3f3ca99165c2cb640790f21d8c6a58fe07891ade3f78de47464d8ea2a2c2ceed SHA512 a9f038beb7998535d92414cbda14130b68535c2639075ec98d621c22c0a85215bb846377c9be3e50bd1692a37a9d37c3db7036481cf2785618aa15e5ce5f3cd3
MISC metadata.xml 321 BLAKE2B aff48bec04e34b92668aa18214d86ddbedef2376eeced4815118d35eebfb8e6af87234a9470828f465626f7d9ed56fe0fcb8f078c23945371248136533651ad3 SHA512 358b751b3a65f64ab5468bcf4022315f7069a2fb60709c2bb12ac02577866a3ff24ab2dd69577052070cf010a51428cb3ec385ca7cfe48640f4dd25ae478a966
diff --git a/dev-python/psycopg/psycopg-2.8.6-r1.ebuild b/dev-python/psycopg/psycopg-2.8.6-r1.ebuild
index 38933e37a6aa..6022fc3bdde1 100644
--- a/dev-python/psycopg/psycopg-2.8.6-r1.ebuild
+++ b/dev-python/psycopg/psycopg-2.8.6-r1.ebuild
@@ -17,7 +17,7 @@ S=${WORKDIR}/${MY_P}
LICENSE="LGPL-3+"
SLOT="2"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ~ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
IUSE="debug test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/pybind11/Manifest b/dev-python/pybind11/Manifest
index bec7e7209e2b..9c1f66ac0a91 100644
--- a/dev-python/pybind11/Manifest
+++ b/dev-python/pybind11/Manifest
@@ -3,5 +3,5 @@ DIST pybind11-2.6.0.tar.gz 631925 BLAKE2B 6b7872182f52e035f2a86f0f2ad70b084e62fc
DIST pybind11-2.6.1.tar.gz 634179 BLAKE2B 33f057e88e45985a0475783b8931ec669a16efcad5d66ecb265744155e9941b2d618391a36bff1d8c1c2d74a7e0b41de50b26eae689215d4585542fbd4282cc1 SHA512 8730efec82eef8dc09a58ca3e3b28fca45880cef85d32aa5524a8fe64e23d5f6dff4ca1b48b3034a287199bd56f4db4d6806c5358bef66fde84ed0fbf80ec264
EBUILD pybind11-2.5.0.ebuild 1302 BLAKE2B 52c61ccc0c7de0eaaa6f39fa4e6496f72893e948d65bc84f3d544bac9d2d79c13843b4fbfefec6f61f106de4542056323bc2e7e9f4309530a99597d84623ac78 SHA512 9cdb6b256fd146d4d3113e57f8e944bb7e793609c27796c7bb9a5e2076620302413dfd1ed4138ae9ba5f70e7cbcea1f437c7a562f2a618e556cdae827f2b2fdc
EBUILD pybind11-2.6.0.ebuild 1282 BLAKE2B b5fb119d2df30584784f282342ca1bd2d14ad2d869d4f13b7d7c8408661c957f62209b9b777d682136a8ac676180f3049d7a825931f5e2a3b099c79b10c985f3 SHA512 de8996501cf7879de71242a35250032f95347422d7680cd2e3efcc574f16ee75fe26d258fb4b8f3448d05c750090b37a8e4a9c1869e8b0bc9886c83c8bb3715f
-EBUILD pybind11-2.6.1.ebuild 1284 BLAKE2B 7d753f38ebe4ebdb9a166eb0dd172b768b1fb7aff74f65c65129bd6d53ba455a50adc2de48a6dd32064eebf59c30368668f76799f657c389e7a564d2266089d9 SHA512 1a0922bb491a62c480f53d7b0ed34163c991b672aafc44e1a330afaaa7cbc0973eb3283b10c9daa7eefcf1af1d396120cf8a03a60080da652f3e2f09c2025db3
+EBUILD pybind11-2.6.1.ebuild 1283 BLAKE2B 56ee577252f3ccc60acca4b6c732ddeb5e29d5f6c312f354102b950df679638f75ffd604aabd928a82fc86c5ae443624c25a6fbf575c9adbb302675ae9d009a2 SHA512 f1f6a870e255b9c742454adc9c289524633d432c95abbfe5e7930449c836675235baafa61d6e32fd8f2a4c90d376d15d7d35a686781a42ef7bcec36c85c28f94
MISC metadata.xml 419 BLAKE2B 4b76037af5a23b231241e9d53f12dd3866cb07811888d1de3e022d3ea812a83a17856107b257f608343aafe763975cfa621061e225c7ecdcc175f3bb0b8a51a8 SHA512 b17fc1d7231812f22077e7feb0400a3c1e9b66f29c125457b5cf568694ef35332d83fdf405d6c849df55e1f0e517a8c25ecd6f24d1d67ca6654cae8522bb10a2
diff --git a/dev-python/pybind11/pybind11-2.6.1.ebuild b/dev-python/pybind11/pybind11-2.6.1.ebuild
index ad41df44bfd7..29b85cf69217 100644
--- a/dev-python/pybind11/pybind11-2.6.1.ebuild
+++ b/dev-python/pybind11/pybind11-2.6.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/pybind/pybind11/archive/v${PV}.tar.gz -> ${P}.tar.gz
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
RDEPEND="
dev-cpp/eigen:3
diff --git a/dev-python/pycryptodome/Manifest b/dev-python/pycryptodome/Manifest
index c802da65f5b9..60967f2eefeb 100644
--- a/dev-python/pycryptodome/Manifest
+++ b/dev-python/pycryptodome/Manifest
@@ -2,5 +2,5 @@ AUX pycryptodome-3.9.4-parallel-make.patch 756 BLAKE2B 06a79eff056ecb98313183828
DIST pycryptodome-3.9.8.tar.gz 15633268 BLAKE2B 8c4f8d4839be0fb09556677514ee6c7f832684f20eb4e355cee87eb5b52a5c09e12712c1865ff89fb5dd6c628ca027374c7cab8a2287aafa4eecedf1095f1a12 SHA512 894e763720df284804fd686d5805980853b86773bb3097bf03d929818b9944e5a257e47414275f302966864751e50ae34dea19ad749910f1ceac31833a53ef7c
DIST pycryptodome-3.9.9.tar.gz 15551299 BLAKE2B ac89bcc2bbe707cb2a9cf2496a2eb74ff5685f11017d60d67558de7ac6cad5c24c43b4074bff01e99378d7c88462e88e88f363c5329fb800e1a7872ad8a34dab SHA512 a1aad4d52256220fe3d5d7f399c2c5e7338d6eb88058da0571fe1c686d74d33ff4bc1c275d4b9373e0ff22f4ddcded75a25387e76fc65047f8612f8856c1bd4d
EBUILD pycryptodome-3.9.8-r1.ebuild 1320 BLAKE2B 043de28361a19d129a73c360118f64d602039d3ea9a7a27a2564d709a53ec307fe7ca8589862436c2a44977f23cb7342e08d2fde8a1d32c524044a7cdc02302b SHA512 dcb8e914dd502e4d9335aa41d73551261d2d0645a75ae1389d534cddd693b25013d8551af300132d2093d2379e70eadb81081a082fed3dd551e49b35df3042cf
-EBUILD pycryptodome-3.9.9.ebuild 1388 BLAKE2B c04652e3db3ac43bf586982815cb4008769adf7f7d15e39c57e2b85b1c9d744ef654d496a29118c1ba0a3698e163651c3b6ca457f4fae0c1c50a5a3e32e79965 SHA512 355a342e1bb2669c3bf2e6ac60e0d2226b695e40d738e767e2ec693c98e6540825bb4a9545c23e5b3056c74ca171a78deb8409dc48296931bebfd2252bb1575a
+EBUILD pycryptodome-3.9.9.ebuild 1387 BLAKE2B e567fcdd6a7233657c2219685690d67b63201c492f69e25673b0e8a69792c38229e2019a220dbca690a1d5eb7f6489a62ecc33d80ca8f20d16e7c8dffa2cbe9f SHA512 a23ab811ca63ea99cd243ed0c171b13cac88b79434ad7597952f28e45fd38ec2117381c7c44728f1130e0ad3698be075e2b9e3a71376b7e21f374bc295a1cbc0
MISC metadata.xml 385 BLAKE2B 8ee308521948e0f6bbc9c70e25c231a02424c9d4bdbf2c6ddda10767d4bf77bbda74607f4dce97ff42bfe6fef8a5ac2ee25e0b91bbc491e977c5cc46b3486699 SHA512 073885df3e0742b6088a537d54bfe9fcfb646ed9a5d3d19940d02fb05d453601b71db583567a4810a8d739c935488291624bc06948c4cb21b28a5500fbea4e97
diff --git a/dev-python/pycryptodome/pycryptodome-3.9.9.ebuild b/dev-python/pycryptodome/pycryptodome-3.9.9.ebuild
index 146a5db4e6d4..c175cf74a398 100644
--- a/dev-python/pycryptodome/pycryptodome-3.9.9.ebuild
+++ b/dev-python/pycryptodome/pycryptodome-3.9.9.ebuild
@@ -18,7 +18,7 @@ SRC_URI="
LICENSE="BSD-2 Unlicense"
SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~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 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND="
diff --git a/dev-python/pygame/Manifest b/dev-python/pygame/Manifest
index c83f6a4366a6..d2e60a9f0b2c 100644
--- a/dev-python/pygame/Manifest
+++ b/dev-python/pygame/Manifest
@@ -4,6 +4,6 @@ DIST pygame-2.0.0.dev10.tar.gz 5567274 BLAKE2B 7d78f260318cfabeb33f1073ae210f890
DIST pygame-2.0.0.tar.gz 5522621 BLAKE2B 49773979af53595d3ff2db1a18e4bcd217e26db3ec28d6129d2a588f23a1bd5326fa79fab32c25aa796738cde0e68f5741bee58f62432e86f89cd49ee17a8f14 SHA512 3f65924d0e1d2863b84118a4e468b521a289e2cf174405c6f3ee2b2a2ed399cde7f9f310d57c4166351f84caaea02dd7408ee852dbcee7c205bb2955b6078fda
EBUILD pygame-1.9.6-r1.ebuild 2295 BLAKE2B 682c814c2c6471f81bf7f4304ef056fe96651d5f08dac9c89e8801ec30eb88c0779cd7425bdb492f888886a9f1058ce999576b62120bb0fbd707efd48805f5e7 SHA512 3a8461dc43baf4970d3bdd1dfa18b2993f7d19858436b562c6767016cc64850a4efaa80f121e87b4ab9badd5db0f1c994e563ceff61b6f53511a3b1475d6ce8f
EBUILD pygame-2.0.0.ebuild 2074 BLAKE2B d2c44c2be2f39e04f88c5bded248b1ef79d568962a99cd3928521aee39ac735b6d0971afc438817cce47133bc363db7b5a0b9b8f04301b191674ac507011f8f5 SHA512 f01647e5d470537ec933eddce6dca6339cca42321150f2f0ff437bcfcb6f59c85bf9b7aad23ed0306217c2aa6cdb25a1c9c1a5210678624ca0630473b87e0680
-EBUILD pygame-2.0.0_pre10.ebuild 1911 BLAKE2B 1b9feec06c2cad0101e9a966dc9f52d3ea1e879cb425c021ec637e2dbc8f2cb8226d573bd99bd7616d0dedf99a3dc982c405effbd55a271f63c84f23f538d923 SHA512 e08204ab6ec0f7072b175d384c8fe2609e1e488b9b6215d0f4604431f619fc6d6d6e7f21aebdac3b206e9d8f92394b9dbf4fdcf0bf07764d9df7e412938302ce
+EBUILD pygame-2.0.0_pre10.ebuild 1910 BLAKE2B ec813172ab8ea9cbbff771d79a0c2fd9b63c9c9b86fd2aa764444b6228dc2617cb76600ec61437a473e503afe0159427e58b4a5f33b6df2f780bf13cc508f510 SHA512 3b148b6dd080328f7c33841dbe23c2259fe2844b246810b084266555f13eb330e1e584b981d4331bbea047b3d7cd138caf21d5db42dd85d4cbc1387e37ed34a5
EBUILD pygame-9999.ebuild 1737 BLAKE2B c854247d528ccf4aaee3c348d16ee9148d2de2624080e80e233d947249719b1d3f16d0898703a1579b725fabc369679a2a3e113da4ce6af9f64fdf2d7dd983e7 SHA512 c3ff68bc1c97aff762c5b66507f1ae159476a55cc9b7395841c462769109a105bc961cac9e5f7284223d169c0afbbdd305a533b06ecf2966e7c0c07b4833096d
MISC metadata.xml 408 BLAKE2B ae371ef164069765d0964da714a83c9898ddc190ac295c5ad5bbb6a3c45db5aa415d84ff21dbaa510e5c9852397e6b6b389684c54b67d83d675afd9b3d9a697e SHA512 a6e06c0bed59d5157166577a2dafa53f28a310c56f251bec36af077a79342c6f954fa63a3fa8d3546ca03cc9358e75eeb1ef04c6e0371e43e0b7bff51ffe35dd
diff --git a/dev-python/pygame/pygame-2.0.0_pre10.ebuild b/dev-python/pygame/pygame-2.0.0_pre10.ebuild
index 490902c9494e..579f6b9799ea 100644
--- a/dev-python/pygame/pygame-2.0.0_pre10.ebuild
+++ b/dev-python/pygame/pygame-2.0.0_pre10.ebuild
@@ -17,7 +17,7 @@ S=${WORKDIR}/${MY_P}
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ~ppc64 sparc x86"
IUSE="doc examples midi opengl test X"
RESTRICT="!test? ( test )"
diff --git a/dev-python/pylama/Manifest b/dev-python/pylama/Manifest
index ba446c3f394c..273e15f64dd4 100644
--- a/dev-python/pylama/Manifest
+++ b/dev-python/pylama/Manifest
@@ -1,3 +1,3 @@
DIST pylama-7.7.1.tar.gz 34740 BLAKE2B a4bd5aed40c2c4e7bdb9f9968030f0954f0309cff80567b2252ee9576fdb4598714286bda63c22676789d4919662430ef2729089faa70b5cb590784eb47ef1f0 SHA512 298fabffcdf38e3e868e3965de87a0e761bc9dfcfe33320b53057c4e05598bcc22045481ec16ccb8df27f49ea41d6fef82b69fe7327905f93ce74d9350682cf0
-EBUILD pylama-7.7.1-r1.ebuild 1303 BLAKE2B dfa780b79a6acfd9572bcffeacd44835c546319b07016f0d970c74ab25598458e0317006bc8679b72acb653bb47a9c7e8a13be271b4484299fda34a07b9448f5 SHA512 e19c23d5790b1fa385fbc2e4925a489e2bf19c53eef87ede364fbd96c2024d2fba86029dfb4b2dc4c194414e942538bfa34c893a0e696adc5436d381715ff4e2
+EBUILD pylama-7.7.1-r1.ebuild 1310 BLAKE2B a35c46402412e87ab92aa3fb8f7472032df817108411fec6f0142f93a5709715bf6152db3f6cc8f4abaa15506983e110b2bdc55c2e7fde5b81e5888aa2ee49ed SHA512 a99a6df06b0504d1b5260aa8d96cd356ee344f591834be3cf7d74e237e836b3bedfcddae83d84beec4efe831cc9da2271a08c4ec7049be2eba09c9d7ebe31d42
MISC metadata.xml 388 BLAKE2B 9fd8abe101834b8d24d232875dec2f2e84e2d2983b7fe27243cbadb60208df63e7fbc9b450c7587df71a3ad488b104e43b43ec0e013907006e622ca5cac7da73 SHA512 96cd8e9bc7391c28d2625f02521ae93a1ae901c04c144288cfb5a7d7c0de70d2e58f73a51071b4f82f3f043c4f6c94bfef67a2e29ff7187302dedb3a421117e7
diff --git a/dev-python/pylama/pylama-7.7.1-r1.ebuild b/dev-python/pylama/pylama-7.7.1-r1.ebuild
index 99c48bba206f..550f02e50c98 100644
--- a/dev-python/pylama/pylama-7.7.1-r1.ebuild
+++ b/dev-python/pylama/pylama-7.7.1-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/klen/pylama/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="LGPL-3"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~x86 ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos"
RDEPEND="
>=dev-python/mccabe-0.5.2[${PYTHON_USEDEP}]
diff --git a/dev-python/pyls-spyder/Manifest b/dev-python/pyls-spyder/Manifest
index 70db3b324b47..2f522c73ad9a 100644
--- a/dev-python/pyls-spyder/Manifest
+++ b/dev-python/pyls-spyder/Manifest
@@ -1,3 +1,5 @@
DIST pyls-spyder-0.1.1-gh.tar.gz 7113 BLAKE2B c504c5393527c13d06de579b3e46938dc52012902229e6859e56c3358990f72861682b7a7166658d874b501f9a797db62296d6f5ef30b25e43df73116091d9b6 SHA512 dabc2e3047b97502daaa5f939e75cf6533284bd89c33b29cbb881a3ddafd5b273ff0915645120515740e07dfb4f22c12d47db699b4744599d5edf87e41abe051
+DIST pyls-spyder-0.3.0-gh.tar.gz 8545 BLAKE2B fe2ec3ca6a4440bb9112970550a096389a0969eea9f0cdd631110c19358ac387a97902cc21ee61c8961ef2ee020689c30f7c86f6448bbb40258d730b3cf79cbe SHA512 94ce684d8c7fdb8ece003c1965a001bd745a38086f382e0185f6750edb3103998165a5e2554f065d6364409e5438272e5c256b7b756b971f61f1dd5cbcf3d503
EBUILD pyls-spyder-0.1.1.ebuild 586 BLAKE2B f3613c7d550e5a9212856bbcca4f93f2c1a9201df4d6fb3069a6338748541615d7dbe7f6572335dea8f99f2c63cad8f2c5ef8c4d8e096a653ff9f66b56933de9 SHA512 ce8a3d2500a664e08d48a5ec517a1f10575ab14d50e96bd72ad03ac11525e5f9f3d72d78ec9decb10a3ba5a9604ef80e327d12b75f58be3d01e07badf09de7c5
+EBUILD pyls-spyder-0.3.0.ebuild 595 BLAKE2B 2e4207fcf655977a4e24ce18b6d88079110fcc87b3d95e978fedc894200fb6a2492cc3ca9dd6617669551277c1ae047560d96efa2a89f7ffd0e647e3d280e0a7 SHA512 4449555861c88a6338ad9ec1f587510d666933e53386e5ae6333756b39d7efda5da4d71585ac17b57606a6fdd648ffc0e178aec52225af05201074db41cbd5b1
MISC metadata.xml 529 BLAKE2B f03e03230b89b83cf275a96a4e3ecf6b1a9a76e44e917d8efb2fbfe58b3410b2d4427a88727e3f6d7dcce8143de6b725e1040762a2a240b5bf73d77747a00d84 SHA512 8ecf182651e9c77312d5527a7cbc28802bf99a7b6f70f20113a5aea97e76a4a5f2e056d26d55b5330c0219986c8a420f51a29d756ac400060fe73e82eb4bc770
diff --git a/dev-python/pyls-spyder/pyls-spyder-0.3.0.ebuild b/dev-python/pyls-spyder/pyls-spyder-0.3.0.ebuild
new file mode 100644
index 000000000000..c4e47f6ce321
--- /dev/null
+++ b/dev-python/pyls-spyder/pyls-spyder-0.3.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="Spyder extensions for the python language server"
+HOMEPAGE="https://github.com/spyder-ide/pyls-spyder
+ https://pypi.org/project/pyls-spyder/"
+SRC_URI="https://github.com/spyder-ide/${PN}/archive/v${PV}.tar.gz -> ${P}-gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=dev-python/python-language-server-0.36.2[${PYTHON_USEDEP}]"
+BDEPEND="test? ( dev-python/mock )"
+
+distutils_enable_tests pytest
diff --git a/dev-python/pyopencl/Manifest b/dev-python/pyopencl/Manifest
index 7d5b7f512d23..5e02fe418b0f 100644
--- a/dev-python/pyopencl/Manifest
+++ b/dev-python/pyopencl/Manifest
@@ -1,7 +1,5 @@
DIST pyopencl-2020.2.2.tar.gz 352110 BLAKE2B a3bb5f74abbb5d9600651dc0659f2472f7bf91d67cf3474f7306a29ccd3a8249dc952fc1e5b81f0514990e49246d106325a6697559b260a490981541666cb3a7 SHA512 2c4f21d9c0a5d3d53f2a0e4aaa8f85f42fc6fbedc5282cfc107ff047936aa731a973605f5500b56b62d5b580a00e9f2be2aa9a259287291641ca4b4d60c51ca9
-DIST pyopencl-2020.2.tar.gz 351600 BLAKE2B 47a733d7a552f5d1f69a1a9710c3262d50c26651ed9f46146829babe28962e236e2c1b9ba3d3d14207f28bdc562323a94ab4c51dbf5fcf1a0b12282b3c6aff50 SHA512 233bbf2e99507d3a832222cc8149bf7ac17332a550e4867f843fcc2b31104d961a3f0d972b0a1878d4716b2da4548f1390560141cd09cb1ba13300c541b058b9
DIST pyopencl-2020.3.1.tar.gz 357422 BLAKE2B de9cb6408e957e30f54797ce682ed17f3272dc82019bcd9a744a0696a7e344f47645a3549332da90e0bcc442f7a8ea9c6a12a375875a9728fa9814ca9d1a9b30 SHA512 459d6f060f4203e83276c47bf832f33fc4348dd59904ea55fe2a53684cb7c8eaad45875476d10dcb6653820f9cb1f7e013c6b854410b2040b2dfe847fc1f7658
-EBUILD pyopencl-2020.2.2.ebuild 1458 BLAKE2B 432af46ec53efafe01f85fd3526802deccefcdcdd0a77e9e15a0ae92b42c9915c93a255c693504b8f586d0f8246945ce5173a144b2dc2e7440ebdfa8ecc613a1 SHA512 3f6c952a342a9d77ecea70ba6518c6204d46bb23ce18a004d0f69042848a071df099d0b7840d3036cbc0683f80cc5b6e3b97621972291d6878e722d9516e8750
-EBUILD pyopencl-2020.2.ebuild 1457 BLAKE2B b899057e68131fe0bfb4a5848f520cf557da23aa07fec39aa9bab4113696232d8152ff2f1704ffc523a0eec90f0d01f56a9dda52cabb1996bc177cfdba988c29 SHA512 2c69164b3057ca058b73c07741a111fb3583adf8928abcef98cb876514c528df594a4affde55ffae66bb4c0a2fbbdd5df972abef99ecd0517f8141e9b81edd70
-EBUILD pyopencl-2020.3.1.ebuild 1458 BLAKE2B 432af46ec53efafe01f85fd3526802deccefcdcdd0a77e9e15a0ae92b42c9915c93a255c693504b8f586d0f8246945ce5173a144b2dc2e7440ebdfa8ecc613a1 SHA512 3f6c952a342a9d77ecea70ba6518c6204d46bb23ce18a004d0f69042848a071df099d0b7840d3036cbc0683f80cc5b6e3b97621972291d6878e722d9516e8750
+EBUILD pyopencl-2020.2.2.ebuild 1457 BLAKE2B b899057e68131fe0bfb4a5848f520cf557da23aa07fec39aa9bab4113696232d8152ff2f1704ffc523a0eec90f0d01f56a9dda52cabb1996bc177cfdba988c29 SHA512 2c69164b3057ca058b73c07741a111fb3583adf8928abcef98cb876514c528df594a4affde55ffae66bb4c0a2fbbdd5df972abef99ecd0517f8141e9b81edd70
+EBUILD pyopencl-2020.3.1.ebuild 1459 BLAKE2B cb43e4cddf56b1fe1fd8e5b1896758a8dba57ea16bfe147329932c2a5f407accaa1bb3bb3f49e5d742a76c6cf852d2ca8a494bd5268cdc94643e4943e4e6ae1a SHA512 9799573e15cb4f3f7ccd3dbc364c720a2e70f99ab51f8c40c5e321b5bc567de0e07229ff8d0f4f4a37465a8fc5ceac1ec501551182658de119cd1bb9e0c3789a
MISC metadata.xml 316 BLAKE2B 46de5d09541dbd7e1ae6cb3e46a87f0f7dde068ca48dfb4f8885b3f25a2c6ad258019a7585bc6dac42a01ce41292d5458aa7ba122fd81a1fe6f12307b0642966 SHA512 1ac69571c5ff5abb94dc68dc87d02d8675e12e120dedb0bece65a9cb81764f496a587e7345b43e8037f8d7ed6e269dfa276d8482ab42fdb4f3adda336570d703
diff --git a/dev-python/pyopencl/pyopencl-2020.2.2.ebuild b/dev-python/pyopencl/pyopencl-2020.2.2.ebuild
index e5fbb9b9f447..862f4155cff8 100644
--- a/dev-python/pyopencl/pyopencl-2020.2.2.ebuild
+++ b/dev-python/pyopencl/pyopencl-2020.2.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
IUSE="examples opengl"
COMMON="dev-python/numpy[${PYTHON_USEDEP}]"
diff --git a/dev-python/pyopencl/pyopencl-2020.2.ebuild b/dev-python/pyopencl/pyopencl-2020.2.ebuild
deleted file mode 100644
index 862f4155cff8..000000000000
--- a/dev-python/pyopencl/pyopencl-2020.2.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python wrapper for OpenCL"
-HOMEPAGE="https://mathema.tician.de/software/pyopencl
- https://pypi.org/project/pyopencl/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="examples opengl"
-
-COMMON="dev-python/numpy[${PYTHON_USEDEP}]"
-RDEPEND="${COMMON}
- >=dev-python/appdirs-1.4.0[${PYTHON_USEDEP}]
- >=dev-python/decorator-3.2.0[${PYTHON_USEDEP}]
- dev-python/mako[${PYTHON_USEDEP}]
- >=dev-python/pytools-2017.6[${PYTHON_USEDEP}]
- >=dev-python/six-1.9.0[${PYTHON_USEDEP}]
- >=virtual/opencl-2"
-DEPEND="${COMMON}
- dev-python/pybind11[${PYTHON_USEDEP}]"
-
-# The test suite fails if there are no OpenCL platforms available, and
-# even if there is one (which requires the presence of both an OpenCL
-# runtime *and* hardware supported by it - simply emerging any runtime
-# is not enough) the vast majority of tests end up skipped because by
-# default the portage user hasn't got sufficient privileges to talk
-# to the GPU.
-RESTRICT="test"
-
-python_configure_all() {
- local myconf=()
- if use opengl; then
- myconf+=(--cl-enable-gl)
- fi
-
- "${EPYTHON}" configure.py \
- "${myconf[@]}"
-}
-
-python_install_all() {
- if use examples; then
- dodoc -r examples
- docompress -x /usr/share/doc/${PF}/examples
- fi
-
- distutils-r1_python_install_all
-}
diff --git a/dev-python/pyopencl/pyopencl-2020.3.1.ebuild b/dev-python/pyopencl/pyopencl-2020.3.1.ebuild
index e5fbb9b9f447..2bc9b99b4716 100644
--- a/dev-python/pyopencl/pyopencl-2020.3.1.ebuild
+++ b/dev-python/pyopencl/pyopencl-2020.3.1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python3_{7..9} )
inherit distutils-r1
DESCRIPTION="Python wrapper for OpenCL"
-HOMEPAGE="https://mathema.tician.de/software/pyopencl
+HOMEPAGE="https://mathema.tician.de/software/pyopencl/
https://pypi.org/project/pyopencl/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
diff --git a/dev-python/pyopenssl/Manifest b/dev-python/pyopenssl/Manifest
index 5643e7bc861e..d25a9d169fa3 100644
--- a/dev-python/pyopenssl/Manifest
+++ b/dev-python/pyopenssl/Manifest
@@ -1,6 +1,8 @@
AUX pyopenssl-20.0.0-libressl.patch 1021 BLAKE2B b2158cc4bcde97221d0c18204020f1cb5331a3c38826ebda16bdf8018b038a87bdf1ab4aa81cd2c690b868411663d4a6303eecdeb6743afb60e956512e1dee34 SHA512 aa2ea27211fc06bbca62ff78305d69b9fd9f0cf5d5318f956fd9b386f378b33cf99f7596f35c37343404940d9fe7f9734efcbebadff7a98e5f0f650a71bc84a1
DIST pyOpenSSL-19.1.0.tar.gz 160510 BLAKE2B e6e39f860221a2696aa3fa32ac89ed48e34b18e4accc366a86264d943a15a1b00ba1a0d8349550d1775d25836aa5d214e1e3fe4ec0a9c0f6d5ab00cd9fede633 SHA512 4acd96f287d72eb11bd812697d28cd6eb6a96a4653248b65f967187830a6b17cc1254775a18a3405469f3d45abdae6f02d165f2f35f035f3174c2826fba82916
DIST pyOpenSSL-20.0.0.tar.gz 173786 BLAKE2B 3fb1e90e20b3e083fc93f6dc8a54fb54e15ceb38c4d2e84e2d7d68bb56f9e3828cd264e3554f25465e858687e74a7f20b91216fb7a0b4b2c656ea86423cd3442 SHA512 26e8a64d53a35434ad4bf5ef50ed5c37d7b92b0db971a2103dcafea56a0b377d67333af630a31405a97cf2cffddde320907b4950ed336a8321391854bcd2c50a
+DIST pyOpenSSL-20.0.1.tar.gz 173736 BLAKE2B 37e1741425a296142d38c20c70f9950eec2bd043fc58e50c9955b98dc6825111328af852d247b154aa120ab42ea9dc2ae8186d350dd0c664cd5920b9a902963e SHA512 e81e0870398b882d77453b02e972559c0be82dbfe87bd8a48a65e8943acc3ea07dc8c3150b88e299c237496043443d1a5832219c337e4436f99ef419b36dd23f
EBUILD pyopenssl-19.1.0-r1.ebuild 1395 BLAKE2B 29ec3a4e7ca4ac8c60f6227046e80c136e12db62d493619e852cdd657a332543806e48915ee0b9613258427230e9b696d07d2295bb0ed80c837ffc5cfba91aa0 SHA512 1620336ea740370145277b48c4836d5b8d9e2c4f5d476d29c4c321194ca04adc04d1972d4278309b8dac65dd6bb8da0a1b14cb6e3689e41c3be88f8fd5a50952
EBUILD pyopenssl-20.0.0-r1.ebuild 1449 BLAKE2B dec6086e443725609c7bf5a583c65a006a5cb14a711677e8bf96f29452d920766042a16459cdc23314f3b586d3f25ad8425e84ada6c4cb8864bc5899fb55de29 SHA512 fdbd12bdc40ab48f3fe7fb0397523ba0543efcc604e7c53c34705dbf7874940859c7a7215de8292dc3f219c1c0da54415536df2cd0168e96f48251267c61088a
+EBUILD pyopenssl-20.0.1.ebuild 1342 BLAKE2B 3e8c84504b21ebcc68baa0af86f11e535d146bc22e695d85f32d53235c787daa503ba7e11360647167174ceb0b414985f3a31c03c263daa6987a31db5917682b SHA512 d16083c4c262e97f7458ce1bcf9396ad5956bdd67cfae7b35961bd1e616528ad58a4d7827b81545b1e588d530016bdc9aad59760a2ce5c27e8c4d201c94a2d52
MISC metadata.xml 535 BLAKE2B bf6dde29d0d101534792aab82e884425a32a6d96385e21e46d760902684b32d0560c57eb8be37db82365f5332906540d145f88bcd76626f00a11e12428664ced SHA512 64f374479e80652f5803b3c6ef3fbeb94c3dc23c5805b11390979be02c312c631ad8ddca0056f439f41da7ebf245119c7da1110cad637efb0e4290be9fadd4f3
diff --git a/dev-python/pyopenssl/pyopenssl-20.0.1.ebuild b/dev-python/pyopenssl/pyopenssl-20.0.1.ebuild
new file mode 100644
index 000000000000..a2cdef92deec
--- /dev/null
+++ b/dev-python/pyopenssl/pyopenssl-20.0.1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1 flag-o-matic
+
+MY_PN=pyOpenSSL
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Python interface to the OpenSSL library"
+HOMEPAGE="
+ https://www.pyopenssl.org/
+ https://pypi.org/project/pyOpenSSL/
+ https://github.com/pyca/pyopenssl/
+"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0"
+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"
+
+RDEPEND="
+ >=dev-python/six-1.5.2[${PYTHON_USEDEP}]
+ >=dev-python/cryptography-3.2[${PYTHON_USEDEP}]"
+BDEPEND="
+ test? (
+ virtual/python-cffi[${PYTHON_USEDEP}]
+ dev-python/flaky[${PYTHON_USEDEP}]
+ dev-python/pretend[${PYTHON_USEDEP}]
+ >=dev-python/pytest-3.0.1[${PYTHON_USEDEP}]
+ )"
+
+distutils_enable_sphinx doc \
+ dev-python/sphinx_rtd_theme
+distutils_enable_tests pytest
+
+python_prepare_all() {
+ # Requires network access
+ sed -i -e 's/test_set_default_verify_paths/_&/' tests/test_ssl.py || die
+ distutils-r1_python_prepare_all
+}
+
+src_test() {
+ local -x TZ=UTC
+ distutils-r1_src_test
+}
diff --git a/dev-python/pyparted/Manifest b/dev-python/pyparted/Manifest
index bdab1180e141..76b807fe49ed 100644
--- a/dev-python/pyparted/Manifest
+++ b/dev-python/pyparted/Manifest
@@ -1,5 +1,5 @@
DIST pyparted-3.11.6.tar.gz 105633 BLAKE2B 8c74fb3521f94cf726365e91954c56a60bc418c0e18c3401dc525f942169b1c03ade5fa35d5053daf4a4568b373e9a8771e50c76ea5b51c2f6351ce62ed2bb21 SHA512 8c3a86efb21c212a8f227ae324896552f45568b8facdd76729f5acf15bf7d691c1b9ab9e46885e4fa4e0c4c7d60314e2abfcbff212e5dc158d27ce716dbd50fa
DIST pyparted-3.11.7.tar.gz 105671 BLAKE2B ffe7869c7ac85f291314d0381e18ca6a732eca2cee3d31fe31a89b8b1c1c671f97a06a586f235ee67244388ab214a7e51c67951a5c1eb79fb1b448f6a004381c SHA512 147fdc45d47faaee574a7b0268a218eef49be929a147d20adf85cc0302d94e57e98e02072591ca035cad7efe164e7dd87bd1a31504f5cff8575f18d4469dc2b0
EBUILD pyparted-3.11.6.ebuild 671 BLAKE2B 5be9c6d5cfb65c7a8a4702fe0eea20e39ebf768fb144d88e228f7646bfefe3c3b64ffd588e56f15e5cfbe24a92feb803db8cb691278ffd73e8b6a000ffb3e165 SHA512 280a9da40c537cdfc295dd0df09e9ed97f2f119eecd7555d706bd67d9b725722a32efe34970e5114c374819cb121785792f74cca92f28126c90fadffd956c222
-EBUILD pyparted-3.11.7.ebuild 677 BLAKE2B c0740e0ab83ce4e31227801d3c6d001e0e1daf6ed74371b663354c3f68525dbc22e69b851b28058bea1e23f2778ad29b2c640b03ed72ad064735ff98ceabbdb9 SHA512 de20c3651fce5cc98dee52ae18bc0252767e6f458d6f37fa6befd33b54f3ab5958a3f1926426d32861e0b474df260ef8b1eacc2973dd2569740ec1f2b61f5ed8
+EBUILD pyparted-3.11.7.ebuild 676 BLAKE2B 1e4d369f84a21aeaa783bfa95743894541d6a66f363e7374b2a18b819daf7c9b99437d0994f4f4f55823d18804429f7fec29c6c7374baaf6722f89d433c8dd11 SHA512 d6c9d51a0ab47d1b7c2bae31c16d1d9743d8ae226d45fc6c4e7cfa59b3b1a0bd420757ad24f2bbf8bb7992ecfc30ba8adf2fcf14f935508dd513cfe26e16aa71
MISC metadata.xml 376 BLAKE2B 6f05ffd5c5420323e7cc8a583190efdc30e16e20d38f73765b1eea2a9572c265bc3612a3218eff6544da134850bd75863cf3c155791767efd45559ac1f1c049d SHA512 afdcbcc3d388fc555d0036416b9190e8c610a78d890b817a031f18c622c80b25cb30a73d98607fa402c548d944cd82fa9f9ed7c35899e2de20b2422f99325476
diff --git a/dev-python/pyparted/pyparted-3.11.7.ebuild b/dev-python/pyparted/pyparted-3.11.7.ebuild
index 5535859ce228..7f9144dabdcf 100644
--- a/dev-python/pyparted/pyparted-3.11.7.ebuild
+++ b/dev-python/pyparted/pyparted-3.11.7.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/dcantrell/pyparted/archive/v${PV}.tar.gz -> ${P}.tar
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ppc ~ppc64 ~sparc ~x86"
DEPEND="
>=sys-block/parted-3.2
diff --git a/dev-python/pyphen/Manifest b/dev-python/pyphen/Manifest
index 39604e526a98..477fddc46412 100644
--- a/dev-python/pyphen/Manifest
+++ b/dev-python/pyphen/Manifest
@@ -1,5 +1,3 @@
DIST pyphen-0.10.0.tar.gz 1894118 BLAKE2B c33283d6eb3dd7affb52b91826fa0f8fab8ec8f858158e905e8487dc2ad8c77a88e4b25699ed6272d246bcf8a926560e18ec224f59703452ea1ad5c921e4fb4b SHA512 b6d789ca6eb010c1c79b28a9a0e68620ea5600adc43111bed5dbda3cb8b3a4c8c05caa3fb44ea60b0ef4a20272f17cf5e6fe61f0d1e48038395407ff53da7a92
-DIST pyphen-0.9.5.tar.gz 1901384 BLAKE2B 809f7e3c204ab7de87a387909fb0d9aebd3d48586a6b1da8a683a8b1f862e2d2489babfb30c9792acca44c0fe7bd5da39c1508245ec784dce30a4c7124e91152 SHA512 049a62b226e90e568c8f56e756f8fa6fbc74f3bc40d61af8eb05ff2d4404a7b29cef14d4f144d68ed2f2b11eb128491de64536240ba7b76a2d04010c76e10346
-EBUILD pyphen-0.10.0.ebuild 679 BLAKE2B 14da6d594bc52a56c99c0f74d5c8a34f0ee6f00b0d8351ded3a66276a10082c31f7fe0cd5986f1b4794bb8fc09eb17592d6e5f38afcab09588f8867e77801291 SHA512 0a5f227802b566139d6b4a8bceae99fdd0c5a94042fef5df33988bda192af8b857a7d8ab36cac1d0728b318fcea27988c81edbfa34a4d250b74781ccf9fc077c
-EBUILD pyphen-0.9.5.ebuild 675 BLAKE2B 66b6f629cbec9c907a437d5ffff78ddbf1a9979e612181f0a4cf7c548fb822dda019803141e883f67489dcb764d145e2055c5744244d8f3d9dc852f69b849230 SHA512 3829045d3e715e7929fd171eac870c6d476bd21962f5ffeb0346a161ac991d70074085b2eeb64f6a9b26632d44fd3f46e0d37cb9b5fbb49dd8adef5a5cf67d04
+EBUILD pyphen-0.10.0.ebuild 677 BLAKE2B 9fbe1d0b8f6025d03946f1b07729f36ff4dec251fa3305a9c9863b91d8885799667b5d1e3c30e1a9dde20367c104b0008737ce848e908638b59a8085c7c1a553 SHA512 e5c76403ff5b37861fe10f285c7c82c9190eafafdab3e5f1002f8f39cb68e1949d0f448c86448f13869a8310d5fff2dfd2ff0b42408988a95e2057392981de66
MISC metadata.xml 409 BLAKE2B 3ec65099621f94904aea69465bdc2163554677e4312d51f925df9d792deb790aa1511b0c9e8fa86a4416f083b1f8b0072a71b88480c46e46ebe30165f560a63f SHA512 4462817e8689c52a47fc71cf2f73204c8a0963bffed85fd803993236aa2d36924c92a232d0bee5b3153a6dbad85c5808c2cf42df5ab8b6bd585d5045650802a8
diff --git a/dev-python/pyphen/pyphen-0.10.0.ebuild b/dev-python/pyphen/pyphen-0.10.0.ebuild
index 1dbb3a13825e..adcab1a0f3e0 100644
--- a/dev-python/pyphen/pyphen-0.10.0.ebuild
+++ b/dev-python/pyphen/pyphen-0.10.0.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://github.com/Kozea/Pyphen"
LICENSE="GPL-2+ LGPL-2+ MPL-1.1"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
RDEPEND=""
diff --git a/dev-python/pyphen/pyphen-0.9.5.ebuild b/dev-python/pyphen/pyphen-0.9.5.ebuild
deleted file mode 100644
index 545808efbe15..000000000000
--- a/dev-python/pyphen/pyphen-0.9.5.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-DISTUTILS_USE_SETUPTOOLS=bdepend
-inherit distutils-r1
-
-DESCRIPTION="Python module for hyphenation using hunspell dictionaries"
-MY_PN="Pyphen"
-MY_P="${MY_PN}-${PV}"
-SRC_URI="https://github.com/Kozea/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-HOMEPAGE="https://github.com/Kozea/Pyphen"
-
-LICENSE="GPL-2+ LGPL-2+ MPL-1.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND="test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-
-S="${WORKDIR}/${MY_P}"
-
-distutils_enable_tests pytest
-
-python_test() {
- pytest -v test.py || die
-}
diff --git a/dev-python/pytest-mock/Manifest b/dev-python/pytest-mock/Manifest
index 21fd597c0d73..f2a71bbf4f08 100644
--- a/dev-python/pytest-mock/Manifest
+++ b/dev-python/pytest-mock/Manifest
@@ -1,3 +1,5 @@
DIST pytest-mock-3.3.1.tar.gz 27551 BLAKE2B 9e3602b988c0e27caa295d42d7400cbe7e3e30392511e662fa6ec16ec9fa4ef776d3e64b63b0345d1b520f753c6776103f507f91f0bad022544bfccc510b7e6b SHA512 ffd53974f82f725cf3bdbe750c1deb568ad1a12a67532eca93ff28d80b1cbcd8ebf709985f5473717c9d54345b251c1627c0567821e9e8b9e102db5c16cf7421
+DIST pytest-mock-3.4.0.tar.gz 28115 BLAKE2B 0a7f9098955d57f7121c04f7ab706dd67eb52d8ec0b2254552460eb90b2e3fef3cd3b925cf46619532ffe7bede2f208bf822e465647f3ac4504566c18ff58a75 SHA512 5456b60bdd06a63859232b28aeb79be643e8298e69ae103cb6e194891987e01b17771ad895dfead97fa45531959689fb202bb1ebc9ba44491098760c10d1ef43
EBUILD pytest-mock-3.3.1.ebuild 955 BLAKE2B 3206260037284cdc8f2d6b7c521a58225c149e99d97475087bf39170bf26b75c69ce0f683b6e564d779f342463a7afd9f697579207688ec336399ca546e18a4d SHA512 a1648c76ad6e4e4cbcf89b221adab82d51089d0dae49358456907c5a8980bd3106cba2b7e0aec344e166334534c5732653204fa1c047ad060729a9868933ed26
+EBUILD pytest-mock-3.4.0.ebuild 963 BLAKE2B 97ad64c97530064e3957ceb7ef7642e76c9c98384e056db8889488e11c9f4f5c9cbeb52a9575aec6934850ef73432a8d1a503fae2ec9b0b96cdd388e3afeb8aa SHA512 9d80293fc9109c11c89a02e78b8fd3d32089ff6086a9cf1fc4920fcc87d52acc23aef64875ccff76c373f13b1a3e646ef7393c238008277b3132a444d485b7cf
MISC metadata.xml 457 BLAKE2B 9ec62ff0eda60ae60bb1b63509ecc696ae4256d1b3ff00c9b7f834ffd735f87edef57ccbfb78a2f9002632c4287b581a8a81003c45601b314059675a8f2d288d SHA512 0defca8aefe2c6bb95d36112b14645d93c8bc5b8db08956b97b9a42cf4a7e1d97170068937e6ec818e43d4d6afd7ef414e1d5d7f4b72bae71291eeda9caf5c1a
diff --git a/dev-python/pytest-mock/pytest-mock-3.4.0.ebuild b/dev-python/pytest-mock/pytest-mock-3.4.0.ebuild
new file mode 100644
index 000000000000..dc04d9251c5b
--- /dev/null
+++ b/dev-python/pytest-mock/pytest-mock-3.4.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Thin-wrapper around the mock package for easier use with pytest"
+HOMEPAGE="https://github.com/pytest-dev/pytest-mock/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+IUSE=""
+
+RDEPEND=">=dev-python/pytest-5[${PYTHON_USEDEP}]"
+BDEPEND="
+ dev-python/setuptools_scm[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+ if has_version dev-python/mock; then
+ # test fails when standalone mock is installed
+ sed -e 's|^\(def \)\(test_standalone_mock(\)|\1_\2|' -i tests/test_pytest_mock.py || die
+ fi
+ distutils-r1_src_prepare
+}
+
+python_test() {
+ distutils_install_for_testing
+ pytest --assert=plain -vv || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/pytest-regressions/Manifest b/dev-python/pytest-regressions/Manifest
index c009aa24e8c3..6b9d53487207 100644
--- a/dev-python/pytest-regressions/Manifest
+++ b/dev-python/pytest-regressions/Manifest
@@ -1,5 +1,5 @@
-DIST pytest-regressions-2.0.1.tar.gz 77934 BLAKE2B 4bf9868afd3bae1ab1668a6cb75bbc661336b3bd7dca23b0b6e0ab810cb60645737e45008c74a09f90763869982db5d819f170f6b251d9419681ceee810c4657 SHA512 9c35f356ef2c2914674b022b4a357ec75a4a12c8090c44d959111f1eaa1f10f492f8103098b273292bff08a5957d7f2ae3f0b0bd051438d6467ce1491f234d97
DIST pytest-regressions-2.0.2.tar.gz 78362 BLAKE2B 67c37c49230d5b84869b0743ef5e4c6b83cc7869ab12832cef9ac4a09c7199d141e064809e6532e325c3b4b22385468ecdde3ea0a021523930c849b78e4bd8f7 SHA512 8c9959a9d84fb6c055b90b38ad6aabdf8e9459931ca50c959f395280199aaa707844330d26b33467119e77f3d50a51d76dd648fdb351de9228c8d54dc047c92e
-EBUILD pytest-regressions-2.0.1.ebuild 907 BLAKE2B d6aaac9a0f09fa9cd6ddd9b0dfe0f87dc036cfd356d5c084bd46be86a06d15764963cbd5808ae713c43b87cca3830b154b871852a7ac99cf74a855c4316b2810 SHA512 c91210fedfe17a3a55070d0b0aa1b57b565e891305df76818f92a2516bb819ce8dd41e6e00c0d4f583ea761acccca16099345d010171bca19dc71a46b12b4ad7
+DIST pytest-regressions-2.1.1.tar.gz 97596 BLAKE2B a0c62ec1a0c1f66d0539780008a99bcf7fb0f9bd6d73198154c9a1ebe9830679d4fb57f989a2ac03c19cce7ac617db26c07857581d2bf753fbe18358a9edcecc SHA512 488bf42502ad18995c1f1e7f32677c500d14869cc0e2655400610bf18b73f48538025c08fc23758737ebb92deba61b130a1f6f82a75f71d93f03181ccd74a9c4
EBUILD pytest-regressions-2.0.2.ebuild 817 BLAKE2B 9bfee7b2c0f6dc519398070d839647d90ae1344c71b9310bccd3445f1ad79298a39cd638eb0ead1505c9b827105d6f9e6e78416a88d60522e7387cb9103fd895 SHA512 c085736fabbb6aa79f53b5ce5e1a1671a0e5b60bfb48c6d7d95a3301b4eb01a8ce4005b9bd54de03870361febb56d3c91082dfedc1da81e0f0dd5459a8819208
+EBUILD pytest-regressions-2.1.1.ebuild 1060 BLAKE2B fa64a78fcfc1d84d69326fec21e1c92ba5af51d0d0f04cf8655a6a0477e24dde1e64e5795ba3a28959c8bb2544602beaed70df26cb1ed79240f8497ef9967231 SHA512 6606583e168939f0375bbaf13aae826e4e77d2c77157aa9fc3fcea9a4f967969d8aac9848ba914801ab8e06f96d98e192290b9a7508468afedb7ef34fe84efe0
MISC metadata.xml 480 BLAKE2B e6c6ac7fcdf6df37deb29f3551fac8fef3a9282ceae658aea4d80fcc7950e34805b7b3f77b87a9231c4b251e58f4076ef150b9e49744058ef298cb2278f5f2b0 SHA512 2659af13e07c58c86cf62f78f7196a92553411cdb1876e234d2a166a973ad49ab0c0d57df5d32e291d0d49e44dc9ce82b7dc2ae3f5ae24553524906151794d3a
diff --git a/dev-python/pytest-regressions/pytest-regressions-2.0.1.ebuild b/dev-python/pytest-regressions/pytest-regressions-2.1.1.ebuild
similarity index 71%
rename from dev-python/pytest-regressions/pytest-regressions-2.0.1.ebuild
rename to dev-python/pytest-regressions/pytest-regressions-2.1.1.ebuild
index c744db0e2a9d..a0b17c024ef0 100644
--- a/dev-python/pytest-regressions/pytest-regressions-2.0.1.ebuild
+++ b/dev-python/pytest-regressions/pytest-regressions-2.1.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
BDEPEND="test? (
dev-python/matplotlib[${PYTHON_USEDEP}]
@@ -29,10 +29,14 @@ RDEPEND="
dev-python/pyyaml[${PYTHON_USEDEP}]
"
-distutils_enable_tests pytest
+distutils_enable_tests --install pytest
distutils_enable_sphinx doc dev-python/sphinx_rtd_theme
-python_test() {
- distutils_install_for_testing
- pytest -vv || die "Tests failed with ${EPYTHON}"
+python_prepare_all() {
+ # Does not work with the panda's version in ::gentoo
+ sed -i -e 's:test_non_numeric_data:_&:' \
+ -e 's:test_non_pandas_dataframe:_&:' \
+ tests/test_dataframe_regression.py || die
+
+distutils-r1_python_prepare_all
}
diff --git a/dev-python/pytest-xdist/Manifest b/dev-python/pytest-xdist/Manifest
index 89388cf92b1f..1a549131c7cc 100644
--- a/dev-python/pytest-xdist/Manifest
+++ b/dev-python/pytest-xdist/Manifest
@@ -1,6 +1,9 @@
AUX pytest-xdist-1.34.0-pytest4.patch 1839 BLAKE2B 6f16b51b8b8415390d66b5763afe038e035e22f4f5e2db637497284c52a0eb271d4fc2a9585414ca5d3e34354ca84e2f291b10344331cc1c25663d616f34c7d4 SHA512 d25119e0f26b4b9e97764c962c83e43ca5564e27f711374ee1d1932de0917b30671e29c98799f61bd436f6b560abbbf379a24ce79271c5dbc7ed4563ee145b4b
+AUX pytest-xdist-2.2.0-services-conflict.patch 1097 BLAKE2B edc3ecb79578f89e9ce5515e194dc16df34abc2685d9fb78cc5930f29893dbd9e145c95e5b1f58bf252710c57964ea00dc8b71e20fd0aa713e9b9ab2d8d29a93 SHA512 50155aa39d0a87be7a22d0ccf6c9d8eacc8ce4342baa3fd67839b3c5b4d05b31fef5786a60e15051de3000b3ee3494ddb48feba43850d677484e239ee4be8b02
DIST pytest-xdist-1.34.0.tar.gz 66151 BLAKE2B ac5274e32b3ef6b72113efd4300eb6946a977e0e202d3383abcdbc022126b7806edb326ddc16abb1219e22eb091e06a9c39fce3031aaf5943d4ad653a47af142 SHA512 69e9877ee0268d71d7c0ca202ccc46b3ba1a9271f0e6e4ac4b76602833f9b7012364eb6924ae994e76c1d48d63adf1702d4c5e6ed5b75c52ac7ebae958210e24
DIST pytest-xdist-2.1.0.tar.gz 66332 BLAKE2B ac3c19a32bb9153537edfcf55bc656011661cf0d166da1aba969055a398616bb5782534a12ba354175be722c070fcfb2013d58405048814a3d11434a314e38b8 SHA512 85c69d8e649a19de5639738eae4cb213dc7323d96883ec82f39ab51a196346edd9fadbaf97f9763ac0dea104bc123d521264a39d2701878edfa76ce7e5bb347b
+DIST pytest-xdist-2.2.0.tar.gz 64781 BLAKE2B 17287c28f31c42c6a8fe3622d4ba920a530e0ced3bc99cffd8f9de91c3498cc2a3b654cc32bd5b09ee8ec6c1f64226aec736acafd73397be2eb34bd3d192bb46 SHA512 2027f8512fbd6cb68ab36eb774b9d8b7e855c181733b884f394d0e84994926b4fe6158dbd55808328b262497036f101e71cb86553340eba0031d654f34541689
EBUILD pytest-xdist-1.34.0-r1.ebuild 1036 BLAKE2B f576f44fdb55876e9cf7ccaec9ce5ffeede2095111a48f2455da590cc4c053ffac094b21baad142dc9ed54c654af423b29c4f7719dd32ff49da2d2f149e666d3 SHA512 3dc96e04f982a62f24f9ab9b2748dbd1a97c486ae3feee09b2e6fbd1ae4af6910455c456537453fa48d3cb85e03ac09acd7d26512a054e3aff83b5dc28591f62
EBUILD pytest-xdist-2.1.0.ebuild 1147 BLAKE2B 5f8b2db3dda86e53857ae6155e4c13ec868f744b9113c012ee961cd651584f010125d3ae3539deb5b3bab106397211cea17de81f8c506e9d1fc7e2cc50a4f7b7 SHA512 c9ac3c5c1d0e4d728e0edaa5ae122248a0c6d7ef426573e50274385b0ccca14feb3dc4a1112e00f11a23bf8529a036430b8f239cfde386d0c9cc407dd19ba5a4
+EBUILD pytest-xdist-2.2.0.ebuild 917 BLAKE2B c19d098863698507d64abf3724e0de9e411ed797f30e75d3d3e6be0c087830c1d54305b04d2e6e15175fecc25020a26957f7472203d33303619d1e4bfd39a4c2 SHA512 2af3e8f5fae4fc3a1a8b9ab51c7ac9f9fe1d7a4e05b9f6e03d1a9f067e840c1d18d551f13b192e041566d4b05a82318735be746eaff728bf0c2ca76b85d2e8b3
MISC metadata.xml 402 BLAKE2B 9e24660b4146f94ecdf375e3bd89a9ab01157ab7c7e9b37fa183eaad12edfbb6574ecef4a98e6079b3dd81e6614b5eb23b0bfd69c9468abde7bbc073e8ef44b4 SHA512 7fbab209b81bba0684b9dad109dc7ba64f9c496e5ad69fcbc659f9361aa131f6779a5419a54112b4ff1c2a63a9deef5f36791551165b1b4b7219c7a00fe93060
diff --git a/dev-python/pytest-xdist/files/pytest-xdist-2.2.0-services-conflict.patch b/dev-python/pytest-xdist/files/pytest-xdist-2.2.0-services-conflict.patch
new file mode 100644
index 000000000000..2c911601b070
--- /dev/null
+++ b/dev-python/pytest-xdist/files/pytest-xdist-2.2.0-services-conflict.patch
@@ -0,0 +1,31 @@
+From 082beb2ce0fe1f338311d85e656b962df8a16ce1 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?=
+Date: Tue, 15 Dec 2020 11:38:53 +0100
+Subject: [PATCH] Disable pytest-services plugin in test to avoid worker_id
+ conflict
+
+Pass "-p no:pytest-services" in test_worker_id_fixture() to ensure
+that the presence (and implicit loading) of pytest-services will not
+cause the test to fail via overriding worker name.
+
+Fixes #611
+---
+ testing/acceptance_test.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/testing/acceptance_test.py b/testing/acceptance_test.py
+index c273bfa..3bea8fc 100644
+--- a/testing/acceptance_test.py
++++ b/testing/acceptance_test.py
+@@ -1025,7 +1025,7 @@ def test_worker_id_fixture(testdir, n):
+ f.write(worker_id)
+ """
+ )
+- result = testdir.runpytest(f, "-n%d" % n)
++ result = testdir.runpytest(f, "-n%d" % n, "-p", "no:pytest-services")
+ result.stdout.fnmatch_lines("* 2 passed in *")
+ worker_ids = set()
+ for fname in glob.glob(str(testdir.tmpdir.join("*.txt"))):
+--
+2.29.2
+
diff --git a/dev-python/pytest-xdist/pytest-xdist-2.2.0.ebuild b/dev-python/pytest-xdist/pytest-xdist-2.2.0.ebuild
new file mode 100644
index 000000000000..7cb664b2df30
--- /dev/null
+++ b/dev-python/pytest-xdist/pytest-xdist-2.2.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Distributed testing and loop-on-failing modes"
+HOMEPAGE="https://pypi.org/project/pytest-xdist/ https://github.com/pytest-dev/pytest-xdist"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+# please do not depend on pytest to avoid unnecessary USEDEP enforcement
+RDEPEND="
+ dev-python/execnet[${PYTHON_USEDEP}]
+ dev-python/psutil[${PYTHON_USEDEP}]
+ dev-python/pytest-forked[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+ dev-python/setuptools_scm[${PYTHON_USEDEP}]
+ test? (
+ dev-python/filelock[${PYTHON_USEDEP}]
+ )
+"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-services-conflict.patch
+)
+
+distutils_enable_tests --install pytest
diff --git a/dev-python/pytest/Manifest b/dev-python/pytest/Manifest
index 6bc261b04598..967dad146b4c 100644
--- a/dev-python/pytest/Manifest
+++ b/dev-python/pytest/Manifest
@@ -4,8 +4,10 @@ DIST pytest-4.6.11.tar.gz 952305 BLAKE2B af07adf5e8fc614b1fdb7b5673fb9c557ff0dd3
DIST pytest-5.4.3.tar.gz 1022353 BLAKE2B 70d4f23cbbfc4c4ce63c512ee0a01556973761a6d3ebb71a6d9ed4fb4a4a21531e1b151ed0e4c5e56e5dd3243a1a272441f17c4c2c4e3b0b19c24654b74e8e52 SHA512 0a07d4f4f791969c6f21961a0ba0f8c6670e5870c6cc1cebf93766587bb9cb3e10db8e57f0bd33dd22b275f3aad7aa674949f124ac80e0ccca64e35be4beee4e
DIST pytest-6.1.2.tar.gz 1084943 BLAKE2B cbdf29c54118b5daf699f11fb674d37d5972a163a7a53f42f6ddf9224e2d8d9e84b9a88106d5a77e70f470ccbffb15c2cf9a939be69bc0a2cab1fc4c76054562 SHA512 6335e994c5273881c8d1c334fe6bfa9cd0a3e5c251f3d6a9332f7f7c1427e6560ff48d8f235b307ea5eb53491072daf30c41f566bb67b304354fd88d286c61b1
DIST pytest-6.2.0.tar.gz 1101619 BLAKE2B c59d5c23c70aaa7670eb0e96cd5d57c6cdf21f2cdfacc2fb9c01a6baf211f85e5f757d7087589db2dc9a6f0b387ec7b25da5816d4cffc86f6e2c3c08b9f07f59 SHA512 58315bb5f9a696f5196da08912a0f32fd367ea11987d37ff74b0d00d961bb706e0d3604bc7c25a762e4ee66bd46ef4389b50eca11b3109406c169aefff395d51
+DIST pytest-6.2.1.tar.gz 1102958 BLAKE2B 336757fe911e2bfa1041d7d9c1f83ce66418c55bbe0a1accdac45a36ed5ace972f124bc5f68d2847e3d310bcb2e68a8ced04c74e818ff6f1d43c3ba8b915332d SHA512 abd130212411e0a26265aec922958053e41d05d09d14942b75c1ba81d0ad7c5115d851110a257b32f0b05a2d515961ad068a1fd65f7e275cfe65d16150d008a6
EBUILD pytest-4.6.11-r1.ebuild 2473 BLAKE2B 4a5edd72d94553b553730a5caa2c17c25826a5be58bce6273d39d2a010a70c1fa1f8acb0751c3fe5185883a94da31ecd7e772f606c82d8d99b639804bd49d5d4 SHA512 da60063475df3b7e9e531b234e486bcafe7c1e926f58f7ebaa8e38cb02233629160aa20a9b665fddb83e50f52b0b46702b8a80e65195af4ff7b3e939927db9cb
EBUILD pytest-5.4.3.ebuild 1940 BLAKE2B b17bc0f3efe70c149ee494d2528f8e16a839c4cb2965378ab6c8b37e3c1b295bab253edd8410f6f2a69cbeb288d6299898320d387330e2d7b5b31418e985a0d8 SHA512 d99fa3064053e3ac99fadce4b23749e16dc2d9e6658f3ab07b1e68c1885d9fd243f4ab4f5462e127b9afdbb957bb498c41126ce79164a31cb2accbbaa1f4b7e9
EBUILD pytest-6.1.2.ebuild 1662 BLAKE2B b75f29897f6dde0657c243ef4e039f364fc7ca3a942fd5796f4bd23e35ad48122224016217702037a6ccdbcb7e5b7d7c10023e3ec3dcd807828b33b6c6f3d5d9 SHA512 b0b03c1b9ac2970ba93669862088045ab117e3e9832f626ba08c8fb157379370771f2d5aad2153e55678742894efc54cdae9f4a51a1027b7efbae5c300cc443d
EBUILD pytest-6.2.0.ebuild 1686 BLAKE2B 6256ff3f90b0dee2deabd17b4a3e8bc30066c0b0d31f6d11fadd8c77807cb27e04b1a465ddbd1967891c7558321920703d1cb9b9b03c4becd11790aa87740ecc SHA512 ef65bb620f290a9b61c92b6569b19f73d603d7e120ea1d61238f8c7da0568a59e170c240e3d910f10fee2c9d4ca51f8f597374bf09684ae10136015c003e3c6b
+EBUILD pytest-6.2.1.ebuild 1686 BLAKE2B 6256ff3f90b0dee2deabd17b4a3e8bc30066c0b0d31f6d11fadd8c77807cb27e04b1a465ddbd1967891c7558321920703d1cb9b9b03c4becd11790aa87740ecc SHA512 ef65bb620f290a9b61c92b6569b19f73d603d7e120ea1d61238f8c7da0568a59e170c240e3d910f10fee2c9d4ca51f8f597374bf09684ae10136015c003e3c6b
MISC metadata.xml 333 BLAKE2B 2155c30735de72aace8fe3e88a16c011f3961b4b644d761be31c45094f243f1eeeac1803f5a74219198039dcf1f7474531b2ec814a3ed591c59fd6d9ad5a914a SHA512 c59e04710dd640b2e7bb0214e52b05ec50367d895d057886ae9bf9342312006e7b21f5625e1c4f5d7a9e12a7f7b64a968e5371f8c2c45a8ac8b1c8ca6d39b10b
diff --git a/dev-python/pytest/pytest-6.2.1.ebuild b/dev-python/pytest/pytest-6.2.1.ebuild
new file mode 100644
index 000000000000..8bbfc6be1bf1
--- /dev/null
+++ b/dev-python/pytest/pytest-6.2.1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Simple powerful testing with Python"
+HOMEPAGE="https://pytest.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ >=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ dev-python/importlib_metadata[${PYTHON_USEDEP}]
+ ' python3_{6,7} pypy3)
+ dev-python/iniconfig[${PYTHON_USEDEP}]
+ >=dev-python/more-itertools-4.0.0[${PYTHON_USEDEP}]
+ dev-python/packaging[${PYTHON_USEDEP}]
+ >=dev-python/pluggy-0.12[${PYTHON_USEDEP}]
+ =dev-python/py-1.8.2[${PYTHON_USEDEP}]
+ dev-python/toml[${PYTHON_USEDEP}]
+"
+# flake cause a number of tests to fail
+DEPEND="
+ >=dev-python/setuptools_scm-3.4[${PYTHON_USEDEP}]
+ test? (
+ ${RDEPEND}
+ dev-python/argcomplete[${PYTHON_USEDEP}]
+ >=dev-python/hypothesis-3.56[${PYTHON_USEDEP}]
+ dev-python/mock[${PYTHON_USEDEP}]
+ dev-python/nose[${PYTHON_USEDEP}]
+ dev-python/requests[${PYTHON_USEDEP}]
+ dev-python/xmlschema[${PYTHON_USEDEP}]
+ !!dev-python/flaky
+ )"
+
+python_prepare_all() {
+ # fragile to warnings from other packages (setuptools)
+ # little value for us to run it
+ sed -i -e 's:test_no_warnings:_&:' \
+ testing/test_meta.py || die
+
+ distutils-r1_python_prepare_all
+}
+
+python_test() {
+ distutils_install_for_testing --via-root
+
+ "${EPYTHON}" -m pytest -vv --lsof -rfsxX ||
+ die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/python-dotenv/Manifest b/dev-python/python-dotenv/Manifest
index ed76a33f5755..1df6748032f1 100644
--- a/dev-python/python-dotenv/Manifest
+++ b/dev-python/python-dotenv/Manifest
@@ -2,4 +2,4 @@ DIST python-dotenv-0.14.0.tar.gz 29029 BLAKE2B 33db159192faf9b74439b5e98e2b9a090
DIST python-dotenv-0.15.0.tar.gz 30008 BLAKE2B 1a406145f0d0497aa037dc95b80fb04854b2889ba4014e4689a24b142d5d71c49d24ac60406f8b2dc873e661c19e36604ef58eb03c7bc9f890f6d4561be199a6 SHA512 f1f16d2688041259027b12920ac5f47c2d1d96cfc3ec8a362a05ddfb13fee2cf4926c20ad38eda521fcafb6eef8d7895d86dedadef1b1ea2ecd7e33734b07cbe
EBUILD python-dotenv-0.14.0.ebuild 842 BLAKE2B fd90de3669b9ba35fff65bd181d1cadcb716a29a9eb3c4d03bd69af904da243de5013705653aa693b29806be05479f0cba385feff72559b273be9f148ba2733f SHA512 39817ab53ad40ba1ef9ffb0bc3bfd6de23b55e2560e039cbeaae05a9c2a0d670dd368f8830aa25f57bab899b176dc735206fa8a2c658fa40449cf9c6637cdd0a
EBUILD python-dotenv-0.15.0.ebuild 844 BLAKE2B 04ffcf0f214faabdcf842d2294a757be9ae5db4f2b70ff05b73761750d25934da350cae01f5fb00b42049e9d8c9e2bab149a1b30ae17591873ec5e046789af14 SHA512 3ef07ae1fc7a2554a14d39db75f3906a9002ede7e41283e5c4599fd29e30b03f1017b7994c5a0f3a5b80703d12b5cef901a3e0d233c325a0e8fd5c87379b823a
-MISC metadata.xml 441 BLAKE2B 5735fbcb504ce02de58403da4a85a52ff277b03924d0ae950ddc05228d39fc4b318f18a0e72f72a8c500c33bb53fababe7ae4304ae3d09ee7887b986754ff0b4 SHA512 fc197fdd0cb126045f91efd3d9564ce2ab9f092d0fa3ccdd4882dd19114b2947eb60358e069ab18ff890e263953156e7cc385161da13c6167c7b99a2507d4f88
+MISC metadata.xml 465 BLAKE2B 9b67c317b80cf8956d86e3482f9bd4b8824013c758e13c53865c4c8b428127a39188b23776176e038b4e58f8eb4e28b6ff7030df75a300bb647f969ef979a551 SHA512 f4bbf11566f50c90aeb7684755651f9112d3ce12dbfc425aa209eeff7c5a2636688a9236bd5227961cc334c07c82f49da0f4f27c3189bb7a0a8f76b517e9036f
diff --git a/dev-python/python-dotenv/metadata.xml b/dev-python/python-dotenv/metadata.xml
index 8acffd41cc4d..8ad23a577b8d 100644
--- a/dev-python/python-dotenv/metadata.xml
+++ b/dev-python/python-dotenv/metadata.xml
@@ -9,6 +9,7 @@
python@gentoo.org
Gentoo Python Project
+
python-dotenv
diff --git a/dev-python/python-email-validator/Manifest b/dev-python/python-email-validator/Manifest
index bf9557dd2963..ed539b8f1551 100644
--- a/dev-python/python-email-validator/Manifest
+++ b/dev-python/python-email-validator/Manifest
@@ -2,4 +2,4 @@ DIST python-email-validator-1.1.1.tar.gz 18497 BLAKE2B a65a5603854920d022062fb4f
DIST python-email-validator-1.1.2.tar.gz 19421 BLAKE2B 118165ceed5da6fed377180662496f5bc996f1d3c2201e6a014cae8f66a9ff3f447900aff07f778fdec49cd0c680ad6f9316f30f6c152b7eed4f1f57adc1ba74 SHA512 b40f8ecd65a9a5945a1a84b174398fc495afccd27ad5fcd7b4a03ecd26bcff6dd6ac3b5f75ac200cf2647b92d4defb25afe1dda28f82ed86bd8c2bd82708d0aa
EBUILD python-email-validator-1.1.1.ebuild 819 BLAKE2B fa518aaa7f447540775b5a4fc2ef0f93eff7e17ed695d37fa6a6f5c853143551d4b24339fc3df8bdffa845d685146c9ddb8bc7b28d7ccda6b113c6fdd3365358 SHA512 4f053aba850bfd0c76c1bd1cbeae8b30ea09f25c8b3e227bde6642733f1707180f9794245ff0b1e385a658649fd3be5ec4ab7938ef91fa0531603f359753a558
EBUILD python-email-validator-1.1.2.ebuild 821 BLAKE2B 6fad7946d2b19b3323d766d00e670133033ddfc0c0d47edd382bf90f438814089f8baf541db23b43e033c77e8fdaf7014845c9b080f51e95b8d49514e16c026c SHA512 976766dd671f1bf7b10466fb0011e1701b1e642efb6f6c2ffc019ca986e3700a39a2953d4b0afbb053e4d60a11e52915e619a4c0f5734999bbeb19d4b1a8a534
-MISC metadata.xml 738 BLAKE2B 84c1f0f3fa44e391de12ddc2eabf45020499a8244f1a96bea47c49fa9f946c07cfaa68ded9c8b62f144431d322fc1bf7c5c2ac67b3a628f982e224b8fd920d2e SHA512 7b158b2e20c466264f02b338bb16d8fdd2b1ce527f35eb8f61c4f4692df50ae51f8bbdecd5a21f1660ec10323397daf1215fed2384ebb9c4df4ac9ff78a7b46f
+MISC metadata.xml 762 BLAKE2B fa66973f32734b810addac910f42d2e3ec8117934d555a1866e90f4c427f5c19f8204674bdc700e98ea112112f083f22adbca58fa29f90266cfb9e52cad19341 SHA512 8c0371c9d5605a3ecd4ee5d354ff78a53738726e9882114db49bb442fcde9fead3ce7934d9c4e8af82c5d44fe80ac34910681d700eed6ee97862bcf77889f851
diff --git a/dev-python/python-email-validator/metadata.xml b/dev-python/python-email-validator/metadata.xml
index 43109320ceb5..c1a47f0f99d0 100644
--- a/dev-python/python-email-validator/metadata.xml
+++ b/dev-python/python-email-validator/metadata.xml
@@ -18,6 +18,7 @@
python@gentoo.org
Python
+
JoshData/python-email-validator
email-validator
diff --git a/dev-python/python-jsonrpc-server/Manifest b/dev-python/python-jsonrpc-server/Manifest
index 26dda755ce70..6ad4216040f5 100644
--- a/dev-python/python-jsonrpc-server/Manifest
+++ b/dev-python/python-jsonrpc-server/Manifest
@@ -1,8 +1,6 @@
AUX python-jsonrpc-server-0.3.4-Python-3.8-fixes-for-endpoint-and-tests-37.patch 3003 BLAKE2B 9b4cb5168bd591a8832ddc3bcb14797adb58b5acbf5d4be22d7a6d5e559ea32013670417e15005c123d4d322e4af53b866cef0ddcf2f9a1720d200686e11ece9 SHA512 599cb7561e1fdee594f9059a6a669725e6b0d1909309bec28ede40d47a0e2a151f419011279cd8823d4a2946499696d240d099b9947784d19dc457279db20c20
AUX python-jsonrpc-server-0.3.4-remove-pytest-cov-dep.patch 359 BLAKE2B 73548cee569f25bfd6cf98897ab5553507adb4e2f28a2cad6029451432f2144a8de2643bec491a1937f88fc2b7bb3a2f23dd1b56bc82eaec94f206fbdf0b133a SHA512 d8a7ac71a897d4dce9290b51a658443e5b6c954e38cd8477a55a5e3b8abaabf033a9f34410eb282156340efed36758a904eb2473a91b01fa181615fd8a641761
AUX python-jsonrpc-server-0.4.0-fix-test-with-ujson-3-and-up.patch 341 BLAKE2B 99635861a87bcc613540c0440edba10a3011c43ddfe91e675483db603308a655b8b77a832fc013016c7d3d0fe1dbe7c02f925dfc6b20cb514a37ca3d66c3dafa SHA512 3da608b3c7ed162d2b32c93f2f0733cc26e3ae218c65d3000d607a553240baef8ea47cddd8323caa58fea2fec59e8bf3f9b120a977b4522642b88ae55cf88f28
-DIST python-jsonrpc-server-0.3.4.tar.gz 26123 BLAKE2B 5d3c7b910cc91999f7f03a70a1f954decd11801b4dad39cb940625a3456fb69a8e6a146c128d29d347f1513a9f27208f1f39208d3449443be8278e0d175e6598 SHA512 a00af318baf89fe38ececc2080d7b3af8c2476280f9eb89670e5b0d3ceac046573be964bc2882c1b1894edc8ab4cb5fd69366980abe17bb1df857181821bcbd0
DIST python-jsonrpc-server-0.4.0.tar.gz 26491 BLAKE2B 524dbd0692861bff538d9db06facda4bdad74c84d3c047a374db658adc31eeb799ba0c4b0219597b04c75cd6e2db3968ba0cf4084ba235509c2457c22b3e1497 SHA512 062e5b75253b95e64918a9da86ad7e29d8a29019670e451b9a28d44cde064339953004c343be0e7dd40968ec9fc2420b5722265f56c2db8057d0f1eaf088dacc
-EBUILD python-jsonrpc-server-0.3.4.ebuild 823 BLAKE2B c5bed3fbd7d925a276095e4791ae344a7feaacc4b5ae42a8a4fe5c11cb019754ba75056c174cb1c321fdaced435548c55d068f459ddda5c85731f7521aca8e8e SHA512 d4c1ad78e518e7ed585908deebcd1ae2238dfeb45495a712b84cf23590e95f1010c96258f98ba7b586966ec2f7428de6777a8b4a531f7aca7cc6b71ba6f779ee
EBUILD python-jsonrpc-server-0.4.0-r1.ebuild 821 BLAKE2B e3f5797334c29a39ccfaac7efe5ecd26901ec677f4708a82b8f1d4cae55e9fbf3b18c480cbb218006479788c39c224aefc6995227984281214b07e09f24e84cb SHA512 86e60b631f68bdc81b4ec53d0a26441d8a2369d713703808ca37f234680610a02ea5cbb7c6d026e0cb95abd58dfe4e17a09bdc005d513c2b7b754c6b4aa2cda8
MISC metadata.xml 459 BLAKE2B f052cd6b712a1d4dc7d0116ea6985599b124d57e46bc529f86aee675e31e5a7c4367326590a6075d470f765c1d6c0f69289f517136b4cac1b29a7328f82f9123 SHA512 20ecd3f908a796cfe24f6e0d544d3440c219dd6a8441e099e53195b2898219a3b3e8aaa915ec5f59f21b49eef363aece1f863e8cb7c479a2f1eca6a21a8fd6a6
diff --git a/dev-python/python-jsonrpc-server/python-jsonrpc-server-0.3.4.ebuild b/dev-python/python-jsonrpc-server/python-jsonrpc-server-0.3.4.ebuild
deleted file mode 100644
index 6dc4dd963bf3..000000000000
--- a/dev-python/python-jsonrpc-server/python-jsonrpc-server-0.3.4.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="A Python 2 and 3 asynchronous JSON RPC server"
-HOMEPAGE="https://github.com/palantir/python-jsonrpc-server"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-BDEPEND="dev-python/versioneer[${PYTHON_USEDEP}]"
-
-RDEPEND="~dev-python/ujson-1.35[${PYTHON_USEDEP}]"
-
-DEPEND="test? (
- dev-python/mock[${PYTHON_USEDEP}]
- dev-python/pycodestyle[${PYTHON_USEDEP}]
- dev-python/pyflakes[${PYTHON_USEDEP}]
- dev-python/pylint[${PYTHON_USEDEP}]
-)"
-
-PATCHES=(
- "${FILESDIR}"/${P}-remove-pytest-cov-dep.patch
- "${FILESDIR}"/${P}-Python-3.8-fixes-for-endpoint-and-tests-37.patch
-)
-
-distutils_enable_tests pytest
diff --git a/dev-python/python-language-server/Manifest b/dev-python/python-language-server/Manifest
index 0ea70908e73d..95773d7104fa 100644
--- a/dev-python/python-language-server/Manifest
+++ b/dev-python/python-language-server/Manifest
@@ -1,7 +1,7 @@
-DIST python-language-server-0.34.1.tar.gz 70238 BLAKE2B 55ec41875907bb6c09f682c8ce6165e7e2fab5d03c3d4758bcbe658968aeeee7f0316a472efe68ddd87872b0e2d34908c8a7e9528aa5eec6d3359b2565a2cbbc SHA512 12404753f4271ec3606cee535ba8e886037bf0c61cc5c4415358066be837e2248f6393124340551387cba7351dee924b4f5ebc9c4e35b1ab0943067968967a90
DIST python-language-server-0.35.1.tar.gz 72944 BLAKE2B fe469e5365dec4a2192a2ca2f75fc9f05476434c0f6db26d851521149053455b256678ed98c5f1209d30b262808b615a3f7ac77fb604adf1455203e40f93c96f SHA512 278f281c8c82729ad60db2785b3f4b64568de529edb7a6f1b5683d09838ea43ed79182c50e42210e766b9a3f3c10b0c0256121b9925803c45f9e948f144ca994
DIST python-language-server-0.36.1.tar.gz 74524 BLAKE2B 3337bf4c91204302b26b2496bc79ae6e0c18143f89ef97861dd91760b27406eba8fc9895a2f00c5c2de3a990eeb8ba29ba10319262466a42b1fb362af809060f SHA512 4a8150cf1334e9b2085e9b4ca7165404f30127339bd0fe8db229924c67933bfcd7827a875136b1694a82d4f447255862df116bc6d74a51df8e1ed82a6875914b
-EBUILD python-language-server-0.34.1.ebuild 2331 BLAKE2B 459ed84a1fef756235cbe1e48f592318464e332abf5daf1c3fa57a8bbc0576e4e5a5765d340387101db5f01e444c06fa491da8c00d004a704ef79c31c4d6049c SHA512 e5aca74748fe5a16ca651e33f1d3ba1e250a34cc9f631c9f979d0dd36063106929a8ebeca9399a9bb9b900cbe3e8dfd54d7618d5a2ad96703034e0e74ea59ef2
+DIST python-language-server-0.36.2.tar.gz 74499 BLAKE2B 0bf950e236f8f898c3158afc2b3355948340639b607f474654b0334d484170a210b6e81c7508f12368223ae9915ccf19f76a1bcde41503230d8c008ba0818b47 SHA512 ee909d9332ef76c616d727ebfa36e80fd03ab57df8fc57265de21f0105cc0b64a518b2a8a582f88364d03a7d2a66e1030bcf5b3452ad3a891a3141da9b338373
EBUILD python-language-server-0.35.1-r1.ebuild 2443 BLAKE2B 7ec56114275d77df6d65dda131a77a279c479c905b31d743463c7bf0d48feab6c32727ee877adcb051160853cc9dfa9b40afe8f598290585bf96ce6b35110b27 SHA512 36bfd243fa011f84b4f16934c56c9edb64082dbeea301322c82d572784835b907cba2369914945a913eac99c5a98b8bf778602c63be7f0da1b5d6ec8e969214b
EBUILD python-language-server-0.36.1.ebuild 2445 BLAKE2B f089cfc85880f3cbdf6a8dd8fa81efa9d4bb452eccc60c9f86fd2e7784cb1fc40f324674a6e1136460f8b70de5bd74dbc8dad644b73250bd142131689f1e0a80 SHA512 717d73489e00c8d7e63470fc0914d4c65ad446cc7eb500f3f91aaee5cf194b0158c2ae31e0e615a18074fb55b3ab22a038af08db945b71980ea2495d9130431f
+EBUILD python-language-server-0.36.2.ebuild 2444 BLAKE2B fb960ed5cb8530f1c1dfd716e617ff777a71da1be6da802695d750a662f456e3d8a313547f80ed7229f60457652a686001d6e323f2c80f5432a63c88a975d326 SHA512 bbe8f8d58acb509b0859aed43b285eadd8f54b262241a5ce4b55c6fc34b5155d214604c2d91b170698a9742e27154bbd3ccd2b2d3736de87ddbd5d9e19f6d72f
MISC metadata.xml 460 BLAKE2B f8024f798dd5825225570df7851186a542dcff8530c85b10a95b8caaaea6f045a0a5093a71d588a1d04239387f0c079f1e8ce8c388fbedc5062569dda024a651 SHA512 f7a2a7720c9b600dc8150e7cb77e5db7514b3e991614b456af2ca0f7269d31caeba69137a5a4583cc892ea66cc62e4ea8de7fc0d8844144aed081d0cf53f72fc
diff --git a/dev-python/python-language-server/python-language-server-0.34.1.ebuild b/dev-python/python-language-server/python-language-server-0.36.2.ebuild
similarity index 55%
rename from dev-python/python-language-server/python-language-server-0.34.1.ebuild
rename to dev-python/python-language-server/python-language-server-0.36.2.ebuild
index 663277c6a00f..a7b107e23691 100644
--- a/dev-python/python-language-server/python-language-server-0.34.1.ebuild
+++ b/dev-python/python-language-server/python-language-server-0.36.2.ebuild
@@ -6,7 +6,6 @@ EAPI=7
PYTHON_COMPAT=( python3_{7,8} )
DISTUTILS_USE_SETUPTOOLS=rdepend
-
inherit distutils-r1 optfeature
DESCRIPTION="An implementation of the Language Server Protocol for Python"
@@ -15,42 +14,43 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
-BDEPEND="dev-python/versioneer[${PYTHON_USEDEP}]"
+BDEPEND="dev-python/versioneer[${PYTHON_USEDEP}]
+ test? (
+ dev-python/autopep8[${PYTHON_USEDEP}]
+ dev-python/flaky[${PYTHON_USEDEP}]
+ >=dev-python/flake8-3.8.0[${PYTHON_USEDEP}]
+ dev-python/matplotlib[${PYTHON_USEDEP}]
+ >=dev-python/mccabe-0.6.0[${PYTHON_USEDEP}]
+ =dev-python/pycodestyle-2.6.0[${PYTHON_USEDEP}]
+ =dev-python/pydocstyle-2.0.0[${PYTHON_USEDEP}]
+ >=dev-python/pyflakes-2.2.0[${PYTHON_USEDEP}]
+ =dev-python/pylint-2.5.0[${PYTHON_USEDEP}]
+ dev-python/QtPy[gui,testlib,${PYTHON_USEDEP}]
+ >=dev-python/rope-0.10.5[${PYTHON_USEDEP}]
+ dev-python/yapf[${PYTHON_USEDEP}]
+)"
RDEPEND="
- >=dev-python/jedi-0.17.0[${PYTHON_USEDEP}]
+ >=dev-python/jedi-0.17.2[${PYTHON_USEDEP}]
=dev-python/python-jsonrpc-server-0.3.2[${PYTHON_USEDEP}]
- ~dev-python/ujson-1.35[${PYTHON_USEDEP}]
+ >=dev-python/python-jsonrpc-server-0.4.0[${PYTHON_USEDEP}]
+ >=dev-python/ujson-3[${PYTHON_USEDEP}]
"
-DEPEND="test? (
- dev-python/autopep8[${PYTHON_USEDEP}]
- >=dev-python/flake8-3.8.0[${PYTHON_USEDEP}]
- dev-python/matplotlib[${PYTHON_USEDEP}]
- >=dev-python/mccabe-0.6.0[${PYTHON_USEDEP}]
- =dev-python/pycodestyle-2.6.0[${PYTHON_USEDEP}]
- =dev-python/pydocstyle-2.0.0[${PYTHON_USEDEP}]
- dev-python/pyflakes[${PYTHON_USEDEP}]
- dev-python/pylint[${PYTHON_USEDEP}]
- dev-python/QtPy[gui,testlib,${PYTHON_USEDEP}]
- >=dev-python/rope-0.10.5[${PYTHON_USEDEP}]
- dev-python/yapf[${PYTHON_USEDEP}]
-)"
-
distutils_enable_tests pytest
python_prepare_all() {
- # remove pytest-cov dependencie
- sed -i -e '16,18d' setup.cfg || die
+ # remove pytest-cov dep
+ sed -i -e '0,/addopts/I!d' setup.cfg || die
distutils-r1_python_prepare_all
}
diff --git a/dev-python/python-socks/Manifest b/dev-python/python-socks/Manifest
index 22834f995ed2..bdc4fd342d98 100644
--- a/dev-python/python-socks/Manifest
+++ b/dev-python/python-socks/Manifest
@@ -1,3 +1,5 @@
DIST python-socks-1.1.0.gh.tar.gz 1358296 BLAKE2B c599095a7f687ba1bba6f0ddbbc8ef2e680cb6be4e5d2250fad88c3a3273fb2044712045b20c5a358ed9dcbaef07e5133b6d672698d8caf4b978c9e633a5df70 SHA512 e38594815e5f943f810862dfe5d07a802601e41e879f68b4fa70c8087be0387a91e99e1b0578f2819557832b5e53be9773043a9617c72017c41e9377c4f35ef1
+DIST python-socks-1.1.2.gh.tar.gz 29948 BLAKE2B c110cd8d5d055aa30a63cdade10e7e67b0d6f0b1b17e76ff40bfb85563c90e026f0169a7e943d1391d75e20d7dd715ab070a6adf9e1e247eccf906d63c324e66 SHA512 c62259e86e7afeba7ee3ef5cdca104846352137e5d5bfa6f475e2ac38b21fe1766aee6a1fcb6b9f725576613ce3d92663fab3682516b96caa3948a05d89333a7
EBUILD python-socks-1.1.0.ebuild 834 BLAKE2B 2ef14ed1bb9e5eda0a579556d7eb27d51a75598bd305de1b77d009055f5ce7a3f94aef4a414fde28df07841770fb7dca8ecbcf7a4ee4ef2581d064754cf4c1f8 SHA512 cad56c6a4f47a885a8a9d78313cd9e48486bc982382306d721552cb25079735011ded23fb90c3aed5071fb1bb674e84b393228201b4a6d820f049b861d10a8fb
+EBUILD python-socks-1.1.2.ebuild 836 BLAKE2B 839d63a9d8791d200e38302ead37571a499beba21edc9ed2352c2b91d44fa4ca1e276f2aeda59969aa97f115657bf9c8fb249d4958c8a2bdf7f329cfddb9ecee SHA512 f82da47e50181ac065b9c5f1c5c8374be60e250dd765a63962ccfb7b220d05a9a048555c8863754a13a8b06f79eb39ad04ab3187d31a042d4061ed9f8c69bd35
MISC metadata.xml 355 BLAKE2B 81d034921790157b24dd06af411bcb7de195e68e78d20b4671f9b28055f65c3a7d85f55da725c7540a945a95eba719e7662182424d5ea5e542eb32b38f83ef64 SHA512 bde135dafa4157a8aa39dfcbdada405b5b2109b346c2f0bd654d3c85d58b02ccbae3fc54deed0ec9fef1cc1709bda9adbf826b7c5d1011243dfdb0b3cc6513a0
diff --git a/dev-python/python-socks/python-socks-1.1.2.ebuild b/dev-python/python-socks/python-socks-1.1.2.ebuild
new file mode 100644
index 000000000000..8efe7d9b3616
--- /dev/null
+++ b/dev-python/python-socks/python-socks-1.1.2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+inherit distutils-r1
+
+DESCRIPTION="SOCKS4, SOCKS5, HTTP tunneling functionality for Python"
+HOMEPAGE="
+ https://pypi.org/project/python-socks/
+ https://github.com/romis2012/python-socks/"
+SRC_URI="
+ https://github.com/romis2012/python-socks/archive/v${PV}.tar.gz
+ -> ${P}.gh.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+# tests rely on connecting to Internet
+RESTRICT="test"
+
+# trio, curio are not packaged
+# asyncio is the only backend we have, so dep on its deps unconditionally
+RDEPEND="dev-python/async_timeout[${PYTHON_USEDEP}]"
+#BDEPEND="
+# test? (
+# dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+# dev-python/yarl[${PYTHON_USEDEP}]
+# )"
+
+#distutils_enable_tests pytest
diff --git a/dev-python/python-utils/Manifest b/dev-python/python-utils/Manifest
index 3847545ccdd3..454dd03bc7ba 100644
--- a/dev-python/python-utils/Manifest
+++ b/dev-python/python-utils/Manifest
@@ -2,5 +2,5 @@ AUX python-utils-2.3.0-pytest-runner.patch 461 BLAKE2B 245e0a6a4c76a4286616e0ad1
DIST python-utils-2.3.0.tar.gz 19384 BLAKE2B 1746deadc8dbaf49a6499fe9c79d25c2b5cfea68e2d1b7ab6f88aa72807eedcdb338058e24a7822c6360dea36f1a044145572443c57f43f4cfed765a76e48f0b SHA512 482ccf9c635a0cbe603b69488a364d9033f8b7fada279d901725b5bf91ac13b1cd4a6b7e8d5834a9355d97d8b0803397d5e13da2b7ba72f8d8e2f7f39fee027a
DIST python-utils-2.4.0.tar.gz 22230 BLAKE2B 1c144f62a009a2470ec43341283048842cba61f1b677e8b1d197d3ef39dd1d890b364e63ed8da0b30ad5560d335ab0eb2dfc329ff6dfea86c0f64e909de730b9 SHA512 bfad0ef30383df634b89bb2206a00e45434eff9fee9ba0eeab99361bacfb56f3fb420019608b639713a7e8777870de75becb1d7b48aa09c582df27f9ebe8c512
EBUILD python-utils-2.3.0.ebuild 798 BLAKE2B 66199da67e7e9668a4fc80a61a62a591d7a9f6993f9f1d7bf8080545c1305b4e167f00e66255b2e8ded5b8c3cc7aeffde4ae57eb53f0ec8b6b06b1a7be3c113e SHA512 ac12f533f8aa267f580ce1336ccd34ff732534e039b507d33ac87c189663bcb283917e720958420068f39401ba6616d4f34e412b45b9feb61556dffddd7717fb
-EBUILD python-utils-2.4.0.ebuild 795 BLAKE2B 2338d0390102cecb1b9796fbfa8867adfaeb0ecd66b513209efe74942f2f0d25c32b53fb9a5e1a1e685938082475b91dbb2656bcec1ed4cb3daf59218c49cfdb SHA512 e85a9c8b666d69936df1fe49eeb573521152baaf4589c91b53fa07eb1138bbb5089816f26fd6565558dd4b0bfcb521a2972bd42337f3360c60e8d1deb73cb665
+EBUILD python-utils-2.4.0.ebuild 794 BLAKE2B a1aaf94e578dab9bc62f49d8e3d314a145d40f2ca0a318a95adcd6113bb01b39b023ae404e6ac7ec97176065d249737ec1fd5f7222c7f122b173a2cc1767e903 SHA512 0dee56b2f15fd487c1dc16bd4d216470181715b15eb3999b5c85492a4c08afdfefbd426b57ec16d4792562820f3ad87430ab55f3e76d269d148a3119d51e1bf9
MISC metadata.xml 344 BLAKE2B 6534277dda110fe095373e49ca9d06d96472c9f89167916c45a33f543b44730e441b7e8ea492afac8d4ec85c689f6aefaf895bee9c658b09e4bc2096d5c073e7 SHA512 4b88ade5445b338f9900f5b80048c8dc178c358acbb8305d820daee7d39809b6e1318c4182760ed0160447aaa36c74118e7a2b77659339cb31abb3e639fa7332
diff --git a/dev-python/python-utils/python-utils-2.4.0.ebuild b/dev-python/python-utils/python-utils-2.4.0.ebuild
index 880245a0fc3c..5a0b73fcd142 100644
--- a/dev-python/python-utils/python-utils-2.4.0.ebuild
+++ b/dev-python/python-utils/python-utils-2.4.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
diff --git a/dev-python/pytoml/Manifest b/dev-python/pytoml/Manifest
deleted file mode 100644
index 2eb17b1fc2dc..000000000000
--- a/dev-python/pytoml/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST pytoml-0.1.20.tar.gz 8529 BLAKE2B ebd2ea0ec2ca3477371622a003b6a84d3b108c0a36b76e2fb656a8cc59406c39d0158986aef5aafb39036624871f3185041a1314866f17fda1d28cd8e7cde802 SHA512 9b913219e65e2329302455a1457a39cf5eb37e04c03025dfdbb81db4ffe60b547fb7e64fc961608004900365ccfddb4225042105fa2db8bd2e393fa2797fc24f
-DIST toml-test-b212790a6b7367489f389411bda009e5ff765f20.tar.gz 19525 BLAKE2B 4a0a90406c4388a4834f33b637569d156b1ed6b0006b77b44dfcc6968349b745217ce40405aad5680a690bb9c5ffb2dfd7e716ecf214a7354e7727a212914a72 SHA512 94dc6ddadac2c75095b1a9ef7c4f68e38908bfadba53203b75c29c7aa8d3c387c1f05cf9915c2c63eeee869f4290cdcef4b8768cb36dcd4031168b5af549bb54
-EBUILD pytoml-0.1.20.ebuild 773 BLAKE2B ed6e21d5d5d7386279c4353ac1b403023e9149404487e91a21c0530d129dc9afcb506788c0e5e14d140a6c3685fc9a99b91ebf4e02a520723eaed6e6c43ec0c2 SHA512 fb3dbb999a67b2eb689cc25e4ebc026ab595833ee886cfc50a9d6c5ff866cd42780c4f0640911c402606dc63f581ae46e41628a367fd21fe001cbd97a7aa2ac3
-MISC metadata.xml 362 BLAKE2B fade23ceaa3b73c711e020a55500ce06c2b948a3dbafc1d39900c813a19716a8c3688ee1c83e500427b361559b6cec31f354a33f8ee72669ddb1e46ab6ffe45d SHA512 6122e392ec59d0c033d04e9b5855c28f81993755a1be2b688608a4efecbb6fd3f61fb5a6d41b3af294b1c0beacfd8edec39a454ff2a34ed0db088399301bdc0a
diff --git a/dev-python/pytoml/metadata.xml b/dev-python/pytoml/metadata.xml
deleted file mode 100644
index 0b02f1b3ec21..000000000000
--- a/dev-python/pytoml/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
- python@gentoo.org
- Python
-
-
- avakar/pytoml
- pytoml
-
-
diff --git a/dev-python/pytoml/pytoml-0.1.20.ebuild b/dev-python/pytoml/pytoml-0.1.20.ebuild
deleted file mode 100644
index 9894d88cc6a2..000000000000
--- a/dev-python/pytoml/pytoml-0.1.20.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-inherit distutils-r1
-
-TOML_TEST_COMMIT="b212790a6b7367489f389411bda009e5ff765f20"
-
-DESCRIPTION="A TOML-0.4.0 parser/writer for Python"
-HOMEPAGE="https://github.com/avakar/pytoml"
-SRC_URI="https://github.com/avakar/pytoml/archive/v${PV}.tar.gz -> ${P}.tar.gz
- test? ( https://github.com/avakar/toml-test/archive/${TOML_TEST_COMMIT}.tar.gz -> toml-test-${TOML_TEST_COMMIT}.tar.gz )"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
- cp -R ../toml-test-${TOML_TEST_COMMIT}/* test/toml-test/ || die
- ${EPYTHON} test/test.py || die
-}
diff --git a/dev-python/qscintilla-python/Manifest b/dev-python/qscintilla-python/Manifest
index bd692377d2de..270d68c51d80 100644
--- a/dev-python/qscintilla-python/Manifest
+++ b/dev-python/qscintilla-python/Manifest
@@ -1,3 +1,5 @@
DIST QScintilla-2.11.5.tar.gz 3007564 BLAKE2B e1eb7794b2e09f7bbfebde69a7c62c1a952e36b95f9c7a38c3db0b6bbdab8d0bad4a6d780dc9bf9b5e8d64111046f1741c6710d8444504230ee0f4154ce0a304 SHA512 46bc3c896b4ab71fbcc821ce3a248ecc4200378e0b621adef8d39092f940928806c76abe529b7f27ce4280e7e49091d8cbeafe6f303ca85cf5675df2887fd99b
+DIST QScintilla-2.11.6.tar.gz 3027764 BLAKE2B 1eb5d9ba44040cbff30e8b0028e164cf2aa86c565a5368890500614b9395dbe861c5cd268cf6a4ec06e2c7d77860b2ad6064bc3d07fd63a6ede2b060f44a7117 SHA512 8055d72a40f9f5a7d45c6592055c1b8eb5e5c50ce9e51673babd5e567c769d60c64d244ba5a7def5731a3120099e9528d01ed94327a06bb56ae2fa2e5e37b198
EBUILD qscintilla-python-2.11.5.ebuild 1778 BLAKE2B ae80010a8a0267a3005245fed31fb4b28f8d465338949d39368e3ee211dcf152985a905d967c4efc434e9cd6ba1320822938bf73e9d9348bd29a70f57a4d1fe0 SHA512 073e224c8a23bda76d08c6a56eb43bf7c35df49c33ec9bce6e97b707cd24c02d37ef0bd529804c8a4c3c9093372340786cf64d52d6d4da42188e2b3a033f6467
+EBUILD qscintilla-python-2.11.6.ebuild 1777 BLAKE2B 3526ad6d2c92b6f4fc608a317b65b2f81922cd7e0bf9495f90a52547205688e791de6368abb91714ca8e526141af6e3325c5e7919407e59e8b299b20d592d023 SHA512 deecf75677a947217a38f3fd1e7a7dde37943a187a6430ae52b467ba06052fb4d7f2d03a778042810b974c5aa09896197fdba3a16d1e8702461f09568a5e155a
MISC metadata.xml 678 BLAKE2B e849d949281fe5162977ac3cba9c3559258f0534ced3e4e160554e2ee166cd20f979545bebae2effb0690231c987abb0ad11ed2090dbcb1c6724fc3389edc195 SHA512 58afaba4b14bf09297c024e29d51bc6b22c9a8290a6ca7f2c8c5fd63dea01037a637eeddb2ad5dfc09f2fd09d92229f74f1ee9cfb200c835110236407296e530
diff --git a/dev-python/qscintilla-python/qscintilla-python-2.11.6.ebuild b/dev-python/qscintilla-python/qscintilla-python-2.11.6.ebuild
new file mode 100644
index 000000000000..1460fdded08a
--- /dev/null
+++ b/dev-python/qscintilla-python/qscintilla-python-2.11.6.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+inherit python-r1 qmake-utils
+
+DESCRIPTION="Python bindings for QScintilla"
+HOMEPAGE="https://www.riverbankcomputing.com/software/qscintilla/intro"
+
+MY_PN=QScintilla
+MY_P=${MY_PN}-${PV/_pre/.dev}
+if [[ ${PV} == *_pre* ]]; then
+ SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.gz"
+else
+ SRC_URI="https://www.riverbankcomputing.com/static/Downloads/${MY_PN}/${PV}/${MY_P}.tar.gz"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="debug"
+
+REQUIRED_USE="
+ ${PYTHON_REQUIRED_USE}
+"
+
+RDEPEND="
+ ${PYTHON_DEPS}
+ >=dev-python/PyQt5-5.12[gui,printsupport,widgets,${PYTHON_USEDEP}]
+ >=dev-python/PyQt5-sip-4.19.22:=[${PYTHON_USEDEP}]
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtprintsupport:5
+ dev-qt/qtwidgets:5
+ ~x11-libs/qscintilla-${PV}:=
+"
+DEPEND="${RDEPEND}
+ >=dev-python/sip-4.19.22[${PYTHON_USEDEP}]
+"
+
+S=${WORKDIR}/${MY_P}/Python
+
+src_configure() {
+ configuration() {
+ local myconf=(
+ "${PYTHON}"
+ "${S}"/configure.py
+ --pyqt=PyQt5
+ --qmake="$(qt5_get_bindir)"/qmake
+ $(usex debug '--debug --trace' '')
+ --verbose
+ )
+ echo "${myconf[@]}"
+ "${myconf[@]}" || die
+
+ # Fix parallel install failure
+ sed -i -e '/INSTALLS += distinfo/i distinfo.depends = install_subtargets install_pep484_stubs install_api' \
+ ${MY_PN}.pro || die
+
+ # Run eqmake to respect toolchain and build flags
+ eqmake5 -recursive ${MY_PN}.pro
+ }
+ python_foreach_impl run_in_build_dir configuration
+}
+
+src_compile() {
+ python_foreach_impl run_in_build_dir default
+}
+
+src_install() {
+ installation() {
+ emake INSTALL_ROOT="${D}" install
+ python_optimize
+ }
+ python_foreach_impl run_in_build_dir installation
+}
diff --git a/dev-python/qtawesome/Manifest b/dev-python/qtawesome/Manifest
index c5fd2a971d5b..81b7e55615ff 100644
--- a/dev-python/qtawesome/Manifest
+++ b/dev-python/qtawesome/Manifest
@@ -1,3 +1,5 @@
DIST QtAwesome-1.0.1.tar.gz 878654 BLAKE2B e654db2210b15274e200bf9ef783b6c8706833129162cc615cbded10a3ee440fae23497dfa327cb6af31664370f90ee46f5d2986d7e5dd6d27b5430a1558c3ce SHA512 edc8f1b7f8dc8d06b7a108300eb72e47e9601be7e16cf774e7efea888e583168f5aa8afe015e83156cd40bda5007b52ef38f914f232fdd1b5eb2683256f1de74
+DIST QtAwesome-1.0.2.tar.gz 878664 BLAKE2B 55f6d527e83165a91918ec6200a9becad99ace56b2906fa216dd8b0179c5948418954a1d0151d1524dc2d02e00c943311e4d2c28cd4d89fc7f325f0b6fb3edf5 SHA512 22bd2a96000d94d1e72259a559b21fee0a442c02751b983df29a1b64f8c5b7057905d8281108ef591cbb2ba71bd1294ad647f00468b7ea28a67466ec2fff0d4f
EBUILD qtawesome-1.0.1.ebuild 775 BLAKE2B c1969cd7f0c0631996b48a6782585b14de2c3be58e4ac3ea33578a6af84216ade0540946afb1fc38301ba7478d0ae0ccf05b7d60f1f270c146efb08be300fcf8 SHA512 035b06dce1286c495ceefd5d08bb475f6e3777ee0ab329745bb6dbed0585449be2b4712ba1e6a8096904596be847a6774023dd74c2ddc0d4531e42bd9cfff84f
+EBUILD qtawesome-1.0.2.ebuild 777 BLAKE2B 74ea64bb1bb2f464971967a0e0c427d784b8776bcef6d5ecf832285c5ca38b0c383a93dc276ac07e41992bb9bf38486d2326d78e5fe686fb77e43caa2b8ae4ec SHA512 6425aef6474aba009485f8e20c111e15c0c2e9aba79da901e4900f7fc6cd292d0d8b79ee74c852a6f34685d3bda3f81d6af325d92d116b66924544b218d2472f
MISC metadata.xml 932 BLAKE2B 348589aaf4ce3cc6a9df0f5dcb54a85a7493d0c0f7f2d88cde63345a92a149ac762a303f7d3b8f8820fd795276a1c94039c5c6da6aa38e57464fd19a12bb8663 SHA512 8fed0b82049cce4946b0e92e051ca928f34e9dbb8f0fcc81733d598d8b35e50b2abc17f6bc6cbd1c376fdb32544c6fbbc6eef7c695db5ca44498795fdab16549
diff --git a/dev-python/qtawesome/qtawesome-1.0.2.ebuild b/dev-python/qtawesome/qtawesome-1.0.2.ebuild
new file mode 100644
index 000000000000..3efa4911a2ea
--- /dev/null
+++ b/dev-python/qtawesome/qtawesome-1.0.2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1 virtualx
+
+MY_PN="QtAwesome"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Enables iconic fonts such as Font Awesome in PyQt"
+HOMEPAGE="https://github.com/spyder-ide/qtawesome/ https://pypi.org/project/QtAwesome/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+ media-fonts/fontawesome
+ dev-python/QtPy[${PYTHON_USEDEP},gui]
+"
+
+DEPEND="test? ( dev-python/pytest-qt[${PYTHON_USEDEP}] )"
+
+S="${WORKDIR}/${MY_P}"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs/source
+
+python_test() {
+ virtx pytest -vv
+}
diff --git a/dev-python/requests/Manifest b/dev-python/requests/Manifest
index 2d4d86a70292..a8c84c58d494 100644
--- a/dev-python/requests/Manifest
+++ b/dev-python/requests/Manifest
@@ -1,5 +1,7 @@
DIST requests-2.24.0.tar.gz 115071 BLAKE2B ae98be1d023b2a7b883e15a7a5d214ecbf482234e9de6bfc9cd06d1f04d1b57d101d41a2c6fdd07b7a6b468875463514841d2e023391ac8ae0797a2cb58b3424 SHA512 46ca8ab70eb39be8398c242404b9b3ffb6baddd5c78eaad125b55c719154eb8c7b6a737a8dc587b0cb51b3b9a074abaa8b2ff347a64d38f4f90cdba4db16a119
DIST requests-2.25.0.tar.gz 101897 BLAKE2B 5de8f4f5059915f929ebb71d8209bfefbe95bb381544ed0b6875cc01cb958e6fe8861cd8321143463da5dd872ad4ff8c828008bcd6409b41857c4d2037db3f67 SHA512 dd13ccb6bcd95bdd31a414dba67e5a0914ff172ae6f5d255849837e8e2a7e404e3c02fc3d07e5ff6dc81c12d0fe56c3b83bc62bc377dd3f504b00b97b144db74
+DIST requests-2.25.1.tar.gz 102161 BLAKE2B 1901ca3bb1eb7a6eb7689a81e01c1c23d3f359835507fda78de734162cbd8573b7640c9376cb50ed9397603d67d9a14624028573c2709086547f37993a959429 SHA512 ca6b0a257b448a999cade0ae173c29cddc9cfffb319d16fc3d051d3e1cd77161536e3cab279b3cba59c60d29d7864a9281c1fa1f689ce48d3bce2ca9f1cd8d45
EBUILD requests-2.24.0-r1.ebuild 1500 BLAKE2B 8c41580af3392d4b1d22aa3809ce970e7c6ef9f56dabab7daf1b02892e8cf116a0c5872625b1de7816201dc5650d3db2907e8514c25eb6d46799f182321350bf SHA512 1eef7754e3491548ea66ab9a7d34b6412e9c08cae2bfee0eec4ab914445f6bf32ecf07ae52b3c56f31428eeebb67ffe67702d9e3a2d25248b4853a26b2e10fad
EBUILD requests-2.25.0.ebuild 1520 BLAKE2B 6f3bdac3f957e720f441bf1f3f72947930d484b7e42ee60dba208b0bdba0fad9585d04106e0450b270e34c299dfdd4c1fcbccd084b060d3696b187e5fe6f3ddd SHA512 17c356f6f4906929c2a011f29f8eb140c790729a885b34f84e6d7cc5b39604272d4fa3a54bf9d34918029e7c344269e9bcdf331a6ac2b26bf7f0869d3f4d42c4
+EBUILD requests-2.25.1.ebuild 1520 BLAKE2B 453c6e6b3384f802a63de21e33f070715faf8e0c4a165acde05c4e54c877dd79a8534d47bc24b63c3d320545c0816c3628dfecd82e3b60d1d3d981b32f22da05 SHA512 9e6286ee54dbb9c0b9fa852593b6ad66dcfba54544190c0da8ea1c9e092a3bcb3a41bf594a5068e41cfd258c6b9dad701779a9f0dcfc2eb1e1dd81f99f0f180f
MISC metadata.xml 769 BLAKE2B 3b70fd8b559e10b971a7c72e4e134028300406af09445bf3d9c013cc15899f10452b493730b0af5f1ec958b81f719ae1af9be96cbf3fb5c0e3bf6f5bf1de7326 SHA512 12d72ea4ecc2ba0a58306917322a1687b73a3234b6dfa7f9ddbc4aa861daa4a56bcc6a8ea7e5da7cafdca2239f065c0f839a998de133958656b2c9a764fc30ae
diff --git a/dev-python/requests/requests-2.25.1.ebuild b/dev-python/requests/requests-2.25.1.ebuild
new file mode 100644
index 000000000000..ca3637585050
--- /dev/null
+++ b/dev-python/requests/requests-2.25.1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="HTTP library for human beings"
+HOMEPAGE="https://requests.readthedocs.io/"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+IUSE="socks5 +ssl"
+
+RDEPEND="
+ >=dev-python/certifi-2017.4.17[${PYTHON_USEDEP}]
+ >=dev-python/chardet-3.0.2[${PYTHON_USEDEP}]
+ =dev-python/idna-2.5[${PYTHON_USEDEP}]
+ =dev-python/PySocks-1.5.6[${PYTHON_USEDEP}] )
+ ssl? (
+ >=dev-python/cryptography-1.3.4[${PYTHON_USEDEP}]
+ )
+"
+
+BDEPEND="
+ test? (
+ dev-python/pytest-httpbin[${PYTHON_USEDEP}]
+ dev-python/pytest-mock[${PYTHON_USEDEP}]
+ >=dev-python/PySocks-1.5.6[${PYTHON_USEDEP}]
+ )
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+ distutils-r1_src_prepare
+
+ # strip tests that require some kind of network
+ sed -e 's:test_connect_timeout:_&:' \
+ -e 's:test_total_timeout_connect:_&:' \
+ -i tests/test_requests.py || die
+ # probably pyopenssl version dependent
+ sed -e 's:test_https_warnings:_&:' \
+ -i tests/test_requests.py || die
+ # doctests rely on networking
+ sed -e 's:--doctest-modules::' \
+ -i pytest.ini || die
+}
diff --git a/dev-python/requests_download/Manifest b/dev-python/requests_download/Manifest
index 855efec675c6..fa2ac7323a35 100644
--- a/dev-python/requests_download/Manifest
+++ b/dev-python/requests_download/Manifest
@@ -1,3 +1,3 @@
DIST requests_download-0.1.2.tar.gz 2584 BLAKE2B c6f2eb7a182e0f42ccb7b603dec47a077b1b946bfa93968972dce5267c7c51fa8c4158e15cd35621cbe229e12f6644db9734e52439796d8d8411be16a38e1e9a SHA512 99d4b275200c88befd2730d17a3329c8cbb155fa5cf9600a7466e8ab109f999a9fc9b8c668aa3b389bc2a3deb33b8a3fd390270d71f04bb0a8f998da67cfde82
-EBUILD requests_download-0.1.2.ebuild 813 BLAKE2B eace37551ed157964a725b512f8ee629599910242a72f89bd0162d0d6e69b6b7d46a72d16602036b273b5cdd98f1e91e7117a6d53c612ce2107e78f90833148f SHA512 2aeaddca5fba53404c5cf2f31ae5cb6561879ed77ae39b5de98f0cc149ce87126de7f396ee55b679a6fe66033aec3f9506d0c7100ee6ebf671db1a194cf4d4c3
-MISC metadata.xml 408 BLAKE2B 2fa0562549efb76db2df8bf0485bf3fcd123de81dd29b89ea9d2a0b87dc72db068e577e4cebfc36c2569b2a4057d14ad26490b368770ec0e566cdb549b2fb308 SHA512 2fdfa8da4f76fd449807c41fd535356f388f71dbc8793a59b7bf2b04c9be3096900decdb014389097a43565642906114169163ab8d19dcd69901457dad3d9f6c
+EBUILD requests_download-0.1.2.ebuild 812 BLAKE2B 0a8eafd8770a49ef425f234bb146039c6df1f877eebe344ba1733ed71bfb06d5dba33d4827c78728fe71f89cdf08204282dec209d3fc79d513680baca687c8be SHA512 e7e1f14832f7085de2975a73f78c01453093bd5585b942ec8dc4733e67372012047417c66ed2c4d77d7f9622d74167f4888c0833283b8e1e312420027cdc4f18
+MISC metadata.xml 433 BLAKE2B 41e0f8a24f94d5c494977f9236ba7b092ace4c2a70522d781cd345e1745db154c7adb022553c45e723c8fdfa13f728f69d47fc9427fa6532ce5c21c4615c15f6 SHA512 79669a88c885d1bb85fac0e76a1be6a602935e146c5b7ae1f1ed4a1ba826a99a76a7b71e9aa49dcf56a20dbc0a7f32cbd5de5e9e703ce798400062683dc7177b
diff --git a/dev-python/requests_download/metadata.xml b/dev-python/requests_download/metadata.xml
index 2d3a29feeb4c..0239f8e8d29d 100644
--- a/dev-python/requests_download/metadata.xml
+++ b/dev-python/requests_download/metadata.xml
@@ -5,6 +5,7 @@
chutzpah@gentoo.org
Patrick McLean
+
requests_download
takluyver/requests_download
diff --git a/dev-python/requests_download/requests_download-0.1.2.ebuild b/dev-python/requests_download/requests_download-0.1.2.ebuild
index a4eaf50913d5..89b087448dc4 100644
--- a/dev-python/requests_download/requests_download-0.1.2.ebuild
+++ b/dev-python/requests_download/requests_download-0.1.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/takluyver/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
RDEPEND="dev-python/requests[${PYTHON_USEDEP}]"
BDEPEND="${RDEPEND}"
diff --git a/dev-python/responses/Manifest b/dev-python/responses/Manifest
index 681fa0103965..32e385749346 100644
--- a/dev-python/responses/Manifest
+++ b/dev-python/responses/Manifest
@@ -1,5 +1,3 @@
-DIST responses-0.12.0.tar.gz 26527 BLAKE2B 71769b683f9c672d52844803e76ff66def61a2a56f788d93cfbad5a7e0f967b003244ee32f83430a97f7726c732b4e8b25baf65ec35535da1a6d609e4cfefe7c SHA512 484076f7942ff12977f06bcc850f1afcc9ae70ca2b7986a647c972893562d28cf3cd7226c87d8f5588fa4500be34dd5be0c7d1df6b8ddcd134455540d3dbe6d9
DIST responses-0.12.1.tar.gz 27123 BLAKE2B 2c77e3ac48e7430e2c91321a946c09746953b3aa2a93aff1ad277f849bc57fe8033d405cd0c391111ba31e523ecb2dfa5bc475519fb1224dff5247925eb54616 SHA512 cc840920895c5ab02b546d6441636197e93c4dc7346a801a14d663a30a761d78a0be73e820cdd5963e52d882958d9ea7873df6fcd6c032d99a230109b5c0ddb8
-EBUILD responses-0.12.0.ebuild 783 BLAKE2B b22904f2f10b1551fff7e5cc5f4cf70167ea506037f72d0d13fc1e734bb220db1691eed0a0112518c9d14887dc3c89884c2f14563988d6c2cdf17a3e20a2c20a SHA512 a9493af45b12ebf9f43d3ebc9be820e920fb7cef0016cb21dcff49029e49ac320702ce05e33629ebbdf005229185876bc5a137c60743f90fe10442f117e6a6b6
-EBUILD responses-0.12.1.ebuild 792 BLAKE2B cd525118b50d09fc7a59c7677f3d467da4303de138bf93647b688b8f3a15c43052cea4410b2cbd40a1f09a1283c9890ba7a0e3858faa21f842edab7e25fd09b9 SHA512 d3637f207d8132ed1cd1f8748033f98d48955df03496cd507ff87c7eaa804adb8d0bee6abd9d246f24f90ab208a6136b93bb8afdacaff7ecd2bc90304428f570
+EBUILD responses-0.12.1.ebuild 783 BLAKE2B b22904f2f10b1551fff7e5cc5f4cf70167ea506037f72d0d13fc1e734bb220db1691eed0a0112518c9d14887dc3c89884c2f14563988d6c2cdf17a3e20a2c20a SHA512 a9493af45b12ebf9f43d3ebc9be820e920fb7cef0016cb21dcff49029e49ac320702ce05e33629ebbdf005229185876bc5a137c60743f90fe10442f117e6a6b6
MISC metadata.xml 462 BLAKE2B c0afeab502da79631572ffa360f5b5cb19d41be177e9dc028041642cc756e08df0df9685c49825a40f3f343a29defe87f1f1e4805568d1037eab73895606221e SHA512 1b33da0d6d1ea49e0f108362c903f3521704ce8eaf1f328441eeb6950c19900eae5abf08204a0402cf7387077f32da97e5a84b2b6bb7c347a39a38e18032de33
diff --git a/dev-python/responses/responses-0.12.0.ebuild b/dev-python/responses/responses-0.12.0.ebuild
deleted file mode 100644
index b63b1bef1d4c..000000000000
--- a/dev-python/responses/responses-0.12.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6..9} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Utility for mocking out the Python Requests library"
-HOMEPAGE="https://github.com/getsentry/responses"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="
- >=dev-python/requests-2.0[${PYTHON_USEDEP}]
- >=dev-python/urllib3-1.25.10[${PYTHON_USEDEP}]
- dev-python/cookies[${PYTHON_USEDEP}]
- dev-python/six[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
- test? (
- ${RDEPEND}
- dev-python/pytest-localserver[${PYTHON_USEDEP}]
- )
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/responses/responses-0.12.1.ebuild b/dev-python/responses/responses-0.12.1.ebuild
index 398a6aa8505d..b63b1bef1d4c 100644
--- a/dev-python/responses/responses-0.12.1.ebuild
+++ b/dev-python/responses/responses-0.12.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
IUSE="test"
RDEPEND="
diff --git a/dev-python/rope/Manifest b/dev-python/rope/Manifest
index 9b427099a41c..15506473a0f4 100644
--- a/dev-python/rope/Manifest
+++ b/dev-python/rope/Manifest
@@ -1,5 +1,3 @@
-DIST rope-0.17.0.tar.gz 248629 BLAKE2B 7c9276b5f400dfa9661f81d365eac150a124620824d400131d5da7361475e5a2d548c8b53a88e61e7ae6e483a47c8ca4b8ca773235e209e8c6fb47b0088327fd SHA512 c27a17fdf73ed0ae85fe417132acd999452ae88a7b779d84fdf73134094fd34510ae08017dc24ddd7c34cb70353b5a43021229b88819002371790e7717b8ae46
DIST rope-0.18.0.tar.gz 249828 BLAKE2B 2aac0541936c671f9b70528da28b2c016f14c7a3e5f368aecb6a3f2a39d2b447d70943bf00b7a49702f5d341504da7398ca5b1240d625275f749de1e530fb178 SHA512 9f706da345866447ff7e4027e6f9f0719d4b823253155881efcdd3a9e9a6f42fa9e194cd9547df4a6f752ae0cec739045e52bb7edd5cfa04ad4079fe06808298
-EBUILD rope-0.17.0.ebuild 931 BLAKE2B cffb66f101f15abc1f1315eb5bf130419132f44cca4df6ecbe78ddbcefec40954dcea342da7b91ab19ad62e09fc8c33d9259a91bca937dd041180f14880aebd4 SHA512 7b61c1ecc06b11d48f8df05f3e3c1860be26c3182811ff8e2e51b5deb3e3645a602af33330a8b1f7cf11d878cd1860772960eb015ba19674dbea993daed06a0f
-EBUILD rope-0.18.0.ebuild 1007 BLAKE2B c71f52a7c6dc364c239c1833d7dc985c0e29bf75763149ddd9c944efd5adf25a0a7ecf8015a2d694584fdfd6073e847713cfa6c6e9642cd1753d34dba43ed53d SHA512 756a1ee101dc1cc4c870ecf3fe92c89320c9e362972fe0a964c02ce9aa1f17873842f0c6a0b497f87f0d1598b23c18e7c1ae0d2e2a9a1dd56d24ba16b6bf8160
+EBUILD rope-0.18.0.ebuild 1005 BLAKE2B 4fe93b94cddb40f608a5332b4399c00dab4271b3dfa149c7ef6bba520a01b9b96d4d2c9ed05f407e9ece9b2bdf1530c91fdc23b1e7447b142416884ca0f84095 SHA512 b1d514250693320ee18a2fa4fe140ea85587c99056dab720f5d49cd58dd89849944ad472e1b10e39cd2bb02810f21da9b6be01fee693ef924f6fbb67998acc82
MISC metadata.xml 451 BLAKE2B 37ad17660eb9247a5de5ff2974c8ec1a312c87f6bbf79375f0a4bb272277f3fb9af63de230c608f7353209868eb4e4882778fecf7ea3d51ba465d14768470ccb SHA512 756ea4e98b36abd8730139115b84d6779c910fe1e671a40b6bc00ef1a484bfcf54baa40f16f03e7375bd044307ebad51dbfce3fe3d90ed9e87d1568a4ef5a198
diff --git a/dev-python/rope/rope-0.17.0.ebuild b/dev-python/rope/rope-0.17.0.ebuild
deleted file mode 100644
index 1933bb3cbd83..000000000000
--- a/dev-python/rope/rope-0.17.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python refactoring library"
-HOMEPAGE="https://github.com/python-rope/rope"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
-
-IUSE="doc"
-
-# Dependency for docbuild documentation which is not noted in
-# setup.py, using standard docutils builds docs successfully.
-DEPEND="doc? ( dev-python/docutils[${PYTHON_USEDEP}] )"
-
-distutils_enable_tests pytest
-
-python_compile_all() {
- if use doc; then
- pushd docs > /dev/null || die
- mkdir build || die
- local i
- for i in ./*.rst; do
- rst2html.py $i > ./build/${i/rst/html} || die
- done
- popd > /dev/null || die
- fi
-}
-
-python_install_all() {
- use doc && local HTML_DOCS=( docs/build/. )
- distutils-r1_python_install_all
-}
diff --git a/dev-python/rope/rope-0.18.0.ebuild b/dev-python/rope/rope-0.18.0.ebuild
index 212968e98367..d41554d306b7 100644
--- a/dev-python/rope/rope-0.18.0.ebuild
+++ b/dev-python/rope/rope-0.18.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="LGPL-3"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
IUSE="doc"
diff --git a/dev-python/rq/Manifest b/dev-python/rq/Manifest
index accb92f0695d..28c26c2868a6 100644
--- a/dev-python/rq/Manifest
+++ b/dev-python/rq/Manifest
@@ -1,8 +1,6 @@
AUX rq-1.5.0-no-install-tests.patch 449 BLAKE2B 3a69c2fcf868c21565b2660fafb519fd175cb375643f85d91754a651fc012d12db32c8875b8f8236407672aaa787aef1e4484a4e33b9582c65aad00c525a7180 SHA512 373b94f956aded0d54ecaa04250533f564f3a8e81d693353c4ce63dfd754f013e741084faaed976ae9b0aca4c0f2a21cf70f2118820f157282966a8446f7c1e8
-DIST rq-1.5.2.tar.gz 570138 BLAKE2B de1f9b9b1d790d0ea3efcd93e916f79b2f28521571652ba048adc725bd53b657cab5a7b2bc65b320a1c2766f77dba399ae62e90fa0a2514fc59565b8949c0327 SHA512 2e2cfe97d427057281415cfb1593ad504485b0398b72f55a93cfa48c7bae8f800ed1b1ad2aa447fe3f6baabd7bb112af29181577d31b270aee58cf4558d15a5b
DIST rq-1.6.1.tar.gz 572668 BLAKE2B 4a1990492ed0c5e999fa918cdf49c03cf664e809b74f75c0aa941a72d9f3f45481e66c0d04780b88efa8e8ac2a8a94b11a0ad620d4c5f99e8abb3582db28e3d3 SHA512 8fc5f0cb87fb43fd6a0981dfb24a21d858e2d9fb2003c955d6d83b33a10b3cbaa713c11e422a91b4e020073d931fd3942530f3368fc8688dcff1a71fbe83fb15
DIST rq-1.7.0.tar.gz 579373 BLAKE2B 835868a294478af07b9fa97fef14b0f2013abe125263efa15c4988eeaf564ee61ab2e8d68842c730a0f8b02a19a4d66f328828fb939a05b9d3b36996688192e0 SHA512 4027a8e1474cc350cf539ecf5734c2f851ef4e61bf0e106e44f359736f4f1ec4e690af97a119d12b1b7614b38ec4da286acff98b718ef604b5c367b3cc2af741
-EBUILD rq-1.5.2.ebuild 1702 BLAKE2B b3df7ac90250491a542e52a742de35898c6643da33f3fcbd4ccb22e0a926206fa9243a19d2a47266a8fb925adf3d71b373261fb7d0c787da4a6e2512cf61001a SHA512 40be428b824ad10628be73624b70079c7bced8c759670e4e701a8ce8e2c048e08dbcb65be55bdce33f7376af50b93ce97dfbfe1bbf8cea563bf9dfd13a62ed60
-EBUILD rq-1.6.1.ebuild 1681 BLAKE2B 8b9dd9da0c13a06976a334221a39d5ec81d18ac6f730912829a5c06ba7b06d10e2714db1105e29a1b8148f009e8515d18c8b82b0979c498b7a2d13d3ba88d562 SHA512 9e5ff8a18088cb154d773b55ad65570efeb1f860e9ed32c482f22ada6ba180ac2a08cb6b34b1fb7af6cfc6fd11a0ddeb5025518563cf7fb556879514956f3af2
+EBUILD rq-1.6.1.ebuild 1677 BLAKE2B 09e4379d3c505cf371e987e1a48eaf91674f9192c582ff9d29b9a1ddedfff7076d698e6893f763f4bfa80ee07963a9f75dcebd05c853c392350287e2ece3e8a6 SHA512 dc188d58eb82b6550ea9d47c58cfb7016f62e97345dce00911e902bdc826b835bb234ecf9d93b403301523c712a4be8b5692fa79eb37d7e434cbc6dfb8e7bb49
EBUILD rq-1.7.0.ebuild 1681 BLAKE2B 8b9dd9da0c13a06976a334221a39d5ec81d18ac6f730912829a5c06ba7b06d10e2714db1105e29a1b8148f009e8515d18c8b82b0979c498b7a2d13d3ba88d562 SHA512 9e5ff8a18088cb154d773b55ad65570efeb1f860e9ed32c482f22ada6ba180ac2a08cb6b34b1fb7af6cfc6fd11a0ddeb5025518563cf7fb556879514956f3af2
MISC metadata.xml 561 BLAKE2B b0f95e81961b91a9ee8b6911f12a4ae0738dfb424b18f934a8a113dc509a31f87c69cbb22b8e049b82f847f34509b222baca3985b3873567cf7089238d6568ba SHA512 bf1c6bc1794ae0e20f6622c9bacc501bb6b0d9ddb4f1caa2de64e20b31f050a6329ecaa7baf26159f24f04a2b75798693fbb3071554d0fbbb9f8577ce8d91797
diff --git a/dev-python/rq/rq-1.5.2.ebuild b/dev-python/rq/rq-1.5.2.ebuild
deleted file mode 100644
index ad1ea88ea2c2..000000000000
--- a/dev-python/rq/rq-1.5.2.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="simple, lightweight library for creating and processing background jobs"
-HOMEPAGE="https://python-rq.org https://github.com/rq/rq"
-SRC_URI="https://github.com/rq/rq/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 x86"
-
-BDEPEND="
- test? (
- dev-db/redis
- dev-python/mock[${PYTHON_USEDEP}]
- dev-python/sentry-sdk[${PYTHON_USEDEP}]
- )
-"
-DEPEND="
- >=dev-python/click-5.0[${PYTHON_USEDEP}]
- >=dev-python/redis-py-3.5.0[${PYTHON_USEDEP}]
-"
-RDEPEND="${DEPEND}"
-
-distutils_enable_tests pytest
-
-PATCHES=(
- "${FILESDIR}/${PN}-1.5.0-no-install-tests.patch"
-)
-
-src_test() {
- local redis_pid="${T}"/redis.pid
- local redis_port=6379
- local redis_test_config="daemonize yes
- pidfile ${redis_pid}
- port ${redis_port}
- bind 127.0.0.1
- "
-
- # Spawn Redis itself for testing purposes
- # NOTE: On sam@'s machine, spawning Redis can hang in the sandbox.
- # I'm not restricting tests yet because this doesn't happen for anyone else AFAICT.
- elog "Spawning Redis"
- elog "NOTE: Port ${redis_port} must be free"
- /usr/sbin/redis-server - <<< "${redis_test_config}" || die
-
- # Run the actual tests
- distutils-r1_src_test
-
- # Clean up afterwards
- kill "$(<"${redis_pid}")" || die
-}
-
-python_test() {
- # Tests needing rqworker:
- # TestWorkerSubprocess::test_run_access_self, test_run_empty_queue, test_run_scheduled_access_self
- distutils_install_for_testing
- PATH="${BUILD_DIR}/test/scripts:${PATH}" pytest -vv || die "Testsuite failed under ${EPYTHON}"
-}
diff --git a/dev-python/rq/rq-1.6.1.ebuild b/dev-python/rq/rq-1.6.1.ebuild
index 031701f5d585..f318a1bee1e1 100644
--- a/dev-python/rq/rq-1.6.1.ebuild
+++ b/dev-python/rq/rq-1.6.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/rq/rq/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 x86"
BDEPEND="
test? (
diff --git a/dev-python/secretstorage/Manifest b/dev-python/secretstorage/Manifest
index dcf7060ab470..8d06bc2a653d 100644
--- a/dev-python/secretstorage/Manifest
+++ b/dev-python/secretstorage/Manifest
@@ -1,7 +1,5 @@
-DIST SecretStorage-3.1.2.tar.gz 17848 BLAKE2B 3d108f98fd0c26958860aa65554a21924822a5d51a90ae20c5496792f4571babbdfd2aec5b70d1bdd908498ad1b61606130d5db2900406ae85f8e3367ad3013f SHA512 c132b21556c55b5912354fd27b6062d32c0f510234f7fe57f6e8e0acb08393ad95e0896967b577de97821387cd714e62b657359230296449e4e0a7ae5a797803
DIST SecretStorage-3.2.0.tar.gz 19311 BLAKE2B 06c3d6137d814f6c2f0cd35927b84c33e09d3c934e4dabfefaa682f3b220045b223aaf06ec970ccc0d39a7388cf13579338299136d13ad2c1b57bf064c278096 SHA512 668f3847f573e1756ffa3a38c278e6d4895223553830d49969e979003d04ca04fb5eaf8dfcc616086a6020f6a73fbe71f7041d4c4ee574205f00fbde945298e9
DIST SecretStorage-3.3.0.tar.gz 19352 BLAKE2B 8e870d4e95b585f4c5e78d9b11327f21ff909b746f035115bd75bde499f2161c0e1ab3640b3861fc54af67dd7d305f794a855430389c207bfef129f7c0439a9e SHA512 d33c11b98824d214eb67c5b11a7fe0d14af084edfebc1d83204bcfd167258fbc07be8c1de8824ec984d83d07bfd66271c44f751784429e574cb240b5add70e16
-EBUILD secretstorage-3.1.2.ebuild 1138 BLAKE2B 6089e6ecce166476afeea659d97855b350695e441b101f54096f98ee8f024e29bc45de8257fd9f13dcf027306d1f61ab12b25c0b07cb4457ce611ae84a009bf8 SHA512 cfaf8a6fd4b444db0b6ce6952ac395eac0240f90e8bef9abe824e9065109d2f48b2d275a79729416311bedc603555c9ecc3ad42401ef90f6230b94b1b6b6a608
-EBUILD secretstorage-3.2.0.ebuild 1146 BLAKE2B 4c654901e897ec1f95783071c0f6c79c30d80e28773d44bd4c77b912804b021e23741ccc0fd3e7e4a0e4da79a0536637f8008b04e61c5d2cef1e66c78e63ed0b SHA512 93c1da70864ab15d70a226ea5fc973dd5b2cf3f6c323000b0978e0bed2a65abe2776e7c21405a85007c03fa7aba706b129306e83721ae395a1f86dfef9fe14ff
-EBUILD secretstorage-3.3.0.ebuild 1121 BLAKE2B 39b65a34776f40899aaec6513f91eca869c17315131c1a499d5ee56e7186aa852870bb7b4708518633a9f6c878ed57a9e34cf869067ac4e974b4373e9a691d18 SHA512 63399bab79af12e438139f1ab69a30fbf78273632a7f93d37f3b45e2826a601af240ea925bdc3bc016bfcf23d98738e56cb17c700ffdf1669a9febe9d1833c92
+EBUILD secretstorage-3.2.0.ebuild 1138 BLAKE2B 6089e6ecce166476afeea659d97855b350695e441b101f54096f98ee8f024e29bc45de8257fd9f13dcf027306d1f61ab12b25c0b07cb4457ce611ae84a009bf8 SHA512 cfaf8a6fd4b444db0b6ce6952ac395eac0240f90e8bef9abe824e9065109d2f48b2d275a79729416311bedc603555c9ecc3ad42401ef90f6230b94b1b6b6a608
+EBUILD secretstorage-3.3.0.ebuild 1128 BLAKE2B 6c2299b00acaff6bda5b243770324ab8b15116cb9b8b39c4b0edb1ad1c7e7599e0ee1cb59ed58b73054abf3b6dade7d4324bf3412cbb7d63ca329112653c1bbe SHA512 8ee5d2130d873afa15fcc64698b7e03632fbe4a592d78440dcef4a8213ea8fd39dde0e4b0dedac1a808475297c76290140b51e769fa5e920394f5524dd424421
MISC metadata.xml 401 BLAKE2B dd985b75846d20aaa47a4c419e44ff481bcfe95b0eebd1c6c8c66e8d75561f6e583c188cb16e1adf6ee35f2f7aa430f5426215d0ba68f5bab5e3a501a4787efa SHA512 75758f0d9498d427aa39ce1c7ddcefdbd08de06a6b5a2bf7df94f6571ac0d2d3c7aa3dea0ed467179bdc6763704ddd5446ad004abc8618794222e51d9502ccb4
diff --git a/dev-python/secretstorage/secretstorage-3.1.2.ebuild b/dev-python/secretstorage/secretstorage-3.1.2.ebuild
deleted file mode 100644
index 65375843c0c4..000000000000
--- a/dev-python/secretstorage/secretstorage-3.1.2.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{6,7,8,9} )
-
-inherit distutils-r1
-
-MY_PN="SecretStorage"
-
-DESCRIPTION="Python bindings to FreeDesktop.org Secret Service API."
-HOMEPAGE="https://github.com/mitya57/secretstorage https://pypi.org/project/SecretStorage/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
- dev-python/cryptography[${PYTHON_USEDEP}]
- >=dev-python/jeepney-0.4.2[${PYTHON_USEDEP}]
-"
-BDEPEND="
- test? ( !hppa? ( !sparc? (
- gnome-base/gnome-keyring
- sys-apps/dbus
- ) ) )
-"
-
-distutils_enable_tests unittest
-distutils_enable_sphinx docs \
- dev-python/alabaster
-
-src_test() {
- case ${ARCH} in
- hppa|sparc)
- einfo "gnome-keyring is not supported on ${ARCH}, skipping tests"
- return
- ;;
- esac
-
- distutils-r1_src_test
-}
-
-python_test() {
- dbus-run-session "${EPYTHON}" -m unittest discover -v -s tests \
- || die "tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/secretstorage/secretstorage-3.2.0.ebuild b/dev-python/secretstorage/secretstorage-3.2.0.ebuild
index 571eb1a98f0c..65375843c0c4 100644
--- a/dev-python/secretstorage/secretstorage-3.2.0.ebuild
+++ b/dev-python/secretstorage/secretstorage-3.2.0.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
RDEPEND="
dev-python/cryptography[${PYTHON_USEDEP}]
diff --git a/dev-python/secretstorage/secretstorage-3.3.0.ebuild b/dev-python/secretstorage/secretstorage-3.3.0.ebuild
index fae4fb187e1f..bb8809d131fb 100644
--- a/dev-python/secretstorage/secretstorage-3.3.0.ebuild
+++ b/dev-python/secretstorage/secretstorage-3.3.0.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
RDEPEND="
dev-python/cryptography[${PYTHON_USEDEP}]
diff --git a/dev-python/smmap2/Manifest b/dev-python/smmap2/Manifest
deleted file mode 100644
index c5b47119dd0b..000000000000
--- a/dev-python/smmap2/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST smmap2-2.0.3.tar.gz 23049 BLAKE2B 225ffddb4461caa5cbfee210d086ff62d8d7b2a809640cc972ec831fae16bb4fec0418fde30d86308e84369128a2024d1480e38e85e758dba3550b3469db019d SHA512 f5623247fbdb6b0e94bbfe7104ffd84ee4563a0c32781256d92d46fd23e05280d7a0e3952a573b6834e253e9b68175784babc36d91ab61edf6d0d072830e1fde
-EBUILD smmap2-2.0.3.ebuild 705 BLAKE2B 4aea1c878fa4c516c51953564cc4dd89137f26491455d4e84c5b6ee689803a25a9cc51416f201ae844e91d243b3e48d1ce7ec8a5cfbfe59f9b79bd0fed8e4b40 SHA512 c38fa9ab2be00bcefc7171c36073b5e24fbe709a84e94a10b196e1d2df5cc74c57a077c6da8f1052d4aab5b9af5f946ea0fa177e0bb189141fa3a652f80a42e3
-MISC metadata.xml 387 BLAKE2B 70154d8612cf6e5634d429efaa1bb8eeaa9c09be7dbe7b8279ae1fb5bedd1ec0cb008eb84fba44f78b488d9cb2faaf39751faf39a62399c13a9709e62644fd8f SHA512 88990d23bd28d820c1c6ff4827ed74dcd381ddaaace31efcde02cc66905f4a96ebfa05dc5de080273dc60f88c50fd3111649a34cd1bb8f68e65574f92b55793d
diff --git a/dev-python/smmap2/metadata.xml b/dev-python/smmap2/metadata.xml
deleted file mode 100644
index 8c3e7214bd47..000000000000
--- a/dev-python/smmap2/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
- python@gentoo.org
- Python
-
-
- smmap2
- gitpython-developers/smmap
-
-
diff --git a/dev-python/smmap2/smmap2-2.0.3.ebuild b/dev-python/smmap2/smmap2-2.0.3.ebuild
deleted file mode 100644
index f526711c7d97..000000000000
--- a/dev-python/smmap2/smmap2-2.0.3.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="A pure python implementation of a sliding window memory map manager"
-HOMEPAGE="
- https://pypi.org/project/smmap2/
- https://github.com/gitpython-developers/smmap"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-KEYWORDS="amd64 arm64 x86"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
- dev-python/setuptools[${PYTHON_USEDEP}]
- test? (
- dev-python/nose[${PYTHON_USEDEP}]
- )"
-RDEPEND="
- !dev-python/smmap[${PYTHON_USEDEP}]"
-
-python_test() {
- nosetests -v || die "tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/sphinx-panels/Manifest b/dev-python/sphinx-panels/Manifest
index 7dc42c3899ff..089f53e5f256 100644
--- a/dev-python/sphinx-panels/Manifest
+++ b/dev-python/sphinx-panels/Manifest
@@ -1,3 +1,5 @@
DIST sphinx-panels-0.4.1.tar.gz 393088 BLAKE2B 3ba183710d211ddc623791dfa1994e08a65a2a3b4c3cda44bba7c13da255dd32c571a3637961bb901dadddfd7d06e7304eb7c489bcdcce8a05452efa151830f3 SHA512 a86377197682fe456d4d1d94571dfcb41bd09b086b79b3fd06a2d170aa97392130315f95534c04160e202cf8674bcd4005893dd306b2a1210647708863d22517
+DIST sphinx-panels-0.5.2.tar.gz 400415 BLAKE2B af103b3a10032590def4b41c650e9023fe94ec6e2fe764a09237cad4d928b1ff429a7a385770f2d07724897413f001ae4037c6e8638b3a9c1d63362c361fd999 SHA512 6d4eb566623543d0553790136e420e3f3a23e06f38b64642e2bb535a5401a954719135a9af89b3655190aebcd35024cecd40b887e7b2bb1394a2a575447316c0
EBUILD sphinx-panels-0.4.1.ebuild 618 BLAKE2B 366dfa4ee843ff592ba57ced6a4e848f94bea80e833f08ad40527e45f5f417aae0eaafaabc2146ace34df5619164aca8b6509818c25b4921bb33c225b7596b34 SHA512 d4d7c2465ef5a29e8581348f0d1dd480f71d9e14510e014fd1bb0c19987ea631610d662b6f8531d60f293e10dbc17975b4a79195662a32fabf5e303b003327de
+EBUILD sphinx-panels-0.5.2.ebuild 689 BLAKE2B f1f5b51426550f32a19801c815d40888274a7596533b0fb98ed19668e0fc034fd65196a14e599c438516d0792be625ebc3fa25563c00e65d66508d2b45a3ad90 SHA512 55d6b88a4e9ea02ee013c85943431cbb29a015c3af37137f31994df3702bde7e3f32fae3f34aed8b23ba8703f3aba895978620032461a97e4b7a74857fc07fb7
MISC metadata.xml 451 BLAKE2B 2e03c98023cd1a19637ebfdd7a2a887bc2b4e1f3d3ffd6dc6e9941a346d10e9073bb981b41459f63ff2375855aafbdc02691d13327a312830bef55f27992a38e SHA512 1a11694eb40871b6ae5fc4107b907788fe02ab47c489096e5c55531bb88103fe66ed54deca57c41ed694f4e595f13a1cb67c8b9328bdf8c209d8c334c859f242
diff --git a/dev-python/sphinx-panels/sphinx-panels-0.5.2.ebuild b/dev-python/sphinx-panels/sphinx-panels-0.5.2.ebuild
new file mode 100644
index 000000000000..783a15c35997
--- /dev/null
+++ b/dev-python/sphinx-panels/sphinx-panels-0.5.2.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+inherit distutils-r1
+
+DESCRIPTION="A sphinx extension for creating panels in a grid layout"
+HOMEPAGE="https://github.com/executablebooks/sphinx-panels"
+SRC_URI="https://github.com/executablebooks/sphinx-panels/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+ dev-python/docutils[${PYTHON_USEDEP}]
+ dev-python/sphinx[${PYTHON_USEDEP}]
+"
+
+BDEPEND="test? ( dev-python/pytest-regressions[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs dev-python/sphinx_rtd_theme
diff --git a/dev-python/sshtunnel/Manifest b/dev-python/sshtunnel/Manifest
index 94ab6026445c..d916a674dea6 100644
--- a/dev-python/sshtunnel/Manifest
+++ b/dev-python/sshtunnel/Manifest
@@ -1,7 +1,5 @@
-DIST sshtunnel-0.1.4.tar.gz 48330 BLAKE2B 5fdc5dd602274a16025f250fcc3a36453a17c921f51367cac0cb0ef36be6251f687b53b1df6072d1e32456a5c0fa5ec6d2fd8e5d4874977a641a6c9ba81ac57c SHA512 c228fe79cf5172c950777a40b27ababd42a31b7aad8a8472d55a2b3babf5aa4c5308799bb271f33f0e943c309eb9adedee321045a03324cb5e30a385178751ca
DIST sshtunnel-0.1.5.tar.gz 49345 BLAKE2B dde497296ebf84cd34a485ac82de3ca138671b4b8ad2d2307a5e40dc0bb9c6a6daa8c8f3888db942133a9a0fb5321c240c5f2db7c93baf824c9cefaf361ef7c9 SHA512 ae804865a83bae8443cff1a73b168ffb8aac0c5c4fa6c7a5e142f4f95b4eef34bc7674588fa8797fa35b2685016828bcb137f4102e84ea15089671cf64503d17
DIST sshtunnel-0.3.1.tar.gz 51392 BLAKE2B 9cf5c0e1f12489e482abf73e74d1a59bdc619b5248265add15744357ef49bf502e013b9d4494efff27e45817e0728f2cee3629f5cf21ba9849f564e84ac9c4a9 SHA512 5c24243cae959cf38f2cdcad4351950ca3abd1c6d289829b6603cd8e93b8d61480c4c7b3607bb38615854825c0bf08890c2362f79104c8bae7f9bf8e0931aa85
-EBUILD sshtunnel-0.1.4-r2.ebuild 517 BLAKE2B 3d24f8164a062e965819996c9468a17a7952850d9bafc47413a785ffa6e24e1564df8df41b71c135080293cd1bee46fc9f2e30caac06030644a495f6798eaccf SHA512 0a5c5fe99ef5f29534ec7bab70403db6aa26811dd6caabe8894b954d6b3b732294004a6e70703e160a3300f13795158acf479d53580584153205f2613f06e05a
-EBUILD sshtunnel-0.1.5.ebuild 575 BLAKE2B 88504cce4eb31efd83ac11dfaad4b9f9d65674cc3ff64f4bc55fe9f65066344475cc10875e23e3f4a6440f0bf23eaec213e2564df8d465bddc2baeccbdd5be0d SHA512 088e9d360e1a63bc193ed88075585e4573d3a3fa29e8bc189a4bdbfa35f457039a3cc6946d4b03fcdeffed99eaa02bbfc681e8e06ebbea2dd8239a120a4046b0
+EBUILD sshtunnel-0.1.5.ebuild 574 BLAKE2B 47ae12965de337ce2fe05435667c9fc2ea9b71bee6ac2a9611d8354a09db88c58a5c85cf970a127907101bcb1ecc71db3427cdb7558a826b6355432b5b1a9643 SHA512 9f6be11ca810cac458182d9eb6eb789d2ff907d5399b80ae73e2bac24469990a6c7c8a903574e20f44f90e86c50f35c25cd6d776c16d66b950b8c494dd581284
EBUILD sshtunnel-0.3.1.ebuild 482 BLAKE2B 554d6e677c4758cebfd7cb7997fcad3349084bd3ab7c99165d95269df16f426d4b8f3fdb86d8575e00b727fb2d232dfe619a3f7a6f4234b03bac04a7c3e78776 SHA512 6ccf2379f98311a068ae6ecf79687d03a829c1bb079165f345e09bd4f2f1112a927e92ad30d9736d39a700e947d087bccd44f221c0e219cd436953a6519c63b4
MISC metadata.xml 349 BLAKE2B 422416914a00373444093cebf9339589395c3b1ae1ccd8ebe3534dc21552f07e14c0738dab0145198dd9adbd955e3926e4a461be7cc91f2dd24a1cb77e2e2eee SHA512 1d105dc7cf4b6ef94f9ad7d1833cbd1e94fdb8bf390203b2fa7655f8b5a351701fd1c4357944c64d07335d6f5f120b6551a399868d8c3ff613463e5eb20c516b
diff --git a/dev-python/sshtunnel/sshtunnel-0.1.4-r2.ebuild b/dev-python/sshtunnel/sshtunnel-0.1.4-r2.ebuild
deleted file mode 100644
index dafebc1d8116..000000000000
--- a/dev-python/sshtunnel/sshtunnel-0.1.4-r2.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-inherit distutils-r1
-
-DESCRIPTION="Pure python SSH tunnels"
-HOMEPAGE="https://pypi.python.org/pypi/sshtunnel"
-SRC_URI="mirror://pypi/s/sshtunnel/${P}.tar.gz"
-
-KEYWORDS="amd64 ~arm x86"
-LICENSE="MIT"
-SLOT="0"
-
-RDEPEND="dev-python/paramiko[${PYTHON_USEDEP}]"
-
-DEPEND="${RDEPEND}
- dev-python/setuptools[${PYTHON_USEDEP}]
-"
-
-# https://bugs.gentoo.org/683774
-RESTRICT="test"
diff --git a/dev-python/sshtunnel/sshtunnel-0.1.5.ebuild b/dev-python/sshtunnel/sshtunnel-0.1.5.ebuild
index 91a4abe26bd4..e7cf2220adb0 100644
--- a/dev-python/sshtunnel/sshtunnel-0.1.5.ebuild
+++ b/dev-python/sshtunnel/sshtunnel-0.1.5.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Pure Python SSH tunnels"
HOMEPAGE="https://pypi.python.org/pypi/sshtunnel"
SRC_URI="mirror://pypi/s/sshtunnel/${P}.tar.gz"
-KEYWORDS="~amd64 ~arm x86"
+KEYWORDS="amd64 ~arm x86"
LICENSE="MIT"
SLOT="0"
diff --git a/dev-python/statsmodels/Manifest b/dev-python/statsmodels/Manifest
index 527801d42a6d..dd8567c4850a 100644
--- a/dev-python/statsmodels/Manifest
+++ b/dev-python/statsmodels/Manifest
@@ -4,6 +4,6 @@ DIST statsmodels-0.12.0.tar.gz 17502050 BLAKE2B 8621882d920db652d1244fcd4a0bc4f3
DIST statsmodels-0.12.1.tar.gz 17392393 BLAKE2B 10443f3d4063c312a822fd18a062481300ca55e2ac93be41c3819619d0eafa1756ebaa79d941032ece20b9bfbf4567f0635718aa0a833556daba1aa748d60322 SHA512 43d1ab2261f740055bbed6ed5e885e39e0444d575aa3bce61a5dcd3737714138e9c2fc93c8caaba279883860dffc71f6fe75888ecdab8a736175863cfa00de2e
EBUILD statsmodels-0.11.1.ebuild 2206 BLAKE2B 349b3f7ca72b3c4ed778f548806cfe606fb2b4bc3e77c856c32e3997327aac993023a85e0a8f749f3219a0139ed315e07d4f85a84159983540b9b05f022cf4a9 SHA512 801eee8d1da9316557e2edc5b8035764da96c4932ae7ff1ddd907a01bbb8fe69f498a3b5163176270e5f6e419ecea21c816b1e84c7ce3f9aebe3e63da2b62b1d
EBUILD statsmodels-0.12.0.ebuild 2016 BLAKE2B 6f44cf38df21a8caaff50e64842d7c995a9ed0211e0a5795bbefcb26ce6fd16dd0c829cb44701d54237e4101b81716854ad02410fd87dab5be3a7936253e63ff SHA512 35b636c6252a3798292d25c7a552b0d8e34f636cfb11862d0327872b1b471fa9d4426d67b08508fb6c1eca1eedf0020932278095589db413bd095ff35b296a90
-EBUILD statsmodels-0.12.1.ebuild 2017 BLAKE2B 684cbe41212616a92cd3b660c965ffff07507e69f96ae782b1de041cbf82f9b4bbbbaaa20bf35ba49d834eb33fd7ca50f88cbec53e69b6d3e61583dacc33b9ca SHA512 77321d82febd3e681bd4cbbb10c32f7cfcf018c3603e566762366cfd6a500399dde30b43314b5df3b02a542abea26a479e3e231c492755ab2086047de28cc18e
+EBUILD statsmodels-0.12.1.ebuild 2016 BLAKE2B 6f44cf38df21a8caaff50e64842d7c995a9ed0211e0a5795bbefcb26ce6fd16dd0c829cb44701d54237e4101b81716854ad02410fd87dab5be3a7936253e63ff SHA512 35b636c6252a3798292d25c7a552b0d8e34f636cfb11862d0327872b1b471fa9d4426d67b08508fb6c1eca1eedf0020932278095589db413bd095ff35b296a90
EBUILD statsmodels-9999.ebuild 1990 BLAKE2B 933b395a2b60d41bd861507879f042751437f9db661ea4c1758352b3dd060e4f4750b42f044719ce946a7f624e3cc5f20bc9685fc913d06c46a798098572f9b4 SHA512 24cfb32254b6d1768d765be1589c4d5972ac669d1d6d6aa721ace82530a9ac240a363316af2e3fdbaca77df02b44af27c032156c208e46acc1656712a7c3bf8d
MISC metadata.xml 1310 BLAKE2B de8c73b0fb91a3bd65b2ee149b3ef01b3f93c78dfaf1642f9c81335e21c0ace42a771a0901a30dfebc7a8bbb80e9fb7057bd047a26035e103c7ece9e9dbef58a SHA512 96bfb2a3e0b677a67c0256bfcdc76b3621eac9d9242c2aaa7d22322bb53be9bb2185ed82a2fa65cb7cd16df7562c1999ac0d936471608700030ecff4de7174b6
diff --git a/dev-python/statsmodels/statsmodels-0.12.1.ebuild b/dev-python/statsmodels/statsmodels-0.12.1.ebuild
index cb0c73adee24..18951d2f5133 100644
--- a/dev-python/statsmodels/statsmodels-0.12.1.ebuild
+++ b/dev-python/statsmodels/statsmodels-0.12.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
IUSE="examples"
RDEPEND="
diff --git a/dev-python/testfixtures/Manifest b/dev-python/testfixtures/Manifest
index 7885fa4d12f4..2be0f88b1542 100644
--- a/dev-python/testfixtures/Manifest
+++ b/dev-python/testfixtures/Manifest
@@ -1,5 +1,7 @@
DIST testfixtures-6.15.0.tar.gz 116119 BLAKE2B cc0e351bd6778393cf061b741d7d593f56bc1b6a3d53d2e34baa006f7edd718c86f1b16c094e42cf116805a5c6652ac6827f71c1ebbb160d48c071317603c151 SHA512 34b9f1b9a5e76c5e20acf9abae2961694817de3822361cd5afc4a405ccdbcf26c617a01fbd8d2d977c2a0bc696232c2363df4a9fb7ba9187e0743cf2a6fe98e1
DIST testfixtures-6.16.0.tar.gz 120986 BLAKE2B bb17c44091370edca55f1e273f70e454c2e74a152a228f97efba08d605e3a024c64bfc163b3aa50805f038556c76fb754825b16fdf4451760403682c06251c80 SHA512 0c519fa2d2619ad71f6b487456ea1480365aa421c14a9beaeee916e7841bd266be2c95d48c61b64e91554b37d2621358a45b124be6a6d25b3e381f966653c9b8
+DIST testfixtures-6.17.0.tar.gz 121419 BLAKE2B 62dc8808cf9fbc37386fcf9e44c56edbdc2c51ee0698518142dcbc52b73ab538445d49d5d4a779cd68bf51b6aa267222f877bdc703d3dc87230f6a6db81e258a SHA512 2ace802d3bf8b261727037a5ac26a0beca852ca8c2e57ec33344707f300edae7cf317f1bb79c05aa809b1f68d38ffabcc6c5383ce9ecfd4f66a80b02ff4c7315
EBUILD testfixtures-6.15.0.ebuild 1056 BLAKE2B 4d3587c3d3ad6acb348ed76c4831442aa0fa5930c7bbe6b5a24393a3df6b264af41b16bf93532044832eb2d884a424166cd238ceda70c9486f95f3fe60ab943d SHA512 2e4f58775521fec11cfab422c1dcd50dfca685c989f3d642bddc688f3e473ee43ae1278ddda696c50f368c97f1e450c4fdccb6d5797daab18f33305543df23d0
EBUILD testfixtures-6.16.0.ebuild 1089 BLAKE2B 1aece1ca23c043598dc4eecf7b4775dcb53475f8083a7e01ff8965fbdbaff546d1e4d81ba046a18d489a35dba48e68431df443f39f47dc7ac85b283600f297b8 SHA512 452daaf02fd5a94a0d6a2d3410aba86836f80e5f4babb518c4b59a2174b713b595f35e1f8666bc6ebebde32378fdd3deaac8cf642adddf310abf947e610c7529
+EBUILD testfixtures-6.17.0.ebuild 1089 BLAKE2B 1aece1ca23c043598dc4eecf7b4775dcb53475f8083a7e01ff8965fbdbaff546d1e4d81ba046a18d489a35dba48e68431df443f39f47dc7ac85b283600f297b8 SHA512 452daaf02fd5a94a0d6a2d3410aba86836f80e5f4babb518c4b59a2174b713b595f35e1f8666bc6ebebde32378fdd3deaac8cf642adddf310abf947e610c7529
MISC metadata.xml 415 BLAKE2B d3e133602f86d013faf5998b2e52256dca88ed9593b9ea26bed0277b70823eda4dd27deca7488a7f66fac2f77e3312cddf833a4b865cf400c7e78a4d267a4c5b SHA512 78fd16b4fd4e8ea3f244b3d8fcce8451a38713d0374df3d2661453f2ad06af587b4613c9119b11bf4cfe3d226fd04620bfa74f58f2660e44ba7e84b93c99c20e
diff --git a/dev-python/testfixtures/testfixtures-6.17.0.ebuild b/dev-python/testfixtures/testfixtures-6.17.0.ebuild
new file mode 100644
index 000000000000..d8efd8340de3
--- /dev/null
+++ b/dev-python/testfixtures/testfixtures-6.17.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="A collection of helpers and mock objects for unit tests and doc tests"
+HOMEPAGE="https://pypi.org/project/testfixtures/ https://github.com/Simplistix/testfixtures"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+BDEPEND="
+ test? (
+ $(python_gen_impl_dep sqlite)
+ dev-python/django[${PYTHON_USEDEP}]
+ dev-python/pytest-django[${PYTHON_USEDEP}]
+ dev-python/sybil[${PYTHON_USEDEP}]
+ >=dev-python/twisted-18[${PYTHON_USEDEP}]
+ dev-python/zope-component[${PYTHON_USEDEP}]
+ )"
+
+distutils_enable_sphinx docs
+distutils_enable_tests pytest
+
+python_prepare_all() {
+ # kill weird way of declaring build deps
+ sed -e '/build=/d' -i setup.py || die
+
+ distutils-r1_python_prepare_all
+}
+
+python_test() {
+ PYTHONPATH="." \
+ DJANGO_SETTINGS_MODULE=testfixtures.tests.test_django.settings \
+ pytest -vv || die "Tests failed with "${EPYTHON}
+}
diff --git a/dev-python/tikzplotlib/Manifest b/dev-python/tikzplotlib/Manifest
index 68a20096b8e1..9aa2e5cfb734 100644
--- a/dev-python/tikzplotlib/Manifest
+++ b/dev-python/tikzplotlib/Manifest
@@ -1,3 +1,3 @@
-DIST tikzplotlib-0.9.4.tar.gz 588518 BLAKE2B 3f6ec8b9149ef86e8a0dd551d4aeca4f676df3ca86de8bb9bfbf2abed81afab50adef99752970a40f174258f4d14c245366c5159f241d2cd10f7cebdfd6bbbfb SHA512 0d654dbecc473f5bc20dc128ad55852c3787ddd50cf730ed57b25a25e6a55e79bfd451eb28188d75ac6b61a53a6a6e244bef2ca366dcb636e0d325c74b32d1cd
-EBUILD tikzplotlib-0.9.4.ebuild 1431 BLAKE2B 44a9cabdf7cab0881932d8bfe06fe56265e5c57521ec31dfa9e66306e1a48241f37aea97f8769d8c8672cf85c73210b10418372cedb5c87b00f850f71bacf2a4 SHA512 1911e14521d586cb89186ce8deec6253edc15c46e342d7e84af065b80b98c4e3f66e0a81ba10fe32077b577161c0000e13dd662841ca68af680e62e3daf62d58
+DIST tikzplotlib-0.9.6.tar.gz 589081 BLAKE2B aacd1374caed3dc86e6a93479b7ed0d0a79a2f96acc3817e630860794dc2f77c0d908d5765ebd500160d8c459b51131645f3633a084627b55aa2f26f5de87add SHA512 447dcd9da8d5cebf68b9f1a1f06d82370d5adf731524ea17c4f570bfd76dfce06e65f92df0ead732a02b42d9bdf6d0fde9e004bff50204cc5e33cca6c014a257
+EBUILD tikzplotlib-0.9.6.ebuild 1431 BLAKE2B 44a9cabdf7cab0881932d8bfe06fe56265e5c57521ec31dfa9e66306e1a48241f37aea97f8769d8c8672cf85c73210b10418372cedb5c87b00f850f71bacf2a4 SHA512 1911e14521d586cb89186ce8deec6253edc15c46e342d7e84af065b80b98c4e3f66e0a81ba10fe32077b577161c0000e13dd662841ca68af680e62e3daf62d58
MISC metadata.xml 963 BLAKE2B 211d448ee2e29e104616f0713ac523e3f19a06f5322b2da7f04e9b19e879504a0486e677b0570d72a112b4987ac73551343d9d115da99a40dd8c8a6946e50093 SHA512 5cbda85d835d17aaeb4050cf1b31c0d12fb4611768286780895baf827e9899646d144a695e7f0145ae71f4ba2390bb0e4d8b4e22f780681e391203bc47e0529d
diff --git a/dev-python/tikzplotlib/tikzplotlib-0.9.4.ebuild b/dev-python/tikzplotlib/tikzplotlib-0.9.6.ebuild
similarity index 100%
rename from dev-python/tikzplotlib/tikzplotlib-0.9.4.ebuild
rename to dev-python/tikzplotlib/tikzplotlib-0.9.6.ebuild
diff --git a/dev-python/tinycss2/Manifest b/dev-python/tinycss2/Manifest
index 1eae63ab039c..d75cf79bbec8 100644
--- a/dev-python/tinycss2/Manifest
+++ b/dev-python/tinycss2/Manifest
@@ -1,6 +1,4 @@
DIST css-parsing-tests-c5749e51dda3868b3e8062e65a36584c2fec8059.gh.tar.gz 35758 BLAKE2B d834011c3ac774eb79b35e2e74f3854ddc2bb871531a32194041d6f98bde3dc68db67baea25d5463a03e057197144237be69fee4eacfb8edb73167e6e4faf7be SHA512 ef44eb1144a6484f308fabe4187310b2ef0067f328bf5213969d87c475fccae3d716dc66640a0a554ab2a3d7da0efb3a168a288ac6eef7722f3ae46959943b49
-DIST tinycss2-1.0.2.tar.gz 57728 BLAKE2B 966af74a499b9eb696beb3aca2c832d4e07641ed61415aa85a1798e30c568932875ff69f1ccf71cde8823194ea8dfbd54226fa93e718291f09645ea60620b43d SHA512 69bdf52898f9e704c01fe5fd11170e0efc9a6aca14646f5331fc06ebbdf941f9b6c798ded7d93636c7b810b35c659750c3ece3917c5c9cef4092e3e17b382dd1
DIST tinycss2-1.1.0.gh.tar.gz 28205 BLAKE2B 46ba3f705522067e5b7aa5fdbc89f8980598e7e81b39114052b428e8c21b1a90fb3a9082bd51bbc0c6719adf6f0be285683b125886afe1a957013164f3b89428 SHA512 e1ed2679c09a0814d6deca069c68521e6ceef80f4a9cc16ab359dc5ee7ef97d0c7335680702548b023b1a48c5aeb838e29bf1b55f64698913dd16ae33a478a2b
-EBUILD tinycss2-1.0.2.ebuild 622 BLAKE2B dea3b9e649876958124ccf217eeb53971f8853be2ca217b58a037547e8a64543b9ac314d355bb0db941dda496544606889a9a9e12f0a131e72c32c580d0f11c8 SHA512 04d966612d83091c49fa59d9136ba70223114fbe9d144d16dcc3ef42bbf406128d63a1e2926c31a2127a4d57f54370dadca6f69567a072ef23e387f697998ab7
-EBUILD tinycss2-1.1.0.ebuild 1016 BLAKE2B d0b6332588a7a32c428b408bcadb736b0a6d1a2285d1b5154d01da5fd08923569e4185c6acdbaf9dcd3279fb66325d112f06b566b77619cffc9a428497728e32 SHA512 099aba9df5a4f1c53b6c26ed5348d482d8dbe5280ab745fbae97eb7daa265c0fc80aaeec63abb3389483e3fd8d4c91e81e9e5a22f0363d5776d1b1242cf82626
+EBUILD tinycss2-1.1.0.ebuild 1017 BLAKE2B 1b8f967a5390ecc5713cdd07f03c2adbeab6b07110b11488e3da9123335d2dbcb633de1590fa076fe234811280668deeb09ca4d400d6fbc20c6840dfea7c1dfe SHA512 6abd03b5db5a6b2205d55f765e5900870eefe2fcff1283865b74f0719b160e14ab1b3586bb82dd6b7834ec74f427fb9e24d4836fba3ca35ee777bdfae273b776
MISC metadata.xml 522 BLAKE2B 7954745f23764d7736ce267e95b61c55efdad096d4f6cc7f552438edde811bcf2efce828e3710f5dcc580ba225a980cfc951a3bc52788fb518c3e22ae82140f9 SHA512 45dd447790194120cdf6715e569a39834a7839bafb6c9272da5d10243bfdec5cea26b97dd6be139d62a8f03ab035da1b0e2022c8114b6f0a1b9d18c56d0f7b8d
diff --git a/dev-python/tinycss2/tinycss2-1.0.2.ebuild b/dev-python/tinycss2/tinycss2-1.0.2.ebuild
deleted file mode 100644
index 754dc595f016..000000000000
--- a/dev-python/tinycss2/tinycss2-1.0.2.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="A complete yet simple CSS parser for Python"
-HOMEPAGE="https://github.com/Kozea/tinycss2/ https://pypi.python.org/pypi/tinycss2/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND=">=dev-python/webencodings-0.4[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-src_prepare() {
- # junk deps
- sed -i -e '/pytest-runner/d' -e '/^addopts/d' setup.cfg || die
- distutils-r1_src_prepare
-}
diff --git a/dev-python/tinycss2/tinycss2-1.1.0.ebuild b/dev-python/tinycss2/tinycss2-1.1.0.ebuild
index f3c7adb52c71..5b05fabea7c5 100644
--- a/dev-python/tinycss2/tinycss2-1.1.0.ebuild
+++ b/dev-python/tinycss2/tinycss2-1.1.0.ebuild
@@ -12,7 +12,7 @@ CSS_TEST_COMMIT_ID=c5749e51dda3868b3e8062e65a36584c2fec8059
DESCRIPTION="A complete yet simple CSS parser for Python"
HOMEPAGE="https://github.com/Kozea/tinycss2/
- https://pypi.python.org/pypi/tinycss2/"
+ https://pypi.org/project/tinycss2/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
SRC_URI="
https://github.com/Kozea/tinycss2/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz
@@ -21,7 +21,7 @@ SRC_URI="
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
RDEPEND=">=dev-python/webencodings-0.4[${PYTHON_USEDEP}]"
diff --git a/dev-python/translate-toolkit/Manifest b/dev-python/translate-toolkit/Manifest
index 793a56cf41f5..6648619f6a37 100644
--- a/dev-python/translate-toolkit/Manifest
+++ b/dev-python/translate-toolkit/Manifest
@@ -1,5 +1,3 @@
-DIST translate-toolkit-2.5.1.tar.gz 5984081 BLAKE2B 55e158d0d354f181a4e23d9638306eb82bda0dd3133a507de682a54c4197d36ae6ad6bf3d733eb841d9406933407eb98c5874a13e55c7840a672971e87721d94 SHA512 57bdd7f824527955fde6db3a69ffadc27814336c6f792d08bb70e56e95a646d0366e8a3a48ac187ef62804f79dd8a61a4a0b76c8a28e57047c310fcfdf79e999
DIST translate-toolkit-3.2.0.tar.gz 6029254 BLAKE2B fe4c30e09fcba6755a928775f931f1027bb5678606e74aa435fd5803642ab39b8b55d763bb96dba6b1a957d6656cfca4ec6400b735afd8df7f2c1273ac173c89 SHA512 1045762a5c63cc2bc8459b61a85ef56e4f1d1f705d74646b8235169f22d8d5aa4ab5e3599af52a860d9e434df0fad3e98836b0c021bb0a9697b36a59edbfb6ec
-EBUILD translate-toolkit-2.5.1.ebuild 1936 BLAKE2B 7d9d2c054f8d71841d0ea8cb88851ab59fd0ad2458603f8c26d2876e5021153ba98a3ffd7db1fdb743df708ef986bf2794807085289e6b1705f059f0e8c53ac1 SHA512 f40cf5b7384ce50b908eeba85915b9e70c9834b36dc5bf2d7a96d917df55807154e4c092def35d33616425e8bb138a053073f38231b6153c4d38ee2cf8d0bfa4
-EBUILD translate-toolkit-3.2.0.ebuild 3292 BLAKE2B ac6a59e7650125c2cdb03631e7be4b616d1bdecfa3ebd6c8db5cfce39e51311352a0c964bcb194781d578a0dd4f06178964f4d8b81a3c4d17a87c27dee7580c3 SHA512 76e628ee8e79f582188c0c4f151d13e0954e82ba1b4a4626f0e36ca2b0ce68eec87c58de81ffb2e133c21d2c2cd8b8f24ca68bb847b8f60a7d9d6f4d7a978039
+EBUILD translate-toolkit-3.2.0.ebuild 3289 BLAKE2B 421050ac03ffc23314f7a827b7b98132674e696df390a788ccdc6be95ff01ccf76672ea8e34fd404394f3b1db6dbe30605668ffed6684587d861edd3b0fe33c2 SHA512 61e6941b491c922657cbe3f91fe2673dc6e54608c129ee63e3736a9c64a50681d9661da1a847b217f2de831b526f8fcb013878f55e6ae9eca3495e20cf53fd80
MISC metadata.xml 745 BLAKE2B fada3477df5ccc4e5f6036d8d60f948dd4c015ba9ea4e0c844526a43bddf469378e3601a6f5652f8e4f7fe88e65beb82e3dbd1f171c1e7fe83794e91ac7a52ac SHA512 314825d2d8187ebce4e0fb63bed639dfdcb8455883eff29e75cfce963e200371bd38de86190e7051d0950c60befa2115cdcb8630313774946036b693b3c51106
diff --git a/dev-python/translate-toolkit/translate-toolkit-2.5.1.ebuild b/dev-python/translate-toolkit/translate-toolkit-2.5.1.ebuild
deleted file mode 100644
index 6fe148d06b4c..000000000000
--- a/dev-python/translate-toolkit/translate-toolkit-2.5.1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-PYTHON_REQ_USE="sqlite"
-DISTUTILS_USE_SETUPTOOLS=rdepend
-inherit distutils-r1
-
-DESCRIPTION="Toolkit to convert between many translation formats"
-HOMEPAGE="https://github.com/translate/translate"
-SRC_URI="https://github.com/translate/translate/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc +html +ical +ini +subtitles +yaml"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-BDEPEND="
- doc? ( >=dev-python/sphinx-3.0.2 )
-"
-DEPEND="
- >=dev-python/six-1.11.0[${PYTHON_USEDEP}]
-"
-RDEPEND="${DEPEND}
- !dev-python/pydiff
- app-text/iso-codes
- >=dev-python/chardet-3.0.4[${PYTHON_USEDEP}]
- >=dev-python/lxml-4.3.1[${PYTHON_USEDEP}]
- >=dev-python/pycountry-19.8.18[${PYTHON_USEDEP}]
- >=dev-python/python-levenshtein-0.12.0[${PYTHON_USEDEP}]
- sys-devel/gettext
- html? ( dev-python/utidylib[${PYTHON_USEDEP}] )
- ical? ( dev-python/vobject[${PYTHON_USEDEP}] )
- ini? ( >=dev-python/iniparse-0.5[${PYTHON_USEDEP}] )
- subtitles? ( media-video/gaupol[${PYTHON_USEDEP}] )
- yaml? ( dev-python/pyyaml[${PYTHON_USEDEP}] )
-"
-
-python_prepare_all() {
- # Prevent unwanted d'loading in doc build
- sed -e "/^ 'sphinx.ext.intersphinx',/d" \
- -e "/html_theme/ s/sphinx-bootstrap/classic/" \
- -i docs/conf.py || die
-
- distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
- if use doc; then
- emake -C docs html
- HTML_DOCS=( "${S}"/docs/_build/html/. )
- fi
-}
-
-python_install_all() {
- distutils-r1_python_install_all
-
- rm -Rf docs || die
- if ! use html; then
- rm "${ED}"/usr/bin/{html2po,po2html} || die
- fi
- if ! use ical; then
- rm "${ED}"/usr/bin/{ical2po,po2ical} || die
- fi
- if ! use ini; then
- rm "${ED}"/usr/bin/{ini2po,po2ini} || die
- fi
- if ! use subtitles; then
- rm "${ED}"/usr/bin/{sub2po,po2sub} || die
- fi
-
- python_optimize
-}
diff --git a/dev-python/translate-toolkit/translate-toolkit-3.2.0.ebuild b/dev-python/translate-toolkit/translate-toolkit-3.2.0.ebuild
index 2dfbd4ae55b4..8b289f3448e2 100644
--- a/dev-python/translate-toolkit/translate-toolkit-3.2.0.ebuild
+++ b/dev-python/translate-toolkit/translate-toolkit-3.2.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/translate/translate/releases/download/${PV}/${P}.tar
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
IUSE="doc +html +ical +ini +subtitles +yaml"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-python/versioneer/Manifest b/dev-python/versioneer/Manifest
index 38218cca261d..08e7762552bc 100644
--- a/dev-python/versioneer/Manifest
+++ b/dev-python/versioneer/Manifest
@@ -1,6 +1,3 @@
-AUX versioneer-0.18-fix_test_git.patch 788 BLAKE2B e910a651eec861ee5fffd9f7f05860b468154fe741f1b04504221149f48ca8bc241ba383fabafce6199387839daf7373aa9912456ce9ac688db295ebe7d437d7 SHA512 44ff35bad67b41c7be786a9d8f3b6958fffb71d598eb17ce172defbf1dbda9ac40ecbfeb790900a4a8052905fc510ee5b640039fa0fcaf408ef73c3e01eea57b
-DIST versioneer-0.18.tar.gz 40552 BLAKE2B 640c010958a0178ec5ec5f06c986d83e3bc2f49df95583c4c90d3058449dcca5c7b5421ee5f2f56905b1d949bfe3bfbd87fb23ebc868ede591d078d811ccc2b3 SHA512 8d4522932b1f6aa1c13211008a57a572d54ea677cbdecd7d563ef8f77c76ed5d59f58f2e3be38a01e8cd102c264baf5c8949e9c17ea98d686ac497f8ad8b0011
DIST versioneer-0.19.tar.gz 47005 BLAKE2B cd4ce82bdb17cd10b628cf6013d1be171cc21115d9a065b845227fd6e5d1e988f8ab6fb001e2eeb6c1bfeda8a4afc8420937b0ec7437554d87e207713ccef381 SHA512 919c2e52e32b2fa1661ab2e10e3a698eb3f7c5102e66175d465d1a29237b86efa1520435ca581e321802cffeaa0ccd21fb66ba66946d72a05d13743c87a3e333
-EBUILD versioneer-0.18-r1.ebuild 932 BLAKE2B 64b1f8ff43a37265442a77d82d342c172c926cb1e45db95902dcb5ba4fb8de9df067f156c41c7e64471ec2f59e5e39d4d794633e276432003bdedec32752d4fa SHA512 50a4aa5ebca587bad112a7983f1e24c5b0976df5bc47be9388edd764c4952fb077838495dc9ffd63bcd0f74815a3997656bde72d374a1f53a0aaf5b295314d3f
-EBUILD versioneer-0.19.ebuild 878 BLAKE2B b4a1ecfd076c964ae42e8df40badbd984859eb530bebd5fc92ef5fb2bc5de29741dab650b9b496b9b82652ad01c033020e95fe7bceba8ac852e7826ae6282821 SHA512 81fa5aaef32c15e23929fa8079ef3a8864ea04c97722166ff455f8d3829bf4d6115e67c0bfe044413cd02e887a09c1338963ce8ed23824231607e8b349778ab5
-MISC metadata.xml 414 BLAKE2B 409cab20af609a75c5795436650c1c5f83715a9f966a243089fc54fee8b726705e90a220193cfa0a61ee947599377853edd245384423bef20a925e60ea99f65d SHA512 000b7ccae83bf3951a36e8c5743759c7f02d812ed808bacb4365bbb317c16475c1b443b22b174b3411243603bbf53844cfec67aebc61350e82261cc98a99f7d0
+EBUILD versioneer-0.19.ebuild 889 BLAKE2B 4b1f5d65ae4548c301b572d2e90267bde6176f15bde5d7ce7c9a107981c853a84f0668c31ede15d9d986030cfaca1532748e17aa7376b0f22a5b668ece455f26 SHA512 502ea228f9c0e7066a556b2ad4e6c392b59acbe94231963d9d78dcc6ffca60884a418498283b3c6f6ce01604930888c11f93b1bd6c1e71be4252804defefee68
+MISC metadata.xml 425 BLAKE2B 70d2a29bcd352f61add9b6ec9f302712d3f14556c3827c55273b4b2525c7f1b36c4ae2b2e4056aff955e864128d9e106b1c0a0424129818082047af19d8bb03d SHA512 4e2f07cd10a1dceebd43c8bdfda3c546a924b5283bd31417cecfe5b5af6b5868915f9e3343694a503c51bbe71fc9644c39f9335471b0ec98fcf780caa20f49c3
diff --git a/dev-python/versioneer/files/versioneer-0.18-fix_test_git.patch b/dev-python/versioneer/files/versioneer-0.18-fix_test_git.patch
deleted file mode 100644
index 35c45979e6f1..000000000000
--- a/dev-python/versioneer/files/versioneer-0.18-fix_test_git.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/test/git/test_git.py 2020-04-11 23:36:18.858361255 -0700
-+++ b/test/git/test_git.py 2020-04-11 23:47:01.929316371 -0700
-@@ -8,7 +8,8 @@
- import tempfile
-
-
--from pkg_resources import parse_version, SetuptoolsLegacyVersion
-+from pkg_resources import parse_version
-+from packaging.version import LegacyVersion
-
- sys.path.insert(0, "src")
- import common
-@@ -590,7 +591,7 @@
- def assertPEP440(self, got, state, tree, runtime):
- where = "/".join([state, tree, runtime])
- pv = parse_version(got)
-- self.assertFalse(isinstance(pv, SetuptoolsLegacyVersion),
-+ self.assertFalse(isinstance(pv, LegacyVersion),
- "%s: '%s' was not pep440-compatible"
- % (where, got))
- self.assertEqual(str(pv), got,
diff --git a/dev-python/versioneer/metadata.xml b/dev-python/versioneer/metadata.xml
index eba03f3f6be6..eb3cfbacbaf2 100644
--- a/dev-python/versioneer/metadata.xml
+++ b/dev-python/versioneer/metadata.xml
@@ -7,7 +7,7 @@
- warner/python-versioneer
+ python-versioneer/python-versioneer
versioneer
diff --git a/dev-python/versioneer/versioneer-0.18-r1.ebuild b/dev-python/versioneer/versioneer-0.18-r1.ebuild
deleted file mode 100644
index 38d6b48aa164..000000000000
--- a/dev-python/versioneer/versioneer-0.18-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{6..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Easy VCS-based management of project version strings"
-HOMEPAGE="https://pypi.org/project/versioneer/ https://github.com/warner/python-versioneer"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="public-domain"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
- test? (
- dev-python/packaging[${PYTHON_USEDEP}]
- dev-vcs/git
- )
-"
-
-PATCHES=(
- "${FILESDIR}/${PN}-0.18-fix_test_git.patch"
-)
-
-python_test() {
- esetup.py make_versioneer
-
- git config --global user.email "you@example.com" || die
- git config --global user.name "Your Name" || die
-
- ${PYTHON} test/git/test_git.py -v || die
-}
diff --git a/dev-python/versioneer/versioneer-0.19.ebuild b/dev-python/versioneer/versioneer-0.19.ebuild
index 124411ff7b67..a72e22ae29b6 100644
--- a/dev-python/versioneer/versioneer-0.19.ebuild
+++ b/dev-python/versioneer/versioneer-0.19.ebuild
@@ -9,12 +9,14 @@ PYTHON_COMPAT=( python3_{6..9} )
inherit distutils-r1
DESCRIPTION="Easy VCS-based management of project version strings"
-HOMEPAGE="https://pypi.org/project/versioneer/ https://github.com/warner/python-versioneer"
+HOMEPAGE="
+ https://pypi.org/project/versioneer/
+ https://github.com/python-versioneer/python-versioneer/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
SLOT="0"
LICENSE="public-domain"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/xapp/Manifest b/dev-python/xapp/Manifest
index 6792d1424501..8bca3fa649c1 100644
--- a/dev-python/xapp/Manifest
+++ b/dev-python/xapp/Manifest
@@ -1,3 +1,3 @@
DIST xapp-2.0.1.tar.gz 19839 BLAKE2B 692ef5a560681f415ab211b6f2870339dc80ca3ce90ac860637ce6765309b03f8ac41499ad5bcef51cde194b7cee2e3366abb3ddb5ee7e2212e3dac0da625387 SHA512 a529680ab2adbcd829ec224b7dafeb5f641afaabd51ac6cea154d1adf46772b0f2c58a78c6f136d3c6dde0b5d69a4e53a988f69d282af852ecf9ffa130ec1fe4
-EBUILD xapp-2.0.1.ebuild 552 BLAKE2B b31f8e833684636c9f87e100e0343b9943a0baf9806a8bc2d921e7999a13f0a4d466d9eb901b069f5a5e0084ab90a71579b7bf547845e32b55a29d3f2bb6a714 SHA512 39b2369f25cbbff7f189674a263307514d09f9e93dfe5ec3c01ff616cf896f4f3817f70343f02b64b84adb784059a0f53529b4dec82e9a878fcf7fa82082b448
+EBUILD xapp-2.0.1.ebuild 559 BLAKE2B 70ecb291a7ef6da01e5b9c5db22b86aec6d071316dd3c5f16f9614858106f1961160f8421e99abd363fa801977dec980236a676daf728130cfa2791b2573ed45 SHA512 948a2a1787c537738561d358bebdfb4d73346067e2920848083296c070d14452d64e6994c48665012e43d6a4846022a8ad7f5c65d863808c333bf1f7dc6f4d15
MISC metadata.xml 584 BLAKE2B 7b0110a8ad67b0faa3125ddd088a8d019129d239cc541a08b4443f8bddd3c1efc1891ccbd935309fd13c940b1cf95bf6f1e769c078e895393f7bccf3a366a0ea SHA512 3273919c56af741c5cfde4b69180c20a2defdb16a59f34c0a57147f955c8454eb73cd20f5d02fe827432b7f7310e9a313b324832df96c724300cf3b05cb30141
diff --git a/dev-python/xapp/xapp-2.0.1.ebuild b/dev-python/xapp/xapp-2.0.1.ebuild
index 8ab0a07bede6..44ea64861489 100644
--- a/dev-python/xapp/xapp-2.0.1.ebuild
+++ b/dev-python/xapp/xapp-2.0.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/linuxmint/python3-xapp/archive/${PV}.tar.gz -> ${P}.
LICENSE="LGPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
IUSE=""
DEPEND="x11-libs/xapps[introspection]"
diff --git a/dev-python/yappi/Manifest b/dev-python/yappi/Manifest
index 10f706924ce8..2a4ba2c79b50 100644
--- a/dev-python/yappi/Manifest
+++ b/dev-python/yappi/Manifest
@@ -3,5 +3,5 @@ AUX yappi-1.3.0-tests.patch 563 BLAKE2B 7415bb3e8c69634aadc605871414a17101e91e3e
DIST yappi-1.2.5.tar.gz 928100 BLAKE2B 1d303226821d53fb215ac29f8363d9f564f9f40096b5ba8f67475c4074012316f523afb6d770cff879038cd333ef7f050b29c015e2dd2e517859f66a0e1f36f3 SHA512 ec784e76b56e8bc0c3cfe07c90d0810fa90d5a7da62f36187e8a09a9d6e01f3c2d74320de3dd3f4bf1d4a9425fee319c7a575a9d35ad5412c1501c934f1ba353
DIST yappi-1.3.0.tar.gz 928100 BLAKE2B 1d303226821d53fb215ac29f8363d9f564f9f40096b5ba8f67475c4074012316f523afb6d770cff879038cd333ef7f050b29c015e2dd2e517859f66a0e1f36f3 SHA512 ec784e76b56e8bc0c3cfe07c90d0810fa90d5a7da62f36187e8a09a9d6e01f3c2d74320de3dd3f4bf1d4a9425fee319c7a575a9d35ad5412c1501c934f1ba353
EBUILD yappi-1.2.5-r1.ebuild 976 BLAKE2B 3f047a3015a88861d59e9a2038a641ad8aced7c66f04001855ce50d37ae830bcae60e16df89ec9a6930c4649aef724311bfec311a72f555dcece057fdae3ae67 SHA512 171960875c3d2c67fabea15def17f077f7b9a0caac90ec2c195ca9d1e6256f77c2cbd3781e643d32c1c484b51c49533c4a50b77b4eedd12c1c85e4374c00739a
-EBUILD yappi-1.3.0.ebuild 899 BLAKE2B 16b548bfff14c447de6ad8a619ecad564812d0a4eb82b47a95f4979a6f4bba478f2d4e9e80d62527ccc2e9ea52bccd0b7a7a395f0c38c3edf5de5e0a7b888910 SHA512 7e8510ae1655211a411cdec831bc0196176d0b5861ffbb4c4fac01eefd770c08f49a8621eacb42c9862f50bb80e3de9af25bcfb283d5a971e901990a0e419dd2
+EBUILD yappi-1.3.0.ebuild 898 BLAKE2B ae183985f61a5b527c5a110721cf522c381250d0d8f99d07484d95d76c7157db4a13110a3fab8bc55f3903fa00926c4e79735a6745a8b5790bdcdfe67418d370 SHA512 ac60d680ee6a7061e2106815d506043af43e43d91c0c3e6cf8cdbd4911d32f1a83029578c248f4534896c4b0e49e31de5728d6693726b791e8206f6559ea1bb1
MISC metadata.xml 488 BLAKE2B 2ac7151d74622eb9e76ce39ef336aa6c729b4249e781747916936fc88e0aac76d54626b8383c58cdb6661ef080b3ee37c8bab7eb00a4befac7b0523f5552afc2 SHA512 a85e098364030d565901db988e7848181b51db19d17eef2a97ab40ab4e318ccf03e2a72201ebe28ca56965c2327ebdf9e01f5230be9a46d4d273a08cb8473af3
diff --git a/dev-python/yappi/yappi-1.3.0.ebuild b/dev-python/yappi/yappi-1.3.0.ebuild
index ad3b69aae527..3f448ea8e3c0 100644
--- a/dev-python/yappi/yappi-1.3.0.ebuild
+++ b/dev-python/yappi/yappi-1.3.0.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${PN}-${COMMIT_HASH}"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 x86"
+KEYWORDS="amd64 ~arm64 x86"
#RDEPEND="
# $(python_gen_cond_dep 'dev-python/contextvars[${PYTHON_USEDEP}]' 'python3_6')
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index 534ceea2ac95..0b377441163f 100644
Binary files a/dev-ruby/Manifest.gz and b/dev-ruby/Manifest.gz differ
diff --git a/dev-ruby/chunky_png/Manifest b/dev-ruby/chunky_png/Manifest
index d91a1fe21592..fe7ba2c91f5f 100644
--- a/dev-ruby/chunky_png/Manifest
+++ b/dev-ruby/chunky_png/Manifest
@@ -2,8 +2,10 @@ DIST chunky_png-1.3.11.gem 352768 BLAKE2B a60607830c41921f8e8018b91e459103d0a793
DIST chunky_png-1.3.12.gem 353792 BLAKE2B dc891b23189ab4ff1f487d1ef3e83ede822261691c77a04d4ec4cb268902a6a3dac0db705644e7cceea6d5d097f520409005ebdf6496f5d3be339f2e0d27b13c SHA512 84325afc3903b3d0b4e4a19ebd9548029e02f68d45896efdcfe6eb23a64360f2c2b3d191c736cc172a11258828bf82687b950f95104cbdae639d00277c37bebf
DIST chunky_png-1.3.13.gem 353792 BLAKE2B 9804e2baba7816b52f9ba10db0cfc6e4b45db05fa95f3d154163866bc97e6da644f6240f65e3d5ca8b984cd102346d8838986ca7a1441647cbddd168fee3857f SHA512 40596c3a404830571a24b4241b306ecf1600d7d76f6d535805fbf53640890526b941f0cdae0f9873d00858457a65edd6b415a627725cecb0c32b753e42bf1bc2
DIST chunky_png-1.3.14.gem 363008 BLAKE2B b35dc7523583b2b6b5c42024ab0e29b90c3c2db734d80ae4c6690f34feb8af22eda09b17ef598fd96dab245d86dd20392b7d8ef727be4ee968d39225aa914bcc SHA512 d52aca34f94749dc58c8850f552bacc6354c93bccf041435d4fd1ed81a88e7564840fca191d6b40d56dfa69a74bbe09f7adbed1517e363e4e00884f7c81c4494
+DIST chunky_png-1.3.15.gem 363008 BLAKE2B e94b366aced2214a052f321ea828c7de9df2d9cf91f5a0926a1f17dd258774681db1172a3a04b033cbbae6f3f9bcb114bde3d07f166a6028e523a433926f6e81 SHA512 a53d3ba7b5d879a2f1dc3bccf20c4ba99fd35fa8224b21a4652904de9554ec4776b81186b8b75f5f77c6c1a63543ff1ace91c1723b76c1c4c7155bbc2a819239
EBUILD chunky_png-1.3.11.ebuild 735 BLAKE2B 0b660745c190b9ad13ef26ec32b2e6b9bb20ae1e51e85578333d12af02df390b6a4b1cde9b959e708459b7d8b003afe8d60c66712fc2eec4c1505eac2f4c70bc SHA512 f9bdb047dc31f980d22103f29b133103de6e9a70663433cc96bcdc52108ffe022daa60fea29330c2638dbae396149f85a822645ed995dfbec3d5e9e4b2f7408c
EBUILD chunky_png-1.3.12.ebuild 753 BLAKE2B 74682ed8fade797e87c2f3e4c74e162ee839054993f7a6c1a4b759d171c8f28f9b14645cd433700f2ccd3041a673595e3b51ae39cd959d4e06414bdc4e6aae41 SHA512 7f083da715a03d0bf0eca20a987315ff2234def44b3f369ae9fcb4ccc57aeaa5feb6c68a8b5c11f63089a7e75b8da4cb06c028b2156e0a254db49452423d54ab
EBUILD chunky_png-1.3.13.ebuild 753 BLAKE2B 74682ed8fade797e87c2f3e4c74e162ee839054993f7a6c1a4b759d171c8f28f9b14645cd433700f2ccd3041a673595e3b51ae39cd959d4e06414bdc4e6aae41 SHA512 7f083da715a03d0bf0eca20a987315ff2234def44b3f369ae9fcb4ccc57aeaa5feb6c68a8b5c11f63089a7e75b8da4cb06c028b2156e0a254db49452423d54ab
EBUILD chunky_png-1.3.14.ebuild 753 BLAKE2B 74682ed8fade797e87c2f3e4c74e162ee839054993f7a6c1a4b759d171c8f28f9b14645cd433700f2ccd3041a673595e3b51ae39cd959d4e06414bdc4e6aae41 SHA512 7f083da715a03d0bf0eca20a987315ff2234def44b3f369ae9fcb4ccc57aeaa5feb6c68a8b5c11f63089a7e75b8da4cb06c028b2156e0a254db49452423d54ab
+EBUILD chunky_png-1.3.15.ebuild 753 BLAKE2B 74682ed8fade797e87c2f3e4c74e162ee839054993f7a6c1a4b759d171c8f28f9b14645cd433700f2ccd3041a673595e3b51ae39cd959d4e06414bdc4e6aae41 SHA512 7f083da715a03d0bf0eca20a987315ff2234def44b3f369ae9fcb4ccc57aeaa5feb6c68a8b5c11f63089a7e75b8da4cb06c028b2156e0a254db49452423d54ab
MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/chunky_png/chunky_png-1.3.15.ebuild b/dev-ruby/chunky_png/chunky_png-1.3.15.ebuild
new file mode 100644
index 000000000000..58f7a1ed2e69
--- /dev/null
+++ b/dev-ruby/chunky_png/chunky_png-1.3.15.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_DOCDIR=""
+
+RUBY_FAKEGEM_EXTRADOC="BENCHMARKING.rdoc CHANGELOG.rdoc README.md"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+RUBY_FAKEGEM_GEMSPEC="chunky_png.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Pure Ruby library that can read and write PNG images"
+HOMEPAGE="https://wiki.github.com/wvanbergen/chunky_png"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+all_ruby_prepare() {
+ sed -i -e '/[bB]undler/s:^:#:' {spec,benchmarks}/*.rb || die
+ rm Gemfile* || die
+
+ # Avoid git dependency
+ sed -i -e '/s.files/d' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/multi_json/Manifest b/dev-ruby/multi_json/Manifest
index 0af345334233..704b257cb70e 100644
--- a/dev-ruby/multi_json/Manifest
+++ b/dev-ruby/multi_json/Manifest
@@ -2,6 +2,6 @@ DIST multi_json-1.13.1.tar.gz 26098 BLAKE2B e82a08a747a092a9094cd7b35b4f933b5ac9
DIST multi_json-1.14.1.tar.gz 24713 BLAKE2B 188d0fa3bf7a46a6cf4a5aa1d613523b4da3dee5061a5288146d1a367835b255f103dec265da9a218dd6dd21ecb38a7ce35d16a758ac7754b440f52c25f0b703 SHA512 19e2b6704a8ed39b8714da449c8961e740198772718ddba3d3b651f71f2b7d8c2c198d9cc16fe290f1df7b1e54d029c01147fdc431a8d2763944a4de802b89d9
DIST multi_json-1.15.0.tar.gz 24932 BLAKE2B c99c5c6b152c91dedc38fd24f8697f918064c603bfd72c55213f3ac8afd14d3c0ba31b7c3fb91c9998fcc8a5386f41a6983c53b40119558b99194ba58c06cc91 SHA512 55c873e45cdc59e75823aa031eb6d792cb9dc744b13a682fc279a8375b925db7a984256d61aa5454795a59722794a774a0ed5b6bf518db253152f4af67f46dea
EBUILD multi_json-1.13.1.ebuild 1909 BLAKE2B f62c99b3440fbd7ed45e9a549e9e83aea7598c89a64182c6db3869b42fb2c70605f8ece22e3357cabef7f39e25dc9208b734c3fbdcecf902c1342b065db30786 SHA512 1c056af470853ff954801e20a048c64bf2fffc3cd1b25b06374194569ff6004d531373503c0e3d1057dac54c4ecf219304f1f9bbdf5ea45abc1b36e14a34f0ba
-EBUILD multi_json-1.14.1.ebuild 1968 BLAKE2B 015b1404d563d4ee3220456a457e82f796885877dd42169d7365e1dc36c0b6b7b25a9e2e854c4d4088095a5cbfd9ae312895254209d252c7172d9415053d8d9f SHA512 2caa547a8b1f989f0fbf661204f7f82c653180c4de8501197ee27540afa76b7947c3082a5c6200822c90a66b17bb99fb8717a849ceaa7a4d2b815611e2320b9f
+EBUILD multi_json-1.14.1.ebuild 1967 BLAKE2B 20b40ce152a90a7d5a0d70c29e18a6a81c2bcbf9a30f0b0f6ab045ecfdc0f7afc19d95f63be2601d8ea3abe44211b59e707f4842db11927f1f21ae3790bba3dc SHA512 ca8d00813f96754d5e3f0d85d7cf0195e335bd2794dc2ccb30cf2cb321e40c0861b6dd47a25335ca8407d1ec3372939a908ac3eca6eda89193f861f1dd912ea4
EBUILD multi_json-1.15.0.ebuild 1968 BLAKE2B 641843d31c77760261e556a6e8277ca1c64e1400027eeb0ceb2a3243f3f99d5eb4a397637154aee891a40aa4bfdae801343be39b77af82f928756d1a2ac96227 SHA512 ff7a796705cb587ecc1ecb9f2bccbb6f974cdf4f9c01cd54900891e2ffa5ff58d816df4a9457733ef877303317a4b9537f85dfc26639e7a6dc785ce0903fd2a2
MISC metadata.xml 345 BLAKE2B 7d7684a1546dcc97e934f1a7df4484b568c5e8043dcfd0493e03124fa9f96959de5dccb78d22b1ff51ebc39b5fbec8b9a1dfd24531d676b8982b1f1dbd5097d0 SHA512 5fe7f117806d67e0d295bfcbdd07d4bbe8d3c3875e07cc3d276f2aee81b89f2e90174cbf4264d647384817fe0e8c81c2f2c9d9d67e3f78b46c3c194001bcace9
diff --git a/dev-ruby/multi_json/multi_json-1.14.1.ebuild b/dev-ruby/multi_json/multi_json-1.14.1.ebuild
index a1a87bd0e656..37cfcb5dbdd8 100644
--- a/dev-ruby/multi_json/multi_json-1.14.1.ebuild
+++ b/dev-ruby/multi_json/multi_json-1.14.1.ebuild
@@ -20,7 +20,7 @@ DESCRIPTION="A gem to provide swappable JSON backends"
HOMEPAGE="https://github.com/intridea/multi_json"
LICENSE="MIT"
-KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
SLOT="0"
IUSE=""
diff --git a/dev-ruby/ruby-termios/Manifest b/dev-ruby/ruby-termios/Manifest
index 1280418075b6..54d9f3ada1c7 100644
--- a/dev-ruby/ruby-termios/Manifest
+++ b/dev-ruby/ruby-termios/Manifest
@@ -1,3 +1,5 @@
DIST ruby-termios-1.0.2.gem 17408 BLAKE2B f85877dc3c9beb5c8d20e044ef7dfde6a12d540157228c1fdff365f3b662f8c84b9e7460ede985f0d402ec76a1d248fa41d336ac7bd9333222543c6d01748c83 SHA512 e32e899e917eb04e382a02484accf9fea0369de8c1942b445e48e71e9c836305e2d54221c9a044d27ede44a7d5c14f976a8ffda79f79f71b5a121474e759f45d
+DIST ruby-termios-1.1.0.gem 17408 BLAKE2B df85f46693c17ca05736fecb2dcbddafc3831ae04cdb56e13782242e4161d04e6c095d04927eebe1959843d6f6da95f0433309018a7cee2bd42407560c2c99f9 SHA512 dc98e6d7e304fa76b4139dd88f8c6955e6f4e09ca48d5611813fac941564c93165945c24dc0d7f7f84d7cd959512d006d73f042b57fcb1dde2743ffbb3cc9b41
EBUILD ruby-termios-1.0.2-r1.ebuild 725 BLAKE2B b85e1fcfc66ee3775b8c3785338142144a169da8c23e76f2cf9edee3c9a38d8484f4066096822f04285a73f3e0f73b639485b42f1360ba7ce753d9eb097d06f9 SHA512 19669765a46bbade129c976634d196869f9d40c71f0ff11d98103f147d78f7fdc761005c074360511e0633b576891d09651ce5cb483fcba48b11b3b094079851
+EBUILD ruby-termios-1.1.0.ebuild 689 BLAKE2B ac70a85bb99bea92e0b569ae199b61b1b419b9ea5b55852e34e65e306e9ad0431298b2c0e13fa825600e224b9f3757def2058303d92ee2ad207d5bd08c8bd8c8 SHA512 4abc5218c4b4effdcd77cec98f6d294be69125d54be3089f4d619d8d948b6083f90ea5dbd1ca5ffcfca50713b34f36c341377a65fa973de062600d108784bbf2
MISC metadata.xml 344 BLAKE2B bea737f016d7562c237c3cd1da976866362b52c33fed4f356becc724318f0d73129d6d67cb1202658495cd3ca337625f218cf3739dcdb19fab7fbf7df87df8bc SHA512 3c6d07c1fb48f63b2e3b11eaa84b24b6f57e1b7ad4146327950c294e0d49521a7dce7cb63c99bd0641c7b330d64b6c85d91ba6feb150282f35902fce8602806c
diff --git a/dev-ruby/ruby-termios/ruby-termios-1.1.0.ebuild b/dev-ruby/ruby-termios/ruby-termios-1.1.0.ebuild
new file mode 100644
index 000000000000..9fe950499df7
--- /dev/null
+++ b/dev-ruby/ruby-termios/ruby-termios-1.1.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_EXTRADOC="README.md termios.rd"
+
+# There are no tests in the gem, and the upstream tests only work
+# with a normal TTY, bug 340575.
+RUBY_FAKEGEM_RECIPE_TEST="none"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit multilib ruby-fakegem
+
+DESCRIPTION="A Ruby interface to termios"
+HOMEPAGE="http://arika.org/ruby/termios"
+LICENSE="Ruby"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~mips ~ppc ~x86 ~x86-macos"
+IUSE=""
+
+each_ruby_configure() {
+ ${RUBY} -Cext extconf.rb || die
+}
+
+each_ruby_compile() {
+ emake -Cext V=1
+ cp ext/termios$(get_modname) lib/ || die
+}
diff --git a/dev-ruby/tty-prompt/Manifest b/dev-ruby/tty-prompt/Manifest
index fce190600a7a..4f6a10c66ccd 100644
--- a/dev-ruby/tty-prompt/Manifest
+++ b/dev-ruby/tty-prompt/Manifest
@@ -1,7 +1,9 @@
DIST tty-prompt-0.20.0.gem 72704 BLAKE2B c3a24544459bfd70aa1ada029211d8873665794ac0dfa19bd02c86e3104c937aefc50009763ccacc3b3eb7c91b220125279c4388a94cd4dab5bc2cb77bad701e SHA512 d3e018465779d673bb80d15f2706edd762236dbee37bc9bd090138fb5dd918c63c4cda3418054391b9d15032fde399911e50c6fbed9d8063afc5896b31fb3fb1
DIST tty-prompt-0.21.0.tar.gz 72679 BLAKE2B 1693a2ad49d308975c0f03d9bbf01a192bc6e5c66eb04108a08a7d338c79d20ac80e8b45b0833f57b6a4f5191880160a8df0a9b9751c3af1f3d77b4952c99393 SHA512 e2963951523f9077a6aac20d12b88d261902c1f6ab1ab01bafd9eef94df76e37fd1448d5b5f81a3a8d2335eade4618896a64c77e80e369b3a660bc8d361cb53d
DIST tty-prompt-0.22.0.tar.gz 551572 BLAKE2B b18e3acba984c6848161deff659112ee2342d4021c0fa8df1aed1f19d4530382b4c2d4e215b42820be9939a8a563333c163217ac59809b3e9b1e4d68068647eb SHA512 2bc87d41c9359da1bb04a53c2f3535e4845e1a55594624235434b4e6d5f870029ae72436487fa6d2a795101d1fc8263d63dd89cc5d3e59b0756b80448c23e514
+DIST tty-prompt-0.23.0.tar.gz 553952 BLAKE2B 32ac89708b89550c0e46e9dd76cc4acbb1a8bdf6a365019e463c30bd60ee0e06a74a7c5b2c4f8f3cbda70f3a37ec86d6b5be788aec5f73411381f6195c13a467 SHA512 c37213f37c33c756e99ac5aa3c6124c25b94d53a72e013ccca31427a4e9bdb05284926cfc89d39b444cbe75946fe64f1ec40ad61e89f9440b946d9d32ce3ca1b
EBUILD tty-prompt-0.20.0.ebuild 604 BLAKE2B 4ad825cdeb6c476bb1bfa23ba4519bce927089ebe9f4a8bf7c97c81b3c35b670095aa7a8fb825140aef527c4a2afc21386ae72e7dd3f8068c1492b13512465bf SHA512 a3289054a294a48d4821e32aa3e6c65d3821655628c649083370be5bc7d3ed0359393e9d32c063a793c5bcdea7bcc98dd97241816c72f5b8aa6e4e74df0db551
EBUILD tty-prompt-0.21.0.ebuild 783 BLAKE2B 9d318e9fc03df8a32db4cc5965f18de8fdb0763cb1af6fc27c809784d2a0a8af4dadd822d7f324f5946f57abe0e33eaa6886bed37eefba3aef11b38b1869b5b4 SHA512 81b63b91ed97e36ae060318992e1096da5fe5f022a2671614085a0b99818187530b5260b02db80ceff77c6b4b78de7fa0e88f84786d638c227519d28c74945b8
EBUILD tty-prompt-0.22.0.ebuild 759 BLAKE2B 9dfe0b42d088f5bd3399f3b84243cfa10ac42289f2c71b80f4db117dcd95e3718b0c7fe349d757d4b1d166d8fdecc0fc1f1d4852ff4c3667218d87dd6b89602e SHA512 e6a164a320ce1cd97aa4fd7a0f78a6b33602187ea05563c30f9474928e5dc41c31da1921dc6bd524ae3a1f65267ec665ff13cd4ca778c8859a966320ef3ab32f
+EBUILD tty-prompt-0.23.0.ebuild 759 BLAKE2B 9dfe0b42d088f5bd3399f3b84243cfa10ac42289f2c71b80f4db117dcd95e3718b0c7fe349d757d4b1d166d8fdecc0fc1f1d4852ff4c3667218d87dd6b89602e SHA512 e6a164a320ce1cd97aa4fd7a0f78a6b33602187ea05563c30f9474928e5dc41c31da1921dc6bd524ae3a1f65267ec665ff13cd4ca778c8859a966320ef3ab32f
MISC metadata.xml 338 BLAKE2B 6162c739121dfed6f95cefbcd4b187668bcc434678ed094b70d9963662ab44e263e357ed1c3ad51bde318509dd19dabb7e8acd26845bfc1bad1119d2a6c27964 SHA512 383567b446b991c346809d57da8c2dc269d5dee34abc0a7ec354942ac025fc868cd0d2b92ebb764d7d2aa8a4b0f86ecc5bf00c80619922cb694fe0e04445d12b
diff --git a/dev-ruby/tty-prompt/tty-prompt-0.23.0.ebuild b/dev-ruby/tty-prompt/tty-prompt-0.23.0.ebuild
new file mode 100644
index 000000000000..86c2dc4efca8
--- /dev/null
+++ b/dev-ruby/tty-prompt/tty-prompt-0.23.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_GEMSPEC="tty-prompt.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A beautiful and powerful interactive command line prompt"
+HOMEPAGE="https://github.com/piotrmurach/tty-prompt"
+SRC_URI="https://github.com/piotrmurach/tty-prompt/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_rdepend "
+ >=dev-ruby/pastel-0.8:0
+ >=dev-ruby/tty-reader-0.8:0
+"
+
+all_ruby_prepare() {
+ echo '-rspec_helper' > .rspec || die
+ sed -i -e 's:require_relative ":require "./:' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/tzinfo/Manifest b/dev-ruby/tzinfo/Manifest
index 20c3407be047..9edeb2fb7e7a 100644
--- a/dev-ruby/tzinfo/Manifest
+++ b/dev-ruby/tzinfo/Manifest
@@ -3,9 +3,11 @@ DIST tzinfo-1.2.7.gem 156672 BLAKE2B c1b52d2ac03fa9d11b68579931991887f566e3cb269
DIST tzinfo-1.2.8.gem 166400 BLAKE2B 67f116171a6cfd2680c5eeac3cf7a034b446e973f2658052a70fff8d0571bfae03ee212b26d277c6b5050943f6117b5d8ce7c2ce5c5ab6891a1b8e9212bf7ded SHA512 5573b252d91a77b1e1ace2d2ccf48f7dd9bfb79b8b0b15ba2e8757e5fdcb9cbc044abdcf82beacffa284fc57ded2b579feccc393331f0f5a680e5f5c6275b62a
DIST tzinfo-2.0.2.tar.gz 213501 BLAKE2B 7886ba84257b85104073445d0948fd5f58985fa0f5f85c1ec15978c6f497fffb9bd997a0bae1313d697115c487c069dda1b7e5dd4ec2c7580951d0a8ddf8d623 SHA512 a0c71dd9299e84bd71a91858ba8c12a0ba00c625219da1172d5cd1dfd35318ce8a83e59f45489c2ed5161761e1c39834ba63dbfa189acb100ba37ceae842668d
DIST tzinfo-2.0.3.tar.gz 223942 BLAKE2B 975c2278ba86c7aaf11cb870b12fa41a9fb3eb8b8b87628bcb0b09f54d7f2490b2d9864dd411f646f20c3760ed0949a8ee4266c28a6b0607927e9807743a9f13 SHA512 c9e94af668217226533d2810b647cc7a0d0a553177ab9c4102e5676fa21d4384e833c887f5cb3f9c00cf738763dcd39b25d991483641426c407237938e076adf
+DIST tzinfo-2.0.4.tar.gz 224673 BLAKE2B 0c7ef231767b6fc00cf95b3e1c2037894b14dfe832eaedb3f4b7c60a884ab6f7121243af5b62acf47d02da28395e7390f968421a3a3a2d731deb079e9fc51bfa SHA512 5b2ec73f737009ba21dac7dbb9504235fdef14dc45a6450e1218ba9e53dd29735ab4fa6c2854271916cc5c0244e09ae7ab19467408b72b9b82ca238e14d3fa4f
EBUILD tzinfo-1.2.5.ebuild 1062 BLAKE2B b1368ba23bd2e4eb2003eadb11fb4697c0349eaba076169929ba8acff26e12295c3e9fc501b8db9877c1a46707f4dbf34ffb8cd2077ec9a18509ef943b79df9d SHA512 615494ec0f377c5ab47992fc2cd660933aff560b7b9b3ac36137fe6f7d134df7503409994a654596285fc12fc3fbb3edde6e21247a6d24ec3fbcbad00853a8e1
EBUILD tzinfo-1.2.7.ebuild 1041 BLAKE2B ff9248b33054054ad5a24df6df40456ee4c47f985dfb2450e10117c612fc1680a0523021a71e41da676d8161257a0c4f6dd7b88108eaac9163a3ff8835d93e4d SHA512 909f0fe46a327691056eefefc5ee0a40f360e308eedf14336c57c0980b381325dffc5a26f8f5418864e3e7e5def53154a473560a79a83c753e10306dfa8e076e
EBUILD tzinfo-1.2.8.ebuild 1034 BLAKE2B f2057fb51267ed0884ca73e288d8f51710f13a3fe2d51b9a64f8a6172d50cb0d3ebd0da2ba3830ffacda63db7e72ea77e69e38353485b2908fb312734f611bd2 SHA512 7df0b6b03ba279768f1c36e0ca57029e5fe7d28754c1cd470ae4595a16647852b3399f9f3fb6fb2cfdf9c74bc7bbd237d7cc4dcdccc81fa1e107210f5ca0ec6d
EBUILD tzinfo-2.0.2.ebuild 1436 BLAKE2B 46069296c733f7968826499a3f03155ac027185e9961993ec49ab20e3d79b74c694a2f7a5b005285a6a4c18cd1aaec6f12a1d172a21679290a6956b053b7d446 SHA512 cdc9d83064ea1929179081f6849e1c857e9ce5db2209ff7b5c6c9faf6415b0d7f8cf754e0f205baa422e20af44b02b9e44e29bedd827f59bc4fe8f642bcc6b2b
EBUILD tzinfo-2.0.3.ebuild 1429 BLAKE2B 3d67d2dfba06ecb16f5ccfa9eb58e74bc4eba774dee00fec47e512c29f7c8e8e8e0d00ca3a50555f2dba9c2284fff18827cb3766b11fcb8789d1a05528f8edd7 SHA512 a6dfec51ef0fdcf46e1904698cd3acaea952cf56e6f179cfa8b862c84be641cea807ba33f4eda1df6b78407c8b95f52d9d9ee7e635fddc9a31dc4525de2ceade
+EBUILD tzinfo-2.0.4.ebuild 1429 BLAKE2B 3d67d2dfba06ecb16f5ccfa9eb58e74bc4eba774dee00fec47e512c29f7c8e8e8e0d00ca3a50555f2dba9c2284fff18827cb3766b11fcb8789d1a05528f8edd7 SHA512 a6dfec51ef0fdcf46e1904698cd3acaea952cf56e6f179cfa8b862c84be641cea807ba33f4eda1df6b78407c8b95f52d9d9ee7e635fddc9a31dc4525de2ceade
MISC metadata.xml 251 BLAKE2B e8bf2b70161d425791d65052583fd8be03b19ef3bb2a2cde34605bc93224fea9d8c6a91f0f2d630a00094ef54c0871e210da0e0134f52401bc80cb6b2358c13d SHA512 17d4dbd64468a524311a24ca065537a5b21560388efd282f3fa873e6722f70db6f83e3e5615556450905c29d5df2cf0a0855f9c0b38bf23f0f8112501456d4ea
diff --git a/dev-ruby/tzinfo/tzinfo-2.0.4.ebuild b/dev-ruby/tzinfo/tzinfo-2.0.4.ebuild
new file mode 100644
index 000000000000..f95e0c59ce27
--- /dev/null
+++ b/dev-ruby/tzinfo/tzinfo-2.0.4.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_TASK_TEST="test_zoneinfo"
+
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="CHANGES.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="tzinfo.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Daylight-savings aware timezone library"
+HOMEPAGE="https://tzinfo.github.io/"
+SRC_URI="https://github.com/tzinfo/tzinfo/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="2"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND="sys-libs/timezone-data"
+DEPEND="test? ( sys-libs/timezone-data )"
+
+ruby_add_rdepend "dev-ruby/concurrent-ruby:1"
+ruby_add_bdepend "test? ( dev-ruby/bundler dev-ruby/minitest:5 )"
+
+all_ruby_prepare() {
+ # Set the secure permissions that tests expect.
+ chmod 0755 "${HOME}" || die "Failed to fix permissions on home"
+
+ # Skip safe tests since we cannot guarantee the correct permissions
+ # on directories for it to pass.
+ sed -e '/safe_test/askip "does not pass in gentoo test environment"' -i test/test_utils.rb || die
+
+ # Loosen test dependencies
+ sed -e '/rake/ s/12.2.1/12.2/' \
+ -e '/simplecov/d' \
+ -i Gemfile || die
+ sed -e '/TEST_COVERAGE/d' -i Rakefile || die
+}
+
+each_ruby_test() {
+ ${RUBY} -S bundle exec rake test || die
+}
diff --git a/dev-ruby/yajl-ruby/Manifest b/dev-ruby/yajl-ruby/Manifest
index 97a01f497ef0..966dcc7f41a6 100644
--- a/dev-ruby/yajl-ruby/Manifest
+++ b/dev-ruby/yajl-ruby/Manifest
@@ -1,3 +1,3 @@
DIST yajl-ruby-1.4.1.gem 557056 BLAKE2B ade1c18bff1d95a733a1981f7898f1ebaecaed6e9a0354af2a6b4d0190a37e613830f77d5e57178b622c32e2d8688aaa11a7edd543c17a30a16f9045d21ea4aa SHA512 24cd82380658d784bbf0a7a16d4048125cc5a856b0e0b4d3bdec29a550a9131d3959f9a75eba0d18d5db8d0a23158fb7ef6ea6f60d221a7bc3d8efc437d52df5
-EBUILD yajl-ruby-1.4.1.ebuild 1229 BLAKE2B 75281d4891f9651016fc1557dfb72f1a15868d92f4867d50c73538774b70e9cd2ccc821effe2f67aa44758cbf8e7465b2af2c8fc4afbc49ed376e9142a2f5975 SHA512 3dc7458c24c91a558db038032f24bdcd48f05bd6dde5d0b68504491bc1414dce8a196bc28ea29b39fafd1ccf0fb486bd40470be94786d9a92da496321409a6fe
+EBUILD yajl-ruby-1.4.1.ebuild 1234 BLAKE2B 6914f3182f22113f2187baf20520448b0717bdbd1d2b1c108a5b48d889c18c085da65e1690aff1bc67005ed22c7616d424569b04b095c255c9d36c32ebf3109c SHA512 62d691a59c0e35363d51f142963ea48f801b89022dfc97d32a84ad8a9a509ddc11126e55ccd0589708fa7c8967a598e5040bfd361ab2c1a955d5c9136cdcc72f
MISC metadata.xml 346 BLAKE2B 2fff8cc633fbc47874a3e5a9e567ef430dcdd4de90343c35f599b15a85e0601a5d4b3c5b650e3971dab90cd90f382505000b40092e57d05fdaf86536a02106ff SHA512 54921a3e3df293d819d020aa6671e7e33f9031b83d375d6f8423fd844cf757c20c2e6cafc9d5a8f2670e10bd286b4e29067a8d7176e7acafd3474578134a2aae
diff --git a/dev-ruby/yajl-ruby/yajl-ruby-1.4.1.ebuild b/dev-ruby/yajl-ruby/yajl-ruby-1.4.1.ebuild
index f6fa3aa93621..1a7be9cd00bd 100644
--- a/dev-ruby/yajl-ruby/yajl-ruby-1.4.1.ebuild
+++ b/dev-ruby/yajl-ruby/yajl-ruby-1.4.1.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://github.com/brianmario/yajl-ruby"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND="${RDEPEND} dev-libs/yajl"
diff --git a/dev-tex/Manifest.gz b/dev-tex/Manifest.gz
index acf92c5f4b3e..ac2e908d796c 100644
Binary files a/dev-tex/Manifest.gz and b/dev-tex/Manifest.gz differ
diff --git a/dev-tex/hevea/Manifest b/dev-tex/hevea/Manifest
index 97cbde99f73d..1a1e671409de 100644
--- a/dev-tex/hevea/Manifest
+++ b/dev-tex/hevea/Manifest
@@ -3,5 +3,5 @@ DIST hevea-2.30.tar.gz 965635 BLAKE2B 7f23c6f793be1515b689571f0ae25d76d45c7bd8df
DIST hevea-2.31.tar.gz 965678 BLAKE2B 770a3ff5b3e209d1e34e68647baffc064cb78f63a610e6b81181a829837861984f22e381cc17c34a3b0b4643c260a5cb84841cd8e2038e40083bba7ffbdab929 SHA512 4b66030f69b8b60750f8e62a9d81240b0ba399af8af69df10b33742e10d23fe7aef3e7782265fac9705f27715e5964debd47b9da7a394f70fda947b5fcd2d6ea
EBUILD hevea-2.29.ebuild 1399 BLAKE2B b292b879fffbb1bfcc25cd391948575dcf258138ac1894f3e667c77666bb87d966c87725b3f91e23814bd34914eb932edb0679a27a206fde62640d770e95f6c1 SHA512 0d234ea448643a386d84df7add23c65f8be2367bdb9b068aab4864ba5e300082419ab1356fd7eefeaf81b2f1bf6d8fa91a8117163d10599efa0bc0450312cf19
EBUILD hevea-2.30.ebuild 1402 BLAKE2B a1c8918296823122ad0d80282305389e9b76f79d06e35d56be2ccb1448500f73ca58073a1915725d22d1aec97248a8fbb260025799e5d36579391a25617fbea7 SHA512 cab09c6eca6883ff939229219f99966e775d595405371eef40a1b7ca2706b97b88ed3414cd7a6e92a0a67ad1c03353c71583372a7f6fb310c8873c8da1418269
-EBUILD hevea-2.31.ebuild 1402 BLAKE2B a1c8918296823122ad0d80282305389e9b76f79d06e35d56be2ccb1448500f73ca58073a1915725d22d1aec97248a8fbb260025799e5d36579391a25617fbea7 SHA512 cab09c6eca6883ff939229219f99966e775d595405371eef40a1b7ca2706b97b88ed3414cd7a6e92a0a67ad1c03353c71583372a7f6fb310c8873c8da1418269
+EBUILD hevea-2.31.ebuild 1398 BLAKE2B 3782caf2b8dc25bea2c05d63fedacee1bfd258848c390232b0c67b3712c722b82ee150c4f9e567b79d14ad4f49fb81b332a7b4f18fc69b8c1f724106297ec6a2 SHA512 9a9473956baa4ecd374baa931155ac0f8b135516c9b60672f4d20f64941f2ceea914199274cb6952ed1aaef1d3a939510f8207edf543ec0c7e46fd286e4efd1f
MISC metadata.xml 249 BLAKE2B 1b34ce77c092c0664a18f32525d158d41bf36ab7ab7a4b9d01ed37e1e3dda3d58849d5b1375065c4e5591f6b09b2a93e88a624d399c495a0b1125edb30ec172f SHA512 895325641a176c848988fb5f36cdb567b584d22f6e778b3de674de480cbca30b7cf8f12ecbbe1173a63e3229889e1e0f5efd5afea4f0d4c429ac236598f80f1e
diff --git a/dev-tex/hevea/hevea-2.31.ebuild b/dev-tex/hevea/hevea-2.31.ebuild
index c5dfa8e05aaf..aebec23c86c0 100644
--- a/dev-tex/hevea/hevea-2.31.ebuild
+++ b/dev-tex/hevea/hevea-2.31.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -13,7 +13,7 @@ SRC_URI="http://hevea.inria.fr/distri/${P}.tar.gz"
LICENSE="QPL"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ppc ~ppc64 ~x86"
DEPEND=">=dev-lang/ocaml-3.12:=[ocamlopt?]"
RDEPEND="${DEPEND}
diff --git a/dev-tex/latexdiff/Manifest b/dev-tex/latexdiff/Manifest
index f9390110cfc4..ba66bc23d388 100644
--- a/dev-tex/latexdiff/Manifest
+++ b/dev-tex/latexdiff/Manifest
@@ -1,6 +1,6 @@
DIST latexdiff-1.3.0.tar.gz 1791127 BLAKE2B e394dcf29d529f47a87eb7615d0da42a2d30c0e3a40938903cee75c2241ee8543713ee735f94f9eb9fe59829be85a5dad681183d96b2651e0e09d20ecae9e207 SHA512 d1b47ff4733bbba0ecadd71e6c54362b78ad8e97cac54b99b9ead4565dd0a56a8a5d4ce27866cabb4dc43c47a3c2230ce7743909f2d30bb94ecbae75c6ecbaae
DIST latexdiff-1.3.1.1.tar.gz 1879814 BLAKE2B 1f537dff75ff12eeacfcdfa05c0199a29a0ffc4e8ff728b390dcbd35b3ba490e4e1c2e7201b7313335aabd8b870e764b9573d6322c34141be9d4fa141349db0a SHA512 bdc573b4fdb4d647ab3208f350e89843e4602e81c293665e1d08ff9b1b0d531c665d687be0185ff9ae229b9f43fd9bbd6aac437b6b1bcdca9d72d39f360b6136
EBUILD latexdiff-1.3.0.ebuild 1175 BLAKE2B da8a2ee81250501bcd2b4a623c424b1ad66e08d1016ad834721e38da17fe20e345552d0af603b3299105788785a0c8c70e2ae8ec811e27d025b67b33822ba1b2 SHA512 ad2f76582f4a86d254adfff2406f86f79354acbe6b8425b3a663549ea7b37e3ca830cbe07fdfc06d18bffbedb3e392cea8a470506c3a96214455309fae4e0ffb
-EBUILD latexdiff-1.3.1.1.ebuild 1182 BLAKE2B 6aab4e29b22e72953edf34229ad41a795a41f64f399620e838c08f71354bcfd11d17f2b4a6237255428f3aff03f2ba5ab4e1fcbdceaac152d683d709df27c53b SHA512 5f4a7b47fb985d1785006d57e37b904f1bece9e1cf45004ab5ac8da62a34116b040d089447cecdcec4869820b4432298b8e1c073fa194815904f7965f07f6f65
+EBUILD latexdiff-1.3.1.1.ebuild 1181 BLAKE2B 4e667b9128094668d0d0c9465b78a8a0f53644817728e40c6ae44bc8cece96eacfc12bef8d510cd9f57cbb2c98b60b69973cfd4cee440483fca40ccfe10b659d SHA512 4202a34731b011b66526ec542bbeed6251db83cfc99a8f39e0db6187328cbde92b0d14e09a02862b05e4bfb749da298eb652e88bd5290e6d616363e5d409c245
EBUILD latexdiff-9999.ebuild 1182 BLAKE2B 6aab4e29b22e72953edf34229ad41a795a41f64f399620e838c08f71354bcfd11d17f2b4a6237255428f3aff03f2ba5ab4e1fcbdceaac152d683d709df27c53b SHA512 5f4a7b47fb985d1785006d57e37b904f1bece9e1cf45004ab5ac8da62a34116b040d089447cecdcec4869820b4432298b8e1c073fa194815904f7965f07f6f65
MISC metadata.xml 332 BLAKE2B e23b9e1ce0df618f8130ae9291147e4c2cdd33e0aaa3f26e6900cf30f41dae7f4954144180ca0886a8a3370910e1e4bba21dd87b303e23e6bbb8ceea484e00bc SHA512 a0e324d4d38574f5f5af8003e9e048f4c0628022e5b6553d1ce4b20cf12424f15e1bea07c6bd6cf87b7f7ba54c9983e2c025b42d517ef31c9fa3853def50ba3c
diff --git a/dev-tex/latexdiff/latexdiff-1.3.1.1.ebuild b/dev-tex/latexdiff/latexdiff-1.3.1.1.ebuild
index 2926345b876e..f3a63474be31 100644
--- a/dev-tex/latexdiff/latexdiff-1.3.1.1.ebuild
+++ b/dev-tex/latexdiff/latexdiff-1.3.1.1.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999* ]] ; then
EGIT_REPO_URI="https://github.com/ftilmann/latexdiff.git"
else
SRC_URI="https://github.com/ftilmann/latexdiff/archive/${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
fi
LICENSE="GPL-3"
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 216238afb2cd..758236865578 100644
Binary files a/dev-util/Manifest.gz and b/dev-util/Manifest.gz differ
diff --git a/dev-util/catalyst/Manifest b/dev-util/catalyst/Manifest
index 530b8d0e9312..ee43a0ac09b2 100644
--- a/dev-util/catalyst/Manifest
+++ b/dev-util/catalyst/Manifest
@@ -1,4 +1,6 @@
DIST catalyst-3.0.14.tar.bz2 621178 BLAKE2B 3fa87125f14661bb77432267f03c0966eff8f71f4ef334ce0a14218f7557dee270840afb79b6735a149851ed44b1ea2f6cf59d8274d74e049246d89874aa484b SHA512 938a63a83458fa5a26a4b4e62d18086ed813aec5638a9dd363ba553cb7aeb337c3b8ba0768f3b5a658aa54f2f375a7fe067279c739073d2420c3ad3a42830830
+DIST catalyst-3.0.15.tar.bz2 621366 BLAKE2B 890381a3ed53bd28eb110a95b98fbdac83d1ee72e935919a47a5bae29f672edb1943fdf5f259572ede578c0253e55a39f25fba88109e6d9bc5af0d3e344c2db2 SHA512 ed543b995664a5786790990cb4729e84a705820d1e72eefb432c3622bb2307646a0ee753eaaafac93bda04df130e83dd6db6b59052c4bae6347b77dabd67b2d5
EBUILD catalyst-3.0.14.ebuild 1913 BLAKE2B 76c621805e4cbb86e2bd52537091309fea71a6abef1190b274180210dbd6c363502d478d9c27f2981143e5068264e5b0b05633b857184e053669f11e44eba913 SHA512 be473d81fb31ae9aec8aa25608c426f98c877d4115a091c7fd7561e45e2dca3805c076b6eb088dee3988dc6925f186a67f3f951b5e75f2ea5d66014290d981f3
+EBUILD catalyst-3.0.15.ebuild 1920 BLAKE2B 7ca73e1aed2adce42ce88ccc20b7d430203e95548703b3fd4b1e827c64c9c33f53a1e32f5ced427a3a042a9a435a005dc5a4d8f245cfb51fc9067bf6bad668cd SHA512 b9325a569babfae2fc1cf65033d658f6afb4a464070772c3cb370e196128641a478662f9d26eb9764916720da3f3edb4afc06c6754d06c2e8094444b53858487
EBUILD catalyst-9999.ebuild 2317 BLAKE2B 9e80914d109534080b36949a85afd9a4ca28d51e58b7c96bc5bbf359a3d18093ece3263650cf540584e4ad730f50ec7da2c1a8d8447950e46489be6a8d81e69d SHA512 45b47f8c3dfe12d15bad9b57e0fd4d885387e97bd44d8779dc9bcfe492d8240099185a434a25829eb6d43627e8a8ad3005403def3e3cd99fea2bbb1fc3173412
MISC metadata.xml 512 BLAKE2B 27e0e3638c330c780f163608e5e62b71ed636a2e26291f97465c4506ae1b99345d081046bcab70b1bf56e36c5b9a6b8220b94da8433f2b313235c784ad6b9b5f SHA512 7d6683e83df2d311f3210af91880486ede8f7ddea57044e765f29694eb3e1b8df6f3d22c9a729c480ae9d49ebe3778cfe7a6509365f59eaae34f8438afe97afd
diff --git a/dev-util/catalyst/catalyst-3.0.15.ebuild b/dev-util/catalyst/catalyst-3.0.15.ebuild
new file mode 100644
index 000000000000..cf9fc644a640
--- /dev/null
+++ b/dev-util/catalyst/catalyst-3.0.15.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+if [[ ${PV} == *9999* ]]; then
+ SRC_ECLASS="git-r3"
+ EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/catalyst.git"
+ EGIT_BRANCH="master"
+else
+ SRC_URI="https://gitweb.gentoo.org/proj/catalyst.git/snapshot/${P}.tar.bz2"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+
+PYTHON_COMPAT=( python3_{7,8} )
+DISTUTILS_USE_SETUPTOOLS=no
+
+inherit distutils-r1 ${SRC_ECLASS}
+
+DESCRIPTION="Release metatool used for creating releases based on Gentoo Linux"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Catalyst"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="ccache doc +iso kernel_linux system-bootloader"
+
+DEPEND="
+ app-text/asciidoc
+ >=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}]
+"
+RDEPEND="
+ >=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}]
+ >=dev-python/pydecomp-0.3[${PYTHON_USEDEP}]
+ app-arch/lbzip2
+ app-crypt/shash
+ sys-fs/dosfstools
+ !kernel_FreeBSD? ( || ( app-arch/tar[xattr] app-arch/libarchive[xattr] ) )
+ kernel_FreeBSD? ( app-arch/libarchive[xattr] )
+ amd64? ( >=sys-boot/syslinux-3.72 )
+ x86? ( >=sys-boot/syslinux-3.72 )
+ ccache? ( dev-util/ccache )
+ iso? ( virtual/cdrtools )
+ kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 )
+"
+PDEPEND="system-bootloader? ( >=sys-apps/memtest86+-5.01-r4
+ sys-boot/grub:2
+ amd64? ( sys-boot/grub[grub_platforms_efi-32,grub_platforms_efi-64] )
+ x86? ( sys-boot/grub[grub_platforms_efi-32] )
+ sys-boot/syslinux
+ sys-boot/shim )"
+
+python_prepare_all() {
+ python_setup
+ echo VERSION="${PV}" "${PYTHON}" setup.py set_version
+ VERSION="${PV}" "${PYTHON}" setup.py set_version || die
+ distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+ # build the man pages and docs
+ emake
+}
+
+python_install_all() {
+ distutils-r1_python_install_all
+ if use doc; then
+ dodoc files/HOWTO.html files/docbook-xsl.css
+ fi
+}
diff --git a/dev-util/cloc/Manifest b/dev-util/cloc/Manifest
index a5acce655ba0..063f543f271d 100644
--- a/dev-util/cloc/Manifest
+++ b/dev-util/cloc/Manifest
@@ -1,5 +1,5 @@
DIST cloc-1.84.tar.gz 514868 BLAKE2B 53fa0f0d2c8033619f9f7202802e5fd51013c459bbeed8482a35050be69981e60f3c96879cc2853d509322933050fda52fe17be7ec393783f06a0df5e9cec785 SHA512 85f8af041b0ca858c21e28d3fb7cd9201264afa9e12bd3a14b15a8af3e6e68378dbb02a39dc12140bcbb104424cf38bfa602d2a0683e8c89fa50cbdcf7556b3a
DIST cloc-1.86.tar.gz 536828 BLAKE2B f584da0e25ae755a1450117774ec8fdb87eb693ac77473929a52e617713391eb4bffc2f6b74bbcd5b01f6e2c0d747221e3f7c4e74dfd6131d3cde10a3a102daa SHA512 fe6101404f5884d11bf73de43bd25e533b04a70707b95e4e9482b51413aed46ddb55beaa27e3d25cd7604394a739f7cac6c1f8695cd9cab3f23adf6e27171719
EBUILD cloc-1.84.ebuild 681 BLAKE2B 7f0b61c23a9af5fe8bd6d6359e926989191ef28f5a2fe3b045ac325c8c88d3a48d1c3d884e6aa9a35c38ac586a2eb571a9d36d72b8d6215947f1dbc63d5d26a4 SHA512 f5bcfec8a2c440f6105adfb1c9e99acf2b2b5bdfb3f8e1205b4f3c4a92cef7072f472e8337500846bdcd6d88b1c2fb239d61de1c38d6f4e91653127421e5dd6c
-EBUILD cloc-1.86.ebuild 683 BLAKE2B 125b6eb0805bd7047cd3cb74e807a7110393001879aeb9be71b221c3e9369d95e82ed83aab6d7230235e7479c83ecd9030542d9017c9ea529af7fc33350ee594 SHA512 80fffb487795b4abfca524c7a20abf284d8647fbd45c415b0c29ca512beb3edff41fe93e312989690651ba1d61358162b2de51293cb8a7961a8c6d6f4cbd8bbb
+EBUILD cloc-1.86.ebuild 690 BLAKE2B aba1ed53616bf629c70bf2aaf90a8edcec86c7f976349d37664db4064b9fcf3d622e63438d16d92174acc6c57c825d509f9d16cb854cedec06996ffea824674c SHA512 6f69d7feca2204ed07010169c5dd1f4ea3f777b255017b2389c9aa864e46eb97657309c8ff5ab9fbf62c547f2ed370bc58c5bd1f588e947da597feb97c676dc8
MISC metadata.xml 699 BLAKE2B 424f272c2a398814052cdf40724b0daaf63985ef10194e38b2a22ad4cf67c90a9ee016d7e14dca738729d61b45d0cf7f2044f5801e6b35fe344ab152fe754d80 SHA512 7625ef4e35fda98f4a56ddc5a02f24af4b8a30db9fc1297092188078328ac8c2f188715251b41b3956c40a946b8791c5ec06e71c2edb271ffb0459add56dd7df
diff --git a/dev-util/cloc/cloc-1.86.ebuild b/dev-util/cloc/cloc-1.86.ebuild
index 61220333dbd9..d2013f01d311 100644
--- a/dev-util/cloc/cloc-1.86.ebuild
+++ b/dev-util/cloc/cloc-1.86.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/AlDanial/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
DEPEND="dev-lang/perl"
RDEPEND="${DEPEND}
diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index 329a719fd9b9..512cd725c664 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -5,9 +5,7 @@ AUX cmake-3.1.0-darwin-isysroot.patch 1926 BLAKE2B 4e8dfc78db33e62a6234a91210f01
AUX cmake-3.11.0_rc2-FindBLAS.patch 775 BLAKE2B 89249b37ca44cc9068a5fd81350637da16c3a92a662f5b30db7e7bbfb9b47c816122bcbe31cb01845bdec760d449d0babbbcd6638ad4975b39db73c7bc5ea2e2 SHA512 ab24736b64bff1f9213f3eef7acc6a78829c875e8e5ec7b0d96ad406517e5335b0e3930ef369a9d6190d25a298c6834965e4977e5062e87595169272339f7738
AUX cmake-3.11.4-fix-boost-detection.patch 996 BLAKE2B 195ade40e279ca85ee55b1d46353f8809f68e405a6c914c34340825f7f77ec5cb78ebee3f7aa12cc6f026a802db4bc893ac8570a03b76af708ea2df7a3ecadb1 SHA512 66da91fb39286d1745af733a806f60db313ddb0a506b29509aba66259a57cf8abf65fcc871114c5a2cff91eb8c27ca346dd75fbd29f773fb2d31cfead827f250
AUX cmake-3.13.4-prefix-dirs.patch 4239 BLAKE2B 470de3626a9f6edf65e5ec597b1de36697e6c2038ec5f435dd5a89ec69ac32227663f0eb5f86c9d5d89a1c809e1092b5e901c52dcab9f2a7d3bc8f7bdca110a7 SHA512 b1801d0f0ec8963181460a8b939a26e791295d6a45fb78135dce5684507689cb44cab7a536d5f85c26f51deda19e95b40500aba026f43920fa7eee686ad3869c
-AUX cmake-3.14.0_rc1-FindLAPACK.patch 1798 BLAKE2B f372fd920abaf85ab3106385d45e193c2c0fba1ca9fb5c14cf53bdee9a29602b7db0078676c90f65f3f3eccddfbb1f6b9964d26f90aef38cbc0c197a4b243ac5 SHA512 dcc970561f54d862f2124512bfc28ab25e66b1fa5e6a7a6138faae7f1e3a4136320ad4d4942153ac9505035b74f3e8442dddb62af6fb1486fcfec08fcf3e3743
AUX cmake-3.14.0_rc3-prefix-dirs.patch 4688 BLAKE2B ec197f40246ff9b47f6515cec92f0ef497de2e96756cd7c12ea3fe7c71d5e2220c637210f663194c63e72924d89dbce7afe92fed01bca8947bdd76af6f5365b0 SHA512 9da6be335e5615b2e14fdcccbadd50a0e2df6e19476818358216501b657350c73fa6bdc1dcaedec1fa50e3e18e39544e2d2815d6f54dd5b4aa5860bdf35e8d52
-AUX cmake-3.15.0_rc2-FindBLAS.patch 1233 BLAKE2B 165307b41f7ebaa094e80adbab336ab10c48841a3c0b0e14b1277f847f624b421448cfc5e45a20e80f71f14ee7986ce756bc5b3d8e6b41b4a741611151d7f446 SHA512 2d46d95e69fd8eeaf8df198243269d87b83b87b6ade1d5f80d69ed78627a54ce05718596eaf43c7851fd4e010e526fa38350efeb2d92cbaf260e7789da0a2b6a
AUX cmake-3.16.0_rc4-darwin-bundle.patch 1388 BLAKE2B bcb6c3d8e4f64ccc3e6ebf9ae906960075b3fb1f432925e07a711ac27321023033013e7a2e1d0ffc60dd464b775fa2537a49c73089861a2ce8f6316ddaa3d03e SHA512 7e0f598fe1cbb2c44b345091c102fb42ebff510ea7eeccdbe1fe0d65251127d823c37f2d37b073305679ed86fd48923566f1d62a7c9fb55df475d48891b4b861
AUX cmake-3.17.0_rc1-FindBLAS.patch 1087 BLAKE2B 5e549db39f0e8c5f821a70121551ccea132e11dd8b468cfc7439e61763b5406860d952787d5957ea719dd48ec32ac8313d3209bed2a3423f5e40b8a2fcf04ae4 SHA512 1ea5e5e44c6a97cced30ef38424e24a3551d58c828d71d3b5994c265f099a3aa19174febfc2778eb688930432073e012557a79550d38b6b716e6b619d74a298c
AUX cmake-3.17.0_rc1-FindLAPACK.patch 1973 BLAKE2B d4f10694b55fcea047f364f3dd383ba12fb5c3ce4369bd527c286e23260b551a915fa5257f0351bce00a4332c987c047c246812f2a713b0d1db312c7d03edee4 SHA512 20baafcda95ba219ae4e186a8878aa75e2e27f766ab3afaa14ce316cd2c2bc85debfc6be4ed1b6c17c3c1532b3a6868d0b4ee7cc47145cb788838f023b624303
@@ -21,13 +19,11 @@ AUX cmake-3.5.2-FindQt4.patch 1585 BLAKE2B 8cfda84c419515be57f65be7b4b22d7937b65
AUX cmake-3.9.0_rc2-FindPythonInterp.patch 1458 BLAKE2B a70945921738f00952b40a73d9ea26ecc86614aa3f12c94226aac4710dd0b9723c365b6f5def965069a54919bab13a33490facc6c5e64fad69d2e05a97d2812f SHA512 8adcb75cc035f64521e85229eb8dfa1e627326f8e189f66b707b3a0448ed3ae6acf306643026f7cbc7b924edcef73cad7a107d83162b4ca46bd6bbdc7a58af12
AUX cmake.vim 217 BLAKE2B 5d2cf8b4101a7204fd27a9f21d82fea4d86fc4eeed54e062b543452dc574e73d1c80167c83eb482d9eec310950ac811ba35d3eeb97b51958f12f3adf575ddbe7 SHA512 2f7e9e949f8f3030a0dfcef56f4effea703ee60555c22f6a2d1dfeaf3334f33a3e88910c666f704e4ab60cde4ebb509c7d85d812a3c1627010e52fc757f15cdf
DIST cmake-3.13.5.tar.gz 8618821 BLAKE2B 765678bc92821207c53bfb4ac995a791b938f20236c3a6fda873b8edd11cd1401b4f4c05f170b8f600f38bde5f1227c715499eee072a8de3bb29d4f5cd230226 SHA512 99e3a8f5bc147dd90b9cab11f06892d87f289aa1354ad323711fe96ebc9c32b1e887e8f9d3575a37831c4d2153a070ff9115c5e27a185d54170bad9dbbaabc26
-DIST cmake-3.16.5.tar.gz 9111262 BLAKE2B 5f996113a4979563d7b9f298b4b1a32d6f91eebaa79af42e1cbf247884e443de47e30030fd0f16c7755c4086e2bff0c0741911753ea7c889b68c393c0b98c876 SHA512 204ce83501c8068ff660c30a68641a354764135e1600a9a95b39476d072876e400961377e19bbe03a7b18412b36dcf21a693946a2a81cff5985e637e9f193671
DIST cmake-3.17.4.tar.gz 9473549 BLAKE2B 2ce29415525b5292ae9e06d73570ed0af2173d8d15612f4d645f22d4f55cb99018663c374c4282731e09f8c6e4ffd59316d65f38aef9db5c34d874ca8992382b SHA512 6af879502e52388f3be02a4edfb006274840ad1afa8f28ffd6ec69b0310c7f718812b2272e5f77ffa422717f61407a6d482deb95941555c21c73fc5f62356a4e
DIST cmake-3.18.5.tar.gz 8975784 BLAKE2B 62ea68b602e7e352c22ba6122aa010fb78fb5c4e484aa51bc336e750280d5fc03ffa439bd8005d2c43176f5a5db4ebfd419beca65cc59c5b8cd5666e38394fb8 SHA512 c15e0937a9c0ce0b6164c3d02a147e679ea57e1119cff4189a15de71429a7facb3c04eb8db467471876b5da5dbd4a25acb228efa7101fe78efd205f0d2c96343
DIST cmake-3.19.1.tar.gz 9256956 BLAKE2B 00874fa3099fe55e7a8c16f5225d30c56e05aaaa69930e0f10d1829bb373f83c17cb11ba538918089bd94162dbb4cc736b2024bd0e1e7102f3d8c462bfe71c1b SHA512 1a1c9a8546c80f8602babffc7fd398cea5d9163512ef74333f87e26a97ca35358bd0e90423768cfc971ebfed185e19d775737e557e0e982403b77a2ccbcd063a
EBUILD cmake-3.13.5.ebuild 6250 BLAKE2B 51fd5c675042b869a8dd3f54ceaed2f3a2d9bc43aeb2894b1b8c9d995660bc81ed9b39f99bfbb376d0dd658942def7bc2c1ec3538efc36c1f43f65bc1ca5dd5b SHA512 638eece44d2cb688d92fd9fbedd189aee9b0b878b1fd054984e806d17083eda352695136bf0d800d9e2ecb7993917f2da4f1f1913e14c7686c4d7cff8c641f60
-EBUILD cmake-3.16.5.ebuild 5911 BLAKE2B f124d2d41b33a9a76749ced21fac3717eb50bba7065500986fdafc445bef3f17bf6e1faac7e863257ad5d8f571e4bdf17c9e750f5b83163401b491d85a2319f7 SHA512 4cfeb2154bd96b1f146b508ed038158a8cb58ead403011054702c4bdc1e2d99e677baa1b7ee6c33c4b317ca4992718cdc352b55724e73bf8edc758d2748e2603
-EBUILD cmake-3.17.4-r1.ebuild 6136 BLAKE2B 255ddfbb74512dbbbbf5ad397bbf6f78b9185ff2aa25e8b5ca9f12ffc57ba65a2906de692977c722c8a29f524169b72ff46ee7226ec8ba9d81f36c90357ae149 SHA512 c836b5851c424b9880967c248605cc1ba1e992946a1ba96f0622695902303bb40b1c0d6d015fb17dac7778b1fa388d277c9dfe964cfd0796b48c93fe8badd426
+EBUILD cmake-3.17.4-r1.ebuild 6135 BLAKE2B e2a5cc3192918239c62b6502374a585d8f25dfb795e492a43de513a8f89e601862c0e010cedb02441a716884abc55ff1b455739ceeb769e41c4e873233df2a11 SHA512 a0b1ed0cd63486d3f625cfce02c14bb7363199b950850bf03380d48b8126402659712dad7c0254033846b43faf4051413cc875bc882e86f658baa5eff59a2236
EBUILD cmake-3.18.5.ebuild 6130 BLAKE2B 57a06ffa279519744afa1854fabb28f90da78d31dc26ea6e78fd1f0e0401a4ce86bb5a45297679cb92df3928a79ee8740a5288ad1e8711d908601fadfa02b028 SHA512 8337e005af90f1a0f792b6f2a7d9098767024ad221aed57237e4ced1b20f98a5d16a7633ca86e1df83043a3e3b7d58c138104b58ebd170675146af37e619744a
EBUILD cmake-3.19.1-r1.ebuild 6757 BLAKE2B 2efce746909404d51f2f2f294bcf0c89d21938fc9721d0d0fa79977c28574078f6a57fec8e87dee8732cb6704f636b7f02770cff6b1873e4ac2babb8284d203f SHA512 a65f25b10379f0483cf7afe38bd76b7eca0c39b852c30ab80f73794ccf80a258c5377254fb0294d362a8447f4bb65628b271d225f00dbefdcffec33d420afa68
MISC metadata.xml 460 BLAKE2B f1a7e1709a6b9975ffbc377c8b4d1ea8a01f52ccc139693c8e427150b7559ecc867b3e55fb4bc95fe342a2335fe5e13c69f4bd74ffbbf302c83872c65963e73e SHA512 fc562cd5f336101d16ca30a5b3e9b99a6e51ec9d7aa503f20ce278f44d5810286fcd6b46b18073cd88ba88ee5ab4f8a0bfccaa567df09ebb722a68ab721aa340
diff --git a/dev-util/cmake/cmake-3.16.5.ebuild b/dev-util/cmake/cmake-3.16.5.ebuild
deleted file mode 100644
index f53ac8c1d184..000000000000
--- a/dev-util/cmake/cmake-3.16.5.ebuild
+++ /dev/null
@@ -1,220 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_MAKEFILE_GENERATOR="emake"
-CMAKE_REMOVE_MODULES_LIST=( none )
-inherit bash-completion-r1 cmake elisp-common flag-o-matic multiprocessing \
- toolchain-funcs virtualx xdg-utils
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="Cross platform Make"
-HOMEPAGE="https://cmake.org/"
-SRC_URI="https://cmake.org/files/v$(ver_cut 1-2)/${MY_P}.tar.gz"
-
-LICENSE="CMake"
-SLOT="0"
-[[ "${PV}" = *_rc* ]] || \
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc emacs ncurses qt5 test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- app-crypt/rhash
- >=app-arch/libarchive-3.3.3:=
- >=dev-libs/expat-2.0.1
- >=dev-libs/jsoncpp-1.9.2-r2:0=
- >=dev-libs/libuv-1.10.0:=
- >=net-misc/curl-7.21.5[ssl]
- sys-libs/zlib
- virtual/pkgconfig
- emacs? ( >=app-editors/emacs-23.1:* )
- ncurses? ( sys-libs/ncurses:0= )
- qt5? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5
- )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
- doc? (
- dev-python/requests
- dev-python/sphinx
- )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-SITEFILE="50${PN}-gentoo.el"
-
-PATCHES=(
- # prefix
- "${FILESDIR}"/${PN}-3.16.0_rc4-darwin-bundle.patch
- "${FILESDIR}"/${PN}-3.14.0_rc3-prefix-dirs.patch
- # Next patch requires new work from prefix people
- #"${FILESDIR}"/${PN}-3.1.0-darwin-isysroot.patch
-
- # handle gentoo packaging in find modules
- "${FILESDIR}"/${PN}-3.15.0_rc2-FindBLAS.patch
- "${FILESDIR}"/${PN}-3.14.0_rc1-FindLAPACK.patch
- "${FILESDIR}"/${PN}-3.5.2-FindQt4.patch
-
- # respect python eclasses
- "${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch
- "${FILESDIR}"/${PN}-3.9.0_rc2-FindPythonInterp.patch
-
- # upstream fixes (can usually be removed with a version bump)
-)
-
-cmake_src_bootstrap() {
- # disable running of cmake in boostrap command
- sed -i \
- -e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \
- bootstrap || die "sed failed"
-
- # execinfo.h on Solaris isn't quite what it is on Darwin
- if [[ ${CHOST} == *-solaris* ]] ; then
- sed -i -e 's/execinfo\.h/blablabla.h/' \
- Source/kwsys/CMakeLists.txt || die
- fi
-
- tc-export CC CXX LD
-
- # bootstrap script isn't exactly /bin/sh compatible
- ${CONFIG_SHELL:-sh} ./bootstrap \
- --prefix="${T}/cmakestrap/" \
- --parallel=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)") \
- || die "Bootstrap failed"
-}
-
-cmake_src_test() {
- # fix OutDir and SelectLibraryConfigurations tests
- # these are altered thanks to our eclass
- sed -i -e 's:^#_cmake_modify_IGNORE ::g' \
- "${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \
- || die
-
- pushd "${BUILD_DIR}" > /dev/null
-
- local ctestargs
- [[ -n ${TEST_VERBOSE} ]] && ctestargs="--extra-verbose --output-on-failure"
-
- # Excluded tests:
- # BootstrapTest: we actualy bootstrap it every time so why test it.
- # BundleUtilities: bundle creation broken
- # CMakeOnly.AllFindModules: pthread issues
- # CTest.updatecvs: which fails to commit as root
- # Fortran: requires fortran
- # RunCMake.CompilerLauncher: also requires fortran
- # RunCMake.CPack_RPM: breaks if app-arch/rpm is installed because
- # debugedit binary is not in the expected location
- # RunCMake.CPack_DEB: breaks if app-arch/dpkg is installed because
- # it can't find a deb package that owns libc
- # TestUpload, which requires network access
- "${BUILD_DIR}"/bin/ctest \
- -j "$(makeopts_jobs)" \
- --test-load "$(makeopts_loadavg)" \
- ${ctestargs} \
- -E "(BootstrapTest|BundleUtilities|CMakeOnly.AllFindModules|CompileOptions|CTest.UpdateCVS|Fortran|RunCMake.CompilerLauncher|RunCMake.PrecompileHeaders|RunCMake.CPack_(DEB|RPM)|TestUpload)" \
- || die "Tests failed"
-
- popd > /dev/null
-}
-
-src_prepare() {
- cmake_src_prepare
-
- # disable Xcode hooks, bug #652134
- if [[ ${CHOST} == *-darwin* ]] ; then
- sed -i -e 's/__APPLE__/__DISABLED_APPLE__/' \
- Source/cmGlobalXCodeGenerator.cxx || die
- fi
-
- # Add gcc libs to the default link paths
- sed -i \
- -e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \
- -e "$(usex prefix-guest "s|@GENTOO_HOST@||" "/@GENTOO_HOST@/d")" \
- -e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \
- Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed"
- if ! has_version \>=${CATEGORY}/${PN}-3.4.0_rc1 ; then
- CMAKE_BINARY="${S}/Bootstrap.cmk/cmake"
- cmake_src_bootstrap
- fi
-}
-
-src_configure() {
- # Fix linking on Solaris
- [[ ${CHOST} == *-solaris* ]] && append-ldflags -lsocket -lnsl
-
- local mycmakeargs=(
- -DCMAKE_USE_SYSTEM_LIBRARIES=ON
- -DCMAKE_DOC_DIR=/share/doc/${PF}
- -DCMAKE_MAN_DIR=/share/man
- -DCMAKE_DATA_DIR=/share/${PN}
- -DSPHINX_MAN=$(usex doc)
- -DSPHINX_HTML=$(usex doc)
- -DBUILD_CursesDialog="$(usex ncurses)"
- -DBUILD_TESTING=$(usex test)
- )
-
- if use qt5 ; then
- mycmakeargs+=(
- -DBUILD_QtDialog=ON
- $(cmake_use_find_package qt5 Qt5Widgets)
- )
- fi
-
- cmake_src_configure
-}
-
-src_compile() {
- cmake_src_compile
- use emacs && elisp-compile Auxiliary/cmake-mode.el
-}
-
-src_test() {
- virtx cmake_src_test
-}
-
-src_install() {
- cmake_src_install
-
- if use emacs; then
- elisp-install ${PN} Auxiliary/cmake-mode.el Auxiliary/cmake-mode.elc
- elisp-site-file-install "${FILESDIR}/${SITEFILE}"
- fi
-
- insinto /usr/share/vim/vimfiles/syntax
- doins Auxiliary/vim/syntax/cmake.vim
-
- insinto /usr/share/vim/vimfiles/indent
- doins Auxiliary/vim/indent/cmake.vim
-
- insinto /usr/share/vim/vimfiles/ftdetect
- doins "${FILESDIR}/${PN}.vim"
-
- dobashcomp Auxiliary/bash-completion/{${PN},ctest,cpack}
-
- rm -r "${ED}"/usr/share/cmake/{completions,editors} || die
-}
-
-pkg_postinst() {
- use emacs && elisp-site-regen
- if use qt5; then
- xdg_icon_cache_update
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
- fi
-}
-
-pkg_postrm() {
- use emacs && elisp-site-regen
- if use qt5; then
- xdg_icon_cache_update
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
- fi
-}
diff --git a/dev-util/cmake/cmake-3.17.4-r1.ebuild b/dev-util/cmake/cmake-3.17.4-r1.ebuild
index 27718c8a18dd..1f26097bdab5 100644
--- a/dev-util/cmake/cmake-3.17.4-r1.ebuild
+++ b/dev-util/cmake/cmake-3.17.4-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://cmake.org/files/v$(ver_cut 1-2)/${MY_P}.tar.gz"
LICENSE="CMake"
SLOT="0"
[[ "${PV}" = *_rc* ]] || \
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="doc emacs ncurses qt5 test"
RESTRICT="!test? ( test )"
diff --git a/dev-util/cmake/files/cmake-3.14.0_rc1-FindLAPACK.patch b/dev-util/cmake/files/cmake-3.14.0_rc1-FindLAPACK.patch
deleted file mode 100644
index ebd83f38d187..000000000000
--- a/dev-util/cmake/files/cmake-3.14.0_rc1-FindLAPACK.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 6d4d97b328f48862923bb55c1c0976b1d532dcc3 Mon Sep 17 00:00:00 2001
-From: Lars Wendler
-Date: Sun, 10 Feb 2019 23:01:53 +0100
-Subject: [PATCH] Prefer pkgconfig in FindLAPACK
-
----
- Modules/FindLAPACK.cmake | 21 +++++++++++++++++++++
- 1 file changed, 21 insertions(+)
-
-diff --git a/Modules/FindLAPACK.cmake b/Modules/FindLAPACK.cmake
-index d6646eaacf..ef5f324670 100644
---- a/Modules/FindLAPACK.cmake
-+++ b/Modules/FindLAPACK.cmake
-@@ -7,6 +7,10 @@ FindLAPACK
-
- Find LAPACK library
-
-+Version modified for Gentoo Linux.
-+If a valid PkgConfig configuration is found, this overrides and cancels
-+all further checks.
-+
- This module finds an installed fortran library that implements the
- LAPACK linear-algebra interface (see http://www.netlib.org/lapack/).
-
-@@ -181,6 +185,21 @@ endif()
-
- endmacro()
-
-+# first, try PkgConfig
-+find_package(PkgConfig REQUIRED)
-+pkg_check_modules(PC_LAPACK lapack)
-+if(PC_LAPACK_FOUND)
-+ foreach(PC_LIB ${PC_LAPACK_LIBRARIES})
-+ find_library(${PC_LIB}_LIBRARY NAMES ${PC_LIB} HINTS ${PC_LAPACK_LIBRARY_DIRS} )
-+ if (NOT ${PC_LIB}_LIBRARY)
-+ message(FATAL_ERROR "Something is wrong in your pkg-config file - lib ${PC_LIB} not found in ${PC_LAPACK_LIBRARY_DIRS}")
-+ endif (NOT ${PC_LIB}_LIBRARY)
-+ list(APPEND LAPACK_LIBRARIES ${${PC_LIB}_LIBRARY})
-+ endforeach(PC_LIB)
-+ find_package_handle_standard_args(LAPACK DEFAULT_MSG LAPACK_LIBRARIES)
-+ mark_as_advanced(LAPACK_LIBRARIES)
-+else(PC_LAPACK_FOUND)
-+message(STATUS "No PkgConfig configuration for LAPACK found; starting more extensive search.")
-
- set(LAPACK_LINKER_FLAGS)
- set(LAPACK_LIBRARIES)
-@@ -428,3 +447,5 @@ endif()
-
- cmake_pop_check_state()
- set(CMAKE_FIND_LIBRARY_SUFFIXES ${_lapack_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES})
-+
-+endif(PC_LAPACK_FOUND)
---
-2.20.1
-
diff --git a/dev-util/cmake/files/cmake-3.15.0_rc2-FindBLAS.patch b/dev-util/cmake/files/cmake-3.15.0_rc2-FindBLAS.patch
deleted file mode 100644
index 64ab5612b868..000000000000
--- a/dev-util/cmake/files/cmake-3.15.0_rc2-FindBLAS.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 4de8287ce3b098ea579a28155d442eb589db8617 Mon Sep 17 00:00:00 2001
-From: Lars Wendler
-Date: Sat, 22 Jun 2019 16:09:05 +0200
-Subject: [PATCH] Prefer pkgconfig in FindBLAS
-
----
- Modules/FindBLAS.cmake | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/Modules/FindBLAS.cmake b/Modules/FindBLAS.cmake
-index 77f9d0e40c..bbe155caa9 100644
---- a/Modules/FindBLAS.cmake
-+++ b/Modules/FindBLAS.cmake
-@@ -7,6 +7,10 @@ FindBLAS
-
- Find Basic Linear Algebra Subprograms (BLAS) library
-
-+Version modified for Gentoo Linux.
-+If a valid PkgConfig configuration is found, this overrides and cancels
-+all further checks.
-+
- This module finds an installed Fortran library that implements the
- BLAS linear-algebra interface (see http://www.netlib.org/blas/). The
- list of libraries searched for is taken from the ``autoconf`` macro file,
-@@ -92,6 +96,9 @@ installation.
-
- #]=======================================================================]
-
-+# first, try PkgConfig
-+set(BLA_PREFER_PKGCONFIG On)
-+
- include(${CMAKE_CURRENT_LIST_DIR}/CheckFunctionExists.cmake)
- include(${CMAKE_CURRENT_LIST_DIR}/CheckFortranFunctionExists.cmake)
- include(${CMAKE_CURRENT_LIST_DIR}/CMakePushCheckState.cmake)
---
-2.22.0
-
diff --git a/dev-util/cvise/Manifest b/dev-util/cvise/Manifest
index 81560936ab07..01659ce00d03 100644
--- a/dev-util/cvise/Manifest
+++ b/dev-util/cvise/Manifest
@@ -1,9 +1,12 @@
+AUX cvise-2.0.0-shebang.patch 1130 BLAKE2B 50f54e410f978a485aaa08cc7d9b8311211ec5b42fb372656821beba7bacd8aa7506b6e10732a0c426ce48a94440daa64bf931b23734d43b57e4a0d3d08a7281 SHA512 2c8fdc838ec802d7a1afb209dbe3e765780dd599f21cbdb7d9316e076ec06d0f0c1e78a00ea6a66fb614c8d0f7b44ca88ad624236223b47d87dddeab427621d3
DIST cvise-1.6.0.tar.gz 243050 BLAKE2B 64c305426dbeaf2e3f3a92a902209b35fcc76b5f5a6d2e48fcc8e24d1325badc0839e70afa1381c6d1412c22a7e9dd41ca03d6ca714fa5082958378cc8863000 SHA512 9d4ee043c34748b600b49ac4f00463b853faff2809f8b581e9b07433a8f3bef4436d0e5d5a9dbff1b2d7c3a8ab1d6d4823e78787eb3e911a683808703b2e24b6
DIST cvise-1.7.0.tar.gz 248515 BLAKE2B b1a2ca8abc7a09c240a7ae39400e3e60ca641dd0dff4edb34f43d755619ec47bb7a0d25fd6b4461bf80a3be14a63c6e56d0e3e758827ca7c2ef90370aba5d539 SHA512 2e0115355c0ca3cdf593ad4a8d0079ea0ea193234ff4fcae8bdc7c0244cc7b8672025682821279b826fda97f80dc71455390d709836acb671c19772f13156de5
DIST cvise-1.8.0.tar.gz 248744 BLAKE2B 5196a2bb68c0f9ca1a8219ee0dccae80aa7adac64df5bc4c7601a8ef81048875bfa3d8fb2e8c407cfa8f238739733ad4fbdf08bb14a72ec208d562bd7e69ba84 SHA512 eaef3506f0fcd54953271494ebdbd043c028cd98c4a976bc2d978112c28d27d5d307527db52c2a3f8f153b52430ba9c61ad072dcae5a6e0b9bfb8be844a50bab
DIST cvise-1.9.0.tar.gz 249042 BLAKE2B 357d429afc43691e616dba31621d1de89fb1f85fcbc177847b3367aac993ccd2c3bec20226e910a319d5d6194b32d0be9704e4fa7b8fce49f23788d10a378012 SHA512 518c48b7b9d9af9b856bfc46d4fb8064bca3730735bdabf2b3aa981a3f743fa6988594b7cbe39da71ac01fbadb4a45e5212d7c79b510fa36d86055978829495b
+DIST cvise-2.0.0.tar.gz 249307 BLAKE2B ba1a70da71706969a35b1223ad0c0fa1a1d4caf7f70eef184adc4dbc69586be6a33bdf11d7c1b606ea4b20d4cd2bf68170aabc1764364c235fe5f67182419080 SHA512 e49ca9919ced9db67b16af4b8a7cd3c18c7d96dea5724c9ee6d60736c8f34074d68ade151be702794c93b24943d167278e1c1a6e6f67a9a1422f695f3a177e46
EBUILD cvise-1.6.0.ebuild 1162 BLAKE2B 09b719db9f8c428bd94aeec9ccb8a03b150323a62a9d014ee82cced18733a89d2272ba049fe8446b3f008d77861281be70549d351d5cd173d7e1fddb12e3c5ed SHA512 af3c19d0f1d2ed513f0533e4861f109546a5da5c1b9dacb6b6f585dc568ca1d28a34530e04eb6acc3bb77a2b47ab84490793c78d834637771a59b8341bc7c2e2
EBUILD cvise-1.7.0-r1.ebuild 1202 BLAKE2B e0b789b8fc805718c1fe3cb71ae4180bfc0b5af7049a8631ed64d5983a980c84310d17c534aa1f638c76fe2a1a3053a1739d7351c5fbd4f192f204c67857638d SHA512 d94a2453dbe52425d800587465d1f5eae79fbc9d33fab09bbf6479ec217ce9ef78c1afa78b40f7294b986137cd689ef72d4b1371f44735f61ecdafbcb185fd78
EBUILD cvise-1.8.0.ebuild 1202 BLAKE2B e0b789b8fc805718c1fe3cb71ae4180bfc0b5af7049a8631ed64d5983a980c84310d17c534aa1f638c76fe2a1a3053a1739d7351c5fbd4f192f204c67857638d SHA512 d94a2453dbe52425d800587465d1f5eae79fbc9d33fab09bbf6479ec217ce9ef78c1afa78b40f7294b986137cd689ef72d4b1371f44735f61ecdafbcb185fd78
EBUILD cvise-1.9.0.ebuild 1282 BLAKE2B 3784ed4ae498cd0df37b5134b8f068de2b51cc5067f8eb40b46f46af8668af1e2b3fa2d9350f5e89d9733e3b58c9712274807ee4bfc6d07ac8b3386aa6953e45 SHA512 2a6f63a13ba59f02534f53b7ebd0f42bde0bf078995e582b74e1399893038e130e14b1fdce7e8be9f2e267bdc9068985e7c5f7d2e934d956e6c30dfbd7621f41
+EBUILD cvise-2.0.0.ebuild 1347 BLAKE2B 8651ce715dccf7bc322a7fae16e5f7b3b1d92eff666ec1faff37ad44541f39d2d394344a60cf1ca7f67f9c05b1efac0123ebdcd76343e9752a844089ceabe0f7 SHA512 aebd0940cd504e4f89ec9ae95e98574168274bddc7c9fac3406207d0e41cec114698af955dccbee6c90b864690d840a9865b707ff2a8d7b22acbeecb696da282
MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/dev-util/cvise/cvise-2.0.0.ebuild b/dev-util/cvise/cvise-2.0.0.ebuild
new file mode 100644
index 000000000000..9ef3d7393dea
--- /dev/null
+++ b/dev-util/cvise/cvise-2.0.0.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+: ${CMAKE_MAKEFILE_GENERATOR=ninja}
+PYTHON_COMPAT=( python3_{6..9} )
+inherit cmake llvm python-single-r1
+
+DESCRIPTION="Super-parallel Python port of the C-Reduce"
+HOMEPAGE="https://github.com/marxin/cvise/"
+SRC_URI="
+ https://github.com/marxin/cvise/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="UoI-NCSA"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+LLVM_MAX_SLOT=12
+DEPEND="
+ || (
+ sys-devel/clang:12
+ sys-devel/clang:11
+ sys-devel/clang:10
+ )
+ <=sys-devel/clang-$(( LLVM_MAX_SLOT + 1 )):="
+RDEPEND="${DEPEND}
+ ${PYTHON_DEPS}
+ $(python_gen_cond_dep '
+ dev-python/pebble[${PYTHON_USEDEP}]
+ dev-python/psutil[${PYTHON_USEDEP}]
+ ')
+ dev-util/unifdef
+ sys-devel/flex"
+BDEPEND="
+ ${PYTHON_DEPS}
+ sys-devel/flex
+ test? (
+ $(python_gen_cond_dep '
+ dev-python/pebble[${PYTHON_USEDEP}]
+ dev-python/pytest[${PYTHON_USEDEP}]
+ ')
+ )"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-shebang.patch
+)
+
+llvm_check_deps() {
+ has_version "sys-devel/clang:${LLVM_SLOT}"
+}
+
+pkg_setup() {
+ python-single-r1_pkg_setup
+ llvm_pkg_setup
+}
+
+src_prepare() {
+ sed -i -e 's:-n auto::' -e 's:--flake8::' setup.cfg || die
+ cmake_src_prepare
+}
+
+src_test() {
+ cd "${BUILD_DIR}" || die
+ pytest -vv || die
+}
diff --git a/dev-util/cvise/files/cvise-2.0.0-shebang.patch b/dev-util/cvise/files/cvise-2.0.0-shebang.patch
new file mode 100644
index 000000000000..26bfe9678ebb
--- /dev/null
+++ b/dev-util/cvise/files/cvise-2.0.0-shebang.patch
@@ -0,0 +1,34 @@
+From 492d2d759d35bec39aca137906046b76151b56d1 Mon Sep 17 00:00:00 2001
+From: Martin Liska
+Date: Sun, 15 Nov 2020 12:12:04 +0100
+Subject: [PATCH] Add Leap 15 and fix shebang.
+
+---
+ build_and_test.sh | 2 +-
+ cvise.py | 2 +-
+ 4 files changed, 22 insertions(+), 2 deletions(-)
+ create mode 100644 Docker/Dockerfile-opensuselp15-llvm9
+
+diff --git a/build_and_test.sh b/build_and_test.sh
+index 95c1539..b726dd4 100755
+--- a/build_and_test.sh
++++ b/build_and_test.sh
+@@ -1,4 +1,4 @@
+-#!/usr/bin/bash
++#!/bin/bash
+
+ BUILD_TYPE=$1
+
+diff --git a/cvise.py b/cvise.py
+index 15efaf6..7f318f2 100755
+--- a/cvise.py
++++ b/cvise.py
+@@ -260,7 +260,7 @@ def get_available_pass_groups():
+ script = None
+ if args.commands:
+ with tempfile.NamedTemporaryFile(mode='w', delete=False, suffix='.sh') as script:
+- script.write('#!/usr/bin/bash\n\n')
++ script.write('#!/bin/bash\n\n')
+ script.write(args.commands + '\n')
+ os.chmod(script.name, 0o744)
+ logging.info('Using temporary interestingness test: %s' % script.name)
diff --git a/dev-util/debugedit/Manifest b/dev-util/debugedit/Manifest
index 239ac099ab04..02fe10d0ea0b 100644
--- a/dev-util/debugedit/Manifest
+++ b/dev-util/debugedit/Manifest
@@ -1,5 +1,7 @@
DIST rpm-4.16.0.tar.bz2 4341683 BLAKE2B 5161e5dcc6d9a1f1d4b8e44740fb368050b808fd9e8b8276fb17b530a4642e1b9ad104b5a30c0071215aef7f823eeab10988dd41f73af1c52d575529c374b5eb SHA512 177119c3ac3d48980db55bb4ba0fdbb2a911968e5efc690bfa8cc343f850fc90531cc0dee6dd8e45d2b14f0d951ced35bd8893d24011b7f270745d281ddf4e3d
+DIST rpm-4.16.1.2.tar.bz2 4346745 BLAKE2B 17485b1e73b30586acb8e9be53bfb0bd430fa05e826755729c68367c798e8cad039f091731b6effbe9fa9b7d6c4018abd6feec94f032230cbbd6068e9080573a SHA512 066b67838312f9ad076285fe8f43527aded694f5562ead4e90df48675f2e99c1f2d68693fd20b2037e2614b978ed94c417753e2dbd055a9869b45264cd932afc
DIST rpm-4.16.1.tar.bz2 4348973 BLAKE2B 5f415099ed5b4f3425c1cbd02476c3066ef51e8efbe09829c0c7d9732cfdeed76ab0c5eed113a1b007d35bf5d5fb1c60543b7ef23319ba0f63550d598e98dcdd SHA512 cbce8381e7a0bdaf2c7529d0ac91fda15e663db7a76b02652d53327ebcd7d5b6b6154d5e88feeda87f71727a036e7a2afcd57c7dcddef610e32957b9e430d367
EBUILD debugedit-4.16.0.ebuild 1765 BLAKE2B 463b1295cb2cf4d8fd4914546610844495065a62d164b099b3352761b2329cb016d9fa15a1cfab3d8f348a1d9c9392eb4debac627b58af9402cc01d99244eba1 SHA512 29e6a33ff92e86ba3c7eb52eb593c97af3ca52fdf9df999984cdbe7ea2c2a3039619738b0877af42ff1b77515fac2249d603827abbe7c9bba86368f959242a29
+EBUILD debugedit-4.16.1.2.ebuild 1770 BLAKE2B 9657d25e12679c563a0dd2f6220a58844c043f28ead997e6add996cff70e78964f6f3b88afbb65e7c1a683b4d7250919ebbc822001744adcc46b4e1324300823 SHA512 86a515866fa7f33aeb896b9ee67451bdb8d2850a34fcfca719307bacc002e99039fb24e3d6c6f088da1a6e59ca6c71ae764baca4c875e076315852be9100f1b8
EBUILD debugedit-4.16.1.ebuild 1770 BLAKE2B 9657d25e12679c563a0dd2f6220a58844c043f28ead997e6add996cff70e78964f6f3b88afbb65e7c1a683b4d7250919ebbc822001744adcc46b4e1324300823 SHA512 86a515866fa7f33aeb896b9ee67451bdb8d2850a34fcfca719307bacc002e99039fb24e3d6c6f088da1a6e59ca6c71ae764baca4c875e076315852be9100f1b8
MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/dev-util/debugedit/debugedit-4.16.1.2.ebuild b/dev-util/debugedit/debugedit-4.16.1.2.ebuild
new file mode 100644
index 000000000000..d2c338794406
--- /dev/null
+++ b/dev-util/debugedit/debugedit-4.16.1.2.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic
+
+MY_P=rpm-${PV}
+DESCRIPTION="Stand-alone debugedit from RPM"
+HOMEPAGE="https://rpm.org
+ https://github.com/rpm-software-management/rpm"
+SRC_URI="http://ftp.rpm.org/releases/rpm-$(ver_cut 1-2).x/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2+ LGPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="
+ sys-libs/zlib:=
+ >=dev-libs/popt-1.7
+ >=dev-libs/elfutils-0.176-r1
+ dev-libs/nss
+"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+ eapply_user
+
+ # cheat it into believing we're bundling db
+ mkdir -p db/dist || die
+ touch db/dist/configure || die
+ chmod +x db/dist/configure || die
+ echo 'install:' > db3/Makefile || die
+
+ # TODO: why do we need to do this?
+ mkdir rpm || die
+ find -name '*.h' -exec cp {} rpm/ ';' || die
+}
+
+src_configure() {
+ append-cppflags -I"${EPREFIX}/usr/include/nss" -I"${EPREFIX}/usr/include/nspr"
+ local myconf=(
+ # force linking to static librpmio
+ --disable-shared
+
+ # disable linking compression libraries
+ ac_cv_header_bzlib_h=no
+ ac_cv_header_lzma_h=no
+ --disable-zstd
+
+ # fake some libraries we don't use
+ ac_cv_header_magic_h=yes
+ ac_cv_lib_magic_magic_open=yes
+
+ # use nss as crypto provider
+ --with-crypto=nss
+
+ # disable other stuff irrelevant to debugedit
+ --disable-bdb
+ --disable-nls
+ --disable-plugins
+ --disable-python
+ --without-acl
+ --without-archive
+ --without-cap
+ --without-external-db
+ --without-hackingdocs
+ --without-lua
+ --without-selinux
+ )
+ econf "${myconf[@]}"
+}
+
+src_compile() {
+ emake -C misc
+ emake -C rpmio
+ emake debugedit
+}
+
+src_test() {
+ :
+}
+
+src_install() {
+ dobin debugedit
+}
diff --git a/dev-util/desktop-file-utils/Manifest b/dev-util/desktop-file-utils/Manifest
index ae5b26dba022..683abfb5a2c6 100644
--- a/dev-util/desktop-file-utils/Manifest
+++ b/dev-util/desktop-file-utils/Manifest
@@ -2,5 +2,5 @@ AUX 50desktop-file-utils-gentoo.el 250 BLAKE2B 6778fd6faecc6afe376598cdab5d89036
DIST desktop-file-utils-0.24.tar.xz 137424 BLAKE2B 3cce27caa14782ef10886fdc0602c0378c1bad0d49a4b99077436a9951f13ccdb539fdc2b9d27b54430fce94fb0ee0268746b216cc5d6c1b9ba517e1af81b4ce SHA512 b19d700d4403c8757c62e49bb7650e0138a85e799f79de07b0d0099a52398a3ead90c8125ccc883df6e2a3f8f5f97696009ebb7452dc7acc25afeef20e06fde0
DIST desktop-file-utils-0.26.tar.xz 83132 BLAKE2B fdbe5427a0278ebe4a9b1bc15a148ecdc3f54b54058b355ae4f9a962fb1c4ec309d24a075973caf8f187a1c74b013e9bed0a7c3668bf888274e77fac9e077ec8 SHA512 5b4e435f0b635d8f898ac7f5759f74a08ffbe2a56d41fee0e84ff57e73b98d08b57b4416f20b99f696dad8bcb1c20792b39acf836b0814220c0b386ea5f6b831
EBUILD desktop-file-utils-0.24.ebuild 1287 BLAKE2B 7ac58a5fc22f86c48162d3ef0c5f5471031a36294d8e9a68c1bc6643db4bcabb51e0ad581115e18df0e97c1b119d9c0b65737c617f6cdd3dbb984c7c90e81fd5 SHA512 09ee0891f66b52b89f6f45e909c579408cb36f0e8e535636444ab82424cb1c93f89d9cebf48c141f8bd9322c362e3948a5bc6cc3d0e844d1d8d8cb758f129870
-EBUILD desktop-file-utils-0.26-r1.ebuild 1168 BLAKE2B fe43657150b74c25da3656c9ea58ff48c8a3be0b4c770727e7055ac11ad7aed0ef80f1b415a5a8898fa921a497f89e3186e92c7101e2a05c50a6084f1c426231 SHA512 dcdb9758d6b071f5666607f31d4489fb9852e45d203be14573d21e1fea44fe6306ffc616bad6cb302a8ec2dea9f0de89b24972af9533bce26186ee763230565b
+EBUILD desktop-file-utils-0.26-r1.ebuild 1167 BLAKE2B 183e1c5b0b242143a9e59ba942be5497eaa4812ea8f99b83145ab5bb1142f10a7a5ad56cae010e94aed2f3d3d58ca1e16d2f37c670d1ad4cfa71e5152df54aaa SHA512 60da0a27b78328456d10d5cb66653bd4307b88624d15f2a26a10f1ca90a8b93bb1236b7b0f6b3f08b77568bfbe7fd37b11dbdfc9505abafc368c1b614482c594
MISC metadata.xml 224 BLAKE2B 50a08713f8b792454787823dd56f1dcc1a1970ded78fa6ddffc6fb7301e0de75018e1e7a8c7ed890b4910f2716d2588ad21c7ae88ad8013b51cab7ba401c46c9 SHA512 12da46d8052565f62c482e6bcc714d8c00cac256f85dc1602579c8d61e0b61af95da149d1a446e56b2eba918ab9d78b556f77c6fe034a2e578f57a9dbe62fc44
diff --git a/dev-util/desktop-file-utils/desktop-file-utils-0.26-r1.ebuild b/dev-util/desktop-file-utils/desktop-file-utils-0.26-r1.ebuild
index 390c5208bb58..7caea829dc2f 100644
--- a/dev-util/desktop-file-utils/desktop-file-utils-0.26-r1.ebuild
+++ b/dev-util/desktop-file-utils/desktop-file-utils-0.26-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://www.freedesktop.org/software/${PN}/releases/${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 ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="emacs"
RDEPEND=">=dev-libs/glib-2.12:2"
diff --git a/dev-util/eric/Manifest b/dev-util/eric/Manifest
deleted file mode 100644
index 10a68e37dafd..000000000000
--- a/dev-util/eric/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST eric6-18.03.tar.gz 16517664 BLAKE2B f7f5292df8bc694fc4715ec1a250d948123a2eb99a590e6824d985318446babff86aeb745f5b5dbd0707e771638eaa943673e5b546676bea97e266888b844989 SHA512 e488010791b44cc7da782620baec9b97259aaefeb90d491023ec1d4582fb68acbc06d9eedba7beef9ddc706302e06e36b9ebb4e46d6f035b6c74e9f4eb9ac400
-DIST eric6-19.11.tar.gz 16241807 BLAKE2B bd8284164c6c191e91fc08bc42f594107ebab50f71a980ef331d42fbd8d9c488d5674b2f53665718a6e723a228e838d082095fc3c3b2d40c3fb350c5be9a98ee SHA512 a8305c5185687d62231926bd4c484f3786ac1c20d125a1f8fb1b6bc0d42c57ba92bf00aaffd8699f8d7594c6432896bef8db13da85513ba4f217a60223f2f533
-EBUILD eric-18.03.ebuild 1997 BLAKE2B 002de73e34f3ec7f56e23070abcd77df2cfc2d6d0425043a4ce3797527d09fe298fc36cb8bd718760d6d876b829980cb15e144aa7d34ed4b5d82b39fab8235c6 SHA512 f801ba23020200d0e5eda3b64d1ae80a070e993e421a8f12b996cfe8c065e5bc3e9cb8084ef9098c06cc93823193eacd052cee6f373c88b93872102196e8ca7e
-EBUILD eric-19.11-r1.ebuild 1488 BLAKE2B a37b87b2fe72c30cbf2a2c7a0ea196a143fa5cd5235ef2ef1e32016951676a08bfdbd9bf3927915d59d22de7c7d7641a9f39b6a79a097a69080e58a67c21e8a9 SHA512 5dd51dbb756ee8545a16846415e22636b7850b9d319d75faac2cdf33ce460eee2d28b9766bf689e1fb70a3e4fc028e35a7be4950fc9d7d5e800bba3e63778ccd
-MISC metadata.xml 325 BLAKE2B 5c4bd806e4833d3f4c294ca46b24420c71f8ef234ea732460833f39f583e0e5156d773d6fbf7fb4d45edf409d21622a9b90e0989e9d93632d7dd94b7aa7e6c3f SHA512 e3da71c04a1a2af6b72ff068eba586c14b159034f759448c669032b30a82cc618e58467cc8cec8090d22d0e864338fc62b735f73dc31fd2a33d63cb677178f9e
diff --git a/dev-util/eric/eric-18.03.ebuild b/dev-util/eric/eric-18.03.ebuild
deleted file mode 100644
index f766811e82e4..000000000000
--- a/dev-util/eric/eric-18.03.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_P=${PN}6-${PV}
-PYTHON_COMPAT=( python3_6 )
-PYTHON_REQ_USE="sqlite,xml"
-inherit python-single-r1 xdg-utils
-
-DESCRIPTION="A full featured Python IDE using PyQt and QScintilla"
-HOMEPAGE="https://eric-ide.python-projects.org/"
-SRC_URI="mirror://sourceforge/eric-ide/${PN}6/stable/${PV}/${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="6"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="
- ${PYTHON_DEPS}
- $(python_gen_cond_dep '
- >=dev-python/sip-4.14.3[${PYTHON_MULTI_USEDEP}]
- >=dev-python/PyQt5-5.7.1[gui,network,printsupport,sql,svg,widgets,${PYTHON_MULTI_USEDEP}]
- >=dev-python/qscintilla-python-2.10[qt5(+),${PYTHON_MULTI_USEDEP}]
- ')
-"
-RDEPEND="${DEPEND}
- $(python_gen_cond_dep '
- || (
- dev-python/PyQt5[help,webengine,${PYTHON_MULTI_USEDEP}]
- dev-python/PyQt5[help,webkit,${PYTHON_MULTI_USEDEP}]
- )
- >=dev-python/chardet-3.0.4[${PYTHON_MULTI_USEDEP}]
- >=dev-python/coverage-4.1.0[${PYTHON_MULTI_USEDEP}]
- >=dev-python/pygments-2.2.0[${PYTHON_MULTI_USEDEP}]
- ')
- !dev-util/eric:4
- !dev-util/eric:5
-"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-S=${WORKDIR}/${MY_P}
-
-DOCS=( changelog README.rst THANKS )
-
-src_prepare() {
- default
-
- # Delete internal copies of dev-python/chardet and dev-python/pygments
- rm -fr eric/ThirdParty/{CharDet,Pygments} || die
-
- # Delete internal copy of dev-python/coverage
- rm -fr eric/DebugClients/Python{,3}/coverage || die
- sed -i -e 's/from DebugClients\.Python3\?\.coverage/from coverage/' \
- $(grep -lr 'from DebugClients\.Python3\?\.coverage' .) || die
-}
-
-src_install() {
- "${PYTHON}" install.py \
- -b "${EPREFIX}/usr/bin" \
- -d "$(python_get_sitedir)" \
- -i "${D}" \
- -c \
- -z \
- || die
-
- python_optimize
- einstalldocs
-}
-
-pkg_postinst() {
- xdg_desktop_database_update
-
- if ! has_version dev-python/enchant; then
- elog "You might want to install dev-python/pyenchant for spell checking."
- fi
-}
-
-pkg_postrm() {
- xdg_desktop_database_update
-}
diff --git a/dev-util/eric/eric-19.11-r1.ebuild b/dev-util/eric/eric-19.11-r1.ebuild
deleted file mode 100644
index bb8cee447042..000000000000
--- a/dev-util/eric/eric-19.11-r1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-PYTHON_REQ_USE="sqlite,xml"
-inherit python-single-r1 xdg
-
-MY_P=${PN}6-${PV}
-
-DESCRIPTION="A full featured Python IDE using PyQt and QScintilla"
-HOMEPAGE="https://eric-ide.python-projects.org/"
-SRC_URI="mirror://sourceforge/eric-ide/${PN}6/stable/${PV}/${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="6"
-KEYWORDS="~amd64 ~x86"
-IUSE="spell"
-
-DEPEND="
- ${PYTHON_DEPS}
- $(python_gen_cond_dep '
- >=dev-python/PyQt5-5.12[gui,help,network,printsupport,sql,svg,widgets,${PYTHON_MULTI_USEDEP}]
- dev-python/PyQtWebEngine[${PYTHON_MULTI_USEDEP}]
- dev-python/qscintilla-python[${PYTHON_MULTI_USEDEP}]
- dev-python/sip[${PYTHON_MULTI_USEDEP}]
- ')
-"
-RDEPEND="${DEPEND}
- $(python_gen_cond_dep '
- >=dev-python/chardet-3.0.4[${PYTHON_MULTI_USEDEP}]
- >=dev-python/pygments-2.3.1[${PYTHON_MULTI_USEDEP}]
- spell? ( dev-python/pyenchant[${PYTHON_MULTI_USEDEP}] )
- ')
-"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-S=${WORKDIR}/${MY_P}
-
-DOCS=( eric/docs/{changelog,README.rst,README-eric6-doc.rst,README-passive-debugging.rst,THANKS} )
-
-src_prepare() {
- default
-
- # Delete internal copies of dev-python/chardet and dev-python/pygments
- rm -fr eric/eric6/ThirdParty/{CharDet,Pygments} || die
-}
-
-src_install() {
- yes n | "${PYTHON}" install.py \
- -b "${EPREFIX}/usr/bin" \
- -d "$(python_get_sitedir)" \
- -i "${D}" \
- -c \
- -z \
- || die
-
- python_optimize
- einstalldocs
-}
diff --git a/dev-util/eric/metadata.xml b/dev-util/eric/metadata.xml
deleted file mode 100644
index 11e69dd891df..000000000000
--- a/dev-util/eric/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
- qt@gentoo.org
- Gentoo Qt Project
-
-
- eric-ide
-
-
diff --git a/dev-util/glslang/Manifest b/dev-util/glslang/Manifest
index 6f64f6bcc3ab..8e5fea0b7abb 100644
--- a/dev-util/glslang/Manifest
+++ b/dev-util/glslang/Manifest
@@ -1,14 +1,6 @@
-AUX glslang-7.12.3353_pre20191027-fix-relative-includes.patch 663 BLAKE2B 4d0e8efd9152610b16813d45251a83b8b685c07d3491c6bc1a1c2656ecabde2eed8840a53712bfd9aa9e6f047f332f56ead1e3c0d8185a81c4de0eb286f5d048 SHA512 db8bf5424aca0eb215db3059665eb7e6ffbbab029979de9f5b574e577274f6d0ca8a27acde10bd53769561eaae2996ec6da1a4916b2c39e82f343c33b120915f
-AUX glslang-Respect-CMAKE_INSTALL_LIBDIR-in-installed-CMake-files.patch 4974 BLAKE2B 9bb7807618a2dd6c322244557bf93809c21631be064bde4fc659724c45cb27d3e615fecde8692658edc1e3d229b4daadfa2b51732ebddb5d49f85abdb3af5399 SHA512 a07654d40172d6669d3ee3c3685463dbd58cc163ce726a20db18237ab710044b011e511defc8828f7ccd8b4fc128bb38f75669686085f7572ce8cc98887266d3
DIST glslang-10.11.0.0_pre20200924.tar.gz 3246618 BLAKE2B e4353a9cf06273f6a5fc79004c5f97df3da3444a793ddefb6adee96cbcf541d6088bf2f2edc65dea53363cbcb254f7da80fefb8a93b8650adf2ed283b243fa24 SHA512 01551b2347f25e6135ef82f5ae838dbf275cb3f20300659b830c85fded334a8dea3928c017ff7d48d58d89ddf93f5429191f0a326f310db9ee989f622e23477f
-DIST glslang-7.12.3353_pre20191027.tar.gz 3119760 BLAKE2B 4a7eda7bf89b1589cb8a712660589e2746ff13ce3cac589a5651486fbdaa149b0fd8fceb791af0e43c9342aa9ca31459f66d0236c31d22959e519e8eb4457018 SHA512 6f247dbf9a50cdfe7b6ffbf79f73c46c57f8f61ef10037e0775ddd6faf4c5fd4b9b6b6761ecf26cc71c3711a650ee8619e2f0a33dfcf8ca8dc2974e497a685a7
-DIST glslang-8.13.3559.tar.gz 3122936 BLAKE2B 856e6068a06407195f97478b3e6bd91aa619213d8468a8c9ff7ee8e7a36a904e4896e34e021e8e4e047fab6ea406d89206849058a659de8075c52a06118b0e7b SHA512 d2f09888dd1b6edb4f324502627aeca0c78411f61ab50e672fa2a6d9ae46611849e1d13b9c6069b77f31092d843abcf3d74ed7cfc3c9144ced80e65876f4b781
-DIST glslang-8.13.3560_pre20200404.tar.gz 3185684 BLAKE2B fac831212b46b22f10657ee44afc788d174779dd36e9d5f045f8e84ab3cca448aee89aab13771a29598b242653d6a29e4eb8fd8965e1c03ceec599e7ab1fafa9 SHA512 ec5b89d918cf55bb0a166f59eeea3662d54f29a986f979a9b04ab35bc8e02e5b01d13c24f336666669115f90d3d97eb91abe7ba4b9108590ec9b8a78e976223f
-DIST glslang-8.13.3743.tar.gz 3183453 BLAKE2B 2e8fc3693477be8bd6f8000a0eb032b314f5903991dc5a73dbd913a92aa0d6878e45f29f0a01ca5e8453b566d8a503a3cf4256def7f90a4cb561391b047c2a1d SHA512 19169c4ffa511113978af8e8efc57b290d4aa962a4c2429dbea1af72204787c6ce20ffbbb452dc04bef5416e00510819d84463a2e76295b9a59b409e12af6792
-EBUILD glslang-10.11.0.0_pre20200924.ebuild 892 BLAKE2B 02ea8c0d451b7d06f18c653f20ffbf2bea94d96252b48d74579ca1429431fb43cfc05291c0e1b7f2a4412df81991f5e8f7bf8499cf65a6a8445bf2675f0189b6 SHA512 da75d32d2c8ee1df404afbb93625a35028dab80dedb096e516f0bedc2a16e53e662d8273a60ffeded743e62222fc5c43021b210eb20623c5f5683c814e5bf1dd
-EBUILD glslang-7.12.3353_pre20191027-r2.ebuild 848 BLAKE2B c21ffc390e783a2abae679b7c10b20b0f6b2c7c0240638a54b2717c0e65289006b367ddc96115f6234a3c999515314736011649283c14ec73aec8c37abd26710 SHA512 d6b739906ffc084106aa5dcd0182980c91a0874b1425f1eaa2b05e206597e2f7c807f87c02c8fca0db5c1f9860a378579cbfb4646f429bca72de672c151e87ee
-EBUILD glslang-8.13.3559.ebuild 759 BLAKE2B 64a7cb4e904a835110d41ce432dbb04a2e60efd884daa5daea7f36eaa6356126793239889b0b69ce87ebdcaea2987550b84405c58553dd87276a579a61b788f2 SHA512 0a362fa37d32551a976a8ced67b9dee1556b3c8f5c90cdb7446643c4ea4f07e388bfc9594e9de9ad3daa5f8c638db3373ef6592566ed72349dd892c5a24777b6
-EBUILD glslang-8.13.3560_pre20200404.ebuild 870 BLAKE2B a79d014151d18393e8fc95cd4bf3ca7eb859ba7250665ea97d3f77c60973dd496c0ca82a1c0f90d5870bcb6b2e87d5fb29ee9bc968b70b9df6900cdc90827f6b SHA512 47ad53da564d55ab780b5a69abcc232798f2c48b9babf9391416abf34a8f7871ffbb27d6893cf98caf56cf079b3885f06e8b6e60a3407a5e051938beef7b8cd7
-EBUILD glslang-8.13.3743-r1.ebuild 849 BLAKE2B 1d1c72d989d355232f47950c46c56ce92b3b78c12f1d6d9bbbc382f868b5534723037a8e03f1b65add39ee352fe37559a48092577b41b60e230cf9574b017c58 SHA512 e4bc4ecace4c588b787c40b959660e7fb93be18210aedb712e7cdc4ab0153067124d138286747f99f7eaa68083e3be977d5605349dca54ff1710963578cceb85
-EBUILD glslang-9999.ebuild 758 BLAKE2B f4f9a1e734aff4245c035d872d6c3a04abebf472730398d666bddab58cda002843b4dd9f06eac7d652c4db176cc9333e025ad27ddd1752a509786e12e341f9d1 SHA512 dc7eed08504ce61a142ad4ab3e6a9cdef360163dc5deb29dc61823ddf25f4915abfc0e127900c0acaeea3173e46c2fc152eaff41bdb6313861b04c052c57925f
+DIST glslang-10.11.0.0_pre20201216.tar.gz 3290064 BLAKE2B 46ce951ab6c69eb25dc2490e3eb817c5cc0e2bf2416f29842b45bb1efb83ea439d72c823c981e2f37803e203077ea01d1c84c28391fb78288c107510a47d2241 SHA512 4b9e300152dc2ec3b14657b3a745d5b26b5da49e5ff3da0d75680f84126237ec6af0f7cee5aaa74b2d4a123a386522cd7342b5f25e4c01f114da3d5d92057128
+EBUILD glslang-10.11.0.0_pre20200924.ebuild 891 BLAKE2B 8e165d654410d5a8c2be32c5bf59d3dd7c083e58731651760abf380e7e92bcb8f13b4cdd41bc0603193c673e9ee87911c38ca11b317fdbb493a895aff9205d5e SHA512 1934b386247d8389e6b346e937aef0e94c3fdc87de9bacda0fda7abe188248ef31a3255e74a7c20e4a76c81e72775596c84e8f100ccd3b5e31744e65abc0dfcc
+EBUILD glslang-10.11.0.0_pre20201216.ebuild 898 BLAKE2B 4ce47780386eac2f393b79e9ddcbdd94ed455669bedb85a63b855deed9ca719ffb01063ae11699eda61b445a383b1579f2cbf065558b997c0ea37c5aa90658b6 SHA512 a86ce43f8afa66bf9d1df56cc8ba1e679338d2f85c9e87e60ffc2dcf50731cb993c291c39b5b5df18dcec6336dc7db54a7c042d1b23c13ab22fadab280d9fc09
+EBUILD glslang-9999.ebuild 760 BLAKE2B c5653ce28262fc6dd00c8fa38fb7188c7892e40ab339eaa19d90c7d2c8b90050ea4d8002eaf81f4049ab7aae853d6adae178fc441c3637f2b6c7f16922023ce7 SHA512 127fd825c4cd0e8b690e3163b0e12c35d39744cf52b01ad717b38028c932932aa2d9b6bc6e260b5478f964e6e4ce7eb88e9c83685772d4666611e7164b6c451a
MISC metadata.xml 330 BLAKE2B fd98c615a1b5c3364e122b66d18e9667ff1bae51218e2474862a0376f352421cfbe7aa3b4f9751ff8e8f24510f4a6e3f0e1977ca759b566b54f48fa45243980c SHA512 9658890a6aa3ae0c91e71416c3996d9c8064bb970521b5c444d617fc4a51ef2edb62aa7d44b25ef96768417de0c5478999e74405c6d9ff847816311990c945ee
diff --git a/dev-util/glslang/files/glslang-7.12.3353_pre20191027-fix-relative-includes.patch b/dev-util/glslang/files/glslang-7.12.3353_pre20191027-fix-relative-includes.patch
deleted file mode 100644
index 4c44cfbbbedd..000000000000
--- a/dev-util/glslang/files/glslang-7.12.3353_pre20191027-fix-relative-includes.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/SPIRV/GlslangToSpv.h b/SPIRV/GlslangToSpv.h
-index 86e1c23b..3907be43 100755
---- a/SPIRV/GlslangToSpv.h
-+++ b/SPIRV/GlslangToSpv.h
-@@ -40,7 +40,7 @@
- #endif
-
- #include "SpvTools.h"
--#include "../glslang/Include/intermediate.h"
-+#include "glslang/Include/intermediate.h"
-
- #include
- #include
-diff --git a/SPIRV/SpvTools.h b/SPIRV/SpvTools.h
-index 7422d012..59c914da 100644
---- a/SPIRV/SpvTools.h
-+++ b/SPIRV/SpvTools.h
-@@ -46,7 +46,7 @@
- #include
- #endif
-
--#include "../glslang/MachineIndependent/localintermediate.h"
-+#include "glslang/MachineIndependent/localintermediate.h"
- #include "Logger.h"
-
- namespace glslang {
diff --git a/dev-util/glslang/files/glslang-Respect-CMAKE_INSTALL_LIBDIR-in-installed-CMake-files.patch b/dev-util/glslang/files/glslang-Respect-CMAKE_INSTALL_LIBDIR-in-installed-CMake-files.patch
deleted file mode 100644
index 8838a97809d4..000000000000
--- a/dev-util/glslang/files/glslang-Respect-CMAKE_INSTALL_LIBDIR-in-installed-CMake-files.patch
+++ /dev/null
@@ -1,105 +0,0 @@
-diff --git a/OGLCompilersDLL/CMakeLists.txt b/OGLCompilersDLL/CMakeLists.txt
-index af4ab587..e0096743 100644
---- a/OGLCompilersDLL/CMakeLists.txt
-+++ b/OGLCompilersDLL/CMakeLists.txt
-@@ -11,5 +11,5 @@ endif(WIN32)
- if(ENABLE_GLSLANG_INSTALL)
- install(TARGETS OGLCompiler EXPORT OGLCompilerTargets
- ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
-- install(EXPORT OGLCompilerTargets DESTINATION lib/cmake)
-+ install(EXPORT OGLCompilerTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake)
- endif(ENABLE_GLSLANG_INSTALL)
-diff --git a/SPIRV/CMakeLists.txt b/SPIRV/CMakeLists.txt
-index e25ec0a1..364f04cc 100644
---- a/SPIRV/CMakeLists.txt
-+++ b/SPIRV/CMakeLists.txt
-@@ -91,8 +91,8 @@ if(ENABLE_GLSLANG_INSTALL)
- ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
- endif()
-
-- install(EXPORT SPVRemapperTargets DESTINATION lib/cmake)
-- install(EXPORT SPIRVTargets DESTINATION lib/cmake)
-+ install(EXPORT SPVRemapperTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake)
-+ install(EXPORT SPIRVTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake)
-
- install(FILES ${HEADERS} ${SPVREMAP_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/glslang/SPIRV/)
- endif(ENABLE_GLSLANG_INSTALL)
-diff --git a/StandAlone/CMakeLists.txt b/StandAlone/CMakeLists.txt
-index 0878965c..d9d71d1a 100644
---- a/StandAlone/CMakeLists.txt
-+++ b/StandAlone/CMakeLists.txt
-@@ -49,12 +49,12 @@ if(ENABLE_GLSLANG_INSTALL)
- install(TARGETS spirv-remap EXPORT spirv-remapTargets
- RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
-
-- install(EXPORT glslangValidatorTargets DESTINATION lib/cmake)
-- install(EXPORT spirv-remapTargets DESTINATION lib/cmake)
-+ install(EXPORT glslangValidatorTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake)
-+ install(EXPORT spirv-remapTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake)
-
- if(BUILD_SHARED_LIBS)
- install(TARGETS glslang-default-resource-limits EXPORT glslang-default-resource-limitsTargets
- LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
-- install(EXPORT glslang-default-resource-limitsTargets DESTINATION lib/cmake)
-+ install(EXPORT glslang-default-resource-limitsTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake)
- endif()
- endif(ENABLE_GLSLANG_INSTALL)
-diff --git a/glslang/CMakeLists.txt b/glslang/CMakeLists.txt
-index 42df1d1e..446cabb9 100644
---- a/glslang/CMakeLists.txt
-+++ b/glslang/CMakeLists.txt
-@@ -112,7 +112,7 @@ if(ENABLE_GLSLANG_INSTALL)
- install(TARGETS glslang EXPORT glslangTargets
- ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
- endif()
-- install(EXPORT glslangTargets DESTINATION lib/cmake)
-+ install(EXPORT glslangTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake)
- endif(ENABLE_GLSLANG_INSTALL)
-
- if(ENABLE_GLSLANG_INSTALL)
-diff --git a/glslang/OSDependent/Unix/CMakeLists.txt b/glslang/OSDependent/Unix/CMakeLists.txt
-index 91fb45a7..9994314f 100644
---- a/glslang/OSDependent/Unix/CMakeLists.txt
-+++ b/glslang/OSDependent/Unix/CMakeLists.txt
-@@ -22,5 +22,5 @@ endif()
- if(ENABLE_GLSLANG_INSTALL)
- install(TARGETS OSDependent EXPORT OSDependentTargets
- ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
-- install(EXPORT OSDependentTargets DESTINATION lib/cmake)
-+ install(EXPORT OSDependentTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake)
- endif(ENABLE_GLSLANG_INSTALL)
-diff --git a/glslang/OSDependent/Windows/CMakeLists.txt b/glslang/OSDependent/Windows/CMakeLists.txt
-index f6bd4e9d..c050ef61 100644
---- a/glslang/OSDependent/Windows/CMakeLists.txt
-+++ b/glslang/OSDependent/Windows/CMakeLists.txt
-@@ -17,5 +17,5 @@ endif(WIN32)
- if(ENABLE_GLSLANG_INSTALL)
- install(TARGETS OSDependent EXPORT OSDependentTargets
- ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
-- install(EXPORT OSDependentTargets DESTINATION lib/cmake)
-+ install(EXPORT OSDependentTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake)
- endif(ENABLE_GLSLANG_INSTALL)
-diff --git a/gtests/CMakeLists.txt b/gtests/CMakeLists.txt
-index 77d217f1..aadf9a54 100644
---- a/gtests/CMakeLists.txt
-+++ b/gtests/CMakeLists.txt
-@@ -33,7 +33,7 @@ if(BUILD_TESTING)
- if(ENABLE_GLSLANG_INSTALL)
- install(TARGETS glslangtests EXPORT glslangtestsTargets
- RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
-- install(EXPORT glslangtestsTargets DESTINATION lib/cmake)
-+ install(EXPORT glslangtestsTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake)
- endif(ENABLE_GLSLANG_INSTALL)
-
- set(GLSLANG_TEST_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/../Test")
-diff --git a/hlsl/CMakeLists.txt b/hlsl/CMakeLists.txt
-index 44f9d6a2..ae0d4d4e 100644
---- a/hlsl/CMakeLists.txt
-+++ b/hlsl/CMakeLists.txt
-@@ -41,5 +41,5 @@ if(ENABLE_GLSLANG_INSTALL)
- install(TARGETS HLSL EXPORT HLSLTargets
- ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
- endif()
-- install(EXPORT HLSLTargets DESTINATION lib/cmake)
-+ install(EXPORT HLSLTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake)
- endif(ENABLE_GLSLANG_INSTALL)
diff --git a/dev-util/glslang/glslang-10.11.0.0_pre20200924.ebuild b/dev-util/glslang/glslang-10.11.0.0_pre20200924.ebuild
index 9cdeed43912d..f1e8c702dbee 100644
--- a/dev-util/glslang/glslang-10.11.0.0_pre20200924.ebuild
+++ b/dev-util/glslang/glslang-10.11.0.0_pre20200924.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999* ]]; then
else
SNAPSHOT_COMMIT="bacaef3237c515e40d1a24722be48c0a0b30f75f"
SRC_URI="https://github.com/KhronosGroup/${PN}/archive/${SNAPSHOT_COMMIT}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 arm arm64 ~ppc ppc64 ~riscv x86"
+ KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86"
S="${WORKDIR}/${PN}-${SNAPSHOT_COMMIT}"
fi
diff --git a/dev-util/glslang/glslang-8.13.3743-r1.ebuild b/dev-util/glslang/glslang-10.11.0.0_pre20201216.ebuild
similarity index 83%
rename from dev-util/glslang/glslang-8.13.3743-r1.ebuild
rename to dev-util/glslang/glslang-10.11.0.0_pre20201216.ebuild
index 09634fb83a93..7e40994e48ac 100644
--- a/dev-util/glslang/glslang-8.13.3743-r1.ebuild
+++ b/dev-util/glslang/glslang-10.11.0.0_pre20201216.ebuild
@@ -4,16 +4,16 @@
EAPI=7
CMAKE_ECLASS="cmake"
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
inherit cmake-multilib python-any-r1
if [[ ${PV} == *9999* ]]; then
EGIT_REPO_URI="https://github.com/KhronosGroup/${PN}.git"
inherit git-r3
else
- SNAPSHOT_COMMIT="${PV}"
+ SNAPSHOT_COMMIT="c594de23cdd790d64ad5f9c8b059baae0ee2941d"
SRC_URI="https://github.com/KhronosGroup/${PN}/archive/${SNAPSHOT_COMMIT}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="amd64 arm arm64 ~ppc ppc64 x86"
+ KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
S="${WORKDIR}/${PN}-${SNAPSHOT_COMMIT}"
fi
diff --git a/dev-util/glslang/glslang-7.12.3353_pre20191027-r2.ebuild b/dev-util/glslang/glslang-7.12.3353_pre20191027-r2.ebuild
deleted file mode 100644
index 99b6659f2a23..000000000000
--- a/dev-util/glslang/glslang-7.12.3353_pre20191027-r2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=(python{3_6,3_7})
-
-inherit cmake-multilib cmake-utils python-any-r1
-
-SNAPSHOT_COMMIT="b131630e7c749a5dc19faa458024260c71fb170f"
-SRC_URI="https://github.com/KhronosGroup/${PN}/archive/${SNAPSHOT_COMMIT}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="amd64 ~ppc64 x86"
-S="${WORKDIR}/glslang-${SNAPSHOT_COMMIT}"
-
-DESCRIPTION="Khronos reference front-end for GLSL and ESSL, and sample SPIR-V generator"
-HOMEPAGE="https://www.khronos.org/opengles/sdk/tools/Reference-Compiler/"
-
-LICENSE="BSD"
-SLOT="0"
-
-PATCHES=(
- "${FILESDIR}/${P}-fix-relative-includes.patch"
- "${FILESDIR}/${PN}-Respect-CMAKE_INSTALL_LIBDIR-in-installed-CMake-files.patch"
- )
-
-RDEPEND="!
kensington@gentoo.org
+
gleitz/howdoi
howdoi
diff --git a/dev-util/spirv-headers/Manifest b/dev-util/spirv-headers/Manifest
index 2d541f552f9d..c333efdb2f53 100644
--- a/dev-util/spirv-headers/Manifest
+++ b/dev-util/spirv-headers/Manifest
@@ -1,6 +1,6 @@
-DIST spirv-headers-1.5.3.tar.gz 387520 BLAKE2B 80f210792294232b9f1ebd12e96a8070b27ca29fcfcf8f61c19b0ddef493511bd1f5f85d44f6112de6154108237147feb564334cd47fb37b6f3e7dfb50620a7e SHA512 fab90cd073aed34320d2a03c441746101e757a4bd44f0b259aaa34e1fafd450b9576d8d539d85a8066cdf0eda3e78c807ccf65cd86ab9d8660195a96e9a50795
+DIST spirv-headers-1.5.4.1.tar.gz 395834 BLAKE2B e4852f1d694271e9928f1f9aa460c6ba33ad2d0568bd38b24ba31e8dd0390a5542192f9c6977cd3ff4a56520af83280b779fd4e7cece6adc33a5261ef2d2398d SHA512 3578a0210b954e904ac154307a0b98a2c01410adf910e549669109b1b559781959bb5771e39945c50523548a6613d064576fcba15aa3c9125255c0443d3e61a6
DIST spirv-headers-1.5.4.tar.gz 394957 BLAKE2B c94d0ab2e98242aeb78c6948ac915467ba2cc9568483b8e3d00d5c5e1f422a23e9645161ea6b958cb3a8f7b2d51cf8e8040b7479712dd32382c5c5cbba30e4f3 SHA512 050ae8ded345bbef3d94e91f22dd72860fdeed3072f943bafaa37f86f2d522e59d7c4ff2e6aa5bddb3c3df55f124200394a91e6d99eb95933463e7b8ce360aad
-EBUILD spirv-headers-1.5.3.ebuild 514 BLAKE2B e5d846bf7b3aaf4b39a254e17b55926ca91c016bea43f57f52a8c30ab5152013f5f4b96a9d25981b32e0c58091626704ee4bc79088d9447f72ad9af0897d3ee8 SHA512 8edf411df280b4c0d143263d7eca5f3a1866972c4df4f8b62c899f7e2c1d3975a3d6bc80ab570d36f7dcbe1131529c2fadf658349167a15494affde48a7e5679
-EBUILD spirv-headers-1.5.4.ebuild 487 BLAKE2B b201adb9dc981e5f7523b926e843941cd53ffbe0466f858c1933307cf2bce2e34371ef59cdb2a92db17b3211261e6ddf12b9112751f3993c3ef26a226803105a SHA512 5b75746f154205fc72676597f6650bc3e4c54bcecfa55240e4f3a8a1cad110fd3cd7e8cfeca0058d738a982c68502e95bb49313cac18b2dba7f53d15fedd1640
+EBUILD spirv-headers-1.5.4.1.ebuild 526 BLAKE2B 4843ac3173d4b943d7bac8b0a0f090f63ba3554463642a2a09eb49091c1b8101de70d7ce385e430b7cac7788b66b03a8c5145590cdadc52bab63a6b354a34163 SHA512 a99b7e8b4ea4a57d36c23bfbcc21c2375757b9521f1a69a78162332cade62198527234ada1aa8d42def89e0af0d5078d2e1f4785a40603e57ec5759c58e0a835
+EBUILD spirv-headers-1.5.4.ebuild 486 BLAKE2B 70210f64f9151c4676d41bae9eef920ce25fa4da56531c2978d67841757a76c4f250932ccf2c90b810e6df0343a9329bcc9e677d3cf94e8bdf839d5ff07c07a8 SHA512 d5c18b4b5938377b4795364b1013e28c5c2793fa35cc8307456495d25dbc08d65987bbf2e49d1abdf298a0762c1e45f5a4918cbcd094d9951f6d6396683f94f0
EBUILD spirv-headers-9999.ebuild 600 BLAKE2B e52054009b4c2a119218fe8e7d1d7606a5355fa93c8a9e14d7e6174dc212d2c87a7d2c57106bd4d217c8fd0ab88234e5a186f700664ccbd04de8b3520afef10e SHA512 420d7be91c892302e0b052c9bf1a628d663f95051a6d38580944aafd1c43c395cb87cec8df6d2d756b8fb4a177b23671911f58c05e9e5b035a41b0b9bb399dfe
MISC metadata.xml 431 BLAKE2B 2a03bfd5ff92d23da598ab731032790658e828cfc16c1bb1bcaed0e8e8aeba5d76ca97d5b52f5433bae5391e5f50d2d1028c49689114da7d4fc9703e40f964d6 SHA512 a770e25b42892a5062dc35739c6776d1e8baa22ee4ac9c745b0283fdb3322ae4f6549693045f9125b6a604f4f103c34e52bc069c11f47394373400c522a877c5
diff --git a/dev-util/spirv-headers/spirv-headers-1.5.3.ebuild b/dev-util/spirv-headers/spirv-headers-1.5.4.1.ebuild
similarity index 79%
rename from dev-util/spirv-headers/spirv-headers-1.5.3.ebuild
rename to dev-util/spirv-headers/spirv-headers-1.5.4.1.ebuild
index 4f2bba2c5394..90856517cc36 100644
--- a/dev-util/spirv-headers/spirv-headers-1.5.3.ebuild
+++ b/dev-util/spirv-headers/spirv-headers-1.5.4.1.ebuild
@@ -7,11 +7,11 @@ inherit cmake-utils
DESCRIPTION="Machine-readable files for the SPIR-V Registry"
HOMEPAGE="https://www.khronos.org/registry/spir-v/"
-EGIT_COMMIT="c0df742ec0b8178ad58c68cff3437ad4b6a06e26"
+EGIT_COMMIT="f027d53ded7e230e008d37c8b47ede7cd308e19d"
SRC_URI="https://github.com/KhronosGroup/SPIRV-Headers/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc ppc64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
S="${WORKDIR}/SPIRV-Headers-${EGIT_COMMIT}"
diff --git a/dev-util/spirv-headers/spirv-headers-1.5.4.ebuild b/dev-util/spirv-headers/spirv-headers-1.5.4.ebuild
index d9ba70c80794..d6312ae27fb4 100644
--- a/dev-util/spirv-headers/spirv-headers-1.5.4.ebuild
+++ b/dev-util/spirv-headers/spirv-headers-1.5.4.ebuild
@@ -12,6 +12,6 @@ SRC_URI="https://github.com/KhronosGroup/SPIRV-Headers/archive/${EGIT_COMMIT}.ta
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 arm arm64 ~ppc ppc64 ~riscv x86"
+KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86"
S="${WORKDIR}/SPIRV-Headers-${EGIT_COMMIT}"
diff --git a/dev-util/spirv-tools/Manifest b/dev-util/spirv-tools/Manifest
index 118229546b8f..2bc672d50ea5 100644
--- a/dev-util/spirv-tools/Manifest
+++ b/dev-util/spirv-tools/Manifest
@@ -1,6 +1,6 @@
-DIST spirv-tools-2020.3.tar.gz 2170858 BLAKE2B c9fdc6bbf6edbb6e3e5aba1fff9bd179b7b435ecb4ebbe29db38ce0c71166269484f8c3798a69a0fe5d936392b07fc6ccd5f058945aa70330612a6ef8fafe12f SHA512 8abb4fe227dbe9d0fc4279523eb714ce3a590a3c56e3dcd226317bc7835e2dceaef3a46c0873c2f144c61b28f41c0fcdf2985cc4f708fa496186c16738cc493f
DIST spirv-tools-2020.5_pre20201107.tar.gz 2583541 BLAKE2B f234e34142af47a98268d85fa12861b9c66c78d74af7e44d4aa9150ad5cfce8e65780d89344ec947b4866de9811a8198e174480c23c30f690193feca7cc136a6 SHA512 a65174e5f1b7cad3be80e0df0d46e8fbfbb62f397fe98eb1b2c37bb85cf8f92d7b4c9103b5e9e8181240bcf97e5a7e3f09323f78159d4b25f7f02176e982f542
-EBUILD spirv-tools-2020.3.ebuild 1088 BLAKE2B 9576a7b33287e9139790225411a344c0a2eb17459140d6c165791195bc6e265be3038e269c7de85ca54405e4030f80d3d3e863ff832ca59772bbf0a9027774f9 SHA512 947a778123f62fd3901d017dfaf9743c50cb75d2014c2e85289b9709958d21462371bdfc926c3e6b5cbc5e2e6a4a86481552b45f062810c04007b09fac529b64
-EBUILD spirv-tools-2020.5_pre20201107.ebuild 1231 BLAKE2B 42263f9563cfdf7d4efbbc932b377f6ad0e92b01b1ff457690dbcbe72aaa19c22a862dad5a4161ca2bbb4d9a7f4347599522f859a4d07504bc4ec24fb53ae656 SHA512 999f277a3e3acfdf1644c2bf1ad0a8c41a60c7322eaf588183bb251ee19ce16a3b83217bd5f2ce18dcc8a21147c1ee3056ce6c89614c7fcff174b93c4153fef1
-EBUILD spirv-tools-9999.ebuild 1228 BLAKE2B 93c5fb104f3264f14e1ac18a0d7954dfb166e2add2ba2d79b6bab09e89e7e7605e9baa53824f919c8e825f354f719b226bfa647d814b5be45d9861dcfaeccb99 SHA512 54e65f2212524e7a11d5d73bf0368151048a4efcfdcf9636cb42a7da890a97f5e4aad6b9b53a035ec94e78608bc6d488627d50f46905a8986108e4e255f3d85d
+DIST spirv-tools-2020.6.tar.gz 2595300 BLAKE2B bd500824866fcd0f0e05ccf3f43a168e33bc4783396d24fa6ddc58d4e46110b001cc32acde1cadcd793a997d547476f58c07475f43c3cbec5314b039926896b2 SHA512 b6d3667581101536e1f4d405e9c1c64e64a0aba174cc2f41d31e080f44d23bcfaed9642fd31f1d44a56c3df3e894526b643c572832cb96218b16d748b1ac6fe2
+EBUILD spirv-tools-2020.5_pre20201107.ebuild 1230 BLAKE2B c22ed6c1c229fbd4530eb631dd6920fef98c29578432ba71370512be1bafcc2fb8da12478be16ca2f54a8a126237689ba7cdad1cd5782a34ff409fa43053e24b SHA512 172fce20975bd218161edf8d873beb6d1c647377d099627797d522befa4773bb224393eafc95bc5a7c123236106d41453ecb9873ff8663c1a857c3b663fdb365
+EBUILD spirv-tools-2020.6.ebuild 1205 BLAKE2B 4e74e0c95341d93f71be441da32b0ee04a8b29834242c668a6f87378497fd8463537a7a15b61d40a70cbc953f9522918fb8965c581e37fb135ad379313d7a47e SHA512 7fa96042df7287684db7bc86dba3e5baa2ff266ea0442d324b6660ec9aee791772f3ae600b687d62d4913010981d48928111b9bbe380088abdf7d117a9d75365
+EBUILD spirv-tools-9999.ebuild 1232 BLAKE2B 0c5acd106fbf664a8f9f1d82ee921e1ad8f8f73ee1b7182f69c7dc1f6303dd6f53ce9bbd96a0b2dd6ded7b73baf7956e2cd757540e7b36a57923b1a4afdbfb70 SHA512 c6d27ddeed7cfa4ec06d6dfa9366082ed1818f4a87dea5c4b01fa6aef87bda429c93776e9d5c7187ee018a10dc5b68d058710425dd11f8271ad61d3e19236733
MISC metadata.xml 429 BLAKE2B 84129eb27ea4a745c90ed7eab09723b41b45a696375c41458c45a6163dc00cd15d208d6858ea4fd92280e3ff3bb385f340ec3684c980a97ea5fd46fdc4c24001 SHA512 13b340b0e43ba726370f3b013759adab727fc37e251ec5777d10541976843e3e575be23ee015af83dd2e98a1917f4d2511467a38afd064cef025ab4700f005a6
diff --git a/dev-util/spirv-tools/spirv-tools-2020.5_pre20201107.ebuild b/dev-util/spirv-tools/spirv-tools-2020.5_pre20201107.ebuild
index 7921c01f46cd..41ee1a4b749d 100644
--- a/dev-util/spirv-tools/spirv-tools-2020.5_pre20201107.ebuild
+++ b/dev-util/spirv-tools/spirv-tools-2020.5_pre20201107.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999* ]]; then
else
EGIT_COMMIT="a61d07a72763c1eb200de0a2c316703643a0d1d9"
SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 arm arm64 ~ppc ppc64 ~riscv x86"
+ KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86"
S="${WORKDIR}"/${MY_PN}-${EGIT_COMMIT}
fi
diff --git a/dev-util/spirv-tools/spirv-tools-2020.3.ebuild b/dev-util/spirv-tools/spirv-tools-2020.6.ebuild
similarity index 70%
rename from dev-util/spirv-tools/spirv-tools-2020.3.ebuild
rename to dev-util/spirv-tools/spirv-tools-2020.6.ebuild
index 16c82fcd1bd9..d6ecf835b95b 100644
--- a/dev-util/spirv-tools/spirv-tools-2020.3.ebuild
+++ b/dev-util/spirv-tools/spirv-tools-2020.6.ebuild
@@ -5,16 +5,17 @@ EAPI=7
MY_PN=SPIRV-Tools
CMAKE_ECLASS="cmake"
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
inherit cmake-multilib python-any-r1
if [[ ${PV} == *9999* ]]; then
EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git"
inherit git-r3
else
- SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="amd64 arm arm64 ~ppc ppc64 x86"
- S="${WORKDIR}"/${MY_PN}-${PV}
+ EGIT_COMMIT="${PV}"
+ SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+ S="${WORKDIR}"/${MY_PN}-${EGIT_COMMIT}
fi
DESCRIPTION="Provides an API and commands for processing SPIR-V modules"
@@ -25,7 +26,7 @@ SLOT="0"
# Tests fail upon finding symbols that do not match a regular expression
# in the generated library. Easily hit with non-standard compiler flags
RESTRICT="test"
-COMMON_DEPEND=">=dev-util/spirv-headers-1.5.3"
+COMMON_DEPEND=">=dev-util/spirv-headers-1.5.4.1"
DEPEND="${COMMON_DEPEND}"
RDEPEND=""
BDEPEND="${PYTHON_DEPS}
@@ -35,6 +36,8 @@ multilib_src_configure() {
local mycmakeargs=(
"-DSPIRV-Headers_SOURCE_DIR=/usr/"
"-DSPIRV_WERROR=OFF"
+ "-DSPIRV_TOOLS_BUILD_STATIC=OFF"
+ "-DBUILD_SHARED_LIBS=ON"
)
cmake_src_configure
diff --git a/dev-util/spirv-tools/spirv-tools-9999.ebuild b/dev-util/spirv-tools/spirv-tools-9999.ebuild
index d1cdb00c129a..5e644f17681c 100644
--- a/dev-util/spirv-tools/spirv-tools-9999.ebuild
+++ b/dev-util/spirv-tools/spirv-tools-9999.ebuild
@@ -5,7 +5,7 @@ EAPI=7
MY_PN=SPIRV-Tools
CMAKE_ECLASS="cmake"
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
inherit cmake-multilib python-any-r1
if [[ ${PV} == *9999* ]]; then
@@ -26,7 +26,7 @@ SLOT="0"
# Tests fail upon finding symbols that do not match a regular expression
# in the generated library. Easily hit with non-standard compiler flags
RESTRICT="test"
-COMMON_DEPEND=">=dev-util/spirv-headers-1.5.4"
+COMMON_DEPEND=">=dev-util/spirv-headers-1.5.4.1"
DEPEND="${COMMON_DEPEND}"
RDEPEND=""
BDEPEND="${PYTHON_DEPS}
diff --git a/dev-util/vulkan-headers/Manifest b/dev-util/vulkan-headers/Manifest
index d6865c16f151..a448f2b92685 100644
--- a/dev-util/vulkan-headers/Manifest
+++ b/dev-util/vulkan-headers/Manifest
@@ -1,6 +1,6 @@
-DIST vulkan-headers-1.2.143.tar.gz 758635 BLAKE2B e1fa8e1290d2fd1e4cef932e4dcd2bc10ef14449cdb41d57f0e4ef58f9a758add7e05d06d7884b08e080250cbb93bf0b211ac3570f0be6b256f6c70bd9eb1704 SHA512 fafd28822da050211525b289a324d333d5651e74e455a7b1010db55eac624edbbf50f5e7f899e2003c821fd06a9a61fec32ea7d07dc4d90a3b3697e03d3ddcc3
DIST vulkan-headers-1.2.154.tar.gz 817069 BLAKE2B 66b073daf01741d74a8c2524e6f2692a4c2143340bba8349f3c85408ce12cd7405f960fac0b6ffe3cbd6dcddfcbb04a6481b2743428c66a527d51c16cbd326c6 SHA512 97f9b56b57a762a3616ff3e9795de01c9b9327b80903adf2b141f33be45b30980acd50007ac6af9562ee1897491929d23f7f5dc6a8bafced59e14df27dfca6a9
-EBUILD vulkan-headers-1.2.143.ebuild 605 BLAKE2B caf8d1eff6c89b36ca7e4a544a97699aa257bd306b69bb40e3522a743469f079c3fdbcb26e79bcee137267eccf2de8f7886a3282e6d0582e3a33bd3cfade49ee SHA512 211cf1ac07e4dd0bcdf133cc9cf288bf4613ee91cf1358c406a7534584aa117a72e0d2a51a45afed59e5884c05ce87d2acfe49995ad91b3e20fa15b54cd5d6ed
-EBUILD vulkan-headers-1.2.154.ebuild 613 BLAKE2B e14d48d56969086af316c53f09968f0825b036e69923aa7ec3ba9da858a9f88777e0a639cc9afdfbd74c2e093bc8b43248fbe512a6bf7985a8d037c58dcb0ab4 SHA512 9028c31acfa8c3d622b0ac7fd9195440fef9c6639d456fc950904aa70248b5ee533ddb4d94573cc1913d25caadb4c63b96fbf01140439aa9564154600b33a3f4
+DIST vulkan-headers-1.2.162.tar.gz 852973 BLAKE2B 3907c247f115f4dee2fc8697f157aeb30a3ef91a774132591771c0b327090abf7c0caad2082edb86c787883c167ce1ffe75c199d9b94fc642aae30526f5311cd SHA512 7b33f6ef32f1ef34d3b37ad38b077a3a2ebcef62612371afa1b6f4910815bbab8418a837c49b3872b57d2e5012c15623521121f5d62836e46d6f20773841d7b0
+EBUILD vulkan-headers-1.2.154.ebuild 612 BLAKE2B 64c4431737365668e9e0625218152e4299dd9fc06b60a341ae93b7642667663f0ee7a8d3d19e709d484826f34a9c37d9901942c42659d1e1f9ad7e4bb5379642 SHA512 e6fd884d43405daab2ad3df6c02fc2d3e029647d1facecb79acbaed0a456d41e7709e56aaa8d752dab8ce59a82de51cc6bba7cd365edbe911f329e788c084c98
+EBUILD vulkan-headers-1.2.162.ebuild 617 BLAKE2B c9b53f7d664cca2f4f793712f2db1d41eb37a837602813ec1462302779bc5a63d10e8fa87bad10de41577a2339cf55cfe99340271d398470272849b4917df486 SHA512 ae8aae0d72ee4de778d818ee0865313de580d3585c95f3eb1415e7ef57bae3373f790d25af1f7d37b0c31196c43200da4061476b8bd6b85b5d5948af1ea3b657
EBUILD vulkan-headers-9999.ebuild 593 BLAKE2B 101dc4954cc61f0375202d2398a3bab6e99e379f9dbc3aaab01129670e0413cba3fc9d15f031a44f634ec7576f0cd6bbd52ccfdbec0de9d703f6db5a9a2eff52 SHA512 a95238b09e9d71d72588e9e90af0d99590a8d4fffb6b134cc75c5b9bfc542c40f7a438447ce06aaf4a5ea5922d9ce49763af91b49934c8f66fc5dbb1d7ea8246
MISC metadata.xml 432 BLAKE2B e6c1f4f34e41862d3739bad772b910b21348dce97dbde38cc7fbc9cb42993a493881dd100a0c21be3615805f27d3987259233ae5830ef56e2d1dd928c285c09f SHA512 f4f93b16ad29f813a2c0397ec46c6decf7c9bdb3f4a376e1f24a29724c136feabd230d0558d37a502f2795f71c959833a662e6d2544a78704408b3be9be314fc
diff --git a/dev-util/vulkan-headers/vulkan-headers-1.2.154.ebuild b/dev-util/vulkan-headers/vulkan-headers-1.2.154.ebuild
index 79af58fcdc70..82d54c8ea81d 100644
--- a/dev-util/vulkan-headers/vulkan-headers-1.2.154.ebuild
+++ b/dev-util/vulkan-headers/vulkan-headers-1.2.154.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999* ]]; then
inherit git-r3
else
SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 arm arm64 ~ppc ppc64 ~riscv x86"
+ KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86"
S="${WORKDIR}"/${MY_PN}-${PV}
fi
diff --git a/dev-util/vulkan-headers/vulkan-headers-1.2.143.ebuild b/dev-util/vulkan-headers/vulkan-headers-1.2.162.ebuild
similarity index 91%
rename from dev-util/vulkan-headers/vulkan-headers-1.2.143.ebuild
rename to dev-util/vulkan-headers/vulkan-headers-1.2.162.ebuild
index 3c7d217ae9fa..b7d53089df0c 100644
--- a/dev-util/vulkan-headers/vulkan-headers-1.2.143.ebuild
+++ b/dev-util/vulkan-headers/vulkan-headers-1.2.162.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999* ]]; then
inherit git-r3
else
SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="amd64 arm arm64 ~ppc ppc64 x86"
+ KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
S="${WORKDIR}"/${MY_PN}-${PV}
fi
diff --git a/dev-util/vulkan-tools/Manifest b/dev-util/vulkan-tools/Manifest
index ee08b36bf45b..bec96618d2ed 100644
--- a/dev-util/vulkan-tools/Manifest
+++ b/dev-util/vulkan-tools/Manifest
@@ -1,6 +1,6 @@
-DIST vulkan-tools-1.2.141.tar.gz 711666 BLAKE2B 0ad31cba26106ea76ddeb26e05b59302a6f35c9172eb75fe31b6a05370be0131a92db33a4c54a006b6ba5145447079239d7ff174f7be10feb172fe03d7a1a619 SHA512 5dce372f60f55570bfc7dc4e4da7b4a07f632cfac6a2862bdf773cab61a8c6260bb38cbd48d944e08479248bfe29248214618a78952fac0aeef285e5b888d337
DIST vulkan-tools-1.2.154.tar.gz 719166 BLAKE2B 351fd168be69615691bf956f65c0a6f2050c1061897745ecc227cc11336d2d3b39b0475a0c941c0ccdb011b9d37ef0417b22e0935ec956c5d37bbb8c6cd2e6d2 SHA512 51d6521af4f65c5b93bc5a10ef921f3770f04d6a363a9c4f0941421bf762e17cb8948bbdd3ed1d5449d015e1ac86e42e63583aee4a442cc275a1d410f61813a7
-EBUILD vulkan-tools-1.2.141.ebuild 1885 BLAKE2B 145b76e22548ae638ec3eedf9b3692d03b026484a2cc611221c25a9dc4ac4d57a077531ff34533579f983d997fdf5eae9ded0c2c25e5573daa99a698e6eb9b49 SHA512 2d76c2ff116686ed5d6bfd3cca4de4c8e2bd227bd7a4373e0b1f7ef12f9c26d871be9048c92d0f9569ea11b04369215f6fe6bd7b31054db4dca675f3cd2d57e1
-EBUILD vulkan-tools-1.2.154.ebuild 1886 BLAKE2B 370a628f1edc87ffbfa541531dc4ddaf7e956963365050debcc3d66dafefb0ebdce6b93c1b7c7e2e80400607007d3130860241cf636029288c3106955f9044dd SHA512 6a457f33f1d21ca91f72876c892da529305b43afcce57c9266fb8660825cb0971782e8496f34d9f4cf1d4b2f0c2dfa9e8a3ce9fc25de268b119ff57481138ddb
-EBUILD vulkan-tools-9999.ebuild 1886 BLAKE2B 370a628f1edc87ffbfa541531dc4ddaf7e956963365050debcc3d66dafefb0ebdce6b93c1b7c7e2e80400607007d3130860241cf636029288c3106955f9044dd SHA512 6a457f33f1d21ca91f72876c892da529305b43afcce57c9266fb8660825cb0971782e8496f34d9f4cf1d4b2f0c2dfa9e8a3ce9fc25de268b119ff57481138ddb
+DIST vulkan-tools-1.2.162.tar.gz 724232 BLAKE2B 16eb2dde35883fb2c7c263a72a615818ff8e1557ac9d74553ec3784d96a827e6900efa4e42218cb9081f7501d9b1a53eac82c360c2d20922043308515ab48983 SHA512 7827f6775dfb26820a2a2cbc60e7da8c7e7bdcb57b65523fbc6b2e989ae6869b04a57ae458c72715722c67d842660574697834c92f9b909dd5673da1945ac6dc
+EBUILD vulkan-tools-1.2.154.ebuild 1885 BLAKE2B 145b76e22548ae638ec3eedf9b3692d03b026484a2cc611221c25a9dc4ac4d57a077531ff34533579f983d997fdf5eae9ded0c2c25e5573daa99a698e6eb9b49 SHA512 2d76c2ff116686ed5d6bfd3cca4de4c8e2bd227bd7a4373e0b1f7ef12f9c26d871be9048c92d0f9569ea11b04369215f6fe6bd7b31054db4dca675f3cd2d57e1
+EBUILD vulkan-tools-1.2.162.ebuild 1888 BLAKE2B 7635fd4593b06c176a16b09aa251b9825d155edbfae0160f314ea23c2c14fdaba7e1652709fbd89934df5374157d75aa260b028958e96366495599335fe1478c SHA512 024da45078e75055b6a66bccef0835d21699e2e457837e359ca5bc0307a1edd99f16754329e473ade28e3ef527f413428beb3148c15338403287570934f32b25
+EBUILD vulkan-tools-9999.ebuild 1888 BLAKE2B 7635fd4593b06c176a16b09aa251b9825d155edbfae0160f314ea23c2c14fdaba7e1652709fbd89934df5374157d75aa260b028958e96366495599335fe1478c SHA512 024da45078e75055b6a66bccef0835d21699e2e457837e359ca5bc0307a1edd99f16754329e473ade28e3ef527f413428beb3148c15338403287570934f32b25
MISC metadata.xml 500 BLAKE2B 2b03cd2296502530b43020bacbbef0edaabacc6b8d2458ef6d5f653fbbdf6b02ff5fba9988fd19ee9c9e14e41df359c150cbc2fd141769960f2f1b95e213d8ed SHA512 327529a5a8a57115e116c31c5b86a00f978c8612a4905eed90ad3b33671acaabbaa5e7e82bb140ad5d9b1574b0f37a53882d117c50ec320c1ea0c8d5fc25994e
diff --git a/dev-util/vulkan-tools/vulkan-tools-1.2.154.ebuild b/dev-util/vulkan-tools/vulkan-tools-1.2.154.ebuild
index 1dad1fe14b60..a23ebee93695 100644
--- a/dev-util/vulkan-tools/vulkan-tools-1.2.154.ebuild
+++ b/dev-util/vulkan-tools/vulkan-tools-1.2.154.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999* ]]; then
inherit git-r3
else
SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64"
+ KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64"
S="${WORKDIR}"/${MY_PN}-${PV}
fi
diff --git a/dev-util/vulkan-tools/vulkan-tools-1.2.141.ebuild b/dev-util/vulkan-tools/vulkan-tools-1.2.162.ebuild
similarity index 95%
rename from dev-util/vulkan-tools/vulkan-tools-1.2.141.ebuild
rename to dev-util/vulkan-tools/vulkan-tools-1.2.162.ebuild
index a23ebee93695..484eb9bb156c 100644
--- a/dev-util/vulkan-tools/vulkan-tools-1.2.141.ebuild
+++ b/dev-util/vulkan-tools/vulkan-tools-1.2.162.ebuild
@@ -5,7 +5,7 @@ EAPI=7
MY_PN=Vulkan-Tools
CMAKE_ECLASS="cmake"
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
inherit cmake-multilib python-any-r1
if [[ ${PV} == *9999* ]]; then
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999* ]]; then
inherit git-r3
else
SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64"
+ KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64"
S="${WORKDIR}"/${MY_PN}-${PV}
fi
diff --git a/dev-util/vulkan-tools/vulkan-tools-9999.ebuild b/dev-util/vulkan-tools/vulkan-tools-9999.ebuild
index 1dad1fe14b60..484eb9bb156c 100644
--- a/dev-util/vulkan-tools/vulkan-tools-9999.ebuild
+++ b/dev-util/vulkan-tools/vulkan-tools-9999.ebuild
@@ -5,7 +5,7 @@ EAPI=7
MY_PN=Vulkan-Tools
CMAKE_ECLASS="cmake"
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
inherit cmake-multilib python-any-r1
if [[ ${PV} == *9999* ]]; then
diff --git a/dev-util/wiggle/Manifest b/dev-util/wiggle/Manifest
index 3db124dbb272..4f24ddffde4a 100644
--- a/dev-util/wiggle/Manifest
+++ b/dev-util/wiggle/Manifest
@@ -2,5 +2,5 @@ AUX wiggle-1.0-cflags.patch 576 BLAKE2B 25b065a28bb88f3163c063a90a9dc60ec9171e4a
DIST wiggle-0.9.tar.gz 809756 BLAKE2B 62fd35c721c4d54204984fd196686decff54c1613ceabf5c727b6383500158a04110c4fa2e63d6456452ac79fb811aac611876528fd2503c1acb7e0eb000e49f SHA512 2e3a4977704231f3bd6aa96ffaba8bc733acde425773b86a9649312676b44360c5b85cb48bf944cd383d8e4d0a541d88755f23be7d7a8884213f68a6320c62d9
DIST wiggle-1.0.tar.gz 868216 BLAKE2B 7241cbbde488b5cbf8970feb1cc258deb04c935347d793796f34993feba3e82870c9ac2aa7d5039f4739308cd0b20b4b104fb50c5ce64a5c66381ff3f6c545d4 SHA512 e9bd6e794ba0cff70db96a648c53aa21b427967758375b843fccf409dd17faf59468c11bafb1e0a7af8bfa657551da8bc1903b9ccf8def1ed9acc84f50c7e0b3
EBUILD wiggle-0.9-r1.ebuild 1714 BLAKE2B e8c17c40f61dad213d8cfd43e3211fdcb5293eb46baee1f875f6b262382d6931b1e739d80ffcee7bec2930d6fba1878a1e8d4553dea17daa9be9b74851202f3f SHA512 8b976140f14ac386c2c483f3402097ac49b89bfc7742e8800c1053e3cb46fb75fc8b10ba6be49627aaaaf4261f6c8dff11a8834fdadc31f1029304f062eebe8a
-EBUILD wiggle-1.0.ebuild 1491 BLAKE2B 031b2ad8091f0521f9ab17900309ca336f7616570a99188b22fcbdec4f237f5e232e1453d569bb06152374dd7bbc568b94636181ddc279bc614c05dbdd83df0b SHA512 7d62261ed2d1187a2e5d5efe13f792179a2f47975b704627e0b63e953b3c2bb501e4ec90c96ea12ae43de52e3dd88dbfc0c52f493315be30809831b5721661f0
+EBUILD wiggle-1.0.ebuild 1490 BLAKE2B 24e5ccd7bf02838a717d0229d8d4a95f37151ebefcbff72d1ae7d64e64bf8b2cf57367b23e8b46652e7ae8073007dcba0cf1e5903d6a61541acbe5aaa4fed056 SHA512 71fe38aff8390d637b414f8dd88134f5997330756daaceb9a55fe947b154829ecb50d681b8cfbacbd8b100a66309caadb14e2d7e4b24ec5de83dcd820395495d
MISC metadata.xml 256 BLAKE2B 7380eb4443aa7d04fc02d228edb72f675580a9f36244c083c4bbdcbc492a4c5169fb3121158d4a613f25f7c0464042bba7951fb92cf9f11c5208a2d9699e195e SHA512 574345bb2730bbc2d0190a03b16703d10441ccd589623c5e8bdddf84d7ce86226da7e079d7b2135e4c724d0813973c551143cdd0f525a58efdd37716dd83edfd
diff --git a/dev-util/wiggle/wiggle-1.0.ebuild b/dev-util/wiggle/wiggle-1.0.ebuild
index 33e321fa5383..2ae059f746e4 100644
--- a/dev-util/wiggle/wiggle-1.0.ebuild
+++ b/dev-util/wiggle/wiggle-1.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://neil.brown.name/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-util/xfce4-dev-tools/Manifest b/dev-util/xfce4-dev-tools/Manifest
index ee1b555ffc69..b17d3e4a2ed8 100644
--- a/dev-util/xfce4-dev-tools/Manifest
+++ b/dev-util/xfce4-dev-tools/Manifest
@@ -1,7 +1,5 @@
DIST xfce4-dev-tools-4.14.0.tar.bz2 292275 BLAKE2B 18f28394ded038a7bcf0e754ebb359464358df245903a0c4441df2845e57c9059de6e6775a90c0e6c3cde4936a847ddf26ae88ff61fe7612fc2626b00f1d56a7 SHA512 e22b139ff7516ec0e510f882cc6a9e8e8b2b7bd41093c8e67e5ef11eb6c2c2848637513369d652f7238f10b5005c5483a938d3348020b48a4c1fadadd6d635f8
-DIST xfce4-dev-tools-4.15.0.tar.bz2 336453 BLAKE2B 9072d86b4b1645e72c04f26b5609162f50aac9d90ad007d2f629bb1ec67d242f3addea4bdd6f129f3336658b04f0eaecbd039154dfd98ccb87a85840b502d11f SHA512 125c8a7d594b17ce822dc5f57f5c700e69ee6208b06931cb0fefcbd1aa70281f388a9eebe8b451ffb55f16682070f9119a43b148f97adcdfd2278b4901910425
DIST xfce4-dev-tools-4.15.1.tar.bz2 340738 BLAKE2B 73c08f27011ce0d2144eaa1672209669a382695bc9fc9c0a7b9966398df09cf4813afdde9f809354b48d8ddc06644b6e8d4f45ed758dfca24c92e557f5536c8e SHA512 e24fb63774b36f5b3cd901394b75b36e891a68fe7a46a1503a1fc3cfe901bd267e2d8d4aa35a2c760226524079617059e5344b93ef98b3f97dce85e765e5c5dc
EBUILD xfce4-dev-tools-4.14.0.ebuild 578 BLAKE2B ee9471d511f0f61bebc4458fafd29ec7c246ede52b393404d055058f8453149fb13a0c5e83504aa15465ac4549ec67a8bc693d59f44cb268e61ab313de3b0aac SHA512 de4981b2dd476a6582654f5bc09b3e6008d0f96b310737e0797c66bf3e469783a7dbef58445ff20d5e9d8ea02539d334e6c5047f78ecbb82290deab39a9aa83a
-EBUILD xfce4-dev-tools-4.15.0.ebuild 584 BLAKE2B 6b2f6fcd2f8ed91d4a09138a3ea90c1ecb1e5cf8236dc7e16bbf4889d0aabb9a08d822b7cca7b0888ee586837e41a5c055d71836cb2255ac82c99af875a58cf7 SHA512 35e950fba2c4de9b286afa8d9af5560c8c1ec72c8df70ab2fafc67015005bee23f5e7b59e79e8d631e668cb1ceb423106c4a1fddfdbd39e8e7741e6fb9fe1c9e
EBUILD xfce4-dev-tools-4.15.1.ebuild 584 BLAKE2B 6b2f6fcd2f8ed91d4a09138a3ea90c1ecb1e5cf8236dc7e16bbf4889d0aabb9a08d822b7cca7b0888ee586837e41a5c055d71836cb2255ac82c99af875a58cf7 SHA512 35e950fba2c4de9b286afa8d9af5560c8c1ec72c8df70ab2fafc67015005bee23f5e7b59e79e8d631e668cb1ceb423106c4a1fddfdbd39e8e7741e6fb9fe1c9e
MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/dev-util/xfce4-dev-tools/xfce4-dev-tools-4.15.0.ebuild b/dev-util/xfce4-dev-tools/xfce4-dev-tools-4.15.0.ebuild
deleted file mode 100644
index 665633a8f721..000000000000
--- a/dev-util/xfce4-dev-tools/xfce4-dev-tools-4.15.0.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="A set of scripts and m4/autoconf macros that ease build system maintenance"
-HOMEPAGE="https://www.xfce.org/ http://users.xfce.org/~benny/projects/xfce4-dev-tools/"
-SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
-IUSE=""
-
-RDEPEND=">=dev-libs/glib-2.42"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
diff --git a/dev-util/ydiff/Manifest b/dev-util/ydiff/Manifest
index de1d1d1e300a..2222fdbf4d12 100644
--- a/dev-util/ydiff/Manifest
+++ b/dev-util/ydiff/Manifest
@@ -1,5 +1,3 @@
-DIST ydiff-1.1.tar.gz 36357 BLAKE2B 4465c85132bb7c7d58c13dd79903610c74edec3b2b8ab8980918a1bf3a98f2b8387872a0974743503fcaad1e7ecb24c21d312a13d9aabe94780e9d623c35175a SHA512 575b3327edd3b8796f5f150fc7ebde32561e1782582e03e9b63bf9010998913fb8b00a8245d799f6cd5599e286f07f9e97e160f23606323d1a6f6059faa59bc9
DIST ydiff-1.2.tar.gz 42808 BLAKE2B 927482c2ed9a96efc354178679b4ba50497289bc31107e8cdef3062a71d91268fa703620f1f4b0be03aebaf339eba5254f4b43c16403f1d7818b84b0c450defb SHA512 0eb2230b64f43e20f6dc2411296389dc99356ef626152dc7f234583f70678e64a07b764fd89635479e7ac4aa7e2490db6e76c744369eefef8ab6a5386db1a7b5
-EBUILD ydiff-1.1.ebuild 652 BLAKE2B 64b7eb0fa137e38a02ff45de004eded3d9b07863d546b992a7f7e80fdee29b7ea3c82842e4183752012e64811369c3d8d54927f0fb72dd24106c46d7941edd19 SHA512 c274ee20ef7535608aeacf48704fd40f24d8b53dd398c702f7ab475cefa31d9fa44243b3361cddaa6a9fda4177eee46e1c576d81509ca308d08f05571373430d
-EBUILD ydiff-1.2.ebuild 642 BLAKE2B 92d9aade555437c87e66e26ada7f59ffd5733a622c7eacb8541f4e7ffc43593b971d8c091e698e5736422ce374507099433f5b09c04f87b6afae15107c2e0815 SHA512 94d99b71d6243d7a18bf5ab2a006d3742e6512587a544418aec562195872dfa49318cb1064d688cc3ac094e2389faec68a2790187714c57d62a8cdee05b1e302
-MISC metadata.xml 369 BLAKE2B e1679b4929852125cc2ce7ec0ede870da64132b820c16865d6fa4e572227c64d699871e07df5588ea46ae67cab3775be9908a76d2d222d75bc2f59ea9269b14a SHA512 798de8606d059795e57d1cfaf513e2587b132e512a8833d422d94e7708473379ddbcee63ec2cf8068653f7c1e02de516f7facb5e5fea59a9dca98698cc3c6d57
+EBUILD ydiff-1.2.ebuild 641 BLAKE2B b0fb4d05d81a594c53084bf1fb1f223aad84826b8ce73d0cc2781ab349517945f6bde6e415fe121c6bcc6409fba27dd67f62679fa8927449a2604b92b874d92a SHA512 9de5bc0965a88bc26277e16cb69cae584b56824996e25a0373428e30cbea9d417ee6ff9a1ac13c6489875c4a8eb7bc0111df8b9ef368922a7d27cad2330bfbd6
+MISC metadata.xml 393 BLAKE2B a469859412c431ab72df7f29759bf03532bc356cdfd556385ea6b62688d68cc430b5655f980b0d6816333097828e5b3266febe2b1cd5abef7fee7474c35c1998 SHA512 901e8ab9f695585a175507658185427f15c20cfc7fabf9b502707d2a3acf7215dcd244fc1556b6a2981ea1e93e44153c715f53017ef72a4c30bf9182f09f3534
diff --git a/dev-util/ydiff/metadata.xml b/dev-util/ydiff/metadata.xml
index a42be58d1e78..6ad1949b1bf5 100644
--- a/dev-util/ydiff/metadata.xml
+++ b/dev-util/ydiff/metadata.xml
@@ -5,6 +5,7 @@
sping@gentoo.org
Sebastian Pipping
+
ydiff
ymattw/ydiff
diff --git a/dev-util/ydiff/ydiff-1.1.ebuild b/dev-util/ydiff/ydiff-1.1.ebuild
deleted file mode 100644
index 4d5e505aa774..000000000000
--- a/dev-util/ydiff/ydiff-1.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-DISTUTILS_USE_SETUPTOOLS=no
-
-inherit distutils-r1
-
-DESCRIPTION="Colored, side-by-side diff terminal viewer (ex. cdiff)"
-HOMEPAGE="https://github.com/ymattw/ydiff"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-
-DEPEND="sys-apps/less"
-RDEPEND=""
-
-DOCS=( CHANGES.rst README.rst )
-
-RESTRICT="test"
-
-python_test() {
- ${PYTHON} tests/test_ydiff.py || die "Unit tests failed."
-
- ./tests/regression.sh || die "Regression tests failed."
-}
diff --git a/dev-util/ydiff/ydiff-1.2.ebuild b/dev-util/ydiff/ydiff-1.2.ebuild
index cdfe106fd620..3db2a37750ee 100644
--- a/dev-util/ydiff/ydiff-1.2.ebuild
+++ b/dev-util/ydiff/ydiff-1.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
RDEPEND="sys-apps/less"
diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz
index 6b29c898a41b..2570eb034fa3 100644
Binary files a/dev-vcs/Manifest.gz and b/dev-vcs/Manifest.gz differ
diff --git a/dev-vcs/git-cola/Manifest b/dev-vcs/git-cola/Manifest
index db8d1aa8503a..74a4ab550b1b 100644
--- a/dev-vcs/git-cola/Manifest
+++ b/dev-vcs/git-cola/Manifest
@@ -1,7 +1,8 @@
AUX README.gentoo 227 BLAKE2B 828266fe46d9eb866250b57921df446055c7835cce3c3d17014563451acfc100f0e3ade6805514d620852273f011c12a8dd581ad90ffa135e5ab168a87790d46 SHA512 9e8b672fe6998a255dea761e186d5a9031895e8ec0eb14d4942c81a462a238ef1eec0431671da8be3ee4bbacd7f81cec6ec1f9e75e2f4429c3472faad5ba2c2d
+AUX git-cola-3.5-py3.8-line-buffering.patch 1342 BLAKE2B e13e576a8e4d88975b59e3f9b58f3a0b1f7cb903a0469729005e04f8dc43b5d4459d4dc85436713519cce72a408cedf9784b6fa69bd9a0cbb0fdc1e49b66588e SHA512 445106e675df96386e1b995c9bd8ea496bf029f7bde6c81390b657034769580a7ef448bcb2f5c9c79ade19f2d490f4bef19b7a0e0d51e43c01cdc6e2594e7535
AUX index.html 355 BLAKE2B 24c532f3882744fe3be55fbef8eb35410849124baeffc56659fa6200140ec7059bfee2323443a5ea62481b6b4c43b6fcc1e116acf8f67082ade03b2a8a23aed1 SHA512 a3e66bb220ae05c2f49a75ce413c5aeefb9ced26f7e8b2175b32ade83663153fab94f8601b1d0182d1eeb907edc6c1bef3ad96d84b1e6c00ca4d5a816be79bac
DIST git-cola-3.5.tar.gz 970155 BLAKE2B ae602d4de0e6fac9d2817100bee8923d8f550d0bb83ddafd806ccdfbd0a77c65bfb60ff03a9399c6b60d5d4683eb6d46ee41eaa43faf2e2ac092b34c9151c999 SHA512 532e24092a72486171345aeb0e7610eb49c4062b64395988c6c4965cac6e9ffaed1268c30a0a525d4d99404f626d9e505a4be148d376994d4326e3ca873e2793
DIST git-cola-3.8.tar.gz 980190 BLAKE2B 0502701c63f370b304a83094b2154757d1810216e82882472c7eac9633ac26eaa75974af05c32c18203d03b67a027655ea85c0e335915f204f668fcc86ed9c3f SHA512 9ae04dfef3b5bc64452a8df43e7afa93091f282097447208dadbd17522b62e5c43f7afce3eecc59fc4e38863496cdb41ac8b0453bbf327121629fbde20e45bb0
-EBUILD git-cola-3.5-r1.ebuild 2528 BLAKE2B 6b1054847474f44db0a2c794c5e8abc795677b6bccb30aff2413f774df7d9889a5134fa4502ac5daf02cb34c35c4c177f6a653a4df906aa0987af0d805143d53 SHA512 099c6027561d80beeca7cffc09fc3196d4561ea0953bce82d953cf37cd0a227069dcc147540325f478c1e00da3012818d1c5b2758aa4a209d3314b683292ef98
+EBUILD git-cola-3.5-r1.ebuild 2730 BLAKE2B d54f7e418027e9c3718bf6da0052a87f99cdedf8e6d5e53c71b6ee4bf2bf5547b65c1b4782554f61090c3c66d675adaa128322a0200ff837169f77972a47b557 SHA512 7e6e221d12f1212748e90c07f2a1646ffc42e0edd0d55a09a8c173ba0b1bb509a1a6262c7f5b303bcb8ab6a61ae6e2c0b4be0ff6c70b2fe73861d62fe3140903
EBUILD git-cola-3.8.ebuild 2527 BLAKE2B cdc2bfb801db6cdca9a47fb9d62fa6aa2b6facfa92b6a6eb2dab2866b852ea8d36e1c976e9f1b1106550024d092cca31a6c08ffd3e4e442d887c5e2be508007f SHA512 1ee2043174cc1bf055de8c160e3b9665deac31553512ba2410e7cb616604e852a9a4ccbab4d5f7cca9bc1ce3ca4f2740a5ff51a7a08c832f3c00f2a4765493e0
MISC metadata.xml 550 BLAKE2B 65feeb544a556d9202adda4f760b622c21bc03e04ae40428a49f3c53f253065cb923bbdf70c10187935895d5afc47ed9e49d8789d616503963689fdac06e860c SHA512 92a636e729d3d000e04773b2debb015b399f0b87f32a14c259c915975864e1d40114e68c7434fbe055913fbdc9f73c3f1d400807c25e83cf0b49f354b302e657
diff --git a/dev-vcs/git-cola/files/git-cola-3.5-py3.8-line-buffering.patch b/dev-vcs/git-cola/files/git-cola-3.5-py3.8-line-buffering.patch
new file mode 100644
index 000000000000..4938d6a30eca
--- /dev/null
+++ b/dev-vcs/git-cola/files/git-cola-3.5-py3.8-line-buffering.patch
@@ -0,0 +1,29 @@
+From ed00653d43b00b18e89c8c4d9e733ef156c02579 Mon Sep 17 00:00:00 2001
+From: Simon Peeters
+Date: Mon, 18 Nov 2019 21:15:32 +0100
+Subject: [PATCH] Only use line buffering in text mode when calling Popen
+
+Python3.8 started complaining loudly when trying to open a stream in binary mode but with line buffering enabled.
+So we should only try to set `bufsize` to `1` when we enable `text` or `universal_newlines` mode.
+
+see https://docs.python.org/3/library/subprocess.html#subprocess.Popen under bufsize
+---
+ cola/core.py | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/cola/core.py b/cola/core.py
+index 0fabfcf3d..5ad719f05 100644
+--- a/cola/core.py
++++ b/cola/core.py
+@@ -208,7 +208,10 @@ def start_command(cmd, cwd=None, add_env=None,
+ CREATE_NO_WINDOW = 0x08000000
+ extra['creationflags'] = CREATE_NO_WINDOW
+
+- return subprocess.Popen(cmd, bufsize=1, stdin=stdin, stdout=stdout,
++ # Use line buffering when in text/universal_newlines mode,
++ # otherwise use the system default buffer size.
++ bufsize = 1 if universal_newlines else -1
++ return subprocess.Popen(cmd, bufsize=bufsize, stdin=stdin, stdout=stdout,
+ stderr=stderr, cwd=cwd, env=env,
+ universal_newlines=universal_newlines, **extra)
+
diff --git a/dev-vcs/git-cola/git-cola-3.5-r1.ebuild b/dev-vcs/git-cola/git-cola-3.5-r1.ebuild
index 0c0122bcd5b6..e6a1500ea821 100644
--- a/dev-vcs/git-cola/git-cola-3.5-r1.ebuild
+++ b/dev-vcs/git-cola/git-cola-3.5-r1.ebuild
@@ -3,8 +3,9 @@
EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,8} )
DISTUTILS_SINGLE_IMPL=true
+DISTUTILS_USE_SETUPTOOLS=no
inherit distutils-r1 readme.gentoo-r1 virtualx xdg-utils
DESCRIPTION="The highly caffeinated git GUI"
@@ -37,6 +38,8 @@ BDEPEND="sys-devel/gettext
)
")"
+PATCHES=( "${FILESDIR}/${P}-py3.8-line-buffering.patch" )
+
python_prepare_all() {
# make sure that tests also use the system provided QtPy
rm -r qtpy || die
@@ -95,6 +98,9 @@ python_install_all() {
python_fix_shebang "${ED}/usr/share/git-cola/bin/git-xbase" "${ED}"/usr/bin/git-cola
python_optimize "${ED}/usr/share/git-cola/lib/cola"
+ # fix appdata installation
+ mv "${D}"/usr/share/appdata "${D}"/usr/share/metainfo || die "moving appdata failed"
+
use doc || HTML_DOCS=( "${FILESDIR}"/index.html )
distutils-r1_python_install_all
diff --git a/dev-vcs/git/Manifest b/dev-vcs/git/Manifest
index 5a6c99c2dcff..ed030678d083 100644
--- a/dev-vcs/git/Manifest
+++ b/dev-vcs/git/Manifest
@@ -18,6 +18,7 @@ DIST git-2.26.2.tar.xz 6007864 BLAKE2B efce003a95e24dbb6e14feebd35874c9ed1a5c06d
DIST git-2.27.0.tar.xz 6074636 BLAKE2B 72c992ee35a50cdeb2363f04edfab65358216b8415f31f217b6e837d1f7bc28b90e49850006596a8f5f1932fd3011c4253df287d445dca58e335d2f6e7bab8c2 SHA512 8ddea44503db7caf1f6080e64555541aa64a7b8761fd6541965ee244d9c4a47befccda1a239f11d86c2ad0ff24923d084f65712f5f2d6cfa178573e3471c6c33
DIST git-2.28.0.tar.xz 6117608 BLAKE2B 81c834dfda5b8e3065d098e411eb2408a1e7ccfde9c447a4164c131c9c2c32dcfd888980bcd180952435c05976a4fa18c155830432170deff70aa1aa2989cd2a SHA512 a6159c0a15e3c5f9603157d4010664a6d74e7d65b9fe97a03b36fac12607248ed57980d96565841e88eae343001c167222232737d3af812608c8db011941df1a
DIST git-2.29.2.tar.xz 6187988 BLAKE2B 15c2446a266d7cc3032e4b3bd32f57a2c2ff3d377848f307225ea585883c993ed835c8ffe02202386360b94f5a1f4bd3124322f0034c0d65ed15aa28b7e45ffa SHA512 34117628c6d43ac0940c43bffaa1bda7f12af863728f391492725a3e57d1bbda523cf7734e90f463fe9a9ae4e70fc1cc2523643dbb3c27377d98dc4736b0ea62
+DIST git-2.30.0.rc0.tar.xz 6223120 BLAKE2B c0f376d114970c307742c2bb613dc38230db683b9d3eb34803527cb333b78ecf2f2f04d3829c0286b9fdeac477f8ebcf7fb80457215bcafa7d1382578fcc7511 SHA512 aecfa17571ec718e9f8892f6d5ba059451e44ac00f4e39f0d8fef51b9c27e885eff2711e3fc2ebfbb0bc0815370fa0a13b8e9243b60d6cf7cb1278e406cb743f
DIST git-htmldocs-2.23.3.tar.xz 1295344 BLAKE2B 7a6d8198cf8285717f11731ea907ea06786c486701a729d071deedc5437a595dab355ae2d0ac2814b10503ab4161e76a1245663a9ce35ce48d03be9905315db3 SHA512 2c86c03f29f1a4fc2acb17a17a9e1a3df2ec95138895f5c8e776859772ebc7b95c24af0e328508ccf1ea85b7adaa86a9aedc4d0c353ffc91ad5810ecc9a48059
DIST git-htmldocs-2.24.3.tar.xz 1307828 BLAKE2B 5d6dda03e2c51346326a1258a14a0ee16fab7fe83c80b4a1a0b307a6343db851d89b96afcf616e10ad5831352a90332ac602e5713444855327e11be8992a5274 SHA512 14289fb46cff48bece0cdafea9ef201facdb58eafce4b735ce50489356deb993c481ac1b6e96a2f98cfe30434280997c47f2cca0bdb2b6e85c31cb7cf17cc257
DIST git-htmldocs-2.25.4.tar.xz 1296896 BLAKE2B 4f6469acdcd699698bd1f19bd0d911fd522c1890115f25c087a7870b855eb9354340fe17e9e6aaec7fb27cd951fe28cadbf26e1aeadc76f3c3a1cde4d23e42cd SHA512 e10c6fa52e213a2b18290fed375f6e176eef17b0a19f6906f09d6228d18bece88ff0ec97d871db0ba29fc0fbff73740312ab01eab809bd6a9a41c8b295cf8d67
@@ -25,6 +26,7 @@ DIST git-htmldocs-2.26.2.tar.xz 1304788 BLAKE2B e0de88c5c41646d5fb9b54e2ee873c79
DIST git-htmldocs-2.27.0.tar.xz 1325820 BLAKE2B a86cb62b6e42e451201a69e92c897566a78ed4965a98ef7b09f7c4674f60a334357ea8834ec5d97764f5f7e8fe580b8ac3af4da588b72a0e01f065adcd019aec SHA512 6af974ea6c8458f72c5fc7a372611e0153b705a85092a5fe37587a3165368712e077f582ce4085538f48df925d60898b96c32275182b7ef034711ab53e7ab811
DIST git-htmldocs-2.28.0.tar.xz 1347596 BLAKE2B 9c447f951cc31eb306841d12a94aefd3bb9699f374f2919f7eed0789f6b49cd54df74ecddaa1475203a5dca33140787f53272774f71ccbb48e5da5f1ab6bfbde SHA512 bbe7a7c221d1bb8d9852d5210a80b3d60c5b66f159591971abb2d9a08570cb7bf85686c7eba8cf37e04d37d63702906b308692a68c05fdbd0e3f3d60322003f0
DIST git-htmldocs-2.29.2.tar.xz 1364856 BLAKE2B 76498ef5bfdc058ad1e7c3b2c0c5ba715fa2682c7429db837cfeb7abe64ae3561e8b3f2dc032dd193514778271a040b1b120071d12ae5082a415db5084c7b6aa SHA512 d7223160af9bc97201bff59b94c8c09d331cdb9f979c878698230bb579b3f4751b6a455d8413ce09a507799744d7e3c77a2ad4d265386de7ef3ba9e11fb20445
+DIST git-htmldocs-2.30.0.rc0.tar.xz 1340368 BLAKE2B 7db7f4ec396351c36ada8189e37dadb736015c8e4d3c327d6805a8ad812430093dfadf99c84c6cc64f85e130971e2eb2480e3926bb6ae6acc840b11c811cfae6 SHA512 5154ddbf8b744f035b2ac2eb0f19d982e04a45f95fe7f19cdc10cadaf1a989b33bc23af8e16459767474a7a2184397115b1a7bca500b5b6ff293bc20579c884b
DIST git-manpages-2.23.3.tar.xz 449464 BLAKE2B bfc0153e43724df7210110e836d47f17258e45a876aa9bf4604c3f38e690e0e5379d4394df96c3dd84ea4d7371b7843729e6fb5d4b43fd7d4a9b4c3f4062a922 SHA512 a7b5fc48a5b840eb9b668b441ad3c30f65adc73c22cda461ffaca1cfddf154bf1974cab6c372b4534fd45a43a2e2ab96513364845a7db4285b88e31bf7619f8e
DIST git-manpages-2.24.3.tar.xz 454796 BLAKE2B b340b33593e596a7a87385110fea53a96b68f0b0c5c02e046a1aff5ff7c7a6bf3d7a55c4d33796db8e84824df72451ad51db9fc44df4840ecd0183c0ef49eba0 SHA512 22709e159196da27befc26eef3ab40dab9700c95abf6892860a81c8e5df7d85ad423c877e6c88949cfc611c4dfebd956f02a78f0340c1cd4d58c48f80e3e1cce
DIST git-manpages-2.25.4.tar.xz 459344 BLAKE2B b0ac88f691984f39f6cfbf41d2d61ab443573974277536641daddf0e9b7755ea9cb6bc96ecf3c14479809036171e461eff72cb498c63a56eea041341b8a65af5 SHA512 a67b881f289d5b3e2187ad55c5176258c30108c73fc7c18d50c1a6b42b241ce46dba28acf2f7bfc994b044444a6678096a35ad60936ea6cba07b52ddf647da17
@@ -32,6 +34,7 @@ DIST git-manpages-2.26.2.tar.xz 462052 BLAKE2B 27fc44360c9f890e9f7754e8423f55965
DIST git-manpages-2.27.0.tar.xz 470724 BLAKE2B 83db9c5aaf9ada63d4e6146ffa4f20f1d21797ba7c7b27ade9d6f4dedb1091591b8afe4f368a4433cf75d2b148d68cec725f5504504c703eb7c22916d17b8069 SHA512 a4ceb7b86d67d15a52fec22e9bac5c8b1a5447041c3278710c2e24f70d6d443853d6a6ec5eb5ab7633390c5fa2494dd495096c26a6467d9cb13d9da007a73d12
DIST git-manpages-2.28.0.tar.xz 472524 BLAKE2B 84752bee094eb879be8905dd561593e9f2a71d91971be7be83ed421bdeef83f7165f9506297bf23127a46a1d05c718999dab6b3ac3bda0ce0fba95ca64145de8 SHA512 ba4d41c2c2efd1eb5ab8ccf00efcebbc2fbbd31ab325da66b05181d15f677c2fc97c9eefd58c3b1c75a07276b399214f398df8d084c1a5092f982ce392876a2f
DIST git-manpages-2.29.2.tar.xz 478516 BLAKE2B d9a9840a8c869e2f7f9dade12c780032a7eeff59314b4d45c8c65e3f076e0335f0674c484fe7cebbc70d13b51a17b5fcf69b1bd51dca7ff226d76b1fed33d8bf SHA512 f2af31f8b2242961a0633258dd4668dbf21b26eff440e302608bc5bee2ed45a3e573528cdd0f11503d0ac4745e03cb457d99f5529fc96c105ce441ece07e4fe8
+DIST git-manpages-2.30.0.rc0.tar.xz 481784 BLAKE2B 990e597e6c9fb772c7e7a4b81230b7e5b737ecdba4759afbaf1ec9a3ec9963a05cab99f23a24d73c1412a9ff8d7ef4e6fb9d0b72c0d2450c8beac4834c998b59 SHA512 c53756f6c6bfd81ba72290516a8c9751fe946baa1937ff2f24784953c7a22e8e629c27093b45dc8219f77868b9f33fe90495ae8e5f6631c6a14c5ae7a2e018c7
EBUILD git-2.23.3.ebuild 19572 BLAKE2B 5841475703086587bb399d8c7f7298b9a3da33184fe7a9f060a8d286a8392014bc6133aa4ed4d727f0d7c37915d900d7d760ad994909da32061152bfe5f9bf2f SHA512 5ef0dcfd745b800a27fbbe8186c3050fc11dfac243bdb54e590d45f50a24645204b9eb5747ef3e2a0ed8b760aa3a38c7bad66357e900b4ed151a100d0e8dca3d
EBUILD git-2.24.3.ebuild 19520 BLAKE2B 8d0545fe4531bcc09138641ae52c5840a30ea884194bd3106957447988869bd3c3d1e343285d6f2c49374bd06532e462613f3016b6bfccfe2172a6713be51b53 SHA512 e017844d87dee555355ddc45f25bdff34d75a1f3a3d49e5f214aead8fbbd0316f0f39abe1afcca919c7b83ff226c00fb4524dd900983a9c7811d0d167d946673
EBUILD git-2.25.4.ebuild 19520 BLAKE2B 8d0545fe4531bcc09138641ae52c5840a30ea884194bd3106957447988869bd3c3d1e343285d6f2c49374bd06532e462613f3016b6bfccfe2172a6713be51b53 SHA512 e017844d87dee555355ddc45f25bdff34d75a1f3a3d49e5f214aead8fbbd0316f0f39abe1afcca919c7b83ff226c00fb4524dd900983a9c7811d0d167d946673
@@ -39,6 +42,7 @@ EBUILD git-2.26.2.ebuild 19520 BLAKE2B 8d0545fe4531bcc09138641ae52c5840a30ea8841
EBUILD git-2.27.0.ebuild 19529 BLAKE2B 72e4fcd7d3f80fb563d5f9621066e73ce939beabcf74833557e513aeb10fe6bdff1ca8b853893d8b9988c813d81693132faf0928b0785f9a7ab44f8c2af72aec SHA512 acb6319405d397c136faca7456dca8234291761aa21a7388aa068977a32a47b000821ed7c0d19e467c8298ae0ec42a092df3e9e19d5c79e989a340b1377ff9e0
EBUILD git-2.28.0.ebuild 19529 BLAKE2B 72e4fcd7d3f80fb563d5f9621066e73ce939beabcf74833557e513aeb10fe6bdff1ca8b853893d8b9988c813d81693132faf0928b0785f9a7ab44f8c2af72aec SHA512 acb6319405d397c136faca7456dca8234291761aa21a7388aa068977a32a47b000821ed7c0d19e467c8298ae0ec42a092df3e9e19d5c79e989a340b1377ff9e0
EBUILD git-2.29.2.ebuild 18586 BLAKE2B 70fa03b3858a96196db9a8eb6c5f294bf3d432d87103d0b57e93b694f890234c506aa338b6c4a97b5d23463941c8469564690540141bdb390db9c5fa0fb10fb5 SHA512 896572e27cc03d35312d3dc9010e199b44fd9f6a00799f0ff99e1723b9c95380be27bb691f3270d3969a3daf76ca8ff6e3b24ddd24a14b0d0c069ba5330f641e
+EBUILD git-2.30.0_rc0.ebuild 18586 BLAKE2B 70fa03b3858a96196db9a8eb6c5f294bf3d432d87103d0b57e93b694f890234c506aa338b6c4a97b5d23463941c8469564690540141bdb390db9c5fa0fb10fb5 SHA512 896572e27cc03d35312d3dc9010e199b44fd9f6a00799f0ff99e1723b9c95380be27bb691f3270d3969a3daf76ca8ff6e3b24ddd24a14b0d0c069ba5330f641e
EBUILD git-9999-r1.ebuild 18556 BLAKE2B 13da7097172b5614876866bf15bcc9f428ab52bb16ce068f2f7012a498b1c36ce5823e933aed58e296489949a7c6442a5a4fe0c081c21c521f2c37570e432043 SHA512 d918d1c13b20020a1857939dab0d45aa3eb350527d2471d021bcb939227494a0a011e57da85ce84192064f2659c668eae229d51e286c00047825e27429673f8b
EBUILD git-9999-r2.ebuild 18556 BLAKE2B 13da7097172b5614876866bf15bcc9f428ab52bb16ce068f2f7012a498b1c36ce5823e933aed58e296489949a7c6442a5a4fe0c081c21c521f2c37570e432043 SHA512 d918d1c13b20020a1857939dab0d45aa3eb350527d2471d021bcb939227494a0a011e57da85ce84192064f2659c668eae229d51e286c00047825e27429673f8b
EBUILD git-9999-r3.ebuild 18586 BLAKE2B 70fa03b3858a96196db9a8eb6c5f294bf3d432d87103d0b57e93b694f890234c506aa338b6c4a97b5d23463941c8469564690540141bdb390db9c5fa0fb10fb5 SHA512 896572e27cc03d35312d3dc9010e199b44fd9f6a00799f0ff99e1723b9c95380be27bb691f3270d3969a3daf76ca8ff6e3b24ddd24a14b0d0c069ba5330f641e
diff --git a/dev-vcs/git/git-2.30.0_rc0.ebuild b/dev-vcs/git/git-2.30.0_rc0.ebuild
new file mode 100644
index 000000000000..ce04e5f8d0eb
--- /dev/null
+++ b/dev-vcs/git/git-2.30.0_rc0.ebuild
@@ -0,0 +1,693 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+GENTOO_DEPEND_ON_PERL=no
+
+# bug #329479: git-remote-testgit is not multiple-version aware
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit toolchain-funcs elisp-common l10n perl-module bash-completion-r1 python-single-r1 systemd
+
+PLOCALES="bg ca de es fr is it ko pt_PT ru sv vi zh_CN"
+if [[ ${PV} == *9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
+ # Please ensure that all _four_ 9999 ebuilds get updated; they track the 4 upstream branches.
+ # See https://git-scm.com/docs/gitworkflows#_graduation
+ # In order of stability:
+ # 9999-r0: maint
+ # 9999-r1: master
+ # 9999-r2: next
+ # 9999-r3: pu
+ case "${PVR}" in
+ 9999) EGIT_BRANCH=maint ;;
+ 9999-r1) EGIT_BRANCH=master ;;
+ 9999-r2) EGIT_BRANCH=next;;
+ 9999-r3) EGIT_BRANCH=pu ;;
+ esac
+fi
+
+MY_PV="${PV/_rc/.rc}"
+MY_P="${PN}-${MY_PV}"
+
+DOC_VER="${MY_PV}"
+
+DESCRIPTION="stupid content tracker: distributed VCS designed for speed and efficiency"
+HOMEPAGE="https://www.git-scm.com/"
+if [[ ${PV} != *9999 ]]; then
+ SRC_URI_SUFFIX="xz"
+ SRC_URI_KORG="https://www.kernel.org/pub/software/scm/git"
+ [[ "${PV/rc}" != "${PV}" ]] && SRC_URI_KORG+='/testing'
+ SRC_URI="${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}
+ ${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+ doc? (
+ ${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+ )"
+ [[ "${PV}" == *_rc* ]] || \
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit perforce +perl +ppcsha1 subversion tk +threads +webdav xinetd cvs test"
+
+# Common to both DEPEND and RDEPEND
+DEPEND="
+ gnome-keyring? ( app-crypt/libsecret )
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl:= )
+ sys-libs/zlib
+ pcre? (
+ pcre-jit? ( dev-libs/libpcre2[jit(+)] )
+ !pcre-jit? ( dev-libs/libpcre )
+ )
+ perl? ( dev-lang/perl:=[-build(-)] )
+ tk? ( dev-lang/tk:0= )
+ curl? (
+ net-misc/curl
+ webdav? ( dev-libs/expat )
+ )
+ emacs? ( >=app-editors/emacs-23.1:* )
+ iconv? ( virtual/libiconv )
+"
+
+RDEPEND="${DEPEND}
+ gpg? ( app-crypt/gnupg )
+ perl? (
+ dev-perl/Error
+ dev-perl/MailTools
+ dev-perl/Authen-SASL
+ >=virtual/perl-libnet-3.110.0-r4[ssl]
+ cgi? (
+ dev-perl/CGI
+ highlight? ( app-text/highlight )
+ )
+ cvs? (
+ >=dev-vcs/cvsps-2.1:0
+ dev-perl/DBI
+ dev-perl/DBD-SQLite
+ )
+ mediawiki? (
+ dev-perl/DateTime-Format-ISO8601
+ dev-perl/HTML-Tree
+ dev-perl/MediaWiki-API
+ )
+ subversion? (
+ dev-vcs/subversion[-dso(-),perl]
+ dev-perl/libwww-perl
+ dev-perl/TermReadKey
+ )
+ )
+ perforce? ( ${PYTHON_DEPS} )
+"
+
+# This is how info docs are created with Git:
+# .txt/asciidoc --(asciidoc)---------> .xml/docbook
+# .xml/docbook --(docbook2texi.pl)--> .texi
+# .texi --(makeinfo)---------> .info
+BDEPEND="
+ doc? (
+ app-text/asciidoc
+ app-text/docbook2X
+ app-text/xmlto
+ sys-apps/texinfo
+ )
+ nls? ( sys-devel/gettext )
+ test? ( app-crypt/gnupg )
+"
+
+# Live ebuild builds man pages and HTML docs, additionally
+if [[ ${PV} == *9999 ]]; then
+ BDEPEND="${BDEPEND}
+ app-text/asciidoc"
+fi
+
+SITEFILE="50${PN}-gentoo.el"
+S="${WORKDIR}/${MY_P}"
+
+REQUIRED_USE="
+ cgi? ( perl )
+ cvs? ( perl )
+ mediawiki? ( perl )
+ mediawiki-experimental? ( mediawiki )
+ pcre-jit? ( pcre )
+ perforce? ( ${PYTHON_REQUIRED_USE} )
+ subversion? ( perl )
+ webdav? ( curl )
+"
+
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+ # bug #350330 - automagic CVS when we don't want it is bad.
+ "${FILESDIR}"/git-2.22.0_rc0-optional-cvs.patch
+
+ # Make submodule output quiet
+ "${FILESDIR}"/git-2.21.0-quiet-submodules-testcase.patch
+)
+
+pkg_setup() {
+ if use subversion && has_version "dev-vcs/subversion[dso]" ; then
+ ewarn "Per Gentoo bugs #223747, #238586, when subversion is built"
+ ewarn "with USE=dso, there may be weird crashes in git-svn. You"
+ ewarn "have been warned."
+ fi
+
+ if use perforce ; then
+ python-single-r1_pkg_setup
+ fi
+}
+
+# This is needed because for some obscure reasons future calls to make don't
+# pick up these exports if we export them in src_unpack()
+exportmakeopts() {
+ local extlibs myopts
+
+ myopts=(
+ ASCIIDOC_NO_ROFF=YesPlease
+ $(usex cvs '' NO_CVS=YesPlease)
+ $(usex elibc_musl NO_REGEX=YesPlease '')
+ $(usex iconv '' NO_ICONV=YesPlease)
+ $(usex nls '' NO_GETTEXT=YesPlease)
+ $(usex perl 'INSTALLDIRS=vendor NO_PERL_CPAN_FALLBACKS=YesPlease' NO_PERL=YesPlease)
+ $(usex perforce '' NO_PYTHON=YesPlease)
+ $(usex subversion '' NO_SVN_TESTS=YesPlease)
+ $(usex threads '' NO_PTHREADS=YesPlease)
+ $(usex tk '' NO_TCLTK=YesPlease)
+ )
+
+ if use blksha1 ; then
+ myopts+=( BLK_SHA1=YesPlease )
+ elif use ppcsha1 ; then
+ myopts+=( PPC_SHA1=YesPlease )
+ fi
+
+ if use curl ; then
+ use webdav || myopts+=( NO_EXPAT=YesPlease )
+ else
+ myopts+=( NO_CURL=YesPlease )
+ fi
+
+ # broken assumptions, because of static build system ...
+ myopts+=(
+ NO_FINK=YesPlease
+ NO_DARWIN_PORTS=YesPlease
+ INSTALL=install
+ TAR=tar
+ SHELL_PATH="${EPREFIX}/bin/sh"
+ SANE_TOOL_PATH=
+ OLD_ICONV=
+ NO_EXTERNAL_GREP=
+ )
+
+ # can't define this to null, since the entire makefile depends on it
+ sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile || die
+
+ if use pcre; then
+ if use pcre-jit; then
+ myopts+=( USE_LIBPCRE2=YesPlease )
+ extlibs+=( -lpcre2-8 )
+ else
+ myopts+=(
+ USE_LIBPCRE1=YesPlease
+ NO_LIBPCRE1_JIT=YesPlease
+ )
+ extlibs+=( -lpcre )
+ fi
+ fi
+# Disabled until ~m68k-mint can be keyworded again
+# if [[ ${CHOST} == *-mint* ]] ; then
+# myopts+=(
+# NO_MMAP=YesPlease
+# NO_IPV6=YesPlease
+# NO_STRLCPY=YesPlease
+# NO_MEMMEM=YesPlease
+# NO_MKDTEMP=YesPlease
+# NO_MKSTEMPS=YesPlease
+# )
+# fi
+ if [[ ${CHOST} == ia64-*-hpux* ]]; then
+ myopts+=( NO_NSEC=YesPlease )
+ fi
+ if [[ ${CHOST} == *-*-aix* ]]; then
+ myopts+=( NO_FNMATCH_CASEFOLD=YesPlease )
+ fi
+ if [[ ${CHOST} == *-solaris* ]]; then
+ myopts+=(
+ NEEDS_LIBICONV=YesPlease
+ HAVE_CLOCK_MONOTONIC=1
+ )
+ if grep -q getdelim "${EROOT}"/usr/include/stdio.h ; then
+ myopts+=( HAVE_GETDELIM=1 )
+ fi
+ fi
+
+ if has_version '>=app-text/asciidoc-8.0' ; then
+ myopts+=( ASCIIDOC8=YesPlease )
+ fi
+
+ # Bug 290465:
+ # builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim'
+ if [[ "${CHOST}" == *-uclibc* ]] ; then
+ myopts+=( NO_NSEC=YesPlease )
+ use iconv && myopts+=( NEEDS_LIBICONV=YesPlease )
+ fi
+
+ export MY_MAKEOPTS="${myopts[@]}"
+ export EXTLIBS="${extlibs[@]}"
+}
+
+src_unpack() {
+ if [[ ${PV} != *9999 ]]; then
+ unpack ${MY_P}.tar.${SRC_URI_SUFFIX}
+ cd "${S}" || die
+ unpack ${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+ if use doc ; then
+ pushd "${S}"/Documentation &>/dev/null || die
+ unpack ${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+ popd &>/dev/null || die
+ fi
+ else
+ git-r3_src_unpack
+ #cp "${FILESDIR}"/GIT-VERSION-GEN .
+ fi
+
+}
+
+src_prepare() {
+ # add experimental patches to improve mediawiki support
+ # see patches for origin
+ if use mediawiki-experimental ; then
+ PATCHES+=(
+ "${FILESDIR}"/git-2.7.0-mediawiki-namespaces.patch
+ "${FILESDIR}"/git-2.7.0-mediawiki-subpages.patch
+ "${FILESDIR}"/git-2.7.0-mediawiki-500pages.patch
+ )
+ fi
+
+ default
+
+ sed -i \
+ -e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \
+ -e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \
+ -e 's:^\(CC[[:space:]]* =\).*$:\1$(OPTCC):' \
+ -e 's:^\(AR[[:space:]]* =\).*$:\1$(OPTAR):' \
+ -e "s:\(PYTHON_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
+ -e "s:\(PERL_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
+ Makefile || die
+
+ # Fix docbook2texi command
+ sed -r -i 's/DOCBOOK2X_TEXI[[:space:]]*=[[:space:]]*docbook2x-texi/DOCBOOK2X_TEXI = docbook2texi.pl/' \
+ Documentation/Makefile || die
+}
+
+git_emake() {
+ # bug #320647: PYTHON_PATH
+ local PYTHON_PATH=""
+ use perforce && PYTHON_PATH="${PYTHON}"
+ emake ${MY_MAKEOPTS} \
+ prefix="${EPREFIX}"/usr \
+ htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
+ perllibdir="$(use perl && perl_get_raw_vendorlib)" \
+ sysconfdir="${EPREFIX}"/etc \
+ DESTDIR="${D}" \
+ GIT_TEST_OPTS="--no-color" \
+ OPTAR="$(tc-getAR)" \
+ OPTCC="$(tc-getCC)" \
+ OPTCFLAGS="${CFLAGS}" \
+ OPTLDFLAGS="${LDFLAGS}" \
+ PERL_PATH="${EPREFIX}/usr/bin/perl" \
+ PERL_MM_OPT="" \
+ PYTHON_PATH="${PYTHON_PATH}" \
+ V=1 \
+ "$@"
+}
+
+src_configure() {
+ exportmakeopts
+}
+
+src_compile() {
+ git_emake || die "emake failed"
+
+ if use emacs ; then
+ elisp-compile contrib/emacs/git{,-blame}.el
+ fi
+
+ if use perl && use cgi ; then
+ git_emake \
+ gitweb \
+ || die "emake gitweb (cgi) failed"
+ fi
+
+ if [[ ${CHOST} == *-darwin* && ! tc-is-gcc ]]; then
+ pushd contrib/credential/osxkeychain &>/dev/null || die
+ git_emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" \
+ || die "emake credential-osxkeychain"
+ popd &>/dev/null || die
+ fi
+
+ pushd Documentation &>/dev/null || die
+ if [[ ${PV} == *9999 ]] ; then
+ git_emake man \
+ || die "emake man failed"
+ if use doc ; then
+ git_emake info html \
+ || die "emake info html failed"
+ fi
+ else
+ if use doc ; then
+ git_emake info \
+ || die "emake info html failed"
+ fi
+ fi
+ popd &>/dev/null || die
+
+ if use gnome-keyring ; then
+ pushd contrib/credential/libsecret &>/dev/null || die
+ git_emake || die "emake git-credential-libsecret failed"
+ popd &>/dev/null || die
+ fi
+
+ pushd contrib/subtree &>/dev/null || die
+ git_emake git-subtree
+ # git-subtree.1 requires the full USE=doc dependency stack
+ use doc && git_emake git-subtree.html git-subtree.1
+ popd &>/dev/null || die
+
+ pushd contrib/diff-highlight &>/dev/null || die
+ git_emake
+ popd &>/dev/null || die
+
+ if use mediawiki ; then
+ pushd contrib/mw-to-git &>/dev/null || die
+ git_emake
+ popd &>/dev/null || die
+
+ fi
+}
+
+src_install() {
+ git_emake install || die "make install failed"
+
+ if [[ ${CHOST} == *-darwin* && ! tc-is-gcc ]]; then
+ dobin contrib/credential/osxkeychain/git-credential-osxkeychain
+ fi
+
+ # Depending on the tarball and manual rebuild of the documentation, the
+ # manpages may exist in either OR both of these directories.
+ find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157]
+ find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157]
+ dodoc README* Documentation/{SubmittingPatches,CodingGuidelines}
+ use doc && dodir /usr/share/doc/${PF}/html
+ local d
+ for d in / /howto/ /technical/ ; do
+ docinto ${d}
+ dodoc Documentation${d}*.txt
+ if use doc ; then
+ docinto ${d}/html
+ dodoc Documentation${d}*.html
+ fi
+ done
+ docinto /
+ # Upstream does not ship this pre-built :-(
+ use doc && doinfo Documentation/{git,gitman}.info
+
+ newbashcomp contrib/completion/git-completion.bash ${PN}
+ bashcomp_alias git gitk
+ # Not really a bash-completion file (bug #477920)
+ # but still needed uncompressed (bug #507480)
+ insinto /usr/share/${PN}
+ doins contrib/completion/git-prompt.sh
+
+ if use emacs ; then
+ elisp-install ${PN} contrib/emacs/git.{el,elc}
+ elisp-install ${PN} contrib/emacs/git-blame.{el,elc}
+ #elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc}
+ # don't add automatically to the load-path, so the sitefile
+ # can do a conditional loading
+ touch "${ED}${SITELISP}/${PN}/compat/.nosearch"
+ elisp-site-file-install "${FILESDIR}"/${SITEFILE}
+ fi
+
+ #dobin contrib/fast-import/git-p4 # Moved upstream
+ #dodoc contrib/fast-import/git-p4.txt # Moved upstream
+ newbin contrib/fast-import/import-tars.perl import-tars
+ exeinto /usr/libexec/git-core/
+ newexe contrib/git-resurrect.sh git-resurrect
+
+ # git-subtree
+ pushd contrib/subtree &>/dev/null || die
+ git_emake install || die "Failed to emake install for git-subtree"
+ if use doc ; then
+ # Do not move git subtree install-man outside USE=doc!
+ git_emake install-man install-html || die "Failed to emake install-html install-man for git-subtree"
+ fi
+ newdoc README README.git-subtree
+ dodoc git-subtree.txt
+ popd &>/dev/null || die
+
+ if use mediawiki ; then
+ pushd contrib/mw-to-git &>/dev/null || die
+ git_emake install
+ popd &>/dev/null || die
+ fi
+
+ # diff-highlight
+ dobin contrib/diff-highlight/diff-highlight
+ newdoc contrib/diff-highlight/README README.diff-highlight
+
+ # git-jump
+ exeinto /usr/libexec/git-core/
+ doexe contrib/git-jump/git-jump
+ newdoc contrib/git-jump/README git-jump.txt
+
+ # git-contacts
+ exeinto /usr/libexec/git-core/
+ doexe contrib/contacts/git-contacts
+ dodoc contrib/contacts/git-contacts.txt
+
+ if use gnome-keyring ; then
+ pushd contrib/credential/libsecret &>/dev/null || die
+ dobin git-credential-libsecret
+ popd &>/dev/null || die
+ fi
+
+ dodir /usr/share/${PN}/contrib
+ # The following are excluded:
+ # completion - installed above
+ # diff-highlight - done above
+ # emacs - installed above
+ # examples - these are stuff that is not used in Git anymore actually
+ # git-jump - done above
+ # gitview - installed above
+ # p4import - excluded because fast-import has a better one
+ # patches - stuff the Git guys made to go upstream to other places
+ # persistent-https - TODO
+ # mw-to-git - TODO
+ # subtree - build seperately
+ # svnimport - use git-svn
+ # thunderbird-patch-inline - fixes thunderbird
+ local contrib_objects=(
+ buildsystems
+ fast-import
+ hg-to-git
+ hooks
+ remotes2config.sh
+ rerere-train.sh
+ stats
+ workdir
+ )
+ local i
+ for i in "${contrib_objects[@]}" ; do
+ cp -rf \
+ "${S}"/contrib/${i} \
+ "${ED}"/usr/share/${PN}/contrib \
+ || die "Failed contrib ${i}"
+ done
+
+ if use perl && use cgi ; then
+ # We used to install in /usr/share/${PN}/gitweb
+ # but upstream installs in /usr/share/gitweb
+ # so we will install a symlink and use their location for compat with other
+ # distros
+ dosym ../gitweb /usr/share/${PN}/gitweb
+
+ # INSTALL discusses configuration issues, not just installation
+ docinto /
+ newdoc "${S}"/gitweb/INSTALL INSTALL.gitweb
+ newdoc "${S}"/gitweb/README README.gitweb
+
+ for d in "${ED}"/usr/lib{,64}/perl5/ ; do
+ if test -d "${d}" ; then find "${d}" \
+ -name .packlist \
+ -delete || die
+ fi
+ done
+ else
+ rm -rf "${ED}"/usr/share/gitweb
+ fi
+
+ if ! use subversion ; then
+ rm -f "${ED}"/usr/libexec/git-core/git-svn \
+ "${ED}"/usr/share/man/man1/git-svn.1*
+ fi
+
+ if use xinetd ; then
+ insinto /etc/xinetd.d
+ newins "${FILESDIR}"/git-daemon.xinetd git-daemon
+ fi
+
+ if use !prefix ; then
+ newinitd "${FILESDIR}"/git-daemon-r1.initd git-daemon
+ newconfd "${FILESDIR}"/git-daemon.confd git-daemon
+ systemd_newunit "${FILESDIR}/git-daemon_at-r1.service" "git-daemon@.service"
+ systemd_dounit "${FILESDIR}/git-daemon.socket"
+ fi
+
+ perl_delete_localpod
+
+ # Remove disabled linguas
+ # we could remove sources in src_prepare, but install does not
+ # handle missing locale dir well
+ rm_loc() {
+ if [[ -e "${ED}/usr/share/locale/${1}" ]]; then
+ rm -r "${ED}/usr/share/locale/${1}" || die
+ fi
+ }
+ l10n_for_each_disabled_locale_do rm_loc
+}
+
+src_test() {
+ local disabled=()
+ local tests_cvs=(
+ t9200-git-cvsexportcommit.sh
+ t9400-git-cvsserver-server.sh
+ t9401-git-cvsserver-crlf.sh
+ t9402-git-cvsserver-refs.sh
+ t9600-cvsimport.sh
+ t9601-cvsimport-vendor-branch.sh
+ t9602-cvsimport-branches-tags.sh
+ t9603-cvsimport-patchsets.sh
+ t9604-cvsimport-timestamps.sh
+ )
+ local tests_perl=(
+ t3701-add-interactive.sh
+ t5502-quickfetch.sh
+ t5512-ls-remote.sh
+ t5520-pull.sh
+ t7106-reset-unborn-branch.sh
+ t7501-commit.sh
+ )
+ # Bug #225601 - t0004 is not suitable for root perm
+ # Bug #219839 - t1004 is not suitable for root perm
+ # t0001-init.sh - check for init notices EPERM* fails
+ local tests_nonroot=(
+ t0001-init.sh
+ t0004-unwritable.sh
+ t0070-fundamental.sh
+ t1004-read-tree-m-u-wf.sh
+ t3700-add.sh
+ t7300-clean.sh
+ )
+ # t9100 still fails with symlinks in SVN 1.7
+ local test_svn=( t9100-git-svn-basic.sh )
+
+ # Unzip is used only for the testcase code, not by any normal parts of Git.
+ if ! has_version app-arch/unzip ; then
+ einfo "Disabling tar-tree tests"
+ disabled+=( t5000-tar-tree.sh )
+ fi
+
+ local cvs=0
+ use cvs && let cvs=${cvs}+1
+ if [[ ${EUID} -eq 0 ]]; then
+ if [[ ${cvs} -eq 1 ]]; then
+ ewarn "Skipping CVS tests because CVS does not work as root!"
+ ewarn "You should retest with FEATURES=userpriv!"
+ disabled+=( ${tests_cvs[@]} )
+ fi
+ einfo "Skipping other tests that require being non-root"
+ disabled+=( ${tests_nonroot[@]} )
+ else
+ [[ ${cvs} -gt 0 ]] && \
+ has_version dev-vcs/cvs && \
+ let cvs=${cvs}+1
+ [[ ${cvs} -gt 1 ]] && \
+ has_version "dev-vcs/cvs[server]" && \
+ let cvs=${cvs}+1
+ if [[ ${cvs} -lt 3 ]]; then
+ einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])"
+ disabled+=( ${tests_cvs[@]} )
+ fi
+ fi
+
+ if ! use perl ; then
+ einfo "Disabling tests that need Perl"
+ disabled+=( ${tests_perl[@]} )
+ fi
+
+ einfo "Disabling tests that fail with SVN 1.7"
+ disabled+=( ${test_svn[@]} )
+
+ # Reset all previously disabled tests
+ pushd t &>/dev/null || die
+ local i
+ for i in *.sh.DISABLED ; do
+ [[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}"
+ done
+ einfo "Disabled tests:"
+ for i in ${disabled[@]} ; do
+ [[ -f "${i}" ]] && mv -f "${i}" "${i}.DISABLED" && einfo "Disabled ${i}"
+ done
+
+ # Avoid the test system removing the results because we want them ourselves
+ sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' \
+ -i Makefile || die
+
+ # Clean old results first, must always run
+ nonfatal git_emake clean
+ popd &>/dev/null || die
+
+ # Now run the tests, keep going if we hit an error, and don't terminate on
+ # failure
+ local rc
+ einfo "Start test run"
+ #MAKEOPTS=-j1
+ nonfatal git_emake --keep-going test
+ rc=$?
+
+ # Display nice results, now print the results
+ pushd t &>/dev/null || die
+ nonfatal git_emake aggregate-results
+
+ # And bail if there was a problem
+ [[ ${rc} -eq 0 ]] || die "tests failed. Please file a bug."
+}
+
+showpkgdeps() {
+ local pkg=$1
+ shift
+ elog " $(printf "%-17s:" ${pkg}) ${@}"
+}
+
+pkg_postinst() {
+ use emacs && elisp-site-regen
+ elog "Please read /usr/share/bash-completion/completions/git for Git bash command"
+ elog "completion."
+ elog "Please read /usr/share/git/git-prompt.sh for Git bash prompt"
+ elog "Note that the prompt bash code is now in that separate script"
+ elog "These additional scripts need some dependencies:"
+ echo
+ showpkgdeps git-quiltimport "dev-util/quilt"
+ showpkgdeps git-instaweb \
+ "|| ( www-servers/lighttpd www-servers/apache www-servers/nginx )"
+ echo
+ use mediawiki-experimental && ewarn "Using experimental git-mediawiki patches. The stability of cloned wiki filesystems is not guaranteed."
+}
+
+pkg_postrm() {
+ use emacs && elisp-site-regen
+}
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz
index a0b4de4a65c6..289a1af75340 100644
Binary files a/eclass/Manifest.gz and b/eclass/Manifest.gz differ
diff --git a/eclass/acct-group.eclass b/eclass/acct-group.eclass
index 19a378e0b061..6fabc530e2ea 100644
--- a/eclass/acct-group.eclass
+++ b/eclass/acct-group.eclass
@@ -31,6 +31,11 @@
# - RDEPEND if it is needed at install time (e.g. you 'fowners' files
# in pkg_preinst) or run time.
+# @VARIABLE: _ACCT_GROUP_ECLASS
+# @INTERNAL
+# @DESCRIPTION:
+# If null set to 1
+
if [[ -z ${_ACCT_GROUP_ECLASS} ]]; then
_ACCT_GROUP_ECLASS=1
diff --git a/eclass/acct-user.eclass b/eclass/acct-user.eclass
index 56a4e83e8bfc..3aa7a1cfe0f0 100644
--- a/eclass/acct-user.eclass
+++ b/eclass/acct-user.eclass
@@ -39,6 +39,11 @@
# - RDEPEND if it is needed at install time (e.g. you 'fowners' files
# in pkg_preinst) or run time.
+# @VARIABLE: _ACCT_USER_ECLASS
+# @INTERNAL
+# @DESCRIPTION:
+# If null set to 1
+
if [[ -z ${_ACCT_USER_ECLASS} ]]; then
_ACCT_USER_ECLASS=1
diff --git a/eclass/alternatives.eclass b/eclass/alternatives.eclass
index 6ee984458fd6..108a55af8112 100644
--- a/eclass/alternatives.eclass
+++ b/eclass/alternatives.eclass
@@ -74,14 +74,17 @@ alternatives_auto_makesym() {
alternatives_makesym ${SYMLINK} ${ALT}
}
+# @FUNCTION: alternatives_makesym
+# @USAGE: alternatives_makesym [alternative targets..]
+# @DESCRIPTION:
+# make sure it is in the prefix, allow it already to be in the prefix
+
alternatives_makesym() {
has "${EAPI:-0}" 0 1 2 && ! use prefix && EPREFIX=
local ALTERNATIVES=""
local SYMLINK=""
local alt pref
- # usage: alternatives_makesym [alternative targets..]
- # make sure it is in the prefix, allow it already to be in the prefix
SYMLINK=${EPREFIX}/${1#${EPREFIX}}
# this trick removes the trailing / from ${ROOT}
pref=${ROOT%/}
@@ -126,6 +129,7 @@ alternatives_makesym() {
# @FUNCTION: alernatives-pkg_postinst
# @DESCRIPTION:
# The alternatives pkg_postinst, this function will be exported
+
alternatives_pkg_postinst() {
if [ -n "${ALTERNATIVES}" -a -n "${SOURCE}" ]; then
alternatives_makesym ${SOURCE} ${ALTERNATIVES}
@@ -135,6 +139,7 @@ alternatives_pkg_postinst() {
# @FUNCTION: alternatives_pkg_postrm
# @DESCRIPTION:
# The alternatives pkg_postrm, this function will be exported
+
alternatives_pkg_postrm() {
if [ -n "${ALTERNATIVES}" -a -n "${SOURCE}" ]; then
alternatives_makesym ${SOURCE} ${ALTERNATIVES}
diff --git a/eclass/ant-tasks.eclass b/eclass/ant-tasks.eclass
index c882196e7758..a96222f8ff50 100644
--- a/eclass/ant-tasks.eclass
+++ b/eclass/ant-tasks.eclass
@@ -66,6 +66,7 @@ ANT_TASK_DEPNAME=${ANT_TASK_DEPNAME-${ANT_TASK_NAME}}
# @VARIABLE: ANT_TASK_PV
# @INTERNAL
+# @DESCRIPTION:
# Version of ant-core this task is intended to register and thus load with.
ANT_TASK_PV="${PV}"
diff --git a/eclass/apache-2.eclass b/eclass/apache-2.eclass
index 07f2cd6af875..40877e89b023 100644
--- a/eclass/apache-2.eclass
+++ b/eclass/apache-2.eclass
@@ -87,7 +87,12 @@ SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2
# This variable needs to be set in the ebuild and contains a list of available
# built-in modules
+# @VARIABLE: IUSE_MPMS
+# @DESCRIPTION:
+# Combine IUSE_MPMS_FORK and IUSE_MPMS_THREAD
+
IUSE_MPMS="${IUSE_MPMS_FORK} ${IUSE_MPMS_THREAD}"
+
IUSE="${IUSE} debug doc gdbm ldap libressl selinux ssl static suexec threads"
for module in ${IUSE_MODULES} ; do
diff --git a/eclass/apache-module.eclass b/eclass/apache-module.eclass
index ff97b6c70f3a..5e59410ba24a 100644
--- a/eclass/apache-module.eclass
+++ b/eclass/apache-module.eclass
@@ -95,7 +95,11 @@ inherit depend.apache
# INTERNAL FUNCTIONS
# ==============================================================================
+# @FUNCTION: apache_cd_dir
+# @INTERNAL
+# @DESCRIPTION:
# Internal function to construct the default ${APXS2_S} path if required.
+
apache_cd_dir() {
debug-print-function $FUNCNAME $*
@@ -113,7 +117,11 @@ apache_cd_dir() {
echo "${CD_DIR}"
}
+# @FUNCTION: apache_mod_file
+# @INTERNAL
+# @DESCRIPTION:
# Internal function to construct the default ${APACHE2_MOD_FILE} if required.
+
apache_mod_file() {
debug-print-function $FUNCNAME $*
@@ -123,9 +131,13 @@ apache_mod_file() {
echo "${MOD_FILE}"
}
+# @FUNCTION: apache_doc_magic
+# @INTERNAL
+# @DESCRIPTION:
# Internal function for picking out html files from ${DOCFILES}. It takes an
# optional first argument `html'; if the first argument is equals `html', only
# html files are returned, otherwise normal (non-html) docs are returned.
+
apache_doc_magic() {
debug-print-function $FUNCNAME $*
diff --git a/eclass/aspell-dict-r1.eclass b/eclass/aspell-dict-r1.eclass
index d633d991c5e5..d6b85565a10c 100644
--- a/eclass/aspell-dict-r1.eclass
+++ b/eclass/aspell-dict-r1.eclass
@@ -42,6 +42,11 @@ esac
EXPORT_FUNCTIONS src_configure src_install
+# @VARIABLE: _ASPELL_DICT_R1
+# @INTERNAL
+# @DESCRIPTION:
+# Please document me
+
if [[ ! ${_ASPELL_DICT_R1} ]]; then
# aspell packages have an idiosyncratic versioning scheme, that is
diff --git a/eclass/autotools-utils.eclass b/eclass/autotools-utils.eclass
index 3fcaa79f80ab..13d2f653a972 100644
--- a/eclass/autotools-utils.eclass
+++ b/eclass/autotools-utils.eclass
@@ -113,6 +113,11 @@ esac
# Note that dependencies are added for autoconf, automake and libtool only.
# If your package needs one of the external tools listed above, you need to add
# appropriate packages to DEPEND yourself.
+
+# @VARIABLE: AUTOTOOLS_AUTO_DEPEND
+# @DESCRIPTION:
+# Please document me
+
[[ ${AUTOTOOLS_AUTORECONF} ]] || : ${AUTOTOOLS_AUTO_DEPEND:=no}
# eutils for eqawarn, path_exists
@@ -192,6 +197,12 @@ EXPORT_FUNCTIONS src_prepare src_configure src_compile src_install src_test
# cases only.
# Determine using IN or OUT source build
+
+# @FUNCTION: _check_build_dir
+# @INTERNAL
+# @DESCRIPTION:
+# Please document me
+
_check_build_dir() {
: ${ECONF_SOURCE:=${S}}
# Respect both the old variable and the new one, depending
diff --git a/eclass/autotools.eclass b/eclass/autotools.eclass
index d7ce23bfdf35..12c8e899d19f 100644
--- a/eclass/autotools.eclass
+++ b/eclass/autotools.eclass
@@ -23,6 +23,11 @@ if [[ ${__AUTOTOOLS_AUTO_DEPEND+set} == "set" ]] ; then
fi
fi
+# @ECLASS-VARIABLE: _AUTOTOOLS_ECLASS
+# @INTERNAL
+# @DESCRIPTION:
+# Please document
+
if [[ -z ${_AUTOTOOLS_ECLASS} ]]; then
_AUTOTOOLS_ECLASS=1
@@ -99,6 +104,11 @@ if [[ -n ${WANT_AUTOCONF} ]] ; then
export WANT_AUTOCONF
fi
+# @ECLASS-VARIABLE: _libtool_atom
+# @INTERNAL
+# @DESCRIPTION:
+# Set libtool ${P}
+
_libtool_atom=">=sys-devel/libtool-2.4"
if [[ -n ${WANT_LIBTOOL} ]] ; then
case ${WANT_LIBTOOL} in
@@ -109,6 +119,10 @@ if [[ -n ${WANT_LIBTOOL} ]] ; then
export WANT_LIBTOOL
fi
+# @ECLASS-VARIABLE: AUTOTOOLS_DEPEND
+# @DESCRIPTION:
+# Set DEPEND
+
AUTOTOOLS_DEPEND="${_automake_atom}
${_autoconf_atom}
${_libtool_atom}"
@@ -119,6 +133,7 @@ RDEPEND=""
# Set to 'no' to disable automatically adding to DEPEND. This lets
# ebuilds form conditional depends by using ${AUTOTOOLS_DEPEND} in
# their own DEPEND string.
+
: ${AUTOTOOLS_AUTO_DEPEND:=yes}
if [[ ${AUTOTOOLS_AUTO_DEPEND} != "no" ]] ; then
case ${EAPI:-0} in
@@ -126,6 +141,12 @@ if [[ ${AUTOTOOLS_AUTO_DEPEND} != "no" ]] ; then
7) BDEPEND=${AUTOTOOLS_DEPEND} ;;
esac
fi
+
+# @ECLASS-VARIABLE: __AUTOTOOLS_AUTO_DEPEND
+# @INTERNAL
+# @DESCRIPTION:
+# Set internal variable
+
__AUTOTOOLS_AUTO_DEPEND=${AUTOTOOLS_AUTO_DEPEND} # See top of eclass
unset _automake_atom _autoconf_atom
@@ -251,6 +272,7 @@ eautoreconf() {
# @FUNCTION: _at_uses_pkg
# @USAGE:
# @INTERNAL
+# @DESCRIPTION:
# See if the specified macros are enabled.
_at_uses_pkg() {
if [[ -n $(autotools_check_macro "$@") ]] ; then
@@ -265,14 +287,68 @@ _at_uses_pkg() {
egrep -q "${args[@]}" configure.??
fi
}
+
+# @FUNCTION: _at_uses_autoheader
+# @INTERNAL
+# @DESCRIPTION:
+# Call another function
+
_at_uses_autoheader() { _at_uses_pkg A{C,M}_CONFIG_HEADER{S,}; }
+
+# @FUNCTION: _at_uses_automake
+# @INTERNAL
+# @DESCRIPTION:
+# Call another function
+
_at_uses_automake() { _at_uses_pkg AM_INIT_AUTOMAKE; }
+
+# @FUNCTION: _at_uses_gettext
+# @INTERNAL
+# @DESCRIPTION:
+# Call another function
+
_at_uses_gettext() { _at_uses_pkg AM_GNU_GETTEXT_{,REQUIRE_}VERSION; }
+
+# @FUNCTION: _at_uses_glibgettext
+# @INTERNAL
+# @DESCRIPTION:
+# Call another function
+
_at_uses_glibgettext() { _at_uses_pkg AM_GLIB_GNU_GETTEXT; }
+
+# @FUNCTION: _at_uses_intltool
+# @INTERNAL
+# @DESCRIPTION:
+# Call another function
+
_at_uses_intltool() { _at_uses_pkg {AC,IT}_PROG_INTLTOOL; }
+
+# @FUNCTION: _at_uses_gtkdoc
+# @INTERNAL
+# @DESCRIPTION:
+# Call another function
+
_at_uses_gtkdoc() { _at_uses_pkg GTK_DOC_CHECK; }
+
+# @FUNCTION: _at_uses_gnomedoc
+# @INTERNAL
+# @DESCRIPTION:
+# Call another function
+
_at_uses_gnomedoc() { _at_uses_pkg GNOME_DOC_INIT; }
+
+# @FUNCTION: _at_uses_libtool
+# @INTERNAL
+# @DESCRIPTION:
+# Call another function
+
_at_uses_libtool() { _at_uses_pkg A{C,M}_PROG_LIBTOOL LT_INIT; }
+
+# @FUNCTION: _at_uses_libltdl
+# @INTERNAL
+# @DESCRIPTION:
+# Call another function
+
_at_uses_libltdl() { _at_uses_pkg LT_CONFIG_LTDL_DIR; }
# @FUNCTION: eaclocal_amflags
@@ -291,10 +367,10 @@ eaclocal_amflags() {
autotools_env_setup
aclocal_opts=$(sed -n \
"/^ACLOCAL_AMFLAGS[[:space:]]*=/{ \
- # match the first line
- s:[^=]*=::p; \
- # then gobble up all escaped lines
- : nextline /\\\\$/{ n; p; b nextline; } \
+ # match the first line
+ s:[^=]*=::p; \
+ # then gobble up all escaped lines
+ : nextline /\\\\$/{ n; p; b nextline; } \
}" ${amflags_file})
eval aclocal_opts=\""${aclocal_opts}"\"
break
@@ -550,10 +626,11 @@ autotools_run_tool() {
fi
}
-# Internal function to check for support
-
+# @ECLASS-VARIABLE: ALL_AUTOTOOLS_MACROS
+# @DESCRIPTION:
# Keep a list of all the macros we might use so that we only
# have to run the trace code once. Order doesn't matter.
+
ALL_AUTOTOOLS_MACROS=(
A{C,M}_PROG_LIBTOOL LT_INIT LT_CONFIG_LTDL_DIR
A{C,M}_CONFIG_HEADER{S,}
@@ -566,6 +643,11 @@ ALL_AUTOTOOLS_MACROS=(
GTK_DOC_CHECK
GNOME_DOC_INIT
)
+
+# @FUNCTION: autotools_check_macro
+# @DESCRIPTION:
+# Check the macros
+
autotools_check_macro() {
[[ -f configure.ac || -f configure.in ]] || return 0
@@ -591,6 +673,7 @@ autotools_check_macro() {
# @INTERNAL
# @DESCRIPTION:
# Look for a macro and extract its value.
+
autotools_check_macro_val() {
local macro scan_out
@@ -606,6 +689,11 @@ autotools_check_macro_val() {
return 0
}
+# @FUNCTION: _autotools_m4dir_include
+# @INTERNAL
+# @DESCRIPTION:
+# m4dir include stuff
+
_autotools_m4dir_include() {
local x include_opts flag
@@ -627,7 +715,17 @@ _autotools_m4dir_include() {
echo ${include_opts}
}
+
+# @FUNCTION: autotools_m4dir_include
+# @DESCRIPTION:
+# Call another function
+
autotools_m4dir_include() { _autotools_m4dir_include ${AT_M4DIR} ; }
+
+# @FUNCTION: autotools_m4sysdir_include
+# @DESCRIPTION:
+# m4sysdir include stuff
+
autotools_m4sysdir_include() {
# First try to use the paths the system integrator has set up.
local paths=( $(eval echo ${AT_SYS_M4DIR}) )
diff --git a/eclass/base.eclass b/eclass/base.eclass
index 0f9a2e576b78..4682890b3dc3 100644
--- a/eclass/base.eclass
+++ b/eclass/base.eclass
@@ -28,12 +28,22 @@
# @DESCRIPTION:
# The base eclass defines some default functions and variables.
+# @VARIABLE: _BASE_ECLASS
+# @INTERNAL
+# @DESCRIPTION:
+# If null set to 1
+
if [[ -z ${_BASE_ECLASS} ]]; then
_BASE_ECLASS=1
inherit eutils
+# @VARIABLE: BASE_EXPF
+# @DESCRIPTION:
+# Please document me
+
BASE_EXPF="src_unpack src_compile src_install"
+
case "${EAPI:-0}" in
0|1) ;;
2|3|4|5) BASE_EXPF+=" src_prepare src_configure" ;;
diff --git a/eclass/bash-completion-r1.eclass b/eclass/bash-completion-r1.eclass
index 636371df9d6b..e3981438fd9f 100644
--- a/eclass/bash-completion-r1.eclass
+++ b/eclass/bash-completion-r1.eclass
@@ -61,10 +61,11 @@ _bash-completion-r1_get_bashcompdir() {
_bash-completion-r1_get_bashdir completionsdir /usr/share/bash-completion/completions
}
-# @FUNCTION: _bash-completion-r1_get_helpersdir
+# @FUNCTION: _bash-completion-r1_get_bashhelpersdir
# @INTERNAL
# @DESCRIPTION:
# Get unprefixed bash-completion helpers directory.
+
_bash-completion-r1_get_bashhelpersdir() {
debug-print-function ${FUNCNAME} "${@}"
diff --git a/eclass/bazel.eclass b/eclass/bazel.eclass
index 854b740db4f2..493e2d4593d6 100644
--- a/eclass/bazel.eclass
+++ b/eclass/bazel.eclass
@@ -24,6 +24,11 @@ case "${EAPI:-0}" in
;;
esac
+# @VARIABLE: _BAZEL_ECLASS
+# @INTERNAL
+# @DESCRIPTION:
+# Please document me
+
if [[ ! ${_BAZEL_ECLASS} ]]; then
inherit multiprocessing toolchain-funcs
diff --git a/eclass/cargo.eclass b/eclass/cargo.eclass
index 7f7a681f6f52..d1e968b4e9ce 100644
--- a/eclass/cargo.eclass
+++ b/eclass/cargo.eclass
@@ -9,10 +9,18 @@
# @SUPPORTED_EAPIS: 6 7
# @BLURB: common functions and variables for cargo builds
+# @VARIABLE: _CARGO_ECLASS
+# @INTERNAL
+# @DESCRIPTION:
+# If null set to 1
+
if [[ -z ${_CARGO_ECLASS} ]]; then
_CARGO_ECLASS=1
+# @VARIABLE: RUST_DEPEND
+# @DESCRIPTION:
# we need this for 'cargo vendor' subcommand and net.offline config knob
+
RUST_DEPEND=">=virtual/rust-1.37.0"
case "${EAPI:-0}" in
@@ -35,7 +43,16 @@ fi
IUSE="${IUSE} debug"
+# @VARIABLE: ECARGO_HOME
+# @DESCRIPTION:
+# Adjust the working directory
+
ECARGO_HOME="${WORKDIR}/cargo_home"
+
+# @VARIABLE: ECARGO_VENDOR
+# @DESCRIPTION:
+# Vendorize the working directory
+
ECARGO_VENDOR="${ECARGO_HOME}/gentoo"
# @ECLASS-VARIABLE: CARGO_OPTIONAL
diff --git a/eclass/cdrom.eclass b/eclass/cdrom.eclass
index 77b9d6ceb209..4481eaa1dd9b 100644
--- a/eclass/cdrom.eclass
+++ b/eclass/cdrom.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# @ECLASS: cdrom.eclass
@@ -14,6 +14,11 @@
# eclass will require RESTRICT="bindist" but the point still stands.
# The functions are generally called in src_unpack.
+# @VARIABLE: _CDROM_ECLASS
+# @INTERNAL
+# @DESCRIPTION:
+# If null set to 1
+
if [[ -z ${_CDROM_ECLASS} ]]; then
_CDROM_ECLASS=1
diff --git a/eclass/check-reqs.eclass b/eclass/check-reqs.eclass
index a45cbd15fee7..e512c1bb23a0 100644
--- a/eclass/check-reqs.eclass
+++ b/eclass/check-reqs.eclass
@@ -38,6 +38,11 @@
# These checks should probably mostly work on non-Linux, and they should
# probably degrade gracefully if they don't. Probably.
+# @VARIABLE: _CHECK_REQS_ECLASS_
+# @INTERNAL
+# @DESCRIPTION:
+# Please document me
+
if [[ ! ${_CHECK_REQS_ECLASS_} ]]; then
# @ECLASS-VARIABLE: CHECKREQS_MEMORY
@@ -67,6 +72,8 @@ esac
EXPORT_FUNCTIONS pkg_pretend pkg_setup
+# @FUNCTION: check_reqs
+# @DESCRIPTION:
# Obsolete function executing all the checks and printing out results
check_reqs() {
eerror "Package calling old ${FUNCNAME} function."
@@ -350,8 +357,8 @@ check-reqs_unsatisfied() {
${msg} "There is NOT at least ${sizeunit} ${location}"
# @ECLASS-VARIABLE: CHECKREQS_FAILED
- # @DESCRIPTION:
# @INTERNAL
+ # @DESCRIPTION:
# If set the checks failed and eclass should abort the build.
# Internal, do not set yourself.
CHECKREQS_FAILED="true"
diff --git a/eclass/chromium-2.eclass b/eclass/chromium-2.eclass
index b3d63f302d05..d8225f983e2f 100644
--- a/eclass/chromium-2.eclass
+++ b/eclass/chromium-2.eclass
@@ -43,6 +43,11 @@ chromium_suid_sandbox_check_kernel_config() {
# @DESCRIPTION:
# List of language packs available for this package.
+# @FUNCTION: _chromium_set_l10n_IUSE
+# @INTERNAL
+# @DESCRIPTION:
+# Please document me
+
_chromium_set_l10n_IUSE() {
[[ ${EAPI:-0} == 0 ]] && die "EAPI=${EAPI} is not supported"
@@ -100,6 +105,10 @@ chromium_remove_language_paks() {
done
}
+# @FUNCTION: chromium_pkg_die
+# @DESCRIPTION:
+# Various reasons to die
+
chromium_pkg_die() {
if [[ "${EBUILD_PHASE}" != "compile" ]]; then
return
diff --git a/eclass/cmake.eclass b/eclass/cmake.eclass
index 62fa02715700..384556fd7d14 100644
--- a/eclass/cmake.eclass
+++ b/eclass/cmake.eclass
@@ -17,6 +17,11 @@
# out-of-source builds (default), in-source builds and an implementation of the
# well-known use_enable function for CMake.
+# @VARIABLE: _CMAKE_ECLASS
+# @INTERNAL
+# @DESCRIPTION:
+# If null set to 1
+
if [[ -z ${_CMAKE_ECLASS} ]]; then
_CMAKE_ECLASS=1
@@ -135,7 +140,10 @@ _cmake_banned_func() {
die "${FUNCNAME[1]} is banned. use -D$1=\"\$(usex $2)\" instead"
}
+# @FUNCTION: _cmake_check_build_dir
+# @DESCRIPTION:
# Determine using IN or OUT source build
+
_cmake_check_build_dir() {
: ${CMAKE_USE_DIR:=${S}}
if [[ -n ${CMAKE_IN_SOURCE_BUILD} ]]; then
@@ -268,8 +276,12 @@ cmake-utils_use() { _cmake_banned_func "" "$@" ; }
# Banned. Use -DNOFOO=$(usex !foo) instead.
cmake-utils_useno() { _cmake_banned_func "" "$@" ; }
+# @FUNCTION: _cmake_modify-cmakelists
+# @INTERNAL
+# @DESCRIPTION:
# Internal function for modifying hardcoded definitions.
# Removes dangerous definitions that override Gentoo settings.
+
_cmake_modify-cmakelists() {
debug-print-function ${FUNCNAME} "$@"
diff --git a/eclass/cuda.eclass b/eclass/cuda.eclass
index b1da77c69dda..cfc42a859495 100644
--- a/eclass/cuda.eclass
+++ b/eclass/cuda.eclass
@@ -25,6 +25,11 @@ esac
# @EXAMPLE:
# inherit cuda
+# @VARIABLE: _CUDA_ECLASS
+# @INTERNAL
+# @DESCRIPTION:
+# Please document me
+
if [[ -z ${_CUDA_ECLASS} ]]; then
inherit flag-o-matic toolchain-funcs
diff --git a/eclass/cvs.eclass b/eclass/cvs.eclass
index 26706cd74d1f..f3d0d4f6b452 100644
--- a/eclass/cvs.eclass
+++ b/eclass/cvs.eclass
@@ -13,6 +13,11 @@
# cvs_src_unpack. If you find that you need to call the cvs_* functions
# directly, I'd be interested to hear about it.
+# @ECLASS-VARIABLE: _CVS_ECLASS
+# @INTERNAL
+# @DESCRIPTION:
+# Please document
+
if [[ -z ${_CVS_ECLASS} ]]; then
_CVS_ECLASS=1
@@ -195,6 +200,11 @@ case ${EAPI:-0} in
esac
# called from cvs_src_unpack
+
+# @FUNCTION: cvs_fetch
+# @DESCRIPTION:
+# Fetch CVS repo
+
cvs_fetch() {
# Make these options local variables so that the global values are
# not affected by modifications in this function.
diff --git a/eclass/db.eclass b/eclass/db.eclass
index 01c2f9d9f1fc..743a9c78e83b 100644
--- a/eclass/db.eclass
+++ b/eclass/db.eclass
@@ -16,6 +16,10 @@ DEPEND="test? ( >=dev-lang/tcl-8.4 )"
RDEPEND=""
+# @FUNCTION: db_fix_so
+# @DESCRIPTION:
+# Please document me
+
db_fix_so() {
has "${EAPI:-0}" 0 1 2 && ! use prefix && EROOT="${ROOT}"
LIB="${EROOT}/usr/$(get_libdir)"
@@ -69,6 +73,10 @@ db_fix_so() {
fi
}
+# @FUNCTION: db_src_install_doc
+# @DESCRIPTION:
+# Please document me
+
db_src_install_doc() {
has "${EAPI:-0}" 0 1 2 && ! use prefix && ED="${D}"
# not everybody wants this wad of documentation as it is primarily API docs
@@ -83,6 +91,10 @@ db_src_install_doc() {
db_src_install_examples
}
+# @FUNCTION: db_src_install_examples
+# @DESCRIPTION:
+# Please document me
+
db_src_install_examples() {
has "${EAPI:-0}" 0 1 2 && ! use prefix && ED="${D}"
if use examples ; then
@@ -102,6 +114,10 @@ db_src_install_examples() {
fi
}
+# @FUNCTION: db_src_install_usrbinslot
+# @DESCRIPTION:
+# Please document me
+
db_src_install_usrbinslot() {
has "${EAPI:-0}" 0 1 2 && ! use prefix && ED="${D}"
# slot all program names to avoid overwriting
@@ -116,6 +132,10 @@ db_src_install_usrbinslot() {
done
}
+# @FUNCTION: db_src_install_headerslot
+# @DESCRIPTION:
+# Please document me
+
db_src_install_headerslot() {
has "${EAPI:-0}" 0 1 2 && ! use prefix && ED="${D}"
# install all headers in a slotted location
@@ -123,6 +143,10 @@ db_src_install_headerslot() {
mv "${ED}"/usr/include/*.h "${ED}"/usr/include/db${SLOT}/ || die
}
+# @FUNCTION: db_src_install_usrlibcleanup
+# @DESCRIPTION:
+# Please document me
+
db_src_install_usrlibcleanup() {
has "${EAPI:-0}" 0 1 2 && ! use prefix && ED="${D}"
LIB="${ED}/usr/$(get_libdir)"
diff --git a/eclass/depend.apache.eclass b/eclass/depend.apache.eclass
index 5aa552542680..46bf93461bc0 100644
--- a/eclass/depend.apache.eclass
+++ b/eclass/depend.apache.eclass
@@ -127,6 +127,11 @@ APACHE2_4_DEPEND="=www-servers/apache-2.4*"
# INTERNAL FUNCTIONS
# ==============================================================================
+# @FUNCTION: _init_apache2
+# @INTERNAL
+# @DESCRIPTION:
+# Please document me
+
_init_apache2() {
debug-print-function $FUNCNAME $*
@@ -148,11 +153,21 @@ _init_apache2() {
esac
}
+# @FUNCTION: _init_apache2_late
+# @INTERNAL
+# @DESCRIPTION:
+# Please document me
+
_init_apache2_late() {
APACHE_BASEDIR="/usr/$(get_libdir)/apache2"
APACHE_MODULESDIR="${APACHE_BASEDIR}/modules"
}
+# @FUNCTION: _init_no_apache
+# @INTERNAL
+# @DESCRIPTION:
+# Please document me
+
_init_no_apache() {
debug-print-function $FUNCNAME $*
APACHE_VERSION="0"
diff --git a/eclass/desktop.eclass b/eclass/desktop.eclass
index 7d5c0f0f9a26..20b4d1797305 100644
--- a/eclass/desktop.eclass
+++ b/eclass/desktop.eclass
@@ -6,6 +6,11 @@
# base-system@gentoo.org
# @BLURB: support for desktop files, menus, and icons
+# @VARIABLE: _DESKTOP_ECLASS
+# @INTERNAL
+# @DESCRIPTION:
+# If null set to 1
+
if [[ -z ${_DESKTOP_ECLASS} ]]; then
_DESKTOP_ECLASS=1
diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass
index 33c66c4872e5..d626d816369c 100644
--- a/eclass/distutils-r1.eclass
+++ b/eclass/distutils-r1.eclass
@@ -95,6 +95,11 @@ esac
# It needs to be set before the inherit line.
: ${DISTUTILS_USE_SETUPTOOLS:=bdepend}
+# @VARIABLE: _DISTUTILS_R1
+# @INTERNAL
+# @DESCRIPTION:
+# Please document me
+
if [[ ! ${_DISTUTILS_R1} ]]; then
[[ ${EAPI} == [456] ]] && inherit eutils
diff --git a/eclass/docs.eclass b/eclass/docs.eclass
index adacae4abda6..a8b1549dda36 100644
--- a/eclass/docs.eclass
+++ b/eclass/docs.eclass
@@ -118,11 +118,12 @@ case ${DOCS_BUILDER} in
;;
esac
-# @FUNCTION: python_append_dep
+# @FUNCTION: python_append_deps
# @DESCRIPTION:
# Appends [\${PYTHON_USEDEP}] to all dependencies
# for python based DOCS_BUILDERs such as mkdocs or
# sphinx.
+
python_append_deps() {
debug-print-function ${FUNCNAME}
@@ -332,5 +333,10 @@ if [[ ${_DISTUTILS_R1} && ( ${DOCS_BUILDER}="mkdocs" || ${DOCS_BUILDER}="sphinx"
python_compile_all() { docs_compile; }
fi
+# @ECLASS-VARIABLE: _DOCS
+# @INTERNAL
+# @DESCRIPTION:
+# Please document
+
_DOCS=1
fi
diff --git a/eclass/ecm.eclass b/eclass/ecm.eclass
index c763957bf893..1d6d08e72a7d 100644
--- a/eclass/ecm.eclass
+++ b/eclass/ecm.eclass
@@ -20,6 +20,11 @@
# This eclass's phase functions are not intended to be mixed and matched, so if
# any phase functions are overridden the version here should also be called.
+# @VARIABLE: _ECM_ECLASS
+# @INTERNAL
+# @DESCRIPTION:
+# Please document me
+
if [[ -z ${_ECM_ECLASS} ]]; then
_ECM_ECLASS=1
diff --git a/eclass/elisp-common.eclass b/eclass/elisp-common.eclass
index 66a3a325e673..fb4498ae0867 100644
--- a/eclass/elisp-common.eclass
+++ b/eclass/elisp-common.eclass
@@ -272,6 +272,8 @@ elisp-check-emacs-version() {
fi
}
+# @FUNCTION: elisp-need-emacs
+# @DESCRIPTION:
# Test if the eselected Emacs version is at least the major version
# of GNU Emacs specified as argument.
# Return 0 if true, 1 if false, 2 if trouble.
diff --git a/eclass/emboss-r2.eclass b/eclass/emboss-r2.eclass
index 7d13f194eb7a..b260cd2736bb 100644
--- a/eclass/emboss-r2.eclass
+++ b/eclass/emboss-r2.eclass
@@ -35,6 +35,11 @@
#
# Defaults to the upstream name of the module.
+# @VARIABLE: _EMBOSS_R2
+# @INTERNAL
+# @DESCRIPTION:
+# Please document me
+
if [[ ! ${_EMBOSS_R2} ]]; then
case ${EAPI:-0} in
diff --git a/eclass/epatch.eclass b/eclass/epatch.eclass
index fbb4f0b5bc0d..921647e257a6 100644
--- a/eclass/epatch.eclass
+++ b/eclass/epatch.eclass
@@ -11,6 +11,11 @@
# An eclass providing epatch and epatch_user functions to easily apply
# patches to ebuilds. Mostly superseded by eapply* in EAPI 6.
+# @VARIABLE: _EPATCH_ECLASS
+# @INTERNAL
+# @DESCRIPTION:
+# Please document me
+
if [[ -z ${_EPATCH_ECLASS} ]]; then
case ${EAPI:-0} in
diff --git a/eclass/estack.eclass b/eclass/estack.eclass
index 3f444ee3b70b..37a2994283ce 100644
--- a/eclass/estack.eclass
+++ b/eclass/estack.eclass
@@ -8,6 +8,11 @@
# @DESCRIPTION:
# Support for storing values on stack-like variables.
+# @VARIABLE: _ESTACK_ECLASS
+# @INTERNAL
+# @DESCRIPTION:
+# Please document me
+
if [[ -z ${_ESTACK_ECLASS} ]]; then
# @FUNCTION: estack_push
diff --git a/eclass/eutils.eclass b/eclass/eutils.eclass
index 20ebe31c10a4..0750da6019e8 100644
--- a/eclass/eutils.eclass
+++ b/eclass/eutils.eclass
@@ -19,6 +19,11 @@
# or eclasses. Use the more specific split eclasses instead, or native
# package manager functions when available.
+# @ECLASS-VARIABLE: _EUTILS_ECLASS
+# @INTERNAL
+# @DESCRIPTION:
+# Please document me
+
if [[ -z ${_EUTILS_ECLASS} ]]; then
_EUTILS_ECLASS=1
@@ -69,6 +74,10 @@ emktemp() {
fi
}
+# @FUNCTION: path_exists
+# @DESCRIPTION:
+# Warn that function has been removed
+
path_exists() {
eerror "path_exists has been removed. Please see the following post"
eerror "for a replacement snippet:"
diff --git a/eclass/fcaps.eclass b/eclass/fcaps.eclass
index 4bef00d40ac7..107a519892dc 100644
--- a/eclass/fcaps.eclass
+++ b/eclass/fcaps.eclass
@@ -28,6 +28,11 @@
# )
# @CODE
+# @VARIABLE: _FCAPS_ECLASS
+# @INTERNAL
+# @DESCRIPTION:
+# Please document me
+
if [[ -z ${_FCAPS_ECLASS} ]]; then
_FCAPS_ECLASS=1
diff --git a/eclass/fdo-mime.eclass b/eclass/fdo-mime.eclass
deleted file mode 100644
index 3aa45919b37e..000000000000
--- a/eclass/fdo-mime.eclass
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# @DEAD
-# No consumers left. Removal in 30 days.
-
-# @ECLASS: fdo-mime.eclass
-# @MAINTAINER:
-# freedesktop-bugs@gentoo.org
-# @AUTHOR:
-# Original author: foser
-# @BLURB: Utility eclass to update the desktop mime info as laid out in the freedesktop specs & implementations
-# @DEPRECATED: xdg-utils
-# @DESCRIPTION:
-# This eclass is DEPRECATED. Please use xdg-utils or xdg instead.
-
-# @FUNCTION: fdo-mime_desktop_database_update
-# @DESCRIPTION:
-# Updates the desktop database.
-# Generates a list of mimetypes linked to applications that can handle them
-fdo-mime_desktop_database_update() {
- has "${EAPI:-0}" 0 1 2 && ! use prefix && EPREFIX=
- has "${EAPI:-0}" 0 1 2 && ! use prefix && EROOT="${ROOT}"
- if [ -x "${EPREFIX}/usr/bin/update-desktop-database" ]
- then
- einfo "Updating desktop mime database ..."
- "${EPREFIX}/usr/bin/update-desktop-database" -q "${EROOT}usr/share/applications"
- fi
-}
-
-# @FUNCTION: fdo-mime_mime_database_update
-# @DESCRIPTION:
-# Update the mime database.
-# Creates a general list of mime types from several sources
-fdo-mime_mime_database_update() {
- has "${EAPI:-0}" 0 1 2 && ! use prefix && EPREFIX=
- has "${EAPI:-0}" 0 1 2 && ! use prefix && EROOT="${ROOT}"
- if [ -x "${EPREFIX}/usr/bin/update-mime-database" ]
- then
- einfo "Updating shared mime info database ..."
- "${EPREFIX}/usr/bin/update-mime-database" "${EROOT}usr/share/mime"
- fi
-}
diff --git a/eclass/findlib.eclass b/eclass/findlib.eclass
index 3a165cfb4b41..aedcc6fad008 100644
--- a/eclass/findlib.eclass
+++ b/eclass/findlib.eclass
@@ -16,6 +16,10 @@
DEPEND=">=dev-ml/findlib-1.0.4-r1"
[[ ${FINDLIB_USE} ]] && DEPEND="${FINDLIB_USE}? ( ${DEPEND} )"
+# @FUNCTION: check_ocamlfind
+# @DESCRIPTION:
+# Please document me
+
check_ocamlfind() {
if [ ! -x "${EPREFIX}"/usr/bin/ocamlfind ]
then
diff --git a/eclass/fixheadtails.eclass b/eclass/fixheadtails.eclass
index 475b182843a5..23f14692d5ce 100644
--- a/eclass/fixheadtails.eclass
+++ b/eclass/fixheadtails.eclass
@@ -8,6 +8,11 @@
# Original author John Mylchreest
# @BLURB: functions to replace obsolete head/tail with POSIX compliant ones
+# @FUNCTION: _do_sed_fix
+# @INTERNAL
+# @DESCRIPTION:
+# Please document me
+
_do_sed_fix() {
einfo " - fixed $1"
sed -i \
diff --git a/eclass/flag-o-matic.eclass b/eclass/flag-o-matic.eclass
index 20ee39d98bad..f7786725c5b9 100644
--- a/eclass/flag-o-matic.eclass
+++ b/eclass/flag-o-matic.eclass
@@ -9,18 +9,29 @@
# This eclass contains a suite of functions to help developers sanely
# and safely manage toolchain flags in their builds.
+# @ECLASS-VARIABLE: _FLAG_O_MATIC_ECLASS
+# @INTERNAL
+# @DESCRIPTION:
+# Please document me
+
if [[ -z ${_FLAG_O_MATIC_ECLASS} ]]; then
_FLAG_O_MATIC_ECLASS=1
inherit eutils toolchain-funcs multilib
+# @FUNCTION: all-flag-vars
+# @DESCRIPTION:
# Return all the flag variables that our high level funcs operate on.
+
all-flag-vars() {
echo {ADA,C,CPP,CXX,CCAS,F,FC,LD}FLAGS
}
+# @FUNCTION: setup-allowed-flags
+# @DESCRIPTION:
# {C,CPP,CXX,CCAS,F,FC,LD}FLAGS that we allow in strip-flags
# Note: shell globs and character lists are allowed
+
setup-allowed-flags() {
ALLOWED_FLAGS=(
-pipe -O '-O[12sg]' -mcpu -march -mtune
@@ -87,8 +98,12 @@ setup-allowed-flags() {
)
}
+# @FUNCTION: _filter-hardened
+# @INTERNAL
+# @DESCRIPTION:
# inverted filters for hardened compiler. This is trying to unpick
# the hardened compiler defaults.
+
_filter-hardened() {
local f
for f in "$@" ; do
@@ -121,9 +136,13 @@ _filter-hardened() {
done
}
+# @FUNCTION: _filter-var
+# @INTERNAL
+# @DESCRIPTION:
# Remove occurrences of strings from variable given in $1
# Strings removed are matched as globs, so for example
# '-O*' would remove -O1, -O2 etc.
+
_filter-var() {
local f x var=$1 new=()
shift
@@ -142,6 +161,7 @@ _filter-var() {
# @USAGE:
# @DESCRIPTION:
# Remove particular from {C,CPP,CXX,CCAS,F,FC,LD}FLAGS. Accepts shell globs.
+
filter-flags() {
_filter-hardened "$@"
local v
@@ -154,6 +174,7 @@ filter-flags() {
# @FUNCTION: filter-lfs-flags
# @DESCRIPTION:
# Remove flags that enable Large File Support.
+
filter-lfs-flags() {
[[ $# -ne 0 ]] && die "filter-lfs-flags takes no arguments"
# http://www.gnu.org/s/libc/manual/html_node/Feature-Test-Macros.html
@@ -167,6 +188,7 @@ filter-lfs-flags() {
# @USAGE:
# @DESCRIPTION:
# Remove particular from LDFLAGS. Accepts shell globs.
+
filter-ldflags() {
_filter-var LDFLAGS "$@"
return 0
@@ -313,6 +335,11 @@ replace-cpu-flags() {
return 0
}
+# @FUNCTION: _is_flagq
+# @INTERNAL
+# @DESCRIPTION:
+# Please document me
+
_is_flagq() {
local x var="$1[*]"
for x in ${!var} ; do
@@ -438,6 +465,10 @@ strip-flags() {
return 0
}
+# @FUNCTION: test-flag-PROG
+# @DESCRIPTION:
+# Please document me
+
test-flag-PROG() {
local comp=$1
local lang=$2
@@ -557,8 +588,13 @@ test-flag-FC() { test-flag-PROG "FC" f95 "$@"; }
# @USAGE:
# @DESCRIPTION:
# Returns shell true if is supported by the C compiler and linker, else returns shell false.
+
test-flag-CCLD() { test-flag-PROG "CC" c+ld "$@"; }
+# @FUNCTION: test-flags-PROG
+# @DESCRIPTION:
+# Please document me
+
test-flags-PROG() {
local comp=$1
local flags=()
diff --git a/eclass/font-ebdftopcf.eclass b/eclass/font-ebdftopcf.eclass
index c36cd14256fa..9e00eec467f2 100644
--- a/eclass/font-ebdftopcf.eclass
+++ b/eclass/font-ebdftopcf.eclass
@@ -1,12 +1,15 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-# Author: Robin H. Johnson
-
-# font-ebdftopcf.eclass
-# Eclass to make PCF font generator from BDF uniform and optimal
+# @ECLASS: font-ebdftopcf.eclass
+# @MAINTAINER:
+# Robin H. Johnson
+# @AUTHOR:
+# Robin H. Johnson
+# @BLURB: A simple eclass to convert BDF to PCF
+# @DESCRIPTION:
+# Make PCF font generator from BDF uniform and optimal
# The manpage for this eclass is in media-gfx/ebdftopcf.
-
# inherit this eclass after font.eclass
# if USE="-X", this eclass is basically a no-op, since bdftopcf requires Xorg.
@@ -16,9 +19,9 @@ IUSE="X"
DEPEND="X? ( media-gfx/ebdftopcf )"
RDEPEND=""
-#
-# Public functions
-#
+# @FUNCTION: ebdftopcf
+# @DESCRIPTION:
+# Convert BDF files to PCF
ebdftopcf() {
local bdffiles
bdffiles="$@"
@@ -29,9 +32,9 @@ ebdftopcf() {
|| die "Failed to build PCF files"
}
-#
-# Public inheritable functions
-#
+# @FUNCTION: font-ebdftopcf_src_compile
+# @DESCRIPTION:
+# Convert fonts from BDF to PCF
font-ebdftopcf_src_compile() {
use X && FONT_SUFFIX="pcf.gz"
use X || FONT_SUFFIX="bdf"
diff --git a/eclass/font.eclass b/eclass/font.eclass
index e9e448a8155b..10f4bf61e8d7 100644
--- a/eclass/font.eclass
+++ b/eclass/font.eclass
@@ -13,6 +13,11 @@ case ${EAPI:-0} in
*) die "EAPI ${EAPI} is not supported by font.eclass." ;;
esac
+# @VARIABLE: _FONT_ECLASS
+# @INTERNAL
+# @DESCRIPTION:
+# Please document me
+
if [[ ! ${_FONT_ECLASS} ]]; then
EXPORT_FUNCTIONS pkg_setup src_install pkg_postinst pkg_postrm
diff --git a/eclass/fortran-2.eclass b/eclass/fortran-2.eclass
index 6049b03b8f14..45f26a83c2b0 100644
--- a/eclass/fortran-2.eclass
+++ b/eclass/fortran-2.eclass
@@ -36,6 +36,11 @@ esac
EXPORT_FUNCTIONS pkg_setup
+# @VARIABLE: _FORTRAN_2_CLASS
+# @INTERNAL
+# @DESCRIPTION:
+# Please document me
+
if [[ ! ${_FORTRAN_2_CLASS} ]]; then
# @ECLASS-VARIABLE: FORTRAN_NEED_OPENMP
@@ -282,5 +287,10 @@ fortran-2_pkg_setup() {
fi
}
+# @VARIABLE: _FORTRAN_2_ECLASS
+# @INTERNAL
+# @DESCRIPTION:
+# Please document me
+
_FORTRAN_2_ECLASS=1
fi
diff --git a/eclass/games.eclass b/eclass/games.eclass
index a2a5ce066a57..cdd40a222572 100644
--- a/eclass/games.eclass
+++ b/eclass/games.eclass
@@ -26,6 +26,10 @@
# is needed. For more details, see the QA team policies page:
# https://wiki.gentoo.org/wiki/Project:Quality_Assurance/Policies#Games
+# @VARIABLE: _GAMES_ECLASS
+# @INTERNAL
+# @DESCRIPTION:
+# Please document me
if [[ -z ${_GAMES_ECLASS} ]]; then
_GAMES_ECLASS=1
diff --git a/eclass/gnuconfig.eclass b/eclass/gnuconfig.eclass
index 3433837787c2..6ddaabff00a6 100644
--- a/eclass/gnuconfig.eclass
+++ b/eclass/gnuconfig.eclass
@@ -1,8 +1,13 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-#
-# Author: Will Woods
-#
+
+# @ECLASS: gnuconfig.eclass
+# @MAINTAINER:
+# maintainer-needed@gentoo.org
+# @AUTHOR:
+# Will Woods
+# @BLURB: Automatically update automake files to newest version
+# @DESCRIPTION:
# This eclass is used to automatically update files that typically come with
# automake to the newest version available on the system. The most common use
# of this is to update config.guess and config.sub when configure dies from
@@ -20,6 +25,8 @@
DEPEND="sys-devel/gnuconfig"
+# @FUNCTION: gnuconfig_update
+# @DESCRIPTION:
# Wrapper function for gnuconfig_do_update. If no arguments are given, update
# config.sub and config.guess (old default behavior), otherwise update the
# named files.
@@ -42,10 +49,12 @@ gnuconfig_update() {
return $?
}
+# @FUNCTION: gnuconfig_do_update
+# @DESCRIPTION:
# Copy the newest available version of specified files over any old ones in the
# source dir. This function shouldn't be called directly - use gnuconfig_update
#
-# Note that since bash using dynamic scoping, startdir is available here from
+# Note: that since bash using dynamic scoping, startdir is available here from
# the gnuconfig_update function
gnuconfig_do_update() {
local configsubs_dir target targetlist file
@@ -75,6 +84,8 @@ gnuconfig_do_update() {
return 0
}
+# @FUNCTION: gnuconfig_findnewest
+# @DESCRIPTION:
# this searches the standard locations for the newest config.{sub|guess}, and
# returns the directory where they can be found.
gnuconfig_findnewest() {
diff --git a/eclass/golang-vcs-snapshot.eclass b/eclass/golang-vcs-snapshot.eclass
index 3a35d7e1aa58..d178bb6da8ce 100644
--- a/eclass/golang-vcs-snapshot.eclass
+++ b/eclass/golang-vcs-snapshot.eclass
@@ -5,8 +5,7 @@
# @MAINTAINER:
# William Hubbs
# @SUPPORTED_EAPIS: 5 6 7
-# @BLURB: support eclass for unpacking VCS snapshot tarballs for
-# software written in the Go programming language
+# @BLURB: support eclass for unpacking VCS snapshot tarballs
# @DESCRIPTION:
# This eclass provides a convenience src_unpack() which unpacks the
# first tarball mentioned in SRC_URI to its appropriate location in
@@ -63,6 +62,10 @@ EXPORT_FUNCTIONS src_unpack
declare -arg EGO_VENDOR
_golang-vcs-snapshot_set_vendor_uri() {
+ # @ECLASS-VARIABLE: EGO_VENDOR_URI
+ # @DEFAULT_UNSET
+ # @DESCRIPTION:
+ # Determine the appropriate vendor URI
EGO_VENDOR_URI=
local lib
for lib in "${EGO_VENDOR[@]}"; do
diff --git a/eclass/java-utils-2.eclass b/eclass/java-utils-2.eclass
index a33962f114de..84c09885c7ba 100644
--- a/eclass/java-utils-2.eclass
+++ b/eclass/java-utils-2.eclass
@@ -1484,7 +1484,6 @@ java-pkg_ensure-vm-version-sufficient() {
# @FUNCTION: java-pkg_is-vm-version-sufficient
# @INTERNAL
-# @DESCRIPTION:
# @RETURN: zero - VM is sufficient; non-zero - VM is not sufficient
java-pkg_is-vm-version-sufficient() {
debug-print-function ${FUNCNAME} $*
@@ -1564,8 +1563,8 @@ java-pkg_ensure-vm-version-ge() {
# Parameters:
# $@ - VM version to compare current VM to
# @CODE
-# @RETURN: zero - current VM version is greater than checked version;
-# non-zero - current VM version is not greater than checked version
+# @RETURN: zero - current VM version is greater than checked version
+# @RETURN: non-zero - current VM version is not greater than checked version
java-pkg_is-vm-version-ge() {
debug-print-function ${FUNCNAME} $*
@@ -2592,14 +2591,14 @@ java-pkg_needs-vm() {
# @FUNCTION: java-pkg_get-current-vm
# @INTERNAL
-# @RETURN - The current VM being used
+# @RETURN: The current VM being used
java-pkg_get-current-vm() {
java-config -f
}
# @FUNCTION: java-pkg_get-vm-vendor
# @INTERNAL
-# @RETURN - The vendor of the current VM
+# @RETURN: The vendor of the current VM
java-pkg_get-vm-vendor() {
debug-print-function ${FUNCNAME} $*
@@ -2610,7 +2609,7 @@ java-pkg_get-vm-vendor() {
# @FUNCTION: java-pkg_get-vm-version
# @INTERNAL
-# @RETURN - The version of the current VM
+# @RETURN: The version of the current VM
java-pkg_get-vm-version() {
debug-print-function ${FUNCNAME} $*
diff --git a/eclass/mozextension.eclass b/eclass/mozextension.eclass
index ea4f1eb143e9..5eeaf89f578d 100644
--- a/eclass/mozextension.eclass
+++ b/eclass/mozextension.eclass
@@ -5,7 +5,9 @@
# @MAINTAINER:
# Mozilla team
# @BLURB: Install extensions for use in mozilla products.
-#
+# @DESCRIPTION:
+# Install extensions for use in mozilla products
+
if [[ ! ${_MOZEXTENSION} ]]; then
# @ECLASS-VARIABLE: MOZEXTENSION_TARGET
@@ -20,6 +22,10 @@ inherit eutils
DEPEND="app-arch/unzip"
+# @FUNCTION: mozversion_extension_location
+# @DESCRIPTION:
+# Get ${PN} from extension location
+
mozversion_extension_location() {
case ${PN} in
firefox|firefox-bin|palemoon)
@@ -32,6 +38,10 @@ mozversion_extension_location() {
return 1
}
+# @FUNCTION: xpi_unpack
+# @DESCRIPTION:
+# Unpack XPI files
+
xpi_unpack() {
local xpi xpiname srcdir
@@ -61,6 +71,9 @@ xpi_unpack() {
done
}
+# @FUNCTION: xpi_install
+# @DESCRIPTION:
+# Install XPI files
xpi_install() {
local emid
@@ -91,6 +104,10 @@ xpi_install() {
doins -r "${x}"/* || die "failed to copy extension"
}
+# @FUNCTION: xpi_copy
+# @DESCRIPTION:
+# Copy XPI files
+
xpi_copy() {
local emid
diff --git a/eclass/myspell-r2.eclass b/eclass/myspell-r2.eclass
index 9b1de236dfcf..efe33ce041cf 100644
--- a/eclass/myspell-r2.eclass
+++ b/eclass/myspell-r2.eclass
@@ -7,7 +7,6 @@
# @AUTHOR:
# Tomáš Chvátal
# @BLURB: An eclass to ease the construction of ebuilds for myspell dicts
-# @DESCRIPTION:
EXPORT_FUNCTIONS src_unpack src_install
diff --git a/eclass/openib.eclass b/eclass/openib.eclass
index 08d6fb3a1115..685eaf344a7e 100644
--- a/eclass/openib.eclass
+++ b/eclass/openib.eclass
@@ -1,9 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# @ECLASS: openib.eclass
+# @MAINTAINER:
+# maintainer-needed@gentoo.org
# @AUTHOR:
-# Original Author: Alexey Shvetsov
+# Alexey Shvetsov
# @BLURB: Simplify working with OFED packages
inherit eutils rpm versionator
diff --git a/eclass/php-pear-r2.eclass b/eclass/php-pear-r2.eclass
index e4197522b162..cd4625fdacc2 100644
--- a/eclass/php-pear-r2.eclass
+++ b/eclass/php-pear-r2.eclass
@@ -39,7 +39,8 @@ RDEPEND=">=dev-php/pear-1.8.1"
# @ECLASS-VARIABLE: PEAR-P
# @INTERNAL
-# @DESCRIPTION: Combines PHP_PEAR_PKG_NAME and PEAR_PV
+# @DESCRIPTION:
+# Combines PHP_PEAR_PKG_NAME and PEAR_PV
PEAR_P="${PHP_PEAR_PKG_NAME}-${PEAR_PV}"
# @ECLASS-VARIABLE: PHP_PEAR_DOMAIN
diff --git a/eclass/portability.eclass b/eclass/portability.eclass
index 1402c0420cb0..67ca30fa5aa4 100644
--- a/eclass/portability.eclass
+++ b/eclass/portability.eclass
@@ -13,7 +13,6 @@ _PORTABILITY_ECLASS=1
# @FUNCTION: treecopy
# @USAGE: [orig2 orig3 ....]
-# @RETURN:
# @DESCRIPTION:
# mimic cp --parents copy, but working on BSD userland as well
treecopy() {
@@ -118,7 +117,6 @@ get_bmake() {
# @FUNCTION: get_mounts
# @USAGE:
# @RETURN: table of mounts in form "point node fs opts"
-# @MAINTAINER:
# @DESCRIPTION:
# Portable method of getting mount names and points.
# Returns as "point node fs options"
diff --git a/eclass/postgres-multi.eclass b/eclass/postgres-multi.eclass
index 49d5c6a9c684..76916932042d 100644
--- a/eclass/postgres-multi.eclass
+++ b/eclass/postgres-multi.eclass
@@ -8,7 +8,8 @@ EXPORT_FUNCTIONS pkg_setup src_prepare src_compile src_install src_test
# @ECLASS: postgres-multi.eclass
# @MAINTAINER:
# PostgreSQL
-# @AUTHOR: Aaron W. Swenson
+# @AUTHOR:
+# Aaron W. Swenson
# @SUPPORTED_EAPIS: 5 6 7
# @BLURB: An eclass to build PostgreSQL-related packages against multiple slots
# @DESCRIPTION:
diff --git a/eclass/postgres.eclass b/eclass/postgres.eclass
index 2e2ac85ead6f..b7b45fd888d4 100644
--- a/eclass/postgres.eclass
+++ b/eclass/postgres.eclass
@@ -7,7 +7,8 @@ EXPORT_FUNCTIONS pkg_setup
# @ECLASS: postgres.eclass
# @MAINTAINER:
# PostgreSQL
-# @AUTHOR: Aaron W. Swenson
+# @AUTHOR:
+# Aaron W. Swenson
# @SUPPORTED_EAPIS: 5 6 7
# @BLURB: An eclass for PostgreSQL-related packages
# @DESCRIPTION:
diff --git a/eclass/rebar.eclass b/eclass/rebar.eclass
index 7f712905c407..17be853acfaa 100644
--- a/eclass/rebar.eclass
+++ b/eclass/rebar.eclass
@@ -54,8 +54,8 @@ get_erl_libs() {
# @INTERNAL
# @USAGE:
# @RETURN: full path with EPREFIX to a Erlang package/project on success,
-# code 1 when dependency is not found and code 2 if multiple versions of
-# dependency are found.
+# @RETURN: code 1 when dependency is not found and code 2 if multiple versions of
+# @RETURN: dependency are found.
# @DESCRIPTION:
# Find a Erlang package/project by name in Erlang lib directory. Project
# directory is usually suffixed with version. It is matched to ''
diff --git a/eclass/ruby-ng.eclass b/eclass/ruby-ng.eclass
index e52c507d8010..628d04592abd 100644
--- a/eclass/ruby-ng.eclass
+++ b/eclass/ruby-ng.eclass
@@ -111,6 +111,7 @@ ruby_implementation_depend() {
# @FUNCTION: _ruby_get_all_impls
# @INTERNAL
# @RETURN: list of valid values in USE_RUBY
+# @DESCRIPTION:
# Return a list of valid implementations in USE_RUBY, skipping the old
# implementations that are no longer supported.
_ruby_get_all_impls() {
diff --git a/eclass/ssl-cert.eclass b/eclass/ssl-cert.eclass
index 0e7294f62299..a9a6c820e960 100644
--- a/eclass/ssl-cert.eclass
+++ b/eclass/ssl-cert.eclass
@@ -3,6 +3,7 @@
# @ECLASS: ssl-cert.eclass
# @MAINTAINER:
+# maintainer-needed@gentoo.org
# @AUTHOR:
# Max Kalika
# @SUPPORTED_EAPIS: 1 2 3 4 5 6 7
diff --git a/eclass/stardict.eclass b/eclass/stardict.eclass
index cbfb10c54552..075c832829bf 100644
--- a/eclass/stardict.eclass
+++ b/eclass/stardict.eclass
@@ -1,11 +1,14 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-# Author : Alastair Tse
-#
-# Convienence class to do stardict dictionary installations.
-#
-# Usage:
+# @ECLASS: stardict.eclass
+# @MAINTAINER:
+# maintainer-needed@gentoo.org
+# @AUTHOR:
+# Alastair Tse
+# @BLURB: eclass to do stardict dictionary installations.
+
+# @Usage:
# - Variables to set :
# * FROM_LANG - From this language
# * TO_LANG - To this language
diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass
index 59f8660a3d90..095c53d4c1d8 100644
--- a/eclass/toolchain.eclass
+++ b/eclass/toolchain.eclass
@@ -1,8 +1,14 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-# Maintainer: Toolchain Ninjas
+# @ECLASS: toolchain.eclass
+# @MAINTAINER:
+# Toolchain Ninjas
+# @AUTHOR:
+# Toolchain Ninjas
# @SUPPORTED_EAPIS: 5 6 7
+# @BLURB: Basic toolchain stuff
+
DESCRIPTION="The GNU Compiler Collection"
HOMEPAGE="https://gcc.gnu.org/"
diff --git a/eclass/vim-doc.eclass b/eclass/vim-doc.eclass
index 5f281eba25f2..e21e2611296c 100644
--- a/eclass/vim-doc.eclass
+++ b/eclass/vim-doc.eclass
@@ -1,6 +1,11 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-#
+
+# @ECLASS: vim-doc.eclass
+# @MAINTAINER:
+# Vim project
+# @BLURB: Work with Vim documentation
+# @DESCRIPTION:
# This eclass is used by vim.eclass and vim-plugin.eclass to update
# the documentation tags. This is necessary since vim doesn't look in
# /usr/share/vim/vimfiles/doc for documentation; it only uses the
diff --git a/games-action/Manifest.gz b/games-action/Manifest.gz
index 1c9a40297e67..ac98deac346d 100644
Binary files a/games-action/Manifest.gz and b/games-action/Manifest.gz differ
diff --git a/games-action/formido/Manifest b/games-action/formido/Manifest
index af88af8193c5..c63337a949a3 100644
--- a/games-action/formido/Manifest
+++ b/games-action/formido/Manifest
@@ -1,4 +1,4 @@
DIST formido-1.0.1.tar.gz 3117496 BLAKE2B 19ba27513cb1ad28c2e1fdb80c956bb752b6a7515580d78de95d65a0e75d27c0ff780dc2b6ed2e0227570183976c2a5c6478218311af494139366e77a998fdc3 SHA512 72c4b92806eed79290da571c47fcd5427ccd0fafd3d5c5bc1cf641790e13b622eb40f8226e54daf30d1f301743f670115efe8f30279ed83b8fd58d69b6a7e123
DIST formido-music.tar.bz2 6159005 BLAKE2B 606a0eee0728ef38f94acde72be33914ca22762b78452c25c846fde950e1d694a381aa41cbc8a56d78719876304add14ac983483800f138f4407e9e7bfbc8b5a SHA512 116ff8af42b68cf641f459b642d42c579decf8ee1314a45de30d4f5452e1669dab5cfdc3a61a72359305f690e686312ea0e1666e724de8b214f3d4d8f6034bd3
-EBUILD formido-1.0.1-r1.ebuild 1077 BLAKE2B c8068ad9968c8a3e12d90f705909a52b06114ae28415924e6e586a0660d40370876e9a46a56efe4bd0d0a72d268bf96ad3a39a89777095b7cf19792a669e54c1 SHA512 9dc03add6fdada41b1b6a476ebb3170154a1f5d0ca29ee05cee308cd346537d269f400f47976de5e87ff603f96eed43f50a799216b042fd8f884f8dfb3a1dc3c
+EBUILD formido-1.0.1-r2.ebuild 1098 BLAKE2B 047f612ba0c78f9ba6e16ee5407de0a742c9f025c6116ae654b216aab0b0cb3dfe9e26b7ab0ee12a15c8dbab27dba05b282b38bd50d69cdc71fea366a896377e SHA512 547a8864f6fee23d72cc9bbdee773b2469c0339a58e518394c1c6369e22ecf688adebe3df9cab62b911383953f6aa812778b5627172e186e2bac039dde089053
MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-action/formido/formido-1.0.1-r1.ebuild b/games-action/formido/formido-1.0.1-r2.ebuild
similarity index 75%
rename from games-action/formido/formido-1.0.1-r1.ebuild
rename to games-action/formido/formido-1.0.1-r2.ebuild
index 6f6f10f9c8af..053a48c66e0f 100644
--- a/games-action/formido/formido-1.0.1-r1.ebuild
+++ b/games-action/formido/formido-1.0.1-r2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
inherit desktop toolchain-funcs
@@ -13,7 +13,6 @@ SRC_URI="http://noe.falzon.free.fr/prog/${P}.tar.gz
LICENSE="GPL-2"
SLOT=0
KEYWORDS="~amd64 ~x86"
-IUSE=""
DEPEND="media-libs/libsdl[sound,video]
media-libs/sdl-image
@@ -30,14 +29,18 @@ src_prepare() {
default
sed -i \
- -e "s:g++:$(tc-getCXX):" \
- -e "/^FLAGS=/s:$: ${CXXFLAGS}:" \
- -e "/^LINKFLAGS=/s:=.*:=${LDFLAGS}:" \
- -e "s:\${DATDIR}:/usr/share/${PN}/data:" \
- -e "s:\${DEFCONFIGDIR}:/usr/share/${PN}:" \
+ -e '/^FLAGS=/s:$: $(CXXFLAGS):' \
Makefile || die
}
+src_compile() {
+ emake CC="$(tc-getCXX)" \
+ CXXFLAGS="${CXXFLAGS}" \
+ LINKFLAGS="${LDFLAGS}" \
+ DATDIR="${EPREFIX}/usr/share/formido/data" \
+ DEFCONFIGDIR="${EPREFIX}/usr/share/formido"
+}
+
src_install() {
dobin ${PN}
insinto /usr/share/${PN}
diff --git a/games-engines/Manifest.gz b/games-engines/Manifest.gz
index 998a7b3812d8..d78ce229e596 100644
Binary files a/games-engines/Manifest.gz and b/games-engines/Manifest.gz differ
diff --git a/games-engines/stratagus/Manifest b/games-engines/stratagus/Manifest
index f6d7e76936d5..ffd7c6836ffe 100644
--- a/games-engines/stratagus/Manifest
+++ b/games-engines/stratagus/Manifest
@@ -3,5 +3,6 @@ AUX stratagus-2.3.0-doc.patch 378 BLAKE2B 673afcbcf6131a49d03b683db2b430795b3022
DIST stratagus-2.4.1.tar.gz 1087678 BLAKE2B be7fc8322aee2a28c80833d44c3180e26b961ce9dfd1bc5e0a8e3fa0caac74bf713224de4c38b2ebf6d5aeabbe778a5664346c6a444b066f07f719bba5317bac SHA512 1f0420677df72e3e2d2f31e60030fa2eba4c3d1ab80cfc79c045724fe39ac237846bc38e8762ee9aa51768a443cdbbaa1fe91bf80fb2164261288a1bb17e27cd
DIST stratagus-2.4.3.tar.gz 1123537 BLAKE2B 90e40b2b277b5c52977f3c0ae2ae8f2e65d940d765e2ca4f7def4f8cf903399350f5e46f6dc6fbc38f3a53c7ca9ecaf5cf38025ec69154972869f28da37865d4 SHA512 16271c4fed3fb75fb8fb08e363e72713ede7979ea7e25b7c83db2fa9a0688fb7927cad3379e3b23e172c409cf0f6db18f7c6557d19a693c9a7f24109b56d2a56
EBUILD stratagus-2.4.1.ebuild 1523 BLAKE2B 3b165318ba374101a436297ef4e8bdfefe977fa60ef850001f1de415135babc0d6692a4321c3a56a7249ccbc5cf903b1322e4c51e202c590636125ab43d41251 SHA512 0751342ca95b1384e116732401481c341c0c79555eecda4ab6dda0318d0823c6130ea4a4e988ec97c77a315bc5f70db8be4b36c6cd9e705a7fe0885d86bab269
+EBUILD stratagus-2.4.3-r100.ebuild 1585 BLAKE2B 207b0a52a39c7704491a8e64181336401e5594f1103e6d14933df721f08f34755e066199033c9a13eba77237de8892e6964790b974622fa31c6a8c130f7a0c75 SHA512 873a5079b9783abf710df210876048f6928f06e1963cb75ed13bc7cf549b9d97fb10a0f04bbf3afde13209777013efef35225a3349e69437f8f3eeb14b8cd3ee
EBUILD stratagus-2.4.3.ebuild 1516 BLAKE2B a31e4732e29ab32c34f161956c107d159e3b9fdc22a3c882b02278d161b1239392e9aafa855f58caf5945dde82815254b37712e18f282e570a388c84832d12e8 SHA512 d7b71f58898721bb8a6d73a6fb42456433dc1ba0494e16ecc9ffcfeda565e0c6b03aac333e3c21654746f7209fd542e09bc2431c562626743c0fe0a802ee8ca9
MISC metadata.xml 526 BLAKE2B ae5eabae36efabcfa6af79a4ec6be482532af44eddb2725b5405a013dbc12171440c8790cae30c5e21dce0eaa605bfd0273c6f7e985149b9b0b5c6a9e86a2dc2 SHA512 b1ec75815ac742ab9c9a69ffc83bf191de9ba5c6b461a1094d6827e90d104e9db63a92f2094e93cd235265ffb8e4c690f51cd5729b86bfe74a8f30af069444e6
diff --git a/games-engines/stratagus/stratagus-2.4.3-r100.ebuild b/games-engines/stratagus/stratagus-2.4.3-r100.ebuild
new file mode 100644
index 000000000000..5b096ccea6d1
--- /dev/null
+++ b/games-engines/stratagus/stratagus-2.4.3-r100.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-1 )
+
+inherit cmake lua-single
+
+DESCRIPTION="A realtime strategy game engine"
+HOMEPAGE="https://wargus.github.io/stratagus.html
+ https://github.com/Wargus/stratagus"
+SRC_URI="https://github.com/Wargus/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="bzip2 debug doc fluidsynth mikmod mng theora vorbis"
+REQUIRED_USE="${LUA_REQUIRED_USE}
+ theora? ( vorbis )"
+
+RDEPEND="${LUA_DEPS}
+ dev-db/sqlite:3
+ dev-lua/toluapp[${LUA_SINGLE_USEDEP}]
+ media-libs/libpng:0
+ virtual/opengl
+ x11-libs/libX11
+ media-libs/libsdl[sound,opengl,video]
+ sys-libs/zlib
+ bzip2? ( app-arch/bzip2 )
+ fluidsynth? ( media-sound/fluidsynth )
+ mikmod? ( media-libs/libmikmod )
+ mng? ( media-libs/libmng )
+ vorbis? (
+ media-libs/libogg
+ media-libs/libvorbis
+ theora? ( media-libs/libtheora )
+ )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ virtual/pkgconfig
+ doc? ( app-doc/doxygen )"
+
+PATCHES=(
+ "${FILESDIR}/${PN}"-2.3.0-doc.patch
+)
+
+src_prepare() {
+ sed -i -e 's:-Werror::' CMakeLists.txt || die
+ cmake_src_prepare
+}
+
+src_configure() {
+ # there are in-source switches
+ use debug && CMAKE_BUILD_TYPE=Debug
+
+ local mycmakeargs=(
+ -DGAMEDIR="/usr/bin"
+ -DDOCDIR="/usr/share/doc/${PF}"
+ -DWITH_BZIP2=$(usex bzip2)
+ -DWITH_FLUIDSYNTH=$(usex fluidsynth)
+ -DWITH_MIKMOD=$(usex mikmod)
+ -DWITH_MNG=$(usex mng)
+ -DWITH_OGGVORBIS=$(usex vorbis)
+ -DWITH_THEORA=$(usex theora)
+ -DENABLE_DOC=$(usex doc)
+ -DENABLE_DEV=ON
+ )
+
+ cmake_src_configure
+}
diff --git a/games-fps/Manifest.gz b/games-fps/Manifest.gz
index 7743380c0569..56337e6c632f 100644
Binary files a/games-fps/Manifest.gz and b/games-fps/Manifest.gz differ
diff --git a/games-fps/eduke32/Manifest b/games-fps/eduke32/Manifest
index 3887208ee47b..60560a1e8c73 100644
--- a/games-fps/eduke32/Manifest
+++ b/games-fps/eduke32/Manifest
@@ -10,6 +10,6 @@ DIST duke3d_psx-1.11.zip 7636016 BLAKE2B 63094c0eb2343e443f98844675ddc23a138d87c
DIST duke3d_voxels-1.21.zip 2997999 BLAKE2B dcb3103a82b45cfcf906d00147a57fe47997680ff7550973ed9741e62e78f9a099c1a13f65eaa133076d6551fcdfbf34e28ff59f2ad59f91ece98753e7d39523 SHA512 4b55dcc192cb2aa8830250fd222664272176bea8f6c6e4ac6d488abfecb1332b5793986c164fde78901904e2bde37e6ee4aa020c5eb578002de8f6102f44df15
DIST duke3d_xxx-1.33.zip 26586453 BLAKE2B 7e3c46172d3db1b2eb49eb07f243a9ead4f260d6b1dcae9f8bd599b8e9ba3a19068032afeb4ec2cf61742b6216e3a06c24f2b7e8903f9636f9d00f4d57ada47f SHA512 4783d159610fc178e748446b7a5f9c13d90e1aca3cef34deb82e99655b7f4a254f1130e16dbcfad9013b95bc07161d5c5dccfcc552fbb7a88404b4b9cedbadbf
DIST eduke32_classic.png 5129 BLAKE2B 332ad44b7f6b4f51362387aa6870e7db54423ca5a1f0586cb5019322fb72317d8e88e0bbf46ac89b56290db7e2e4a8442179a6eb87a615fd741b5f00ce96a1c8 SHA512 b41dece8f1ddcadde3367a83f6029ffdc5805811b40380e270169684fb3b368258bd8caeb55623dadffb6fb9d72faf9a3d75907722623f4fac94a4347f8ce833
-DIST eduke32_src_20201128-9276-42c62c58f.tar.xz 19786040 BLAKE2B 5cf8fced61ed5876030a4569e3068ef1e6d2542dbb57528aba0101e37d8233e9c878f1adba7deedd34cbbce37470c47be4d61713c2a4d9eafbcdc65c690a53a3 SHA512 54d2eb3d2caec8ef941796106c60a2cfeb6edc37f1c353cf8acbeacd3c96e4e2ccd037b0c6a9e1adc47406c3572aed816136190161b83948e36b364ec4edd518
-EBUILD eduke32-20201128.9276.ebuild 5981 BLAKE2B 137a2c86bf9f2a3bac6faf5bfbfb7cfe0edaae9c678cc32b70f374ef3591eefcb9029fe050fb70ead1a1f6b1dfc8b306ed0df729f3e9bbc798855b558401de8a SHA512 a22a61b807089a2df51a25f94d10cd23d2a33af0eeb9a87270dcb09c4d44d28f98cde9b161096dc1d8746e876d1a848acdd73655be0d3f27f904702a6a16da6e
+DIST eduke32_src_20201214-9286-74aceda66.tar.xz 19917364 BLAKE2B e871d18c216a11dc5c8396a06d23f42feb40dff7b6a2652601b9a13234e7e5e2f7194ccf1d3750a52f4fb66c6a3ca1386a4869a02ecaf11c64b34a082996dd05 SHA512 584cb1219d19c1d48f3f812c0e1378c9d672a1761ff568addd1094d040301b18feadc6340989a811fe7f80f6ef3046753bc261517fee133452aafbe50aabfb1a
+EBUILD eduke32-20201214.9286.ebuild 5980 BLAKE2B 4dad84a1be403dbf6638069484bc50bd5cabd9bb955e0855b2990c0f01fe807968414c8b4d2a3cd8ba8c93046984675a74360bf00bac02c462f87a936347b69e SHA512 33dcb32f29e72668477193c3d85103a9d30d4dee5257443bfe217185dd3ef52a435d3c520b739a165a36d234df3843437602faf0f3c1f6b727b716d4eb2a321f
MISC metadata.xml 1697 BLAKE2B 76ea172154c71939d93fb4599f516b782682b9d774daf740e8c6a31810926e9a42b9f0c91f131de51975ecde8d2f99a542ddad1757da60b21f4934baadf0222a SHA512 c8f3410f58e8da648e6b0399b5167829d60800aab710df2a370e3976eb27bd1c3f8ad313b964c6e8d47eb22236010ef6bd6bd148b989ee5489122e7b174e17a7
diff --git a/games-fps/eduke32/eduke32-20201128.9276.ebuild b/games-fps/eduke32/eduke32-20201214.9286.ebuild
similarity index 97%
rename from games-fps/eduke32/eduke32-20201128.9276.ebuild
rename to games-fps/eduke32/eduke32-20201214.9286.ebuild
index e7ec5d6a3a6a..7529d21a544e 100644
--- a/games-fps/eduke32/eduke32-20201128.9276.ebuild
+++ b/games-fps/eduke32/eduke32-20201214.9286.ebuild
@@ -5,7 +5,7 @@ EAPI=7
inherit desktop toolchain-funcs xdg-utils
-EGIT_COMMIT="42c62c58f"
+EGIT_COMMIT="74aceda66"
MY_BUILD="$(ver_cut 2)"
MY_DATE="$(ver_cut 1)"
MY_PV_HRP="5.4"
@@ -18,7 +18,7 @@ MY_PV_VOXELS="1.21"
DESCRIPTION="An open source engine port of the classic PC first person shooter Duke Nukem 3D"
HOMEPAGE="http://www.eduke32.com/"
SRC_URI="
- https://dukeworld.com/eduke32/synthesis/latest/${PN}_src_${MY_DATE}-${MY_BUILD}-${EGIT_COMMIT}.tar.xz
+ http://dukeworld.com/eduke32/synthesis/latest/${PN}_src_${MY_DATE}-${MY_BUILD}-${EGIT_COMMIT}.tar.xz
https://www.eduke32.com/images/eduke32_classic.png
hrp? ( http://www.duke4.org/files/nightfright/hrp/duke3d_hrp.zip -> duke3d_hrp-${MY_PV_HRP}.zip )
offensive? ( http://www.duke4.org/files/nightfright/related/duke3d_xxx.zip -> duke3d_xxx-${MY_PV_OFFENSIVE_XXX}.zip )
diff --git a/games-roguelike/Manifest.gz b/games-roguelike/Manifest.gz
index 9ae3f0500be3..ac8ecf1d2a7e 100644
Binary files a/games-roguelike/Manifest.gz and b/games-roguelike/Manifest.gz differ
diff --git a/games-roguelike/tomenet/Manifest b/games-roguelike/tomenet/Manifest
index b3f30e3adc83..67bf27c610fb 100644
--- a/games-roguelike/tomenet/Manifest
+++ b/games-roguelike/tomenet/Manifest
@@ -1,9 +1,6 @@
-AUX tomenet-4.6.1a-makefile.patch 2699 BLAKE2B 480333d83f89c557bbec4bfdbfe0146b2607c8c50269fe365b304575fd92c3948ba00e6b87dfa42a446c92a0830d267b052719b20e0a789c2454a78ab1064de7 SHA512 89e72ec53f43770b3fea6e4d99838eed37c1f537238e7b6c7a16edadcf3755e7611256435702802809575f988238f5f529c4b962994d5d13b34f77b8520cb25d
-AUX tomenet-4.7.2-makefile.patch 2365 BLAKE2B 23d83d5b5bcd21b881d4fd6455087fb447d28ffbeac7bf1941e6bbd82189971a8626e5725290c6d1650f5ba6cc006056ed5a7d3546f2d4671e387ce81f7bd0c3 SHA512 b10f3de114eacbbbe95c00e09d1b76cacd2765ac975fa1fe5c661a4939755b36242ddc8cbf5ef012765e4a82a884eb2cb6062e9074c96b6898189c9467bfc2c4
+AUX tomenet-4.7.3-makefile.patch 1627 BLAKE2B c34cb479c05590f00517009232a5ef0aee2e747d71f03f15e4ab3256b334dff757d42b8d75b1f167e934b8f7a55f51d8a87610ad75cba7ccb3d1ec0b291f6ed2 SHA512 3baf4952f1a4dcd99cca33d024b5c3bdf1adf5a4e433dc0b90fbf3857b164ce56fb3e8f9bad3f216e9d8cfc07e1c358b55a7cf05769b88fe54275149f457dd78
AUX tomenet-server-wrapper 105 BLAKE2B 3b23750806b3bb3a6b5fa9c99aca0f2dbbcce2852bcb80296fd97b36ffb6fa0896939636fce6938f0874ece0b30abe800d10479431eac2cf6d883332d2b432e9 SHA512 9f509cdcc694fe47eed4cfdcb14f0ab3ea7006c202e7f4d8798012e62b89f34cc26834131412e18d2f0edba4237b6c66f4743ff6b780e3080a52e9da992d8cc3
AUX tomenet-wrapper 557 BLAKE2B 9b73f87c55815b49f6444e01c552ee1ba102e64b042f33bed89627c39602cf5646e287be99ffd88f26a281b64c4d023b20f2eaac8b924438709a2ac9ef4e1009 SHA512 9a913502af52c7988e8cb3b9c678e556e5f07d4bf99e7e3951f1be6192980da22b8091617d4c4daaac356cd72d7e175706f96ca62d6581ab916bc7a7034eb629
-DIST tomenet-4.6.1a.tar.bz2 2990275 BLAKE2B 40d855e4f9e908a8802bba8fd95fcb8c69df026bdc9b891e14a79691e80f7caab48e7826066a761101d932116542d42240457d85998278f8a928dd64ed1ac522 SHA512 eb89cd2276a18947d55efcc745e0b0abc0d9ae8a8d922a4726632657f32657e762bd0530d721afcf9d4ab3eeed2da6e43a3822d1d8c2c3b630fdb4cde924ac9f
-DIST tomenet-4.7.2.tar.bz2 3253873 BLAKE2B 4cba4827a64588c850691ae3b5c7ad0097a322ab1baca42492cbe42bc1e76615fb0084b7b8608e20adf303bded42a9cb80c4d09d0a29f1f68699ffa8e04240bb SHA512 284aa71374b726fd86bfa6b0d820301ec7e5004ddb140a1567c54c883c138cabd2ac55085c222aa057b234dc822f717489128b857ed527fff7d702092bdb51d5
-EBUILD tomenet-4.6.1a.ebuild 2143 BLAKE2B 5d8d8090b9ee296683e037a2d84d4d0a0fbc02173fb7450bffa6495e041c268e88dba9bd6835d5de171b892f66924e71d712782b79ba5e109befab2760c23065 SHA512 6534f48ea79938264a95c05062ae10d29757b27b83241f73e2e23c6d3e83eda610c3f079c70f981a341335ac2aa2140c8e4e8d4ce3b9afeb20cf307927955c72
-EBUILD tomenet-4.7.2.ebuild 2057 BLAKE2B cdf3f6cf24757597e41a1ef5f1a2942f021ef02c8e037abdf2c31a105bc3b1e2644d54d1902142d068d73ed6676100147102571d7fc71dc9486efd41be84a410 SHA512 daf2663128b972e6e9eb74afcc03074e903fb7b11485dab4c6eb063141eef0eb3d6768f8966d8affcf668c2b960d81762444d7aa505c8e86713a40e12bb98656
-MISC metadata.xml 795 BLAKE2B 61b39e7ecb9d7bee7c9488ba16b75354b92b99fcd6157f8b249406557fb93b7bdb9d476c264b4aec5501bfe73987667e94b21db81d0a6aefea0fac7b76a4d418 SHA512 4e7b25ba67a044e76013a5d2c88979d5f082872e785576b37647face2e0cff9056d138df0cd16db23b5b79328156d110d7adf667ba2481c089569fb02b18a0f1
+DIST tomenet-4.7.3.tar.bz2 3355774 BLAKE2B e574434d283525793ad7b7e2c23103692c540be8727a90623b9fd52aba47d245be99cb39846046f4ba78795e168c8ef9342ff9ee16417dce3698036cbd6c50eb SHA512 25c7dedcd63306ada738078c412a45483ee6ac4c6fe116624a409cb4c9795270942cac2428c1ecafac45bbc9e3044890e308f8bd1bb1344dd156a610948addcd
+EBUILD tomenet-4.7.3.ebuild 2029 BLAKE2B 34739cfb541be230d99ab0c6417fad696a5691d01f13dbf0e2b996899f83f52ca5a95f3fe36466a05a272966b0528b3293b5bd6247a17a2824ba3de6ce9a365b SHA512 41ff9227b02ecf00054247f00b7a65e901c11905a9a67cdbb1d6162dfb77666183825119bc1986c7b8cd712a5d0481e4fd32bc860cc31c45d4143da6e15615b4
+MISC metadata.xml 831 BLAKE2B aea21f1ced6d7849fe8d4d8e7e44cf5034d9ad2db91f26b5ab47bbe9de83c20a6f380898ff1399701358ad839bcfefae6250c4c5e718e9eb0dc1fdfc816b5525 SHA512 99e687841cc0a3082e6101542f04cdbd48d608aa328d66aae39220a739f2278e6687107ed89ac4ecfcbde0aba52be6cefe82d3b743c536788c12f3eb724891e8
diff --git a/games-roguelike/tomenet/files/tomenet-4.6.1a-makefile.patch b/games-roguelike/tomenet/files/tomenet-4.6.1a-makefile.patch
deleted file mode 100644
index c78a55cebd94..000000000000
--- a/games-roguelike/tomenet/files/tomenet-4.6.1a-makefile.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-diff -ru tomenet-4.6.1a.orig/src/makefile tomenet-4.6.1a/src/makefile
---- tomenet-4.6.1a.orig/src/makefile 2015-12-31 07:05:21.000000000 -0500
-+++ tomenet-4.6.1a/src/makefile 2016-02-10 01:42:12.958344532 -0500
-@@ -203,7 +203,7 @@
- #
- # This is my compiler of choice, it seems to work most everywhere
- #
--CC = gcc
-+CC ?= gcc
-
- # For allowing #if..#else..#endif constructs in LUA files - C. Blue
- # Note: The flags must contain
-@@ -215,16 +215,26 @@
- # need to use the gcc invocation below instead.
- #
- # cpp variant:
--CPP = cpp
--CPPFLAGS = -C -P
-+#CPP = cpp
-+#CPPFLAGS = -C -P
- # gcc variant:
--#CPP = gcc
--#CPPFLAGS = -x c -E -Wp,-C,-P
-+CPP ?= gcc
-+CPPFLAGS = -x c -E -Wp,-C,-P
-
-
- # For variations with X11
- X11BASE = /usr/X11R6
-
-+# defines
-+ifdef USE_SDL
-+CFLAGS += -DSOUND_SDL $(shell sdl-config --cflags)
-+SDL_LIBS = $(shell sdl-config --libs) -lSDL_mixer
-+endif
-+
-+ifdef USE_X
-+CFLAGS += -I${X11BASE}/include -DUSE_X11
-+LIBS += -L${X11BASE}/lib -lX11
-+endif
-
- ##
- ## Standard version -- supports X11 (main-x11.c)
-@@ -237,6 +247,11 @@
- #CFLAGS = -g -pipe -Wall -DUSE_X11 -I${X11BASE}/include -D_XOPEN_SOURCE -D_BSD_SOURCE -DMEXP=19937 -std=c99 -DSOUND_SDL `sdl-config --cflags`
- #LIBS = -L${X11BASE}/lib -L/usr/pkg/lib -lX11 -lcrypt -lm `sdl-config --libs` -lSDL_mixer
- ##
-+
-+CFLAGS += -Wall
-+CFLAGS += -DUSE_GCU -D_XOPEN_SOURCE -D_BSD_SOURCE -DMEXP=19937 -std=c99
-+LIBS += -L/usr/pkg/lib $(shell ${PKG_CONFIG} --libs ncurses) -lcrypt -lm ${SDL_LIBS}
-+
- ## Without SDL
- #CFLAGS = -g -pipe -Wall -DUSE_X11 -I${X11BASE}/include -D_XOPEN_SOURCE -D_BSD_SOURCE -DMEXP=19937 -std=c99
- #LIBS = -L${X11BASE}/lib -L/usr/pkg/lib -lX11 -lcrypt -lm
-@@ -256,8 +271,8 @@
- # attempt to "guess" at many of these flags based on your system.
- #
- ## With SDL
--CFLAGS = -g -pipe -Wall -DUSE_X11 -DUSE_GCU -I${X11BASE}/include -D_XOPEN_SOURCE -D_BSD_SOURCE -DMEXP=19937 -std=c99 -DSOUND_SDL `sdl-config --cflags` -D_DEFAULT_SOURCE -DACC32
--LIBS = -L${X11BASE}/lib -L/usr/pkg/lib -lX11 -lncurses -lcrypt -lm `sdl-config --libs` -lSDL_mixer
-+#CFLAGS = -g -pipe -Wall -DUSE_X11 -DUSE_GCU -I${X11BASE}/include -D_XOPEN_SOURCE -D_BSD_SOURCE -DMEXP=19937 -std=c99 -DSOUND_SDL `sdl-config --cflags` -D_DEFAULT_SOURCE -DACC32
-+LIBS = -L${X11BASE}/lib -L/usr/pkg/lib -lX11 $(shell ${PKG_CONFIG} --libs ncurses) -lcrypt -lm $(shell sdl-config --libs) -lSDL_mixer
- ##
- ## Without SDL
- #CFLAGS = -g -pipe -Wall -DUSE_X11 -DUSE_GCU -I${X11BASE}/include -D_XOPEN_SOURCE -D_BSD_SOURCE -DMEXP=19937 -std=c99
-@@ -357,10 +372,6 @@
- # Compile a client with 'test client' version/tag
- tomenet.test: CFLAGS += -DTEST_CLIENT -O0
-
--# Normal release build
--tomenet: CFLAGS += -O2
--
--
- # Lua
- SRCS += $(LUASRCS)
- SRCS += $(CLI_LUASRCS)
diff --git a/games-roguelike/tomenet/files/tomenet-4.7.2-makefile.patch b/games-roguelike/tomenet/files/tomenet-4.7.2-makefile.patch
deleted file mode 100644
index 1b89c2bc987d..000000000000
--- a/games-roguelike/tomenet/files/tomenet-4.7.2-makefile.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-diff --git a/makefile b/makefile
-index ee56a33..7f3c81f 100644
---- a/makefile
-+++ b/makefile
-@@ -203,7 +203,7 @@ CLI_LUAOBJS = \
- #
- # This is my compiler of choice, it seems to work most everywhere
- #
--CC = gcc
-+CC ?= gcc
-
- # For allowing #if..#else..#endif constructs in LUA files - C. Blue
- # Note: The flags must contain
-@@ -215,16 +215,26 @@ CC = gcc
- # need to use the gcc invocation below instead.
- #
- # cpp variant:
--CPP = cpp
--CPPFLAGS = -C -P
-+#CPP = cpp
-+#CPPFLAGS = -C -P
- # gcc variant:
--#CPP = gcc
--#CPPFLAGS = -x c -E -Wp,-C,-P
-+CPP ?= gcc
-+CPPFLAGS = -x c -E -Wp,-C,-P
-
-
- # For variations with X11
- X11BASE = /usr/X11R6
-
-+# defines
-+ifdef USE_SDL
-+CFLAGS += -DSOUND_SDL $(shell sdl-config --cflags)
-+SDL_LIBS = $(shell sdl-config --libs) -lSDL_mixer
-+endif
-+
-+ifdef USE_X
-+CFLAGS += -I${X11BASE}/include -DUSE_X11
-+LIBS += -L${X11BASE}/lib -lX11
-+endif
-
- ##
- ## Standard version -- supports X11 (main-x11.c)
-@@ -236,6 +246,11 @@ X11BASE = /usr/X11R6
- ## With SDL
- #CFLAGS = -O2 -g -pipe -Wall -DUSE_X11 -I${X11BASE}/include -D_XOPEN_SOURCE -D_BSD_SOURCE -DMEXP=19937 -std=c99 -DSOUND_SDL `sdl-config --cflags`
- #LIBS = -L${X11BASE}/lib -L/usr/pkg/lib -lX11 -lcrypt -lm `sdl-config --libs` -lSDL_mixer
-+
-+CFLAGS += -Wall
-+CFLAGS += -DUSE_GCU -D_XOPEN_SOURCE -D_BSD_SOURCE -DMEXP=19937 -std=c99
-+LIBS += -L/usr/pkg/lib $(shell ${PKG_CONFIG} --libs ncurses) -lcrypt -lm ${SDL_LIBS}
-+
- ##
- ## Without SDL
- #CFLAGS = -O2 -g -pipe -Wall -DUSE_X11 -I${X11BASE}/include -D_XOPEN_SOURCE -D_BSD_SOURCE -DMEXP=19937 -std=c99
-@@ -259,7 +274,7 @@ X11BASE = /usr/X11R6
- #CFLAGS = -O2 -g -pipe -Wall -DUSE_X11 -DUSE_GCU -I${X11BASE}/include -D_XOPEN_SOURCE -D_BSD_SOURCE -DMEXP=19937 -std=c99 -DSOUND_SDL `sdl-config --cflags` -D_DEFAULT_SOURCE -DACC32 -fPIC
- CFLAGS = -O2 -g -pipe -Wall -DUSE_X11 -DUSE_GCU -I${X11BASE}/include -D_XOPEN_SOURCE -D_BSD_SOURCE -DMEXP=19937 -std=c99 -DSOUND_SDL `sdl-config --cflags` -D_DEFAULT_SOURCE -DACC32 -fPIC -Wno-format-truncation
- #LIBS = -L${X11BASE}/lib -L/usr/pkg/lib -lX11 -lncurses -lcrypt -lm `sdl-config --libs` -lSDL_mixer
--LIBS = -L${X11BASE}/lib -L/usr/pkg/lib -lX11 -lncurses -lcrypt -lm `sdl-config --libs` -lSDL_mixer
-+LIBS = -L${X11BASE}/lib -L/usr/pkg/lib -lX11 $(shell ${PKG_CONFIG} --libs ncurses) -lcrypt -lm $(shell sdl-config --libs) -lSDL_mixer
- ACCEDIT_LIBS = -lcurses -lcrypt
- ##
- ## Without SDL
diff --git a/games-roguelike/tomenet/files/tomenet-4.7.3-makefile.patch b/games-roguelike/tomenet/files/tomenet-4.7.3-makefile.patch
new file mode 100644
index 000000000000..c00fc5f1e699
--- /dev/null
+++ b/games-roguelike/tomenet/files/tomenet-4.7.3-makefile.patch
@@ -0,0 +1,43 @@
+diff --git a/makefile b/makefile
+index ee56a33..7f3c81f 100644
+--- a/makefile
++++ b/makefile
+@@ -224,7 +224,7 @@ CPP = cpp
+ #thing is, that the correctly transcribed URL will actually make tolua choke.
+ #So, -nostdinc will prevent the whole own comment blob of cpp to get generated
+ #in the first place, as we never asked for it:
+-CPPFLAGS = -C -P -nostdinc
++CPPFLAGS = -C -P -nostdinc $(GENTOO_CPPFLAGS)
+
+ # gcc variant:
+ #CPP = gcc
+--- a/makefile
++++ b/makefile
+@@ -234,5 +234,19 @@ CC = gcc
+ X11BASE = /usr/X11R6
+
++# defines
++ifdef USE_SDL
++CFLAGS += -DSOUND_SDL $(shell sdl-config --cflags)
++SDL_LIBS = $(shell sdl-config --libs) -lSDL_mixer
++endif
++
++ifdef USE_X
++CFLAGS += -DUSE_X11
++LIBS += -lX11
++endif
++
++CFLAGS += -Wall
++CFLAGS += -DUSE_GCU -D_XOPEN_SOURCE -D_BSD_SOURCE -DMEXP=19937 -std=c99
++LIBS += $(shell ${PKG_CONFIG} --libs ncurses) -lcrypt -lm ${SDL_LIBS}
+
+ ##
+ ## Standard version -- supports X11 (main-x11.c)
+@@ -259,7 +274,5 @@ X11BASE = /usr/X11R6
+ #CFLAGS = -O2 -g -pipe -Wall -DUSE_X11 -DUSE_GCU -I${X11BASE}/include -D_XOPEN_SOURCE -D_BSD_SOURCE -DMEXP=19937 -std=c99 -DSOUND_SDL `sdl-config --cflags` -D_DEFAULT_SOURCE -DACC32 -fPIE
+-CFLAGS = -O2 -g -pipe -Wall -DUSE_X11 -DUSE_GCU -I${X11BASE}/include -D_XOPEN_SOURCE -D_BSD_SOURCE -DMEXP=19937 -std=c99 -DSOUND_SDL `sdl-config --cflags` -D_DEFAULT_SOURCE -DACC32 -fPIE -Wno-format-truncation
+ #LIBS = -L${X11BASE}/lib -L/usr/pkg/lib -lX11 -lncurses -lcrypt -lm `sdl-config --libs` -lSDL_mixer
+-LIBS = -L${X11BASE}/lib -L/usr/pkg/lib -lX11 -lncurses -lcrypt -lm `sdl-config --libs` -lSDL_mixer
+ ACCEDIT_LIBS = -lcurses -lcrypt
+ ##
+ ## Without SDL
diff --git a/games-roguelike/tomenet/metadata.xml b/games-roguelike/tomenet/metadata.xml
index 9d9cd998599c..b80155092934 100644
--- a/games-roguelike/tomenet/metadata.xml
+++ b/games-roguelike/tomenet/metadata.xml
@@ -6,7 +6,8 @@
Gentoo Games Project
TomeNET is a multiplayer fantasy dungeon exploration game based on
diff --git a/games-roguelike/tomenet/tomenet-4.6.1a.ebuild b/games-roguelike/tomenet/tomenet-4.6.1a.ebuild
deleted file mode 100644
index ec80992655ca..000000000000
--- a/games-roguelike/tomenet/tomenet-4.6.1a.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils gnome2-utils toolchain-funcs games
-
-DESCRIPTION="A MMORPG based on the works of J.R.R. Tolkien"
-HOMEPAGE="https://www.tomenet.eu"
-SRC_URI="https://www.tomenet.eu/downloads/${P}.tar.bz2"
-
-LICENSE="Moria"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="dedicated server +sound X"
-
-RDEPEND="sys-libs/ncurses:0
- !dedicated? (
- X? (
- x11-libs/libX11
- )
- sound? (
- media-libs/libsdl[sound]
- media-libs/sdl-mixer[vorbis,smpeg,mp3]
- )
- )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- !dedicated? ( sound? ( app-arch/p7zip[wxwidgets] ) )"
-
-S=${WORKDIR}/${P}/src
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-makefile.patch
- use server || use dedicated || { rm -r ../lib/{config,data,save} || die ;}
-
- sed \
- -e "s#@LIBDIR@#${GAMES_DATADIR}/${PN}#" \
- "${FILESDIR}"/${PN}-wrapper > "${T}"/${PN} || die
-
- if use server || use dedicated ; then
- sed \
- -e "s#@LIBDIR@#${GAMES_DATADIR}/${PN}#" \
- "${FILESDIR}"/${PN}-server-wrapper > "${T}"/${PN}.server || die
- fi
-
- tc-export PKG_CONFIG
-}
-
-src_compile() {
- local mytargets="$(usex dedicated "accedit tomenet.server" "$(usex server "all" "tomenet")")"
- emake \
- $(usex dedicated "" "$(usex X "USE_X=1" "")") \
- $(usex dedicated "" "$(usex sound "USE_SDL=1" "")") \
- -f makefile \
- ${mytargets[@]}
-}
-
-src_install() {
- dodoc ../TomeNET-Guide.txt
-
- if ! use dedicated ; then
- newgamesbin ${PN} ${PN}.bin
- dogamesbin "${T}"/${PN}
-
- doicon -s 48 client/tomenet4.png
- make_desktop_entry ${PN} ${PN} ${PN}4
- fi
-
- if use server || use dedicated ; then
- newgamesbin tomenet.server tomenet.server.bin
- dogamesbin "${T}"/${PN}.server accedit
- fi
-
- insinto "${GAMES_DATADIR}/${PN}"
- doins -r ../lib/*
- doins ../.tomenetrc
-
- prepgamesdirs
-}
-
-pkg_preinst() {
- games_pkg_preinst
- gnome2_icon_savelist
-}
-
-pkg_postinst() {
- games_pkg_postinst
- gnome2_icon_cache_update
-
- if use sound; then
- elog "You can get soundpacks from here:"
- elog ' http://tomenet.net/downloads.php'
- elog "They must be placed inside ~/.tomenet directory."
- fi
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
-}
diff --git a/games-roguelike/tomenet/tomenet-4.7.2.ebuild b/games-roguelike/tomenet/tomenet-4.7.3.ebuild
similarity index 59%
rename from games-roguelike/tomenet/tomenet-4.7.2.ebuild
rename to games-roguelike/tomenet/tomenet-4.7.3.ebuild
index 5da772d9c22c..7c9991bde4d9 100644
--- a/games-roguelike/tomenet/tomenet-4.7.2.ebuild
+++ b/games-roguelike/tomenet/tomenet-4.7.3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
-inherit eutils gnome2-utils toolchain-funcs
+EAPI=7
+inherit desktop toolchain-funcs xdg
DESCRIPTION="A MMORPG based on the works of J.R.R. Tolkien"
HOMEPAGE="https://www.tomenet.eu"
@@ -11,10 +11,11 @@ SRC_URI="https://www.tomenet.eu/downloads/${P}.tar.bz2"
LICENSE="Moria"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE="dedicated server +sound X"
+IUSE="+client server +sound X"
+REQUIRED_USE="|| ( client server )"
RDEPEND="sys-libs/ncurses:0
- !dedicated? (
+ client? (
X? (
x11-libs/libX11
)
@@ -24,8 +25,8 @@ RDEPEND="sys-libs/ncurses:0
)
)"
DEPEND="${RDEPEND}
- virtual/pkgconfig
- !dedicated? ( sound? ( app-arch/p7zip[wxwidgets] ) )"
+ client? ( sound? ( app-arch/p7zip[wxwidgets] ) )"
+BDEPEND="virtual/pkgconfig"
S=${WORKDIR}/${P}/src
@@ -35,15 +36,17 @@ PATCHES=(
src_prepare() {
default
- use server || use dedicated || { rm -r ../lib/{config,data,save} || die ;}
+ if ! use server; then
+ rm -r ../lib/{config,data,save} || die
+ fi
sed \
- -e "s#@LIBDIR@#/usr/share/${PN}#" \
+ -e "s#@LIBDIR@#${EPREFIX}/usr/share/${PN}#" \
"${FILESDIR}"/${PN}-wrapper > "${T}"/${PN} || die
- if use server || use dedicated ; then
+ if use server; then
sed \
- -e "s#@LIBDIR@#/usr/share/${PN}#" \
+ -e "s#@LIBDIR@#${EPREFIX}/usr/share/${PN}#" \
"${FILESDIR}"/${PN}-server-wrapper > "${T}"/${PN}.server || die
fi
@@ -51,10 +54,13 @@ src_prepare() {
}
src_compile() {
- local mytargets="$(usex dedicated "accedit tomenet.server" "$(usex server "all" "tomenet")")"
+ local mytargets="$(usex client "tomenet" "") $(usex server "accedit tomenet.server" "")"
emake \
- $(usex dedicated "" "$(usex X "USE_X=1" "")") \
- $(usex dedicated "" "$(usex sound "USE_SDL=1" "")") \
+ $(usex client "$(usex X "USE_X=1" "")" "") \
+ $(usex client "$(usex sound "USE_SDL=1" "")" "") \
+ CC="$(tc-getCC)" \
+ CPP="$(tc-getCPP)" \
+ GENTOO_CPPFLAGS="${CPPFLAGS}" \
-f makefile \
${mytargets[@]}
}
@@ -62,7 +68,7 @@ src_compile() {
src_install() {
dodoc ../TomeNET-Guide.txt
- if ! use dedicated ; then
+ if use client ; then
newbin ${PN} ${PN}.bin
dobin "${T}"/${PN}
@@ -70,7 +76,7 @@ src_install() {
make_desktop_entry ${PN} ${PN} ${PN}4
fi
- if use server || use dedicated ; then
+ if use server ; then
newbin tomenet.server tomenet.server.bin
dobin "${T}"/${PN}.server accedit
fi
@@ -80,20 +86,12 @@ src_install() {
doins ../.tomenetrc
}
-pkg_preinst() {
- gnome2_icon_savelist
-}
-
pkg_postinst() {
- gnome2_icon_cache_update
+ xdg_pkg_postinst
if use sound; then
elog "You can get soundpacks from here:"
- elog ' https://tomenet.net/downloads.php'
+ elog ' https://tomenet.eu/downloads.php'
elog "They must be placed inside ~/.tomenet directory."
fi
}
-
-pkg_postrm() {
- gnome2_icon_cache_update
-}
diff --git a/games-simulation/Manifest.gz b/games-simulation/Manifest.gz
index 58a3d348fb73..e07540d33f3e 100644
Binary files a/games-simulation/Manifest.gz and b/games-simulation/Manifest.gz differ
diff --git a/games-simulation/openrct2/Manifest b/games-simulation/openrct2/Manifest
index 6bf3afc785d4..96f73af58fd2 100644
--- a/games-simulation/openrct2/Manifest
+++ b/games-simulation/openrct2/Manifest
@@ -3,14 +3,10 @@ AUX openrct2-0.2.4-include-additional-paths.patch 1583 BLAKE2B b21e59cfaa37b2115
AUX openrct2-0.2.6-gtest-1.10.patch 740 BLAKE2B b974fbf84765776018e13700f3c9151fa7613ed4aef76257b3d8d47bdc48d4e13314115ed5eb9e713a09213ca5c43906f13ce7929ef6795a5ab53a0c75000e3b SHA512 0d955664b28e68e39134438034c0559ee56a98fa7cd16dc5b90a1290f59defe700f4653ad053b4ca403f13f35cb822c0b063a0ff3777996c6049cd686a9a724f
AUX openrct2.confd 415 BLAKE2B 08c22a6940f07d89b6414917d5438d2926b71397c1aa590db805fea67fe6857ccd7e00117edb0f8135fd055d741ec071e3cd439bd62f516142151ef3af76b2a4 SHA512 d2f6863c507389eab1117497edca2a21121c115b7fd06f59bc358f0a610ebf58b8df3be7683aaf105cc481c27647c4cfa36893c33b3a1da0624325927b5e3d9b
AUX openrct2.initd 1424 BLAKE2B 0b5940000d0d7ebf0ad14d2326fc6342380fe9fd5266a49610d4c62686062ce2fbaca7c3211f0026d3c8bda6ad8bc7526838734571266da745e2d67ca8be9ec8 SHA512 3c1ebbe9874ecda50b9420d1cb27633a9ddec57f5afab39ceac0845e44c7fdfd0fd0dd9799a14b09f45d3c7e85a93cd994515d495c3b2f1d4e8012e5716f1409
-DIST openrct2-0.3.0.tar.gz 11754657 BLAKE2B 66d956fd85829bc6b4825a59db9f3a3eebbb1e4565a4c8afdb8c05d9d7b3f339f75ff1d9fbc0a0f48d3c0673ac3fc335fb6bec5fe458513de2a0611ccfa3d48d SHA512 585bcd7a077114dc5332b95cb44f7c689e47fcbd7cff7c2ab32a24253a4fd87f50e79f40f9428c79ea6bc6d8cd88019b4edfce88509c03bc2d43854926d21317
DIST openrct2-0.3.2.tar.gz 12749225 BLAKE2B de79fefdb860dae1bf2962f9359d1ea46ab073c80206b6687ef40386725c84d1d048eafbd3f3aeb3fcae3136528568943e4cb88ae0f78b4f6c04d127726254e8 SHA512 e9986ce1fb7e57b4ac80b1de6c99f6b9d26a7a37b4e7fe081528f4faac41833871f9bcf8df864302b8d902271561fc44e606acf8d9adfaf789f69fbc4ae379a7
-DIST openrct2-objects-1.0.16.zip 3056214 BLAKE2B 7d8d938ba20ce612f7845dce1038134ec60d7e17e0f7d78a67480ae1ae2e6f8dd043f266742acd2dbd8539390349a2dcd7b8c73859a3caef3b5cd8565a4ec1c7 SHA512 2a8696467320f7894330d0fbb4894dd6effb2d6844fcf643e1f8e15a7b0b45411a7c205b75a9e9d7ea0627bc70b7a7e1e2213e0f7db1c7b489ae8b485670dba5
DIST openrct2-objects-1.0.18.zip 3117675 BLAKE2B faccbd11ff7995977b45cc81df07fde8eeecd781141cab813026bc551fb0d867edd078627cc83a6317fddccd025ed3019e14596bf107f48d287110d69c6f73bd SHA512 12deb118740e83a1dcd64b5196371f0fd4f57a3593ab58cb71867ccd35e7a9b0641bb797ab15266ec932c96f1fc208daa7b0e8683ac7e7ef48342733d8b58aa4
-DIST openrct2-replays-0.0.17.zip 1825315 BLAKE2B 9c22b52302c37abe5e802662eb4b6805fa3e229a71ab9f901b57eee30641ae4b86de9b1315476d158a3feb57c6be2a26c1ccca7c94328fe35bf57b46e2364c32 SHA512 103a8ba5b5b2dd76c18b642720d262553bb15ad26d59892f895327bf5e87b73e476b255af6556286faacb668aae49aa1ee29a14bcca2bb75d855383d12e60f4a
DIST openrct2-replays-0.0.19.zip 1825303 BLAKE2B d7ddbe090fe041f5bdeab435d223a40f5e8a231850393aa0274813c1b5db0abc2086dcf5b0e807232edf9ceaa05ce98efca14869a01742820366460353c29320 SHA512 09615b9687da0de1fd690765305a413b8e57b1de48d42a8707a9e4167ac20566b39b2abb6112b200ac0caab45001b7cd2896df71205d64df0c61e7742e082de5
DIST openrct2-title-sequences-0.1.2c.zip 2980030 BLAKE2B f91168bea0a4f88a801c95ea45759e0d1c887a89c18dbbded5887d2914db7119dd65c231aa422e4f8a964a81d832eae05bffaa8b7908fac39a63792d082b53a0 SHA512 0e544d236d5f6ac7f68d75ba1f56f043c76c77676cbb92e6fdbf68a6ae2dc6c41dbdad6083ceec36b2f774bcdd99f64f28de73b208d6a39a8218a9e95502d46e
-EBUILD openrct2-0.3.0-r1.ebuild 3939 BLAKE2B 54a337d6885a3dcb7b22125c1c486e00c4e56c89337af2b82594a5c240fc9db52948d80d0f1a6469014880820cc63a13865c49015ba51acf4c314ec956dc0fc1 SHA512 49ef33f4b00dfa6794a16bef60f4e46ac7f63dd76dfe4308961d95af06a9cae4add7966a7a468753dc50c2693a84369899182981e3a0e82013a796458a08e9cf
-EBUILD openrct2-0.3.2-r1.ebuild 3963 BLAKE2B ce8a4f7c0a9ee9e7777f5511f4d679ce0172179ea18d6452d98abd40473dea01879b6cbe42d0bf1faad0a63073539e40178fc03ada7bf8aec977387d57de1eef SHA512 577c8dd7f6f7f948caf2a3b6e32d57835d2ec4dfe5619e0fc163b90639b9083e9db669c5f23ab1833dcc330094774e2149301256a6e70242edb5f046ee211b31
+EBUILD openrct2-0.3.2-r1.ebuild 3962 BLAKE2B b729a666bef756a63e6473b9a6cac608690311f08a9bdd25a90d9a644e1122e38f3d23d9cc3bf41c4b0090dc61b24b392fef6cf248487f99a50a64324dc0d89b SHA512 61f6577fb382260851bc22e87e41181973b58b2cd5cb835b58687fbffa814e7c833bf6aa3fe4b51b2d5025de157f0b02e6f0b642b7c3fc3f199407138a7dd1f5
EBUILD openrct2-9999.ebuild 3924 BLAKE2B 5d37135db8e8d701a80658aa26906dfa5c863d2bc1096eeb8860e7cb34d9bb4b12f812010d8333a0c75b34214741fbaf54fee1f183dd6280a2b81baa9c4d0755 SHA512 f9e65e96326e2c012aa1e2bd79576dee7da6f925cb7ba835afb54d8f1b3f950a4ec8edd5d3683e423731e437a75b31f260696b2645c5434af6a240d95ea05d87
MISC metadata.xml 1275 BLAKE2B e75ea799a2a2d31ddb8fdd7b0bdcda99d0c1b7a2e327f8f4b305ec10b95084486cd12aa7bfa53ee3d32e5369ce44d2c6e6cb243786eb24cfc495ec31ec87605b SHA512 d749fe317f6745193f65ed1d83f28cfe7faf30c36f469e3842c354d6418bfa17f73d7ce40aae4f7271cfd7f86e91f700243ea21a177b35a681d8f20d47c60830
diff --git a/games-simulation/openrct2/openrct2-0.3.0-r1.ebuild b/games-simulation/openrct2/openrct2-0.3.0-r1.ebuild
deleted file mode 100644
index 5a111a1f34fd..000000000000
--- a/games-simulation/openrct2/openrct2-0.3.0-r1.ebuild
+++ /dev/null
@@ -1,166 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake readme.gentoo-r1 xdg-utils
-
-MY_PN="OpenRCT2"
-MY_PN_OBJ="objects"
-MY_PN_RPL="replays"
-MY_PN_TS="title-sequences"
-MY_PV_OBJ="1.0.16"
-MY_PV_RPL="0.0.17"
-MY_PV_TS="0.1.2c"
-
-DESCRIPTION="An open source re-implementation of Chris Sawyer's RollerCoaster Tycoon 2"
-HOMEPAGE="https://openrct2.org/"
-SRC_URI="
- https://github.com/${MY_PN}/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
- https://github.com/${MY_PN}/${MY_PN_OBJ}/releases/download/v${MY_PV_OBJ}/${MY_PN_OBJ}.zip -> ${PN}-${MY_PN_OBJ}-${MY_PV_OBJ}.zip
- https://github.com/${MY_PN}/${MY_PN_TS}/releases/download/v${MY_PV_TS}/${MY_PN_TS}.zip -> ${PN}-${MY_PN_TS}-${MY_PV_TS}.zip
- test? ( https://github.com/${MY_PN}/${MY_PN_RPL}/releases/download/v${MY_PV_RPL}/${MY_PN_RPL}.zip -> ${PN}-${MY_PN_RPL}-${MY_PV_RPL}.zip )
-"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="dedicated libressl +lightfx +opengl scripting test +truetype"
-
-COMMON_DEPEND="
- dev-libs/icu:=
- dev-libs/jansson
- dev-libs/libzip:=
- media-libs/libpng:0=
- net-misc/curl[ssl]
- sys-libs/zlib
- !dedicated? (
- media-libs/libsdl2
- media-libs/speexdsp
- opengl? ( virtual/opengl )
- )
- libressl? ( dev-libs/libressl:0= )
- !libressl? ( dev-libs/openssl:0= )
- scripting? ( dev-lang/duktape:= )
- truetype? (
- media-libs/fontconfig:1.0
- media-libs/freetype:2
- )
-"
-
-RDEPEND="
- ${COMMON_DEPEND}
- dedicated? (
- acct-group/openrct2
- acct-user/openrct2
- )
-"
-
-DEPEND="
- ${COMMON_DEPEND}
- test? ( dev-cpp/gtest )
-"
-
-BDEPEND="
- app-arch/unzip
- virtual/pkgconfig
-"
-
-RESTRICT="!test? ( test )"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-PATCHES=(
- "${FILESDIR}/${PN}-0.2.4-include-additional-paths.patch"
- "${FILESDIR}/${PN}-0.2.6-gtest-1.10.patch"
-)
-
-src_unpack() {
- unpack "${P}".tar.gz
-
- mkdir -p "${S}"/data/sequence || die
- cd "${S}"/data/sequence || die
- unpack "${PN}-${MY_PN_TS}-${MY_PV_TS}".zip
-
- mkdir -p "${S}"/data/object || die
- cd "${S}"/data/object || die
- unpack "${PN}-${MY_PN_OBJ}-${MY_PV_OBJ}".zip
-
- if use test; then
- mkdir -p "${S}"/testdata/replays || die
- cd "${S}"/testdata/replays || die
- unpack "${PN}-${MY_PN_RPL}-${MY_PV_RPL}".zip
- fi
-}
-
-src_prepare() {
- cmake_src_prepare
-
- # Don't treat warnings as errors.
- sed -e 's/-Werror//' -i CMakeLists.txt || die
-}
-
-src_configure() {
- # Note: There is currently no support for Disord-RPC and Google Benchmark,
- # as both packages do not exist in Gentoo, so support for them has been disabled.
- local mycmakeargs=(
- -DDISABLE_DISCORD_RPC=ON
- -DDISABLE_GOOGLE_BENCHMARK=ON
- -DDISABLE_GUI=$(usex dedicated)
- -DDISABLE_HTTP=OFF
- -DDISABLE_NETWORK=OFF
- $(usex !dedicated "-DDISABLE_OPENGL=$(usex !opengl)" "")
- -DDISABLE_TTF=$(usex !truetype)
- -DDOWNLOAD_OBJECTS=OFF
- -DDOWNLOAD_REPLAYS=OFF
- -DDOWNLOAD_TITLE_SEQUENCES=OFF
- -DENABLE_LIGHTFX=$(usex lightfx)
- -DENABLE_SCRIPTING=$(usex scripting)
- -DOPENRCT2_USE_CCACHE=OFF
- -DPORTABLE=OFF
- -DSTATIC=OFF
- $(usex test "-DSYSTEM_GTEST=ON" "")
- -DWITH_TESTS=$(usex test)
- -DUSE_MMAP=ON
- )
-
- cmake_src_configure
-}
-
-src_test() {
- # Since the tests need the OpenRCT2 data,
- # we need to symlink them into the build directory,
- # otherwise some tests will fail, as they don't find the OpenRCT2 data.
- # It is currently not possible to override that path.
- # See: https://github.com/OpenRCT2/OpenRCT2/issues/6473
- ln -s "${S}"/data "${BUILD_DIR}" || die
-
- cmake_src_test
-}
-
-src_install() {
- use scripting && DOCS+=( "distribution/scripting.md" "distribution/openrct2.d.ts" )
-
- cmake_src_install
-
- if use dedicated; then
- newinitd "${FILESDIR}"/openrct2.initd openrct2
- newconfd "${FILESDIR}"/openrct2.confd openrct2
- fi
-
- readme.gentoo_create_doc
-}
-
-pkg_postinst() {
- readme.gentoo_print_elog
-
- xdg_desktop_database_update
- xdg_icon_cache_update
- xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
- xdg_desktop_database_update
- xdg_icon_cache_update
- xdg_mimeinfo_database_update
-}
diff --git a/games-simulation/openrct2/openrct2-0.3.2-r1.ebuild b/games-simulation/openrct2/openrct2-0.3.2-r1.ebuild
index 5a1847da7c74..ab825ca0f215 100644
--- a/games-simulation/openrct2/openrct2-0.3.2-r1.ebuild
+++ b/games-simulation/openrct2/openrct2-0.3.2-r1.ebuild
@@ -24,7 +24,7 @@ SRC_URI="
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 x86"
+KEYWORDS="amd64 ~arm64 x86"
IUSE="dedicated libressl +lightfx +opengl scripting test +truetype"
COMMON_DEPEND="
diff --git a/games-strategy/Manifest.gz b/games-strategy/Manifest.gz
index e6a7a8fec509..f8e35a67ceec 100644
Binary files a/games-strategy/Manifest.gz and b/games-strategy/Manifest.gz differ
diff --git a/games-strategy/julius/Manifest b/games-strategy/julius/Manifest
index 0ed82ae3ad04..8b664f470351 100644
--- a/games-strategy/julius/Manifest
+++ b/games-strategy/julius/Manifest
@@ -1,4 +1,4 @@
AUX 90julius.sh 72 BLAKE2B d07d935037fa998174fffd1c786ffe2dab8d6af4eb9b71f0c30e1ad2e528ddda09232c4009573935f64eccf3c99b23041441579b99110a96f31a003b7db87ba6 SHA512 39ad3849f341a0817623cd3daf3d0ce255784c33538a9b1f9e25fa6655c59e8c3f56cc2f4bca23692e64118c78900c8dede656e9a1af5a043904b02fdf0e84dc
DIST julius-1.4.1.tar.gz 8592785 BLAKE2B 8eb91522fccdee33600b02de766727beb19f138c0f695eb92aaa77ea2f25ec293906d0c75d31d42159097a12317ba38b22c01e7edf722670f51fe56d625d9ae7 SHA512 8488cee4a229299fd771f7ebddf076888b2e11458b2edbb6058b29b1f7e79d372ec2f913df3afacd8191551ba692a900508e64661ead1029916e28f356f79f7b
-EBUILD julius-1.4.1.ebuild 1450 BLAKE2B aa8530a01ac3246f04bffb3762268325496e8c50eedcca72ea0d100508eea7bb607fc776c9c5c46a732024c1309fd4c1c70fd2b7a1c065887c09f8d5c78ee84e SHA512 ec2afdc6bd8b85d9e799ba79a80057f6479bbbc1ed6489a310322c239ca77278f3733718e4409082a3685e58f10a8cecf3758df3f7d5814dc64d62d656335aee
+EBUILD julius-1.4.1.ebuild 1457 BLAKE2B d7ed69d09ed8720e99472e704f9244a571e94b224666335724a219454575426cb107dd0dd291d147fff52e53bc9a0c24f0b52b3fdbe812ed9ed691514c06a7cd SHA512 ff027e9e7503ef84c2fef0a90486670ecd94139fa96b9e6aa1f9d8f394e278773e40981e339072422b5740f21f89f2d80043d2e6eb1f585f2c8de15588c235e9
MISC metadata.xml 967 BLAKE2B 1bbe893da1d8326518e5ad1ec1e2bd238080db0cb9e022df84209f4a593ea94eb08066b44ec9bcba6e7acb2ba9d01b042e32d153a117b40c77a3aa08ebe33c12 SHA512 0b7d07bd6b945918856b0339db7695d361ce2e0e62137ede757dbdd8b544d5fb3ac81099308a8751f2dba07bdc5f3e5a417334622ab4578e9865c091259463dc
diff --git a/games-strategy/julius/julius-1.4.1.ebuild b/games-strategy/julius/julius-1.4.1.ebuild
index 811dfaebf3f6..bffe7ad84787 100644
--- a/games-strategy/julius/julius-1.4.1.ebuild
+++ b/games-strategy/julius/julius-1.4.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/bvschaik/julius/archive/v${PV}.tar.gz -> ${P}.tar.gz
LICENSE="AGPL-3"
SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm64"
DEPEND="
media-libs/libpng:0=
diff --git a/games-strategy/seven-kingdoms/Manifest b/games-strategy/seven-kingdoms/Manifest
index 8c266c69ac2c..b10237c9dbba 100644
--- a/games-strategy/seven-kingdoms/Manifest
+++ b/games-strategy/seven-kingdoms/Manifest
@@ -1,6 +1,4 @@
-DIST 7kaa-2.14.7.tar.xz 31342092 BLAKE2B 1e2456ff8e40eace3185f842aad1d436e7e336eb4489a1a23022c89e7695ef1fc6f632d884d5d992c63f8b67f8b045fbda37e2fa3a07e9be13b9801d959b1e93 SHA512 5c2067a842af18f2eaa21267ee0c48064eecfc6b967eb2abf967f2bf782a9699186b038d87de03fad71b5d88ec9fc1cfddd7521cb90c255a3a8d2aa586d3f2c1
DIST 7kaa-2.15.4p1.tar.xz 46927880 BLAKE2B b32b819bef5918f2de378893224dcb7a27af6afe4e09791d59a2208f92aa8b82f3d9936553734a8b1cdfec93a8cc5562c65a78a15734fa1457dc94a64a49ed93 SHA512 eac0ca91755f828cfc8b0ea07ad1d0c08030c60ac236473992cc7887f8da43a3246a1f375f569e4fc71afaf7c5797ae6911b8b617217077429e5f5c51af4f4b6
DIST 7kaa.png 559 BLAKE2B 0379e60a5355c93cddf2a5f30b5e84711f77df073db4e85eee13d51654180572cd73dc96e8a9b954101e8b0ecacd879d6fa9e57feb70b66d1bdd043d07a40113 SHA512 0ec1ba67107a7823943704879efaf12297c5441c43b54f49684550927b10dc40c657fe93eb7c4cc85208d08194f179c9602fd8df6545776f3e1b4481803b16e6
-EBUILD seven-kingdoms-2.14.7.ebuild 839 BLAKE2B e611c29456970a60ecf4235f03ce74f108655df2e9a67661b149fe0398d8824c22ea108e3eccedf259bf0e9c6c0b590e15dceb70f21147d3d3425db022ca5d9d SHA512 c6ed2f3bf01c2eee117eebb427f7583225050fd05a9fcd3a552be53164c84be96b47208e2f80ec666714db8b9dd24800c20c17fa93996943edeaf28a2ae6a150
-EBUILD seven-kingdoms-2.15.4_p1.ebuild 879 BLAKE2B 3c598c3f546cbb2709b2246a6a601c79a9ba72a9351c94b18aabe4027f6bee3571271142b75ee69d1ee851b5dd0fc0a6f6ab49629edf0395f2d5e5f62bdb2671 SHA512 eb3b16362ceb60ba01335932087d19947f215b84656fce61abeec1833185ccafe68e3c5c0fe1df74717e83376f9b40b0254ef4a2fad3096fea2ccf7ae94d1589
+EBUILD seven-kingdoms-2.15.4_p1.ebuild 877 BLAKE2B 75dde0c3cb9eb2d3835684e11ac2013ae66c5e64f6897af8582ed7f3afc64d4f531460bd75c0681ad8b46ef1b7bf5592948a8b02b28b34e95c32ea4c0350c75b SHA512 4c2f279ca072acfdb9457241fb4d603f3e1a0ee7a94ce00b3ea9f2e0cec63ae7e4d5392d15f7ff0e4f7939dda22fb966e7f7d0b74bc7bd76e0469fa2a89103f1
MISC metadata.xml 379 BLAKE2B e307acc5095abbee8bc3bdab262c6f85dbf01638364fdc3ff6a1ea4d6ca0409f9e3197bb06fc3724327081fa4316811aecd594c4ecfc2288b978ca09831cfe96 SHA512 74215810c5079763bd386dd78cd2edcdefbac5350226beb275d0229247f733c9f09268893b3a9581e5924bd3651b54203b8acd3691ee86a32c52f382d5e22477
diff --git a/games-strategy/seven-kingdoms/seven-kingdoms-2.14.7.ebuild b/games-strategy/seven-kingdoms/seven-kingdoms-2.14.7.ebuild
deleted file mode 100644
index e76f54f62801..000000000000
--- a/games-strategy/seven-kingdoms/seven-kingdoms-2.14.7.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils toolchain-funcs
-
-MY_PN="7kaa"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Seven Kingdoms: Ancient Adversaries"
-HOMEPAGE="https://7kfans.com/"
-SRC_URI="https://github.com/the3dfxdude/${MY_PN}/releases/download/v${PV}/${MY_P}.tar.xz
- https://dev.gentoo.org/~pinkbyte/distfiles/${MY_PN}.png"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-DEPEND="net-libs/enet:1.3=
- media-libs/libsdl2[X,video]
- media-libs/openal
- net-misc/curl"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
- unpack ${MY_P}.tar.xz
-}
-
-src_compile() {
- emake AR="$(tc-getAR)"
-}
-
-src_install() {
- default
-
- doicon "${DISTDIR}/${MY_PN}.png"
- make_desktop_entry "${MY_PN}" "Seven Kingdoms: Ancient Adversaries" "${MY_PN}" "Game;StrategyGame"
-}
diff --git a/games-strategy/seven-kingdoms/seven-kingdoms-2.15.4_p1.ebuild b/games-strategy/seven-kingdoms/seven-kingdoms-2.15.4_p1.ebuild
index a23677ae1b8b..fccfe63df907 100644
--- a/games-strategy/seven-kingdoms/seven-kingdoms-2.15.4_p1.ebuild
+++ b/games-strategy/seven-kingdoms/seven-kingdoms-2.15.4_p1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/the3dfxdude/${MY_PN}/releases/download/v${MY_PV}/${M
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
DEPEND="net-libs/enet:1.3=
media-libs/libsdl2[X,video]
diff --git a/gnome-extra/Manifest.gz b/gnome-extra/Manifest.gz
index f2c7c6508480..d10da42ca3e5 100644
Binary files a/gnome-extra/Manifest.gz and b/gnome-extra/Manifest.gz differ
diff --git a/gnome-extra/cinnamon-control-center/Manifest b/gnome-extra/cinnamon-control-center/Manifest
index 9313fe6e6100..801b272bce06 100644
--- a/gnome-extra/cinnamon-control-center/Manifest
+++ b/gnome-extra/cinnamon-control-center/Manifest
@@ -1,5 +1,5 @@
DIST cinnamon-control-center-4.4.0.tar.gz 3868474 BLAKE2B 88e22670427416139468c35918105cc664c531aa5084636226498a09b27f56300c8541feff8f93a5ec860372436af01fdeb2ca2c0761b34a6f298439538dfb44 SHA512 3f176c067312bad68ed8ce2461937d8e8cd188839ab3cf786fb76930905691b8f5a91d700f1d88d75448eeecfd23b645b77ee15c0ec02e08718f7c9ac800677f
DIST cinnamon-control-center-4.6.2.tar.gz 3877007 BLAKE2B f64ebfedc73eb92b96f81fb2743d818ec1602a550130d362eadba4c66a24a0e1f2bdffbe0bf80b23426ab57cead910c78b061b52e4eb82d0e6173d1da2d62749 SHA512 c759c14cc295ba15bde87ad1544d4bdef284d8e3fb8fbee528e9a258aaf83c6f6d76944042230725804ea6c05bd2cb5cbb59cb7507378b952221f381fc47075e
EBUILD cinnamon-control-center-4.4.0.ebuild 2520 BLAKE2B e03b2b5f1c310ebad94a320aad6271dfd06ab1c50ba1b1224af69e311c1b0a37c39bb26d2ac8ea5837db9a0ee2d44eaf752fd0369dfcbcccab6ed4a1fb2ae979 SHA512 f83e1f69368c7465249ddfe34900168b8257130bd8610a69811c099bf947ae8bd9a94937c4319cbf9153c922b78d23adfef607dc2e27f68942d4ef19f4478621
-EBUILD cinnamon-control-center-4.6.2.ebuild 2420 BLAKE2B bb3172ad49f485e7c19fd1a081801577e28aeb70619dafc1c89c9cc97330fb8a7dd668b31693579d9541de4acb11555f5077a6e611685d5407aa55731dbd61e3 SHA512 1a7555ed64d92a623c530b3d99c591c85dc6b7780a545d3a3597a0a1725222cd3c8058162bc910786c68aed7b007a874c574dec7c23482799171bdfec2c2b02a
+EBUILD cinnamon-control-center-4.6.2.ebuild 2427 BLAKE2B 06a1cb6c53580985758b04432ab161a5a3cbfde5927d228a4133a4311859d396acdb7aa90be085a1c8e6b454c2d869d2d22617c0820a9d1107c0a14f83a2ee18 SHA512 f367192f64dad91ec7aa3f03645781fae3673b620c0065cdf4e85ba8c73c59eb1b4e1b52f8f5369de05d255b57bb2cf310a3c6cb4e511b26438c863cac770163
MISC metadata.xml 608 BLAKE2B 4087b4540c1a4822bc57dbfa96b3f61f318c4e6112a530519dae25d8f41e3e7e0f10dc2b213c429eac05c54ae1ac6947766abd0def5d046881ccaa544a4d0cc2 SHA512 03d0eaa7834c6cc0bc89ced18ce558020641b4e802707178778e4aeaeedb5939333182289934ae61109226633bafc0be7d40f3a139d092da73426c266a3f5abe
diff --git a/gnome-extra/cinnamon-control-center/cinnamon-control-center-4.6.2.ebuild b/gnome-extra/cinnamon-control-center/cinnamon-control-center-4.6.2.ebuild
index 6d9e682accff..4bfeb3e86e90 100644
--- a/gnome-extra/cinnamon-control-center/cinnamon-control-center-4.6.2.ebuild
+++ b/gnome-extra/cinnamon-control-center/cinnamon-control-center-4.6.2.ebuild
@@ -12,7 +12,7 @@ LICENSE="GPL-2+"
SLOT="0"
IUSE="+colord debug input_devices_wacom +networkmanager +modemmanager systemd"
REQUIRED_USE="modemmanager? ( networkmanager )"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
# False positives caused by nested configure scripts
QA_CONFIGURE_OPTIONS=".*"
diff --git a/gnome-extra/cinnamon-desktop/Manifest b/gnome-extra/cinnamon-desktop/Manifest
index daaac9387660..0648fc140f42 100644
--- a/gnome-extra/cinnamon-desktop/Manifest
+++ b/gnome-extra/cinnamon-desktop/Manifest
@@ -1,5 +1,5 @@
DIST cinnamon-desktop-4.4.1.tar.gz 488102 BLAKE2B 8bf770e1f2af67c32381c5ba23e88f259d9d6c6a0b722e61202922da8c8c5374bd297b3866846f28924d6d527e6122432682df98d4b3979eeaf026674b6e5027 SHA512 3e3a1bb007ed6d921c83e377bf05642f01ae2ae29f4fb63d93e011de44dadc4e79967510079c6175b68207263fd4a589587c2d0904f17639f3fffad81ddbbde9
DIST cinnamon-desktop-4.6.4.tar.gz 495195 BLAKE2B eba62e0d99bf824ea034a3bfdf08fcb157e9e5b156260f31c4b41244649ce4fd54adfc192654cffb1336d72c678d32ee151b2a7bbe114dccbe078e66f85ad261 SHA512 09a0e521bd97d4eead9e84ca929a04202d3d4ef35e689d84578a534cc00f1be0a22e04c407f7caaaca4bb5b5a837bd1a2893cd727d0045f15ee20938c36fae72
EBUILD cinnamon-desktop-4.4.1.ebuild 1214 BLAKE2B 39797307951e573217c0b8c112f58cf99262bf73eea1eeb4a4f8ea7a53361a4b6c199f11fff991bcd89876bd29551fb8c9db5931297adee4fb7db28a9d79c4e5 SHA512 b20b0117c711c67cb27b396249e43701f45cb3bf074db146ac9b9d96220f2d166873dd859feebb23ed55f3409d49e4b4190c65e1ab8fb2cb9a7242e780e3ed24
-EBUILD cinnamon-desktop-4.6.4.ebuild 1214 BLAKE2B 39797307951e573217c0b8c112f58cf99262bf73eea1eeb4a4f8ea7a53361a4b6c199f11fff991bcd89876bd29551fb8c9db5931297adee4fb7db28a9d79c4e5 SHA512 b20b0117c711c67cb27b396249e43701f45cb3bf074db146ac9b9d96220f2d166873dd859feebb23ed55f3409d49e4b4190c65e1ab8fb2cb9a7242e780e3ed24
+EBUILD cinnamon-desktop-4.6.4.ebuild 1221 BLAKE2B 41155ad4995d71e97d534901b4299f0560e67463abd4e43da3fe37d4020d7c32b41a1e042985bd77ba25ab8ee1af04210e36287ecf896635ed5925f837381aa3 SHA512 cd1733b345d871e294c0b60d5b40fa0cfb555baf60cb22e56243e370bc771f21d68387255e5a86e13c750a3a185a2af9c98743d384a17bcbc9ba956fa7707e87
MISC metadata.xml 465 BLAKE2B c78166d54a50ae1dbf4580564161bb0fd0c824b0f305d8e211452d089d8b88ffab5207c2ee63fd4bc83f434023fe87ab873b9d39c61a5f3199213647189adcdc SHA512 0298cc730405fdc373e8dfd11150651d29ed9d19c98370b2bb5dd19df1cfe5d83816e45d222c0eb103811d330a6508fef09001c00d6022ffe38997bdae771f3b
diff --git a/gnome-extra/cinnamon-desktop/cinnamon-desktop-4.6.4.ebuild b/gnome-extra/cinnamon-desktop/cinnamon-desktop-4.6.4.ebuild
index 095f38549eec..fba7ceb0e2de 100644
--- a/gnome-extra/cinnamon-desktop/cinnamon-desktop-4.6.4.ebuild
+++ b/gnome-extra/cinnamon-desktop/cinnamon-desktop-4.6.4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/linuxmint/cinnamon-desktop/archive/${PV}.tar.gz -> $
LICENSE="GPL-2+ FDL-1.1+ LGPL-2+"
SLOT="0/4" # subslot = libcinnamon-desktop soname version
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
COMMON_DEPEND="
>=dev-libs/glib-2.37.3:2[dbus]
diff --git a/gnome-extra/cinnamon-menus/Manifest b/gnome-extra/cinnamon-menus/Manifest
index 9afb64c81fd1..fff2f984e99c 100644
--- a/gnome-extra/cinnamon-menus/Manifest
+++ b/gnome-extra/cinnamon-menus/Manifest
@@ -1,5 +1,5 @@
DIST cinnamon-menus-4.4.0.tar.gz 96196 BLAKE2B 9bb16c3d4d0f3b92b38ea9e388e0a17ee80d1143ed77daab03fcdc0de63423e77900174c2f4a49b173b0d2f1dddff43d3864b1ce1c940a64740d5c53a7807f41 SHA512 68d63fc9b79ecd979dea39e284e1b3120e3c889f496a418e060e97acea04c92a07a31cb5a0b4f1a62b4af64731de3b8c5524a8613cab61361ff329f68a19cb90
DIST cinnamon-menus-4.6.1.tar.gz 96294 BLAKE2B bdfacd5f4c5344833c9804b79846c5ac9908e74381c2e84b29b8cb765b10578ac69155d93e1c0bd8b6b8100d5e5f34ca1bc8bd77edb681eb705d759c5d9275bc SHA512 ef37662d4e1a49494c22481456b5e318039ec8c873e6ffcc0c55f89edbcc918d3bc97664b33007194da268b43884fe5abd08b27ac8bb5e7ba7bcb9928546aee9
EBUILD cinnamon-menus-4.4.0.ebuild 811 BLAKE2B 9246302f04dcda455ae12ab315d43dcdaa8ad64620e014f514272f83a42b938ce899aef6b1b175726ef450192832cc844786b0893a4d43da1a80c796c917eef3 SHA512 d59203f4dee454c25bce88e714049a2390abdb6435c31869ad328186dcde7dab3f94381acce06ec48803358bd59cc5b6a8227115598c346e4d6310f79377616e
-EBUILD cinnamon-menus-4.6.1.ebuild 811 BLAKE2B 9246302f04dcda455ae12ab315d43dcdaa8ad64620e014f514272f83a42b938ce899aef6b1b175726ef450192832cc844786b0893a4d43da1a80c796c917eef3 SHA512 d59203f4dee454c25bce88e714049a2390abdb6435c31869ad328186dcde7dab3f94381acce06ec48803358bd59cc5b6a8227115598c346e4d6310f79377616e
+EBUILD cinnamon-menus-4.6.1.ebuild 818 BLAKE2B 487769acb305e05b54fabb1bb6edb1cfa6b0e4b5ec14de3843ef851107e5aeaebde5b62cfc11e70ab5383a00d8a980e1fe7decd86bc45c6455aacd5833004bb8 SHA512 3654d6794b9d7527c9edf20be2e505fdd8494524fab27c32ea0cbebf0b5f3f21858eabe7ba07591f6b152f749dc23456dc21dac0ec51163953584ed2fd26912d
MISC metadata.xml 463 BLAKE2B 41f1994f18142bb9c28d5b60d6a3d2afaf4163dcf04fdf20c663361064e93d61e2ae363a6d8aad667186e39873ea85ed571e35ebd1b4f2d1ce59441a3ac51665 SHA512 14e5471c3ee6048d5e976cd8734b91f9f27818df88014e8ace1c22c9cc9121f167064dea98a36d4cc80f5c01f9adf90df095902e6ea86f80d1c3dc86447bfe37
diff --git a/gnome-extra/cinnamon-menus/cinnamon-menus-4.6.1.ebuild b/gnome-extra/cinnamon-menus/cinnamon-menus-4.6.1.ebuild
index 7b62b345a9cc..73f3666a6fa1 100644
--- a/gnome-extra/cinnamon-menus/cinnamon-menus-4.6.1.ebuild
+++ b/gnome-extra/cinnamon-menus/cinnamon-menus-4.6.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/linuxmint/cinnamon-menus/archive/${PV}.tar.gz -> ${P
LICENSE="GPL-2+ LGPL-2+"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
IUSE="debug gtk-doc"
RDEPEND="
diff --git a/gnome-extra/cinnamon-screensaver/Manifest b/gnome-extra/cinnamon-screensaver/Manifest
index 31469cfd7cce..b8be073c73b6 100644
--- a/gnome-extra/cinnamon-screensaver/Manifest
+++ b/gnome-extra/cinnamon-screensaver/Manifest
@@ -3,5 +3,5 @@ AUX cinnamon-screensaver-4.6.0-xinerama.patch 1482 BLAKE2B 4908aed13aca65da9cfe9
DIST cinnamon-screensaver-4.4.1.tar.gz 160214 BLAKE2B df19a370c76648e0717565a3aab4785c3d8b48b20b9d87cc5426506f196db72872642d0ed1109a40986311c0ad7a5c17fbdcfc69681083afd3884c04822c6afa SHA512 92050febcfd41ad03b277cef60b95080d56b8fd985d064e9420a3357d7d0475355a4ca55965e581ae45410df8f19f3c031f6df0e3eec5b6b78aee7141d0244f7
DIST cinnamon-screensaver-4.6.0.tar.gz 141043 BLAKE2B ba9f1e02fb7567d269daa4eccdb39d2c73dd6ac6bd3a3a4e00e1bcec685b48394fc9247d5006f908091291748e013ae65cf7718a972ef67ed7fd11a226789d6d SHA512 c83a057ff12a22445a155d4f91a45638d922c9b2180a7655f1e34bfd8ddcd31ed901b5b038236fa0e06c6f7986547c34ee8ab61cd216b5bc75f1c202b545c28f
EBUILD cinnamon-screensaver-4.4.1.ebuild 1475 BLAKE2B 586bec8c310ea88e328e1f9b824d90a90c6b28f29319a66ead39e0eab4abcf47ae81f47c7566ee97a224bf8d31e69ecabd0389f438df5c340d910d21c2900a29 SHA512 443077ba13918179062b2ffeb5ff9f69b3656853135d5acdd8285451ceb16fc0767c65b671ef09e4a3ad9c8b4e5ae1ec26fd85e8f945168ff77351d2072f4b62
-EBUILD cinnamon-screensaver-4.6.0.ebuild 1587 BLAKE2B 82a6f0ba82278e98390da3c3c4c1de84ff411a6fe5cbf599ff283759d11940e14e6f87f2386f7a924a1de625bf7913afbb07221c874386b4b638ceac28b5889e SHA512 a9793edaac5adbf9e3379a8b7aa624e2d75d7085ea0feecaa2146b2ddf7f5f9f27420ce263ec0061e28f613e623592547b41a7b7e42e4ccbf747906fd9b3c56f
+EBUILD cinnamon-screensaver-4.6.0.ebuild 1594 BLAKE2B 725c75e3dbf65ec69edcac4b663137fb66e8b145f09fd17b1aa97411ec2e4212a203c76c4cdee49be89093391989d2d9b91980391542133c105a10d7e17d9744 SHA512 fccd50c1cdd104d8ef8467fa696c5b520131609f939ed5e24753e4bd9136ef6e00b90c7421ecaa3886dfeadff6aee9b98a1a1b3380e41dc30b34f59652ee28d6
MISC metadata.xml 469 BLAKE2B 0f8fdea17d41db323fbd27368ecb1d4ddf4fc625d32e73a5fad69fc8e6db19120dcdbc807455a3e28064aac8c78fbca4ddb72bc359d730f3661b4857a5a993db SHA512 05d67a25bc957bdcb9aca4c48d43a24898aae6a1d7c9740ced98f0751259de5b918b87cab75ec9f8926c6bad0858dd0254572229f33e20073f69ed73f01e2d82
diff --git a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-4.6.0.ebuild b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-4.6.0.ebuild
index b06476c95bd7..df2f0f2494ae 100644
--- a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-4.6.0.ebuild
+++ b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-4.6.0.ebuild
@@ -14,7 +14,7 @@ LICENSE="GPL-2+"
SLOT="0"
IUSE="systemd xinerama"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
COMMON_DEPEND="
>=dev-libs/glib-2.37.3:2[dbus]
diff --git a/gnome-extra/cinnamon-session/Manifest b/gnome-extra/cinnamon-session/Manifest
index 314677ed7dd7..edd6d4eccc6c 100644
--- a/gnome-extra/cinnamon-session/Manifest
+++ b/gnome-extra/cinnamon-session/Manifest
@@ -3,5 +3,5 @@ AUX cinnamon-session-3.8.0-elogind2.patch 617 BLAKE2B aad4e717fef7289576e81f863e
DIST cinnamon-session-4.4.1.tar.gz 198819 BLAKE2B bd39b5a89011942239beb76976b01234eaf839e80f1f54d26e1ee988797596d876d2708bee91d4c016a584d76fd9ba1209b4f8e77da8e9db8d7a8b4e5a43dac1 SHA512 f5caf7a3797ca30c397433ea052b7736308a31da291442f64224f034a6bd50eb45307cc8987efe5148eb816c2c70c3033795290386c93f205684796d03b63c22
DIST cinnamon-session-4.6.2.tar.gz 199292 BLAKE2B f4a2a7dc438846c6013b539a027cbc13359a3cb47ed01c6acb97daf4a28fc26da3754d4264aaa90e8f10504bb7415a82dcc509430825cfd3e50e3beac7c78616 SHA512 c4b9d21145a82ecd0c9645899bb76acff632c7cc7ce4c5cc162ef38b91c772a29c66ab1645a6e35f92dd121cea0bd6748cf86275bc95a2a6d045fdbb4aea7d24
EBUILD cinnamon-session-4.4.1.ebuild 1417 BLAKE2B 15d200dbc0213a6ecc73a257f80823a4088d30e4e4f44f7fed7f8f1d31572764a21e90523ec389c0cf659f28baf10ab623ab3cf55da888afe72826259b0a5f3e SHA512 c4e5f59281b992e9dc3b4d91564a61bf705b646e07edfd956ad44ef3fd13ee01ba1fdac0da25462ed7819d2f9a2e706bdda30772534d3bda5deb694f07e4be78
-EBUILD cinnamon-session-4.6.2.ebuild 1276 BLAKE2B eae60eaa3bda884bfb84b6c8604d741ad5eedacb8ab396c3209bdfcbf7e62141644f10440a121019b6e512d5d9e454fce3b24e03caafc3b925680d03d0c58e35 SHA512 193d0fa0d7bcb2c266e4bc850d2dddc658f42a73a8c803c9f1bd5bae605759dfde4bab19f3d1b0cfe46a49abcd63c57fc97ecd098f89889cbf19dbdf36897e43
+EBUILD cinnamon-session-4.6.2.ebuild 1283 BLAKE2B 033817d9b5fed393b6c8758bdfb5e62860e25fb8abdb4f6c22b8bbc9d772c2bde0b341d10d7b26b1c1b7a25cab0f4ccfde64d47adf07515cba6cb937d93b42ed SHA512 3d5b138c558665d56bb5579d079627941f0cd6b5b9b0d5f35df252832a911e6e9d927e3cb30b1493f14a4dc55b97ee188dd284203448d4c18d53443497c89cf5
MISC metadata.xml 573 BLAKE2B e7c49fc19d81b1c33ac69bcf57839e5e895bb656cedcb38efa37d5e88310d713705bd42209969301e4ad4c19863c242a4ab91c9d64b8c0924f0d4807ee54f358 SHA512 66288033b458b5c6bdd769c7a053401bebaaa015ea152640298a4cf4f341cc0c96d8024bacff6054c371a7a584f7a2b5e33334c563d2ec788b0bf755e1cef11e
diff --git a/gnome-extra/cinnamon-session/cinnamon-session-4.6.2.ebuild b/gnome-extra/cinnamon-session/cinnamon-session-4.6.2.ebuild
index b7c12adfc38e..8b32bd223688 100644
--- a/gnome-extra/cinnamon-session/cinnamon-session-4.6.2.ebuild
+++ b/gnome-extra/cinnamon-session/cinnamon-session-4.6.2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/linuxmint/cinnamon-session/archive/${PV}.tar.gz -> $
LICENSE="GPL-2+ FDL-1.1+ LGPL-2+"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
IUSE="doc ipv6 systemd"
COMMON_DEPEND="
diff --git a/gnome-extra/cinnamon-settings-daemon/Manifest b/gnome-extra/cinnamon-settings-daemon/Manifest
index f280819f7210..8d72eefd253f 100644
--- a/gnome-extra/cinnamon-settings-daemon/Manifest
+++ b/gnome-extra/cinnamon-settings-daemon/Manifest
@@ -4,5 +4,5 @@ AUX cinnamon-settings-daemon-4.4.0-systemd.patch 1733 BLAKE2B 950b165f39b6a36cb9
DIST cinnamon-settings-daemon-4.4.0.tar.gz 665615 BLAKE2B ef0666864a4735ff32d57a584004176c74d0f0ad4b077d3439e135c1d24c8d0606221a1b1693a0189972b462055478680b03917a6acfcdfdc80649f7ee0fc224 SHA512 dc4b0c570b345577bd20e85b44f4c99c3e3c88a2c2aea7c928e1fae931dc4dc07c6dd64c5917661434d35e3ae606c8189c3f77e0658925b5cc6ba2dc1885cb81
DIST cinnamon-settings-daemon-4.6.4.tar.gz 668339 BLAKE2B 80e14d29a74004c1778e90d39c6ca892d3eee778134e43b8ea77cfec8cbad4f5ac21609cfbb9cdaab0b4d35b42e897223a5b9cdfd43de49d8112b8bc6fc45914 SHA512 77ddb637fd93fdfd59fb27c5a10082259fd99b4753ff36b3473db12f2fe0d19ee89d44c9e72f1ce9eab3f228c5fef418ce774dd78746d77b959ad9d8f93c1208
EBUILD cinnamon-settings-daemon-4.4.0.ebuild 2325 BLAKE2B dc4e03e93769716d38f615166c0008f53067a1d25821fdf3ed843fff247acd9a6577812de9523477557afeadc70be4aae8ceafbfed19e203ae0bb18b44db48a6 SHA512 20273a9a2eb1189d9fb88592153d30aa6bbd16d65d70b153655f8392c173f98ffcf54fb66c2c3427b684417d0adb72a34b10cdb3d6cbd81a99f7bb65fb2f79be
-EBUILD cinnamon-settings-daemon-4.6.4.ebuild 2557 BLAKE2B 285a75247b21c563065abf93fe5fd327a3a07ab0cb175271cb0c475977c2b975ddfa3f6d0e551df254afe0737c69ba7bf209a87b955bd8bbeeb2454f71852fab SHA512 c3366a00184a023d6e07daea280f4f98da0dcd0bbb79fba76a1bfd1fe462dd55067cbc9fc144ad1258acc5c1a9343b8090a588bf2849bfdbbbad8e53ab6b390c
+EBUILD cinnamon-settings-daemon-4.6.4.ebuild 2564 BLAKE2B fd49e531f11a97788f906e7f0f3ca691570f940541a9380c4c93e9f34aedd47ea24f1ec930af80116bd94c08754964590dceabd49c82ee65e3174b0005e0e89d SHA512 362e972f79f8307c2937d43fa97a6d56d5dd802aa4167b08a114a61058ef23b41ee553aacbaeacb546bc528523171a7c4da41716b4e89e0c20fae6f691c5458f
MISC metadata.xml 473 BLAKE2B 653c7036ca8c17890778db69bab8294046cff31b4af5ee5148a65181183231cb83e4898eba4e9b3a10565ae6abebdc6b3720d2401c6f397861031d7d19df9521 SHA512 6b3a5f8882234339eddabdc46e3ed4fe34e985558f90e516f31f6e4953719bec084a5e4090f473ef7562ac81427c2a6a122c01020d3626b5aecec50bfd0aac7e
diff --git a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-4.6.4.ebuild b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-4.6.4.ebuild
index 5d723f5bd75e..c3770c9a2fb7 100644
--- a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-4.6.4.ebuild
+++ b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-4.6.4.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/linuxmint/cinnamon-settings-daemon/archive/${PV}.tar
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
IUSE="+colord cups input_devices_wacom smartcard systemd"
RESTRICT="test"
diff --git a/gnome-extra/cinnamon-translations/Manifest b/gnome-extra/cinnamon-translations/Manifest
index 09be9b4afd4b..2355ecf60a04 100644
--- a/gnome-extra/cinnamon-translations/Manifest
+++ b/gnome-extra/cinnamon-translations/Manifest
@@ -1,5 +1,5 @@
DIST cinnamon-translations-4.4.2.tar.gz 11479907 BLAKE2B b1d38e1bac17e254a55d679f6d057ce24b643f0c17126fadb8581e60c81001c0d1dd357244d1f199661f2bddcdc8fece768f37d53c0bfbc61867a8c7ea3b93e0 SHA512 09700cc7fcd2e9e6599db8de994ec257da2be1931c32254af3042583310eeaf729b4dda0006346099922994f95310b32f99239916b5a35f9194bb4f8f8045eea
DIST cinnamon-translations-4.6.2.tar.gz 11728647 BLAKE2B a1c8feb175be6bdb3bca3040c1e4a9227ccca744128f28b3ffd1e1ae53e103e6c2e40d5f2af54aa69ad9489d5be9acf4bbeda5175bd2c6f271bfbf6415494438 SHA512 b3bd19f140792988ce05e5a33e1beed9018048690bbd38db050c1c7b8c60091466892bbcfecc056118321a16aed80ca79df9a1c5b756c3c28539f940d9408517
EBUILD cinnamon-translations-4.4.2.ebuild 1339 BLAKE2B 19ef3977cb2b230160dc854bdda597e46f37e7996ccf50881eda930271a86c738b41404bd5813e311bdcf6cfffa2512bf1e7aaf535ccb37fc6a79e85021c3f03 SHA512 7e03a0f489a8c8d46c21e1a22ffff80de2ed7bedc23c0e075de7714242991f6c5474f98245e5d96b506b2b41dc56ccae387e6b03f3f03bd455da58e30c27bdf2
-EBUILD cinnamon-translations-4.6.2.ebuild 1336 BLAKE2B 1d690f80bb489d35b7036dee4d1d328fa4bbb777ccda40b897b848890e4632259e164275ad9efa159dc67e0ab7ec25b2d5a0068bd8cc870c458ddedd2a8acb53 SHA512 175fe3f1a4042c8516b294d01488609ed31fb1e88b9332c17d84796b03247043ea238de4f192a5ed44abd926864018aef7fafcfbe26b96f70543e8add4316f8d
+EBUILD cinnamon-translations-4.6.2.ebuild 1343 BLAKE2B 448f4640741eb8fb314b8cbeddf60739abcca7da58242ecc25f5b451edaee109f8dfe7889d8f39b4393114ff3e7d74eec05ec5b5d6df3bb0630545c3333d429b SHA512 bae2e532788d2330600f9044c39da87204f5e40f63e5ec22f18e009f2e8d51684e503538a257111d1ef02fd17b3df0569506679751a53b8f083780008f381b6d
MISC metadata.xml 470 BLAKE2B b0df2af77ac75dc30330b04e80fb609138bc9ed1fd470cdb25dfe8c53052bbf0ae454e1b3666e118720d0bfdfed604f1a295de04954d28798c4e51a6cff73ae8 SHA512 248dc0f84f5d43861ca7a96baf2d25959d76a7f9e0cdeeb7aac738b5a0b30eef8e1b7c113a5e3d89a0e5c0c4226e28231b98967b80b237dbfd0f4c88ebdc7b5e
diff --git a/gnome-extra/cinnamon-translations/cinnamon-translations-4.6.2.ebuild b/gnome-extra/cinnamon-translations/cinnamon-translations-4.6.2.ebuild
index 772b4aaea485..8a44e98ba688 100644
--- a/gnome-extra/cinnamon-translations/cinnamon-translations-4.6.2.ebuild
+++ b/gnome-extra/cinnamon-translations/cinnamon-translations-4.6.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/linuxmint/cinnamon-translations/archive/${PV}.tar.gz
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
DEPEND=">gnome-extra/cinnamon-settings-daemon-3.6"
RDEPEND="${DEPEND}"
diff --git a/gnome-extra/cinnamon/Manifest b/gnome-extra/cinnamon/Manifest
index e8238a118a0f..8fbc98f0ace9 100644
--- a/gnome-extra/cinnamon/Manifest
+++ b/gnome-extra/cinnamon/Manifest
@@ -4,5 +4,5 @@ AUX polkit-cinnamon-authentication-agent-1.desktop 213 BLAKE2B 66a45b25c92751b01
DIST cinnamon-4.4.8.tar.gz 2285252 BLAKE2B 8049093582c57d3e60f570561265b4edbc117e749e228b2d9638ec3afb2a33c1675604e4e8283c683a0fb54608f742552e89da8fc57fafd01bb6ba1567dc1fe3 SHA512 aedf9f470c04bd0a36cdc34546ed92d5709325e3ef2c0f40e8b026a76964231fc950c4a46bb6a87d46a2fa0f1cac50e7dcbe914008e18550b5fc1e27c7135978
DIST cinnamon-4.6.7.tar.gz 2271281 BLAKE2B bbf8a5d82b6bd27a8578aebb30ed0df4190ef2addfc0d820448e70d4db6b3d8df633a5f33178b29fd2c012045e1790df60a4b1b281fdd70eda53caa5cacc0d7b SHA512 4807d5330c1e2a7e1804257b88dbec2822aa386b0bc2fe2d3aca8e5a27125703987dbabca35360e99216e7b4370bcf6339de562026b48529442a4edda6eb9070
EBUILD cinnamon-4.4.8.ebuild 5622 BLAKE2B 89b253b06f80dc03bac458777059079cf7d331b0ae684917e02944d936ad875c2701fc016e0353cbc804988876e187fdaad8b430ff2018edbb9445f9c143ab38 SHA512 702307caa03256616eb68cec0a6d753c81064c68b5f9d7753154551418379251e43ce00f0d56f04896c9a5cc6d0cb0e506f241c8092f12ed2a99d5f7b4c83202
-EBUILD cinnamon-4.6.7.ebuild 5654 BLAKE2B e554aceff4a7595f063d0a362140bedb417d4d35a62f1ec2f091411fd3e81073fb1b17a365ed0e715407a630a7b99521803e11974a515de4225ca335123d909e SHA512 e902135db9c0638a1228ec21c2a755495becc571ef4b361d351f5d1f63425c3f1f6e74ac49d5985a8f6f1cc2217ad5891a6b848d0c90478d423501bfda725cc2
+EBUILD cinnamon-4.6.7.ebuild 5661 BLAKE2B 4213db13987203d87c77b24a8c6d2a07d22a748147ae2890da26f870d8f7b9f8c47f2a21d3b2036f303c295a522825bb72f48b244783aafc7143f401754a73d2 SHA512 04576ecde6536ef2e2b43cb3d153834778315f944484a02dcf1aaf9fb49b7bf9409f39ac9e43bc2f6ff164d078aaee7cd454462e0d1567c2fe804123c4ed9e5b
MISC metadata.xml 457 BLAKE2B e490b367e0476636037260ffa234127d71d05f57c80903218b1d198496cf41501902de06fdf00f1934e2e5ae559b6e59e03d500872a6e62223a2bc19e6943483 SHA512 e343e078605c96055b829bd6b9cc0ffc6a48cdc04ff07f00242eedbe0c835cd0269a4990bdd99e06e6511e94c9355e6107fc26ec702a9273456e4d69454e0b65
diff --git a/gnome-extra/cinnamon/cinnamon-4.6.7.ebuild b/gnome-extra/cinnamon/cinnamon-4.6.7.ebuild
index acc18a5644a0..99704c766804 100644
--- a/gnome-extra/cinnamon/cinnamon-4.6.7.ebuild
+++ b/gnome-extra/cinnamon/cinnamon-4.6.7.ebuild
@@ -15,7 +15,7 @@ LICENSE="GPL-2+"
SLOT="0"
IUSE="gtk-doc +nls +networkmanager"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
COMMON_DEPEND="${PYTHON_DEPS}
app-accessibility/at-spi2-atk:2
diff --git a/gnome-extra/cjs/Manifest b/gnome-extra/cjs/Manifest
index 749dd34fba4e..4f17c65738eb 100644
--- a/gnome-extra/cjs/Manifest
+++ b/gnome-extra/cjs/Manifest
@@ -1,5 +1,5 @@
DIST cjs-4.4.0.tar.gz 463019 BLAKE2B af276cd8f9ef0f66a6f4ab3e0072b485e33015e070bb796818907964df0696240b753f7a271bf45db788eb244e0cd1fb866f3b78798adf3ef8f9e76825fc4d74 SHA512 3b2bdc55ab572713d6b6f92978522b290819656f64fef620659065ff5673a04a0585b83a1a0248116570ac1cfee4f54acc228f355c02aa4e0a2a13b59fbafed2
DIST cjs-4.6.0.tar.gz 463060 BLAKE2B 466f807539ea95eece8b468287582f2c085ce86a63cf37ed1489f6ed20c98dfcb7028c7679102526009b71aba7d737f6f56c9544bc926fbf5a0be540afeaee53 SHA512 b7b457b43b756918670c9acc1064fc5b424d7bb7ab826ec207595c98159f407411ceb6d3043d305570f21f7675e1b699d7e95466688835034e178e079e118dfe
EBUILD cjs-4.4.0.ebuild 1844 BLAKE2B bb1da618ac42aeb96813eee02024e9ee190a2eb958c6adf6f06677c61560c4bac81dcd3e418486e700f5eb6acae998ee949b77ee65c1c13f9d6c093723cc61d6 SHA512 c150c1e2fe3b7629cc4e01663967adeca6035a5219326bd7ccb306be2aca20e30cf18ce16420dd093c95c56178b3ddebc7f75319bf723c2821263058a8fa686d
-EBUILD cjs-4.6.0.ebuild 1688 BLAKE2B b7adbbf8b7b7f981520191e1ad620153267ae1486f97aa98cbf061ea25ebd0c2359b8ce2f286a6ca392eaedc1280d580bad8e2b378d81b388656e1d06a7d93cf SHA512 2fd8c83981392f9e2a02db93ad595ea8821a51cb8ed5006114ddceb2b4fcb64a26481296e7413ba11611bef3b8d4e6569600383726f74f0593ac767094ac9e1c
+EBUILD cjs-4.6.0.ebuild 1695 BLAKE2B 51745b5d618e91e8afd2f044dfaf2decb89068173c0534496933990697ca44ecfdcf126a1001aa3b98ee8bd1e42715f61ee8f386d3640587dc24c169049aeb7c SHA512 198ec71a6eb2e0a742c810a234df890ac832c3a68f9922672e948628ae508fd27b0320a18ef593f334e9a9ffa1215ac6e3b5e311612decf3c803ac84af6aa010
MISC metadata.xml 452 BLAKE2B 14171fbd087539a58381694472c27a76b85400df2a910427386755db2418ffe514ad17df2058d67e454fbe9c720793664556df787a7008341530b8b52763b553 SHA512 370917c429954d9a72be84416b7a3675f54b355a0093cf138796dec8f94e55a8f127e96456b2a5025ceb93d4bcc14e378c9f78e3d6a43a3be1e61a46e70fc38a
diff --git a/gnome-extra/cjs/cjs-4.6.0.ebuild b/gnome-extra/cjs/cjs-4.6.0.ebuild
index ccb7de2083d3..2173b520a753 100644
--- a/gnome-extra/cjs/cjs-4.6.0.ebuild
+++ b/gnome-extra/cjs/cjs-4.6.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/linuxmint/cjs/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )"
SLOT="0"
IUSE="+cairo examples gtk test"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
RESTRICT="test"
RDEPEND="
diff --git a/gnome-extra/nemo/Manifest b/gnome-extra/nemo/Manifest
index 552b86fa3fe7..76fdcbf610da 100644
--- a/gnome-extra/nemo/Manifest
+++ b/gnome-extra/nemo/Manifest
@@ -1,5 +1,5 @@
DIST nemo-4.4.2.tar.gz 1462269 BLAKE2B 365cd98a05c0c4aa1c86a3e7a565904852bd02d92ace8593043ae8a58f5b9d3eda71e8b0d329a177ed59c0d8f1330ae61f5bcc6671110e82bbd9baad84faa9f0 SHA512 b951c401f93d04061a0ef0accc810ecc7f0487617f089960ab58886a6ca6ecd0af3a98c47e9a620a4d6f8f530a11af9cae20903d089177e69bfa12f9ca31ec5c
DIST nemo-4.6.5.tar.gz 1468701 BLAKE2B 42b47300782745e4ae98db164ca547b0794caf8f0883db4241f2f0ed2e375e5c8564cff6d878142b55744ce41f49c60aad3f24930398ff68444e32c572d7e9bd SHA512 3c8c95e75e8bc499b56d1fd133f5ccc86ad18dae2219772b732586fd684a4a7a36e51fa61e6b734ad182ffd96636bdf276b8645d049e5ca68795fac274236eb6
EBUILD nemo-4.4.2.ebuild 1809 BLAKE2B 5641d649cca2dcb39fdc2f9c9984455bc7bb3f76e3a1b706c061380a93c0931837f6d67e676b2bf72b557e62fe557086e7239198e4a732c140b189fa558c6e3a SHA512 8cf22e8df511caf4d79817a7af8865d4dceb4c72683b7de7e20627762cf372ddefa64c02ce3835100d1011be464ae7da41e871335214956be2069f1afa29d954
-EBUILD nemo-4.6.5.ebuild 1879 BLAKE2B bed95d8374a6612e7a5e75cc7c3cdd7fb56664545ff6456ba5b8ba67de714e4cd5a53938cd160acd5e9a10cf0c66c1ea1dccfab32a80075099a3e078bd36c16f SHA512 c9df147fc7ad01e6a7e4a4d2c76bf6cbe299bb8e8fab62c384b76d2dbe6f999a5e0cc7b3f5069d7aebd55b94aee19c4715ed8720cd5a6529ed23e1ef71b0067c
+EBUILD nemo-4.6.5.ebuild 1886 BLAKE2B 2bb8fe2ff8fe942f25e89ea93824a0d1c10dfc5da33e75b3a84da3cffd43026ba5789400a089173f615c19e3c9eaec9407702deb143a9d722b08999e5cdb62af SHA512 57dd6082d37fd4473d29168691faeccfc260eb543f42ec76ba9919bd301911062faa5e6beaa5746b9d6fa42e3d5093d7b03f5519885c8cdc44c0e1e1c9c6b936
MISC metadata.xml 549 BLAKE2B e60bf6d13687fbd3fd8277dbfc61ad428939e2fe91f648dde5e740dd8e5cc7ac75609a95a01fdaf11f721837ac05a01dc5b7c1604c008036a8f01b006dccff27 SHA512 4bff873128b46a56e572f4d9d355ce2016518cadf3fd0ffa00ac0f6b0961fb7efac4873c8a310eacd6862f8bf4265fa1df306e4efa3130330376e03966ad5278
diff --git a/gnome-extra/nemo/nemo-4.6.5.ebuild b/gnome-extra/nemo/nemo-4.6.5.ebuild
index b74c1d702a22..bec318af83c8 100644
--- a/gnome-extra/nemo/nemo-4.6.5.ebuild
+++ b/gnome-extra/nemo/nemo-4.6.5.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/linuxmint/nemo/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2+ LGPL-2+ FDL-1.1"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
IUSE="doc exif +nls selinux tracker xmp"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
RESTRICT=test
diff --git a/gui-libs/Manifest.gz b/gui-libs/Manifest.gz
index 37dac3903d19..2718d5d9ace6 100644
Binary files a/gui-libs/Manifest.gz and b/gui-libs/Manifest.gz differ
diff --git a/gui-libs/wayfire-plugins-extra/Manifest b/gui-libs/wayfire-plugins-extra/Manifest
new file mode 100644
index 000000000000..d515603bb07a
--- /dev/null
+++ b/gui-libs/wayfire-plugins-extra/Manifest
@@ -0,0 +1,4 @@
+DIST wayfire-plugins-extra-0.6.0.tar.gz 47411 BLAKE2B 32f784abff6b0f05cdfde0bd491e6c8321eb6038f5ac49ff5b241e628abfb0002289fac6f1deaef4148fd8e071ad08c54ea15a441f9d6356ca43bbf4beb9c7b6 SHA512 2ad35cc54892cf716e8492227f96cab7eb89173294ef928115ca998c8c06e9daef69f60d6d11c5393a3038ded0184ccaa404552fe6035a019682d2fdbe4b768d
+EBUILD wayfire-plugins-extra-0.6.0.ebuild 688 BLAKE2B 472cbfa68a581af6bf9a2cde259aac056dc7ce55fa21d348e4910bf00237049f8311465301b859b6335f1b834a6e1c026f2d3212eb03e68f7cfd1b54b8ff1126 SHA512 808abd51fd9b20faad08f2e55d7cf71790a49714834a61509f681e804175ed3557a0fdfd74a56f3a01a05f22aee8359ed9a27489406d23c073bb7e56ccbf0b4b
+EBUILD wayfire-plugins-extra-9999.ebuild 688 BLAKE2B 472cbfa68a581af6bf9a2cde259aac056dc7ce55fa21d348e4910bf00237049f8311465301b859b6335f1b834a6e1c026f2d3212eb03e68f7cfd1b54b8ff1126 SHA512 808abd51fd9b20faad08f2e55d7cf71790a49714834a61509f681e804175ed3557a0fdfd74a56f3a01a05f22aee8359ed9a27489406d23c073bb7e56ccbf0b4b
+MISC metadata.xml 395 BLAKE2B a08fac50820a592a0c79a1f7b376099208b70506a6d6c5badaf9c06c45639f366d8fbe17b42d8c5f0481ef5411b7ba4e6f675c917333e8dc5aaedcf5ff9a0381 SHA512 8837eddafde633e308bf550a194e21ec15fa7275a23e2fb7677e33f45d2054969a6be7059b7f0c016c376cf79ef9aaed698a63ebaf6a5a653f098d2ac2dcbeab
diff --git a/gui-libs/wayfire-plugins-extra/metadata.xml b/gui-libs/wayfire-plugins-extra/metadata.xml
new file mode 100644
index 000000000000..cfbacced2332
--- /dev/null
+++ b/gui-libs/wayfire-plugins-extra/metadata.xml
@@ -0,0 +1,12 @@
+
+
+
+
+ gentoo@aisha.cc
+ Aisha Tammy
+
+
+ proxy-maint@gentoo.org
+ Proxy Maintainers
+
+
diff --git a/gui-libs/wayfire-plugins-extra/wayfire-plugins-extra-0.6.0.ebuild b/gui-libs/wayfire-plugins-extra/wayfire-plugins-extra-0.6.0.ebuild
new file mode 100644
index 000000000000..74ef87cc7523
--- /dev/null
+++ b/gui-libs/wayfire-plugins-extra/wayfire-plugins-extra-0.6.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson
+
+DESCRIPTION="extra plugins for wayfire"
+HOMEPAGE="https://github.com/WayfireWM/wayfire-plugins-extra"
+
+if [[ ${PV} == 9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/WayfireWM/wayfire-plugins-extra.git"
+else
+ SRC_URI="https://github.com/WayfireWM/wayfire-plugins-extra/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+
+DEPEND="
+ dev-cpp/glibmm
+ >=gui-libs/wlroots-0.11.0
+ >=gui-wm/wayfire-${PV%.*}
+ x11-libs/cairo
+"
+RDEPEND="${DEPEND}"
+
+BDEPEND="
+ dev-libs/wayland-protocols
+ virtual/pkgconfig
+"
diff --git a/gui-libs/wayfire-plugins-extra/wayfire-plugins-extra-9999.ebuild b/gui-libs/wayfire-plugins-extra/wayfire-plugins-extra-9999.ebuild
new file mode 100644
index 000000000000..74ef87cc7523
--- /dev/null
+++ b/gui-libs/wayfire-plugins-extra/wayfire-plugins-extra-9999.ebuild
@@ -0,0 +1,33 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson
+
+DESCRIPTION="extra plugins for wayfire"
+HOMEPAGE="https://github.com/WayfireWM/wayfire-plugins-extra"
+
+if [[ ${PV} == 9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/WayfireWM/wayfire-plugins-extra.git"
+else
+ SRC_URI="https://github.com/WayfireWM/wayfire-plugins-extra/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+
+DEPEND="
+ dev-cpp/glibmm
+ >=gui-libs/wlroots-0.11.0
+ >=gui-wm/wayfire-${PV%.*}
+ x11-libs/cairo
+"
+RDEPEND="${DEPEND}"
+
+BDEPEND="
+ dev-libs/wayland-protocols
+ virtual/pkgconfig
+"
diff --git a/gui-wm/Manifest.gz b/gui-wm/Manifest.gz
index 5bfad0aac963..9c66b08dd47e 100644
Binary files a/gui-wm/Manifest.gz and b/gui-wm/Manifest.gz differ
diff --git a/gui-wm/hikari/Manifest b/gui-wm/hikari/Manifest
index 79f92cc0849d..312ebaa440a2 100644
--- a/gui-wm/hikari/Manifest
+++ b/gui-wm/hikari/Manifest
@@ -1,4 +1,4 @@
AUX hikari-2.2.1-pkgconfig.patch 2675 BLAKE2B c5313156b4c9fb2871d3c5ee7b0b4532235c9ccf36747d5b6f2b519f1cd9f9fc65b366f404c4c30842286c3656ee75a59ebf214c6b06f4ad3be188d312f9b371 SHA512 d9e782c9bc7038e452a2a2956dd7e812484d8e8cbbd73018dff45a91522594ebd9cfa3e8737b66c143ab7a8cfd04e360b41b9cf4f037a8f215e1986745467378
DIST hikari-2.2.2.tar.gz 1019277 BLAKE2B 3cf76f0849cbc80493b6f078ec32b2a6f8e47f12ff3a015132e662dc2382f4071661126bf111550e5ab31eee69c54adaf10ec6ef64b681d7859771a180d30652 SHA512 53b1cb8b8e5fdbabcdcb5ba8af31f1cc66e89c8e94d217b7d1f89f0c733fb7969a251ef5090296b7aeca064aafc60d12878f3f2dbffa17e1fb24609e5549b4f1
-EBUILD hikari-2.2.2.ebuild 1395 BLAKE2B 89adb4ea6468cb0404858b1da7dfebeb5fdbe19392282b3a69a3cb55e779bd0c806da0dcbaef114b34d88930cbf5cd1ed92c5d782f7942578c4f00a73b8485fe SHA512 c02f303b6c6bfb0e9fca846aa75b606241c15956fd57e7fd1b173c98380e2c58fbab2be815ba0546f3ab74ff90420e54a38bf354d7bf3d0effc5a36abb92f35e
+EBUILD hikari-2.2.2-r1.ebuild 1399 BLAKE2B 962fe480625acf9879a27af92d198cbd950eabfaa612511b70b28f02a4b28b2dbe08d7bf499625f0dd6bb990c5712b3a3e5e6bb65bde66714f0ee6bf05ae1735 SHA512 1a4b733158710d2eb623288c72f26f2895456bf149e5dbda44cfa515440dac3694b52a263b59d07b04e3cd5117579da9744c1d88ecd7ae9955399e3749a0ee26
MISC metadata.xml 1015 BLAKE2B cf0b1938d20d91676068e3fe8d5556da68afc6c3d5c1f56da1a8b18b60d3ed932c43b084cd2fd99cf5c0f713f6684da5b907a650f7f37d671d12b15de894624a SHA512 fe3983cb19d30846c315db699947be49e5ca046a320ecd56dbde122ebd5380d896210ea3fbbb860f164bc4140e7199d0cc26b067dfcab6f492932b31fdaf593c
diff --git a/gui-wm/hikari/hikari-2.2.2.ebuild b/gui-wm/hikari/hikari-2.2.2-r1.ebuild
similarity index 92%
rename from gui-wm/hikari/hikari-2.2.2.ebuild
rename to gui-wm/hikari/hikari-2.2.2-r1.ebuild
index 2d87cfd595d1..a9bbaec4c529 100644
--- a/gui-wm/hikari/hikari-2.2.2.ebuild
+++ b/gui-wm/hikari/hikari-2.2.2-r1.ebuild
@@ -45,7 +45,6 @@ pkg_setup() {
}
src_compile() {
-
${MAKE} -j$(makeopts_jobs) VERSION="{PV}" \
CC="$(tc-getCC)" \
CFLAGS_EXTRA="${CFLAGS}" \
@@ -54,13 +53,14 @@ src_compile() {
$(usex gamma -DWITH_GAMMACONTROL "") \
$(usex layershell -DWITH_LAYERSHELL "") \
$(usex screencopy -DWITH_SCREENCOPY "") \
- $(usex suid -DWITH_SUID "") \
$(usex virtual-io -DWITH_VIRTUAL_INPUT "") \
$(usex X -DWITH_XWAYLAND "") \
all || die
}
src_install() {
- ${MAKE} DESTDIR="${D}" PREFIX=/usr ETC_PREFIX=/ install || die
+ ${MAKE} DESTDIR="${D}" PREFIX=/usr ETC_PREFIX=/ \
+ $(usex suid "" -DWITHOUT_SUID) \
+ install || die
doman share/man/man1/hikari.1
}
diff --git a/kde-apps/Manifest.gz b/kde-apps/Manifest.gz
index 8c61ca097582..f76243fcdd0e 100644
Binary files a/kde-apps/Manifest.gz and b/kde-apps/Manifest.gz differ
diff --git a/kde-apps/ffmpegthumbs/Manifest b/kde-apps/ffmpegthumbs/Manifest
index 5e9ee754eca7..8872c0eb4a0f 100644
--- a/kde-apps/ffmpegthumbs/Manifest
+++ b/kde-apps/ffmpegthumbs/Manifest
@@ -1,5 +1,5 @@
DIST ffmpegthumbs-20.08.3.tar.xz 32164 BLAKE2B edb1a898709d8a6bb5591ed055b5f28c5424321558a541130e3b61b516c2fecab8a7498bdc53a33949efdbe365c6fe49fb59fc9d3bef28dabfcf2bd2fcfe8c2b SHA512 03dbd65bf2d2151bfd6f20bafeba24df78c8be97188878e79e3566e1a5d11bac0d4959507ae997b45026533b985f60acbbcc68faca730663f8dba888a8b93b5f
DIST ffmpegthumbs-20.12.0.tar.xz 33936 BLAKE2B d12f352a1fb108db24dafc1ea2ce226e2e7314047177a2afde96aa1a39dd123ae9b36f87e16dbdac40b5e6207b946e103466e6ca4bb87bb9bd7f2ba419fbcb83 SHA512 41cf587e1a3369542e16d8819d97e1f229c52ba2bbdaab39a8f6a856e96e00613bf22cc0abfb0aee2ce81e79fcb2daea876f3ea1ee3d55910c03699a804089f8
EBUILD ffmpegthumbs-20.08.3.ebuild 541 BLAKE2B ef9330dbda1ad092fb8931e528787cb81017fbd8b2071e4cfdb60d506a01efbc1fa0070ec001f2a7e97034a1247bbbe727eb3473e45fd99da0c225c25dea097d SHA512 e0a1230f6216b2cd6ec6b6d5e340a9288844bdb454dd6a28d2dd34878e1ce6b564bc233b483a8be14c615d3b8a8dda521c592037930753dcd9859b4187588771
-EBUILD ffmpegthumbs-20.12.0.ebuild 544 BLAKE2B 82b4c019342c1e960cd933ba4b59b8c229bd6346753df6eac32c08d1edfea2c12616f758778cc63e3c23d7509724df726c2755cc24468fa2b216769ba42d85cf SHA512 4801b9837ccfdbbe1c8753112522737cefd3fd7ba140e67d03f7f40bc2d92fa4a2bf403d9ebfb9e3babb80d427c4e3b2e6dc0d775da38de4d2e7426fc206b603
+EBUILD ffmpegthumbs-20.12.0-r1.ebuild 563 BLAKE2B 649dfacb55630380f07949c4927641394670640949762053e9b14e559248d0d528888027e7612d862fbd11ae966fd91b8f5ae9706bdc7f8baf7cafcafd7cc82b SHA512 b4bebcfc6827524ebb57fd050bd601c98509c01d97058c476a90b0bb743bce078c5b6c33541ab4eaf17b31ecb66a274ab5cf49882e5ac7436d7f5f2290c44de5
MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ffmpegthumbs/ffmpegthumbs-20.12.0.ebuild b/kde-apps/ffmpegthumbs/ffmpegthumbs-20.12.0-r1.ebuild
similarity index 96%
rename from kde-apps/ffmpegthumbs/ffmpegthumbs-20.12.0.ebuild
rename to kde-apps/ffmpegthumbs/ffmpegthumbs-20.12.0-r1.ebuild
index 9b0d864bda9e..f4d833b787ae 100644
--- a/kde-apps/ffmpegthumbs/ffmpegthumbs-20.12.0.ebuild
+++ b/kde-apps/ffmpegthumbs/ffmpegthumbs-20.12.0-r1.ebuild
@@ -23,6 +23,7 @@ DEPEND="
>=kde-frameworks/kconfig-${KFMIN}:5
>=kde-frameworks/ki18n-${KFMIN}:5
>=kde-frameworks/kio-${KFMIN}:5
+ media-libs/taglib
media-video/ffmpeg:0=
"
RDEPEND="${DEPEND}"
diff --git a/mail-client/Manifest.gz b/mail-client/Manifest.gz
index a6766918f223..2b3add128458 100644
Binary files a/mail-client/Manifest.gz and b/mail-client/Manifest.gz differ
diff --git a/mail-client/roundcube/Manifest b/mail-client/roundcube/Manifest
index 6caae6e9e090..5dcff13aba3a 100644
--- a/mail-client/roundcube/Manifest
+++ b/mail-client/roundcube/Manifest
@@ -2,5 +2,5 @@ AUX POST-UPGRADE_complete.txt 854 BLAKE2B e99a1ec9a316c90ee4adc112dd87f394d0e2ce
DIST roundcubemail-1.4.8-complete.tar.gz 7032822 BLAKE2B 61c5329d9abe65baba3274d3cb9a6a435f886a0196c2881153da473eb415ad4c63dfdab49c67c75a2fd92ff55f9e6da7bdfcece7041ce408b2be628da47045d4 SHA512 8b7734cdec95954b7e18a0e44957da6ef74b5b0c3d28a1449e8634faa230844f5e0c28954245641758f8b2d9102aa32f279765ed3dfa20fa7b00dee4e5347362
DIST roundcubemail-1.4.9-complete.tar.gz 7043437 BLAKE2B a1b7c6e160d29f61e2ca9c25f725b55411cb52c0f0d00fc4b3dc2ab1eb0edf190176ec932a297d6052b34047673e5dfb8cb13ad3a7b8b755e9d8e9265fb85aa9 SHA512 c6395757544b85693e808234f3dc6baac618ba115fb2c9eefc309ee18e74b2fdfbc0af00ac2b3b980fdd2abc56eefde47b535cdf688cfd2a5ce975786aca6572
EBUILD roundcube-1.4.8.ebuild 1792 BLAKE2B 6ee68871faba7e25719ea805518faf117e5619cc265235e7df8189d557af0fbc48b4c1ee14f1241854e64bae810f05679d6a154a209795c2738fcd8e5f7b3626 SHA512 60ecc662e19e21ba510947dcb07db3dd62912f675ca9b5c1a4502df456d6be8109c7803b8e4322b307ca9daa28cc70ab39f037b7f290e14e96fa1c2539cb1862
-EBUILD roundcube-1.4.9.ebuild 1798 BLAKE2B e51db73005c7b8a1c2a501566efe426b7cbf4e8079149546ede7e520e528ef6c4743eb6c75ee674ea65ee69ebd25ebfdde023c1e248fd9e7c21f3b9a8a345db2 SHA512 f6ae8f889cd6a17f0367ebe6f4bac62eac7a43bb410d141a2fa7f68307315bb2b2f61319a0b1519af620a8d3aa17deb2a9fc3580c86c6a701ab5c6aeb304b54b
+EBUILD roundcube-1.4.9.ebuild 1801 BLAKE2B c1ffa52b415ee208cc39cbfb9d04a96bf79d0ac6dd8b385c5de52aed64bfe72a7c4dda038f122db5d42a4b0406e4807b7b5acc938f2d9b17a773bf24a52a7866 SHA512 2c72d3d5ae3ad265ee8a219077cf935df68f1783f32a11057b209c5846a19dbba73af1e1ce05d01ec1200324d0bebb4d52be613d8fc29de3a026b5daa4c13e47
MISC metadata.xml 888 BLAKE2B 08166287c0fc134f79884a6bd5cf96d67ab12a74422393d0ef8b4c89b588911e03d587f99bc62bff132494d021fc03b79fbe25a3a7e19ac9ae3107495f2d45c5 SHA512 c5522fd989d08c1de91aac7783e7fb8cbdf94669ca645357b58b3565ed604a52bf563d6417f28b6e2833ad51ee65ec4dfb76412ba88e1b280e346ad8d35b4f86
diff --git a/mail-client/roundcube/roundcube-1.4.9.ebuild b/mail-client/roundcube/roundcube-1.4.9.ebuild
index 6d3b3ede4e45..e3ccf0af49aa 100644
--- a/mail-client/roundcube/roundcube-1.4.9.ebuild
+++ b/mail-client/roundcube/roundcube-1.4.9.ebuild
@@ -26,7 +26,7 @@ need_httpd_cgi
RDEPEND="
${DEPEND}
- >=dev-lang/php-5.4.0[filter,gd,iconv,json,ldap?,pdo,postgres?,session,sqlite?,ssl?,unicode,xml]
+ >=dev-lang/php-5.4.0[filter,gd,iconv,json(+),ldap?,pdo,postgres?,session,sqlite?,ssl?,unicode,xml]
virtual/httpd-php
change-password? (
dev-lang/php[sockets]
diff --git a/mail-client/thunderbird-bin/Manifest b/mail-client/thunderbird-bin/Manifest
index f25af948c376..7105120182e8 100644
--- a/mail-client/thunderbird-bin/Manifest
+++ b/mail-client/thunderbird-bin/Manifest
@@ -68,7 +68,74 @@ DIST thunderbird-78.5.1-uz.xpi 586572 BLAKE2B d88d9d5350b9c654fec7a384b94f0d83c6
DIST thunderbird-78.5.1-vi.xpi 674603 BLAKE2B 47d7902b363d3f383d18be1446b83aa67be5065726b39bb67c06a8eca8b024c803867e396b85ef24ccd820227c19d45c18c5addbcd55c5ac087e907659ba6307 SHA512 f8245adddc5130c0559a345415d64a206a282f2bfac0777d97ccb96fee7f091982621a02df605e2fb9dbb1b1da6adeca7195384084b65e1ff9134c8e99e455fe
DIST thunderbird-78.5.1-zh-CN.xpi 687173 BLAKE2B 559fe08784381491f4711200b8024a43a3a539b234aa8f4c4a0836899774a792805c1e5f74a77c33ea3d61392d2e7a6a3521903d1d776e8fe671d2667c6f5f32 SHA512 917ddc49e8603eed925678e57d9a00da85da42676ae7b0a9e567e84f8cb8daf8014b897cc9a651ce60a683d17cd9510400647e5621261ae483fd6634cbeaea36
DIST thunderbird-78.5.1-zh-TW.xpi 687617 BLAKE2B 905f1290f151c44961c3052237b57732f1be545a60189e2fd1621b1b31d522cfc8cbb7e49fed1d8b8795d936a830c7f5dc33e0b27d8caff31309d09429397e76 SHA512 1bf9343592d4df3f5f091ae6fe63b58c2c43bec0581124db88e7c714877e364f0a97d252736dec6cf3522134a7eceb7ca00ffa00274e5690f39e6a4de1f05a8c
+DIST thunderbird-78.6.0-af.xpi 548345 BLAKE2B d89ee0a52cbbdfe33efb93f5ad4d89523f486b18fe62f5292dbad19b2ac7f8134d83b9c40e9424318d40de4a8d9f745f61faf0614015ce6ae1ae8b42b9fd0be0 SHA512 273c352acfce808b97bad77f0b9a3b02296ea78e086baf7b2a3c5d6c980edcdc20e2f525aa24dfffaee74a027a8bb2d34ec09f221f76a67bbcb145c6d21ed417
+DIST thunderbird-78.6.0-ar.xpi 648600 BLAKE2B 274020f982e55bb6892153e3a19b55a6bf5a845e85fdf144f114ae2be4a4607fe3f140ea67e89ea2a3b921355f550b23e5eb88723a58803c4aac08af7f7b161d SHA512 b73e36dd0a086cdcda34757a0e30dd6aa82791862d60d7c0f87bd8687d52d71da81dc1684130182be07001a777512897dcf4f95e23db344f97991ff937aae5df
+DIST thunderbird-78.6.0-ast.xpi 561260 BLAKE2B f6eff5ea45de17a5b370539ab83de54a04d6afa603e122f2afc8875e3f2b3205fbbedff7c3df99532c7ffa8985167a1b124ca586376a3a8b3f84e6023123ee92 SHA512 a7ce5cfaf4c96bdc63dc99aa1e5a31eb5e4f90a45350b3bcae2fedf2925a2372fe0058754f490e5e0a114ee5d6341fe8b632f4e3c01924da3f79738a55201117
+DIST thunderbird-78.6.0-be.xpi 666670 BLAKE2B 13402ba59c35c3d20c25cb18f8786c0a0b83088e8ee46a0b3c0fd86f0069c3848e966a9ef7c2546e0d665d01e16ee7372d1c920be902f18a0efa36d0ccacd8da SHA512 4ca4be8284f64132c99c11e4428fa7e4638b8a970eb31f61b5368a18425b7736622ff21b38907450361b943b680d50b2f0b293f6dc943cc8b665ff8af8cdbe8b
+DIST thunderbird-78.6.0-bg.xpi 672417 BLAKE2B f2fef6a49108146a3f4d0c4feb36cf199a5043a85544f4e0d8cee271f180126ad0f035f34bf4978071be3f7f7bbd15b25f9bb6addc5bc05aa7e8a22eae3c6c9e SHA512 aa18a8bf86ffdd83f292942f338e4ae6085ee50e0b573f95bf0c9fa99e257719e934e48d6347c99b39c7aa128a34cd6986154cfd8cea8e5c50a023a8b669a861
+DIST thunderbird-78.6.0-br.xpi 604528 BLAKE2B 4c1a1159eb3c2433ba2334833799cbd321b43165331cf4cd3fbc6f0e29f543aecd8755632938151220a30d69f6f9e503d22a1656d0488a1d57b36a7b982ae148 SHA512 85c9c83e535c87faeb98e2adb7b7ce41752d913e23cb7a92bcc3f5b7af412c184a3995bc0956872c9474dc45b00f6db00058f485a7ff202d478179b8b34af656
+DIST thunderbird-78.6.0-ca.xpi 620436 BLAKE2B 0124303d8e022da4a2a67df03e18d3c64559966c952a9df14a2d09de954467954cc9231904c649c09b40a4956752156b6eeafc4d904fdd9866a0e8bfb01aac6c SHA512 9d6debedb42e0d314dd4a8f14eba786ee32afb582791e2568a3a528cedef414c01a3df40bee44514ce8cb3e498a49998430b52b1cb3db3bda78989f1775b7a01
+DIST thunderbird-78.6.0-cak.xpi 635657 BLAKE2B 095934912bf56eeffdbb66c782a32ed30a3f1d940eafa086a69e385a2d913c38510eb5e3522c4df8d25e6d97e9bb4ac5bf5552ce096d7b92f14da2fe68676777 SHA512 b998c8972f193a57e0a601f0a6d51130567fd5a74d7d31fdca03cb2ae0d716196bcc36718ce936c15f92d24a2035e19479546dec618685505b4a3ba59ec00653
+DIST thunderbird-78.6.0-cs.xpi 635346 BLAKE2B 58d56bef182faa2996db3a66909e4daa113a66193b2bb1bed629e772792c2933ca7983062ab2828aed9957bb0303074d02c0729650939153deb0646eb47d71d0 SHA512 317573845d2d470a5466dd0863e2c462ad2357b3f6ce422ad74f9db53ceb6876095452bed13cf83cb46ec78c47145d2168b51c600fc17ec1bf0c8e458e15eb0a
+DIST thunderbird-78.6.0-cy.xpi 646243 BLAKE2B c02bbe1a26c4c295d04750adb393a786fda6acdfdac420c155f57ca90470ad2ff07f4bed50819bedf1739c0b14b5facd8223a68fb358b832ec683a970a058593 SHA512 836171f65ce69d61c0f2043c18db13f2fdf8e38b28982b89bb547de07930c1dd807f710efeb50b61c203c5f91648499dd58488dd6e41b050aaf78f5f1560deec
+DIST thunderbird-78.6.0-da.xpi 620993 BLAKE2B 089edb401b604309848a8c45ada0e048a76670d2ae85138b60d798afdee0597f8a3cf9d7344755a207c381cd74444f55e0c634c72b01863dbc6d547838d894b8 SHA512 e5d19b04b314dc29ba822ea6ccaa77ec54ee526838ca4b565ab74b63a8b521e7060af8d416a285b56db91631284b34941bce7e664643042440528e8165a01c65
+DIST thunderbird-78.6.0-de.xpi 665191 BLAKE2B 8236d20a297bb3f0b9ef0b9f7cd8eb49877aeb8d12b38a3de7204fbeaf544b109ab4d420c1792277dd4570d94a564ed13617287f6b3f9331404b213acca097bc SHA512 0ef3ba13a9feeb3496d295553f6908a0329f426b8b0fb1646a2f0c7638c4557765da5a39b58e4269dfe593a43909aa712024e16e0450df7c4db5a938172b855a
+DIST thunderbird-78.6.0-dsb.xpi 666771 BLAKE2B e1c15e7a2c5eca6630a5ff739c40dbc095903326ea324e8c2fd6356603737d18cc837cc511c0fcad0c322bc007b7c6d7f706f2062e8a8ceafa92ceb04fd952f6 SHA512 a831c73ead0e13ab05ae95b972055a3b329092b622c19cba1bf4fd917e85514b55d4fe1c31b1af51173f855f36b4a9bcc631bcf1081fda74d2bdde7a9584526e
+DIST thunderbird-78.6.0-el.xpi 774448 BLAKE2B 6f6044403442a9375eb42f9b6731a014aa2d008f713666a8caab5dcd6260ede83a7292ab2ca1920fa33fbe87c5e07c66b56feebbe7c8ec580db7624df45f317c SHA512 63264d5332a089e838f4a968f2c804d3e8411a68639caea65b7d6a13cb0569f5e44b2ade846032bb79f13499e9565ce231ccb55ba48ca3a2502c92e0f40adedb
+DIST thunderbird-78.6.0-en-CA.xpi 611773 BLAKE2B 1b608542c77d41edb37c583cbd74ff1932dd21e36954678161c57f6820ceba4c14408dc7d79a8d7a86bfd4d493ff45028fe520abff79719db025442de6d88b65 SHA512 0077c9b65b56e8b1c5f7dfedf2bb2d45896b4a02b5c6ace9e8e03d6499c96cf4a9ed1dc9eaa85a71357f9a1a5a60b5f8f6e21a92992ac5544c3d1992815204f0
+DIST thunderbird-78.6.0-en-GB.xpi 611183 BLAKE2B 9bc2ea427279866563e421c6ca7efb739b96a9d5aa11591b3595cb54a9293bd1876290e385f64206142d833ab3339321af6ebe30f234472cca48affbd5ee0127 SHA512 12761b4b100bd845f2f55c2b724b2bd350a0290ff821df84c4f732d5947e2cb974368ca0063f98e3e8ab264da4e2acda7499255dd82e96bf30b7e7e32b4fb1c3
+DIST thunderbird-78.6.0-es-AR.xpi 657788 BLAKE2B 2d14ebb13dbdd93d4f095d1c9a1345b68e9e6d488059e88bc3643695fa31cc46e8edd76aaeb8beb10c1fd7a1dbab313b0c693a68d46322159781e6efd199ac3c SHA512 0417c7c47a22c9e548120202d35b52fd4bf7bd6b08e4c9771cc027348bec1fa8db3cd551f41726cc61a830397738274d0483d1cbd507b90c501b53495f22f6e7
+DIST thunderbird-78.6.0-es-ES.xpi 569804 BLAKE2B 33bb8080008ef53e82cfb7f36c4ab8e21691f9fbe43c1691ffac98dfde64c707415bf8e0d8488a058c8e35813ae910dcd4e82126779ae2259dd9450c4bb87a21 SHA512 7c6cce31958b93afbbe4fcf99a62c4a73f2e37eaf51a54945d0ce2190df635eb53498d3d455e7b53fff035f9dd76b92b4478cf44594d67d293a5ca549ca43e36
+DIST thunderbird-78.6.0-et.xpi 597728 BLAKE2B d0aebfc5fe1335eed6dbe6e42015d59b4aedbf45f91f44950f125ffb8952395119f8427c83c0749b1d682fcff553e556ae41d2ea8ff011a2d3931bc78a05d285 SHA512 5381bb92715ad132cd8c68d9781c4c975a59df64000a6ea71a0113cfda54ddcacebfca8b90bd030128110c915293df26a2c34a10f9ebc2ffdf0a5b24eb39d18e
+DIST thunderbird-78.6.0-eu.xpi 632962 BLAKE2B c97291230b26dc72d0113af0f4cc8d8d4bf5be645bc784b8802852f6c58ef9e691bd73a15843b974ad9b2eb5ff48b291a35c774e3fdcfc54af492aa9f9f02e22 SHA512 3f38183f140aa30e7b947f47a9da01454722ceb69c75819c0a8831938faba084b3b2398ae5136dd3c72b8a504df78bae6948b6491b8ff8ff9f3a675b934d2a60
+DIST thunderbird-78.6.0-fa.xpi 639756 BLAKE2B e61f2625fdb7cfa1d3276b5f0a1fe13d89a7632e1437f7c32262dd0df994b41868094f57915d4b389d1277a0a7c8692203da82381a1b809178084b80e6deb391 SHA512 d8e4488007f6dcee3b499e8306086860d3d2d2e4031c0a03022402d1eac2dc7f35a77ed49d2de8ad0e1ce50450152c3f8e1a685f416c2b4aa14239b05e4b0d94
+DIST thunderbird-78.6.0-fi.xpi 642454 BLAKE2B b29324602268c3b347f8876f1c0e27de28b04c49b862bb93a614bcca40250c79f644887261468f2b110b6d71a1ad5da0d45bdf40301ea24a159bdce5da914273 SHA512 9b69c8a1ae2e04aa9282066cdde5831960d34bfee69188aa8fe0be69db799b79c3ea11f55d1c084b4d3376974c667d8dec57592937c4988617d1cf1dc81690ac
+DIST thunderbird-78.6.0-fr.xpi 669493 BLAKE2B fa3b3bfceed1852a3500b3804679d57f897a017d195f011fd79b9476f73d385f15ce3316cfc349d31c9fb03635aa5286e212343cf9b6b45be5532bd9eb698996 SHA512 bfbf57fe957bad0043b51950354cf1619a497c224ee3c84893f888d6ad72e695fc6a20a9c44c8cfe48d64f89f80304a8d814a600371708415c2671f28b9b7d50
+DIST thunderbird-78.6.0-fy-NL.xpi 653072 BLAKE2B 468c42637d99472415f5ab81d3126fcbcf2eab5e67803e16b7d0d0117fa039983e1d43d2c7ebbec0acff9d6dd20047c558d583ea2c7104b277e68989da90d9c4 SHA512 c4e4999c76af1c94cbf5009f23d500f2e5351fc38ce18c45c06dc85d6e548be411632b3c3cdd84f37a476cc391bf9000de7c0f4331bfad445b8e13aa153b2951
+DIST thunderbird-78.6.0-ga-IE.xpi 600703 BLAKE2B 7692232fdea4a106ec0c47c20f170ba0ed021438e41893159038bf9fdf5e00f7dd6e67bb53ab515c9d3bdfe540c5b65e29e2ebfd81506e48e9920b60128b32ee SHA512 d16ee32e21c3cfa354e34b74864f732b2edeb63177ab0ad19731f12ec724f4c59a684e013f0ca083edec9335039419e53b7c86cdcf01cf5bdb02896f7ac7acbe
+DIST thunderbird-78.6.0-gd.xpi 609381 BLAKE2B 7813fc3edc1080148a59eda5ceb3b2cc0fa47f734c18dde4412398169746fd037c364f7159b1ad1877cf7a2a0bc590b53df552ab2f00fdde0aac83eddf40cdee SHA512 a775f12c9a85c4be2ff7777e3cef7f921e6d70be3e1439c363007d383773b56657600eb816299035d959d97708e786319f927410dd83758c5b605c17447418c1
+DIST thunderbird-78.6.0-gl.xpi 615720 BLAKE2B 766c20db8418c07016c8acf90adfec3a64c86e6fa4f6f37b51fc92a36e4af9a588d4456177acd7ecf207e7d076f1ba4159eb00c94179a0082759d9ee1fceef4e SHA512 ea9003203e13a5beeac91b691e1fad55eadd83113a586943330e58bcfa00451acea801d374064d98e6649650545392b6bb5ff69d2cdcdf08c223dfad25058a32
+DIST thunderbird-78.6.0-he.xpi 640498 BLAKE2B 8b372d45238bf88182a53c2129e856c2c4ae59406bcb3f22740d5e8fdd941b351df58baef25e9857eeb42583fca4b99e1153bd5239f6ebdbadb9ff8d12c139d8 SHA512 586869e7648df55872fc824d13bf279cfb0ea2f133fabb235ba6230619a2ca7f0dd505cfe71b8788a2e965f3657aa98fbe5b79acd1995576d2507e56e0398c45
+DIST thunderbird-78.6.0-hr.xpi 629032 BLAKE2B 7f7410f9a10c348db7c605e485cd90ec0b88e028ff13577c10017e27c91a3f182edf2a5121febfe97ac849529b47f395aaac8b18bc0e705f28d4d5f6b5a7b27c SHA512 950c929465b15e13f06b065f967d58ab51b741cf788b58f3e54c15f7917b6dfa372213e4e685310c08e76274237f113b8edb457c29a1beb93e7643cbfd724558
+DIST thunderbird-78.6.0-hsb.xpi 668602 BLAKE2B de71c85a194402ec9e5f7e80e51cda8b25237c47354990da6ad187638d7e4a76ca49a7ef6bf84d24737669dfeda31ef26afbd57d09633a3d16d56c619a9baba3 SHA512 e2d20a2c3eae77227587b3f90621bd84a3b4c5fe289b97a03b3951c0a050a85faff3f2d4cd51f0e644ec073706e2249e304a5ccd00072ff70d37fcff902c14d0
+DIST thunderbird-78.6.0-hu.xpi 679831 BLAKE2B a5597ac70728c3d89c4af989b31dfb73e1dcdce1b6426b1eba03dacb17881d818b5f1e146ab808199e07f3f81bf6e31b0e5a89519d79ef5040cfba3a58843000 SHA512 df8a66b3907adda26bfc55eebcd463fcb2c93fd907c6c72a133a66a2848a9fca7cc1d78e25b745d750bbd5c8a47354a225891095d9d036ffd8f529eac4078b0b
+DIST thunderbird-78.6.0-hy-AM.xpi 713334 BLAKE2B d3fe1317a7bb149a60ffc85786c37b4b53a6b2ec41d4099357ee3e7d7a5d48aa477f4212a2419f94cbba117ce7e773c7f04467edd38ced72867545fa6c3aca9a SHA512 9c7a3b685d60f1ef899a0e61752740f1f15c8ff6d1f156d6b1dd1b90ea69f3c319a0fc5fbfdabad954f20b87c712bcf4a7d1010de7b8fe06618c24a4ae0dec51
+DIST thunderbird-78.6.0-id.xpi 620680 BLAKE2B e09060c821c4ec6c2fd047bf2fc01cc161fc984807d2fda7d571483029d5ab9be28b1f2950d279e8ba3aa86443e3eb7774dc15b377a048a75d0dfd8fd6541bdd SHA512 ea81176725de1a79cd6bebda2e41f01a852db5b8d3b2466919e77afe31335255a3fabd9d88bde684c5bd4fac447f106a183e217e72a15f436a92bc7f064d0acb
+DIST thunderbird-78.6.0-is.xpi 581641 BLAKE2B 0debf74e2280b2a1f0d733a6845f5d71c46f1ad0c3cb771e382247369d1d6529e410b98515019f7bbfc2ad4ddb600cb4f0922bb5f9f043d77a0c285e82c7ba94 SHA512 bb9a1144afe77eba866d03bc0eaa507e7e12fe785af4a7d0d61be2257511d48c83569fadaa7b71c71b3d74796296f34424c10ad6c6735d401542be23d97e27b9
+DIST thunderbird-78.6.0-it.xpi 572959 BLAKE2B 00f7fe1681a7e79acfbec06877732c1603263fc58ff1e8a595c672f8dc6e7368f0b028b7eecc2988dea2249a4b35db806c1b9e08e8effc67347c2f1572dc7342 SHA512 de3c634a4763a0efa48dfa921986f12dbdb5d8890628996a8b26f10e35dbff833851381a2b3846328e52d702d33eebaa0aa6859ed3c61dc19ffcededb99b1cc9
+DIST thunderbird-78.6.0-ja.xpi 722456 BLAKE2B 122ebc20541bd219124b2241e90401067a4c58a1b00e171827a95df43781b875703fd8e4b5388327b8f883da8fc87839d13c02883c284333947036da6e183a46 SHA512 70d5b3aa1efe0c6ad54c7b15599f6c63b0deaecd0f46cc20ccb16201d24a081f45f62f73907defc6d5b73d2bd3e3e8f959ddb5744d0f94b880403595802ba856
+DIST thunderbird-78.6.0-ka.xpi 717013 BLAKE2B 0733225b0cd6852aaa15f24fb99659e622f40894ad81dde4119d1e3b536038d310280f5edef41257355e6485e17e5db56a7532a20c6ba7f498b272f725a9d61b SHA512 2c4ecf76f42b2e0421a08d7825b8fed3a02f340634ea5136024dc4bd4833b93f5079ea31911db0af26472ea2fc1ba8ab0b47e5debaed8345533f1f1ef37fb7b1
+DIST thunderbird-78.6.0-kab.xpi 651911 BLAKE2B ae8db244f9b001eb84d463dfc20e032471c956164f366e9eadfa309f79879e7f52f3edc4436db2d4f0e41e76cfa8865f3debec2aa9f7eb4fad156d3c01bf551a SHA512 8ea02eb64f8852929b5a48c5616140ba24dd0d056e5371c6489fe080a8c4604108ec2b38ae6ed937304889aa58608a9815813f3bd1a1149940ce994528a1594a
+DIST thunderbird-78.6.0-kk.xpi 720467 BLAKE2B 6ebbff20d3d5182cc605f16ba98d99559f84b0e7db007e2a8bd7808eb71697b4d60d0ebeb4d2e738b41f546eb1c026d9d827579f566dfc5dae0e984cf73f729c SHA512 41e5fb9a5c03114b465ea1f7d1d7d41a9bb1a8147ce89ebf043a96ace293321c6a933b166637ff750bf3bfbb7722b39d589910d1e88680e18871f1c473b475ab
+DIST thunderbird-78.6.0-ko.xpi 688206 BLAKE2B d3d98362817d725aa1d69a1a7c0b8d84d517108b72a1bd37d8d43a647aac22032b7a3c6f1783913176fee64c501f55ed00ed6e1fabfd33e9d51963777d81fc33 SHA512 f7db483586c0d2f562316b63324a996355572177d83cc664db34048e4e613f2302f007cddb356381f93cf3526a33ee5a5b516fb9469775a99b634f5712651979
+DIST thunderbird-78.6.0-lt.xpi 660294 BLAKE2B a8fb815d4ce796391acc4f4eab4dc75c943b7b0814aa056d85d8fb687903a5bd11b7ddb839100b3a183ea027ef934f0fdf635956ca83885fee302f8270f5012a SHA512 f31729b94c20292a88deacf4e44a19fb9e3843334f87a062d1e0f482f1b7b2c81cb61c96ffc2a9e71f90823c0571c51ea5c3b6e1df83b7194cee00e93a200560
+DIST thunderbird-78.6.0-ms.xpi 572178 BLAKE2B 434711867a334f60871e013b10ef6b0cd5df01df9a254f80922db1fd4399ff367112595e6a04645274fd18b679c4536ba9f71d66108a2a1a8550458601b6fc34 SHA512 98b1db595979d635fd83013b878a91c7a54459755fa60db97f080d98328cbf967b4a4d6e12f47229d7162cfe06697b6adf87bd6a1b76bb151af0a45f2241fde1
+DIST thunderbird-78.6.0-nb-NO.xpi 637238 BLAKE2B c245f36cecd8416110390f9d654fc2b03fbb89a54e2f04cdc56771b72f88fbece43e78833c8d178ef733e1a1748e691ecca7e18858520cde82ebf310ae1570aa SHA512 5790635192abd36c6649af9024498a1830a6dcbfa4f830b54ab9940e908ad0184c696acfca3f07856f507b22793f7c401f914ad179c9d02ddfb278a4ce9e558c
+DIST thunderbird-78.6.0-nl.xpi 644358 BLAKE2B 1e6ef2483d2f7aea4645dffc6180b5bfada30e7eaeae017d25c62428e599549c9d7c7c6a1440d0456b52bf0fece5a3e3b04f015c685e37b05329e4d88a1c50fe SHA512 40cdb1860ff159c6929523278e2e08c0701333e76b15fd27689e424450363c4ee0f85088f3963fef3cc1dde891a886b31b48316eebe8c4f4c6cbeec4c35d603f
+DIST thunderbird-78.6.0-nn-NO.xpi 640689 BLAKE2B 9d7b6894ca31a9ce1d85ae57bc368b9d1c8ba7af2a98255e2e57253b6c5867e3657a5ba12b632fdc52985a4242fffe21bce69f4c085859454c3f1e6d6d58b24d SHA512 cc37e910819df0245d9b69364eec7c95bd5753fc4513188e8793c5e6e44ce7732261fe22fed4683e535dc68bfd047c4aec9d106a3e0912911bc9a522bb83335d
+DIST thunderbird-78.6.0-pa-IN.xpi 633216 BLAKE2B 689f49261d4d87262bc6b25e69dbbe97cb9d1c70124c67e0f48e8476ccb1d43875695f48276db8295296cf79fa8c9be404253a590c348c182d872bdf4e4ba7a8 SHA512 21a6c9e18e089c57541b827449b51d2591a7d4b815398faf36f727eedf17c8b97923687a6ac6947e89aebb1ecf4f10effb3aab39798a8ff3d2e99b0f2939984f
+DIST thunderbird-78.6.0-pl.xpi 637127 BLAKE2B 80440ea54e6135d51b34db18b5f1848fbdc0f0adb04aaccd8ace85c2d7521af9b3c0d33abc81b36c631db77b95663ad5dd4ac19364e8300183c6f6a82adea037 SHA512 e0a35f5a5fc44e3ad0150eb93e6e542c4676b02e16b797c04ddeed551bba191750f58dd743431350af3fe44d318483a6b823767a3a9ebc5a75483d0706a407dd
+DIST thunderbird-78.6.0-pt-BR.xpi 649417 BLAKE2B c4f22032da235c6f3828205dea272020d198ea6211d595900c9bdeacb890ac4e3e3b162f5cdc2cd163ce3be698bb8df56c7bfcba1d45709567c5e2eeae2e3494 SHA512 5223246ab5c33ecf43d6b81f1c26eebdb25d667726bb7ba5eadf7c4d8c774207543f098c049893b42965b8495f2162f00cf2abccf85ea6e7f141a9a0169eedb2
+DIST thunderbird-78.6.0-pt-PT.xpi 655498 BLAKE2B 256ce12702391fd3c9fb8de6e4f0257032d41679b2bdf9e43e7a96adf281722a714bf60004b4dfec4b210f7c7b64913114686f76d3d10af26e83573e45f09ccf SHA512 5a81abf08b6115480573e729bfb5c00bb1c8449b35b6b8ab8523e9c84c9d00e53973e4072a99a736c9d6a44afcfc4d5587df9e1b5036966d18cb5393d3523eb3
+DIST thunderbird-78.6.0-rm.xpi 646529 BLAKE2B eac9273aab4ee9fa46880e0f92d0041c1fc003523fa191918f34bc7219d6e4a5075bb815047881a07b8522a212d76a75c838ba0ced3c8af3cef5466d5aee8a40 SHA512 5b56d907789c926e92344ddbeae276e6879ac7d9171d52f235ef1a319422ba6f6b2c0d905d1e43eb28a65153ca8869fb69a3592a16a308a6fc0e3a7df981f79c
+DIST thunderbird-78.6.0-ro.xpi 662631 BLAKE2B 026ef09f7d7d489e30a28fd0f65a48a3cf0188812b3e34aa5768ade6a8638fd7e49c006ad8c7140c227e9cfd03a451c6206c0ffd55619834b6a735e5cc50f72d SHA512 4912ba964500b233b4caf08c004d69623d2fb864bdaf4ae46f0fc65c2552fb75d7da5c20815e471971457ef5a98661e3424218f78f88fa63077f542ae8bff312
+DIST thunderbird-78.6.0-ru.xpi 756183 BLAKE2B 8051edc385f5c9bc6263fdbafeb777a1c168a4f54f577867d965f5aa91e2b454b8734a64e4a2aeff91447676461d15c815c9a73b10213d60843c8da8e086a413 SHA512 d3f60e3b8efc6dc4fc1fc390dc3afa29f74e71df0efc553e2011f2bef341cce0522c861ac3f131ed4adf9f172d8390597de0aa094670e0a1e34e36afddcc0ad9
+DIST thunderbird-78.6.0-si.xpi 651097 BLAKE2B 70b48d07ddabec8fbf9257f8d3eca281ad35b262abb189445990b628efbb59af527135e873e96c5072c71b7b18325ed656b7873f98121660922b3e19c24ac2d7 SHA512 4c5769c720616276f900f21afbd580ad2bc97f86522eff3b75a09f69f2146f9510742c2d83f4080e7a23b97caafd0d30a40e6a6bebd819d1d67a1412831f6e4a
+DIST thunderbird-78.6.0-sk.xpi 643224 BLAKE2B efebcbcc0fdb45cb68a392837a893b8c6efac3ffa578024698834b3c4b6a1991ded082368d780832719c6d64cc049a4d989614d6d0cfe8b3f9450d1f9d763616 SHA512 2b3c748650b642e7790b854f897cae928197914feb95cab8003c0b33a3dbea050bc60fbdffc32327c458e052a8db8f7e670c4caed8fe5895b2033851215d9484
+DIST thunderbird-78.6.0-sl.xpi 632386 BLAKE2B 703614849ff79d90dcbdada61cd90f493e5bb1747465c4e037a5e5c668e5e0129d03a19fe9e5161c83ec64e9f5f23a134a1b8d7cfb7d3bfd40bb6ab4dec140b9 SHA512 73a5584dd6b27905c64ad3f4a20f089ced5f7987865b316145d8d7160e863381eafeed10918ca18bb58dbce4d9d302c72b511996aea9ec789d90e1e0e5137683
+DIST thunderbird-78.6.0-sq.xpi 657824 BLAKE2B 37c210e46f0865db3feb8fc05e0baf0fbbe5d0c7e2e40248b915cbca82e6f96f3ff1cd968a0979571fcb036fa06e155ce7e118c6ceea962bce28dc9b18201dc3 SHA512 d90f97a383602752adecdbff4c76e50cb5c5ce31589d2d1165bea6c5fe30d80382fc9294f7c7d1df6c33327f99ec87e7ab797645e5ea4ebd89acfeb2bc0a8e7a
+DIST thunderbird-78.6.0-sr.xpi 683113 BLAKE2B f3dbfd42ccb3d7476af6861e1e8650507240b179ee4d6b356797e95436fe43875c8e239facbcf75884a3c1cccdc2224d1da46cf142b571f6e6d24a49d5bd2c7c SHA512 7a3201573cba6949ccba92a5d6801e61775e8dc2e1dd1f5e5f64806559081c84364f974e93de032845fba12e469add4ed731975bc0490dbed03d928b65ae8783
+DIST thunderbird-78.6.0-sv-SE.xpi 648865 BLAKE2B 2682a73db0092415272cf1b99409f282b7b39538f018d697483b6b4a13b81182916f76f1fcfb608dd91e50a239e11e0d973333b5972f3d926322372118940043 SHA512 9509af73ae1efd8f7aeea319c736d962d81c0ab4708b4be5c5637d73c7fa804cd3a30b507f3d18c365f8ca1cee78ebe9a1797cbe4db7c91bd220fd82ef4a5be6
+DIST thunderbird-78.6.0-th.xpi 712032 BLAKE2B 0945fefe03f853e36e2d48b0991b0fc48e2c5a63c18405844ae0c225d302925a81ac3eb30221aeb16e68902aaa099669f961002f917663271c0c8de39c5402e2 SHA512 8e26902e33bb940ceb7e23ddbecd3991caf08ce3e9aa9049a02fdeff377d741ca69aff8e412c0f87329f67d92e7fb77f6a652fd05e3ae5422972776394f4bab8
+DIST thunderbird-78.6.0-tr.xpi 649077 BLAKE2B 0cb4d4ca9cc747f9d430873f4801d0c019701f07fcdf6846263437fc9c072251f0d957eed792fd51df02b80493742d22b24bfa3da2bed358fc7023fd23d4a99b SHA512 a98868cf4efd6fcbd0d52278b7d5a35ea0db4b0d8fcb4b0bc449fa73771f1f80d5b542521450f755c09cd509b0a806716b527ff5b36ff6c87ca1aa8dde654951
+DIST thunderbird-78.6.0-uz.xpi 586592 BLAKE2B 00ade31247f6aebdbb7c3d1dbe4913646ea752041cdd83e6c67779c764ce2f2530e9dc38125d92d9930cf5b5f4615a67b8ec1261e887412f00fdb54f502e553f SHA512 a5d20d2910e70535da06ce1a52d28190934834b609af2c689f6695e2c4b4e0fb20f438ebd4d8ddb4ef7f327acc845144ffbad4965840e72d069662a345d980fb
+DIST thunderbird-78.6.0-vi.xpi 674599 BLAKE2B dcc41dcfcb211f9362b92dde02fffecc83c53e279e97e6620247e617a9da03d641301ddfcb244f6977e932cd3a5e97528fb6d66c098e41394b9b8e2600cb9f52 SHA512 a73b25e4fcb1d110ae79fc14e000bc4f2fcf0870d521f4d2c98bb8774c889ba308aedc5a200f4b344aa12bca954d829abc4bfb4fabf1d14d15af2fb9e0a77eec
+DIST thunderbird-78.6.0-zh-CN.xpi 687180 BLAKE2B 4b662680445032e207b21136af182358b4d353d487baa42022f42b4ce0a9d413fcf7ddfd7b5a0ec6418c38d6979eb8adfbe5c435632873642f9f25a8614b9c90 SHA512 4655c5b71b75a483779b1ee974961f2f11f70d4f3ff60e0d7422681a6fc14ef7b44c7e1ac409c319081b88bdf4a76fa6dc3ca51fe19a0ec87b0df8716674439d
+DIST thunderbird-78.6.0-zh-TW.xpi 687618 BLAKE2B 56a70374a090c6e8118d513dc3f55e7b8b4dc51853cf8a243f369de3f5449a311d9da6b789d4ea326b36db4f386a0926964a3d3d8f64656a2a037dc3e8b45221 SHA512 26ae0da18bd99aa0bbb32fcc5a8e5cb2e22cf60bdef93be2805174c85a1372f59b3099fed24ee5d88c754ada0293fcac8d3ad2d029a622240d583ddfaca87da2
DIST thunderbird-bin_i686-78.5.1.tar.bz2 68231037 BLAKE2B cd770c1f6c12fe9c8ef79106f835b5078ab2ba932d4e18341679c38ea661ec8135188136e8ce7fd34954f61ef9160e19385fbfb6971c1d278915d2563e1f54ce SHA512 ccf3ebfe40a9e245685adbcb9bdc0f760be0d84b873cfc94b305ceffd1eacd6a51b86f04813e0ae5bbc5b48ea10bd34caf0bc2a3caf7a3837f0457fe60b2a6ad
+DIST thunderbird-bin_i686-78.6.0.tar.bz2 68162116 BLAKE2B 7d134c1d290522517d72d9cbeb92b54e0b636b630ef574b41468b181471938b08f753aa2908b7f3ff9e4f0e5d6869a2e0234f2a1f46f8644f534b85a8431e168 SHA512 9be21f8aca07ab8823493f14b55561421e61f9a5277770129c8594301c402e6bf29a267729d4577799fd3dad4ffae38d9711a12af1ef9daf385424ff22298163
DIST thunderbird-bin_x86_64-78.5.1.tar.bz2 65109284 BLAKE2B 2559bd7dd79878873a03ede4e9ec6df8b8e73a57117779b767475e8476a15419fb83cd472a637bf9e6fcfdde2611b7f7bc27dcecab30d804d23a8e6a6e6faf86 SHA512 9bfca093b6e8d77a49f8320db400fef6029a1b96ea68fe21e8a74dcc4a18e9e8e0c2a11d51bdb2ecf5dcf52e99d8eefcf27a9c503b3c747e52e30f6c12e5708b
+DIST thunderbird-bin_x86_64-78.6.0.tar.bz2 65170034 BLAKE2B ab2008010bab25eeb6377230616dc1a77f99944ff2ecf2528848b77f01756fefb2e9a769dbd70fba3a1fd39e1a9e0ba8574142f639518bba143f2138d9f0012a SHA512 a4cb67ff69363e89ffcd9b35a292b20a9351b8a817710dd82b2fdbb8e057ab8d71d6c371d60ea5ea8d42707c3484cc3ff7cbd0e004aefbc178ddf2ae7a0e697e
EBUILD thunderbird-bin-78.5.1.ebuild 10244 BLAKE2B fa13396fac7f04ad1bbe22c8e04114048a2694e48609f063191b6c502b967e98da85ac4bf0e29ee15acf867611465eee2d79043693f99a42d932c6ed1f5c618a SHA512 ef68593e9528d6a61a5c06a2e58deb8ac7a6bfa62dc14a4506ec7e52a2d74308b243b9f53d00befa0ebb6aa663442ef703d1ef2038e36d13244bd2ab4f42200e
+EBUILD thunderbird-bin-78.6.0.ebuild 10244 BLAKE2B fa13396fac7f04ad1bbe22c8e04114048a2694e48609f063191b6c502b967e98da85ac4bf0e29ee15acf867611465eee2d79043693f99a42d932c6ed1f5c618a SHA512 ef68593e9528d6a61a5c06a2e58deb8ac7a6bfa62dc14a4506ec7e52a2d74308b243b9f53d00befa0ebb6aa663442ef703d1ef2038e36d13244bd2ab4f42200e
MISC metadata.xml 254 BLAKE2B b88b441b35ae1040470cb225b4b898a6c2a995beac668099b50cd32700cdcad63f41dc8c50416d9a2a1ed865f3f7ad45ca0a9cf053c0ab73cdf68fb9b2fc4553 SHA512 d159efb994f7a897f0e15392446c3e5d66abcb4bedb30d4e8743ea15cc3df99771b78fc665a988002acfd2d6c7701449f6001587bdcd748be684b41640b22261
diff --git a/mail-client/thunderbird-bin/thunderbird-bin-78.6.0.ebuild b/mail-client/thunderbird-bin/thunderbird-bin-78.6.0.ebuild
new file mode 100644
index 000000000000..147ff9cc95ff
--- /dev/null
+++ b/mail-client/thunderbird-bin/thunderbird-bin-78.6.0.ebuild
@@ -0,0 +1,378 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MOZ_ESR=
+
+MOZ_PV=${PV}
+MOZ_PV_SUFFIX=
+if [[ ${PV} =~ (_(alpha|beta|rc).*)$ ]] ; then
+ MOZ_PV_SUFFIX=${BASH_REMATCH[1]}
+
+ # Convert the ebuild version to the upstream Mozilla version
+ MOZ_PV="${MOZ_PV/_alpha/a}" # Handle alpha for SRC_URI
+ MOZ_PV="${MOZ_PV/_beta/b}" # Handle beta for SRC_URI
+ MOZ_PV="${MOZ_PV%%_rc*}" # Handle rc for SRC_URI
+fi
+
+if [[ -n ${MOZ_ESR} ]] ; then
+ # ESR releases have slightly different version numbers
+ MOZ_PV="${MOZ_PV}esr"
+fi
+
+MOZ_PN="${PN%-bin}"
+MOZ_P="${MOZ_PN}-${MOZ_PV}"
+MOZ_PV_DISTFILES="${MOZ_PV}${MOZ_PV_SUFFIX}"
+MOZ_P_DISTFILES="${MOZ_PN}-${MOZ_PV_DISTFILES}"
+
+inherit desktop pax-utils xdg
+
+MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/releases/${MOZ_PV}"
+
+SRC_URI="amd64? ( ${MOZ_SRC_BASE_URI}/linux-x86_64/en-US/${MOZ_P}.tar.bz2 -> ${PN}_x86_64-${PV}.tar.bz2 )
+ x86? ( ${MOZ_SRC_BASE_URI}/linux-i686/en-US/${MOZ_P}.tar.bz2 -> ${PN}_i686-${PV}.tar.bz2 )"
+
+DESCRIPTION="Thunderbird Mail Client"
+HOMEPAGE="https://www.thunderbird.net/"
+
+KEYWORDS="-* amd64 x86"
+SLOT="0/$(ver_cut 1)"
+LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
+IUSE="+alsa +ffmpeg +pulseaudio selinux wayland"
+
+RESTRICT="strip"
+
+BDEPEND="app-arch/unzip
+ alsa? (
+ !pulseaudio? (
+ dev-util/patchelf
+ )
+ )"
+
+CDEPEND="alsa? (
+ !pulseaudio? (
+ media-sound/apulse
+ )
+ )"
+
+DEPEND="${CDEPEND}"
+
+RDEPEND="${CDEPEND}
+ dev-libs/atk
+ dev-libs/dbus-glib
+ >=dev-libs/glib-2.26:2
+ media-libs/fontconfig
+ >=media-libs/freetype-2.4.10
+ sys-apps/dbus
+ virtual/freedesktop-icon-theme
+ >=x11-libs/cairo-1.10[X]
+ x11-libs/gdk-pixbuf
+ >=x11-libs/gtk+-2.18:2
+ >=x11-libs/gtk+-3.11:3[wayland?]
+ x11-libs/libX11
+ x11-libs/libXcomposite
+ x11-libs/libXdamage
+ x11-libs/libXext
+ x11-libs/libXfixes
+ x11-libs/libXrender
+ x11-libs/libXt
+ >=x11-libs/pango-1.22.0
+ ffmpeg? ( media-video/ffmpeg )
+ pulseaudio? ( media-sound/pulseaudio )
+ selinux? ( sec-policy/selinux-mozilla )
+"
+
+QA_PREBUILT="opt/${MOZ_PN}/*"
+
+MOZ_LANGS=(
+ af ar ast be bg br ca cak cs cy da de dsb el en-CA en-GB en-US
+ es-AR es-ES et eu fa fi fr fy-NL ga-IE gd gl he hr hsb hu hy-AM
+ id is it ja ka kab kk ko lt ms nb-NO nl nn-NO pa-IN pl pt-BR
+ pt-PT rm ro ru si sk sl sq sr sv-SE th tr uz vi zh-CN zh-TW
+)
+
+mozilla_set_globals() {
+ # https://bugs.gentoo.org/587334
+ local MOZ_TOO_REGIONALIZED_FOR_L10N=(
+ fy-NL ga-IE gu-IN hi-IN hy-AM nb-NO ne-NP nn-NO pa-IN sv-SE
+ )
+
+ local lang xflag
+ for lang in "${MOZ_LANGS[@]}" ; do
+ # en and en_US are handled internally
+ if [[ ${lang} == en ]] || [[ ${lang} == en-US ]] ; then
+ continue
+ fi
+
+ # strip region subtag if $lang is in the list
+ if has ${lang} "${MOZ_TOO_REGIONALIZED_FOR_L10N[@]}" ; then
+ xflag=${lang%%-*}
+ else
+ xflag=${lang}
+ fi
+
+ SRC_URI+=" l10n_${xflag/[_@]/-}? ("
+ SRC_URI+=" ${MOZ_SRC_BASE_URI}/linux-x86_64/xpi/${lang}.xpi -> ${MOZ_P_DISTFILES}-${lang}.xpi"
+ SRC_URI+=" )"
+ IUSE+=" l10n_${xflag/[_@]/-}"
+ done
+}
+mozilla_set_globals
+
+moz_install_xpi() {
+ debug-print-function ${FUNCNAME} "$@"
+
+ if [[ ${#} -lt 2 ]] ; then
+ die "${FUNCNAME} requires at least two arguments"
+ fi
+
+ local DESTDIR=${1}
+ shift
+
+ insinto "${DESTDIR}"
+
+ local emid xpi_file xpi_tmp_dir
+ for xpi_file in "${@}" ; do
+ emid=
+ xpi_tmp_dir=$(mktemp -d --tmpdir="${T}")
+
+ # Unpack XPI
+ unzip -qq "${xpi_file}" -d "${xpi_tmp_dir}" || die
+
+ # Determine extension ID
+ if [[ -f "${xpi_tmp_dir}/install.rdf" ]] ; then
+ emid=$(sed -n -e '/install-manifest/,$ { /em:id/!d; s/.*[\">]\([^\"<>]*\)[\"<].*/\1/; p; q }' "${xpi_tmp_dir}/install.rdf")
+ [[ -z "${emid}" ]] && die "failed to determine extension id from install.rdf"
+ elif [[ -f "${xpi_tmp_dir}/manifest.json" ]] ; then
+ emid=$(sed -n -e 's/.*"id": "\([^"]*\)".*/\1/p' "${xpi_tmp_dir}/manifest.json")
+ [[ -z "${emid}" ]] && die "failed to determine extension id from manifest.json"
+ else
+ die "failed to determine extension id"
+ fi
+
+ einfo "Installing ${emid}.xpi into ${ED}${DESTDIR} ..."
+ newins "${xpi_file}" "${emid}.xpi"
+ done
+}
+
+src_unpack() {
+ local _lp_dir="${WORKDIR}/language_packs"
+ local _src_file
+
+ mkdir "${S}" || die
+
+ if [[ ! -d "${_lp_dir}" ]] ; then
+ mkdir "${_lp_dir}" || die
+ fi
+
+ for _src_file in ${A} ; do
+ if [[ ${_src_file} == *.xpi ]]; then
+ cp "${DISTDIR}/${_src_file}" "${_lp_dir}" || die "Failed to copy '${_src_file}' to '${_lp_dir}'!"
+ else
+ MY_SRC_FILE=${_src_file}
+ fi
+ done
+}
+
+src_install() {
+ # Set MOZILLA_FIVE_HOME
+ local MOZILLA_FIVE_HOME="/opt/${MOZ_PN}"
+
+ dodir /opt
+ pushd "${ED}"/opt &>/dev/null || die
+ unpack "${MY_SRC_FILE}"
+ popd &>/dev/null || die
+
+ pax-mark m \
+ "${ED}${MOZILLA_FIVE_HOME}"/${MOZ_PN} \
+ "${ED}${MOZILLA_FIVE_HOME}"/${MOZ_PN}-bin \
+ "${ED}${MOZILLA_FIVE_HOME}"/plugin-container
+
+ # Patch alsa support
+ local apulselib=
+ if use alsa && ! use pulseaudio ; then
+ apulselib="${EPREFIX}/usr/$(get_libdir)/apulse"
+ patchelf --set-rpath "${apulselib}" "${ED}${MOZILLA_FIVE_HOME}/libxul.so" || die
+ fi
+
+ # Install policy (currently only used to disable application updates)
+ insinto "${MOZILLA_FIVE_HOME}/distribution"
+ newins "${FILESDIR}"/disable-auto-update.policy.json policies.json
+
+ # Install system-wide preferences
+ local PREFS_DIR="${MOZILLA_FIVE_HOME}/defaults/pref"
+ insinto "${PREFS_DIR}"
+ newins "${FILESDIR}"/gentoo-default-prefs.js gentoo-prefs.js
+
+ local GENTOO_PREFS="${ED}${PREFS_DIR}/gentoo-prefs.js"
+
+ # Install language packs
+ local langpacks=( $(find "${WORKDIR}/language_packs" -type f -name '*.xpi') )
+ if [[ -n "${langpacks}" ]] ; then
+ moz_install_xpi "${MOZILLA_FIVE_HOME}/distribution/extensions" "${langpacks[@]}"
+ fi
+
+ # Install icons
+ local icon_srcdir="${ED}/${MOZILLA_FIVE_HOME}/chrome/icons/default"
+
+ local icon size
+ for icon in "${icon_srcdir}"/default*.png ; do
+ size=${icon%.png}
+ size=${size##*/default}
+
+ if [[ ${size} -eq 48 ]] ; then
+ newicon "${icon}" ${PN}.png
+ fi
+
+ newicon -s ${size} "${icon}" ${PN}.png
+ done
+
+ # Install menus
+ local wrapper_wayland="${PN}-wayland.sh"
+ local wrapper_x11="${PN}-x11.sh"
+ local desktop_file="${FILESDIR}/icon/${PN}-r2.desktop"
+ local display_protocols="auto X11"
+ local icon="${PN}"
+ local name="Mozilla ${MOZ_PN^} (bin)"
+ local use_wayland="false"
+
+ if use wayland ; then
+ display_protocols+=" Wayland"
+ use_wayland="true"
+ fi
+
+ local app_name desktop_filename display_protocol exec_command
+ for display_protocol in ${display_protocols} ; do
+ app_name="${name} on ${display_protocol}"
+ desktop_filename="${PN}-${display_protocol,,}.desktop"
+
+ case ${display_protocol} in
+ Wayland)
+ exec_command="${PN}-wayland --name ${PN}-wayland"
+ newbin "${FILESDIR}/${wrapper_wayland}" ${PN}-wayland
+ ;;
+ X11)
+ if ! use wayland ; then
+ # Exit loop here because there's no choice so
+ # we don't need wrapper/.desktop file for X11.
+ continue
+ fi
+
+ exec_command="${PN}-x11 --name ${PN}-x11"
+ newbin "${FILESDIR}/${wrapper_x11}" ${PN}-x11
+ ;;
+ *)
+ app_name="${name}"
+ desktop_filename="${PN}.desktop"
+ exec_command="${PN}"
+ ;;
+ esac
+
+ cp "${desktop_file}" "${WORKDIR}/${PN}.desktop-template" || die
+
+ sed -i \
+ -e "s:@NAME@:${app_name}:" \
+ -e "s:@EXEC@:${exec_command}:" \
+ -e "s:@ICON@:${icon}:" \
+ "${WORKDIR}/${PN}.desktop-template" \
+ || die
+
+ newmenu "${WORKDIR}/${PN}.desktop-template" "${desktop_filename}"
+
+ rm "${WORKDIR}/${PN}.desktop-template" || die
+ done
+
+ # Install generic wrapper script
+ [[ -f "${ED}/usr/bin/${PN}" ]] && rm "${ED}/usr/bin/${PN}"
+ newbin "${FILESDIR}/${PN}.sh" ${PN}
+
+ # Update wrapper
+ local wrapper
+ for wrapper in \
+ "${ED}/usr/bin/${PN}" \
+ "${ED}/usr/bin/${PN}-x11" \
+ "${ED}/usr/bin/${PN}-wayland" \
+ ; do
+ [[ ! -f "${wrapper}" ]] && continue
+
+ sed -i \
+ -e "s:@PREFIX@:${EPREFIX}/usr:" \
+ -e "s:@MOZ_FIVE_HOME@:${MOZILLA_FIVE_HOME}:" \
+ -e "s:@APULSELIB_DIR@:${apulselib}:" \
+ -e "s:@DEFAULT_WAYLAND@:${use_wayland}:" \
+ "${wrapper}" \
+ || die
+ done
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+
+ if ! has_version 'gnome-base/gconf' || ! has_version 'gnome-base/orbit' \
+ || ! has_version 'net-misc/curl'; then
+ einfo
+ einfo "For using the crashreporter, you need gnome-base/gconf,"
+ einfo "gnome-base/orbit and net-misc/curl emerged."
+ einfo
+ fi
+
+ use ffmpeg || ewarn "USE=-ffmpeg : HTML5 video will not render without media-video/ffmpeg installed"
+
+ local HAS_AUDIO=0
+ if use alsa || use pulseaudio; then
+ HAS_AUDIO=1
+ fi
+
+ if [[ ${HAS_AUDIO} -eq 0 ]] ; then
+ ewarn "USE=-pulseaudio & USE=-alsa : For audio please either set USE=pulseaudio or USE=alsa!"
+ fi
+
+ local show_doh_information show_normandy_information
+
+ if [[ -z "${REPLACING_VERSIONS}" ]] ; then
+ # New install; Tell user that DoH is disabled by default
+ show_doh_information=yes
+ show_normandy_information=yes
+ else
+ local replacing_version
+ for replacing_version in ${REPLACING_VERSIONS} ; do
+ if ver_test "${replacing_version}" -lt 70 ; then
+ # Tell user only once about our DoH default
+ show_doh_information=yes
+ fi
+
+ if ver_test "${replacing_version}" -lt 74.0-r1 ; then
+ # Tell user only once about our Normandy default
+ show_normandy_information=yes
+ fi
+ done
+ fi
+
+ if [[ -n "${show_doh_information}" ]] ; then
+ elog
+ elog "Note regarding Trusted Recursive Resolver aka DNS-over-HTTPS (DoH):"
+ elog "Due to privacy concerns (encrypting DNS might be a good thing, sending all"
+ elog "DNS traffic to Cloudflare by default is not a good idea and applications"
+ elog "should respect OS configured settings), \"network.trr.mode\" was set to 5"
+ elog "(\"Off by choice\") by default."
+ elog "You can enable DNS-over-HTTPS in ${PN^}'s preferences."
+ fi
+
+ # bug 713782
+ if [[ -n "${show_normandy_information}" ]] ; then
+ elog
+ elog "Upstream operates a service named Normandy which allows Mozilla to"
+ elog "push changes for default settings or even install new add-ons remotely."
+ elog "While this can be useful to address problems like 'Armagadd-on 2.0' or"
+ elog "revert previous decisions to disable TLS 1.0/1.1, privacy and security"
+ elog "concerns prevail, which is why we have switched off the use of this"
+ elog "service by default."
+ elog
+ elog "To re-enable this service set"
+ elog
+ elog " app.normandy.enabled=true"
+ elog
+ elog "in about:config."
+ fi
+}
diff --git a/mail-client/thunderbird/Manifest b/mail-client/thunderbird/Manifest
index ed95fb6081d9..12f1df4a2865 100644
--- a/mail-client/thunderbird/Manifest
+++ b/mail-client/thunderbird/Manifest
@@ -1,5 +1,7 @@
AUX disable-auto-update.policy.json 53 BLAKE2B f8df63721191d84d8f1ceec263f63c44fd5dadeae0939baf9a4a6b1852516722b2a3d94b8d403cc7b6c6b525d5236f357ab65a72d716aab1f5bef47800b5a18c SHA512 5ed67bde39175d4d10d50ba5b12063961e725e94948eadb354c0588b30d3f97d2178b66c1af466a6e7bd208ab694227a1391c4141f88d3da1a1178454eba5308
+AUX distribution.ini 182 BLAKE2B c8329157d3b2de0f8f3cf779618273f23a6c1d5ba7a79c6013331f730c1e3a2191febd3d8475329bcc805f8f10259129934bf0a47a1e526b954548eff4c739ef SHA512 c19cbc8e9e0f823b65c1b9f4ab6d1d804b3d2b997992f54253e7aa3913e27c38c09dc0b965a5d646ddd87f56a8daf6c90aa931ca99df38054891c36c492bef47
AUX gentoo-default-prefs.js 362 BLAKE2B d3f08c4ac1ae1941e2a805175dd0621756a7aa44f2dc0daf90762a0307c56eb1777e0acd572c6e131e5494c6586c4af2154e0980d25c0f4d4ab3cf4df1747892 SHA512 924313eb0e23b3609b27e3984cc39545122fdecf69d6382d11f18e92962d7a2018a1846404329f21b5880b7baed9491c7506fec998081413fc7c2c4c6c4e6bd1
+AUX gentoo-hwaccel-prefs.js 162 BLAKE2B c5f2dfb727081e2d538c262f12c0cfdda31cbda58c77f4024d820e1d1915203d1fb8ad2671f88ff0eb2b019bbf44079a8b1114e240b74f815680e5c28eccc295 SHA512 f1847f11e7059a83f09c3c7494aadcb04512cdf2ccf6616ebe3ec02fc46de66fd35cf83d81e08013c0e594b73e4dffcb67a32288b6949ce137669715583fd0a4
AUX icon/thunderbird-r2.desktop 851 BLAKE2B 09f88c3e849ef901ff7825752c560c212e746aa6bc941b01ac76db64d0b992130550561214ebc868373a67fa99be63d6048cda392e0a6766f7fa6254615bfe21 SHA512 8d0f5e526bc974b82f4fa8e077c2c3f816af704ec2db5b5d16059085700afadfff313ea5d039c790d82e3ad54029e63d4050836523fdf2836ff89c2e30165a35
AUX thunderbird-wayland.sh 118 BLAKE2B 7ae701fd21972d3b67f94962441e37bdd04d6b71ffe40b2aa7179d8a5622fe9b837f9430f93371cc83582118682fbb95d8ed5f66b4019924cf9b023e67cb696c SHA512 41a680a7d615bbfceabb49c9753feac5efb1276ad0e709164ee16fb4a0655886da29ac60bf1fc6886e1d4c00b84b3889cb85f42f1ebbc72a52bce80817a4ead0
AUX thunderbird-x11.sh 112 BLAKE2B f62f330ead8aa425d614249f7f968078def08f851d2529005cac6f0bb9257d0ffd6bc15e200b53283106a2739674c1d0cf900f6dc4270138281bcc7666b547b1 SHA512 24490cd7c9dbd4d04124f92a5cd523fc0c48cff2d7f37cb2492bb6644a986da7ff05e62beb744fff1187f991c6f3edd68474ce6cbdd8ea34479bce2c2ded4406
@@ -70,5 +72,71 @@ DIST thunderbird-78.5.1-vi.xpi 674603 BLAKE2B 47d7902b363d3f383d18be1446b83aa67b
DIST thunderbird-78.5.1-zh-CN.xpi 687173 BLAKE2B 559fe08784381491f4711200b8024a43a3a539b234aa8f4c4a0836899774a792805c1e5f74a77c33ea3d61392d2e7a6a3521903d1d776e8fe671d2667c6f5f32 SHA512 917ddc49e8603eed925678e57d9a00da85da42676ae7b0a9e567e84f8cb8daf8014b897cc9a651ce60a683d17cd9510400647e5621261ae483fd6634cbeaea36
DIST thunderbird-78.5.1-zh-TW.xpi 687617 BLAKE2B 905f1290f151c44961c3052237b57732f1be545a60189e2fd1621b1b31d522cfc8cbb7e49fed1d8b8795d936a830c7f5dc33e0b27d8caff31309d09429397e76 SHA512 1bf9343592d4df3f5f091ae6fe63b58c2c43bec0581124db88e7c714877e364f0a97d252736dec6cf3522134a7eceb7ca00ffa00274e5690f39e6a4de1f05a8c
DIST thunderbird-78.5.1.source.tar.xz 352743032 BLAKE2B b713b157e273a01ad215bfe751d79948884b9320b59689e0ae1916dee730b54f9147f7c895ec629f06cf4b6da7bff9045bece54704c5d683d9c1deaf41298e8d SHA512 3fb50ee1b5ec4bedaca0c68a86286f5141d3e350025b9d928348c55e57e07013124ef8b0315ee6cb16c08777ba8b0fb715ddc4b5fef2481e32f2b676090a2d80
+DIST thunderbird-78.6.0-af.xpi 548345 BLAKE2B d89ee0a52cbbdfe33efb93f5ad4d89523f486b18fe62f5292dbad19b2ac7f8134d83b9c40e9424318d40de4a8d9f745f61faf0614015ce6ae1ae8b42b9fd0be0 SHA512 273c352acfce808b97bad77f0b9a3b02296ea78e086baf7b2a3c5d6c980edcdc20e2f525aa24dfffaee74a027a8bb2d34ec09f221f76a67bbcb145c6d21ed417
+DIST thunderbird-78.6.0-ar.xpi 648600 BLAKE2B 274020f982e55bb6892153e3a19b55a6bf5a845e85fdf144f114ae2be4a4607fe3f140ea67e89ea2a3b921355f550b23e5eb88723a58803c4aac08af7f7b161d SHA512 b73e36dd0a086cdcda34757a0e30dd6aa82791862d60d7c0f87bd8687d52d71da81dc1684130182be07001a777512897dcf4f95e23db344f97991ff937aae5df
+DIST thunderbird-78.6.0-ast.xpi 561260 BLAKE2B f6eff5ea45de17a5b370539ab83de54a04d6afa603e122f2afc8875e3f2b3205fbbedff7c3df99532c7ffa8985167a1b124ca586376a3a8b3f84e6023123ee92 SHA512 a7ce5cfaf4c96bdc63dc99aa1e5a31eb5e4f90a45350b3bcae2fedf2925a2372fe0058754f490e5e0a114ee5d6341fe8b632f4e3c01924da3f79738a55201117
+DIST thunderbird-78.6.0-be.xpi 666670 BLAKE2B 13402ba59c35c3d20c25cb18f8786c0a0b83088e8ee46a0b3c0fd86f0069c3848e966a9ef7c2546e0d665d01e16ee7372d1c920be902f18a0efa36d0ccacd8da SHA512 4ca4be8284f64132c99c11e4428fa7e4638b8a970eb31f61b5368a18425b7736622ff21b38907450361b943b680d50b2f0b293f6dc943cc8b665ff8af8cdbe8b
+DIST thunderbird-78.6.0-bg.xpi 672417 BLAKE2B f2fef6a49108146a3f4d0c4feb36cf199a5043a85544f4e0d8cee271f180126ad0f035f34bf4978071be3f7f7bbd15b25f9bb6addc5bc05aa7e8a22eae3c6c9e SHA512 aa18a8bf86ffdd83f292942f338e4ae6085ee50e0b573f95bf0c9fa99e257719e934e48d6347c99b39c7aa128a34cd6986154cfd8cea8e5c50a023a8b669a861
+DIST thunderbird-78.6.0-br.xpi 604528 BLAKE2B 4c1a1159eb3c2433ba2334833799cbd321b43165331cf4cd3fbc6f0e29f543aecd8755632938151220a30d69f6f9e503d22a1656d0488a1d57b36a7b982ae148 SHA512 85c9c83e535c87faeb98e2adb7b7ce41752d913e23cb7a92bcc3f5b7af412c184a3995bc0956872c9474dc45b00f6db00058f485a7ff202d478179b8b34af656
+DIST thunderbird-78.6.0-ca.xpi 620436 BLAKE2B 0124303d8e022da4a2a67df03e18d3c64559966c952a9df14a2d09de954467954cc9231904c649c09b40a4956752156b6eeafc4d904fdd9866a0e8bfb01aac6c SHA512 9d6debedb42e0d314dd4a8f14eba786ee32afb582791e2568a3a528cedef414c01a3df40bee44514ce8cb3e498a49998430b52b1cb3db3bda78989f1775b7a01
+DIST thunderbird-78.6.0-cak.xpi 635657 BLAKE2B 095934912bf56eeffdbb66c782a32ed30a3f1d940eafa086a69e385a2d913c38510eb5e3522c4df8d25e6d97e9bb4ac5bf5552ce096d7b92f14da2fe68676777 SHA512 b998c8972f193a57e0a601f0a6d51130567fd5a74d7d31fdca03cb2ae0d716196bcc36718ce936c15f92d24a2035e19479546dec618685505b4a3ba59ec00653
+DIST thunderbird-78.6.0-cs.xpi 635346 BLAKE2B 58d56bef182faa2996db3a66909e4daa113a66193b2bb1bed629e772792c2933ca7983062ab2828aed9957bb0303074d02c0729650939153deb0646eb47d71d0 SHA512 317573845d2d470a5466dd0863e2c462ad2357b3f6ce422ad74f9db53ceb6876095452bed13cf83cb46ec78c47145d2168b51c600fc17ec1bf0c8e458e15eb0a
+DIST thunderbird-78.6.0-cy.xpi 646243 BLAKE2B c02bbe1a26c4c295d04750adb393a786fda6acdfdac420c155f57ca90470ad2ff07f4bed50819bedf1739c0b14b5facd8223a68fb358b832ec683a970a058593 SHA512 836171f65ce69d61c0f2043c18db13f2fdf8e38b28982b89bb547de07930c1dd807f710efeb50b61c203c5f91648499dd58488dd6e41b050aaf78f5f1560deec
+DIST thunderbird-78.6.0-da.xpi 620993 BLAKE2B 089edb401b604309848a8c45ada0e048a76670d2ae85138b60d798afdee0597f8a3cf9d7344755a207c381cd74444f55e0c634c72b01863dbc6d547838d894b8 SHA512 e5d19b04b314dc29ba822ea6ccaa77ec54ee526838ca4b565ab74b63a8b521e7060af8d416a285b56db91631284b34941bce7e664643042440528e8165a01c65
+DIST thunderbird-78.6.0-de.xpi 665191 BLAKE2B 8236d20a297bb3f0b9ef0b9f7cd8eb49877aeb8d12b38a3de7204fbeaf544b109ab4d420c1792277dd4570d94a564ed13617287f6b3f9331404b213acca097bc SHA512 0ef3ba13a9feeb3496d295553f6908a0329f426b8b0fb1646a2f0c7638c4557765da5a39b58e4269dfe593a43909aa712024e16e0450df7c4db5a938172b855a
+DIST thunderbird-78.6.0-dsb.xpi 666771 BLAKE2B e1c15e7a2c5eca6630a5ff739c40dbc095903326ea324e8c2fd6356603737d18cc837cc511c0fcad0c322bc007b7c6d7f706f2062e8a8ceafa92ceb04fd952f6 SHA512 a831c73ead0e13ab05ae95b972055a3b329092b622c19cba1bf4fd917e85514b55d4fe1c31b1af51173f855f36b4a9bcc631bcf1081fda74d2bdde7a9584526e
+DIST thunderbird-78.6.0-el.xpi 774448 BLAKE2B 6f6044403442a9375eb42f9b6731a014aa2d008f713666a8caab5dcd6260ede83a7292ab2ca1920fa33fbe87c5e07c66b56feebbe7c8ec580db7624df45f317c SHA512 63264d5332a089e838f4a968f2c804d3e8411a68639caea65b7d6a13cb0569f5e44b2ade846032bb79f13499e9565ce231ccb55ba48ca3a2502c92e0f40adedb
+DIST thunderbird-78.6.0-en-CA.xpi 611773 BLAKE2B 1b608542c77d41edb37c583cbd74ff1932dd21e36954678161c57f6820ceba4c14408dc7d79a8d7a86bfd4d493ff45028fe520abff79719db025442de6d88b65 SHA512 0077c9b65b56e8b1c5f7dfedf2bb2d45896b4a02b5c6ace9e8e03d6499c96cf4a9ed1dc9eaa85a71357f9a1a5a60b5f8f6e21a92992ac5544c3d1992815204f0
+DIST thunderbird-78.6.0-en-GB.xpi 611183 BLAKE2B 9bc2ea427279866563e421c6ca7efb739b96a9d5aa11591b3595cb54a9293bd1876290e385f64206142d833ab3339321af6ebe30f234472cca48affbd5ee0127 SHA512 12761b4b100bd845f2f55c2b724b2bd350a0290ff821df84c4f732d5947e2cb974368ca0063f98e3e8ab264da4e2acda7499255dd82e96bf30b7e7e32b4fb1c3
+DIST thunderbird-78.6.0-es-AR.xpi 657788 BLAKE2B 2d14ebb13dbdd93d4f095d1c9a1345b68e9e6d488059e88bc3643695fa31cc46e8edd76aaeb8beb10c1fd7a1dbab313b0c693a68d46322159781e6efd199ac3c SHA512 0417c7c47a22c9e548120202d35b52fd4bf7bd6b08e4c9771cc027348bec1fa8db3cd551f41726cc61a830397738274d0483d1cbd507b90c501b53495f22f6e7
+DIST thunderbird-78.6.0-es-ES.xpi 569804 BLAKE2B 33bb8080008ef53e82cfb7f36c4ab8e21691f9fbe43c1691ffac98dfde64c707415bf8e0d8488a058c8e35813ae910dcd4e82126779ae2259dd9450c4bb87a21 SHA512 7c6cce31958b93afbbe4fcf99a62c4a73f2e37eaf51a54945d0ce2190df635eb53498d3d455e7b53fff035f9dd76b92b4478cf44594d67d293a5ca549ca43e36
+DIST thunderbird-78.6.0-et.xpi 597728 BLAKE2B d0aebfc5fe1335eed6dbe6e42015d59b4aedbf45f91f44950f125ffb8952395119f8427c83c0749b1d682fcff553e556ae41d2ea8ff011a2d3931bc78a05d285 SHA512 5381bb92715ad132cd8c68d9781c4c975a59df64000a6ea71a0113cfda54ddcacebfca8b90bd030128110c915293df26a2c34a10f9ebc2ffdf0a5b24eb39d18e
+DIST thunderbird-78.6.0-eu.xpi 632962 BLAKE2B c97291230b26dc72d0113af0f4cc8d8d4bf5be645bc784b8802852f6c58ef9e691bd73a15843b974ad9b2eb5ff48b291a35c774e3fdcfc54af492aa9f9f02e22 SHA512 3f38183f140aa30e7b947f47a9da01454722ceb69c75819c0a8831938faba084b3b2398ae5136dd3c72b8a504df78bae6948b6491b8ff8ff9f3a675b934d2a60
+DIST thunderbird-78.6.0-fa.xpi 639756 BLAKE2B e61f2625fdb7cfa1d3276b5f0a1fe13d89a7632e1437f7c32262dd0df994b41868094f57915d4b389d1277a0a7c8692203da82381a1b809178084b80e6deb391 SHA512 d8e4488007f6dcee3b499e8306086860d3d2d2e4031c0a03022402d1eac2dc7f35a77ed49d2de8ad0e1ce50450152c3f8e1a685f416c2b4aa14239b05e4b0d94
+DIST thunderbird-78.6.0-fi.xpi 642454 BLAKE2B b29324602268c3b347f8876f1c0e27de28b04c49b862bb93a614bcca40250c79f644887261468f2b110b6d71a1ad5da0d45bdf40301ea24a159bdce5da914273 SHA512 9b69c8a1ae2e04aa9282066cdde5831960d34bfee69188aa8fe0be69db799b79c3ea11f55d1c084b4d3376974c667d8dec57592937c4988617d1cf1dc81690ac
+DIST thunderbird-78.6.0-fr.xpi 669493 BLAKE2B fa3b3bfceed1852a3500b3804679d57f897a017d195f011fd79b9476f73d385f15ce3316cfc349d31c9fb03635aa5286e212343cf9b6b45be5532bd9eb698996 SHA512 bfbf57fe957bad0043b51950354cf1619a497c224ee3c84893f888d6ad72e695fc6a20a9c44c8cfe48d64f89f80304a8d814a600371708415c2671f28b9b7d50
+DIST thunderbird-78.6.0-fy-NL.xpi 653072 BLAKE2B 468c42637d99472415f5ab81d3126fcbcf2eab5e67803e16b7d0d0117fa039983e1d43d2c7ebbec0acff9d6dd20047c558d583ea2c7104b277e68989da90d9c4 SHA512 c4e4999c76af1c94cbf5009f23d500f2e5351fc38ce18c45c06dc85d6e548be411632b3c3cdd84f37a476cc391bf9000de7c0f4331bfad445b8e13aa153b2951
+DIST thunderbird-78.6.0-ga-IE.xpi 600703 BLAKE2B 7692232fdea4a106ec0c47c20f170ba0ed021438e41893159038bf9fdf5e00f7dd6e67bb53ab515c9d3bdfe540c5b65e29e2ebfd81506e48e9920b60128b32ee SHA512 d16ee32e21c3cfa354e34b74864f732b2edeb63177ab0ad19731f12ec724f4c59a684e013f0ca083edec9335039419e53b7c86cdcf01cf5bdb02896f7ac7acbe
+DIST thunderbird-78.6.0-gd.xpi 609381 BLAKE2B 7813fc3edc1080148a59eda5ceb3b2cc0fa47f734c18dde4412398169746fd037c364f7159b1ad1877cf7a2a0bc590b53df552ab2f00fdde0aac83eddf40cdee SHA512 a775f12c9a85c4be2ff7777e3cef7f921e6d70be3e1439c363007d383773b56657600eb816299035d959d97708e786319f927410dd83758c5b605c17447418c1
+DIST thunderbird-78.6.0-gl.xpi 615720 BLAKE2B 766c20db8418c07016c8acf90adfec3a64c86e6fa4f6f37b51fc92a36e4af9a588d4456177acd7ecf207e7d076f1ba4159eb00c94179a0082759d9ee1fceef4e SHA512 ea9003203e13a5beeac91b691e1fad55eadd83113a586943330e58bcfa00451acea801d374064d98e6649650545392b6bb5ff69d2cdcdf08c223dfad25058a32
+DIST thunderbird-78.6.0-he.xpi 640498 BLAKE2B 8b372d45238bf88182a53c2129e856c2c4ae59406bcb3f22740d5e8fdd941b351df58baef25e9857eeb42583fca4b99e1153bd5239f6ebdbadb9ff8d12c139d8 SHA512 586869e7648df55872fc824d13bf279cfb0ea2f133fabb235ba6230619a2ca7f0dd505cfe71b8788a2e965f3657aa98fbe5b79acd1995576d2507e56e0398c45
+DIST thunderbird-78.6.0-hr.xpi 629032 BLAKE2B 7f7410f9a10c348db7c605e485cd90ec0b88e028ff13577c10017e27c91a3f182edf2a5121febfe97ac849529b47f395aaac8b18bc0e705f28d4d5f6b5a7b27c SHA512 950c929465b15e13f06b065f967d58ab51b741cf788b58f3e54c15f7917b6dfa372213e4e685310c08e76274237f113b8edb457c29a1beb93e7643cbfd724558
+DIST thunderbird-78.6.0-hsb.xpi 668602 BLAKE2B de71c85a194402ec9e5f7e80e51cda8b25237c47354990da6ad187638d7e4a76ca49a7ef6bf84d24737669dfeda31ef26afbd57d09633a3d16d56c619a9baba3 SHA512 e2d20a2c3eae77227587b3f90621bd84a3b4c5fe289b97a03b3951c0a050a85faff3f2d4cd51f0e644ec073706e2249e304a5ccd00072ff70d37fcff902c14d0
+DIST thunderbird-78.6.0-hu.xpi 679831 BLAKE2B a5597ac70728c3d89c4af989b31dfb73e1dcdce1b6426b1eba03dacb17881d818b5f1e146ab808199e07f3f81bf6e31b0e5a89519d79ef5040cfba3a58843000 SHA512 df8a66b3907adda26bfc55eebcd463fcb2c93fd907c6c72a133a66a2848a9fca7cc1d78e25b745d750bbd5c8a47354a225891095d9d036ffd8f529eac4078b0b
+DIST thunderbird-78.6.0-hy-AM.xpi 713334 BLAKE2B d3fe1317a7bb149a60ffc85786c37b4b53a6b2ec41d4099357ee3e7d7a5d48aa477f4212a2419f94cbba117ce7e773c7f04467edd38ced72867545fa6c3aca9a SHA512 9c7a3b685d60f1ef899a0e61752740f1f15c8ff6d1f156d6b1dd1b90ea69f3c319a0fc5fbfdabad954f20b87c712bcf4a7d1010de7b8fe06618c24a4ae0dec51
+DIST thunderbird-78.6.0-id.xpi 620680 BLAKE2B e09060c821c4ec6c2fd047bf2fc01cc161fc984807d2fda7d571483029d5ab9be28b1f2950d279e8ba3aa86443e3eb7774dc15b377a048a75d0dfd8fd6541bdd SHA512 ea81176725de1a79cd6bebda2e41f01a852db5b8d3b2466919e77afe31335255a3fabd9d88bde684c5bd4fac447f106a183e217e72a15f436a92bc7f064d0acb
+DIST thunderbird-78.6.0-is.xpi 581641 BLAKE2B 0debf74e2280b2a1f0d733a6845f5d71c46f1ad0c3cb771e382247369d1d6529e410b98515019f7bbfc2ad4ddb600cb4f0922bb5f9f043d77a0c285e82c7ba94 SHA512 bb9a1144afe77eba866d03bc0eaa507e7e12fe785af4a7d0d61be2257511d48c83569fadaa7b71c71b3d74796296f34424c10ad6c6735d401542be23d97e27b9
+DIST thunderbird-78.6.0-it.xpi 572959 BLAKE2B 00f7fe1681a7e79acfbec06877732c1603263fc58ff1e8a595c672f8dc6e7368f0b028b7eecc2988dea2249a4b35db806c1b9e08e8effc67347c2f1572dc7342 SHA512 de3c634a4763a0efa48dfa921986f12dbdb5d8890628996a8b26f10e35dbff833851381a2b3846328e52d702d33eebaa0aa6859ed3c61dc19ffcededb99b1cc9
+DIST thunderbird-78.6.0-ja.xpi 722456 BLAKE2B 122ebc20541bd219124b2241e90401067a4c58a1b00e171827a95df43781b875703fd8e4b5388327b8f883da8fc87839d13c02883c284333947036da6e183a46 SHA512 70d5b3aa1efe0c6ad54c7b15599f6c63b0deaecd0f46cc20ccb16201d24a081f45f62f73907defc6d5b73d2bd3e3e8f959ddb5744d0f94b880403595802ba856
+DIST thunderbird-78.6.0-ka.xpi 717013 BLAKE2B 0733225b0cd6852aaa15f24fb99659e622f40894ad81dde4119d1e3b536038d310280f5edef41257355e6485e17e5db56a7532a20c6ba7f498b272f725a9d61b SHA512 2c4ecf76f42b2e0421a08d7825b8fed3a02f340634ea5136024dc4bd4833b93f5079ea31911db0af26472ea2fc1ba8ab0b47e5debaed8345533f1f1ef37fb7b1
+DIST thunderbird-78.6.0-kab.xpi 651911 BLAKE2B ae8db244f9b001eb84d463dfc20e032471c956164f366e9eadfa309f79879e7f52f3edc4436db2d4f0e41e76cfa8865f3debec2aa9f7eb4fad156d3c01bf551a SHA512 8ea02eb64f8852929b5a48c5616140ba24dd0d056e5371c6489fe080a8c4604108ec2b38ae6ed937304889aa58608a9815813f3bd1a1149940ce994528a1594a
+DIST thunderbird-78.6.0-kk.xpi 720467 BLAKE2B 6ebbff20d3d5182cc605f16ba98d99559f84b0e7db007e2a8bd7808eb71697b4d60d0ebeb4d2e738b41f546eb1c026d9d827579f566dfc5dae0e984cf73f729c SHA512 41e5fb9a5c03114b465ea1f7d1d7d41a9bb1a8147ce89ebf043a96ace293321c6a933b166637ff750bf3bfbb7722b39d589910d1e88680e18871f1c473b475ab
+DIST thunderbird-78.6.0-ko.xpi 688206 BLAKE2B d3d98362817d725aa1d69a1a7c0b8d84d517108b72a1bd37d8d43a647aac22032b7a3c6f1783913176fee64c501f55ed00ed6e1fabfd33e9d51963777d81fc33 SHA512 f7db483586c0d2f562316b63324a996355572177d83cc664db34048e4e613f2302f007cddb356381f93cf3526a33ee5a5b516fb9469775a99b634f5712651979
+DIST thunderbird-78.6.0-lt.xpi 660294 BLAKE2B a8fb815d4ce796391acc4f4eab4dc75c943b7b0814aa056d85d8fb687903a5bd11b7ddb839100b3a183ea027ef934f0fdf635956ca83885fee302f8270f5012a SHA512 f31729b94c20292a88deacf4e44a19fb9e3843334f87a062d1e0f482f1b7b2c81cb61c96ffc2a9e71f90823c0571c51ea5c3b6e1df83b7194cee00e93a200560
+DIST thunderbird-78.6.0-ms.xpi 572178 BLAKE2B 434711867a334f60871e013b10ef6b0cd5df01df9a254f80922db1fd4399ff367112595e6a04645274fd18b679c4536ba9f71d66108a2a1a8550458601b6fc34 SHA512 98b1db595979d635fd83013b878a91c7a54459755fa60db97f080d98328cbf967b4a4d6e12f47229d7162cfe06697b6adf87bd6a1b76bb151af0a45f2241fde1
+DIST thunderbird-78.6.0-nb-NO.xpi 637238 BLAKE2B c245f36cecd8416110390f9d654fc2b03fbb89a54e2f04cdc56771b72f88fbece43e78833c8d178ef733e1a1748e691ecca7e18858520cde82ebf310ae1570aa SHA512 5790635192abd36c6649af9024498a1830a6dcbfa4f830b54ab9940e908ad0184c696acfca3f07856f507b22793f7c401f914ad179c9d02ddfb278a4ce9e558c
+DIST thunderbird-78.6.0-nl.xpi 644358 BLAKE2B 1e6ef2483d2f7aea4645dffc6180b5bfada30e7eaeae017d25c62428e599549c9d7c7c6a1440d0456b52bf0fece5a3e3b04f015c685e37b05329e4d88a1c50fe SHA512 40cdb1860ff159c6929523278e2e08c0701333e76b15fd27689e424450363c4ee0f85088f3963fef3cc1dde891a886b31b48316eebe8c4f4c6cbeec4c35d603f
+DIST thunderbird-78.6.0-nn-NO.xpi 640689 BLAKE2B 9d7b6894ca31a9ce1d85ae57bc368b9d1c8ba7af2a98255e2e57253b6c5867e3657a5ba12b632fdc52985a4242fffe21bce69f4c085859454c3f1e6d6d58b24d SHA512 cc37e910819df0245d9b69364eec7c95bd5753fc4513188e8793c5e6e44ce7732261fe22fed4683e535dc68bfd047c4aec9d106a3e0912911bc9a522bb83335d
+DIST thunderbird-78.6.0-pa-IN.xpi 633216 BLAKE2B 689f49261d4d87262bc6b25e69dbbe97cb9d1c70124c67e0f48e8476ccb1d43875695f48276db8295296cf79fa8c9be404253a590c348c182d872bdf4e4ba7a8 SHA512 21a6c9e18e089c57541b827449b51d2591a7d4b815398faf36f727eedf17c8b97923687a6ac6947e89aebb1ecf4f10effb3aab39798a8ff3d2e99b0f2939984f
+DIST thunderbird-78.6.0-pl.xpi 637127 BLAKE2B 80440ea54e6135d51b34db18b5f1848fbdc0f0adb04aaccd8ace85c2d7521af9b3c0d33abc81b36c631db77b95663ad5dd4ac19364e8300183c6f6a82adea037 SHA512 e0a35f5a5fc44e3ad0150eb93e6e542c4676b02e16b797c04ddeed551bba191750f58dd743431350af3fe44d318483a6b823767a3a9ebc5a75483d0706a407dd
+DIST thunderbird-78.6.0-pt-BR.xpi 649417 BLAKE2B c4f22032da235c6f3828205dea272020d198ea6211d595900c9bdeacb890ac4e3e3b162f5cdc2cd163ce3be698bb8df56c7bfcba1d45709567c5e2eeae2e3494 SHA512 5223246ab5c33ecf43d6b81f1c26eebdb25d667726bb7ba5eadf7c4d8c774207543f098c049893b42965b8495f2162f00cf2abccf85ea6e7f141a9a0169eedb2
+DIST thunderbird-78.6.0-pt-PT.xpi 655498 BLAKE2B 256ce12702391fd3c9fb8de6e4f0257032d41679b2bdf9e43e7a96adf281722a714bf60004b4dfec4b210f7c7b64913114686f76d3d10af26e83573e45f09ccf SHA512 5a81abf08b6115480573e729bfb5c00bb1c8449b35b6b8ab8523e9c84c9d00e53973e4072a99a736c9d6a44afcfc4d5587df9e1b5036966d18cb5393d3523eb3
+DIST thunderbird-78.6.0-rm.xpi 646529 BLAKE2B eac9273aab4ee9fa46880e0f92d0041c1fc003523fa191918f34bc7219d6e4a5075bb815047881a07b8522a212d76a75c838ba0ced3c8af3cef5466d5aee8a40 SHA512 5b56d907789c926e92344ddbeae276e6879ac7d9171d52f235ef1a319422ba6f6b2c0d905d1e43eb28a65153ca8869fb69a3592a16a308a6fc0e3a7df981f79c
+DIST thunderbird-78.6.0-ro.xpi 662631 BLAKE2B 026ef09f7d7d489e30a28fd0f65a48a3cf0188812b3e34aa5768ade6a8638fd7e49c006ad8c7140c227e9cfd03a451c6206c0ffd55619834b6a735e5cc50f72d SHA512 4912ba964500b233b4caf08c004d69623d2fb864bdaf4ae46f0fc65c2552fb75d7da5c20815e471971457ef5a98661e3424218f78f88fa63077f542ae8bff312
+DIST thunderbird-78.6.0-ru.xpi 756183 BLAKE2B 8051edc385f5c9bc6263fdbafeb777a1c168a4f54f577867d965f5aa91e2b454b8734a64e4a2aeff91447676461d15c815c9a73b10213d60843c8da8e086a413 SHA512 d3f60e3b8efc6dc4fc1fc390dc3afa29f74e71df0efc553e2011f2bef341cce0522c861ac3f131ed4adf9f172d8390597de0aa094670e0a1e34e36afddcc0ad9
+DIST thunderbird-78.6.0-si.xpi 651097 BLAKE2B 70b48d07ddabec8fbf9257f8d3eca281ad35b262abb189445990b628efbb59af527135e873e96c5072c71b7b18325ed656b7873f98121660922b3e19c24ac2d7 SHA512 4c5769c720616276f900f21afbd580ad2bc97f86522eff3b75a09f69f2146f9510742c2d83f4080e7a23b97caafd0d30a40e6a6bebd819d1d67a1412831f6e4a
+DIST thunderbird-78.6.0-sk.xpi 643224 BLAKE2B efebcbcc0fdb45cb68a392837a893b8c6efac3ffa578024698834b3c4b6a1991ded082368d780832719c6d64cc049a4d989614d6d0cfe8b3f9450d1f9d763616 SHA512 2b3c748650b642e7790b854f897cae928197914feb95cab8003c0b33a3dbea050bc60fbdffc32327c458e052a8db8f7e670c4caed8fe5895b2033851215d9484
+DIST thunderbird-78.6.0-sl.xpi 632386 BLAKE2B 703614849ff79d90dcbdada61cd90f493e5bb1747465c4e037a5e5c668e5e0129d03a19fe9e5161c83ec64e9f5f23a134a1b8d7cfb7d3bfd40bb6ab4dec140b9 SHA512 73a5584dd6b27905c64ad3f4a20f089ced5f7987865b316145d8d7160e863381eafeed10918ca18bb58dbce4d9d302c72b511996aea9ec789d90e1e0e5137683
+DIST thunderbird-78.6.0-sq.xpi 657824 BLAKE2B 37c210e46f0865db3feb8fc05e0baf0fbbe5d0c7e2e40248b915cbca82e6f96f3ff1cd968a0979571fcb036fa06e155ce7e118c6ceea962bce28dc9b18201dc3 SHA512 d90f97a383602752adecdbff4c76e50cb5c5ce31589d2d1165bea6c5fe30d80382fc9294f7c7d1df6c33327f99ec87e7ab797645e5ea4ebd89acfeb2bc0a8e7a
+DIST thunderbird-78.6.0-sr.xpi 683113 BLAKE2B f3dbfd42ccb3d7476af6861e1e8650507240b179ee4d6b356797e95436fe43875c8e239facbcf75884a3c1cccdc2224d1da46cf142b571f6e6d24a49d5bd2c7c SHA512 7a3201573cba6949ccba92a5d6801e61775e8dc2e1dd1f5e5f64806559081c84364f974e93de032845fba12e469add4ed731975bc0490dbed03d928b65ae8783
+DIST thunderbird-78.6.0-sv-SE.xpi 648865 BLAKE2B 2682a73db0092415272cf1b99409f282b7b39538f018d697483b6b4a13b81182916f76f1fcfb608dd91e50a239e11e0d973333b5972f3d926322372118940043 SHA512 9509af73ae1efd8f7aeea319c736d962d81c0ab4708b4be5c5637d73c7fa804cd3a30b507f3d18c365f8ca1cee78ebe9a1797cbe4db7c91bd220fd82ef4a5be6
+DIST thunderbird-78.6.0-th.xpi 712032 BLAKE2B 0945fefe03f853e36e2d48b0991b0fc48e2c5a63c18405844ae0c225d302925a81ac3eb30221aeb16e68902aaa099669f961002f917663271c0c8de39c5402e2 SHA512 8e26902e33bb940ceb7e23ddbecd3991caf08ce3e9aa9049a02fdeff377d741ca69aff8e412c0f87329f67d92e7fb77f6a652fd05e3ae5422972776394f4bab8
+DIST thunderbird-78.6.0-tr.xpi 649077 BLAKE2B 0cb4d4ca9cc747f9d430873f4801d0c019701f07fcdf6846263437fc9c072251f0d957eed792fd51df02b80493742d22b24bfa3da2bed358fc7023fd23d4a99b SHA512 a98868cf4efd6fcbd0d52278b7d5a35ea0db4b0d8fcb4b0bc449fa73771f1f80d5b542521450f755c09cd509b0a806716b527ff5b36ff6c87ca1aa8dde654951
+DIST thunderbird-78.6.0-uz.xpi 586592 BLAKE2B 00ade31247f6aebdbb7c3d1dbe4913646ea752041cdd83e6c67779c764ce2f2530e9dc38125d92d9930cf5b5f4615a67b8ec1261e887412f00fdb54f502e553f SHA512 a5d20d2910e70535da06ce1a52d28190934834b609af2c689f6695e2c4b4e0fb20f438ebd4d8ddb4ef7f327acc845144ffbad4965840e72d069662a345d980fb
+DIST thunderbird-78.6.0-vi.xpi 674599 BLAKE2B dcc41dcfcb211f9362b92dde02fffecc83c53e279e97e6620247e617a9da03d641301ddfcb244f6977e932cd3a5e97528fb6d66c098e41394b9b8e2600cb9f52 SHA512 a73b25e4fcb1d110ae79fc14e000bc4f2fcf0870d521f4d2c98bb8774c889ba308aedc5a200f4b344aa12bca954d829abc4bfb4fabf1d14d15af2fb9e0a77eec
+DIST thunderbird-78.6.0-zh-CN.xpi 687180 BLAKE2B 4b662680445032e207b21136af182358b4d353d487baa42022f42b4ce0a9d413fcf7ddfd7b5a0ec6418c38d6979eb8adfbe5c435632873642f9f25a8614b9c90 SHA512 4655c5b71b75a483779b1ee974961f2f11f70d4f3ff60e0d7422681a6fc14ef7b44c7e1ac409c319081b88bdf4a76fa6dc3ca51fe19a0ec87b0df8716674439d
+DIST thunderbird-78.6.0-zh-TW.xpi 687618 BLAKE2B 56a70374a090c6e8118d513dc3f55e7b8b4dc51853cf8a243f369de3f5449a311d9da6b789d4ea326b36db4f386a0926964a3d3d8f64656a2a037dc3e8b45221 SHA512 26ae0da18bd99aa0bbb32fcc5a8e5cb2e22cf60bdef93be2805174c85a1372f59b3099fed24ee5d88c754ada0293fcac8d3ad2d029a622240d583ddfaca87da2
+DIST thunderbird-78.6.0.source.tar.xz 353496712 BLAKE2B 71cba995bc99181c7bee5ad99c3441301f12b79d4db3491d79df3c89f06927ab62261a12cbaae0031bce880f817eee9d35b3e2a66acfd3c070b902f6db1c25e6 SHA512 36194e8bf58117d8accbd6d8dc52a6241d8c572c023db1b271db3b73098652a608da28134865099792fbeb0a2f0d3705d98093447b64fa19eab7efb3e3bdd421
EBUILD thunderbird-78.5.1.ebuild 28783 BLAKE2B abd73da2381058667a9cfed20f581b8c7425afa4dbabc16df686e58131c258caab7e793b0231c06fc412cc231d0a6cc7e3a3663c2f4b955ae31f6989a506fc67 SHA512 c80cbef3b70a4fd9695a5db66ec47d99d7fa78c29914da908d4a5b0ff77b58dc66605347cd1c0d71e19e1bcf45f78a8d138a973545660d91156d5b44165faac6
-MISC metadata.xml 1646 BLAKE2B c8c3a757f3fd2da52a41466c40abb57e2ef493439ee51648730d92935ee98fff2c87e486537ebb0f03ba50461b05e123e3f5b0939aabf0e47f2a23a68b1838c5 SHA512 33520a230924981a68191e8373cac6e211851ed878111b778748e90639f4f4570a038ea9ad0e1d91aedf65dd89c9b472bdc6b08464b3ce1f5687f28ba83a0eb3
+EBUILD thunderbird-78.6.0.ebuild 29082 BLAKE2B fae9aa480b6ca1dc28747d4dd5551a960f51b623586c9680cb648279e0746a15aa8eedea6bcb66f19e02e1ef0f4de34729343905b378f24f338a136ba70f3406 SHA512 2380b3d98542e18505e3f7d564b2404f5735893ec3ff64ae0b934a2c792f078f46036fb8bdbc3ca9a76e79612efb57415cae6cbc1b8e3b8fdc4509cc446b7825
+MISC metadata.xml 1740 BLAKE2B d51bd6ad55bd5a54ba77e732906443e19c639bc2f081abe48ef756514fb7bcf45946ae7898b30fb2b73cb654886cac98d107a0244707301c4b800fc2f7597f49 SHA512 d5980ffb710daf47bfdd6d46b0b74a198c2614fddf363438c75828516bb742720ac767887ee67ed7bd1e7c5c76daa0588778b5bc0dbf675ca04d7e1d19685c1e
diff --git a/mail-client/thunderbird/files/distribution.ini b/mail-client/thunderbird/files/distribution.ini
new file mode 100644
index 000000000000..ab0d14912f4c
--- /dev/null
+++ b/mail-client/thunderbird/files/distribution.ini
@@ -0,0 +1,9 @@
+[Global]
+id=gentoo
+version=1.0
+about=Mozilla Thunderbird for Gentoo
+about.de=Mozilla Thunderbird für Gentoo
+
+[Preferences]
+app.distributor="gentoo"
+app.distributor.channel="gentoo"
diff --git a/mail-client/thunderbird/files/gentoo-hwaccel-prefs.js b/mail-client/thunderbird/files/gentoo-hwaccel-prefs.js
new file mode 100644
index 000000000000..a00144a7ad13
--- /dev/null
+++ b/mail-client/thunderbird/files/gentoo-hwaccel-prefs.js
@@ -0,0 +1,3 @@
+/* Force hardware accelerated rendering due to USE=hwaccel */
+pref("layers.acceleration.force-enabled", true);
+pref("webgl.force-enabled", true);
diff --git a/mail-client/thunderbird/metadata.xml b/mail-client/thunderbird/metadata.xml
index ae7a481e18f0..bc4d1af369a4 100644
--- a/mail-client/thunderbird/metadata.xml
+++ b/mail-client/thunderbird/metadata.xml
@@ -8,6 +8,7 @@