diff --git a/Manifest b/Manifest
index 19eb3efdc8f3..96cf5b2364b0 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512
-MANIFEST Manifest.files.gz 29311 BLAKE2B 13e2765ea87bc42904c383e9e1ded381bb57f1807a32df1d545cc4aa78b266ada307fee7f74b353d27a0726e6e729637709d6f6edf2697b97bbedf169683342a SHA512 cc41597b0388f996599a67def5b14ed48214b2d09d1d7bb72364c07e9a0cb9e28126dbd77653b1206dc9f9b62dacc9593951d988639ee8fd60eb314aa6b29783
-TIMESTAMP 2021-01-13T09:08:46Z
+MANIFEST Manifest.files.gz 29300 BLAKE2B d882f226e361fabb08518a064c8780ac89ed88c4a039bd2d2f626e059067ba8435a830400982709dc113737fa9060616085e777b0fcba6700498677b162a40a9 SHA512 a6d50fc8967ff330ce9433898b294b8a3eda99f65b3cc0b2d1365afdb9c4d5acff466152e2525a07f92a20f301f26ff74921cfb5529396d10c092a992a4ec3b5
+TIMESTAMP 2021-01-15T07:08:30Z
-----BEGIN PGP SIGNATURE-----
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAl/+uJ5fFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmABP25fFIAAAAAALgAo
aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klD50BAAgbBjAqK9JHBNbikjm5uvq2gmyxyIp4YzLf9fZ12ccV+Othv0YRJLEoe5
-IUL/XJM9OW2wz4osClC9C9TVTXZSzLWKQetM00x/zBZV9TE32FByW9GCGeG4I1M6
-/7jlPBSneT0JI8CZ2uIQwZzw2/ahicfc5Dbyv1EklNavUv5boyXGD4bEsMV1bH1+
-3WBik/70ObNecD7Jsulp0+IkCdpHDcQ84VZyKgePD3jRKI1PeH+p8nLNZKew0GYT
-XDnmwKnc82ptvKR4LnkVfU+60XB+6wdpN2/Aw+no30deZK4WFnOfFK4379peYLRg
-xlVY5ugKTvUIobggcFwNVVCP9hOXg3yryuyuUPZDtV++CA86s29zPtZ3l/DeQ9bh
-6ZwGqU2R0+J52hP8VgnbttNqxArZuCZcfISHpR/MclR0py3g+ws0+C2blBJMu2PO
-LftBDHoXsPSBJSeFbM2XMqdO4FSka8rt6fmS8j4bokfTPeoOqw50AyW5sbQXBBAX
-pVdiqxcjM4MgiHVE9C6/WIe78NrYmocTk5OD892wAsCwlzuLy1zfou67UHAKTd9z
-ZAogi8aMfd3Iw8ktQOb8zfl/jYfqr6n5v1Ab+CYI8oM8v1LrkNjX59pY9DOX1BOj
-5iWdh8WbSjtDKd6oBPsN1aK3nSQ43wi4SZyCi/jJc8PlZvO9arY=
-=HQsc
+klB0oA/9G0llWcB1qPcLIdRLIvYrQdmnv2HICa2XkOb8JQcPSPH9o5+vGLjAmAPN
+UXKu8KKgT4VTk6iMgO9O9tMFy2snT7p1rE0+tlBiH0IsxLcKVdfT/ZorMX6ldSLS
+dcZ2XWFgxlz+GrZnSXAkqb+1KfaYodXn1g5s0n+kcIlYCwz4RwkP9DD8K/7zdCoY
+u/rSZLjmUVQYBxZU3X/2ARJRxiwj6wGaDf5huofjcmQ3Yd3V20CDOJdDBdAaESt4
+zgF2AWR3TtZLe8ddQ6ePeR/AfsjIQA17yUjbQuRFkI7j8ngqGZrg49oISs8UXr2x
+5WOxtEoJ1HeCUQSjpTj0YIwzQGxESKUqMCzUbQXpB31nj+r6jcBwdKOd5MQLll2U
+4hb7BQsmAFT+IJ6CHNwgqIg0Mq/L3PqQrb5OkVgUuXtkGHcghndAR0XGxg1i5miV
+br0HdHQ7H36TJpeqYvVtc1Owlwr2WAc+YlOaUmFMNzLr9HDfCVjNwC+iFOIVFlQy
+2vs+hNHRXwxafxVtKIV17meAJWuGg3uT2b/5Skq7W3dlzJx8aBy6t4KX7ag2s8UM
+p7ZwjZlaVTUeE+7CuJkp6N11Xh99b75fVI80Ro/9X+YyhUA2iNNlu5DgqBUtTEzA
+zUVf6YlKao2G/GbokVv+3eTQQcnHDFC8lqFHmC1rJFgEguKkmMY=
+=9Uy/
-----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index 6344ccb1d2ec..432fb494ce23 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 d78294064fc8..689e86bedfd4 100644
Binary files a/acct-group/Manifest.gz and b/acct-group/Manifest.gz differ
diff --git a/acct-group/lxc/Manifest b/acct-group/lxc/Manifest
new file mode 100644
index 000000000000..86e09137bb30
--- /dev/null
+++ b/acct-group/lxc/Manifest
@@ -0,0 +1,2 @@
+EBUILD lxc-0.ebuild 188 BLAKE2B 251574646bf0f59af052205705a3380c85bbf712d40035f39d815db01808318083460722d17cbe46c6ef2a38b3523debf8b80367cebba7877ea99d2fbb3dd398 SHA512 2d44a4455bff8902eb2522af2707b8f4ba97202fae210d382dfef89f8e2d2fa1b84ba048e35c8779fdef439369fb39693c9e1242b3c181b2c9c3c58b97436974
+MISC metadata.xml 277 BLAKE2B fdd3d0858258cd42bb21a1759e210802c20d42422a6b527e43f7c2488162ecc74b31a8098018999b986f23fefa9ce8752f59bce9dbd1becc6044e5a5b999c2cf SHA512 a7f1ef17d50370f30622f5a9f9a3d69623214ce9e1eb76fb9d59fcd8e016a2dfa18e6141ee130e7e1c6dab517d274ae8d252638a27320e356d4f7267d09587db
diff --git a/acct-group/lxc/lxc-0.ebuild b/acct-group/lxc/lxc-0.ebuild
new file mode 100644
index 000000000000..5d0fe836d34c
--- /dev/null
+++ b/acct-group/lxc/lxc-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
+
+ACCT_GROUP_ID=358
+DESCRIPTION="Group for app-emulation/lxc"
diff --git a/acct-group/lxc/metadata.xml b/acct-group/lxc/metadata.xml
new file mode 100644
index 000000000000..36289aa361ce
--- /dev/null
+++ b/acct-group/lxc/metadata.xml
@@ -0,0 +1,8 @@
+
+
+
+
+ virtualization@gentoo.org
+ Gentoo Virtualization Project
+
+
diff --git a/acct-user/Manifest.gz b/acct-user/Manifest.gz
index 0e4c36903e08..a81a7fab9a29 100644
Binary files a/acct-user/Manifest.gz and b/acct-user/Manifest.gz differ
diff --git a/acct-user/lxc/Manifest b/acct-user/lxc/Manifest
new file mode 100644
index 000000000000..a57364e81ba3
--- /dev/null
+++ b/acct-user/lxc/Manifest
@@ -0,0 +1,2 @@
+EBUILD lxc-0.ebuild 230 BLAKE2B a6137bdebba906c7e213e2969a8853f60ffb1d229eac7e27b95525602d54fa32cd15b2f63623c817dd2f8fbf0c67b8e8a64f9121cd6734c5b04455ec3ff748c1 SHA512 cb9d4beb92eb1a99e192de654ffae98519b45bbd5e2d7df34ada798fc4dbe2d20dd444d0bc5a943b4c663893ba602e9ef9cd25ece105fad06b4b04b8399a06e3
+MISC metadata.xml 277 BLAKE2B fdd3d0858258cd42bb21a1759e210802c20d42422a6b527e43f7c2488162ecc74b31a8098018999b986f23fefa9ce8752f59bce9dbd1becc6044e5a5b999c2cf SHA512 a7f1ef17d50370f30622f5a9f9a3d69623214ce9e1eb76fb9d59fcd8e016a2dfa18e6141ee130e7e1c6dab517d274ae8d252638a27320e356d4f7267d09587db
diff --git a/acct-user/lxc/lxc-0.ebuild b/acct-user/lxc/lxc-0.ebuild
new file mode 100644
index 000000000000..c0bf316bb091
--- /dev/null
+++ b/acct-user/lxc/lxc-0.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for app-emulation/lxc"
+ACCT_USER_ID=358
+ACCT_USER_GROUPS=( lxc )
+
+acct-user_add_deps
diff --git a/acct-user/lxc/metadata.xml b/acct-user/lxc/metadata.xml
new file mode 100644
index 000000000000..36289aa361ce
--- /dev/null
+++ b/acct-user/lxc/metadata.xml
@@ -0,0 +1,8 @@
+
+
+
+
+ virtualization@gentoo.org
+ Gentoo Virtualization Project
+
+
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index cba1c7ca4d53..91fc916ff442 100644
Binary files a/app-admin/Manifest.gz and b/app-admin/Manifest.gz differ
diff --git a/app-admin/conky/Manifest b/app-admin/conky/Manifest
index 3cc898799f46..d346934fe74b 100644
--- a/app-admin/conky/Manifest
+++ b/app-admin/conky/Manifest
@@ -5,9 +5,10 @@ AUX conky-1.10.8-portmon.patch 551 BLAKE2B 6b69ebb6c8ec194e51d616f487ab8d7360626
AUX conky-1.10.8-use-pkgconfig.patch 1115 BLAKE2B d951bdd32ee0e6eace1444d3b8a6453c6ba25c15df2cb5ca4e1ccbb2f7f86fb860e4b43e75d76b62f7d1d12e91018bb03fb3b0237ce1b1af239c53f0bffc832b SHA512 e4b73aa8c0cc917a87e1eaecc3a2e55058fa4ea0acee9c76e409cda29de0c430df3a13f8a6c3ac922dd0a11b6c4cfca781bef39c6d508e903ae81423144c86d4
AUX conky-1.10.8-virtual-sinks.patch 2054 BLAKE2B e047348df61b00dec0de151422a891feede717007e552ffb8fde0f390c0c3208e2c03bb1a615c89f7f4bfaaa8fdb603dd0eb75b4e6bdffe718c9eb6702787c2e SHA512 fe07eb460165bba0521071e7b5c452d4dc5626c7bb8e0c559ac4b275e09e8484a21eec275cfc02ca2162b6461a4198704fd806d6ba3c72504f8d007310a60ccb
AUX conky-1.11.6-fpermissive.patch 1517 BLAKE2B 6f0c0fc9370955786f74c9a707fd63eb9ead7b5889ab57fe8c6a9326a1ff0253b90c7ccd3f38baa837404787bcded00de46d8132cc0d013ad70910b3fd64f91c SHA512 df645d30e4d6f88348af5dc1c782f6146fab86d744f54d77b0c6561f0f0c2491472e72b55f075a22bc3d16e87a01303955d0a0bffc6495dae390c9904e1f783f
+AUX conky-1.11.6-ipv6.patch 503 BLAKE2B 896cfc76a858981438cecf83db5b2b4fe32d7d6a0749524ac4c4d8dba3fd124a0b7de5d89329280b5c50e9de6cc4e182c23c2813575be6fceb97615e2acda4ca SHA512 3ea5247723676812a07d9ecc129d63cc75e51626a23c202da50bd3172403a24b93f6cbcc5c5e743a9acfe87b6d087ba510381c6157e1995b54d28a6dadbcf08a
DIST conky-1.10.8.tar.gz 373075 BLAKE2B 749d8bb37557c1eeb8b07955bbd45704fadb41995fad8380dd89afdf7b0c9dce02d19692691e3ef1857d849c05eae1b2fdf20243460d767199a681aeb9e87746 SHA512 743b1d17db4ae654c7a319fe9157e9ebc5eb4ae0462a1f7269332d379e8bdd1dbfecc3ab6f46c8b5176b7e40918301649ac3ee883a84dc4fc8d766abbac6585a
DIST conky-1.11.6.tar.gz 2402216 BLAKE2B 573e2a16781ffb246041052796fd2e2f02937e0e1399edb6b8d0a16b90bbd73f84b3332d7dfba4d8bf53becc05b907efaf33fc48d4efda425c87756d44fe35f4 SHA512 f7bffcef33680d61d0171ba50b29ddda011c1c1989fc847cd4b5b60d46bed4772294eec34fd27c4d642a9c03e3cedaa31855ffc0f3b60791f4bed14ffdf7490a
EBUILD conky-1.10.8-r10.ebuild 4860 BLAKE2B bfa7ab46f34c8fac5a395869ad3ce175c75b748d87cabacac03a39f7d19ac904f5fd1fbb989fe4dbb6aee947b6d775c06d7941f7eecdbc566e09c17087bd7299 SHA512 b2160e9147005b2cc90020c07f8a7c4c0de7641a88f87ff983e573d24d52edd04ab3cefcea96cceb6579a48e021975248cb8f066b9137542def3c801ba57b587
EBUILD conky-1.10.8-r9.ebuild 4777 BLAKE2B 42eff9a8b3bb93f1620b301c6b4c313415c39ca4c4f9c81ee860fd15314ab4d12b2a1cbc1b58b58cd533f6dd9c69ce45a527a6e00c337aae9108ed73f9729b08 SHA512 612d3d918499ad3c51816256fb826d432e45be4634cd810d623a26a3138e7feef80639fb98206a8f590ab37f4a90e08bc3352627f5fce2abda0579f75f551d65
-EBUILD conky-1.11.6-r2.ebuild 4764 BLAKE2B 5aa4d74f05a7a6301911314c1fed06c451f54ab49a4fa1ba314e128a5e71279a9d342b7ead5e42268c5d9034280b0f14bdc6dedd1900d4084b9c49f7d43fadfd SHA512 7b706907e4669c7cec665893d478fa73129d88c3eda9304c29114f2b91ebd550ca019c1a4415e9e4b8633f42a7df68254582ba1f1a31b0269d2ac18410e8807b
+EBUILD conky-1.11.6-r2.ebuild 4795 BLAKE2B 470cf78bbf13773cfaab634587ae7d03b9c41e89aaccfa02586173ec367a52167df7f35f60931c5dceac8be0138f4c9430c911c8c054c46c08c94f90d9fa149d SHA512 474153c6501ecf562ae7a92b65e40dbe125269d4b25fb98426117ea61f2d4c018f74ccd6b932e0b21872ed36539ebfaf0b26a16b5092b036114af4e6402f6b53
MISC metadata.xml 2469 BLAKE2B 15947c03593a9d5215a9c1dd142458aeb84f61c77a669bbfa4abe256c94e28650516a0226350323f56bbc225c5edc5e9b9e3310d7957e072b6701e77e40623ce SHA512 75e2d5bd8f4848779c03fd983d995d8216f4bc35ca1d3af47cf004d1d43e36c2924523d286e13ea82c720a51a63d91e03af795e6c31471af71716b4c5ce46c4e
diff --git a/app-admin/conky/conky-1.11.6-r2.ebuild b/app-admin/conky/conky-1.11.6-r2.ebuild
index fb7f8a7087d9..827e39e30975 100644
--- a/app-admin/conky/conky-1.11.6-r2.ebuild
+++ b/app-admin/conky/conky-1.11.6-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
@@ -78,6 +78,7 @@ DOCS=( README.md AUTHORS )
PATCHES=(
"${FILESDIR}"/${P}-fpermissive.patch
+ "${FILESDIR}"/${P}-ipv6.patch
)
DISABLE_AUTOFORMATTING="yes"
diff --git a/app-admin/conky/files/conky-1.11.6-ipv6.patch b/app-admin/conky/files/conky-1.11.6-ipv6.patch
new file mode 100644
index 000000000000..65066270a750
--- /dev/null
+++ b/app-admin/conky/files/conky-1.11.6-ipv6.patch
@@ -0,0 +1,22 @@
+Fix no-ipv6
+From https://github.com/brndnmtthws/conky/issues/1033#issue-748414180
+
+diff '--color=auto' -aur a/src/linux.cc b/src/linux.cc
+--- a/src/linux.cc 2019-08-12 14:53:54.000000000 -0700
++++ b/src/linux.cc 2020-11-22 18:44:04.394329722 -0700
+@@ -667,6 +667,7 @@
+ }
+ }
+
++#ifdef BUILD_IPV6
+ void update_ipv6_net_stats() {
+ FILE *file;
+ char v6addr[33];
+@@ -731,6 +732,7 @@
+
+ fclose(file);
+ }
++#endif /* BUILD_IPV6 */
+
+ /**
+ * Parses information from /proc/net/dev and stores them in ???
diff --git a/app-admin/keepassxc/Manifest b/app-admin/keepassxc/Manifest
index c02cab2cbc08..08eebb1e702f 100644
--- a/app-admin/keepassxc/Manifest
+++ b/app-admin/keepassxc/Manifest
@@ -2,7 +2,7 @@ DIST keepassxc-2.6.1-src.tar.xz 5715948 BLAKE2B 5490757fd939b572f2f281dc6ecfcd6a
DIST keepassxc-2.6.2-src.tar.xz 5720788 BLAKE2B c6bcc0af594c3b697d8e74752edb0389c80c72008bd57dcc36d9606462ea4bc9c6012a9f3f31702a9c0f88004fdc66f1ee4fbebd8a501227f4579ea8f3f1078f SHA512 b297edc4fae32b65430802094bd63dc301addae36859365a3009899d5bc20b32934e174ea56bf3fd1ee633a263ab36b577cba5aaa75bf4ad597f44606f7b5fd1
DIST keepassxc-2.6.3-src.tar.xz 7562816 BLAKE2B 1b33850ed996a2f07b1665309bb4680329a0f858d89e9e89f7ca39a84f27f1a4364bd8526d1907b4fc4d5dd586b3dc48d9d9b6235b78b52edc4db08ca72d79fa SHA512 37f97c0851731badffc9c40ed2dcc5c8fc200ea96b32281c21cf199799681abbd74fb191140022ad7872d69ee139e12646e19697010f539690e4e0f0f1c92558
EBUILD keepassxc-2.6.1.ebuild 2063 BLAKE2B a42e9515621416fe81b1724db430fa5d601fedd7de2830acf9d9993c9486206bd76d13c5f10c3040e7fd37b518f543ea03173cc2a64c36eab10bce13c0d628dc SHA512 c699ed6e099a04e8a3748ecf6b586ffc4ba1f46dcf5644bb89fb3ad37b8506e47cc1e41fd7d98a0689fbaa80fb6c08ecde1db2cffc868199b124a8ba76a307fe
-EBUILD keepassxc-2.6.2.ebuild 2065 BLAKE2B 80d76cb75cead9572075d8068567f280dc5dd6f940654b121e57379aac666a1513ba8026de0583f9a0a14f12a30394c488c803280154e3ad05d0a5b0d880091e SHA512 0d250a23c3c98683a6592ce9f39a9cb200e2053ee8852fabe1e11c04df9c14618c27b7d7fc589f2983c2bf198a0c8c435f932f330c532c936a433bd9e8ce8245
+EBUILD keepassxc-2.6.2.ebuild 2063 BLAKE2B 8f692d143bb7102d5b3ab2440b9d6ccc66dc08ce9753265592ecf125896852fa6c79745db673ecde2e55d1de84edb76d5118354173f05902695e628da357b1ba SHA512 d43414563780fac5c23f0b3f7dfadaada0af309e49a2366e83b288ea181be9d662b5f366d1d73b8c16ab8b5d8e1bb958c3dcef06a132ca1c16f66099811bb71b
EBUILD keepassxc-2.6.3.ebuild 2065 BLAKE2B 9acee41f6a44dfab875466c68104c75395c878c51746dfcb2d4109fea79f46d8828b9856ee370e612abacaec1a3cfbd8779cec0b072d82ea8d9de0fab562536a SHA512 fbf3880f1a66356f1700a89dbf3d33814862a4cfdb2b8a51c7182afde6e405a88960a1a7aec987ee54531d718faf02a111afe5088f386a28f160e9f16a18a4e1
EBUILD keepassxc-9999.ebuild 2065 BLAKE2B 80d76cb75cead9572075d8068567f280dc5dd6f940654b121e57379aac666a1513ba8026de0583f9a0a14f12a30394c488c803280154e3ad05d0a5b0d880091e SHA512 0d250a23c3c98683a6592ce9f39a9cb200e2053ee8852fabe1e11c04df9c14618c27b7d7fc589f2983c2bf198a0c8c435f932f330c532c936a433bd9e8ce8245
MISC metadata.xml 1041 BLAKE2B ba27a63c6d2f620e5e44e0a081db88b3f504dba20f2952b586564fbcbfaf464e82b755c5d4b6faa107a11af53e1acf675c452c721ddefceac4f3aff3c83d4eab SHA512 6e1f6a8455ee0afa21abad8c606da210161c1e287df94ca1e7f49b854d9dca2675ad83e801e5eb0f5f8cab7f115b654b50d71a2399b97e357f77f6b61f2bcb0e
diff --git a/app-admin/keepassxc/keepassxc-2.6.2.ebuild b/app-admin/keepassxc/keepassxc-2.6.2.ebuild
index 0511c16e1277..5b51acf9ec34 100644
--- a/app-admin/keepassxc/keepassxc-2.6.2.ebuild
+++ b/app-admin/keepassxc/keepassxc-2.6.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 @@ if [[ "${PV}" != 9999 ]] ; then
else
#SRC_URI="https://github.com/keepassxreboot/keepassxc/archive/${PV}.tar.gz -> ${P}.tar.gz"
SRC_URI="https://github.com/keepassxreboot/keepassxc/releases/download/${PV}/${P}-src.tar.xz"
- KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+ KEYWORDS="amd64 ~arm64 ~ppc64 x86"
fi
else
inherit git-r3
diff --git a/app-admin/logrotate/Manifest b/app-admin/logrotate/Manifest
index 75bb5bf11f88..202363cd8357 100644
--- a/app-admin/logrotate/Manifest
+++ b/app-admin/logrotate/Manifest
@@ -7,6 +7,6 @@ DIST logrotate-3.14.0.tar.gz 215413 BLAKE2B 7914188922d81b1f8b6c4e493fae71d23bc9
DIST logrotate-3.17.0.tar.gz 224559 BLAKE2B 6d019bafad6986a0b6264893d36a515db75d746dd590afd26825c01c68e9ccf3c260502a29912d75c069ece8715ae14d3c13d4030f6222187be0e1ca05d60e49 SHA512 ada4415ef68ad97c1415fa0c1ba7bf108621777cd91599bf4f999dea1c1025596543aa00fd579cae4d39315b71c4d8f96a9c9d1178f78be7c523470588ab1d31
DIST logrotate-3.18.0.tar.gz 224873 BLAKE2B f73ffa2d58a5125393e6c96e158e39e0b4cadef01e6eebd172220227a7e1363e6731bc2ac511fa028078054b55d42b131cdc30232ac5762ce4c6cbff79c19681 SHA512 d1bca267fbec4acbb83ffba4d3ac4c864f4269d8513e5614e7dbe6f3b1f176685218bffdb5d62f559ee73f84cf9a8a257c9f63e30af058d12d0034240f247586
EBUILD logrotate-3.14.0.ebuild 2504 BLAKE2B c95b9546ebaa6175bfc8bfaf7cfe553d8859b2f4cd45148fab16c8f84dc50806d01fd27f9c851f077224e0b040e024aeb2fad5429d50ba77b6bf073b9574c32a SHA512 a1a3398e9895aa1884cbaee490fb21973826a258b30a2f12631c98c1c5848ecaaccd4696eea5480ed578e519bac79d19282f7590d32205408f6d1438963d28bd
-EBUILD logrotate-3.17.0.ebuild 2486 BLAKE2B f52d8f5a6159345c29eb35e9a8706d1fb35335862d71e4f27d405f2ea634ffee26d19cb32a067631e42b4378876cc19460f0027be4fa13df043d431e6da2056c SHA512 0a0627a7226be397140f6badc430a7a0b0e982957deac8827b196cad5fe07944061819aa278b565d23a03db186b165716ed168166a1f633a36b9ff04f4f16d90
+EBUILD logrotate-3.17.0.ebuild 2485 BLAKE2B 3e244a1b935f0807c86cdd57e7f2cc42a22b8681a2a10f634d76e44f3d5058c761d732fd5d0e501f7a5374b1ba436a0f6ccf199c4158f6911805c0882d89a443 SHA512 c569c598b0671da82df47bf45e145b215662bac936c63b6751d681939b693707dce5aa4434433c91894bc0434662e1aa0ac73ce5b27450c734b3213917563bbd
EBUILD logrotate-3.18.0.ebuild 2492 BLAKE2B e1a272d0faf0a73bd07f86d1167859adea17d59299a712c6dcee669dff0bc46d83e9839a0639a6f2932990124d74b515ffbd89ae63a590e82729d74acd38f3ff SHA512 2e8abdec38a8881817f2413ed2b87dfbc222e5565fdfabcb0eeea61e55bb83f17048282eb95fb2e87306bd772067cc1098dac8700e5e3b42b50096d6ea17ae68
MISC metadata.xml 1207 BLAKE2B 59294176103f15343e415ada4c4e073cae53322114bf39b43376c6eec8206fd3cce19da99cf609b1e72340f15a272b94a5a956703c93659709f4d83605ab6152 SHA512 29acdfddf935cf1c3bd7e61cbecb19f9f5b4acac31d01aa89ea2f6395a7f59bc2501d3f751f5e8680fc71336cd56cc5abedd9850d44664ddbb12b140efa86645
diff --git a/app-admin/logrotate/logrotate-3.17.0.ebuild b/app-admin/logrotate/logrotate-3.17.0.ebuild
index 98a69f1ad414..33eb0d103ce0 100644
--- a/app-admin/logrotate/logrotate-3.17.0.ebuild
+++ b/app-admin/logrotate/logrotate-3.17.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
IUSE="acl +cron selinux"
COMMON_DEPEND="
diff --git a/app-admin/system-config-printer/Manifest b/app-admin/system-config-printer/Manifest
index 7b125879309a..70f605865223 100644
--- a/app-admin/system-config-printer/Manifest
+++ b/app-admin/system-config-printer/Manifest
@@ -1,5 +1,5 @@
DIST system-config-printer-1.5.13.tar.xz 974532 BLAKE2B 44e748d2fc20edefe58e1c8dd3781aff28af93e57356a9969e051813bf4f04f72c4e895b587e86614df6fb4984a4d610e8e1a1e17777801ae8912b6904679c72 SHA512 f4fbc1b20b35aa5b33bafdffc8a7490cc3c55e0b33bd9e925f1d3e01532c0a7bb87f80a04dd6da6fc492edd9fea74bacb0ce16ff64ceac622722fe1f9a77a6b7
-DIST system-config-printer-1.5.14.tar.xz 1005400 BLAKE2B 23f96a079e568afc098cc505d32b02d1fe14e8e43bf24032c890d8c924f754def194525a8188719873c3c4b693666c1ef83f19b8bbe89846fc2c32ed48abe4da SHA512 5aa0f9f7d3a6e15acc1c2fdc62cc6c10bc686a62fbfd2b97aa61e1d6d1d690019fc461b6db54d6340668f52d52764cc0b2cd59b02b5061b7f44577f2c2b19fe9
+DIST system-config-printer-1.5.15.tar.xz 1005764 BLAKE2B 4919c555444829505b09b658ce0fd016ba235260f8c8b4db751e6a511afba5d5975e5f9570f5fe74fc35d158bbf2dd3ece99aa568ec1bb850096e5f12f0fc0b0 SHA512 b992f96f48c54350c11c5c629e77ee4409fe52fb17b386f226a42d532a95e17b6506319dcedeb70c0072555cb9ab464daaae22f295ce3d5181e5f49836f2ae2e
EBUILD system-config-printer-1.5.13.ebuild 1942 BLAKE2B 26bd1079a01eebc8f49335d5756f310471b686bfe8966d5b993040c0636d6eaafee272eb8da305b07df0a8880e1db4899fdb61f9cd929ff1c829dc1e07c667f3 SHA512 e25caad24daf23975975b52bf2ea241e06b462573dd0e2129cebb9de467c94e035e5f3e64914d68123d0da8f40276071d9600888992b57ad9b316556a2bf1ab3
-EBUILD system-config-printer-1.5.14.ebuild 1947 BLAKE2B 2d6401f250725a79d029a10b73e08721c37904f2a7a015b8970d00e22a6631607dc06c3b6a186f2145aca6535a474879c5fd9426b91af68e6fcdc79fb215b1e5 SHA512 b7e9155c46dfd20c548cca7538e72aee51214124540d2996c41ea2b770f93418ea5cef87e6cc6ef748ab3cce5e167d7f33a88426e90d05d119d914e30e4cef4e
+EBUILD system-config-printer-1.5.15.ebuild 1947 BLAKE2B 2d6401f250725a79d029a10b73e08721c37904f2a7a015b8970d00e22a6631607dc06c3b6a186f2145aca6535a474879c5fd9426b91af68e6fcdc79fb215b1e5 SHA512 b7e9155c46dfd20c548cca7538e72aee51214124540d2996c41ea2b770f93418ea5cef87e6cc6ef748ab3cce5e167d7f33a88426e90d05d119d914e30e4cef4e
MISC metadata.xml 463 BLAKE2B 8cc3de37cb766555e89dca64b9be719c3b2885144f08e5a126084e5f8125ff085e9c51705216cd51fb3c66daa29016a790dd606de2b443a7e65f6677f4c46fa4 SHA512 8521e871b99b17ea2bb754dc9bf1b1a49bd32673acce3fe561ec087c5c4bacfbefbf904af1cf5a6ada369e936a0e06a7116074ef622f882e434da7afdee12533
diff --git a/app-admin/system-config-printer/system-config-printer-1.5.14.ebuild b/app-admin/system-config-printer/system-config-printer-1.5.15.ebuild
similarity index 100%
rename from app-admin/system-config-printer/system-config-printer-1.5.14.ebuild
rename to app-admin/system-config-printer/system-config-printer-1.5.15.ebuild
diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index b156d2ec5e94..b232af398546 100644
Binary files a/app-arch/Manifest.gz and b/app-arch/Manifest.gz differ
diff --git a/app-arch/libarchive/Manifest b/app-arch/libarchive/Manifest
index ba3c036f31f9..b217cc0ccc3b 100644
--- a/app-arch/libarchive/Manifest
+++ b/app-arch/libarchive/Manifest
@@ -5,5 +5,5 @@ DIST libarchive-3.5.0.tar.gz 7017726 BLAKE2B 651c9e28d1a1b0a6dd2dbd2aefa0a47ba23
DIST libarchive-3.5.1.tar.gz 7008338 BLAKE2B 243dfda2bd4582bbc20679328b89aae0c530475c822dcf9ff25c65df2017b8f18bb616142d6ab016ccea4a5aa1b410d46b913c2ee0afefd2fdb1a41cf51585d9 SHA512 08ddd74bef4cef0981739da202879f36cf7ca33a8f6d438724588efe3ab8477f2f1d0cccf7b8ed0bedfc0c8d0cab16ee3ae5c0c6e83b6811bc650d7d7471a996
EBUILD libarchive-3.4.3.ebuild 3739 BLAKE2B def9ba9f8584f7262d556d4ab779a62c60dea12aab1f817ecc4f808f3806945edf22728879af7a33d50495a4def1be1f873512fab4689b9872e060fc7b1537f1 SHA512 4cc36bdf9248525af26e929eae11828549e9b4a8ff1a2cd3b4c4e7e243a7892edb39810f080d7ad8a99a02aba114e3aa2990e5af86b42335108a35b7fd5c4298
EBUILD libarchive-3.5.0.ebuild 3820 BLAKE2B 10fe13aea974d5b1133c7ba44d3e77a462cb516464893259acd9e86f8653a5e6b0dcc42daa5c43077fb7a1eab36b5cfe22e62b3c25e358a0978cc91ded64c0bb SHA512 28e0a522aa4f0351e1a5228b2af8371b5890e04d2060599eaffb52568cc8503dc332df9c78644c5ee22b0ba303c03452084cd7428fe2f8786de2e16e1ad8231c
-EBUILD libarchive-3.5.1.ebuild 3892 BLAKE2B a08f1f70d41779e293cd6662af037299ef09629f11c9f3793e0ce5fa616433e0543953d357d14de0fa575d1346f4c4a0d6334b5bb1e463f4d387dc2a48a35d9f SHA512 1005088f59ccc7d1a9c972e0c1f30644d4127c978e6cca23cf4af942198019191247f3de05894ccbbb48c1cbaca505e0b27665252444094f6e3a73fbb20c5d66
+EBUILD libarchive-3.5.1.ebuild 3890 BLAKE2B c4abafeada5374ccbb41905c05b33c18560b213f2c693d1d3f2225e70576cbbc52e57662cb23997c6038c3577fcdd49d19469d638bd48884e69dc5aa7bc0ddb5 SHA512 96e1b4889773fe20c9df748da3e57c60d8bb97653603e4b39f1216d5fcabd557b0a1d1de2ef184ae7d27426d8005a66993382eaede8a574844c9901cd506a8a8
MISC metadata.xml 1514 BLAKE2B 377e5cfd85ad2660469744537665395cb99b12187f63d5a2202b8eee52cbe19adcc9f5289ea6665e5bc5f4e9339a5280e1e6dd297199cb009bebb37624009a5b SHA512 8dd39292864923ced4fab7f1307130082525aab611f94e5c7eee25045168e812dade090ea621ca3252eeb85ef8c7269fcaf0de1adc2979f4567f5e01581540e7
diff --git a/app-arch/libarchive/libarchive-3.5.1.ebuild b/app-arch/libarchive/libarchive-3.5.1.ebuild
index ea5dd6b3e541..27cc87b1cfdf 100644
--- a/app-arch/libarchive/libarchive-3.5.1.ebuild
+++ b/app-arch/libarchive/libarchive-3.5.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://www.libarchive.org/downloads/${P}.tar.gz"
LICENSE="BSD BSD-2 BSD-4 public-domain"
SLOT="0/13"
-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="acl blake2 +bzip2 +e2fsprogs expat +iconv kernel_linux libressl lz4 +lzma lzo nettle static-libs +threads xattr +zlib zstd"
RDEPEND="
diff --git a/app-backup/Manifest.gz b/app-backup/Manifest.gz
index 0a75c626270a..8eb3143534cf 100644
Binary files a/app-backup/Manifest.gz and b/app-backup/Manifest.gz differ
diff --git a/app-backup/snapper/Manifest b/app-backup/snapper/Manifest
index 94190fa571f0..8815e9ffbbbf 100644
--- a/app-backup/snapper/Manifest
+++ b/app-backup/snapper/Manifest
@@ -1,12 +1,11 @@
AUX cron-confd.patch 916 BLAKE2B 52672e59ebbfde9dd120516d9c0fb80443b8bfe38d08ec943956005a3d07aa1ed3e9273c572730722a02d3b841859dbc8d3fa81e89e87d6958251abec016716c SHA512 7f0872b14f1fa6b3c7990a9b219a0b2c0b941b1376fb89eda6e4fdf4b3b37818d0114febdb21d2432f5b1c08f1ba4354936d556c1c26953a0fe0f3196d699aa7
AUX snapper-0.5.6-swap.patch 852 BLAKE2B 89b05a268d3fed009665c9db6e43d5552023940b14c5afb58521582ba10c9ce332cf2aa07dcb336dd8cb825e5063a553aa6fcb84f597e380831bf0d507b7a96b SHA512 7ec3a471ece6e24c6e225f45401635317197a8d4daebb32817df64b035df3a7df02f0af85677a37d7a2b69af1afc785d70bcfe42252cc7453bc7eb2f7aa2740b
+AUX snapper-0.8.15-testsuite.patch 2528 BLAKE2B c68cb221ade1d281f0d8bdfc5b4853d1bd3f6409ac0bca56ed9348968f2f5f66646105e2158a8cb55857afe41ee1078427b953d964b30877e887e40928a0a01b SHA512 29a447e26eb5092f40f5ca097026ca6f62a5c75c5be4ed51ec5a77eff80a25f86ddf0c67f6805a180e45f81c64594908fb5d30a52db68e96e975f40d50a095d2
AUX snapper.bash 5939 BLAKE2B f8139dfbfb9bd9616d1b43cc1e90e0f7cf4472515a12425c8501c8109af72206e76c19d95f2156afd7048085fe48c84509fdffddbd11242db66f40732c68230f SHA512 c72a9557a93e988ccebc76b076a1abb9fcccea582b80f615b98b69fd4671a2f52c0dd60cbc6248ed9c55ddf96ea16b10a874348325f61fe14a0b675fd0887e98
DIST snapper-0.5.6.tar.bz2 580047 BLAKE2B 3b945acbf734db1925dad5515323a64a2c08ee8226a593025f9160e0d1b1140734b2b498d036256946159900b50fec8567147dc0a974c281be747e977bcbd05b SHA512 392427d097cbe221bf7ca0ae20bc065dffaa4d0017ed750c41748d71128fc7ce054bb4425d6dbed7308a530df71815f80f56e60d72aab17ef3e0a16f3b3ba47e
-DIST snapper-0.8.6.tar.bz2 607016 BLAKE2B 3e496fa22b1ecce2079d79caeb530ca1538febcc6bdf04aa0256e5b43bb546ea66436e60eeaae6722bc869c60579bc47c556671c5878dd671c266102516f04bb SHA512 f01a309a8dcfff455bf480ff297108e8ec3603d469d50f08740176e22bc2b8dd211de678fa8ce12c1ccd828348a35c6d347ca51b829d7b8c30b3fbaba4e9e2d9
-DIST snapper-0.8.7.tar.bz2 622381 BLAKE2B 82d1a9c91beb309e87acfa914b55b2ff5900edc023a5ecd6f2bee6b1a15adb1336656f3f1fffea4a9971aa449b7825750e6c680806d4574faada5bba0a6d14f1 SHA512 6fa63c2453f93a724f0ac23d84ff2c5aafc654463e84a4f767bb8a75a0d4fb7ca7314811179d5fefddddce0df4441298c67b473596aa720d86eeefa43011b727
+DIST snapper-0.8.15.tar.gz 393310 BLAKE2B a977ed8cdcbd73b4e49713dc48407c9bdab88e3084f6d9030c555da860b7277961e8e742103bbe04a05a1efa9bbe916a08fc04da3c2bcb59df8d5e53c038c373 SHA512 cdcc811c4299373e22043780a2cc06e7d5bca44fbf62f92ecb76162e791849b6002b35fe804b8b89524fd5e3ed26ed4120f09b62b202e41fedb7339ab9fe267c
DIST snapper-0.8.9.tar.gz 373192 BLAKE2B 55c927136518e91b45631f3087fce13e8e08228274ef7c54164a7024e382a45bfa5b40687fd5e3d770fc87019d8e93af5c681013a023cd89dcb1f16863a77421 SHA512 5a3e45839cd4b5e621425df2e1214ca5014a391d17b489fdf7d315e8ac9959741c1f6fcf7adf644276ed11488bc0f88fcfa563198bd78824867d267df204659d
EBUILD snapper-0.5.6-r1.ebuild 1686 BLAKE2B 12cc9169119ff75a9b2c8ff7945c6b7d5c86077efee9b308fb668a9bd765cee21354fca37d353c0a7ff18029fb45286fa27a54e565e24c146b0838391a867b61 SHA512 fd57c4d10cd2d0f4f190fa887099a8a701fd1e5a6ae0b834fd8bcd1d60255cd66ae942311d16c76a0914e679afc2824b64f04a68ff884d177589e17911fcac39
-EBUILD snapper-0.8.6.ebuild 1720 BLAKE2B b1539038deeb427fc6ca79f713d49f7122b6e1b7e795e0e96473bcdda98752f85a415e4f94f2413d1028e10786e569649122465f6d15addfc1e64ae6eca22d47 SHA512 87875741264b9e309629bff0da167c83f178b3914096ce6a6f6d91045af8d716643e0430a8a93b5c6cdbceb1e92b9df5cf6b8c21f56ea48967491cbd70a304c1
-EBUILD snapper-0.8.7.ebuild 1750 BLAKE2B db18e3f269127500ad265344f338969f385f69bd0143b1c73e61f1345e6e3acd184a15f0e21735fe53839f2f3c29547b3024ac85708bcf4212a2f0002466d898 SHA512 a7418aeb4f7666a38ee46a74d5ad1fba91a05ee16bd25d067f850e78cf9a99e9bef3ec876c45b22b1c009b0eb8ea53089f714f28f826b2d937e1e26158982f1d
+EBUILD snapper-0.8.15.ebuild 2014 BLAKE2B 9d6ecf978206bba9cdebf2733dcefa4686e3a256c4b9f62efac0497722ebc749fd62e7081d23d848b2bd8b99d09e23a35f059878aa607b48eb04456543fde6d8 SHA512 f80851be0cc5df9fabfad61f4a195b7fcacad276ddc215d4fbc569ea096752e3d1a651e79457392f4f7087ec3c4c4e024f58e3501dbdb9a40fbdf2e4a84d9bc9
EBUILD snapper-0.8.9-r1.ebuild 1843 BLAKE2B 8d24ca268222ef6917a6f06c6d83a667c363037ae413b8139844715fb00c38e25e821be080edeeab136267718497f49c675e6b14cd15572c06458baf659a59a1 SHA512 40f4443313427b740f18ad279e8188c48295d8d6b2f38cd0fcb601d9b4f6f1f486e48b3fa1b057d1815ab3f227eb1537ce4c1f1c306256104416a5358d5a3c60
MISC metadata.xml 1300 BLAKE2B a6f8d0942ec42f06331ec08d2b87a8ed5e395718d064eee7de11ae1a41cc0cffd85f012704076dacc46846d35a13bd1f9743ddda511e30a9967b241354ca619b SHA512 4f22d97f6fe05d89a973079f2373dac101859e73327b06eacc1a8a08260f234453240158c5cff320ef888259fc09e32d8abba080d08b0fb06964bf041ba68157
diff --git a/app-backup/snapper/files/snapper-0.8.15-testsuite.patch b/app-backup/snapper/files/snapper-0.8.15-testsuite.patch
new file mode 100644
index 000000000000..237e0705c98d
--- /dev/null
+++ b/app-backup/snapper/files/snapper-0.8.15-testsuite.patch
@@ -0,0 +1,83 @@
+diff --git a/configure.ac b/configure.ac
+index 839d012..ceac54d 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -86,6 +86,12 @@ AS_IF([test "x$with_conf" != xno], [SYSCONFIG="${with_conf}"])
+
+ CPPFLAGS="${CPPFLAGS} -DCONF_DIR='\"${SYSCONFIG}\"'"
+
++AC_ARG_ENABLE([tests], AC_HELP_STRING([--disable-tests],[Disable internal tests support]),
++ [with_tests=$enableval],[with_tests=yes])
++AM_CONDITIONAL(ENABLE_TESTS, [test "x$with_tests" = "xyes"])
++if test "x$with_tests" = "xyes"; then
++ AC_DEFINE(ENABLE_TESTS, 1, [Enable internal tests support])
++fi
+
+ AC_ARG_ENABLE([btrfs], AC_HELP_STRING([--disable-btrfs],[Disable Btrfs internal snapshots support]),
+ [with_btrfs=$enableval],[with_btrfs=yes])
+diff --git a/testsuite-cmp/Makefile.am b/testsuite-cmp/Makefile.am
+index 81104bf..9c29477 100644
+--- a/testsuite-cmp/Makefile.am
++++ b/testsuite-cmp/Makefile.am
+@@ -2,6 +2,7 @@
+ # Makefile.am for snapper/testsuite-cmp
+ #
+
++if ENABLE_TESTS
+ AM_CPPFLAGS = -I$(top_srcdir)
+ AM_LDFLAGS = -lboost_system
+
+@@ -15,3 +16,4 @@ cmp_SOURCES = cmp.cc
+
+ EXTRA_DIST = $(noinst_SCRIPTS)
+
++endif
+diff --git a/testsuite-real/Makefile.am b/testsuite-real/Makefile.am
+index 717313a..527843d 100644
+--- a/testsuite-real/Makefile.am
++++ b/testsuite-real/Makefile.am
+@@ -2,6 +2,7 @@
+ # Makefile.am for snapper/testsuite-real
+ #
+
++if ENABLE_TESTS
+ CXXFLAGS += -std=gnu++0x
+
+ AM_CPPFLAGS = -I$(top_srcdir)
+@@ -53,3 +54,4 @@ ug_tests_SOURCES = ug-tests.cc
+
+ EXTRA_DIST = $(test_DATA) $(test_SCRIPTS)
+
++endif
+diff --git a/testsuite/Makefile.am b/testsuite/Makefile.am
+index d7e30b8..72ef5ee 100644
+--- a/testsuite/Makefile.am
++++ b/testsuite/Makefile.am
+@@ -2,6 +2,7 @@
+ # Makefile.am for snapper/testsuite
+ #
+
++if ENABLE_TESTS
+ AM_CPPFLAGS = -I$(top_srcdir) $(DBUS_CFLAGS)
+
+ LDADD = ../snapper/libsnapper.la ../dbus/libdbus.la -lboost_unit_test_framework
+@@ -40,3 +41,4 @@ json_formatter_test_LDADD = -lboost_unit_test_framework ../client/utils/libutils
+ getopts_test_LDADD = -lboost_unit_test_framework ../client/utils/libutils.la
+
+ lvm_utils_test_LDADD = -lboost_unit_test_framework ../snapper/libsnapper.la
++endif
+diff --git a/zypp-plugin/testsuite/Makefile.am b/zypp-plugin/testsuite/Makefile.am
+index 7b52e13..71cb545 100644
+--- a/zypp-plugin/testsuite/Makefile.am
++++ b/zypp-plugin/testsuite/Makefile.am
+@@ -1,3 +1,5 @@
++
++if ENABLE_TESTS
+ if HAVE_ZYPP
+ TEST_LOG_DRIVER = $(SHELL) tap-driver.sh
+
+@@ -12,3 +14,4 @@ TESTS = $(check_SCRIPTS)
+
+ EXTRA_DIST = $(check_SCRIPTS) $(noinst_SCRIPTS) $(noinst_DATA) tap-driver.sh
+ endif
++endif
diff --git a/app-backup/snapper/snapper-0.8.7.ebuild b/app-backup/snapper/snapper-0.8.15.ebuild
similarity index 78%
rename from app-backup/snapper/snapper-0.8.7.ebuild
rename to app-backup/snapper/snapper-0.8.15.ebuild
index bcefeb713f17..62e5c8e65b21 100644
--- a/app-backup/snapper/snapper-0.8.7.ebuild
+++ b/app-backup/snapper/snapper-0.8.15.ebuild
@@ -1,18 +1,18 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-inherit systemd bash-completion-r1
+inherit autotools systemd bash-completion-r1
DESCRIPTION="Command-line program for btrfs and lvm snapshot management"
HOMEPAGE="http://snapper.io/"
-SRC_URI="ftp://ftp.suse.com/pub/projects/snapper/${P}.tar.bz2"
+SRC_URI="https://github.com/openSUSE/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE="lvm pam xattr"
+IUSE="doc lvm pam test systemd xattr"
RDEPEND="dev-libs/boost:=[threads]
dev-libs/libxml2
@@ -28,11 +28,14 @@ RDEPEND="dev-libs/boost:=[threads]
xattr? ( sys-apps/attr )"
DEPEND="${RDEPEND}
+ app-text/docbook-xsl-stylesheets
+ dev-libs/libxslt
sys-devel/gettext
virtual/pkgconfig"
PATCHES=(
"${FILESDIR}"/cron-confd.patch
+ "${FILESDIR}"/${P}-testsuite.patch
)
src_prepare() {
@@ -41,19 +44,25 @@ src_prepare() {
sed -e "s,/usr/lib/systemd/system,$(systemd_get_systemunitdir),g" \
-i data/Makefile.* \
|| die "Failed to fix systemd services and timers installation path"
+ eautoreconf
}
src_configure() {
# ext4 code does not work anymore
# snapper does not build without btrfs
local myeconfargs=(
+ --disable-silent-rules
--with-conf="/etc/conf.d"
- --disable-zypp
+ --enable-zypp
--enable-rollback
+ --enable-btrfs-quota
--disable-ext4
--enable-btrfs
+ $(use_enable doc)
$(use_enable lvm)
$(use_enable pam)
+ $(use_enable test tests)
+ $(use_enable systemd)
$(use_enable xattr xattrs)
)
diff --git a/app-backup/snapper/snapper-0.8.6.ebuild b/app-backup/snapper/snapper-0.8.6.ebuild
deleted file mode 100644
index 1fcb91d42362..000000000000
--- a/app-backup/snapper/snapper-0.8.6.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit systemd bash-completion-r1
-
-DESCRIPTION="Command-line program for btrfs and lvm snapshot management"
-HOMEPAGE="http://snapper.io/"
-SRC_URI="ftp://ftp.suse.com/pub/projects/snapper/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="lvm pam xattr"
-
-RDEPEND="dev-libs/boost:=[threads]
- dev-libs/libxml2
- dev-libs/icu:=
- sys-apps/acl
- sys-apps/dbus
- sys-apps/util-linux
- >=sys-fs/btrfs-progs-3.17.1
- sys-libs/zlib
- virtual/libintl
- lvm? ( sys-fs/lvm2 )
- pam? ( sys-libs/pam )
- xattr? ( sys-apps/attr )"
-
-DEPEND="${RDEPEND}
- sys-devel/gettext
- virtual/pkgconfig"
-
-PATCHES=(
- "${FILESDIR}"/cron-confd.patch
-)
-
-src_prepare() {
- default
-
- sed -e "s,/usr/lib/systemd/system,$(systemd_get_systemunitdir),g" \
- -i data/Makefile.* \
- || die "Failed to fix systemd services and timers installation path"
-}
-
-src_configure() {
- # ext4 code does not work anymore
- # snapper does not build without btrfs
- local myeconfargs=(
- --with-conf="/etc/conf.d"
- --disable-zypp
- --enable-rollback
- --disable-ext4
- --enable-btrfs
- $(use_enable lvm)
- $(use_enable pam)
- $(use_enable xattr xattrs)
- )
-
- econf "${myeconfargs[@]}"
-}
-
-src_install() {
- default
- # Existing configuration file required to function
- newconfd data/sysconfig.snapper snapper
- find "${D}" -name '*.la' -delete || die
- newbashcomp "${FILESDIR}"/${PN}.bash ${PN}
-}
-
-pkg_postinst() {
- elog "In order to use Snapper, you need to set up"
- elog "at least one config first. To do this, run:"
- elog "snapper create-config "
- elog "For more information, see man (8) snapper or"
- elog "http://snapper.io/documentation.html"
-}
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index 818587a3048f..06e1544397f5 100644
Binary files a/app-crypt/Manifest.gz and b/app-crypt/Manifest.gz differ
diff --git a/app-crypt/gnupg/Manifest b/app-crypt/gnupg/Manifest
index 88d3822d10ed..03bd26e15b1e 100644
--- a/app-crypt/gnupg/Manifest
+++ b/app-crypt/gnupg/Manifest
@@ -6,7 +6,7 @@ DIST gnupg-2.2.25.tar.bz2 7195857 BLAKE2B c930edf9259a0e1c508af8d76a86f979860adf
DIST gnupg-2.2.26.tar.bz2 7189254 BLAKE2B f51dd18f6fe327573769d1581ab49bfbca6a56973f6115a68d11e79f52f4b9bdd717ff027800cd1d52fca56abcffa80ee025b49a6af3914f60decdad1e1585ba SHA512 5e9482e126c32c836064b125a18b109f0d3c96892474d3fb47dd791350cccefc56f9a5dfbd54504716487a93d9f71de2493bdfef92e29964b5bfe28b0053c265
DIST gnupg-2.2.27.tar.bz2 7191555 BLAKE2B d652aad382cf07cc458b29ff82718edd47457d8236dcbeee51f22d88503be141f009e9ea45b6dafe614115d9558fe371509579e58ce17a5f04540a31aa406ea3 SHA512 cf336962116c9c08ac80b1299654b94948033ef51d6d5e7f54c2f07bbf7d92c7b0bddb606ceee2cdd837063f519b8d59af5a82816b840a0fc47d90c07b0e95ab
EBUILD gnupg-2.2.20-r2.ebuild 4966 BLAKE2B 28dbe5083ff6a9959548244afea0593f762f1b2671df62d182ccda1aed8f3f40f19ca2ecf452d6c51360b54dbc1eb2b889ead957899e7757314c128df49b3405 SHA512 56f3dc9ffa04db44d45ce9c9cdf3f64407fe6b047f9942a63f5e0b0236848b77da6c3e086814954c6b6ec9770f535a05b839bf0c93ef131708ff500988be57e7
-EBUILD gnupg-2.2.25.ebuild 5280 BLAKE2B 3d3cbe9fe563a1aa5efd540b558d69c934b584859f0253a0f51f2a1d4972636ee6dbb8a2ca6d854df25a9b60ee595791da4dbaffddab2cf515158bde64e11277 SHA512 f28ef793b822b3b9808d182cd3830e7114b1af62ad4b2ea81be629b6b904bfd111688adba0d906846d1a30aefec4cf4940a63e28dcf9b3da999ed0824781247b
+EBUILD gnupg-2.2.25.ebuild 5277 BLAKE2B 811bcfc62e4595439656d277a85bff428689168bc7b0c17f93bad2263ed2e617afdbc6a382de0831f1ea463016e1085594686008aeee1742050761c04b3ad09a SHA512 fc6b374cb73b604df3e234a822a8a4f7d8d600aa7b9563ab3a419157fb48f16a0cce415afac7a32eaa96dbdc094875a1c467d24b285e462618fb8e2ef7cd2911
EBUILD gnupg-2.2.26.ebuild 5176 BLAKE2B 27f5486bc97c1f7afa8467140592986362c8e1010072d410def43f3b29c707e14edafc086e21cd8a1bde40529358aaaaf68e0a1daf9d0bb1de5a627100ee8e05 SHA512 64c0ec53a4c94071bcbc58a306ee445d44ea7bfaf6eb1c13bb36c09d1ce166eabb2403c23431d8c93b77a3483395ec931a839aefe11b0affc3d1cea13a3eba83
EBUILD gnupg-2.2.27.ebuild 5176 BLAKE2B 27f5486bc97c1f7afa8467140592986362c8e1010072d410def43f3b29c707e14edafc086e21cd8a1bde40529358aaaaf68e0a1daf9d0bb1de5a627100ee8e05 SHA512 64c0ec53a4c94071bcbc58a306ee445d44ea7bfaf6eb1c13bb36c09d1ce166eabb2403c23431d8c93b77a3483395ec931a839aefe11b0affc3d1cea13a3eba83
MISC metadata.xml 1379 BLAKE2B e51735e46f2b9ade13d8aa53c1354b1285904933c260efef8e0d6d66e7b8a36199f33ab48cc98006e75e566a21422883dc3694d91e1dcbf1e7c413ba7dab557f SHA512 cd71918f048d081e7a223b9b09b0089b3e015aef674ef233c2aff43e1325ac61a3bd2bfa828071dd157fea0f5ec76ee719ccd339cf94539e3702d48ba6ecd5d4
diff --git a/app-crypt/gnupg/gnupg-2.2.25.ebuild b/app-crypt/gnupg/gnupg-2.2.25.ebuild
index 6f6b6902cf77..dc44640b1635 100644
--- a/app-crypt/gnupg/gnupg-2.2.25.ebuild
+++ b/app-crypt/gnupg/gnupg-2.2.25.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://gnupg/gnupg/${MY_P}.tar.bz2
LICENSE="GPL-3"
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"
IUSE="bzip2 doc ldap nls readline scd-shared-access selinux +smartcard ssl tofu tools usb user-socket wks-server"
# Existence of executables is checked during configuration.
diff --git a/app-doc/Manifest.gz b/app-doc/Manifest.gz
index 36b04e66ac72..880048b6e3ae 100644
Binary files a/app-doc/Manifest.gz and b/app-doc/Manifest.gz differ
diff --git a/app-doc/doxygen/Manifest b/app-doc/doxygen/Manifest
index 30e691a2eabd..6edc3e7982f7 100644
--- a/app-doc/doxygen/Manifest
+++ b/app-doc/doxygen/Manifest
@@ -4,10 +4,13 @@ AUX doxygen-1.8.16-link_with_pthread.patch 691 BLAKE2B c6ced2c6aeb199d7f8ad39f39
AUX doxygen-1.8.17-ensure_static_support_libraries.patch 817 BLAKE2B 085e2c853e10b22f1be38bd85abb3f33b3cefd4fdb565b244626785d6e54972404638c956c9f03b06022184e8308c1b1b4715f5ef83a8cf34b9a7b938e951152 SHA512 bc076b02f5f9d2886d25ac2f1800475990542e956b59afedea2dfadb262bdb317a44f91b47fbd8cd27f77476e215629aeaf1d03a9cbf24f1aafa822a382bb05c
AUX doxygen-1.8.17-llvm10.patch 1405 BLAKE2B 553891d761117276a7b7d3c8526d902b392392eae65943b834a23e21b10d4a38c1d7500716ccc1edfa4246be6180eee8dad0c7bb87b5478b837936a9a61ea110 SHA512 17f996a39c1d59fc5a21090f8de1b5d351ef03144b2dde38ac99515193a0e99d1865ce4950b5711d645cea545df56be8f9a4e2af1e93be01806ca3ef9f81a3bf
AUX doxygen-1.8.9.1-empty-line-sigsegv.patch 489 BLAKE2B 747825ab555b28642fc607980896e3a2f71f27c739a1e2e3afca28beb37ffccf8bf7cccc0bc250a4938c84d5caa5c05d4347496dc754a4cb28b5f506a838e6c6 SHA512 8b9d70fda66eae1fd871fbf29b7587d8f3872810f4b6b7b570d8fd8711a0a0fd84257798261db2c6a7aa7efd8874cf18e1056e67f53d6ec2bd3720cfd0f572ef
+AUX doxygen-1.9.1-ignore-bad-encoding.patch 1016 BLAKE2B 453e13ba115fe7108b0f319b45ad6c3f66c937a2a133eb9c76d38455f71cbbc1ee830e5e632ce36ab2a2906a67b1c676d60c02d0696a9da75862ea4197e209b1 SHA512 71cc9c54bc40f6719c64874e2bd9355cda47c87affec7f3e551fae06cb27bd9c569bffec03d2594c2f1a0190c6975123270fb446c62d8c1fac4c2834c7adaf80
DIST doxygen-1.8.17.src.tar.gz 5138888 BLAKE2B 79d7d64fe2104f3fc802e9ee8f5fcd13ed4f0e23fe3e8d8013d1724d917d5f4e7d8c2df672e253aa2c8d67e839a6169632ebd87bc281b8ee70d217f486e402f7 SHA512 2fd087d127e301ea48355ea52c9af4f2091df06551cf64da80df81f0758194b296efb1e8d3962867a6a6d2da5a3fc323842f7766a445748005b30097ded30a75
DIST doxygen-1.8.20.src.tar.gz 5132703 BLAKE2B 2a9e6df833c64d7052331b52647943f7eaad8214d66962970ad55628cc2ab26883655908588bee2d4872bb2d6d85f8d18cbb03e7dabe0280f337ab53d8538ec9 SHA512 65d104d25061ee59199c74c0328f59fbeaf14f0dade755187ebd43f59008adfef243d4da448b71ae04dc325b848f9bdd109eb20e6f6092f3ed19862426d060cf
+DIST doxygen-1.9.1.src.tar.gz 5117435 BLAKE2B 28c1a1cb8390e17e2b399cea765f837782ee268a999606eef4031a5f65943c793c97bdbd2e2a25a39358ecac5df2c7a62aa4cca72753a924e4e718c512b8a9c7 SHA512 637496c549a4a150cfaeb5d4913de512262145ecd7d455d7b7f3dd68f9416e47d931a6c1efd8a17d931e4baf4a8a9f2ed21124664003b123b6f89ca4abf263ed
EBUILD doxygen-1.8.17-r1.ebuild 3271 BLAKE2B d877706761e38f9eb2190da8bb81a9871b276792b729eb057838592d56048e50dba8dd53823a14759e17e472f7cbbdb69a4df393aba2b30398f8c5fc02ac8d28 SHA512 8c543cba2660e8c71eb82b5ace0cd561312e1264c3b19fd57e887a87a66eeaac6cb72e77cb55afac206afccbe623187bcd63e1e54788fced0e3caa006a680856
EBUILD doxygen-1.8.17.ebuild 3238 BLAKE2B c19e0d899df56655b72bedd4d7fb93fba33babb4689b624f380b52160668225e86cbc229fc684834d908afe376e4114a1da8dc7aeba9b528c506374b5477238e SHA512 2557ee7ba3e915acf3214b0cab332f758d2b3e876fae90eb9ec91fd8d5aaab6f3b61f4b70fba9e4e52c7a14247d44fb5bf644b964d84b59f559b593f8afb779d
EBUILD doxygen-1.8.20.ebuild 3183 BLAKE2B 762457e0e1b12a98f71b2e3e753714589024ea27fda95b6ec87ffa931796eb41ceacdbe0a3494d0f8f11ac6eba4a277e03c9296b35582cf89510b9dd6165f77c SHA512 c00cda20a42bb7f5f2d71c363edd052f14cf56b84487776e439d561ea1c5f22805c8eea9fe588e69c7f4abf19bb126514249056a792ccb10976717d3e182bb5e
-EBUILD doxygen-9999.ebuild 2902 BLAKE2B e5fcc802186b7f1ff3c97db643eefb5be729ce2557ee5bd921513bba7b41a1ee04e1e217dfc52dd436617a0532ac87cfd6d170283894e4a84539cbfbeeeaafdf SHA512 40dbcb0e9a4d7fd1637ed3cef6e9f6cb33b4f45efa8e386a9ed670bc1f96e2d3c4daa5eec68f0287b40b4189f2c10a7b6d7152f8341c88f184e66ae0ba7c0814
+EBUILD doxygen-1.9.1.ebuild 3148 BLAKE2B 2e18a22b8d7797de67d9f459d976d331dc1aa80d1b5dcc43c35d3dfe1c9764e4f846790dd7e1c78c0f8dde10734e891b9a6458a6cecbede7cfe53e4d90d957db SHA512 234c66cdd23e530383d6a5e6c4281d178cbb9e02164a4984a50ba0b11f571f033719e34435327ea8b7ad33f85097b54de39794b5b3f2fcad4fe3249f2984556c
+EBUILD doxygen-9999.ebuild 3148 BLAKE2B 2e18a22b8d7797de67d9f459d976d331dc1aa80d1b5dcc43c35d3dfe1c9764e4f846790dd7e1c78c0f8dde10734e891b9a6458a6cecbede7cfe53e4d90d957db SHA512 234c66cdd23e530383d6a5e6c4281d178cbb9e02164a4984a50ba0b11f571f033719e34435327ea8b7ad33f85097b54de39794b5b3f2fcad4fe3249f2984556c
MISC metadata.xml 891 BLAKE2B 175ca40e223a340b42e5446db6441e7b5a3d273b4457b47a5715911fc0c3ab7ffe24400e472a43182c20fd274404b6d542ba1ac697c7cb8dc0d099c7debba7a6 SHA512 951c1c9ce4096fa8ae4a01959ef4b8d66388d31ad07604e44df2ad5f689fc586d8d915fcedcd89731ba87ece080c4305a2ccf409ef87993017fa285f43196d61
diff --git a/app-doc/doxygen/doxygen-1.9.1.ebuild b/app-doc/doxygen/doxygen-1.9.1.ebuild
new file mode 100644
index 000000000000..c44b0d62387b
--- /dev/null
+++ b/app-doc/doxygen/doxygen-1.9.1.ebuild
@@ -0,0 +1,137 @@
+# 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 cmake flag-o-matic llvm python-any-r1
+if [[ ${PV} = *9999* ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/doxygen/doxygen.git"
+ SRC_URI=""
+else
+ SRC_URI="http://doxygen.nl/files/${P}.src.tar.gz"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+DESCRIPTION="Documentation system for most programming languages"
+HOMEPAGE="http://www.doxygen.org"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="clang debug doc dot doxysearch qt5 sqlite userland_GNU"
+# We need TeX for tests, bug #765472
+RESTRICT="!doc? ( test )"
+
+BDEPEND="sys-devel/bison
+ sys-devel/flex
+ doc? ( ${PYTHON_DEPS} )
+"
+RDEPEND="app-text/ghostscript-gpl
+ dev-lang/perl
+ media-libs/libpng:0=
+ virtual/libiconv
+ clang? ( >=sys-devel/clang-10:= )
+ dot? (
+ media-gfx/graphviz
+ media-libs/freetype
+ )
+ doc? (
+ dev-texlive/texlive-bibtexextra
+ dev-texlive/texlive-fontsextra
+ dev-texlive/texlive-fontutils
+ dev-texlive/texlive-latex
+ dev-texlive/texlive-latexextra
+ dev-texlive/texlive-plaingeneric
+ )
+ doxysearch? ( dev-libs/xapian:= )
+ qt5? (
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtxml:5
+ )
+ sqlite? ( dev-db/sqlite:3 )
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-1.8.9.1-empty-line-sigsegv.patch" #454348
+ "${FILESDIR}/${PN}-1.8.16-link_with_pthread.patch"
+ "${FILESDIR}/${PN}-1.8.17-ensure_static_support_libraries.patch"
+ "${FILESDIR}/${PN}-1.9.1-ignore-bad-encoding.patch"
+)
+
+DOCS=( LANGUAGE.HOWTO README.md )
+
+pkg_setup() {
+ use clang && llvm_pkg_setup
+ use doc && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+ cmake_src_prepare
+
+ # Ensure we link to -liconv
+ if use elibc_FreeBSD && has_version dev-libs/libiconv || use elibc_uclibc; then
+ local pro
+ for pro in */*.pro.in */*/*.pro.in; do
+ echo "unix:LIBS += -liconv" >> "${pro}" || die
+ done
+ fi
+
+ # Call dot with -Teps instead of -Tps for EPS generation - bug #282150
+ sed -i -e '/addJob("ps"/ s/"ps"/"eps"/g' src/dot.cpp || die
+
+ # fix pdf doc
+ sed -i.orig -e "s:g_kowal:g kowal:" \
+ doc/maintainers.txt || die
+
+ if is-flagq "-O3" ; then
+ ewarn
+ ewarn "Compiling with -O3 is known to produce incorrectly"
+ ewarn "optimized code which breaks doxygen."
+ ewarn
+ elog
+ elog "Continuing with -O2 instead ..."
+ elog
+ replace-flags "-O3" "-O2"
+ fi
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -Duse_libclang=$(usex clang)
+ -Dbuild_doc=$(usex doc)
+ -Dbuild_search=$(usex doxysearch)
+ -Dbuild_wizard=$(usex qt5)
+ -Duse_sqlite3=$(usex sqlite)
+ -DGIT_EXECUTABLE="false"
+ )
+
+ use doc && mycmakeargs+=(
+ -DDOC_INSTALL_DIR="share/doc/${P}"
+ )
+
+ cmake_src_configure
+}
+
+src_compile() {
+ if use doc; then
+ export VARTEXFONTS="${T}/fonts" # bug #564944
+
+ if ! use dot; then
+ sed -i -e "s/HAVE_DOT = YES/HAVE_DOT = NO/" \
+ {Doxyfile,doc/Doxyfile} \
+ || die "disabling dot failed"
+ fi
+
+ cmake_src_compile docs
+ fi
+
+ cmake_src_compile
+}
+
+src_install() {
+ cmake_src_install
+}
diff --git a/app-doc/doxygen/doxygen-9999.ebuild b/app-doc/doxygen/doxygen-9999.ebuild
index 3217e3c06602..c44b0d62387b 100644
--- a/app-doc/doxygen/doxygen-9999.ebuild
+++ b/app-doc/doxygen/doxygen-9999.ebuild
@@ -1,19 +1,18 @@
-# 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} )
-CMAKE_MAKEFILE_GENERATOR="emake"
+PYTHON_COMPAT=( python3_{7,8,9} )
-inherit cmake-utils eutils flag-o-matic python-any-r1
+inherit cmake flag-o-matic llvm python-any-r1
if [[ ${PV} = *9999* ]]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/doxygen/doxygen.git"
SRC_URI=""
- KEYWORDS=""
else
SRC_URI="http://doxygen.nl/files/${P}.src.tar.gz"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
DESCRIPTION="Documentation system for most programming languages"
@@ -22,7 +21,13 @@ HOMEPAGE="http://www.doxygen.org"
LICENSE="GPL-2"
SLOT="0"
IUSE="clang debug doc dot doxysearch qt5 sqlite userland_GNU"
+# We need TeX for tests, bug #765472
+RESTRICT="!doc? ( test )"
+BDEPEND="sys-devel/bison
+ sys-devel/flex
+ doc? ( ${PYTHON_DEPS} )
+"
RDEPEND="app-text/ghostscript-gpl
dev-lang/perl
media-libs/libpng:0=
@@ -38,6 +43,7 @@ RDEPEND="app-text/ghostscript-gpl
dev-texlive/texlive-fontutils
dev-texlive/texlive-latex
dev-texlive/texlive-latexextra
+ dev-texlive/texlive-plaingeneric
)
doxysearch? ( dev-libs/xapian:= )
qt5? (
@@ -46,28 +52,25 @@ RDEPEND="app-text/ghostscript-gpl
dev-qt/qtxml:5
)
sqlite? ( dev-db/sqlite:3 )
- "
-
-DEPEND="sys-devel/flex
- sys-devel/bison
- doc? ( ${PYTHON_DEPS} )
- ${RDEPEND}"
-
-# src_test() defaults to make -C testing but there is no such directory (bug #504448)
-RESTRICT="test"
+"
+DEPEND="${RDEPEND}"
PATCHES=(
- "${FILESDIR}/${PN}-1.8.12-link_with_pthread.patch"
+ "${FILESDIR}/${PN}-1.8.9.1-empty-line-sigsegv.patch" #454348
+ "${FILESDIR}/${PN}-1.8.16-link_with_pthread.patch"
"${FILESDIR}/${PN}-1.8.17-ensure_static_support_libraries.patch"
+ "${FILESDIR}/${PN}-1.9.1-ignore-bad-encoding.patch"
)
+
DOCS=( LANGUAGE.HOWTO README.md )
pkg_setup() {
+ use clang && llvm_pkg_setup
use doc && python-any-r1_pkg_setup
}
src_prepare() {
- cmake-utils_src_prepare
+ cmake_src_prepare
# Ensure we link to -liconv
if use elibc_FreeBSD && has_version dev-libs/libiconv || use elibc_uclibc; then
@@ -104,17 +107,16 @@ src_configure() {
-Dbuild_wizard=$(usex qt5)
-Duse_sqlite3=$(usex sqlite)
-DGIT_EXECUTABLE="false"
- )
+ )
+
use doc && mycmakeargs+=(
-DDOC_INSTALL_DIR="share/doc/${P}"
- )
+ )
- cmake-utils_src_configure
+ cmake_src_configure
}
src_compile() {
- cmake-utils_src_compile
-
if use doc; then
export VARTEXFONTS="${T}/fonts" # bug #564944
@@ -123,10 +125,13 @@ src_compile() {
{Doxyfile,doc/Doxyfile} \
|| die "disabling dot failed"
fi
- cmake-utils_src_make -C "${BUILD_DIR}" docs
+
+ cmake_src_compile docs
fi
+
+ cmake_src_compile
}
src_install() {
- cmake-utils_src_install
+ cmake_src_install
}
diff --git a/app-doc/doxygen/files/doxygen-1.9.1-ignore-bad-encoding.patch b/app-doc/doxygen/files/doxygen-1.9.1-ignore-bad-encoding.patch
new file mode 100644
index 000000000000..5dd7578f24ec
--- /dev/null
+++ b/app-doc/doxygen/files/doxygen-1.9.1-ignore-bad-encoding.patch
@@ -0,0 +1,23 @@
+Hack to avoid "UnicodeDecodeError: 'utf-8' codec can't decode byte 0xb0 in position 45: invalid start byte"
+in src/._xmlgen.cpp which is binary. This doesn't seem like it should be present at the time the docs
+are generated, but this is simpler for now.
+--- a/doc/translator.py
++++ b/doc/translator.py
+@@ -1454,10 +1454,13 @@ class TrManager:
+
+ # Read content of the file as one string.
+ assert os.path.isfile(fname)
+- f = xopen(fname)
+- cont = f.read()
+- cont = ''.join(cont.split('\n')) # otherwise the 'match' function won't work.
+- f.close()
++ try:
++ with xopen(fname) as f:
++ cont = f.read()
++ cont = ''.join(cont.split('\n')) # otherwise the 'match' function won't work.
++ except UnicodeDecodeError:
++ print("Skipping {0} because of decoding errors".format(fname))
++ return
+
+ # Remove the items for identifiers that were found in the file.
+ while lst_in:
diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index 63fa5f75c277..927ecf0ae2f6 100644
Binary files a/app-editors/Manifest.gz and b/app-editors/Manifest.gz differ
diff --git a/app-editors/nano/Manifest b/app-editors/nano/Manifest
index fc86be47b249..6e31f6464afa 100644
--- a/app-editors/nano/Manifest
+++ b/app-editors/nano/Manifest
@@ -3,8 +3,10 @@ AUX nano-4.9.3-minimal_build_fix.patch 1357 BLAKE2B d204314118779f7e433cea11ea07
DIST nano-4.9.3.tar.gz 2999198 BLAKE2B a96f707936934a965a9a41dfe13ac1ebbe1a5e38db714df6d219b2c6539f24924d4c4f0451508718f66259854806032b84dc89850a7fd55d157f28ae23531d0e SHA512 233e6ed103441bd2c85ed21c50547f85dc0838cc750a5e9b16ecfb393e3b7b978e971af4a4164062c7c267c98895ecb696c02cbd2e4c2eb1ceee657fd026c30a
DIST nano-5.3.tar.gz 2874796 BLAKE2B d266018f2508153369e10c6f9cf4c53eaeafdf0efe88da6de19efd76ef13fedebe4b9339ae594b751a12cf18a8c4dcd57466ceedfabf61406f63b69c75fceff1 SHA512 019b58779f5a7d9a9472b415715876d0daac313a02b794900339469ee0b5a27ce202e397c00ad6396b7e26a7c303e52c28d981fff85cf774c79a5a8a9835836d
DIST nano-5.4.tar.gz 2898561 BLAKE2B 7e5e48f1e85253a7a4a9be2be2b7663e8798655d9e9e2505df1d1752512058734062af953652c1d11dca464ca06d7c90faf2e54cdb65ba01d0f76cfca0282c18 SHA512 711b1a890649e3a2b62c778e6d54813ed98a8261c47a92aa6d7baa690f86d8563813a764f5dffcc6c259fe9b05f8fe76cf48a3178b09666ba55ee035c91cbe28
+DIST nano-5.5.tar.gz 2943973 BLAKE2B cecc4b3bb74c6ca35a249052cc58df618b6a0445781813d1b06164afb3d119bedf49bdb0a04c327d4db968eeb5b0f1087b84184b83d4b92548c3146a4400389d SHA512 968eac59db2889ba1cb75bc83a30fd0c0ae370a05c668da0f3a20768158f3be0962034737924ea49f06e696e68625bc6841f41aae86aebbe8ba7c00b2627c056
EBUILD nano-4.9.3.ebuild 2303 BLAKE2B ae1b5d040e6c7be9d49ca11fbf8dd63d93b6ae74093ac9795e8e9c0f61532b4dae83ba4ecd1179469edda487babacb0c4fafcb23155039d2ba052bb01d1026e4 SHA512 7afddc9908b55b2a397915a2a1716c775ac09666eacee600873a19bf0103c49202daa5880a9f19115b6a1488f42dcab16e235cec2c3f8b285254e51a6183fbeb
EBUILD nano-5.3-r1.ebuild 2417 BLAKE2B 67f81d38936522e480337cdedd8156835e01c92cfe80f4126787015e822ecaec935bcb008a6e02808af155f0dc15b14d3cb209e4583818f1a0a45607004b4bae SHA512 a4b0af913ea15fcdf05e2a6d76eabedcd7833d2a01f879223c1a39a8b670c46c7230b36cfffc57f35b971c875552d21ca184dc108bcc044c87551bd4067f5312
EBUILD nano-5.4.ebuild 2426 BLAKE2B 5f2c77741c935c09a85bcf7741617c535cf2ea248e7f5cb486699190f4106f59b96567b66ae9498dbfba46eb30a9afd40ef2fe4fe30db49758968bf195c6725f SHA512 29f11d409df9fb2193cb915e59e96174f9079ecc1bec981749b79d5946556ceb2c07219ba46e817fa88a24593498d0c3efbe452566b871f5ca916885612397af
-EBUILD nano-9999.ebuild 2426 BLAKE2B 5f2c77741c935c09a85bcf7741617c535cf2ea248e7f5cb486699190f4106f59b96567b66ae9498dbfba46eb30a9afd40ef2fe4fe30db49758968bf195c6725f SHA512 29f11d409df9fb2193cb915e59e96174f9079ecc1bec981749b79d5946556ceb2c07219ba46e817fa88a24593498d0c3efbe452566b871f5ca916885612397af
+EBUILD nano-5.5.ebuild 2277 BLAKE2B 966340463238b8bf4b42c5c2f8de3e0b02b3807ccc5d7bcbe995f6e453a3ad8522b4f3ca649de2378bc3af2f8727911a6c2a1be97c7fbc095720e8a2fcbed086 SHA512 acf553fac40d5f51ddf9324156bcda8170e18da51badb79f7a5283b36e8a5f1505e9a832c172d5b91f934b665af6f068e34411472eb37d5b5fdddee33f39a2b9
+EBUILD nano-9999.ebuild 2277 BLAKE2B 966340463238b8bf4b42c5c2f8de3e0b02b3807ccc5d7bcbe995f6e453a3ad8522b4f3ca649de2378bc3af2f8727911a6c2a1be97c7fbc095720e8a2fcbed086 SHA512 acf553fac40d5f51ddf9324156bcda8170e18da51badb79f7a5283b36e8a5f1505e9a832c172d5b91f934b665af6f068e34411472eb37d5b5fdddee33f39a2b9
MISC metadata.xml 1642 BLAKE2B bd201f1a56bd864dbf7ce5e8dd8b9e0f1a34c236543d8bffa096da1f53460e824171ec629fa84a0a31919fa128e248397671129b8c0a23dfdda9d685e789bf87 SHA512 1b9eac65c24ddc6b917a8bbd1849a7dfd7f29cfa6430eb5945b1a09ec036e68023159882c632fe3dfe04038673cac68ecc74fb128a8bbdf1a2b0aa6cfd3a398c
diff --git a/app-editors/nano/nano-5.5.ebuild b/app-editors/nano/nano-5.5.ebuild
new file mode 100644
index 000000000000..64c74e70f9b1
--- /dev/null
+++ b/app-editors/nano/nano-5.5.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic
+if [[ ${PV} == "9999" ]] ; then
+ EGIT_REPO_URI="git://git.sv.gnu.org/nano.git"
+ inherit git-r3 autotools
+else
+ MY_P="${PN}-${PV/_}"
+ SRC_URI="https://www.nano-editor.org/dist/v${PV:0:1}/${MY_P}.tar.gz"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+DESCRIPTION="GNU GPL'd Pico clone with more functionality"
+HOMEPAGE="https://www.nano-editor.org/ https://wiki.gentoo.org/wiki/Nano/Basics_Guide"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="debug justify magic minimal ncurses nls +spell +split-usr static unicode"
+
+LIB_DEPEND=">=sys-libs/ncurses-5.9-r1:0=[unicode?]
+ sys-libs/ncurses:0=[static-libs(+)]
+ magic? ( sys-apps/file[static-libs(+)] )
+ nls? ( virtual/libintl )"
+RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
+DEPEND="${RDEPEND}
+ static? ( ${LIB_DEPEND} )"
+BDEPEND="
+ nls? ( sys-devel/gettext )
+ virtual/pkgconfig
+"
+
+REQUIRED_USE="
+ magic? ( !minimal )
+"
+
+src_prepare() {
+ default
+ if [[ ${PV} == "9999" ]] ; then
+ eautoreconf
+ fi
+}
+
+src_configure() {
+ use static && append-ldflags -static
+ local myconf=(
+ --bindir="${EPREFIX}"/bin
+ --htmldir=/trash
+ $(use_enable !minimal color)
+ $(use_enable !minimal multibuffer)
+ $(use_enable !minimal nanorc)
+ $(use_enable magic libmagic)
+ $(use_enable spell speller)
+ $(use_enable justify)
+ $(use_enable debug)
+ $(use_enable nls)
+ $(use_enable unicode utf8)
+ $(use_enable minimal tiny)
+ )
+ econf "${myconf[@]}"
+}
+
+src_install() {
+ default
+ # don't use "${ED}" here or things break (#654534)
+ rm -r "${D}"/trash || die
+
+ dodoc doc/sample.nanorc
+ docinto html
+ dodoc doc/faq.html
+ insinto /etc
+ newins doc/sample.nanorc nanorc
+ if ! use minimal ; then
+ # Enable colorization by default.
+ sed -i \
+ -e '/^# include /s:# *::' \
+ "${ED}"/etc/nanorc || die
+
+ # Since nano-5.0 these are no longer being "enabled" by default
+ # (bug #736848)
+ local rcdir="/usr/share/nano"
+ mv "${ED}"${rcdir}/extra/* "${ED}"/${rcdir}/ || die
+ rmdir "${ED}"${rcdir}/extra || die
+ fi
+
+ use split-usr && dosym ../../bin/nano /usr/bin/nano
+}
diff --git a/app-editors/nano/nano-9999.ebuild b/app-editors/nano/nano-9999.ebuild
index 92473ae856c8..64c74e70f9b1 100644
--- a/app-editors/nano/nano-9999.ebuild
+++ b/app-editors/nano/nano-9999.ebuild
@@ -18,13 +18,12 @@ HOMEPAGE="https://www.nano-editor.org/ https://wiki.gentoo.org/wiki/Nano/Basics_
LICENSE="GPL-3"
SLOT="0"
-IUSE="debug justify magic minimal ncurses nls slang +spell +split-usr static unicode"
+IUSE="debug justify magic minimal ncurses nls +spell +split-usr static unicode"
LIB_DEPEND=">=sys-libs/ncurses-5.9-r1:0=[unicode?]
sys-libs/ncurses:0=[static-libs(+)]
magic? ( sys-apps/file[static-libs(+)] )
- nls? ( virtual/libintl )
- !ncurses? ( slang? ( sys-libs/slang[static-libs(+)] ) )"
+ nls? ( virtual/libintl )"
RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
DEPEND="${RDEPEND}
static? ( ${LIB_DEPEND} )"
@@ -34,7 +33,6 @@ BDEPEND="
"
REQUIRED_USE="
- !ncurses? ( slang? ( minimal ) )
magic? ( !minimal )
"
@@ -60,7 +58,6 @@ src_configure() {
$(use_enable nls)
$(use_enable unicode utf8)
$(use_enable minimal tiny)
- $(usex ncurses --without-slang $(use_with slang))
)
econf "${myconf[@]}"
}
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index 851e9aa2c72f..ddee2808bd72 100644
Binary files a/app-emulation/Manifest.gz and b/app-emulation/Manifest.gz differ
diff --git a/app-emulation/containerd/Manifest b/app-emulation/containerd/Manifest
index 243e5905c257..9dbc093ed110 100644
--- a/app-emulation/containerd/Manifest
+++ b/app-emulation/containerd/Manifest
@@ -1,8 +1,8 @@
AUX containerd.initd 766 BLAKE2B 07b323c35f9cafa156969644ccab7c618baf60a82ad8037538ae23562c5663742a7453e00412eeafa72129a4806f3610f3f77865c7ebf3e58223a7286c9f712e SHA512 b70abb44d6bc0cdd8115104ef1fbb5099a270c29040351ceff738b9b6ff796a802f92dbbe2c49e04ae058043546bbe6a854e25044f5c07bea7bf6b6fc4f66018
DIST containerd-1.3.7.tar.gz 5709989 BLAKE2B 0cfa6f5bcd41c1591e64f41dbba2720bed5f25d61625b6d09be19df56fe74b61532b627c35a830e1e4937333f790f7ff8a5fad18b8869a679a6fec18daf238d3 SHA512 7c6de27b6529e3fb3f924ec67a260a51bc45186d69baa4cae6720a08e5c3b74aeb43d236c0a4739f297b2863233bde7d2246a597c9e17713c48bec767c6bbfee
DIST containerd-1.3.9.tar.gz 5717856 BLAKE2B f6b9741f7d793a18b44813453d185cb9e8f4742fbb2987521445104fb44bca913571d6b4f6386ea048084d6565d41759c6ec95ac4591bd9b2101b40bbaafd8fa SHA512 79e0baab72169f84b8661b77f54d0a906a380cd00cbabd00bfec6c10d71a13fc4dd81c7b5e1c3ce184f91d3f68d6df9b735f13e6e04d494792bf7374058d43aa
-DIST containerd-1.4.3.tar.gz 5717856 BLAKE2B f6b9741f7d793a18b44813453d185cb9e8f4742fbb2987521445104fb44bca913571d6b4f6386ea048084d6565d41759c6ec95ac4591bd9b2101b40bbaafd8fa SHA512 79e0baab72169f84b8661b77f54d0a906a380cd00cbabd00bfec6c10d71a13fc4dd81c7b5e1c3ce184f91d3f68d6df9b735f13e6e04d494792bf7374058d43aa
+DIST containerd-1.4.3.gh.tar.gz 6180754 BLAKE2B 41dfedf18dcdfe942013ca4a036235b39e3ce98c89fa64a99c05693183b26c071cec613566234de709df943da6ebd62e6a29b918b30233b9660519c4970c0f0c SHA512 0bb64ebc8afc87781fbdb21b7c8362e3cd9a3afe88c053905e9c6859788f0801187aa6abb79dc1d293dd92f74d320ff4a2293a6abb00914781a487a869e68a80
EBUILD containerd-1.3.7.ebuild 1976 BLAKE2B e3559d3d0377c627707d8556c3ddad741d7987df808c35df00f9971659a2d09f6332961a2d77eb7eea1d5df6a7a0304148244b652af7fa8805397c1f7c657b68 SHA512 f37f918409e9f5b0316e3cba207a773ccf0fc8317cf12fdc91732d6825848eceb8c03886ad652789aa6f88e9478aefe831536f0ecfcd9adc278f2dd11c9b6a3c
EBUILD containerd-1.3.9.ebuild 1943 BLAKE2B 638d7118f30791a508d0647e2a122e53f513b70513749f10458701bc3971ee48d76134166b1b5405f382c26783f3aef8151a45ed8d3e1da2605de10b6a5b7631 SHA512 73d59882125d5782c6a8bf6bafd87331267d1e2281cf04231f67bb1ed91b2153b11fe8e916176eea89794484481e811e83ef7b4af471c655d016cf8cc290a857
-EBUILD containerd-1.4.3-r1.ebuild 1946 BLAKE2B 83acdbb6f0021012875956679b92a965be4ae6a5a1979e051ae4486262bbec6121c8b161d17ca65bb02e393b75a0b7833560d208dc57f564f8806d7a51ca52ee SHA512 358c521283c93fc51773819302946dc237731c677285f6386f858f9ed153754feac40fe1d8b0df9fe1056daf6e42f42df7ccfde227f8ccf8516d6629e74dee86
+EBUILD containerd-1.4.3-r2.ebuild 2044 BLAKE2B 05a9dcd98dc56b87a41425eaa57e866f61ecf99f74d770db9c0637a75f9e90ae43920504358e9896b1eaf51c20621522ff754580cb1be271ca680b1bb7d2d77b SHA512 d32677001130132dc4399bf913d6d34216ecc328e85a906e704b61ddf81d264d6ebff6c0c28012511bc4f26a85ed47958bdd3736228d52f13413bf4199729c3a
MISC metadata.xml 1073 BLAKE2B 5f1a667e9b8812a71e24318d51353b010f9a3662c608627c68cdd13431a6d8380b51b8b8619b2a98fd9dece381a391f18a35458156ef7743b10825aee4c58e8f SHA512 46e110750ad8da48d741b612c8c1f030d493636c0255f1944134660eddb5693488c1093df47252d09589bf90565d525819a82a0594ce8f727165f1a822acb537
diff --git a/app-emulation/containerd/containerd-1.4.3-r1.ebuild b/app-emulation/containerd/containerd-1.4.3-r2.ebuild
similarity index 89%
rename from app-emulation/containerd/containerd-1.4.3-r1.ebuild
rename to app-emulation/containerd/containerd-1.4.3-r2.ebuild
index 0cbf0912b442..90dd18565d1c 100644
--- a/app-emulation/containerd/containerd-1.4.3-r1.ebuild
+++ b/app-emulation/containerd/containerd-1.4.3-r2.ebuild
@@ -1,18 +1,19 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
# update on bump, look for https://github.com/docker\
# docker-ce/blob//components/engine/hack/dockerfile/install/containerd.installer
-CONTAINERD_COMMIT="ea765ab"
+CONTAINERD_COMMIT="269548fa27e0089a8b8278fc4fc781d7f65a939b"
EGO_PN="github.com/containerd/${PN}"
inherit golang-vcs-snapshot toolchain-funcs
DESCRIPTION="A daemon to control runC"
HOMEPAGE="https://containerd.io/"
-SRC_URI="https://github.com/containerd/${PN}/archive/${CONTAINERD_COMMIT}.tar.gz -> ${P}.tar.gz"
+# NOTE: Drop '.gh' on bump, it's there because of bug #764791
+SRC_URI="https://github.com/containerd/${PN}/archive/${CONTAINERD_COMMIT}.tar.gz -> ${P}.gh.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
@@ -78,7 +79,8 @@ src_install() {
# we already installed manpages, remove markdown source
# before installing docs directory
- rm -rf docs/man || die
+ rm -r docs/man || die
+
local DOCS=( README.md PLUGINS.md docs/. )
einstalldocs
}
diff --git a/app-emulation/lxc/Manifest b/app-emulation/lxc/Manifest
index 0ad04a4f767a..c2aa6b1bd096 100644
--- a/app-emulation/lxc/Manifest
+++ b/app-emulation/lxc/Manifest
@@ -4,5 +4,8 @@ AUX lxc.initd.8 3669 BLAKE2B 50d41e0923ba26b9653ca3b5b559dd0905e61ec81969e709650
AUX lxc_at.service.4.0.0 284 BLAKE2B 1adc76b9861f2499b7b703f7076782a258f9b21a3d1e32b69334f753faca9ecd8c6fb2a03baf04698e765f079e73ee683434d8c7c6d3b3082427a6af74ab33b1 SHA512 4c2f9846ca60bb78df7e652309900c0e788b45d569f268a9e5b98842518542b35fce253e2aedeb0eded3d37274390988ef887b01d1d37859ccddf6225286b4bb
DIST lxc-4.0.5.tar.gz 1368909 BLAKE2B 9fdef5600fe5fd427703312f07ed6499285a59d74c7c0572f036a108454192347166fe08df4551fa8df4e414167b7b081b8a1902036c7c8a012f27b99cc83335 SHA512 d536e767f4b7c1ea974469a19f89ddbcebbc3f8c7922b174b966fb2e80ae33199a8a915a962da9cbc7e075442555bc355525f2d4f8e76498b8a7e49f46dc006f
DIST lxc-4.0.5.tar.gz.asc 833 BLAKE2B 8cc3f00e3a3359b525f7ead48f4cce7b386a75c04b43eefe0ec939786e368712c2674a17fe9e9ef58649147c7f2d5682f5a0c280ddc8ca8c34664069d5efd4b5 SHA512 9e67932fa424224d39ec6c5c32a6e6c3cdf305d3e4d7c8ddbb8ab86a38392c30b56a20b11e4f85e3645a97c106a13ef868a5d3c78ac57bc8cb44cee20e83a700
+DIST lxc-4.0.6.tar.gz 1363162 BLAKE2B e2d9d281cf521575aeecefbcba0c7b7f336ab73193be94e760b37eb6f3423ec3520f194549def6f64c1662f22b7df5a03dfc6b4e6dac1bf229c5f726f51b4d43 SHA512 98514796ef2091a291516ed7fde737df07ccfe374a0f8b4314e0ee992837e98ed02aa9f7809f8808a2f5ee1c7ae2dcea163531cdaedbb577211eeb9beff90c15
+DIST lxc-4.0.6.tar.gz.asc 833 BLAKE2B 04b6bda0ed52a6ab8eebde4d3d5f1f6cb19eea017ae989d47323831d467324f99801b40c3bb70f00d7521753a298e6fa339f0da039c4d72b0163d0efc815d7e7 SHA512 baeafa5b63034e2884d5ab4f11710612bed1c61cd493ac19b9b24b93365b89325518b69878015b4b752f71beda47ecabf774b698e6be9ec9aa86376df2c302db
EBUILD lxc-4.0.5.ebuild 4740 BLAKE2B 404458da3595bfbd8b5bef903b138e25a58d5147571d29417610e9997cdf06bca78d0c4ade1de168d6846e87810541c25d3ae1b290c48650cae07c5e0cab3f3c SHA512 8a227ff5a974ddd7e017a53c7c4ba09274717d1060c7c7e22a1cf8609e80eaf85c7a51e8801a56061a85fce07cd747f71fa004f73f1c04b142deb120bbea9edf
+EBUILD lxc-4.0.6.ebuild 4747 BLAKE2B c63a42de22131e7573ee751eb9578100d5b45eb5badc28998f3876e9eb117e9c47d05befb129ab7c8f906f298192af973c76ea6dafbe4e7ba6231a90c78ecda7 SHA512 48acb758092b4368998a2986b4caa0d1c5e37ed53552f75769f6095d66696f8ca89e035c4cd40949e51819a7d0ffd0a3d22dc66fa4740c3bd5f8ca9137358d8e
MISC metadata.xml 663 BLAKE2B 4e6b34cc41c0ff68c3c5867e4c81277e82255512678c495879114a9c51b3a0eb50f6f7a514752e27c2aea8215b2241c255a4a7b6258c73927cbc3f112d9985f1 SHA512 05813d7ee6a5e1ec6558b3ade26452e9cbdbaa94479ed320f0b7db9af27e7bc32543e6fad5543746b21b6983158090cff55b826d219a4f66a51264949d95f0ff
diff --git a/app-emulation/lxc/lxc-4.0.6.ebuild b/app-emulation/lxc/lxc-4.0.6.ebuild
new file mode 100644
index 000000000000..c8596294b80d
--- /dev/null
+++ b/app-emulation/lxc/lxc-4.0.6.ebuild
@@ -0,0 +1,174 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools bash-completion-r1 linux-info flag-o-matic optfeature pam readme.gentoo-r1 systemd verify-sig
+
+DESCRIPTION="A userspace interface for the Linux kernel containment features"
+HOMEPAGE="https://linuxcontainers.org/ https://github.com/lxc/lxc"
+SRC_URI="https://linuxcontainers.org/downloads/lxc/${P}.tar.gz
+ verify-sig? ( https://linuxcontainers.org/downloads/lxc/${P}.tar.gz.asc )"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+LICENSE="LGPL-3"
+SLOT="0"
+IUSE="apparmor +caps doc examples libressl man pam selinux +ssl +tools verify-sig"
+
+RDEPEND="acct-group/lxc
+ acct-user/lxc
+ app-misc/pax-utils
+ sys-apps/util-linux
+ sys-libs/libcap
+ sys-libs/libseccomp
+ virtual/awk
+ caps? ( sys-libs/libcap )
+ pam? ( sys-libs/pam )
+ selinux? ( sys-libs/libselinux )
+ ssl? (
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl:0= )
+ )"
+DEPEND="${RDEPEND}
+ >=sys-kernel/linux-headers-4
+ apparmor? ( sys-apps/apparmor )"
+BDEPEND="doc? ( app-doc/doxygen )
+ man? ( app-text/docbook-sgml-utils )
+ verify-sig? ( app-crypt/openpgp-keys-linuxcontainers )"
+
+CONFIG_CHECK="~!NETPRIO_CGROUP
+ ~CGROUPS
+ ~CGROUP_CPUACCT
+ ~CGROUP_DEVICE
+ ~CGROUP_FREEZER
+
+ ~CGROUP_SCHED
+ ~CPUSETS
+ ~IPC_NS
+ ~MACVLAN
+
+ ~MEMCG
+ ~NAMESPACES
+ ~NET_NS
+ ~PID_NS
+
+ ~POSIX_MQUEUE
+ ~USER_NS
+ ~UTS_NS
+ ~VETH"
+
+ERROR_CGROUP_FREEZER="CONFIG_CGROUP_FREEZER: needed to freeze containers"
+ERROR_MACVLAN="CONFIG_MACVLAN: needed for internal (inter-container) networking"
+ERROR_MEMCG="CONFIG_MEMCG: needed for memory resource control in containers"
+ERROR_NET_NS="CONFIG_NET_NS: needed for unshared network"
+ERROR_POSIX_MQUEUE="CONFIG_POSIX_MQUEUE: needed for lxc-execute command"
+ERROR_UTS_NS="CONFIG_UTS_NS: needed to unshare hostnames and uname info"
+ERROR_VETH="CONFIG_VETH: needed for internal (host-to-container) networking"
+
+DOCS=( AUTHORS CONTRIBUTING MAINTAINERS NEWS README doc/FAQ.txt )
+
+pkg_setup() {
+ linux-info_pkg_setup
+}
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-3.0.0-bash-completion.patch
+ "${FILESDIR}"/${PN}-2.0.5-omit-sysconfig.patch # bug 558854
+)
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/linuxcontainers.asc
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
+src_configure() {
+ append-flags -fno-strict-aliasing
+
+ local myeconfargs=(
+ --bindir=/usr/bin
+ --localstatedir=/var
+ --sbindir=/usr/bin
+
+ --with-config-path=/var/lib/lxc
+ --with-distro=gentoo
+ --with-init-script=systemd
+ --with-rootfs-path=/var/lib/lxc/rootfs
+ --with-runtime-path=/run
+ --with-systemdsystemunitdir=$(systemd_get_systemunitdir)
+
+ --disable-asan
+ --disable-coverity-build
+ --disable-dlog
+ --disable-mutex-debugging
+ --disable-rpath
+ --disable-tests
+ --disable-ubsan
+ --disable-werror
+
+ --enable-bash
+ --enable-commands
+ --enable-memfd-rexec
+ --enable-seccomp
+ --enable-thread-safety
+
+ $(use_enable apparmor)
+ $(use_enable caps capabilities)
+ $(use_enable doc api-docs)
+ $(use_enable examples)
+ $(use_enable man doc)
+ $(use_enable pam)
+ $(use_enable selinux)
+ $(use_enable ssl openssl)
+ $(use_enable tools)
+
+ $(use_with pam pamdir $(getpam_mod_dir))
+ )
+
+ econf "${myeconfargs[@]}"
+}
+
+src_install() {
+ default
+
+ mv "${ED}"/usr/share/bash-completion/completions/${PN} "${ED}"/$(get_bashcompdir)/${PN}-start || die
+ bashcomp_alias ${PN}-start \
+ ${PN}-{attach,cgroup,copy,console,create,destroy,device,execute,freeze,info,monitor,snapshot,stop,unfreeze,wait}
+
+ keepdir /etc/lxc /var/lib/lxc/rootfs /var/log/lxc
+ rmdir "${D}"/var/cache/lxc "${D}"/var/cache || die "rmdir failed"
+
+ find "${D}" -name '*.la' -delete -o -name '*.a' -delete || die
+
+ # Gentoo-specific additions!
+ newinitd "${FILESDIR}/${PN}.initd.8" ${PN}
+
+ # Remember to compare our systemd unit file with the upstream one
+ # config/init/systemd/lxc.service.in
+ systemd_newunit "${FILESDIR}"/${PN}_at.service.4.0.0 "lxc@.service"
+
+ DOC_CONTENTS="
+ For openrc, there is an init script provided with the package.
+ You should only need to symlink /etc/init.d/lxc to
+ /etc/init.d/lxc.configname to start the container defined in
+ /etc/lxc/configname.conf.
+
+ Correspondingly, for systemd a service file lxc@.service is installed.
+ Enable and start lxc@configname in order to start the container defined
+ in /etc/lxc/configname.conf."
+ DISABLE_AUTOFORMATTING=true
+ readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+ readme.gentoo_print_elog
+
+ elog "Please run 'lxc-checkconfig' to see optional kernel features."
+ elog
+ elog "Optional uninstalled dependencies:"
+ optfeature "automatic template scripts" app-emulation/lxc-templates
+ optfeature "Debian-based distribution container image support" dev-util/debootstrap
+ optfeature "snapshot & restore functionality" sys-process/criu
+}
diff --git a/app-emulation/lxd/Manifest b/app-emulation/lxd/Manifest
index c3125892ff2b..5668cd7165a3 100644
--- a/app-emulation/lxd/Manifest
+++ b/app-emulation/lxd/Manifest
@@ -6,6 +6,6 @@ AUX lxd-4.0.0_apparmor.service 567 BLAKE2B e5951c31f90b842f5b625060326d9611ed67f
AUX lxd-containers-4.0.0.service 322 BLAKE2B a38cffd4b5809946abdac858564dcab2c2967c295d671df0d315d790df1849e25f0bc052e20cd0d9e4c23403289050b4538f5a52437ab8ae9ca3b40c6a9a1571 SHA512 a55f2c1a367c5c3c5eb6880e01893977de18c6e9463949236ee3247715fbf53641bbe1b69404362dd6cb6ba2a30ac6539fd362b21059e529dc4dac4ec5ca6718
DIST lxd-4.0.4.tar.gz 14166577 BLAKE2B 5a04efa1bf70d416b328f5f85379a7c697667978a2b7571c05f8d834ccea51c65ce3df447787ccad5c0a9cc524bc396eb5c90b26b92d6252fc07a5be0157e0ea SHA512 800768b923de920e04d676d9c87beedd2ddd164661799c429616f6fa00b36f23ae1d9cff56f2ed16172585b9b3c058ee955eb3e5f8d98c84109c4405c5aae23f
DIST lxd-4.0.4.tar.gz.asc 833 BLAKE2B bac0b63fc7fe61290bd399ef09eaf0bae12ac962b1188c49fa94c9132b002c278dcdb271d35a1784848591a315a8e88eab823c1c653ef814d454a0af607e461b SHA512 7fc9b9b27305d7637efeaf4024a8a26e2f891599fe50fa22e2f9defa6d451a015d74d068f63a9547fce312ed5fb5da82b99be9dc13601f807695cf1b675baf15
-EBUILD lxd-4.0.4-r1.ebuild 3511 BLAKE2B 8dabc47cc1b4ae2b165d5e1f4027816a31a7c7bf1069f198a90859c0b68b94ff9b3f273345a58156cd6771860a4c4eac96d364ade2efeda71dcd1a7ca459d474 SHA512 8a60709dbc465933c2de7c7097dc06e131b3a69b1535fb1af90dd9fbb2ffb05fa524e458bd80394437ad652138c07be9cde45f602f69d85930f3322433020889
-EBUILD lxd-4.0.4-r2.ebuild 3811 BLAKE2B e2affa44f362eeb92c7a6f94c26e32586cb7f57b6bfbe6df35d322323790d866cca13d94d99234afcd318025292bbee19807e50471d75a20688e8d638e959944 SHA512 593c379655756a3ca45006f6708a103972f5ed81e701f28143661d83eed542d4d61e2a0b46f083a2e3f146dc206e36db0c718e0804ad8461717333d76697c2eb
+EBUILD lxd-4.0.4-r3.ebuild 3514 BLAKE2B ff39c8561a720cc1469d1ce1f40c503887c8e07fefa283300052ab87824b39fe386f0d28c049ec001074f8f450dd5d95433ee4b29194aa64f6ae9535ed0937bf SHA512 cd54d26efda60c91975d163172a822391ca6652b7b7699eca46d7a640eb83cd7223e5afc63f01e313b23e0e30a8f6f375a920bec1f66ef6ec6c3955b0bfc0c4e
+EBUILD lxd-4.0.4-r4.ebuild 3814 BLAKE2B a4e563c03078766a50361430c86846735cff4e4b63567a87c1d0f11e941c0eea72fb6f9fe7f4f12eacb65f06630de05e861ee3c3a1a07770923877b76bb3a412 SHA512 3941c7989dcf8d516b1cbff6de61b2ca34cad63e499f3726d43e85133a834725fbe170580af7a98ad14f0c0073b4710a5da3bc4d3dfbd6cce98ffafff9379632
MISC metadata.xml 776 BLAKE2B 5f8e6d2639982bf6564567a9775e55b777d4bd9cb01818770b5089071262ceda815e5d94e853b7c08a470234729c08e313685610b3da457a23bb7edbf5b3ff52 SHA512 050d500629b4331f2f8bd2fa5cbcabadc988d737c891edb66ad8b2ee2fd378690b2fee4c70e0b380c2579cb9a39453768242d7acbead4c5390c7f01131b939c0
diff --git a/app-emulation/lxd/lxd-4.0.4-r1.ebuild b/app-emulation/lxd/lxd-4.0.4-r3.ebuild
similarity index 97%
rename from app-emulation/lxd/lxd-4.0.4-r1.ebuild
rename to app-emulation/lxd/lxd-4.0.4-r3.ebuild
index 81f45b82b6a7..2a2aee90dd4f 100644
--- a/app-emulation/lxd/lxd-4.0.4-r1.ebuild
+++ b/app-emulation/lxd/lxd-4.0.4-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
@@ -17,7 +17,7 @@ KEYWORDS="amd64"
IUSE="apparmor ipv6 nls verify-sig"
DEPEND="app-arch/xz-utils
- >=app-emulation/lxc-3.0.0[apparmor?,seccomp]
+ >=app-emulation/lxc-3.0.0[apparmor?,seccomp(+)]
dev-libs/dqlite
dev-libs/lzo
dev-libs/raft
diff --git a/app-emulation/lxd/lxd-4.0.4-r2.ebuild b/app-emulation/lxd/lxd-4.0.4-r4.ebuild
similarity index 98%
rename from app-emulation/lxd/lxd-4.0.4-r2.ebuild
rename to app-emulation/lxd/lxd-4.0.4-r4.ebuild
index 060fd2fab5e0..361d00b56fa2 100644
--- a/app-emulation/lxd/lxd-4.0.4-r2.ebuild
+++ b/app-emulation/lxd/lxd-4.0.4-r4.ebuild
@@ -17,7 +17,7 @@ KEYWORDS="~amd64"
IUSE="apparmor ipv6 nls verify-sig"
DEPEND="app-arch/xz-utils
- >=app-emulation/lxc-3.0.0[apparmor?,seccomp]
+ >=app-emulation/lxc-3.0.0[apparmor?,seccomp(+)]
dev-libs/dqlite
dev-libs/lzo
dev-libs/raft
diff --git a/app-emulation/wine-staging/Manifest b/app-emulation/wine-staging/Manifest
index ffa2335b63f7..ecaedacdad79 100644
--- a/app-emulation/wine-staging/Manifest
+++ b/app-emulation/wine-staging/Manifest
@@ -1,15 +1,15 @@
DIST gentoo-wine-patches-20200523.tar.xz 59740 BLAKE2B 951d7f305a6e5b3759c8095629d48de4830b8a0c9558de859a9e02d9824fe85553fda2bc0820ca97022a0ca63ac28473dadfe827821220445dbf1a7fd15c7c98 SHA512 46eea45c982b475e3ff444cbd87c6a0a235fc8dcaf3d83d89655a10ed8841a9ddb09e5a638a05803f3bf2c3bd34165c16067aba561efa4c183ee396dc31cdf75
-DIST wine-5.18.tar.xz 24160316 BLAKE2B 4f359b6e869707a514d2198d2b8ba810b8552ea53ff3f37cbc7c23b732152db0fa5c0c909d2c16a03f6b0ff122435c92f8a9b8b462577aa50a39b2dcfa7bcd05 SHA512 70565fbea61b78580ca86443fcb4c10c7814c1dffcfa49ee38746fef21a52a00f2e040d9d2515892fed4021e7868720cc22b650d18872656838e4610d4d4e823
DIST wine-5.20.tar.xz 24177960 BLAKE2B 50169bc00497feef91f5cf7fd56bce8f7784f70d2a24776494d0ab98cdb70b4387a92dece4571b2b22b15c42d82672595f39079a0678e551331f2bee4460f0f8 SHA512 30299287857376a827579335ba410d0575379df300860c8fdd50473f3eec074372d3602e5027f9e75fb13e272f28f51950ec652109839573a168aed23ba9c8f4
DIST wine-5.21.tar.xz 24178740 BLAKE2B 9d6b2766536fb019d69dbffc8dbae0004eeb6d5b3d3f57d0577b4952159b9a5388d1f767d982b3837d713175ac7baec47c7b017e21f4fb586d3d97707491066e SHA512 0879e4edeca60880799736ac831f8ae28c6e5156dde161685aa84a5d8bd20c4f3a51a178fa2b130a9e8af44432bb239160a04829fcef5d8332e2bbf829d2bc18
DIST wine-5.22.tar.xz 24214812 BLAKE2B 7bc093501cb20fbe52e277aadb867e4f55abc9898ae570aebf3496c2f7938129498e6ad8b6de7f8efe28ccffee734c94754da703e0c5d6bad6c1293cefb42c0e SHA512 9e86a1f74a142513121c155ffa5e1dd863ecc00092952878f44185725e81793fd7291e0e3c93275cd0d083d17af99eb1d8feba1c96e8607f44919b9045737271
-DIST wine-staging-5.18.tar.gz 10357038 BLAKE2B 07df0de55d1bfa36d3492498a48d8f1402dffa161f3b02f3326185d524bea9a2f0893b85a70650797bf1b74c06f5814ddc09cb184a5977cfacb968921020aee1 SHA512 75911ac4d5aaf6cfef41aa487290369d714f153b1fba2279daca75d6c5cbc7e7de9d3f8ef55eb7c311a05b86a212163e2b81ff685c1527fb0e90f223ec23dcab
+DIST wine-6.0.tar.xz 24192280 BLAKE2B baf0eee582190ede8d210390b51d330c1879cb442100bc2e957052898fbd84bcc047a885065f9bf96ac4f072f92eee44f0e1c3baddc68937286e7cc6f976bd4e SHA512 c0732fbab1da8737d595a876b28ce87eef1440c317746e798642b59b44b34e890de562e0c0cc674e97096f39db82f8e9c3b1cc1ba9edc246b7266a0f7cb00057
DIST wine-staging-5.20.tar.gz 10378427 BLAKE2B 75910b198ca5b79f41f4aa115a962cb01a4dd208512feffc2ef9bc327d9c82d0c0babd543ea011917257c5dfd7c5f2f2815dae81d553dd4b239b627bafba1635 SHA512 64913c3af44890a959593c610c713113f068811a8fe79e234a61f262af963d194d1d71d336361c6a473ad0f3f64fc5a88cee36facdc0824cea6856fc74da9634
DIST wine-staging-5.21.tar.gz 10362610 BLAKE2B 41f40c33b7d0853c63b81da863145f242b640a0e491b3ee92e1c687d33b85344676e764ae93921f00643b4bd3247e9c9aef4ba92cf80aa43785db1f762eac8cc SHA512 079a7fccd66d886b3498c45057b1bb215d3897e44e0c8d6afb56174fad583e8a578ea888d70d62a18da1566bb9649fdefd08227efecd21fc71b0b3d739dab636
DIST wine-staging-5.22.tar.gz 10342905 BLAKE2B 9f59a0d8c06f29b52fec71cc09915c8a7a23a1ad9945cedeced179657645970048846517f4eced051989b0ef1ee555c9f8176de073a66b3633f3fe1fd90e0836 SHA512 0ce0314b470e90c741fd02ede522b6dd754fb69595b527e3ad5ac62d944bc7eca43eca88aa2b85d99a9945fbad05872cdcd2ac87ed809dcd41a9ce56bfcc1147
-EBUILD wine-staging-5.18.ebuild 20436 BLAKE2B 522ef18a86d633267119e239986bd2fba09eedad6358fb5f441dde3d05ad95af673bb29940e45b17b90415650f7b6e6da6d6c66fa4a1a746c48ef5373b18723f SHA512 37e945cdd14814105bf8d395ea2a36c0e845352bfa11deda2226db61c42706113ca849c11f230b5607dc81cf694be583542026b9b5c9d23463c5dc009bd2b92f
+DIST wine-staging-6.0.tar.gz 9863425 BLAKE2B b51e0c3dc426c637de4ee89ee7d519847edcb04b1fb160f5f196e5560ce570ced682165ac74958433de79e104765d4811f004d323f357b753cf56108b9a631bb SHA512 33845e398e9c3d4bacbd9cd369983e72517fd648747433eabd933b446f9d86f1d61660959ff4e05cb661cf4038550b3df3384f588f3f5504b1f8056196ca3c38
EBUILD wine-staging-5.20.ebuild 20436 BLAKE2B 40da6c7a1e6d008ad55f53ec09b82f7c9830a7c00dca754c2a4d9afd6bf14f0a67cdbd22a1174aeef79d685b08f11628e8131ab7007351ba555c9742270062a1 SHA512 c658843b8dcc234c49c3071a24fa60f9884ef3a939612e203d3433077dd154f8f09429db3467e50d6f1c014f421b228a25cffb06843a758ee6f1a5f1cb4073c8
EBUILD wine-staging-5.21.ebuild 20436 BLAKE2B 40da6c7a1e6d008ad55f53ec09b82f7c9830a7c00dca754c2a4d9afd6bf14f0a67cdbd22a1174aeef79d685b08f11628e8131ab7007351ba555c9742270062a1 SHA512 c658843b8dcc234c49c3071a24fa60f9884ef3a939612e203d3433077dd154f8f09429db3467e50d6f1c014f421b228a25cffb06843a758ee6f1a5f1cb4073c8
EBUILD wine-staging-5.22-r2.ebuild 21689 BLAKE2B 212be2581df2c851d2cc06eac3de72d506d7d142703e2cd29fb116ea32431a9ab60f2950c30f7afad9f97ccd4d91674fed55c54360402933e71d97444833e1c9 SHA512 d7dac0725c2502f9627962bf6ab9a550b5a2ea9ef5a2daabfa2536bb220671860a379229cccbad45aa075a18d449ed6af1cacf295e214a16bee473c6af2f4a74
-EBUILD wine-staging-9999.ebuild 21614 BLAKE2B 0d4e553688ce47e14385dd543d05b84291131180d4f1abae2ad1303416abd5bd843d34b81a71d4bdfccb3550c6756bffe70357a5862b37183eca432e3e7ee982 SHA512 b5fcc7b9d260d393cb040afb92127967faaa92fe8c0196e957664762b6484de1255680037a26fa4b58a6589a4110bcddc96f28ec35e452b5070da63ed8c3f4bb
-MISC metadata.xml 3887 BLAKE2B 488d934f151903b52366045b3080f85543ebe7ae732ddff83fb85ecf011da53253f02a24fe2e3edf0775b4ec4abe2ca3ac2cc8d5445a94295d802486dc137e6b SHA512 016e53c706fb3be797a9d66dcd9d24a3824e890d0d4be4e3bee851e5b39439d1500b126def8623ec21ae1849c68026102d39d5b17bb145069d04aa435a2f0d8c
+EBUILD wine-staging-6.0.ebuild 22040 BLAKE2B 9d26b36dc0163ead5b9302d4a3cd48396d25301fd6a413058d919aa2a28bbc53f15e48e4595e09e334b576d6518cc0f1266588d5fb5b975391c780212b60d0e6 SHA512 8bd69f11bde6febf2f96416913c3ee95d7c239562a19d7c6bae4a7082557e5487a7cefec8a5c1bc0bf7f9ddbcd74756be5e83540f572d53f64284716b016b5d6
+EBUILD wine-staging-9999.ebuild 22040 BLAKE2B 9d26b36dc0163ead5b9302d4a3cd48396d25301fd6a413058d919aa2a28bbc53f15e48e4595e09e334b576d6518cc0f1266588d5fb5b975391c780212b60d0e6 SHA512 8bd69f11bde6febf2f96416913c3ee95d7c239562a19d7c6bae4a7082557e5487a7cefec8a5c1bc0bf7f9ddbcd74756be5e83540f572d53f64284716b016b5d6
+MISC metadata.xml 3966 BLAKE2B ee3d47cb51499adfa3a98d09c9a718f1c51f0dc4b24a57b8d3c1f18e45584bc12ccdb54250162a146f0b7c95b835b84684a16f0164a21832df80bbaa4cefece4 SHA512 7db52c79172194fb0e151431273fbb02694144c3a7d39746e78fcb195471ce0d702d0643cfe24414eda070943b58d21d06db341e3607924de89c34ad5e7b5033
diff --git a/app-emulation/wine-staging/metadata.xml b/app-emulation/wine-staging/metadata.xml
index 453fea4e770c..d0c5202e160f 100644
--- a/app-emulation/wine-staging/metadata.xml
+++ b/app-emulation/wine-staging/metadata.xml
@@ -46,6 +46,7 @@ This variant of the Wine packaging includes the Wine-Staging patchset.
Support GTK+:3 window theming through Wine-Staging
Use virtual/libudev to provide plug and play support
Use sys-libs/libunwind to unwind the stack
+ Use virtual/libusb to provide USB support
Use app-emulation/vkd3d to provide Direct3D 12 support
Enable Vulkan drivers
diff --git a/app-emulation/wine-staging/wine-staging-5.18.ebuild b/app-emulation/wine-staging/wine-staging-6.0.ebuild
similarity index 85%
rename from app-emulation/wine-staging/wine-staging-5.18.ebuild
rename to app-emulation/wine-staging/wine-staging-6.0.ebuild
index 5b6a507ddc06..3eb6ecd117f7 100644
--- a/app-emulation/wine-staging/wine-staging-5.18.ebuild
+++ b/app-emulation/wine-staging/wine-staging-6.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
@@ -7,11 +7,11 @@ PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko
PLOCALE_BACKUP="en"
inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
-
MY_PN="${PN%%-*}"
-MY_P="${MY_PN}-${PV}"
+MY_PV="${PV/_/-}"
+MY_P="${MY_PN}-${MY_PV}"
-if [[ ${PV} == "9999" ]] ; then
+if [[ ${MY_PV} == "9999" ]] ; then
EGIT_REPO_URI="https://source.winehq.org/git/wine.git"
EGIT_BRANCH="master"
inherit git-r3
@@ -19,12 +19,16 @@ if [[ ${PV} == "9999" ]] ; then
#KEYWORDS=""
else
MAJOR_V=$(ver_cut 1)
- SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz"
+ MINOR_V=$(ver_cut 2)
+ if [[ ${MINOR_V} != "0" ]] ; then
+ MINOR_V="x"
+ fi
+ SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.${MINOR_V}/${MY_P}.tar.xz"
KEYWORDS="-* ~amd64 ~x86"
fi
S="${WORKDIR}/${MY_P}"
-STAGING_P="wine-staging-${PV}"
+STAGING_P="wine-staging-${MY_PV}"
STAGING_DIR="${WORKDIR}/${STAGING_P}"
GWP_V="20200523"
PATCHDIR="${WORKDIR}/gentoo-wine-patches"
@@ -35,16 +39,16 @@ SRC_URI="${SRC_URI}
https://dev.gentoo.org/~sarnex/distfiles/wine/gentoo-wine-patches-${GWP_V}.tar.xz
"
-if [[ ${PV} == "9999" ]] ; then
+if [[ ${MY_PV} == "9999" ]] ; then
STAGING_EGIT_REPO_URI="https://github.com/wine-staging/wine-staging.git"
else
SRC_URI="${SRC_URI}
- staging? ( https://github.com/wine-staging/wine-staging/archive/v${PV}.tar.gz -> ${STAGING_P}.tar.gz )"
+ staging? ( https://github.com/wine-staging/wine-staging/archive/v${MY_PV}.tar.gz -> ${STAGING_P}.tar.gz )"
fi
LICENSE="LGPL-2.1"
-SLOT="${PV}"
-IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +faudio +fontconfig +gcrypt +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl staging test themes +threads +truetype udev +udisks +unwind v4l vaapi vkd3d vulkan +X +xcomposite xinerama +xml"
+SLOT="${MY_PV}"
+IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +faudio +fontconfig +gcrypt +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap mingw +mono mp3 netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl staging test themes +threads +truetype udev +udisks +unwind usb v4l vaapi vkd3d vulkan +X +xcomposite xinerama +xml"
REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
X? ( truetype )
elibc_glibc? ( threads )
@@ -86,7 +90,6 @@ COMMON_DEPEND="
lcms? ( media-libs/lcms:2=[${MULTILIB_USEDEP}] )
ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] )
mp3? ( >=media-sound/mpg123-1.5.0[${MULTILIB_USEDEP}] )
- ncurses? ( >=sys-libs/ncurses-5.2:0=[${MULTILIB_USEDEP}] )
netapi? ( net-fs/samba[netapi(+),${MULTILIB_USEDEP}] )
nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] )
odbc? ( dev-db/unixODBC:=[${MULTILIB_USEDEP}] )
@@ -113,6 +116,7 @@ COMMON_DEPEND="
udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
+ usb? ( virtual/libusb:1[${MULTILIB_USEDEP}] )
v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
vaapi? ( x11-libs/libva[X,${MULTILIB_USEDEP}] )
vkd3d? ( >=app-emulation/vkd3d-1.2[${MULTILIB_USEDEP}] )
@@ -130,7 +134,7 @@ RDEPEND="${COMMON_DEPEND}
!app-emulation/wine:0
dos? ( >=games-emulation/dosbox-0.74_p20160629 )
gecko? ( app-emulation/wine-gecko:2.47.1[abi_x86_32?,abi_x86_64?] )
- mono? ( app-emulation/wine-mono:5.1.0 )
+ mono? ( app-emulation/wine-mono:5.1.1 )
perl? (
dev-lang/perl
dev-perl/XML-Simple
@@ -172,7 +176,7 @@ PATCHES=(
PATCHES_BIN=()
# https://bugs.gentoo.org/show_bug.cgi?id=635222
-if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then
+if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${MY_PV} == 9999 ]]; then
DEPEND+=" dev-util/patchbin"
fi
@@ -286,15 +290,45 @@ wine_env_vcs_vars() {
}
pkg_pretend() {
- wine_build_environment_check || die
+ if [[ ${MERGE_TYPE} != binary ]] ; then
+ wine_build_environment_check || die
+
+ # Verify OSS support
+ if use oss && ! use kernel_FreeBSD; then
+ if ! has_version ">=media-sound/oss-4"; then
+ eerror "You cannot build wine with USE=oss without having support from a"
+ eerror "FreeBSD kernel or >=media-sound/oss-4 (only available through external repos)"
+ eerror
+ die
+ fi
+ fi
- # Verify OSS support
- if use oss && ! use kernel_FreeBSD; then
- if ! has_version ">=media-sound/oss-4"; then
- eerror "You cannot build wine with USE=oss without having support from a"
- eerror "FreeBSD kernel or >=media-sound/oss-4 (only available through external repos)"
+ if use mingw && use abi_x86_32 && ! has_version "cross-i686-w64-mingw32/gcc"; then
eerror
- die
+ eerror "USE=\"mingw\" is currently experimental, and requires the"
+ eerror "'cross-i686-w64-mingw32' compiler and its runtime for 32-bit builds."
+ eerror
+ eerror "These can be installed by using 'sys-devel/crossdev':"
+ eerror
+ eerror "crossdev --target i686-w64-mingw32"
+ eerror
+ eerror "For more information on setting up MinGW, see: https://wiki.gentoo.org/wiki/Mingw"
+ eerror
+ die "MinGW build was enabled, but no compiler to support it was found."
+ fi
+
+ if use mingw && use abi_x86_64 && ! has_version "cross-x86_64-w64-mingw32/gcc"; then
+ eerror
+ eerror "USE=\"mingw\" is currently experimental, and requires the"
+ eerror "'cross-x86_64-w64-mingw32' compiler and its runtime for 64-bit builds."
+ eerror
+ eerror "These can be installed by using 'sys-devel/crossdev':"
+ eerror
+ eerror "crossdev --target x86_64-w64-mingw32"
+ eerror
+ eerror "For more information on setting up MinGW, see: https://wiki.gentoo.org/wiki/Mingw"
+ eerror
+ die "MinGW build was enabled, but no compiler to support it was found."
fi
fi
}
@@ -303,7 +337,7 @@ pkg_setup() {
wine_build_environment_check || die
wine_env_vcs_vars || die
- WINE_VARIANT="${PN#wine}-${PV}"
+ WINE_VARIANT="${PN#wine}-${MY_PV}"
WINE_VARIANT="${WINE_VARIANT#-}"
MY_PREFIX="${EPREFIX}/usr/lib/wine-${WINE_VARIANT}"
@@ -317,7 +351,7 @@ pkg_setup() {
}
src_unpack() {
- if [[ ${PV} == "9999" ]] ; then
+ if [[ ${MY_PV} == "9999" ]] ; then
EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack
if use staging; then
local CURRENT_WINE_COMMIT=${EGIT_VERSION}
@@ -420,6 +454,9 @@ src_configure() {
export LDCONFIG=/bin/true
use custom-cflags || strip-flags
+ if use mingw; then
+ export CROSSCFLAGS="${CFLAGS}"
+ fi
multilib-minimal_src_configure
}
@@ -440,7 +477,6 @@ multilib_src_configure() {
$(use_with capi)
$(use_with lcms cms)
$(use_with cups)
- $(use_with ncurses curses)
$(use_with udisks dbus)
$(use_with faudio)
$(use_with fontconfig)
@@ -455,7 +491,8 @@ multilib_src_configure() {
$(use_with jpeg)
$(use_with kerberos krb5)
$(use_with ldap)
- --without-mingw # linux LDFLAGS leak in mingw32: bug #685172
+ # TODO: Will bug 685172 still need special handling?
+ $(use_with mingw)
$(use_enable mono mscoree)
$(use_with mp3 mpg123)
$(use_with netapi)
@@ -475,6 +512,7 @@ multilib_src_configure() {
$(use_with truetype freetype)
$(use_with udev)
$(use_with unwind)
+ $(use_with usb)
$(use_with v4l v4l2)
$(use_with vkd3d)
$(use_with vulkan)
@@ -544,12 +582,20 @@ multilib_src_install_all() {
fi
# Remove wineconsole if neither backend is installed #551124
- if ! use X && ! use ncurses; then
+ if ! use X; then
rm "${D%/}${MY_PREFIX}"/bin/wineconsole* || die
rm "${D%/}${MY_MANDIR}"/man1/wineconsole* || die
- rm_wineconsole() {
- rm "${D%/}${MY_PREFIX}/$(get_libdir)"/wine/{,fakedlls/}wineconsole.exe* || die
- }
+
+ if ! use mingw; then
+ rm_wineconsole() {
+ rm "${D%/}/usr/$(get_libdir)/wine-${WINE_VARIANT}"/wine/{,fakedlls/}wineconsole.exe* || die
+ }
+ else
+ rm_wineconsole() {
+ rm "${D%/}/usr/$(get_libdir)/wine-${WINE_VARIANT}"/wine/wineconsole.exe* || die
+ }
+ fi
+
multilib_foreach_abi rm_wineconsole
fi
@@ -576,12 +622,12 @@ multilib_src_install_all() {
}
pkg_postinst() {
- eselect wine register ${P}
+ eselect wine register ${PN}-${MY_PV}
if [[ ${PN} == "wine-vanilla" ]]; then
- eselect wine register --vanilla ${P} || die
+ eselect wine register --vanilla ${PN}-${MY_PV} || die
else
if use staging; then
- eselect wine register --staging ${P} || die
+ eselect wine register --staging ${PN}-${MY_PV} || die
fi
fi
@@ -604,12 +650,12 @@ pkg_postinst() {
}
pkg_prerm() {
- eselect wine deregister ${P}
+ eselect wine deregister ${PN}-${MY_PV}
if [[ ${PN} == "wine-vanilla" ]]; then
- eselect wine deregister --vanilla ${P} || die
+ eselect wine deregister --vanilla ${PN}-${MY_PV} || die
else
if use staging; then
- eselect wine deregister --staging ${P} || die
+ eselect wine deregister --staging ${PN}-${MY_PV}|| die
fi
fi
diff --git a/app-emulation/wine-staging/wine-staging-9999.ebuild b/app-emulation/wine-staging/wine-staging-9999.ebuild
index ccde3bd86527..3eb6ecd117f7 100644
--- a/app-emulation/wine-staging/wine-staging-9999.ebuild
+++ b/app-emulation/wine-staging/wine-staging-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=6
@@ -7,11 +7,11 @@ PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko
PLOCALE_BACKUP="en"
inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
-
MY_PN="${PN%%-*}"
-MY_P="${MY_PN}-${PV}"
+MY_PV="${PV/_/-}"
+MY_P="${MY_PN}-${MY_PV}"
-if [[ ${PV} == "9999" ]] ; then
+if [[ ${MY_PV} == "9999" ]] ; then
EGIT_REPO_URI="https://source.winehq.org/git/wine.git"
EGIT_BRANCH="master"
inherit git-r3
@@ -19,12 +19,16 @@ if [[ ${PV} == "9999" ]] ; then
#KEYWORDS=""
else
MAJOR_V=$(ver_cut 1)
- SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz"
+ MINOR_V=$(ver_cut 2)
+ if [[ ${MINOR_V} != "0" ]] ; then
+ MINOR_V="x"
+ fi
+ SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.${MINOR_V}/${MY_P}.tar.xz"
KEYWORDS="-* ~amd64 ~x86"
fi
S="${WORKDIR}/${MY_P}"
-STAGING_P="wine-staging-${PV}"
+STAGING_P="wine-staging-${MY_PV}"
STAGING_DIR="${WORKDIR}/${STAGING_P}"
GWP_V="20200523"
PATCHDIR="${WORKDIR}/gentoo-wine-patches"
@@ -35,16 +39,16 @@ SRC_URI="${SRC_URI}
https://dev.gentoo.org/~sarnex/distfiles/wine/gentoo-wine-patches-${GWP_V}.tar.xz
"
-if [[ ${PV} == "9999" ]] ; then
+if [[ ${MY_PV} == "9999" ]] ; then
STAGING_EGIT_REPO_URI="https://github.com/wine-staging/wine-staging.git"
else
SRC_URI="${SRC_URI}
- staging? ( https://github.com/wine-staging/wine-staging/archive/v${PV}.tar.gz -> ${STAGING_P}.tar.gz )"
+ staging? ( https://github.com/wine-staging/wine-staging/archive/v${MY_PV}.tar.gz -> ${STAGING_P}.tar.gz )"
fi
LICENSE="LGPL-2.1"
-SLOT="${PV}"
-IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +faudio +fontconfig +gcrypt +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap mingw +mono mp3 netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl staging test themes +threads +truetype udev +udisks +unwind v4l vaapi vkd3d vulkan +X +xcomposite xinerama +xml"
+SLOT="${MY_PV}"
+IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +faudio +fontconfig +gcrypt +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap mingw +mono mp3 netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl staging test themes +threads +truetype udev +udisks +unwind usb v4l vaapi vkd3d vulkan +X +xcomposite xinerama +xml"
REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
X? ( truetype )
elibc_glibc? ( threads )
@@ -112,6 +116,7 @@ COMMON_DEPEND="
udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
+ usb? ( virtual/libusb:1[${MULTILIB_USEDEP}] )
v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
vaapi? ( x11-libs/libva[X,${MULTILIB_USEDEP}] )
vkd3d? ( >=app-emulation/vkd3d-1.2[${MULTILIB_USEDEP}] )
@@ -171,7 +176,7 @@ PATCHES=(
PATCHES_BIN=()
# https://bugs.gentoo.org/show_bug.cgi?id=635222
-if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then
+if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${MY_PV} == 9999 ]]; then
DEPEND+=" dev-util/patchbin"
fi
@@ -285,44 +290,46 @@ wine_env_vcs_vars() {
}
pkg_pretend() {
- wine_build_environment_check || die
+ if [[ ${MERGE_TYPE} != binary ]] ; then
+ wine_build_environment_check || die
+
+ # Verify OSS support
+ if use oss && ! use kernel_FreeBSD; then
+ if ! has_version ">=media-sound/oss-4"; then
+ eerror "You cannot build wine with USE=oss without having support from a"
+ eerror "FreeBSD kernel or >=media-sound/oss-4 (only available through external repos)"
+ eerror
+ die
+ fi
+ fi
- # Verify OSS support
- if use oss && ! use kernel_FreeBSD; then
- if ! has_version ">=media-sound/oss-4"; then
- eerror "You cannot build wine with USE=oss without having support from a"
- eerror "FreeBSD kernel or >=media-sound/oss-4 (only available through external repos)"
+ if use mingw && use abi_x86_32 && ! has_version "cross-i686-w64-mingw32/gcc"; then
eerror
- die
+ eerror "USE=\"mingw\" is currently experimental, and requires the"
+ eerror "'cross-i686-w64-mingw32' compiler and its runtime for 32-bit builds."
+ eerror
+ eerror "These can be installed by using 'sys-devel/crossdev':"
+ eerror
+ eerror "crossdev --target i686-w64-mingw32"
+ eerror
+ eerror "For more information on setting up MinGW, see: https://wiki.gentoo.org/wiki/Mingw"
+ eerror
+ die "MinGW build was enabled, but no compiler to support it was found."
fi
- fi
- if use mingw && use abi_x86_32 && ! has_version "cross-i686-w64-mingw32/gcc"; then
- eerror
- eerror "USE=\"mingw\" is currently experimental, and requires the"
- eerror "'cross-i686-w64-mingw32' compiler and its runtime for 32-bit builds."
- eerror
- eerror "These can be installed by using 'sys-devel/crossdev':"
- eerror
- eerror "crossdev --target i686-w64-mingw32"
- eerror
- eerror "For more information on setting up MinGW, see: https://wiki.gentoo.org/wiki/Mingw"
- eerror
- die "MinGW build was enabled, but no compiler to support it was found."
- fi
-
- if use mingw && use abi_x86_64 && ! has_version "cross-x86_64-w64-mingw32/gcc"; then
- eerror
- eerror "USE=\"mingw\" is currently experimental, and requires the"
- eerror "'cross-x86_64-w64-mingw32' compiler and its runtime for 64-bit builds."
- eerror
- eerror "These can be installed by using 'sys-devel/crossdev':"
- eerror
- eerror "crossdev --target x86_64-w64-mingw32"
- eerror
- eerror "For more information on setting up MinGW, see: https://wiki.gentoo.org/wiki/Mingw"
- eerror
- die "MinGW build was enabled, but no compiler to support it was found."
+ if use mingw && use abi_x86_64 && ! has_version "cross-x86_64-w64-mingw32/gcc"; then
+ eerror
+ eerror "USE=\"mingw\" is currently experimental, and requires the"
+ eerror "'cross-x86_64-w64-mingw32' compiler and its runtime for 64-bit builds."
+ eerror
+ eerror "These can be installed by using 'sys-devel/crossdev':"
+ eerror
+ eerror "crossdev --target x86_64-w64-mingw32"
+ eerror
+ eerror "For more information on setting up MinGW, see: https://wiki.gentoo.org/wiki/Mingw"
+ eerror
+ die "MinGW build was enabled, but no compiler to support it was found."
+ fi
fi
}
@@ -330,7 +337,7 @@ pkg_setup() {
wine_build_environment_check || die
wine_env_vcs_vars || die
- WINE_VARIANT="${PN#wine}-${PV}"
+ WINE_VARIANT="${PN#wine}-${MY_PV}"
WINE_VARIANT="${WINE_VARIANT#-}"
MY_PREFIX="${EPREFIX}/usr/lib/wine-${WINE_VARIANT}"
@@ -344,7 +351,7 @@ pkg_setup() {
}
src_unpack() {
- if [[ ${PV} == "9999" ]] ; then
+ if [[ ${MY_PV} == "9999" ]] ; then
EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack
if use staging; then
local CURRENT_WINE_COMMIT=${EGIT_VERSION}
@@ -505,6 +512,7 @@ multilib_src_configure() {
$(use_with truetype freetype)
$(use_with udev)
$(use_with unwind)
+ $(use_with usb)
$(use_with v4l v4l2)
$(use_with vkd3d)
$(use_with vulkan)
@@ -522,9 +530,10 @@ multilib_src_configure() {
$(use_with vaapi va)
)
- local PKG_CONFIG
+ local PKG_CONFIG AR RANLIB
# Avoid crossdev's i686-pc-linux-gnu-pkg-config if building wine32 on amd64; #472038
- tc-export PKG_CONFIG
+ # set AR and RANLIB to make QA scripts happy; #483342
+ tc-export PKG_CONFIG AR RANLIB
if use amd64; then
if [[ ${ABI} == amd64 ]]; then
@@ -613,12 +622,12 @@ multilib_src_install_all() {
}
pkg_postinst() {
- eselect wine register ${P}
+ eselect wine register ${PN}-${MY_PV}
if [[ ${PN} == "wine-vanilla" ]]; then
- eselect wine register --vanilla ${P} || die
+ eselect wine register --vanilla ${PN}-${MY_PV} || die
else
if use staging; then
- eselect wine register --staging ${P} || die
+ eselect wine register --staging ${PN}-${MY_PV} || die
fi
fi
@@ -641,12 +650,12 @@ pkg_postinst() {
}
pkg_prerm() {
- eselect wine deregister ${P}
+ eselect wine deregister ${PN}-${MY_PV}
if [[ ${PN} == "wine-vanilla" ]]; then
- eselect wine deregister --vanilla ${P} || die
+ eselect wine deregister --vanilla ${PN}-${MY_PV} || die
else
if use staging; then
- eselect wine deregister --staging ${P} || die
+ eselect wine deregister --staging ${PN}-${MY_PV}|| die
fi
fi
diff --git a/app-emulation/wine-vanilla/Manifest b/app-emulation/wine-vanilla/Manifest
index 9b7dddb7d415..2c83ee6ce713 100644
--- a/app-emulation/wine-vanilla/Manifest
+++ b/app-emulation/wine-vanilla/Manifest
@@ -1,22 +1,16 @@
-DIST gentoo-wine-patches-20180120.tar.xz 58672 BLAKE2B 84d621075b65475cec41a06429680b518d7eafb938cefd903f3f8aa71ea3049ac9d8de05af48f9f4f4a1b9172c7ef17784540413e410eb8ec11e8ec4a63858c6 SHA512 5b354a409c7a2b77499aaa593b9248a1d15d755e3687b095755faacc30068bfcdbdd5c2a2a78617cb1a78c46d2931162bd69ec3379b035d81494bea7108263c2
DIST gentoo-wine-patches-20191222.tar.xz 59236 BLAKE2B 1b2c7b3ab69e5603d0f176a88c13b6d532f94f319ad29821faa699e828d90cfbe92c02b6e73b72eb16e565707c49885833fe557809ed16f4a6f0f182de9bb6e6 SHA512 a030fad55be5e1d909bc50e430c9a99846b88d7555f12749e101ba83f04df5af23eeb726b5ed78f847a66d11ac0a838bc69bd5bf8cf53da77ad454d2a2fe65cf
DIST gentoo-wine-patches-20200523.tar.xz 59740 BLAKE2B 951d7f305a6e5b3759c8095629d48de4830b8a0c9558de859a9e02d9824fe85553fda2bc0820ca97022a0ca63ac28473dadfe827821220445dbf1a7fd15c7c98 SHA512 46eea45c982b475e3ff444cbd87c6a0a235fc8dcaf3d83d89655a10ed8841a9ddb09e5a638a05803f3bf2c3bd34165c16067aba561efa4c183ee396dc31cdf75
-DIST wine-4.0.3.tar.xz 21680420 BLAKE2B a7caf4b82fa2594f77e31f29b2a3da59c08bb58f213268d61bdf48998345162bc36fbfc24db94d11cb07b6da347b3471e9d8976d9abfa0f76c183c0a519aa73e SHA512 a8fde0bcf600eaec56c3ce58c9aa992386784c85cf1c93aa84d50aff4c842b12a6b099c23391d3ad9a0059f3dc9069c0f8e00fad293305ba8a33afc70bf26e14
-DIST wine-5.0.1.tar.xz 22476496 BLAKE2B 8fd7729812c0144b6c9ec7f28ecc25bca5bc7801d9927346928f43fc46ca0be89ecb4caefb7a93cf2f3365e088d11e6bd53a028ea8cc9e170ef864ff63f21a5a SHA512 d9756f0a74417ea9e05d08a94ff29b83ebff3db3a3cbaa90979d5312754371ddfcab6bded73a246ef980252b908d8a26e93de2779b766c4bff92c91f8c315d98
DIST wine-5.0.2.tar.xz 22484932 BLAKE2B 93253a86605b32dc8f7c79a16336643e6f84937094f8c96ea336289c2076a4d9f759fc1ad128f7b1a009da5eb2ed25cdc893da99e338093608bf5fc0ef1a85fc SHA512 9ff902ff929d9ac8c81843eea141c96446d26b14f70781a40a3ea1fdef5f412ca4c87374a5a3af9b42b52236159645e55d6e54f8b06178a4d210a72fb1d5358e
DIST wine-5.0.3.tar.xz 22495496 BLAKE2B 459399b940111fb573d3060e74c17423ff43b510a196d70eadb5d57e7d57b44c990f8c9bb69eb258a76515c2d50fb756f82229a1a7cd391a32c407bedc1e9f14 SHA512 3217cc8a91e898e15130314fb7ebc2cdd93e2a4e88a46d3778ff4790a635b28e951ba974b83a56414d387b710da21a998e519f1df0cde636ff5fffdceff7f652
-DIST wine-5.19.tar.xz 24201860 BLAKE2B 34233747a58e2cf6c9b6b328cb8c0af5707479e02d20365da07d039163757c6557d25ec8136933fd9bd5a7aeb360d96e44c41c34fffb26a23f9e3ea137f03120 SHA512 b91eb1cb1225ac8abe26f5c5dd74fb376e6489b460035c70e6c7890595086e99273497741b6a736ef4884ae7bacc44482d2e3e8ba7e8d85c78c571bd4b133d8a
DIST wine-5.20.tar.xz 24177960 BLAKE2B 50169bc00497feef91f5cf7fd56bce8f7784f70d2a24776494d0ab98cdb70b4387a92dece4571b2b22b15c42d82672595f39079a0678e551331f2bee4460f0f8 SHA512 30299287857376a827579335ba410d0575379df300860c8fdd50473f3eec074372d3602e5027f9e75fb13e272f28f51950ec652109839573a168aed23ba9c8f4
DIST wine-5.21.tar.xz 24178740 BLAKE2B 9d6b2766536fb019d69dbffc8dbae0004eeb6d5b3d3f57d0577b4952159b9a5388d1f767d982b3837d713175ac7baec47c7b017e21f4fb586d3d97707491066e SHA512 0879e4edeca60880799736ac831f8ae28c6e5156dde161685aa84a5d8bd20c4f3a51a178fa2b130a9e8af44432bb239160a04829fcef5d8332e2bbf829d2bc18
DIST wine-5.22.tar.xz 24214812 BLAKE2B 7bc093501cb20fbe52e277aadb867e4f55abc9898ae570aebf3496c2f7938129498e6ad8b6de7f8efe28ccffee734c94754da703e0c5d6bad6c1293cefb42c0e SHA512 9e86a1f74a142513121c155ffa5e1dd863ecc00092952878f44185725e81793fd7291e0e3c93275cd0d083d17af99eb1d8feba1c96e8607f44919b9045737271
-EBUILD wine-vanilla-4.0.3.ebuild 17273 BLAKE2B 31f49631a2eb96a0d20c98891c3ace1874bab916e8c75d6b6a003b7cf35b84f2014891c99defb1da6a77d2ce56353566e212282c4c4f607312245c6ec7e66803 SHA512 341f4e04041395f2b4a46dde9e46854e783936a4dbf0859946d4f7cb4b25072fb28f397b61c1916bb3aa9708d2e6a7a1e04ac157bd36f03be63b4d6180b9fb05
-EBUILD wine-vanilla-5.0.1.ebuild 17552 BLAKE2B 45440982bf2bfd3f6a2788af10b3a1712f4a4d82a0d4d0d139e9b9eb8f6c4af2b4a516e23a17ace87a6c6cf0e4cf9f3d1a0738b380203a77798b3fae437f1ed9 SHA512 2a92a7f78ac86289439a6bc507ec48a6f6a44a1d666f8a2b0705c4bb6fbd6b5d1f667347db96ea98ead1b5473b1cb7b0cb396446c84182165145842648795d5a
+DIST wine-6.0.tar.xz 24192280 BLAKE2B baf0eee582190ede8d210390b51d330c1879cb442100bc2e957052898fbd84bcc047a885065f9bf96ac4f072f92eee44f0e1c3baddc68937286e7cc6f976bd4e SHA512 c0732fbab1da8737d595a876b28ce87eef1440c317746e798642b59b44b34e890de562e0c0cc674e97096f39db82f8e9c3b1cc1ba9edc246b7266a0f7cb00057
EBUILD wine-vanilla-5.0.2.ebuild 17552 BLAKE2B 45440982bf2bfd3f6a2788af10b3a1712f4a4d82a0d4d0d139e9b9eb8f6c4af2b4a516e23a17ace87a6c6cf0e4cf9f3d1a0738b380203a77798b3fae437f1ed9 SHA512 2a92a7f78ac86289439a6bc507ec48a6f6a44a1d666f8a2b0705c4bb6fbd6b5d1f667347db96ea98ead1b5473b1cb7b0cb396446c84182165145842648795d5a
EBUILD wine-vanilla-5.0.3-r1.ebuild 17635 BLAKE2B 05faf2469f3c1645e6839d5be2f710b3cf544ad513bfd3699f5afd7390c64d31233e499d68d372908e5f43118c67d7396fce9978b35545086208de51b942a6ba SHA512 1ef21017980fd5ae253fcb9b2521c639f8069fe5dc3cd08a42b091da22948739f02b04cd8e68eafa809afef19616bb1ecffbfa6fb86000087ee9a61d7a1917c8
-EBUILD wine-vanilla-5.0.3.ebuild 17554 BLAKE2B 4fb5c237a16645195516f980e6a0bb96a9a263423b7489b8f425326a65ab5b06a75fc705862940220bc762dbaba5816eb340ef9f8427f08a2a6678fdb05b9429 SHA512 33011fd9ba031978b4351f8ff5b8eeffa692062df4a511fb105231e493742d55c0430a256551cc08cc8caf9c546de38eb0a4e1fe1ee98db0a391233b231a5d1c
-EBUILD wine-vanilla-5.19.ebuild 17601 BLAKE2B 38d18a7743bbc9a229928001dbf598224a76df8d56af2ff5f314dd14961483ae8b9470a6adcfd80bef6b1848420f8bf069545c615858c97dd45d752bc2fc252d SHA512 e4a5252018b1c5cb8b99a05a6a209c0c43e9e973dd305388fa5fe1ae9eb1653f37c1cee617161f5f1ada8085b1e660ae217707d4f0329f39d04f41e788ce2cf4
EBUILD wine-vanilla-5.20.ebuild 17601 BLAKE2B 38d18a7743bbc9a229928001dbf598224a76df8d56af2ff5f314dd14961483ae8b9470a6adcfd80bef6b1848420f8bf069545c615858c97dd45d752bc2fc252d SHA512 e4a5252018b1c5cb8b99a05a6a209c0c43e9e973dd305388fa5fe1ae9eb1653f37c1cee617161f5f1ada8085b1e660ae217707d4f0329f39d04f41e788ce2cf4
EBUILD wine-vanilla-5.21.ebuild 17601 BLAKE2B 38d18a7743bbc9a229928001dbf598224a76df8d56af2ff5f314dd14961483ae8b9470a6adcfd80bef6b1848420f8bf069545c615858c97dd45d752bc2fc252d SHA512 e4a5252018b1c5cb8b99a05a6a209c0c43e9e973dd305388fa5fe1ae9eb1653f37c1cee617161f5f1ada8085b1e660ae217707d4f0329f39d04f41e788ce2cf4
EBUILD wine-vanilla-5.22-r2.ebuild 18854 BLAKE2B c45f3e3f4431910be09d1951dee0e35726dcbe5506896c0c66be037e1dca123f81d9306d635efa94f0e8c1b93011b0f04b9ad3880e955126cc9de3481fbd9ee8 SHA512 a68c0937ba3bbfcfb171c8ad997a630531a5b68c5f08d5936c6fd5a7e63a94a80c4030b9bb186a7667c51bd7e488fd498ad1225ea499ed49e87dc6fe909a79da
-EBUILD wine-vanilla-9999.ebuild 18854 BLAKE2B c45f3e3f4431910be09d1951dee0e35726dcbe5506896c0c66be037e1dca123f81d9306d635efa94f0e8c1b93011b0f04b9ad3880e955126cc9de3481fbd9ee8 SHA512 a68c0937ba3bbfcfb171c8ad997a630531a5b68c5f08d5936c6fd5a7e63a94a80c4030b9bb186a7667c51bd7e488fd498ad1225ea499ed49e87dc6fe909a79da
-MISC metadata.xml 3414 BLAKE2B 29136302781a2a0979948e0da37cf9d34bf728b3dd7c6973f19d69d61a59804cf13c8e7f21e01ad892bd3b8d028d9f7a0cdab6d092de861e8fc5c73e178dc2da SHA512 5e3b375d5ed3c31556441d7d71e99a862e57c3f8d07adffcfb7ed0c6c9f3dc888c6a17474ddc5c62897149000d6ccebcb5866b3ac6dace781774ab7f1b48e46b
+EBUILD wine-vanilla-6.0.ebuild 18924 BLAKE2B 3a3525660d464ee3931a81d30c0081592bf4abc68711f2a7191a42b8f3f8bb5064fdc1d82ad93b578879a67a95800433c5f7f30bb15098976c71a4cbc778dd6a SHA512 d41fec9edc822af3d507e79380f647ec5aef144f89aac15a9564d57b9ca3ef5fe7155396b8c206eaccb32c20d820cf6c72c3996645cbf4fd76cde3ef22c56fb1
+EBUILD wine-vanilla-9999.ebuild 18924 BLAKE2B 3a3525660d464ee3931a81d30c0081592bf4abc68711f2a7191a42b8f3f8bb5064fdc1d82ad93b578879a67a95800433c5f7f30bb15098976c71a4cbc778dd6a SHA512 d41fec9edc822af3d507e79380f647ec5aef144f89aac15a9564d57b9ca3ef5fe7155396b8c206eaccb32c20d820cf6c72c3996645cbf4fd76cde3ef22c56fb1
+MISC metadata.xml 3493 BLAKE2B 5574a661321f07674198bed06bdd632ccd5e46a4b4a15b49aef8882f5f6afa1a087a9fdb308bfecd80a9ea32d6b1135ff1bc2733ac3748d83d8754e4228ac1da SHA512 1e7d4867143412d7261b8f977f82df67ea9777dc1168e0ac3e428f68ac93314528df75b45a573dd96910d02a2357b75509c90b2de531b8188ce2e474a30d52e8
diff --git a/app-emulation/wine-vanilla/metadata.xml b/app-emulation/wine-vanilla/metadata.xml
index 7467ea24def3..a57d62f758b0 100644
--- a/app-emulation/wine-vanilla/metadata.xml
+++ b/app-emulation/wine-vanilla/metadata.xml
@@ -42,6 +42,7 @@ This variant of the Wine packaging does not include external patchsets
Add support for gamepad detection using SDL
Use virtual/libudev to provide plug and play support
Use sys-libs/libunwind to unwind the stack
+ Use virtual/libusb to provide USB support
Use app-emulation/vkd3d to provide Direct3D 12 support
Enable Vulkan drivers
diff --git a/app-emulation/wine-vanilla/wine-vanilla-4.0.3.ebuild b/app-emulation/wine-vanilla/wine-vanilla-4.0.3.ebuild
deleted file mode 100644
index f4c82a817bde..000000000000
--- a/app-emulation/wine-vanilla/wine-vanilla-4.0.3.ebuild
+++ /dev/null
@@ -1,531 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW"
-PLOCALE_BACKUP="en"
-
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n ltprune multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
-
-MY_PN="${PN%%-*}"
-MY_P="${MY_PN}-${PV}"
-
-if [[ ${PV} == "9999" ]] ; then
- EGIT_REPO_URI="https://source.winehq.org/git/wine.git"
- EGIT_BRANCH="master"
- inherit git-r3
- SRC_URI=""
- #KEYWORDS=""
-else
- MAJOR_V=$(ver_cut 1)
- MINOR_V=$(ver_cut 2)
- SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.${MINOR_V}/${MY_P}.tar.xz"
- KEYWORDS="-* ~amd64 ~x86"
-fi
-S="${WORKDIR}/${MY_P}"
-
-GWP_V="20180120"
-PATCHDIR="${WORKDIR}/gentoo-wine-patches"
-
-DESCRIPTION="Free implementation of Windows(tm) on Unix, without external patchsets"
-HOMEPAGE="https://www.winehq.org/"
-SRC_URI="${SRC_URI}
- https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-${GWP_V}.tar.xz
-"
-
-LICENSE="LGPL-2.1"
-SLOT="${PV}"
-IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl test +threads +truetype udev +udisks v4l vkd3d vulkan +X +xcomposite xinerama +xml"
-REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
- X? ( truetype )
- elibc_glibc? ( threads )
- osmesa? ( opengl )
- test? ( abi_x86_32 )
- vkd3d? ( vulkan )" # osmesa-opengl #286560 # X-truetype #551124
-
-# FIXME: the test suite is unsuitable for us; many tests require net access
-# or fail due to Xvfb's opengl limitations.
-RESTRICT="test"
-
-COMMON_DEPEND="
- X? (
- x11-libs/libXcursor[${MULTILIB_USEDEP}]
- x11-libs/libXext[${MULTILIB_USEDEP}]
- x11-libs/libXfixes[${MULTILIB_USEDEP}]
- x11-libs/libXrandr[${MULTILIB_USEDEP}]
- x11-libs/libXi[${MULTILIB_USEDEP}]
- x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
- )
- alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
- capi? ( net-libs/libcapi[${MULTILIB_USEDEP}] )
- cups? ( net-print/cups:=[${MULTILIB_USEDEP}] )
- fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] )
- gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
- gsm? ( media-sound/gsm:=[${MULTILIB_USEDEP}] )
- gssapi? ( virtual/krb5[${MULTILIB_USEDEP}] )
- gstreamer? (
- media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
- media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}]
- )
- jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
- kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] )
- lcms? ( media-libs/lcms:2=[${MULTILIB_USEDEP}] )
- ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] )
- mp3? ( >=media-sound/mpg123-1.5.0[${MULTILIB_USEDEP}] )
- ncurses? ( >=sys-libs/ncurses-5.2:0=[${MULTILIB_USEDEP}] )
- netapi? ( net-fs/samba[netapi(+),${MULTILIB_USEDEP}] )
- nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] )
- odbc? ( dev-db/unixODBC:=[${MULTILIB_USEDEP}] )
- openal? ( media-libs/openal:=[${MULTILIB_USEDEP}] )
- opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
- opengl? (
- virtual/glu[${MULTILIB_USEDEP}]
- virtual/opengl[${MULTILIB_USEDEP}]
- )
- osmesa? ( >=media-libs/mesa-13[osmesa,${MULTILIB_USEDEP}] )
- pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] )
- png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] )
- pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
- scanner? ( media-gfx/sane-backends:=[${MULTILIB_USEDEP}] )
- sdl? ( media-libs/libsdl2:=[haptic,joystick,${MULTILIB_USEDEP}] )
- ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
- truetype? ( >=media-libs/freetype-2.0.0[${MULTILIB_USEDEP}] )
- udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
- udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
- v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
- vkd3d? ( app-emulation/vkd3d[${MULTILIB_USEDEP}] )
- vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] )
- xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
- xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
- xml? (
- dev-libs/libxml2[${MULTILIB_USEDEP}]
- dev-libs/libxslt[${MULTILIB_USEDEP}]
- )"
-
-RDEPEND="${COMMON_DEPEND}
- app-emulation/wine-desktop-common
- >app-eselect/eselect-wine-0.3
- !app-emulation/wine:0
- dos? ( >=games-emulation/dosbox-0.74_p20160629 )
- gecko? ( app-emulation/wine-gecko:2.47[abi_x86_32?,abi_x86_64?] )
- mono? ( app-emulation/wine-mono:4.7.5 )
- perl? (
- dev-lang/perl
- dev-perl/XML-Simple
- )
- pulseaudio? (
- realtime? ( sys-auth/rtkit )
- )
- samba? ( >=net-fs/samba-3.0.25[winbind] )
- selinux? ( sec-policy/selinux-wine )
- udisks? ( sys-fs/udisks:2 )"
-
-# tools/make_requests requires perl
-DEPEND="${COMMON_DEPEND}
- sys-devel/flex
- >=sys-kernel/linux-headers-2.6
- virtual/pkgconfig
- virtual/yacc
- X? ( x11-base/xorg-proto )
- prelink? ( sys-devel/prelink )
- xinerama? ( x11-base/xorg-proto )"
-
-# These use a non-standard "Wine" category, which is provided by
-# /etc/xdg/applications-merged/wine.menu
-QA_DESKTOP_FILE="usr/share/applications/wine-browsedrive.desktop
-usr/share/applications/wine-notepad.desktop
-usr/share/applications/wine-uninstaller.desktop
-usr/share/applications/wine-winecfg.desktop"
-
-PATCHES=(
- "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726
- "${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
- "${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
- "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" #310611
-)
-PATCHES_BIN=()
-
-# https://bugs.gentoo.org/show_bug.cgi?id=635222
-if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then
- DEPEND+=" dev-util/patchbin"
-fi
-
-wine_compiler_check() {
- [[ ${MERGE_TYPE} = "binary" ]] && return 0
-
- # GCC-specific bugs
- if tc-is-gcc; then
- # bug #549768
- if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then
- ebegin "Checking for gcc-5 ms_abi compiler bug"
- $(tc-getCC) -O2 "${PATCHDIR}/files/pr66838.c" -o "${T}"/pr66838 || die
- # Run in subshell to prevent "Aborted" message
- ( "${T}"/pr66838 || false ) >/dev/null 2>&1
- if ! eend $?; then
- eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0"
- eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild,"
- eerror "or use gcc-config to select a different compiler version."
- eerror "See https://bugs.gentoo.org/549768"
- eerror
- return 1
- fi
- fi
- # bug #574044
- if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then
- ebegin "Checking for gcc-5-3 stack realignment compiler bug"
- # Compile in subshell to prevent "Aborted" message
- ( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${PATCHDIR}/files/pr69140.c" -o "${T}"/pr69140 ) >/dev/null 2>&1
- if ! eend $?; then
- eerror "Wine cannot be built with this version of gcc-5.3"
- eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild,"
- eerror "or use gcc-config to select a different compiler version."
- eerror "See https://bugs.gentoo.org/574044"
- eerror
- return 1
- fi
- fi
- fi
-
- # Ensure compiler support
- if use abi_x86_64; then
- ebegin "Checking for 64-bit compiler with builtin_ms_va_list support"
- # Compile in subshell to prevent "Aborted" message
- ( $(tc-getCC) -O2 "${PATCHDIR}/files/builtin_ms_va_list.c" -o "${T}"/builtin_ms_va_list >/dev/null 2>&1)
- if ! eend $?; then
- eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine"
- eerror
- eerror "You need gcc-4.4+ or clang 3.8+ to build 64-bit wine"
- eerror
- return 1
- fi
- fi
-}
-
-wine_build_environment_check() {
- [[ ${MERGE_TYPE} = "binary" ]] && return 0
-
- if use abi_x86_64; then
- if tc-is-gcc && [[ $(gcc-major-version) -lt 4 || ( $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 4 ) ]]; then
- eerror "You need gcc-4.4+ to compile 64-bit wine"
- die
- elif tc-is-clang && [[ $(clang-major-version) -lt 3 || ( $(clang-major-version) -eq 3 && $(clang-minor-version) -lt 8 ) ]]; then
- eerror "You need clang-3.8+ to compile 64-bit wine"
- die
- fi
- fi
- if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -le 3 ]]; then
- ewarn "GCC-5.0-5.3 suffered from compiler bugs and are no longer supported by"
- ewarn "Gentoo's Toolchain Team. If your ebuild fails the compiler checks in"
- ewarn "the configure phase, either update your compiler or switch to <5.0 || >=5.4"
- fi
- if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -eq 4 ]]; then
- if has "-march=i686" ${CFLAGS} && ! has "-mtune=generic" ${CFLAGS}; then
- ewarn "Compilation can hang with CFLAGS=\"-march=i686\". You can temporarily work"
- ewarn "around this by adding \"-mtune=generic\" to your CFLAGS for wine."
- ewarn "See package.env in man 5 portage for more information on how to do this."
- ewarn "See https://bugs.gentoo.org/show_bug.cgi?id=613128 for more details"
- fi
- fi
-
- if use abi_x86_32 && use opencl && [[ "$(eselect opencl show 2> /dev/null)" == "intel" ]]; then
- eerror "You cannot build wine with USE=opencl because intel-ocl-sdk is 64-bit only."
- eerror "See https://bugs.gentoo.org/487864 for more details."
- eerror
- return 1
- fi
-}
-
-wine_env_vcs_vars() {
- local pn_live_var="${PN//[-+]/_}_LIVE_COMMIT"
- local pn_live_val="${pn_live_var}"
- eval pn_live_val='$'${pn_live_val}
- if [[ ! -z ${EGIT_COMMIT} ]]; then
- eerror "Commits must now be specified using the environmental variables"
- eerror "EGIT_OVERRIDE_COMMIT_WINE"
- eerror
- return 1
- fi
-}
-
-pkg_pretend() {
- wine_build_environment_check || die
-
- # Verify OSS support
- if use oss && ! use kernel_FreeBSD; then
- if ! has_version ">=media-sound/oss-4"; then
- eerror "You cannot build wine with USE=oss without having support from a"
- eerror "FreeBSD kernel or >=media-sound/oss-4 (only available through external repos)"
- eerror
- die
- fi
- fi
-}
-
-pkg_setup() {
- wine_build_environment_check || die
- wine_env_vcs_vars || die
-
- WINE_VARIANT="${PN#wine}-${PV}"
- WINE_VARIANT="${WINE_VARIANT#-}"
-
- MY_PREFIX="${EPREFIX}/usr/lib/wine-${WINE_VARIANT}"
- MY_DATAROOTDIR="${EPREFIX}/usr/share/wine-${WINE_VARIANT}"
- MY_DATADIR="${MY_DATAROOTDIR}"
- MY_INCLUDEDIR="${EPREFIX}/usr/include/wine-${WINE_VARIANT}"
- MY_LIBEXECDIR="${EPREFIX}/usr/libexec/wine-${WINE_VARIANT}"
- MY_LOCALSTATEDIR="${EPREFIX}/var/wine-${WINE_VARIANT}"
- MY_MANDIR="${MY_DATADIR}/man"
-}
-
-src_unpack() {
- if [[ ${PV} == "9999" ]] ; then
- EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack
- fi
-
- default
-
- l10n_find_plocales_changes "${S}/po" "" ".po"
-}
-
-src_prepare() {
-
- eapply_bin(){
- local patch
- for patch in ${PATCHES_BIN[@]}; do
- patchbin --nogit < "${patch}" || die
- done
- }
-
- local md5="$(md5sum server/protocol.def)"
-
- default
- eapply_bin
- eautoreconf
-
- # Modification of the server protocol requires regenerating the server requests
- if [[ "$(md5sum server/protocol.def)" != "${md5}" ]]; then
- einfo "server/protocol.def was patched; running tools/make_requests"
- tools/make_requests || die #432348
- fi
- sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
- if ! use run-exes; then
- sed -i '/^MimeType/d' loader/wine.desktop || die #117785
- fi
-
- # Edit wine.desktop to work for specific variant
- sed -e "/^Exec=/s/wine /wine-${WINE_VARIANT} /" -i loader/wine.desktop || die
-
- # hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652
- cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die
-
- l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
-
- # Fix manpage generation for locales #469418 and abi_x86_64 #617864
-
- # Duplicate manpages input files for wine64
- local f
- for f in loader/*.man.in; do
- cp ${f} ${f/wine/wine64} || die
- done
- # Add wine64 manpages to Makefile
- if use abi_x86_64; then
- sed -i "/wine.man.in/i \
- \\\twine64.man.in \\\\" loader/Makefile.in || die
- sed -i -E 's/(.*wine)(.*\.UTF-8\.man\.in.*)/&\
-\164\2/' loader/Makefile.in || die
- fi
-
- rm_man_file(){
- local file="${1}"
- loc=${2}
- sed -i "/${loc}\.UTF-8\.man\.in/d" "${file}" || die
- }
-
- while read f; do
- l10n_for_each_disabled_locale_do rm_man_file "${f}"
- done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; -print)
-}
-
-src_configure() {
- wine_compiler_check || die
-
- export LDCONFIG=/bin/true
- use custom-cflags || strip-flags
-
- multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
- local myconf=(
- --prefix="${MY_PREFIX}"
- --datarootdir="${MY_DATAROOTDIR}"
- --datadir="${MY_DATADIR}"
- --includedir="${MY_INCLUDEDIR}"
- --libdir="${EPREFIX}/usr/$(get_libdir)/wine-${WINE_VARIANT}"
- --libexecdir="${MY_LIBEXECDIR}"
- --localstatedir="${MY_LOCALSTATEDIR}"
- --mandir="${MY_MANDIR}"
- --sysconfdir=/etc/wine
- $(use_with alsa)
- $(use_with capi)
- $(use_with lcms cms)
- $(use_with cups)
- $(use_with ncurses curses)
- $(use_with udisks dbus)
- $(use_with fontconfig)
- $(use_with ssl gnutls)
- $(use_enable gecko mshtml)
- $(use_with gphoto2 gphoto)
- $(use_with gsm)
- $(use_with gssapi)
- $(use_with gstreamer)
- --without-hal
- $(use_with jpeg)
- $(use_with kerberos krb5)
- $(use_with ldap)
- $(use_enable mono mscoree)
- $(use_with mp3 mpg123)
- $(use_with netapi)
- $(use_with nls gettext)
- $(use_with openal)
- $(use_with opencl)
- $(use_with opengl)
- $(use_with osmesa)
- $(use_with oss)
- $(use_with pcap)
- $(use_with png)
- $(use_with pulseaudio pulse)
- $(use_with threads pthread)
- $(use_with scanner sane)
- $(use_with sdl)
- $(use_enable test tests)
- $(use_with truetype freetype)
- $(use_with udev)
- $(use_with v4l)
- $(use_with vkd3d)
- $(use_with vulkan)
- $(use_with X x)
- $(use_with X xfixes)
- $(use_with xcomposite)
- $(use_with xinerama)
- $(use_with xml)
- $(use_with xml xslt)
- )
-
- local PKG_CONFIG AR RANLIB
- # Avoid crossdev's i686-pc-linux-gnu-pkg-config if building wine32 on amd64; #472038
- # set AR and RANLIB to make QA scripts happy; #483342
- tc-export PKG_CONFIG AR RANLIB
-
- if use amd64; then
- if [[ ${ABI} == amd64 ]]; then
- myconf+=( --enable-win64 )
- else
- myconf+=( --disable-win64 )
- fi
-
- # Note: using --with-wine64 results in problems with multilib.eclass
- # CC/LD hackery. We're using separate tools instead.
- fi
-
- ECONF_SOURCE=${S} \
- econf "${myconf[@]}"
- emake depend
-}
-
-multilib_src_test() {
- # FIXME: win32-only; wine64 tests fail with "could not find the Wine loader"
- if [[ ${ABI} == x86 ]]; then
- if [[ $(id -u) == 0 ]]; then
- ewarn "Skipping tests since they cannot be run under the root user."
- ewarn "To run the test ${MY_PN} suite, add userpriv to FEATURES in make.conf"
- return
- fi
-
- WINEPREFIX="${T}/.wine-${ABI}" \
- Xemake test
- fi
-}
-
-multilib_src_install_all() {
- local DOCS=( ANNOUNCE AUTHORS README )
- add_locale_docs() {
- local locale_doc="documentation/README.$1"
- [[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
- }
- l10n_for_each_locale_do add_locale_docs
-
- einstalldocs
- prune_libtool_files --all
-
- if ! use perl ; then # winedump calls function_grep.pl, and winemaker is a perl script
- rm "${D%/}${MY_PREFIX}"/bin/{wine{dump,maker},function_grep.pl} \
- "${D%/}${MY_MANDIR}"/man1/wine{dump,maker}.1 || die
- fi
-
- # Remove wineconsole if neither backend is installed #551124
- if ! use X && ! use ncurses; then
- rm "${D%/}${MY_PREFIX}"/bin/wineconsole* || die
- rm "${D%/}${MY_MANDIR}"/man1/wineconsole* || die
- rm_wineconsole() {
- rm "${D%/}${MY_PREFIX}/$(get_libdir)"/wine/{,fakedlls/}wineconsole.exe* || die
- }
- multilib_foreach_abi rm_wineconsole
- fi
-
- use abi_x86_32 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine{,-preloader} #255055
- use abi_x86_64 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine64{,-preloader}
-
- if use abi_x86_64 && ! use abi_x86_32; then
- dosym wine64 "${MY_PREFIX}"/bin/wine # 404331
- dosym wine64-preloader "${MY_PREFIX}"/bin/wine-preloader
- fi
-
- # Failglob for binloops, shouldn't be necessary, but including to stay safe
- eshopts_push -s failglob #615218
- # Make wrappers for binaries for handling multiple variants
- # Note: wrappers instead of symlinks because some are shell which use basename
- local b
- for b in "${D%/}${MY_PREFIX}"/bin/*; do
- make_wrapper "${b##*/}-${WINE_VARIANT}" "${MY_PREFIX}/bin/${b##*/}"
- done
- eshopts_pop
-}
-
-pkg_postinst() {
- eselect wine register ${P}
- if [[ ${PN} == "wine-vanilla" ]]; then
- eselect wine register --vanilla ${P} || die
- fi
-
- eselect wine update --all --if-unset || die
-
- xdg_desktop_database_update
-
- if ! use gecko; then
- ewarn "Without Wine Gecko, wine prefixes will not have a default"
- ewarn "implementation of iexplore. Many older windows applications"
- ewarn "rely upon the existence of an iexplore implementation, so"
- ewarn "you will likely need to install an external one, like via winetricks"
- fi
- if ! use mono; then
- ewarn "Without Wine Mono, wine prefixes will not have a default"
- ewarn "implementation of .NET. Many windows applications rely upon"
- ewarn "the existence of a .NET implementation, so you will likely need"
- ewarn "to install an external one, like via winetricks"
- fi
-}
-
-pkg_prerm() {
- eselect wine deregister ${P}
- if [[ ${PN} == "wine-vanilla" ]]; then
- eselect wine deregister --vanilla ${P} || die
- fi
-
- eselect wine update --all --if-unset || die
-}
-
-pkg_postrm() {
- xdg_desktop_database_update
-}
diff --git a/app-emulation/wine-vanilla/wine-vanilla-5.0.1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-5.0.1.ebuild
deleted file mode 100644
index c13d5834460c..000000000000
--- a/app-emulation/wine-vanilla/wine-vanilla-5.0.1.ebuild
+++ /dev/null
@@ -1,538 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW"
-PLOCALE_BACKUP="en"
-
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
-
-MY_PN="${PN%%-*}"
-MY_P="${MY_PN}-${PV}"
-
-if [[ ${PV} == "9999" ]] ; then
- EGIT_REPO_URI="https://source.winehq.org/git/wine.git"
- EGIT_BRANCH="master"
- inherit git-r3
- SRC_URI=""
- #KEYWORDS=""
-else
- MAJOR_V=$(ver_cut 1)
- SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.0/${MY_P}.tar.xz"
- KEYWORDS="-* amd64 x86"
-fi
-S="${WORKDIR}/${MY_P}"
-
-GWP_V="20191222"
-PATCHDIR="${WORKDIR}/gentoo-wine-patches"
-
-DESCRIPTION="Free implementation of Windows(tm) on Unix, without external patchsets"
-HOMEPAGE="https://www.winehq.org/"
-SRC_URI="${SRC_URI}
- https://dev.gentoo.org/~sarnex/distfiles/wine/gentoo-wine-patches-${GWP_V}.tar.xz
-"
-
-LICENSE="LGPL-2.1"
-SLOT="${PV}"
-IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +faudio +fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl test +threads +truetype udev +udisks v4l vkd3d vulkan +X +xcomposite xinerama +xml"
-REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
- X? ( truetype )
- elibc_glibc? ( threads )
- osmesa? ( opengl )
- test? ( abi_x86_32 )
- vkd3d? ( vulkan )" # osmesa-opengl #286560 # X-truetype #551124
-
-# FIXME: the test suite is unsuitable for us; many tests require net access
-# or fail due to Xvfb's opengl limitations.
-RESTRICT="test"
-
-COMMON_DEPEND="
- X? (
- x11-libs/libXcursor[${MULTILIB_USEDEP}]
- x11-libs/libXext[${MULTILIB_USEDEP}]
- x11-libs/libXfixes[${MULTILIB_USEDEP}]
- x11-libs/libXrandr[${MULTILIB_USEDEP}]
- x11-libs/libXi[${MULTILIB_USEDEP}]
- x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
- )
- alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
- capi? ( net-libs/libcapi[${MULTILIB_USEDEP}] )
- cups? ( net-print/cups:=[${MULTILIB_USEDEP}] )
- faudio? ( app-emulation/faudio:=[${MULTILIB_USEDEP}] )
- fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] )
- gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
- gsm? ( media-sound/gsm:=[${MULTILIB_USEDEP}] )
- gssapi? ( virtual/krb5[${MULTILIB_USEDEP}] )
- gstreamer? (
- media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
- media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}]
- )
- jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
- kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] )
- lcms? ( media-libs/lcms:2=[${MULTILIB_USEDEP}] )
- ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] )
- mp3? ( >=media-sound/mpg123-1.5.0[${MULTILIB_USEDEP}] )
- ncurses? ( >=sys-libs/ncurses-5.2:0=[${MULTILIB_USEDEP}] )
- netapi? ( net-fs/samba[netapi(+),${MULTILIB_USEDEP}] )
- nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] )
- odbc? ( dev-db/unixODBC:=[${MULTILIB_USEDEP}] )
- openal? ( media-libs/openal:=[${MULTILIB_USEDEP}] )
- opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
- opengl? (
- virtual/glu[${MULTILIB_USEDEP}]
- virtual/opengl[${MULTILIB_USEDEP}]
- )
- osmesa? ( >=media-libs/mesa-13[osmesa,${MULTILIB_USEDEP}] )
- pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] )
- png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] )
- pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
- scanner? ( media-gfx/sane-backends:=[${MULTILIB_USEDEP}] )
- sdl? ( media-libs/libsdl2:=[haptic,joystick,${MULTILIB_USEDEP}] )
- ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
- truetype? ( >=media-libs/freetype-2.0.0[${MULTILIB_USEDEP}] )
- udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
- udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
- v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
- vkd3d? ( app-emulation/vkd3d[${MULTILIB_USEDEP}] )
- vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] )
- xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
- xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
- xml? (
- dev-libs/libxml2[${MULTILIB_USEDEP}]
- dev-libs/libxslt[${MULTILIB_USEDEP}]
- )"
-
-RDEPEND="${COMMON_DEPEND}
- app-emulation/wine-desktop-common
- >app-eselect/eselect-wine-0.3
- !app-emulation/wine:0
- dos? ( >=games-emulation/dosbox-0.74_p20160629 )
- gecko? ( app-emulation/wine-gecko:2.47.1[abi_x86_32?,abi_x86_64?] )
- mono? ( app-emulation/wine-mono:4.9.4 )
- perl? (
- dev-lang/perl
- dev-perl/XML-Simple
- )
- pulseaudio? (
- realtime? ( sys-auth/rtkit )
- )
- samba? ( >=net-fs/samba-3.0.25[winbind] )
- selinux? ( sec-policy/selinux-wine )
- udisks? ( sys-fs/udisks:2 )"
-
-# tools/make_requests requires perl
-DEPEND="${COMMON_DEPEND}
- sys-devel/flex
- >=sys-kernel/linux-headers-2.6
- virtual/pkgconfig
- virtual/yacc
- X? ( x11-base/xorg-proto )
- prelink? ( sys-devel/prelink )
- xinerama? ( x11-base/xorg-proto )"
-
-# These use a non-standard "Wine" category, which is provided by
-# /etc/xdg/applications-merged/wine.menu
-QA_DESKTOP_FILE="usr/share/applications/wine-browsedrive.desktop
-usr/share/applications/wine-notepad.desktop
-usr/share/applications/wine-uninstaller.desktop
-usr/share/applications/wine-winecfg.desktop"
-
-PATCHES=(
- "${PATCHDIR}/patches/${MY_PN}-5.0-winegcc.patch" #260726
- "${PATCHDIR}/patches/${MY_PN}-4.7-multilib-portage.patch" #395615
- "${PATCHDIR}/patches/${MY_PN}-5.0-memset-O3.patch" #480508
- "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" #310611
-)
-PATCHES_BIN=()
-
-# https://bugs.gentoo.org/show_bug.cgi?id=635222
-if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then
- DEPEND+=" dev-util/patchbin"
-fi
-
-wine_compiler_check() {
- [[ ${MERGE_TYPE} = "binary" ]] && return 0
-
- # GCC-specific bugs
- if tc-is-gcc; then
- # bug #549768
- if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then
- ebegin "Checking for gcc-5 ms_abi compiler bug"
- $(tc-getCC) -O2 "${PATCHDIR}/files/pr66838.c" -o "${T}"/pr66838 || die
- # Run in subshell to prevent "Aborted" message
- ( "${T}"/pr66838 || false ) >/dev/null 2>&1
- if ! eend $?; then
- eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0"
- eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild,"
- eerror "or use gcc-config to select a different compiler version."
- eerror "See https://bugs.gentoo.org/549768"
- eerror
- return 1
- fi
- fi
- # bug #574044
- if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then
- ebegin "Checking for gcc-5-3 stack realignment compiler bug"
- # Compile in subshell to prevent "Aborted" message
- ( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${PATCHDIR}/files/pr69140.c" -o "${T}"/pr69140 ) >/dev/null 2>&1
- if ! eend $?; then
- eerror "Wine cannot be built with this version of gcc-5.3"
- eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild,"
- eerror "or use gcc-config to select a different compiler version."
- eerror "See https://bugs.gentoo.org/574044"
- eerror
- return 1
- fi
- fi
- fi
-
- # Ensure compiler support
- if use abi_x86_64; then
- ebegin "Checking for 64-bit compiler with builtin_ms_va_list support"
- # Compile in subshell to prevent "Aborted" message
- ( $(tc-getCC) -O2 "${PATCHDIR}/files/builtin_ms_va_list.c" -o "${T}"/builtin_ms_va_list >/dev/null 2>&1)
- if ! eend $?; then
- eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine"
- eerror
- eerror "You need gcc-4.4+ or clang 3.8+ to build 64-bit wine"
- eerror
- return 1
- fi
- fi
-}
-
-wine_build_environment_check() {
- [[ ${MERGE_TYPE} = "binary" ]] && return 0
-
- if use abi_x86_64; then
- if tc-is-gcc && [[ $(gcc-major-version) -lt 4 || ( $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 4 ) ]]; then
- eerror "You need gcc-4.4+ to compile 64-bit wine"
- die
- elif tc-is-clang && [[ $(clang-major-version) -lt 3 || ( $(clang-major-version) -eq 3 && $(clang-minor-version) -lt 8 ) ]]; then
- eerror "You need clang-3.8+ to compile 64-bit wine"
- die
- fi
- fi
- if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -le 3 ]]; then
- ewarn "GCC-5.0-5.3 suffered from compiler bugs and are no longer supported by"
- ewarn "Gentoo's Toolchain Team. If your ebuild fails the compiler checks in"
- ewarn "the configure phase, either update your compiler or switch to <5.0 || >=5.4"
- fi
- if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -eq 4 ]]; then
- if has "-march=i686" ${CFLAGS} && ! has "-mtune=generic" ${CFLAGS}; then
- ewarn "Compilation can hang with CFLAGS=\"-march=i686\". You can temporarily work"
- ewarn "around this by adding \"-mtune=generic\" to your CFLAGS for wine."
- ewarn "See package.env in man 5 portage for more information on how to do this."
- ewarn "See https://bugs.gentoo.org/show_bug.cgi?id=613128 for more details"
- fi
- fi
-
- if use abi_x86_32 && use opencl && [[ "$(eselect opencl show 2> /dev/null)" == "intel" ]]; then
- eerror "You cannot build wine with USE=opencl because intel-ocl-sdk is 64-bit only."
- eerror "See https://bugs.gentoo.org/487864 for more details."
- eerror
- return 1
- fi
-}
-
-wine_env_vcs_vars() {
- local pn_live_var="${PN//[-+]/_}_LIVE_COMMIT"
- local pn_live_val="${pn_live_var}"
- eval pn_live_val='$'${pn_live_val}
- if [[ ! -z ${EGIT_COMMIT} ]]; then
- eerror "Commits must now be specified using the environmental variables"
- eerror "EGIT_OVERRIDE_COMMIT_WINE"
- eerror
- return 1
- fi
-}
-
-pkg_pretend() {
- wine_build_environment_check || die
-
- # Verify OSS support
- if use oss && ! use kernel_FreeBSD; then
- if ! has_version ">=media-sound/oss-4"; then
- eerror "You cannot build wine with USE=oss without having support from a"
- eerror "FreeBSD kernel or >=media-sound/oss-4 (only available through external repos)"
- eerror
- die
- fi
- fi
-}
-
-pkg_setup() {
- wine_build_environment_check || die
- wine_env_vcs_vars || die
-
- WINE_VARIANT="${PN#wine}-${PV}"
- WINE_VARIANT="${WINE_VARIANT#-}"
-
- MY_PREFIX="${EPREFIX}/usr/lib/wine-${WINE_VARIANT}"
- MY_DATAROOTDIR="${EPREFIX}/usr/share/wine-${WINE_VARIANT}"
- MY_DATADIR="${MY_DATAROOTDIR}"
- MY_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
- MY_INCLUDEDIR="${EPREFIX}/usr/include/wine-${WINE_VARIANT}"
- MY_LIBEXECDIR="${EPREFIX}/usr/libexec/wine-${WINE_VARIANT}"
- MY_LOCALSTATEDIR="${EPREFIX}/var/wine-${WINE_VARIANT}"
- MY_MANDIR="${MY_DATADIR}/man"
-}
-
-src_unpack() {
- if [[ ${PV} == "9999" ]] ; then
- EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack
- fi
-
- default
-
- l10n_find_plocales_changes "${S}/po" "" ".po"
-}
-
-src_prepare() {
-
- eapply_bin(){
- local patch
- for patch in ${PATCHES_BIN[@]}; do
- patchbin --nogit < "${patch}" || die
- done
- }
-
- local md5="$(md5sum server/protocol.def)"
-
- default
- eapply_bin
- eautoreconf
-
- # Modification of the server protocol requires regenerating the server requests
- if [[ "$(md5sum server/protocol.def)" != "${md5}" ]]; then
- einfo "server/protocol.def was patched; running tools/make_requests"
- tools/make_requests || die #432348
- fi
- sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
- if ! use run-exes; then
- sed -i '/^MimeType/d' loader/wine.desktop || die #117785
- fi
-
- # Edit wine.desktop to work for specific variant
- sed -e "/^Exec=/s/wine /wine-${WINE_VARIANT} /" -i loader/wine.desktop || die
-
- # hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652
- cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die
-
- l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
-
- # Fix manpage generation for locales #469418 and abi_x86_64 #617864
-
- # Duplicate manpages input files for wine64
- local f
- for f in loader/*.man.in; do
- cp ${f} ${f/wine/wine64} || die
- done
- # Add wine64 manpages to Makefile
- if use abi_x86_64; then
- sed -i "/wine.man.in/i \
- \\\twine64.man.in \\\\" loader/Makefile.in || die
- sed -i -E 's/(.*wine)(.*\.UTF-8\.man\.in.*)/&\
-\164\2/' loader/Makefile.in || die
- fi
-
- rm_man_file(){
- local file="${1}"
- loc=${2}
- sed -i "/${loc}\.UTF-8\.man\.in/d" "${file}" || die
- }
-
- while read f; do
- l10n_for_each_disabled_locale_do rm_man_file "${f}"
- done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; -print)
-}
-
-src_configure() {
- wine_compiler_check || die
-
- export LDCONFIG=/bin/true
- use custom-cflags || strip-flags
-
- multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
- local myconf=(
- --prefix="${MY_PREFIX}"
- --datarootdir="${MY_DATAROOTDIR}"
- --datadir="${MY_DATADIR}"
- --docdir="${MY_DOCDIR}"
- --includedir="${MY_INCLUDEDIR}"
- --libdir="${EPREFIX}/usr/$(get_libdir)/wine-${WINE_VARIANT}"
- --libexecdir="${MY_LIBEXECDIR}"
- --localstatedir="${MY_LOCALSTATEDIR}"
- --mandir="${MY_MANDIR}"
- --sysconfdir="${EPREFIX}/etc/wine"
- $(use_with alsa)
- $(use_with capi)
- $(use_with lcms cms)
- $(use_with cups)
- $(use_with ncurses curses)
- $(use_with udisks dbus)
- $(use_with faudio)
- $(use_with fontconfig)
- $(use_with ssl gnutls)
- $(use_enable gecko mshtml)
- $(use_with gphoto2 gphoto)
- $(use_with gsm)
- $(use_with gssapi)
- $(use_with gstreamer)
- --without-hal
- $(use_with jpeg)
- $(use_with kerberos krb5)
- $(use_with ldap)
- --without-mingw # linux LDFLAGS leak in mingw32: bug #685172
- $(use_enable mono mscoree)
- $(use_with mp3 mpg123)
- $(use_with netapi)
- $(use_with nls gettext)
- $(use_with openal)
- $(use_with opencl)
- $(use_with opengl)
- $(use_with osmesa)
- $(use_with oss)
- $(use_with pcap)
- $(use_with png)
- $(use_with pulseaudio pulse)
- $(use_with threads pthread)
- $(use_with scanner sane)
- $(use_with sdl)
- $(use_enable test tests)
- $(use_with truetype freetype)
- $(use_with udev)
- $(use_with v4l v4l2)
- $(use_with vkd3d)
- $(use_with vulkan)
- $(use_with X x)
- $(use_with X xfixes)
- $(use_with xcomposite)
- $(use_with xinerama)
- $(use_with xml)
- $(use_with xml xslt)
- )
-
- local PKG_CONFIG AR RANLIB
- # Avoid crossdev's i686-pc-linux-gnu-pkg-config if building wine32 on amd64; #472038
- # set AR and RANLIB to make QA scripts happy; #483342
- tc-export PKG_CONFIG AR RANLIB
-
- if use amd64; then
- if [[ ${ABI} == amd64 ]]; then
- myconf+=( --enable-win64 )
- else
- myconf+=( --disable-win64 )
- fi
-
- # Note: using --with-wine64 results in problems with multilib.eclass
- # CC/LD hackery. We're using separate tools instead.
- fi
-
- ECONF_SOURCE=${S} \
- econf "${myconf[@]}"
- emake depend
-}
-
-multilib_src_test() {
- # FIXME: win32-only; wine64 tests fail with "could not find the Wine loader"
- if [[ ${ABI} == x86 ]]; then
- if [[ $(id -u) == 0 ]]; then
- ewarn "Skipping tests since they cannot be run under the root user."
- ewarn "To run the test ${MY_PN} suite, add userpriv to FEATURES in make.conf"
- return
- fi
-
- WINEPREFIX="${T}/.wine-${ABI}" \
- Xemake test
- fi
-}
-
-multilib_src_install_all() {
- local DOCS=( ANNOUNCE AUTHORS README )
- add_locale_docs() {
- local locale_doc="documentation/README.$1"
- [[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
- }
- l10n_for_each_locale_do add_locale_docs
-
- einstalldocs
- prune_libtool_files --all
-
- if ! use perl ; then # winedump calls function_grep.pl, and winemaker is a perl script
- rm "${D%/}${MY_PREFIX}"/bin/{wine{dump,maker},function_grep.pl} \
- "${D%/}${MY_MANDIR}"/man1/wine{dump,maker}.1 || die
- fi
-
- # Remove wineconsole if neither backend is installed #551124
- if ! use X && ! use ncurses; then
- rm "${D%/}${MY_PREFIX}"/bin/wineconsole* || die
- rm "${D%/}${MY_MANDIR}"/man1/wineconsole* || die
- rm_wineconsole() {
- rm "${D%/}${MY_PREFIX}/$(get_libdir)"/wine/{,fakedlls/}wineconsole.exe* || die
- }
- multilib_foreach_abi rm_wineconsole
- fi
-
- use abi_x86_32 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine{,-preloader} #255055
- use abi_x86_64 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine64{,-preloader}
-
- # Avoid double prefix from dosym and make_wrapper
- MY_PREFIX=${MY_PREFIX#${EPREFIX}}
-
- if use abi_x86_64 && ! use abi_x86_32; then
- dosym wine64 "${MY_PREFIX}"/bin/wine # 404331
- dosym wine64-preloader "${MY_PREFIX}"/bin/wine-preloader
- fi
-
- # Failglob for binloops, shouldn't be necessary, but including to stay safe
- eshopts_push -s failglob #615218
- # Make wrappers for binaries for handling multiple variants
- # Note: wrappers instead of symlinks because some are shell which use basename
- local b
- for b in "${ED%/}${MY_PREFIX}"/bin/*; do
- make_wrapper "${b##*/}-${WINE_VARIANT}" "${MY_PREFIX}/bin/${b##*/}"
- done
- eshopts_pop
-}
-
-pkg_postinst() {
- eselect wine register ${P}
- if [[ ${PN} == "wine-vanilla" ]]; then
- eselect wine register --vanilla ${P} || die
- fi
-
- eselect wine update --all --if-unset || die
-
- xdg_desktop_database_update
-
- if ! use gecko; then
- ewarn "Without Wine Gecko, wine prefixes will not have a default"
- ewarn "implementation of iexplore. Many older windows applications"
- ewarn "rely upon the existence of an iexplore implementation, so"
- ewarn "you will likely need to install an external one, like via winetricks"
- fi
- if ! use mono; then
- ewarn "Without Wine Mono, wine prefixes will not have a default"
- ewarn "implementation of .NET. Many windows applications rely upon"
- ewarn "the existence of a .NET implementation, so you will likely need"
- ewarn "to install an external one, like via winetricks"
- fi
-}
-
-pkg_prerm() {
- eselect wine deregister ${P}
- if [[ ${PN} == "wine-vanilla" ]]; then
- eselect wine deregister --vanilla ${P} || die
- fi
-
- eselect wine update --all --if-unset || die
-}
-
-pkg_postrm() {
- xdg_desktop_database_update
-}
diff --git a/app-emulation/wine-vanilla/wine-vanilla-5.0.3.ebuild b/app-emulation/wine-vanilla/wine-vanilla-5.0.3.ebuild
deleted file mode 100644
index 2c8da9a04c68..000000000000
--- a/app-emulation/wine-vanilla/wine-vanilla-5.0.3.ebuild
+++ /dev/null
@@ -1,538 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW"
-PLOCALE_BACKUP="en"
-
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
-
-MY_PN="${PN%%-*}"
-MY_P="${MY_PN}-${PV}"
-
-if [[ ${PV} == "9999" ]] ; then
- EGIT_REPO_URI="https://source.winehq.org/git/wine.git"
- EGIT_BRANCH="master"
- inherit git-r3
- SRC_URI=""
- #KEYWORDS=""
-else
- MAJOR_V=$(ver_cut 1)
- SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.0/${MY_P}.tar.xz"
- KEYWORDS="-* ~amd64 ~x86"
-fi
-S="${WORKDIR}/${MY_P}"
-
-GWP_V="20191222"
-PATCHDIR="${WORKDIR}/gentoo-wine-patches"
-
-DESCRIPTION="Free implementation of Windows(tm) on Unix, without external patchsets"
-HOMEPAGE="https://www.winehq.org/"
-SRC_URI="${SRC_URI}
- https://dev.gentoo.org/~sarnex/distfiles/wine/gentoo-wine-patches-${GWP_V}.tar.xz
-"
-
-LICENSE="LGPL-2.1"
-SLOT="${PV}"
-IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +faudio +fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl test +threads +truetype udev +udisks v4l vkd3d vulkan +X +xcomposite xinerama +xml"
-REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
- X? ( truetype )
- elibc_glibc? ( threads )
- osmesa? ( opengl )
- test? ( abi_x86_32 )
- vkd3d? ( vulkan )" # osmesa-opengl #286560 # X-truetype #551124
-
-# FIXME: the test suite is unsuitable for us; many tests require net access
-# or fail due to Xvfb's opengl limitations.
-RESTRICT="test"
-
-COMMON_DEPEND="
- X? (
- x11-libs/libXcursor[${MULTILIB_USEDEP}]
- x11-libs/libXext[${MULTILIB_USEDEP}]
- x11-libs/libXfixes[${MULTILIB_USEDEP}]
- x11-libs/libXrandr[${MULTILIB_USEDEP}]
- x11-libs/libXi[${MULTILIB_USEDEP}]
- x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
- )
- alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
- capi? ( net-libs/libcapi[${MULTILIB_USEDEP}] )
- cups? ( net-print/cups:=[${MULTILIB_USEDEP}] )
- faudio? ( app-emulation/faudio:=[${MULTILIB_USEDEP}] )
- fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] )
- gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
- gsm? ( media-sound/gsm:=[${MULTILIB_USEDEP}] )
- gssapi? ( virtual/krb5[${MULTILIB_USEDEP}] )
- gstreamer? (
- media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
- media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}]
- )
- jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
- kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] )
- lcms? ( media-libs/lcms:2=[${MULTILIB_USEDEP}] )
- ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] )
- mp3? ( >=media-sound/mpg123-1.5.0[${MULTILIB_USEDEP}] )
- ncurses? ( >=sys-libs/ncurses-5.2:0=[${MULTILIB_USEDEP}] )
- netapi? ( net-fs/samba[netapi(+),${MULTILIB_USEDEP}] )
- nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] )
- odbc? ( dev-db/unixODBC:=[${MULTILIB_USEDEP}] )
- openal? ( media-libs/openal:=[${MULTILIB_USEDEP}] )
- opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
- opengl? (
- virtual/glu[${MULTILIB_USEDEP}]
- virtual/opengl[${MULTILIB_USEDEP}]
- )
- osmesa? ( >=media-libs/mesa-13[osmesa,${MULTILIB_USEDEP}] )
- pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] )
- png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] )
- pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
- scanner? ( media-gfx/sane-backends:=[${MULTILIB_USEDEP}] )
- sdl? ( media-libs/libsdl2:=[haptic,joystick,${MULTILIB_USEDEP}] )
- ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
- truetype? ( >=media-libs/freetype-2.0.0[${MULTILIB_USEDEP}] )
- udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
- udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
- v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
- vkd3d? ( app-emulation/vkd3d[${MULTILIB_USEDEP}] )
- vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] )
- xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
- xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
- xml? (
- dev-libs/libxml2[${MULTILIB_USEDEP}]
- dev-libs/libxslt[${MULTILIB_USEDEP}]
- )"
-
-RDEPEND="${COMMON_DEPEND}
- app-emulation/wine-desktop-common
- >app-eselect/eselect-wine-0.3
- !app-emulation/wine:0
- dos? ( >=games-emulation/dosbox-0.74_p20160629 )
- gecko? ( app-emulation/wine-gecko:2.47.1[abi_x86_32?,abi_x86_64?] )
- mono? ( app-emulation/wine-mono:4.9.4 )
- perl? (
- dev-lang/perl
- dev-perl/XML-Simple
- )
- pulseaudio? (
- realtime? ( sys-auth/rtkit )
- )
- samba? ( >=net-fs/samba-3.0.25[winbind] )
- selinux? ( sec-policy/selinux-wine )
- udisks? ( sys-fs/udisks:2 )"
-
-# tools/make_requests requires perl
-DEPEND="${COMMON_DEPEND}
- sys-devel/flex
- >=sys-kernel/linux-headers-2.6
- virtual/pkgconfig
- virtual/yacc
- X? ( x11-base/xorg-proto )
- prelink? ( sys-devel/prelink )
- xinerama? ( x11-base/xorg-proto )"
-
-# These use a non-standard "Wine" category, which is provided by
-# /etc/xdg/applications-merged/wine.menu
-QA_DESKTOP_FILE="usr/share/applications/wine-browsedrive.desktop
-usr/share/applications/wine-notepad.desktop
-usr/share/applications/wine-uninstaller.desktop
-usr/share/applications/wine-winecfg.desktop"
-
-PATCHES=(
- "${PATCHDIR}/patches/${MY_PN}-5.0-winegcc.patch" #260726
- "${PATCHDIR}/patches/${MY_PN}-4.7-multilib-portage.patch" #395615
- "${PATCHDIR}/patches/${MY_PN}-5.0-memset-O3.patch" #480508
- "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" #310611
-)
-PATCHES_BIN=()
-
-# https://bugs.gentoo.org/show_bug.cgi?id=635222
-if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then
- DEPEND+=" dev-util/patchbin"
-fi
-
-wine_compiler_check() {
- [[ ${MERGE_TYPE} = "binary" ]] && return 0
-
- # GCC-specific bugs
- if tc-is-gcc; then
- # bug #549768
- if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then
- ebegin "Checking for gcc-5 ms_abi compiler bug"
- $(tc-getCC) -O2 "${PATCHDIR}/files/pr66838.c" -o "${T}"/pr66838 || die
- # Run in subshell to prevent "Aborted" message
- ( "${T}"/pr66838 || false ) >/dev/null 2>&1
- if ! eend $?; then
- eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0"
- eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild,"
- eerror "or use gcc-config to select a different compiler version."
- eerror "See https://bugs.gentoo.org/549768"
- eerror
- return 1
- fi
- fi
- # bug #574044
- if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then
- ebegin "Checking for gcc-5-3 stack realignment compiler bug"
- # Compile in subshell to prevent "Aborted" message
- ( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${PATCHDIR}/files/pr69140.c" -o "${T}"/pr69140 ) >/dev/null 2>&1
- if ! eend $?; then
- eerror "Wine cannot be built with this version of gcc-5.3"
- eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild,"
- eerror "or use gcc-config to select a different compiler version."
- eerror "See https://bugs.gentoo.org/574044"
- eerror
- return 1
- fi
- fi
- fi
-
- # Ensure compiler support
- if use abi_x86_64; then
- ebegin "Checking for 64-bit compiler with builtin_ms_va_list support"
- # Compile in subshell to prevent "Aborted" message
- ( $(tc-getCC) -O2 "${PATCHDIR}/files/builtin_ms_va_list.c" -o "${T}"/builtin_ms_va_list >/dev/null 2>&1)
- if ! eend $?; then
- eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine"
- eerror
- eerror "You need gcc-4.4+ or clang 3.8+ to build 64-bit wine"
- eerror
- return 1
- fi
- fi
-}
-
-wine_build_environment_check() {
- [[ ${MERGE_TYPE} = "binary" ]] && return 0
-
- if use abi_x86_64; then
- if tc-is-gcc && [[ $(gcc-major-version) -lt 4 || ( $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 4 ) ]]; then
- eerror "You need gcc-4.4+ to compile 64-bit wine"
- die
- elif tc-is-clang && [[ $(clang-major-version) -lt 3 || ( $(clang-major-version) -eq 3 && $(clang-minor-version) -lt 8 ) ]]; then
- eerror "You need clang-3.8+ to compile 64-bit wine"
- die
- fi
- fi
- if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -le 3 ]]; then
- ewarn "GCC-5.0-5.3 suffered from compiler bugs and are no longer supported by"
- ewarn "Gentoo's Toolchain Team. If your ebuild fails the compiler checks in"
- ewarn "the configure phase, either update your compiler or switch to <5.0 || >=5.4"
- fi
- if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -eq 4 ]]; then
- if has "-march=i686" ${CFLAGS} && ! has "-mtune=generic" ${CFLAGS}; then
- ewarn "Compilation can hang with CFLAGS=\"-march=i686\". You can temporarily work"
- ewarn "around this by adding \"-mtune=generic\" to your CFLAGS for wine."
- ewarn "See package.env in man 5 portage for more information on how to do this."
- ewarn "See https://bugs.gentoo.org/show_bug.cgi?id=613128 for more details"
- fi
- fi
-
- if use abi_x86_32 && use opencl && [[ "$(eselect opencl show 2> /dev/null)" == "intel" ]]; then
- eerror "You cannot build wine with USE=opencl because intel-ocl-sdk is 64-bit only."
- eerror "See https://bugs.gentoo.org/487864 for more details."
- eerror
- return 1
- fi
-}
-
-wine_env_vcs_vars() {
- local pn_live_var="${PN//[-+]/_}_LIVE_COMMIT"
- local pn_live_val="${pn_live_var}"
- eval pn_live_val='$'${pn_live_val}
- if [[ ! -z ${EGIT_COMMIT} ]]; then
- eerror "Commits must now be specified using the environmental variables"
- eerror "EGIT_OVERRIDE_COMMIT_WINE"
- eerror
- return 1
- fi
-}
-
-pkg_pretend() {
- wine_build_environment_check || die
-
- # Verify OSS support
- if use oss && ! use kernel_FreeBSD; then
- if ! has_version ">=media-sound/oss-4"; then
- eerror "You cannot build wine with USE=oss without having support from a"
- eerror "FreeBSD kernel or >=media-sound/oss-4 (only available through external repos)"
- eerror
- die
- fi
- fi
-}
-
-pkg_setup() {
- wine_build_environment_check || die
- wine_env_vcs_vars || die
-
- WINE_VARIANT="${PN#wine}-${PV}"
- WINE_VARIANT="${WINE_VARIANT#-}"
-
- MY_PREFIX="${EPREFIX}/usr/lib/wine-${WINE_VARIANT}"
- MY_DATAROOTDIR="${EPREFIX}/usr/share/wine-${WINE_VARIANT}"
- MY_DATADIR="${MY_DATAROOTDIR}"
- MY_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
- MY_INCLUDEDIR="${EPREFIX}/usr/include/wine-${WINE_VARIANT}"
- MY_LIBEXECDIR="${EPREFIX}/usr/libexec/wine-${WINE_VARIANT}"
- MY_LOCALSTATEDIR="${EPREFIX}/var/wine-${WINE_VARIANT}"
- MY_MANDIR="${MY_DATADIR}/man"
-}
-
-src_unpack() {
- if [[ ${PV} == "9999" ]] ; then
- EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack
- fi
-
- default
-
- l10n_find_plocales_changes "${S}/po" "" ".po"
-}
-
-src_prepare() {
-
- eapply_bin(){
- local patch
- for patch in ${PATCHES_BIN[@]}; do
- patchbin --nogit < "${patch}" || die
- done
- }
-
- local md5="$(md5sum server/protocol.def)"
-
- default
- eapply_bin
- eautoreconf
-
- # Modification of the server protocol requires regenerating the server requests
- if [[ "$(md5sum server/protocol.def)" != "${md5}" ]]; then
- einfo "server/protocol.def was patched; running tools/make_requests"
- tools/make_requests || die #432348
- fi
- sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
- if ! use run-exes; then
- sed -i '/^MimeType/d' loader/wine.desktop || die #117785
- fi
-
- # Edit wine.desktop to work for specific variant
- sed -e "/^Exec=/s/wine /wine-${WINE_VARIANT} /" -i loader/wine.desktop || die
-
- # hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652
- cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die
-
- l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
-
- # Fix manpage generation for locales #469418 and abi_x86_64 #617864
-
- # Duplicate manpages input files for wine64
- local f
- for f in loader/*.man.in; do
- cp ${f} ${f/wine/wine64} || die
- done
- # Add wine64 manpages to Makefile
- if use abi_x86_64; then
- sed -i "/wine.man.in/i \
- \\\twine64.man.in \\\\" loader/Makefile.in || die
- sed -i -E 's/(.*wine)(.*\.UTF-8\.man\.in.*)/&\
-\164\2/' loader/Makefile.in || die
- fi
-
- rm_man_file(){
- local file="${1}"
- loc=${2}
- sed -i "/${loc}\.UTF-8\.man\.in/d" "${file}" || die
- }
-
- while read f; do
- l10n_for_each_disabled_locale_do rm_man_file "${f}"
- done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; -print)
-}
-
-src_configure() {
- wine_compiler_check || die
-
- export LDCONFIG=/bin/true
- use custom-cflags || strip-flags
-
- multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
- local myconf=(
- --prefix="${MY_PREFIX}"
- --datarootdir="${MY_DATAROOTDIR}"
- --datadir="${MY_DATADIR}"
- --docdir="${MY_DOCDIR}"
- --includedir="${MY_INCLUDEDIR}"
- --libdir="${EPREFIX}/usr/$(get_libdir)/wine-${WINE_VARIANT}"
- --libexecdir="${MY_LIBEXECDIR}"
- --localstatedir="${MY_LOCALSTATEDIR}"
- --mandir="${MY_MANDIR}"
- --sysconfdir="${EPREFIX}/etc/wine"
- $(use_with alsa)
- $(use_with capi)
- $(use_with lcms cms)
- $(use_with cups)
- $(use_with ncurses curses)
- $(use_with udisks dbus)
- $(use_with faudio)
- $(use_with fontconfig)
- $(use_with ssl gnutls)
- $(use_enable gecko mshtml)
- $(use_with gphoto2 gphoto)
- $(use_with gsm)
- $(use_with gssapi)
- $(use_with gstreamer)
- --without-hal
- $(use_with jpeg)
- $(use_with kerberos krb5)
- $(use_with ldap)
- --without-mingw # linux LDFLAGS leak in mingw32: bug #685172
- $(use_enable mono mscoree)
- $(use_with mp3 mpg123)
- $(use_with netapi)
- $(use_with nls gettext)
- $(use_with openal)
- $(use_with opencl)
- $(use_with opengl)
- $(use_with osmesa)
- $(use_with oss)
- $(use_with pcap)
- $(use_with png)
- $(use_with pulseaudio pulse)
- $(use_with threads pthread)
- $(use_with scanner sane)
- $(use_with sdl)
- $(use_enable test tests)
- $(use_with truetype freetype)
- $(use_with udev)
- $(use_with v4l v4l2)
- $(use_with vkd3d)
- $(use_with vulkan)
- $(use_with X x)
- $(use_with X xfixes)
- $(use_with xcomposite)
- $(use_with xinerama)
- $(use_with xml)
- $(use_with xml xslt)
- )
-
- local PKG_CONFIG AR RANLIB
- # Avoid crossdev's i686-pc-linux-gnu-pkg-config if building wine32 on amd64; #472038
- # set AR and RANLIB to make QA scripts happy; #483342
- tc-export PKG_CONFIG AR RANLIB
-
- if use amd64; then
- if [[ ${ABI} == amd64 ]]; then
- myconf+=( --enable-win64 )
- else
- myconf+=( --disable-win64 )
- fi
-
- # Note: using --with-wine64 results in problems with multilib.eclass
- # CC/LD hackery. We're using separate tools instead.
- fi
-
- ECONF_SOURCE=${S} \
- econf "${myconf[@]}"
- emake depend
-}
-
-multilib_src_test() {
- # FIXME: win32-only; wine64 tests fail with "could not find the Wine loader"
- if [[ ${ABI} == x86 ]]; then
- if [[ $(id -u) == 0 ]]; then
- ewarn "Skipping tests since they cannot be run under the root user."
- ewarn "To run the test ${MY_PN} suite, add userpriv to FEATURES in make.conf"
- return
- fi
-
- WINEPREFIX="${T}/.wine-${ABI}" \
- Xemake test
- fi
-}
-
-multilib_src_install_all() {
- local DOCS=( ANNOUNCE AUTHORS README )
- add_locale_docs() {
- local locale_doc="documentation/README.$1"
- [[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
- }
- l10n_for_each_locale_do add_locale_docs
-
- einstalldocs
- prune_libtool_files --all
-
- if ! use perl ; then # winedump calls function_grep.pl, and winemaker is a perl script
- rm "${D%/}${MY_PREFIX}"/bin/{wine{dump,maker},function_grep.pl} \
- "${D%/}${MY_MANDIR}"/man1/wine{dump,maker}.1 || die
- fi
-
- # Remove wineconsole if neither backend is installed #551124
- if ! use X && ! use ncurses; then
- rm "${D%/}${MY_PREFIX}"/bin/wineconsole* || die
- rm "${D%/}${MY_MANDIR}"/man1/wineconsole* || die
- rm_wineconsole() {
- rm "${D%/}${MY_PREFIX}/$(get_libdir)"/wine/{,fakedlls/}wineconsole.exe* || die
- }
- multilib_foreach_abi rm_wineconsole
- fi
-
- use abi_x86_32 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine{,-preloader} #255055
- use abi_x86_64 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine64{,-preloader}
-
- # Avoid double prefix from dosym and make_wrapper
- MY_PREFIX=${MY_PREFIX#${EPREFIX}}
-
- if use abi_x86_64 && ! use abi_x86_32; then
- dosym wine64 "${MY_PREFIX}"/bin/wine # 404331
- dosym wine64-preloader "${MY_PREFIX}"/bin/wine-preloader
- fi
-
- # Failglob for binloops, shouldn't be necessary, but including to stay safe
- eshopts_push -s failglob #615218
- # Make wrappers for binaries for handling multiple variants
- # Note: wrappers instead of symlinks because some are shell which use basename
- local b
- for b in "${ED%/}${MY_PREFIX}"/bin/*; do
- make_wrapper "${b##*/}-${WINE_VARIANT}" "${MY_PREFIX}/bin/${b##*/}"
- done
- eshopts_pop
-}
-
-pkg_postinst() {
- eselect wine register ${P}
- if [[ ${PN} == "wine-vanilla" ]]; then
- eselect wine register --vanilla ${P} || die
- fi
-
- eselect wine update --all --if-unset || die
-
- xdg_desktop_database_update
-
- if ! use gecko; then
- ewarn "Without Wine Gecko, wine prefixes will not have a default"
- ewarn "implementation of iexplore. Many older windows applications"
- ewarn "rely upon the existence of an iexplore implementation, so"
- ewarn "you will likely need to install an external one, like via winetricks"
- fi
- if ! use mono; then
- ewarn "Without Wine Mono, wine prefixes will not have a default"
- ewarn "implementation of .NET. Many windows applications rely upon"
- ewarn "the existence of a .NET implementation, so you will likely need"
- ewarn "to install an external one, like via winetricks"
- fi
-}
-
-pkg_prerm() {
- eselect wine deregister ${P}
- if [[ ${PN} == "wine-vanilla" ]]; then
- eselect wine deregister --vanilla ${P} || die
- fi
-
- eselect wine update --all --if-unset || die
-}
-
-pkg_postrm() {
- xdg_desktop_database_update
-}
diff --git a/app-emulation/wine-vanilla/wine-vanilla-5.19.ebuild b/app-emulation/wine-vanilla/wine-vanilla-6.0.ebuild
similarity index 89%
rename from app-emulation/wine-vanilla/wine-vanilla-5.19.ebuild
rename to app-emulation/wine-vanilla/wine-vanilla-6.0.ebuild
index 226b93efb90f..a95817ac4247 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-5.19.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-6.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 @@ if [[ ${PV} == "9999" ]] ; then
#KEYWORDS=""
else
MAJOR_V=$(ver_cut 1)
- SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz"
+ SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.0/${MY_P}.tar.xz"
KEYWORDS="-* ~amd64 ~x86"
fi
S="${WORKDIR}/${MY_P}"
@@ -35,7 +35,7 @@ SRC_URI="${SRC_URI}
LICENSE="LGPL-2.1"
SLOT="${PV}"
-IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +faudio +fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl test +threads +truetype udev +udisks +unwind v4l vkd3d vulkan +X +xcomposite xinerama +xml"
+IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +faudio +fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap mingw +mono mp3 netapi nls odbc openal opencl +opengl osmesa oss +perl pcap +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl test +threads +truetype udev +udisks +unwind usb v4l vkd3d vulkan +X +xcomposite xinerama +xml"
REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
X? ( truetype )
elibc_glibc? ( threads )
@@ -73,7 +73,6 @@ COMMON_DEPEND="
lcms? ( media-libs/lcms:2=[${MULTILIB_USEDEP}] )
ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] )
mp3? ( >=media-sound/mpg123-1.5.0[${MULTILIB_USEDEP}] )
- ncurses? ( >=sys-libs/ncurses-5.2:0=[${MULTILIB_USEDEP}] )
netapi? ( net-fs/samba[netapi(+),${MULTILIB_USEDEP}] )
nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] )
odbc? ( dev-db/unixODBC:=[${MULTILIB_USEDEP}] )
@@ -94,6 +93,7 @@ COMMON_DEPEND="
udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
+ usb? ( virtual/libusb:1[${MULTILIB_USEDEP}] )
v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
vkd3d? ( >=app-emulation/vkd3d-1.2[${MULTILIB_USEDEP}] )
vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] )
@@ -261,6 +261,34 @@ pkg_pretend() {
die
fi
fi
+
+ if use mingw && use abi_x86_32 && ! has_version "cross-i686-w64-mingw32/gcc"; then
+ eerror
+ eerror "USE=\"mingw\" is currently experimental, and requires the"
+ eerror "'cross-i686-w64-mingw32' compiler and its runtime for 32-bit builds."
+ eerror
+ eerror "These can be installed by using 'sys-devel/crossdev':"
+ eerror
+ eerror "crossdev --target i686-w64-mingw32"
+ eerror
+ eerror "For more information on setting up MinGW, see: https://wiki.gentoo.org/wiki/Mingw"
+ eerror
+ die "MinGW build was enabled, but no compiler to support it was found."
+ fi
+
+ if use mingw && use abi_x86_64 && ! has_version "cross-x86_64-w64-mingw32/gcc"; then
+ eerror
+ eerror "USE=\"mingw\" is currently experimental, and requires the"
+ eerror "'cross-x86_64-w64-mingw32' compiler and its runtime for 64-bit builds."
+ eerror
+ eerror "These can be installed by using 'sys-devel/crossdev':"
+ eerror
+ eerror "crossdev --target x86_64-w64-mingw32"
+ eerror
+ eerror "For more information on setting up MinGW, see: https://wiki.gentoo.org/wiki/Mingw"
+ eerror
+ die "MinGW build was enabled, but no compiler to support it was found."
+ fi
}
pkg_setup() {
@@ -354,6 +382,9 @@ src_configure() {
export LDCONFIG=/bin/true
use custom-cflags || strip-flags
+ if use mingw; then
+ export CROSSCFLAGS="${CFLAGS}"
+ fi
multilib-minimal_src_configure
}
@@ -374,7 +405,6 @@ multilib_src_configure() {
$(use_with capi)
$(use_with lcms cms)
$(use_with cups)
- $(use_with ncurses curses)
$(use_with udisks dbus)
$(use_with faudio)
$(use_with fontconfig)
@@ -388,7 +418,8 @@ multilib_src_configure() {
$(use_with jpeg)
$(use_with kerberos krb5)
$(use_with ldap)
- --without-mingw # linux LDFLAGS leak in mingw32: bug #685172
+ # TODO: Will bug 685172 still need special handling?
+ $(use_with mingw)
$(use_enable mono mscoree)
$(use_with mp3 mpg123)
$(use_with netapi)
@@ -408,6 +439,7 @@ multilib_src_configure() {
$(use_with truetype freetype)
$(use_with udev)
$(use_with unwind)
+ $(use_with usb)
$(use_with v4l v4l2)
$(use_with vkd3d)
$(use_with vulkan)
@@ -470,12 +502,20 @@ multilib_src_install_all() {
fi
# Remove wineconsole if neither backend is installed #551124
- if ! use X && ! use ncurses; then
+ if ! use X; then
rm "${D%/}${MY_PREFIX}"/bin/wineconsole* || die
rm "${D%/}${MY_MANDIR}"/man1/wineconsole* || die
- rm_wineconsole() {
- rm "${D%/}${MY_PREFIX}/$(get_libdir)"/wine/{,fakedlls/}wineconsole.exe* || die
- }
+
+ if ! use mingw; then
+ rm_wineconsole() {
+ rm "${D%/}/usr/$(get_libdir)/wine-${WINE_VARIANT}"/wine/{,fakedlls/}wineconsole.exe* || die
+ }
+ else
+ rm_wineconsole() {
+ rm "${D%/}/usr/$(get_libdir)/wine-${WINE_VARIANT}"/wine/wineconsole.exe* || die
+ }
+ fi
+
multilib_foreach_abi rm_wineconsole
fi
diff --git a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
index 97ea9019cb11..a95817ac4247 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-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=6
@@ -19,7 +19,7 @@ if [[ ${PV} == "9999" ]] ; then
#KEYWORDS=""
else
MAJOR_V=$(ver_cut 1)
- SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz"
+ SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.0/${MY_P}.tar.xz"
KEYWORDS="-* ~amd64 ~x86"
fi
S="${WORKDIR}/${MY_P}"
@@ -35,7 +35,7 @@ SRC_URI="${SRC_URI}
LICENSE="LGPL-2.1"
SLOT="${PV}"
-IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +faudio +fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap mingw +mono mp3 netapi nls odbc openal opencl +opengl osmesa oss +perl pcap +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl test +threads +truetype udev +udisks +unwind v4l vkd3d vulkan +X +xcomposite xinerama +xml"
+IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +faudio +fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap mingw +mono mp3 netapi nls odbc openal opencl +opengl osmesa oss +perl pcap +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl test +threads +truetype udev +udisks +unwind usb v4l vkd3d vulkan +X +xcomposite xinerama +xml"
REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
X? ( truetype )
elibc_glibc? ( threads )
@@ -93,6 +93,7 @@ COMMON_DEPEND="
udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
+ usb? ( virtual/libusb:1[${MULTILIB_USEDEP}] )
v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
vkd3d? ( >=app-emulation/vkd3d-1.2[${MULTILIB_USEDEP}] )
vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] )
@@ -438,6 +439,7 @@ multilib_src_configure() {
$(use_with truetype freetype)
$(use_with udev)
$(use_with unwind)
+ $(use_with usb)
$(use_with v4l v4l2)
$(use_with vkd3d)
$(use_with vulkan)
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index 879061868949..4d8acfd88d5f 100644
Binary files a/app-misc/Manifest.gz and b/app-misc/Manifest.gz differ
diff --git a/app-misc/fdupes/Manifest b/app-misc/fdupes/Manifest
index 6aab26267cc1..87425b97c27f 100644
--- a/app-misc/fdupes/Manifest
+++ b/app-misc/fdupes/Manifest
@@ -2,10 +2,11 @@ AUX fdupes-1.50_pre2-compare-file.patch 2002 BLAKE2B 235dea1ccd34b5c75bb289af920
AUX fdupes-1.50_pre2-typo.patch 675 BLAKE2B 790bc07cc4e83a3dfc8736417d8e5eb5c892ef6d4eb452ead369ef6e700f530e45e0410b2b03702592032a78207f700a812673abf75d1cfe6387e0952ce9885d SHA512 fdc313c2bfa44c17bc30f2f001f06b818eeea7fddc0b2c6a600b4694cbaeb53aa4fcfd93a7fe6eb0b6d48297b1a8654481f8efa57e2a78908e75b35df5959619
AUX fdupes-1.51-fix-stdin-lvalue.patch 585 BLAKE2B 15bff93ab94497d4cafa27baa27fd8a214a16efb7a90d5d42926141b4a02e5fc36d0b353eab93ffe8ef512f6039deb81e1448e28a259f87d78459db50d1ecdb1 SHA512 87ddc27a1125a5500be9120781d7b7b695f638af6219498e200d375bca5b98f009d25905ca7d72dde7ebea2bd58a4e23db48843eef5dabeff6cb95194e9bc7c1
AUX fdupes-1.51-makefile.patch 779 BLAKE2B de015e63777f64b2f798eb61314f71e3b66a91f2c8360a63ca7a0078df21d9fb9b01a9adc8e670f70545946ba7dd594287e701ca31caa1f34b57d4c8ee2d99db SHA512 965b8eda17f52b822657373f3aa6d624900477c43d50fd507f853ffe10764184dac6c0f46cf40cbe371eec69f12434a63b49759c94512896640c9001641d0a8d
-AUX fdupes-9999-gentoo.patch 426 BLAKE2B ec2b67101e35617fdd479c68df0b61161852d1895b2de1ff8ca127746b4b3deb5906f388a7f6030cd4ed95ff6781b648133ec50ab075039092b560581a89e690 SHA512 86482e46a6e2b3800f34122ef44ca830c065360fce5806962fcc49b2d9a6a76f65b52e89283e150ce5b885f038b70d992f753fecbb38694f2485a08e221f1216
DIST fdupes-1.51.tar.gz 48942 BLAKE2B b2673a5601d0bc1d7bb0d312c3d4fbf67494916e9445fba6c46bccbeaa471ebc776b9deb18b323c6eebea4f231bdf1503af9010cbe83b6aae2a3efe479c3a49c SHA512 7cbc414f25427793317667b8d5494f7247a08ba402855929de77d1db01eb3dce41ea608f8dcca047c4a7856e02b10261982cf2acd7f6a79ab726b3009c710a8d
DIST fdupes-1.6.1.tar.gz 20869 BLAKE2B 683b75b44ea4662e555a81405d6c9c291c7980b579c866ad953e18ad8c92beb37c2b6f7ca29ea4e40269ef751851dd8afbb77b0bffb5139bbfbcc0d41ab23a5a SHA512 6c6662b70068c2f48f4be64a6830c81a66852d650391d0756f20b9ac0df7d70c1a32918bd7cbd50e19de524d9ebc09ea338c19636e1807b071eb96b325e641db
+DIST fdupes-2.1.2.tar.gz 142266 BLAKE2B caf949b87baf0fecc87fef58f512d0a99e1219b57bc167992b0e40841ce67e5ddcf5307de7fc9c70f173e75aab4a12eb86abef0084084b5119f95326509ea665 SHA512 9c3761e7ce34f2d9d1b5ee49ebc3bf665e3d45e4146231bc77d7416801fbfa70415e80c81c64962897766ee068d1a103609895d783f20a765c351d4cd433323d
EBUILD fdupes-1.5.1.ebuild 967 BLAKE2B 4194d5858cc9f677391c7129a14cf654dbe8b85feb59a0b52d8247b09692433aa5be075dd2f5a1523c4b9e9eaa9d45900d9db3742a779ba5b7a3b17c44e45f3b SHA512 8138668d8cc7c9748075f13f6c384597accfe73ef1ca33d5ca547c67e19c4bafde2590515695a9d224ce95001ec7f11ff3d80eaaa4cb9d650d343e3091fbd41d
EBUILD fdupes-1.6.1-r1.ebuild 781 BLAKE2B 5a06c5e3e377a4ff287b037b909badb8c796b0b903b88312202a1f153c35b185fd3fda4833f7e2b7807b424442fa4185a512c9a3c226abda55424b0bb1a9ea88 SHA512 94926bdd838eb754e4f59ab049f45e377ef9485c17970a67d8e52cc3ce9713e64a97261a0f93ddaa7e09b4a507b380c8af4566ed1c26bae0b99ef09c2f5895ab
-EBUILD fdupes-9999.ebuild 676 BLAKE2B 061f5b9146f1a815ae16a056ddc95bf0f8bbcdda0b22e704986018df8d178582cfba854205814d41a7587433200eef4e326edc21b27f2715d1f641366e568077 SHA512 f04df62de8ddd45ad72015f8d346f15f4b81c066be0ff53e0f301ff5eb370ecc74192e2e03265f3fe729059cd1d330623eacca57177b1d8b9e777f8a090608d5
+EBUILD fdupes-2.1.2.ebuild 774 BLAKE2B aa48150134e666136d41b5a29db3afd8ef08d9315b8ef65409762e2e2481d1cf8d3df80407d385f1d5e14151617b55de444b636050bd3c7c5421e04fa766741e SHA512 c2e383f68cfaa5d5dda001b844c0fb08862721da228451c57fe4d50d9bb485181efef4fdfb922d038b725c910815bc46505dfe8e08ccd6389334db446cecc991
+EBUILD fdupes-9999.ebuild 973 BLAKE2B 59e4bab5eff1a0d8bc82d6235c282272110e35056092e6a3ed35e5d88a2a87eab5edb4757d256a03fb464c55db2b089d5aa7933f6fca1846d381e6cf79709a70 SHA512 d7004dd32acd802cc3bccad9b7d229bc669fab5c3075f51d0f99ce9200ed5ba8e624244bf92770a7ceac559eb8d06b9c630350614bda345c885c455753590d77
MISC metadata.xml 353 BLAKE2B 39808fa78e13623faaeb1acf023d3bba06fb38635f315144fe9f0713b209e5c31ba36073f03102bf55fbc216c00347cef077f4ddd9e5fe585104bbeac954ac46 SHA512 a918f701cfd176d6281ce0703be9ced24bba96090d0c6ed0647e20909cc420336506c943cd5e82050ebba4618dba28b8543afc9baa394c35e5bcdd3d7ffebb8c
diff --git a/app-misc/fdupes/fdupes-2.1.2.ebuild b/app-misc/fdupes/fdupes-2.1.2.ebuild
new file mode 100644
index 000000000000..78acd8f3a926
--- /dev/null
+++ b/app-misc/fdupes/fdupes-2.1.2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="Identify/delete duplicate files residing within specified directories"
+HOMEPAGE="https://github.com/adrianlopezroche/fdupes"
+SRC_URI="https://github.com/adrianlopezroche/${PN}/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+IUSE="+ncurses"
+
+RDEPEND="
+ dev-libs/libpcre2[pcre32]
+ ncurses? ( sys-libs/ncurses:0= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+DOCS=( CHANGES CONTRIBUTORS README )
+
+src_configure() {
+ econf $(use_with ncurses)
+}
+
+src_compile() {
+ emake CC=$(tc-getCC)
+}
diff --git a/app-misc/fdupes/fdupes-9999.ebuild b/app-misc/fdupes/fdupes-9999.ebuild
index f27d34c2d82a..9fc8d0597860 100644
--- a/app-misc/fdupes/fdupes-9999.ebuild
+++ b/app-misc/fdupes/fdupes-9999.ebuild
@@ -1,34 +1,41 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
-inherit flag-o-matic git-r3 toolchain-funcs
-
-MY_P="${PN}-${PV/_pre/-PR}"
+inherit toolchain-funcs
DESCRIPTION="Identify/delete duplicate files residing within specified directories"
HOMEPAGE="https://github.com/adrianlopezroche/fdupes"
-EGIT_REPO_URI="https://github.com/adrianlopezroche/fdupes.git"
-
+if [[ "${PV}" == *9999 ]] ; then
+ inherit autotools git-r3
+ EGIT_REPO_URI="https://github.com/adrianlopezroche/fdupes.git"
+else
+ SRC_URI="https://github.com/adrianlopezroche/${PN}/releases/download/v${PV}/${P}.tar.gz"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+fi
LICENSE="MIT"
SLOT="0"
+IUSE="+ncurses"
-KEYWORDS=""
-SRC_URI=""
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
+RDEPEND="
+ dev-libs/libpcre2[pcre32]
+ ncurses? ( sys-libs/ncurses:0= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
DOCS=( CHANGES CONTRIBUTORS README )
+src_prepare() {
+ default
+ [[ "${PV}" == *9999 ]] && eautoreconf
+}
+
src_configure() {
- append-lfs-flags
- tc-export CC
+ econf $(use_with ncurses)
}
-src_install() {
- emake PREFIX="/usr" DESTDIR="${D}" install
- einstalldocs
+src_compile() {
+ emake CC=$(tc-getCC)
}
diff --git a/app-misc/fdupes/files/fdupes-9999-gentoo.patch b/app-misc/fdupes/files/fdupes-9999-gentoo.patch
deleted file mode 100644
index 4c6edda50e04..000000000000
--- a/app-misc/fdupes/files/fdupes-9999-gentoo.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -71,9 +71,9 @@
- # Make Configuration
- #
- CC ?= gcc
--COMPILER_OPTIONS = -Wall -O -g
-+COMPILER_OPTIONS = -Wall
-
--CFLAGS= $(COMPILER_OPTIONS) -I. -DVERSION=\"$(VERSION)\" $(OMIT_GETOPT_LONG) $(FILEOFFSET_64BIT)
-+CFLAGS += $(COMPILER_OPTIONS) -I. -DVERSION=\"$(VERSION)\" $(OMIT_GETOPT_LONG) $(FILEOFFSET_64BIT)
-
- INSTALL_PROGRAM = $(INSTALL) -c -m 0755
- INSTALL_DATA = $(INSTALL) -c -m 0644
diff --git a/app-misc/geneweb/Manifest b/app-misc/geneweb/Manifest
index 0b1bf7e350b2..a70a76283d38 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.ebuild 1881 BLAKE2B 19f4f06fe2c6d2c3be7e446c831ea36795f5d1ee8e5e014bd6c916a3b58d4ee68a08ae2d2fba020be84da62c1136b9f5051e7283c05ae75fb938147666000f0f SHA512 f3a3212ae81a7e6d72731b1591c4f36a2fcd796f72aa9f3723defa4720ef1bb7388b577b86e7b7e71ca4514d7ad728593ac269081f628dcd457dc05b85fa15a2
+EBUILD geneweb-7.0.0-r1.ebuild 1874 BLAKE2B 680a796895db27360fd824a6373dd13920f0b93e05525b80b1f6fd2e943fe301338bfe60842d0e0b534ede6dae52bbdc9aeabe6576f2c3fb99050675dad4ddf7 SHA512 f3ad5766a831fb324cb7f793d3901852b3fa0175d403ee67a90172c7fb4866bcb0ab3f6b1013415540c241de0f874bead60a3098433cf17710b351783b538dcc
MISC metadata.xml 652 BLAKE2B 0a523f6b4dd3d65cf1668c16c07d1a9a4547bbcb9a800c4f9f706973d159ce434c2567d5b23609bd33f8c5f3ca4a25d8e7c485e15a640a941d21fd29fd52589d SHA512 7c94f8655959224e21113156e943d28dc9653f767fcd0cb6a9e7ec149abf3deabe850b404ba3b92384fd5bc919cce973c73b622746efc2a2862c86a62136d973
diff --git a/app-misc/geneweb/geneweb-7.0.0.ebuild b/app-misc/geneweb/geneweb-7.0.0-r1.ebuild
similarity index 95%
rename from app-misc/geneweb/geneweb-7.0.0.ebuild
rename to app-misc/geneweb/geneweb-7.0.0-r1.ebuild
index 3d855c8c25ea..b7c12813fba3 100644
--- a/app-misc/geneweb/geneweb-7.0.0.ebuild
+++ b/app-misc/geneweb/geneweb-7.0.0-r1.ebuild
@@ -32,14 +32,12 @@ QA_FLAGS_IGNORED=(
/usr/bin/consang
/usr/bin/gwd
/usr/bin/gwsetup
- /usr/bin/ged2gwb2
/usr/bin/gwc
/usr/bin/ged2gwb
- /usr/bin/check_base
/usr/bin/gwu
- /usr/bin/gwc1
- /usr/bin/gwc2
- /usr/lib/geneweb/gwtp
+ /usr/bin/connex
+ /usr/bin/gwdiff
+ /usr/bin/gwgc
)
src_configure() {
@@ -58,6 +56,7 @@ src_compile() {
src_install() {
default
+ mv "${D}"/usr/bin/{,gw}setup || die
rm -r "${D}"/usr/doc || die
dodoc ICHANGES etc/README.txt etc/a.gwf
diff --git a/app-misc/recoll/Manifest b/app-misc/recoll/Manifest
index dce8f67bef65..820f4c06c7cc 100644
--- a/app-misc/recoll/Manifest
+++ b/app-misc/recoll/Manifest
@@ -1,5 +1,5 @@
DIST recoll-1.25.19.tar.gz 2845683 BLAKE2B 745eac2dd3208619e173abba78f1e03186cdb5deb363c30728184a9d826c698d8e088cc0420178754131792f0d933f395a4fdb209a4315888b733a1209644580 SHA512 d56aff810e335f8212b908118de8fe12fc8d8f8341ebc281244c00dfe2216e008c655f4d39955b6c71928a28ea0aea073036fed17be5b80e8443fe6dfbe374f6
DIST recoll-1.27.12.tar.gz 3184471 BLAKE2B 60bcdee44259fa7f8b9decb9258ca0dae4edbf0cee1e8b1353cb59418503f0fcea9b439ecd6352500ff5b4cccfae08fc2a3f7f786fbd096cf18fd21fb809705b SHA512 3701dff056b8200f3b3c1bb2acaa69356c0def00959a0b74c14e1d500bd9e05fc81d82ce8b7db59d7e5b85617a8a7197700031aab65b31e005a4fedeaff59e97
EBUILD recoll-1.25.19.ebuild 3626 BLAKE2B ee225b0e2a67b4daa437abd238d82dddcdd3532bc8dda11ff72ec6812e9c7133a5e5f269d813101309b035e08a75b0f254491dcd826e0ac5fe5ffb47bd2114c2 SHA512 1265aa3c34bf97fe18785e5744de9d202a5d60d2d3c72f8d9a2549360ed665d9c764c6320e375ad61a11f66baae5e5ab594eb89c44bcc7f8286949f110bad239
-EBUILD recoll-1.27.12.ebuild 3645 BLAKE2B 56aef16e0f20e6c04713dda3763a4c8b3ca09c54f31630a4f2e2e8ea756f045282bc594aac5ccd57979d63a70ac36de0405a1982e98df226f618272e8cdd00bf SHA512 89039f5a49139dc2bdffd244bd3a716d6d64fbff5966651ea8964266557a8ed8f8a4ffd07466c607a0ddbc4b2e3f5119e50cb95b8e9f9dc36e5d01478c92e244
+EBUILD recoll-1.27.12.ebuild 3643 BLAKE2B 67720e02a10479a5491bcc2325fcb817a259f65f838184d6598801685b7acf8c06a638ab2890bae732068d99fdd9531fdda6d3fd119de4cb8c7b32323cd86c17 SHA512 a28a26ad3167e98ec3a30a26a9ae0a7041d091eae622bb55332359679876ed2b2e610b839620b49d156aaa008a45cecc5c4477090ffb8ee8c729d2582fbd6369
MISC metadata.xml 1382 BLAKE2B e0fe8843b74140663aa9eb968ee212ef0fd76bda4dd17b353b8382fcee917f9d47c82c9790ccae260e375d66ff1ef34049130ddab90d89e89819139848341e00 SHA512 b677720fb6be1b93e6fc26360bb4b9c4008bb2908db4cb8a4d10e84312f5b7e2a59a4e67ef2c5c7b410abdb11b80385efc6d2d604445048a9a9a29c97141223c
diff --git a/app-misc/recoll/recoll-1.27.12.ebuild b/app-misc/recoll/recoll-1.27.12.ebuild
index 0118eba02152..1b6a24294da3 100644
--- a/app-misc/recoll/recoll-1.27.12.ebuild
+++ b/app-misc/recoll/recoll-1.27.12.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://www.lesbonscomptes.com/recoll/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="camelcase chm doc +inotify qt5 session +spell webengine"
REQUIRED_USE="
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 4912cdb82f2e..ae3d93c251c9 100644
Binary files a/app-text/Manifest.gz and b/app-text/Manifest.gz differ
diff --git a/app-text/dvisvgm/Manifest b/app-text/dvisvgm/Manifest
index 65655c91ad91..4c344fa13c17 100644
--- a/app-text/dvisvgm/Manifest
+++ b/app-text/dvisvgm/Manifest
@@ -1,11 +1,5 @@
-DIST dvisvgm-2.1.3.tar.gz 2802278 BLAKE2B 36e523d4b82a71f26ebc50428c56863a3729d1cf79c63660a5a3cecdd7c55c27e7ad811121e8a2ccdaa37f1ec2fb345d1d5d4f7b59011be7877500df5dba1f48 SHA512 dfd6e94b28dcdf2d1be236f3f29eaf4e3e5b7bb34544cdd55ae09de612b02561dd782b693a9a94eea07420c795d31ef210eba34cb663d7de98f438c089369ff2
DIST dvisvgm-2.10.1.tar.gz 3110061 BLAKE2B 3f3bb50baa587c1d20061d235885b4c921efbd3400aa7e4d2df872e37e0ef57d57ae4713fedfd0587d7fcffe7e0286ca55e319e6e82b3b72b49c5df5fa08f633 SHA512 8faa68b13a0e351ba54b5c9acb1dbda6e081eddd167b2cc599208cc2e7967c116c3d105d29df224165daff88f81acb3135d936ec9b2da4dce2c82c197f6a4e78
DIST dvisvgm-2.11.tar.gz 3111889 BLAKE2B 7944b62bee48173f1ed0e2de5ff0c8090322da925abdd4a57611ccb5c055ba602a76ab4e3dbddb83d73ac19a23ce4b657d96a3830f76eb8939f3e3a9c0890cd1 SHA512 bbefff027f710a0370d179e42f1775cb37765836969fcf9e27e5e05d46565e6db74414440823068b04dbef0dac768b70b2573359fe729c12b27f6d678f41d55f
-DIST dvisvgm-2.6.1.tar.gz 2911596 BLAKE2B 8dfe85140db4b462c1721a8bad322d52535a0fced4bb8c374c342bd4ca8fe5cf6dfa5751a8a8070b9ce622ab7bb7df14985802c596fdc387f90febc80151fbd6 SHA512 791183f92ec4733574614fd5b8b4247a7b766b62b1aa7b1444d508d0358178b1447b24fb51d09948d99552c2cb7ed3a0f9bce0416b66de8a4835f85476bbdb25
-DIST dvisvgm-2.7.tar.gz 3037242 BLAKE2B f93bcc4220adf4b2c0d7e06deb11416f22c623f07c96ca9aa9093054e18ec72f8da1d93aa4ee467f82f9478bb0c1b8acebbb56de020f47563056dd0dbea5936e SHA512 b706085015d1ab4c9b88997cf6c1c93f6c0ee60c9d1429d3fba7bed7b5acb3392958f64b4207ae27e6eb52abb19ff9640e2b7459e4b19ae21986b82d4b65b182
-EBUILD dvisvgm-2.1.3.ebuild 1098 BLAKE2B b65e4082e5bc9ae1449ffe319b54dd83cfa2d08b4c66c5e69cbfaf165598ce7bf0c891672a2ee5f581c86e52d9c8fa33a5a5859b221211498e4284b76379595d SHA512 0d182e7884dc102759b812324f478e6e8d53d37ba50a071e8797723ad417af104903f9c46a401af85e36f6becf3fbdbe365b7f89db7df48d05b8d25f659061c1
-EBUILD dvisvgm-2.10.1.ebuild 1152 BLAKE2B e2593ba85a4cb54a4e89b0ef96e974511182874fff32e2693d9b664b191eb3a0ee8b30986dfb8f63f6bc8c4af7ad1195b3c785b97954cd1f8cc62d7d94e8e6b5 SHA512 e62a45b93de199e6acaee660ff3f6c9b71967f68b734bc9136a698ac98a356e50790b057e2f6529a8b2ff8b6bf7f6b5ca020519674ca8dcf9358b50eceecb925
-EBUILD dvisvgm-2.11.ebuild 1171 BLAKE2B 03483fc458429420dffd0e6302fdec821c8fbdf4f75da22443fd8e853f8b69590a65e433534bd2f843e5b3e12245c45b8481cc39da3750f729e45917eec4eb09 SHA512 77a4bad919d88341161ffa0e05b32dc9641b307070901b32d0564e61929259ff7186125ab74480cc923d11ee993658e9e54e9a55ba714cbb217b401ff0a4483b
-EBUILD dvisvgm-2.6.1.ebuild 1187 BLAKE2B 6fa1cd59060e980501c34d1a4a207de4987bd037918e6e28128a55247c6f28121054e8036b9a1e8932f65f3530a1c43cd47fe39ab5eab318d3800b5a20aeaae2 SHA512 8c1ef49c8f3978e10271d92ff5249cf56a5e9111b84ed474bd5a3ecf6a797dd2f6f079d32cd7e65471959aa67625e4d24266323f660ae673b9bbe8ffe672f3ca
-EBUILD dvisvgm-2.7.ebuild 1187 BLAKE2B 1fcabdfd6ab8fd3e46aeb7b602c17b1f402785fc4b784d864933e107d52a758465d1024420cc6a8945617d57a75ecbe2afc3969ec4d9b498dd83783b6daba320 SHA512 11f4fa6fb5b2a6dd1e88748e85bee2127e910257f446dc8d5457a52464263c2fa353c582e91a20415f0d013e2c2bace4ad8361f0b8a0a48a79db63f985caffb0
+EBUILD dvisvgm-2.10.1-r1.ebuild 1166 BLAKE2B 26e6a705af966e996d370e139cfcc1e4568b5d2473923ae9d5ccd938703e832c32170779536ca893fb19f066feb931620cedca2a85ad24e809264e50cec98693 SHA512 0820393c43f6358e1e851ade6b2e33d14dec9b35e42566f39d6aeb0b4001db6609f626c2456c02b9a8a1fc300c3641010b28432de4fdbb3a1c79eda93651009f
+EBUILD dvisvgm-2.11-r1.ebuild 1174 BLAKE2B 37615bba08e5a21258ab933ac78effaf67c2e1e59088ea04f2d86d26ffb186b916d278900731ff22bd59a8e9dc0cc59f22646c0c1af4edb9ea8f5cc58a9e814f SHA512 2b4090f58a6018fd07745d0dd3a8d148871e846130c7a4b295703d945f2855ee813d69ac809fc568e503fa8a0e48dcbbb10373042dd7e9b004046a8db6b7c8ee
MISC metadata.xml 382 BLAKE2B ccc1e78101b4a4bcd72e8898d75270b38231df2e3563f9d0ad2beb826fdfcad0da3e0ef9ed39c4f0adcb79eef87b17bc639a2414eca0d9a5dbf88795b968bb82 SHA512 0d9a02bb1979574379451b38d790a58479fa438cbb5ee657058a7259b7e5cfa441854ce8bde11ed8cfedb06adb1e6361164d6bbb258466586cb5fa9cdff852c0
diff --git a/app-text/dvisvgm/dvisvgm-2.1.3.ebuild b/app-text/dvisvgm/dvisvgm-2.1.3.ebuild
deleted file mode 100644
index 6891f3e0b5f2..000000000000
--- a/app-text/dvisvgm/dvisvgm-2.1.3.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit toolchain-funcs flag-o-matic
-
-DESCRIPTION="Converts DVI files to SVG"
-HOMEPAGE="https://dvisvgm.de/"
-SRC_URI="https://github.com/mgieseki/dvisvgm/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos"
-IUSE="test"
-# Tests don't work from $WORKDIR: kpathsea tries to search in relative
-# directories from where the binary is executed.
-# We cannot really use absolute paths in the kpathsea configuration since that
-# would make it harder for prefix installs.
-RESTRICT="test"
-
-RDEPEND="virtual/tex-base
- app-text/ghostscript-gpl
- >=media-gfx/potrace-1.10-r1
- media-libs/freetype:2
- dev-libs/kpathsea
- sys-libs/zlib"
-DEPEND="${RDEPEND}
- app-text/xmlto
- app-text/asciidoc
- dev-libs/libxslt
- virtual/pkgconfig
- test? ( dev-cpp/gtest )"
-
-src_configure() {
- has_version '>=dev-libs/kpathsea-6.2.1' && append-cppflags "$($(tc-getPKG_CONFIG) --cflags kpathsea)"
- default
-}
diff --git a/app-text/dvisvgm/dvisvgm-2.10.1.ebuild b/app-text/dvisvgm/dvisvgm-2.10.1-r1.ebuild
similarity index 78%
rename from app-text/dvisvgm/dvisvgm-2.10.1.ebuild
rename to app-text/dvisvgm/dvisvgm-2.10.1-r1.ebuild
index 6436b5ad01aa..a35bc82ca5a9 100644
--- a/app-text/dvisvgm/dvisvgm-2.10.1.ebuild
+++ b/app-text/dvisvgm/dvisvgm-2.10.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/mgieseki/dvisvgm/releases/download/${PV}/${P}.tar.gz
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos"
IUSE="test"
# Tests don't work from $WORKDIR: kpathsea tries to search in relative
# directories from where the binary is executed.
@@ -19,22 +19,26 @@ IUSE="test"
# would make it harder for prefix installs.
RESTRICT="test"
-RDEPEND="virtual/tex-base
- >=app-arch/brotli-1.0.5
+BDEPEND="
+ app-text/asciidoc
+ app-text/xmlto
+ dev-libs/libxslt
+ virtual/pkgconfig
+ test? ( dev-cpp/gtest )
+"
+RDEPEND="
+ >=app-arch/brotli-1.0.5:=
app-text/ghostscript-gpl
dev-libs/kpathsea:=
+ dev-libs/openssl:=
>=dev-libs/xxhash-0.6.5
>=media-gfx/potrace-1.10-r1
media-libs/freetype:2
>=media-libs/woff2-1.0.2
- dev-libs/kpathsea
- sys-libs/zlib"
-DEPEND="${RDEPEND}
- app-text/xmlto
- app-text/asciidoc
- dev-libs/libxslt
- virtual/pkgconfig
- test? ( dev-cpp/gtest )"
+ sys-libs/zlib
+ virtual/tex-base
+"
+DEPEND="${RDEPEND}"
src_configure() {
local myargs=(
diff --git a/app-text/dvisvgm/dvisvgm-2.11.ebuild b/app-text/dvisvgm/dvisvgm-2.11-r1.ebuild
similarity index 95%
rename from app-text/dvisvgm/dvisvgm-2.11.ebuild
rename to app-text/dvisvgm/dvisvgm-2.11-r1.ebuild
index af466d3dc91b..aa5dfaf017e7 100644
--- a/app-text/dvisvgm/dvisvgm-2.11.ebuild
+++ b/app-text/dvisvgm/dvisvgm-2.11-r1.ebuild
@@ -27,14 +27,14 @@ BDEPEND="
test? ( dev-cpp/gtest )
"
RDEPEND="
- >=app-arch/brotli-1.0.5
+ >=app-arch/brotli-1.0.5:=
app-text/ghostscript-gpl
dev-libs/kpathsea:=
+ dev-libs/openssl:=
>=dev-libs/xxhash-0.6.5
>=media-gfx/potrace-1.10-r1
media-libs/freetype:2
>=media-libs/woff2-1.0.2
- dev-libs/kpathsea
sys-libs/zlib
virtual/tex-base
"
diff --git a/app-text/dvisvgm/dvisvgm-2.6.1.ebuild b/app-text/dvisvgm/dvisvgm-2.6.1.ebuild
deleted file mode 100644
index 1307115f485c..000000000000
--- a/app-text/dvisvgm/dvisvgm-2.6.1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs flag-o-matic
-
-DESCRIPTION="Converts DVI files to SVG"
-HOMEPAGE="https://dvisvgm.de/"
-SRC_URI="https://github.com/mgieseki/dvisvgm/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos"
-IUSE="test"
-# Tests don't work from $WORKDIR: kpathsea tries to search in relative
-# directories from where the binary is executed.
-# We cannot really use absolute paths in the kpathsea configuration since that
-# would make it harder for prefix installs.
-RESTRICT="test"
-
-# TODO unbundle app-arch/brotli
-RDEPEND="virtual/tex-base
- >=app-arch/brotli-1.0.5
- app-text/ghostscript-gpl
- dev-libs/kpathsea:=
- >=dev-libs/xxhash-0.6.5
- >=media-gfx/potrace-1.10-r1
- media-libs/freetype:2
- >=media-libs/woff2-1.0.2
- dev-libs/kpathsea
- sys-libs/zlib"
-DEPEND="${RDEPEND}
- app-text/xmlto
- app-text/asciidoc
- dev-libs/libxslt
- virtual/pkgconfig
- test? ( dev-cpp/gtest )"
-
-src_configure() {
- local myargs=(
- --without-ttfautohint
- )
- econf "${myargs[@]}"
-}
diff --git a/app-text/dvisvgm/dvisvgm-2.7.ebuild b/app-text/dvisvgm/dvisvgm-2.7.ebuild
deleted file mode 100644
index fc2a5095bc13..000000000000
--- a/app-text/dvisvgm/dvisvgm-2.7.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs flag-o-matic
-
-DESCRIPTION="Converts DVI files to SVG"
-HOMEPAGE="https://dvisvgm.de/"
-SRC_URI="https://github.com/mgieseki/dvisvgm/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos"
-IUSE="test"
-# Tests don't work from $WORKDIR: kpathsea tries to search in relative
-# directories from where the binary is executed.
-# We cannot really use absolute paths in the kpathsea configuration since that
-# would make it harder for prefix installs.
-RESTRICT="test"
-
-# TODO unbundle app-arch/brotli
-RDEPEND="virtual/tex-base
- >=app-arch/brotli-1.0.5
- app-text/ghostscript-gpl
- dev-libs/kpathsea:=
- >=dev-libs/xxhash-0.6.5
- >=media-gfx/potrace-1.10-r1
- media-libs/freetype:2
- >=media-libs/woff2-1.0.2
- dev-libs/kpathsea
- sys-libs/zlib"
-DEPEND="${RDEPEND}
- app-text/xmlto
- app-text/asciidoc
- dev-libs/libxslt
- virtual/pkgconfig
- test? ( dev-cpp/gtest )"
-
-src_configure() {
- local myargs=(
- --without-ttfautohint
- )
- econf "${myargs[@]}"
-}
diff --git a/app-text/pdfarranger/Manifest b/app-text/pdfarranger/Manifest
index 247496ab72f8..fd7604f94a3f 100644
--- a/app-text/pdfarranger/Manifest
+++ b/app-text/pdfarranger/Manifest
@@ -3,5 +3,5 @@ DIST pdfarranger-1.5.3.tar.gz 221208 BLAKE2B 2669a3be00d771542ba2449696de74d633f
DIST pdfarranger-1.6.2.tar.gz 197726 BLAKE2B aee8ee7d32603f20bc01d9f5f77290390e8a038bf79e3c4f689a71ec1c3e454784b2225b43d33bdfd7897785827141cfe1770dcf41d233c4ec1f3865d6f1e3c0 SHA512 610c4dfaa141cfb8caebfc72b524cda05455ed4a5c1e336772655bd02ceac25fafedb439dbe83e87c88da189147eaf91149e9af92ec745a52f8a24fcee5fd390
EBUILD pdfarranger-1.3.1.ebuild 732 BLAKE2B d2f04362a6461b10b875fdc00e86e1f71534eefc87c5cea5f9b6ae7e3ea877ec07dd4debb1aaf39c13dd00f553cf09782b35d2a8d07e2159ce0cbd2d8424b6a6 SHA512 97d65731e892b00f5c3e22756c9ca02548982a7a88e5434d7abf76018deba2671d2b378cf9b5c0e0d5179516f6e88c8f8c7e5aa7428ad8c648e13f97f8a10074
EBUILD pdfarranger-1.5.3-r1.ebuild 1077 BLAKE2B 283fd218247e772d2d33366b0b54f2a2d541c479f145ad34480a6eaf6f74cf00090eb69697868afce44914dae499e379fe123a980610c560c4e73acc6b5ec831 SHA512 f1f3c911f98f8032892d80c09277e0121f0f3631c0c3e599bd8e61ee2713d6ff4d165727c52936d420caf17da34736696080ba23b5e497c4946af94f90b4e115
-EBUILD pdfarranger-1.6.2.ebuild 1077 BLAKE2B 283fd218247e772d2d33366b0b54f2a2d541c479f145ad34480a6eaf6f74cf00090eb69697868afce44914dae499e379fe123a980610c560c4e73acc6b5ec831 SHA512 f1f3c911f98f8032892d80c09277e0121f0f3631c0c3e599bd8e61ee2713d6ff4d165727c52936d420caf17da34736696080ba23b5e497c4946af94f90b4e115
+EBUILD pdfarranger-1.6.2.ebuild 1211 BLAKE2B 493036de2cb2802329cc3c33144fcfc084e23c8c33ba0718f8ca714832b009f62d99e7591bf202a74ead4769a6fc0fb131255c4181bcb3dfa72a884a9f059ed1 SHA512 980edb6863241bbe83129d2916f7285fb14e793b5c28ac4a9531d68e92f1075b5a2d6fccf2d2e94e490b2695ea51333da2fece276ea2ba8e71d31db3e0f95480
MISC metadata.xml 622 BLAKE2B 5a11cb38ad122bd2408a114cfdd40e3a0ebd3cc897ede128cc7c5fd55df8c566d0cd342573bac3352f501fa935c293b890b71736d0ecaf7e5e5c2e25fac74418 SHA512 15cfc342f5df485547c0691362e3dcb5e4820158db143452b5439969325fe798dbad02f5ec50379bedae732a42163086e26c5b7472aab804af2c99df25611912
diff --git a/app-text/pdfarranger/pdfarranger-1.6.2.ebuild b/app-text/pdfarranger/pdfarranger-1.6.2.ebuild
index ca5563883b52..f3d0a8fa4fe9 100644
--- a/app-text/pdfarranger/pdfarranger-1.6.2.ebuild
+++ b/app-text/pdfarranger/pdfarranger-1.6.2.ebuild
@@ -1,34 +1,44 @@
-# 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} )
DISTUTILS_USE_SETUPTOOLS=rdepend
-inherit distutils-r1 xdg-utils
+inherit distutils-r1 optfeature xdg-utils desktop
DESCRIPTION="Merge or split pdfs; rearrange, rotate, crop pages."
HOMEPAGE="https://github.com/jeromerobert/pdfarranger"
SRC_URI="https://github.com/jeromerobert/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
LICENSE="GPL-3"
SLOT="0"
KEYWORDS="~amd64"
IUSE=""
-RDEPEND="dev-python/pikepdf[${PYTHON_USEDEP}]
- dev-python/pygobject:3[${PYTHON_USEDEP},cairo]
+
+RDEPEND="
+ app-text/poppler[introspection,cairo]
+ dev-python/pikepdf[${PYTHON_USEDEP}]
dev-python/pycairo[${PYTHON_USEDEP}]
+ dev-python/pygobject:3[${PYTHON_USEDEP},cairo]
x11-libs/gtk+:3[introspection]
x11-libs/pango[introspection]
- app-text/poppler[introspection,cairo]"
+"
DEPEND="${RDEPEND}
- dev-python/python-distutils-extra[${PYTHON_USEDEP}]"
+ dev-python/python-distutils-extra[${PYTHON_USEDEP}]
+"
src_install() {
distutils-r1_src_install
- insinto /usr/share/icons
- doins -r data/icons/hicolor
+ for x in 16 32 48 256 scalable
+ do doicon -s ${x} data/icons/hicolor/${x}*/*
+ done
}
pkg_postinst() {
+ elog "Optional dependency:"
+ optfeature "image file import" media-gfx/img2pdf
+
xdg_desktop_database_update
xdg_icon_cache_update
xdg_mimeinfo_database_update
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index fdde8ae1983a..40c668b8dc3e 100644
Binary files a/dev-db/Manifest.gz and b/dev-db/Manifest.gz differ
diff --git a/dev-db/redis/Manifest b/dev-db/redis/Manifest
index a4b873c949b1..e4849836c098 100644
--- a/dev-db/redis/Manifest
+++ b/dev-db/redis/Manifest
@@ -20,5 +20,5 @@ DIST redis-6.0.9.tar.gz 2261418 BLAKE2B 93e64e2c682320d11e468021fd13a2888dd6b154
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 4937 BLAKE2B 9612fa325b4e7d380af2dc34e8529cd69c20fbb434f3f0097bbb1759e542b59954c9df437b7351c0f7f77afbbbdd95f5f708c56e44b3983f4db5a346107d64d6 SHA512 12ba4c6d9771c0b9aa50daac093467bb0b086b6086ec2a3b6f6536057c4bcd837c4b6df3527fd06cac8d9ae56731d9d82a5738a69101096b8bb48d8e9648f8e3
+EBUILD redis-6.0.9.ebuild 4936 BLAKE2B db9cfabc8aba8f96c52251e61474debc762c78497d76b317ba0368c161bb65aa437620841de506b3535d6811d4cf9fc3d70e1c14ceb89d708503e130c8e5b7fd SHA512 6fa969b605110eb838a3dea0852c20b678368e84df118a4bb7c9b6901b9419fe9362876e317ad44338f31edb92bfa55a1832baeb4a4934ea61c7789dc51fda34
MISC metadata.xml 356 BLAKE2B 19e27b12be84927b990fc2f481d8dd1f88f05b5e029fdd91c7ce9517e7fd378d6e1df1eb55052a04fefe781da09b371da1c28fd269c72f4222aa896897222bf7 SHA512 ab06f694c5b20072f40e85b3a8e05d2c333f3b29fc145733fde1e3f42ea78ac7c51550afc29e671ef9b4a163597ac9f44bc182344c18db52036595e5d65f7e22
diff --git a/dev-db/redis/redis-6.0.9.ebuild b/dev-db/redis/redis-6.0.9.ebuild
index e9c315ea1560..7d33e4f13ef5 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 x86 ~amd64-linux ~x86-linux ~x86-solaris"
IUSE="+jemalloc luajit tcmalloc test"
RESTRICT="!test? ( test )"
SLOT="0"
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index a71c64845e7a..9ce8c68cdfaa 100644
Binary files a/dev-lang/Manifest.gz and b/dev-lang/Manifest.gz differ
diff --git a/dev-lang/go/Manifest b/dev-lang/go/Manifest
index b3736c311ba4..4b28bcd16f05 100644
--- a/dev-lang/go/Manifest
+++ b/dev-lang/go/Manifest
@@ -4,8 +4,8 @@ DIST go1.14.13.src.tar.gz 22553900 BLAKE2B 35aed1c43a59e06c1d5feaa91a6c4120c5869
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 4918 BLAKE2B 01f8bde2add1728d83f74e2ba04543ff06f3f1607cdc7ef5227de2681adfdfd2e2c9e533128ebbb9d0381644a99668db92f514d9c430661e7e246b1eb1dfaf65 SHA512 4ed122a82a00624de085719ec67c8bd2d00cb910b461071bdad752dde272593f14e8542bd7a54f736c51740a72297aeb2928b88f81ef7a7acb318dfc5cc0aab0
+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 4918 BLAKE2B 01f8bde2add1728d83f74e2ba04543ff06f3f1607cdc7ef5227de2681adfdfd2e2c9e533128ebbb9d0381644a99668db92f514d9c430661e7e246b1eb1dfaf65 SHA512 4ed122a82a00624de085719ec67c8bd2d00cb910b461071bdad752dde272593f14e8542bd7a54f736c51740a72297aeb2928b88f81ef7a7acb318dfc5cc0aab0
+EBUILD go-1.15.6-r1.ebuild 4916 BLAKE2B 3dd0e046cb11660c20f846356e08ebf4c8a3d2ed2c4f732462db8c543b908ea870b1d2b42d57161b5c8396c8cb0b16ee71634741f697d01fd2a4d9015208b95d SHA512 6d89d24b1766703a18f3726584e7603f2373630533cfee5961a7fb3ab167e5051664238d6268eeb6866805c375730a5e4635388d900edb05b6b8b37432d0e435
EBUILD go-9999.ebuild 4921 BLAKE2B d70f9c7cc9d4c2c43db62dfd59bb0f60a75dc056f552f406210011bd96e602397bcc6bb683b7f5fb39ece2c1ec7088e02a8e39fa01da1e279cb178682429523e SHA512 81b2653ac9499ac418bbb0daa4fd11bae0afa7bffa11f129aee7a78aac4ed0837f099f0ce14b51ea0a512419b5b337450b890fff542ad5e1a2068af3b95fd759
MISC metadata.xml 462 BLAKE2B d9d4280e921286791a55619a7e5557c7041b0de157aa0f8bf6f17cf5041f802df4037270eeb3e8d37263f9fc17939c619a0dd3bce449c5f247279884da10bf67 SHA512 26fa7bfe26f00e8e1766cc0a1052fb8b5352799a33c9eb8f0c4f4523601d3eb5d1da8adc4b731f0d778039788734a9ad483f22e58e4bf1551ec8e9dccbcb87ba
diff --git a/dev-lang/go/go-1.14.13-r1.ebuild b/dev-lang/go/go-1.14.13-r1.ebuild
index bc15cd43c5e4..ebfb8c5bc2b5 100644
--- a/dev-lang/go/go-1.14.13-r1.ebuild
+++ b/dev-lang/go/go-1.14.13-r1.ebuild
@@ -21,7 +21,7 @@ case ${PV} in
case ${PV} in
*_beta*|*_rc*) ;;
*)
- KEYWORDS="-* amd64 arm arm64 ~ppc64 ~s390 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+ KEYWORDS="-* amd64 arm arm64 ppc64 ~s390 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
;;
esac
esac
diff --git a/dev-lang/go/go-1.15.6-r1.ebuild b/dev-lang/go/go-1.15.6-r1.ebuild
index bc15cd43c5e4..ebfb8c5bc2b5 100644
--- a/dev-lang/go/go-1.15.6-r1.ebuild
+++ b/dev-lang/go/go-1.15.6-r1.ebuild
@@ -21,7 +21,7 @@ case ${PV} in
case ${PV} in
*_beta*|*_rc*) ;;
*)
- KEYWORDS="-* amd64 arm arm64 ~ppc64 ~s390 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+ KEYWORDS="-* amd64 arm arm64 ppc64 ~s390 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
;;
esac
esac
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 3850e1e05714..83de2b7e0a6c 100644
Binary files a/dev-libs/Manifest.gz and b/dev-libs/Manifest.gz differ
diff --git a/dev-libs/hyperscan/Manifest b/dev-libs/hyperscan/Manifest
index ebe84eb6f134..06cf6868c5a8 100644
--- a/dev-libs/hyperscan/Manifest
+++ b/dev-libs/hyperscan/Manifest
@@ -1,3 +1,5 @@
DIST hyperscan-5.3.0.tar.gz 1824077 BLAKE2B 6d1c8ac8df32e8e4ac09f51ad292e566c2af2b7de9fb1f0bf99b233b9647b527ea115b6bdace5533927bc7a0eace626921b391ad3e78d62fe54636ae13b9f26e SHA512 a4d85ffd2264e8e6745340ba51431361775a1e7a2da78edd31f6f53552ac61fdef718710ae53a254b7d5000f9ec1aafe7a48d9c55e76f5c6822486150bbc6c56
+DIST hyperscan-5.4.0.tar.gz 1844963 BLAKE2B 1a5af88655854b4c1ec58e6663b6c9c4b6fca0aa9d3e4daad3992daf911b8f359f48a95b65e4f05c71aa644e0271471d016fafaca05d547b838a9c52ea016e27 SHA512 cfec3f43b9e8b3fbb2e761927f3a173c1230f2688da710ec7708f2941ce6f550a1d3cb48b0b0e2ccf709807390117a7e40047cb99190bcc341f37eb3da13ae62
EBUILD hyperscan-5.3.0.ebuild 1191 BLAKE2B f0bf124f5646a11ff6c827ad1ededd174608022dfd161f33fb7ff6530859ba36578bbc8fecc473be328fc048b66f5719356a4b78cf5f2d67e278f60bc1cb7d4b SHA512 4a6407daeaae14499cfba022eeb43868e6a3b0dc4ebaab1ba0ed6394b507b037fe8bef1933b6f17d4d02868f08b259c8e66a891d8d4bdc2d159644ceb50294f6
+EBUILD hyperscan-5.4.0.ebuild 1191 BLAKE2B 76aeaab241f170ad365ad094fba85d945ac63e0b8368ec22791f09d33d0d897089c4fd03c09c70a1a708fbf83821382540ae783104ef8b054672f89d2d36c0b6 SHA512 6f7cbfc1bffd13cb6b9405402fdeb985bcd488165004e03f1f2f95585373a6367a1ff422871cd1cf94e3b9e921f429d3c8afd2943162243506cd70e38628a2d3
MISC metadata.xml 548 BLAKE2B d68c6cd73543c82ec12d2b05651ef2de0a3e402a3a3b28d827e87026f5576a1db23e52fa04021967cd919aeb828bdabc931ccf2e0238294c84c0f3f1d27dbee2 SHA512 5005d5ee96a915866096f63075a5ff76a49474807a63d846151ebbb411fe0c477c3b6883d97438018a69fb78c917b190de8768a44296caf7ca11451b7cbf587a
diff --git a/dev-libs/hyperscan/hyperscan-5.4.0.ebuild b/dev-libs/hyperscan/hyperscan-5.4.0.ebuild
new file mode 100644
index 000000000000..fcfeb8e7d138
--- /dev/null
+++ b/dev-libs/hyperscan/hyperscan-5.4.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit cmake flag-o-matic python-any-r1
+
+DESCRIPTION="High-performance regular expression matching library"
+SRC_URI="https://github.com/intel/hyperscan/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://www.hyperscan.io/ https://github.com/intel/hyperscan"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="cpu_flags_x86_avx2 +cpu_flags_x86_ssse3 static-libs"
+
+RDEPEND="dev-libs/boost:="
+DEPEND="${RDEPEND}"
+BDEPEND="
+ ${PYTHON_DEPS}
+ dev-util/ragel
+"
+
+REQUIRED_USE="cpu_flags_x86_ssse3"
+
+src_prepare() {
+ # Respect user -O flags
+ sed -i '/set(OPT_CX*_FLAG/d' CMakeLists.txt || die
+
+ # upstream workaround
+ append-cxxflags -Wno-redundant-move
+ cmake_src_prepare
+}
+
+src_configure() {
+ use cpu_flags_x86_ssse3 && append-flags -mssse3
+ use cpu_flags_x86_avx2 && append-flags -mavx2
+
+ local mycmakeargs=(
+ -DBUILD_SHARED_LIBS=$(usex static-libs OFF ON)
+ -DBUILD_STATIC_AND_SHARED=$(usex static-libs ON OFF)
+ -DBUILD_EXAMPLES=OFF
+ -DFAT_RUNTIME=false
+ )
+ cmake_src_configure
+}
+
+src_test() {
+ "${BUILD_DIR}"/bin/unit-hyperscan || die
+}
diff --git a/dev-libs/icu/Manifest b/dev-libs/icu/Manifest
index e141b66b6e9e..09aecacf31dd 100644
--- a/dev-libs/icu/Manifest
+++ b/dev-libs/icu/Manifest
@@ -6,5 +6,5 @@ DIST icu4c-68_1-src.tgz 24722348 BLAKE2B 252ef254cba1a953a0defabae5bf06ba24b3cf4
DIST icu4c-68_2-src.tgz 24737478 BLAKE2B ff54f903aed1a16928656e5f4fee79e4301038a70ba1d389fb2a2cc7c7dc4c76bc2430c810cea484c0ef69fbafc5728e71776c39874a5395c9dd06d573e8ea90 SHA512 24f3b7981667b37df58118f56ae76a09b719358c1efa8d6f044d28ef8df1c722a894957acadfb3c37aee39ac845893924fc3370d6bbe09875aec8d937059f84b
EBUILD icu-67.1.ebuild 3315 BLAKE2B dcb2d548021a1c55939a07f367349a801e2600d1323ccc9ee7c9c00b1a4ae6f5ea4da331c920c06ab906a0b1317beb29eb86765044d002ad2b5c70b650bd569c SHA512 34fd8c7fc822e576c8d3aae1d1b463cde9e8915acca93ce49caf1425934782cd0514b9774dee8a179cf0225052219177801db1b7023663e6797ea7f8f8d44f49
EBUILD icu-68.1.ebuild 3366 BLAKE2B e6ab7ff08c0d194e374133330212164063864eec77bb458f594ac6f856db83d781c998216e75981ff250ba42b07468f44df67602a6d0814251ba7342bdddd6c9 SHA512 eda409b0a7c3901a21d0ea32dcdf7e8f7d14fef7b9eaf901cd4217ab1935ce88efe4fabed71a997098742ad673dd0fc6c9e21b0f64199c379734abe7dfc5471b
-EBUILD icu-68.2.ebuild 3358 BLAKE2B 38dec0453af8a95ebd5c29d8ee573fbe4fadfd7b33e8a457fc9ba6ecc59014a0bf821bd4acd1ef2c66102a6a71856972d7223206710a8a2e8c63ab1db554ad96 SHA512 ed10d49bc6d55a588c04ab798021b6fcccc5bf2f49af866384d09ddce21f5b4809d84b2f833940260e792610c64117343ae163010fa98b9260b4d5f46ae3cd83
+EBUILD icu-68.2.ebuild 3357 BLAKE2B aa921f24f95618a71cb108e071fea15fc55f554d2711247e4b60ef6663fb1db052b8979b8dc7496e9de211e18da16ff9e58e8099f6f783da5a665e5ee73dee57 SHA512 747c30dfa5f5e6ca3b18ac9e28ce3de0ce0d7e33f3fa277aaad030c1f792ad8fee0c0a8fd6a9f7c1d3c9cd6171097679ce44cca8891614d8e1d526a7c884c787
MISC metadata.xml 255 BLAKE2B 9b8486730bea2158e8be5cbbe0552c5460d1b18e2236a68e3f11d85ce4eeb96eb0e746f44a10cb7cdcf1bf498190a512ef42f47852c6843b9a3c937ceabc338d SHA512 ac646e8ac676faf0aac283e4be31c5f2b29e98ccf07327073ed05e688ce696caf639bdfea63e4aed141a90e84c0a86892bc717a52b95cdf1739aaa15240013c3
diff --git a/dev-libs/icu/icu-68.2.ebuild b/dev-libs/icu/icu-68.2.ebuild
index 5df871cf5b56..99bd99420a7b 100644
--- a/dev-libs/icu/icu-68.2.ebuild
+++ b/dev-libs/icu/icu-68.2.ebuild
@@ -14,7 +14,7 @@ LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE="debug doc examples static-libs"
BDEPEND="${PYTHON_DEPS}
diff --git a/dev-libs/inih/Manifest b/dev-libs/inih/Manifest
index 4421cafe5489..d464485e7251 100644
--- a/dev-libs/inih/Manifest
+++ b/dev-libs/inih/Manifest
@@ -1,6 +1,6 @@
DIST inih-51.tar.gz 16258 BLAKE2B 91a5aee6e0ecadf949fbf0b58bd2596bcb985c76fc9000a671d65cb5325c51dbb8bd945ccd7721b72dafafd11c70a9c84ad910768d0fc479e5491db8b7aacbd8 SHA512 eb2f58979d93e51a09326e6c187828643887ac1a239d4b12205567c7d87a671c9c49ca99db376c031d366bc680e579c30dcea9f3eb130ec802597411b2cb3cf4
DIST inih-52.tar.gz 16808 BLAKE2B 12d4078ad7b6a4013ea77239c486fb7b5e9165252d4a67ee57d60fc72a98f15ca537b610c7b22841cc660e46bb424aa5c9b7ed1cf2462600a2aa58d40447ba90 SHA512 14c0d0dbd78efc99bec8df12067107d130eef8b124e0616f7d83dc4e14530b57f0c8fcf0b8862d425b5a0b84d6c6a6bff7b3c852c9b2e2364ef56c8f64a1f339
EBUILD inih-51.ebuild 733 BLAKE2B 35c324b1927627143e78e9f18e6121e5092541ac96ff10b17fe7717f546bce6ecbd8e0f0aea086a736543f44b2fcdcc3976b3f1364f8146c39fc279b1c0bc5da SHA512 a7f9767609347bd9618156e41815b13f88551e7531f4c6ba5df58caa362d2395aea12466dc19225e2e320dc893ef17d0b48e0dc7976d36a353a46bdffb616902
-EBUILD inih-52-r1.ebuild 844 BLAKE2B 5d880d7a1ea62da459a61af8c12c078d2e848f8895f2f79335896b9ac0d79303af56c24eaf0d3c771b6ca032866712ef395134d5db5e53912656a9b2ae68eaa4 SHA512 03206b8707a8ad71e7f6a3fb5d5738030ae526abcd0518e0507cbb9e46db11d863b71c697eb34a1a0b4d38391792a4e29d358219b5e1c68f0d48144e40f11164
+EBUILD inih-52-r1.ebuild 850 BLAKE2B 019ca0b222cc8eb4f68d206495a811907328deee71e5675c4a135454f29637badb48be1c448b85525e6806bfd76caf3a669c2748db68f25ddc81714917e250b5 SHA512 5eb6ba444d1436644fb1e23584f44d0bde8d7e8bef7f464b4ab828f610eff47b8c3226a573f1f9f3e2eaa382dd2f5e6b3eb8bac62b5a584a08b42aecae48cce8
EBUILD inih-52.ebuild 791 BLAKE2B 09983b3a0fecbc3bc76218f7852778282568682a355c2e9644205b8adb0efc6b4710e5611b08c674359ac828aaf8c7797788601f0eac5ac3b9b5854cc2f9a0c8 SHA512 6da75c3754efd2dcce6e7c24e13ed14880427d6291d2d01e35c15b4d67b1ffb2c2a9d390ed4b0c73e56b1593c1d31ca0ed91914543aa150b2bcc3eaacf8a8ef9
MISC metadata.xml 505 BLAKE2B 304fa736140ec6ca3461e31f5629e22857ece165c6f16dbe4632211f05d2d4a45c2c9b5f35e858e81ae0d11cbdc87b3fc4977b55c0032cc115b65df43466242f SHA512 09e559083c0457cc38eae5efe344d035fbbbc860ae1ba268462ff821a467712d599c3cf7292d44f9a9f0d99674b0a1d6650e199147403686e859ee20d8fcdba3
diff --git a/dev-libs/inih/inih-52-r1.ebuild b/dev-libs/inih/inih-52-r1.ebuild
index 59b118e7afe5..288ada671b4b 100644
--- a/dev-libs/inih/inih-52-r1.ebuild
+++ b/dev-libs/inih/inih-52-r1.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="inih (INI not invented here) simple .INI file parser"
HOMEPAGE="https://github.com/benhoyt/inih"
SRC_URI="https://github.com/benhoyt/inih/archive/r${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
LICENSE="BSD"
SLOT="0"
diff --git a/dev-libs/libcbor/Manifest b/dev-libs/libcbor/Manifest
index 74ea478b3d58..485469e795e2 100644
--- a/dev-libs/libcbor/Manifest
+++ b/dev-libs/libcbor/Manifest
@@ -1,3 +1,3 @@
DIST libcbor-0.8.0.tar.gz 267044 BLAKE2B e8548e7351984ebdcbeb5f13a7ca35412c3f3f05e2a44a5438d57b90bdcdc51f5265953163106f90ade911a96af665956ebeba7ed1c48cf207acf6d683af5606 SHA512 694d2d3a78d80072f96e0afb73590ca1f3572e41d2117330ef4313ed06271743b048d3ba3259c6ffe9a802d5e441379d0e54787d1d42fed08dc81ac4f06c6dbc
-EBUILD libcbor-0.8.0.ebuild 1360 BLAKE2B dffbb62f33b520a77a96bc3496bc2eb42cac38999d1d2da743b8faff93d7e1638ce023ad65d749e658e66502ac01f7cbf613cce3f20bf8bc5859b13dd2237bef SHA512 b149a4ccb15e81f023df0cf99e25f2510cb13dd1c2235e2cac8807b695de087961505366b134eb3f3f4da84a43c7a46c4c8e4ebfd20d6b60d1a23bb3391e9435
+EBUILD libcbor-0.8.0.ebuild 1364 BLAKE2B cbf1b5bd2f9700bf4d3d243a6d28aa0da24002a387b04b87e0820e88697c98319bb1bc0bfa6d4c314d10261c9094d7b7977ea080c26be3a22ea6d859c072750c SHA512 ba7b1ad054595106fad5ae9b79f37c80ba8ba4e6aeb18df6fe83c1c34be97a3baa593511ab19a050685e93dc14512b45dd64c6ed425fce25ee751af5b5c746ac
MISC metadata.xml 353 BLAKE2B ac88c66fa58046797dba48cfe47fc42a3aaf8d8a256fab563def54d126c7ad903bc2d47095ca7221b84f0fd59bcbb6677ffaef9062c9c662ef95b02bf3563b99 SHA512 56f76a4b80d8cf12f854022c2c7353119b11052bf6d454b5d2f6427a02ab64176d2d7ecfadecabafceac6b7aa5ec066145a62831d33f09a829b37cdb8bec64cf
diff --git a/dev-libs/libcbor/libcbor-0.8.0.ebuild b/dev-libs/libcbor/libcbor-0.8.0.ebuild
index a62fb30caa60..22bdb9b768d6 100644
--- a/dev-libs/libcbor/libcbor-0.8.0.ebuild
+++ b/dev-libs/libcbor/libcbor-0.8.0.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
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/PJK/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="MIT"
SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
IUSE="+custom-alloc doc test"
BDEPEND="
diff --git a/dev-libs/libdnsres/Manifest b/dev-libs/libdnsres/Manifest
index cf076a56ab17..acb569c41f2b 100644
--- a/dev-libs/libdnsres/Manifest
+++ b/dev-libs/libdnsres/Manifest
@@ -1,5 +1,4 @@
AUX libdnsres-0.1a-autotools.patch 887 BLAKE2B 5141d50a6e55f1ed49471dab5ab328352731e271514e37a40d65cffd0e7f1b9024155ff5be1e181950a2b355e618645e041c7c84fd7f574c96d0565f22d101db SHA512 f482017f43bb7bd7050c6246d7d48e4126f33c63fd7b0bf83ba12f9ddbfbdfbdf67d7ac5b6e55668edb462c8af8d5402f4b57cfc1a2aa8e4bb75440d2c02b11d
DIST libdnsres-0.1a.tar.gz 360583 BLAKE2B b2b3befaf3910b46e826c17ec36bb90271b334a58ef5d02bd69ad0aa8643e2fe8ab4a1f86b59e4fbd1d41ef2c01ea01995b07b68922740fc86bee3d207bcc65d SHA512 d6b1c248a99eeaea3524ee8af01dd31ba507179a69ffb313a167611792084d5efc99fe6462a63480932faa3493b01c3c43fc7575dab6aaade885583bee006f67
-EBUILD libdnsres-0.1a-r2.ebuild 568 BLAKE2B b40135288d0292a597e889576f0a282e58782f5da79b845a618d2710b86ff5c938b51c34d36cce6709fc30c9ad496a89d61efe71eccc1699a9ad41c3843404d9 SHA512 c2148ee736a8dffba14ada064dcc2664f782c201c40f4295c1cbaec9e978218ee5003f6976646755985cf379c1ab6f42f78273cabe90323fd40ae03176097c23
-EBUILD libdnsres-0.1a-r3.ebuild 724 BLAKE2B db22d8f5918385653bc1102ba9af157ad00888535ba30304e33332bed01db78045abb9edfb3ec7072b763230a85b29d9b80156ed2292fe9acf48aa31f2ac8ed5 SHA512 5f9a1c9a1f891dc4afba99314f14fc394962a31fd8e6eff9c2123a0a2076a1b76b2a843ef5ac2db9583fe2852c6734a24050e107f34087d4ce74bfea1d3ce5c0
+EBUILD libdnsres-0.1a-r3.ebuild 721 BLAKE2B ad8f42115ac31afcd49276f86de6ef034cb747ae6db884257aa5fe613895bf529557fe666ee37c10c269342bc5ce6b61bd1da24db7e7607a0b4634df65acabad SHA512 82016a6f97ba2ee207fc66b51631e4ea4dfbeb1a8109bad1e2c953371e3bb80a401460f3929cedd28990658d9f59f66e5fa5a75b77d28601fc8c106cb348cc87
MISC metadata.xml 821 BLAKE2B fe11fa4932033b3bdbe6f7b55495aca6a1ff5d745fa65654d42ac0dc3b5992a7cf91cc705113b4a2c3ea04c0384589cd4f75c2c4d496b834db664313be30f711 SHA512 cbb9306da8e15d166cdd09e0bf6e8a07030a12d45bda18d56f45b18e439c6e199963189047fe846dd59b33408de6a101ecb1a7c251cfb5dc5c34cc313a741134
diff --git a/dev-libs/libdnsres/libdnsres-0.1a-r2.ebuild b/dev-libs/libdnsres/libdnsres-0.1a-r2.ebuild
deleted file mode 100644
index 2811d24833bf..000000000000
--- a/dev-libs/libdnsres/libdnsres-0.1a-r2.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils
-
-DESCRIPTION="A non-blocking DNS resolver library"
-HOMEPAGE="https://www.monkey.org/~provos/libdnsres/"
-SRC_URI="https://www.monkey.org/~provos/${P}.tar.gz"
-
-LICENSE="BSD-4"
-SLOT="0"
-KEYWORDS="amd64 ~ppc sparc x86"
-
-DEPEND="dev-libs/libevent"
-RDEPEND="${DEPEND}"
-
-DOCS=( README )
-
-src_prepare() {
- epatch "${FILESDIR}/${P}-autotools.patch"
- sed -i configure.in -e 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|g' || die
- eautoreconf
-}
diff --git a/dev-libs/libdnsres/libdnsres-0.1a-r3.ebuild b/dev-libs/libdnsres/libdnsres-0.1a-r3.ebuild
index 99fa34502800..2ecf5403264a 100644
--- a/dev-libs/libdnsres/libdnsres-0.1a-r3.ebuild
+++ b/dev-libs/libdnsres/libdnsres-0.1a-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
@@ -10,7 +10,7 @@ SRC_URI="https://www.monkey.org/~provos/${P}.tar.gz"
LICENSE="BSD-4"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ~ppc sparc x86"
IUSE="static-libs"
DEPEND="dev-libs/libevent"
diff --git a/dev-libs/libev/Manifest b/dev-libs/libev/Manifest
index 06fe7e1facde..0cd518fb64d3 100644
--- a/dev-libs/libev/Manifest
+++ b/dev-libs/libev/Manifest
@@ -1,6 +1,4 @@
AUX libev-4.25-pc.patch 1237 BLAKE2B 6f07e9a8614f136dc44c099a49aafc57e78d107820f23319a9d498d7e6919c01d0e77cb0649e84913d8453341191f48ab6c1b71138c11005400e1936a2efd6e2 SHA512 4cb83f6ab869028a023f1dbc5be4d29b7bd5a703ce12e0cfa54305682e83a5e4a357c19b95dc1b8236e9dc2fe5e2647f42547983a1a3cff3eaf8049b297306bc
-DIST libev-4.31.tar.gz 565540 BLAKE2B 59df831f4cfc9a615234d8d5b845a687ea41cc27aea84698e213bfacb79d8f9862ff776c2bf3888495cc303daf3b9073a1f660eaedb1437ebaa6d678c8ef0873 SHA512 c2687c2e538c724ec8d02ce5bf6875d2e697c57623c4d5c4e6a09c5c480dd7ea38bb7af290f120ff9e61f0ecfc9b6a07a653a9f44ea8ecf2487438756105bd18
DIST libev-4.33.tar.gz 569527 BLAKE2B 8a6cae25ffde10b24a5bbf084f6a8559af326b37acdbdf47dda34b7f0c7955f3ebd26958594444a574cfa3e2b4011e4be93ad2bd994ffd4c094bf36620e67ba5 SHA512 c662a65360115e0b2598e3e8824cf7b33360c43a96ac9233f6b6ea2873a10102551773cad0e89e738541e75af9fd4f3e3c11cd2f251c5703aa24f193128b896b
-EBUILD libev-4.31.ebuild 1115 BLAKE2B 7a3f6741829cf0f2b7493ca45fc05c83a8fecea39281f2248af752aeea6f5b26a056b5b4c0ee8212952a25c4e23be2002af3c3ca53a8ff6c0f2953ccd564dc21 SHA512 5ad0a8e1fd871d212d2925e7ac8bdbebfb4f673da40346c72768876c4c592c0e80486d589a5f7615c4626e8495fb287eb6c9dc86c1109a6c08b8d673042de4b7
EBUILD libev-4.33.ebuild 1022 BLAKE2B b9855ec8b68f6f01610941f9fae592343f3f745c161bbaf33d8a4af00b914fc66821b4310db4b9903f4288fd973f7e5eb98373e85c7766885938227747ad6496 SHA512 9c211867e69c3d8805a7c873972a8162e1105922ec61f92bea2cb9f096178677335b1127a892a050f0f3dd47b5e7dc01ee632d8281ff43185c653ec168c3df21
MISC metadata.xml 246 BLAKE2B 65c152b918cef5b72db59bbb3fd1a71a6fd444bbbb3e95a87aa880e23f33d418b96f842f4a2070ad1bbd0c1d1c3753e935841e6fccf088954bb58f297b672dc4 SHA512 9977bb6fcdb8374bf6148fef57fa31bf04fdd8eb3701ecd75be5ea62a48382fb0ef703b3d01bbc996f91322b6fd0f8365dfa4134426770fa98d624d69d8073d9
diff --git a/dev-libs/libev/libev-4.31.ebuild b/dev-libs/libev/libev-4.31.ebuild
deleted file mode 100644
index 1fddcfefdde2..000000000000
--- a/dev-libs/libev/libev-4.31.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
-
-inherit autotools eutils multilib-minimal
-
-DESCRIPTION="A high-performance event loop/event model with lots of feature"
-HOMEPAGE="http://software.schmorp.de/pkg/libev.html"
-SRC_URI="http://dist.schmorp.de/libev/${P}.tar.gz
- http://dist.schmorp.de/libev/Attic/${P}.tar.gz"
-
-LICENSE="|| ( BSD GPL-2 )"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="elibc_glibc static-libs"
-
-# Bug #283558
-DEPEND="elibc_glibc? ( >=sys-libs/glibc-2.9_p20081201 )"
-RDEPEND="${DEPEND}"
-
-DOCS=( Changes README )
-
-# bug #411847
-PATCHES=( "${FILESDIR}/${PN}-4.25-pc.patch" )
-
-src_prepare() {
- default
- sed -i -e "/^include_HEADERS/s/ event.h//" Makefile.am || die
-
- eautoreconf
-}
-
-multilib_src_configure() {
- ECONF_SOURCE="${S}" \
- econf \
- --disable-maintainer-mode \
- $(use_enable static-libs static)
-}
-
-multilib_src_install_all() {
- if ! use static-libs; then
- find "${D}" -name '*.la' -type f -delete || die
- fi
- einstalldocs
-}
diff --git a/dev-libs/libfido2/Manifest b/dev-libs/libfido2/Manifest
index 9cbf1edcec59..e1b1cc1671b4 100644
--- a/dev-libs/libfido2/Manifest
+++ b/dev-libs/libfido2/Manifest
@@ -1,6 +1,6 @@
AUX libfido2-1.5.0-cmakelists.patch 1037 BLAKE2B f6e34d02dbedfda8f152a2f8081370ea5d8c23468a355329d2c44831c0a9b82a95cc914bb55e7963bda71aa65e4ce4b9849e0e1c42c397c39c9b6b67d80598b4 SHA512 c4b761174994b8db917c5a44940e4119d208e2f9625a6669c15c692ebc485e24439d549c45b271712d69a3c026dcd41005d39381dddd44b606d033b7c44d64b8
DIST libfido2-1.5.0.tar.gz 407259 BLAKE2B 23a04f9230c45652aa1ac9fd8b3e809096ae31699c65ca0fda27b27b1b47263e375bb99e5b1ebc515b9edfb801bb2fba9c4f50d88e755efe3eaa23463ca01946 SHA512 240e2368e43846fddf5e98bbcc247468833565bcde4ec27976b88c814d787f1a477241a82b064818aa0eb0a98ff46a65d80b8243f4d0bbd763270e42492354e2
DIST libfido2-1.6.0.tar.gz 413904 BLAKE2B 59444cc9e32b5d9f2a0f9138fe4f3ad644865e1f7f24f50bbace262308aa7c10b58aa0e890a3493e8fd102468e26947f7fc0864b5d7a1e185e40ad730064db8e SHA512 c473732a2f7ef54156097d315e44457d89056446ab3112a7c7a6fd99d5c2c8ae0ca2451ff9cd45be6c32de1ab335d6dfdb2b0c56b40cae9eb41391d18d83be4a
-EBUILD libfido2-1.5.0-r1.ebuild 926 BLAKE2B 01119027dab909094c4de51c0fb379172cc8ba108fca3e5d5545ee4d3122d54b850b52fdfc782262ac51a24d9455ebd531de63d2f492b4bc8dcf8e1020659b6f SHA512 8ca20903bcb8b2f39865580bebc282b71d6fdc62db780102140576d99f6959e5121f88fc6bd1e874b8a0dfe83c2c6cbae3613c41a17cbf8debd20e07b143c97a
+EBUILD libfido2-1.5.0-r1.ebuild 930 BLAKE2B cf13a87979df2b351e4ee731c6faca845c3ab3c579461bd559d69d352b8755b7a1c68cc775270adab7318e99bccde68284e485112662379745d60f1d1e4b9732 SHA512 c1b66d54635ab61e99fbbfa7c91299c89eb26deec4749fe51aae1c7cf851ce02f562db4c7ff6ab5c4cd222d517deac1e69bc1841f50bbf0b653d225bb2a1daff
EBUILD libfido2-1.6.0.ebuild 932 BLAKE2B 7c2c11e808bcaffd9904714fa967412917d05f21f73e37137408b45a4c59562737360e52500ee18d03f43342de145f278e052f2c7cf77dece213d88e353e2460 SHA512 9f65e6f5f4a8e7ccc441cab13142151c992733329ce73badf612e31e9c261cb72aac038a0cb7e1578f485eaaf87a00569f90d8e657996e087dfab90039b77b69
MISC metadata.xml 257 BLAKE2B f8a00f23163e58c310fa0e4ab94b2e6b5638ec569a5e93ea2efec8c7bdd97c1629e9bc0e9bf04917f5ca4fea4085855b281c30ced2f09548e96b12e6bb1d5a40 SHA512 9c7759d33e1bbc8be0da5b4f59fc720266e40f4116d7db0c17c5ad800a7bb638f33a1308e1554092af781f06df6f6cb55db41fc22207cd3edc2e159840e3a3b1
diff --git a/dev-libs/libfido2/libfido2-1.5.0-r1.ebuild b/dev-libs/libfido2/libfido2-1.5.0-r1.ebuild
index a45c99bd27b1..e836ac168b5d 100644
--- a/dev-libs/libfido2/libfido2-1.5.0-r1.ebuild
+++ b/dev-libs/libfido2/libfido2-1.5.0-r1.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
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/Yubico/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD-2"
SLOT="0/1"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
IUSE="libressl +static-libs"
DEPEND="
diff --git a/dev-libs/libx86/Manifest b/dev-libs/libx86/Manifest
index 779b0bf98844..b63a5623283a 100644
--- a/dev-libs/libx86/Manifest
+++ b/dev-libs/libx86/Manifest
@@ -2,5 +2,5 @@ AUX libx86-0.99-ifmask.patch 584 BLAKE2B 33c0ebeb0ca32b892cebf4bdd91bb2f82fefa3c
AUX libx86-1.1-makefile.patch 853 BLAKE2B 48a25cd96bacd2e39bc8ecb4fd7988ab3775441f259bfe56fedf0f39f8cb894f3f4bcd64a03a6a5357ed064f9dc0e0b578cccbd760cd2056c564f2502f065d6c SHA512 a61e21ab31b1f22d898799ecc3db57e6816146488d436d3d33817f0ac19d420562830411111bacd8ca4c80a446c088fb931ee293522828076d0a1cae6e7ee0a6
AUX libx86-1.1-x86emu.patch 1194 BLAKE2B e4f721ca09e081fb9f528ec95ea491a8267a9be8a169a12ebfd05d18425d473b89fe3e6d121ece254b6764a66a4adaeee9d811e619c6db1ce0c62178185d1ac5 SHA512 476d0bc7d3e903c1b1dff75577ea0caa80a5dd06618a08b24300367031ccb578322fcc267746285bcb671583407f22bfb7165374eeb2301ed67177ee18ec549e
DIST libx86-1.1.tar.gz 87428 BLAKE2B cee90a446994816ce925a5b9edb3de5256f404bcadd9853ad197f13bdf4c86bf4c2def6d38e342ed9af5eba9e87400bfb76cad56852d44583b183853b65dcfff SHA512 b946555a45405a06fdf00b3e2522fc99dd7c61349c32726221aa60117a8d3da6da4b44188b1ebb208368e12b396f26055437cebcc8a0e6df10c7a006182c9280
-EBUILD libx86-1.1-r4.ebuild 1237 BLAKE2B 39f65a05b66592e445c84ac989fe65be33ae97ea20a575a4fff36a50cdfc9c6fbded751e751329292c1af8258a22891be35e015557f88f4273b073e8df2b5af6 SHA512 4fc1d05a41b19091bb06470689b50e5190b7b55df32b9fa1f1c1a52c2258c8f296193ac31e179d0038a8130df80802c2f4ec0d869b656150e028dab67f9bfb69
+EBUILD libx86-1.1-r4.ebuild 1233 BLAKE2B 7165f84264a5c936d29ad7030070f356074a0c47b87916b1a0ace57c4b58d2e1aedc7fe33ad08792fd054a1b7a753b2befddf0629b888551ad8693be9943b2ad SHA512 0efb4a9c19918395ca2831223c35b201c4dc7e4fbf628ff34f90f6b8e444a86894c6386e1a8edf075f67f0e19a652b4bf2f471586f8668e4a1357c92d90cfc0d
MISC metadata.xml 247 BLAKE2B 61049845c1ffb66aea9959f984983735ad8d7d9d37aab6da3a19951bbf8d67af657cacde1701da8a3dd93b0704c10430d511bea11d56bf98702950f0707436ec SHA512 96c55c2979dd6a4c4761fce9b5a0be387b11fcf197ef903d8680ae82f01a2caea93b1238bed1ac96d3eb250744e2149a507e0424ac017b4324f0806a54e72c4a
diff --git a/dev-libs/libx86/libx86-1.1-r4.ebuild b/dev-libs/libx86/libx86-1.1-r4.ebuild
index 259d3f552e7f..24efb4976012 100644
--- a/dev-libs/libx86/libx86-1.1-r4.ebuild
+++ b/dev-libs/libx86/libx86-1.1-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://www.codon.org.uk/~mjg59/${PN}/downloads/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="amd64 ~arm ~sparc x86"
+KEYWORDS="amd64 ~arm x86"
IUSE="static-libs"
src_prepare() {
diff --git a/dev-libs/libxmlb/Manifest b/dev-libs/libxmlb/Manifest
index 04dff08c9cc2..aa0a10193abe 100644
--- a/dev-libs/libxmlb/Manifest
+++ b/dev-libs/libxmlb/Manifest
@@ -1,7 +1,5 @@
DIST libxmlb-0.1.15.tar.gz 92923 BLAKE2B 97b6af812397dd279e7e3c038627fcf8228cbfa5c3af91ceeb5361e32d37d357eda6a193f627a5f4442426fb08abca1ff11684fe199d9d3a4add72ca4f3f5d08 SHA512 58268b3a690af36c0923afdee3ae58e88bf778eebbc6a439be1bc85ed985efdc20cd7006c976586f7be87310dc091d67dddd370f4bbec58379fc4e7349bfa3d8
-DIST libxmlb-0.2.0.tar.gz 97521 BLAKE2B 7a47164503b5b682e2bb9d877622a7dcad06d40bf87d6a7cf9e21898d8444e610ba3985d6be8cf65068f0637ee44ef8678610315be2795476b2f5ccaacb098ea SHA512 cff4245a47a942dd37675921ba753858a3ee0572500a1cd7291d2a063fa7fa9d9157c167bf33694e4e0204504d7e88fbfd2873c4b9851247d6cdb338c2d587a8
DIST libxmlb-0.2.1.tar.gz 98284 BLAKE2B b9bf02560a231837d7837b43f01d8f78c54a80319379a7bfa191f8303b77c35e82d1e2bb57722f1bfe56224d96bd1513cef702a0375eb85a137bff8ca3104c5c SHA512 4e082f036eb62626d1724ac5093ad625f9259e9e81aa40d5ca0589a3a72dadd669c0718ff64dcae094973b6c282b6c8f8ce7212b7e47211f320035bb639ec59d
-EBUILD libxmlb-0.1.15.ebuild 1228 BLAKE2B 8cfdb11b371d1c9b710147e5963003e47d48006b137b183ce8995a85d565df9fe681555000c366b4e944979400eb3306c903eacbf460b2615c52a4731b3a4611 SHA512 ae8f7237ca068cea6e17feb6aa0182a593d6d49a61cfd5a5b4a90aa013d4cb64109f983a728867450c4798aefce2dd1eaf0873c25bda356e431f770ead431a08
-EBUILD libxmlb-0.2.0.ebuild 1253 BLAKE2B 13704d38962eec15866858cc6de0044b5a2fafea7a8779b4944b7aff23b01ac092cb481bb1d84376fefeb984320c01ef023bb441afc97697422cec2eed7f6257 SHA512 d51b93170189a70b6de957a23241d2a58966a23845c7d02e76de26550e2ffd8c1ae9fe0cb8ef68a976dacdaa0fa8279a0863daaeafacac9232a93693d5c982ee
-EBUILD libxmlb-0.2.1.ebuild 1260 BLAKE2B 25c67b3396fdcea722a2263f25c4be5c5912f443edd717adc6646879e698b178b2188e38bfb58cca63040538854bf62c00a84b45e55c0da0fd7022ed86f9d873 SHA512 8710006775f27af03c84e5f0b950e76df91f2ca6b1e64f4ac048ea89dda764dbbfa727de1696283af501a145eef0198f363b0c97c018da43b7291fe5b397c065
+EBUILD libxmlb-0.1.15.ebuild 1205 BLAKE2B 6ae7459288a60acb506e4bb387f66a6527c15939fd5414688b85f50d9c5f2a7f49d3440779648b5e41f1cd27d35df1b86696fac793e0bce52d668d9a69af6c35 SHA512 40197234eac844929649c54b196db7a2a2a434d123819e6eecf1cdfbbbdc61a6a712220027a0d3c4feb821c83f9b10ab915e9525a082b81dcf431bd2c12628d2
+EBUILD libxmlb-0.2.1.ebuild 1237 BLAKE2B 71b492613dd2c3224a415d4ff2ba7149567b5ae9e4f1a10c1b9ea808cdeb6df165076d9a8a1e467f16aabb493f5c5a2b7428f2433ba220930e5ee894d27c896f SHA512 ea4db4ce81be03989daaf0d386518189199a244c702df6ef76fbc706221b6b80f44ada0de73a2387c5f3f4c5b471ef03ec8704d32cda123e53fda2beef5afb46
MISC metadata.xml 423 BLAKE2B 4f6fce646b2b255484b20c506f3a192ddfe0748987d76b4010bbc4efb69db159acfd8dff07e851f6c009aa2afac24ed2b252b7ee2a817fb583b11924d9f865a2 SHA512 b1d47209f5bb217313f0a4f6b27d0c54e4968f010c066c95b6f2df889b0914a5eae7ef8758b965f69475a4c8ce955120d6f452db5060b5f1bd93d5ca7d87e8c9
diff --git a/dev-libs/libxmlb/libxmlb-0.1.15.ebuild b/dev-libs/libxmlb/libxmlb-0.1.15.ebuild
index 68409989938f..80a864311d25 100644
--- a/dev-libs/libxmlb/libxmlb-0.1.15.ebuild
+++ b/dev-libs/libxmlb/libxmlb-0.1.15.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_{6..9} )
inherit meson python-any-r1
@@ -31,11 +31,11 @@ DEPEND="
"
BDEPEND="
+ ${PYTHON_DEPS}
>=dev-util/meson-0.47.0
virtual/pkgconfig
introspection? (
$(python_gen_any_dep 'dev-python/setuptools[${PYTHON_USEDEP}]')
- ${PYTHON_DEPS}
)
"
@@ -44,7 +44,7 @@ python_check_deps() {
}
pkg_setup() {
- use introspection && python-any-r1_pkg_setup
+ python-any-r1_pkg_setup
}
src_configure() {
diff --git a/dev-libs/libxmlb/libxmlb-0.2.0.ebuild b/dev-libs/libxmlb/libxmlb-0.2.0.ebuild
deleted file mode 100644
index eef8b51f8641..000000000000
--- a/dev-libs/libxmlb/libxmlb-0.2.0.ebuild
+++ /dev/null
@@ -1,58 +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 meson python-any-r1
-
-DESCRIPTION="Library to help create and query binary XML blobs"
-HOMEPAGE="https://github.com/hughsie/libxmlb"
-SRC_URI="https://github.com/hughsie/libxmlb/archive/${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="LGPL-2.1+"
-SLOT="0/2" # libxmlb.so version
-
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="doc introspection stemmer test"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- dev-libs/glib:2
- sys-apps/util-linux
- stemmer? ( dev-libs/snowball-stemmer )
-"
-
-DEPEND="
- ${RDEPEND}
- doc? ( dev-util/gtk-doc )
- introspection? ( dev-libs/gobject-introspection )
-"
-
-BDEPEND="
- >=dev-util/meson-0.47.0
- virtual/pkgconfig
- introspection? (
- $(python_gen_any_dep 'dev-python/setuptools[${PYTHON_USEDEP}]')
- ${PYTHON_DEPS}
- )
-"
-
-python_check_deps() {
- has_version -b "dev-python/setuptools[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
- use introspection && python-any-r1_pkg_setup
-}
-
-src_configure() {
- local emesonargs=(
- -Dgtkdoc="$(usex doc true false)"
- -Dintrospection="$(usex introspection true false)"
- -Dstemmer="$(usex stemmer true false)"
- -Dtests="$(usex test true false)"
- )
- meson_src_configure
-}
diff --git a/dev-libs/libxmlb/libxmlb-0.2.1.ebuild b/dev-libs/libxmlb/libxmlb-0.2.1.ebuild
index 30f41ec4d836..03845174fc31 100644
--- a/dev-libs/libxmlb/libxmlb-0.2.1.ebuild
+++ b/dev-libs/libxmlb/libxmlb-0.2.1.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_{6..9} )
inherit meson python-any-r1
@@ -31,11 +31,11 @@ DEPEND="
"
BDEPEND="
+ ${PYTHON_DEPS}
>=dev-util/meson-0.47.0
virtual/pkgconfig
introspection? (
$(python_gen_any_dep 'dev-python/setuptools[${PYTHON_USEDEP}]')
- ${PYTHON_DEPS}
)
"
@@ -44,7 +44,7 @@ python_check_deps() {
}
pkg_setup() {
- use introspection && python-any-r1_pkg_setup
+ python-any-r1_pkg_setup
}
src_configure() {
diff --git a/dev-libs/volume_key/Manifest b/dev-libs/volume_key/Manifest
index aadf1b10d556..7de60d794689 100644
--- a/dev-libs/volume_key/Manifest
+++ b/dev-libs/volume_key/Manifest
@@ -1,7 +1,5 @@
AUX volume_key-0.3.12-find_python3.patch 894 BLAKE2B 7173a00937a78c2b883d554e7c14ced4502088c5dee3af0378f13091aaf4133e4c899df60d4ebafd8c3f629c6020fdb17c0d61afda7e6d87a9c05b15803a4361 SHA512 bdbdf24f9a7e6b0db28cb22e831af898e4faca26b51c386835ab8dd74c0d0d79d261fa47ebd18213fe24424fd0bed54836fec5f3993a908ca88a720168768c7d
AUX volume_key-0.3.12-support_higher_LUKS_versions.patch 917 BLAKE2B a637ba7d7761032bbbae34378a1cd8da57cd96c762ebeb50fce0ca28b7b154df11bda89af203d18833e7841fbd9181c01ee5fcb11d80d765fd147e82440becca SHA512 e784115d85f782db46dbd67c40c3a6b0864b69ce8d13b6a67d70471d39079e9fc0d9d263bd543556d645d7dc922ef22f641491051dd736128cdaecd63df2ff22
DIST volume_key-0.3.12.tar.xz 490432 BLAKE2B 4a0424d51878855c69bdf969b616f3a563074976ad7b07aa848140266d97f66de9c52e1a6ed8913df93077d5966c3ab99afc78c3b22c410f1eadf5447ca2f416 SHA512 d056154c9b9d23e4eb661946dd59ed97e116903a3afcff9d9e29258408082f33dcbb69958724143f6bf191a3da488a03b6c02af287790990ed6459e29d66553c
-EBUILD volume_key-0.3.12-r1.ebuild 968 BLAKE2B 1f76e10a057318f71cfeccd60aee0de8b43f22888476bb9580361dc1bdec0c1027965f3d5e1f3469a059b8c3d5658f7a9be72a5b8523efe9099c73b387f9e114 SHA512 3c75c5090b02268e3a72da218a210e57158941f5a926e6cce9b02975398978a945721b541249f015fbd28044d2ad8216c5763fb53f0951c09ed8d4c5a4b84a5f
-EBUILD volume_key-0.3.12-r2.ebuild 1050 BLAKE2B a728cf5978b592976ece161d05e1d20a502beaf31668ade53125dd42ed950f856adef9ce4d0cace156dd55f4a5e211d29c5a0fd1ce6b25966313962995a9bff4 SHA512 093b7b8e1eea57b0452acec1992c53182d221fdd5cb40df3f4730746d8021d8b12ea3c279de57e39433a56174232a32728d5117a53a8c5283331e325afee4d36
EBUILD volume_key-0.3.12-r3.ebuild 1157 BLAKE2B 4d9c7a54de611857170a9ac06cd818ad342254414215a34e688e36aa8697988799e22a81735e7bf131d4a65b5de89ead56041da5e59e190fcafa53166ea97ae6 SHA512 da690a480ed58e8e08601244649ba5fe7d620067db983e033ca3e88cd6d26bbac6672046c47c1bd66e102e3e86110cf151491a01f54da9d1c3ef08c0b033042f
MISC metadata.xml 257 BLAKE2B 35c1b06807230338ceb9de70f79760d55e93dcdba508da3c663e785ab3966781edc2098abd8df084b2ecabbf40ff8e8e4a0d0a6e131daf648ff58e101cf27587 SHA512 ff078cacb115b8f3624b45d883d8ed72701e3d2fccae06c04c633eb60821b23681cc151e00689d1b6035c94570535e7ac0de51a55dae99f606886164883185ea
diff --git a/dev-libs/volume_key/volume_key-0.3.12-r1.ebuild b/dev-libs/volume_key/volume_key-0.3.12-r1.ebuild
deleted file mode 100644
index 9eb5fb16e7a9..000000000000
--- a/dev-libs/volume_key/volume_key-0.3.12-r1.ebuild
+++ /dev/null
@@ -1,51 +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 python-single-r1
-
-DESCRIPTION="Library for manipulating and storing storage volume encryption keys"
-HOMEPAGE="https://pagure.io/volume_key"
-SRC_URI="http://releases.pagure.org/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
- ${PYTHON_DEPS}
- app-crypt/gpgme
- dev-libs/glib:2
- dev-libs/nspr
- dev-libs/nss
- sys-apps/util-linux
- sys-fs/cryptsetup:=
-"
-DEPEND="
- ${RDEPEND}
- sys-devel/gettext
- test? ( dev-libs/nss[utils] )
- "
-
-pkg_setup() {
- python-single-r1_pkg_setup
-}
-
-src_configure() {
- # --without-python disables python2
- econf --without-python --with-python3
-}
-
-src_install() {
- default
- find "${ED}" -type f -name "*.la" -delete || die
-
- python_optimize
-}
diff --git a/dev-libs/volume_key/volume_key-0.3.12-r2.ebuild b/dev-libs/volume_key/volume_key-0.3.12-r2.ebuild
deleted file mode 100644
index 90c67ed022e2..000000000000
--- a/dev-libs/volume_key/volume_key-0.3.12-r2.ebuild
+++ /dev/null
@@ -1,55 +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 python-single-r1
-
-DESCRIPTION="Library for manipulating and storing storage volume encryption keys"
-HOMEPAGE="https://pagure.io/volume_key"
-SRC_URI="http://releases.pagure.org/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
- ${PYTHON_DEPS}
- app-crypt/gpgme
- dev-libs/glib:2
- dev-libs/nspr
- dev-libs/nss
- sys-apps/util-linux
- sys-fs/cryptsetup:=
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
- sys-devel/gettext
- test? ( dev-libs/nss[utils] )
-"
-
-PATCHES=(
- "${FILESDIR}/${P}-support_higher_LUKS_versions.patch"
-)
-
-pkg_setup() {
- python-single-r1_pkg_setup
-}
-
-src_configure() {
- # --without-python disables python2
- econf --without-python --with-python3
-}
-
-src_install() {
- default
- find "${ED}" -type f -name "*.la" -delete || die
-
- python_optimize
-}
diff --git a/dev-libs/xmlrpc-c/Manifest b/dev-libs/xmlrpc-c/Manifest
index 6ae783508a11..e7173c251014 100644
--- a/dev-libs/xmlrpc-c/Manifest
+++ b/dev-libs/xmlrpc-c/Manifest
@@ -3,6 +3,6 @@ AUX xmlrpc-c-1.39.11-cplusplus.patch 374 BLAKE2B cacbc4fc8737d5e3f675a9579281fb4
DIST xmlrpc-c-1.39.11.tgz 815463 BLAKE2B 7d169d51835e64e5ac822c48b1a6d7622293c1ce1e7379985ebf6c10f3ab331c55eeff9f655cf914c4cf7e3c107fbdbd741d664489f4ad7aadb5e576ceb383c2 SHA512 13e7ddf5264436671437c0bcd698380baca35c4469f592edf79cb4cafda254fe8207ecb992ee728ed20ec70457a20bd0cf8e180ce5cf0561a38a21f1e588f584
DIST xmlrpc-c-1.51.06.tgz 933161 BLAKE2B 8023444e14e7e41f5433cebeb0fcb7a7323dd734f658155e117d3547b4d61ef81c189395662bf68074dcf1ec5c47ee550cd18773ce8bf0bd53cb0a1764cce945 SHA512 2927fc8c01d42b6f838d8b0c839f09a7dd0d1ddc5a3d7b36c9d479f1c7bf7fdf14923f640883f98ba66067eda0f5379737bf3a5bc9d4b9abe1a7eff7d7def066
EBUILD xmlrpc-c-1.39.11-r1.ebuild 1906 BLAKE2B ef9e533ca06556fe561364b1ad2e824e0ffc44b7a8a63928640410ac1f7d608764b94387bcc892ea37ad2ed61482cf8cdb528a46fd2ba6b289b888c191536f40 SHA512 9543ea33b4e23c035491d94ba1046ce8fb355d1bced2acd99827d969c09cc719def5d11842d0ed6733ae95c45bd23c86a7bf8126ac3f0e0941f51d7666dfad42
-EBUILD xmlrpc-c-1.51.06-r2.ebuild 2071 BLAKE2B 6f83818489de0463a8d97a1d7ef1723333cd515049d27a6c94ad6c0687ab244362c94b61d3e4fd274b60ef3ff47ee07a11f0e6b1759b089dd6742ac31bbc7367 SHA512 0b47fe7a9a4174133849c9801272696a26f07eb9b0f9f5b60f2ca8f220e04e452249873c719c3bf143ebeb6cff48906ca4dd3b125245c80fa11437891ade9de9
+EBUILD xmlrpc-c-1.51.06-r2.ebuild 2070 BLAKE2B ae2c26de4d30d36c9f9c4446b745c69cd11f802207a1ba2d884368de3c94690d1f84a30b4772ee91caf951683b5ec0cb1a915d5bf0140a61109e607cf68cab8d SHA512 288f29257a7d725a1a0225ed4a8b36fe15607ad9c535d463475b0ffd0386773def1fddb0bcd72b67d624c365c64f7fd2f4992718befcff364ed228484dd55021
EBUILD xmlrpc-c-1.51.06.ebuild 1811 BLAKE2B 051cdaabaf2ea0476a92e277e4421c03299c6211305685fbef1ce23ec7ecd1c8f4f2015bd19582f956d6e017a383b14538c15cc3bd9f89e2b4f8f7f3bfa05194 SHA512 61e7476b123b33aeba36d6b85cc97b2a334211224786e031a1f9e5624064ec5cd0146b16d27f64781f29f85f0aae8bf74284c0c83ae16997be7dc698ad95dc21
MISC metadata.xml 669 BLAKE2B 04f88706453ca3f6c7960b6a8d9fa0201cc620386d00f5e709070095e58f689ad7492d3b2a0effc9de985f642f55a347f3678f734170d36e141f1eca231612de SHA512 6009e48c681fd9a98054a37eb9ee78d87eff527d617094b55d6f3af6fe59f81328a03ccec47ab7fc1b4e54bdec50629b76b522e8943e2be43c1adf57e74caecb
diff --git a/dev-libs/xmlrpc-c/xmlrpc-c-1.51.06-r2.ebuild b/dev-libs/xmlrpc-c/xmlrpc-c-1.51.06-r2.ebuild
index 90705a7f3f1d..13b34e66e318 100644
--- a/dev-libs/xmlrpc-c/xmlrpc-c-1.51.06-r2.ebuild
+++ b/dev-libs/xmlrpc-c/xmlrpc-c-1.51.06-r2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
LICENSE="BSD"
SLOT="0/4.51"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="abyss +cgi +curl +cxx +libxml2 threads test"
diff --git a/dev-ml/Manifest.gz b/dev-ml/Manifest.gz
index 3852c22f99ef..bf135d4c6847 100644
Binary files a/dev-ml/Manifest.gz and b/dev-ml/Manifest.gz differ
diff --git a/dev-ml/camlp5/Manifest b/dev-ml/camlp5/Manifest
index 36401801445d..50e5fdfbb764 100644
--- a/dev-ml/camlp5/Manifest
+++ b/dev-ml/camlp5/Manifest
@@ -7,4 +7,4 @@ EBUILD camlp5-7.11-r1.ebuild 1028 BLAKE2B 1fe3e0ddcc521d416bc5f5b917178775a5f14e
EBUILD camlp5-7.12.ebuild 1278 BLAKE2B 7bc87a12ff2dcfc4ec043d78479d03745c98d01ec8540d6fba3128bd58caf1b7eed137535b86f8f5a0dffde50c90a58b5d398fa2ab0d1a1361fadb805976b5b6 SHA512 cb2c7464bd37fe71efd94e7b604e68454480384cfb68f1b409a8f57e98504aecf0b03120dd8569f08b964995f94cd5bda4ad5a322605a92b8ad3393a4aac0d87
EBUILD camlp5-7.13.ebuild 1091 BLAKE2B e96813ca2ec1c8e2d1f49b1ff541467aa3801fd2bb0ee036588a9440916562a7a8bd184d8cd1f730e5c9aab70ebbf85ceb9be37ce551959985f71a57ce7f5004 SHA512 05477b46f85711d1a8bff84f44a75dc8346a87e84fb357a349297666f73cbf8d54b36d91c9111cc5991c7cad15bbd10fd1a478eb9ef2920b1e5a1fab90260ef4
EBUILD camlp5-7.14.ebuild 1125 BLAKE2B 272eea9e08214d9d56cb9d899d710c4dc9403f14d83d175e7e26563cb82b932f213e17b048542843b9f199a852c8370209b3135600323f72ea19e490ec867c21 SHA512 de0b49d7a13e2f6040fed43c8d5ccdbb0fca75dcf1bb8a6d48ba7e7b0ce53bc70307d9f06de0557a80864dbe619052cdcb6034846e746c578d13ca2f2a36b3ce
-MISC metadata.xml 430 BLAKE2B b86085580138b59733fbfb751c9a1132428f6c21c9633274cad4cf2e579ef9779317e3c935e117356ca59d741978c2e68c89435952982e8eb0b4c12f3f9f3c97 SHA512 48d26da358e022e6d3eb273046176496387b9bc0f7469cf534130070fa13a45b47728977c96a2ef8dc4b7568ad6ac82bfb7a669b16b1d021e8e7fc06a0be2f71
+MISC metadata.xml 415 BLAKE2B cba4109b6961dba8c767674cc6633812ed76c99e8091ae2b0ca0c285ead9e730d575cc96c448fce7873375a0aa8d16acbb2f80f85d8e26a174ca8945976580b0 SHA512 4e2255d7af948851ca86e708c01be5d61e46235078b6e5606687ca3975ae7d7618d8e531c5b9ca6f1eac893f065258d7191e544f5bb6331fb6e3a9c5ac274f93
diff --git a/dev-ml/camlp5/metadata.xml b/dev-ml/camlp5/metadata.xml
index cafe415ffc77..a0efa42d1bbe 100644
--- a/dev-ml/camlp5/metadata.xml
+++ b/dev-ml/camlp5/metadata.xml
@@ -1,9 +1,9 @@
-
- tupone@gentoo.org
- Tupone Alfredo
+
+ ml@gentoo.org
+ ML
gienah@gentoo.org
diff --git a/dev-ml/camlzip/Manifest b/dev-ml/camlzip/Manifest
index c881e219f914..ca3f36339b2d 100644
--- a/dev-ml/camlzip/Manifest
+++ b/dev-ml/camlzip/Manifest
@@ -4,4 +4,4 @@ DIST camlzip-1.10.tar.gz 27335 BLAKE2B bbf24953634278589395dd9fcedf1e3becce8dad1
EBUILD camlzip-1.06.ebuild 675 BLAKE2B 62844ec59c1659ac216dcca4c53de6dc8a7ae8f9e94e6fca181d4ff5da535548cfb829d86825cc7b6fb55da278eb4e93d1335ff937ef8eb024b3030b14a236db SHA512 936a8828d5ccec18df84be21f2e95cbb8061001d94389fc557b27ce697436b5dbf961b73032b9a416230201b341f48ae5e6b3fe04f172f013a4c60dd449e1375
EBUILD camlzip-1.07.ebuild 809 BLAKE2B 1862fa6b059b2f557127137998cd7c5c4932240e08c3b7dc961fd7f47520d5fe03a7c65ff9275f8f004aa323828f4539cac35229cafb89f62a6330e9f7f7c266 SHA512 c5ede699cbc018186b9747bc6e24915ce0984a489b38f3fc3e58b001078e5d00ea85689fb231b79b2781de54fd64b8e72692db582651411efb6df989bdace7c3
EBUILD camlzip-1.10.ebuild 907 BLAKE2B 012df253e5f38bb840c76950f76de430493ae1d2ba91d013ecc7deccda1396844ef453cbd2c013e7718b1e096880f8ac28203bc1d42128f3eaacd94f8b3547dc SHA512 4d349781e882ff21d795f3d676c36b83c5d3667dc4b945f66c5fbcf027b8902c39b9c4c058704ff111076ba170be04eb8af043c43227c37619c465ec9e500748
-MISC metadata.xml 331 BLAKE2B 0d8f433e2cede398f8cfcf629db7a0f6440766bf9d822e65529135ff915632c578ee0fda0ced5fcec0259aa568b391bda7f2ae070f4c351051b7e68113e17363 SHA512 93244e380436e9779580d7e6a9d8175f00bdac042935ffb0312d6a794af01c88fb4c4f6da42650c121bd7912adb1da0ea6fdf9fa02c367f82c9a8b8ad221f35e
+MISC metadata.xml 316 BLAKE2B 77b2aa09d7f9f4ab39f475277041c53808372951adf605dec9dac4665883c70716fcc18370535027c12581bf8fa7076899fe2d95597d5e5d6b04b5d45a1789e0 SHA512 fa95894f70cbd2fb42e0433a29e675235ed5b68e2bf0095e7fa2fc865f28043fa125c2df5db11b3d8d2998ba71ed60749d302b62917db90747dfa62022553ed2
diff --git a/dev-ml/camlzip/metadata.xml b/dev-ml/camlzip/metadata.xml
index e9aafd4d0149..5bec2e3de616 100644
--- a/dev-ml/camlzip/metadata.xml
+++ b/dev-ml/camlzip/metadata.xml
@@ -1,9 +1,9 @@
-
- tupone@gentoo.org
- Tupone Alfredo
+
+ ml@gentoo.org
+ ML
xavierleroy/camlzip
diff --git a/dev-ml/jingoo/Manifest b/dev-ml/jingoo/Manifest
index ce4db4ef6a01..6a64ee9dc963 100644
--- a/dev-ml/jingoo/Manifest
+++ b/dev-ml/jingoo/Manifest
@@ -1,3 +1,3 @@
DIST jingoo-1.4.2.tar.gz 67611 BLAKE2B 5d2ead117863a2edd18320da4fa7539a7ebd6c537509b5cd37df3778d90c3459dde73d03d3d97b0ed64cfa4b7ef46f620e5638dd75f7e5b290340cc53761deea SHA512 d54d9114b87efdf49b81931b28ee2b61edbd984792c8371f7498b42175f574da7d2774b7b28702b62eeae704168e18c7e9283c4618045abc559b2d1d680e92ad
-EBUILD jingoo-1.4.2.ebuild 594 BLAKE2B 7ff880d55881827f6f7f9e7711942dbc1d204218613cb3d98f0416e94ad576afeb44b4724d74d295ce4ef8614a986c84e37acc0c8ac2837e10196c37049adb21 SHA512 9e9d85b410674eb0d0be3116d377a41ddf26decf2202276ff72732c7dac1871bb6c01a22ed175aab14c558ac575c5c446742aa16199ae2ba81c8ab9a84d08f18
-MISC metadata.xml 332 BLAKE2B d14b96422d1a1f0c8b0bdcab3d980505ece3e8517759cf75e7608bbb4f5dcdb548b7341dc8e8d6663e94e33d4019c6289b1d7d4deca042ac13941026819893b5 SHA512 2adb5cec0cd34cbd1e5b8ba35637ac52a25ab165847460d6fc798aa95d8cf093f1cf23b64b2a9d786b97b86e43cb331bdc61032c4f3f60a071c336a4936a89f1
+EBUILD jingoo-1.4.2.ebuild 550 BLAKE2B f9a097e9f628c2a3fb5531779bedb1acb588926919fb4b5c32ab7d0cf9ce0e879161144449f3ae3782cc585c6159ef0de05f91749b92d9acd6350ff0dd3291a3 SHA512 6aecd1baf1834b0bc92f2295f06173453414444e248ae746964c3e376d0a7ca38f42d1af4151ff83eb25e1b82c6e496b2164247b2684ce1b24aaf949c2c61424
+MISC metadata.xml 317 BLAKE2B b57cff70c59dd46051192a7e63c8de6921d3b71c9f69cc4a4ecb677bd53330c4ab7e96711cb23d3136faae3b88a8ff591ddfb016e17a8481de2614355a17ddb6 SHA512 afc508aed8b09713f0f3246783a64f8b26a016b26fc14ad3388c0815136219da00bacc7174629c3f829eefb67d0e5d7fb384919f5ec61f42c963782a1398b85a
diff --git a/dev-ml/jingoo/jingoo-1.4.2.ebuild b/dev-ml/jingoo/jingoo-1.4.2.ebuild
index 8243636f76ae..4164b805b6a0 100644
--- a/dev-ml/jingoo/jingoo-1.4.2.ebuild
+++ b/dev-ml/jingoo/jingoo-1.4.2.ebuild
@@ -3,6 +3,8 @@
EAPI=7
+inherit dune
+
DESCRIPTION="OCaml template engine almost compatible with Jinja2."
HOMEPAGE="https://github.com/tategakibunko/jingoo"
SRC_URI="https://github.com/tategakibunko/${PN}/archive/v${PV}.tar.gz
@@ -11,18 +13,13 @@ SRC_URI="https://github.com/tategakibunko/${PN}/archive/v${PV}.tar.gz
LICENSE="ISC"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE="test"
+IUSE="+ocamlopt test"
RESTRICT="!test? ( test )"
RDEPEND="dev-ml/ppx_deriving
dev-ml/uucp
dev-ml/uutf
+ dev-ml/re
dev-ml/menhir"
DEPEND="${RDEPEND}
test? ( dev-ml/ounit )"
-BDEPEND="dev-ml/dune"
-
-src_install() {
- default
- rm -r "${D}"/usr/doc || die
-}
diff --git a/dev-ml/jingoo/metadata.xml b/dev-ml/jingoo/metadata.xml
index 1170eeb50700..3789f3a63313 100644
--- a/dev-ml/jingoo/metadata.xml
+++ b/dev-ml/jingoo/metadata.xml
@@ -1,9 +1,9 @@
-
- tupone@gentoo.org
- Alfredo Tupone
+
+ ml@gentoo.org
+ ML
tategakibunko/jingoo
diff --git a/dev-ml/lablgtk/Manifest b/dev-ml/lablgtk/Manifest
index 9b55f0ad2c51..71edbffeb3bd 100644
--- a/dev-ml/lablgtk/Manifest
+++ b/dev-ml/lablgtk/Manifest
@@ -7,4 +7,4 @@ EBUILD lablgtk-2.18.10.ebuild 1979 BLAKE2B fc3f2212c9629121a9c219783e525fa5a3ddc
EBUILD lablgtk-2.18.5.ebuild 2321 BLAKE2B 70d8ce75121c45fa78897e7217612e2cf135f70bda1950bc040c75e92db86ea704c383c65e98922824f372496f060bcc665c6b22b3e7f61518841be19c09a098 SHA512 ac8e9e5e6041d5c31563ad21d69c57c59ae70a19e8958d9f633e964dcf482e4f471d8695101fbbefcb2c3b709f7cbc651bf1bef2903d137fc77ddabb8011435a
EBUILD lablgtk-2.18.8-r1.ebuild 1710 BLAKE2B e404ccdcd1b0329abbe678f23533243ecd31b2f6192ff3ce379c23e794a6eb25a70ec55c1a9783850f89961a4de18a2ac092ef7f2c828eb82078ca1ef7625315 SHA512 986b606bc6eeb8803852754790c5775f9666c6a9b14cea8a6f10382c789f22427c2c04c97586a6026273e9ef0d2de61703a58607786cbcf74fc130aa97eaa5ba
EBUILD lablgtk-3.1.1.ebuild 677 BLAKE2B 76e30cc1a4488369c0ff545b615c609cd707ac60c8d5197e2817b3d064a69ccd64e60bee3cdb63bc2857bb0ed77509a849fe4bb63acfdc1a991ae1768e06eff5 SHA512 9e16aba68d8ce1b74508ee153f5eef04d7150080df95b6ac8effef9a17fbf5230a3e3f5a92f10419317c1ca9bcfa05949cf639232dd77b85a86e669b58d0ad54
-MISC metadata.xml 568 BLAKE2B 888aca75a617b3f24240e7d951b3ea4168150f3bb48a3ddbe74b97caca5170737e4ee3d89a9785eca89300e524b1484d20438443ae4971957203ec5fa12b638f SHA512 ea25d50c9b57627ebb05390183b5698caddf142457001bfa60f1cc1bade58c01cd2c46cd7025b24cb2dd10503e2bda2dbcaaec380a54d9192379b6d44f75ce64
+MISC metadata.xml 553 BLAKE2B 90a0c974eeb82ca8d6c6634fa4c277ce2aa1352629462377178bfcab4928df5cf1cce9242b32c30447f006cab1297622c0f5ae16cab7030b23373f9bd67fd926 SHA512 dde726bb31037d7fe2490b2f578bae878c4f08a350ea732ed036ff2497c3bbf445953ff22f011a2e6e4fdf8295509fd3ef3f979c90157f35bb48c04efbde8302
diff --git a/dev-ml/lablgtk/metadata.xml b/dev-ml/lablgtk/metadata.xml
index c0c9cf6b2c2b..b47954e05bc3 100644
--- a/dev-ml/lablgtk/metadata.xml
+++ b/dev-ml/lablgtk/metadata.xml
@@ -1,9 +1,9 @@
-
- tupone@gentoo.org
- Tupone Alfredo
+
+ ml@gentoo.org
+ ML
gienah@gentoo.org
diff --git a/dev-ml/llvm-ocaml/Manifest b/dev-ml/llvm-ocaml/Manifest
index 247355cd489a..992590b65a10 100644
--- a/dev-ml/llvm-ocaml/Manifest
+++ b/dev-ml/llvm-ocaml/Manifest
@@ -1,10 +1,12 @@
DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151
DIST llvmorg-11.0.0.tar.gz 122743665 BLAKE2B 3f95570240789fd68ddb747df817f5c6cdc9da40911bbe9ee3531c15ada9165e5002b1c2f778cf8735858485ea05a8754e3d3a5f4b15bdd6cb33d64a14692984 SHA512 b6d38871ccce0e086e27d35e42887618d68e57d8274735c59e3eabc42dee352412489296293f8d5169fe0044936345915ee7da61ebdc64ec10f7737f6ecd90f2
DIST llvmorg-11.0.1.tar.gz 122790338 BLAKE2B 0130996b4a8c4d9f757136fd7fb318068c9bfdc565060dec0d4336480c4ab66c4ae3185a7fdb05f13cf9ee8fd4123b09df938881b75d6e5d3689595114b7e32a SHA512 f5e6ef0b3111aae08a89cd01adb2ff4abfa9ef779c68b9190421d0447efd25c2cc00e5aae9f4764805f5fa31434866043d1510ae7389817e28ae53a5442e2fdf
+DIST llvmorg-11.1.0-rc1.tar.gz 122793491 BLAKE2B f4777455f5903cffea284eaffd872be6c287c6c1ebbd0c4b5b5473f146d7f5476f3551998a58d3e976ab90cde7b0d05db2b3be97f4e8e2c3474755ff38739268 SHA512 44e281486c44fa1611042ab658b9833a75f9613b7f896863613cfb99de66d13607fb1e9064f42ea3d89ca7951113465a90fd96ca4544262f165f78bd5261f5a8
DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
EBUILD llvm-ocaml-10.0.1.ebuild 2990 BLAKE2B 3993630867acb739d621fa701f83e4c8ddbc44cb9b77e9c9ff1cbd173c18c894836a9eeb2aa2d9182fbed3e05af2d3cf180a535d27c74de4dd2f87afdadc8f99 SHA512 a6444d4877fc671390b0396f04a770363a5be803afa4f657c61bfb0449fa0aa8b68960f4be1ab6061d9c44f69d4130a64c6a4dff1d76e1896919ae2e59ec30d6
EBUILD llvm-ocaml-11.0.0.ebuild 3052 BLAKE2B 9697dc5b6c2365415dd405b00c913606055d56366ef7710e559611c1bcd1b955777ae4d7836b75a49635bf5132feaf423af9ec7b033e34eb40864a6ecbed3c28 SHA512 855bcfbb8198e815c7d89dfed959fe95d78221eec20a6512c9190eb9e3d9c7b3ebada04a85ccf4653cf9e8e89e318b5339113b92afc1f99d8cd19ffd17c22dd5
EBUILD llvm-ocaml-11.0.1.ebuild 3053 BLAKE2B cc4118d6db256fc34e0ec28a9baa2ffe4aaefbb622b236d86fabb482a27eb3a1e54c7dec13284d6a7b6e9a362dd67be18be73e462f7dfa2c0d459794a19c8db3 SHA512 a0c48923514eef7c205225cee0a0eb15fd0a65248f80a706e2db24731e279707fdd971a0f0ba71d106d3a871d746c98e9fe7bef33b051ffe40bccc007241be62
+EBUILD llvm-ocaml-11.1.0_rc1.ebuild 3037 BLAKE2B 04762e5e843d8d60f5482c3025bdd0c7de2d5b85e3d7eb51a1c0cf8133255406f5f3b4ae61892260bccc6b29825a06317bd06e8195d15a12ba7f8e081e53dcf3 SHA512 216a4d5586912c3d4f47aedc88aea2ddc066f24cb85d0949b89f7536d3bc3a998129abcdb556dcee72ad11ec9d67196031745d4235168430d9be7fa6ccfcd6f8
EBUILD llvm-ocaml-12.0.0.9999.ebuild 3042 BLAKE2B bd3be02016d1136e2f87dd8da51ff1815f9edc633c1c109ddf108f53d1aaa68ad9af967261ffab5836eb96911071525f20741841e45fada95b6edeb1ce1adc54 SHA512 7610604754b5cd6be108c532b211532a30fb3320216ac7f9042673b50c2411058532d01166610f049f7ecbda6ea45fb495841ce0b4d1b58d14690473d347d206
EBUILD llvm-ocaml-9.0.1.ebuild 2952 BLAKE2B d0a7879b89bddff51521378d5cf96626b2bad80f35bae6b0026a51806fdc47139049b23a6ded6f64ce9161b1951341ec71e496a9b094e4b3aa1ca8c44e626cbb SHA512 f1937a057dd79a8fcb5ff587520199941d22e5d4ef18be5f5cc7c854e9d42e32beac3101f37897dd1ea32ef6a38a232685a11bee4b2cc83dfedbec3b5e08c75d
MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-11.1.0_rc1.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-11.1.0_rc1.ebuild
new file mode 100644
index 000000000000..f3cecbcfbfae
--- /dev/null
+++ b/dev-ml/llvm-ocaml/llvm-ocaml-11.1.0_rc1.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+inherit cmake llvm llvm.org python-any-r1
+
+DESCRIPTION="OCaml bindings for LLVM"
+HOMEPAGE="https://llvm.org/"
+
+# Keep in sync with sys-devel/llvm
+ALL_LLVM_EXPERIMENTAL_TARGETS=( ARC VE )
+ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM AVR BPF Hexagon Lanai Mips MSP430
+ NVPTX PowerPC RISCV Sparc SystemZ WebAssembly X86 XCore
+ "${ALL_LLVM_EXPERIMENTAL_TARGETS[@]}" )
+ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0/${PV}"
+KEYWORDS=""
+IUSE="debug test ${ALL_LLVM_TARGETS[*]}"
+REQUIRED_USE="|| ( ${ALL_LLVM_TARGETS[*]} )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ >=dev-lang/ocaml-4.00.0:0=
+ dev-ml/ocaml-ctypes:=
+ ~sys-devel/llvm-${PV}:=[debug?]
+ !sys-devel/llvm[ocaml(-)]"
+for x in "${ALL_LLVM_TARGETS[@]}"; do
+ RDEPEND+="
+ ${x}? ( ~sys-devel/llvm-${PV}[${x}] )"
+done
+unset x
+
+DEPEND="${RDEPEND}"
+BDEPEND="
+ dev-lang/perl
+ dev-ml/findlib
+ >=dev-util/cmake-3.16
+ test? ( dev-ml/ounit )
+ ${PYTHON_DEPS}"
+
+LLVM_COMPONENTS=( llvm )
+llvm.org_set_globals
+
+pkg_setup() {
+ LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup
+ python-any-r1_pkg_setup
+}
+
+src_configure() {
+ local libdir=$(get_libdir)
+ local mycmakeargs=(
+ -DLLVM_LIBDIR_SUFFIX=${libdir#lib}
+
+ -DBUILD_SHARED_LIBS=OFF
+ -DLLVM_BUILD_LLVM_DYLIB=ON
+ -DLLVM_LINK_LLVM_DYLIB=ON
+ -DLLVM_OCAML_OUT_OF_TREE=ON
+
+ # cheap hack: LLVM combines both anyway, and the only difference
+ # is that the former list is explicitly verified at cmake time
+ -DLLVM_TARGETS_TO_BUILD=""
+ -DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
+ -DLLVM_BUILD_TESTS=$(usex test)
+
+ # disable various irrelevant deps and settings
+ -DLLVM_ENABLE_FFI=OFF
+ -DLLVM_ENABLE_TERMINFO=OFF
+ -DHAVE_HISTEDIT_H=NO
+ -DLLVM_ENABLE_ASSERTIONS=$(usex debug)
+ -DLLVM_ENABLE_EH=ON
+ -DLLVM_ENABLE_RTTI=ON
+
+ -DLLVM_HOST_TRIPLE="${CHOST}"
+
+ -DPython3_EXECUTABLE="${PYTHON}"
+
+ # disable go bindings
+ -DGO_EXECUTABLE=GO_EXECUTABLE-NOTFOUND
+
+ # TODO: ocamldoc
+ )
+
+ use test && mycmakeargs+=(
+ -DLLVM_LIT_ARGS="$(get_lit_flags)"
+ )
+
+ # LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
+ # also: custom rules for OCaml do not work for CPPFLAGS
+ use debug || local -x CFLAGS="${CFLAGS} -DNDEBUG"
+ cmake_src_configure
+
+ local llvm_libdir=$(llvm-config --libdir)
+ # an ugly hack; TODO: figure out a way to pass -L to ocaml...
+ cd "${BUILD_DIR}/${libdir}" || die
+ ln -s "${llvm_libdir}"/*.so . || die
+
+ if use test; then
+ local llvm_bindir=$(llvm-config --bindir)
+ # Force using system-installed tools.
+ sed -i -e "/llvm_tools_dir/s@\".*\"@\"${llvm_bindir}\"@" \
+ "${BUILD_DIR}"/test/lit.site.cfg.py || die
+ fi
+}
+
+src_compile() {
+ cmake_build ocaml_all
+}
+
+src_test() {
+ # respect TMPDIR!
+ local -x LIT_PRESERVES_TMP=1
+ cmake_build check-llvm-bindings-ocaml
+}
+
+src_install() {
+ DESTDIR="${D}" \
+ cmake -P "${BUILD_DIR}"/bindings/ocaml/cmake_install.cmake || die
+
+ dodoc bindings/ocaml/README.txt
+}
diff --git a/dev-ml/num/Manifest b/dev-ml/num/Manifest
index d8691e62be8c..80b699375907 100644
--- a/dev-ml/num/Manifest
+++ b/dev-ml/num/Manifest
@@ -2,4 +2,4 @@ AUX num-1.3-cflags.patch 409 BLAKE2B 97db7e69d4bee7e6940386349620799d586ab7094a5
DIST num-1.3.tar.gz 66251 BLAKE2B d6fde246693c8aef3b881a4ebc2b601392e0f0bf561dc4f4d32a5e1f835a5186deba3ffa77c88c6c05cd6e837dc836567fcabffefae99ce1ccae94e1bdfc849a SHA512 c88310f8c45700990095e6b2e9abf24c27347711b9abfd1dde75e540fbbfc6a365e6713bd69f66009af305728fcb36dc61eb37fdd0be7d73824b0e92fbe8c031
EBUILD num-1.3-r1.ebuild 804 BLAKE2B b5f0ec6dd0fb889124e0b868ad9e440e2c3ceec9cacf0d7e70b4a3d706389481fcfa27bb19034db7d53f32aa0423dbfb6b7f069ee4a397ac58b71702fc7842c8 SHA512 4dc33357474ea530206db05451010d4ed4dd665b81e12c398424537b0024de064b03beeedfd94213bcd3244be6627f67778e876e633150341402aa346e5d40d1
EBUILD num-1.3.ebuild 723 BLAKE2B 50ac5e2566b164c5b1aa77037a77f68763ab7d7db2d043f67ce011b1aaf49b97eacb6eaada17af468e9d0f4cc451f977e5964e789dcf03f2b7addce7c935d01b SHA512 d3c8198445dc5eae9c517243bd54a72762e0c3a698a4ef332e48c6fa8cdd1c9f18cab924980e575b8170a85e19766380a4b053b999e24dae5dd9d9233632fb7e
-MISC metadata.xml 352 BLAKE2B 09915ccff13920cb1e43159bf0219bd2312529a87c09f2ec689c575d8f87a78e23033a07c9052b535a8584b19fa06229cf9b5213013fd42d7a1b5354d8236ef6 SHA512 c5dbac31e43517ba73f20a6cf8119b27c2d13334f1736b7e92ee3d9685145fde839cbdd09af311c01a3c5897684bc6c1d668d9a2541b921c7a9816bb3afd3223
+MISC metadata.xml 337 BLAKE2B a5226f08e396ac186d438cd68a253580cc27d9bb0748e8afc49b7f2eafc3eda15d6add9c16bac268b75fd7cbb0ab160a1be8fe56e0ed3d902184157d581ab1c1 SHA512 5b913612f28ef5235ce57b6ec586f1b20d0ccaadfc760fe7cf8e186aeb4be261f8cd17f045de61edfda6c31f347ed965653c917b23523e3fd8d0071a3e845b4b
diff --git a/dev-ml/num/metadata.xml b/dev-ml/num/metadata.xml
index 000cf86e43c1..e24f3283a006 100644
--- a/dev-ml/num/metadata.xml
+++ b/dev-ml/num/metadata.xml
@@ -1,9 +1,9 @@
-
- tupone@gentoo.org
- Tupone Alfredo
+
+ ml@gentoo.org
+ ML
gienah@gentoo.org
diff --git a/dev-ml/ocplib-simplex/Manifest b/dev-ml/ocplib-simplex/Manifest
index 8935a3a34df0..a21314c7de17 100644
--- a/dev-ml/ocplib-simplex/Manifest
+++ b/dev-ml/ocplib-simplex/Manifest
@@ -3,4 +3,4 @@ DIST ocplib-simplex-0.3.tar.gz 31013 BLAKE2B 30d1541f15bf9d2c55f51ed565f2feb63c2
DIST ocplib-simplex-0.4.tar.gz 31784 BLAKE2B 89ebb43ba59debc658b1400b24379dcb717f44f484742a4ea2227e1692f2d1d359469add4e3c22bd15b7a5044e4d45877994b40e80f28ec8639989bf28565d9a SHA512 5eb80f0c8ad32291d24423255c0359e139cd85e2262b0cbbfaffcab66d9a7eb66c9bf04bb9d5d5c103574ec7041a72cde5412e6cb03fc9fe4a8fd257dab49a76
EBUILD ocplib-simplex-0.3.ebuild 755 BLAKE2B b3c1b4fb214ea1c3a4deb79508ebcd58eb75b753899dc63edae5b38bbedeadb9baf26a8ecd2f57e44e267e3973248fe9bfe538fdcdb55e351156c6ab9bc9954e SHA512 665c3ca7adeeb547c390742ffe3127f6783a90262b7719b119d6aa962b58d9210c4b63c3c9341fd92d7083cb472b4aab748510a45015c18faa429ce4b084d3e9
EBUILD ocplib-simplex-0.4.ebuild 873 BLAKE2B 28c840cc9fd1fa52b199140191b20c951cf4bd9bd930d466786f35ce47e8e3378c37308b10f8e93b26272e21d57242646dbef6be3d7a45d5ec73f325b25508bc SHA512 ba17ac1c46113fcd36930de84e37c221c84af9f689bc74fdd12acd98ee27219177ebd6b8bbe3420364ddb1abdf2a63f09219ab9b39adb53872af262af6e2e6e3
-MISC metadata.xml 410 BLAKE2B 517ce557434537aa6fcaf30b4d9ff7aab1c817bd3bdb9f4d2a7f7a8556e3911db55a79d6cadebe86ba018577ad9a1434b3073ed8811513a72c1522069f8bed41 SHA512 caf6a675ff8f7950d06b2ed55e0d8a1eed290fe4f14a68fc87e9c60b6b394cc029787692be7041b7d7e727d6187249ba61a324315742c1af50556496da23eb0f
+MISC metadata.xml 395 BLAKE2B 54a700f2e21a6b8a8b9f05e017e7c2601d7880aa7c3009b8877beb3cf023c5fb6a74e7ec63b65920c0b88994a594a36218aa5e1bef367a1f499fcc87a34134d2 SHA512 7f7ac525cbf0913934c92722e9c279846664b9f0628eb529f67039e6dadda276925535b53b9139a22ed2da67e51f6434f0dea35ff60d74d8941e27b51a0f0ea1
diff --git a/dev-ml/ocplib-simplex/metadata.xml b/dev-ml/ocplib-simplex/metadata.xml
index 01c5e44dd808..9a08a32b302f 100644
--- a/dev-ml/ocplib-simplex/metadata.xml
+++ b/dev-ml/ocplib-simplex/metadata.xml
@@ -1,9 +1,9 @@
-
- tupone@gentoo.org
- Tupone Alfredo
+
+ ml@gentoo.org
+ ML
A library implementing a simplex algorithm, in a functional style,
diff --git a/dev-ml/seq/Manifest b/dev-ml/seq/Manifest
index c59825f4a5e0..1d1047de333b 100644
--- a/dev-ml/seq/Manifest
+++ b/dev-ml/seq/Manifest
@@ -4,4 +4,4 @@ AUX seq.install 30 BLAKE2B 4f3676729c9b48eb67adc238eeb6162cb38c0cbae4ba8aff46255
DIST seq-0.1.tar.gz 2452 BLAKE2B 4f673c3909611957fc882c548c8549cbcad1e93101e1968f001609108b89f4cee13b055a7a8e75e9c36d33074863532b7d84461f036d14c468d5baadde411295 SHA512 cf0df428408efd8f593765c419007c3b181c1234fa957bd09bd96bbbbc7950dcd329429a8a22573680fdfd46847e21befae29ade967509690428ba2b90fe83f2
EBUILD seq-0.1.ebuild 721 BLAKE2B 9c51848bdd583c605856613c7f80fa5c6c8bff817043cb907dc72450de50c780b1eeb73336c9aa6dab884afc43c97cedb152a2d8abf725901cbaa46011676298 SHA512 9ef41b4d2b1dd58754c85521550dc096e636e5d0e18fae22e8b300b893388594d045bcbbb2b30f83dcf41d1a1e59bef9f1c24f98149f262193645116938d44ef
EBUILD seq-1.ebuild 552 BLAKE2B 1cc7c58894503841b2288a628505382293865565982ad10e466ee41aefe3823f76d9f7bc8dcc7751ed7539258b31585d75eb7e3d9348cba462ae8795a373dee1 SHA512 663eb04eb4c7ddaf64c72f9d3923410eec0a3d6d2b323de7c15dbdc886fca311b39ca3799f5133849eb85ba2f05565004a750f3290b0026e3292e815fdb98f1f
-MISC metadata.xml 352 BLAKE2B 09915ccff13920cb1e43159bf0219bd2312529a87c09f2ec689c575d8f87a78e23033a07c9052b535a8584b19fa06229cf9b5213013fd42d7a1b5354d8236ef6 SHA512 c5dbac31e43517ba73f20a6cf8119b27c2d13334f1736b7e92ee3d9685145fde839cbdd09af311c01a3c5897684bc6c1d668d9a2541b921c7a9816bb3afd3223
+MISC metadata.xml 337 BLAKE2B a5226f08e396ac186d438cd68a253580cc27d9bb0748e8afc49b7f2eafc3eda15d6add9c16bac268b75fd7cbb0ab160a1be8fe56e0ed3d902184157d581ab1c1 SHA512 5b913612f28ef5235ce57b6ec586f1b20d0ccaadfc760fe7cf8e186aeb4be261f8cd17f045de61edfda6c31f347ed965653c917b23523e3fd8d0071a3e845b4b
diff --git a/dev-ml/seq/metadata.xml b/dev-ml/seq/metadata.xml
index 000cf86e43c1..e24f3283a006 100644
--- a/dev-ml/seq/metadata.xml
+++ b/dev-ml/seq/metadata.xml
@@ -1,9 +1,9 @@
-
- tupone@gentoo.org
- Tupone Alfredo
+
+ ml@gentoo.org
+ ML
gienah@gentoo.org
diff --git a/dev-ml/unidecode/Manifest b/dev-ml/unidecode/Manifest
index e8d195f765bf..28f7ff31f7c9 100644
--- a/dev-ml/unidecode/Manifest
+++ b/dev-ml/unidecode/Manifest
@@ -1,4 +1,4 @@
AUX unidecode-0.4.0-test.patch 464 BLAKE2B 43a8cfdfdfd87a3c8609ab428eaa6af3189c31813b7630578a6bac41f6a94270962a48cd4eb07084042c16dc3e5647a9c25fce8694e8944a35c6aa43f809aec6 SHA512 407aeff21aea1223838a90318dcfa556d32d477d2748a364cb06d146ee2220fe757689eaef430a50a97f7cfd188084827a30b75cdf47e7f21285f8744eeb3db5
DIST unidecode-0.4.0.tar.gz 20571 BLAKE2B 864888e1f3db1a784f847f49584fcb6da93ad30066b8ea5764395b25d3d86c47749a98d13771107dbd6c68dacb2ff4e6e2cb9370e8adb35d84e8149b93122ccd SHA512 a411685ddb1d52585251eff3e2cd56fc9b4e91dcfceff424d7cfd5f721be73561d7a8e9223ecaeeda6178b02e5f6df74d50a49d4ce61d72a7d3fa1e8aefe5cf3
-EBUILD unidecode-0.4.0.ebuild 527 BLAKE2B c73e35e06a5232ef30f318e8564f603c964d54575d4b0694b1fa6bcba5d70bc027c16e2e2a90af108b7619cd35a57a6df2099ef3e3aecf6bbee782583785e9e4 SHA512 f1125cf7ea036ee51fd9a3bc2e6642fdd22d588d46db9ccc48aadea0706de4666d2bcd575c6a260009d8e1eb558f45e880efd90b01c5f81fcc17cd997b5dc7cc
+EBUILD unidecode-0.4.0.ebuild 606 BLAKE2B 472a5ef18897cea494d229d18cd02c242780752b703e4e3efb84a151f4907c8a67bb2b0a58419ff6ad667baa9b71f24acc6befdef68f0d2c8a3097335436a574 SHA512 742ae25a5530e462152fd639e411a8f0e7add6c4686c1d3921eeace7e2601160a710db0082b73020a56ed85f4298e98db6da4c73e02c1fa51466aea0e154fc06
MISC metadata.xml 329 BLAKE2B 228f3313fa90dcc96d858c9a29686d80e9c1eb5a0b581eb94480a55fa40051518e2023238503d446876506012e3817d91341065ab46016cd610d658bcbd51087 SHA512 0c5c37e8dda809dc0131d80de868b3f14769a54863c4c2bfefa657a91c2914126fd1a6abb57b00f3563375435d25eebb4e2491f3b9ff582b69f6613e6cb53785
diff --git a/dev-ml/unidecode/unidecode-0.4.0.ebuild b/dev-ml/unidecode/unidecode-0.4.0.ebuild
index fc22748ce120..35cfaf39fd6c 100644
--- a/dev-ml/unidecode/unidecode-0.4.0.ebuild
+++ b/dev-ml/unidecode/unidecode-0.4.0.ebuild
@@ -21,3 +21,8 @@ DEPEND="test? ( dev-ml/ounit2 )"
BDEPEND=""
PATCHES=( "${FILESDIR}"/${P}-test.patch )
+
+src_install() {
+ dune_src_install
+ mv "${D}"/usr/bin/unidecode{,-gw} || die
+}
diff --git a/dev-ml/zarith/Manifest b/dev-ml/zarith/Manifest
index 8a37cd4de7a7..a27f603ed91c 100644
--- a/dev-ml/zarith/Manifest
+++ b/dev-ml/zarith/Manifest
@@ -7,4 +7,4 @@ EBUILD zarith-1.10.ebuild 1470 BLAKE2B b582fe34fbdf05490c4f9b78da27d72030a612793
EBUILD zarith-1.11.ebuild 1352 BLAKE2B 3ea6bb8b8013eb55a9c92a7bc29e616957d01290e9c28682cd2c07cbbaabf80ae70b133611aef349fce6f2843c244f0051957ea9467731d123e3bf5c612fda91 SHA512 9f4e857d7ea44ac512032d458a28e75ae6c82c3673a99a6a57d49ca720d1585db2ce2ed9130873c8bc5c933b9ab0236083c7c796a471979f496d37ec7a57e271
EBUILD zarith-1.7.ebuild 1324 BLAKE2B 25281d39a44be1b345fab0ba5ff4bd34c1355a2f9bd5a80ffbe8d3d7685bec4ced72865c29a56f69b9db4555a35eac0c752b6752d0083c3d2a018ad50d8e47ba SHA512 33c9759c47aef05c74514d71077b2ab791f83b4d8b46bc32b12b75ddc7032dc4fe5b04ed7690e6a251f54994b5793d0c1c4a5eeb06f53f5eacb5ec5ff18267bf
EBUILD zarith-1.9.1.ebuild 1460 BLAKE2B ae8dd8e3eb7d55a6ace369189c77dde72d156c830fafa37f74218d0ed4f96ba40867ddf9f6ec7d2ac3ace0c2a62d8e7137f6e63705de28b3ba8f3b3e9fe1d342 SHA512 5abcc22e0cb2a954a24dc0b4fb517c72dd09631b7ba89f64609dbe2c648dbd5cec79ac7f93973d9448f9d081189541e74e17adaae8043031a9ae73e536d8f528
-MISC metadata.xml 399 BLAKE2B 8d0594f3da1c885b3c23bc0bd85bb499b46c1bf9e6d9ce97d03a5bbb9b3ef07be3fe71887464d0334eb5338db123a07113b40f83c4887a99041eccd77d3aed21 SHA512 a1b5ac5f460c86208b260d2adf19bcfe4e34c076be1aa4f52aef993d8e709411ecaf3fa0b6170b0fca952ae7fc1c8e70cb20f7d40ea528ec69dc32624a61faf0
+MISC metadata.xml 384 BLAKE2B 2476ec65036f286fe12f1b64916114abb08792a1c8840be05fe48ba075c9beeeeef5d01ea1a920ca91144fda6d946c86c045c8a853b698bd08d0c02ff93c9bba SHA512 4e0f0e30d6b928341d9610efb0d42717476bb76a897ab3b350782b101cf7a4d3fa5b31d61499552073c987eac1ceb8bc0c9bd9103115f50ee9b52939301ff1ed
diff --git a/dev-ml/zarith/metadata.xml b/dev-ml/zarith/metadata.xml
index dc2c35e803b2..98fa0a2215bc 100644
--- a/dev-ml/zarith/metadata.xml
+++ b/dev-ml/zarith/metadata.xml
@@ -1,9 +1,9 @@
-
- tupone@gentoo.org
- Tupone Alfredo
+
+ ml@gentoo.org
+ ML
marcelotduarte/cx_Freeze
- cx_Freeze
+ cx-Freeze
diff --git a/dev-python/defcon/Manifest b/dev-python/defcon/Manifest
index 8a73e15b0650..44c16c979c3d 100644
--- a/dev-python/defcon/Manifest
+++ b/dev-python/defcon/Manifest
@@ -1,3 +1,5 @@
DIST defcon-0.6.0.tar.gz 403682 BLAKE2B c85cf4f846cab3f7543dcec885221e9f828cdf56fb1a373c9d06b27a29c1ab22fc9702d2ce561af97e3d4aa3b03712538ce0b29a0042fa4a0fea6f11eacba69b SHA512 b981c87d2355dc83b5da0ea4879707336ade8ea4d6ca2bc13da064367938579f2a60dfa5b1c0fd3629f4a2de97676e4f02f30f99a6116049cc2a10abd13a3d7b
+DIST defcon-0.7.2.tar.gz 424146 BLAKE2B 6a3cc6c4bd8ccf030cda5fdaa3d7d2ba8aabc74daf71ce9a006de015d459ff0e5d876d584e7873fba7349a2941490db8d0ebd9a9c880e80db534b231639d3147 SHA512 9cf402b6626b75222e351d11afcde3e0c8be88b3ceb6ed4ff68cc3762b636905b61f31ece288f4d7e5273b6cd2b044661188a39fde1941e1bb5b483b23f3b42e
EBUILD defcon-0.6.0-r1.ebuild 595 BLAKE2B 8b55bccf251089c43672330a436f839cf5a8194b61414eca2f22c7aa1c677572284a088715f35d10a8c024d38023b3ceb2a35788aa1909f255d9565ccc34fe49 SHA512 e2c4a89f0aefd0f445b2211297592318283376386f5b726e86d50a82a04e11b36b3749e10b471a757f239f0868f22ff369255a976cb5f7c55487a70e23e46154
+EBUILD defcon-0.7.2.ebuild 597 BLAKE2B 441a968ad4c1fceef6ad0cd3e07f4f9b7ff55415b6b6620bc87b16941e7248776dbff833fd8003dc9802907c8194fe08d2e35ed5fb72b5b697b849fbc764b879 SHA512 18a01a6c344401f2aca634d45c417a4a9e52f2e5c71e2842d1b52ae8e1c4f9cc306ee18c63357fb19b809baad0eae10e5f1543f66dd0697dd6f210650bebb4ca
MISC metadata.xml 368 BLAKE2B e99b9b950a6b060499bd76d17bed5b749b7bea284c7226bd54c613f6c64012c7d858e474b817f06137923dfa67f1700a2aaf41a487f54be9ef3c13e16bad9709 SHA512 73ba1e560ac21b734b3938609e61926ac45819a6cb546f2c8058fcbdf888f468e6b6158383cb538e3dcef70fcda2f63a2c17f185653abdb327402adc3db3751a
diff --git a/dev-python/defcon/defcon-0.7.2.ebuild b/dev-python/defcon/defcon-0.7.2.ebuild
new file mode 100644
index 000000000000..6a2042c9e578
--- /dev/null
+++ b/dev-python/defcon/defcon-0.7.2.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..8} )
+inherit distutils-r1
+
+DESCRIPTION="A set of UFO based objects for use in font editing applications"
+HOMEPAGE="https://github.com/robotools/defcon"
+SRC_URI="https://github.com/robotools/defcon/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-python/fonttools-3.31.0[${PYTHON_USEDEP}]"
+BDEPEND="
+ test? (
+ dev-python/fs[${PYTHON_USEDEP}]
+ )
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/eventlet/Manifest b/dev-python/eventlet/Manifest
index 4be20c6c08d8..a97243a98d95 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 1840 BLAKE2B 9954992c66a4adb3d2b9e60dd30f809a362e151e560bd888a97fc57c2fe572b2b08b14f26a453516ab6fe596d7f7816c70a7202dd13eb2c5d787e95d8dfa0e9e SHA512 e9a7330597a1a9452b39eb86f8af9093f9a3662e7ec24e69f3da81c886dacb8b6332c47d617c251b5b9b574d273f65234ea257b2e0bc3b88d36be59b31473c63
+EBUILD eventlet-0.30.0.ebuild 1839 BLAKE2B 1edf8188ad4834580bf02145aa61a111373547444e039fdd3cd03da617f927c6a56e28e7281980ba533e730bd39679e7a6a9164a0bca346ca877999987320d19 SHA512 9eee9e9995c7f30ebf956b4e67e1def1bbd538d727fc698b230e32dd3c03fc2e1553850099272b964287a4b54505c167938ce4866604058ba3ebeac0c808885e
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 bce0a6cda427..a2fc36fd2548 100644
--- a/dev-python/eventlet/eventlet-0.30.0.ebuild
+++ b/dev-python/eventlet/eventlet-0.30.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
@@ -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/fonttools/Manifest b/dev-python/fonttools/Manifest
index df81f6e1e406..e0edf1dedf91 100644
--- a/dev-python/fonttools/Manifest
+++ b/dev-python/fonttools/Manifest
@@ -1,7 +1,5 @@
-DIST fonttools-4.1.0.tar.gz 2253792 BLAKE2B 470207d74404851aa111142ad8541d45820ded0212029867c289f2e7741d4b41b4ac824f65555a23d4f3dcc974428537cd319a8787bc4d80f2fb67561a21d1ee SHA512 3d9485cd34b5ea3dfdcc26474e0b21a96811b84eda16341c39165aea72bb09c3cf3360a069b316ae6575a399e26f6518c199180caec7bb959f245ced7ca45e3b
DIST fonttools-4.18.1.tar.gz 2498166 BLAKE2B 9ea9fd372c71883e37756c9b0b5bcd193782d49a99df37e7245f788362b284af8e5b9456c31b1c6b84fb6cccd8bce0339e95c87cecc008f0130e47a40c74bfe5 SHA512 d87c466e87ffa70bb15ee40f889b25e1187d51a1074b6e47a259d5984d51d7ce988ef50db91796fcbd06b5692b2c627d0a4cd76e3be6d0da348c0872ff01317c
DIST fonttools-4.18.2.tar.gz 2499129 BLAKE2B 1ae93418121942e4303e4b138b192a30195d25c87e8c6204b508cc6a5b7a87608fcde7acbb6a2e8fb3c71ea59938827dabbe1556b7edad537523f6f0b3615696 SHA512 ceec3656c674ff5c43f4dc7cdf1468ddaf5c8bbe569d865fb015a9251ac089caedcf3dcea82c93a0c367576fcd7d65451642a6ab5d3093d941aa391b50070d53
-EBUILD fonttools-4.1.0.ebuild 1356 BLAKE2B b062425fc7bc10c18c3c44e0d29c946f0ddda6e24d4345429039c60323e9b9501f192894eebdc8aae1d39c195bd34e8717e9e8fd9716c8cbc0817c697bd2f5a7 SHA512 317ba31531366edbfe474592594dd8c9dbaf19dda856f90dd3e37f4a5fcec214e6a2197a85193ffd962967aeca32dc675785632d927f170ac03c83851fd63e27
-EBUILD fonttools-4.18.1.ebuild 1392 BLAKE2B 740f06cc15d4902bb0ddf431911eb2940a98b6c395cac21f9863670d43f4f9ac82fcd9ec473542ee773b1abc7a71f5e51497a8f9e68b17adec8b62d130312ded SHA512 2b6c51fd2aab0c4099359a6c621f18fe0fafdcaf35de9e933c0985d63a8295f5d768f854bb39cde3f25ee4379160816ca7d7cd3551cc43ba6a8ffdc8e239a6cf
+EBUILD fonttools-4.18.1.ebuild 1384 BLAKE2B 685f17f7a8e0ab08171bae30f595c8e5850f35514d6c93d4efdb2451005370d1b0353ba8bea2806a9c593d3c0b63f141f3bed8c038ebc1744d17451e4bf56e62 SHA512 0b23f24c13fffd2a419f4d7225b57e0c96b57f28ee6818f1b6ee0185ff283da3fb90b8a500b0b689d22a6dcd9efb64bae6deb6c195af504e9ad9ca00f6dcfea5
EBUILD fonttools-4.18.2.ebuild 1392 BLAKE2B 740f06cc15d4902bb0ddf431911eb2940a98b6c395cac21f9863670d43f4f9ac82fcd9ec473542ee773b1abc7a71f5e51497a8f9e68b17adec8b62d130312ded SHA512 2b6c51fd2aab0c4099359a6c621f18fe0fafdcaf35de9e933c0985d63a8295f5d768f854bb39cde3f25ee4379160816ca7d7cd3551cc43ba6a8ffdc8e239a6cf
MISC metadata.xml 395 BLAKE2B f31a990237241b04b7e3222093c878d57d990ee97466160947d4c85a5798543a76c480b01a8f1da13057773b3b6b6dc270d039a4211d7d5cde8991bfa9b7632c SHA512 6c676733e48ceab4d6dcc56359c62d610728e06e7483648d410cbb0826c603521823a0f73b6d832b0f90b3e2f6254a92195e751867e16fbdef8335bbb0bec430
diff --git a/dev-python/fonttools/fonttools-4.1.0.ebuild b/dev-python/fonttools/fonttools-4.1.0.ebuild
deleted file mode 100644
index ab2adaed22e2..000000000000
--- a/dev-python/fonttools/fonttools-4.1.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{3_6,3_7,3_8} )
-PYTHON_REQ_USE="xml(+)"
-
-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.1.ebuild b/dev-python/fonttools/fonttools-4.18.1.ebuild
index c1277db3ff69..af5f8647f96d 100644
--- a/dev-python/fonttools/fonttools-4.18.1.ebuild
+++ b/dev-python/fonttools/fonttools-4.18.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 @@ 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/fs/Manifest b/dev-python/fs/Manifest
index ae3f8d9704b8..28c1ceabb931 100644
--- a/dev-python/fs/Manifest
+++ b/dev-python/fs/Manifest
@@ -1,3 +1,5 @@
DIST fs-2.4.11.tar.gz 163986 BLAKE2B 953e50da7002512029c0a1a8e7fe8be3a7c31fc48e2c66f0fe7d71dc908aab734f724e09c16074c3e4cdd86c9c2e1a847aa21176af07311012090375a3a6808e SHA512 fe4596bf213f9b1721cd3c665e6af180d6617eea07afbaa9d83847dc3f7dfe64bca16c8ccb337d48bbb49bf0d2fef90903e3c4aecc63f61faac6a2b6f6c59cf6
+DIST fs-2.4.12.tar.gz 165536 BLAKE2B 9212ffc1f2d5c315091116770e045e4c5365690d61ca34c3f4a9ce82764c4ba5be6af886e62c8baaf57ab461539a02aa042d50a9dcf314b0894710953571d37f SHA512 8b4727ea21cb9e1b69e31688c46f0732bb1536490549e353c1f88ab0c794b867c5212d1003b094cc86f562108ab4a7ee9dbc7e9aa5dc1349371de583277eb93d
EBUILD fs-2.4.11.ebuild 1326 BLAKE2B e04e402594e9e4c35905fe189d773a751a89f028e13853f230cf8951469091f8895a6f4c272e53d781d821bdad2c78e2a555c095a0d501374ee8f67a393fe705 SHA512 77969b7e5b93c8b6c600c1e274d1c093591f79e38296eb229d638bcfb9946703cf7127637a3e6ea8a360a67bcbc995ae53435e3cb06550213367d40292c470d7
+EBUILD fs-2.4.12.ebuild 1250 BLAKE2B d0d3b385b0ce541b284f0179f3484d944922a6dc216b5afd7eb8a270094c676eceee4d7b1b58dcfdf22dbc8699a534f2bbb5b6d9335efc99044e858587f7cbe2 SHA512 52ed781a7c00f986b5b9c9f02fa9891cfd0bdd5f79600455870d8c1549338f4986d10ab1f0414bd07597af7d1d33c3203fe7ba6b1de0ed8e76af296efc75baef
MISC metadata.xml 580 BLAKE2B 7fa906a1331fb39671795b92d09a71dd41ed44f08820f20e7fbc8fd9f1edb6aecc7168d9d3bc539fd58767122db918824a46ed9c4ae345618dde439a27299acb SHA512 f675af4b3cca4ec6caa96414f0e72dd03d1ed1208afa46ee9ac28eba16071fd44a03acb24e2b6930475fc906f46a3f50ca4e1d4a59c352dec7b476906a1df1d6
diff --git a/dev-python/fs/fs-2.4.12.ebuild b/dev-python/fs/fs-2.4.12.ebuild
new file mode 100644
index 000000000000..3c3ba7eba881
--- /dev/null
+++ b/dev-python/fs/fs-2.4.12.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} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1 optfeature
+
+MY_PN="pyfilesystem2"
+DESCRIPTION="Filesystem abstraction layer"
+HOMEPAGE="
+ https://pypi.org/project/fs/
+ https://docs.pyfilesystem.org
+ https://www.willmcgugan.com/tag/fs/
+"
+# Tests from the PyPI tarball are broken
+# https://github.com/PyFilesystem/pyfilesystem2/issues/364
+SRC_URI="https://github.com/PyFilesystem/pyfilesystem2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+ >=dev-python/appdirs-1.4.3[${PYTHON_USEDEP}]
+ dev-python/pytz[${PYTHON_USEDEP}]
+ >=dev-python/six-1.10[${PYTHON_USEDEP}]
+"
+BDEPEND="
+ test? (
+ ${RDEPEND}
+ dev-python/pyftpdlib[${PYTHON_USEDEP}]
+ dev-python/psutil[${PYTHON_USEDEP}]
+ )
+"
+
+distutils_enable_sphinx docs/source dev-python/sphinx_rtd_theme
+distutils_enable_tests pytest
+
+pkg_postinst() {
+ optfeature "S3 support" dev-python/boto
+ optfeature "SFTP support" dev-python/paramiko
+ optfeature "Browser support" dev-python/wxpython
+}
diff --git a/dev-python/google-auth/Manifest b/dev-python/google-auth/Manifest
index 6d9517a4ff7d..29f3abbff906 100644
--- a/dev-python/google-auth/Manifest
+++ b/dev-python/google-auth/Manifest
@@ -1,5 +1,3 @@
-DIST google-auth-1.20.1.tar.gz 107375 BLAKE2B 2f57cd9752c46891c59ed13e2ec8c6f98e5b3cd07d329769a78872877a17580c1ff5bb9da0381ef9bd4b6b9f72f04125ef71102543cfe1dc7bc3b09a5d5d9039 SHA512 6aad44b58c71f96c686606d6e8b6f273c64ce1559737920ccc31ad761442cad7f5fab19a59daee9408b284405a00c2de769c00221ac91bcfdd48851dba6f680f
DIST google-auth-1.24.0.tar.gz 120351 BLAKE2B b0a78ad87622bc806cce72847d5dad3844afe080ffbcd822575dab6208952806360bed4e8756133d5b4fe2755f6cbeeb239b8f51634dd3d4cede9346372b689a SHA512 3e678dd946eb6c3c865cd35df1480a96ed35cf14b973f2239c5213b223a6569b4a9642609ac51243af75c662a08bbf0518d8592db97af297cf67c52b83019e30
-EBUILD google-auth-1.20.1.ebuild 1519 BLAKE2B 975bbb50a2965ef5fa5e9b0ed8b374b0bde75691094803657c0577010654524d09ed22b68152dd9466a90849bf92ce135e6bf07d0f3eb61514a6d2d959c31697 SHA512 828fdeb4565666d4b7ed43d182f6968ba549c638389207ca094247835384eb329fccd6ba0ac7aa2462a8dca237fd77c60e07d58506a7e7197f1bb91ca0e5e3ea
-EBUILD google-auth-1.24.0.ebuild 1639 BLAKE2B 9f836c6fcf709d9179e640323059c30feabeb48f38b2445d7701aa2d2f39726bad21e74e73844d218b21fed8e96129d62a2f9fccdeb28d28b3a7710c95cab082 SHA512 c63e2444201d6394666204087a56401c16466b2d2df9af2e30066ba35770064058aef27868dccf61a8e03554a5eb8710338a0230aa37667d5d04fe7982e971ba
-MISC metadata.xml 428 BLAKE2B 130f36eeb8949f23ff7658277485387897cc1688205de4f5ac7acd4e8e897a5212c07fbe36b4884f4b6d4c4755cbe1e99d0f9d37529a605d0f4df01445e7045a SHA512 82c278bcbbd1329e5b002b7382f11a5bcd8419080137ad09c51db944941669cf072401210d9990d1bb2adf98fd3e60f0f77415d9f2294e1cc2c68023040b9535
+EBUILD google-auth-1.24.0.ebuild 1632 BLAKE2B 4b654b23432a13eed095a2654eeda2bd0501c3d9a2854bfa0567670aab2c247fcaeb7ecaa1df26ca48044d57d5a1c09fe5b0ff83eeb8839e9b78f28f67a8d5a5 SHA512 e2de6bceefd8e7e3e9811d5de212a50ed347d31d98e38c6290a339bf2cff6d94f8de870c72070411d1315417ed5e7ac9f187b29d3bbe3cc18893b1b733e0d327
+MISC metadata.xml 419 BLAKE2B d8a88d0022eb8d396a504bfc90741d9274cb0e0c7f816444ca70533c6c4c0aef8d74e59a65141515a8db8b6768f43618ebba5e997494670f4e05131c34f7e609 SHA512 222e76f72e487b126c2407764023f7b4861e286015ad1e8204bac13e5c7b036db3a7c71908068061c5536535f354a82e547685c29c614af891100b80a7bcca3e
diff --git a/dev-python/google-auth/google-auth-1.20.1.ebuild b/dev-python/google-auth/google-auth-1.20.1.ebuild
deleted file mode 100644
index 371c951a2d52..000000000000
--- a/dev-python/google-auth/google-auth-1.20.1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6..9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="Google Authentication Library"
-HOMEPAGE="https://github.com/GoogleCloudPlatform/google-auth-library-python https://pypi.org/project/google-auth/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- dev-python/namespace-google[${PYTHON_USEDEP}]
- >=dev-python/pyasn1-0.1.7[${PYTHON_USEDEP}]
- >=dev-python/pyasn1-modules-0.2.1[${PYTHON_USEDEP}]
- >=dev-python/rsa-3.1.4[${PYTHON_USEDEP}]
- >=dev-python/six-1.9.0[${PYTHON_USEDEP}]
- >=dev-python/cachetools-2.0.0[${PYTHON_USEDEP}]
- "
-DEPEND="${RDEPEND}
- test? (
- dev-python/cryptography[${PYTHON_USEDEP}]
- dev-python/flask[${PYTHON_USEDEP}]
- dev-python/freezegun[${PYTHON_USEDEP}]
- dev-python/mock[${PYTHON_USEDEP}]
- dev-python/moto[${PYTHON_USEDEP}]
- dev-python/pyopenssl[${PYTHON_USEDEP}]
- dev-python/pytest[${PYTHON_USEDEP}]
- dev-python/pytest-localserver[${PYTHON_USEDEP}]
- dev-python/oauth2client[${PYTHON_USEDEP}]
- dev-python/requests[${PYTHON_USEDEP}]
- )"
-
-distutils_enable_tests pytest
-
-src_prepare() {
- # delete stray files included in the tarball
- find "${S}"/tests -name '*.pyc' -delete || die
- distutils-r1_src_prepare
-}
-
-python_install_all() {
- distutils-r1_python_install_all
- find "${ED}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/google-auth/google-auth-1.24.0.ebuild b/dev-python/google-auth/google-auth-1.24.0.ebuild
index f33fd88d8afa..b31ae614005a 100644
--- a/dev-python/google-auth/google-auth-1.24.0.ebuild
+++ b/dev-python/google-auth/google-auth-1.24.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
@@ -9,12 +9,14 @@ DISTUTILS_USE_SETUPTOOLS=rdepend
inherit distutils-r1
DESCRIPTION="Google Authentication Library"
-HOMEPAGE="https://github.com/GoogleCloudPlatform/google-auth-library-python https://pypi.org/project/google-auth/"
+HOMEPAGE="
+ https://github.com/googleapis/google-auth-library-python/
+ https://pypi.org/project/google-auth/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/google-auth/metadata.xml b/dev-python/google-auth/metadata.xml
index c773411434f1..a81e78d4b7cb 100644
--- a/dev-python/google-auth/metadata.xml
+++ b/dev-python/google-auth/metadata.xml
@@ -8,6 +8,6 @@
google-auth
- GoogleCloudPlatform/google-auth-library-python
+ googleapis/google-auth-library-python
diff --git a/dev-python/googleapis-common-protos/Manifest b/dev-python/googleapis-common-protos/Manifest
index a81aa1ff13f9..340783ce74d4 100644
--- a/dev-python/googleapis-common-protos/Manifest
+++ b/dev-python/googleapis-common-protos/Manifest
@@ -1,5 +1,3 @@
-DIST googleapis-common-protos-1.51.0.tar.gz 35176 BLAKE2B 517004426bb04dc58b85a43fc4268407bbb3a5b6abc1949bda39e03a08a506e727e2bd1741180dc03695b09f4f094c55fe836d275b2c2de146459c399f584355 SHA512 31b6754d5541de4a6ce13e1e54dc54ee29c8153b57de3d0faf40bb236b6af9bee0516957f4b1f64f4404d713e3185126ef782a7825747fede827a8a8e604e303
DIST googleapis-common-protos-1.52.0.tar.gz 39383 BLAKE2B 0b2a21b62c1e48cec91b6fe0d141baa1c1081b621c27d60d0a045932388d8c1b8c1eaee3219cdc3af1919b19358e6ec759e109865367b1b7879b3af05f7ec9be SHA512 470d949379a6aa21875b1c5851de54391847f89136b0b7ee84ac68931388a6294f53be167b6095265b2c2c0f30c7d8c71a4e5a546638670d24a9bd544538ff1a
-EBUILD googleapis-common-protos-1.51.0.ebuild 681 BLAKE2B dc517963dd55216c4782c5bef0b11b34e65b9b036d3f78a8f1e5a158356bded5a3b6351d9a35c35793d32552f593d4f40cd7337e0fa4be02d00d4fd91245ccd6 SHA512 2fc097e384ae7b7a35c4041387d1af7ffb28d9c54515abf9989165851a7d29b3b6c5022a6baeb5c8ce5177db22fb51547a960fb7e8900957554607f84eed8396
-EBUILD googleapis-common-protos-1.52.0.ebuild 683 BLAKE2B db2489f6aa8fc6bd05ea341922ba20e97f373fabb0925bb4c4ef9ef890239d6a11e5eb394f6e90515f0be91a94764b3a8afc39220fe7c271a965df579d73ee6c SHA512 34268347a52c9183f130f39d4ec426bca50290a042d44860a1c48352be1bcb0e8c079dad87a1bd723c9309ed970dc796671af2340c65e06823d09c86b689a5e3
+EBUILD googleapis-common-protos-1.52.0.ebuild 686 BLAKE2B 1d13a60b9c5fbc7ab7dd575cdf1a11c8b381c89d0c295dfb849bf2a95f0732633588f3bd781d0bcbfe6dc27a9d549d3c04b10efed44815ad3f1fab480144495d SHA512 890b4231e6b97ca21f5a857eb122f8b334bcfa08c5febe6bd2beeb1f1d8f5a37821c4188f5319761f827e6f456b503f6dc2378127a476c5acd4d9af78e22c982
MISC metadata.xml 360 BLAKE2B 817566cf751db360e4d4f0a3002c9fc36067c983b197fee5175d63f58f057c58404aab2a14e4d33132e25078d3d7bd2015e1b89a6ba702793015f3b42af0c213 SHA512 c84b7ec502160c9f7d6f79d446474f6684f710579efc9f4471b0499b21902334d4f3d0e1c6b9ab61fec40c6c411a80821b43756d5e59c6e6649aa3af8d452163
diff --git a/dev-python/googleapis-common-protos/googleapis-common-protos-1.51.0.ebuild b/dev-python/googleapis-common-protos/googleapis-common-protos-1.51.0.ebuild
deleted file mode 100644
index cb0e7ec78b9e..000000000000
--- a/dev-python/googleapis-common-protos/googleapis-common-protos-1.51.0.ebuild
+++ /dev/null
@@ -1,27 +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="python classes generated from the common protos in the googleapis repository"
-HOMEPAGE="https://pypi.org/project/googleapis-common-protos/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-
-RDEPEND="
- dev-python/namespace-google[${PYTHON_USEDEP}]
- dev-python/protobuf-python[${PYTHON_USEDEP}]
-"
-
-python_install_all() {
- distutils-r1_python_install_all
- find "${D}" -name '*.pth' -delete || die
-}
-
-# no tests as this is all generated code
diff --git a/dev-python/googleapis-common-protos/googleapis-common-protos-1.52.0.ebuild b/dev-python/googleapis-common-protos/googleapis-common-protos-1.52.0.ebuild
index 1c0536a357ba..aa8c02c50812 100644
--- a/dev-python/googleapis-common-protos/googleapis-common-protos-1.52.0.ebuild
+++ b/dev-python/googleapis-common-protos/googleapis-common-protos-1.52.0.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
@@ -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"
+KEYWORDS="amd64 ~arm ~arm64 x86"
RDEPEND="
dev-python/namespace-google[${PYTHON_USEDEP}]
diff --git a/dev-python/greenlet/Manifest b/dev-python/greenlet/Manifest
index df5e9203162e..104acbbbc244 100644
--- a/dev-python/greenlet/Manifest
+++ b/dev-python/greenlet/Manifest
@@ -1,3 +1,5 @@
DIST greenlet-0.4.17.tar.gz 61381 BLAKE2B fd5b8ed72acd390f3d5fe3ca1d5894bc47278b1f0e04e4fe5c6015c60dfb3109e766dc6072bf85b96760f673a1af08cd546171906800a1221a216899077a908e SHA512 41afd80a6cd5e9cf9c8149016f24d0944d2651288d50094ef04bb6759202903c436af639872d7aab631ed8fe13aad7d4405beb428415b198a3ba30a96d4bd3de
+DIST greenlet-1.0.0.tar.gz 84525 BLAKE2B b5b7094a3dd7b6426fb93fb147077e98e7313700be7a94c221cda3df3bb12f5322f0cea786b77b7b6500e5e97f71ba19b2c32535ccdbdf8a14c3db049cc2850a SHA512 7b615792c340e0eb8ca61bd09bde48ed15110d97254910bd8598312e15adb7267ba795e9e6b52f0998db27d8413d2e1aa9e977511c0d09cd3a5583b37475f882
EBUILD greenlet-0.4.17.ebuild 931 BLAKE2B a2c41e695b3f0015dc839230f12f1b7d597b736772823d3b88333b5c3583b0e21fb995bf3273c551f0255cf8948aa2ef248c95730ee6c869521b23a249ca0ea4 SHA512 001322397287fc8cd64474fc2abe432e6e7ca6d42cc20a0ea27181ae90d503fd3c40112d08cdb394507a7aeb6ff2a4cad585d8e040373ef72177560f44c1fdb1
+EBUILD greenlet-1.0.0.ebuild 678 BLAKE2B 61e2018d3550d818b18f9ebb0236921d534655a8e2ce1655aab5dd3616d4f1babb4d1a935ecb216efe609dff385087a9e8673429507bec78c350f338d07dd5ee SHA512 235cd584f37ac27345949053a9dc78c23b3f9ca0589c125bd92768267ed309eb142bf83c72376ae3be52035ffe325a757ed97f8372b4cc63a319f86d212b91bb
MISC metadata.xml 321 BLAKE2B e625b0c7ecad0e1755cc398a1111c93434bc16c848ba4c15c11551ec1f9367c71a8f1f081409a7f09f5a3c5c6a693d5702fe2d30d371f4c431a6147b817621e6 SHA512 39b920fabdf3e6ca67ead606a859b66dfa19ab532a798755fc9406b850372d238b774ebe82e107e89b4e8e0447e5e48abb259047df62b4cd5009396ecad74548
diff --git a/dev-python/greenlet/greenlet-1.0.0.ebuild b/dev-python/greenlet/greenlet-1.0.0.ebuild
new file mode 100644
index 000000000000..99b9632cbcb5
--- /dev/null
+++ b/dev-python/greenlet/greenlet-1.0.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# Note: greenlet is built-in in pypy
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+
+inherit distutils-r1 flag-o-matic
+
+DESCRIPTION="Lightweight in-process concurrent programming"
+HOMEPAGE="https://pypi.org/project/greenlet/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 -hppa -ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+
+distutils_enable_sphinx doc --no-autodoc
+
+python_test() {
+ "${EPYTHON}" -m unittest discover -v greenlet.tests ||
+ die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/humanize/Manifest b/dev-python/humanize/Manifest
index 5bac5ded31e0..46d2ef1652f9 100644
--- a/dev-python/humanize/Manifest
+++ b/dev-python/humanize/Manifest
@@ -1,5 +1,3 @@
-DIST humanize-3.1.0.tar.gz 54352 BLAKE2B 0e25f4f7f01244f5b24a33c54546c2b2d82e0e069d2cabbe67ff0e5f8e2bc9d3aa2eb7f4d63d4a01dc8ff4ddcfee030b33015ede00d769dfafccb6c2af95171a SHA512 71cb2766a791481f4dc5e02b77357e8e4e7332e533ee055a207cf145f2b2f9041c5bc4ce25f061f0cc1498f37edbc6243f63b888a322c0cf19e5216e120542dc
DIST humanize-3.2.0.tar.gz 53976 BLAKE2B 2e9347418ffa103c6a66583136aa0c79bce669b48fcbc01bf482ba16659af14d4b4a88e78167e8013a8ede6467ed7b7f5eea8f46ed4234294a79b0c63fabd17c SHA512 448919e762e0ecc95f5a7158e0dd8bc028d173ee236be8e15fd0283741af037af1bcdc671ed83b0c16c1998dc0a70debf11cb1c349085530e458bc7aa2f6dde4
-EBUILD humanize-3.1.0.ebuild 693 BLAKE2B b8451a66d9f40936d328a924642399b20dae17bb9ebc9f948b5a72e0229dd2cc242573f4c101200d03aa4a49617dd92b95b7263bc4f508a2ebd43acf05a96b8d SHA512 31bb2793727c00e3e18f69893394535403c7a6841759022e2f15cd508ff8ef57e4600725b3317f72145e570ec215eb61da46c77f313e7b6947d6b842301d142a
-EBUILD humanize-3.2.0.ebuild 706 BLAKE2B ea1f49746655d50b60c5a276328d5a8665e7530c5d0afeb3c1f716b8e62602a05aeeb881725a1599369cd2a9ec60018d3417e82004ad54ffa9e2d21a7b0c6b5c SHA512 3af0ec7f150aa79bdc208fe92fce0337e34c23fcbab0a3743a537c2a606c7997f36b7a3d37c3448058e1638a64c9ec16f7f4d29aecc0c66f1e26a5d1aff3d991
+EBUILD humanize-3.2.0.ebuild 704 BLAKE2B 93977c6337f99c79c87cd80da17011383cb2e9132ab943728e7dc681c00a4d2de703df66bc79b5dc99e0feacce03f963405f1f6ec8143cfdfcf3d38947dc70b3 SHA512 630f2c7e98d6f210b1e8b6b9d8ddefd93c09d57719f73f6a58c12047299bd987ae3b20ab25d247cd4487ba0dbee5c46e617fe74dd67eebdb63c0c6784658a26b
MISC metadata.xml 561 BLAKE2B a7919d3646edc6a4e7c2e13d74b1ae4eb18e16c41d33f27adb2841e80ab12e5d85f42bedab668c1096740e7ed1323e5accac1ba45a78290f0979c55e39c9d682 SHA512 b31a4947368fcbfb0edf93b48f843c49d5209820cf9da1a8aeb8666ab4fffebac765ca4aeb3cf2523837fcfc9c21d858cecaed65002ac23bb9d946a8c818f113
diff --git a/dev-python/humanize/humanize-3.1.0.ebuild b/dev-python/humanize/humanize-3.1.0.ebuild
deleted file mode 100644
index 2ecfbaacf8e2..000000000000
--- a/dev-python/humanize/humanize-3.1.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{6..9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="Common humanization utilities"
-HOMEPAGE="https://github.com/jmoiron/humanize/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-BDEPEND="
- dev-python/setuptools_scm[${PYTHON_USEDEP}]
- test? ( dev-python/freezegun[${PYTHON_USEDEP}] )
-"
-
-distutils_enable_tests pytest
-
-python_test() {
- # The package uses pkg_resources to determine its version
- distutils_install_for_testing
- pytest -vv || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/humanize/humanize-3.2.0.ebuild b/dev-python/humanize/humanize-3.2.0.ebuild
index fa1c2e7585b3..c59ef057f405 100644
--- a/dev-python/humanize/humanize-3.2.0.ebuild
+++ b/dev-python/humanize/humanize-3.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
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
BDEPEND="
dev-python/setuptools_scm[${PYTHON_USEDEP}]
diff --git a/dev-python/hypothesis/Manifest b/dev-python/hypothesis/Manifest
index d827a992eca6..56a23286d3ca 100644
--- a/dev-python/hypothesis/Manifest
+++ b/dev-python/hypothesis/Manifest
@@ -1,15 +1,7 @@
-DIST hypothesis-python-5.41.5.tar.gz 9098660 BLAKE2B 6caa742d34a3a2aeb6c6fdec3f8772e5221e1d0b2becc1362b657d383387f2a1152756222cfe86ffbb3e23a53e395050a16325d74ec9e03822a5c0020505b38e SHA512 b220a48e5746bacc6fa257f79feed0dc2c0a9f66862aba74806fb1ac3d06f380620410c9c46c377c50e4fa7c3171d5b31ce2759e7a3e0e2abd0920b237242dd6
-DIST hypothesis-python-5.43.3.tar.gz 9103991 BLAKE2B e374edf17571c33e48dc8d259db2fb23b9cc358f56189ebd60f3e9141ade7759eede1bdbd91d924f144a20b1ea0b7ec19817559b7f82a90f026ac101a7feeabd SHA512 392fb794fc5ba06acd1e465cf1500f742d8b056148540778f1ec9c5065be66c0f514f0fa6872337869079636c71235d51d4c6722a63b03037b689edd6f09809f
DIST hypothesis-python-5.43.4.tar.gz 9104105 BLAKE2B 08b8c9ac7ac72afcc4556ae2167af7b4ab79d505da8c9f6a11c91d211f26ccf320c8f5ed41458f5e34f75614ad4aecdbf6df62275868dc079c037390dcbc9e08 SHA512 065e1bdd878eab35f38105e8da3f5cf108670a51fd48ea1996bebedf8c8a152386d0eb5284ed43d4e588695a408b3a455a2e4757430e31bb5dbf0ece1f64d294
-DIST hypothesis-python-5.47.0.tar.gz 9101964 BLAKE2B 7f57eebb6f27bf57373f2560612458bf9fd6233f8a9f254e59ced22c070a6f00453036c09b4e224b340843ad5027a9217e83473aaa13c1f94d354408d8d28799 SHA512 6a72469f0c2d0f16ddb56846a96f584104e726e4cd459abe30a744aef20ff50811e00e2a0feb72a3e3e6a3c6c7a7bf15be7c633640350e3bd550ad145c97c693
-DIST hypothesis-python-5.48.0.tar.gz 9102665 BLAKE2B 985957be8e13ada8830bc9c8c3941d8ecec0ef3d3684a177aa4d9cc10c1d57972ddef9f5b35194197ede2d1e5932299a9a99f04eabe6dd8789a786300d1b5608 SHA512 b4d46db6aa9c3dc59f38e209b702580ce9fa0d8771792943cbe28fcca4ea434c23a6f49b9889cb28339d7282e529f1c947a7768c38d726b5e993a2ba3c029e00
DIST hypothesis-python-5.49.0.tar.gz 9103591 BLAKE2B 158cbc38f6f2407d437656a7b94b5826193d427e06eca59d91b3fe85667282ec3392d72e7bbdf2bd952a495871a86814275883e2dcbc80758fcb3e68936d6d20 SHA512 96b7f98e7d87f82dac52a7b2de2bc0c29507cee05ee9a93f838e090e45a9f484ca75db1ab83ab52361b27e4e0f2747914ec09324fc188f6100c3397b1596778c
-DIST hypothesis-python-6.0.0.tar.gz 9103769 BLAKE2B 91ce33c4370530611f1c14abdaf8760a4e40b314ee01bf9536e0ee6b618f1191b0173cf8f65f78fb31ccb23331d5c12779703f94fa85b4d648d9b879762bd8b0 SHA512 c06d95fd889a0560325435787344a5d57041269e5ea4945dac4517ccf04b0b2aa58ae06058937640b208c5433fc0ff3d81c958baca5a5d9100a8f058aeccf41e
-EBUILD hypothesis-5.41.5.ebuild 1854 BLAKE2B f4718705096362bba4308c46dc130c7cfc87488df2e6bd8badce0f25222f747bb8270ab457d49dfa8878cb0b193052cc7d20d7e8a503935ee3b5abe2caabf469 SHA512 ded3f3aa0fe2424f29c3138cf885edccfc98f84659b0a45cada182501865b36384d42bd63ba5cbdad19091e247f17083b4da167ee06a7f5a1bef9a9dee46840d
-EBUILD hypothesis-5.43.3.ebuild 1868 BLAKE2B dbc0309e757938bfc38621183fa804775df68a395e05b2ba01e2ed1c24b28cd2cf94a4d145852d7c6c3157e968b9631464daa9736328bb8787b882bc3e021a61 SHA512 d16e2f08ab141ae378165fa1fcc54f4f354f1aaf9ed63537fcffea8f2e1d451429161078d31452257d9deb7f6ed6069342c0cbbf9c540f39fc5257310766ec14
-EBUILD hypothesis-5.43.4.ebuild 1865 BLAKE2B c41a2e7fbb766e6c836cc8aacd2c24ffb20ec592b99dcb0319ad5c90104257955ade9243e11b8b38242fad6447e5d601dfd17f0130de39d813755aafe8a72d5f SHA512 6d080af7ca4674b970be9d68ef25147ed18624cdb817b70f462a15b5f353c46ff18d4aa6e4ec86aeea7577f7676b9707fd31635ca75d57e8a3090eb3e848a925
-EBUILD hypothesis-5.47.0.ebuild 1865 BLAKE2B 8c34ee228aa6da4a44f7ef2b7f152429109211c5f810068c4a3e5b3f02fda8f866d8044e430d4df38e557b9827a6cad09ecb2e4648e581b612fb320f8ff41e0f SHA512 330a98f11c0c656d166f1faf7ea87b08bf9be1ee91bb18131c28a5135f6be50e930bf71a871d1f8b3f389546a397ca2ba5317ec5192829e8abd2a0b367779f86
-EBUILD hypothesis-5.48.0.ebuild 1865 BLAKE2B 8c34ee228aa6da4a44f7ef2b7f152429109211c5f810068c4a3e5b3f02fda8f866d8044e430d4df38e557b9827a6cad09ecb2e4648e581b612fb320f8ff41e0f SHA512 330a98f11c0c656d166f1faf7ea87b08bf9be1ee91bb18131c28a5135f6be50e930bf71a871d1f8b3f389546a397ca2ba5317ec5192829e8abd2a0b367779f86
+DIST hypothesis-python-6.0.1.tar.gz 9104122 BLAKE2B c4702a2c94fb5ecfc44543b70995150090949067ca986f5671a936d5da651e2e1ed072457ed1238ae04549709019722f7501ff7c2a37c46da3d25b43fa416b08 SHA512 3981a40ba61ca38140582f46b1ebb1ac2fc0816e8210c37ddc91249515d035534208c6ba926f367607bbd79792383eb166c1f4710a8a5ba5e04876383ac44644
+EBUILD hypothesis-5.43.4.ebuild 1857 BLAKE2B b8c5bbbb3fcc96f25163d3c342bd50acd8cc3cdb3aa07b412ae0ef85bdd848a223534c7e32157b90a94825734420d29f5da86f5b0a7408e0d8579bd614c345ba SHA512 ef10894c2b3e2e7a5318aa32130ee145cc9948f9fa5abe592350d741233a2a75b536279fcdbdb07327cfdc9eac39785382e63de45ccdd593d24d9432a1aaec79
EBUILD hypothesis-5.49.0.ebuild 1865 BLAKE2B 8c34ee228aa6da4a44f7ef2b7f152429109211c5f810068c4a3e5b3f02fda8f866d8044e430d4df38e557b9827a6cad09ecb2e4648e581b612fb320f8ff41e0f SHA512 330a98f11c0c656d166f1faf7ea87b08bf9be1ee91bb18131c28a5135f6be50e930bf71a871d1f8b3f389546a397ca2ba5317ec5192829e8abd2a0b367779f86
-EBUILD hypothesis-6.0.0.ebuild 1865 BLAKE2B 8c34ee228aa6da4a44f7ef2b7f152429109211c5f810068c4a3e5b3f02fda8f866d8044e430d4df38e557b9827a6cad09ecb2e4648e581b612fb320f8ff41e0f SHA512 330a98f11c0c656d166f1faf7ea87b08bf9be1ee91bb18131c28a5135f6be50e930bf71a871d1f8b3f389546a397ca2ba5317ec5192829e8abd2a0b367779f86
+EBUILD hypothesis-6.0.1.ebuild 1865 BLAKE2B 8c34ee228aa6da4a44f7ef2b7f152429109211c5f810068c4a3e5b3f02fda8f866d8044e430d4df38e557b9827a6cad09ecb2e4648e581b612fb320f8ff41e0f SHA512 330a98f11c0c656d166f1faf7ea87b08bf9be1ee91bb18131c28a5135f6be50e930bf71a871d1f8b3f389546a397ca2ba5317ec5192829e8abd2a0b367779f86
MISC metadata.xml 755 BLAKE2B da1fcfe4509905d2058d448b0178dacbb87026a3542368d8aa3ffca38edf1cd3d76d9542f8badc0220f5b5c916fdbb054f65b054a361977e0258e475768e3cf3 SHA512 3f046788581ef05937ec8376538cc60628f9d8e25486fc6e4421dd8461a9a085f51540e1d5203ccf85007adf1a978a23da9ac39cc486d698967412eeb3f2a793
diff --git a/dev-python/hypothesis/hypothesis-5.41.5.ebuild b/dev-python/hypothesis/hypothesis-5.41.5.ebuild
deleted file mode 100644
index ff300152f968..000000000000
--- a/dev-python/hypothesis/hypothesis-5.41.5.ebuild
+++ /dev/null
@@ -1,64 +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="threads(+),sqlite"
-
-inherit distutils-r1 eutils multiprocessing optfeature
-
-DESCRIPTION="A library for property based testing"
-HOMEPAGE="https://github.com/HypothesisWorks/hypothesis https://pypi.org/project/hypothesis/"
-SRC_URI="https://github.com/HypothesisWorks/${PN}/archive/${PN}-python-${PV}.tar.gz"
-S="${WORKDIR}/${PN}-${PN}-python-${PV}/${PN}-python"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos"
-IUSE="cli test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- >=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
- >=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
- cli? (
- $(python_gen_cond_dep '
- dev-python/black[${PYTHON_USEDEP}]
- dev-python/click[${PYTHON_USEDEP}]
- ' python3_{6..9})
- )
-"
-BDEPEND="
- test? (
- ${RDEPEND}
- dev-python/mock[${PYTHON_USEDEP}]
- dev-python/pexpect[${PYTHON_USEDEP}]
- >=dev-python/pytest-5.3.5[${PYTHON_USEDEP}]
- dev-python/pytest-xdist[${PYTHON_USEDEP}]
- !!= 3.8
-PYTHON_COMPAT=( pypy3 python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Read metadata from Python packages"
-HOMEPAGE="https://github.com/python/importlib_metadata"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-RDEPEND="dev-python/zipp[${PYTHON_USEDEP}]"
-BDEPEND="
- dev-python/setuptools_scm[${PYTHON_USEDEP}]
- test? (
- >=dev-python/importlib_resources-1.3.0[${PYTHON_USEDEP}]
- dev-python/packaging[${PYTHON_USEDEP}]
- dev-python/pyfakefs[${PYTHON_USEDEP}]
- )
-"
-
-distutils_enable_sphinx docs dev-python/jaraco-packaging dev-python/rst-linker
-distutils_enable_tests unittest
-
-python_prepare_all() {
- # Skip a test that requires pep517 which is not in the tree
- sed -e 's:test_find_local:_&:' -i tests/test_integration.py || die
-
- distutils-r1_python_prepare_all
-}
diff --git a/dev-python/importlib_metadata/importlib_metadata-3.3.0.ebuild b/dev-python/importlib_metadata/importlib_metadata-3.3.0.ebuild
index 7fe2947b8391..735940b84dd7 100644
--- a/dev-python/importlib_metadata/importlib_metadata-3.3.0.ebuild
+++ b/dev-python/importlib_metadata/importlib_metadata-3.3.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="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
RDEPEND="
$(python_gen_cond_dep 'dev-python/typing-extensions[${PYTHON_USEDEP}]' python3_{6,7})
diff --git a/dev-python/iniconfig/Manifest b/dev-python/iniconfig/Manifest
index 398848677f2d..09ec4f8edbc4 100644
--- a/dev-python/iniconfig/Manifest
+++ b/dev-python/iniconfig/Manifest
@@ -1,6 +1,3 @@
-AUX iniconfig-1.0.0-pytest-5.patch 1809 BLAKE2B ccb4383f447f84a88cb020daf0b17ae626c627ce46424ba89591e1feba8ba38b48877e0cac83cef8792cafe283e632cdcec358f6d3929146cc67d2da57848233 SHA512 347295b050cc31108ee013a20dd1135f42a85636d83fba19d509a09856e50ad9343074b965e3b80306a9b73bfcda4c5197800ed3c2e5cba8432d26c5397a135f
-DIST iniconfig-1.0.0.tar.gz 7807 BLAKE2B a77c4d8c6f549db911110505ac5a367be5175adbb580211d4aded14d1108e189fd6d6a229ac4e0e742baafa9b037d58c2bbc810897c8b274c07493c518ef752e SHA512 639a4e765637110f69627fb18a5e719b6d648e5549fd857168183d97da7880434d447c9af1e254dd2aa5d0e36cbd3f5c4ffabf8a949ed3d6294002e7e1b2f6e1
DIST iniconfig-1.1.1.tar.gz 8104 BLAKE2B 31301484887018a6aa75c944e2f8643f85b2433534ae46a8da893a113f2376eca14cbee88095a3784d1c52f26d4c748260c1df59c46b8f94cd342038f93242e8 SHA512 c9341db7e3ec2204b6a674fca7824cbeb492e3576d5ac3f084b234c82842b28f2f6acbfdb812e183f4334a95b990551f942a4caf548f5ce7ef14885f931535ee
-EBUILD iniconfig-1.0.0.ebuild 581 BLAKE2B c84511fef6516d9dc2945aab1ea72ab9463dba852a987a4b4cb52b541589f26965a4fe5aa402b7b9ad07c0cdf24f7bc0804a9aecfca6bd84935627243525ffcd SHA512 2f72e8be6e27000637cc4920e667c277e35483d75fd5c712c92a6f4ae3f720ff732e0f29e65947b446f24e50de8f319c0949a25b1cdf5c5b753270dcbfb1c97c
-EBUILD iniconfig-1.1.1.ebuild 536 BLAKE2B a52c461adbd916197518d1b0f8171791d74c29cd5d62bbbb6b31552f244faac1ad4d1d50c299fe016712213e62d9df60d56f3ad3983507058aa6119f04e09753 SHA512 c26851eebe8d527b3435c2098075d003412b87b5c3863e7f0ffce0016069bf47c1a18aebf9660c2692d318b63a02137165bd7b83ec077ab88b85566d07f3bf32
-MISC metadata.xml 290 BLAKE2B 2ce3db3ab43e55c8d7cdb33ef6c04d0242b80927b9b363ae5e0ca3435c4984455cd3c711b50e5e8e1dcef50b814fdff0fa3c82a6eb2fb8199fc2ddb9949dd9f4 SHA512 878fc9a22e172b52509babcafd133caefa1f86153b877641a13447409dd8c0f28d507e71a01587887ee1d01dd5b609e0189cedcd43eaaf519934223c3890b05f
+EBUILD iniconfig-1.1.1.ebuild 534 BLAKE2B d6840ab0476492532db733c6f122745a531e710f3b067d2e906edb05375194583cd5c10ec55515d14992dd5319c1a06c2bb956a6703a72c478446af39e807358 SHA512 c7c1a749779f33f04612c08f3310b5cbbb4f5b9878a6f5cbeb209666820f4d2c41e26462dba856b4d039c44d6411035530c6f84ec4545edea6e371cb022278bb
+MISC metadata.xml 314 BLAKE2B 4d711ba8f750f4c66f8a5131c8d0549d8e13099fef027a4b2267f6bff083283b06d80e9650acf6d8df819fe3be27fe6f18d24dadfc85aab266064d43c32fb863 SHA512 7b1ec3fe73060f3145298dd94d741f7998a9372da8ac16290a25bcddb88d9c5780b4c93fdbf439ebee8ef19b147d41145640a9483af4d4554a6c6f5761f72992
diff --git a/dev-python/iniconfig/files/iniconfig-1.0.0-pytest-5.patch b/dev-python/iniconfig/files/iniconfig-1.0.0-pytest-5.patch
deleted file mode 100644
index f8fca367b342..000000000000
--- a/dev-python/iniconfig/files/iniconfig-1.0.0-pytest-5.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From da205253f0d78204900ec82b6cb2cb0afd9f1254 Mon Sep 17 00:00:00 2001
-From: Stanislav Levin
-Date: Thu, 8 Aug 2019 19:43:12 +0300
-Subject: [PATCH] Fix Pytest 5 errors
-
-This fixes
-"""
-pytest.PytestDeprecationWarning: raises(..., 'code(as_a_string)')
-is deprecated, use the context manager form or use `exec()` directly.
-"""
-
-Fixes: https://github.com/RonnyPfannschmidt/iniconfig/issues/6
-Signed-off-by: Stanislav Levin
----
- test_iniconfig.py | 12 +++++-------
- 1 file changed, 5 insertions(+), 7 deletions(-)
-
-diff --git a/test_iniconfig.py b/test_iniconfig.py
-index 27fd53f..fe12421 100644
---- a/test_iniconfig.py
-+++ b/test_iniconfig.py
-@@ -150,27 +150,25 @@ def test_iniconfig_from_file(tmpdir):
- assert list(config.sections) == ['metadata']
- config = IniConfig(path, "[diff]")
- assert list(config.sections) == ['diff']
-- py.test.raises(TypeError, "IniConfig(data=path.read())")
-+ with pytest.raises(TypeError):
-+ IniConfig(data=path.read())
-
-
- def test_iniconfig_section_first(tmpdir):
-- excinfo = py.test.raises(ParseError, """
-+ with pytest.raises(ParseError) as excinfo:
- IniConfig("x", data='name=1')
-- """)
- assert excinfo.value.msg == "no section header defined"
-
-
- def test_iniconig_section_duplicate_fails():
-- excinfo = py.test.raises(ParseError, r"""
-+ with pytest.raises(ParseError) as excinfo:
- IniConfig("x", data='[section]\n[section]')
-- """)
- assert 'duplicate section' in str(excinfo.value)
-
-
- def test_iniconfig_duplicate_key_fails():
-- excinfo = py.test.raises(ParseError, r"""
-+ with pytest.raises(ParseError) as excinfo:
- IniConfig("x", data='[section]\nname = Alice\nname = bob')
-- """)
-
- assert 'duplicate name' in str(excinfo.value)
-
---
-2.28.0
-
diff --git a/dev-python/iniconfig/iniconfig-1.0.0.ebuild b/dev-python/iniconfig/iniconfig-1.0.0.ebuild
deleted file mode 100644
index 89b47a779d41..000000000000
--- a/dev-python/iniconfig/iniconfig-1.0.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6..9} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="Brain-dead simple config-ini parsing"
-HOMEPAGE="
- https://github.com/RonnyPfannschmidt/iniconfig
- "
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~x64-macos"
-
-BDEPEND="dev-python/setuptools_scm[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-PATCHES=(
- "${FILESDIR}"/${P}-pytest-5.patch
-)
diff --git a/dev-python/iniconfig/iniconfig-1.1.1.ebuild b/dev-python/iniconfig/iniconfig-1.1.1.ebuild
index 32d95992678b..5733655e09f4 100644
--- a/dev-python/iniconfig/iniconfig-1.1.1.ebuild
+++ b/dev-python/iniconfig/iniconfig-1.1.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
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~x64-macos"
BDEPEND="dev-python/setuptools_scm[${PYTHON_USEDEP}]"
diff --git a/dev-python/iniconfig/metadata.xml b/dev-python/iniconfig/metadata.xml
index 7b11afae1bb5..6e6146bc1198 100644
--- a/dev-python/iniconfig/metadata.xml
+++ b/dev-python/iniconfig/metadata.xml
@@ -4,6 +4,7 @@
python@gentoo.org
+
iniconfig
diff --git a/dev-python/lit/Manifest b/dev-python/lit/Manifest
index dbb3d3e16958..11f969846065 100644
--- a/dev-python/lit/Manifest
+++ b/dev-python/lit/Manifest
@@ -1,10 +1,12 @@
DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151
DIST llvmorg-11.0.0.tar.gz 122743665 BLAKE2B 3f95570240789fd68ddb747df817f5c6cdc9da40911bbe9ee3531c15ada9165e5002b1c2f778cf8735858485ea05a8754e3d3a5f4b15bdd6cb33d64a14692984 SHA512 b6d38871ccce0e086e27d35e42887618d68e57d8274735c59e3eabc42dee352412489296293f8d5169fe0044936345915ee7da61ebdc64ec10f7737f6ecd90f2
DIST llvmorg-11.0.1.tar.gz 122790338 BLAKE2B 0130996b4a8c4d9f757136fd7fb318068c9bfdc565060dec0d4336480c4ab66c4ae3185a7fdb05f13cf9ee8fd4123b09df938881b75d6e5d3689595114b7e32a SHA512 f5e6ef0b3111aae08a89cd01adb2ff4abfa9ef779c68b9190421d0447efd25c2cc00e5aae9f4764805f5fa31434866043d1510ae7389817e28ae53a5442e2fdf
+DIST llvmorg-11.1.0-rc1.tar.gz 122793491 BLAKE2B f4777455f5903cffea284eaffd872be6c287c6c1ebbd0c4b5b5473f146d7f5476f3551998a58d3e976ab90cde7b0d05db2b3be97f4e8e2c3474755ff38739268 SHA512 44e281486c44fa1611042ab658b9833a75f9613b7f896863613cfb99de66d13607fb1e9064f42ea3d89ca7951113465a90fd96ca4544262f165f78bd5261f5a8
DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
EBUILD lit-10.0.1.ebuild 893 BLAKE2B e23af1f7a6d50e660ccf67a800375129465f3fc0c89e0be4e8013318ba9882df788baee745ddc9e932e1d42664cefbc5b08c1ec550a162a3d1ea39e1f22e66b0 SHA512 20206b54df19decdcc35112630b734351a9aafc2093f8ea3b5a57baa2db822bc3583252fe784d8af4ca729a0ee5f0cb1ec53e2eba85e94e21cd7b6c4d80e5302
EBUILD lit-11.0.0.ebuild 900 BLAKE2B 0224887621d00008b892a1549721c41e7495ea3ed80a34895ecdcd117b48be5d88607b1ab5a31c0e8441691c91ebd6b19ace2ac6e8ba919dde8fc8ba9b12ce27 SHA512 e418060f8cdc1654aa5be2345ff65c47aef24257ece4682092ae4c2663d68ef7ac9836491a79f6a4c084c6f3ad4419dc17ce0ff2f252dc1da1c8e5e1c3cb2d10
EBUILD lit-11.0.1.ebuild 906 BLAKE2B 708d74537d3170a4eda560384480fecc6de33ab02d8ded6ecb2b0699c3b62cb18eb4f4fe6360423025420f7e7b92c0a6bc90eec5585fd3b6fa5500daa7a96e67 SHA512 f23fffc23b04481a3d25d71d60ae15b058222b625cec4c39c08df8421e029c9ff5065644d1aacb0cb517972365fd5d0ed6b48ddbea329b4d3e4cf17c3df220a7
+EBUILD lit-11.1.0_rc1.ebuild 869 BLAKE2B ef1981c3ebc7769f58971abac2b5fda03b7c8cb18e6a75f73dff3e6be01a84b0bd43049cb9a88698284497f94b83c7189ac7221a11ac79829f0e973d14c6c94d SHA512 817ad57cd29b8321ea5768015f468b674262eb60cee2f82353b341b504ad66f0c4169278c6668cb2e8591dc8319def2314a1ec6d38aaf87e60b3e48f38cda7a8
EBUILD lit-12.0.0.9999.ebuild 869 BLAKE2B 0338f86d2256fc370fc708e65482eccdc101917726ffaea02dbea297d114e52abfda416673cc94f8029671c705396d36321518c080d38cdd5ee68691a5854136 SHA512 54c0401c0d4b07ba0cf2fa4b69975a58d2fab218bf7925488637069844d8e891eca2d76806d4a12ee26b04030d0f8e5d68d034264469620d95c880e867d90d3d
EBUILD lit-9.0.1.ebuild 861 BLAKE2B c4d1a504e922e182102538cc19ea99683500c533af440179bbc99f22aa21558585a7d4f6bdc8ca4159c2300150ffedba1cc980c448fbf5f146d4168e65a3c9e7 SHA512 7916fc0e882021c5b3bf21b4b565e73e83380d9c221b61b31af0acb5939ee3413a1a6638f7328b0815081316300b78836273ba20448b4d8c9d5baf73278184d9
MISC metadata.xml 282 BLAKE2B 36e6403814edc8e79eca456ef9648a7b261f79d4823082a8dce876127b11bf89182dabb02e58b2a42dec3cf9e21fe2f5c474ee4a8416213901f82cfc481ffcda SHA512 fa292059e410ff5e751980c5f5b0145c579b373d77970b797850c3d92641bbcf27b2c18a33d665e76e59553ba7dcc124ae09ec34fcaab4b2caed74248ace0e57
diff --git a/dev-python/lit/lit-11.1.0_rc1.ebuild b/dev-python/lit/lit-11.1.0_rc1.ebuild
new file mode 100644
index 000000000000..cd8a5985d342
--- /dev/null
+++ b/dev-python/lit/lit-11.1.0_rc1.ebuild
@@ -0,0 +1,40 @@
+# 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..9} )
+
+inherit distutils-r1 llvm.org
+
+DESCRIPTION="A stand-alone install of the LLVM suite testing tool"
+HOMEPAGE="https://llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0"
+KEYWORDS=""
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+# Tests require 'FileCheck' and 'not' utilities (from llvm)
+BDEPEND="
+ test? (
+ dev-python/psutil[${PYTHON_USEDEP}]
+ sys-devel/llvm )"
+
+LLVM_COMPONENTS=( llvm/utils/lit )
+llvm.org_set_globals
+
+# TODO: move the manpage generation here (from sys-devel/llvm)
+
+src_prepare() {
+ cd "${WORKDIR}" || die
+ distutils-r1_src_prepare
+}
+
+python_test() {
+ local -x LIT_PRESERVES_TMP=1
+ local litflags=$(get_lit_flags)
+ ./lit.py ${litflags//;/ } tests || die
+}
diff --git a/dev-python/mkdocs-bootstrap/Manifest b/dev-python/mkdocs-bootstrap/Manifest
index c65d9a6ca8dc..c50cdd73dae5 100644
--- a/dev-python/mkdocs-bootstrap/Manifest
+++ b/dev-python/mkdocs-bootstrap/Manifest
@@ -1,4 +1,3 @@
DIST mkdocs-bootstrap-1.1.tar.gz 233231 BLAKE2B 64470a4e5ca6d44976944c16244daaefa99702fa68d68fb14e31201fcfd5f927dc2b962fd0b1967a6fd7eec8719389a78dd13cbfcdc387fa6de5f21c9c1a4960 SHA512 a494afa614f96771fbc640862b5cb5674d4eb5c978a56e86e2f523137fed315808067f20cfadca463cbeb5384de062c91001b6eaf5f3ebdce329f167b461d2b5
-EBUILD mkdocs-bootstrap-1.1-r1.ebuild 469 BLAKE2B 97fab41002010319a3e9efa89abb991c8877a4467761c24c41d55fea785698169dfeef69627b30d74d5bc6fc7d7c184bd01b0a1e97188768dc987b1ea00ab822 SHA512 ffb7d14d89fc8e93a42a2925de3e54a2eddfe9c87b6fdd0a1d0edf7f4f3dca26e23223312bb0e6fd69b7f3665d730920515df13ccd40d4590b530f81301fca35
-EBUILD mkdocs-bootstrap-1.1.ebuild 681 BLAKE2B 09261a96412e41a75d59e096c2d209bd4751f33d1d472725c27ea4aaa7a8fd1d16a7b6ee3c51a617368dbea6a7fe6133d23ca54f518975f55e3f67115150d8a8 SHA512 9cc237da10d39e465792afad64fb5cad41f9cdc6222e714b84066a791e68af569067cfb9a8185e4b392b05f6dde7e015ee1dffb5b8054b2e67cf7a8838bcc3fb
-MISC metadata.xml 517 BLAKE2B 5ec9b229c40f371ee85312cc7617c48fa57aa6e119b246ff19b11c6476d65ff0412f2749b7135d398284f9cf60addf329a45589b4dc3c59e6b202046198f01fb SHA512 767109c07e26d63e55d90be4f4dbc227fdf26e828d329b4e52adb20749d3435dcb671ce83fbfa529ff72998b1723635e426949dc8598fb022b3f8a03a3c588f7
+EBUILD mkdocs-bootstrap-1.1-r1.ebuild 467 BLAKE2B f9273fb6714330aef9d62e73ec81901feb72c65f2b61567eb23bda0d3a5a73129e0dfe3538a1e62afbe272a3af76d64c5aa497fa9c24431fe44ec07f571c699e SHA512 50eabf43f13746ae5e063b769679cefb4a6385ba2d47576e373a1b768ca66c8596d4f7627c396183dfd0d9476554bfb5523d1b3be1270e34abd0ca300cc9860f
+MISC metadata.xml 541 BLAKE2B 3e39a72b66c3d58605e6600f8f3b1c82111e49a2e9bf2bdabac3db591d0a75607063f27b53f45203010f591a575de5fb101d789a67b1929f75bb4a0ddc223773 SHA512 6c2211d7d2bfab79690338ee531faa0ce53057ce034351e3e89c12e6d7a7be6855cab6db2889f314edf47dbfc203e5cd70af3d426ae3250dd46b5553188d657b
diff --git a/dev-python/mkdocs-bootstrap/metadata.xml b/dev-python/mkdocs-bootstrap/metadata.xml
index 6e06cfa5f1f8..f07ab710ca25 100644
--- a/dev-python/mkdocs-bootstrap/metadata.xml
+++ b/dev-python/mkdocs-bootstrap/metadata.xml
@@ -9,6 +9,7 @@
proxy-maint@gentoo.org
Proxy Maintainers
+
mkdocs-bootstrap
mkdocs/mkdocs-bootstrap
diff --git a/dev-python/mkdocs-bootstrap/mkdocs-bootstrap-1.1-r1.ebuild b/dev-python/mkdocs-bootstrap/mkdocs-bootstrap-1.1-r1.ebuild
index 7d7ccbe6b6ba..7cc9163d3e0a 100644
--- a/dev-python/mkdocs-bootstrap/mkdocs-bootstrap-1.1-r1.ebuild
+++ b/dev-python/mkdocs-bootstrap/mkdocs-bootstrap-1.1-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
@@ -15,6 +15,6 @@ SRC_URI="https://github.com/mkdocs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
DEPEND="dev-python/mkdocs"
diff --git a/dev-python/mkdocs-bootstrap/mkdocs-bootstrap-1.1.ebuild b/dev-python/mkdocs-bootstrap/mkdocs-bootstrap-1.1.ebuild
deleted file mode 100644
index 302d16ab5fd3..000000000000
--- a/dev-python/mkdocs-bootstrap/mkdocs-bootstrap-1.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="Bootstrap theme for MkDocs"
-HOMEPAGE="https://www.mkdocs.org https://github.com/mkdocs/mkdocs-bootstrap"
-SRC_URI="https://github.com/mkdocs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-IUSE="doc"
-
-DEPEND="dev-python/mkdocs"
-
-python_compile_all() {
- default
- if use doc; then
- mkdocs build || die "Failed to make docs"
- # Colliding files found by ecompress:
- rm site/sitemap.xml.gz || die
- HTML_DOCS=( "site/." )
- fi
-}
diff --git a/dev-python/mkdocs-bootswatch/Manifest b/dev-python/mkdocs-bootswatch/Manifest
index e7e8db0680c2..2750fea25ca4 100644
--- a/dev-python/mkdocs-bootswatch/Manifest
+++ b/dev-python/mkdocs-bootswatch/Manifest
@@ -1,4 +1,3 @@
DIST mkdocs-bootswatch-1.1.tar.gz 1514738 BLAKE2B 0ee80c7816a1a8d6c8e09494f3e07d94cfa8fd1fe8d4dfdd44c55974edf9811be20c22a6aa0424b07f21ca89764e1c15617cc43aaa1a6503365b237905f010e6 SHA512 1a3305434a11aa5dbb79b6a9e7162ddb458f987f44f2e48bcf74776e6ef33d172b2f38e6b46c288401af344386f62d9c814d015be70d38f66b7635ff87bdbdb3
-EBUILD mkdocs-bootswatch-1.1-r1.ebuild 472 BLAKE2B 46e69979231cf4da365f3d67af8c5cf82f2291963253727649f88c43046ee4bef64d578cb6579b418f108ecde5cc5dd667f3daff44b7e311855f61461db26284 SHA512 ab56b80d19caf52350d7ed3011f39543a1819961528f8311cac6d3bfa9ecc254fbc56d4b134817dc66b3e64c4fe4ac31e7b48d965258f1d87c13527cd4a5d85b
-EBUILD mkdocs-bootswatch-1.1.ebuild 684 BLAKE2B ce0a229db0818af7450d2711a789f1ebdd7fd779aecc705a09ec9f69b7549439a95dc431ef25828ebfc83a1987b786426cff17d9ad1324074a85b6e0dd8d0445 SHA512 933427ef910927f7fbc0d688f1cd90184985533f37d4923f17ebfc3428fe6dbdcd60e8db14c6f323f255a5f444cb774a2f23f7eb4b556a0c0f450155d09e9476
-MISC metadata.xml 519 BLAKE2B e70f9963c86a54c5cdda25d71bc42a81ea0549500bb1d7484b99bd578652f2fe130ae203ba5d54f199f972309ddec739cfd63e9355387dd81cdb248ecaeedebd SHA512 b80a906addf6c39025c1233c4118686b4bc5945a399515271fb32bf7b9eefa2440ef8c67137af16a5fe2ba91b490afb6af4c8f09325e09910e414b6a07182ead
+EBUILD mkdocs-bootswatch-1.1-r1.ebuild 470 BLAKE2B 5610975b73e4d4e9e70118f41164fff1d09056d2b370b367a3adfc8f9f35ac0d35565c21309eadc1c848f059f1f6c2ef0752e3bb211d5768be47a7dec7e2d3e1 SHA512 910a649a67671281c991c7eaceb45710e32a171eea711a541b0197e5e4299f53da54ec0ce356f68215c36a111c109321f8a4d971406d287decf1a5b93952d94f
+MISC metadata.xml 543 BLAKE2B ede63e47862c51e9a6bb05a99dfb0ac652ca0769a63a99aa44d84aa76052c600cfae5aa3a234956c7b5a31956f4860cd24ba54667dffbd9e1413abcd3bdcde0c SHA512 0b1834c6d4350246bdf437d980081cb826d3e9085a3e532385b89c8c84a946ede96120587856b023709e0f25e9af5c586ef494a970fdb089f50c4fee58c3fdd8
diff --git a/dev-python/mkdocs-bootswatch/metadata.xml b/dev-python/mkdocs-bootswatch/metadata.xml
index af2e042302e1..a28fbda87e67 100644
--- a/dev-python/mkdocs-bootswatch/metadata.xml
+++ b/dev-python/mkdocs-bootswatch/metadata.xml
@@ -9,6 +9,7 @@
proxy-maint@gentoo.org
Proxy Maintainers
+
mkdocs-bootswatch
mkdocs/mkdocs-bootswatch
diff --git a/dev-python/mkdocs-bootswatch/mkdocs-bootswatch-1.1-r1.ebuild b/dev-python/mkdocs-bootswatch/mkdocs-bootswatch-1.1-r1.ebuild
index bb9630d5c055..05229c21adc8 100644
--- a/dev-python/mkdocs-bootswatch/mkdocs-bootswatch-1.1-r1.ebuild
+++ b/dev-python/mkdocs-bootswatch/mkdocs-bootswatch-1.1-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
@@ -15,6 +15,6 @@ SRC_URI="https://github.com/mkdocs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
DEPEND="dev-python/mkdocs"
diff --git a/dev-python/mkdocs-bootswatch/mkdocs-bootswatch-1.1.ebuild b/dev-python/mkdocs-bootswatch/mkdocs-bootswatch-1.1.ebuild
deleted file mode 100644
index 3302fe197dba..000000000000
--- a/dev-python/mkdocs-bootswatch/mkdocs-bootswatch-1.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="Bootswatch themes for MkDocs"
-HOMEPAGE="https://www.mkdocs.org https://github.com/mkdocs/mkdocs-bootswatch"
-SRC_URI="https://github.com/mkdocs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-IUSE="doc"
-
-DEPEND="dev-python/mkdocs"
-
-python_compile_all() {
- default
- if use doc; then
- mkdocs build || die "Failed to make docs"
- # Colliding files found by ecompress:
- rm site/sitemap.xml.gz || die
- HTML_DOCS=( "site/." )
- fi
-}
diff --git a/dev-python/mock/Manifest b/dev-python/mock/Manifest
index f1da0909d1fa..dbf13728cced 100644
--- a/dev-python/mock/Manifest
+++ b/dev-python/mock/Manifest
@@ -1,5 +1,5 @@
DIST mock-3.0.5.gh.tar.gz 67887 BLAKE2B b9c49b3627275889d73aff9ea9c7925093f9cafb304448b2f06eda2fff26152a031aafb4844537e4d58bc112709e59a44e08d32602776386a30d039743def29c SHA512 9ab4f0c794f5701ba1367d982cf79a5662d4233753d12ed9c88ae20282db1f44be73f84c4d9f6d03ff64926b8c1b6d0c9a79b2a4724a3eb36c247ffd4ab03e2d
DIST mock-4.0.3.gh.tar.gz 80318 BLAKE2B bc0dc8b97129eaa2f0f9c89898157ea5de398f59f4e2ebc07318cf745b74d1f1bcc989774600ec88ce1956f9fe16f9464f101ea5df5cd23b3a58b432d19feb8a SHA512 adfdab253eb3bc1b6cb767c58ffa3a8a5c5f88da0f04ea6680e0d87da59177972d2d99bfe0a770ac2ed4f809ca6a090a9d0f789eea8f4365ef2c54f8e8792e89
EBUILD mock-3.0.5-r2.ebuild 1480 BLAKE2B f1d156fb43b69ee9c8aaafd77c8d0179b43e3e8ea14a53d61b1e82799d7ef4e388039564fe39f9fae67e31c39c546850ef85f13f5e3f9b8c84807bb3300316cd SHA512 ba39fad32df534db43a31031485e3ddebafa314a2ac26d168f40822f5d6bedc8d4811c16de2cadf9b39fd7ca70735087126d88f1645c962aa95f1e0dcf9f27be
-EBUILD mock-4.0.3.ebuild 1682 BLAKE2B e2fd5eb9736dd3c7b70a91d2c7b983707b5fc71393ea9caafeb3a35c75e5298c6453175b92f5cdef18b2a18f057da332872a2c936477f67ec5910a567012dc37 SHA512 63e76153b85ec64187806491f969f171bb3c56aee189b0ae8bf01cef6f9cecc79e11451f5c2264070b28c1f0a0225223e65c81de6d0b5e3a9f38e15ba0a174fe
-MISC metadata.xml 365 BLAKE2B 80ce989b7585192744838e804490286b598d6a4e082a2e88fce1efdc34c3ef3185478fa6ce3f08c81dd680c62b4de0c7eff3fe7c926d96479ab856aa46c69250 SHA512 89eda97d1f0ece91d573a9fc4fb5d357733b757b1214a56c7bb14a10f84e1c275d2cc49ed773597c4e320df03f751fb093fef7f3805deb450380df4dd83d875f
+EBUILD mock-4.0.3.ebuild 1673 BLAKE2B 7574624d4c992787b2d9665da75bee9e0f4c77234bb8fe687c3cecd6746ff875c5d6e8bcf29aa124e6e4255ed1c665cc5c6dee047729008d2c34f08c787eb16e SHA512 dec85e07d6629a7558fbfa5da5f7a2b9d25639b0c1171f4e6b3d71766aebe6022a7b1ad5daddbb3d4a5bc43d83175ea727e5c7e6a24384dc2c4ae71685fd23a1
+MISC metadata.xml 389 BLAKE2B 0663f612b893e4f8dd7b7e28c624c5abaf1f3bcd1fc2f454e5dceed971f8b9ca9f3ab32f2ba51eaf88572e6178eb87669b98bcf852d731fac4c077d10cc89ef7 SHA512 e142011c0f4c7b3ea4eeac1c0431e3d3df8eea803dad50ae5dd0184e0fe070b009b9a1e6933e7a298751091dac4972f10adfbd6bbf713b36a28ad8f4b29f2a66
diff --git a/dev-python/mock/metadata.xml b/dev-python/mock/metadata.xml
index ab357a34d6e4..c0e1d1d2a919 100644
--- a/dev-python/mock/metadata.xml
+++ b/dev-python/mock/metadata.xml
@@ -5,6 +5,7 @@
python@gentoo.org
Python
+
mock
testing-cabal/mock
diff --git a/dev-python/mock/mock-4.0.3.ebuild b/dev-python/mock/mock-4.0.3.ebuild
index d658150ed21e..d6af420ec4b9 100644
--- a/dev-python/mock/mock-4.0.3.ebuild
+++ b/dev-python/mock/mock-4.0.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
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/testing-cabal/mock/archive/${PV}.tar.gz -> ${P}.gh.t
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
RDEPEND="
$(python_gen_cond_dep '
diff --git a/dev-python/mongomock/Manifest b/dev-python/mongomock/Manifest
index ec8b6d8edf23..0c22ba69a509 100644
--- a/dev-python/mongomock/Manifest
+++ b/dev-python/mongomock/Manifest
@@ -1,5 +1,7 @@
DIST mongomock-3.21.0.tar.gz 116340 BLAKE2B 5f6ff23bce50e2104a7772dd692e6341398b2fe4b8be07391285074e680661228ec50368e437fec201fb62eaafb5fa588c2cf27f9554602403fea3cf0eaabc55 SHA512 777d5eb7a4ffb2caa569149c600c0eb3bde2737d734f0f934787ee10af571771be201c9cb44b3464ef550e48c035de3ed31cabb2ddac9c0cb864516256cf5c2f
DIST mongomock-3.22.0.tar.gz 118915 BLAKE2B 98c90684a58e582601acdb2f112a4d1fbfe043f979b9b07b12649a2928fc813c0d11c8a51851b0fa87c5fdc8615c0b923b36d2557e82bcd8f668a3cfdc03a2e1 SHA512 1033d95620a5a212a698f8f0f90679a1cae7c7fca97448ab7cff223db2cf45a230d4d5c863aecd20445bc9ab189ede188ee756b13f108eef81e088c622385d61
+DIST mongomock-3.22.1.tar.gz 121742 BLAKE2B b325fd917f27712d1fdd35564dd27e02a69a417b40c975b447d1d553a170fb45978303b47878e094c6360930b0293f7353552522b54c9228f8083ea88e672510 SHA512 efd8e46986076fb1b6aa2d68d17b136191bcb90408da305a860a99a86ce06c8377ea5f684902761ceb38b5e914b75f7307e9a73477a3297b502241d7517fc143
EBUILD mongomock-3.21.0.ebuild 852 BLAKE2B 8e9bdcec3740a4b2a3c08f999431179e7d3ac1e63e93fdf8c9ad310b4c07cd1db0bbfe4004699d4948d39dfe4e35bd46889237973f59712363bc5eaec44c8c60 SHA512 9808692de45c70bae0a3f68e8a3e5c0db027c8a4bee7f802820f5417e08c6f34ea912539d2f31878f3b524dd1402d542fa34ebb25c395eba79fcefcf3a0f7947
EBUILD mongomock-3.22.0.ebuild 854 BLAKE2B 41830428d5637dd3b6485d16abbd097069682bdd27e65dc3229adfbf4672400a8a6dd1064edac0b8316de34cc288c24c4c0a345dd91ded9ad3761e66f233b004 SHA512 9fcc8ca838cd7da241832cb494ecdccbf515bda504b5b8dfb7851c6393c46e33aab41f27404d661e52a84420178cc98863e854710959dc873d892cd77fa49e30
+EBUILD mongomock-3.22.1.ebuild 854 BLAKE2B 7ddd5a9eed3bfc1ecbb6c113f11a5fd88cd13005dfcac02fcdb264014cb7c0444456b5e42de463c11755aa45a8e934ddae54ab304f523c722b95249d30bf7408 SHA512 cba7e29b6b25f18d150fa17433cc1dd168c2f9a104827a35a16f5f0f53cebda267add11ba0186ae82dad26569df2b89acc653245caafa14fd18aff36247ef51d
MISC metadata.xml 619 BLAKE2B 9b3bdbeeadf2a214e0e6dd41b6177080fb6ee475db19be125bc09efcfd1adb9624ed262ce3e739801eff91b7045bbcf3a51b78ba499a7c446a3ad7389493bb72 SHA512 b0bd3746abb8f97dcb9dd4893aa00612c2444fe1d39ad9b0b203f135f4422642809bee2c37e7fe3d783ced47c50bd2624c19ced3b9218127b799096ca7ee8182
diff --git a/dev-python/mongomock/mongomock-3.22.1.ebuild b/dev-python/mongomock/mongomock-3.22.1.ebuild
new file mode 100644
index 000000000000..5195c13b7f1a
--- /dev/null
+++ b/dev-python/mongomock/mongomock-3.22.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_{6..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Library to help testing Python code that interacts with MongoDB via Pymongo"
+HOMEPAGE="https://github.com/mongomock/mongomock https://pypi.org/project/mongomock/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND=">=dev-python/pbr-5.1.1[${PYTHON_USEDEP}]"
+
+RDEPEND="
+ >=dev-python/pymongo-3.10.1[${PYTHON_USEDEP}]
+ >=dev-python/sentinels-1.0.0[${PYTHON_USEDEP}]
+ >=dev-python/six-1.14.0[${PYTHON_USEDEP}]"
+
+src_test() {
+ # Use NO_LOCAL_MONGO to disable tests that need a MongoDB instance.
+ # TZ=UTC needed for date/time tests to pass
+ TZ=UTC NO_LOCAL_MONGO=1 distutils-r1_src_test
+}
+
+distutils_enable_tests pytest
diff --git a/dev-python/nbformat/Manifest b/dev-python/nbformat/Manifest
index d13f4d4b9e9a..8d621f348715 100644
--- a/dev-python/nbformat/Manifest
+++ b/dev-python/nbformat/Manifest
@@ -1,3 +1,7 @@
DIST nbformat-5.0.8.gh.tar.gz 127329 BLAKE2B 6252d35f72fd0af5a89d83e9e48f61baf2656eb6530d4a7b05a5241e7272098992d70d68705da4fb9921ab1939378658b2e6e5f765a453f932e94e9232006a66 SHA512 956add98517f1128d8efacae1f3cf9fe27b4d7acae4a56e14dd6c2942aab39b063170759bc6de67bcedd2e0fd6c7ab1a36aef268f2088644ba31caa936b9359d
+DIST nbformat-5.1.0.gh.tar.gz 152052 BLAKE2B 571d48af8c92b1cff9110935e00f53543d7bbae5ed9a08b516e9ff23366d9db7e4b1fb50dc786f2cd70d7f871baa05b6be86a6f22940724d90d05fdf58449bba SHA512 17c234e7777c170d629c0d3a4d8d7ddf01a754977a5e21357550ff702c5b4e26cd31164b32ced0fb20f3c0953390efd9a7509ed92f6c159fcef8634bd3f6af53
+DIST nbformat-5.1.1.gh.tar.gz 152242 BLAKE2B df5e293ab235156f78e2bf85f1a22e597d8e0a60a6e448c69d4e04b62eed834b078238ad03a67e58ee0f705d1495b2f6c4b42124b8d439adbcb52be7ee91ae36 SHA512 5058c009b5148e6764de942cc43cb4774abad758250f065f9103c94f820de841b72d0f69ad24c38ade0c9fca3df61b7ea51b6097c6c191a2f606d57ef358083f
EBUILD nbformat-5.0.8.ebuild 872 BLAKE2B 77871014d6e031edb950013e857ce0c7bcb9ef2d1f2ca68ff1690e7d613c68c4edd859aa238464f03d86ed393af5ea0e9c5ff71ee6e3db4c0252f73144ab05e8 SHA512 f1a6aebaf9a08fbea9c94a958951800c3dc66a03e5f7eac13e6ed4ea3a925e0c4fb0f9b15e68c4ed183153f4dec4b11e76777fc2035c6fe91bac652ac3037c89
+EBUILD nbformat-5.1.0.ebuild 875 BLAKE2B f06ec85744d49347e270736a9a2e18308e5e71b267961ef5ae7b505bcc815926e474e129a820e72e2d6f4c2d63c5296fadb76721efac3cc88e382ce34e541f4a SHA512 6a86869e69b57478603f7f454dcd6e4601533af1c62b04cf678f055abef5036954a4fcad94ba8631e58fe325dffbb5c923f1039ac6870d70ddaef95d7cc83ece
+EBUILD nbformat-5.1.1.ebuild 875 BLAKE2B f06ec85744d49347e270736a9a2e18308e5e71b267961ef5ae7b505bcc815926e474e129a820e72e2d6f4c2d63c5296fadb76721efac3cc88e382ce34e541f4a SHA512 6a86869e69b57478603f7f454dcd6e4601533af1c62b04cf678f055abef5036954a4fcad94ba8631e58fe325dffbb5c923f1039ac6870d70ddaef95d7cc83ece
MISC metadata.xml 754 BLAKE2B 566e6a6a59e274323550624d9444267abb5279ef663328aa93906685a23bc7b38888468ccc3284889e3a1c6607cfeb501926ab6ac5ab84c5acd34fa62ead4205 SHA512 898ed2b6f39842e6a4624a0c7afeaa6480197637ee781001c093c21b807c094f5ec1cf436abde53b6d483abfe170c7b8720239b648499a697f0be140a0212be5
diff --git a/dev-python/nbformat/nbformat-5.1.0.ebuild b/dev-python/nbformat/nbformat-5.1.0.ebuild
new file mode 100644
index 000000000000..6991991c0a60
--- /dev/null
+++ b/dev-python/nbformat/nbformat-5.1.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_REQ_USE='sqlite'
+
+inherit distutils-r1
+
+DESCRIPTION="Reference implementation of the Jupyter Notebook format"
+HOMEPAGE="https://jupyter.org"
+# missing on pypi
+SRC_URI="
+ https://github.com/jupyter/nbformat/archive/${PV}.tar.gz
+ -> ${P}.gh.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="
+ >=dev-python/jsonschema-2.4.0[${PYTHON_USEDEP}]
+ dev-python/ipython_genutils[${PYTHON_USEDEP}]
+ >=dev-python/traitlets-4.1[${PYTHON_USEDEP}]
+ dev-python/jupyter_core[${PYTHON_USEDEP}]
+ "
+DEPEND="
+ test? (
+ dev-python/fastjsonschema[${PYTHON_USEDEP}]
+ dev-python/testpath[${PYTHON_USEDEP}]
+ )
+ "
+
+distutils_enable_sphinx docs \
+ dev-python/numpydoc
+distutils_enable_tests pytest
diff --git a/dev-python/nbformat/nbformat-5.1.1.ebuild b/dev-python/nbformat/nbformat-5.1.1.ebuild
new file mode 100644
index 000000000000..6991991c0a60
--- /dev/null
+++ b/dev-python/nbformat/nbformat-5.1.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_REQ_USE='sqlite'
+
+inherit distutils-r1
+
+DESCRIPTION="Reference implementation of the Jupyter Notebook format"
+HOMEPAGE="https://jupyter.org"
+# missing on pypi
+SRC_URI="
+ https://github.com/jupyter/nbformat/archive/${PV}.tar.gz
+ -> ${P}.gh.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="
+ >=dev-python/jsonschema-2.4.0[${PYTHON_USEDEP}]
+ dev-python/ipython_genutils[${PYTHON_USEDEP}]
+ >=dev-python/traitlets-4.1[${PYTHON_USEDEP}]
+ dev-python/jupyter_core[${PYTHON_USEDEP}]
+ "
+DEPEND="
+ test? (
+ dev-python/fastjsonschema[${PYTHON_USEDEP}]
+ dev-python/testpath[${PYTHON_USEDEP}]
+ )
+ "
+
+distutils_enable_sphinx docs \
+ dev-python/numpydoc
+distutils_enable_tests pytest
diff --git a/dev-python/notebook/Manifest b/dev-python/notebook/Manifest
index 76258f1d6f98..c8b81f31d613 100644
--- a/dev-python/notebook/Manifest
+++ b/dev-python/notebook/Manifest
@@ -2,7 +2,9 @@ AUX notebook-5.7.0-no-mathjax.patch 1438 BLAKE2B 66719f5342c08fce7576a70780b38a9
DIST notebook-6.1.3.tar.gz 13806042 BLAKE2B da63fdabd1a71e4247a9e340539e688410a84c58d94049dfb7e8e3fcdc53686a55eb855687df34ff48f599a0c5aececbd9a8e1aa1d2ff7baa2a6da1b4e1bcf24 SHA512 67a8feb01dfb665bb24f3ce1b28212e9bad5a188e8cef1d168c4edaf207cbc16d516f6024ca905f75f1c27ba4890da858c5278a3ee84a4c4ac1bdbf225afa351
DIST notebook-6.1.5.tar.gz 13925632 BLAKE2B ce9d0ee110a158ba0ee3f3199a7cc1c8d53ecb72e8f77f43d2b1e5552b4a0378edca9a987634e12d8429c70595ec4cc226784248d196501b3a04c67e4ba88c85 SHA512 4b0893c805a0494c369b363b7d1c606a1b124869e601eafce1eb4c93ad1436b757c6149bc76c489aa26171412280d69e894b44d7d19141341fb1194a8e2f447b
DIST notebook-6.1.6.tar.gz 13926673 BLAKE2B 944f92d468ade0f0d3fbe01d46cb2893866fca067b48c6a6cefe653b9941bbde0802c7d9ee17b493bcf6391d1b0a77e710f5b5c8f1d58ec692b40753ac0692e9 SHA512 d1271273ae9cc098d5937a3ac91dc8035b033bb8da799f31c5d71abe48b17579f2fadc8b0ff7134dedda72ac49cc29c5adafaa4ef6f347cc4f6698ab46d83040
+DIST notebook-6.2.0.tar.gz 13927515 BLAKE2B ca752f0cb316b46b71d8451c59c196c324008c296dfc7fbc4ee426ba5b3c1035e90170e46720547a9e3f2cf381ab5e0294185ee1a814d31ffbe6ecf546f229d6 SHA512 217392000ca2d0266137f937fc4d2a1b81ed19217fdbf6550b07453eede8b9a6e15c8fbb1c94f559a7f44ac73dfadcefeae815c186e56bb1e9a30120fe070f3a
EBUILD notebook-6.1.3.ebuild 2587 BLAKE2B 5d30ae02f109446293762966e48958433920d8111b34ccee173a44e6fe8548cf4053f16b91dffe13851a50ee495f5040f1623628a1f8500fa659f2ab26b1c830 SHA512 c1804bd5bdbfa742993ce62e0295bff4419dfc08c86f58fb55c0f585683a55de84b373a15b9726a268736af6f3b373437a9d013f2b1d3678d26b573466bbad10
EBUILD notebook-6.1.5.ebuild 2587 BLAKE2B f1fa42de905aa9732ae0a80893e680eec6de96c96fe39f793538736cc37bc30c1638ac6e0008a99dd70215f53f979e5c977c714abb3f9c54723ede6add29d781 SHA512 214e9bb13da3d0f320f9e88e2d6f8463747e586dff2927e9153fadd9c72ab511c829bc7da0ed8e4077ce13e01b60bdb354297a880aff232a8f62e64b42ee8d56
EBUILD notebook-6.1.6.ebuild 2367 BLAKE2B 9548920eac4c1ce96fa91bffe0b5a2bab8a90d1abcd47697662c836c0c66c381181342b876a6e9f687668e702f7ca4757e79e57865b549c68be54f26be69aadd SHA512 71bf5fc86176b1c973afa82ebb5483b36b01f625ffc41e608d73ad4d41842ab774bece0e9245814f32e0e2ff177501d8d4fb0bce943705a64ee756ff2b91d5c2
-MISC metadata.xml 466 BLAKE2B a907de2cb309e201f79881fbc1084337fc9d5bb88af8ba4b65db62123703c5193df08d7a1ed7255417fe619bb197290ed76fa70bc5e04133a616c13f69cc7d3f SHA512 cffa01ae84a4242117574bb9dfc26f7152307f263d12270a9ee8bc978b780c8a19ae26db0b9e7bc98ab1ba82a44f222849a6a33a8a0c50a2887a01f3f94dc6c2
+EBUILD notebook-6.2.0.ebuild 2366 BLAKE2B 1e08d8141a606ba583fe3a5bfcde87b368e5b62e8d6a96a1f097d8ee2db680181bd59c95d4f05f3eddbfb119a974c9e81061054191e5dc8897aaa8a183cfc4c5 SHA512 5c0653d82f673f625eca9e171316966fbc819eb27a43f400592256fed634999b1da79ee5e0d49fdc45ec3d1892725f73f10f776e42cc71c93fb478c610b5e574
+MISC metadata.xml 524 BLAKE2B dfca744ea63418ee961bc5f106be6a01acf80af2e4179e0f3446c370a416bdae998887a55e866cd2fe5ede334653b46205f32b5db275e2ec54efefbd10455541 SHA512 a3511781a2086a80a0cc7a02842e1c71490ae1b200ac5263ace00610d37df7cf9ad866f4bfb89441514dbf26a5dfeb6559cbef9e1e6e2fba534c14feb5fcd616
diff --git a/dev-python/notebook/metadata.xml b/dev-python/notebook/metadata.xml
index 68142250c5d8..863c6761df8c 100644
--- a/dev-python/notebook/metadata.xml
+++ b/dev-python/notebook/metadata.xml
@@ -12,5 +12,6 @@
notebook
+ jupyter/notebook
diff --git a/dev-python/notebook/notebook-6.2.0.ebuild b/dev-python/notebook/notebook-6.2.0.ebuild
new file mode 100644
index 000000000000..095c5d5f72c3
--- /dev/null
+++ b/dev-python/notebook/notebook-6.2.0.ebuild
@@ -0,0 +1,85 @@
+# 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_{7..9} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Jupyter Interactive Notebook"
+HOMEPAGE="https://jupyter.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="
+ >=dev-libs/mathjax-2.4
+ dev-python/argon2-cffi[${PYTHON_USEDEP}]
+ dev-python/jinja[${PYTHON_USEDEP}]
+ >=dev-python/terminado-0.8.3[${PYTHON_USEDEP}]
+ >=www-servers/tornado-6.0[${PYTHON_USEDEP}]
+ dev-python/ipython_genutils[${PYTHON_USEDEP}]
+ >=dev-python/traitlets-4.2.1[${PYTHON_USEDEP}]
+ >=dev-python/jupyter_core-4.6.1[${PYTHON_USEDEP}]
+ >=dev-python/pyzmq-17[${PYTHON_USEDEP}]
+ >=dev-python/jupyter_client-5.3.4[${PYTHON_USEDEP}]
+ dev-python/nbformat[${PYTHON_USEDEP}]
+ >=dev-python/nbconvert-4.2.0[${PYTHON_USEDEP}]
+ dev-python/ipykernel[${PYTHON_USEDEP}]
+ dev-python/send2trash[${PYTHON_USEDEP}]
+ dev-python/prometheus_client[${PYTHON_USEDEP}]"
+
+# sphinx 2+ seems to have a problem with its github plugin. temporarily adding
+# a version constraint.
+BDEPEND="
+ test? (
+ dev-python/requests[${PYTHON_USEDEP}]
+ dev-python/requests-unixsocket[${PYTHON_USEDEP}]
+ )
+"
+
+PATCHES=(
+ "${FILESDIR}/${PN}"-5.7.0-no-mathjax.patch
+)
+
+distutils_enable_tests --install pytest
+
+python_prepare_all() {
+ # disable bundled mathjax
+ sed -i 's/^.*MathJax.*$//' bower.json || die
+
+ # require geckodriver
+ rm -r notebook/tests/selenium || die
+ # trash doesn't seem to work for us
+ sed -e 's:test_delete:_&:' \
+ -i notebook/services/contents/tests/test_manager.py || die
+ sed -e 's:test_checkpoints_follow_file:_&:' \
+ -e 's:test_delete:_&:' \
+ -i notebook/services/contents/tests/test_contents_api.py || die
+ # network-sandbox?
+ sed -e 's:test_connections:_&:' \
+ -e 's:test_culling:_&:' \
+ -i notebook/services/kernels/tests/test_kernels_api.py || die
+
+ sed -i -e "/'bdist_egg':/d" setup.py || die
+
+ distutils-r1_python_prepare_all
+}
+
+python_install() {
+ distutils-r1_python_install
+
+ ln -sf \
+ "${EPREFIX}/usr/share/mathjax" \
+ "${D}$(python_get_sitedir)/notebook/static/components/MathJax" || die
+}
+
+pkg_preinst() {
+ # remove old mathjax folder if present
+ rm -rf "${EROOT}"/usr/lib*/python*/site-packages/notebook/static/components/MathJax || die
+}
diff --git a/dev-python/pandas/Manifest b/dev-python/pandas/Manifest
index 2a231b133bd9..353c69aca781 100644
--- a/dev-python/pandas/Manifest
+++ b/dev-python/pandas/Manifest
@@ -3,5 +3,5 @@ DIST pandas-1.1.4.tar.gz 5226971 BLAKE2B 9386eefdd1be566dee7e950d6c791a1127f5736
DIST pandas-1.1.5.tar.gz 5229894 BLAKE2B 5b47774e33c7fccd7a9110e8971e8ce63cafd68273ee870b386aa8562be4c8f667137a4a078eafb2a62847bdd6f73c390254e8024d483c21e1834a8c49d44d32 SHA512 a213690ea658554b78e003a30cc88a59e34195457401d84b1cafdf74433ad27c801c12b8138371bb0206f6dc083ae882eabf0e33cb5733fa313e9f3257d48823
EBUILD pandas-1.1.2-r1.ebuild 5855 BLAKE2B 3c9648efbdaa93e97d46b3b322230a23e690072279a8bac47ad0d2c2a001ce8818816b434b73e8165a12da303ed26ea139b15c905f8b877e10e2ebfd69453b44 SHA512 812b77f89aceb831036b041ecd45a7c24154297b496d020153d06dc98e81c40094dfbcf5dab89b38ae08a0ae96b342d50b2609bcfcfde17599c92a7ab69da421
EBUILD pandas-1.1.4-r1.ebuild 5820 BLAKE2B 4c81d71133ca4c46eeb6feeb4a0f9cfc16d3e8badb366c29351f5e246a9eeea155bd4d08e6e9daa1486127beff8b5b370b068fa6705c8d29d353176ea04e3e22 SHA512 4b823624f807f91f0ca748832c3e3cd5f34a5d877b5ace08bb44a07373cea0deb80ec315176c2b0aa4838443faa3294c0a6e7953f8fad47780858a87a20b4839
-EBUILD pandas-1.1.5.ebuild 5821 BLAKE2B e7e7dd14d6d5ad5c15b2d6f7323707dd213133ceee80f10eb72ec0c8bb1aad521f384781a463b6bdaac66375dae7acfa093760b95fbfa6b9233259ac4d6d9bd2 SHA512 54cdce3e68ca8bfaa786f55e63208d9a118c0d189ab75f3f65340aa501df67251f44003ee9bde87f122acdf460062945d22f1832131f8936128af1e4912f9385
+EBUILD pandas-1.1.5.ebuild 5820 BLAKE2B b6fe5ae9e5da1bd8c9bf2eb05b9277818ec2afc15a0b148d08c7b6227ec9b78646249d6a628fd04876c839151568135144b49125b648cbb7421debda033b5ebc SHA512 4c5c06aeb1284cf11baafee64bc9523a7c008b51d0067e1c83118b948f73d4400aa6ad052669c71ae4ad3dd6bbdf98f3ef2db42ab6d998289d2876cf16e1ea93
MISC metadata.xml 917 BLAKE2B 52ce164457db6dcf39fe8cd3482021ca88bb1d8d35f09adbc189e23f31b098229d2d5381ce2df7e68f996f50dd5b41b8ccb851fe877d5a7c468c8e42d1cc457b SHA512 fdfd49c8327288be612fa5f5a7a230a278d0634b090ac8da1dcc63c732db84dbcd7cb37dee74a9996127c4062bc73a5be1a9f911715166ed6af16758a578e333
diff --git a/dev-python/pandas/pandas-1.1.5.ebuild b/dev-python/pandas/pandas-1.1.5.ebuild
index ec902a8752af..6f7adbcca28d 100644
--- a/dev-python/pandas/pandas-1.1.5.ebuild
+++ b/dev-python/pandas/pandas-1.1.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
@@ -17,7 +17,7 @@ S="${WORKDIR}/${P/_/}"
SLOT="0"
LICENSE="BSD"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 x86"
IUSE="doc full-support minimal test X"
RESTRICT="!test? ( test )"
diff --git a/dev-python/piexif/Manifest b/dev-python/piexif/Manifest
index b5ba887419d0..32de3f3fd4ea 100644
--- a/dev-python/piexif/Manifest
+++ b/dev-python/piexif/Manifest
@@ -1,5 +1,4 @@
AUX piexif-1.1.3-tests-pillow-7.2.0.patch 1382 BLAKE2B c7ea03ffe0708b975d64602910bf9c228f0093d9cb717a1b1b9f3e7b6358b94f3bcbd6da8f9bac12fe2ee0745d17defccd196bdd8ec018fea50b7d131e148616 SHA512 be1ee541e3bb6c219d6fd9ab68e9143c2131f695a2001d36a0d63b0566d71a542a09d58dc0bcbdb8c1353297156ea7853d483b9a44407cb31c30acc4252310bf
DIST piexif-1.1.3.zip 1011134 BLAKE2B b27d4419cf545f6205b13c5646dff9fc7b1ce6e5de538f6a7189e6cadb54d301e11cbf0feaed8b073cbf16de95d67c621b68657b35fc0ba2025281ee64be4e51 SHA512 df5f7793c39911af58bbae76cf998e2a7bc820b84dcf9808ee8f6a38f766f824fef28392ef88387e18b10c270c4b27881be310f0368076b6fb65379a11a93270
-EBUILD piexif-1.1.3-r1.ebuild 820 BLAKE2B 6f706af19de167098362da0e14a45cc87b04dd7c3840ee9508ea1ce355d16f450b561f5f7bce7a3f8d8e21f73c14a2b5a82f39e971d4cab84691b10c253f0464 SHA512 aca456dbf2c63245e330177e0bd1d2c0280e082431d671af9c6ed53377451b87941cf82e96144cd1fb909c11b6aa811d18dcd5176d9641fbf6b1039919702dbe
-EBUILD piexif-1.1.3.ebuild 802 BLAKE2B 7c266d8a11a7710452d554f7e07d64ff51405c669cf767d736f54a081972deddff5dddf71362112d248cb096a4b6971e6e1eb2bdbcb196c9e4ea92e570331ca4 SHA512 08eba3892bffe7471e2c48739d5c94035c7649dad4d0f748b74f4113eba05d0064300f5d528cdab657d0127053126f3bc612e303fc0b1f151c80a637cd86f222
-MISC metadata.xml 339 BLAKE2B 32abc28c3481c47f9c73594d1ede39100d8dea0ea8c41de777243b78dbda60f4b0ce741465ccd626c89b3924410505fc8edbf3fe8c416800a38b82b16031f72c SHA512 ad095b64f7512a0884d07bae7c47977ef55991a06bec4b4d43c73808a4c902bfd7eca0d2364ddf806301b1b3eb5f5a24d1080abb27157983394fcbc47f6c66b5
+EBUILD piexif-1.1.3-r1.ebuild 819 BLAKE2B 55f81ff4a4aac43be3964f8b94a96eb9772c76a19418b741d131004dbc40426cfc72312eafa982e7a465c6201e542de57e531b03eaa9e358eeba2e2bab4e46c0 SHA512 3cc34c5320ff55c801954477d3703819e2dbb50d3d3cdc4aeeb7feeee5656190f252c6b8d6ca40e1e4bd9a43af79d0d1a8557118d5919384202c2b130cadc6ec
+MISC metadata.xml 363 BLAKE2B 0d1dbdcb12e7a0d709950fedd9f1da080dfb469886b8af985d47d5ac851e93964866fe9c5a845d86bb83aa94d02fb247eadfee27b3a2af7524a9706c2f1abea5 SHA512 a34daf002488ca39148a7e50c10a56373858a52e9a1bfb782f1a52109b920e4423053db616f0884ecf9bb210d6b28e770310c94aa5c522c3a252736f1b26fc1f
diff --git a/dev-python/piexif/metadata.xml b/dev-python/piexif/metadata.xml
index ca0382cd67ba..7854c4ea15cc 100644
--- a/dev-python/piexif/metadata.xml
+++ b/dev-python/piexif/metadata.xml
@@ -4,6 +4,7 @@
sping@gentoo.org
+
piexif
hMatoba/Piexif
diff --git a/dev-python/piexif/piexif-1.1.3-r1.ebuild b/dev-python/piexif/piexif-1.1.3-r1.ebuild
index a5521daaaa91..b1a61351c28a 100644
--- a/dev-python/piexif/piexif-1.1.3-r1.ebuild
+++ b/dev-python/piexif/piexif-1.1.3-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
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/piexif/piexif-1.1.3.ebuild b/dev-python/piexif/piexif-1.1.3.ebuild
deleted file mode 100644
index d73f2b184359..000000000000
--- a/dev-python/piexif/piexif-1.1.3.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=( pypy3 python3_{6..9} )
-
-inherit edos2unix distutils-r1
-
-DESCRIPTION="Exif manipulation with pure Python"
-HOMEPAGE="https://github.com/hMatoba/Piexif
- https://pypi.org/project/piexif/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
- app-arch/unzip
- test? ( dev-python/pillow[jpeg] )"
-RDEPEND=""
-
-PATCHES=(
- # From https://github.com/hMatoba/Piexif/pull/109
- "${FILESDIR}"/${P}-tests-pillow-7.2.0.patch
-)
-
-src_prepare() {
- edos2unix tests/s_test.py # to be able to patch it
- default
-}
-
-python_test() {
- "${PYTHON}" setup.py test || die
-}
diff --git a/dev-python/pyenchant/Manifest b/dev-python/pyenchant/Manifest
index d71d50898d60..1096f45e4f25 100644
--- a/dev-python/pyenchant/Manifest
+++ b/dev-python/pyenchant/Manifest
@@ -1,5 +1,5 @@
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 638 BLAKE2B 575fd8e57251bfc43ee9c3d15a0f2145a9aa7bd04ec26d50dd448594d59b3aedcc426c2d1dfa51286b580d42c17c777f8009ae08ceb49bbb590849d3d5d56de9 SHA512 7795f4ab17d51170ecf6d15c5dbe885352b28496b61358bc2233bf4216650fd94847e4c36fce6af3e8ae15b85229203d574466b80247820dd6c0787e1372e759
+EBUILD pyenchant-3.2.0.ebuild 632 BLAKE2B 210e54f4e8eb7cb9e1a8dd809c092cd47b3510b1b81eac140faf124d3616691edd598f5f55b695f97533da692ea05deed38dd31e5e9a3416338c8fae278ab83c SHA512 3879fb22031571deb49418a463b3332b44ad8e5e6b230fda50b53eb609533af4d47cc89f3c063cda2a494174fe518003ccec39c3f7bf5041335afe0cc9d2c611
MISC metadata.xml 876 BLAKE2B 4b2b615496f92b395ca4449e8caba7860223101e142d45f3eb703e829d34b27a0e7b3965f7362739ffc16a61d4e5f495754415047b41473303982eb2bf35e528 SHA512 7e69e0da10236e15c70526eb35b2ae8d862109e3aaa81a2613f5a97ba08816eb71e76a845a0656dbe2a6bc92b45a79ab018386110aa7fa0687b3faba18c63129
diff --git a/dev-python/pyenchant/pyenchant-3.2.0.ebuild b/dev-python/pyenchant/pyenchant-3.2.0.ebuild
index a8226a33c22f..66edd8e3b766 100644
--- a/dev-python/pyenchant/pyenchant-3.2.0.ebuild
+++ b/dev-python/pyenchant/pyenchant-3.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
@@ -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/pytest/Manifest b/dev-python/pytest/Manifest
index 094d24f89874..b485585bbd96 100644
--- a/dev-python/pytest/Manifest
+++ b/dev-python/pytest/Manifest
@@ -8,6 +8,6 @@ DIST pytest-6.2.1.tar.gz 1102958 BLAKE2B 336757fe911e2bfa1041d7d9c1f83ce66418c55
EBUILD pytest-4.6.11-r1.ebuild 2473 BLAKE2B 4a5edd72d94553b553730a5caa2c17c25826a5be58bce6273d39d2a010a70c1fa1f8acb0751c3fe5185883a94da31ecd7e772f606c82d8d99b639804bd49d5d4 SHA512 da60063475df3b7e9e531b234e486bcafe7c1e926f58f7ebaa8e38cb02233629160aa20a9b665fddb83e50f52b0b46702b8a80e65195af4ff7b3e939927db9cb
EBUILD pytest-5.4.3.ebuild 1940 BLAKE2B b17bc0f3efe70c149ee494d2528f8e16a839c4cb2965378ab6c8b37e3c1b295bab253edd8410f6f2a69cbeb288d6299898320d387330e2d7b5b31418e985a0d8 SHA512 d99fa3064053e3ac99fadce4b23749e16dc2d9e6658f3ab07b1e68c1885d9fd243f4ab4f5462e127b9afdbb957bb498c41126ce79164a31cb2accbbaa1f4b7e9
EBUILD pytest-6.1.2.ebuild 1662 BLAKE2B b75f29897f6dde0657c243ef4e039f364fc7ca3a942fd5796f4bd23e35ad48122224016217702037a6ccdbcb7e5b7d7c10023e3ec3dcd807828b33b6c6f3d5d9 SHA512 b0b03c1b9ac2970ba93669862088045ab117e3e9832f626ba08c8fb157379370771f2d5aad2153e55678742894efc54cdae9f4a51a1027b7efbae5c300cc443d
-EBUILD pytest-6.2.0.ebuild 1686 BLAKE2B 6256ff3f90b0dee2deabd17b4a3e8bc30066c0b0d31f6d11fadd8c77807cb27e04b1a465ddbd1967891c7558321920703d1cb9b9b03c4becd11790aa87740ecc SHA512 ef65bb620f290a9b61c92b6569b19f73d603d7e120ea1d61238f8c7da0568a59e170c240e3d910f10fee2c9d4ca51f8f597374bf09684ae10136015c003e3c6b
+EBUILD pytest-6.2.0.ebuild 1679 BLAKE2B 6840a09890147eead002e099262c04a60a6b925dc4a470a4ba9acefe1187cecb1ab398f8b3b89251d847551b1c5adea3c39dc5ff0e14fda6ccb131da4cace873 SHA512 ee41e815e8cf6415f63e24ca9aa2781b48d8acc795e7f5709e31e64a92021ff03cc5fb0f53d22b3923ea8870d49460545a15973eb27836185fd8214c015e23c6
EBUILD pytest-6.2.1.ebuild 1692 BLAKE2B b607896447bb6ace1b4e866a1ecdb00da0e689a27b1a5ce26a2d86884e781d609e09b099809b3afc2341e7eba6e90a14b94557dae05ed0c892c95fd2d92dd742 SHA512 05866fb8e15cbc7accfd2c01a60baffab61073ebf9a8fc75501c69c4012d28a5796bec503b80b6ecea1c4da011746492c881a10585e1173d3cfa602e48ad6a4d
MISC metadata.xml 333 BLAKE2B 2155c30735de72aace8fe3e88a16c011f3961b4b644d761be31c45094f243f1eeeac1803f5a74219198039dcf1f7474531b2ec814a3ed591c59fd6d9ad5a914a SHA512 c59e04710dd640b2e7bb0214e52b05ec50367d895d057886ae9bf9342312006e7b21f5625e1c4f5d7a9e12a7f7b64a968e5371f8c2c45a8ac8b1c8ca6d39b10b
diff --git a/dev-python/pytest/pytest-6.2.0.ebuild b/dev-python/pytest/pytest-6.2.0.ebuild
index 8bbfc6be1bf1..f9b00ac08732 100644
--- a/dev-python/pytest/pytest-6.2.0.ebuild
+++ b/dev-python/pytest/pytest-6.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
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/python-email-validator/Manifest b/dev-python/python-email-validator/Manifest
index ed539b8f1551..1023595084bc 100644
--- a/dev-python/python-email-validator/Manifest
+++ b/dev-python/python-email-validator/Manifest
@@ -1,5 +1,5 @@
DIST python-email-validator-1.1.1.tar.gz 18497 BLAKE2B a65a5603854920d022062fb4f1575eafe7274e5501ae00fdb58a53a75c6582353ce2c46e20a6a172e7a4a1bbe2b25515b543ace2af4151102c5201ff1ac27132 SHA512 fb4dc5b728adca6041129aa3eecb3efbb358ecf47bf383737936132df7b24c3b9e47e56918d375d8eb4a2535d56ce22c9e03dc126dafd8894911b43fe30f5162
DIST python-email-validator-1.1.2.tar.gz 19421 BLAKE2B 118165ceed5da6fed377180662496f5bc996f1d3c2201e6a014cae8f66a9ff3f447900aff07f778fdec49cd0c680ad6f9316f30f6c152b7eed4f1f57adc1ba74 SHA512 b40f8ecd65a9a5945a1a84b174398fc495afccd27ad5fcd7b4a03ecd26bcff6dd6ac3b5f75ac200cf2647b92d4defb25afe1dda28f82ed86bd8c2bd82708d0aa
EBUILD python-email-validator-1.1.1.ebuild 819 BLAKE2B fa518aaa7f447540775b5a4fc2ef0f93eff7e17ed695d37fa6a6f5c853143551d4b24339fc3df8bdffa845d685146c9ddb8bc7b28d7ccda6b113c6fdd3365358 SHA512 4f053aba850bfd0c76c1bd1cbeae8b30ea09f25c8b3e227bde6642733f1707180f9794245ff0b1e385a658649fd3be5ec4ab7938ef91fa0531603f359753a558
-EBUILD python-email-validator-1.1.2.ebuild 821 BLAKE2B 6fad7946d2b19b3323d766d00e670133033ddfc0c0d47edd382bf90f438814089f8baf541db23b43e033c77e8fdaf7014845c9b080f51e95b8d49514e16c026c SHA512 976766dd671f1bf7b10466fb0011e1701b1e642efb6f6c2ffc019ca986e3700a39a2953d4b0afbb053e4d60a11e52915e619a4c0f5734999bbeb19d4b1a8a534
+EBUILD python-email-validator-1.1.2.ebuild 819 BLAKE2B 593f0d135a558dabd96e58030dad6b783d6fa971ea3ef9e39b0eb191803184bd7bbd806346f2aa2c78b0f00aabd3cc4898beb8d074dcb02f2ab1dcb55e84d37a SHA512 bbcbddee9dcb181c641234a588daf2b90638cee121cfda4cd8a4966a04987fe11ea494f6940af1fcdab212113f0138a0842a679c36503935d8bc2ea19e7b7a0d
MISC metadata.xml 762 BLAKE2B fa66973f32734b810addac910f42d2e3ec8117934d555a1866e90f4c427f5c19f8204674bdc700e98ea112112f083f22adbca58fa29f90266cfb9e52cad19341 SHA512 8c0371c9d5605a3ecd4ee5d354ff78a53738726e9882114db49bb442fcde9fead3ce7934d9c4e8af82c5d44fe80ac34910681d700eed6ee97862bcf77889f851
diff --git a/dev-python/python-email-validator/python-email-validator-1.1.2.ebuild b/dev-python/python-email-validator/python-email-validator-1.1.2.ebuild
index 8cd9e9bd41e1..797c0c520a69 100644
--- a/dev-python/python-email-validator/python-email-validator-1.1.2.ebuild
+++ b/dev-python/python-email-validator/python-email-validator-1.1.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/JoshData/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
S="${WORKDIR}/${PN}-${PV}"
LICENSE="CC0-1.0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
SLOT="0"
RDEPEND="
diff --git a/dev-python/python-linux-procfs/Manifest b/dev-python/python-linux-procfs/Manifest
index a9e5d795a354..c8aeadbe3a18 100644
--- a/dev-python/python-linux-procfs/Manifest
+++ b/dev-python/python-linux-procfs/Manifest
@@ -1,3 +1,5 @@
DIST python-linux-procfs-0.6.1.tar.xz 18540 BLAKE2B efda66e0264db15b0c1904b9dca631683d089207abe57d165a25e71f68194c249a22394c997a13a71b0333aa27dbe7ac1b47488f715e22655d0f9217346d7ce7 SHA512 14f7510828d5a3eea1a8267041b604046392dbb8d7980b03b4d10bdefa88a89a5f69acdfea77255ba664c2ef33ce52273490214b3f76d2865e7b1dcc83e8e265
+DIST python-linux-procfs-0.6.3.tar.xz 18808 BLAKE2B 02fdc0349dd456819f67f82d6836a44e3285e16d9654dd52b58ac7d86e48bc559feda18f105db7911ac5f670fd0e6cfd5c6cc69a958a3e8494813ff244f8b06f SHA512 18e42bf12456893740c5ec950ffcca86945b1ff202a6ea3ae6ac800145771a39b4ab7e8bbb440210d48d0fe9de646e334095afd0b20060e2e28ab3fa844f6140
EBUILD python-linux-procfs-0.6.1.ebuild 589 BLAKE2B 72c9d2ab6bb0a3d1b5a3091c5771eddea09b7d272f1855583288be9c8751e7bf89e45fb46d2051e7a7c584d350d2f8a1d9ee9823989ad237058b4affb0736e9c SHA512 89a4cd9d0fc3204c8710f93e4b52cbb6e6b1e91b0c4db6dfdfbf7b7e496b79f99c3031f9d869c20a47836b239139686da67ee81c2b8fab9788e6a42fdef5071f
+EBUILD python-linux-procfs-0.6.3.ebuild 593 BLAKE2B 71f96b3ff7e93618904b6778a934169e53d29a4bb81b08c9190928fb2515a724d8c29eed0e4db2e47b2917a4349ea31eb70db7124bdef14c34353c9873d3519d SHA512 994efa3ec189851c6bd86bfa810e6b2e79c73be2a54fc1910d7588fa009ac47a86d513c64c0f77b8d798c31a3d5be609e0a2a7174daeccac4e23395ec49be87f
MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-python/python-linux-procfs/python-linux-procfs-0.6.3.ebuild b/dev-python/python-linux-procfs/python-linux-procfs-0.6.3.ebuild
new file mode 100644
index 000000000000..06ab368f999e
--- /dev/null
+++ b/dev-python/python-linux-procfs/python-linux-procfs-0.6.3.ebuild
@@ -0,0 +1,20 @@
+# 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} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python classes to extract information from the Linux kernel /proc files"
+HOMEPAGE="
+ https://git.kernel.org/pub/scm/libs/python/python-linux-procfs/
+ https://kernel.googlesource.com/pub/scm/libs/python/python-linux-procfs/python-linux-procfs/"
+SRC_URI="https://cdn.kernel.org/pub/software/libs/python/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
diff --git a/dev-python/python3-saml/Manifest b/dev-python/python3-saml/Manifest
index 4a865fb4dad9..354a7e5f17df 100644
--- a/dev-python/python3-saml/Manifest
+++ b/dev-python/python3-saml/Manifest
@@ -1,3 +1,5 @@
+DIST python3-saml-1.10.0.tar.gz 503005 BLAKE2B 88be9b00082d00c86081432dd6789c0f040e8e210d3d1de218f8bf7a41cf32acce6aa90f92b6e083142a2a5c8f820eb9f8b6e880e742400b8bb83e7eb28db392 SHA512 82d15ef4315d25b38506177cbb4ef095a0546705035491847597b353486e119026c700f5d4d22764c93646f645e13d93d75bd3541c2c5b31343bcee35a42ead3
DIST python3-saml-1.9.0.tar.gz 497106 BLAKE2B c3b282be835dcd0590125563ed0380bbb5d486aeffd60fa0d6a1e7d22b25ffaa03a1bea555520b1465b27b352df0936d21b919ce73a3671d63f07a52b3efdb37 SHA512 a5171258b917c02f10a0c420a19fe6829a034df1dfd87135351b9c187314dca2f973012f49056f391444aba76306adfd48cd77a859274d5cbd2a8c23a00af78d
+EBUILD python3-saml-1.10.0.ebuild 845 BLAKE2B baf652ce7709f85ed5b297b49eacf78c19b3c566336045d48d7502ca37ec57202badfcce3f66044b734125be6856f752ff0147f96e2ed34f11d64f973f1c2bf7 SHA512 610d9880ff8852265e68898536e2a0e0db02ca1232ed4392b9717a5a1d02c7176be38c34ab979860989d09425ce86b22f0c4f50a87acba23c70d1cfa4fe4eff4
EBUILD python3-saml-1.9.0.ebuild 737 BLAKE2B dfe2a322187209c39ded3053130418f2ee03830239c33aa82838e755caa1318881b8ba93071921284380761e672f38a54390a7652c8b6ba06f112a13189be5a7 SHA512 a62859afaaa19b10c09f045e47655deb57ab7ecd11fc0fc39770893bf0b78df9019cc41fea4d85e6afae92bb12544e58cb7b492c45dba82014ed3bae2c73d291
-MISC metadata.xml 385 BLAKE2B 8bd80251991951e4ff55a46e535d444a8eee64ea13bfddcebd8e9558f02937d392d3c0dae6d345dbb889fa6def7f12e09bd4e3974db7ac9b38848a0ce9587360 SHA512 d64079de30451e3a9f0222bc62a921cf44ebaf1a3bed03eff79d30d55303c096b73814d5c9ef6854147aaaab0f0bdf873fcc79ab07dceacbd816161cf793e332
+MISC metadata.xml 486 BLAKE2B 1f23cbaa3e1036247a248e4260dd6688ffd05880a4bb551c8ec3106257875936854478c84fdf4c5c2a47c9d7f32f71dc57ec73c1e9e53744126bcc18a820d420 SHA512 0a6c9d48a664bf598dcafa1dc72074f4abbb730b31b29fa84d01d00d95694669b9210df84a3b18baf5384caa4b9f483412769150b25ba1acf0101c47347d1781
diff --git a/dev-python/python3-saml/metadata.xml b/dev-python/python3-saml/metadata.xml
index 9a923ba5ee07..9806814b89c8 100644
--- a/dev-python/python3-saml/metadata.xml
+++ b/dev-python/python3-saml/metadata.xml
@@ -5,6 +5,10 @@
chutzpah@gentoo.org
Patrick McLean
+
+ python@gentoo.org
+ Python
+
python3-saml
onelogin/python3-saml
diff --git a/dev-python/python3-saml/python3-saml-1.10.0.ebuild b/dev-python/python3-saml/python3-saml-1.10.0.ebuild
new file mode 100644
index 000000000000..ca0bb11a6cd7
--- /dev/null
+++ b/dev-python/python3-saml/python3-saml-1.10.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+inherit distutils-r1
+
+DESCRIPTION="OneLogin's SAML Python Toolkit"
+HOMEPAGE="https://github.com/onelogin/python3-saml
+ https://pypi.org/project/python3-saml/"
+SRC_URI="https://github.com/onelogin/python3-saml/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+RDEPEND="
+ >=dev-python/isodate-0.5.0[${PYTHON_USEDEP}]
+ >=dev-python/lxml-3.3.5[${PYTHON_USEDEP}]
+ >=dev-python/python-xmlsec-1.0.5[${PYTHON_USEDEP}]
+ >=dev-python/defusedxml-0.6.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+ test? (
+ dev-python/freezegun[${PYTHON_USEDEP}]
+ )
+"
+
+distutils_enable_tests setup.py
+
+src_prepare() {
+ # unpin deps
+ sed -i -e 's:==:>=:' setup.py || die
+ distutils-r1_src_prepare
+}
diff --git a/dev-python/pytools/Manifest b/dev-python/pytools/Manifest
index a55016b654b7..f253d3f7fdac 100644
--- a/dev-python/pytools/Manifest
+++ b/dev-python/pytools/Manifest
@@ -1,10 +1,6 @@
-DIST pytools-2020.4.3.tar.gz 62980 BLAKE2B 692d3aec649c89e473754ceeb13d141df6709f287ae45ae793d84de4321ba13a7fca766456a99f2134e81be4e3a084169f0e1f8f8b9595182efbaab89aefb616 SHA512 4f162114fee298812c0f63b0af1c4113fa1636b6dd4bb750b18decb60d7ad89adc2e460b9861c46ee1c8e11ca3ec437836ff173abe4436ba7784f18b1d6455a6
DIST pytools-2020.4.4.tar.gz 61208 BLAKE2B e124ae0f2c6be9c760ac178f2043e2d63af7e1eaa79e343b52dc183724bac7e869185d14d43a79efb91cfc55f39c81747581c61badbcb8cbd3d02d6e9a9a79a0 SHA512 32dc47a5a6c39c806c0bc4ffc34a41a1bb51ada537dbba36cfefad7f4370793879b3cb143b37d6fd3542aad0d64ac663cca4c8f7a05db36a9522e9919a1ef3d1
-DIST pytools-2020.4.tar.gz 67157 BLAKE2B 57fd583a7d5cc1337e20fedb5bc1c53c4025a01e7d4e3a5b05a0770a86e2bcabdde31dd535321215cf1bf2c7f3ed0b54e2407583bea63b63ca5b829f590a00be SHA512 66dea0d67c99c152edd7cd44e1262b6d163f065f5a4b697a5997f7453145af8fb0539d8eafa606fa18128908ce933c724b51bd1a76a6f7ab02e27db24496dc4c
DIST pytools-2021.1.tar.gz 62003 BLAKE2B 2938359365082d9475cfb51586c78d3dce264cf0e8b1cf3fea0c7c688570c6e25c9a558b78977c35331ee89afd23ab7eb44a8702b3908eea160b07747646cc53 SHA512 c365cbb65b756869407f7f053112cb9732aeb138493172f2b90563a4f45e6d993557e54de2165a463931b8e2bd29c3ccd32c059702f21fb59e3dee74c19efd8f
-EBUILD pytools-2020.4.3.ebuild 671 BLAKE2B d8e7e67f5e9ca2e79a22e2e933997d75095a6d4a87939ecfbcfa4674cad0dc2690e97198cdf97295c292c7dde9c712e8f7495762ed234ce6077d44aa7b370524 SHA512 012a0d25cd87188b9b19305b4e4a0b287994bbbdb96b23f9d25abe1e09cebbb19dee15117cef055bf382e84fa6358543454f3e5c5c84cd509b1b7078dada4312
-EBUILD pytools-2020.4.4.ebuild 632 BLAKE2B 59e70d4f78af5303e85f490b77b7a92cd0a65b50739f32fc3781f346db88d01bed2a44ed58a1e23d13a2103e23798d534f4f5d11ec2db81ba873b90de7d320e6 SHA512 ea42bf1c1e1564bd3cf0825eff5192c107e7bd13aa6388253389405064ea2f4d130dbcf5c1f600d86103bef0955d4e723097cf862f02ae239fb67b922dbf1539
-EBUILD pytools-2020.4.ebuild 670 BLAKE2B a4dea2ba67077ed0c59807debe1b73c59f7526c0201784813853b818a5a280be90526110dde5f4102aa080995e0214416f09f6bcc3c3641e218147bb6ded0e1a SHA512 9da434ab7b2fa6cc73c246a920e62d8a0af1769f3b988eaa74cdcdee3846f4110a4c54327dc38c86d3f42cd6712147b0c04f09427d5af0e10868038eb18834ed
+EBUILD pytools-2020.4.4.ebuild 631 BLAKE2B c6331d7fc2c4ea29ecda248e305e01624dc8dbcba35546ac1a255ccfbf47b395a043aac44a3b7ff8a8e1f26fd0d31d881c2ea54325b82fbaabed36d3b785140d SHA512 1a2b7167f3f9d1959d77d21df99ffcbb22a8f0a0287512fac9b60ef14f264579230a971af8656e3135419694cf61a1f99eb226be0fbef05e25e11c9c6ac1babd
EBUILD pytools-2021.1.ebuild 632 BLAKE2B 435feb6c54a3ec7c848185818fd354e0bcc5338e8aa3671c369baefcacbfc011eb82b3eb9030eb1752e12f1d0fb45f7dc1312021570079644bfa7af2b4034742 SHA512 5829639f5b19f01739dc1b9de25787905237a771ce051c4c98b3a303fc6959354e1b05b06d04739e285dbc7fea3d7b60fd25e8c353e3d37995bf2091190aea2c
EBUILD pytools-9999.ebuild 659 BLAKE2B e95a3d9d028e49f5f6123a98342ac999ec1d6a3487ab7acfb2b09b4814d6b4a3af9d609ff17b9451bf93509926cb665c4568ccdf4a2dbeb93dab80ad82f976d1 SHA512 07ef3afa1568beae15a9210426a0d5b4687becf12249443e7f2d5e867b6a8632c17b01eca5dbb69ce1055eaecdda62256129783106b0bc45a88ec48e9670ed38
MISC metadata.xml 370 BLAKE2B c7fc7fd9d90ddabb9b07a5a15677f36892a428e3d0394eaeba76b4828560d7ba0212cdebb6fc4a61e5768cbd8458dc069038e8e84c99fd7d92d1e014eeed04cc SHA512 8287dc77596e94cd8d3d34dcd6fbe979064efadda19124992b97d90cb14b561ed311e701769f29a1bfc9f3b0e612e3356b95bfa05106dc29dfaaca722cb79292
diff --git a/dev-python/pytools/pytools-2020.4.3.ebuild b/dev-python/pytools/pytools-2020.4.3.ebuild
deleted file mode 100644
index e822631055e5..000000000000
--- a/dev-python/pytools/pytools-2020.4.3.ebuild
+++ /dev/null
@@ -1,25 +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} )
-PYTHON_REQ_USE='sqlite'
-DISTUTILS_USE_SETUPTOOLS=bdepend
-
-inherit distutils-r1
-
-DESCRIPTION="Collection of tools missing from the Python standard library"
-HOMEPAGE="https://mathema.tician.de/software/pytools/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND=">=dev-python/appdirs-1.4.0[${PYTHON_USEDEP}]
- >=dev-python/decorator-3.2.0[${PYTHON_USEDEP}]
- >=dev-python/numpy-1.6.0[${PYTHON_USEDEP}]
- >=dev-python/six-1.8.0[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
diff --git a/dev-python/pytools/pytools-2020.4.4.ebuild b/dev-python/pytools/pytools-2020.4.4.ebuild
index 80c91e37779b..0638cd697a4a 100644
--- a/dev-python/pytools/pytools-2020.4.4.ebuild
+++ b/dev-python/pytools/pytools-2020.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
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
RDEPEND="
>=dev-python/appdirs-1.4.0[${PYTHON_USEDEP}]
diff --git a/dev-python/pytools/pytools-2020.4.ebuild b/dev-python/pytools/pytools-2020.4.ebuild
deleted file mode 100644
index 452aa2e327c0..000000000000
--- a/dev-python/pytools/pytools-2020.4.ebuild
+++ /dev/null
@@ -1,25 +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'
-DISTUTILS_USE_SETUPTOOLS=bdepend
-
-inherit distutils-r1
-
-DESCRIPTION="Collection of tools missing from the Python standard library"
-HOMEPAGE="https://mathema.tician.de/software/pytools/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64"
-
-RDEPEND=">=dev-python/appdirs-1.4.0[${PYTHON_USEDEP}]
- >=dev-python/decorator-3.2.0[${PYTHON_USEDEP}]
- >=dev-python/numpy-1.6.0[${PYTHON_USEDEP}]
- >=dev-python/six-1.8.0[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
diff --git a/dev-python/pyudev/Manifest b/dev-python/pyudev/Manifest
index edbd014bd995..dc51389bfce9 100644
--- a/dev-python/pyudev/Manifest
+++ b/dev-python/pyudev/Manifest
@@ -1,3 +1,3 @@
DIST pyudev-0.22.0.tar.gz 85077 BLAKE2B 66c78aa4d3bea5ceae3660a93e5bd1733629bb5228d67d8e647abb8c237a2786c1061b07e034be5467f5bcab58d95ba30f91d74bdc54cd8253dff69be3ad4a80 SHA512 a09ed479a54a1772a6af68cb975fef792068c2de3655e20223905bc3f574fd32bd3dbe6b97062eee3ab5f08a8b041ad3ea86dfb68c839ea44e29d65ec1686670
-EBUILD pyudev-0.22.0.ebuild 1254 BLAKE2B efe06eb1d6888dcfd710ad306ff5cd25097359e2a7ed2606d620d0ad0120fecaafb08ca9f658a687bdc851801d7faaa6cb4b62eeb4259d859531b2bdcd9405b7 SHA512 8ddf2977c4cb63d4ab6b116d3e952f5f6ac9d0c59b8dbe780c30cb80add203711c127feef62b4df6d2e7e2ff2f112b6e6a9fb8f048f01249f7397ab521e11030
+EBUILD pyudev-0.22.0.ebuild 1261 BLAKE2B e0345064bd91da29acee694a9d6465beee9e49a700cfb251cebf284a51a6af6c49640d76a0760bc57ff66a4ab6720719ec7707c0c5ee13387ac965a22fb2cbda SHA512 724e0dc2e45d6fc71fa37214045dcf8add36b90e65c7c81ddd11336fd76d16fc9e3a74342ead7d9ae88791010aebf609fde415b75d399e1759eead273f06f69a
MISC metadata.xml 593 BLAKE2B bb5efdb90e8b189f55f12df33d7bc69233a448d010c62b512cdbea78c58a625d0e876b48cdac3342e3588e3bb1f3998d9400e927fecf7bb86ad01da113c97758 SHA512 dd6e479a44e54d4e3b2a4b7a3ceedf04fd45152d9667227b4f7bf0c585052e1adedda44084c6251749714ba91bfb8ae2969c158bb3412edf1230f5b8d1d1c768
diff --git a/dev-python/pyudev/pyudev-0.22.0.ebuild b/dev-python/pyudev/pyudev-0.22.0.ebuild
index fa8016446e34..c3360568fcf3 100644
--- a/dev-python/pyudev/pyudev-0.22.0.ebuild
+++ b/dev-python/pyudev/pyudev-0.22.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ~mips x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ~mips ~sparc x86"
IUSE="qt5"
RDEPEND="
diff --git a/dev-python/rpyc/Manifest b/dev-python/rpyc/Manifest
index 26c393612d2d..a560c59dd6b1 100644
--- a/dev-python/rpyc/Manifest
+++ b/dev-python/rpyc/Manifest
@@ -1,7 +1,7 @@
-DIST rpyc-4.1.4.tar.gz 1251969 BLAKE2B 8d77d6c80fb69d96847878830c8fd0b8333223b8a2f13389de250bea6c8d9fc79477ee9ddd738776c1f1fdb4ed6d9d349a2d5cbdf3dd4486fe9b11113df0fedd SHA512 50b146fa07c213ad51cc3ba5e29264e5c16a6061fb109b94b9183582399495697c73c38e6e4958989a90080a88155bb140bf8e1ca43e0c6fb1f72eda2795d71f
DIST rpyc-4.1.5.tar.gz 1252268 BLAKE2B 3669b10e7b9dc28feec33cb8472e74087fb31801564fcd9d9230f88a44dca8c7100a6134ad5c0e4974b8252e6c2f8d33877550facfe5f6c21d8a388e38c9e9f7 SHA512 27f67c7e7bf6f1e94815b3124f300da5f1317e7b454280953d85eca8c7146afc33937ac66a1bb8ac2344b73532ae232b190a647ef90aa723b8b5173b96877454
DIST rpyc-5.0.0.tar.gz 1257159 BLAKE2B cc1b9465745b22ba8d21a11c1f1b874e62acda6ee706591d4cf4389e5be36c3b39b24e6790356f8f5c5ad03c9739a3f835abd5e50768403e35731afa78bc608c SHA512 dadacd7bfa5c564843fbad377b7f346f582640e91b8d3ce1625e537625d448f902104b376203d026fcd08b1a89ddc8cfe2259fa035a16f0184d227543fbc465f
-EBUILD rpyc-4.1.4.ebuild 525 BLAKE2B 3f7c2ad7f390bccc52cc9311523565e56989b00be475f2577c3c499b1f8c7b67caf8dbc1bf8318b25a6c4e3bb7b23fb6fee8a81d3ab3c088994ad114f69a977a SHA512 9bc70196fd12ac1483397fb901ab04c5e9a1b4607ab8f5393314759ddd1196e3ea967e4410e869c9888b81c25607acf604893da0e207aef0c8e36c9888149895
-EBUILD rpyc-4.1.5.ebuild 526 BLAKE2B c901e812d13e6f6682b867aff0f847de111e9deea828a5c0faa84cef92ad9ff47651131e2fa72dd8e17e3db238fb5588e627d4bedf3d5eb943886ef15638b736 SHA512 8abb54bc947ffced70c416cc5dabc7d5a60fc092d7a5550a89ce9a8a4987f02bc338a3a6dab0b0dd14a0df0596bd6bbbe3c6dd0676be217f347392a8d9c088e5
-EBUILD rpyc-5.0.0.ebuild 599 BLAKE2B dc4875ad59c7bcfc8b63a6028aa4e2b5e1a8ecad7873e9b83c719019f05dc96b134c06fd7e0609456f6ec9128a6ce041b564ab2437f91ff077aabfffd4828177 SHA512 4f4b8bb2ba5e3708fa55b8422a3d60fb38f8602b90646cfb3561a45e31188c33ff6ef9fd1489656d68a4d658e6152b4e8775e7fbcbe536520c6d87d535fe5f49
-MISC metadata.xml 519 BLAKE2B bff6efbebeaa170cc6f51bb81a8401dab34bd7e9ff6c0f4419099904601bfa1170ca7c191ad0da665176662ce8fe4ebdef911b8abe04280d74924865d4e64264 SHA512 797220200ee9ec3d52d30f89e719394f548b8b030390aa8834cb7b1022ad1b1e7b0b8b2dd3a4b9aa4e0b95494330c21276597287132ba3254a333a0ae51f2670
+DIST rpyc-5.0.1.tar.gz 1258657 BLAKE2B 84d0bee67004928c26a1765a26267e3e8eb5dc09a8fd53c1d75ca691cf313a7563398626b7e89a8893415294721623206204784da01444708edb56aec8101719 SHA512 57b0d6b2dba33c7f6c9d204b4deae8ab08ed56e5799aa2c7ae4bcb8ab98486055090e3079d8b0d615fcd517111a6e02893dff85607aaca5497ae76429abe3148
+EBUILD rpyc-4.1.5.ebuild 528 BLAKE2B 95781ecbec0b561ea677b10cbcb3d08501e84d7fcc3f0ede2c791ede6934b9139176407a776530107bae14f4fb1700b1edf26a905109ae023d7eb78f34f3e960 SHA512 6e130f5732206e7a9c260ee571c467a5bf8c7d482558b8972f981eafce0a691589ac85cd6403384c346a5e993268cc91ef37793a4ac32947ca9404423c5a3280
+EBUILD rpyc-5.0.0.ebuild 603 BLAKE2B 536151a541661db0b5c26d7acc18eabb52a28fe87d08cb0c35af2f1d595f3061ad47676d0dc3c8fe847303039d31a76e624760562d89da7747628ff4a961d73a SHA512 0d6f3108006d7e0739ba269a4d8a16a169fbe0a5beac48394ba7ff82ca8ec0ba8f1ce32a7d2899ceb7df15dd721236e5f17de4eca74251564366c37de6e20712
+EBUILD rpyc-5.0.1.ebuild 1643 BLAKE2B da73e657f03c8d4c7f937120c6da7e73988173776181075f7c145f84190f52e5a4ec5e8a45fe7937a1f9b1da1db9b4485c3f702fc6a502bb77784f82bef678a6 SHA512 fac7e032f716ad51636fb727916f5b1f4da2965ca9c7b07b44c76616f46548df68c14008b69f789a69c1c5b1cffbb745e1fe37cc8a0beb9df261a56b34e0a21a
+MISC metadata.xml 754 BLAKE2B 82ff0e7411b48772006257e8b35f042fbe7dcd805872b27480717937e34b2530159add3550e645f30f86c124b9d6ec4bebb7ca5f931af52a85dc8a61165f87f5 SHA512 ba1be445e198db7684a66b4d40eaea109ecdf975570d56e8d054f984df24ba40230cd17b5f3bd74759d0e31222e5fd771d63feb17ed3f2714bdef11f5cd2e15a
diff --git a/dev-python/rpyc/metadata.xml b/dev-python/rpyc/metadata.xml
index 325f00581a6c..9595e6323dd1 100644
--- a/dev-python/rpyc/metadata.xml
+++ b/dev-python/rpyc/metadata.xml
@@ -9,9 +9,17 @@
python@gentoo.org
Python
+
rpyc
rpyc
- tomerfiliba/rpyc
+ tomerfiliba-org/rpyc
+
diff --git a/dev-python/rpyc/rpyc-4.1.4.ebuild b/dev-python/rpyc/rpyc-4.1.4.ebuild
deleted file mode 100644
index 6fad45080a65..000000000000
--- a/dev-python/rpyc/rpyc-4.1.4.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Remote Python Call (RPyC), a transparent and symmetric RPC library"
-HOMEPAGE="https://rpyc.readthedocs.io/en/latest/"
-SRC_URI="https://github.com/tomerfiliba/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="dev-python/plumbum[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/rpyc/rpyc-4.1.5.ebuild b/dev-python/rpyc/rpyc-4.1.5.ebuild
index 98438a3833b6..7a4ae17ce4bf 100644
--- a/dev-python/rpyc/rpyc-4.1.5.ebuild
+++ b/dev-python/rpyc/rpyc-4.1.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
@@ -8,11 +8,11 @@ inherit distutils-r1
DESCRIPTION="Remote Python Call (RPyC), a transparent and symmetric RPC library"
HOMEPAGE="https://rpyc.readthedocs.io/en/latest/"
-SRC_URI="https://github.com/tomerfiliba/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/tomerfiliba-org/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
RDEPEND="dev-python/plumbum[${PYTHON_USEDEP}]"
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/rpyc/rpyc-5.0.0.ebuild b/dev-python/rpyc/rpyc-5.0.0.ebuild
index bb29a47687ce..bfcf9c33a5b5 100644
--- a/dev-python/rpyc/rpyc-5.0.0.ebuild
+++ b/dev-python/rpyc/rpyc-5.0.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 @@ DESCRIPTION="Remote Python Call (RPyC), a transparent and symmetric RPC library"
HOMEPAGE="https://rpyc.readthedocs.io/en/latest/
https://pypi.org/project/rpyc/
https://github.com/tomerfiliba-org/rpyc"
-SRC_URI="https://github.com/tomerfiliba/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/tomerfiliba-org/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
diff --git a/dev-python/rpyc/rpyc-5.0.1.ebuild b/dev-python/rpyc/rpyc-5.0.1.ebuild
new file mode 100644
index 000000000000..a38e0e9a45fa
--- /dev/null
+++ b/dev-python/rpyc/rpyc-5.0.1.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_{6..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Remote Python Call (RPyC), a transparent and symmetric RPC library"
+HOMEPAGE="https://rpyc.readthedocs.io/en/latest/
+ https://pypi.org/project/rpyc/
+ https://github.com/tomerfiliba-org/rpyc"
+SRC_URI="https://github.com/tomerfiliba-org/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+# USE flags gdb, numpy are used *only* to run tests depending on these packages
+IUSE="test numpy gdb"
+RESTRICT="!test? ( test )"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+ numpy? ( dev-python/numpy[${PYTHON_USEDEP}] dev-python/pandas[${PYTHON_USEDEP}] )
+ gdb? ( sys-devel/gdb )"
+
+RDEPEND="dev-python/plumbum[${PYTHON_USEDEP}]
+ dev-python/gevent[${PYTHON_USEDEP}]"
+
+src_prepare() {
+ default
+
+ # Windows specific test
+ rm tests/test_win32pipes.py || die "rm tests/test_win32pipes.py failed"
+
+ # These tests require running sshd
+ rm tests/test_ssh.py tests/test_deploy.py || die "rm test_ssh.py test_deploy.py failed"
+
+ # This test requires internet access
+ rm tests/test_registry.py || die "rm test_registry.py failed"
+
+ if ! use numpy
+ then rm tests/test_service_pickle.py || die "rm test_service_pickle.py failed"
+ fi
+
+ if ! use gdb
+ then rm tests/test_gdb.py || die "rm test_gdb.py failed"
+ fi
+}
+
+python_test() {
+ # for some reason, when tests are run via pytest or nose, some of them hung
+ pushd tests > /dev/null || die "pushd tests failed"
+ for x in test_*.py
+ do ${PYTHON} ${x} || die "${x} failed"
+ done
+ popd > /dev/null
+}
diff --git a/dev-python/sentry-sdk/Manifest b/dev-python/sentry-sdk/Manifest
index b8c738e1fe69..f25f359541f3 100644
--- a/dev-python/sentry-sdk/Manifest
+++ b/dev-python/sentry-sdk/Manifest
@@ -1,5 +1,3 @@
-DIST sentry-sdk-0.19.4.tar.gz 205992 BLAKE2B fdf7d1a29a04be01bc3b7dd7ef7ee0ad33bb03241d9c62e152aa829b2faddb52e7307705ec4f7d89db912ac625de477999167ea66372bcf9304caef31fb65aa4 SHA512 bc8d23b6767a1809ecb4d43becbe266f1e068cfb953cbad280313e54fd3d679308eace42fd880f356bac2f216894e45ee1b51eb2fc74f73f9e433bae406a2a37
DIST sentry-sdk-0.19.5.tar.gz 206164 BLAKE2B 9d7ce2a64fcb511c659188dc18bc4af18052c0f12ff5d31848f341ef20cbc6c9cf1102d17e6e8d8b741eb8000f94978f840f3ec66b43367820e0ccce97b1fd1b SHA512 082ace137656e8cc8317e70cf4fe9823ccf8cc3ed7b54af059990cede72179924a36896a31a806de4adbbf3bd66e54d5385eb630c047b929583e32c39ed69d61
-EBUILD sentry-sdk-0.19.4.ebuild 2784 BLAKE2B fd8206c5dd8e85d9b9f8f5270483fa20f9a8961fdb6cd92945f30c29ee369e33c4398b4220786d2968d068cb02715b18ee25d4b0ad0da0531c1fa846d6d7ab63 SHA512 16a5de71707c55f671216673349ac9c7b45971eed5ac4d89f28f14d5b479ca97924a02342e27b3f702c5e636723ff684c82947bb8e6fcf48222cb6cdc746ca81
-EBUILD sentry-sdk-0.19.5.ebuild 2788 BLAKE2B 47fa86739fd821f8b2357d6caf8e539412b46b846eb59aaa3cd5c14156634e87c07ccae637184f28cdbec1c01682488900d6e7e8167fae39e10ecacb282465fd SHA512 627bbca3e49f5a5cf0f86ce35a81320253e03b0ffd35dc43f53eef463ff001b8e88ff9b07431d1475647199f97b78b8899cbc8ff394d5d95d506e757801c442d
+EBUILD sentry-sdk-0.19.5.ebuild 2784 BLAKE2B 79e9b1cff5731ca899c2442c514d6cad80b2d0d7fdb1821dfe4a077d4ee3e55993ad6c191d47870932b9806c9420367b1bcb0a7a915f0bf359a5a3efe98e0f33 SHA512 442776b2e8eedefc1ee43f3bec80eba921402ef5c6026ed21e137471ac2fba90dc49e281a1d41076e17f66de9cfd0b328f620aed16220cc45f0d1f3708ef6dcb
MISC metadata.xml 446 BLAKE2B d115ce1b9a1d92cfeb93cd220c96247f1d6ae9514b0d598a0abc9fc6b17e45851a33e6f61b364f682f6530e4ac2611fd0a65b2fb5b21d394e78030f6ef34d1fa SHA512 f7167d56812496468a0766bf6e7d29b99e5efcef8cd61723ed7b09188b515b50fa13275d665f7ff8400b5b451e05ddcec403cc4c75e55509b21b849cafde0a3e
diff --git a/dev-python/sentry-sdk/sentry-sdk-0.19.4.ebuild b/dev-python/sentry-sdk/sentry-sdk-0.19.4.ebuild
deleted file mode 100644
index aa73cdf8cc61..000000000000
--- a/dev-python/sentry-sdk/sentry-sdk-0.19.4.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
-
-PYTHON_COMPAT=( python3_{6..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python client for Sentry"
-HOMEPAGE="https://getsentry.com https://pypi.org/project/sentry-sdk/"
-SRC_URI="https://github.com/getsentry/sentry-python/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/sentry-python-${PV}"
-
-LICENSE="PSF-2"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 x86"
-
-RDEPEND="
- dev-python/urllib3[${PYTHON_USEDEP}]
- dev-python/certifi[${PYTHON_USEDEP}]
-"
-BDEPEND="
- test? (
- dev-python/asttokens[${PYTHON_USEDEP}]
- dev-python/django[${PYTHON_USEDEP}]
- =dev-ruby/ffi-1.0.0"
diff --git a/dev-ruby/net-http-persistent/Manifest b/dev-ruby/net-http-persistent/Manifest
index 5031e508e568..3f93e1fcc775 100644
--- a/dev-ruby/net-http-persistent/Manifest
+++ b/dev-ruby/net-http-persistent/Manifest
@@ -1,7 +1,9 @@
DIST net-http-persistent-3.0.0.gem 30208 BLAKE2B 2bbd87d66e65081c76bc9cddaeb38f3ffd8a92b5b64f7717f77c7a927e2032fa732c2e82e220a75a63ddc10dfaa6a0f24e4fa7e0964e2ebd3d0729127f1fb452 SHA512 a601d3abde43b196406e3cdd6b704796ed70db67dfb67c9b510e0164ce7355cc925cac37fbf4c5889f41b069890ba2e2c15440fb40294ed21891fd08d9f87894
DIST net-http-persistent-3.1.0.gem 31744 BLAKE2B fdd9c36ab5216c1cd1fe358207a689276e109845ac374ea16011469b6cb2b165115e78e701cce98c280e7f878c23d8016e75cac4508c7e579209012671b64101 SHA512 65b5afc4ad0729ec14b642e0e36363cecfff3dc25b26308d632866e93fed3eccfb83ce85da78f631553c6a1fe3ee834fcbc9d3681c85db6387463abbc30e60fa
DIST net-http-persistent-4.0.0.gem 30720 BLAKE2B 5955cd60c86ae74c1f9d3415bf0257542718fc83d2b82cbc6ce31b5013edd1c0c3202757ccaf23a33c70d90fcb04e6bdfd2cdddfb82a45733ae3d15a5c526301 SHA512 eccc6cacfdd1dfb99bd0dcb7fe1c13cb1c21eae0104357156888bd0a5b2ee0b0d8ed5687860670c2dc54ccc1cfc7a090592bee160458427f44c255c1b99938d2
+DIST net-http-persistent-4.0.1.gem 27136 BLAKE2B b88151498c401cc20983c86859d7ef7ae3688ee12a5fcc69544d9716c3aeed55f4339d35ec08e9c0a6a16b4b4ab807d7155425c3056b9634185c255472ad93c5 SHA512 d3c86c9c58affac8cde1513dd899527406c0baafd3a620b80011e3babf51a4bfd6fb2bd8998fd9c4696d49aad2d014bdf666b9626e06fe4413cb4010f94e5e91
EBUILD net-http-persistent-3.0.0.ebuild 874 BLAKE2B a3015ff9e4532090626746a238b180ea045c34fd882edbd8fbcc30d7969d65e78ff1dcd24160ae812531b5851b62f86e3fe9bb3a7650d22614b07016a4828b79 SHA512 9d18e19de760d5a2a3eafcd362f7f5f6fff3768d74b7bedc981f17fd015e3b229d5cb15ba0fe198f898816cd6f2117569f19f0708a00f8b32f53512addfe4213
EBUILD net-http-persistent-3.1.0.ebuild 869 BLAKE2B cbeffa90d3d6359123326301449f942954e254fa6517588a1ff588a0ef4a54b0faa6c0e40bd516b6f9903e3f2ea94811ed52159fcbe660ae2fd6c80c8acf8eca SHA512 72eab46c783f89be648fe0860ac49c12c32834d6300065335a276f756f3bfa541b7980b34a7e7b704d6d983dfc9b18bd7b93bc1a38a8acea7a5390d41789f315
EBUILD net-http-persistent-4.0.0.ebuild 855 BLAKE2B 7ffed8c7fe63f3d2018fc69e4c5e3c7b23f1a3a5902d0033352ab9b0b90e205ec1ebbdff050da1a5bc10b17e454ce8436a89d878fec1e75a2241732714d37881 SHA512 47aa38d2cd60879e4beadf084c133c7223a32165316b29da0ec1e893796cd153c90b954ff1b3304d539453107d103ba6df819deb6605bf1a7f59fe6bd9aca355
+EBUILD net-http-persistent-4.0.1.ebuild 848 BLAKE2B 23b7a1aea4003b9514236c08dc22418f4354ad42b8681a93f9cd186dcac749280bc83ba459d50d6a98db314af69cc460dce737ea67525c8b6fecd3896b20cbc6 SHA512 c7bcae97f52934e2ad3d4d800f7695278ce06f4891b7cb397dac4c66b94309f054cb9bcd6b134d6114a3420d36683f0f101956fc1adc7d60be4f8b4fbcb39489
MISC metadata.xml 353 BLAKE2B 9c2503aa880a368eb25787d0020bba032b96ad047823434e630864c5569985cddc59fb8cfe458ce2ec7a278759f98c677d0413c70d65f20bf2b11df7c1114c0b SHA512 acff0618bb97cf903d61bf4149537876ba57037cf93c033f7a7c2165682d52216229f5d52166e648e313c7066c25bf3cd70925b5791ac8f77f4c43180555d420
diff --git a/dev-ruby/net-http-persistent/net-http-persistent-4.0.1.ebuild b/dev-ruby/net-http-persistent/net-http-persistent-4.0.1.ebuild
new file mode 100644
index 000000000000..22ef11e58977
--- /dev/null
+++ b/dev-ruby/net-http-persistent/net-http-persistent-4.0.1.ebuild
@@ -0,0 +1,29 @@
+# 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_EXTRADOC="History.txt README.rdoc"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Manages persistent connections using Net::HTTP plus a speed fix for Ruby 1.8"
+HOMEPAGE="https://github.com/drbrain/net-http-persistent"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+IUSE="doc test"
+
+ruby_add_rdepend ">=dev-ruby/connection_pool-2.2:0"
+
+ruby_add_bdepend "
+ test? ( dev-ruby/hoe dev-ruby/minitest )"
+
+all_ruby_prepare() {
+ # avoid test with implicit dependency on net-http-pipeline which
+ # fails and is not tested upstream
+ sed -i -e '/net-http-pipeline not installed/ s/unless.*$//' test/test_net_http_persistent.rb || die
+}
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 3f242e6f3b3c..874d9a4b6f52 100644
Binary files a/dev-util/Manifest.gz and b/dev-util/Manifest.gz differ
diff --git a/dev-util/cargo-c/Manifest b/dev-util/cargo-c/Manifest
index d30b5cb1f930..52eeb17ac9ae 100644
--- a/dev-util/cargo-c/Manifest
+++ b/dev-util/cargo-c/Manifest
@@ -1,135 +1,225 @@
+DIST adler-0.2.3.crate 12168 BLAKE2B c7743569d700d7ec3185e0459a18181148f8cd7579f4da1fab30eb2e3c3cabbe5a7467f7760f0cba4b2fdeb62f8d988ee1f24637685d76db7acb56f679cfc996 SHA512 565849eba122eb94d240a0cba875035537058cc168f137a8a3b99392d753815d56fa0e1a1e851062632700b0e3d12caf67f5f768b9f727956a2e5b599029e9dc
DIST adler32-1.0.4.crate 5105 BLAKE2B 344a5258e77328a24a545e32f9bc653fa25b7ea43803ed7861db261bce227aa1599520a42acea3de1f2acebb8fa9fad251e2688413b752eafe2401ca1a2ee34a SHA512 5990e1e277a1c3aae5adef5e4601b807a756a40e88578bb91f1c70d70babfa97fb3f2c1b963482ec8e18c16d5e722bf90fb42f9646c8dd840373f28965a2d123
DIST aho-corasick-0.7.10.crate 111039 BLAKE2B 69f984dbe528ece5ce4345bc0f39c122507a88e781d7c2d5c9175d1788aeef8d21e0487c7c449e28fbbdaae8203fe68627d23ac0a58d30dc70befd26ac9af32f SHA512 e8a1cb252015435009883662ca23408f1491d8f01461f3a81082feabeeff72ec61beb4f1f3271fc8a87f1379899ecfc38036ac208dca17889f70ddaca2406a9b
+DIST aho-corasick-0.7.15.crate 113071 BLAKE2B a22743be74f873b9545648db6a994250e3e39b92ac99601580e3b02194d205e921bff0b1952a4cca3399a3a7828555a1abfb0c1466f3930811c6b95c1a07ec5e SHA512 e67816efa7305937a7cbbb0079b91b8afa3fdab52cfb8eeddeee156f18bbeed26f941cd4cb18ab2bdc1da5a9ff1dcbe9d2090deec68c00287bd99ace18ee8b24
DIST ansi_term-0.11.0.crate 17087 BLAKE2B 9bd35c045a01ce4c6c4a5db1b4f15e9412bb97426eec19d4421dffbec633de8d13452c13c1dc1b30998690b78d7ed38311aca700087f13a81f66bd1d5d7300c4 SHA512 a637466a380748f939b3af090b8c0333f35581925bc03f4dda9b3f95d338836403cf5487ae3af9ff68f8245a837f8ab061aabe57a126a6a2c20f2e972c77d1fa
DIST anyhow-1.0.27.crate 26395 BLAKE2B f510c352ba6cb6be2e20d40e176bd48f7bf39dff4a0be288f54da60346f2fcb9b6376a4f139fbe13a9178ec8feb58a28badc209814d6ed9d1decd7b327ac8a4b SHA512 ed880d594fa5d17f14abecee56f7b2742b9ceb744bf8548c99c0ac6f3880f761df657959ecf512d7d194f75055db668eaf1a8306876d596b471b12ccffb8c959
+DIST anyhow-1.0.36.crate 29083 BLAKE2B 62166679a01ba1a2935316efa74b97a990f3ad720cbe339abc333a8609462438ec0268c4f3e6f5ede1ec972a23ce982d8e5de057c3f76b3f711b1d1d1cba8fe9 SHA512 4128dade4fa361230581973809598556b188195f5cbd951f2be651cb9bdb9ce6bbc45e70e0f05044080b054524d379bf2661cddc85ca157f0b260c1c0b492bda
DIST atty-0.2.14.crate 5470 BLAKE2B 2db856a9e898a430258f059aeaf7c844a153293e8856d90ac81f7d91a888c89198768ad5cb09303c23241fe85c560a55148fa56a303651a82b0edb895616bfab SHA512 d7b6c4b9a0f898d91ddbc41a5ee45bbf45d1d269508c8cc87ee3e3990500e41e0ec387afb1f3bc7db55bedac396dd86c6509f4bf9e5148d809c3802edcc5e1d9
DIST autocfg-1.0.0.crate 12870 BLAKE2B 79e495d53298574afd3b292da7c9c363dcb3ea434fd44258efaf3628e95ebfc731f03083f8a1060272a2a3478a6452cdc41539e2dac08465cc6e6283844bf260 SHA512 451fc63148792ba1952b884170e3481359b01bacca5ec0456f43ca58f8e092b8f81c9764f8b00d4104059ff608089be5858220ee868127c064cc890c767ec3a3
+DIST autocfg-1.0.1.crate 12908 BLAKE2B 40c53cab298e4f26634c3acff3ece6a3371188d91dbf377ed664eabedcde20536edaa93daf406618f37edde019f049a6e7b9a47f627344587dbd126bee2b5e3a SHA512 630b348acb98b012e97804e6325d03c89abc22f2157762c59144c04e6c733daf550bdc7f0fe0b9f3b50e15dae8c1c3c4bdfce3d805b02f0fc987311f5332419b
DIST bitflags-1.2.1.crate 16745 BLAKE2B 0fa6d3ce44aad7616d5cd02aad8c1d0b0fed4022650eb43067c4a72e6fc88da05442674fa51826e4858a47c9de233e1ba2229820af094197cd11bb416ceffb2b SHA512 ad89b3798845e23737a620bba581c2ff1ff3e15bac12555c765e201d2c0b90ecea0cdbc5b5b1a3fa9858c385e8e041f8226f5acfae5bbbe9925643fff2bf3f0b
DIST bitmaps-2.0.0.crate 17026 BLAKE2B 61559f3ea68cf54ea51426a3655a095eda21f0f4078aeb1254655e97ec92b53ecd5fe29835ce073949d5277f567f11de432643258428b5223b8624e23dc318c1 SHA512 6e89076a6ebe8256b99054a62e5112e8aba12f4393905bb4f6577f8cb19179a566df4fac01533aa83e3ae25950b9818828a9526ad370936355b8e5f761b6c81c
+DIST bitmaps-2.1.0.crate 16717 BLAKE2B 817045077c198a84d114f68474b14515309bf56abde29398fcb47d7593d41c3fac069825d8a2aa1a598dea5b4865b94a21e83d03dc8d069672e1b835bc1ad551 SHA512 a423ea009bf61629e6dd7cb954f2781dd3c578d2216cd843957e0db05abc8f8c5971d2cca1915929b2b3c7b712450c817bb1de8d08715a1ca2641ace015a1dc7
DIST bstr-0.2.12.crate 344435 BLAKE2B b55a55be4875d9aefcff0091be82d80a19c1c92d5d6e17b751dd41bebd37f6a5f72d884fa8a70e829905baf3526ce4d854b162d10d894573dd2801ed030460e9 SHA512 2d14ac85274814bb29439acf67c3aaf84ac32ad361dd6d2cbca58bf571c968f594eeb1443a632b625296929b84047652fc60ec39983c110737ba1950d88bce89
+DIST bstr-0.2.14.crate 345490 BLAKE2B 96095cf4d70d88cd5cb4a61bd0e72a673933c7d1d95b713bd44375e739037ae12451602fa539ebf98e73d39a6786728ad145e882117b98108d945ba96b810e83 SHA512 de62c0f31ad672f90a8038fa163c7cdaf474b35ec24592aee5549af7c76d43e6ed00f8d7237e15ab27576c27a7232033a217955de6a0a3b40c83661b3a7e1e8a
DIST bytesize-1.0.0.crate 7522 BLAKE2B cd4f9687753ec1ea4e7435f34b64afdf6e5534d33515d00c413da37081dea57eb76b2f3b8e001e65ca40908efccddcfa458ce1e3b5974aa79232567d9df7faff SHA512 a8837bc05efbf6faf55ce76cffb0f8ef2f47baad2f65875da246f4a8f1052af0fcd8f156950deac0e57e015183d740e0d8ced1e6da1aaecf03244ad370d926b8
+DIST bytesize-1.0.1.crate 7629 BLAKE2B c1f969f809abf5ac432e8590158781c26d11448ff0590647f2d60ad62d416a9f93e8bf1d5a650a40cac21bda90310c02f323bcc4fd1e2ee122de1588aff29352 SHA512 99a11059c27ed3c0279acafff1c0fa27fb7e5021876d2ad3a79ff8f31030fdc8a1b5969063ec6578499412804564cd3cb325c9198196bd4a078225a47179f605
DIST cargo-0.43.1.crate 1119258 BLAKE2B b6ab277b4c06064fc7ba84f829363a5bcc2e484136b2f50f75354234f6114bd424d2f88952dc45c7f671751cd1ebff3ba3076c5cc648de0550d5ef1e122dc3ab SHA512 950e6f30643b38c90bddcb2be34f02c7e57da1e3f8afeb2f0f1037d93a877928064748339b40ca520ed045d36ef5c25a8bb3ad294316fe657368cfb50163f399
+DIST cargo-0.49.0.crate 1312720 BLAKE2B 700e677b5b2ec9567219bcb3103829542d459e5ef79a40093626cf056370176c68be008b741a21684661661cb079c085869e56bdaa21d5eb6cc0cd4b9884c6c7 SHA512 2590a4a71f756e5f614ec500be39c08c627994b6c3fff76c5d5c7fbe06bd7bdcd4fe1bb4971b54eb4d8b5b10780931fdbc1a410c049d97ee84b9eb8c2502a6ac
DIST cargo-c-0.6.2.crate 19994 BLAKE2B fe2c9a8eabaf940082628ffcc481ff45640d16fd95e6e9dc8fa447aef13569db3257e73c81b1b0abea6a61aa57ca2a86eccc28f2a9ecad9bc698c6e73f9fa6c6 SHA512 430a5c96ee230419b79d80cd979d8baf59ebd93bbb75115c0c77dcffac1dc6b1c9bdf1e91fcf45619d3aca608f91573e854dd41921c1cc2a53655a7d7c7c8f0b
+DIST cargo-c-0.7.0+cargo-0.49.crate 28605 BLAKE2B 9d202186eecf8d42799338277b583cf2cb6efff1f98d22442070d63c57599bbe6201d20144172a210f7c1e2334a8e8d61c3c89e7113d2afd2f2b17b944a85d0e SHA512 d76147240b30811f6085dca040a68ee90d3304d38635bdb594d8cb04089050b687322a05cffcaf4dd32f6cdeaa355a983b8b6cb2843df40dc7cb3766b3df6342
DIST cargo-platform-0.1.1.crate 7409 BLAKE2B 503bc17f9cf08cecdc02371cfb69c70b0f61203153fee4ad4e5b8adb995e1f84e6a6cbb12565607fdb1606372b744fd3d4519f2605f05eb83078c1fc14d789a3 SHA512 b8758e002ac6c4c4440707a27cd747c90e2b128f51bc80464be93bf8677aaa26bec28cc1f730cfba639fb022bb030fae5c06c41773c5692bf3a12167d04f0d57
DIST cbindgen-0.13.2.crate 160484 BLAKE2B 9c69f957305c3bd2c3056b45875dd2115309f01541bec4bce718f5d843dfb5b3bb6746474fe8149c42c194922ff618d9e3f6cfff13f7cf9069afb81d2da3e569 SHA512 2e894c6cf2b08321418ef78228fbebb5f504aea1576b8e159b4d8d66442cb65cee4f611f0ce13fa58539c08fe21932358fcfead52acbe5413adc9fdba05faf66
+DIST cbindgen-0.16.0.crate 178160 BLAKE2B 45e6d3054582069abeeb6ac9cd54bfc25392eff48b84ae6d5f05f1a7d416caaa0194889c6ff0aa3090fe6eb844087f5ddc3a7be292d341f86c221d86d646e662 SHA512 aca6a783f4347bb977d115b5a1ae8c532b0cad1509a6ec0ddccb4d5f043c59de1242b4f1f4ab081b7ec04f67b5f137b614ab71374377efeb7b119043b47e089d
DIST cc-1.0.50.crate 49792 BLAKE2B 25ec14fd42536c381babcf697cf96fe8be61417a61ba5875a2461bb40bf3ffd9c9d03e1d9df83e2dabfc9472de3db97b08fdffb710e89b868a5e115d0463a9cd SHA512 34a721d9352f8b59cffb8cc0b9c520b972b65d6c23e83d9c6f6e88d6a6845c53ec89350a4aacd0444a5d6b03b867b97aedaf418b483afead209a7ae6d3885f5d
+DIST cc-1.0.66.crate 53454 BLAKE2B fe34309ae50a3b022c36270a1dc819713f9d70e9ade2f421c33c542e865dc861e3b5191e8949de253515aef6878f786a6abe048391a819d09bf57f33054a90ce SHA512 b07a70f88fa0588fb0f6bc7376e985834672cc9914a0713afe01740af6bcf01821d15720d831e8b7ea8b42f5866dbd011a245997f35bf8febc3b13d66089723e
DIST cfg-if-0.1.10.crate 7933 BLAKE2B 063a96ed176f34f788666b40adc483d147fc011dee941ab60569ddd0e57502b5dd06ed71090f4e14ce005d06e240500a286f74652615e9d068fba649610d8cf8 SHA512 9d22616bfb4a75770a828a0a3cddac6787297a5fdc53eb17e25811cc94de717f2de8bd66d53c5d65ba1c83d8892aefee5ae758cf56a1ef0a0c3120f70b244339
+DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff
DIST clap-2.33.0.crate 196458 BLAKE2B 3bb62d817afc77b421a6282746b9b61367d224de6b614c7ed66bde452ce1046728077dab3368a46635b5c74d82ba3196586d87c0201478ce5b89638910dadb1a SHA512 f1075031414d48e4340bfe308904a95a31b72460724773c52a0bc8c004e625a04c904a39fc5420cb8c26a633321f9b5f4f69019c7aae5ed89900b63ed8c21a91
+DIST clap-2.33.3.crate 201925 BLAKE2B bec9c866481c5b3fddeb314f68af9bce38fc421e42816182de3209e8ea3447b72cf033e6251eea27fe974eff8085b7d98cdd2911b5cc0ec6b4bf4c750deb8a25 SHA512 3eb0fd648e2e3f9e5ff69a5e6cf0d867304fe18523accd036f28a86de368e4774088a6936c108ccc045092c539fe7f7494ea96420ebf6b4bec16880cea84bedf
DIST commoncrypto-0.2.0.crate 3009 BLAKE2B 174f3099955d595040005ef201361bacc3084f5218efb0f20df8082b9bb683909a10ade64af7062edfafadb9674b27a06836f2333fdaa7d2926b207355f7a40c SHA512 61f567468221cc46b30b31ce96dba26e3dd3a9245a8d37f9f8a615b346d992c261db059bdc678882415c608a806bd45c7b38a5bfb562ad96a111cee8e1082e85
DIST commoncrypto-sys-0.2.0.crate 4338 BLAKE2B 992a06d56adc97a9d02c547766c2be2f1973507fc0083e50c623dc4ac554681b802f3fb5ef61ef430e4a58bda000170636cf6e38430550e0c0506438901fae20 SHA512 06851fbe0b87224f6c8333964237badf57f32256acb7e647ac2da16561701b7572c12509e042d0d1032a54c94c1663bc2ff19ef5ba3a7daf84276f2544bfba8e
DIST core-foundation-0.7.0.crate 25384 BLAKE2B fde852b7673cc972da8d2f8663c2c8372fda36fd577d19c9536f9df929f649ccf94150e1e23a57013bee3cd8cbb6fb894c4fb3a5744171bc6be607cb27e2757e SHA512 919041f431e21783193c0661b82cbd15946a56e24e5100a6a9dc02476ddc714595fb0416ae182981ebf6a8b27181e3178135c27388b41ec848423d739a265da6
+DIST core-foundation-0.9.1.crate 25985 BLAKE2B 22e70b7b1cd1f39c4ac287f406dabc549e3ba750ecf17955f129ff83afe67bb4bdee7e7907287eac0c28597df971de27dae77619f44d0368864c08798def1ae2 SHA512 d6dae760082ef9dcfc37d18acfa9a6ad8ee491335d17ee17447c5bccad623564f1e8bdc54460fb260aebe9276ce5ea4d8a389a83b5c7d17193614906c3d2bea9
DIST core-foundation-sys-0.7.0.crate 17033 BLAKE2B 26d190931c7462ed8c13de82e86d4417e0d130f97295c8435ec666be08c7bdc37894ef25647043970fa40eae1c63503d2ad7660c2ac17ef35d7d35698652e18b SHA512 b77566aed2b572bdbce6f71ca9dcc942ef96b628a7ed9680c4d3e3ada4a9dce90c1b439a8c7c7f22d68e51becf1d22b3262e227cafdf8cfe5f42db0ffb9dadc7
+DIST core-foundation-sys-0.8.2.crate 17461 BLAKE2B bafa6f6af67f55b34c20e50093a5426bed35c159058a97c03d28c99b6f0075305596907291d26b170ee2ce1bf0c74bd51e2c54f11ef021399791129de6cabb57 SHA512 1c66f2012c11185603a0e4c09311d32bc4ffe639ef7626e49bb15006306fbed4c963f2c53d3b853a254b29cda73c393e0236436575d217992268463441ac7348
DIST crates-io-0.31.0.crate 8907 BLAKE2B f0d110103f639e348498a6df1ba796c78550c33ee3a089cf944f0cdc3541e20c05a85778d43bc1b58056010c980643f8ad9ff3fe118c1d46bc37e7f80dffa8fa SHA512 17e76ed6f34a94810e68c4a6473c689887b1d917ff76af5f0fa00697cdc455d4d82d3e6cde095a5ade81cde872f88a2cd7f754bb93f7ba75309dafe2ef34c450
+DIST crates-io-0.31.1.crate 8943 BLAKE2B ea8b4ea737ef07b27861555b8940722798306fc8c8adb908f81158f16309eca2a88db2ce6ce4a4d814d7a11f1625f2f9a13500ebe2dccb2cef1d435161baf5ad SHA512 2b04cf7ca5a79c31f25877c5d28d70d958a9bf31f5a057568272ffabdfc8131dd4fb5c76cc06700ff74fd8877b8a0096ec0a72b38a7db0054e75dcd6f2b45e74
DIST crc32fast-1.2.0.crate 39161 BLAKE2B f71c85801f945602d53f93ce251c978c91f63fcd92fecba5083fff0f06738697e99d92c17a824605d5d56b3224db224ff32e4b147b6f6af47ae714dcd511e7cd SHA512 2ee73e0642f83e28034c1baca65156e65d751214e83f2a4ce94b6add5ba11f74ffc80832a3348ece1c099367be2b11e820dfb349fae89fbced1b68bd6b0466f0
+DIST crc32fast-1.2.1.crate 38172 BLAKE2B 80801a345f4c5ed8a5fd335bbf672eac1733a1c2b333dc8a8e0254338148ce7b34402201a8d2d7434dd1b057f33d99d3a8f02610ea50b54115d80bb8da28b2b0 SHA512 4c04236bb15a5c63b712c62652777917e947823abb20a0d0b372c850ec1c8695faa414e8de73904f1f1a296d7b00a6206cde8da404cf4cdaa2e8408e64b62b5e
DIST crossbeam-channel-0.4.2.crate 87419 BLAKE2B 721013134069abc8f01ae5e98e1e6f10981d4892881339d3bf87f1bcb58b362348dad92e702a6b2367075dd41d860d62cca0ac8b3691954c454ca70bb5158000 SHA512 19b0ed2b5ed0fb1fe7c809e08483152fc36cf46f465c8571ca0fb9ebb1cb4b2b8f5860a303c932f336f434dafa9776ce6026ea2e64457147fb540766dc6da2ce
DIST crossbeam-utils-0.7.2.crate 34338 BLAKE2B 3cb287c7741c4d5b0551331634a75b066f07fb4b55fa2b347370506467a05923254b1c4dca667de59ed91ff91f5496b37f40f13d3e9885a1b4f639f5b6748433 SHA512 e375f24c007bcf660d9e297527ed938f678a55696ca7b555b96fee7e0b94c31db2d3f4355675aa0baeadba68b9755ec92dc3a09a37b5db48e3723b926fd4a8f3
+DIST crossbeam-utils-0.8.1.crate 35914 BLAKE2B 8d8e7e2df01f061d3596127dd62c1d5316540fbdb34e6b88badff8968a408b2bdbd0f86a32531f4e276b6d40a89c4834cd8e9991288a0bb8cc27d99ba2f7b978 SHA512 c9f3a513fd139dab3c8091366cd6d378ef8a4d00eb43a6c26d107361fea470a5ab180950a1204c1a8881c2ed1106500327d598ccb09c79d0eba2db11299aa286
DIST crypto-hash-0.3.4.crate 8102 BLAKE2B 8bcf39d195d40a2e6d899fa254c9f64e982d742fb304f4b271b75db305d5afa8ea5361c0b6adb23c0fbfd212f3c4601bc7476b4874eaac00a26c8a65b711b0ae SHA512 57d020650689c988859f51ec9252702a7e8510526364b00058b263f4decb249d7296811adf3b8c5e76f8aa744cd5e444aa198f3dfe134c98257b99cdeb824537
DIST curl-0.4.28.crate 75395 BLAKE2B 5c837538d411958c479e4b831114044f3a4b90b8d079f64f80a8e76b42bc79b1204db00d2f85fe65f88d01df675dac6c6c958bc11280c682cd46924e40c48dbb SHA512 67d10f183334da78457283ecb90a27825723d772bc2031871d789a7173e7f5266e05195c84522d5c64697659eb7c1a6dccecbc4d3f772a71e7fff6f687a6a5e1
+DIST curl-0.4.34.crate 84129 BLAKE2B 94397213cbbfcad521bddaeeaf0b8e394223b72871cc9e0435edd4e1ba078a18e64e830f835c436285163512801408f33c64cc497c059d08d1edac1527aae923 SHA512 50250a3d5bf5b3fa899089a5452e9cd1dbb6553647ee52c0df4fb5837878131c4bfe84cf912e6cf5ede945e94906952051f4a2c4ea140cfeb41a91efb36f61a2
DIST curl-sys-0.4.30+curl-7.69.1.crate 3006445 BLAKE2B 80c932b9e9d847258e2704a47af3edf028581a076df784b13e99af639bd9788c564bb8ed6b07900f5660a662817bb75fe3282c3ae2e2118fa26045871fed80eb SHA512 34d4e520d25215b35af150a217105cceb3934706c4170eb2e42324d352b6778e82bf23be3a3ea1cb73ff09d7c0bdd20548b6396d6b0ebe1cee4dfcb3c3c0abe0
+DIST curl-sys-0.4.39+curl-7.74.0.crate 2878786 BLAKE2B 4aa2fbafc3aaab6738c7c8433cdfbc3d1b7c0186ac630d0c097fbca7c1e5251c37b56a97eb78d0864fad281f3a53603bf11709f097ff092a90bb8ce1c9674a48 SHA512 ce13ffe129f62f9967f15d18cefbe9c9c38fb4ad2fea9dd8b736981199c89b7ef8ccef2d7411b0f007c44a81bc1a357014a363bd0e715aa9311a517b04e7382c
DIST env_logger-0.7.1.crate 32281 BLAKE2B 6f1894c64f301ca4b687270c911dbe230f674662aa0561b97c4d2537886e404664b5773d4e223e2018047c222a951232c3cb52ec5bddbfb6665e34c3e7ea52f5 SHA512 604060d2ee83ab337a2d20d6784d1b7541534d2fd9e1662fc5c709fa681672a9db5e34d00face864b56ae321962e644ebe29fbb6d68a0d556419cf5d71c6149f
+DIST filetime-0.2.13.crate 14348 BLAKE2B cdb21f88ba00293c93f4831ec81b1c5468d6ca88fc58d3c3daa106c5476089df630ce6082280a77bf6da881dd95f3000f4abeb2469d8aad4d0efb6c3bdd80a2b SHA512 ba7d31b0946bc30782feee124dd904b4c3ba75d1bd81131e3bef06faeb019b51e7cc436a4fe86f3dc9615900fa27bce3f4965f13472ead173564054db8f6f786
DIST filetime-0.2.8.crate 13527 BLAKE2B 49b9f7a786e3920fd0d457e8ef09fb729dcf557483e17940091ea7079d3bf331e28b7d9029b3840608c8abd6ef1ecd559644826bf5f9bec66881022da9ff72e4 SHA512 c94d3c3926972f3105be52a48654afe3ebc7822d2ef77a2000113c3a85e7f0084b3598c6845a09e8e530d68f50637c3c0b9a058fdfb68052117af3ddcee89d2a
DIST flate2-1.0.14.crate 74183 BLAKE2B d3ef991f13e063deec70e782c07d064b033c50bebe2d92fe648cc21ff45e1716e7c50eff84f3805d3b11d7ea3510cd97d96b75b531c8f03b56e06889867dae08 SHA512 d70ee34d21b345529149b95000692e2dc590e14924d862cefdf926e77bb6e2572a99d0cea76fc0661d1149730cb3914598c1f500bd09661338713894b9a19152
+DIST flate2-1.0.19.crate 73768 BLAKE2B 1cdce9db71ace32d45b90774cc0804f4f663d1193687e9487ffcb8b8962006c680449dcdabd296e1b1046bb3dc2d910a11106f24debea5c63f757b471fc33fa1 SHA512 6e802f351085ce8804afad32d9502980269e2c03e2315349b9dcdbbb6895f61c89fbde822e31504eb00d94e665e1a8186ea3d128b5b612c61323494a8dd4332e
DIST fnv-1.0.6.crate 11131 BLAKE2B 220cf5463749b21e1560419ab9b1f235de08dd548c4a9a7fa6190d9516ce7db884f877b67174ee50b66b22be80d3be73ccafca80e06e94e0fa6e96fbb94475f6 SHA512 f1356b3da25f76cb3ccb4336ff54d4967f1dc7523eae6cba21a4349b8ce563516f6a2aa10d626cd5bb6046b55ac2f246e61e4e526a03fad5e78d0ea174841844
+DIST fnv-1.0.7.crate 11266 BLAKE2B 81da85889c91b6567e0f555e37dd915f1bd919719d1ca10c31a6861d7aec29a49ae9c1e8bc500791bf9d6b8dbb318c096d04872c5872a4b1f7d45fbd8e12842d SHA512 2195a4b34a78e2dd9838caf0ee556bf87cbb4a8ef5505aac663b614eb59dcfc0c40f432463ede41ecca57bfe7711f72673d39a85fe03d426f1324097d5628334
DIST foreign-types-0.3.2.crate 7504 BLAKE2B 520818b702d990d296ecd31a8646850202509ccfa18edd0e1b260289619a6c351e758f317ec0824bd76eccb209b6f087057c25f1bd01a47897715013dd834867 SHA512 bf27b8243ed482c202d120383374f19ff09422535e24b9c1aebccc66529bf300ca17b8bbc76d67f98ac092e614497afe3add9dc68aa69c93074df05762f91232
DIST foreign-types-shared-0.1.1.crate 5672 BLAKE2B d2e42e04b6657e7a69fe0bd20c672176629c743e49a55fd007bb30e289710b70045d445ae9cae0eeaa747ee708c90e8abd9b5fc39bad8ec0666befe1b696d4f1 SHA512 bafdb2143e136fb0818e2ffd90b5c862b7181647d6568947d4e4531012bbf7a57b597221ec7056c1b562dfc0c3b5dead26d1a4111ebc15e7863737a873518a4a
+DIST form_urlencoded-1.0.0.crate 8412 BLAKE2B d65250a1d56cee26befb8733733ab67ffba9b9826755194158f336a22e792d38320292548ec73cedf18a56a806707334eb75833e54bb811c56a2ccfee05aa731 SHA512 193b8630b2790931c1ade898187637b2efdfed60b2c98a2dec6658380433fb7711fc2d8196834c19eecddd219ca7383e4a4946bef25c664bf4dc010388b60605
DIST fs2-0.4.3.crate 13138 BLAKE2B a8c53130014affc276544360425718c480fe6b6583675e15e8bf25dca0cd2752aeb0793135fce1bdc12bcfc0ef21fb7f6aa298981d61ac150300eb134c2014e0 SHA512 b83fefa9123f304e4813ec1dacbb1aee5dc0c94e1316cd7c8a434aa2a242c9c42523d2bd8232d78e6c84c4e172b5c46ef8605e93b54216a2d4496fdf885dcf50
DIST fwdansi-1.1.0.crate 8280 BLAKE2B 5c46e66a7fe25e02aaf42668853a0eea8ab3bbf9d160702770d94f8e6c4b3efcac9f840387516d1d14cf34271981ba095e3e0f7a5eb009b9d5837f94f8fdee3b SHA512 5f91a6fbc40b00a06abb6686cdc0389a837fea6513a9b9bde7cc4ce5cdb19c180ab21ecb5927c41a52c56675991ee10d127335c1f6d8c52dc7e6b30b32411370
DIST getrandom-0.1.14.crate 24698 BLAKE2B 8139227951eb65cc2bb7bba29291c0e8ff0b8d9a8e2d7eabb01682d1683c989c44b6195952ec7d087c338538c1d6858c45514822625266e0996829e8c50f3d17 SHA512 b5cb78ae81f31fffd7d720f9ea2b5917b4eac103711faf656a3a3fdd24ae5a2e671016d39309cdd11f902de919187311401dd8fe9e6ed68c29b83987de77c957
+DIST getrandom-0.1.15.crate 24786 BLAKE2B 868817d62ee44fa5bbf54f9af0bd71a29503f92bc93e190a834f4ebdb8eb73dd29e175c661f9964298987949c0b82a53e99080cbe4090fc9c5453daea4b05595 SHA512 b26d9558554058f8a54b03f56f488db5ebad2d5cc84f737e489f8f532f8464ef9038d104173eb30acca61caa1f99e1ce267bc493c01ba1611b829e0a090cc87f
DIST git2-0.11.0.crate 158388 BLAKE2B b58cb940b2341acb458e0047a0758de26593a36f7dce30ae8386919dc50ef43a3094ed9ea834e9f141e9551491c1a5b7cb7cf93122f41283235fc75624d01cc2 SHA512 4625eb25e5e88c0f608917a5a6a574372942bde8697f9e2ac1a8198c263a89edaf42cae6738dc87343b1b1359f56462886a3551e9f41ac6c19837996340ebfaa
+DIST git2-0.13.13.crate 178908 BLAKE2B 8d7a556ee3368254261bd4bea23c02b407ffcc30991196064dbf23167a4479f50e2fd099aba2ec02bfea4c8c7f012d5dcc544c42f94573af1b5f20296717719b SHA512 f98bf48c925d75fdf4d661cc36a7416236ca3155a5b4f6d0a29abba484b9a48a947d92197470cad25f2a16acbfd2aa6f0d7836cde73480a42a0e50be734e0c96
DIST git2-curl-0.12.0.crate 9340 BLAKE2B 231859e1358e7237e683c4d243f184170fbecb49f69eef611aa92c34afc7fa86801d1be7009e6e37435a6387339ae7f92acf5a717047ed37280e20133415c594 SHA512 ec047a4a11e49c4c4ba2f132b8e6f86e52cce85cb1eb5337ee069d39033bc85234f71a7990d3357de5cc190121c4ad4ab3562ad5aae13298d830e508e182e20d
+DIST git2-curl-0.14.1.crate 9336 BLAKE2B ac2338bcc95315dfbc1528e29fbe7e16a4442b2e2aa94350b0f7e8a5d643db60f901d99ac5689c1b242335eee78194449c64d3e7082a2f164b6b80fcf3100134 SHA512 bd1f074631f902c1affd167db0cbff329aa07b2a46758af97c71dfbb5308a82562efa2c42e21c5be63d7c93bc1052d688beb71cfe1588a4c2e9705679cec5a1c
DIST glob-0.3.0.crate 18724 BLAKE2B 1f1dd380e7d668a0c2cff9134279ebda958b4bccdd4a65ff01f9665b45ec4cce8ffbd47eb46e52cf516c5fd5803561e6bcb60cdee21ddfbb8601a95d45500620 SHA512 87098ffdbc518442995c422120cef71f83069c8f88a1970ecec5105b0f284ddd92bcee929f5c230d5b90ae1ead7e1214c3eea26f4a8b26715a00c1ab8b09bc46
DIST globset-0.4.5.crate 22830 BLAKE2B e4e1c4924577cc8ad14f3c76e49821b2f6050395e7673cdf4d118e7025e59e6df1be807762a484ee80739121b14bee8833c10b52ba69a13537ff9919f1bd2e3f SHA512 8fca9a19953370aa5d13b876a254f71ad6ecf0df218d8f5598ff2328eec9676be56b3a44d898dd031c8d4328bda939ee198f9b8dc7e03b45a1609b6f693a9088
+DIST globset-0.4.6.crate 22893 BLAKE2B d47dce5ddb342b5c544f50c01160df66e81e80ca8a0abbf90a74ba67aa9c585843c051ea98ceb7249d4a56e5c1b985b00df734ec0fd19439274a8c1f998dbe75 SHA512 aac2b1b0f47103a0e8b404f4c97bcaa8561d51683fe741a85d745b3f30b56f0523c2fa21f21a680d9e883c697eb4232180f042dca290e954ac55429ae251fcbc
+DIST hashbrown-0.9.1.crate 77734 BLAKE2B d59002253112cf92173c3c1b305fd03fb7318ef187d7e033433baf6a354db046d1f3fe0387b3cf500fbcc0f83d2b2076527ba7cda2695f7627eca0bc3e3487c1 SHA512 dfa4742111f6fe757b7fa97f04c7b4a78ce9708c87e8e09ecf3c28f2566e48af9885fda380ed918cec37b5c696110fbdd30273aba6e7d2221c9e65f72af064fd
DIST heck-0.3.1.crate 54666 BLAKE2B 99f7ceb44ea6af445749989730ce1e14156018ff046a136be2e6474b285088e1d90d6f8af9352affbbde5bac7e5a32971dd99f249f968105e9793b7de76def07 SHA512 134722192c46fd64b38d2fbec3a2511c560916e906491a72c4ec9d99b9f716dc58942fb99cac99b9a6ef2de5b5ad1d1c1155f292d091401b6873347d80c086d6
+DIST hermit-abi-0.1.17.crate 10065 BLAKE2B 79aeac5f72873a29b53368fb01ed4288224692cc7c55221633775641ade40693bf3fb44db22cbe4422a74d1d6330450110f21b586426b6fb8ef93f116476c644 SHA512 1ed4688f2cc1f1d5ba2f7637e2a9dc230712ce8907e1fa3d95ae374cd4b67a325138a98f2a524cb03f99625775057aa0370f480a73ab20485f0456e2f108baf2
DIST hermit-abi-0.1.8.crate 7581 BLAKE2B 90fef564dd39973c5ff8ee3d4a9b129f1ca00800ca459c644ee08df1542c5adbc06881a7a59d37fe6e03a72a2df21917e38544759a2833dd8f8c065261cc1512 SHA512 25f7806834ea007174001284200201895f4536d5a447dea6c165b43c30b30871f78da5f3ef0d79579e3195951e6fd7ee5e21ec80811c515fd096f2e7b3bf7b9b
DIST hex-0.3.2.crate 9053 BLAKE2B 3ac67d26ad367df7543967a8153a2ca7c082d5f56df16cf63a37f76157ce94c68f4cb11c14cc75621a9c45d19c38425acb92b552dd6f45b9052d90cde2ea6e5f SHA512 fbb5e86da5c7fd4b7ebc505d4c0da1258b06406d40a5c6c1626f559e1a91525fa747cbb6e35a687c63216158832ceb49dc61d68cd7d74f2df3630b36ac423852
DIST hex-0.4.2.crate 13385 BLAKE2B fb185e0888736515b8c1c4c00f831f1a4a7b2a04bc0262c80bb2425563b3ca8059fadeff8660ad738bcbb522d432dde98ed6b14aa1fb8c03cdcfec6ae282a55b SHA512 b37504fa6e41caa77c924b24893a7b505330aa8c39501b3ac283fbdffa9af2b89ccb9ae004ff415af1c813fb3da222dba62f17bb3b6210a259661e2312d099a5
DIST home-0.5.3.crate 7890 BLAKE2B ed1cfadae63d1fb0a66f38aa5440dd09a98343e3afadcf1495bf69f3ce813774c9a49776c6b3641001b6007c01e24ffa6d2600c1bab05c4ea3353c74ddae2fd6 SHA512 cb3b7b24db30a8b29f36f90a0d345b2e187f9e76f22203e142a77c8308dcc62e97b5714fb0ed890210b31375cf30d3362b8d740fe189079a6d3a095be50dcb0b
DIST humantime-1.3.0.crate 17020 BLAKE2B 37efaacedac293197ff7acc8b0446a73243a2d90ed8dbdcecd9cb0af6e901f135e1d92aa1a642460f531a6811a5f08075f8aabaa9941e96eddef301e205fdbe1 SHA512 2589bfdac96108951882b7ee497528b9084ddd344a67914810ea9961a1e319167d5cab959c66cbb26e398e75ca50d488a251694fff35f3c2f69a88b6f22844da
DIST humantime-2.0.0.crate 17374 BLAKE2B 35f36b30d8fe3cb26f666dd57e31ab93924cf9d1c40d6c83cbf800f141c951634fcd641634a8f552baabf858303570bf8d1207e5455d5129f433d0c95b138c35 SHA512 5686246351af000cc38d10f65bd6cf3fe446dbedd75867f9bfc7a68c4b8183ccfc9e0cf14b7fa149d912acbfd9ff917d8ed5be3b5eab7832d23bf573a8e024e2
+DIST humantime-2.0.1.crate 17381 BLAKE2B 254f2bc0ea87123b49c22e95ff2218abb5f611918ae5419b960b472ce3402c5baf9d66c3a586b0ad9b10639473a0dcb660b8a8d79f86e5d6bd48768cc6aeb0f8 SHA512 c3cb464801fcbeea7c04e148cda2467386b7f008642d2641bdffab85784c16aa2708e847740772674d62b746c66d404e3b8307ebaa9c2df836fb58b3b0278e62
DIST idna-0.2.0.crate 257203 BLAKE2B d26117124891f90b5e36af291c9038e2f4d46402c41380a6a89758459fd73839137e6faa401502be12dd81292cd9e12ec82fc611c0ff7a150510d19010767558 SHA512 375d6d73537a5c9cebfc850a2b561d57e748d80059ca27fe5e35c058cc12a5938cfbb39a76cfe57fbe589f7e36f89ccd91ccdb8899458c322e277c299293bc7d
DIST ignore-0.4.12.crate 51983 BLAKE2B bc0e8c263b8f128ce53761bd225249f08cc81c4301eb496c8503e468832f5dd8d93f5e0ffaa5b5590cda3ba94c3b861cbe96afc4d3cd309d1aa3030224bfebd1 SHA512 5e0afb4094ba87051dc5c545aa673bfe86fbed4dc33462f444992177d114b18400936a2a018c44fc19503951645667f16504144548753a52df3a9ebb167c0c72
+DIST ignore-0.4.17.crate 53056 BLAKE2B 734e74210f13e5ad08864cc8b143fb780383cd36048e78da04a0475eaa760867dd4a385b37fdfaff0c5aca946d4aab19c4901df0833271a3ba05887ea5dec9c5 SHA512 52380126bb46478875093eb39972949625e1d9ada6fac7148faeccc22807d8e2a1e41c34549e7d9f884fd3cd6dc3d42b47a88b5b6de1089d7e3ee8014b3aea35
DIST im-rc-14.3.0.crate 180179 BLAKE2B 6d41f9ba59c722b2c830e48f47b1e58a65888796db50831e59fb4239fc7437fca3fb46f62c6009352eef075a745bc1342c531da1160e8a72e7eebc11bbfd4e82 SHA512 525e2be44012dc79a94f662ea6bb0ce6e517131df389b3ca147b6886284f6121db09bd90217d4615dabd42117b7714e95438af714cd90b336e18be6d2a794fc3
+DIST im-rc-15.0.0.crate 182171 BLAKE2B 94605a89b9f375cc2e0a60f107db600ca57b7f342d1d686ed73a24d9e4851d790b71293b0b0440262ee45ec94defa8780c7611969fbbe36532b328964ef12c22 SHA512 4be0ad2ef6272d39b3305dcf50c97836839c4917163c030ff2a950fb16deb4eed0d3026f09743479b344f9f688419449e8732923ee1146aa655ff5aae6279003
+DIST indexmap-1.6.1.crate 49644 BLAKE2B 605929e1b6b3473171fb2af7500d769783d7e3872244800c107664fdd7decb7603bd3657ba208d3022a931fc499bb2c2e6b8aed85f880d3ed1deb827dab70703 SHA512 a859cf4f2db46fe753aae0562ba6ea32dd529789a29784324e82b03f64f42a4f302789230ac298860513b1cd8cb238b7a150f6f865d342d606fcb7a2787f9a03
DIST itoa-0.4.5.crate 11194 BLAKE2B d8f0e2aaf62152c187e0987ab4b0cf842ac13255262a9ccbf8484d730ea5397572791c023d2363d0562c18c8efd2418680583e99a1f5d14450b3f0184dce69ca SHA512 79ff8774524130a4729d5e708a4a4a837b3e5052384a12c22db4ae3e208dc4391ee185365f685137a8ba55ea7dc3499f8cddddb2fd98b84177ab292c264034d3
+DIST itoa-0.4.6.crate 12167 BLAKE2B a0ab539cfdaca0a61fc55afdb74ef3231d300452fabbc747cac16a51ec74b4ad5c877e2b2a35f3087693c7eb55b5c389b5bc037b960733ab2afa36ff781591c2 SHA512 9085ad30313a2904fc60a85afed99c7388a345ed50c988f4e7307b23b5f38b14bc9ff64edf02b85fda6c363e035ac314241d5dba4a6e2dcfef3d2648cadb9692
DIST jobserver-0.1.21.crate 21228 BLAKE2B ab1a6496d609e19235f022e920495e708571116e90f8c036edb5f7ba270c2ac938f7571e89f3fb714043c87623d4cbf1d404067ccac6a8b41e4a6768039cf02b SHA512 944249819e1e3dd09495ead941330e9abe439647c1e66ab7e2140c0c9e100b63f4f792fe06aa3c86f509f057df297ee2d35df0ccdfd4bd6a115b6a44076237ad
DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8
DIST lazycell-1.2.1.crate 11691 BLAKE2B 9b1d6e9ced918aa94dd5dddcd3ffba59116dae922d264180ac36c288d8a6dd9244324a7c3050c5991b216a241e482ee17b2e6d27527b88339b606586128df1f5 SHA512 de74ccd6a3c32c360a12a51ba1d51d6530130396b37d63350a960956ae0ba13e9ac31e2bb70b61ddf055fdfbe7e559b20a38415cac3906839684905a01256ff2
+DIST lazycell-1.3.0.crate 12502 BLAKE2B dca2d3f46823a52dcf87b7d6103fc4f1f83bc5247ce361946ac2d9df239fb43ce4b418104503698dff0242480cd014996e77da4ae0a88f3cedbce4eb9d3c9ef8 SHA512 f9d627afc28b61e9687a3f72260eb013401fd64057647641ff2e763770d7380ab1d2d8cbb4a3c8818d53d504c618a3b46aaf701f72f4d7b25d226042824c2f8d
DIST libc-0.2.68.crate 468882 BLAKE2B c313ba0ed94de22abf2a764edaf1ca5dc4b86e98e004c3c23d53c7684996d68a4c5499fecd0afdabc4af3e1308e5e089a66cbac81d243f432ec1a9ca5b1856a2 SHA512 3f501182e814a2e4eef3a574bf5830a9ba633018164acdac115e7d8d809bc4308b08e657869206d4e5cc73d4ec4944ea98504b708201802b1b021f854a36159c
+DIST libc-0.2.81.crate 513105 BLAKE2B 789a79faf2d5079f5c4248446fa7c07b11af647bbcc32521e7989928788bea7dc2f65204f396b4fe0c7b3a6cf5248882d7775b97c028a3af1ba35e8ecdb489f8 SHA512 8e121e0dcbd8218e02c2c6536ef6398cd002a92406d433c39bf84576e9b881c5b8a66fee826da6a6189f44b825f3a9d959075eeb0501d7f604bf9cc1a8b8d437
DIST libgit2-sys-0.10.0.crate 1530695 BLAKE2B 1a46359e2a61aad9f3dbb6eca54325bbb8e39c99eff53b4877796b8007eab61801ef7ff9c7331352396c689b134bb42e2d50bde42bacf2eb7aebf97a75c8a272 SHA512 3e86cf98c01f33a242ff0117bebd1a2dfc33100ee00c46cf538d61eae56bda4b93d479baff186837d5b8dc1ba7fbaf1942287df0487a50ac23cc75efe3a1cf7d
+DIST libgit2-sys-0.12.15+1.1.0.crate 1610175 BLAKE2B 0e2810c18b39b2788839d59eabd602636413ff8a3501474e39ebac457067e811755c41a73e7dbb35ff90f5a402afcfb8fcfeb3a7f573a2d4901204b7272cd98c SHA512 0649a0a30e30afe08cccf356c08819ce0b0f57a6cea23e87d2e7deef88e4ef6513f07d04cbc5b76d125587ab3b7752d272c380d1a22b6a23cb965bf1f9698417
DIST libnghttp2-sys-0.1.3.crate 2307977 BLAKE2B 9f0ba44c0b9e51fed1b71b9b270c20633dfed6f066a150c8cf6e4be39f08e3f1bb3a606889b9286141a10cf02aeb0ae9610571e2a55ceb5eea718426dd824a35 SHA512 d8bf63f230ad394f39c3e66226bb9bf2ce9dd8931480d3bbbefc335ff9b54cc9517cfe29c69c0bdde9fdde2e81ab2e614c2650704ee34cca88998fcf52672d68
+DIST libnghttp2-sys-0.1.5+1.42.0.crate 4457076 BLAKE2B c36a7179602b00b88f98efe5b145209b7ec5f4c21b7012e781b9083b287bdf2983b9653532ba140b8afe179b3d4d730e7f156f4a2eac3c645c02a2245ab61462 SHA512 b6abb369f0f5ddbe31efbd21b22ecbbac5d5d8b9feb5c133949c9f532e80a4e57c13bc26cd4da406961190c47ca090e98e8f260c1cc86e01d955805740c13a51
DIST libssh2-sys-0.2.16.crate 471055 BLAKE2B 4ac133a98f466a87a441f72fc030799d38bdad71496aabcf7734f4eb0d46df53ca1a5258d899e07909aeaac37269d0d6a05ca6153635a2dbb41c2432ebb1a3c4 SHA512 ada58da5ba71d577010ecae04504c9542ca5ce13b7d1f56b3408e018d28f7a3b39ab4821e82e1b212fd52a9e80bdc57d944651b33e923602b26153caf81b2400
+DIST libssh2-sys-0.2.20.crate 482687 BLAKE2B 1c35f69b06917df083f656ffae04791b5f748360087a7f4e07629b5795af7aa357541730345a1b209ab22b82810c55164dc47b9c6d8276f62ddd0bff6f750c85 SHA512 1528436d63d13dfc48dc55972fe1c7fdc7bdebccd4c2d046a9ed7f020eec6660f4bcee9cb562f6caaf721afc2f590ce4bd4cd00249a62ddf45211b436767e93a
DIST libz-sys-1.0.25.crate 650151 BLAKE2B dc11dc65c95f6c1f409ffbd0c9b12a809eaca5899da1073d8f302a752f9bb538b419cdf2f540b34b6f72c7ac36719e8fe21a1480533829cee305019304523520 SHA512 3c1d0754230c327876fadbaf3770f52282fedc6b373c92fba386a80261c577f6bea2983db7d3a40a231fbcfee40e560d8f738d25b634d270e2132b3162497547
+DIST libz-sys-1.1.2.crate 1339299 BLAKE2B c055fdcdeaff5d44cc95f6cef190094317644e4881f356e46b0c0347221ffb867afcd29ecd4d995bf397f714b705ce84cf34ab87010770e00b3aed1956fa46a0 SHA512 2342c738230ac570c61b466920e2ceafc0194381643540f094f6541917639a4f5b11d46d575bb03c7623ce109d376bafc3076a9d172233313e38cb6f49ed16db
+DIST log-0.4.11.crate 36276 BLAKE2B 728647c829e96cb4fc795682facceebec887508e1ca14f13c0e7984db8ac39b3045885d1daa2f335de3e8f25c5cf1b519a1e7c8c6f4160a716bb8e39d085009f SHA512 e216fcb3c9635d8c4b67b05c1ada1e5de4e99dce89ab4c8f8033ddce6ac488605d8af09f93c42d25ebf8844feea22c93b71682e77a368ee01c686a15133fdeec
DIST log-0.4.8.crate 31297 BLAKE2B 31037fdc2fc94f4ab8a6e89a251b0bc29975027dc7efb7cc86a8e848dfc8e2ae50acdb177b7ba9f7c1f20ec01e50798f89abb772d67a33f1b060ac617cf9a8ab SHA512 0b71f97d5964134b5eea1332347e177806b2f171d0be5c410c0ff1539470b242ba9f0933fafd853e4171a43b5e373a150af18918924be431c7216022553a8a3b
DIST matches-0.1.8.crate 2216 BLAKE2B f18176110921b1cf6e58d52d12f1d1a3455ce2dc04421fbf1b392f66cdd81a88e924571fa27e307a06301d83b04f3b8a0ca3ae40d2da6f2decb8aac4e2801fbb SHA512 98b58f6a2694b03a7dd1be69ebf7e3ad14483fc8e4cb6e6c26a4937e4e660e843efb4dd04a7312dd9659ca02acd3775678f73b8faac44a76ffafaf873c22f590
DIST maybe-uninit-2.0.0.crate 11809 BLAKE2B 5e517b8c59f9ae4f1a4f86b48679ea64d62450ec2519c8caaa914479ce9e5b3aff24707e2e37272ba74bb60499afdc602fff17756337b0c50a9184edbd8b8805 SHA512 3006fc009c7c743d9147a4122e677cdeb2546f7bb46963b2f266839614eb906f9d763c161044fd0bf3f7b54124ac0734ac9ae7f7151b1a7a5f45cbc739976434
DIST memchr-2.3.3.crate 22566 BLAKE2B f952070b98ef30f0d2780a6efbeb36d295710734f678517d913a8002cafebbd3cfc38975fc4546d306efc11bc815764d14320af3b7a2360bd46fc2ab3db9efa5 SHA512 922e05da920d0d94226857788878ee5e31518cd80d95ae57e1d7ecd233942c37d01565525db2f1dfdfd5b3b1f81b2c73eee058cbfd745cb4e1519518318df248
+DIST memchr-2.3.4.crate 23077 BLAKE2B 5ddcc5fba109030040dd0c394344860ac0cb96679948b364c3333eddd29992c335c2a46a6f496c2fe085981ecb6e5386f7d44c1d489cabba180c037f1a872013 SHA512 24cde03e6f7cbee1c1d12dcc691190c7e3dc72f468cf41e2397560961d62685976fe47de51119c04c473cccf75b38311bd887fd9db93e92563aebac8f9184df6
DIST miniz_oxide-0.3.6.crate 44717 BLAKE2B 49d69fee6911ada1effe8ed73072d7815ed94a2705276698a178fc77ebf8c9e92eb286d7d71727a894f46e605afacd620d48d6aecf8975d2366e46e2c8c8bfb8 SHA512 d041b41617ae0e614f85bcfeca31d0c9d031c24942f786f43166e34ebc37bd67e3b9a44779e74b119e3d95d288d0842736ba709dd2faa3cb418415e2c86ccc93
+DIST miniz_oxide-0.4.3.crate 50058 BLAKE2B bc7a152a984de061803c11255459ce3d8fa64dd5b38de9f2ed29213abc1922d68746ff523de3b99e0e95a8933ea75448a9fa1e14cbbe248549074cd5ce7b3c1d SHA512 8c0e2b3a585a0986a61977d4459adb1a7c396ab53f4f688dcbeb2a09c60878b0423f54fd1879c190f5c64690a2473ed2a07d4162a650f6c39f402f6b27e863b7
DIST miow-0.3.3.crate 22850 BLAKE2B edfbbda60206d0e25eaa2d8972290feffe989bc2b6d98099fe3042bd0480d63a0cdb54df1abd55827790996bdbdb61f241b7fad8d325cdd64891513876ae913d SHA512 f2b8c5f31bfa2d831f1a6c0aaa9e526dde3ef8a2ac363da5180592cdf7a30e9e0898de680692db00406a48f4ee068ec97e3d42787c807335f7d47faac9c563aa
+DIST miow-0.3.6.crate 24533 BLAKE2B 232aac1d3449f2542c8fc21c9796932f478a4317a93e505de2113c6d980bba2c03a06f74d00a3abac79b689cbfbb06b5a4fa0b6778c9866bb67053111ee16d8c SHA512 13ef93e0965a2c5e561e7252407a0db03dd0811d076f20a6174a5c2ee28c49f1c340688d0ccb913736a1cab1c764cc719b61fa670f9b707f619b70797cb81ebe
DIST num_cpus-1.12.0.crate 11867 BLAKE2B 49ba476ebd14f2894dcd3e017921a865ceafe62ebf990a27874d264588f5e45fc8d6c3a3e82717e661434daca8b134faafeaf55f44e6ac447b81f162a9cbc695 SHA512 502cb7c7abdaaa42e849847313e6e12b34d9d619b58dccf7f3e80458b5b7778657f352828481daa21d482c247cfbf6d167f9ada8bbf0c3186b82d30a93a6e381
+DIST num_cpus-1.13.0.crate 14704 BLAKE2B e7a26e597ad5e45309393a9500b031ba64a77831320cbb96d7861139a2f7a453b7ba06a3255439b43ac1e2e36269b0a350d514020d3cd82c2513b57934b3ebbc SHA512 e75ec298fa682be84bf4efb6cf40126da9233ef25f07e887c2fa7421ee78790204564e6406c8219466651f47421e27f69eca690bb9cdfc982b644d78cc10de3f
DIST opener-0.4.1.crate 10634 BLAKE2B 74668ad804ee2d39b8b1c3ec3ff2e99b62a871bec8bf295a89db0cea421f3bf1127c2bb9d886ca527402a7d05dc7477f149929507bf19be069676d83f2d947f9 SHA512 7200f4d21a0ba5e0dca5d58368c3d172a73db36d1ceb3cc978c46140e1594343c638d291685b86f0c503c970c9ce95ec2800d6840fe745005eecd32bf326d46f
DIST openssl-0.10.28.crate 189106 BLAKE2B f08547bf5636fb83aca04d859b5ca9fa790943ed866f52d2858da0b9304f07d80540e61a5eabc4da45b242789d2e8ca43af0ba253cbfcb072ceabb7d5a54a2a4 SHA512 1b8ee9409b6e3426bca45530250c89ede93ef420058f79f7c9674ee6f33e826815045d9ad9ef78719c449f6f8a02b6216b90b6b048562fd8efbad7d2b151d09d
+DIST openssl-0.10.31.crate 195472 BLAKE2B 9dececcfd2725471095f72108e70adda4d69877110f85b2ef186400e5b9fa19656f6c9fbe0ff3134d961812b3167e7ec3e77284011393c4d990591eb8474acd8 SHA512 b8844e982e012a084079b77de3de6729994b724d95b05731c3e134ce41669b3b7777d468e948bdcfa57324c4e2866b8d700e42b1da02e3e5d3d14a3c3b3b18aa
DIST openssl-probe-0.1.2.crate 6427 BLAKE2B 8df00c8ab6af7887a88dd1672bf2c40c6aed5867b0b8d07dacc94b80591814e2fee4ac5dc775ea0e98cc33641b9eeebb6d5979d34717ba400b907358ceb2a469 SHA512 4001eeea5c4f859559475b4b1df8248611bd44273116b31e7ef775e02918cc989825989868f331f0f0e387787680c1e4ba721ac0fd4695f7363005ccc0815d9a
+DIST openssl-src-111.13.0+1.1.1i.crate 5087843 BLAKE2B 89502daf1795de99e730a471acb58402c5cb1b6ff1b051870de7d220f585990291a80429c4a71b3ee8389b405b5ef12fbf8975dbf3fdea0d9810460cb50bfd12 SHA512 72d8bc3fc11197e6cbdf506e98bb512b89affa405795673e58e6005c0a4a177a8dfbafc2292ea788f8b2d3c1720a84a4223618f8958706d5738254ae5650e7f3
DIST openssl-sys-0.9.54.crate 45751 BLAKE2B 7d21482f56568cdd7f8d02063f1c9b51ff355d67d20d44397f31332dccfbad36af9d6dae3294eb28feaf607b5ffcd13437ccc28df2ff0e43589b5e51c5faa012 SHA512 3c3271ac3b3825c6b8182e3d699835a4d73d774b43e9f694f4d9f1b9644de9ea1b8d8bfc2b98c9fe7af4c652d0eb7878001cd688f797d3b81bf5c8a72fd0334e
+DIST openssl-sys-0.9.59.crate 51178 BLAKE2B c29fa2d5d18f0a3fed73d231ce663dbfcfa8bd71b4841dc7dec9ae0057de16d0b353582330f5bc290edf55c8dca57d7b43787d52c86f12fe4d79c9c311920304 SHA512 dfc51d3cd90978a3173f4242f5f1c1848092680a042fd0735d4ea4d5793eca435a733173110081ca50ccae5fd8f75109bd5337146b7930872edea0e84f655241
DIST percent-encoding-2.1.0.crate 9748 BLAKE2B f3ff35ac683724b15e40c85e0fb8ececb07b61beeea82b7020f02d27df05a8a3535f157b3cd688533e414d6541de7de8640ef4756706d8061af0fec94ba04ab3 SHA512 98af4dfa7c6a3cf0d5aa929c436f9eb1ba1b576a944513f1284e6df2ad06be7cab9eba145d888d50af88f8c970bacc702b323041bec6d4fa1dc34095186c628a
DIST pkg-config-0.3.17.crate 14533 BLAKE2B 729b15209bbbee8a6d3854e30a89b3e6041ca3cf7b1460ff6008e37866e326d9ec8b4ac582c125676e31eefa048b143beda33432b95f00a8f51cc7fa33ee4986 SHA512 42be78556adc07dffa8933ab1436d5d6a776018898377d58dfdc9f961981f9f21397301b41536c55d8a3772bf74a38069899d1a5cddce5c24a032017137044bc
+DIST pkg-config-0.3.19.crate 15451 BLAKE2B dc23b5ef12719b4b3d2fc5c93c087399ba954a5e127be91b26619466d5d7422e71684d02905304dca65273d69b66338d94c0642e3810a14df845ef507ddc0bfb SHA512 42bc13c4e39c8f71690db527d815884acdfd2ccf5fbfea700c6ed60257e852cdcb1c443e7774409e51da53612b0ff0aa165554b99fd0cba973f94a8df52982d9
+DIST ppv-lite86-0.2.10.crate 20915 BLAKE2B 83a075381c24b2b89f5266929f5672ce051c3781c1a199252738dadbf471618c8b87452ce84e1cd87a9eac11b44107002894f544091210cc7e77bf52c045288e SHA512 c9941052e504b9b310024064026e4b1d540dd877705ef450a833d9ff6dee70ba874cdad68c46381a71d5b54482cd80b3dbb8e0c225758fd339069031a55195f1
DIST ppv-lite86-0.2.6.crate 20522 BLAKE2B 6e1e4f3d0daa02148df390be19d3575626e66f6a78dbf27c1275f097c4307b80d8182f7795a270aa2c34d8c31c8c3eecc88e9507a6c9def0e91af11233aba90b SHA512 b9764a841364eb89157c828a183fdf6aeeb63d1d35e4f5dcba79e5d8e20eee8f22c845636c5c7bc980da1d141d838528d5f190546b23aa5e4e51e626a0ddce3d
DIST proc-macro-error-0.4.11.crate 21395 BLAKE2B 86e5dfa563564c1afd63e9ad69bd294c138309d3b044b9832a60380a492bc072fc3fcd295f05bb97fcab15a352ec410d235f7f25270dc0ad89cc69212bfe0502 SHA512 8d6098bcb1b61bf6894feb10a447afb71f9862f83a0c00b2eee9b0443c77d9ad7e17f848d760c158f1070d3e6716e4490f1c31199800d72939749d71051681c6
+DIST proc-macro-error-1.0.4.crate 25293 BLAKE2B ef918c5efaf2545ab38787c8d0c07315af00431139e4dff66346bf798e3a429f91d12a79776c150412fdda0b158a72badd5e1044ac4d6917f8482d4b5a7110b7 SHA512 8a47bc9d3e24e9561d1e384d8f5a633284c2cf9b5e6733c5f9d1dbfe1870ccc8e2152482852e50b551cecb68e009148585b910ffb0508a7b4875598eaf8657db
DIST proc-macro-error-attr-0.4.11.crate 6924 BLAKE2B 155d14ce647f9f9fc30255132cdfbfb2417234a97dc12dab97195f88171b51cde7284b6117e48c2754e89a8d21f0ddaf7086d69b223748f00aa9f0cbb44438b1 SHA512 a1e23486c7f4af41b419b4c833789e0edd0506bc774e3504fff2bc5bc88c2f8799ae545b79138e6ce686f479ec703f90112589639bae861b99daef0f08496885
+DIST proc-macro-error-attr-1.0.4.crate 7971 BLAKE2B 98e2925881c2be186e22c2c439697e91d43f807eb61a5d13e3b0b4321ed50a74f3d699942c04b89b6fea0f156bb5d19ebcf22f9cd4b98a7e6917c437600ed823 SHA512 2606afa9ec78d7dad4500c98d3a5ecbd02c6b53ab829c742bed7f57b322a95238ab4e01cf268746815f1424fd9b02eddfa30e72f98c66106f57765f3d3116495
+DIST proc-macro2-1.0.24.crate 37716 BLAKE2B e2bdbc7cc9ea254529e322f6a2eb44002b4994fc4a00df32012f66740e8e73ae70820dd40b7fcfcf024f3c7784ab9add5cc1db37f4c72d5af5c8f00164ebc145 SHA512 c3d23a5136c55d734084ce1d76d54f237fc1003074af102c2ad96d851ac496ffc7513ddc505a68af4051c9d6de09725a0ecb6e76ebcdd77a1c056f8f9242c9be
DIST proc-macro2-1.0.9.crate 35576 BLAKE2B 16c687cfd21bc3b97113f32293c1e06ca5811df6c8f279e1c5661a501c230b430f1e8bc983a2ba30d097acd01df8701a5a90ed02a93feff83a1f6f33ffa1e8d6 SHA512 005d1d31ec62a25fcf3cb0e62063d5fb53a3b15fce8fa597ab09cac5ac404a7eb441ae44c2d3acc295e24e814a413d0664a3d142155495674c4713f489ec79dc
DIST quick-error-1.2.3.crate 15066 BLAKE2B 1c61525d383f3588c1c5017f016f60b484bbf2035e7f63c553bd9a49b638ab0c6106ac3676a41072b24da4e13dde78706e0f99fd1ec9ee329d5be81d45a85866 SHA512 f8aaf9024d20ccd42b706c756eed8320aee339f8776392b47a41cc82ca06b03df1a5b1f00854cea96689c5af261b4d8c5d2b1a242d10f2755e7e33dc41be35b9
DIST quote-1.0.3.crate 22939 BLAKE2B c50e47b647fe1ac1930544d20b2b78ad98e6398a32c98460701d93f93fa1437c6d12c632386ab9eb733cbe64cad57e02dd201686885d0a951cb013fc10a95a9c SHA512 b4867554b86d119251db67f9d0949bf8c3cd7c64f006c76531398ebb7478cb93805b9bcafe159d921ba1a32e92773853b56685cff0e1ebdc6aadaefd3b932ef3
+DIST quote-1.0.8.crate 24997 BLAKE2B 53f8d9e363e2697b580f4bfa39257a6ea1d1899f6cd73f96233cb476de1aecd0c4bca9a8856d128af81ae0f428be71c19b0d2e4816d856bff20030c4cc9258b5 SHA512 448d06465d93d384bf31b0249fd143a92edc4b9be8bb3a8c1a86366241be6469c3874dac98acb3810d5177b106d7307c7d9e879f91cce2e278a319ef1935577f
DIST rand-0.7.3.crate 112246 BLAKE2B ecc7c1bd70ac874c03bd8b7faa3016bb2d5ee5c19603280a12a45a81598f706e445971ee081e6ca410ab6f0f5f7a06d9315848cd556a2d8522a82024f6ff91e4 SHA512 f9b68ef9446f1ca2c8092c50990f15c1b4cb5529eeeac4df8d69755e0b7253c663c587775e7cb0a7298c31edb444975dda34926759306541f6d43d0d3cf57b7e
DIST rand_chacha-0.2.2.crate 13267 BLAKE2B 7908867ceac98243ade22e1b38f1903fe0249324484d91c948a5058a1e099e5213f325c5ba3400898c8319158ed69f4ed064164f235470856a8191bd990d5a10 SHA512 1e2117442e4ffdd834dcbf0ea1829e73202c0ff9041d5969d81a59330242145f2753f2a56de2fdbff65f26cf0d227c7d08b2094ab2f946b764aef88106a6ac84
DIST rand_core-0.5.1.crate 21116 BLAKE2B e74791f941a79971f2741172d489d546373c9abcb0dfbffcb7b97b858ec800b2e0c97df4ac636f3aa1b8dd6c14685edf317336d577f31b5c6cb7d89a157e547a SHA512 4f7500b35e165e6c817fdd67a50745d5497d24e554bb554705097e37258751e8755c4d6b8a69fcb5e1977708ba78620bc35d640e4e018fcd4e88d9dbdbebdcbf
DIST rand_hc-0.2.0.crate 11670 BLAKE2B 55fd048f2524cecd4f0e17927a81111e3070a8cc6a5b0234a46445400ad5527194edf8c91fb5ad6538f4958d53044ab02424f61a38adb2931e2cb7568c458ee8 SHA512 bca185612bed5cee4da76fb68fe854105da276f5bf2da464e596d586b925df798cc692ed881e276ab77c36b4b0551930966c93656be122ad05899d87853533b0
DIST rand_xoshiro-0.4.0.crate 17029 BLAKE2B efee418e99b15aba76385a4320da667554effdde4f5d19dd55d16c1069d7915851f64526d4b4c9ed1cb6e5827572c0c96484f13669ff233baca124377ccbd48b SHA512 e889eb75ef40ad52eaf32692b3a405e01eacfeb20e0dc171de8f1b2ce05723ba448e293a2ee91eb3bec3cb5a2667bd05c11433b50470eea9219586afa73f519e
DIST redox_syscall-0.1.56.crate 17117 BLAKE2B 57b1b01ef3cbc6f55def6c9a0dcde16bd98e83badcef993e26ae3ce849abcd1b1c10f4da931c605970d77f92471734764a537e7329291a221343fde23f3591eb SHA512 17a3044327aa733c830dd74e210d6bda32622617d1c5af9d70d7647232d8569ad0b04ccb14042cbabb5d97ad98e3f1f5a9968a75387354ffb4d175e9577115a1
+DIST redox_syscall-0.1.57.crate 17087 BLAKE2B 88e3ffcfd752e757f8fadfd4edca367f9185f09e609c329bb36f179183cf103dc182aae701c14afb717d2b4c3d72ba307b49fc671cc97aa7c9d03df1a7a1835f SHA512 c6e187087060084b7173ed0d9d0e982e4259d4f76522112268c02ff20751382e3bc8e119da6153170f5c54bd5b9cb028910f2f85c1c842099205dccd44659184
DIST regex-1.3.5.crate 235308 BLAKE2B 66548c392ff921815d3be3cc196c6b1ca1ddb3f1dc178935f8159335ea9b85ab7264bfca468a3c63c242c522095fc6faeb7da19b0968a40b30ad55b6536f8201 SHA512 c37c28141a9ed35250f830d1d4b84dc527cb880d6093f1e95b348aab7ecd2d2e949fe7cc23bafde217a4f704eb828bef1651854ef4ab9593e7b4ac006d2a5ef7
+DIST regex-1.4.2.crate 236931 BLAKE2B f316b777df1c97aef2994745e1fbd9ca676b0da6bf4ffad4e54aa11014d39aed343884ede3648b5fd676dcec5e4840e9d84f4a4faaeefaf5a2d772e2c5b9ebf6 SHA512 a9bc8061b7563b8494b21f35bf3c2af5f58dcc1b0df4e25ab8d3f99ba66527d5163e2c04b229b688fcb7934961f718fab72f22d66fef53562c5d96a2fb3887de
DIST regex-syntax-0.6.17.crate 294004 BLAKE2B 3d203b06b8b1a5bdb42d50d395ce117ad92e41a7d36e5cb5194014eb7af1b17f944ae493041b7e9a2a9ea929381b4c1cb513c895747beff97aafef524ea2ced5 SHA512 bd9a165bcac207ec3bb87a81ae644be98d9b5ea0053b3bcc69efb334e3ebfeb85021aa372bafc3575758200640cbaaa67d372950fbb3ab210d8ec62b336d147f
+DIST regex-syntax-0.6.21.crate 293572 BLAKE2B 49c499ba1c03447fe7c90f27147dc5d96daf815e330a4073fe293d3be594fab1d798d35a5e49f6af43c71befd47528927246c4ebb24b6a6a141135484bbecd31 SHA512 56507f4432804ea30820984f6cff03c3514988bc3e406b3ba3a89c36c9c5d75951e4acd000ba85b95bb83d253898ce7d7d282ed930e811e12bb644c4a5ec84fa
DIST remove_dir_all-0.5.2.crate 8907 BLAKE2B 585f49f83db3ace90dd0b4fc77aab7525844194c82d36cc33ab8999aaa6226d24a130c30f55e2c46a08273cc554d9d4c8bc51958aa7dbf1045085b2e22639e4e SHA512 d19a45398a93adbcef9f233f6b3eaf4a63ae95f5bbae00c880b40c5edd34449e7f798ebcd4d11843c68ddfa15e11bed21d434b224e4a175dcb64ae011c13c8cd
+DIST remove_dir_all-0.5.3.crate 9184 BLAKE2B ab7ef94e0230ddc9b363f038254a180881bbc20eb04a254f97e6f71ed491c99ba1c88f5e85632d450243882a4a0df63f3b8b183bc1fbca9caf30ec23d577b1d7 SHA512 50417d6d8a33912193a1ed37eb72b47431b12ae65d2780cdb7080c3d141e63819da13751c3fb737685cea322f70b36d413389c3dc01aa12b4dce615aefed0e2c
DIST rustc-workspace-hack-1.0.0.crate 774 BLAKE2B 521f71467c95554c8a87ab3e10623ea3516932fe4bc9ca95c835c06b8e0bf526291dede3a5e08df8222f365f4d326c4054a99ef0d37aa6fb5210e2a35d7599be SHA512 48e4774a272e717ea571f4c22606ffca78245723ebc3f15ae5d0b28c5d767df9e772b7e2d6c5c3505bb09bf28097aa83a34b182856bb9d74b3a00b292da45315
DIST rustfix-0.5.0.crate 18370 BLAKE2B ec580a65720ec56031efd96f082625063e85671c4877fc96b9e73181ee15c565a83f4085a26d2a2d1bc57689bda34bff7233a3e4e3555d8d1b9fb8ddccf3b281 SHA512 3bc67adb7d1012c8e832d67491c619ee376df505227738a0d83bd129c360dcbcf6330cc9c5b18038428bd8b6baa7af79686420f25c428fa8a50c9e8403706cd9
+DIST rustfix-0.5.1.crate 17768 BLAKE2B 6c1e58267fc4b81ba025d33a9bd95ab1832ed651d22d52b8808f52870aec674bffc18ce2d53bce58c4bc36f98f1e049e4c9609eb7e99e407ef78eeb756186837 SHA512 61990f482a5d490154fc55d7c052464e50268c0f752068669afb3c387d27a1e980a052ba29fe0aa301cbe4b17c7374db071a8a38d3562c943e8292605c40b3a4
DIST ryu-1.0.3.crate 41983 BLAKE2B 32f2b9e8b7aacee3fb86acf405efc86b44c564b4da4310567a0e1b22d09fa51e5ed8278f6b2c38c220ba235de39c596b15db8958aa413ff822c0876ebed56515 SHA512 53ee61ef116594829849b417feb02d415305783b08d3e45656a467aaf272899e4ed46ac0415cefdf3102f61faa666f21f3237244b2711ad10b528a3773aa8414
+DIST ryu-1.0.5.crate 49570 BLAKE2B 3bfba4a5f290a429de7ac3b86823b2a973f40eb6f48c15329173d95964d31ada36f2618be4b36774a03f97f2ce61364900c6a3ad5465a294e2df311a1f4104ed SHA512 d1708ffa3112a684edf2956b6730ead040401d38f1457cde074eaaa59c249007dc8b925629e7f6df89f7ea757e9d0826649d685cc8ede0a04d50296048bf476c
DIST same-file-1.0.6.crate 10183 BLAKE2B a320c8343e0b38078ba81c4f0159d886bf47764c74efe0d7cd2b3218426e8341b51e523c00a9e5fbc2ee1057618296bd70b576c68751bd55d6ddb352defaca15 SHA512 3ba35309742c8db63210d9ea78bff4ecd80471d69e6238eb96c7bf0673814f221e2d838fe6311bfc5a0e71b4a7ccba33e07859c0b9cff2171969ff08a4214a7c
DIST schannel-0.1.18.crate 42693 BLAKE2B 78aa68189d2b0620e139010b64a962d47096410c0dc6b839a173d4e8e7808da9f460c26180511412711448b4a30adb072580a5c485d8d2257afc5100f80589ac SHA512 eba32bc2a9722fca9b97388c13f9cb99db4f2ebfc54f28f09525ba531297303ee601cea1995334bcbcfaff207dc5c906596bfe951a948221f26f25df65517fe3
+DIST schannel-0.1.19.crate 42755 BLAKE2B 11503202bb6c8fdff3cc716558a5c00ca7497f7aaa4890d332084754e0d1e1013719d5bd744d8aa12b8b042401f4828fda8453c104d5feeb9b437d7cc51b5273 SHA512 319d9931cdeaa0f6b50c46e413fed2b6e97b28fe8c4825d4e5ed0fe22083e686e124117bfab7c89bcce815a31a3478f8c230cdedae6a852a31719a0df34645b0
+DIST semver-0.10.0.crate 20503 BLAKE2B b27e780828e383a0baa0edf99d36952a847b10ffe174c22d2680ecf5f723354e0ff5253974b07981a6266cd74d373d1993eeb145ce795201bd8e43dd0e15299b SHA512 75e39076a551cd1f4e7c011e79ac762258b7995bb021298cf2fbc7b3bc9e6715ca3c5165429834738f1cfb5ea9fa3daf173ebe1e9e0f04135845c89675c89ad4
DIST semver-0.9.0.crate 17344 BLAKE2B ae782bc78f29e45577de8574ee58959c70b54bb0b6f45a5a7b09cc4d358d9a0a80bbefc6e0f2a330e2b55adfbbe5c1f64f4ec9bb94c4adf7bb3e4fc9c142db6c SHA512 03a2ea563456f812c301721c3572370fe4934a22db60079da0dd6ffa33fa789e5e2436ef09e62fc35e0b742b06fabc290992c74eed80419a353c9de9449928dc
DIST semver-parser-0.7.0.crate 10268 BLAKE2B e46b7cf9d292f8fc54561fca4df8534dc96f6be920a5c869c405ddb31b9d1a18eab0799207113cf4910a52cc0df5017ab1bc1883a7c3787ebf2d60f09ac0ab4f SHA512 17320468ec6b9862d595f358d70c09ac6e09db7885fe0ead7a1e596f79350a6306e8bfde5bbd6512008a7c5454da1c7ae55fe1e3bc1c1ff02ac9df54c0a6121f
DIST serde-1.0.105.crate 73358 BLAKE2B ef75efaa654a5980648e8418553af18508f95b29fa1441f0804c78d9f8fe91764a3565ee1138c96c9245c28ed2ed8082d08c50f8ff36b9d40b12456a758ee289 SHA512 e8b471769b696b0c7f3b673879dfd056279fb49dad0228bc2ec459a2aa8bd26073d40ac1809a42c0b5ab3e9abfd32252f812c6493d17979c10796e7ab78a795f
+DIST serde-1.0.118.crate 74248 BLAKE2B 0d78d29a9d97da401dba93cd6e118dfa48c73351e32ee48bdc2a649ad60f1b198574b78a5261564d466e8097f8b635e810f4c8a52592e3f39550910e250971e8 SHA512 d3b316e721ce395fad656a598fed7e83b248a3dbd98a9eced98fdc337c8fd40f415356a0af6a0e5a104a592ad10e1265d47d94b10b343ce9475797b3a74306e4
DIST serde_derive-1.0.105.crate 49700 BLAKE2B bbbb3a54b7eb4ca87b667c75dab007745a1e163b90c793258aa9f78b9bacd067262e3443d27c4d941b6c4ae0ad217779a4fe5ff79aaa84bb30fbac06252c5289 SHA512 1a39820708a609b3941ce6ff669068f67d65d446e208c904ffc59808ff7bb1d82148357515056fd4856e10cfdb2cfffbd968dbfba870ed23fddf1076e3f6e543
+DIST serde_derive-1.0.118.crate 50589 BLAKE2B b1328a3c7fb0fd6321f0d020969f1b7e32150488410d574cf9e75ca06bebef3d753dacfac4e45cbc0eb9626246734a1dd5b766b96a1a98b53f3f17897dcfb349 SHA512 f0909822f73e900c8a0b791a30fc5cf5be0a79e6c455766a90d6cc314408b95f2b9d7e3ef99363860d615620968e217da304457d2d6e00f60da8ab8fd2db7115
DIST serde_ignored-0.1.1.crate 11083 BLAKE2B 990f549b8b4fbd6b67f5bfe06fa6278f357ccd1014ee3a95561a09edab7f7f2e209d80c59ee749c6bc7524a07f0b357601e327d2f96bac0cfa514b3ea73afeed SHA512 1ef241d6a22f47c22305da613554e7c62cab00584e06c81381eab9c1e3e12e7ea9a516f845a5818b33bcbe72ee7dc9be686598bfc0121b400b0a8e165c8941e8
+DIST serde_ignored-0.1.2.crate 12179 BLAKE2B 45b8cab135fac2d7b23443462fe630212ae170207061f968540dd2b86a1f8c1203a185dfaa158f87dc36ceb8f769ea6c57e67c1497f2374444424237b7275af2 SHA512 c6f76051a5397615eea4aa953535ffa227cbdd6747f8f2ed0bf57d0a0b7bfa71536d8372a6cb8eb046b9a761e36f273e019754f607e6c84ae71bce25e25132cd
DIST serde_json-1.0.48.crate 72113 BLAKE2B bc522d0924044b41548b5c0ca63ed3e1fe70b7632b9e04ca6b01a63245deeae0e7154b0d913b3edfeaecfc816c1edfebfb666734c2a5371b416aaab9c1880f3c SHA512 544dd844330a26fbdaeb5246825f143cf06110065089c8be3dc44f8437f797ac083d7dcc5181656ed3d78428fcddc44e6802544ae304466eebdcd625a5a5fef9
+DIST serde_json-1.0.60.crate 114828 BLAKE2B 8f8fcce30049b0f20ed4e11ce9323afb5edcb0f05a3a5e226b15770350147f27d6fc2cf242ced0f5b76c85c78694bf342ca084bcfeb18ea7d6c9e2bac5461f78 SHA512 c19262072cc2dee3f7e047e45ef3f02df121c9b1c9dc6f16a20f5fcbc0fb1bc25e87342358f9e9ac86bbd5f5d6091a9cb56256c04e22f3dac671ed23ff64d9f4
DIST shell-escape-0.1.4.crate 6764 BLAKE2B cbfaabec7c6b81b802ced02a33e463c39b2f27f004e0e97087adf5712f1ccf4f4405ea9d010afb49153292741aa1d51d985caea5a3c48a601dc4f25b66012135 SHA512 19cd5e79b2b610dbb26098182c1ed3a8a2cb93a88fc623c0a9e3ff719998d6bb1de632f79519905441a4e38275178dd5aebca8b9994efc24e19bac4ebe5d6329
+DIST shell-escape-0.1.5.crate 6847 BLAKE2B ccd71a73b217b375843d3f0a762b3f5317bc0fdc8e43380a17f25e1ffdc391de0af7b0e4472be23241a6654f5b6ab799a51bbed8da35295322002c54ad84e9a5 SHA512 848f8d47d802b82e83f113fb07f44fe962628379481d1bef9d15f2e5821a382c9928c32175652361aae9fe4c8fa5c1dc1c89350db6ef5e68691bae4a3742df93
DIST sized-chunks-0.5.3.crate 40643 BLAKE2B f08b893f2e32eee10372c75fd6bb41b667f004e044bf271d8a4a0bb6bc9f393662ed685aae3046ec05823f0e9c70b3b7e15c40b94bd22a5aa2079873d4b4c842 SHA512 9ffe2b6d0510d8cad010f4e3015f605ea0d0f4e27ded1fdfd7d7080e338bf239bec30fe85ef4576160297ad287ed006097ffc12151a2cdc578d7031d1501440b
+DIST sized-chunks-0.6.2.crate 40265 BLAKE2B eb02254a9feaf421460130345969ac244f8b46a536f6eae27e9fe55133ab6149f545864bacee70d839a492b81b790a9eb74a0f31f44c6f2d6ce7f470a6a2eb48 SHA512 524eb5ca27cbadc6b3a2ee32e4968308ab7fd01c961511b2c783338fbc0435303a607d92c2066a9dc1fe1772ccfdc0a97875da9a929e7cfcbbb8d0647768d26d
DIST smallvec-1.2.0.crate 23658 BLAKE2B 7e662c79fb35e6965b409a63128da6ae6d8183992ab12f09ca7b97f15b2c7c29b1844c35cf4ff72d02d934481bebe5b2353a9c70d17d9f44a11bdcd496f2c201 SHA512 ad89826c1e999c63feb6d481e7ca3110831a08491ff8fc66825e92ad003a06b40033b365ba628c4707df06a3ac2c0d3b71e327c1caa4dc86f48150515031e52f
DIST socket2-0.3.11.crate 27725 BLAKE2B 75c2b2ba7ac8981bb7111bb7780fcaae03c670abcc5dd464c2121fe8d3c592fb19faa2b759ff8f8d9a60f954c6059ae600cbad5a6b4592a23888b5264d7e1d25 SHA512 6b29b2e4e36fcc165f658da5a2e92980713134d3b68a43b993e4f1cd049530b7c0a119918c4a9528d8d2be27cf8642fd8b6d3ebc2469ca5525045da56022a91c
+DIST socket2-0.3.18.crate 33513 BLAKE2B 83d42f6a96b9c4ae023079204a5f4a1506abc7f133c78dc4d659c8b46a6a04e5e6ac51cb4e28188d7ccb4f51cb268dad1a42adc88acfc9844deac3b00efbe48b SHA512 5820d1f2de59dad6545c356e111f6c40248763a8f432d696288c7996acbc73dbb0f3800f421a2c2ebf1e712e3db7fddc1280f8a889ecace2cb0ca2956a073514
DIST strip-ansi-escapes-0.1.0.crate 7972 BLAKE2B 39f227ba45b044bced56e944fc0ef147be93338bbfd76be5feb90e73e1faa0e0b337b6ebc6d57fe14dce11ad13e48f6db87d24c28f06b09978520c71b0e3f047 SHA512 6a8da540a7f3f820d64202024e449da7b0dc45832c4c3637cf4c8d6136098579463a1b7108c03923d2582479193e52dbf23039c4b4d0f875384066a611514a45
DIST strsim-0.8.0.crate 9309 BLAKE2B 40a8be506c43ee1ffe006ddc7dee98c3d418bdd205d57b78f5d1e4c9312feb57e1eaf952e02d92d4e0932db240c6fba45beb06ea8c4fc6de1cf1faa8b6a3a939 SHA512 1d55a8d946cd55f5f37d06aea536549ded95739fa58c0f2da285a0041154c181f663682bdcac643aa198b3e762d694a04f058db985c62ebe22b5c16327ba6d34
DIST structopt-0.3.12.crate 50273 BLAKE2B 9d7493700cfed14a8f20cae73c807fd103623ec6502a76ec677ff6bdd5385a88d5d20a395394fa28be580ac2fac34aeb19a8fb0ffb8dd23a50e9551ce973e7a5 SHA512 a71f4cb68ff3cfdacc4600350e35ab040e7fb5c929f3e9649fc0d93f9ca74c6a6efc46e1aecaadf3690106cd281118a1c7c03dd7b265d532e033d437f5ec2e7d
+DIST structopt-0.3.21.crate 50761 BLAKE2B e48bbec27a34ef80f28e21d42b5acc8b2cf012e1944a6b7f6395f4bd420281e18767dacabed0ca37d94ad26e73ed201c9df06d5cd781a4c107b5741eb0880e53 SHA512 df8592f10456a5b1a7bc7b290357c069ce4eba14d2558ecd6face231e49c748a8892c31ffad000b426e8180d3e4dd607329db91f4b5617e971b2edda5bab42f1
+DIST structopt-derive-0.4.14.crate 20116 BLAKE2B cfeb48f5e4906ca24b61afc085a5dc41edc6f69c6060a1cd7e01b844b076928111e4be2f24b3cb28e7704c09bdbbb3c3a1b2f9012ae9e23cc5f795af91fb1245 SHA512 bc20dd9d10c6dc1f5975b074a63eb84b49385ad272b62d8526962e88b28cada3998c3944dedaf8560d6577871747b875cd399dfe06851472c0a1c81fced429a0
DIST structopt-derive-0.4.5.crate 19402 BLAKE2B 921dd4dcd8d19556351afa37d6ed4b1f6f3d1e847a6a33d80ff32e8fb0674d595f467cdb0d2949ffdcb95d36d6ac12db7fa37ff6a4088b9622519619ee75af1d SHA512 34205ba32a30bda80a06ca8c0cad3b17dcfdccfefec027b95769c08682736fb1462c161bbecf047ccb5f8d1ec02dcee6313dfad4fb61ef910deb1b65665b419a
DIST syn-1.0.17.crate 198158 BLAKE2B 7093cc8aab4ae2f435aa70a54c8c2b8e4f6928ea76186059942bf5c74e2ad25d73608f469cb0f1d97071a5dc2e3d048a155084bbc28647ca39032f06bcd5a3a3 SHA512 5acf5bafb32f780e08495e1e0782c170eae54baabd72c45a1d350aa41aa4ff2e5fa84b23d088fbb8522f430526e938c459087f89e3372690bde7bd0cb8c4750f
+DIST syn-1.0.55.crate 229095 BLAKE2B e46833d7f6a252dd95bde77040787f937b19a8a96e9ca2041d667ef7b7d824976d0513b49f899bffbca32c87c51458701074507e55e9a4b47a83b328db915681 SHA512 9c3e5087db4819141994470c912e5f4d09d22a8e7ea9179b575f9601ce78ed501cf76f8303237e519c17e8628764d5f547141f97cea88ce7daf4c2982b7c1399
DIST syn-mid-0.5.0.crate 14149 BLAKE2B 87170d072ab6f5ffc6d7f4dc1a08869d4e5c0f505b9130d9b5778a55e206a488b048e47895a524e117ed58b3d45907c8877c897d1d88536a06c9319826b596e7 SHA512 759e29a2ca984eddae3c091be036ad630fb985408be31d838af3bb04fe1f26a3d2b7ef597c1ffb61a72c96383cbf39d8fe83cfe0d79ed4bc3250a585156e637b
DIST tar-0.4.26.crate 42689 BLAKE2B 174baa480caac4734282003b5277004d87ccf9d5519b0adc3a02ceb0831e053483eb4cb7d21170ba792e2a573748aaa9589a261ffa8050d8bf2bc36e86451e16 SHA512 83ee187b253347068121d04242a488ac44ca6da159c6f9029f3e063b04544b7fa3ed40fed7e251692ffd73553dd369edb413f52f3b3718396451ec916eba15ab
+DIST tar-0.4.30.crate 45211 BLAKE2B 9c1e3b2b7526c48854a4c4955f1d0cd79599a55fedd4a351249761007ab2c57da98a492f457558242a25dfea306160ed1dc2fabe66e4bfca42d5793f21ce5b68 SHA512 7cc921057a8b1a38e3eb03966313ea39812ad36b5694f383c9ea69ded9813ce3ff1c7bb0f3fc596d63630279722365a7ea0cdd034bc2cfeaa3056ff83d6201b0
DIST tempfile-3.1.0.crate 25823 BLAKE2B a34721369923771d5f9a2fc64adaff2bff41da97a0ce79e01aaedb8d6670867220c671c0d23f7a8a9c71b09c0559efe4e7c9bab1f7f9d890866be1de1ce050a9 SHA512 a87ee51c36a81a8a8eb8f091eb57926682f38b707f7f641332d8752170e6c139a656ae49c6861f51e07c2fab5c86cc9b2ac158f5d89c6bff15d18934dd4e7ba5
DIST termcolor-1.1.0.crate 17193 BLAKE2B c3a1a80269195f6bc92d141fce0885413c031980a4ad2f0f6e5a9051acfac10bad8a484362bfcaf3a60851a97d930e9602df4c00aec39431ea5a8a20d40a55c2 SHA512 41b05b047cbfdd5e3990eb36f635dc8ccf26a42bd5403d6d14a9f3c341e92b61c3b8d4d5f4fcd29071a97b3d96280ed59b4557b63a769390e2729fc82ab39702
+DIST termcolor-1.1.2.crate 17287 BLAKE2B 5ff748064c9fb6663befce2fd299edf6a6deb06ea72d21a62d6e77642934cca0933e10340fa84f636631cc08c76ba83ef2284b2212759129d54248e5fccb4c49 SHA512 f37b034345382cd621b1344a3fb301ca3d4d9db8b5858ac1ea82372c983229fce3c0ea8213d6b7e91291b6034affe11e2c3e593dbd95256294ce5c584b33e14c
DIST textwrap-0.11.0.crate 17322 BLAKE2B 257428908342774593bbd3528fcdae710712ff54e8a711393a24356d8ba0e16e466a4b20c05f942c48ca76b3b5b5aaa90ec202f782cad892caa8b71ccf124da6 SHA512 f5c0fe4f28ff1a3a0931e8e235b5157a45f67967985bcc752418c5ec3481fca44a8ae4800088889b37e8cd0533f53d3c456d5ffd19b767b3f83a87b49a2e209a
DIST thread_local-1.0.1.crate 12609 BLAKE2B 34206b5232262cda9cc0fb970e20f154d43ff1c4477a5ad5ff9200e6d874a6c7b2bcd99a2dae75a984b54574281e049ad35307ace0dd188f44c9a95fa93139cf SHA512 f2bfca4eee32a8fc88a01ff5bf24518c12142228d95916d13aae35ed6addd0b7da2235359f15220049ef197555344ac31a8833775e7a5bd49144db9c54b3165b
+DIST tinyvec-1.1.0.crate 39037 BLAKE2B 8033a336c2c346df70d5c6161233043a7e196a2994b62c15aa022b7053f7aee686092fc7e2db551cd1a09ee5e4a038e777120c5c33c891bb47b71c78cac60e92 SHA512 29830cec393506651b20d045c584e3df5ce5f13fdf70e866d4d6b7e97fe4f6b07ccf2a2c64ced5b092d5d963af74f826930d96d817db90bc0e4ad112a399926e
+DIST tinyvec_macros-0.1.0.crate 1817 BLAKE2B a3d1966bf57c11afcd026269135a6189f149f905bb70b47537c0a7bcaef0bfc6c89bdcbdb0f6cb8e5255632855134631c683fc90606a254ec8ba818fd5ef0794 SHA512 d6afc83a3c70cde916a6ff599e2772588e4bbfa7a5b1c7e5c8aa0f4a8a5c9426182497a644e4a88194ece986d38fa64b6c8eda9eb1630441c8e65a8741a45873
DIST toml-0.5.6.crate 54341 BLAKE2B a367d22daf6169dbdc9cd58c97f824ab76567679e1032af7a0f924ca53720d2f0989c14545d1f5d82e7f46293e3d27849459157d0cd77dc78e9d76dd6d200648 SHA512 718f5d3fde823ae5d7fbea31e3cd0eaa66f6a2bcd854093d0179dfc4328930a984deff466bcabf3c81caa323aa743c609136b8d036b80087b88e888ba7577f54
+DIST toml-0.5.8.crate 54219 BLAKE2B b4f9f563e5ba4574d4f2dcbe244378a2e1e984bd9fbbbfa5a06bdd5f8b8d677394f0db9cb8696f6936c80a52caa86b1b3ebaf3885c53855af23f03d318785f19 SHA512 26b7901ee4b7cbb4cf8ea57d365a99ed05e0a76e73452e47d4bcb3b4eeb7bbd393c13eea9ea33dc13622942efcda39acdba9425b74b40c920c9f19673a1f2082
DIST typenum-1.11.2.crate 31853 BLAKE2B 1781840c29726a8df614fdcd620924b4cb5a11ad8b5af7c633e70b459b4cdcb9d6a7ccb02b08b78a0cfb3f73382d3ce9d93c56296f93ad588546aeb81a74540c SHA512 c301bc123421e47d39b50e39c42c04e35c7f12a549283d51e1942d1a8d54aa3e49e6177ba4610659d8e68a1d30fb1b2aa5af57c7bb652ab3f70ab7a28ef8b59a
+DIST typenum-1.12.0.crate 36037 BLAKE2B b5aa97daf856e4c0ecf6f543ce75c1203ea2a27b493e4e62b1a0a22fbccf79217382061833e518a5de296a00a4a5f3c0c1cc736a7fa40a947712fcddf0735ea7 SHA512 b88dac076d4102f2b1d74501cc2bedd4eb923458e060ab77b826093e3146bc48005ad7d3471921c4f5e8765f3f93f8f7c48e0eb00e2623ad439bd60bcf64d6ea
DIST unicode-bidi-0.3.4.crate 32228 BLAKE2B 853a85b29d1ac2025b7a28af64ead9387e3b4b1e790ad719d4374e349c1853ddbb5959a2890d9d6c94a5c28e4523fc3324deb6b1ed1aeb5e917f21b0e2516f6c SHA512 170ce083fa82bed13ecc62d85cb882fdd6491ae721e1633d3c1a5d3cee69422153afcf6695765c0e8fc7035440d0370d34afac9e978cb27f7506c07cba300e1e
DIST unicode-normalization-0.1.12.crate 91057 BLAKE2B d5b8354990e1911e093d63d9b3b3adeacb38142ac68637fbfe59c0822f34c743e348cae9f535421c12cc6a56db2112dd5ec75f96c173b1f34a68db66c8ad8dd7 SHA512 0e095a59ff965499a5d2c79bfd4826b793103bebb4d2666c09e675110a50f79d985eb29565e4c40bd8fddc30237f874324d8a24786ead697ee0698ef8f79a1b6
+DIST unicode-normalization-0.1.16.crate 92805 BLAKE2B 556b0b95b6d21f95ad99181e999d2f2a1291951db14e95cdaa4596b159323e999a135380ca0f795c996f97ffaa0c25465bfe5884bebc8903130bfd7437d4b86a SHA512 c1f83a79b0fffd2f0e1b8a579ae4e5021c4cffd74c259d065919b937bdd78b9ef83650cfd777010e7008ceb51e072777b195dd2483e1a85798a98b72f8648ead
DIST unicode-segmentation-1.6.0.crate 90703 BLAKE2B b7d63bb8b62cabc604084957aaff021df24a1291f0ebdcddc424cceefe10ad399ed53152211c3e7557e39e21255166f922256f9f8e1fb488d3bae368b49a378e SHA512 80c6f92d9b39602a05809dc63a7cb05a305441689b6056801097a882a36c9795aabd660f884f707daa7e7fe6ad4983f6e245c226962cc982dbfeea2ddfddf41e
+DIST unicode-segmentation-1.7.1.crate 93066 BLAKE2B 80058a79c64972dfff897b08a24e9f18ae0fa312a50f86fc321961eeab83c5546bdbc30534315870d891e648bde1d7d77f459ec9744455bdebb94bf6e326f2ef SHA512 183ca68d456a8d53e6f255129e8fd07b87d8da23b8f18187231d6fa70dac80e4069eb6c501d45155d9f0050b6bd713964e55f0e4b25a40546c4d245a17fc8dc6
DIST unicode-width-0.1.7.crate 16644 BLAKE2B 8cc5ee2dfeeda8ffe3405a0d4f1576d2b3b8ede1a42cbefb0ba3bd0d71b53a92ceade86c4a06e9d5b31382955dc6e1152ae5cd279dc26dbc51f478dad1d0f64d SHA512 39b8a539c9009d0421f54ae68b139f21456c9cb03d743b58535a977f98bc9655cf42eaacfadbcff796c187a6f315ae16259ee22be9c2da5aa042172c6b464d84
+DIST unicode-width-0.1.8.crate 16732 BLAKE2B 5aa7b87eef1322e4151a3fcf981ade311b8fa030527d7561815950e58d3f15156163dfe34da6a708c37dccc3f7652bf7fc2cd899fe8bb0118b67c4113ff3a2d2 SHA512 0abba6da6981a2451e01d93bbd47652c46eb6fb07cc0214f33259fb29945bfd5ee2b302e883ddca8f68e921635f222701b7310e7da2a5e225f854980d1e474b0
DIST unicode-xid-0.2.0.crate 14994 BLAKE2B e66b4255798f0ef1c81fb852613fee396a042d780d2158a171dbb5e7dedad0b3d2522f5401ae5d215f89ab8be4f5c371b046e4845693a65554c2a6eedc5d1e28 SHA512 590f727d8d8354023062ae5fe7ac5bed1bcf79d86b883effd7f33b3ea3b1c8922998a63d621ca6962a969e890fa6edd009871f21cd57b1969264f41ba3f78359
+DIST unicode-xid-0.2.1.crate 14392 BLAKE2B 7f8f91b9c4df55f2137b754208d4f2997a290acfc9393ee2dcda8195eda25cb342e56ad123f56bb298d93db5248a749c18a982423c9a0e85ce93f7a1eb55d289 SHA512 91e862137e837baea82829431cfed36634fdb05339f00c756eb5a4b429ef0bb871f5133d11adf9a023fa22168c8a0cf194ff3669779f04f219d48fc4fac339d2
DIST url-2.1.1.crate 70383 BLAKE2B c4096cb1bd50e9ca97fcdae0ee8b58957e21507607eafa8d84ff71c3df1ba52c68299609776f7baa45c93b971f8b61162fd8afd4174a5c7b66f36dc673707fa0 SHA512 a16c3a625fa85be9305f8150d5711c3e3aaa1f33753e7ecb8368b176cf3ea96f51fde74598c8ea3a5db2effc338589fd2834b297a1fba4bed967fa39e670fabb
+DIST url-2.2.0.crate 42787 BLAKE2B 115380294b06c833fe183423b26f32b7a0cb3eb7bbb53380c41b32c031d6d34ed55f11153d5ed8f3e82effc13b9571f3b27d9889fe61cf63a68ea3767ef63cc8 SHA512 5474daa20242552fc76f8e21a28f8880c011627773fed74061fdf15afd5a33cc1b09baf6583112126a1b8287ad71a22055d2bbf78a73a0d82a115db1334d05ee
DIST utf8parse-0.1.1.crate 13995 BLAKE2B 6b1de4afdb2837a76637de72f6e6a81e73aa683d8da04ebc94cf7ee3c542845d2244e721840511ee2725320f2f882722e2bea67914435131d7af1ab29291d1eb SHA512 543d4daddce8248b181deb1c3952ca15303d78616480b23af163ca6253a059b5ce9494652839a051c48a47816c3dd719465bbe5bb7930db676a16bcdac47c517
+DIST vcpkg-0.2.11.crate 12600 BLAKE2B 1c44c8df531a75f686c0497e70a72aa0c1b554c02ed256e6b08407b17066ed949f03bda42645d56e1227b50dc4c0e3865f10856605c2eadab3b74f55f005789b SHA512 d67bc244c81827165bf976808f79fd02f9149a19006898e60ff8ef11df2d72657c56bc9fc14c8f91b091075ceb23c3f96a3df81be345bb01881679eb47a0e6e9
DIST vcpkg-0.2.8.crate 11209 BLAKE2B e393dfbaabf1e47bc74fd89dc05e09f2dd9fd8b965a84f638edafcb2f5cf062005224d0c1b229394b40a3ecdf0fb34bfb3bf2c62a5d5b1016663e02d08bbcc8c SHA512 a239e969a02c8d8670178cc2be654bd12d6e6bb18be9eb70ec547212289fd2ef98859e6b3592aa6fbaf3178e0f2c27e2c8598d82990077a74896e739ae1374b9
DIST vec_map-0.8.1.crate 14959 BLAKE2B f5c179ccb4349d543747d5e3bb3edfca4bc9f3f64ba3c2d40fb1d9cba98433b7a0641387aafda6347c9b3603592c64bd820b217b46fbfcd37f802f298e5793ab SHA512 026cf10dc7ba98ae51dd312fc847cbaea41c25f0da5db6e0e22c2ecf75584bbf876d7bd96035fbbcf6696d702d5a3f25977e02a2d77cf519aa21e3ed05710e40
+DIST vec_map-0.8.2.crate 14466 BLAKE2B 8f109fbff19604b82ea2aa61c952e2ce9b5597ccc8e1ef4e847648e2de08dece8c4debe92889edeccb8d393645fd0b62436b49d236ded7ad181c4a51239a9539 SHA512 4f1ef59bc2c437e79f1f84fe021bce5aa8ccd581f500f3d5776913d5f17d45b03ccee64f5bd03d47656318cfc9344a1f4311079d471fa409a8e4e94c143973f9
DIST version_check-0.9.1.crate 11459 BLAKE2B 72f002c00504f635b7d2d7ee7137e07ba9c182d2e41d32a51851896f6bf6742c5524b7f66946437ba581ccf80b9c9a57280dd4b02df0918569ac710511940fc1 SHA512 b9cf363169df2022a961f5bed4fb7da07513e0283a85aa69752f6ac567e942611ed2216ac61799db1a199e2bdf0fd9b994e35d4a40c6cd80cd26b97cbfe977cf
+DIST version_check-0.9.2.crate 11979 BLAKE2B 6568f8d4652fb470162bb2251be2260a6bf83e107a4f957ed91117938d5da48c42bedfb5e6622bcd6c37950805666b78984577bd8dae687dbb39e452078bd97c SHA512 b88a9d545ef103fe6d0eebe7ddcf328fc21fcb02c60828b347cfc35afd957669e652a94d880ef992450c167df3505838bc649e0d83896542fa13a149875acf26
DIST vte-0.3.3.crate 2397439 BLAKE2B 213fccf5b1f09b2d23bca57be2abec0a3580ab01864c51dd364676f5c66decc5184ef15f0e484f9a94e892f118863655f4b2ed2a340a47276b3fe7b4db901dec SHA512 5e00e8409ef21edb5aa6fbe482785fd5969dd17a6695f82328c4ae12ea8622712dc3473f33832fdfe0cc2395411431fd47842e86e35022149d5e958c4e5f8fe9
DIST walkdir-2.3.1.crate 23413 BLAKE2B fc9601f4a28cec383297dbd87d422e56db1e989e4273900750f05d1f4a92e114a5b1a5a54368e290c5f4b47159ed51f52d85ce66f003cd2f52ffc737ead20f8b SHA512 ba807ff0d098aabdcd37e23204632beea1dbb7a6adfd16cb1009cae9e7b6957cfeab705cc454bf8f2b62a08743214ab995e43bf46fc510012c938f9e2a434951
DIST wasi-0.9.0+wasi-snapshot-preview1.crate 31521 BLAKE2B 716bdd2ec46d0bc9911c5e5e29fc783840559931b2563d8619675fc11da9527ddbe653a0f1ce0b782ee0c5f7a3131aba2b0867d415f003aa9c2389357569e7dc SHA512 dbe641f796ee3a5daafcaafc911ecc6dff170340f477c2df7a61fb4858a85aefc2637c9e61973ecce66a987aa8e08a736273a4aad3ef47eaf61ed4268dbf9c47
DIST winapi-0.3.8.crate 1128308 BLAKE2B e0e8ef6121f222b0500525192ebb69b26b71cc16f9ba92186f8ad6acc9de4cb8cc7c738f9c31f5bd223d2e34c93c496e8448c973d69797776004670c70abf69c SHA512 5a899ee5f09f30d742b8b8eba78da05cd9f4c664408fdeb9370373f8756a962a23e3f1c07619e745b3270138606c9a369076c02c3f5353f657df09d203d9a736
+DIST winapi-0.3.9.crate 1200382 BLAKE2B cb5799749ccd935ea2d7068d953cecf19f543d9db7dc16ad4584bb7005373ada34937a3ced7225544d8bc765da599911c7a3190efefb3a25b7c1bb7123b4f673 SHA512 ff8b7b78065f3d8999ec03c725a0460ebc059771bf071c7a3df3f0ecd733edf3b0a2450024d4e24e1aedddaecd9038ce1376c0d8bbf45132068cf45cf4a53a97
DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
DIST winapi-util-0.1.3.crate 9913 BLAKE2B d310b3fbe45bf4a25971c4396f945119efbe8f5bd497f03ae04eaee7643d9d022af69c4d511ed6e89fd10bc56d4448b8b3a624491a67a87dcab4f156c31ab104 SHA512 55ed7996a8f63e2218e74e778e47450863b19170bf1f5375a36b094c5e34bb41b19f093157e40190e105a40cd1cd9bf90e95966fc3a7de71f6b74e272723a1b8
+DIST winapi-util-0.1.5.crate 10164 BLAKE2B fc800aceae5249a858c806c3e969ef2545766099872d856ebee51c883d9acf1122278db9607d50ca53eac351502b700fd2463900932d342240f97f683d517963 SHA512 7baeb661f397c4693dfa001fdc774b323c51a7c55caad40f2de5112a1cefd1d6151e3df41fa4ee193460a5905917c83d2b1de5fa10b4bd014ad96690af95c0fd
DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
EBUILD cargo-c-0.6.2.ebuild 3051 BLAKE2B 049145dfd1f0ba27a92845082e12221cc9b04b5e6238ecff6490792ceb1861db0959224bba6e5c25bea273012724e420a23c95b4e6243d77c912e13b00936c35 SHA512 8b789d8bba907d3a46b17efc1471e8e8e25941b903727d5177994a0bee7904c5f5d73d332a9a940f37c1617c7d7879b5b4cc7c1f4ffa5d9c033d9b522f3e38d7
+EBUILD cargo-c-0.7.0.ebuild 3298 BLAKE2B 86eb973dcfb1024573c076ac5d63623ede11628976828bfaa81c3e68d66186feb952883af86c4d8ff3ff510d93c4d249bcf218be550b7d75178b61b9bde117f5 SHA512 975070dcc1a250382caa551be5165e6f26eac41ad54de419f71d42a4bd3d69174f60abc4f3a2c1686207f74e796b823eb430f519c33d623cf5e0a5396199b08e
MISC metadata.xml 326 BLAKE2B ec5622ca2c87640dfe5c409704f1674bc53ef0ce4d0778227d3816cd4a151f5f09e3de1f09814ce98f5e208e04a5cc0a6c28dd1b9bd81fa3857b688d8e9eebb9 SHA512 f28238739f1c2d04cb617ac31c2965fb110b560e5b9bbc6fa2749f22cd4cb353ef6cda1df1d718f165e4ae56f5bdf66da9104f6440d7d0009ba352a877c1f3c8
diff --git a/dev-util/cargo-c/cargo-c-0.7.0.ebuild b/dev-util/cargo-c/cargo-c-0.7.0.ebuild
new file mode 100644
index 000000000000..e9fb83044277
--- /dev/null
+++ b/dev-util/cargo-c/cargo-c-0.7.0.ebuild
@@ -0,0 +1,176 @@
+# Copyright 2017-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Auto-Generated by cargo-ebuild 0.3.0
+
+EAPI=7
+
+CRATES="
+cargo-c-0.7.0+cargo-0.49
+adler-0.2.3
+aho-corasick-0.7.15
+ansi_term-0.11.0
+anyhow-1.0.36
+atty-0.2.14
+autocfg-1.0.1
+bitflags-1.2.1
+bitmaps-2.1.0
+bstr-0.2.14
+bytesize-1.0.1
+cargo-0.49.0
+cargo-platform-0.1.1
+cbindgen-0.16.0
+cc-1.0.66
+cfg-if-0.1.10
+cfg-if-1.0.0
+clap-2.33.3
+commoncrypto-0.2.0
+commoncrypto-sys-0.2.0
+core-foundation-0.9.1
+core-foundation-sys-0.8.2
+crates-io-0.31.1
+crc32fast-1.2.1
+crossbeam-utils-0.7.2
+crossbeam-utils-0.8.1
+crypto-hash-0.3.4
+curl-0.4.34
+curl-sys-0.4.39+curl-7.74.0
+env_logger-0.7.1
+filetime-0.2.13
+flate2-1.0.19
+fnv-1.0.7
+foreign-types-0.3.2
+foreign-types-shared-0.1.1
+form_urlencoded-1.0.0
+fwdansi-1.1.0
+getrandom-0.1.15
+git2-0.13.13
+git2-curl-0.14.1
+glob-0.3.0
+globset-0.4.6
+hashbrown-0.9.1
+heck-0.3.1
+hermit-abi-0.1.17
+hex-0.3.2
+hex-0.4.2
+home-0.5.3
+humantime-1.3.0
+humantime-2.0.1
+idna-0.2.0
+ignore-0.4.17
+im-rc-15.0.0
+indexmap-1.6.1
+itoa-0.4.6
+jobserver-0.1.21
+lazy_static-1.4.0
+lazycell-1.3.0
+libc-0.2.81
+libgit2-sys-0.12.15+1.1.0
+libnghttp2-sys-0.1.5+1.42.0
+libssh2-sys-0.2.20
+libz-sys-1.1.2
+log-0.4.11
+matches-0.1.8
+memchr-2.3.4
+miniz_oxide-0.4.3
+miow-0.3.6
+num_cpus-1.13.0
+opener-0.4.1
+openssl-0.10.31
+openssl-probe-0.1.2
+openssl-sys-0.9.59
+openssl-src-111.13.0+1.1.1i
+percent-encoding-2.1.0
+pkg-config-0.3.19
+ppv-lite86-0.2.10
+proc-macro-error-1.0.4
+proc-macro-error-attr-1.0.4
+proc-macro2-1.0.24
+quick-error-1.2.3
+quote-1.0.8
+rand-0.7.3
+rand_chacha-0.2.2
+rand_core-0.5.1
+rand_hc-0.2.0
+rand_xoshiro-0.4.0
+redox_syscall-0.1.57
+regex-1.4.2
+regex-syntax-0.6.21
+remove_dir_all-0.5.3
+rustc-workspace-hack-1.0.0
+rustfix-0.5.1
+ryu-1.0.5
+same-file-1.0.6
+schannel-0.1.19
+semver-0.10.0
+semver-parser-0.7.0
+serde-1.0.118
+serde_derive-1.0.118
+serde_ignored-0.1.2
+serde_json-1.0.60
+shell-escape-0.1.5
+sized-chunks-0.6.2
+socket2-0.3.18
+strip-ansi-escapes-0.1.0
+strsim-0.8.0
+structopt-0.3.21
+structopt-derive-0.4.14
+syn-1.0.55
+tar-0.4.30
+tempfile-3.1.0
+termcolor-1.1.2
+textwrap-0.11.0
+thread_local-1.0.1
+tinyvec-1.1.0
+tinyvec_macros-0.1.0
+toml-0.5.8
+typenum-1.12.0
+unicode-bidi-0.3.4
+unicode-normalization-0.1.16
+unicode-segmentation-1.7.1
+unicode-width-0.1.8
+unicode-xid-0.2.1
+url-2.2.0
+utf8parse-0.1.1
+vcpkg-0.2.11
+vec_map-0.8.2
+version_check-0.9.2
+vte-0.3.3
+walkdir-2.3.1
+wasi-0.9.0+wasi-snapshot-preview1
+winapi-0.3.9
+winapi-i686-pc-windows-gnu-0.4.0
+winapi-util-0.1.5
+winapi-x86_64-pc-windows-gnu-0.4.0
+"
+inherit cargo
+
+DESCRIPTION="Helper program to build and install c-like libraries"
+# Double check the homepage as the cargo_metadata crate
+# does not provide this value so instead repository is used
+HOMEPAGE="https://github.com/lu-zero/cargo-c"
+SRC_URI="$(cargo_crate_uris ${CRATES})"
+MY_P="${PN}-0.7.0+cargo-0.49"
+S="${WORKDIR}/${MY_P}"
+
+RESTRICT="mirror"
+# License set may be more restrictive as OR is not respected
+# use cargo-license for a more accurate license picture
+LICENSE="Apache-2.0 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="libressl"
+
+DEPEND=""
+RDEPEND="sys-libs/zlib
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl:0= )
+ net-libs/libssh2
+ net-misc/curl[ssl]
+"
+
+src_unpack() {
+ cargo_src_unpack
+
+ tar -xf "${DISTDIR}"/"${MY_P}.crate" -C "${WORKDIR}"
+}
diff --git a/dev-util/clazy/Manifest b/dev-util/clazy/Manifest
index d7e8af81318e..0bcd49c8fe8d 100644
--- a/dev-util/clazy/Manifest
+++ b/dev-util/clazy/Manifest
@@ -1,3 +1,5 @@
DIST clazy-1.8.tar.xz 392328 BLAKE2B 9ece9d279b2bd7e4c15ad35d9943636a107abd47cf0ed0b20db305b1684610fb84c6f9c7f606f159f0b5a48b881506796f0addf12246f2e9929a08225fcc5c74 SHA512 c43a393721a5235ddcd653f9c322e0a215f86add3b1ce42f849677c108cd21209693c6e8f225171db88032c75596722109ee01bc53db4af90fe7652f27c1eba5
+DIST clazy-1.9.tar.xz 394856 BLAKE2B 641ca46a31475cf7bd03ba921e390cb2712362dc97b960a519e05c47049927f805d3ef6f1c756b96d3483e8f4b75e2dc41a2419a462ed2e45cbd08c88c07f933 SHA512 2e8bec44a027366263de23c50d14192e310fd38fa2b369afb21413da9cb78da9882b2153daf1784c4c9076cc62e2867b5211c75ff9a1eabcb583e405f20f5912
EBUILD clazy-1.8.ebuild 1000 BLAKE2B 3c6589a1415df7b2fcf463e5c3d396e49b17b583eb4bc756302a9f008f8167f3012634b0bffccc2822532765970409bd6123715d4c36d17614fbedcdbfca35d1 SHA512 764551bdfaef64651d399ea681dc6330aacf0ac425ecc18118f9f820dcfeaafc86c85fb11744f6ab53fee6c58975c448abfcca8c5163dfda48a01d6b11c8e270
+EBUILD clazy-1.9.ebuild 988 BLAKE2B 6e2e73e25b1c45cdb160727183090c573a510d6a265b17d7c17cc35777d9e5ce17773685f33fa3ab5d782471e9fcb602411e38c2493b3ce696ac469f7afd028a SHA512 d93541655d4a0b9850070ef05fc5cd1f0b9bacb38fca1330ae60db9ab5825d7f52bc8fd7cf76c02317ea93a8cf3ad6f7914ad2d915c0c2ff62c1ff49afca8f34
MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/dev-util/clazy/clazy-1.9.ebuild b/dev-util/clazy/clazy-1.9.ebuild
new file mode 100644
index 000000000000..e9b6e64599a7
--- /dev/null
+++ b/dev-util/clazy/clazy-1.9.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Compiler plugin which allows clang to understand Qt semantics"
+HOMEPAGE="https://apps.kde.org/en/clazy"
+SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+RDEPEND="
+ >=sys-devel/clang-5.0:=
+ >=sys-devel/llvm-5.0:=
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+ cmake_src_prepare
+
+ sed -e '/install(FILES README.md COPYING-LGPL2.txt checks.json DESTINATION/d' \
+ -i CMakeLists.txt || die
+}
+
+src_configure() {
+ # this package requires both llvm and clang of the same version.
+ # clang pulls in the equivalent llvm version, but not vice versa.
+ # so, we must find llvm based on the installed clang version.
+ # bug #681568
+ local clang_version=$(best_version "sys-devel/clang")
+ export LLVM_ROOT="/usr/lib/llvm/$(ver_cut 1 ${clang_version##sys-devel/clang-})"
+ cmake_src_configure
+}
diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index 5633d0ae60b5..61aab7a6401e 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -20,8 +20,10 @@ DIST cmake-3.13.5.tar.gz 8618821 BLAKE2B 765678bc92821207c53bfb4ac995a791b938f20
DIST cmake-3.17.4.tar.gz 9473549 BLAKE2B 2ce29415525b5292ae9e06d73570ed0af2173d8d15612f4d645f22d4f55cb99018663c374c4282731e09f8c6e4ffd59316d65f38aef9db5c34d874ca8992382b SHA512 6af879502e52388f3be02a4edfb006274840ad1afa8f28ffd6ec69b0310c7f718812b2272e5f77ffa422717f61407a6d482deb95941555c21c73fc5f62356a4e
DIST cmake-3.18.5.tar.gz 8975784 BLAKE2B 62ea68b602e7e352c22ba6122aa010fb78fb5c4e484aa51bc336e750280d5fc03ffa439bd8005d2c43176f5a5db4ebfd419beca65cc59c5b8cd5666e38394fb8 SHA512 c15e0937a9c0ce0b6164c3d02a147e679ea57e1119cff4189a15de71429a7facb3c04eb8db467471876b5da5dbd4a25acb228efa7101fe78efd205f0d2c96343
DIST cmake-3.19.2.tar.gz 9264414 BLAKE2B f45727fd6b6e0e324f618577abbc7fb1830f05f01a9afea4f8713f5f62ede3a612a020ef97385cdd6ede4b575a3b6f63deb57123a222b71e2906a42cba3b3d7f SHA512 d811122af89d46174b8fdb2a26e8553200d9dc7eb6385ece4e4b3e7584880f73a799813d5a81e64e956fd2574b63264fa8944d862c74a076e9d61f5e6521e91a
+DIST cmake-3.19.3.tar.gz 9265831 BLAKE2B 133ca8b12c0ccff0f9d833543c66cac597d72898d6e8602c74ef2875c90059b0a19d059b8801e407a7d5931b8aa50b253aef970330454789e13e2e63a7bb6d97 SHA512 54c91fa76882152d3933b696d7e547bc4edf6f97f3810e8dd57ca28c98e9fcaf757eac7c77e1e7fab88aced10937ed354917aeac3997edef406313dcf76ba0c5
EBUILD cmake-3.13.5.ebuild 6239 BLAKE2B 5e3b289af5d341e73fbdfe6162330e9e39dac40276991f08df670fcff6e40438995b608704e535545c4538cedb7ed789c2cc2ae0b38a1fd0f3a2e9627c95a494 SHA512 e75ea6defa00993410ed865329b450f38f9ad418c59bfe345880bae25d2f19e4463a407d744527d3f5c6c59fe8cf732cad5ac6274901cfcf3809d29573be7ad1
EBUILD cmake-3.17.4-r1.ebuild 6124 BLAKE2B e5e3ae707d53e486d2fc594a3376138067b1e2e0041e04354e1ac3a1f7ae40f2d87b4eb404e457967a3cb62ba437b0b9dcd916cce50e8d6d30c0c0da3ecece28 SHA512 145b100bd219c50de18d94066c5d73cc77051b054ea5822e0fcb86f53c3d381a29e0026c25e115320df3c324a96519ffa670ecf73e8dc24527043dafb51fe443
EBUILD cmake-3.18.5.ebuild 6119 BLAKE2B 7721f2479c737064a576ee9986dbca604c50c2ca14787e0c3e7f9b9c00b4470bf8a4015cd4abe3d000b79dd1cbcec9949754d2c259ddd2396b3f4ef06291b5d7 SHA512 3462ad588ceaedc9509c0d49ba5803d3c76d149b9054c0c55cf28e29258efca20ad6dc62dc80567c910ef86f775fd4e56d2eea726f0e6e81287cb1fbf28bc038
EBUILD cmake-3.19.2.ebuild 6733 BLAKE2B 2a2746d24c989a18d6ff8da0bd91bdc71b5d11b52eef3199f9f58d4a6698427da24ec35ff65bfb2e8c9c4ce65568b3c6759aea92a2695bff1185cc6efedd7603 SHA512 360029531687002f68392a3c24870b98ec60c2130b747a3926f5c431d5ca05ab09281a1fe9d26f135da71479ca82d3adbe806515448f160da845010c9d88a8cf
+EBUILD cmake-3.19.3.ebuild 6861 BLAKE2B 7349f361613e4c1279f218a953179bf0fd98f40ea7963540bc3837272ab7b2585cb2ee371f9776ce2a5fb5ad3eddcc5030e7faba9a6257ef6e24780588c70f48 SHA512 6168ff1a5833a7b69d36c5122026e3c848a5f1f67b034b800f627a4bbaf94bfc3d4f5041f26b000c23ff224b8873d6621f897624f13ad7e01c2d82ee99e32cac
MISC metadata.xml 460 BLAKE2B f1a7e1709a6b9975ffbc377c8b4d1ea8a01f52ccc139693c8e427150b7559ecc867b3e55fb4bc95fe342a2335fe5e13c69f4bd74ffbbf302c83872c65963e73e SHA512 fc562cd5f336101d16ca30a5b3e9b99a6e51ec9d7aa503f20ce278f44d5810286fcd6b46b18073cd88ba88ee5ab4f8a0bfccaa567df09ebb722a68ab721aa340
diff --git a/dev-util/cmake/cmake-3.19.3.ebuild b/dev-util/cmake/cmake-3.19.3.ebuild
new file mode 100644
index 000000000000..930417171292
--- /dev/null
+++ b/dev-util/cmake/cmake-3.19.3.ebuild
@@ -0,0 +1,230 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_MAKEFILE_GENERATOR="emake" # TODO: Re-check with 3.19, see commit 491dddfb; bug #596460
+CMAKE_REMOVE_MODULES_LIST=( none )
+inherit bash-completion-r1 cmake elisp-common flag-o-matic multiprocessing \
+ toolchain-funcs virtualx xdg-utils
+
+MY_P="${P/_/-}"
+
+DESCRIPTION="Cross platform Make"
+HOMEPAGE="https://cmake.org/"
+SRC_URI="https://cmake.org/files/v$(ver_cut 1-2)/${MY_P}.tar.gz"
+
+LICENSE="CMake"
+SLOT="0"
+[[ "${PV}" = *_rc* ]] || \
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc emacs ncurses qt5 test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ >=app-arch/libarchive-3.3.3:=
+ app-crypt/rhash
+ >=dev-libs/expat-2.0.1
+ >=dev-libs/jsoncpp-1.9.2-r2:0=
+ >=dev-libs/libuv-1.10.0:=
+ >=net-misc/curl-7.21.5[ssl]
+ sys-libs/zlib
+ virtual/pkgconfig
+ emacs? ( >=app-editors/emacs-23.1:* )
+ ncurses? ( sys-libs/ncurses:0= )
+ qt5? (
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+ )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ doc? (
+ dev-python/requests
+ dev-python/sphinx
+ )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+SITEFILE="50${PN}-gentoo.el"
+
+PATCHES=(
+ # prefix
+ "${FILESDIR}"/${PN}-3.16.0_rc4-darwin-bundle.patch
+ "${FILESDIR}"/${PN}-3.14.0_rc3-prefix-dirs.patch
+ "${FILESDIR}"/${PN}-3.19.1-darwin-gcc.patch
+
+ # handle gentoo packaging in find modules
+ "${FILESDIR}"/${PN}-3.17.0_rc1-FindBLAS.patch
+ # Next patch needs to be reworked
+ #"${FILESDIR}"/${PN}-3.17.0_rc1-FindLAPACK.patch
+ "${FILESDIR}"/${PN}-3.5.2-FindQt4.patch
+
+ # respect python eclasses
+ "${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch
+ "${FILESDIR}"/${PN}-3.9.0_rc2-FindPythonInterp.patch
+
+ "${FILESDIR}"/${PN}-3.18.0-filter_distcc_warning.patch # bug 691544
+
+ # upstream fixes (can usually be removed with a version bump)
+)
+
+cmake_src_bootstrap() {
+ # disable running of cmake in bootstrap command
+ sed -i \
+ -e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \
+ bootstrap || die "sed failed"
+
+ # execinfo.h on Solaris isn't quite what it is on Darwin
+ if [[ ${CHOST} == *-solaris* ]] ; then
+ sed -i -e 's/execinfo\.h/blablabla.h/' \
+ Source/kwsys/CMakeLists.txt || die
+ fi
+
+ # bootstrap script isn't exactly /bin/sh compatible
+ tc-env_build ${CONFIG_SHELL:-sh} ./bootstrap \
+ --prefix="${T}/cmakestrap/" \
+ --parallel=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)") \
+ || die "Bootstrap failed"
+}
+
+cmake_src_test() {
+ # fix OutDir and SelectLibraryConfigurations tests
+ # these are altered thanks to our eclass
+ sed -i -e 's:^#_cmake_modify_IGNORE ::g' \
+ "${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \
+ || die
+
+ pushd "${BUILD_DIR}" > /dev/null
+
+ local ctestargs
+ [[ -n ${TEST_VERBOSE} ]] && ctestargs="--extra-verbose --output-on-failure"
+
+ # Excluded tests:
+ # BootstrapTest: we actually bootstrap it every time so why test it.
+ # BundleUtilities: bundle creation broken
+ # CMakeOnly.AllFindModules: pthread issues
+ # CTest.updatecvs: fails to commit as root
+ # Fortran: requires fortran
+ # RunCMake.CommandLineTar: whatever...
+ # RunCMake.CompilerLauncher: also requires fortran
+ # RunCMake.CPack_RPM: breaks if app-arch/rpm is installed because
+ # debugedit binary is not in the expected location
+ # RunCMake.CPack_DEB: breaks if app-arch/dpkg is installed because
+ # it can't find a deb package that owns libc
+ # RunCMake.{IncompatibleQt,ObsoleteQtMacros}: Require Qt4
+ # TestUpload: requires network access
+ "${BUILD_DIR}"/bin/ctest \
+ -j "$(makeopts_jobs)" \
+ --test-load "$(makeopts_loadavg)" \
+ ${ctestargs} \
+ -E "(BootstrapTest|BundleUtilities|CMakeOnly.AllFindModules|CompileOptions|CTest.UpdateCVS|DependencyGraph|Fortran|RunCMake.CommandLineTar|RunCMake.CompilerLauncher|RunCMake.IncompatibleQt|RunCMake.ObsoleteQtMacros|RunCMake.PrecompileHeaders|RunCMake.CPack_(DEB|RPM)|TestUpload)" \
+ || die "Tests failed"
+
+ popd > /dev/null
+}
+
+src_prepare() {
+ cmake_src_prepare
+
+ if [[ ${CHOST} == *-darwin* ]] ; then
+ # disable Xcode hooks, bug #652134
+ sed -i -e 's/cm\(\|Global\|Local\)XCode[^.]\+\.\(cxx\|h\)//' \
+ Source/CMakeLists.txt || die
+ sed -i -e '/define CMAKE_USE_XCODE/s/XCODE/NO_XCODE/' \
+ -e '/cmGlobalXCodeGenerator.h/d' \
+ Source/cmake.cxx || die
+ # disable isysroot usage with GCC, we've properly instructed
+ # where things are via GCC configuration and ldwrapper
+ sed -i -e '/cmake_gnu_set_sysroot_flag/d' \
+ Modules/Platform/Apple-GNU-*.cmake || die
+ # disable isysroot usage with clang as well
+ sed -i -e '/_SYSROOT_FLAG/d' \
+ Modules/Platform/Apple-Clang.cmake || die
+ # don't set a POSIX standard, system headers don't like that, #757426
+ sed -i -e 's/^#if !defined(_WIN32) && !defined(__sun)/& \&\& !defined(__APPLE__)/' \
+ Source/cmLoadCommandCommand.cxx \
+ Source/cmStandardLexer.h \
+ Source/cmSystemTools.cxx \
+ Source/cmTimestamp.cxx
+ fi
+
+ # Add gcc libs to the default link paths
+ sed -i \
+ -e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \
+ -e "$(usex prefix-guest "s|@GENTOO_HOST@||" "/@GENTOO_HOST@/d")" \
+ -e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \
+ Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed"
+ if ! has_version -b \>=${CATEGORY}/${PN}-3.4.0_rc1 || ! cmake --version &>/dev/null ; then
+ CMAKE_BINARY="${S}/Bootstrap.cmk/cmake"
+ cmake_src_bootstrap
+ fi
+}
+
+src_configure() {
+ # Fix linking on Solaris
+ [[ ${CHOST} == *-solaris* ]] && append-ldflags -lsocket -lnsl
+
+ local mycmakeargs=(
+ -DCMAKE_USE_SYSTEM_LIBRARIES=ON
+ -DCMAKE_DOC_DIR=/share/doc/${PF}
+ -DCMAKE_MAN_DIR=/share/man
+ -DCMAKE_DATA_DIR=/share/${PN}
+ -DSPHINX_MAN=$(usex doc)
+ -DSPHINX_HTML=$(usex doc)
+ -DBUILD_CursesDialog="$(usex ncurses)"
+ -DBUILD_TESTING=$(usex test)
+ )
+ use qt5 && mycmakeargs+=( -DBUILD_QtDialog=ON )
+
+ cmake_src_configure
+}
+
+src_compile() {
+ cmake_src_compile
+ use emacs && elisp-compile Auxiliary/cmake-mode.el
+}
+
+src_test() {
+ virtx cmake_src_test
+}
+
+src_install() {
+ cmake_src_install
+
+ if use emacs; then
+ elisp-install ${PN} Auxiliary/cmake-mode.el Auxiliary/cmake-mode.elc
+ elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+ fi
+
+ insinto /usr/share/vim/vimfiles/syntax
+ doins Auxiliary/vim/syntax/cmake.vim
+
+ insinto /usr/share/vim/vimfiles/indent
+ doins Auxiliary/vim/indent/cmake.vim
+
+ insinto /usr/share/vim/vimfiles/ftdetect
+ doins "${FILESDIR}/${PN}.vim"
+
+ dobashcomp Auxiliary/bash-completion/{${PN},ctest,cpack}
+}
+
+pkg_postinst() {
+ use emacs && elisp-site-regen
+ if use qt5; then
+ xdg_icon_cache_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+ fi
+}
+
+pkg_postrm() {
+ use emacs && elisp-site-regen
+ if use qt5; then
+ xdg_icon_cache_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+ fi
+}
diff --git a/dev-util/debugedit/Manifest b/dev-util/debugedit/Manifest
index 632ecaf1689e..7fffda0b8091 100644
--- a/dev-util/debugedit/Manifest
+++ b/dev-util/debugedit/Manifest
@@ -2,6 +2,6 @@ DIST rpm-4.16.0.tar.bz2 4341683 BLAKE2B 5161e5dcc6d9a1f1d4b8e44740fb368050b808fd
DIST rpm-4.16.1.2.tar.bz2 4346745 BLAKE2B 17485b1e73b30586acb8e9be53bfb0bd430fa05e826755729c68367c798e8cad039f091731b6effbe9fa9b7d6c4018abd6feec94f032230cbbd6068e9080573a SHA512 066b67838312f9ad076285fe8f43527aded694f5562ead4e90df48675f2e99c1f2d68693fd20b2037e2614b978ed94c417753e2dbd055a9869b45264cd932afc
DIST rpm-4.16.1.tar.bz2 4348973 BLAKE2B 5f415099ed5b4f3425c1cbd02476c3066ef51e8efbe09829c0c7d9732cfdeed76ab0c5eed113a1b007d35bf5d5fb1c60543b7ef23319ba0f63550d598e98dcdd SHA512 cbce8381e7a0bdaf2c7529d0ac91fda15e663db7a76b02652d53327ebcd7d5b6b6154d5e88feeda87f71727a036e7a2afcd57c7dcddef610e32957b9e430d367
EBUILD debugedit-4.16.0.ebuild 1766 BLAKE2B d1a689387d0286879fc063d4e1732f70204b990c293f3eba9b02dfa92879bf1547aa9a70241345c949d7b4261b75859b5bf90b7f101eb379189e605d41b78081 SHA512 dfcabd9331d4425fcb26f064c0ac942fb7ebe5da7026dd4db863906f66b0e153fc9bd6e73324d07251ed8a2ee579278e26cf1c984b82d3048716290141f9a872
-EBUILD debugedit-4.16.1.2.ebuild 1767 BLAKE2B 9975eb6a65c9d80dec6310eef4a6fe21bbe10270472f9932d2733455cdc7a6d4e7fb454d67a80c411cb4e612f8e45d118882302ca17b4de3ff7908637d39932c SHA512 0b8f7ea65844a8264fe66ce66ee63fefa06b2498f285ade9cbe6a2b84873ce032b84e01167c6a703b710dc674d820f2fa40ca12b8fd57104340835f9fdb16f46
+EBUILD debugedit-4.16.1.2.ebuild 1766 BLAKE2B e505dcf0eb515dfd407e787959e63d817da5b7167c6e8fc60834b4d8d13d0b4275231d5de2b7c1dbc79518e4ed26b4d2851def8c682b7ee9d3ccb2e2de93ac10 SHA512 aff4b984df0300a979e253835c957b2d1d70b837a2c1e7db89a2c766cb50f0c03578d44a5682573734b0f94527614b54b531a6f158b408cb92c996edf2254a1e
EBUILD debugedit-4.16.1.ebuild 1770 BLAKE2B 9657d25e12679c563a0dd2f6220a58844c043f28ead997e6add996cff70e78964f6f3b88afbb65e7c1a683b4d7250919ebbc822001744adcc46b4e1324300823 SHA512 86a515866fa7f33aeb896b9ee67451bdb8d2850a34fcfca719307bacc002e99039fb24e3d6c6f088da1a6e59ca6c71ae764baca4c875e076315852be9100f1b8
MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/dev-util/debugedit/debugedit-4.16.1.2.ebuild b/dev-util/debugedit/debugedit-4.16.1.2.ebuild
index b5b05aae3a50..66b35de69336 100644
--- a/dev-util/debugedit/debugedit-4.16.1.2.ebuild
+++ b/dev-util/debugedit/debugedit-4.16.1.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://ftp.rpm.org/releases/rpm-$(ver_cut 1-2).x/${MY_P}.tar.bz2"
LICENSE="GPL-2+ LGPL-2+"
SLOT="0"
-KEYWORDS="amd64 ~arm64 ~hppa ~ia64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 ~hppa ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
IUSE=""
RDEPEND="
diff --git a/dev-util/diffstat/Manifest b/dev-util/diffstat/Manifest
index 5144fa085641..7166bdf2bb0b 100644
--- a/dev-util/diffstat/Manifest
+++ b/dev-util/diffstat/Manifest
@@ -1,7 +1,5 @@
-DIST diffstat-1.60.tgz 255922 BLAKE2B 325be7c283580066cd5c2665078320d33f9a97761a641ce53e7a53200cfdd0d047adb3bec527a5c8489320a685bd43979066465886fefd7ce5a29926c43dd95b SHA512 6cbcff7dfe6d51583d59d2c9dfe4cb958202491ca3c4b1096616380564a1842065434d30858c55c3ddcfc76cd07b58dfc4c4cb6cfdcf6346af60998170f51bd2
-DIST diffstat-1.61.tgz 257242 BLAKE2B 8506944255991f3fb093c77e04d1c19e75cce5deffe7ade19f6917c9775e00d02cc8013fcd88440a9d116b66859ffebb0d1c92755ca0ebcca465dd0595fe4bd2 SHA512 48166e1241904b955c0f5543b1f11724a1a91516fcba5ad0603441d985728de3e0fca5f5212704dd0fc9a9e5062788b1b34062869137fd851932233d4abad114
DIST diffstat-1.63.tgz 270855 BLAKE2B 01a54c49200396a102c42d982e952d38d23c78452ae467e799d29ae1199aa179927ff719955d700081c4b4f4296c0b73229fa35823e3e18f80b2edc51e3316e2 SHA512 e1319f95088e615d442b0b02af922605d0c76e15ba2f0e8cf8c4db56949ac63f4a6e3e42099254480b9aab388cbd6550f515ed4d4995c6723d24f392d1872b16
-EBUILD diffstat-1.60.ebuild 580 BLAKE2B 95c794f5c6ae95a8bd24d7a4866de5962b0891ce9452faef7813dbedeb8a5f9b2feaa30d9db19fc88d90bb56fc3ca244f5cbfcd8d3a2b237c81adf9724f54a2f SHA512 da9df08a13aa342721fb1b07934e05292ab3e0003f60928cbd4ffca7654207cf565c036f19775a749c74c5de3c8f264019f3a72fab1243e37768da926cc2d623
-EBUILD diffstat-1.61.ebuild 449 BLAKE2B f630d8c91c5e9e9790ecd4408a8a827850c19063ce12aa679c53e722d02661e80cc4dfc221f355b56849f20642fd2488f3df060d81674403a7d011fa9fbc1704 SHA512 81b2b542093fd398ec2ea2e2894864bce9da8306113291108fcae2038b414ae5e780b42c44109e5d29ab355c8c82c15623f133229266c8d42bbb2700b43e175d
+DIST diffstat-1.64.tgz 278873 BLAKE2B 41500977adacf492498a7ea38d5f5a7bb5a31d5e39a202c72ee344ad1996f36c493ff18af74cf4dda18d47617832351fd55e386f008493c39f4b64e6d3f01910 SHA512 d647477beb49b0999c5de41d084da827528571c4848f40c69c2d64d060fc89848d15d03d59b1a31d79f02180f81d92cdf6e19d0172482bc569cf2a87476f12cf
EBUILD diffstat-1.63.ebuild 449 BLAKE2B 8e41fa28b91fb83c97c8304ba302c33a25b7c2abf7d76e012c3f11f852a9932452ad36a4139a2b152d86c87ebbe0aa431e8b660525ef63e2c8e012bde74018a8 SHA512 f8c6d1d9c207d2957f4afee7abb589f89d81df0d33e2c3ea414f5dbccce2f2cb732e11f4753fffd3a298db99322e3caaa9e163b44d81591e0114e0303396e29c
+EBUILD diffstat-1.64.ebuild 449 BLAKE2B 8992746b8e1465aea49fa8a6a8650f889447261198e31b9c6608d5ced4fd154a2db0c9f14630e0e030c535473698648aa27b724de681b2a4f8a0c450dda9a9ef SHA512 61c26a80cbd5d8c87e86dc601e611f4fa8eb60179a569ac7d0fdeaf3f54814e714ef57c70564f7d3b71cbacc38cff65eb735ad0bf337bdd212b3053387c8d1bb
MISC metadata.xml 371 BLAKE2B 2c3b630946c1fa3f6e48d84b71b09902f6bd1d325abf2addc77cf89347771b9de8851c918eb90268989c41f725ce8f44ff5383fd51b4a483e40e67fe7ee066c2 SHA512 612277ac37956a5eb62db296c83919d9b49125145a9e9408dd4cd65c4e38439ac70b965de73e8f975e0410d9b0bcdf8bf1fce6a93c4883cd806fd39c6f9ab549
diff --git a/dev-util/diffstat/diffstat-1.60.ebuild b/dev-util/diffstat/diffstat-1.60.ebuild
deleted file mode 100644
index 2e106c3c7010..000000000000
--- a/dev-util/diffstat/diffstat-1.60.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-DESCRIPTION="Display a histogram of diff changes"
-HOMEPAGE="https://invisible-island.net/diffstat/"
-SRC_URI="ftp://invisible-island.net/diffstat/${P}.tgz"
-
-LICENSE="HPND"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
-
-src_configure() {
- # We can drop this once a new release is made w/newer autotools.
- export CONFIG_SHELL="/bin/bash" #529744
- default
-}
diff --git a/dev-util/diffstat/diffstat-1.61.ebuild b/dev-util/diffstat/diffstat-1.64.ebuild
similarity index 84%
rename from dev-util/diffstat/diffstat-1.61.ebuild
rename to dev-util/diffstat/diffstat-1.64.ebuild
index 137aa219c23e..f72e1c0d0024 100644
--- a/dev-util/diffstat/diffstat-1.61.ebuild
+++ b/dev-util/diffstat/diffstat-1.64.ebuild
@@ -1,13 +1,12 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
DESCRIPTION="Display a histogram of diff changes"
HOMEPAGE="https://invisible-island.net/diffstat/"
-SRC_URI="ftp://invisible-island.net/diffstat/${P}.tgz"
+SRC_URI="https://invisible-mirror.net/archives/${PN}/${P}.tgz"
LICENSE="HPND"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
diff --git a/dev-util/hfstospell/Manifest b/dev-util/hfstospell/Manifest
index 41fb9259851f..80c7097dfac0 100644
--- a/dev-util/hfstospell/Manifest
+++ b/dev-util/hfstospell/Manifest
@@ -1,3 +1,4 @@
DIST hfstospell-0.5.2.tar.gz 152115 BLAKE2B 667c01672fd6fd6ee743a6542677ffe74e3900c27ab2754f8fa7dcc57081074bd98e8d82827fe176b2a6c9abc4565efcb3204df43110906f5a333405ec8a6bf2 SHA512 307aff3aec91ac6ffed3ebabdc2baa1a6e913431f57a80a0d0254be57fbd72e28d7592c35e0d72e5979f7e0b4c585f11b8eb91183b0877f9670a9cd5206c0140
+EBUILD hfstospell-0.5.2-r1.ebuild 884 BLAKE2B ff6f1d9b69aad5651a921d705b3d865e493e5c34e08e175dc1c0d586d202ec91fd0a1cdb71e3c8d34b1456dd0b9aedca62fce09c5b76f7601ac2f37ac5d86ada SHA512 07b0468408360c1fdfd481566eae56601931342b5bdd219f22de5bd419137ef815599b52ab5367e20ced10e53827783b5b82a84c06caffb2646b170a1a7e77b4
EBUILD hfstospell-0.5.2.ebuild 679 BLAKE2B 02dd2bda990c8e01596828dd21891332242fac8df412c48276082bc4813f9e20abdd7220a779a0aa0a2ec0e5a69263316ea3e80bff116703fe2ad51172df59d5 SHA512 ba79bce0a5b5820397db178d670825e88c4905792df3cc83adcd89d0178262b636370433b4a7f87c738e02379c5977c29f2807f7c449e60ce82815c91f5f07bb
-MISC metadata.xml 254 BLAKE2B 938f68b7b21ad386a35540a09e4bb956e241dfc963d4823c3c0cd46d3449ff4fb5a1cead67ad7c35a460503d30bdbde35822535f1c2d46f2939ee190f328b846 SHA512 26047ebb40fc49bfb4393121c5c5af69caee617a1d75676be84b0f5af75564828aeeef4503c7681eaaf7e48f6c662574874336296c18e002dca8e925162a1d4c
+MISC metadata.xml 350 BLAKE2B 7ee5a7e4724c7a13a1f607e8134f95fcbcf40989b972002d0ae488a8d378d9dee83939948c7c1f8c6c124ca2e7927620ea906a804a5ebe16690ddd20415392d4 SHA512 77662d70afc9c6c6fcd7a1e12aeb3c26c49f5263088cccc0c587cb30d41592c65e63009dde1c36ffeca978b2f96628a6fba08ec909f4dad99fc7d9457aba9473
diff --git a/dev-util/hfstospell/hfstospell-0.5.2-r1.ebuild b/dev-util/hfstospell/hfstospell-0.5.2-r1.ebuild
new file mode 100644
index 000000000000..3b6cb8750ad9
--- /dev/null
+++ b/dev-util/hfstospell/hfstospell-0.5.2-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools toolchain-funcs
+
+DESCRIPTION="HFST spell checker library and command line tool"
+HOMEPAGE="https://github.com/hfst/hfst-ospell"
+SRC_URI="https://github.com/hfst/hfst-ospell/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="clang"
+
+DEPEND="app-arch/libarchive
+ dev-libs/icu:=
+ !clang? (
+ dev-cpp/libxmlpp:2.6
+ dev-libs/tinyxml2
+ )"
+RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+S="${WORKDIR}/hfst-ospell-${PV}"
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
+src_configure() {
+ # https://github.com/hfst/hfst-ospell/issues/48
+ if tc-is-clang; then
+ econf --without-libxmlpp --without-tinyxml2
+ else
+ default
+ fi
+}
+
+src_install() {
+ default
+ find "${D}" -name '*.la' -delete -o -name '*.a' -delete || die
+}
diff --git a/dev-util/hfstospell/metadata.xml b/dev-util/hfstospell/metadata.xml
index 6b0a0fb3a729..79d3d066cce0 100644
--- a/dev-util/hfstospell/metadata.xml
+++ b/dev-util/hfstospell/metadata.xml
@@ -5,4 +5,7 @@
juippis@gentoo.org
Joonas Niilola
+
diff --git a/dev-util/jenkins-bin/Manifest b/dev-util/jenkins-bin/Manifest
index 9ba4d0745f62..8af5dd094cd4 100644
--- a/dev-util/jenkins-bin/Manifest
+++ b/dev-util/jenkins-bin/Manifest
@@ -3,16 +3,12 @@ AUX jenkins-bin.confd 998 BLAKE2B 5c44e37118e15fdd76fc7eb0e10e06683828d3efe08687
AUX jenkins-bin.init2 1782 BLAKE2B 25c78b64308be71d605f3c4f2d33c5cf1074ab431e23a170f7d36002d668def7dbd56b0b45590692047d7d88c6884ec1cc40cb4f077f7edcb853300301805002 SHA512 e0fd85f653bbf5ac80dc929cb265ac86a08047f9102d57f2ac6194cd31794310a3c062824423552a3ee65e298506332436fca037f96963358dc511982f900be8
AUX jenkins-bin.service 499 BLAKE2B 28a90d5cf40e46880570e87acbc6d78766460faebc6e9a79b8c446fc05babf1de405cf79e29f527f0e9e0bf91093836fb6a50c7040320f59e78bf1971cd14ed3 SHA512 4ede5e0d55bf9d53239a1b8c152d1a3e38510982d6ff01c9c4288d63b8312ab7412979e0af3466638c7ef2803b711d49344692c14e72baa85d8eb4caa15f7506
AUX jenkins-bin.service2 566 BLAKE2B 38511fddc783a70ae3deab70526c737a883ef090bcfb20216658b0775667022782f3ee8a6638515b46e6a4df96228fb2368521c74a0ddca2f121e9170549df8e SHA512 87b59349edcb1503e6c91440327092732f0dddb8cc35e4576c81da55e08a2ad67d462a4d871c46da4f3ed037de8b9109d766ba36ca9acf244506d129766ed5cb
-DIST jenkins-bin-2.249.2.war 67399569 BLAKE2B df3d954988370a47d90363a01de97f17a92cb4d93049ceacea80f7d2a92195cd1e95b1f3780521efa166aee1058949f0e8861b887d6da5b0f0126a2579d22595 SHA512 0300369b3c427420a9c41ee17f3e098c77f14b25597059d740fdbea03f3679ce56d9e154d7765601274cd9dc866939595f7728bc2b8b8a0ef3ea131378648a98
-DIST jenkins-bin-2.249.3.war 67400032 BLAKE2B eb9ffde454bf9ee2140655a985c6f383cb2e3d21f172075cf19171871564d356afd38b8ed6119cb3bd43801843d499242c0ae99087c5c4f7cb2db1b8b80b70a4 SHA512 5d65dee8c128ba2a307ade0750a0ad9b71136b1102a36df0a34a1217ce62df9c0c60449e0f5dd8861369b553000ef65f8bb0afb54a3c8e4315400dede58e779b
DIST jenkins-bin-2.263.1.war 67270143 BLAKE2B 2c59b2d58632c741a0ce9ba66e4d177779899be01d3e0b9f7ba2e8fa5ff8bac667c2e2c98b9c199a8d55f9c873c1937b80f4aa6ea5f7ff6bbf256047c9a6ee94 SHA512 320dc0d4b365c0b9e11e76d6753b5ba3fbdf81e1acb9a7bbb4082fba1c57f22126810b75c563c4aa75ef3ff1633f2fe1a953c8aa1a25af5f3a0a9b2bc3a104d9
-DIST jenkins-bin-2.264.war 67272894 BLAKE2B 8cf8afc038420bbf101bf8c81cdb37e9ba25f631ccbe0f98d8897f12a93abf8355dca1ec23f254e14b16dbd8e88507a37b545c4854f2e8f3684bda871d8e171f SHA512 9bf29d7ae084c30c02931ba065e7d712a3cab4e4519587a1edc68e7205dac7a91934ca910536dd8d2c268575547fea2cdcc43229c726ed495658210cea7747a5
-DIST jenkins-bin-2.267.war 70971700 BLAKE2B 1470144d6be6cfc33d7b84c51ebb3f762b3e590427a362596302b87510d694b479608ff290b64a433aa98266d3c47b1294a505525cfdeae3547e58cc65f0d172 SHA512 39c042b3ca9d48c040d0a9d9ac9d65aff2f579888e24b800bc1e1b77b7175528aed31f2675b3417577b0b0eef7c17b6faa2d7b794360a17a6a4c8ba867007185
+DIST jenkins-bin-2.263.2.war 67285886 BLAKE2B 6bb4922536370744b5e69ebc50b79937865bef13183d48b0cd725e78921bab4433fd63ab1a1a32d52903bd448c31acf29a47a3c03bda8ef2cc2fcdaed673d985 SHA512 f25158373963fd4dfa988381dbb6c84b16129899a596a447ae35dbce5ebed27a796d0b1aea0c4213032ee37a17df7b3dc50d393cf13156944813cbed1e598351
DIST jenkins-bin-2.268.war 70969355 BLAKE2B e24424c8cd0535c04134cd22b8fc5e73de80c8eaa090e9fdf512dfeda4a9d029b0657e7ecaed4934ff996c1f5e8e59e9f10a7bfc31a313792cf759017780aeeb SHA512 b0e55310a21039fc57a7bdcc3b190ec61141f253d084a8279d279cff1778a3a4edc281bcc2cd1f872389d160a77dd2c9ebdf1b6cbc5d90272f2aedd66296535a
-EBUILD jenkins-bin-2.249.2.ebuild 1105 BLAKE2B 161bf3f0ad77e74702cfdd1db69cfaa54f6e267e814b358d3fdcac2ca5c7210410d1cf87d03a9e6f987d2ede8459d37f6bf352bc2a7fcd7f2167edf81542aff9 SHA512 d86e52237449bda33bc052d7b1dd3bc15306c4b771c485d34843973a7a7df6c0d0593ab156837cc64a018466222fd0c09bb331bb5c820807f5038300517e2283
-EBUILD jenkins-bin-2.249.3.ebuild 1105 BLAKE2B 161bf3f0ad77e74702cfdd1db69cfaa54f6e267e814b358d3fdcac2ca5c7210410d1cf87d03a9e6f987d2ede8459d37f6bf352bc2a7fcd7f2167edf81542aff9 SHA512 d86e52237449bda33bc052d7b1dd3bc15306c4b771c485d34843973a7a7df6c0d0593ab156837cc64a018466222fd0c09bb331bb5c820807f5038300517e2283
+DIST jenkins-bin-2.275.war 70809238 BLAKE2B 876d7215f55c80352336f4b3a8b47ff655930666e545bf81701c311e7b2ef756e9afbf286fdb8cc33d9dc64502dde3ec4d84c6b9c636d8503df79b8176ea8b9a SHA512 6c473e8d117ba99fa6a25820f0e0793f5b95f2d4c8ae2969c3e6c38fa076cbce91003d9d3e5c41c158a6d9ac69c192addbd3c0487af8b220878a1c08435b2a5a
EBUILD jenkins-bin-2.263.1.ebuild 1105 BLAKE2B 161bf3f0ad77e74702cfdd1db69cfaa54f6e267e814b358d3fdcac2ca5c7210410d1cf87d03a9e6f987d2ede8459d37f6bf352bc2a7fcd7f2167edf81542aff9 SHA512 d86e52237449bda33bc052d7b1dd3bc15306c4b771c485d34843973a7a7df6c0d0593ab156837cc64a018466222fd0c09bb331bb5c820807f5038300517e2283
-EBUILD jenkins-bin-2.264.ebuild 1105 BLAKE2B 90abfb2e3e72792cf968489f1da72a5bf90a6f622ac0003fcd56e5cda7a1ae79cd7effb539a7526fabcf85a6453499c831cfaced13db2ad5762b93cd0e2925f7 SHA512 0f1b7d69bb9e1dd47a42c5a0c925bb55f04692c2097b16d64f08d6d49f6b4267b81c766cca359c9ab55b411372741a2af1029ded72e93a600d44dbda7ad02110
-EBUILD jenkins-bin-2.267.ebuild 1105 BLAKE2B 90abfb2e3e72792cf968489f1da72a5bf90a6f622ac0003fcd56e5cda7a1ae79cd7effb539a7526fabcf85a6453499c831cfaced13db2ad5762b93cd0e2925f7 SHA512 0f1b7d69bb9e1dd47a42c5a0c925bb55f04692c2097b16d64f08d6d49f6b4267b81c766cca359c9ab55b411372741a2af1029ded72e93a600d44dbda7ad02110
+EBUILD jenkins-bin-2.263.2.ebuild 1105 BLAKE2B 96354716d929d2e229fdada62b1998ec7450849d9a519e974d22f9ad33c209150f1c43aa78c1016c61bbf68126f52d67c4055f683b6f50af99773309dc197b20 SHA512 7d056a9a3f7c321fc22bb4980de0d25bca8f72dbb828b1ddda06d65a4edcbc02353e6fc9bc227ee9e960b3d054e6d21c20ad0cc883327e0fc9eccb76550f5ffd
EBUILD jenkins-bin-2.268.ebuild 1105 BLAKE2B 90abfb2e3e72792cf968489f1da72a5bf90a6f622ac0003fcd56e5cda7a1ae79cd7effb539a7526fabcf85a6453499c831cfaced13db2ad5762b93cd0e2925f7 SHA512 0f1b7d69bb9e1dd47a42c5a0c925bb55f04692c2097b16d64f08d6d49f6b4267b81c766cca359c9ab55b411372741a2af1029ded72e93a600d44dbda7ad02110
+EBUILD jenkins-bin-2.275.ebuild 1105 BLAKE2B 15c84a6e246eb72decbf8eac284db1cf74e4502424a3caec2564007004205995f06b2dc2690974a28ff5823a565ee16e082f544c7d2a308d026ba877622f8922 SHA512 4898f7440514a649891c69e47d421282494be9d642bbb00e5c5b1bdacdc3e410be7ef95a9525ec9142d8085e172ba6b08af50d60a78629a4569a993f450c0507
MISC metadata.xml 397 BLAKE2B b1a7fd87c8d5857ab102ec3d3bf5830c26c6988bb97caf89018b05e159f038c9c3a092b4f35788929d05042ac5cfd694bd03a8381686b9472880d0d205a451cd SHA512 4087fd799f4019f09103fb32d7f120e74d94715205bcc66858d11b9457774acaed37f3ad97ca0328f4ec28230a409dcfb0cbaceec142eb0a5fd3241ca35f8810
diff --git a/dev-util/jenkins-bin/jenkins-bin-2.249.3.ebuild b/dev-util/jenkins-bin/jenkins-bin-2.249.3.ebuild
deleted file mode 100644
index 8ab8d5db213a..000000000000
--- a/dev-util/jenkins-bin/jenkins-bin-2.249.3.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
-
-inherit user systemd
-
-DESCRIPTION="Extensible continuous integration server"
-HOMEPAGE="https://jenkins.io/"
-LICENSE="MIT"
-SRC_URI="http://mirrors.jenkins-ci.org/war-stable/${PV}/${PN/-bin/}.war -> ${P}.war"
-RESTRICT="mirror"
-SLOT="lts"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
-IUSE=""
-
-RDEPEND="media-fonts/dejavu
- media-libs/freetype
- !dev-util/jenkins-bin:0
- >=virtual/jre-1.8.0"
-
-S=${WORKDIR}
-
-JENKINS_DIR=/var/lib/jenkins
-
-pkg_setup() {
- enewgroup jenkins
- enewuser jenkins -1 -1 ${JENKINS_DIR} jenkins
-}
-
-src_install() {
- keepdir /var/log/jenkins ${JENKINS_DIR}/backup ${JENKINS_DIR}/home
-
- insinto /opt/jenkins
- newins "${DISTDIR}"/${P}.war ${PN/-bin/}.war
-
- insinto /etc/logrotate.d
- newins "${FILESDIR}"/${PN}-r1.logrotate ${PN/-bin/}
-
- newinitd "${FILESDIR}"/${PN}.init2 jenkins
- newconfd "${FILESDIR}"/${PN}.confd jenkins
-
- systemd_newunit "${FILESDIR}"/${PN}.service2 jenkins.service
-
- fowners jenkins:jenkins /var/log/jenkins ${JENKINS_DIR} ${JENKINS_DIR}/home ${JENKINS_DIR}/backup
-}
diff --git a/dev-util/jenkins-bin/jenkins-bin-2.249.2.ebuild b/dev-util/jenkins-bin/jenkins-bin-2.263.2.ebuild
similarity index 96%
rename from dev-util/jenkins-bin/jenkins-bin-2.249.2.ebuild
rename to dev-util/jenkins-bin/jenkins-bin-2.263.2.ebuild
index 8ab8d5db213a..e24da02245e6 100644
--- a/dev-util/jenkins-bin/jenkins-bin-2.249.2.ebuild
+++ b/dev-util/jenkins-bin/jenkins-bin-2.263.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
diff --git a/dev-util/jenkins-bin/jenkins-bin-2.264.ebuild b/dev-util/jenkins-bin/jenkins-bin-2.264.ebuild
deleted file mode 100644
index 231d58c8748f..000000000000
--- a/dev-util/jenkins-bin/jenkins-bin-2.264.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
-
-inherit user systemd
-
-DESCRIPTION="Extensible continuous integration server"
-HOMEPAGE="https://jenkins.io/"
-LICENSE="MIT"
-SRC_URI="http://mirrors.jenkins-ci.org/war/${PV}/${PN/-bin/}.war -> ${P}.war"
-RESTRICT="mirror"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux"
-IUSE=""
-
-RDEPEND="media-fonts/dejavu
- media-libs/freetype
- !dev-util/jenkins-bin:lts
- >=virtual/jre-1.8.0"
-
-S=${WORKDIR}
-
-JENKINS_DIR=/var/lib/jenkins
-
-pkg_setup() {
- enewgroup jenkins
- enewuser jenkins -1 -1 ${JENKINS_DIR} jenkins
-}
-
-src_install() {
- keepdir /var/log/jenkins ${JENKINS_DIR}/backup ${JENKINS_DIR}/home
-
- insinto /opt/jenkins
- newins "${DISTDIR}"/${P}.war ${PN/-bin/}.war
-
- insinto /etc/logrotate.d
- newins "${FILESDIR}"/${PN}-r1.logrotate ${PN/-bin/}
-
- newinitd "${FILESDIR}"/${PN}.init2 jenkins
- newconfd "${FILESDIR}"/${PN}.confd jenkins
-
- systemd_newunit "${FILESDIR}"/${PN}.service2 jenkins.service
-
- fowners jenkins:jenkins /var/log/jenkins ${JENKINS_DIR} ${JENKINS_DIR}/home ${JENKINS_DIR}/backup
-}
diff --git a/dev-util/jenkins-bin/jenkins-bin-2.267.ebuild b/dev-util/jenkins-bin/jenkins-bin-2.275.ebuild
similarity index 96%
rename from dev-util/jenkins-bin/jenkins-bin-2.267.ebuild
rename to dev-util/jenkins-bin/jenkins-bin-2.275.ebuild
index 231d58c8748f..2eea44d52656 100644
--- a/dev-util/jenkins-bin/jenkins-bin-2.267.ebuild
+++ b/dev-util/jenkins-bin/jenkins-bin-2.275.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
diff --git a/dev-util/lldb/Manifest b/dev-util/lldb/Manifest
index 9dbb41b8b394..a84871e8ba9b 100644
--- a/dev-util/lldb/Manifest
+++ b/dev-util/lldb/Manifest
@@ -1,10 +1,12 @@
DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151
DIST llvmorg-11.0.0.tar.gz 122743665 BLAKE2B 3f95570240789fd68ddb747df817f5c6cdc9da40911bbe9ee3531c15ada9165e5002b1c2f778cf8735858485ea05a8754e3d3a5f4b15bdd6cb33d64a14692984 SHA512 b6d38871ccce0e086e27d35e42887618d68e57d8274735c59e3eabc42dee352412489296293f8d5169fe0044936345915ee7da61ebdc64ec10f7737f6ecd90f2
DIST llvmorg-11.0.1.tar.gz 122790338 BLAKE2B 0130996b4a8c4d9f757136fd7fb318068c9bfdc565060dec0d4336480c4ab66c4ae3185a7fdb05f13cf9ee8fd4123b09df938881b75d6e5d3689595114b7e32a SHA512 f5e6ef0b3111aae08a89cd01adb2ff4abfa9ef779c68b9190421d0447efd25c2cc00e5aae9f4764805f5fa31434866043d1510ae7389817e28ae53a5442e2fdf
+DIST llvmorg-11.1.0-rc1.tar.gz 122793491 BLAKE2B f4777455f5903cffea284eaffd872be6c287c6c1ebbd0c4b5b5473f146d7f5476f3551998a58d3e976ab90cde7b0d05db2b3be97f4e8e2c3474755ff38739268 SHA512 44e281486c44fa1611042ab658b9833a75f9613b7f896863613cfb99de66d13607fb1e9064f42ea3d89ca7951113465a90fd96ca4544262f165f78bd5261f5a8
DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
EBUILD lldb-10.0.1.ebuild 2335 BLAKE2B 1e8212cd840aa2898451bca1c2670f443707738b4c8ca9c673f9e940fa918d0f742b04273f9d2899791aebb2db499bf210605f9ed90479029d4c25add49a310c SHA512 86f5ded28593601e21abf270a0dd0ff703c1ef863534cae87ec72f67ddf8de4fc3394b7088be9d38dfb39a79c1593a57b3df4f5a167e96e6aa1a34c2b1c8f656
EBUILD lldb-11.0.0.ebuild 2383 BLAKE2B 86df01e0663b79c93b5816c6cbf4ec9a995cded9350d100bbdbad9b9ab7529fedf0244274718a919a003209ad0c48580192a06aeb19f3ca4c06bea0c9d35f9b7 SHA512 ddc49fda9558b794f08ed9c3b0f91ea3fffc67ab171354a7f229790a7b2f05d0b144da8bbc686571a5f9dc1f0fbf5fc502bf99ec3f8897d4537b0ba9ad69a7e4
EBUILD lldb-11.0.1.ebuild 2346 BLAKE2B aedd0dd380e2ea658c1d3d7ab1528062f20b04c7231232812d11d880722cd4084640650188a2a60a9faa7d1c8c347f693c3bcb104868c0dd74fd6aef5b02e1db SHA512 1ec66bc790920c758a7cadd91652640ce20284e01c15b2c213d249f6efddd854b7839aebc32ff96575686cdff9d2fff1012cc4f99d61344055482fc5c01c5bec
+EBUILD lldb-11.1.0_rc1.ebuild 2323 BLAKE2B 03b635bcd827160b2e17bc37026201a9d6f68652920af99536d66ac924fd2f9cb409c6d75dab95ba44aca8cd8d38790beda778d6867cab3f289021d245ef7219 SHA512 63188a50b66295d238414eef3b72509cea75fded8f6edc7033af738c47fc6e519229010bfbae7db6791b9fd7fd1f8fd958dea9c4866338c1138fd54496d6a318
EBUILD lldb-12.0.0.9999.ebuild 2323 BLAKE2B 109888de2a70965bf611190aee56cdd6af1183e0282b1cccc4a9c149963516bf2eb44000f11ca17c2a6d8fea5d1b9694458cb09bf41c6528f73a13510229f292 SHA512 708b848850018c42256ddaae593d5dad388f906376514b0bfefe898d44ccf325bd8ccbc4ffcc65b25a3effc45b8e961a376916af1368a8459818f0b14d06deff
EBUILD lldb-9.0.1-r1.ebuild 2391 BLAKE2B c0e73cf6e7c6fc153855681daa373618baffa2d45bd290855633d957464e99d86112918eec8aa0b43a975750e8ccd87fbffe2594b0110ac406eab8579c654f72 SHA512 8edadff2f01c15b75d894e30546a00826f140a81bc0ebfb5fb214eb5d133d8390b18a3075746fe94f061b36fcea9fb981ecd6de3d0567f73736c388af62c6320
MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
diff --git a/dev-util/lldb/lldb-11.1.0_rc1.ebuild b/dev-util/lldb/lldb-11.1.0_rc1.ebuild
new file mode 100644
index 000000000000..00b5d55d6be5
--- /dev/null
+++ b/dev-util/lldb/lldb-11.1.0_rc1.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+inherit cmake llvm llvm.org python-single-r1 toolchain-funcs
+
+DESCRIPTION="The LLVM debugger"
+HOMEPAGE="https://llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0"
+KEYWORDS=""
+IUSE="libedit lzma ncurses +python test"
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+RESTRICT="test"
+
+RDEPEND="
+ libedit? ( dev-libs/libedit:0= )
+ lzma? ( app-arch/xz-utils:= )
+ ncurses? ( >=sys-libs/ncurses-5.9-r3:0= )
+ python? (
+ $(python_gen_cond_dep '
+ dev-python/six[${PYTHON_USEDEP}]
+ ')
+ ${PYTHON_DEPS}
+ )
+ ~sys-devel/clang-${PV}[xml]
+ ~sys-devel/llvm-${PV}
+ !
# define RANDOMIZE(x) { struct timeval tv; gettimeofday(&tv, NULL); x = tv.tv_usec; }
diff --git a/dev-util/pretrace/files/pretrace-0.4-qa.patch b/dev-util/pretrace/files/pretrace-0.4-qa.patch
new file mode 100644
index 000000000000..8cf40e796a12
--- /dev/null
+++ b/dev-util/pretrace/files/pretrace-0.4-qa.patch
@@ -0,0 +1,39 @@
+--- pretrace-0.4/Makefile.orig 2021-01-14 13:31:45.950615134 +0300
++++ pretrace-0.4/Makefile 2021-01-14 13:32:04.940676578 +0300
+@@ -2,14 +2,14 @@
+ # $Id: Makefile,v 1.1 2005/07/27 07:45:37 taviso Exp $
+ #
+
+-VERSION=0.4
++VERSION?=0.4
+ PREFIX=/usr/local
+ DOCDIR=$(PREFIX)/share/doc/pretrace-$(VERSION)
+ LIBDIR=$(PREFIX)/lib
+ BINDIR=$(PREFIX)/bin
+ MANDIR=$(PREFIX)/share/man
+
+-all: libpretrace.so ptgenmap doc
++all: libpretrace.so ptgenmap
+ @echo 'libpretrace.so has been built, please see README for instructions.'
+ @echo 'type `make install` to install to $(PREFIX)'
+
+@@ -26,7 +26,7 @@
+ $(CC) $(CFLAGS) -Wall -g -fPIC -c trie.c
+
+ libpretrace.so: libpretrace.o trie.o
+- $(CC) $(CFLAGS) $(LDFLAGS) -g -shared -o libpretrace.so libpretrace.o trie.o
++ $(CC) $(CFLAGS) $(LDFLAGS) -g -shared -Wl,-soname,libpretrace.so -o libpretrace.so libpretrace.o trie.o
+
+ doc:
+ gzip -9c pretrace.3 > pretrace.3.gz
+@@ -38,8 +41,8 @@
+ install -m 0755 libpretrace.so $(LIBDIR)
+ install -m 0755 ptgenmap $(BINDIR)
+ install -m 0644 README pretrace.conf.example ChangeLog $(DOCDIR)
+- install -m 0644 pretrace.3.gz $(MANDIR)/man3
+- install -m 0644 ptgenmap.8.gz $(MANDIR)/man8
++ install -m 0644 pretrace.3 $(MANDIR)/man3
++ install -m 0644 ptgenmap.8 $(MANDIR)/man8
+
+ clean:
+ -rm -f libpretrace.so libpretrace.o trie.o ptgenmap.o ptgenmap *~
diff --git a/dev-util/pretrace/pretrace-0.4-r1.ebuild b/dev-util/pretrace/pretrace-0.4-r2.ebuild
similarity index 73%
rename from dev-util/pretrace/pretrace-0.4-r1.ebuild
rename to dev-util/pretrace/pretrace-0.4-r2.ebuild
index 998da63f1052..c6ff1edc5859 100644
--- a/dev-util/pretrace/pretrace-0.4-r1.ebuild
+++ b/dev-util/pretrace/pretrace-0.4-r2.ebuild
@@ -1,30 +1,28 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
inherit readme.gentoo-r1
DESCRIPTION="start dynamically linked applications under debugging environment"
-HOMEPAGE="http://dev.inversepath.com/trac/pretrace"
-SRC_URI="http://dev.inversepath.com/pretrace/libpretrace-${PV}.tar.gz"
+HOMEPAGE="https://github.com/robholland/pretrace"
+SRC_URI="https://dev.gentoo.org/~bircoph/distfiles/${P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-S="${WORKDIR}/lib${P}"
DOC_CONTENTS="Remember to execute ptgenmap after modifying pretrace.conf"
PATCHES=(
"${FILESDIR}"/${P}--as-needed.diff
"${FILESDIR}"/${P}-build.patch #227923
+ "${FILESDIR}"/${P}-qa.patch
)
src_install() {
dodir /usr/bin /usr/share/man/man3 /usr/share/man/man8
- emake DESTDIR="${D}" LIBDIR="${D}/usr/$(get_libdir)" PREFIX="${D}/usr" install
+ emake DESTDIR="${D}" LIBDIR="${D}/usr/$(get_libdir)" PREFIX="${D}/usr" VERSION="${PVR}" install
readme.gentoo_create_doc
}
diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz
index f6f4212ee574..642f615aea6d 100644
Binary files a/dev-vcs/Manifest.gz and b/dev-vcs/Manifest.gz differ
diff --git a/dev-vcs/git-big-picture/Manifest b/dev-vcs/git-big-picture/Manifest
new file mode 100644
index 000000000000..66f8ac18b599
--- /dev/null
+++ b/dev-vcs/git-big-picture/Manifest
@@ -0,0 +1,3 @@
+DIST git-big-picture-1.0.0.tar.gz 2952246 BLAKE2B caf28b57399bbdc2c80feda70e2a043dc1a8ffdc1e88bc79ccec44d6857e52726961e5febe9d1dbe1230818990a291900237cc01f65e819995243cbbc47ba8a9 SHA512 3b5416d3802c91ee35ad31ef702ada5f23b33cd77ef4c1f15cf22bb7f7d1e3c315e100aabdca3831b56d52b1d1637afa86382f89f0a2bbc8c60970095cd53d43
+EBUILD git-big-picture-1.0.0.ebuild 716 BLAKE2B db8f91d4f78796e7624c8509e8867392291e2f3b4d4bc8fa8afbed1d6b000ffb47e2d1310e20f6f8fba714372e73a5cc60d460ffa7814ea9f070166faedb58ea SHA512 9870b64133afa589ceb0a7305d311a49f46b46ae4308cf904d5d12733fc987c6509b922a4d924eb06c8cd7bd8ba98ccca8748ee47b0f2047fedec59521cdacfa
+MISC metadata.xml 249 BLAKE2B a4931a30c3947b238913053d611639235b076475e864914e684020d86ee1b4aa6da94e4cef59c53a0e5ccd3b3d15d3a4ae293800b17bbb89e0af9cff79314a70 SHA512 b1cb770984baef468e3d17e343acff395e1993b14f90def7f8582b5e5d1a512bd3c7727e03f1deca47f7359a8f8cc9a8360130923388a5c06fabbfb9b05d5138
diff --git a/dev-vcs/git-big-picture/git-big-picture-1.0.0.ebuild b/dev-vcs/git-big-picture/git-big-picture-1.0.0.ebuild
new file mode 100644
index 000000000000..6672763d608f
--- /dev/null
+++ b/dev-vcs/git-big-picture/git-big-picture-1.0.0.ebuild
@@ -0,0 +1,32 @@
+# 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="Visualization tool for Git repositories"
+HOMEPAGE="https://github.com/git-big-picture/git-big-picture"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# No need for "[python]" or "[${PYTHON_USEDEP}]" with any of these
+# since they are invoked using subprocess
+RDEPEND="
+ dev-vcs/git
+ media-gfx/graphviz[svg]
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+ mv test.py test_some.py || die # help pytest with test discovery
+ default
+}
diff --git a/dev-vcs/git-big-picture/metadata.xml b/dev-vcs/git-big-picture/metadata.xml
new file mode 100644
index 000000000000..ab886b7f0382
--- /dev/null
+++ b/dev-vcs/git-big-picture/metadata.xml
@@ -0,0 +1,8 @@
+
+
+
+
+ sping@gentoo.org
+ Sebastian Pipping
+
+
diff --git a/dev-vcs/repo/Manifest b/dev-vcs/repo/Manifest
index b936cabc40b3..1fb63235e4a0 100644
--- a/dev-vcs/repo/Manifest
+++ b/dev-vcs/repo/Manifest
@@ -1,5 +1,7 @@
+DIST repo-2.11 39791 BLAKE2B 535de238d934eb2717af7bddd960c158501a56dd400ae02f3665e30c34bd68a1973de4c84e2ea76f48aa027249dfd4270153f1a7d4c4a2d5d883b580f02664e9 SHA512 1889ee9c782a6dc90b782c8ca9c5411b97c4495e0d27add62b9661a5961a782096037e081e984c965e44d33459e8fe4428528b5ebfff9fe356ce401cb610480a
DIST repo-2.5 38761 BLAKE2B 26d002bb7e5a24dc958bb4e0653c2cc260b2766d81fd55edf9a0373542365ed89a224805293383e2c16d8fc331038b265d3b2aca3a9a637d893f4a9c8221ce76 SHA512 36e515241fd9705c63beaf662309dc2ab6406552ba845fe020c878ac82e7eb7e1cd73924a076cf5fe4800ea70919bb5ad5d2d43566d5b0a559f81a45f9a58fe8
DIST repo-2.8 39134 BLAKE2B af52a2c06e09de83100cb297d585f89bcbe85d6e9e5c358024a371ee4d47c59992745d1088b164fc670cdd9db7394a5f3521967e3eb80840c53993af8b0172b1 SHA512 6d577fce34eb298035a7b98c24fc21521c8c9efbdf02abc37af8a54552893ecf8cdce2db5efbc5398d7f99226408f6cc9ce2f81c2961d9d5dd21fb0264194431
+EBUILD repo-2.11.ebuild 859 BLAKE2B 888cb54ac80672bd40a5f8da06afa80568be74afae0c3d3932ac0e38a8fce33def301694a3cceb531ecf2349d02f7226091e230f0b095112b7904c423e46fb85 SHA512 05999f49e7196155838ebc17df76c894be5b20273d220e6fa4e66bb8f1879fd6ae4bf8b562c2b1d7cde350b56183132d4747f9423a635c0b63da5520da3bcaff
EBUILD repo-2.5.ebuild 853 BLAKE2B 5123c3b627a65cf07ab9586308676a9c3edb1b5037525d6b2af702203b4223676ebf5a018239d6655aae90c2daef1358995a490b37a0c67bda6e66c000907ae0 SHA512 b5862ce4158e106a6a21138371b5471f6f70bc5844b074de0f1334daf3183238df0d81784afc448c403cdbb027ce240948c0743d9e39a2c19f053112bf578883
-EBUILD repo-2.8.ebuild 859 BLAKE2B fe8ad85ef67acc2ecfa5ab5a4f84ce25d5b71efda9dd5ebf5d1888e0adb0074ccb5fc5cf374e4adfcd3cd1349bb74fea53f8aeaad087f315f98004720b56b0c4 SHA512 8c12b6b3350b182241dd8b82890a3966dd99938aa344f0df3833df41ec532d09812f0f4b6dddbabcc26abb32cf567b1206a1c0ae74efa288b92e3afdeaefcb86
+EBUILD repo-2.8.ebuild 853 BLAKE2B 4da4a529a7d429a9b5eaca623188e8200ae46997c9d6f10faa3924a63310b85c26405a4769b954cac16c42d1670d6451b1eb3e4f086db99531670c535be7057b SHA512 d3cc7adf815321fbd807369feccbab9571b0a36cf1d8a2bfa562228f0f24c6c7282587870adc3f0c71121b19ecb75c9edcc28bdbf665744542543aa0f24d6659
MISC metadata.xml 214 BLAKE2B c0c4c0ad9c74c68b5d7e4e539dc441e82a025754b84fa14f01d0f6772b5acacc836523305857e1a8ef54d472e77a339d2361ec4bc70651cbf13e7be34b051d81 SHA512 d0c4ab837bd2d936086900fa4ad3d048ad069bfbc58dc7f07ad3819b383646d66f392407314bfe8f542fb8b0b2ffec0848bc7b2d122469f23b9ddaa4aec0a9cd
diff --git a/dev-vcs/repo/repo-2.11.ebuild b/dev-vcs/repo/repo-2.11.ebuild
new file mode 100644
index 000000000000..71f6820e3670
--- /dev/null
+++ b/dev-vcs/repo/repo-2.11.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# NB: The $PV tracks the *repo launcher version*, not the last signed release
+# of the repo project. The launcher only gets a new update when changes are
+# made in it.
+
+EAPI="7"
+
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit python-r1
+
+DESCRIPTION="Google tool for managing git, particularly multiple repos"
+HOMEPAGE="https://gerrit.googlesource.com/git-repo"
+SRC_URI="https://storage.googleapis.com/git-repo-downloads/${P}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+ !app-admin/radmind
+ !dev-util/repo"
+
+S=${WORKDIR}
+
+src_install() {
+ python_foreach_impl python_newscript "${DISTDIR}/${P}" ${PN}
+}
diff --git a/dev-vcs/repo/repo-2.8.ebuild b/dev-vcs/repo/repo-2.8.ebuild
index 544acae9a81b..7da69b4ea509 100644
--- a/dev-vcs/repo/repo-2.8.ebuild
+++ b/dev-vcs/repo/repo-2.8.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
# NB: The $PV tracks the *repo launcher version*, not the last signed release
@@ -17,7 +17,7 @@ SRC_URI="https://storage.googleapis.com/git-repo-downloads/${P}"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
IUSE=""
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz
index 6ae5a3dffbc8..045d422b9137 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..96a857a1962e 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,13 @@ 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
+ find "${LIB}" -maxdepth 1 -type l -name 'libdb[1._-]*'"$(get_libname)" -delete || die
+ find "${LIB}" -maxdepth 1 -type l -name 'libdb[1._-]*'"$(get_libname "[23]")" -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 +37,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 +143,8 @@ 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
+ find "${LIB}" -maxdepth 1 -type l -name 'libdb[1._-]*'"$(get_libname)" -delete || die
+ find "${LIB}" -maxdepth 1 -type l -name 'libdb[1._-]*'"$(get_libname "[23]")" -delete || die
einfo "removing unversioned static archives"
find "${LIB}" -maxdepth 1 -type l -name 'libdb[1._-]*a' -delete || die
diff --git a/eclass/dist-kernel-utils.eclass b/eclass/dist-kernel-utils.eclass
new file mode 100644
index 000000000000..d92642a25a0a
--- /dev/null
+++ b/eclass/dist-kernel-utils.eclass
@@ -0,0 +1,132 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# @ECLASS: dist-kernel-utils.eclass
+# @MAINTAINER:
+# Distribution Kernel Project
+# @AUTHOR:
+# Michał Górny
+# @SUPPORTED_EAPIS: 7
+# @BLURB: Utility functions related to Distribution Kernels
+# @DESCRIPTION:
+# This eclass provides various utility functions related to Distribution
+# Kernels.
+
+if [[ ! ${_DIST_KERNEL_UTILS} ]]; then
+
+case "${EAPI:-0}" in
+ 0|1|2|3|4|5|6)
+ die "Unsupported EAPI=${EAPI:-0} (too old) for ${ECLASS}"
+ ;;
+ 7)
+ ;;
+ *)
+ die "Unsupported EAPI=${EAPI} (unknown) for ${ECLASS}"
+ ;;
+esac
+
+# @FUNCTION: dist-kernel_build_initramfs
+# @USAGE:
+
diff --git a/games-strategy/warzone2100/warzone2100-3.4.1.ebuild b/games-strategy/warzone2100/warzone2100-3.4.1.ebuild
new file mode 100644
index 000000000000..210b225cba54
--- /dev/null
+++ b/games-strategy/warzone2100/warzone2100-3.4.1.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake desktop xdg
+
+MY_PV=$(ver_cut 1-2)
+VIDEOS_PV=2.2
+VIDEOS_P=${PN}-videos-${VIDEOS_PV}.wz
+DESCRIPTION="3D real-time strategy game"
+HOMEPAGE="http://wz2100.net/"
+SRC_URI="mirror://sourceforge/warzone2100/releases/${PV}/${PN}_src.tar.xz -> ${P}.tar.xz
+ videos? ( mirror://sourceforge/warzone2100/warzone2100/Videos/${VIDEOS_PV}/high-quality-en/sequences.wz -> ${VIDEOS_P} )"
+
+LICENSE="GPL-2+ CC-BY-SA-3.0 public-domain"
+SLOT="0"
+#[[ "${PV}" == *_beta* ]] || \
+KEYWORDS="~amd64 ~x86"
+# upstream requested debug support
+IUSE="debug discord nls videos vulkan"
+
+# TODO: unbundle miniupnpc and quesoglc
+# quesoglc-0.7.2 is buggy: http://developer.wz2100.net/ticket/2828
+CDEPEND="
+ >=dev-games/physfs-2[zip]
+ >=dev-libs/libsodium-1.0.14
+ dev-libs/openssl:0=
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtopengl:5
+ dev-qt/qtscript:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtx11extras:5
+ media-libs/freetype:2
+ media-libs/glew:=
+ media-libs/harfbuzz
+ media-libs/libogg
+ media-libs/libpng:0
+ media-libs/libsdl2[opengl,video,X]
+ media-libs/libtheora
+ media-libs/libvorbis
+ media-libs/openal
+ sys-libs/zlib
+ virtual/glu
+ virtual/opengl
+ x11-libs/libX11
+ x11-libs/libXrandr
+ nls? ( virtual/libintl )
+ vulkan? ( media-libs/libsdl2:=[vulkan] )
+"
+DEPEND="
+ ${CDEPEND}
+ app-text/asciidoc
+ dev-libs/fribidi
+ media-libs/fontconfig
+"
+RDEPEND="
+ ${CDEPEND}
+ media-fonts/dejavu
+"
+BDEPEND="
+ app-arch/zip
+ virtual/pkgconfig
+ nls? ( sys-devel/gettext )
+"
+
+S="${WORKDIR}/${PN}"
+
+src_unpack() {
+ unpack ${P}.tar.xz
+}
+
+src_prepare() {
+ default
+
+ sed -i -e 's/#top_builddir/top_builddir/' po/Makevars || die
+
+ cmake_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DWZ_DISTRIBUTOR="Gentoo"
+ -DWZ_ENABLE_WARNINGS_AS_ERRORS="OFF"
+ -DWZ_ENABLE_BACKEND_VULKAN="$(usex vulkan)"
+ -DWZ_PORTABLE="OFF"
+ -DBUILD_SHARED_LIBS="OFF"
+ -DENABLE_NLS="$(usex nls)"
+ -DENABLE_DISCORD="$(usex discord)"
+ )
+ cmake_src_configure
+}
+
+src_compile() {
+ cmake_src_compile
+
+ asciidoc -b html5 doc/quickstartguide.asciidoc || die
+}
+
+src_install() {
+ local HTML_DOCS=( doc/quickstartguide.html doc/docbook-xsl.css doc/ScriptingManual.htm )
+ local DOCS=( README.md doc/images doc/Scripting.md doc/js-globals.md )
+ default
+
+ insinto /usr/bin
+ dobin "${BUILD_DIR}"/src/${PN}
+
+ insinto /usr/share/${PN}
+ doins "${BUILD_DIR}"/data/base.wz
+ doins "${BUILD_DIR}"/data/mp.wz
+ if use videos ; then
+ newins "${DISTDIR}"/${VIDEOS_P} sequences.wz
+ fi
+ insinto /usr/share/${PN}/music
+ doins data/music/music.wpl
+ doins data/music/menu.ogg
+ doins data/music/track1.ogg
+ doins data/music/track2.ogg
+ doins data/music/track3.ogg
+
+ doman "${BUILD_DIR}"/doc/warzone2100.6
+
+ doicon -s 128 icons/warzone2100.png
+ domenu icons/warzone2100.desktop
+}
diff --git a/games-util/Manifest.gz b/games-util/Manifest.gz
index a7556857953e..e9c87f80d3b4 100644
Binary files a/games-util/Manifest.gz and b/games-util/Manifest.gz differ
diff --git a/games-util/lutris/Manifest b/games-util/lutris/Manifest
index eb060f6aa9f0..48a5b6c15952 100644
--- a/games-util/lutris/Manifest
+++ b/games-util/lutris/Manifest
@@ -2,8 +2,8 @@ AUX lutris-0.5.7-copy_paste_fix.patch 1178 BLAKE2B fcb28456fb0ced4e7f53156bbaed7
DIST lutris_0.5.7.1.tar.xz 2145584 BLAKE2B eb766d5e36aca63af7af8f2e85f51b4e3e37b8372b13a59702c545a0c697fa5feb1403cd9589d22c2bdff6593f69ed39e1bcb7ecb28ecc24b7a77b09ed1b2f89 SHA512 9efff4d92ae4d9051a7253324047dfa57f463188ebdbcede5feba2c0268494e8fa7929d2ef30bfe85e52824bbb9c05b1f1688b6658376597cc4cc35c26a19da3
DIST lutris_0.5.8.1.tar.xz 893328 BLAKE2B 67c66b59c3fa78af46f953b6e27fb3dd77d0e4cb0746f490716c7c074e81afa4f9c4e8c10dc6d4dab3e2b37d03254bae5eda0b777da72bc17f18dda5fd1f990a SHA512 da3b5ebf3e5dcc5011351197c5a80e8547e54df4555ea9124a8404877c5b75225cfae970819a171c55454fef73afdd927dafbf427301b71618c33660a1c8c022
DIST lutris_0.5.8.tar.xz 892740 BLAKE2B eaa8c71ade35392e701b3fd1d8ef2c0077e7fb7b96c3f037b5e4353d89b50b82e8a75fb2fb537e6ceeb9b6faaa5962e0ffe425f52820168b60eed742024610a4 SHA512 dcd963ff8b3c6d66fe79acc1e1c237196f7351d87bf1b4e5920201ecd7f1b2a80ac59f7151287e70e68c402c2b1b00e961d7314e6d5cbbbae0f4ca5fda562a0f
-EBUILD lutris-0.5.7.1.ebuild 1894 BLAKE2B 81f5eb0ba0b07676f2317fa52daabbed987707ab83921d797887834ded7b9a84187ee426ccab5c4baf7235424750844ecf4491e155542c78e2b14ad9bfa07ca6 SHA512 5845f01a0832c236b727af191f6ef55abf7ba08487d0b921b51a939001cd3245a0f5b9efdf235b7c59371b87c647ab61fa81380019a7faa916da3019f403222f
-EBUILD lutris-0.5.8.1.ebuild 1833 BLAKE2B b9130c739bdd68f87f29a2f95bfc9acf60196cbd9279d128be8d13c2736ed1a6355e765ce34e0edb0db1b4d50ee985acd7f25ea4865f5d2891bca96538bd5b7c SHA512 3d29f3b8dd92c94d177dfa7e3789d31d14dcb3d8c8cbebb6f76a374f8f4761dae779563703d4d49e4ee0ddd6616dfed93d6fa3cf395392d811ee59f5b1dcc3ad
-EBUILD lutris-0.5.8.ebuild 1833 BLAKE2B b9130c739bdd68f87f29a2f95bfc9acf60196cbd9279d128be8d13c2736ed1a6355e765ce34e0edb0db1b4d50ee985acd7f25ea4865f5d2891bca96538bd5b7c SHA512 3d29f3b8dd92c94d177dfa7e3789d31d14dcb3d8c8cbebb6f76a374f8f4761dae779563703d4d49e4ee0ddd6616dfed93d6fa3cf395392d811ee59f5b1dcc3ad
-EBUILD lutris-9999.ebuild 1833 BLAKE2B b9130c739bdd68f87f29a2f95bfc9acf60196cbd9279d128be8d13c2736ed1a6355e765ce34e0edb0db1b4d50ee985acd7f25ea4865f5d2891bca96538bd5b7c SHA512 3d29f3b8dd92c94d177dfa7e3789d31d14dcb3d8c8cbebb6f76a374f8f4761dae779563703d4d49e4ee0ddd6616dfed93d6fa3cf395392d811ee59f5b1dcc3ad
+EBUILD lutris-0.5.7.1.ebuild 1892 BLAKE2B 76c0d77e6be634e27d2d873d2756622ff92ce42c0fec3ac71d59d460332178418216c0a99c7bfe525180dc6481d0fd3160b7717d2289d03f468844bbd0906509 SHA512 f456f6ca26d91aa97ce2159c00a5789a255e36ab069bb40d45bc1ec5858d1dd83fd828b2b34b8e2a6fd709e6cb37ddd95b5318e23156c748806039709bf3d18b
+EBUILD lutris-0.5.8.1.ebuild 1875 BLAKE2B c5d633b619d334c3cae7ed31786f335792a44e8a70618d36466287ce6c8829c9a1fe79a3228ec698948fb603e83a7370e92c37e5eecf3cb966793d32720af6ad SHA512 24600a07731d4f13d5ef20464ac92c52a4fb2fa8e15f40259bf76481e8493b71a2181c9bf5671bf45f454727599bf2d32a1e6b7c83e4dc22916167faced22988
+EBUILD lutris-0.5.8.ebuild 1875 BLAKE2B c5d633b619d334c3cae7ed31786f335792a44e8a70618d36466287ce6c8829c9a1fe79a3228ec698948fb603e83a7370e92c37e5eecf3cb966793d32720af6ad SHA512 24600a07731d4f13d5ef20464ac92c52a4fb2fa8e15f40259bf76481e8493b71a2181c9bf5671bf45f454727599bf2d32a1e6b7c83e4dc22916167faced22988
+EBUILD lutris-9999.ebuild 1875 BLAKE2B c5d633b619d334c3cae7ed31786f335792a44e8a70618d36466287ce6c8829c9a1fe79a3228ec698948fb603e83a7370e92c37e5eecf3cb966793d32720af6ad SHA512 24600a07731d4f13d5ef20464ac92c52a4fb2fa8e15f40259bf76481e8493b71a2181c9bf5671bf45f454727599bf2d32a1e6b7c83e4dc22916167faced22988
MISC metadata.xml 661 BLAKE2B 8b05694fe3755a3b2b1546c1392bccb408d99f430c361e6058702107d665b13e0d36834d37c2a31ab7065290363e6af7712fcf4b36542222b59e47b508b7d1ef SHA512 e5d7a7023e9aa025d8d526457ba61ec9d9ceadf472d3f04f6b799cb3c130543e4300a56ce1830c163650f0554e2a87d705152b3771bb4f7fd9edeba3db16b9a7
diff --git a/games-util/lutris/lutris-0.5.7.1.ebuild b/games-util/lutris/lutris-0.5.7.1.ebuild
index fb54a72d2b4d..bf776348a5a6 100644
--- a/games-util/lutris/lutris-0.5.7.1.ebuild
+++ b/games-util/lutris/lutris-0.5.7.1.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
PYTHON_REQ_USE="sqlite,threads(+)"
DISTUTILS_SINGLE_IMPL="1"
@@ -36,7 +36,6 @@ BDEPEND="
RDEPEND="
app-arch/cabextract
app-arch/p7zip
- app-arch/unrar
app-arch/unzip
$(python_gen_cond_dep '
dev-python/dbus-python[${PYTHON_USEDEP}]
@@ -54,7 +53,7 @@ RDEPEND="
x11-apps/xgamma
x11-apps/xrandr
x11-libs/gtk+:3[introspection]
- x11-libs/libnotify
+ x11-libs/libnotify[introspection]
"
PATCHES=(
diff --git a/games-util/lutris/lutris-0.5.8.1.ebuild b/games-util/lutris/lutris-0.5.8.1.ebuild
index 4052ada5d976..1daf6b1bf933 100644
--- a/games-util/lutris/lutris-0.5.8.1.ebuild
+++ b/games-util/lutris/lutris-0.5.8.1.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
PYTHON_REQ_USE="sqlite,threads(+)"
DISTUTILS_SINGLE_IMPL="1"
@@ -36,13 +36,13 @@ BDEPEND="
RDEPEND="
app-arch/cabextract
app-arch/p7zip
- app-arch/unrar
app-arch/unzip
$(python_gen_cond_dep '
dev-python/dbus-python[${PYTHON_USEDEP}]
dev-python/pillow[${PYTHON_USEDEP}]
dev-python/pygobject:3[${PYTHON_USEDEP}]
dev-python/python-evdev[${PYTHON_USEDEP}]
+ dev-python/python-magic[${PYTHON_USEDEP}]
dev-python/pyyaml[${PYTHON_USEDEP}]
dev-python/requests[${PYTHON_USEDEP}]
')
@@ -54,7 +54,7 @@ RDEPEND="
x11-apps/xgamma
x11-apps/xrandr
x11-libs/gtk+:3[introspection]
- x11-libs/libnotify
+ x11-libs/libnotify[introspection]
"
python_install_all() {
diff --git a/games-util/lutris/lutris-0.5.8.ebuild b/games-util/lutris/lutris-0.5.8.ebuild
index 4052ada5d976..1daf6b1bf933 100644
--- a/games-util/lutris/lutris-0.5.8.ebuild
+++ b/games-util/lutris/lutris-0.5.8.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
PYTHON_REQ_USE="sqlite,threads(+)"
DISTUTILS_SINGLE_IMPL="1"
@@ -36,13 +36,13 @@ BDEPEND="
RDEPEND="
app-arch/cabextract
app-arch/p7zip
- app-arch/unrar
app-arch/unzip
$(python_gen_cond_dep '
dev-python/dbus-python[${PYTHON_USEDEP}]
dev-python/pillow[${PYTHON_USEDEP}]
dev-python/pygobject:3[${PYTHON_USEDEP}]
dev-python/python-evdev[${PYTHON_USEDEP}]
+ dev-python/python-magic[${PYTHON_USEDEP}]
dev-python/pyyaml[${PYTHON_USEDEP}]
dev-python/requests[${PYTHON_USEDEP}]
')
@@ -54,7 +54,7 @@ RDEPEND="
x11-apps/xgamma
x11-apps/xrandr
x11-libs/gtk+:3[introspection]
- x11-libs/libnotify
+ x11-libs/libnotify[introspection]
"
python_install_all() {
diff --git a/games-util/lutris/lutris-9999.ebuild b/games-util/lutris/lutris-9999.ebuild
index 4052ada5d976..1daf6b1bf933 100644
--- a/games-util/lutris/lutris-9999.ebuild
+++ b/games-util/lutris/lutris-9999.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
PYTHON_REQ_USE="sqlite,threads(+)"
DISTUTILS_SINGLE_IMPL="1"
@@ -36,13 +36,13 @@ BDEPEND="
RDEPEND="
app-arch/cabextract
app-arch/p7zip
- app-arch/unrar
app-arch/unzip
$(python_gen_cond_dep '
dev-python/dbus-python[${PYTHON_USEDEP}]
dev-python/pillow[${PYTHON_USEDEP}]
dev-python/pygobject:3[${PYTHON_USEDEP}]
dev-python/python-evdev[${PYTHON_USEDEP}]
+ dev-python/python-magic[${PYTHON_USEDEP}]
dev-python/pyyaml[${PYTHON_USEDEP}]
dev-python/requests[${PYTHON_USEDEP}]
')
@@ -54,7 +54,7 @@ RDEPEND="
x11-apps/xgamma
x11-apps/xrandr
x11-libs/gtk+:3[introspection]
- x11-libs/libnotify
+ x11-libs/libnotify[introspection]
"
python_install_all() {
diff --git a/gui-wm/Manifest.gz b/gui-wm/Manifest.gz
index 7f7ea2040957..f5137cbea675 100644
Binary files a/gui-wm/Manifest.gz and b/gui-wm/Manifest.gz differ
diff --git a/gui-wm/sway/Manifest b/gui-wm/sway/Manifest
index 11ff1467cfac..7884f8f815ab 100644
--- a/gui-wm/sway/Manifest
+++ b/gui-wm/sway/Manifest
@@ -1,7 +1,5 @@
DIST sway-1.5.1.tar.gz 5536721 BLAKE2B 4dcb6ca380ef8451ab9219a584598928a79e999bc0b1de0599cb7867c8fd94d54c55a2be9585635b4fd230fd83852141d6fd41ef35dbc4a8fef1bcc2828b3be4 SHA512 3b937249db2875100bc22e99f955a3300d3294a296fb37006fa1468a3986bf4fa8e5197279e3587bd8dc29f31adff8fbdc9ddc840e7be982b73331a05cd06ba5
-DIST sway-1.5.tar.gz 5535966 BLAKE2B e863e97ee897dcd1652d363a09b712932de55da08c88b4858f0aadc29b2cb19d2bda1e5e1184f4e4be6fa54a0136463556f9072f32e2b952d4f12ffd0ee9baf9 SHA512 702e44f8923a4ca05d831dd7ed76165654f113a8b2754d332c509ee844528f47c52b7f21deca78d4a79dad465cbcd0934574fff4ad9bb7a45aec3124dea5bca4
EBUILD sway-1.5.1-r1.ebuild 3148 BLAKE2B 0c71e5d52ca525bd7c25e28108da95d6d86dc419dbca0ec97cdff6b88688ce2ccc0226773bf22b296ac66116c4c5b129613af02a30c5f7dc9ef2396688591fec SHA512 b95e2e5c6f45aeaf62372d8dbbdff3d57f48980051d301bd23c1105da8e3ce597e624132e3b116e6bce09e484b753d1b187c345b21b5148c7c5719c7c8076435
EBUILD sway-1.5.1.ebuild 3123 BLAKE2B e6b31593b2dc7f47edb561b95ff74562f29604e24dfafd603c4f343e8e91641ccf76402aa4608879fdc410a691b47a35f412ecc130c8ef79772a1bc14497864e SHA512 df481568d43bfbc64bb1ff293ee94c126d40e2379e50217f383ac1a315f48bb7a4d22fd1fa69abc7b526f2bf317811a97ff99ecae8e9ec78c6ee344be1f23885
-EBUILD sway-1.5.ebuild 3124 BLAKE2B 62294350697990792f27d39c7c720455b50434bfbf805fd67b4c474750af3c7319e3877f2bd00b033a4a82cd8dcd5ae4cac5fcbd6c754d769c25d7e9a6b0f77c SHA512 6f991e0e9f8fc39f3d833e1636b529d8fb0e9b002a990ceefb43864db1febbd8657084a8e8849a11af4a4b00a721f14955ade2d1742ac051c68d1d1934939a09
EBUILD sway-9999.ebuild 3148 BLAKE2B 0c71e5d52ca525bd7c25e28108da95d6d86dc419dbca0ec97cdff6b88688ce2ccc0226773bf22b296ac66116c4c5b129613af02a30c5f7dc9ef2396688591fec SHA512 b95e2e5c6f45aeaf62372d8dbbdff3d57f48980051d301bd23c1105da8e3ce597e624132e3b116e6bce09e484b753d1b187c345b21b5148c7c5719c7c8076435
MISC metadata.xml 2468 BLAKE2B dc1da35dc84c5c977c7ecdd44972bea616119c166a5b4d138895a7c4327f8465db94f4b039afe4e1cab119063fa0d050a7ef9ef25ed77c22c3776098560cb7dd SHA512 1abe7b4a3871350e6573fb2eb88de1c2b908a13c18661a19a4a192e73ba5860bfdf268f10761413110c9eedea67c811c3a4dc0ce700ad9c59713b5c6546ddc0e
diff --git a/gui-wm/sway/sway-1.5.ebuild b/gui-wm/sway/sway-1.5.ebuild
deleted file mode 100644
index ccdb0da86af9..000000000000
--- a/gui-wm/sway/sway-1.5.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit eutils meson
-
-DESCRIPTION="i3-compatible Wayland window manager"
-HOMEPAGE="https://swaywm.org"
-
-if [[ ${PV} == 9999 ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/swaywm/${PN}.git"
-else
- MY_PV=${PV/_rc/-rc}
- SRC_URI="https://github.com/swaywm/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="amd64 arm64 ~ppc64 x86"
- S="${WORKDIR}/${PN}-${MY_PV}"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="elogind fish-completion +man +swaybar +swaybg +swayidle +swaylock +swaymsg +swaynag systemd tray wallpapers X zsh-completion"
-REQUIRED_USE="?? ( elogind systemd )
- tray? ( || ( elogind systemd ) )"
-
-DEPEND="
- >=dev-libs/json-c-0.13:0=
- >=dev-libs/libinput-1.6.0:0=
- dev-libs/libpcre
- dev-libs/wayland
- x11-libs/cairo
- x11-libs/libxkbcommon
- x11-libs/pango
- x11-libs/pixman
- media-libs/mesa[gles2,libglvnd(+)]
- elogind? ( >=sys-auth/elogind-239 )
- swaybar? ( x11-libs/gdk-pixbuf:2 )
- swaybg? ( gui-apps/swaybg )
- swayidle? ( gui-apps/swayidle )
- swaylock? ( gui-apps/swaylock )
- systemd? ( >=sys-apps/systemd-239 )
- wallpapers? ( x11-libs/gdk-pixbuf:2[jpeg] )
- X? ( x11-libs/libxcb:0= )
-"
-if [[ ${PV} == 9999 ]]; then
- DEPEND+="~gui-libs/wlroots-9999:=[elogind=,systemd=,X=]"
-else
- DEPEND+="
- >=gui-libs/wlroots-0.11.0:=[elogind=,systemd=,X=]
-
+Date: Wed, 6 Jan 2021 15:54:52 +0100
+Subject: [PATCH] Don't reset account scopes if not necessary
+
+This triggers unnecesary authentication prompts
+
+BUG: 429406
+---
+ src/core/accountmanager.cpp | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/src/core/accountmanager.cpp b/src/core/accountmanager.cpp
+index b9af6c1..f68563e 100644
+--- a/src/core/accountmanager.cpp
++++ b/src/core/accountmanager.cpp
+@@ -81,7 +81,9 @@ public:
+ currentScopes.push_back(requestedScope);
+ }
+ }
+- account->setScopes(currentScopes);
++ if (currentScopes != account->scopes()) {
++ account->setScopes(currentScopes);
++ }
+ }
+ auto *job = new AuthJob(account, apiKey, apiSecret);
+ job->setUsername(account->accountName());
+--
+GitLab
+
diff --git a/kde-apps/libkgapi/libkgapi-20.12.1.ebuild b/kde-apps/libkgapi/libkgapi-20.12.1-r1.ebuild
similarity index 90%
rename from kde-apps/libkgapi/libkgapi-20.12.1.ebuild
rename to kde-apps/libkgapi/libkgapi-20.12.1-r1.ebuild
index 950dc581ce22..07016b6b5f89 100644
--- a/kde-apps/libkgapi/libkgapi-20.12.1.ebuild
+++ b/kde-apps/libkgapi/libkgapi-20.12.1-r1.ebuild
@@ -31,3 +31,5 @@ DEPEND="
>=kde-frameworks/kwallet-${KFMIN}:5
"
RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${P}-remember-gmail-auth-token.patch" ) # KDE-Bug 429406
diff --git a/kde-frameworks/Manifest.gz b/kde-frameworks/Manifest.gz
index 587e36e5a3d7..4bbaabcc04d1 100644
Binary files a/kde-frameworks/Manifest.gz and b/kde-frameworks/Manifest.gz differ
diff --git a/kde-frameworks/extra-cmake-modules/Manifest b/kde-frameworks/extra-cmake-modules/Manifest
index 9d2716f2f69a..9a26c3e1b897 100644
--- a/kde-frameworks/extra-cmake-modules/Manifest
+++ b/kde-frameworks/extra-cmake-modules/Manifest
@@ -3,6 +3,6 @@ AUX extra-cmake-modules-5.72.0-skip-ecm_add_test-early.patch 1636 BLAKE2B 8aa070
AUX extra-cmake-modules-5.74.0-disable-qmlplugindump.patch 2677 BLAKE2B 7ee3d039291f65e667d83dafbedf1a7790db9c411962dca48dadf8e65d25733cf1f74b406b871986340e65ab43cea586739274d3e9e36ad00021bfa1fc6700a8 SHA512 47105664fb59b5bee31b58c034e4e83cfa93983d40d369ff82204a35195171a5fab6063f0257eead5186fadd17f87c378daacecc3c9cdb63fdfd0dbe42fe56a7
DIST extra-cmake-modules-5.77.0.tar.xz 353784 BLAKE2B 08f70ab68fa1de0a8014fffb5a5f638fc49ea4d17a68de4a2061746bc95218235e18066d865ed12c746deb2212f61299675fefc4c89b2ed9d48e675925904f5e SHA512 0581b3f8f17ad452140a68e9d1b14014235523ecc2df2b6a8e6a6b3cac99a1b58470b8d31ae2eb695c1e5357d4c5ff26d656bf2f4ede7aba824eaed1e38a3a95
DIST extra-cmake-modules-5.78.0.tar.xz 355416 BLAKE2B 379125601e7d946f16e39aee081e199f7cc3f683ab7babe654dd55bf0977923c7ac049f860cd37dd525a62b17fbc05a2454ce20fb3e241fdba903331e85873e9 SHA512 6cd3bd89d4cbd2463ca3e55538becdc0931b5bd351d5a692dcb9b5f63f3440f7cd0dd4f6f5cc2d2044c798b14d276c6a30d224188caf3e78b4a462facf649e4a
-EBUILD extra-cmake-modules-5.77.0.ebuild 1718 BLAKE2B 1e305256237e9b9f2d1c4d6bf6cc3e1c2c8cc79557a7b81dc015e8bbeaf971d5c2bb4bb8cbc50c030faad9995033991690b4a97c338a271f6fc89b8dacf65a33 SHA512 681dca0c2bb3ac69b199d06df2237832613054980d87a89b5ecc51e77b02839260a56756a65346454cca2eea8fa9746f3e1850a5b5693eca06f0695d7cbb7559
-EBUILD extra-cmake-modules-5.78.0.ebuild 1723 BLAKE2B 89f57d107880514bbc8e0432a6485ddf433c74caf60b30afe4745a5f012cf86bfc423dbc1965770adce23c237b0c63aa40cfe90c93b651f0ee9e3e0575fc2ca7 SHA512 72537459d1b79f937f26dd46cc794732078ed582dddb15ff985ad4dd4f9cf5cfcdcb826deefc4fddfd233f52aefc0201d07913e3ebcc56062687f1dc1c46c609
+EBUILD extra-cmake-modules-5.77.0.ebuild 1813 BLAKE2B 8b5ac59ea6a6ee0810c8bc1729e09d0777b419b6725a8f38dd9c6300e23bf62d99f3d6563d9e473d75ac1303f8c0e87bc51de17f8306e7c8e6f4e406976fb7e6 SHA512 2a5a6c0e1269cfe4688b08e942f919a25f03b088c857da44904d813e32219c71b69e6b883ed6afdadc827c1d8f99b550aa2e96a2c378b32686b6fff1f134cd3f
+EBUILD extra-cmake-modules-5.78.0.ebuild 1818 BLAKE2B ab803efcf2dab98778c6c274d81d2b4046004ab19b29aa3ab0ec9be51a61355db020268f1b4594ed98208e28eea282ca3f227c8a46e22a948a997dd906adde04 SHA512 02a44c9b710e98a734123275d0ed39527a46335854bbf18f88a590b5162fc341a4e86b544b30698a4f70d198d16583a076f32eade0877495deab56f97829e041
MISC metadata.xml 273 BLAKE2B e5a4eabc4773a11bcdf052b2ce87104bb85b0ed030475140ad0ec7fea2dcb401f539c67e1b1dc1138a5985be143947c86ff3b0b4d6881cc3a0952140ce33732e SHA512 570f3ea3dd25cac1410c3290a4003a288b9e1a0b873884fc33250dfa110cc39b61bd4db1f4d06e3b6e5f761bda8da222a4e294d12ebd8194d771ac61069ffc92
diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.77.0.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.77.0.ebuild
index 15ca6a51bc80..1f1a776db327 100644
--- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.77.0.ebuild
+++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.77.0.ebuild
@@ -67,10 +67,11 @@ src_configure() {
src_test() {
# ECMToolchainAndroidTest passes but then breaks src_install
# ECMPoQmToolsTest is broken, bug #627806
+ # KDEFetchTranslations can not possibly succeed in releases, bug #764953
# possible race condition with multiple jobs, bug #701854
local myctestargs=(
-j1
- -E "(ECMToolchainAndroidTest|ECMPoQmToolsTest)"
+ -E "(ECMToolchainAndroidTest|ECMPoQmToolsTest|KDEFetchTranslations)"
)
cmake_src_test
diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.78.0.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.78.0.ebuild
index a6510f2e6557..c635f424c819 100644
--- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.78.0.ebuild
+++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.78.0.ebuild
@@ -67,10 +67,11 @@ src_configure() {
src_test() {
# ECMToolchainAndroidTest passes but then breaks src_install
# ECMPoQmToolsTest is broken, bug #627806
+ # KDEFetchTranslations can not possibly succeed in releases, bug #764953
# possible race condition with multiple jobs, bug #701854
local myctestargs=(
-j1
- -E "(ECMToolchainAndroidTest|ECMPoQmToolsTest)"
+ -E "(ECMToolchainAndroidTest|ECMPoQmToolsTest|KDEFetchTranslations)"
)
cmake_src_test
diff --git a/kde-frameworks/kimageformats/Manifest b/kde-frameworks/kimageformats/Manifest
index 381a171eed22..bb805c480735 100644
--- a/kde-frameworks/kimageformats/Manifest
+++ b/kde-frameworks/kimageformats/Manifest
@@ -1,5 +1,5 @@
DIST kimageformats-5.77.0.tar.xz 548968 BLAKE2B 29c0f5182a1cc2148f77c5ca2b8a28523d7c3c725cb2666e17bdb3efb4c815a08d3431605083dfa1d4711d584fd933e043cf647bc7046b038f21f87d6afbe4b3 SHA512 dfb6ffabe3b61652a9a59bb063c5f7c0fc0286bae6f66c34f5b20f5d984925d683190c806e1ead0b8fcae991a2830c6bbece679e5abfae5189af0d08f1cf8705
DIST kimageformats-5.78.0.tar.xz 558436 BLAKE2B e21d439b18df40572b5c45048fd51572dfc4a5958d31661bed4d29176c1e78ca997d58aa92672b0653a5a271fc92be3cf8b22033dab1e283a4cd485a5c03e3ab SHA512 cd06c63794ecfdf52863293b48a939c54ce58fdf4b0e84e629652d9e656a17c8e5fd3428aa7b3e741130bebcc968ba7d8d7f198fa2d01ebb297ab9bc1121ea4d
EBUILD kimageformats-5.77.0.ebuild 769 BLAKE2B c64e91fb001934fdb7a928d04631c2dedd97793dd5bc497b5bf5703de6e271b16513906c5af1cb5bd2f25e79a61426bfaf24444f54979d6a5807866596898014 SHA512 8684a14674194a3db8c3ce177f8ce761f4ce2042176babfdc1dc27c221d7b123dd4ff7ffe0937506018a0539bc07aef53473203f303cfd33b390a4e39ef3b0be
-EBUILD kimageformats-5.78.0.ebuild 772 BLAKE2B 6b131b64572913a2c47a2f99eb57c6fec92eddd25d00a67ffa87a9b06ba25ed7110c020004952f1ce08ba16ee8ee999c7ff9c6dd4bcad0fccd0f2c3309ecb07b SHA512 651316d065c7090d62f7651310aa8eb0ad155aa77a6f4c0a8820616fdf99b1a2e2da99d679c4fcb3ba3128848c2a24fbe896a716dc2f4b8a0d133da1e608256e
-MISC metadata.xml 327 BLAKE2B 830c0a5e6689cfb881f6c878199b45716bf683fabe3ef6cbe51c757efcb057ad253912930b1637d958e26dbe0072ed25fca3051b752084a634dab1d1f34c7e6e SHA512 269908d4ff42e80fcb50a3a3b9ab6caceed1068edb2469f3de5563b5505f8053c14c698299383686c752a3b43097d3eccbfbde7f0d41684e5270bb2281a24d69
+EBUILD kimageformats-5.78.0-r1.ebuild 856 BLAKE2B f5dbe1a6169d944da9074a1883b8234d88ca2fa426ecba14bdd8539bcc70c7cff8c8c0d09ff9d9aed00c39f332e8f69dde3f382f788b6dab80191c5a240ae31e SHA512 2ce17a257d7899e6bf8a1b8c3b89e6e6f9bb7c7dac56aaf1ad76044bbee93dfaa1660db2b72bc55e89fcf888e3a4d6553d84900707a7f37a6180af85a74114eb
+MISC metadata.xml 389 BLAKE2B 1608d53acb5699c47adce21f2a808b851354592b3169cf622f8bf6d9012d9036a59175288a602f08cf862c1532eaaf290cd6a018473214b9730ecd010e8da704 SHA512 522cc4b6c7877e9fb9565d23e590c2cedaf1a1a3be6cb9ca830613ffaf5f048ac38c6d5ad784d8599fbf032141c09fefe121e83addbaecdb65d5eaf640440535
diff --git a/kde-frameworks/kimageformats/kimageformats-5.78.0.ebuild b/kde-frameworks/kimageformats/kimageformats-5.78.0-r1.ebuild
similarity index 87%
rename from kde-frameworks/kimageformats/kimageformats-5.78.0.ebuild
rename to kde-frameworks/kimageformats/kimageformats-5.78.0-r1.ebuild
index f19f45e0f376..3d62edafb6e4 100644
--- a/kde-frameworks/kimageformats/kimageformats-5.78.0.ebuild
+++ b/kde-frameworks/kimageformats/kimageformats-5.78.0-r1.ebuild
@@ -12,11 +12,12 @@ inherit ecm kde.org
DESCRIPTION="Framework providing additional format plugins for Qt's image I/O system"
LICENSE="LGPL-2+"
KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="eps openexr"
+IUSE="avif eps openexr"
DEPEND="
>=dev-qt/qtgui-${QTMIN}:5
=kde-frameworks/karchive-${PVCUT}*:5
+ avif? ( >=media-libs/libavif-0.8.2 )
eps? ( >=dev-qt/qtprintsupport-${QTMIN}:5 )
openexr? (
media-libs/ilmbase:=
@@ -29,6 +30,7 @@ DOCS=( src/imageformats/AUTHORS )
src_configure() {
local mycmakeargs=(
+ $(cmake_use_find_package avif libavif)
$(cmake_use_find_package eps Qt5PrintSupport)
$(cmake_use_find_package openexr OpenEXR)
)
diff --git a/kde-frameworks/kimageformats/metadata.xml b/kde-frameworks/kimageformats/metadata.xml
index 810e5e62b997..c44e1a5290b5 100644
--- a/kde-frameworks/kimageformats/metadata.xml
+++ b/kde-frameworks/kimageformats/metadata.xml
@@ -6,6 +6,7 @@
Gentoo KDE Project
diff --git a/kde-frameworks/syntax-highlighting/Manifest b/kde-frameworks/syntax-highlighting/Manifest
index cd59f49916bd..8c2c7950bd6a 100644
--- a/kde-frameworks/syntax-highlighting/Manifest
+++ b/kde-frameworks/syntax-highlighting/Manifest
@@ -1,6 +1,9 @@
+AUX syntax-highlighting-5.77.0-bash-zsh-fix.patch 6963 BLAKE2B 9d78a32f3ee42f9861c0bc58c0d0c006b051f415bbc4874ee0fe89952d5557b846581be7c0390f551230598e001e71cc45cb667f5eee68cb57061fa9eb16cbe4 SHA512 1a9b8e67dab8eb7b1eafa0d37c4bf2dfdd15f0bfff17f1380bb7771eebd17b8ce33bc684e2c3b5514fde17064af8d77f96d44895836bf1889593c241079a20a8
+AUX syntax-highlighting-5.77.0-bash-zsh-version.patch 2125 BLAKE2B b12c649b444595caee9bc28b3991c66b4c11260c55b56900894a922e53fc2aea46f1a374f7fe0787967619f98c7862db6645c5e2f02053f7a25da688f9c80b92 SHA512 1dc6b08f651f647e5442de9bfb91babec5f2bfdfdd1da9dc1809a58e0b7750b9e7ba1e60279fb7c99e66a0a5a9d291ec136cd4183b156b37ce1a9f7581257eac
DIST syntax-highlighting-5.77.0-bash-zsh-fixes.patch.xz 91824 BLAKE2B 4d201e62aecc7126f11d52ef2d68c308e61f7e167312270baf093eab379a7d95efaa38fec604701ad0fc15e8e050191a00a4075dac488c957fabe4dc4994065f SHA512 598eb3ed82f2bd072750730e6f9492d821a63cc2ebb4877e83aa482597a6cfb50ac721945f5c176c45d75de970dfba3c79f0e048db9076d7451743e672512c97
DIST syntax-highlighting-5.77.0.tar.xz 2145120 BLAKE2B de91836509fd6264fe0b79f1a7153c4d581913870ec207bd4d69ce24c5d00d92e49ebc70d147715a732626805cf68045be6490ff6ae7e199454c53a4c82ec2dd SHA512 057e9be24608cd856ee8aea355ddc63da9a11d50c388ae303e1f34cdf3a7ac99c592de51e0f04fa2254246ad796ced5029117b22ca71420b6089139d827a31b9
DIST syntax-highlighting-5.78.0.tar.xz 2201352 BLAKE2B 6cd72e85d43d5061a490da6ff13f16c6e3ad2decd4efc65b8a5ec82f1815102bab0a546cd929a8ce82bccc163a809efb8cc5c82ecba98a410d0debef16b47884 SHA512 e9d47f69a14a890a4c5c0e9c33cce51fa6fef93d5c50b565b4d6e2d1978cddd8ffb4239534ddb02decf75190ec3b5446ca387901cda9f27f59088b6853c76843
EBUILD syntax-highlighting-5.77.0-r1.ebuild 702 BLAKE2B 31ebfd8db51b156d515477ae8d0fa4783287fde242b0d9bcc99bc9b5438980c83e5692bc653e3402b65504e333539cf33cf71a9bc68c80b53afefb983b9d0d02 SHA512 1fb527d9ffa2e1a343d7527a7bd8f6827296862639017f225fe20580ce287687f192a3d04ea0ec255e57aa6e67f92d3ae8685ef03720a7523d2245cc52c6782d
-EBUILD syntax-highlighting-5.78.0.ebuild 570 BLAKE2B 21116a678eaa7c3e9cd6e1011e3e299662ce90e10feb3f04e7fbe1d4f84618b1de053a797b9ff205266842a729fffbec4b1661edcb23564772aa53654e9bf9e2 SHA512 9ee5488301245e4b03627500a7fe73e14c6711c3d4da720147a5f8e84ca76fdca6d6311daadd96621e31a8fd682efb90f645c372c99d6e48fb5c284d97cf91ef
+EBUILD syntax-highlighting-5.77.0-r2.ebuild 804 BLAKE2B 53de7441b14c5626ac919fa24d05b580d46de74f4f719fe4f4b15ac143a03ac0468dfdad5539d11e7f350452ca44a4e3cb56d8e198714826c6addfa5d4de3194 SHA512 3fcf266ff816032f5ef6e88a686824121e7f74c864c306c759bb8192fae00c5fd1e869823747903c52258693f31fc013fcee60532eec3608accf72903fd88671
+EBUILD syntax-highlighting-5.78.0-r1.ebuild 630 BLAKE2B 63db421310600183db8612af671075644d4e98375dcc838eb5573c389f4cd5f16d17a33a6eaacdd6fb0dea78affe2db3d6114dc247e503bea0f4d31652fb175b SHA512 33e8463a49ad5770160681a96760af50cfb7fa5ab5c272c5ed6dbe18bab41133f32edb57d68dae6fee2decfda770549af93560d367180e13038d223a158a3a9a
MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/syntax-highlighting/files/syntax-highlighting-5.77.0-bash-zsh-fix.patch b/kde-frameworks/syntax-highlighting/files/syntax-highlighting-5.77.0-bash-zsh-fix.patch
new file mode 100644
index 000000000000..2ec92edb9c8f
--- /dev/null
+++ b/kde-frameworks/syntax-highlighting/files/syntax-highlighting-5.77.0-bash-zsh-fix.patch
@@ -0,0 +1,122 @@
+From ba9b3c5e0ed2fb33b9a896ec910590410978befe Mon Sep 17 00:00:00 2001
+From: Jonathan Poelen
+Date: Mon, 11 Jan 2021 01:29:01 +0100
+Subject: [PATCH] Bash: fix #5: $ at the end of a double quoted string
+
+---
+ autotests/folding/highlight.sh.fold | 1 +
+ autotests/html/highlight.sh.dark.html | 1 +
+ autotests/html/highlight.sh.html | 1 +
+ autotests/input/highlight.sh | 1 +
+ autotests/reference/highlight.sh.ref | 1 +
+ data/syntax/bash.xml | 5 +++--
+ data/syntax/zsh.xml | 3 +--
+ 7 files changed, 9 insertions(+), 4 deletions(-)
+
+diff --git a/autotests/folding/highlight.sh.fold b/autotests/folding/highlight.sh.fold
+index 652fef8f..d7a6b210 100644
+--- a/autotests/folding/highlight.sh.fold
++++ b/autotests/folding/highlight.sh.fold
+@@ -16,6 +16,7 @@ echo 'single quoted string'
+ echo "double quoted string"
+ echo $'string with esc\apes\x0din it'
+ echo $"string meant to be translated"
++echo "$"
+
+
+ # comments:
+diff --git a/autotests/html/highlight.sh.dark.html b/autotests/html/highlight.sh.dark.html
+index d1d4fb8a..8cbd0929 100644
+--- a/autotests/html/highlight.sh.dark.html
++++ b/autotests/html/highlight.sh.dark.html
+@@ -22,6 +22,7 @@
+ echo "double quoted string"
+ echo $'string with esc\apes\x0din it'
+ echo $"string meant to be translated"
++echo "$"
+
+
+ # comments:
+diff --git a/autotests/html/highlight.sh.html b/autotests/html/highlight.sh.html
+index 5d687d86..d176b1cb 100644
+--- a/autotests/html/highlight.sh.html
++++ b/autotests/html/highlight.sh.html
+@@ -22,6 +22,7 @@
+ echo "double quoted string"
+ echo $'string with esc\apes\x0din it'
+ echo $"string meant to be translated"
++echo "$"
+
+
+ # comments:
+diff --git a/autotests/input/highlight.sh b/autotests/input/highlight.sh
+index 177e104f..5c2ae7b1 100644
+--- a/autotests/input/highlight.sh
++++ b/autotests/input/highlight.sh
+@@ -16,6 +16,7 @@ echo 'single quoted string'
+ echo "double quoted string"
+ echo $'string with esc\apes\x0din it'
+ echo $"string meant to be translated"
++echo "$"
+
+
+ # comments:
+diff --git a/autotests/reference/highlight.sh.ref b/autotests/reference/highlight.sh.ref
+index 181c36af..edaf18ab 100644
+--- a/autotests/reference/highlight.sh.ref
++++ b/autotests/reference/highlight.sh.ref
+@@ -16,6 +16,7 @@
+ echo "double quoted string"
+ echo $'string with esc\apes\x0din it'
+ echo $"string meant to be translated"
++echo "$"
+
+
+ # comments:
+diff --git a/data/syntax/bash.xml b/data/syntax/bash.xml
+index 3171247b..3b804f90 100644
+--- a/data/syntax/bash.xml
++++ b/data/syntax/bash.xml
+@@ -30,7 +30,7 @@
+
+ ]>
+
+-
++
+
+
++ Verdana
+ Tahoma
++ Albany AMT
+
+
+
+ monospace
+
++ Liberation Mono
+ DejaVu Sans Mono
+ Inconsolata
+ Andale Mono
+ Courier New
+- Cumberland AMT
+ Luxi Mono
+ Nimbus Mono L
+ Nimbus Mono
+ Nimbus Mono PS
+ Courier
++ Cumberland AMT
+
+
+ "
+ ewarn " Graphics support --->"
+ ewarn " Direct Rendering Manager (XFree86 4.1.0 and higher DRI support) --->"
+ ewarn " <*> Intel 830M, 845G, 852GM, 855GM, 865G (i915 driver) --->"
+ ewarn " i915 driver"
+ ewarn " [*] Enable modesetting on intel by default"
+ echo
+ fi
+}
diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index 3c6ab1c27b17..dc3fe3074248 100644
Binary files a/x11-libs/Manifest.gz and b/x11-libs/Manifest.gz differ
diff --git a/x11-libs/libva-intel-media-driver/Manifest b/x11-libs/libva-intel-media-driver/Manifest
index 8a8295b4baba..57ad729b2b19 100644
--- a/x11-libs/libva-intel-media-driver/Manifest
+++ b/x11-libs/libva-intel-media-driver/Manifest
@@ -14,6 +14,6 @@ EBUILD libva-intel-media-driver-20.1.1.ebuild 868 BLAKE2B 1925faeccacca0f6d0c3f7
EBUILD libva-intel-media-driver-20.2.0-r1.ebuild 985 BLAKE2B 9c7d9f19c231c5e3137243915fd2ff55f61bd79fd43ce23d21b1bf12572054d2c99b00e5ad249197501c0f270bcbc51dd589f18b0a6308c88adb028fee08a359 SHA512 72b54d7049baf366ba89782f6c098ec24e3435b81b5e4b592b8ce313b2aa8f4ac7bd4e8f1750ffcd17817c1ffff467385bf0e22118b3804af61e710d02471157
EBUILD libva-intel-media-driver-20.2.0-r2.ebuild 1225 BLAKE2B 195b1f1db03ad5bf2d42bae05cba99e9726a0ba3c682c993eb73b6cff6bf04b40004d15223d69fbd64fcae4b62bf1137f50911ec2b9c68bd9079d0302d682ba6 SHA512 a46e343c36dc51819c22b601b7eecc62f38c27b75cc4eafba844fdb32ce062047f3408e582b3daff9668a72df26d995d2a4909c7da98cf2fbc4a60682f41151b
EBUILD libva-intel-media-driver-20.2.0.ebuild 869 BLAKE2B f060ace5837fa81761fd7a416d2c82647656691e7a356d4d5b1f5f74c06e417cbf8386429762d1a4b9ee63debaaa99efc5a55e6e333f372fe763848040f9e9bd SHA512 65233a25a88643d2d1b6d6d2381ba333a8c28716b178646471b191d691179ddfc45322a25564d189b266f3ee1c5c72ab5014bf374c9f1e6dd6f34b73e7ff8d53
-EBUILD libva-intel-media-driver-20.4.5.ebuild 1474 BLAKE2B e4ba04d1959ac2a8319b8d017cda851e694a5faedf8e883935f61d74f4295e28aca192b50099cefc10bb247be25c037cf112cbc2ffc8ecd9975cc48713594eec SHA512 319a40150ac6122df9abcc7738d2d2c0d4c972fa4109f236d81d32387fe5a14f2b23ba71b5c6785d6241ff2a50fa3e24987f41f4f1298d1ca86916a88ec893c9
-EBUILD libva-intel-media-driver-9999.ebuild 1474 BLAKE2B e4ba04d1959ac2a8319b8d017cda851e694a5faedf8e883935f61d74f4295e28aca192b50099cefc10bb247be25c037cf112cbc2ffc8ecd9975cc48713594eec SHA512 319a40150ac6122df9abcc7738d2d2c0d4c972fa4109f236d81d32387fe5a14f2b23ba71b5c6785d6241ff2a50fa3e24987f41f4f1298d1ca86916a88ec893c9
+EBUILD libva-intel-media-driver-20.4.5.ebuild 1466 BLAKE2B bb8d37fee27f49d2b0f96cbb62e3bd2d46521149e4541886ec1f89f816ff906d5da9662b47e6151ac4cb4723fceed30b32fb4503202e40a9f000d88145d1debb SHA512 6123a39dfe64a9b23dbd8b40026e48d20cb31eb981f26f76fe0f7850730743c6a4658abafa8aa95201c5eda90520a97bc120b0564d82b68d400a55e2274e6736
+EBUILD libva-intel-media-driver-9999.ebuild 1466 BLAKE2B bb8d37fee27f49d2b0f96cbb62e3bd2d46521149e4541886ec1f89f816ff906d5da9662b47e6151ac4cb4723fceed30b32fb4503202e40a9f000d88145d1debb SHA512 6123a39dfe64a9b23dbd8b40026e48d20cb31eb981f26f76fe0f7850730743c6a4658abafa8aa95201c5eda90520a97bc120b0564d82b68d400a55e2274e6736
MISC metadata.xml 602 BLAKE2B 9448d1e88775ec7458fab88e284cd0ac184500f3c6d1b1007495e7de30eba245998b10bfef258a34d2b67d5f17438f0afe9f93e3e4001fa197fcffa22f6559dd SHA512 dbc361bd18283a1ca1feb4adea969783afeb7b0a105675b9603d946f8cc1da6d7e959b3c7f74e5bad5c95bb949687563382155a61de985b3fdd70a8cbb2b502f
diff --git a/x11-libs/libva-intel-media-driver/libva-intel-media-driver-20.4.5.ebuild b/x11-libs/libva-intel-media-driver/libva-intel-media-driver-20.4.5.ebuild
index c43c51fa3c72..03687e6cb765 100644
--- a/x11-libs/libva-intel-media-driver/libva-intel-media-driver-20.4.5.ebuild
+++ b/x11-libs/libva-intel-media-driver/libva-intel-media-driver-20.4.5.ebuild
@@ -26,18 +26,18 @@ IUSE="+custom-cflags set-as-default test X"
RESTRICT="!test? ( test )"
-PATCHES=(
- "${FILESDIR}"/${PN}-20.2.0_x11_optional.patch
- "${FILESDIR}"/${PN}-20.4.5_custom_cflags.patch
- "${FILESDIR}"/${PN}-20.4.5_tesing_in_src_test.patch
- )
-
DEPEND=">=media-libs/gmmlib-20.4.1
>=x11-libs/libva-2.10.0[X?]
>=x11-libs/libpciaccess-0.13.1-r1:=
"
RDEPEND="${DEPEND}"
+PATCHES=(
+ "${FILESDIR}"/${PN}-20.2.0_x11_optional.patch
+ "${FILESDIR}"/${PN}-20.4.5_custom_cflags.patch
+ "${FILESDIR}"/${PN}-20.4.5_tesing_in_src_test.patch
+)
+
src_configure() {
local mycmakeargs=(
-DMEDIA_BUILD_FATAL_WARNINGS=OFF
diff --git a/x11-libs/libva-intel-media-driver/libva-intel-media-driver-9999.ebuild b/x11-libs/libva-intel-media-driver/libva-intel-media-driver-9999.ebuild
index c43c51fa3c72..03687e6cb765 100644
--- a/x11-libs/libva-intel-media-driver/libva-intel-media-driver-9999.ebuild
+++ b/x11-libs/libva-intel-media-driver/libva-intel-media-driver-9999.ebuild
@@ -26,18 +26,18 @@ IUSE="+custom-cflags set-as-default test X"
RESTRICT="!test? ( test )"
-PATCHES=(
- "${FILESDIR}"/${PN}-20.2.0_x11_optional.patch
- "${FILESDIR}"/${PN}-20.4.5_custom_cflags.patch
- "${FILESDIR}"/${PN}-20.4.5_tesing_in_src_test.patch
- )
-
DEPEND=">=media-libs/gmmlib-20.4.1
>=x11-libs/libva-2.10.0[X?]
>=x11-libs/libpciaccess-0.13.1-r1:=
"
RDEPEND="${DEPEND}"
+PATCHES=(
+ "${FILESDIR}"/${PN}-20.2.0_x11_optional.patch
+ "${FILESDIR}"/${PN}-20.4.5_custom_cflags.patch
+ "${FILESDIR}"/${PN}-20.4.5_tesing_in_src_test.patch
+)
+
src_configure() {
local mycmakeargs=(
-DMEDIA_BUILD_FATAL_WARNINGS=OFF
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index c306e9676278..aa3961336dfe 100644
Binary files a/x11-misc/Manifest.gz and b/x11-misc/Manifest.gz differ
diff --git a/x11-misc/bumblebee/Manifest b/x11-misc/bumblebee/Manifest
index 7044a0b42b04..5ba0c5c7fb07 100644
--- a/x11-misc/bumblebee/Manifest
+++ b/x11-misc/bumblebee/Manifest
@@ -2,9 +2,9 @@ AUX bumblebee-3.2.1_p20190421-gcc10.patch 2006 BLAKE2B 136c9f5aa38269efa2ef59f41
AUX bumblebee.confd 60 BLAKE2B 68cfe5dd4db512e10cf82977556336e7bb8eb7ab3f397a2ba5b75c4d5e0856d957a126e741d2c3a45f3453479b42e0b1b42b9aab411eb80de9afc73f3c2ff8bd SHA512 4c773002e372e1696c0922bda91a104ea0ee244eb6beac84a4e7ad2ff1aee265aa248e63c3ad55ea75cabbd36b03d9efa3f8ec3ef708346837ab6a10d6652251
AUX bumblebee.envd 127 BLAKE2B 2a993cd77706c2da4f90a3a77b4a6d0014b1322c584ae8970d75539b04b5d6a23adac7067a511f4f9d9a47797ac1d55f836c3242d26d0c464f6ea3833dc30ae5 SHA512 f42bd5992a8c80d045036a689e3c33cc2bdb7d54afb03bb7f33a80fa6a9c1e05f583cdec5b3da42021c48c1b59db4664e9c850e48ada47a1887327f7b11633af
AUX bumblebee.initd 488 BLAKE2B be625ab381b6f588bc86402bfe7aacc8f541c0ebe2f8fdbc4309bdef5dd1cfa44953a3488bde8d0af67b8cf4b14b7b5de77ab125067b6b59379ceba75863fc45 SHA512 5c733a901e2bed20082d01f0db2e8d168106b082f2f6300388edbeec7f5b7a70ddfed908012c8ccf9a3caf070669cfb550368237dd6f8ff62018f8b767012cd7
-DIST bumblebee-3.2.1_p20170130.tar.gz 63428 BLAKE2B 33a2fbbd6e6cbc6cd026b87714d06e54d8803cc75e997cc1bd1aa1d1263c3fe9602f822b92c67fa7e76632bb19daaae11e591b88d087889a970d374f6316e847 SHA512 b457e8ce197782bd1b1fabd3c0c67e4ec26cdb90a3715bbe7a8e1550cdde19134151567cfa0c73d800c30e5d303b30bc1261d5f3cbceaa64d559416e4d541070
DIST bumblebee-3.2.1_p20190421.tar.gz 63640 BLAKE2B 62bf3e7556b3cc3651f0e1f9fabd22501b82e78c0820b5ae113fddc24816cefd9c788a33d506944dc971092ae22dc3389ced79da6284a5e812ffad909bb03ebd SHA512 e24de3b60e55828ccbbd85774b9a776ba01b62850489b9d7952c4bf807f080b68d084f11de540a65d1bf78f6a35ce89d35f868de14e7ab9d768cdf21a1d422ec
-EBUILD bumblebee-3.2.1_p20170130-r1.ebuild 2219 BLAKE2B d422665f2e8033f644162a7ade48b83f7416747ce29a3dcaca58190054510e445bc72515d36e435dcf6990960ea1db852b3dab8b4cdc9ff42da54f6d1c174b93 SHA512 38bd8fe978bed7807f5fda4d6d48fbd97e648cd47e022efd5b11f5805aea5c175cb091eca7ae4f0da8faf67d8e27c49eae89691516932c63805258e85b080e28
+DIST bumblebee-3.2.1_p20210112.tar.gz 63840 BLAKE2B 53f433c90ea7925a059597f9ce1e6b764bf204337cda2a87b3e862951fbd86e18cf3bb973a2a43c0ff913e9b290170536760ed9163ea746f5b28b7fed4ce9c6d SHA512 2d23db5a6d2a06c37176440568fd30c3afd80a75e13db00f081c0029f9e03275bf6c7b019778b9c31dcffe49ba56ec86a3303f00074123c95560a850bdb0f36b
EBUILD bumblebee-3.2.1_p20190421-r1.ebuild 2317 BLAKE2B 5189a2f0ab287b44c2fd72f5f4f06734e4db53db95ff2b98cf093a01202f1764275483f03a7383f82e0799135976a7d8b039870d626f9959ecf8072fcf623d3d SHA512 75ecf2b663e7f72ddc38a55a56783e218d9f6f2ac6e8bb91ddda91e902f0841c1c1b655679e9316981a4398f84df6baf4630e6102dfc17e7f5534c120d896acd
+EBUILD bumblebee-3.2.1_p20210112.ebuild 2203 BLAKE2B 7cab41e8e9037f3fc3094317d7402d15c4af198f714aa03d22f46a894e2f2f68f677005b951b1ab68639aa8ffe6efe035970c2908814a59da76e23b312331d23 SHA512 28718f6459d80ca30613a0432430fbf11680d1acbe79fd1d4965242a93c0fb06b20bd67d3ed97c5ecb10ca1f33f865581d27e576c42c9e5d04fea7347f2128b0
EBUILD bumblebee-9999.ebuild 2215 BLAKE2B f9f61a4183cc43c2c1442101b433fec6a3477d6062da340d8421e0e63398927c5767177ea4d3c98ef87bd261de39b821d003d7a67e209de21b47c57c5e7aed21 SHA512 7da89e2bf3ee757b29fde2757dba5e63c157ff0b15b59d244df8ec43ce9a25adcd00b6f149b694488a916eb7d293b6a59d48e40c18eb94b4be1e9fa35c26a69d
MISC metadata.xml 1111 BLAKE2B 9f9bcd089280889ccb6990617f6b470c0c69a8b77b2af849d5bde7ff45ec94e121569d2c217a87d7375e19503bf0d90de775c514e7b400c0dd2a6fbc897c21b4 SHA512 dc2f37b1def7e302fc3d82325d3179b0c64c96b2fa609f6cf5196cb97b89854fade361005327ee2f8ccc5927e0aefe1c997cf5e6f9862cc18ef09deb3a2aa814
diff --git a/x11-misc/bumblebee/bumblebee-3.2.1_p20170130-r1.ebuild b/x11-misc/bumblebee/bumblebee-3.2.1_p20210112.ebuild
similarity index 91%
rename from x11-misc/bumblebee/bumblebee-3.2.1_p20170130-r1.ebuild
rename to x11-misc/bumblebee/bumblebee-3.2.1_p20210112.ebuild
index 1099ff0e4161..422ac388e2dc 100644
--- a/x11-misc/bumblebee/bumblebee-3.2.1_p20170130-r1.ebuild
+++ b/x11-misc/bumblebee/bumblebee-3.2.1_p20210112.ebuild
@@ -1,19 +1,19 @@
-# 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 multilib readme.gentoo-r1 systemd user
+inherit autotools readme.gentoo-r1 systemd user
if [[ ${PV} == 9999 ]]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/Bumblebee-Project/Bumblebee.git"
EGIT_BRANCH="develop"
- KEYWORDS="amd64 x86"
+ KEYWORDS=""
else
- COMMIT="d469a32fc0dfef5b3725c7a5331be2d04b870594"
+ COMMIT="8f3d307b6aabbc2cd8444c6e5a4360f3bf2915ec"
SRC_URI="https://github.com/Bumblebee-Project/Bumblebee/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="amd64 x86"
+ KEYWORDS="~amd64 ~x86"
S="${WORKDIR}/Bumblebee-${COMMIT}"
fi
diff --git a/x11-misc/xsettingsd/Manifest b/x11-misc/xsettingsd/Manifest
index 5d54bf13aaae..fae1f5c82dea 100644
--- a/x11-misc/xsettingsd/Manifest
+++ b/x11-misc/xsettingsd/Manifest
@@ -1,5 +1,7 @@
AUX xsettingsd-1.0.0-add-cmake-buildsystem.patch 1418 BLAKE2B 981c9b2160a9bce572d7b703e08db93d9619767e39368e5f5eeb41126a78223fed840b41f5804b1a20e76bce695028f101ca5fc28297a02f93e55fd99c225349 SHA512 a3ff870af999745f873d1ab8f2eadfff73b82048a401f6ceacf79f1d7c9834c84081f09e3021af3fb977d80042e663ff40278cef0f72307f877608ba6617f041
AUX xsettingsd-1.0.0-return-1.patch 829 BLAKE2B 9e6024303ffa9f7977187e6f718f03f993788abb5421989e31fcd55f366810903eb9c375c5281803d22ec23b61286ff799bb4096840e55ebd5fc29e0ad592e15 SHA512 f66b5c0fa5068ab5e0232d5de025a59fe8a1bcbbf9b6cc398610773d32c05eb05ef40a8dc7432f5baf153c06671f24f36f07868acd119471665b7c0450ddf6a3
DIST xsettingsd-1.0.0.tar.gz 23627 BLAKE2B e9f7dcb9fd017f34ed88f29e1954e0824764db66eac5fbcfa55e7edef51c4bdec1cb9383efe0b6cb18b88c04818b106b9c4f95fb25daaf09a76b4b4ef4e0b75f SHA512 39077050a2fc3206c308ba399328719303884dd668b61f7756f0a3a4388ed25a3cda0849a713126c22c6b80466ab74c1317fdd9cb3e652169c80c54ba0a45790
+DIST xsettingsd-1.0.2.tar.gz 22481 BLAKE2B 1f7e8112b8910ea20492109ebc2df90d7113804653d5758bbac2b52116e737505026ddd0e17b5444951ad83606ba41495ce8e165bbe04573c740cc3faee75c1b SHA512 da2a82d0b3f5061a1fad7632d800539f4e81bd3f8631dd724705d0601556c044c62da7469a974cbe8f6d8e070247493ac5776bac966cf36f1fae825562457baa
EBUILD xsettingsd-1.0.0.ebuild 543 BLAKE2B b2d84af5b7091b0bab3b41122e2397bf7fb57d7094c7f942c9a6231d2d25d2f31023dc3adfaa1e23dc8c9e2a25ab7bc7447f2627aa304b5b52fc0e096549fb0b SHA512 355acc37e97dc3e33af015136676434cc55f8160abe1566530688093a50507faa9c7c527056f143808be81521718acbdf3cbe28e06e3c0b54f03e2611aac149d
+EBUILD xsettingsd-1.0.2.ebuild 684 BLAKE2B d26ea4ee199ef6a5558c9e24ff9154e4370ee6e38fd622a3e3725d00d2892c8d1319b00f1cba3d810b3d6d0a16ef274c677a66c225fe9227a665f6019653b329 SHA512 debdb6e4708d1c756430cac67e341f08209fa39d8c4e8adc1dbfaa91b5dc94ed4a7830a33534450b912acb3e184465c7ac9f720900bba224bb6ad21753b7c533
MISC metadata.xml 330 BLAKE2B 0b8f27cf4be7ed52be5e6656a64497815cbac57febe612b3755ca2cfa9ce97f34d5807318ac39bc184b7e61b3086cecfa4e5b2e19066adfb32caead8e8833a89 SHA512 834c1c90c8297497e13de12121a39f113807228ede6ec87ad774096e870840f1f1ddc73301c63375f2600b035be12f88c77c978a8fec2e089b0624df16444959
diff --git a/x11-misc/xsettingsd/xsettingsd-1.0.2.ebuild b/x11-misc/xsettingsd/xsettingsd-1.0.2.ebuild
new file mode 100644
index 000000000000..127a824fb368
--- /dev/null
+++ b/x11-misc/xsettingsd/xsettingsd-1.0.2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Provides settings to X11 applications via the XSETTINGS specification"
+HOMEPAGE="https://github.com/derat/xsettingsd"
+SRC_URI="https://github.com/derat/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="x11-libs/libX11"
+DEPEND="${RDEPEND}
+ test? ( dev-cpp/gtest )
+"
+BDEPEND=">=dev-util/cmake-3.15"
+
+src_configure() {
+ local mycmakeargs=(
+ -DBUILD_TESTING=$(usex test)
+ $(cmake_use_find_package test GTest)
+ )
+ cmake_src_configure
+}
diff --git a/xfce-base/Manifest.gz b/xfce-base/Manifest.gz
index 75822919de93..1f3609c2a615 100644
Binary files a/xfce-base/Manifest.gz and b/xfce-base/Manifest.gz differ
diff --git a/xfce-base/exo/Manifest b/xfce-base/exo/Manifest
index c0ed186da9f8..649b49cad5f1 100644
--- a/xfce-base/exo/Manifest
+++ b/xfce-base/exo/Manifest
@@ -4,5 +4,5 @@ DIST exo-4.15.3.tar.bz2 994455 BLAKE2B 9c62b31a2f5cba4853263ea0b155fc3e5439170c7
DIST exo-4.16.0.tar.bz2 966143 BLAKE2B ee2175d2d5087e948a6fb9bd4ffed2ecfe54be7078d2f1c55a6b30a0f3920689a46372af749035b1454e74ef5c75037996f3601d76adf1d0067eceba6775df76 SHA512 8fff640c4a229e77911cf091866f265e1f0d7f0b9274b1a879f46061644dd6aec07ae3f8fc43ac7277429ea98bdde8d0ee010da7ed398cddc7d755fea91b964c
EBUILD exo-0.12.11.ebuild 1036 BLAKE2B 12fc8c5a693166a7672750259cf9b3061b24c104ad3aeaf234ce5fc3d189ca552502eefaf08b24836f1b4f8f356f181469c805929fa0fefdde652cf1c38218b2 SHA512 5e6486e6cabb66870995aa41337730f7dcc6f5dff787b2fb7eba254d11fa69ba1309fbfc7926fec4aba8f287c55f8d777210eb1fe523ceed42c9e1282184b733
EBUILD exo-4.15.3.ebuild 880 BLAKE2B 4c42d53b2f5ad9a5b3e663f2bb1c5543ab013ac3c034c3d3497f9a0b450572b6c1330abc035cd81c4be2ee8232412779d2581bf766e778e867f9e1b8084ef36b SHA512 8cecf712555a726ed2c5fdb2fcd3f8f92213a0027046403461a8a5b9a23fda3d6fc17a13c13333187601294237ed9c25f3246a76ff3af7cdb575f912064b5fee
-EBUILD exo-4.16.0.ebuild 1027 BLAKE2B dfcb7fa9c04d28d7f33af95255078b9efd925df26fade4c4b7501ee48e6a1445164680d5ebf97a5cf8ee0601fdf63f66c274bc843f2b12047bdbb57bf84122d0 SHA512 d3cf689b5e8fe6cf157f7fac021686f7a7fe16a890b94dafa036408389ef7d2383139efe17c0f364a3809be134b45045cdc2c6e2495c1e2998866f5038fcc903
+EBUILD exo-4.16.0.ebuild 1036 BLAKE2B 98eaad351a5ed893c52e0de1e43e708e0a5edb75fbebd10532e3f637f7f03f3cb846b6c03bc026da44ac898ba3b6d76ce1bd61a2e7e2d15567ff26517c65eec1 SHA512 ed593fd1f3c8cfc6791e22a062dc8f7a60bd664bf1e9df55759ccb54ef8a348b4796c5aae5fdb5b7bf267cf77d32525b581e441a9c5c5ac49766313201b72b57
MISC metadata.xml 334 BLAKE2B 0d61ecd7415a1a60ea5f53fdc29fae2ebf9c286822bd7ee5c10629fae5da0102687c3b07fdd5f81b123aa79e5d04905da705177402c491aad574dccc4e6d18ce SHA512 158e0c248e2d8f235fdb105f2342d0a3c4ca3f15b8938a73bfbc1da823d573a178857433e68a7b36cccc7449ba29cfb3fd4c3856b02c231bd5736d9f5932b6d7
diff --git a/xfce-base/exo/exo-4.16.0.ebuild b/xfce-base/exo/exo-4.16.0.ebuild
index 96c225ee8e5d..2cfa5d5ce161 100644
--- a/xfce-base/exo/exo-4.16.0.ebuild
+++ b/xfce-base/exo/exo-4.16.0.ebuild
@@ -21,7 +21,7 @@ DEPEND="${RDEPEND}"
BDEPEND="
dev-util/gtk-doc-am
dev-util/intltool
- dev-util/xfce4-dev-tools
+ >=dev-util/xfce4-dev-tools-4.16.0
sys-devel/gettext
virtual/pkgconfig"