diff --git a/Manifest b/Manifest
index 1cd850989d51..fc3e422fdaa3 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512
-MANIFEST Manifest.files.gz 29288 BLAKE2B e515292bc85e74af891019cfd99899aeb82d34bb95ed30f883710097aa42a54d82d5634793013ea58d18138cfc3e1ca93a604a0f509ad0c0a9b422e5bbc27a15 SHA512 104b4c794cc25e9dcc5546836b9140b0ace6d94ea3c6a92d4f1b55cd387e4948b4730cf76dd45ad3d6f85143661f22f727afff8bc6b400d5669330e0cbb0218f
-TIMESTAMP 2021-01-17T19:08:31Z
+MANIFEST Manifest.files.gz 29337 BLAKE2B e697e9e6f6813a35af005e415e93642d088c3ff8691d7da0b0138e65b04adcd33b04afb6667896930bca06d8dce331aa91c5ad0fd61a5001bb0f3b179523fda2 SHA512 d5ec182df08777cc40730b99734bdc9681214f4eed016a9222151c8a43219702fd6d26a016a8742ffcab7e9f06ed9a68b55a7a640f7c070dcc2540de8db9f0eb
+TIMESTAMP 2021-01-19T18:38:32Z
-----BEGIN PGP SIGNATURE-----
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmAEiy9fFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmAHJyhfFIAAAAAALgAo
aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klDJYRAAtqtPHk14sUQySnUyXNCgWjbAhS+qYU/k54t8qqOZSLBSbni2id7Notfo
-8QcG7czcbUX4yr58/FGwY4vtTBfhK6LmCZQ6xtCo43jCLImJUv42oVYgWhwDSssB
-A3Ba1b4/hAn5bpo8NKd5TLX0x44LBioafDpo9cEbfglkhOn9L0qwhL/QeZTN1Sfz
-qIr7I/oU/1iWLR4DIZKwGDPsKkQm9a0ScVSxzB0PeRo/cDtY4ak0/t7M5x8rENvt
-F0tb5e18Urpsuy8OCUlqO9XTs331ZQOO3LLcYSHLq4kYI1UGVeP1B9bBamMGVsKD
-GFS2dtQ0VUCKr+nklxgnH/W8MQjEr75zYYiOGy80KuRcFk60JB3X1vGSXdSpfUHB
-0FxYPLj/bMQxI4DRZgLlmee3JqIlcLRmKaaw2vwwyRaB2LAxvfH1XRdsdn0+yC+v
-Mal8a7dHzyGyIpoMJMgFSnG+jiLB0gqVNI9gJqanD80vlZKrNLoTUab0d1CZyV02
-t0bXn4R0qzFnaWvD8KH5GKbLaJQoL/9X/iieoPmxofoLv4W3g8mW5UkgN6wov52T
-QHjNCd/eKmnAOohxiBADrbeQiM2Bun0RKxIeb5G6prJgT29GAI7VCKh9blN7ZzbV
-SSoXiZ/iHcR+4BYD0MGFXvRcOEpPcktoWOnF2gHDtn23jYI6zUU=
-=p01w
+klA9Dw//Z/OG8uV22URiYQOqwnl3L+Ev8ycTWQWY3sxET4GYzqCnzDXz4o2pD+ij
+RDDB1bUgQd9LwJN8nf03wkCREg0p80adNUUPLveNVglh1wx+zXl8E+dP2CjGE8kn
+AH5KB/YwYyO/tgzW68ANatm8H6VbMN1Zri1dDv9fYxpBuiuwPo7bf1Nm4aaDvQRG
+L9Sb8gc5hHCsJuUq/naHknhcbLwfYn4k9CymLxE2rixSQjNrDmUBAgGtojeY8KJ1
+ZwjEDrsqO8Tv42N5Xu/upQXE93Gw+rD2tvT+/EhGSBU0H1jUZivGk/vHwT5Z5vB4
+3tq5G7YhUjnSz/8uZky5hD0T6v8DSXGfjbu5ROE8x2ZOzwo6rnr7kugvqxNhin9C
+XOfKkqm7eAdhUu3koxSCiXrqfYSjhOKniN0oWffO8QhOW4YD2fF31IZuG+noi9kb
+YkZgTzkxQcpB2j4ildcDaZzrWfGwav+DAIXnU5d29g9Et+19ZwzhF18m9Jr7UeL+
+/KEFuJR6Ylxs+fjTPkfJE8WBBNfzZOkuzWyhazc7kxAmOnJd/FDpcRWVUPK8vR1V
+GaWZQtQT1Cf1BFZJihEKNOLfrjo2LRLkb0nEriRwH82saNnwfDY/hWGbRoqG1W5G
+771pa95end3alc8hNuTFgTCCXzNmbh84cNpt95goz8lXKNVl7oE=
+=8f0V
-----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index 547e27beb94d..bf1bc723355e 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 37f1f9fdfb96..52966ce14f6f 100644
Binary files a/acct-group/Manifest.gz and b/acct-group/Manifest.gz differ
diff --git a/acct-group/boinc/Manifest b/acct-group/boinc/Manifest
new file mode 100644
index 000000000000..bf011334ced7
--- /dev/null
+++ b/acct-group/boinc/Manifest
@@ -0,0 +1,2 @@
+EBUILD boinc-0.ebuild 185 BLAKE2B 5460f7bc31d15beba86f16443aeb364fd40b207285fad0f1534878d83eded1a060aef502ebe04b830c49d2908efe6ec47840864a151cadf819a67624aab88976 SHA512 0ea549e2b4dc5ad23aecd49359e78cf294d36c3d1d4ca9099bd7c919caf991b1591699a0411e3b828c850a6263aa48a3ec6f9e6f73d744286ef6cf07dc812052
+MISC metadata.xml 479 BLAKE2B 50a600d88a0206f4c34f3f1dfc69536240de71b92a0e899059b53e3ccf8e9bdf0dbe3293a88ffc6a8fbfc0882648167cfc92ea6f017d438894a5b34b76217a94 SHA512 c7c487eaf4b5f8f5810787be1669c6c9b4c41d4ab5643a8e2307856b094eb2d1fe645b88d51fc8c0583582e0682df0795792be4c7bce480a2fca85d3a52907c0
diff --git a/acct-group/boinc/boinc-0.ebuild b/acct-group/boinc/boinc-0.ebuild
new file mode 100644
index 000000000000..dc46c8eba7b2
--- /dev/null
+++ b/acct-group/boinc/boinc-0.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for sci-misc/boinc"
+ACCT_GROUP_ID=352
diff --git a/dev-libs/ustr/metadata.xml b/acct-group/boinc/metadata.xml
similarity index 76%
rename from dev-libs/ustr/metadata.xml
rename to acct-group/boinc/metadata.xml
index 97b72ca3a65d..912fdc058f94 100644
--- a/dev-libs/ustr/metadata.xml
+++ b/acct-group/boinc/metadata.xml
@@ -1,6 +1,10 @@
+
+ sci@gentoo.org
+ Gentoo Science Project
+
sven.eden@prydeworx.com
Sven Eden
@@ -9,7 +13,4 @@
proxy-maint@gentoo.org
Proxy Maintainers
-
diff --git a/acct-group/colord/Manifest b/acct-group/colord/Manifest
new file mode 100644
index 000000000000..382cca37bb42
--- /dev/null
+++ b/acct-group/colord/Manifest
@@ -0,0 +1,2 @@
+EBUILD colord-0.ebuild 151 BLAKE2B ca20121e9e263fa0d3462cee443bb37189d59333a400c9c4ce12c31b589337ca0556effb0ac8505710f3c3b406d2a6240085eab46591a739a9b6820d951d577e SHA512 e155830328da665607b939f8d76d7e420b2d3aada13015af3493b4dfdd72521fbcf42552f0c89162e6a1f35fbc7910684fa89c173b08657443b032330056db65
+MISC metadata.xml 253 BLAKE2B 572e1663a3e6032823a1d18c4ef4e0aa783bcd0e341a8d55caf718b5c6390b79211f386ed1d0b8b155f896b5074f27c170bfd531984df56e29bbd895076786dd SHA512 01cb856c66dce5d1d4e83d1b224c74c70919c2737ca5af3c475634b2705d906c78fa3802600427be58bf8361b34a3308b02304c90c84b5b7e93a4adcc8980806
diff --git a/acct-group/colord/colord-0.ebuild b/acct-group/colord/colord-0.ebuild
new file mode 100644
index 000000000000..da6555c53bfa
--- /dev/null
+++ b/acct-group/colord/colord-0.ebuild
@@ -0,0 +1,8 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=350
diff --git a/acct-group/colord/metadata.xml b/acct-group/colord/metadata.xml
new file mode 100644
index 000000000000..b79c2cda0f30
--- /dev/null
+++ b/acct-group/colord/metadata.xml
@@ -0,0 +1,8 @@
+
+
+
+
+ gnome@gentoo.org
+ Gentoo GNOME Desktop
+
+
diff --git a/acct-group/gdm/Manifest b/acct-group/gdm/Manifest
new file mode 100644
index 000000000000..8d89f3759799
--- /dev/null
+++ b/acct-group/gdm/Manifest
@@ -0,0 +1,2 @@
+EBUILD gdm-0.ebuild 150 BLAKE2B 90ded007a25830e843d6e83df8e63fefd6a438fbbb1d8fc2edf3138bc2f846bb7fa6feb1e1858a5d1cfdfe4ca7eeefeb98949766639020b65b58cc5925656719 SHA512 f55d4a6632f23a9b1d7df9630ccada87dec5545ef805905ce14309b2f7ee398d43162df53e52db44021eac81138fc9181fd424a988c9f013f2d3142b45b7d54d
+MISC metadata.xml 253 BLAKE2B 572e1663a3e6032823a1d18c4ef4e0aa783bcd0e341a8d55caf718b5c6390b79211f386ed1d0b8b155f896b5074f27c170bfd531984df56e29bbd895076786dd SHA512 01cb856c66dce5d1d4e83d1b224c74c70919c2737ca5af3c475634b2705d906c78fa3802600427be58bf8361b34a3308b02304c90c84b5b7e93a4adcc8980806
diff --git a/acct-group/gdm/gdm-0.ebuild b/acct-group/gdm/gdm-0.ebuild
new file mode 100644
index 000000000000..2d82aac6f39d
--- /dev/null
+++ b/acct-group/gdm/gdm-0.ebuild
@@ -0,0 +1,8 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=32
diff --git a/acct-group/gdm/metadata.xml b/acct-group/gdm/metadata.xml
new file mode 100644
index 000000000000..b79c2cda0f30
--- /dev/null
+++ b/acct-group/gdm/metadata.xml
@@ -0,0 +1,8 @@
+
+
+
+
+ gnome@gentoo.org
+ Gentoo GNOME Desktop
+
+
diff --git a/acct-user/Manifest.gz b/acct-user/Manifest.gz
index b5d92de00455..045fdaa99e7f 100644
Binary files a/acct-user/Manifest.gz and b/acct-user/Manifest.gz differ
diff --git a/acct-user/boinc/Manifest b/acct-user/boinc/Manifest
new file mode 100644
index 000000000000..59c5a4c8c3b3
--- /dev/null
+++ b/acct-user/boinc/Manifest
@@ -0,0 +1,2 @@
+EBUILD boinc-0.ebuild 291 BLAKE2B 982e184dd3be58e2fc5045e05e574223e23e5445a938c32d1329d38234124b098f0cbcfc6279aececf56c9fc4f65711f3535f2f212f24a48ef6e7fa6e9f9faab SHA512 cc736e27a523776653d1e3080ad500c796be422becb242fd6a66ddac494b855b0135cffe07f78310e2db5e21cf18c8181ebc2dff8df610d3ac8aef938891a305
+MISC metadata.xml 479 BLAKE2B 50a600d88a0206f4c34f3f1dfc69536240de71b92a0e899059b53e3ccf8e9bdf0dbe3293a88ffc6a8fbfc0882648167cfc92ea6f017d438894a5b34b76217a94 SHA512 c7c487eaf4b5f8f5810787be1669c6c9b4c41d4ab5643a8e2307856b094eb2d1fe645b88d51fc8c0583582e0682df0795792be4c7bce480a2fca85d3a52907c0
diff --git a/acct-user/boinc/boinc-0.ebuild b/acct-user/boinc/boinc-0.ebuild
new file mode 100644
index 000000000000..c96379bc4fbf
--- /dev/null
+++ b/acct-user/boinc/boinc-0.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for sci-misc/boinc"
+ACCT_USER_ID=352
+ACCT_USER_HOME=/var/lib/${PN}
+ACCT_USER_HOME_PERMS=0750
+ACCT_USER_GROUPS=( boinc video )
+
+acct-user_add_deps
diff --git a/acct-user/boinc/metadata.xml b/acct-user/boinc/metadata.xml
new file mode 100644
index 000000000000..912fdc058f94
--- /dev/null
+++ b/acct-user/boinc/metadata.xml
@@ -0,0 +1,16 @@
+
+
+
+
+ sci@gentoo.org
+ Gentoo Science Project
+
+
+ sven.eden@prydeworx.com
+ Sven Eden
+
+
+ proxy-maint@gentoo.org
+ Proxy Maintainers
+
+
diff --git a/acct-user/colord/Manifest b/acct-user/colord/Manifest
new file mode 100644
index 000000000000..1a5eb50f2393
--- /dev/null
+++ b/acct-user/colord/Manifest
@@ -0,0 +1,2 @@
+EBUILD colord-0.ebuild 278 BLAKE2B 88b28dabb9fc7cfe116154e3a44ab4a19dcb59f1ff7b7d483dc2e30d27773ee10c3a82053dc7ade2b9bcf5d59f6fce418696541974e6fbaa7de3c0cab8c16348 SHA512 17ab09869356fa1aae526e25e7eb7524ee4fda867ea61d349ebea6f8f70b99abd56fa2b8bcc9bd2016b5269c6eae056043a71035c5f78e51c5585f4a72d0a981
+MISC metadata.xml 253 BLAKE2B 572e1663a3e6032823a1d18c4ef4e0aa783bcd0e341a8d55caf718b5c6390b79211f386ed1d0b8b155f896b5074f27c170bfd531984df56e29bbd895076786dd SHA512 01cb856c66dce5d1d4e83d1b224c74c70919c2737ca5af3c475634b2705d906c78fa3802600427be58bf8361b34a3308b02304c90c84b5b7e93a4adcc8980806
diff --git a/acct-user/colord/colord-0.ebuild b/acct-user/colord/colord-0.ebuild
new file mode 100644
index 000000000000..e5387b5b0f7a
--- /dev/null
+++ b/acct-user/colord/colord-0.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for running the colord service"
+ACCT_USER_ID=350
+ACCT_USER_GROUPS=( colord )
+ACCT_USER_HOME=/var/lib/colord
+
+acct-user_add_deps
diff --git a/acct-user/colord/metadata.xml b/acct-user/colord/metadata.xml
new file mode 100644
index 000000000000..b79c2cda0f30
--- /dev/null
+++ b/acct-user/colord/metadata.xml
@@ -0,0 +1,8 @@
+
+
+
+
+ gnome@gentoo.org
+ Gentoo GNOME Desktop
+
+
diff --git a/acct-user/gdm/Manifest b/acct-user/gdm/Manifest
new file mode 100644
index 000000000000..579f2d6eea56
--- /dev/null
+++ b/acct-user/gdm/Manifest
@@ -0,0 +1,2 @@
+EBUILD gdm-0.ebuild 262 BLAKE2B df60f339d858c37f7356d3ab6d3facb4616b0cca3ca418cee6a6cc4871ce0f3eda10cf309551d0a7c0a4ae8472c1e131c540da95401c7f99c6bb0e14876adc58 SHA512 44ec68d59ca508c849859f85a644dc2bc6e72a1e15c6a36f501ec4c10e2f9f3f47bc71b1eebdf35ad2bb36e436939218bf1f768dc3bcbb3ca4a59bf8d52411e5
+MISC metadata.xml 253 BLAKE2B 572e1663a3e6032823a1d18c4ef4e0aa783bcd0e341a8d55caf718b5c6390b79211f386ed1d0b8b155f896b5074f27c170bfd531984df56e29bbd895076786dd SHA512 01cb856c66dce5d1d4e83d1b224c74c70919c2737ca5af3c475634b2705d906c78fa3802600427be58bf8361b34a3308b02304c90c84b5b7e93a4adcc8980806
diff --git a/acct-user/gdm/gdm-0.ebuild b/acct-user/gdm/gdm-0.ebuild
new file mode 100644
index 000000000000..dcbdc40a98e1
--- /dev/null
+++ b/acct-user/gdm/gdm-0.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for running GDM"
+ACCT_USER_ID=32
+ACCT_USER_GROUPS=( gdm video )
+ACCT_USER_HOME=/var/lib/gdm
+
+acct-user_add_deps
diff --git a/acct-user/gdm/metadata.xml b/acct-user/gdm/metadata.xml
new file mode 100644
index 000000000000..b79c2cda0f30
--- /dev/null
+++ b/acct-user/gdm/metadata.xml
@@ -0,0 +1,8 @@
+
+
+
+
+ gnome@gentoo.org
+ Gentoo GNOME Desktop
+
+
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 5bc77ed1649a..0f6349ed0f32 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 e38dfbf19f73..8809eaebb6ee 100644
--- a/app-admin/ansible-base/Manifest
+++ b/app-admin/ansible-base/Manifest
@@ -1,3 +1,5 @@
DIST ansible-base-2.10.4.tar.gz 5708083 BLAKE2B dcae17dd84dd1985703bf55bffd4a7907ecf072fcc52c76633fd2fc1d3461901b284002f69ce542ab8447f7aa6a2f65ff4c9abca1a7c1c8df3ad69a4179b1c33 SHA512 50dcccc0b40f47590d3ea56907f987bddbb858952b0d6a999db0b706232a571037dc31e66a773370be57ca14d11a7091c53a480d7f3cecf4a5e7f91895661100
+DIST ansible-base-2.10.5.tar.gz 5714628 BLAKE2B 28860023f652866b82fff6441cb5ec928de8a19f04c0d354107882854ada3d3637573e3a933d39aa64b5d3f743dec2adf759aa4fd2e9c051a0f4096a8807c338 SHA512 2449a36bdea7242a3f4e248e42388339299340cd6c377d6a20b02803db527895912e49040f3931a1aa2ebf04e3d4d5594cfc08aec28da44b73c8206dc81ddb89
EBUILD ansible-base-2.10.4.ebuild 1678 BLAKE2B 97b1821b3d5adadfccf88e01ebfac3edef631af01156a714d4f8b3b6bb178c98998415ab2742df8bd6152ae9c1871e88ff1362ca0a348023bbffa84455430e73 SHA512 68af5a51524cc631020a9016cfe42036e27149a9e5bdbd826f6dd7350d725b720bb47e19b9351e51c1b8e94038996a6eb96dcba8c69760772bc78cc9210fccd6
+EBUILD ansible-base-2.10.5.ebuild 1681 BLAKE2B cedbf07a852abb5f1a32d74a1799db9a5363c7ee0dceff37372ead52e1a7f288caf33c0190e636982f47947bc374b2b1d1f1abf024758d374b2bf332ef8a6a1b SHA512 7bd628861d1571dee9e77eb35437d2adbc5defcff720b31f619d89bd8dcd4eae7fa3ba68eefb2d265f093cc863a34ae43a3a79951a6aa0e8105bdedba51047ba
MISC metadata.xml 1151 BLAKE2B c70e650fe88afd0fb5d5478d0c7624709e119344bfa5866655c2b5b7c8ebde7e4eea61580315b51a762f3b9978681defacea600bc6f4db846080012fe69b78ea SHA512 376ca169d8881ca84918ace897a542ef200979cc48b226b5de29e06f9b7b22790968689fab59cdc5b64aff0715907900451e0a33cf04f88ecb46ca03d1b7213b
diff --git a/app-admin/ansible-base/ansible-base-2.10.5.ebuild b/app-admin/ansible-base/ansible-base-2.10.5.ebuild
new file mode 100644
index 000000000000..21cb2476a6d0
--- /dev/null
+++ b/app-admin/ansible-base/ansible-base-2.10.5.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2021 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 c5592fe7032b..989398bd2fa6 100644
--- a/app-admin/ansible/Manifest
+++ b/app-admin/ansible/Manifest
@@ -1,5 +1,7 @@
AUX ansible-2.10.0-CVE-2020-25635-6.patch 2961 BLAKE2B bd023424bb075a743881056d6e0c0c194ae56cde0ed3b9aad2ef5a2f75d6a63994a0455a896e6e9f16cacd0f1c3438eb45cd2352d4f4b53810f19728b5a7de5e SHA512 36bb9321e9524d04f06d7156ad6f7f72ce4bd75332437a33ff49c226e12e8e4f8cd82976ccb0c02076ee95de762988d6783a2ed00453b1b8893fe8127847bc30
DIST ansible-2.10.4.tar.gz 28622006 BLAKE2B 94551986f5e8ef54dd4f806a264f8373b19564f74b32bfc6d852d49b7b9ff1030ad3c2fdda2f16bc78c0dae5e07cc750a3992bca23fd9bff0f2466716ac32374 SHA512 da9517ad1f478eb8ccab3bad15f3f6ca4d6151798b5aab6db261c4b19a0ac023db1e294745a06748788820ece8980bf1c2c6274314fa0a2943b76c0658383b72
+DIST ansible-2.10.5.tar.gz 29123326 BLAKE2B a63ba7d26d2bf49f8367c48962ad77461994601b073986342ce090f7ec16a2c4d23e9176f9463adb558996ad33a5b6e27bf829983e648f2b9b3d9992b7678f01 SHA512 9eca87e0a98e2641112ac3c4fff07d624afa3db9655ba88d3ac5faa76464f7e89f6a64fe0613582c6e5528c2c0408fe1ee237f4c69353bdfcd73b264444fe3dc
EBUILD ansible-2.10.4.ebuild 1515 BLAKE2B c144c9099dcc347fd5eec6945222d1c4b80f357e0d5c6645dc8a45f1812adc75d8b33bd1d7aaf3c233d718f15152242834115ce78376f2e5b7f40819db9046c2 SHA512 5a65db7ac0770ae19d32f9c19a391d6a2b17ea64d21d182b6fc6fcd1cd274bce31f1e623a1b56a1711f42c63d1e7519fa28292a56086fbb02a858cb2cf0b18e2
+EBUILD ansible-2.10.5.ebuild 1518 BLAKE2B 26ca3c2e12c6c7cec26f87d488e42d19105219c68c5043fcf029b3e8a56f07dbae477fd833b44db16cb3fc7521edd9800b6887032cfad760167459e827c7bc98 SHA512 e2dcfca4af8878fe7cd03002be684a55b9939db2ac815bc7666ecf1a3323a4594c1cfaf4a8ab87fc82a3080234a5a72c0ec021548f311f623193e4956b00e56c
EBUILD ansible-9999.ebuild 1520 BLAKE2B e7358a5fb39611b0aca5c62cc18c9e40a992844d3a94d8f2677ce1a05cd80d4ec730a4c701566d65a4d4bb993630bab13db24e84748cedab7ac13e826ef74012 SHA512 f349dc7ab23e08540a103ff4724b81f50d54c8f99ea6e9c1a28555e752fb0ebd8bce7aec11791da718349dc7f1b96fd16f9d7448616d3571c8025d6b5f8478c2
MISC metadata.xml 837 BLAKE2B ace15c05a5ac41dcf4889ed6cbf1b920793af9b67d415b0e51ddb1da179efc1ccf6efb821bc1ea6031283b7896cc5fde309fdff6a7d30b5f4902fec471b901a4 SHA512 dc6e6af5b2c5e14afca5719a4fcb920edff8386c89145895784c8b4ed95942b2313035eb4b7d5c595871b316b21a3119d5f584d9851a643a18f6e6fae3c26506
diff --git a/app-admin/ansible/ansible-2.10.5.ebuild b/app-admin/ansible/ansible-2.10.5.ebuild
new file mode 100644
index 000000000000..3d022874c45f
--- /dev/null
+++ b/app-admin/ansible/ansible-2.10.5.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2021 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="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
+ 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_test() {
+ nosetests -d -w test/units -v --with-coverage --cover-package=ansible --cover-branches || die
+}
diff --git a/app-admin/monit/Manifest b/app-admin/monit/Manifest
index cd5b470d79de..d88eb9406ab0 100644
--- a/app-admin/monit/Manifest
+++ b/app-admin/monit/Manifest
@@ -2,13 +2,9 @@ AUX monit-fix-unmonitor.patch 1231 BLAKE2B 691cc01a06817be42a90706e967577aadb659
AUX monit.initd-5.0-r1 798 BLAKE2B 3596494122e9746157e86379f204e54d5ad7c0eb378323f3cd2ef7019e9f7a7fba0d8567afe71da8dc2a8b6e17be5fc4162211d36f227183a1557b9b33021f3c SHA512 5e0e2ae2bd1b7e1153a24a51f10b11b7006c43c5b4d68008b477dd0a4cdf97e2109cdb48b1165b79e6f5ad8e98c24a86ff0688f9aecc9297a46d82dd402e0554
AUX monit.pamd 120 BLAKE2B 76744f79babaa99fa2961f73158ca755f885e9ea8e20b76dcb29f8fd10be6b5804b09b3c90f59ada7ce81eab90713ba43d2b2f28a6abc278fdfc75b356af4e67 SHA512 75c5fbad1c04fc5c9c0de224df245d64f4e59e23f79f4037edcc94623795852900318747e8a71946cab406009834643e84e1cd40b27854951d5462e740712b5c
AUX monit.service 226 BLAKE2B 3b3041900987acd5bb6faa770c6631f6554b2e4360520252369951b3f7f87a3dd96440a58c9d2c4973ce9980a00ab7085c92af1e6542ae10d679ba352d170b19 SHA512 3ca0499ebd21aee812b78883c144c0a346a8cb6106392544836bf76d594e96b7e77be4b32b8c3170273e8236b25000c268724148252d98a4b99131f8b0ce4e88
-DIST monit-5.25.3.tar.gz 1355925 BLAKE2B f1c4775ad82ccea262fa5d9c3c9396e634cb3742c59ff9d8b3c87552501ee749a829932570b8d2836fe77a14fb42fea2ee42cab1aa355ca09df6dccda9aa5f51 SHA512 9030b8e6a02eeaf497382f14f7cf855a96599ab060130f077208edd5db35fee1b74f9166df4deff87b4a1954c8d4fff83b5465166938a3f8aea8d4d4c0371e90
-DIST monit-5.26.0.tar.gz 1371327 BLAKE2B eb130c36ad9df0b042fc241fde540ea12945ff1d63d14925da8435e88586141f5ebc116ad5a540a4fbfa507e0101d4cf4ef8a4435fd638f39d5472ba0d6e12d5 SHA512 ae5bfc9f2e8cf2d2efa7a121f3bb865dc5b66b647e23e005349799f3f4384dfa1534ed88d0767ca41dac4cea2674fb82cfb51098129d350b470143df548c6900
-DIST monit-5.27.0.tar.gz 1455341 BLAKE2B a2eeab81dacf506cdb336ba5e116f18d947b206ab791b4ee9f3ec54dcbbb973c31074f5a46bf32397fa4306cc6b11eca80b4c92770ae412baf1b610483e8259f SHA512 34461572ad809917f13672613bd37546ec2b5ebaf5a93a52d669c7c67b102a592ed5e88012feb53c9fe310ea9437a169f8822eac06d7b6f42a1801f710365785
DIST monit-5.27.1.tar.gz 1459360 BLAKE2B ef8030112c401ab08653692c702f2ec6d34c11605c2f6fbb5310f8e08d7fb238cf1b2d0271358b7160e05ad8dae3931d458329c422ae826681c11fe46fac01b4 SHA512 1e71a529a920a37576242a99fe8067d9b88f64136b111c152527aca4aa5d3cac3c32c1f58a793a56361b8e286f025bfb1f063f4c38d25ebafc7927fbf9170673
-EBUILD monit-5.25.3.ebuild 1204 BLAKE2B b1afff4ec33ccbea3c8e06de97e756590706a54492bac64da87b5a40278ed835806cbccbe9b2b7869e443b83f00f9b6cdf6d78e6929d5683916cf11756c3da7f SHA512 02a0b6d37182baf77a2cb835664ea0d8faf3a473647d234ffc2a62df313d564ec491d9682808161bf4da62aa558fa03293a1b8eea017840acb52298bcfe1834d
-EBUILD monit-5.26.0.ebuild 1207 BLAKE2B aa074c71f4eb188e69feb148663344e15c8ab1e818c960018d59abd21ea5713eb148cdb9c796b996b00aca20f9a4e46ab3ce75f90465d35fb2cd7901a18b9858 SHA512 add86722d2fa2a539c6ac3c4758731e0b72d279d8c56f9634880507e1db0e364a2c4b66ef7d23a60c6a56550bb5fc15d0f8d99a16aa11cd81890093eb368fcf9
-EBUILD monit-5.27.0.ebuild 1189 BLAKE2B 6d26a251a2971408adb9801306041c873741e6d2f8b785a050764c40fc7d1076881aeffac520c102e1c3138a945f23abc1b62d83bb6c6b8cc4ddb615511de277 SHA512 9ad4ca52585b0e2b20407b7a901e6fbb8dc0aeac56e6f9fb4c47b2453f745c88d416f5cbbe8b80c75d67c7b06fd99b68616736eb9f28328db18261bbb965581d
+DIST monit-5.27.2.tar.gz 1463790 BLAKE2B f00733261fd941f47ec04e63ed9e3617991cd8a069a14e59941e85d3a342537892019864d4716f821428adb57979aa270fcba9d57f573d49e897dfcd77cc133a SHA512 a45cbbf0905b165767e21d66103b460ea48948824d043881aba3de752e34a67bfb3b97f75153e3672d87a34a702d66ceee28160110654aa52fb82c668aa135b9
EBUILD monit-5.27.1-r1.ebuild 1252 BLAKE2B 828454c39b96d5ebde4bc3edd2dde1111914242a3d883f439d76e0f53f7f84e1a8c745daa59d22cee19f69c034ffe86f5f01325d26d39d3eb115007c1aba04c4 SHA512 3de6f38ded218644e8d087c5bff499a2a78b29a2fc4a3e0928dfd49c994a96654f0cfad338f64220b052182c465a93fb41516dc92c9252931850d3031d0496ab
EBUILD monit-5.27.1.ebuild 1189 BLAKE2B 6d26a251a2971408adb9801306041c873741e6d2f8b785a050764c40fc7d1076881aeffac520c102e1c3138a945f23abc1b62d83bb6c6b8cc4ddb615511de277 SHA512 9ad4ca52585b0e2b20407b7a901e6fbb8dc0aeac56e6f9fb4c47b2453f745c88d416f5cbbe8b80c75d67c7b06fd99b68616736eb9f28328db18261bbb965581d
+EBUILD monit-5.27.2.ebuild 1199 BLAKE2B 47700b4eaede91e2794a9bf0d03c4330217ddc64243dcc00eb459c6566ad4cdc5bc948f9f5c6c6af8ea0c43936144529990f68f71dca970a6f24b5d34cdca940 SHA512 541746ada9d73c9e0082bc3f16079853c214ef48b2fd3a59f708c5b40d780279cf46b36fc7a2552f954d945e4694ea8b7558f48905a313cb1e5bce99e65a45b2
MISC metadata.xml 247 BLAKE2B 5a20af3c9732ef7dba68131a08988652f5c93a6d186a82c4deb1bb9c06dc3ae73152a0d241cc346637f7b11caf4676da43301ba596c67b66669535e71db0b03e SHA512 29cf52c16b0cce69899d9c2da8acd9144b7d760442aa323b854dceadb42459e009545193b1df7911ac2241b59f4819b4a6bb1d206d6f57953f770031433bb6b7
diff --git a/app-admin/monit/monit-5.25.3.ebuild b/app-admin/monit/monit-5.25.3.ebuild
deleted file mode 100644
index f64d0e3989d7..000000000000
--- a/app-admin/monit/monit-5.25.3.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit bash-completion-r1 pam systemd
-
-DESCRIPTION="Monitoring and managing daemons or similar programs running on a Unix system"
-HOMEPAGE="http://mmonit.com/monit/"
-SRC_URI="http://mmonit.com/monit/dist/${P}.tar.gz"
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 x86 ~amd64-linux"
-IUSE="ipv6 libressl pam ssl"
-
-RDEPEND="
- ssl? (
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:0= )
- )"
-DEPEND="${RDEPEND}
- pam? ( sys-libs/pam )"
-BDEPEND="
- sys-devel/flex
- sys-devel/bison
-"
-
-src_prepare() {
- default
- sed -i -e '/^INSTALL_PROG/s/-s//' Makefile.in || die
-}
-
-src_configure() {
- local myeconfargs=(
- $(use_with ipv6)
- $(use_with pam)
- $(use_with ssl)
- )
- econf "${myeconfargs[@]}"
-}
-
-src_install() {
- default
-
- dodoc README
-
- insinto /etc; insopts -m600; doins monitrc
- newinitd "${FILESDIR}"/monit.initd-5.0-r1 monit
- systemd_dounit "${FILESDIR}"/${PN}.service
-
- use pam && newpamd "${FILESDIR}"/${PN}.pamd ${PN}
-
- dobashcomp system/bash/monit
-}
-
-pkg_postinst() {
- elog "Sample configurations are available at:"
- elog "http://mmonit.com/monit/documentation/"
-}
diff --git a/app-admin/monit/monit-5.27.0.ebuild b/app-admin/monit/monit-5.27.0.ebuild
deleted file mode 100644
index b5d4e9fca1a3..000000000000
--- a/app-admin/monit/monit-5.27.0.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit bash-completion-r1 pam systemd
-
-DESCRIPTION="Monitoring and managing daemons or similar programs running on a Unix system"
-HOMEPAGE="http://mmonit.com/monit/"
-SRC_URI="http://mmonit.com/monit/dist/${P}.tar.gz"
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 x86 ~amd64-linux"
-IUSE="ipv6 libressl pam ssl"
-
-RDEPEND="
- ssl? (
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:0= )
- )"
-DEPEND="${RDEPEND}
- pam? ( sys-libs/pam )"
-BDEPEND="
- sys-devel/flex
- sys-devel/bison
-"
-
-src_prepare() {
- default
- sed -i -e '/^INSTALL_PROG/s/-s//' Makefile.in || die
-}
-
-src_configure() {
- local myeconfargs=(
- $(use_with ipv6)
- $(use_with pam)
- $(use_with ssl)
- )
- econf "${myeconfargs[@]}"
-}
-
-src_install() {
- default
-
- insinto /etc; insopts -m600; doins monitrc
- newinitd "${FILESDIR}"/monit.initd-5.0-r1 monit
- systemd_dounit "${FILESDIR}"/${PN}.service
-
- use pam && newpamd "${FILESDIR}"/${PN}.pamd ${PN}
-
- dobashcomp system/bash/monit
-}
-
-pkg_postinst() {
- elog "Sample configurations are available at:"
- elog "http://mmonit.com/monit/documentation/"
-}
diff --git a/app-admin/monit/monit-5.26.0.ebuild b/app-admin/monit/monit-5.27.2.ebuild
similarity index 92%
rename from app-admin/monit/monit-5.26.0.ebuild
rename to app-admin/monit/monit-5.27.2.ebuild
index 7bbf46381a98..bc107a7fd16a 100644
--- a/app-admin/monit/monit-5.26.0.ebuild
+++ b/app-admin/monit/monit-5.27.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-inherit bash-completion-r1 pam systemd
+inherit bash-completion-r1 pam systemd eutils
DESCRIPTION="Monitoring and managing daemons or similar programs running on a Unix system"
HOMEPAGE="http://mmonit.com/monit/"
@@ -42,8 +42,6 @@ src_configure() {
src_install() {
default
- dodoc README
-
insinto /etc; insopts -m600; doins monitrc
newinitd "${FILESDIR}"/monit.initd-5.0-r1 monit
systemd_dounit "${FILESDIR}"/${PN}.service
diff --git a/app-admin/puppet-agent/Manifest b/app-admin/puppet-agent/Manifest
index 7c275891ed2b..db1db26050ce 100644
--- a/app-admin/puppet-agent/Manifest
+++ b/app-admin/puppet-agent/Manifest
@@ -2,10 +2,8 @@ AUX puppet-agent.conf.tmpfilesd 39 BLAKE2B 5ad1c862fec60701bdd18fb5f968d53b54b04
AUX puppet.initd 765 BLAKE2B 4b48126506cbafe50bccd364a5aab10e57fb2412795122d3520d75f6034c92bcfaa0fff2cf7d19d40fa251f3a9009c32660474d2ef24c2481e93c04bc16b2979 SHA512 d40522b2060e4d4d72e60cca17860d029223e442e69982b6c553b72c4bd6d8b0d6be22baa496486cd0d9e99d6ed55789cba565186979fcd6cf3e49acb8a45171
AUX puppet.initd2 758 BLAKE2B caf8c2e3563f24d9d313e790498dc362fcd14467ca2b6329cf454a5163bae5cfa2b7af1a212b2e5bfcb4693c7291d5306e47e574d3c937aaedd02625dc954a9e SHA512 df93f7dbcf61eee9f42f4a0c2fa0e2dfc806ac737ba98329cee158e04150c9bf346abd9364b2a6824df4bb862e676be7b2c23f5947ef5aa589df745ac5c5cd03
AUX puppet.service 355 BLAKE2B 96b24396f6b91181c13ef66cb06ff8197135d0bceefe4b01bdeb461d337b369c7fb7721ccbb2bf8680c0e8029d281d1bb0d5eafc7de6393f8fe058b7e67285de SHA512 a4dfb4f510413f0c4cbdcac911d35c33659d661b1dd52f2f9fe296fcff53f8ea4b2270dcb0b56d0128d629e15ffffd1e2c75a4ae338c47233194a035965fe2d6
-DIST puppet-agent_6.18.0-1focal_amd64.deb 22258752 BLAKE2B 547d06b16b2c95ec9be72bd82e1aa0a4a4b511075da73f29ebecdef32ca4ed9b965a38a7c071d9bcc8c444b6974159df97f020878c0e4a20d1f50ff23d4c1129 SHA512 00f0cfd96176f5311f0bab14016ab88da03ecc10fd9e2bf28fc2d9a399600c56a97e23095694be5382005fef0df1c4fe3ff0d1aec3a46d85f74c729a3c62476a
DIST puppet-agent_6.19.1-1focal_amd64.deb 22221600 BLAKE2B 22b03ef1f86b34955e8bad7c63a2022d2832dadd554316baf75419d6543e8a569902fb92a81a3dcc817401f06aa7dd47143a6cbd383f0e531c465cd3203dc4ed SHA512 4819a3509066516b0be76bc0f2afe94611405f7ac52fe50890d57c86a8a9c6c70787d46cb4b77085666f3e74bcb83a11acf1fef5d1e6ed3151ea06cbb8df3170
DIST puppet-agent_7.1.0-1focal_amd64.deb 20881084 BLAKE2B 1f16533e9f2da9971bfeaaab696bd0631d058928491c52e7cadba2c710af8373cfb89b4eaa4e293121857dfdad9bc694d562ebd9db8213198191c56fe94dd119 SHA512 3356810dd08baad373fd62669995cea17fed6baad3d3ae54dfd00c88a69602b5d4b8917b5e54aacc41fbd011a4e6877d1fd6c4a62d09648ddfaf26d898c3e7d6
-EBUILD puppet-agent-6.18.0.ebuild 2067 BLAKE2B fbaa5ddfc2c3085a877a0adb546a8ced6242fcfeffa180cee4588dd6ac0f35ef15b58869f1b22dbc4d92b2344780ad64ae9ef41fa6a46f71bc50fd2f89031ea5 SHA512 154315c97b9ec493d6923e066df73d58a33e6f0c7bc33162d8fcb5b5eb86df3ebd7af93d9cc8a0463d6d19f7650209610fe391a5b530b7b57e147738cc567d9e
EBUILD puppet-agent-6.19.1-r1.ebuild 2063 BLAKE2B 046b9954bf6619f55a664eb77b6552fd23a8d6d8a0da3dc9f9f395d570bd852fc3222bfc92debce028b49919e2fce63115d8c84c4957c75e49ebf5857b33c1d5 SHA512 8d78af238e593ddd88498d4994afa6565c8d5e9dcbc4baf4e05238ed591847ad97b3eb452c1a4d688d8d9d64aad274826349c28797bad960f12ebe39be1c304b
-EBUILD puppet-agent-7.1.0.ebuild 1917 BLAKE2B 1dff33fb27bd351a53bbec487e8d5b0a94b25ddb0593f7edac54fac68093201eaddbb304019ced4ac49d5d01765229729c522321c8d5646c549d188d0d0f842c SHA512 53896e99a7c287f71e067a257b0548267c9201010eabbd61ddf6cbcee7a86b1b427fc534d112806223a14eb96bcef90e6ed568b78fb2b883da34e2cc1075cbd6
+EBUILD puppet-agent-7.1.0.ebuild 1916 BLAKE2B 7ee5268c276c7166787b64d7b39d5c2066303d552dc3b9880285daa98846d1f92512e353f6ce7a270774cbbcc569781cddd391e3fb2e633188c5535a7e9d0098 SHA512 d1b5ffd018cc68f5e71084b7948fc5aba69cf1b66c50acee9d2ed4927f93f9dc9104c3a691654fc730dd6a0bf891ecaa08b2540201ca2157b0ab81626cff6b99
MISC metadata.xml 1031 BLAKE2B 87fd22edd4da3d7b50a8dc12fd136fa3205aef046491b33b9fff0466ffa1824a6a37cda506435a23d14efe5b247d99f4d7b5922cb9fbf13e52cdf54c24031633 SHA512 b180e0fcb10ade14fd10f7cabc3b6eb26ce0c4bd8983bde07aa89c663252e19d249cd7cf7cbfe46426826bd2e88c333060888adbe7e9ac63a05432ff848e2fc7
diff --git a/app-admin/puppet-agent/puppet-agent-6.18.0.ebuild b/app-admin/puppet-agent/puppet-agent-6.18.0.ebuild
deleted file mode 100644
index c33a9ee73c47..000000000000
--- a/app-admin/puppet-agent/puppet-agent-6.18.0.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit eutils systemd unpacker
-
-DESCRIPTION="general puppet client utils along with hiera and facter"
-HOMEPAGE="https://puppetlabs.com/"
-SRC_URI="http://apt.puppetlabs.com/pool/focal/puppet/${PN:0:1}/${PN}/${PN}_${PV}-1focal_amd64.deb"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="puppetdb selinux"
-RESTRICT="strip"
-
-CDEPEND="!app-admin/puppet
- !dev-ruby/hiera
- !dev-ruby/facter
- !app-emulation/virt-what
- acct-user/puppet
- acct-group/puppet"
-
-DEPEND="
- ${CDEPEND}
- app-admin/augeas"
-RDEPEND="${CDEPEND}
- app-portage/eix
- sys-apps/dmidecode
- sys-libs/libselinux
- sys-libs/glibc
- sys-libs/readline:0/8
- sys-libs/libxcrypt
- sys-libs/ncurses:0[tinfo]
- selinux? (
- sys-libs/libselinux[ruby]
- sec-policy/selinux-puppet
- )
- puppetdb? ( >=dev-ruby/puppetdb-termini-5.0.1 )"
-
-S=${WORKDIR}
-
-QA_PREBUILT="*"
-
-src_install() {
- # conf.d
- doconfd etc/default/puppet
- doconfd etc/default/pxp-agent
- # logrotate.d
- insinto /etc/logrotate.d
- doins etc/logrotate.d/pxp-agent
- # puppet itself
- insinto /etc/puppetlabs
- doins -r etc/puppetlabs/*
- # logdir for systemd
- dodir var/log/puppetlabs/puppet/
- fperms 0750 var/log/puppetlabs/puppet/
- # the rest
- insinto /opt
- dodir opt/puppetlabs/puppet/cache
- doins -r opt/*
- fperms 0750 /opt/puppetlabs/puppet/cache
- # init
- newinitd "${FILESDIR}/puppet.initd" puppet
- systemd_dounit lib/systemd/system/puppet.service
- systemd_dounit lib/systemd/system/pxp-agent.service
- systemd_newtmpfilesd "${FILESDIR}/puppet-agent.conf.tmpfilesd" puppet-agent.conf
- # symlinks
- chmod 0755 -R "${D}/opt/puppetlabs/puppet/bin/"
- chmod 0755 "${D}//opt/puppetlabs/puppet/lib/virt-what/virt-what-cpuid-helper"
- dosym ../../opt/puppetlabs/bin/facter /usr/bin/facter
- dosym ../../opt/puppetlabs/bin/hiera /usr/bin/hiera
- dosym ../../opt/puppetlabs/bin/puppet /usr/bin/puppet
- dosym ../../opt/puppetlabs/puppet/bin/virt-what /usr/bin/virt-what
- dosym ../../../../usr/lib64/xcrypt/libcrypt.so.1 /opt/puppetlabs/puppet/lib/libcrypt.so.1
-}
diff --git a/app-admin/puppet-agent/puppet-agent-7.1.0.ebuild b/app-admin/puppet-agent/puppet-agent-7.1.0.ebuild
index b8c6c3f40eaa..c5679f7b83b6 100644
--- a/app-admin/puppet-agent/puppet-agent-7.1.0.ebuild
+++ b/app-admin/puppet-agent/puppet-agent-7.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="http://apt.puppetlabs.com/pool/focal/puppet/${PN:0:1}/${PN}/${PN}_${PV}
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
IUSE="puppetdb selinux"
RESTRICT="strip"
diff --git a/app-admin/puppet/Manifest b/app-admin/puppet/Manifest
index 03e02e1bb5cd..622d5d4517b0 100644
--- a/app-admin/puppet/Manifest
+++ b/app-admin/puppet/Manifest
@@ -6,12 +6,10 @@ AUX puppetmaster.init-4.x 1108 BLAKE2B 1793d3d881de2c1808159f940bf1e758c2e7fad8f
AUX tmpfiles.d 39 BLAKE2B 2c9a992bf709a384ae02395299ddeb2febf3cd83b924acd97d0ca7fbc17dac273cb27c926790708c0d929f62282dec0477f167ed2e5fc1418a9ff5d130f246f1 SHA512 2dfec45e6f762ce0431d55b1a826e707e970defacbe050df838b66b347e7423eac78a35248c74908e7b52fa84cde5129ce3f562f64dac357f0368a3bc0b719a1
DIST puppet-5.5.19.tar.gz 2993740 BLAKE2B aa6bde89489279769ee9a1ed5508fb223f7f0153b1b1991970018908eee70ff0816688c702b8dc779d01e1978ea7f9290c80523648730d5408a17674c11345fd SHA512 996fa155ca04c8c3c96c29cf65cd24eaf9e19e89fcf85345509dbd3673b28c263df5b62d6f016b8ac1c1da8ed86f0acf3100eae2656252bb10c542972db81de3
DIST puppet-5.5.22.tar.gz 2998132 BLAKE2B 8662c89190d0904fe44ffeca1cf9a9ddca40d57ba6fb2d1e644ca353ceb55b1ca3a91416f1eef2975233c9c4498784e7d7280c111ea0cc070870cadc69341d99 SHA512 5332b084a63bdf244672cc4751022c84a1cc50d3f394a13bdcbccf7fcf4ebea67953e88957f23046608bf25e9182548449be824c18289cb2bf1e3ed29b40dc58
-DIST puppet-6.18.0.tar.gz 2911742 BLAKE2B 75ecb14a0cf96c1c54d09f88f91984805834288a166e74c5b9648d5f9ad60a6c279100f32f148659772a22fc01d21345bf765ed47518bfa9bd81d06c17587efd SHA512 a14994aea502fbc78219967e2d711952b580df1e7befeab2d254a73f28036c6c7923d167a20bc61c9abe76000f93dcd3cba92b3353540e2a26fc27b10b06efe1
DIST puppet-6.19.1.tar.gz 2917976 BLAKE2B 06019b465699494c3c5045d8d3f617046583f8bb5ebff4e72991bcf5f1ca76b4e00f56af79bbcd7ab849439fc5e627840ef08b92f586441c0cb0bb3d51805f7f SHA512 4e8a3c8d46b6aa67c31da4b510dfc32a187937af213efb9f2f0b6625b29995cdfa8cbca384ad857c19e47ae4878127564756a809c2afdff4883038249395ff01
DIST puppet-7.1.0.tar.gz 2827602 BLAKE2B 5e15c7304c7b91e40b95096482d6a71a3e9e1686f769c4c0334a533cd8b6faf31d4e126585c9b48c15bb524930e0410bff32201dd01d7faeb7487c29075f7477 SHA512 7cb5f8c472d28012a0b93893792611dd03081c7100be57e2fab60a0dabe164081fc40195d562ef8cf5e2d67f9d32f26704ecedee9cc772e568a116e12af70cda
EBUILD puppet-5.5.19-r1.ebuild 3692 BLAKE2B 7aa03944368b7395b4c587230a39536db28d0a46352bd5c6f7ec457ca29a3e6d9a3672a9b74591d3382909dc4f9ecf6ec73853ad5722b26becafb5c1a1264912 SHA512 6012739c4d92cf576ea482f99e9d560633103116b40be7df8cc3a9e89f9efeef3e02317dbbed1207a91c5372ef7702d723c37207488ecd6ececad5d0df6de9a2
EBUILD puppet-5.5.22.ebuild 3751 BLAKE2B bde3bbacdd70435fe0e804133106ebc887f72da5742c871bfdaed08a084866f178b68433453d392f7e98f8f5a2297ee10e7b6e035392fecd22a84780a2b431b2 SHA512 5bc024d0696e51de520ca6ba162cf312ddc9cca04ba5ee18f849ca48547f31e4a493664ffd0100022ef4fb69ad1c24b1efccf7a25d85652281da71c446b87f26
-EBUILD puppet-6.18.0.ebuild 3637 BLAKE2B cd36d770482bad87468463b633c1fbe4ef2020906381c6f407cfc7a5d7ac757a0858a7bdeb948167e87a877fdb03f141544912d393e5a40efeb48657871e3e7a SHA512 09bf797fa8034fd9f651e6fb6cc2ef155b2825f4de5985f3331877f050ce6f26ce297de05f0061fe2f34898dee92944c071df7c4a251a608415197f0e0bfa470
EBUILD puppet-6.19.1.ebuild 3637 BLAKE2B cd36d770482bad87468463b633c1fbe4ef2020906381c6f407cfc7a5d7ac757a0858a7bdeb948167e87a877fdb03f141544912d393e5a40efeb48657871e3e7a SHA512 09bf797fa8034fd9f651e6fb6cc2ef155b2825f4de5985f3331877f050ce6f26ce297de05f0061fe2f34898dee92944c071df7c4a251a608415197f0e0bfa470
-EBUILD puppet-7.1.0.ebuild 3554 BLAKE2B a181c774112747fa06e9980081da602b0bc8a924c08b04802054738a1a9ffac08bf85d6d4fca1c0c734a04f8e1b2daaf410743488f3fddc5ebc46f9424ca65fe SHA512 0ceea9d4e1651ba4732c3cf37c63998113a0bb0f88fedb27f2f2bfb663ab1f558e537886b983a415bbf0259c4a36ca40a186f7a78b9bb48d3bdd8b396a1f4215
+EBUILD puppet-7.1.0.ebuild 3552 BLAKE2B 14aaaf8c7a30bf347ebd26aa83c000e329a63eec65b00927b8b2e53e5f44d610079fe38d1353e31467302f6c5aad558263ea045faaa564cfef4aa8995a8fea16 SHA512 29bd219cba5000e6a68f8e64bbd1db27e8df220d70288ac76b3258712c2343de636f327aa202e8be8d2dfd1a94aa0ef87cfb72438cbb501bce6162fb7f8a0ec0
MISC metadata.xml 1569 BLAKE2B 689531701af0604e7a10f59f2eb721c133796a6c7a87d6a9bffef26ed71d7135b9498450274f4875feb5c45ad7b1aa8458be9a71145f1c0f089b9db687be3cba SHA512 a5672e5d6191264e037e60dd3d2d2d545719fe0edc5db1372b6f1c83a05ebf8b4c5b171b5a80f5ec55a531cec3e37d8b9207adcbf38925efe193eecd80999198
diff --git a/app-admin/puppet/puppet-6.18.0.ebuild b/app-admin/puppet/puppet-6.18.0.ebuild
deleted file mode 100644
index 11fd2d3c5085..000000000000
--- a/app-admin/puppet/puppet-6.18.0.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_TASK_DOC="doc:all"
-
-RUBY_FAKEGEM_EXTRAINSTALL="locales"
-
-inherit eutils ruby-fakegem eapi7-ver
-
-DESCRIPTION="A system automation and configuration management software."
-HOMEPAGE="https://puppet.com/"
-SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz"
-
-LICENSE="Apache-2.0 GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86"
-IUSE="augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax"
-RESTRICT="test"
-
-ruby_add_rdepend "
- dev-ruby/hiera
- dev-ruby/json:=
- dev-ruby/semantic_puppet
- >=dev-ruby/facter-3.0.0
- dev-ruby/concurrent-ruby
- augeas? ( dev-ruby/ruby-augeas )
- diff? ( dev-ruby/diff-lcs )
- doc? ( dev-ruby/rdoc )
- ldap? ( dev-ruby/ruby-ldap )
- shadow? ( dev-ruby/ruby-shadow )
- sqlite? ( dev-ruby/sqlite3 )
- virtual/ruby-ssl
- dev-ruby/hocon"
-
-ruby_add_bdepend "
- doc? ( dev-ruby/yard )
- test? (
- dev-ruby/mocha
- dev-ruby/rack
- dev-ruby/rspec-its
- )"
-# this should go in the above lists, but isn't because of test deps not being keyworded
-# dev-ruby/rspec-collection_matchers
-
-RDEPEND+=" ${RDEPEND}
- rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] )
- selinux? (
- sys-libs/libselinux[ruby]
- sec-policy/selinux-puppet
- )
- vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 )
- >=app-portage/eix-0.18.0
- acct-user/puppet
- acct-group/puppet"
-PDEPEND="emacs? ( >=app-emacs/puppet-mode-0.3-r1 )"
-
-all_ruby_prepare() {
- # Avoid spec that require unpackaged json-schema.
- rm spec/lib/matchers/json.rb $( grep -Rl matchers/json spec) || die
-
- # can't be run within portage.
- epatch "${FILESDIR}/puppet-fix-tests-6.10.1.patch"
-
- # fix systemd path
- epatch "${FILESDIR}/puppet-systemd.patch"
-
- # Avoid specs that can only run in the puppet.git repository. This
- # should be narrowed down to the specific specs.
- rm spec/integration/parser/compiler_spec.rb || die
-
- # Avoid failing spec that need further investigation.
- rm spec/unit/module_tool/metadata_spec.rb || die
-}
-
-each_ruby_install() {
- each_fakegem_install
-# dosym "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${P}" "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${PN}"
-}
-
-all_ruby_install() {
- all_fakegem_install
-
- # systemd stuffs
- insinto /usr/lib/systemd/system
- doins "${WORKDIR}/all/${P}/ext/systemd/puppet.service"
-
- # tmpfiles stuff
- insinto /usr/lib/tmpfiles.d
- newins "${FILESDIR}/tmpfiles.d" "puppet.conf"
-
- # openrc init stuff
- newinitd "${FILESDIR}"/puppet.init-4.x puppet
-
- keepdir /etc/puppetlabs/puppet/ssl
-
- keepdir /var/lib/puppet/facts
- keepdir /var/lib/puppet/files
- fowners -R puppet:puppet /var/lib/puppet
-
- fperms 0750 /var/lib/puppet
-
- fperms 0750 /etc/puppetlabs
- fperms 0750 /etc/puppetlabs/puppet
- fperms 0750 /etc/puppetlabs/puppet/ssl
- fowners -R :puppet /etc/puppetlabs
- fowners -R :puppet /var/lib/puppet
-
- if use ldap ; then
- insinto /etc/openldap/schema; doins ext/ldap/puppet.schema
- fi
-
- # ext and examples files
- for f in $(find ext examples -type f) ; do
- docinto "$(dirname ${f})"; dodoc "${f}"
- done
-}
-
-pkg_postinst() {
- elog
- elog "Please, *don't* include the --ask option in EMERGE_EXTRA_OPTS as this could"
- elog "cause puppet to hang while installing packages."
- elog
- elog "Portage Puppet module with Gentoo-specific resources:"
- elog "http://forge.puppetlabs.com/gentoo/portage"
- elog
- elog "If updating from puppet 5 to 6, keep in mind that webrick (server/master)"
- elog "suppert was removed for >=6.x, please migrate to puppetserver if you have"
- elog "not already done so."
- elog
-}
diff --git a/app-admin/puppet/puppet-7.1.0.ebuild b/app-admin/puppet/puppet-7.1.0.ebuild
index 7347beb79605..e5c11f9a8e24 100644
--- a/app-admin/puppet/puppet-7.1.0.ebuild
+++ b/app-admin/puppet/puppet-7.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -19,7 +19,7 @@ SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz"
LICENSE="Apache-2.0 GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86"
IUSE="augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax"
RESTRICT="test"
diff --git a/app-admin/puppetdb/Manifest b/app-admin/puppetdb/Manifest
index ad65a0c0b024..a4e597292ac0 100644
--- a/app-admin/puppetdb/Manifest
+++ b/app-admin/puppetdb/Manifest
@@ -1,9 +1,7 @@
AUX puppetdb.initd 1824 BLAKE2B 76d8252b2fee61270f440734d91735fa002df1583126de60befd3cc756cc0f5368ce49461cee85ffca4c6893b1e1859bff9af86e75d73171d15ae344a9fb4149 SHA512 0d0f67b7eaf7d10474e73eb77174a51e0f891bf664706e11c7a5ef1f918d7967c67251bab797e1d117b0f2b08f4b634ad06a81f6022ef04e6394c15e36a73961
AUX puppetdb.initd-r2 1896 BLAKE2B 04f47dd0406c1f67d4f72a911b0db8b482e37673ec9a0d14d73fb868aaae97f756e03fa39c2c7a9d69a217b5924dafa23c6f3e276a0626f06bf5c143b588a2c8 SHA512 58c248710c6eb39ec13e6f55a8bca686386e79eb048c4927925a2e2e75bce742d6a5e84001c231ea2b74fd4eed0ead81b9a4fc5672fdfbbd59f90677e4490675
-DIST puppetdb-6.12.0.tar.gz 46375914 BLAKE2B 7d1a884881e9aa324b0d2a8cd49bf47e4014ff6bc23e94c76c27b3736c75f3cdcead76aea159de17ce1255381e32bb126f9cbf55297f64454fcca6ffd7f28b46 SHA512 040f8653c422e312857f82a8f040a33128f49c7900978a22b9ae672172ec41d2037e323de5aad3c50a630058b6b95c025bae05b3ea923e2321e94f97390998dc
DIST puppetdb-6.13.0.tar.gz 46400373 BLAKE2B 2e3cdd4e7a3e84e11f23031dba3aadf5be885e118938a0a52140e612b4006a0fd4e97f162322c80731b2bfb63dcff2d73d5b2cd0882f7aabcb69fe30aa05151b SHA512 4d16ce44666634e88c538b06f6b2e91cf9786646134a6302a80ea941e3f73168b0f4981cecdb125cac881c0233c835893e9385004461b67e7d8635865f14aee9
DIST puppetdb-7.0.1.tar.gz 46449698 BLAKE2B 63538c2c61ca5f68643f95537d5096e08e46ffbd0b7d02e03fd6fb6ae5864fc234bd18bc9389d1f073c30ed4472415b6916672875250ae3a24cb348969f950d8 SHA512 0ae763b71d02c3afc55cf2f10829da75b07d89e57b75c713bc52492a7cc3693c3d22ecbbb36fed30f562f067f78fb0d1c80b073e0238a60eb144cc3555d7219d
-EBUILD puppetdb-6.12.0.ebuild 2647 BLAKE2B 9c83ecde90c6dadb85eec7f67205a0eda5cd6f82cc70cbe2d700cc441e0d920ba1f4a0adee9cd88faedbd402ac6070a904b1ae8c80e455832efd9da4b4ebf715 SHA512 ba06f2e2e5fde0af2463cccf4628f3dae3151cf02c221b2297755fe8a960e81e2ced7775c5a72bb1063986d171545a3f82c25f64213d4c1583dbdded00a314ce
EBUILD puppetdb-6.13.0.ebuild 2647 BLAKE2B 9c83ecde90c6dadb85eec7f67205a0eda5cd6f82cc70cbe2d700cc441e0d920ba1f4a0adee9cd88faedbd402ac6070a904b1ae8c80e455832efd9da4b4ebf715 SHA512 ba06f2e2e5fde0af2463cccf4628f3dae3151cf02c221b2297755fe8a960e81e2ced7775c5a72bb1063986d171545a3f82c25f64213d4c1583dbdded00a314ce
-EBUILD puppetdb-7.0.1.ebuild 2649 BLAKE2B 61c2280603f62775d7e3c06142c0bad6d28795dfd396c45c73680e7d33b034e8f656994a21b304e438f89fc9d700e722bdbbc94dec544cda0f6abbe560c9d1e1 SHA512 1dbf062b0f95659020fcd4ec207aeb658a62e35e74f868d95c91ccabf1115b22536be505fb2de84427a6506c47ecd7cbb3ca0164f618e4d297b921a629065b6c
+EBUILD puppetdb-7.0.1.ebuild 2647 BLAKE2B bab07bf74afcbab16f872d1959eab98ffb3e354a0ca7062d7ef9563158b1acf0246c19baf72f821ca37a9e343f3694dcd2bdc17c41a66f5e7accd63ef3ecaa24 SHA512 7cd8ad05afb22cc053004e72ccb0a1b2b5b55a8e2f20f56ee564a030cfd20a537204460ddc9ad328b69bc16023d921310d4495b737e7d0a025e56c36ab62ab32
MISC metadata.xml 485 BLAKE2B 5f2ffba1725ce7168c4bacbef8170b7ca626d4e639cc2c32e0063e076fc951681c9a7154d08036e935617bd5cf67a5640acec9ae3964829da9bc3a7cdf412222 SHA512 b9461d712e74a7ff469a554a21c1e4e67954395eaae8de9a8669f7e816e2291120be14e8c659f34b41f65962027cfa73030ef2678003b52a1a56b35de0f9b2b2
diff --git a/app-admin/puppetdb/puppetdb-6.12.0.ebuild b/app-admin/puppetdb/puppetdb-6.12.0.ebuild
deleted file mode 100644
index 784885ac312f..000000000000
--- a/app-admin/puppetdb/puppetdb-6.12.0.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib systemd
-
-DESCRIPTION="PuppetDB collects data generated by Puppet."
-HOMEPAGE="http://docs.puppetlabs.com/puppetdb/"
-SRC_URI="https://downloads.puppetlabs.com/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-KEYWORDS="amd64 x86"
-
-RDEPEND+=">=virtual/jdk-1.8.0"
-DEPEND+="acct-user/puppetdb
- acct-group/puppetdb"
-
-src_prepare() {
- sed -i 's/sysconfig/conf\.d/g' ext/redhat/puppetdb.service || die
- sed -i 's/sysconfig/conf\.d/g' ext/bin/puppetdb || die
- sed -i 's/sysconfig/conf\.d/g' install.sh || die
- sed -i 's/var\/run/run/g' ext/puppetdb.tmpfiles.conf || die
- sed -i 's/var\/run/run/g' install.sh || die
- default
-}
-
-src_compile() {
- einfo "not compiling"
-}
-
-src_install() {
- dodir /opt/puppetlabs/server/data/puppetdb
- insinto /opt/puppetlabs/server/apps/puppetdb
- insopts -m0744
- doins ext/ezbake-functions.sh
- insopts -m0644
- doins ext/ezbake.manifest
- doins puppetdb.jar
- insinto /etc/puppetlabs/puppetdb
- doins ext/config/logback.xml
- doins ext/config/bootstrap.cfg
- doins ext/config/request-logging.xml
- insinto /etc/puppetlabs/puppetdb/conf.d
- doins ext/config/conf.d/jetty.ini
- doins ext/config/conf.d/repl.ini
- doins ext/config/conf.d/database.ini
- doins ext/config/conf.d/config.ini
- insopts -m0755
- insinto /opt/puppetlabs/server/apps/puppetdb/scripts
- doins install.sh
- insinto /opt/puppetlabs/server/apps/puppetdb/cli/apps
- doins ext/cli/foreground
- doins ext/cli/ssl-setup
- doins ext/cli/config-migration
- doins ext/cli/foreground
- doins ext/cli/anonymize
- doins ext/cli/reload
- doins ext/cli/start
- doins ext/cli/stop
- insinto /opt/puppetlabs/server/apps/puppetdb/bin
- doins ext/bin/puppetdb
- insopts -m0644
- dodir /opt/puppetlabs/server/bin
- dosym ../apps/puppetdb/bin/puppetdb /opt/puppetlabs/server/bin/puppetdb
- dodir /opt/puppetlabs/bin
- dosym ../server/apps/puppetdb/bin/puppetdb /opt/puppetlabs/bin/puppetdb
- dosym ../../opt/puppetlabs/server/apps/puppetdb/bin/puppetdb /usr/bin/puppetdb
- # init type tasks
- newconfd ext/default puppetdb
- systemd_dounit ext/redhat/puppetdb.service
- systemd_newtmpfilesd ext/puppetdb.tmpfiles.conf puppetdb.conf
- newinitd "${FILESDIR}/puppetdb.initd-r2" puppetdb
- # misc
- insinto /etc/logrotate.d
- newins ext/puppetdb.logrotate.conf puppetdb
- fowners -R puppetdb:puppetdb /opt/puppetlabs/server/data/puppetdb
- fperms -R 770 /opt/puppetlabs/server/data/puppetdb
-}
-
-pkg_postinst() {
- elog "to install please run '/opt/puppetlabs/server/bin/puppetdb ssl-setup'"
- elog
- elog "to upgrade please run '/opt/puppetlabs/server/bin/puppetdb config-migration'"
-}
diff --git a/app-admin/puppetdb/puppetdb-7.0.1.ebuild b/app-admin/puppetdb/puppetdb-7.0.1.ebuild
index 5a7a32bcf49c..32de81f2a2e9 100644
--- a/app-admin/puppetdb/puppetdb-7.0.1.ebuild
+++ b/app-admin/puppetdb/puppetdb-7.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="https://downloads.puppetlabs.com/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
IUSE=""
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
RDEPEND+=">=virtual/jdk-1.8.0"
DEPEND+="acct-user/puppetdb
diff --git a/app-admin/puppetserver/Manifest b/app-admin/puppetserver/Manifest
index 188b56afcb7b..c6cd679bf82c 100644
--- a/app-admin/puppetserver/Manifest
+++ b/app-admin/puppetserver/Manifest
@@ -1,11 +1,9 @@
AUX puppetserver.init 2138 BLAKE2B 6c157cb6bbe9e085ae67920abadf99ff97798115f784a60e2be4fa565f5b897f60d8abea21af273b1951477a1662c778081ee9a31063780c179097e764b0845b SHA512 50e78feda08e06a16290f90b7d593653c7fe2e98efdfc8cc7cc4a85a5be528e8bc585b934330f3a87b6f038311942fd8bc6d73f0538069d7b132dd3a64e23f11
AUX puppetserver.init-r1 2190 BLAKE2B 6e4b547af51989d678a52e0fb41e8b27a669d96aaa445998b532524651f2bf2349a26f8eb77ead92a9e0f613a5269fe464045937f318947c8c2878b93dad0d4f SHA512 de159346c4b1b5705d53337994cf77f4b70edd20d60f0e1338589be4ee67c4a1bddca5cfdf9a4e744ff9360676f86391a6675b137c3bef050d71f2964b885b58
-DIST puppetserver-6.12.1.tar.gz 60422470 BLAKE2B fd3fa33262a5ae83fb6889079a85c262d74d55b0ffb9ed297d60399c442d7a1676cfc54afd3e25721d6e4a4ad926c43a1f8f1a9db206ee6145280601c501fe09 SHA512 9ad5d3e266f91b8a1ef09302a1f8889f139909fb20268f714fb894dcff2379a01c78baafdab1102a26c26903cefe92ac833c2b20e9ea6f8d379af2dd11c20407
DIST puppetserver-6.13.0.tar.gz 61890579 BLAKE2B be514b3c41dcc018715e949f1f1c86317499baa22fa70e5f7e8df89211b566651ab4de469afadf14fcd1dbc9b1d0b0c21452c313f74052eb8d65bbd591231194 SHA512 ab67ebf94c37a50999a5597e1ceeadf606296c2b6e557bd6ee2bb99ac44b7c8fe8df892f4e3bccb9f0e3822fc480f61a27d6799b7dfc8df12e058c7074d589f9
DIST puppetserver-6.14.0.tar.gz 61960111 BLAKE2B 760fb2114aef78f1d96d41023f43f162eccd14ee0fa50f8ce4c7954450087dc395d9a9347629a968d99193ba6964b11a2650513c229b48159df67e9f9d63f541 SHA512 5d66b57a0f3c64ff889c33ccf94077a0ab142b84ca17faffaf4b885ba4794a52afb1b227f101eced36655999ac402913363897a3823a387f3c48948d38471c43
DIST puppetserver-7.0.1.tar.gz 62214010 BLAKE2B e0272e8dfc910f503cbd8aca8d4c689656d1356a6198766c5c82ab6658b2e7f5e956eb10022ca5336fd1bd0d655ca4c87e5c43290229cfd26c74c9943210cdef SHA512 67f3ba07d1f607eeee0f0520054711f36d0f6e59477930a6115c5f5127b9fc7e00075d6f863bfe9e9f92e4f45fe13f452c80759e3b496aebdca6fd97e50f3774
-EBUILD puppetserver-6.12.1.ebuild 5323 BLAKE2B 0db7db207a85592c34ea08e7f2943a84ba799191e4481603b3448be95f26195c5419f465ee205d4c218c7d59c872d59ce42228437e9a4008d773eaf89c8334bb SHA512 b2424e2661072d77a7ccd535dc319000e1e2b8510428c4932bbd578c3e0d5189f8681d409daf194c801382ac730b45a916fae6c950ce059b8d0bf83de58a0c0f
EBUILD puppetserver-6.13.0.ebuild 5323 BLAKE2B 0db7db207a85592c34ea08e7f2943a84ba799191e4481603b3448be95f26195c5419f465ee205d4c218c7d59c872d59ce42228437e9a4008d773eaf89c8334bb SHA512 b2424e2661072d77a7ccd535dc319000e1e2b8510428c4932bbd578c3e0d5189f8681d409daf194c801382ac730b45a916fae6c950ce059b8d0bf83de58a0c0f
EBUILD puppetserver-6.14.0.ebuild 5323 BLAKE2B 0db7db207a85592c34ea08e7f2943a84ba799191e4481603b3448be95f26195c5419f465ee205d4c218c7d59c872d59ce42228437e9a4008d773eaf89c8334bb SHA512 b2424e2661072d77a7ccd535dc319000e1e2b8510428c4932bbd578c3e0d5189f8681d409daf194c801382ac730b45a916fae6c950ce059b8d0bf83de58a0c0f
-EBUILD puppetserver-7.0.1.ebuild 5326 BLAKE2B 33112d222b68f04c96b806e68ed7042885d453efb887dee9d8b94da3b1e69242c3aa9bffd940a115ca545278290f479690ce2f7ebf523606258f210fd9a8420e SHA512 c4487fa107612ed0f1f639cf73413dd810dbc0316e25140441fe28325fc64e34cef4e3062fd0ca6affecd822d44524e5f3d83bcf4b39bbb96441175493cc2c87
+EBUILD puppetserver-7.0.1.ebuild 5325 BLAKE2B 63fbd9c252c64476df2b8592c34ccd2e67bcd39b41686ddf29f49cf860ccedbc3193b8e9adb95edb8cd3cd75da448e0dd9f202da5bbf0cb9bd1bbbe61f996a29 SHA512 191d5c6fa5dd735838814de6b7c62bf44c143c64d470aaef171f27eafa6e1576643b2614620cf7f07919a16388fbb58ad9b89124ada6bcbe287b4cd88d374bf9
MISC metadata.xml 340 BLAKE2B 91985e6677e8a9d4428356eb316146949d82a250f0a0995308733c4348cfeebabe01990a0cde9e580bc61c8b5c7df44ba92b347d90b9eb9c1f6f9fc38efa899f SHA512 9bc170ecf1a1b3810b0f9a5838ad5eb994169d7b50f5d0c0cfba279649ed7665f8d8a627a463dd35029610c554f8b0e5d76b759218802e3b0b9fa09c45c4ee5b
diff --git a/app-admin/puppetserver/puppetserver-6.12.1.ebuild b/app-admin/puppetserver/puppetserver-6.12.1.ebuild
deleted file mode 100644
index 2b74472d2418..000000000000
--- a/app-admin/puppetserver/puppetserver-6.12.1.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib systemd
-
-DESCRIPTION="Puppet Server is the next-generation application for managing Puppet agents."
-HOMEPAGE="http://docs.puppetlabs.com/puppetserver/"
-SRC_URI="https://downloads.puppetlabs.com/puppet/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="puppetdb"
-# will need the same keywords as puppet
-KEYWORDS="amd64"
-
-RDEPEND+="
- >=virtual/jdk-1.8.0
- app-admin/puppet-agent[puppetdb?]"
-DEPEND+="acct-user/puppet
- acct-group/puppet"
-
-src_prepare() {
- sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' ext/redhat/puppetserver.service || die
- sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' ext/bin/puppetserver || die
- sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' install.sh || die
- sed -i 's/var\/run/run/g' ext/config/conf.d/puppetserver.conf || die
- sed -i 's/var\/run/run/g' ext/redhat/puppetserver.service || die
- sed -i 's/var\/run/run/g' install.sh || die
- default
-}
-
-src_compile() {
- einfo "not compiling"
-}
-
-src_install() {
- insinto /opt/puppetlabs/server/apps/puppetserver
- insopts -m0774
- doins ext/ezbake-functions.sh
- insopts -m0644
- doins ext/ezbake.manifest
- doins puppet-server-release.jar
- insinto /etc/puppetlabs/puppetserver
- doins ext/config/logback.xml
- doins ext/config/request-logging.xml
- insinto /etc/puppetlabs/puppetserver/services.d
- doins ext/system-config/services.d/bootstrap.cfg
- doins ext/config/services.d/ca.cfg
- insinto /etc/puppetlabs/puppetserver/conf.d
- doins ext/config/conf.d/puppetserver.conf
- doins ext/config/conf.d/auth.conf
- doins ext/config/conf.d/global.conf
- doins ext/config/conf.d/web-routes.conf
- doins ext/config/conf.d/metrics.conf
- doins ext/config/conf.d/webserver.conf
- insopts -m0755
- insinto /opt/puppetlabs/server/apps/puppetserver/scripts
- doins install.sh
- insinto /opt/puppetlabs/server/apps/puppetserver/cli/apps
- doins ext/cli/ca
- doins ext/cli/irb
- doins ext/cli/foreground
- doins ext/cli/gem
- doins ext/cli/ruby
- doins ext/cli/reload
- doins ext/cli/start
- doins ext/cli/stop
- insinto /opt/puppetlabs/server/apps/puppetserver/cli
- doins ext/cli_defaults/cli-defaults.sh
- insinto /opt/puppetlabs/server/apps/puppetserver/bin
- doins ext/bin/puppetserver
- insopts -m0644
- dodir /opt/puppetlabs/server/bin
- dosym ../apps/puppetserver/bin/puppetserver /opt/puppetlabs/server/bin/puppetserver
- dodir /opt/puppetlabs/bin
- dosym ../server/apps/puppetserver/bin/puppetserver /opt/puppetlabs/bin/puppetserver
- dosym ../../opt/puppetlabs/server/apps/puppetserver/bin/puppetserver /usr/bin/puppetserver
- dodir /opt/puppetlabs/server/apps/puppetserver/config/services.d
- # other sys stuff
- dodir /etc/puppetlabs/code
- # needed for systemd
- dodir /var/log/puppetlabs/puppetserver
- dodir /etc/puppetlabs/puppet/ssl
- fowners -R puppet:puppet /etc/puppetlabs/puppet/ssl
- fperms -R 771 /etc/puppetlabs/puppet/ssl
- # systemd type things
- insinto /etc/systemd/system/puppetserver.service.d/
- systemd_dounit ext/redhat/puppetserver.service
- insinto /etc/default
- newins ext/default puppetserver
- # normal init type tasks
- dosym ../default/puppetserver /etc/conf.d/puppetserver
- newinitd "${FILESDIR}/puppetserver.init-r1" puppetserver
- # misc
- insinto /etc/logrotate.d
- newins ext/puppetserver.logrotate.conf puppetserver
- # cleanup
- dodir /opt/puppetlabs/server/data/puppetserver/jruby-gems
- fowners -R puppet:puppet /opt/puppetlabs/server/data
- fperms -R 775 /opt/puppetlabs/server/data/puppetserver
- fperms -R 700 /var/log/puppetlabs/puppetserver
- insinto /opt/puppetlabs/server/data
- doins ext/build-scripts/jruby-gem-list.txt
- doins ext/build-scripts/mri-gem-list-no-dependencies.txt
- insopts -m 0644
- insinto /usr/lib/tmpfiles.d
- newins ext/puppetserver.tmpfiles.conf puppetserver.conf
-}
-
-pkg_postinst() {
- elog "to install you may want to run the following:"
- elog
- elog "puppet config set --section master vardir /opt/puppetlabs/server/data/puppetserver"
- elog "puppet config set --section master logdir /var/log/puppetlabs/puppetserver"
- elog "puppet config set --section master rundir /run/puppetlabs/puppetserver"
- elog "puppet config set --section master pidfile /run/puppetlabs/puppetserver/puppetserver.pid"
- elog "puppet config set --section master codedir /etc/puppetlabs/code"
- elog
- elog "# install puppetserver gems"
- elog "cd /opt/puppetlabs/server/apps/puppetserver"
- elog "echo \"jruby-puppet: { gem-home: ${DESTDIR}/opt/puppetlabs/server/data/puppetserver/vendored-jruby-gems }\" > jruby.conf"
- elog "while read LINE; do"
- elog " java -cp puppet-server-release.jar:jruby-9k.jar clojure.main -m puppetlabs.puppetserver.cli.gem --config jruby.conf -- install --no-document \$(echo \$LINE |awk '{print \$1}') --version \$(echo \$LINE |awk '{print \$2}')"
- elog "done < /opt/puppetlabs/server/data/jruby-gem-list.txt"
- elog "echo \"jruby-puppet: { gem-home: ${DESTDIR}/opt/puppetlabs/puppet/lib/ruby/vendor_gems }\" > jruby.conf"
- elog "while read LINE; do"
- elog " java -cp puppet-server-release.jar:jruby-9k.jar clojure.main -m puppetlabs.puppetserver.cli.gem --config jruby.conf -- install --no-document --ignore-dependencies \$(echo \$LINE |awk '{print \$1}') --version \$(echo \$LINE |awk '{print \$2}')"
- elog "done < /opt/puppetlabs/server/data/mri-gem-list-no-dependencies.txt"
-}
diff --git a/app-admin/puppetserver/puppetserver-7.0.1.ebuild b/app-admin/puppetserver/puppetserver-7.0.1.ebuild
index 4e99a7c7b7ee..4d5a6144923f 100644
--- a/app-admin/puppetserver/puppetserver-7.0.1.ebuild
+++ b/app-admin/puppetserver/puppetserver-7.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -13,7 +13,7 @@ LICENSE="Apache-2.0"
SLOT="0"
IUSE="puppetdb"
# will need the same keywords as puppet
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
RDEPEND+="
>=virtual/jdk-1.8.0
diff --git a/app-admin/sudo/Manifest b/app-admin/sudo/Manifest
index 4b7882299137..d1f7dc67f9d7 100644
--- a/app-admin/sudo/Manifest
+++ b/app-admin/sudo/Manifest
@@ -3,6 +3,6 @@ DIST sudo-1.9.4p2.tar.gz 3994184 BLAKE2B 110562792fa3d6f3f30fb0f07eefca975f062d4
DIST sudo-1.9.5p1.tar.gz 4008926 BLAKE2B f033a0dcea98d5b038ee310e76cb9f532abc3aa33880e4f606cb9463d5daf231c7697670c68b2829e3f33f687280c15e026ae700dec527a380e26d6e20fc1171 SHA512 0168f0b61a6c2d2f60a92b5b4d3c3254aed4116decabac3821d9ac2fd7f74bb7b019e35bb8955335315b3b00ddf4e4acd82540df0addc1d9bf4f44b60447a878
EBUILD sudo-1.9.3_p1.ebuild 6892 BLAKE2B 3ad32318e45533045e40e7d4ad282b5a218c9531d98dda7a6d92bc0568ee874e020f4497811e7e2dad677d8d14962d2e5aadb014d5d1e01a4559fda16867e39f SHA512 34803aae1dd4a8aaa696b7b4c72d69d9dbe08a25072aac9b8a2a3f9e47eed84a9273c2cc6f1c496477a88b8df74e5587cf8761906970d574ea140fd0a41ca639
EBUILD sudo-1.9.4_p2.ebuild 6901 BLAKE2B 57b94080303df4d32651aab3cd4be8601f59ff13138eb6b8941854255942422d338e47047ff98b1ec9c86863e77f2e1b36901ed001daf715f23b15ae65264709 SHA512 ecb146a12fe3ea3d32ef237e0e67a99d3eadd6ad99997c327eb31027b0f45aa6dbed9dec03ed5c39c62ddd1131762fdc708899e76b2a867416dc0997c1f0727e
-EBUILD sudo-1.9.5_p1.ebuild 6895 BLAKE2B 87a1671fc80d4f1f3076033e2b323247d6463055d006950a85aa534bbf01fefaf81fa1b535f60d527238de376f821932dce6416c3aedb87577992e84a38e8a8c SHA512 8cacd9827c018f527a9553676fcc4a7942d038d1084d0bff80885b122659e31c847758b23aa6d814e5fa5ad352cdbc5837f2b608502bd115d9448d02e437d2af
+EBUILD sudo-1.9.5_p1.ebuild 6893 BLAKE2B 6eaac456d1e9be5b1b0e53674dd0c64a5eb69028275bcf87873ab9ac38a872c6c173c02196fc8e98f23cbfa5aec07904cc058a0c26ddde82ffe32183ae583cf9 SHA512 35b38535c8befd880978aa4c90532adeddbbbe7a3c2310b213c4a680e4e9f787ab1be85bd346923b9d0b9079db0b74c6d2fd6ca8f9112ea878e1c46f427ff58f
EBUILD sudo-9999.ebuild 6901 BLAKE2B 57b94080303df4d32651aab3cd4be8601f59ff13138eb6b8941854255942422d338e47047ff98b1ec9c86863e77f2e1b36901ed001daf715f23b15ae65264709 SHA512 ecb146a12fe3ea3d32ef237e0e67a99d3eadd6ad99997c327eb31027b0f45aa6dbed9dec03ed5c39c62ddd1131762fdc708899e76b2a867416dc0997c1f0727e
MISC metadata.xml 1161 BLAKE2B 0c501bf06edca82993ece857f9f7565f99da15df36c916bc9dc57e78bccf2b247c382e97dd6c97cc7f5375e1a0513c1a30ecbf097516e96319fd1797257fb117 SHA512 d6bc9cf11ea1bd28c19bfe167580556af517d92c958d63cd7872ab5076840eca39a7ab3d1f56e84fc0fcfb675d7a89c23ccdd3629f665c45232be1140eb950ac
diff --git a/app-admin/sudo/sudo-1.9.5_p1.ebuild b/app-admin/sudo/sudo-1.9.5_p1.ebuild
index 4bb085b6b846..53eee6aee832 100644
--- a/app-admin/sudo/sudo-1.9.5_p1.ebuild
+++ b/app-admin/sudo/sudo-1.9.5_p1.ebuild
@@ -22,7 +22,7 @@ else
SRC_URI="https://www.sudo.ws/sudo/dist/${uri_prefix}${MY_P}.tar.gz
ftp://ftp.sudo.ws/pub/sudo/${uri_prefix}${MY_P}.tar.gz"
if [[ ${PV} != *_beta* ]] && [[ ${PV} != *_rc* ]] ; then
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 sparc x86 ~sparc-solaris"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~sparc-solaris"
fi
fi
diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index 7baece80ca2f..983b7579489a 100644
Binary files a/app-arch/Manifest.gz and b/app-arch/Manifest.gz differ
diff --git a/app-arch/gnome-autoar/Manifest b/app-arch/gnome-autoar/Manifest
index 5b6697b697bd..d9503c6c8fe6 100644
--- a/app-arch/gnome-autoar/Manifest
+++ b/app-arch/gnome-autoar/Manifest
@@ -1,3 +1,3 @@
DIST gnome-autoar-0.2.4.tar.xz 294956 BLAKE2B 20e2054f996443f7c3d84d91c41705c8c63df8aea626cb54c17a9cb0c20c7109dc1dba99ad9489d8870674b0a3bbdef23da6ef07684f9c01870d421873d5bed1 SHA512 66750ae30bf9f59820f06653898eb33ac4edbb63976a02d15417118a068abd9292350220713813ddfdd1f2e77db7b3a8f8980f0c70a93d1bb87a9405e013de19
-EBUILD gnome-autoar-0.2.4.ebuild 925 BLAKE2B a7e66b83f20c8b3b4604609b4866b25a24af8b3e537d68343de495c599a459aed5f47872fc3e458544037895ad61e16fa3d8279f9ac5bdcf5a23d57e6fd9b2c4 SHA512 50e55d8d3e08269915270a787abc263ef611e3cc1068dfdbd50b2cfa94f917fbefa93e632fc14a778f28f97f57c886d8e6f386d67efc8c7ae473e2f9d4c26898
+EBUILD gnome-autoar-0.2.4.ebuild 936 BLAKE2B 61b5417dc8c5292b269b05f59cf9262daceb214352b1df56221ae089aa301a5a2ebef88ee30144704bbbe78bdcb2af03590a26ad7f03322468bda3b5b9dca903 SHA512 1bbe09781e0bc2a635eae72fe1cab84091d58aec832b6c2cb943a025753d149ffcc14e70c95aa2e52cb739babaa9f0a6c9b723cc5ccf2ccf8f2e5c8ef38f891c
MISC metadata.xml 464 BLAKE2B 1144e271593c56474f4d7a733d09cb3d4bf042d6db45eaf81942d66e49a8c2a722d15cf8647af88c8406a7661365cded5b3ea9a8e4530d52e0f99cc5c847a1a8 SHA512 2ed7ffd5a60c7f0481868cf0f151ed8a9a097036cab309129a45b6bc5eb5ee21fc276deb3ed262d0309ffe5fcad531f05ef9c7e085e007760a9470878b61bc3c
diff --git a/app-arch/gnome-autoar/gnome-autoar-0.2.4.ebuild b/app-arch/gnome-autoar/gnome-autoar-0.2.4.ebuild
index 136e3777af79..ff4e408cbc94 100644
--- a/app-arch/gnome-autoar/gnome-autoar-0.2.4.ebuild
+++ b/app-arch/gnome-autoar/gnome-autoar-0.2.4.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
VALA_USE_DEPEND="vapigen"
inherit gnome2 vala
@@ -22,7 +22,8 @@ RDEPEND="
gtk? ( >=x11-libs/gtk+-3.2:3[introspection?] )
introspection? ( >=dev-libs/gobject-introspection-1.30.0:= )
"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
>=dev-util/gtk-doc-am-1.14
virtual/pkgconfig
vala? ( $(vala_depend) )
diff --git a/app-arch/wimlib/Manifest b/app-arch/wimlib/Manifest
index ad86435f1467..26104a3deb78 100644
--- a/app-arch/wimlib/Manifest
+++ b/app-arch/wimlib/Manifest
@@ -1,6 +1,6 @@
AUX syslinux-path.patch 713 BLAKE2B 94a9a0ef73b40ad9dc0febf732e5facc24fde0a3138a0298a72f7e2cde6d5fe34560d739432bcd12f172b48763f8deab2288eb14f99470d0a1340d0103941ab2 SHA512 dd0658529fb3b35690d34bb03ae8624314c0b379765566753b1ea0804ef8f1b94f300734b35ce0815e5352b02d09c86c91e371e0c442fcc3dca7ad89ceee4cbe
-DIST wimlib-1.12.0.tar.gz 1014508 BLAKE2B d12f4e0b458fe756b74c67f2f643256c44021e0f0c3e2a3a70eb87647c3c6cabd93413917bf8a8c6ab6820860c407f4454454719227f5cbf1a9a81a7bedc1a6e SHA512 0343b37550366f07fd6a6689f4445f390187beddde677f4d6d831c07936d03b613ae95f612ec7a75e978a5e678f33ab766d0f3b3d942886df56e4ef77d4b07b9
DIST wimlib-1.13.0.tar.gz 1035146 BLAKE2B 305d4bd4a0299c99b537c2bc59c674740239d3fe7c240038f4846849f36046ef587b04643d5a482c876668bf8f9a94a7b45a5e4f12c6d235a579a08c3879acff SHA512 a7ec729dda07b3884a851533a3c9e9db3061d9f6273ec318e40ece3687f4671f66989c07c080fa9cdcf5f01318c5eba7256b58f15f711b3ff14f4eb61c2114cb
-EBUILD wimlib-1.12.0.ebuild 1520 BLAKE2B 2d1eef2fcf1a7c311213a8baf454d0fdbda3dd36805c5b0a20dd0436a872407116bbf2766f426034e0e75d10b4dab36701be2c5d22364b5e5b8bf9daa8f85e63 SHA512 4f3cb589e575403f0a207b1769445137eff7375371f526146be272f28783233245e97f491e4c307de03c1233f31f26d24d4d8e4e90ffa3ca3ea79081e286882a
-EBUILD wimlib-1.13.0.ebuild 1520 BLAKE2B 2d1eef2fcf1a7c311213a8baf454d0fdbda3dd36805c5b0a20dd0436a872407116bbf2766f426034e0e75d10b4dab36701be2c5d22364b5e5b8bf9daa8f85e63 SHA512 4f3cb589e575403f0a207b1769445137eff7375371f526146be272f28783233245e97f491e4c307de03c1233f31f26d24d4d8e4e90ffa3ca3ea79081e286882a
+DIST wimlib-1.13.3.tar.gz 1030667 BLAKE2B 2b897392bed3c4a390479f34925474c229ee835ab624c81a0baa7ebb8f3484f27aa4efb2a440debdcafe23b152b385bbe0f198d6f0560e8f88a34c7328a74edd SHA512 5c6e3bd1d7bda55812c818cc527cd241ac8a15276648f2a307db1f2a858de0b322e9f2beffda5bab991811aee3f4a953c3e31847bfa76a7d32ad5850595a15d4
+EBUILD wimlib-1.13.0.ebuild 1517 BLAKE2B cda0345780c9edff70e7fbe88a4818edcad8e8317f34aade48712359793a333025d7a971019eb9fa45b994b6a09283e0501fda8aa1b05abe57f25722907657e1 SHA512 a6c72ea6ef5884e15f5473eaad6e669da9ab954c8a55915a3b981c2fbe9dc9fc6ac25bf0c31d78618c78cc5d7d869c176a5750dcbf0e594c36b2128d74a8a10b
+EBUILD wimlib-1.13.3.ebuild 1470 BLAKE2B a1f77e6881bb1f850c9002a2ac65bd96c51c4ac0042110677b06aa44be80f1d22abfe908737426390ad2eb5d25b795646c4c9c079310cfa85f67a06ad0967ac5 SHA512 511ed97e28f0adca5eb3322ca181c331ba81194f3c3ceb17ad4200503ef1ef3e533f11e0f5d2419f2a05c733b3d66c9306c1670823bd9f838502e4d797ba400f
MISC metadata.xml 633 BLAKE2B 441e45675abb3671408e44a13ea6ae1738276a598e9e30522e4f58116936ae85a1971f92b2d2c791395abaed09640d2224ccd1ad889a845839212b29222d5cce SHA512 1f7e158976543a9e195330a8cdd5b0f87bae9154d9d01b30bb0e93f900af5410cf35a61e8ea5230b2cf5601717d0a46381febb1375e540da510f95d770e82281
diff --git a/app-arch/wimlib/wimlib-1.13.0.ebuild b/app-arch/wimlib/wimlib-1.13.0.ebuild
index 3fb8e91ab6c9..a6578586e5cf 100644
--- a/app-arch/wimlib/wimlib-1.13.0.ebuild
+++ b/app-arch/wimlib/wimlib-1.13.0.ebuild
@@ -1,17 +1,16 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
inherit autotools pax-utils
if [[ -z ${PV%%*9999} ]]; then
inherit git-r3
EGIT_REPO_URI="git://wimlib.net/${PN}"
else
- inherit vcs-snapshot
MY_PV="${PV/_/-}"
MY_PV="${MY_PV^^}"
- SRC_URI="https://wimlib.net/downloads/${PN}-${MY_PV}.tar.gz -> ${P}.tar.gz"
+ SRC_URI="https://wimlib.net/downloads/${PN}-${MY_PV}.tar.gz"
KEYWORDS="~amd64 ~x86"
fi
@@ -20,28 +19,31 @@ HOMEPAGE="https://wimlib.net/"
LICENSE="|| ( GPL-3+ LGPL-3+ ) CC0-1.0"
SLOT="0"
-IUSE="cpu_flags_x86_ssse3 fuse iso ntfs openssl threads yasm"
+IUSE="cpu_flags_x86_ssse3 fuse iso ntfs openssl test threads yasm"
REQUIRED_USE="cpu_flags_x86_ssse3? ( !openssl )"
-PATCHES=( "${FILESDIR}/syslinux-path.patch" )
+RESTRICT="!test? ( test )"
+BDEPEND="
+ virtual/pkgconfig
+ cpu_flags_x86_ssse3? (
+ yasm? ( dev-lang/yasm )
+ !yasm? ( dev-lang/nasm )
+ )
+"
RDEPEND="
dev-libs/libxml2:2
ntfs? ( sys-fs/ntfs3g )
fuse? ( sys-fs/fuse:0 )
- openssl? ( dev-libs/openssl:0 )
+ openssl? ( dev-libs/openssl:0= )
iso? (
app-arch/cabextract
app-cdr/cdrtools
)
"
-DEPEND="
- ${RDEPEND}
- cpu_flags_x86_ssse3? (
- yasm? ( dev-lang/yasm )
- !yasm? ( dev-lang/nasm )
- )
-"
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}/syslinux-path.patch" )
src_prepare() {
default
@@ -55,15 +57,15 @@ src_configure() {
$(use_enable cpu_flags_x86_ssse3 ssse3-sha1)
$(use_with openssl libcrypto)
$(use_enable threads multithreaded-compression)
+ $(use_enable test test-support)
--disable-static
)
- has test ${FEATURES} && myeconfargs+=( --enable-test-support )
ac_cv_prog_NASM="$(usex yasm yasm nasm)" \
econf "${myeconfargs[@]}"
}
src_compile() {
- emake
+ default
pax-mark m "${S}"/.libs/wimlib-imagex
}
diff --git a/app-arch/wimlib/wimlib-1.12.0.ebuild b/app-arch/wimlib/wimlib-1.13.3.ebuild
similarity index 75%
rename from app-arch/wimlib/wimlib-1.12.0.ebuild
rename to app-arch/wimlib/wimlib-1.13.3.ebuild
index 3fb8e91ab6c9..a6115205d0c9 100644
--- a/app-arch/wimlib/wimlib-1.12.0.ebuild
+++ b/app-arch/wimlib/wimlib-1.13.3.ebuild
@@ -1,17 +1,16 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
inherit autotools pax-utils
if [[ -z ${PV%%*9999} ]]; then
inherit git-r3
EGIT_REPO_URI="git://wimlib.net/${PN}"
else
- inherit vcs-snapshot
MY_PV="${PV/_/-}"
MY_PV="${MY_PV^^}"
- SRC_URI="https://wimlib.net/downloads/${PN}-${MY_PV}.tar.gz -> ${P}.tar.gz"
+ SRC_URI="https://wimlib.net/downloads/${PN}-${MY_PV}.tar.gz"
KEYWORDS="~amd64 ~x86"
fi
@@ -20,28 +19,29 @@ HOMEPAGE="https://wimlib.net/"
LICENSE="|| ( GPL-3+ LGPL-3+ ) CC0-1.0"
SLOT="0"
-IUSE="cpu_flags_x86_ssse3 fuse iso ntfs openssl threads yasm"
+IUSE="cpu_flags_x86_ssse3 fuse iso ntfs openssl test threads yasm"
REQUIRED_USE="cpu_flags_x86_ssse3? ( !openssl )"
-PATCHES=( "${FILESDIR}/syslinux-path.patch" )
+RESTRICT="!test? ( test )"
+BDEPEND="
+ virtual/pkgconfig
+ cpu_flags_x86_ssse3? (
+ yasm? ( dev-lang/yasm )
+ !yasm? ( dev-lang/nasm )
+ )
+"
RDEPEND="
dev-libs/libxml2:2
ntfs? ( sys-fs/ntfs3g )
fuse? ( sys-fs/fuse:0 )
- openssl? ( dev-libs/openssl:0 )
+ openssl? ( dev-libs/openssl:0= )
iso? (
app-arch/cabextract
app-cdr/cdrtools
)
"
-DEPEND="
- ${RDEPEND}
- cpu_flags_x86_ssse3? (
- yasm? ( dev-lang/yasm )
- !yasm? ( dev-lang/nasm )
- )
-"
+DEPEND="${RDEPEND}"
src_prepare() {
default
@@ -55,15 +55,15 @@ src_configure() {
$(use_enable cpu_flags_x86_ssse3 ssse3-sha1)
$(use_with openssl libcrypto)
$(use_enable threads multithreaded-compression)
+ $(use_enable test test-support)
--disable-static
)
- has test ${FEATURES} && myeconfargs+=( --enable-test-support )
ac_cv_prog_NASM="$(usex yasm yasm nasm)" \
econf "${myeconfargs[@]}"
}
src_compile() {
- emake
+ default
pax-mark m "${S}"/.libs/wimlib-imagex
}
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index 6fc5c42e5f0e..edfedc15e984 100644
Binary files a/app-crypt/Manifest.gz and b/app-crypt/Manifest.gz differ
diff --git a/app-crypt/heimdal/Manifest b/app-crypt/heimdal/Manifest
index ab9b9d4581ca..932d6e8a11ea 100644
--- a/app-crypt/heimdal/Manifest
+++ b/app-crypt/heimdal/Manifest
@@ -15,5 +15,5 @@ AUX krb5.conf 424 BLAKE2B 49b8a0aab6e0dacb70b91e030bb5f2b8bdfe4253026f85e2c9d16b
DIST heimdal-7.6.0.tar.gz 10186832 BLAKE2B 456b495a3d0a196cf02d6042c6db72c772327545fbc84f7bb758f55f3fca025432bf319fc33e9e0b5fe5ca78b83aea9dc47d77bf1f5b69ae88f1286a22c41263 SHA512 3f7ce090cf8da91f19675a1d9f6bd65c83b3a847337739481506f09d74001cb44283b103ba684dac8a5f11ec48605b5476240c534f6fc36442fb874b73680200
DIST heimdal-7.7.0.tar.gz 10189293 BLAKE2B db9cdd1861dc9214a7f76b3d8b9656cfc0bad11cb6eadffa4fa29ea7f9aabd4c3d1b628c510644ec9abe1b3bf27a413ccf8cd590d602c4a4ac54ba3deb4cedc4 SHA512 6660939b5a36ce36310721a08a089fb671d1e3d2e8ac74ea4775bfa5f8f772d32de805551456200fe96cc486c092c44beb84f5dd877008bc305490ee971bbf99
EBUILD heimdal-7.6.0.ebuild 4516 BLAKE2B 80a8c18e0e5d93010956cb12ab97439515d70d2b872823fcc3025f8bae14ace57a5c6a58b12456e8b2d3bc193c4248751bcbfef24d01e593ab6a15ee97167ffb SHA512 9748d83779ff348640a87045f4aafdae19566ac734b67d93cb3ac01b5fc28c4d3d777c8f5ff2f1617ddf3b7bbae0d50955f01c5568358534956f77d3a0e903c4
-EBUILD heimdal-7.7.0-r1.ebuild 4513 BLAKE2B 826663b974d14d9d4b2e352b31cdd0ea9254c9e75bdb12b73efdc4d498b38b571c27d75c679ec44bc77ab627dd6669a7912f20dd534504adbd2af69d657617f9 SHA512 f64c95f36ec6c13c77fafddeb51deb7def8c31674f81fbb7794a580497c780cf528bbfd51a509ee6d1efbe4784782268a70323b8f5eb7e9f2d24bb79c4c70ca1
+EBUILD heimdal-7.7.0-r1.ebuild 4512 BLAKE2B 61e6fdb057279892ace57b250421f5940223272c188c95f5f43c5cb95500e5e876786ee13c34ca6bb1241976b2380efeeb7e39195792dff007b5e1bb573ff782 SHA512 30400051d3f7ca797a7be67d741e2dedf32ed5a5c8ae99db27b2ae9df33ea794dc9faee06d24a960856d87832bd4587ccccbb61a12eb2f6f4486e783b19c5a4d
MISC metadata.xml 570 BLAKE2B 827b4e549ff73259b932cc8587625fd9dcd73553d7bee3726baae0d1de8d8e8f8d67fdd649d605099301f426b88fc654341005976a3373d61482c81dec67db5b SHA512 069fa36a8f551ae0fdfd3a6f3dfd6cbfb3bf56c2ceba6ecd5184c4686d885ce5aa83622090f7fa1df44924a7ac3bf63fed4b9b19e70254d2a6d883d483500ad8
diff --git a/app-crypt/heimdal/heimdal-7.7.0-r1.ebuild b/app-crypt/heimdal/heimdal-7.7.0-r1.ebuild
index 0dbea843f386..e4429e9372fa 100644
--- a/app-crypt/heimdal/heimdal-7.7.0-r1.ebuild
+++ b/app-crypt/heimdal/heimdal-7.7.0-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc ~x86"
IUSE="afs +berkdb caps gdbm hdb-ldap libressl +lmdb otp selinux ssl static-libs test X"
RESTRICT="!test? ( test )"
diff --git a/app-doc/Manifest.gz b/app-doc/Manifest.gz
index 880048b6e3ae..8f3c1eff9f24 100644
Binary files a/app-doc/Manifest.gz and b/app-doc/Manifest.gz differ
diff --git a/app-doc/devmanual/Manifest b/app-doc/devmanual/Manifest
index ea0f7a554f54..27a573a4e0a2 100644
--- a/app-doc/devmanual/Manifest
+++ b/app-doc/devmanual/Manifest
@@ -1,5 +1,7 @@
AUX devmanual-eclasses.patch 486 BLAKE2B 7e772ed7386c199c697808137ecf6f999e60ff32f05a89eb0ceeb41b34576d667996fe9b7f7279b87a40bd8c1efbef5415d69be1b0b9f9f0954e813ab890ffa5 SHA512 1f34bf4e0ed105122eb45ad498ddc737774103720cef9a3a30346a16e85173bc8fb38dc9cc1e9bb2d9b902feb167e5df0ff4cb39f62640f4314fe750533f7cf3
DIST devmanual-0_pre20200207.tar.xz 163940 BLAKE2B c6cf856a8f6c80b500466e27cc4106c070cff2dcf8c89d58c9ca90d03cb34a1e6a2048cb99364993f224f3497309fc24207dc44f9c14ece37c49aa602480dac0 SHA512 f6a88312e2030bf4d9fcf64bf1f38397087cb151aa41cd0c254cfc6251e4d5b291e3b361094a7c1d5fdb16e40c1702c0f0b7460ba230bfb217ad733f400c9089
+DIST devmanual-0_pre20210118.tar.xz 165552 BLAKE2B 17b11ab8b5ec31b93fca95c472e7d137157c3d7629b80be26648d5b77f6a6a0709d1a622a079207695fe48cd9d24d48f5ece0a24259106547d84e7c47cb2199b SHA512 2cf40936ab6ee0acda6f71d44d4cbff03ed195688f172d749b32dab9edde005ab9c4ad28d84f7ad01fc82e0fb8a9441cba20c4c7435f21067abf49fe8da739ff
EBUILD devmanual-0_pre20200207.ebuild 1383 BLAKE2B eebc48a0e5a564a72698e7ea71f74729574369bdaa310bb12d83e5d60bc1371e942b35eae13f380d3d8ea359b7f07c85d0db7b1353ca2bf7e8d31441c58afc4e SHA512 98593703f7bbde1da93f43266979c2f59f0b6d5ca4493a738a3dee0a2b0581b6a691615f296da43083266c7bd2555f28bc355b819836ffa08a06671f0ba22017
-EBUILD devmanual-9999.ebuild 1383 BLAKE2B eebc48a0e5a564a72698e7ea71f74729574369bdaa310bb12d83e5d60bc1371e942b35eae13f380d3d8ea359b7f07c85d0db7b1353ca2bf7e8d31441c58afc4e SHA512 98593703f7bbde1da93f43266979c2f59f0b6d5ca4493a738a3dee0a2b0581b6a691615f296da43083266c7bd2555f28bc355b819836ffa08a06671f0ba22017
+EBUILD devmanual-0_pre20210118.ebuild 1478 BLAKE2B 6b78715ac26c53af1ac1160d75bc33c6ce8876464a8c4618a9b49c40f36a58d178ec0ed845ee399795ed983742d33ea211a4051495e6bef19300cceba30992bf SHA512 1ab86abfc466f6ab52d776794b485bc3241b17c29d33b597cba5f0873930240c8a5c3781cf7fed6206758cded44f206e24968b6983ba46a609e82d0ecf1ecad3
+EBUILD devmanual-9999.ebuild 1478 BLAKE2B 6b78715ac26c53af1ac1160d75bc33c6ce8876464a8c4618a9b49c40f36a58d178ec0ed845ee399795ed983742d33ea211a4051495e6bef19300cceba30992bf SHA512 1ab86abfc466f6ab52d776794b485bc3241b17c29d33b597cba5f0873930240c8a5c3781cf7fed6206758cded44f206e24968b6983ba46a609e82d0ecf1ecad3
MISC metadata.xml 481 BLAKE2B b64eb2f74c0558ff3de3269faa64231776ed3fd9fd5c96163d1da0151ac8880b2e81ebc888fe1e3cc05f33b4ac035be168de592c0c52766a54ac011b70b992ca SHA512 6d1031f05b9bf88ae7a9df381c3befcb7b712049fd5cbbf2e1961497d23164e87e47f68fba08b620e9b436a037a7bb5798d42b60e5e4ee5de35fb3e66623b67e
diff --git a/app-doc/devmanual/devmanual-0_pre20210118.ebuild b/app-doc/devmanual/devmanual-0_pre20210118.ebuild
new file mode 100644
index 000000000000..1170493b93eb
--- /dev/null
+++ b/app-doc/devmanual/devmanual-0_pre20210118.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=(python3_{7,8,9})
+
+inherit python-any-r1 readme.gentoo-r1
+
+DESCRIPTION="The Gentoo Development Guide"
+HOMEPAGE="https://devmanual.gentoo.org/"
+
+if [[ ${PV} == *9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/devmanual.git"
+else
+ # "make dist" in devmanual repo
+ SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
+ S="${WORKDIR}/${PN}"
+ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos"
+fi
+
+LICENSE="CC-BY-SA-4.0"
+SLOT="0"
+IUSE="+offline"
+
+BDEPEND="dev-libs/libxml2
+ dev-libs/libxslt
+ gnome-base/librsvg
+ media-fonts/open-sans
+ ${PYTHON_DEPS}"
+
+PATCHES=( "${FILESDIR}"/${PN}-eclasses.patch )
+
+src_compile() {
+ emake OFFLINE=$(usex offline 1 0)
+}
+
+src_install() {
+ emake OFFLINE=$(usex offline 1 0) \
+ DESTDIR="${D}" \
+ htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
+ install
+
+ local DOC_CONTENTS="In order to browse the Gentoo Development Guide in
+ offline mode, point your browser to the following url:
+ file://${EPREFIX}/usr/share/doc/${PF}/html/index.html"
+ if ! has_version app-doc/eclass-manpages; then
+ DOC_CONTENTS+="\\n\\nThe offline version of the devmanual does not
+ include the documentation for the eclasses. If you need it,
+ then emerge app-doc/eclass-manpages."
+ fi
+ readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+ readme.gentoo_print_elog
+}
diff --git a/app-doc/devmanual/devmanual-9999.ebuild b/app-doc/devmanual/devmanual-9999.ebuild
index fdaf6ddcf5de..1170493b93eb 100644
--- a/app-doc/devmanual/devmanual-9999.ebuild
+++ b/app-doc/devmanual/devmanual-9999.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
+PYTHON_COMPAT=(python3_{7,8,9})
-inherit readme.gentoo-r1
+inherit python-any-r1 readme.gentoo-r1
DESCRIPTION="The Gentoo Development Guide"
HOMEPAGE="https://devmanual.gentoo.org/"
@@ -12,6 +13,7 @@ if [[ ${PV} == *9999 ]]; then
inherit git-r3
EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/devmanual.git"
else
+ # "make dist" in devmanual repo
SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
S="${WORKDIR}/${PN}"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos"
@@ -24,7 +26,8 @@ IUSE="+offline"
BDEPEND="dev-libs/libxml2
dev-libs/libxslt
gnome-base/librsvg
- media-fonts/open-sans"
+ media-fonts/open-sans
+ ${PYTHON_DEPS}"
PATCHES=( "${FILESDIR}"/${PN}-eclasses.patch )
diff --git a/app-doc/doxygen/Manifest b/app-doc/doxygen/Manifest
index 6edc3e7982f7..ce7a9c1db03e 100644
--- a/app-doc/doxygen/Manifest
+++ b/app-doc/doxygen/Manifest
@@ -1,4 +1,3 @@
-AUX doxygen-1.8.12-link_with_pthread.patch 1078 BLAKE2B bcf05d8e2c56e4c5a026ea8e8662e247aa48fb4c3ffeb2a26799ae98f1bbd1a9f9cfc55bcad4b9d254d6067fce8e51990ab9cecfcfa6fa9b1a9861c085525966 SHA512 01173974a66a4b6214f6506f9f9009da2ae3ee1b6f424763dfc2b1ce96293e71b463b1afb4c6ccdeac299c66132bbf6d3ee7fe543f1251ff429107f8b4017831
AUX doxygen-1.8.15-llvm7.patch 495 BLAKE2B 937de77966f8f7239469d02a442b7438c4de759b8f162d1ff2b6cee2c3b5097894c7ed2d14454e0051cfe707aa26605a0551da7ff1e69a608e171ce22adb5b7c SHA512 9dced7f1399a12a4e943f3d3353c771033e66eec11d102483909f16ffe2fded2e766362059a20198e325755f01751d419c5dccdb2f5a5c807bb7b4d3b73cd0bf
AUX doxygen-1.8.16-link_with_pthread.patch 691 BLAKE2B c6ced2c6aeb199d7f8ad39f39a90747d886e0841103a27d105fc40242fbb5dd289a3ff640203fe1d97bb51fdd559bb94dfddf4e2364d4bc630d861c75ff079f0 SHA512 5b23cc35faf571229b9ff7f1dd4745ade10d5ef0935d1ac9455e0036517ec3e038aacd1a565604f1621aa2c42584240939269777321993b02645334ca7dd18fa
AUX doxygen-1.8.17-ensure_static_support_libraries.patch 817 BLAKE2B 085e2c853e10b22f1be38bd85abb3f33b3cefd4fdb565b244626785d6e54972404638c956c9f03b06022184e8308c1b1b4715f5ef83a8cf34b9a7b938e951152 SHA512 bc076b02f5f9d2886d25ac2f1800475990542e956b59afedea2dfadb262bdb317a44f91b47fbd8cd27f77476e215629aeaf1d03a9cbf24f1aafa822a382bb05c
diff --git a/app-doc/doxygen/files/doxygen-1.8.12-link_with_pthread.patch b/app-doc/doxygen/files/doxygen-1.8.12-link_with_pthread.patch
deleted file mode 100644
index cdc630c4d42b..000000000000
--- a/app-doc/doxygen/files/doxygen-1.8.12-link_with_pthread.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff --git a/addon/doxysearch/CMakeLists.txt b/addon/doxysearch/CMakeLists.txt
-index 33e01c1..165fc3e 100644
---- a/addon/doxysearch/CMakeLists.txt
-+++ b/addon/doxysearch/CMakeLists.txt
-@@ -20,6 +20,7 @@ target_link_libraries(doxyindexer
- ${ZLIB_LIBRARIES}
- ${WIN_EXTRA_LIBS}
- qtools
-+ pthread
- )
-
- add_executable(doxysearch.cgi
-@@ -29,6 +30,7 @@ target_link_libraries(doxysearch.cgi
- ${XAPIAN_LIBRARIES}
- ${ZLIB_LIBRARIES}
- ${WIN_EXTRA_LIBS}
-+ pthread
- )
-
- install(TARGETS doxyindexer doxysearch.cgi DESTINATION bin)
-diff --git a/addon/doxywizard/CMakeLists.txt b/addon/doxywizard/CMakeLists.txt
-index bf2eda8..8eb2a1c 100644
---- a/addon/doxywizard/CMakeLists.txt
-+++ b/addon/doxywizard/CMakeLists.txt
-@@ -109,6 +109,7 @@ ${doxywizard_RESOURCES_RCC}
- qt_use_modules(doxywizard Core Gui Widgets Xml)
- target_link_libraries(doxywizard
- ${QT_LIBRARIES} ${QT_QTMAIN_LIBRARY}
-+pthread
- )
-
- install(TARGETS doxywizard DESTINATION bin)
diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index d9468b93e733..9d84a90a7f5c 100644
Binary files a/app-editors/Manifest.gz and b/app-editors/Manifest.gz differ
diff --git a/app-editors/neovim/Manifest b/app-editors/neovim/Manifest
index 80e46bf1a58c..2c768a9692f1 100644
--- a/app-editors/neovim/Manifest
+++ b/app-editors/neovim/Manifest
@@ -1,10 +1,11 @@
AUX neovim-0.4.3-gcc-10-fix.patch 7417 BLAKE2B 5632a2427337e7b4d1b793381a074d2d7f0822aecb99a83123e8ec4fa4a35a975816a4854d2b596ae1aa63ecb876399c843454b6bd12b759889384d49fb8f0bf SHA512 e29c65e8075972e44ab056fd721208c62d77591a91cc12987bc07339bb2f6373cbf308719d9fa3f7919ec064112475993af64572fad851152da2fc8f0f39d2a4
+AUX neovim-0.4.4-cmake-release-type.patch 627 BLAKE2B 87c6e6fd487b923ec4146f2cb38a9a30be00ffa7b9d0a41b43f17d4f79860e4f097b76e093af474dfe20538332a7c6f233ebd57d845a74d7a8aead9cae2fec76 SHA512 b236c0b703ec2763a1179149715fa241573803a27dcb05324e2f766f49aaf53dfe0efc62f1c10aa6d58333ce115835e852608778d9582689550fb537103f361a
AUX neovim-0.4.4-cmake_lua_version.patch 419 BLAKE2B 73477d7fdc2705f2e93cd6dd355ea01fbfc232306e86a13097a1c069ea3248972be9d4da7b175c8c3c7e0fde7581d4ed9b431d73c119e9f8a63a7a15007aba31 SHA512 a1be27ebd18be34fede632f695bacf65699e9dd1a8b219120372b5e0c48691f595ba42725c4f795456b8018d668f471e3a042622a5f541af50c84a089d53c83c
AUX sysinit.vim 3408 BLAKE2B 50da5ecb83fb38af20d484dbc5f3e417efc083cde339070b07ff4c2fa4ebd080189f975478d82fa977bc763d5e8d7f29c7703a515ecf6fff62772be4ef160170 SHA512 79b574ef42fbdd9c7fe26cffb1fadea3c31becf22f4be441acbdc75068a00f809a23f3a886e1cb6e30bb92c780bd04aea7b94f655f5c9f0d10c547fb10dd6e8a
DIST neovim-0.4.3.tar.gz 9556199 BLAKE2B 831f4d4950f4fa2cd9c7393824bbb5eb571ae5759d13af9f320e0fa351fa155413a5be580f010f2c7ab43ca7bc10c569ccf6e3ba29efc7f5a035576b030b216d SHA512 e13853fa296eda8618f389c71b6cbbd6f01d561615e80cc92959131dd10e395b1c6732a7d9ef6dbb9fe3ea9da4c11485b464547e2d46b22e59b8a20214e861f5
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 2679 BLAKE2B 279e5e67204abb5c6cba110bc4f4804beea30cbdc06a125bdd0cd687dc6a9f4799ae9094d23131aa40d1471d990458348a6bbaf82fc4a04ea2e6c9acf9212255 SHA512 d1c0a5f59d4c9bdb3aee23434696d16e62b144bf105c873eaec7cc9b271b2eb66009f3b30f14d85d9deb18e75f69e224d1a8ebf0ebbe4dd7487f16709531a4cc
-EBUILD neovim-0.4.4.ebuild 2347 BLAKE2B 9684c3b66c5f8c69c495f7a14fe4222def4c8b574866e5e1d5575d953659e7e08a8dc6c7d6a56b7754a44eae1be9d108b3daedb49f35a13e360c065f7741d7c5 SHA512 bae47cc54f45ef5e1ed7d394bdf8f04e7b226265956b534fcd39509c50a4be91ba997c0c75bdf429a85bbcc1073113f2bae29482668f0440c1b6eb25d16a51b8
-EBUILD neovim-9999.ebuild 2727 BLAKE2B 2493704ce40bc751c4e6b1c27540943fcae117fb9386237684ff8dfd0376ed5975b17ecb847f97af8c0440f9b53498ea54e3fc1b272ad88968691c2d9378c801 SHA512 972ebef3d1cb7843b9f6252e8e011084c68d71a6cf94f3ced165dea16835a03f17a925b86e24ed66eb83bcb1f35847c37d839ea8d43a0d1022fb95d29e5f1ff6
+EBUILD neovim-0.4.4-r100.ebuild 2731 BLAKE2B 4c77f2e8204ceff784448cce89645c8711e29b79ea3941a17610a7deab9ac40a4b2107749305e3bef45181954345ea0eb9395b63fc4212db677f6ecd41a66c39 SHA512 392c56339bfef9d744ba9c6447fe9f456b109c4ddbe28726132afd4da19d9dbd9fd17026ff1396a7d59f65f4ee17ef78c1c605a38db92bcaf9ebf1a72a576686
+EBUILD neovim-0.4.4.ebuild 2412 BLAKE2B aec8572ee84bc68d99cbe3d1885f5998ac1198e92f4fb06c3eaeed6ad24fe134d1a0b47ab383f1b8b765e146525189fd63a7f5ab191365c1f39d4b462ed00f1b SHA512 f22853bb06156c3d096587736856a8a121c2bcf6359b8e7e0a74269805b6c0ed6fe7c73d7ed13e76f4310142b7724a7c2607a30500b65c745dd4d656a0d66ad9
+EBUILD neovim-9999.ebuild 2779 BLAKE2B a629bad5945a0054fc56eb28c759e80c39ff44735bc0ef48edf50238fa6a891789324303c8fb27709efe71056763b987a12c907c62736b197b59c9fd55afb2fb SHA512 87f6afbf6d9ca151a8019761f53d9bd9137ecc0943adc7a875ed019134dc772794f64419fd959198ecbb1ea81a978368e92d20f4015d96be7c24fc030a5f25bd
MISC metadata.xml 535 BLAKE2B 7cebdc1b7adafafdcc2fe266f8696ad0dff927e8a9383ee34ac66e2c8910d3863d1f7603f2a82dec75f586ab22814d7268475ae3ce02fc3dca12a665e1e8ce5e SHA512 71fcf593a1b9587e6af0e30e851fb17e8552568a4e8bd38341c150ada7dbf72f962250f3306403c0be2d334932f63fe183850efe1c67d515ba79577cdf7aa561
diff --git a/app-editors/neovim/files/neovim-0.4.4-cmake-release-type.patch b/app-editors/neovim/files/neovim-0.4.4-cmake-release-type.patch
new file mode 100644
index 000000000000..2c9c80a7a690
--- /dev/null
+++ b/app-editors/neovim/files/neovim-0.4.4-cmake-release-type.patch
@@ -0,0 +1,13 @@
+Ensure that :checkhealth is happy with the Gentoo build type.
+https://bugs.gentoo.org/757744
+--- a/runtime/autoload/health/nvim.vim
++++ b/runtime/autoload/health/nvim.vim
+@@ -118,7 +118,7 @@ function! s:check_performance() abort
+ let buildtype = matchstr(execute('version'), '\v\cbuild type:?\s*[^\n\r\t ]+')
+ if empty(buildtype)
+ call health#report_error('failed to get build type from :version')
+- elseif buildtype =~# '\v(MinSizeRel|Release|RelWithDebInfo)'
++ elseif buildtype =~# '\v(MinSizeRel|Release|RelWithDebInfo|Gentoo)'
+ call health#report_ok(buildtype)
+ else
+ call health#report_info(buildtype)
diff --git a/app-editors/neovim/neovim-0.4.4-r100.ebuild b/app-editors/neovim/neovim-0.4.4-r100.ebuild
index 8cd8499a6fa2..2fdf25560fce 100644
--- a/app-editors/neovim/neovim-0.4.4-r100.ebuild
+++ b/app-editors/neovim/neovim-0.4.4-r100.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -61,7 +61,8 @@ RDEPEND="
"
PATCHES=(
- "${FILESDIR}"/${PN}-0.4.4-cmake_lua_version.patch
+ "${FILESDIR}/${PN}-0.4.4-cmake_lua_version.patch"
+ "${FILESDIR}/${PN}-0.4.4-cmake-release-type.patch"
)
src_prepare() {
diff --git a/app-editors/neovim/neovim-0.4.4.ebuild b/app-editors/neovim/neovim-0.4.4.ebuild
index 2b8b289784e9..b9f0be5d76b6 100644
--- a/app-editors/neovim/neovim-0.4.4.ebuild
+++ b/app-editors/neovim/neovim-0.4.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -55,6 +55,10 @@ RDEPEND="
app-eselect/eselect-vi
"
+PATCHES=(
+ "${FILESDIR}/${PN}-0.4.4-cmake-release-type.patch"
+)
+
src_prepare() {
# use our system vim dir
sed -e "/^# define SYS_VIMRC_FILE/s|\$VIM|${EPREFIX}/etc/vim|" \
diff --git a/app-editors/neovim/neovim-9999.ebuild b/app-editors/neovim/neovim-9999.ebuild
index d10ac87a1704..0663ee9e4715 100644
--- a/app-editors/neovim/neovim-9999.ebuild
+++ b/app-editors/neovim/neovim-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -63,7 +63,8 @@ RDEPEND="
"
PATCHES=(
- "${FILESDIR}"/${PN}-0.4.4-cmake_lua_version.patch
+ "${FILESDIR}/${PN}-0.4.4-cmake_lua_version.patch"
+ "${FILESDIR}/${PN}-0.4.4-cmake-release-type.patch"
)
src_prepare() {
diff --git a/app-editors/xmlcopyeditor/Manifest b/app-editors/xmlcopyeditor/Manifest
index 6a4f0141b036..875e7e159f03 100644
--- a/app-editors/xmlcopyeditor/Manifest
+++ b/app-editors/xmlcopyeditor/Manifest
@@ -1,4 +1,4 @@
AUX xmlcopyeditor-1.2.1.3-no-automagic-enchant.patch 597 BLAKE2B fe33a2ca16954fbfad90b19edb6c9e161fda4fc26650a4cccbe717bc23143dc54fe5689b83e135f16d1e3fc57c8794eb01e2760db927917fd1f858140d712d5b SHA512 e859277afe276a2e358a011a7c1a9d61e554463ebbe79985bcc159b49495eec076f24595b3b43ae3a3210797f59a92b9944f1a59754556a8322a9ec1d0d5d7d3
DIST xmlcopyeditor-1.2.1.3.tar.gz 4266907 BLAKE2B 52e8c27a37edbcc0da46b52443f5b6754252a62f1abb7746e724270dd5cd9a2db4de60e68d495008ef55a18e9c25149825c9b26c5fd6e20d8e3937931de64e74 SHA512 1adda58bc262cd22898ba22eed3cad9f4a51f199e779172af2d51c5d7bf6dac072b9015b90906236de83d7acebe29d0aae6ae73998ec9d9b3c58b02f081e0b4d
-EBUILD xmlcopyeditor-1.2.1.3-r1.ebuild 939 BLAKE2B 5e934e0f17669e683316bbe9534e28b33e747f3db4ea9f0d84b1fb96eb2d2c663022f42c4a68539c5827796ad5cf1dfe6eff8bf22ba4a5f023d924f2ae5a435f SHA512 4c8c6e13755ba3064063aae517368f5016061b2f56d65f0fc59a97bc1b8549253c46fec1462c2c4dafe4125fc8829e10fc72a6aa7725c4624e2a0855211e89db
+EBUILD xmlcopyeditor-1.2.1.3-r1.ebuild 882 BLAKE2B 352b538f0637fbdec5efd8c34029b25f9c74b05c6ca20363e5a03a48ab80ba7042c037bf3dd291708157d4426249932e3e3243d4fe409009db8f25423537a025 SHA512 94ece0feba37eb20e255e9305de6925b615b340e1d98c9cc071590a81e85b53e9a0d178aff2350ad7fab52c59bbf64c1c57dd4a2b403b9f9fd9f3b3dfba2e192
MISC metadata.xml 250 BLAKE2B 113a0d77e4ddd91ae5487bc89371d2973202f242a3c9a8899725295e62b51c0a64437ab158b40ba410c671f92fe3efb896b1446f7301e1f1e923baece1cb7e04 SHA512 20703a39d4150e2a8984fdaeb997da464e98e6abc363e5e07fee46954d5af19c861e40648fb238b763420349e3ebeaa4bf61a621ccff3ff77d6e629c61095bb0
diff --git a/app-editors/xmlcopyeditor/xmlcopyeditor-1.2.1.3-r1.ebuild b/app-editors/xmlcopyeditor/xmlcopyeditor-1.2.1.3-r1.ebuild
index df844c1b0b70..08f5b2c7e7a9 100644
--- a/app-editors/xmlcopyeditor/xmlcopyeditor-1.2.1.3-r1.ebuild
+++ b/app-editors/xmlcopyeditor/xmlcopyeditor-1.2.1.3-r1.ebuild
@@ -21,8 +21,7 @@ RDEPEND="
dev-libs/libxslt
dev-libs/xerces-c[icu]
dev-libs/libpcre
- !aqua? ( x11-libs/wxGTK:${WX_GTK_VER}[X] )
- aqua? ( x11-libs/wxGTK:${WX_GTK_VER}[aqua] )
+ x11-libs/wxGTK:${WX_GTK_VER}[X]
"
DEPEND="${RDEPEND}
dev-libs/boost
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index 72647718ceab..09341481b0c1 100644
Binary files a/app-emulation/Manifest.gz and b/app-emulation/Manifest.gz differ
diff --git a/app-emulation/cri-o/Manifest b/app-emulation/cri-o/Manifest
index 8d5399a58bbb..665b34d222d7 100644
--- a/app-emulation/cri-o/Manifest
+++ b/app-emulation/cri-o/Manifest
@@ -3,7 +3,7 @@ AUX crio.initd 846 BLAKE2B 844400d3cd706d4f78616edb3c8a50a9819ee21aecc7fc33f7d3d
DIST cri-o-1.17.1.tar.gz 10532728 BLAKE2B 12747b0161ca2fa7dc7e95fd4c000b9011402e65dac0885ed59a37a87b53907044d3b3c873d6fe82186313af6745e463ce84be259dae99793c6363794c76e16f SHA512 1548c4b20081e8f1af772b0b0fadd0f1b63af641283bef8b8cd8478bd626699c23b30b39fe460660776bc7e6509e85db73d1d7e0d030dd7bd3dbfe319c82e332
DIST cri-o-1.18.3.tar.gz 11210469 BLAKE2B 16a9ed89c594c082e18d5a08ba1f87eaed600b95baed1e36c5b718e9dbaf52c7b482dbf6dba94a1cbc5e02f3dc58f0f21236b6b11c65fa60666d654e28c793fd SHA512 28798d0a46a9fe361fa2e57f350375abe2a66b955447d667a0a51b39034d73f98abf06371ccf5ea27dfcad38dc46907a2fe9583b94c9a0092ad18b2485b12640
DIST cri-o-1.19.0.tar.gz 13383665 BLAKE2B 8288985392a08fb7fdc58f509d34f8814bf9670386b7aae42be349765cb1f3bd3f4b77077e9c282a4a25b0f99b8a8fc335c6a53053bd2575b3e23c225483a1d3 SHA512 15b506d755be735d7b71e503b02b309693e3090be41f5790bd34cec460238eab56829239caf18849f3656cf8c12f77a10bbb3ae4ad81eb4e18858946e454583d
-EBUILD cri-o-1.17.1.ebuild 2547 BLAKE2B be9c8bd54a3cdfd9b9d8ba11aa58b23d26c7c58fbbb1430af0844a8356397e418972c08210f664c2c52c10529712e40f7a1a7e1dec12ae1f15c0750a6adf3d9c SHA512 02c7d53cc10c501849bf0bef5d523ab3a746f7e8c0888d732a5427dc7e5edcfacd076e93bbedb444bcb999017ed2bbbc1ad805dbbc6ae9c2458d649ef56e6668
-EBUILD cri-o-1.18.3.ebuild 2554 BLAKE2B 63fdb098fe0a0e7c73f237b7c99a6c27c1789baf6f774a791111e65a2065ec9efdb6478b79ed9dfba09aac92e0f7b0b40ea31fb497bfbb2fb8401ccb6b38218c SHA512 bd235d9e5df620783f9a40c2ff4799a4e36e948337beaae8ac104d3895b837bff4300de69bed2261bbdb32cb84960fb3e2509a1c67ec451621a4681304a9bd38
-EBUILD cri-o-1.19.0.ebuild 2554 BLAKE2B f4b09cf209c0e11b96fb2b92c1e5b969bf98a9a516039b714e455844b49f3857d153abf9c61bafc1c11a7e2be5743f7ec306e5f1ab2cebca681f4ca1ee139231 SHA512 cbd5d4071ddc0fc792e39d9585387e797fbca5426101ed1c324f2bc9abef5be52c259405f3f9814a665c5eeaccb3991358eed5beae0d6f82bfd15900751cf009
+EBUILD cri-o-1.17.1.ebuild 2547 BLAKE2B 058beea5699dedd3e3ac67e8f8daf49e0a296e3a4d39796a58acb682e069cb3f6ee9cf07983e6e73ce65229110161b9a0dc90b4bf0e16d7a897c78d409d3c8f9 SHA512 6156f187e9aaa7260bb23291bb75bd8dbbc5aacf7b246d3d41d09430e8f32ad5824f6ccdb09d4a4434b989da7e96787ea137a1354e57f84577190324d9b4e925
+EBUILD cri-o-1.18.3.ebuild 2554 BLAKE2B 55b0d28f984fb6f728f857af2fb521ee7688ed32d8056900e676ee830b374fcda0ee65527046ab219f54f2a1100f6798d60c8625bb6ffad8077f65218e462681 SHA512 01bdcb4cd4df9f930e061ecdfc49404e8dc89069298a4645350d7adcc3ed17e8a755de0fd452ff60ba88cb1072567e8f398eda13a04de33e73340a7c2fb4b935
+EBUILD cri-o-1.19.0.ebuild 2554 BLAKE2B 83f2cf2229adfde49dbeea1327918952e0ebeb6a6017396470738aeb75ed1ea86b2b09f2ba3346ae96e9b116b1b2117a12416c9e18651f96a59fe3fa51bdd454 SHA512 96428fdcda12d1f7952ae5fc9bd7300868bed91853477e7f3102045e5350e56f7531e1ac1ce6837e44ef51e19e14b3d6fb7402e719287810ad125748e19ab837
MISC metadata.xml 907 BLAKE2B 60c92eb3aee1637dc4788228248ede35df42e6f2b82049c2a90c884c8cf676c18ed742c9935727b55c89c811e30f6eaee233cf65b6b0ebe61e86d7a3d6b842a8 SHA512 70fe7eb62159634ed9b6fe70f9c357e66979f5fca6eeb3103c0609fd6565709bf172b7d53d4ade9df89960e40538ce19434902449baa0ee6680e788dd2262b0a
diff --git a/app-emulation/cri-o/cri-o-1.17.1.ebuild b/app-emulation/cri-o/cri-o-1.17.1.ebuild
index f8d6d2c59f40..d528603cf524 100644
--- a/app-emulation/cri-o/cri-o-1.17.1.ebuild
+++ b/app-emulation/cri-o/cri-o-1.17.1.ebuild
@@ -36,7 +36,7 @@ COMMON_DEPEND="
DEPEND="
${COMMON_DEPEND}"
RDEPEND="${COMMON_DEPEND}
- ! ${MY_P}.tar.gz"
-LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0"
-SLOT="0"
-
-KEYWORDS="~amd64 ~arm64"
-IUSE="apparmor btrfs +fuse +rootless selinux"
-RESTRICT="test"
-
-COMMON_DEPEND="
- app-crypt/gpgme:=
- >=app-emulation/conmon-2.0.0
- || ( >=app-emulation/runc-1.0.0_rc6 app-emulation/crun )
- dev-libs/libassuan:=
- dev-libs/libgpg-error:=
- >=net-misc/cni-plugins-0.8.6
- sys-fs/lvm2
- sys-libs/libseccomp:=
-
- apparmor? ( sys-libs/libapparmor )
- btrfs? ( sys-fs/btrfs-progs )
- rootless? ( app-emulation/slirp4netns )
- selinux? ( sys-libs/libselinux:= )
-"
-DEPEND="
- ${COMMON_DEPEND}
- dev-go/go-md2man"
-RDEPEND="${COMMON_DEPEND}
- fuse? ( sys-fs/fuse-overlayfs )"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
- default
-
- # Disable installation of python modules here, since those are
- # installed by separate ebuilds.
- local makefile_sed_args=(
- -e '/^GIT_.*/d'
- -e 's/$(GO) build/$(GO) build -v -work -x/'
- -e 's/^\(install:.*\) install\.python$/\1/'
- -e 's|^pkg/varlink/iopodman.go: .gopathok pkg/varlink/io.podman.varlink$|pkg/varlink/iopodman.go: pkg/varlink/io.podman.varlink|'
- )
-
- has_version -b '>=dev-lang/go-1.13.9' || makefile_sed_args+=(-e 's:GO111MODULE=off:GO111MODULE=on:')
-
- sed "${makefile_sed_args[@]}" -i Makefile || die
-
- sed -e 's|OUTPUT="${CIRRUS_TAG:.*|OUTPUT='v${PV}'|' \
- -i hack/get_release_info.sh || die
-}
-
-src_compile() {
- # Filter unsupported linker flags
- filter-flags '-Wl,*'
-
- [[ -f hack/apparmor_tag.sh ]] || die
- if use apparmor; then
- echo -e "#!/bin/sh\necho apparmor" > hack/apparmor_tag.sh || die
- else
- echo -e "#!/bin/sh\ntrue" > hack/apparmor_tag.sh || die
- fi
-
- [[ -f hack/btrfs_installed_tag.sh ]] || die
- if use btrfs; then
- echo -e "#!/bin/sh\ntrue" > hack/btrfs_installed_tag.sh || die
- else
- echo -e "#!/bin/sh\necho exclude_graphdriver_btrfs" > \
- hack/btrfs_installed_tag.sh || die
- fi
-
- [[ -f hack/selinux_tag.sh ]] || die
- if use selinux; then
- echo -e "#!/bin/sh\necho selinux" > hack/selinux_tag.sh || die
- else
- echo -e "#!/bin/sh\ntrue" > hack/selinux_tag.sh || die
- fi
-
- # Avoid this error when generating pkg/varlink/iopodman.go:
- # cannot find package "github.com/varlink/go/varlink/idl"
- mkdir -p _output || die
- ln -snf ../vendor _output/src || die
- GO111MODULE=off GOPATH=${PWD}/_output go generate ./pkg/varlink/... || die
- rm _output/src || die
-
- export -n GOCACHE GOPATH XDG_CACHE_HOME
- GOBIN="${S}/bin" \
- emake all \
- GIT_BRANCH=master \
- GIT_BRANCH_CLEAN=master \
- COMMIT_NO="${EGIT_COMMIT}" \
- GIT_COMMIT="${EGIT_COMMIT}"
-}
-
-src_install() {
- emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
-
- insinto /etc/containers
- newins test/registries.conf registries.conf.example
- newins test/policy.json policy.json.example
-
- insinto /usr/share/containers
- doins vendor/github.com/containers/common/pkg/seccomp/seccomp.json
-
- newinitd "${FILESDIR}"/podman.initd podman
-
- insinto /etc/logrotate.d
- newins "${FILESDIR}/podman.logrotated" podman
-
- dobashcomp completions/bash/*
-
- keepdir /var/lib/containers
-}
-
-pkg_preinst() {
- LIBPOD_ROOTLESS_UPGRADE=false
- if use rootless; then
- has_version 'app-emulation/libpod[rootless]' || LIBPOD_ROOTLESS_UPGRADE=true
- fi
-}
-
-pkg_postinst() {
- local want_newline=false
- if [[ ! ( -e ${EROOT%/*}/etc/containers/policy.json && -e ${EROOT%/*}/etc/containers/registries.conf ) ]]; then
- elog "You need to create the following config files:"
- elog "/etc/containers/registries.conf"
- elog "/etc/containers/policy.json"
- elog "To copy over default examples, use:"
- elog "cp /etc/containers/registries.conf{.example,}"
- elog "cp /etc/containers/policy.json{.example,}"
- want_newline=true
- fi
- if [[ ${LIBPOD_ROOTLESS_UPGRADE} == true ]] ; then
- ${want_newline} && elog ""
- elog "For rootless operation, you need to configure subuid/subgid"
- elog "for user running podman. In case subuid/subgid has only been"
- elog "configured for root, run:"
- elog "usermod --add-subuids 1065536-1131071 "
- elog "usermod --add-subgids 1065536-1131071 "
- want_newline=true
- fi
-}
diff --git a/app-emulation/podman/Manifest b/app-emulation/podman/Manifest
new file mode 100644
index 000000000000..afbe959f9e03
--- /dev/null
+++ b/app-emulation/podman/Manifest
@@ -0,0 +1,5 @@
+AUX podman.initd 566 BLAKE2B ccfedaea85b03a09446b678460d53591e62a9d8a1c205bd850fd95b4ce0ed47ebf767830fb9d30d32f1c0a4a1868eeb83c2c7deaef1617c0e6e91899807f0c36 SHA512 561c72d71827e523ab177b38961e38a594a14da8c6f0490d5743f35f4d02f4d813b43d9b3a66dd1aa72701c7d9a88ac6bb3a8435e72afcfa23289cce460bdb04
+AUX podman.logrotated 85 BLAKE2B 730899f93ee354e476629276b69224cfeaaa1603b6690cac3c0cd905cd75add19179f99e26f29edbd963d5f44c38a3a2db0b5a3613dc665ab801654eac13dc2e SHA512 0136d063b15b07c41a9370ba1845c4f368ec46a7a30683b7ff7cbb0b12e5b2711c9a45329f5102af6a969e562edcec006a8de9055e43e1caf9395847d0c5ec45
+DIST podman-2.2.1.tar.gz 9653842 BLAKE2B 4e86903fc8fb51b9b1aa2b46704c1828b4ea11b738eccf198260c678b175e0a8699120e0280a2803f7898c9b28040a75d489ccd09ebd9c1f45d10a86e2a26c8f SHA512 4c6eda9320daf18b5f0e892c0f3019a5658d983936c25a195bcb1fbc28c18a9a65e87043faddeb47e9f62c9b445efc2906a2b7ccedca877941fadb21b1b68367
+EBUILD podman-2.2.1.ebuild 4586 BLAKE2B d79d7aa66ba47059961756df95d9395f2274c777f44200b5b14356d635c2ca4ceabc5c93c088e01e2cf698fffc59a3327ae60697f0f6054d96fb94604aea05d6 SHA512 226474f8b948c6bb9e69d1ea6cde5fa41b076bb012fc9f3fe8092c8e6380d9cd074c529095310a86cc06732939163d0e3befba82d7bb6ce2885d468e77cac0ca
+MISC metadata.xml 1160 BLAKE2B d56944aa9a0b3793aa581ea68233ec7b29c7caec3042aae9985d1b228e5ba205a7a631c61d31cef923e38714c934fbaf3202d5a8cf260b78f78fafe81730870e SHA512 0b1e63e5cad075899045c876d6dc93638eb36afd01fb7acef59b59c6795d767f250926cf77789f159481a7efdde09848d2a63fb7452d28ff250146d16a289064
diff --git a/app-emulation/libpod/files/podman.initd b/app-emulation/podman/files/podman.initd
similarity index 100%
rename from app-emulation/libpod/files/podman.initd
rename to app-emulation/podman/files/podman.initd
diff --git a/app-emulation/libpod/files/podman.logrotated b/app-emulation/podman/files/podman.logrotated
similarity index 100%
rename from app-emulation/libpod/files/podman.logrotated
rename to app-emulation/podman/files/podman.logrotated
diff --git a/app-emulation/libpod/metadata.xml b/app-emulation/podman/metadata.xml
similarity index 62%
rename from app-emulation/libpod/metadata.xml
rename to app-emulation/podman/metadata.xml
index 8b673ef7a51a..64831477a766 100644
--- a/app-emulation/libpod/metadata.xml
+++ b/app-emulation/podman/metadata.xml
@@ -6,10 +6,13 @@
Zac Medico
- libpod provides a library for applications looking to use the
- Container Pod concept popularized by Kubernetes. libpod also
- contains a tool called podman for managing Pods, Containers,
- and Container Images.
+ Podman (the POD MANager) is a tool for managing containers
+ and images, volumes mounted into those containers, and pods
+ made from groups of containers. Podman is based on libpod,
+ a library for container lifecycle management that is also
+ contained in this repository. The libpod library provides
+ APIs for managing containers, pods, container images,
+ and volumes.
- containers/libpod
+ containers/podman
diff --git a/app-emulation/libpod/libpod-2.2.1.ebuild b/app-emulation/podman/podman-2.2.1.ebuild
similarity index 95%
rename from app-emulation/libpod/libpod-2.2.1.ebuild
rename to app-emulation/podman/podman-2.2.1.ebuild
index fc16a6b258ee..bca75d6fddbd 100644
--- a/app-emulation/libpod/libpod-2.2.1.ebuild
+++ b/app-emulation/podman/podman-2.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -131,9 +131,9 @@ src_install() {
}
pkg_preinst() {
- LIBPOD_ROOTLESS_UPGRADE=false
+ PODMAN_ROOTLESS_UPGRADE=false
if use rootless; then
- has_version 'app-emulation/libpod[rootless]' || LIBPOD_ROOTLESS_UPGRADE=true
+ has_version 'app-emulation/podman[rootless]' || PODMAN_ROOTLESS_UPGRADE=true
fi
}
@@ -148,7 +148,7 @@ pkg_postinst() {
elog "cp /etc/containers/policy.json{.example,}"
want_newline=true
fi
- if [[ ${LIBPOD_ROOTLESS_UPGRADE} == true ]] ; then
+ if [[ ${PODMAN_ROOTLESS_UPGRADE} == true ]] ; then
${want_newline} && elog ""
elog "For rootless operation, you need to configure subuid/subgid"
elog "for user running podman. In case subuid/subgid has only been"
diff --git a/app-emulation/protontricks/Manifest b/app-emulation/protontricks/Manifest
index 5bbe4deff508..0feeb07caace 100644
--- a/app-emulation/protontricks/Manifest
+++ b/app-emulation/protontricks/Manifest
@@ -1,6 +1,9 @@
AUX protontricks-1.4.1_no-setuptools-scm.patch 1291 BLAKE2B 8d97cc8ab7d7dcdba72a3245d7bbd6965d0e0da1f22e290babe6a967057c0ddd6ba85920799f3fa85de4e395f29ea6362472380d3888f2a59bd7c1c167151337 SHA512 730180ce050a81ad42680bb884e3b86b4cc7c2d0efadc07f3a0708f55ab0158b8257e3528ce748d4be830d728e9a238c6d5deef15bc2c926b13ce1c7a1f9a4f2
+AUX protontricks-1.4.3_no-setuptools-scm.patch 1174 BLAKE2B 16ad14073457431d388e295d5004874a8b7bc74aa5762c3f4a950c35ad485d9dc60312acaa511541ff4f2d2e826c31e5c74d1f51d80721bb5ffaa23903714283 SHA512 99349a830eba3e248db3f67f5cd842764700fff51788db1fc649ba9dbef3f356c6ec4a66e4608a74eb67b919d53700b5c501e55a98f78e67e9c63e6f851aa18d
DIST protontricks-1.4.1.tar.gz 31838 BLAKE2B b8c94a1b96fa7df14eaf1cc6d11cb96e43ae4e8c7bd232687a50cae9c79cf2d0e7864b1af0e1dc4cc20086952e1fcefeb16cb71a9c3a977f6feafad1b17d6857 SHA512 7635c9830afa3c64617514cd86edc7d7f9f33e6e81a1da995ec8bee70adc1cf8b5d9de92036c372134e408d735615b267b46a9afc9246f14ff161cb2ee1fc8f9
DIST protontricks-1.4.2.gh.tar.gz 41381 BLAKE2B 9030c5cc0781303834af3b478e78f9ba43f01c68c5e203df20a9db80492dd5e641134b796158011a15e65f6907f27a67c542323ea8f9e10c49dca3f5c663458a SHA512 8b60233723130e5f7cd1a7ce7b9563ba1cc8595352b6d942d9ce66a6906f18d86cf97e2b49cbdb8e276fad6cd038eaf1de8a704a8b900b29de5dfb7327b045d0
+DIST protontricks-1.4.3.tar.gz 43573 BLAKE2B 3a3050ba6e940182d81d98498a5558433ceaa4282f5a23fb93b3cfc299699381493eb2912c5f03bb6a8092be5c50b94bf7181208cda3d4c0f4c90c0f438f7f1b SHA512 7ca8c7c273d92f7c4526caaa8c9db6988c642913c33c6b6188d285d5cfbe30924533a9f024135865cdc1a25bd867ac00bd915b0a61417d17fe0e5ee451417e64
EBUILD protontricks-1.4.1.ebuild 1415 BLAKE2B fd3e09407cfac634bc86a26df6d107ecd07abbfd097ff74a2ea7baaeba40cd8db95460d7b37004b4e54a79ec99c46b3c1ccd162e7d40d4c8ff89b8370b28c3aa SHA512 74bc259a1c1ec202540a36a3d402c1dd71d3350ed9c2c048390c501e4e7c84fd83c7c259a2481d70f83d211821097a560460bb530b96fd0db1fd6b01427353ba
EBUILD protontricks-1.4.2.ebuild 1461 BLAKE2B 84c308caaedaa8b06e2426b2590504ae59c9662dcb9df2bd31a86a8879aafd30a2f055d613905ec088d6ae0e09bf81e572d9545fa9f7e4b663e417695633d135 SHA512 49375b5379e8ead5f3c638d239b9c99a3f540bd86ecdf8f21866d4de516d3fd5e25bf27f9bd8cba25a9272036e7c391e22380366d383efc208d0f50fd994fe9b
+EBUILD protontricks-1.4.3.ebuild 1443 BLAKE2B 8e618ffbeb08d2eacd054c034a7b56f4c737fca62bd9957cb8b25d052f3c1cc384e95923990f49a5aca2a7dbadf246cc393f4fc006af7a0d4d888f3eb303d58a SHA512 3c985a558ac8d63bf32a3d5754f78e207029e19a2d99fc7c5c09ebe272116338ec492d40e84df721f906a2a3798aeef4bae7ccdab794b4ddb6856e1276449728
MISC metadata.xml 784 BLAKE2B 37e795944e32ef3f17022efa4ad352e3ee2d1819f3e7ee4ccf02f2366156c999290b4b309c924f54dfde4a5ffc017628c36ead987da2101d2eb38c1eaa767e3e SHA512 6bccb95acbe4cf3b64b4734f98dc4495bd20df294efa0b628f08f4c2ee6bb6c5d103bd323ac29dddb02d2a7ff4ac88ccccdce8a8c01b856aef051eaae6cdb0ae
diff --git a/app-emulation/protontricks/files/protontricks-1.4.3_no-setuptools-scm.patch b/app-emulation/protontricks/files/protontricks-1.4.3_no-setuptools-scm.patch
new file mode 100644
index 000000000000..e8c6d75036b8
--- /dev/null
+++ b/app-emulation/protontricks/files/protontricks-1.4.3_no-setuptools-scm.patch
@@ -0,0 +1,32 @@
+Since version 1.4.1 upstream has used setuptools-scm to determine the
+current version number. Unfortunately the package in question does not
+support GitHub release archives, using GitHub VCS snapshots would require
+retrieving and updating commit hashes corresponding to release tags, and
+PyPI tarballs do not contain tests. setuptools_scm_git_archive does not
+help because it requires extra files to be included in the repository,
+which upstream has not done.
+
+Seeing as we already know the version number, bypass setuptools_scm
+altogether and create the version file ourselves. For obvious reasons the
+latter has to be done in ebuilds themselves.
+
+--- a/setup.py
++++ b/setup.py
+@@ -16,9 +16,6 @@
+
+ setup(
+ name="protontricks",
+- use_scm_version={
+- "write_to": "src/protontricks/_version.py"
+- },
+ description=DESCRIPTION,
+ long_description=LONG_DESCRIPTION,
+ author=AUTHOR,
+@@ -28,7 +25,6 @@
+ packages=["protontricks"],
+ package_data={"": ["LICENSE"]},
+ package_dir={"protontricks": "src/protontricks"},
+- setup_requires=["setuptools_scm"],
+ install_requires=["vdf>=3.2"],
+ entry_points={
+ "console_scripts": [
diff --git a/app-emulation/protontricks/protontricks-1.4.3.ebuild b/app-emulation/protontricks/protontricks-1.4.3.ebuild
new file mode 100644
index 000000000000..8aa78e9acad1
--- /dev/null
+++ b/app-emulation/protontricks/protontricks-1.4.3.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} pypy3 )
+DISTUTILS_SINGLE_IMPL=1
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="app-emulation/winetricks wrapper for Proton (Steam Play) games"
+HOMEPAGE="https://github.com/Matoking/protontricks"
+SRC_URI="https://github.com/Matoking/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+gui"
+
+RDEPEND="app-emulation/winetricks
+ $(python_gen_cond_dep '
+ dev-python/vdf[${PYTHON_USEDEP}]
+ ')
+ gui? ( gnome-extra/zenity
+ || (
+ app-emulation/winetricks[gtk]
+ app-emulation/winetricks[kde]
+ )
+ )"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.4.3_no-setuptools-scm.patch
+)
+
+DOCS=( CHANGELOG.md README.md )
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+ distutils-r1_python_prepare_all
+ echo "version = '${PV}'" > "${S}"/src/${PN}/_version.py || die "Failed to generate the version file"
+}
+
+pkg_postinst() {
+ elog
+
+ if ! use gui; then
+ ewarn "Please note that disabling USE=gui does *not* presently remove the --gui command-line option,"
+ ewarn "it just means using this option will fail unless gnome-extra/zenity happens to be installed."
+ ewarn
+ fi
+
+ elog "Protontricks can only find games for which a Proton prefix already exists."
+ elog "Make sure to run a Proton game at least once before trying to use protontricks on it."
+ elog
+}
diff --git a/app-emulation/virtio-win/Manifest b/app-emulation/virtio-win/Manifest
index cadc779ddf04..c1c2cc4efb07 100644
--- a/app-emulation/virtio-win/Manifest
+++ b/app-emulation/virtio-win/Manifest
@@ -1,7 +1,9 @@
DIST virtio-win-0.1.173.iso 393902080 BLAKE2B a90da9d4e23a95c4cf9f02cc010664d87c987d7a9b82a90b534ec69041f763d73d7b37b1378078a162e7ef4f06b9d4cd6c5b7c4b98d77ff75bcd0d06a8ede8a2 SHA512 49cba35d74a3f480f6d23a57b68217f5732e8bcfb7657a4a87f16b286ad2c6ffd2509f034d0b4f363a389ce50d4d0e80e241f7ddff3e93b5dc315dad1713f08a
DIST virtio-win-0.1.185.iso 413564928 BLAKE2B 84aa2d0ce16292b95431044618538f6dc176ff834f5e01b245414e27a74775a0e202c7b9262495de9d5f54476fe4dfa5e853f30b994e301080fee1a1c840f823 SHA512 62992baafce1f2eb52c23ba62291765c535c513e2598910083a8519eff58e8c57366d46add702e791fb07ec96c0fb65c9cff03b57e8f32b4357799c86b46c198
DIST virtio-win-0.1.187.iso 433235968 BLAKE2B 0df10aa5f46cd70f7530f6d677b882df364a0b1a859d7e9fe777817136213d4f856116cf73b8521e8720c203bca3321b9a7bdae057f867e655764a8b7d5dc0b2 SHA512 db9938f1f17b723a994d1bd5bb0e0ffce47ae2bbfa96f9bdf1d895750502600f9a71f0486a97af9301659e05ebd5365d1f08dc0e062d1f9e4c3acaac8b7f0bf5
+DIST virtio-win-0.1.190.iso 501745664 BLAKE2B f9f2bc4dc371ff412dfd0b65228e0984c30a1fe1b30307d3894f2b238a8993e96fda75f931080aeff06a29467a678ca02174a876b9f339a4c8d199fd9c8a9917 SHA512 dfdaddb99c92d633368eb243801425abbcb09e4693be658efe531c33a47600b165e598ddac594239402d2c578f24f5400b5e7b643f17e7db4ebba2d4d99cf0fd
EBUILD virtio-win-0.1.173.9.ebuild 630 BLAKE2B 5d5d9ddedd33ca2ad52c1b213edd46f7fbf2b3c310e2cbc176398bcdd29dd576bb542d1ba280720c8e717aa2f37e8aa88aa22f92c04cf42d520e45e99cb9a46c SHA512 7adef1a78a2173de5c41cb2bb2b0325a3163800c0089f6936dd21fa56d7aa8f94889c7b9da7c2a387342c27623e7e6ff55fb55ff5cd15a08025d89dec6b7a96b
EBUILD virtio-win-0.1.185.1.ebuild 697 BLAKE2B 107141d59a78989c5cc47a712ace77c3c40be624a50fe76d0a576ed9581249701ba2edda868a5cab56f863978824817273e516137d62ee469e6dc4f816183de7 SHA512 37872fc77a00eb0c0ea43be87e53fce6743a249511861c8b357c489bc656664c4d0101ae1aac6d5875c93179965f17ed2b8c8fd626d964acc8f541ae7b2f74ba
EBUILD virtio-win-0.1.187.1.ebuild 697 BLAKE2B 107141d59a78989c5cc47a712ace77c3c40be624a50fe76d0a576ed9581249701ba2edda868a5cab56f863978824817273e516137d62ee469e6dc4f816183de7 SHA512 37872fc77a00eb0c0ea43be87e53fce6743a249511861c8b357c489bc656664c4d0101ae1aac6d5875c93179965f17ed2b8c8fd626d964acc8f541ae7b2f74ba
+EBUILD virtio-win-0.1.190.1.ebuild 697 BLAKE2B 3755b24495c2bbc9bb4e630dabec6013809fcfd8a2f682c17c4b464aa15d04def9067dd16902f1e3a0bb7fb821fd71b4d9cea1dceab787e62e16dc73057e3bc1 SHA512 f2ab671652ef92efc65315c4e0fd3889a51c1f990ebc1dadcac0d609579d754ace0a04df870f50423bceb52face1ff2c4f0ca19c6b79db25823dfe053e25c1ae
MISC metadata.xml 359 BLAKE2B 6a34261ec10702f5bec40975ab7723eee34e015afa5a4544146834c43a9a3b040d9ead5d5a617da0b8253e9e9a7e05fe9efae38588b02b8fa16f653d9bfc5340 SHA512 43bdd93da8962e2ca6d852356e206511754f1e5f0bda721ac6458c54abab89367fc137f686583dd9df6d83be82bad66f9858efc52ed1e5a002d6b3bacd8fdbb4
diff --git a/app-emulation/virtio-win/virtio-win-0.1.190.1.ebuild b/app-emulation/virtio-win/virtio-win-0.1.190.1.ebuild
new file mode 100644
index 000000000000..9b0970a358d2
--- /dev/null
+++ b/app-emulation/virtio-win/virtio-win-0.1.190.1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PV=$(ver_cut 1-3)
+MY_DW=$(ver_rs 3 -)
+
+DESCRIPTION="VirtIO drivers for Windows virtual machines running on KVM"
+HOMEPAGE="https://docs.fedoraproject.org/en-US/quick-docs/creating-windows-virtual-machines-using-virtio-drivers/index.html"
+SRC_URI="https://fedorapeople.org/groups/virt/virtio-win/direct-downloads/archive-virtio/${PN}-${MY_DW}/${PN}-${MY_PV}.iso"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+S="${WORKDIR}"
+
+src_install() {
+ insinto /usr/share/drivers/windows
+ doins "${DISTDIR}/${PN}-${MY_PV}.iso"
+ dosym "${PN}-${MY_PV}.iso" "/usr/share/drivers/windows/${PN}.iso"
+}
diff --git a/app-emulation/virtualbox-additions/Manifest b/app-emulation/virtualbox-additions/Manifest
index 23ef89f6211f..4ec35e03cf49 100644
--- a/app-emulation/virtualbox-additions/Manifest
+++ b/app-emulation/virtualbox-additions/Manifest
@@ -1,5 +1,3 @@
-DIST VBoxGuestAdditions_6.0.24.iso 77355008 BLAKE2B 3bb611323ba41ad94a75d5d28198aaf732bd7c36965abc65755c0ffeec29bd378cf4351b838675667958086e499f5791b942a8e3877c1ed815a22c4d564147a1 SHA512 aea64aff216a0cfa3535d2215ec74dd46243f9aba0c1b95f476bb8f0b3d561994f4fc8cc7d454f03482e1cec9a227014f10045e75756767bd8006e8beb9aaade
DIST VBoxGuestAdditions_6.1.16.iso 60987392 BLAKE2B d4452f43c72ab8c49633f717f7a49257e14a8c6c7b60c6d61ee65ae5e4bcce00c30e19ba78d6f28fb85dfbc95ca6139aec2c7069e5afecae145dffc6ff38793a SHA512 e7606fba6e7490318b7dbadff52578040e4370bbe81fa67e6653e798176eb929ed37e363792647ab3c6626ee9e32af40f63167521997af7b446c25173ff60280
-EBUILD virtualbox-additions-6.0.24-r1.ebuild 781 BLAKE2B fbda6311a77ff20cabf4075c35e682f143a7e267f907ea63e948f66e2370c773f9831bb407b7607bfc9a006c9548b93f6d66142f1da49ead9c4488f42a9a2dcf SHA512 b7be1bcbcc119214c8e293f997031abf84ab19920c859e488660d5c8a5c1146ce6ef87b558886f0be633dde8090cd71d27f72ee9ac34f057ba5dc6b5d14460a9
EBUILD virtualbox-additions-6.1.16-r1.ebuild 777 BLAKE2B ef241fa299288ab813b6a6acfddb7910b3a8bd454527fd75143e8b3f404049374662c500aa17ce83a6edb080af267ed1710e09240058c877957e24272c782556 SHA512 53bddb2a887429730a34ea27a0859541c4c47a11a010ff33715314119500e337ed5849a8f76af106ab414dfcafbbe269ce2a282fb5137a324bac676dceb6080c
MISC metadata.xml 260 BLAKE2B 55d9eb1793faf23ffb69c904a9daf755cefe1b1e04fc2331e792a81acc1b699591acb85e005a96e70167e4eba8444e0cfc8f03be4fcdc19487ad6b1cea356f4a SHA512 443c9c27369b12fa4d23ac7e9add34dbf93b54d560ca946dac97801698b79401a80d88c6570530e641ad4f7231a8c1419682e1e11af2b171ca2854c598e05635
diff --git a/app-emulation/virtualbox-additions/virtualbox-additions-6.0.24-r1.ebuild b/app-emulation/virtualbox-additions/virtualbox-additions-6.0.24-r1.ebuild
deleted file mode 100644
index feae0de326e4..000000000000
--- a/app-emulation/virtualbox-additions/virtualbox-additions-6.0.24-r1.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
-
-MY_PN=VBoxGuestAdditions
-MY_PV="${PV/beta/BETA}"
-MY_PV="${MY_PV/rc/RC}"
-MY_P=${MY_PN}_${MY_PV}
-
-DESCRIPTION="CD image containing guest additions for VirtualBox"
-HOMEPAGE="https://www.virtualbox.org/"
-SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.iso"
-
-LICENSE="GPL-2+ LGPL-2.1+ MIT SGI-B-2.0 CDDL"
-SLOT="0/$(ver_cut 1-2)"
-[[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
-KEYWORDS="amd64 x86"
-IUSE=""
-RESTRICT="mirror"
-
-RDEPEND="!app-emulation/virtualbox-bin
- !=app-emulation/virtualbox-9999"
-
-S="${WORKDIR}"
-
-src_unpack() {
- return 0
-}
-
-src_install() {
- insinto /usr/share/${PN/-additions}
- newins "${DISTDIR}"/${MY_P}.iso ${MY_PN}.iso
-}
diff --git a/app-emulation/virtualbox-extpack-oracle/Manifest b/app-emulation/virtualbox-extpack-oracle/Manifest
index d1b24d61e0cb..6bfeef4f3751 100644
--- a/app-emulation/virtualbox-extpack-oracle/Manifest
+++ b/app-emulation/virtualbox-extpack-oracle/Manifest
@@ -1,5 +1,3 @@
-DIST Oracle_VM_VirtualBox_Extension_Pack-6.0.24-139119.tar.gz 23238486 BLAKE2B cad4e6822b51db05fb0b919f4c44ace1743a9d2b5ebcc0da6fe3c9ec43612ec6079614f5d3a9423c320e65b5438089aeef42f331946eb74093e3f8b1ef137300 SHA512 4be76fffb8508dda561e74daf68c71641a0903e554ecdf6b102f3fe35af03883bc88c2ac3cbdae2b3ddfb7ee5c9bdfa8df670662eef139f2a894dea4aa6f2e18
DIST Oracle_VM_VirtualBox_Extension_Pack-6.1.16-140961.tar.gz 11145670 BLAKE2B 86e620ebaea9803b9bf633990a39d9e2828fbe70cdc98cbb6ba98accc374e0ea2300a7135cae0f0ec8d13184ccc8e0ff075ca1f81132ed97206f14c20adeb3bc SHA512 89b9c709da1c4b8268c4c1849e074f4d8dc76a36663b401c9ea63f02422bec50e2b77056289144bb161b1dd226b78687379d6ab86281112a71561c1777f525fb
-EBUILD virtualbox-extpack-oracle-6.0.24.139119-r1.ebuild 1086 BLAKE2B 99cdee4d3ad71bb23128613cf34977c565910add5e74cec1e3eb7d93f479b9b458888eaa050fa6e014ba62953f05533c10d2e74b98f0e7125705bb173a79f198 SHA512 85cb99d4f621df810805994132b939079986b6959e49889d4d34fa9d1bc62630c79d4bcb8914807450f137112330520553982735929ca7c7db95c789b6c923f2
EBUILD virtualbox-extpack-oracle-6.1.16.140961-r1.ebuild 1083 BLAKE2B 088e4a97b7fb82fdbbe2206c79bf4296ca886d008df1c5cf1d789c0bbaced88b83fd8b5cee42f5aa6a5c9246c07ad9c8d2b7363a4a0f09cc687b3fbd6a64331e SHA512 e674994322cdcf4f0151f488c28324c786a72039ad32147dca57f84774ab39100f5534506e1ff5e6adeda75314ba3ef071b032c39ab4b6754b3469ccb79707ae
MISC metadata.xml 260 BLAKE2B 55d9eb1793faf23ffb69c904a9daf755cefe1b1e04fc2331e792a81acc1b699591acb85e005a96e70167e4eba8444e0cfc8f03be4fcdc19487ad6b1cea356f4a SHA512 443c9c27369b12fa4d23ac7e9add34dbf93b54d560ca946dac97801698b79401a80d88c6570530e641ad4f7231a8c1419682e1e11af2b171ca2854c598e05635
diff --git a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-6.0.24.139119-r1.ebuild b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-6.0.24.139119-r1.ebuild
deleted file mode 100644
index 1ced8bb1016c..000000000000
--- a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-6.0.24.139119-r1.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
-
-inherit multilib
-
-MAIN_PV="$(ver_cut 1-3)"
-if [[ ${PV} = *_beta* ]] || [[ ${PV} = *_rc* ]] ; then
- MY_PV="${MAIN_PV}_$(ver_cut 5-6)"
- DEP_PV="${MY_PV}"
- MY_PV="${MY_PV/beta/BETA}"
- MY_PV="${MY_PV/rc/RC}"
-else
- MY_PV="${MAIN_PV}"
- DEP_PV="${MAIN_PV}"
-fi
-VBOX_BUILD_ID="$(ver_cut 4)"
-MY_PN="Oracle_VM_VirtualBox_Extension_Pack"
-MY_P="${MY_PN}-${MY_PV}-${VBOX_BUILD_ID}"
-
-DESCRIPTION="PUEL extensions for VirtualBox"
-HOMEPAGE="https://www.virtualbox.org/"
-SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.vbox-extpack -> ${MY_P}.tar.gz"
-
-LICENSE="PUEL"
-SLOT="0/$(ver_cut 1-2)"
-[[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
-KEYWORDS="amd64 x86"
-IUSE=""
-RESTRICT="bindist mirror strip"
-
-RDEPEND="~app-emulation/virtualbox-${DEP_PV}"
-
-S="${WORKDIR}"
-
-QA_PREBUILT="/usr/lib*/virtualbox/ExtensionPacks/${MY_PN}/.*"
-
-src_install() {
- insinto /usr/$(get_libdir)/virtualbox/ExtensionPacks/${MY_PN}
- doins -r linux.${ARCH}
- doins ExtPack* PXE-Intel.rom
-}
diff --git a/app-emulation/virtualbox-guest-additions/Manifest b/app-emulation/virtualbox-guest-additions/Manifest
index 8c82cd1ecc55..3e421e1ab80d 100644
--- a/app-emulation/virtualbox-guest-additions/Manifest
+++ b/app-emulation/virtualbox-guest-additions/Manifest
@@ -4,10 +4,7 @@ AUX virtualbox-guest-additions-5-localconfig 937 BLAKE2B 4ad7e6520572ed5b3ee29c0
AUX virtualbox-guest-additions-8.initd 538 BLAKE2B f720a0f9de10c5240f1ac8a590c4e5de2ada767a06341f9259a9e491660e796640dd4a251fbbf85f66786b8ec829357aa51546e502ca99452fa998ce20031637 SHA512 e01579b0ce980517a7b9e163915977a58c73594cf4c8484d20941449b9a21a4346ab1bb031b248ee438b350fa23b4bc78a1d6e501986b329564a4df487f5d3ca
AUX virtualbox-guest-additions.service 411 BLAKE2B f5f1c24a94764ca72a04879c27cd9fdc1e0c8a1440ac87674dad44a1493a9347e6e2b351ae2b71e050ba06ae9848168220d62981a9e0c984ea68bf48ea06b485 SHA512 b6226146f3591a778551e94ae2661e2ae3c6b761d20600d741eaaa03f43f0a2b841d2a44d9eec3a3768edb23b021cee94c7849d998ee4104ad60dad2df88df83
AUX xorg.conf.vbox 274 BLAKE2B 3a3035fcbdbd5810c54505f5a5e6deefa1540e5e01a038babb62a40bd5b2de2dc5b228cabe55612d92a522e6ae92aa7ff4ff2ab26772c3b54ce95ebac4e7fc5a SHA512 ac2b14970dc6667ceec2dbdae52bc92cbad4aff020898ede156454e8a8a703354f15c7e19cfbd2bdd15e251493fd05cacfe814cabee0f9b4cf155e44860ed4c9
-DIST VirtualBox-6.0.24.tar.bz2 159833756 BLAKE2B 321f7988a5b55a794e2d51937a0752d96eaefb376c12e2fb23be08dff81b164153e19a7d5963a0404f630fb38d6047b9d954a67923f26b2aa16d861a0c6a1b63 SHA512 e6f98d0036cdebc52c78c5ddbce369d9ef0a036c366647b299060e1ccf6942f6b6f899201dfa08c410a039f353b767a41a0d14579c741dc5c034a035cb16c534
DIST VirtualBox-6.1.16.tar.bz2 165470821 BLAKE2B 13376322d0ce2ea3ed826c61816ff19c8ce1f022f6cb1f1b0c291d72354cbe574a01589a6dcc39de10080ba32d5961ca980e75fe11c7401736bf8f7e5443d166 SHA512 4373eb35934f894e419e1441f6368e646e4a84b963a0ecf1e5c71bbf0231de0b0e52f4c4377b8cd2d956bc7a11346a9da2285988bf1e4c743971c413c6529421
-DIST virtualbox-6.0.24-patches-01.tar.xz 3640 BLAKE2B e55c30395978471edd0f291cd34ecb772cce2f27bea88c6fe348e83046777638be9bdd36bf3a2fd1967357ea7ff53936398cd94ee74d8e55d31c1896069404ff SHA512 b8d9395083769a641a5d7f78ac734a86220fec817e3e49461208f8e72ef7d11c19fe4507e6766fe7c8c815c9888f793fd66f3fae36d6e3a217e53620b5d95029
DIST virtualbox-6.1.12-patches-01.tar.xz 2528 BLAKE2B a5d7cde0daea41bee2e40e46569c725769927a31865d99d13b8b13c4903e59b4097f85da15dc592b9c7e8baf8ff805397af827620f107ba09a468b4d1198ecab SHA512 f71d10a9fbce99c3f631ef30bcfa9d0e017e702ac509541b039e08ccbcd024beb93fde09c43d90af5d9d28f6842a7947f20e7950d3897da3e6d57859657e1123
-EBUILD virtualbox-guest-additions-6.0.24-r2.ebuild 6108 BLAKE2B 0d096d671de70e69d37bb5bead993413b5f6dbe6ea3d95ca491907341ff6e546ca0c0676e85f79840c2e666b537f2b25976f44aa419873931a0875fd538ddfb3 SHA512 4753a3d1ab46464e4047d8d88bab548bea5ebdfed21f79039a065b02d4ea0d34f9a4d49bed368a9dd9e5002d8530652231def7902a7fa68ef965be12e6f1f6ac
-EBUILD virtualbox-guest-additions-6.1.16-r1.ebuild 6203 BLAKE2B 3d718face26d4c0178ee16cdbb95504eb6bc15c63b1112adfdd67ae4cc56d4963810ed2f4417154c0a3d70c539220b99ef30a9904b54be6acda93fa3498b240e SHA512 5f534315e95e50008b1f704bbef4feaaebb702f72443b7cd63cd6ae7a2bc143f5fa2907cbeda370369b03f83a3025364ab89853a52a981c5976f4d103e9c7c55
+EBUILD virtualbox-guest-additions-6.1.16-r1.ebuild 6202 BLAKE2B b6e2fed23a8749deb6136ceef602dc2af84466940ec8c35caf6ffd08f582e8dda92b6a2ffec26dde62a678be94d6ac8b7623365f0c27dacb3b1ca2a1ff5b72cb SHA512 5dbf2a06b0dbed7a9640fd1b9cf50d7ea9af3344f0fadaad90e34b55e864056ac4aa9100bd04293553db1ef7851120844f55f4b634118842272413b112dbda77
MISC metadata.xml 260 BLAKE2B 55d9eb1793faf23ffb69c904a9daf755cefe1b1e04fc2331e792a81acc1b699591acb85e005a96e70167e4eba8444e0cfc8f03be4fcdc19487ad6b1cea356f4a SHA512 443c9c27369b12fa4d23ac7e9add34dbf93b54d560ca946dac97801698b79401a80d88c6570530e641ad4f7231a8c1419682e1e11af2b171ca2854c598e05635
diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.0.24-r2.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.0.24-r2.ebuild
deleted file mode 100644
index 8a69b30c9df7..000000000000
--- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.0.24-r2.ebuild
+++ /dev/null
@@ -1,218 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit linux-mod systemd toolchain-funcs
-
-MY_PV="${PV/beta/BETA}"
-MY_PV="${MY_PV/rc/RC}"
-MY_P="VirtualBox-${MY_PV}"
-DESCRIPTION="VirtualBox kernel modules and user-space tools for Gentoo guests"
-HOMEPAGE="https://www.virtualbox.org/"
-SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.tar.bz2
- https://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-6.0.24-patches-01.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0/$(ver_cut 1-2)"
-[[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
-KEYWORDS="amd64 x86"
-IUSE="X"
-
-# automount Error: VBoxServiceAutoMountWorker: Group "vboxsf" does not exist
-RDEPEND="
- acct-group/vboxguest
- acct-group/vboxsf
- acct-user/vboxguest
- X? ( x11-apps/xrandr
- x11-apps/xrefresh
- x11-libs/libXmu
- x11-libs/libX11
- x11-libs/libXt
- x11-libs/libXext
- x11-libs/libXau
- x11-libs/libXdmcp
- x11-libs/libSM
- x11-libs/libICE )
- sys-apps/dbus
-"
-DEPEND="
- ${RDEPEND}
- >=dev-util/kbuild-0.1.9998.3127
- >=dev-lang/yasm-0.6.2
- sys-devel/bin86
- sys-libs/pam
- sys-power/iasl
- x11-base/xorg-proto
-"
-PDEPEND="
- X? ( x11-drivers/xf86-video-vboxvideo )
-"
-BUILD_TARGETS="all"
-BUILD_TARGET_ARCH="${ARCH}"
-
-S="${WORKDIR}/${MY_P}"
-VBOX_MOD_SRC_DIR="${S}/out/linux.${ARCH}/release/bin/additions/src"
-
-pkg_setup() {
- export DISTCC_DISABLE=1 #674256
- MODULE_NAMES="vboxguest(misc:${VBOX_MOD_SRC_DIR}/vboxguest:${VBOX_MOD_SRC_DIR}/vboxguest)
- vboxsf(misc:${VBOX_MOD_SRC_DIR}/vboxsf:${VBOX_MOD_SRC_DIR}/vboxsf)"
- use X && MODULE_NAMES+=" vboxvideo(misc:${VBOX_MOD_SRC_DIR}/vboxvideo::${VBOX_MOD_SRC_DIR}/vboxvideo)"
-
- linux-mod_pkg_setup
- BUILD_PARAMS="KERN_DIR=/lib/modules/${KV_FULL}/build KERNOUT=${KV_OUT_DIR} KBUILD_EXTRA_SYMBOLS=${S}/Module.symvers"
-}
-
-src_prepare() {
- # Remove shipped binaries (kBuild,yasm), see bug #232775
- rm -r kBuild/bin tools || die
-
- # Provide kernel sources
- pushd src/VBox/Additions &>/dev/null || die
- ebegin "Extracting guest kernel module sources"
- kmk GuestDrivers-src vboxguest-src vboxsf-src vboxvideo-src &>/dev/null || die
- eend
- popd &>/dev/null || die
-
- # PaX fixes (see bug #298988)
- pushd "${VBOX_MOD_SRC_DIR}" &>/dev/null || die
- eapply "${FILESDIR}"/vboxguest-6.0.6-log-use-c99.patch
- popd &>/dev/null || die
-
- # Disable things unused or splitted into separate ebuilds
- cp "${FILESDIR}/${PN}-5-localconfig" LocalConfig.kmk || die
- use X || echo "VBOX_WITH_X11_ADDITIONS :=" >> LocalConfig.kmk
-
- # Remove pointless GCC version check
- sed -e '/^check_gcc$/d' -i configure || die
-
- eapply "${WORKDIR}/patches"
-
- eapply_user
-}
-
-src_configure() {
- # build the user-space tools, warnings are harmless
- local cmd=(
- ./configure
- --nofatal
- --disable-xpcom
- --disable-sdl-ttf
- --disable-pulse
- --disable-alsa
- --with-gcc="$(tc-getCC)"
- --with-g++="$(tc-getCXX)"
- --target-arch=${ARCH}
- --with-linux="${KV_OUT_DIR}"
- --build-headless
- )
- echo "${cmd[@]}"
- "${cmd[@]}" || die "configure failed"
- source ./env.sh
- export VBOX_GCC_OPT="${CFLAGS} ${CPPFLAGS}"
-}
-
-src_compile() {
- MAKE="kmk" emake \
- VBOX_BUILD_PUBLISHER=_Gentoo \
- TOOL_GXX3_CC="$(tc-getCC)" TOOL_GXX3_CXX="$(tc-getCXX)" \
- TOOL_GXX3_LD="$(tc-getCXX)" VBOX_GCC_OPT="${CXXFLAGS}" \
- TOOL_YASM_AS=yasm \
- VBOX_ONLY_ADDITIONS=1 \
- KBUILD_VERBOSE=2
-
- # Now creating the kernel modules. We must do this _after_
- # we compiled the user-space tools as we need two of the
- # automatically generated header files. (>=3.2.0)
- linux-mod_src_compile
-}
-
-src_install() {
- linux-mod_src_install
-
- cd "${S}"/out/linux.${ARCH}/release/bin/additions || die
-
- insinto /sbin
- newins mount.vboxsf mount.vboxsf
- fperms 4755 /sbin/mount.vboxsf
-
- newinitd "${FILESDIR}"/${PN}-8.initd ${PN}
-
- insinto /usr/sbin/
- newins VBoxService vboxguest-service
- fperms 0755 /usr/sbin/vboxguest-service
-
- insinto /usr/bin
- doins VBoxControl
- fperms 0755 /usr/bin/VBoxControl
-
- # VBoxClient user service and xrandr wrapper
- if use X ; then
- doins VBoxClient
- fperms 0755 /usr/bin/VBoxClient
-
- pushd "${S}"/src/VBox/Additions/x11/Installer &>/dev/null \
- || die
- newins 98vboxadd-xclient VBoxClient-all
- fperms 0755 /usr/bin/VBoxClient-all
- popd &>/dev/null || die
- fi
-
- # udev rule for vboxdrv
- local udev_rules_dir="/lib/udev/rules.d"
- dodir ${udev_rules_dir}
- echo 'KERNEL=="vboxguest", OWNER="vboxguest", GROUP="vboxguest", MODE="0660"' \
- >> "${ED}/${udev_rules_dir}/60-virtualbox-guest-additions.rules" \
- || die
- echo 'KERNEL=="vboxuser", OWNER="vboxguest", GROUP="vboxguest", MODE="0660"' \
- >> "${ED}/${udev_rules_dir}/60-virtualbox-guest-additions.rules" \
- || die
-
- # VBoxClient autostart file
- insinto /etc/xdg/autostart
- doins "${FILESDIR}"/vboxclient.desktop
-
- # sample xorg.conf
- dodoc "${FILESDIR}"/xorg.conf.vbox
- docompress -x "${ED}"/usr/share/doc/${PF}/xorg.conf.vbox
-
- systemd_dounit "${FILESDIR}/${PN}.service"
-}
-
-pkg_postinst() {
- linux-mod_pkg_postinst
- if ! use X ; then
- elog "use flag X is off, enable it to install the"
- elog "X Window System video driver."
- fi
- elog ""
- elog "Please add users to the \"vboxguest\" group so they can"
- elog "benefit from seamless mode, auto-resize and clipboard."
- elog ""
- elog "The vboxsf group has been added to make automount services work."
- elog "These services are part of the shared folders support."
- elog ""
- elog "Please add:"
- elog "/etc/init.d/${PN}"
- elog "to the default runlevel in order to start"
- elog "needed services."
- elog "To use the VirtualBox X driver, use the following"
- elog "file as your /etc/X11/xorg.conf:"
- elog " /usr/share/doc/${PF}/xorg.conf.vbox"
- elog ""
- elog "Also make sure you use the Mesa library for OpenGL:"
- elog " eselect opengl set xorg-x11"
- elog ""
- elog "An autostart .desktop file has been installed to start"
- elog "VBoxClient in desktop sessions."
- elog ""
- elog "You can mount shared folders with:"
- elog " mount -t vboxsf "
- elog ""
- elog "Warning:"
- elog "this ebuild is only needed if you are running gentoo"
- elog "inside a VirtualBox Virtual Machine, you don't need"
- elog "it to run VirtualBox itself."
- elog ""
-}
diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.1.16-r1.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.1.16-r1.ebuild
index 113acb8e12ca..5000d477eb16 100644
--- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.1.16-r1.ebuild
+++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.1.16-r1.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://download.virtualbox.org/virtualbox/${DIR_PV:-${MY_PV}}/${MY_P}.
LICENSE="GPL-2"
SLOT="0/$(ver_cut 1-2)"
[[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="X"
# automount Error: VBoxServiceAutoMountWorker: Group "vboxsf" does not exist
diff --git a/app-emulation/virtualbox-modules/Manifest b/app-emulation/virtualbox-modules/Manifest
index ed029e7e83b3..be87847dcbf7 100644
--- a/app-emulation/virtualbox-modules/Manifest
+++ b/app-emulation/virtualbox-modules/Manifest
@@ -3,8 +3,6 @@ AUX virtualbox-modules-5.2.8-pax-const.patch 1728 BLAKE2B 1a2e8c5946af5abcf443c8
AUX virtualbox-modules-6.1.16-linux-5.10-r0drv-memobj-fix-r0.patch 3237 BLAKE2B 5ebd53475768d4611ce9a23f8b11ad92246f561933c67a620136adcd4c7f5d1cf12cd09360eb6676221725c3732c255fcb1fe2a177fce9d007db83c776c5b202 SHA512 046e4c8e2d8f295d8e7c29c7dea53b8db18700f2ba03c7ab67ff466850f1cb2ed0dbc22aacd78b8c7011e3fb2dc02be06aba1678d1930b947988ddacf74e9174
AUX virtualbox.conf 38 BLAKE2B 4f03cb09a1cca36013beb2a38220115d63510fd0aa63e2df1f0dc755a9162f7c2efed32d8f9c98fcc1e36d48067471085d5b038c6e8b3118508fbaaaab3790f7 SHA512 63eba0963b3344ea7e7a0035560406899d878a0761cddef9853bec95deb9812b221e98f446f240070d6448d61d6ecbcf7a990bcd52863660e8f21cf9a98c0e1d
AUX virtualbox.conf-r1 30 BLAKE2B 6308dedc75e2677cbdc844b53f51359e6b5745d3510636b04d08512122aeb6db81a1a18af156a8b9acccad395d390b24f9c27ed47413382cb6101266762de230 SHA512 5c6d31f527ca2db8d7fbeea759ac328eff42803d7940fd81ef12af22eb09f8913a0e561c35db1963e2a8b398ee288692817b5c8f3d439f2a6fd381769ec2ac8a
-DIST vbox-kernel-module-src-6.0.24.tar.xz 670960 BLAKE2B 26e4b1b6b9ab8c8fd0312b2162fe745dc11ef3f8a7e2f08f49df9d9ef346ec21b64e4a0a480bd726e9cca6ab2ce5d3cf2637aa8923c0843bf78a3ed160b98810 SHA512 9b1093307dffeb64f3ec22c4797268858e1fcc729403e89294c2e3cf0852662b7b0aad4416a593fd25b2107a1995d6bc17078f072b6f7718ed111ab61df8324e
DIST vbox-kernel-module-src-6.1.16.tar.xz 671736 BLAKE2B 8b2153874ee7a63f88679a5372215e89def49622caa7679a5c2410423eaf23ced18ece79d638fc96db40fac88857db7568dd72dd8e05371b14add3553d61d3a7 SHA512 c51dfad5f9578ad43e2fbdd35a70659640030108006f89d362bc25dead99eb3b39a78d403633b3813f62f5b510eff22d826a2750b9c88f5fcb1cde6531295bff
-EBUILD virtualbox-modules-6.0.24-r2.ebuild 1471 BLAKE2B 405d9600d0f8d00f9442db9bea087094a035114acf58e2357cb18797c9273ecec65c26f4b470711fcc6372a641e718553fb436a52eb366b3f563800277c5f3aa SHA512 a8ee80d7c9c0e31ac4f4c0115d2a4f11798a182549e009ed55dcaddf1b8b893a54838696cffcc01f4760f212b55fc80319917235ea40776d280496386c9e278e
EBUILD virtualbox-modules-6.1.16-r1.ebuild 1511 BLAKE2B 5da8447d01281777c51b21469b44397ab585659a36ade0407d74b32da4d0078ca5329479785cd2924d8c3f61fb066f84a64b4a92514454fe7368b9b54dfbebc4 SHA512 fb606c28048f9e4ce050b73de3eb7a80e5546d18ce52d13aa2a00abb42530052dd61523f5a800ed1cfb06541b272017cfc1b403a2260fe43b779238bd08a46d2
MISC metadata.xml 353 BLAKE2B d7de13b3a8966ab3bca54ae77f7f6c7dfd57f2c5941f09ab1b5f79ac798687ffaaa183afdf9c034a9d50fda8507a3aaa2ef0c11d0fdfa6e09a55a1bdb9f30f4a SHA512 40029c9a246dde5ed51119f42ec5448b7ae08a47ee4d6be201fef282305c809d7d3182abf807dd2444ffe1a980abcd670878567d948bcd3661a55c6848a37000
diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-6.0.24-r2.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-6.0.24-r2.ebuild
deleted file mode 100644
index a56ac88cb0f4..000000000000
--- a/app-emulation/virtualbox-modules/virtualbox-modules-6.0.24-r2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# XXX: the tarball here is just the kernel modules split out of the binary
-# package that comes from virtualbox-bin
-
-EAPI=7
-
-inherit linux-mod toolchain-funcs
-
-MY_P="vbox-kernel-module-src-${PV}"
-DESCRIPTION="Kernel Modules for Virtualbox"
-HOMEPAGE="https://www.virtualbox.org/"
-SRC_URI="https://dev.gentoo.org/~polynomial-c/virtualbox/${MY_P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0/$(ver_cut 1-2)"
-[[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
-KEYWORDS="amd64 x86"
-IUSE="pax_kernel"
-
-RDEPEND="!=app-emulation/virtualbox-9999"
-
-S="${WORKDIR}"
-
-BUILD_TARGETS="all"
-MODULE_NAMES="vboxdrv(misc:${S}) vboxnetflt(misc:${S}) vboxnetadp(misc:${S}) vboxpci(misc:${S})"
-MODULESD_VBOXDRV_ENABLED="yes"
-MODULESD_VBOXNETADP_ENABLED="no"
-MODULESD_VBOXNETFLT_ENABLED="no"
-# The following is a security measure that comes directly from usptream.
-# Do NOT remove this!!!
-MODULESD_VBOXPCI_ADDITIONS=(
- "blacklist vboxpci"
- "install vboxpci /bin/true"
-)
-
-pkg_setup() {
- linux-mod_pkg_setup
- BUILD_PARAMS="CC=$(tc-getBUILD_CC) KERN_DIR=${KV_DIR} KERN_VER=${KV_FULL} O=${KV_OUT_DIR} V=1 KBUILD_VERBOSE=1"
-}
-
-src_prepare() {
- if use pax_kernel && kernel_is -ge 3 0 0 ; then
- eapply -p0 "${FILESDIR}"/${PN}-5.2.8-pax-const.patch
- fi
-
- default
-}
-
-src_install() {
- linux-mod_src_install
- insinto /usr/lib/modules-load.d/
- newins "${FILESDIR}"/virtualbox.conf-r1 virtualbox.conf
-}
diff --git a/app-emulation/virtualbox/Manifest b/app-emulation/virtualbox/Manifest
index ec0c287a6485..3f4405ecaf30 100644
--- a/app-emulation/virtualbox/Manifest
+++ b/app-emulation/virtualbox/Manifest
@@ -7,10 +7,7 @@ AUX virtualbox-5-localconfig 1553 BLAKE2B dc1e946e97eb6b19a99b5ecf34640ef09c4446
AUX virtualbox-5.2.8-paxmark-bldprogs.patch 2732 BLAKE2B a3966e0f1a990c648cba0dfd245229d66040294f068f5fa3f52d7cd55f56819fa1ed505465bc6e524c147f958af3460ecc9e4c3b1628dcb456067181521b7ef5 SHA512 2c436dd64ff3135ce31dc7ab2c05a38fe0b1b1a2b2cc687b1f58fa09f7de2384a6f067ff67c0ab4ecb5ddd42a94a9379517e1901a085e3cb7f43c38a07c28a16
AUX virtualbox-ose-6-wrapper 3570 BLAKE2B 730747f4e7517fae218d8abf311e1f30f90bbf0810bdd1ee358dd4250359d501803c2213782310788b2c54a3c57f5195455b89331f02d35be0c5f4713a235b54 SHA512 e7e1e161fa8030234973e18d9d033238ded1f0b511323b642d8102dc062a16e69b6fa63729e88dcf1ef16fa02befd1f36e7242e23db12fa838b25d83f19810ea
AUX virtualbox-vboxusb_tmpfilesd 35 BLAKE2B 56937e236a0e4d1a2aa085271e8ae0af9553fdf7c3b804af4d3fda3aa8dbc32d63762fee90bc949390cb9cd67f2f0111894c8af084731dab6920ae1675c69a64 SHA512 72e4602f5f214f8833486f5c787c263a10390e8bdf65b5615d67c35ec44048f02add12fe43b19f9c57a9d2f12d768c52e54fcfb9052c0611d06cc988a698c171
-DIST VirtualBox-6.0.24.tar.bz2 159833756 BLAKE2B 321f7988a5b55a794e2d51937a0752d96eaefb376c12e2fb23be08dff81b164153e19a7d5963a0404f630fb38d6047b9d954a67923f26b2aa16d861a0c6a1b63 SHA512 e6f98d0036cdebc52c78c5ddbce369d9ef0a036c366647b299060e1ccf6942f6b6f899201dfa08c410a039f353b767a41a0d14579c741dc5c034a035cb16c534
DIST VirtualBox-6.1.16.tar.bz2 165470821 BLAKE2B 13376322d0ce2ea3ed826c61816ff19c8ce1f022f6cb1f1b0c291d72354cbe574a01589a6dcc39de10080ba32d5961ca980e75fe11c7401736bf8f7e5443d166 SHA512 4373eb35934f894e419e1441f6368e646e4a84b963a0ecf1e5c71bbf0231de0b0e52f4c4377b8cd2d956bc7a11346a9da2285988bf1e4c743971c413c6529421
-DIST virtualbox-6.0.24-patches-01.tar.xz 3640 BLAKE2B e55c30395978471edd0f291cd34ecb772cce2f27bea88c6fe348e83046777638be9bdd36bf3a2fd1967357ea7ff53936398cd94ee74d8e55d31c1896069404ff SHA512 b8d9395083769a641a5d7f78ac734a86220fec817e3e49461208f8e72ef7d11c19fe4507e6766fe7c8c815c9888f793fd66f3fae36d6e3a217e53620b5d95029
DIST virtualbox-6.1.12-patches-01.tar.xz 2528 BLAKE2B a5d7cde0daea41bee2e40e46569c725769927a31865d99d13b8b13c4903e59b4097f85da15dc592b9c7e8baf8ff805397af827620f107ba09a468b4d1198ecab SHA512 f71d10a9fbce99c3f631ef30bcfa9d0e017e702ac509541b039e08ccbcd024beb93fde09c43d90af5d9d28f6842a7947f20e7950d3897da3e6d57859657e1123
-EBUILD virtualbox-6.0.24-r1.ebuild 14396 BLAKE2B 1bea8d995578378b2a25037089e81ca4c0153c2ebd5bd9029ab368ea3203210f98acd63ad5dff2b98655a0b97acbc27ac134537986529db835b241d4f131fc17 SHA512 616c12eb22d560791adf61096a2b80b74b2a4fbc3f6abae3626a6a2eacdd7ab5b5b6deda89f84b504dce481872c1ffc6da1e728e22a546851554a408085f0452
EBUILD virtualbox-6.1.16-r1.ebuild 14559 BLAKE2B bf41053a4be4e156d4132f1e10479558edfa6bb5d6a23600e91a4301dd5600a853d5c1d91b0b4377cdae974914ad4fc8ca92d1f2db05b0375f634f6231f1159a SHA512 f3e11dba150273f388a3c96068aedb0bdb1eb9ed7a2b8ebed3a5ceb2c223164d590b619d9979f11fee512b21085b38d80fdb060bc2d02e8d5c20e71df8fb7141
MISC metadata.xml 774 BLAKE2B 74d422bee5013b3875828aa2f192a8269815c567ae79c135b7cab1cc71175a923668e1c7e6f5ff76f19c7c359dbb1a20edfcc59570e95ec83418d8a6a0dae46b SHA512 bea193854ac55683c6c4fdcab3c2a4e9144ca4806b261ff7a6bf50f7fffd005f7de3dbb44a4a833ba7bf7f0cb535a46a4586c59bca9a46bf664b4b06ce425549
diff --git a/app-emulation/virtualbox/virtualbox-6.0.24-r1.ebuild b/app-emulation/virtualbox/virtualbox-6.0.24-r1.ebuild
deleted file mode 100644
index 5b7282afe308..000000000000
--- a/app-emulation/virtualbox/virtualbox-6.0.24-r1.ebuild
+++ /dev/null
@@ -1,510 +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 desktop flag-o-matic java-pkg-opt-2 linux-info pax-utils python-single-r1 tmpfiles toolchain-funcs udev xdg
-
-MY_PV="${PV/beta/BETA}"
-MY_PV="${MY_PV/rc/RC}"
-MY_P=VirtualBox-${MY_PV}
-
-DESCRIPTION="Family of powerful x86 virtualization products for enterprise and home use"
-HOMEPAGE="https://www.virtualbox.org/"
-SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.tar.bz2
- https://dev.gentoo.org/~polynomial-c/${PN}/patchsets/${PN}-6.0.24-patches-01.tar.xz"
-
-LICENSE="GPL-2 dtrace? ( CDDL )"
-SLOT="0/$(ver_cut 1-2)"
-[[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
-KEYWORDS="amd64 x86"
-IUSE="alsa debug doc dtrace headless java libressl lvm +opus pam pax_kernel pulseaudio +opengl python +qt5 +sdk +udev vboxwebsrv vnc"
-
-CDEPEND="
- ${PYTHON_DEPS}
- !app-emulation/virtualbox-bin
- acct-group/vboxusers
- ~app-emulation/virtualbox-modules-${PV}
- dev-libs/libIDL
- >=dev-libs/libxslt-1.1.19
- net-misc/curl
- dev-libs/libxml2
- media-libs/libpng:0=
- media-libs/libvpx:0=
- sys-libs/zlib:=
- !headless? (
- media-libs/libsdl:0[X,video]
- x11-libs/libX11
- x11-libs/libxcb:=
- x11-libs/libXcursor
- x11-libs/libXext
- x11-libs/libXmu
- x11-libs/libXt
- opengl? ( media-libs/libglvnd[X] )
- qt5? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtprintsupport:5
- dev-qt/qtwidgets:5
- dev-qt/qtx11extras:5
- opengl? ( dev-qt/qtopengl:5 )
- x11-libs/libXinerama
- )
- )
- libressl? ( dev-libs/libressl:= )
- !libressl? ( dev-libs/openssl:0= )
- lvm? ( sys-fs/lvm2 )
- opus? ( media-libs/opus )
- udev? ( >=virtual/udev-171 )
- vnc? ( >=net-libs/libvncserver-0.9.9 )
-"
-DEPEND="
- ${CDEPEND}
- alsa? ( >=media-libs/alsa-lib-1.0.13 )
- !headless? (
- x11-libs/libXinerama
- opengl? ( virtual/opengl )
- )
- pam? ( sys-libs/pam )
- pax_kernel? ( sys-apps/elfix )
- pulseaudio? ( media-sound/pulseaudio )
- qt5? ( dev-qt/linguist-tools:5 )
- vboxwebsrv? ( net-libs/gsoap[-gnutls(-)] )
-"
-BDEPEND="
- ${PYTHON_DEPS}
- >=dev-util/kbuild-0.1.9998.3127
- >=dev-lang/yasm-0.6.2
- sys-devel/bin86
- sys-libs/libcap
- sys-power/iasl
- virtual/pkgconfig
- doc? (
- app-text/docbook-sgml-dtd:4.4
- dev-texlive/texlive-basic
- dev-texlive/texlive-latex
- dev-texlive/texlive-latexrecommended
- dev-texlive/texlive-latexextra
- dev-texlive/texlive-fontsrecommended
- dev-texlive/texlive-fontsextra
- )
- java? ( >=virtual/jdk-1.6 )
-"
-RDEPEND="
- ${CDEPEND}
- java? ( >=virtual/jre-1.6 )
-"
-
-QA_TEXTRELS_x86="usr/lib/virtualbox-ose/VBoxGuestPropSvc.so
- usr/lib/virtualbox/VBoxSDL.so
- usr/lib/virtualbox/VBoxSharedFolders.so
- usr/lib/virtualbox/VBoxDD2.so
- usr/lib/virtualbox/VBoxOGLrenderspu.so
- usr/lib/virtualbox/VBoxPython.so
- usr/lib/virtualbox/VBoxDD.so
- usr/lib/virtualbox/VBoxDDU.so
- usr/lib/virtualbox/VBoxREM64.so
- usr/lib/virtualbox/VBoxSharedClipboard.so
- usr/lib/virtualbox/VBoxHeadless.so
- usr/lib/virtualbox/VBoxRT.so
- usr/lib/virtualbox/VBoxREM.so
- usr/lib/virtualbox/VBoxSettings.so
- usr/lib/virtualbox/VBoxKeyboard.so
- usr/lib/virtualbox/VBoxSharedCrOpenGL.so
- usr/lib/virtualbox/VBoxVMM.so
- usr/lib/virtualbox/VirtualBox.so
- usr/lib/virtualbox/VBoxOGLhosterrorspu.so
- usr/lib/virtualbox/components/VBoxC.so
- usr/lib/virtualbox/components/VBoxSVCM.so
- usr/lib/virtualbox/components/VBoxDDU.so
- usr/lib/virtualbox/components/VBoxRT.so
- usr/lib/virtualbox/components/VBoxREM.so
- usr/lib/virtualbox/components/VBoxVMM.so
- usr/lib/virtualbox/VBoxREM32.so
- usr/lib/virtualbox/VBoxPython2_7.so
- usr/lib/virtualbox/VBoxXPCOMC.so
- usr/lib/virtualbox/VBoxOGLhostcrutil.so
- usr/lib/virtualbox/VBoxNetDHCP.so
- usr/lib/virtualbox/VBoxNetNAT.so"
-
-S="${WORKDIR}/${MY_P}"
-
-REQUIRED_USE="
- java? ( sdk )
- python? ( sdk )
- vboxwebsrv? ( java )
- ${PYTHON_REQUIRED_USE}
-"
-
-pkg_pretend() {
- if ! use headless && ! use qt5 ; then
- einfo "No USE=\"qt5\" selected, this build will not include any Qt frontend."
- elif use headless && use qt5 ; then
- einfo "You selected USE=\"headless qt5\", defaulting to"
- einfo "USE=\"headless\", this build will not include any X11/Qt frontend."
- fi
-
- if ! use opengl ; then
- einfo "No USE=\"opengl\" selected, this build will lack"
- einfo "the OpenGL feature."
- fi
- if ! use python ; then
- einfo "You have disabled the \"python\" USE flag. This will only"
- einfo "disable the python bindings being installed."
- fi
-}
-
-pkg_setup() {
- java-pkg-opt-2_pkg_setup
- python-single-r1_pkg_setup
-
- tc-ld-disable-gold #bug 488176
- tc-export CC CXX LD AR RANLIB
- export HOST_CC="$(tc-getBUILD_CC)"
-}
-
-src_prepare() {
- # Remove shipped binaries (kBuild,yasm), see bug #232775
- rm -r kBuild/bin tools || die
-
- # Replace pointless GCC version check with something less stupid.
- # This is needed for the qt5 version check.
- sed -e 's@^check_gcc$@cc_maj="$(gcc -dumpversion | cut -d. -f1)" ; cc_min="$(gcc -dumpversion | cut -d. -f2)"@' \
- -i configure || die
-
- # Disable things unused or split into separate ebuilds
- sed -e "s@MY_LIBDIR@$(get_libdir)@" \
- "${FILESDIR}"/${PN}-5-localconfig > LocalConfig.kmk || die
-
- # Respect LDFLAGS
- sed -e "s@_LDFLAGS\.${ARCH}*.*=@& ${LDFLAGS}@g" \
- -i Config.kmk src/libs/xpcom18a4/Config.kmk || die
-
- # Do not use hard-coded ld (related to bug #488176)
- sed -e '/QUIET)ld /s@ld @$(LD) @' \
- -i src/VBox/Devices/PC/ipxe/Makefile.kmk || die
-
- # Use PAM only when pam USE flag is enbaled (bug #376531)
- if ! use pam ; then
- elog "Disabling PAM removes the possibility to use the VRDP features."
- sed -i 's@^.*VBOX_WITH_PAM@#VBOX_WITH_PAM@' Config.kmk || die
- sed -i 's@\(.*/auth/Makefile.kmk.*\)@#\1@' \
- src/VBox/HostServices/Makefile.kmk || die
- fi
-
- # add correct java path
- if use java ; then
- sed "s@/usr/lib/jvm/java-6-sun@$(java-config -O)@" \
- -i "${S}"/Config.kmk || die
- java-pkg-opt-2_src_prepare
- fi
-
- # Only add nopie patch when we're on hardened
- if gcc-specs-pie ; then
- eapply "${FILESDIR}/050_virtualbox-5.2.8-nopie.patch"
- fi
-
- # Only add paxmark patch when we're on pax_kernel
- if use pax_kernel ; then
- eapply "${FILESDIR}"/virtualbox-5.2.8-paxmark-bldprogs.patch
- fi
-
- eapply "${WORKDIR}/patches"
-
- eapply_user
-}
-
-doecho() {
- echo "$@"
- "$@" || die
-}
-
-src_configure() {
- local myconf=(
- --with-gcc="$(tc-getCC)"
- --with-g++="$(tc-getCXX)"
- --disable-dbus
- --disable-kmods
- $(usex alsa '' --disable-alsa)
- $(usex debug --build-debug '')
- $(usex doc '' --disable-docs)
- $(usex java '' --disable-java)
- $(usex lvm '' --disable-devmapper)
- $(usex opus '' --disable-libopus)
- $(usex pulseaudio '' --disable-pulse)
- $(usex python '' --disable-python)
- $(usex vboxwebsrv --enable-webservice '')
- $(usex vnc --enable-vnc '')
- )
- if ! use headless ; then
- myconf+=(
- $(usex opengl '' --disable-opengl)
- $(usex qt5 '' --disable-qt)
- )
- else
- myconf+=(
- --build-headless
- --disable-opengl
- )
- fi
- if use amd64 && ! has_multilib_profile ; then
- myconf+=( --disable-vmmraw )
- fi
- # not an autoconf script
- doecho ./configure ${myconf[@]}
-}
-
-src_compile() {
- source ./env.sh || die
-
- # Force kBuild to respect C[XX]FLAGS and MAKEOPTS (bug #178529)
- MAKEJOBS=$(grep -Eo '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' <<< ${MAKEOPTS}) #'
- MAKELOAD=$(grep -Eo '(\-l|\-\-load-average)(=?|[[:space:]]*)[[:digit:]]+' <<< ${MAKEOPTS}) #'
- MAKEOPTS="${MAKEJOBS} ${MAKELOAD}"
- MAKE="kmk" emake \
- VBOX_BUILD_PUBLISHER=_Gentoo \
- TOOL_GXX3_CC="$(tc-getCC)" TOOL_GXX3_CXX="$(tc-getCXX)" \
- TOOL_GXX3_LD="$(tc-getCXX)" VBOX_GCC_OPT="${CXXFLAGS}" \
- TOOL_YASM_AS=yasm KBUILD_VERBOSE=2 \
- all
-}
-
-src_install() {
- cd "${S}"/out/linux.${ARCH}/$(usex debug debug release)/bin || die
-
- local vbox_inst_path="/usr/$(get_libdir)/${PN}" each size ico icofile
-
- vbox_inst() {
- local binary="${1}"
- local perms="${2:-0750}"
- local path="${3:-${vbox_inst_path}}"
-
- [[ -n "${binary}" ]] || die "vbox_inst: No binary given!"
- [[ ${perms} =~ ^[[:digit:]]+{4}$ ]] || die "vbox_inst: perms must consist of four digits."
-
- insinto ${path}
- doins ${binary}
- fowners root:vboxusers ${path}/${binary}
- fperms ${perms} ${path}/${binary}
- }
-
- # Create configuration files
- insinto /etc/vbox
- newins "${FILESDIR}/${PN}-4-config" vbox.cfg
-
- # Set the correct libdir
- sed \
- -e "s@MY_LIBDIR@$(get_libdir)@" \
- -i "${ED}"/etc/vbox/vbox.cfg || die "vbox.cfg sed failed"
-
- # Install the wrapper script
- exeinto ${vbox_inst_path}
- newexe "${FILESDIR}/${PN}-ose-6-wrapper" "VBox"
- fowners root:vboxusers ${vbox_inst_path}/VBox
- fperms 0750 ${vbox_inst_path}/VBox
-
- # Install binaries and libraries
- insinto ${vbox_inst_path}
- doins -r components
-
- # *.rc files for x86_64 are only available on multilib systems
- local rcfiles="*.rc"
- if use amd64 && ! has_multilib_profile ; then
- rcfiles=""
- fi
- for each in VBox{Autostart,BalloonCtrl,BugReport,CpuReport,ExtPackHelperApp,Manage,SVC,Tunctl,VMMPreload,XPCOMIPCD} *so *r0 ${rcfiles} iPxeBaseBin ; do
- vbox_inst ${each}
- done
-
- # These binaries need to be suid root.
- for each in VBox{Headless,Net{AdpCtl,DHCP,NAT}} ; do
- vbox_inst ${each} 4750
- done
-
- # Install EFI Firmware files (bug #320757)
- for each in VBoxEFI{32,64}.fd ; do
- vbox_inst ${each} 0644
- done
-
- # VBoxSVC and VBoxManage need to be pax-marked (bug #403453)
- # VBoxXPCOMIPCD (bug #524202)
- for each in VBox{Headless,Manage,SVC,XPCOMIPCD} ; do
- pax-mark -m "${ED}"${vbox_inst_path}/${each}
- done
-
- # Symlink binaries to the shipped wrapper
- for each in vbox{autostart,balloonctrl,bugreport,headless,manage} VBox{Autostart,BalloonCtrl,BugReport,Headless,Manage,VRDP} ; do
- dosym ${vbox_inst_path}/VBox /usr/bin/${each}
- done
- dosym ${vbox_inst_path}/VBoxTunctl /usr/bin/VBoxTunctl
-
- if use pam ; then
- # VRDPAuth only works with this (bug #351949)
- dosym VBoxAuth.so ${vbox_inst_path}/VRDPAuth.so
- fi
-
- # set an env-variable for 3rd party tools
- echo -n "VBOX_APP_HOME=${vbox_inst_path}" > "${T}/90virtualbox"
- doenvd "${T}/90virtualbox"
-
- if ! use headless ; then
- vbox_inst rdesktop-vrdp
- vbox_inst VBoxSDL 4750
- pax-mark -m "${ED}"${vbox_inst_path}/VBoxSDL
-
- for each in vboxsdl VBoxSDL ; do
- dosym ${vbox_inst_path}/VBox /usr/bin/${each}
- done
-
- if use qt5 ; then
- vbox_inst VirtualBox
- vbox_inst VirtualBoxVM 4750
- for each in VirtualBox{,VM} ; do
- pax-mark -m "${ED}"${vbox_inst_path}/${each}
- done
-
- if use opengl ; then
- vbox_inst VBoxTestOGL
- pax-mark -m "${ED}"${vbox_inst_path}/VBoxTestOGL
- fi
-
- for each in virtualbox{,vm} VirtualBox{,VM} ; do
- dosym ${vbox_inst_path}/VBox /usr/bin/${each}
- done
-
- insinto /usr/share/${PN}
- doins -r nls
- doins -r UnattendedTemplates
-
- domenu ${PN}.desktop
- fi
-
- pushd "${S}"/src/VBox/Artwork/OSE &>/dev/null || die
- for size in 16 32 48 64 128 ; do
- newicon -s ${size} ${PN}-${size}px.png ${PN}.png
- done
- newicon ${PN}-48px.png ${PN}.png
- doicon -s scalable ${PN}.svg
- popd &>/dev/null || die
- pushd "${S}"/src/VBox/Artwork/other &>/dev/null || die
- for size in 16 24 32 48 64 72 96 128 256 512 ; do
- for ico in hdd ova ovf vbox{,-extpack} vdi vdh vmdk ; do
- icofile="${PN}-${ico}-${size}px.png"
- if [[ -f "${icofile}" ]] ; then
- newicon -s ${size} ${icofile} ${PN}-${ico}.png
- fi
- done
- done
- popd &>/dev/null || die
- fi
-
- if use lvm ; then
- vbox_inst VBoxVolInfo 4750
- dosym ${vbox_inst_path}/VBoxVolInfo /usr/bin/VBoxVolInfo
- fi
-
- if use sdk ; then
- insinto ${vbox_inst_path}
- doins -r sdk
-
- if use java ; then
- java-pkg_regjar "${ED}/${vbox_inst_path}/sdk/bindings/xpcom/java/vboxjxpcom.jar"
- java-pkg_regso "${ED}/${vbox_inst_path}/libvboxjxpcom.so"
- fi
- fi
-
- if use udev ; then
- # New way of handling USB device nodes for VBox (bug #356215)
- local udevdir="$(get_udevdir)"
- insinto ${udevdir}
- doins VBoxCreateUSBNode.sh
- fowners root:vboxusers ${udevdir}/VBoxCreateUSBNode.sh
- fperms 0750 ${udevdir}/VBoxCreateUSBNode.sh
- insinto ${udevdir}/rules.d
- sed "s@%UDEVDIR%@${udevdir}@" "${FILESDIR}"/10-virtualbox.rules \
- > "${T}"/10-virtualbox.rules || die
- doins "${T}"/10-virtualbox.rules
- fi
-
- if use vboxwebsrv ; then
- vbox_inst vboxwebsrv
- dosym ${vbox_inst_path}/VBox /usr/bin/vboxwebsrv
- newinitd "${FILESDIR}"/vboxwebsrv-initd vboxwebsrv
- newconfd "${FILESDIR}"/vboxwebsrv-confd vboxwebsrv
- fi
-
- # Fix version string in extensions or else they don't get accepted
- # by the virtualbox host process (see bug #438930)
- find ExtensionPacks -type f -name "ExtPack.xml" -print0 \
- | xargs --no-run-if-empty --null sed -i '/Version/s@_Gentoo@@' \
- || die
-
- local extensions_dir="${vbox_inst_path}/ExtensionPacks"
-
- if use vnc ; then
- insinto ${extensions_dir}
- doins -r ExtensionPacks/VNC
- fi
-
- if use dtrace ; then
- insinto ${extensions_dir}
- doins -r ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack
- fi
-
- if use doc ; then
- dodoc UserManual.pdf
- fi
-
- newtmpfiles "${FILESDIR}"/${PN}-vboxusb_tmpfilesd ${PN}-vboxusb.conf
-}
-
-pkg_preinst() {
- xdg_pkg_preinst
-}
-
-pkg_postinst() {
- xdg_pkg_postinst
-
- if use udev ; then
- udevadm control --reload-rules \
- && udevadm trigger --subsystem-match=usb
- fi
-
- tmpfiles_process /usr/lib/tmpfiles.d/virtualbox-vboxusb.conf
-
- if ! use headless && use qt5 ; then
- elog "To launch VirtualBox just type: \"virtualbox\"."
- fi
- elog "You must be in the vboxusers group to use VirtualBox."
- elog ""
- elog "The latest user manual is available for download at:"
- elog "http://download.virtualbox.org/virtualbox/${PV}/UserManual.pdf"
- elog ""
- elog "For advanced networking setups you should emerge:"
- elog "net-misc/bridge-utils and sys-apps/usermode-utilities"
- elog ""
- elog "Starting with version 4.0.0, ${PN} has USB-1 support."
- elog "For USB-2 support, PXE-boot ability and VRDP support please emerge"
- elog " app-emulation/virtualbox-extpack-oracle"
- elog "package."
- elog "Starting with version 5.0.0, ${PN} no longer has the \"additions\" and"
- elog "the \"extension\" USE flag. For installation of the guest additions ISO"
- elog "image, please emerge"
- elog " app-emulation/virtualbox-additions"
- elog "and for the USB2, USB3, VRDP and PXE boot ROM modules, please emerge"
- elog " app-emulation/virtualbox-extpack-oracle"
- if ! use udev ; then
- elog ""
- elog "WARNING!"
- elog "Without USE=udev, USB devices will likely not work in ${PN}."
- elif [[ -e "${ROOT}/etc/udev/rules.d/10-virtualbox.rules" ]] ; then
- elog ""
- elog "Please remove \"${ROOT}/etc/udev/rules.d/10-virtualbox.rules\""
- elog "or else USB in ${PN} won't work."
- fi
-}
-
-pkg_postrm() {
- xdg_pkg_postrm
-}
diff --git a/app-emulation/winetricks/Manifest b/app-emulation/winetricks/Manifest
index ed0ad53c15d7..b78fe113ecd7 100644
--- a/app-emulation/winetricks/Manifest
+++ b/app-emulation/winetricks/Manifest
@@ -1,5 +1,7 @@
DIST winetricks-20200412.tar.gz 684548 BLAKE2B e29eba0c73ec0649523dac0f0efd145a5c9fe60d94ae98bc55ec430f511cc5bdf3149d87289973a85a373f2f91c3bd5521470853e06f5ec4af83fc810aa4fdc5 SHA512 d6ca5628b7d296b3168ef088ca0b03aff8b73da8a139061ca64fac0685ec29bf2b7e075b89226f8ce3af511947eac45d4c72cfb1199e6b72666fc67547b77588
+DIST winetricks-20201206.tar.gz 690966 BLAKE2B 8304d64657fdd921974f0c326bb4e0e1d859a69e573a7387c945c7dbfd20540621cc9c89718069b569309ac2358872083d651d29ddce616d1c2cf9a12ed39943 SHA512 6965bea9bc8bb212fe2b851a53dd144c52b37466cd0d6d6a933e4e0c16b202647f1b19804159642ce9fda566872ca51e8326e8716fafdea43cd09f24ed6b4a25
DIST winetricks-gentoo-2012.11.24.tar.bz2 6398 BLAKE2B 54a4502f6e8ef15d21b02c43e3ce599e32d476c2559246064de14cc4ce2243ff11dde681d24c8a7f4913c3d7a10b855bda47e8fb8ecad31e00d839705416be6f SHA512 59c93b73f3a7b2d11aefcde2ff66659ff1de21ad4b5f232f4b60572f3a48b15a6c49f369b1696862bf1b33fde190bf5598945e9536fb41ddec42d8def4d2be2a
EBUILD winetricks-20200412.ebuild 2051 BLAKE2B d37bffe1f2386eb52a2cd1697b7e9c8ea67807ac400fa4474b22e76a83aeeae04176215d9fa64845e1627723d9ba3c18c03c6b0e020e1db3a50fb04ce378e50b SHA512 bde6f11832da7d9efcbdf226ed7f37b9a2b7da1eb79001dc00ea398c5eadc41f0bc5821d19cbdbf9a1c4df80a395dc5cf718b2e51ad051a64141a41758eacc5e
-EBUILD winetricks-99999999.ebuild 2053 BLAKE2B 7397013ffbeafd1bf53b64d8980132a86cf48bada822049d75012753bd5a88e34a84b8d0e5909f99d5b63503683a0f85be4aa180279b529a00c2d9db8e7ecbde SHA512 d0c888efb8cc8a8a4976e1900741a6b7172280050805e3ee41f811694fdc363ba6563d149334cded5d8e950ff6af70987d3ea824dc8432498e41d6afea4278d9
+EBUILD winetricks-20201206.ebuild 1997 BLAKE2B fc9bd9fd39e90ed9786dcb37910a0f2150b012460f7feba37bafedcf7df7e78146e1de812a42314aa7a9c048f796f25cb1be470fb9201719dfbf6884d8a80d58 SHA512 0b132794ce98987a5da0a4167fd14c29866278ee949521509f1f981762f1306bf2f1dbb92d42c0354af89e28790c8f5bc6d78d467aba6b8bba15a49822fe878c
+EBUILD winetricks-99999999.ebuild 1997 BLAKE2B fc9bd9fd39e90ed9786dcb37910a0f2150b012460f7feba37bafedcf7df7e78146e1de812a42314aa7a9c048f796f25cb1be470fb9201719dfbf6884d8a80d58 SHA512 0b132794ce98987a5da0a4167fd14c29866278ee949521509f1f981762f1306bf2f1dbb92d42c0354af89e28790c8f5bc6d78d467aba6b8bba15a49822fe878c
MISC metadata.xml 713 BLAKE2B 7d9673350201c49de4651ecb8975ed21387259f3375c1b531b63b2a0e0e65f0b2540806db5f6d1d47953911ca36b0d06bf8edaa57ad5e546d242eebcd96f869f SHA512 2a4c5a6ecfc558f3c7382538b8701ab95c3d771a02c51f5dae852a0e90b7df51be65200b337bcc3c92ef9bf827c23954097b3b5e8c99004db729ed6d77e64cfc
diff --git a/app-emulation/winetricks/winetricks-20201206.ebuild b/app-emulation/winetricks/winetricks-20201206.ebuild
new file mode 100644
index 000000000000..89dcbb57c973
--- /dev/null
+++ b/app-emulation/winetricks/winetricks-20201206.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit xdg
+
+if [[ ${PV} == "99999999" ]] ; then
+ EGIT_REPO_URI="https://github.com/Winetricks/${PN}.git"
+ inherit git-r3
+ SRC_URI=""
+else
+ SRC_URI="https://github.com/Winetricks/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~x86"
+fi
+
+wtg="winetricks-gentoo-2012.11.24"
+
+SRC_URI="${SRC_URI}
+ gtk? ( https://dev.gentoo.org/~chiitoo/distfiles/${wtg}.tar.bz2 )
+ kde? ( https://dev.gentoo.org/~chiitoo/distfiles/${wtg}.tar.bz2 )
+"
+
+DESCRIPTION="Easy way to install DLLs needed to work around problems in Wine"
+HOMEPAGE="https://github.com/Winetricks/winetricks https://wiki.winehq.org/Winetricks"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+IUSE="gtk kde rar test"
+RESTRICT="!test? ( test )"
+
+# dev-util/shellcheck is not available for x86
+RESTRICT+=" x86? ( test )"
+
+BDEPEND="
+ test? (
+ dev-python/bashate
+ dev-util/checkbashisms
+ || (
+ dev-util/shellcheck-bin
+ dev-util/shellcheck
+ )
+ )
+"
+DEPEND=""
+RDEPEND="${DEPEND}
+ app-arch/cabextract
+ app-arch/p7zip
+ app-arch/unzip
+ net-misc/wget
+ virtual/wine
+ x11-misc/xdg-utils
+ gtk? ( gnome-extra/zenity )
+ kde? ( kde-apps/kdialog )
+ rar? ( app-arch/unrar )
+"
+
+# Test targets include syntax checks only, not the "heavy duty" tests
+# that would require a lot of disk space, as well as network access.
+
+# This uses a non-standard "Wine" category, which is provided by
+# '/etc/xdg/menus/applications-merged/wine.menu' from the
+# 'app-emulation/wine-desktop-common' package.
+# https://bugs.gentoo.org/451552
+QA_DESKTOP_FILE="usr/share/applications/winetricks.desktop"
+
+src_unpack() {
+ if [[ ${PV} == "99999999" ]]; then
+ git-r3_src_unpack
+
+ if use gtk || use kde; then
+ unpack ${wtg}.tar.bz2
+ fi
+
+ else
+ default
+ fi
+}
+
+src_test() {
+ ./tests/shell-checks || die "Test(s) failed."
+}
+
+src_install() {
+ default
+
+ if ! use gtk && ! use kde; then
+ rm -r "${ED}"/usr/share/applications || die
+ rm -r "${ED}"/usr/share/icons || die
+ fi
+}
diff --git a/app-emulation/winetricks/winetricks-99999999.ebuild b/app-emulation/winetricks/winetricks-99999999.ebuild
index 3b4cea7a0559..89dcbb57c973 100644
--- a/app-emulation/winetricks/winetricks-99999999.ebuild
+++ b/app-emulation/winetricks/winetricks-99999999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-inherit desktop xdg
+inherit xdg
if [[ ${PV} == "99999999" ]] ; then
EGIT_REPO_URI="https://github.com/Winetricks/${PN}.git"
@@ -84,10 +84,8 @@ src_test() {
src_install() {
default
- if use gtk || use kde; then
- cd "${WORKDIR}/${wtg}" || die
- domenu winetricks.desktop
- insinto /usr/share/icons/hicolor/scalable/apps
- doins wine-winetricks.svg
+ if ! use gtk && ! use kde; then
+ rm -r "${ED}"/usr/share/applications || die
+ rm -r "${ED}"/usr/share/icons || die
fi
}
diff --git a/app-metrics/Manifest.gz b/app-metrics/Manifest.gz
index 07ef43e1e23b..bf9adb880b50 100644
Binary files a/app-metrics/Manifest.gz and b/app-metrics/Manifest.gz differ
diff --git a/app-metrics/openvpn_exporter/Manifest b/app-metrics/openvpn_exporter/Manifest
index 18d82b6025cb..479398e4d314 100644
--- a/app-metrics/openvpn_exporter/Manifest
+++ b/app-metrics/openvpn_exporter/Manifest
@@ -29,5 +29,5 @@ DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181108010431-42b317875d0f.zip 24743 B
DIST openvpn_exporter-0.2.1.tar.gz 10126 BLAKE2B 06899bdc151232b6588e865ccdb69c4cc0b4f618de8b8d03240d72c7fe2acade2c65b60597f744936c19c603da0e0f924b8910a5898349a42884f91deb882e59 SHA512 9cbf859be78337e15c1e3ba0c2dc687afc18b4879af68b7b9fe823aebb415c8b430aedb7e31ffdd1685c582632db1427504a1fb874aac49c8ef11df4345ecca1
DIST openvpn_exporter-0.3.0.tar.gz 11505 BLAKE2B 61a991e3ea8001a9481b8207c83316c1e028a68f657f3de191b7d69d7a3fefa753663292c2d77d09ef6024f9392b0077fc5170f2e8a19c0397240281dec09482 SHA512 4bea502e7dfd32e5fea9fc21fbfdb65ddcb381d6d1b5463c361e60026f88693912b998979e9fab3e455196eb7dec1677dc9feb293f4f14609f4352eb9d238cd9
EBUILD openvpn_exporter-0.2.1.ebuild 1542 BLAKE2B fb8a7c75b75ff6538af664c93139d7083d843792554f914947b89695ba5a25d9d6595018d3329c7b6368d05c0dd2a5e95acca842fac4089ac46acad4f0f8d6b8 SHA512 0d1fbab3dee51b1e5a863ddf83025c75c1906398773599431bbcce88c583438947dd44deca9fa34e69abc16fa500becefcaf99007790ed54da23f87ba4ef60cf
-EBUILD openvpn_exporter-0.3.0.ebuild 2010 BLAKE2B 24e1781eb4e3ef5a5c24bb7330f24d95e9f1a3201255dcd1b531c90fd6a60f667630e4dcc8400e1ca46e68ca34f0e9c0f1973c1d58c5718bc292e00be502f7b6 SHA512 a3b33fc848114eb0e71cf5b8f39b6d36a9ae3a7983b9089c8e8555f337e1e1d1b3469522d745c7b5024a4ac7d578325055609d22980ba85562fd6df77a89cadc
+EBUILD openvpn_exporter-0.3.0.ebuild 2010 BLAKE2B 0ffb902719f294b29d932b72a91c5b8063e83f8530cf2a2a3b85fb73cc26108d55d3e39d890e96764787c0be3e3c2a0f926edc86a6550016574e4d8489ed4dee SHA512 f776c7b12d4cad4bd418a4be8ebd84db93ed5927af5e27627a64f39fed776eb6ed9fa61f4c6d39a1ab9f21931e753f4fd32fbe06fe707243b100a4d003e00234
MISC metadata.xml 336 BLAKE2B fb4eabbee6ee8a353c2024ccf23b68482a4af72fae31d6539fca9680c3d0113f56aa740abb1b545f6a607e7618c222c54e35ff74705eb33f60bb9b49e3a926b6 SHA512 aeb14e5633d68c01ce32750f3557bedce69622115cead0029dc981f13a0cb67bc00100d7c3e6b668871579f71e1f73606084f0b16b6920df4c6b7321db60f134
diff --git a/app-metrics/openvpn_exporter/openvpn_exporter-0.3.0.ebuild b/app-metrics/openvpn_exporter/openvpn_exporter-0.3.0.ebuild
index 1d562cb554c7..759b08a9f34b 100644
--- a/app-metrics/openvpn_exporter/openvpn_exporter-0.3.0.ebuild
+++ b/app-metrics/openvpn_exporter/openvpn_exporter-0.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -38,10 +38,12 @@ SLOT="0"
KEYWORDS="~amd64"
IUSE=""
-COMMON_DEPEND="acct-group/openvpn_exporter
- acct-group/openvpn_exporter"
- DEPEND="${COMMON_DEPEND}"
- RDEPEND="${COMMON_DEPEND}"
+COMMON_DEPEND="
+ acct-user/openvpn_exporter
+ acct-group/openvpn_exporter
+"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}"
src_compile() {
go build -o ${PN} || die
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index f1768ab3b89f..ad4c4c79d14b 100644
Binary files a/app-misc/Manifest.gz and b/app-misc/Manifest.gz differ
diff --git a/app-misc/g810-led/Manifest b/app-misc/g810-led/Manifest
index cf79bbeb786e..2d2adbe6e3ff 100644
--- a/app-misc/g810-led/Manifest
+++ b/app-misc/g810-led/Manifest
@@ -1,3 +1,5 @@
DIST g810-led-0.3.6.tar.gz 34544 BLAKE2B 142fd54d7721a1deebfb019b644a4c8ab0fd5e1662391075cea67a4c7b7145034101f14c22975bdf079ee5b8e56c4a73e18fe31ce5d7fcf20ff4b9c64ee85502 SHA512 5a1877ee135a662bc5eb15c1afe5370cfe9243b4479823e3492f0da8f407b1438e3d7e35bd9992eea8dcbd4d548c9acdb7e74f4c99efbd4e9e8e6ddae33f8a5b
+DIST g810-led-0.4.2.tar.gz 36669 BLAKE2B 738ca1849b05ddc35e42c258f67b2fedc2ab207594a32111aeca8cb1cffa99580e0f22e57ea92aff0e49f546e871b5af1c77cd5830349af98c9a977b27a0186b SHA512 03e62265964b6d47d474b57a92beb3a017e8479113750e7d52790d0779b8893eb7e3761f236db94ff1e1ddb0424c711fd1a35c869d0f93ad68104b1ddd2bf1e8
EBUILD g810-led-0.3.6.ebuild 1030 BLAKE2B d4e1cad7408ceb58c18e56906de4f9eb6245b31f5742cb3e692f16f4282d4bda92ea84148c71d8ffa7dc17d68a73e03aefad3da2b72fe86cdcdaa43e8fa5b18f SHA512 1f961c941a7b797de5b68b45b5237fabefcca53b841437dbc6d2adfefb0c744851bce2c891ffaa234236b407d0866ea1971368cc6931952b8888e2c8b3a6764a
+EBUILD g810-led-0.4.2.ebuild 2033 BLAKE2B 1624115e3b4412155f618b05aa73edc024b3cd6076be42453714cff38add7910b4874068dc4b6b0b08c8698120b85817caabefa000432b8c6a601da09c0acefd SHA512 e3f30b558a9c9325a500a3c50999ba1b7132665f2ae8bd8650484221778c0dab825a670460314d27ba102efcd65ff685110e334cde9bea207a1acb344f0c0a88
MISC metadata.xml 610 BLAKE2B dc374b0b903c17b3418871362fbfe6bd47704f2d9d7895ffbbdfa468f98e42708d385d844cd96b04b88646f5b71f4acfae659c99f7c2fc5bcdcfbdb4eef18303 SHA512 978a7c99bf4e5f7a79e04055871645438322b950b8274512bdca9563050449ad395e40ba479ba70914aaef60bd86c3b41aab05f070e79fd7dbc61c941cb59fb8
diff --git a/app-misc/g810-led/g810-led-0.4.2.ebuild b/app-misc/g810-led/g810-led-0.4.2.ebuild
new file mode 100644
index 000000000000..5e5b098aef05
--- /dev/null
+++ b/app-misc/g810-led/g810-led-0.4.2.ebuild
@@ -0,0 +1,77 @@
+# Copyright 2018-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit eutils systemd toolchain-funcs udev
+
+DESCRIPTION="Led controller for Logitech G- Keyboards"
+HOMEPAGE="https://github.com/MatMoul/g810-led"
+SRC_URI="https://github.com/MatMoul/g810-led/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+hidapi"
+
+RDEPEND="
+ hidapi? ( dev-libs/hidapi:= )
+ !hidapi? ( virtual/libusb:= )
+ "
+DEPEND="${RDEPEND}"
+
+DOCS=("README.md" "sample_profiles" "sample_effects")
+
+src_prepare() {
+ default
+ # See
+ # https://github.com/systemd/systemd/issues/4288
+ # https://sourceforge.net/p/sigrok/mailman/sigrok-devel/thread/12691365.gQiffmFRoU%40pebbles.site/
+ # We remove the MODE-bit since it's already set to 660+GROUP="input" by default udev rules
+ sed -i \
+ -e 's|MODE="666"|TAG+="uaccess",|' \
+ udev/g810-led.rules || die
+}
+
+src_compile() {
+ emake LIB="$(usex hidapi hidapi libusb)" CXX="$(tc-getCXX)" bin-linked
+}
+
+src_install() {
+ dolib.so "lib/libg810-led.so.${PV}"
+ dosym "libg810-led.so.${PV}" "/usr/$(get_libdir)/libg810-led.so"
+
+ insinto /etc/g810-led/
+ newins sample_profiles/group_keys profile
+ newins sample_profiles/all_off reboot
+
+ dobin bin/g810-led
+ local boards=(213 410 413 512 513 610 815 910 pro)
+ local x
+ for x in "${boards[@]}"; do
+ dosym g810-led "/usr/bin/g${x}-led"
+ done
+
+ insinto /usr/include/g810-led
+ doins src/classes/*.h
+
+ systemd_dounit systemd/g810-led.service
+ systemd_dounit systemd/g810-led-reboot.service
+
+ udev_newrules udev/g810-led.rules 60-g810-led.rules
+
+ einstalldocs
+}
+
+pkg_postinst() {
+ elog "The file /etc/g810-led/profile is run on boot and device insertion."
+ elog "The default file can be replaced by other examples:"
+ elog "/usr/share/doc/${PF}/sample_profiles"
+ elog "Read the documentation in:"
+ elog "/usr/share/doc/${PF}/"
+ elog "to make your own."
+ if systemd_is_booted; then
+ elog "To turn off the LEDs on shutdown and save power, do:"
+ elog "systemctl enable g810-led-reboot.service"
+ fi
+}
diff --git a/app-misc/geneweb/Manifest b/app-misc/geneweb/Manifest
index a70a76283d38..0660e1a23f04 100644
--- a/app-misc/geneweb/Manifest
+++ b/app-misc/geneweb/Manifest
@@ -5,5 +5,5 @@ AUX geneweb.initd 429 BLAKE2B d216c7970cd7e62a3732faeee6ac97062712023a6bbad6d654
DIST geneweb-6.08.01.tar.gz 1796215 BLAKE2B 4b7d05126d244984b62ebadda3419ba8cf97326ac3103c73ca5433a8f9edeab8acd968d05942d299e70127bcf75efe5cb9a9af9f7d97ec08fd9a8a6a5aae100d SHA512 54e1ed05e540f1de167c66dee46976a8324a37ca36a9dfd6ab03105fe925053c570842e1a263499fd8bd7aecfebac8f9596b1573fcec1e104e3892337376f84d
DIST geneweb-7.0.0.tar.gz 14767981 BLAKE2B 3a0a777a934d26fa91bd94d20311c6147e749961035b57aed8322c4e96f5cead2edde3a96e362b5de35073fa594d4cb5f3ef0f4d7eeaebea2095bfeef37740b6 SHA512 359b8e2258d572198a7516dd03830e536038392d552482f25fe4b93ded76dccebfe3c420eb2ba1a566500200755c87cbe19a2060eaeea895bd84c505b7b65345
EBUILD geneweb-6.08.01.ebuild 2193 BLAKE2B fbd1b8f71b4c1e1e33956659b08f5e4ea441a8266dae4b65103721520851e2a6eaa0f5c9d8a35d261a4677d1b1d88c939064fcc933e1e0952202c880ab251b1b SHA512 8c2c767970c1f6bcf9824ce5b4003e6452ada10a2c31b49f707a1aa9c8bff2323141065e553e3e07efef4a66568997769a6643ffb535748f1446832b1dbbbab0
-EBUILD geneweb-7.0.0-r1.ebuild 1874 BLAKE2B 680a796895db27360fd824a6373dd13920f0b93e05525b80b1f6fd2e943fe301338bfe60842d0e0b534ede6dae52bbdc9aeabe6576f2c3fb99050675dad4ddf7 SHA512 f3ad5766a831fb324cb7f793d3901852b3fa0175d403ee67a90172c7fb4866bcb0ab3f6b1013415540c241de0f874bead60a3098433cf17710b351783b538dcc
+EBUILD geneweb-7.0.0-r2.ebuild 1934 BLAKE2B 04e90baccb0d0de3cd55a5432559345aa75695351a8cb5d7f0094f86afb64b5d9e6ae65907b67f434e1054e42e7cb2e37e66eeaf6fe6b0f3813b95b99d04a2ab SHA512 b8bbf0d34066689a02279b14df73b32c78e4b4d791a961f0e72e084975ba04649da12c3dc2e2f53e51a77dc78b3786bcc66f161a0b7249f7d7e31778fb5ca824
MISC metadata.xml 652 BLAKE2B 0a523f6b4dd3d65cf1668c16c07d1a9a4547bbcb9a800c4f9f706973d159ce434c2567d5b23609bd33f8c5f3ca4a25d8e7c485e15a640a941d21fd29fd52589d SHA512 7c94f8655959224e21113156e943d28dc9653f767fcd0cb6a9e7ec149abf3deabe850b404ba3b92384fd5bc919cce973c73b622746efc2a2862c86a62136d973
diff --git a/app-misc/geneweb/geneweb-7.0.0-r1.ebuild b/app-misc/geneweb/geneweb-7.0.0-r2.ebuild
similarity index 88%
rename from app-misc/geneweb/geneweb-7.0.0-r1.ebuild
rename to app-misc/geneweb/geneweb-7.0.0-r2.ebuild
index b7c12813fba3..9ab366e9baa7 100644
--- a/app-misc/geneweb/geneweb-7.0.0-r1.ebuild
+++ b/app-misc/geneweb/geneweb-7.0.0-r2.ebuild
@@ -11,20 +11,21 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE="+ocamlopt"
-RESTRICT="strip"
+IUSE="+ocamlopt test"
+RESTRICT="strip !test? ( test )"
RDEPEND="dev-lang/ocaml[ocamlopt?]
- dev-ml/camlp5[ocamlopt?]
+ =dev-ml/markup-1.0.0
- dev-ml/unidecode
- dev-ml/calendars"
+ dev-ml/jingoo:=
+ dev-ml/uunf:=
+ >=dev-ml/markup-1.0.0:=
+ dev-ml/unidecode:=
+ dev-ml/calendars:="
DEPEND="${RDEPEND}
- dev-ml/cppo"
+ dev-ml/cppo
+ test? ( dev-ml/ounit )"
QA_FLAGS_IGNORED=(
/usr/bin/gwb2ged
diff --git a/app-misc/pdfpc/Manifest b/app-misc/pdfpc/Manifest
index c7d35f0d495f..48c4f71390fe 100644
--- a/app-misc/pdfpc/Manifest
+++ b/app-misc/pdfpc/Manifest
@@ -1,5 +1,7 @@
DIST pdfpc-4.3.0.tar.gz 107235 BLAKE2B 290a11f970ca16ea3ce3d724f1e62cd1b347b51dfc70162e61f80fb2ef630e18963c55ff99741c9c6a0fdd85c109371e660614b0af15b63dae524e21f534001c SHA512 a7e3efecd988ecdec8b0856a7a140ef8f6f3abcc56ecd7c1193f8b1c3723c9193fa3ea48dd9286d8c90d72983fc5a8ad75be7a40cd2c6196cc1361fa3c338ac0
DIST pdfpc-4.4.0.tar.gz 7733136 BLAKE2B e0bae93803561e8d7a96621baef4e8e2d038324dd28c31ce9cc05a8e42dafda101eb7eb2cea258bd66a41dff904c6a95e8c9cb50b236780564b9501edf3aeef8 SHA512 4f5d013ae513ba5f106638401cccd280e1a77535747663963a566c8b9ddc7b87c0ae1859220586ed66d294902674d54cea4256c72320ad3005e3e47cc8ea57a3
+DIST pdfpc-4.4.1.tar.gz 7733986 BLAKE2B 4232dedbda6423e95259169348a36196a539ed966e50a230390a6f99dbff6c9710d0c41be11436005454858a213ff5f07d1b1f26fd67973f20812111eea81d79 SHA512 61db48eae75f0e55f7d7b728bc107827b9f141826c3c55be4fb90faf95eaac2dbef1858eb1b7a3e5980130ee09c4096812a3403451f2a52052c29e4fb7be458f
EBUILD pdfpc-4.3.0.ebuild 1014 BLAKE2B 5865c6ddb7f777d0e6f0882dd9198030b101c934c6bb2bda06e7b6766225a43e717ec8462db1e1018292862fe5ba05380c7f6223fd83486a1c6189b8eb1824d7 SHA512 34473475f604b45312884eaed52ecafe727499d2bb81f6c857dd4b3ee380dcc06e5130fbbb3cdd329395652008902a4cd07fa3882474103fa1e60a0a0f4119ed
EBUILD pdfpc-4.4.0.ebuild 1018 BLAKE2B ad2e1b87467798caf25736123a267f6e6b38779ac734a36ebb93f6fc65aab2fd7277a38dbe48282da212a4d6d63de7bdedf882a8dcb9de06b3502427d03ab79d SHA512 8a92dbeeb501dfd8dc1d8fb824b605ab4e6cbab54761bac596ef4acaad9e042e5a5fc4132e007337133e8e2aba2d4339d3ab65e5ec2f1fd5728505e28afe2af4
+EBUILD pdfpc-4.4.1.ebuild 1244 BLAKE2B c8ee12af08a4a0e7830e62bc6b079ba68870c44e58058f6235507484ff6da1f159e6b515239d2c5b7a82b88eaee284f7813ea17ec1d739b6b038256ae0e9958b SHA512 eadfa044d9532a66ac600b5f4886f125550495e496955faf3e08022908f2d56c14c896fa617f14c92940c3f5eeac18a477b1c0a6370d7ba16ab299ecd3a797d0
MISC metadata.xml 442 BLAKE2B 2c0c51b3e75d8e7012fa16b4d289c16c929c15c9967d648dd7d4dd474c930deccd53f39cc6324bca81a697acd700e04eacca5d34f6e66fb320c2b01d602f9b0b SHA512 63c75c7e256649f353b2e0015d9952a7a51c6f49c09c37acc45a1aae6560ee5df0f7969d2bf9c9161a059238b5ba21858e94fc5a3736345d5bf75482e4278fa3
diff --git a/app-misc/pdfpc/pdfpc-4.4.1.ebuild b/app-misc/pdfpc/pdfpc-4.4.1.ebuild
new file mode 100644
index 000000000000..c767bbae520c
--- /dev/null
+++ b/app-misc/pdfpc/pdfpc-4.4.1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+VALA_MIN_API_VERSION="0.34"
+VALA_MAX_API_VERSION="0.50" # append versions in sed line if increased
+
+inherit cmake vala
+
+DESCRIPTION="Presenter console with multi-monitor support for PDF files"
+HOMEPAGE="https://pdfpc.github.io"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+# Note: Relicensing to GPL-3+ for >pdfpc-4.4.1, see
+# https://github.com/pdfpc/pdfpc/commit/2a2c9b71467db801a3a0c6e5aabc8794004216bb
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+gstreamer"
+
+RDEPEND="
+ app-text/poppler:=[cairo]
+ dev-libs/glib:2
+ dev-libs/libgee:0.8=
+ gnome-base/librsvg
+ sys-apps/dbus
+ x11-libs/gtk+:3
+ gstreamer? (
+ media-libs/gstreamer:1.0=
+ media-libs/gst-plugins-base:1.0=
+ media-plugins/gst-plugins-gtk:1.0=
+ media-plugins/gst-plugins-cairo:1.0=
+ )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="$(vala_depend)"
+
+src_prepare() {
+ cmake_src_prepare
+
+ sed -i -e "s/valac/valac valac-0.50 valac-0.48 valac-0.46 valac-0.44 valac-0.40 valac-0.36/" cmake/vala/FindVala.cmake || die
+ vala_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DMOVIES=$(usex gstreamer on off)
+ )
+ cmake_src_configure
+}
diff --git a/app-misc/vifm/Manifest b/app-misc/vifm/Manifest
index 7c924287b5f0..5815b42f57eb 100644
--- a/app-misc/vifm/Manifest
+++ b/app-misc/vifm/Manifest
@@ -1,5 +1,3 @@
-DIST vifm-0.10.1.tar.bz2 1097998 BLAKE2B b9712d61a00761986aa54d9bc561a5125ae96f751e8ba2844adae91577ba093b1a4860071b57ab81dbed3eb52c2c91ce3316831fa44a06436ef5fa81d2739f3a SHA512 8116c4c31b01a9453684a90b26b87a33e5ec2cd2930162869507f673319d231f44e464d1056239f647531c3be5bc9bcf92045c79e5d545f9c75be11c7fe03ea2
DIST vifm-0.11.tar.gz 1525791 BLAKE2B c2aa6d3ddd0304ce1e3a0d1c9ac3218a783bc6dd8eebf7b3346ca262811f63dac75597913ad4883c62680cb77036c2985ca4ce88989a0dd0212dce975d8ec8b8 SHA512 15ace460da6d5f9bb7a016d8bb3f3d9cba47a608da5a39defbf7d09ff9de64c90a63a44264d695fe005f2f6d27ecb07dcec8f4ed5aef15e9d8728b52f1168dbd
-EBUILD vifm-0.10.1.ebuild 2109 BLAKE2B aad52868d392db5234ca53c2694afdbb5626afc61b277b5031e76f08d859af76b26813eb689820c2f2d54c751935721515083f3cf7be35c94527eed736cdd4f7 SHA512 7f2ca99051e8e0dcfcb9bdbe1783e783cdf9c02f2f6b9f4434e16701cc9cacab77cc19014f202c56c3a22f5cfab1dc4163266cac51249f4c17a63c93bc3d2846
EBUILD vifm-0.11.ebuild 1780 BLAKE2B a194381f233f025f8a18cdbdc989921fb52d8a72a0acefeae24c69b6ea8c0cb16e599f007e848d537de1c80888415f44678408a880cb7f3ebb4e890c7be82e2b SHA512 b27a656abc42fce68750e7fe71f22e214cd02276940c930134e3bab10c725a14bf87905b717782c0bd503975768cbf474433dc53eaca957ea6e6a2830dd5a54b
MISC metadata.xml 1144 BLAKE2B 7fb3843c66347b41788014325145c08b79ab3d2ce4845501ca33a6e0a62454298351636a21a712528fe5ea3ff99b24fdaea4d27936024710866a50bf6370ebef SHA512 ceaa84abce6268f7ea54edef793d5f0df4586e2902059fa9c06fecd20f2b562740a8993c5248558fc85fe68fc2d70794b89e75400bad8868f7e8f1a51f897fbe
diff --git a/app-misc/vifm/vifm-0.10.1.ebuild b/app-misc/vifm/vifm-0.10.1.ebuild
deleted file mode 100644
index 0b697df0c6e7..000000000000
--- a/app-misc/vifm/vifm-0.10.1.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools vim-doc versionator xdg-utils
-
-MY_P=$(replace_version_separator 4 '-' ${PF})
-
-DESCRIPTION="Console file manager with vi(m)-like keybindings"
-HOMEPAGE="https://vifm.info/"
-SRC_URI="mirror://sourceforge/vifm/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="X developer +extended-keys gtk +magic vim vim-syntax"
-
-DEPEND="
- >=sys-libs/ncurses-5.9-r3:0
- magic? ( sys-apps/file )
- gtk? ( x11-libs/gtk+:2 )
- X? ( x11-libs/libX11 )
-"
-RDEPEND="
- ${DEPEND}
- vim? ( || ( app-editors/vim app-editors/gvim ) )
- vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
-"
-
-DOCS="AUTHORS FAQ NEWS README TODO"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
- default
- sed -i -e '/stat.h/a#include ' "${S}/src/modes/file_info.c" \
- || die
- eautoreconf
-}
-
-src_configure() {
- econf \
- $(use_enable developer) \
- $(use_enable extended-keys) \
- $(use_with magic libmagic) \
- $(use_with gtk) \
- $(use_with X X11)
-}
-
-src_compile() {
- default
-}
-
-src_install() {
- emake DESTDIR="${D}" install
- dodoc ${DOCS}
-
- if use vim; then
- local t
- for t in app plugin; do
- insinto /usr/share/vim/vimfiles/"${t}"
- doins "${S}"/data/vim/doc/"${t}"/"${PN}"*
- done
- fi
-
- if use vim-syntax; then
- local t
- for t in ftdetect ftplugin syntax; do
- insinto /usr/share/vim/vimfiles/"${t}"
- doins "${S}"/data/vim/"${t}"/"${PN}".vim
- done
- fi
-}
-
-src_test() {
- emake check
-}
-
-pkg_postinst() {
- xdg_desktop_database_update
- if use vim; then
- update_vim_helptags
-
- if [[ -n ${REPLACING_VERSIONS} ]]; then
- elog
- elog "You don't need to copy or link any files for"
- elog " the vim plugin and documentation to work anymore."
- elog "If you copied any vifm files to ~/.vim/ manually"
- elog " in earlier vifm versions, please delete them."
- fi
- elog
- elog "To use vim in vifm to view the documentation"
- elog " edit ~/.vifm/vifmrc and set vimhelp instead of novimhelp"
- elog
- fi
-}
-
-pkg_postrm() {
- xdg_desktop_database_update
- use vim && update_vim_helptags
-}
diff --git a/app-mobilephone/Manifest.gz b/app-mobilephone/Manifest.gz
index 026cf4771980..f453bb8f91f3 100644
Binary files a/app-mobilephone/Manifest.gz and b/app-mobilephone/Manifest.gz differ
diff --git a/app-mobilephone/smstools/Manifest b/app-mobilephone/smstools/Manifest
index 16596137a3aa..67ff0b994c83 100644
--- a/app-mobilephone/smstools/Manifest
+++ b/app-mobilephone/smstools/Manifest
@@ -5,5 +5,5 @@ AUX smsd.tmpfiles 28 BLAKE2B 1f7dc406901d08d362ad2ca8ad236c8d5c45166c97501d0b314
DIST smstools-3.1.21-patches.tgz 6961 BLAKE2B ee70220d96645f1cdea403ebcc3a199e16aeea2c11d222d4013d6ae08be43daa089f1c6b770ad79edfe783f534913c0fad547181aeeb51796f41420a1e43d505 SHA512 9d6697f64a1af00664bec734e638dff810c984de959675ba856fe4f74290bb971425c909c2e245a62bb8d1991811c79dd5b10864a0f4cc14c5773bf5e01d07a7
DIST smstools3-3.1.21.tar.gz 356548 BLAKE2B 8bbb65761128a86200a6d47e90456fef076be10cd4081b4e3cdc9456c0176996ee6ee9afbe3d9f2a989d93db706bf5461ddf7f739bc8d70337a842b96eb27a5c SHA512 0587e5020a0318351ca99b68baa1c19411824279055857a5b5aa4e346cae373fe94a811eaca6767bcf991cf849eaaa66ec120f046420531a6088cdde9373db31
EBUILD smstools-3.1.21-r1.ebuild 1707 BLAKE2B 426053dd73de6533ed4067a5443c2569beb28f347b31b15d28622b22414db05f87f269668cbd789720f8f135f819b142a0664982034abb22668eb1f1f9c57c7b SHA512 7893129b52974d6b0948c9a840b7099a99c007c4a8b414b2d0fe704db21b09765343b47c164a17e902d4a92706c792e757f7e28b8383c42fe87fb5b4afef190d
-EBUILD smstools-3.1.21-r2.ebuild 1729 BLAKE2B fee664899c99753b38e72071513123986dbb3e259a800f116787aac0652897ff9d0e88a00fee73e2bf799172a86b5927b7210f77adc63145e29790402b0b3fab SHA512 a2173d60a4d2de80a378348d1a353e5f0f55c0042913289a90c0e5c74f628731f0e9239c617022e42c178d1719e3b51aa6a0926567ce3de313887496d701a7aa
+EBUILD smstools-3.1.21-r2.ebuild 1728 BLAKE2B a62cf3d6dbcdb81845244382897cea8dd1e65f53891ce76ed7a6acb6efc9c5bed2d35c7684a9188c553119e499cba4603e500cc74ba13217208685ceac08a4fb SHA512 17dafd9a9931b5b514b77a6440864936704a09e6a81b0c9cb8b3e7b13eaf8f3116a3173c693c6db343d2ad0ba2f35fb05359aa6c6b688432b848ea556fa88809
MISC metadata.xml 315 BLAKE2B c04075d2c685c8a3d65ee6ad0270625493667a4083e6fba888810eb09233497b5999409bf4f80567e4401a7ca2fbb55990e14809d086cb42600c61e88ca447de SHA512 f8ea9efc4287af603952d1643df71f3de2201c466e760d27b6b6b5accca5c28d977202198abc92e8b89d1e1361a14f3b4186d17716c592a334658004aac8fff2
diff --git a/app-mobilephone/smstools/smstools-3.1.21-r2.ebuild b/app-mobilephone/smstools/smstools-3.1.21-r2.ebuild
index 7bbd2e97cb6f..1ff5073bc2fa 100644
--- a/app-mobilephone/smstools/smstools-3.1.21-r2.ebuild
+++ b/app-mobilephone/smstools/smstools-3.1.21-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
IUSE="stats"
DEPEND="
diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index dad4569bbd34..64d5b97dbbc3 100644
Binary files a/app-office/Manifest.gz and b/app-office/Manifest.gz differ
diff --git a/app-office/skrooge/Manifest b/app-office/skrooge/Manifest
index 7263ea56a5e5..86020a13a2c9 100644
--- a/app-office/skrooge/Manifest
+++ b/app-office/skrooge/Manifest
@@ -1,5 +1,7 @@
DIST skrooge-2.23.0.tar.xz 22403128 BLAKE2B e8b4e33e80f307f2c7e6c984199c116aee1d7cabe0ac4ee9461ba10289adc0a15ba5e5d8efb93d49ec8f22104462d572a8ee52b08df84d0379fa77ce56a4ddc9 SHA512 4592deb159aa310f36f8950cf0a65d811624b40dc8b05cdefc271b95885bc6db5ac15f7b4c5299b1468ac92b7e560636bf95ddd6d31340993d9184ba0b150a76
DIST skrooge-2.24.0.tar.xz 22184092 BLAKE2B 84d14fa35665fc1d5326e6212e56569f095b0a22ff2b3df752a8f456e34442edb639c2855b4f1a54cd639c2f9041e8a5e2ccfdf488876ce25dd48f0b0e0721c1 SHA512 e48ad9e657e4f15ab10db38cf1944cfe5a1fe73fa4623ec288b8749de746fc64ccc2534dc2bc7c379db0632107eba17ffc6a39e50de8e52a6800bb86b2ef234d
+DIST skrooge-2.24.6.tar.xz 22187100 BLAKE2B 8657397c1faef949e4d2aa5a23b35433695329e9b00e62f11e4b60b78b3d0e92c32ff93219a4931b9baa08ae1bbdc18285728c97b0d49ca71bad37ee37b01a83 SHA512 a253bdcd966dbb3b0b2b078a88b8de7e9fbdf7700ce91850c0a174c3bb2f56aa04a00250e8164a5e9387699b4a6162052edb4a064293360a3b5ef62c350912df
EBUILD skrooge-2.23.0-r1.ebuild 2556 BLAKE2B d1c89d00e4e0b8b870a9500fff0bb90a877fbddc8df3f397133d63c5f6d700051d7289bd662edd8921e30796fb978d43c9320ca8e1387025a68c0ae26f9ea685 SHA512 55046b4cffc5a83e7157f77021a8245fd0658ee837b5aee69e5b690ac4302e43a36e78fe3626320bef7ad89f13107e16f42464eec55ffa6a6a643e345ee3560c
EBUILD skrooge-2.24.0.ebuild 2558 BLAKE2B ccfe31f3ccccddf042c38da794b3f90dd7695e66e28348c711b826c836a7a4e3d8cd98afdddeea9436391b58d2ec04b9840bc5fdc0b953f3d954d44c97a0d7dd SHA512 e95c7ba30049268b3d636d06b31e85abb7a1f808fba637f95aa52c994e1c0e76a9f6f71bb4ecf46b0a23d608ce0d2c2957fe96fc013a7a7a7d012fffc2fec875
+EBUILD skrooge-2.24.6.ebuild 2558 BLAKE2B ccfe31f3ccccddf042c38da794b3f90dd7695e66e28348c711b826c836a7a4e3d8cd98afdddeea9436391b58d2ec04b9840bc5fdc0b953f3d954d44c97a0d7dd SHA512 e95c7ba30049268b3d636d06b31e85abb7a1f808fba637f95aa52c994e1c0e76a9f6f71bb4ecf46b0a23d608ce0d2c2957fe96fc013a7a7a7d012fffc2fec875
MISC metadata.xml 324 BLAKE2B ffd83d73c861eb5aa5281a859162ba693bd9ac642f7475b28419aa92c512e6caeef1fcecf56faade8b9c6573f9b09c9023dbc7f1a153f59aeea9e4c7dfa30571 SHA512 a5af84ff6c29117ec87f605e4d565a133656a05a9669a6fb2190f6c8706c4cee56c40df024c0160d391ca5e74be7a3d45244a86039cd403b0f60bc0334977a7c
diff --git a/app-office/skrooge/skrooge-2.24.6.ebuild b/app-office/skrooge/skrooge-2.24.6.ebuild
new file mode 100644
index 000000000000..cf20ef1b6597
--- /dev/null
+++ b/app-office/skrooge/skrooge-2.24.6.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="optional"
+ECM_TEST="forceoptional"
+KFMIN=5.74.0
+QTMIN=5.15.1
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Personal finances manager, aiming at being simple and intuitive"
+HOMEPAGE="https://skrooge.org/"
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+ SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
+ KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="5"
+IUSE="activities kde ofx"
+
+BDEPEND="
+ dev-libs/libxslt
+ virtual/pkgconfig
+"
+COMMON_DEPEND="
+ >=app-crypt/qca-2.3.0:2
+ dev-db/sqlcipher
+ dev-libs/grantlee:5
+ >=dev-qt/qtconcurrent-${QTMIN}:5
+ >=dev-qt/qtdbus-${QTMIN}:5
+ >=dev-qt/qtdeclarative-${QTMIN}:5[widgets]
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtnetwork-${QTMIN}:5
+ >=dev-qt/qtprintsupport-${QTMIN}:5
+ >=dev-qt/qtscript-${QTMIN}:5
+ >=dev-qt/qtsql-${QTMIN}:5=
+ >=dev-qt/qtsvg-${QTMIN}:5
+ >=dev-qt/qtwebengine-${QTMIN}:5[widgets]
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ >=dev-qt/qtxml-${QTMIN}:5
+ >=kde-frameworks/karchive-${KFMIN}:5
+ >=kde-frameworks/kcompletion-${KFMIN}:5
+ >=kde-frameworks/kconfig-${KFMIN}:5
+ >=kde-frameworks/kconfigwidgets-${KFMIN}:5
+ >=kde-frameworks/kcoreaddons-${KFMIN}:5
+ >=kde-frameworks/kdbusaddons-${KFMIN}:5
+ >=kde-frameworks/ki18n-${KFMIN}:5
+ >=kde-frameworks/kiconthemes-${KFMIN}:5
+ >=kde-frameworks/kio-${KFMIN}:5
+ >=kde-frameworks/kitemviews-${KFMIN}:5
+ >=kde-frameworks/knewstuff-${KFMIN}:5
+ >=kde-frameworks/knotifications-${KFMIN}:5
+ >=kde-frameworks/knotifyconfig-${KFMIN}:5
+ >=kde-frameworks/kparts-${KFMIN}:5
+ >=kde-frameworks/kservice-${KFMIN}:5
+ >=kde-frameworks/ktextwidgets-${KFMIN}:5
+ >=kde-frameworks/kwallet-${KFMIN}:5
+ >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+ >=kde-frameworks/kxmlgui-${KFMIN}:5
+ activities? ( >=kde-frameworks/kactivities-${KFMIN}:5 )
+ kde? ( >=kde-frameworks/krunner-${KFMIN}:5 )
+ ofx? ( dev-libs/libofx:= )
+"
+DEPEND="${COMMON_DEPEND}
+ >=kde-frameworks/kguiaddons-${KFMIN}:5
+ >=kde-frameworks/kjobwidgets-${KFMIN}:5
+ >=kde-frameworks/kwindowsystem-${KFMIN}:5
+"
+RDEPEND="${COMMON_DEPEND}
+ >=dev-qt/qtquickcontrols-${QTMIN}:5
+"
+
+# hangs + installs files (also requires KF5DesignerPlugin)
+RESTRICT+=" test"
+
+src_configure() {
+ local mycmakeargs=(
+ -DSKG_WEBENGINE=ON
+ -DSKG_DESIGNER=OFF
+ $(cmake_use_find_package activities KF5Activities)
+ $(cmake_use_find_package kde KF5Runner)
+ $(cmake_use_find_package ofx LibOfx)
+ -DSKG_BUILD_TEST=$(usex test)
+ )
+
+ ecm_src_configure
+}
+
+src_test() {
+ local mycmakeargs=(
+ -DSKG_BUILD_TEST=ON
+ )
+ ecm_src_test
+}
diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index 2c9c03b08cdd..7554fca7b557 100644
Binary files a/app-portage/Manifest.gz and b/app-portage/Manifest.gz differ
diff --git a/app-portage/mgorny-dev-scripts/Manifest b/app-portage/mgorny-dev-scripts/Manifest
index 6880b04cd3da..1c1678f4cc37 100644
--- a/app-portage/mgorny-dev-scripts/Manifest
+++ b/app-portage/mgorny-dev-scripts/Manifest
@@ -1,3 +1,5 @@
DIST mgorny-dev-scripts-6.tar.gz 7270 BLAKE2B 30945ccc04111c91dcf22d180b0f653606910a0f13d3d2c2acdb037a51bc6490917d8dab91580c27caf492487dca7ec575c5d59181ce622dd67dada49e653462 SHA512 b46d6919cea7233131e90c423392bfdc8a560800adc05e164ef88351d84d51a73dfd982fcaf12bd9519219bc08b84b6a1aa3dc078bb30d35d57847ad1b22efa9
+DIST mgorny-dev-scripts-7.tar.gz 7262 BLAKE2B adae301b7a3707aed052e11227f792e247b8e55f56dbe5b07ecfd7c37b1bc401f7f7110c2e38703d8c0f77926374193fd21dd803a60c3300990b85974e084ac8 SHA512 24b7b03bfa5ebac91a19470a49c5df6b4ff808876d8fa3e95adc243542f9b215f4c5b4cf3a3df48bae4386be570948d2976b6d50e1144469690a73bd5c119a6c
EBUILD mgorny-dev-scripts-6.ebuild 603 BLAKE2B eaa3b41806bc9e16eb74173e3a69c4426220ddae73f62e089deb0eef98d55e2df080064a4f64e53dc01c3baec06af6ff5a7926cb3cb4fb6bda62bdce2c157948 SHA512 3f75ac80f219d8f366a60043c0aceb3553a506baa5c9fdfbf50ccfa2611dd16789edbc2605c501b3037253d8ffc9e4bc427e24aaafbc95813086c16363f08d50
+EBUILD mgorny-dev-scripts-7.ebuild 603 BLAKE2B 129885a428e34844ecf0c42270aa4d1b712da7f99b706d91f25e09cce68ebd918e80c4e2da455478c55fc21879f1c57c3c477def155fad21f02a97f9a9343267 SHA512 f52a8b9b0fa466ff28bb8379ae81208c2cc3e29a21d4c7bbfba59f1b03528a0f89d6cae51ee8333f4bdd82c97004c7af96b80b2031939c1ed203fcfdd48929c2
MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-7.ebuild b/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-7.ebuild
new file mode 100644
index 000000000000..5e039f280997
--- /dev/null
+++ b/app-portage/mgorny-dev-scripts/mgorny-dev-scripts-7.ebuild
@@ -0,0 +1,28 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Handy scripts for ebuild development and more"
+HOMEPAGE="https://github.com/mgorny/mgorny-dev-scripts"
+SRC_URI="https://github.com/mgorny/mgorny-dev-scripts/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+ app-portage/gentoolkit
+ dev-perl/URI
+ dev-util/pkgcheck
+ dev-vcs/git
+ net-misc/wget
+ sys-apps/portage
+ x11-misc/xdg-utils
+ !dev-util/pkgdiff"
+
+src_install() {
+ dodoc README.rst
+ rm -f COPYING README.rst || die
+ dobin *
+}
diff --git a/app-portage/unsymlink-lib/Manifest b/app-portage/unsymlink-lib/Manifest
index 188da97cf76f..fd6b9f8a3b9f 100644
--- a/app-portage/unsymlink-lib/Manifest
+++ b/app-portage/unsymlink-lib/Manifest
@@ -1,3 +1,5 @@
DIST unsymlink-lib-19.tar.gz 11235 BLAKE2B 955583517c485125722bdc808e1038c038509fad0afe0774f16299f2eb3a6088d7433e11565567bb3c9976a27910fbd9fe92289eaa210062f38eb9e3b15e120b SHA512 98943c887aeb70fc667c2092b985fe0078f127123d271cc45e1abb3e9b6218f1190bd23f140fa9775dca1d473d03113e6cfa8aeca8985cfc31f1cb459c4c620e
+DIST unsymlink-lib-20.tar.gz 11333 BLAKE2B bf5ab4390e52dceb0f86717abc21d752449754b6cb1083b34547997377c24618412d1dfef9736286d5af35632113885c998bddaeb373267280289b93a9ee8f40 SHA512 084d733046499ffa3bbeec6f59e72a8bd8bd9924c6f4cdca5f1bec5a6ef59502ceb19b156783c14d0418dbcd37025da65caaa2ce47665a26cec609e1895b01fb
EBUILD unsymlink-lib-19.ebuild 727 BLAKE2B 9f7fc0461042aa9ff844859a7043b57644d37e65943df81ba243fbf635b98c22d2051ba9a7b7698e02bb59fff638069a7eb604542f25ad0cbaa650aed04ad011 SHA512 e7984ba5b8c5b03817b59afea51792e124ab8b10d492a04b33954a0c69bed8dd56dcdca73afa216aac0e445b3a4d6edbab2576a758cec42b96c02c2828a91321
+EBUILD unsymlink-lib-20.ebuild 728 BLAKE2B 64c902e855cb5ef1d1297dccb882d0036493a82616f4e5181f5c6150dee6d092ad28fd3534c6babb6723327ac2bd1e23a043224e17dc308fae0f05e34a1a68c6 SHA512 5b7921d3c5325c15c029afdc222cafedf70cb268c252837ae73149a0acfeda2740e883e02b1335a14035418f952b4b5af37464e2644e93c9195220cb882d06cc
MISC metadata.xml 401 BLAKE2B f16ce51083f8054e7190c2d5fc193808898071af155cc8442a9ef7064cb4d46e6639d8724f85a4a0f551477c6f7ae0f81434c6bef8bd88b2077ea7b7e1f2133b SHA512 dbd79971b54d9027956c46586b547f8308404e273e91dd7ff84d3fbbd50936b8f19dd1dacde5e16a22ca2ef17924f19f66ec83e64c9f145f29322150db9e00a6
diff --git a/app-portage/unsymlink-lib/unsymlink-lib-20.ebuild b/app-portage/unsymlink-lib/unsymlink-lib-20.ebuild
new file mode 100644
index 000000000000..46e5fca98af7
--- /dev/null
+++ b/app-portage/unsymlink-lib/unsymlink-lib-20.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+inherit python-single-r1
+
+DESCRIPTION="Convert your system to SYMLINK_LIB=no"
+HOMEPAGE="https://github.com/mgorny/unsymlink-lib"
+SRC_URI="https://github.com/mgorny/unsymlink-lib/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+# tests are docker-based, you need a running docker daemon and you
+# should expect leftover images
+RESTRICT="test"
+
+RDEPEND="${PYTHON_DEPS}
+ $(python_gen_cond_dep '
+ sys-apps/portage[${PYTHON_MULTI_USEDEP}]
+ ')"
+
+src_install() {
+ python_doscript unsymlink-lib
+ dodoc README
+}
diff --git a/app-shells/Manifest.gz b/app-shells/Manifest.gz
index 530d85a253a1..da827fbc8b0c 100644
Binary files a/app-shells/Manifest.gz and b/app-shells/Manifest.gz differ
diff --git a/app-shells/tcsh/Manifest b/app-shells/tcsh/Manifest
index a5f20cef926d..423c3b0e5c7d 100644
--- a/app-shells/tcsh/Manifest
+++ b/app-shells/tcsh/Manifest
@@ -1,6 +1,5 @@
AUX tcsh-6.18.01-aix.patch 474 BLAKE2B c794769b5ddb354ebbcad902df18db735f06b3e098069e025e5b976b3fdf3758104b48881a94f38f620ba8cb5b307ee3f5a61f528988bd31ff9edd19efb58872 SHA512 ae5dd2f5aee7c14734e775b55f780aa430dd2efc8407b671308215c69e3b97ad37a3b54ad2bc7fabe84b1806997a78ccd15b06ac59491c93dcad14bb14032bd5
AUX tcsh-6.20.00-debian-dircolors.patch 506 BLAKE2B 584808b9bd488c41a8b375d18b976ef89256771b9282b248c0ac4e500ea5dedb07a05af60c3a5995b511dce49ac95db1b0beb2ae2db11de241e9eea2a72c52cd SHA512 c761857c343c833aea5061baeb54dd86f7a8804424b7ea2009d05fd57b92ba3b892c05fe48a8f4e00a6eee39515086063a9c518004d726626dc5c466958a6dad
-AUX tcsh-6.20.00-use-ncurses-tinfo.patch 382 BLAKE2B 99d794389e3f65607887eae8df4d8af9f9361604f0d70e96a45f3a2b3ec648a6f04f335b2de8fb8b9b6c7441be6009ca38f9f8479ddd9e3e831c4cf0c0b48863 SHA512 d6e2346a0ed093651be7073b04cd31ec1bd587c52fc9a21295405699fed2a63d6ea8415e7c0d29e0f03732288b4a8749e14c9ee85c39a1b4f8e51cfa996166c3
AUX tcsh-6.21.00-fno-common.patch 613 BLAKE2B bd9d68b9f4a7655d519a49c8937d150e8d4521fea2f1be26b3827369905d865e2115ff2a51a1d491b3ce2c80352d0845cdbc127d808f58556842fa5555dde41b SHA512 d67b82c6dcb7042c8d6e33d97c30b6937244af0667ac9b5928f4316b4bb69e4080f7d609271f2e1beed03b5d896bbc70c171e9f9a58684ab29409918ad77f40d
AUX tcsh-6.21.00-no-nls.patch 386 BLAKE2B 5df1b205d76e29b68530f50b661329e851ce46206306662e150452ffc340e82d2347a0d1407c3a4aed6ee5f1b93257d0dece87b37ebc51f4240ac83a110f471e SHA512 9ece39f524b0d377dd907772c37e9412cb4a700db5d828aa404a0b231b758638cdf1215d026ba574486c2a00b49f20888e7f5683ac4f712845fa484118a8109f
AUX tcsh-6.21.00-use-ncurses.patch 388 BLAKE2B 5938d6ceee5cafa254d3bedb36705a7d1d6f3c41cb30d8eb22181cf053bbe39302c9dcb14191383e755f47c08fa1a0dd3fc20cc7f813cf9737e60850327a7e71 SHA512 eef51644cde4bf27a614a1f099b5f21e46600ca396e4baafa6ece005f3fb4901ab1862176ee715b7294216894f6a2d84c1a5b1c38c1086cf95914f6f44358595
diff --git a/app-shells/tcsh/files/tcsh-6.20.00-use-ncurses-tinfo.patch b/app-shells/tcsh/files/tcsh-6.20.00-use-ncurses-tinfo.patch
deleted file mode 100644
index e17841863d81..000000000000
--- a/app-shells/tcsh/files/tcsh-6.20.00-use-ncurses-tinfo.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- tcsh-6.20.00/configure.ac
-+++ tcsh-6.20.00/configure.ac
-@@ -317,7 +317,7 @@
- dnl Checks for libraries
- AC_SEARCH_LIBS(crypt, crypt)
- AC_SEARCH_LIBS(getspnam, sec)
--AC_SEARCH_LIBS([tgetent], [termlib termcap curses ncurses], [], [
-+AC_SEARCH_LIBS([tgetent], [ncurses tinfo], [], [
- AC_MSG_ERROR([unable to find the tgetent() function])
- ])
- AC_SEARCH_LIBS(gethostbyname, nsl)
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index e54dd14aab68..212c81484041 100644
Binary files a/app-text/Manifest.gz and b/app-text/Manifest.gz differ
diff --git a/app-text/htmldoc/Manifest b/app-text/htmldoc/Manifest
index a287a6dab1aa..706c4eb45a93 100644
--- a/app-text/htmldoc/Manifest
+++ b/app-text/htmldoc/Manifest
@@ -1,3 +1,5 @@
DIST htmldoc-1.8.30-source.tar.gz 3901592 BLAKE2B 1aad75973ce485fdbe15d6db99701f88a0fd48a075014c401cc8fdb1f9031214a148748e6731542ca8df7bfa5e5f4c50ec772dac4231fdd71e70f6b092bd20ac SHA512 713dc67622533dae896745ac8809e43a7f91696715aeb77df2628bd04c0d3e16c8402891499e8e0c10cab793b44114e600d5935b3c76a3cfa303c10897456804
-EBUILD htmldoc-1.8.30.ebuild 1117 BLAKE2B e2541de911f24741b3456f02fe4af773e8c918fc3125d2be67276baa2715be6b0d59b6c0e2d4e1714474e0f24755e3b645515dcfaeedd7d90e152a2cdfac346f SHA512 e901762a07d850837ed43f80986d4e63fc724de5f973b71cf10e231e1a462cea693995016e17432a93b9a5767264dd37690b1701a3159d969d71e8f986453e8f
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
+DIST htmldoc-1.9.11-source.tar.gz 4471815 BLAKE2B a76da0f5129d8d637c440ee1880bdc4c314db02294f8e7387abe28ab7f76a81b47c4670a27d34759f89b82e9b1d7c259d154fac7cb8c2b7caa6e1f99f3a35ebf SHA512 5ee6a61f129be9a7d26c554f1acb533f1edfbf34eefd8f4924e07bcead2680407c68b4e2c9840203d7bb07daf51ea18c422d7c04e33c4b346dd207531f330678
+EBUILD htmldoc-1.8.30.ebuild 1111 BLAKE2B a5b0b23b01e65a7e525a7d2a078728d4a6e08f0c16659724c3a05d82c64a78261b90b82b14f4704b13745d324589311c28215a0bb982b52698a61c46c9e5e336 SHA512 809df0ddefdbd700eb51e7d23a81b24390f497a7592bd93b737ffd41416ae317ae6d5b3d1e83c29f0ebb667af49188037d87f98c1e7987e440751589080ae7b4
+EBUILD htmldoc-1.9.11-r1.ebuild 1381 BLAKE2B 6c36d4cd01b7098604bb653bde2f9b6d7736d790d4aa25f825814ed35699688e8798bca29291c7843cfde15ae832f6cdbb540d4c00207c91345f7bdff25470d7 SHA512 0b0b71c5b07c0f11f35c11fd497dbbc50439c3e9c467361f5582b92ee0aeaa16231a1e2e4a63006efae1ed911183e8be112c1a33e4d0a52e74f59a01f42607fb
+MISC metadata.xml 253 BLAKE2B 866785a39539e5da350fc5ce3c2039b8e906bb106c7eab83df24a7a66f576e530ade48e9d63e1115ff5cb55617da9bb615f164ffc46f5f16bb93055419d4229e SHA512 cc9791ffe80b6f6064de254903f73d298247a57455a3031fc089abdf5a291a0546e6d8f64fb7886ce5d543af487971149ccf68092a8418e25ed58feece9fc033
diff --git a/app-text/htmldoc/htmldoc-1.8.30.ebuild b/app-text/htmldoc/htmldoc-1.8.30.ebuild
index 61956c4652b9..cbff036765a3 100644
--- a/app-text/htmldoc/htmldoc-1.8.30.ebuild
+++ b/app-text/htmldoc/htmldoc-1.8.30.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
inherit toolchain-funcs xdg
DESCRIPTION="Convert HTML pages into a PDF document"
-HOMEPAGE="http://www.msweet.org/projects.php?Z1"
+HOMEPAGE="https://www.msweet.org/htmldoc/"
SRC_URI="https://github.com/michaelrsweet/${PN}/releases/download/v${PV}/${P}-source.tar.gz"
IUSE="fltk"
SLOT="0"
diff --git a/app-text/htmldoc/htmldoc-1.9.11-r1.ebuild b/app-text/htmldoc/htmldoc-1.9.11-r1.ebuild
new file mode 100644
index 000000000000..7c364dc21f21
--- /dev/null
+++ b/app-text/htmldoc/htmldoc-1.9.11-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools toolchain-funcs xdg
+
+DESCRIPTION="Convert HTML pages into a PDF document"
+HOMEPAGE="https://www.msweet.org/htmldoc/"
+SRC_URI="https://github.com/michaelrsweet/${PN}/releases/download/v${PV}/${P}-source.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="fltk ssl"
+
+BDEPEND="virtual/pkgconfig"
+DEPEND="
+ >=media-libs/libpng-1.4:0=
+ sys-libs/zlib
+ virtual/jpeg:0
+ ssl? ( net-libs/gnutls )
+ fltk? ( x11-libs/fltk:1 )
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+ default
+ eautoreconf
+
+ # Make sure not to use the libs htmldoc ships with
+ rm -r jpeg png zlib || die "failed to unbundle jpeg, png, and zlib"
+
+ # Fix the documentation path in a few places. Some Makefiles aren't
+ # autotoolized =(
+ for file in configure doc/Makefile doc/htmldoc.man; do
+ sed -i "${file}" \
+ -e "s:/doc/htmldoc:/doc/${PF}/html:g" \
+ || die "failed to fix documentation path in ${file}"
+ done
+}
+
+src_configure() {
+ local myeconfargs=(
+ $(use_with fltk gui)
+ $(use_enable ssl)
+ $(use_enable ssl gnutls)
+ --disable-localjpeg
+ --disable-localpng
+ --disable-localzlib
+ )
+
+ CC="$(tc-getCC)" CXX="$(tc-getCXX)" DSTROOT="${ED}" econf "${myeconfargs[@]}"
+}
+
+src_install() {
+ emake STRIPPROG="true" DSTROOT="${ED}" install
+}
diff --git a/app-text/htmldoc/metadata.xml b/app-text/htmldoc/metadata.xml
index 6f49eba8f496..f6208173d9c3 100644
--- a/app-text/htmldoc/metadata.xml
+++ b/app-text/htmldoc/metadata.xml
@@ -1,5 +1,8 @@
-
+
+
+ michaelrsweet/htmldoc
+
diff --git a/app-text/mupdf/Manifest b/app-text/mupdf/Manifest
index 2075f76cbe07..3dade61968c0 100644
--- a/app-text/mupdf/Manifest
+++ b/app-text/mupdf/Manifest
@@ -1,15 +1,10 @@
AUX mupdf-1.10a-add-desktop-pc-xpm-files.patch 13387 BLAKE2B e0100380b328cfd8ce6099c35886a6f2e9508f6d08c678dbc1386e88998d01bdacd160020dc6ceefffbe09f4cf2b64d08acfb76f8535ffcc0dc93c65a3a2da78 SHA512 1d6ccfccf785cca01b1a607e94f90a5e31c748154e9fa7664b9863c7b26951f17a584ffc7cd23dd83d1e547498e22c902067e9695006824017e69d33dbf25a5b
AUX mupdf-1.15-CFLAGS.patch 376 BLAKE2B ace255a4110df9200d627ac68f5950218eeaa993bbd37fa7fe2d676572cad02d50a632750e6a9bdf6269cd97501f709d075a79d7db8b9832909b59b33251b594 SHA512 c00cd5cb30d33a9cbc55557cab3c4e2be1ae86121c5b1b28b6e35f97f93751aa2e96e106f13b7f365a56ebcce8e1c5e4163a440e8c85a48130803f5a7aec63ed
-AUX mupdf-1.15-Makefile.patch 1189 BLAKE2B 21447e2fd8ca7c396b9b2bd5e1e70ac6ebff5dc8dcbde273e0b23e17281cf2fe16f7a53587f9b0a3b2af1837f3ed5fc4a19666a4cdfa5d491e8b9be71519e1a8 SHA512 6c696b5a522116d075ee1a4759cdf3cae2e8836315f2898a51c15e227d4d57b44095a9927e7d66ab7d522ba6e0c65eed10a379d9e80b791ee8b6022933f615ab
AUX mupdf-1.15-openssl-x11.patch 735 BLAKE2B 03e53970a145db913bad9c03de899ffeb7eed3abfad4d3db15819d5e101ba03e376fc0faea9c4939b7167b276fffe022975bae2e99238d5b4bee92edfb924fd5 SHA512 028930d5e6c86a9052de6e1e0f3e937d89a3f22e10b7fb71f1dba998c480c9914520e4248c21d68291c6fd7684c627b5068c1bb2e027ff6a518d1ca5533eb677
-AUX mupdf-1.16.1-freeglut-fg_gl2-gcc-10.patch 3410 BLAKE2B 1181234b618d52766e159366bd4358776ec39fc7091c05025a6a70cf626427fb3a36c0909569d4be22aba8c9695366d0b8a61592f5bbab766efbe8190077d66d SHA512 069c8150402fc463def14ff5690ecfe8a376579ad8319bf79f90823a04799bef1bfa25e79b759a0e027595a114bd3cf48f613541eeb2eec2c85e31d2105062f6
-AUX mupdf-1.17.0-cross-fixes.patch 4554 BLAKE2B 7956aea05180adc50805f56c000b0704cbaf1eb538889f1569e9f536984fb11581c36956edabb704f519285513aad01cbe0ba5a107838996937c2efa398a9c07 SHA512 0fc71632744a5fe15cace6c7b185b108e78b6676c03f204ba52e90826e7be17039b427a50697004798d51ea357828035e897d2d3ce91da95ea0f2a1a0c668fba
AUX mupdf-1.18-Makefile.patch 1246 BLAKE2B e0054c441b067ef4aec069cb0fd4342f16919af51ac53096f20a2dbc87a81e2bece8478441df493d6825eedca53f4c9634cfe8724980da119d0ac20035a4d423 SHA512 def7524e0468ca15220b2d9c718ef61da4ce007c43f591ae3ad80afe55f86549985b1c5ec3d3d266045a0a6ca399580f8f4e001893d4feaabb7785a8a4df278e
AUX mupdf-1.18.0-cross-fixes.patch 5830 BLAKE2B e91e41b4889f2716d20b112b18924799db5d21274feb3699f2bca04fd3d93528d86e2ef05ccf25d1a0800e81a333d0703f837d45fef926746aeec1ece60c6ced SHA512 0e7a91474c3f31a5d5f7ddc461d74f1bc0cc8de7eb7bedbaa0f6335a6038327f5c7261d16baade5dba567b3d1ad49adf7a65ea40b226fca5f1eb58cc7bc0b07a
AUX mupdf-1.18.0-fix-oob-in-pdf-layer.c 3462 BLAKE2B 861f5d6d0f81aed837d19ed19ba54158856bed5cab3ce8202bad11bb509b017e554ea37d9ebd05213386251b26bce10f83311c3de99fe663bf2995adc1231a9e SHA512 91620d0d429d2f4068e1834ec9466d9e9f9bfb363fba33247636e38651196580a89bd36785e42b31328070c42bd2210585ddabea8a0a970d72e7066e61804d6c
AUX mupdf-1.18.0-fix-oob-in-pixmap.c 1123 BLAKE2B d49194b540b489ad9d3a4b5057bbe6ac3a1414d0123b7c2d4710adad1ed7fd439f8e83162d07a86aee6bd778c35ea6798da166461ac6e358af6910cc6b492624 SHA512 1d836c1a3f37c21ed349da799d5cb0c57d3fc275a632a42343cda81aae76394273c06230fc9c22a6d5366498b51a057d5a11797376a4b2af96b937618ba31e11
-DIST mupdf-1.17.0-source.tar.xz 48559964 BLAKE2B f46b09a6d288054da79bea356df4d7d98fe2759cf82bea1f0df2e961b94acebbab58826f7a731c4c68e8b086fd9367fddcabea6c7d2838f25ed84ddc1a0c2bd9 SHA512 39188e6ce3eaefb525b2c32767c4bf52ed881b41889edef086aa64bfe1c38e6f3cb853450c8284d175ef8854f32e9bc67415a692048ead26cf31c35645f9e0e5
DIST mupdf-1.18.0-source.tar.xz 53621544 BLAKE2B d0057f4240bd4f6b4b6d9381ae1c3871c56b97604d5c6ea6438a8bde72d4696c10a9f0e8e2ed8f43d63a04bb1d973bade8a708327c00b0d0c6802b28af697a55 SHA512 7551f18b9bac6e2dc1cf073741cbc975ce3a16dc7e37c9d5a58254c67bf2c07bb36185d6585e435d4126f3ae351f67d7432d19a986c9b47b15105ca43db0edb8
-EBUILD mupdf-1.17.0.ebuild 4054 BLAKE2B 087806cf5b3a3099abbbf4d7aee104b8a026004524b6505d8c677d117a6b47e235325c946a781c0bdc5a3d851bafbcb50c28b7b430229092c18e35dccfcedfc6 SHA512 76387c80e2de2646aeaa69bc8051aa8868185af424271e3ed037932bb1b11d2f7eb70549b0ab47fa7c792836eb5f0150850efff3eb46133bb2c84fc2839e3153
EBUILD mupdf-1.18.0-r2.ebuild 4122 BLAKE2B e8bf328f63f9b469a4e1a561ef97c029252fa69776ebbc0a4677ad6668757ee26c083842e78cac6807c86932b04437ed025b5e6a82b4492c6f898a04bf7dea3f SHA512 537ce8ff3f792ce0eca92f7a209d1984158b44f7ad214fa7d941a80ff19288b4ffce80e5a83508bff156aa287f100a8304c504d60a4831284fba7f46320520c3
MISC metadata.xml 345 BLAKE2B 6adf08490e4a701eeb6ab07c2e5619cff42ff02bf75ec38fd94f215f000972f0b3d88c8b0fab827728dd12d7906dd580b7650f11da1d77964eb5fddd773ee4a9 SHA512 32902c1fac57a44927a53dbb52fb22cb04317bcdf3dd2ae8e9863bef557178e33565bb122e128908c61ade9a5e2d1f067c530ff05e7ed0242eccf193e6fa2026
diff --git a/app-text/mupdf/files/mupdf-1.15-Makefile.patch b/app-text/mupdf/files/mupdf-1.15-Makefile.patch
deleted file mode 100644
index cff348d95e42..000000000000
--- a/app-text/mupdf/files/mupdf-1.15-Makefile.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff --git a/Makefile b/Makefile
-index a9539342..e76b2c61 100644
---- a/Makefile
-+++ b/Makefile
-@@ -3,7 +3,7 @@
- -include user.make
-
- ifndef build
-- build := release
-+ build := debug
- endif
-
- ifndef OUT
-@@ -187,13 +187,15 @@ generate: source/pdf/js/util.js.h
-
- # --- Library ---
-
--MUPDF_LIB = $(OUT)/libmupdf.a
--THIRD_LIB = $(OUT)/libmupdf-third.a
-+MUPDF_LIB = libmupdf.so.$(GENTOO_PV)
-+MUPDF_STATIC = $(OUT)/libmupdf.a
-+THIRD_LIB =
- THREAD_LIB = $(OUT)/libmupdf-threads.a
- PKCS7_LIB = $(OUT)/libmupdf-pkcs7.a
-
--$(MUPDF_LIB) : $(MUPDF_OBJ)
--$(THIRD_LIB) : $(THIRD_OBJ)
-+$(MUPDF_LIB) : $(MUPDF_OBJ) $(THIRD_OBJ)
-+ $(QUIET_LINK) $(CC) $(LDFLAGS) --shared -Wl,-soname -Wl,$(MUPDF_LIB) -o $@ $^ $(THIRD_LIBS) $(LIBS)
-+$(MUPDF_STATIC): $(MUPDF_OBJ) $(THIRD_OBJ)
- $(THREAD_LIB) : $(THREAD_OBJ)
- $(PKCS7_LIB) : $(PKCS7_OBJ)
-
-@@ -322,7 +324,7 @@ install: libs apps
-
- install -d $(DESTDIR)$(docdir)
- install -d $(DESTDIR)$(docdir)/examples
-- install -m 644 README COPYING CHANGES $(DESTDIR)$(docdir)
-+ install -m 644 README CHANGES $(DESTDIR)$(docdir)
- install -m 644 docs/*.html docs/*.css docs/*.png $(DESTDIR)$(docdir)
- install -m 644 docs/examples/* $(DESTDIR)$(docdir)/examples
-
diff --git a/app-text/mupdf/files/mupdf-1.16.1-freeglut-fg_gl2-gcc-10.patch b/app-text/mupdf/files/mupdf-1.16.1-freeglut-fg_gl2-gcc-10.patch
deleted file mode 100644
index c9c37e2efac2..000000000000
--- a/app-text/mupdf/files/mupdf-1.16.1-freeglut-fg_gl2-gcc-10.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-From 5791564dd934d193df771a0a7c52013e9f456aa1 Mon Sep 17 00:00:00 2001
-From: Sergei Trofimovich
-Date: Tue, 21 Jan 2020 22:33:49 +0000
-Subject: [PATCH] fg_gl2: fix build failure against gcc-10
-
-On gcc-10 (and gcc-9 -fno-common) build fails as:
-
-```
-[ 31%] Linking C executable bin/Lorenz_static
-/usr/bin/cmake -E cmake_link_script CMakeFiles/Lorenz_static.dir/link.txt --verbose=1
-/usr/lib/ccache/bin/cc -Wall -pedantic -rdynamic CMakeFiles/Lorenz_static.dir/progs/demos/Lorenz/lorenz.c.o \
- -o bin/Lorenz_static -lGLU -lGL -lm -lX11 -lXrandr -lXxf86vm -lXi -lm lib/libglut.a -lGL -lm -lX11 -lXrandr -lXxf86vm -lXi
-ld: lib/libglut.a(fg_gl2.c.o):(.bss+0x0):
- multiple definition of `fghGenBuffers'; lib/libglut.a(fg_window.c.o):(.bss+0x0): first defined here
-ld: lib/libglut.a(fg_gl2.c.o):(.bss+0x8):
- multiple definition of `fghDeleteBuffers'; lib/libglut.a(fg_window.c.o):(.bss+0x8): first defined here
-```
-
-Note: duplicate definition comes here from 'fg_gl2.h'.
-The fix is to move declaration to a 'fg_gl2.c' file.
-
-gcc-10 will change the default from -fcommon to fno-common:
-https://gcc.gnu.org/PR85678.
-
-The error also happens if CFLAGS=-fno-common passed explicitly.
-
-Bug: https://bugs.gentoo.org/705840
-Signed-off-by: Sergei Trofimovich
----
- freeglut/freeglut/src/fg_gl2.c | 12 ++++++++++++
- freeglut/freeglut/src/fg_gl2.h | 14 +++++++-------
- 2 files changed, 19 insertions(+), 7 deletions(-)
-
---- a/thirdparty/freeglut/src/fg_gl2.c
-+++ b/thirdparty/freeglut/src/fg_gl2.c
-@@ -27,6 +27,18 @@
- #include "fg_internal.h"
- #include "fg_gl2.h"
-
-+#ifdef GL_ES_VERSION_2_0
-+/* Use existing functions on GLES 2.0 */
-+#else
-+FGH_PFNGLGENBUFFERSPROC fghGenBuffers;
-+FGH_PFNGLDELETEBUFFERSPROC fghDeleteBuffers;
-+FGH_PFNGLBINDBUFFERPROC fghBindBuffer;
-+FGH_PFNGLBUFFERDATAPROC fghBufferData;
-+FGH_PFNGLENABLEVERTEXATTRIBARRAYPROC fghEnableVertexAttribArray;
-+FGH_PFNGLDISABLEVERTEXATTRIBARRAYPROC fghDisableVertexAttribArray;
-+FGH_PFNGLVERTEXATTRIBPOINTERPROC fghVertexAttribPointer;
-+#endif
-+
- void FGAPIENTRY glutSetVertexAttribCoord3(GLint attrib) {
- if (fgStructure.CurrentWindow != NULL)
- fgStructure.CurrentWindow->Window.attribute_v_coord = attrib;
---- a/thirdparty/freeglut/src/fg_gl2.h
-+++ b/thirdparty/freeglut/src/fg_gl2.h
-@@ -67,13 +67,13 @@ typedef void (APIENTRY *FGH_PFNGLENABLEVERTEXATTRIBARRAYPROC) (GLuint index);
- typedef void (APIENTRY *FGH_PFNGLDISABLEVERTEXATTRIBARRAYPROC) (GLuint);
- typedef void (APIENTRY *FGH_PFNGLVERTEXATTRIBPOINTERPROC) (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid *pointer);
-
--FGH_PFNGLGENBUFFERSPROC fghGenBuffers;
--FGH_PFNGLDELETEBUFFERSPROC fghDeleteBuffers;
--FGH_PFNGLBINDBUFFERPROC fghBindBuffer;
--FGH_PFNGLBUFFERDATAPROC fghBufferData;
--FGH_PFNGLENABLEVERTEXATTRIBARRAYPROC fghEnableVertexAttribArray;
--FGH_PFNGLDISABLEVERTEXATTRIBARRAYPROC fghDisableVertexAttribArray;
--FGH_PFNGLVERTEXATTRIBPOINTERPROC fghVertexAttribPointer;
-+extern FGH_PFNGLGENBUFFERSPROC fghGenBuffers;
-+extern FGH_PFNGLDELETEBUFFERSPROC fghDeleteBuffers;
-+extern FGH_PFNGLBINDBUFFERPROC fghBindBuffer;
-+extern FGH_PFNGLBUFFERDATAPROC fghBufferData;
-+extern FGH_PFNGLENABLEVERTEXATTRIBARRAYPROC fghEnableVertexAttribArray;
-+extern FGH_PFNGLDISABLEVERTEXATTRIBARRAYPROC fghDisableVertexAttribArray;
-+extern FGH_PFNGLVERTEXATTRIBPOINTERPROC fghVertexAttribPointer;
-
- # endif
-
---
-2.25.0
-
diff --git a/app-text/mupdf/files/mupdf-1.17.0-cross-fixes.patch b/app-text/mupdf/files/mupdf-1.17.0-cross-fixes.patch
deleted file mode 100644
index ae14f9bb5e49..000000000000
--- a/app-text/mupdf/files/mupdf-1.17.0-cross-fixes.patch
+++ /dev/null
@@ -1,103 +0,0 @@
-Refreshed patches based on:
-https://sources.debian.org/patches/mupdf/1.17.0+ds1-1/0004-MuPDF-crossbuild-use-target-arch-pkg-config.patch/
-https://sources.debian.org/patches/mupdf/1.17.0+ds1-1/0005-MuPDF-crossbuild-use-host-cc-for-utils.patch/
---- a/Makefile
-+++ b/Makefile
-@@ -134,6 +134,9 @@ PKCS7_OBJ := $(PKCS7_SRC:%.c=$(OUT)/%.o)
-
- HEXDUMP_EXE := $(OUT)/scripts/hexdump.exe
-
-+$(HEXDUMP_EXE): scripts/hexdump.c
-+ $(QUIET_CC) $(MKTGTDIR) ; $(CC_FOR_BUILD) $(CFLAGS) -o $@ $<
-+
- FONT_BIN := $(sort $(wildcard resources/fonts/urw/*.cff))
- FONT_BIN += $(sort $(wildcard resources/fonts/han/*.ttc))
- FONT_BIN += $(sort $(wildcard resources/fonts/droid/*.ttf))
---- a/Makerules
-+++ b/Makerules
-@@ -15,6 +15,9 @@ OS := $(OS:MSYS%=MINGW)
- OS := $(OS:Windows_NT=MINGW)
- OS := $(OS:Darwin=MACOS)
-
-+PKG_CONFIG ?= pkg-config
-+CC_FOR_BUILD ?= $(CC)
-+
- ifeq ($(findstring -fembed-bitcode,$(XCFLAGS)),)
- # clang does not support these in combination with -fembed-bitcode
- CFLAGS += -ffunction-sections -fdata-sections
-@@ -101,35 +104,35 @@ else ifeq ($(OS),MACOS)
- else ifeq ($(OS),Linux)
- HAVE_OBJCOPY := yes
-
-- ifeq ($(shell pkg-config --exists freetype2 && echo yes),yes)
-- SYS_FREETYPE_CFLAGS := $(shell pkg-config --cflags freetype2)
-- SYS_FREETYPE_LIBS := $(shell pkg-config --libs freetype2)
-+ ifeq ($(shell $(PKG_CONFIG) --exists freetype2 && echo yes),yes)
-+ SYS_FREETYPE_CFLAGS := $(shell $(PKG_CONFIG) --cflags freetype2)
-+ SYS_FREETYPE_LIBS := $(shell $(PKG_CONFIG) --libs freetype2)
- endif
-- ifeq ($(shell pkg-config --exists harfbuzz && echo yes),yes)
-- SYS_HARFBUZZ_CFLAGS := $(shell pkg-config --cflags harfbuzz)
-- SYS_HARFBUZZ_LIBS := $(shell pkg-config --libs harfbuzz)
-+ ifeq ($(shell $(PKG_CONFIG) --exists harfbuzz && echo yes),yes)
-+ SYS_HARFBUZZ_CFLAGS := $(shell $(PKG_CONFIG) --cflags harfbuzz)
-+ SYS_HARFBUZZ_LIBS := $(shell $(PKG_CONFIG) --libs harfbuzz)
- endif
-- ifeq ($(shell pkg-config --exists lcms2 && echo yes),yes)
-- SYS_LCMS2_CFLAGS := $(shell pkg-config --cflags lcms2)
-- SYS_LCMS2_LIBS := $(shell pkg-config --libs lcms2)
-+ ifeq ($(shell $(PKG_CONFIG) --exists lcms2 && echo yes),yes)
-+ SYS_LCMS2_CFLAGS := $(shell $(PKG_CONFIG) --cflags lcms2)
-+ SYS_LCMS2_LIBS := $(shell $(PKG_CONFIG) --libs lcms2)
- endif
-- ifeq ($(shell pkg-config --exists libjpeg && echo yes),yes)
-- SYS_LIBJPEG_CFLAGS := $(shell pkg-config --cflags libjpeg)
-- SYS_LIBJPEG_LIBS := $(shell pkg-config --libs libjpeg)
-+ ifeq ($(shell $(PKG_CONFIG) --exists libjpeg && echo yes),yes)
-+ SYS_LIBJPEG_CFLAGS := $(shell $(PKG_CONFIG) --cflags libjpeg)
-+ SYS_LIBJPEG_LIBS := $(shell $(PKG_CONFIG) --libs libjpeg)
- endif
-- ifeq ($(shell pkg-config --exists libopenjp2 && echo yes),yes)
-- SYS_OPENJPEG_CFLAGS := $(shell pkg-config --cflags libopenjp2)
-- SYS_OPENJPEG_LIBS := $(shell pkg-config --libs libopenjp2)
-+ ifeq ($(shell $(PKG_CONFIG) --exists libopenjp2 && echo yes),yes)
-+ SYS_OPENJPEG_CFLAGS := $(shell $(PKG_CONFIG) --cflags libopenjp2)
-+ SYS_OPENJPEG_LIBS := $(shell $(PKG_CONFIG) --libs libopenjp2)
- endif
-- ifeq ($(shell pkg-config --exists zlib && echo yes),yes)
-- SYS_ZLIB_CFLAGS := $(shell pkg-config --cflags zlib)
-- SYS_ZLIB_LIBS := $(shell pkg-config --libs zlib)
-+ ifeq ($(shell $(PKG_CONFIG) --exists zlib && echo yes),yes)
-+ SYS_ZLIB_CFLAGS := $(shell $(PKG_CONFIG) --cflags zlib)
-+ SYS_ZLIB_LIBS := $(shell $(PKG_CONFIG) --libs zlib)
- endif
-
-- HAVE_SYS_CURL := $(shell pkg-config --exists libcurl && echo yes)
-+ HAVE_SYS_CURL := $(shell $(PKG_CONFIG) --exists libcurl && echo yes)
- ifeq ($(HAVE_SYS_CURL),yes)
-- SYS_CURL_CFLAGS := $(shell pkg-config --cflags libcurl)
-- SYS_CURL_LIBS := $(shell pkg-config --libs libcurl)
-+ SYS_CURL_CFLAGS := $(shell $(PKG_CONFIG) --cflags libcurl)
-+ SYS_CURL_LIBS := $(shell $(PKG_CONFIG) --libs libcurl)
- endif
-
- HAVE_GLUT := yes
-@@ -140,14 +143,14 @@ else ifeq ($(OS),Linux)
-
- HAVE_X11 := not-unless-portage-tells-me
- ifeq ($(HAVE_X11),yes)
-- X11_CFLAGS := $(shell pkg-config --cflags x11 xext)
-- X11_LIBS := $(shell pkg-config --libs x11 xext)
-+ X11_CFLAGS := $(shell $(PKG_CONFIG) --cflags x11 xext)
-+ X11_LIBS := $(shell $(PKG_CONFIG) --libs x11 xext)
- endif
-
- HAVE_LIBCRYPTO := not-unless-portage-tells-me
- ifeq ($(HAVE_LIBCRYPTO),yes)
-- LIBCRYPTO_CFLAGS := $(shell pkg-config --cflags libcrypto) -DHAVE_LIBCRYPTO
-- LIBCRYPTO_LIBS := $(shell pkg-config --libs libcrypto)
-+ LIBCRYPTO_CFLAGS := $(shell $(PKG_CONFIG) --cflags libcrypto) -DHAVE_LIBCRYPTO
-+ LIBCRYPTO_LIBS := $(shell $(PKG_CONFIG) --libs libcrypto)
- endif
-
- HAVE_PTHREAD := yes
diff --git a/app-text/mupdf/mupdf-1.17.0.ebuild b/app-text/mupdf/mupdf-1.17.0.ebuild
deleted file mode 100644
index 01332031c1ef..000000000000
--- a/app-text/mupdf/mupdf-1.17.0.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop flag-o-matic toolchain-funcs xdg
-
-DESCRIPTION="A lightweight PDF viewer and toolkit written in portable C"
-HOMEPAGE="https://mupdf.com/"
-SRC_URI="https://mupdf.com/downloads/archive/${P}-source.tar.xz"
-S="${WORKDIR}/${P}-source"
-
-LICENSE="AGPL-3"
-SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~x86 ~amd64-linux ~ppc-macos ~x64-macos"
-IUSE="X +javascript libressl opengl ssl"
-
-# Although we use the bundled, patched version of freeglut in mupdf (because of
-# bug #653298), the best way to ensure that its dependencies are present is to
-# install system's freeglut.
-BDEPEND="virtual/pkgconfig"
-RDEPEND="
- >=dev-lang/mujs-1.0.7:=
- media-libs/freetype:2=
- media-libs/harfbuzz:=[truetype]
- media-libs/jbig2dec:=
- media-libs/libpng:0=
- >=media-libs/openjpeg-2.1:2=
- virtual/jpeg
- opengl? ( >=media-libs/freeglut-3.0.0:= )
- ssl? (
- libressl? ( >=dev-libs/libressl-3.2.0:0= )
- !libressl? ( >=dev-libs/openssl-1.1:0= )
- )
- X? (
- x11-libs/libX11
- x11-libs/libXext
- )
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.15-CFLAGS.patch
- "${FILESDIR}"/${PN}-1.15-Makefile.patch
- "${FILESDIR}"/${PN}-1.10a-add-desktop-pc-xpm-files.patch
- # See bugs #662352
- "${FILESDIR}"/${PN}-1.15-openssl-x11.patch
- "${FILESDIR}"/${PN}-1.16.1-freeglut-fg_gl2-gcc-10.patch
- # General cross fixes from Debian (refreshed)
- "${FILESDIR}"/${PN}-1.17.0-cross-fixes.patch
-)
-
-src_prepare() {
- xdg_src_prepare
-
- use hppa && append-cflags -ffunction-sections
-
- use javascript || \
- sed -e '/* #define FZ_ENABLE_JS/ a\#define FZ_ENABLE_JS 0' \
- -i include/mupdf/fitz/config.h || die
-
- sed -e "1iOS = Linux" \
- -e "1iCC = $(tc-getCC)" \
- -e "1iLD = $(tc-getLD)" \
- -e "1iAR = $(tc-getAR)" \
- -e "1iverbose = yes" \
- -e "1ibuild = debug" \
- -e "1iprefix = ${ED}/usr" \
- -e "1ilibdir = ${ED}/usr/$(get_libdir)" \
- -e "1idocdir = ${ED}/usr/share/doc/${PF}" \
- -i Makerules || die
-}
-
-_emake() {
- # When HAVE_OBJCOPY is yes, we end up with a lot of QA warnings.
-
- # Bundled libs
- # * General
- # Note that USE_SYSTEM_LIBS=yes is a metaoption which will set to upstream's
- # recommendations. It does not mean "always use system libs".
- # See [0] below for what it means in a specific version.
- #
- # * freeglut
- # We don't use system's freeglut because upstream has a special modified
- # version of it that gives mupdf clipboard support. See bug #653298
- #
- # * mujs
- # As of v1.15.0, mupdf started using symbols in mujs that were not part
- # of any release. We then went back to using the bundled version of it.
- # But v1.17.0 looks ok, so we'll go unbundled again. Be aware of this risk
- # when bumping and check!
- # See bug #685244
- #
- # * lmms2
- # mupdf uses a bundled version of lcms2 [0] because Artifex have forked it [1].
- # It is therefore not appropriate for us to unbundle it at this time.
- #
- # [0] https://git.ghostscript.com/?p=mupdf.git;a=blob;f=Makethird;h=c4c540fa4a075df0db85e6fdaab809099881f35a;hb=HEAD#l9
- # [1] https://www.ghostscript.com/doc/lcms2mt/doc/WhyThisFork.txt
-
- emake \
- GENTOO_PV=${PV} \
- HAVE_GLUT=$(usex opengl) \
- HAVE_LIBCRYPTO=$(usex ssl) \
- HAVE_X11=$(usex X) \
- USE_SYSTEM_LIBS=yes \
- USE_SYSTEM_MUJS=yes \
- USE_SYSTEM_GLUT=no \
- HAVE_OBJCOPY=no \
- "$@"
-}
-
-src_compile() {
- _emake XCFLAGS="-fpic"
-}
-
-src_install() {
- if use X || use opengl ; then
- domenu platform/debian/${PN}.desktop
- doicon platform/debian/${PN}.xpm
- else
- rm docs/man/${PN}.1 || die
- fi
-
- _emake install
-
- dosym libmupdf.so.${PV} /usr/$(get_libdir)/lib${PN}.so
-
- if use opengl ; then
- einfo "mupdf symlink points to mupdf-gl (bug 616654)"
- dosym ${PN}-gl /usr/bin/${PN}
- elif use X ; then
- einfo "mupdf symlink points to mupdf-x11 (bug 616654)"
- dosym ${PN}-x11 /usr/bin/${PN}
- fi
-
- # Respect libdir (bug #734898)
- sed -i -e "s:/lib:/$(get_libdir):" platform/debian/${PN}.pc || die
-
- insinto /usr/$(get_libdir)/pkgconfig
- doins platform/debian/${PN}.pc
-
- dodoc README CHANGES CONTRIBUTORS
-}
diff --git a/app-text/ots/Manifest b/app-text/ots/Manifest
deleted file mode 100644
index cf20fb470e33..000000000000
--- a/app-text/ots/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX ots-0.5.0-automake-1.13.patch 435 BLAKE2B a4ea226fa489a0d42f73c1f2bc936b10dd875067190f0f1f2c824209ad38511beb7baf471438408564e5e66af7980714e64a1345fc5b7b27bfe7df9394860c63 SHA512 9ff7d9117ea12917b967c386054afbc25c2c9a9e85d9930fa7ecdf9e0c230a64a6f3689d22c94a796f00d13cd652fd6d7bcfe21c7ccc1649ee58f68ca5f89a11
-AUX ots-0.5.0-fix-installation.patch 514 BLAKE2B 932a241591dcc23b9a57070e23422f9ae8077061f812ab262d63ed069bac1d7984a66169d47640359dfbb41ed779928470d81b604b6695b9a8fbf5c6291c2104 SHA512 490974d43f3001220505fe9b77830b57f0ffc8faf0ab262c3de8f50c4ada75df64588441f20810e6958ed78de5a2e898c889cb686eddeeccfe497f42cbfa4664
-AUX ots-0.5.0-fix-underlinking.patch 863 BLAKE2B a85d3c6d4c004a3105935e013705e10e26159500f7dd95c2edf6fcccf1af9bfd1a1f8854feba37ed7b8473e8c272d355367eb795486cc65b820c264a4dd32ed6 SHA512 34f189afbba9d1c8936142f27e5ab6ed4ab2eac8271a58e9295e46b993b0be7d48fa771cd62b3a8374da15b07deaa12eefcc01b0dd34643947cb43cd64f5d0a6
-AUX ots-0.5.0-math.patch 402 BLAKE2B 647dd793323f1eb6a470015053c066593a6fc4da95c3b36f3e0c7926e38ebd75997fd3482dffa3bda850f70fac5a8a65ad19cb6e725fd514d4e9d4b366d9fec1 SHA512 4ba250e3c51eb621bba6e8ee1d291719c86d04ecb2dc20cbd1bf7bae27ea22ffbe54376d690c24c84a0af0da9907dcf40d01c0aa53e9b610737930a442cf6918
-DIST ots-0.5.0.tar.gz 371126 BLAKE2B 05785a4d4ec5feba421762ba58a7dab649f3fadcf83a3f809a73b8027c6668263a29305766aba1bba4ce9447e115a89a59788026d567b5b82f9e1c1f7a934d97 SHA512 736a672e16b741f2948e6874b88d4ade8e0450941915e65285f2fe661194a6d384a6abb267b15c3254c638750c644b4b2cf4279d7bda163b02336fcd8da9cfbe
-EBUILD ots-0.5.0-r1.ebuild 1138 BLAKE2B 8eb53441c6d769f69da5432363c4702077808edb5b451e58ff4f3cb0d3591805eb2367cabd97220994c7888dad472cf3083bbc375d12f4a3fac85eba433d73a3 SHA512 5db848ddded743c7f6a4fbf79d3e0c6299f917d80d435ca624c32975bd5e557a6a88170f7d0a499a699bf8bd32b426f006d177c1763c1dfcbef3ed0a5c835512
-MISC metadata.xml 243 BLAKE2B aa2c4e92961faa40826e16a92582bb02cacbe1a10bd1e6e8d169560472923ce521ec642b1b0175ad5beac315e575d65c9a23466b08cc95eb9605ed2376af50d1 SHA512 354efb009da3999e18811a3e91f53628d4ce26aa103544be6b5d42caf9c5d9881097e81777665f96c7828a15a7e38f1e4a118579a865eb4c740e580527b42774
diff --git a/app-text/ots/files/ots-0.5.0-automake-1.13.patch b/app-text/ots/files/ots-0.5.0-automake-1.13.patch
deleted file mode 100644
index 074eb0e53a83..000000000000
--- a/app-text/ots/files/ots-0.5.0-automake-1.13.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up ots-0.5.0/configure.in.automake-1_13 ots-0.5.0/configure.in
---- ots-0.5.0/configure.in.automake-1_13 2007-04-08 20:12:42.000000000 +0200
-+++ ots-0.5.0/configure.in 2013-01-09 02:31:52.690211708 +0100
-@@ -34,7 +34,7 @@ PACKAGE=ots
-
- dnl Specify a configuration file
- dnl Initialize automake stuff
--AM_CONFIG_HEADER(ots-config.h)
-+AC_CONFIG_HEADERS(ots-config.h)
- AM_INIT_AUTOMAKE($PACKAGE, $OTS_VERSION)
- AM_MAINTAINER_MODE
-
diff --git a/app-text/ots/files/ots-0.5.0-fix-installation.patch b/app-text/ots/files/ots-0.5.0-fix-installation.patch
deleted file mode 100644
index 757f4f86b80b..000000000000
--- a/app-text/ots/files/ots-0.5.0-fix-installation.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- dic/Makefile.am~ 2003-07-22 16:56:03.000000000 +0200
-+++ dic/Makefile.am 2009-06-01 00:40:17.000000000 +0200
-@@ -1,7 +1,7 @@
- DICTS=bg.xml ca.xml cs.xml cy.xml da.xml de.xml el.xml en.xml eo.xml es.xml \
- et.xml eu.xml fi.xml fr.xml ga.xml gl.xml he.xml hu.xml ia.xml id.xml \
- is.xml it.xml lv.xml mi.xml ms.xml mt.xml nl.xml nn.xml pl.xml pt.xml \
-- ro.xml ru.xml sv.xml tl.xml tr.xml uk.xml yi.xml en.xml
-+ ro.xml ru.xml sv.xml tl.xml tr.xml uk.xml yi.xml
-
- pkgdata_DATA = $(DICTS)
-
diff --git a/app-text/ots/files/ots-0.5.0-fix-underlinking.patch b/app-text/ots/files/ots-0.5.0-fix-underlinking.patch
deleted file mode 100644
index dd9295930c33..000000000000
--- a/app-text/ots/files/ots-0.5.0-fix-underlinking.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- src/Makefile.in.orig 2007-04-08 20:17:23.000000000 +0200
-+++ src/Makefile.in 2008-07-05 02:16:42.000000000 +0200
-@@ -108,7 +108,7 @@
-
- lib_LTLIBRARIES = libots-1.la
-
--libots_1_la_LIBADD = $(OTS_LIBS)
-+libots_1_la_LIBADD = $(OTS_LIBS) -lm
- libots_1_la_LDFLAGS = -version-info @VERSION_INFO@ $(no_undefined)
- libots_1_la_SOURCES = libots.h article.c dictionary.c grader.c grader-tf.c grader-tc.c grader-tc.h html.c parser.c text.c stemmer.c highlighter.c wordlist.c relations.c
-
---- src/Makefile.am~ 2007-04-08 18:21:51.000000000 +0200
-+++ src/Makefile.am 2009-06-01 00:28:53.000000000 +0200
-@@ -20,7 +20,7 @@
-
- lib_LTLIBRARIES = libots-1.la
-
--libots_1_la_LIBADD = $(OTS_LIBS)
-+libots_1_la_LIBADD = $(OTS_LIBS) -lm
- libots_1_la_LDFLAGS = -version-info @VERSION_INFO@ $(no_undefined)
- libots_1_la_SOURCES = \
- libots.h \
diff --git a/app-text/ots/files/ots-0.5.0-math.patch b/app-text/ots/files/ots-0.5.0-math.patch
deleted file mode 100644
index da964c25f612..000000000000
--- a/app-text/ots/files/ots-0.5.0-math.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff --exclude='*~' -Naur ots-0.5.0.orig/src/grader-tf.c ots-0.5.0/src/grader-tf.c
---- ots-0.5.0.orig/src/grader-tf.c 2008-05-17 12:17:23.000000000 +0000
-+++ ots-0.5.0/src/grader-tf.c 2008-05-17 12:17:37.000000000 +0000
-@@ -22,6 +22,7 @@
- #include
- #include
- #include "libots.h"
-+#include
-
- /*Grader - using the Term frequency algorithm. Will give each line a score*/
-
diff --git a/app-text/ots/metadata.xml b/app-text/ots/metadata.xml
deleted file mode 100644
index 88f5ac008b4a..000000000000
--- a/app-text/ots/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
-
- libots
-
-
diff --git a/app-text/ots/ots-0.5.0-r1.ebuild b/app-text/ots/ots-0.5.0-r1.ebuild
deleted file mode 100644
index 0dd8f38da851..000000000000
--- a/app-text/ots/ots-0.5.0-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils ltprune
-
-DESCRIPTION="Open source Text Summarizer, as used in newer releases of abiword and kword"
-HOMEPAGE="http://libots.sourceforge.net/"
-SRC_URI="mirror://sourceforge/libots/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~mips ppc ppc64 ~sparc x86"
-IUSE=""
-
-RDEPEND="
- dev-libs/glib:2
- >=dev-libs/libxml2-2.4.23
- >=dev-libs/popt-1.5
-"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
-"
-
-DOCS="AUTHORS BUGS ChangeLog HACKING NEWS README TODO"
-
-src_prepare() {
- # ugly ugly hack, kick upstream to fix its packaging
- touch "${S}"/gtk-doc.make
-
- epatch "${FILESDIR}"/${P}-math.patch
- epatch "${FILESDIR}"/${P}-automake-1.13.patch
- epatch "${FILESDIR}"/${P}-fix-installation.patch
- epatch "${FILESDIR}"/${P}-fix-underlinking.patch
- eautoreconf
-}
-
-src_configure() {
- # bug 97448
- econf \
- --disable-gtk-doc \
- --disable-static
-}
-
-src_compile() {
- # parallel make fails, bug 112932
- emake -j1
-}
-
-src_install() {
- default
- prune_libtool_files
- rm -rf "${D}"/usr/share/doc/libots
-}
diff --git a/app-text/pandoc/Manifest b/app-text/pandoc/Manifest
index 3c80bbe2b259..a0280f082d9f 100644
--- a/app-text/pandoc/Manifest
+++ b/app-text/pandoc/Manifest
@@ -1,3 +1,5 @@
+DIST pandoc-2.11.3.1.tar.gz 12924767 BLAKE2B e8e99e3993363730d7e048926754f29b0f8a3e61278efeadd549c45d7434ff627f701bbe5d54203a6592bc12fe0086b107d82e552c3b5e60f5f20afd65ecdae6 SHA512 a1e4b0a598c56b892e95d0c129717b0c56071fe6614583171bf7b661a8c02221cff8927f1a1a6b375236b563cc9585684de1d4eeb2514e81722866c29260fb5e
DIST pandoc-2.9.2.1.tar.gz 12586844 BLAKE2B 298cafc88c33f461e6724cb60f4462398ab6a484eb4fcd598a488f4d599abc09f5e85faf16cc4da5c7cfc2274fb2ed1acf5cf9450bcc83c2ec810badfb7d6380 SHA512 35ac491a7e0a2f6d8fe0f2c2ffe265748b13920904e974f88c92b3f82edb2f1c03e28ebef1bc344ead13d566117a5e50707a68edc49f95159157f974210b23b2
+EBUILD pandoc-2.11.3.1.ebuild 6170 BLAKE2B 097a59b21710bb75bb17f3d93cca07918a041eecc9517d0e8476c44af174f5f6b227d9bc9065d705b552841a12d3068c40e0ac9a64bb36c9c0ee2a0988df3fb5 SHA512 5a2a9266d3285952688af54ed71f7d34eeb0612cf2c1b0d147597132e3393411edc73393759f5389496378d66b27d2e3e5241dcf920121bde8f750486ae9a21c
EBUILD pandoc-2.9.2.1.ebuild 6088 BLAKE2B 156eb7fda9f1824886d8d484db802dd645601abe0514fadc21e359ee0f8bb02f4b0ad7ba1c1d77d7e662f9fdda45de16b91ab9f756d383c5e95b2f48811132c5 SHA512 a600bad2ecb5b8b497cc1041685a1b4c98d20cfe9347cec12e5679d197dbcb5b70aa70a42e03f4cd48252713b3a669475bc0d82d076afe3454b9f2e00c5e5e59
MISC metadata.xml 941 BLAKE2B 04e284ba78b78c6a88999705ce10650fbe854fd5154bc197b938de1e7b12689382c0c19b04c522366fb51c50f7f0b03d7cdb875ee6840816613bfc96f7d1d7c6 SHA512 2cb5cdae868ec8345655e18303a9fe1bae9c4eef4ee2b2da3f302b2e520af70095f06f78cbf0de1cbed524ddccb43742a73a5ce0e3710876ce83d25f4f19f77f
diff --git a/app-text/pandoc/pandoc-2.11.3.1.ebuild b/app-text/pandoc/pandoc-2.11.3.1.ebuild
new file mode 100644
index 000000000000..d51982085be4
--- /dev/null
+++ b/app-text/pandoc/pandoc-2.11.3.1.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.7.9999
+#hackport: flags: -static
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Conversion between markup formats"
+HOMEPAGE="https://pandoc.org"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="embed-data-files optimize trypandoc"
+
+# test failure: error while loading shared libraries:
+# libHSpandoc-2.9.2.1-FD5JyeIDy0ZA6c46md2bYO-ghc8.8.3.so:
+# cannot open shared object file: No such file or directory
+RESTRICT=test
+
+RDEPEND=">=dev-haskell/aeson-0.7:=[profile?] =dev-haskell/aeson-pretty-0.8.5:=[profile?] =dev-haskell/attoparsec-0.12:=[profile?] =dev-haskell/base-compat-0.9:=[profile?]
+ >=dev-haskell/base64-bytestring-0.1:=[profile?] =dev-haskell/blaze-html-0.9:=[profile?] =dev-haskell/blaze-markup-0.8:=[profile?] =dev-haskell/case-insensitive-1.2:=[profile?] =dev-haskell/citeproc-0.3.0.1:=[profile?] =dev-haskell/commonmark-0.1.1.2:=[profile?] =dev-haskell/commonmark-extensions-0.2.0.4:=[profile?] =dev-haskell/commonmark-pandoc-0.2:=[profile?] =dev-haskell/connection-0.3.1:=[profile?]
+ >=dev-haskell/data-default-0.4:=[profile?] =dev-haskell/doclayout-0.3:=[profile?] =dev-haskell/doctemplates-0.9:=[profile?] =dev-haskell/emojis-0.1:=[profile?] =dev-haskell/exceptions-0.8:=[profile?] =dev-haskell/file-embed-0.0:=[profile?] =dev-haskell/glob-0.7:=[profile?] =dev-haskell/haddock-library-1.8:=[profile?] =dev-haskell/hslua-1.1:=[profile?] =dev-haskell/hslua-module-system-0.2:=[profile?] =dev-haskell/hslua-module-text-0.2.1:=[profile?] =dev-haskell/hsyaml-0.2:=[profile?] =dev-haskell/http-4000.0.5:=[profile?] =dev-haskell/http-client-0.4.30:=[profile?] =dev-haskell/http-client-tls-0.2.4:=[profile?] =dev-haskell/http-types-0.8:=[profile?] =dev-haskell/ipynb-0.1:=[profile?] =dev-haskell/jira-wiki-markup-1.3.2:=[profile?] =dev-haskell/juicypixels-3.1.6.1:=[profile?] =dev-haskell/mtl-2.2:=[profile?] =dev-haskell/network-2.6:=[profile?]
+ >=dev-haskell/network-uri-2.6:=[profile?] =dev-haskell/pandoc-types-1.22:=[profile?] =dev-haskell/parsec-3.1:=[profile?] =dev-haskell/random-1:=[profile?] =dev-haskell/safe-0.3:=[profile?] =dev-haskell/scientific-0.3:=[profile?] =dev-haskell/sha-1.6:=[profile?] =dev-haskell/skylighting-0.10.2:=[profile?] =dev-haskell/skylighting-core-0.10.2:=[profile?] =dev-haskell/split-0.2:=[profile?] =dev-haskell/syb-0.1:=[profile?] =dev-haskell/tagsoup-0.14.6:=[profile?] =dev-haskell/temporary-1.1:=[profile?] =dev-haskell/texmath-0.12.0.2:=[profile?] =dev-haskell/text-1.1.1.0:=[profile?] =dev-haskell/text-conversions-0.3:=[profile?] =dev-haskell/unicode-transforms-0.3:=[profile?] =dev-haskell/unordered-containers-0.2:=[profile?] =dev-haskell/xml-1.3.12:=[profile?] =dev-haskell/zip-archive-0.2.3.4:=[profile?] =dev-haskell/zlib-0.5:=[profile?] =dev-lang/ghc-8.0.1:=
+ trypandoc? ( >=dev-haskell/wai-0.3:=[profile?]
+ dev-haskell/wai-extra:=[profile?] )
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2
+ test? ( >=dev-haskell/diff-0.2 =dev-haskell/executable-path-0.0 =dev-haskell/quickcheck-2.4 =dev-haskell/tasty-0.11 =dev-haskell/tasty-golden-2.3 =dev-haskell/tasty-hunit-0.9 =dev-haskell/tasty-lua-0.2 =dev-haskell/tasty-quickcheck-0.8
-
-
-
-
- jgm/peg-markdown
-
-
diff --git a/app-text/peg-markdown/peg-markdown-0.4.14.ebuild b/app-text/peg-markdown/peg-markdown-0.4.14.ebuild
deleted file mode 100644
index 66f95d01bb91..000000000000
--- a/app-text/peg-markdown/peg-markdown-0.4.14.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Implementation of markdown in C, using a PEG grammar"
-HOMEPAGE="https://github.com/jgm/peg-markdown"
-SRC_URI="https://github.com/jgm/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="|| ( GPL-2 MIT )"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-libs/glib:2"
-DEPEND="${RDEPEND}
- dev-util/peg
- test? (
- dev-lang/perl
- virtual/perl-Getopt-Long
- app-text/htmltidy )"
-
-src_prepare() {
- rm -rf peg-* || die "rm failed"
- sed -i \
- -e 's/^PROGRAM=markdown/PROGRAM=peg-markdown/' \
- -e 's/$(CC) `/$(CC) $(LDFLAGS) `/g' \
- -e 's/^\t$(LEG)/\tleg/' \
- -e 's/^$(PEGDIR):/dummy:/' \
- -e '/$(PEGDIR)/d' \
- -e 's/$(LEG) //g' \
- Makefile || die 'sed failed'
- sed -i \
- -e '/strdup/d' markdown_peg.h || die 'sed .h failed'
-}
-
-src_install() {
- dobin peg-markdown
- dodoc README.markdown
-}
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index c86e01af8726..45bfb0dcbb8b 100644
Binary files a/dev-db/Manifest.gz and b/dev-db/Manifest.gz differ
diff --git a/dev-db/aerospike-server-community/Manifest b/dev-db/aerospike-server-community/Manifest
deleted file mode 100644
index 6f362159c727..000000000000
--- a/dev-db/aerospike-server-community/Manifest
+++ /dev/null
@@ -1,10 +0,0 @@
-AUX 3.5.8-use-system-libs.patch 1755 BLAKE2B fd16e094db29fcce9ed327cc02c730bef8bca486500c80b956d2e2d8e708053982fc39d2ba5e5b9fad141a042bd4eb5b2559a80d1bd59f3f497176afce56374e SHA512 9124fc14481bc1390a743d2365aa51723445e90db428607aa76d7d59e2c73bc4236da4d1a57c765d4484895147f06254bb269f80b0ff9f7029fcb2f782a418a4
-AUX aerospike.conf 1265 BLAKE2B 2851f1a2dcec6b9514ce82b68c832aff55a9d06e4b1127505c377cf18ba118fafaa6b7edea75997142b1c3919d8c55db2edb8b180ded90ca3d1ceeedfef30ff9 SHA512 5d2b2a368bb31e8230d2f88073befbf5f1aa33aecc628b669e5714cfde71e83d53143b28c0ee95b52f13e84027283413927abd97470a97e36946cc05605b15ed
-AUX aerospike.init 1194 BLAKE2B d21f481882027c748de84a01f599a0f3e17f7a14c14c1b7b5e9427399d1e01b9339f6061a77ca2eaba71c2950db1fb92af09e49dfa7b20a0a9f40d85f6c3603c SHA512 c8d5db18225aa031d152337981430bef413fc30592d162776fab6c1d1c8ea2876233feba7c73f103fc35091255ef7f31da602c6dcb302d9dcac2ce9a67c97837
-AUX aerospike.logrotate 196 BLAKE2B e52b68100c48c2ea47d28583a80fbc8da44d866884ef159520315641f8e5261f0e8561cf53460a23fe0daa12133023a5a2c8bc4a8efa81bf89f2b17735ff4bc3 SHA512 2810df72e5a570be0d3118b0c3244fb13ae7bb98684219d681f02a1ec1499191e1f7e3455da818a8ca36d36a7d194cf85ee1985930bf6fe63b1723060af05cba
-AUX aerospike_mesh.conf 1476 BLAKE2B 76dd16b34f024faec1cbbad526b72dfc389f5ba875928a71147e2a21e1f5cec3754c2bd821d2a329cea475ec5f12b6f4c355d15e0a6092733959a4f6131b5a12 SHA512 a7d5e52738a3153b649cc81d8a9b635b70fe21335802f5c2f348fe71f3b7087ea85aaf926c4ad3ce71514fa1b479f98bc27aadb95995a5bbb8808219bcbe28c4
-AUX aerospike_ssd.conf 1341 BLAKE2B 70720ac3bf9c7b41eb595a4ef2ff16d559abbd2f8c64b09159ea6ad7068513040ac0b036eb4dcd77252b454002935b7e8255c79e6a4ebf06850d3acc325100df SHA512 0382842d4e7b20caaa4c39d999da0cd2b67c24bdd9fad6e5d2d393758b6f788decf0039ae9a262a4db7e89b358cbb9954efd082a15549d12e3e244b2c51675c9
-DIST aerospike-server-community-4.1.0.1-debian7.tgz 16538371 BLAKE2B b879fa134d932dd5c5f3432abd6902e3a1bfd071b7753a78b4d2fdd1cc58e6b875c6793285dbfa18612f9ccd98af4f8ae3a16e7178a30d03715a4d38dc369b1c SHA512 f3954f209a3aab446c193b07fe6c045de89af115f29815a886c99b5648da1e3ff1b348cb1ec4299ce772d7619918e2340de6c25393e04c3bf4b9f1760646625d
-EBUILD aerospike-server-community-4.1.0.1.ebuild 1638 BLAKE2B 751741ae79b6700d6233106c6d47daab9ed2d998fafa1162ad19612a4e2ad6865d7a06f698d56aaf52f61ad06203bd6551657a68c0c6d7dd6c027f3a8cd0fd96 SHA512 44c44e9aa4781b43d74d2a2e397c724916ee02da62899525436d6b8eb0b2ac20a9507f3cb2b24cadcf4168859a3b61b6e1dc78ed2c9b9c3bf104f17f10c359c3
-EBUILD aerospike-server-community-9999.ebuild 1921 BLAKE2B 7ee8da5034709fe63c47aa0f6caaf426be2184d68b6f5403261173e4f56fe87ded940b35a65e6994154da9a2ba2c7f023c4c65789a5e12ad1238cce2d3950572 SHA512 3c034f9f0498c74317d8996fca9f022b3eb7d9bca05bea1903e10596a632165a4f1e7ca516cbbf97e24cd8d1b6b89812ae48ec0ee5e448b1436384e3c18fe3fa
-MISC metadata.xml 281 BLAKE2B c83365afa5d87cf5b8d65ed299e16797d54a0c5f8632ad69c7449edcd52b32f150bc7f933a9e3662d45c37fc64dfcd97b09b3d265a328cdc3ca6cc609a2311f2 SHA512 d3a33c339bb7409528ddca6187790b842150e273bd7630a610c0be08be50e26278ed7b4d42305bfd1a796544c6be251301c938b15d70e609b9d91bd22161aee6
diff --git a/dev-db/aerospike-server-community/aerospike-server-community-4.1.0.1.ebuild b/dev-db/aerospike-server-community/aerospike-server-community-4.1.0.1.ebuild
deleted file mode 100644
index a69846b1bc8b..000000000000
--- a/dev-db/aerospike-server-community/aerospike-server-community-4.1.0.1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils user
-
-DESCRIPTION="Flash-optimized, in-memory, nosql database"
-HOMEPAGE="http://www.aerospike.com"
-SRC_URI="http://www.aerospike.com/artifacts/${PN}/${PV}/${P}-debian7.tgz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="sys-libs/readline:0
- sys-libs/zlib
- dev-libs/openssl:0
- "
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${P}-debian7"
-
-pkg_setup() {
- enewgroup aerospike
- enewuser aerospike -1 /bin/bash /opt/aerospike aerospike
-}
-
-src_prepare() {
- local server_deb="${P}.debian7.x86_64.deb"
- local tools_deb="aerospike-tools-3.15.3.6.debian7.x86_64.deb"
-
- ar x "${server_deb}" || die
- tar xzf data.tar.gz && rm data.tar.gz || die
-
- ar x "${tools_deb}" || die
- tar xzf data.tar.gz && rm data.tar.gz || die
-
- rm *.deb asinstall control.tar.gz debian-binary LICENSE SHA256SUMS
- rm usr/bin/{asfixownership,asmigrate2to3}
-}
-
-src_install() {
- insinto /opt/
- doins -r opt/aerospike
-
- fperms +x -R /opt/aerospike/bin/
- fperms +x -R /opt/aerospike/lib/python/
-
- for dir in '/etc' '/var/log'; do
- keepdir "${dir}/aerospike"
- done
-
- insinto /etc/aerospike
- for conf in 'aerospike.conf' 'aerospike_mesh.conf' 'aerospike_ssd.conf'; do
- doins "${FILESDIR}/${conf}"
- done
-
- insinto /usr/bin
- doins usr/bin/*
- fperms +x -R /usr/bin/asd
-
- insinto /etc/logrotate.d
- newins "${FILESDIR}"/aerospike.logrotate aerospike
-
- newinitd "${FILESDIR}"/aerospike.init aerospike
-
- fowners -R aerospike:aerospike /opt/aerospike/
- fowners aerospike:aerospike /usr/bin/asd
- fowners -R aerospike:aerospike /var/log/aerospike
-}
diff --git a/dev-db/aerospike-server-community/aerospike-server-community-9999.ebuild b/dev-db/aerospike-server-community/aerospike-server-community-9999.ebuild
deleted file mode 100644
index 0ff1b892d746..000000000000
--- a/dev-db/aerospike-server-community/aerospike-server-community-9999.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit git-r3 systemd user
-
-DESCRIPTION="Flash-optimized, in-memory, nosql database"
-HOMEPAGE="http://www.aerospike.com"
-EGIT_REPO_URI="https://github.com/aerospike/aerospike-server.git"
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS=""
-IUSE="+tools"
-
-RDEPEND="
- dev-libs/jansson
- dev-libs/jemalloc"
-DEPEND="${RDEPEND}"
-
-DOCS=(
- README.md
-)
-
-PATCHES=(
- "${FILESDIR}"/3.5.8-use-system-libs.patch
-)
-
-pkg_setup() {
- enewgroup aerospike
- enewuser aerospike -1 /bin/bash /opt/aerospike aerospike
-}
-
-src_prepare() {
- base_src_prepare
-
- git submodule update --init
-
- sed \
- -e 's/USE_SYSTEM_JEM = 0/USE_SYSTEM_JEM = 1/g' \
- -e 's/USE_SYSTEM_JANSSON = 0/USE_SYSTEM_JANSSON = 1/g' \
- -e 's/LD_CRYPTO = static/LD_CRYPTO = dynamic/g' \
- -e 's/LD_JANSSON = static/LD_JANSSON = dynamic/g' \
- -e 's/LD_JEM = static/LD_JEM = dynamic/g' \
- -i make_in/Makefile.vars || die
-
- rm -rf modules/jansson
- rm -rf modules/jemalloc
-}
-
-src_install() {
- base_src_install_docs
-
- dobin target/Linux-x86_64/bin/asd
-
- insinto /opt/aerospike/sys/udf/lua
- doins -r modules/lua-core/src/*
-
- if use tools; then
- insinto /opt/aerospike/bin
- doins tools/afterburner/afterburner.sh
- fperms +x /opt/aerospike/bin/afterburner.sh
- fi
-
- keepdir /opt/aerospike/usr/udf/lua
- keepdir /var/log/aerospike
-
- insinto /etc/aerospike
- for conf in aerospike.conf aerospike_mesh.conf aerospike_ssd.conf; do
- sed -e "s@/var/run/aerospike/asd.pid@/run/aerospike/aerospike.pid@g" -i as/etc/"${conf}" || die
- doins as/etc/"${conf}"
- done
-
- insinto /etc/logrotate.d
- newins as/etc/logrotate_asd aerospike
-
- newinitd "${FILESDIR}"/aerospike.init aerospike
- systemd_newunit as/etc/aerospike-server.service aerospike.service
-
- fowners -R aerospike:aerospike /opt/aerospike/
- fowners aerospike:aerospike /usr/bin/asd
- fowners -R aerospike:aerospike /var/log/aerospike
-}
diff --git a/dev-db/aerospike-server-community/files/3.5.8-use-system-libs.patch b/dev-db/aerospike-server-community/files/3.5.8-use-system-libs.patch
deleted file mode 100644
index eb69f5ff2e51..000000000000
--- a/dev-db/aerospike-server-community/files/3.5.8-use-system-libs.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-diff --git a/Makefile b/Makefile
-index d4ce8ac..26271fd 100644
---- a/Makefile
-+++ b/Makefile
-@@ -54,12 +54,16 @@ ifeq ($(USE_ASM),1)
- $(MAKE) -C $(ASMALLOC) jem SRCDIR=src
- endif
- ifeq ($(USE_JEM),1)
-+ifeq ($(USE_SYSTEM_JEM),0)
- $(MAKE) -C $(JEMALLOC)
- endif
-+endif
- ifeq ($(USE_LUAJIT),1)
- $(MAKE) -C $(LUAJIT) Q= TARGET_SONAME=libluajit.so CCDEBUG=-g
- endif
-+ifeq ($(USE_SYSTEM_JANSSON),0)
- $(MAKE) -C $(JANSSON)
-+endif
- $(MAKE) -C $(COMMON) CF=$(CF) EXT_CFLAGS="$(EXT_CFLAGS)"
- $(MAKE) -C $(CF)
- $(MAKE) -C $(MOD_LUA) CF=$(CF) COMMON=$(COMMON) LUA_CORE=$(LUA_CORE) EXT_CFLAGS="$(EXT_CFLAGS)" USE_LUAJIT=$(USE_LUAJIT) LUAJIT=$(LUAJIT)
-@@ -174,16 +178,24 @@ mexp2: mexp1
- $(MAKE) MEXP_PHASE=2 SRCDIR=$(realpath $(MEXP_DIR))/
-
- $(JANSSON)/configure:
-+ifeq ($(USE_SYSTEM_JANSSON),0)
- cd $(JANSSON) && autoreconf -i
-+endif
-
- $(JANSSON)/Makefile: $(JANSSON)/configure
-+ifeq ($(USE_SYSTEM_JANSSON),0)
- cd $(JANSSON) && ./configure $(JANSSON_CONFIG_OPT)
-+endif
-
- $(JEMALLOC)/configure:
-+ifeq ($(USE_SYSTEM_JEM),0)
- cd $(JEMALLOC) && autoconf
-+endif
-
- $(JEMALLOC)/Makefile: $(JEMALLOC)/configure
-+ifeq ($(USE_SYSTEM_JEM),0)
- cd $(JEMALLOC) && ./configure $(JEM_CONFIG_OPT)
-+endif
-
- $(LUAJIT)/src/luaconf.h: $(LUAJIT)/src/luaconf.h.orig
- ln -s $(notdir $<) $@
-diff --git a/make_in/Makefile.vars b/make_in/Makefile.vars
-index efe3226..0b54701 100644
---- a/make_in/Makefile.vars
-+++ b/make_in/Makefile.vars
-@@ -31,6 +31,12 @@ ifeq ($(USE_ASM),1)
- EXT_CFLAGS += -DUSE_ASM
- endif
-
-+# Use the system provided JEMalloc memory allocator? [By default, no.]
-+USE_SYSTEM_JEM = 0
-+
-+# Use the system provided Jansson JSON API Library? [By default, no.]
-+USE_SYSTEM_JANSSON = 0
-+
- # Use the JEMalloc memory allocator? [By default, yes.]
- USE_JEM = 1
-
diff --git a/dev-db/aerospike-server-community/files/aerospike.conf b/dev-db/aerospike-server-community/files/aerospike.conf
deleted file mode 100644
index 842873bd3e8e..000000000000
--- a/dev-db/aerospike-server-community/files/aerospike.conf
+++ /dev/null
@@ -1,70 +0,0 @@
-# Aerospike database configuration file.
-
-service {
- user root
- group root
- paxos-single-replica-limit 1 # Number of nodes where the replica count is automatically reduced to 1.
- pidfile /run/aerospike/aerospike.pid
- service-threads 4
- transaction-queues 4
- transaction-threads-per-queue 4
- proto-fd-max 15000
-}
-
-logging {
- # Log file must be an absolute path.
- file /var/log/aerospike/aerospike.log {
- context any info
- }
-}
-
-network {
- service {
- address any
- port 3000
- }
-
- heartbeat {
- mode multicast
- address 239.1.99.222
- port 9918
-
- # To use unicast-mesh heartbeats, remove the 3 lines above, and see
- # aerospike_mesh.conf for alternative.
-
- interval 150
- timeout 10
- }
-
- fabric {
- port 3001
- }
-
- info {
- port 3003
- }
-}
-
-namespace test {
- replication-factor 2
- memory-size 4G
- default-ttl 30d # 30 days, use 0 to never expire/evict.
-
- storage-engine memory
-}
-
-namespace bar {
- replication-factor 2
- memory-size 4G
- default-ttl 30d # 30 days, use 0 to never expire/evict.
-
- storage-engine memory
-
- # To use file storage backing, comment out the line above and use the
- # following lines instead.
-# storage-engine device {
-# file /opt/aerospike/data/bar.dat
-# filesize 16G
-# data-in-memory true # Store data in memory in addition to file.
-# }
-}
diff --git a/dev-db/aerospike-server-community/files/aerospike.init b/dev-db/aerospike-server-community/files/aerospike.init
deleted file mode 100644
index b1dac8078d6d..000000000000
--- a/dev-db/aerospike-server-community/files/aerospike.init
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-config_file=${config_file:-/etc/aerospike/${SVCNAME}.conf}
-run_dir=${run_dir:-/run/aerospike}
-
-command="/usr/bin/asd"
-command_args="--config-file ${config_file}"
-command_background="false"
-pidfile=${run_dir}/${SVCNAME}.pid
-user=${user:-aerospike}
-group=${group:-aerospike}
-start_stop_daemon_args="--user ${user} --group ${group}"
-required_files="${config_file}"
-
-depend() {
- use net
-}
-
-set_shmall() {
- mem=`/sbin/sysctl -n kernel.shmall`
- min=4294967296
- if [ ${#mem} -le ${#min} ]; then
- if [ $mem -lt $min ]; then
- ewarn "kernel.shmall too low, setting to 4G pages = 16TB"
- /sbin/sysctl -w kernel.shmall=$min
- fi
- fi
-}
-
-set_shmmax() {
- mem=`/sbin/sysctl -n kernel.shmmax`
- min=1073741824
- if [ ${#mem} -le ${#min} ]; then
- if [ $mem -lt $min ]; then
- ewarn "kernel.shmmax too low, setting to 1GB"
- /sbin/sysctl -w kernel.shmmax=$min
- fi
- fi
-}
-
-start_pre() {
- checkpath -d -m 0755 -o "${user}":"${group}" "${run_dir}"
- set_shmall
- set_shmmax
- ulimit -n 100000
- if [ -n $LD_PRELOAD ]; then export LD_PRELOAD; fi
-}
-
-start_post() {
- ewaitfile 60 "${pidfile}"
-}
diff --git a/dev-db/aerospike-server-community/files/aerospike.logrotate b/dev-db/aerospike-server-community/files/aerospike.logrotate
deleted file mode 100644
index 04aabc4a6017..000000000000
--- a/dev-db/aerospike-server-community/files/aerospike.logrotate
+++ /dev/null
@@ -1,10 +0,0 @@
-/var/log/aerospike/aerospike.log {
- daily
- rotate 90
- dateext
- compress
- olddir /var/log/aerospike/
- postrotate
- kill -HUP `cat /var/run/aerospike/aerospike.pid`
- endscript
-}
diff --git a/dev-db/aerospike-server-community/files/aerospike_mesh.conf b/dev-db/aerospike-server-community/files/aerospike_mesh.conf
deleted file mode 100644
index 26274f310ed0..000000000000
--- a/dev-db/aerospike-server-community/files/aerospike_mesh.conf
+++ /dev/null
@@ -1,73 +0,0 @@
-# Aerospike database configuration file for deployments using mesh heartbeats.
-
-service {
- user root
- group root
- paxos-single-replica-limit 1 # Number of nodes where the replica count is automatically reduced to 1.
- pidfile /run/aerospike/aerospike.pid
- service-threads 4
- transaction-queues 4
- transaction-threads-per-queue 4
- proto-fd-max 15000
-}
-
-logging {
- # Log file must be an absolute path.
- file /var/log/aerospike/aerospike.log {
- context any info
- }
-}
-
-network {
- service {
- address any
- port 3000
- }
-
- heartbeat {
- mode mesh
- port 3002 # Heartbeat port for this node.
-
- # List one or more other nodes, one ip-address & port per line:
- mesh-seed-address-port 10.10.10.10 3002
-# mesh-seed-address-port 10.10.10.11 3002
-# mesh-seed-address-port 10.10.10.12 3002
-# mesh-seed-address-port 10.10.10.13 3002
-# mesh-seed-address-port 10.10.10.14 3002
-
- interval 250
- timeout 10
- }
-
- fabric {
- port 3001
- }
-
- info {
- port 3003
- }
-}
-
-namespace test {
- replication-factor 2
- memory-size 4G
- default-ttl 30d # 30 days, use 0 to never expire/evict.
-
- storage-engine memory
-}
-
-namespace bar {
- replication-factor 2
- memory-size 4G
- default-ttl 30d # 30 days, use 0 to never expire/evict.
-
- storage-engine memory
-
- # To use file storage backing, comment out the line above and use the
- # following lines instead.
-# storage-engine device {
-# file /opt/aerospike/data/bar.dat
-# filesize 16G
-# data-in-memory true # Store data in memory in addition to file.
-# }
-}
diff --git a/dev-db/aerospike-server-community/files/aerospike_ssd.conf b/dev-db/aerospike-server-community/files/aerospike_ssd.conf
deleted file mode 100644
index 3d75bd6f7d91..000000000000
--- a/dev-db/aerospike-server-community/files/aerospike_ssd.conf
+++ /dev/null
@@ -1,68 +0,0 @@
-# Aerospike database configuration file for deployments using raw storage.
-
-service {
- user root
- group root
- paxos-single-replica-limit 1 # Number of nodes where the replica count is automatically reduced to 1.
- pidfile /run/aerospike/aerospike.pid
- service-threads 8
- transaction-queues 8
- transaction-threads-per-queue 8
- proto-fd-max 15000
-}
-
-logging {
- # Log file must be an absolute path.
- file /var/log/aerospike/aerospike.log {
- context any info
- }
-}
-
-network {
- service {
- address any
- port 3000
- }
-
- heartbeat {
- mode multicast
- address 239.1.99.222
- port 9918
-
- # To use unicast-mesh heartbeats, remove the 3 lines above, and see
- # aerospike_mesh.conf for alternative.
-
- interval 150
- timeout 10
- }
-
- fabric {
- port 3001
- }
-
- info {
- port 3003
- }
-}
-
-namespace test {
- replication-factor 2
- memory-size 4G
- default-ttl 30d # 30 days, use 0 to never expire/evict.
-
- # Warning - legacy data in defined raw partition devices will be erased.
- # These partitions must not be mounted by the file system.
- storage-engine device {
- # Use one or more lines like those below with actual device paths.
-# device /dev/sdb
-# device /dev/sdc
-
- # The 2 lines below optimize for SSD.
- scheduler-mode noop
- write-block-size 128K
-
- # Use the line below to store data in memory in addition to devices.
-# data-in-memory true
- }
-}
-
diff --git a/dev-db/aerospike-server-community/metadata.xml b/dev-db/aerospike-server-community/metadata.xml
deleted file mode 100644
index 647069390b01..000000000000
--- a/dev-db/aerospike-server-community/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
- patrick@gentoo.org
-
-
-
diff --git a/dev-db/mongodb/Manifest b/dev-db/mongodb/Manifest
index 77b083204e6f..e9594998d6d6 100644
--- a/dev-db/mongodb/Manifest
+++ b/dev-db/mongodb/Manifest
@@ -1,7 +1,4 @@
-AUX mongodb-3.6.1-fix-scons.patch 1207 BLAKE2B 3c47d72eb940d67f40e4a12becb6de469255446b74aa5e0b2f27e8e0021e77f1af9cce12ae26ed0b05871e995e29d3da1eaee718997bc6de6e62838285946094 SHA512 70efb9309ff5a2415cec6ddca694c33ebaba29d5fb959ecc79907218205a10d4e7329fe48c8c8515bda83751061245d41f4fb11a5d8cd0c80c1db61217acb90e
-AUX mongodb-3.6.1-no-compass.patch 2046 BLAKE2B e6b6977b69eb297c6a6340661f906e0206c2b68a1cebfd3c7ca01b27cc05562e0909531a2488159a54db32a05ec0cc4f81b4fe675db51bf3c30d66bc9d484c0b SHA512 5a7257a3670f40453c424ae2e6d2bbe0e3d1c795b57351c24a1b48ea4134146b08310d88a47cbb0c94a0a451a2c4a3c30fb10c44a1b9203681ee9cb5240db412
AUX mongodb-4.0.0-no-compass.patch 2270 BLAKE2B 66659a18d46755e6661b57e2ba020d7b967c455b0bfd5d198e0efd5bab1c0fdbb5def66b9e9fb54b34eb415e9b9231dcb6ba4b943d674e09685b47333af31d22 SHA512 e3b3adae4991e7687b191651f4c93471042bc8f56c5977743afec573fe026df3af1459b8bcbdb4f9995ecfbf83785ad56ccf46d6756429164b1f49524a36fed7
-AUX mongodb-4.0.12-boost-1.71-cxxabi-include.patch 227 BLAKE2B 46a23c95581110282929f6a50f1bb9c2cb1bb8e3027f65a88246c9c16854c80bc809e7498ce5e28b7e9c73a21768f67724f1751f811cb7f787a10f9f6f7c6a85 SHA512 2e0fde98937f1cefe28dd5cb68f2b91910a09c014b0090fc7b742ac8a28863d5d9a50e961339374f14b95eaf1972dc02bb48d59daecdcd8c5d7acc1aed618fa5
AUX mongodb-4.2.0-fix-scons.patch 1174 BLAKE2B 748de9efdb743c836ccb26239d4b3e73632f19846e2c765e5a9fb6fa6c0bcfaf6cc31a63ba0ce54edf5c8a9d0923efd31ddf81fbc7196386d827f59a50b0b352 SHA512 6f971e8b4140068402b5e8cc738fbff1b54645f97e2f463fec37b124c7b93b8302fae25f9ea1f7f3261c93270e662e4cd876db3f092111e3bde0fcbc3eea33c4
AUX mongodb-4.2.10-no-compass.patch 2151 BLAKE2B 724bf4e50c608f2336fcf587c78e68c713fb9b1469c5cf1203f1b155961daa16612ca13fd1fdc10326ebb587c7f339333f92f76d7c770fc043125cc1f931a594 SHA512 a13bea0614dfeb4fe2d81ad0448ecf2364ddd79a9d025f011fbd39c6da5a654e616424f91f7f88c32b00c780d9bc88c497f573b3f1b9a04849c67c4671a26c8d
AUX mongodb-4.4.1-boost.patch 761 BLAKE2B 45295d05d23a8c2d72e333b14f06c40d32ff6c0610a244f71303fabf0bf0851d3a8a8c3df9f72aa7363a48a0b44bae45d81422970398f8b4f9753bab3dcf793a SHA512 504ec9a4e41f5e1c1a069d64e0958b260a3a8506d17638e62ddf6f1cd873b835f33a588b779e4851d63351faef4be1e0f4720e86f389128d062909b58fdb9aa2
@@ -16,22 +13,12 @@ AUX mongodb.service 220 BLAKE2B ea55bb2f08066d7399e9e66f981f86395f6a177faa198c66
AUX mongos.conf-r2 648 BLAKE2B 420bebfafc1ef4af4b90580077a803fe30f37d63eca6509e7381ca5fcf4e5bc31e136dfc72b653b4d942fdeda058f9fcecc3dcbec9c61e2c82ac3324b9fc0f44 SHA512 5aa8ced8d83572358e008c0df45dbe72a2e9c0003c9f49514d6b91bf9b75d4fb48b189ffe00d14e5675679943a05215a9873c5c9bde9ab1be4ed4813e75714e3
AUX mongos.confd-r3 470 BLAKE2B 9cf6f201d337430901d957a5a0811ff11ac2e81814aac2120c5018e6ec4c38b5ca22d19caea593834416c63609c69a8294227fb6b30200b41dfb29799cc5c1b4 SHA512 952fb9cf5d3eeea2006b101e23142e408c98d66d1f4f868f6ea5a4df6a6331ddcbcbdfb24f4b031c1a8c42652141a3684073b96dfc0b3fbd21dc6b5bcf0e36cb
AUX mongos.initd-r3 422 BLAKE2B 90872d0d8cdc5e33e3eebee848f58a2db0511d48b496ba9318117b74ad9265ead53a21b7d1790729a62d61839099bee315ace8ff3646c01e096a943c2251bf88 SHA512 bf5897614d59c6b4e72529b126408a62ea37d9e9368e5ff69c8fcf2bad3ec09065cff09467f82117a892c51090018706d2f38c03cb9a974a61a49bd9efa0f144
-DIST mongodb-src-r3.6.13.tar.gz 40853787 BLAKE2B de9621de4f570d569df5cfe026ea5da24641c97f1ac9f3e58a0706b1d0bd74757390a075c95c6d3acd12f3c5c7bcbeb9302ac997248c54a5b7910b582debdc82 SHA512 eb84fb22ff871b5ec620d6fc29a6a66072211656e914630ad0f53e4fcad55aa40a76a0e68e68bdbe8ef061bea09ce6ad6aea5d8d865ea8a8fdca0ed829555fcd
-DIST mongodb-src-r3.6.17.tar.gz 40932592 BLAKE2B 94bbb943fd929318a2b32344cb4574243ad234d1cd14ffef864d7fd2d60841866fd5a1966eae8f14266a9648deb62b7b55386d41338b515d5e6849e980143d42 SHA512 b4d9e9bfc7ff886532641058c99da29420d1aa472cb4cf2b254e0fd0af5ecc72ac8bf28dcd55ab738b799b00132ffacddd154dea37ccfbf459c7cc603c2582e0
-DIST mongodb-src-r4.0.19.tar.gz 50126414 BLAKE2B 2691e2a9c8833ff9a086b28fd137bc8e8f10d58570117657c7cc01edbf61568ae62f58440d72e8711de98b9fc6868c1095b4ee88eb7b0eb63ea45ce19e842edd SHA512 57032a009ea7e79de4cac496a2d1266b83b99cc45eb9f1169be2fcdca1ed2003a659ceedf9eafbd4aa7fc5b3b0513066a5d712af7666cee5a897b2a2d7dd30cb
-DIST mongodb-src-r4.0.20.tar.gz 50160192 BLAKE2B 3395399791b0620d3852b5d0a2ab2419f08127d909fac52035dd2624eb22660069401e71b036f449d8fd46be03b9e48ee548fb0c327b67c1eecc72a6ee9045b8 SHA512 dc18216d9096520b309ff769898fb65cf26f765eb74e5e0517617bdb0732c456620bbce351be5ad9f89bc72fea0b6d3afe13bd4cffe2c2b4ea06c9cb2b3b1696
-DIST mongodb-src-r4.2.10.tar.gz 61800545 BLAKE2B 773f3da589107d932808c30ee3bd09ec006b1c570884fbe6929ea4767581e951fd32b1771e9adf1e392ef97bd4c0e2b4ce5ce30c8bbbfbd63aa36b6ebaa8cbe4 SHA512 3947b2880bc0aaa958f26dfddfe79c7878f389eeeb8d0783360667124d3b253928ef746433c260bf395a219d650a6907bbf712ef61da6137ab85e4e1ba38fcbd
DIST mongodb-src-r4.2.11.tar.gz 61829417 BLAKE2B cc989d6ea87a48b7402d119dda4678a966cf96cec0da5d00d792faf06ecb6fbe4bc426069e1a72548410adcbd26162038ec7201e76036ac599af5f53029c0e66 SHA512 ff398a9d3a012e0eb860c2139967e163b8b0ac045c1c47f2c0c5584ba7c60a1403bb423ce8c6e8b3900fdcad1164a84c6da79276f897fd640366e3f80cf54316
DIST mongodb-src-r4.2.8.tar.gz 61730247 BLAKE2B f1d98b8ac8f62c0c7aff100ef663bb20345de0e77e0ff420817db0843fe735b58af8075578a7f8d83cc9dc4e597c95ae09f89ce7a21cf8146ff15bcb11eba924 SHA512 163fce480762bd377d6c78b661bfe51fc883223a5309a68f9556e1bafb99e26e476d81dbe6de825d90469e835442be097be630ca9678e54b9d09091e0b5d67c4
DIST mongodb-src-r4.4.1.tar.gz 49644743 BLAKE2B 7d84998c69b9b55164ebab04b49c38a4113a0f58d431612389ec37eb044fba1adf9284e9d4454bd40bb7a071fd042308a5cd350129d6d52480412cf6b868ec2b SHA512 16aa66995ea8cfe0cc47b96c1c5643a28ab47fc9f27bd93404cf572944ab30492df7c9255553f918b353cd7157a6ccde9ac6f58bfba322fb52c2d7409c6fb9b0
DIST mongodb-src-r4.4.2.tar.gz 49816559 BLAKE2B 0e51302e7e414de9fef74872e44c8de1f5682cb3cac0aa7a02e3c1ee3084669ea647d1e574e8a76a3b6b2f34aa4ef693c8d1f3fa025ec3072eff7b7c408b94e5 SHA512 bbf59ed97a8718576c469c696d5331c122f63528dad950fd415b00269c2fa5e6949b372c575e2504c2a58b145bae485172b25000000481662e6543bc3127252a
-EBUILD mongodb-3.6.13.ebuild 4253 BLAKE2B 9c549c4a4f86d0642845b704af18c2f6e813ac71c188b1cc770b188e634dc388368607f92bc164afb24f0e4de09ee77d52a126450a89fa0af3f0254f6d8258d7 SHA512 aeacc08eb48dbd86141d694b1a71579b79da29cfc9f1f2e7727c25ccbb47bdc3f9b4d0091fd269ef04aff7bfce27059ac4059e7f7c14f8258ccc194996999c3b
-EBUILD mongodb-3.6.17.ebuild 4239 BLAKE2B 2e88b7f99c60bdc724aba683ac6397634e005ebd0ede16d40620f84de196d77b616defcb2faa1fd84434a922826ebcd53c2902f4cb9fdf052a4b4a4d767b638d SHA512 10425c5c499a7182a22bf80479ddd61bcea5f51c4b99fd64aaf4c8fe29fec9db7dfeca211ead81431faf98f800d5dd3f381be32737acde01d4608d14a9d4f77c
-EBUILD mongodb-4.0.19.ebuild 4592 BLAKE2B 7e2feeb4abdfdd2eebe27265665576ea7c899cdb06bf5d5a70e8ac54a227815a93e79d5a58538effd1732b3e8e9e08d9ed38d7a3e6a463c4c21c5f3850ccd77d SHA512 f37ef841a74cb6b9b9f7adf6879977352d94be11e583b8ff475e3610f4c016203ffcad06ce45808734e93a1fff4aee067b29a9e828961abeca59e15e0396604a
-EBUILD mongodb-4.0.20.ebuild 4593 BLAKE2B 25a75906f5b037572499b8f5a51bc5df9be6e4e413055c85c340a653809587b9467bb51a6b6bd69d5e9609a062727540b7ca90a71e738958b6d50ae21fb46683 SHA512 661332d0421a768ac8b22d9e5f8bc44c5e7ef986dc2180d3c2163e72190fab3557c378d162a63029c897fa1dc1e1a2e5ed2dde5b22d33e7a84de61fa02a52a08
-EBUILD mongodb-4.2.10.ebuild 4787 BLAKE2B cf0502f0cea2c86387b3ba176a1178f58f5e7c0afd6e804c29ece21b4bcb043456612b2739b7e1faa063a5c850dda9c72705ac55728c3449a8796e5a39f4ea5f SHA512 493750ca11273d0ac744086425fa759059ba45c5580818527f2f669ae4d5f6336b763169553f19ea32f7c6c9f7e611be36e4f3cae5d8d27bf12ea89838760790
EBUILD mongodb-4.2.11.ebuild 4788 BLAKE2B 3f349ec20ebe7c493f8c35f9b6849acc3e1880da17623a71f94bda1860f0d1003e7a9afdf607691ec0c50426fefcd7552d086efde527100e807dad22809be4d2 SHA512 b494549fb51885fcf077b30024ed9da1efb16cd1172be4a0b52337c7e012e089d03191e67c9f50e4413c0728d9cac5e8bf872bc03c769445775bbcda42522acc
EBUILD mongodb-4.2.8.ebuild 4785 BLAKE2B 882ce4365612621348c851383ea19a20db880a11c4b7eb38ac3e7e4508a231d3c4bfca90615425eb9801cee85885c2cccfa61aeef1c26b5f22c4971cc8f31c5c SHA512 3c3fa9e7698f8853f9310bab8890e8e30c1bbc095eb2ede1f6196accaaf770cf1bec94b1bfaf019fdf727f9f1243f0dc2dfcaacbfd651187e852d4aa171e04ce
EBUILD mongodb-4.4.1.ebuild 4873 BLAKE2B 238cd0ded14cccbb88e5b0fd9c9ae391bd3c0a17c8aa7f8bfd12f3916a725c576df7cfb4849c0735301d13cb895f86858e5e72b9d7d3805dbc257bdcd7e4b89a SHA512 190549c03ad957d79dbfdaf96be0f9c2b2abeb86159750a4f771345774dbb08037481d0145cf517ecb56ce8051cd7229ae15a94e8a54ce478ce98644e206246c
EBUILD mongodb-4.4.2.ebuild 4828 BLAKE2B 269b1275bfc3bf57ef3dd3036a5cdcf0c8b51327e26e366450d9cd0172bd7b0dca94714fed4c48332b7c55aff1c0f2aa8d42ffed0d5a6978902cce435a333398 SHA512 e6b8c5b1eb5b075906f062b8c89e0884028ea839721944ce8ec30d7cddd4b511342645035e185407e1f3f8bef052fcbd1e8312eba30d5eb91300abf7de81b3ed
-MISC metadata.xml 901 BLAKE2B f7fde58679ba05518634b82bf5fcc371897165364fe5b023a2ec161790c869de82b4a3dd769d5e1bb450f99679869b60bb1e35beb8d41c54d3448dfca580a7ae SHA512 48f133d396aa31b992bac5f947e5a262b2d07a1016c6d49fa3c86dabb85981edfa332abb867413826762d88051ff3981cc77c2ec92e992d7a231c3b542336e36
+MISC metadata.xml 824 BLAKE2B d7e131d6292b092deb2001bbd6f3d6f6a908f57a064f36f64429696849633ae5ff8dee36604e9952a90ef160b834c56f91d085be7c67a6f9a973c83875bf426c SHA512 cc3555829b1587640259c30c8ede022846ad60993d064ba43d16b28ef5b4a46e5b1fad6818826d4668f0738d27a43f29c5ec769fd647076828e275b5d325e748
diff --git a/dev-db/mongodb/files/mongodb-3.6.1-fix-scons.patch b/dev-db/mongodb/files/mongodb-3.6.1-fix-scons.patch
deleted file mode 100644
index d7bfb35b00d5..000000000000
--- a/dev-db/mongodb/files/mongodb-3.6.1-fix-scons.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff --git a/SConstruct b/SConstruct
-index fe7975b..92659a7 100644
---- a/SConstruct
-+++ b/SConstruct
-@@ -1619,7 +1619,6 @@ if env.TargetOSIs('posix'):
- # -Winvalid-pch Warn if a precompiled header (see Precompiled Headers) is found in the search path but can't be used.
- env.Append( CCFLAGS=["-fno-omit-frame-pointer",
- "-fno-strict-aliasing",
-- "-ggdb",
- "-pthread",
- "-Wall",
- "-Wsign-compare",
-@@ -1631,6 +1630,8 @@ if env.TargetOSIs('posix'):
- env.Append( CCFLAGS=["-Werror"] )
-
- env.Append( CXXFLAGS=["-Woverloaded-virtual"] )
-+ env.Append( CXXFLAGS=os.environ['CXXFLAGS'] )
-+ env.Append( LINKFLAGS=os.environ['LDFLAGS'] )
- if env.ToolchainIs('clang'):
- env.Append( CXXFLAGS=['-Werror=unused-result'] )
-
-@@ -1650,8 +1651,8 @@ if env.TargetOSIs('posix'):
-
- env.Append( LIBS=[] )
-
-- #make scons colorgcc friendly
-- for key in ('HOME', 'TERM'):
-+ #make scons colorgcc, distcc, ccache friendly
-+ for key in ('HOME', 'PATH', 'TERM'):
- try:
- env['ENV'][key] = os.environ[key]
- except KeyError:
diff --git a/dev-db/mongodb/files/mongodb-3.6.1-no-compass.patch b/dev-db/mongodb/files/mongodb-3.6.1-no-compass.patch
deleted file mode 100644
index 133c10fd258b..000000000000
--- a/dev-db/mongodb/files/mongodb-3.6.1-no-compass.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff --git a/src/mongo/SConscript b/src/mongo/SConscript
-index 9cde728..e29664e 100644
---- a/src/mongo/SConscript
-+++ b/src/mongo/SConscript
-@@ -629,33 +629,6 @@ for full_dir, archive_dir in env["ARCHIVE_ADDITION_DIR_MAP"].items():
- for target in env["DIST_BINARIES"]:
- installBinary(env, "db/modules/" + target)
-
--# Set the download url to the right place
--compass_type = 'compass-community'
--if 'enterprise' in env['MONGO_MODULES']:
-- compass_type = 'compass'
--
--compass_script = "install_compass"
--if env.TargetOSIs('windows'):
-- # On windows the .in needs to be explicitly added to the file.
-- compass_script = "Install-Compass.ps1.in"
--
--compass_python_interpreter = '/usr/bin/env python2'
--if env.TargetOSIs('darwin'):
-- compass_python_interpreter = '/usr/bin/env python'
--
--compass_installer = env.Substfile('#/src/mongo/installer/compass/' + compass_script,
-- SUBST_DICT=[
-- ('@compass_type@', compass_type),
-- ('@python_interpreter@', compass_python_interpreter),
-- ])
--distBinaries.append(compass_installer)
--
--compass_script_installer = env.Install("$INSTALL_DIR/bin", compass_installer)
--
--if env.TargetOSIs('posix'):
-- env.AddPostAction( compass_script_installer, 'chmod 755 $TARGET' )
-- env.AddPostAction( compass_installer, 'chmod 755 $TARGET' )
--
- # "dist" target is valid only when --use-new-tools is specified
- # Attempts to build release artifacts without tools must fail
- if has_option("use-new-tools"):
-@@ -673,7 +646,6 @@ if has_option("use-new-tools"):
- '--transform $BUILD_DIR/mongo=$SERVER_DIST_BASENAME/bin',
- '--transform $BUILD_DIR/mongo/stripped/src/mongo-tools=$SERVER_DIST_BASENAME/bin',
- '--transform src/mongo-tools=$SERVER_DIST_BASENAME/bin',
-- '--transform src/mongo/installer/compass=$SERVER_DIST_BASENAME/bin',
- '${TEMPFILE(SOURCES[1:])}'
- ],
- ),
diff --git a/dev-db/mongodb/files/mongodb-4.0.12-boost-1.71-cxxabi-include.patch b/dev-db/mongodb/files/mongodb-4.0.12-boost-1.71-cxxabi-include.patch
deleted file mode 100644
index b65f91236770..000000000000
--- a/dev-db/mongodb/files/mongodb-4.0.12-boost-1.71-cxxabi-include.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/src/mongo/util/heap_profiler.cpp
-+++ b/src/mongo/util/heap_profiler.cpp
-@@ -49,6 +49,9 @@
- #include
- #include
-
-+// for abi::__cxa_demangle
-+#include
-+
- //
- // Sampling heap profiler
- //
diff --git a/dev-db/mongodb/metadata.xml b/dev-db/mongodb/metadata.xml
index 5379d9760d42..a12b5966959c 100644
--- a/dev-db/mongodb/metadata.xml
+++ b/dev-db/mongodb/metadata.xml
@@ -15,7 +15,6 @@
diff --git a/dev-db/mongodb/mongodb-3.6.13.ebuild b/dev-db/mongodb/mongodb-3.6.13.ebuild
deleted file mode 100644
index 85e64d7df806..000000000000
--- a/dev-db/mongodb/mongodb-3.6.13.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
-
-PYTHON_COMPAT=( python2_7 )
-
-SCONS_MIN_VERSION="2.5.0"
-CHECKREQS_DISK_BUILD="2400M"
-CHECKREQS_DISK_USR="512M"
-CHECKREQS_MEMORY="1024M"
-
-inherit check-reqs flag-o-matic multiprocessing pax-utils python-any-r1 scons-utils systemd toolchain-funcs user
-
-MY_P=${PN}-src-r${PV/_rc/-rc}
-
-DESCRIPTION="A high-performance, open source, schema-free document-oriented database"
-HOMEPAGE="https://www.mongodb.com"
-SRC_URI="https://fastdl.mongodb.org/src/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0 SSPL-1"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="debug kerberos libressl lto mms-agent ssl test +tools"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=app-arch/snappy-1.1.3
- >=dev-cpp/yaml-cpp-0.5.3:=
- >=dev-libs/boost-1.60:=[threads(+)]
- >=dev-libs/libpcre-8.41[cxx]
- dev-libs/snowball-stemmer
- net-libs/libpcap
- >=sys-libs/zlib-1.2.8:=
- kerberos? ( dev-libs/cyrus-sasl[kerberos] )
- mms-agent? ( app-admin/mms-agent )
- ssl? (
- !libressl? ( >=dev-libs/openssl-1.0.1g:0= )
- libressl? ( dev-libs/libressl:0= )
- )"
-DEPEND="${RDEPEND}
- ${PYTHON_DEPS}
- $(python_gen_any_dep '
- dev-python/cheetah[${PYTHON_USEDEP}]
- dev-python/pyyaml[${PYTHON_USEDEP}]
- dev-python/typing[${PYTHON_USEDEP}]
- ')
- sys-libs/ncurses:0=
- sys-libs/readline:0=
- debug? ( dev-util/valgrind )
- test? (
- $(python_gen_any_dep 'dev-python/pymongo[${PYTHON_USEDEP}]')
- )"
-PDEPEND="tools? ( >=app-admin/mongo-tools-${PV} )"
-
-PATCHES=(
- "${FILESDIR}/${PN}-3.6.1-fix-scons.patch"
- "${FILESDIR}/${PN}-3.6.1-no-compass.patch"
-)
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_pretend() {
- if [[ -n ${REPLACING_VERSIONS} ]]; then
- if ver_test "$REPLACING_VERSIONS" -lt 3.4; then
- ewarn "To upgrade from a version earlier than the 3.4-series, you must"
- ewarn "successively upgrade major releases until you have upgraded"
- ewarn "to 3.4-series. Then upgrade to 3.6 series."
- else
- ewarn "Be sure to set featureCompatibilityVersion to 3.4 before upgrading."
- fi
- fi
-}
-
-pkg_setup() {
- enewgroup mongodb
- enewuser mongodb -1 -1 /var/lib/${PN} mongodb
-
- python-any-r1_pkg_setup
-}
-
-src_prepare() {
- default
-
- # remove bundled libs
- rm -r src/third_party/{boost-*,pcre-*,scons-*,snappy-*,yaml-cpp-*,zlib-*} || die
-
- # remove compass
- rm -r src/mongo/installer/compass || die
-}
-
-src_configure() {
- # https://github.com/mongodb/mongo/wiki/Build-Mongodb-From-Source
- # --use-system-icu fails tests
- # --use-system-tcmalloc is strongly NOT recommended:
- scons_opts=(
- CC="$(tc-getCC)"
- CXX="$(tc-getCXX)"
-
- --disable-warnings-as-errors
- --use-system-boost
- --use-system-pcre
- --use-system-snappy
- --use-system-stemmer
- --use-system-yaml
- --use-system-zlib
- )
-
- use debug && scons_opts+=( --dbg=on )
- use kerberos && scons_opts+=( --use-sasl-client )
- use lto && scons_opts+=( --lto=on )
- use ssl && scons_opts+=( --ssl )
-
- # respect mongoDB upstream's basic recommendations
- # see bug #536688 and #526114
- if ! use debug; then
- filter-flags '-m*'
- filter-flags '-O?'
- fi
-
- default
-}
-
-src_compile() {
- escons "${scons_opts[@]}" core tools
-}
-
-# FEATURES="test -usersandbox" emerge dev-db/mongodb
-src_test() {
- "${EPYTHON}" ./buildscripts/resmoke.py --dbpathPrefix=test --suites core --jobs=$(makeopts_jobs) || die "Tests failed"
-}
-
-src_install() {
- escons "${scons_opts[@]}" --nostrip install --prefix="${ED}"/usr
-
- doman debian/mongo*.1
- dodoc README docs/building.md
-
- newinitd "${FILESDIR}/${PN}.initd-r3" ${PN}
- newconfd "${FILESDIR}/${PN}.confd-r3" ${PN}
- newinitd "${FILESDIR}/mongos.initd-r3" mongos
- newconfd "${FILESDIR}/mongos.confd-r3" mongos
-
- insinto /etc
- newins "${FILESDIR}/${PN}.conf-r3" ${PN}.conf
- newins "${FILESDIR}/mongos.conf-r2" mongos.conf
-
- systemd_dounit "${FILESDIR}/${PN}.service"
-
- insinto /etc/logrotate.d/
- newins "${FILESDIR}/${PN}.logrotate" ${PN}
-
- # see bug #526114
- pax-mark emr "${ED}"/usr/bin/{mongo,mongod,mongos}
-
- local x
- for x in /var/{lib,log}/${PN}; do
- diropts -m0750 -o mongodb -g mongodb
- keepdir "${x}"
- done
-}
-
-pkg_postinst() {
- ewarn "Make sure to read the release notes and follow the upgrade process:"
- ewarn " https://docs.mongodb.com/manual/release-notes/$(ver_cut 1-2)/"
- ewarn " https://docs.mongodb.com/manual/release-notes/$(ver_cut 1-2)/#upgrade-procedures"
-}
diff --git a/dev-db/mongodb/mongodb-3.6.17.ebuild b/dev-db/mongodb/mongodb-3.6.17.ebuild
deleted file mode 100644
index b5718c0c148c..000000000000
--- a/dev-db/mongodb/mongodb-3.6.17.ebuild
+++ /dev/null
@@ -1,162 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-
-SCONS_MIN_VERSION="2.5.0"
-CHECKREQS_DISK_BUILD="2400M"
-CHECKREQS_DISK_USR="512M"
-CHECKREQS_MEMORY="1024M"
-
-inherit check-reqs flag-o-matic multiprocessing pax-utils python-any-r1 scons-utils systemd toolchain-funcs
-
-MY_P=${PN}-src-r${PV/_rc/-rc}
-
-DESCRIPTION="A high-performance, open source, schema-free document-oriented database"
-HOMEPAGE="https://www.mongodb.com"
-SRC_URI="https://fastdl.mongodb.org/src/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0 SSPL-1"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="debug kerberos libressl lto mms-agent ssl test +tools"
-RESTRICT="!test? ( test )"
-
-RDEPEND="acct-group/mongodb
- acct-user/mongodb
- >=app-arch/snappy-1.1.3
- >=dev-cpp/yaml-cpp-0.5.3:=
- >=dev-libs/boost-1.60:=[threads(+)]
- >=dev-libs/libpcre-8.41[cxx]
- dev-libs/snowball-stemmer
- net-libs/libpcap
- >=sys-libs/zlib-1.2.8:=
- kerberos? ( dev-libs/cyrus-sasl[kerberos] )
- mms-agent? ( app-admin/mms-agent )
- ssl? (
- !libressl? ( >=dev-libs/openssl-1.0.1g:0= )
- libressl? ( dev-libs/libressl:0= )
- )"
-DEPEND="${RDEPEND}
- ${PYTHON_DEPS}
- $(python_gen_any_dep '
- dev-python/cheetah[${PYTHON_USEDEP}]
- dev-python/pyyaml[${PYTHON_USEDEP}]
- dev-python/typing[${PYTHON_USEDEP}]
- ')
- sys-libs/ncurses:0=
- sys-libs/readline:0=
- debug? ( dev-util/valgrind )
- test? (
- $(python_gen_any_dep 'dev-python/pymongo[${PYTHON_USEDEP}]')
- )"
-PDEPEND="tools? ( >=app-admin/mongo-tools-${PV} )"
-
-PATCHES=(
- "${FILESDIR}/${PN}-3.6.1-fix-scons.patch"
- "${FILESDIR}/${PN}-3.6.1-no-compass.patch"
- "${FILESDIR}/${PN}-4.0.12-boost-1.71-cxxabi-include.patch"
-)
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_pretend() {
- if [[ -n ${REPLACING_VERSIONS} ]]; then
- if ver_test "$REPLACING_VERSIONS" -lt 3.4; then
- ewarn "To upgrade from a version earlier than the 3.4-series, you must"
- ewarn "successively upgrade major releases until you have upgraded"
- ewarn "to 3.4-series. Then upgrade to 3.6 series."
- else
- ewarn "Be sure to set featureCompatibilityVersion to 3.4 before upgrading."
- fi
- fi
-}
-
-src_prepare() {
- default
-
- # remove bundled libs
- rm -r src/third_party/{boost-*,pcre-*,scons-*,snappy-*,yaml-cpp-*,zlib-*} || die
-
- # remove compass
- rm -r src/mongo/installer/compass || die
-}
-
-src_configure() {
- # https://github.com/mongodb/mongo/wiki/Build-Mongodb-From-Source
- # --use-system-icu fails tests
- # --use-system-tcmalloc is strongly NOT recommended:
- scons_opts=(
- CC="$(tc-getCC)"
- CXX="$(tc-getCXX)"
-
- --disable-warnings-as-errors
- --use-system-boost
- --use-system-pcre
- --use-system-snappy
- --use-system-stemmer
- --use-system-yaml
- --use-system-zlib
- )
-
- use debug && scons_opts+=( --dbg=on )
- use kerberos && scons_opts+=( --use-sasl-client )
- use lto && scons_opts+=( --lto=on )
- use ssl && scons_opts+=( --ssl )
-
- # respect mongoDB upstream's basic recommendations
- # see bug #536688 and #526114
- if ! use debug; then
- filter-flags '-m*'
- filter-flags '-O?'
- fi
-
- default
-}
-
-src_compile() {
- escons "${scons_opts[@]}" core tools
-}
-
-# FEATURES="test -usersandbox" emerge dev-db/mongodb
-src_test() {
- "${EPYTHON}" ./buildscripts/resmoke.py --dbpathPrefix=test --suites core --jobs=$(makeopts_jobs) || die "Tests failed"
-}
-
-src_install() {
- escons "${scons_opts[@]}" --nostrip install --prefix="${ED}"/usr
-
- doman debian/mongo*.1
- dodoc README docs/building.md
-
- newinitd "${FILESDIR}/${PN}.initd-r3" ${PN}
- newconfd "${FILESDIR}/${PN}.confd-r3" ${PN}
- newinitd "${FILESDIR}/mongos.initd-r3" mongos
- newconfd "${FILESDIR}/mongos.confd-r3" mongos
-
- insinto /etc
- newins "${FILESDIR}/${PN}.conf-r3" ${PN}.conf
- newins "${FILESDIR}/mongos.conf-r2" mongos.conf
-
- systemd_dounit "${FILESDIR}/${PN}.service"
-
- insinto /etc/logrotate.d/
- newins "${FILESDIR}/${PN}.logrotate" ${PN}
-
- # see bug #526114
- pax-mark emr "${ED}"/usr/bin/{mongo,mongod,mongos}
-
- local x
- for x in /var/{lib,log}/${PN}; do
- diropts -m0750 -o mongodb -g mongodb
- keepdir "${x}"
- done
-}
-
-pkg_postinst() {
- ewarn "Make sure to read the release notes and follow the upgrade process:"
- ewarn " https://docs.mongodb.com/manual/release-notes/$(ver_cut 1-2)/"
- ewarn " https://docs.mongodb.com/manual/release-notes/$(ver_cut 1-2)/#upgrade-procedures"
-}
diff --git a/dev-db/mongodb/mongodb-4.0.19.ebuild b/dev-db/mongodb/mongodb-4.0.19.ebuild
deleted file mode 100644
index 8b315a9df686..000000000000
--- a/dev-db/mongodb/mongodb-4.0.19.ebuild
+++ /dev/null
@@ -1,173 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-
-SCONS_MIN_VERSION="2.5.0"
-CHECKREQS_DISK_BUILD="2400M"
-CHECKREQS_DISK_USR="512M"
-CHECKREQS_MEMORY="1024M"
-
-inherit check-reqs flag-o-matic multiprocessing pax-utils python-any-r1 scons-utils systemd toolchain-funcs
-
-MY_P=${PN}-src-r${PV/_rc/-rc}
-
-DESCRIPTION="A high-performance, open source, schema-free document-oriented database"
-HOMEPAGE="https://www.mongodb.com"
-SRC_URI="https://fastdl.mongodb.org/src/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0 SSPL-1"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="debug kerberos libressl lto mms-agent ssl test +tools"
-RESTRICT="!test? ( test )"
-
-RDEPEND="acct-group/mongodb
- acct-user/mongodb
- >=app-arch/snappy-1.1.3
- >=dev-cpp/yaml-cpp-0.5.3:=
- >=dev-libs/boost-1.60:=[threads(+)]
- >=dev-libs/libpcre-8.41[cxx]
- dev-libs/snowball-stemmer
- net-libs/libpcap
- >=sys-libs/zlib-1.2.11:=
- kerberos? ( dev-libs/cyrus-sasl[kerberos] )
- mms-agent? ( app-admin/mms-agent )
- ssl? (
- !libressl? ( >=dev-libs/openssl-1.0.1g:0= )
- libressl? ( dev-libs/libressl:0= )
- )"
-DEPEND="${RDEPEND}
- ${PYTHON_DEPS}
- $(python_gen_any_dep '
- test? ( dev-python/pymongo[${PYTHON_USEDEP}] )
- >=dev-util/scons-2.5.0[${PYTHON_USEDEP}]
- dev-python/cheetah[${PYTHON_USEDEP}]
- dev-python/pyyaml[${PYTHON_USEDEP}]
- dev-python/typing[${PYTHON_USEDEP}]
- ')
- sys-libs/ncurses:0=
- sys-libs/readline:0=
- debug? ( dev-util/valgrind )"
-PDEPEND="tools? ( >=app-admin/mongo-tools-${PV} )"
-
-PATCHES=(
- "${FILESDIR}/${PN}-3.6.1-fix-scons.patch"
- "${FILESDIR}/${PN}-4.0.0-no-compass.patch"
- "${FILESDIR}/${PN}-4.0.12-boost-1.71-cxxabi-include.patch"
-)
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_pretend() {
- if [[ -n ${REPLACING_VERSIONS} ]]; then
- if ver_test "$REPLACING_VERSIONS" -lt 3.6; then
- ewarn "To upgrade from a version earlier than the 3.6-series, you must"
- ewarn "successively upgrade major releases until you have upgraded"
- ewarn "to 3.6-series. Then upgrade to 4.0 series."
- else
- ewarn "Be sure to set featureCompatibilityVersion to 3.6 before upgrading."
- fi
- fi
-}
-
-python_check_deps() {
- if use test; then
- has_version "dev-python/pymongo[${PYTHON_USEDEP}]" ||
- return 1
- fi
-
- has_version ">=dev-util/scons-2.5.0[${PYTHON_USEDEP}]" &&
- has_version "dev-python/cheetah[${PYTHON_USEDEP}]" &&
- has_version "dev-python/pyyaml[${PYTHON_USEDEP}]" &&
- has_version "dev-python/typing[${PYTHON_USEDEP}]"
-}
-
-src_prepare() {
- default
-
- # remove bundled libs
- rm -r src/third_party/{boost-*,pcre-*,scons-*,snappy-*,yaml-cpp-*,zlib-*} || die
-
- # remove compass
- rm -r src/mongo/installer/compass || die
-}
-
-src_configure() {
- # https://github.com/mongodb/mongo/wiki/Build-Mongodb-From-Source
- # --use-system-icu fails tests
- # --use-system-tcmalloc is strongly NOT recommended:
- scons_opts=(
- CC="$(tc-getCC)"
- CXX="$(tc-getCXX)"
-
- --disable-warnings-as-errors
- --use-system-boost
- --use-system-pcre
- --use-system-snappy
- --use-system-stemmer
- --use-system-yaml
- --use-system-zlib
- )
-
- use debug && scons_opts+=( --dbg=on )
- use kerberos && scons_opts+=( --use-sasl-client )
- use lto && scons_opts+=( --lto=on )
- use ssl && scons_opts+=( --ssl )
-
- # respect mongoDB upstream's basic recommendations
- # see bug #536688 and #526114
- if ! use debug; then
- filter-flags '-m*'
- filter-flags '-O?'
- fi
-
- default
-}
-
-src_compile() {
- escons "${scons_opts[@]}" core tools
-}
-
-# FEATURES="test -usersandbox" emerge dev-db/mongodb
-src_test() {
- "${EPYTHON}" ./buildscripts/resmoke.py --dbpathPrefix=test --suites core --jobs=$(makeopts_jobs) || die "Tests failed"
-}
-
-src_install() {
- escons "${scons_opts[@]}" --nostrip install --prefix="${ED}"/usr
-
- doman debian/mongo*.1
- dodoc README docs/building.md
-
- newinitd "${FILESDIR}/${PN}.initd-r3" ${PN}
- newconfd "${FILESDIR}/${PN}.confd-r3" ${PN}
- newinitd "${FILESDIR}/mongos.initd-r3" mongos
- newconfd "${FILESDIR}/mongos.confd-r3" mongos
-
- insinto /etc
- newins "${FILESDIR}/${PN}.conf-r3" ${PN}.conf
- newins "${FILESDIR}/mongos.conf-r2" mongos.conf
-
- systemd_dounit "${FILESDIR}/${PN}.service"
-
- insinto /etc/logrotate.d/
- newins "${FILESDIR}/${PN}.logrotate" ${PN}
-
- # see bug #526114
- pax-mark emr "${ED}"/usr/bin/{mongo,mongod,mongos}
-
- local x
- for x in /var/{lib,log}/${PN}; do
- diropts -m0750 -o mongodb -g mongodb
- keepdir "${x}"
- done
-}
-
-pkg_postinst() {
- ewarn "Make sure to read the release notes and follow the upgrade process:"
- ewarn " https://docs.mongodb.com/manual/release-notes/$(ver_cut 1-2)/"
- ewarn " https://docs.mongodb.com/manual/release-notes/$(ver_cut 1-2)/#upgrade-procedures"
-}
diff --git a/dev-db/mongodb/mongodb-4.0.20.ebuild b/dev-db/mongodb/mongodb-4.0.20.ebuild
deleted file mode 100644
index 651219492475..000000000000
--- a/dev-db/mongodb/mongodb-4.0.20.ebuild
+++ /dev/null
@@ -1,173 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-
-SCONS_MIN_VERSION="2.5.0"
-CHECKREQS_DISK_BUILD="2400M"
-CHECKREQS_DISK_USR="512M"
-CHECKREQS_MEMORY="1024M"
-
-inherit check-reqs flag-o-matic multiprocessing pax-utils python-any-r1 scons-utils systemd toolchain-funcs
-
-MY_P=${PN}-src-r${PV/_rc/-rc}
-
-DESCRIPTION="A high-performance, open source, schema-free document-oriented database"
-HOMEPAGE="https://www.mongodb.com"
-SRC_URI="https://fastdl.mongodb.org/src/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0 SSPL-1"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="debug kerberos libressl lto mms-agent ssl test +tools"
-RESTRICT="!test? ( test )"
-
-RDEPEND="acct-group/mongodb
- acct-user/mongodb
- >=app-arch/snappy-1.1.3
- >=dev-cpp/yaml-cpp-0.5.3:=
- >=dev-libs/boost-1.60:=[threads(+)]
- >=dev-libs/libpcre-8.41[cxx]
- dev-libs/snowball-stemmer
- net-libs/libpcap
- >=sys-libs/zlib-1.2.11:=
- kerberos? ( dev-libs/cyrus-sasl[kerberos] )
- mms-agent? ( app-admin/mms-agent )
- ssl? (
- !libressl? ( >=dev-libs/openssl-1.0.1g:0= )
- libressl? ( dev-libs/libressl:0= )
- )"
-DEPEND="${RDEPEND}
- ${PYTHON_DEPS}
- $(python_gen_any_dep '
- test? ( dev-python/pymongo[${PYTHON_USEDEP}] )
- >=dev-util/scons-2.5.0[${PYTHON_USEDEP}]
- dev-python/cheetah[${PYTHON_USEDEP}]
- dev-python/pyyaml[${PYTHON_USEDEP}]
- dev-python/typing[${PYTHON_USEDEP}]
- ')
- sys-libs/ncurses:0=
- sys-libs/readline:0=
- debug? ( dev-util/valgrind )"
-PDEPEND="tools? ( >=app-admin/mongo-tools-${PV} )"
-
-PATCHES=(
- "${FILESDIR}/${PN}-3.6.1-fix-scons.patch"
- "${FILESDIR}/${PN}-4.0.0-no-compass.patch"
- "${FILESDIR}/${PN}-4.0.12-boost-1.71-cxxabi-include.patch"
-)
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_pretend() {
- if [[ -n ${REPLACING_VERSIONS} ]]; then
- if ver_test "$REPLACING_VERSIONS" -lt 3.6; then
- ewarn "To upgrade from a version earlier than the 3.6-series, you must"
- ewarn "successively upgrade major releases until you have upgraded"
- ewarn "to 3.6-series. Then upgrade to 4.0 series."
- else
- ewarn "Be sure to set featureCompatibilityVersion to 3.6 before upgrading."
- fi
- fi
-}
-
-python_check_deps() {
- if use test; then
- has_version "dev-python/pymongo[${PYTHON_USEDEP}]" ||
- return 1
- fi
-
- has_version ">=dev-util/scons-2.5.0[${PYTHON_USEDEP}]" &&
- has_version "dev-python/cheetah[${PYTHON_USEDEP}]" &&
- has_version "dev-python/pyyaml[${PYTHON_USEDEP}]" &&
- has_version "dev-python/typing[${PYTHON_USEDEP}]"
-}
-
-src_prepare() {
- default
-
- # remove bundled libs
- rm -r src/third_party/{boost-*,pcre-*,scons-*,snappy-*,yaml-cpp-*,zlib-*} || die
-
- # remove compass
- rm -r src/mongo/installer/compass || die
-}
-
-src_configure() {
- # https://github.com/mongodb/mongo/wiki/Build-Mongodb-From-Source
- # --use-system-icu fails tests
- # --use-system-tcmalloc is strongly NOT recommended:
- scons_opts=(
- CC="$(tc-getCC)"
- CXX="$(tc-getCXX)"
-
- --disable-warnings-as-errors
- --use-system-boost
- --use-system-pcre
- --use-system-snappy
- --use-system-stemmer
- --use-system-yaml
- --use-system-zlib
- )
-
- use debug && scons_opts+=( --dbg=on )
- use kerberos && scons_opts+=( --use-sasl-client )
- use lto && scons_opts+=( --lto=on )
- use ssl && scons_opts+=( --ssl )
-
- # respect mongoDB upstream's basic recommendations
- # see bug #536688 and #526114
- if ! use debug; then
- filter-flags '-m*'
- filter-flags '-O?'
- fi
-
- default
-}
-
-src_compile() {
- escons "${scons_opts[@]}" core tools
-}
-
-# FEATURES="test -usersandbox" emerge dev-db/mongodb
-src_test() {
- "${EPYTHON}" ./buildscripts/resmoke.py --dbpathPrefix=test --suites core --jobs=$(makeopts_jobs) || die "Tests failed"
-}
-
-src_install() {
- escons "${scons_opts[@]}" --nostrip install --prefix="${ED}"/usr
-
- doman debian/mongo*.1
- dodoc README docs/building.md
-
- newinitd "${FILESDIR}/${PN}.initd-r3" ${PN}
- newconfd "${FILESDIR}/${PN}.confd-r3" ${PN}
- newinitd "${FILESDIR}/mongos.initd-r3" mongos
- newconfd "${FILESDIR}/mongos.confd-r3" mongos
-
- insinto /etc
- newins "${FILESDIR}/${PN}.conf-r3" ${PN}.conf
- newins "${FILESDIR}/mongos.conf-r2" mongos.conf
-
- systemd_dounit "${FILESDIR}/${PN}.service"
-
- insinto /etc/logrotate.d/
- newins "${FILESDIR}/${PN}.logrotate" ${PN}
-
- # see bug #526114
- pax-mark emr "${ED}"/usr/bin/{mongo,mongod,mongos}
-
- local x
- for x in /var/{lib,log}/${PN}; do
- diropts -m0750 -o mongodb -g mongodb
- keepdir "${x}"
- done
-}
-
-pkg_postinst() {
- ewarn "Make sure to read the release notes and follow the upgrade process:"
- ewarn " https://docs.mongodb.com/manual/release-notes/$(ver_cut 1-2)/"
- ewarn " https://docs.mongodb.com/manual/release-notes/$(ver_cut 1-2)/#upgrade-procedures"
-}
diff --git a/dev-db/mongodb/mongodb-4.2.10.ebuild b/dev-db/mongodb/mongodb-4.2.10.ebuild
deleted file mode 100644
index 763bd774d5a7..000000000000
--- a/dev-db/mongodb/mongodb-4.2.10.ebuild
+++ /dev/null
@@ -1,175 +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} )
-
-SCONS_MIN_VERSION="2.5.0"
-CHECKREQS_DISK_BUILD="2400M"
-CHECKREQS_DISK_USR="512M"
-CHECKREQS_MEMORY="1024M"
-
-inherit check-reqs flag-o-matic multiprocessing pax-utils python-any-r1 scons-utils systemd toolchain-funcs
-
-MY_P=${PN}-src-r${PV/_rc/-rc}
-
-DESCRIPTION="A high-performance, open source, schema-free document-oriented database"
-HOMEPAGE="https://www.mongodb.com"
-SRC_URI="https://fastdl.mongodb.org/src/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0 SSPL-1"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-IUSE="debug kerberos libressl lto ssl test +tools"
-RESTRICT="!test? ( test )"
-
-RDEPEND="acct-group/mongodb
- acct-user/mongodb
- >=app-arch/snappy-1.1.3
- >=dev-cpp/yaml-cpp-0.6.2:=
- >=dev-libs/boost-1.70:=[threads(+)]
- >=dev-libs/libpcre-8.42[cxx]
- app-arch/zstd
- dev-libs/snowball-stemmer
- net-libs/libpcap
- >=sys-libs/zlib-1.2.11:=
- kerberos? ( dev-libs/cyrus-sasl[kerberos] )
- ssl? (
- !libressl? ( >=dev-libs/openssl-1.0.1g:0= )
- libressl? ( dev-libs/libressl:0= )
- )"
-DEPEND="${RDEPEND}
- ${PYTHON_DEPS}
- $(python_gen_any_dep '
- test? ( dev-python/pymongo[${PYTHON_USEDEP}] dev-python/requests[${PYTHON_USEDEP}] )
- >=dev-util/scons-2.5.0[${PYTHON_USEDEP}]
- dev-python/cheetah3[${PYTHON_USEDEP}]
- dev-python/psutil[${PYTHON_USEDEP}]
- dev-python/pyyaml[${PYTHON_USEDEP}]
- ')
- sys-libs/ncurses:0=
- sys-libs/readline:0=
- debug? ( dev-util/valgrind )"
-PDEPEND="tools? ( >=app-admin/mongo-tools-${PV} )"
-
-PATCHES=(
- "${FILESDIR}/${PN}-4.2.0-fix-scons.patch"
- "${FILESDIR}/${PN}-4.2.10-no-compass.patch"
-)
-
-S="${WORKDIR}/${MY_P}"
-
-python_check_deps() {
- if use test; then
- has_version "dev-python/pymongo[${PYTHON_USEDEP}]" || return 1
- has_version "dev-python/requests[${PYTHON_USEDEP}]" || return 1
- fi
-
- has_version ">=dev-util/scons-2.5.0[${PYTHON_USEDEP}]" &&
- has_version "dev-python/cheetah3[${PYTHON_USEDEP}]" &&
- has_version "dev-python/psutil[${PYTHON_USEDEP}]" &&
- has_version "dev-python/pyyaml[${PYTHON_USEDEP}]"
-}
-
-pkg_pretend() {
- if [[ -n ${REPLACING_VERSIONS} ]]; then
- if ver_test "$REPLACING_VERSIONS" -lt 4.0; then
- ewarn "To upgrade from a version earlier than the 4.0-series, you must"
- ewarn "successively upgrade major releases until you have upgraded"
- ewarn "to 4.0-series. Then upgrade to 4.2 series."
- else
- ewarn "Be sure to set featureCompatibilityVersion to 4.0 before upgrading."
- fi
- fi
-}
-
-src_prepare() {
- default
-
- # remove bundled libs
- rm -r src/third_party/{boost-*,pcre-*,scons-*,snappy-*,yaml-cpp-*,zlib-*,zstandard-*} || die
-
- # remove compass
- rm -r src/mongo/installer/compass || die
-}
-
-src_configure() {
- # https://github.com/mongodb/mongo/wiki/Build-Mongodb-From-Source
- # --use-system-icu fails tests
- # --use-system-tcmalloc is strongly NOT recommended:
- scons_opts=(
- CC="$(tc-getCC)"
- CXX="$(tc-getCXX)"
-
- --disable-warnings-as-errors
- --use-system-boost
- --use-system-pcre
- --use-system-snappy
- --use-system-stemmer
- --use-system-yaml
- --use-system-zlib
- --use-system-zstd
- )
-
- use arm64 && scons_opts+=( --use-hardware-crc32=off ) # Bug 701300
- use debug && scons_opts+=( --dbg=on )
- use kerberos && scons_opts+=( --use-sasl-client )
- use lto && scons_opts+=( --lto=on )
- use ssl && scons_opts+=( --ssl )
-
- # respect mongoDB upstream's basic recommendations
- # see bug #536688 and #526114
- if ! use debug; then
- filter-flags '-m*'
- filter-flags '-O?'
- fi
-
- default
-}
-
-src_compile() {
- escons "${scons_opts[@]}" core tools
-}
-
-# FEATURES="test -usersandbox" emerge dev-db/mongodb
-src_test() {
- ewarn "Tests may hang with FEATURES=usersandbox"
- "${EPYTHON}" ./buildscripts/resmoke.py run --dbpathPrefix=test --suites core --jobs=$(makeopts_jobs) || die "Tests failed with ${EPYTHON}"
-}
-
-src_install() {
- escons "${scons_opts[@]}" --nostrip install --prefix="${ED}"/usr
-
- doman debian/mongo*.1
- dodoc README docs/building.md
-
- newinitd "${FILESDIR}/${PN}.initd-r3" ${PN}
- newconfd "${FILESDIR}/${PN}.confd-r3" ${PN}
- newinitd "${FILESDIR}/mongos.initd-r3" mongos
- newconfd "${FILESDIR}/mongos.confd-r3" mongos
-
- insinto /etc
- newins "${FILESDIR}/${PN}.conf-r3" ${PN}.conf
- newins "${FILESDIR}/mongos.conf-r2" mongos.conf
-
- systemd_dounit "${FILESDIR}/${PN}.service"
-
- insinto /etc/logrotate.d/
- newins "${FILESDIR}/${PN}.logrotate" ${PN}
-
- # see bug #526114
- pax-mark emr "${ED}"/usr/bin/{mongo,mongod,mongos}
-
- local x
- for x in /var/{lib,log}/${PN}; do
- diropts -m0750 -o mongodb -g mongodb
- keepdir "${x}"
- done
-}
-
-pkg_postinst() {
- ewarn "Make sure to read the release notes and follow the upgrade process:"
- ewarn " https://docs.mongodb.com/manual/release-notes/$(ver_cut 1-2)/"
- ewarn " https://docs.mongodb.com/manual/release-notes/$(ver_cut 1-2)/#upgrade-procedures"
-}
diff --git a/dev-db/pgcli/Manifest b/dev-db/pgcli/Manifest
index be1b288a8910..ad45dc969815 100644
--- a/dev-db/pgcli/Manifest
+++ b/dev-db/pgcli/Manifest
@@ -2,5 +2,5 @@ AUX pgcli-3.0.0-sqlparse.patch 1258 BLAKE2B bb899fcd3e059e3380d3bdba12765a1709af
DIST pgcli-3.0.0.tar.gz 437733 BLAKE2B 5db69997f675812c3ef847b220b66e7872b134b4d8debd668154bdfa6020432ac08829e7c2ce42adc4cf124e84de5eb9aacbe19636216502f81373a71f21b68f SHA512 7ac52cbfc492dc85163dac7df7a5dde6bfa0327ac1ef6580891cb76d617b998d74c2a59b27d2f8abf8699eb5a69aba30bf13e95ad7bee75c83350730ac061262
DIST pgcli-3.1.0.tar.gz 441939 BLAKE2B 2c9c9a3afb233eee6f88d304e26e482760f1ff2a458103a80ffb80d877f63bd3ec74ba4be06238e8d78adf36ec251cd27849e0899f3b257b75ac9585f3c04572 SHA512 458871bf7ea0a83a66f44ecbde88590ca2aa08420a58c97d2716d4e36c61738d92283d007fc3968063daa01c25b2c46360292ad6339757c119ff04891e1a1c46
EBUILD pgcli-3.0.0-r1.ebuild 1066 BLAKE2B c879ab11069b87424a5c9118e27f0b0ec06f9dc2d9d5584d13d25f2c52dc4365e37656ab9c0d0df2fc00713fa8a3840f7796a4af4452cda23ee5948d79d563bf SHA512 85b78c0153202b25ea0b3900a9c26579655f4fcfbe735ae271f0a32f3544791348f82d8a758794071b895863538fa47fa973169d2d92f1630e7f4f57615b9e0d
-EBUILD pgcli-3.1.0.ebuild 1060 BLAKE2B e48bf98019f5109f78f1b2e34c5895fe751adbcc050d2c12c365f12665de5f747b81ed691e99bf16aa2c41d7a7b8f18756d108c7f2768e1581193b862c92bfcb SHA512 bc3c2ca7fe6528c20b20061ed08b0eadb2a80c510281b252825e740d01dbb7b7a6a6050570739dd8fc02812ad98390ba10aeb3470c5f2fe7b3b6b3e42e6e2909
+EBUILD pgcli-3.1.0.ebuild 1013 BLAKE2B bc1ebe22b62178467e555396fa88f5a5b5c7072e7d14c36c81f0b9f847a3e4a95f684ff9dd6b39a68c11466f741eb59d2a46467ced804552fbfca7896106e55e SHA512 ce1cac923191a5237132c0845d2c99c1465779abc613857424f4d6ae0e06d804dbaff7049e49fa05f8eabe4c3349bd27d2c9b329be754dac5347e934770e13c5
MISC metadata.xml 460 BLAKE2B c6dc837776eb72ba61b0b0e00cd3f3adc022b70385204346eb2aa0eb8229636ab230be67b194993b22e18cda08b4f968ff02b96d390b8782aac2a4f4de92d7ee SHA512 a3b44f66861c5f8b66cda0fcac6b1d3418bf04835e7ed202ae22faca50ee22187fda785c6e7e7c0848f31b88e1cd9c8c6b4be1999eb600d48965edff2e959c35
diff --git a/dev-db/pgcli/pgcli-3.1.0.ebuild b/dev-db/pgcli/pgcli-3.1.0.ebuild
index 7cd55f1d636e..453cba7d70d4 100644
--- a/dev-db/pgcli/pgcli-3.1.0.ebuild
+++ b/dev-db/pgcli/pgcli-3.1.0.ebuild
@@ -31,7 +31,6 @@ BDEPEND="
test? (
dev-db/postgresql
dev-python/mock[${PYTHON_USEDEP}]
- dev-python/python-dateutil[${PYTHON_USEDEP}]
)"
distutils_enable_tests pytest
diff --git a/dev-db/redis/Manifest b/dev-db/redis/Manifest
index e4849836c098..74baf1478c8b 100644
--- a/dev-db/redis/Manifest
+++ b/dev-db/redis/Manifest
@@ -19,6 +19,6 @@ 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 4733 BLAKE2B 16dff9009b44aff40a0d8b00c6d9885fd26bbd7265a57f09b57060acedb083d15ccbf593015bf66fdd0b0d05b8ce84cfc3805000b7f0aa9a5d7209773046d476 SHA512 f25cf0346af69b39075537a5fc8ee547c1bc3d1c3bd77e9ea6ab7c44fcbfd13e4e23ed5126f37fa86ecf5637c8a6619d864c69cfe3a5b5879464c04c1f7d9261
EBUILD redis-5.0.9-r1.ebuild 4727 BLAKE2B 691271bcb72643dd3b1b0adb6f1a374967b7172437c2049fbc6cfdb01b19ee2cbd104f0baa96fce3b6b6983704f49922863f45677727b4d4ee573694d6897336 SHA512 bf5edded12de21673a5095ea034a344de05b5e54070dbbe698b8ca591d576af209f38df9c3715c21e38e877ae79a9b57b894142a55f2c475e933f72e4dc95222
-EBUILD redis-6.0.9-r100.ebuild 4568 BLAKE2B 0088942746ae620a1e07dc161df62ff84778b5b80c5de90bbe2f1c4cf7322ffb827452047bfdca3b24de57d71195dadf2ef830ea06fc539334b0fbe2569e908a SHA512 37bf4db34a51b2055ab4b9cc3bc591c9fead01b9dbb762776944f19d9155c480df8e031032fcbbd585e5f353b5725ce0fe4e70e0d8fdf1dd233c4911c37b47cb
-EBUILD redis-6.0.9.ebuild 4936 BLAKE2B db9cfabc8aba8f96c52251e61474debc762c78497d76b317ba0368c161bb65aa437620841de506b3535d6811d4cf9fc3d70e1c14ceb89d708503e130c8e5b7fd SHA512 6fa969b605110eb838a3dea0852c20b678368e84df118a4bb7c9b6901b9419fe9362876e317ad44338f31edb92bfa55a1832baeb4a4934ea61c7789dc51fda34
+EBUILD redis-6.0.9-r100.ebuild 4575 BLAKE2B ec7c086c04e86f54ce4e8faa851cee2dd074aabeeeef1aa569aff498d43e829dc8bd1f73e2ca5885c8bdc1630044e11639cce20ac5e04ed236f21b0f25837baf SHA512 417248f9d33ec0959a789f0c1fd4d300662121ec51dec53088d6b27b0ba9b53b9553b2f174c77656e1cea9d1c9e34e2cbf45590379171d31468d29cd72e2e984
+EBUILD redis-6.0.9.ebuild 4943 BLAKE2B 89a87cd49796bcb9ddb1f46390a6bea48a4fd2b6df7e8f2bd4c22587e6a6c7f3035316800641a0c2a7b4bf1ec76a66927fe72b721f3a141c2c3886d96b899efe SHA512 e827cc5a7db240e1569be7e05da01385e4039ba98a7d96857bfc7a0360a698512a950c29e2d20b7a6bad830641b1c5b53a932def18d00e273d5ee86f53199294
MISC metadata.xml 356 BLAKE2B 19e27b12be84927b990fc2f481d8dd1f88f05b5e029fdd91c7ce9517e7fd378d6e1df1eb55052a04fefe781da09b371da1c28fd269c72f4222aa896897222bf7 SHA512 ab06f694c5b20072f40e85b3a8e05d2c333f3b29fc145733fde1e3f42ea78ac7c51550afc29e671ef9b4a163597ac9f44bc182344c18db52036595e5d65f7e22
diff --git a/dev-db/redis/redis-6.0.9-r100.ebuild b/dev-db/redis/redis-6.0.9-r100.ebuild
index 53ee073cd46c..289257d67305 100644
--- a/dev-db/redis/redis-6.0.9-r100.ebuild
+++ b/dev-db/redis/redis-6.0.9-r100.ebuild
@@ -18,7 +18,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-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
IUSE="+jemalloc tcmalloc test"
RESTRICT="!test? ( test )"
SLOT="0"
diff --git a/dev-db/redis/redis-6.0.9.ebuild b/dev-db/redis/redis-6.0.9.ebuild
index 7d33e4f13ef5..f24b4fcfe9be 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-solaris"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
IUSE="+jemalloc luajit tcmalloc test"
RESTRICT="!test? ( test )"
SLOT="0"
diff --git a/dev-haskell/Manifest.gz b/dev-haskell/Manifest.gz
index 7100ba45c701..313a3bc10fc0 100644
Binary files a/dev-haskell/Manifest.gz and b/dev-haskell/Manifest.gz differ
diff --git a/dev-haskell/citeproc/Manifest b/dev-haskell/citeproc/Manifest
new file mode 100644
index 000000000000..722a671912e8
--- /dev/null
+++ b/dev-haskell/citeproc/Manifest
@@ -0,0 +1,3 @@
+DIST citeproc-0.3.0.1.tar.gz 567617 BLAKE2B 8b6df78401f392d3bc3045fe183b25850328bc9a5b0c0ce9334f6cf14e4451e4a526bd23266846d8a625011b1cf5b1b52fee0a5f7c83ea405769704203da5ce6 SHA512 113f3b5dae2bfce13a4b39ef87ea21f763a897182c7a10eae5e7aabbddbb12b773be6583f51578a92bf078e40b0718a69b908049f700f317bbfb509253dae27b
+EBUILD citeproc-0.3.0.1.ebuild 1529 BLAKE2B 1b106817f7a352aef0b867101d3e2d138914d89e03dd80d1026c8f72007155e2b7380c871f25a175f8947b7358c5b4ed822634e9dfaebb25848b302b94f0d6e7 SHA512 7defd3b05a00223e6eccb0bc8280186759874f467adaa19d62267a21dc0901070cbe2420889089bce19e110bdf8a1b725acf0bcc5a95d54cd127b507aeb87a34
+MISC metadata.xml 624 BLAKE2B e41c62aa3d4886828f0d00576edc6c2fc4aad728e5996f1bde6c1fee0b55c801db9ef8719abc1a2b852c800c77abd804f4cb8b5410b422e62617993e9f001728 SHA512 eec77dd81a936c85e1bcb01831178ecf32e43e4bae12b77ccedea98925697e1d123ed8fb5fde80fecf8e49a8b5809a7201296faac7bb996597894f1364bb1cc9
diff --git a/dev-haskell/citeproc/citeproc-0.3.0.1.ebuild b/dev-haskell/citeproc/citeproc-0.3.0.1.ebuild
new file mode 100644
index 000000000000..ee9b06f64280
--- /dev/null
+++ b/dev-haskell/citeproc/citeproc-0.3.0.1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.7.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Generates citations and bibliography from CSL styles"
+HOMEPAGE="https://hackage.haskell.org/package/citeproc"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="executable icu"
+
+RDEPEND="dev-haskell/aeson:=[profile?]
+ dev-haskell/attoparsec:=[profile?]
+ >=dev-haskell/base-compat-0.10:=[profile?]
+ >=dev-haskell/case-insensitive-1.2:=[profile?] =dev-haskell/pandoc-types-1.22:=[profile?] =dev-lang/ghc-8.6.5:=
+ executable? ( dev-haskell/aeson-pretty:=[profile?] )
+ icu? ( dev-haskell/text-icu:=[profile?] )
+ !icu? ( >=dev-haskell/rfc5051-0.2:=[profile?] =dev-haskell/cabal-2.4.0.1
+ test? ( >=dev-haskell/diff-0.4
+ dev-haskell/mtl
+ dev-haskell/timeit )
+"
+
+src_configure() {
+ haskell-cabal_src_configure \
+ $(cabal_flag executable executable) \
+ $(cabal_flag icu icu)
+}
diff --git a/dev-haskell/citeproc/metadata.xml b/dev-haskell/citeproc/metadata.xml
new file mode 100644
index 000000000000..60badcbca1f9
--- /dev/null
+++ b/dev-haskell/citeproc/metadata.xml
@@ -0,0 +1,18 @@
+
+
+
+
+ haskell@gentoo.org
+ Gentoo Haskell
+
+
+
+ citeproc parses CSL style files and uses them to
+ generate a list of formatted citations and bibliography
+ entries. For more information about CSL, see
+ <https://citationstyles.org/>.
+
+
diff --git a/dev-haskell/commonmark-extensions/Manifest b/dev-haskell/commonmark-extensions/Manifest
new file mode 100644
index 000000000000..1dc89b0dc552
--- /dev/null
+++ b/dev-haskell/commonmark-extensions/Manifest
@@ -0,0 +1,3 @@
+DIST commonmark-extensions-0.2.0.4.tar.gz 32043 BLAKE2B 5a0f690b04b8c2e34383b9e2d8248ea5e6945af434c413aa289bbf1706bbfced8fa68b625682ae1c916db25a577d7f029e9247e908bb87e6979f702d93b72a9c SHA512 2e595dd6bfc582a783d42ae612a64917470b9fa737d9c445e83e30f7cf7500cd4d3ab5f254268cf9d7434dcd03bdaa88cd38bc4fc50d1423a2792e0d21ffe6e3
+EBUILD commonmark-extensions-0.2.0.4.ebuild 879 BLAKE2B b7e4b903d7a975ffc0a4fbc76613857ac81f0c8eab10c07e32e9a08e695cf3918ead9721db4ca4b919bb91266fd8b0c73b70049155d39813578aa4ac88b2dfdb SHA512 45d0147fee42fc394b87e6c2fa69ce71c3315aee5033cdd90ca17f2aecec57787d3f2c4d5b3d6519e92acda3aaa75daa427c5c9705f76bdc6446fdcb8a20c8c9
+MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/commonmark-extensions/commonmark-extensions-0.2.0.4.ebuild b/dev-haskell/commonmark-extensions/commonmark-extensions-0.2.0.4.ebuild
new file mode 100644
index 000000000000..4af1c67261ac
--- /dev/null
+++ b/dev-haskell/commonmark-extensions/commonmark-extensions-0.2.0.4.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.7.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Pure Haskell commonmark parser"
+HOMEPAGE="https://github.com/jgm/commonmark-hs"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/commonmark-0.1.1.2:=[profile?] =dev-haskell/emojis-0.1:=[profile?] =dev-lang/ghc-8.0.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.24.0.0
+ test? ( dev-haskell/quickcheck
+ dev-haskell/tasty
+ dev-haskell/tasty-hunit
+ dev-haskell/tasty-quickcheck )
+"
diff --git a/sci-mathematics/agda-lib-ffi/metadata.xml b/dev-haskell/commonmark-extensions/metadata.xml
similarity index 75%
rename from sci-mathematics/agda-lib-ffi/metadata.xml
rename to dev-haskell/commonmark-extensions/metadata.xml
index bf5543388935..b7878815d80d 100644
--- a/sci-mathematics/agda-lib-ffi/metadata.xml
+++ b/dev-haskell/commonmark-extensions/metadata.xml
@@ -5,7 +5,4 @@
haskell@gentoo.org
Gentoo Haskell
-
- agda/agda-stdlib
-
diff --git a/dev-haskell/commonmark-pandoc/Manifest b/dev-haskell/commonmark-pandoc/Manifest
new file mode 100644
index 000000000000..7cb0c57b1985
--- /dev/null
+++ b/dev-haskell/commonmark-pandoc/Manifest
@@ -0,0 +1,3 @@
+DIST commonmark-pandoc-0.2.0.1.tar.gz 4754 BLAKE2B 4611196ab63844bd1c40c9e673c43cfd8c44997ba31511b45bcb9a9b21109cd9c1fad98dbf99de2bbd203b39d93d841604afdf4acd0cadecc45ab2230d952f1a SHA512 5162a987085d5204af27d4b073fedf4d678f5e0325a12f96c611899f3c484e576d7b667271c480837b9d4593e9950828e9398a33c63b5e829016019ecfc7bb6d
+EBUILD commonmark-pandoc-0.2.0.1.ebuild 849 BLAKE2B ba636e066bf39b2d85db69f5e2f23b0343328190aed22c243547738208a7610a093fffd595c7a22ea34e894b4c5a813c75db048e2ce5cbac9b1328540f99385f SHA512 b38b9291705b8607eb71b78d9b97406bc4555af8b0d55af6241403ca85b9030baabf0211ed3c04f51ed05ba21ef01ea859b0e4a8a3fed26bd8a9bbd3d6193368
+MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/commonmark-pandoc/commonmark-pandoc-0.2.0.1.ebuild b/dev-haskell/commonmark-pandoc/commonmark-pandoc-0.2.0.1.ebuild
new file mode 100644
index 000000000000..3fc16f6d2a8f
--- /dev/null
+++ b/dev-haskell/commonmark-pandoc/commonmark-pandoc-0.2.0.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.7.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Bridge between commonmark and pandoc AST"
+HOMEPAGE="https://github.com/jgm/commonmark-hs"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/commonmark-0.1:=[profile?] =dev-haskell/commonmark-extensions-0.2:=[profile?] =dev-haskell/pandoc-types-1.21:=[profile?] =dev-lang/ghc-8.0.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.24.0.0
+"
diff --git a/sys-libs/netbsd-csu/metadata.xml b/dev-haskell/commonmark-pandoc/metadata.xml
similarity index 73%
rename from sys-libs/netbsd-csu/metadata.xml
rename to dev-haskell/commonmark-pandoc/metadata.xml
index 89c4bdb96049..b7878815d80d 100644
--- a/sys-libs/netbsd-csu/metadata.xml
+++ b/dev-haskell/commonmark-pandoc/metadata.xml
@@ -2,6 +2,7 @@
- llvm@gentoo.org
+ haskell@gentoo.org
+ Gentoo Haskell
diff --git a/dev-haskell/commonmark/Manifest b/dev-haskell/commonmark/Manifest
new file mode 100644
index 000000000000..e391a647d0f9
--- /dev/null
+++ b/dev-haskell/commonmark/Manifest
@@ -0,0 +1,3 @@
+DIST commonmark-0.1.1.2.tar.gz 98983 BLAKE2B 8ec8e46c39d54af276d12388938d6ef7dd02a40fa0a5aba58f5c3026ce5be970ebf37cf351524e30cd80f80f49df1f03175941c97c658744c212379bd6e5051e SHA512 746539c055ef84b4458e910bf260222498c7081f62f421ca63aa2652a1297c3ad6b518cc27a3783868b8db3df39fe454e78f6ebf51439e73495ab4699c5c8427
+EBUILD commonmark-0.1.1.2.ebuild 714 BLAKE2B 8aa4bbb15767cd3262240c2e1014ac8d381a36f9f60a817d8b60797afb8c992565082383b1fd17f06ef23475ce4a872d7504c1f1415ed5c7d60578f8fe44fbaa SHA512 b314c2cad91c16c82fbabb720ce93fcda508782d404cb96581ae915cdd3b72b12998b4033390a9668909c2748938fed4d086b98f4b6b47618d08554d70642406
+MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/commonmark/commonmark-0.1.1.2.ebuild b/dev-haskell/commonmark/commonmark-0.1.1.2.ebuild
new file mode 100644
index 000000000000..66535724ad97
--- /dev/null
+++ b/dev-haskell/commonmark/commonmark-0.1.1.2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.7.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Pure Haskell commonmark parser"
+HOMEPAGE="https://github.com/jgm/commonmark-hs"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-haskell/parsec:=[profile?]
+ dev-haskell/text:=[profile?]
+ >=dev-lang/ghc-8.0.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2
+ test? ( dev-haskell/quickcheck
+ dev-haskell/tasty
+ dev-haskell/tasty-hunit
+ dev-haskell/tasty-quickcheck )
+"
diff --git a/dev-util/creduce/metadata.xml b/dev-haskell/commonmark/metadata.xml
similarity index 61%
rename from dev-util/creduce/metadata.xml
rename to dev-haskell/commonmark/metadata.xml
index 0319eec4c8be..b7878815d80d 100644
--- a/dev-util/creduce/metadata.xml
+++ b/dev-haskell/commonmark/metadata.xml
@@ -1,8 +1,8 @@
-
- mgorny@gentoo.org
- Michał Górny
+
+ haskell@gentoo.org
+ Gentoo Haskell
diff --git a/dev-haskell/doctemplates/Manifest b/dev-haskell/doctemplates/Manifest
index f1468467963d..ee9efb2fcb6e 100644
--- a/dev-haskell/doctemplates/Manifest
+++ b/dev-haskell/doctemplates/Manifest
@@ -1,3 +1,5 @@
DIST doctemplates-0.8.2.tar.gz 26780 BLAKE2B 32554545d451a382a490dc6d64b9f8ff0465b1e345daec457196cebf61f0d6975fda8eebc0e7115089622c15e7a96cbe490ae78d63b7b06ebded9c9b79f82a3a SHA512 1e1dbb8f8a2980b342ef3b5c2c0fefa8d0bf220d5ca1332de3dbdf30ab3243fd6f4d12816fa25851498a26c25c5fba1bc2aa6f16eafca11c65bc125a203b90ad
+DIST doctemplates-0.9.tar.gz 27366 BLAKE2B e4c88e3abce07f6fa94e51e63124a7a6f1fa054a1f70595fe81b058a5fd6c87a25085cc5373eb6ee191fcdabd34650d30f9ce6251bfedaa2e16961ce3b74a816 SHA512 3216fc7ef4e2a45230a2854c22c2a8622774bc834bbf59d34134912b3942df2a541230bd91324995e13e19098a0fa0bf7057c7d55ca35ec75da7840fddd61a37
EBUILD doctemplates-0.8.2.ebuild 1098 BLAKE2B e910ee9a939f767336e8773d73b1426afe21d5a614aa0904c52624f62ccf5b11f5ae555733e74b3055d631dcac0c2779627e5e39334a2a020c6b421a2654cf3e SHA512 eb72d55c9652162f6730747767ffcef6f6900a412a005c6a45c6d0cef6ba3637e4031ca4604cd625e42acbb2a43535911cccccfcd02d09178053606640156959
+EBUILD doctemplates-0.9.ebuild 1140 BLAKE2B 8c48f1deb24c71c4e551ef7a74953916f2af687a54361096dcf5d11ed9a8cb63806888d4805b2143e07d6c3aba8a997af2f881896a4db454b9b9a91ccc151fa2 SHA512 ab017d6e971ed53ef6b3b97115b8b95bc9e58c4cdbf42921c54d6aa7e47b2c47d810e737a80290354059719497fa10fc3bca12ace4d3a2c6b0ced132431d3459
MISC metadata.xml 330 BLAKE2B 4e484befc00c2e9a388ea1d9393b64b5f14468e963814f45a519a901066734fc79e84677d33e36dccf6741301b11dba5b4cecf318caa27c3334c71df93025051 SHA512 1008fef5c084894f63467499cc6b44e997279f195cd77d381802b27646cf3135d9f58fa3e6b1049699fcff4419f91a8081428e30357d7c90a08c449abfa4e460
diff --git a/dev-haskell/doctemplates/doctemplates-0.9.ebuild b/dev-haskell/doctemplates/doctemplates-0.9.ebuild
new file mode 100644
index 000000000000..88f81e5d48bc
--- /dev/null
+++ b/dev-haskell/doctemplates/doctemplates-0.9.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.7.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Pandoc-style document templates"
+HOMEPAGE="https://github.com/jgm/doctemplates#readme"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-haskell/aeson:=[profile?]
+ >=dev-haskell/doclayout-0.3:=[profile?] =dev-haskell/hsyaml-0.2:=[profile?] =dev-lang/ghc-8.0.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.24.0.0
+ test? ( dev-haskell/glob
+ dev-haskell/tasty
+ dev-haskell/tasty-golden
+ dev-haskell/tasty-hunit
+ dev-haskell/temporary )
+"
diff --git a/dev-haskell/hakyll/Manifest b/dev-haskell/hakyll/Manifest
index 29e232a0e387..ef2ecba20b06 100644
--- a/dev-haskell/hakyll/Manifest
+++ b/dev-haskell/hakyll/Manifest
@@ -1,3 +1,6 @@
+AUX hakyll-4.13.4.1-pandoc-2.11.patch 8213 BLAKE2B f30c9f5260ab834395d10358419e9b0d4bfe91acd80b1a45a7e432e92c480097138cd2e430257af2c24934d8bce1d377f8b84b6acd99036fe321f12b0f065063 SHA512 6e4c5f4440619e19d03a591b8771f810ecfb18ddbd9b4961fae64ef36defcb89191cd9b84998f61f3538854ebd2d9c1c8bda986a323d37ebf8361504fc126bc6
DIST hakyll-4.13.4.0.tar.gz 105151 BLAKE2B a17ddcc7846d4c50f3ade0d430a0208c6c85d9827e5daa69b1652050313cb62fc87fd8b1547cacacbca5562f4cf172eacd7e641d3921516c4578e0684ae55ee9 SHA512 4ade6776cfee7a8293ba4a659cf8633c0e6641ee2c33db9cdddeaca996ff092d027ce4165e174d7acdeb8485904394d9a899351d9e3c065e4ce7cb5af61ee08a
+DIST hakyll-4.13.4.1.tar.gz 105251 BLAKE2B 6a2c83f2784aad1c80ecce7d01ade1d1bde0546c3f828acc74c88df95b4217f191eb516bf57cc1993bdaebd76629d86d3963bf386f7df68ca5dc17288f3f2b3f SHA512 6045a1461855d46f57a20f7a84636f90e6d151bcbaf09511f10ab66fa0567062e355ff580d1f12a4432bbe517bc9e162d65927f3c343f8f077e81981e7c7973c
EBUILD hakyll-4.13.4.0.ebuild 4079 BLAKE2B bdd468381be955fa43da8b5596e4e0c521936f4d51d922717da71d9c48d12edc5c0ad2e570c42805772018acd5e0d8f32803c419f2dab402412453dda801c90c SHA512 7a14b03e850212f32e1a66f9be83d9b6e9e51650d5a158b7889908d65aba2570d277fc42a2957e0a90fec554fc623f2268ea64af41a7a3116ea8f892403018f3
+EBUILD hakyll-4.13.4.1.ebuild 4333 BLAKE2B 82665d4629e697ac65494402797742f4d20f65e15b3ab34b860529be82799477c62f7129126514974dd46099b8ea41572b8220c5f65d0f0bcd2a1ce4b6674290 SHA512 90d97380fe9a629fb2a3cc38de12a959ea299b80e34b5d35c1f0e19a0082892a05fd8aafb4833ea8c3c20ba76d0a5a0d8f9d49c4b7177b7682b16b7446f34b05
MISC metadata.xml 1181 BLAKE2B a22ae826a948f6941e935e93f5381bffb53ec0c532e571d5c903ce5670cdc615a1a4915b2b0b66530e21877e57eb55d2947a5d54da18df8e0030aeb6e369dd8b SHA512 104a8d369da505e931d184a37661832fa99c27412b4e4e8c2dca8b857aaba48258a0fa52d47fafeb964b1633255a38b72383fa439038e948631730da02f07a8d
diff --git a/dev-haskell/hakyll/files/hakyll-4.13.4.1-pandoc-2.11.patch b/dev-haskell/hakyll/files/hakyll-4.13.4.1-pandoc-2.11.patch
new file mode 100644
index 000000000000..1598c89c8995
--- /dev/null
+++ b/dev-haskell/hakyll/files/hakyll-4.13.4.1-pandoc-2.11.patch
@@ -0,0 +1,209 @@
+From 77afcbc2937a4ee5db9666c1f3e0c090914d3980 Mon Sep 17 00:00:00 2001
+From: Jasper Van der Jeugt
+Date: Sun, 6 Dec 2020 19:24:06 +0100
+Subject: [PATCH] Pandoc 2.11 compatibility (#826)
+
+* Pandoc 2.11 compatibility
+
+* Bump stack.yaml
+
+* Bump stack dependencies
+---
+ lib/Hakyll/Web/Pandoc/Biblio.hs | 102 +++++++++++++++++---------------
+ lib/Hakyll/Web/Pandoc/Binary.hs | 12 ----
+ 5 files changed, 123 insertions(+), 86 deletions(-)
+diff --git a/lib/Hakyll/Web/Pandoc/Biblio.hs b/lib/Hakyll/Web/Pandoc/Biblio.hs
+index 5127d881..567f478b 100644
+--- a/lib/Hakyll/Web/Pandoc/Biblio.hs
++++ b/lib/Hakyll/Web/Pandoc/Biblio.hs
+@@ -12,6 +12,7 @@
+ {-# LANGUAGE Arrows #-}
+ {-# LANGUAGE DeriveDataTypeable #-}
+ {-# LANGUAGE GeneralizedNewtypeDeriving #-}
++{-# LANGUAGE OverloadedStrings #-}
+ module Hakyll.Web.Pandoc.Biblio
+ ( CSL
+ , cslCompiler
+@@ -23,33 +24,31 @@ module Hakyll.Web.Pandoc.Biblio
+
+
+ --------------------------------------------------------------------------------
+-import Control.Monad (liftM, replicateM)
+-import Data.Binary (Binary (..))
+-import Data.Typeable (Typeable)
++import Control.Monad (liftM)
++import Data.Binary (Binary (..))
++import qualified Data.ByteString as B
++import qualified Data.ByteString.Lazy as BL
++import qualified Data.Map as Map
++import qualified Data.Time as Time
++import Data.Typeable (Typeable)
+ import Hakyll.Core.Compiler
+ import Hakyll.Core.Compiler.Internal
+ import Hakyll.Core.Identifier
+ import Hakyll.Core.Item
+-import Hakyll.Core.Provider
+ import Hakyll.Core.Writable
+ import Hakyll.Web.Pandoc
+-import Hakyll.Web.Pandoc.Binary ()
+-import qualified Text.CSL as CSL
+-import Text.CSL.Pandoc (processCites)
+-import Text.Pandoc (Pandoc, ReaderOptions (..),
+- enableExtension, Extension (..))
++import Text.Pandoc (Extension (..), Pandoc,
++ ReaderOptions (..),
++ enableExtension)
++import qualified Text.Pandoc as Pandoc
++import qualified Text.Pandoc.Citeproc as Pandoc (processCitations)
+
+
+ --------------------------------------------------------------------------------
+-data CSL = CSL
+- deriving (Show, Typeable)
++newtype CSL = CSL {unCSL :: B.ByteString}
++ deriving (Binary, Show, Typeable)
+
+
+---------------------------------------------------------------------------------
+-instance Binary CSL where
+- put CSL = return ()
+- get = return CSL
+-
+
+ --------------------------------------------------------------------------------
+ instance Writable CSL where
+@@ -59,21 +58,12 @@ instance Writable CSL where
+
+ --------------------------------------------------------------------------------
+ cslCompiler :: Compiler (Item CSL)
+-cslCompiler = makeItem CSL
+-
+-
+---------------------------------------------------------------------------------
+-newtype Biblio = Biblio [CSL.Reference]
+- deriving (Show, Typeable)
++cslCompiler = fmap (CSL . BL.toStrict) <$> getResourceLBS
+
+
+ --------------------------------------------------------------------------------
+-instance Binary Biblio where
+- -- Ugly.
+- get = do
+- len <- get
+- Biblio <$> replicateM len get
+- put (Biblio rs) = put (length rs) >> mapM_ put rs
++newtype Biblio = Biblio {unBiblio :: B.ByteString}
++ deriving (Binary, Show, Typeable)
+
+
+ --------------------------------------------------------------------------------
+@@ -84,12 +74,7 @@ instance Writable Biblio where
+
+ --------------------------------------------------------------------------------
+ biblioCompiler :: Compiler (Item Biblio)
+-biblioCompiler = do
+- filePath <- getResourceFilePath
+- makeItem =<< unsafeCompiler (Biblio <$> CSL.readBiblioFile idpred filePath)
+- where
+- -- This is a filter on citations. We include all citations.
+- idpred = const True
++biblioCompiler = fmap (Biblio . BL.toStrict) <$> getResourceLBS
+
+
+ --------------------------------------------------------------------------------
+@@ -99,19 +84,42 @@ readPandocBiblio :: ReaderOptions
+ -> (Item String)
+ -> Compiler (Item Pandoc)
+ readPandocBiblio ropt csl biblio item = do
+- -- Parse CSL file, if given
+- provider <- compilerProvider <$> compilerAsk
+- style <- unsafeCompiler $
+- CSL.readCSLFile Nothing . (resourceFilePath provider) . itemIdentifier $ csl
+-
+- -- We need to know the citation keys, add then *before* actually parsing the
+- -- actual page. If we don't do this, pandoc won't even consider them
+- -- citations!
+- let Biblio refs = itemBody biblio
+- pandoc <- itemBody <$> readPandocWith ropt item
+- let pandoc' = processCites style refs pandoc
+-
+- return $ fmap (const pandoc') item
++ -- It's not straightforward to use the Pandoc API as of 2.11 to deal with
++ -- citations, since it doesn't export many things in 'Text.Pandoc.Citeproc'.
++ -- The 'citeproc' package is also hard to use.
++ --
++ -- So instead, we try treating Pandoc as a black box. Pandoc can read
++ -- specific csl and bilbio files based on metadata keys.
++ --
++ -- So we load the CSL and Biblio files and pass them to Pandoc using the
++ -- ersatz filesystem.
++ Pandoc.Pandoc (Pandoc.Meta meta) blocks <- itemBody <$>
++ readPandocWith ropt item
++
++ let cslFile = Pandoc.FileInfo zeroTime . unCSL $ itemBody csl
++ bibFile = Pandoc.FileInfo zeroTime . unBiblio $ itemBody biblio
++ addBiblioFiles = \st -> st
++ { Pandoc.stFiles =
++ Pandoc.insertInFileTree "_hakyll/style.csl" cslFile .
++ Pandoc.insertInFileTree "_hakyll/refs.bib" bibFile $
++ Pandoc.stFiles st
++ }
++ biblioMeta = Pandoc.Meta .
++ Map.insert "csl" (Pandoc.MetaString "_hakyll/style.csl") .
++ Map.insert "bibliography" (Pandoc.MetaString "_hakyll/refs.bib") $
++ meta
++ errOrPandoc = Pandoc.runPure $ do
++ Pandoc.modifyPureState addBiblioFiles
++ Pandoc.processCitations $ Pandoc.Pandoc biblioMeta blocks
++
++ pandoc <- case errOrPandoc of
++ Left e -> compilerThrow ["Error during processCitations: " ++ show e]
++ Right x -> return x
++
++ return $ fmap (const pandoc) item
++
++ where
++ zeroTime = Time.UTCTime (toEnum 0) 0
+
+ --------------------------------------------------------------------------------
+ pandocBiblioCompiler :: String -> String -> Compiler (Item String)
+diff --git a/lib/Hakyll/Web/Pandoc/Binary.hs b/lib/Hakyll/Web/Pandoc/Binary.hs
+index 5d3efead..3f7f4fb5 100644
+--- a/lib/Hakyll/Web/Pandoc/Binary.hs
++++ b/lib/Hakyll/Web/Pandoc/Binary.hs
+@@ -4,9 +4,6 @@ module Hakyll.Web.Pandoc.Binary where
+
+ import Data.Binary (Binary (..))
+
+-import qualified Text.CSL as CSL
+-import qualified Text.CSL.Reference as REF
+-import qualified Text.CSL.Style as STY
+ import Text.Pandoc
+
+ --------------------------------------------------------------------------------
+@@ -18,7 +15,6 @@ instance Binary Caption
+ instance Binary Cell
+ instance Binary ColSpan
+ instance Binary ColWidth
+-instance Binary CSL.Reference
+ instance Binary Citation
+ instance Binary CitationMode
+ instance Binary Format
+@@ -27,17 +23,9 @@ instance Binary ListNumberDelim
+ instance Binary ListNumberStyle
+ instance Binary MathType
+ instance Binary QuoteType
+-instance Binary REF.CLabel
+-instance Binary REF.CNum
+-instance Binary REF.Literal
+-instance Binary REF.RefDate
+-instance Binary REF.RefType
+-instance Binary REF.Season
+ instance Binary Row
+ instance Binary RowHeadColumns
+ instance Binary RowSpan
+-instance Binary STY.Agent
+-instance Binary STY.Formatted
+ instance Binary TableBody
+ instance Binary TableFoot
+ instance Binary TableHead
diff --git a/dev-haskell/hakyll/hakyll-4.13.4.1.ebuild b/dev-haskell/hakyll/hakyll-4.13.4.1.ebuild
new file mode 100644
index 000000000000..87f239ca1460
--- /dev/null
+++ b/dev-haskell/hakyll/hakyll-4.13.4.1.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.7.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="A static website compiler library"
+HOMEPAGE="https://jaspervdj.be/hakyll"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="buildwebsite +checkexternal +previewserver +usepandoc +watchserver"
+
+RDEPEND=">=dev-haskell/blaze-html-0.5:=[profile?] =dev-haskell/blaze-markup-0.5.1:=[profile?] =dev-haskell/cryptonite-0.25:=[profile?] =dev-haskell/data-default-0.4:=[profile?] =dev-haskell/file-embed-0.0.10.1:=[profile?] =dev-haskell/lrucache-1.1.1:=[profile?] =dev-haskell/memory-0.14.18:=[profile?] =dev-haskell/mtl-1:=[profile?] =dev-haskell/network-uri-2.6:=[profile?] =dev-haskell/optparse-applicative-0.12:=[profile?] =dev-haskell/parsec-3.0:=[profile?] =dev-haskell/random-1.0:=[profile?] =dev-haskell/regex-tdfa-1.1:=[profile?] =dev-haskell/resourcet-1.1:=[profile?] =dev-haskell/scientific-0.3.4:=[profile?] =dev-haskell/tagsoup-0.13.1:=[profile?] =dev-haskell/text-0.11:=[profile?] =dev-haskell/time-locale-compat-0.1:=[profile?] =dev-haskell/unordered-containers-0.2:=[profile?] =dev-haskell/vector-0.11:=[profile?] =dev-haskell/yaml-0.8.11:=[profile?] =dev-lang/ghc-8.6.3:=
+ buildwebsite? ( >=app-text/pandoc-2.11:=[profile?] =dev-haskell/http-conduit-2.2:=[profile?] =dev-haskell/fsnotify-0.2:=[profile?] =dev-haskell/http-types-0.9:=[profile?] =dev-haskell/wai-3.2:=[profile?] =dev-haskell/wai-app-static-3.1:=[profile?] =dev-haskell/warp-3.2:=[profile?] =dev-haskell/http-types-0.7:=[profile?] =dev-haskell/fsnotify-0.2:=[profile?] =app-text/pandoc-2.11:=[profile?] =dev-haskell/cabal-2.4.0.1
+ test? ( >=dev-haskell/quickcheck-2.8 =dev-haskell/tasty-0.11 =dev-haskell/tasty-hunit-0.9 =dev-haskell/tasty-quickcheck-0.8 = 2.10 && < 2.11,' 'pandoc >= 2.11' \
+ 'pandoc >= 2.10 && < 2.11' 'pandoc >= 2.11' \
+ 'pandoc-citeproc >= 0.14 && < 0.18' ' ' \
+ 'file-embed >= 0.0.10.1 && < 0.0.12' 'file-embed >= 0.0.10.1'
+}
+
+src_configure() {
+ haskell-cabal_src_configure \
+ $(cabal_flag buildwebsite buildwebsite) \
+ $(cabal_flag checkexternal checkexternal) \
+ $(cabal_flag previewserver previewserver) \
+ $(cabal_flag usepandoc usepandoc) \
+ $(cabal_flag watchserver watchserver)
+}
+
+src_test() {
+ # unixFilter test expects 'option' output in error message
+ # But it's a localized string that:
+ # https://github.com/jaspervdj/hakyll/issues/607
+ LANGUAGE=en haskell-cabal_src_test
+}
diff --git a/dev-haskell/hslua/Manifest b/dev-haskell/hslua/Manifest
index a361bbecb86a..6d07b37227af 100644
--- a/dev-haskell/hslua/Manifest
+++ b/dev-haskell/hslua/Manifest
@@ -1,3 +1,5 @@
DIST hslua-1.0.3.1.tar.gz 236734 BLAKE2B 45eba849c41a22fdc7d03729f0ac15fb25ff83d1cdcb905a58a5813ef34f3b2e2a98a7ff2991083672a7afd5898e50e6ef9c83157c773b9861bd1547f4da5972 SHA512 047bcf851727e7525f10f6c705ec8968f330373aedf22bc91c96a44e5abdced46622a66a87c7973eac178c69dd3371bbcf4b858ed3c442719279e4cac4e57657
+DIST hslua-1.1.2.tar.gz 244832 BLAKE2B 5da2b9c2da6f43d841662b3143d3cd5b084d3f32cd2804316a8741e863d4c8dcab85da650b219af4250b2d4ec0570a742dc13b8bbeab79ec6dd5d4ddbe4907be SHA512 886a9d555a034b8fe74d5184457dad9e1bc9bd75662760a0415a75222bd64c556043ce6f98bc11dc1d27c34212f87ad3ce2271d5ff8125c1b5a89263cdf987eb
EBUILD hslua-1.0.3.1.ebuild 1405 BLAKE2B cf81f09383e91ff08d5e02efdc64c80d4a1b6fabfc282fd5806022becf8b5f9bd56955ab148abc01abee8eda7f8835e8e21bef31d737ca879cdb3604964ffc01 SHA512 683aac87e2cd8846cca263c687b4f4e770d960c92005be242f580931522b422f0e856c6e583c502ef9b3730a54ab79a9d5118638143919ba47784c7b873167ff
-MISC metadata.xml 496 BLAKE2B 03b43a6f7206208babba5f617f629c4e3f129fcceae2d39a3326379dab93bcc8e0357725b97a470d5d63ad23feea43c719c7e4014400fe680d4757ba40801b10 SHA512 e2cbc21370efa8f4268956b43fdefe02cb09c2f2da86733e345bbf4eb891b838f6924b874ba38ec67218646b75472dffeacfc9af76832cfed029cdff562693ca
+EBUILD hslua-1.1.2.ebuild 1558 BLAKE2B 8b737fcbcee9cce4d4ebb749dbd432fd4536668cef86c5d024e81cd7275306e90bcf437d6acf839a9ace9e9a90065ecdf794839880dd7962bcdd3937a82111fd SHA512 9a3cc589126828d57b55a6ac5b3055885a6bbf154d0049dc39a61d12d09c2906fe89b2cde662f12fcce6ae19630dc98f42c542e5492fd94ac6b39bf7770d5c48
+MISC metadata.xml 559 BLAKE2B f03daddb36339dfe0a0efc078588c9517e19f6753bc8d7087f3062845fb9dbab43ddfe9142a1fd45ab2bab2a3c26bd15950e282a45515b250b5f375b2baa158a SHA512 e132dcc9cebff3d70a283fd7dc078eab31074a5dbf9486a1155549a0e5b73792408a9628abd80b940d79074c87d6f5be871ec3a09ea7051eeeafb80e2eaffa87
diff --git a/dev-haskell/hslua/hslua-1.1.2.ebuild b/dev-haskell/hslua/hslua-1.1.2.ebuild
new file mode 100644
index 000000000000..829469faf3e7
--- /dev/null
+++ b/dev-haskell/hslua/hslua-1.1.2.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.6
+#hackport: flags: -allow-unsafe-gc,-apicheck,-export-dynamic,-lua501,-lua502,-lua_32bits,-system-lua,-pkg-config
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="A Lua language interpreter embedding in Haskell"
+HOMEPAGE="https://hslua.github.io/"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="hardcode-reg-keys"
+
+RDEPEND=">=dev-haskell/base-compat-0.10:=[profile?]
+ >=dev-haskell/exceptions-0.8:=[profile?] =dev-haskell/fail-4.9:=[profile?] =dev-haskell/mtl-2.2:=[profile?] =dev-haskell/semigroups-0.18:=[profile?] =dev-haskell/text-1.0:=[profile?] =dev-lang/ghc-7.10.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.22.2.0
+ test? ( >=dev-haskell/quickcheck-2.7
+ >=dev-haskell/quickcheck-instances-0.3
+ >=dev-haskell/tasty-0.11
+ >=dev-haskell/tasty-hunit-0.9
+ >=dev-haskell/tasty-quickcheck-0.8 )
+"
+
+src_configure() {
+ haskell-cabal_src_configure \
+ --flag=-allow-unsafe-gc \
+ --flag=-apicheck \
+ --flag=-export-dynamic \
+ $(cabal_flag hardcode-reg-keys hardcode-reg-keys) \
+ --flag=-lua501 \
+ --flag=-lua502 \
+ --flag=-lua_32bits \
+ --flag=-pkg-config \
+ --flag=-system-lua
+}
diff --git a/dev-haskell/hslua/metadata.xml b/dev-haskell/hslua/metadata.xml
index a76459888050..6ca237e1273d 100644
--- a/dev-haskell/hslua/metadata.xml
+++ b/dev-haskell/hslua/metadata.xml
@@ -5,11 +5,7 @@
haskell@gentoo.org
Gentoo Haskell
-
- The Scripting.Lua module is a wrapper of Lua language interpreter
- as described in www.lua.org.
-
- The package is standalone: full Lua interpreter version 5.1.4
- is distributed in this package as well.
-
+
diff --git a/dev-haskell/jira-wiki-markup/Manifest b/dev-haskell/jira-wiki-markup/Manifest
index e521a12ef34c..73d2ea91fd18 100644
--- a/dev-haskell/jira-wiki-markup/Manifest
+++ b/dev-haskell/jira-wiki-markup/Manifest
@@ -1,3 +1,5 @@
DIST jira-wiki-markup-1.1.4.tar.gz 20144 BLAKE2B 88b81d0107923373d6d9ce60c5028d3673e0c3175210db1cdb32846f8e7a77b2a1870da0e95bb1cefcbaf737d8aaa2b5718de0b7e45837e2ea249365030d3e75 SHA512 89a89ca7bc43598c77328cbf93ce6215a446322a6ce5d5bbcb1180cf664be56e26e61d49332006988b27d460ac2a32af466fb974af6b52e2f5d9e69f4821474f
+DIST jira-wiki-markup-1.3.2.tar.gz 23081 BLAKE2B 09a426ebbfc480d64eb1c7012622b358ae7a9e3d6491eb0fa1cba24d8385d7b94455150399e14a5c02783876ebb3ea57b74da76afc95b96c06e3734c4a7c19c7 SHA512 14d68dcbdcfa9e0a7959df3a38cfe475047ad42aab9c6c3e1caee4d2491e7efb9a58e99e3b9c601726a235c592d2763016f709d5a23c6d80e1e6d2115fdce269
EBUILD jira-wiki-markup-1.1.4.ebuild 835 BLAKE2B 7ea9a7f709e4575923a82a2b5c849213b44e626dd68db079dfa8224a59770fa6a5bc83acc12bfd0d1fbe4c9a675e6d94de31323a0d93b8c40f304214ec4313fe SHA512 3ea322122f948cb3542be50ba85165034fec5ce6362d47158cd6bc0685ff4f30f63223842316bf2b91d4442ebb7f7bece8fab536961f570c1847bef0d2fc2316
+EBUILD jira-wiki-markup-1.3.2.ebuild 835 BLAKE2B 04ec00e34ad07178a1fdd21b43472fceb3282e3688a4ef3cc9fc09b0f7e139010ed1245a8013cd83d4e3e45ff53c8a92840b784d10ea855d04e937cad1719007 SHA512 b79ebf4bdd183d738d232292c2814fb6c0a43ea0a5f024c9b4adb0025a41e46b8dbd5293e65a9075b89a73da03307c42ad09b90d07b5db96489302a83bae777f
MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/jira-wiki-markup/jira-wiki-markup-1.3.2.ebuild b/dev-haskell/jira-wiki-markup/jira-wiki-markup-1.3.2.ebuild
new file mode 100644
index 000000000000..7857af088d8c
--- /dev/null
+++ b/dev-haskell/jira-wiki-markup/jira-wiki-markup-1.3.2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2021 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 test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Parse jira wiki text into an abstract syntax tree"
+HOMEPAGE="https://github.com/tarleb/jira-wiki-markup"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/mtl-2.2:=[profile?] =dev-haskell/parsec-3.1:=[profile?] =dev-haskell/text-1.1.1:=[profile?] =dev-lang/ghc-8.0.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.0
+ test? ( dev-haskell/tasty
+ dev-haskell/tasty-hunit )
+"
diff --git a/dev-haskell/pandoc-citeproc/Manifest b/dev-haskell/pandoc-citeproc/Manifest
index 7246db434725..4e7b6ca4decb 100644
--- a/dev-haskell/pandoc-citeproc/Manifest
+++ b/dev-haskell/pandoc-citeproc/Manifest
@@ -1,3 +1,3 @@
-DIST pandoc-citeproc-0.17.0.1.tar.gz 344529 BLAKE2B f3aaa74eb52d8c023638dc0ff608d2651af8a294cc3f6beae727dc6b0537229e92929c01b24ba7f45c41acc6dd465e5afe1087aa9f2e902bb2b6cfb8aba7512d SHA512 b616007c8b105e3245bae87f60e2ad55809435c82cf91cf32498dad8f2303df48d4555e68c3fbd9f78dc49fd1042ff46061273031c3352df130fc735f443be96
-EBUILD pandoc-citeproc-0.17.0.1.ebuild 2624 BLAKE2B 1029765ca1b39931388641c2f45dcdd63053af8a817fd82dd4f88cb1c0c394aeb087005e29822e2c8139fd62936304f1260e948fd91c03bff6a8bdd37591fb5c SHA512 6b2ce83990051013e04ecf5af3fa9a191a3b6de75efd7c4780c0dbd887c3a486ffdfd74a227ba179598d5b22b99a23717ae2ceb3e8e625f2f57bac798cc4b470
+DIST pandoc-citeproc-0.17.0.2.tar.gz 344577 BLAKE2B f2b4687fe5de8cb8b76d1d8022ec9629c7834a3f3d3bc2735c52ec40ea0132caa8d7b9ad3c603d6120800e2c1f75e76cb13a3c45a4cbdd0e4bbba6d6fd54ed24 SHA512 5ce079a542b096c06d6e4e205625a993422a972f04787495ac9013dd3131df62733f30e4c3004335e3738b02bb22a7ad50a31c1eb3f67d2b4ef51605c7fcbf16
+EBUILD pandoc-citeproc-0.17.0.2.ebuild 2722 BLAKE2B e5ad059cc4a8d4d0d0609014b50eb425d7efc483e8e8c99cb84cd45f87779376c8a2ec634e9fcbece1c7c6f15b660f9585284e55cffc674146b3fe8f8ed9acad SHA512 df584133674ecac26cacfeaa3a7fbd30639576a8a11b7d45384496d876f87c9b30f4dbd65f4a92cdff1ed0fea280fe5b723bf1579174e0952339e091c66a1144
MISC metadata.xml 1247 BLAKE2B 5e118fd7595a9775b75a9b87fc81bb7221a2b2609565880bff42fd9efcd9469dce6c69f47c1dc1a04b1f7fb97023166e73fa76943c904cd6633e66ac6010e963 SHA512 fdde89152d95778a857d83643ef23c4759d1d0de2e4d22b78444ee4f91a181e503ca02349ba4b468265281edb361f8d86c3a78e8b6b49fca0006777f8cd79674
diff --git a/dev-haskell/pandoc-citeproc/pandoc-citeproc-0.17.0.1.ebuild b/dev-haskell/pandoc-citeproc/pandoc-citeproc-0.17.0.2.ebuild
similarity index 92%
rename from dev-haskell/pandoc-citeproc/pandoc-citeproc-0.17.0.1.ebuild
rename to dev-haskell/pandoc-citeproc/pandoc-citeproc-0.17.0.2.ebuild
index 7c28423ccd3e..b5c9b3c6e24d 100644
--- a/dev-haskell/pandoc-citeproc/pandoc-citeproc-0.17.0.1.ebuild
+++ b/dev-haskell/pandoc-citeproc/pandoc-citeproc-0.17.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -18,7 +18,7 @@ SLOT="0/${PV}"
KEYWORDS="~amd64 ~x86"
IUSE="+bibutils debug embed-data-files static unicode-collation"
-RESTRICT=test # fails
+RESTRICT=test # tests fail when system already has pandoc-citeproc installed
RDEPEND=">=app-text/pandoc-2.8:=[profile?] =dev-haskell/aeson-0.7:=[profile?] =dev-haskell/aeson-0.6.2:=[profile?] =dev-haskell/quickcheck-2.10:2=[profile?] =dev-haskell/semigroups-0.18:=[profile?] =dev-haskell/syb-0.1:=[profile?] =dev-lang/ghc-7.10.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.2
+ test? ( >=dev-haskell/hunit-1.2 =dev-haskell/string-qq-0.0.2 =dev-haskell/test-framework-0.3 =dev-haskell/test-framework-hunit-0.2 =dev-haskell/test-framework-quickcheck2-0.2.9 =dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.0
+"
diff --git a/dev-haskell/skylighting-core/Manifest b/dev-haskell/skylighting-core/Manifest
index 835c0fa4dbe3..4a94f406b7c4 100644
--- a/dev-haskell/skylighting-core/Manifest
+++ b/dev-haskell/skylighting-core/Manifest
@@ -1,3 +1,5 @@
+DIST skylighting-core-0.10.2.tar.gz 695555 BLAKE2B b4ef476780b9cf613e8bc7150abc57f4bcc282321a31ff549bb4ffb518c2519aaddeb4c94ca974f79d6fe803729b444da4f6c01784dab1cf63b7a596f2676818 SHA512 c3d20694b29dee660cbba681dec4b7610b1b5be8e5b359931935b0e2a466f41a494847231557c6c5906d5b31487360516af0e00c46689cbc03c9de58e3430698
DIST skylighting-core-0.8.5.tar.gz 675746 BLAKE2B 3a17423f5412228930df78e86b00b3d0339bced0a00e801a9986177f7099e9e5706b1858e3a4064db84eeec3b0fdde3f043b05b62de85d6a92d2d47a5cbb136d SHA512 ad411d7e0fd72adeb4cdbf6fc57d6191c51d9319b25c8d41ad35a66f885d518a842846cd7cf5ce35bdc31da74e0f9d97445f492628a4b5a2bceb85642aa23257
+EBUILD skylighting-core-0.10.2.ebuild 1356 BLAKE2B 75a8326e94a055d9521716261f1d2af25e3fa3d73dd5e7ef6571c56a3eb1a1f1ed5dc512fb73aea53627a13b93feaf49476914212a54cae36d68d119a1f7f811 SHA512 9fbcf7fe7b9f6d6ca4e09c9232408c8031889202d8837839f195b68c2ae0a103f0ee6823d7a396b77f067191bc90fee920f67c47a367c5ab06c3c2b992f6a149
EBUILD skylighting-core-0.8.5.ebuild 1393 BLAKE2B cae9c111639ba16103db61609b380cae0268753a54eb3a61894b112e18768b041702695d4a2a84c58b18e5b38268c4371bb80be5796124a708351a3d4c350018 SHA512 aa65fb1f748c102c539bdc3f869a1c86a97716538588346ca5231fc37ad21837739c280bf885ac49b05331357f1632c80b5b29ee6c1c17b6cb66813d4d112d0c
MISC metadata.xml 860 BLAKE2B 168a330230e8a77fcdd7da5c60bbcc88546be72a0f383aa9e5e55370459982437a2cfd0a3a1645c4542e15a04e56a250c486650d13a18cf00bd6db03829623bf SHA512 e09699b10db27bf3ae4b794fcdc7e84f5a6ed870ce0fe28e269e337457f9be90e234d8f104e532d8c9c3dee0346547d9beaeb8f4a3e24a0d4d1a1e7553b7e225
diff --git a/dev-haskell/skylighting-core/skylighting-core-0.10.2.ebuild b/dev-haskell/skylighting-core/skylighting-core-0.10.2.ebuild
new file mode 100644
index 000000000000..3e890f211b07
--- /dev/null
+++ b/dev-haskell/skylighting-core/skylighting-core-0.10.2.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.7.9999
+#hackport: flags: +system-pcre
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="syntax highlighting library"
+HOMEPAGE="https://github.com/jgm/skylighting"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="executable"
+
+RDEPEND=">=dev-haskell/aeson-1.0:=[profile?]
+ >=dev-haskell/ansi-terminal-0.7:=[profile?]
+ dev-haskell/attoparsec:=[profile?]
+ dev-haskell/base64-bytestring:=[profile?]
+ >=dev-haskell/blaze-html-0.5:=[profile?]
+ dev-haskell/case-insensitive:=[profile?]
+ >=dev-haskell/colour-2.0:=[profile?]
+ dev-haskell/hxt:=[profile?]
+ dev-haskell/mtl:=[profile?]
+ dev-haskell/safe:=[profile?]
+ dev-haskell/text:=[profile?]
+ dev-haskell/utf8-string:=[profile?]
+ >=dev-lang/ghc-8.2.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-2.0.0.2
+ test? ( dev-haskell/diff
+ dev-haskell/hunit
+ dev-haskell/pretty-show
+ dev-haskell/quickcheck
+ dev-haskell/random
+ dev-haskell/tasty
+ dev-haskell/tasty-golden
+ dev-haskell/tasty-hunit
+ dev-haskell/tasty-quickcheck )
+"
+
+src_configure() {
+ haskell-cabal_src_configure \
+ $(cabal_flag executable executable) \
+ --flag=system-pcre
+}
diff --git a/dev-haskell/skylighting/Manifest b/dev-haskell/skylighting/Manifest
index 8916d3aefbf7..e8a3f39b0e50 100644
--- a/dev-haskell/skylighting/Manifest
+++ b/dev-haskell/skylighting/Manifest
@@ -1,3 +1,5 @@
+DIST skylighting-0.10.2.tar.gz 633776 BLAKE2B 9f8899a7ad65e812009299f385033250d0ddc467d9f2574709a896bda45a27abf9d1ef275dd4b33ad351055b6f4476881f60a7f14cd21cd15da2b15cb10e17a4 SHA512 04d411580caf6102e3f8732c53b103412c6d42becfadbbcdd13053557235b632f07d82b22acad87ffc37f5705a387367aa21a0b70b1c5cf2ef52acce1b3e4e86
DIST skylighting-0.8.5.tar.gz 621391 BLAKE2B f17c1e729b2f669950ffec8a84bd9018acbd407f1c8c05bcbe65d77986ce72cdf55b0e967ce4070cd72e5a12fe469ee55cc3782401cc15f19da213a5fa92d592 SHA512 9d40d96020a3b54d549259f6c981ff63f666f490e900f29eda437ed76965f172e9c77c4def36850e448ca0d3fad035ce4e9a244fd0b3748c6c24fb413c69614f
+EBUILD skylighting-0.10.2.ebuild 899 BLAKE2B 6a587e7f7400eca3034b3f0d734aae74988a2d1e384a4ce8f8197aab89fc9562dcca7cc1023593662ae9f833b8145670d34beee964717b598cbc20c604393663 SHA512 e26baf847e7d7c773bc4ec7da48a7664aafb58957c56917eaa7424b540200492aab58c8a67f12d96b730e8006d146dfd91a70655b12f572aa88f96f6e98c2151
EBUILD skylighting-0.8.5.ebuild 898 BLAKE2B 628371708fba84fb319cc1174b8f2a9f12a41152da8857b31987a1be294d71431f0f0af26a253f5f5178bab06de7269e9b02a724a3e3eec6977a808aa76f411b SHA512 c4fd303427acc18e85d1f2aa76942d406257e778f4a45e147305f7a09414c4cb78cdb002f5a6d28d68453510de13b4a32bac412e511b2286a7b891574deaf3ed
MISC metadata.xml 824 BLAKE2B 40102d8937d28fe2b98f055019288ea9fb08307e23702e46c2f10e815006e4a3f4fa11a34fd787c1053441f30a27c138252ce853e9c22867523b3be8fa711f3c SHA512 377bf69b015def5abcaa6dde5865890fb97188b09b4539f13f704880d61aa352df3f4a8f5a76bcadc51e4938ed6336e4732540a8ee12e705aa6fa39e58f9b792
diff --git a/dev-haskell/skylighting/skylighting-0.10.2.ebuild b/dev-haskell/skylighting/skylighting-0.10.2.ebuild
new file mode 100644
index 000000000000..69413875bb52
--- /dev/null
+++ b/dev-haskell/skylighting/skylighting-0.10.2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.7.9999
+#hackport: flags: -bootstrap,+system-pcre
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="syntax highlighting library"
+HOMEPAGE="https://github.com/jgm/skylighting"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="executable"
+
+RDEPEND="~dev-haskell/skylighting-core-0.10.2:=[profile?]
+ >=dev-lang/ghc-7.10.1:=
+ executable? ( >=dev-haskell/blaze-html-0.5:=[profile?]
+ dev-haskell/pretty-show:=[profile?]
+ dev-haskell/text:=[profile?] )
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.22.2.0
+"
+
+src_configure() {
+ haskell-cabal_src_configure \
+ --flag=-bootstrap \
+ $(cabal_flag executable executable) \
+ --flag=system-pcre
+}
diff --git a/dev-haskell/timeit/Manifest b/dev-haskell/timeit/Manifest
new file mode 100644
index 000000000000..2676626d2625
--- /dev/null
+++ b/dev-haskell/timeit/Manifest
@@ -0,0 +1,3 @@
+DIST timeit-2.0.tar.gz 2117 BLAKE2B 3cb601e87cd77af879572aca0fc495ce6e446d4c402c3e1010b114a18326254f94fc212985df722a47b0a6870d1789424b65620ebc471c177e22b18c6aa7c577 SHA512 3cbe554ddb17fbeb5f8be1f6459144921f8be4db0fa9571678980251ca397fca0700df61d0e5bd8466b0b2cdcedac8473ac53debbd9b4e9c239ebb37bec2845b
+EBUILD timeit-2.0.ebuild 514 BLAKE2B 555bf5941fd4106560c70a52f664235c3f60fce263eb9dab5bd204cd35d2edc924ba1f0643d064d42d5a7d3db9d5f7bedca3ed729a4564deb9bac789a2b7e194 SHA512 4a3f89bdcd948ac2f053d85c5b40fd221eb5052c1ef344b2b2fb75bae82081729612fa917821156304c444709f991a0417e1b603b8d57a9cf59ddefb5f928d12
+MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/net-ftp/tlswrap/metadata.xml b/dev-haskell/timeit/metadata.xml
similarity index 55%
rename from net-ftp/tlswrap/metadata.xml
rename to dev-haskell/timeit/metadata.xml
index 7a38bb900964..b7878815d80d 100644
--- a/net-ftp/tlswrap/metadata.xml
+++ b/dev-haskell/timeit/metadata.xml
@@ -1,5 +1,8 @@
-
+
+ haskell@gentoo.org
+ Gentoo Haskell
+
diff --git a/dev-haskell/timeit/timeit-2.0.ebuild b/dev-haskell/timeit/timeit-2.0.ebuild
new file mode 100644
index 000000000000..fba159e684ae
--- /dev/null
+++ b/dev-haskell/timeit/timeit-2.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.1
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Time a computation"
+HOMEPAGE="https://github.com/merijn/timeit"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-lang/ghc-7.8.2:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.18.1.3
+"
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index b7227e7003e5..7516859d49a0 100644
Binary files a/dev-java/Manifest.gz and b/dev-java/Manifest.gz differ
diff --git a/dev-java/gradle-bin/Manifest b/dev-java/gradle-bin/Manifest
index 77052d537a99..958add0d4b89 100644
--- a/dev-java/gradle-bin/Manifest
+++ b/dev-java/gradle-bin/Manifest
@@ -1,3 +1,3 @@
DIST gradle-bin-6.3.zip 145161013 BLAKE2B f840bda2c1e2a6dd5306b9f7ad6fc8ae8c3d7342de57bd813b8dff64f733fc058af8dc7c9c5a138eac4eef3d5d12074976db81fe7eeb51b52d726502af04d036 SHA512 9796c14f8d4559128b4cb7e676883d83ef99b67242ae8156abebdb38bb7a561e8b3df3f93b24aa53274b7d78a7b04ea51e73268c2465799daa9da53ef73de24d
-EBUILD gradle-bin-6.3.ebuild 997 BLAKE2B 14539daf17d39d17d539561cb6d6d4ab586f3e8a6a084d3684b8b1f8bdfb160bdd3f7c3091ce0f362c93c3ba5b3c0d3641aa3e6fab1ea58338f3973c7fb0270a SHA512 7bedadebec8b2df5bc94cd2b674965edd5529fb4cf9eca8328c117cde83bcfa2baf96eda3ea8ec4b75ccbdec3e504b84d54d1861dec69586f781a6508e121a5b
+EBUILD gradle-bin-6.3.ebuild 985 BLAKE2B 5108b1a0ec969d79b2a27256b8c9ba5430f4d4326bd0e692cebeb31c9f09830592c3b856b19376fc6eef2d14069bf3c804b11f8054e7464a5a88c2b6b81cfd58 SHA512 c04c5d989701292ee4cd269e61ba989b5dfb818822b8c92f274c808216fadea75014ca21359ccdc859f29cc62812f3bc45c4a6db71a0f800f25575587373b583
MISC metadata.xml 435 BLAKE2B 22a7527b15ef2974a3e389977eb4056c03f7575ec9866848b90ef9e98bb7d2d645e83408f0ab4cbb139699757e7e3a1b5eb458a389563597ae3fa0ff5c310c0b SHA512 2a8b7c438d8aed952350c0a08660bde349363bb80794de9197c7ac107409021c1e38f0168e13213d730c6251ed9e39f644c42d6de050f0e58e862efaa46b2a43
diff --git a/dev-java/gradle-bin/gradle-bin-6.3.ebuild b/dev-java/gradle-bin/gradle-bin-6.3.ebuild
index 93eb5b8f352f..1623bb9c3f34 100644
--- a/dev-java/gradle-bin/gradle-bin-6.3.ebuild
+++ b/dev-java/gradle-bin/gradle-bin-6.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -26,14 +26,14 @@ RDEPEND=">=virtual/jdk-1.8"
S="${WORKDIR}/${MY_P}"
src_install() {
- local gradle_dir="${EPREFIX}/usr/share/${PN}-${SLOT}"
+ local gradle_dir="/usr/share/${PN}-${SLOT}"
insinto "${gradle_dir}"
doins -r lib/
exeinto "${gradle_dir}"/bin
doexe bin/${MY_PN}
- dosym "../${gradle_dir##*/usr/}/bin/gradle" "/usr/bin/${MY_PN}-${SLOT}"
+ dosym "../${gradle_dir#/usr/}/bin/gradle" "/usr/bin/${MY_PN}-${SLOT}"
docinto html
dodoc -r docs/release-notes.html
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index f5e134a5277b..9528124ffaf0 100644
Binary files a/dev-lang/Manifest.gz and b/dev-lang/Manifest.gz differ
diff --git a/dev-lang/cilk/Manifest b/dev-lang/cilk/Manifest
deleted file mode 100644
index 4c7d60718740..000000000000
--- a/dev-lang/cilk/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX cilk-5.4.6-autotools.patch 3379 BLAKE2B 50f3a0c7b36fc2f944d0e952e4ebd5b96e978d0f339fb3ae9b3205e7ea2f76a1fd04a262752ac68af22f57620173d372b7f0963911afa012d3258d6631ae7b15 SHA512 a69181b04c8ebd5010164d8796e615cd63837be45409438d20d009eb69492cfe5750f1a21754cdadb15cf9ca4645edc65db46092741e6227df4f41fef5110943
-DIST cilk-5.4.6.tar.gz 1270768 BLAKE2B e340901034a082af0ad431e33cd68c3ba9b97fa06ad5efe44b1f7e9eb6159f0408048d6ba76315dfc54670faf548d45f282fdd0ae5300ae2a5d741a92639beec SHA512 1ad082c5e1f42a4f15130673d1d43a0b5dedd80ca0e3182765065be8dccce72b26087243ca3405460dcc90332a84c3c5b1decf5a4650505fb738e7e085998e0e
-EBUILD cilk-5.4.6-r1.ebuild 873 BLAKE2B 019e29f097c69c317805411eaa7ae51c3fb279a14f7e19d0c7f125baf5f4f969ae194fcdd1c8b16b75ab5d4e5542f8b89525bac9acbc3dacbc6f36dfaca9f770 SHA512 9c5414928164016e8f7b2cd3f87513313de62ac2c8d3988b52571bdded22b63bfaec8d18ab46d39cbf5c3ea0226bc35eab2da7b7525f0007ca081c07dc95993c
-EBUILD cilk-5.4.6-r2.ebuild 970 BLAKE2B 15b132cbd2709027b5321391c111327a75b775df78a46b95bd161be321862b8cfeb45712feff77cade5e89a68876bdff9fadc9e70dde7531aa39a768733c05e9 SHA512 853142dc8f3e07718e059d618b7b87b112220d3c47f7536c257ae958f9717cef79b7c9a5818684434d358c56b9a7e82df38ae5604c727a9dd08276cbb4b2fc60
-MISC metadata.xml 874 BLAKE2B 719290eb8bee04e03209a96d8b2a04c04fa35f1143e96078dfd7fddb538be34f4f1b4be4b7b21527799e76d66a4d0016fd8af46210ca57a98b09e03761f33481 SHA512 b2044c69cb6dc0ee0a9a0e35abdd52fc52e46e532ca212f075bebb80b078d174ab6e9897b2cbec8f742274fc0aac37f1a8dea7b23d66d718871ef1cd3566cf96
diff --git a/dev-lang/cilk/cilk-5.4.6-r1.ebuild b/dev-lang/cilk/cilk-5.4.6-r1.ebuild
deleted file mode 100644
index 80297e33e8b2..000000000000
--- a/dev-lang/cilk/cilk-5.4.6-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit flag-o-matic autotools eutils
-
-DESCRIPTION="Language for multithreaded parallel programming based on ANSI C"
-HOMEPAGE="http://supertech.csail.mit.edu/cilk"
-SRC_URI="http://supertech.csail.mit.edu/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples static-libs"
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-autotools.patch
- eautoreconf
-}
-
-src_configure() {
- append-cppflags -D_XOPEN_SOURCE=600 -D_POSIX_C_SOURCE=200809L
- replace-flags -O[2-9] -O1
- econf --with-perfctr=no $(use_enable static-libs static)
-}
-
-src_install() {
- emake DESTDIR="${D}" install
- dodoc NEWS README THANKS
- use doc && dodoc doc/manual.pdf
- if use examples; then
- insinto /usr/share/doc/${PF}
- doins -r examples
- fi
-}
diff --git a/dev-lang/cilk/cilk-5.4.6-r2.ebuild b/dev-lang/cilk/cilk-5.4.6-r2.ebuild
deleted file mode 100644
index d0d1a60b22df..000000000000
--- a/dev-lang/cilk/cilk-5.4.6-r2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools flag-o-matic
-
-DESCRIPTION="Language for multithreaded parallel programming based on ANSI C"
-HOMEPAGE="http://supertech.csail.mit.edu/cilk"
-SRC_URI="http://supertech.csail.mit.edu/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples static-libs"
-
-PATCHES=(
- "${FILESDIR}/${P}-autotools.patch"
-)
-
-src_prepare() {
- # fix #571060 by restoring pre-GCC5 inline semantics
- append-cflags -std=gnu89
- append-cppflags -D_XOPEN_SOURCE=600 -D_POSIX_C_SOURCE=200809L
- replace-flags -O[2-9] -O1
-
- default
- eautoreconf
-}
-
-src_configure() {
- econf \
- --with-perfctr=no \
- $(use_enable static-libs static)
-}
-
-src_install() {
- emake DESTDIR="${D}" install
- dodoc NEWS README THANKS
- use doc && dodoc doc/manual.pdf
- if use examples; then
- insinto /usr/share/doc/${PF}
- doins -r examples
- fi
-}
diff --git a/dev-lang/cilk/files/cilk-5.4.6-autotools.patch b/dev-lang/cilk/files/cilk-5.4.6-autotools.patch
deleted file mode 100644
index 9f2d62b90410..000000000000
--- a/dev-lang/cilk/files/cilk-5.4.6-autotools.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-diff -Nur cilk-5.4.6.orig/cilk2c/Makefile.am cilk-5.4.6/cilk2c/Makefile.am
---- cilk-5.4.6.orig/cilk2c/Makefile.am 2012-11-12 21:18:50.374020109 -0800
-+++ cilk-5.4.6/cilk2c/Makefile.am 2012-11-12 21:19:09.667111443 -0800
-@@ -1,4 +1,6 @@
--pkglib_PROGRAMS = cilk2c
-+pkglibexec_PROGRAMS = cilk2c
-+
-+BUILT_SOURCES = ANSI-C.c ANSI-C.h
-
- cilk2c_SOURCES = analyze.c ast.c complex-types.c constexpr.c \
- container.c conversions.c dataflow.c elide.c initializer.c list.c \
-diff -Nur cilk-5.4.6.orig/configure.ac cilk-5.4.6/configure.ac
---- cilk-5.4.6.orig/configure.ac 2012-11-12 21:18:50.371020111 -0800
-+++ cilk-5.4.6/configure.ac 2012-11-12 21:19:09.668111459 -0800
-@@ -1,8 +1,8 @@
- dnl Process this file with autoconf to produce a configure script.
- AC_INIT
- AC_CONFIG_SRCDIR([config.h.in])
--AM_CONFIG_HEADER([config.h runtime/cilk-sysdep.h])
--AC_PREREQ(2.53)
-+AC_CONFIG_HEADERS([config.h runtime/cilk-sysdep.h])
-+AC_PREREQ(2.68)
- AM_INIT_AUTOMAKE(cilk, 5.4.6)
- AC_CANONICAL_HOST
-
-@@ -20,7 +20,7 @@
-
- dnl Checks for required programs.
- if test "$GCC" != "yes"; then
-- AC_ERROR("I cannot find gcc. gcc is required for Cilk to work.")
-+ AC_MSG_ERROR("I cannot find gcc. gcc is required for Cilk to work.")
- fi
-
- dnl Checks for libraries.
-diff -Nur cilk-5.4.6.orig/examples/Makefile.am cilk-5.4.6/examples/Makefile.am
---- cilk-5.4.6.orig/examples/Makefile.am 2012-11-12 21:18:50.370020112 -0800
-+++ cilk-5.4.6/examples/Makefile.am 2012-11-12 21:20:06.347380163 -0800
-@@ -5,13 +5,13 @@
- NPROC = 4
- PROGFLAGS = --nproc $(NPROC) --yield
-
--CILKFLAGS=@CFLAGS@
-+CILKFLAGS=-O2
- CILKCOMPILE = $(CILK) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CILKFLAGS) $(CILKFLAGS)
- CILKLD = $(CILK)
- CILKLINK = $(CILKLD) $(AM_CILKFLAGS) $(CILKFLAGS) $(PERFCTR_LIBS) $(LDFLAGS) -o $@
- LINK=$(CILKLINK)
-
--noinst_PROGRAMS=hello fib fib-serial testall ck magic knapsack queens \
-+check_PROGRAMS=hello fib fib-serial testall ck magic knapsack queens \
- cilksort fft test-locks bucket cholesky game nfib kalah matmul lu plu \
- heat test-errno strassen rectmul spacemul \
- test-void-func \
-@@ -58,7 +58,7 @@
- EXTRA_DIST = knapsack-example1.input knapsack-example2.input \
- knapsack-example3.input
-
--check: hello testall fft fib lu matmul cilksort heat test-locks test-errno
-+check-local: hello testall fft fib lu matmul cilksort heat test-locks test-errno
- @echo "Runnig Cilk tests. This will take a while."
- ./hello $(PROGFLAGS)
- ./test-void-func $(PROGFLAGS)
-diff -Nur cilk-5.4.6.orig/runtime/Makefile.am cilk-5.4.6/runtime/Makefile.am
---- cilk-5.4.6.orig/runtime/Makefile.am 2012-11-12 21:18:50.375020110 -0800
-+++ cilk-5.4.6/runtime/Makefile.am 2012-11-12 21:19:09.668111459 -0800
-@@ -1,5 +1,5 @@
- lib_LTLIBRARIES = libcilk.la libcilk.g.la libcilk.p.la libcilk.g.p.la
--pkglib_LIBRARIES = libcilkrt0.a libcilkrt0g.a libcilkrt0p.a libcilkrt0gp.a
-+lib_LIBRARIES = libcilkrt0.a libcilkrt0g.a libcilkrt0p.a libcilkrt0gp.a
-
- CILK_HFILES = cilk-cilk2c.h cilk.h cilk-lib.h cilk-lib.cilkh \
- gcc-builtin.h cilk-cilk2c-pre.h
-@@ -8,7 +8,7 @@
- cmdline.c internal-malloc.c timing.c invoke-main.c malloc.c debug.c \
- workers.c mutex.c
-
--pkginclude_HEADERS = $(CILK_HFILES) cilk-conf.h cilk-sysdep.h
-+include_HEADERS = $(CILK_HFILES) cilk-conf.h cilk-sysdep.h
-
- CILK_SRC = cilk-internal.h $(CILK_CFILES) $(CILK_HFILES)
- COMMON_LINK_FLAGS = -version-info 1:3:0 @PTHREAD_LIBS@
diff --git a/dev-lang/cilk/metadata.xml b/dev-lang/cilk/metadata.xml
deleted file mode 100644
index c8b5e5c42150..000000000000
--- a/dev-lang/cilk/metadata.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-
- sci@gentoo.org
- Gentoo Science Project
-
-
- Cilk is a language for multithreaded parallel programming based on
- ANSI C. Cilk is especially effective for exploiting dynamic, highly
- asynchronous parallelism, which can be difficult to write in data-parallel or
- message-passing style. Cilk provides an effective platform for
- programming dense and sparse numerical algorithms, such as matrix
- factorization and N-body simulations. Cilk is algorithmic, in that
- the runtime system employs a scheduler that allows the performance
- of programs to be estimated accurately based on abstract complexity
- measures.
-
-
diff --git a/dev-lang/erlang/Manifest b/dev-lang/erlang/Manifest
index f8981182d824..bfd421ded0e1 100644
--- a/dev-lang/erlang/Manifest
+++ b/dev-lang/erlang/Manifest
@@ -24,5 +24,5 @@ EBUILD erlang-23.1.4.ebuild 4604 BLAKE2B 94eb0cd161622bdaf13b9c4cd9d4f2ccca1a76a
EBUILD erlang-23.1.5.ebuild 4605 BLAKE2B d533ab1ab5061818c654521da41a2a20f46cc8f58d12c335a0ebf427f776cdd3ffecc18511e62a2f3d3a42ad5fe6fa7dbdb9b0a41e8b74660561406f35930393 SHA512 c220a9ff15a4dd08ff662972561575c98868eb506dbc2ef686509fbd5f892563289bb37c2f6269a030fb31c42c1f432909a4af656f1a1700070dacf1785cf1a9
EBUILD erlang-23.2.1.ebuild 4609 BLAKE2B b8ddf3bcd86dfb396a99e3209280b77e2ed8e1c5af99ddba34be0adf9b40bd58053bd254e1b52b4df6fe26e01e5ccb24c999ca4b4ddd4858488c78d79a06d684 SHA512 42d3fd1039bf50fe419a53aaa05d6c0602506e67b125049592881f732493851b07671b174e41cceb97334b2afa35bfd3ff89c70eb4e832bd8c2bdaba3f053fe6
EBUILD erlang-23.2.2.ebuild 4568 BLAKE2B afa013bfe43d1c6c8a9853f4ffaa3ce26095d5eba4dba1383f56ac0378fe1f3d73f2cfbfdb17df4c689764eaedcb349d65ea2b99aac67ff452f14a3d2d17be44 SHA512 7e8a5cb7c184d4e0ae500593764f6fbd9866e0ffc22c33359d0b2911b0b98a546da0998fb0aba17534e97ddb7ebc981f2e470c542378b0def45897383d26bd8a
-EBUILD erlang-23.2.ebuild 4609 BLAKE2B b8ddf3bcd86dfb396a99e3209280b77e2ed8e1c5af99ddba34be0adf9b40bd58053bd254e1b52b4df6fe26e01e5ccb24c999ca4b4ddd4858488c78d79a06d684 SHA512 42d3fd1039bf50fe419a53aaa05d6c0602506e67b125049592881f732493851b07671b174e41cceb97334b2afa35bfd3ff89c70eb4e832bd8c2bdaba3f053fe6
+EBUILD erlang-23.2.ebuild 4607 BLAKE2B 95463c58cf2ae3b4cb55a8fb9a755bfb0121c7daaf4c2424bb7a66ddb4071eb9d142f22e693f69baa006bd26da52a56975fe7cc2d714d6b7cd4a3050610fa768 SHA512 220b55d642602b2f94f93cc63993fd9151ebbe4c39e65a0c84b8f2d4da89fab87f13bb978ddbe421438f90b57c07328291d283d591e718ef766a81435fb39c3b
MISC metadata.xml 834 BLAKE2B 1f394278eed4a3ac5e1c04f4ffced7042cc910d9e84ed4ad955cf91240446410f0ffbf1c138cc76cfa55d40c0eb0f110da98cd49c59df2b12ae70c13afd45a06 SHA512 7c067d233ffae83e4b1b55ba9e8adffe125d27f5f81401a4e4262d9b713b08bdaa4dd927570b2d32591092ca387372ee206e25e0b939ca721c96317fcd3d2be2
diff --git a/dev-lang/erlang/erlang-23.2.ebuild b/dev-lang/erlang/erlang-23.2.ebuild
index e266bd5246c6..a18718fcf2a2 100644
--- a/dev-lang/erlang/erlang-23.2.ebuild
+++ b/dev-lang/erlang/erlang-23.2.ebuild
@@ -22,7 +22,7 @@ LICENSE="Apache-2.0"
# same build of ERTS that was used when compiling the code. See
# http://erlang.org/doc/system_principles/misc.html for more information.
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
IUSE="doc emacs +hipe java +kpoll libressl odbc sctp ssl systemd tk wxwidgets"
RDEPEND="
diff --git a/dev-lang/go/Manifest b/dev-lang/go/Manifest
index 4b28bcd16f05..82298aa070f5 100644
--- a/dev-lang/go/Manifest
+++ b/dev-lang/go/Manifest
@@ -1,11 +1,7 @@
AUX go-sets.conf 313 BLAKE2B 03e94776e317d34b72bfb8385b8b0dfa6a599a6086e4d0c9214e7b49293768947c21d9afb323ffcc7fd85ba0af72d9cb243dbb571eee9eb81de9400fd5f5e79c SHA512 7d01b98bc8d1b609183682dd942bd4c9fa757a98243c7de3cf6c497c7bc20b8cdbe59dd669ce4bb11f914a0e9b6d100e65cea2dffd99f38be50b18e0ecf66315
-DIST go1.14.12.src.tar.gz 22553834 BLAKE2B f2b3f750cc451c00376846962a5337c8e57aa9f4f737c7a8ab826772547ca0677bb3c6e52d004259f7e53d49efb013f645ce5223241fd29b35121149dc09a76c SHA512 cba26b97878d5bd57d75bd1541932786779ddb7e9fa0bfb7bf003c7ae9e7bee8318c0d2108ce918453b863892b8f562e481bd0ed6cfc44e43d901522603adff2
DIST go1.14.13.src.tar.gz 22553900 BLAKE2B 35aed1c43a59e06c1d5feaa91a6c4120c586958257cb3e4f83ab4e767159e20ae953d70bc0debabd80722bca0965d1b129531a2bd89f558df0a8700cadc09edc SHA512 b54a0bc3b85809a78d4704fe2e97ad7417a2027608ec0f90c2784e2ddb28b505df3cda862dc6f1b99af2d136363cbb9b120e2fd6ed985cb300c43f8e539a5e28
-DIST go1.15.5.src.tar.gz 23019303 BLAKE2B 549f0e9c4e22432db7a1c6e06724d6ada0ac90c09c0886d3053296390d85686df89bcaff86c703e8a2789119f670ffb2c6c11f4bf7e186c14a75896e8e6b8c6e SHA512 8e1d71f628d364b949b1e124af8950a563bbe9d9ae73b94c66af6ce029f67c26e2654556c0c118d0bc8566af52a7e9ed736b4667bbef7ccdab2bd338c43e6eb4
DIST go1.15.6.src.tar.gz 23019337 BLAKE2B d328401af9843f4a099dee7d82433ad2a0b349add0f2ecb609635814cca610e17a6fc50215e9928b8cb0d8ea8dd6ae9d84ffca125e1362dfb18ba08783bb4264 SHA512 f20e495204f32170d6554e8f4b64763dae8302a7859005020f650d1d53a5b15de3afbaff28e0b6418287396166c67bdc4c6bee7a0fd7ba8a87bb79b6c1d38326
-EBUILD go-1.14.12.ebuild 4816 BLAKE2B fdef3a598cfb56afcea723bf4be7fe2e2603273631ffc3add513902f6e171f090a7154870ef7e0e9c937e96c6a17bba03b2c26fc7aafb715468f13f65b6c64d5 SHA512 558e7511ab18d58cf026dd841f5ce37b4fcc6a99a6eb4dadd0a0d32eda9eb00d5404de9f5bbba321763cd5ee2abb027137fe74e39ce6a874f3c4036b86621c08
-EBUILD go-1.14.13-r1.ebuild 4916 BLAKE2B 3dd0e046cb11660c20f846356e08ebf4c8a3d2ed2c4f732462db8c543b908ea870b1d2b42d57161b5c8396c8cb0b16ee71634741f697d01fd2a4d9015208b95d SHA512 6d89d24b1766703a18f3726584e7603f2373630533cfee5961a7fb3ab167e5051664238d6268eeb6866805c375730a5e4635388d900edb05b6b8b37432d0e435
-EBUILD go-1.15.5.ebuild 4816 BLAKE2B fdef3a598cfb56afcea723bf4be7fe2e2603273631ffc3add513902f6e171f090a7154870ef7e0e9c937e96c6a17bba03b2c26fc7aafb715468f13f65b6c64d5 SHA512 558e7511ab18d58cf026dd841f5ce37b4fcc6a99a6eb4dadd0a0d32eda9eb00d5404de9f5bbba321763cd5ee2abb027137fe74e39ce6a874f3c4036b86621c08
-EBUILD go-1.15.6-r1.ebuild 4916 BLAKE2B 3dd0e046cb11660c20f846356e08ebf4c8a3d2ed2c4f732462db8c543b908ea870b1d2b42d57161b5c8396c8cb0b16ee71634741f697d01fd2a4d9015208b95d SHA512 6d89d24b1766703a18f3726584e7603f2373630533cfee5961a7fb3ab167e5051664238d6268eeb6866805c375730a5e4635388d900edb05b6b8b37432d0e435
-EBUILD go-9999.ebuild 4921 BLAKE2B d70f9c7cc9d4c2c43db62dfd59bb0f60a75dc056f552f406210011bd96e602397bcc6bb683b7f5fb39ece2c1ec7088e02a8e39fa01da1e279cb178682429523e SHA512 81b2653ac9499ac418bbb0daa4fd11bae0afa7bffa11f129aee7a78aac4ed0837f099f0ce14b51ea0a512419b5b337450b890fff542ad5e1a2068af3b95fd759
+EBUILD go-1.14.13-r1.ebuild 4574 BLAKE2B c9833658e5cd6f2a032663144aaf037d72a9175da16c4ca2562b49030d434335c9a981761c7ba13217bc3e80805eb127a6a16705fdacc681017a67f96235c20d SHA512 ff8b197a487280639b7e687a823277e260da97ce44d12ccbdbda00d25cb6dbae2b683b34ea8eceb3a98f368bd5fe6eb18f37b4ebd3bab10c2536c85334809122
+EBUILD go-1.15.6-r1.ebuild 4574 BLAKE2B c9833658e5cd6f2a032663144aaf037d72a9175da16c4ca2562b49030d434335c9a981761c7ba13217bc3e80805eb127a6a16705fdacc681017a67f96235c20d SHA512 ff8b197a487280639b7e687a823277e260da97ce44d12ccbdbda00d25cb6dbae2b683b34ea8eceb3a98f368bd5fe6eb18f37b4ebd3bab10c2536c85334809122
+EBUILD go-9999.ebuild 4579 BLAKE2B c19b3d07e84df70393c8242eb825444436b97d591b214bf1fbd6d265ac0e276fd147d1cfa96e61b1e33468d56eb355cdeda807af7beaa0b3fdcb2f1d1f989374 SHA512 768d17b68de2925267e8274f9e216cd5f79c13be54cb986d0126ab85beaaaa4e46d8ca18422786ee09813b4707aafc6695df815e234fa330dc0211c2ebd398d3
MISC metadata.xml 462 BLAKE2B d9d4280e921286791a55619a7e5557c7041b0de157aa0f8bf6f17cf5041f802df4037270eeb3e8d37263f9fc17939c619a0dd3bce449c5f247279884da10bf67 SHA512 26fa7bfe26f00e8e1766cc0a1052fb8b5352799a33c9eb8f0c4f4523601d3eb5d1da8adc4b731f0d778039788734a9ad483f22e58e4bf1551ec8e9dccbcb87ba
diff --git a/dev-lang/go/go-1.14.12.ebuild b/dev-lang/go/go-1.14.12.ebuild
deleted file mode 100644
index 7c0569dd4b05..000000000000
--- a/dev-lang/go/go-1.14.12.ebuild
+++ /dev/null
@@ -1,203 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-
-MY_PV=${PV/_/}
-
-inherit toolchain-funcs
-
-case ${PV} in
-*9999*)
- EGIT_REPO_URI="https://github.com/golang/go.git"
- inherit git-r3
- ;;
-*)
- SRC_URI="https://storage.googleapis.com/golang/go${MY_PV}.src.tar.gz "
- S="${WORKDIR}"/go
- case ${PV} in
- *_beta*|*_rc*) ;;
- *)
- KEYWORDS="-* amd64 arm arm64 ppc64 ~s390 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
- ;;
- esac
-esac
-
-DESCRIPTION="A concurrent garbage collected and typesafe programming language"
-HOMEPAGE="https://golang.org"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-
-BDEPEND="|| (
- dev-lang/go
- dev-lang/go-bootstrap )"
-RDEPEND="!=x11-libs/cairo-1.10.0 )
- glut? ( media-libs/freeglut )
- odbc? ( dev-db/unixODBC )
- iodbc? ( !odbc? ( dev-db/libiodbc ) )
- ncurses? ( sys-libs/ncurses:= )
- opengl? (
- virtual/opengl
- virtual/glu
- )
- tcl? ( tk? (
- dev-lang/tcl:0
- dev-lang/tk:0
- x11-libs/libX11
- x11-libs/libXmu
- )
- )"
-
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}"/${MY_P}/extras
-
-mercury_pkgs()
-{
- echo "base64
- cgi
- complex_numbers
- dynamic_linking
- error
- fixed
- lex
- moose
- posix
- solver_types/library
- $(use ncurses && echo curs curses)
- $(use glut && echo graphics/mercury_glut)
- $(use opengl && echo graphics/mercury_opengl)
- $(use tcl && use tk && echo graphics/mercury_tcltk)
- $(use odbc && echo odbc || (use iodbc && echo odbc) )
- $(has_version dev-lang/mercury[trail] && echo references)
- $(usev xml)"
-}
-
-src_prepare() {
- cd "${WORKDIR}"
-
- EPATCH_FORCE=yes
- EPATCH_SUFFIX=patch
- if [[ -d "${WORKDIR}"/${PV} ]] ; then
- epatch "${WORKDIR}"/${PV}
- fi
-
- cd "${S}"
- if use odbc; then
- cp odbc/Mmakefile.odbc odbc/Mmakefile
- elif use iodbc; then
- cp odbc/Mmakefile.iodbc odbc/Mmakefile
- fi
-}
-
-src_compile() {
- local MERCURY_PKGS="$(mercury_pkgs)"
-
- # Mercury dependency generation must be run single-threaded
- mmake -j1 \
- SUBDIRS="${MERCURY_PKGS}" \
- depend || die "mmake depend failed"
-
- # Compiling Mercury submodules is not thread-safe
- mmake -j1 \
- SUBDIRS="${MERCURY_PKGS}" \
- EXTRA_MLFLAGS=--no-strip \
- EXTRA_CFLAGS="${CFLAGS}" \
- EXTRA_LDFLAGS="${LDFLAGS} -L/usr/$(get_libdir)" \
- EXTRA_LD_LIBFLAGS="${LDFLAGS} -L/usr/$(get_libdir)" \
- || die "mmake failed"
-
- if use cairo; then
- cd "${S}"/graphics/mercury_cairo
- mmc --make libmercury_cairo \
- || die "mmc --make libmercury_cairo failed"
- fi
-}
-
-src_install() {
- local MERCURY_PKGS="$(mercury_pkgs)"
-
- # Compiling Mercury submodules is not thread-safe
- mmake -j1 \
- SUBDIRS="${MERCURY_PKGS}" \
- EXTRA_MLFLAGS=--no-strip \
- EXTRA_CFLAGS="${CFLAGS}" \
- EXTRA_LDFLAGS="${LDFLAGS} -L/usr/$(get_libdir)" \
- EXTRA_LD_LIBFLAGS="${LDFLAGS} -L/usr/$(get_libdir)" \
- DESTDIR="${D}" \
- INSTALL_PREFIX="${D}"/usr \
- install || die "mmake install failed"
-
- if use cairo; then
- cd "${S}"/graphics/mercury_cairo
- INSTALL_PREFIX="${D}"/usr \
- mmc --make libmercury_cairo.install \
- || die "mmc --make libmercury_cairo.install failed"
- fi
-
- find "${D}"/usr/$(get_libdir)/mercury -type l | xargs rm
-
- cd "${S}"
- if use examples; then
- insinto /usr/share/doc/${PF}/samples/base64
- doins base64/*.m
-
- insinto /usr/share/doc/${PF}/samples/complex_numbers
- doins complex_numbers/samples/*
-
- insinto /usr/share/doc/${PF}/samples/dynamic_linking
- doins dynamic_linking/hello.m
-
- insinto /usr/share/doc/${PF}/samples/error
- doins error/*
-
- insinto /usr/share/doc/${PF}/samples/fixed
- doins fixed/*.m
-
- insinto /usr/share/doc/${PF}/samples/gator
- doins -r gator/*
-
- insinto /usr/share/doc/${PF}/samples/lex
- doins lex/samples/*
-
- insinto /usr/share/doc/${PF}/samples/log4m
- doins log4m/*.m
-
- insinto /usr/share/doc/${PF}/samples/monte
- doins monte/*.m
-
- insinto /usr/share/doc/${PF}/samples/moose
- doins moose/samples/*
-
- insinto /usr/share/doc/${PF}/samples/net
- doins net/*.m
-
- if use ncurses; then
- insinto /usr/share/doc/${PF}/samples/curs
- doins curs/samples/*
-
- insinto /usr/share/doc/${PF}/samples/curses
- doins curses/sample/*
- fi
-
- if use X; then
- insinto /usr/share/doc/${PF}/samples/graphics
- doins graphics/easyx/samples/*.m
- fi
-
- if use glut && use opengl; then
- insinto /usr/share/doc/${PF}/samples/graphics
- doins graphics/samples/calc/*
- doins graphics/samples/gears/*
- doins graphics/samples/maze/*
- doins graphics/samples/pent/*
- fi
-
- if use opengl && use tcl && use tk; then
- insinto /usr/share/doc/${PF}/samples/graphics
- doins graphics/samples/pent/*.m
- fi
-
- if use ssl; then
- insinto /usr/share/doc/${PF}/samples/mopenssl
- doins mopenssl/*.m
- fi
-
- ecvs_clean
- fi
-
- dodoc README
-}
diff --git a/dev-lang/mercury-extras/mercury-extras-20.01.1.ebuild b/dev-lang/mercury-extras/mercury-extras-20.01.1.ebuild
deleted file mode 100644
index 7595eae754b7..000000000000
--- a/dev-lang/mercury-extras/mercury-extras-20.01.1.ebuild
+++ /dev/null
@@ -1,317 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit eutils multilib vcs-clean
-
-PATCHSET_VER="0"
-MY_P=mercury-srcdist-${PV}
-
-DESCRIPTION="Additional libraries and tools that are not part of the Mercury standard library"
-HOMEPAGE="http://www.mercurylang.org/index.html"
-SRC_URI="http://dl.mercurylang.org/release/${MY_P}.tar.gz
- mirror://gentoo/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="cairo examples glut gmp iodbc ncurses odbc opengl ssl tk tommath X xml"
-REQUIRED_USE="?? ( odbc iodbc )"
-
-RDEPEND="
- ~dev-lang/mercury-${PV}
- cairo? ( >=x11-libs/cairo-1.10.0 )
- gmp? ( dev-libs/gmp:0 )
- glut? ( media-libs/freeglut )
- odbc? ( dev-db/unixODBC )
- iodbc? ( dev-db/libiodbc )
- tommath? ( dev-libs/libtommath )
- ncurses? ( sys-libs/ncurses:= )
- opengl? (
- virtual/opengl
- virtual/glu
- )
- tk? (
- dev-lang/tcl:0
- dev-lang/tk:0
- )
- X? ( x11-libs/libX11 )"
-
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}"/${MY_P}/extras
-
-mercury_pkgs() {
- echo "
- align_right/align_right:bin:
- base64/mercury_base64:lib:
- cgi/mercury_www:lib:
- complex_numbers/complex_numbers:lib:
- $(use ncurses && echo \
- curs/curs:lib:ncurses,panel curses/mcurses:lib:ncurses)
- dynamic_linking/dl:lib:
- error/error:bin:
- fixed/fixed:lib:
- $(use gmp && echo gmp_int/gmp_int:lib:)
- $(use tommath && echo mp_int/mp_int:lib:libtommath)
- $(use X && echo graphics/easyx/easyx:lib:x11)
- $(use cairo && echo graphics/mercury_cairo/mercury_cairo:lib:cairo)
- $(use glut && echo graphics/mercury_glut/mercury_glut:lib:freeglut)
- $(use opengl && echo graphics/mercury_opengl/mercury_opengl:lib:gl,glu)
- $(use tk && echo graphics/mercury_tcltk/mercury_tcltk:lib:tk)
- lex/lex:lib:
- lex/regex:lib:
- moose/moose:bin:
- net/net:lib:
- net/echo:bin:
- $(use ssl && echo mopenssl/mopenssl:lib:openssl)
- $(use odbc && echo odbc/odbc:lib:)
- $(use iodbc && echo odbc/odbc:lib:libiodbc)
- posix/posix:lib:
- $(has_version dev-lang/mercury[trail] && echo \
- references/global:lib: trailed_update/trailed_update:lib:)
- show_ops/show_ops:bin:
- solver_types/library/any:lib:
- $(use xml && echo xml/xml:lib:)"
-}
-
-mercury_pkg_setup() {
- mercury_pkg=${1%%:*}
- mercury_pkg_dir=${mercury_pkg%/*}
- mercury_pkg_name=${mercury_pkg##*/}
-
- mercury_pkg_atts=${1#*:}
- mercury_pkg_type=${mercury_pkg_atts%%:*}
- mercury_pkg_deps=${mercury_pkg_atts#*:}
-
- cd "${S}"/${mercury_pkg_dir} || die
-
- echo ">> Preparing Mercury package: ${mercury_pkg}"
-
- if ! test -f "${S}"/${mercury_pkg_dir}/gentoo.params; then
- echo "LIBGRADES := \$(filter-out java,\$(LIBGRADES))" \
- > "${S}"/${mercury_pkg_dir}/gentoo.params
- echo "LIBGRADES := \$(filter-out erlang,\$(LIBGRADES))" \
- >> "${S}"/${mercury_pkg_dir}/gentoo.params
- echo "LIBGRADES := \$(filter-out csharp,\$(LIBGRADES))" \
- >> "${S}"/${mercury_pkg_dir}/gentoo.params
- echo "include gentoo.params" > "${S}"/${mercury_pkg_dir}/Mmakefile
- fi
-
- if test -n "$mercury_pkg_deps"; then
- echo "EXTRA_CFLAGS += $(pkg-config --cflags ${mercury_pkg_deps/,/ })" \
- >> "${S}"/${mercury_pkg_dir}/gentoo.params
- echo "EXTRA_MLLIBS += $(pkg-config --libs ${mercury_pkg_deps/,/ })" \
- >> "${S}"/${mercury_pkg_dir}/gentoo.params
- fi
-
- if test ${mercury_pkg_name} = dl; then
- echo "EXTRA_MLLIBS = -ldl" >> "${S}"/${mercury_pkg_dir}/gentoo.params
- elif test ${mercury_pkg_name} = gmp_int; then
- echo "EXTRA_MLLIBS = -lgmp" >> "${S}"/${mercury_pkg_dir}/gentoo.params
- elif test ${mercury_pkg_name} = mercury_tcltk; then
- echo "EXTRA_CFLAGS += -DUSE_INTERP_RESULT" \
- >> "${S}"/${mercury_pkg_dir}/gentoo.params
- elif test ${mercury_pkg_name} = mopenssl; then
- local net_libdir="${D}/usr/$(get_libdir)/mercury/extras/lib/\$(GRADE)"
- echo "EXTRA_MLLIBS += -L${net_libdir} -L../net -lnet" \
- >> "${S}"/${mercury_pkg_dir}/gentoo.params
- echo "net%:" >> "${S}"/${mercury_pkg_dir}/gentoo.params
- echo " cp ../net/\$@ \$@" >> "${S}"/${mercury_pkg_dir}/gentoo.params
- elif test ${mercury_pkg_name} = odbc && use odbc; then
- echo "EXTRA_CFLAGS = -DMODBC_UNIX -DMODBC_MYSQL" \
- >> "${S}"/${mercury_pkg_dir}/Mmakefile
- echo "EXTRA_MLLIBS = -lodbc" >> "${S}"/${mercury_pkg_dir}/gentoo.params
- elif test ${mercury_pkg_name} = odbc && use iodbc; then
- echo "EXTRA_CFLAGS += -DMODBC_IODBC -DMODBC_MYSQL" \
- >> "${S}"/${mercury_pkg_dir}/gentoo.params
- fi
-}
-
-mercury_pkg_compile() {
- mercury_pkg=${1%%:*}
- mercury_pkg_dir=${mercury_pkg%/*}
- mercury_pkg_name=${mercury_pkg##*/}
-
- mercury_pkg_atts=${1#*:}
- mercury_pkg_type=${mercury_pkg_atts%:*}
-
- cd "${S}"/${mercury_pkg_dir} || die
-
- echo ">> Compiling Mercury package: ${mercury_pkg}"
-
- if test "${mercury_pkg_type}" = "bin"; then
- mercury_mmc_target=${mercury_pkg_name}
- else
- mercury_mmc_target=lib${mercury_pkg_name}
- fi
-
- # Mercury dependency generation must be run single-threaded
- mmc -f *.m || die "mmc -f .m failed"
- mmake -j1 \
- ${mercury_pkg_name}.depend \
- || die "mmake ${mercury_pkg} depend failed"
-
- # Compiling Mercury submodules is not thread-safe
- mmake -j1 \
- MLFLAGS=--no-strip \
- CFLAGS="${CFLAGS}" \
- LD_LIBFLAGS="${LDFLAGS}" \
- ${mercury_mmc_target} || die "mmake ${mercury_pkg} failed"
-
-}
-
-mercury_pkg_install() {
- mercury_pkg=${1%%:*}
- mercury_pkg_dir=${mercury_pkg%/*}
- mercury_pkg_name=${mercury_pkg##*/}
-
- mercury_pkg_atts=${1#*:}
- mercury_pkg_type=${mercury_pkg_atts%:*}
-
- cd "${S}"/${mercury_pkg_dir} || die
-
- echo ">> Installing Mercury package: ${mercury_pkg}"
-
- if test "${mercury_pkg_type}" = "bin"; then
- into /usr/$(get_libdir)/mercury/extras
- dobin ${mercury_pkg_name}
- else
- # Compiling Mercury submodules is not thread-safe
- mmake -j1 \
- MLFLAGS=--no-strip \
- CFLAGS="${CFLAGS}" \
- LD_LIBFLAGS="${LDFLAGS}" \
- INSTALL_LIBDIR="${D}/usr/$(get_libdir)/mercury/extras" \
- lib${mercury_pkg_name}.install || die "mmake ${mercury_pkg} failed"
- fi
-}
-
-src_prepare() {
- cd "${WORKDIR}"/${MY_P}
- if [[ -d "${WORKDIR}"/${PV} ]] ; then
- eapply "${WORKDIR}"/${PV}
- fi
- eapply_user
-
- cd "${S}"
- for mercury_pkg in $(mercury_pkgs); do
- mercury_pkg_setup ${mercury_pkg}
- done
-}
-
-src_compile() {
- for mercury_pkg in $(mercury_pkgs); do
- mercury_pkg_compile ${mercury_pkg}
- done
-}
-
-src_install() {
- for mercury_pkg in $(mercury_pkgs); do
- mercury_pkg_install ${mercury_pkg}
- done
-
- cd "${S}"
- dodoc README
-
- if use examples; then
- docinto samples/cgi
- dodoc cgi/form_test.m
-
- docinto samples/complex_numbers
- dodoc complex_numbers/samples/*.m
-
- if use ncurses; then
- docinto samples/curs
- dodoc curs/samples/*.m
-
- docinto samples/curses
- dodoc curses/sample/*.m
- fi
-
- docinto samples/dynamic_linking
- dodoc dynamic_linking/{hello,dl_test}.m
-
- docinto samples/gator
- dodoc -r gator/*
-
- if use gmp; then
- docinto samples/gmp_int
- dodoc gmp_int/gmp_int_test.m
- fi
-
- if use tommath; then
- docinto samples/mp_int
- dodoc mp_int/mp_int_test.m
- fi
-
- if use X; then
- docinto samples/graphics
- dodoc graphics/easyx/samples/*.m
- fi
-
- if use glut && use opengl; then
- docinto samples/graphics
- dodoc graphics/samples/gears/*.m
- dodoc graphics/samples/maze/*.m
- fi
-
- if use tk; then
- docinto samples/graphics
- dodoc graphics/samples/calc/*.m
- fi
-
- if use opengl && use tk; then
- docinto samples/graphics
- dodoc graphics/samples/pent/*.m
- fi
-
- docinto samples/lex
- dodoc lex/samples/*.m
-
- docinto samples/log4m
- dodoc log4m/*.m
-
- docinto samples/monte
- dodoc monte/*.m
-
- docinto samples/moose
- dodoc moose/samples/*
-
- docinto samples/net
- dodoc net/test_lookups.m
-
- if use odbc || use iodbc; then
- docinto samples/odbc
- dodoc odbc/odbc_test.m
- fi
-
- docinto samples/posix
- dodoc posix/samples/*.m
-
- docinto samples/random
- dodoc random/*.m
-
- if has_version dev-lang/mercury[trail]; then
- docinto samples/references
- dodoc references/samples/*.m
-
- docinto samples/trail
- dodoc trail/*.m
-
- docinto samples/trailed_update
- dodoc trailed_update/samples/*.m
- fi
-
- if use xml; then
- docinto samples/xml
- dodoc xml/tryit.m
- dodoc xml/samples/*
- dodoc xml_stylesheets/*.xsl
- fi
-
- ecvs_clean
- fi
-}
diff --git a/dev-lang/mercury-extras/mercury-extras-20.01.2.ebuild b/dev-lang/mercury-extras/mercury-extras-20.01.2.ebuild
deleted file mode 100644
index bce2fa7c29f2..000000000000
--- a/dev-lang/mercury-extras/mercury-extras-20.01.2.ebuild
+++ /dev/null
@@ -1,319 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit eutils multilib vcs-clean
-
-PATCHSET_VER="1"
-MY_P=mercury-srcdist-${PV}
-
-DESCRIPTION="Additional libraries and tools that are not part of the Mercury standard library"
-HOMEPAGE="https://www.mercurylang.org/index.html"
-SRC_URI="https://dl.mercurylang.org/release/${MY_P}.tar.gz
- https://dev.gentoo.org/~keri/distfiles/mercury-extras/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="cairo examples glut gmp iodbc ncurses odbc opengl ssl tk tommath X xml"
-REQUIRED_USE="?? ( odbc iodbc )"
-
-RDEPEND="
- ~dev-lang/mercury-${PV}
- cairo? ( >=x11-libs/cairo-1.10.0 )
- gmp? ( dev-libs/gmp:0 )
- glut? ( media-libs/freeglut )
- odbc? ( dev-db/unixODBC )
- iodbc? ( dev-db/libiodbc )
- tommath? ( dev-libs/libtommath )
- ncurses? ( sys-libs/ncurses:= )
- opengl? (
- virtual/opengl
- virtual/glu
- )
- tk? (
- dev-lang/tcl:0
- dev-lang/tk:0
- )
- X? ( x11-libs/libX11 )"
-
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}"/${MY_P}/extras
-
-mercury_pkgs() {
- echo "
- align_right/align_right:bin:
- base64/mercury_base64:lib:
- cgi/mercury_www:lib:
- complex_numbers/complex_numbers:lib:
- $(use ncurses && echo \
- curs/curs:lib:ncurses,panel curses/mcurses:lib:ncurses)
- dynamic_linking/dl:lib:
- error/error:bin:
- fixed/fixed:lib:
- $(use gmp && echo gmp_int/gmp_int:lib:)
- $(use tommath && echo mp_int/mp_int:lib:libtommath)
- $(use X && echo graphics/easyx/easyx:lib:x11)
- $(use cairo && echo graphics/mercury_cairo/mercury_cairo:lib:cairo)
- $(use glut && echo graphics/mercury_glut/mercury_glut:lib:freeglut)
- $(use opengl && echo graphics/mercury_opengl/mercury_opengl:lib:gl,glu)
- $(use tk && echo graphics/mercury_tcltk/mercury_tcltk:lib:tk)
- lex/lex:lib:
- lex/regex:lib:
- moose/moose:bin:
- net/net:lib:
- net/echo:bin:
- $(use ssl && echo mopenssl/mopenssl:lib:openssl)
- $(use odbc && echo odbc/odbc:lib:)
- $(use iodbc && echo odbc/odbc:lib:libiodbc)
- posix/posix:lib:
- $(has_version dev-lang/mercury[trail] && echo \
- references/global:lib: trailed_update/trailed_update:lib:)
- show_ops/show_ops:bin:
- solver_types/library/any:lib:
- $(use xml && echo xml/xml:lib:)"
-}
-
-mercury_pkg_setup() {
- mercury_pkg=${1%%:*}
- mercury_pkg_dir=${mercury_pkg%/*}
- mercury_pkg_name=${mercury_pkg##*/}
-
- mercury_pkg_atts=${1#*:}
- mercury_pkg_type=${mercury_pkg_atts%%:*}
- mercury_pkg_deps=${mercury_pkg_atts#*:}
-
- cd "${S}"/${mercury_pkg_dir} || die
-
- echo ">> Preparing Mercury package: ${mercury_pkg}"
-
- if ! test -f "${S}"/${mercury_pkg_dir}/gentoo.params; then
- echo "LIBGRADES := \$(filter-out java,\$(LIBGRADES))" \
- > "${S}"/${mercury_pkg_dir}/gentoo.params
- echo "LIBGRADES := \$(filter-out erlang,\$(LIBGRADES))" \
- >> "${S}"/${mercury_pkg_dir}/gentoo.params
- echo "LIBGRADES := \$(filter-out csharp,\$(LIBGRADES))" \
- >> "${S}"/${mercury_pkg_dir}/gentoo.params
- echo "include gentoo.params" > "${S}"/${mercury_pkg_dir}/Mmakefile
- fi
-
- if test -n "$mercury_pkg_deps"; then
- echo "EXTRA_CFLAGS += $(pkg-config --cflags ${mercury_pkg_deps/,/ })" \
- >> "${S}"/${mercury_pkg_dir}/gentoo.params
- echo "EXTRA_MLLIBS += $(pkg-config --libs ${mercury_pkg_deps/,/ })" \
- >> "${S}"/${mercury_pkg_dir}/gentoo.params
- fi
-
- if test ${mercury_pkg_name} = dl; then
- echo "EXTRA_MLLIBS = -ldl" >> "${S}"/${mercury_pkg_dir}/gentoo.params
- elif test ${mercury_pkg_name} = gmp_int; then
- echo "EXTRA_MLLIBS = -lgmp" >> "${S}"/${mercury_pkg_dir}/gentoo.params
- elif test ${mercury_pkg_name} = mercury_tcltk; then
- echo "EXTRA_CFLAGS += -DUSE_INTERP_RESULT" \
- >> "${S}"/${mercury_pkg_dir}/gentoo.params
- elif test ${mercury_pkg_name} = mopenssl; then
- local net_libdir="${D}/usr/$(get_libdir)/mercury/extras/lib/\$(GRADE)"
- echo "EXTRA_MLLIBS += -L${net_libdir} -L../net -lnet" \
- >> "${S}"/${mercury_pkg_dir}/gentoo.params
- echo "net%:" >> "${S}"/${mercury_pkg_dir}/gentoo.params
- echo " cp ../net/\$@ \$@" >> "${S}"/${mercury_pkg_dir}/gentoo.params
- elif test ${mercury_pkg_name} = odbc && use odbc; then
- echo "EXTRA_CFLAGS = -DMODBC_UNIX -DMODBC_MYSQL" \
- >> "${S}"/${mercury_pkg_dir}/Mmakefile
- echo "EXTRA_MLLIBS = -lodbc" >> "${S}"/${mercury_pkg_dir}/gentoo.params
- elif test ${mercury_pkg_name} = odbc && use iodbc; then
- echo "EXTRA_CFLAGS += -DMODBC_IODBC -DMODBC_MYSQL" \
- >> "${S}"/${mercury_pkg_dir}/gentoo.params
- fi
-}
-
-mercury_pkg_compile() {
- mercury_pkg=${1%%:*}
- mercury_pkg_dir=${mercury_pkg%/*}
- mercury_pkg_name=${mercury_pkg##*/}
-
- mercury_pkg_atts=${1#*:}
- mercury_pkg_type=${mercury_pkg_atts%:*}
-
- cd "${S}"/${mercury_pkg_dir} || die
-
- echo ">> Compiling Mercury package: ${mercury_pkg}"
-
- if test "${mercury_pkg_type}" = "bin"; then
- mercury_mmc_target=${mercury_pkg_name}
- else
- mercury_mmc_target=lib${mercury_pkg_name}
- fi
-
- # Mercury dependency generation must be run single-threaded
- mmc -f *.m || die "mmc -f .m failed"
- mmake -j1 \
- ${mercury_pkg_name}.depend \
- || die "mmake ${mercury_pkg} depend failed"
-
- # Compiling Mercury submodules is not thread-safe
- mmake -j1 \
- MLFLAGS=--no-strip \
- CFLAGS="${CFLAGS}" \
- LDFLAGS="${LDFLAGS}" \
- LD_LIBFLAGS="${LDFLAGS}" \
- ${mercury_mmc_target} || die "mmake ${mercury_pkg} failed"
-
-}
-
-mercury_pkg_install() {
- mercury_pkg=${1%%:*}
- mercury_pkg_dir=${mercury_pkg%/*}
- mercury_pkg_name=${mercury_pkg##*/}
-
- mercury_pkg_atts=${1#*:}
- mercury_pkg_type=${mercury_pkg_atts%:*}
-
- cd "${S}"/${mercury_pkg_dir} || die
-
- echo ">> Installing Mercury package: ${mercury_pkg}"
-
- if test "${mercury_pkg_type}" = "bin"; then
- into /usr/$(get_libdir)/mercury/extras
- dobin ${mercury_pkg_name}
- else
- # Compiling Mercury submodules is not thread-safe
- mmake -j1 \
- MLFLAGS=--no-strip \
- CFLAGS="${CFLAGS}" \
- LDFLAGS="${LDFLAGS}" \
- LD_LIBFLAGS="${LDFLAGS}" \
- INSTALL_LIBDIR="${D}/usr/$(get_libdir)/mercury/extras" \
- lib${mercury_pkg_name}.install || die "mmake ${mercury_pkg} failed"
- fi
-}
-
-src_prepare() {
- cd "${WORKDIR}"/${MY_P}
- if [[ -d "${WORKDIR}"/${PV} ]] ; then
- eapply "${WORKDIR}"/${PV}
- fi
- eapply_user
-
- cd "${S}"
- for mercury_pkg in $(mercury_pkgs); do
- mercury_pkg_setup ${mercury_pkg}
- done
-}
-
-src_compile() {
- for mercury_pkg in $(mercury_pkgs); do
- mercury_pkg_compile ${mercury_pkg}
- done
-}
-
-src_install() {
- for mercury_pkg in $(mercury_pkgs); do
- mercury_pkg_install ${mercury_pkg}
- done
-
- cd "${S}"
- dodoc README
-
- if use examples; then
- docinto samples/cgi
- dodoc cgi/form_test.m
-
- docinto samples/complex_numbers
- dodoc complex_numbers/samples/*.m
-
- if use ncurses; then
- docinto samples/curs
- dodoc curs/samples/*.m
-
- docinto samples/curses
- dodoc curses/sample/*.m
- fi
-
- docinto samples/dynamic_linking
- dodoc dynamic_linking/{hello,dl_test}.m
-
- docinto samples/gator
- dodoc -r gator/*
-
- if use gmp; then
- docinto samples/gmp_int
- dodoc gmp_int/gmp_int_test.m
- fi
-
- if use tommath; then
- docinto samples/mp_int
- dodoc mp_int/mp_int_test.m
- fi
-
- if use X; then
- docinto samples/graphics
- dodoc graphics/easyx/samples/*.m
- fi
-
- if use glut && use opengl; then
- docinto samples/graphics
- dodoc graphics/samples/gears/*.m
- dodoc graphics/samples/maze/*.m
- fi
-
- if use tk; then
- docinto samples/graphics
- dodoc graphics/samples/calc/*.m
- fi
-
- if use opengl && use tk; then
- docinto samples/graphics
- dodoc graphics/samples/pent/*.m
- fi
-
- docinto samples/lex
- dodoc lex/samples/*.m
-
- docinto samples/log4m
- dodoc log4m/*.m
-
- docinto samples/monte
- dodoc monte/*.m
-
- docinto samples/moose
- dodoc moose/samples/*
-
- docinto samples/net
- dodoc net/test_lookups.m
-
- if use odbc || use iodbc; then
- docinto samples/odbc
- dodoc odbc/odbc_test.m
- fi
-
- docinto samples/posix
- dodoc posix/samples/*.m
-
- docinto samples/random
- dodoc random/*.m
-
- if has_version dev-lang/mercury[trail]; then
- docinto samples/references
- dodoc references/samples/*.m
-
- docinto samples/trail
- dodoc trail/*.m
-
- docinto samples/trailed_update
- dodoc trailed_update/samples/*.m
- fi
-
- if use xml; then
- docinto samples/xml
- dodoc xml/tryit.m
- dodoc xml/samples/*
- dodoc xml_stylesheets/*.xsl
- fi
-
- ecvs_clean
- fi
-}
diff --git a/dev-lang/mercury-extras/mercury-extras-20.01.ebuild b/dev-lang/mercury-extras/mercury-extras-20.01.ebuild
deleted file mode 100644
index 8a9593959aee..000000000000
--- a/dev-lang/mercury-extras/mercury-extras-20.01.ebuild
+++ /dev/null
@@ -1,317 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit eutils multilib vcs-clean
-
-PATCHSET_VER="0"
-MY_P=mercury-srcdist-${PV}
-
-DESCRIPTION="Additional libraries and tools that are not part of the Mercury standard library"
-HOMEPAGE="http://www.mercurylang.org/index.html"
-SRC_URI="http://dl.mercurylang.org/release/${MY_P}.tar.gz
- mirror://gentoo/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="cairo examples glut gmp iodbc ncurses odbc opengl ssl tk tommath X xml"
-REQUIRED_USE="?? ( odbc iodbc )"
-
-RDEPEND="
- ~dev-lang/mercury-${PV}
- cairo? ( >=x11-libs/cairo-1.10.0 )
- gmp? ( dev-libs/gmp:0 )
- glut? ( media-libs/freeglut )
- odbc? ( dev-db/unixODBC )
- iodbc? ( dev-db/libiodbc )
- tommath? ( dev-libs/libtommath )
- ncurses? ( sys-libs/ncurses:= )
- opengl? (
- virtual/opengl
- virtual/glu
- )
- tk? (
- dev-lang/tcl:0
- dev-lang/tk:0
- )
- X? ( x11-libs/libX11 )"
-
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}"/${MY_P}/extras
-
-mercury_pkgs() {
- echo "
- align_right/align_right:bin:
- base64/mercury_base64:lib:
- cgi/mercury_www:lib:
- complex_numbers/complex_numbers:lib:
- $(use ncurses && echo \
- curs/curs:lib:ncurses,panel curses/mcurses:lib:ncurses)
- dynamic_linking/dl:lib:
- error/error:bin:
- fixed/fixed:lib:
- $(use gmp && echo gmp_int/gmp_int:lib:)
- $(use tommath && echo mp_int/mp_int:lib:libtommath)
- $(use X && echo graphics/easyx/easyx:lib:x11)
- $(use cairo && echo graphics/mercury_cairo/mercury_cairo:lib:cairo)
- $(use glut && echo graphics/mercury_glut/mercury_glut:lib:freeglut)
- $(use opengl && echo graphics/mercury_opengl/mercury_opengl:lib:gl,glu)
- $(use tk && echo graphics/mercury_tcltk/mercury_tcltk:lib:tk)
- lex/lex:lib:
- lex/regex:lib:
- moose/moose:bin:
- net/net:lib:
- net/echo:bin:
- $(use ssl && echo mopenssl/mopenssl:lib:openssl)
- $(use odbc && echo odbc/odbc:lib:)
- $(use iodbc && echo odbc/odbc:lib:libiodbc)
- posix/posix:lib:
- $(has_version dev-lang/mercury[trail] && echo \
- references/global:lib: trailed_update/trailed_update:lib:)
- show_ops/show_ops:bin:
- solver_types/library/any:lib:
- $(use xml && echo xml/xml:lib:)"
-}
-
-mercury_pkg_setup() {
- mercury_pkg=${1%%:*}
- mercury_pkg_dir=${mercury_pkg%/*}
- mercury_pkg_name=${mercury_pkg##*/}
-
- mercury_pkg_atts=${1#*:}
- mercury_pkg_type=${mercury_pkg_atts%%:*}
- mercury_pkg_deps=${mercury_pkg_atts#*:}
-
- cd "${S}"/${mercury_pkg_dir} || die
-
- echo ">> Preparing Mercury package: ${mercury_pkg}"
-
- if ! test -f "${S}"/${mercury_pkg_dir}/gentoo.params; then
- echo "LIBGRADES := \$(filter-out java,\$(LIBGRADES))" \
- > "${S}"/${mercury_pkg_dir}/gentoo.params
- echo "LIBGRADES := \$(filter-out erlang,\$(LIBGRADES))" \
- >> "${S}"/${mercury_pkg_dir}/gentoo.params
- echo "LIBGRADES := \$(filter-out csharp,\$(LIBGRADES))" \
- >> "${S}"/${mercury_pkg_dir}/gentoo.params
- echo "include gentoo.params" > "${S}"/${mercury_pkg_dir}/Mmakefile
- fi
-
- if test -n "$mercury_pkg_deps"; then
- echo "EXTRA_CFLAGS += $(pkg-config --cflags ${mercury_pkg_deps/,/ })" \
- >> "${S}"/${mercury_pkg_dir}/gentoo.params
- echo "EXTRA_MLLIBS += $(pkg-config --libs ${mercury_pkg_deps/,/ })" \
- >> "${S}"/${mercury_pkg_dir}/gentoo.params
- fi
-
- if test ${mercury_pkg_name} = dl; then
- echo "EXTRA_MLLIBS = -ldl" >> "${S}"/${mercury_pkg_dir}/gentoo.params
- elif test ${mercury_pkg_name} = gmp_int; then
- echo "EXTRA_MLLIBS = -lgmp" >> "${S}"/${mercury_pkg_dir}/gentoo.params
- elif test ${mercury_pkg_name} = mercury_tcltk; then
- echo "EXTRA_CFLAGS += -DUSE_INTERP_RESULT" \
- >> "${S}"/${mercury_pkg_dir}/gentoo.params
- elif test ${mercury_pkg_name} = mopenssl; then
- local net_libdir="${D}/usr/$(get_libdir)/mercury/extras/lib/\$(GRADE)"
- echo "EXTRA_MLLIBS += -L${net_libdir} -L../net -lnet" \
- >> "${S}"/${mercury_pkg_dir}/gentoo.params
- echo "net%:" >> "${S}"/${mercury_pkg_dir}/gentoo.params
- echo " cp ../net/\$@ \$@" >> "${S}"/${mercury_pkg_dir}/gentoo.params
- elif test ${mercury_pkg_name} = odbc && use odbc; then
- echo "EXTRA_CFLAGS = -DMODBC_UNIX -DMODBC_MYSQL" \
- >> "${S}"/${mercury_pkg_dir}/Mmakefile
- echo "EXTRA_MLLIBS = -lodbc" >> "${S}"/${mercury_pkg_dir}/gentoo.params
- elif test ${mercury_pkg_name} = odbc && use iodbc; then
- echo "EXTRA_CFLAGS += -DMODBC_IODBC -DMODBC_MYSQL" \
- >> "${S}"/${mercury_pkg_dir}/gentoo.params
- fi
-}
-
-mercury_pkg_compile() {
- mercury_pkg=${1%%:*}
- mercury_pkg_dir=${mercury_pkg%/*}
- mercury_pkg_name=${mercury_pkg##*/}
-
- mercury_pkg_atts=${1#*:}
- mercury_pkg_type=${mercury_pkg_atts%:*}
-
- cd "${S}"/${mercury_pkg_dir} || die
-
- echo ">> Compiling Mercury package: ${mercury_pkg}"
-
- if test "${mercury_pkg_type}" = "bin"; then
- mercury_mmc_target=${mercury_pkg_name}
- else
- mercury_mmc_target=lib${mercury_pkg_name}
- fi
-
- # Mercury dependency generation must be run single-threaded
- mmc -f *.m || die "mmc -f .m failed"
- mmake -j1 \
- ${mercury_pkg_name}.depend \
- || die "mmake ${mercury_pkg} depend failed"
-
- # Compiling Mercury submodules is not thread-safe
- mmake -j1 \
- MLFLAGS=--no-strip \
- CFLAGS="${CFLAGS}" \
- LD_LIBFLAGS="${LDFLAGS} -L/usr/$(get_libdir)" \
- ${mercury_mmc_target} || die "mmake ${mercury_pkg} failed"
-
-}
-
-mercury_pkg_install() {
- mercury_pkg=${1%%:*}
- mercury_pkg_dir=${mercury_pkg%/*}
- mercury_pkg_name=${mercury_pkg##*/}
-
- mercury_pkg_atts=${1#*:}
- mercury_pkg_type=${mercury_pkg_atts%:*}
-
- cd "${S}"/${mercury_pkg_dir} || die
-
- echo ">> Installing Mercury package: ${mercury_pkg}"
-
- if test "${mercury_pkg_type}" = "bin"; then
- into /usr/$(get_libdir)/mercury/extras
- dobin ${mercury_pkg_name}
- else
- # Compiling Mercury submodules is not thread-safe
- mmake -j1 \
- MLFLAGS=--no-strip \
- CFLAGS="${CFLAGS}" \
- LD_LIBFLAGS="${LDFLAGS} -L/usr/$(get_libdir)" \
- INSTALL_LIBDIR="${D}/usr/$(get_libdir)/mercury/extras" \
- lib${mercury_pkg_name}.install || die "mmake ${mercury_pkg} failed"
- fi
-}
-
-src_prepare() {
- cd "${WORKDIR}"/${MY_P}
- if [[ -d "${WORKDIR}"/${PV} ]] ; then
- eapply "${WORKDIR}"/${PV}
- fi
- eapply_user
-
- cd "${S}"
- for mercury_pkg in $(mercury_pkgs); do
- mercury_pkg_setup ${mercury_pkg}
- done
-}
-
-src_compile() {
- for mercury_pkg in $(mercury_pkgs); do
- mercury_pkg_compile ${mercury_pkg}
- done
-}
-
-src_install() {
- for mercury_pkg in $(mercury_pkgs); do
- mercury_pkg_install ${mercury_pkg}
- done
-
- cd "${S}"
- dodoc README
-
- if use examples; then
- docinto samples/cgi
- dodoc cgi/form_test.m
-
- docinto samples/complex_numbers
- dodoc complex_numbers/samples/*.m
-
- if use ncurses; then
- docinto samples/curs
- dodoc curs/samples/*.m
-
- docinto samples/curses
- dodoc curses/sample/*.m
- fi
-
- docinto samples/dynamic_linking
- dodoc dynamic_linking/{hello,dl_test}.m
-
- docinto samples/gator
- dodoc -r gator/*
-
- if use gmp; then
- docinto samples/gmp_int
- dodoc gmp_int/gmp_int_test.m
- fi
-
- if use tommath; then
- docinto samples/mp_int
- dodoc mp_int/mp_int_test.m
- fi
-
- if use X; then
- docinto samples/graphics
- dodoc graphics/easyx/samples/*.m
- fi
-
- if use glut && use opengl; then
- docinto samples/graphics
- dodoc graphics/samples/gears/*.m
- dodoc graphics/samples/maze/*.m
- fi
-
- if use tk; then
- docinto samples/graphics
- dodoc graphics/samples/calc/*.m
- fi
-
- if use opengl && use tk; then
- docinto samples/graphics
- dodoc graphics/samples/pent/*.m
- fi
-
- docinto samples/lex
- dodoc lex/samples/*.m
-
- docinto samples/log4m
- dodoc log4m/*.m
-
- docinto samples/monte
- dodoc monte/*.m
-
- docinto samples/moose
- dodoc moose/samples/*
-
- docinto samples/net
- dodoc net/test_lookups.m
-
- if use odbc || use iodbc; then
- docinto samples/odbc
- dodoc odbc/odbc_test.m
- fi
-
- docinto samples/posix
- dodoc posix/samples/*.m
-
- docinto samples/random
- dodoc random/*.m
-
- if has_version dev-lang/mercury[trail]; then
- docinto samples/references
- dodoc references/samples/*.m
-
- docinto samples/trail
- dodoc trail/*.m
-
- docinto samples/trailed_update
- dodoc trailed_update/samples/*.m
- fi
-
- if use xml; then
- docinto samples/xml
- dodoc xml/tryit.m
- dodoc xml/samples/*
- dodoc xml_stylesheets/*.xsl
- fi
-
- ecvs_clean
- fi
-}
diff --git a/dev-lang/mercury/Manifest b/dev-lang/mercury/Manifest
index 9ecedf188dae..aa99f7af4f94 100644
--- a/dev-lang/mercury/Manifest
+++ b/dev-lang/mercury/Manifest
@@ -1,17 +1,5 @@
AUX 50mercury-gentoo.el 130 BLAKE2B b0108f529cbe5b66b510b2ebab6f091825df9ac92dc1d98bc98b34532b6c217ea5ede7bc5960f6616c3a8201788c6a5094b30871fba15e5ded87eb97ab3f7c1f SHA512 e790f1b396f63bf36e57160d588b1377d3f889156446a7d26a6edd3f7175ee8ac5b8972ee4d0b6045b5442ae750341b5e06adc42f094fd6d08f2b519f4432071
-DIST mercury-14.01.1-gentoo-patchset-5.tar.gz 5693 BLAKE2B 300de3254bc0d2f59493c0e2243b0d8786fccce714134a11ce510120b7d9f05ebe4835f084ec2db2ddaf2d405cbae65e86d809847079a7d63a6a68021d9d29e8 SHA512 3f9f1e2359f372e4f510b9a00c197978657b28d1308d12cba4d08a982877e2311d7fb6e626dad07d0fa09d24f97334575557cb49003508fdc7b32288c1ae8f2d
-DIST mercury-20.01-gentoo-patchset-0.tar.gz 3862 BLAKE2B 79ef6d30add63a5d419e3dd5b376fd9c1727038102db2bc0e8ccd8b71cdc1c80e721647f34764b0aa4fd6d58b9e38c9675f234714f381f94be572b9b64b478e1 SHA512 2835b4740453bcc358363f9eaa0264706125b5e5f7a38802d5f280ccd777d4c760124ed3a635f17ecc2ae772767e9fa5d61093c40094358a0a96a726a23ff08e
-DIST mercury-20.01.1-gentoo-patchset-0.tar.gz 3943 BLAKE2B 0fd149c622715bf191182bd93e264096327d7869e30aaa10bb19b70bec5563520026e2561cc6607c62801ed00ed6b5907bbae4be997869b9facb2f9d65ec0c7a SHA512 d866b35b6df14645ef60ff25497f9bbf0c2caeae2145bc0aef2adea0e651379c673c1815c717f1a51457d93cc67e9ae3dafe5d9fce1d4734bf1673e4cfcbd367
-DIST mercury-20.01.2-gentoo-patchset-1.tar.gz 4562 BLAKE2B f1e9d040cfd5930c4f4d9722fc10e11532272f1fa0ab6bd25cc0d2ed42eb0edfbe6f9bc1d41972775fa720b80601d5fdae1681d56f677861fab15e10cc6d05cb SHA512 4f89b09e1e196a61892811167bc0dc1b3ee868ef336efdf66e417574c18ea53b557bd87d5c5300eee8194a3c4250b47e70f5991fcc25b1c58d956a4b097eaec5
DIST mercury-20.06-gentoo-patchset-1.tar.gz 4555 BLAKE2B 8609ba7cd43d82ceb6b6e25fd6af3b2c750df6446c1235bd9c6f8e3bc87bb1fe0a43cafb9f1d061562bb80ade1deb7809889bf0d703c99ea1e2286bbeb7c5182 SHA512 23fae769c5c1204154c6ed55cc31644967e3554f499b23a6585d34615d062a214d6485de3a4acf8cf90a582a229aeab519e57a6df80cee62e9e6789f210e8256
-DIST mercury-srcdist-14.01.1.tar.gz 52658945 BLAKE2B 6497921a0227b9a6fbcbabdd309ef3325f32dda14fc4ddb443368385b89be4011d677a24b30b3702147d1b782fe2597760ad66dd34503aa6aebaf79707466529 SHA512 a128ef0fd4955abadea32019ec59297ffe32537415f32e9e948cbc1c3439bb40eb09de77569690fb18dd7d6969a2b1141b3ae5baeb87f2627eaa65ad93add92c
-DIST mercury-srcdist-20.01.1.tar.gz 47088335 BLAKE2B 1e3285dadc3748934e801b8ac0316d3005fbe24c20c9ceb694e9fc316d820fdb89c659107b25ee474fd6ac50d661dd029af9ca5082016a3b0827dd640a54a707 SHA512 24ad0bbecee46ab6ff669d63d64096b37a0d010bb44978a1785eee2701a8b30a83eab229af97cbbb18bca55b5e89be9ba74fe126d1d430da1e1e909366dc5b90
-DIST mercury-srcdist-20.01.2.tar.gz 46789217 BLAKE2B bc9637c1b4afb81d4bf35cd94a1f1d87b17094d8a6cbb7e5c8b0ff9c99ce59178d9e32bae246dd041ad781fe5d04e68db8f5effbb6bfcc29b76a83aad91a5666 SHA512 0deed9c0a13ebf793fb80def3fe6d9ee0aa4f0f2974865364eff81bdcac1ec0c41aafbec3e0146c8bdcf3245789e1003b2e4f8e219b53bec71e90074867a834d
-DIST mercury-srcdist-20.01.tar.gz 47103868 BLAKE2B 68be786e925bdf94dcba6c6a2a746a384da345ee33250785d8d2b9281815694a4525cdd694c26f58051c097f2a897291e640e2139729ccede9bd2e472077d8c9 SHA512 90e36faa375603e596b2dd692363528120fda62ae6d2e2b119cf76de1656dae4028aff00858a4bff3fdfb9b2210ea17db0aa516ce4283604c46a5935dd2cd4b7
DIST mercury-srcdist-20.06.tar.gz 47768559 BLAKE2B f242aa2ef7da53aa2dfa054e4fee8646434d276f0748b014e33ea52d22f2a8a37e6fecaa20617f4943c4c1e7d8c179ed0603a344fde2dd58da98b2bacadf1a71 SHA512 b76bd22d8eb16242c68b614ff122ed7ee7535efef6c0ceb8cc798fee4c550bc41b6faff2135cea43b24c652b654bb35ae049656585d8e7bf3a1122d07cb1ecf4
-EBUILD mercury-14.01.1-r1.ebuild 5624 BLAKE2B 0ddb116dec074a53e316935279650cecae3990ec9cbdbfbc1e99e6c47d0fceb20bcbb685259a78e18a850fafe2e4d609072a5183a2ef9ef3a6d45ba9368dbdc7 SHA512 338dee876d50fee43085a203b6adafaeb0f921c855925bda05ba3b30f133ac8eab9dfd476793d63f99ef5f9e4cb40775c9255c835c38685dd13fa78b54b2690f
-EBUILD mercury-20.01.1.ebuild 4984 BLAKE2B 55587832b1021ed04397d28a254bc17ca6172b52ac2afa89979f99a65d90107b52ea3758303d26b224ccffda5e5a2be76655d5791f0d2fa6d3fcb69caf5ae01b SHA512 fd270ddc8913049f2bb8cf472c85fc5d4724a4d979399ed2919cc34760c61492ec46fe8c9abbe2b7b9f43c0ff7fc608bfcba744bbbd05a75e0d1aa4387ba6c91
-EBUILD mercury-20.01.2.ebuild 5073 BLAKE2B 669670dc48445434e48190c7f5414dd48132ce97080bb56c47f3669d92164ef005007fd07fb3335cb53a0044dd37423cbea4d42ed960792ff18ba96c8aba8378 SHA512 fd037eecd755cef8214d48cb3a7b40c6406ea4f12c15392f898270deb88909b2edcf24892106a7d960118b282d5bbe4b7a3eb0cad81a2907b6aea0fa5afb3335
-EBUILD mercury-20.01.ebuild 5129 BLAKE2B 93b409d07e9a60705630c17100da0231b5aaa74089990b32d02dbbde77681c428242f096a39b90e2136aba6fb30310ced9e98aeaecc6d2dc553f427461dc27f5 SHA512 4355a4e2f2280c9196c4e1aedd804b94b50933da23a9337b948756a1a8c5f824320d837f5dd49a1e498e7b0d68e9786c00afcb3d5d90fba1975f5626d0787430
EBUILD mercury-20.06.ebuild 5181 BLAKE2B 0fcd5b91586cb40cc6b15b9a6e689985ca3fa80d13bea92f53f6165c389c2877d4db9f4f3b8a7f37525c2c6a0fc284c9a5d1e327f9b5c304b348b4999272233a SHA512 068408d5531d72288c35f9f01b339244f5f126de614fd9d8ede2a78514a4d4cb8691fd7a5e7afe114a3958f95817791e358c6d519b8d3879248382216743649c
MISC metadata.xml 384 BLAKE2B eaed468c341970157e4e641d25d5d87e0851bdbd31ba9d6c1e428c9f0239ad98220395858d6291fabe41561fb2ecc5c894700a86b290fc3cab2eaeda2a9df372 SHA512 c90a7a81ab16bac0af4bb9dd3f47cfb3987e0c3aebe08bb7ac6125baf7c619269318bd2c7a45e4213184544d981c920cace23ccb61fbb60c0872db77a10e3ecf
diff --git a/dev-lang/mercury/mercury-14.01.1-r1.ebuild b/dev-lang/mercury/mercury-14.01.1-r1.ebuild
deleted file mode 100644
index 3584581c3cea..000000000000
--- a/dev-lang/mercury/mercury-14.01.1-r1.ebuild
+++ /dev/null
@@ -1,222 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools elisp-common eutils flag-o-matic java-pkg-opt-2 multilib vcs-clean xdg-utils
-
-PATCHSET_VER="5"
-MY_P=${PN}-srcdist-${PV}
-
-DESCRIPTION="Mercury is a modern general-purpose logic/functional programming language"
-HOMEPAGE="http://www.mercurylang.org/index.html"
-SRC_URI="http://dl.mercurylang.org/release/${MY_P}.tar.gz
- mirror://gentoo/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-IUSE="debug doc emacs erlang examples java mono profile readline threads trail"
-
-DEPEND="!dev-libs/mpatrol
- !dev-util/mono-debugger
- net-libs/libnsl:0=
- readline? ( sys-libs/readline:= )
- erlang? ( dev-lang/erlang )
- java? ( >=virtual/jdk-1.6:= )
- mono? ( dev-lang/mono )
- doc? ( sys-apps/texinfo )"
-
-RDEPEND="${DEPEND}
- emacs? ( >=app-editors/emacs-23.1:* )"
-
-S="${WORKDIR}"/${MY_P}
-
-SITEFILE=50${PN}-gentoo.el
-
-src_prepare() {
- cd "${WORKDIR}" || die
- EPATCH_FORCE=yes
- EPATCH_SUFFIX=patch
- if [[ -d "${WORKDIR}"/${PV} ]] ; then
- epatch "${WORKDIR}"/${PV}
- fi
-
- sed -i -e "s/@libdir@/$(get_libdir)/" \
- "${S}"/scripts/Mmake.vars.in \
- || die "sed libdir failed"
-
- cd "${S}" || die
- eautoconf
-
- xdg_environment_reset
-}
-
-src_configure() {
- strip-flags
-
- local myconf
- myconf="--libdir=/usr/$(get_libdir) \
- $(use_enable mono csharp-grade) \
- $(use_enable erlang erlang-grade) \
- $(use_enable java java-grade) \
- $(use_enable debug debug-grades) \
- $(use_enable profile prof-grades) \
- $(use_enable threads par-grades) \
- $(use_enable trail trail-grades) \
- $(use_with readline)"
-
- econf ${myconf}
-}
-
-src_compile() {
- # Prepare mmake flags
- echo "EXTRA_CFLAGS = ${CFLAGS}" >> Mmake.params
- echo "EXTRA_LDFLAGS = ${LDFLAGS}" >> Mmake.params
- echo "EXTRA_MLFLAGS = --no-strip" >> Mmake.params
-
- if use x86; then
- echo "CFLAGS-ml_backend.ml_closure_gen = -O0" >> Mmake.params
- echo "CFLAGS-ml_backend.ml_unify_gen = -O0" >> Mmake.params
- echo "CFLAGS-ml_backend.rtti_to_mlds = -O0" >> Mmake.params
- echo "CFLAGS-display_report = -O0" >> Mmake.params
- echo "CFLAGS-mercury_ho_call = -O0" >> Mmake.params
- echo "CFLAGS-mercury_trace_vars = -O0" >> Mmake.params
- fi
-
- # Build Mercury using bootstrap grade
- emake \
- PARALLEL="'${MAKEOPTS}'" \
- TEXI2DVI="" PDFTEX=""
-
- # We can now patch .m Mercury compiler files since we
- # have just built mercury_compiler.
- EPATCH_FORCE=yes
- EPATCH_SUFFIX=patch
- if [[ -d "${WORKDIR}"/${PV}-mmc ]] ; then
- epatch "${WORKDIR}"/${PV}-mmc
- fi
-
- sed -i -e "s/@libdir@/$(get_libdir)/" \
- "${S}"/compiler/file_util.m \
- "${S}"/compiler/make.program_target.m \
- || die "sed libdir failed"
-
- # Rebuild Mercury compiler using the just built mercury_compiler
- emake \
- PARALLEL="'${MAKEOPTS}'" \
- MERCURY_COMPILER="${S}"/compiler/mercury_compile \
- TEXI2DVI="" PDFTEX=""
-
- # The default Mercury grade may not be the same as the bootstrap
- # grade. Since src_test() is run before src_install() we compile
- # the default grade now
- emake \
- PARALLEL="'${MAKEOPTS}'" \
- MERCURY_COMPILER="${S}"/compiler/mercury_compile \
- TEXI2DVI="" PDFTEX="" \
- default_grade
-}
-
-src_test() {
- TEST_GRADE=$(scripts/ml --print-grade)
- if [ -d "${S}"/install_grade_dir.${TEST_GRADE} ] ; then
- TWS="${S}"/install_grade_dir.${TEST_GRADE}
- cp runtime/mer_rt.init "${TWS}"/runtime/
- cp mdbcomp/mer_mdbcomp.init "${TWS}"/mdbcomp/
- cp browser/mer_browser.init "${TWS}"/browser/
- else
- TWS="${S}"
- fi
-
- cd "${S}"/tests || die
- sed -e "s:@WORKSPACE@:${TWS}:" \
- < WS_FLAGS.ws \
- > WS_FLAGS \
- || die "sed WORKSPACE failed"
- sed -e "s:@WORKSPACE@:${TWS}:" \
- < .mgnuc_copts.ws \
- > .mgnuc_copts \
- || die "sed WORKSPACE failed"
- find . -mindepth 1 -type d -exec cp .mgnuc_opts {} \;
- find . -mindepth 1 -type d -exec cp .mgnuc_copts {} \;
-
- # Mercury tests must be run in C locale since Mercury output is
- # compared to hard-coded warnings/errors
- LC_ALL="C" \
- PATH="${TWS}"/scripts:"${TWS}"/util:"${S}"/slice:"${PATH}" \
- TERM="" \
- WORKSPACE="${TWS}" \
- WORKSPACE_FLAGS=yes \
- MERCURY_COMPILER="${TWS}"/compiler/mercury_compile \
- MMAKE_DIR="${TWS}"/scripts \
- MERCURY_SUPPRESS_STACK_TRACE=yes \
- GRADE=${TEST_GRADE} \
- mmake || die "mmake test failed"
-}
-
-src_install() {
- emake \
- PARALLEL="'${MAKEOPTS}'" \
- MERCURY_COMPILER="${S}"/compiler/mercury_compile \
- TEXI2DVI="" PDFTEX="" \
- DESTDIR="${D}" \
- INSTALL_PREFIX="${D}"/usr \
- INSTALL_MAN_DIR="${D}"/usr/share/man \
- INSTALL_INFO_DIR="${D}"/usr/share/info \
- INSTALL_HTML_DIR="${D}"/usr/share/doc/${PF}/html \
- INSTALL_ELISP_DIR="${D}/${SITELISP}"/${PN} \
- install
-
- if use java; then
- keepdir /usr/$(get_libdir)/mercury/modules/java
- fi
-
- if use mono; then
- keepdir /usr/$(get_libdir)/mercury/modules/csharp
- fi
-
- if use emacs; then
- elisp-site-file-install "${FILESDIR}/${SITEFILE}" \
- || die "elisp-site-file-install failed"
- fi
-
- dodoc \
- BUGS HISTORY LIMITATIONS NEWS README README.Linux \
- README.Linux-Alpha README.Linux-m68k README.Linux-PPC \
- RELEASE_NOTES TODO VERSION WORK_IN_PROGRESS || die
-
- if use erlang; then
- dodoc README.Erlang
- fi
-
- if use java; then
- dodoc README.Java
- fi
-
- if use examples; then
- insinto /usr/share/doc/${PF}/samples
- doins samples/{*.m,README,Mmakefile}
- doins -r samples/c_interface \
- samples/diff \
- samples/muz \
- samples/rot13 \
- samples/solutions \
- samples/solver_types
-
- if use java; then
- doins -r samples/java_interface
- fi
-
- ecvs_clean "${D}"/usr/share/doc/${PF}/samples
- fi
-}
-
-pkg_postinst() {
- use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
- use emacs && elisp-site-regen
-}
diff --git a/dev-lang/mercury/mercury-20.01.1.ebuild b/dev-lang/mercury/mercury-20.01.1.ebuild
deleted file mode 100644
index 6770d4264de4..000000000000
--- a/dev-lang/mercury/mercury-20.01.1.ebuild
+++ /dev/null
@@ -1,201 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools elisp-common eutils flag-o-matic java-pkg-opt-2 multilib vcs-clean xdg-utils
-
-PATCHSET_VER="0"
-MY_P=${PN}-srcdist-${PV}
-
-DESCRIPTION="Mercury is a modern general-purpose logic/functional programming language"
-HOMEPAGE="http://www.mercurylang.org/index.html"
-SRC_URI="http://dl.mercurylang.org/release/${MY_P}.tar.gz
- mirror://gentoo/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="debug doc emacs erlang examples java mono profile readline threads trail"
-
-DEPEND="net-libs/libnsl:0=
- readline? ( sys-libs/readline:= )
- erlang? ( dev-lang/erlang )
- java? ( >=virtual/jdk-1.6:= )
- mono? ( dev-lang/mono )
- doc? ( sys-apps/texinfo )"
-
-RDEPEND="${DEPEND}
- emacs? ( >=app-editors/emacs-23.1:* )"
-
-S="${WORKDIR}"/${MY_P}
-
-SITEFILE=50${PN}-gentoo.el
-
-src_prepare() {
- if [[ -d "${WORKDIR}"/${PV} ]] ; then
- eapply "${WORKDIR}"/${PV}
- fi
- eapply_user
-
- AT_M4DIR=m4 eautoreconf
-
- xdg_environment_reset
-}
-
-src_configure() {
- strip-flags
-
- local myconf
- myconf="--libdir=/usr/$(get_libdir) \
- $(use_enable mono csharp-grade) \
- $(use_enable erlang erlang-grade) \
- $(use_enable java java-grade) \
- $(use_enable debug debug-grades) \
- $(use_enable profile prof-grades) \
- $(use_enable threads par-grades) \
- $(use_enable trail trail-grades) \
- $(use_with readline)"
-
- econf ${myconf}
-}
-
-src_compile() {
- # Prepare mmake flags
- echo "EXTRA_CFLAGS = ${CFLAGS}" >> Mmake.params
- echo "EXTRA_LD_LIBFLAGS = ${LDFLAGS}" >> Mmake.params
- echo "EXTRA_MLFLAGS = --no-strip" >> Mmake.params
-
- echo "EXTRA_LD_LIBFLAGS += -Wl,-soname=libgc.so" >> boehm_gc/Mmake.boehm_gc.params
- echo "EXTRA_LD_LIBFLAGS += -Wl,-soname=libmer_rt.so" >> runtime/Mmake.runtime.params
- echo "EXTRA_LD_LIBFLAGS += -Wl,-soname=libmer_std.so" >> library/Mmake.library.params
-
- # Build Mercury using bootstrap grade
- emake \
- PARALLEL="'${MAKEOPTS}'" \
- TEXI2DVI="" PDFTEX=""
-
- # We can now patch .m Mercury compiler files since we
- # have just built mercury_compiler.
- if [[ -d "${WORKDIR}"/${PV}-mmc ]] ; then
- eapply "${WORKDIR}"/${PV}-mmc
- fi
-
- # Rebuild Mercury compiler using the just built mercury_compiler
- emake \
- PARALLEL="'${MAKEOPTS}'" \
- MERCURY_COMPILER="${S}"/compiler/mercury_compile \
- TEXI2DVI="" PDFTEX=""
-
- # The default Mercury grade may not be the same as the bootstrap
- # grade. Since src_test() is run before src_install() we compile
- # the default grade now
- emake \
- PARALLEL="'${MAKEOPTS}'" \
- MERCURY_COMPILER="${S}"/compiler/mercury_compile \
- TEXI2DVI="" PDFTEX="" \
- default_grade
-}
-
-src_test() {
- TEST_GRADE=$(scripts/ml --print-grade)
- if [ -d "${S}"/install_grade_dir.${TEST_GRADE} ] ; then
- TWS="${S}"/install_grade_dir.${TEST_GRADE}
- cp runtime/mer_rt.init "${TWS}"/runtime/
- cp mdbcomp/mer_mdbcomp.init "${TWS}"/mdbcomp/
- cp browser/mer_browser.init "${TWS}"/browser/
- else
- TWS="${S}"
- fi
-
- cd "${S}"/tests || die
- sed -e "s:@WORKSPACE@:${TWS}:" \
- < WS_FLAGS.ws \
- > WS_FLAGS \
- || die "sed WORKSPACE failed"
- sed -e "s:@WORKSPACE@:${TWS}:" \
- < .mgnuc_copts.ws \
- > .mgnuc_copts \
- || die "sed WORKSPACE failed"
- find . -mindepth 1 -type d -exec cp .mgnuc_opts {} \;
- find . -mindepth 1 -type d -exec cp .mgnuc_copts {} \;
-
- # Mercury tests must be run in C locale since Mercury output is
- # compared to hard-coded warnings/errors
- LC_ALL="C" \
- PATH="${TWS}"/scripts:"${TWS}"/util:"${S}"/slice:"${PATH}" \
- TERM="" \
- WORKSPACE="${TWS}" \
- WORKSPACE_FLAGS=yes \
- MERCURY_COMPILER="${TWS}"/compiler/mercury_compile \
- MMAKE_DIR="${TWS}"/scripts \
- MERCURY_SUPPRESS_STACK_TRACE=yes \
- GRADE=${TEST_GRADE} \
- mmake || die "mmake test failed"
-}
-
-src_install() {
- emake \
- PARALLEL="'${MAKEOPTS}'" \
- MERCURY_COMPILER="${S}"/compiler/mercury_compile \
- TEXI2DVI="" PDFTEX="" \
- DESTDIR="${D}" \
- INSTALL_ELISP_DIR="${D}/${SITELISP}"/${PN} \
- install
-
- if use java; then
- keepdir /usr/$(get_libdir)/mercury/modules/java
- fi
-
- if use mono; then
- keepdir /usr/$(get_libdir)/mercury/modules/csharp
- fi
-
- if use emacs; then
- elisp-site-file-install "${FILESDIR}/${SITEFILE}" \
- || die "elisp-site-file-install failed"
- fi
-
- dodoc \
- BUGS HISTORY LIMITATIONS NEWS README README.Linux \
- README.Linux-Alpha README.Linux-m68k README.Linux-PPC \
- RELEASE_NOTES VERSION || die
-
- if use erlang; then
- dodoc README.Erlang
- fi
-
- if use java; then
- dodoc README.Java
- fi
-
- if use mono; then
- dodoc README.CSharp
- fi
-
- if use examples; then
- docinto /usr/share/doc/${PF}/samples
- dodoc samples/{*.m,README,Mmakefile}
- dodoc -r samples/c_interface \
- samples/diff \
- samples/muz \
- samples/rot13 \
- samples/solutions \
- samples/solver_types
-
- if use java; then
- dodoc -r samples/java_interface
- fi
-
- ecvs_clean "${D}"/usr/share/doc/${PF}/samples
- fi
-}
-
-pkg_postinst() {
- use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
- use emacs && elisp-site-regen
-}
diff --git a/dev-lang/mercury/mercury-20.01.2.ebuild b/dev-lang/mercury/mercury-20.01.2.ebuild
deleted file mode 100644
index b0c5ecffdb0f..000000000000
--- a/dev-lang/mercury/mercury-20.01.2.ebuild
+++ /dev/null
@@ -1,202 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools elisp-common eutils flag-o-matic java-pkg-opt-2 multilib vcs-clean xdg-utils
-
-PATCHSET_VER="1"
-MY_P=${PN}-srcdist-${PV}
-
-DESCRIPTION="Mercury is a modern general-purpose logic/functional programming language"
-HOMEPAGE="https://www.mercurylang.org/index.html"
-SRC_URI="https://dl.mercurylang.org/release-20.01/${MY_P}.tar.gz
- https://dev.gentoo.org/~keri/distfiles/mercury/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="debug doc emacs erlang examples java mono profile readline threads trail"
-
-DEPEND="net-libs/libnsl:0=
- readline? ( sys-libs/readline:= )
- erlang? ( dev-lang/erlang )
- java? ( >=virtual/jdk-1.6:= )
- mono? ( dev-lang/mono )
- doc? ( sys-apps/texinfo )"
-
-RDEPEND="${DEPEND}
- emacs? ( >=app-editors/emacs-23.1:* )"
-
-S="${WORKDIR}"/${MY_P}
-
-SITEFILE=50${PN}-gentoo.el
-
-src_prepare() {
- if [[ -d "${WORKDIR}"/${PV} ]] ; then
- eapply "${WORKDIR}"/${PV}
- fi
- eapply_user
-
- AT_M4DIR=m4 eautoreconf
-
- xdg_environment_reset
-}
-
-src_configure() {
- strip-flags
-
- local myconf
- myconf="--libdir=/usr/$(get_libdir) \
- $(use_enable mono csharp-grade) \
- $(use_enable erlang erlang-grade) \
- $(use_enable java java-grade) \
- $(use_enable debug debug-grades) \
- $(use_enable profile prof-grades) \
- $(use_enable threads par-grades) \
- $(use_enable trail trail-grades) \
- $(use_with readline)"
-
- econf ${myconf}
-}
-
-src_compile() {
- # Prepare mmake flags
- echo "EXTRA_CFLAGS = ${CFLAGS}" >> Mmake.params
- echo "EXTRA_LDFLAGS = ${LDFLAGS}" >> Mmake.params
- echo "EXTRA_LD_LIBFLAGS = ${LDFLAGS}" >> Mmake.params
- echo "EXTRA_MLFLAGS = --no-strip" >> Mmake.params
-
- echo "EXTRA_LD_LIBFLAGS += -Wl,-soname=libgc.so" >> boehm_gc/Mmake.boehm_gc.params
- echo "EXTRA_LD_LIBFLAGS += -Wl,-soname=libmer_rt.so" >> runtime/Mmake.runtime.params
- echo "EXTRA_LD_LIBFLAGS += -Wl,-soname=libmer_std.so" >> library/Mmake.library.params
-
- # Build Mercury using bootstrap grade
- emake \
- PARALLEL="'${MAKEOPTS}'" \
- TEXI2DVI="" PDFTEX=""
-
- # We can now patch .m Mercury compiler files since we
- # have just built mercury_compiler.
- if [[ -d "${WORKDIR}"/${PV}-mmc ]] ; then
- eapply "${WORKDIR}"/${PV}-mmc
- fi
-
- # Rebuild Mercury compiler using the just built mercury_compiler
- emake \
- PARALLEL="'${MAKEOPTS}'" \
- MERCURY_COMPILER="${S}"/compiler/mercury_compile \
- TEXI2DVI="" PDFTEX=""
-
- # The default Mercury grade may not be the same as the bootstrap
- # grade. Since src_test() is run before src_install() we compile
- # the default grade now
- emake \
- PARALLEL="'${MAKEOPTS}'" \
- MERCURY_COMPILER="${S}"/compiler/mercury_compile \
- TEXI2DVI="" PDFTEX="" \
- default_grade
-}
-
-src_test() {
- TEST_GRADE=$(scripts/ml --print-grade)
- if [ -d "${S}"/install_grade_dir.${TEST_GRADE} ] ; then
- TWS="${S}"/install_grade_dir.${TEST_GRADE}
- cp runtime/mer_rt.init "${TWS}"/runtime/
- cp mdbcomp/mer_mdbcomp.init "${TWS}"/mdbcomp/
- cp browser/mer_browser.init "${TWS}"/browser/
- else
- TWS="${S}"
- fi
-
- cd "${S}"/tests || die
- sed -e "s:@WORKSPACE@:${TWS}:" \
- < WS_FLAGS.ws \
- > WS_FLAGS \
- || die "sed WORKSPACE failed"
- sed -e "s:@WORKSPACE@:${TWS}:" \
- < .mgnuc_copts.ws \
- > .mgnuc_copts \
- || die "sed WORKSPACE failed"
- find . -mindepth 1 -type d -exec cp .mgnuc_opts {} \;
- find . -mindepth 1 -type d -exec cp .mgnuc_copts {} \;
-
- # Mercury tests must be run in C locale since Mercury output is
- # compared to hard-coded warnings/errors
- LC_ALL="C" \
- PATH="${TWS}"/scripts:"${TWS}"/util:"${S}"/slice:"${PATH}" \
- TERM="" \
- WORKSPACE="${TWS}" \
- WORKSPACE_FLAGS=yes \
- MERCURY_COMPILER="${TWS}"/compiler/mercury_compile \
- MMAKE_DIR="${TWS}"/scripts \
- MERCURY_SUPPRESS_STACK_TRACE=yes \
- GRADE=${TEST_GRADE} \
- mmake || die "mmake test failed"
-}
-
-src_install() {
- emake \
- PARALLEL="'${MAKEOPTS}'" \
- MERCURY_COMPILER="${S}"/compiler/mercury_compile \
- TEXI2DVI="" PDFTEX="" \
- DESTDIR="${D}" \
- INSTALL_ELISP_DIR="${D}/${SITELISP}"/${PN} \
- install
-
- if use java; then
- keepdir /usr/$(get_libdir)/mercury/modules/java
- fi
-
- if use mono; then
- keepdir /usr/$(get_libdir)/mercury/modules/csharp
- fi
-
- if use emacs; then
- elisp-site-file-install "${FILESDIR}/${SITEFILE}" \
- || die "elisp-site-file-install failed"
- fi
-
- dodoc \
- BUGS HISTORY LIMITATIONS NEWS README README.Linux \
- README.Linux-Alpha README.Linux-m68k README.Linux-PPC \
- RELEASE_NOTES VERSION || die
-
- if use erlang; then
- dodoc README.Erlang
- fi
-
- if use java; then
- dodoc README.Java
- fi
-
- if use mono; then
- dodoc README.CSharp
- fi
-
- if use examples; then
- docinto /usr/share/doc/${PF}/samples
- dodoc samples/{*.m,README,Mmakefile}
- dodoc -r samples/c_interface \
- samples/diff \
- samples/muz \
- samples/rot13 \
- samples/solutions \
- samples/solver_types
-
- if use java; then
- dodoc -r samples/java_interface
- fi
-
- ecvs_clean "${D}"/usr/share/doc/${PF}/samples
- fi
-}
-
-pkg_postinst() {
- use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
- use emacs && elisp-site-regen
-}
diff --git a/dev-lang/mercury/mercury-20.01.ebuild b/dev-lang/mercury/mercury-20.01.ebuild
deleted file mode 100644
index 4ee03178b5f5..000000000000
--- a/dev-lang/mercury/mercury-20.01.ebuild
+++ /dev/null
@@ -1,206 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools elisp-common eutils flag-o-matic java-pkg-opt-2 multilib vcs-clean xdg-utils
-
-PATCHSET_VER="0"
-MY_P=${PN}-srcdist-${PV}
-
-DESCRIPTION="Mercury is a modern general-purpose logic/functional programming language"
-HOMEPAGE="http://www.mercurylang.org/index.html"
-SRC_URI="http://dl.mercurylang.org/release/${MY_P}.tar.gz
- mirror://gentoo/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="debug doc emacs erlang examples java mono profile readline threads trail"
-
-DEPEND="net-libs/libnsl:0=
- readline? ( sys-libs/readline:= )
- erlang? ( dev-lang/erlang )
- java? ( >=virtual/jdk-1.6:= )
- mono? ( dev-lang/mono )
- doc? ( sys-apps/texinfo )"
-
-RDEPEND="${DEPEND}
- emacs? ( >=app-editors/emacs-23.1:* )"
-
-S="${WORKDIR}"/${MY_P}
-
-SITEFILE=50${PN}-gentoo.el
-
-src_prepare() {
- if [[ -d "${WORKDIR}"/${PV} ]] ; then
- eapply "${WORKDIR}"/${PV}
- fi
- eapply_user
-
- AT_M4DIR=m4 eautoreconf
-
- xdg_environment_reset
-}
-
-src_configure() {
- strip-flags
-
- local myconf
- myconf="--libdir=/usr/$(get_libdir) \
- $(use_enable mono csharp-grade) \
- $(use_enable erlang erlang-grade) \
- $(use_enable java java-grade) \
- $(use_enable debug debug-grades) \
- $(use_enable profile prof-grades) \
- $(use_enable threads par-grades) \
- $(use_enable trail trail-grades) \
- $(use_with readline)"
-
- econf ${myconf}
-}
-
-src_compile() {
- # Prepare mmake flags
- echo "EXTRA_CFLAGS = ${CFLAGS}" >> Mmake.params
- echo "EXTRA_LD_LIBFLAGS = ${LDFLAGS}" >> Mmake.params
- echo "EXTRA_MLFLAGS = --no-strip" >> Mmake.params
-
- echo "EXTRA_LD_LIBFLAGS += -Wl,-soname=libgc.so" >> boehm_gc/Mmake.boehm_gc.params
- echo "EXTRA_LD_LIBFLAGS += -Wl,-soname=libmer_rt.so" >> runtime/Mmake.runtime.params
- echo "EXTRA_LD_LIBFLAGS += -Wl,-soname=libmer_std.so" >> library/Mmake.library.params
-
- # Build Mercury using bootstrap grade
- emake \
- PARALLEL="'${MAKEOPTS}'" \
- TEXI2DVI="" PDFTEX=""
-
- # We can now patch .m Mercury compiler files since we
- # have just built mercury_compiler.
- if [[ -d "${WORKDIR}"/${PV}-mmc ]] ; then
- eapply "${WORKDIR}"/${PV}-mmc
- fi
-
- sed -i -e "s/@libdir@/$(get_libdir)/" \
- "${S}"/compiler/file_util.m \
- "${S}"/compiler/make.program_target.m \
- || die "sed libdir failed"
-
- # Rebuild Mercury compiler using the just built mercury_compiler
- emake \
- PARALLEL="'${MAKEOPTS}'" \
- MERCURY_COMPILER="${S}"/compiler/mercury_compile \
- TEXI2DVI="" PDFTEX=""
-
- # The default Mercury grade may not be the same as the bootstrap
- # grade. Since src_test() is run before src_install() we compile
- # the default grade now
- emake \
- PARALLEL="'${MAKEOPTS}'" \
- MERCURY_COMPILER="${S}"/compiler/mercury_compile \
- TEXI2DVI="" PDFTEX="" \
- default_grade
-}
-
-src_test() {
- TEST_GRADE=$(scripts/ml --print-grade)
- if [ -d "${S}"/install_grade_dir.${TEST_GRADE} ] ; then
- TWS="${S}"/install_grade_dir.${TEST_GRADE}
- cp runtime/mer_rt.init "${TWS}"/runtime/
- cp mdbcomp/mer_mdbcomp.init "${TWS}"/mdbcomp/
- cp browser/mer_browser.init "${TWS}"/browser/
- else
- TWS="${S}"
- fi
-
- cd "${S}"/tests || die
- sed -e "s:@WORKSPACE@:${TWS}:" \
- < WS_FLAGS.ws \
- > WS_FLAGS \
- || die "sed WORKSPACE failed"
- sed -e "s:@WORKSPACE@:${TWS}:" \
- < .mgnuc_copts.ws \
- > .mgnuc_copts \
- || die "sed WORKSPACE failed"
- find . -mindepth 1 -type d -exec cp .mgnuc_opts {} \;
- find . -mindepth 1 -type d -exec cp .mgnuc_copts {} \;
-
- # Mercury tests must be run in C locale since Mercury output is
- # compared to hard-coded warnings/errors
- LC_ALL="C" \
- PATH="${TWS}"/scripts:"${TWS}"/util:"${S}"/slice:"${PATH}" \
- TERM="" \
- WORKSPACE="${TWS}" \
- WORKSPACE_FLAGS=yes \
- MERCURY_COMPILER="${TWS}"/compiler/mercury_compile \
- MMAKE_DIR="${TWS}"/scripts \
- MERCURY_SUPPRESS_STACK_TRACE=yes \
- GRADE=${TEST_GRADE} \
- mmake || die "mmake test failed"
-}
-
-src_install() {
- emake \
- PARALLEL="'${MAKEOPTS}'" \
- MERCURY_COMPILER="${S}"/compiler/mercury_compile \
- TEXI2DVI="" PDFTEX="" \
- DESTDIR="${D}" \
- INSTALL_ELISP_DIR="${D}/${SITELISP}"/${PN} \
- install
-
- if use java; then
- keepdir /usr/$(get_libdir)/mercury/modules/java
- fi
-
- if use mono; then
- keepdir /usr/$(get_libdir)/mercury/modules/csharp
- fi
-
- if use emacs; then
- elisp-site-file-install "${FILESDIR}/${SITEFILE}" \
- || die "elisp-site-file-install failed"
- fi
-
- dodoc \
- BUGS HISTORY LIMITATIONS NEWS README README.Linux \
- README.Linux-Alpha README.Linux-m68k README.Linux-PPC \
- RELEASE_NOTES VERSION || die
-
- if use erlang; then
- dodoc README.Erlang
- fi
-
- if use java; then
- dodoc README.Java
- fi
-
- if use mono; then
- dodoc README.CSharp
- fi
-
- if use examples; then
- docinto /usr/share/doc/${PF}/samples
- dodoc samples/{*.m,README,Mmakefile}
- dodoc -r samples/c_interface \
- samples/diff \
- samples/muz \
- samples/rot13 \
- samples/solutions \
- samples/solver_types
-
- if use java; then
- dodoc -r samples/java_interface
- fi
-
- ecvs_clean "${D}"/usr/share/doc/${PF}/samples
- fi
-}
-
-pkg_postinst() {
- use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
- use emacs && elisp-site-regen
-}
diff --git a/dev-lang/python-exec-conf/Manifest b/dev-lang/python-exec-conf/Manifest
new file mode 100644
index 000000000000..c05ea706bd8f
--- /dev/null
+++ b/dev-lang/python-exec-conf/Manifest
@@ -0,0 +1,3 @@
+DIST python-exec-2.4.6.tar.bz2 87634 BLAKE2B 7b6de8ad0e0603fafd3284e6e3c5247ad83f145ab4db6728914318ae8e6f5aaa3c0247f4e01238fca11519ef72fb1b11436aea7e2b8c988b8717b3f6a2a43c37 SHA512 e05eaf01b83de196a10933636ab6b1a5489a421592df49b8b58eabd0e732de970f902744cd3a06b5ab530a6d69fe6dfa8f270fbb09b9fe3df4ae04d516828050
+EBUILD python-exec-conf-2.4.6.ebuild 1168 BLAKE2B b2ba54c0b6f2e4f0f62c3f3e4769b378eed563831975065b69154efbeac4597f9d5b101bf1b32af427f601050bb881dd68bff48d65cbebe4b11d79e2d02c5996 SHA512 302786afebe1b7ab62d800be280976c1790be8de3157e7ec8ffae36491c9682ebdb8e9a02eadbd39cdf715e7a1c7f600b2726c540525645c93cf8c30802fcada
+MISC metadata.xml 240 BLAKE2B 97c523cb7da7b4b1e2c1809fadbe80a88f0760dd98356fc1b9a1d8f7514fb8a696f1d36bc45285a3dc169994c78176d2bcf1397df51f9e3227c7b2dff5849742 SHA512 57181dfbeaab954ce3f81beb68ef3458f78d2f1fb9c9c2954e0553d19806b3455721f8845eb45beccd79a20941f682487fa0e09763339012a4b5057ed4e2a524
diff --git a/dev-lang/python-exec-conf/metadata.xml b/dev-lang/python-exec-conf/metadata.xml
new file mode 100644
index 000000000000..aa2793060bf8
--- /dev/null
+++ b/dev-lang/python-exec-conf/metadata.xml
@@ -0,0 +1,8 @@
+
+
+
+
+ python@gentoo.org
+ Python
+
+
diff --git a/dev-lang/python-exec-conf/python-exec-conf-2.4.6.ebuild b/dev-lang/python-exec-conf/python-exec-conf-2.4.6.ebuild
new file mode 100644
index 000000000000..db918e82c65e
--- /dev/null
+++ b/dev-lang/python-exec-conf/python-exec-conf-2.4.6.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit python-utils-r1
+
+MY_P=${P/-conf}
+DESCRIPTION="Configuration file for dev-lang/python-exec"
+HOMEPAGE="https://github.com/mgorny/python-exec/"
+SRC_URI="https://github.com/mgorny/python-exec/releases/download/v${PV}/${MY_P}.tar.bz2"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="BSD-2"
+SLOT="2"
+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"
+# Internal Python project hack. Do not copy it. Ever.
+IUSE="${_PYTHON_ALL_IMPLS[@]/#/python_targets_}"
+
+RDEPEND="!=app-eselect/eselect-python-20140125-r1"
pkg_setup() {
if use berkdb; then
@@ -346,24 +345,3 @@ src_install() {
dosym "python${PYVER}" "/usr/bin/python${pymajor}"
dosym "python${PYVER}-config" "/usr/bin/python${pymajor}-config"
}
-
-eselect_python_update() {
- if [[ -z "$(eselect python show)" || \
- ! -f "${EROOT}/usr/bin/$(eselect python show)" ]]; then
- eselect python update
- fi
-
- if [[ -z "$(eselect python show --python${PV%%.*})" || \
- ! -f "${EROOT}/usr/bin/$(eselect python show --python${PV%%.*})" ]]
- then
- eselect python update --python${PV%%.*}
- fi
-}
-
-pkg_postinst() {
- eselect_python_update
-}
-
-pkg_postrm() {
- eselect_python_update
-}
diff --git a/dev-lang/python/python-3.10.0_alpha3.ebuild b/dev-lang/python/python-3.10.0_alpha3.ebuild
index c26b80ae4526..4f63d5703d89 100644
--- a/dev-lang/python/python-3.10.0_alpha3.ebuild
+++ b/dev-lang/python/python-3.10.0_alpha3.ebuild
@@ -60,7 +60,6 @@ BDEPEND="
virtual/pkgconfig
!sys-devel/gcc[libffi(-)]"
RDEPEND+=" !build? ( app-misc/mime-types )"
-PDEPEND=">=app-eselect/eselect-python-20140125-r1"
# large file tests involve a 2.5G file being copied (duplicated)
CHECKREQS_DISK_BUILD=5500M
diff --git a/dev-lang/python/python-3.6.12-r1.ebuild b/dev-lang/python/python-3.6.12-r1.ebuild
index 1695164047aa..d7dc0ddc2f32 100644
--- a/dev-lang/python/python-3.6.12-r1.ebuild
+++ b/dev-lang/python/python-3.6.12-r1.ebuild
@@ -56,7 +56,6 @@ DEPEND="${RDEPEND}
virtual/pkgconfig
!sys-devel/gcc[libffi(-)]"
RDEPEND+=" !build? ( app-misc/mime-types )"
-PDEPEND=">=app-eselect/eselect-python-20140125-r1"
src_prepare() {
# Ensure that internal copies of expat, libffi and zlib are not used.
@@ -330,36 +329,3 @@ src_install() {
"${scriptdir}/idle" || die
fi
}
-
-pkg_preinst() {
- if has_version "<${CATEGORY}/${PN}-${PYVER}" && ! has_version ">=${CATEGORY}/${PN}-${PYVER}_alpha"; then
- python_updater_warning="1"
- fi
-}
-
-eselect_python_update() {
- if [[ -z "$(eselect python show)" || \
- ! -f "${EROOT}/usr/bin/$(eselect python show)" ]]; then
- eselect python update
- fi
-
- if [[ -z "$(eselect python show --python${PV%%.*})" || \
- ! -f "${EROOT}/usr/bin/$(eselect python show --python${PV%%.*})" ]]
- then
- eselect python update --python${PV%%.*}
- fi
-}
-
-pkg_postinst() {
- eselect_python_update
-
- if [[ "${python_updater_warning}" == "1" ]]; then
- ewarn "You have just upgraded from an older version of Python."
- ewarn
- ewarn "Please adjust PYTHON_TARGETS (if so desired), and run emerge with the --newuse or --changed-use option to rebuild packages installing python modules."
- fi
-}
-
-pkg_postrm() {
- eselect_python_update
-}
diff --git a/dev-lang/python/python-3.7.9-r1.ebuild b/dev-lang/python/python-3.7.9-r1.ebuild
index efee2dc75560..c9f05e0a8bb6 100644
--- a/dev-lang/python/python-3.7.9-r1.ebuild
+++ b/dev-lang/python/python-3.7.9-r1.ebuild
@@ -57,7 +57,6 @@ DEPEND="${RDEPEND}
virtual/pkgconfig
!sys-devel/gcc[libffi(-)]"
RDEPEND+=" !build? ( app-misc/mime-types )"
-PDEPEND=">=app-eselect/eselect-python-20140125-r1"
src_prepare() {
# Ensure that internal copies of expat, libffi and zlib are not used.
@@ -316,36 +315,3 @@ src_install() {
"${scriptdir}/idle" || die
fi
}
-
-pkg_preinst() {
- if has_version "<${CATEGORY}/${PN}-${PYVER}" && ! has_version ">=${CATEGORY}/${PN}-${PYVER}_alpha"; then
- python_updater_warning="1"
- fi
-}
-
-eselect_python_update() {
- if [[ -z "$(eselect python show)" || \
- ! -f "${EROOT}/usr/bin/$(eselect python show)" ]]; then
- eselect python update
- fi
-
- if [[ -z "$(eselect python show --python${PV%%.*})" || \
- ! -f "${EROOT}/usr/bin/$(eselect python show --python${PV%%.*})" ]]
- then
- eselect python update --python${PV%%.*}
- fi
-}
-
-pkg_postinst() {
- eselect_python_update
-
- if [[ "${python_updater_warning}" == "1" ]]; then
- ewarn "You have just upgraded from an older version of Python."
- ewarn
- ewarn "Please adjust PYTHON_TARGETS (if so desired), and run emerge with the --newuse or --changed-use option to rebuild packages installing python modules."
- fi
-}
-
-pkg_postrm() {
- eselect_python_update
-}
diff --git a/dev-lang/python/python-3.8.6-r1.ebuild b/dev-lang/python/python-3.8.6-r1.ebuild
index 3a63d125d358..a995778caf34 100644
--- a/dev-lang/python/python-3.8.6-r1.ebuild
+++ b/dev-lang/python/python-3.8.6-r1.ebuild
@@ -57,7 +57,6 @@ DEPEND="${RDEPEND}
virtual/pkgconfig
!sys-devel/gcc[libffi(-)]"
RDEPEND+=" !build? ( app-misc/mime-types )"
-PDEPEND=">=app-eselect/eselect-python-20140125-r1"
src_prepare() {
# Ensure that internal copies of expat, libffi and zlib are not used.
@@ -320,36 +319,3 @@ src_install() {
"${scriptdir}/idle" || die
fi
}
-
-pkg_preinst() {
- if has_version "<${CATEGORY}/${PN}-${PYVER}" && ! has_version ">=${CATEGORY}/${PN}-${PYVER}_alpha"; then
- python_updater_warning="1"
- fi
-}
-
-eselect_python_update() {
- if [[ -z "$(eselect python show)" || \
- ! -f "${EROOT}/usr/bin/$(eselect python show)" ]]; then
- eselect python update
- fi
-
- if [[ -z "$(eselect python show --python${PV%%.*})" || \
- ! -f "${EROOT}/usr/bin/$(eselect python show --python${PV%%.*})" ]]
- then
- eselect python update --python${PV%%.*}
- fi
-}
-
-pkg_postinst() {
- eselect_python_update
-
- if [[ "${python_updater_warning}" == "1" ]]; then
- ewarn "You have just upgraded from an older version of Python."
- ewarn
- ewarn "Please adjust PYTHON_TARGETS (if so desired), and run emerge with the --newuse or --changed-use option to rebuild packages installing python modules."
- fi
-}
-
-pkg_postrm() {
- eselect_python_update
-}
diff --git a/dev-lang/python/python-3.8.7.ebuild b/dev-lang/python/python-3.8.7.ebuild
index eaee9eaef9c5..6d3bedd9a7f4 100644
--- a/dev-lang/python/python-3.8.7.ebuild
+++ b/dev-lang/python/python-3.8.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
@@ -57,7 +57,6 @@ DEPEND="${RDEPEND}
virtual/pkgconfig
!sys-devel/gcc[libffi(-)]"
RDEPEND+=" !build? ( app-misc/mime-types )"
-PDEPEND=">=app-eselect/eselect-python-20140125-r1"
src_prepare() {
# Ensure that internal copies of expat, libffi and zlib are not used.
@@ -320,36 +319,3 @@ src_install() {
"${scriptdir}/idle" || die
fi
}
-
-pkg_preinst() {
- if has_version "<${CATEGORY}/${PN}-${PYVER}" && ! has_version ">=${CATEGORY}/${PN}-${PYVER}_alpha"; then
- python_updater_warning="1"
- fi
-}
-
-eselect_python_update() {
- if [[ -z "$(eselect python show)" || \
- ! -f "${EROOT}/usr/bin/$(eselect python show)" ]]; then
- eselect python update
- fi
-
- if [[ -z "$(eselect python show --python${PV%%.*})" || \
- ! -f "${EROOT}/usr/bin/$(eselect python show --python${PV%%.*})" ]]
- then
- eselect python update --python${PV%%.*}
- fi
-}
-
-pkg_postinst() {
- eselect_python_update
-
- if [[ "${python_updater_warning}" == "1" ]]; then
- ewarn "You have just upgraded from an older version of Python."
- ewarn
- ewarn "Please adjust PYTHON_TARGETS (if so desired), and run emerge with the --newuse or --changed-use option to rebuild packages installing python modules."
- fi
-}
-
-pkg_postrm() {
- eselect_python_update
-}
diff --git a/dev-lang/python/python-3.9.0-r1.ebuild b/dev-lang/python/python-3.9.0-r1.ebuild
index 1135d77cd400..9a4416b1da3b 100644
--- a/dev-lang/python/python-3.9.0-r1.ebuild
+++ b/dev-lang/python/python-3.9.0-r1.ebuild
@@ -57,7 +57,6 @@ DEPEND="${RDEPEND}
virtual/pkgconfig
!sys-devel/gcc[libffi(-)]"
RDEPEND+=" !build? ( app-misc/mime-types )"
-PDEPEND=">=app-eselect/eselect-python-20140125-r1"
# large file tests involve a 2.5G file being copied (duplicated)
CHECKREQS_DISK_BUILD=5500M
diff --git a/dev-lang/python/python-3.9.1.ebuild b/dev-lang/python/python-3.9.1.ebuild
index 9f6b2edbb3a1..dfb20a04f215 100644
--- a/dev-lang/python/python-3.9.1.ebuild
+++ b/dev-lang/python/python-3.9.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
@@ -57,7 +57,6 @@ DEPEND="${RDEPEND}
virtual/pkgconfig
!sys-devel/gcc[libffi(-)]"
RDEPEND+=" !build? ( app-misc/mime-types )"
-PDEPEND=">=app-eselect/eselect-python-20140125-r1"
# large file tests involve a 2.5G file being copied (duplicated)
CHECKREQS_DISK_BUILD=5500M
diff --git a/dev-lang/qu-prolog/Manifest b/dev-lang/qu-prolog/Manifest
index 0fd754ee2ef1..fdf00ecd1a1e 100644
--- a/dev-lang/qu-prolog/Manifest
+++ b/dev-lang/qu-prolog/Manifest
@@ -1,9 +1,4 @@
-AUX qu-prolog-10.5-gcc-version.patch 872 BLAKE2B 0ca594ff48e9c58c7f99d2f4774308e0e6024188157197da75846b849f11a05f3d8331f8a16a7f31c648bf6e1f60fd2f184619dd64201ec0239fd64caf098919 SHA512 b120b532101b8adf69fe1ed7ded1cf3dc8a78a59fc74fc287cf6627f593b792b33ab2bbaa4022f2ec654e0bf2e3b64cb8bca5c5f6b2c3a41c2a1a243f703e60f
AUX qu-prolog-10.x-qt5.patch 1037 BLAKE2B 91287f26c97c0c2f1c9cd3bae3a007cf27e4b8121aca4a42cabbbb37c224b7399ed06468b7a725977f27bad2fcda8d2165bfeb569f36491d227dd472036de5ed SHA512 9dd1c8245f725d552bf23ad9ef1bb858a06c69b66778fa851013775081751a77923e2145f6575966e8394666b8dc2e04724d102be28b32efaa44b7e474b3dd7f
-DIST qp10.4.tar.gz 1671144 BLAKE2B 293cbc09a058714f762e5d371074ca1b87e8177868851a3db2606a837810b474e926c43f6715c5088c718f2b1841c46f9668795ac53edc0266a9a6d5d04386f5 SHA512 39193ba2c39dc24b234092a47f9834af5b8dff6edc34ba6e0ceb6a4bda60c2f30b951bc17ef72da1dd220ef62563c88f4106dd0115a5bf8e51045abfb96151c6
-DIST qp10.5.tar.gz 1670927 BLAKE2B 74fd47beb18f7081ade39bf215a999066a2a5e99753ee8e48751c37d7bff111d355a7713f13af43a1cffc2fa6ca5efdf89a633fba45accdef17ee265f068e57a SHA512 6a7d46f09015304ffa222c82be5d9fb28c272ce27641455113740f3a4a08887369208456c478320b30d9464d8eeea0f7fcc1c1e56e1a130134e2fe54d5446958
DIST qp10.6.tar.gz 1671349 BLAKE2B 189ddd733a0bbf939387de60ec76e8e41a430af5f4684a9a3b8cc3effa4e402cfd4471c955f4d626d2de8cf14eb93c2977540ad209d06ce9b562325a4b984fea SHA512 425b35c758ba86cc14a1faf5c19f2c091142be6c42261323dc6f551efd6c80f7223584cd2be239748539eaf25308f777d95fd5bfdc65b33ca3245377e1766299
-EBUILD qu-prolog-10.4.ebuild 1886 BLAKE2B edbc9d921adeba6e5d729b74fec6fafd6fc84be0c241f1b6109e99b21e769ccff7c94cd8dbdee767f429c76160638499a4fe42f44d1fdde49015bc42aebe832c SHA512 df532910131df9678f0500263cd05b518a49c064f86d99461e8016569dc95b5475c486f6ff703a41d701433f0c0a0f43186ab3ee7a7f51762155a5a84ab705d4
-EBUILD qu-prolog-10.5.ebuild 1962 BLAKE2B 56670281e663d1a51649fde6740370ea7f7454b094f16c514cc4daa356180d5e518ebb882bcbb576978d2875b4c8dde5bba86a3a21f7fc1774d178e5d6ccc597 SHA512 b18807094d8944eec12347d07f5624aed4d5b98d3130700e3e924ba78080832b7879c9b9791ba3c3120db978bf1a95a4bae6f5e1f9282a0a04f3b65b6390dae9
EBUILD qu-prolog-10.6.ebuild 1908 BLAKE2B fc182193b74348bd9f029fda07ffe45e1c5f6529d216817870d04181f7f641f2b6b6f3e92ed16cf6c82b6744e65eb5011ce7d96000f3628375bcf7b635e6da8a SHA512 167fe155fe6910f630a7a84386094ca4611cc28bca2188ba6c70f740075e166d2b390b6bd6614e072954154ad89ddb01204c1d85e6c66839a6df1d0699c5ef5b
MISC metadata.xml 347 BLAKE2B d0d2ead501a46ff84953eceee649d58e406ebf5a83e7b7862b9501b2e665ad71b5c9c31f4790161074debb7b86ce7e53ff8d0904c39c37ddcac6250668685aca SHA512 7a7bb3ccaa42fa120c3702d963719d5fdfcf0a413685cad98bd34a515a4cc83a213a71e7f3b6b0ce67947fa347229caecf699879192f0d930c9c6577e0ce59cc
diff --git a/dev-lang/qu-prolog/files/qu-prolog-10.5-gcc-version.patch b/dev-lang/qu-prolog/files/qu-prolog-10.5-gcc-version.patch
deleted file mode 100644
index cfc7cbfd4c14..000000000000
--- a/dev-lang/qu-prolog/files/qu-prolog-10.5-gcc-version.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- qp10.5.orig/configure.in 2019-12-29 00:57:44.000000000 +0100
-+++ qp10.5/configure.in 2020-06-25 08:53:32.610430095 +0200
-@@ -209,22 +209,6 @@
- uname \
- )
-
--#----------------------------------------------------------------------------
--dnl Check for CPP version
--AC_MSG_CHECKING([for GCC version])
--qp_cpp_ver=[`gcc --version 2>/dev/null | head -1 | sed -e 's/^[^[:digit:]]*\([[:digit:]][^[:space:]]*\).*$/\1/'`]
--if test -n "$qp_cpp_ver"; then
-- AC_MSG_RESULT($qp_cpp_ver)
-- case "$qp_cpp_ver" in
-- 2.*)
-- AC_DEFINE(GCC_VERSION_2, 1, [Whether or not the GCC is gcc 2])
-- ;;
-- esac
--else
-- AC_MSG_RESULT(not found)
-- AC_MSG_ERROR(Could not determine GCC version)
--fi
--
- #-----------------------------------------------------------------------------
- dnl Check for -fno-strict-aliasing
- AC_MSG_CHECKING([for -fno-strict-aliasing])
diff --git a/dev-lang/qu-prolog/qu-prolog-10.4.ebuild b/dev-lang/qu-prolog/qu-prolog-10.4.ebuild
deleted file mode 100644
index c06392ec7013..000000000000
--- a/dev-lang/qu-prolog/qu-prolog-10.4.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit eutils multilib qmake-utils
-
-MY_P=qp${PV}
-
-DESCRIPTION="Extended Prolog supporting quantifiers, object-variables and substitutions"
-HOMEPAGE="http://www.itee.uq.edu.au/~pjr/HomePages/QuPrologHome.html"
-SRC_URI="http://www.itee.uq.edu.au/~pjr/HomePages/QPFiles/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0 GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="debug doc examples pedro qt5 readline threads"
-
-RDEPEND="
- !dev-util/mpatch
- !dev-util/rej
- qt5? (
- dev-qt/qtwidgets:5
- dev-qt/qtgui:5
- )
- pedro? ( net-misc/pedro )
- readline? ( app-misc/rlwrap )"
-DEPEND="${RDEPEND}
- dev-lang/perl"
-
-S="${WORKDIR}"/${MY_P}
-
-src_prepare() {
- eapply "${FILESDIR}"/${PN}-10.x-qt5.patch
- eapply_user
-}
-
-src_configure() {
- econf \
- --libdir=/usr/$(get_libdir) \
- $(use_enable debug) \
- $(use_enable threads multiple-threads)
-
- if use qt5; then
- cd "${S}"/src/xqp || die
- eqmake5 xqp.pro
- fi
-}
-
-src_compile() {
- emake OPTIMISATION="${CXXFLAGS}"
-
- if use qt5; then
- cd "${S}"/src/xqp || die
- emake
- fi
-}
-
-src_install() {
- sed \
- -e "s|${S}|/usr/$(get_libdir)/qu-prolog|g" \
- -i bin/qc bin/qc1.qup bin/qecat bin/qg bin/qp || die
-
- dobin bin/{qc,qecat,qp,kq}
-
- use qt5 && dobin src/xqp/xqp
-
- into /usr/$(get_libdir)/${PN}
- dobin bin/{qa,qc1.qup,qdeal,qem,qg,ql,qppp}
-
- insinto /usr/$(get_libdir)/${PN}/bin
- doins bin/rl_commands
- doins bin/{qc1.qup,qecat,qg,qp}.qx
-
- insinto /usr/$(get_libdir)/${PN}/library
- doins prolog/library/*.qo
-
- insinto /usr/$(get_libdir)/${PN}/compiler
- doins prolog/compiler/*.qo
-
- doman doc/man/man1/*.1
-
- dodoc README
-
- if use doc ; then
- docinto reference-manual
- dodoc doc/manual/*.html
- docinto user-guide
- dodoc doc/user/main.pdf
- fi
-
- if use examples ; then
- docinto examples
- newdoc examples/README README.examples
- dodoc examples/*.ql
- fi
-}
diff --git a/dev-lang/qu-prolog/qu-prolog-10.5.ebuild b/dev-lang/qu-prolog/qu-prolog-10.5.ebuild
deleted file mode 100644
index 36fdb457ce21..000000000000
--- a/dev-lang/qu-prolog/qu-prolog-10.5.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools eutils multilib qmake-utils
-
-MY_P=qp${PV}
-
-DESCRIPTION="Extended Prolog supporting quantifiers, object-variables and substitutions"
-HOMEPAGE="http://www.itee.uq.edu.au/~pjr/HomePages/QuPrologHome.html"
-SRC_URI="http://www.itee.uq.edu.au/~pjr/HomePages/QPFiles/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0 GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="debug doc examples pedro qt5 readline threads"
-
-RDEPEND="
- !dev-util/mpatch
- !dev-util/rej
- qt5? (
- dev-qt/qtwidgets:5
- dev-qt/qtgui:5
- )
- pedro? ( net-misc/pedro )
- readline? ( app-misc/rlwrap )"
-DEPEND="${RDEPEND}
- dev-lang/perl"
-
-S="${WORKDIR}"/${MY_P}
-
-src_prepare() {
- eapply "${FILESDIR}"/${PN}-10.x-qt5.patch
- eapply "${FILESDIR}"/${PN}-10.5-gcc-version.patch
- eapply_user
-
- eautoconf
-}
-
-src_configure() {
- econf \
- --libdir=/usr/$(get_libdir) \
- $(use_enable debug) \
- $(use_enable threads multiple-threads)
-
- if use qt5; then
- cd "${S}"/src/xqp || die
- eqmake5 xqp.pro
- fi
-}
-
-src_compile() {
- emake OPTIMISATION="${CXXFLAGS}"
-
- if use qt5; then
- cd "${S}"/src/xqp || die
- emake
- fi
-}
-
-src_install() {
- sed \
- -e "s|${S}|/usr/$(get_libdir)/qu-prolog|g" \
- -i bin/qc bin/qc1.qup bin/qecat bin/qg bin/qp || die
-
- dobin bin/{qc,qecat,qp,kq}
-
- use qt5 && dobin src/xqp/xqp
-
- into /usr/$(get_libdir)/${PN}
- dobin bin/{qa,qc1.qup,qdeal,qem,qg,ql,qppp}
-
- insinto /usr/$(get_libdir)/${PN}/bin
- doins bin/rl_commands
- doins bin/{qc1.qup,qecat,qg,qp}.qx
-
- insinto /usr/$(get_libdir)/${PN}/library
- doins prolog/library/*.qo
-
- insinto /usr/$(get_libdir)/${PN}/compiler
- doins prolog/compiler/*.qo
-
- doman doc/man/man1/*.1
-
- dodoc README
-
- if use doc ; then
- docinto reference-manual
- dodoc doc/manual/*.html
- docinto user-guide
- dodoc doc/user/main.pdf
- fi
-
- if use examples ; then
- docinto examples
- newdoc examples/README README.examples
- dodoc examples/*.ql
- fi
-}
diff --git a/dev-lang/sassc/Manifest b/dev-lang/sassc/Manifest
index 44cdbd97244f..bb24c2aabb6f 100644
--- a/dev-lang/sassc/Manifest
+++ b/dev-lang/sassc/Manifest
@@ -1,5 +1,5 @@
DIST sassc-3.6.0.tar.gz 26111 BLAKE2B 91d634bd652607407c48f141aa39260739357f6eeb4bade1fff1bfdd4e4e6e0757712501395c913ef1a8944ec9174649fa5ce657af4afec6f9f0eb7f804e1ff2 SHA512 0d8de651b1587f4994a5da85ad09ec2ce6e240213dbaa567c6b9baa612fe82e337061d9a5a8a3a5588e4c366c1178b6fd04e9d699a0be3d83c68f98bac774527
DIST sassc-3.6.1.tar.gz 26137 BLAKE2B 73aaabe4f4dab7efdaef591918da8a4bd79e98dff0105666548f00b09657f46d2e28523988d60eef7f4b1eedacbfe17638e96f5a9c98a5325ef9e56f681c0e28 SHA512 b6df8f481db0737ca08808c0849dcbd83e80799d883271d382607b7a74028153195f5f9c26768ffe1a9a92ee8c26be3c382ad7b3a5336eb6e4a0dad58132690e
EBUILD sassc-3.6.0.ebuild 499 BLAKE2B 32e47680611689f022aa863cb12310bc456cf14817c871da23108872d2a7af046f73d9cf14ebb8a1ca48b5c688a15f4d6c9799268b75218a3ca5fe5a11d9313e SHA512 178d94cff7e1f973beac530b4f0f602d190c31977bfd0bc2a6e9966856fa8aa12aaa90e1995d6ec1201f0dbd5f362820d44b9fef73f6b9bfb944268bcd84574a
-EBUILD sassc-3.6.1.ebuild 502 BLAKE2B ddfa6745821608abf9caa2adc33095926bfe70cd35ede53987c7b8be1822dfed2d5c43bf91ce27f143ef27187a9391e544981f1f6090cbfe3f3bfcb8bf073263 SHA512 a099c2019d7817f413a0eefc80685ffed018878e4acfe3b481b016f9df83aa002e4d18dde1f63863258a2431aabf5de6292cc284107cda95d21972b07285fb17
+EBUILD sassc-3.6.1.ebuild 546 BLAKE2B b6a2bda5cdcd18a58622390d9f614d0fbcbc6e692ee06fe682b072665666707ef63a83925b1848b2a2e7f53ec3e1103578f48abc9b8aacc8a90fd5af36e7388e SHA512 41bc9e59c44eda32ca9e188422512d84dc087efe400a9c27248b1743e468630d456506697e0a6ff8d66ea725f6b08674857f7aabdecf30e32b4a6e50e44d4e45
MISC metadata.xml 481 BLAKE2B 4f5d2e0062ba66e18b394807ae98e1ebe8925d0f094f969406f4d3c3cbed7fb001adfe41f1b61246df24f89e11b142d31027dfde07cfb919c60a2fece1ed20fe SHA512 2ba528dc5a56c29561f5b7644b5a428d99383965052233f4b5b03e0796a5e0bf1d7747548f9a7edde41471cacab1269d3c1cce089bba8ab33d903b4cd48585f7
diff --git a/dev-lang/sassc/sassc-3.6.1.ebuild b/dev-lang/sassc/sassc-3.6.1.ebuild
index 309816f17dd5..82d1a97e1181 100644
--- a/dev-lang/sassc/sassc-3.6.1.ebuild
+++ b/dev-lang/sassc/sassc-3.6.1.ebuild
@@ -21,5 +21,6 @@ DOCS=( Readme.md )
src_prepare() {
default
+ [[ -f VERSION ]] || echo "${PV}" > VERSION
eautoreconf
}
diff --git a/dev-lang/tk/Manifest b/dev-lang/tk/Manifest
index 7d3980124eca..2517bc51cb59 100644
--- a/dev-lang/tk/Manifest
+++ b/dev-lang/tk/Manifest
@@ -10,11 +10,13 @@ AUX tk-8.6.9-conf.patch 407 BLAKE2B 13662318b4c5029802f74551a6a194e27ddb6dbf2e5c
DIST tk8.5.17-src.tar.gz 4095985 BLAKE2B 4cbb140c30ca717ee499b9ad9e1a3df27a470a78613edbaec425c39afaa41d59276bbe487933a4e77a9722fcafa9113b203cf5c828660bdeb38f667c3263c3cd SHA512 ddadc738c2567e35d1257b59212c8a0eb70a1bf041d986bc6df3b841b51d934d79a0ef389c928223a64516a92cae3357b2c789edca9c8a626ff4c1cf320c4f4f
DIST tk8.6.10-src.tar.gz 4444764 BLAKE2B f56647e005778c802352aee0257c0a8f5e0014c9d21362592f08030252d83141cca385f0fb95c0e7e930016255c3b2cef49a65064e056a877214b7d7a1a01246 SHA512 d12ef3a5bde9e10209a24e9f978bd23360a979d8fa70a859cf750a79ca51067a11ef6df7589303b52fe2a2baed4083583ddaa19e2c7cb433ea523639927f1be5
DIST tk8.6.11-src.tar.gz 4496914 BLAKE2B c3050a48d5cb3bd3095b2c439b3d33992551f953a981bf23eedbf774368b383abc77fb3156aa4bcaae658d0706495cff03536ab8258f9d824ff8f4325b36cc38 SHA512 2e11490f2f51ef7e723661dd91c95622234fb97850e80d8ecd564be8c28f7c8fb0334a97cf8267af9d68f63e4adea887a1a4eec8d2e807d6a970b5912f99d3f2
+DIST tk8.6.11.1-src.tar.gz 4496008 BLAKE2B d7bae2fa535411ad8620ec81cdc0b34a1206fed82f50dbd98d3977af46ac43f794166cb7029f274f7903228c62ce83dfbd56cea06669ff1e382b185d733b0792 SHA512 e2a1d27ba63601731d43c4c4e2b658771a14afd97ef8231f8bc7854e762b83a42f23b8db600e4b4a4a14ae6fc97378d0b9a9a180ae09308b9d12436ec2b176c4
DIST tk8.6.8-src.tar.gz 4319854 BLAKE2B 167c5dc6c32e49653c04bc067c3d75df022ca230657be32797021b0e2f7748215d9ad0493c8020b8d1be1f005b9b2d561339a6a0b209721c0d05dd222d47d377 SHA512 d0d30637b733fb0b0d38461b6d872934c04af422fcdb7ec41a72331b2529cc94414e6f441f95a98642d69505e4f41469847fedd1cbe58bd08cdd818fcabd1db9
DIST tk8.6.9-src.tar.gz 4364606 BLAKE2B 9c96d977aa72dcc0c8d2a570d644284a1eef217ef082d8a78461bdcb4845e206ccad59cb5bc21ef80e32ea19951fa3a845e45059bb9eaf0756f128a95530260c SHA512 654d73aad006e628110057681477b958b7ec0a42287bc78259fb4b84635e7ebe757e69099d66c0c73479bc506ca66fa5baf13f13b0f403d60b2c54fd48a4a686
DIST tk8.6.9.1-src.tar.gz 4364603 BLAKE2B 3d96637ceadc28977f8b4532be071907d64f11bd22881baf02aa6fa2778b607437edce8f1ed02e7011bcf78468128f7bfe81ee6dac9bd73a796e7fefae130dcf SHA512 b9c811ffc8326331ae03c6fb25ea71f7a5eaeebd9d5a16a51a1671d0f0422268bd351b077e17ae925f0a7eddac9642aa640658615c52d4269c299373af031a92
EBUILD tk-8.5.17-r1.ebuild 3560 BLAKE2B 93ed1cb14c0c19a0550bbbac0e709bc4679af057b621655d7d6e708ae2f48f78146c64e507eed8db9ae67ffcdb1f3c1ce0b0a12c1b72bd6247190bd2708ba377 SHA512 3a635f4158f718ca599d2a27b1438ae4322410b4db224ec5026b7667f1e61550df0f979451cd87fa22c6e861e251704e64e53717bbff18daa0bc334f22b3a714
EBUILD tk-8.6.10.ebuild 4156 BLAKE2B 9e1b4c777abe66af6a726cf13c083f24a3a272db6dd02b4f077412cbf0f957ad3b2e2b587ad0d730fb59c9afc2d280bb003881739dcc33c7ad3b551e89f8cfd7 SHA512 813ad0926c98367e2685ad32c0dc44d1003bcfb793dbb8869b8ccf3140eaf0c9f99f0a60e135ed8b2d92711cb67602298e42ffbf30ce4a36e3c361881009f052
+EBUILD tk-8.6.11.1.ebuild 4056 BLAKE2B 6c6d5f5f7d825e971e1fa9c31d1bd9c5ee0e2959ea1f7014bd3c10bb313eefb7a8334a60970b1f261ec17b09b23cd420fc9a1be4b608c883d93faf6fac289c63 SHA512 21cdb1f4580d76ade2fad0c6d28f46f3c9b1b00f835a1db4ebdf7eb9e5cdda7586721c5ebf236b947709dd44b5a0618e07d2a4b242eedcec474d2b544f61a3a0
EBUILD tk-8.6.11.ebuild 4048 BLAKE2B 64f027de88ee55d7ad3b81d2bbc154913ff5525b01ca922ce32d81d5114fee12042dddfd41da878701e7bd12f9d79a3abe57333a11e48630c5ce705b6570a96c SHA512 40109fce5eb93a0501c2034a7fd38760d67d59df26c2439b395044a4bef73664f2843a62d87afa06add74772ca69ecd3c0c2e87efd80427b0d42befc9d4f2c9d
EBUILD tk-8.6.8.ebuild 4109 BLAKE2B 143bb4e973d2dc0cbf2fe44d261115c17dee16936a865dd870d2f673fcf843ee9de82321087c8d4a4229185ec5e6eec96a92e2b51d3ea636e3a8ba4d88480faa SHA512 125ab4cbd73fc23d0aab1d426ebf21ac117c292de310cbd192f472db38b0249529857acfc8fdcb926b39d98584269aedd663adf2db9b85bda935eb4e215ef606
EBUILD tk-8.6.9.1.ebuild 4054 BLAKE2B c43eb1108e479d3d68d0ad12f7949a9674368228c0273460f8947c287405bad09fc2b31e65cfc738cc3ed09813fe9a18ddeaed2eca8a26e0abf57ff3c840a53b SHA512 f5b53c321f8c535b4671464e230c78b8328b74e107b313d4338a7cfe421903cb1385410cbf1775292622a1b6db208c4f10272d1077e41ea37e0e5545e526d174
diff --git a/dev-lang/tk/tk-8.6.11.1.ebuild b/dev-lang/tk/tk-8.6.11.1.ebuild
new file mode 100644
index 000000000000..f033c912f9c6
--- /dev/null
+++ b/dev-lang/tk/tk-8.6.11.1.ebuild
@@ -0,0 +1,146 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools multilib-minimal prefix toolchain-funcs virtualx
+
+MY_P="${PN}${PV/_beta/b}"
+
+DESCRIPTION="Tk Widget Set"
+HOMEPAGE="http://www.tcl.tk/"
+SRC_URI="mirror://sourceforge/tcl/${MY_P}-src.tar.gz"
+
+LICENSE="tcltk"
+SLOT="0/8.6"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="debug +threads truetype aqua xscreensaver"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ !aqua? (
+ >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}]
+ >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+ >=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}]
+ truetype? ( >=x11-libs/libXft-2.3.1-r1[${MULTILIB_USEDEP}] )
+ xscreensaver? ( >=x11-libs/libXScrnSaver-1.2.2-r1[${MULTILIB_USEDEP}] )
+ )
+ ~dev-lang/tcl-$(ver_cut 1-3):0=[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}
+ !aqua? ( x11-base/xorg-proto )"
+
+# Not bumped to 8.6
+#RESTRICT=test
+
+SPARENT="${WORKDIR}/${PN}$(ver_cut 1-3 ${PV})"
+S="${SPARENT}"/unix
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-8.6.10-multilib.patch
+ "${FILESDIR}"/${PN}-8.4.15-aqua.patch
+ "${FILESDIR}"/${PN}-8.6.9-conf.patch # Bug 125971
+ "${FILESDIR}"/${PN}-8.6.11-test.patch
+)
+
+src_prepare() {
+ find \
+ "${SPARENT}"/compat/* \
+ -delete || die
+
+ pushd "${SPARENT}" &>/dev/null || die
+ default
+ popd &>/dev/null || die
+ eprefixify Makefile.in
+
+ # Make sure we use the right pkg-config, and link against fontconfig
+ # (since the code base uses Fc* functions).
+ sed \
+ -e 's/FT_New_Face/XftFontOpen/g' \
+ -e "s:\:$(tc-getPKG_CONFIG):" \
+ -e 's:xft freetype2:xft freetype2 fontconfig:' \
+ -i configure.in || die
+ rm configure || die
+
+ tc-export CC
+
+ sed \
+ -e '/chmod/s:555:755:g' \
+ -i Makefile.in || die
+
+ sed \
+ -e 's:-O[2s]\?::g' \
+ -i tcl.m4 || die
+
+ mv configure.{in,ac} || die
+
+ eautoconf
+
+ multilib_copy_sources
+}
+
+multilib_src_configure() {
+ if tc-is-cross-compiler ; then
+ export ac_cv_func_strtod=yes
+ export tcl_cv_strtod_buggy=1
+ fi
+
+ local mylibdir=$(get_libdir)
+
+ econf \
+ --with-tcl="${EPREFIX}/usr/${mylibdir}" \
+ $(use_enable threads) \
+ $(use_enable aqua) \
+ $(use_enable truetype xft) \
+ $(use_enable xscreensaver xss) \
+ $(use_enable debug symbols)
+}
+
+multilib_src_test() {
+ CI=1 virtx emake test
+}
+
+multilib_src_install() {
+ #short version number
+ local v1=$(ver_cut 1-2)
+ local mylibdir=$(get_libdir)
+
+ S= default
+
+ # normalize $S path, bug #280766 (pkgcore)
+ local nS="$(cd "${S}"; pwd)"
+
+ # fix the tkConfig.sh to eliminate refs to the build directory
+ # and drop unnecessary -L inclusion to default system libdir
+
+ sed \
+ -e "/^TK_BUILD_LIB_SPEC=/s:-L${S}-\w*\.\w* ::g" \
+ -e "/^TK_LIB_SPEC=/s:-L${EPREFIX}/usr/${mylibdir} *::g" \
+ -e "/^TK_SRC_DIR=/s:${SPARENT}:${EPREFIX}/usr/${mylibdir}/tk${v1}/include:g" \
+ -e "/^TK_BUILD_STUB_LIB_SPEC=/s:-L${S}-\w*\.\w* *::g" \
+ -e "/^TK_STUB_LIB_SPEC=/s:-L${EPREFIX}/usr/${mylibdir} *::g" \
+ -e "/^TK_BUILD_STUB_LIB_PATH=/s:${S}-\w*\.\w*:${EPREFIX}/usr/${mylibdir}:g" \
+ -e "/^TK_LIB_FILE=/s:'libtk${v1}..TK_DBGX..so':\"libk${v1}\$\{TK_DBGX\}.so\":g" \
+ -i "${ED}"/usr/${mylibdir}/tkConfig.sh || die
+ if use prefix && [[ ${CHOST} != *-darwin* && ${CHOST} != *-mint* ]] ; then
+ sed \
+ -e "/^TK_CC_SEARCH_FLAGS=/s|'$|:${EPREFIX}/usr/${mylibdir}'|g" \
+ -e "/^TK_LD_SEARCH_FLAGS=/s|'$|:${EPREFIX}/usr/${mylibdir}'|" \
+ -i "${ED}"/usr/${mylibdir}/tkConfig.sh || die
+ fi
+
+ # install private headers
+ insinto /usr/${mylibdir}/tk${v1}/include/unix
+ doins "${S}"/*.h
+ insinto /usr/${mylibdir}/tk${v1}/include/generic
+ doins "${SPARENT}"/generic/*.h
+ rm -f "${ED}"/usr/${mylibdir}/tk${v1}/include/generic/{tk,tkDecls,tkPlatDecls}.h || die
+
+ # install symlink for libraries
+ dosym libtk${v1}$(get_libname) /usr/${mylibdir}/libtk$(get_libname)
+ dosym libtkstub${v1}.a /usr/${mylibdir}/libtkstub.a
+
+ if multilib_is_native_abi; then
+ dosym wish${v1} /usr/bin/wish
+ dodoc "${SPARENT}"/{ChangeLog*,README.md,changes}
+ fi
+}
diff --git a/dev-lang/yap/Manifest b/dev-lang/yap/Manifest
index 0f10a6b35a22..18933d3f32dc 100644
--- a/dev-lang/yap/Manifest
+++ b/dev-lang/yap/Manifest
@@ -1,7 +1,4 @@
DIST YAP-6.3.4.tar.gz 11007893 BLAKE2B d8024fb68269bbb4f9a434e2be13b4a42aa250f7e6505ef8f6e4c76d50510e04e9a2985796ce66b1d426a877646eafeecb30774c353f5a820c32dc3cbdf20b1c SHA512 67884b98bbc564f23f88cbb1462127a47f3d0602ac347d1c8b0857e5d8ebd9d0ca28770229a6beb52493c6c3256b6cdf8dad25ed2963c64102093f70c4c20a3a
-DIST yap-6.3.3-gentoo-patchset-13.tar.gz 8677 BLAKE2B ebaea8e2851a5025482422161cfca8f5c65bea65e08ed0fd8032956a909bcf8e486558705b663004aa506a614dc4d638107e3ad5fc590fc3b74a0fd203fb33d3 SHA512 b1a2b202ce05c97aebf8c869d24276f7ca12c6f1027886902d8cd7267cd623ed73c5652f49e7e58386a93b37dcfbdfc83e3b0bd1aeddb95245a5f0e8adcc852b
-DIST yap-6.3.3.tar.gz 7879301 BLAKE2B 1b12a3113dd57634df64680726fd49575979b84126a7a9e1f4d1429be90e1b95599166151ffe62c9ef990ac3c32f57a1efae081b864fc22225c93d21807f412b SHA512 4ef45277ec84b6e072fa54afc7d6c18f11c3a0cdf477e35e35a0ce2181c9ff2e693f8735f63a1899373f6baf79ce0a972b37e1ae6ed8271bec60663f477bbe80
DIST yap-6.3.4-gentoo-patchset-0.tar.gz 5165 BLAKE2B 1f6c9f91f2d2c0e9488f26e1a8079a40ed30c1c83c7171024dd0c0115874e336bbdfa449246e363d0030bd05dc0d86e9efa19cc2fdc4d04b96faeb33b9ade9d0 SHA512 a2a39869042cb647dc022b34a4dd0881a6a35ad0bf88527380d6d74e5307f9dd0ab5feea8e9e922524e3dce39132ab6c8cadd78f92735e2c368d7b277cbe6944
-EBUILD yap-6.3.3-r1.ebuild 2900 BLAKE2B c910366dce14626845c9d8e5d3b571a45dfad735228cc0b9852c0e967fb264620280d2fee5ec5ad496c0ca507e0eab499368ea545188a6e05413410365dc9234 SHA512 b2c3eee06745115093a5c63429f0838b09d43b5e273ab7a6e5edc746bdcf9b892ec0bc2c9ef830438defe1efc0ba74fea5cca9d84e2b34fb851bb0eb2145ff35
EBUILD yap-6.3.4.ebuild 3435 BLAKE2B 76a1a62f4f39fc3646e57d275608c662e98f2390dec3956d61ff6d0735cff265b3eeabf75b8fbb430511969984b633cd35b5dac3c7d38edd896dc8234de96e29 SHA512 9b38c8e553566c374fcee28d91307b0c98a36e59dd0fa54cb689828afd9c6462809d290e462e62dc88241e9db65aba8dbace42cd7f0b90c59ca17c5929498d5e
MISC metadata.xml 388 BLAKE2B 6664a3afcf7d766c6167c87d139aeb008ebf1525528dbb8b6b0b9e051279a60083a3858149aaaf579563c8ddc12b3c02b9712b37d52244b659eb7d953ba946ad SHA512 cdd5e0418ac4fd525d5cbde6982591d542d9accbb48e4d7726c21257dfb114ca2c7438c2c9c914368fb407ab32ac1edd02d918689ba8a1cba4035e20135c64dd
diff --git a/dev-lang/yap/yap-6.3.3-r1.ebuild b/dev-lang/yap/yap-6.3.3-r1.ebuild
deleted file mode 100644
index 97ef2fda8f97..000000000000
--- a/dev-lang/yap/yap-6.3.3-r1.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic java-pkg-opt-2
-
-PATCHSET_VER="13"
-
-DESCRIPTION="YAP is a high-performance Prolog compiler"
-HOMEPAGE="http://www.dcc.fc.up.pt/~vsc/Yap/"
-SRC_URI="http://www.dcc.fc.up.pt/~vsc/Yap/${P}.tar.gz
- https://dev.gentoo.org/~keri/distfiles/yap/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz"
-
-LICENSE="Artistic LGPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="R debug doc examples gmp java mpi mysql odbc readline static threads"
-
-RDEPEND="sys-libs/zlib
- gmp? ( dev-libs/gmp:0 )
- java? ( >=virtual/jdk-1.4:= )
- mpi? ( virtual/mpi )
- mysql? ( dev-db/mysql-connector-c:0= )
- odbc? ( dev-db/unixODBC )
- readline? ( sys-libs/readline:= sys-libs/ncurses:= )
- R? ( dev-lang/R )"
-
-DEPEND="${RDEPEND}
- doc? ( app-text/texi2html )"
-
-PATCHES=( "${WORKDIR}"/${PV} )
-
-src_prepare() {
- default
- rm -rf "${S}"/yap || die "failed to remove yap xcode project"
-
- # Fix QA error on doc location
- local mFile
- for mFile in Makefile.in packages/Dialect.defs.in \
- $(find packages -name Makefile.in) ; do
- sed -i -e "s~doc/Yap~doc/${PF}~" "${mFile}" || die
- done
-}
-
-src_configure() {
- append-flags -fno-strict-aliasing
-
- local myddas_conf
- if use mysql || use odbc; then
- myddas_conf="--enable-myddas"
- else
- myddas_conf="--disable-myddas"
- fi
- if use mysql; then
- myddas_conf="$myddas_conf yap_with_mysql=yes"
- fi
- if use odbc; then
- myddas_conf="$myddas_conf yap_with_odbc=yes"
- fi
-
- econf \
- --libdir=/usr/$(get_libdir) \
- --disable-chr \
- --disable-prism \
- --disable-gecode \
- $(use_enable !static dynamic-loading) \
- $(use_enable threads) \
- $(use_enable threads pthread-locking) \
- $(use_enable debug debug-yap) \
- $(use_enable debug low-level-tracer) \
- $(use_with gmp) \
- $(use_with readline) \
- $(use_with mpi) \
- $(use_with mpi mpe) \
- $(use_with java) \
- $(use_with R) \
- ${myddas_conf}
-}
-
-src_compile() {
- default
-
- if use doc ; then
- emake html
- fi
-}
-
-src_test() {
- # libtai package contains check.c which confuses the default
- # src_test() function
- true
-}
-
-src_install() {
- default
-
- dodoc changes*.html README
-
- if use doc ; then
- dodoc yap.html
- fi
-
- if use examples ; then
- insinto /usr/share/doc/${PF}/examples/chr
- doins packages/chr/Examples/*
- insinto /usr/share/doc/${PF}/examples/clib
- doins packages/clib/demo/*
- insinto /usr/share/doc/${PF}/examples/http
- doins -r packages/http/examples/*
- insinto /usr/share/doc/${PF}/examples/plunit
- doins packages/plunit/examples/*
- if use java ; then
- insinto /usr/share/doc/${PF}/examples/jpl/prolog
- doins packages/jpl/examples/prolog/*
- insinto /usr/share/doc/${PF}/examples/jpl/java
- doins packages/jpl/examples/java/README
- doins -r packages/jpl/examples/java/*/*.{java,pl}
- fi
- if use mpi ; then
- insinto /usr/share/doc/${PF}/examples/mpi
- doins library/mpi/examples/*.pl
- fi
- fi
-}
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 6457beb3f9fb..a4f6eef558bc 100644
Binary files a/dev-libs/Manifest.gz and b/dev-libs/Manifest.gz differ
diff --git a/dev-libs/libical/Manifest b/dev-libs/libical/Manifest
index 5e751a861d1e..33c31a16e4a4 100644
--- a/dev-libs/libical/Manifest
+++ b/dev-libs/libical/Manifest
@@ -2,5 +2,7 @@ AUX libical-3.0.4-tests.patch 747 BLAKE2B 41c72700e8a87c3665144bf12e7ea2c7f74c17
AUX libical-3.0.5-pkgconfig-libdir.patch 1229 BLAKE2B 3bfb99d68c9c379b1c64d84091c6ee3af676e8cb8d6082783f1f15dd430f73c8b82d403d120f1b2cb682c71313ef4262f42923ffc72480ab83d9b42aacee4df1 SHA512 24d312f8f6ad9c1a3d10ffd3ea96893a2345eefcf7485b6464a8879d561f8d23922c84560765dea3b83614eacb4ee6efe63c9233cf8964c441ae17630d001c37
AUX libical-3.0.8-icu-68.patch 1630 BLAKE2B 9622dac19255518e5a4d1876d6c27613f0d765cd7968ce148e42cf3cb13cbd3439d6d802352101a4b3a07f4a8f82b7e151f2239fbe8d792ab536707db75347dd SHA512 98b0b685676e7aa54e49050ec8adab4bb6cd3827fcd3977c156d841a527268cb47b3227852036f4bb195931ae8295fa6761bc96f4d4042f059193ab6f75aa27a
DIST libical-3.0.8.tar.gz 881462 BLAKE2B e31dd1c823be033abbecd0373af784f1f57e533df56ca91ea467deb02cdda2a719f22882195b639182b85fcf4e59d56229dbf601d2c909c2c91b355c32022622 SHA512 ce015e6d4c1c7cb4af7b45748ce8251c663f80f6a4357ddff6a97796642619abe882f4cadeca10cabeb1b25577869f436da15bca882e032eb3ff0475f6010d8b
+DIST libical-3.0.9.tar.gz 886500 BLAKE2B 66810ce13d70f9f1da62ff4d4c9dbff4953a644e939f55770cd4ca367293125b47590297b64a4b755cfb11315dfb4e77ad926390cde1c2d16847d24561288750 SHA512 4a9894d82776437cb2ef16df70bffb52da7b4fd57b52a4f6941430b3b1f9830829f0775fb495411f67393581bda1304b54c9f0031bc3d4ada56d2204900cb268
EBUILD libical-3.0.8.ebuild 2331 BLAKE2B f6e81653753042d4972d6cb79a887c430b7f8d5c46b06dc3d351f30e715b2e54231cb06f86d36d653b5bf730916f2196f8766b068cfa84eec8da257f193b9e6b SHA512 275f3a0a521c4225f14f680018968690443e51a33533f4b769557d23e9c76ca7e3cbcb740444955752b5f0bd7b3c8dd91f0eb0515a20ad73f57a76604be08503
+EBUILD libical-3.0.9.ebuild 2265 BLAKE2B 0042ba8853fa0736c8d4db5badd0a8c7e5d8b7b4d91ab2f7368541a95368241cf3b1fc1a600e7989eebd490d091017f52add482bfe15b7b7a042f859c0fdfb81 SHA512 f9d7306fc2c907e7e50be4dc38a4f1a99ff32e8829f909daf3e68752254de41cbbd6fd57afb0d9c2393893a8093bd734febaea7b4832be81e310ee96940c663d
MISC metadata.xml 414 BLAKE2B a98ae31f47d5352b02643040fc01547b8895bf62ca72627e61dfe16ce4e6084c3448c216a04fb3d5a4fe955de6f7ce6821096a5febc01f610bdd674266ccf968 SHA512 5b408580f7e11fd645b7759556b6cef87a57d381abaf38c46c1e4331f75bb4f909d22b3afdeab9a2acda485684d52929cc564fe01ad2963f5e7fa914f9db82c0
diff --git a/dev-libs/libical/libical-3.0.9.ebuild b/dev-libs/libical/libical-3.0.9.ebuild
new file mode 100644
index 000000000000..9ab9acb8a1be
--- /dev/null
+++ b/dev-libs/libical/libical-3.0.9.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+VALA_USE_DEPEND="vapigen"
+inherit cmake python-any-r1 vala
+
+DESCRIPTION="An implementation of basic iCAL protocols"
+HOMEPAGE="https://github.com/libical/libical"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="|| ( MPL-2.0 LGPL-2.1 )"
+SLOT="0/3"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+IUSE="berkdb doc examples +glib +introspection static-libs test vala"
+
+REQUIRED_USE="introspection? ( glib ) vala? ( introspection )"
+
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+ dev-lang/perl
+ virtual/pkgconfig
+ doc? ( app-doc/doxygen )
+ introspection? ( dev-libs/gobject-introspection )
+ test? ( ${PYTHON_DEPS} )
+ vala? ( $(vala_depend) )
+"
+COMMON_DEPEND="
+ dev-libs/icu:=
+ berkdb? ( sys-libs/db:= )
+ glib? ( dev-libs/glib:2 )
+"
+DEPEND="${COMMON_DEPEND}
+ glib? ( dev-libs/libxml2:2 )
+"
+RDEPEND="${COMMON_DEPEND}
+ sys-libs/timezone-data
+"
+
+DOCS=(
+ AUTHORS ReadMe.txt ReleaseNotes.txt TEST THANKS TODO
+ doc/{AddingOrModifyingComponents,UsingLibical}.txt
+)
+
+PATCHES=(
+ "${FILESDIR}/${PN}-3.0.4-tests.patch"
+ "${FILESDIR}/${PN}-3.0.5-pkgconfig-libdir.patch"
+)
+
+pkg_setup() {
+ use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+ cmake_src_prepare
+ use examples || cmake_comment_add_subdirectory examples
+ use vala && vala_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake_use_find_package berkdb BDB)
+ -DICAL_BUILD_DOCS=$(usex doc)
+ -DICAL_GLIB=$(usex glib)
+ -DGOBJECT_INTROSPECTION=$(usex introspection)
+ -DSHARED_ONLY=$(usex !static-libs)
+ -DLIBICAL_BUILD_TESTING=$(usex test)
+ -DICAL_GLIB_VAPI=$(usex vala)
+ )
+ if use vala; then
+ mycmakeargs+=(
+ -DVALAC="${VALAC}"
+ -DVAPIGEN="${VAPIGEN}"
+ )
+ fi
+ cmake_src_configure
+}
+
+src_compile() {
+ cmake_src_compile
+ use doc && cmake_src_compile docs
+}
+
+src_test() {
+ local myctestargs=(
+ -E "(icalrecurtest|icalrecurtest-r)" # bug 660282
+ )
+
+ cmake_src_test
+}
+
+src_install() {
+ use doc && HTML_DOCS=( "${BUILD_DIR}"/apidocs/html/. )
+
+ cmake_src_install
+
+ if use examples; then
+ rm examples/CMakeLists.txt || die
+ dodoc -r examples
+ fi
+}
diff --git a/dev-libs/libretls/Manifest b/dev-libs/libretls/Manifest
index 86b472a84052..7e7e93196421 100644
--- a/dev-libs/libretls/Manifest
+++ b/dev-libs/libretls/Manifest
@@ -1,3 +1,3 @@
DIST libretls-3.3.1.tar.gz 431233 BLAKE2B b935cae7bdd2e2338099dbc830e2773198d5d4ed12df80b89291d0eb8ae68549e36413c79ba1373d8bce8fd857c4a291fbd9bce30c819cc182bd5b68ac7b9527 SHA512 ddb4eb7c2c7e9cbb36ced17424ea0e08863488e6b3e18cd462ccc52b2eca685b5299f79ed6ba58ad4da2d742b61fa4857109a19137a1ee4c6cfdb48463080f4a
-EBUILD libretls-3.3.1-r1.ebuild 662 BLAKE2B e4de99a3d1d65c55febfc57475640b4ecea2d482fd227361124844c0b979684c12fc0b28c335d1ec68b214f6fb644929c31bcefac32485b793553b476e5b51a7 SHA512 127e7c8a2ca47c12378fea115e295c81cbf48fa58768aa8c5fe0837db52ecbb3fded1b54c05cf2cf38737a41faafd721521b6c19348cc5c63b8917693f50b64d
+EBUILD libretls-3.3.1-r1.ebuild 674 BLAKE2B 050bec311e70765e2adda7f26083ebb39056b79388f865cce02751d5df7a12bbb6f1b77c33928331261e879e04c2f9cab32d64b6d28c96a96813a93944527a20 SHA512 a9f9282ec7fb93b1879d0c4e9a64e05c4d68d01974fc1f1b465abdde19654f3b33d79fa41d8b13061bac69a722d7add02d167c7a381311008f51957f146e47cd
MISC metadata.xml 360 BLAKE2B 5cc82f43a10ff14c4f5a8defdd77defdc89b74370d49775b3fa25226ff25303f3ad276a91f90f44bb1a58f4a29ea4936a9f3bf455c16190de039e407442bf596 SHA512 c250f62e9f43df69fda74d9a276f4ec7f314522ee3a7b32cee360339bebbf7c6bf63008b433e45fcc441d01d6a363f8447a38edca9243eede7e1b6146e7b3c70
diff --git a/dev-libs/libretls/libretls-3.3.1-r1.ebuild b/dev-libs/libretls/libretls-3.3.1-r1.ebuild
index 9f50b7f5a3e2..2c0169fa8b56 100644
--- a/dev-libs/libretls/libretls-3.3.1-r1.ebuild
+++ b/dev-libs/libretls/libretls-3.3.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://causal.agency/libretls/${P}.tar.gz"
LICENSE="ISC"
SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
DEPEND="dev-libs/openssl:="
RDEPEND="${DEPEND}
diff --git a/dev-libs/libsigc++/Manifest b/dev-libs/libsigc++/Manifest
index 97ca89ba4cee..314127892549 100644
--- a/dev-libs/libsigc++/Manifest
+++ b/dev-libs/libsigc++/Manifest
@@ -2,7 +2,9 @@ AUX libsigc++-1.2.7-fix-install.patch 457 BLAKE2B 70e53fc5931a8f11390da226297edf
DIST libsigc++-1.2.7.tar.bz2 326205 BLAKE2B b316460178224c0b8177ce9a236c69a8b737bf7356b290b59eaeb60b09285c61d113bfc7de89bd712c3c049a492f5cc36d205ac77816aff73e587e8a42ade520 SHA512 79fd9657219459bce64fc069dbcb054959e324b5d546b5f11acaae5e5bedcc4dca699a21c949e3f6b2ec0dbe1c3dba3981158e5950d0aaba5028445b2ad5740f
DIST libsigc++-2.10.1.tar.xz 4062388 BLAKE2B 3bd988acae78b7d463c966fa5c8da68b35d8a0b0bf4762811b7a9fdf82357b29aaa48d64e19f4cb6bd0f42ee70ad77a64a4905d1ad609dbe11ca8ff7596527c6 SHA512 e2bd7b1a97019be010dee1594271bbf7cae92b28e31dcb3c6d7d60643a0996233f0a75a9337b4afcb5b7dc453bfc3159d82f6daacfbcd8993a39ccecaf811bb2
DIST libsigc++-2.10.3.tar.xz 4558428 BLAKE2B fcaaae7bf3a3aea30c0b8b63d7a7c5fa137d16128ef9652b611613118e323f7bcabafe28d42407df0e08c323c540143c152ac91e04e9f101c1971ddaf0f9144c SHA512 3c7f90be84724e39073c05624ad2bee6a5835e2c6cb6cf9e605edc6574eb7cd99ec153aaca6e8fcf7e3a6c031c4e9c334da32d04177d36788e64a17667c70b4e
+DIST libsigc++-2.10.6.tar.xz 4791016 BLAKE2B c50283da7eb3ec1b595514ac805c5fe0b4f7687ec77478c7c703ce8915ea72e065f4e7cbe53fb90c13b81d266df74cade8f5a5c0ff2dcc3880e852f02508eaf9 SHA512 7dd57c061defe323de5721d187145dcf63346311d8993eb6346a33789f26c8509c1bf5a73d55776cc5ebe85fb14d54107553a652dd42f452aed6aed20047b549
EBUILD libsigc++-1.2.7.ebuild 1021 BLAKE2B 2065eece99aaa2b32cdc436f1937e4094c6625aedab1edd462e407a1cf3c1f4468075728be277611ceedf872adf6ed92ccad1d23e6c17f9088a9657e6408ab3f SHA512 f5683c55d985c4240e948b933e7d758f25dca68a75e3db88b5e65d16dc1061dcce3251a3016318cbe6c0ce911973c03a1f951982a45e9f471b1ac79f324952c4
EBUILD libsigc++-2.10.1.ebuild 1585 BLAKE2B 2e7d16b0fb2a5db23d70d37c7e12eb5b19f40d308ea7141e82915f21ce2fad6b6ae059c5642d1d7e0c82f2e7fb5a5145eb22af25e60d0fd28bbdb4aec35b9fde SHA512 d44134fedf1092686305546f4795db93107b1982d5cbfcd7a21aec02e5e356f50f1f1f4579a5561788c5d9790284065b69cdfdd2704e6c167f866e184fdd4c76
EBUILD libsigc++-2.10.3.ebuild 1584 BLAKE2B 3c1d71f2ca4107173b5d9ac89a9ccced9caca4ad9e4a30a7a21b23ba096124cf32ca7822841e987bc1775e6874e5e37ae938ddda57fd683886ce70c4c5f87544 SHA512 723c25c68909befa473004081b6c0830d05d652bbfba005faec021df5c6599234bcd9b874033edbcf064245fb299ba7f556115578f938ce5c2a0f96e3a6f93f5
+EBUILD libsigc++-2.10.6.ebuild 1384 BLAKE2B 04c117e9167bd6cfcc22837c2b85bba7768daecfe4ed1c54247e94e072aedb87d7fa5eab6d4f675a67cb457d3dabdd06d204439c9f92ba0242112f22a31f56eb SHA512 aed2014594c5f24b5175bc1f456ba45358d03e66fd3d6f215917cefd81d468ba7317aacafefa14965a64f9feba2c668124a746b3b8d087cfd07c55d6e05db1b9
MISC metadata.xml 330 BLAKE2B 0b22bbb61c537a54f586756a026c3928e861873d2c6455e4792109180381c6a7bef00fa64037d5ec21da81ab7edbc6aaaecc784d66407db09bcb6613fb7b0be8 SHA512 541cc8c579c995b2b31cb5534205f7cf7c5d68b9b098fc90c96662c02a20cbd55ddbd9c25bdc19e6494620aa5847ef87035022174d35204e442a7487cd56025e
diff --git a/dev-libs/libsigc++/libsigc++-2.10.6.ebuild b/dev-libs/libsigc++/libsigc++-2.10.6.ebuild
new file mode 100644
index 000000000000..444e6596071e
--- /dev/null
+++ b/dev-libs/libsigc++/libsigc++-2.10.6.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit flag-o-matic gnome.org meson multilib-minimal
+
+DESCRIPTION="Typesafe callback system for standard C++"
+HOMEPAGE="https://libsigcplusplus.github.io/libsigcplusplus/
+ https://github.com/libsigcplusplus/libsigcplusplus"
+
+LICENSE="LGPL-2.1+"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc static-libs test"
+RESTRICT="!test? ( test )"
+
+DEPEND="test? ( dev-libs/boost[${MULTILIB_USEDEP}] )"
+BDEPEND="sys-devel/m4
+ doc? ( app-doc/doxygen[dot] )"
+
+multilib_src_configure() {
+ filter-flags -fno-exceptions #84263
+
+ local -a emesonargs=(
+ -Ddefault_library=$(usex static-libs both shared)
+ -Dbenchmark=$(usex test true false)
+ -Dbuild-documentation=$(multilib_native_usex doc true false)
+ -Dbuild-examples=false
+ )
+ meson_src_configure
+}
+
+multilib_src_compile() {
+ meson_src_compile
+}
+
+multilib_src_test() {
+ meson_src_test
+}
+
+multilib_src_install() {
+ meson_src_install
+}
+
+multilib_src_install_all() {
+ einstalldocs
+
+ # Note: html docs are installed into /usr/share/doc/libsigc++-2.0
+ # We can't use /usr/share/doc/${PF} because of links from glibmm etc. docs
+ if use doc; then
+ docinto examples
+ dodoc examples/*.cc
+ fi
+}
diff --git a/dev-libs/protobuf/Manifest b/dev-libs/protobuf/Manifest
index 7d69399db46d..9bc4042f3ded 100644
--- a/dev-libs/protobuf/Manifest
+++ b/dev-libs/protobuf/Manifest
@@ -14,6 +14,6 @@ DIST protobuf-3.14.0.tar.gz 5319779 BLAKE2B cea083eea4d7fec441536effdfe2bf181191
EBUILD protobuf-3.12.2.ebuild 3009 BLAKE2B 8fa16af3fa8a044e4855a3c97de40762ae4e68e3c7dad59bf490d87c1685cd1f12adfc4919df70236fa2fc200c5e5b8e7089ed5735211336a93014f0c49493ef SHA512 305056f299b34c4adbd9b05d402f7561625a1e232abd64fb6d44ccc90e5eadd1f30c72ac629e6c9976e9f384b639ba645763a85472b2cecbd1574858c5958cf2
EBUILD protobuf-3.12.4.ebuild 3205 BLAKE2B 5d41dab953c7a0230df22500c99caa1ef843600fa17940d77567da33ee0c0fc68062e69fc816d480670e97fbfaa101c274c03c4d005aa87ae6f2f182cdd257bf SHA512 e33502f6f03bb899fada09a8bc3565b1e1d0994b85984ab69a0acf39c9139ebee6cb0c625ed97d6f781def4efec1497dd36e24d4a86bec6652dadb90fed27cfa
EBUILD protobuf-3.13.0.ebuild 3199 BLAKE2B d79383364ae304ea0a4682e9d9d92b673ab524820262b8e8fbc303594ca9079961d6964222d1d2beba4733f97a9e74e4df48e8f907f1ffb1e46901f986b93625 SHA512 22f2acef4cadb511040ff2f6421c2e5efe4e0d5983ffaa111edde7d0737b82817dea34dc640c7c97a45c10678c2e0ffd7061c90031b2bcf8adaedebb0efd4027
-EBUILD protobuf-3.14.0.ebuild 3008 BLAKE2B 4ae080f55e63280885d1fdebfc507882fa689d1e7547823f0cf670034eaa64776cbb6600b25ce1830ca04bc829da716ddfad9fe589e20520c76ddd658f822a53 SHA512 593d0aa0fa8241b9f559336e20d1043c3e4b67e49a944cfc24b7949f3d967ee5f886074c929a2c3570b978dc83ab82453749de58793022d0b4797dfa7fa129e7
+EBUILD protobuf-3.14.0.ebuild 3007 BLAKE2B cc628f5eea0c8fde7ca12648a65e58212a1e06baa7e60005b7a563873bff0f3b11b3f66bdc5112de9c860a1fd0a4f3d025b342f0b03f0d597dfaf340a91b56ac SHA512 92c80a6b61ccbb63d220bd6437cb9cd34f7891b80581e78c938ea44a53184dd66f71df3e2ddc49e17d3a5f919d8e03be8a141792fe261c890d1885981a862132
EBUILD protobuf-9999.ebuild 2672 BLAKE2B d57420114a77e371e0d1b8aa311ab56f9e44df7c3eb1c6d32dd15b04e840d1e4b61c178317f596616804d740e1c903c7fc8a423f72d1a63b16d62f2fb4b393ae SHA512 e0457cc8e279393eae5f8a6b8ac194688e27e6fc89ec0a54e9c266f86f7bdf5ce83b024002954e30386600b9abd4d4758347652f5087f4a81a67103271883b4e
MISC metadata.xml 627 BLAKE2B e908d6d2ab7bf7886f09af02f2a2828bcd9d6909ad7b421e0879551c24ab382733c2140def8132c70d7b6a0f8074651773476e9a645c64440ef596a7f62319d0 SHA512 2f60739bbea23091942893776b29257ed556c3d98351e0e9455852e8ea6b275d3ecca613c81ed35c009431c3e5fb378a77259f13c470359526ccbdff4033d86b
diff --git a/dev-libs/protobuf/protobuf-3.14.0.ebuild b/dev-libs/protobuf/protobuf-3.14.0.ebuild
index d1e71d4e5020..45e38f15fb6f 100644
--- a/dev-libs/protobuf/protobuf-3.14.0.ebuild
+++ b/dev-libs/protobuf/protobuf-3.14.0.ebuild
@@ -22,7 +22,7 @@ fi
LICENSE="BSD"
SLOT="0/25"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
IUSE="emacs examples static-libs test zlib"
RESTRICT="!test? ( test )"
diff --git a/dev-libs/pugixml/Manifest b/dev-libs/pugixml/Manifest
index e086fa0e9547..2c1bfa475551 100644
--- a/dev-libs/pugixml/Manifest
+++ b/dev-libs/pugixml/Manifest
@@ -3,6 +3,6 @@ DIST pugixml-1.11.3.tar.gz 386244 BLAKE2B 1c83b0e0c1f464d3ef2efc19decc425bac14b5
DIST pugixml-1.11.4.tar.gz 386229 BLAKE2B 93d9c537f10e3a12297e4d6a39f2866bd5c9678c6aff83e20fb79b6587191b6586b1fe4d9dd995a7be05cc9281cd9910fae3eddf6b2eac216873e918a5cf3231 SHA512 c83f57ef2492eee359d979597fb5089b8eca547bb9d41cfbb6bcf43d59fe75e6780b0f31dd593145ec9888c065153aba52702667e2de213fa080cd51e9e13a38
EBUILD pugixml-1.10.ebuild 571 BLAKE2B 882d1cf798f1b6f033d26204059fef59169588d7f939620f8a61dbbfe582d9c6888bc9918b657841cef5eba110dee6a977dab63a5a2c731ceb2d9a329635d447 SHA512 eefcb601ccfe5aa7c529ab220a1e21faaf3fdf4dfbac06f847e268ec6b784d7f6d3962d57d53b92c0645d735529d7f8ed56009ddbcecedc0f640b5f5f20420ef
EBUILD pugixml-1.11.3.ebuild 576 BLAKE2B 03902967dd711c63b01b8e11c1769f769f7b4df57dd889b87f23c316abe8bf746339058de220644decefaf133d8032c45c480cfcf4d51addc164e8894543c800 SHA512 71bc00b077502f5592e41f36ab6faea344caaff4a8e5787c5ddf88f0ff151bc313811594d0ce83e6506a60879c2f8009c7e4c1f49532f2c8ba3a5f6b1499ec28
-EBUILD pugixml-1.11.4.ebuild 576 BLAKE2B 03902967dd711c63b01b8e11c1769f769f7b4df57dd889b87f23c316abe8bf746339058de220644decefaf133d8032c45c480cfcf4d51addc164e8894543c800 SHA512 71bc00b077502f5592e41f36ab6faea344caaff4a8e5787c5ddf88f0ff151bc313811594d0ce83e6506a60879c2f8009c7e4c1f49532f2c8ba3a5f6b1499ec28
+EBUILD pugixml-1.11.4.ebuild 574 BLAKE2B 91e3c958f51b544630f5c1dca4c920d87f2f377fdeb76b263f59ba24c25c27d78095ea098befae491010a8205bf0c92478ff727bb1278c98649e2e14ca877cb2 SHA512 97b4ec500ec9122b503c9f11251ae48d8603a0f95020e6c54062353c928f6e1e51e2ab6440bb71937cd4650f2de3d844408338130b2df30b42fd99901aa89fd2
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.4.ebuild b/dev-libs/pugixml/pugixml-1.11.4.ebuild
index 0750359ebd79..7ffb8098086f 100644
--- a/dev-libs/pugixml/pugixml-1.11.4.ebuild
+++ b/dev-libs/pugixml/pugixml-1.11.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]] ; then
inherit git-r3
else
SRC_URI="https://github.com/zeux/${PN}/releases/download/v${PV}/${P}.tar.gz"
- KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+ KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc ~x86 ~amd64-linux ~x86-linux"
fi
DESCRIPTION="Light-weight, simple, and fast XML parser for C++ with XPath support"
diff --git a/dev-libs/ustr/Manifest b/dev-libs/ustr/Manifest
deleted file mode 100644
index 9c6a31c4e408..000000000000
--- a/dev-libs/ustr/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX ustr-1.0.4-build-libs.patch 2058 BLAKE2B 93162c8a35b892dd55a5334bbbfc718be959d597f969fdf1a712b49e490d04510268dad927ecdd2c9333eeb39c9091240887bb59b9b69a7e6e7887654c4676dc SHA512 122c38e4779526ae821341b10757454b28c35d59d99aee919d23f691fc06b019983467c5bdd0b8ca8d3e939e357e9bb588f61d4dd2ebb33235d720d637f20f86
-AUX ustr-1.0.4-gcc_5-check.patch 1087 BLAKE2B bd0414477fa789f5f6c3ef5292bd5b58f7fa8c396a739752c3fc5c4e8b456912273c5ab5fce6cc4a71830c003ac5c8e43d371177f2ed07abe3e614cff8bffb69 SHA512 b669a40929cf45cb83aa5c738cb58676cc9c08ee6c84dd7c79352c6aaa7aa36526a0878e98d78b45cfe3c7f62e9b014fe9eaf01fb1b4b460658cfcb1e77d7dab
-AUX ustr-1.0.4-inline-check.patch 1098 BLAKE2B d51410975458329f1587f747d03cfec52e212e8b22e20f159db254007fb2b29b30c335e3912443797c1c03132e7d4dc584b6d66962cb8982e3782b326c9af46d SHA512 08559671006e20f8cfb10e85738e420529822ec916acca29ab14f3f0ab77805b102ae5a60779f09978e334c167550a62eb960853d5821e308c056b4fec93117e
-DIST ustr-1.0.4.tar.bz2 233723 BLAKE2B 47fd489cadda1487eb131b9a21148d4b21ad46320f5177a0f3c2b2e156a5756918e269053363d47608661a47d8969b8c505192edea316edbd9fc17649d8dbc91 SHA512 b7df6ca3a9f25ee6f5c9ab4325732d348de27c5e02ebff36a7d5706f56b2df994df35bd652825a28e27bbde731c6a5933248d99c670d192b1952e7534eec1510
-EBUILD ustr-1.0.4-r8.ebuild 2028 BLAKE2B 6a6ca22ce593a1c804845b15a01da4c9a8d05434a3adf3af99c2cb55a5b6dd2938e2aacd1c6efe01d2988ed41d599a505e49f68981cc40cf4e1f862ae0b320e2 SHA512 34758bb22166a92f73e7e0324d5cd3d00927e1e540d3d062d07d77eb63d5b3c9101230de1a9b4f82e4ad1a4f7e05f5aae8b8b6f40939606aad8500640ff600f3
-EBUILD ustr-1.0.4-r9.ebuild 2039 BLAKE2B 1e24b6bd04be4535078479c7768b5c9434bed53d05f2711d0444a899262c53f35df90d5f155a5356e4461d570febc76e5cac244248327483c9679f0179997f89 SHA512 e58e53e73b4a8024a1531c19f13d919acf81d9714e60f7093a2b65c9ff1a857cabbe4ddd9c0854dc4d4e8acac7367630aa6082c1adb5573896c7c3f435849c9c
-MISC metadata.xml 479 BLAKE2B 4d19665a6413f27085ed035e5cd7fef83bae1d56dd2368079ec3166dd2a7e324ec1970aae754cec809014b5248fdc58053aff6277f3ae804d6f1e3300370984f SHA512 bf3530e0e77ddeaf0c97d4290d0f0a6101ceebfc41bc6df8758ed47938f2c791359ff723964bb8159e76fac6fb6ca64f1dee18a2e7fe445bbf59571a71d5bd3b
diff --git a/dev-libs/ustr/files/ustr-1.0.4-build-libs.patch b/dev-libs/ustr/files/ustr-1.0.4-build-libs.patch
deleted file mode 100644
index 79fe818c8edf..000000000000
--- a/dev-libs/ustr/files/ustr-1.0.4-build-libs.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-make static lib build/install controllable so we can disable it by default
-
-punt the -debug lib variants ... if people want debug libs, they can rebuild
-the package using their desired build settings.
-
---- a/Makefile
-+++ b/Makefile
-@@ -291,8 +291,10 @@
- OPT_LIB_SHARED = libustr-$(VERS_BSO).so.$(VERS_ESO)
- OPT_LIB_STATIC = libustr.a
-
--LIB_SHARED = $(DBG_LIB_SHARED) $(OPT_LIB_SHARED)
--LIB_STATIC = $(DBG_LIB_STATIC) $(OPT_LIB_STATIC)
-+LIB_SHARED = $(OPT_LIB_SHARED)
-+ifeq ($(USE_STATIC),yes)
-+LIB_STATIC = $(OPT_LIB_STATIC)
-+endif
-
- DEPS_NONC_ALL = $(SRC_HDRS) $(SRC_SRCS_H)
- DEPS_C_ALL = $(SRC_HDRS)
-@@ -388,17 +390,14 @@
- install -d $(DESTDIR)$(bindir)
- install -d $(DESTDIR)$(libdir)/pkgconfig
- $(HIDE)echo Installing files
-+ifeq ($(USE_STATIC),yes)
- install -m 644 -t $(DESTDIR)$(libdir) $(LIB_STATIC)
-+endif
- install -m 755 -t $(DESTDIR)$(libdir) $(LIB_SHARED)
- -rm -f $(DESTDIR)$(libdir)/$(OPT_LIB_SHARED_NAME)
- ln -s $(OPT_LIB_SHARED) $(DESTDIR)$(libdir)/$(OPT_LIB_SHARED_NAME)
- -rm -f $(DESTDIR)$(libdir)/$(OPT_LIB_SHAREDEV)
- ln -s $(OPT_LIB_SHARED_NAME) $(DESTDIR)$(libdir)/$(OPT_LIB_SHAREDEV)
-- -rm -f $(DESTDIR)$(libdir)/$(DBG_LIB_SHARED_NAME)
-- ln -s $(DBG_LIB_SHARED) $(DESTDIR)$(libdir)/$(DBG_LIB_SHARED_NAME)
-- -rm -f $(DESTDIR)$(libdir)/$(DBG_LIB_SHAREDEV)
-- ln -s $(DBG_LIB_SHARED_NAME) $(DESTDIR)$(libdir)/$(DBG_LIB_SHAREDEV)
-- $(LDCONFIG) -n $(DESTDIR)$(libdir)
- install -pm 644 -t $(DESTDIR)$(includedir) $(SRC_HDRS)
- install -pm 644 -t $(DESTDIR)$(SHRDIR) $(SRC_SRCS)
- install -pm 644 -t $(DESTDIR)$(SHRDIR) $(XSRC_SRCS)
-@@ -406,7 +406,7 @@ endif
- install -pm 644 -t $(DESTDIR)$(mandir)/man1 $(MAN_PAGES_1)
- install -pm 644 -t $(DESTDIR)$(mandir)/man3 $(MAN_PAGES_3)
- install -m 755 -t $(DESTDIR)$(bindir) ustr-import
-- install -pm 644 -t $(DESTDIR)$(libdir)/pkgconfig ustr.pc ustr-debug.pc
-+ install -pm 644 -t $(DESTDIR)$(libdir)/pkgconfig ustr.pc
-
- ustr-import-multilib: ustr-import-multilib.in
- sed -e 's,@INCLUDEDIR@,$(includedir),g' -e 's,@MBINDIR@,$(MBINDIR),g' < $< > $@
diff --git a/dev-libs/ustr/files/ustr-1.0.4-gcc_5-check.patch b/dev-libs/ustr/files/ustr-1.0.4-gcc_5-check.patch
deleted file mode 100644
index aaed1503030a..000000000000
--- a/dev-libs/ustr/files/ustr-1.0.4-gcc_5-check.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- a/ustr-conf.h.in 2007-10-22 08:00:55.000000000 +0200
-+++ b/ustr-conf.h.in 2015-09-10 12:24:34.998796842 +0200
-@@ -4,13 +4,24 @@
- /* this is the custom version for the library itself, for everyone else
- * ustr-import generates one depending on the options. */
-
-+/* If this is GCC with major version 5 and up, the default C standard
-+ * has changed from C89 to C99 so the old inline behaviour must be
-+ * restored:
-+ */
-+#if defined(__GNUC__) \
-+ && (__GNUC__ > 4) \
-+ && defined(__STDC_VERSION__) \
-+ && (__STDC_VERSION__ >= 199901L)
-+# define inline inline __attribute__ ((gnu_inline))
-+#endif /* GCC greater than major version 4 and not -std=c89 set */
-+
- /* The default is now to link against libc. */
- #ifndef USTR_CONF_INCLUDE_CODEONLY_HEADERS
- #define USTR_CONF_INCLUDE_CODEONLY_HEADERS 0
- #endif
-
- /* We can't: if defined(__GLIBC__) && (!defined(_GNU_SOURCE) || !_GNU_SOURCE)
-- * because by the time we've included a libc header it's too late. */
-+ * because by the time we've included a libc header it's too late. */
- #ifndef _GNU_SOURCE
- #define _GNU_SOURCE 1
- #endif
diff --git a/dev-libs/ustr/files/ustr-1.0.4-inline-check.patch b/dev-libs/ustr/files/ustr-1.0.4-inline-check.patch
deleted file mode 100644
index b38cf7829c9f..000000000000
--- a/dev-libs/ustr/files/ustr-1.0.4-inline-check.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- a/ustr-conf.h.in 2007-10-22 08:00:55.000000000 +0200
-+++ b/ustr-conf.h.in 2015-09-10 12:24:34.998796842 +0200
-@@ -4,13 +4,23 @@
- /* this is the custom version for the library itself, for everyone else
- * ustr-import generates one depending on the options. */
-
-+/* Ustr relies on GCC's traditional handling of inline functions, not
-+ * the version that was actually standardized in C99. GCC-compatible
-+ * compilers define __GNUC_STDC_INLINE__ when using the standard
-+ * behavior. When this is set we must restore the old inline behavior:
-+ */
-+#if defined(__GNUC__) \
-+ && defined(__GNUC_STDC_INLINE__)
-+# define inline inline __attribute__ ((gnu_inline))
-+#endif
-+
- /* The default is now to link against libc. */
- #ifndef USTR_CONF_INCLUDE_CODEONLY_HEADERS
- #define USTR_CONF_INCLUDE_CODEONLY_HEADERS 0
- #endif
-
- /* We can't: if defined(__GLIBC__) && (!defined(_GNU_SOURCE) || !_GNU_SOURCE)
-- * because by the time we've included a libc header it's too late. */
-+ * because by the time we've included a libc header it's too late. */
- #ifndef _GNU_SOURCE
- #define _GNU_SOURCE 1
- #endif
diff --git a/dev-libs/ustr/ustr-1.0.4-r8.ebuild b/dev-libs/ustr/ustr-1.0.4-r8.ebuild
deleted file mode 100644
index 8515c489b472..000000000000
--- a/dev-libs/ustr/ustr-1.0.4-r8.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit toolchain-funcs multilib-minimal
-
-DESCRIPTION="Low-overhead managed string library for C"
-HOMEPAGE="http://www.and.org/ustr/"
-SRC_URI="ftp://ftp.and.org/pub/james/ustr/${PV}/${P}.tar.bz2"
-
-LICENSE="|| ( BSD-2 MIT LGPL-2 )"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
-IUSE="ustr-import"
-
-DOCS=(ChangeLog README README-DEVELOPERS AUTHORS NEWS TODO)
-
-MULTILIB_WRAPPED_HEADERS=(
- /usr/include/ustr-conf.h
- /usr/include/ustr-conf-debug.h
-)
-
-src_prepare() {
- epatch "${FILESDIR}/${P}-gcc_5-check.patch"
- epatch "${FILESDIR}/${PN}-1.0.4-build-libs.patch"
- multilib_copy_sources
-}
-
-_emake() {
- emake \
- USE_STATIC="no" \
- AR="$(tc-getAR)" \
- CC="$(tc-getCC)" \
- CFLAGS="${CFLAGS} ${CPPFLAGS}" \
- LDFLAGS="${LDFLAGS}" \
- prefix="${EPREFIX}/usr" \
- libdir="${EPREFIX}/usr/$(get_libdir)" \
- mandir="${EPREFIX}/usr/share/man" \
- SHRDIR="${EPREFIX}/usr/share/${P}" \
- DOCSHRDIR="${EPREFIX}/usr/share/doc/${PF}" \
- HIDE= \
- "$@"
-}
-
-multilib_src_configure() {
- # The included configure tests require execution.
-
- # We require vsnprintf everywhere as it's in POSIX.
- printf '#!/bin/sh\necho 0\n' > autoconf_vsnprintf
- chmod a+rx autoconf_vsnprintf
-
- # Always use stdint.h as it's in POSIX.
- sed -i '/have_stdint_h=0/s:=0:=1:' Makefile || die
-
- # Figure out the size of size_t.
- printf '#include \nint main() { char buf[sizeof(size_t) - 8]; }\n' > sizet_test.c
- $(tc-getCC) ${CPPFLAGS} ${CFLAGS} -c sizet_test.c 2>/dev/null
- printf '#!/bin/sh\necho %s\n' $(( $? == 0 )) > autoconf_64b
- chmod a+rx autoconf_64b
-
- # Generate the config file now to avoid bad makefile deps.
- _emake ustr-import
-}
-
-multilib_src_compile() {
- _emake all-shared
-}
-
-multilib_src_install() {
- _emake DESTDIR="${D}" install
-
- if ! use ustr-import ; then
- rm -r \
- "${ED}/usr/bin/ustr-import" \
- "${ED}/usr/share/man/man1/ustr-import.1" \
- "${ED}/usr/share/${P}" || die
- fi
-}
-
-multilib_src_test() {
- _emake check
-}
diff --git a/dev-libs/ustr/ustr-1.0.4-r9.ebuild b/dev-libs/ustr/ustr-1.0.4-r9.ebuild
deleted file mode 100644
index 184372af56b2..000000000000
--- a/dev-libs/ustr/ustr-1.0.4-r9.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs multilib-minimal
-
-DESCRIPTION="Low-overhead managed string library for C"
-HOMEPAGE="http://www.and.org/ustr/"
-SRC_URI="ftp://ftp.and.org/pub/james/ustr/${PV}/${P}.tar.bz2"
-
-LICENSE="|| ( BSD-2 MIT LGPL-2 )"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
-IUSE="ustr-import"
-
-DOCS=(ChangeLog README README-DEVELOPERS AUTHORS NEWS TODO)
-
-MULTILIB_WRAPPED_HEADERS=(
- /usr/include/ustr-conf.h
- /usr/include/ustr-conf-debug.h
-)
-
-PATCHES=(
- "${FILESDIR}/${P}-inline-check.patch"
- "${FILESDIR}/${PN}-1.0.4-build-libs.patch"
-)
-
-src_prepare() {
- default
- multilib_copy_sources
-}
-
-_emake() {
- emake \
- USE_STATIC="no" \
- AR="$(tc-getAR)" \
- CC="$(tc-getCC)" \
- CFLAGS="${CFLAGS} ${CPPFLAGS}" \
- LDFLAGS="${LDFLAGS}" \
- prefix="${EPREFIX}/usr" \
- libdir="${EPREFIX}/usr/$(get_libdir)" \
- mandir="${EPREFIX}/usr/share/man" \
- SHRDIR="${EPREFIX}/usr/share/${P}" \
- DOCSHRDIR="${EPREFIX}/usr/share/doc/${PF}" \
- HIDE= \
- "$@"
-}
-
-multilib_src_configure() {
- # The included configure tests require execution.
-
- # We require vsnprintf everywhere as it's in POSIX.
- printf '#!/bin/sh\necho 0\n' > autoconf_vsnprintf
- chmod a+rx autoconf_vsnprintf
-
- # Always use stdint.h as it's in POSIX.
- sed -i '/have_stdint_h=0/s:=0:=1:' Makefile || die
-
- # Figure out the size of size_t.
- printf '#include \nint main() { char buf[sizeof(size_t) - 8]; }\n' > sizet_test.c
- $(tc-getCC) ${CPPFLAGS} ${CFLAGS} -c sizet_test.c 2>/dev/null
- printf '#!/bin/sh\necho %s\n' $(( $? == 0 )) > autoconf_64b
- chmod a+rx autoconf_64b
-
- # Generate the config file now to avoid bad makefile deps.
- _emake ustr-import
-}
-
-multilib_src_compile() {
- _emake all-shared
-}
-
-multilib_src_install() {
- _emake DESTDIR="${D}" install
-
- if ! use ustr-import ; then
- rm -r \
- "${ED}/usr/bin/ustr-import" \
- "${ED}/usr/share/man/man1/ustr-import.1" \
- "${ED}/usr/share/${P}" || die
- fi
-}
-
-multilib_src_test() {
- _emake check
-}
diff --git a/dev-libs/voikko-fi/Manifest b/dev-libs/voikko-fi/Manifest
index 354fab5dc12a..7667ecfe9f9f 100644
--- a/dev-libs/voikko-fi/Manifest
+++ b/dev-libs/voikko-fi/Manifest
@@ -3,5 +3,5 @@ DIST voikko-fi-2.3.tar.gz.asc 833 BLAKE2B 4d960595ac948ec59499448219c5c84fe17060
DIST voikko-fi-2.4.tar.gz 701807 BLAKE2B 978871a733b12be53287ec2d4637428f6991cdb3098a97cc7fc673d7b1e1ac85eb6811653c1121a1f04b23f40e1b6ff6340a5514c2d1231cf7be37879c70cf20 SHA512 00098fd52d4f81b30fe7f0ecb97ee8f240d898dfd511da1fdc5e6fd7046f2bf94c0230dc733bc6034f178d56d26c3ee69965eb61c04fc7b30087131767701858
DIST voikko-fi-2.4.tar.gz.asc 833 BLAKE2B f4f470118716cf3ad2348b8ae74f57d95a03adff3ffee66a1f09ae569e240a99ff08e026cd7bf575347ec9941bf6e0174c0b3b468a3434304dd8356db3e4d35d SHA512 bb68fe81c0d8cea206b93484d94d5bfc9a9272827616f3ce8016721027a736b190ae37679baed70df0350c3f84235fdb3d6a525d93123ff561ef6d83b7717562
EBUILD voikko-fi-2.3.ebuild 847 BLAKE2B 3e56a0d3c4f2a32e7b17798b99f9c2452c093642b62007850e0b625a62892e6d8104187df2f456c599bf7eebdae53662e7bbfedbb89bd2dca4f81d35e199c4c7 SHA512 f7b38d806d87095af6dea361c45a501b2ed92975a5bb833240c9e5abca3c6ca79e1dc7470b335688e25e16543d5b49135f54348330a39cd45053c8fd894f1010
-EBUILD voikko-fi-2.4.ebuild 849 BLAKE2B 424141699532415d35234846a9ba8bd4c1534ad16649267cadbacca98c95030ced271c5ebe29130f89083cd41320c049e4e81a0f6a2858c8c6d67dc2e1598755 SHA512 985b9ab743be38311c8973759ec24551f8743caef645ed28f09f7107075642e981ffada0499e50c8f7ddb3043820ef610e6912781c305882f43aeb1909f8c94f
+EBUILD voikko-fi-2.4.ebuild 847 BLAKE2B e915d4cc7acc882e5294518b8b0877890d3c087c2c726e2cf339cb44b4a329a32afc374441e60d4826cf4f3d1df814712d9e76438557a242baf32fae83afe4bc SHA512 b29f1c583e9eea48875df5a72e84f1cc800f3a763187cf1692f2e4f6fb942b28bcabff299f548f37c48c0b4cf8d04a2e63d9cfc2ef1a1ac435d050de4bd80ba3
MISC metadata.xml 254 BLAKE2B 938f68b7b21ad386a35540a09e4bb956e241dfc963d4823c3c0cd46d3449ff4fb5a1cead67ad7c35a460503d30bdbde35822535f1c2d46f2939ee190f328b846 SHA512 26047ebb40fc49bfb4393121c5c5af69caee617a1d75676be84b0f5af75564828aeeef4503c7681eaaf7e48f6c662574874336296c18e002dca8e925162a1d4c
diff --git a/dev-libs/voikko-fi/voikko-fi-2.4.ebuild b/dev-libs/voikko-fi/voikko-fi-2.4.ebuild
index 527614bfd971..b25d293369e3 100644
--- a/dev-libs/voikko-fi/voikko-fi-2.4.ebuild
+++ b/dev-libs/voikko-fi/voikko-fi-2.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="https://www.puimula.org/voikko-sources/${PN}/${P}.tar.gz
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
DEPEND="dev-libs/foma
dev-libs/libvoikko"
diff --git a/dev-libs/xmlsec/Manifest b/dev-libs/xmlsec/Manifest
index be46a6dae5a4..fa80560a3b49 100644
--- a/dev-libs/xmlsec/Manifest
+++ b/dev-libs/xmlsec/Manifest
@@ -2,4 +2,4 @@ DIST xmlsec1-1.2.30.tar.gz 1989670 BLAKE2B b363d1661ba5fdf968725948598954c7d514a
DIST xmlsec1-1.2.31.tar.gz 1989144 BLAKE2B ddc55e34867d5870fa434c739825ceaa68500a11fb2eabb482945901ad7fa0ba0d5fce7cd6c5f1b49c24d5bc07cee2875ff21833f09c0ec2ffeaf63875f5b001 SHA512 7a0e3d6f66746a22cf6468eb4d0691879c7468e4bef71fd8720e6a56b420f076a1d8a3094c35e721471dd029a643f5c4a553ef5788be5509f2786a419da1b7af
EBUILD xmlsec-1.2.30.ebuild 1400 BLAKE2B 33a78b6d284196e366c67719cc2d0e292696e761c297fc0bc2e3cdfb13cbd3fd732ad3ebb5b1ffc7c3ef4d1992ad368dee5f392900849e1970e7db67730f1f29 SHA512 8dd204f7d770a323c0f1943c555cabf67fa9ae3a83d89fe325f23be24b21cad29f62565cba9c8eae733453b76c1547f022ccd2a263edb85a2aba0ea6efb0b6cd
EBUILD xmlsec-1.2.31.ebuild 1405 BLAKE2B 0f41b67a723a978e8510ef16f2a3455d7aaac2eedce8ceb16a5d2bc91d14642b5f05f6112eb205d88a9faa040697e51a50e711c97bca6e9b4ff92985476190ec SHA512 7f09fa4ef386bfa3f1a7ea1f27dec14a6a21eb02e22fe159739ac2554c825d03f58a96162c8f2eed7ac31507a5a7180aa896869d0c644e8a210a402101ca12b2
-MISC metadata.xml 414 BLAKE2B 265c7a10b540266026188b46fbe6f609d83946a5ceadae090bed44b981e9c37599b86c506ea16d06d62bde58d804f042d01eb5e9a96fd9480671ae3e423040d3 SHA512 6192225c849da5ac481f102aa6e7ca91d4222623eb84d42d5313ecd9280a4fec8ac819ed74c0b761986c60532b5ec5061d0998e20c77c5dae0abd058ecb039d7
+MISC metadata.xml 492 BLAKE2B f1d4308323da79d17e6f5e0025fff338024b6d74c90584c469917418ebb06aa9be43a1b1d5f8a8e4a25aa0584b8b96aadc5508a2aca1b9f6d3924c81bb33f41b SHA512 920fe71d66278f82b0fcb18044998d5b72cc69a07966e8d1d2527a0d1a7e78c89536e165f105dc4ed9de84377a80f3ef55804bd26f71d868808077ffcd6b39c3
diff --git a/dev-libs/xmlsec/metadata.xml b/dev-libs/xmlsec/metadata.xml
index 68a53aac563f..8f1184e366ba 100644
--- a/dev-libs/xmlsec/metadata.xml
+++ b/dev-libs/xmlsec/metadata.xml
@@ -8,4 +8,7 @@
Install xmlsec-nss library
Install xmlsec-openssl library
+
+ lsh123/xmlsec
+
diff --git a/dev-ml/Manifest.gz b/dev-ml/Manifest.gz
index 7db53fe1a6df..4ebf05e08e77 100644
Binary files a/dev-ml/Manifest.gz and b/dev-ml/Manifest.gz differ
diff --git a/dev-ml/menhir/Manifest b/dev-ml/menhir/Manifest
index d997257d28ce..dc7b19ec473f 100644
--- a/dev-ml/menhir/Manifest
+++ b/dev-ml/menhir/Manifest
@@ -2,4 +2,4 @@ DIST menhir-20181006.tar.gz 6665871 BLAKE2B 98820922c3dc9ffa27e0f9432d683aae3a11
DIST menhir-20190924.tar.gz 2491000 BLAKE2B 463825aa0f3ea41e49d9c130226bc8bbfc2b96650debf8d79422a90b93338ead58e01aa0c34b2161e4383d1c9a8d77ab58bb1da78e3187ed60b02e13f7742844 SHA512 8036eb8a65f123ceadd21739d88dafca54a2338fc168922a1301a9fbe709ac5e8e7214d95d8114f3798c15f458822e64dcedb94f7fff18ab6f9ccfb6de462e46
EBUILD menhir-20181006.ebuild 890 BLAKE2B d9bdda28d00ccc0f528d6f7a43abc8b9d394073b5592fef9857b2c06092a6d8f0f7de49bea4b974379b0d789e4de044f456f65984f2575665cb4e2296379525d SHA512 420da808f42896ece95cf6b9487140a3509e1a60cd6c4f4fabd9fadc0c894d3cb054e51e52d6aba16d52ae1af6832dc461eec8fba65e0db12edfccec00d0fb2e
EBUILD menhir-20190924.ebuild 905 BLAKE2B f04704503fd1c2e8f6375774969e53838798c07ff7109ce5773f509ab5e3d236cb6071c28e83f173ed0c843b343e269d7aa1f46f809aac1f32ca78a053dccb6c SHA512 8450caaa0657159ae143769b4d36169367bff66436a8264ce9d45427c03f3ad266fc04034033ae72e17e6ac6684b291aca91f911393fbb4997f6c0babc3596db
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
+MISC metadata.xml 232 BLAKE2B 502ab2778b7b5d1ac9441b71cab7ff412fbb5663747f4abfc59fb45559185dda510683f1e8ffea5db8f6b31874ca209fde5c524e3526cb125931ee1feb7ee68d SHA512 7ac25a89f6b48a8e858fd1e9f4d3e938a82a4591f21249d81e8d9f1d028c5f427a3669933a932c0e8a1dc7455106696e3bfba3573976edcd8c7ec89368dacde2
diff --git a/dev-ml/menhir/metadata.xml b/dev-ml/menhir/metadata.xml
index 6f49eba8f496..9f27ba42c7de 100644
--- a/dev-ml/menhir/metadata.xml
+++ b/dev-ml/menhir/metadata.xml
@@ -1,5 +1,8 @@
-
+
+ ml@gentoo.org
+ ML
+
diff --git a/dev-perl/Encode-IMAPUTF7/Encode-IMAPUTF7-1.50.0-r2.ebuild b/dev-perl/Encode-IMAPUTF7/Encode-IMAPUTF7-1.50.0-r2.ebuild
index cd9e5e93d605..8a25142f4648 100644
--- a/dev-perl/Encode-IMAPUTF7/Encode-IMAPUTF7-1.50.0-r2.ebuild
+++ b/dev-perl/Encode-IMAPUTF7/Encode-IMAPUTF7-1.50.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Modification of UTF-7 encoding for IMAP"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc ~x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Encode-IMAPUTF7/Manifest b/dev-perl/Encode-IMAPUTF7/Manifest
index 8d6632b13e5c..3fa803af2434 100644
--- a/dev-perl/Encode-IMAPUTF7/Manifest
+++ b/dev-perl/Encode-IMAPUTF7/Manifest
@@ -1,3 +1,3 @@
DIST Encode-IMAPUTF7-1.05.tar.gz 25646 BLAKE2B 8024f0029145df4ec409394eaa799612dadd65a1bc6f2e9fdad51a950a0756b73daa5da2579f22d38efd367642a9ae0f7402f6beeea02a51f84a725803849ba6 SHA512 e286e059db72c498173a312223152ca492700282345cccbd21ea49e0334fedcd922ae40b018aa8a6b474a10fbff9ac49f46d4c6f9920f3e508adab42bdca976f
-EBUILD Encode-IMAPUTF7-1.50.0-r2.ebuild 424 BLAKE2B 4064773abb97dfff9ebe4b180d726a64eba15b5ffa2fca7095084499471f9f268076a4481c4f1f491ed90a822dd3d50d533bf2b17cdcb39517b427dc937b8ace SHA512 4c976e3b837128dbdc681164bc15b5dbcf871d2691919e51ad7fcc0591e891c0a00d3e435a3e9ff59bf723caaa8bd69649984b5f1268afec2d0244dec08cb517
+EBUILD Encode-IMAPUTF7-1.50.0-r2.ebuild 429 BLAKE2B 01925f48c88addbcc6b93cc61071f3ca64aa9e271610a2c537e004421c4bb113980e087a49e00236b93c6a1a4d71dee37244482de6548b015fb613e1e883c791 SHA512 8a4649ac0ec107987256ec6419e9f4996de7bf6b7d49af41c9755056dde4d3d947f58ea4500f9a708fe28c66162f5d2b0fe493f58a060eb9f5de2dd057c363ab
MISC metadata.xml 402 BLAKE2B 0b6f7b4acbb054f0a644d2666e150f5f8b6d3cabaa8c87241440460c57a65067ca4ecbef8eca9157aa3a68020dfb122db8695830e9ab1aec5b515e195efcfb22 SHA512 203dcdbe7c27e5c159d99132ffa93ab7317ca0d6ccc205dc01fc0d7c8c50cef76e5ca7a0eef8d66c923e403c7de5fdeb40f8a4b23abff96908cffb58771f44a7
diff --git a/dev-perl/Gtk3-ImageView/Gtk3-ImageView-6.0.0.ebuild b/dev-perl/Gtk3-ImageView/Gtk3-ImageView-6.0.0.ebuild
new file mode 100644
index 000000000000..ebce005b7376
--- /dev/null
+++ b/dev-perl/Gtk3-ImageView/Gtk3-ImageView-6.0.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DIST_AUTHOR=RATCLIFFE
+DIST_VERSION=6
+DIST_TEST=do
+inherit perl-module virtualx
+
+DESCRIPTION="Image viewer widget for Gtk3"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+ dev-perl/Cairo
+ >=dev-perl/glib-perl-1.210.0
+ dev-perl/Gtk3
+ dev-perl/Readonly
+"
+BDEPEND="${RDEPEND}
+ virtual/perl-ExtUtils-MakeMaker
+ test? (
+ dev-perl/Carp-Always
+ dev-perl/Test-Differences
+ dev-perl/Test-MockObject
+ dev-perl/Try-Tiny
+ media-gfx/imagemagick[jpeg,perl,png,svg,X]
+ virtual/perl-Test-Simple
+ )
+"
+
+PERL_RM_FILES=(
+ t/90_MANIFEST.t
+ t/91_critic.t
+)
+
+src_test() {
+ virtx perl-module_src_test
+}
diff --git a/dev-perl/Gtk3-ImageView/Manifest b/dev-perl/Gtk3-ImageView/Manifest
index 25a8cdcb651e..560c84d00753 100644
--- a/dev-perl/Gtk3-ImageView/Manifest
+++ b/dev-perl/Gtk3-ImageView/Manifest
@@ -1,3 +1,5 @@
DIST Gtk3-ImageView-4.tar.gz 14329 BLAKE2B e4dee495e83392cc14e8fbd050658a1647bfa3f71e3711610e4df502d92adcce67800fd3c1e5ce09464fdb2e22a92ad7a1bdb52fb119f86712ef898cbf208abf SHA512 d723fb826f510ceccc6116b43baac4e1e42b59f91a0da5d8e9acf5b4ce608807119533fa965ba5aa623511aa9843b81488fd931d58417a2f3dd4f5db45238d64
+DIST Gtk3-ImageView-6.tar.gz 15444 BLAKE2B 1f026895328912443d4e08fbeb2ee9826818c09b00d06f087417f141d2c5b193e13840a09162c47fc5c0d642d0738cf290038a541f5e14303382a14a0245213d SHA512 68fc3371fe3d62163523d81732f0716fe15623a53139e8050e3bddc12c694a9ae2e89855b9926e14b18803e9c7a586b925b613e1cf364cb449b850fe70b571ab
EBUILD Gtk3-ImageView-4.0.0.ebuild 681 BLAKE2B d34bcfabd119e76879463829d87fbda70d0b1a0323fb6826156a4d36c1f4f441a52b591aaf3e51995bfe446fa973148516b16026bdfb109edf4201017994e9de SHA512 c40ad0ac50852b261eb6ea9ac7d87cfca47ea725a00008b0f84e983e4ac5ffa86c99955708e0fc6b66957fad5fec27891d4af6b156dc922ba087d0feea27f47c
+EBUILD Gtk3-ImageView-6.0.0.ebuild 694 BLAKE2B 3cc1f6b35ac13d0ff603908331432c92f08e920b96fa35b49bf3c466f61581e49504a927c47bd4c7bc684a43b4985fc0ab2013b06e6bcddd7520c9d0a97968d2 SHA512 4427496e10a434ef53268f1036c443e0e44113faeeaaba383f8f6adcd4c3dbc3ecfc5b603364e3376cf8017731cdfb9e0e0e7b108d9d91d1425d4e62c1638bf2
MISC metadata.xml 922 BLAKE2B 7cc2b876b9e004190d7c8c85718fc9f343f4950f7bd372c3d08c7cde064d0e7097459d4b4a7662a01d737053cb1849c8092939357dc358d83318bd0ab0695cc4 SHA512 9578c565fd1062ccf5d81d5ce4f7bf30fb819682ce404bc5ae69e9e549073c3c8015e71c27a70e8657cb88278c7fe8593b1ac89633d260501be4bf246f5b42ca
diff --git a/dev-perl/Manifest.gz b/dev-perl/Manifest.gz
index 5159e5fa1ea1..0b82a8f963c5 100644
Binary files a/dev-perl/Manifest.gz and b/dev-perl/Manifest.gz differ
diff --git a/dev-php/Manifest.gz b/dev-php/Manifest.gz
index 750e6ebf608a..28101c6d36b9 100644
Binary files a/dev-php/Manifest.gz and b/dev-php/Manifest.gz differ
diff --git a/dev-php/PEAR-Archive_Tar/Manifest b/dev-php/PEAR-Archive_Tar/Manifest
index 91497d0284f4..0afbf5076699 100644
--- a/dev-php/PEAR-Archive_Tar/Manifest
+++ b/dev-php/PEAR-Archive_Tar/Manifest
@@ -1,3 +1,5 @@
DIST Archive_Tar-1.4.11.tgz 21556 BLAKE2B f7e450f4581400159099dba023192ec4026da8867c675119001085651c20315523a58180e0ccd4528e3b1764e222945055702e0fd8e42bb5976b891230351f29 SHA512 a67ff191eb1d814094fc752b58b5d4b4d3db0fd2476fce403f8e5cac49a35fd1219167817dc84d6f957af87d326435aef000e2e0b16357a0d051ab407b76d2cc
+DIST Archive_Tar-1.4.12.tgz 21665 BLAKE2B fc4d2d5128bfc02da5f7e2465834e2ff14554188ede7899856f200935a850c35bb74e6fcca5c4c4ae641a575725a3edba2878376a587304f133c8f16e1ee9336 SHA512 9f2e6ca4628ba4ec95a324c4a706b2d01d2323b5e5e77f1cc7425784d1a35d139b1604bffca10af8b04c4cc875cb6b1f40715a00208cd042aba37f089a586497
EBUILD PEAR-Archive_Tar-1.4.11.ebuild 748 BLAKE2B a6fddee5de1a3398f806853cb7f076c4f37184faae350cec0a8dc4e96b22727e63d9ae7a1a9479f8dbd916b4d4e7b720ba9999baf73ffb9ee6f705ae49aca73b SHA512 85ec995f26fbbf20a3e30b11c9e9c618da30c7d6dc3c8111107c1fc3105af2e80470a2c6a81c0b51488125a09fc13a583b1ec127db9f186890bc69d763478c56
+EBUILD PEAR-Archive_Tar-1.4.12.ebuild 1345 BLAKE2B 788692c5dbc83cf35c4937b3332edb6c59e3f6837f541c963b25227e9ecbb7ba137bbb1053bd83412e05bcf320ec2c4bee72e7bb1196a24d58f67cf3130050b9 SHA512 8aa15cb4e7dda9e75d54035d4f492db34186c49a9e53aec29b280f1038fa183d797850beaaebbcbe575fb9d694199a0b3d3fca3c3050473f523e30e68852e9ce
MISC metadata.xml 337 BLAKE2B def75fcf8f3291007347252cd8885def7980837bf24cef97f5709ff0166792bb6597d2d0395425e897a8a0afee7fc5436ecfd745e66e4b9147f76f93cb92f923 SHA512 c77cfe795995f88c94b790ac8900e1366e2d4b4adf12f5d18284687145bd37177052ee6f39bf66fe97d8f254366b83019ba51632e15cbfdf7c93d7f08d8f48e7
diff --git a/dev-php/PEAR-Archive_Tar/PEAR-Archive_Tar-1.4.12.ebuild b/dev-php/PEAR-Archive_Tar/PEAR-Archive_Tar-1.4.12.ebuild
new file mode 100644
index 000000000000..02c0db09b3a8
--- /dev/null
+++ b/dev-php/PEAR-Archive_Tar/PEAR-Archive_Tar-1.4.12.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN="${PN/PEAR-/}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Tar file management class"
+HOMEPAGE="https://pear.php.net/package/Archive_Tar"
+SRC_URI="https://pear.php.net/get/${MY_P}.tgz"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE=""
+
+# bzip2 and zlib are needed for compressed tarballs, and there's one
+# call to preg_match to test paths against a pattern of files and
+# directories that will be ignored.
+RDEPEND="dev-lang/php:*[bzip2,pcre(+),zlib]"
+PDEPEND="dev-php/PEAR-PEAR"
+DEPEND=""
+
+S="${WORKDIR}/${MY_P}"
+
+src_install() {
+ insinto /usr/share/php
+ doins -r Archive
+
+ dodoc docs/*
+
+ insinto /usr/share/php/.packagexml
+ newins "${WORKDIR}/package.xml" "${MY_P}.xml"
+}
+
+pkg_postinst() {
+ # It is not critical to complete so only warn on failure
+ if [[ -f "${EROOT}/usr/share/php/.packagexml/${MY_P}.xml" && \
+ -x "${EROOT}/usr/bin/peardev" ]] ; then
+ "${EROOT}/usr/bin/peardev" install -nrO --force \
+ "${EROOT}/usr/share/php/.packagexml/${MY_P}.xml" 2> /dev/null \
+ || ewarn "Failed to insert package into local PEAR database"
+ fi
+}
+
+pkg_postrm() {
+ if [[ -x "${EROOT}/usr/bin/peardev" ]]; then
+ "${EROOT}/usr/bin/peardev" uninstall -nrO "pear.php.net/${MY_PN}"
+ fi
+}
diff --git a/dev-python/Babel/Babel-2.9.0.ebuild b/dev-python/Babel/Babel-2.9.0.ebuild
index 54bd9135e64f..1f5f5687d77f 100644
--- a/dev-python/Babel/Babel-2.9.0.ebuild
+++ b/dev-python/Babel/Babel-2.9.0.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 ppc ppc64 ~riscv s390 ~sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv s390 sparc x86 ~x64-macos"
RDEPEND="dev-python/pytz[${PYTHON_USEDEP}]
$(python_gen_cond_dep '
diff --git a/dev-python/Babel/Manifest b/dev-python/Babel/Manifest
index b8900a39fd65..3e4a3f3efadd 100644
--- a/dev-python/Babel/Manifest
+++ b/dev-python/Babel/Manifest
@@ -3,5 +3,5 @@ AUX Babel-2.9.0-pypy3.patch 1130 BLAKE2B 23abff434e982c8d8f8350c599b3b94ee07775e
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.1.ebuild 966 BLAKE2B af8d864c8647b3f4e1111ea36dc0f8ae619ad549a6249cd5f56d2af501359f4020596b2eb71d711be73e4f035314b4b0024c2f7faef21f264921a7d63a774a82 SHA512 8a26eb03ed75591b738e4f1b93214c1ce480fca78737758dfa9cfbb5c94fe9397e86a95f6d7ee15300c19237510f32726bf1e84a59efa1fdcf214f2fb691ce3b
-EBUILD Babel-2.9.0.ebuild 929 BLAKE2B 2562d77ceed3e971fb89514c15ca52745087e88c4b5841d586e50ade77a66dd69510296df29a7382194f2afc4ab7725f53104e3b7dacca71ff340f00a3f2e398 SHA512 54d9cdfd610cb09465871c9f17528b136dbe1dc1b29694b87c8a1744030603e1f4b85cd6e512d0bebe38c760b12a1b8852d8d4b33d55701c18dcd98295a50d22
+EBUILD Babel-2.9.0.ebuild 928 BLAKE2B 0c62024952a06af7eb4763ec7f7ddb65706535e6fe3914c07d017fc67cbadaaae57eb4bb512362546c4e21755b03794d2e66b7ffe1ee8e7ca7f2d1fa7bfa907b SHA512 c57ab2a6be0c4381b31f2fa99714dcf086268e7aeea7e7b399a78c7a89f9bbc81c85a1c9d19a89bb0fa9a50083c7da88d151a16b95fd35ffd116657ff20a721b
MISC metadata.xml 839 BLAKE2B d9916ce88ce8436bb28d15300e78013e1c9e0f88f385a369c0ad6840f0fe81ad136052a3c257cef50a2fd86500bcde2b652ad0ed664f95d6affa4ccc8770445b SHA512 3688c1488c552b84c685d0aeb6251aea4f9d41be3db3aeb226291655107e1332df13445545b3742587e133de7468a40f22ca53fa67fd8d2e0db570069498654f
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 0d527a036fd9..0a9f5b4ff715 100644
Binary files a/dev-python/Manifest.gz and b/dev-python/Manifest.gz differ
diff --git a/dev-python/alembic/Manifest b/dev-python/alembic/Manifest
index 617c2de0cb67..643e84b6357b 100644
--- a/dev-python/alembic/Manifest
+++ b/dev-python/alembic/Manifest
@@ -1,4 +1,6 @@
AUX alembic-1.4.3-pytest6.patch 2379 BLAKE2B 3c43194ce234703b10e87a8d8746efef96b317b1d23fbd19c1cea4a8809bf68e0a3908314948afb61f5b8081ac021d51d329c4b064f026ce33ed8ffe2919fb3d SHA512 390f3a605649c0c927edb2746906b703cf293879e9cc18be6a87a646ddb8032eeba837f7c4df4a9d82187bd9bb3af5955a815df3428e966ec7b4e7e8fb43de87
DIST alembic-1.4.3.tar.gz 1108131 BLAKE2B d9c8b6d6aebce7a45194dd6c654f4a2627714a5c1f7cb7a1cf80ed8c3fe861e3bb7857811128787ddd6c093b4370784b40cddb385cfbd30f6134d537fe949d2d SHA512 925d8957fd9008d041737a9e79ec8d7a4c5deba1976e980362d355a75348c1638d783d9d48234a5bc3b2dc3f2f09dcb281d0c80ae0f0c5bc32e176c3dfa05463
+DIST alembic-1.5.0.tar.gz 1128073 BLAKE2B 067ebe7a8ee9b14fc782e0f5268990b07a8ae91ab8ae89daee119bb64f30b8cb966ff22ce71c67e476fafce7ae418952f253645b0f5b5b8a1abbf7f562794138 SHA512 a667e5b176770061c27ea7fdaafdbcdad64d968e22e729083fadd8e002530cc43909a955c3ccaa04329c393ab3f27ec5b944b03ba0ae5d29609b940e7cfb8ad5
EBUILD alembic-1.4.3.ebuild 1097 BLAKE2B fd2e3a637f3e5ac2ab9c99ca604202bb166de1fb228e9f01c599d421477f9ee1f3238d776077ff6572b92ead31d810189ae6e0248061f6d5b9f2d248ffb05095 SHA512 ef525cc7ef1390e7416e0472cf0922c7d281875a257a0bd5321f3ce376a3d91a0815081064da999d71e6b9144612e17dd0a7be097057241878b7ed442888df59
+EBUILD alembic-1.5.0.ebuild 773 BLAKE2B 678e616304c753d6b6e6d013fab3287a5866dff3fbae2515bea8e9a4a194c8a5a39e4881e3b99696f1d29682825877a8db6ad4cff79bd2e06f107104beb99fd0 SHA512 16945915b6f6dcd5237f009f72ffb22b5acc2acdc746a41d297f3082cda9418800e3a4d83e5cde1faf7b90f4f2b31d7fdbe61a6b99b54504b7a48b54eb8613c3
MISC metadata.xml 515 BLAKE2B 219e6908903fd35cdc826ecf6dd46ad0e55996c4e674274b7840a9f04e50b19c9cdf24f0af66a9ea6782caeba7b7b0f0286c43055f25c638fda443fcf5a04f2e SHA512 8fe0d55be255a8f486693b026de9d9f934baf1ac6b927a743fdb8170bb52a32a1a0ae57b1b8c7e30ad8921e2dbae7af560a8942c801aec88d4c3b2544fd66319
diff --git a/dev-python/alembic/alembic-1.5.0.ebuild b/dev-python/alembic/alembic-1.5.0.ebuild
new file mode 100644
index 000000000000..9600e4d2d12c
--- /dev/null
+++ b/dev-python/alembic/alembic-1.5.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python3_{6..9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="database migrations tool, written by the author of SQLAlchemy"
+HOMEPAGE="https://github.com/sqlalchemy/alembic"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="doc"
+
+RDEPEND="
+ >=dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
+ dev-python/mako[${PYTHON_USEDEP}]
+ >=dev-python/python-editor-0.3[${PYTHON_USEDEP}]
+ dev-python/python-dateutil[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+python_install_all() {
+ use doc && local HTML_DOCS=( docs/. )
+
+ distutils-r1_python_install_all
+}
diff --git a/dev-python/asgiref/Manifest b/dev-python/asgiref/Manifest
index 2329c391624c..f1bee465bd66 100644
--- a/dev-python/asgiref/Manifest
+++ b/dev-python/asgiref/Manifest
@@ -1,3 +1,3 @@
DIST asgiref-3.3.1.tar.gz 27197 BLAKE2B 1a883ed8b87dd1214ffb7672796159684f04a9a38d75562df38455ea039667f877020263b4577a3f6f7cfdfa0aae2a2074781db669f10c5b639a5009ee4c94b3 SHA512 2d709e8b0ea8b9f11f485ee438cfbbfe8a832de1aa37094a6339cfff23c2605ec79f691320c42bebf46f3bddb005ebb6857d17a8ad641c87a149536cc65984e6
-EBUILD asgiref-3.3.1.ebuild 551 BLAKE2B a32cda0db162f4df3b93fdc898de85bc401e4d720bf2fd714910cd2da5d011b632f17ce6d25e4d30a3f4e57c9db5225c994d0d9ec9998bfc8946c018c7f85f36 SHA512 8198a33c9e8f6210ad179ac106d9f18941b1fd7795e4709f6f89bbee417147c9576f647aa551ccedfd7b3c6cbe5a6cd7bf2bf979fd506049385fa10719afbddc
+EBUILD asgiref-3.3.1.ebuild 563 BLAKE2B 832da32641f76a27afade547f60c6ced71c8c927e75fbf3968018bd44bae49dc628764eaa89a0c8e7edbfba0cf6e146254e08a8c5452ed45a4ca58dd59231c5d SHA512 7654b93434208d490738976903910dabf04ebcc03ec86daaf2fe7ea430fd45459d2f8a1af904a9395ce4d2f7d9244bdcaeae5f9c89abfd193d234e4b885e8e56
MISC metadata.xml 388 BLAKE2B eb8c329aa8d5220d66dd380ad7c4bb4fe539b3fb5b854e9a6b4912d2212b6ffa74d7f9331c5ec575bfd53407d016b464efb06c3f94c4088dd729f646b5d528ab SHA512 45d74c331619ea754ed36e7a2e9eee1687be49cf698ed7d9e89c8cb006b40001be93a8fc753830dbbba12a5ca61d3407aaa364aff3354708ae79cbb72cba6a20
diff --git a/dev-python/asgiref/asgiref-3.3.1.ebuild b/dev-python/asgiref/asgiref-3.3.1.ebuild
index 8ddc951f3bf0..04b982c66f9f 100644
--- a/dev-python/asgiref/asgiref-3.3.1.ebuild
+++ b/dev-python/asgiref/asgiref-3.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 2020-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~sparc x86"
BDEPEND="
test? ( dev-python/pytest-asyncio[${PYTHON_USEDEP}] )"
diff --git a/dev-python/asttokens/Manifest b/dev-python/asttokens/Manifest
index afade2a2e146..3d0d8059a8ee 100644
--- a/dev-python/asttokens/Manifest
+++ b/dev-python/asttokens/Manifest
@@ -1,3 +1,3 @@
DIST asttokens-2.0.4.gh.tar.gz 46823 BLAKE2B 111ed58c1b657900f830b7b9f521c1f87fd37945ab6ed6e165108fc2371923030b37cae33885e166a524eb8dd5cfad5fe9391a19b7729b7cd504474d1477748d SHA512 49287259d64c43c7460357d19ed95495ab499b0ad7ae0d5a59378ea0332142b574643349d1d3ca56442712ebec14c53167da475915017feb1b524ac190f9dac3
-EBUILD asttokens-2.0.4.ebuild 1463 BLAKE2B beed10427f48ad7a6644900f742aef1e723265b1ac7a24fc2fd713a6dd907443f271b1011b052e19ab2fef0e57c5014e7dfebd347bcc469f9e12a9b6d0702ba1 SHA512 4ca621407c94a98fde8d17d0a8acd61f50bdd4855c5b252b065d4700117d13f79bcfbdeda418ddf8be64ead584757713b6bf03693c3a3bebac82ae0ba4d8cf1e
+EBUILD asttokens-2.0.4.ebuild 1475 BLAKE2B 81d2d8eb63b580c5b35337167a9180e0b2237eb046d4aa634c68f93cc3acecfe37d43157901b1213f049be97a1ee7247fa98b08c0ba1bee423da877ccab7a5b5 SHA512 a34b7b996274c4ce4f46cc28b64e0f188d404145da7a0d5f9ea4a9b90e7a169049a45d95d2d82a51f21afaef6cabad44d9b4f7be539e0e942eca0db4aef151d9
MISC metadata.xml 349 BLAKE2B 98a5cf5c1dd38d72e3a9291bce91e66b23feaae3df2356e68e60bd2fb37a578b3f62d9f1eef8f8966c1cb10dc1c6d0820cfc9977e30c8574f9881177fc58fd00 SHA512 1bb6c8ba010ccdc6a47646021446943063034afeccf89437e6a769f40136e0a8a3875dca5eb40beb119a87e24b37db342542d89acde1fd3a836853f4524f62e1
diff --git a/dev-python/asttokens/asttokens-2.0.4.ebuild b/dev-python/asttokens/asttokens-2.0.4.ebuild
index d33cd9b5d356..4b007212a6fd 100644
--- a/dev-python/asttokens/asttokens-2.0.4.ebuild
+++ b/dev-python/asttokens/asttokens-2.0.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 2020-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -16,7 +16,7 @@ SRC_URI="
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~sparc x86"
RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
BDEPEND="
diff --git a/dev-python/awesome-slugify/Manifest b/dev-python/awesome-slugify/Manifest
deleted file mode 100644
index f776296e5b69..000000000000
--- a/dev-python/awesome-slugify/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST awesome-slugify-1.6.5.tar.gz 8405 BLAKE2B d1c43881dc5eacae105ec71230e53375b7244dcdefbfb95d3ed35a12eb74e6940f5fffcf4cb0eb803400949d17bda15eaee877e2a2406aabafaf9271298bed66 SHA512 3f8cc595cecc2a77b90bb800ea9ce889dbfa40427a4fc843f8f1caf90ddc6baa44d7195e6af2f8853c6038168f29da1d77a4ffd11a38d514140a07e4eb960c11
-EBUILD awesome-slugify-1.6.5.ebuild 482 BLAKE2B 3c763112ea7c9d3ab5976c1b63c136bb4b128091eb71e34681f87f4bfb734e308f60e03ae6c0436cb609fb835764f891e749d58bcb7b5001ca47df3b1736f9eb SHA512 b18b0e25e08b87d390c72b2b7960fc0a9501282bc5576588ec510cea814d80fe5a33c7c75adbe3d1b6ca73910982d2d0f884196437cea78751e34cb83509c858
-MISC metadata.xml 491 BLAKE2B 6e025d3be39b08a26fc072ed81f5ccd8a802faa2e368df5db3bc057fded57265804d6a9b234978e57e1a29de3e29af7d333f6f48cbaa4d399a10ff84e9c4e893 SHA512 856e2de73b55be31a7f9219de62711dbd26fcad1de44b710265a87ac1b1d992d370e238a93670dffa734f458f7e97000eabe356500f01ef8dd23546211ed9743
diff --git a/dev-python/awesome-slugify/awesome-slugify-1.6.5.ebuild b/dev-python/awesome-slugify/awesome-slugify-1.6.5.ebuild
deleted file mode 100644
index 70e930a3fdc6..000000000000
--- a/dev-python/awesome-slugify/awesome-slugify-1.6.5.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{5,6,7,8} )
-
-inherit distutils-r1
-
-BDEPEND=""
-RDEPEND="
- dev-python/regex
- >=dev-python/unidecode-0.04.14
-
-
-
-
- alexxy@gentoo.org
- Alexey Shvetsov
-
-
- python@gentoo.org
- Python
-
-
- awesome-slugify
- dimka665/awesome-slugify
-
-
diff --git a/dev-python/aws-sam-translator/Manifest b/dev-python/aws-sam-translator/Manifest
index 617b67e1dea9..acd873dca0ca 100644
--- a/dev-python/aws-sam-translator/Manifest
+++ b/dev-python/aws-sam-translator/Manifest
@@ -1,5 +1,3 @@
-DIST aws-sam-translator-1.32.0.tar.gz 817649 BLAKE2B 34d606bb294700dac1d3385d173d737d3259f460d0ead302521eb4e2660d3781c49ce5db71e1721245068efdac03eefcfe8963d4915d1e1c60fd783880a95bc9 SHA512 e4adce238434983c56b69960fd673db88edf5b3e4f9356ca4dae508f5a7a8e6bbd3c84050ee606e1fbd578d8f58c5d8196890187e058b7ae2bc8249dbb8ac0d4
DIST aws-sam-translator-1.33.0.tar.gz 817801 BLAKE2B 6e50f299b077f6d0240ee4db80450f766589c5349c323cd846c9ef42dc08bfcb7f8f80099c7d1ecf940d3ba1c2e4628842bf4b1f12e8fcc6c83100f5a375125d SHA512 72fadce4851d782e37e786132d98bcc364c92a1fa48addf715f0d2cf28e286e8cb8835de05fccc67c153d45ed8ba9fd3b7445333f8d96cd70b6c854b8b34c5d6
-EBUILD aws-sam-translator-1.32.0-r1.ebuild 1330 BLAKE2B 945f72a827d587257008785c4ba4ab66ff9bb15f7318780f305ee6554fd606976fdfc9ab258745a927e5b6860dd0f470b956cc7f897dc1bcabb43c5b3279ac48 SHA512 ac2d058a45be9a9e0bcde334bdd5e49545be8bb496cf1b345bdc064c98d82e323b5dd0d309fdf60f2b151a5bec6d053d3721c1d0108a13219e9b3fc3cd715b4f
-EBUILD aws-sam-translator-1.33.0.ebuild 1332 BLAKE2B 8d6fefe0f96a5ee6749057b524020e6e72e600d2fcfe1abedce4626a5074902aa818b721bf6d92c5883b4baa22d8126a5b020b2b88255cfef13a4346a2368c02 SHA512 e52a886d455ce75d590a96f19a9dc7d0ee331f105ca4313c4799172b26800b6237c092a6f48ee7de52f81a1bffe8489bf414497ff4caa2aecbfb4109ef38d479
+EBUILD aws-sam-translator-1.33.0.ebuild 1330 BLAKE2B 945f72a827d587257008785c4ba4ab66ff9bb15f7318780f305ee6554fd606976fdfc9ab258745a927e5b6860dd0f470b956cc7f897dc1bcabb43c5b3279ac48 SHA512 ac2d058a45be9a9e0bcde334bdd5e49545be8bb496cf1b345bdc064c98d82e323b5dd0d309fdf60f2b151a5bec6d053d3721c1d0108a13219e9b3fc3cd715b4f
MISC metadata.xml 602 BLAKE2B ce51fd399f69177920ab2a99807491640ee4fc4193c46279a05f442b608b420122ba8b7302b3fab1724ba2b3bad5519b51d86ff050713ad5bf9953acd843dba0 SHA512 829df35f0b222b1a3c2c17e813bcd2c8d8311e694ce0244877a9e492a91edb9597be906e7a449d7ac641787643fd355a0014e3e9ef113023066c9ccf52f32e65
diff --git a/dev-python/aws-sam-translator/aws-sam-translator-1.32.0-r1.ebuild b/dev-python/aws-sam-translator/aws-sam-translator-1.32.0-r1.ebuild
deleted file mode 100644
index f6fee1c242ab..000000000000
--- a/dev-python/aws-sam-translator/aws-sam-translator-1.32.0-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2021 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="A library that transform SAM templates into AWS CloudFormation templates"
-HOMEPAGE="https://github.com/aws/serverless-application-model
- https://pypi.org/project/aws-sam-translator/"
-SRC_URI="https://github.com/aws/serverless-application-model/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/serverless-application-model-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
- >=dev-python/boto3-1.5[${PYTHON_USEDEP}]
- >=dev-python/jsonschema-2.6[${PYTHON_USEDEP}]
- >=dev-python/six-1.11[${PYTHON_USEDEP}]
- dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-BDEPEND="
- test? (
- dev-python/mock[${PYTHON_USEDEP}]
- dev-python/parameterized[${PYTHON_USEDEP}]
- )
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
- # remove pytest-cov dependency
- sed -r -e 's:--cov(-[[:graph:]]+|)[[:space:]]+[[:graph:]]+::g' \
- -i pytest.ini || die
-
- # don't install tests
- sed -e 's:"tests",:"tests", "tests.*",:' -i setup.py || die
-
- # deps are installed by ebuild, don't try to reinstall them via pip
- truncate --size=0 requirements/*.txt || die
-
- distutils-r1_python_prepare_all
-}
diff --git a/dev-python/aws-sam-translator/aws-sam-translator-1.33.0.ebuild b/dev-python/aws-sam-translator/aws-sam-translator-1.33.0.ebuild
index 12e3cdc1611f..f6fee1c242ab 100644
--- a/dev-python/aws-sam-translator/aws-sam-translator-1.33.0.ebuild
+++ b/dev-python/aws-sam-translator/aws-sam-translator-1.33.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -14,7 +14,7 @@ S="${WORKDIR}/serverless-application-model-${PV}"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
RDEPEND="
>=dev-python/boto3-1.5[${PYTHON_USEDEP}]
diff --git a/dev-python/backports-zoneinfo/Manifest b/dev-python/backports-zoneinfo/Manifest
index bb57ced7776b..42b231595fba 100644
--- a/dev-python/backports-zoneinfo/Manifest
+++ b/dev-python/backports-zoneinfo/Manifest
@@ -1,4 +1,4 @@
AUX backports-zoneinfo-0.2.1-py38.patch 700 BLAKE2B c3bfc78001da6cfcd9e4b2ffae55f010e5237e68cce04bdadca40db95b5b2c2ef4e218cee884cba0e63ee182b817964ed5e9a7ef3b1992b0da041c0847d31b16 SHA512 d4210cf591a5c2a0266a3dc2f8b74b5ba5bde31923097aeb2044eea2c2934fa5946cafb747bb5e022a1af9a771049a4c6027acaf6886fcd0cc16db0c87a0a3ed
DIST zoneinfo-0.2.1.tar.gz 85385 BLAKE2B a6382560dbe8c4207c5a53971431497126a3bad7374580f4a67ffd1ffe5940701f13a09bc3a5ba4b729ab8d2484516ea2dc71131b7276f5339b1f60fc39c4ab1 SHA512 1f17ce34eef489dcd263665d58780ab54cf8aa83a601d31148bb4316e600f94d0af1d0baa1d6554d069c0801af906e21b9d5535db2bf76de32333820c61e2364
-EBUILD backports-zoneinfo-0.2.1-r1.ebuild 1698 BLAKE2B 4a2a8e1e7c3be940cda8327a8d5196dc5b33d797fc06e32113129c5a7cf1f60daa98f09526fa17e4950048ee5cef5012172513dd0ce0f987df7487f74c408925 SHA512 6a960c80d312d4ab51ee57232f86878ad2496776002ddf0c0cf1f86db5c70ce8970966bf2b2f2661d9f652ea91bac69d50f659740dfbf5671c10202a7fe55705
+EBUILD backports-zoneinfo-0.2.1-r1.ebuild 1697 BLAKE2B 98b9b45a5b03376101ac21fabc6903f0a1b41db64eb7f0f7b5cb0d00a8829bb560330fd93ca4351bf2f86b35e9e7b5708531ef7c840209350a277c29c78dab3c SHA512 9858c8cd0ed3f9b8891276e8997da7147cf779e2f61d6c5913693bb4ec43d07010827ece0431556e49d39ce31fb1fc1e5c2204f384ccc102c0d860190dc2a3cf
MISC metadata.xml 299 BLAKE2B 1ee3feadaf1ca5ce9f21e6992db3308c45acde5db35f0484cfc9ce8c0c63fe4f6504dd72fcf795562a86a72f6dd566cb31dbccd95d0c162a47050c54c4df8433 SHA512 4429cae96d7f99e5ca93fbf6ae8b5c18a02c515c20f46a7ac7e9d19a9ec63567cfac4ac3122ff23cd04073f76aae3b41c6f1540ea6aab20f488f093bf130db45
diff --git a/dev-python/backports-zoneinfo/backports-zoneinfo-0.2.1-r1.ebuild b/dev-python/backports-zoneinfo/backports-zoneinfo-0.2.1-r1.ebuild
index 8717574cc0bf..c7d80174a6a3 100644
--- a/dev-python/backports-zoneinfo/backports-zoneinfo-0.2.1-r1.ebuild
+++ b/dev-python/backports-zoneinfo/backports-zoneinfo-0.2.1-r1.ebuild
@@ -16,7 +16,7 @@ S=${WORKDIR}/${MY_P}
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv s390 ~sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv s390 sparc x86 ~x64-macos"
RDEPEND="
$(python_gen_cond_dep '
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index 042928f978d8..6467709b1c46 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -1,22 +1,10 @@
-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.43.tar.gz 342444 BLAKE2B 1a367fa252eab6738533c7bec2bc370dcc206f25c4290ea34632ef82a0e308aa4521af7bd2e9755782b3b66b438c528e67f55f7238183ffff2318bfb7361e924 SHA512 1cd757a2751e48b9075f99724a9980d882751542f5a7794a4cbddc46f82a1bbf00b8e0908e0cd2db16726636750d591aee26b00004a454c35d24ab79de9c80b9
DIST boto3-1.16.50.tar.gz 342744 BLAKE2B a6581acbdb07f2d8ce21ddf384b471d281d58910366dee0669f0f726118eabd52de8a4fe129915b9044bd484950155c32fa4f4941e1ef6ce55249213ba29f2f3 SHA512 de483be833917a2c478c0fe651ffe4143dc6c742e259711a955be41a8b76197353b295526695ca800bb860b95e0378dc461119bfa163c4be0faa3b6c2ccfc097
-DIST boto3-1.16.51.tar.gz 342794 BLAKE2B e344c4a2c6b1c43e0f2f9207541a7e00963829f9398cb36ab8a90544a486a638d2f88552fde5b006388692463de6c93fec6b16a64e43874fc173f82af3d8272c SHA512 5bd66801121aff3526d742dd79b48b1d502b76c0319183660d22532a5abb31b6faf616ddb2af774519e8e5eb89616be85e478325497ed6af8635e02786d0c78f
-DIST boto3-1.16.52.tar.gz 342838 BLAKE2B 62ab3b2bd72369e08d514fb712eb6653c247e774fbfb579f1293ec1a42752d7321011cf75a054cd625846e72b1b5b6490b1d8bd48f5a2ed818fcf6ac060c0857 SHA512 6a80ee0181f5def2595e7a2d07e7a29e32c23b2d91908338c43fc4794be3d69504cdf8cec7372cdca09004dddb45ae49772404f59a222af4e3eb0bb869cdaf98
-DIST boto3-1.16.53.tar.gz 342896 BLAKE2B 28f3fde4e029944d839c9bb46f8d0e0603dc1dc890cd157ade2687a5566b00ae77ef19c0835341cf92d12b8fca2d5290508456f1938789aa2689ac7a5673550e SHA512 f73cc6b78fdeedd25c7976ab1df681dce438bfe40f03cf74a3bbdb1d0b54b4203d650cd72263325fd9f1dbbb60445dfeb619c070debf711da7ab696eacd5a464
-DIST boto3-1.16.54.tar.gz 342962 BLAKE2B 8c17e156c127349f35e85f82980be5c79618bd43f896effbf07c7c847bd7d5e9ff2dce3db9dd4a414515e50139b1373c1d275ce3408e9c749e084185d0610fdf SHA512 cd1e290cf2aeea0abbe5504995e945c9e259ccc7f5dffbbe4037680405a26fb04ab466517b5273f2b372126a6627a9ff49574a19ad3cf740ff28628a8bd2621c
-DIST boto3-1.16.55.tar.gz 343080 BLAKE2B 4569d9caf329a3fc1870d88f85b208568cef12cc8b38382a342215fc517a251669dd92e82926a9b8a1c4e7298efad71c9d27d27633a92657c638be25884f8444 SHA512 4076ee3e91142f555975e0b543b365dce715a7eb6b35d6834f309556f63dca5a4a22205b04c2596c49e09e4b092ab1fa49a33ed6af05c215cce5519a5ece7cf9
DIST boto3-1.16.56.tar.gz 344547 BLAKE2B da32affd031a7efd7f55ec390f657d02caaf37d5c226ed811934e101dee1fcdc6df8b678ddaa181cdec140ad70525ff0a462885eee21f924040b1f2051d0f1f0 SHA512 2f35d4331db005ecb8dca5c780ebb2347242564f541e5b9585f0645e113255aeb8dff2210ecc42a2768f2b58c6731d59d6cb5eb7ac143e7aafd2bf21eae7d7ab
-EBUILD boto3-1.16.30.ebuild 1353 BLAKE2B a6f5c41b2add438b535df316b1c0a2dd060f513564ed89ec528d33ea184e573c87f68de0b03ac7a020baf9caceef209ff59706c155722f33e559b523dd9b96b5 SHA512 8a73419effe9e83d170d423f979c85a3fb89fa8ae9784a0b872cd2f8036ecb18c52a8dc54b6f444b660669ac25a38f40f9788a3aa37d15ed23a38fe1c1bc2fcc
-EBUILD boto3-1.16.36.ebuild 1355 BLAKE2B b77544d9428e4a8306032b23d79f453bfd59e44a61fcc664506d8e3b8977478bebda0d6b7df403c5e2b00473f0b14bb8eff7ef2bd454597c7d5550a6c37e972e SHA512 e863b24a58b8a33b678c3bd7b9f26ae9fa924f9f9cbd6ae7e923f1f764c4c83852c6e15084e0614f6141ad4ba00596208c41e543b40cffa1eec9029b7ae09ed2
+EBUILD boto3-1.16.36.ebuild 1353 BLAKE2B a6f5c41b2add438b535df316b1c0a2dd060f513564ed89ec528d33ea184e573c87f68de0b03ac7a020baf9caceef209ff59706c155722f33e559b523dd9b96b5 SHA512 8a73419effe9e83d170d423f979c85a3fb89fa8ae9784a0b872cd2f8036ecb18c52a8dc54b6f444b660669ac25a38f40f9788a3aa37d15ed23a38fe1c1bc2fcc
EBUILD boto3-1.16.43.ebuild 1355 BLAKE2B b77544d9428e4a8306032b23d79f453bfd59e44a61fcc664506d8e3b8977478bebda0d6b7df403c5e2b00473f0b14bb8eff7ef2bd454597c7d5550a6c37e972e SHA512 e863b24a58b8a33b678c3bd7b9f26ae9fa924f9f9cbd6ae7e923f1f764c4c83852c6e15084e0614f6141ad4ba00596208c41e543b40cffa1eec9029b7ae09ed2
EBUILD boto3-1.16.50.ebuild 1355 BLAKE2B f0f3a5ce9733f47eb3be188aac00a378c8e49aa6f6b38056c13c8340d9371b5ac2df5569a94673e005cee363f69dd24ae8722db8dbe6fd3d822af9b4473e0c84 SHA512 4b286aa8fdddad64d1d03dc8921cd355bab18ba1d9b4744b94446eedc07bb19285bfde860994599022fa021b033ca5f64c78d8b674984227a85e4070ef574efd
-EBUILD boto3-1.16.51.ebuild 1355 BLAKE2B f0f3a5ce9733f47eb3be188aac00a378c8e49aa6f6b38056c13c8340d9371b5ac2df5569a94673e005cee363f69dd24ae8722db8dbe6fd3d822af9b4473e0c84 SHA512 4b286aa8fdddad64d1d03dc8921cd355bab18ba1d9b4744b94446eedc07bb19285bfde860994599022fa021b033ca5f64c78d8b674984227a85e4070ef574efd
-EBUILD boto3-1.16.52.ebuild 1355 BLAKE2B f0f3a5ce9733f47eb3be188aac00a378c8e49aa6f6b38056c13c8340d9371b5ac2df5569a94673e005cee363f69dd24ae8722db8dbe6fd3d822af9b4473e0c84 SHA512 4b286aa8fdddad64d1d03dc8921cd355bab18ba1d9b4744b94446eedc07bb19285bfde860994599022fa021b033ca5f64c78d8b674984227a85e4070ef574efd
-EBUILD boto3-1.16.53.ebuild 1355 BLAKE2B f0f3a5ce9733f47eb3be188aac00a378c8e49aa6f6b38056c13c8340d9371b5ac2df5569a94673e005cee363f69dd24ae8722db8dbe6fd3d822af9b4473e0c84 SHA512 4b286aa8fdddad64d1d03dc8921cd355bab18ba1d9b4744b94446eedc07bb19285bfde860994599022fa021b033ca5f64c78d8b674984227a85e4070ef574efd
-EBUILD boto3-1.16.54.ebuild 1355 BLAKE2B f0f3a5ce9733f47eb3be188aac00a378c8e49aa6f6b38056c13c8340d9371b5ac2df5569a94673e005cee363f69dd24ae8722db8dbe6fd3d822af9b4473e0c84 SHA512 4b286aa8fdddad64d1d03dc8921cd355bab18ba1d9b4744b94446eedc07bb19285bfde860994599022fa021b033ca5f64c78d8b674984227a85e4070ef574efd
-EBUILD boto3-1.16.55.ebuild 1355 BLAKE2B f0f3a5ce9733f47eb3be188aac00a378c8e49aa6f6b38056c13c8340d9371b5ac2df5569a94673e005cee363f69dd24ae8722db8dbe6fd3d822af9b4473e0c84 SHA512 4b286aa8fdddad64d1d03dc8921cd355bab18ba1d9b4744b94446eedc07bb19285bfde860994599022fa021b033ca5f64c78d8b674984227a85e4070ef574efd
EBUILD boto3-1.16.56.ebuild 1355 BLAKE2B f0f3a5ce9733f47eb3be188aac00a378c8e49aa6f6b38056c13c8340d9371b5ac2df5569a94673e005cee363f69dd24ae8722db8dbe6fd3d822af9b4473e0c84 SHA512 4b286aa8fdddad64d1d03dc8921cd355bab18ba1d9b4744b94446eedc07bb19285bfde860994599022fa021b033ca5f64c78d8b674984227a85e4070ef574efd
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.30.ebuild b/dev-python/boto3/boto3-1.16.30.ebuild
deleted file mode 100644
index 7de92d70c47a..000000000000
--- a/dev-python/boto3/boto3-1.16.30.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2021 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.36.ebuild b/dev-python/boto3/boto3-1.16.36.ebuild
index ccc99e1c2415..7de92d70c47a 100644
--- a/dev-python/boto3/boto3-1.16.36.ebuild
+++ b/dev-python/boto3/boto3-1.16.36.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -17,7 +17,7 @@ if [[ "${PV}" == "9999" ]]; then
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"
+ 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-)"
diff --git a/dev-python/boto3/boto3-1.16.51.ebuild b/dev-python/boto3/boto3-1.16.51.ebuild
deleted file mode 100644
index 7be6516ff810..000000000000
--- a/dev-python/boto3/boto3-1.16.51.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2021 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.52.ebuild b/dev-python/boto3/boto3-1.16.52.ebuild
deleted file mode 100644
index 7be6516ff810..000000000000
--- a/dev-python/boto3/boto3-1.16.52.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2021 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.53.ebuild b/dev-python/boto3/boto3-1.16.53.ebuild
deleted file mode 100644
index 7be6516ff810..000000000000
--- a/dev-python/boto3/boto3-1.16.53.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2021 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.54.ebuild b/dev-python/boto3/boto3-1.16.54.ebuild
deleted file mode 100644
index 7be6516ff810..000000000000
--- a/dev-python/boto3/boto3-1.16.54.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2021 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.55.ebuild b/dev-python/boto3/boto3-1.16.55.ebuild
deleted file mode 100644
index 7be6516ff810..000000000000
--- a/dev-python/boto3/boto3-1.16.55.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2021 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 70434d5a4adc..427bf4cf375d 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -1,24 +1,12 @@
AUX 1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch 1056 BLAKE2B ecdf805cd61e337d4152d56952aeb8b78bfdd871b4da060d025ca4e3f974b3b7a907eee71ce6de1bc6cff8130fa81391aeaa2c5537b1baf159ce23500908a5f4 SHA512 c3be1a6457990168c759f03b24de8f78242b9c06f189553e416ce75fee6a77dce68967a551dfd83e1be096db9baeca019b75526c4886c672eca35282e307f229
AUX botocore-1.16.7-unlock-deps.patch 598 BLAKE2B 27b0c4d42da15c009c1a9181a757aa2886343a6e486710de5f962fe09ebe3ee9091830aabd17544e2112de2eaf91d63ca881ce050b6b9fa9af86337f3146a791 SHA512 6028bd13aebcbe6afe66018185d22f904c010cfd41f014b43f361c73799592d223af0a23d8fb3086f4bba9a1d106f60afc68e659dcb78d0d2a967442130b3179
-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.43.tar.gz 7374325 BLAKE2B 7def5221bee4774a6b8a33e6499e499588ff18f8b144e669bdf9b01ae4a3e370e3aed5a3a960360123e57299da9b0293aa8da9108fe114f8ae34521b2920f479 SHA512 a1b97cbb779d8c8fe3495dd18d3d635e38c5c49e5b5fb31b7764029cf3063a7fda44711defc45783b3afb844bead46e686705af57472a7ff27af8b7e21645ad5
DIST botocore-1.19.50.tar.gz 7382888 BLAKE2B 7de2ef7a7d051427191b13cdd47d3ebd9b4de505e3e17aa7dfb42de9a5eebffa2f06317a559631d219acc4380cc68c7dcfa1d6b0dc9cb123b2fa0315dd81df4e SHA512 7d1a8ff53e22fc265d8ac6492c0607f8948c9aa5862abaded93c605c3a3e4e98e535308e5ec1500a480636e03dbc3d849ec2b1dbf0efb22dffa841ce1cb551f9
-DIST botocore-1.19.51.tar.gz 7385977 BLAKE2B 505dd818f001b11f248582ec0f24bb7aac2e0d9bd343670d23eeb7ec14420bb7b97835a737de9464ffe5d76a43d311feee0e19860b35fddfc8398da4d00739b3 SHA512 03209809f75a5916df03d312fb877a3e129a8677ebd4e7785bbf8311a55823fe6c8faa62c78908fe0d003dd1695e0593a961d73c98dec2a8a7260ce53d6603cf
-DIST botocore-1.19.52.tar.gz 7386245 BLAKE2B 53e21b0c3e39bb3c7219e785b79a167e082f7de7a6c54b2c0e5c53f565c41f76042a9ccd1e2c7ae2e68e19ac2c43d9ce104f1ecfd6c606dead2533a319c969af SHA512 deb827631ffbed9980adc47f05e96d800dc2c65f67a156bbe29e3cd34e612169fc4169e173d06fb9fe42c92ddb1e5041dbd02ad838b80f82657b5bd851aa8fba
-DIST botocore-1.19.53.tar.gz 7387325 BLAKE2B 3432c9d71f7a021184c2ac99be9213015951d1bba445788dcb388a518b62a96a4d3871577d5e97f4f86f7b0830a009155667b05a960b1d06642599e3d4d484e4 SHA512 ffe1da3076e656c36f4c59c12fa9f466e63b6bbc0365f7ecb78a6dc6941eb3748d676188c2b0e5a2d23d21e5cb03daf2893aa04561e183dc931070fae77eea9f
-DIST botocore-1.19.54.tar.gz 7387625 BLAKE2B f3d6a36e5659fb96bdffdf3b7dfdde29c7af7f8437a1ba9722fd1b7c7c817d6a2e54500a6cce4784b7cff4e06342d317615cba048347ddd284dec978d5159e0e SHA512 1f5e0af14bb3e6ff57070580c72caeadfbdf64b8e24951053d991120ddd0d835e025d1211bfeff0f4932821e0c36f82514168ce785a316aac5ebee1feb073e6f
-DIST botocore-1.19.55.tar.gz 7389560 BLAKE2B 887b78625ef9a1d526850d2dba65d4dd4c9dc913ba6716e457d74ede4483a4e77fc401fc102f37150acec9f3d66511543615d73c5a380a354915b964dead1e8e SHA512 fd86ac2770bfebb3618faf3ccbbe003526dc97a0c233465eb26f83e9946a8710377c27811d8c8869b2cb8eec4f183555a47131968f57ab80529279d287ed9642
DIST botocore-1.19.56.tar.gz 7390812 BLAKE2B 3bec12ce19f39f12a72f7f59f226568cb5af59d6f9a40447a7a1fdc0f27eea06d0cfe5a5b12d2152189b700ddaa016592e95059fa42208c590cb698c568c2d63 SHA512 76988a7ddc588dba48f2444a99159247a0f178c67378fcb6eac51e3f5cfd0ab385960f0fb68bbc483f79e74c9b891070d34a39e9566eb8c24ce903b9ae24dfa5
-EBUILD botocore-1.19.30.ebuild 1494 BLAKE2B edfccea326db3a51f325d8ecb94d2fa22eb29e838709e6d0a140ad6adf5d64c5a8f140f078216650ca36836564b8210f5ea7912c228b1734498d3dbd8ec1016f SHA512 1e8ecb2d7a80af6bd5aa9732c457bb80af0bec916a258b3c017ba60fca07601d6d3eb0f66f44d4ff011c06514e944f66633898d5dfb07eb9f09e10d05f147bef
-EBUILD botocore-1.19.36.ebuild 1496 BLAKE2B 0eb45127ff4fac7d4993ef398b6ad1569cf2eaf8f3fcfee53a1a6072f59d6274ff54ca171015e1e04580c74ad2d4ddc60884d48218af8e2a017a6d8519e9a14d SHA512 d0482c33572812a938fd0631f8eec0f8ae42188f80d6238089d89ea49542f927146fe10f2fe15f672b79129b04328472000dc2a4ead9cb01aac7f5ffae6c80e1
+EBUILD botocore-1.19.36.ebuild 1494 BLAKE2B edfccea326db3a51f325d8ecb94d2fa22eb29e838709e6d0a140ad6adf5d64c5a8f140f078216650ca36836564b8210f5ea7912c228b1734498d3dbd8ec1016f SHA512 1e8ecb2d7a80af6bd5aa9732c457bb80af0bec916a258b3c017ba60fca07601d6d3eb0f66f44d4ff011c06514e944f66633898d5dfb07eb9f09e10d05f147bef
EBUILD botocore-1.19.43.ebuild 1496 BLAKE2B 0eb45127ff4fac7d4993ef398b6ad1569cf2eaf8f3fcfee53a1a6072f59d6274ff54ca171015e1e04580c74ad2d4ddc60884d48218af8e2a017a6d8519e9a14d SHA512 d0482c33572812a938fd0631f8eec0f8ae42188f80d6238089d89ea49542f927146fe10f2fe15f672b79129b04328472000dc2a4ead9cb01aac7f5ffae6c80e1
EBUILD botocore-1.19.50.ebuild 1496 BLAKE2B 8ca102a7a0953e4b60d52d61ab5de11437d7ed064b44021ee80625148278b4eda8ee84aa476c150fbfa54bbd1a0845ddbdc3f7350d073b69e35b72574feac0da SHA512 6edb749a2738a2e91d3c3f55317588e116e2bdf13bbebba47d1bcbb212d62966d8e784abd12c9696078a145fad9715fdf3a2fee617b338beee4f4b1d635219a7
-EBUILD botocore-1.19.51.ebuild 1496 BLAKE2B 8ca102a7a0953e4b60d52d61ab5de11437d7ed064b44021ee80625148278b4eda8ee84aa476c150fbfa54bbd1a0845ddbdc3f7350d073b69e35b72574feac0da SHA512 6edb749a2738a2e91d3c3f55317588e116e2bdf13bbebba47d1bcbb212d62966d8e784abd12c9696078a145fad9715fdf3a2fee617b338beee4f4b1d635219a7
-EBUILD botocore-1.19.52.ebuild 1496 BLAKE2B 8ca102a7a0953e4b60d52d61ab5de11437d7ed064b44021ee80625148278b4eda8ee84aa476c150fbfa54bbd1a0845ddbdc3f7350d073b69e35b72574feac0da SHA512 6edb749a2738a2e91d3c3f55317588e116e2bdf13bbebba47d1bcbb212d62966d8e784abd12c9696078a145fad9715fdf3a2fee617b338beee4f4b1d635219a7
-EBUILD botocore-1.19.53.ebuild 1496 BLAKE2B 8ca102a7a0953e4b60d52d61ab5de11437d7ed064b44021ee80625148278b4eda8ee84aa476c150fbfa54bbd1a0845ddbdc3f7350d073b69e35b72574feac0da SHA512 6edb749a2738a2e91d3c3f55317588e116e2bdf13bbebba47d1bcbb212d62966d8e784abd12c9696078a145fad9715fdf3a2fee617b338beee4f4b1d635219a7
-EBUILD botocore-1.19.54.ebuild 1496 BLAKE2B 8ca102a7a0953e4b60d52d61ab5de11437d7ed064b44021ee80625148278b4eda8ee84aa476c150fbfa54bbd1a0845ddbdc3f7350d073b69e35b72574feac0da SHA512 6edb749a2738a2e91d3c3f55317588e116e2bdf13bbebba47d1bcbb212d62966d8e784abd12c9696078a145fad9715fdf3a2fee617b338beee4f4b1d635219a7
-EBUILD botocore-1.19.55.ebuild 1496 BLAKE2B 8ca102a7a0953e4b60d52d61ab5de11437d7ed064b44021ee80625148278b4eda8ee84aa476c150fbfa54bbd1a0845ddbdc3f7350d073b69e35b72574feac0da SHA512 6edb749a2738a2e91d3c3f55317588e116e2bdf13bbebba47d1bcbb212d62966d8e784abd12c9696078a145fad9715fdf3a2fee617b338beee4f4b1d635219a7
EBUILD botocore-1.19.56.ebuild 1496 BLAKE2B 8ca102a7a0953e4b60d52d61ab5de11437d7ed064b44021ee80625148278b4eda8ee84aa476c150fbfa54bbd1a0845ddbdc3f7350d073b69e35b72574feac0da SHA512 6edb749a2738a2e91d3c3f55317588e116e2bdf13bbebba47d1bcbb212d62966d8e784abd12c9696078a145fad9715fdf3a2fee617b338beee4f4b1d635219a7
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.30.ebuild b/dev-python/botocore/botocore-1.19.30.ebuild
deleted file mode 100644
index 78d17756cbc2..000000000000
--- a/dev-python/botocore/botocore-1.19.30.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2021 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.36.ebuild b/dev-python/botocore/botocore-1.19.36.ebuild
index ca40b64d111f..78d17756cbc2 100644
--- a/dev-python/botocore/botocore-1.19.36.ebuild
+++ b/dev-python/botocore/botocore-1.19.36.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -16,7 +16,7 @@ if [[ "${PV}" == "9999" ]]; then
inherit git-r3
else
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
- KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+ KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
fi
RDEPEND="
diff --git a/dev-python/botocore/botocore-1.19.51.ebuild b/dev-python/botocore/botocore-1.19.51.ebuild
deleted file mode 100644
index fa25adc1c1ff..000000000000
--- a/dev-python/botocore/botocore-1.19.51.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2021 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.52.ebuild b/dev-python/botocore/botocore-1.19.52.ebuild
deleted file mode 100644
index fa25adc1c1ff..000000000000
--- a/dev-python/botocore/botocore-1.19.52.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2021 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.53.ebuild b/dev-python/botocore/botocore-1.19.53.ebuild
deleted file mode 100644
index fa25adc1c1ff..000000000000
--- a/dev-python/botocore/botocore-1.19.53.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2021 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.54.ebuild b/dev-python/botocore/botocore-1.19.54.ebuild
deleted file mode 100644
index fa25adc1c1ff..000000000000
--- a/dev-python/botocore/botocore-1.19.54.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2021 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.55.ebuild b/dev-python/botocore/botocore-1.19.55.ebuild
deleted file mode 100644
index fa25adc1c1ff..000000000000
--- a/dev-python/botocore/botocore-1.19.55.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2021 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/cffi/Manifest b/dev-python/cffi/Manifest
index 4aa840fc91fd..073f6fc7d89c 100644
--- a/dev-python/cffi/Manifest
+++ b/dev-python/cffi/Manifest
@@ -3,5 +3,5 @@ AUX cffi-1.14.0-darwin-no-brew.patch 568 BLAKE2B 43afdb086a0385e913f287bc5c1534d
DIST cffi-1.14.0.tar.gz 463065 BLAKE2B 4d1e8a92241db801848ef8bd05ea15a31c7f61ea426ce4da184aff00df786348d2c76de9dc48898c814478aed9750b665868df24ad39435062cd7e1c84163e52 SHA512 4c5451eeede1d48a8f4b40e25b845ad1863b8bf3bd39624e6c693c2800d89a13efedc4c43b37e317a035613bffc2e3fd5f7e583c46cb283cb5cb930356f86253
DIST cffi-1.14.4.tar.gz 471302 BLAKE2B 9722e517c99b6df239f59235baea76957900dc8566ff04c8d1fd367d20ad5f5437212bdb5e4e98aca303121e79411634fcb5e4e72179ecb3007d4f0eee68c9f2 SHA512 b2c54a805ead93c5dd8531d7f0f7e4b44be8f07bfcb1af2f19eb6d325b4e846cae23f16a5bcc777ba019d1213f013611614ade798e195f5b4f6b7904c9cb6e3a
EBUILD cffi-1.14.0-r3.ebuild 1376 BLAKE2B 7ed4fd5d2d44f22736bc2e288e98283105aed983097ad734a4cfd96af327b1b9488a2683b1c9fb5938d5e082090e31685fd190722f48fe8b763ccdfe701ab38d SHA512 ef5fd650941c3ca01f6270986f12821e1d4b88a3440da518cae49cb1a1c9075ff339d085b1bd764540d8563f97fbfb8f14c445289be320c3a5b404aed37b8c96
-EBUILD cffi-1.14.4.ebuild 1544 BLAKE2B d3a649a9de69ecc14bb168494910033f60b9ca3897b0ab20eef56e76ff50a37132d70a0e521f9635a91548df5b07d45525f3d88acea86046447680a2555a3468 SHA512 793d5606de7a0dad2ab6476405808d59400356532e4dfa80a087998dfae4a745d34d13d7d11f6a7a4ec59f3fc1ea93e454eb9c2f7d6a5fbf1a0c60211a56380b
+EBUILD cffi-1.14.4.ebuild 1543 BLAKE2B 492162d70898d50ae6cd19463dc6ffc0b41dc244fc8d2633e1daef0eb1e8be9cd1eaef8ac33c576a1d85be06d48e3015af08fc7eed8c84afc41b6195808041f9 SHA512 a2c35f9be8351e29a8bd716fc29a59a9e1d5f8507c82bcb7d0babad8086da8135723ee4d0e93256e60d06ad4a2168b2d9cebaa88393cc599e38b62ca3da1a4ff
MISC metadata.xml 317 BLAKE2B b6416209bd2358c42c2be3bd228238b401bf126919b6e7371d83d7cec8cb55a40f89db562701cc8f3dfa904e225426881b22ff1d3b72085365b5caf9b8c6a403 SHA512 0744ca7b98b2ebe2985bf2a81a337d09be62cfaa51f8380bac52f8d30941e997f09be20e28caf6967226a71369003cf35977790aba56ed0d469cc490cfa089b6
diff --git a/dev-python/cffi/cffi-1.14.4.ebuild b/dev-python/cffi/cffi-1.14.4.ebuild
index e2f5a15b61b3..dff0135796cc 100644
--- a/dev-python/cffi/cffi-1.14.4.ebuild
+++ b/dev-python/cffi/cffi-1.14.4.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0/${PV}"
-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"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/cfn-python-lint/Manifest b/dev-python/cfn-python-lint/Manifest
index 3e7adcf5ac2c..16a8b69a5594 100644
--- a/dev-python/cfn-python-lint/Manifest
+++ b/dev-python/cfn-python-lint/Manifest
@@ -1,12 +1,8 @@
AUX cfn-python-lint-0.30.1-tests.patch 621 BLAKE2B 7b4d457c56f32799c0da0e1e1f6551b57b89b08d7916a5a4b5c8c59605bb7dbb2393d566afc0da606103c09226b61d8a85734e124027ed81d46d405d18079778 SHA512 bffe6e2668dfb16f09ce20b784fb33a4a19cfbee832e6107601bd0bbd60c3f4e3b7debb3c3c320b87223dc584f054b6bfd1c19251ce17bf0b978d0b3e0b28088
-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
DIST cfn-python-lint-0.44.1.tar.gz 5339578 BLAKE2B 7982cba9fe422a8323c6ea270bd7ff5f41800cc16ceaa39d9fc01c2929cda5cca3b19c45de50ca8338a56aad001c834e16bfbd0ab59140381b5189e28965ba38 SHA512 b7f9ad598411d89979334aa79c7b4667ede28eef82b0b546977ba10f33f57e89366d1448e8ceeb3f28a2e53b33a409c439c3faf7d10f53fc5819f6b8693e117d
DIST cfn-python-lint-0.44.2.tar.gz 5515542 BLAKE2B 9da951dc7faa000d2abd1610595e463045079e5a2e73ad59779fb715f32fca39c1cef189484d62de3bc57a48b7776f5cebcc21c39948b7d73e394b89a4cebba9 SHA512 ca0cba19f930960711676ec285b10e0b60ff36359326098d5040bd2fd8f7ca6cfee985544c4bf94770baefa0e50eecead45c4d769ff3587031c3bf463f26355f
DIST cfn-python-lint-0.44.3.tar.gz 5591470 BLAKE2B 7d8f6763023a86d528f132b36b9b860b726241576037a1dd92a296f4b5ec5389ffe24e4a41a8f504ae8351b9dafc166d96ae3b17b90ac23062af2159baa36220 SHA512 a3c5fa435ed9afce32336d01cfc6c94d1965dc5c296601aba75064fdaecda9df5bfaf2976837729b56f00bc3e8cea7fe8cd5141c58335091a35dbec31a630b69
-EBUILD cfn-python-lint-0.43.0.ebuild 1339 BLAKE2B fe90ab49bbd145507a1c7294c48bdbbd3c2427604f26922c62e6868374c2217c44a0bcf6ab23e3297f36d44363875eaeb5a2295feeaccb79abd568cba0fdd0b8 SHA512 d43645635ea1f237a37ae964b41f3b2812590feb06a9854052b3fa258905c115b15433b3f508c7aafa88f19b85fed1262c8b49c412902c8fd4d9b50e629ba849
-EBUILD cfn-python-lint-0.44.0.ebuild 1341 BLAKE2B ac10bcae4e7c4cca570f4fa1e66f35038fd340fbe6d69388bf6300ae7cfa275610f1a2f239cad3b6ab1bf1ca8308a0805c91db8896f5eff612e695ad179b8f6a SHA512 eb21732bf1dbd44eb434f6b056c61c04b82f67f685b62709b9ccb16d37990f9cbaccf828021fd27fdc518707c14cf7977133ba3a722376bf53220252b4695a06
-EBUILD cfn-python-lint-0.44.1.ebuild 1341 BLAKE2B ac10bcae4e7c4cca570f4fa1e66f35038fd340fbe6d69388bf6300ae7cfa275610f1a2f239cad3b6ab1bf1ca8308a0805c91db8896f5eff612e695ad179b8f6a SHA512 eb21732bf1dbd44eb434f6b056c61c04b82f67f685b62709b9ccb16d37990f9cbaccf828021fd27fdc518707c14cf7977133ba3a722376bf53220252b4695a06
+EBUILD cfn-python-lint-0.44.1.ebuild 1339 BLAKE2B fe90ab49bbd145507a1c7294c48bdbbd3c2427604f26922c62e6868374c2217c44a0bcf6ab23e3297f36d44363875eaeb5a2295feeaccb79abd568cba0fdd0b8 SHA512 d43645635ea1f237a37ae964b41f3b2812590feb06a9854052b3fa258905c115b15433b3f508c7aafa88f19b85fed1262c8b49c412902c8fd4d9b50e629ba849
EBUILD cfn-python-lint-0.44.2.ebuild 1341 BLAKE2B ac10bcae4e7c4cca570f4fa1e66f35038fd340fbe6d69388bf6300ae7cfa275610f1a2f239cad3b6ab1bf1ca8308a0805c91db8896f5eff612e695ad179b8f6a SHA512 eb21732bf1dbd44eb434f6b056c61c04b82f67f685b62709b9ccb16d37990f9cbaccf828021fd27fdc518707c14cf7977133ba3a722376bf53220252b4695a06
EBUILD cfn-python-lint-0.44.3.ebuild 1341 BLAKE2B ed867d589bc3406d2235aeeb37d76e3c1e69a98cf2e4f729e810dad358984e8842373355630dcb3c37c1d3cb40c7025739aeebfccede74485f65b0da79e5293e SHA512 b2b5c746f57920942b4f6ca854f5166c773e7f4423e7b3c8ee37990eb7bcc52d40e95797a2924c63f49e4d6a63cd11e2402b78134d76d9010a34abca0a9a1258
MISC metadata.xml 596 BLAKE2B c9937cb001e177c18c65bff8b70940d241e54f58aae3818071510f1c73540fcac6c532c8700b4904d4e2c9382f8a5288a2cb8745e174b8ac0a4edfe114d78ff5 SHA512 40c20431d8132ee97311a23bba87d6b408297410573c191f8fc43282bd156884adc25b6ceb6f2168d3456d535c4d82fb3473dd9025bda276f6aad829f68a8e37
diff --git a/dev-python/cfn-python-lint/cfn-python-lint-0.43.0.ebuild b/dev-python/cfn-python-lint/cfn-python-lint-0.43.0.ebuild
deleted file mode 100644
index ec60ca8ed079..000000000000
--- a/dev-python/cfn-python-lint/cfn-python-lint-0.43.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2021 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/cfn-python-lint/cfn-python-lint-0.44.0.ebuild b/dev-python/cfn-python-lint/cfn-python-lint-0.44.0.ebuild
deleted file mode 100644
index a83123122bcb..000000000000
--- a/dev-python/cfn-python-lint/cfn-python-lint-0.44.0.ebuild
+++ /dev/null
@@ -1,49 +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="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/cfn-python-lint/cfn-python-lint-0.44.1.ebuild b/dev-python/cfn-python-lint/cfn-python-lint-0.44.1.ebuild
index a83123122bcb..ec60ca8ed079 100644
--- a/dev-python/cfn-python-lint/cfn-python-lint-0.44.1.ebuild
+++ b/dev-python/cfn-python-lint/cfn-python-lint-0.44.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/aws-cloudformation/${PN}/archive/v${PV}.tar.gz -> ${
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
RDEPEND="
>=dev-python/aws-sam-translator-1.25.0[${PYTHON_USEDEP}]
diff --git a/dev-python/cheroot/Manifest b/dev-python/cheroot/Manifest
index 827b54e35e2c..d25a474116c7 100644
--- a/dev-python/cheroot/Manifest
+++ b/dev-python/cheroot/Manifest
@@ -1,3 +1,5 @@
DIST cheroot-8.5.0.tar.gz 112163 BLAKE2B f7105f7c2d5433b90832dff6404120f153783b644b5acab72a915899fd138df1ee9ecde6d4148a66472cfb31802e58d684256524a212c65c1c42a22ab7783ce2 SHA512 3e781bfaea0b1d0b339ddb1ef871505c7eb0f4a67873f3207ec3cbb703392f579de90785c196d77f7a484b675de1438def4ad91109e70ad5894d26e55c645a01
+DIST cheroot-8.5.2.tar.gz 113183 BLAKE2B a3b60a9df3f34913cfb8c99fbdc8580ea436710c7979e296c18a6981f54bb959d6a300f4cf9d4e608fe2987f58d5fc6d2b8f57bca800e461d31c77ac61fd6b01 SHA512 245c4157f5e11741d94375099878ef5b31945412a2b02961502e762b9770fd968f4f977fe2d74744aa6596c668079d7f07b6f129fa11438783a95d3a5ee088fa
EBUILD cheroot-8.5.0.ebuild 1527 BLAKE2B a010786c5a37bef710f485a6f89ae1b612a4d093b3e71d21bb93374fe3da6290954ca228614e5cc768f48120c1ef317e52f6ae8f1ed0210b7277cb9f5055e216 SHA512 9f679be4d18bcf14a0d2fc25ec2e669dbda25311f17ec8b1c59bac814d8245ef63f217989ac42c344a68f4608d3e41be2f6289faf91730638860fef4a64b3b79
+EBUILD cheroot-8.5.2.ebuild 1627 BLAKE2B 16daee02bb1ce2ce2ec0d1bb6c24d5176f27310d15b3d4e6fe66a1939e3d5b4112b80ef90e1122d597b86928c850fad3c6953f75be8ff8265a2c7090fcb837af SHA512 b7ab367d673a2f1937b7193abdd07f807f283fef8e39df478f7a3939d28951c03099459b03c92aefe15dd309743bf8e81e661e7eb315f92655257f870f9c27e6
MISC metadata.xml 495 BLAKE2B 4194775afacc99b4983275505dd45471a7ca4305a6cfb37d8fe80fdc00d196da1c2722940d2ae13408de0c13c92c7a2a01ef153b35f49f8ccb9d7df2f605dceb SHA512 710108fdb8ddda277cceea3d57a3ef716e7a67067e658f9719a793f9ba7fd04e8a1e4482c68c23ba458e29e85b9b233d72ec485ab8c585703f411fc32051f256
diff --git a/dev-python/cheroot/cheroot-8.5.2.ebuild b/dev-python/cheroot/cheroot-8.5.2.ebuild
new file mode 100644
index 000000000000..a679521746ed
--- /dev/null
+++ b/dev-python/cheroot/cheroot-8.5.2.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..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
+}
+
+python_test() {
+ cd "${BUILD_DIR}" || die
+ pytest -vv || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/cleo/Manifest b/dev-python/cleo/Manifest
index e09128008f88..f016859f9bc1 100644
--- a/dev-python/cleo/Manifest
+++ b/dev-python/cleo/Manifest
@@ -1,3 +1,3 @@
DIST cleo-0.8.1.tar.gz 96220 BLAKE2B 57971f6254a31ecf5101d89e96607b5915ab5138d727279d445172b89a10acd6b76619d344973fa2bdbc320866fa1dbdf05c889f4eca879839fa6bcbbad0af7c SHA512 9cd470063db9866a526f0bb8619d772c585377d5b1a662e0f94bad9fb9c853598b176444ca1ac0fadec82992196c471646504d6a28d4dcd1171433b8d160be9c
EBUILD cleo-0.8.1.ebuild 624 BLAKE2B 38abd62a84c961213d71760f8ba7fab59ccf4a602567206e25510ff99fe40020f411636aaf4b6a3a1341f1db5dd012145a96fbee81f01d4f0e499adf306a83a0 SHA512 ee3f28a563973aea30510e71d9a264082744fb6bc2443f53b61c170e42d15d1601a6e056427d002e22243477f00ebe272ee696581dc3db1dce616b5346f2a66a
-MISC metadata.xml 463 BLAKE2B 1301eaf07a48878ae354f7eeb765d5791812067ca1e7e7e5bad4d9cc6b1f229ad78120ba9030848054bfe27b35fc7c76a5c6e05298bc0c1a07cd0f16c4e4a6a9 SHA512 f8e8bd548905b8aa84bb86134fd08d9df75a274fae5cb45a18233b3fc60e7a84a2d454a38cfe6458ef133885dcb370a662360fa1509de7dec475cfa221a2fcd0
+MISC metadata.xml 507 BLAKE2B 21dc64d2772ae701ec2297232c11b08c1a3c8bb1a4444d65370c80c655a90642a1eb421c85d87fdd7414ccbe0e707d108ae4e2dff56fcceaeff952053dacdcc7 SHA512 4e9ee663b00c7faa3f160ee78d6fa02ea1947b5134fe173129a357646b0e35049a6b59e630c4eb4f94ea5da514bc44140765955a9f1788760d955b69f0d00fc1
diff --git a/dev-python/cleo/metadata.xml b/dev-python/cleo/metadata.xml
index 3aeda27fde98..9276c356eb74 100644
--- a/dev-python/cleo/metadata.xml
+++ b/dev-python/cleo/metadata.xml
@@ -11,5 +11,6 @@
sdispater/cleo
+ cleo
diff --git a/dev-python/cliff/Manifest b/dev-python/cliff/Manifest
index b39967d94e03..0cb531384657 100644
--- a/dev-python/cliff/Manifest
+++ b/dev-python/cliff/Manifest
@@ -1,3 +1,5 @@
DIST cliff-3.5.0.tar.gz 82997 BLAKE2B f169770a0a956e6091e56eccda8d10906bee09bdb03b474f3b17837b3eda858f3afd21beae1d6945bcdabfa89fc1555d13d70ddd0454a10fe05bfb63c8de75e7 SHA512 215f22e5dd2c4c17bd0f19866189b6b247377a7d5bddeb4a07b7536af7545bd0440b5fb0a98474fc018e3b12f6695f60028c012f3e7eeb6498b20f2923939d08
+DIST cliff-3.6.0.tar.gz 80464 BLAKE2B 2b7efb07123fd9939c5717d6bdc1685d2e6474f3852e920c8d93f8a3e7ba20e433dbead97040ab035c4081058b621740ff64045c282a0568393fe8453da245d9 SHA512 ed4077e8b9e848dbd8aebb076b9f55086ea861cbf22322f7c9fb03a66b88bd60f5c09c6914481fe5f02bad25c0183e245405d9ac54d37b6bf0f14c9c97bd7684
EBUILD cliff-3.5.0.ebuild 1204 BLAKE2B c6386d66b15ed57cb82983255a1194eddb7597a8b8eea3ec842d3c12230a43edd252d74a6515e2ae8a0313057cf9b77514e4893b32af0fedfbc61084e391e7b2 SHA512 092334f6b041427cc099d9a4b091d3d8883444552de3c1fb533c4db1f62ca16d8167e79c012484d0632f7b8576660fb4f555dbf8785d665984f49066efe18aca
+EBUILD cliff-3.6.0.ebuild 1166 BLAKE2B 502b2e79d040aa28a7ca74954cc7bf7461c39ff4573de9419e1fc832403c8c696647dd723ab8373e92a14dcb90b3cba62eb2d53765ac0424ecfa45808dd9779f SHA512 f94d9bb700bef4a901c2e70f6ebce34bcaeb6a8164a85588e2bfb3c354fe89fbaad63b21889b58681b0574f006a88aa75102c8b1c6c9c0fc31973e827c6a2c99
MISC metadata.xml 766 BLAKE2B d1e77f1b381c58cc9d5c004cbc5062bc8b024bbd416ce4f3e44d6fc817252980193d7f3990b4f0248d23d763dc62a489fbc68093eacf8e3e7fd82cb596b6fcf5 SHA512 bdeca590929247212b707d2faf686d70102aae0fefd4904a9bd091e041d926740df1fe0556b485d0947c7ff879c190341fbc3cbca535aa0e2140104a8b618f1b
diff --git a/dev-python/cliff/cliff-3.6.0.ebuild b/dev-python/cliff/cliff-3.6.0.ebuild
new file mode 100644
index 000000000000..a3bff2da3f73
--- /dev/null
+++ b/dev-python/cliff/cliff-3.6.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..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/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/clikit/Manifest b/dev-python/clikit/Manifest
index ced018c2f9ac..1b98de907478 100644
--- a/dev-python/clikit/Manifest
+++ b/dev-python/clikit/Manifest
@@ -1,3 +1,3 @@
DIST clikit-0.6.2.tar.gz 72115 BLAKE2B b72f245128c698375f97139cf245bdc8c017e3e2d142f6e3183a42620b23a024531e5b14f05163c6defa9ee54c52c19a64932c62484f2ec8da5c75ea1b7d3d27 SHA512 6f6e436b2161349ce03c705df594e564dbc594b03370dfd62e3b1c8f2accbbc12a1cda881ca392a096435ee243e4f772589ce6f6dfbd3af63d1656d49c3fcb04
EBUILD clikit-0.6.2.ebuild 832 BLAKE2B d8104e7bf554583fc9248bc3fcf21dbe8b59e02f2869ae0e8c0837cd8d51737df2e18892e0315e2b5ff8122f328d6adc40eed4fd4aaf7c6020e2df50485e147a SHA512 b1306ea25067b396cc1b7ccd4306c48cda0f5eda58eb39d58858039158e43a7ddf3fe17c3fc1373c841e758d274c09f8494912ada3329fb20635145252438c4f
-MISC metadata.xml 465 BLAKE2B a4afe2c2062d27de8b59c25056d740befa28200a6f245f400943cf51f5cd429e94e4b79b6373e7ebb8a679780c57f92f235d772851a29a206ec419ac4112cce3 SHA512 2722dbbb4e40e90b12833ccadaa94cdae400f6b4d1d7c284d19a15bcf87c65afa6cdff42977d0ffc18ea63d16c96e6f60430cda966b5bf25ca3d54cb636912bc
+MISC metadata.xml 513 BLAKE2B cb8c163c3be7c18a28edbd53b48d20d30787b2006cc23f68d7b5575232b5fa6fcda37c3b07e5afb6ed5d02779533cd3aed463e4c9aa2c5dcf4ce6de901b014ae SHA512 ea5929f2f091b02c368c6faa4a227b2a2423f05b4aed82abe2122b51630a6be4b9061ec078a5844074cf94ef0a609ab827731eaad6d5c434cc911ce67ae8a3bd
diff --git a/dev-python/clikit/metadata.xml b/dev-python/clikit/metadata.xml
index a50ca4fdf5fe..4a11e6ef158b 100644
--- a/dev-python/clikit/metadata.xml
+++ b/dev-python/clikit/metadata.xml
@@ -11,5 +11,6 @@
sdispater/clikit
+ clikit
diff --git a/dev-python/crashtest/Manifest b/dev-python/crashtest/Manifest
index 823b8c0bd22b..f73e58039848 100644
--- a/dev-python/crashtest/Manifest
+++ b/dev-python/crashtest/Manifest
@@ -1,3 +1,3 @@
DIST crashtest-0.3.1.tar.gz 16223 BLAKE2B b90465ee736ec0d9c378ed16327fe5bbddf19066a64a2a9d1c454f38eac5321235cafeb20756b2018e1dfea0e07726696084b8965a2543edc5e9fe0d79c33db1 SHA512 1ec80159416e820336d2217c2327f26638e235797ac73edc96fc5e568e2d9fa6e8746e11acde71953a960247f73a6ed9540e3f01c96d3a65f2071dc3e6be5be6
EBUILD crashtest-0.3.1.ebuild 498 BLAKE2B cb1310612456b7774b2f1f0ca67ec74b826262650a589b7c404ebfaf908343c23509a11826a8b4083031233ff7b17769dd620f8b5a98c7f858745fe8767d66ed SHA512 2b7ac2bf23baf5489534b72cecde8b88d59798929fec7f6438751a9c6b6631512d0a62cd5a0e6a776fb6469f5b65956fcf514c92918a8003dc960132fcf0247e
-MISC metadata.xml 468 BLAKE2B ad41def7785b24dd47cb095b4ea63dd05bbaccf0bf31a574e8d874c51930ff98e5ef8d3c206635318b52a08bb0022b3001aafeaa5833677b6c5d8ecf289fd600 SHA512 50d2c98fcc435a1a4ccc9ff05fd84d318e1e556a9fe2a675206d90ce0e135743271409a4c55d2465118f5d68933d366494f527ea7b20771476df0f1630c19bec
+MISC metadata.xml 517 BLAKE2B 0975f95441e6bcf402d1214b987e8bab096300387c758dadab39b4d047f43bb1c112190cf6f0d068eacfc39895355edfa3249430a10d4400921c8c6b4ba48d35 SHA512 0bb7b4234db5f0a7bf4faaa048d47a8543fa981a266beae9518eb8f3a14fff421acd3682457095c8d375f5c95ccaa73c0741bb2d247d84b62dda099ffe21a2bf
diff --git a/dev-python/crashtest/metadata.xml b/dev-python/crashtest/metadata.xml
index e0750dcf1d2d..6af88537ea4d 100644
--- a/dev-python/crashtest/metadata.xml
+++ b/dev-python/crashtest/metadata.xml
@@ -11,5 +11,6 @@
sdispater/crashtest
+ crashtest
diff --git a/dev-python/cryptography/Manifest b/dev-python/cryptography/Manifest
index a3d114fa60e5..888d47326006 100644
--- a/dev-python/cryptography/Manifest
+++ b/dev-python/cryptography/Manifest
@@ -3,5 +3,5 @@ DIST cryptography-3.3.1.tar.gz 539756 BLAKE2B a3eb52d756565ae83d9f2e06045be1d343
DIST cryptography_vectors-3.2.1.tar.gz 35168164 BLAKE2B 77af3be0dbd7393da7cd59600086041b78fe20339018a637fc1cf3600c7cd08cf2e565c79ccb47f4719a4b0f01cf2ab2db00c025805443b333dd7fdf3aa835a7 SHA512 44ff756a6ece9700f7657f8ba92417e95bf273cf500f1dab2141de5b2af6e61840d65c37b766abd752c76025ead1550bfc7b7340ce5774c75fd0bb8ac768cdd8
DIST cryptography_vectors-3.3.1.tar.gz 35168171 BLAKE2B 72cf5d79773a728c16847e3e62f8ce444526c051d7562467446d3e59c66064568fdfcbfb1fd35419fd79079ff9a02a2f3a97f870f7adef6cc9a0fd23b4edf514 SHA512 a102535bd3cf72118106ca7268d5a9921738d41f81247940c550961d61cb0d1869095b7891c39e8dc15816f7d38230622846747b4b7a3f226f09306cf86220bd
EBUILD cryptography-3.2.1.ebuild 1939 BLAKE2B 6e50d1b568ca68ee26c7b8edc6078345f842438fd2ec1626cb4142f024017f7003b9e6f1ba34f0f2ff7e945f7b6a4a50efe7c7e8833dd0472740d11e5b78170a SHA512 b04948250bd9bdd521161b6ee70d7a9bad0bc6cdecaf0f1b4111deb65f6f54cb002070bcfe8ea36bfaab1a170b9e338ec43bffab36ae6d17b032e89917b253f4
-EBUILD cryptography-3.3.1.ebuild 1942 BLAKE2B 6c9093252e726de5317957c6c4d58d5e9229111b393199116094abbe3636b234d4d38d3aef5d80957bd6c05ac4493f580ad480a8fab3eb5a6ece1a4f2e746acd SHA512 1f3b8694a0c8f96c0e4b8f8dc15ac315eacc5fec68b7cf8f319aaff3f456eb22b4a69aaa6f223a5a0063e43b565e66335095fdaf08c76f052a1eb00d2852afbd
+EBUILD cryptography-3.3.1.ebuild 1941 BLAKE2B 17dbc6d37dbde22a0d002c9bbd998b4b9da89a237ba28eb22838c44dd97b50827ead46cdd294b1c2361fb57c24a7a211b9072bf5e4390d04dcd261835718c521 SHA512 d2f206d0b426aa14c7b8f31867afc4b1d244969345261e3c8aac3207891a623a2c197d155f24b04c4030e33553ebf04298bdfe2264fbf19f4e650dd32841c5a3
MISC metadata.xml 499 BLAKE2B 2e4c37917ebb1604f399b0db4abe27b02b133a2cc8fb69fbbf52b6fdc0aee079dde61be188bfa5bca043a1804a670ffb53f6ab1e79147230166f696741fadad8 SHA512 26eda8b0a2ac91dce2946e18e941e2e75df15e4583e4ddb1f1329403eaae30db9976017f92981c462bfb8c8a559de2a2ea9531f4ac5ccb2d57cadb00e68e05ec
diff --git a/dev-python/cryptography/cryptography-3.3.1.ebuild b/dev-python/cryptography/cryptography-3.3.1.ebuild
index ce8cb9163d41..3862af56608f 100644
--- a/dev-python/cryptography/cryptography-3.3.1.ebuild
+++ b/dev-python/cryptography/cryptography-3.3.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
LICENSE="|| ( Apache-2.0 BSD )"
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 ~x64-solaris"
+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 ~x64-solaris"
IUSE="libressl idna"
RDEPEND="
diff --git a/dev-python/dbusmock/Manifest b/dev-python/dbusmock/Manifest
index 50a179b2df24..9f14e280b92b 100644
--- a/dev-python/dbusmock/Manifest
+++ b/dev-python/dbusmock/Manifest
@@ -1,10 +1,5 @@
-AUX 0.18.2-disable-polkitd-tests.patch 372 BLAKE2B bb9b33df485c635a080c41d4bea5360cf6a128a2f569782a51525c1ac9e6972bd03188f9777b1685f04900d48f2e554507db7c8b755de02c0a07de8defa26f05 SHA512 a105bb67702ef10d578e4df723452f060248287e9fc394754257c036ba0c6b186f90f5849a37e32e57cd70f16bbb73d0b8f84d9d153e1649d3ec5ab147dd6183
-DIST dbusmock-0.19.tar.gz 72567 BLAKE2B 973cfa02d1aec29f2151ce077471c49f7def3cee079eb975bbc1abca39cc6d391f5dc4aed40fcd9c9db3fcc25429e689f130dc495b94428b73c64f3c650a9c3a SHA512 9f49cb1818c0de8b774d4ccd0eed35de3b0a95de669e70539699237b5cdfee993da7747dc28375c8f1c26fac83d948b7ce25107d866e28b833b556c6f654706c
DIST dbusmock-0.20.0.tar.gz 72228 BLAKE2B 704287414bf562bcda9c25c6febd6c4a7b0123c1c38dcbe00f5448dc94784eb6002825975f03b8633e253dd63b18126026c9630aa98fcd891d7e40eba207f123 SHA512 26660439801dbd4c2cdc146d67fa465ecfdfbe4dba4fbd163e0f00af415247d0ff502122d0a850b5bd6dde9f296dea601dcb180ba4bdd5d58966ee4ccdef8999
-DIST python-dbusmock-0.21.0.tar.gz 68184 BLAKE2B 3a9ecac8677d0c48f458ae6b39d3fd38aca0bc85ea666f0806f6fb463161cd983ef83af6b0c9f68ace64d4f3a28920f71265d75aa5a6bf8dc61a506ab6f8b67d SHA512 46acfdb7598a99f2daf8ab00677e558bc499c092b44f3231f1371b4aa99393d2bdcfdc8d2181236362932c89c0d94a283e6e985c61cf284652f55ec192f8de1f
DIST python-dbusmock-0.22.0.tar.gz 68626 BLAKE2B 51b897ad95bc547afe6cd59abed243dcaecd3c6ce8c47825f3a2eeaf7364c5aba04d23247c876f748b071f30753a86da954493bc63f0ae503085974e7e769658 SHA512 2c3430f4178a16acc376ce582f4a1a9bbe8b917efcd7eee58dab85ee3addf60ba355ae9e7b318ec2cdf7ca771183c37d16520a1e5bcab8414c66e2d2a36d26fe
-EBUILD dbusmock-0.19.ebuild 1071 BLAKE2B ceac7e1a85ab974743225c48b6d76168b69cc55b703b59dc29caa6433a7c7b5ce13edb312355045d14eaf8a58d9d47ae86c9738eb93e07f64ce6c3878d728c54 SHA512 74a0aa6c85d547eca93f99c9e27fe9cc13136a74b963ef315ee560a332f7a809e4d7f154d2809a3be720cb1f7ec76b7e97becc32fc130b0c45bf4422e8b6663e
-EBUILD dbusmock-0.20.0.ebuild 881 BLAKE2B 212c8f42a9943921bbf41f7a341d3631949d71422c88fc933d62c674c912cb907d27133fe2c27e654e7463ca388c5db3495c4233edd3ed4ead029629b8b411df SHA512 382001ad6e78a5cebda97b3e9336de3ccc7e9582c3728040a71779ea7eb47ca0f2ef573233a6aea7d43b1cfea04fb48ded230ecf2a256e51ae62d5927d08bc8f
-EBUILD dbusmock-0.21.0.ebuild 811 BLAKE2B 8904a8f8f4bfb7e087658409e6e689b0c160ff3bae3302d3a903c286e0d4827c8c9878657ae177a56d728f6bc982059a4e9bfadd7dfa0e94a1a2b42c5724ed15 SHA512 2fa59494782f89d6996d337d93a6f87a272b50f80ce501064ec5fe9114fe77a3f1768e8898054b945f293b457a93095ad13c5fbb4e4ea4be010eea61ee956d3e
+EBUILD dbusmock-0.20.0.ebuild 877 BLAKE2B 450e4e35d28ee5809154df031cb800f3ad738de63a6049edbb676a810e0a339db1d4ad0072d7af4b32cc19d161247eef184400e9aaabd03cb1c341d2cc57aac2 SHA512 cc357487b414036e827f031660c4a3601e471727a69af656e98fd9c642f6f9035c920298d586a53a71ce15c9b287394146c9b99105a85642714502ab0837e878
EBUILD dbusmock-0.22.0.ebuild 811 BLAKE2B 8904a8f8f4bfb7e087658409e6e689b0c160ff3bae3302d3a903c286e0d4827c8c9878657ae177a56d728f6bc982059a4e9bfadd7dfa0e94a1a2b42c5724ed15 SHA512 2fa59494782f89d6996d337d93a6f87a272b50f80ce501064ec5fe9114fe77a3f1768e8898054b945f293b457a93095ad13c5fbb4e4ea4be010eea61ee956d3e
-MISC metadata.xml 331 BLAKE2B b328a0033b2b0c38d69fe4d8d37c6f270e5f0e2fccbdd2ac0b346cc7b067dbc99af9275f5d9eca50972522cdea6c5a5f2cea8465e9afb6b7c616506ef0ca9196 SHA512 6469bee681a79c9496171ee61cb26fedec1dc4317dfc81163a3597379fd3b295fca78990a6d2cb56ae1d7243ecb08416e0bb6dc618f2ce534691a0e5ba6e5b50
+MISC metadata.xml 456 BLAKE2B 1255b5eaa7068525c5661663a3d42b052100e7c0c9ad58f4b85ba6113d2b0ebd4a48691ca52bbaf10635d34e5fe8949b6e44f98babe514ca78663462fa88a85c SHA512 ce665cd1934e2307281538e1f306297974cdf50c7c5576ebd2f290066a39b1a18bd1dfbe34bef29d5f332847699699b811754bac9d52364a96c66b030d953362
diff --git a/dev-python/dbusmock/dbusmock-0.19.ebuild b/dev-python/dbusmock/dbusmock-0.19.ebuild
deleted file mode 100644
index 899a8a785982..000000000000
--- a/dev-python/dbusmock/dbusmock-0.19.ebuild
+++ /dev/null
@@ -1,46 +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} )
-PYTHON_REQ_USE="xml(+)"
-
-inherit distutils-r1
-
-MY_PN="python-${PN}"
-MY_P="${MY_PN}-${PV}"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="Easily create mock objects on D-Bus for software testing"
-HOMEPAGE="https://github.com/martinpitt/python-dbusmock"
-SRC_URI="https://github.com/martinpitt/${MY_PN}/releases/download/${PV}/${MY_P}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- dev-python/dbus-python[${PYTHON_USEDEP}]
- dev-python/pygobject:3[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
- >=dev-python/setuptools-17.1[${PYTHON_USEDEP}]
- test? (
- dev-python/nose[${PYTHON_USEDEP}]
- )"
-
-PATCHES=(
- "${FILESDIR}"/0.18.2-disable-polkitd-tests.patch
-)
-
-python_test() {
- nosetests --verbose || die "tests fail under ${EPYTHON}"
-}
-
-python_install_all() {
- local DOCS=( NEWS README.rst )
-
- distutils-r1_python_install_all
-}
diff --git a/dev-python/dbusmock/dbusmock-0.20.0.ebuild b/dev-python/dbusmock/dbusmock-0.20.0.ebuild
index 7a5a676663e2..f2e30a9c925c 100644
--- a/dev-python/dbusmock/dbusmock-0.20.0.ebuild
+++ b/dev-python/dbusmock/dbusmock-0.20.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/martinpitt/${MY_PN}/releases/download/${PV}/${MY_P}.
LICENSE="LGPL-3+"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86"
RDEPEND="
dev-python/dbus-python[${PYTHON_USEDEP}]
diff --git a/dev-python/dbusmock/dbusmock-0.21.0.ebuild b/dev-python/dbusmock/dbusmock-0.21.0.ebuild
deleted file mode 100644
index 8ba3f1810b52..000000000000
--- a/dev-python/dbusmock/dbusmock-0.21.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-PYTHON_REQ_USE="xml(+)"
-
-inherit distutils-r1
-
-MY_PN="python-${PN}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Easily create mock objects on D-Bus for software testing"
-HOMEPAGE="https://github.com/martinpitt/python-dbusmock"
-SRC_URI="https://github.com/martinpitt/${MY_PN}/releases/download/${PV}/${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-RDEPEND="
- dev-python/dbus-python[${PYTHON_USEDEP}]
- dev-python/pygobject:3[${PYTHON_USEDEP}]"
-
-distutils_enable_tests unittest
-
-src_prepare() {
- # needed for unittest discovery
- > tests/__init__.py || die
-
- distutils-r1_src_prepare
-}
diff --git a/dev-python/dbusmock/files/0.18.2-disable-polkitd-tests.patch b/dev-python/dbusmock/files/0.18.2-disable-polkitd-tests.patch
deleted file mode 100644
index 2f17c233a3f7..000000000000
--- a/dev-python/dbusmock/files/0.18.2-disable-polkitd-tests.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/tests/test_polkitd.py b/tests/test_polkitd.py
-index f47fdfa..975878b 100644
---- a/tests/test_polkitd.py
-+++ b/tests/test_polkitd.py
-@@ -25,7 +25,7 @@ p.communicate()
- have_pkcheck = (p.returncode == 0)
-
-
--@unittest.skipUnless(have_pkcheck, 'pkcheck not installed')
-+@unittest.skip
- class TestPolkit(dbusmock.DBusTestCase):
- '''Test mocking polkitd'''
-
diff --git a/dev-python/dbusmock/metadata.xml b/dev-python/dbusmock/metadata.xml
index 598247402a90..142adb28d26c 100644
--- a/dev-python/dbusmock/metadata.xml
+++ b/dev-python/dbusmock/metadata.xml
@@ -5,6 +5,11 @@
gnome@gentoo.org
Gentoo GNOME Desktop
+
+ python@gentoo.org
+ Python
+
+
python-dbusmock
diff --git a/dev-python/diskcache/Manifest b/dev-python/diskcache/Manifest
index a9aad9a4aee4..08c29f706b44 100644
--- a/dev-python/diskcache/Manifest
+++ b/dev-python/diskcache/Manifest
@@ -1,5 +1,3 @@
-DIST diskcache-5.0.3.gh.tar.gz 656486 BLAKE2B be3a7c919287698e4bd7fc6ff4b861729eabeddff47d01f08711f75f72a48d652e798ed511c5aa1cd9952ecbbbd5ebb003663cfd9c0877b812ef421665e080c0 SHA512 41b393ce255747939c68059251c31b5af43ad9c7fbcfe9288193c501a3a7d070b8db0863e1abd10f16db574565719b2357a7b10371428ed3f37f7de754b16ab6
DIST diskcache-5.1.0.gh.tar.gz 656930 BLAKE2B 19ec1e16e33315248f28e1937a94bb29d641f31c263a3a2fc4d24b58082f7c9c522c74f38d07ece51dce066040538ef47348c50e8d591a749674ab6d6f2ce5f1 SHA512 33437899221051ef3dafd0eeddfec72bef00d5a6b189046cb919495b322b534445a39e5d23a1c85484867d9d07efb7de36fe5f2d3dad79357086a3dcfa3c8b0c
-EBUILD diskcache-5.0.3.ebuild 807 BLAKE2B f25648d1fda9da9d2d9c78f15450004a81d02ba50c500bcf97dc60e3c94c74e4c3bfb9fc92a5cac28ef06d7417d95957aa666352f8f0a8dc5da8b9be536ec6e8 SHA512 9c31f7e9f957ef600815eeec30a917d0a56cde7a68fbd03750cdb270c0bf08cd546741bee80a7b8a7c039d5315fae26a70185c16471f8d4eb17c673150660c8e
-EBUILD diskcache-5.1.0.ebuild 807 BLAKE2B f25648d1fda9da9d2d9c78f15450004a81d02ba50c500bcf97dc60e3c94c74e4c3bfb9fc92a5cac28ef06d7417d95957aa666352f8f0a8dc5da8b9be536ec6e8 SHA512 9c31f7e9f957ef600815eeec30a917d0a56cde7a68fbd03750cdb270c0bf08cd546741bee80a7b8a7c039d5315fae26a70185c16471f8d4eb17c673150660c8e
-MISC metadata.xml 391 BLAKE2B 74eba8c76944b17dd3b7a446129b9786a56e1afa0a787af75c8e832317b5051afa7e527ac8e7c04a2f9f4c36b0eb3bc72a61655f7de4a5caf9048c50f438d745 SHA512 0d088c14dbbf7c11541b5f47d193280c0f92f8f1b3ec62c8aad49648b3fbcc393ce639b5b9ae18533a4d4b9cb5ad536a5a847b705e2b4bd385d3b90d48f812ec
+EBUILD diskcache-5.1.0.ebuild 804 BLAKE2B edff50efb4b338424cf6eaa4ad4eafb794e52b5bd58f962eb4bdbf5cd54dd5a6559629592ca87138d7274d3b1b4b2b753ecb57a14c806a59af3d6f520533f57e SHA512 03288646f8d35d224d775f486f16b32e341a81937d6a2a000be710030aea28a57458f63093b505c0d1e0b66cd1f353c424475a82cadfc6758d72289f7a8d316c
+MISC metadata.xml 416 BLAKE2B abce0086d9e449bb58281c7856b518501d837b88473dcd611d3f7026a221bb320d866ba631f704a2cc9a5d24af88fdb171e5a0dc28a79f88852ce6931d4a37e7 SHA512 14c60bba29274523a81a24008d51d74ed2ff3c5ae84ed11110fd1e3b83c39c35eb0a95d56edf53db5bbccd08c6bea62cc3019405a077dc00a0869f01e6968c9e
diff --git a/dev-python/diskcache/diskcache-5.0.3.ebuild b/dev-python/diskcache/diskcache-5.0.3.ebuild
deleted file mode 100644
index c57b662ad91a..000000000000
--- a/dev-python/diskcache/diskcache-5.0.3.ebuild
+++ /dev/null
@@ -1,37 +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} )
-PYTHON_REQ_USE="sqlite"
-
-inherit distutils-r1
-
-HOMEPAGE="http://www.grantjenks.com/docs/diskcache/
- https://github.com/grantjenks/python-diskcache/"
-DESCRIPTION="Disk and file backed cache"
-SRC_URI="
- https://github.com/grantjenks/python-diskcache/archive/v${PV}.tar.gz
- -> ${P}.gh.tar.gz"
-S=${WORKDIR}/python-diskcache-${PV}
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-
-BDEPEND="
- test? (
- >=dev-python/django-2.2[${PYTHON_USEDEP}]
- )
-"
-
-distutils_enable_sphinx docs
-distutils_enable_tests pytest
-
-src_prepare() {
- # remove dep on pytest-xdist
- sed -i -e '/-n auto/d' tox.ini || die
-
- distutils-r1_src_prepare
-}
diff --git a/dev-python/diskcache/diskcache-5.1.0.ebuild b/dev-python/diskcache/diskcache-5.1.0.ebuild
index c57b662ad91a..84231205d305 100644
--- a/dev-python/diskcache/diskcache-5.1.0.ebuild
+++ b/dev-python/diskcache/diskcache-5.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -18,7 +18,7 @@ S=${WORKDIR}/python-diskcache-${PV}
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 x86 ~amd64-linux ~x86-linux"
BDEPEND="
test? (
diff --git a/dev-python/diskcache/metadata.xml b/dev-python/diskcache/metadata.xml
index bda6b340bb5b..e1b2d7744ec2 100644
--- a/dev-python/diskcache/metadata.xml
+++ b/dev-python/diskcache/metadata.xml
@@ -5,6 +5,7 @@
python@gentoo.org
Python
+
diskcache
grantjenks/python-diskcache
diff --git a/dev-python/django/Manifest b/dev-python/django/Manifest
index eb39babc1391..76ba7f500f66 100644
--- a/dev-python/django/Manifest
+++ b/dev-python/django/Manifest
@@ -13,5 +13,5 @@ DIST Django-3.1.5.tar.gz 9257571 BLAKE2B 0ec618753d922e64b2f0e75506843383568c001
EBUILD django-2.2.17.ebuild 2762 BLAKE2B 05ddd252f5adcf6d8448b00363bbd95ed66ef00750b39775808d5304d9873d0b8cf256b6695e93b7cd022ca3c0d8fb90ab960cbcecdb0a3b1b084d3209dc2f29 SHA512 dfa2b1b4610b617d4bb29ce6d8110e88e66189f2ba79de5dd5814bd3aece3c13e9ba189f8c03fe9c75e6e9ab7f975d9b2cf0429cbb1c44eb2f41bc4a759dcb50
EBUILD django-3.0.11.ebuild 2925 BLAKE2B 2c5baf347061283457c2f94ab14025802233fc66d5adb2765232d53d0a71e45c54556daf7327cd5ec72edb6497aaa3198a904c434c3e97062407d60c8ff293c4 SHA512 ca540fe2aa4f4de9612026c72ab5015fcedefe8743c9335938215408ff5e0f49a33fb0ab9691f2179ec65ace99a400423ce3fa352d2f366c25338a4fe86f1276
EBUILD django-3.1.4.ebuild 2737 BLAKE2B cb674526525bb078418d9aacbec8a344a3031a64b30fcd9f6ac7ebbc8cce4a131c3cf6f0a65b1c5b33117a6cdb7b66566e2258e6c5b8a0044e1d7b49586204cb SHA512 cb204ec944cfbcfcc4321f5ba9c8d9d9441677b6e3795bafe2399971cf22ae1c7fd0d79a48917ae9e9e3a21d3501f0e0187ec1389229766497476daf4f6e3e0f
-EBUILD django-3.1.5.ebuild 2741 BLAKE2B e169a80342886252b27fc4f07b622bafa50bed51af3189b6de4fd3a31a2fa0d431278da11707effaa71a85af8b4440e330e5a092a4a09826d7a0e37f5674bd8a SHA512 0f22b4a53081118724a99e426f0d44c30e5bcabc9f722d28144f449889ff604b2d3589ae3a5508f7aa503ddc2afe6e8c01b06914de59c8ddef1a7b26eb79fabd
+EBUILD django-3.1.5.ebuild 2748 BLAKE2B 98e3074a032877b45b2abc296db7dc815d2e49703dbe064d4aca286aa45241053e2c34eea877611c329427f693fa09fcffae9bf272a7a30c988c210e27ea7ceb SHA512 d4a699362ecc1dce20d054f1c6193282ab44a0cf30e671089bcf41a805c571cab80666cc9e11919d85df39c7d5e8512ac5537fdbbeea7770a0cc513d6b6a7d4f
MISC metadata.xml 399 BLAKE2B f49845f5a6476a0b43cbe47ab11b298f53703d850d145a31967f512d9402048fc1b1891606ddba7342ea9613c27ace3986f6b508ed83f0c5eccb26a13fd49f85 SHA512 92470f2930b1c940ccf3478b11157adcc4b84924b0cab4e1fd8aae98c7bba14e995491ce44810223eeb3802967be68c867d0ee4ac0df9f49b4234efd1a7ecfa7
diff --git a/dev-python/django/django-3.1.5.ebuild b/dev-python/django/django-3.1.5.ebuild
index 240bc31938b1..76cc22dbd83a 100644
--- a/dev-python/django/django-3.1.5.ebuild
+++ b/dev-python/django/django-3.1.5.ebuild
@@ -23,7 +23,7 @@ LICENSE+=" Apache-2.0"
# admin icons, jquery, xregexp.js
LICENSE+=" MIT"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~x64-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos"
IUSE="doc sqlite test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/empy/Manifest b/dev-python/empy/Manifest
index 5cd5da0c2ea0..c89201500a31 100644
--- a/dev-python/empy/Manifest
+++ b/dev-python/empy/Manifest
@@ -1,3 +1,3 @@
DIST empy-3.3.4.tar.gz 138495 BLAKE2B 0040b26966d3d6c7911cc7957159084ddb610085affaa5cf214121fdb292c43b071df8990749e02c0c3ef46cba131188e0907b8ab7c28a0834498b505bec0a2e SHA512 5de8de26484468d180a2575bfc8302cb3d32004ed4d70768310b7564a9ed1bb880b8c1d862f419588b2b5baa8c3da8bc707eac41f3921e6136cc5bc3f47f1a3d
-EBUILD empy-3.3.4.ebuild 1008 BLAKE2B 1578964a5bbedc3620b50a3490d40c9f3fdb835194cf1267fe1b9824000dd4a72ebc3062bfd5b3ab561d86dab15ed29675f064e1b7a046113e9ec962b0cb646b SHA512 35477343e3dc8859953d31e5a476fc822687f9d2c42572aa3582f8a26bb7f5ee7af14a7c4105762f3c54b10bed1679195b9c880cfa19c2ce02f2334ed9f6dfc2
+EBUILD empy-3.3.4.ebuild 959 BLAKE2B d1b441a19304f87c1a3e48cbd82fe5ea895554a26449a2d2cbfd7692175f23c17d68eba21c8212c067e0cfde9bf31d6569cbfb94fb7f07f18e63449fcda63aa1 SHA512 8857d7baf0d81def6abb28daf65613b9e703dce0fb6d092e0cc57c64c6df54b852c1473d3d04247a7ccc7e4fe38db78a448ee6689f5d42281fdccd2a27cb0bcd
MISC metadata.xml 331 BLAKE2B 8d17a39d3a33950846a59d7ea3582a7d5de4382d8fef2bb225ddb103370c658b556399d7708931c57ba7bbb71bcd55c7886a7d3eb5e8f6ea2c42446dea531e19 SHA512 502f00b8c181b7eb726f5132fc5556539cb17a7b75eab684fa13e606cc32f6fd73fbe4d4ed78903028b0edb4e6c2ff8c8574bc7c24d695fff124f1452a7d6480
diff --git a/dev-python/empy/empy-3.3.4.ebuild b/dev-python/empy/empy-3.3.4.ebuild
index 6f45d2d2f36d..e34022a54b94 100644
--- a/dev-python/empy/empy-3.3.4.ebuild
+++ b/dev-python/empy/empy-3.3.4.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
DISTUTILS_USE_SETUPTOOLS=no
PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
@@ -26,13 +26,14 @@ python_test() {
python_install_all() {
distutils-r1_python_install_all
+
if use doc; then
- dodir /usr/share/doc/"${PF}"/examples
- insinto /usr/share/doc/"${PF}"/examples
- doins sample.em sample.bench
- #3.3 has the html in this funny place. Fix in later version:
- dohtml doc/home/max/projects/empy/doc/em/*
- dohtml doc/home/max/projects/empy/doc/em.html
- dohtml doc/index.html
+ docinto examples
+ dodoc sample.em sample.bench
+ # 3.3 has the html in this funny place. Fix in later version:
+ docinto html
+ dodoc doc/home/max/projects/empy/doc/em/*
+ dodoc doc/home/max/projects/empy/doc/em.html
+ dodoc doc/index.html
fi
}
diff --git a/dev-python/eventlet/Manifest b/dev-python/eventlet/Manifest
index a97243a98d95..1bb930f9a013 100644
--- a/dev-python/eventlet/Manifest
+++ b/dev-python/eventlet/Manifest
@@ -3,5 +3,5 @@ AUX eventlet-0.30.0-tests-socket.patch 607 BLAKE2B 3da02ca5cbc16ef2a8ecbd6fc9f81
DIST eventlet-0.26.1.tar.gz 398200 BLAKE2B f14024d0825fb5530929766c63dceea7446057d9ad5dfb98ab013e96cab9b0eef5440f2d4d7ceeef17691c8a2a9055cac2b93fb23653a6facba4967c4e7cb0b3 SHA512 55b9b214130d0482ea005ea570a5aa3eafdf66e6d315a95c5ba60186a2d9a9df5c2638c86d886968954ce39e5ac2153e1f9e11631e6aef237078c3776af7d6c5
DIST eventlet-0.30.0.tar.gz 401035 BLAKE2B 94a272ce810b28c00fc8a468f160e38f3c58c98750455e5eb096c266c46257a7e30e0278a6a8f509e47e6ab40297129ccf52b347a723037f9cc9b85a3e06a203 SHA512 c2ba283063333e9e74536dcda33276f98f74051ea0e9c8669506d2e3b11715f37cd5963af6130f14761a42cc6c8346e59c756efe2cef0ea3547dc30ccb8bf0fb
EBUILD eventlet-0.26.1.ebuild 1767 BLAKE2B ae71076b4ab1c6903a557fd3fb1b1f8facc88235c4f2957f41da098d1e7a1c75ccea80ca8d95cc73cc557fcc731e309a57adf8310bf24aa970dc1430107fbee5 SHA512 68b12849631f3516d4692ef4151e1bb9c00a2aac883cf4ae87aab8a7ad781ff8b102ed6748917b7502f5f6329da05eda924559aacba29d63f118f8334ccec1a3
-EBUILD eventlet-0.30.0.ebuild 1839 BLAKE2B 1edf8188ad4834580bf02145aa61a111373547444e039fdd3cd03da617f927c6a56e28e7281980ba533e730bd39679e7a6a9164a0bca346ca877999987320d19 SHA512 9eee9e9995c7f30ebf956b4e67e1def1bbd538d727fc698b230e32dd3c03fc2e1553850099272b964287a4b54505c167938ce4866604058ba3ebeac0c808885e
+EBUILD eventlet-0.30.0.ebuild 1838 BLAKE2B f192c8eda7645066961d10b4f735ea4070cc8804e2eaeb7677ebee5df29c6c80731c87db683ca37b0c92ed2422218f76ca92b84657aa396ccb2026523eb2bb18 SHA512 72a06266180acbeeb16f181431029f1558d0f9655b79e515aafe89c4f69fd6264a2a050fede03ef46abc2f0dedbfb34bb3652871e29dcd9447dab097dd9454ed
MISC metadata.xml 380 BLAKE2B abdf12718464c834d63994ad012a6d47279fa6f0e5cb0d075bfbbf24167438220ec9681eac874c93dc3abd9c1498a1a7f658a622f8ebe764cb6803b1b2bb4561 SHA512 8100edfde1885122848aa543b99bbc8529b9dc2aeea3b7efb74a3d1e8e01bdd2110e4cdce2c4ddeab9fd0182f193118e876843a61a25e17355d0916d50331daa
diff --git a/dev-python/eventlet/eventlet-0.30.0.ebuild b/dev-python/eventlet/eventlet-0.30.0.ebuild
index a2fc36fd2548..9256bc3d1f3d 100644
--- a/dev-python/eventlet/eventlet-0.30.0.ebuild
+++ b/dev-python/eventlet/eventlet-0.30.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/e/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ppc ~ppc64 ~s390 sparc ~x86"
IUSE="doc examples test"
RDEPEND="
diff --git a/dev-python/executing/Manifest b/dev-python/executing/Manifest
index 7bfe69aef747..cf5ce94bd7da 100644
--- a/dev-python/executing/Manifest
+++ b/dev-python/executing/Manifest
@@ -1,5 +1,5 @@
DIST executing-0.5.3.gh.tar.gz 303234 BLAKE2B cb9de0492c4aa31b53310abf65d97df888278671fbf24e5dc2f3f4b00fd22d233fae2265bffe240c092c5b67bfca1e69ec1c4eaa937a0d4c90bedced1f156e2a SHA512 faf591de8e6354300fb572065bda304c3cbc529725b4044ad4f4ca1f86d892da21598ba7245059824e27894937d46e4ef9ef5962a9d7dff78e4144a3e0e6b388
DIST executing-0.5.4.gh.tar.gz 330687 BLAKE2B 10f526dfb3a9f72dda788af97547e011425a56d1af73c30f5704fb8d348beb4e4538e118355dd415ec6125507ca9b2b015c02dc0bd81a2ef732a60aafb89f12a SHA512 3953ee1f6667c32fea28f964b395d53e99fa7869e27495a241f70179577865ec430ddfa07776995b6b1aaddd660adf6c6b61a8e8931589c0faeea94743fbc209
EBUILD executing-0.5.3.ebuild 1073 BLAKE2B a4a3da165439df3b2c851d7683fa8a5179b39b291c3b23c3b6997c5797b72ec3964a1699f0be41016931dfe86e8f22ff901a7209920781d8cb9ae9d08b99ac4b SHA512 78b93e2537ba57f8d95c126cd907db9e556ec7b902dd648d562af503682161647ef07da2e0000813f885726ae4c8a4b335e79fc3b6140f09f53ad3a1359f6941
-EBUILD executing-0.5.4.ebuild 1077 BLAKE2B 6389b34cb94312f5d995d06c43e70ca6ecd9249aa6b66642e3bf9c405d234cd12cc9e0ae912faab1ee674654b20bda1804d8701b7351a118a1073e77037a630f SHA512 e97e2a0ffbf94ba1c25bf0f4e8d72e0572c1d043193c372d2cba6521d25bb0048ce765bafb68e8f3a97081c9d5309fcf939202abf46985fb28b5d36b83da1579
+EBUILD executing-0.5.4.ebuild 1089 BLAKE2B 9feab98096c316bd3c1a6356ba5812a2a170e185159acee5e7e1d8e666591ba8efa622c2830989e3780d179c088621ebc548b28656d2a52302192fc2ed113d16 SHA512 a02389cf2c1938e773646708d505493d0afeea2fb4e1976a858c40eb77693c297ea2bf98218624d6cfa234cb065ecb6cd54c02844da03e21361fd1c6fb80778d
MISC metadata.xml 350 BLAKE2B d128d36a837974853f5e51c64b03ca8eb749eaba54e5049033153e1c3671eef5a91490855820a47ce718f28e2aa45dd9d26df75e81fd923d7f119d546b6d9b61 SHA512 ff4ae4abcc417476ba024f7e9ff8f8de8c57d70f34c36bd2a4adae498c01489c16bf315ff174616ac9d65de3431983c35da66edae60668c9e526ada2a026555a
diff --git a/dev-python/executing/executing-0.5.4.ebuild b/dev-python/executing/executing-0.5.4.ebuild
index bdeaacb0be41..debe5e560b61 100644
--- a/dev-python/executing/executing-0.5.4.ebuild
+++ b/dev-python/executing/executing-0.5.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 2020-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -16,7 +16,7 @@ SRC_URI="
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
# asttokens is optional runtime dep
BDEPEND="
diff --git a/dev-python/fakeredis/Manifest b/dev-python/fakeredis/Manifest
index 184d388027ef..e514d1c887d2 100644
--- a/dev-python/fakeredis/Manifest
+++ b/dev-python/fakeredis/Manifest
@@ -1,3 +1,3 @@
DIST fakeredis-1.4.5.gh.tar.gz 66197 BLAKE2B f0f36d1e209673f7722849e835c2a33fac9f7e8bfb1294ecf2e69478295f14af514d0fc4a5732a20ce099333b136d682591fef031ce90d6262fa8c9025cbfa2e SHA512 e16ae5c5947a924b0c9c40ae68efebad5cccea9f88d1b5c3f1677e1ccb8c1fa75dbafc9b413c2359b774f3043c387ff91ecd4e2e21204036883175944338d59b
-EBUILD fakeredis-1.4.5.ebuild 1051 BLAKE2B 0dba6874655b81e658b556c408c9cbabbc53255d44dc341f39f6196ccafcfc61c37394823a5b7ae5a181b4217afa0d912a622282d6cb73ccb7f8455a4b8cf3e3 SHA512 dd939840fa1388eff049603481a9a07bcefefe846d3f1e758949fb57c32077b28a13723ea6ed6134fade3277e9a6d0b044707b11c1190bbe286b8f7646fbac37
+EBUILD fakeredis-1.4.5.ebuild 1063 BLAKE2B c4fba55ef9f7ff28cde1754d25f430bff4e263b16292b90eadf129b3ece325acde26dc31ff35ca11870f7b3e9411957b21d5432fdaf6cac1390e1dfd30c166d0 SHA512 0343db42c2105ba807bad870a989c1eb384d7d7960802918635c13561a43e485aa98b53e2b6895f108d8ccaa4f72bc55dabb8d981107ca1876ef81e38b1a94bd
MISC metadata.xml 371 BLAKE2B 5d6b5f058881d62662d45b5f0207912d915fc731a4816b16ee098d19f7e8aa98f63e45bc68c6a41db7c09a84b4a82177a74e4edf566e506f287dc806bc461d54 SHA512 f43716bb013e8bcf042b0c75393686f1ae7eeac8b1f4b9c2d1acd27738d1f82427ded18f51d857032361ba2f4a3ea9679d3bcbb9ad2d99c3def5beac2873af3b
diff --git a/dev-python/fakeredis/fakeredis-1.4.5.ebuild b/dev-python/fakeredis/fakeredis-1.4.5.ebuild
index 989b57bc2d0b..92cc6ca2fd44 100644
--- a/dev-python/fakeredis/fakeredis-1.4.5.ebuild
+++ b/dev-python/fakeredis/fakeredis-1.4.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 2020-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -16,7 +16,7 @@ SRC_URI="
LICENSE="BSD"
SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~sparc x86"
RDEPEND="
dev-python/redis-py[${PYTHON_USEDEP}]
diff --git a/dev-python/fasteners/Manifest b/dev-python/fasteners/Manifest
index 45219b91cef4..7d36e0119e04 100644
--- a/dev-python/fasteners/Manifest
+++ b/dev-python/fasteners/Manifest
@@ -1,5 +1,3 @@
-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 703 BLAKE2B 0f8364ed24c906d0315132d5f3bd3c412f6627b922f1940dbdfd9271209433bd9bfd8c9e0945049049d64c681d2405cb03afad4aa269ba4f4ebf9bea47844a87 SHA512 db42b0df1591a68f00daa08f04a3aef400dfcce082f27f2d17214645c658f027b68bd96ecd9a51466d6ffa47b881a7fe4ad5daa8248322ab15f12daacfa34837
+EBUILD fasteners-0.16.ebuild 700 BLAKE2B e9c45660624ff3ebea3b826feecffd58a8574c0a163718b9af9df74bb7183b191aa5b77606dbd3746f41ae4aef2c4ecbdebb2e1ff4675f5bf17e2b8aa4c161f3 SHA512 c8fc672c25d5528c59883052ccbf52356c2bf07f4cd0042cb8a64d383c7043e2ee52a572c0a028a628476f4add6a4b0fa26dc3dec296ab0e9c05b41e8fe0e382
MISC metadata.xml 509 BLAKE2B a2ecd43c854cb670cc29c9bb6e663a46d33334f3e2ff45963730712eac8eb7b9059445dc798a73f89eb2c9e66c5de1caf9b6f4193df5c0552e8176355a325e0e SHA512 f72b52a24f4693ba6d534aecf039a616be7bd5efc83dcc76c8eebaef95edd247192c784caa7b001224786071e5dd3dec59758be0717330a71c4afb7718bc68b1
diff --git a/dev-python/fasteners/fasteners-0.15.ebuild b/dev-python/fasteners/fasteners-0.15.ebuild
deleted file mode 100644
index 9be92e0a5829..000000000000
--- a/dev-python/fasteners/fasteners-0.15.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="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/testtools[${PYTHON_USEDEP}]
- )"
-
-distutils_enable_tests unittest
diff --git a/dev-python/fasteners/fasteners-0.16.ebuild b/dev-python/fasteners/fasteners-0.16.ebuild
index 5d339cdd5176..bf4ebc943735 100644
--- a/dev-python/fasteners/fasteners-0.16.ebuild
+++ b/dev-python/fasteners/fasteners-0.16.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -12,7 +12,7 @@ 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"
+KEYWORDS="amd64 ~arm arm64 x86 ~amd64-linux ~x86-linux ~x64-macos"
RDEPEND="
>=dev-python/monotonic-0.1[${PYTHON_USEDEP}]
diff --git a/dev-python/flask-login/Manifest b/dev-python/flask-login/Manifest
index 1511fe4b1696..691ff734c582 100644
--- a/dev-python/flask-login/Manifest
+++ b/dev-python/flask-login/Manifest
@@ -1,3 +1,3 @@
DIST flask-login-0.5.0.tar.gz 44961 BLAKE2B a780a3ca1ced7f01cbc1f99e3d92f57819c73982a4098330be7b9b4dce88e5fac577d15b2989b99971c4b2f7e6c9f02a54aeab9f7fa1c101f409cbdcfa3c6942 SHA512 8ffecd2a512738f81ec3901ad30d356b1d63355268f7cf1b427e463d0a271a4623723255e139bbd0f88845d73fa4aab051418b5f68aef0b4576c30294f6207b3
-EBUILD flask-login-0.5.0.ebuild 937 BLAKE2B 8bdfca63b85e60e7912520f81e8ab6e80c654a9950fdb51d99eaef3091a73530f9be243f64947a4ded7498b174b72a5d5638546df0bd202bffd3ccb5f3c8b667 SHA512 60fec59ae00ef38e7260a237c48cb97878822eacd42df8dc885f6ccda162f3f8927d6c65fab61b50cdb14723340ffbc6b544cd7296bb241c7e0b552781695b2f
+EBUILD flask-login-0.5.0.ebuild 944 BLAKE2B 50c25a7dc3b12ea556f0f154ef0b8ea070e94d722c6b9469ac82858f86b62c317bdfcea1eebd2e9ba64839f15310fa1593c6bd82c8322d0d2e50dde753c43e87 SHA512 496f04c0c0281fced2795fa19ef15f469c73cdd2f345457e495341ee97cbf93baec20888b7e29e6b7fc5a1f56bfdf15168f68559f6351a74e9bae70a5edc468c
MISC metadata.xml 403 BLAKE2B 975f428a5370ac440d4b4c6d257a91ed91fa463bf62491130010a73f87978b68468fade0b44fce56854b52fe0b64c3b77bfa676025b5ccdfd75214c3e43b5ce6 SHA512 5b702e0e8a7d848d1f09f0282c790132a8fbd3bd44596a3e9ddcf13228f93dd67e38c332fa444fc21eb4999be8fae38c64d576b5b59aaa73d650c3efc9c420f4
diff --git a/dev-python/flask-login/flask-login-0.5.0.ebuild b/dev-python/flask-login/flask-login-0.5.0.ebuild
index 446da2629472..ad83f7d8fece 100644
--- a/dev-python/flask-login/flask-login-0.5.0.ebuild
+++ b/dev-python/flask-login/flask-login-0.5.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/maxcountryman/${PN}/archive/${PV}.tar.gz -> ${P}.tar
LICENSE="BSD"
SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~sparc x86"
RDEPEND="
>=dev-python/flask-0.10[${PYTHON_USEDEP}]
diff --git a/dev-python/fonttools/Manifest b/dev-python/fonttools/Manifest
index e0edf1dedf91..ca80d8187ce8 100644
--- a/dev-python/fonttools/Manifest
+++ b/dev-python/fonttools/Manifest
@@ -1,5 +1,3 @@
-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.18.1.ebuild 1384 BLAKE2B 685f17f7a8e0ab08171bae30f595c8e5850f35514d6c93d4efdb2451005370d1b0353ba8bea2806a9c593d3c0b63f141f3bed8c038ebc1744d17451e4bf56e62 SHA512 0b23f24c13fffd2a419f4d7225b57e0c96b57f28ee6818f1b6ee0185ff283da3fb90b8a500b0b689d22a6dcd9efb64bae6deb6c195af504e9ad9ca00f6dcfea5
-EBUILD fonttools-4.18.2.ebuild 1392 BLAKE2B 740f06cc15d4902bb0ddf431911eb2940a98b6c395cac21f9863670d43f4f9ac82fcd9ec473542ee773b1abc7a71f5e51497a8f9e68b17adec8b62d130312ded SHA512 2b6c51fd2aab0c4099359a6c621f18fe0fafdcaf35de9e933c0985d63a8295f5d768f854bb39cde3f25ee4379160816ca7d7cd3551cc43ba6a8ffdc8e239a6cf
+EBUILD fonttools-4.18.2.ebuild 1384 BLAKE2B 685f17f7a8e0ab08171bae30f595c8e5850f35514d6c93d4efdb2451005370d1b0353ba8bea2806a9c593d3c0b63f141f3bed8c038ebc1744d17451e4bf56e62 SHA512 0b23f24c13fffd2a419f4d7225b57e0c96b57f28ee6818f1b6ee0185ff283da3fb90b8a500b0b689d22a6dcd9efb64bae6deb6c195af504e9ad9ca00f6dcfea5
MISC metadata.xml 395 BLAKE2B f31a990237241b04b7e3222093c878d57d990ee97466160947d4c85a5798543a76c480b01a8f1da13057773b3b6b6dc270d039a4211d7d5cde8991bfa9b7632c SHA512 6c676733e48ceab4d6dcc56359c62d610728e06e7483648d410cbb0826c603521823a0f73b6d832b0f90b3e2f6254a92195e751867e16fbdef8335bbb0bec430
diff --git a/dev-python/fonttools/fonttools-4.18.1.ebuild b/dev-python/fonttools/fonttools-4.18.1.ebuild
deleted file mode 100644
index af5f8647f96d..000000000000
--- a/dev-python/fonttools/fonttools-4.18.1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2021 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/fonttools/fonttools-4.18.2.ebuild b/dev-python/fonttools/fonttools-4.18.2.ebuild
index c1277db3ff69..af5f8647f96d 100644
--- a/dev-python/fonttools/fonttools-4.18.2.ebuild
+++ b/dev-python/fonttools/fonttools-4.18.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/fonttools/fonttools/archive/${PV}.tar.gz -> ${P}.tar
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos"
RESTRICT="!test? ( test )"
IUSE="test"
diff --git a/dev-python/gevent/Manifest b/dev-python/gevent/Manifest
index 2bac0ca9b79b..1b17a89a7fb6 100644
--- a/dev-python/gevent/Manifest
+++ b/dev-python/gevent/Manifest
@@ -1,9 +1,9 @@
DIST gevent-20.12.0.tar.gz 5898634 BLAKE2B a73129c7d393aedcd84b6e62c890c3b306722876a1ea4c96485096ce2ea7d1db5f03c77ea77a2c35ef41c7a96183246316c577735bcf4b25fb41095282c64d38 SHA512 76c75128ba2b33e47bd85ef2788387aa6d47d230ef9aeac4bceee03e8a2555dd204c321de7d1779fe4f44503e4fca5dce3b43c1922238da994faed0d78e5c4c1
DIST gevent-20.12.1.tar.gz 5908977 BLAKE2B fd3536de1ca518e889868537cfb856d022ec2be8f5f658cddb06b9797841333a475d2c4d7eb3f97ecd715a19999804e724f8126b189087582452a88076bf5d12 SHA512 63bf8d63ed0eeed63b5ae6b58a2a0a36bb4a606d7d76f51cb59d5b76aa639296264a01455699cfb6abee53c958368c17f4c6bfca1543d04f9d750637b113046b
DIST gevent-20.9.0.tar.gz 5806581 BLAKE2B 6b1b653fa6e22539e049a9bba3d3a2b9d798a5555ce4ba60ce33ecbdf14bb5201967d22d677e1ce3170129b0763fddfcc5991347186fb102d10ae39e22538c44 SHA512 966efc945b623df2521fffadca3b7e56cae1efe6de904a724765e0593389e8b1305094baa6fbc9f4fa376b1157d0f230b01e2a90de21e4b9650614363edec9f4
-DIST gevent-21.1.0.tar.gz 5928692 BLAKE2B d3187523a8740c1a2d3c2aef9d20b4e49b87fafef9e4e5bfe551f2cce790a2d9149597bad3c13b7e18da6bfb0dd4a0d516ef340faf0536a11b987f8e3e78b8ac SHA512 a38cfa952514cf0132651aa94afa119573c292bd4d4772405fbdddf3c72d3bd83e36e2b2eb0f4dd569580a04a4e52cb8ef7bb43191a4a447761edf481b5b2525
+DIST gevent-21.1.1.tar.gz 5928822 BLAKE2B dac05942b228a9e29da459c078e2c182f59a7ed8352c14d7efdb63ded8a0c7d25b1d91468c6a3e75e5fdfe8b101fa5be43db61bba6b24b00a6a20778b56b34d2 SHA512 668f30f62a923e53f11ba272f96adc2289f6af82424a800a9c83dda6d093e993b28857fad3bfc07de1002bcd3f62b5670f486bbaab900d443ebc01a4a03c3fce
EBUILD gevent-20.12.0.ebuild 2192 BLAKE2B 1b4de8f295e0e90c6ccaf710cf50f62162437a193132f6eecfb21956721ad44f8b129495aebc159afd2803814ffa4678bfc2cb6855fbc84e8371fe6ba6827028 SHA512 4a68c3e7ee72a199072f3cf103591fcc0839b934532e7122ed0af96f0368a6bd7f5765cb651e828076460f2087e7eaed5186238db924a98a5a4db67911307d98
EBUILD gevent-20.12.1.ebuild 2192 BLAKE2B 1b4de8f295e0e90c6ccaf710cf50f62162437a193132f6eecfb21956721ad44f8b129495aebc159afd2803814ffa4678bfc2cb6855fbc84e8371fe6ba6827028 SHA512 4a68c3e7ee72a199072f3cf103591fcc0839b934532e7122ed0af96f0368a6bd7f5765cb651e828076460f2087e7eaed5186238db924a98a5a4db67911307d98
EBUILD gevent-20.9.0.ebuild 2185 BLAKE2B 3ab0e07fd999097d3d658821bee3ce5b5435299de761981b2451bba0bc59f645ee54922ceb8e28f93ecfca0deba1bbb984b9d62f1ad03bae3c153d4a4c37d18e SHA512 302d83e431de91e163e8771712bbc4cee8530a7ab6c1dd136e9e817cf8fca2ab1cd01284812fb35952f8c4676e246d19f3072159eceb4b8471d636f1b487a9cb
-EBUILD gevent-21.1.0.ebuild 2190 BLAKE2B 186f40f4fedf6c7c6232ef37a3264b54f9c3eab24dd6051dfd88e24474c9494d9f1cd7b4e2a6589fc1b6b9b9cc263383c36f0f75aba9c917455d21e41bfe3c45 SHA512 8c52a2004d6fe5a6deb11ffa64e4417a20b6a0fc7b55891b5d22a8e6e40df9923b7a338dd52414292ac53e0c5293544b1a88914e41acf9d4d2ee22fa5b15415a
+EBUILD gevent-21.1.1.ebuild 2190 BLAKE2B 186f40f4fedf6c7c6232ef37a3264b54f9c3eab24dd6051dfd88e24474c9494d9f1cd7b4e2a6589fc1b6b9b9cc263383c36f0f75aba9c917455d21e41bfe3c45 SHA512 8c52a2004d6fe5a6deb11ffa64e4417a20b6a0fc7b55891b5d22a8e6e40df9923b7a338dd52414292ac53e0c5293544b1a88914e41acf9d4d2ee22fa5b15415a
MISC metadata.xml 374 BLAKE2B 80be57b8b296d0c79707bf576e666c9b418ef4a575342675ef50eef354d38cabb77ac2f645c08751060ed8d5cd9996c5285265d56b2018b3e8a72a342c9f3903 SHA512 c4ef41632b92cc273287883b966a262e675ddedd67e32953b94bd329152cc0d667138ab0fca50b9525f514fe73c1ccf0cd4ea2d3257178402b101b4ffda2db32
diff --git a/dev-python/gevent/gevent-21.1.0.ebuild b/dev-python/gevent/gevent-21.1.1.ebuild
similarity index 100%
rename from dev-python/gevent/gevent-21.1.0.ebuild
rename to dev-python/gevent/gevent-21.1.1.ebuild
diff --git a/dev-python/importlib_resources/Manifest b/dev-python/importlib_resources/Manifest
index c963694d66f2..8a57ec9db3c4 100644
--- a/dev-python/importlib_resources/Manifest
+++ b/dev-python/importlib_resources/Manifest
@@ -1,7 +1,9 @@
DIST importlib_resources-3.3.0.tar.gz 29000 BLAKE2B 5fb87c6e15f01733567fef060607da0625d32e415e294cfd5db94fb26e13d257763f2d3795c19ee7d10fc1fdc579fc0c34a484d28aff32c20553d18fafc7b850 SHA512 1fc03c9d141a094ca6ae0acb9ff0668a3f3aa76b47ce2149691b1d85d37a3ba9d329dbafd8b94961c537a4982cea1bd3ee34bac069819c51d725208f45b24172
DIST importlib_resources-4.1.1.tar.gz 30821 BLAKE2B 440adde5ce8604c3dddc6c59f730890b4832076f3f7d5c1f9b46ed4d4fe1d80d714a2f393ae1a1b386ef20812090c7370858ca9d3920bc115a6cedb0d2000c8f SHA512 e277d375f800e8d1be317f90344c10b2848a0f7e0b3b6f28014b71d4b92b496137aa84b8ad865a3b93c983d20d827f18c6baf0d6c540882622b0903bebaae303
DIST importlib_resources-5.0.0.tar.gz 30603 BLAKE2B 66a22891e28e282919ed3847e69d36655ab8052f4f6c743ceb43456bc5447348302b61e5e3d3553d006fbab45c706882680265613497eedcc97c732a1776183a SHA512 eff23d8d365f105069910efe6e95f63a7e6c2cea7ca707cf4085c6d9f9c4f28065a1ad937d06ab3549a0ac25da5fa950af7b56a52d892125265252e0b79bf7f9
+DIST importlib_resources-5.1.0.tar.gz 31435 BLAKE2B f3e39117027a07de6c781e8b9bc3809a8fda4d1d5305bd514f4818a89a15e567c7c3c9533b263d8a2874e8fe0a580a55739e784a7ea2c7190a3eba7a422fab2a SHA512 f8ea8719a038a0b14845678c3ad836a6285b69bd3af45a45bb1e8d3ba401c72b8da00907a03297cde466551b169ba3f02133231e6f8d935d39110681ada35c8e
EBUILD importlib_resources-3.3.0.ebuild 827 BLAKE2B e65742ed1491b75a235027d96100ed31d4e2a0799b3db8246cef4549bd69a7f6b407da21a8a58b321991734edf48b81bbfda117906168cd474b465d41dff011e SHA512 fdd643e983c4d4126bdb399934ed4147a7530595eb22931e7c9b24349bc579e425583ea805249adfdb0c1f88f9215c3dde5196dc9844f385250edec09bd807d1
EBUILD importlib_resources-4.1.1.ebuild 836 BLAKE2B 71b9f7aa0465ffb0d797b007ab0f12fe7d9542415ad2aedcded20b3acd1f62605f6d375dcb85f09567df2c2ab1cd9d9dfd4526889c7f0ba88f789dd2c3a824a0 SHA512 d3d547d197dd043df177ec74dc2bb0a55802084750d1e6fba3d3371c3baed30719cf7c1380fd93d358aa682d191baf9617ae3863a25c54a551901060e325f3c4
EBUILD importlib_resources-5.0.0.ebuild 836 BLAKE2B f4cd94e2472020ba8b2706885c34be93f7d53799a34d3e51a6ebf72bec7234342d4c47ab3ebb67b10401e3545b39aea92aeaf708860e8009fa88a6b9a724ca94 SHA512 e6cfb47c4ff811d7228926571aba28bbc2beab772cb6fdb0e7194b4b0532cb8e8ed8fc953be42db9e830b489c5e6e86e9685134c8a667bf9651f4eb71a13e67a
+EBUILD importlib_resources-5.1.0.ebuild 836 BLAKE2B f4cd94e2472020ba8b2706885c34be93f7d53799a34d3e51a6ebf72bec7234342d4c47ab3ebb67b10401e3545b39aea92aeaf708860e8009fa88a6b9a724ca94 SHA512 e6cfb47c4ff811d7228926571aba28bbc2beab772cb6fdb0e7194b4b0532cb8e8ed8fc953be42db9e830b489c5e6e86e9685134c8a667bf9651f4eb71a13e67a
MISC metadata.xml 944 BLAKE2B 7a5aa1dfb947b0115f3e22f9550471b452204daedb386e78374c5dc19b408ec52bf5887d3e645c41be9ebd16f3bd003a2ac1bb3bac539e603d44decd86b92458 SHA512 f17b2ad2e3eedd75db96765537c30d68aa28c60137b12bac3bb47307347431a19ca064a94c8e41e4a3947ab2669605d7183b5b62e55def66631d20ab903e1ea9
diff --git a/dev-python/importlib_resources/importlib_resources-5.1.0.ebuild b/dev-python/importlib_resources/importlib_resources-5.1.0.ebuild
new file mode 100644
index 000000000000..e1158587790f
--- /dev/null
+++ b/dev-python/importlib_resources/importlib_resources-5.1.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# This is a backport of Python 3.9's importlib.resources
+PYTHON_COMPAT=( pypy3 python3_{6,7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="Read resources from Python packages"
+HOMEPAGE="https://github.com/python/importlib_resources"
+SRC_URI="mirror://pypi/${PN: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 ~x64-macos"
+
+RDEPEND="
+ $(python_gen_cond_dep '
+ dev-python/zipp[${PYTHON_USEDEP}]
+ ' pypy3 python3_{6,7})
+"
+BDEPEND="
+ dev-python/toml[${PYTHON_USEDEP}]
+ >=dev-python/setuptools_scm-3.4.1[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests unittest
+distutils_enable_sphinx docs dev-python/rst-linker dev-python/jaraco-packaging
diff --git a/dev-python/latexcodec/Manifest b/dev-python/latexcodec/Manifest
index 716f51d4c770..c05187098da7 100644
--- a/dev-python/latexcodec/Manifest
+++ b/dev-python/latexcodec/Manifest
@@ -1,3 +1,3 @@
DIST latexcodec-2.0.0.tar.gz 29919 BLAKE2B 163fe7332aba7628265f1462570c8d22ec4044dd7b7383de8280bbc617ba4dc26e90f12e6777d690c7a8ae4f6564dbf7519bd6f57cf3dca2820a1fc647a1d7ef SHA512 3c0540b4e5dbc88908b26c68b4c6fca573b45a6b17053733b35a16716510bb67ef6099fae8e48e094a6f08be4e4eac48e889366f035ab38f80e31dd61f08a3c1
-EBUILD latexcodec-2.0.0.ebuild 499 BLAKE2B e57fb6b0e42779d7bbd90b87de402c43b68a993e33f35be8d3de5d92ddba7a782fdb0966c8ed48116194d0cac39ab4ed5c8e88a879a1e5905a1b3d691d91fd35 SHA512 6f21b8fbb172a9cc12bf2f1edee6dc1eaf6dea03a0cee8a19b16e67b0e6dbb995434c0cd71568eca5c7188beeb0097573c6717f579771d3335c809499beb5dea
+EBUILD latexcodec-2.0.0.ebuild 498 BLAKE2B 0a62422087d54ddf603ed2edc4bca11089db678b90138ac5c161bb30381bb25a07021c8a79dd4f350a3edf8c12145a22e40759defa631338c94e75371babb38e SHA512 dcaa15efe2f61db1b674dc6121d54362a4db69aa74ceef03e60d89a367a8ed028411bbadedfa884ba2dc821b15aad988f3e829423d72fadc9c465ecbef38b67e
MISC metadata.xml 1105 BLAKE2B 888095a4dc47b0dc263a532afc635f4e673a3ecdfb268e0c7bdea292240aae883c9c477a11621991a9291fd528e72756da2dfcf83a1ca38c1e2ab2335abeaa49 SHA512 1643cfda1ab0bde15b47bfb5bf2ddb8f5f0c94981fc4d8cab9568fa8569b3ff7214419d2685699486cfb96bcfaa0e88d2da350d44f11fa321e23ab0a6571ffcf
diff --git a/dev-python/latexcodec/latexcodec-2.0.0.ebuild b/dev-python/latexcodec/latexcodec-2.0.0.ebuild
index eb517529d165..d0b505b9f685 100644
--- a/dev-python/latexcodec/latexcodec-2.0.0.ebuild
+++ b/dev-python/latexcodec/latexcodec-2.0.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{7..9} )
inherit distutils-r1
diff --git a/dev-python/micawber/Manifest b/dev-python/micawber/Manifest
index f3f2dbae9f5b..ed02b45136df 100644
--- a/dev-python/micawber/Manifest
+++ b/dev-python/micawber/Manifest
@@ -1,5 +1,3 @@
-DIST micawber-0.5.1.tar.gz 34210 BLAKE2B cc3be0dfdb52a733ff37f249d589f37812c5f6b641b1dd2092faffcfeff9cd79c3989324def721859584280405a28c046ec98aeee3a89106fec0e3f27ed4fede SHA512 888826ced322a0584d827f7e0c58691281d8147e7c3ca9e940493a8beba41fbf6d005b0ca7c4ee6eb8e9c37edea4fb8244aaea9f553b886b1410d91aecbae4ee
DIST micawber-0.5.2.tar.gz 34541 BLAKE2B d123e67ed859a60d102c4653776d0440e410f084087bf27fa56f4976e6e1d06d4f5a7d91bb67b45c6fb99657d6b3cdf6145d3153bc13553b9f4e7892cc7e6d24 SHA512 2bca326f884e88b31a1e019f22d5002316d200f7b273cf2a80ed6240e3fcafc2816f351e8f992905d4b60223061fb096469e905d75ef7c1c45b941d744a1a217
-EBUILD micawber-0.5.1.ebuild 670 BLAKE2B 7c8079710773d453e544edb8cafc0df0b0e4bb3fd3c809adec1ab7324765b27aae4671723f0b0fc916028657293e63db0b14f5f29a7d3acb0a369df280f4e432 SHA512 aa101c9f5eccc1e8d666c42628695c175a2fa8da499f3396da30f8ced3145a7fafe3d85838fba267d6f5d9952e15249a60a97a1ed7274e7301879afeda8d7813
-EBUILD micawber-0.5.2.ebuild 670 BLAKE2B 243442e39ce8b83b36bebd8347a85e601a916458da1774221f0905052e50ec914d483b53166309edabed9aaa2ad34e85d7db622197ecc053b33584361a4103b7 SHA512 5bf58ba04cf21364aa3305c5d5c41ba888924d56ba210d44dde6f0bddfff5449f847de06d53e1d9327642bd6807517d0431374cad19cd26bf45feb1fd94c3405
-MISC metadata.xml 368 BLAKE2B e6fb6533cace706d2feb6903ebea740cdc9a043e609027fa88d7f980212fb5daebdc195da3382099842cd0b6446c44a381de850b28c050a6526b2a864293923f SHA512 6043accc7969996b66f8639ec5338d8df340d5bbf87aa16db811dffa6ef7cc84a10ff0a270b6ae090520767b41fecc8dec1b3249aa02d3b21b32e2f6c992f815
+EBUILD micawber-0.5.2.ebuild 669 BLAKE2B 083f5a8539eb0ce08921e627ed57e55a1abf20955a82a1693e5f46256ea830f426ab6e4241c5509fe7c191285c4c0dff969950fc16bb3d2571292cec9f74bd9d SHA512 5ecb56ae3c28b025232c5212c847f4494357283bbfc07bf455025efccea1697b096fa7b97c350e4b7047108ae56c6c753ef4d5886fa9189c4fb8a8b6f70d3732
+MISC metadata.xml 392 BLAKE2B e64309d757450287e941aade812040543a73b56dbeb26960bd1fade3bd0e8b45a3bb04be4f4f0c9720c6ea36967d9e9715f793cfd57435c64c7dece1986761ca SHA512 210939afb78c7bab48debb24886a5b482215ba5fbaac0e7d7faacbf6781e6d1766ff97e61d94070048ea13d351996b5bd2e8a56e9395e8fb47e1f63e730f30e1
diff --git a/dev-python/micawber/metadata.xml b/dev-python/micawber/metadata.xml
index 51ec6ca51d93..11f5830a0a13 100644
--- a/dev-python/micawber/metadata.xml
+++ b/dev-python/micawber/metadata.xml
@@ -5,6 +5,7 @@
python@gentoo.org
Python
+
coleifer/micawber
micawber
diff --git a/dev-python/micawber/micawber-0.5.1.ebuild b/dev-python/micawber/micawber-0.5.1.ebuild
deleted file mode 100644
index 743a6f20ad10..000000000000
--- a/dev-python/micawber/micawber-0.5.1.ebuild
+++ /dev/null
@@ -1,28 +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 small library for extracting rich content from urls"
-HOMEPAGE="https://github.com/coleifer/micawber/"
-SRC_URI="https://github.com/coleifer/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
- test? (
- $(python_gen_impl_dep sqlite)
- dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
- dev-python/django[${PYTHON_USEDEP}]
- )"
-
-python_test() {
- "${EPYTHON}" runtests.py || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/micawber/micawber-0.5.2.ebuild b/dev-python/micawber/micawber-0.5.2.ebuild
index 6ea149baeecf..060cac98a650 100644
--- a/dev-python/micawber/micawber-0.5.2.ebuild
+++ b/dev-python/micawber/micawber-0.5.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/coleifer/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/mongoengine/Manifest b/dev-python/mongoengine/Manifest
index 4b7ee968bfb0..9ff92acda115 100644
--- a/dev-python/mongoengine/Manifest
+++ b/dev-python/mongoengine/Manifest
@@ -1,7 +1,3 @@
-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.21.0.ebuild 1497 BLAKE2B 0282934e3d29ee3944cb62e5de1cf7a26e64f3b08325c80fac6459a47c3740689f431051837789ed75ebf4d93c3c39f730aa512ddb5b1aa8ddc5aa1ab435c87b SHA512 62fccab4b550fc85724528571b476f5c901ca6cf86725914d416b5ed4ec7726d8c576d73fb3bc8051c805e2dd92d3da345933f5aaa0367a6eb7a9bd0a0c35c5a
-EBUILD mongoengine-0.22.0.ebuild 1347 BLAKE2B a2b6783d3cb5c3516a9f9ac2cedfb2482b4a8dcea86da8308a6e8cad5b75af9a73d263e4becf6c5a057ea6cf3136376844f56ceb3fa053348ae95969c3ba8b81 SHA512 dfa3f9e9ca2c2b1e47707ce44974d928ffb29f3f8a56cad3f4070976420cae259293119616add7015f353d08af7266c7052fa887cbd2ceae8fc5e8d54243284f
-EBUILD mongoengine-0.22.1.ebuild 1347 BLAKE2B a2b6783d3cb5c3516a9f9ac2cedfb2482b4a8dcea86da8308a6e8cad5b75af9a73d263e4becf6c5a057ea6cf3136376844f56ceb3fa053348ae95969c3ba8b81 SHA512 dfa3f9e9ca2c2b1e47707ce44974d928ffb29f3f8a56cad3f4070976420cae259293119616add7015f353d08af7266c7052fa887cbd2ceae8fc5e8d54243284f
+EBUILD mongoengine-0.22.1.ebuild 1345 BLAKE2B d34f8034b6f444777ff5dc86e0af23a66b169f40463ddeaeccba491e1b5d51c2ab34a9624d99dd57b806dd4baed37b34b23f5cff846406ce419a1a0be90b9e0b SHA512 d6dc5e5ce08fef1253273429d68d12611b81a48209a8f0fc5ff72b8586f162382b108737d3c875793adee1bbe6bbe8a83534faaa47086115dede335ca37ea2d4
MISC metadata.xml 401 BLAKE2B 85d14e37ee9648d1067f85cd133ffc31023c94057b3bba418c3c047ac7ed7234193ab54f1784908ffbbc23b087675d295ad55e59689dc9be312bc3ac966213fe SHA512 8eec6c724d7d943777ffd842f5963fbb72247aa0e9a66a9de006e56421e3b51e262df3aeb04112f2b91c9251ff3e3abfcd1c018a5bf0621a5a7b1f0ba17fcd1a
diff --git a/dev-python/mongoengine/mongoengine-0.21.0.ebuild b/dev-python/mongoengine/mongoengine-0.21.0.ebuild
deleted file mode 100644
index 55fa670b3f9c..000000000000
--- a/dev-python/mongoengine/mongoengine-0.21.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..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
- # incompatible pillow?
- sed -e 's:test_image_field_resize:_&:' \
- -e 's:test_image_field_thumbnail:_&:' \
- -i tests/fields/test_file_field.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.0.ebuild b/dev-python/mongoengine/mongoengine-0.22.0.ebuild
deleted file mode 100644
index bcf7043f3db3..000000000000
--- a/dev-python/mongoengine/mongoengine-0.22.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..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
index bcf7043f3db3..094a4761c2a8 100644
--- a/dev-python/mongoengine/mongoengine-0.22.1.ebuild
+++ b/dev-python/mongoengine/mongoengine-0.22.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/MongoEngine/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
# TODO: make it run a local database server
RESTRICT="test"
diff --git a/dev-python/msgpack/Manifest b/dev-python/msgpack/Manifest
index c5eca454baf4..606a6e43f2c0 100644
--- a/dev-python/msgpack/Manifest
+++ b/dev-python/msgpack/Manifest
@@ -5,5 +5,5 @@ DIST msgpack-1.0.2.tar.gz 123033 BLAKE2B 8ecf743f5cae536bde9328974827e48376fdfbc
EBUILD msgpack-0.6.2.ebuild 964 BLAKE2B 1d27576570c692008f26a34621fdcd50c3e94a960285040036190770e0d8b30e5ba8cda0a05b499da7adefd30a4af5ade250db446ddad0e16d24e7d26c7250be SHA512 e3835ec633b0eabb9fbea8ff3f8cc84abf8e2bc4efb86c1796deab39c718b5fb1dbfb770ef582c1c21203be471304d18b9bcb0c0a5dffa7f6ba65e8ac102cab8
EBUILD msgpack-1.0.0.ebuild 923 BLAKE2B dc80e570b84b80441c093f501ea2f412c6517b733dfc64c4235a61bd87fc705e9efe5045bdc81294685266edade3220983772297993376783d3960f6ef929f70 SHA512 53faf2e7be9c48b133f4872af4683b055bd9a4d8a43129519b7ecbb2f648f758522457d132501ebd54a15db9113a20ea3fc1f966c842537e45507505d906ea74
EBUILD msgpack-1.0.1.ebuild 939 BLAKE2B 5b6a858a380ad896b10d531ee36d75231ce15e93aeb7d41aa01b2761368fc46aea22a17b64e4bf084091c022647c42da23a023cc281b87b9474109cb64c63ea5 SHA512 6644271c146dd9a72cd68c422c683d70509999e5414bb9c009203ff71143d332fc5f1501c2bcaa371d3c9c0669495319dbe504f05bc8e09605e912dab93efffe
-EBUILD msgpack-1.0.2.ebuild 978 BLAKE2B 98b4c413ed57818960c8640c108d16908316bb6430b1531882870055311b1dfb6a56690e8d85282bcb870b653bae958dd423c41d258dfd9847fedf09bf73f92a SHA512 a334c3be7ff38b5f348aa984a877fa142ec90527d2d080c1a3938b0b37418b29d01e0c58be41296394022526a6a5de0ea9a569f15616fa504223e66c635f3a8e
+EBUILD msgpack-1.0.2.ebuild 975 BLAKE2B a931f3efabcd34223b79ceab9b00266203851ab95230dec57c83e3022fb3505d04eb6edb9c89385b509b6ac369f71f00515cfaeb4e41569cd25f11a6a886f87e SHA512 78ef59e2fb3f097dab302272b3084e8d926b939061ab802e6bd37856392ef359f13bc0cc1c89c6a2fb3510090eeea42ab013b2f82874ea59a98ab8f71651d1c0
MISC metadata.xml 519 BLAKE2B 2947e6ef092dec03d89e409684e08b7f8f2bdee001e0884424f75f9473bffa9cedc99d0932f83bce5a4e255ea29a02819611ec9eb3d16767b50a24982172e1e0 SHA512 27e121bfde1989d5018dc5c87d29b8cb317b264a41ab4480d6c13332d78219e23cb4cb9f803fdbf9198305af1d831000d5e1fa2e2e975d76425a73864561390e
diff --git a/dev-python/msgpack/msgpack-1.0.2.ebuild b/dev-python/msgpack/msgpack-1.0.2.ebuild
index a01a194cd8e5..f5083a8c348e 100644
--- a/dev-python/msgpack/msgpack-1.0.2.ebuild
+++ b/dev-python/msgpack/msgpack-1.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86 ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~ppc ~x86 ~x64-macos"
IUSE="+native-extensions"
# extension code is relying on CPython implementation details
diff --git a/dev-python/mss/Manifest b/dev-python/mss/Manifest
index d4983efe0afe..f66cc3be3c2e 100644
--- a/dev-python/mss/Manifest
+++ b/dev-python/mss/Manifest
@@ -1,5 +1,3 @@
-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
+EBUILD mss-6.1.0.ebuild 763 BLAKE2B 81f824c319d1d42ac0de9855bade1cfe92923d38cac3bb24f2be774a64bc5f7df4d8b46c5be8c4c8fe27126b7f26b38bb3150e55e349a60f8a9358a83720bbad SHA512 3cff7e7a92418b11cf0d3f793d692b1b7f4a91962b4da3fb7dc789817255efce69a3772763eed9ecf7afd0c8c74ba9ffac73d434fd9efe64d17834d0b5bcf0ba
+MISC metadata.xml 465 BLAKE2B 184f01f04e05ae8e344b8f8de0f46654d1e663c88c563cbb70c88a3d2815d67761b6054454734dfe9097599301ed8053db1dd56a34d2a83d47e9a4a64b717acb SHA512 54d6699e8fc5a291b72626c53abe99cce2ff803389b8f3258acaf72db28cced92cfe4a86407cbb98a80f3ecafdeff322d36f8e66c7fbadcf73a9956c293abbc7
diff --git a/dev-python/mss/metadata.xml b/dev-python/mss/metadata.xml
index 33e44966d1b3..c2887188cfa1 100644
--- a/dev-python/mss/metadata.xml
+++ b/dev-python/mss/metadata.xml
@@ -9,6 +9,7 @@
proxy-maint@gentoo.org
Proxy Maintainers
+
mss
diff --git a/dev-python/mss/mss-6.0.0.ebuild b/dev-python/mss/mss-6.0.0.ebuild
deleted file mode 100644
index c2cdf1ecf1af..000000000000
--- a/dev-python/mss/mss-6.0.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_{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/mss/mss-6.1.0.ebuild b/dev-python/mss/mss-6.1.0.ebuild
index 28a7a6fe0acc..72eee16892bf 100644
--- a/dev-python/mss/mss-6.1.0.ebuild
+++ b/dev-python/mss/mss-6.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/BoboTiG/python-mss/archive/v${PV}.tar.gz -> ${P}.tar
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
S="${WORKDIR}/python-${PN}-${PV}"
diff --git a/dev-python/nototools/Manifest b/dev-python/nototools/Manifest
index 891f2d2af803..f8aaaedcada8 100644
--- a/dev-python/nototools/Manifest
+++ b/dev-python/nototools/Manifest
@@ -1,5 +1,3 @@
DIST nototools-0.2.13.tar.gz 9574809 BLAKE2B 8c5f59721ed3294162d9578955f0493007fdcebe5aecb3364abf22add5cedb12de99c63064574ea84b553cf2547af2ac2203e68b4a380527695edd72cf05f6c7 SHA512 8e46ed8d5c683dd93a14890df059a86824fda7f39011570cb414a471c380ed5464cfbe2ee6c8b0c2819d35fabf51ed5495df4c49d5c562fed5467ac2bde135e6
-DIST nototools-9731cb825a5c7c7c88c043009f15d4d1e5708df1.tar.gz 9703187 BLAKE2B 9767b79514b8d7da8cac879c71fa76054993d17bee41f978ccca1648bed525567cfec48bfe06ae2b1de2146d2c2898afd4e53b746d5b03c0e48e6c93632407e6 SHA512 6888b00a11fb7d54947c438ba9e654f97e4ccd1ba292ad6219c7a2f4cc56fc75d249b89eb688b2f99ea3f321472eeb5103b33f4641d17e9983c70e9ad3cf6cb3
-EBUILD nototools-0.2.13.ebuild 1029 BLAKE2B 20c86f5e5e8358eae00461d9c2f47049e0e474478afb1d48214cf7e803ea1c31abfb1d5d84ce15d9b0962771d45efb861bbeda50d864984805c83e4d6e1774aa SHA512 ec266118599c18ef877a98f35df992b954652d2a9bcf52b32856f4fa7b4ff6a24a1dd86a368c0e142eab6abce5c72c2bfd7c8aa71c962581b6913b8eddc3c7d6
-EBUILD nototools-0_pre20200207.ebuild 963 BLAKE2B 8796ff981ed169017cd99e72a7f05bf4b9d0925c145e48d919ad4f1df0e6c1eb0027237c81d31ce8903745bf72fa27075a394489f878e7a929090d509e2d58e3 SHA512 40b0922f7f6feedc85ba4110bdd4a5e480473f896190b3f4cc64ac11d4ac6e83719158e3f4a0f88ca643d69d8ac91e4845a206395648d39ec66936de2c49e095
-MISC metadata.xml 243 BLAKE2B f40c5d69470d5136cba32e1ea6b2351ca1842a5d83381e0bef3e063e266c64bebb9ba85e1f155010e219b136c2827c989d9adf3b2c6b2f6ca265f03339c9a7ce SHA512 640630eb9d42c319ca1da37b03a03677a3dd4e48f28ce2690b64f6e4e7d5885cfda41d439f3f9d8b009be04891b043a5b0ac6f9d43b701f65c8fcc0e0613b04a
+EBUILD nototools-0.2.13.ebuild 1026 BLAKE2B 0542b6c6b6cb44020b68132328b7d00495c2800881c2b62b508260e88d771771b47f8034fa6a3fbf380ba3b1631cdd8d34d00e4c400084b0fc0547ce1f076b35 SHA512 5ff9a8f294d3715ed752be8b4c2169804b285cb797986cb2dd48f242b6a04ae1ead9d387e3f72bd83cff74d60c65f416aaaf38b31f19bb995c9ae7cd26f66298
+MISC metadata.xml 267 BLAKE2B 2d8b57fd5de0132fa382ac268575d15aea1f698eefa99b03a35c07ea1eb798dea4d25a1fba9deda173404f29cc99c8d519aed5ff5fb60d0779768fa53411542a SHA512 8c8abb99f1567921f504df5c39fd2f54a0cdc5ca1b5c348fa5b0a9c6a3822b474bd489821195ead44237f3ac873b0ac0b05597632a546a41e0bbbb97e71a2357
diff --git a/dev-python/nototools/metadata.xml b/dev-python/nototools/metadata.xml
index 3da97a9953cc..1f54352252db 100644
--- a/dev-python/nototools/metadata.xml
+++ b/dev-python/nototools/metadata.xml
@@ -5,4 +5,5 @@
pacho@gentoo.org
Pacho Ramos
+
diff --git a/dev-python/nototools/nototools-0.2.13.ebuild b/dev-python/nototools/nototools-0.2.13.ebuild
index fe9dc691005d..75f32ed3a48a 100644
--- a/dev-python/nototools/nototools-0.2.13.ebuild
+++ b/dev-python/nototools/nototools-0.2.13.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz -> ${P}.tar.gz"
LICENSE="Apache-2.0 OFL-1.1"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
RDEPEND="
media-gfx/scour
diff --git a/dev-python/nototools/nototools-0_pre20200207.ebuild b/dev-python/nototools/nototools-0_pre20200207.ebuild
deleted file mode 100644
index 5e5d67c1cc07..000000000000
--- a/dev-python/nototools/nototools-0_pre20200207.ebuild
+++ /dev/null
@@ -1,38 +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
-
-DESCRIPTION="Noto fonts support tools and scripts plus web site generation"
-HOMEPAGE="https://github.com/googlei18n/nototools"
-
-COMMIT="9731cb825a5c7c7c88c043009f15d4d1e5708df1"
-SRC_URI="https://github.com/googlei18n/nototools/archive/${COMMIT}.tar.gz#/nototools-${COMMIT}.tar.gz"
-
-LICENSE="Apache-2.0 OFL-1.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-
-RDEPEND="
- media-gfx/scour
- >=dev-python/booleanOperations-0.7.0[${PYTHON_USEDEP}]
- >=dev-python/defcon-0.3.1[${PYTHON_USEDEP}]
- >=dev-python/fonttools-3.36.0[${PYTHON_USEDEP}]
- >=dev-python/pillow-4.0.0[${PYTHON_USEDEP}]
- >=dev-python/pyclipper-1.0.6[${PYTHON_USEDEP}]
-"
-
-S="${WORKDIR}/${PN}-${COMMIT}"
-
-# Some tests weren't ported to python3 yet
-RESTRICT="test"
-
-python_test() {
- esetup.py test
-}
diff --git a/dev-python/pastel/Manifest b/dev-python/pastel/Manifest
index 15e498bc08e2..6c34b6acad2c 100644
--- a/dev-python/pastel/Manifest
+++ b/dev-python/pastel/Manifest
@@ -1,3 +1,3 @@
DIST pastel-0.2.1.tar.gz 125760 BLAKE2B f9b3c29444bb6bd0e710cd80d4e48cdc9099ad6512cd99b0224559b87504f5b61cfcb90165f97b101b8ff5e9f8b7e230878c5cf50ae2b0555447f5be28977cb0 SHA512 585834d035fe208313a77e0c824f6b67630a85697d4aef802800911cb1da72bfd6c9ba47fe5502359bdf244a98b8f6dea300a788ff1cfd56a8bc19eb7b7dcc16
EBUILD pastel-0.2.1.ebuild 454 BLAKE2B 46ceeb4b528e6a41fd674b75b229637062f3b187987460a5656cd0375c3c0d0db77d27c9b89f44f1d799bb236bc4ebeef7bbdba1b1d809f48631c7a3878f6751 SHA512 ed59976a9aa9120efc84259ebfad1466427046df60ebe93b7866c4468b8fe142c291498eff3bed035f19a5f8f8fc03050bdbb624606d5292ef0d88b6a88511dc
-MISC metadata.xml 465 BLAKE2B 596e2384b82e76027e65038e061f595467698d58096e2ddc52e069431feabdd980a7cd9afd6c19b6d055ed017a7d32b16fed723afa3c20fb6e1f930596d9f2f2 SHA512 d6b2356e166c94973c10ae6ea49866d63cf600963ac680a38ac410814c8cc64ff78a44dd296609e94219b667d76b2aec9ee69eeaa087a419e42ce047a9b0b894
+MISC metadata.xml 511 BLAKE2B 682644ff41bdbd8e94235ea9543edc06ab335e6a910b0121c1bd31e44d6511e924cfe45f97d9879fcc89a65ef8060261e459c42b4aecb3b5e87e6f6672d2d07f SHA512 a53766208c3a3d23607301f5098a2347a603973d68360b2209e34db0e2211cad4881fb39218575efd97039c5cc15c11247e1ccb3a552b7d5d29f19985adb776e
diff --git a/dev-python/pastel/metadata.xml b/dev-python/pastel/metadata.xml
index fc2ac36e1652..fdbca71a6d7f 100644
--- a/dev-python/pastel/metadata.xml
+++ b/dev-python/pastel/metadata.xml
@@ -11,5 +11,6 @@
sdispater/pastel
+ pastel
diff --git a/dev-python/pendulum/Manifest b/dev-python/pendulum/Manifest
index 2b892dee43e3..10bc9c6ea997 100644
--- a/dev-python/pendulum/Manifest
+++ b/dev-python/pendulum/Manifest
@@ -1,3 +1,3 @@
DIST pendulum-2.1.2.tar.gz 159885 BLAKE2B c95cd131fc95a0d19ef11f180cc42126cb8a6ea3aaf4b3bbedbc5ce4c1b37a6624f2a1be92f1a6fd6b1f14f5d20fa5f32e8230f896ab7a216f02f00e85b98738 SHA512 c367320ade0d10b7eb9c880286176161b925d7df052f7de85ddd169594bbe778776ea74df451f00186df98be3e32b7399c68ca4b40123e2c456206410e3a1ab2
EBUILD pendulum-2.1.2-r1.ebuild 1015 BLAKE2B e7fa249c719a4021cf38b711da36b2f126c02739e92188715f7bdb317fc8dec341be6b31494c8c24fff60241101149774cff8b99a7ea84549554cd81d91ae78c SHA512 3b62cd6944857c0fde598c226b57a68ed5c74548c72bbaf4bab2cb9f262deb5c3f5a8af36f7369f960e3b5bca4bcc176afb97b138cf13b5cf4a84cd91e68698e
-MISC metadata.xml 467 BLAKE2B 38fe131a514ff3e46355a9dcc7c8d4af67573756e85887b4c7ed36cb75c07578171db481ab688a9cc21719cfb2e30b9d06e4f2b76172ab69c48a08c54427f624 SHA512 adcbb44100cb5daabbe1b86a335e6853492b419e5fcff1dfc19bb80ec1a8dc5dfaeab8d2fe16119f9a4f7cb1093eef8b6ab5b81f3b27eba238fcf2b254897e2d
+MISC metadata.xml 515 BLAKE2B 836e056a0ea2aa33fd1d3fb9bb6fda8539ebb1395038e3b264302e8b6b63397840f3413bccd4bd1fe24ecceec8075ed3313f8404cab60a386c1c9eed902bc6d2 SHA512 e61f93ccb5176ea9693f9d03bd6b583db8154b9673e63ab683841b4ab9f611ffc2072bcb9c19c199f93b7fdec1cdc87c82fdfb688733de449f1a59a7a25f70f4
diff --git a/dev-python/pendulum/metadata.xml b/dev-python/pendulum/metadata.xml
index 59e2612c0884..2f00533e580f 100644
--- a/dev-python/pendulum/metadata.xml
+++ b/dev-python/pendulum/metadata.xml
@@ -11,5 +11,6 @@
sdispater/pendulum
+ pendulum
diff --git a/dev-python/phonenumbers/Manifest b/dev-python/phonenumbers/Manifest
index 9dfacc648384..d4c2b828b71e 100644
--- a/dev-python/phonenumbers/Manifest
+++ b/dev-python/phonenumbers/Manifest
@@ -1,7 +1,5 @@
-DIST phonenumbers-8.12.14.tar.gz 2256560 BLAKE2B 60fdcb14143d4ffb625d1c873a1e262053bb0bc3df6f2576212329726c4578367b817f1166dfbc561669e4e8486a411487627de479e66775968c05574a8beff6 SHA512 fc155095a00d5e776301dde134043dcc60dfdc6812399e92e92f319c568f7e06f3b294833dc385614b14c87cac15aafb76e7c27116445c7d8fc0ec0740314089
DIST phonenumbers-8.12.15.tar.gz 2256651 BLAKE2B b3a583cb64ea1e4fc278f40cb78c7ad9aa66f1655e4483219f8d1e3384628b9b5cd672c584953c0233743d436fbc6723484d63724e466badf0b3fecf57791b87 SHA512 56c52ab736ce807609c79d5cc3d4e97cb3c5a3e59689cf3112c21ee672c04f095f1727fc37f4e3b1573dbcd4c9ccb00b3a5773c2c383264996e1761f46acfd0c
DIST phonenumbers-8.12.16.tar.gz 2257000 BLAKE2B 33e513840f1147af9169ae4b01527b07597cd8fd3be2e299c77e79eed75b84c7e8bbe036e5961ddd93efcf4a8bab6e6a5da348800becac66d078947a2c98accb SHA512 4e2162a6fa02170241887f4876ee811d431b0bccb03d9be305478ae48f21f27643da1be238d68f52b50eb72e87f8de4961769500f026cd4bfb2ac291534d1e74
-EBUILD phonenumbers-8.12.14.ebuild 433 BLAKE2B 11b1a8c231c75bd817bbafc293de8500cdbfc0a560fbc98116212568ca63a7e003b1051f0ea496489978b73f82c2210450217042091b85a85114e928f9fa64f9 SHA512 35b211635f454d87b95b4bc2435b7142cd8eebf7a631a920f3108e02e810990256169a8bcb35828d79537efc3e51ac3a143a25319f2d5cd4e2b1c7f26272afbb
-EBUILD phonenumbers-8.12.15.ebuild 435 BLAKE2B 79b981b633b68fa232f0c431dbf4a180c9d4596931386e69046e2850e6f7aafc05600776af068613cbfd54484ecb2c5a3ee0653afd0338f12a18b43aeb9d6653 SHA512 e3f59e06254641b3ce2d4433ec1b1a74f786d0ae4ffcc1a407e30c8f4ec57f539925fdbaedbdaaf71ff4cecc9bcd95651f3b876affbf9e86c5b99546a122c17a
+EBUILD phonenumbers-8.12.15.ebuild 433 BLAKE2B 11b1a8c231c75bd817bbafc293de8500cdbfc0a560fbc98116212568ca63a7e003b1051f0ea496489978b73f82c2210450217042091b85a85114e928f9fa64f9 SHA512 35b211635f454d87b95b4bc2435b7142cd8eebf7a631a920f3108e02e810990256169a8bcb35828d79537efc3e51ac3a143a25319f2d5cd4e2b1c7f26272afbb
EBUILD phonenumbers-8.12.16.ebuild 435 BLAKE2B d974186dd5b9ef49120f67d6fc5f8d73ff6a80ab5ffa74fae9cc1799969cfe214f8303df9b1cb1f785079df953ed5ea8bc5a18e4718fedd103d64752a40f65db SHA512 6bbb205a0b04495d322611c8e31e0aed0f1fcfaddfb16747ae311189f6fd903b0fb953c9b724763a39b9358409d1a489b9ad48abff5632cad1ecd9cfc1752f51
MISC metadata.xml 517 BLAKE2B fbbefd64340f179046eff07f02cfc01416d9c99817d8bd4061aa908eaabf59560e704e40876b5d514389766b26697ee811a1a4ef9ee5a306790156892f45e8d1 SHA512 5246cff049767fba3892ae49499127453cc26806d3eca35de98012c71df29cca4192d104810ea21921a1160e736a2225e3538e829016d9712a0b489be0e5a17b
diff --git a/dev-python/phonenumbers/phonenumbers-8.12.14.ebuild b/dev-python/phonenumbers/phonenumbers-8.12.14.ebuild
deleted file mode 100644
index 42ab4628077a..000000000000
--- a/dev-python/phonenumbers/phonenumbers-8.12.14.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2021 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.15.ebuild b/dev-python/phonenumbers/phonenumbers-8.12.15.ebuild
index 4d3183b1591b..42ab4628077a 100644
--- a/dev-python/phonenumbers/phonenumbers-8.12.15.ebuild
+++ b/dev-python/phonenumbers/phonenumbers-8.12.15.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -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/pip/Manifest b/dev-python/pip/Manifest
index 2d19b9d56283..495ae49d0ded 100644
--- a/dev-python/pip/Manifest
+++ b/dev-python/pip/Manifest
@@ -1,10 +1,8 @@
AUX pip-19.3-disable-version-check.patch 872 BLAKE2B b0398674f56b78a066c4308f0a8ee0272c5c4c3cb569e6c300ac62fc9fbe8ec2a1bfe257047c15ddcf9cc44c47b7f8b9ab99e17b722bd6ae4cf9dc2a168e01d6 SHA512 1ece773f66556e4380eabf76490430e8fbec23f7cfad27dac02c7e49f7136b632515ef04843e89dfae42c095dbf5280d64e61da1544801c998f802aa59be8e22
AUX pip-20.0.2-disable-system-install.patch 1298 BLAKE2B a384ee2114e59b8bc719fc14270cf6efbe8914854c404395beb1126db3278683b940e8fcfee83423d78e2aed6521e0bc57566ab0f5618f473262bbd9b7b0bffa SHA512 d2772105d4f4f880606e1e8ab3381af6768a96604a5fdcaa155dd42f8eea731c3a1b733b027d3e591d81f962ba14758b19da4a2c6c12946cd9a9d77c51ca4e78
AUX pip-20.2-no-coverage.patch 6154 BLAKE2B 743dcacd3107d9c6447197dd01bc85b1b16db5b1da3bf5f84e73801e645848a98854f350d958056eb17aa6b87f8bb2557a27e3bd78582958c3b37cb6ce61d7ce SHA512 67ea11c56b6a7b02faae28c9d941015ca2ba9c125dfcaf01eeaba7717cfb22f23fb84c28f993202f7b648ee64741baaf7545e9951be840d378e39d3af0a60fd0
-DIST pip-20.3.1.tar.gz 8753852 BLAKE2B dbcf719ed6a1e4f39f08c39df0cb4abf4284f6cd68c9fbd1282b17714aff9df9e33dd2a4a1af89f45ce5131a858f7d392c11447fe9aceba9d3be2ebe1529818d SHA512 6061004b51e57e428a7eef02968fbbde02311ee184019c491012758010bffcb49d371c7612bc43cfacf96fe8de37fdcad34e3cadefc46b3b5962b0c716ee5d59
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.3.1.ebuild 4314 BLAKE2B db4ece017b4631267353ef076e72d4e5ecf52e6eea4d1a7fd1c6430802100fcf0a3172f8e3f97b4270f26200d4a6c7ebec1a64f4217583ce82e816fbf74e886b SHA512 ba5209a5cc5a48bb95a6a5d9a209061c1f2324a98332ce955c244ab51261e12f3b0e5ed55cd9c3ab7039c54b6c9c723019d80bdc90300e69a29227aa7f44aefc
-EBUILD pip-20.3.3.ebuild 4322 BLAKE2B f149a792176550728a21b30a4e670a9d292cbb06a492c8e023729697c7202a194a68de535bfb672fd1267911d13e3082d69bd07b73a8eabd1fbb14ba9e77fdd6 SHA512 94b10d3ebff504920c3aaa065421da9165edb5140ce00c01c8d61208858265662cb7dbe5fe22782cf934e59f13f185fbb693eb6b93015c6774a273fc8e6c734e
+EBUILD pip-20.3.3.ebuild 4314 BLAKE2B db4ece017b4631267353ef076e72d4e5ecf52e6eea4d1a7fd1c6430802100fcf0a3172f8e3f97b4270f26200d4a6c7ebec1a64f4217583ce82e816fbf74e886b SHA512 ba5209a5cc5a48bb95a6a5d9a209061c1f2324a98332ce955c244ab51261e12f3b0e5ed55cd9c3ab7039c54b6c9c723019d80bdc90300e69a29227aa7f44aefc
MISC metadata.xml 391 BLAKE2B d8537d1b2f8886d7c30dad3975568e0198a04f16a7ced44f3682f1b865e25f0b7552a640955dd915b2f059eec78eb3f920a0bea0f5f1503f366731a5d20a96c2 SHA512 27ee4b430cd0175c9eecc279765fd617ce5ab55d36932879a0710c2eb66ac2de449de303b1b70fc0ce925666c87008814d64e62d904fc3b9f800380c53478e69
diff --git a/dev-python/pip/pip-20.3.1.ebuild b/dev-python/pip/pip-20.3.1.ebuild
deleted file mode 100644
index 0545f115a9bd..000000000000
--- a/dev-python/pip/pip-20.3.1.ebuild
+++ /dev/null
@@ -1,150 +0,0 @@
-# Copyright 1999-2021 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
index 7987289ca6ad..0545f115a9bd 100644
--- a/dev-python/pip/pip-20.3.3.ebuild
+++ b/dev-python/pip/pip-20.3.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -28,7 +28,7 @@ SRC_URI="
# 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"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos"
SLOT="0"
IUSE="test -vanilla"
diff --git a/dev-python/pybtex/Manifest b/dev-python/pybtex/Manifest
index de1a0515031a..f94a458869e7 100644
--- a/dev-python/pybtex/Manifest
+++ b/dev-python/pybtex/Manifest
@@ -1,4 +1,6 @@
AUX pybtex-0.22.2-fix-test-installation.patch 410 BLAKE2B 6c9addde727e5e1c0001a92ad39c307399331e6ff6e1b5aa9cd691e4c8d6381f0d911fc8e622e8a2dd76736fbeb24513751651886a9db0b5e790a509b9043755 SHA512 d357f3f0566fb67b1ce2abb8669429b344f8d6f4bc8651ea913fba3337bfb33a1a7f6a6e1361b42b42cdf92ec09f60c42262f5c41f12da6b34593a1033c732db
DIST pybtex-0.23.0.tar.gz 400649 BLAKE2B ae841eb98588fea55dea59a90be4ea5489b115b5594aa2ba7da140d529371c9275d28896d2b3b1d7fdbfe6a4bc7f1a99a8a73505f5d141f7affc0f22e5b08ceb SHA512 11b4c8141f237a25c320726b18fb254df077f4b644ac26fa2bf9f3d85c4301ab839f3544a3c1849243e75bbcbf194b25642b0ef11d354e3711578a4e19565bde
+DIST pybtex-0.24.0.tar.gz 402879 BLAKE2B 0cbb74360ebb4e9598543b17a46f21fab037d83a50ee46eae50dd385b981789d72c8cfb0b6c9983a3721565cdefb0df7ca15c120683e33204c591863be79d23e SHA512 caa3480b82012d1db5e44ca7fb5a4082e9aa27e892364de22bd05b0b589da3b1bd41eacd3cda8f86ce567b32ab9a22765d2d8d89c21936d4149d4511349c556e
EBUILD pybtex-0.23.0.ebuild 765 BLAKE2B 9b87c3fc3bc8a04d75572aae949c9b3478cf4a37cea036c808c976282b94423b28a5892d6e5da908e1ccbee1d30eae4384e15a9c887a1de0470ca050c47c002d SHA512 c38693ff4bb4c62d2ff3023c7565c92e1f4f263d7ce496a39e49a191e423aa7ef5b11e8f2f114d1b08afeb31ecdc89aeb55e1d48066cd68ab228b2e824fd3d56
+EBUILD pybtex-0.24.0.ebuild 704 BLAKE2B 1a4350bfd74869b673c6f6e1087729be4f682938aefa28bb6b24c91426306078aee8b9b87d0289dd520ad895ca904e85b241cf194e7dc991d46fcce5eedfacb6 SHA512 98144f8fcd3738d2d5ede84c8c3e834a8d1200cd691107a78719765f46d6721211de9d7de32c1aecf6113bca0c44524a2c6b2af2260ac727997d3292b0881cd9
MISC metadata.xml 522 BLAKE2B 62e314da62e360861bbe2fe0a8c71dab45a03aeb3161adde5680e19b3d42d51c75294d288b7e7d89483e9dd9392f52b935e1ae33e0f732376284d988061743ec SHA512 9a27f72f6b1c15e6f30f33afd02c830949032c5315bd3b4cde8fe136f82602b32b1e1f7fafb12c58d2decb18e14bc88dfc507014b263dc1911e2e4cf74b677a9
diff --git a/dev-python/pybtex/pybtex-0.24.0.ebuild b/dev-python/pybtex/pybtex-0.24.0.ebuild
new file mode 100644
index 000000000000..903359c1e9db
--- /dev/null
+++ b/dev-python/pybtex/pybtex-0.24.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="BibTeX-compatible bibliography processor"
+HOMEPAGE="https://pybtex.org https://pypi.org/project/pybtex/"
+SRC_URI="https://files.pythonhosted.org/packages/source/p/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-python/latexcodec[${PYTHON_USEDEP}]
+ dev-python/pyyaml[${PYTHON_USEDEP}]
+ dev-python/six[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+
+PATCHES=( "${FILESDIR}/${PN}-0.22.2-fix-test-installation.patch" )
diff --git a/dev-python/pycryptodomex/Manifest b/dev-python/pycryptodomex/Manifest
deleted file mode 100644
index 554f033e16f0..000000000000
--- a/dev-python/pycryptodomex/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX pycryptodome-3.9.4-parallel-make.patch 756 BLAKE2B 06a79eff056ecb983131838287563d4d60896f27e28d5c2534f4ab008e50017694ac9355b43f8f387cc29abfd21ffd648233c3dbae33a06fcedb12a6c7e11e80 SHA512 06b42ea780bd374cf5cb5d6cef3fade5d695c1ee0d765e2659408da7645ad311eef2028f17d8ec0289d49c3a5851b4c63503d7c922de15873dbbf16d0db58b08
-DIST pycryptodome-3.9.9.tar.gz 15551299 BLAKE2B ac89bcc2bbe707cb2a9cf2496a2eb74ff5685f11017d60d67558de7ac6cad5c24c43b4074bff01e99378d7c88462e88e88f363c5329fb800e1a7872ad8a34dab SHA512 a1aad4d52256220fe3d5d7f399c2c5e7338d6eb88058da0571fe1c686d74d33ff4bc1c275d4b9373e0ff22f4ddcded75a25387e76fc65047f8612f8856c1bd4d
-DIST pycryptodomex-3.9.8.tar.gz 15633485 BLAKE2B 3d7b8a74d2f7cc0f47c73f3f3d1dcf13c8b9feb9f2f532dc48751c4a73915aa081ecf273a81731076070f054f5b2037a5eba9054ca71e549aad18ed0c3148c74 SHA512 bcc5fb27a89c00e6348eacc744a23d687d0b308d5c8ad8f6d955fe2b9e84288a592206336e7fef699800948f8ea7b1ac06d2bec60df0b9ff0fa32d0a05380869
-EBUILD pycryptodomex-3.9.8.ebuild 1295 BLAKE2B d413cbbe60cc382b829579894363c528308e30ab0066d41f4b460328bc4f1c6209390d717e75da19568b1a1ecbe0916e61d67c2e97e2cb62599072074240f3ce SHA512 9aa38a944bb46c2f9488ebe83bce157684a5641f07fd04a0c37f7af14effbf03f86642c63ef39877a321c33afaac1c4b8c7c88ccf2fd87ed2800f1a434af2c8a
-EBUILD pycryptodomex-3.9.9.ebuild 1479 BLAKE2B 11a85fe4de8bb65dd41194b586bd0e061308bfe1ed8100c4035e78a52e5f22d4aa7b4680e4de30480e0aa09c370ecaa24b2302964c037d1b26c60af80924eee0 SHA512 b81e5260e744f75eba0564ed48193c4286533562860aa61a4ff5d858244913eba746e2984f3abc0db4ab630c11fbed75335f6222b01efe3c7092d326d33b6c73
-MISC metadata.xml 496 BLAKE2B 8ac5f6afdf1dc8341803e415ae9f3c7c845d066c613b0643f80202367ebd44385f9b0a101c154455d545da479358d74852fb15f003c2efbb0cd6da952454d5c7 SHA512 9d8246235e1ee909fcb035b8f968f1134a09b774f182a4d88bdf0e3fb6296412963fd15ea504aa627ccf50f431a4521c27b6c3233603a9eef486f93d03daf2aa
diff --git a/dev-python/pycryptodomex/files/pycryptodome-3.9.4-parallel-make.patch b/dev-python/pycryptodomex/files/pycryptodome-3.9.4-parallel-make.patch
deleted file mode 100644
index 331333533f10..000000000000
--- a/dev-python/pycryptodomex/files/pycryptodome-3.9.4-parallel-make.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/setup.py b/setup.py
-index 1d70caad..c72f64ff 100644
---- a/setup.py
-+++ b/setup.py
-@@ -364,7 +364,7 @@ ext_modules = [
- Extension("Crypto.Cipher._raw_eksblowfish",
- include_dirs=['src/'],
- define_macros=[('EKS',None),],
-- sources=["src/blowfish.c"]),
-+ sources=["src/blowfish_eks.c"]),
- Extension("Crypto.Cipher._raw_cast",
- include_dirs=['src/'],
- sources=["src/CAST.c"]),
-@@ -427,7 +427,7 @@ ext_modules = [
- # Math
- Extension("Crypto.Math._modexp",
- include_dirs=['src/'],
-- sources=['src/modexp.c', 'src/siphash.c', 'src/modexp_utils.c', 'src/mont.c'],
-+ sources=['src/modexp.c', 'src/siphash.c', 'src/modexp_utils.c', 'src/mont_math.c'],
- ),
- ]
-
diff --git a/dev-python/pycryptodomex/metadata.xml b/dev-python/pycryptodomex/metadata.xml
deleted file mode 100644
index 0bcccd6fc1e2..000000000000
--- a/dev-python/pycryptodomex/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-
- chutzpah@gentoo.org
- Patrick McLean
-
-
- python@gentoo.org
- Python project
-
-
- Legrandin/pycryptodome
- pycryptodomex
-
-
diff --git a/dev-python/pycryptodomex/pycryptodomex-3.9.8.ebuild b/dev-python/pycryptodomex/pycryptodomex-3.9.8.ebuild
deleted file mode 100644
index c00030d4846c..000000000000
--- a/dev-python/pycryptodomex/pycryptodomex-3.9.8.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2021 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
-
-DESCRIPTION="A self-contained cryptographic library for Python"
-HOMEPAGE="https://www.pycryptodome.org https://github.com/Legrandin/pycryptodome https://pypi.org/project/pycryptodome/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD-2 Unlicense"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="dev-libs/gmp:0
- virtual/python-cffi[${PYTHON_USEDEP}]
- !dev-python/pycrypto"
-BDEPEND="${RDEPEND}"
-
-PATCHES=(
- "${FILESDIR}/pycryptodome-3.9.4-parallel-make.patch"
-)
-
-distutils_enable_tests setup.py
-
-python_prepare_all() {
- # parallel make fixes
- # Multiple targets were compiling the same file, setuptools doesn't
- # understand this and you get race conditions where a file gets
- # overwritten while it's linking. This makes the files look like separate
- # files so this race won't happen
- ln src/blowfish.c src/blowfish_eks.c || die
- ln src/mont.c src/mont_math.c || die
-
- distutils-r1_python_prepare_all
-}
diff --git a/dev-python/pycryptodomex/pycryptodomex-3.9.9.ebuild b/dev-python/pycryptodomex/pycryptodomex-3.9.9.ebuild
deleted file mode 100644
index d59485bbd17d..000000000000
--- a/dev-python/pycryptodomex/pycryptodomex-3.9.9.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2021 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
-
-MY_P=${P/x/}
-DESCRIPTION="A self-contained cryptographic library for Python"
-HOMEPAGE="https://www.pycryptodome.org
- https://github.com/Legrandin/pycryptodome/
- https://pypi.org/project/pycryptodomex/"
-SRC_URI="
- https://github.com/Legrandin/pycryptodome/archive/v${PV}.tar.gz
- -> ${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="BSD-2 Unlicense"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND="
- dev-libs/gmp:0"
-BDEPEND="
- virtual/python-cffi[${PYTHON_USEDEP}]"
-RDEPEND="
- ${DEPEND}
- ${BDEPEND}"
-
-PATCHES=(
- "${FILESDIR}/pycryptodome-3.9.4-parallel-make.patch"
-)
-
-distutils_enable_tests setup.py
-
-python_prepare_all() {
- # parallel make fixes
- # Multiple targets were compiling the same file, setuptools doesn't
- # understand this and you get race conditions where a file gets
- # overwritten while it's linking. This makes the files look like separate
- # files so this race won't happen
- ln src/blowfish.c src/blowfish_eks.c || die
- ln src/mont.c src/mont_math.c || die
-
- # create the magic file to build cryptodomex from the sources
- echo > .separate_namespace || die
-
- distutils-r1_python_prepare_all
-}
diff --git a/dev-python/pyenchant/Manifest b/dev-python/pyenchant/Manifest
index 1096f45e4f25..b767266f4a23 100644
--- a/dev-python/pyenchant/Manifest
+++ b/dev-python/pyenchant/Manifest
@@ -1,5 +1,3 @@
-DIST pyenchant-3.1.0.gh.tar.gz 75012 BLAKE2B dde78c4f8e986be7e7b4f82979bc446d68a88c3289d472948bb704120fb0dfc3064b8fd46b1883724b0084eefb9e52dfd522bcda290ed5e7a99ae62c948f828c SHA512 d2bf872c15fca1e2c1aa8de06a9ee2c0e6128a69f728383ae9b91fb0ead2d66f804388671cc8156716e240548c29da41eb6c0678dd889012009c690bd078a7de
DIST pyenchant-3.2.0.gh.tar.gz 75395 BLAKE2B bff9d4d5038252473fd7673758ecf1304f74f96514d984f5b6cd052042d0b2cf6fe2e149e3675777899107794c9d2fe1c630e87b031f38512ed2499ee1053f34 SHA512 63ca44aea9e7af3fecf554dc6156513c42d278a92170bd6b88b71a737def2e9fe7f7d2ecafd5fea2b860b4d5de55c9e8a6e4b30a58d6f28533bba71cc407850c
-EBUILD pyenchant-3.1.0.ebuild 712 BLAKE2B 171748cbd5f65d678c0288c48848cc04995edd6c1ea3aa597935f70db52c50095bfdffb08b8965c8adf1145f9c9063d8750cf526d0c0e512c31e671c1c909bf0 SHA512 bf7420e73287ae8d13e6f58bcff45ebb578b8059dcecccb494021c712dda291050970f4f9066479c9bbdb262053ee9084623409e96ba02bbea5f3332c72850f1
-EBUILD pyenchant-3.2.0.ebuild 632 BLAKE2B 210e54f4e8eb7cb9e1a8dd809c092cd47b3510b1b81eac140faf124d3616691edd598f5f55b695f97533da692ea05deed38dd31e5e9a3416338c8fae278ab83c SHA512 3879fb22031571deb49418a463b3332b44ad8e5e6b230fda50b53eb609533af4d47cc89f3c063cda2a494174fe518003ccec39c3f7bf5041335afe0cc9d2c611
+EBUILD pyenchant-3.2.0.ebuild 631 BLAKE2B b0a12d88c7884bb151103ad59da0bd1f7b4d1906b75062ac461d5d3897fdb07419e9465f8673eb8df0d3e48f0f25e33474a6f0d69a3eba63f78ee61e42da128f SHA512 133d3da1ae40fa9aa9184f176cf6cb5c3dad87b455f58bcabf50bff2f86ba91dde7ee214b9fee4b1e23ca3588287d25ef3e6cebe6507290a778be7298e3f0ec7
MISC metadata.xml 876 BLAKE2B 4b2b615496f92b395ca4449e8caba7860223101e142d45f3eb703e829d34b27a0e7b3965f7362739ffc16a61d4e5f495754415047b41473303982eb2bf35e528 SHA512 7e69e0da10236e15c70526eb35b2ae8d862109e3aaa81a2613f5a97ba08816eb71e76a845a0656dbe2a6bc92b45a79ab018386110aa7fa0687b3faba18c63129
diff --git a/dev-python/pyenchant/pyenchant-3.1.0.ebuild b/dev-python/pyenchant/pyenchant-3.1.0.ebuild
deleted file mode 100644
index b128cfe80b26..000000000000
--- a/dev-python/pyenchant/pyenchant-3.1.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=( pypy3 python3_{6..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python bindings for the Enchant spellchecking system"
-HOMEPAGE="https://github.com/pyenchant/pyenchant
- https://pypi.org/project/pyenchant/"
-SRC_URI="
- https://github.com/pyenchant/pyenchant/archive/v${PV}.tar.gz
- -> ${P}.gh.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
-
-RDEPEND="app-text/enchant:*"
-BDEPEND="
- test? (
- app-dicts/myspell-en
- )"
-
-distutils_enable_tests pytest
-
-src_prepare() {
- rm tests/test_docstrings.py || die
- distutils-r1_src_prepare
-}
diff --git a/dev-python/pyenchant/pyenchant-3.2.0.ebuild b/dev-python/pyenchant/pyenchant-3.2.0.ebuild
index 66edd8e3b766..927a0baa718b 100644
--- a/dev-python/pyenchant/pyenchant-3.2.0.ebuild
+++ b/dev-python/pyenchant/pyenchant-3.2.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
RDEPEND="app-text/enchant:*"
BDEPEND="
diff --git a/dev-python/pyglet/Manifest b/dev-python/pyglet/Manifest
index de3b7d5c0f5a..2bc90739fb4d 100644
--- a/dev-python/pyglet/Manifest
+++ b/dev-python/pyglet/Manifest
@@ -1,9 +1,5 @@
-DIST pyglet-1.5.10.tar.gz 6417209 BLAKE2B 2c413c111ce3d016ca23186e92b17cb6f67bb904d90ca241eb0f95372a0a9ff8915014f31294a6609e2f35072cb963b6998d791157ede2e2bf01175edeb91582 SHA512 02b3859f2805f703997d7799e324e7debe9375f6c0df211ceff2f750aa7dbbad61b6ece55fbfec111e4f47f0ee6a71881fd73a47bef794a437615ecb42d0f411
-DIST pyglet-1.5.11.tar.gz 6414606 BLAKE2B bc39a611b10a6397f31ce402d0f4be17093e5c37fdbd6bb419156cc00929fd951cfc8e309a0c2a557afba9c567f203956c6ac7fdd1c677d4a5c199c1633e86e4 SHA512 4121fcd45c8d7f500e2bcbaf85e30e39d44b9de165a818455c006964787ad9dcdbb1a670ca72e149a3574ec7c18f113166190acca9a2dec4bef4b5fde856e129
DIST pyglet-1.5.13.tar.gz 6415241 BLAKE2B 784e387072ea7260c5fc3f0c78869e62d42a68b7ca1208318af3dad77d64d6ca8d12b03c040ce1dca8430cbab31f218c2a1782ccfcaaf3637203e1e9638488b8 SHA512 05863b187653cb82d7727d7d33a65d9907030ac97d926d6dac01301817159c31d4a301570f41ad8e2af9e0509f67008b876e7f3460f31c6d58d5548179cba4ea
DIST pyglet-1.5.14.tar.gz 6414252 BLAKE2B 3e30f4dc80fffbf93a3cc7fa744ba224868dea1d9f1998446a2341fd3ed1c058493c486979aedb8415abe5c8a3f53dc634494f849bf6f3ab6f9ceb0e35cfecd9 SHA512 9b34e80e1b28a2ef0504339b67bdc31e568bf3a3352a9a1d78d3cf87ba84e86e23aec6e524abbca26865082ec2f9da8d7633ba83206f9996d87002faa1269044
-EBUILD pyglet-1.5.10.ebuild 1297 BLAKE2B 73e71b2b7b0feb6f2d1d4a8956e0b1f4433d2374e293334ab34e00f8a5d6720b177d266d17eb5c969b0678303fa82a0dc98879fb851b1413c48936d2598f2d17 SHA512 2e2f3b3686078f8bbe72f379612a66fa57578cecde7e2bedbc604900b7ab14741f535d5597c957f86aa082b26fa7791a6c75e9a09777a44da19c4ca2601d1ac3
-EBUILD pyglet-1.5.11.ebuild 1298 BLAKE2B 095b0e8a5f28e4da68af1da870634dec894fdac5b98f1c31ba5c1c5a7b41aa7a8f223edf79fa2609f1ce42a84fe517036b757824bd146aba41cb80724ad0b819 SHA512 a30f80bd64620ab6d0f83f8222f76ce30d6e6a4fa637d197a1bce1e454ee8509be8ec65e81fb3e86c9c00a5b99989502dcec129e38bcd085f2e2db3b4c63793f
-EBUILD pyglet-1.5.13.ebuild 1295 BLAKE2B 20694764dd3c60079418001b0e72c3b36bad38738174e3fadf0fb44737899194302566ff7198c4c45d745420663f5b49fba0eb5eadbdf15f2fe6a9a783821a81 SHA512 a1fcde05da77067d3a91e6fc81da4fcb304838e8334445a2d5351347a703030cbcbf41b889d229dddfbbfd8fd357ffde717ea41184a00264588713be01a91f5d
+EBUILD pyglet-1.5.13.ebuild 1293 BLAKE2B 5dd7a893ec3eba0dca425bff1ef71cd47626ff073ac8e33475c618d4251f88b5e19e226561e94942f9dcc7801918b8c72a0c9cc2d3e4814b57b109443fe4f89c SHA512 3dbfa44d1772329fa1a92df9f07d880143aa24596be5519895e591f81c8b92726806357db321cc6075eec776010591043a59f315de297db892a17c6eaf0bd84e
EBUILD pyglet-1.5.14.ebuild 1295 BLAKE2B 20694764dd3c60079418001b0e72c3b36bad38738174e3fadf0fb44737899194302566ff7198c4c45d745420663f5b49fba0eb5eadbdf15f2fe6a9a783821a81 SHA512 a1fcde05da77067d3a91e6fc81da4fcb304838e8334445a2d5351347a703030cbcbf41b889d229dddfbbfd8fd357ffde717ea41184a00264588713be01a91f5d
MISC metadata.xml 996 BLAKE2B 74fda944aaa3954eafb31e21741f8cb599c9f8bff46c662a598cb384da9770d3160302b37ce8cbe9ddbc7dfe63c594614783afa568ab4be5e73db502fdc3a095 SHA512 a13a1aa2134de7bc7e007f81540631623c5a3fc1f5bfd4b6f7bc744eff8cc037da321292aa968184d324099dbfd87f608d7c0a2aeea90707c27aee5532a1fe15
diff --git a/dev-python/pyglet/pyglet-1.5.10.ebuild b/dev-python/pyglet/pyglet-1.5.10.ebuild
deleted file mode 100644
index 0f9c824411bd..000000000000
--- a/dev-python/pyglet/pyglet-1.5.10.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
-
-PYTHON_COMPAT=( python3_{6,7,8,9} )
-
-inherit distutils-r1 virtualx xdg-utils
-
-DESCRIPTION="Cross-platform windowing and multimedia library for Python"
-HOMEPAGE="http://www.pyglet.org/"
-SRC_URI="https://github.com/pyglet/pyglet/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
-IUSE="examples image +sound"
-
-BDEPEND="
- test? (
- dev-python/pillow[${PYTHON_USEDEP}]
- dev-python/gst-python[${PYTHON_USEDEP}]
- )
-"
-RDEPEND="
- virtual/glu
- virtual/opengl
- image? ( || (
- dev-python/pillow[${PYTHON_USEDEP}]
- x11-libs/gtk+:2
- ) )
- sound? ( || (
- media-libs/openal
- media-sound/pulseaudio
- ) )
-"
-# ffmpeg? ( media-libs/avbin-bin )
-
-DOCS=( DESIGN NOTICE README.md RELEASE_NOTES )
-
-distutils_enable_tests pytest
-
-src_test() {
- virtx distutils-r1_src_test
-}
-
-python_test() {
- xdg_environment_reset
-
- # Specify path to avoid running interactive tests
- # We could add in integration tests, but they're slow
- pytest -vv tests/unit || die "Tests failed with ${EPYTHON}"
-}
-
-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/pyglet/pyglet-1.5.11.ebuild b/dev-python/pyglet/pyglet-1.5.11.ebuild
deleted file mode 100644
index bc22b79ee8ad..000000000000
--- a/dev-python/pyglet/pyglet-1.5.11.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
-
-PYTHON_COMPAT=( python3_{6,7,8,9} )
-
-inherit distutils-r1 virtualx xdg-utils
-
-DESCRIPTION="Cross-platform windowing and multimedia library for Python"
-HOMEPAGE="http://www.pyglet.org/"
-SRC_URI="https://github.com/pyglet/pyglet/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="examples image +sound"
-
-BDEPEND="
- test? (
- dev-python/pillow[${PYTHON_USEDEP}]
- dev-python/gst-python[${PYTHON_USEDEP}]
- )
-"
-RDEPEND="
- virtual/glu
- virtual/opengl
- image? ( || (
- dev-python/pillow[${PYTHON_USEDEP}]
- x11-libs/gtk+:2
- ) )
- sound? ( || (
- media-libs/openal
- media-sound/pulseaudio
- ) )
-"
-# ffmpeg? ( media-libs/avbin-bin )
-
-DOCS=( DESIGN NOTICE README.md RELEASE_NOTES )
-
-distutils_enable_tests pytest
-
-src_test() {
- virtx distutils-r1_src_test
-}
-
-python_test() {
- xdg_environment_reset
-
- # Specify path to avoid running interactive tests
- # We could add in integration tests, but they're slow
- pytest -vv tests/unit || die "Tests failed with ${EPYTHON}"
-}
-
-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/pyglet/pyglet-1.5.13.ebuild b/dev-python/pyglet/pyglet-1.5.13.ebuild
index b3559565c31b..2436679a92a0 100644
--- a/dev-python/pyglet/pyglet-1.5.13.ebuild
+++ b/dev-python/pyglet/pyglet-1.5.13.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/pyglet/pyglet/archive/v${PV}.tar.gz -> ${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 image +sound"
BDEPEND="
diff --git a/dev-python/pygments/Manifest b/dev-python/pygments/Manifest
index 68379e241d8a..a1f917543606 100644
--- a/dev-python/pygments/Manifest
+++ b/dev-python/pygments/Manifest
@@ -1,5 +1,3 @@
-DIST Pygments-2.7.3.tar.gz 2355381 BLAKE2B a7ae0ce7fefd8e2ec707ca8cf2d01d1b746d233e36c78ec51055f750e1a508240b706be50e5f1260f93fe19e15dc27d8de8c614260783713dc61c3c683b86c57 SHA512 fe58ce0beb3d2fd88b374d7864e93dba41e4e2ad6dca570e284fd76615c5bb4e78459a4b8c4dd5f61603d4bccd5705cebafd7274369d158af149e838ec63f7eb
DIST Pygments-2.7.4.tar.gz 2325473 BLAKE2B 48e45f8d58e4d06be71cacbfbcbee57c69fe0b4c344c1dde2054912f1b74c67db19c24de2661acab7026ea78420ff90e4596e1a89b783ce79ebea12c8d3a7a60 SHA512 84fb2e0c52e4683d52524ee1d70c11a9ff6cc0b21fe6aa3e1a6c4fac393f87267756b1c04b7c2555799e387b2e9ca7d2e7703ddc1690a642aa263ed27510e030
-EBUILD pygments-2.7.3.ebuild 946 BLAKE2B bc779c3136b9df401d5083619a6f28e9f60d021062fd4c0435b44350e1983f9aef221a7d484cdf3c5531a638e09994100e1884641899bc7da1c39ebb84860a9d SHA512 4f4f339de5aefdcfc1723411967e46e7a7d6d820a6ca564d89a42d948af1c1a5716eb8dfa76c5d88c9aa6d6ccc4908d892f59536af999d5c933c4bf728a4657d
-EBUILD pygments-2.7.4.ebuild 1245 BLAKE2B c26b8a623548fe14608d88eed2e5d88a4adc9ff7313056c9fa7eaad0cdead5ba5a8c78c8d068f951e73c220d1cef2caa7323c8c9c5f72d9d5504db309ccaf793 SHA512 684c92cf95382fa01d670cd9407955e0df6fca4846dfabc69aa8b4d0e299c3716f4bd8fd2c1b87b3457145206a2d130d2ee604d4318b97f394ec47653f653402
+EBUILD pygments-2.7.4.ebuild 1236 BLAKE2B 5fd235b382de6224b8958289243666236d1ee4ba8e2bbd22bb0812027d26b81f64db9131d882c604c9d83699402a405e2b16caad816203a721dce013a75de196 SHA512 dac5160a45335154dbd080464cf5aee7b864461874b527b41af1e9eaf8b037fe8f408809a5693f93648590483c87ec069c06d8491c3b464498a98f91c4d739fe
MISC metadata.xml 556 BLAKE2B 87120b6aafeefb97b45a6895b23d08c6443cb177d5bc337845bec55ebdb59ee9eb19ef41c10b3ce4d61452c602f925b4120a441959b5b5d5fea26e15de4a1510 SHA512 b5f4491bb714e2abef07da4e960609aae651ceae3153102467e19bc4d06b9006418729f0b915cc026842253287786faa083d608c0ad5bd7f5c423922740580bd
diff --git a/dev-python/pygments/pygments-2.7.3.ebuild b/dev-python/pygments/pygments-2.7.3.ebuild
deleted file mode 100644
index 0ac9a8b410b2..000000000000
--- a/dev-python/pygments/pygments-2.7.3.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2021 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 )
-
-inherit distutils-r1 bash-completion-r1
-
-MY_P=${P^}
-DESCRIPTION="Pygments is a syntax highlighting package written in Python"
-HOMEPAGE="
- https://pygments.org/
- https://github.com/pygments/pygments/
- https://pypi.org/project/Pygments/"
-SRC_URI="mirror://pypi/${MY_P:0:1}/${PN^}/${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="BSD"
-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"
-
-BDEPEND="
- test? (
- virtual/ttf-fonts
- )"
-
-distutils_enable_sphinx doc
-distutils_enable_tests pytest
-
-python_install_all() {
- distutils-r1_python_install_all
- newbashcomp external/pygments.bashcomp pygmentize
-}
diff --git a/dev-python/pygments/pygments-2.7.4.ebuild b/dev-python/pygments/pygments-2.7.4.ebuild
index 20b5e4dc6432..e80a67cac2a6 100644
--- a/dev-python/pygments/pygments-2.7.4.ebuild
+++ b/dev-python/pygments/pygments-2.7.4.ebuild
@@ -19,7 +19,7 @@ S=${WORKDIR}/${MY_P}
LICENSE="BSD"
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"
+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"
BDEPEND="
test? (
diff --git a/dev-python/pyjwt/Manifest b/dev-python/pyjwt/Manifest
index 277a9b149396..0a488dbfcd66 100644
--- a/dev-python/pyjwt/Manifest
+++ b/dev-python/pyjwt/Manifest
@@ -1,6 +1,8 @@
AUX pyjwt-1.7.1-ecdsa-fix.patch 1179 BLAKE2B 79fcaf69d6021f04fb624fc36314135c9704a8abeef8eb6872d1f2dc24bcd9372f2372e8022fb24e9db736c9014756805d608415e8893084ca45fbb3e76a8948 SHA512 6fb83a17ebe768a147f6f610c823a11a500cc1828efe8cb12f3623be153574c94abacabb441150ee9d3bcba5762cb2eea73e30b46cc748044842e787172808da
DIST PyJWT-1.7.1.tar.gz 41979 BLAKE2B 5604b309838b2dfb2f95e18e291c43703954664aa8acb7439072f002c1c8a1e49ff2c21d907be77a4d2f86e695ec71970d550aad2541252ac85bd7133e300b28 SHA512 70cd38127b6848933992c8b88303725ef71bfb430ad42eb63247e549b0bdab2a194137349d43ab02a1c97212dbc89f447ee3f0c5403dd14632b8b4b6b9235fc4
DIST PyJWT-2.0.0.tar.gz 56981 BLAKE2B e093bf23beb86a287e494018aed6bd6870d5923697b6502e4269f0b991b28c4ea6a53261b88789b0786b59e03b3d4eb763006becf0666921a81d0528c7677af5 SHA512 1831c93f100cd481e2ea80e23ff9f5114806cc493efc1c42ec6ff3ecc07e716d9ba2557b0b66fd8413946d166eebc1a44c453ec5407dfeef0529d222c9187e45
+DIST PyJWT-2.0.1.tar.gz 57496 BLAKE2B 1258734d2cd5ca6a4012691bef0ae2a7d6539083241cde7ef27da155cff0808211eddd56b9455e812bae4c739f83fed1c6fd84abcc85208203d86e5834d5952b SHA512 a59b975fb465b44e4d84e3ef0380ed5107438e202e073238700bd700e8871098b9c59a849d157ade7888eef32609078571e2b8af09dca0752d7a18c370c2a0a5
EBUILD pyjwt-1.7.1-r1.ebuild 1407 BLAKE2B 80be3db89061e26191efdda9c90030a8de204081ae7abe63a16caad001d893ea68025e222b9eacf6cc012ceb1df814a95560151fc022cdbce7f1060ab708553f SHA512 37f1ed02c287943ecc70b0171c5a52c6b5308bc49a7aad0804fb14970396d2149f2ef381ad365be77de342cc70d93321b7debc11722c5b65752bddcdcfe5f5f7
EBUILD pyjwt-2.0.0.ebuild 970 BLAKE2B 4d80c1b064ed15fd9a324a60c5eb73780b730bce6e6740c0d5cb89eafe4ed01979912f4f46f3d5106e50b03ee342142f48abc9c35725863ed5af97e765b3af90 SHA512 d36c414fa01fe7b4e62b292ce67053ef4f5eb127908779630557745f275c3239424d5d6288884369f73485583b7e1ff4ff5af9d315219a08366e46897b7eb6a9
+EBUILD pyjwt-2.0.1.ebuild 751 BLAKE2B cd42fd04c1117a04e917bd1f4119729a8a1d340d47430d62b427542f53127218434dfb96e50026b1494b8d0f037a45bfa7d8487a326cafef92c35c357dd704b4 SHA512 e674e84fddf2114b4b8eb54a6a9b8a115ffe39402bbbfae461031925ffc825ea9174d1620b3019995b9ae2b18b1e7c6e2a1844d4b77fd665a53dacfe4d504659
MISC metadata.xml 439 BLAKE2B c58ee634cc6b1b2e3876de50487d821d4b73192b7445c95a1e3fd96ab02d6024092295fe1e347aeb4fa50ff64c57340eb3a0ceb8cde033f25ed5a6ea169f0ee1 SHA512 df1e2e59917f902be01bc1059f91371d7385d612e2bad165460ce5402ad519cb4f33b190ddd29783b4fe6a42ec9430889a9e9e32236329259e197b743ab26209
diff --git a/dev-python/pyjwt/pyjwt-2.0.1.ebuild b/dev-python/pyjwt/pyjwt-2.0.1.ebuild
new file mode 100644
index 000000000000..d6e6d2d94d3e
--- /dev/null
+++ b/dev-python/pyjwt/pyjwt-2.0.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit distutils-r1 optfeature
+
+MY_PN="PyJWT"
+DESCRIPTION="JSON Web Token implementation in Python"
+HOMEPAGE="https://github.com/jpadilla/pyjwt/ https://pypi.org/project/PyJWT/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+S="${WORKDIR}"/${MY_PN}-${PV}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND=""
+DEPEND="
+ test? (
+ >=dev-python/cryptography-3.3.1[${PYTHON_USEDEP}]
+ )"
+
+distutils_enable_tests pytest
+
+pkg_postinst() {
+ elog "Available optional features:"
+ optfeature "cryptography" dev-python/cryptography
+}
diff --git a/dev-python/pylev/Manifest b/dev-python/pylev/Manifest
index 77f2b3e80c98..75b6fa9ac5a8 100644
--- a/dev-python/pylev/Manifest
+++ b/dev-python/pylev/Manifest
@@ -1,3 +1,3 @@
DIST pylev-1.2.0.tar.gz 3048 BLAKE2B 3bb8c18350667cd6405ae87afb0bce5c7aa987bb318f6ede0220b268facc2bb06f0c0daedb8cfcc9e7a64f65ac32d75b80e9c2718214925fe9965082f434f47a SHA512 848bda63a3bb5f686944ec1396ad916fe18546fd681a106b7b9641231bed540db6ad9f88f56bbcceb71cedd2c2d7c567295071b1de81f3d10cf115b6459bc793
EBUILD pylev-1.2.0.ebuild 418 BLAKE2B 92f3c437ec14c69ec498bc4ecee78b8c925acd5c07929614968e59f5c29ab0c7c3baa8b5df7c97066b97243ef47f1998c8d10d902438fcfa2daf29f0e10138a6 SHA512 9aef6bc9f1e85f829b26e8eb0d11dcbd7f35f19e7abe47a13271ea15e1348d7ab3f4d96a48f9dae0b8fd8aeeb9833f1dad69ad69ba1c674634390c57844d1ddb
-MISC metadata.xml 466 BLAKE2B 2bd63efc1937649a7a0b06033cb60dabf8566f70ba93130c178d12a9789ebd0e5a792fb2c89b6635f07e3794145e0f361d3bec4a499ab6f452915f5730779f49 SHA512 26e9e66390f6400549b3d9fd831f65229a70b626ec27f3e68e60d79e58771f5dffd623a1475bfbb1326e76bd1a9fcc3b19463bce602487b71a41822575b7995a
+MISC metadata.xml 511 BLAKE2B 2a6e66dad341afe9386031a90d395cfc9518526e4c4441cab70c98c700c0d64b706dc7680f71e282f549239ad0e5af386772e3f1aa0848a4cbac9b37627134a2 SHA512 632108658c5730efe8bc9132d1b1023c0b3daa54b95f2ce6477ead3f0723d98ee24fad95df150892b4b3c6ce7783b26200a4e4d3ff55b6c36960d882a648aacc
diff --git a/dev-python/pylev/metadata.xml b/dev-python/pylev/metadata.xml
index fa047620d07a..1023f11f98d0 100644
--- a/dev-python/pylev/metadata.xml
+++ b/dev-python/pylev/metadata.xml
@@ -11,5 +11,6 @@
toastdriven/pylev
+ pylev
diff --git a/dev-python/pyls-spyder/Manifest b/dev-python/pyls-spyder/Manifest
index 18ae3f96de7f..bd976e22aec7 100644
--- a/dev-python/pyls-spyder/Manifest
+++ b/dev-python/pyls-spyder/Manifest
@@ -2,4 +2,4 @@ DIST pyls-spyder-0.1.1-gh.tar.gz 7113 BLAKE2B c504c5393527c13d06de579b3e46938dc5
DIST pyls-spyder-0.3.0-gh.tar.gz 8545 BLAKE2B fe2ec3ca6a4440bb9112970550a096389a0969eea9f0cdd631110c19358ac387a97902cc21ee61c8961ef2ee020689c30f7c86f6448bbb40258d730b3cf79cbe SHA512 94ce684d8c7fdb8ece003c1965a001bd745a38086f382e0185f6750edb3103998165a5e2554f065d6364409e5438272e5c256b7b756b971f61f1dd5cbcf3d503
EBUILD pyls-spyder-0.1.1.ebuild 584 BLAKE2B cf117e84371af5185632dddb005291066d80306dc6f54aee0c0576fa33f024f789cb41acadf09289d6cfeadc8c5bfb39d8200a537b93b8c5dd7d077ac630ab61 SHA512 bfb1494af0ed44d6f769b649d53b58eb8b8e1a3078374c0132ff58f648986ca0d5f111292ac5da9d62f706ef1e9c098b57fa5bfceaa0e0acfedfa706017e3bd0
EBUILD pyls-spyder-0.3.0.ebuild 595 BLAKE2B 2e4207fcf655977a4e24ce18b6d88079110fcc87b3d95e978fedc894200fb6a2492cc3ca9dd6617669551277c1ae047560d96efa2a89f7ffd0e647e3d280e0a7 SHA512 4449555861c88a6338ad9ec1f587510d666933e53386e5ae6333756b39d7efda5da4d71585ac17b57606a6fdd648ffc0e178aec52225af05201074db41cbd5b1
-MISC metadata.xml 529 BLAKE2B f03e03230b89b83cf275a96a4e3ecf6b1a9a76e44e917d8efb2fbfe58b3410b2d4427a88727e3f6d7dcce8143de6b725e1040762a2a240b5bf73d77747a00d84 SHA512 8ecf182651e9c77312d5527a7cbc28802bf99a7b6f70f20113a5aea97e76a4a5f2e056d26d55b5330c0219986c8a420f51a29d756ac400060fe73e82eb4bc770
+MISC metadata.xml 554 BLAKE2B d92e4696e31a986927d50e9e17fa0d202681c4c323430ca9dc7006a203e5fbac10a2a33107dbdaff9b3ab21a5473c678f282a76ba63178909e687a07cb0a82a0 SHA512 83e82a6f5fe43cbcb305046744600881214625e891b708d45ec6f31ecb41e9f6f4e6524d10d41823aeb6b43f3e96e6e484d9e579f30de7608228449cafebe27a
diff --git a/dev-python/pyls-spyder/metadata.xml b/dev-python/pyls-spyder/metadata.xml
index 41c9df516967..880fbaa4fef0 100644
--- a/dev-python/pyls-spyder/metadata.xml
+++ b/dev-python/pyls-spyder/metadata.xml
@@ -5,6 +5,7 @@
pyls-spyder
spyder-ide/pyls-spyder
+
andrewammerlaan@riseup.net
Andrew Ammerlaan
diff --git a/dev-python/pymetar/Manifest b/dev-python/pymetar/Manifest
index 7b0724f4f81c..6b38e912d6ee 100644
--- a/dev-python/pymetar/Manifest
+++ b/dev-python/pymetar/Manifest
@@ -2,4 +2,4 @@ DIST pymetar-1.1.tar.gz 3162533 BLAKE2B 43cc79a0c8b27f7146a0f89d4271830ace0bd257
DIST pymetar-1.2.tar.gz 3163447 BLAKE2B be3e06efa007db46bd90e944ce60d24389f6b8685fcbb66803aca9b46b62cbb23b27e4ef7b2dc47080b6e6c9366acd3ecf13d02ef47ca50705a7631006482002 SHA512 4f19e99f56497b59ca31620a41beb7fd896b4503ed3edd34bafc8e9158895a238cc721e4161c2940abb49b34b1a7cbeb3d97952c4b19361d74a8b3ca56ea2fe7
EBUILD pymetar-1.1-r1.ebuild 457 BLAKE2B a3c6dacb74e8e4d03381deffb34517cc6013c36ff0d068a28cb4be7cae6f604463e0b791bffb872a1eec5a59b3a3852152235afeb2068c186777ef4412494b76 SHA512 d5667c9978cc42cbe110f59107954001a697238bec3a53b5e27dc8dd4ade873191147c2d74106c92c2d9db5cd563dac7019dda0515381674675d6158a241c895
EBUILD pymetar-1.2.ebuild 452 BLAKE2B 89b611cecbd3edc3fe4bf41a6a94ea3658ed5cb6f84f8a3919a5f2b82ba520a6adfe4e5ee4c5f4c4731ea964c32e12876e1bb3c6425903eed571ba29a41343e3 SHA512 13b6d37fe11cb733aadd58ca2af0187b605379d28ee45b5a192759efdc593a57acfeec691e91b264fddfc786ae8c14928cbec3fc2c406868d5f624429f7d9fd4
-MISC metadata.xml 1035 BLAKE2B fb5f0b1a2495780614d229252c840b9937c2f385a18d4473dc9b151cbe73d2a2fcd98fc3c856d5fd13dacc7f72b32c26ab27fabab21437372b21b63fb0b8bae4 SHA512 38987451c572b1da0cb240bcead18b9a4b2d2611d152f9174695a884df932bbde6408a989548ef1dc92eda209b802199a077988a5cba83161852bd402dae024b
+MISC metadata.xml 1146 BLAKE2B dad7f0dd50292e100ae7984401b1d8ef13a04ddf13943fc5a537a7807af0a5cdcba0296c9ee200c690547de3bbc70a56c70d9208bdfc8ce31aa174d19f90040e SHA512 ac50c6e1511ae8370f7b70d56918914b59a06d61c28f3d55943e32609f9c932e27e757bf72cca91106165391f29bda31ebdc20c181ef7e9b18a842e99f03367c
diff --git a/dev-python/pymetar/metadata.xml b/dev-python/pymetar/metadata.xml
index c739026bcfd3..02d5d8db5b4e 100644
--- a/dev-python/pymetar/metadata.xml
+++ b/dev-python/pymetar/metadata.xml
@@ -1,6 +1,10 @@
+
+ klausman@gentoo.org
+ Tobias Klausman
+
python@gentoo.org
Python
diff --git a/dev-python/pyopencl/Manifest b/dev-python/pyopencl/Manifest
index 5e02fe418b0f..56be3b40ebd2 100644
--- a/dev-python/pyopencl/Manifest
+++ b/dev-python/pyopencl/Manifest
@@ -1,5 +1,3 @@
-DIST pyopencl-2020.2.2.tar.gz 352110 BLAKE2B a3bb5f74abbb5d9600651dc0659f2472f7bf91d67cf3474f7306a29ccd3a8249dc952fc1e5b81f0514990e49246d106325a6697559b260a490981541666cb3a7 SHA512 2c4f21d9c0a5d3d53f2a0e4aaa8f85f42fc6fbedc5282cfc107ff047936aa731a973605f5500b56b62d5b580a00e9f2be2aa9a259287291641ca4b4d60c51ca9
DIST pyopencl-2020.3.1.tar.gz 357422 BLAKE2B de9cb6408e957e30f54797ce682ed17f3272dc82019bcd9a744a0696a7e344f47645a3549332da90e0bcc442f7a8ea9c6a12a375875a9728fa9814ca9d1a9b30 SHA512 459d6f060f4203e83276c47bf832f33fc4348dd59904ea55fe2a53684cb7c8eaad45875476d10dcb6653820f9cb1f7e013c6b854410b2040b2dfe847fc1f7658
-EBUILD pyopencl-2020.2.2.ebuild 1457 BLAKE2B b899057e68131fe0bfb4a5848f520cf557da23aa07fec39aa9bab4113696232d8152ff2f1704ffc523a0eec90f0d01f56a9dda52cabb1996bc177cfdba988c29 SHA512 2c69164b3057ca058b73c07741a111fb3583adf8928abcef98cb876514c528df594a4affde55ffae66bb4c0a2fbbdd5df972abef99ecd0517f8141e9b81edd70
-EBUILD pyopencl-2020.3.1.ebuild 1459 BLAKE2B cb43e4cddf56b1fe1fd8e5b1896758a8dba57ea16bfe147329932c2a5f407accaa1bb3bb3f49e5d742a76c6cf852d2ca8a494bd5268cdc94643e4943e4e6ae1a SHA512 9799573e15cb4f3f7ccd3dbc364c720a2e70f99ab51f8c40c5e321b5bc567de0e07229ff8d0f4f4a37465a8fc5ceac1ec501551182658de119cd1bb9e0c3789a
+EBUILD pyopencl-2020.3.1.ebuild 1458 BLAKE2B 813176a34b1b1d3110bcd6535e9a9036bc62b720c7b24926e791437ac1ae9cfc5e08705632a1ce059f2ee9e7d7917d0b0d22310200d90967e734202e8f2f2abf SHA512 f163387b2fe9a65dd52b94c5d5f2c12c4a105cbfc47f5d4c2bbf3327668f0bd646ee0af37e737fbb862f278d0e239e503d29992fd9ca44bf87a23c0d743cb2f4
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
deleted file mode 100644
index 862f4155cff8..000000000000
--- a/dev-python/pyopencl/pyopencl-2020.2.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 2bc9b99b4716..2c8ad069433b 100644
--- a/dev-python/pyopencl/pyopencl-2020.3.1.ebuild
+++ b/dev-python/pyopencl/pyopencl-2020.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -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/pyopenssl/Manifest b/dev-python/pyopenssl/Manifest
index cade441e84d8..54c8f4807991 100644
--- a/dev-python/pyopenssl/Manifest
+++ b/dev-python/pyopenssl/Manifest
@@ -4,5 +4,5 @@ DIST pyOpenSSL-20.0.0.tar.gz 173786 BLAKE2B 3fb1e90e20b3e083fc93f6dc8a54fb54e15c
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 1444 BLAKE2B 9cc9a4833c30ab6db4851227c0ae3ec32c24cf872e7e37155ac12a0e18bfda9a24d7ac0d7e526c0bfcae99b3627abdd5a456a6782fd9e5f8086996021c8fda3d SHA512 0b8ca22e06b69782eb7c7e6bc1f9f9a6efd5b3072971a9f447c5ed15b92442e4cc7f71e0ba888b4fe32de7c878cc8fa3115a04c8d0b88f6466ed1f903c55c2e1
-EBUILD pyopenssl-20.0.1.ebuild 1342 BLAKE2B 3e8c84504b21ebcc68baa0af86f11e535d146bc22e695d85f32d53235c787daa503ba7e11360647167174ceb0b414985f3a31c03c263daa6987a31db5917682b SHA512 d16083c4c262e97f7458ce1bcf9396ad5956bdd67cfae7b35961bd1e616528ad58a4d7827b81545b1e588d530016bdc9aad59760a2ce5c27e8c4d201c94a2d52
+EBUILD pyopenssl-20.0.1.ebuild 1338 BLAKE2B 15505776ea6e12c100398982ff75c4489b68577f52de8df54639cc0a035d2230c13e74173a93bbfa807ad4ca87f72fb6ab65214103ab0196b438ee402499e1f8 SHA512 d72de62730b416167a535235f6c8a2ffe19cfd0cad880c41e31e3903664cf0f063cecb358c1f3159d5bcec8b95331097ca24508090354fc7f5107638800a0b20
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
index a2cdef92deec..05155611d1be 100644
--- a/dev-python/pyopenssl/pyopenssl-20.0.1.ebuild
+++ b/dev-python/pyopenssl/pyopenssl-20.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -22,7 +22,7 @@ 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"
+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}]
diff --git a/dev-python/pytest-cov/Manifest b/dev-python/pytest-cov/Manifest
index b8a8c32faa26..a194182ba80e 100644
--- a/dev-python/pytest-cov/Manifest
+++ b/dev-python/pytest-cov/Manifest
@@ -2,7 +2,9 @@ AUX pytest-cov-2.8.1-disable-broken-tests.patch 763 BLAKE2B d36ec8acb8329cff8619
AUX pytest-cov-2.8.1-latest-setuptools.patch 1247 BLAKE2B 24ac573f41ea6beff690330b26900e99f7454bbc74bb868246055bbd5ed9385f7fff9e72c4222c855dcfcd06e1cab6ac322ec9c085c3b3fdbb12137f8f64455b SHA512 699c4e0e5e3f0b8b145946fa319d19be4ddd42ab7f565af875ca37df0aac222d2b0af50f13ee52f19cf01c9e799a8b7e60ccf114b59530731f820c91311b1b5a
AUX pytest-cov-2.8.1-python38.patch 2522 BLAKE2B c09196ac945cd4b00acd75e45987be12ad1c8c251b679135fce1c2356d58396bc11b986f6d65ba0b946f5008eae70dcf18ceed68ba1ea50cb39bce303e710912 SHA512 3bd1fc80cfc76bdf643ed00bb59ecee1ceaf3c838f851cd65f844a5297ea33ab514ed441a5807ce6424ac461b10b629a8b6885851cb80336c5836c5f72ca6271
DIST pytest-cov-2.10.1.tar.gz 56822 BLAKE2B 45eba205a2c6687882445d3554cedc04ad556854f5eac8eb0fab7fda84cdf2736b034dfdceb664293d1add153a5271403eb94585a863676ccfef9ab09727d165 SHA512 2dd575141754a417f34b414ba7e07291c273abdc63a6b7dc72d317c6ec10076b83c2ad78eeefdda7cee1fd6f56932d838602da4dd760a1c0d12095be94c22568
+DIST pytest-cov-2.11.0.tar.gz 59018 BLAKE2B f2ecaff439e701c3b7d029e4c51cb019d5222a083815ae5771341b0fa0f1b658f921a6eab75c0b568b630cc7ca75887f25ae7fb6fcaa9c2e8dc419397c4c799a SHA512 001f4975d7ad1a573354074366f983887ec9035bcc29afe9bd1ae2654fab520b8f479c5037936e6131749e5205077e937304e73d366cb43460db1f24a58b02be
DIST pytest-cov-2.8.1.tar.gz 47661 BLAKE2B 590fd50b69d01a71b20982d8cdbed0698ebe24c290d791bb44c96aa1aaaf77cf1f379d565eb775864c6945facf6d271115236cb44b95e4a4c9bb7cc6fd591acf SHA512 769a17c2095dbe990df148a0105c9e3dc88ac2265ac77ac31448dab6abf6d8cc0d54f5c6ff01fd708bd38700bfea93f57d3bb702bd9bb0a708257d094b2376ec
EBUILD pytest-cov-2.10.1.ebuild 1396 BLAKE2B eb6d91beeebb87a89f7af47630e53b52e663568bc711c6117beddb534d73c65652e6799ccec1de6639de9cb5018d686db5ce105bf4a3c1cd048b356699e3cbae SHA512 26fe1a217e12c41ba5a830338b0a0d525e21767d199d1cf0f60efc8497094a42007aa435e02dffbafd849be2139d70bb31a9fcef0a1f0667394c447718a65702
+EBUILD pytest-cov-2.11.0.ebuild 1285 BLAKE2B 49e15b8d30865c76ef41d328bd2049c915ee17551d89e844491aecd3d8f1fccf218f7645c3e75f3f10ca19bd353594cea15561e855faa590e3de05e450a8a1bb SHA512 8dae610239503d4c7f711572889808a07cfffb3e7f66027d38b0c07864a398953082561f564ed0f62d1840eaf6dd3b468a86eb1a31b0ccc26e9b4a8d26b1a068
EBUILD pytest-cov-2.8.1.ebuild 1381 BLAKE2B d94212fb13d2e1ab3f1f79c2a6025d64f6f514ae9bc7703dfb3359b5f47a560bbfcf2821055578a28c16e41db98c05d4ca0b5e9def8eab5a499cd3904d617dbb SHA512 40ea68bfc2c03f70161d08e367abd29a86e173504511d1e53e53d31f5aa4718a59ae32db3d0d5337349bf14bcf3db2f79952f07bd36048394d724fea087763db
-MISC metadata.xml 476 BLAKE2B be2e8759e98061a26e63e9431f2d62f5d66dcad8d1e82c88c53bbcf129511a3e443cb0332ee27ad450740b719d164d4feb3f6e176e3541a58cecd34dea96d9a7 SHA512 380f75130a29a9b4408eba5d9dce8e6a2bae7ed25fe337ca1f7ec99e941f06063ea088a71b3c1c5fd3e0b617fec676dc52e4f76b8b270485aef7993969712e3e
+MISC metadata.xml 411 BLAKE2B 5ecf37fefd3ba802d31a3f7e10a58fb7391d213164cca73117a5723b174b66e29574ef694960af9346df13667e6c203c309e8372086ddd481eca1eda7f843926 SHA512 ffb291dfaa0724a05a65152d6e1d1fcffed59bf260e07e216fb8e097fef0c3aeec320fd75a7c45ffefdd39c1c0e6a50e196a4cea99654fc3e5d768fd3a81dd99
diff --git a/dev-python/pytest-cov/metadata.xml b/dev-python/pytest-cov/metadata.xml
index 406193f56966..2b08bf4d2293 100644
--- a/dev-python/pytest-cov/metadata.xml
+++ b/dev-python/pytest-cov/metadata.xml
@@ -8,7 +8,6 @@
pytest-cov
- memedough/pytest-cov
pytest-dev/pytest-cov
diff --git a/dev-python/pytest-cov/pytest-cov-2.11.0.ebuild b/dev-python/pytest-cov/pytest-cov-2.11.0.ebuild
new file mode 100644
index 000000000000..ae807ac41f7d
--- /dev/null
+++ b/dev-python/pytest-cov/pytest-cov-2.11.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="py.test plugin for coverage reporting"
+HOMEPAGE="https://github.com/pytest-dev/pytest-cov https://pypi.org/project/pytest-cov/"
+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"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ >=dev-python/py-1.4.22[${PYTHON_USEDEP}]
+ >=dev-python/pytest-3.6[${PYTHON_USEDEP}]
+ >=dev-python/coverage-4.4[${PYTHON_USEDEP}]
+"
+# TODO: figure out how to make tests work without pytest-cov installed
+# first
+BDEPEND="
+ test? (
+ ~dev-python/pytest-cov-${PV}[${PYTHON_USEDEP}]
+ dev-python/virtualenv[${PYTHON_USEDEP}]
+ dev-python/fields[${PYTHON_USEDEP}]
+ >=dev-python/process-tests-2.0.2[${PYTHON_USEDEP}]
+ dev-python/pytest-xdist[${PYTHON_USEDEP}]
+ )
+"
+
+distutils_enable_sphinx docs \
+ dev-python/sphinx-py3doc-enhanced-theme
+
+python_test() {
+ local deselect=(
+ # attempts to install packages via pip (network)
+ tests/test_pytest_cov.py::test_dist_missing_data
+ )
+
+ pytest -vv ${deselect[@]/#/--deselect } || die "Tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/pytest-django/Manifest b/dev-python/pytest-django/Manifest
index de2218d76a38..35d83b8f2dbd 100644
--- a/dev-python/pytest-django/Manifest
+++ b/dev-python/pytest-django/Manifest
@@ -1,3 +1,3 @@
DIST pytest-django-4.1.0.gh.tar.gz 67983 BLAKE2B b7f4fe1366ce1443b19f05e8e834f0555cd8d63bf10921be1427338b7e5e737b7e04d96c9c9d2ad1b9c0f0ed6fba4ed93fb4fd9a948dc5315b4b7a35ba8adfd1 SHA512 734921f5c6f8569f6488706fbb6ca2515a5b24c6641fd260771022bd4fd72b65d062a8130f59163e8b30f4c9bceb383d154b26f8fbf46a1903339668d0a7d12b
-EBUILD pytest-django-4.1.0.ebuild 810 BLAKE2B 894aa8044ebf66bbdf23f38165776b02ab5f2c8a833aa1efcfa991db63ea7050146a5f9720d47c58fb845b3706ad33600bad10bc129903cb79297e35dee780ba SHA512 f9cfeb140f1aff332d49e37f4ae53fa4f9b2eb4bedd88846bf9d19ac326d0ee56a8ee636ecd41f582bbb0a01ab3dbd0df85e752c8f0f450597997e367ad5c1b4
+EBUILD pytest-django-4.1.0.ebuild 817 BLAKE2B f67f65cc303187827420646d5328142ce4a5e20a8b08e09432c04c87fe712488fff146f8cdd2573104187d531314b41981ef4be59fccbe3d6df796b1b7b1a2c7 SHA512 3d6adb7b9bd3c66c5b40f87d836768ed0046d2de861f2ddb6599b73072e6c282f06d41dd2b8c5fafbaace200893bdf11d26ddf5aca5c03ed4f83a4b648afc308
MISC metadata.xml 404 BLAKE2B 24556c59793b77f5c6de6f5c1210575d7bf7b5dc55aa7427d630d21311a77b31e3c846d5198ebf9b0407a0b1a36eae17bbd37a988c376eda666680871de30ea6 SHA512 33db1ea8ab6490e9b09daf334f48aa8db16db565e264b47b120797aee63c08c99aa27cae3c0a55a21c87552f99ad1ba9a13ba3b53e4562608209efb87a227268
diff --git a/dev-python/pytest-django/pytest-django-4.1.0.ebuild b/dev-python/pytest-django/pytest-django-4.1.0.ebuild
index 2104afe6bdda..6c9df3af515d 100644
--- a/dev-python/pytest-django/pytest-django-4.1.0.ebuild
+++ b/dev-python/pytest-django/pytest-django-4.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -17,7 +17,7 @@ SRC_URI="
-> ${P}.gh.tar.gz"
LICENSE="BSD"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
SLOT="0"
RDEPEND="
diff --git a/dev-python/pytest-mock/Manifest b/dev-python/pytest-mock/Manifest
index 0d3ab29f8bcc..8de55055cb92 100644
--- a/dev-python/pytest-mock/Manifest
+++ b/dev-python/pytest-mock/Manifest
@@ -1,9 +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
-DIST pytest-mock-3.5.0.tar.gz 28903 BLAKE2B 39490d30546ad7419a16309a60cc7a3d8090cb38c11ca89d41034264147501fcd1ca52b26d391425df043b7234a0dc0b1255b973f93c8f40898a19d364df2e77 SHA512 ca85c49144a2dba83b4e3c5cfc5a82ddb631429271a4b87af686ba738f8137fe87db22121e4c04d04038c0bc786a555e882bfea21d667d1ed9f67c21b208d4ce
DIST pytest-mock-3.5.1.tar.gz 29135 BLAKE2B f9eb37bff0965772919c359ad56a0cdd0cac24fa763685c42ffaa2dfaea183a9c0be480269cbfc80990baaf406021c541b6dccc09602e98c8f731bbd530e928a SHA512 28ab2f239d3dfee134dd4e4fd467109cf3c76cb60aeb537dbc0c21b9a7619d068d54737e33d98c585e9341588fdafba4737ea5f428af37796f55e61ec30373a7
-EBUILD pytest-mock-3.3.1.ebuild 955 BLAKE2B 3206260037284cdc8f2d6b7c521a58225c149e99d97475087bf39170bf26b75c69ce0f683b6e564d779f342463a7afd9f697579207688ec336399ca546e18a4d SHA512 a1648c76ad6e4e4cbcf89b221adab82d51089d0dae49358456907c5a8980bd3106cba2b7e0aec344e166334534c5732653204fa1c047ad060729a9868933ed26
-EBUILD pytest-mock-3.4.0.ebuild 963 BLAKE2B 97ad64c97530064e3957ceb7ef7642e76c9c98384e056db8889488e11c9f4f5c9cbeb52a9575aec6934850ef73432a8d1a503fae2ec9b0b96cdd388e3afeb8aa SHA512 9d80293fc9109c11c89a02e78b8fd3d32089ff6086a9cf1fc4920fcc87d52acc23aef64875ccff76c373f13b1a3e646ef7393c238008277b3132a444d485b7cf
-EBUILD pytest-mock-3.5.0.ebuild 963 BLAKE2B e24095c69f723392adc6f18a69f329cabb8e4b07d3f5168c273b3a71fabd6945de2b2cc8aca55c7bd76a73c31b7e43c0a5ba9f5ef39805b3e6da00c28493c0a3 SHA512 8abc312f9b975075bb1eb6953ee7046281b8d70acefbbd3c7b341eed5898bc8c22a7c3af6125c2e048ecbee528c7afee96bdce9061a1090db866b3cea8334b19
+EBUILD pytest-mock-3.4.0.ebuild 955 BLAKE2B 2fb63999ee7d8980209b07f4327dc4c1a75323045715dbbf00075969e69a10a9ded621f44ed18a21a4c68c76185b574ac94348e8d20de2f7195d52e44b7f575b SHA512 2cc14ebffc9670e7c3909f51ffc8926458971e10ff29c60865838b01c7c93e1420f5a1daf6ad3ae65aec1a501835acdd894c1cec1982dc0e4462a8c7fc6ddcbe
EBUILD pytest-mock-3.5.1.ebuild 963 BLAKE2B e24095c69f723392adc6f18a69f329cabb8e4b07d3f5168c273b3a71fabd6945de2b2cc8aca55c7bd76a73c31b7e43c0a5ba9f5ef39805b3e6da00c28493c0a3 SHA512 8abc312f9b975075bb1eb6953ee7046281b8d70acefbbd3c7b341eed5898bc8c22a7c3af6125c2e048ecbee528c7afee96bdce9061a1090db866b3cea8334b19
MISC metadata.xml 457 BLAKE2B 9ec62ff0eda60ae60bb1b63509ecc696ae4256d1b3ff00c9b7f834ffd735f87edef57ccbfb78a2f9002632c4287b581a8a81003c45601b314059675a8f2d288d SHA512 0defca8aefe2c6bb95d36112b14645d93c8bc5b8db08956b97b9a42cf4a7e1d97170068937e6ec818e43d4d6afd7ef414e1d5d7f4b72bae71291eeda9caf5c1a
diff --git a/dev-python/pytest-mock/pytest-mock-3.3.1.ebuild b/dev-python/pytest-mock/pytest-mock-3.3.1.ebuild
deleted file mode 100644
index 48dd889e97f3..000000000000
--- a/dev-python/pytest-mock/pytest-mock-3.3.1.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=( 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-mock/pytest-mock-3.4.0.ebuild b/dev-python/pytest-mock/pytest-mock-3.4.0.ebuild
index dc04d9251c5b..f0b059648691 100644
--- a/dev-python/pytest-mock/pytest-mock-3.4.0.ebuild
+++ b/dev-python/pytest-mock/pytest-mock-3.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -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 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos"
IUSE=""
RDEPEND=">=dev-python/pytest-5[${PYTHON_USEDEP}]"
diff --git a/dev-python/pytest-mock/pytest-mock-3.5.0.ebuild b/dev-python/pytest-mock/pytest-mock-3.5.0.ebuild
deleted file mode 100644
index 8f3aa84f0a71..000000000000
--- a/dev-python/pytest-mock/pytest-mock-3.5.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2021 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 6b9d53487207..dbd68ff3808e 100644
--- a/dev-python/pytest-regressions/Manifest
+++ b/dev-python/pytest-regressions/Manifest
@@ -1,5 +1,3 @@
-DIST pytest-regressions-2.0.2.tar.gz 78362 BLAKE2B 67c37c49230d5b84869b0743ef5e4c6b83cc7869ab12832cef9ac4a09c7199d141e064809e6532e325c3b4b22385468ecdde3ea0a021523930c849b78e4bd8f7 SHA512 8c9959a9d84fb6c055b90b38ad6aabdf8e9459931ca50c959f395280199aaa707844330d26b33467119e77f3d50a51d76dd648fdb351de9228c8d54dc047c92e
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
+EBUILD pytest-regressions-2.1.1.ebuild 1058 BLAKE2B 1716a67041a5d634defff5a2e16fcc4e21026ede4d6f91937f2a9c48ccb2c643f46455ed40a8660a443a82fe74ad3d494769da9750b85c4d66794af71b0ea0c8 SHA512 99ff85f74ee2009006e09a7a97a3e5de655682b7944bc0d1a9f5fa18c87a74bd515575884950533b91138f99f388f660aee4a6a590b55997ce8f3441198cf143
MISC metadata.xml 480 BLAKE2B e6c6ac7fcdf6df37deb29f3551fac8fef3a9282ceae658aea4d80fcc7950e34805b7b3f77b87a9231c4b251e58f4076ef150b9e49744058ef298cb2278f5f2b0 SHA512 2659af13e07c58c86cf62f78f7196a92553411cdb1876e234d2a166a973ad49ab0c0d57df5d32e291d0d49e44dc9ce82b7dc2ae3f5ae24553524906151794d3a
diff --git a/dev-python/pytest-regressions/pytest-regressions-2.0.2.ebuild b/dev-python/pytest-regressions/pytest-regressions-2.0.2.ebuild
deleted file mode 100644
index d8ea832714cd..000000000000
--- a/dev-python/pytest-regressions/pytest-regressions-2.0.2.ebuild
+++ /dev/null
@@ -1,33 +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} )
-
-inherit distutils-r1
-
-DESCRIPTION="Easy to use fixtures to write regression tests"
-HOMEPAGE="https://github.com/ESSS/pytest-regressions"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-BDEPEND="test? (
- dev-python/matplotlib[${PYTHON_USEDEP}]
- dev-python/numpy[${PYTHON_USEDEP}]
- dev-python/pandas[${PYTHON_USEDEP}]
- dev-python/pillow[${PYTHON_USEDEP}]
- dev-python/tox[${PYTHON_USEDEP}]
-)"
-
-RDEPEND="
- dev-python/pytest[${PYTHON_USEDEP}]
- dev-python/pytest-datadir[${PYTHON_USEDEP}]
- dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests --install pytest
-distutils_enable_sphinx doc dev-python/sphinx_rtd_theme
diff --git a/dev-python/pytest-regressions/pytest-regressions-2.1.1.ebuild b/dev-python/pytest-regressions/pytest-regressions-2.1.1.ebuild
index a0b17c024ef0..079a26b29eef 100644
--- a/dev-python/pytest-regressions/pytest-regressions-2.1.1.ebuild
+++ b/dev-python/pytest-regressions/pytest-regressions-2.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -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}]
diff --git a/dev-python/pytest-xdist/Manifest b/dev-python/pytest-xdist/Manifest
index 102c7245e875..c857c12615c0 100644
--- a/dev-python/pytest-xdist/Manifest
+++ b/dev-python/pytest-xdist/Manifest
@@ -1,10 +1,8 @@
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-r1.ebuild 927 BLAKE2B a77208de373f965e3719d00b21ff639b3a6af406286059802bd668a39aab99ff31e0fdbfba55c0daf7c3e611ae5b7fe31cb8fc0c8abfe03f0e1d3130f3d9ab9b SHA512 8c113df2b5c3f999eb19fbf8f0e03c5580dcea60a6e3125a1464c0f79a3d799452654a6075ecd2fec85249880977ac431dc050b6b20e637e70760eea70272e30
-EBUILD pytest-xdist-2.2.0.ebuild 917 BLAKE2B c19d098863698507d64abf3724e0de9e411ed797f30e75d3d3e6be0c087830c1d54305b04d2e6e15175fecc25020a26957f7472203d33303619d1e4bfd39a4c2 SHA512 2af3e8f5fae4fc3a1a8b9ab51c7ac9f9fe1d7a4e05b9f6e03d1a9f067e840c1d18d551f13b192e041566d4b05a82318735be746eaff728bf0c2ca76b85d2e8b3
+EBUILD pytest-xdist-2.2.0.ebuild 909 BLAKE2B 71de738c264f36d0319b81c9e38e2e5f36ff7fe98e04c8772420a362857170502a2e2b300d8820c9d035348228ac7ef8058d5377779772c3a4a42bc27ec07dbe SHA512 7ac0f3f725beb38ebef7264faf7260b2036262a6d4201d8c4a96d742ada0648e71666e8556757858551664bc24ac255b124e17c23cf8e67ee650d81010c46276
MISC metadata.xml 402 BLAKE2B 9e24660b4146f94ecdf375e3bd89a9ab01157ab7c7e9b37fa183eaad12edfbb6574ecef4a98e6079b3dd81e6614b5eb23b0bfd69c9468abde7bbc073e8ef44b4 SHA512 7fbab209b81bba0684b9dad109dc7ba64f9c496e5ad69fcbc659f9361aa131f6779a5419a54112b4ff1c2a63a9deef5f36791551165b1b4b7219c7a00fe93060
diff --git a/dev-python/pytest-xdist/pytest-xdist-2.1.0.ebuild b/dev-python/pytest-xdist/pytest-xdist-2.1.0.ebuild
deleted file mode 100644
index 27e096bc9919..000000000000
--- a/dev-python/pytest-xdist/pytest-xdist-2.1.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,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}]
- )
-"
-
-distutils_enable_tests pytest
-
-python_test() {
- distutils_install_for_testing --via-root
- # Skip a broken test
- # https://github.com/pytest-dev/pytest-xdist/issues/601
- pytest -vv testing --deselect \
- testing/acceptance_test.py::TestWarnings::test_warning_captured_deprecated_in_pytest_6 \
- || die "Tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/pytest-xdist/pytest-xdist-2.2.0.ebuild b/dev-python/pytest-xdist/pytest-xdist-2.2.0.ebuild
index 7cb664b2df30..27b5fdcaf987 100644
--- a/dev-python/pytest-xdist/pytest-xdist-2.2.0.ebuild
+++ b/dev-python/pytest-xdist/pytest-xdist-2.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -13,7 +13,7 @@ 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"
+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="
diff --git a/dev-python/python-backoff/Manifest b/dev-python/python-backoff/Manifest
index a8a1c8ea756c..3a6ec0ca4e0d 100644
--- a/dev-python/python-backoff/Manifest
+++ b/dev-python/python-backoff/Manifest
@@ -1,3 +1,5 @@
+DIST backoff-1.10.0.tar.gz 13652 BLAKE2B 15b9381fc83cce4559c3402cb214d8cf41651a1a72f7231a61a576e9a48ca7a4367b7823043c6540bd15d3d2b8c185be3ec3533bbc61d5f2dcebefaab013945b SHA512 87f64612ec1d6f80d2f173846af196bd347f1fcc6c6f93275dd1cb3b5486789f3c6e98e1080ed6f3b13e28c1b056fb1baa6da73639d4b9b460fedf68bb012422
DIST backoff-1.6.0.tar.gz 10474 BLAKE2B 64e4b4a9cb8a1ac5a888aae78f50111400bb57f46bb0c123ecfeb4d660393a9786945d83b838599479e70244f2aa9b667428be2f0d57958b084ed8a045d0ea7d SHA512 a9bb5477d8a84397df61bd3904ad0914c5b214e46da9b55a2286ca8a81508184483e99a6703551dfcd1147e3e656396171ab7133f9e0cf2bff1bc17e6da49444
-EBUILD python-backoff-1.6.0.ebuild 564 BLAKE2B 3e1a30af5d6d59c74a2c64514bf8aee407bd508f1678a6333ca4f508bb4836966efb589cf8195ca5b52d37e1dbdd83f26a25d9dff3014cda3f538564247181e2 SHA512 57844e80c253dfc9a1ac61eca3bf7310601cfd96d3dcce84ebb3d67f847ba770a7c60542c87c1a45ab820052b8ebc11283fa83e1aea26320c8f7122e3324d9ba
+EBUILD python-backoff-1.10.0.ebuild 569 BLAKE2B 815a9e0622a1d164bd9aad9ad0ed36aabf0f9a7684ed6d678d026a1d255aff2fbd420b559198c9bbdf35a67a9d892553d09f553b478df0ae2d95a5e8bee4c3f9 SHA512 94d6345ac2ecb536fd66161364c14e411475f964e6af321f2bd25c31a48cddfb38e9afa2dbb81bd0ae55652174380dad18ecb7a0a0e3d8be015c6c87e433b108
+EBUILD python-backoff-1.6.0.ebuild 566 BLAKE2B 14570f43d28f8ad858319496aa9221634d8ac963173d7a4707cccb4a85c665ec7db6a9e018b04ab0160e908d1d3811a8664f4f0095bbf09675a2ac631f5e636e SHA512 63e615ca8ac992b377f4a5f9ab77cb2bc281d1fe83218776feef05dbb72fa9f4591643be6674b71b1be053850b914c2825ca351c36f64710994e5e9b80e06040
MISC metadata.xml 340 BLAKE2B a920195ff15b57c43e2ada5474cec497fa16c1914dea631b88c5e84942c5dd7a5d22d80dd2a162dc347153563274fe5e25d34dca0a9f0a3d22e12b0057e8ef22 SHA512 7dff40ae5c42b76769febb0b76b7e44b605daf77c0bd4cb1446e2e7f3414a6a539dc24a523970e90ef9695ec87982f12ccdde4f63c625895667d4880e27933e8
diff --git a/dev-python/python-backoff/python-backoff-1.10.0.ebuild b/dev-python/python-backoff/python-backoff-1.10.0.ebuild
new file mode 100644
index 000000000000..29639f91e18c
--- /dev/null
+++ b/dev-python/python-backoff/python-backoff-1.10.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2021 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=no
+
+inherit distutils-r1
+
+MY_PN=${PN#python-}
+MY_P=${MY_PN}-${PV}
+DESCRIPTION="Function decoration for backoff and retry"
+HOMEPAGE="https://github.com/litl/backoff https://pypi.org/project/backoff/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+RESTRICT="test"
+S=${WORKDIR}/${MY_P}
+
+DOCS=( README.rst )
+
+python_test() {
+ emake test
+}
diff --git a/dev-python/python-backoff/python-backoff-1.6.0.ebuild b/dev-python/python-backoff/python-backoff-1.6.0.ebuild
index 07504e8a9c02..7629c20e6e9c 100644
--- a/dev-python/python-backoff/python-backoff-1.6.0.ebuild
+++ b/dev-python/python-backoff/python-backoff-1.6.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
DISTUTILS_USE_SETUPTOOLS=no
inherit distutils-r1
diff --git a/dev-python/python-bugzilla/Manifest b/dev-python/python-bugzilla/Manifest
index 8016fa680f29..e44a93a977b2 100644
--- a/dev-python/python-bugzilla/Manifest
+++ b/dev-python/python-bugzilla/Manifest
@@ -1,3 +1,3 @@
DIST python-bugzilla-3.0.2.tar.gz 115324 BLAKE2B 3f64af96bf61d16e720338055391b187f53a968488535e76a5d6e56817030fc1c45f824ed27424b3e7440dc03759e77bcb8d417fa2278aa611b995bea2775f7a SHA512 c4fb79c9ca4d813a5dd9573e9a300aa01ea713fa11d43e2ee7ca13efb4720fed14fff339e9cc1b756505f43348768f0fdaaa8ae0b370640ff70e402f852e9b1a
-EBUILD python-bugzilla-3.0.2.ebuild 679 BLAKE2B ea1a48cfcd6c80d1ead275b661866ff640f3a897d8d3cc8adf10e7af0b681a83441917a5c05e20d9c0dbdd15615624dd34ec95e19f3ca6434975ec163b4106df SHA512 c762afc66c7e1a7ceed0350172714bb5037a3ec4d1a6a3b75dfb0e01d333b24b2f8fbb1fe6e2bfdd5d28d114b19415bcfa3381800ad200ece7ef25936e0e9478
+EBUILD python-bugzilla-3.0.2.ebuild 686 BLAKE2B 7b0521dcef9e95fd5aeea0c349e8216f36926e2f2378b7827eaeb7d5ea288e5c849ec8dfdf1d7f00124c6c839c47ca0a494a09bfb1fd67961ab1cfc4b344bdf6 SHA512 6b8ae6b30ef47bfc837bb76f9e09c9eb9e8e688fdc084bba717e76cf8ea0ca9d7b9bdcffb4e9fafa81f636f4ae2d9ecf32691d6d8368e48e5fa51fec8a55d91b
MISC metadata.xml 661 BLAKE2B 71e2d61d2c3f6f68dc260f2849bcc6cc444bd1eae0ed95e0e5312ea6b362e7de644bc18573d83bde770511174f42b79d04478c8a0ab49622e66deb4d06059535 SHA512 0b31da040d6c68a84d20c171f614fecee1ebc2a01be1c6fc5480774d9ba4e47c7d8dbcb2b58ff8e2dcd56bf96a8e9b6181960173ede6e73bc9eb2355f2945ca3
diff --git a/dev-python/python-bugzilla/python-bugzilla-3.0.2.ebuild b/dev-python/python-bugzilla/python-bugzilla-3.0.2.ebuild
index 3a1e491a2fec..fcb4d29b7df2 100644
--- a/dev-python/python-bugzilla/python-bugzilla-3.0.2.ebuild
+++ b/dev-python/python-bugzilla/python-bugzilla-3.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -12,7 +12,7 @@ DESCRIPTION="A python module for interacting with Bugzilla over XMLRPC"
HOMEPAGE="https://github.com/python-bugzilla/python-bugzilla"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~sparc x86"
LICENSE="GPL-2+"
SLOT="0"
diff --git a/dev-python/python-language-server/Manifest b/dev-python/python-language-server/Manifest
index e6abc11a85b2..e623ab6fa7be 100644
--- a/dev-python/python-language-server/Manifest
+++ b/dev-python/python-language-server/Manifest
@@ -1,5 +1,3 @@
-DIST python-language-server-0.36.1.tar.gz 74524 BLAKE2B 3337bf4c91204302b26b2496bc79ae6e0c18143f89ef97861dd91760b27406eba8fc9895a2f00c5c2de3a990eeb8ba29ba10319262466a42b1fb362af809060f SHA512 4a8150cf1334e9b2085e9b4ca7165404f30127339bd0fe8db229924c67933bfcd7827a875136b1694a82d4f447255862df116bc6d74a51df8e1ed82a6875914b
DIST python-language-server-0.36.2.tar.gz 74499 BLAKE2B 0bf950e236f8f898c3158afc2b3355948340639b607f474654b0334d484170a210b6e81c7508f12368223ae9915ccf19f76a1bcde41503230d8c008ba0818b47 SHA512 ee909d9332ef76c616d727ebfa36e80fd03ab57df8fc57265de21f0105cc0b64a518b2a8a582f88364d03a7d2a66e1030bcf5b3452ad3a891a3141da9b338373
-EBUILD python-language-server-0.36.1.ebuild 2443 BLAKE2B c82ec3e91e366639451bda6774bdc6589b5eaed525d392e10f08c194a33bd687cabe878ff31faba80fe4bcf297f1818082090fd73bbd728a2cb819433e7b8f4d SHA512 d4d6b63f985d552d68974e8509c4a16715ea752524ab12c95b92a3036ffedb813eb8ae185bc764c01a99c802f1643696f22a12d3f8c6528d2eb4e7e69cdceeac
-EBUILD python-language-server-0.36.2.ebuild 2444 BLAKE2B fb960ed5cb8530f1c1dfd716e617ff777a71da1be6da802695d750a662f456e3d8a313547f80ed7229f60457652a686001d6e323f2c80f5432a63c88a975d326 SHA512 bbe8f8d58acb509b0859aed43b285eadd8f54b262241a5ce4b55c6fc34b5155d214604c2d91b170698a9742e27154bbd3ccd2b2d3736de87ddbd5d9e19f6d72f
-MISC metadata.xml 460 BLAKE2B f8024f798dd5825225570df7851186a542dcff8530c85b10a95b8caaaea6f045a0a5093a71d588a1d04239387f0c079f1e8ce8c388fbedc5062569dda024a651 SHA512 f7a2a7720c9b600dc8150e7cb77e5db7514b3e991614b456af2ca0f7269d31caeba69137a5a4583cc892ea66cc62e4ea8de7fc0d8844144aed081d0cf53f72fc
+EBUILD python-language-server-0.36.2.ebuild 2442 BLAKE2B d61537a5a1132ea6ff586fcb534f770776a6f6872a711fa743745ab703bfe08b5569b8dac52c0fbf9dff86a2f11a241c10ba57eb8829aed7ca3ec89343a6639c SHA512 9a50540cc100d5ddd97e59c5dc677227fc8252247785e703fd3f530b195554fa9ebff32f2f7af7c6174dc7d00646561c262631e9b519d42dbf1a417618f13c6e
+MISC metadata.xml 484 BLAKE2B 2f8a311932b3cae28a62cf8aeb9488a3a5c96435760468c538355cf859f66675043f2be9f417bd6996325046c40c2dc9793e75c51389e3ae25f374c86d27ca84 SHA512 3695d28540296a6e2add93223bccce5ea3f4f5d1b607ee8139ae5eb3ea065eca70e61f89b38a927f20683b5a25884e568265fbc8ac007012838263e82e375b76
diff --git a/dev-python/python-language-server/metadata.xml b/dev-python/python-language-server/metadata.xml
index b9fcdf3f618a..3e115bfb71c6 100644
--- a/dev-python/python-language-server/metadata.xml
+++ b/dev-python/python-language-server/metadata.xml
@@ -9,6 +9,7 @@
proxy-maint@gentoo.org
Proxy Maintainers
+
python-language-server
diff --git a/dev-python/python-language-server/python-language-server-0.36.1.ebuild b/dev-python/python-language-server/python-language-server-0.36.1.ebuild
deleted file mode 100644
index 7a34f6296f50..000000000000
--- a/dev-python/python-language-server/python-language-server-0.36.1.ebuild
+++ /dev/null
@@ -1,70 +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} )
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1 optfeature
-
-DESCRIPTION="An implementation of the Language Server Protocol for Python"
-HOMEPAGE="https://github.com/palantir/python-language-server"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-
-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.2[${PYTHON_USEDEP}]
- =dev-python/python-jsonrpc-server-0.4.0[${PYTHON_USEDEP}]
- >=dev-python/ujson-3[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
- # remove pytest-cov dep
- sed -i -e '0,/addopts/I!d' setup.cfg || die
-
- distutils-r1_python_prepare_all
-}
-
-pkg_postinst() {
- elog "To get additional features, optional runtime dependencies may be installed:"
- optfeature "Automatically formats Python code to conform to the PEP 8 style guide" dev-python/autopep8
- optfeature "A wrapper around PyFlakes, pep8 & mccabe" dev-python/flake8
- optfeature "flake8 plugin: McCabe complexity checker" dev-python/mccabe
- optfeature "Python style guide checker (fka pep8)" dev-python/pycodestyle
- optfeature "Python docstring style checker" dev-python/pydocstyle
- optfeature "Passive checker for Python programs" dev-python/pyflakes
- optfeature "Python code static checker" dev-python/pylint
- optfeature "Python refactoring library" dev-python/rope
- optfeature "A formatter for Python files" dev-python/yapf
-}
diff --git a/dev-python/python-language-server/python-language-server-0.36.2.ebuild b/dev-python/python-language-server/python-language-server-0.36.2.ebuild
index a7b107e23691..66b2b7273e9b 100644
--- a/dev-python/python-language-server/python-language-server-0.36.2.ebuild
+++ b/dev-python/python-language-server/python-language-server-0.36.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
BDEPEND="dev-python/versioneer[${PYTHON_USEDEP}]
test? (
diff --git a/dev-python/python-levenshtein/Manifest b/dev-python/python-levenshtein/Manifest
index d6797f5af3a8..2d45b92250ca 100644
--- a/dev-python/python-levenshtein/Manifest
+++ b/dev-python/python-levenshtein/Manifest
@@ -1,3 +1,5 @@
DIST python-Levenshtein-0.12.0.tar.gz 48617 BLAKE2B 67a720f2a76152b008bce86405b4f15f14f203e55c09931f83624c85199626582dcbc255ace914e103e7cd459c8570b0ea0c0d69abfd2c314aa488cb235583a4 SHA512 95df064490970618b003bccbef9071b1a2a3ee4645ac8e851f4205bd4e8123d21ee0ee733adfeec79085faa01ba39902e2a4a26bfb21b70678377579157df4a5
+DIST python-Levenshtein-0.12.1.tar.gz 50567 BLAKE2B 795c377a29045caecee245b23138ef5499691177e2d50f1729f3145c667818b34a2c05e86e5fe8317357570347e7b21188fb64a84e85cb9645513e19f1438509 SHA512 e5b9dfda4ebe1f1111e2ac86219be5659a763368759d13393bd32c6c5d78d9b183c757c7e8ff1bd8a2f73450f0a255cc78664f03d899e1e5af2e58d871843722
EBUILD python-levenshtein-0.12.0.ebuild 637 BLAKE2B b91b7c517dda6a143cd9344c935148043518acad62f4b60f74900c0cc022f674de32968be119042eb97981ba683d53171b544245bc5957b83848ef806d3b25a9 SHA512 d48a001d680f11f7f08d79c1b538353c42aa81be5e6e322b4e02eb854c095c72ca41fa07d16b2797babd2a46f82524e1506c1b6979003c089ebad1576cafe76d
+EBUILD python-levenshtein-0.12.1.ebuild 640 BLAKE2B 2cbc0ed4ab586a5094fe462f0ea72a68e54bc4e989ca59b4d615c03a9335b21304dc40f83834417352a37014bf9b6cc715917eeccb5f1a2048a165ed778090c9 SHA512 9d13c0f53ded4f81db87fa1630140abe3ec6ac78c2c494673444a417a682305f0136d3ddd248e846c0e16618fcec195bc9c7b69365f65c8df719489e4d9b705d
MISC metadata.xml 385 BLAKE2B c550a5bf9e27b3e514164ec28c311cfef21144c746e71dbb4ea8554d87cefa97c4a94ead564a557e15bda4f60cde32cfd3cb5140524a711bf57ac72e75103b82 SHA512 4314a89127d81a04635029b87baf8b9d71b931441d6e5ffd01b96fa9cf9fb5b2f1ed5c4ff2ab4f5befab2fb0ccec8890601e98ab2bcca93da548e07bb6ffbe57
diff --git a/dev-python/python-levenshtein/python-levenshtein-0.12.1.ebuild b/dev-python/python-levenshtein/python-levenshtein-0.12.1.ebuild
new file mode 100644
index 000000000000..c8322f748b58
--- /dev/null
+++ b/dev-python/python-levenshtein/python-levenshtein-0.12.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2021 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
+
+MY_PN="python-Levenshtein"
+MY_P="${MY_PN}-${PV}"
+inherit distutils-r1
+
+DESCRIPTION="Functions for fast computation of Levenshtein distance, and edit operations"
+HOMEPAGE="https://pypi.org/project/python-Levenshtein/
+ https://github.com/ztane/python-Levenshtein/"
+SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ia64 ~x86"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+S="${WORKDIR}/${MY_P}"
diff --git a/dev-python/python-socks/Manifest b/dev-python/python-socks/Manifest
index 824cc8789437..db36af9e95e3 100644
--- a/dev-python/python-socks/Manifest
+++ b/dev-python/python-socks/Manifest
@@ -1,7 +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
DIST python-socks-1.2.0.gh.tar.gz 31969 BLAKE2B f967d8100513455533132e7bb276a8f15a8486656c04493cb803640951d2cedaa0b9229386322846ff8992cfd13cf04470b017a615f33392880a4285c9ecd041 SHA512 c5db92b22ef1edef3a22b7ce79975e66f379da2bd8e9a629a15dc2995dfaef3d99d93eaf768ef593b6a7571ad580397290274e319707f36a883a9bcad20434b1
-EBUILD python-socks-1.1.0.ebuild 834 BLAKE2B 2ef14ed1bb9e5eda0a579556d7eb27d51a75598bd305de1b77d009055f5ce7a3f94aef4a414fde28df07841770fb7dca8ecbcf7a4ee4ef2581d064754cf4c1f8 SHA512 cad56c6a4f47a885a8a9d78313cd9e48486bc982382306d721552cb25079735011ded23fb90c3aed5071fb1bb674e84b393228201b4a6d820f049b861d10a8fb
-EBUILD python-socks-1.1.2.ebuild 836 BLAKE2B 839d63a9d8791d200e38302ead37571a499beba21edc9ed2352c2b91d44fa4ca1e276f2aeda59969aa97f115657bf9c8fb249d4958c8a2bdf7f329cfddb9ecee SHA512 f82da47e50181ac065b9c5f1c5c8374be60e250dd765a63962ccfb7b220d05a9a048555c8863754a13a8b06f79eb39ad04ab3187d31a042d4061ed9f8c69bd35
+EBUILD python-socks-1.1.2.ebuild 839 BLAKE2B 47a316eb8fe338d0ba0757ce493002906ba601abb62b59542862f2387710bf5f3437de335eef79e0f07b2b085a7976d8bd0551a2755674275460bc775fc3fba8 SHA512 35edf27d7fb6a78a8871d8c4850aca5bebca4df1fa9c85077c296a645826cca69aff1187345e632d7243ba528bc9dde565180ef29bbea14f17bf37f9efc7f538
EBUILD python-socks-1.2.0.ebuild 841 BLAKE2B 89dac8cacdd10aac51f4f1ab086f6f27e5fc3ef2dff96088b5e524eb29bb382689054c76351dcc976ee5440715460ea12af857a3fc21d2abe5b63acc6827d438 SHA512 e23e457a7e29001779a33a2953e2f7f4f9ca9bd172de5a0f307ec0074a7e19f4e260cc0624b3829f2aca19934215c7db1b24953ee79cc569f8029d457801ab40
-MISC metadata.xml 355 BLAKE2B 81d034921790157b24dd06af411bcb7de195e68e78d20b4671f9b28055f65c3a7d85f55da725c7540a945a95eba719e7662182424d5ea5e542eb32b38f83ef64 SHA512 bde135dafa4157a8aa39dfcbdada405b5b2109b346c2f0bd654d3c85d58b02ccbae3fc54deed0ec9fef1cc1709bda9adbf826b7c5d1011243dfdb0b3cc6513a0
+MISC metadata.xml 379 BLAKE2B 837cc3435249b88e94e6b35aeb9ff95ca1e88160f4f2352acfc353fdb0891e361d376f3278207e9bea3eca1742f634ae3dd165d9c48c3ba4a4c60df7137172a4 SHA512 9d81d94484e23f22cbeff22a0d8f19052b01c60713295d9d3aa40ecb250255dda4096588201fd0f30b2954ce81569e66de1ed0f88e6ea9545c0210259fefe3a0
diff --git a/dev-python/python-socks/metadata.xml b/dev-python/python-socks/metadata.xml
index 3880302d1883..8803a47a43f9 100644
--- a/dev-python/python-socks/metadata.xml
+++ b/dev-python/python-socks/metadata.xml
@@ -4,6 +4,7 @@
python@gentoo.org
+
python-socks
romis2012/python-socks
diff --git a/dev-python/python-socks/python-socks-1.1.0.ebuild b/dev-python/python-socks/python-socks-1.1.0.ebuild
deleted file mode 100644
index 12d2e765b096..000000000000
--- a/dev-python/python-socks/python-socks-1.1.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# 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-socks/python-socks-1.1.2.ebuild b/dev-python/python-socks/python-socks-1.1.2.ebuild
index 8efe7d9b3616..9f3777556f52 100644
--- a/dev-python/python-socks/python-socks-1.1.2.ebuild
+++ b/dev-python/python-socks/python-socks-1.1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 2020-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -16,7 +16,7 @@ SRC_URI="
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
# tests rely on connecting to Internet
RESTRICT="test"
diff --git a/dev-python/qtawesome/Manifest b/dev-python/qtawesome/Manifest
index 81b7e55615ff..de4a1c1163bd 100644
--- a/dev-python/qtawesome/Manifest
+++ b/dev-python/qtawesome/Manifest
@@ -1,5 +1,3 @@
-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
+EBUILD qtawesome-1.0.2.ebuild 775 BLAKE2B 3b79ad78a8b90f48784cc2f12c736bc6ec56cb9700a2e135c7253d756acbd50758ba2bd197aef7e46dd4a7c43436126fa5c28caff1c56a85ac4c6277646fcb64 SHA512 4f006e817a9aeaddabcd6fad05309a6797f34d9f7aa912cc8b90e97fe64063fd8d8e8e5e04ed01b55052f6d7822de0efa3476afd90cf10f24a3ac0c95172a7d1
MISC metadata.xml 932 BLAKE2B 348589aaf4ce3cc6a9df0f5dcb54a85a7493d0c0f7f2d88cde63345a92a149ac762a303f7d3b8f8820fd795276a1c94039c5c6da6aa38e57464fd19a12bb8663 SHA512 8fed0b82049cce4946b0e92e051ca928f34e9dbb8f0fcc81733d598d8b35e50b2abc17f6bc6cbd1c376fdb32544c6fbbc6eef7c695db5ca44498795fdab16549
diff --git a/dev-python/qtawesome/qtawesome-1.0.1.ebuild b/dev-python/qtawesome/qtawesome-1.0.1.ebuild
deleted file mode 100644
index 5ead22a48d25..000000000000
--- a/dev-python/qtawesome/qtawesome-1.0.1.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=( 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/qtawesome/qtawesome-1.0.2.ebuild b/dev-python/qtawesome/qtawesome-1.0.2.ebuild
index 3efa4911a2ea..135fd3162ca5 100644
--- a/dev-python/qtawesome/qtawesome-1.0.2.ebuild
+++ b/dev-python/qtawesome/qtawesome-1.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
RDEPEND="
media-fonts/fontawesome
diff --git a/dev-python/redis-py/Manifest b/dev-python/redis-py/Manifest
index a0dce20f03d1..18d1fe824049 100644
--- a/dev-python/redis-py/Manifest
+++ b/dev-python/redis-py/Manifest
@@ -1,3 +1,3 @@
DIST redis-py-3.5.3.tar.gz 141112 BLAKE2B b953d553a3cfa2d6ba6f5aa35dfaf93865acbfad0e901a96082c3b1c027dc23b6ceedde185f24e86772522fbbf4f0a4d18e115a6b40aff6a65450bbe397d5c07 SHA512 eae6ac6b3e0f1366a9c29e5e2d9a5210e4627e62e3006159b1c290f36cd9c1c2c12cafe0944f7a010e04632b517874f230aa9411491993b7ecf2080546217206
-EBUILD redis-py-3.5.3.ebuild 1723 BLAKE2B d96b22278935e59af6af816ea818f29592bcb3ae16232dd845b1d991eeb74cfb12482c8053ab7deda556d5a8d2854b89a7a9b550b9958c7cbffbdc84a1887cc3 SHA512 55588bd699a8d7836bf32f426dfcb1e7840c394f01435ec3f691ffa1f5a03bbf78ab567c9959777cd59ff03d98ecdd908fd9c2aca6fbeb1987d01acf0f3ac825
+EBUILD redis-py-3.5.3.ebuild 1730 BLAKE2B c16eab80a1864723302b941654b4415eb1c245e50b914f90c2cc0d0408e8294912f5b6c709ea734216ca1c03380ddf596b4fb67c7afaf9adb5100c9924124539 SHA512 2225b6a45e5f554910da3358f4c3408aa86d96e3ef55bd200a1ab84573701a5e068bf5fa23441d13af94624d1e4234e05e94197ed461ba88fc00b6796ca40beb
MISC metadata.xml 536 BLAKE2B e146a8713662d8d635cf9e0927223bb427cbb4f684d7b484d3c005e84a7b961f587b7e31123d27ea8be7ac7ce83890c54a670b6d1062f221bacc496229f798ab SHA512 c651a0f6dfab0e857e04ba15924937a42d74c913cc82a1d8f46a0641f6e4fe85315da1a76cb1bf3a8ba3d4a3ee6649872af221b7c1196100cde107d9454c5dd0
diff --git a/dev-python/redis-py/redis-py-3.5.3.ebuild b/dev-python/redis-py/redis-py-3.5.3.ebuild
index 38013b4188fd..d48be99f69b8 100644
--- a/dev-python/redis-py/redis-py-3.5.3.ebuild
+++ b/dev-python/redis-py/redis-py-3.5.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz -> ${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/rq/Manifest b/dev-python/rq/Manifest
index 4793210c4b39..541e805727c8 100644
--- a/dev-python/rq/Manifest
+++ b/dev-python/rq/Manifest
@@ -1,3 +1,3 @@
DIST rq-1.7.0.tar.gz 579373 BLAKE2B 835868a294478af07b9fa97fef14b0f2013abe125263efa15c4988eeaf564ee61ab2e8d68842c730a0f8b02a19a4d66f328828fb939a05b9d3b36996688192e0 SHA512 4027a8e1474cc350cf539ecf5734c2f851ef4e61bf0e106e44f359736f4f1ec4e690af97a119d12b1b7614b38ec4da286acff98b718ef604b5c367b3cc2af741
-EBUILD rq-1.7.0.ebuild 1677 BLAKE2B 09e4379d3c505cf371e987e1a48eaf91674f9192c582ff9d29b9a1ddedfff7076d698e6893f763f4bfa80ee07963a9f75dcebd05c853c392350287e2ece3e8a6 SHA512 dc188d58eb82b6550ea9d47c58cfb7016f62e97345dce00911e902bdc826b835bb234ecf9d93b403301523c712a4be8b5692fa79eb37d7e434cbc6dfb8e7bb49
+EBUILD rq-1.7.0.ebuild 1684 BLAKE2B 8dc9e6a379a86bac858e869aec8e8da72fd1f4dadaf3138bb94f64fe0617cb172ef50be71b009fc7d1bf76a4d62bb3ac64f6ec194c02560e8576a02da4e2855f SHA512 e36b6dfd5b3c4940f493896c1566a6797a77c5957a5efb7875500eb2c915f249e2c2a1a65a70a938d475c9ec661ecc9597a9d7777bdd38f12ad36e42b98b5798
MISC metadata.xml 561 BLAKE2B b0f95e81961b91a9ee8b6911f12a4ae0738dfb424b18f934a8a113dc509a31f87c69cbb22b8e049b82f847f34509b222baca3985b3873567cf7089238d6568ba SHA512 bf1c6bc1794ae0e20f6622c9bacc501bb6b0d9ddb4f1caa2de64e20b31f050a6329ecaa7baf26159f24f04a2b75798693fbb3071554d0fbbb9f8577ce8d91797
diff --git a/dev-python/rq/rq-1.7.0.ebuild b/dev-python/rq/rq-1.7.0.ebuild
index f318a1bee1e1..04fb650e3e5f 100644
--- a/dev-python/rq/rq-1.7.0.ebuild
+++ b/dev-python/rq/rq-1.7.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -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 ~sparc x86"
BDEPEND="
test? (
diff --git a/dev-python/semantic_version/Manifest b/dev-python/semantic_version/Manifest
index 77a63a3285cb..b175fff903dd 100644
--- a/dev-python/semantic_version/Manifest
+++ b/dev-python/semantic_version/Manifest
@@ -1,3 +1,3 @@
DIST semantic_version-2.8.5.tar.gz 50009 BLAKE2B 5f966ca68358d4963b3a41574c100a8f78275445285aebbfa47d1febb0b7a2eb3a638254d4d1bd8e093acbef47a101ef0a0d7a86475313aefa211d2a0a3cfc19 SHA512 2ab59024c148239d78de062ff3a357f81a33fd066b6be8b6f9ef0753841a4945829b1c11899cfbda6c3ff09e00aa3b689e1fb6f8b9a92bbb3c2a62dd713b6049
-EBUILD semantic_version-2.8.5.ebuild 613 BLAKE2B df0de34dd9d3124bcdc1b7cdeb2ec30fb5e4a1d8347b918fcbc3b0d931535fd8325aad0bdbdf00eccabf1e91f13416436d1d9ec7976713fb60042739e8744e00 SHA512 881a255a0060df0a568edccb47e6360581f6750380750e6266c5b4d61d4062cd433212843e7e4783d36cc544dc782bc08592ce24c4ca3126533a5eb5195dc63c
+EBUILD semantic_version-2.8.5.ebuild 620 BLAKE2B 78aca56219c20447cb3758b3f711f94d393cc43640dce2796e02a8664570049ad3f309aeed961f1698ec7ef2fde926c17ea13fe9c23e16101074060d78b0d00c SHA512 a9346c074be42c4415319cebbb34d56e7e207afee0396d1915ab9d579830eecb0d5d9de5c6a348fe89c0f64d90da0ee15603539b02cea012ef9f63013c160121
MISC metadata.xml 819 BLAKE2B 3b85ef79ccc81d2c8a07e28697fef8e0eac70d9711b49bb194f9708ab5d734982d09fdebfb29174d8c9b0b8fe650641a07847e844182b5f78474f94844e182e7 SHA512 214c06da33a967f4ef3f8046dd88232f3916c59f5d220458b01151fa8db83cf1af889e02b2583281ea465de756c235766153ea2d5cc3a9dc39f5ea38fc8ba4da
diff --git a/dev-python/semantic_version/semantic_version-2.8.5.ebuild b/dev-python/semantic_version/semantic_version-2.8.5.ebuild
index 06a0d4f3fb31..53524267d709 100644
--- a/dev-python/semantic_version/semantic_version-2.8.5.ebuild
+++ b/dev-python/semantic_version/semantic_version-2.8.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~sparc x86"
distutils_enable_sphinx docs \
dev-python/sphinx_rtd_theme
diff --git a/dev-python/sentry-sdk/Manifest b/dev-python/sentry-sdk/Manifest
index f25f359541f3..35dd1ab29418 100644
--- a/dev-python/sentry-sdk/Manifest
+++ b/dev-python/sentry-sdk/Manifest
@@ -1,3 +1,3 @@
DIST sentry-sdk-0.19.5.tar.gz 206164 BLAKE2B 9d7ce2a64fcb511c659188dc18bc4af18052c0f12ff5d31848f341ef20cbc6c9cf1102d17e6e8d8b741eb8000f94978f840f3ec66b43367820e0ccce97b1fd1b SHA512 082ace137656e8cc8317e70cf4fe9823ccf8cc3ed7b54af059990cede72179924a36896a31a806de4adbbf3bd66e54d5385eb630c047b929583e32c39ed69d61
-EBUILD sentry-sdk-0.19.5.ebuild 2784 BLAKE2B 79e9b1cff5731ca899c2442c514d6cad80b2d0d7fdb1821dfe4a077d4ee3e55993ad6c191d47870932b9806c9420367b1bcb0a7a915f0bf359a5a3efe98e0f33 SHA512 442776b2e8eedefc1ee43f3bec80eba921402ef5c6026ed21e137471ac2fba90dc49e281a1d41076e17f66de9cfd0b328f620aed16220cc45f0d1f3708ef6dcb
+EBUILD sentry-sdk-0.19.5.ebuild 2791 BLAKE2B 86eb8f5d799d03fdf7f5503acefdd1f41acdfd53a57942138be6fdc3ddb008a5e0cdc086dc5525e7a01ea3c83bf28e46e719ee7e9201463ee1ef6f73b20a5f8b SHA512 1a73b5c8e89d072040a75b4cd75432429a4d5995992fec6b3704cc5b207fa98e31a3bae15b27c79e735b04f71ad335a63a8a50b1771b1f124e7d898180d4b037
MISC metadata.xml 446 BLAKE2B d115ce1b9a1d92cfeb93cd220c96247f1d6ae9514b0d598a0abc9fc6b17e45851a33e6f61b364f682f6530e4ac2611fd0a65b2fb5b21d394e78030f6ef34d1fa SHA512 f7167d56812496468a0766bf6e7d29b99e5efcef8cd61723ed7b09188b515b50fa13275d665f7ff8400b5b451e05ddcec403cc4c75e55509b21b849cafde0a3e
diff --git a/dev-python/sentry-sdk/sentry-sdk-0.19.5.ebuild b/dev-python/sentry-sdk/sentry-sdk-0.19.5.ebuild
index 183f04140cbf..faec0c4dadc4 100644
--- a/dev-python/sentry-sdk/sentry-sdk-0.19.5.ebuild
+++ b/dev-python/sentry-sdk/sentry-sdk-0.19.5.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/sentry-python-${PV}"
LICENSE="PSF-2"
SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~sparc x86"
RDEPEND="
dev-python/urllib3[${PYTHON_USEDEP}]
diff --git a/dev-python/setuptools/Manifest b/dev-python/setuptools/Manifest
index 3c2a43a02ac3..a59f57d67a54 100644
--- a/dev-python/setuptools/Manifest
+++ b/dev-python/setuptools/Manifest
@@ -4,10 +4,12 @@ DIST setuptools-51.1.0.tar.gz 2050951 BLAKE2B 58890bf458ffab84f93e68393a092c2b2e
DIST setuptools-51.1.1.tar.gz 2051053 BLAKE2B 182c8c4b4d3bb8caea8cb1812aaff929d7687942d3c469a7f6e0a68a0c5d3d001be2b42d0d131171815359f2c1d59a7b997c5deab657d2ec99c369c6b27ba03f SHA512 ef08f0ecd0b4a255a8e43c2785c2a1ce76f807322c3358b7955d2ea814f9fa3f52962f7cd0431439ef9ee910fd44922d1be1888c350703031cfcab8db0f60ce7
DIST setuptools-51.1.2.tar.gz 2051107 BLAKE2B a9f1d5dac6bed7b8744f1a3f023398312f6e3696ea68a84bdb252afca3e88b8617ae632384c18cf49906b1ec97f78f467ec158cc09e1842055b5089e154e0429 SHA512 cdfdb3c3666239268ab225704d1a887f027c297262521ee8d55af547cbcef0931656997cc86f4f9a871df6028974bd90b9eea6177c02bf34f98297415b9c410f
DIST setuptools-51.3.1.tar.gz 2057167 BLAKE2B 4077e117c33c5eaad4de2bc66db0432dc14064de3f4a55e853541b09475bec81b9a07c3baec77a1574ed7912f3db2c6a83b7dcffbbe9bbffb15de13a928e6280 SHA512 5ae96ce0595bdaaa86fbe916e79b545db5a18278f150da2a38a83e43e891bbce8d4f03975ef0d7c6138b3ebcdb16fcfa4dae80a970007c8c60683fd57edc998e
+DIST setuptools-51.3.3.tar.gz 2053035 BLAKE2B 73b33359f10f900233b82e68c91781609665bdecb6b0e2963d7d15a798149c104030cc1e124ee945b23e5fc8db3f573d0b9012cfba7767ff913077af907141e4 SHA512 5a3572466a68c6f650111448ce3343f64c62044650bb8635edbff97e2bc7b216b8bbe3b4e3bccf34e6887f3bedc911b27ca5f9a515201cae49cf44fbacf03345
EBUILD setuptools-50.3.0.ebuild 2281 BLAKE2B 7dc1bc7fa3037a66474cc05a46537158d03fb5865b0b0dfe3babb32f1e9eb879b6ef696143f736cbe7af311c7c2718755df75e8d75c0338ff188e46d92e6d9a4 SHA512 9ba181bdc7bd762067a06807eb8cfe64841f7363edae7f94a82749109c673f9265db44f32c2891addee4b266e7075518f434d5c162d9f1486717a073b059d09d
EBUILD setuptools-51.0.0.ebuild 2122 BLAKE2B 761136f3c80b79119370eb72a0a401649d2dbb3bdf2b14dca818f152116cf62ca23378a1b70e3ce3f0fd496b1bf438ea85386be93f4c0776a34342c9621fdd5f SHA512 c986e94cf91485956fd084861afa4f891d19fd1ca6780283a571a86d1e55d97e607c09a7d02c0a7dd0d7a44b66a0d22e17f5af63183aff15f09fa83035f579ba
EBUILD setuptools-51.1.0.ebuild 2055 BLAKE2B ef0e03ef8173b9591681cd78357f4317327e165f15ba7c013b8ec182b06a4c36d526e7210dd08db49c29cbc717f8c7748f8578b8cabf5fe61044bdb83c832bae SHA512 a5779a4a3b54e67d5995372e944c4e2d565022e6ac501f9517cb850b6ecfb8d9bb5e906da32dfb1465ec62960b1fb4e4b7182dfabaf3f0e69b8f7e807dd33ccc
EBUILD setuptools-51.1.1.ebuild 2137 BLAKE2B 2a99a411fae14fcec532134945d076fbb67b1f6b4d3a8db58b2f6210718c35cc1d7eef233ff835c7045f63cce6787e6fe20f60e16cc7bbb11262012a51900165 SHA512 d0acf1f8a18171d3873d95ba3e16b762ae08ef33ac73167e9a0f7a26c7595bb03aad7baba7b9d7de974747a01d1e5130b2d6a16587ec7afb07797cbb312d264e
EBUILD setuptools-51.1.2.ebuild 2137 BLAKE2B 2a99a411fae14fcec532134945d076fbb67b1f6b4d3a8db58b2f6210718c35cc1d7eef233ff835c7045f63cce6787e6fe20f60e16cc7bbb11262012a51900165 SHA512 d0acf1f8a18171d3873d95ba3e16b762ae08ef33ac73167e9a0f7a26c7595bb03aad7baba7b9d7de974747a01d1e5130b2d6a16587ec7afb07797cbb312d264e
EBUILD setuptools-51.3.1.ebuild 2134 BLAKE2B 026061402b07b6aee16e9c963e8af99e35fba7c894c7ef922ab9b2ae5fd0231d42578846985648e8ca7791b3ed83e721dd2d152a59af958e4b54df42bdef39e3 SHA512 a4a912ede611ca6d251e6923625d2ecb6343ce0032ee89015236bdbf6d740fc2876c298e33be385e3a15d42655bc61b4ed4472df27c9b514d1ac60c4f57daf3a
+EBUILD setuptools-51.3.3.ebuild 2134 BLAKE2B 026061402b07b6aee16e9c963e8af99e35fba7c894c7ef922ab9b2ae5fd0231d42578846985648e8ca7791b3ed83e721dd2d152a59af958e4b54df42bdef39e3 SHA512 a4a912ede611ca6d251e6923625d2ecb6343ce0032ee89015236bdbf6d740fc2876c298e33be385e3a15d42655bc61b4ed4472df27c9b514d1ac60c4f57daf3a
MISC metadata.xml 468 BLAKE2B 5f9a9240795261f894d54130ba489bb18fd24f8f95f993b55d23136fb2b518f47b64494d71ab0f697ca64f4eacc8cb58487e8889a8de22e8e3448caba5498065 SHA512 e284933f2a5d11cf7bb483776b8de2afe96ccad15a0e0bf7c9feab05c65f4247c9b19bb60c04d699ba917a637ca470e6ba41a38795899e54179602b587efe300
diff --git a/dev-python/setuptools/setuptools-51.3.3.ebuild b/dev-python/setuptools/setuptools-51.3.3.ebuild
new file mode 100644
index 000000000000..49b44d46c0df
--- /dev/null
+++ b/dev-python/setuptools/setuptools-51.3.3.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+# Set to 'manual' to avoid triggering install QA check
+DISTUTILS_USE_SETUPTOOLS=manual
+PYTHON_COMPAT=( python3_{7..9} pypy3 )
+PYTHON_REQ_USE="xml(+)"
+
+inherit distutils-r1 multiprocessing
+
+DESCRIPTION="Collection of extensions to Distutils"
+HOMEPAGE="https://github.com/pypa/setuptools https://pypi.org/project/setuptools/"
+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 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+BDEPEND="
+ test? (
+ dev-python/jaraco-envs[${PYTHON_USEDEP}]
+ dev-python/mock[${PYTHON_USEDEP}]
+ dev-python/pip[${PYTHON_USEDEP}]
+ dev-python/pytest-fixture-config[${PYTHON_USEDEP}]
+ dev-python/pytest-virtualenv[${PYTHON_USEDEP}]
+ dev-python/pytest-xdist[${PYTHON_USEDEP}]
+ >=dev-python/virtualenv-20[${PYTHON_USEDEP}]
+ dev-python/wheel[${PYTHON_USEDEP}]
+ )
+"
+PDEPEND="
+ >=dev-python/certifi-2016.9.26[${PYTHON_USEDEP}]
+ dev-python/setuptools_scm[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+
+# Force in-source build because build system modifies sources.
+DISTUTILS_IN_SOURCE_BUILD=1
+
+DOCS=( {CHANGES,README}.rst )
+
+python_test() {
+ distutils_install_for_testing --via-root
+ local deselect=(
+ # TODO
+ setuptools/tests/test_easy_install.py::TestSetupRequires::test_setup_requires_with_allow_hosts
+ # this one's unhappy about pytest-xdist but one test is not worth
+ # losing the speed gain
+ setuptools/tests/test_build_meta.py::TestBuildMetaBackend::test_build_sdist_relative_path_import
+ )
+ # test_easy_install raises a SandboxViolation due to ${HOME}/.pydistutils.cfg
+ # It tries to sandbox the test in a tempdir
+ HOME="${PWD}" pytest -vv ${deselect[@]/#/--deselect } \
+ -n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" \
+ setuptools || die "Tests failed under ${EPYTHON}"
+}
+
+python_install() {
+ export DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT=1
+ distutils-r1_python_install
+}
diff --git a/dev-python/snappy/Manifest b/dev-python/snappy/Manifest
index 9d92fe8306d8..8a7c97088fb3 100644
--- a/dev-python/snappy/Manifest
+++ b/dev-python/snappy/Manifest
@@ -1,5 +1,5 @@
DIST python-snappy-0.5.1.tar.gz 15252 BLAKE2B eede689d51123968bdea64b8c89dc1fcb7f700fcd4e5869339717657ea6db88cacfcdaf59f00899773c65953c16ae271c5a6e03d6a17be16ca1e3dddf2b37cd3 SHA512 95a6389c58790aaeff61419bb9f183a29ad801733cae8144a67eb6203a8ebf6c6790bea7c025b37588dc98ebd2fed20f37857d2f30199f507f52653d2475c16b
DIST python-snappy-0.6.0.tar.gz 21344 BLAKE2B ed5b3796a6af9b2196a1cd5353cefb808a878b324d2eae6f83fca12400365c069ed38ad50d790d6201ae9584128371a655ac2003708d324fe227e0153ddaca5d SHA512 185f43fa3adef2a5ec7468f993b83d356dbd76b3340badd308ff2350352b004c4c9528b73282407ebc4f6e1c23a03c1b9abd9f3915b04771ad9b011d7163a63c
-EBUILD snappy-0.5.1-r1.ebuild 677 BLAKE2B 6ee1a32d522cb59f976837636eef29391e995c782cc4fe38ad34d0b21bcbc9fae138eaf92c8c1b1dab28de74d490878e9b750b1d97f4444b84309ae768af6ed4 SHA512 35082bb3b4da2260e35287a88056af71943254fdc20ac807d5c0d9fa3c649d6ea20c128e3b1ba1c0bdd14aa1164650c3de93a9e3c988935adf45ff55ae1dceb8
+EBUILD snappy-0.5.1-r1.ebuild 672 BLAKE2B 8c57d1072a108ae097c7e7957078b3261d82a1e66d386e3bb3287c697c8ec57b1f72dfdce7ff50e3bfaf3e4ad20e7c94f53bb2f48b7a8371ab7a45dceb04f521 SHA512 5b129766c3af98b4426399bbb1a7471fe96d07440075087bb5904fdd23b3f08d411c40d42ccffef77359dd36e746f09d361ecc98231b012cb5374d95f5228d0d
EBUILD snappy-0.6.0.ebuild 699 BLAKE2B 2b0f0af03d9fd01da6ef915dafffdb3c83d41491b8f1f9d2c333beb1c8e4e7dad0aa3265140849268ee8b021681963f25ea2fb2b54c937a2d0c1d0cd7fcfda92 SHA512 3cd6cdb6b226091262bd62d082630b862a54a4916973e20f0db40d156f3c0222166037ee399404b93078e77f91646023023af8342465d6d873f828170578f16e
MISC metadata.xml 376 BLAKE2B 534d91b9ba78233f6fdcfeb7ae6c8aaf426a4848c111ba297f3814671079d3aee1ae505a93c024f3682dda2042907c424db70e3b0a40f7902d020332889e1a0b SHA512 6760eff3990221e541650ff83fa59902230892c992209ab707ac1e8da67be6c097e50b80496500938073026ec4f81ba4016a7b43a84ddfa0f07f3171163fc1ef
diff --git a/dev-python/snappy/snappy-0.5.1-r1.ebuild b/dev-python/snappy/snappy-0.5.1-r1.ebuild
index 27549182e272..cb87edf6551d 100644
--- a/dev-python/snappy/snappy-0.5.1-r1.ebuild
+++ b/dev-python/snappy/snappy-0.5.1-r1.ebuild
@@ -4,7 +4,7 @@
EAPI=6
DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+PYTHON_COMPAT=( python3_{7..9} )
inherit distutils-r1
diff --git a/dev-python/sphinx-panels/Manifest b/dev-python/sphinx-panels/Manifest
index 089f53e5f256..7a955850eaab 100644
--- a/dev-python/sphinx-panels/Manifest
+++ b/dev-python/sphinx-panels/Manifest
@@ -1,5 +1,3 @@
-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
+EBUILD sphinx-panels-0.5.2.ebuild 687 BLAKE2B 299300167bf675d0c93afd131180eb8828831f349c9dff260277108d456ce55b2d1fcea21b2a5d9883e68e4e4a53bc4d2717334d2c62aa4ca8c22d8932cdc54a SHA512 845224a377c62fef4b30a551beddfd02e0db89eb9d09c5de15f149a764d3c499b402ce01aa31bea63c42afef1c2280fd9df342ffae2f8774bb4fe527e6868ce1
+MISC metadata.xml 475 BLAKE2B e4090a3e1358a4464858c23b69b613bb14a89bc25481767e24ffa431b54f14f81947ac91b4f1d0cec68b2ad5cc0b5e21e84d9a8a76a4fce57715320d159dcc19 SHA512 56a46b41fd68bf6b7b6cedf2f36a3e4d75753ab511210fafed4548b8b4cfb0bbd0a5f52dad0324bbe86d5d075b88335f11f59e8a47883e4d000392b1973d0457
diff --git a/dev-python/sphinx-panels/metadata.xml b/dev-python/sphinx-panels/metadata.xml
index 4072be559b5f..dee113881a32 100644
--- a/dev-python/sphinx-panels/metadata.xml
+++ b/dev-python/sphinx-panels/metadata.xml
@@ -9,6 +9,7 @@
proxy-maint@gentoo.org
Proxy Maintainers
+
sphinx-panels
diff --git a/dev-python/sphinx-panels/sphinx-panels-0.4.1.ebuild b/dev-python/sphinx-panels/sphinx-panels-0.4.1.ebuild
deleted file mode 100644
index cb526641b692..000000000000
--- a/dev-python/sphinx-panels/sphinx-panels-0.4.1.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_{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}]
-"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs dev-python/sphinx_rtd_theme
diff --git a/dev-python/sphinx-panels/sphinx-panels-0.5.2.ebuild b/dev-python/sphinx-panels/sphinx-panels-0.5.2.ebuild
index 783a15c35997..b61ecf063b9c 100644
--- a/dev-python/sphinx-panels/sphinx-panels-0.5.2.ebuild
+++ b/dev-python/sphinx-panels/sphinx-panels-0.5.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/executablebooks/sphinx-panels/archive/v${PV}.tar.gz
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
RDEPEND="
dev-python/docutils[${PYTHON_USEDEP}]
diff --git a/dev-python/sphinxcontrib-issuetracker/Manifest b/dev-python/sphinxcontrib-issuetracker/Manifest
deleted file mode 100644
index c08fb61ad20e..000000000000
--- a/dev-python/sphinxcontrib-issuetracker/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST sphinxcontrib-issuetracker-0.11.tar.gz 30351 BLAKE2B 304526543f5d24cc4b2cc76ea8d242d8942fa54737e3d1f0924e816d24aa4838e054b8af468837447d601cacaae987cd285fc706292b979d29dc84f1dbb77ddd SHA512 fb4a977bea22451a3d90b16821fc2a38ed53b17913666ca250e9aab8bb1726bbdb52fb2b6dbb2ae512a0ca6cc3d33dcddeba758c02c77b099180443d67e147c9
-EBUILD sphinxcontrib-issuetracker-0.11-r2.ebuild 1374 BLAKE2B 2402340926bfa595a7e9eab1f6fc3ae0a6a5e190e36e25d05685e9ae197f3123a41aece6b34b9df241b4270662c290b7e10989bc1424a309c1022c8e75656072 SHA512 5688e6f1e1ed3a6d67854fc8811981d92c2af1b23517e0769812bbf80c11efa6cb4295cf3d0cf339e30f1a0e8f15949fc399529960a74e4c3e39d9d8048d58dd
-MISC metadata.xml 278 BLAKE2B 6132906fa86a0a4f3ad9cba6e6758f88e74c26ffa1d652e8ada8ec8f01f2ad2077d7e4ed5e4cf83c8eeceafc4bd93883789d64871794b091ece2caef18053dd0 SHA512 1eab867621bc382951fe841d4bdf330357164af99185f33347cddf831dbd398265d1098a87557f9c272a6a0adea3a2dcecca6800f3bd938e80a12070d76ad64a
diff --git a/dev-python/sphinxcontrib-issuetracker/metadata.xml b/dev-python/sphinxcontrib-issuetracker/metadata.xml
deleted file mode 100644
index aa1d6f0a539d..000000000000
--- a/dev-python/sphinxcontrib-issuetracker/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
- sphinxcontrib-issuetracker
-
-
diff --git a/dev-python/sphinxcontrib-issuetracker/sphinxcontrib-issuetracker-0.11-r2.ebuild b/dev-python/sphinxcontrib-issuetracker/sphinxcontrib-issuetracker-0.11-r2.ebuild
deleted file mode 100644
index 51cd358ad2ec..000000000000
--- a/dev-python/sphinxcontrib-issuetracker/sphinxcontrib-issuetracker-0.11-r2.ebuild
+++ /dev/null
@@ -1,52 +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} )
-
-inherit distutils-r1
-
-DESCRIPTION="Extension to sphinx to create links to issue trackers"
-HOMEPAGE="https://pypi.org/project/sphinxcontrib-issuetracker/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
-
-# ImportError: cannot import name 'SphinxStandaloneReader'
-RESTRICT="test"
-
-RDEPEND="
- dev-python/namespace-sphinxcontrib[${PYTHON_USEDEP}]
- dev-python/requests[${PYTHON_USEDEP}]
- dev-python/sphinx[${PYTHON_USEDEP}]
-"
-
-DEPEND="${RDEPEND}
- test? (
- dev-python/mock[${PYTHON_USEDEP}]
- dev-python/pytest[${PYTHON_USEDEP}]
- )"
-
-distutils_enable_tests pytest
-# KeyError: 'refdomain' with sphinx-1
-# AttributeError: 'Sphinx' object has no attribute 'add_description_unit' with sphinx>1
-#distutils_enable_sphinx doc
-
-python_prepare_all() {
- # test requires network access (bug #425694)
- rm tests/test_builtin_trackers.py || die
-
- # Tests from tests/test_stylesheet.py require dev-python/PyQt4[X,webkit]
- # and virtualx.eclass.
- rm tests/test_stylesheet.py || die
-
- distutils-r1_python_prepare_all
-}
-
-python_install_all() {
- distutils-r1_python_install_all
- find "${ED}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/tblib/Manifest b/dev-python/tblib/Manifest
index 50aa2ec22e8f..d6ac3498e83b 100644
--- a/dev-python/tblib/Manifest
+++ b/dev-python/tblib/Manifest
@@ -1,3 +1,3 @@
DIST tblib-1.7.0.tar.gz 33074 BLAKE2B e05b94b9a36efde4d3fe76e9b72502674554e84e49916ea585de4f6cf9e898d1544535b1a8935fe15ffc100fcbf2b5d4f9edfdcf0ce5c86d479f2f412d3ea83f SHA512 10dcff18a1da386d9dd6bae35608f4a2d3bc8f87c15fcf49d886f98d95a6defd348ef0dc5637e03f4c553a933a0ecb4c215cf15b1e78fca58fea10052f9fb4e9
-EBUILD tblib-1.7.0.ebuild 552 BLAKE2B 79354943c3cd67053590e153e6276c19269bd803209f55357011d9f6ff6fbeb06b37f6672005ec6f9cc9ebb459b1ddb36359a3eeea14ab3ff2f079935845ca11 SHA512 9b62059eeecd6808d4b72577cd84d66baa9e65cece0f1dc09eed6278c9f6597f7f73c7b0d7a1463814e37224e29964e5b2a531ba98474f4d7c37898cc5e856ce
+EBUILD tblib-1.7.0.ebuild 559 BLAKE2B 51d77e19761961dd49480d150e9ab420661f102fe0e51757ba5b6a8c9f52fe3ddd8a02a6935cd939df7a351abc41c9ddcfc37464bec643b05c87d726752e5b8b SHA512 9a0d3a6e1e8d2aa291c18795bba74920c5a55da1013dd0437e933db18e6445646f3e4ad0da071d556d33b20f6de7d55448b5f771b0667ba9e2289a020486a90d
MISC metadata.xml 405 BLAKE2B a9cb9a48ed88b8e80a16761949fcf8973512ec76687eeec4285f65bcfa1b60a92159aead88f4fe9facb2cc2e20bc3e0577c68f862e3bdc296b428918bde3db00 SHA512 b4616a156c1c52141dbfa07452a2f8a22828d8c2a2be6d857079a6246cfe4c773f379c3932d5156f7ce6e9606e8443971089223af87f6d725c7aaa2027a4b994
diff --git a/dev-python/tblib/tblib-1.7.0.ebuild b/dev-python/tblib/tblib-1.7.0.ebuild
index b1a8ee55da20..ec9032e8843a 100644
--- a/dev-python/tblib/tblib-1.7.0.ebuild
+++ b/dev-python/tblib/tblib-1.7.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
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/six[${PYTHON_USEDEP}]"
BDEPEND="test? ( dev-python/twisted[${PYTHON_USEDEP}] )"
diff --git a/dev-python/testfixtures/Manifest b/dev-python/testfixtures/Manifest
index 1ae8b4084127..004346aa9343 100644
--- a/dev-python/testfixtures/Manifest
+++ b/dev-python/testfixtures/Manifest
@@ -1,7 +1,5 @@
-DIST testfixtures-6.16.0.tar.gz 120986 BLAKE2B bb17c44091370edca55f1e273f70e454c2e74a152a228f97efba08d605e3a024c64bfc163b3aa50805f038556c76fb754825b16fdf4451760403682c06251c80 SHA512 0c519fa2d2619ad71f6b487456ea1480365aa421c14a9beaeee916e7841bd266be2c95d48c61b64e91554b37d2621358a45b124be6a6d25b3e381f966653c9b8
DIST testfixtures-6.17.0.tar.gz 121419 BLAKE2B 62dc8808cf9fbc37386fcf9e44c56edbdc2c51ee0698518142dcbc52b73ab538445d49d5d4a779cd68bf51b6aa267222f877bdc703d3dc87230f6a6db81e258a SHA512 2ace802d3bf8b261727037a5ac26a0beca852ca8c2e57ec33344707f300edae7cf317f1bb79c05aa809b1f68d38ffabcc6c5383ce9ecfd4f66a80b02ff4c7315
DIST testfixtures-6.17.1.tar.gz 121440 BLAKE2B 6fcdf4f99af7941044f5f3cdc3e1204b5730d514a009e95f14451537f62af6c6ebaa97356b7ca0dae6313bd81b2a83d981567346e20c477c2d17c6bca73ecdcf SHA512 fbf7c8cd39b83516a257c5a3bce724a8416af88cf1bac8d69457b2030873185c685feb12aea065df2af729a9b733b3e0afe76207bd78e9b5a0c2d464b727d99e
-EBUILD testfixtures-6.16.0.ebuild 1087 BLAKE2B 6e924a23c4219b8d3b0f0a59829fd110a8c121c37a9acdd176b345d53e10ef6c393d770678af488cac4d78c51fe6331fc6b1a3a557c468f42f262806e9bb8b3a SHA512 df1d48375a93cae605236093c3ab30a4eb132362a3a9e4c6267e6c439ab2c57d30da6d1a7491cd45bd15e766d56f77b134f3091487ce90756c9d18838e833b36
-EBUILD testfixtures-6.17.0.ebuild 1089 BLAKE2B 1aece1ca23c043598dc4eecf7b4775dcb53475f8083a7e01ff8965fbdbaff546d1e4d81ba046a18d489a35dba48e68431df443f39f47dc7ac85b283600f297b8 SHA512 452daaf02fd5a94a0d6a2d3410aba86836f80e5f4babb518c4b59a2174b713b595f35e1f8666bc6ebebde32378fdd3deaac8cf642adddf310abf947e610c7529
+EBUILD testfixtures-6.17.0.ebuild 1087 BLAKE2B 6e924a23c4219b8d3b0f0a59829fd110a8c121c37a9acdd176b345d53e10ef6c393d770678af488cac4d78c51fe6331fc6b1a3a557c468f42f262806e9bb8b3a SHA512 df1d48375a93cae605236093c3ab30a4eb132362a3a9e4c6267e6c439ab2c57d30da6d1a7491cd45bd15e766d56f77b134f3091487ce90756c9d18838e833b36
EBUILD testfixtures-6.17.1.ebuild 1089 BLAKE2B af17df67bf9578ff97d9c1387d60e633be2359991f69b8171b177f92d161d7b1ae3049ec8848bf75be41df6b269274b8fc4d3f4ea49a7bf789250217a8c4f7c5 SHA512 34a718c3685a79028cc735af58de8b1f1c6c95172ed632ab62eff2df81d056e258576a2e9416ce46ca29afd76f30185875afddf5ed05fb91af95e9ffe1cd48fd
MISC metadata.xml 415 BLAKE2B d3e133602f86d013faf5998b2e52256dca88ed9593b9ea26bed0277b70823eda4dd27deca7488a7f66fac2f77e3312cddf833a4b865cf400c7e78a4d267a4c5b SHA512 78fd16b4fd4e8ea3f244b3d8fcce8451a38713d0374df3d2661453f2ad06af587b4613c9119b11bf4cfe3d226fd04620bfa74f58f2660e44ba7e84b93c99c20e
diff --git a/dev-python/testfixtures/testfixtures-6.16.0.ebuild b/dev-python/testfixtures/testfixtures-6.16.0.ebuild
deleted file mode 100644
index 8b36eb002d2c..000000000000
--- a/dev-python/testfixtures/testfixtures-6.16.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 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/testfixtures/testfixtures-6.17.0.ebuild b/dev-python/testfixtures/testfixtures-6.17.0.ebuild
index d8efd8340de3..8b36eb002d2c 100644
--- a/dev-python/testfixtures/testfixtures-6.17.0.ebuild
+++ b/dev-python/testfixtures/testfixtures-6.17.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
SLOT="0"
LICENSE="MIT"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
BDEPEND="
test? (
diff --git a/dev-python/theano-pymc/Manifest b/dev-python/theano-pymc/Manifest
index d3582f600355..6bde6f50dabd 100644
--- a/dev-python/theano-pymc/Manifest
+++ b/dev-python/theano-pymc/Manifest
@@ -1,7 +1,9 @@
DIST Theano-PyMC-rel-1.0.15.tar.gz 12978600 BLAKE2B 9038baa6d7c275a20a2e4f4f9e382f651deee958b2f044ad4360ea7d5a0408ab237af03857d5a598464c770ab1935d051d0f84657efd2915f5c80b393b972e04 SHA512 ad544b2749320ac2c3cd27e84e7700ce469e7d840491675378aabc3a75b03b26065c1022760fd1dae06f6cd694b4ec6de95e78280c478884ffdb224e4f0760ad
+DIST Theano-PyMC-rel-1.1.0.tar.gz 12482951 BLAKE2B 3c3cf6bcd396ce01d68575d8272a9b110077ef8c2b4a6c8f0e795dafcf75f862e145d4e9d83289950e8d463098fe0ebbcee8f4d5f0867d9e6c673c77d6fe8b90 SHA512 667c0b3662ee41254d1776060d64d46b58980ac4ae4e7b271d29d7e09321089946e4aa864626b6e8ea1bd2eae330688b675d507e18dce2d92a4a8df5a0116bb6
DIST theano-pymc-1.0.13.tar.gz 12975871 BLAKE2B 71528868885084d7c37f1f5cc5156aca5e764d09f0dc57aa46e21240ee2959aafb5882aef8977d9f215b051265d0d9bc3a7097ac0bb6d427cfc076ea6f591905 SHA512 da25e386965695a5630c54a671a7a573d0f0fae2eeeacf4f65130e4e4caf416373852ac14b1eb07ae39c194febe854d71fffe2adc24c348f64a4b73b43564229
DIST theano-pymc-1.0.14.tar.gz 12979426 BLAKE2B e6db87a348d6e7003f8b1ff4e0634335d53d734ea922951edeaab06ec54d51f1d7930a03f6dca14979930abb6212f873d606a9adada46d5b606854c5d8a6c6a5 SHA512 4ddfe5978f33cea96b20763cb01eecf1ec6c0c6b97ac892d647e28b607e61b11862739e5836356ab87e2002e992febe35ce9e1e72d37732074be2dbed64b50b9
EBUILD theano-pymc-1.0.13-r1.ebuild 1228 BLAKE2B 4c54029fa720820f537d3e0655278167a9308de193afeff044203726b0539a3d41e916d4cc7a7f289a6d02878c851f7701f0b974454c58b4a1ec84986d04fa84 SHA512 ce0851f9e57c6b6c9a458f437f22d47841fa281c10b14b1a641eb24275a88b8091e12a07ec59f706fc6469fc5c989f98ba0055d7a75fdcf9556a236e82036957
EBUILD theano-pymc-1.0.14.ebuild 1228 BLAKE2B 4c54029fa720820f537d3e0655278167a9308de193afeff044203726b0539a3d41e916d4cc7a7f289a6d02878c851f7701f0b974454c58b4a1ec84986d04fa84 SHA512 ce0851f9e57c6b6c9a458f437f22d47841fa281c10b14b1a641eb24275a88b8091e12a07ec59f706fc6469fc5c989f98ba0055d7a75fdcf9556a236e82036957
EBUILD theano-pymc-1.0.15.ebuild 1663 BLAKE2B e9505f246576cd07667c33682debe76365f4295379580b36aed175bb8ae317cd49bdd34f27c782baa3f15bd524968fd60e06b2b8a6e91777bd3e1a8e003a1980 SHA512 74ba634f84cad7ced69a541855358353e5c51bce44fabea20ccc2340ddf16dfca041118f8026ca9041c069c00c5a0aaad3635ffc69ed80f95d271bc14268eddb
+EBUILD theano-pymc-1.1.0.ebuild 1713 BLAKE2B 1a7de27bbb932b8c447b0f2689295a9c3d5f8370ab98a064ec36629e54535601b1a02479249177f59c273993bd4e7143c2d0a67ddd5fda6b9f14d3203dc10770 SHA512 0cab85931fe676fefaa9db25ea37cba43590e5b80920caebaacee18615eee8480cc862e76dea022baf772d2a26be62fee1c4e5dbb2078483a4868988a082f445
MISC metadata.xml 400 BLAKE2B a9f06ebe35c874d15d1a6608e8398a79480b24cc0ec1b7a45db8c8d18aa24d26817c47a62ad13fba1f32286699749679568b75593c0909dd2ef5785450b379f2 SHA512 530f9e294ab4481624cd9757d67a9e8a67dc2a023002a7f312de619bf05bfd1a06c30ecebd0606f76a1dbe37176697e990867c95de9f411b7631bcc341192e93
diff --git a/dev-python/theano-pymc/theano-pymc-1.1.0.ebuild b/dev-python/theano-pymc/theano-pymc-1.1.0.ebuild
new file mode 100644
index 000000000000..221894445d0d
--- /dev/null
+++ b/dev-python/theano-pymc/theano-pymc-1.1.0.ebuild
@@ -0,0 +1,61 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{7..9} )
+inherit distutils-r1 optfeature
+
+MY_P=Theano-PyMC-rel-${PV}
+DESCRIPTION="Library for operating on mathematical expressions with multi-dimensional arrays"
+HOMEPAGE="https://github.com/pymc-devs/Theano-PyMC"
+SRC_URI="
+ https://github.com/pymc-devs/Theano-PyMC/archive/rel-${PV}.tar.gz
+ -> ${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+ dev-python/filelock[${PYTHON_USEDEP}]
+ dev-python/numpy[${PYTHON_USEDEP}]
+ dev-python/six[${PYTHON_USEDEP}]
+ dev-python/scipy[${PYTHON_USEDEP}]"
+BDEPEND="
+ test? (
+ dev-python/pytest-xdist[${PYTHON_USEDEP}]
+ )"
+
+distutils_enable_sphinx doc 'dev-python/sphinx_rtd_theme'
+distutils_enable_tests pytest
+
+python_prepare_all() {
+ sed -i -e "s/tests.\*/tests\*/" setup.py || die
+
+ distutils-r1_python_prepare_all
+}
+
+python_test() {
+ local exclude=(
+ # speed tests are unreliable
+ tests/scan/test_basic.py::test_speed
+ tests/scan/test_basic.py::test_speed_rnn
+ tests/scan/test_basic.py::test_speed_batchrnn
+ tests/link/test_vm.py::test_speed
+ tests/link/test_vm.py::test_speed_lazy
+ tests/tensor/test_gc.py::test_merge_opt_runtime
+ )
+
+ distutils_install_for_testing --via-root
+ pytest -vv ${exclude[@]/#/--deselect } \
+ -n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" ||
+ die "Tests fail with ${EPYTHON}"
+}
+
+pkg_postinst() {
+ optfeature "GPU code generation/execution on NVIDIA gpus" dev-util/nvidia-cuda-toolkit dev-util/nvidia-cuda-sdk
+ optfeature "GPU/CPU code generation on CUDA and OpenCL devices" dev-libs/libgpuarray dev-python/pycuda
+}
diff --git a/dev-python/txaio/Manifest b/dev-python/txaio/Manifest
index cc24c0c72671..0fa4b55ae643 100644
--- a/dev-python/txaio/Manifest
+++ b/dev-python/txaio/Manifest
@@ -1,5 +1,3 @@
DIST txaio-20.12.1.tar.gz 53200 BLAKE2B 0bbcf8a64fec668c2cf128a390779ca81033d0f43f02a341c46fc392254ff011df13a1456757e86dc5c4c15f18468698f4da85cc830fb2e52e4e620f7a8767ee SHA512 efde6115b8eccba94dce736fffe49f280ff49e9738f3299578cf41641c3b6f1deb5b1c0f0c8c6fbf85c8d8adbdc2d3f67aa256335d63a5977ac0bfacc98f909c
-DIST txaio-20.4.1.tar.gz 52580 BLAKE2B 28d745eb9e8a0df1ca8748ce455eb122e240505f31464fcc0e66bafcefa8a01a356e44a46d9a5a1b1c670df46ca0c2ea9e66d29436bf2668e5614c5aa8726cee SHA512 da0269d13d72f4ea14f2e67585cdb74ec5105884c31d81157fb85e92d4eb935b1c13eb1222bd5ecd57a8caa36008cf49de85321e7b67e94159330e1d592d42c4
-EBUILD txaio-20.12.1.ebuild 866 BLAKE2B ad7b2aa8e6f20e0451ef708317612092adf4da81c0498360d14a07f1d29a731bf1d83c65752aa5a7ca1088ab83155df7ee7747ca4a756b76bc7b1dc76f198c3e SHA512 58e375781a327f050388ddf5da550b808e03f89a6088460ed1deb501ad653df41dfbcde9f146905f469426ebd1555465a0602c6a767d74cd7560c7501258fe3c
-EBUILD txaio-20.4.1.ebuild 1248 BLAKE2B 97bd4fb4d67b25f5c7354ad2db0cf455e45dbcc09a5a60b78de6607069597a237f9a1c4af5254c0871dacb11d84036f803655befef85e2de26bb331b521099d8 SHA512 79466def4ee99c900e3e89ef7fc1462c5f5db19f92802efdb3961fb89930604d54362a3decc835cf01712edf9a38c67c044a5389dba5c2f074dcd625f87d4c53
-MISC metadata.xml 593 BLAKE2B 35381e8ffc7b26577752e5b659d76fe07e6680518231665285029e817502653f681ed15c352981e999d251e5ece41d0b3fb6bd7e1bfc22464a5a1f1189705101 SHA512 0c84e60ef241789017983d1cea79bf429c48549ab0d0447bed2cb90dca619fb1a469490734a0eb75392cf12c9dbaefda1563fd30e65dbd1a22eeebb9e9d0ccc3
+EBUILD txaio-20.12.1.ebuild 862 BLAKE2B 32a5a2ddfdaa9dfc0675e16fdccdf46b7fb14048e90967b0c28afb78a17fe396719eb03e4b8bf5e7946bb15e7de55cdd19dc53fed05a317984beb8791f562eea SHA512 32800bca3f10904485c22f8f464597af42e8b4bff33822a8406ba27884a6ac932ec79bf38e10953a7804ebab096f82ec309548e7aacb14d0ca5c873ed376d996
+MISC metadata.xml 617 BLAKE2B a846ad814e7b2107ba9a865cfe98e0ba500b11b2a35dc04efb8f141e7c9abbeedcbbb98df1faaccc7675f0b9076b1294efff20cad07ee6f2b36ef2487a38594a SHA512 2460cee3a6f12587021f87733107903295d1b357d19467df2a2510700a1b0f11d16b6a8e63065692c1ff4ac5c3738a5d75f17f10b6c769d022a7f9d437c040b7
diff --git a/dev-python/txaio/metadata.xml b/dev-python/txaio/metadata.xml
index 55194dea6135..4172d926c7ab 100644
--- a/dev-python/txaio/metadata.xml
+++ b/dev-python/txaio/metadata.xml
@@ -9,6 +9,7 @@
python@gentoo.org
Python
+
autobahnws@googlegroups.com
diff --git a/dev-python/txaio/txaio-20.12.1.ebuild b/dev-python/txaio/txaio-20.12.1.ebuild
index f592667df305..41abcefc327d 100644
--- a/dev-python/txaio/txaio-20.12.1.ebuild
+++ b/dev-python/txaio/txaio-20.12.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 x86 ~amd64-linux ~x86-linux"
BDEPEND="
test? (
diff --git a/dev-python/txaio/txaio-20.4.1.ebuild b/dev-python/txaio/txaio-20.4.1.ebuild
deleted file mode 100644
index ecef57ee9400..000000000000
--- a/dev-python/txaio/txaio-20.4.1.ebuild
+++ /dev/null
@@ -1,49 +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="Compatibility API between asyncio/Twisted/Trollius"
-HOMEPAGE="https://github.com/crossbario/txaio https://pypi.org/project/txaio/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
- dev-python/setuptools[${PYTHON_USEDEP}]
- doc? (
- >=dev-python/sphinx-1.2.3[${PYTHON_USEDEP}]
- >=dev-python/sphinxcontrib-spelling-2.1.2[${PYTHON_USEDEP}]
- >=dev-python/sphinx_rtd_theme-0.1.9[${PYTHON_USEDEP}]
- )
- test? ( >=dev-python/pytest-2.6.4[${PYTHON_USEDEP}]
- >=dev-python/mock-1.3.0[${PYTHON_USEDEP}]
- )
-"
-
-src_prepare() {
- default_src_prepare
- # Take out failing tests known to pass when run manually
- # we certainly don't need to test "python setup.py sdist" here
- rm "${S}/test/test_packaging.py" || die
-}
-
-python_compile_all() {
- use doc && emake -C docs html
-}
-
-python_test() {
- pytest -v || die "Tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
- use doc && HTML_DOCS=( docs/_build/html/. )
- distutils-r1_python_install_all
-}
diff --git a/dev-python/virtualenv/Manifest b/dev-python/virtualenv/Manifest
index 2869e9cb7363..4b2422bf5ab7 100644
--- a/dev-python/virtualenv/Manifest
+++ b/dev-python/virtualenv/Manifest
@@ -5,7 +5,7 @@ DIST virtualenv-16.7.10.tar.gz 5116776 BLAKE2B 42f0a4b4330850b504f8febd991ef6ecd
DIST virtualenv-20.2.1.tar.gz 8286055 BLAKE2B da77c51b352e979f05515107df49101a70f97da01862ae92aff0e185065edf1d6d517ee68057f1f2efe5ee999dd9dec24c0f2967b1f10130b446e83e478ccbd1 SHA512 e7877a9766bc47f47a07219258201ad8457ca587a04d61119a0516da43016dda4b5cfeaf725dd0b06f1f896ac8af0f3d7a2ceed3d3f35ac7a4b6ecc607c84118
DIST virtualenv-20.3.0.tar.gz 9074217 BLAKE2B a5a00e39e31beff84e28e66d1cf6693804861ec0a3c0d0ee5c042e39a8edf894e89d6e78093fe1a4fecaf8b43bceff82e47a1ef7b8a92a1d2bc58d61411575b9 SHA512 5703a934d373d88670092febf26782f65303c65de93cffdd1a2ca06d6f2de4868378421f3ad96e3857eb99d0b60e7a77b0a2dbcf10561918efcbadb29a4ebf3b
DIST virtualenv-20.3.1.tar.gz 9077527 BLAKE2B 9932c75ffd42c2448a3f5dc49aa8b31f7cd169cc671e225a97fa75fabc3339728d0b280abec9616c11fc869dc696bfd17da05bf911c6f8a14947d710ade86897 SHA512 ee95e851e9e3597fd1691086d1d4dc72a41d6a143e9644be208cadbc1dfe7c8e562cd506a657ba1f77161d8d80a9f6f648b345e6533265b0e989c7ad39cc7680
-EBUILD virtualenv-16.7.10-r1.ebuild 1959 BLAKE2B 90c31ff96e46d24169602a0f034bf02f0d5fcc4132b1ef12a06226580ed2737398c889a0f752cd14c99f310a72642664aacc27024a65840a8541e580ef601deb SHA512 ab7f3e64008dc6320e2d0a280087b7ae26f934eaa7d571e2f8e01c4e21db7356476fd002918b6217bb52827f22bcd6f8e527e53c1011824d8d32be99c452bec8
+EBUILD virtualenv-16.7.10-r1.ebuild 1848 BLAKE2B 8b8209b550258bbe31e3bfa2045ba342f5cf284ee7a9ece6aee2d3d72b885cfcb30a83139964769c8b34e07b97aa7a61e8a3579265e5a1cff48288174bbb7590 SHA512 2710122f7ca3ae6a800b433f73b4bb57065c9313bd5cc5abe709d94aa641a07c11ada4664436c01596498a6ba08ea9793f7bdb55241da9e1c3ce47d5eeeb5156
EBUILD virtualenv-20.2.1.ebuild 2586 BLAKE2B 652c6f2eb11138cc38e12dbb3fd7111732f002667fecb3dc4044fc156040c4db9b90f63270607b11640f635fc722e087b0107225f26ed6f22369ae5e76a7bc53 SHA512 9f71abe175ac56f48166bf7339adee6df0f427623c686e6d2c840592ada29f092af00d768f578282d96f1a36484fa00dcb1c6a711170197b3873e6e87db00904
EBUILD virtualenv-20.3.0.ebuild 4022 BLAKE2B c210fcfa5192ddaef2e1be567694f8aab6cda2b60f1989519fe5f9b7641e88f9c9aa4e239e7db55ffb3deebae204b77adb251904bc43da149340489b5daf4625 SHA512 ac2aa30484b5a756a7b3be03e09bd07cbd3ddc48b3de5b62392dc4a87dae92bb64e9288d0ecf3853bce44e43f992e50ea6dcbd60bbeb70c0fb0dcb9cbc6dfbc4
EBUILD virtualenv-20.3.1.ebuild 4022 BLAKE2B c210fcfa5192ddaef2e1be567694f8aab6cda2b60f1989519fe5f9b7641e88f9c9aa4e239e7db55ffb3deebae204b77adb251904bc43da149340489b5daf4625 SHA512 ac2aa30484b5a756a7b3be03e09bd07cbd3ddc48b3de5b62392dc4a87dae92bb64e9288d0ecf3853bce44e43f992e50ea6dcbd60bbeb70c0fb0dcb9cbc6dfbc4
diff --git a/dev-python/virtualenv/virtualenv-16.7.10-r1.ebuild b/dev-python/virtualenv/virtualenv-16.7.10-r1.ebuild
index 898e23e80b64..77928fbb50f9 100644
--- a/dev-python/virtualenv/virtualenv-16.7.10-r1.ebuild
+++ b/dev-python/virtualenv/virtualenv-16.7.10-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -17,8 +17,8 @@ HOMEPAGE="
SRC_URI="https://github.com/pypa/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="MIT"
-#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
+#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86"
SLOT="0"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/warlock/Manifest b/dev-python/warlock/Manifest
index ccb3461641af..15aed4ed9b1a 100644
--- a/dev-python/warlock/Manifest
+++ b/dev-python/warlock/Manifest
@@ -1,3 +1,3 @@
-DIST warlock-1.3.3.tar.gz 11602 BLAKE2B 8d3bd3cd19f27e9c4ceac97f242742c58c6687659d8ab0ea42da74ce948e43415e513e7d7269767b76b21c995229702da66c64688119bbfcc0d30e872af1b65e SHA512 b6f96aa8e084872397744641e3fdc0e7c8d0a9285b048e894b66ccb42af65301c550813221895f0f99ac49cc26d293798b731cdf30524c13a79389ce07dd7e44
-EBUILD warlock-1.3.3.ebuild 1033 BLAKE2B 2aaf79b25c265b526cf52f1e93940a2b634fc9d4aa508e4ba577ca26565f01da46f93a40de16028b136e0ffd306ab4bc3de633d40c83b5e5ae6d27fc2d6c1420 SHA512 95cf158ce036f0aff7c398f520e19addf86e981502361bb23cbe2af6542dd1833362fa23430c1f9c171476cac6f496bf85196fb08f8e37632b56f0919c2b7beb
+DIST warlock-1.3.3.gh.tar.gz 11147 BLAKE2B 1281348076500315c5aa105691b8e5a50ccf2ba79335fb8581a0b89bfc96bb3076a797c4ebe011f6c347667a0971bbbdd2b1bf413d0692ae5977216c524cbee0 SHA512 8a9135a17ccc0d0939ad98eee16100ec68b911d672b3af549f7629edcd6e08129f9e4ab707082593274fc896bc405ab6d6ba9e4bf6fc40b8522ec99327c983ec
+EBUILD warlock-1.3.3.ebuild 1065 BLAKE2B 2f50451b5ce452236e648e9033494341328b182a78930dca46f4067df186e388ef74c1bf67957c5a1f2feab4965e26608358fa7270683f104fc9be3dcda51faa SHA512 4c99409d76f54b824c6590bb7ce219d7a3b14b844eaf15afb872a637e9c95ae960acdc16e2c72f895cb3a990d52c306bdee60df59e577f7a3d6fb1ec2bac5013
MISC metadata.xml 481 BLAKE2B aff1012a1482024186193a16b8e8abab85b300f76ef10a235ed9a40cc25586d4fbf632f37e2bb5a050478c74128cf0b2243345429f6edaa9a5a4b53276637f1d SHA512 1ec1e5a94f222a031e0f73c06c60a76d1e16cdb637d4ade4f0fd1deef8d51fb35cec46de7087c245fe68b8cc77637be822fb7eb9aa6b9379331a797d4e3a0166
diff --git a/dev-python/warlock/warlock-1.3.3.ebuild b/dev-python/warlock/warlock-1.3.3.ebuild
index ddc0185f826a..9957d01b6f12 100644
--- a/dev-python/warlock/warlock-1.3.3.ebuild
+++ b/dev-python/warlock/warlock-1.3.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -8,7 +8,7 @@ inherit distutils-r1
DESCRIPTION="Python object model built on JSON schema and JSON patch"
HOMEPAGE="https://github.com/bcwaldon/warlock"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+SRC_URI="https://github.com/bcwaldon/${PN}/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
@@ -29,5 +29,5 @@ RDEPEND="dev-python/six[${PYTHON_USEDEP}]
${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc x86"
-
-CDEPEND="dev-python/pyyaml[${PYTHON_USEDEP}]"
-RDEPEND="${CDEPEND}
- dev-python/argh[${PYTHON_USEDEP}]"
-DEPEND="${CDEPEND}
- test? (
- >=dev-python/pytest-timeout-0.3[${PYTHON_USEDEP}]
- )"
-
-distutils_enable_tests pytest
-
-src_prepare() {
- sed -i -e '/--cov/d' setup.cfg || die
- # broken when django is installed
- sed -i -e 's:test_eventlet_monkey_patching:_&:' \
- tests/test_skip_repeats_queue.py || die
- default
-}
-
-pkg_postinst() {
- optfeature "Bash completion" dev-python/argcomplete
-}
diff --git a/dev-python/watchdog/watchdog-1.0.2.ebuild b/dev-python/watchdog/watchdog-1.0.2.ebuild
index fd006a578472..8d6d7fadceae 100644
--- a/dev-python/watchdog/watchdog-1.0.2.ebuild
+++ b/dev-python/watchdog/watchdog-1.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/gorakhargosh/${PN}/archive/v${PV}.tar.gz -> ${P}.tar
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc x86"
CDEPEND="dev-python/pyyaml[${PYTHON_USEDEP}]"
RDEPEND="${CDEPEND}
diff --git a/dev-python/whatever/Manifest b/dev-python/whatever/Manifest
index 0da93d6db2af..1bec985d5873 100644
--- a/dev-python/whatever/Manifest
+++ b/dev-python/whatever/Manifest
@@ -1,3 +1,3 @@
DIST whatever-0.6.tar.gz 4748 BLAKE2B c0a8b3bff715b61744ca5094c234c24558882d00b0dd8c375b90deef9d68155997cb97fb94435cb6dcfa0ba4674ce61fd6d030dd338409e8aaa5686c3bf9f3b1 SHA512 acdc145b81423908fd2d80bf0e8a0c02bad3a6156ec5a7724cf10b0f447c14354c34ac4ffa4e5a26788a79ce2a6b7bd65bb0ea281a6d8919dacd9a24ee1cde2d
EBUILD whatever-0.6.ebuild 442 BLAKE2B 15b16324244bdd14db1841e6e5d2817e826286adf9221f29e8032539d04ba75495b117cfa95b6ff45528c7eede9f62779496b475901c6bd58776e391ce55d747 SHA512 386328a87f5e01f0ef4da540bfef9b43c14b18728e781257faacf26ffe3c437a63b9f0392ebb125cde025318cdafc7bafacd50bb86c03b7fe5d2d1a723506825
-MISC metadata.xml 247 BLAKE2B ca08677c4c0af66af431abe578122a2ea0278f7ffabab245eec806167a6226c65f97e9826d64fc4b82eb14b6200cd1e3a31a5b4999e18aac41a4f9af43d708d6 SHA512 fff6c25e644477aaa35b838e10c44ca8eae9824ef8f19795e31201db40c10068f0216dec38deb0ba80782155b43fd1d72fb888cb825eaabacc3bd1ec0d18f3ca
+MISC metadata.xml 318 BLAKE2B a09a37d0d384b1058dc76ae9b255977c917c0bbfef0fa8032f5dbe171ba63832a2b2cfb319b70de8958b2598c45c92a6c55c93e3653149bc25d88f8827636efa SHA512 a3fed1e48fe196f94e4dadba9a75a391065d1f48781ee27bc2201cc825f4ad4061dd188136e137e4190f1d44335003819b39520b221611e5b7e484fe107bca80
diff --git a/dev-python/whatever/metadata.xml b/dev-python/whatever/metadata.xml
index d0e866f244f8..6d676f5f2eab 100644
--- a/dev-python/whatever/metadata.xml
+++ b/dev-python/whatever/metadata.xml
@@ -5,4 +5,7 @@
tupone@gentoo.org
Tupone Alfredo
+
+ whatever
+
diff --git a/dev-python/zeroconf/Manifest b/dev-python/zeroconf/Manifest
index ba944c5e1966..81184def7245 100644
--- a/dev-python/zeroconf/Manifest
+++ b/dev-python/zeroconf/Manifest
@@ -1,9 +1,5 @@
DIST python-zeroconf-0.28.7.gh.tar.gz 60821 BLAKE2B e8c99505d1b149319552c808ee17bd3cd37a016c094d5f273f5d3545670ecf6f9cff58178293816e9cd671cf9e342b0a99641d6b9b3d32626dac4e72d983380e SHA512 8cc5c9b2e964c170c2aa53a3c07f2cd634cb113737fdf2e7a924b0b1c5ffb7c2d1e97b589cce36a4216f427e0e64dfba373f9f96b6117e835a9aa68a911edea0
DIST python-zeroconf-0.28.8.gh.tar.gz 62107 BLAKE2B 94b910be9f95f8b50bfcd5fca102663713234d40a0cf90c5b94b2ab4e85ffd7363747a0fee2f7a72a3bfb74faa1cab703dfb8bfe3cef80a0495efe2c81d0c2af SHA512 ba599fdd44ecdf3da71ee2a155a47e6cf91c8f4fe3efac428f6e99feda052019423a8a3e775d6cc4624697fbfcbe207829a41ad76105082fe62e81eead2f7a34
-DIST zeroconf-0.24.4.tar.gz 51866 BLAKE2B dd71bda4b0759c61a3e5895e766dff6516ea81ca0c8c9f5a95a8093de8a3a9b15722b99a6af0092b02c1b292bcdb11c02c9f165003b56ca8a793f4a4ca8fd891 SHA512 71678521b05016a7404005a06c8109f861cc8bfe2b3375ac6f1da8f63771271a3d9a095a8db6ccea2e062c5cc28b750a50fbe69218de72646b13a5f03359ea17
-DIST zeroconf-0.28.6.tar.gz 61487 BLAKE2B 2ded05d0e63d9f4918da925c179ee198dac68cf7a51d8f63beaaa697b04d297c7e892c97b1cedd51f9ab4af23e79e50bd3d85eb1af804c0fc0c67461501a508e SHA512 405786a25531efc42acf967838e74b67960b7ecdbee5db0633a56ba3e1774b9bd71fac58bcf29ab57ef6328560ee0f0f8cfa126ea42637ff53fb18c479a92f62
-EBUILD zeroconf-0.24.4.ebuild 890 BLAKE2B 841dfc5ae64f77eac07133a4f58e5d23505410c12c4adfd38f161297a6db3d6dd6f7f5c8baf8b1c83b78bfbd316ce3ebccbba732c37a8e3319d8b0b0770c366f SHA512 2afd01e0fdabb391958c1f453bf9f459e433bced93422afbe6b2292457e3639b6b7ca7cf73992526cad7625e1c94c4951b290098d8b153639e9b0628cb2252fe
-EBUILD zeroconf-0.28.6.ebuild 900 BLAKE2B a4becb3f2c92b739f27bb8a5df2a154a502ae89fed01379a07ea139e0e67e1376433239d5e4d56422b765cf6e13fb030f8878e1b05d99b7252ee97d202d90b61 SHA512 45fd053fa6289069c90e1d90167b4205faa957149e1b3e0d30e8beb0a58df9610058675a3b1ead600990b8809a2d2285f9154c35d35718e5d4a8a9a9763e8cca
-EBUILD zeroconf-0.28.7.ebuild 873 BLAKE2B 8c31070af7da401629fea526f3893894ee639648d4bd12af9c85248e3a920fd28b63158f140790fcd17d9ef496380d5a68cdc1f9e42f9816cb9445887373ca84 SHA512 811bd3cb3d9a158cf4a1940fe36db6e3d66e3e28da15c4800662981d6231105b0af2679699510389d14d1411b5c5cd5f1fc7d601379fd04d7a2b49dd193ab8d9
+EBUILD zeroconf-0.28.7.ebuild 871 BLAKE2B 7bd7aca1ef66c618bcdd8b73118fecd95ae741467186dde846b92873d26b7cecff44cc640a601ad84060b031f1dab799b40f1268ffd8c02f43a688430de9007f SHA512 96ade0296d1bec0c8af18e9f8bc9ed5a9b2e163e7b27fabad727ab2fcade343f105fd5a4917877f7f8a3373c4b5b61ef6183ffb1eb888fcb4943d69a8ee1ec42
EBUILD zeroconf-0.28.8.ebuild 873 BLAKE2B aa44d4c4668f45ee14f7ad985b48999dfe8ed2ffa7ae288c2bc5863f35f3ac55630f6f2b5f4d1af20e92766465b524d7028084df9ceb0a0a7f7729937b9c71a2 SHA512 4a1a446a4f68ab021ad203f143042c8f7b6d206d5c8e0b049cc56be308ed4214650f7c3268997450837d0b155c13eba180568c483039e9b9d8ccb4e18cc3ddee
-MISC metadata.xml 387 BLAKE2B 9dea981cf6247ad6fb6ddb3b060671ddb031ec703dc00e61e2efb4909478d01b5dfa309ed848dafe321d388156d16f44bc7b803dab79731205e374b5f046757c SHA512 ccee11a4aad084b1ac1dd901d966e1424b7ad3769b4bdf62c2dd44f9cbb6ec1a566443967ba45b37ef6241f43d2a06c17ebb5028254fbf40e0a480fcc3d76f89
+MISC metadata.xml 412 BLAKE2B 6a739488228910f36342ec3ad1eab50ca3c58c5bb1004d23e465009179dea3452558f3119f6c4e4a6b7b62bd0729fc3ace9a8c2be673ce6b1567181f7acf50db SHA512 86d45467ddb20b64dd7f868fabd1a8ff98469f8fa1cb99ac5f6ce1535e798da06bf78276d8d242b04056c07a195b8406bbc558c09aabb55c25cd875c44b96bd0
diff --git a/dev-python/zeroconf/metadata.xml b/dev-python/zeroconf/metadata.xml
index 773c6eaa7922..37922c45a3e2 100644
--- a/dev-python/zeroconf/metadata.xml
+++ b/dev-python/zeroconf/metadata.xml
@@ -5,6 +5,7 @@
python@gentoo.org
Python
+
zeroconf
jstasiak/python-zeroconf
diff --git a/dev-python/zeroconf/zeroconf-0.24.4.ebuild b/dev-python/zeroconf/zeroconf-0.24.4.ebuild
deleted file mode 100644
index 670067cd5c12..000000000000
--- a/dev-python/zeroconf/zeroconf-0.24.4.ebuild
+++ /dev/null
@@ -1,38 +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="Pure Python Multicast DNS Service Discovery Library (Bonjour/Avahi compatible)"
-HOMEPAGE="https://github.com/jstasiak/python-zeroconf https://pypi.org/project/zeroconf/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="dev-python/ifaddr[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
- dev-python/setuptools[${PYTHON_USEDEP}]
- test? (
- dev-python/nose[${PYTHON_USEDEP}]
- )"
-
-# Not included
-RESTRICT="test"
-
-python_prepare_all() {
- # It's virtual/python-enum34
- sed \
- -e "s:'enum-compat',::g" \
- -i setup.py || die
- distutils-r1_python_prepare_all
-}
-
-python_test() {
- nosetests --verbose || die
-}
diff --git a/dev-python/zeroconf/zeroconf-0.28.6.ebuild b/dev-python/zeroconf/zeroconf-0.28.6.ebuild
deleted file mode 100644
index 821b003fcdef..000000000000
--- a/dev-python/zeroconf/zeroconf-0.28.6.ebuild
+++ /dev/null
@@ -1,38 +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="Pure Python Multicast DNS Service Discovery Library (Bonjour/Avahi compatible)"
-HOMEPAGE="https://github.com/jstasiak/python-zeroconf https://pypi.org/project/zeroconf/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=">=dev-python/ifaddr-0.1.7[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
- dev-python/setuptools[${PYTHON_USEDEP}]
- test? (
- dev-python/nose[${PYTHON_USEDEP}]
- )"
-
-# Not included
-RESTRICT="test"
-
-python_prepare_all() {
- # It's virtual/python-enum34
- sed \
- -e "s:'enum-compat',::g" \
- -i setup.py || die
- distutils-r1_python_prepare_all
-}
-
-python_test() {
- nosetests --verbose || die
-}
diff --git a/dev-python/zeroconf/zeroconf-0.28.7.ebuild b/dev-python/zeroconf/zeroconf-0.28.7.ebuild
index 276d5ec5755d..8d4bac37d9a9 100644
--- a/dev-python/zeroconf/zeroconf-0.28.7.ebuild
+++ b/dev-python/zeroconf/zeroconf-0.28.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -18,7 +18,7 @@ S=${WORKDIR}/${MY_P}
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
RDEPEND=">=dev-python/ifaddr-0.1.7[${PYTHON_USEDEP}]"
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index 0415949b88af..6765d06f616b 100644
Binary files a/dev-ruby/Manifest.gz and b/dev-ruby/Manifest.gz differ
diff --git a/dev-ruby/facter/Manifest b/dev-ruby/facter/Manifest
index c94cd5e37ed8..1321f94e422b 100644
--- a/dev-ruby/facter/Manifest
+++ b/dev-ruby/facter/Manifest
@@ -1,6 +1,8 @@
AUX facter-3.14.6-fix-static-libcpp-hocon.patch 488 BLAKE2B 73f28cf30f5dca16f2ea8bc3346ea95df5d6b3d925a6373153460699e9075017fb43640b714f025c5f8a2167e0742bfffc20dcf886b5e0f6bdabab181a07a7fb SHA512 72192b75ae6d084d0e47ec6a7f4d0817dafd0623269d16cebcb5615d8df0efc891176d0cf246f41dd0f2180d54b8cc94ee596295787fbdb3ca83d0cd41380e89
AUX facter-3.14.8-explicit-rspec-2.patch 578 BLAKE2B 7bd6134235c61e03b2706388ad0c2c21e67582b00c5588b1d0596e3f783eb1df448a92c031862b03c0dffeefa10e0b69fdda4b44d88ac6e09a66f325900cf96f SHA512 a4c219b78b25c2a12e8578c092284fb4bd6d07b8b0d819d5625b1043d2b395413609e21266d3a7bceaf0461ad059e0edfea14a5e48bab85995eadf2d77bff17d
DIST facter-3.14.14.tar.gz 407276 BLAKE2B 5f911581773ef9a19ee42b5ed64114e2519ff88e024490d74bf9b1e777221d92d3ed502c8e6a0df573a5390fca323fcf0bcfdce6aeed25826c84efb3971307a5 SHA512 22e0ff0a9280be129f7587e24109f76f34660d99086378dd7e9ccc004c08a4fa5dd6f9ba50957c146ea40e26344ee87dbafd45b885f8f576192b6e572b084af7
+DIST facter-3.14.15.tar.gz 407293 BLAKE2B 0f9bfe78314144e920695e678fa7ce8b4656ba424240e7e7621fe048e15e46db6fe507bc859448fa22f31e28caecadc33877ebaee8dab85c8e87238daf140157 SHA512 45deb530991883ecb1235d6a6166c36888c3c2c4a42a694e041f4d0911ab4bed880bee56034871fde08cc723b7270166e7d0dfa626bbc205d3b1f495c8d74691
EBUILD facter-3.14.14.ebuild 2138 BLAKE2B da159d7ebc68d3587a29befc35742729e938c63fa176ed924daebd564efbc839be7a3e6f7f929d2222da71cd70de684d4f257f4da3d00de9ba3c73d7910d028d SHA512 71012baae5a2c15c3228004cab2202c59343b5b704aad7e37f89285db826c38a2695acd032bb5451a2d46db90779c509acf1df7cf40b8b420dbb4d7f5e793c1b
+EBUILD facter-3.14.15.ebuild 2140 BLAKE2B 230753014d081e4f4960ea8da9bc6f67556f372ea291a8c13136f1ab08bf4ecc52cae9a9f961623f92ecde6e84c232c04c5f830a111ca8e7a385a8fde9453ab5 SHA512 01fe42671b8cead735468a78cc7c9076bff32beba95d1b1bac8188e0cdd2c16a07368f8a26fbd3c9c2d414fec34aa49bb32d7bf5dec9c6642dcea7bcd2e7884c
EBUILD facter-9999.ebuild 2490 BLAKE2B 9c480e951320b78a43aac1c436d5008d3461de4a62f73f76e7ae6a1eb62d5ac0b4af8f58b2fe25738c892e68d3c014be43f0ac79a8ccfc065c0f1485dbc03428 SHA512 41a5ca3bbbbfb9e5c94271490e7d9a9a1a99ca76b9c3c3ccf5b9ac6b3da005101063ad9b6e3ae8c53e9335c1d55e8b3f8f528f1b759b85a40f6251217b8a7e76
MISC metadata.xml 539 BLAKE2B 989d6bb49686504b47720be6119802f06f998514c53261bb71cb0082cccbd22361195122c101e319ef985f6d5d39d84bb7a6409d77b4735c26e6b87856770a79 SHA512 92486b6b382d065c39999f271b07a915ac6f80fba225b0c1deee86f73a0143d47e8fd986e2ad6a82ae20a9cdd59ece63b623c6a2ec9d10e178c1fbc54f5381a5
diff --git a/dev-ruby/facter/facter-3.14.15.ebuild b/dev-ruby/facter/facter-3.14.15.ebuild
new file mode 100644
index 000000000000..0feb8baceeec
--- /dev/null
+++ b/dev-ruby/facter/facter-3.14.15.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby24 ruby25 ruby26 ruby27"
+
+# git-r3 goes after ruby-ng so that it overrides src_unpack properly
+inherit cmake-utils eutils ruby-ng
+
+DESCRIPTION="A cross-platform ruby library for retrieving facts from operating systems"
+HOMEPAGE="http://www.puppetlabs.com/puppet/related-projects/facter/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="test"
+if [[ ${PV} == 9999 ]] ; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/puppetlabs/facter.git"
+ EGIT_BRANCH="master"
+else
+ [[ "${PV}" = *_rc* ]] || \
+ KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+ SRC_URI="https://github.com/puppetlabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+RESTRICT="!test? ( test )"
+
+ruby_add_bdepend "test? ( dev-ruby/rake dev-ruby/rspec:2 dev-ruby/mocha:0.14 )"
+
+RDEPEND="
+ >=dev-cpp/cpp-hocon-0.2.1:=
+ >=dev-libs/leatherman-1.0.0:=
+ dev-libs/openssl:0=
+ sys-apps/util-linux
+ app-emulation/virt-what
+ net-misc/curl
+ dev-libs/boost:=[nls]
+ >=dev-cpp/yaml-cpp-0.5.1
+ !=dev-ruby/ffi-1.0.0"
diff --git a/dev-ruby/http-parser/Manifest b/dev-ruby/http-parser/Manifest
index 4c0c378023c5..1a3280cb5754 100644
--- a/dev-ruby/http-parser/Manifest
+++ b/dev-ruby/http-parser/Manifest
@@ -1,5 +1,5 @@
DIST http-parser-1.2.2.gem 32256 BLAKE2B bc1600497db7c0ae9ee9311a6eae6494090b190b49d37809671d0c2fbb3b56ab4709dd16b68c7bfe8fc75609fc6f01d31c21c92681b9adbb4c83e521991d9172 SHA512 cffc1561657b7cb50c446e54da20176870ffe5f1acfe5e9fadfeacbea421fcc89243dd8f4a04d7933e19c155662fcd47db950c3743968d7981c52aa6c0a43ab5
DIST http-parser-1.2.3.gem 31232 BLAKE2B 055ab9ccb42bb85f87b65eeaa59f645ec390f0751eb379b22b1a2c83920ef1c482a3bed8f5105843c341fe92ba0c8d44272688b929bca13c690945f7e37b282f SHA512 03c34c3e8174d9010440483af34800b74a7bbddd5daa63607e6aa2254d9c91cf36d90854ea65827b32680432de278aeeb7b8878f788f124c150f163409fa5107
EBUILD http-parser-1.2.2.ebuild 630 BLAKE2B ac881c10e770eb83bf1527965763c052ff56f3eaad578f82d4247a562416a4f3fdbb0e12ee441a2824d6ceba720013b9df6c14d16879cce304d90b387f15d4a0 SHA512 ce4bceeb4f80b58ce5a311453b1559929eafb1a1349f21aac869260a4d8ee8695737251a0d46310833da6719943ef1dbcfc2840bdfc0119562a99b3b411a1a5c
-EBUILD http-parser-1.2.3.ebuild 630 BLAKE2B ac881c10e770eb83bf1527965763c052ff56f3eaad578f82d4247a562416a4f3fdbb0e12ee441a2824d6ceba720013b9df6c14d16879cce304d90b387f15d4a0 SHA512 ce4bceeb4f80b58ce5a311453b1559929eafb1a1349f21aac869260a4d8ee8695737251a0d46310833da6719943ef1dbcfc2840bdfc0119562a99b3b411a1a5c
+EBUILD http-parser-1.2.3.ebuild 635 BLAKE2B 83a504826b3f27365269c2184874de5ae6864e1452cda9cb418f4f2da290ab85c50320712794a24474e3f5a05a08d213e9962071438cfdf577751d65da0bd8e7 SHA512 313400dc96a97531c0cdc8321d83a2ff9355ca7587fe3345c6c15d37c63806ed336df8d91e7f59a200a400527e78d35232bb0fa6dec2c7c435109a36b51a4cec
MISC metadata.xml 343 BLAKE2B 72290387c9fcabd2fc09db5cd44f3676f1b8bd033aeabce6bc0b1a52eb9af14b7908b48c9c5a765af0af4578b3d3c54574f5793acc1869d97ba70b8d82545bda SHA512 efc0c6cc3d88913690573b792e3ee051538034bb5d6b368cefa4d558e91ef6104060007a8d605299ee18bd67727a122752eaf754ecb341d596e1b3bc5e1b1ace
diff --git a/dev-ruby/http-parser/http-parser-1.2.3.ebuild b/dev-ruby/http-parser/http-parser-1.2.3.ebuild
index e3227ecbebf8..24bab3203d7a 100644
--- a/dev-ruby/http-parser/http-parser-1.2.3.ebuild
+++ b/dev-ruby/http-parser/http-parser-1.2.3.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://github.com/cotag/http-parser"
LICENSE="MIT"
SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm"
IUSE=""
DEPEND+=" >=net-libs/http-parser-2.8.1"
diff --git a/dev-ruby/http/Manifest b/dev-ruby/http/Manifest
index 5d256ac291ef..adc15405d3f2 100644
--- a/dev-ruby/http/Manifest
+++ b/dev-ruby/http/Manifest
@@ -3,5 +3,5 @@ DIST http-4.1.1.gem 74240 BLAKE2B 350d4a2eb966f8dae05a206e20a92d8ce0601df36673ca
DIST http-4.4.1.gem 75776 BLAKE2B ab34a6a567842d52f9b7cbe3fc3fb8e4757f5cf1303deacdf2f2130a44e82fde64f0db561c3f8fc28100faea277a9c4a9352f95e6cb1359730b34e83a7b36d72 SHA512 6e43a8ae379d7c8a807a9a03c87bfb5ad1719f9838e26ac7a695220ee2bc50344accc2db268d30da175328fd5468b87ec8532d17ce42a5b74d6c2c4c281d1bc9
EBUILD http-3.3.0.ebuild 1239 BLAKE2B 752e544f8c6282d43b6a14e74ccf79fb876f19f5d4036717a0ab9e659343c7dd418ca55239c01543e1e2aad70d24344f396cd8e9a8c438336de39605265b43d1 SHA512 58d13dc6143a19b0cded23a73df365bde42a98c86c400a2d98b03f26ba31f78b9d607b3d6798b81407aee34ecb6a8a00799c4f9613e69c95fc033aa3ba355c79
EBUILD http-4.1.1.ebuild 1350 BLAKE2B 61fbfd3b70718a979115e66a3078b5cda6ffda0f41dffa7beb9aa1fcc5fcb7cea0a3773979041570e4f421343ddb5b56c96c790fb02bf454b1ab5abf21b833e3 SHA512 a37f1b2813fbca9b378e1ed06c66511ca60f176024630066932c42cb8e217702ae390cc15e6c7dc570ee6f2d345d2d75cdc30574b07fb0b7149b37f493f5a581
-EBUILD http-4.4.1.ebuild 1490 BLAKE2B c976a3c99296ef53a408216d65fc69e423e330b7a8c096ecb2eb89239eb3f931c784abd38a5aafa1383dab5ac8c38d1db83f33901f5782c79a1d0d98ebac9b58 SHA512 02934ebf735b177ccc19dac03ba476245a94db24b2da2e0dc365a6b628ee3ea61c90ae16ce7965fedab202cd8466f3ad7dc3cc51b8aae7a17f885cf2abd5155d
+EBUILD http-4.4.1.ebuild 1495 BLAKE2B 01d95c290b638f46a836ca785080b179a6c388ef19c4aeb0cd4d20be978cb8655f3d8fee12ea01b9783a91b798b3c8b13cd8a14f5918274be4d1298c0da58824 SHA512 e1a4f98dc8f3d77d28e7247cbabb4ebdb18d01263e64e68d23fb1fff332507817ab5141ab3060f374097462b78ebdb0cb0f61f7665dd31826b78e3967dc1e4e5
MISC metadata.xml 339 BLAKE2B 2508769568914caafa01e9e8e6517a7cf9c1733c772b3c605c8dbb056efb8dca3be9525e1ba2ac610bd6d5b5dc02b7625f3569dce0597444240bc2ed8d8449c2 SHA512 9b43a2f61eea32941c251429694bcfe432f284527c332efdaf4187c9ad8c6f53cd924421ca9d56cefce75cbaff104d4f7579790fe09b45a4cced06bedc44d1c1
diff --git a/dev-ruby/http/http-4.4.1.ebuild b/dev-ruby/http/http-4.4.1.ebuild
index 1b3a4d077041..b0471b97c35c 100644
--- a/dev-ruby/http/http-4.4.1.ebuild
+++ b/dev-ruby/http/http-4.4.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -15,7 +15,7 @@ HOMEPAGE="https://github.com/tarcieri/http"
LICENSE="MIT"
SLOT="4"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm"
IUSE=""
ruby_add_rdepend "
diff --git a/dev-ruby/puppetdb-termini/Manifest b/dev-ruby/puppetdb-termini/Manifest
index e7e53d4bbf13..da6673278958 100644
--- a/dev-ruby/puppetdb-termini/Manifest
+++ b/dev-ruby/puppetdb-termini/Manifest
@@ -1,7 +1,5 @@
-DIST puppetdb-termini_6.12.0-1stretch_all.deb 21290 BLAKE2B 11bc0a316517190162e7e4e5a2ce05bc880ef8412bfcf5fb66ec68545bd7779e217d5d5e75ab79f24fc6b2f68e1a962262704efb8833fdce84288d060245b898 SHA512 a742825e9f9bacf5726814474b7812393d1a51c50fd710d771c10a9e23c874a465c6859fc17485b66a2c4114ac170f2f25c5ce1be6684ff18f5da31dc9ef0744
DIST puppetdb-termini_6.13.0-1stretch_all.deb 21296 BLAKE2B 6ef6f82047f293b854e1b0d6db2933e18bc922225d1bb7fe4a3d03d2dbe5da00cdb68e7e3ac35097f466ee21de5a7ed584606684a52c088a9e31abe9fe11d7cf SHA512 bbcf8d2ed996925ead0add6899b266ca9308b01cc12d0dfa6f61956e801a092abf5a01ae4647bf96778f9fe0fa95e17bfae0a3b30576346093651141c1982ebf
DIST puppetdb-termini_7.0.1-1stretch_all.deb 21154 BLAKE2B 6b64de09d6b6c76395f79acda6322c4221cf58efb03442faee697736faa3fbfc0d3e4e0c0f318a3374a5b6b6844312a469656d3e31a5534f484c568d9d5e7fe1 SHA512 29b0e380d3e62bb714838c7e4dac0e296c69297bd4e4a4097ba006f846eb4166051d0c76195afb0a661e6e34726acbcc858e7897128f1bbe14b99a4ea44a9ff3
-EBUILD puppetdb-termini-6.12.0.ebuild 663 BLAKE2B 147e2a56aa251a1655e5019f086d7ac2b2a3a75935559589c1d41207026cb5d885e3dd93f8251dcf97f220a53a4f86d507ce5b4ca3a42a8927542bd81c53b081 SHA512 7174a6cd165c552282272ed7f0a40a437a8f9111f80cad4e0ee29f29ba0c7ef8317bb7e6d2be517f2210754fbcd9054401de203c2fc2e11d994e8b00f43141e9
EBUILD puppetdb-termini-6.13.0.ebuild 663 BLAKE2B 147e2a56aa251a1655e5019f086d7ac2b2a3a75935559589c1d41207026cb5d885e3dd93f8251dcf97f220a53a4f86d507ce5b4ca3a42a8927542bd81c53b081 SHA512 7174a6cd165c552282272ed7f0a40a437a8f9111f80cad4e0ee29f29ba0c7ef8317bb7e6d2be517f2210754fbcd9054401de203c2fc2e11d994e8b00f43141e9
-EBUILD puppetdb-termini-7.0.1.ebuild 665 BLAKE2B 611933cbf3ad90f8e6f11c4b3460d9946519c30ff57b0132d0de9cfab7d243365ab4a3deb10643df19b79cb2bbef878347614e3798544f2494e75f786d8e934b SHA512 613eee0dfa30b09fe2659dd2775d8f1c0f334d5304d153d7965342c0dc610f1402b6e34b60078078d852d031e2b67cc8ef59d952c266caf10bda6dfa5eaa2603
+EBUILD puppetdb-termini-7.0.1.ebuild 663 BLAKE2B 85e09da58e2c7ad55aeac75a1a641a3c26714547f6b488bea929ecc4336aac424b65c35dd37e24c53d517bcea6d22a4cee7471a824f3257e4b5b69e19559b94d SHA512 5e6417c98ae0fdf7e7f552086bb66814795df5583e08574a32dcac58f06e0b48b32775ea1925b953631a35b364ba219e3701a0a47ecf6100ff36518959048c69
MISC metadata.xml 366 BLAKE2B f03ce821e0baae11d699365e190751fd1c9d233935e46d31ed9f19105ce6b66b1c4ef56697f5e5581022261e4b45bacd4f04368c3e6f74a12b15ee4dabecf869 SHA512 96ba26c725e5fd36269acc3556a7ad6b89d26010e376ff76cffd2a99481b2d3c9c76595f5ee4cba585c3dd7ac76e121aa4f7fbc0efa80d760748e9f81c998655
diff --git a/dev-ruby/puppetdb-termini/puppetdb-termini-6.12.0.ebuild b/dev-ruby/puppetdb-termini/puppetdb-termini-6.12.0.ebuild
deleted file mode 100644
index 7919b7b236e7..000000000000
--- a/dev-ruby/puppetdb-termini/puppetdb-termini-6.12.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-inherit unpacker
-
-DESCRIPTION="Library needed to connect puppet to puppetdb"
-HOMEPAGE="http://docs.puppetlabs.com/puppetdb/"
-SRC_URI="http://apt.puppetlabs.com/pool/stretch/puppet/${PN:0:1}/${PN}/${PN}_${PV}-1stretch_all.deb"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-# will need the same keywords as puppet
-KEYWORDS="amd64 ~ppc x86"
-
-RDEPEND+=""
-DEPEND+=""
-
-S=${WORKDIR}
-
-src_install() {
- insinto opt/puppetlabs/puppet/lib/ruby/vendor_ruby/puppet/
- doins -r opt/puppetlabs/puppet/lib/ruby/vendor_ruby/puppet/*
-}
diff --git a/dev-ruby/puppetdb-termini/puppetdb-termini-7.0.1.ebuild b/dev-ruby/puppetdb-termini/puppetdb-termini-7.0.1.ebuild
index a7f2b53b2dde..e88438205f95 100644
--- a/dev-ruby/puppetdb-termini/puppetdb-termini-7.0.1.ebuild
+++ b/dev-ruby/puppetdb-termini/puppetdb-termini-7.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -15,7 +15,7 @@ LICENSE="Apache-2.0"
SLOT="0"
IUSE=""
# will need the same keywords as puppet
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
RDEPEND+=""
DEPEND+=""
diff --git a/dev-ruby/redcarpet/Manifest b/dev-ruby/redcarpet/Manifest
index fa814d6d2230..01097b370f83 100644
--- a/dev-ruby/redcarpet/Manifest
+++ b/dev-ruby/redcarpet/Manifest
@@ -1,5 +1,5 @@
DIST redcarpet-3.4.0.tar.gz 105525 BLAKE2B 38b28f400b7300ea49cebda9b4739193b54c322c1c20ecba50938893286ad87e44ba9e9da83eab8433af0790d76bc0db4189fc0b70a4438480fe784570809e1a SHA512 25ed1fd35ebf815f396ed819baec69aae366bafab3983a53d364b1ef0d3f18cecaa523953d12cb0e5b896c30ac86e000318f33c633047bd271362474b9b8f877
DIST redcarpet-3.5.1.tar.gz 106950 BLAKE2B 2f84e0dbadaa79827d9d244988b19161996e249e493208b20b6339f0eccf73160fe84d79f11a23419573693bbc9c1faae61e690ffe5ec133f8a0baddb69d92b5 SHA512 348ee8fc56b89bb1b9fe0b004cab08e9542f3806a885fb5fb0ff58c9a0fa704ad37611484e071951ad00d1d337988d5dae6d240cd65df890f8fe0865e242608d
EBUILD redcarpet-3.4.0.ebuild 1031 BLAKE2B 44ad77ce9fff4057c3eaf59bf83b3f30c3e37c870fe468cb2ff9f667485fcf063db72f436c60c1cd969228173161989c342e2ac26fd53ca90598d72a4df0f810 SHA512 4c01aef2e885a9a6eed7374b27e16b29b442b08677089c4b1520e445102f75512080fa9532a2969abb077b53d232efd649686da59b398efdcb27c693dfc4b73e
-EBUILD redcarpet-3.5.1.ebuild 1000 BLAKE2B f4357ff0744a49a305e7c44ced98b19cd1735a31508e83abcd4c0387cf924b15f65bc471f307800423302d735f46ba04798e7bac0af6e5c139537ef88ac477ba SHA512 d36017080549e90fa4a4529f832cc0f4439ae49a1e127874c6a46e4212e7c225b9459fe29d31db94870ddb3a2e0871c86b8c9868a0d78c279610d4bf43ed4f5f
+EBUILD redcarpet-3.5.1.ebuild 999 BLAKE2B e46e8edf6d5f97ae584614800065a7119493f19bd50cae997dcc33ccb7d694791a2b52d793c84429b7525c2e98ccdc5aba6eb434018467f67bffc3f76e637fc3 SHA512 8cbf587e58687e815fb010d7b06004ec4ff6678728178c918ae98575dc12520af93515615d32d3e063e33ae6635f2df0c6673f4b433041eb7fd1e922d9928a56
MISC metadata.xml 339 BLAKE2B 3f8aaf2e00581b0e8a62f7a035a0bb80208dd8b4a1541cf77a3550cfaa486e800662c9f251bf02ec3e9a326dfe62d254981f04808b35700130b055488025c79b SHA512 eb85f708675bd9dd3d132e73d14e52689a94279ffc754097a986ddc3224ee21a69e7e81f1bc391725f1d2f1d41f72f8553079a10ffde7c8eb55048b7c6f089d2
diff --git a/dev-ruby/redcarpet/redcarpet-3.5.1.ebuild b/dev-ruby/redcarpet/redcarpet-3.5.1.ebuild
index 6133615221b0..23db100e9928 100644
--- a/dev-ruby/redcarpet/redcarpet-3.5.1.ebuild
+++ b/dev-ruby/redcarpet/redcarpet-3.5.1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://github.com/vmg/redcarpet"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ppc ppc64 ~x86"
IUSE=""
all_ruby_prepare() {
diff --git a/dev-ruby/ruby-gettext/Manifest b/dev-ruby/ruby-gettext/Manifest
index 43b05eafb7d0..842d5b7415bd 100644
--- a/dev-ruby/ruby-gettext/Manifest
+++ b/dev-ruby/ruby-gettext/Manifest
@@ -1,7 +1,9 @@
DIST gettext-3.2.9.gem 285696 BLAKE2B a7bc40b2102f5b937d5f0e407dbaa23ead1da59eb9284c10a249c59548d0e2ad5fcd56b8855439893d2d31b57e0109bb6a9d5cc2d24075f5e360dc16b9291137 SHA512 21496c38cfc16a2b280f30bb94ff4560007eaa7f02c2341cb26aca2969a663c0863cdb650b4eadfd262d8585111dfb572e2ebc66a7a879045de50bf9da80a501
DIST gettext-3.3.5.gem 290816 BLAKE2B 74434c3feaedc16a17ee530669dacbc4b32ae0be95eb903ce89131619e862e1c823351653ce3c5f95f0882c183e3b2fe87b423a245aa2d8803688ce7e6afb5f7 SHA512 6777b96dd73b3d454c0a14a40d2ac0eac52894fa58067ba9ec976627c96efc98b294b1498bed965d0426bcaa1b371dcde5745101e05e21e408397b4e8d31894b
DIST gettext-3.3.6.gem 291840 BLAKE2B 5ca1a48582cb46e96fd672d9dc9e65ef3d5171560cc82fae147669023dafef761b67a68f31eb32fe1e433d918efe2c4c6983c32d8985093a3f090ab718703fe4 SHA512 ed03d370c03fe7502360aeac33f924c7463d7cde6bcde85c66befe8560b221a00f995ba6208ee14d1ca9cbaad6bd37aa7d0085ed75557f5b07724468de4433a8
+DIST gettext-3.3.7.gem 292352 BLAKE2B 76232148ec89720553e7f260c7222b8c5f9eccf0dd0b0b3afa776d9fe6dc6205b21f7853fd1a1edb6e28208ebbd56e327d160af179a4b7c7aaab12965243b806 SHA512 6e7906d68b3e834e1a9d69cea26a61ffed07abd035c9a8ffc3456bc2fdcb9495700c2aaa4d099cf75f88dc6916899510208012e02d1d4f15de3d5148251b4233
EBUILD ruby-gettext-3.2.9.ebuild 1767 BLAKE2B 851f67ad032cd953e78cccd232b8ad05fc868ce75daa07bc7fc7dabbe3b342e57bc3122ede6e5cab86846f827ae88ebf83601fe4c6d049ba50b6008f694bd5b4 SHA512 b11c4c2de781ff7ac1d39babb5ba99d5ce1e744e8eb9be5d1634a9e15457b01645bf705f2462c26912f0f8ac06bf37ab8d0fbdd3eaee9f3cb609ffe5ab5b33da
EBUILD ruby-gettext-3.3.5.ebuild 1729 BLAKE2B dcfb65933b92155a73e83c55ffa7bb6cfc0ce05d2ec5b4dbca0fbab50abe4499f44ef8d10d6c4bf22ea39808eb02fed3d43027cf3083a17cf471ef183341733a SHA512 5418d2b91c2ac538a8ea3d4fb089a25f8c354fe193bb46b98aba79e91e034eefcf8e911347153ea55710534292c24591b1df4337c7c2f44984b2d0b5c4c421f3
EBUILD ruby-gettext-3.3.6.ebuild 1736 BLAKE2B f1b19efb62011446279fcb327179e773ebb2239097b2b2b7a8195c7b2672429f4b58b35cab47995beb815386e5de3a4714f6126361716f68b4eab01549fa0df8 SHA512 5b52cc32f1e21418a9d4d9d84a8d90f65732d6b15f37e9cc5c76ba39f61b8932cf9de62cab5e3b9d9ac3036cafc466ee23410869269ddd70dcd5d7c44d97bea6
+EBUILD ruby-gettext-3.3.7.ebuild 1736 BLAKE2B 30f9ab98b4b1e5e061b7599c848b85509b224562d53f5cc9060dcabdb1a66769f9706c96ef9d181bea6b414ed12ec5ba99a33277adbe5b6b9f7a296b4445ed66 SHA512 7aa10787e7d8a2ee5109c0e0cf4a571c461280488fcefe9ecca34449f7c8e3dac2e3cefe1c22f1278f1f5cae1b0308f563d8e10133abf38a4f2281e3cb12c130
MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/ruby-gettext/ruby-gettext-3.3.7.ebuild b/dev-ruby/ruby-gettext/ruby-gettext-3.3.7.ebuild
new file mode 100644
index 000000000000..fb6b697eafdf
--- /dev/null
+++ b/dev-ruby/ruby-gettext/ruby-gettext-3.3.7.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_NAME="${PN/ruby-/}"
+RUBY_FAKEGEM_VERSION="${PV%_*}"
+
+RUBY_FAKEGEM_RECIPE_DOC="yard"
+RUBY_FAKEGEM_EXTRADOC="README.md doc/text/news.md"
+
+RUBY_FAKEGEM_TASK_TEST="none"
+
+RUBY_FAKEGEM_EXTRAINSTALL="locale po"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Native Language Support Library and Tools modeled after GNU gettext package"
+HOMEPAGE="https://ruby-gettext.github.io/"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc test"
+SLOT="0"
+LICENSE="|| ( Ruby LGPL-3+ )"
+
+ruby_add_rdepend ">=dev-ruby/locale-2.0.5 >=dev-ruby/text-1.3.0"
+
+ruby_add_bdepend "doc? ( dev-ruby/yard )
+ dev-ruby/racc"
+ruby_add_bdepend "test? (
+ dev-ruby/test-unit:2
+ dev-ruby/test-unit-rr )"
+
+RDEPEND+=" sys-devel/gettext"
+DEPEND+=" sys-devel/gettext"
+
+all_ruby_prepare() {
+ # Fix broken racc invocation
+ sed -i -e '/command_line/ s/#{racc}/-S racc/' Rakefile || die
+
+ # Avoid bundler dependency
+ sed -i -e '/bundler/,/helper.install/ s:^:#:' \
+ -e 's/helper.gemspec/Gem::Specification.new/' Rakefile || die
+
+ # Avoid dependency on developer-specific tools.
+ sed -i -e '/notify/ s:^:#:' test/run-test.rb || die
+
+ # Avoid tests failing due to a missing test file.
+ #sed -i -e '/test_invalid_charset/,/end/ s:^:#:' test/test_mo.rb || die
+
+ # Avoid SAFE mode test that fails on ruby 2.6
+ sed -i -e '/test_safe_mode/aomit' test/test_gettext.rb || die
+}
+
+each_ruby_test() {
+ # Upstream tries to daisy-chain rake calls but they fail badly
+ # with our setup, so run it manually.
+ ${RUBY} test/run-test.rb || die "tests failed"
+}
+
+all_ruby_install() {
+ all_fakegem_install
+
+ dodoc -r samples
+}
diff --git a/dev-ruby/rubygems/Manifest b/dev-ruby/rubygems/Manifest
index 2aaebbb35c86..591e7c53aa8f 100644
--- a/dev-ruby/rubygems/Manifest
+++ b/dev-ruby/rubygems/Manifest
@@ -15,6 +15,7 @@ DIST rubygems-3.1.5.tgz 995812 BLAKE2B 43471515e4da8a6fe47a419f67f26efc9855334d4
DIST rubygems-3.2.0.tgz 982282 BLAKE2B 2895cee1d2bc4e59073cc1e3e96a7958d079da5d7a7d2eed392e6bd2fac457a738518f30365d5601511998997f578b3ce9ed65c5e41cdc80138d0ebb07df3548 SHA512 a3d0b9a577a88d8fa27d3bbdfd4bb78e419549c579dc1add4f80e4abd017cc64c441eb7ad260705cbae672937c07fdc0c76f8751bd942fea5a97953f01052f28
DIST rubygems-3.2.3.tgz 984126 BLAKE2B 3a1447738333cc27be3bbc30080b2e39be7557d9dbd9949fea21b0e6ca7c4ef3f062b5a2cd4c8004150f9dc548fe3c8e2cb174854c2d4ed7115f377662673398 SHA512 2910739e3bf3fbfdb98e71bfe97d5761ff6a6910e72004af4c3c3c050df80160c704318c62501b7283086ca3c2342cc9c8bb2ed406d5c582cb0f9d989c841c32
DIST rubygems-3.2.4.tgz 982062 BLAKE2B d74479b4798ccaf03a8940a6f76dc8f5fa28226ce29062b48e725ea47033a4f0a8d5e36df96aec97cff0b0a4eef8beb8ff14e6ac4df4596f170111e89c26841d SHA512 18f4cc79eb3ed5a48b760a6b7a1b4283d8ff7c929f712152eab6a7a389dcc9a969ec77891ee518c033546cef6584865beef4f8f33ea06172eea3ce4e172c1531
+DIST rubygems-3.2.5.tgz 982720 BLAKE2B 027343c37a9be7bc3ef1f12a2851ed1605ed5c0a55e9c23c5f42ebf92f101e2693da725ccc749ec7f48c507eb57e39d3ca91201e5f447779e373ff70d8a5273a SHA512 a12dcad3d1698fea790a4669a3183fb81958c97c702988e1ddda1f33ab953517950a38e382b366c6ecaaed3d7954190339a87c8dab77c5285ce74a858da55a39
EBUILD rubygems-2.7.10.ebuild 4512 BLAKE2B bce66fda261d27daa57b853de1b1605003c6557de15e3471ae9d426f16990da292e19cd48f0dc29bc09c2652adf521b93fa6a059dd1a6967fac692bde4d084d2 SHA512 9cf064646d60eee8037ffde0a059af6d408cfec13cde5715f8f172012e3f9c402a46139781f7e99c18a80d1fc9f81fd7519b3f7c19bbade22adf7c277b11b949
EBUILD rubygems-2.7.11.ebuild 4521 BLAKE2B 8b28842aed8ac1c6387fe52b2639b5afc42c70c9f2222d9567068f173140ffcc51534899e0e0d0ac132e6a1e395126838e0a7b82a17c8ff5c09829a2fc02a017 SHA512 e9dc2072951259dfe568eead50b32aa6bd28515e66926a18568f85d330b05d2d900399ac3a506254fbca9f4dea49064a5d517e4e4de9e7c60929477ffb953d42
EBUILD rubygems-3.0.3.ebuild 4646 BLAKE2B 42f400a5286dea3ff7aa5f3739f7d259ba56bb147d8fdcc5644ec583d0ea98fc7337bc3e9def844a293d09a8bb9745184822b09f7d7c6dc71ec0689e3bf44166 SHA512 4d86e443da752f2422437e9426cbdd32cf32db2ddc7bc36a20f382c4756c9251c96e79e581b93ba2764bece593c95a0c79b7a1063c2c202aec4afd58f0840752
@@ -25,4 +26,5 @@ EBUILD rubygems-3.1.5.ebuild 2847 BLAKE2B 661f1e1035c989668cb24642cab1cc444af535
EBUILD rubygems-3.2.0.ebuild 2862 BLAKE2B 596b1e5deeabbc17e332a4bae8fbfaab3aa8b9b305ed7b35f832deb1ffcff7d75730f3f62de7d7f8fe71eb4e1e8e24e934263d6dea15337456589769193805d3 SHA512 134ed46a51cd42e8b1ffd9a24ec82ce3770696294242a772e034bf5cbc0085a346aeaf619582f802caac893a5e1a76cb7eb82776d09c82eab022323a4ce690de
EBUILD rubygems-3.2.3.ebuild 2991 BLAKE2B edeeff882bab641104a4084de04be99c8452de8f003268501cacc9db5a414d2ccef08265d9dc6a3d6600dd0a4a7d71da2b8fd26e41ccaeafe1b135e8b70c2298 SHA512 bbfddc97de271cb9fb950d8fb28cda6ff183f91a2cde3af220781bb22b2aa5ab5111314aa96970f9f7d995451f54da4a6b0f892036ca28e38b30bc9665d73982
EBUILD rubygems-3.2.4.ebuild 2992 BLAKE2B 798fa78b7d11faa943e9ee03c6d1c832355e06774e3ff94f3e99c902719b865b0d19f74fe021b93de032dc72fe6e9667c2b83c64af70555b9ea1723f00011e2e SHA512 b70c68ecdb8a12bf49631b97fc5decc31a57b8de1fb1685f0dd9892ffdadc769cf4bad93b67678af106e5b2132ba18421d955c9302576c4b58e2324770e298b9
+EBUILD rubygems-3.2.5.ebuild 2992 BLAKE2B 798fa78b7d11faa943e9ee03c6d1c832355e06774e3ff94f3e99c902719b865b0d19f74fe021b93de032dc72fe6e9667c2b83c64af70555b9ea1723f00011e2e SHA512 b70c68ecdb8a12bf49631b97fc5decc31a57b8de1fb1685f0dd9892ffdadc769cf4bad93b67678af106e5b2132ba18421d955c9302576c4b58e2324770e298b9
MISC metadata.xml 335 BLAKE2B c86eaf3d37fad025b8f6ca0b03e65b1b472716b4fda4ca4d08b415b29a63405d8e7b2684d309091c90411c5fe809e5129c6e0c0c4e7a982b4aa062ffdd0ca7fb SHA512 fd7bf880ad68fe5f1fe8eb79f9662af87831ed499517d5a97e22f18a4ddafc69d53118f020e15c3b8b171fe144bf6cb0ce799beaa6e4e4bdc01c984ab582388e
diff --git a/dev-ruby/rubygems/rubygems-3.2.5.ebuild b/dev-ruby/rubygems/rubygems-3.2.5.ebuild
new file mode 100644
index 000000000000..7b3fb4d23fdc
--- /dev/null
+++ b/dev-ruby/rubygems/rubygems-3.2.5.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby25 ruby26 ruby27 ruby30"
+
+inherit ruby-ng prefix
+
+DESCRIPTION="Centralized Ruby extension management system"
+HOMEPAGE="https://rubygems.org/"
+LICENSE="GPL-2 || ( Ruby MIT )"
+
+SRC_URI="https://rubygems.org/rubygems/${P}.tgz"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+SLOT="0"
+IUSE="server test"
+RESTRICT="!test? ( test )"
+
+PDEPEND="server? ( =dev-ruby/builder-3* )"
+
+ruby_add_depend "virtual/ruby-ssl"
+
+ruby_add_bdepend "
+ test? (
+ dev-ruby/json
+ dev-ruby/minitest:5
+ dev-ruby/rake
+ dev-ruby/rdoc
+ dev-ruby/webrick
+ )"
+
+all_ruby_prepare() {
+
+ mkdir -p lib/rubygems/defaults || die
+ cp "${FILESDIR}/gentoo-defaults-4.rb" lib/rubygems/defaults/operating_system.rb || die
+
+ eprefixify lib/rubygems/defaults/operating_system.rb
+
+ # Disable broken tests when changing default values:
+ sed -i -e '/test_default_path/,/^ end/ s:^:#:' test/rubygems/test_gem.rb || die
+ # Avoid test that won't work as json is also installed as plain ruby code
+ sed -i -e '/test_realworld_\(\|upgraded_\)default_gem/askip "gentoo"' test/rubygems/test_require.rb || die
+
+ # Avoid test that requires additional utility scripts
+ rm -f test/test_changelog_generator.rb || die
+
+ # Update manifest after changing files to avoid a test failure
+ if use test; then
+ rake update_manifest || die
+ fi
+}
+
+each_ruby_compile() {
+ # Not really a build but...
+ sed -i -e 's:#!.*:#!'"${RUBY}"':' bin/gem
+}
+
+each_ruby_test() {
+ # Unset RUBYOPT to avoid interferences, bug #158455 et. al.
+ #unset RUBYOPT
+
+ if [[ "${EUID}" -ne "0" ]]; then
+ RUBYLIB="$(pwd)/lib${RUBYLIB+:${RUBYLIB}}" ${RUBY} --disable-gems -I.:lib:test:bundler/lib \
+ -e 'require "rubygems"; gem "minitest", "~>5.0"; Dir["test/**/test_*.rb"].each { |tu| require tu }' || die "tests failed"
+ else
+ ewarn "The userpriv feature must be enabled to run tests, bug 408951."
+ eerror "Testsuite will not be run."
+ fi
+}
+
+each_ruby_install() {
+ # Unset RUBYOPT to avoid interferences, bug #158455 et. al.
+ unset RUBYOPT
+ export RUBYLIB="$(pwd)/lib${RUBYLIB+:${RUBYLIB}}"
+
+ pushd lib &>/dev/null
+ doruby -r *
+ popd &>/dev/null
+
+ local sld=$(ruby_rbconfig_value 'sitelibdir')
+ insinto "${sld#${EPREFIX}}" # bug #320813
+ newins "${FILESDIR}/auto_gem.rb.ruby19" auto_gem.rb
+
+ newbin bin/gem $(basename ${RUBY} | sed -e 's:ruby:gem:')
+}
+
+all_ruby_install() {
+ dodoc CHANGELOG.md README.md
+
+ if use server; then
+ newinitd "${FILESDIR}/init.d-gem_server2" gem_server
+ newconfd "${FILESDIR}/conf.d-gem_server" gem_server
+ fi
+}
+
+pkg_postinst() {
+ if [[ ! -n $(readlink "${ROOT}"/usr/bin/gem) ]] ; then
+ eselect ruby set $(eselect --brief --colour=no ruby show | head -n1)
+ fi
+
+ ewarn
+ ewarn "To switch between available Ruby profiles, execute as root:"
+ ewarn "\teselect ruby set ruby(25|26|...)"
+ ewarn
+}
diff --git a/dev-ruby/sshkit/Manifest b/dev-ruby/sshkit/Manifest
index 7e31bf6dbb07..68ce447c0d65 100644
--- a/dev-ruby/sshkit/Manifest
+++ b/dev-ruby/sshkit/Manifest
@@ -1,5 +1,7 @@
DIST sshkit-1.21.0.gem 144384 BLAKE2B f4f77d9cf00db4bc0ab6ac092dc859af31fd50976fc9425c0e5ba1b5c1607bd9b50fff44f65f0207b9d9d604c5ace153ba05ec062fb064c44673572769416a22 SHA512 981fdaa19d633e92d4e3ef5fc9255a89d992813c400af4a468e6cf12ca52cbe612b771a87afe6392c4098d07b42162d5981025b8b214aafa197a68222b5e234e
DIST sshkit-1.21.1.gem 144384 BLAKE2B 961a3646b4401b1e4548b484143f12a9bc21644f710e19539c5831bbdb2f8a70449992c23858d31ce965a2139343d6e33eaa09650a753813191d655d0e73f83b SHA512 794ff492b737190470acdf8238ae4203ce1e66916ee2caba110eee7c92026897f89ee25d30971f9244359c51cc449f954ecabfd2f6a90b068cedf5ed253f8ba2
+DIST sshkit-1.21.2.gem 144896 BLAKE2B ea72b1d0df7252f9c4ffe010721a957b5a86cc43697acf4dfd065a74cca5317deeb15692449d573a2e5590ef3a23ee666196b7b661d6986a2f270d16e2dc8d89 SHA512 37515726b67ae0e2ac9dff42cf7b71a32832ebe144aa192332780e4d9aead1a9e4c3cf7f6f0b994804175a5befd896b32908a82ba2e4f4a1d4e4b0f5bf01c3b3
EBUILD sshkit-1.21.0.ebuild 1167 BLAKE2B b79a936b31ae0f50cf33806253ad81e1dffe2931cc93d0a0a8b0f5512d76f68c1e455512f308d9708ec153cd43324bff591a02118d1f5d4e7684dc983e6cd1cb SHA512 927d673fb96100b59387fd45e65c1f91781a947f1a6aa4dcca1d485304c995c9dbae1c48008ebf3f8b26a38aa02b08493a53d95348ce75b0fcf0b9fe2690b8dc
EBUILD sshkit-1.21.1.ebuild 1161 BLAKE2B 416b0ee8d20b4d8f162bdac3e3dcc683a8b2763f4ee7c57347b0191e63d4de384b7acbcb2865ddb06ba62bd97a3a52fbcaabdf7edc62f6310529247747aec052 SHA512 e485b70ba01292fd1e54a9a6c32f68b5734e7f6f5416e638986d315a8c9fffc1d73e9a16645c3b703430b6fcc0c5e2afa0b145df0d89fa9f7542f607c825cc47
+EBUILD sshkit-1.21.2.ebuild 1161 BLAKE2B 31b1b239dc398a2ea7f7b74d1a5531d240b1b0805dbc3af03999da8e45ccf6dbf2ac9fb709dcc5ed88c7a7305b0c70b3b3456560aa27b5b425664042645867b0 SHA512 ece47cde0972fbda3f7fdab4bff478050a13e3508484aae013e9d87656afee4325c1649282cd3837f8e50075cf9e17cb939f1bdb21ef3173eee41b3fc916fcde
MISC metadata.xml 343 BLAKE2B 0f8326d45916642aa200df9ede8640367ffbf73022b847f54f8869884a592489bc26a0da45406cd5409973e43290dafa3cb785460e7da61c20de3a796e025a03 SHA512 852971e242c5500cf6ce4fb0c2bc58560b96fdb8cc0f366fa41cac8e066f408330962cb86a35171c08bdea3493be81fbb10bb501ce207f7016a2a1b7c42d263b
diff --git a/dev-ruby/sshkit/sshkit-1.21.2.ebuild b/dev-ruby/sshkit/sshkit-1.21.2.ebuild
new file mode 100644
index 000000000000..37bf47f7d5d8
--- /dev/null
+++ b/dev-ruby/sshkit/sshkit-1.21.2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby25 ruby26 ruby27"
+
+# There are functional tests that require vagrant boxes to be set up.
+RUBY_FAKEGEM_TASK_TEST="test:units"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md FAQ.md README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="SSHKit makes it easy to write structured, testable SSH commands in Ruby"
+HOMEPAGE="https://github.com/capistrano/sshkit"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_rdepend "
+ >=dev-ruby/net-ssh-2.8.0:*
+ >=dev-ruby/net-scp-1.1.2
+"
+
+ruby_add_bdepend "test? ( dev-ruby/minitest dev-ruby/mocha )"
+
+all_ruby_prepare() {
+ sed -i -e '/bundler/I s:^:#:' Rakefile test/helper.rb || die
+ sed -i -e '/\(turn\|unindent\|reporters\)/I s:^:#:' \
+ -e '1irequire "set"; require "pathname"' test/helper.rb || die
+
+ # Fix assumption about parent directory name
+ sed -i -e '/assert_match/ s/sshkit/sshkit.*/' test/unit/test_deprecation_logger.rb || die
+}
+
+each_ruby_test() {
+ # Run tests directly to avoid dependencies in the Rakefile
+ ${RUBY} -Ilib:test:. -e "Dir['test/unit/**/test*.rb'].each{|f| require f}" || die
+}
diff --git a/dev-ruby/webmock/Manifest b/dev-ruby/webmock/Manifest
index ed7b5c991fc6..b484abea1860 100644
--- a/dev-ruby/webmock/Manifest
+++ b/dev-ruby/webmock/Manifest
@@ -1,11 +1,7 @@
DIST webmock-3.11.0.gem 125440 BLAKE2B 8c57ca5b49922a61590595cdeeb5d3306edb3be616fd8e5c68617838831537f2106664201580f645de58322f11e684dfc8404d91139eaead5810c0cb40d5dc1f SHA512 dda7318d32dd88dcd4bc1fee9d1f4644f272348b532cbb59afde2e6a1fc42f359125b28d605ff1a18edac4ed71c00aceb1c67a364c15cfa56092e226588b449c
DIST webmock-3.7.6.gem 122368 BLAKE2B 9bc40971f1eec96d88217544acc67b7abfe6c0815a0696119e12fc5629b4f51e1164ecc982525d2c02fa50c7b1b09548c4831c1d597f06acde04a83227ba0dc9 SHA512 85455495476b22d94b23e34a92db3f0f8cf1aa5bb52ea6a8eb71f5f0bcbdad1edc13dff778c62806ec27850320e9f4e17f12525bbac552e5e105ee1ecd771efd
-DIST webmock-3.8.1.gem 122368 BLAKE2B ba956c72f20e2c21cea90b107ef445e42a6995fdb31f9af65c3b561e9e1fbb9fbd299db009a1d83ddfdb473ce030d40aadf6633e23afbd072ee3b4debf7e0be2 SHA512 b1137fabb000469ee88fdd5521756f368463ee49988d5d89b51fa8352362ff249a4849159504834933e5e1248ed9b6791d254528b3cdea461fc9e8e5d92a334c
-DIST webmock-3.8.2.gem 122880 BLAKE2B 0cd10f391377749c6420d08434c8e66230612c50bdff86b4dfd098690c006426e241c32bf716e2f8b9ee6c0ce6488d1975b54f3e4cd85cc14d6c7f0880f65701 SHA512 ae6bdda341bea804257d9f9b57d17a65a25d030ee2f5a9b7fff125a5f7881a34584c6b5d26a1e6dd5a49bba56ad5b6e731defecd109e19a5144df4caf90561d4
DIST webmock-3.8.3.gem 122880 BLAKE2B 66371028294f3b15172d718e0fa9402ad6ed1bf7beedb0c62621ad31758d25e401af9cd982a6f29cd1161a7e4d7954f6f9df22ab2e0c44c970a0edca3c0f1304 SHA512 6c845c4ed0c82ba4bb1f32d0d87a87eb945c54e159317aa14e2238b497d38282b7e81542e78c0d68d4b8d4a08e46137de84503829b7381e6d945e45474ebb507
EBUILD webmock-3.11.0.ebuild 2065 BLAKE2B 4e57a1a85b7d559719b0d21d72c7971e30765b7bb289f93991a6a5c6b87b8a03f6004099395ccf1b3b1cf19096f76bcb5f0a3edb417b057b874aa870beba60e1 SHA512 3fd8316bea269e5898db3beb2a57bcf5b15c6647f60ca448e5f5da91b511224118c9ba2c7bf83b9fdd60dba34db1a121d7a63b8cf0694bf53e3ea1484403fbe8
EBUILD webmock-3.7.6.ebuild 2059 BLAKE2B 21417ac451a0b70df72a05a8848c8ddf7a2f0f939eb498a5d71f91dd3f2bcd065f15d3ea8ed047c64b70c421562b337054a5388d96d497f52a1b684b58417ca9 SHA512 6b94a52934ada134df94b263fd8fdc9a3ea1388c742a11c2eee24e011fce9f99e86436745d56a646a0e3fb925006f7048a889e2cf82b47ebe39b2d505763b897
-EBUILD webmock-3.8.1.ebuild 2060 BLAKE2B 4faf298c68b96ae1e2eea9389a7af6133af3eee570e001cf7c0e9a36225a023d02769770ca39b827adfec687138ea3c478ac59d50f2ba29566bef89be11fb37f SHA512 f0bccdf423fe1ffe0dafff3d1c418b477e36ee1cdc2094238b5e2b5ff098c171c52c31d92fbf5300dc878da62b8b465cfc00a1f8300c7b8a787f2e4639a52ca0
-EBUILD webmock-3.8.2.ebuild 2060 BLAKE2B 4faf298c68b96ae1e2eea9389a7af6133af3eee570e001cf7c0e9a36225a023d02769770ca39b827adfec687138ea3c478ac59d50f2ba29566bef89be11fb37f SHA512 f0bccdf423fe1ffe0dafff3d1c418b477e36ee1cdc2094238b5e2b5ff098c171c52c31d92fbf5300dc878da62b8b465cfc00a1f8300c7b8a787f2e4639a52ca0
EBUILD webmock-3.8.3.ebuild 2066 BLAKE2B 032b384a4dafd98a1925c0a1582b4698f51f3ed15c0480ac3f6e683492571f869896cdddb8f4f536f84f5cb2b6f0cea89bdcdf1602d9bd40044c60c69a8629ca SHA512 b4f4055fc24416151b55fdd9ee07701ee3562ff03c6dc4f49080417a66539db1b66386721ca7601bc2eae0a30a666a3e52167a3f8d093f9c24a255a94d0c7199
MISC metadata.xml 341 BLAKE2B 75a7b957f0aa060ff3c632620c1b8eac9344b37566c9205bdfaff70fdcbc8cd391dc7296317bde0e8ce1e1ea3cb7540446267112eac00571beda686f5a592130 SHA512 66c55ee845168bbdd2b792d90cfbe116a09ff3bc00861164e82b68355ed585e87b58b7c0ab21da37dd984b680ea4841e7a2cd0c8bea1a081b1adb4c5b9885b73
diff --git a/dev-ruby/webmock/webmock-3.8.1.ebuild b/dev-ruby/webmock/webmock-3.8.1.ebuild
deleted file mode 100644
index 7b97e611140d..000000000000
--- a/dev-ruby/webmock/webmock-3.8.1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_TASK_TEST="test spec NO_CONNECTION=true"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Allows stubbing HTTP requests and setting expectations on HTTP requests"
-HOMEPAGE="https://github.com/bblimke/webmock"
-
-LICENSE="GPL-2"
-SLOT="3"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/addressable-2.3.6 >=dev-ruby/crack-0.3.2 >=dev-ruby/hashdiff-0.4.0:0"
-
-ruby_add_bdepend "test? (
- dev-ruby/minitest:5
- dev-ruby/rspec:3
- >=dev-ruby/test-unit-3.0.0
- dev-ruby/rack
- >=dev-ruby/httpclient-2.8.0
- || ( dev-ruby/http:4 dev-ruby/http:3 ) )"
-
-all_ruby_prepare() {
- # Remove bundler support
- rm Gemfile || die
- sed -i -e '/[Bb]undler/d' Rakefile || die
- sed -i -e '/simplecov/I s:^:#:' spec/spec_helper.rb || die
- sed -i -e '1igem "test-unit"' test/test_helper.rb || die
-
- # There is now optional support for curb and typhoeus which we don't
- # have in Gentoo yet. em_http_request is available in Gentoo but its
- # version is too old. patron's latest version is not compatible.
- sed -i -e '/\(curb\|typhoeus\|em-http\|patron\)/d' spec/spec_helper.rb || die
- rm spec/acceptance/{typhoeus,curb,excon,em_http_request,patron,async_http_client}/* || die
-
- # Avoid httpclient specs that require network access, most likely
- # because mocking does not fully work.
- sed -i -e '/httpclient streams response/,/^ end/ s:^:#:' \
- -e '/are detected when manually specifying Authorization header/,/^ end/ s:^:#:' \
- spec/acceptance/httpclient/httpclient_spec.rb
-
- # Avoid specs that require network access
- sed -i -e '/when request is not stubbed/,/^ end/ s:^:#:' spec/acceptance/shared/callbacks.rb
-}
-
-each_ruby_test() {
- ${RUBY} -S rake test NO_CONNECTION=true || die
- ${RUBY} -S rspec-3 spec || die
-
- einfo "Delay to allow the test server to stop"
- sleep 10
-}
diff --git a/dev-ruby/webmock/webmock-3.8.2.ebuild b/dev-ruby/webmock/webmock-3.8.2.ebuild
deleted file mode 100644
index 7b97e611140d..000000000000
--- a/dev-ruby/webmock/webmock-3.8.2.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_TASK_TEST="test spec NO_CONNECTION=true"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Allows stubbing HTTP requests and setting expectations on HTTP requests"
-HOMEPAGE="https://github.com/bblimke/webmock"
-
-LICENSE="GPL-2"
-SLOT="3"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/addressable-2.3.6 >=dev-ruby/crack-0.3.2 >=dev-ruby/hashdiff-0.4.0:0"
-
-ruby_add_bdepend "test? (
- dev-ruby/minitest:5
- dev-ruby/rspec:3
- >=dev-ruby/test-unit-3.0.0
- dev-ruby/rack
- >=dev-ruby/httpclient-2.8.0
- || ( dev-ruby/http:4 dev-ruby/http:3 ) )"
-
-all_ruby_prepare() {
- # Remove bundler support
- rm Gemfile || die
- sed -i -e '/[Bb]undler/d' Rakefile || die
- sed -i -e '/simplecov/I s:^:#:' spec/spec_helper.rb || die
- sed -i -e '1igem "test-unit"' test/test_helper.rb || die
-
- # There is now optional support for curb and typhoeus which we don't
- # have in Gentoo yet. em_http_request is available in Gentoo but its
- # version is too old. patron's latest version is not compatible.
- sed -i -e '/\(curb\|typhoeus\|em-http\|patron\)/d' spec/spec_helper.rb || die
- rm spec/acceptance/{typhoeus,curb,excon,em_http_request,patron,async_http_client}/* || die
-
- # Avoid httpclient specs that require network access, most likely
- # because mocking does not fully work.
- sed -i -e '/httpclient streams response/,/^ end/ s:^:#:' \
- -e '/are detected when manually specifying Authorization header/,/^ end/ s:^:#:' \
- spec/acceptance/httpclient/httpclient_spec.rb
-
- # Avoid specs that require network access
- sed -i -e '/when request is not stubbed/,/^ end/ s:^:#:' spec/acceptance/shared/callbacks.rb
-}
-
-each_ruby_test() {
- ${RUBY} -S rake test NO_CONNECTION=true || die
- ${RUBY} -S rspec-3 spec || die
-
- einfo "Delay to allow the test server to stop"
- sleep 10
-}
diff --git a/dev-tcltk/Manifest.gz b/dev-tcltk/Manifest.gz
index 7448f28723d0..fa7ce746c24c 100644
Binary files a/dev-tcltk/Manifest.gz and b/dev-tcltk/Manifest.gz differ
diff --git a/dev-tcltk/tkimg/Manifest b/dev-tcltk/tkimg/Manifest
index 618547838139..220014bef216 100644
--- a/dev-tcltk/tkimg/Manifest
+++ b/dev-tcltk/tkimg/Manifest
@@ -2,10 +2,8 @@ AUX tkimg-1.4-jpeg-9.patch 364 BLAKE2B bc9b3e4e404b49a9909d7198929033ebee4ab839f
AUX tkimg-1.4.9-fno-common.patch 274 BLAKE2B b3b3ac5c7e849195fe7dbd6a86ad085825799144ddd05b445abe96577e41a52b50665aaf04fc08cf43a3b5d3d3b1a3a5494a59f8297f68036df4c7948d83dc90 SHA512 8599751f097914fa2757fed9599f3df08f6941c3693d4216f5dcb60a4be8bf603c4869b3f55cf12bea2752d77114c7c1cd2890de1b5635a0665a12053117712f
DIST Img-1.4.11-Source.tar.gz 7610956 BLAKE2B f461ddb07681c15ca68f8a023808c1c9aec63eefe434c46e09b22f48025b3ec4b095fa44092e30799af3a0435562fd1917613a7ed3f9612d166014cd34834142 SHA512 792223fdb310370937669ef537662947f087131a001281e8923095892b585354690612a339d03f3939b91870016256c37e41aa6305db70e8db1b5ab590610751
DIST Img-1.4.9-Source.tar.gz 7702460 BLAKE2B 958956e786cea208f24a30532fa65914439d8289a4fce7dfa149e8202d1abe680bd8cb1cc5d8b3fb3e31d48bf5302db14977997f92ebaa786503138be872fa0b SHA512 c749a567de4eb2b9acc4d84344141ed8ba3703e4e22895d3fe0b292fe10bb0c09920cd765952fa1b95bfe8c0cb5e2955421c29bedaa07b7f3b36e7697a8f36c9
-DIST Img-Source-1.4.7.tar.gz 7259144 BLAKE2B 48794a21564864c5b20953d1504acde5512be4aaa8db0834f63b15431af0bfa8bb2050f241e7b2d9b383480b59e17567f26f45c91e9f9a7fc58600cfe6ef6595 SHA512 6a395d6263e2f46151d0d3f5c6044d87a933617981200d2663328b8c7993b8a3aacba45568cee7aa2f5d8c8d020cb63956179aab5147d25d91b8834c0dfa4b9d
DIST tkimg-1.4.11-patchset-1.tar.gz 9864 BLAKE2B bee2ddd4b0ada51f9aeffc1e4ddcb9ea2d3fec37eccdaf9a1d26551e7e2dd01a466cad91ea33635ce674261d92fc1dc1fa80f3d19dffd92bb5f9bb5425820318 SHA512 013a70826c5a7b083479e6a4cb56421384400dda9ca05b7216b877b9a79d009ee0f80db25c0b0e51b05904b7d74f4d0220cdb92e819404422743c06a1199245f
DIST tkimg-1.4.7-patchset-1.tar.xz 8208 BLAKE2B c2e6f5d6ef415c897cac33da4a003efec467312e844912e5a519cfb3ddf04ac5cac830eed05418ef74f931df2211c53c40669e53ce3bed219a7c2c714a398de5 SHA512 596c505db7f2ff40c786b83a018eba7f82718d350b6a601f8b93aa64fac238d6b8def603cd719f89fc526e5d2891a94b46de1a2ba628b8ff0ec80979892e28d8
EBUILD tkimg-1.4.11.ebuild 2040 BLAKE2B 0aa72930dddd9f8bb41490f9e633e6d20ea4f655ca86930e1d1200c517c179e3a3fac1476a6ed069be8588a41d996c28e5957f94ddd442a74b37eca51332c7c9 SHA512 9d095f694a63b675813170fa41a5fd3f7392d4284a5d08863220656e85254782f7285029a2df4e458c6c1f566fb2141f2496ed8ff03f2b1a04c6ac41f5668e97
-EBUILD tkimg-1.4.7.ebuild 1904 BLAKE2B faba72f6a1b921eb47c64bb6d630838a2a23e7c615ae6dd28860307382fa9dd91c65b580132765534d501a6ecee3b10975ba7a683c0eec62c73dc36b21635dbc SHA512 c6ca2c1dc26c7c986d4126521c52aa0ed8ec6129fb11ec723e6b2c982270c410e4e019ea313bcd7565d096acd97dbfcee93b27de2b8614048511811d5f78366d
EBUILD tkimg-1.4.9.ebuild 2284 BLAKE2B afb3a90524a9e655b0fc2f11bc484745a1cf6209e135895d46241d085b01ab60b36a6e5e754c57f65d203b3b7f70ab4bc7861aeb17428e8c1c31a7f8834450f2 SHA512 4ac3f4de5890a65af0cbec4271dec9a71055d2d61e645e36437b0b24de492dee32b53b2c279f83a1829f67b20e6d22b424482a301542444542b0693db34ef915
MISC metadata.xml 328 BLAKE2B 1c2b4dff486d257a50839ff54238b77348694269a1ddd0e24f80a83ea1bbb7661dba26981d24fa299c9252ae4544c438fab85f28f13fe98a66b97d70c784c1e0 SHA512 8c91b67342dfb72a4e464e51213b04064cac7862f9d78283985096aa1a83135ce50647813599591a46b5ea79eecc52238af0d5d7f223bc61bb58b94e0da54089
diff --git a/dev-tcltk/tkimg/tkimg-1.4.7.ebuild b/dev-tcltk/tkimg/tkimg-1.4.7.ebuild
deleted file mode 100644
index 77643a72c844..000000000000
--- a/dev-tcltk/tkimg/tkimg-1.4.7.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools eutils multilib prefix toolchain-funcs virtualx
-
-MYP=Img-Source-$PV
-
-DESCRIPTION="Adds a lot of image formats to Tcl/Tk"
-HOMEPAGE="http://tkimg.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${PN}/1.4/${PN}%20${PV}/${MYP}.tar.gz
- https://dev.gentoo.org/~tupone/distfiles/${P}-patchset-1.tar.xz"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
-IUSE="doc test static-libs"
-
-RDEPEND="
- dev-lang/tk:=
- >=dev-tcltk/tcllib-1.11
- media-libs/tiff:0=
- >=media-libs/libpng-1.6:0=
- >=sys-libs/zlib-1.2.7:=
- x11-libs/libX11
- virtual/jpeg:="
-DEPEND="${RDEPEND}
- test? (
- x11-apps/xhost
- media-fonts/font-misc-misc
- media-fonts/font-cursor-misc )"
-
-# Fails tests
-RESTRICT="test"
-
-S="${WORKDIR}/${MYP}"
-
-PATCHES=(
- "${WORKDIR}"/${P}-tclconfig.patch
- "${WORKDIR}"/${P}-jpeg.patch
- "${WORKDIR}"/${P}-zlib.patch
- "${WORKDIR}"/${P}-png.patch
- "${WORKDIR}"/${P}-tiff.patch
- "${FILESDIR}"/${PN}-1.4-jpeg-9.patch
-)
-
-src_prepare() {
- default
- find . -name configure -delete
- eautoreconf
- for dir in zlib libpng libtiff libjpeg base bmp gif ico jpeg pcx pixmap png\
- ppm ps sgi sun tga tiff window xbm xpm dted raw ; do
- (cd $dir; eautoreconf)
- done
-
- find compat/{libjpeg,libpng,zlib,libtiff} -delete
-
- eprefixify */*.h
- tc-export AR
-}
-
-src_install() {
- local l bl
-
- emake \
- DESTDIR="${D}" \
- INSTALL_ROOT="${D}" \
- install
-
- if ! use static-libs; then
- find "${ED}"/usr/$(get_libdir)/ -type f -name "*\.a" -delete || die
- fi
-
- # Make library links
- for l in "${ED}"/usr/lib*/Img*/*tcl*.so; do
- bl=$(basename $l)
- dosym Img${PV}/${bl} /usr/$(get_libdir)/${bl}
- done
-
- dodoc ChangeLog README Reorganization.Notes.txt changes ANNOUNCE
-
- if use doc; then
- docompress -x usr/share/doc/${PF}/demo.tcl
- dodoc demo.tcl
- docinto html
- dodoc -r doc/*
- fi
-}
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 7599c9121419..e4fb7c14fb2d 100644
Binary files a/dev-util/Manifest.gz and b/dev-util/Manifest.gz differ
diff --git a/dev-util/colm/Manifest b/dev-util/colm/Manifest
index 99ae86a7d991..4965eeb93af1 100644
--- a/dev-util/colm/Manifest
+++ b/dev-util/colm/Manifest
@@ -1,10 +1,5 @@
-DIST colm-0.13.0.4.tar.gz 707983 BLAKE2B a6b03f24ebe8bf44dbb17b6bd3f545a33b58883fae403d927cd30a81dd2376ae0fd4271c308008d64865697e63cb7cc988465c28b22e56c2136cbd533b32e999 SHA512 4684a315f3fef7cd6ff0982e357b59b110c02dfc2ce00a207d5d16dd9475f41790f3cfec9ddb5347d20da879cb0beebc03d3c56c325ce2ef22438555fcf60402
-DIST colm-0.13.0.5.tar.gz 736026 BLAKE2B 75fb1748495ead2ac5527ce040efb76de264e10b6562c4af734735f5aa25f53fc12260cbe52f019ff04c5117155aeb96358771f20b3e02012639a08527a54d98 SHA512 c5a1228260327d65c2cb5821fbc583608e2a308927b04cb0e7dbc84bced60d0d62892b4e30aa2228fee0d08f6828dc58d88788340433bc5bba9d503977883fc9
-DIST colm-0.13.0.6.tar.gz 739981 BLAKE2B e5b00bc276fa3414cc9ec557a6e4ca93194f86cd6b3b1ad11611352962da1ef68aa1acd4aa62d47495ba04313dcc52e2a17588fefabf51572d19826c7bb70fe8 SHA512 5bcf2d7ff78e523385294f338a8c057807b416b2922e002311fcd8027132504f1aa99bc4dde2c4ea7ddbbc8806fddefda57f8a16f6d5c91a9c47566f86339c81
DIST colm-0.13.0.7.tar.gz 746841 BLAKE2B 7f816bafc0d1a7ea826b6cc2f5bd5fa2bffcd0eca88d5eaab757201481804dc5fa6c80fa19a550ebd9ee50a00a621690c4eed1788e0d0d3dd600db95ed8240d3 SHA512 d15cc6afeeacc4f34171261e75a7daa285529b98940272566ca6d6661d0778b18930ca72e0bce8d0a56c36c3482adfe4375c32ec66d6e77ee32544bddf35024d
-EBUILD colm-0.13.0.4.ebuild 369 BLAKE2B 14ff1f1c4734a24f425a509d5c052a9a1d8ec2acaf968364a0a6cfd94444ae32a2cbe9ee3d03a180c5f1be0431388730fa297351955a034bcbd514f11d6b443a SHA512 888e99986f172f6288617fbb4bd9220cd0b57824b064a48c521e59303d243f4e76a2a9e3ccbedfffc3c10d654e4860f7998712cb35c1c82504f7e544ecd1d3f1
-EBUILD colm-0.13.0.5.ebuild 493 BLAKE2B 1db4cd9d96b82533efaf02912860354d02afadc9db9efcd753717fa8640c31fa23b375cdd6db8d87872accf1cf89931a73f76ec454fb435d2ac6c3aec08d5b1d SHA512 78358f795c3344b0705c9a50906696781dc835c8b600f8dc2fe3c64e5f3451329405dc3cd1496893059b2d09f9f49f261f497c370a674840713d7d7459a47793
-EBUILD colm-0.13.0.6-r1.ebuild 495 BLAKE2B da89d4c288e2fac01b749a1021722d1a8e20d9ab2d9665a34b88d3711d7adeb080e16e8dcbed189ebf61508ecf595b5cd01411febc652a79f2e2689280c3d701 SHA512 f041d1089febd167ea240289d0c8e1876a74093204d3a866310ec4547a274ba4015a04f8329fcaf0d7df9f10ae362badbe18f04858a0fffbf675fcf4fdae1b63
-EBUILD colm-0.13.0.6.ebuild 390 BLAKE2B cdc09b52c1787783cfe49fe1361559b0c5317d9ce9db7b0116f393fd818c17027b257685b15ee06e0cdc7fc3d9779e977dcd97d88ba63306c8cce5dd2bb1ca4d SHA512 1943cd5be8929df9a5c119a7cc9362ba1936440fc2fd77f3a80b1c94e5107709af590987dc32067cdfbea0daf9486e235bdbb3c7035c1bcdc2b57731a536302a
+DIST colm-0.14.6.tar.gz 3110298 BLAKE2B 430c508ff9db27821baca12a458024cb2caecf2879ac3780fa6ebbc37bed30d3faf68515f21c9b31bd5f1504ab03b5ea63a24812f7117515c63261b8d1683e27 SHA512 a783817f9d348a79e93cac54c042e8366a73df287c14221b9e4a7b963385c1e32eb54d6918d0822b271dc2a0420abce84a3e1a3c9ada84968d1c20178d0310ad
EBUILD colm-0.13.0.7.ebuild 535 BLAKE2B a9b324dd50e8e13801761d36b776c7fdb3003e8c078201ae371106d54476abe7373f6010a444d00cff10978c5025d42b898f7596089c933eabd96af6294135ef SHA512 81eaf1b0b0b38e3e6612e94ab88cb35570df633ec20a81f268f23312995a2477881ea8ba230a5891ebb8bb7ead324b086209db043e98083ca08526c38791d9de
-MISC metadata.xml 253 BLAKE2B 7dac7f77dcc8de31f439cc6d7770a503f95be9c2f8ae57df9e725df941e2b31a90a43664a485a5fad9510b9ae060ba7aaaddba29324338dd9eb07d88a63c7dce SHA512 303268e1f46e337e32c64b544c0962ecbe8de1799c42736b3c3515b6f31954a655830c402317bd0534cac12059e17eeb5f360d010432dff795a136662a5c10f1
+EBUILD colm-0.14.6.ebuild 1227 BLAKE2B f359b302ce4345f5d86a20b2ce22298aee8ca519f7348db7201aeff9753346ae5df1e7d8f9388593a426e986ca81c11d58562d889994eb4f4728c5d6b11b8ac3 SHA512 894b7733416e4d7293ab7cf294845d87d92548f5d897865c383b19aa7de65abcdfcfd6dd44e5050cd79ebb22a817f47d2bc0f0b77a848b0debdd31d6e717cc07
+MISC metadata.xml 332 BLAKE2B e0956073a0eac90ffbe6c682e223262351704d19f4ab914435d5751b88386b8197c72c5a77e6eefa410b009b8da4a479d9eede17a26f7faa5f4baf94ae6773b2 SHA512 cc81ab9d4d382d80a02de1073fb5f9a0f793cc3df7b5a11bbba63d5a9727c282e88365c265256d0452f5627a2fcd41551e02ab395cab1be9734765d651b223f6
diff --git a/dev-util/colm/colm-0.13.0.4.ebuild b/dev-util/colm/colm-0.13.0.4.ebuild
deleted file mode 100644
index 3226a9812423..000000000000
--- a/dev-util/colm/colm-0.13.0.4.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="COmputer Language Manipulation"
-HOMEPAGE="https://www.colm.net/open-source/colm/"
-SRC_URI="https://www.colm.net/files/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
diff --git a/dev-util/colm/colm-0.13.0.5.ebuild b/dev-util/colm/colm-0.13.0.5.ebuild
deleted file mode 100644
index ec66f5a78c62..000000000000
--- a/dev-util/colm/colm-0.13.0.5.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="COmputer Language Manipulation"
-HOMEPAGE="https://www.colm.net/open-source/colm/"
-SRC_URI="https://www.colm.net/files/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 arm arm64 ~ia64 x86 ~amd64-linux ~x86-linux"
-
-DEPEND="app-text/asciidoc"
-
-src_configure() {
- econf --disable-static
-}
-
-src_install() {
- default
- find "${ED}" -name '*.la' -delete || die
-}
diff --git a/dev-util/colm/colm-0.13.0.6-r1.ebuild b/dev-util/colm/colm-0.13.0.6-r1.ebuild
deleted file mode 100644
index 24c79169a62c..000000000000
--- a/dev-util/colm/colm-0.13.0.6-r1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="COmputer Language Manipulation"
-HOMEPAGE="https://www.colm.net/open-source/colm/"
-SRC_URI="https://www.colm.net/files/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~x86 ~amd64-linux ~x86-linux"
-
-BDEPEND="app-text/asciidoc"
-
-src_configure() {
- econf --disable-static
-}
-
-src_install() {
- default
- find "${D}" -name '*.la' -delete || die
-}
diff --git a/dev-util/colm/colm-0.13.0.6.ebuild b/dev-util/colm/colm-0.13.0.6.ebuild
deleted file mode 100644
index 4292b617eac2..000000000000
--- a/dev-util/colm/colm-0.13.0.6.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="COmputer Language Manipulation"
-HOMEPAGE="https://www.colm.net/open-source/colm/"
-SRC_URI="https://www.colm.net/files/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-DEPEND="app-text/asciidoc"
diff --git a/dev-util/colm/colm-0.14.6.ebuild b/dev-util/colm/colm-0.14.6.ebuild
new file mode 100644
index 000000000000..827e3f051e77
--- /dev/null
+++ b/dev-util/colm/colm-0.14.6.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="COmputer Language Manipulation"
+HOMEPAGE="https://www.colm.net/open-source/colm/"
+SRC_URI="https://www.colm.net/files/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+IUSE="doc"
+
+BDEPEND="
+ doc? (
+ || ( app-text/asciidoc dev-ruby/asciidoctor )
+ dev-python/pygments
+ )
+"
+# libfsm moved from ragel -> colm, bug #766108
+RDEPEND="!
-
- patrick@gentoo.org
- Patrick Lauer
-
+
+ patrick@gentoo.org
+ Patrick Lauer
+
+
+ adrian-thurston/colm
+
diff --git a/dev-util/creduce/Manifest b/dev-util/creduce/Manifest
deleted file mode 100644
index af85d1f723c1..000000000000
--- a/dev-util/creduce/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX creduce-2.11.0-link-libs.patch 321 BLAKE2B a36440580e526169001e2dcfa96718c8a3dc0706a2abec7cb97e4a939898c5bea4abe346c24b06e480208cb9082b12459b29b28e3d0c07de5bf2010ef2712ab0 SHA512 d10edcb946fac2635dfe4fbbdf01f324144761729ac47465f8f4e9ab3d6b0f2ae6584393607076ad04108988d13dab49c65fe3254e90c3966f3b2cae57049df0
-DIST creduce-2a4480eb6cb72b3d2d131b536c883cc6d41bdcaa.tar.gz 732121 BLAKE2B dad2cf8ec2453a6b210a5303480e7dabfd978b7d7a1326cbc1e4ca40fa7c4e7d18da5f9309ca5f392740bbf55a1c9863e389c9789fceff062a68e9bb9a79de9f SHA512 c598f5c998f0a02d57006e640f88b951cd33a24f24507d6671067842b81bb3fe37c2fccd040b6cedb6fd5857396213e4003ee5fbd3040058050bad67226dc27f
-EBUILD creduce-2.11.0_pre20191110.ebuild 912 BLAKE2B f84141309ffeaa061b57aff16c13c82190bb495598c4e8096218816a21bceb9d89b7e822d0565b5f3044331cea1aad7b3ddb25b7c94a4ce420f204329aabb78d SHA512 56c32a1e63bb01e7a174563695b583efd449725f3a6604a9ae6a55b6d1d4e19bc02d8fd16a94485fa8c8aa4084be6f5101f9dbfd57001f56f2282ebbd023945d
-MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/dev-util/creduce/creduce-2.11.0_pre20191110.ebuild b/dev-util/creduce/creduce-2.11.0_pre20191110.ebuild
deleted file mode 100644
index 4bf63cd40869..000000000000
--- a/dev-util/creduce/creduce-2.11.0_pre20191110.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
-
-: ${CMAKE_MAKEFILE_GENERATOR=ninja}
-inherit cmake llvm
-
-EGIT_COMMIT="2a4480eb6cb72b3d2d131b536c883cc6d41bdcaa"
-DESCRIPTION="C-Reduce - a plugin-based C program reducer"
-HOMEPAGE="https://embed.cs.utah.edu/creduce/"
-SRC_URI="https://github.com/csmith-project/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${PN}-${EGIT_COMMIT}.tar.gz"
-S="${WORKDIR}/${PN}-${EGIT_COMMIT}"
-
-LICENSE="UoI-NCSA"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-LLVM_MAX_SLOT=9
-
-DEPEND="
- sys-devel/clang:${LLVM_MAX_SLOT}"
-RDEPEND="${DEPEND}
- >=dev-lang/perl-5.10.0
- dev-perl/Exporter-Lite
- dev-perl/File-Which
- dev-perl/Getopt-Tabular
- dev-perl/Regexp-Common"
-BDEPEND="
- >=dev-lang/perl-5.10.0
- sys-devel/flex"
-
-PATCHES=(
- "${FILESDIR}"/creduce-2.11.0-link-libs.patch
-)
-
-llvm_check_deps() {
- has_version "sys-devel/clang:${LLVM_SLOT}"
-}
diff --git a/dev-util/creduce/files/creduce-2.11.0-link-libs.patch b/dev-util/creduce/files/creduce-2.11.0-link-libs.patch
deleted file mode 100644
index 3518003760a6..000000000000
--- a/dev-util/creduce/files/creduce-2.11.0-link-libs.patch
+++ /dev/null
@@ -1,7 +0,0 @@
-diff --git a/clang_delta/CMakeLists.txt b/clang_delta/CMakeLists.txt
-index a94ec0d..764af02 100644
---- a/clang_delta/CMakeLists.txt
-+++ b/clang_delta/CMakeLists.txt
-@@ -263 +263 @@ add_executable(clang_delta
--target_link_libraries(clang_delta ${CLANG_LIBS})
-+target_link_libraries(clang_delta ${CLANG_LIBS} ${LLVM_LIBS})
diff --git a/dev-util/ragel/Manifest b/dev-util/ragel/Manifest
index 875320af03a5..b48d50466a55 100644
--- a/dev-util/ragel/Manifest
+++ b/dev-util/ragel/Manifest
@@ -1,12 +1,7 @@
-AUX ragel-7.0.0.10-use-pkginclude.patch 1143 BLAKE2B 980f0248e9f33955b4653fb1a38aa7aa5ec10584650947e85592f9a9ef0a67c41020dca29fad57ab101e98f45c217d332933931ac7da68cb3ea5d3bbc2f02d9a SHA512 44ee69205b87c22d17b5cc419fba96bd69c9b3d4f8fc8133041b9d71b9aae434b1528bdbdcfe15825d663c1d441d6cce97d0586c4bfae58ff5d687b1c156529f
DIST ragel-6.10.tar.gz 1232993 BLAKE2B 401e7a53b062ecd7ec98337866eb2dc0af0ac90e5d04ee304fd2a867b7b6f390985297a7ed57ce65e88b719598efbdd431bac8f53cee24199b795deb0e89da6b SHA512 6c1fe4f6fa8546ae28b92ccfbae94355ff0d3cea346b9ae8ce4cf6c2bdbeb823e0ccd355332643ea72d3befd533a8b3030ddbf82be7ffa811c2c58cbb01aaa38
-DIST ragel-7.0.0.10.tar.gz 779503 BLAKE2B 2f7b8bb858555719b0c7afa8209be76fd07f9d06a8f75df723211c48d59f50c21f09a1f1fa031d53e434db933d1bc12299c75d8932485e5a43eccef7506667ad SHA512 2d1d4c469d8581239ec21f128e94ab452b398903302f82ef59ce03d6fb89bc89de6441dbe53ea99d7689866f7aec485ab1ec9c537908f21eb1394650b55413ba
DIST ragel-7.0.0.12.tar.gz 1543127 BLAKE2B c3024c55eb5397f78159da83e318923529d3c1f10cc802564ac13c39b18c261166e27e4f315bbaa49e7eb9afa6840ca72aa62d7ae14d46f20865db64e3ab6759 SHA512 32ec90eddfd209e50995f21b9a5fcddd2b94279828227d367d990d7bfa8e4412682631d4e6ae5081871bac23d96153b96fb4494b991c70bf38df8cc0ddc8866d
-DIST ragel-7.0.0.9.tar.gz 850078 BLAKE2B 0e7d458e9f78fc7e0fb2e9a0c6fdd3f3789a9104f4441bc878ac64d077dee716e27d3a54c3898fcf1e4ba56b8d46d956a36b92258750f2541fd96f951038d852 SHA512 87de7d41af4a08f09d422a0e58820f9b5b1218acc4733c58690feea4f872790813b5f2d7505ce147a2a6e1bcd341926c35fed7c6b55f543bdf864b119868bcde
+DIST ragel-7.0.3.tar.gz 1656577 BLAKE2B 3a9ce560894714a3801039fb944d3c914f2647a0b76bba4a7b790f8d569eb2e9eb807ab4d8af067560b274692be2d98c5dc28632e11c853893971585e847d48e SHA512 16bcb4b44a3ca94918d6c3e4bce468620cc691bf74cb69f0a264c41cbcffd595f897aa18e300952b60a68e680e1223532bbf9e500168d35d92a6559c190f6e78
EBUILD ragel-6.10.ebuild 906 BLAKE2B 4e1fc1cae8a187e92165539dce7c276ca63dfdc6eefbc55ba5448c826095f4a9f745847ccee03e5c9867a6f02ec57abb6a4831d43ee7df1c0da530a3ffb53010 SHA512 cc2c877a6162d1ee5f29e58758833391e508566201256e2241261357a6c38a2bd6c281f64e6486293faaf1bb8be74c61f5bf458fa9e4d70b4f7a902e181b772f
-EBUILD ragel-7.0.0.10-r1.ebuild 758 BLAKE2B 362a2dee75eb9b744af7b0fca9f26175961029165988cf6a5f8f3aeab8d4e9a4264a553509211884c3bd7d6a7992b5fe0dee7b473f61831e6ab8dcfb1f94ba8b SHA512 12f9640eb0c51a497e274bf0d5dd7dadea78a1e21dba5d8a4a114066717badfa1de28116e133f7cc688fce02b7e2859f45479846f460865982c2ced0f4ea4fc8
-EBUILD ragel-7.0.0.10-r2.ebuild 790 BLAKE2B 83edd042aeea77d1dcc9cea68a5ae5a335b46d7411e47fbde10e6d1b0696ef248194993725aad4bc2e76d624c775b74be4c8cd968dd2d4cc5a2288be5f0c1123 SHA512 f1396bfa1bfcf74ccdcf01c8269ae2d37b06b62200e7417c129bd7fd1188ed9f838ad46f5528cb60c849c020b36f6e5c19d77b6cfd26f7c896b7807969f6d085
-EBUILD ragel-7.0.0.10.ebuild 622 BLAKE2B 4eb1438c8fd1c8e1a3f3f2a95589b719e7b1e07d0411ee0d68bbb0eb5d433471becffdc718593beed535a6f360a3bc63f5fafb058fe6d8c50a6163552ad9da99 SHA512 9f98a2fc800727b126d5db3914ebaf699b4a1095f334906d5809edd9f08b0b5c1d90699a145d303fc06a31d95e600d85aee4a7b5ebb98fd8cfd117f20ee10d2b
EBUILD ragel-7.0.0.12.ebuild 771 BLAKE2B fe5abe581ce0a9c8feccf4c9a86fd9cb258af68c7a3e6aeddcc4bf1f7cb3bf79a2c24951010204f5704efb8ef7d0194ad5f47f3a3dfac9275f38dcd7958d0fdd SHA512 94e28393676e525b0a8fda907c7aa22ce66586a2fa63a881a17f90280f2c2dfbd2b38ba9acb96efe0899efe81c37ed51989886464baf22ed139a4d426fb0b0ab
-EBUILD ragel-7.0.0.9.ebuild 627 BLAKE2B b1c47b5508878b7e13fb95333bb7158a85e4795decd4be8cfc82769934106a43878fb5c15d3df5e139a6af96df04614411ceeef20ff0c3bc695cfe424ae258d5 SHA512 1f88ee8f0bac60c073a2be525ea1dcc9128961d8383f36d992121064746d7c154b1338f4582797145fe782485c8d322119aa7ac8ee903315d056cf17a635a3c6
-MISC metadata.xml 222 BLAKE2B 1c7746701a7405c30d961a743df2c2b3b1c5f20c863057e76862844f34bcf701a01f5b31d6b6dc4b4c3192a0f833b783d0c1db3c79f25ea45b576e1c575b502f SHA512 f5b07576edb64cee121aab00dd2a5f0c080fa947e00b6ff6ad6c514a82c132230426ca81e3430d7785c212786f7ead5f6c3f48e58478507df7d96a4e734168ab
+EBUILD ragel-7.0.3.ebuild 1205 BLAKE2B b0527166bb78470fa8da68c5c44d04638efc5824a3c2b0dbdbb2dd317864f3289556dc5ee815f9ac54f5da431249f5115725dec3c835f65af4729de7fdc6489d SHA512 87f4285971eea6300bc88adbe22e40874ca4bee41d4bbdd351e79d59fc2b433fce5f67b083c00b20b148620e0cc36a2d3aee66fe2974d00fd092b7a7507f60ed
+MISC metadata.xml 304 BLAKE2B e1fe70825ab2eaef1101ab15d8a29dfffae8b22e1a8cfdb9e97bd7243699be7bf5dff01735e9a9451f7e3207fd9659f7cad5492f1909e845c0761388b254a3fc SHA512 4c34ae1a571f693c06acd7b3611019f137e3b73796f982a0d054ce06402f8a27c44d18cf49c6e6758f010690f769a6b3a94fc46f972d38913140eb8392557f66
diff --git a/dev-util/ragel/files/ragel-7.0.0.10-use-pkginclude.patch b/dev-util/ragel/files/ragel-7.0.0.10-use-pkginclude.patch
deleted file mode 100644
index 6609af5a99a2..000000000000
--- a/dev-util/ragel/files/ragel-7.0.0.10-use-pkginclude.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 927f380272442ae803fdccfc001b55877f25e7dc Mon Sep 17 00:00:00 2001
-From: Adrian Thurston
-Date: Sat, 10 Dec 2016 15:41:30 -0500
-Subject: [PATCH] use pkginclude for the headers
-
----
- aapl/Makefile.am | 2 +-
- src/Makefile.am | 4 ++--
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/aapl/Makefile.am b/aapl/Makefile.am
-index fd9f9cb0..80b972f1 100644
---- a/aapl/Makefile.am
-+++ b/aapl/Makefile.am
-@@ -1,4 +1,4 @@
--include_HEADERS = \
-+pkginclude_HEADERS = \
- avlbasic.h avlimel.h avlmap.h bstcommon.h compare.h insertsort.h \
- sbstset.h avlcommon.h avlimelkey.h avlmel.h bstmap.h dlcommon.h \
- mergesort.h sbsttable.h avlibasic.h avliset.h avlmelkey.h bstset.h \
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 24a19a4b..60554a99 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -16,11 +16,11 @@ bin_PROGRAMS = ragel
-
- endif
-
--include_HEADERS = \
-+pkginclude_HEADERS = \
- action.h fsmgraph.h ragel.h common.h \
- gendata.h redfsm.h dot.h
-
--nodist_include_HEADERS = config.h
-+nodist_pkginclude_HEADERS = config.h
-
- ragel_CPPFLAGS = -I$(top_srcdir)/aapl -DBINDIR='"@bindir@"'
-
---
-2.15.1
-
diff --git a/dev-util/ragel/metadata.xml b/dev-util/ragel/metadata.xml
index 71e948fffb95..6e5b8ef64bd2 100644
--- a/dev-util/ragel/metadata.xml
+++ b/dev-util/ragel/metadata.xml
@@ -1,7 +1,10 @@
-
- lu_zero@gentoo.org
-
+
+ lu_zero@gentoo.org
+
+
+ adrian-thurston/ragel
+
diff --git a/dev-util/ragel/ragel-7.0.0.10-r1.ebuild b/dev-util/ragel/ragel-7.0.0.10-r1.ebuild
deleted file mode 100644
index 3b71791dae1c..000000000000
--- a/dev-util/ragel/ragel-7.0.0.10-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="Compiles finite state machines from regular languages into executable code"
-HOMEPAGE="https://www.colm.net/open-source/ragel/"
-SRC_URI="https://www.colm.net/files/ragel/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="vim-syntax"
-
-DEPEND="~dev-util/colm-0.13.0.5"
-RDEPEND="${DEPEND}"
-PATCHES=( "${FILESDIR}/${P}-use-pkginclude.patch" )
-
-src_prepare() {
- default
- eautoreconf
-}
-
-src_test() {
- cd "${S}"/test || die
- ./runtests.in || die
-}
-
-src_install() {
- if use vim-syntax; then
- insinto /usr/share/vim/vimfiles/syntax
- doins ragel.vim
- fi
- default
-}
diff --git a/dev-util/ragel/ragel-7.0.0.10-r2.ebuild b/dev-util/ragel/ragel-7.0.0.10-r2.ebuild
deleted file mode 100644
index 02fdab57ba4c..000000000000
--- a/dev-util/ragel/ragel-7.0.0.10-r2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="Compiles finite state machines from regular languages into executable code"
-HOMEPAGE="https://www.colm.net/open-source/ragel/"
-SRC_URI="https://www.colm.net/files/ragel/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ia64 x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="vim-syntax"
-
-DEPEND="~dev-util/colm-0.13.0.5"
-RDEPEND="${DEPEND}"
-PATCHES=( "${FILESDIR}/${P}-use-pkginclude.patch" )
-
-src_prepare() {
- default
- eautoreconf
-}
-
-src_configure() {
- econf --disable-static
-}
-
-src_install() {
- if use vim-syntax; then
- insinto /usr/share/vim/vimfiles/syntax
- doins ragel.vim
- fi
- default
- find "${D}" -name '*.la' -delete || die
-}
diff --git a/dev-util/ragel/ragel-7.0.0.10.ebuild b/dev-util/ragel/ragel-7.0.0.10.ebuild
deleted file mode 100644
index 89ac14258778..000000000000
--- a/dev-util/ragel/ragel-7.0.0.10.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Compiles finite state machines from regular languages into executable code"
-HOMEPAGE="https://www.colm.net/open-source/ragel/"
-SRC_URI="https://www.colm.net/files/ragel/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~x86"
-IUSE="vim-syntax"
-
-DEPEND="~dev-util/colm-0.13.0.5"
-RDEPEND="${DEPEND}"
-
-src_test() {
- cd "${S}"/test || die
- ./runtests.in || die
-}
-
-src_install() {
- if use vim-syntax; then
- insinto /usr/share/vim/vimfiles/syntax
- doins ragel.vim
- fi
- default
-}
diff --git a/dev-util/ragel/ragel-7.0.0.9.ebuild b/dev-util/ragel/ragel-7.0.0.9.ebuild
deleted file mode 100644
index fb260ba41723..000000000000
--- a/dev-util/ragel/ragel-7.0.0.9.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Compiles finite state machines from regular languages into executable code"
-HOMEPAGE="https://www.colm.net/open-source/ragel/"
-SRC_URI="https://www.colm.net/files/ragel/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~x86"
-IUSE="vim-syntax"
-
-DEPEND="~dev-util/colm-0.13.0.4"
-RDEPEND="${DEPEND}"
-
-src_test() {
- cd "${S}"/test || die
- ./runtests.in || die
-}
-
-src_install() {
- if use vim-syntax; then
- insinto /usr/share/vim/vimfiles/syntax
- doins ragel.vim
- fi
- default
-}
diff --git a/dev-util/ragel/ragel-7.0.3.ebuild b/dev-util/ragel/ragel-7.0.3.ebuild
new file mode 100644
index 000000000000..7620cc9956c6
--- /dev/null
+++ b/dev-util/ragel/ragel-7.0.3.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="Compiles finite state machines from regular languages into executable code"
+HOMEPAGE="https://www.colm.net/open-source/ragel/"
+SRC_URI="https://www.colm.net/files/ragel/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+IUSE="doc"
+
+BDEPEND="
+ doc? (
+ || ( app-text/asciidoc dev-ruby/asciidoctor )
+ dev-texlive/texlive-latex
+ dev-python/pygments
+ media-gfx/transfig
+ )
+"
+DEPEND="~dev-util/colm-0.14.6"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+ default
+
+ # Fix hardcoded search dir
+ sed -i -e "s:\$withval/lib:\$withval/$(get_libdir):" configure.ac || die
+
+ # Allow either asciidoctor or asciidoc
+ # bug #733426
+ sed -i -e 's/(\[ASCIIDOC\], \[asciidoc\], \[asciidoc\]/S([ASCIIDOC], [asciidoc asciidoctor]/' configure.ac || die
+
+ eautoreconf
+}
+
+src_configure() {
+ econf \
+ --with-colm="${EPREFIX}/usr" \
+ $(use_enable doc manual)
+}
+
+src_install() {
+ default
+
+ insinto /usr/share/vim/vimfiles/syntax
+ doins ragel.vim
+
+ find "${ED}" -name '*.la' -delete || die
+}
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz
index 511b19476ee2..3da7861a6308 100644
Binary files a/eclass/Manifest.gz and b/eclass/Manifest.gz differ
diff --git a/eclass/db.eclass b/eclass/db.eclass
index 9a246d18979a..96669c6d8938 100644
--- a/eclass/db.eclass
+++ b/eclass/db.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# @ECLASS: db.eclass
@@ -23,13 +23,15 @@ db_fix_so() {
cd "${LIB}" || die
# first clean up old symlinks
- find "${LIB}" -maxdepth 1 -type l -name 'libdb[1._-]*so' -delete || die
- find "${LIB}" -maxdepth 1 -type l -name 'libdb[1._-]*so.[23]' -delete || die
+ local soext=$(get_libname)
+ find "${LIB}" -maxdepth 1 -type l -name 'libdb[1._-]*'"${soext#.}" -delete || die
+ soext=$(get_libname "[23]")
+ find "${LIB}" -maxdepth 1 -type l -name 'libdb[1._-]*'"${soext#.}" -delete || die
find "${LIB}" -maxdepth 1 -type l -name 'libdb[1._-]*a' -delete || die
# now rebuild all the correct ones
local ext
- for ext in so a; do
+ for ext in so dylib a; do
for name in libdb libdb_{cxx,tcl,java,sql,stl}; do
target="$(find . -maxdepth 1 -type f -name "${name}-*.${ext}" |sort -V |tail -n 1)"
[[ -n "${target}" ]] && ln -sf ${target//.\//} ${name}.${ext}
@@ -37,17 +39,17 @@ db_fix_so() {
done;
# db[23] gets some extra-special stuff
- if [[ -f libdb1.so.2 ]]; then
- ln -sf libdb1.so.2 libdb.so.2
- ln -sf libdb1.so.2 libdb1.so
- ln -sf libdb1.so.2 libdb-1.so
+ if [[ -f libdb1$(get_libname 2) ]]; then
+ ln -sf libdb1$(get_libname 2) libdb$(get_libname 2)
+ ln -sf libdb1$(get_libname 2) libdb1$(get_libname)
+ ln -sf libdb1$(get_libname 2) libdb-1$(get_libname)
fi
# what do we do if we ever get 3.3 ?
local i
for i in libdb libdb_{cxx,tcl,java,sql,stl}; do
- if [[ -f ${i}-3.2.so ]]; then
- ln -sf ${i}-3.2.so ${i}-3.so
- ln -sf ${i}-3.2.so ${i}.so.3
+ if [[ -f $i-3.2$(get_libname) ]]; then
+ ln -sf $i-3.2$(get_libname) $i-3$(get_libname)
+ ln -sf $i-3.2$(get_libname) $i$(get_libname 3)
fi
done
@@ -143,8 +145,10 @@ db_src_install_usrlibcleanup() {
mv "${LIB}/libdb_cxx.a" "${LIB}/libdb_cxx-${SLOT}.a" || die
fi
- find "${LIB}" -maxdepth 1 -type l -name 'libdb[1._-]*so' -delete || die
- find "${LIB}" -maxdepth 1 -type l -name 'libdb[1._-]*so.[23]' -delete || die
+ local soext=$(get_libname)
+ find "${LIB}" -maxdepth 1 -type l -name 'libdb[1._-]*'"${soext#.}" -delete || die
+ soext=$(get_libname "[23]")
+ find "${LIB}" -maxdepth 1 -type l -name 'libdb[1._-]*'"${soext#.}" -delete || die
einfo "removing unversioned static archives"
find "${LIB}" -maxdepth 1 -type l -name 'libdb[1._-]*a' -delete || die
diff --git a/eclass/vala.eclass b/eclass/vala.eclass
index 52899f163dcf..88c5231286ab 100644
--- a/eclass/vala.eclass
+++ b/eclass/vala.eclass
@@ -102,7 +102,7 @@ vala_best_api_version() {
u=$(_vala_use_depend)
for v in $(vala_api_versions); do
- has_version "dev-lang/vala:${v}${u}" && echo "${v}" && return
+ has_version $([[ $EAPI == [1-6] ]] || echo -b) "dev-lang/vala:${v}${u}" && echo "${v}" && return
done
}
@@ -136,7 +136,7 @@ vala_src_prepare() {
fi
if [[ ${version} ]]; then
- has_version "dev-lang/vala:${version}" || die "No installed vala:${version}"
+ has_version $([[ $EAPI == [1-6] ]] || echo -b) "dev-lang/vala:${version}" || die "No installed vala:${version}"
else
version=$(vala_best_api_version)
[[ ${version} ]] || die "No installed vala in $(vala_depend)"
diff --git a/games-engines/Manifest.gz b/games-engines/Manifest.gz
index 9a831e952d80..96a7514c16fb 100644
Binary files a/games-engines/Manifest.gz and b/games-engines/Manifest.gz differ
diff --git a/games-engines/devilutionx/Manifest b/games-engines/devilutionx/Manifest
index 54cf9f37bb5c..2d03274ed51a 100644
--- a/games-engines/devilutionx/Manifest
+++ b/games-engines/devilutionx/Manifest
@@ -1,8 +1,10 @@
+AUX devilutionx-1.1.0-no_bundled_font.patch 1772 BLAKE2B 29c4b17ade1e742ef1dd5137b100df027381f9865f0ddf2295470a5fdcf53e1a2aaa4850f3ea43d05af81546b32ab037fbf226c302bf93fe4ab53396ab81bd27 SHA512 7f1a5ff1b5f0d9d0ea5c2374413cf80424583e46529633272ea903c794a2f5b6f091471a493772f85d13c53a5a8aaf9cf20e8fd165895eb486a7f6a487fecf44
DIST devilutionx-1.0.1.tar.gz 2005920 BLAKE2B 96441436f86430028ebca51a108758c9980b785db1d79de132730b284037d7bfe9f2e7eb23e49108ac520a37479fd3756b2a7605fbaab0232b38039c20f9ed2f SHA512 8c08db37664f4d9971650675866671411fe0fc00fedf4d2b2db040d48fc07e36def3bd78fa892c2be012d46df9519f28a31fe0b3e14f46e1037476458f60cb6d
DIST devilutionx-1.0.3.tar.gz 2010213 BLAKE2B 820917f7587c7afff5272d8dc49fd5dfb6d435be0e43c8f65e0767845bc94e0ae7bb23cddb7c0a7ea4f559e0958cb2eb59ade338334f2c9d481fda4cbcc343d8 SHA512 34840f44d0b72d1f9bc6cab8d1c0cf14414b95b3eff916b397078022e66f96e5aef24365f694da45d5b8729a6b0c876b584039710ceebaec040f1337c218caaa
DIST devilutionx-1.1.0.tar.gz 2271614 BLAKE2B 8afdffafd86477bdeb62c2c3abb96d35dcccde7f7c44cb5ca5bbd8b46ae5f3998262eae4fa23f5c84a3ffdbcbdfc27cf91dc758cb69bfe24b301959085fbe31e SHA512 341e7f2e74e7af4a7b42054b58b6518c2f286f2fdcb21c5553a15912c044ea08f6c7b07a2079e7e795a5146e7a301789fe32b6fda5ff9fbec0654d886d423b38
EBUILD devilutionx-1.0.1.ebuild 1881 BLAKE2B 9d216183c543236820032cc124b5144b2f054f2e1912f734ec8be1cebb12bc75200924c31a29841e2f0a8187bd2351603680c72c501ce7a2aadef5ebe1f04efc SHA512 5d199a61dac8d7c60a7c3af4caa6bf02f2d9187525108aab09c5986d2b76898a008d32ee87cd6daf9c39ae26eb4652d7206604d7162211957a2efd18ec8f0e9f
EBUILD devilutionx-1.0.3.ebuild 1769 BLAKE2B 7fe565f6aca3136c4de53a66b9be8ba8fa578e4bfc1148f1b487ffc6463c729ee68b43dedbfb951cda13117aa7b1f777931a7b947ec6ba1a84a4c659a7c60042 SHA512 2eb1ba1badf306794b13b6d2e4d32ed5d0a7e669f962eec9cba0cddb2d05143453fc078a08c7117f1b4068e2082cafe309ba46a35c6c6139b6c5a0323d86bae2
+EBUILD devilutionx-1.1.0-r1.ebuild 1511 BLAKE2B 31bbb8d8ea09696463d55bc5479490fc48df0488a9825281b97e67059455a3cd19fe9dbf3f7a9f1672ee2dea25790fdd040a103481e655b28e66ac84e23e9a9f SHA512 914b463ba1cb3a2cc1b1b1d7a23f83acae58814265696b2e9ee93dea5de9c282cab198d924b43b07eba46955d3d2226ea13fb83f3ef06422f586de0a2c8c480a
EBUILD devilutionx-1.1.0.ebuild 1417 BLAKE2B caeb8713f216959fc44550fe5a1c78d139634b7c2a9188c2fe546247adcf0602ea7b6a4e3bf3c959d4814f4a604e18354db972bda8a23d7a0f9574fba56f21f5 SHA512 cf122f1c69585e733db8d38c8cad28bead978920c5fc3369fd3e8455ffecdffda49d8725a29a2ec3d325fb8a4331d1ec9a2317ff7b3cb12a6508c37deda79ab3
-EBUILD devilutionx-9999.ebuild 1417 BLAKE2B caeb8713f216959fc44550fe5a1c78d139634b7c2a9188c2fe546247adcf0602ea7b6a4e3bf3c959d4814f4a604e18354db972bda8a23d7a0f9574fba56f21f5 SHA512 cf122f1c69585e733db8d38c8cad28bead978920c5fc3369fd3e8455ffecdffda49d8725a29a2ec3d325fb8a4331d1ec9a2317ff7b3cb12a6508c37deda79ab3
+EBUILD devilutionx-9999.ebuild 1511 BLAKE2B 31bbb8d8ea09696463d55bc5479490fc48df0488a9825281b97e67059455a3cd19fe9dbf3f7a9f1672ee2dea25790fdd040a103481e655b28e66ac84e23e9a9f SHA512 914b463ba1cb3a2cc1b1b1d7a23f83acae58814265696b2e9ee93dea5de9c282cab198d924b43b07eba46955d3d2226ea13fb83f3ef06422f586de0a2c8c480a
MISC metadata.xml 436 BLAKE2B ed4e752aec9d06340681c3ffa0f9608d38935fb1ff141bb016fa7f64fe466aa0f0674993deb75d0d350fdbb796699f48c93315d84960ef65085fca0caeda9a7d SHA512 0d60174f463dd3b1593ec72a876c3a7d50f9c422ed43893288f9c237d4f852295a19c3950d45d7a900740bf9c8f9cc9c032d7cab37934bfbbd46ffae4e52cc01
diff --git a/games-engines/devilutionx/devilutionx-1.1.0-r1.ebuild b/games-engines/devilutionx/devilutionx-1.1.0-r1.ebuild
new file mode 100644
index 000000000000..913e1f40eef5
--- /dev/null
+++ b/games-engines/devilutionx/devilutionx-1.1.0-r1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# Sometimes build with ninja fails.
+# Please check occasionally if we can revert back to ninja.
+# Latest known issue:
+#
+#CMAKE_MAKEFILE_GENERATOR="emake"
+
+inherit cmake desktop
+
+DESCRIPTION="Diablo engine for modern operating systems"
+HOMEPAGE="https://github.com/diasurgical/devilutionX"
+if [[ "${PV}" == 9999 ]] ; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/diasurgical/devilutionX.git"
+else
+ SRC_URI="https://github.com/diasurgical/devilutionX/archive/${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~x86"
+ S="${WORKDIR}/devilutionX-${PV}"
+fi
+
+LICENSE="public-domain"
+SLOT="0"
+
+IUSE="debug lto"
+
+RDEPEND="
+ dev-libs/libsodium
+ media-fonts/sil-charis
+ media-libs/libsdl2[haptic]
+ media-libs/sdl2-mixer
+ media-libs/sdl2-ttf
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ virtual/pkgconfig
+"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-1.1.0-no_bundled_font.patch" #704508
+)
+
+src_configure() {
+ local mycmakeargs=(
+ -DASAN="OFF"
+ -DDEBUG="$(usex debug)"
+ -DDISABLE_LTO="$(usex !lto)"
+ -DDIST="ON"
+ -DUBSAN="OFF"
+ )
+ cmake_src_configure
+
+ # Build system still doesn't reliably set release version in the build
+ sed "/PROJECT_VERSION/s@-@${PV}@" -i "${BUILD_DIR}/config.h" || die
+}
+
+pkg_postinst() {
+ einfo "In order to play the game you need to install the file"
+ einfo " diabdat.mpq"
+ einfo "from the original game CD into the following directory:"
+ einfo " \${HOME}/.local/share/diasurgical/devilution/"
+}
diff --git a/games-engines/devilutionx/devilutionx-9999.ebuild b/games-engines/devilutionx/devilutionx-9999.ebuild
index 3966e9a6b14a..913e1f40eef5 100644
--- a/games-engines/devilutionx/devilutionx-9999.ebuild
+++ b/games-engines/devilutionx/devilutionx-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -29,6 +29,7 @@ IUSE="debug lto"
RDEPEND="
dev-libs/libsodium
+ media-fonts/sil-charis
media-libs/libsdl2[haptic]
media-libs/sdl2-mixer
media-libs/sdl2-ttf
@@ -38,6 +39,10 @@ BDEPEND="
virtual/pkgconfig
"
+PATCHES=(
+ "${FILESDIR}/${PN}-1.1.0-no_bundled_font.patch" #704508
+)
+
src_configure() {
local mycmakeargs=(
-DASAN="OFF"
diff --git a/games-engines/devilutionx/files/devilutionx-1.1.0-no_bundled_font.patch b/games-engines/devilutionx/files/devilutionx-1.1.0-no_bundled_font.patch
new file mode 100644
index 000000000000..7944a8221d2d
--- /dev/null
+++ b/games-engines/devilutionx/files/devilutionx-1.1.0-no_bundled_font.patch
@@ -0,0 +1,51 @@
+https://bugs.gentoo.org/704508
+
+--- devilutionX-1.1.0/CMakeLists.txt
++++ devilutionX-1.1.0/CMakeLists.txt
+@@ -298,7 +298,6 @@
+ SourceX/main.cpp
+ SourceX/devilutionx.exe.manifest
+ Packaging/macOS/AppIcon.icns
+- Packaging/resources/CharisSILB.ttf
+ Packaging/windows/devilutionx.rc)
+
+ if(NOT NONET)
+@@ -339,9 +338,6 @@
+
+ add_executable(${BIN_TARGET} WIN32 MACOSX_BUNDLE ${devilutionx_SRCS})
+
+-# Copy the font to the build directory to it works from the build directory
+-file(COPY "Packaging/resources/CharisSILB.ttf" DESTINATION "${CMAKE_CURRENT_BINARY_DIR}")
+-
+ # Use file GENERATE instead of configure_file because configure_file
+ # does not support generator expressions.
+ get_property(is_multi_config GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG)
+@@ -563,7 +559,6 @@
+
+ if(APPLE)
+ set_source_files_properties("./Packaging/macOS/AppIcon.icns" PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
+- set_source_files_properties("./Packaging/resources/CharisSILB.ttf" PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
+ set(MACOSX_BUNDLE_GUI_IDENTIFIER com.diasurgical.devilutionx)
+ set(MACOSX_BUNDLE_COPYRIGHT Unlicense)
+ set(MACOSX_BUNDLE_BUNDLE_NAME devilutionx)
+@@ -624,9 +619,6 @@
+ DESTINATION "share/icons/hicolor/512x512/apps"
+ RENAME "${project_name}.png"
+ )
+- install(FILES "${PROJECT_SOURCE_DIR}/Packaging/resources/CharisSILB.ttf"
+- DESTINATION "share/fonts/truetype"
+- )
+
+ # -G DEB
+ set(CPACK_PACKAGE_CONTACT "anders@jenbo.dk")
+--- devilutionX-1.1.0/SourceX/DiabloUI/fonts.h
++++ devilutionX-1.1.0/SourceX/DiabloUI/fonts.h
+@@ -11,7 +11,7 @@
+ #endif
+
+ #ifndef TTF_FONT_NAME
+-#define TTF_FONT_NAME "CharisSILB.ttf"
++#define TTF_FONT_NAME "CharisSIL-B.ttf"
+ #endif
+
+ namespace dvl {
diff --git a/gnome-base/Manifest.gz b/gnome-base/Manifest.gz
index bf7e1eee04fa..157ee9966880 100644
Binary files a/gnome-base/Manifest.gz and b/gnome-base/Manifest.gz differ
diff --git a/gnome-base/gdm/Manifest b/gnome-base/gdm/Manifest
index 506c67ecba12..60318bd94085 100644
--- a/gnome-base/gdm/Manifest
+++ b/gnome-base/gdm/Manifest
@@ -10,5 +10,5 @@ DIST gdm-3.36.3.tar.xz 1218972 BLAKE2B 8e4d3dcd1dc84de276a6426feae206d43cfcbd8c8
DIST gdm-3.36.4.tar.xz 1235796 BLAKE2B eeac6c3c95993d7a75eecd03b51f0519b2f899eaecce8767dbab01eead68bddde21edc999eaf6b7ce747084ac9f88ab71cd7bf602e3bdc5bfe09038e3b01ad3a SHA512 ee8a4ae4a1c4846e4d52fda0b115dfc79ef76b78a2349977767e4212910b5ad331b908601f252292a8a944973372d1dce3124d9ccb8a2519a98d0e4813a6ec61
DIST tango-gentoo-v1.1.tar.gz 29322 BLAKE2B 83fa2bf37727e60851dd679054fe1b153ebfea58c9a9a40f891f7d68d3b047b02e8effa1d1b4e08d64500a2072ce7200f159c92a352da7124de27e1b05bb6027 SHA512 87d47ddab68361db6d99866c51705dcb3e198f8345a1096859acf2c6cca5099dd23c7fb30d124f52c4933ea38fd45fadffbbe6ecbdfa84f5b60938a4824f9045
EBUILD gdm-3.36.3.ebuild 7890 BLAKE2B 85a72c96ec7a8ca887e62c08dc6de3155750cdd0f7c991177d59e624f5a1f671eea74bd658d91a04e29627320b84adfa225f854b554385df7475812dbcd872d3 SHA512 03311a54858c5184eb9ded700a3302ca1f9eef6a35b7ade2b3b3d0d004c620ff99d53568f6c56ff34f6f2f91652f6fbc6250f7471f33f8f5a059a1e7e676602c
-EBUILD gdm-3.36.4.ebuild 7892 BLAKE2B d0bc4d82f8582bc86b41555f9c3d214e3c6c8da4ebebf085f991538e6c7b643f92f7b136fb8e9aad45e0981244532814fd6a281e4a32445cde7ce7d7bf97de1e SHA512 f9e2ce355ac24b17fca48d8f1fe80e4d0393d5d23a5b4dfbe687cb2eefe2e7a69abbb43efdb4fcbe365521647f4a429bad7809cd9bfbc99542dd627ae9c2be95
+EBUILD gdm-3.36.4.ebuild 7216 BLAKE2B 616d7e0e5a87180e53ed7a48356029d464ad072879b7c4949e18662ef0217e102d275af78f4336cc0a41dbb24e7eb7e18c8e5a3884a56431618e5736d4651b07 SHA512 7955211e0fe7e63e9622f457a5fd970015c6ad128f40b1c43968432054e26f4dedec5da8680112d50673c0810d67a8aa3150d5e17d1ecf690bb0575facc6871d
MISC metadata.xml 759 BLAKE2B 13de28afc8fe81580a2aa28c5fdc17c77266595ffe95218cfbb5cbee4cbd6edab21e8cd06698e4a5feeb696fd9530ef8bf14209ecf3d03039b4e0562bb757375 SHA512 68cec6972bcabcb873fb314babbf9bdfacc7eaae40d662d11662fccd6cbf6630cd93b7322baa271081244c77fd1458c89ad785a0eb2a58b448ddff663381d98d
diff --git a/gnome-base/gdm/gdm-3.36.4.ebuild b/gnome-base/gdm/gdm-3.36.4.ebuild
index 8a86e224747e..484f7ecbf18c 100644
--- a/gnome-base/gdm/gdm-3.36.4.ebuild
+++ b/gnome-base/gdm/gdm-3.36.4.ebuild
@@ -1,11 +1,10 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
-GNOME2_LA_PUNT="yes"
+EAPI=7
GNOME2_EAUTORECONF="yes"
-inherit eutils gnome2 pam readme.gentoo-r1 systemd toolchain-funcs udev user
+inherit gnome2 pam readme.gentoo-r1 systemd toolchain-funcs udev
DESCRIPTION="GNOME Display Manager for managing graphical display servers and user logins"
HOMEPAGE="https://wiki.gnome.org/Projects/GDM"
@@ -72,6 +71,8 @@ COMMON_DEPEND="
# fprintd is used via dbus by gdm-fingerprint-extension
# gnome-session-3.6 needed to avoid freezing with orca
RDEPEND="${COMMON_DEPEND}
+ acct-group/gdm
+ acct-user/gdm
>=gnome-base/gnome-session-3.6
>=gnome-base/gnome-shell-3.1.90
x11-apps/xhost
@@ -79,18 +80,19 @@ RDEPEND="${COMMON_DEPEND}
accessibility? (
>=app-accessibility/orca-3.10
gnome-extra/mousetweaks )
- fprint? (
- sys-auth/fprintd
- sys-auth/pam_fprint )
+ fprint? ( sys-auth/fprintd[pam] )
"
DEPEND="${COMMON_DEPEND}
+ x11-base/xorg-proto
+"
+BDEPEND="
app-text/docbook-xml-dtd:4.1.2
dev-util/gdbus-codegen
dev-util/glib-utils
dev-util/itstool
+ >=gnome-base/dconf-0.20
>=sys-devel/gettext-0.19.8
virtual/pkgconfig
- x11-base/xorg-proto
test? ( >=dev-libs/check-0.9.4 )
app-text/yelp-tools
" # yelp-tools needed for eautoreconf to not lose help docs (m4_ifdeffed YELP_HELP_INIT call and setup)
@@ -111,23 +113,6 @@ DOC_CONTENTS="
for smartcard support
"
-pkg_setup() {
- enewgroup gdm
- enewgroup video # Just in case it hasn't been created yet
- enewuser gdm -1 -1 /var/lib/gdm gdm,video
-
- # For compatibility with certain versions of nvidia-drivers, etc., need to
- # ensure that gdm user is in the video group
- if ! egetent group video | grep -q gdm; then
- # FIXME XXX: is this at all portable, ldap-safe, etc.?
- # XXX: egetent does not have a 1-argument form, so we can't use it to
- # get the list of gdm's groups
- local g=$(groups gdm)
- elog "Adding user gdm to video group"
- usermod -G video,${g// /,} gdm || die "Adding user gdm to video group failed"
- fi
-}
-
src_prepare() {
# ssh-agent handling must be done at xinitrc.d, bug #220603
eapply "${FILESDIR}/${PN}-2.32.0-xinitrc-ssh-agent.patch"
@@ -209,10 +194,6 @@ src_install() {
newexe "${FILESDIR}/49-keychain-r1" 49-keychain
newexe "${FILESDIR}/50-ssh-agent-r1" 50-ssh-agent
- # gdm user's home directory
- keepdir /var/lib/gdm
- fowners gdm:gdm /var/lib/gdm
-
if ! use bluetooth-sound ; then
# Workaround https://gitlab.freedesktop.org/pulseaudio/pulseaudio/merge_requests/10
# bug #679526
@@ -235,9 +216,9 @@ pkg_postinst() {
# bug #669146; gdm may crash if /var/lib/gdm subdirs are not owned by gdm:gdm
ret=0
- ebegin "Fixing "${EROOT}"var/lib/gdm ownership"
- chown --no-dereference gdm:gdm "${EROOT}var/lib/gdm" || ret=1
- for d in "${EROOT}var/lib/gdm/"{.cache,.color,.config,.dbus,.local}; do
+ ebegin "Fixing "${EROOT}"/var/lib/gdm ownership"
+ chown --no-dereference gdm:gdm "${EROOT}/var/lib/gdm" || ret=1
+ for d in "${EROOT}/var/lib/gdm/"{.cache,.color,.config,.dbus,.local}; do
[[ ! -e "${d}" ]] || chown --no-dereference -R gdm:gdm "${d}" || ret=1
done
eend ${ret}
diff --git a/gnome-base/gnome-keyring/Manifest b/gnome-base/gnome-keyring/Manifest
index a8abe06f6c41..825e79ec9764 100644
--- a/gnome-base/gnome-keyring/Manifest
+++ b/gnome-base/gnome-keyring/Manifest
@@ -1,3 +1,3 @@
DIST gnome-keyring-3.36.0.tar.xz 1345360 BLAKE2B f37454e0e42dcc1fe7e29e95dcb8ca7bc2db10e6b262b796421b4fd38b87fe9128a4c2f129d28d14716a2f9a7d60061d4b345e9564e73a0587faf24a7d2b1194 SHA512 e5aed36ad109cbd2dcb534843f8565829366acc955cadc6e9bbe87ebbb6a8a907211aa3a42f7f26148ac69726af2f9238965707d1259319435bd20aa8c4859ed
-EBUILD gnome-keyring-3.36.0.ebuild 2261 BLAKE2B af850ab3e1f8cf880a68432638eb2d8839a8058a6a5919d554a125f0e0451040962eb6a3a648fa7735d973b386681f7ce857606dcfbb9326c5b27a82b92871af SHA512 d4c54487c420115db2c4c4b21de3236a3ec1086f10dc7cc91124f6c0ad743ba2426b4bdbe632f6542fe46b7091cad14d1c9a7f9fc394481abf9911664ad1e61b
+EBUILD gnome-keyring-3.36.0.ebuild 2287 BLAKE2B 21c26fe56eeea29cacbc0ef63d512eac665fe5dbb22f2dd6bf32714b4839e3ff2f931ffbe6c5f0b3baf46fe5ec018c8a9e9dc33b9b7c235b35a3c6139d2517c6 SHA512 ca4d338d3f5e6681e9faf117f5e68b4b1335328b9bc0e69f18874f7c4438df5fd4dc0b272c1dbdc021ad8c533b9b79732d15653c7f9b5b6de0b7e657bf6f1be9
MISC metadata.xml 883 BLAKE2B 6d253b088319b1f442d91e0372751ce3ddd0516bbd3e72242e4541837c6c6bfe83371a5c47a7be73fad6046be5f053aa6c6fb41d884111ac53cd4de3cb0d1381 SHA512 31d506051c1353e1e4dd987e5ccd39281d19f6ae08974a09bd8145218c7209588629a79c6baad9ff1b83358a699f46fddb8c4ec51da73efe26be2d5e7f0a905a
diff --git a/gnome-base/gnome-keyring/gnome-keyring-3.36.0.ebuild b/gnome-base/gnome-keyring/gnome-keyring-3.36.0.ebuild
index c28cbcaedec6..9315b7b2daba 100644
--- a/gnome-base/gnome-keyring/gnome-keyring-3.36.0.ebuild
+++ b/gnome-base/gnome-keyring/gnome-keyring-3.36.0.ebuild
@@ -1,8 +1,7 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
-GNOME2_LA_PUNT="yes"
+EAPI=7
PYTHON_COMPAT=( python3_{6..9} )
inherit fcaps gnome2 pam python-any-r1 virtualx
@@ -19,16 +18,18 @@ KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x
# Replace gkd gpg-agent with pinentry[gnome-keyring] one, bug #547456
RDEPEND="
>=app-crypt/gcr-3.27.90:=[gtk]
- >=dev-libs/glib-2.44:2
+ >=app-crypt/gnupg-2.0.28:=
+ >=app-eselect/eselect-pinentry-0.5
app-misc/ca-certificates
+ >=dev-libs/glib-2.44:2
>=dev-libs/libgcrypt-1.2.2:0=
caps? ( sys-libs/libcap-ng )
pam? ( sys-libs/pam )
selinux? ( sec-policy/selinux-gnome )
- >=app-crypt/gnupg-2.0.28:=
ssh-agent? ( net-misc/openssh )
"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
>=app-eselect/eselect-pinentry-0.5
app-text/docbook-xml-dtd:4.3
dev-libs/libxslt
diff --git a/gnome-base/gnome-shell/Manifest b/gnome-base/gnome-shell/Manifest
index d24de19eb16d..3eeb1eb49481 100644
--- a/gnome-base/gnome-shell/Manifest
+++ b/gnome-base/gnome-shell/Manifest
@@ -3,6 +3,8 @@ AUX 3.36-defaults.patch 1463 BLAKE2B c529ac85d19699d0837f4060011b8b7dd03773af442
DIST gnome-shell-3.36.7-patchset.tar.xz 6364 BLAKE2B 80a2e2a03e4cc3b15db6af872a2330c0921a63bcd03db78a970190fee93c982296b381d08ac4bd1cb5dbe5b14d9732e447445f5dcc06d607826a9026395f10bb SHA512 6f9145fd00117e6b4170e7457c83a8c3bbbbfc6086ce3bcd07813b5a4f05e58f42e889cc90799d6988af05fce9791a792e4d8d60ffe58818563c852f9923930d
DIST gnome-shell-3.36.7.tar.xz 1777236 BLAKE2B 4dd3b98e8a2ffa711bffe0b3b78708c85c1979122ee71e7e0d7c55626a608ba4598071bf8659338c960ba4b0349e5b621b97f294a4961cf021b9047753136af5 SHA512 7275d1e2d2629abd2fbfae910a77c25485464e39f8317ba1b0e8e1ae3368e69af4eb85c2611e82ea04270bfd8185e24f13002df9b13335adbdff144847790656
DIST gnome-shell-3.38.2.tar.xz 1814152 BLAKE2B 765f584ad8f71ac185e9dc6683f1866308c126d8ce8ba9330068e324ea9586b57315cf7feade62eb4142bb3a4effd80c7e6e0d7b36b6c5fb7d547e3bff9c2ab2 SHA512 ac37549039a11f4f1b2cdd8b0f8cab72093efca74a5909ad187121565cce737c6a6f296c7241ac5f2174fdfcf11070f7584e713e244fafc911fe039d8fd05f04
+DIST gnome-shell-3.38.3.tar.xz 1815204 BLAKE2B 1df05f0a3709d851d9bb01c8d8f82b3e36aa1da68256198afe7f5663bbf3dc3b88148220b4f90a1ab3eb3d2a14e370dc038e9afd73c57133f9535423b074ac27 SHA512 695446a934b3e5f8512084cb4eaba3e27aec0e03041890fb2a7a9eb4d91d3a9f2f5ca94a8616ce4e7303a2073fda7878425ba31bf590c448132f379fa7138d47
EBUILD gnome-shell-3.36.7.ebuild 6667 BLAKE2B 5fbfd1bf5a20ad8a7262a4bdc8c8b797ac3e5d34652fa2e50ad875778eb84f1a0f5be7c23ce7ed57d3d1e293c439a0dfad7bd7840d23e58ae1c83be31e1c6736 SHA512 bf5b0add1c462998859e3f32e8bae687ec53f9cd1911110a1246bd39361d1f219c326ccb2cf12e12b56e8673311fd7e5895cfdceb8a800f3d114b8cfee5f79ac
EBUILD gnome-shell-3.38.2.ebuild 6304 BLAKE2B 3afdd773e134f62a466f6b9800477babd04446ede7bb7b8768f82b90bf540be0c6944b3c30805a51a17524a1afadc332d95bd34513ee8fc5f54dc63d0b632897 SHA512 abf9a4c80031a686b6332c506f452d8ebf0fe04cdccdd2d9798b8cdd933f8bac88c3302f6f591c4195c3b358246064349fdc6a04e9a88f6c0bc38d35cf9c863d
+EBUILD gnome-shell-3.38.3.ebuild 6304 BLAKE2B 3afdd773e134f62a466f6b9800477babd04446ede7bb7b8768f82b90bf540be0c6944b3c30805a51a17524a1afadc332d95bd34513ee8fc5f54dc63d0b632897 SHA512 abf9a4c80031a686b6332c506f452d8ebf0fe04cdccdd2d9798b8cdd933f8bac88c3302f6f591c4195c3b358246064349fdc6a04e9a88f6c0bc38d35cf9c863d
MISC metadata.xml 1050 BLAKE2B cf97e536a47f3b023e118a818bbc34af63500d2ea94bbc71201d2ce18aa6e473673cb28a47245de24b7bad9a174a6dda6b46c300518521c8ea0662e88e95627d SHA512 50c1d4c3eacb89b77bc49b4f236bba9d9041ef047392d5bda19e85b0c935709a095a388b1625a2c77c66145758e9b4ab77a202aa6cdd2b86f262c5b56e428b06
diff --git a/gnome-base/gnome-shell/gnome-shell-3.38.3.ebuild b/gnome-base/gnome-shell/gnome-shell-3.38.3.ebuild
new file mode 100644
index 000000000000..e8428c44af46
--- /dev/null
+++ b/gnome-base/gnome-shell/gnome-shell-3.38.3.ebuild
@@ -0,0 +1,186 @@
+# 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 gnome.org gnome2-utils meson python-single-r1 virtualx xdg
+
+DESCRIPTION="Provides core UI functions for the GNOME 3 desktop"
+HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShell"
+
+LICENSE="GPL-2+ LGPL-2+"
+SLOT="0"
+IUSE="+bluetooth +browser-extension elogind gtk-doc +ibus +networkmanager systemd telepathy"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+ ?? ( elogind systemd )"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+# libXfixes-5.0 needed for pointer barriers and #include
+# FIXME:
+# * gstreamer/pipewire support is currently automagic
+DEPEND="
+ >=gnome-extra/evolution-data-server-3.33.1:=
+ >=app-crypt/gcr-3.7.5[introspection]
+ >=dev-libs/glib-2.57.2:2
+ >=dev-libs/gobject-introspection-1.49.1:=
+ >=dev-libs/gjs-1.65.1
+ >=x11-libs/gtk+-3.15.0:3[introspection]
+ >=x11-wm/mutter-3.38.0:0/7[introspection]
+ >=sys-auth/polkit-0.100[introspection]
+ >=gnome-base/gsettings-desktop-schemas-3.33.1
+ >=x11-libs/startup-notification-0.11
+ >=app-i18n/ibus-1.5.2
+ >=gnome-base/gnome-desktop-3.35.90:3=[introspection]
+ bluetooth? ( >=net-wireless/gnome-bluetooth-3.9[introspection] )
+ >=media-libs/gstreamer-0.11.92:1.0
+ media-libs/gst-plugins-base:1.0
+ >=media-video/pipewire-0.3.0:0/0.3
+ networkmanager? (
+ >=net-misc/networkmanager-1.10.4:=[introspection]
+ net-libs/libnma[introspection]
+ >=app-crypt/libsecret-0.18
+ dev-libs/dbus-glib )
+ systemd? ( >=sys-apps/systemd-242
+ >=gnome-base/gnome-desktop-3.34.2:3=[systemd] )
+ elogind? ( >=sys-auth/elogind-237 )
+ app-arch/gnome-autoar
+ dev-libs/json-glib
+
+ >=app-accessibility/at-spi2-atk-2.5.3
+ x11-libs/gdk-pixbuf:2[introspection]
+ dev-libs/libxml2:2
+ x11-libs/libX11
+
+ >=media-sound/pulseaudio-2[glib]
+ >=dev-libs/atk-2[introspection]
+ dev-libs/libical:=
+ >=x11-libs/libXfixes-5.0
+
+ ${PYTHON_DEPS}
+ $(python_gen_cond_dep '
+ dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+ ')
+ media-libs/mesa[X(+)]
+"
+# Runtime-only deps are probably incomplete and approximate.
+# Introspection deps generated using:
+# grep -roe "imports.gi.*" gnome-shell-* | cut -f2 -d: | sort | uniq
+# Each block:
+# 1. Introspection stuff needed via imports.gi.*
+# 2. gnome-session needed for shutdown/reboot/inhibitors/etc
+# 3. Control shell settings
+# 4. logind interface needed for suspending support
+# 5. xdg-utils needed for xdg-open, used by extension tool
+# 6. adwaita-icon-theme needed for various icons & arrows (3.26 for new video-joined-displays-symbolic and co icons; review for 3.28+)
+# 7. mobile-broadband-provider-info, timezone-data for shell-mobile-providers.c # TODO: Review
+# 8. IBus is needed for nls integration
+# 9. Optional telepathy chat integration
+# 10. Cantarell font used in gnome-shell global CSS (if removing this for some reason, make sure it's pulled in somehow for non-meta users still too)
+# 11. TODO: semi-optional webkit-gtk[introspection] for captive portal helper
+RDEPEND="${DEPEND}
+ >=sys-apps/accountsservice-0.6.14[introspection]
+ app-accessibility/at-spi2-core:2[introspection]
+ app-misc/geoclue[introspection]
+ >=dev-libs/libgweather-3.26:2[introspection]
+ >=sys-power/upower-0.99:=[introspection]
+ x11-libs/pango[introspection]
+ gnome-base/librsvg:2[introspection]
+
+ >=gnome-base/gnome-session-2.91.91
+ >=gnome-base/gnome-settings-daemon-3.8.3
+
+ x11-misc/xdg-utils
+
+ >=x11-themes/adwaita-icon-theme-3.26
+
+ networkmanager? (
+ net-misc/mobile-broadband-provider-info
+ sys-libs/timezone-data )
+ ibus? ( >=app-i18n/ibus-1.4.99[dconf(+),gtk,introspection] )
+ telepathy? (
+ >=net-im/telepathy-logger-0.2.4[introspection]
+ >=net-libs/telepathy-glib-0.19[introspection] )
+ media-fonts/cantarell
+"
+# avoid circular dependency, see bug #546134
+PDEPEND="
+ >=gnome-base/gdm-3.5[introspection]
+ >=gnome-base/gnome-control-center-3.26[bluetooth(+)?,networkmanager(+)?]
+ browser-extension? ( gnome-extra/chrome-gnome-shell )
+"
+BDEPEND="
+ dev-lang/sassc
+ dev-libs/libxslt
+ app-text/asciidoc
+ >=dev-util/gdbus-codegen-2.45.3
+ dev-util/glib-utils
+ gtk-doc? ( >=dev-util/gtk-doc-1.17
+ app-text/docbook-xml-dtd:4.3 )
+ >=sys-devel/gettext-0.19.8
+ virtual/pkgconfig
+"
+
+PATCHES=(
+ # Fix automagic gnome-bluetooth dep, bug #398145
+ "${FILESDIR}"/3.34-optional-bluetooth.patch
+ # Change favorites defaults, bug #479918
+ "${FILESDIR}"/3.36-defaults.patch
+)
+
+src_prepare() {
+ xdg_src_prepare
+ # Hack in correct python shebang
+ sed -e "s:python\.path():'/usr/bin/env ${EPYTHON}':" -i src/meson.build || die
+}
+
+src_configure() {
+ local emesonargs=(
+ $(meson_use bluetooth)
+ -Dextensions_tool=true
+ -Dextensions_app=true
+ $(meson_use gtk-doc gtk_doc)
+ -Dman=true
+ $(meson_use networkmanager)
+ $(meson_use systemd) # this controls journald integration and desktop file user services related property only as of 3.34.4
+ # (structured logging and having gnome-shell launched apps use its own identifier instead of gnome-session)
+ # suspend support is runtime optional via /run/systemd/seats presence and org.freedesktop.login1.Manager dbus interface; elogind should provide what's necessary
+ )
+ meson_src_configure
+}
+
+src_test() {
+ virtx meson_src_test
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+ gnome2_schemas_update
+
+ if ! has_version 'media-libs/gst-plugins-good:1.0' || \
+ ! has_version 'media-plugins/gst-plugins-vpx:1.0'; then
+ ewarn "To make use of GNOME Shell's built-in screen recording utility,"
+ ewarn "you need to either install media-libs/gst-plugins-good:1.0"
+ ewarn "and media-plugins/gst-plugins-vpx:1.0, or use dconf-editor to change"
+ ewarn "apps.gnome-shell.recorder/pipeline to what you want to use."
+ fi
+
+ if ! has_version "media-libs/mesa[llvm]"; then
+ elog "llvmpipe is used as fallback when no 3D acceleration"
+ elog "is available. You will need to enable llvm USE for"
+ elog "media-libs/mesa if you do not have hardware 3D setup."
+ fi
+
+ # https://bugs.gentoo.org/show_bug.cgi?id=563084
+ # TODO: Is this still the case after various fixed in 3.28 for detecting non-working KMS for wayland (to fall back to X)?
+ if has_version "x11-drivers/nvidia-drivers[-kms]"; then
+ ewarn "You will need to enable kms support in x11-drivers/nvidia-drivers,"
+ ewarn "otherwise Gnome will fail to start"
+ fi
+}
+
+pkg_postrm() {
+ xdg_pkg_postrm
+ gnome2_schemas_update
+}
diff --git a/gnome-base/libgnomekbd/Manifest b/gnome-base/libgnomekbd/Manifest
index 39bbafbbbff3..d871f6930437 100644
--- a/gnome-base/libgnomekbd/Manifest
+++ b/gnome-base/libgnomekbd/Manifest
@@ -1,3 +1,3 @@
DIST libgnomekbd-3.26.1.tar.xz 450636 BLAKE2B 241f2f9af95696600f82ab3a1f53f80c6e76f6e81636419407957f172a2758ee16f5c6d419ab1c1c37d2e054c42b65404062471eceabc0fba45099481eb7b214 SHA512 8e83522f4d96001f9635278a001e0208d6d37e74b19a8c1702ec6de651036ad37a03385e66adbd3bae01d845a9a6181bb76f45bffec31eac98d600b49ab4360c
-EBUILD libgnomekbd-3.26.1.ebuild 800 BLAKE2B dcd8aaa43244bc4323987db630ce52d8f9aac63f2c9070ebe383a92bd987ccac9328c658d1f05881e507e16cd47bf6fa3c70801faf4db270cdfdc0f242a7356e SHA512 0b2a0e1e29ecde0ac275ad9bc68a61a92ccd497f9d277d338f00f494811e4e5f0ef46de62e997ca07aa9c28d5c3686d8626bf1da4736a102b85cf8b91ae6847f
+EBUILD libgnomekbd-3.26.1.ebuild 811 BLAKE2B 24edfe4511de6f99340fd73d0614ab9990276c9db0e23fc17bdc3aea5f4a088184e78129d5afc14698b740b2773a8d8a7fb5a72344e3fb9745e52aca595a8509 SHA512 308b9178b2a8c5e5dfec170099e6b0ea235aa01be74623c03d50ef7de652a3276819c283ccb843b5d261e1306b18a875f675188f060857cd35c64dabc3fe2c06
MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-base/libgnomekbd/libgnomekbd-3.26.1.ebuild b/gnome-base/libgnomekbd/libgnomekbd-3.26.1.ebuild
index 8ba0aec7a5c2..8b6422e1ad97 100644
--- a/gnome-base/libgnomekbd/libgnomekbd-3.26.1.ebuild
+++ b/gnome-base/libgnomekbd/libgnomekbd-3.26.1.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
inherit gnome2
@@ -21,7 +21,8 @@ RDEPEND="
introspection? ( >=dev-libs/gobject-introspection-0.6.7:= )
"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
dev-util/glib-utils
>=sys-devel/gettext-0.19.4
virtual/pkgconfig
diff --git a/gnome-base/libgtop/Manifest b/gnome-base/libgtop/Manifest
index 3b227267fccd..286cbb1d2734 100644
--- a/gnome-base/libgtop/Manifest
+++ b/gnome-base/libgtop/Manifest
@@ -1,5 +1,5 @@
AUX 2.40.0-sandbox-workaround.patch 890 BLAKE2B b231acfa4f15b04d5148864da0ef32f08c65fd4ddcda940cd39d832bc30d46edb8f48633e08974521abee126251e5e80693bb224f0630f17065e7c5580ba9439 SHA512 ec5b1f9e9b8174dee576370ccfeb2d758ad5369c1ffacc7d8840f9936046fbedfd0d3e1e2b024606d33a32da59c65cdf204ba98fb108a92dcff660b0769d71b6
DIST libgtop-2.40.0-patchset.tar.xz 9700 BLAKE2B 0d7e42b12fe0989df8e5abd1d45578acb97981c05c43aeeea57ba38f526e61aaa9507cd9520a20634f4559b4dfe60efd368d343f2d1ac6803e33bc5dc4832522 SHA512 15b5a81f4ec7a3e921a2c114e8f57dcca194e38849e09080c55a3a16078a8ec706f8efef6d4b22931927e7ab7789596e85054ccd85f37d6dd3206c962734960b
DIST libgtop-2.40.0.tar.xz 744316 BLAKE2B 3ffd11937e29aacc4b0d5569429ec92835a3743d7cb65336c5c36165b1bb0d817629e73db88c29eff4baf4965791497a8676a897d0de9b394f583fb2cab15b3a SHA512 a9b2135796d7e41c63a6621f672c385d1baeb74d4af3e55c9164aaaae18c66a8a76b09a6ae8b37f89f120092123c38830e0da840c6613a09035ea62339117861
-EBUILD libgtop-2.40.0-r1.ebuild 1211 BLAKE2B 0318bb4dbc3326e0d1692ad3e84db5d25910891909e924bc0995e762b2bd6bdce13f20632ca14d7810f6dcdb5aa553204217d8dbb0a61e34a2d741d0b981e87d SHA512 2a476fef7deee533b3a6cc5549f8bfe17e81972577f5a2f359a8db1eb4aef6f0a08c781eb938e06ceced2305864f209d19548cd18d4ee823d1b67d175cb04edb
+EBUILD libgtop-2.40.0-r1.ebuild 1222 BLAKE2B 3afb05e70ac310e78660ff870a2d7824f6b2b276c6a77a292c6cc65006ae44d6a6ef29c188ccd290efb04675c34d2717595b8ebb5db07ef55819056004515715 SHA512 b4d77a90adb0a94f50708028b8a7754994108861dab59fcf1708026363fcc0c97fbe108779fb71cfa1a74772d326fc429e90661995ac72b5c06c76ffa20ccdf0
MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-base/libgtop/libgtop-2.40.0-r1.ebuild b/gnome-base/libgtop/libgtop-2.40.0-r1.ebuild
index 454fa3ec2244..a724366d9e2f 100644
--- a/gnome-base/libgtop/libgtop-2.40.0-r1.ebuild
+++ b/gnome-base/libgtop/libgtop-2.40.0-r1.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
GNOME2_EAUTORECONF="yes"
inherit flag-o-matic gnome2
@@ -18,7 +18,8 @@ RDEPEND="
>=dev-libs/glib-2.26:2
introspection? ( >=dev-libs/gobject-introspection-0.6.7:= )
"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
>=dev-util/gtk-doc-am-1.4
>=sys-devel/gettext-0.19.6
virtual/pkgconfig
diff --git a/gnome-extra/Manifest.gz b/gnome-extra/Manifest.gz
index 1e2ad0b83424..093139d1c00a 100644
Binary files a/gnome-extra/Manifest.gz and b/gnome-extra/Manifest.gz differ
diff --git a/gnome-extra/zenity/Manifest b/gnome-extra/zenity/Manifest
index 4fa9d1251b4c..b24f1fb7e9b3 100644
--- a/gnome-extra/zenity/Manifest
+++ b/gnome-extra/zenity/Manifest
@@ -1,3 +1,3 @@
DIST zenity-3.32.0.tar.xz 4753752 BLAKE2B 220fbd374f2564b345f4668c0583f2678a296bbb0d344af55b849b4e7e718f29856bd43f7ae2b0fa492e3d1d8180ca160236fcc806cd483716f680d03aa019d0 SHA512 d057df25dbb2d780c6be184ec167b0f569eadf0ac1c460d63509843157f14dfdcebe46bb6f93b17c6069ef0208902ce9ecbb4025933f7dc7572323032ec34fda
-EBUILD zenity-3.32.0.ebuild 1063 BLAKE2B bde976cb06e8963480d109ee619e745187284f0342feec8ec24f7a68501a7d4443c97ce86b28c4aa0a2f260c3e289919b27ba8ee38178af5af7023b615f4fe30 SHA512 27561f4aa7ad6a320fe4bc6d80dafa783fce6f13205af25c2e5af1eb47011d6b35db584f78c60c28bbe42dda9ed9e0ffe95d73fc5f34700260349574357682a8
+EBUILD zenity-3.32.0.ebuild 1074 BLAKE2B a02d0106c0bd58586588af8cdb50723eca45742c39d539f9bcdc226eca3767d61f899e2e9b987a9af64f564e6afc4f20ed6a7835a0e0e70e4b8491de00560cdc SHA512 59aa87003c9dbb18405c023f71a41a97f20db236c4ac297ce8e06c28e15240e8d86ac9e7296b5387cacc234fbacdd8a197d0428a558184b57982e12938a2cd60
MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/zenity/zenity-3.32.0.ebuild b/gnome-extra/zenity/zenity-3.32.0.ebuild
index 64bf0a289f70..5d5ab54c9b12 100644
--- a/gnome-extra/zenity/zenity-3.32.0.ebuild
+++ b/gnome-extra/zenity/zenity-3.32.0.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
inherit gnome2
DESCRIPTION="Tool to display dialogs from the commandline and shell scripts"
@@ -22,7 +22,8 @@ RDEPEND="
libnotify? ( >=x11-libs/libnotify-0.6.1:= )
webkit? ( >=net-libs/webkit-gtk-2.8.1:4 )
"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
dev-util/itstool
>=sys-devel/gettext-0.19.4
virtual/pkgconfig
diff --git a/gui-apps/Manifest.gz b/gui-apps/Manifest.gz
index 4c9b4685f096..996a4c4c4ab6 100644
Binary files a/gui-apps/Manifest.gz and b/gui-apps/Manifest.gz differ
diff --git a/gui-apps/gtkgreet/Manifest b/gui-apps/gtkgreet/Manifest
index 1780676a02a9..59953646e2c6 100644
--- a/gui-apps/gtkgreet/Manifest
+++ b/gui-apps/gtkgreet/Manifest
@@ -1,5 +1,7 @@
AUX gtkgreet-0.6-r1-werror.patch 217 BLAKE2B 61d048236065e73ba755fc878f9b9dfe8584ae5a5f9afb2494b4d2446d52e4dacaa2df8605e3611ed434898340f29dddbb4a80fb436be0b93326099c0fa063d7 SHA512 ee89a03b7eb8d2db9e52b38c52f90131a239159bfe4503f2f1a14629beaefe35868346a977f11a6461267ab1424022ea352891d77e9889beac664b8b9eb3e930
DIST gtkgreet-0.6.tar.gz 25973 BLAKE2B f05926f9c05b8e164a8f8ca9b4f7091ab42d5d5db08133941ac97c2b6ab0452bf1a75b55dbbcf96579783688501be2148d4728528b63a609a9677587cd59be08 SHA512 00bdd61ea45592c432ba07c62301be7fd89aa3e09dbdaeb0dddd03b4e55e8092b68999ed4d6f2917b66cced57bf55ad68ac61912894683c9dc05b8b5f983ba76
+DIST gtkgreet-0.7.tar.gz 26414 BLAKE2B a066cf35928179adc03e2ec7061cd9fef457a96bab9f012566ef4d23ea27236fe38b08686b28c6ba68dff54ee4741193807573fdc4a71a974e6cd9bdb3acc8b2 SHA512 f0d32fe7a701912c5b9318df17a42f35890ec8d6e01677ba38e442bb7f998572995f53b4c1c4e486eaee562a73b10283036d7f438e6ce084840d6944a0b82c53
EBUILD gtkgreet-0.6-r1.ebuild 870 BLAKE2B bb7a73be125138bfae207cf4074feb6aa14d647b668f08e2d86b9c6611f6e15d254433d3f82861215cf89c896f13eb53a40546b14b163d79595e0d3b2e773c76 SHA512 fef6696fba9ab06d3cadf1a58a2f4b6ad8a9c18450ff210c39ac4f62d5d372d56101fb4101fc13bf76bdf7b1978bbcfd8891151fea14ed2dd43b241f6cab1f63
+EBUILD gtkgreet-0.7.ebuild 873 BLAKE2B fd2bd4f4d58b2a06e8969b8cdab566a6845538628fb2b7b304ae8eab97c0b6c79f651ae77c923f5f34f6016aaffe28583e39b61bcd1bcb698e5daa7e09a30b6e SHA512 3bcb955c267ed212630fdd293bf0b9504350166fb2c3680729f4945b317b78f2c975db76cc89aa4046bf608da6f3b8e0159c2f43be2697144e568dac56ac3a38
EBUILD gtkgreet-9999.ebuild 870 BLAKE2B bb7a73be125138bfae207cf4074feb6aa14d647b668f08e2d86b9c6611f6e15d254433d3f82861215cf89c896f13eb53a40546b14b163d79595e0d3b2e773c76 SHA512 fef6696fba9ab06d3cadf1a58a2f4b6ad8a9c18450ff210c39ac4f62d5d372d56101fb4101fc13bf76bdf7b1978bbcfd8891151fea14ed2dd43b241f6cab1f63
MISC metadata.xml 488 BLAKE2B a465943ce6ce18d292c54f35dca128259c56f43b5a443483c25f36d37fdf0e48edf8df32814682d0d614b12c2436fd55d439272797a10aafb86b5595348bbdc6 SHA512 303c2c0c04fadbd480d27eb5937b1eb01038298ac57d8484136f0783aa3fc2d7c2422d4c4a138ddd342b112003c6ea080da0d12ed6927eb868ac8fc135278663
diff --git a/gui-apps/gtkgreet/gtkgreet-0.7.ebuild b/gui-apps/gtkgreet/gtkgreet-0.7.ebuild
new file mode 100644
index 000000000000..f3d4237b47df
--- /dev/null
+++ b/gui-apps/gtkgreet/gtkgreet-0.7.ebuild
@@ -0,0 +1,45 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="gtk based greeter for greetd"
+HOMEPAGE="https://git.sr.ht/~kennylevinsen/gtkgreet"
+
+inherit meson
+
+if [[ ${PV} == 9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://git.sr.ht/~kennylevinsen/gtkgreet"
+else
+ SRC_URI="https://git.sr.ht/~kennylevinsen/gtkgreet/archive/${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~ppc64 ~x86"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="+layershell man"
+
+DEPEND="
+ dev-libs/json-c:=
+ layershell? ( gui-libs/gtk-layer-shell )
+ x11-libs/gtk+:3
+"
+RDEPEND="
+ ${DEPEND}
+ gui-libs/greetd
+"
+BDEPEND="
+ virtual/pkgconfig
+ man? ( app-text/scdoc )
+"
+
+PATCHES=( "${FILESDIR}"/${PN}-0.6-r1-werror.patch )
+
+src_configure() {
+ local emesonargs=(
+ $(meson_feature man man-pages)
+ $(meson_feature layershell)
+ )
+ meson_src_configure
+}
diff --git a/gui-apps/wayland-logout/Manifest b/gui-apps/wayland-logout/Manifest
index ba4c7bb868aa..935645872dbe 100644
--- a/gui-apps/wayland-logout/Manifest
+++ b/gui-apps/wayland-logout/Manifest
@@ -1,4 +1,4 @@
-DIST wayland-logout-1.0.tar.gz 16663 BLAKE2B 7f8932342cd584f9e8c6abcaf83b2a5ff7ff14eda00f6d47a402206cff5786a9f4d5fbd75b8704fd0c39fad9550e47dbd499ac4a9b233f63ee6ed80b544d4556 SHA512 2c31fe11d4e6de53c7e873e7d235c4dcfbcb1425f4d7d2969b623574dd0bea77ee1fd482949b09cd86a1755ed48f2a8b39e4b2db6adedaf6d465144e9ef71652
-EBUILD wayland-logout-1.0.ebuild 605 BLAKE2B 421307556328f95d1bb6aabf1d0a1522a055fd1abb52db07c8aaae429f066816589288520ff946d0d9bfcc47073aad897985ff877d314c04c6e847fa0efe54c3 SHA512 fb8e6fe732098e46666ea5c36a5dd0e1b832a7247d5d428cd9395459683a6bab84ad347a2ff2e8b9c539c10ff3f102ec913464bdbeb711522eee28ac7477e529
-EBUILD wayland-logout-9999.ebuild 605 BLAKE2B 421307556328f95d1bb6aabf1d0a1522a055fd1abb52db07c8aaae429f066816589288520ff946d0d9bfcc47073aad897985ff877d314c04c6e847fa0efe54c3 SHA512 fb8e6fe732098e46666ea5c36a5dd0e1b832a7247d5d428cd9395459683a6bab84ad347a2ff2e8b9c539c10ff3f102ec913464bdbeb711522eee28ac7477e529
+DIST wayland-logout-1.1.tar.gz 17731 BLAKE2B 179fba23ff885746e6664022a1e427e0a29f59e92b29fdf84807729253d5e3f7d2cea31bd2108f2daeb1bf87fdfceb2ce93fdab4dd3e7a914baeff0102880c84 SHA512 3664c865044e81d7fc41b5888ea1a8669804642b05a518e418c222c90867d38ada4c7f6c5193a251f43498dc9e1a70d4bdf79034569b5add12007523aa011e03
+EBUILD wayland-logout-1.1.ebuild 590 BLAKE2B 9981f9efe7aead784692b58f0d2d7cee6f2f755f1cda72f2f376ae55765101f3b3c843a3aef2db10cd1e306a70acad9b2ae2ac7788c23768e0f46414563797ae SHA512 c5d0fd906db6b5464bb5d989377c57ff0977d8a2c85f86823f8e7e91a6f01d57c2a9e6951fb506ffd5973c08bfa2f7569382dd273fc85d1356e300f5f77cb83a
+EBUILD wayland-logout-9999.ebuild 590 BLAKE2B 9981f9efe7aead784692b58f0d2d7cee6f2f755f1cda72f2f376ae55765101f3b3c843a3aef2db10cd1e306a70acad9b2ae2ac7788c23768e0f46414563797ae SHA512 c5d0fd906db6b5464bb5d989377c57ff0977d8a2c85f86823f8e7e91a6f01d57c2a9e6951fb506ffd5973c08bfa2f7569382dd273fc85d1356e300f5f77cb83a
MISC metadata.xml 359 BLAKE2B 6a34261ec10702f5bec40975ab7723eee34e015afa5a4544146834c43a9a3b040d9ead5d5a617da0b8253e9e9a7e05fe9efae38588b02b8fa16f653d9bfc5340 SHA512 43bdd93da8962e2ca6d852356e206511754f1e5f0bda721ac6458c54abab89367fc137f686583dd9df6d83be82bad66f9858efc52ed1e5a002d6b3bacd8fdbb4
diff --git a/gui-apps/wayland-logout/wayland-logout-1.0.ebuild b/gui-apps/wayland-logout/wayland-logout-1.1.ebuild
similarity index 88%
rename from gui-apps/wayland-logout/wayland-logout-1.0.ebuild
rename to gui-apps/wayland-logout/wayland-logout-1.1.ebuild
index edb385b32abf..19849dc6704e 100644
--- a/gui-apps/wayland-logout/wayland-logout-1.0.ebuild
+++ b/gui-apps/wayland-logout/wayland-logout-1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -22,5 +22,5 @@ RDEPEND="sys-process/lsof"
src_install() {
newbin wayland-logout.sh wayland-logout
- dosym wayland-logout /usr/bin/wlogout
+ doman wayland-logout.1
}
diff --git a/gui-apps/wayland-logout/wayland-logout-9999.ebuild b/gui-apps/wayland-logout/wayland-logout-9999.ebuild
index edb385b32abf..19849dc6704e 100644
--- a/gui-apps/wayland-logout/wayland-logout-9999.ebuild
+++ b/gui-apps/wayland-logout/wayland-logout-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -22,5 +22,5 @@ RDEPEND="sys-process/lsof"
src_install() {
newbin wayland-logout.sh wayland-logout
- dosym wayland-logout /usr/bin/wlogout
+ doman wayland-logout.1
}
diff --git a/gui-libs/Manifest.gz b/gui-libs/Manifest.gz
index ebcccd29c3db..512883f268c7 100644
Binary files a/gui-libs/Manifest.gz and b/gui-libs/Manifest.gz differ
diff --git a/gui-libs/greetd/Manifest b/gui-libs/greetd/Manifest
index 36f79805da3c..a0e846bac54b 100644
--- a/gui-libs/greetd/Manifest
+++ b/gui-libs/greetd/Manifest
@@ -11,6 +11,7 @@ DIST fuchsia-zircon-0.3.3.crate 22565 BLAKE2B a4dac3457036efab8f79fe5d5b4545e409
DIST fuchsia-zircon-sys-0.3.3.crate 7191 BLAKE2B 530bb5d475ac828843af248c6bbd24ca3b5dd8118c8884ccc6d7261818cff1c79038077114ffa04bc73a078177527824c4d9d20a9b022e4057afee3330258cff SHA512 978b7e8795a5877a68409ed3a1d7b4246263f8e7e7ce9ba8a022643be98f58f329cc1c234717df80a509db849da4394f39e90a8e2a6f56f8fa8dd3c07e7d4386
DIST getopts-0.2.21.crate 18457 BLAKE2B 10651e947e49acc768d99ae56ca5a7f37c1f61bbd1674e2ca58e3ae563fd64f3563d53ccdd0ae7a878710a39e13a99ac8c274974157db2c691f8c222de14992d SHA512 5515ae6ccb0f03efb783683f46cfd1755342c4e83bb673ff8914c7f9dea0dae333f8d9703865e992659a359067df0e8b0e2253de0d4b0c7707cbe7d73401bb1f
DIST greetd-0.6.1.tar.gz 46027 BLAKE2B 52d469da8aed9580ea1a66020fdcf051241150118dba9397a841e147acd6b70384147087cff329b877e05fd148941ba07b3c6ae7485668205e2f89105fd96ae1 SHA512 e97770cd25624da0027003731afe58c489d66691043fd16f7ffd96b135a78b172ca94bd77e2a713fe93afb8c0b0acb6137859e534b81f48904f27577307c4dcb
+DIST greetd-0.7.0.tar.gz 47764 BLAKE2B 208678998d52e4f644612a82ff4db15df0897d504e9bb3bd5bd01608071f941139783399b16d4b49cef0240dec3bb8f03f330fc01be79640fa9899f337b32b79 SHA512 ab0e35777c64e8825323161c261afd04461a93ffc3f616bf37c232651509bdf3eabb2330d1b04a7e0a39926c2bb55fbd03d7f7e3c7119afc08e4db9e2e803eac
DIST iovec-0.1.4.crate 8720 BLAKE2B aa1b4cd98ebe47901c0959cf1d8eb2586a803d0453e2a8bdd5c63442b32886dbcb37650aa218c748fd45c9fe3a7fdf20569eae5b19716487b139caae1526da4c SHA512 e23fcaac239807daea20ddcf2cdd4fb858ba1aa970ce6248f70f0fba5bff7ebdb27247c0997ac0ff2791178f86ff9657e473d8f64b86c644763e5b3474edd158
DIST itoa-0.4.5.crate 11194 BLAKE2B d8f0e2aaf62152c187e0987ab4b0cf842ac13255262a9ccbf8484d730ea5397572791c023d2363d0562c18c8efd2418680583e99a1f5d14450b3f0184dce69ca SHA512 79ff8774524130a4729d5e708a4a4a837b3e5052384a12c22db4ae3e208dc4391ee185365f685137a8ba55ea7dc3499f8cddddb2fd98b84177ab292c264034d3
DIST kernel32-sys-0.2.2.crate 24537 BLAKE2B dfc4a1e31d3ec9e2ac62b890839919fb7fed1444070c1dcd75bb75acfb53556d6cf2eddf5a6639e7852a3df2a0cc715c5ce1d3fc898ef16a1687020d98f715bc SHA512 682bc7c629aefd035966a2873518fd60719121cca7d63d89d6c97ff5306f24d8b5055a3c91b4eedaec22b1d5dd3fb8b48ff7341a05bbd72d86e06c422dab473b
@@ -54,4 +55,5 @@ DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f955297217
DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
DIST ws2_32-sys-0.2.1.crate 4697 BLAKE2B 52a7a3f57bcd73156730ada4d78fe12a54a498c9064e0928e09de13a95bd9237f884538e5f9368b47a7ac3c425f0f798c26bad85f20bed4ea26c2fa16c779b97 SHA512 18356861fc595efe7d0180afb8ce7649da35a4f9ba456271d2068679ab258a861af32a2e016e241fbfbf5f6ef0eb33127b26eabfc11428af39506538faa4821f
EBUILD greetd-0.6.1.ebuild 2143 BLAKE2B eb2d32cc98f58772f3558a0e7b83b2356cd3ba169fb5a0d8acbfb2129b47f661c50b4563d1df6098983216b00ddb0467757c12902776a39534e20c2ada7f2392 SHA512 0785013fed45095c38c4a5d7e04c95f638d1430309ae0aec4b99805671e785f21de6b360dc405c3228b72405aff0a10aca34757ac6be5fa2c48800de7236b356
+EBUILD greetd-0.7.0.ebuild 2177 BLAKE2B 014e23275dbfb097b5dc45d23d54c4857c4ed958be9c674d1d877d2146e6769335f63df5249cf4da81f783f975eeb6ce140ab8c538488700c3506a12849d25b0 SHA512 0acb65255598442a4efe5500fefa9b081a7f41f7b0655c3e34252edf273b5d38223b0cc37850f62a21a361358699524e66c65d6cd6828689dce4ba9db46557f7
MISC metadata.xml 623 BLAKE2B 8f5f3b8223fe93c5ac24ff1fd2691dbdc1a7ba32c400c9bda2960ce13778d7ad0c2b7115538affb64dbe097a8460e9d21ce5d25bfeb05e1efda2a028a8457274 SHA512 8f0a49687beba90feb1c262dc16ca18105f3d299befb88a589e706614dc7fc709cd1797cd9656c579a756fd28241d292366913b9eb60d1e8d780f456227ccea7
diff --git a/gui-libs/greetd/greetd-0.7.0.ebuild b/gui-libs/greetd/greetd-0.7.0.ebuild
new file mode 100644
index 000000000000..a935278f99a4
--- /dev/null
+++ b/gui-libs/greetd/greetd-0.7.0.ebuild
@@ -0,0 +1,116 @@
+# Copyright 2017-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CRATES="
+arc-swap-0.4.6
+async-trait-0.1.31
+bitflags-1.2.1
+bytes-0.5.4
+cc-1.0.53
+cfg-if-0.1.10
+enquote-1.0.3
+fnv-1.0.7
+fuchsia-zircon-0.3.3
+fuchsia-zircon-sys-0.3.3
+getopts-0.2.21
+iovec-0.1.4
+itoa-0.4.5
+kernel32-sys-0.2.2
+lazy_static-1.4.0
+libc-0.2.70
+log-0.4.8
+memchr-2.3.3
+mio-0.6.22
+mio-named-pipes-0.1.6
+mio-uds-0.6.8
+miow-0.2.1
+miow-0.3.3
+net2-0.2.34
+nix-0.17.0
+pam-sys-0.5.6
+pin-project-lite-0.1.5
+proc-macro2-1.0.12
+quote-1.0.5
+redox_syscall-0.1.56
+rpassword-4.0.5
+ryu-1.0.4
+serde-1.0.110
+serde_derive-1.0.110
+serde_json-1.0.53
+signal-hook-registry-1.2.0
+slab-0.4.2
+socket2-0.3.12
+syn-1.0.21
+thiserror-1.0.17
+thiserror-impl-1.0.17
+tokio-0.2.11
+tokio-macros-0.2.4
+unicode-width-0.1.7
+unicode-xid-0.2.0
+users-0.9.1
+void-1.0.2
+winapi-0.2.8
+winapi-0.3.8
+winapi-build-0.1.1
+winapi-i686-pc-windows-gnu-0.4.0
+winapi-x86_64-pc-windows-gnu-0.4.0
+ws2_32-sys-0.2.1
+"
+
+inherit cargo optfeature systemd
+
+DESCRIPTION="ipc based login daemon"
+
+HOMEPAGE="https://git.sr.ht/~kennylevinsen/greetd/"
+SRC_URI="https://git.sr.ht/~kennylevinsen/greetd/archive/${PV}.tar.gz -> ${P}.tar.gz
+ $(cargo_crate_uris ${CRATES})
+"
+
+LICENSE="Apache-2.0 BSD Boost-1.0 GPL-3 MIT Unlicense"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE="man"
+
+DEPEND="
+ acct-user/greetd
+ sys-auth/pambase
+ sys-libs/pam
+"
+RDEPEND="${DEPEND}"
+BDEPEND="man? ( app-text/scdoc )"
+
+QA_FLAGS_IGNORED="usr/bin/.*greet.*"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-0.6.1-correct_user_config_toml.patch"
+)
+
+src_compile() {
+ cargo_src_compile
+ if use man; then
+ scdoc < ./man/agreety-1.scd > ./agreety.1 || die
+ scdoc < ./man/greetd-1.scd > ./greetd.1 || die
+ scdoc < ./man/greetd-5.scd > ./greetd.5 || die
+ scdoc < ./man/greetd-ipc-7.scd > ./greetd-ipc.7 || die
+ fi
+}
+
+src_install() {
+ dobin target/release/{agreety,fakegreet,greetd}
+
+ insinto /etc/greetd
+ doins config.toml
+
+ systemd_dounit greetd.service
+
+ if use man; then
+ doman agreety.1 greetd.1 greetd.5 greetd-ipc.7
+ fi
+}
+
+pkg_postint() {
+ optfeature "eye-candy gtk based greeter" gui-apps/gtkgreet
+ optfeature "simplistic but sleek terminal greeter" gui-apps/tuigreet
+}
diff --git a/mail-client/Manifest.gz b/mail-client/Manifest.gz
index 0fda6dbedc83..80473f2a1720 100644
Binary files a/mail-client/Manifest.gz and b/mail-client/Manifest.gz differ
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index 21c0d15ccd29..e499d5ec6014 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -1,12 +1,9 @@
AUX Muttrc 667 BLAKE2B 49aaefba7ceeefde9d727ad88574fc599a48bcd334ac8e99d8d5e555f2317f4595c480f1903df4b82854bfd272b8aee86a02369769f38a3cadf35f6a6348bf14 SHA512 b64d6e857f0c7de2e2e5b23cecd869f8a9807aa827ad6221e3c5864b2a31fb0136aeaf09ffdb2549645507fe92f724774a80395b6ab2345068903f5ee1269f29
AUX Muttrc.mbox 486 BLAKE2B dd7f15b08f185800b2a7d26545e5a1b0f7b21f8f7cff2b4fce39fb58d8e336bec6fd500b88c0b14d026c9578d12cd1e4bca45c0d2f3d286d2c9d132b2b5e137e SHA512 aece9a734d292b6f638d2a0dd39f20d9894b4bb6e6888da606a49274faef9c1864e98eec907ffa7742af58d46456e46b8945d2d47c8b89fc95daa2a8833d3e90
DIST mutt-2.0.2.tar.gz 5293613 BLAKE2B 215a4d54e6dd202ebced91d0536a7f70e774b3c41c129ef87a55ea75a298e485b72145e5dd3c654d9b28138800c4b3e87a3815ab789d952b6b58cfc068fd397b SHA512 5dea02edf60b33e4873806481aa4256f91d90b05de99a9eccc620c459bd924197b656f85eb5a31757a61675389e6c4d76571128a757cfda255240934e82eec29
-DIST mutt-2.0.3.tar.gz 5292808 BLAKE2B 323a63b1b4ece774674b6f207ae51ffb58e57fd90fa2a44d8a69bb5311bf66318f8d6e8ca20b333bb7e3bea1ef995ab84f1f6cd8486ee91fbfdb90e2d64444b9 SHA512 6511f6690137f2cd8798a6c76a6f1a6305b2ddaad9bf339ec7144f6c249fe9cbcfb5bfbbdd308fcc6829b7fa12132b14d555dd3a9ef9e9b46c9748e2f31be852
DIST mutt-2.0.4.tar.gz 5293913 BLAKE2B 9c5d2d17fae9653868cca08eb7d92f9c6e122702590ba88a2ba04ee8606cfba5bca99716045b59cf40a21e95a0e32f3b21a34ee34440f155a3e2788720c3d57c SHA512 8080107810d2ff572b1532bb441573e4dcfbfbc03f28be711dcdebd1e6a1c8b5adf5c5a4f386ce0a661ff7050722b41e122c58964feae665ff4138013af18762
DIST mutt-gentoo-2.0.2-patches-r0.tar.xz 26380 BLAKE2B 3ce2dbe07f9340adbaeb0489fe88564b6cc44ef330d298915d42617357799a26f277cc0dcab2b78a5620f20a2533f2fe43287bab76eeb9529013e9f9c7659ffb SHA512 79fb00ccf6084da805c75eedbdb1631b12e616318e91a4c246d0194a478b803e3dc5d2815f757fecc91316c010058c2d0e9ecaf3fe40d5664ac25af63a0d7e13
-DIST mutt-gentoo-2.0.3-patches-r0.tar.xz 26396 BLAKE2B 1ee41baedb2ade72437ec4ffbd617e7e8a07c432ae2c025001df7fc19b2e6181e54f25dd16f02027f03f0f9df0032b35088354ae8c2c238a57fea2c3407dee4e SHA512 290416aa72d6938c9f52f60702ae1a9306704a3c63ca35c8fb35902c8e2307da42b478718521ebe0d6b857089b778bc172cd9cf5f061fab56fe5dea47c01f792
-DIST mutt-gentoo-2.0.4-patches-r0.tar.xz 26448 BLAKE2B 7f2e2730e18def7281cf59bc783ebc4047e459ebb8796810507ff11f5e99b78c2d6914be154251f1a279b4963156825931e22cd727e86eb40c15637736be457e SHA512 16025a790fba20ba1e693b1b826bf86bd2697d0d3ab5ceaf08b1692902235ef40866daec80862c7082a82a58fa4f9631889688f1d06b864cb29c613725fe5024
+DIST mutt-gentoo-2.0.4-patches-r1.tar.xz 26908 BLAKE2B b2ca74496328cd9bcc0eb843e48b99a6a066be6530228534d2d0a60223984e03dde2718116d8314f9cec0f22db0c4fa52521ed4fb95f7e153cfc7fb9f37f84a8 SHA512 7bb6617d900d1058e1d6b9fefd1d557efc669386501c281976c93c2a4c0d1a1a1de459dd39c46a257bd3f9bd64155e1c92add1421d40ed4e061f2fc26d17600a
EBUILD mutt-2.0.2.ebuild 8030 BLAKE2B c4c0be2976d82764751382bb3ee8f752eb0a4e7dc1a8a08c7628baff56c35609f6cc38c0fc680856c4fd8b08c36dd0c349c5f8259f399911f981d3354e8f9570 SHA512 943d41ce9e79a04a8e01cffd3e09c0ec22302f580c5a33e2a3568597e8973f1bb7ec967d598729221ddb570bb45d3b17aeb4732a416892edc1adc0d7a681b034
-EBUILD mutt-2.0.3.ebuild 8036 BLAKE2B 384d6e067fe5a25665e73774e77e672ed95a76979387fadd48162ccb93b4ecb3ef8fd70bdb3da2d032d29b9637bc53d6e76cc0db897e36a4d3d7b85b0d2744b1 SHA512 8ea51487a1de28822309c919fe327393d7b89f6f86174ff68f17d30838576709ca749b8e9482fe0a03200293b333481988ac427bf190bf2d18b8ebba5a9d22ee
-EBUILD mutt-2.0.4.ebuild 8036 BLAKE2B 384d6e067fe5a25665e73774e77e672ed95a76979387fadd48162ccb93b4ecb3ef8fd70bdb3da2d032d29b9637bc53d6e76cc0db897e36a4d3d7b85b0d2744b1 SHA512 8ea51487a1de28822309c919fe327393d7b89f6f86174ff68f17d30838576709ca749b8e9482fe0a03200293b333481988ac427bf190bf2d18b8ebba5a9d22ee
+EBUILD mutt-2.0.4-r1.ebuild 8036 BLAKE2B 49a6ade204d7ea7b43be989c75635eac33c16f5f97ef5e8bb0858258a13d43affcb8938db6040ac47ea2e19c02091cf91244be4b1c05e1da72bbea111eef1cb3 SHA512 69a929fdcbc851265e5f886680e6c79a4e7a389acb99e128c798714747326d0b3321789eaf7fff07e9b1c79bd072dba16f1f06953edebf81e0259c9a21a27251
MISC metadata.xml 1297 BLAKE2B 67419e66fa917ae69f015d9af534edeb809c4371b2c004c6687a942f331c70ad0513fedb8b6f45a2cb7fc5bfd9ca80c91f888e58293dee00c198d2bca7b8cb12 SHA512 9d9c30b14ce952f8099fb60eac3e8dc25e1c5ef05b88b71c1207950766cb367b56cf7c60168c6f3e431e1aa823c0a345ce851414705e9f0af015cfa51e241350
diff --git a/mail-client/mutt/mutt-2.0.3.ebuild b/mail-client/mutt/mutt-2.0.4-r1.ebuild
similarity index 99%
rename from mail-client/mutt/mutt-2.0.3.ebuild
rename to mail-client/mutt/mutt-2.0.4-r1.ebuild
index c9a2e340a3c6..5131f8871a13 100644
--- a/mail-client/mutt/mutt-2.0.3.ebuild
+++ b/mail-client/mutt/mutt-2.0.4-r1.ebuild
@@ -5,7 +5,7 @@ EAPI="6"
inherit eutils flag-o-matic autotools
-PATCHREV="r0"
+PATCHREV="r1"
PATCHSET="gentoo-${PVR}/${PATCHREV}"
DESCRIPTION="A small but very powerful text-based mail client"
diff --git a/mail-client/mutt/mutt-2.0.4.ebuild b/mail-client/mutt/mutt-2.0.4.ebuild
deleted file mode 100644
index c9a2e340a3c6..000000000000
--- a/mail-client/mutt/mutt-2.0.4.ebuild
+++ /dev/null
@@ -1,265 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit eutils flag-o-matic autotools
-
-PATCHREV="r0"
-PATCHSET="gentoo-${PVR}/${PATCHREV}"
-
-DESCRIPTION="A small but very powerful text-based mail client"
-HOMEPAGE="http://www.mutt.org/"
-MUTT_G_PATCHES="mutt-gentoo-${PV}-patches-${PATCHREV}.tar.xz"
-SRC_URI="ftp://ftp.mutt.org/pub/mutt/${P}.tar.gz
- https://bitbucket.org/${PN}/${PN}/downloads/${P}.tar.gz
- https://dev.gentoo.org/~grobian/distfiles/${MUTT_G_PATCHES}"
-IUSE="autocrypt berkdb debug doc gdbm gnutls gpgme +hcache idn +imap kerberos libressl +lmdb mbox nls pgp-classic pop qdbm +sasl selinux slang smime-classic +smtp +ssl tokyocabinet vanilla prefix"
-# hcache: allow multiple, bug #607360
-REQUIRED_USE="
- hcache? ( || ( berkdb gdbm lmdb qdbm tokyocabinet ) )
- imap? ( ssl )
- pop? ( ssl )
- smime-classic? ( ssl !gnutls )
- smtp? ( ssl sasl )
- sasl? ( || ( imap pop smtp ) )
- kerberos? ( || ( imap pop smtp ) )
- autocrypt? ( gpgme )"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-# yes, we overdepend on the backend impls here, hopefully one day we can
-# have REQUIRED_USE do what it is made for again. bug #607360
-CDEPEND="
- app-misc/mime-types
- virtual/libiconv
-
- berkdb? ( >=sys-libs/db-4:= )
- gdbm? ( sys-libs/gdbm )
- lmdb? ( dev-db/lmdb:= )
- qdbm? ( dev-db/qdbm )
- tokyocabinet? ( dev-db/tokyocabinet )
-
- ssl? (
- gnutls? ( >=net-libs/gnutls-1.0.17:= )
- !gnutls? (
- libressl? ( dev-libs/libressl:= )
- !libressl? ( >=dev-libs/openssl-0.9.6:0= )
- )
- )
-
- nls? ( virtual/libintl )
- sasl? ( >=dev-libs/cyrus-sasl-2 )
- kerberos? ( virtual/krb5 )
- idn? ( net-dns/libidn2 )
- gpgme? ( >=app-crypt/gpgme-0.9.0:= )
- autocrypt? ( >=dev-db/sqlite-3 )
- slang? ( sys-libs/slang )
- !slang? ( >=sys-libs/ncurses-5.2:0= )
-"
-DEPEND="${CDEPEND}
- net-mail/mailbase
- doc? (
- dev-libs/libxml2
- dev-libs/libxslt
- app-text/docbook-xsl-stylesheets
- || ( www-client/lynx www-client/w3m www-client/elinks )
- )"
-RDEPEND="${CDEPEND}
- selinux? ( sec-policy/selinux-mutt )
- smime-classic? ( || ( dev-libs/libressl >=dev-libs/openssl-0.9.6:0 ) )
- pgp-classic? ( app-crypt/gnupg )
-"
-
-src_prepare() {
- local PATCHDIR="${WORKDIR}"/mutt-gentoo-${PV}-patches-${PATCHREV}
-
- if use !vanilla ; then
- # apply patches
- export EPATCH_FORCE="yes"
- export EPATCH_SUFFIX="patch"
- # http://hg.code.sf.net/p/gentoomuttpatches/code/file/mutt-1.10
- local patches=(
- patches-mutt
- bugs-gentoo
- features-common
- features-extra
- gentoo
- )
- local patchset
- for patchset in "${patches[@]}" ; do
- [[ -d "${PATCHDIR}/${patchset}" ]] || continue
- einfo "Patches for ${PATCHSET} patchset ${patchset}"
- EPATCH_SOURCE="${PATCHDIR}"/${patchset} epatch \
- || die "patchset ${patchset} failed"
- done
- # add some explanation as to why not to go upstream
- sed -i \
- -e '/ReachingUs = N_(/aThis release of Mutt is heavily enriched with patches.\\nFor this reason, any bugs are better reported at https://bugs.gentoo.org/\\nor re-emerge with USE=vanilla and try to reproduce your problem.\\n\\' \
- main.c || die "Failed to add bug instructions"
- fi
-
- local upatches=
- # allow user patches
- eapply_user && upatches=" with user patches"
-
- # patch version string for bug reports
- local patchset=
- use vanilla || patchset=", ${PATCHSET}"
- sed -i -e 's|"Mutt %s (%s)"|"Mutt %s (%s'"${patchset}${upatches}"')"|' \
- muttlib.c || die "failed patching in Gentoo version"
-
- # many patches touch the buildsystem, we always need this
- AT_M4DIR="m4" eautoreconf
-
- # the configure script contains some "cleverness" whether or not to setgid
- # the dotlock program, resulting in bugs like #278332
- sed -i -e 's/@DOTLOCK_GROUP@//' Makefile.in || die "sed failed"
-}
-
-src_configure() {
- local myconf=(
- # signing and encryption
- $(use_enable autocrypt) $(use_with autocrypt sqlite3)
- $(use_enable pgp-classic pgp)
- $(use_enable smime-classic smime)
- $(use_enable gpgme)
-
- # features
- $(use_enable debug)
- $(use_enable doc)
- $(use_enable nls)
-
- # protocols
- $(use_enable imap)
- $(use_enable pop)
- $(use_enable smtp)
-
- $(use ssl && use gnutls && echo --with-gnutls --without-ssl)
- $(use ssl && use !gnutls && echo --without-gnutls --with-ssl )
- $(use !ssl && echo --without-gnutls --without-ssl)
-
- $(use_with sasl)
- $(use_with idn idn2) --without-idn # avoid automagic libidn dep
- $(use_with kerberos gss)
- "$(use slang && echo --with-slang="${EPREFIX}"/usr || echo a=b)"
- "$(use_with !slang curses "${EPREFIX}"/usr)"
-
- "--enable-compressed"
- "--enable-external-dotlock"
- "--enable-iconv"
- "--enable-nfs-fix"
- "--enable-sidebar"
- "--sysconfdir=${EPREFIX}/etc/${PN}"
- "--with-docdir=${EPREFIX}/usr/share/doc/${PN}-${PVR}"
- "--without-bundled-regex" # use the implementation from libc
- "--with-exec-shell=${EPREFIX}/bin/sh"
- )
-
- if [[ ${CHOST} == *-solaris2.* && ${CHOST#*-solaris2.} -le 10 ]] ; then
- # arrows in index view do not show when using wchar_t
- # or misalign due to wrong computations
- myconf+=( "--without-wc-funcs" )
- fi
-
- # note: REQUIRED_USE should have selected only one of these, but for
- # bug #607360 we're forced to allow multiple. For that reason, this
- # list is ordered to preference, and only the first is taken.
- local hcaches=(
- "lmdb"
- "qdbm"
- "tokyocabinet"
- "gdbm"
- "berkdb:bdb"
- )
- local ucache hcache lcache
- for hcache in "${hcaches[@]}" ; do
- if use ${hcache%%:*} ; then
- ucache=${hcache}
- break
- fi
- done
- if [[ -n ${ucache} ]] ; then
- myconf+=( "--enable-hcache" )
- else
- myconf+=( "--disable-hcache" )
- fi
- for hcache in "${hcaches[@]}" ; do
- [[ ${hcache} == ${ucache} ]] \
- && myconf+=( "--with-${hcache#*:}" ) \
- || myconf+=( "--without-${hcache#*:}" )
- done
-
- if use mbox; then
- myconf+=( "--with-mailpath=${EPREFIX}/var/spool/mail" )
- else
- myconf+=( "--with-homespool=Maildir" )
- fi
-
- econf "${myconf[@]}"
-}
-
-src_install() {
- emake DESTDIR="${D}" install
- insinto /etc/${PN}
- if use mbox; then
- newins "${FILESDIR}"/Muttrc.mbox Muttrc
- else
- doins "${FILESDIR}"/Muttrc
- fi
-
- # include attachment settings, it's mandatory and shouldn't harm
- # when not being referenced (index_format using %X)
- {
- echo
- echo "# mandatory attachments settings, not setting these is a BUG!"
- echo "# see https://marc.info/?l=mutt-dev&m=158347284923517&w=2"
- grep '^attachments' "${ED}"/etc/${PN}/Muttrc.dist
- } >> "${ED}"/etc/${PN}/Muttrc
-
- # add setting to actually enable gpgme usage
- if use gpgme || use autocrypt ; then
- {
- echo
- echo "# this setting enables the gpgme backend (via USE=gpgme)"
- # https is broken due to a certificate mismatch :(
- echo "# see http://www.mutt.org/doc/manual/#crypt-use-gpgme"
- echo "set crypt_use_gpgme = yes"
- } >> "${ED}"/etc/${PN}/Muttrc
- fi
-
- # similar for autocrypt
- if use autocrypt ; then
- {
- echo
- echo "# enables autocrypt (via USE=autocrypt)"
- echo "# see http://www.mutt.org/doc/manual/#autocryptdoc"
- echo "set autocrypt = yes"
- } >> "${ED}"/etc/${PN}/Muttrc
- fi
-
- # A newer file is provided by app-misc/mime-types. So we link it.
- rm "${ED}"/etc/${PN}/mime.types
- dosym ../mime.types /etc/${PN}/mime.types
-
- # nuke manpages that should be provided by an MTA, bug #177605
- rm "${ED}"/usr/share/man/man5/{mbox,mmdf}.5 \
- || ewarn "failed to remove files, please file a bug"
-
- if use !prefix ; then
- fowners root:mail /usr/bin/mutt_dotlock
- fperms g+s /usr/bin/mutt_dotlock
- fi
-
- dodoc COPYRIGHT ChangeLog NEWS OPS* PATCHES README* TODO VERSION
-}
-
-pkg_postinst() {
- if [[ -z ${REPLACING_VERSIONS} ]] ; then
- echo
- elog "If you are new to mutt you may want to take a look at"
- elog "the Gentoo QuickStart Guide to Mutt E-Mail:"
- elog " https://wiki.gentoo.org/wiki/Mutt"
- echo
- fi
-}
diff --git a/mail-filter/Manifest.gz b/mail-filter/Manifest.gz
index a0fe9b71d330..2870396571d2 100644
Binary files a/mail-filter/Manifest.gz and b/mail-filter/Manifest.gz differ
diff --git a/mail-filter/dcc/Manifest b/mail-filter/dcc/Manifest
index 45735645cacb..56d1b8d50566 100644
--- a/mail-filter/dcc/Manifest
+++ b/mail-filter/dcc/Manifest
@@ -3,6 +3,6 @@ AUX dcc-1.3.158-fno-common.patch 543 BLAKE2B 004e1f4bd63b2bda4b7eec0bf45f9115c4c
AUX dcc.confd 274 BLAKE2B 757f3e751028b0c35c166f708c328b506721549267bf1e87e841b746f5d35a6bcbeab6dcebe5deb1c4207b8b11dc0db34925cb93410b556508105cc4c64b6132 SHA512 15b7e4ded3e56e9d15509305df244e29ec7a6c3c163c49a4597e16274317d88f5aff5522984a2a3002f838d0220d04c2ea3def8d771712a11685408a4983d3b4
AUX dcc.initd-1.3.154 2793 BLAKE2B 6ad77dfe2a80070c969ed71b0517fdbc0ad0bf2bcc96207fa80a7331d15ba77ac8b5e369c2bec5e164819da876e2ba022f31db3a455d72a6e52387a014d8de38 SHA512 e171e4333d735aa7da99ae322ce04954554a6738b943ca085e51707dd0bf231f7c170211f019027ddf01ec750ed1b8728b5d54b48dee6ee7fc37f8a810aded01
DIST dcc-1.3.158.tar.Z 1714175 BLAKE2B 19e11e9e78268e76bf97f16ad6f03f0bb114ec9fbc9b1f8bb6ca7ce72fa419b1e50a6d35ee32ed5352b13da96002d313c00a07395317d33082eb69c9ae60008e SHA512 24fba5ea713e8df1468644508c323d64b3868685716b7cc02263933476940a807cfc4593432a9195371308c83d4ea93653e89634681d95dcb32f5d65c7274599
-EBUILD dcc-1.3.158-r1.ebuild 3756 BLAKE2B 55bdfcb558c1a254f1e0767bd821888301ca7c7ded78d81f9bb9af02dc83e380d4d9054698db3d7138db62f1291e920b8b21981bebd7533e07357641c282b249 SHA512 f516e055d7677321dc0e499183b7361f0088dc7b7f1e48f968561dee8b0b74761267d0fa64aa4e5472b142f945761451e763b0e7f9416307b8132cddc865f5f9
+EBUILD dcc-1.3.158-r1.ebuild 3754 BLAKE2B 0951f76182cba504d37754f69065d774e77fc2aed589c64b00904cfa198e0a365294e383c3f1799b6a4ae9c7b6f360d9673c661ddefc2872056adbcb1f4a1389 SHA512 f3ebcba6ce04e5ddb0b108a2570dc0bb38e7fd2baf430f2148d27b39c5d2ca81d9beed5f78b19bf0d0cdefc0d31667863d291f2ea584a0a009efc0704d2f81ff
EBUILD dcc-1.3.158.ebuild 4339 BLAKE2B 05000ce48213142636f937d8b50fb3a281caaf0c45f7528f2cadaffcd37db5dcd8234cb92c1775b29cb5e4f7819dd55c26e9fceee056cd4ce0a234a0766cef53 SHA512 aec98afa8b82c7ca0885570f2b7d5b079ff0002c24d8a3c934288c3e84e4416bfc9f7241b11297d650ff9ad5c08f50c0cef0211ca91b58ad8c6f07e94be077cb
MISC metadata.xml 316 BLAKE2B 24478ea14c1a25332766f54d5d385ef2e5755880258c2307eb62f649e3ab06c299c4ef0534b44b9f97462313227da016ef89b55ddac493a0b6a9014d098d0b85 SHA512 deaa7ad3b9919c65113f97639885bf7da2281a21dff15a0cfa11315daae55550c95ff411c8448bfe03c6b94b4cc4b7a3475bd6f9cf6315d6aa75abb99f536952
diff --git a/mail-filter/dcc/dcc-1.3.158-r1.ebuild b/mail-filter/dcc/dcc-1.3.158-r1.ebuild
index 4f94c517ed2f..41858fed80fa 100644
--- a/mail-filter/dcc/dcc-1.3.158-r1.ebuild
+++ b/mail-filter/dcc/dcc-1.3.158-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.rhyolite.com/dcc/source/old/${P}.tar.Z"
LICENSE="DCC GPL-2"
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="cgi ipv6 rrdtool milter"
RDEPEND="
diff --git a/mail-filter/dovecot_deleted_to_trash/Manifest b/mail-filter/dovecot_deleted_to_trash/Manifest
deleted file mode 100644
index 978d293dba2b..000000000000
--- a/mail-filter/dovecot_deleted_to_trash/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX 29-delete-to-trash.conf 289 BLAKE2B 7ff2f4291f86634c9c0cb054331431776ba2034d32056d6c2503459232649240123d627fce5d049ca26e26a8c56e10c92f187ef65d9c45a379e57af6337cbd65 SHA512 3b1c7156128bddc99ec96576e9b97d0159fbb2034fd755bd9a60c1c2524d1727ce8a17a4967039f7c4bb267eb5bfbf65ceef4b3d4dcf3fef0a34178740ac9119
-DIST dovecot_deleted_to_trash-0.6.tar.gz 4805 BLAKE2B a7712693a3550f6d0b7d96050b7fc124c6113b6060077e3441191422afc7c3dcd0d8df94779c1e2606881e930a694ecbe97b49f2c45e250d3781ff0a549cf2c6 SHA512 41da1b622f30ee137ac8c06a687466a36c21035fd54b83393543c944b4e7cb4f3576556f220734d934033e6804d371eb5a1ec4f1d2491f3bf808782a59e2cb12
-EBUILD dovecot_deleted_to_trash-0.6.ebuild 829 BLAKE2B 76662cd3fc76822ae4305fc95613c94a93936f05d014592ad1c06869a327ece95ace69c41f0f4e021cdf21d3a65e59764538c0e80ca1013fb6773b8f19867ea5 SHA512 9e693e9f8c04c9667a80e31b6b9cfd65055fd6b0f8deae183201ac3617f4b806bab1478bf1cbbb8cf84f23a74a1b2aaa4be7537d4f4469b7ede48e4f7f49a3be
-MISC metadata.xml 267 BLAKE2B b51f122dfaa6c2d1719a4b6e6da9e4877fa7e9f07e85eda84ea27095a378b6ad029643cc99aaad501a55678344417d8e7b3b62293acee4e9cf1a705dabaca334 SHA512 97b29ea5eaeb8d3e8dc6990075312ac70224be66427e312f06b97368bd1e936c07a2a5fdc16a99b2058f9be6e9e4a1089bd1e21a4066cbe728f5beea89b6f080
diff --git a/mail-filter/dovecot_deleted_to_trash/dovecot_deleted_to_trash-0.6.ebuild b/mail-filter/dovecot_deleted_to_trash/dovecot_deleted_to_trash-0.6.ebuild
deleted file mode 100644
index 28c0b53c9642..000000000000
--- a/mail-filter/dovecot_deleted_to_trash/dovecot_deleted_to_trash-0.6.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils multilib toolchain-funcs
-
-DESCRIPTION="Deleted to trash IMAP plugin for Dovecot"
-HOMEPAGE="https://github.com/lexbrugman/dovecot_deleted_to_trash"
-SRC_URI="https://github.com/lexbrugman/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="ZLIB"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-
-RDEPEND="=net-mail/dovecot-2.2*
- !!
-
-
-
-
- lexbrugman/dovecot_deleted_to_trash
-
-
diff --git a/mail-mta/Manifest.gz b/mail-mta/Manifest.gz
index b7c599c8c7e7..110c7bc935f7 100644
Binary files a/mail-mta/Manifest.gz and b/mail-mta/Manifest.gz differ
diff --git a/mail-mta/postfix/Manifest b/mail-mta/postfix/Manifest
index 7e4883b9662f..da762f5ffa62 100644
--- a/mail-mta/postfix/Manifest
+++ b/mail-mta/postfix/Manifest
@@ -5,7 +5,9 @@ AUX postfix.service 662 BLAKE2B dcf9ceb71ad483b580d126fcb5ac68889cdeb898df3333d3
AUX smtp.pass 29 BLAKE2B 589915bd2856fa64e22caa12fca54ef342eb07606de38d3879c13ac395413c84de6c3b733c83cc0625a4433167efcc7d504b2f87fa26c05b2facde9c3d103021 SHA512 a8a940099a77ea0547004daf5392a6efc0cd643f10072803d65e37763012464ad25b1b925ae9e32bffb3c3e8a5d4b2d3bb5619a174d58fdc4ea5d4090db0d365
AUX smtp.sasl 42 BLAKE2B 67e9108101779b6027fa1e5cc7c9256a606d440e15bb037a0da186e6b4983ab26e88ede2f0604737c78144c03e182f66005062f1d49e10443d1ddb9757461d1f SHA512 a48e2bd173c4443dd2c389f6973a541dbcba4223b52b42b409a68d934a7fc82a98d4027267befcd5db6ec628cce6a9dffdf044e6fbd774b6e748f07f4106db47
DIST postfix-3.5.8.tar.gz 4614733 BLAKE2B 13166e854f70987f981bb5e7e5dabfaa73b3170ab16fc1ff8f70f6b98a0697ac980bdf74bbfb39fdfd1972f922a31a28882b1575b79fd8f01d81e08e68d756bc SHA512 0abb07d99e343b76e6a26b4a090af9d592f4dfd03c8c737cc72bfb0f4267dafcbb0cb0aa7b6255f8b834c9289d89a5c47b167be3758239309937cb77e0d9464b
+DIST postfix-3.5.9.tar.gz 4620852 BLAKE2B 66a7bd71e7f74c8f25963ed8d41f04f1f95e060fd23c848065a0e947e766efe058e6593ed8ce1f69528f5b2e9868756d0ea0622b3d77486852882622dd3bb872 SHA512 9ff3a33cdd5811e470d5c6cfa896fa76e4d3257b139deec5f420d18e34232f327b7c8496c5d13566c6f9ae1fdf8719feb9981372b2869b0208a2eb3a1daaeadd
DIST postfix-3.6-20210110.tar.gz 4694759 BLAKE2B fc2b69b98252d6e95c93e64bc4e56205ccc821a81ee52cd7ec28d9db61c90149071f914ede1100f3b29708a1a8361a1f56983f914d59ce9de7ea55d2c767cab8 SHA512 3cd239de4b774eff1546ce69db020f364516027d08f8646c5c8f356a9ade9667695e747c1f31a01d6fdc99e1307ab1e0bb767d96d499b4af2d85326585a72a98
EBUILD postfix-3.5.8.ebuild 8839 BLAKE2B fbc10db39b42d0c3ea8467955d2bf9eb74991d74ad25276049f589cec8e8b72896fcc9b71893e0f33e0a5af1625dc08cbd3c6362f01275ec04bc39c14207fddb SHA512 c5f7d03a4ca987e097fe9a34b42dba4485a1e44b781f0c49ffebe70b23c5d0c3067f5652e7bcd16b29114ae7713f72088ff50b9526cb213d0272d3a76bf4aded
+EBUILD postfix-3.5.9.ebuild 8844 BLAKE2B 253f34340c3625c801bcf756cb28604a7186f9c3489d5cfd1ac4946981cdcf684bac29775519c8e438426157caa5afcfff3b7fb68bf5f1af717bf345424c4d3a SHA512 98072861ba1a0a28a43ecbf0905136abe42dc1549d7c4cdecc994c7d08d9bf2419a03373240282a6973c425343c7ae81427659b0bfbffbf4d0f86a4a5c653125
EBUILD postfix-3.6_pre20210110.ebuild 8097 BLAKE2B 23a14cff6ef0709b0f9aa42a4762617d9726d06f59087c9285e052d5bc7e1f21911bb7438ae9e97c41946ea825bf1fbde5b2c0706523379ac959a6995137d7ee SHA512 45ede802b5eff47f90a5073f42992c6fc5c74f781c7ebf26bdd6ff59f561d6ac0a1d324482fa172966adb2136c225f8aa6566cb86e123dd57e0d13fa76daa0d1
MISC metadata.xml 939 BLAKE2B 01474efe62df1eda9a3ba5976847064d615b3c32d9c71838354ef375c851c7ab4d1fcc2bc0d2945ce3d259fc6a698938cee6d1354c4e0f02f1e66395e377a0c5 SHA512 8602700c2a21b66ecf2c024c06ce23452f7effd9c06a5d58c1ccb351bcdef43a3c89575cc9136efc72fcd4e06ecb0654017b51bb145e7ffeeda771e3f4e7a673
diff --git a/mail-mta/postfix/postfix-3.5.9.ebuild b/mail-mta/postfix/postfix-3.5.9.ebuild
new file mode 100644
index 000000000000..903880a12bfe
--- /dev/null
+++ b/mail-mta/postfix/postfix-3.5.9.ebuild
@@ -0,0 +1,317 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic pam systemd toolchain-funcs
+
+MY_PV="${PV/_rc/-RC}"
+MY_SRC="${PN}-${MY_PV}"
+MY_URI="ftp://ftp.porcupine.org/mirrors/postfix-release/official"
+RC_VER="2.7"
+
+DESCRIPTION="A fast and secure drop-in replacement for sendmail"
+HOMEPAGE="http://www.postfix.org/"
+SRC_URI="${MY_URI}/${MY_SRC}.tar.gz"
+
+LICENSE="|| ( IBM EPL-2.0 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="+berkdb cdb dovecot-sasl +eai hardened ldap ldap-bind libressl lmdb memcached mbox mysql nis pam postgres sasl selinux sqlite ssl"
+
+DEPEND="
+ acct-group/postfix
+ acct-group/postdrop
+ acct-user/postfix
+ >=dev-libs/libpcre-3.4
+ dev-lang/perl
+ berkdb? ( >=sys-libs/db-3.2:* )
+ cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r4 ) )
+ eai? ( dev-libs/icu:= )
+ ldap? ( net-nds/openldap )
+ ldap-bind? ( net-nds/openldap[sasl] )
+ lmdb? ( >=dev-db/lmdb-0.9.11 )
+ mysql? ( dev-db/mysql-connector-c:0= )
+ nis? ( net-libs/libnsl )
+ pam? ( sys-libs/pam )
+ postgres? ( dev-db/postgresql:* )
+ sasl? ( >=dev-libs/cyrus-sasl-2 )
+ sqlite? ( dev-db/sqlite:3 )
+ ssl? (
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( >=dev-libs/libressl-2.9.1:0= )
+ )"
+
+RDEPEND="${DEPEND}
+ memcached? ( net-misc/memcached )
+ net-mail/mailbase
+ !mail-mta/courier
+ !mail-mta/esmtp
+ !mail-mta/exim
+ !mail-mta/mini-qmail
+ !mail-mta/msmtp[mta]
+ !mail-mta/netqmail
+ !mail-mta/nullmailer
+ !mail-mta/qmail-ldap
+ !mail-mta/sendmail
+ !mail-mta/opensmtpd
+ !mail-mta/ssmtp[mta]
+ !net-mail/fastforward
+ selinux? ( sec-policy/selinux-postfix )"
+
+REQUIRED_USE="ldap-bind? ( ldap sasl )"
+
+S="${WORKDIR}/${MY_SRC}"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-libressl-certkey.patch"
+ "${FILESDIR}/${PN}-libressl-server.patch"
+)
+
+src_prepare() {
+ default
+ sed -i -e "/^#define ALIAS_DB_MAP/s|:/etc/aliases|:/etc/mail/aliases|" \
+ src/util/sys_defs.h || die "sed failed"
+ # change default paths to better comply with portage standard paths
+ sed -i -e "s:/usr/local/:/usr/:g" conf/master.cf || die "sed failed"
+}
+
+src_configure() {
+ for name in CDB LDAP LMDB MYSQL PCRE PGSQL SDBM SQLITE
+ do
+ local AUXLIBS_${name}=""
+ done
+
+ # Make sure LDFLAGS get passed down to the executables.
+ local mycc="-DHAS_PCRE" mylibs="${LDFLAGS} -ldl"
+ AUXLIBS_PCRE="$(pcre-config --libs)"
+
+ use pam && mylibs="${mylibs} -lpam"
+
+ if use ldap; then
+ mycc="${mycc} -DHAS_LDAP"
+ AUXLIBS_LDAP="-lldap -llber"
+ fi
+
+ if use mysql; then
+ mycc="${mycc} -DHAS_MYSQL $(mysql_config --include)"
+ AUXLIBS_MYSQL="$(mysql_config --libs)"
+ fi
+
+ if use postgres; then
+ mycc="${mycc} -DHAS_PGSQL -I$(pg_config --includedir)"
+ AUXLIBS_PGSQL="-L$(pg_config --libdir) -lpq"
+ fi
+
+ if use sqlite; then
+ mycc="${mycc} -DHAS_SQLITE"
+ AUXLIBS_SQLITE="-lsqlite3 -lpthread"
+ fi
+
+ if use ssl; then
+ mycc="${mycc} -DUSE_TLS"
+ mylibs="${mylibs} -lssl -lcrypto"
+ fi
+
+ if use lmdb; then
+ mycc="${mycc} -DHAS_LMDB"
+ AUXLIBS_LMDB="-llmdb -lpthread"
+ fi
+
+ if ! use eai; then
+ mycc="${mycc} -DNO_EAI"
+ fi
+
+ # broken. and "in other words, not supported" by upstream.
+ # Use inet_protocols setting in main.cf
+ #if ! use ipv6; then
+ # mycc="${mycc} -DNO_IPV6"
+ #fi
+
+ if use sasl; then
+ if use dovecot-sasl; then
+ # Set dovecot as default.
+ mycc="${mycc} -DDEF_SASL_SERVER=\\\"dovecot\\\""
+ fi
+ if use ldap-bind; then
+ mycc="${mycc} -DUSE_LDAP_SASL"
+ fi
+ mycc="${mycc} -DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I/usr/include/sasl"
+ mylibs="${mylibs} -lsasl2"
+ elif use dovecot-sasl; then
+ mycc="${mycc} -DUSE_SASL_AUTH -DDEF_SERVER_SASL_TYPE=\\\"dovecot\\\""
+ fi
+
+ if ! use nis; then
+ mycc="${mycc} -DNO_NIS"
+ fi
+
+ if ! use berkdb; then
+ mycc="${mycc} -DNO_DB"
+ if use cdb; then
+ # change default hash format from Berkeley DB to cdb
+ mycc="${mycc} -DDEF_DB_TYPE=\\\"cdb\\\""
+ fi
+ fi
+
+ if use cdb; then
+ mycc="${mycc} -DHAS_CDB -I/usr/include/cdb"
+ # Tinycdb is preferred.
+ if has_version dev-db/tinycdb ; then
+ einfo "Building with dev-db/tinycdb"
+ AUXLIBS_CDB="-lcdb"
+ else
+ einfo "Building with dev-db/cdb"
+ CDB_PATH="/usr/$(get_libdir)"
+ for i in cdb.a alloc.a buffer.a unix.a byte.a ; do
+ AUXLIBS_CDB="${AUXLIBS_CDB} ${CDB_PATH}/${i}"
+ done
+ fi
+ fi
+
+ # Robin H. Johnson 17/Nov/2006
+ # Fix because infra boxes hit 2Gb .db files that fail a 32-bit fstat signed check.
+ mycc="${mycc} -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE"
+ filter-lfs-flags
+
+ # Workaround for bug #76512
+ if use hardened; then
+ [[ "$(gcc-version)" == "3.4" ]] && replace-flags -O? -Os
+ fi
+
+ # Remove annoying C++ comment style warnings - bug #378099
+ append-flags -Wno-comment
+
+ sed -i -e "/^RANLIB/s/ranlib/$(tc-getRANLIB)/g" "${S}"/makedefs
+ sed -i -e "/^AR/s/ar/$(tc-getAR)/g" "${S}"/makedefs
+
+ emake makefiles shared=yes dynamicmaps=no pie=yes \
+ shlib_directory="/usr/$(get_libdir)/postfix/MAIL_VERSION" \
+ DEBUG="" CC="$(tc-getCC)" OPT="${CFLAGS}" CCARGS="${mycc}" AUXLIBS="${mylibs}" \
+ AUXLIBS_CDB="${AUXLIBS_CDB}" AUXLIBS_LDAP="${AUXLIBS_LDAP}" \
+ AUXLIBS_LMDB="${AUXLIBS_LMDB}" AUXLIBS_MYSQL="${AUXLIBS_MYSQL}" \
+ AUXLIBS_PCRE="${AUXLIBS_PCRE}" AUXLIBS_PGSQL="${AUXLIBS_PGSQL}" \
+ AUXLIBS_SQLITE="${AUXLIBS_SQLITE}"
+}
+
+src_install() {
+ LD_LIBRARY_PATH="${S}/lib" \
+ /bin/sh postfix-install \
+ -non-interactive \
+ install_root="${D}" \
+ config_directory="/etc/postfix" \
+ manpage_directory="/usr/share/man" \
+ command_directory="/usr/sbin" \
+ mailq_path="/usr/bin/mailq" \
+ newaliases_path="/usr/bin/newaliases" \
+ sendmail_path="/usr/sbin/sendmail" \
+ || die "postfix-install failed"
+
+ # Fix spool removal on upgrade
+ rm -Rf "${D}"/var
+ keepdir /var/spool/postfix
+
+ # Install rmail for UUCP, closes bug #19127
+ dobin auxiliary/rmail/rmail
+
+ # Provide another link for legacy FSH
+ dosym ../sbin/sendmail /usr/$(get_libdir)/sendmail
+
+ # Install qshape, posttls-finger and collate
+ dobin auxiliary/qshape/qshape.pl
+ doman man/man1/qshape.1
+ dobin bin/posttls-finger
+ doman man/man1/posttls-finger.1
+ dobin auxiliary/collate/collate.pl
+ newdoc auxiliary/collate/README README.collate
+
+ # Performance tuning tools and their manuals
+ dosbin bin/smtp-{source,sink} bin/qmqp-{source,sink}
+ doman man/man1/smtp-{source,sink}.1 man/man1/qmqp-{source,sink}.1
+
+ # Set proper permissions on required files/directories
+ keepdir /var/lib/postfix
+ fowners -R postfix:postfix /var/lib/postfix
+ fperms 0750 /var/lib/postfix
+ fowners root:postdrop /usr/sbin/post{drop,queue}
+ fperms 02755 /usr/sbin/post{drop,queue}
+
+ keepdir /etc/postfix
+ keepdir /etc/postfix/postfix-files.d
+ if use mbox; then
+ mypostconf="mail_spool_directory=/var/spool/mail"
+ else
+ mypostconf="home_mailbox=.maildir/"
+ fi
+ LD_LIBRARY_PATH="${S}/lib" \
+ "${D}"/usr/sbin/postconf -c "${D}"/etc/postfix \
+ -e ${mypostconf} || die "postconf failed"
+
+ insinto /etc/postfix
+ newins "${FILESDIR}"/smtp.pass saslpass
+ fperms 600 /etc/postfix/saslpass
+
+ newinitd "${FILESDIR}"/postfix.rc6.${RC_VER} postfix
+ # do not start mysql/postgres unnecessarily - bug #359913
+ use mysql || sed -i -e "s/mysql //" "${D}/etc/init.d/postfix"
+ use postgres || sed -i -e "s/postgresql //" "${D}/etc/init.d/postfix"
+
+ dodoc *README COMPATIBILITY HISTORY PORTING RELEASE_NOTES*
+ mv "${S}"/examples "${D}"/usr/share/doc/${PF}/
+ # postfix set-permissions expects uncompressed man files
+ docompress -x /usr/share/man
+
+ pamd_mimic_system smtp auth account
+
+ if use sasl; then
+ insinto /etc/sasl2
+ newins "${FILESDIR}"/smtp.sasl smtpd.conf
+ fi
+
+ # header files
+ insinto /usr/include/postfix
+ doins include/*.h
+
+ if has_version mail-mta/postfix; then
+ # let the sysadmin decide when to change the compatibility_level
+ sed -i -e /^compatibility_level/"s/^/#/" "${D}"/etc/postfix/main.cf || die
+ fi
+
+ systemd_dounit "${FILESDIR}/${PN}.service"
+}
+
+pkg_preinst() {
+ if has_version ' ${P}.tar.gz
+ ${EGO_SUM_SRC_URI}"
+
+LICENSE="Apache-2.0 BSD BSD-2 GPL-3+ ISC LGPL-3+ MIT MPL-2.0 Unlicense"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="gui"
+
+# Some of the tests fail without access to a keyring service
+RESTRICT="test"
+
+RDEPEND="app-crypt/libsecret
+ gui? ( !mail-mta/protonmail-bridge-bin )" # /usr/bin file collision
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}"/${MY_P}
+
+src_prepare() {
+ xdg_environment_reset
+ default
+}
+
+src_compile() {
+ if use gui; then
+ emake \
+ QT_DOC_DIR="/usr/share/qt5-doc" \
+ QT_PKG_CONFIG=true \
+ build
+ else
+ emake build-nogui
+ fi
+}
+
+src_test() {
+ emake test
+}
+
+src_install() {
+ # A slight hack to allow this package (which is currently limited to CLI mode)
+ # and protonmail-bridge-bin (which supports GUI mode) to co-exist.
+ local bin_name unit_name
+ if use gui; then
+ bin_name="${PN}"
+ unit_name="${FILESDIR}/${PN}.service"
+ else
+ bin_name="${PN}-cli"
+ unit_name="${PN}-cli.service"
+ sed -e "s|${PN}|${bin_name}|" "${FILESDIR}"/${PN}.service > ${unit_name} || die
+ fi
+
+ exeinto /usr/bin
+ newexe proton-bridge ${bin_name}
+
+ systemd_douserunit ${unit_name}
+
+ # FIXME: USE=gui will probably need more files
+
+ einstalldocs
+}
+
+pkg_postinst() {
+ use gui && xdg_icon_cache_update
+}
+
+pkg_postrm() {
+ use gui && xdg_icon_cache_update
+}
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index aaeec7a5375e..b063d78b9fcf 100644
Binary files a/media-gfx/Manifest.gz and b/media-gfx/Manifest.gz differ
diff --git a/media-gfx/exif/Manifest b/media-gfx/exif/Manifest
index a094c9931c61..a12bacc8dee6 100644
--- a/media-gfx/exif/Manifest
+++ b/media-gfx/exif/Manifest
@@ -1,5 +1,3 @@
-DIST exif-0.6.21.tar.bz2 387531 BLAKE2B 494d4910af2e8f740aeebdeeaf8dec5ae638d3e78339c55d5acc38879ab4837164d2ef407bd07a2e36a00df15d53b132bb027e2e97e79c229c589819af3b7f7b SHA512 73b5b7df08462a6a084a8fb973c39197f5d64ed753a97cb2f94a4acf815fdf0313214c2c8e44a46a24a1f6304fdaa68a579b4a2e246cc095f6e9588e93368cdc
DIST exif-0.6.22.tar.gz 569665 BLAKE2B 556927fca99416ff174c0c4403337f2f8b85cb14472d920a48a9598d8b7e3be6b800b0b37a764cd89fb45b62376a05ef1f0ae6b260a076f0949aadf8a441a2eb SHA512 b194bacb28ff2b910014edce732f97a875852abd486ce62bcf9274eb0ed668a0ee9c954cf60455191969aacb48d3d4d3172958a183b29f050c0bf8d55de14e7d
-EBUILD exif-0.6.21.ebuild 580 BLAKE2B a08bd474a0ddba7e01b4ae9f6197c2690bf9a0a8cc9c2d64e84f083639d0b5d7826a00c891ea35dcc4afac01a60eedbd3d3371ee9ef15e320dc6967439d106da SHA512 aa147df8a0baeca94b88497e9fe801e56b5e4a42c2e8940a7ae8a8d03af90af760b7bfc19726f771d6bed3a3875cec226ead12876098b6e8556c3f3770eb4a33
-EBUILD exif-0.6.22.ebuild 662 BLAKE2B 52b88fd78e3ce3a197c8671631697ba30b60eb75286ba115e4e08af2b991464d9861012bbc6b5e5dc9998b4bcda96f6603db83cc56666d2aed08a1bf50d4f34e SHA512 e78c6d0477e1eea34c58af149e453bd5ee5a57cb1f53e0d6aef6bb7db6dce6ecda4c1e007686efec453e0c655bb851344939ab7ddaa11c2c50b9a589ca8dbf9b
+EBUILD exif-0.6.22.ebuild 661 BLAKE2B 8bd9f5447a59f623dfdd84523c165a930bb574e065542e61eb1829442d294b2397228ca307b55e610d02c6055fd5df4f00fe16dc8a8f1013ef86a0f065e3a341 SHA512 5659604e4c43e7301487d4f5a0d66311cffa3d5a2b5ee205c3236b31726bef926aa7c3ef37bca4670c3910c7192e412ff76813e125748aa122f4022c6eb936ef
MISC metadata.xml 249 BLAKE2B d224cb8e5d2c5fce97a3b2e5ddd58eaf63652fbd198148263043184bb34e3ecfa58af4a54fcb3e8c388ba4a8c71f6882b9ff214f3f366d5333093e1e6b0d8394 SHA512 7721d48e6ecfe8212f06808ec8cb7cc6f9d3db63c71a3c348f9f1d7db9cc18d74ad70c474861631c08df354c7a57d37bd0cee1e4a0ee62e83296a35c90af0b7f
diff --git a/media-gfx/exif/exif-0.6.21.ebuild b/media-gfx/exif/exif-0.6.21.ebuild
deleted file mode 100644
index 379dfe2fbe3d..000000000000
--- a/media-gfx/exif/exif-0.6.21.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
-
-DESCRIPTION="Small CLI util to show EXIF infos hidden in JPEG files"
-HOMEPAGE="https://libexif.github.io/"
-SRC_URI="mirror://sourceforge/libexif/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="nls"
-
-BDEPEND="
- virtual/pkgconfig
- nls? ( sys-devel/gettext )
-"
-DEPEND="
- dev-libs/popt
- >=media-libs/libexif-${PV}
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
- econf $(use_enable nls)
-}
diff --git a/media-gfx/exif/exif-0.6.22.ebuild b/media-gfx/exif/exif-0.6.22.ebuild
index c9a3c41fdbb2..fb8a673b2a4f 100644
--- a/media-gfx/exif/exif-0.6.22.ebuild
+++ b/media-gfx/exif/exif-0.6.22.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/lib${PN}/${PN}/releases/download/${PN}-${PV//./_}-re
LICENSE="LGPL-2+"
SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE="nls"
BDEPEND="
diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index 2d7aef44ad56..4a444f688213 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -1,5 +1,7 @@
AUX krita-4.3.1-tests-optional.patch 2583 BLAKE2B 0b5e577bc17ef6b6487ce82ff4b4bc34064c659a3cf48d12a539c3029dd70f17b0b48a7398b68de6a937adff3af0c2d4a47d0f84fdc7746ec612fb05272d963f SHA512 f16885a72cd5f8f250b03903062c70190367ed409c2582d579bfb1e6ab09514df7f96214ce236e33bb8eec2f3872d887f9c3152f4e524b1719250a9064bf719c
DIST krita-4.2.9-patchset.tar.xz 7928 BLAKE2B 57256884edafd528cfca529e020a226613a37682df445ece24d434e816f218d822c03d668a13806f775d02757bafd9627ed8073406e5506023767d06c78c30de SHA512 36ec902afec082fcf18c0e523a83a08aa54d54bd5393691b0f17dcab0969e69973d8e842fac44fcf66232f369b36f97937f67b5c0b0bdcff019cc1d323b3bf59
DIST krita-4.4.1.tar.xz 169788052 BLAKE2B fe0cbba0e63a3873578c54055b0a11941518a52a9fab17e54f13d26325717a5d6e7f0d6c79d29df2bcc91c39174bc992d2e1e14e1012a5fdd8c447f224e3a190 SHA512 8832202384bae5c73715087b1b3230e459eb780cfa71b7c7bfb92ba4498b8b78575a7b3437aa4b88f396cec47080ccaaaadbc1b1f8bcbcdeb607909fee710afe
+DIST krita-4.4.2.tar.xz 174168244 BLAKE2B 95f22853ee31c8121b7d54e6771f8fbb708b19a106bf78026344ac6f2cb02ffbd446d291601359042579ba0e89d6d0a641015e95070c17369a2a8e9e01560660 SHA512 a75925e9690eaea03900cdb8da20dc25f1bf22fdb4515f685111f3503bf7c334acf79e6668b55a70464c77a04229ca34d6f160d5490987592af783ca9fc7d7ef
EBUILD krita-4.4.1.ebuild 3385 BLAKE2B 63a617f770915621fb9550298de444c0973ecf7acfa65c2b15e0e974ef8781c250499ca7fbae02a19987cf03c3d90638f0289e9ab3029e127dac01a3d55cea21 SHA512 3c29c5e00b87e0c4f256c8d26407e42832d72643ff287799667df673bf6dc6936415e1146f65341e28c00e939635654aef53d97d1199bda0e414377cc2c6eab9
+EBUILD krita-4.4.2.ebuild 3386 BLAKE2B 83911adce657ba9679f25f811d2383651cff66e02c1b00b844622ed8d2c763d841662f18c9af58722a2bb59e90c0fdb878872f44e32a1b21c130deb7b4014279 SHA512 9adcebbc9b7abae5418b1a9711cd4a8ef984b924af27fe3747e1367ec513c54a48e3a495465c47a1faa8c533b581c5ace5b9f314e4e1a3bd8da3db01329b0de1
MISC metadata.xml 696 BLAKE2B 433ca97e92c2e6c8a0f5bfbd4cba667576be6cc8c93330b689e0088663ac6df263d62b7be6d42debf3480b706721f06be089c5e9a139451e49b609ea4a081ae2 SHA512 becd89686babf0fde2a7e53196715bbca2a4f0d6bad0bc3a55128c9ee19dbe5819be1020db6458ec0c053cf7370a390ff1e84fd9c49331fc28e5a60348fd34dd
diff --git a/media-gfx/krita/krita-4.4.2.ebuild b/media-gfx/krita/krita-4.4.2.ebuild
new file mode 100644
index 000000000000..3a09834e46d1
--- /dev/null
+++ b/media-gfx/krita/krita-4.4.2.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_TEST="forceoptional"
+PYTHON_COMPAT=( python3_{7,8,9} )
+KFMIN=5.74.0
+QTMIN=5.15.1
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org python-single-r1
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+ SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz
+ https://dev.gentoo.org/~asturm/distfiles/${PN}-4.2.9-patchset.tar.xz"
+ KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+fi
+
+DESCRIPTION="Free digital painting application. Digital Painting, Creative Freedom!"
+HOMEPAGE="https://apps.kde.org/en/krita https://krita.org/en/"
+
+LICENSE="GPL-3"
+SLOT="5"
+IUSE="color-management fftw gif +gsl heif +jpeg openexr pdf qtmedia +raw tiff vc"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+BDEPEND="
+ dev-cpp/eigen:3
+ dev-lang/perl
+ sys-devel/gettext
+"
+RDEPEND="${PYTHON_DEPS}
+ dev-libs/boost:=
+ dev-libs/quazip
+ $(python_gen_cond_dep '
+ dev-python/PyQt5[${PYTHON_MULTI_USEDEP}]
+ dev-python/sip[${PYTHON_MULTI_USEDEP}]
+ ')
+ >=dev-qt/qtconcurrent-${QTMIN}:5
+ >=dev-qt/qtdbus-${QTMIN}:5
+ >=dev-qt/qtdeclarative-${QTMIN}:5
+ >=dev-qt/qtgui-${QTMIN}:5=[-gles2-only]
+ >=dev-qt/qtnetwork-${QTMIN}:5
+ >=dev-qt/qtprintsupport-${QTMIN}:5
+ >=dev-qt/qtsvg-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ >=dev-qt/qtx11extras-${QTMIN}:5
+ >=dev-qt/qtxml-${QTMIN}:5
+ >=kde-frameworks/kcompletion-${KFMIN}:5
+ >=kde-frameworks/kconfig-${KFMIN}:5
+ >=kde-frameworks/kcoreaddons-${KFMIN}:5
+ >=kde-frameworks/kcrash-${KFMIN}:5
+ >=kde-frameworks/kguiaddons-${KFMIN}:5
+ >=kde-frameworks/ki18n-${KFMIN}:5
+ >=kde-frameworks/kiconthemes-${KFMIN}:5
+ >=kde-frameworks/kitemmodels-${KFMIN}:5
+ >=kde-frameworks/kitemviews-${KFMIN}:5
+ >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+ >=kde-frameworks/kwindowsystem-${KFMIN}:5
+ >=kde-frameworks/kxmlgui-${KFMIN}:5
+ media-gfx/exiv2:=
+ media-libs/lcms
+ media-libs/libpng:0=
+ sys-libs/zlib
+ virtual/opengl
+ x11-libs/libX11
+ x11-libs/libXi
+ color-management? ( media-libs/opencolorio )
+ fftw? ( sci-libs/fftw:3.0= )
+ gif? ( media-libs/giflib )
+ gsl? ( sci-libs/gsl:= )
+ jpeg? ( virtual/jpeg:0 )
+ heif? ( media-libs/libheif:= )
+ openexr? (
+ media-libs/ilmbase:=
+ media-libs/openexr
+ )
+ pdf? ( app-text/poppler[qt5] )
+ qtmedia? ( >=dev-qt/qtmultimedia-${QTMIN}:5 )
+ raw? ( media-libs/libraw:= )
+ tiff? ( media-libs/tiff:0 )
+"
+DEPEND="${RDEPEND}
+ vc? ( >=dev-libs/vc-1.1.0 )
+"
+
+# bug 630508
+RESTRICT+=" test"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-4.3.1-tests-optional.patch
+ "${WORKDIR}"/${PN}-4.2.9-patchset/${PN}-4.2.9-ecm-findopenexr.patch
+)
+
+pkg_setup() {
+ python-single-r1_pkg_setup
+ ecm_pkg_setup
+}
+
+src_prepare() {
+ ecm_src_prepare
+ sed -e "/CMAKE_CXX_STANDARD/s/11/14/" -i CMakeLists.txt || die
+}
+
+src_configure() {
+ # Prevent sandbox violation from FindPyQt5.py module
+ # See Gentoo-bug 655918
+ addpredict /dev/dri
+
+ local mycmakeargs=(
+ -DCMAKE_DISABLE_FIND_PACKAGE_KSeExpr=ON # not packaged
+ $(cmake_use_find_package color-management OCIO)
+ $(cmake_use_find_package fftw FFTW3)
+ $(cmake_use_find_package gif GIF)
+ $(cmake_use_find_package gsl GSL)
+ $(cmake_use_find_package heif HEIF)
+ $(cmake_use_find_package jpeg JPEG)
+ $(cmake_use_find_package openexr OpenEXR)
+ $(cmake_use_find_package pdf Poppler)
+ $(cmake_use_find_package qtmedia Qt5Multimedia)
+ $(cmake_use_find_package raw LibRaw)
+ $(cmake_use_find_package tiff TIFF)
+ $(cmake_use_find_package vc Vc)
+ )
+
+ ecm_src_configure
+}
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 7d6b12319c92..5ef9e5f5783b 100644
Binary files a/media-libs/Manifest.gz and b/media-libs/Manifest.gz differ
diff --git a/media-libs/allegro/Manifest b/media-libs/allegro/Manifest
index a970b54601e3..2ffad0ac7870 100644
--- a/media-libs/allegro/Manifest
+++ b/media-libs/allegro/Manifest
@@ -1,16 +1,10 @@
-AUX allegro-4.4.2-GLX_RGBA_FLOAT_BIT.patch 701 BLAKE2B 76b9a2aaca022bbdc143b25adf4d5ad5bc62a52d72222bff3b9fd7b115f62482e98d69919a73324265b3f4a4aa548eb39fe613576166d51ba676d47ed9bdd948 SHA512 d3cbf252917a3dea316475fb8add5f966d6317a8563ac4e15324bcc34585c71c0dd71287507d8ee1f62b223054f009d28eece16656954597a9d35a1406f68dfd
-AUX allegro-4.4.2-Werror-format-security.patch 5100 BLAKE2B 1e52bd5bb0eaa4df2c0c5ecb9d5421d9e41c074a7535dc29532ce976f5562de3c59979b33c042d33da4ee775d190e93036d3a5e3579786b10933f1ecec99110c SHA512 42a4f59d10a5bf3290178943181ba23ef08074abe94bd32d2f6f94f316424bbc0031350793c3d5610feef62a4a42080820fec5dbdb27802c1dc1abd0e64b13f9
AUX allegro-4.4.2-gentoo.patch 756 BLAKE2B 9273b38794a904eedadf8210d5519eda46103e2441090eeff45bfa7810d0112177f334bff66f943f915f5a48fb41542c6aa1b9f2edbaac2130dcab15332e06b5 SHA512 8abac7ade02fe7592ea77f782562d74b9cd45006e63e71f2965f8fa53c37cd5c3fb2543301bb1610a8f41f5c50b734ab9497c52721495c59fae4f3e434cbb615
-AUX allegro-4.4.2-glibc228.patch 1586 BLAKE2B e25f3f34a6a980b1a2067daec2cfaba49bd650fe065b2ccc4f9ee70a191b8fc22f3fe2501b54ac8fb2dbdb4630958f68585895c4f813a67495690a8d830d4879 SHA512 8783c04c765c3f28afd0b94603056e4a28a968f329f8814f60b074327dbd0f22e0e124df17223f04f840fdbdb5db7c9b868ccb90062902699df44b59c3b91060
AUX allegro-4.4.2-rpath.patch 182 BLAKE2B c6bae5a2ca5cd77022bf07690c5eb4d5b78f442f5951098bb30b036e37c0272fea6955908df73fdacef2e5f8698ae57a99dd73de32a056a9580a0e808a8f54f0 SHA512 6e262dc9dac274bdcbeeb2cf54b1c073a69db4a4abeb720caf5c58cb1d692286300c93fd9b7d3cea2f01aea4aeed33a34cb9e585a58ab083685c5f8c937c6536
AUX allegro-4.4.2-shared.patch 247 BLAKE2B d5bada972b4c2555f9ad9da18b30b224f5aa70762d6d68883601df933cc44788b6e5a78289d0bde863f788b65cf583ea828ffb6455d03d1d7493b00ff6c40b77 SHA512 5b982f857197dd9256bb1a151b544484b0178fa8e90d6b876bf2d26ea37c6e6bf6f44d1b729f9d2ccd11899024dccc2afbfbbfb73b816cb17e97dc3eb4df51e5
-AUX allegro-4.4.2-static-func.patch 416 BLAKE2B 3f7436cf87dd66c6ac336a3d8be8901a4679ae3054c1fe8ecb1012b5da883d3bfffc41c7421af6d95171e24e5ed864c8a6b029a9b387ad76c082437b406a8891 SHA512 ad1cd77c66f75192ccf5048f0742b9f420e611b7790576c3915721d104299b9e91619451d615d3653737bb2333b1cb170acb3202f0293be92b8be3371445ac19
AUX allegro-4.4.2-underlink.patch 456 BLAKE2B ede5f9e5195b1c54460f584924afd9daa64c795a0e083499084c7377f1989bc0df621339ff3988bc2a997447050ebf3fe0f5055fbcef8ee21dd66dfdf1ca003a SHA512 0e873aa6d1b6e72e2e4b46276f0a2a4ffe816c8d0b6a10dd9462cfed826b40d7b3461ebe51e595e9f2e7a5d2f19fd261b1ad0e05f60b77717224911e59a537d0
AUX allegro-4.4.3.1-texinfo-encoding.patch 778 BLAKE2B 7bd9538fb2fbded6e425ef6bbc0aa009707e522e1dc3d09540bf1f9fa6350375f7acea942a986304a834964bb20849da4f08ff3f963b86f43c179a9fc2b012ff SHA512 d8960e21b713a24d415704d023443dc09d6a8909d65063a7b55da47228619485fc7e647c5c52e9a9459da027daaebdc19e6c3e56fe618ee5f553fd03c4716bcc
-DIST allegro-4.4.2.tar.gz 4674902 BLAKE2B 9f43fad416348425692481524f6c15808ee03946d93df4a072a46557817ccd5f6ae7eede908ca4a02a0a9e49f9a7c42909c48c14923b2155d3999ff370401006 SHA512 ad4bc1c15fc83bc8a019031fed82f37a793664bb6683cf023ec05fd9cd945f00f43764f3126892426036249c63afa5678fb4906407bb325ce5827b36aee0fa86
DIST allegro-4.4.3.1.tar.gz 4663634 BLAKE2B 23fa8cd77858243bfa8191f6bca26f50d1621fa84616968595c1284c73a86160cdbad201eece5bd026bb7ac13753568b6915295646b86e536b5d26c0394e2d1f SHA512 c5a552ab710226493447eb2547b3d7559badb96f511fbefd315b665b7486013a6710c83b69363eb09f90f53ef4278fe7b90cfee88d90d88f0fe8dc7df7606729
DIST allegro-5.2.6.0.tar.gz 7867726 BLAKE2B 3f21372442e5b8c802ac179019a11648febdcecddfda864559e1e9621f99c9ff7584fb422594c6fd3a1c352c892533c825faef10e35ecbf97058396fbb46fc7d SHA512 a475de67b0e6c727295cc51e113859eb0c57825a240e70bc45cd3b000c40518932b89cecdd13ba957416136db4ee9a9363adb5d3bfa7c8acda04ee95de6ba721
-EBUILD allegro-4.4.2-r2.ebuild 2737 BLAKE2B 53d1da512860d07ae86685094c73795eff384dccac3bfdcaa14e766300043289163cf721ff53abcc826070182eb14bef098fcadb2cda4730cd6042ed76116d4c SHA512 947594d6b3dcc1df3cb7359d41ddac48b8095933aa82dc5e064c92534e94d380ff0b65896a5558b82c11b7149c5f4dd552017b247c35b233318a6e5b010cff0c
EBUILD allegro-4.4.3.1.ebuild 2970 BLAKE2B 9286e322b7397b7ad99f42170b6e260d586e896af3396bb5e8d315d1a120ad0445dacf22825ea180264cec3236ffa967f5346695a13e2a934d70e63894619505 SHA512 caa42406b233bec316d1f57285cec04928f470cc4ac57c0a6b50a5ccf39816b43d4fc376bf06f46daa954af6795b06a811851a50124fc8259d2a93b293aaa594
EBUILD allegro-5.2.6.0.ebuild 2948 BLAKE2B 6a09a2460d6d002dc2760e1d9651ec610eb0b1cd3ff8de0dc4c0713fe86824f28ac1798e4b814352425468f9627a60292ff1cb76f8a3fa4ae835be7678910cf8 SHA512 1b17d768dc4797f36ff940d6e9f9f22b2a0ff5c716700fc903b2779f7e779a82cd13ae3e4ff4a1f46b5f55bb6cd88271f0d69a7fbf521c67cae7217bfc21281d
-MISC metadata.xml 1034 BLAKE2B c1cdd935feae4561903bde181428ef0d71743f85e7756f507087528641471b4af3d1339758c3d829f8244b5cec7cc74bb7563699b9e5b05146ae4c6abe8dd5af SHA512 21301cc66fe94a4d728900cd5856d3e0d27507b1d340e36246c183b13232cb7f9c9da9f8b20428bd387c7216a892dce169c2bc885caabacb08a32892faffc994
+MISC metadata.xml 1093 BLAKE2B 8cc4e85959faafa86e52e526676ae7bc69cbdfde6ea829db073f27dd2bf205130618673dca511f02b2d57ded95261ee5b47ffd337c6e1ce8f15a02a82929e77c SHA512 b66c3f858aba247b1ec1c0e77ff8bbf9fb11f2b98e827984af1fbdaa5af5a396e463aab40eeecdbde27e10be2c4c4ff836b197ed6dbb2afd6be30303004070ae
diff --git a/media-libs/allegro/allegro-4.4.2-r2.ebuild b/media-libs/allegro/allegro-4.4.2-r2.ebuild
deleted file mode 100644
index 0387f700f4a8..000000000000
--- a/media-libs/allegro/allegro-4.4.2-r2.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-CMAKE_IN_SOURCE_BUILD=1
-inherit cmake-utils desktop
-
-DESCRIPTION="cross-platform multimedia library"
-HOMEPAGE="https://liballeg.org/"
-SRC_URI="mirror://sourceforge/alleg/${P}.tar.gz"
-
-LICENSE="Allegro MIT GPL-2+ ZLIB"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~mips ppc ppc64 x86"
-IUSE="alsa fbcon jack jpeg opengl oss png svga test vga vorbis X"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- alsa? ( media-libs/alsa-lib )
- jack? ( media-sound/jack-audio-connection-kit )
- jpeg? ( virtual/jpeg:0 )
- png? ( media-libs/libpng:0= )
- svga? ( media-libs/svgalib )
- vorbis? ( media-libs/libvorbis )
- X? (
- x11-libs/libX11
- x11-libs/libXcursor
- x11-libs/libXext
- x11-libs/libXpm
- x11-libs/libXt
- x11-libs/libXxf86dga
- x11-libs/libXxf86vm
- opengl? (
- virtual/glu
- virtual/opengl
- )
- )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- X? ( x11-base/xorg-proto )"
-
-PATCHES=(
- "${FILESDIR}"/${P}-shared.patch
- "${FILESDIR}"/${P}-underlink.patch
- "${FILESDIR}"/${P}-gentoo.patch
- "${FILESDIR}"/${P}-rpath.patch
- "${FILESDIR}"/${P}-Werror-format-security.patch # bug 540470
- "${FILESDIR}"/${P}-glibc228.patch # bug 670781
- "${FILESDIR}"/${P}-GLX_RGBA_FLOAT_BIT.patch # bug 672858
- "${FILESDIR}"/${P}-static-func.patch # bug 696034
-)
-
-src_prepare() {
- cmake-utils_src_prepare
-
- sed -i \
- -e "s:allegro-\${ALLEGRO_VERSION}:${PF}:" \
- docs/CMakeLists.txt || die
-}
-
-src_configure() {
- # WANT_LINUX_CONSOLE is by default OFF
- # WANT_EXAMPLES doesn't install anything
- local mycmakeargs=(
- -DDOCDIR=share/doc
- -DMANDIR=share/man
- -DWANT_ALSA=$(usex alsa)
- -DWANT_DOCS_INFO=OFF
- -DWANT_EXAMPLES=OFF
- -DWANT_JACK=$(usex jack)
- -DWANT_JPGALLEG=$(usex jpeg)
- -DWANT_LINUX_CONSOLE=OFF
- -DWANT_LINUX_FBCON=$(usex fbcon)
- -DWANT_LINUX_SVGALIB=$(usex svga)
- -DWANT_LINUX_VGA=$(usex vga)
- -DWANT_LOADPNG=$(usex png)
- -DWANT_LOGG=$(usex vorbis)
- -DWANT_OSS=$(usex oss)
- -DWANT_TESTS=$(usex test)
- -DWANT_TOOLS=$(usex X)
- -DWANT_X11=$(usex X)
- )
-
- if use X; then
- mycmakeargs+=( -DWANT_ALLEGROGL=$(usex opengl) )
- else
- mycmakeargs+=( -DWANT_ALLEGROGL=OFF )
- fi
-
- cmake-utils_src_configure
-}
-
-src_install() {
- rm -r docs/html/{build,tmpfile.txt} || die
- local HTML_DOCS=( docs/html/. )
-
- cmake-utils_src_install
-
- #176020 (init_dialog.3), #409305 (key.3)
- pushd docs/man >/dev/null
- local manpage
- for manpage in $(ls -d *.3); do
- newman ${manpage} ${PN}-${manpage}
- done
- popd >/dev/null
-
- if use X; then
- newbin setup/setup ${PN}-setup
- insinto /usr/share/${PN}
- doins {keyboard,language,setup/setup}.dat
- newicon misc/icon.png ${PN}.png
- make_desktop_entry ${PN}-setup "Allegro Setup" ${PN} "Settings"
- fi
-}
diff --git a/media-libs/allegro/files/allegro-4.4.2-GLX_RGBA_FLOAT_BIT.patch b/media-libs/allegro/files/allegro-4.4.2-GLX_RGBA_FLOAT_BIT.patch
deleted file mode 100644
index 54ff4f97fbb1..000000000000
--- a/media-libs/allegro/files/allegro-4.4.2-GLX_RGBA_FLOAT_BIT.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/addons/allegrogl/src/x.c 2019-01-27 20:35:26.209055856 +0100
-+++ b/addons/allegrogl/src/x.c 2019-01-27 20:38:54.135570782 +0100
-@@ -650,7 +650,7 @@
- return -1;
- }
-
-- if (!(render_type & GLX_RGBA_BIT) && !(render_type & GLX_RGBA_FLOAT_BIT)) {
-+ if (!(render_type & GLX_RGBA_BIT) && !(render_type & GLX_RGBA_FLOAT_BIT_ARB)) {
- TRACE(PREFIX_I "decode_fbconfig: Not RGBA mode\n");
- return -1;
- }
-@@ -674,7 +674,7 @@
- /* Floating-point depth is not supported as glx extension (yet). */
- i->float_depth = 0;
-
-- i->float_color = (render_type & GLX_RGBA_FLOAT_BIT);
-+ i->float_color = (render_type & GLX_RGBA_FLOAT_BIT_ARB);
-
- v = glXGetVisualFromFBConfig(_xwin.display, fbc);
- if (!v) {
diff --git a/media-libs/allegro/files/allegro-4.4.2-Werror-format-security.patch b/media-libs/allegro/files/allegro-4.4.2-Werror-format-security.patch
deleted file mode 100644
index b3b0bc30b344..000000000000
--- a/media-libs/allegro/files/allegro-4.4.2-Werror-format-security.patch
+++ /dev/null
@@ -1,107 +0,0 @@
-diff -up allegro-4.4.2/src/unix/umodules.c~ allegro-4.4.2/src/unix/umodules.c
---- allegro-4.4.2/src/unix/umodules.c~ 2011-05-13 10:11:33.000000000 +0200
-+++ allegro-4.4.2/src/unix/umodules.c 2017-03-15 14:42:39.822612368 +0100
-@@ -126,11 +126,11 @@ void _unix_load_modules(int system_drive
- continue;
-
- if (!fullpath_slash) {
-- snprintf(fullpath, sizeof fullpath, filename);
-+ snprintf(fullpath, sizeof fullpath, "%s", filename);
- fullpath[(sizeof fullpath) - 1] = 0;
- }
- else {
-- snprintf(fullpath_slash+1, (sizeof fullpath) - (fullpath_slash - fullpath) - 1, filename);
-+ snprintf(fullpath_slash+1, (sizeof fullpath) - (fullpath_slash - fullpath) - 1, "%s", filename);
- fullpath[(sizeof fullpath) - 1] = 0;
- }
-
-diff -up allegro-4.4.2/src/linux/ljoy.c~ allegro-4.4.2/src/linux/ljoy.c
---- allegro-4.4.2/src/linux/ljoy.c~ 2010-02-20 06:18:16.000000000 +0100
-+++ allegro-4.4.2/src/linux/ljoy.c 2017-03-15 14:52:28.474215615 +0100
-@@ -93,7 +93,7 @@ static int joy_init(void)
-
- if (ioctl(joy_fd[i], JSIOCGVERSION, &raw_version) < 0) {
- /* NOTE: IOCTL fails if the joystick API is version 0.x */
-- uszprintf(allegro_error, ALLEGRO_ERROR_SIZE, get_config_text("Your Linux joystick API is version 0.x which is unsupported."));
-+ uszprintf(allegro_error, ALLEGRO_ERROR_SIZE, "%s", get_config_text("Your Linux joystick API is version 0.x which is unsupported."));
- return -1;
- }
-
-diff -up allegro-4.4.2/examples/extrans2.c~ allegro-4.4.2/examples/extrans2.c
---- allegro-4.4.2/examples/extrans2.c~ 2008-01-30 11:56:50.000000000 +0100
-+++ allegro-4.4.2/examples/extrans2.c 2017-03-15 15:43:03.494831521 +0100
-@@ -211,7 +211,7 @@ int main(int argc, char **argv)
- } else {
- msg = "no flipping";
- }
-- textprintf_ex(buffer, font, 1, 1, makecol(255, 255, 255), -1, msg);
-+ textprintf_ex(buffer, font, 1, 1, makecol(255, 255, 255), -1, "%s", msg);
-
- /* finally blit the back buffer on the screen */
- blit(buffer, screen, 0, 0, 0, 0, buffer->w, buffer->h);
-diff -up allegro-4.4.2/setup/setup.c~ allegro-4.4.2/setup/setup.c
---- allegro-4.4.2/setup/setup.c~ 2010-05-23 18:05:33.000000000 +0200
-+++ allegro-4.4.2/setup/setup.c 2017-03-15 16:13:42.243136380 +0100
-@@ -1163,7 +1163,7 @@ static void plot_joystick_state(BITMAP *
- textprintf_ex(bmp, font, SCREEN_W/2-96, SCREEN_H/2-60+c*20, -1, -1, uconvert_ascii("%s (%d/%d)", tmp),
- joystick_driver->name, i+1, num_joysticks);
- else
-- textprintf_ex(bmp, font, SCREEN_W/2-96, SCREEN_H/2-60+c*20, -1, -1, joystick_driver->name);
-+ textprintf_ex(bmp, font, SCREEN_W/2-96, SCREEN_H/2-60+c*20, -1, -1, "%s", joystick_driver->name);
- c++;
- }
-
-@@ -2879,7 +2879,7 @@ int main(void)
- alert(uconvert_ascii("Error loading " SETUP_DATA_FILE, tmp1), NULL, NULL, uconvert_ascii("OK", tmp2), NULL, 13, 0);
- #else
- set_gfx_mode(GFX_TEXT, 0, 0, 0, 0);
-- allegro_message(uconvert_ascii("Error loading " SETUP_DATA_FILE "\n", tmp1));
-+ allegro_message("%s", uconvert_ascii("Error loading " SETUP_DATA_FILE "\n", tmp1));
- #endif
- return 1;
- }
-diff -up allegro-4.4.2/examples/exkeys.c~ allegro-4.4.2/examples/exkeys.c
---- allegro-4.4.2/examples/exkeys.c~ 2008-01-10 20:46:00.000000000 +0100
-+++ allegro-4.4.2/examples/exkeys.c 2017-03-15 16:17:30.268545467 +0100
-@@ -193,7 +193,7 @@ int main(void)
- if (key_shifts & KB_NUMLOCK_FLAG) strcat(buf, " num");
- if (key_shifts & KB_SCROLOCK_FLAG) strcat(buf, " scrl");
- scroll();
-- textprintf_ex(screen, font, 8, SCREEN_H-16, makecol(0, 0, 0), makecol(255, 255, 255), buf);
-+ textprintf_ex(screen, font, 8, SCREEN_H-16, makecol(0, 0, 0), makecol(255, 255, 255), "%s", buf);
- } while (k != 27);
-
- /* various scan codes are defined in allegro.h as KEY_* constants */
-@@ -234,7 +234,7 @@ int main(void)
- if (key[KEY_8]) buf[8] = '8'; else buf[8] = ' ';
- if (key[KEY_9]) buf[9] = '9'; else buf[9] = ' ';
- buf[10] = 0;
-- textprintf_ex(screen, font, 8, SCREEN_H-16, makecol(0, 0, 0), makecol(255, 255, 255), buf);
-+ textprintf_ex(screen, font, 8, SCREEN_H-16, makecol(0, 0, 0), makecol(255, 255, 255), "%s", buf);
- rest(1);
- } while (!keypressed() || (readkey() >> 8) != KEY_ESC);
-
-diff -up allegro-4.4.2/tests/play.c~ allegro-4.4.2/tests/play.c
---- allegro-4.4.2/tests/play.c~ 2005-03-19 12:15:07.000000000 +0100
-+++ allegro-4.4.2/tests/play.c 2017-03-15 16:35:18.628156496 +0100
-@@ -74,7 +74,7 @@ void usage(void)
-
- strcat(msg, "\nIf you don't specify the card, Allegro will auto-detect (ie. guess :-)\n");
-
-- allegro_message(msg);
-+ allegro_message("%s", msg);
- free(msg);
- }
-
-diff -up allegro-4.2.3/tools/pack.c~ allegro-4.2.3/tools/pack.c
---- allegro-4.2.3/tools/pack.c~ 2006-05-20 16:49:58.000000000 +0200
-+++ allegro-4.2.3/tools/pack.c 2010-12-30 11:20:42.425231307 +0100
-@@ -42,7 +42,7 @@ static void err(char *s1, char *s2)
- printf(": %s", s1);
-
- if (s2)
-- printf(s2);
-+ printf("%s", s2);
-
- printf("\n");
-
diff --git a/media-libs/allegro/files/allegro-4.4.2-glibc228.patch b/media-libs/allegro/files/allegro-4.4.2-glibc228.patch
deleted file mode 100644
index afcdf5100c5e..000000000000
--- a/media-libs/allegro/files/allegro-4.4.2-glibc228.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 4848f1583c3dbe41f5f056869ff2c796d33d8121 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20R=C3=B6nnquist?=
-Date: Wed, 12 Dec 2018 16:39:23 +0100
-Subject: [PATCH] Remove f* variants of fixed math functions
-
-Removing functions that conflicts with later glibc implementations,
-people should use fix* variants instead.
-(Simply use fixadd instead of fadd).
----
- include/allegro/alcompat.h | 18 ------------------
- 1 file changed, 18 deletions(-)
-
-diff --git a/include/allegro/alcompat.h b/include/allegro/alcompat.h
-index d31ab5b6d..c9536839d 100644
---- a/include/allegro/alcompat.h
-+++ b/include/allegro/alcompat.h
-@@ -40,24 +40,6 @@
- #endif
- #endif
-
-- #ifndef ALLEGRO_NO_FIX_ALIASES
-- AL_ALIAS(fixed fadd(fixed x, fixed y), fixadd(x, y))
-- AL_ALIAS(fixed fsub(fixed x, fixed y), fixsub(x, y))
-- AL_ALIAS(fixed fmul(fixed x, fixed y), fixmul(x, y))
-- AL_ALIAS(fixed fdiv(fixed x, fixed y), fixdiv(x, y))
-- AL_ALIAS(int fceil(fixed x), fixceil(x))
-- AL_ALIAS(int ffloor(fixed x), fixfloor(x))
-- AL_ALIAS(fixed fcos(fixed x), fixcos(x))
-- AL_ALIAS(fixed fsin(fixed x), fixsin(x))
-- AL_ALIAS(fixed ftan(fixed x), fixtan(x))
-- AL_ALIAS(fixed facos(fixed x), fixacos(x))
-- AL_ALIAS(fixed fasin(fixed x), fixasin(x))
-- AL_ALIAS(fixed fatan(fixed x), fixatan(x))
-- AL_ALIAS(fixed fatan2(fixed y, fixed x), fixatan2(y, x))
-- AL_ALIAS(fixed fsqrt(fixed x), fixsqrt(x))
-- AL_ALIAS(fixed fhypot(fixed x, fixed y), fixhypot(x, y))
-- #endif
--
- #endif /* !defined ALLEGRO_SRC */
-
-
diff --git a/media-libs/allegro/files/allegro-4.4.2-static-func.patch b/media-libs/allegro/files/allegro-4.4.2-static-func.patch
deleted file mode 100644
index ac107d387d56..000000000000
--- a/media-libs/allegro/files/allegro-4.4.2-static-func.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-https://sourceforge.net/p/alleg/bugs/398/
-
---- a/addons/jpgalleg/src/decode.c 2008-02-13 14:04:57.000000000 +0100
-+++ b/addons/jpgalleg/src/decode.c 2015-09-03 14:57:57.888485546 +0200
-@@ -477,7 +477,7 @@
- * Reads a string of bits from the input stream and returns a properly signed
- * number given the category.
- */
--INLINE int
-+static INLINE int
- get_value(int category)
- {
- int result = get_bits(category);
diff --git a/media-libs/allegro/metadata.xml b/media-libs/allegro/metadata.xml
index 1a6f9338ec6e..8c4daf206b01 100644
--- a/media-libs/allegro/metadata.xml
+++ b/media-libs/allegro/metadata.xml
@@ -20,6 +20,7 @@ and a GUI.
Enables the VGA graphics driver
+ liballeg/allegro5
alleg
diff --git a/media-libs/gsound/Manifest b/media-libs/gsound/Manifest
index 228252384772..f845b6602fc2 100644
--- a/media-libs/gsound/Manifest
+++ b/media-libs/gsound/Manifest
@@ -1,3 +1,3 @@
DIST gsound-1.0.2.tar.xz 282068 BLAKE2B b85aa42c82c346b4541b38c971be46a35f0276d6cc34420cfc1a0e0ab0b4e25aa02829c17e8cb1d4258acc32d1d9c70a51dfac576046820f84e9ce9821c203ce SHA512 3525598aade28129d605e745cd6e8ef292220c446d59b34129056fa2aba7b4aa808c3efd29f4916056e20d5e4046b0edf2a6c9b97c272c95e59af7f8ef62e6b0
-EBUILD gsound-1.0.2-r1.ebuild 847 BLAKE2B b42bd8e7bc1b249ab0c8258ad58eadaf33c682712185dc8d86ea1952185992359e17d7ad404ee6b7cb794dabf37ca5d54b7cfb4623c42838ff192a86a3d46bae SHA512 c99775df1319f0b8851150f6243fa0d8dfa65de27ca352d301be70892adb4d938b4742c80c5330862a4f5c12684d39dda1161a2ee72181b6ddd130e633c22a41
+EBUILD gsound-1.0.2-r1.ebuild 858 BLAKE2B 6de21d34dd116ee34db8855f34fa21f3429a5e21dc0fc5a79f05e9cb8887d9d91e2e9e6b50ba8c0977a05f05870b0fd58390f72cd19562c7bf9b9630c25b4a13 SHA512 c92d35a6a48b94ef22c9f63cb354628d957ad59b47f3f3ba9ebddb265d8a4ec21e8200ed9ac6b9ecadc979fd29ea7e56a43548228c94c2d50ae7a53c4d316ab6
MISC metadata.xml 259 BLAKE2B 32f8c5208a55a1dda504b7df969127393a2c70e672aba383fcdc870de8fe778366d3dde3c3313bd043068d2e7831d1e18bad6fb428e82266fc2a630104e0a193 SHA512 fbef629394690b3a5608abc6344816f6acf1e8e2663f29949fd14a662c628f16fee77a1ec1641066806d143fb94c1571bc5b46b829dc53620af6956377fe15cc
diff --git a/media-libs/gsound/gsound-1.0.2-r1.ebuild b/media-libs/gsound/gsound-1.0.2-r1.ebuild
index bbb5fd9d2776..eff02a07beb6 100644
--- a/media-libs/gsound/gsound-1.0.2-r1.ebuild
+++ b/media-libs/gsound/gsound-1.0.2-r1.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
VALA_USE_DEPEND="vapigen"
inherit gnome2 vala
@@ -20,7 +20,8 @@ RDEPEND="
media-libs/libcanberra
introspection? ( >=dev-libs/gobject-introspection-1.2.9:= )
"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
>=dev-util/gtk-doc-am-1.20
virtual/pkgconfig
vala? ( $(vala_depend) )
diff --git a/media-libs/libaom/Manifest b/media-libs/libaom/Manifest
index f44e7230a703..28ab03c8cb19 100644
--- a/media-libs/libaom/Manifest
+++ b/media-libs/libaom/Manifest
@@ -5,7 +5,9 @@ AUX libdirpc2.patch 2481 BLAKE2B 6236c31784ebd76884e716857e665824f9b325a97c2cb8e
AUX pthread_lib2.patch 535 BLAKE2B 17eabab9e5d7b9d22b4f25ec8006e7e48bc3683b88f560bcb092234a1448ff47ae20d6ba04efb1af5742d7fc253acf9c944322acc8e8ed1acfad0b08df358eda SHA512 be19983342bae014409dd22c2e94ce11a5003a8ded3547a287ff71f53ef63ce1a1cfd6cdfbbfbf36deece2d3c1d9fb3e8e679598698a045229f79ba704976001
DIST libaom-1.0.0.tar.gz 2775454 BLAKE2B 09b891d365804f0c086785a00760af3191b40fc66fc752294e915b54454171fb47d3d1b037fb6d276727772ceec3177d78c14f90a2b01e28250d2de735bf02ec SHA512 131512ef286cb138047bb56dea54196f9a8d2b0d9f3d7689299f185338e5c03ee658b0cfe017a099f1a6be351a3a7157204dea70d2645a1d0a9249fd582c3fa4
DIST libaom-2.0.0.tar.gz 3497458 BLAKE2B ce3cfcf84e2471152998b8690ed5d85ffdf41e729fb86380f2849b9bc80deee0251bf0a1149b548ebcb6642fa6edac13658f3e9c55d5f50c905fb733f8312431 SHA512 8e72e6d1c2fbae7fd8afaea6e7d086f2b533006934ffa8e126d4e769d3fc1aa92703ce7cae4c6dfa5dd8050b2afdbe2eba54fbf4f49c1d11ae41cc9913379607
+DIST libaom-2.0.1.tar.xz 2391756 BLAKE2B 46d5938c49e720ec773d55e461f38d86a4307358fe8d3d9cc0e16e63dd52e54d41163bd14a583c059c9881a6980b1a8c54323b499dbef8301e9fa90094cd0e02 SHA512 2e7e2a9f456d51641ded44cb3ff639982e996276157d34e6a38895a68b7a8f36e209bcbad3dea7a04bd5b45b8cfe8a3bf202ab630f93388ea6dfb516f13ed82f
EBUILD libaom-1.0.0-r2.ebuild 2585 BLAKE2B 6be258a02782560bf5fd8ac982e710a90f51abf4bf6565a7ae59b1531d560e064e6a3333cd6021cfa75e07db58e82c1d23d98e2bea84d89eadc80ab57f62e7b9 SHA512 6b834f4de8a1173c76ca3e4231ccb15c38f6a29669129865cbb8da6aa182a51a9673b965d57ddf876a6a32cc8a9e336d920dfa1208955089e2bcd706b256cdd5
EBUILD libaom-2.0.0.ebuild 2309 BLAKE2B 58f2c55f85387c62abe184863c934979033c63f0b966664a11e13bddf4abf22ead334a94a645bb1cc28ae05ae58f9398cb462e9384f7b087e1ec1983257d1870 SHA512 6fa8b6e03dd556b84abebb271047c58b3936eb7e9479360d87f6f2f4b3bb7815911e43a10de03c4acc431a60897457a39de65ce4e2087ec238bf3afdfd8c285e
+EBUILD libaom-2.0.1.ebuild 2319 BLAKE2B 072057d02485e70a557be99c7e0eb0d52b8382a3cd11afd9c6ac375b830965cb1291488e7a599e4226d4fc553287b618b50ae1cfea27c2e935ce259c2870431a SHA512 4b284f8049d487a178b280c9bb18bfd757f4e8a9f0b673c4cda337085c0fb7192632b46540081967fd03dd9c982cd488155751bb008cc114d4d38f5e98cc8c35
EBUILD libaom-9999.ebuild 2413 BLAKE2B b2f16d9046d8ab50c57d76c7798a4e3f59277cbac662a0f1b3e3b4a3176b0ffd4f14dbfdede2ad651a7df19e637b19ce4f5c9aca7b48b097332055754474dfdd SHA512 ebab14a84e97a4a3a0f19f2a1836bccf10a6b1130ed49525b24ef22a73ab4da1dd99fb2e252c5fe8a0b93830b92a19a061bace04b2d7ac2989f6b50c86eaae76
MISC metadata.xml 223 BLAKE2B 1a772bb5add75cb4343b09bb2456adcd5e46896daaab4091ab64b667c5fa1a4adab0940015a3e755df3d6540b456694dc67ef9581d02d40c63b89290f8f83e43 SHA512 27b688917e0b1c4a75ea34c97d2d67d309573941492ab04124de11034f3b2796480f02408d86e2eba77ca2000722ea6606fe12a49622c04f9e2c1fa27b6fc8db
diff --git a/media-libs/libaom/libaom-2.0.1.ebuild b/media-libs/libaom/libaom-2.0.1.ebuild
new file mode 100644
index 000000000000..8a9361596daa
--- /dev/null
+++ b/media-libs/libaom/libaom-2.0.1.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS=cmake
+inherit cmake-multilib
+
+if [[ ${PV} == *9999* ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://aomedia.googlesource.com/aom"
+else
+ SRC_URI="https://dev.gentoo.org/~polynomial-c/dist/${P}.tar.xz"
+ S="${WORKDIR}"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+DESCRIPTION="Alliance for Open Media AV1 Codec SDK"
+HOMEPAGE="https://aomedia.org"
+
+LICENSE="BSD-2"
+SLOT="0/2"
+IUSE="doc examples"
+IUSE="${IUSE} cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3"
+IUSE="${IUSE} cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_avx cpu_flags_x86_avx2"
+IUSE="${IUSE} cpu_flags_arm_neon"
+
+REQUIRED_USE="
+ cpu_flags_x86_sse2? ( cpu_flags_x86_mmx )
+ cpu_flags_x86_ssse3? ( cpu_flags_x86_sse2 )
+"
+
+BDEPEND="abi_x86_32? ( dev-lang/yasm )
+ abi_x86_64? ( dev-lang/yasm )
+ abi_x86_x32? ( dev-lang/yasm )
+ x86-fbsd? ( dev-lang/yasm )
+ amd64-fbsd? ( dev-lang/yasm )
+ doc? ( app-doc/doxygen )
+"
+
+# the PATENTS file is required to be distributed with this package bug #682214
+DOCS=( PATENTS )
+
+multilib_src_configure() {
+ local mycmakeargs=(
+ -DENABLE_DOCS=$(multilib_native_usex doc ON OFF)
+ -DENABLE_EXAMPLES=$(multilib_native_usex examples ON OFF)
+ -DENABLE_NASM=OFF
+ -DENABLE_TESTS=OFF
+ -DENABLE_TOOLS=ON
+ -DENABLE_WERROR=OFF
+
+ # neon support is assumed to be always enabled on arm64
+ -DENABLE_NEON=$(usex cpu_flags_arm_neon ON $(usex arm64 ON OFF))
+ # ENABLE_DSPR2 / ENABLE_MSA for mips
+ -DENABLE_MMX=$(usex cpu_flags_x86_mmx ON OFF)
+ -DENABLE_SSE=$(usex cpu_flags_x86_sse ON OFF)
+ -DENABLE_SSE2=$(usex cpu_flags_x86_sse2 ON OFF)
+ -DENABLE_SSE3=$(usex cpu_flags_x86_sse3 ON OFF)
+ -DENABLE_SSSE3=$(usex cpu_flags_x86_ssse3 ON OFF)
+ -DENABLE_SSE4_1=$(usex cpu_flags_x86_sse4_1 ON OFF)
+ -DENABLE_SSE4_2=$(usex cpu_flags_x86_sse4_2 ON OFF)
+ -DENABLE_AVX=$(usex cpu_flags_x86_avx ON OFF)
+ -DENABLE_AVX2=$(usex cpu_flags_x86_avx2 ON OFF)
+ )
+ cmake_src_configure
+}
+
+multilib_src_install() {
+ if multilib_is_native_abi && use doc ; then
+ local HTML_DOCS=( "${BUILD_DIR}"/docs/html/. )
+ fi
+ cmake_src_install
+}
+
+multilib_src_install_all() {
+ find "${ED}" -type f \( -name "*.a" -o -name "*.la" \) -delete || die
+}
diff --git a/media-libs/libcanberra/Manifest b/media-libs/libcanberra/Manifest
index dc0b56f08469..98b5feb8c9be 100644
--- a/media-libs/libcanberra/Manifest
+++ b/media-libs/libcanberra/Manifest
@@ -1,5 +1,5 @@
AUX libcanberra-0.30-wayland.patch 2382 BLAKE2B bc2be1eb32541c80483538b8e3105f281023cee22a2a0f67c8210b8cfc97273f5323cf31e3b7955e8b944af1a414b30554c9dff7d2de97cb1bcfb13f4cd56baa SHA512 9822e67dea1b541fedb0fa9779cfcb101ba8bd24d9ff238af59920b937cb1f5fbe5854ee5e642ff53e65f8d2d0996f2c46be67a51a211d2e76ae89ae98ec553a
AUX libcanberra-gtk-module.sh 275 BLAKE2B d7f863f77983d4144035eefc7ce3abb4eb411ecc3aac5f5737b7ce0f44e42cf713b963a17c6a6afdaa95833eedaa510ccd9371056c2c6f0e805febf16c245e36 SHA512 6c945211ad9d461e5bdac209c83e0fc0c714eb194f6d57e4f18db1d904528fe845cd628572d0ab9eb4d53005c00073b376b6d718bcd0cddaeee83dc90042643d
DIST libcanberra-0.30.tar.xz 318960 BLAKE2B c90c6863738b103c256eeb0907060a0f74b73ef50ac0728d2114aa558a7a1ad7cbae4184860573d3fac0032eba77327a4de94c459b99a81c3dc19da0e98adfda SHA512 f7543582122256826cd01d0f5673e1e58d979941a93906400182305463d6166855cb51f35c56d807a56dc20b7a64f7ce4391368d24990c1b70782a7d0b4429c2
-EBUILD libcanberra-0.30-r5.ebuild 2466 BLAKE2B 043cbfe9b05aeb14966b9f5cd9e21f97de2826e5cb22ac9fd3b6282aba31153ffcbe247d903de91302aeca8646a32521909a601449fe6ef964f44d4ff3303f20 SHA512 a18c327f0ab13328f3ada80f27cb67a80225e49da4fd9c6dded7e92a93d579358620844999b7fcb6ea3020d93b2a7af727c578a8da1f3610d91897a5ece48c66
+EBUILD libcanberra-0.30-r5.ebuild 2459 BLAKE2B ee479bd5c14d066928d8c82d54ce09ef8fc02807112ce8022ec5f1d9255af4f7ee22c2db97159f473e303e6d2c540de696c2e17813c25617dae9a61f4d74729a SHA512 65714b83fff4e88e20a41441168870d0fe9d42bb5f5636d884f5a9f797aa7eac7a5491b4be35b692d71301e29b34b665c8dcf29ad539f055868ec0681c109d80
MISC metadata.xml 1730 BLAKE2B 8a3bef42abdbb7b229af42e8555eee2eb339275c55ffbfa89e62564d4ca28501de45fe99f6efbae91bcbd0c580ed99136bba751367deda70f137230ae7a5746d SHA512 14720aaeff663ff227dc7f59d1f69e636d8bbc7771dda7ed5a950c2ac75c09e0075223fad78b24feda994fa92dce8e5cfc186e08a3515db0645f4403641a9061
diff --git a/media-libs/libcanberra/libcanberra-0.30-r5.ebuild b/media-libs/libcanberra/libcanberra-0.30-r5.ebuild
index dd0bace15bfc..344dbc295877 100644
--- a/media-libs/libcanberra/libcanberra-0.30-r5.ebuild
+++ b/media-libs/libcanberra/libcanberra-0.30-r5.ebuild
@@ -1,8 +1,8 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="5"
-inherit autotools-multilib eutils ltprune systemd
+EAPI=7
+inherit multilib-minimal systemd
DESCRIPTION="Portable sound event library"
HOMEPAGE="http://git.0pointer.net/libcanberra.git/"
@@ -13,7 +13,7 @@ SLOT="0"
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
IUSE="alsa gnome gstreamer +gtk +gtk3 oss pulseaudio +sound tdb udev"
-COMMON_DEPEND="
+DEPEND="
dev-libs/libltdl:0[${MULTILIB_USEDEP}]
media-libs/libvorbis[${MULTILIB_USEDEP}]
alsa? (
@@ -31,22 +31,22 @@ COMMON_DEPEND="
pulseaudio? ( >=media-sound/pulseaudio-0.9.11[${MULTILIB_USEDEP}] )
tdb? ( sys-libs/tdb:=[${MULTILIB_USEDEP}] )
"
-RDEPEND="${COMMON_DEPEND}
+RDEPEND="${DEPEND}
gnome? (
gnome-base/dconf
gnome-base/gsettings-desktop-schemas )
sound? ( x11-themes/sound-theme-freedesktop )" # Required for index.theme wrt #323379
-DEPEND="${COMMON_DEPEND}
+BDEPEND="
app-arch/xz-utils
virtual/pkgconfig
"
REQUIRED_USE="udev? ( alsa )"
-src_prepare() {
+PATCHES=(
# gtk: Don't assume all GdkDisplays are GdkX11Displays: broadway/wayland (from 'master')
- epatch "${FILESDIR}/${PN}-0.30-wayland.patch"
-}
+ "${FILESDIR}/${PN}-0.30-wayland.patch"
+)
multilib_src_configure() {
ECONF_SOURCE="${S}" econf \
@@ -59,9 +59,9 @@ multilib_src_configure() {
$(use_enable gtk3) \
$(use_enable tdb) \
$(use_enable udev) \
- $(systemd_with_unitdir) \
--disable-lynx \
- --disable-gtk-doc
+ --disable-gtk-doc \
+ --with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
if multilib_is_native_abi; then
ln -s "${S}"/gtkdoc/html gtkdoc/html || die
@@ -75,7 +75,7 @@ multilib_src_install() {
multilib_src_install_all() {
einstalldocs
- prune_libtool_files --modules
+ find "${ED}" -type f -name '*.la' -delete || die
# This is needed for desktops different than GNOME, bug #520550
exeinto /etc/X11/xinit/xinitrc.d
diff --git a/media-libs/libexif/Manifest b/media-libs/libexif/Manifest
index ba6d90dbc1b5..3e847fce5d83 100644
--- a/media-libs/libexif/Manifest
+++ b/media-libs/libexif/Manifest
@@ -1,4 +1,4 @@
AUX libexif-0.6.13-pkgconfig.patch 255 BLAKE2B 397c0e88f951628e697cdd749936b3e4e676bccac2fb2bff2553b12d5978f03719175b9d25fa66bc06dd459e0f6671af48276d449de9b029202dfe7a3622fc85 SHA512 859c6b5bf179f315184f5f34a986761f113786792ff2e13461cf64ccf394dd2d7bd97215db0651d52819533cb918652d7eae9f18b2a913dd9ccf390cdf3adb65
DIST libexif-0.6.22_p20201105.tar.gz 1111695 BLAKE2B d4eb856ad950f8ae068a27088e54311789c7b8b646dd1c4851ef637b626015119b3b5ac9cbac58f9c79c37c07ba7d3e9a9a67dc52715187495aa824846ec2335 SHA512 5472bf2531d9147be5c6e681d0257325f6609d6aa3935243f887df0ab32e51242ff9d853fc2c183cf5c2709c89d5c52d8fecb9144343d6f959f4bed1062098ab
-EBUILD libexif-0.6.22_p20201105.ebuild 1472 BLAKE2B 200f622089f3d8cac1bf75e9e1963091611694ad689bdd2ced7f818e494f0dd55c6f8a85b608c95c969f48a8b8f054e88fd7b698a5e556ab7563e9b4e9f1c120 SHA512 c43b9826f17119db34e0233233e9bb7f1c42073052d23273f228607a9359e9ac42c8c5004abdf31a6a81750eeb36fd18ea51d95fd46d5bb23cd0dc7e7e738309
-MISC metadata.xml 311 BLAKE2B 0109881067d004082c81401909d6605a6bc792700cabf760db3e62bda628664915647427a3034dbfb52e3f047ce692ec6f279df06dbe76be014c1b676cf796ac SHA512 3b3e7a9c989e72b817e59c9c35ca6cb81dcd00eb27001095f139b1a297f7f1e80d32eee11573344d42881641920aa6a1a2bffc85892f92b347f0d8326d97f7a0
+EBUILD libexif-0.6.22_p20201105.ebuild 1437 BLAKE2B f1821fe0e0394b776515360f3c69f0feb4bf772d267108d655d688cb991bced0996043085be37306ceb732d34d6a6da2183aa8035ced3ac5834dcdf6686f82bb SHA512 949d70abe76e25d9615355e4ab70cef9ee4ba04f892a17908d4682b7b630e3f8574f0e7d8a8dc6e888c157cfa8cf83a5c7fafc7a6b5352f98c6b007d005ea7be
+MISC metadata.xml 366 BLAKE2B c9412873f5846ca7f8b8465063dcacc021e8e181f2c2f8382e68fd3fbf492b1b6ec361adb19e8c8e565497df7e564670f1ced283bbf70009fd70a465f34f2065 SHA512 7d174956f37394f2687f811a17815e3167cbf82e513ce6e146b77ce62f8aeff4d97413fc6e0d3cc96570f8b256450861ab92769c64cdf085805536beb6116c02
diff --git a/media-libs/libexif/libexif-0.6.22_p20201105.ebuild b/media-libs/libexif/libexif-0.6.22_p20201105.ebuild
index 1e9c5d0db4e8..52582a06be4e 100644
--- a/media-libs/libexif/libexif-0.6.22_p20201105.ebuild
+++ b/media-libs/libexif/libexif-0.6.22_p20201105.ebuild
@@ -7,7 +7,7 @@ inherit autotools multilib-minimal
COMMIT="9266d14b5ca4e29b970fa03272318e5f99386e06"
DESCRIPTION="Library for parsing, editing, and saving EXIF data"
-HOMEPAGE="https://libexif.github.io/ https://github.com/libexif/libexif"
+HOMEPAGE="https://libexif.github.io/"
SRC_URI="https://github.com/libexif/libexif/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
#SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PN}-${PV//./_}-release/${P}.tar.gz"
S="${WORKDIR}/${PN}-${COMMIT}"
diff --git a/media-libs/libexif/metadata.xml b/media-libs/libexif/metadata.xml
index f8874c54adaa..dd7cee55e09a 100644
--- a/media-libs/libexif/metadata.xml
+++ b/media-libs/libexif/metadata.xml
@@ -4,6 +4,7 @@
cpe:/a:curtis_galloway:libexif
+ libexif/libexif
libexif
diff --git a/media-libs/libjpeg-turbo/Manifest b/media-libs/libjpeg-turbo/Manifest
index 69030dfb83b8..294cca031128 100644
--- a/media-libs/libjpeg-turbo/Manifest
+++ b/media-libs/libjpeg-turbo/Manifest
@@ -7,4 +7,4 @@ DIST libjpeg-turbo-2.0.6.tar.gz 2192315 BLAKE2B 1e003b147bf5bc1fed59df1eb42c8bd8
DIST libjpeg8_8d-2.debian.tar.gz 14764 BLAKE2B e93d12afa062da28b717b540492221f70e8d9ccf3885371647cf85a2937f938ca723d4a27d5e1c5d79c26aa25dddf69b38754558851a1704172e8b52baf8e17c SHA512 8c5959fb7583a2d61e9442187f67b91b45e72d9dd30db3360d583a3b5d8e1a908db5659f760bdd455b3056e6ae3535b2fd3b847df3d58b140a1816b754003675
EBUILD libjpeg-turbo-1.5.3-r4.ebuild 2986 BLAKE2B ac2af06f2cf40f1f8ada21d841a46d8ba6fe8908ad19e9ab9e7c1f1eb607446f466e1c7aa79aedf856e08241ad6b61c7fbc5b5768b5a7ebf6d0fb481bc77332a SHA512 a6cbfbfbc7ccf0fd7f5e96935a378677f3435de7c3fd260c5912cabcb68a6820b18ade6347f8bfd9495ed4df5d7d5e4c944a0cf1f0021bcd71073925b3151cac
EBUILD libjpeg-turbo-2.0.6.ebuild 3074 BLAKE2B 28d83accdf1be5beb235cc6ada2b57eb4a3dca1fbdf20acedfaa979e46a90aca50d5db2577a4127710835db7f957e4c36c35859cee0dd98198109f4c692da447 SHA512 188498e6272f6755d00ed8b17dd214b821111b5624e56d48669052650377671111674f74fe393e79e66da6384364eb4baa90a9f7fa678b7eea9ec78d17e493f5
-MISC metadata.xml 475 BLAKE2B 00e12208a526ec05edd06341a1f582af2f6cca0ecf4f2de50ff6f1f8d0472c28e6aeaf3994825b90d821144ab351c1f4716a922ac6a454748c76e6c0791b5df2 SHA512 58fadedea7b2a97f0dac0fb0db13cece27a46dfcf2aa2c2bc25ee7ab5ebdd56315d4b465df9cf1b71e4c27588f1398837b5cdb2ea9e2c3caddfb768dd3be13b6
+MISC metadata.xml 566 BLAKE2B 57882cb0d2f18155c76966075cc2e39de863edd42a161077cf98fe070b045e95181851609b9b2e79134919b7c88504ffcaf6a43f1cfa913fd68a728c64dde514 SHA512 33c2184b17b1c3ace640fc94a2aca554fa3dcbdee1dd2f1546e2340f6490c89e5f2c35dc60c3b3410be80fb66abc015846c311f1f0722431345214262ca8d900
diff --git a/media-libs/libjpeg-turbo/metadata.xml b/media-libs/libjpeg-turbo/metadata.xml
index fa375260076d..617cdf8ffdd9 100644
--- a/media-libs/libjpeg-turbo/metadata.xml
+++ b/media-libs/libjpeg-turbo/metadata.xml
@@ -1,7 +1,10 @@
-
+
+ codec@gentoo.org
+ Gentoo Codec Project
+
Reflect ABI of libturbojpeg.so.
diff --git a/media-libs/libplacebo/Manifest b/media-libs/libplacebo/Manifest
index d50a6ce1724e..03a88f53c7f3 100644
--- a/media-libs/libplacebo/Manifest
+++ b/media-libs/libplacebo/Manifest
@@ -1,7 +1,9 @@
AUX libplacebo-2.43.0-vulkan-headers-1.2.140-compatibility.patch 2047 BLAKE2B aa2ca755fb95c9a7d3f55992507ce62340897ad9419a875fac31c8e392b9eab1f896dc8feedef96e804f0c938fede16d78a31517ccf5599efbdcb6d6af2773a6 SHA512 d7bfdb158c9f4e263d1937cb400417174a996a3f116231531d8f8c9266a57adf24ca86fd5ebeebb534c9985e89618fc11ddfcf8a9621729eb741a3bbd74212e6
DIST libplacebo-v2.43.0.tar.gz 356219 BLAKE2B b5f36dc4b7a0b35a47efc64064d0d7e9cf023dea2974fe355d29a6c835efa67b6f50ec500fa3ce50b932fef5d035a470f0adc8377cd274c5904fb4ffc303bb0c SHA512 c57463a9fcde1b259620fcb7ce6470b0d06e45ed837b4eca35ff0931e4c440ef613590485119ed21237f9cf3c3cdb617253f17699d9d252070f30d5dcbc233ab
+DIST libplacebo-v2.43.1.tar.gz 356913 BLAKE2B 1fbda35bcdaf96ebfb20a05bcec35fc03168def2a5fbf3aa4861187a67409d3b9ae28169de2cb6fa9a78e40a1d073982e58c7e36ac9468b5c7c227ef0bb0f96c SHA512 62463dfee6e6fd450395e42d7af2b6e0caa0b183c0d00f5ba0c5ddc893a47cdd0371d37fc72a7361228324b0dc9c55dd0309a5a7210cf753618fde18a094abcb
DIST libplacebo-v2.72.2.tar.gz 398314 BLAKE2B 59ce83d23c22fa1bc10d82b01b531ee82e3e40bf062adf7ea1d276a65c683c448797348a7a9ce234f92e0fd6c699903ae70f15df5d2e2779bec32db6b0b769e6 SHA512 0cb100350dbc81566a8363b0265bf89de8569b0313d1f1aa8ba621e39d7ee43a47ec9ab7827d01fdd2133c357983002412e67c2b2ba3616bd570f16e8e3ba135
EBUILD libplacebo-2.43.0.ebuild 1565 BLAKE2B a698e4b9206214bec581b84ae7b9b6d9415869ff34845f94e673a60e006bc3649389a1fccf092e5eb05318ba5e906af7a688bfc20836acbb1efcd3cb6633acee SHA512 9b35fe6eab88288b78789e78c53a6baeacd684e52010845d0194e4349ee126eaa8701aad7e7714bad051d287b586263efe4846f5ded0f156fc04db5c68af3eee
+EBUILD libplacebo-2.43.1.ebuild 1580 BLAKE2B 1422e2a236e6f296a00108eb9fa1516289607f30f443c56b905157e112608c9bdae8a4a6451200a579c413e08c08eac986f91481eeaed14a0774dde0ca1df3ad SHA512 2cfef936484d384e9917f0330ee2af8ec439c2e7af9771e7e0ae5086a4cb7a8dad3fd6844d72b787d6dcd976b988c2be96965c64988aa11f593b26f01c3b82ba
EBUILD libplacebo-2.72.2.ebuild 1889 BLAKE2B 6d0724bad61f28633b24a61782774d889ee13f33d0e0942b17651defadb19a9af77a0c8f430e746574bdd38d7b2f107ae9869ec1f3001b5f8fd76fdcda7f70ca SHA512 07d8dc86c3df956a34901bcf0e24a1f4455b1781d1357d636b8e18bfcadd37e3210a97e20f1ff7defbba767192d1bc5e03af735cf753ebbe97102a575a15c326
EBUILD libplacebo-9999.ebuild 1924 BLAKE2B 5ed7fea860e50f3b0d568518ab853aaa6fe58576f9a2cd53efd5dd36c5d0968b0c927df2894ec8c5b9aabdee77a218d7f9578cfce5b07f601fcbc88da3699812 SHA512 d4d065dabde0e25e18f63afaee3086727667c27de2a510fee1420dcf36608da78864e74a3f4df58eddb72c9bc47b9f1b8e8ff54809a31657ff14d368f38eb8a3
MISC metadata.xml 807 BLAKE2B f04df70a40523ad668bfa7dda7c841ce098f2105d2bc94ab6291bb194bf1fec18445b779952db33614d685ee0964c7ac6b7666b3d8cf89f8bd9391b1ccd2c553 SHA512 48d5e93ca7e964d80dc579789c6f626f9590d102b451c4f0fced538aed1301e0cb7f93fce4d03deaddb72dcad22489aa3846d8fa8ac443fcdbc4fcb90ef19040
diff --git a/media-libs/libplacebo/libplacebo-2.43.1.ebuild b/media-libs/libplacebo/libplacebo-2.43.1.ebuild
new file mode 100644
index 000000000000..ee21a12eceb4
--- /dev/null
+++ b/media-libs/libplacebo/libplacebo-2.43.1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ "${PV}" == "9999" ]]; then
+ EGIT_REPO_URI="https://code.videolan.org/videolan/libplacebo.git"
+ inherit git-r3
+else
+ KEYWORDS="~amd64 ~ppc64 ~x86"
+ SRC_URI="https://code.videolan.org/videolan/libplacebo/-/archive/v${PV}/libplacebo-v${PV}.tar.gz"
+ S="${WORKDIR}/${PN}-v${PV}"
+fi
+
+inherit meson multilib-minimal
+
+DESCRIPTION="Reusable library for GPU-accelerated image processing primitives"
+HOMEPAGE="https://code.videolan.org/videolan/libplacebo"
+
+LICENSE="LGPL-2.1+"
+SLOT="0/$(ver_cut 2)" # libplacebo.so version
+IUSE="glslang lcms +opengl +shaderc test +vulkan"
+REQUIRED_USE="vulkan? ( || ( glslang shaderc ) )"
+
+RDEPEND="glslang? ( dev-util/glslang[${MULTILIB_USEDEP}] )
+ lcms? ( media-libs/lcms:2[${MULTILIB_USEDEP}] )
+ opengl? ( media-libs/libepoxy[${MULTILIB_USEDEP}] )
+ shaderc? ( >=media-libs/shaderc-2017.2[${MULTILIB_USEDEP}] )
+ vulkan? (
+ dev-util/vulkan-headers
+ media-libs/vulkan-loader[${MULTILIB_USEDEP}]
+ )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+ "${FILESDIR}"/libplacebo-2.43.0-vulkan-headers-1.2.140-compatibility.patch
+)
+
+multilib_src_configure() {
+ local emesonargs=(
+ $(meson_feature glslang)
+ $(meson_feature lcms)
+ $(meson_feature opengl)
+ $(meson_feature shaderc)
+ $(meson_feature vulkan)
+ $(meson_use test tests)
+ )
+ meson_src_configure
+}
+
+multilib_src_compile() {
+ meson_src_compile
+}
+
+multilib_src_test() {
+ meson_src_test -t 10
+}
+
+multilib_src_install() {
+ meson_src_install
+}
diff --git a/media-libs/openjpeg/Manifest b/media-libs/openjpeg/Manifest
index 2e3293d56035..6717a506e69c 100644
--- a/media-libs/openjpeg/Manifest
+++ b/media-libs/openjpeg/Manifest
@@ -1,6 +1,6 @@
AUX openjpeg-2.3.1-CVE-2020-6851.patch 1240 BLAKE2B 440efbd4960def0c98cc5d1874c2261ae263d3a398bf1ed14cb1bdc151ba2351c8d9899d498ea4c103acbbfb85924f6e1ba1690c7d6be46b444946f18710b82b SHA512 c8ffc926d91392b38250fd4e00fff5f93fbf5e17487d0e4a0184c9bd191aa2233c5c5dcf097dd62824714097bba2d8cc865bed31193d1a072aa954f216011297
AUX openjpeg-2.3.1-CVE-2020-8112.patch 2156 BLAKE2B 2a5177faaad8d5d1d32e9ddabdd372b625bcddb01e532cbe418b718560729a09e332eefc066da05b1169feda056d9a518858cce4b252b28a2005ca6763d5b3d7 SHA512 9659e04087e0d80bf53555e9807aae59205adef2d49d7a49e05bf250c484a2e92132d471ec6076e57ca69b5ce98fd81462a6a8c01205ca7096781eec06e401cc
-AUX openjpeg-2.3.1-gnuinstalldirs.patch 19036 BLAKE2B a387c87b543cf3453a6f481b50b958b721105aaadb974cd7ea1dd24bfa15d4b792bfa3b0d894abf2ce4b20c5bc15b077329c0658afd136990daea3471805833a SHA512 1a99381781beea259f96fdc4b310aac41a3c1b6c21320500c5e4642ce222eae09f7f728b7748ad627bb93fd7450ac16c5cbe33853525695576d28feaff524698
+AUX openjpeg-2.3.1-gnuinstalldirs.patch 19036 BLAKE2B 263542dad18e40fca5e890da50c6ff756cbe1f5318fa142eda05af9ab7b65c7616c25505e0ef36047665f82b6498e5621cb6fe5dcbeaa0f7349fa641b50d6cac SHA512 5ef0dd098c00ab02284731999e5448997364e84e6b1a85028358b8a6cd8c8ba7cec08c9950d78e7cd7c4ac1ec6f0d09e178082a1c34de3bddfc9909c63f10a1f
AUX openjpeg-2.3.1-libtiff-4.1-compat.patch 12014 BLAKE2B 1ffc64b81a59abce759bac18c3aef600df21dab3cc135598223d7338f76ab0db690c612c1e955275db02f55392d58864b594c601707136d107879ad55474f79b SHA512 5f3a7632f8792fdb6b202f7613537a519d77239f9fa5c6791362b5cbf4870587d4698a2f44b9556dc550f659dd1f9ad02a76726acd2a2f80b6bbb211823716e1
AUX openjpeg-2.4.0-gnuinstalldirs.patch 15977 BLAKE2B d1036c329d2f1b829e0bc019d2c761acf2f09a061ccf60421797f89005d194279eb880096d151a379fe3ee7edc36a0d3bceeabae0e8c7d9546baed4b7218d800 SHA512 8563a50c86c10b4306e4fb4a2077094268a58e0e2a468702fdbbccbd5f6db59d2f5a67f772dae17066611c09da0c4baeb6980d3aeddfd0690108336d70f39670
DIST openjpeg-1.5.2.tar.gz 1385702 BLAKE2B 936ab6e0fb48f2839df13113c716c39b9572bd590206cd823dedccfd4001444d73a81ccbf82616a40a35ad8b1fae8d2f08d7c265a771d9d9ef413beac5e84ac1 SHA512 b945cf4f8b5e3227a0c07120c94b0ed5bf30c901de73059ee1d47975f46744fb62bbe84cdb2917c6431128f400020874eb07160af870b5448ced897998b08862
diff --git a/media-libs/openjpeg/files/openjpeg-2.3.1-gnuinstalldirs.patch b/media-libs/openjpeg/files/openjpeg-2.3.1-gnuinstalldirs.patch
index b0b2666c7220..7eb393b8922f 100644
--- a/media-libs/openjpeg/files/openjpeg-2.3.1-gnuinstalldirs.patch
+++ b/media-libs/openjpeg/files/openjpeg-2.3.1-gnuinstalldirs.patch
@@ -1,5 +1,5 @@
From fecc8e9e23f78de94c41bc641b3e5b9e9a84560b Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner
+From: Andreas Sturmlechner
Date: Thu, 11 Apr 2019 13:10:57 +0200
Subject: [PATCH] Use GNUInstallDirs for standard installation directories
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index ca8680b03d48..6f11b6e89807 100644
Binary files a/media-sound/Manifest.gz and b/media-sound/Manifest.gz differ
diff --git a/media-sound/beets/Manifest b/media-sound/beets/Manifest
index 5455e672b0b9..cb90e8d8b0ce 100644
--- a/media-sound/beets/Manifest
+++ b/media-sound/beets/Manifest
@@ -1,4 +1,6 @@
+AUX 1.4.9-0001-compatibility-with-breaking-changes-to-the-ast-modul.patch 2123 BLAKE2B fea2eb593c8be68d3cd336a4bf56346c777ba651fdb98cfe6f9063a087428ce2749793ec61f109b2fea40dd8cc44ceb19b97d308c4c69c267b2993836b2b7ae6 SHA512 bf3ef299d66e7db79fcc0f7c4cd5abfbb041e6cea4bf06f02e498d3edf7495cd92f01191865af6a5bb40b064f0659d5cf80df7a42d14976e3e963ab94e113bdd
+AUX 1.4.9-0002-Disable-test_completion.patch 2879 BLAKE2B 7f1b21d92ec93e3a2606a4c3146b0e6fe343d4a437dfdb13aa60e0bbbf59f2959fee39f4d5bdb620fe57670e01a0963ad9eea3cf0309b3ea516e0931e9383c19 SHA512 2f6b5636ad3a16e70438fd2c1b62952416225dcc9acca686b1dc19ba4c2c5dbed4807f3f597e212d23ddf12de0fb0f315729da9ca86fbbc6766f4840dc83a524
DIST beets-1.4.9.tar.gz 1494459 BLAKE2B 2daf77caf395143813c8b288fc376b5aec01d49281d40ba5942daf9941891146d698a1517ced958e480c6f253eadb6a7e09029e079c97e6cc17d44ac18fa0e7b SHA512 616bad4ca3ecdd05d2f59846fd67215f476ce89cc34d63bc6351efcbaf1e33e5ca783cb8a716e8597b56a7e08e6a6dc15e64b51e89dd786bfb6c5d847f66de5a
-EBUILD beets-1.4.9-r2.ebuild 4825 BLAKE2B 0c33fb87a1c6aa41b1d8ced8aacfb103ab838b39c8718d7f85ae8571d906c22fed3e5362a322009a7483e08bd742a30265ccfd1c346674f32eeccd8253661bbb SHA512 8dc35097441730c9be57364488b9ce7e09e7b8e516d2863888e2cc6805336bff6d0f744ec2bd80150e605513fbd9dfb0ed9050eee730ecaa128f2d6f71e0726f
-EBUILD beets-9999.ebuild 4939 BLAKE2B e2cd86d2abf9a8ada1e1421c62199b91ee10eae10f6bc4d35c780b07aa9a8d483863eb4dabbed79c8728c744ecb0a3acf6a9e3cd2073ad8f8bfc5da069678c1e SHA512 6f436b1e1487d07069f4d5a198c9671f1a20c482837ecff8ed6203f095c931ac319fc39aa7d92f5cb0057d09bfa3d22a3250508b02f03d074378a50329868986
-MISC metadata.xml 2696 BLAKE2B 7b78276fdc266ce63a0a89b6234119b01dd8bc39509610e66310683a5f3ad862a598f33243c699eed4ce56bb06630793e8920dc3651c771127ecbeb3b52ed9f4 SHA512 cba68bb5facea99bab3e50051f60c51a4ecb9200324925c7a4bbdaf9b7574c27db29b63ae88db1224240ebe33231565fab658196e199ea7a10c95ff8fc80ed5f
+EBUILD beets-1.4.9-r3.ebuild 4457 BLAKE2B ccb615ef9433434664715bc7fc0fa53d2acc83f490265f290fb39f9bb095abb6d0b28d1f3a989da7664297374351017500f7112aa94d910fd99d4320f10d1e85 SHA512 6ea2c348d84668cd897534a21f0265dd81af57c8b7d40aaa4fd2896cd55614f8eeee876af4ada7872c57bfcc964b0d8c6fcedf1410e61f36756a5b79cae146c3
+EBUILD beets-9999.ebuild 4457 BLAKE2B ccb615ef9433434664715bc7fc0fa53d2acc83f490265f290fb39f9bb095abb6d0b28d1f3a989da7664297374351017500f7112aa94d910fd99d4320f10d1e85 SHA512 6ea2c348d84668cd897534a21f0265dd81af57c8b7d40aaa4fd2896cd55614f8eeee876af4ada7872c57bfcc964b0d8c6fcedf1410e61f36756a5b79cae146c3
+MISC metadata.xml 2993 BLAKE2B f46b84984f6cfce8b0ce3e2589e127a5febe2536ae75eb4d7527c99cbf2bba6e155ecd4df3fd5b5348dae524287c8b542885a69a7b1790303352076ea29022c3 SHA512 28dc8f6044ccf6ceced2e9f29c1c4faba9bcaddff0608b1e3f8e14c612fac975c89bfbfe4368a6ff8e6f1f0ca2fbc2edbb25f8e7e1e7a2b1e3cf790587f39a4e
diff --git a/media-sound/beets/beets-1.4.9-r2.ebuild b/media-sound/beets/beets-1.4.9-r3.ebuild
similarity index 54%
rename from media-sound/beets/beets-1.4.9-r2.ebuild
rename to media-sound/beets/beets-1.4.9-r3.ebuild
index 6fa58e40129d..d07f7f6efe20 100644
--- a/media-sound/beets/beets-1.4.9-r2.ebuild
+++ b/media-sound/beets/beets-1.4.9-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -22,33 +22,23 @@ else
fi
DESCRIPTION="Media library management system for obsessive-compulsive music geeks"
-HOMEPAGE="http://beets.io/ https://pypi.org/project/beets/"
+HOMEPAGE="https://beets.io/ https://pypi.org/project/beets/"
LICENSE="MIT"
SLOT="0"
-IUSE="badfiles chromaprint discogs doc ffmpeg gstreamer icu lastfm mpd replaygain test thumbnail webserver"
+IUSE="badfiles chromaprint cors discogs doc ffmpeg gstreamer icu lastfm mpd replaygain test thumbnail webserver"
-RDEPEND="${DEPEND}"
-DEPEND="
+RDEPEND="
$(python_gen_cond_dep '
- test? (
- dev-python/wheel[${PYTHON_MULTI_USEDEP}]
- dev-python/beautifulsoup[${PYTHON_MULTI_USEDEP}]
- dev-python/flask[${PYTHON_MULTI_USEDEP}]
- dev-python/mock[${PYTHON_MULTI_USEDEP}]
- dev-python/rarfile[${PYTHON_MULTI_USEDEP}]
- dev-python/responses[${PYTHON_MULTI_USEDEP}]
- dev-python/pyxdg[${PYTHON_MULTI_USEDEP}]
- )
>=dev-python/jellyfish-0.7.1[${PYTHON_MULTI_USEDEP}]
dev-python/munkres[${PYTHON_MULTI_USEDEP}]
+ >=media-libs/mutagen-1.33[${PYTHON_MULTI_USEDEP}]
>=dev-python/python-musicbrainz-ngs-0.4[${PYTHON_MULTI_USEDEP}]
dev-python/pyyaml[${PYTHON_MULTI_USEDEP}]
- dev-python/requests[${PYTHON_MULTI_USEDEP}]
dev-python/requests-oauthlib[${PYTHON_MULTI_USEDEP}]
+ dev-python/requests[${PYTHON_MULTI_USEDEP}]
>=dev-python/six-1.9[${PYTHON_MULTI_USEDEP}]
dev-python/unidecode[${PYTHON_MULTI_USEDEP}]
- >=media-libs/mutagen-1.33[${PYTHON_MULTI_USEDEP}]
badfiles? (
media-libs/flac
media-sound/mp3val
@@ -57,14 +47,22 @@ DEPEND="
dev-python/pyacoustid[${PYTHON_MULTI_USEDEP}]
media-libs/chromaprint[tools]
)
- discogs? ( dev-python/discogs-client[${PYTHON_MULTI_USEDEP}] )
- ffmpeg? ( media-video/ffmpeg:0[encode] )
+ discogs? (
+ dev-python/discogs-client[${PYTHON_MULTI_USEDEP}]
+ )
+ ffmpeg? (
+ media-video/ffmpeg:0[encode]
+ )
gstreamer? (
- media-libs/gst-plugins-good:1.0
media-libs/gst-plugins-bad:1.0
+ media-libs/gst-plugins-good:1.0
+ )
+ icu? (
+ dev-db/sqlite[icu]
+ )
+ lastfm? (
+ dev-python/pylast[${PYTHON_MULTI_USEDEP}]
)
- icu? ( dev-db/sqlite[icu] )
- lastfm? ( dev-python/pylast[${PYTHON_MULTI_USEDEP}] )
mpd? (
dev-python/bluelet[${PYTHON_MULTI_USEDEP}]
dev-python/python-mpd[${PYTHON_MULTI_USEDEP}]
@@ -85,10 +83,34 @@ DEPEND="
)
webserver? (
dev-python/flask[${PYTHON_MULTI_USEDEP}]
- dev-python/flask-cors[${PYTHON_MULTI_USEDEP}]
+ cors? (
+ dev-python/flask-cors[${PYTHON_MULTI_USEDEP}]
+ )
+ )
+ ')"
+DEPEND="
+ ${RDEPEND}
+"
+BDEPEND="
+ doc? (
+ dev-python/sphinx
+ )
+ $(python_gen_cond_dep '
+ test? (
+ dev-python/beautifulsoup[${PYTHON_MULTI_USEDEP}]
+ dev-python/flask[${PYTHON_MULTI_USEDEP}]
+ dev-python/mock[${PYTHON_MULTI_USEDEP}]
+ dev-python/pyxdg[${PYTHON_MULTI_USEDEP}]
+ dev-python/rarfile[${PYTHON_MULTI_USEDEP}]
+ dev-python/responses[${PYTHON_MULTI_USEDEP}]
+ dev-python/wheel[${PYTHON_MULTI_USEDEP}]
)
')"
-BDEPEND="dev-python/sphinx"
+
+PATCHES=(
+ "${FILESDIR}/${PV}-0001-compatibility-with-breaking-changes-to-the-ast-modul.patch"
+ "${FILESDIR}/${PV}-0002-Disable-test_completion.patch"
+)
DOCS=( README.rst docs/changelog.rst )
@@ -97,76 +119,44 @@ distutils_enable_tests pytest
python_prepare_all() {
distutils-r1_python_prepare_all
- rm_use_plugins() {
- [[ -n "${1}" ]] || die "rm_use_plugins: No use option given"
- local use=${1}
- local plugins=${use}
- use ${use} && return
- einfo "no ${use}:"
- [[ $# -gt 1 ]] && plugins="${@:2}"
- for arg in ${plugins[@]}; do
- einfo " removing ${arg}"
- if [[ -e "beetsplug/${arg}.py" ]]; then
- rm beetsplug/${arg}.py || die "Unable to remove ${arg} plugin"
- fi
- if [[ -d "beetsplug/${arg}" ]]; then
- rm -r beetsplug/${arg} || die "Unable to remove ${arg} plugin"
- fi
- sed -e "s:'beetsplug.${arg}',::" -i setup.py || \
- die "Unable to disable ${arg} plugin "
- done
- }
-
- rm_use_plugins chromaprint chroma
- rm_use_plugins ffmpeg convert
- rm_use_plugins icu loadext
- rm_use_plugins lastfm lastgenre lastimport
- rm_use_plugins mpd bpd mpdstats
- rm_use_plugins webserver web
- rm_use_plugins thumbnail thumbnails
-
- # remove plugins that do not have appropriate dependencies installed
- for flag in badfiles discogs replaygain; do
- rm_use_plugins ${flag}
- done
-
+ rm test/test_art.py || die "Failed to remove test_art.py"
+ rm test/test_discogs.py || die "Failed to remove test_discogs.py"
+ rm test/test_embyupdate.py || die "Failed to remove test_embyupdate.py"
+ rm test/test_lastgenre.py || die "Failed to remove test_lastgenre.py"
+ rm test/test_spotify.py || die "Failed to remove test_spotify.py"
+ # Not working and dropped in master
+ rm test/test_mediafile.py || die "Failed to remove test_mediafile.py"
+ if ! use ffmpeg; then
+ rm test/test_convert.py || die "Failed to remove test_convert.py"
+ fi
if ! use mpd; then
- rm test/test_player.py || die
- rm test/test_mpdstats.py || die
+ rm test/test_player.py || die "Failed to remove test_player.py"
+ rm test/test_mpdstats.py || die "Failed to remove test_mpdstats.py"
+ fi
+ if ! use replaygain; then
+ rm test/test_replaygain.py || die "Failed to remove test_replaygain.py"
+ fi
+ if ! use thumbnail; then
+ rm test/test_thumbnails.py || die "Failed to remove test_thumbnails.py"
fi
if ! use webserver; then
rm test/test_web.py || die "Failed to remove test_web.py"
fi
- if use test; then
- # Those test need network
- rm test/test_art.py || die
- rm test/test_discogs.py || die
- rm test/test_embyupdate.py || die
- rm test/test_lastgenre.py || die
- rm test/test_spotify.py || die
- # rm test/test_plexupdate.py
- rm test/test_thumbnails.py || die
- # Not working
- rm test/test_replaygain.py || die
- # Not working
- rm test/test_convert.py || die
- # Not working and dropped in master
- rm test/test_mediafile.py || die
- fi
}
python_compile_all() {
- esetup.py build_sphinx -b man --build-dir=docs/build
use doc && esetup.py build_sphinx -b html --build-dir=docs/build
}
python_install_all() {
distutils-r1_python_install_all
- doman docs/build/man/*
+ doman man/*
use doc && local HTML_DOCS=( docs/build/html/. )
einstalldocs
- "${D}$(python_get_scriptdir)/beet" completion > "${T}/beet.bashcomp"
- newbashcomp "${T}/beet.bashcomp" beet
+ ${PYTHON} "${ED}/usr/bin/beet" completion > "${T}/beet.bash" || die
+ newbashcomp "${T}/beet.bash" beet
+ insinto /usr/share/zsh/site-functions
+ newins "${WORKDIR}/${P}/extra/_beet" _beet
}
diff --git a/media-sound/beets/beets-9999.ebuild b/media-sound/beets/beets-9999.ebuild
index 01d7ec3b1be1..d07f7f6efe20 100644
--- a/media-sound/beets/beets-9999.ebuild
+++ b/media-sound/beets/beets-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -6,6 +6,7 @@ EAPI=7
DISTUTILS_SINGLE_IMPL=1
PYTHON_COMPAT=( python3_{6,7,8} )
PYTHON_REQ_USE="sqlite"
+DISTUTILS_USE_SETUPTOOLS=rdepend
inherit distutils-r1 bash-completion-r1
@@ -21,36 +22,23 @@ else
fi
DESCRIPTION="Media library management system for obsessive-compulsive music geeks"
-HOMEPAGE="http://beets.io/ https://pypi.org/project/beets/"
+HOMEPAGE="https://beets.io/ https://pypi.org/project/beets/"
LICENSE="MIT"
SLOT="0"
-IUSE="badfiles chromaprint discogs doc ffmpeg gstreamer icu lastfm mpd replaygain test thumbnail webserver"
+IUSE="badfiles chromaprint cors discogs doc ffmpeg gstreamer icu lastfm mpd replaygain test thumbnail webserver"
-RDEPEND="${DEPEND}"
-DEPEND="
+RDEPEND="
$(python_gen_cond_dep '
- test? (
- dev-python/wheel[${PYTHON_MULTI_USEDEP}]
- dev-python/beautifulsoup[${PYTHON_MULTI_USEDEP}]
- dev-python/flask[${PYTHON_MULTI_USEDEP}]
- dev-python/mock[${PYTHON_MULTI_USEDEP}]
- dev-python/rarfile[${PYTHON_MULTI_USEDEP}]
- dev-python/responses[${PYTHON_MULTI_USEDEP}]
- dev-python/pyxdg[${PYTHON_MULTI_USEDEP}]
- dev-python/requests-oauthlib[${PYTHON_MULTI_USEDEP}]
- )
>=dev-python/jellyfish-0.7.1[${PYTHON_MULTI_USEDEP}]
dev-python/munkres[${PYTHON_MULTI_USEDEP}]
+ >=media-libs/mutagen-1.33[${PYTHON_MULTI_USEDEP}]
>=dev-python/python-musicbrainz-ngs-0.4[${PYTHON_MULTI_USEDEP}]
dev-python/pyyaml[${PYTHON_MULTI_USEDEP}]
- dev-python/requests[${PYTHON_MULTI_USEDEP}]
dev-python/requests-oauthlib[${PYTHON_MULTI_USEDEP}]
+ dev-python/requests[${PYTHON_MULTI_USEDEP}]
>=dev-python/six-1.9[${PYTHON_MULTI_USEDEP}]
dev-python/unidecode[${PYTHON_MULTI_USEDEP}]
- >=media-libs/mutagen-1.33[${PYTHON_MULTI_USEDEP}]
- >=dev-python/confuse-1.0.0[${PYTHON_MULTI_USEDEP}]
- >=dev-python/mediafile-0.2.0[${PYTHON_MULTI_USEDEP}]
badfiles? (
media-libs/flac
media-sound/mp3val
@@ -59,14 +47,22 @@ DEPEND="
dev-python/pyacoustid[${PYTHON_MULTI_USEDEP}]
media-libs/chromaprint[tools]
)
- discogs? ( dev-python/discogs-client[${PYTHON_MULTI_USEDEP}] )
- ffmpeg? ( media-video/ffmpeg:0[encode] )
+ discogs? (
+ dev-python/discogs-client[${PYTHON_MULTI_USEDEP}]
+ )
+ ffmpeg? (
+ media-video/ffmpeg:0[encode]
+ )
gstreamer? (
- media-libs/gst-plugins-good:1.0
media-libs/gst-plugins-bad:1.0
+ media-libs/gst-plugins-good:1.0
+ )
+ icu? (
+ dev-db/sqlite[icu]
+ )
+ lastfm? (
+ dev-python/pylast[${PYTHON_MULTI_USEDEP}]
)
- icu? ( dev-db/sqlite[icu] )
- lastfm? ( dev-python/pylast[${PYTHON_MULTI_USEDEP}] )
mpd? (
dev-python/bluelet[${PYTHON_MULTI_USEDEP}]
dev-python/python-mpd[${PYTHON_MULTI_USEDEP}]
@@ -87,14 +83,35 @@ DEPEND="
)
webserver? (
dev-python/flask[${PYTHON_MULTI_USEDEP}]
- dev-python/flask-cors[${PYTHON_MULTI_USEDEP}]
+ cors? (
+ dev-python/flask-cors[${PYTHON_MULTI_USEDEP}]
+ )
)
')"
+DEPEND="
+ ${RDEPEND}
+"
BDEPEND="
+ doc? (
+ dev-python/sphinx
+ )
$(python_gen_cond_dep '
- dev-python/sphinx[${PYTHON_MULTI_USEDEP}]
+ test? (
+ dev-python/beautifulsoup[${PYTHON_MULTI_USEDEP}]
+ dev-python/flask[${PYTHON_MULTI_USEDEP}]
+ dev-python/mock[${PYTHON_MULTI_USEDEP}]
+ dev-python/pyxdg[${PYTHON_MULTI_USEDEP}]
+ dev-python/rarfile[${PYTHON_MULTI_USEDEP}]
+ dev-python/responses[${PYTHON_MULTI_USEDEP}]
+ dev-python/wheel[${PYTHON_MULTI_USEDEP}]
+ )
')"
+PATCHES=(
+ "${FILESDIR}/${PV}-0001-compatibility-with-breaking-changes-to-the-ast-modul.patch"
+ "${FILESDIR}/${PV}-0002-Disable-test_completion.patch"
+)
+
DOCS=( README.rst docs/changelog.rst )
distutils_enable_tests pytest
@@ -102,74 +119,44 @@ distutils_enable_tests pytest
python_prepare_all() {
distutils-r1_python_prepare_all
- rm_use_plugins() {
- [[ -n "${1}" ]] || die "rm_use_plugins: No use option given"
- local use=${1}
- local plugins=${use}
- use ${use} && return
- einfo "no ${use}:"
- [[ $# -gt 1 ]] && plugins="${@:2}"
- for arg in ${plugins[@]}; do
- einfo " removing ${arg}"
- if [[ -e "beetsplug/${arg}.py" ]]; then
- rm beetsplug/${arg}.py || die "Unable to remove ${arg} plugin"
- fi
- if [[ -d "beetsplug/${arg}" ]]; then
- rm -r beetsplug/${arg} || die "Unable to remove ${arg} plugin"
- fi
- sed -e "s:'beetsplug.${arg}',::" -i setup.py || \
- die "Unable to disable ${arg} plugin "
- done
- }
-
- rm_use_plugins chromaprint chroma
- rm_use_plugins ffmpeg convert
- rm_use_plugins icu loadext
- rm_use_plugins lastfm lastgenre lastimport
- rm_use_plugins mpd bpd mpdstats
- rm_use_plugins webserver web
- rm_use_plugins thumbnail thumbnails
-
- # remove plugins that do not have appropriate dependencies installed
- for flag in badfiles discogs replaygain; do
- rm_use_plugins ${flag}
- done
-
+ rm test/test_art.py || die "Failed to remove test_art.py"
+ rm test/test_discogs.py || die "Failed to remove test_discogs.py"
+ rm test/test_embyupdate.py || die "Failed to remove test_embyupdate.py"
+ rm test/test_lastgenre.py || die "Failed to remove test_lastgenre.py"
+ rm test/test_spotify.py || die "Failed to remove test_spotify.py"
+ # Not working and dropped in master
+ rm test/test_mediafile.py || die "Failed to remove test_mediafile.py"
+ if ! use ffmpeg; then
+ rm test/test_convert.py || die "Failed to remove test_convert.py"
+ fi
if ! use mpd; then
- rm test/test_player.py || die
- rm test/test_mpdstats.py || die
+ rm test/test_player.py || die "Failed to remove test_player.py"
+ rm test/test_mpdstats.py || die "Failed to remove test_mpdstats.py"
+ fi
+ if ! use replaygain; then
+ rm test/test_replaygain.py || die "Failed to remove test_replaygain.py"
+ fi
+ if ! use thumbnail; then
+ rm test/test_thumbnails.py || die "Failed to remove test_thumbnails.py"
fi
if ! use webserver; then
rm test/test_web.py || die "Failed to remove test_web.py"
fi
- if use test; then
- # Those test need network
- rm test/test_art.py || die
- rm test/test_discogs.py || die
- rm test/test_embyupdate.py || die
- rm test/test_lastgenre.py || die
- rm test/test_spotify.py || die
- # rm test/test_plexupdate.py
- rm test/test_thumbnails.py || die
- # Not working
- rm test/test_replaygain.py || die
- # Not working
- rm test/test_convert.py || die
- fi
}
python_compile_all() {
- esetup.py build_sphinx -b man --build-dir=docs/build
use doc && esetup.py build_sphinx -b html --build-dir=docs/build
}
python_install_all() {
distutils-r1_python_install_all
- doman docs/build/man/*
+ doman man/*
use doc && local HTML_DOCS=( docs/build/html/. )
einstalldocs
- "${D}$(python_get_scriptdir)/beet" completion > "${T}/beet.bashcomp"
- newbashcomp "${T}/beet.bashcomp" beet
+ ${PYTHON} "${ED}/usr/bin/beet" completion > "${T}/beet.bash" || die
+ newbashcomp "${T}/beet.bash" beet
+ insinto /usr/share/zsh/site-functions
+ newins "${WORKDIR}/${P}/extra/_beet" _beet
}
diff --git a/media-sound/beets/files/1.4.9-0001-compatibility-with-breaking-changes-to-the-ast-modul.patch b/media-sound/beets/files/1.4.9-0001-compatibility-with-breaking-changes-to-the-ast-modul.patch
new file mode 100644
index 000000000000..f9268b17ca64
--- /dev/null
+++ b/media-sound/beets/files/1.4.9-0001-compatibility-with-breaking-changes-to-the-ast-modul.patch
@@ -0,0 +1,53 @@
+From 86af366abab51b45ad1b06d330d384bc810e45c9 Mon Sep 17 00:00:00 2001
+From: wisp3rwind <17089248+wisp3rwind@users.noreply.github.com>
+Date: Tue, 9 Jun 2020 19:34:31 +0200
+Subject: [PATCH] compatibility with breaking changes to the ast module
+
+new in 3.10, also backported to 3.8 and 3.9: https://github.com/python/cpython/pull/20649
+In fact, our generation of some Literals has been invalid since Python
+3.4, fix that too.
+---
+ beets/util/functemplate.py | 29 ++--
+ docs/changelog.rst | 275 ++++++++++++++++++++++++++++++++++++-
+ 2 files changed, 294 insertions(+), 10 deletions(-)
+
+diff --git a/beets/util/functemplate.py b/beets/util/functemplate.py
+index af22b790..266534a9 100644
+--- a/beets/util/functemplate.py
++++ b/beets/util/functemplate.py
+@@ -73,15 +73,26 @@ def ex_literal(val):
+ """An int, float, long, bool, string, or None literal with the given
+ value.
+ """
+- if val is None:
+- return ast.Name('None', ast.Load())
+- elif isinstance(val, six.integer_types):
+- return ast.Num(val)
+- elif isinstance(val, bool):
+- return ast.Name(bytes(val), ast.Load())
+- elif isinstance(val, six.string_types):
+- return ast.Str(val)
+- raise TypeError(u'no literal for {0}'.format(type(val)))
++ if sys.version_info[:2] < (3, 4):
++ if val is None:
++ return ast.Name('None', ast.Load())
++ elif isinstance(val, six.integer_types):
++ return ast.Num(val)
++ elif isinstance(val, bool):
++ return ast.Name(bytes(val), ast.Load())
++ elif isinstance(val, six.string_types):
++ return ast.Str(val)
++ raise TypeError(u'no literal for {0}'.format(type(val)))
++ elif sys.version_info[:2] < (3, 6):
++ if val in [None, True, False]:
++ return ast.NameConstant(val)
++ elif isinstance(val, six.integer_types):
++ return ast.Num(val)
++ elif isinstance(val, six.string_types):
++ return ast.Str(val)
++ raise TypeError(u'no literal for {0}'.format(type(val)))
++ else:
++ return ast.Constant(val)
+
+
+ def ex_varassign(name, expr):
diff --git a/media-sound/beets/files/1.4.9-0002-Disable-test_completion.patch b/media-sound/beets/files/1.4.9-0002-Disable-test_completion.patch
new file mode 100644
index 000000000000..c60e24d65898
--- /dev/null
+++ b/media-sound/beets/files/1.4.9-0002-Disable-test_completion.patch
@@ -0,0 +1,74 @@
+From f6258c2ff3f3f979d72c149e44f4eecb02cb10a2 Mon Sep 17 00:00:00 2001
+From: Guillaume Seren
+Date: Tue, 29 Sep 2020 16:46:06 +0200
+Subject: [PATCH] Disable test_completion
+
+Know issue by upstream https://github.com/beetbox/beets/issues/1876
+---
+ test/test_ui.py | 50 -------------------------------------------------
+ 1 file changed, 50 deletions(-)
+
+diff --git a/test/test_ui.py b/test/test_ui.py
+index 8267c9be..bcb6c3bf 100644
+--- a/test/test_ui.py
++++ b/test/test_ui.py
+@@ -1167,56 +1167,6 @@ class PluginTest(_common.TestCase, TestHelper):
+ self.run_command('test', lib=None)
+
+
+-@_common.slow_test()
+-class CompletionTest(_common.TestCase, TestHelper):
+- def test_completion(self):
+- # Load plugin commands
+- config['pluginpath'] = [_common.PLUGINPATH]
+- config['plugins'] = ['test']
+-
+- # Do not load any other bash completion scripts on the system.
+- env = dict(os.environ)
+- env['BASH_COMPLETION_DIR'] = os.devnull
+- env['BASH_COMPLETION_COMPAT_DIR'] = os.devnull
+-
+- # Open a `bash` process to run the tests in. We'll pipe in bash
+- # commands via stdin.
+- cmd = os.environ.get('BEETS_TEST_SHELL', '/bin/bash --norc').split()
+- if not has_program(cmd[0]):
+- self.skipTest(u'bash not available')
+- tester = subprocess.Popen(cmd, stdin=subprocess.PIPE,
+- stdout=subprocess.PIPE, env=env)
+-
+- # Load bash_completion library.
+- for path in commands.BASH_COMPLETION_PATHS:
+- if os.path.exists(util.syspath(path)):
+- bash_completion = path
+- break
+- else:
+- self.skipTest(u'bash-completion script not found')
+- try:
+- with open(util.syspath(bash_completion), 'rb') as f:
+- tester.stdin.writelines(f)
+- except IOError:
+- self.skipTest(u'could not read bash-completion script')
+-
+- # Load completion script.
+- self.io.install()
+- self.run_command('completion', lib=None)
+- completion_script = self.io.getoutput().encode('utf-8')
+- self.io.restore()
+- tester.stdin.writelines(completion_script.splitlines(True))
+-
+- # Load test suite.
+- test_script_name = os.path.join(_common.RSRC, b'test_completion.sh')
+- with open(test_script_name, 'rb') as test_script_file:
+- tester.stdin.writelines(test_script_file)
+- out, err = tester.communicate()
+- if tester.returncode != 0 or out != b'completion tests passed\n':
+- print(out.decode('utf-8'))
+- self.fail(u'test/test_completion.sh did not execute properly')
+-
+-
+ class CommonOptionsParserCliTest(unittest.TestCase, TestHelper):
+ """Test CommonOptionsParser and formatting LibModel formatting on 'list'
+ command.
+--
+2.26.2
+
diff --git a/media-sound/beets/metadata.xml b/media-sound/beets/metadata.xml
index 544682635755..421001fc2f49 100644
--- a/media-sound/beets/metadata.xml
+++ b/media-sound/beets/metadata.xml
@@ -34,8 +34,11 @@