diff --git a/Manifest.files.gz b/Manifest.files.gz
index d8a7d6d2cc6d..206e56102ec0 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 b1fe08be0f15..d96e7d1e481a 100644
Binary files a/acct-group/Manifest.gz and b/acct-group/Manifest.gz differ
diff --git a/acct-group/spamd/Manifest b/acct-group/spamd/Manifest
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/acct-group/spamd/metadata.xml b/acct-group/spamd/metadata.xml
new file mode 100644
index 000000000000..265493eecbee
--- /dev/null
+++ b/acct-group/spamd/metadata.xml
@@ -0,0 +1,13 @@
+
+
+
+
+ gentoo_bugs_peep@parallaxshift.com
+ Philippe Chaintreuil
+
+
+
+ proxy-maint@gentoo.org
+ Proxy Maintainers
+
+
diff --git a/acct-group/spamd/spamd-0.ebuild b/acct-group/spamd/spamd-0.ebuild
new file mode 100644
index 000000000000..d995a905a5ce
--- /dev/null
+++ b/acct-group/spamd/spamd-0.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for the SpamAssassin daemon"
+ACCT_GROUP_ID=337
diff --git a/acct-user/Manifest.gz b/acct-user/Manifest.gz
index 095cf42d0f00..64af6186596d 100644
Binary files a/acct-user/Manifest.gz and b/acct-user/Manifest.gz differ
diff --git a/acct-user/spamd/Manifest b/acct-user/spamd/Manifest
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/acct-user/spamd/metadata.xml b/acct-user/spamd/metadata.xml
new file mode 100644
index 000000000000..265493eecbee
--- /dev/null
+++ b/acct-user/spamd/metadata.xml
@@ -0,0 +1,13 @@
+
+
+
+
+ gentoo_bugs_peep@parallaxshift.com
+ Philippe Chaintreuil
+
+
+
+ proxy-maint@gentoo.org
+ Proxy Maintainers
+
+
diff --git a/acct-user/spamd/spamd-0.ebuild b/acct-user/spamd/spamd-0.ebuild
new file mode 100644
index 000000000000..e4fcb0a0378a
--- /dev/null
+++ b/acct-user/spamd/spamd-0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for the SpamAssassin daemon"
+
+ACCT_USER_ID=337
+ACCT_USER_GROUPS=( "${PN}" )
+# The spamd daemon runs as this user. Use a real home directory so
+# that it can hold SA configuration.
+#
+# Since spamd's home contains user-modifiable config files, it's
+# a violation of the Linux FHS for it to be here, but it's been
+# decided it can't be in /home/.
+#
+# - https://github.com/gentoo/gentoo/pull/14055#issuecomment-582929503
+# - https://archives.gentoo.org/gentoo-dev/message/790294f7a46496aecd0056289c4b6d08
+#
+ACCT_USER_HOME="/var/lib/spamd"
+ACCT_USER_HOME_PERMS=0700
+
+acct-user_add_deps
diff --git a/acct-user/tvheadend/Manifest b/acct-user/tvheadend/Manifest
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/acct-user/tvheadend/metadata.xml b/acct-user/tvheadend/metadata.xml
new file mode 100644
index 000000000000..3b94165dd3d1
--- /dev/null
+++ b/acct-user/tvheadend/metadata.xml
@@ -0,0 +1,8 @@
+
+
+
+
+ chewi@gentoo.org
+ James Le Cuirot
+
+
diff --git a/acct-user/tvheadend/tvheadend-0.ebuild b/acct-user/tvheadend/tvheadend-0.ebuild
new file mode 100644
index 000000000000..371ace1855fc
--- /dev/null
+++ b/acct-user/tvheadend/tvheadend-0.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for tvheadend"
+ACCT_USER_ID=462
+ACCT_USER_GROUPS=( video )
+ACCT_USER_HOME=/var/lib/tvheadend
+ACCT_USER_HOME_PERMS=0700
+
+acct-user_add_deps
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 21c42ade501e..6f539e8001fa 100644
Binary files a/app-admin/Manifest.gz and b/app-admin/Manifest.gz differ
diff --git a/app-admin/gopass/Manifest b/app-admin/gopass/Manifest
index 6e0097b95f1d..07719cb900b7 100644
--- a/app-admin/gopass/Manifest
+++ b/app-admin/gopass/Manifest
@@ -34,6 +34,7 @@ DIST github.com%2Fgodbus%2Fdbus%2F@v%2Fv0.0.0-20190623212516-8a1682060722.mod 39
DIST github.com%2Fgodbus%2Fdbus%2F@v%2Fv0.0.0-20190623212516-8a1682060722.zip 93044 BLAKE2B 2c3eb15f4f2792ae60e9712392db623ab2a662e1f2e319da7014c0e94b82452ce141a5c8d7656b02dce44d01cce06a58ac4d8b5bb29ab53a8e3b6d6c65c41582 SHA512 60dd4f9e8b60d72d65c7a35bea054ece6045a32dd033908daec3acbfcef17d6f85b6050c7bff53d49032eb08097e36588911e56622b81d3fb2ed2543187c3478
DIST github.com%2Fgokyle%2Ftwofactor%2F@v%2Fv1.0.1.mod 35 BLAKE2B 8e6a890bcd1d25cab5f07d335454e2251dfe47b7eb40adb1c8479f93bc2134adaa53f7c594caa5e790c06e634ff9789ea0e438b2382baf416be76b335aeea1a9 SHA512 ab41dcf4805fae3baccc64c61ef13ea3e4dad8e92807ca77bb0a8300968b498d5f2b05a0b1aa3269d38fe37391bed80eb7de5c626b90714a8ba490ee05b67682
DIST github.com%2Fgokyle%2Ftwofactor%2F@v%2Fv1.0.1.zip 13502 BLAKE2B 8423a01877ac7ebe40452e5e84551dc9e00a818051d5bcd5d0daa84a55939caaf2ecc130749d4664af62845820e429b8313559c6a78d79f83ad3728d17d9669d SHA512 893ecce9d3eff9ad6e845778a5499a5fa1c723afdcc4be16b323773cff61fe216624b1aeae62ef8c731edb68cfcc099a81297b261451496fe133156c6df133cd
+DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.mod 34 BLAKE2B a4239cba934b6e80714b93d47e88f22ad28ce41d1d984c4261cc3f5f3b857fb28785223fa911b258e2665be2a9d24ffbd925e9e0f374452a2aacd712ad9d5f75 SHA512 e059a34363bb826bbcb8981adbfc10da90e04b86dc5376ab20bdfe1fab135953cff41ef1daa116aff10e9f3e6503168f6baf902f09aa0e8cd9a0da96b932f4b6
DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.1.0.20200221234624-67d41d38c208.mod 151 BLAKE2B 9c1bc32114f742984396777149c3fad997bb47288dfe265614a1d17412ae3946581c2e60ff9ab87e784d71cfbe423b7ed1ea5864b6cd3f81f35e9103c8c08a00 SHA512 431b8d4756fe79e43cdc2f8478f3171ac9c90912222e50503301fc83d34c90001fb6ee0fee3bc05f66e47d657977395769e54efa0fb74ba35f34429cc0dac5c3
DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.1.mod 151 BLAKE2B 260f1bb3e48b0bf9870ea3b725b13f84d2f18a12c6ca1275afcc2897bef547fcc1e893bd6b1efd46330bc1de66a00e3ef133a4418a50a075302aa3141abed8e5 SHA512 b6d7911148c590b3ce2a14a158cfbb94dd56dd402b3a4a2399adcd0421604f85d904244ddf5f8dba65326f04a7817d5652b30a306c65f44fd248ed269485a21c
DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.2.mod 151 BLAKE2B efe8a8f8394f082a813ed4983158ada7bcd20f92f9f8b9b0d0e61e8dbb968b3c825432ae05d69c9b61a04ad57533c1e60438d9a1964312d4c9168f86864ba2d3 SHA512 2df7aaf6cb36a18165dc458a7b3f4158e2bce3bf10165418de401dd43e06d44378511dd4fea6530cb668a8ebb17b4c3f294ba35f5018e6aeb1b7b9082aac8a84
@@ -46,6 +47,12 @@ DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.1.mod 40 BLAKE2B c717b6aaf18662c20
DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.1.zip 99651 BLAKE2B 14632f8da685fecc046b2cc9e61eecca02e7bd4720ebb1d3cd01a299e59d47cc604abc57d5518e18dea69785e3d5d539d87da211279e238a78dd23e3d7f8c7bd SHA512 4b47aa3677a464af17f3e320f41f59e775b45f04cabf2cf749e00ba1aa97e27ee78a07daad347bac4b5c41e2c430634fba57c6edbcd7ad405b5a084142871362
DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.mod 105 BLAKE2B ffd22df03c1b351fb766a97818d46cc6aebeef365632d5263c90cf45a4acffdf5811da10ea2cd4747bc9691f74661c0b655961a065ed15a0194eeb4d1d12ca9b SHA512 cb203760fc6ca9c9d64811cf1342752faa5a95f27934c298407dc865f9561081210dd1b82b15ee2f5337b70d4c55d102d8884b5b9a5f70d9cbf85227a32b9713
DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.zip 105396 BLAKE2B 8b45b030824cf6ad208a00e36c7098b59e89c2725702926092baa11e82bd395d52b5daf26af57cd5edb01bee6ac2b8c4e3379e357e3a6cef69550d9403090c53 SHA512 bd13e72e46a82b149661a61dfc36dc6e0471dd4161f2291f301e871811e5b2a7976a49cf2af10eee1b7b2f6ad68583c240cba007ec163cea157f24bbe51d3b3a
+DIST github.com%2Fgoogle%2Fgo-github%2F@v%2Fv17.0.0+incompatible.mod 35 BLAKE2B 87a5884f51a766419a5bfaca4d6b317f2e86680e7347d29dba287e4c2004db6b8a8afcb2b2b8145cc3f9a502b768105eab89ba0f3e99db44427fd3eab9d3ac8c SHA512 6d285a58dc91fb57f990b76b3c2634247bee990ec1bb3e0f11b19fe1edb3b9b1998030def12b20a6f05c574965ddcefda6883121f5aae70c695e031e72425178
+DIST github.com%2Fgoogle%2Fgo-github%2F@v%2Fv17.0.0+incompatible.zip 347066 BLAKE2B 5ef49f931c987f9a24880afbd3ca231093bb43f0c059df9110c38ffe3ad54c4de3851cc36cc9af15b49112462cc164b0812c8872d5fb2d61d0cf751040213762 SHA512 3a24fd40eec7d23c69143355338019544fcc935b01f63f604419a5d7b5f1222e89de7e28dc86454e57e262f9bee5e4333395f3b8d7392c6e87b7e8c442e05709
+DIST github.com%2Fgoogle%2Fgo-github%2Fv31%2F@v%2Fv31.0.0.mod 362 BLAKE2B 66fd257666d0d7445f79d6aeaf7c31768b4b8f9392b9b30c498d261dbc87c08b48456e3fffd7aada41720eff4ad51e5c9cd6186fdc1ef573c4c5fd71fd7e80d3 SHA512 865ae58366e25fedc575873957948850cdb37bc96d2628c6e4f2137b1d4ac61daf98d03b065eb45eb7006a9e8df11ca851880da112baac124aec859720c0bcd2
+DIST github.com%2Fgoogle%2Fgo-github%2Fv31%2F@v%2Fv31.0.0.zip 436062 BLAKE2B 5d33498a4a42ac99b348d1886ca23941b7b47551c2effb5fe8a78ce93fd42a12f6d3863cc457b03e94b2239a71ed6325b76dc4512d00cde3d2d00ed562bb94a1 SHA512 c4c791528941b0a0a5f24a355e6d26e74595b34a28111f37f84ba5d4265be5ad4809806cd2540941e97bc5c398825e73cde44d039aff6268dc529f9237109c9c
+DIST github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv1.0.0.mod 40 BLAKE2B 081291e204018d8256655052c8f518c8d489818e899a6932325f2efe7a33dd7228f1bab1fe31f190c2cd1a022b8f320c2a779910231122de430bdb6c196ca95e SHA512 b47c833f93e2d2f9746276fb7608dfe01295cead6b0c9cad36863e9c6da80e3abe8e7d79afb113fe382f73b641fcfd717090a8d6ca2d94bf2807fec07cd57574
+DIST github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv1.0.0.zip 9151 BLAKE2B 853a982f1c3b2b60fb44e3da969f7cdbeb6e5214c549e47dee57329a9c93c8786bcb2af6e3aab5f7aacf0bf0c70beb26f95c42b796cc2cff5b9b825040cf5a11 SHA512 e13c7622fe1c4ba73fe147255c02d6828f5d5deaea74ee14a97dd689819547b913caef4721838a68490991c710156307cf0487866d200021cf9d774a4600e52e
DIST github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.mod 36 BLAKE2B e3101c1f32c24b5d5bd3de55b4f15645e7f0b338cdcfa00d30cc4c063bf4e9e31e68972979e8282d04920ffcb54f112c8c8f6e0e109824e56881a6a699cdf622 SHA512 2b68ca06311d8602f04eb738a68a24951a9187aa70018d938e549cf7b555bf54dadbda5825501436c52f6103bcd220ed170c99e4cf777187e2b997c87f05fb0d
DIST github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.zip 9306 BLAKE2B 1172cbdefac5f63dc5dc155b38f1f6e63bafdcc4a9ec057c3714a93251fa88d9cf29aae780587b13dd4eb4af10fde2dd305c4ff774bd843068726c05861ccc4a SHA512 fcecaaf6496b11fb35d01da0d3375508c978b0a319d344c61f77539be199f1f13ed892f2019d5b6d8ee1603c576064203ab87e235bab4b0bcb96d28f9e16e88d
DIST github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.1.0.mod 96 BLAKE2B ada026bc3e6104973cb7900d638acb7976ee8301e98cea55548fc800d8954997b666d0c605dcf1de0f639932c8834bd13e8f8512e74529a818d3de978f0163d4 SHA512 7276c308f91ed52579965e7e83e839351f2170cef2b58ef67887d5eb926dd21fd502f98ddc84ca8e6f16c81171490c1e2d9a131569b5d6d56a1e2ba28f227451
@@ -115,9 +122,11 @@ DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190701094942-4def268fd1a4.mod 146 B
DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190701094942-4def268fd1a4.zip 1825995 BLAKE2B 043e1f926e0ae47ededfa2ced40e95fe6c564122b2e2a64ed631f3bd4dc52c8ccf5b5bd4641d17ed996875dc1e64ca8edcb6f02dca34be178e611cee74e4ce7d SHA512 a596a5c0e3ae5fcf366d84dddc7b884fb72d6dd89dbadc79f9ac2cea397f2795ba3ea5408cfcb75f248ddb18c9774ac7f55d0e355f1be1468812565c5403fa5c
DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200423211502-4bdfaf469ed5.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200423211502-4bdfaf469ed5.zip 1874180 BLAKE2B 20899757b255a90730b8f62f656f6edd1f41539f3e6b5ff1034d274b0f47ca81b862072b9a619120befd2a3260e8b7f84aeb80b51aeb126d5f2ff5f3bb843ecb SHA512 e04eeee38e8ab6ce597d4a342c71823940cc227ce5eab7c245b7035c194ac1bcd33472f1f07ffd125dd3fed59e878fb95857ff93ce90dcd49d26bcbe77d22a64
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190311183353-d8887717615a.mod 119 BLAKE2B e042b2716739483252c3340451b2c3c7b421fdf8d6b3e0333e979802fca66159596982ea63a24b6a64457b2757a0ad24cbb9ea032bab4c5377edf84a3ea18b97 SHA512 26b6c92eecd2208967336d4d23f8a71f77f9a73643ad1e5cd84dee36b2f626fffc806e4dd33acc284831a0961e2b363d898a747903235945fbfb665c5b4d5ef2
DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod 119 BLAKE2B e042b2716739483252c3340451b2c3c7b421fdf8d6b3e0333e979802fca66159596982ea63a24b6a64457b2757a0ad24cbb9ea032bab4c5377edf84a3ea18b97 SHA512 26b6c92eecd2208967336d4d23f8a71f77f9a73643ad1e5cd84dee36b2f626fffc806e4dd33acc284831a0961e2b363d898a747903235945fbfb665c5b4d5ef2
DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200421231249-e086a090c8fd.mod 181 BLAKE2B b45bdd8d5412dfa50e483e0e3431a133435aa68b1225e66fce0f2ef80f2e9d40a9f56a47d5f2faede1624fe05c80fe97c7cd56dd9a6b56ad91315cfbcf9638db SHA512 0c6baecc550358cbc908d994f81f786e62f619b197d4ba0ca5af19eb2ddf243d7f36c6174634b65e205fa5ed3b9c3393d1677c0a57c2b99ddcb252b935a2dc70
DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200421231249-e086a090c8fd.zip 1500505 BLAKE2B aed582fa92d06c76e5c250a9eaf7645b4147d384422e263ecff6136b660dd2af8a40cdf539b9966059e754301afed01b3fcf59d2680ed88bc438d6297a44d7b3 SHA512 7cfa0dc01fa55ff83d10087ddc6358e2e7021d1a8a27393f5778607cf3dfe0c31363676e1663ab4ee485273e580d6f92a486ea62d5944892104f13cac5080b82
+DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20180821212333-d2e6202438be.mod 27 BLAKE2B 078fc99b981406f4ee3f8da94c83954e80619e76ea63cf6323f27614bbcb870bb650eb5ffaac865a374f3ed0ef0619d97e11f05924c92e395e72cb73f28630e6 SHA512 53431e560b5d6a9b50f44997ef6755f71741ccca155767dd954da41f11f53a3e8d01d7e01a2bb9de1fdd551dd2e734cb65e5641cf5de5c9a8a6a25a4894336f5
DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190222072716-a9d3bda3a223.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190412213103-97732733099d.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
@@ -134,6 +143,7 @@ DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.zip 7430601 BLAKE2B d2403817cb6b7e32462
DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0
DIST golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.mod 37 BLAKE2B 7449be81e1998a6439070de1a0ddf5bfd1e4971c90c2e358590a9c1c41128bfc1daa42a9bbc3709506df2442ec8420e6354343a095c837be46335c180083f28a SHA512 659d18a7a3a1be45ff6dc9e7475276b82ee7f11c47d39b0c237d7f872836a1dbdfff0902f21d6cd8093663997865da92e3e5a4acf1ad6129f972dc5e667b4f05
DIST golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.zip 22282 BLAKE2B 68df6b35d9043f23df13432b80074544f46833467294955ae5706713055d0cc9ababda892853c14e99c80a3571fd4a807a019a098fdd2ca695ba90c577ead5c4 SHA512 c72b8b73f89624889a2874c1b2445cb82f0e545fccf6a7761a278f3f659eb19f5f1c8585641b8f89f2bcfc3817ad2c0e267751cfeeab949e287e43af5df57e28
+DIST google.golang.org%2Fappengine%2F@v%2Fv1.1.0.mod 35 BLAKE2B 24fb6ba95138448c45da7f1ecc4c87391485006b54b8e7ff96ec582c2659f9ea77574b4d5fef2442eff9e5564f3c3263ed8e6963c5d21cde8772a7143d82f3ed SHA512 6644c398d639794470e49cad4402d17765422934915b5a13e13e1f84d8890cc8fad9e6ea8c580d114aefea70d894242e05ce3a432ee596f772b98b6b73069fe2
DIST google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200109180630-ec00e32a8dfd.mod 83 BLAKE2B 4cef0579e4d6b156c1af532343070021171ead815734fe1210a0be6a8ba9bc5f3d11b97ee14cde810f2556bca76c206520f56363ee82af7409772d33301e413d SHA512 3cb3393e78f44d9de80074244756d5e309d19adca15e8313a392b925a687edad46e93c612da1539dc09d0c0072a063eede6f04fbd9e5671059e9857da0f7b1e6
DIST google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200221191635-4d8936d0db64.mod 128 BLAKE2B 79cca062b7c73fedaa5357b7b43af16adc1ef83a86be48787887ec450e022d31e0700b7ca4cf5dca03bf2ad9db79727da0fbb89c73bdb006db6b68d75c3e1751 SHA512 bf45db2ba4ae10b447c471118551d337125d5432142f5aa4ba964054d09393730c23373e42eb34574ca93f9b1a12364669be13ba7faa7d9908cacb982984d414
DIST google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200228230310-ab0ca4ff8a60.mod 158 BLAKE2B 8cafd0a40647244f2dd1d3d3da7ef8e376c6eb3823fca68d7aeb041d480e1147b70b70c49c65e47ff1e9b92eba026a109c67c7900da88cf8569ebd037912a35c SHA512 7d00ab108b35ba41ed8c6ad54533bbbd967e0cdf39e62cb8914c0c6e4a531c779a28ea3fb2a4a7f6f4af7f3c922246a8d8ec8eabb779758245cedbebfdd97378
@@ -141,7 +151,7 @@ DIST google.golang.org%2Fprotobuf%2F@v%2Fv1.20.1-0.20200309200217-e05f789c0967.m
DIST google.golang.org%2Fprotobuf%2F@v%2Fv1.21.0.mod 158 BLAKE2B 46e19153fe487751cddafb86818a962b621b10c109e513ef22e7f5c93b44dd94c6a1636e6c03d0db6e5099536901821549859bcf84f06c00483637d5d4284c43 SHA512 4797f4305d5b0159aba0825c0432cc5678cb74e55cd95eb5c42e9879a62db5aefa76c6286a436aee9a31b096193e8a3bc2e67175f0296c9d5eca3d03e98ab2d9
DIST google.golang.org%2Fprotobuf%2F@v%2Fv1.21.0.zip 1456574 BLAKE2B 4957a5322065e982e12220a4eae758cca1626e9e158222acba41df0bf5fffaa8256e4efc832d90c4853d29b46fdbc8f4af9702f51cac93f92d25fa0f4d7cd603 SHA512 739d87735445d8c7bc877774ad0400570a3bbb67216100fd7edab615f11087225dda48fd16be53f7e6535c16f1cd686716c262567954e8ffc052b11125bcfb13
DIST gopass-1.8.6.tar.gz 7072723 BLAKE2B 5ae883c54f8180f8b6da870bd99710f1c740afe9de193c127a3047fa1211641b94ab98e23148d83c6d5b2cd2e3275f644dc875d106c9267e7e0c6342bf0b9a46 SHA512 7acdb095cf8913954044c3206eab020f197542334798c6b94724709c3953b12f7e5b73ce8c1aa4bfd5df3acf1f424b64bfa94f9a8f68fa7116ed14c8a0f2e6f0
-DIST gopass-1.9.0.tar.gz 406187 BLAKE2B 0764ec3d28e1ae2e1c4e8568db903edb93d8c612295b3ae0a06a7a987b11aa0961e50ba4eafce6495872786f57e35a7dbe4cf8fbb3d73550bbe1f29ba47b16f5 SHA512 5f0dbc42bcdbb5acdb36806b24cc607115eb403e3ca5268818590dccf23e62f5337e570b77c5fadd42e9b508fb419b51603a6cb6bb4abe6d9fa334c9710d61ca
+DIST gopass-1.9.1.tar.gz 418562 BLAKE2B 9db44fcffd8728763364dfbb508565aa30b6b31ab930d65cc8cf9adcde9c26a6dbca5232c6027eac0316e78957f3fa0f5a10f75d24801b6faec283ab51b67a22 SHA512 a70affc278b5d46582a3362c28f1aff8be4481aae3d07f3b7e200117fc2ac79466c475d558fe5a642b0102a46fc95242334f406deca6ee4abd7d5e9f674451ab
DIST gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod 25 BLAKE2B 6470f3d94700c4d8b3176d692bdb91646750f2c6a866ff2ef4183aff1de01f024a8757f97b4626ec0355092e5f25e7ded91cd5be845f627d107c58b1daf400d7 SHA512 9ac0f80ef05881387cb2f48f81560f3207fe586ea16495383662e6d62e43d93fac01dfe72e1d0063d3ab065331dab3a8098d7da4f1830ba1aff6f27f8e1bc1b2
DIST gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20200227125254-8fa46927fb4f.mod 25 BLAKE2B 6470f3d94700c4d8b3176d692bdb91646750f2c6a866ff2ef4183aff1de01f024a8757f97b4626ec0355092e5f25e7ded91cd5be845f627d107c58b1daf400d7 SHA512 9ac0f80ef05881387cb2f48f81560f3207fe586ea16495383662e6d62e43d93fac01dfe72e1d0063d3ab065331dab3a8098d7da4f1830ba1aff6f27f8e1bc1b2
DIST gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20200227125254-8fa46927fb4f.zip 41484 BLAKE2B 34fbdc1525bbea7fc6b7f74e74ab407ed03d3b58e25e9b3b79ec35945acce36b7c4be54388c1244d508c7cf67ac6e4f1ff7c9eb5245f01ff27dec82cfe87bdb8 SHA512 713c79551d48a99cc9feed3bcf71b7f1fe95270701787dfb114237bd358ad104d18ce7ca412f65d1ce6b7f94ffb6c01afe28c9b821e1a5378b05c93340aa8a49
diff --git a/app-admin/gopass/gopass-1.9.0.ebuild b/app-admin/gopass/gopass-1.9.1.ebuild
similarity index 94%
rename from app-admin/gopass/gopass-1.9.0.ebuild
rename to app-admin/gopass/gopass-1.9.1.ebuild
index d180e373d713..2dfec7c7afb0 100644
--- a/app-admin/gopass/gopass-1.9.0.ebuild
+++ b/app-admin/gopass/gopass-1.9.1.ebuild
@@ -42,6 +42,7 @@ EGO_SUM=(
"github.com/godbus/dbus v0.0.0-20190623212516-8a1682060722/go.mod"
"github.com/gokyle/twofactor v1.0.1"
"github.com/gokyle/twofactor v1.0.1/go.mod"
+ "github.com/golang/protobuf v1.3.2/go.mod"
"github.com/golang/protobuf v1.4.0-rc.1/go.mod"
"github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod"
"github.com/golang/protobuf v1.4.0-rc.2/go.mod"
@@ -54,6 +55,12 @@ EGO_SUM=(
"github.com/google/go-cmp v0.3.1/go.mod"
"github.com/google/go-cmp v0.4.0"
"github.com/google/go-cmp v0.4.0/go.mod"
+ "github.com/google/go-github v17.0.0+incompatible"
+ "github.com/google/go-github v17.0.0+incompatible/go.mod"
+ "github.com/google/go-github/v31 v31.0.0"
+ "github.com/google/go-github/v31 v31.0.0/go.mod"
+ "github.com/google/go-querystring v1.0.0"
+ "github.com/google/go-querystring v1.0.0/go.mod"
"github.com/hashicorp/errwrap v1.0.0"
"github.com/hashicorp/errwrap v1.0.0/go.mod"
"github.com/hashicorp/go-multierror v1.1.0"
@@ -123,9 +130,11 @@ EGO_SUM=(
"golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod"
"golang.org/x/crypto v0.0.0-20200423211502-4bdfaf469ed5"
"golang.org/x/crypto v0.0.0-20200423211502-4bdfaf469ed5/go.mod"
+ "golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod"
"golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod"
"golang.org/x/net v0.0.0-20200421231249-e086a090c8fd"
"golang.org/x/net v0.0.0-20200421231249-e086a090c8fd/go.mod"
+ "golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod"
"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod"
"golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod"
"golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod"
@@ -142,6 +151,7 @@ EGO_SUM=(
"golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod"
"golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543"
"golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod"
+ "google.golang.org/appengine v1.1.0/go.mod"
"google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod"
"google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod"
"google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod"
diff --git a/app-admin/keepass/Manifest b/app-admin/keepass/Manifest
index 022fd5fc18a8..847d764b1bc8 100644
--- a/app-admin/keepass/Manifest
+++ b/app-admin/keepass/Manifest
@@ -1 +1,2 @@
DIST KeePass-2.44-Source.zip 5182922 BLAKE2B 092d1b982d748ea1b13f26fe5423a491855cb491c80cae7632429d488f80fd730df5d2f1613bab528d55a3aadcf0cb4f4055a637d2b14b68a468e4baf9ab1837 SHA512 ef2ca69e40c0787b63fc30a2b222dd77fd9f0addf8593511dcd0a47580cc8de5e0900c7d4e6f77c0e5a49d1728286cf1b5856cdc65ef175e4acfdd1ffc54b55e
+DIST KeePass-2.45-Source.zip 5011684 BLAKE2B cf7fafb2666f2e0005533e441f1855006aa64aca69b4829fa66117da88f92e6aa65d58b303a099221e796a500bc5abab5c3d0654e6fa53c3fe6f36d3cb18e381 SHA512 3f9b14e57fce047f8d8ae7c289fffd954545c5638fa20392e7864301073452a4353f487832730fb600e1729b1333360c1bce7e66fc8629788e666418a2afbf9a
diff --git a/app-admin/keepass/keepass-2.45.ebuild b/app-admin/keepass/keepass-2.45.ebuild
new file mode 100644
index 000000000000..db354f613661
--- /dev/null
+++ b/app-admin/keepass/keepass-2.45.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop eutils xdg-utils
+
+MY_PN="KeePass"
+DESCRIPTION="A free, open source, light-weight and easy-to-use password manager"
+HOMEPAGE="https://keepass.info/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_PN}-${PV}-Source.zip"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="aot"
+
+COMMON_DEPEND="dev-lang/mono"
+DEPEND="${COMMON_DEPEND}
+ app-arch/unzip
+"
+RDEPEND="${COMMON_DEPEND}
+ dev-dotnet/libgdiplus[cairo]
+"
+
+S="${WORKDIR}"
+PATCHES=( "${FILESDIR}/${PN}-2.36-xsl-path-detection.patch" )
+
+# bug #687052
+# file generated by mono --aot where *FLAGS don't make sense
+QA_PREBUILT="usr/lib64/keepass/KeePass.exe.so"
+
+src_prepare() {
+ # KeePass looks for some XSL files in the same folder as the executable,
+ # we prefer to have it in /usr/share/KeePass. Apply patch using base function.
+ # This XSL file will not be upstreamed since the KeePass creator said that
+ # including this patch would break the Portable USB version of KeePass
+ # (which keeps/looks for xsl files in its own folder)
+ default
+
+ # Switch into build dir so the mono prepration script works correctly
+ pushd Build || die
+ source PrepMonoDev.sh || die
+ popd || die
+}
+
+src_compile() {
+ export MONO_REGISTRY_PATH=/dev/null # bug 659808
+
+ # Build with Release target
+ xbuild /target:KeePass /property:Configuration=Release || die
+
+ # Run Ahead Of Time compiler on the binary
+ if use aot; then
+ cp Ext/KeePass.exe.config Build/KeePass/Release/ || die
+ mono --aot -O=all Build/KeePass/Release/KeePass.exe || die
+ fi
+}
+
+src_install() {
+ # Wrapper script to launch mono
+ make_wrapper "${PN}" "mono /usr/$(get_libdir)/${PN}/KeePass.exe"
+
+ # Some XSL files
+ insinto "/usr/share/${PN}/XSL"
+ doins Ext/XSL/*
+
+ insinto "/usr/$(get_libdir)/${PN}"
+ exeinto "/usr/$(get_libdir)/${PN}"
+
+ doins Ext/KeePass.exe.config
+
+ # Default configuration, simply says to use user-specific configuration
+ doins Ext/KeePass.config.xml
+
+ # The actual executable
+ doexe Build/KeePass/Release/KeePass.exe
+
+ # Copy the AOT compilation result
+ if use aot; then
+ doexe Build/KeePass/Release/KeePass.exe.so
+ fi
+
+ # Prepare the icons
+ newicon -s 256 Ext/Icons_04_CB/Finals/plockb.png "${PN}.png"
+ newicon -s 256 -t gnome -c mimetypes Ext/Icons_04_CB/Finals/plockb.png "application-x-${PN}2.png"
+
+ # Create a desktop entry and associate it with the KeePass mime type
+ make_desktop_entry "${PN}" "${MY_PN}" "${PN}" "System;Security" "MimeType=application/x-keepass2;\nStartupWMClass=KeePass2;"
+
+ # MIME descriptor for .kdbx files
+ insinto /usr/share/mime/packages
+ doins "${FILESDIR}/${PN}.xml"
+
+ # sed, because patching this really sucks
+ sed -i 's/mono/mono --verify-all/g' "${D}/usr/bin/keepass" || die
+}
+
+pkg_postinst() {
+ xdg_icon_cache_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+
+ if ! has_version x11-misc/xdotool ; then
+ elog "Optional dependencies:"
+ elog " x11-misc/xdotool (enables autotype/autofill)"
+ fi
+
+ elog "Some systems may experience issues with copy and paste operations."
+ elog "If you encounter this, please install x11-misc/xsel."
+}
+
+pkg_postrm() {
+ xdg_icon_cache_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+}
diff --git a/app-admin/sudo/Manifest b/app-admin/sudo/Manifest
index 176ca77dd0f8..c1d0124be7b3 100644
--- a/app-admin/sudo/Manifest
+++ b/app-admin/sudo/Manifest
@@ -1,3 +1,3 @@
DIST sudo-1.8.31.tar.gz 3350674 BLAKE2B de5a968732fdd58933b4c513d13c43a08cb50075a00c3e0d338c9892570a416a2b3a8f19940c0893715f4eeab991e804831a87ef656ffd91e7f1ba047c119261 SHA512 b9e408a322938c7a712458e9012d8a5f648fba5b23a5057cf5d8372c7f931262595f1575c32c32b9cb1a04af670ff4611e7df48d197e5c4cc038d6b65439a28a
DIST sudo-1.8.31p1.tar.gz 3351312 BLAKE2B 85775ef574a3a1a9cc749809fe81f8350f7a4e3f46a905bc3392790b20bb7bc8e3c99fb504e01776f3a92aa6afa7972d3ff1c071aadd3a08ee1d2281f8b9ba50 SHA512 9344fd1d8a8445e8afb9c5628cdc832fe32ea29199f071f35fb6ec694371801556df560f4382afec199f468b1f3264ad5e3a89e964612e571b8d911f823724cc
-DIST sudo-1.9.0rc4.tar.gz 3744357 BLAKE2B 569b2e94cbe837d9d2418a6ef7e53484975821d0a3cd0281473b96ee44939c65d8cd9ffc43a00170a6bbc1001cf1e0b826768ada13b3c4c4b85c7c0366b14eda SHA512 e3925f9e0e5eaf426ab4629c772ad36ea97298064bebdf038a82b4db5a73e9191733c0c6d88c6a2aa1f5c8c6d1a0e17b67d8b97e3e384b7f0894be5ac7276e01
+DIST sudo-1.9.0rc5.tar.gz 3746417 BLAKE2B 35c6fdca69e28d6ca3a689a8772995d95842e34d0d2c76423699c163c0afb24f884b03e05c64a4f3cf66bf9631fc28f7933fe63006959a801c375d8238c8489c SHA512 9ae0f3c3d793e6b1f91cea13ec4d4d6058335f15399956c5eaf1093044eb565d1e04581678b8b7699e3f517086be1efadf1ef0454666656fb38d0f5de8645454
diff --git a/app-admin/sudo/sudo-1.9.0_rc4.ebuild b/app-admin/sudo/sudo-1.9.0_rc5.ebuild
similarity index 100%
rename from app-admin/sudo/sudo-1.9.0_rc4.ebuild
rename to app-admin/sudo/sudo-1.9.0_rc5.ebuild
diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index 95b350920dce..6b2bbe020ebf 100644
Binary files a/app-arch/Manifest.gz and b/app-arch/Manifest.gz differ
diff --git a/app-arch/zstd/zstd-1.4.4-r4.ebuild b/app-arch/zstd/zstd-1.4.4-r4.ebuild
index 16dcff4f9ba3..8c6ab8a0fd56 100644
--- a/app-arch/zstd/zstd-1.4.4-r4.ebuild
+++ b/app-arch/zstd/zstd-1.4.4-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/facebook/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="|| ( BSD GPL-2 )"
SLOT="0/1"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="lz4 static-libs +threads"
RDEPEND="app-arch/xz-utils
diff --git a/app-benchmarks/Manifest.gz b/app-benchmarks/Manifest.gz
index 61cf8159f564..8e50adf15229 100644
Binary files a/app-benchmarks/Manifest.gz and b/app-benchmarks/Manifest.gz differ
diff --git a/app-benchmarks/hey/Manifest b/app-benchmarks/hey/Manifest
index 837a02f5ca15..4541157faf06 100644
--- a/app-benchmarks/hey/Manifest
+++ b/app-benchmarks/hey/Manifest
@@ -1,2 +1 @@
-DIST hey-0.1.1_p20181017.tar.gz 446212 BLAKE2B b8d55e4f7efb34634b81b5301617c84aea66cb1fdbe973d45317a309b845d4503331618688feeaef2bb9effa82f6d155b68b813a4b5b4f17149245cb7f15b2ec SHA512 ccaf4ca2025ce4cbe10cbeb5d7a43903d7e15fdc20ed9623795bd3c11b0df510c3b51749c5e63502fb0fd3153f18a7d1b65297b11631b5889f719d0619602604
DIST hey-0.1.2.tar.gz 446073 BLAKE2B 5c5933f54f5895100ea0f5b08c84143d30fb02f1b2a5cf1209a41b271d18dbf41ce24bf35fdc9846d04173e620e584e1afd8f0b3e8e7a9cd8d6d8e2aa85fac67 SHA512 21b7b2ddee84c2dd144a7bca44ea2c24dcfe5a6e41f8ad388a1099ec42b83789748906c2d405b774aefbdffd5cb90e045219f6ee39a9837adef5b57c5f0b2e3a
diff --git a/app-benchmarks/hey/hey-0.1.1_p20181017.ebuild b/app-benchmarks/hey/hey-0.1.1_p20181017.ebuild
deleted file mode 100644
index c01847f7edca..000000000000
--- a/app-benchmarks/hey/hey-0.1.1_p20181017.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGO_SRC="github.com/rakyll/hey"
-EGO_PN=${EGO_SRC}/...
-EGIT_COMMIT="01803349acd49d756dafa2cb6ac5b5bfc141fc3b"
-
-inherit golang-build golang-vcs-snapshot
-
-DESCRIPTION="HTTP load generator, ApacheBench (ab) replacement, formerly known as rakyll/boom"
-HOMEPAGE="https://github.com/rakyll/hey"
-SRC_URI="https://${EGO_SRC}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-LICENSE="Apache-2.0 BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-RESTRICT="test"
-IUSE=""
-DEPEND=""
-RDEPEND=""
-S=${WORKDIR}/${P}/src/${EGO_SRC}
-
-src_compile() {
- GOPATH="${WORKDIR}/${P}" GOBIN="${WORKDIR}/${P}/bin" GO111MODULE=on \
- go install -mod=vendor -v -x ${EGO_BUILD_FLAGS} "${EGO_PN}" || die
-}
-
-src_install() {
- dobin "${WORKDIR}/${P}/bin"/*
- dodoc README.md
-}
diff --git a/app-benchmarks/hey/hey-0.1.2.ebuild b/app-benchmarks/hey/hey-0.1.2.ebuild
index 639ee500ec44..97ae05a22bba 100644
--- a/app-benchmarks/hey/hey-0.1.2.ebuild
+++ b/app-benchmarks/hey/hey-0.1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -18,7 +18,7 @@ RDEPEND=""
src_compile() {
export -n GOCACHE XDG_CACHE_HOME
- go build -o ./bin/${PN} || die
+ go build -v -x -mod=vendor -o ./bin/${PN} || die
}
src_install() {
diff --git a/app-benchmarks/wrk/wrk-4.1.0-r1.ebuild b/app-benchmarks/wrk/wrk-4.1.0-r2.ebuild
similarity index 84%
rename from app-benchmarks/wrk/wrk-4.1.0-r1.ebuild
rename to app-benchmarks/wrk/wrk-4.1.0-r2.ebuild
index 37187a92ca5c..23ba20045cbb 100644
--- a/app-benchmarks/wrk/wrk-4.1.0-r1.ebuild
+++ b/app-benchmarks/wrk/wrk-4.1.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -14,15 +14,23 @@ LICENSE="Apache-2.0 BSD MIT"
SLOT="0"
IUSE="libressl"
-RDEPEND="
+CBUILD="dev-lang/luajit:2"
+
+DEPEND="
dev-lang/lua:0
- dev-lang/luajit:2
libressl? ( dev-libs/libressl:0= )
!libressl? ( dev-libs/openssl:0= )
"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
+RDEPEND="
+ ${CBUILD}
+ ${RDEPEND}
+"
+
+BDEPEND="
+ ${CBUILD}
+ virtual/pkgconfig
+"
DOCS=(
"CHANGES"
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index 12cb59146120..7158dd806722 100644
Binary files a/app-crypt/Manifest.gz and b/app-crypt/Manifest.gz differ
diff --git a/app-crypt/cfssl/Manifest b/app-crypt/cfssl/Manifest
index e81cd19c9060..dfe0138b7adb 100644
--- a/app-crypt/cfssl/Manifest
+++ b/app-crypt/cfssl/Manifest
@@ -1,4 +1 @@
-DIST cfssl-1.3.2.tar.gz 6867118 BLAKE2B 775b3419ecf878d9add13faf03a3e1d4cca7b30d965f1ca55c8faa5abf679188a1ea1f80c1416f19c85bc551395628a31da8669ca647e1c1e7a1a313d68f4c7b SHA512 aba27a282c8ca8e95769996aea7e5300b0c3f8fea7ae26484d19a7e1a0330f0b3a0649407062f1a10e8c93136693954e3b24c92456f69db3abee509f982ba554
-DIST cfssl-1.3.3.tar.gz 5005924 BLAKE2B 81e7ec1f27a6597d69f16254a5ded672b9b3ac0bc8dee0f5bb00939e86147b1ed0389d38ea406fe671f3de052ac2e88fe320ffbf6065a83c2d9627ac3c497740 SHA512 39b42f3f8c22e254fa8ed4079308ecad1b0f77cdb56e57099e434389866e58863687307d6cf0f5ec8e4664ad4743ee8728f47a6a1375f3f74f8206a709f0ffc3
-DIST cfssl-1.3.4.tar.gz 7092440 BLAKE2B 85a7a73ae5b18ae0e4ac02b1a4d5f633d73f2c0f81cb49ef85c39b6a241ac538220a8cebb448af795140a6308f46f6e53003f25a31edad452cb6db39ff95a9b2 SHA512 796f24f9a7cd9966b3586b5b08deb410570cc31ec747b0c834215c105df1b4fea4907bfa223d196ad71fb296724dc690b6ffd298c8ef81db1333ed3e69f1ecd4
DIST cfssl-1.4.1.tar.gz 5736648 BLAKE2B 581627eb269fcbbbe9ff3afe558c6ddc7afa10f563444899244045baa0ae195d8822b389e7c59bec6c9135b1159b18d2a5e497c83cd26eaa47a3a87de23ce694 SHA512 0aa557708a300e2eaf48a99d55794069530b6842584cdd867a864272b205c89d5abc2acf3a19d34b3b5519a6429b5f55685129638e65d574ad6afe5b7e1e1e8f
diff --git a/app-crypt/cfssl/cfssl-1.3.2.ebuild b/app-crypt/cfssl/cfssl-1.3.2.ebuild
deleted file mode 100644
index 79ee3c130db1..000000000000
--- a/app-crypt/cfssl/cfssl-1.3.2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGO_PN="github.com/cloudflare/${PN}"
-inherit golang-build golang-vcs-snapshot
-
-SRC_URI="https://${EGO_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="amd64"
-
-DESCRIPTION="Cloudflare's PKI and TLS toolkit"
-HOMEPAGE="https://github.com/cloudflare/cfssl"
-LICENSE="BSD-2"
-SLOT="0"
-IUSE="hardened"
-
-RDEPEND="!!dev-lang/mono" #File collision (bug 614364)
-
-RESTRICT="test"
-
-src_compile() {
- pushd src || die
- CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" GOPATH="${S}" go install -v github.com/cloudflare/cfssl/cmd/... || die
- popd || die
-}
-
-src_install() {
- dobin bin/*
- pushd src/${EGO_PN} || die
- dodoc CHANGELOG README.md
- popd || die
-}
diff --git a/app-crypt/cfssl/cfssl-1.3.3.ebuild b/app-crypt/cfssl/cfssl-1.3.3.ebuild
deleted file mode 100644
index 64942d2fca9b..000000000000
--- a/app-crypt/cfssl/cfssl-1.3.3.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGO_PN="github.com/cloudflare/${PN}"
-inherit golang-build golang-vcs-snapshot
-
-SRC_URI="https://${EGO_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Cloudflare's PKI and TLS toolkit"
-HOMEPAGE="https://github.com/cloudflare/cfssl"
-LICENSE="BSD-2"
-SLOT="0"
-IUSE="hardened"
-
-RDEPEND="!!dev-lang/mono" #File collision (bug 614364)
-
-RESTRICT="test"
-
-src_compile() {
- pushd src || die
- CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" GOPATH="${S}" go install -v github.com/cloudflare/cfssl/cmd/... || die
- popd || die
-}
-
-src_install() {
- dobin bin/*
- pushd src/${EGO_PN} || die
- dodoc CHANGELOG README.md
- popd || die
-}
diff --git a/app-crypt/cfssl/cfssl-1.3.4.ebuild b/app-crypt/cfssl/cfssl-1.3.4.ebuild
deleted file mode 100644
index 64942d2fca9b..000000000000
--- a/app-crypt/cfssl/cfssl-1.3.4.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGO_PN="github.com/cloudflare/${PN}"
-inherit golang-build golang-vcs-snapshot
-
-SRC_URI="https://${EGO_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Cloudflare's PKI and TLS toolkit"
-HOMEPAGE="https://github.com/cloudflare/cfssl"
-LICENSE="BSD-2"
-SLOT="0"
-IUSE="hardened"
-
-RDEPEND="!!dev-lang/mono" #File collision (bug 614364)
-
-RESTRICT="test"
-
-src_compile() {
- pushd src || die
- CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" GOPATH="${S}" go install -v github.com/cloudflare/cfssl/cmd/... || die
- popd || die
-}
-
-src_install() {
- dobin bin/*
- pushd src/${EGO_PN} || die
- dodoc CHANGELOG README.md
- popd || die
-}
diff --git a/app-crypt/ophcrack/Manifest b/app-crypt/ophcrack/Manifest
index 823ea2bfcb15..aa3a0de8f66a 100644
--- a/app-crypt/ophcrack/Manifest
+++ b/app-crypt/ophcrack/Manifest
@@ -1,3 +1 @@
-DIST ophcrack-3.6.0.tar.bz2 288830 BLAKE2B bc2782d08cb84df24b745fdf0e9723e058da614b73a8d25dfe77cfa2ce291eaf8abd83006a9a410f80bdd240eb81fc402d6d5ebd1c9b92b5a7f1785a203c0c7a SHA512 caa9090b622acac1114f5635c2c58a2c32453ae21a96fc4f424cbc197b056872c282cf9d41142e316a1ffbc9523832b8bc7355c1503c15ac8579470de407a5c9
-DIST ophcrack-3.7.0.tar.bz2 294045 BLAKE2B f506d29b27b4b90eadfd4d650512aea54db4228c4c63b90827a7957b544ab59dae757fc521fe62ab3be55d97e483ddde2aea9ad08c96b77d156e863a61f26312 SHA512 27e73979ca3d733629b9b34c490488cc27140efb8b90d266f270c0b95572cf40319a3fb658c02448fc7a3b825cf05c18a69f5d91bd0656d8410a30645f8dc8c6
DIST ophcrack-3.8.0.tar.bz2 293033 BLAKE2B f20bf79d5cafffaab0667b073e8d9dbcfbae0a16f4139b6304c3f6fc80a24f6ca673db9cd53e28ff277ec35821539f3960265aa28467795e25c45049acca3f31 SHA512 c66276b72299744d3e0c9fc14220c7f568e383bd324c1ede228bda5d51da78db817388421c9f5f8cd2f18687e7e53cfb0c65bcc0354b3d55ac16324c61f62dbd
diff --git a/app-crypt/ophcrack/files/ophcrack-ar.patch b/app-crypt/ophcrack/files/ophcrack-ar.patch
new file mode 100644
index 000000000000..422c17398d20
--- /dev/null
+++ b/app-crypt/ophcrack/files/ophcrack-ar.patch
@@ -0,0 +1,13 @@
+diff --git a/src/common.mk.in b/src/common.mk.in
+index 0f090a8..9c133e0 100644
+--- a/src/common.mk.in
++++ b/src/common.mk.in
+@@ -32,7 +32,7 @@ OBJECTS = $(SOURCES:%.c=%.o)
+ all:
+
+ %.a:
+- ar r $@ $^
++ $(AR) r $@ $^
+ $(RANLIB) $@
+
+ %.o: %.c
diff --git a/app-crypt/ophcrack/files/ophcrack-openssl-des.patch b/app-crypt/ophcrack/files/ophcrack-openssl-des.patch
deleted file mode 100644
index 2515c178abb7..000000000000
--- a/app-crypt/ophcrack/files/ophcrack-openssl-des.patch
+++ /dev/null
@@ -1,92 +0,0 @@
---- a/src/lmtable.c 2013-06-04 07:42:47 UTC
-+++ b/src/lmtable.c
-@@ -470,8 +470,8 @@ void lmtable_mkredux(table_t *tbl, uchar
- /*-------------------------------------------------------------------------*/
- void lmtable_mkhash(uchar_t *pwd, uchar_t *hash) {
- uchar_t key[8];
-- des_key_schedule ks;
-- des_cblock *magic = (des_cblock*)lmmagic;
-+ DES_key_schedule ks;
-+ DES_cblock *magic = (DES_cblock*)lmmagic;
-
- key[0] = pwd[0];
- key[1] = (pwd[0] << 7) | (pwd[1] >> 1);
-@@ -482,7 +482,7 @@ void lmtable_mkhash(uchar_t *pwd, uchar_
- key[6] = (pwd[5] << 2) | (pwd[6] >> 6);
- key[7] = (pwd[6] << 1) ;
-
-- des_set_odd_parity(&key);
-- des_set_key(&key, ks);
-- des_ecb_encrypt(magic, (des_cblock*)hash, ks, DES_ENCRYPT);
-+ DES_set_odd_parity(&key);
-+ DES_set_key(&key, &ks);
-+ DES_ecb_encrypt(magic, (DES_cblock*)hash, &ks, DES_ENCRYPT);
- }
-
---- a/src/samdump2/samdump2.c 2015-03-30 02:26:33 UTC
-+++ b/src/samdump2/samdump2.c
-@@ -71,7 +71,7 @@ void str_to_key(unsigned char *str,unsig
- for (i=0;i<8;i++) {
- key[i] = (key[i]<<1);
- }
-- des_set_odd_parity((des_cblock *)key);
-+ DES_set_odd_parity((DES_cblock *)key);
- }
-
- /*
-@@ -209,8 +209,8 @@ unsigned char* utf16_to_utf8 (unsigned c
- unsigned char hbootkey[0x20];
-
- /* Des */
-- des_key_schedule ks1, ks2;
-- des_cblock deskey1, deskey2;
-+ DES_key_schedule ks1, ks2;
-+ DES_cblock deskey1, deskey2;
-
- int i, j;
-
-@@ -418,15 +418,15 @@ unsigned char* utf16_to_utf8 (unsigned c
-
- /* Get the two decrpt keys. */
- sid_to_key1(rid,(unsigned char *)deskey1);
-- des_set_key_checked((des_cblock *)deskey1,ks1);
-+ DES_set_key_checked((DES_cblock *)deskey1, &ks1);
- sid_to_key2(rid,(unsigned char *)deskey2);
-- des_set_key_unchecked((des_cblock *)deskey2,ks2);
-+ DES_set_key_unchecked((DES_cblock *)deskey2, &ks2);
-
- /* Decrypt the lanman password hash as two 8 byte blocks. */
-- des_ecb_encrypt((des_cblock *)obfkey,
-- (des_cblock *)fb, ks1, DES_DECRYPT);
-- des_ecb_encrypt((des_cblock *)(obfkey + 8),
-- (des_cblock *)&fb[8], ks2, DES_DECRYPT);
-+ DES_ecb_encrypt((DES_cblock *)obfkey,
-+ (DES_cblock *)fb, &ks1, DES_DECRYPT);
-+ DES_ecb_encrypt((DES_cblock *)(obfkey + 8),
-+ (DES_cblock *)&fb[8], &ks2, DES_DECRYPT);
-
-
-
-@@ -471,16 +471,16 @@ unsigned char* utf16_to_utf8 (unsigned c
- if (lm_size != 0x14) {
- /* Get the two decrpt keys. */
- sid_to_key1(rid,(unsigned char *)deskey1);
-- des_set_key((des_cblock *)deskey1,ks1);
-+ DES_set_key((DES_cblock *)deskey1, &ks1);
- sid_to_key2(rid,(unsigned char *)deskey2);
-- des_set_key((des_cblock *)deskey2,ks2);
-+ DES_set_key((DES_cblock *)deskey2, &ks2);
- }
-
- /* Decrypt the NT md4 password hash as two 8 byte blocks. */
-- des_ecb_encrypt((des_cblock *)obfkey,
-- (des_cblock *)fb, ks1, DES_DECRYPT);
-- des_ecb_encrypt((des_cblock *)(obfkey + 8),
-- (des_cblock *)&fb[8], ks2, DES_DECRYPT);
-+ DES_ecb_encrypt((DES_cblock *)obfkey,
-+ (DES_cblock *)fb, &ks1, DES_DECRYPT);
-+ DES_ecb_encrypt((DES_cblock *)(obfkey + 8),
-+ (DES_cblock *)&fb[8], &ks2, DES_DECRYPT);
-
- /* sf27 wrap to sf25 */
- //sf27( obfkey, (int*)&rid, fb );
diff --git a/app-crypt/ophcrack/ophcrack-3.6.0.ebuild b/app-crypt/ophcrack/ophcrack-3.6.0.ebuild
deleted file mode 100644
index 94d9250666bc..000000000000
--- a/app-crypt/ophcrack/ophcrack-3.6.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-inherit eutils
-
-DESCRIPTION="A time-memory-trade-off-cracker"
-HOMEPAGE="http://ophcrack.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="debug libressl +tables"
-
-CDEPEND="!libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:0= )
- net-libs/netwib"
-DEPEND="app-arch/unzip
- virtual/pkgconfig
- ${CDEPEND}"
-RDEPEND="tables? ( app-crypt/ophcrack-tables )
- ${CDEPEND}"
-
-PATCHES="${FILESDIR}/ophcrack-openssl-des.patch"
-
-src_configure() {
-
- local myconf
-
- myconf="${myconf} $(use_enable debug) --disable-gui"
-
- econf ${myconf}
-}
-
-src_install() {
- emake install DESTDIR="${D}"
-}
diff --git a/app-crypt/ophcrack/ophcrack-3.7.0.ebuild b/app-crypt/ophcrack/ophcrack-3.7.0.ebuild
deleted file mode 100644
index 736f3bea8b86..000000000000
--- a/app-crypt/ophcrack/ophcrack-3.7.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-inherit eutils
-
-DESCRIPTION="A time-memory-trade-off-cracker"
-HOMEPAGE="http://ophcrack.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="debug libressl +tables"
-
-CDEPEND="!libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:0= )
- net-libs/netwib"
-DEPEND="app-arch/unzip
- virtual/pkgconfig
- ${CDEPEND}"
-RDEPEND="tables? ( app-crypt/ophcrack-tables )
- ${CDEPEND}"
-
-src_configure() {
-
- local myconf
-
- myconf="${myconf} $(use_enable debug) --disable-gui"
-
- econf ${myconf}
-}
-
-src_install() {
- emake install DESTDIR="${D}"
-}
diff --git a/app-crypt/ophcrack/ophcrack-3.8.0.ebuild b/app-crypt/ophcrack/ophcrack-3.8.0.ebuild
index 98ebe5ffe25f..c35c0f3c154c 100644
--- a/app-crypt/ophcrack/ophcrack-3.8.0.ebuild
+++ b/app-crypt/ophcrack/ophcrack-3.8.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -14,15 +14,16 @@ KEYWORDS="~amd64 ~x86"
IUSE="debug libressl qt5 +tables"
CDEPEND="!libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:0= )
- net-libs/netwib
- qt5? ( dev-qt/qtcharts:5
- dev-qt/qtgui:5 )"
+ libressl? ( dev-libs/libressl:0= )
+ net-libs/netwib
+ qt5? ( dev-qt/qtcharts:5
+ dev-qt/qtgui:5 )"
DEPEND="app-arch/unzip
- virtual/pkgconfig
- ${CDEPEND}"
+ virtual/pkgconfig
+ ${CDEPEND}"
RDEPEND="tables? ( app-crypt/ophcrack-tables )
- ${CDEPEND}"
+ ${CDEPEND}"
+PATCHES=("${FILESDIR}/ophcrack-ar.patch")
src_configure() {
diff --git a/app-crypt/ssss/ssss-0.5.ebuild b/app-crypt/ssss/ssss-0.5-r1.ebuild
similarity index 76%
rename from app-crypt/ssss/ssss-0.5.ebuild
rename to app-crypt/ssss/ssss-0.5-r1.ebuild
index f9d6d9eb8ced..99411362aaff 100644
--- a/app-crypt/ssss/ssss-0.5.ebuild
+++ b/app-crypt/ssss/ssss-0.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -25,8 +25,8 @@ src_prepare() {
tc-export CC
- # Respect users CFLAGS and don't strip, as portage does this part.
- sed -e 's/-O2/$(CFLAGS)/g' -e '/strip/d' -i Makefile || die
+ # Respect users [CL]FLAGS and don't strip, as portage does this part
+ sed -e 's/-O2/$(CFLAGS) -lgmp $(LDFLAGS)/g' -e '/strip/d' -i Makefile || die
}
src_install() {
diff --git a/app-crypt/trousers/trousers-0.3.14-r2.ebuild b/app-crypt/trousers/trousers-0.3.14-r2.ebuild
index b94cc955e2d7..425a63a8dd5f 100644
--- a/app-crypt/trousers/trousers-0.3.14-r2.ebuild
+++ b/app-crypt/trousers/trousers-0.3.14-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/trousers/${PN}/${P}.tar.gz"
LICENSE="CPL-1.0 GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~m68k ~ppc ~ppc64 ~s390 ~x86"
+KEYWORDS="amd64 arm arm64 ~m68k ~ppc ~ppc64 ~s390 ~x86"
IUSE="doc libressl selinux" # gtk
# gtk support presently does NOT compile.
diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index 319678a3627a..7c37fb4bff73 100644
Binary files a/app-editors/Manifest.gz and b/app-editors/Manifest.gz differ
diff --git a/app-editors/aee/Manifest b/app-editors/aee/Manifest
index 546e1aa98e57..11e79c3f7200 100644
--- a/app-editors/aee/Manifest
+++ b/app-editors/aee/Manifest
@@ -1,2 +1 @@
-DIST aee-2.2.15b.tar.gz 184218 BLAKE2B f249c0974a971aa6a1bb38afb8675a3ace671d244c717add4ea2f724ac1d07bf1c57c5d27fb6f9f40f27b3055ba94cf959dd4b855181a83f4522c44124c0b994 SHA512 2810cd8f5148edb352fdaefbc823d417b9a83c8083644c8729be8595013ca8ba660bd72120db1e15915e454f5185d2d030c2f0c853b37eb83c213c1d581a640f
DIST aee-2.2.21.tar.gz 186304 BLAKE2B 2d41678e07f6590023f428e042686c92377200826f86ebb28fe93ec1e5f07290de6eef765dbae91efcef01d32896127c044f20c204b50ed50894fd743cb1fc19 SHA512 c052ef97b18fa9900e9bf0c5894e05cbbf775d7de4ad4c14cb9e3e7758983c84e4768995a98398c05e30173464e6f7994e7f476522a314bc25dac5a84831155a
diff --git a/app-editors/aee/aee-2.2.15b.ebuild b/app-editors/aee/aee-2.2.15b.ebuild
deleted file mode 100644
index bbd9266d8086..000000000000
--- a/app-editors/aee/aee-2.2.15b.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit toolchain-funcs
-
-DESCRIPTION="An easy to use text editor"
-#HOMEPAGE="http://mahon.cwx.net/ http://www.users.uswest.net/~hmahon/"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-
-LICENSE="Artistic"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux"
-IUSE="X"
-
-RDEPEND="X? ( x11-libs/libX11 )"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
- "${FILESDIR}"/${P}-ae-location.patch
- "${FILESDIR}"/${PN}-Wformat-security.patch
-)
-DOCS=( Changes README.${PN} ${PN}.i18n.guide ${PN}.msg )
-
-src_prepare() {
- sed -i \
- -e "s/make -/\$(MAKE) -/g" \
- -e "/^buildaee/s/$/ localaee/" \
- -e "/^buildxae/s/$/ localxae/" \
- Makefile
-
- sed -i \
- -e "s/\([\t ]\)cc /\1\\\\\$(CC) /" \
- -e "/CFLAGS =/s/\" >/ \\\\\$(LDFLAGS)\" >/" \
- -e "/other_cflag/s/ \${strip_option}//" \
- create.mk.{aee,xae}
-
- default
-}
-
-src_compile() {
- local target="aee"
- use X && target="both"
-
- emake CC="$(tc-getCC)" ${target}
-}
-
-src_install() {
- dobin ${PN}
- dosym ${PN} /usr/bin/rae
- doman ${PN}.1
- einstalldocs
-
- insinto /usr/share/${PN}
- doins help.ae
-
- if use X; then
- dobin xae
- dosym xae /usr/bin/rxae
- fi
-}
diff --git a/app-editors/aee/aee-2.2.21.ebuild b/app-editors/aee/aee-2.2.21.ebuild
index 763b9cf91901..69453af195f6 100644
--- a/app-editors/aee/aee-2.2.21.ebuild
+++ b/app-editors/aee/aee-2.2.21.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="6"
+EAPI="7"
inherit toolchain-funcs
@@ -12,7 +12,7 @@ SRC_URI="mirror://gentoo/${P}.tar.gz"
LICENSE="Artistic"
SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
+KEYWORDS="amd64 x86 ~amd64-linux"
IUSE="X"
RDEPEND="X? ( x11-libs/libX11 )"
@@ -21,6 +21,7 @@ DEPEND="${RDEPEND}"
PATCHES=(
"${FILESDIR}"/${PN}-ae-location.patch
"${FILESDIR}"/${PN}-Wformat-security.patch
+ "${FILESDIR}"/${PN}-gcc-10.patch
)
DOCS=( Changes README.${PN} ${PN}.i18n.guide ${PN}.msg )
diff --git a/app-editors/aee/files/aee-2.2.15b-ae-location.patch b/app-editors/aee/files/aee-2.2.15b-ae-location.patch
deleted file mode 100644
index 4a17642b915d..000000000000
--- a/app-editors/aee/files/aee-2.2.15b-ae-location.patch
+++ /dev/null
@@ -1,89 +0,0 @@
---- a/aee.1
-+++ b/aee.1
-@@ -678,7 +678,7 @@
- .\"
- .SS Initializing aee From A File
- .PP
--\fIaee\fR checks for a file named \fIinit.ae\fR in \fI/usr/local/lib\fR,
-+\fIaee\fR checks for a file named \fIinit.ae\fR in \fI/usr/share/aee\fR,
- .I .init.ae
- in the user's home directory, then for \fI.init.ae\fR in the
- current directory. (This file may be created manually or by using the
-@@ -960,7 +960,7 @@
- .PP
- On-line help is provided through the 'help' command or menu item. This
- command uses a file with help information. By default the help file is
--located in \fB/usr/local/lib/help.ae\fR, but this file may be located
-+located in \fB/usr/share/aee/help.ae\fR, but this file may be located
- in the user's home directory with the name \fB.help.ae\fR, or in the
- current directory with the name \fBhelp.ae\fR.
- .\"
-@@ -1017,7 +1017,7 @@
- .\"
- .SH FILES
- .PP
--.I /usr/local/lib/init.ae
-+.I /usr/share/aee/init.ae
- .br
- .I $HOME/.aeeinfo
- .br
---- a/aee.c
-+++ b/aee.c
-@@ -2612,7 +2612,7 @@
-
- char *init_name[4] = {
- "/usr/local/aee/init.ae",
-- "/usr/local/lib/init.ae",
-+ "/usr/share/aee/init.ae",
- NULL,
- ".init.ae"
- };
---- a/aee.msg
-+++ b/aee.msg
-@@ -2,7 +2,7 @@
- $
- $set 1
- $quote "
--1 "/usr/local/lib/help.ae"
-+1 "/usr/share/aee/help.ae"
- 2 "main"
- 3 "modes menu"
- 4 "tabs to spaces "
---- a/help.ae
-+++ b/help.ae
-@@ -1058,11 +1058,11 @@
-
- The file 'init.ae' may be used to set parameters and define keys to
- perform certain functions within ae. This file may reside in three
--locations: /usr/local/lib/init.ae, .init.ae in your home directory, and
-+locations: /usr/share/aee/init.ae, .init.ae in your home directory, and
- .init.ae in the current working directory.
-
- First, aee checks for a system level initialization file, located in
--/usr/local/lib. Next the user's home directory is checked for a file named
-+/usr/share/aee. Next the user's home directory is checked for a file named
- .init.ae, then the current directory. The settings from each file are read,
- so that the directives from the most recently read file will take precedence
- over previously read files. This allows, for example, the .init.ae file in
---- a/help.c
-+++ b/help.c
-@@ -12,7 +12,7 @@
-
- char *help_file_list[4] = {
- "/usr/local/aee/help.ae",
-- "/usr/local/lib/help.ae",
-+ "/usr/share/aee/help.ae",
- "~/.help.ae",
- "help.ae"
- };
---- a/localize.c
-+++ b/localize.c
-@@ -64,7 +64,7 @@
- catalog = catopen("aee", 0);
- #endif /* NO_CATGETS */
-
-- ae_help_file = catgetlocal( 1, "/usr/local/lib/help.ae");
-+ ae_help_file = catgetlocal( 1, "/usr/share/aee/help.ae");
- main_buffer_name = catgetlocal( 2, "main");
-
-
diff --git a/app-editors/aee/files/aee-gcc-10.patch b/app-editors/aee/files/aee-gcc-10.patch
new file mode 100644
index 000000000000..c8747099e588
--- /dev/null
+++ b/app-editors/aee/files/aee-gcc-10.patch
@@ -0,0 +1,44 @@
+--- a/Xcurse.c
++++ b/Xcurse.c
+@@ -37,6 +37,8 @@
+
+ extern int eightbit;
+
++struct _line *top_of_win;
++
+ static WINDOW *virtual_scr;
+ WINDOW *curscr;
+ WINDOW *stdscr;
+--- a/Xcurse.h
++++ b/Xcurse.h
+@@ -132,7 +132,7 @@
+ int number;
+ };
+
+-struct _line *top_of_win;
++extern struct _line *top_of_win;
+
+ typedef struct WIND {
+ int SR; /* starting row */
+--- a/new_curse.c
++++ b/new_curse.c
+@@ -85,6 +85,8 @@
+ #endif
+
+
++struct _line *top_of_win;
++
+ WINDOW *curscr;
+ static WINDOW *virtual_scr;
+ WINDOW *stdscr;
+--- a/new_curse.h
++++ b/new_curse.h
+@@ -161,7 +161,7 @@
+ int number;
+ };
+
+-struct _line *top_of_win;
++extern struct _line *top_of_win;
+
+ typedef struct WIND {
+ int SR; /* starting row */
diff --git a/app-editors/e3/e3-2.8.2.ebuild b/app-editors/e3/e3-2.8.2.ebuild
index 4d675fa1428c..41f1d83154db 100644
--- a/app-editors/e3/e3-2.8.2.ebuild
+++ b/app-editors/e3/e3-2.8.2.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
+inherit toolchain-funcs
+
MY_P="${PN}-$(ver_rs 2 '')"
DESCRIPTION="Very tiny editor in ASM with emacs, pico, wordstar, and vi keybindings"
HOMEPAGE="https://sites.google.com/site/e3editor/"
@@ -16,14 +18,10 @@ RESTRICT="strip"
BDEPEND=">=dev-lang/nasm-2.09.04"
S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
- sed -i 's/-D$(EXMODE)//' Makefile || die
- eapply_user
-}
+PATCHES=("${FILESDIR}"/${P}-makefile.patch)
src_compile() {
- emake -- $(usex amd64 64 32)
+ emake -- $(usex amd64 64 32) LD="$(tc-getLD)"
}
src_install() {
diff --git a/app-editors/e3/files/e3-2.8.2-makefile.patch b/app-editors/e3/files/e3-2.8.2-makefile.patch
new file mode 100644
index 000000000000..5a22ff67e09d
--- /dev/null
+++ b/app-editors/e3/files/e3-2.8.2-makefile.patch
@@ -0,0 +1,36 @@
+--- e3-2.82-orig/Makefile
++++ e3-2.82/Makefile
+@@ -17,6 +17,8 @@
+ NASM_OR_YASM=nasm
+ #NASM_OR_YASM=yasm
+
++LD=ld
++
+ EXMODE=SED
+
+ #----------------------do not edit below line-------------------------------
+@@ -41,12 +43,12 @@
+
+ 32: $(ASOURCES) Makefile
+ ifeq ($(OS),LINUX)
+- nasm -O2 -f bin -l e3.lst -o e3 e3.asm -DCRIPLED_ELF=1 -D$(OS) -D$(EXMODE)
++ nasm -O2 -f bin -l e3.lst -o e3 e3.asm -DCRIPLED_ELF=1 -D$(OS)
+ chmod +x e3
+ else
+ echo $(ASVER)
+- nasm -O2 $(AFLAGS) -o e3.o e3.asm -l e3.lst -D$(OS) -D$(EXMODE)
+- ld -s -o e3 e3.o
++ nasm -O2 $(AFLAGS) -o e3.o e3.asm -l e3.lst -D$(OS)
++ $(LD) -s -o e3 e3.o
+ strip --remove-section .comment e3
+ endif
+ ln -sf e3 e3ws
+@@ -60,7 +62,7 @@
+ 64: $(ASOURCES) Makefile
+ cat e3.asm | sed -f e3_32to64.sed >e3.tmp
+ $(ASSEMBLER64)
+- ld -b elf64-x86-64 --oformat elf64-x86-64 -o e3 e3.o
++ $(LD) -b elf64-x86-64 --oformat elf64-x86-64 -o e3 e3.o
+ ifneq ($(DEBUG),true)
+ strip e3
+ endif
diff --git a/app-editors/ee/ee-1.5.2.ebuild b/app-editors/ee/ee-1.5.2.ebuild
index fc1aec479af4..ad4bb78c8530 100644
--- a/app-editors/ee/ee-1.5.2.ebuild
+++ b/app-editors/ee/ee-1.5.2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="6"
+EAPI="7"
inherit toolchain-funcs
@@ -22,6 +22,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-init-location.patch
"${FILESDIR}"/${PN}-signal.patch
"${FILESDIR}"/${PN}-Wformat-security.patch
+ "${FILESDIR}"/${PN}-gcc-10.patch
)
DOCS=( Changes README.${PN} ${PN}.i18n.guide ${PN}.msg )
diff --git a/app-editors/ee/files/ee-gcc-10.patch b/app-editors/ee/files/ee-gcc-10.patch
new file mode 100644
index 000000000000..2577d76f25f6
--- /dev/null
+++ b/app-editors/ee/files/ee-gcc-10.patch
@@ -0,0 +1,22 @@
+--- a/new_curse.c
++++ b/new_curse.c
+@@ -83,6 +83,8 @@
+ #endif
+
+
++struct _line *top_of_win;
++
+ WINDOW *curscr;
+ static WINDOW *virtual_scr;
+ WINDOW *stdscr;
+--- a/new_curse.h
++++ b/new_curse.h
+@@ -161,7 +161,7 @@
+ int number;
+ };
+
+-struct _line *top_of_win;
++extern struct _line *top_of_win;
+
+ typedef struct WIND {
+ int SR; /* starting row */
diff --git a/app-editors/fe/fe-2.0.ebuild b/app-editors/fe/fe-2.0.ebuild
index ca6658d94079..207e9ec3f773 100644
--- a/app-editors/fe/fe-2.0.ebuild
+++ b/app-editors/fe/fe-2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -19,7 +19,10 @@ RDEPEND="sys-libs/ncurses:0=
DEPEND="${RDEPEND}"
BDEPEND="virtual/pkgconfig"
-PATCHES=("${FILESDIR}"/${PN}-1.8-makefile.patch)
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.8-makefile.patch
+ "${FILESDIR}"/${P}-ar.patch
+)
src_configure() {
econf \
@@ -27,6 +30,10 @@ src_configure() {
LIBS="$("$(tc-getPKG_CONFIG)" --libs ncurses)"
}
+src_compile() {
+ emake AR="$(tc-getAR)"
+}
+
src_install() {
emake \
prefix="${D}"/usr \
diff --git a/app-editors/fe/files/fe-2.0-ar.patch b/app-editors/fe/files/fe-2.0-ar.patch
new file mode 100644
index 000000000000..8096400ab01e
--- /dev/null
+++ b/app-editors/fe/files/fe-2.0-ar.patch
@@ -0,0 +1,21 @@
+https://bugs.gentoo.org/722036
+
+--- fe-2.0-orig/Makefile.in
++++ fe-2.0/Makefile.in
+@@ -15,6 +15,7 @@
+ CPPFLAGS= @CPPFLAGS@ -DLOCALEDIR=\"$(localedir)\"
+ LDFLAGS= @LDFLAGS@
+ LIBS= @LIBS@
++AR= ar
+
+ CATALOGS= de.mo
+ OBJS= buffer.o complete.o display.o macro.o misc.o msgline.o
+@@ -27,7 +28,7 @@
+ $(CC) -o $@ $(LDFLAGS) fe.o libfe.a $(LIBS)
+
+ libfe.a: $(OBJS)
+- rm -f $@; ar q $@ $(OBJS); @RANLIB@ $@
++ rm -f $@; $(AR) q $@ $(OBJS); @RANLIB@ $@
+
+ install-po: install-po-@USE_NLS@
+ install-po-no:
diff --git a/app-editors/hteditor/files/hteditor-2.1.0-AR.patch b/app-editors/hteditor/files/hteditor-2.1.0-AR.patch
new file mode 100644
index 000000000000..60a0427a2125
--- /dev/null
+++ b/app-editors/hteditor/files/hteditor-2.1.0-AR.patch
@@ -0,0 +1,14 @@
+https://bugs.gentoo.org/722040
+--- a/configure.ac
++++ b/configure.ac
+@@ -104,8 +104,8 @@ AC_PROG_CPP
+ AC_PROG_CXX
+ AC_PROG_YACC
+ AM_PROG_LEX
+-AC_PATH_PROG(AR, ar)
+-AC_PATH_PROG(AR, gar)
++AC_CHECK_TOOL(AR, ar)
++AC_CHECK_TOOL(AR, gar)
+
+ if test "x$AR" = "x"; then
+ AC_MSG_ERROR([*** 'ar' and 'gar' missing, please install one of them or fix your \$PATH ***])
diff --git a/app-editors/hteditor/hteditor-2.1.0-r1.ebuild b/app-editors/hteditor/hteditor-2.1.0-r1.ebuild
index 44b7dd140f67..16a7ab4322f0 100644
--- a/app-editors/hteditor/hteditor-2.1.0-r1.ebuild
+++ b/app-editors/hteditor/hteditor-2.1.0-r1.ebuild
@@ -33,6 +33,7 @@ PATCHES=(
"${FILESDIR}"/${P}-gcc-6-uchar.patch
"${FILESDIR}"/${P}-format-security.patch
"${FILESDIR}"/${P}-gcc-10.patch
+ "${FILESDIR}"/${P}-AR.patch
)
src_prepare() {
@@ -46,10 +47,6 @@ src_configure() {
--enable-maintainermode
}
-src_compile() {
- emake AR="$(tc-getAR)" CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}"
-}
-
src_install() {
#For prefix
chmod u+x "${S}/install-sh"
diff --git a/app-emacs/Manifest.gz b/app-emacs/Manifest.gz
index 56017a7f7ca9..65dbd794b43e 100644
Binary files a/app-emacs/Manifest.gz and b/app-emacs/Manifest.gz differ
diff --git a/app-emacs/d-mode/d-mode-2.0.10.ebuild b/app-emacs/d-mode/d-mode-2.0.10.ebuild
index c410ee103834..4a23ae677547 100644
--- a/app-emacs/d-mode/d-mode-2.0.10.ebuild
+++ b/app-emacs/d-mode/d-mode-2.0.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -16,4 +16,5 @@ KEYWORDS="~amd64 ~x86"
RESTRICT="test"
S="${WORKDIR}/Emacs-D-Mode-${PV}"
+PATCHES=("${FILESDIR}"/${P}-rx-form.patch)
SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/d-mode/files/d-mode-2.0.10-rx-form.patch b/app-emacs/d-mode/files/d-mode-2.0.10-rx-form.patch
new file mode 100644
index 000000000000..78ed206c3a80
--- /dev/null
+++ b/app-emacs/d-mode/files/d-mode-2.0.10-rx-form.patch
@@ -0,0 +1,25 @@
+https://bugs.gentoo.org/722012
+
+From cfd1d0869d51b7548b3fb738b2f2593c76533d44 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Per=20Nordl=C3=B6w?=
+Date: Wed, 9 Oct 2019 11:03:00 +0200
+Subject: [PATCH] Use rx-to-string instead of rx-form to support Emacs master
+ (#97)
+
+---
+ d-mode.el | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/d-mode.el b/d-mode.el
+index f8211cd..df72b8d 100644
+--- a/d-mode.el
++++ b/d-mode.el
+@@ -210,7 +210,7 @@ The expression is added to `compilation-error-regexp-alist' and
+ (add-to-list
+ 'compilation-error-regexp-alist-alist
+ `(,symbol
+- ,(rx-form
++ ,(rx-to-string
+ `(and
+ line-start
+ (group-n 1 (one-or-more any)) ; File name
diff --git a/app-emacs/php-mode/Manifest b/app-emacs/php-mode/Manifest
index 1a014681f410..c7ec56da6391 100644
--- a/app-emacs/php-mode/Manifest
+++ b/app-emacs/php-mode/Manifest
@@ -1,2 +1,2 @@
-DIST php-mode-1.19.1.tar.gz 94857 BLAKE2B 65ecb228fd4cd2c09cf38836b7d04ac270051976dc97dd7a3124f5a86d4e95bf9a097c6885f55c0ea40599fc2d3f813204e7f28a5f75223cae9eb51e74136017 SHA512 ca4fd798690d5b855a8d4b0cf5b631c32a561466b7697c9498bd89ad1059b774616acab10e30877b3053ba613b63db5da74a479c0a09c57b9b7b2350f42e68dd
DIST php-mode-1.22.1.tar.gz 90539 BLAKE2B 3cf2f282cbf87d7dc0ef15d81341de851ad95b7f5426ab6495e55729774fa9d1a32bbc36dff40869c219c71e0ff5d55642f99782a18722c94abeda78b45e0023 SHA512 482f07bec5f8ce21396cd4d39b14dbfe47d73f4e06b7b178b3e01c2dc51f89f1693a032384e4ad812c46a344e531a4a626c4f8eb414fe22dfadd9f1a71c55238
+DIST php-mode-1.23.0.tar.gz 94451 BLAKE2B 324eda995ba8d93ca9bec691c88b05caac3d6786b2d1caac39dc34f513e8a026b3803ad3712729b147a8ee839fe337bf11ebaa1b718cb4c741997a9e1c9279a3 SHA512 051adf317ac1dc4ae14b3aaad9aa15ef650a74c7c1ff134ff9a26664cc7494b522957d9cbed981ec398e9bdc6ccae4437c628b2fe3535e8f2a95da34363ec88a
diff --git a/app-emacs/php-mode/php-mode-1.19.1.ebuild b/app-emacs/php-mode/php-mode-1.23.0.ebuild
similarity index 66%
rename from app-emacs/php-mode/php-mode-1.19.1.ebuild
rename to app-emacs/php-mode/php-mode-1.23.0.ebuild
index 7fd367f22226..3a75d798770b 100644
--- a/app-emacs/php-mode/php-mode-1.19.1.ebuild
+++ b/app-emacs/php-mode/php-mode-1.23.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -12,8 +12,7 @@ SRC_URI="https://github.com/ejmr/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-3+"
SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
SITEFILE="50${PN}-gentoo.el"
-DOCS="README.md Changelog.md"
-ELISP_REMOVE="php-mode-test.el"
+DOCS="README*.md CHANGELOG.md CONTRIBUTING.md"
diff --git a/app-emacs/xrdb-mode/files/xrdb-mode-3.0-backquotes.patch b/app-emacs/xrdb-mode/files/xrdb-mode-3.0-backquotes.patch
new file mode 100644
index 000000000000..f0cd950c3a3a
--- /dev/null
+++ b/app-emacs/xrdb-mode/files/xrdb-mode-3.0-backquotes.patch
@@ -0,0 +1,15 @@
+--- a/xrdb-mode.el
++++ b/xrdb-mode.el
+@@ -178,9 +178,9 @@
+
+ (defmacro xrdb-safe (&rest body)
+ "Safely execute BODY, return nil if an error occurred."
+- (` (condition-case nil
+- (progn (,@ body))
+- (error nil))))
++ `(condition-case nil
++ (progn ,@ body)
++ (error nil)))
+
+ (defsubst xrdb-skip-to-separator ()
+ "Skip forward.
diff --git a/app-emacs/xrdb-mode/xrdb-mode-3.0-r1.ebuild b/app-emacs/xrdb-mode/xrdb-mode-3.0-r1.ebuild
new file mode 100644
index 000000000000..9f7879241eac
--- /dev/null
+++ b/app-emacs/xrdb-mode/xrdb-mode-3.0-r1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit elisp
+
+DESCRIPTION="An Emacs major mode for editing X resource database files"
+HOMEPAGE="https://launchpad.net/xrdb-mode
+ https://www.emacswiki.org/emacs/ResourceFiles"
+# taken from https://launchpad.net/${PN}/trunk/3.0/+download/${PN}.el
+SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.el.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+PATCHES=("${FILESDIR}"/${P}-backquotes.patch)
+SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index 465b70872570..5ed16facef06 100644
Binary files a/app-emulation/Manifest.gz and b/app-emulation/Manifest.gz differ
diff --git a/app-emulation/cadvisor/Manifest b/app-emulation/cadvisor/Manifest
index 31b812781d87..c86bf301824f 100644
--- a/app-emulation/cadvisor/Manifest
+++ b/app-emulation/cadvisor/Manifest
@@ -1,6 +1,4 @@
DIST bazil.org%2Ffuse%2F@v%2Fv0.0.0-20160811212531-371fbbdaa898.mod 22 BLAKE2B c2b56c0b043a2c0225c3b4142f179a2d2e4938dad64b95c8662a6d641e69a455b50ed79c66a3bcc10982792d3b7742ac96a2d74eefa7fec40a7c3146e5c949cd SHA512 7b3ef87f98485bb9ec325680f57d43a9bd76e90bdcfb1e798458f28f7d3addf91dbb6a07b654749468860981413ad2267df2d5f3535c85579e9f79d9328d355c
-DIST cadvisor-0.34.0.tar.gz 5210189 BLAKE2B 48cf7ddc94e52f07a0e74868d00f4a45d45aa5233b518da46762743357c17cbe7f2971794deda9936a10c65724928a219c498bf6d2493266f5b0ea547d485cb6 SHA512 accb41afd4683413b846f9380229bfa54c88b3141be68492963444928e40e14fc28da3ce27b09746e29c4dfe6323cd6bea69181826367e830f284d6ab698c633
-DIST cadvisor-0.35.0.tar.gz 5268930 BLAKE2B 065619ee459062bb521e855ccfd576afe236863bdc203b65e53a7eb6aec7172b6b9bb1d4183667ed36c471becb09fd974d1e4f809cf614f4d0d03ea3b87c2f63 SHA512 9fdae170fd167e0b1a2b69112ff2ec081640a144490c04e364536cae71a90e2c2845857f35af81ec58d4addd3675fd86b045d1f1b99a3e281f6270ab5d2a70f3
DIST cadvisor-0.36.0.tar.gz 6182273 BLAKE2B 0406bd88c6595f23de06be1e63e7c0affda7f94a3bbbb1b9e390f2747fdd3ef3199622a5003b79ed083a0cd80e6c013d7776e18269044150dafb98341c54425b SHA512 2da8a2e81d33b97e6f7c5ba3982e51b6d87748b138345ff94eb7671df851f0a535ceeef61358b0ee43bc161a88becdb153065bd7ff8fc9d7c390a4629ad10f02
DIST cloud.google.com%2Fgo%2F@v%2Fv0.1.1-0.20160913182117-3b1ae45394a2.mod 27 BLAKE2B 814b0fa8f12d5ce6171fa629b5a7eb34e0e882cc0c5430986896bb38c243e08dc83098f271227f4ba019e78f16dc97fbb381e833aff1819833d243b08add916b SHA512 5132f3438533427c0ab0fbb7a12112a7830ea9122662ed46019ff89c71d9cf80c02edc32dd5c892da572031b5a2cce100f2602fa6a19bea6be7c02781f701273
DIST cloud.google.com%2Fgo%2F@v%2Fv0.1.1-0.20160913182117-3b1ae45394a2.zip 889396 BLAKE2B 37e1420148340c6d59d3bdc554c8d92ccce4dc145403915d067fe18966fa8baea5a3090714dc8d27c8c24831ca71213c11f1c719d0044647f887590a9b5bcc62 SHA512 f5d89d8eed8a58bfba541ab1102db390e6b4e7ce181f9d6e166c03685cedb1974169b298074bf8c5b2ac7c1e965e0e9794d379a9bb6537a3a11deab41fbec772
diff --git a/app-emulation/cadvisor/cadvisor-0.34.0.ebuild b/app-emulation/cadvisor/cadvisor-0.34.0.ebuild
deleted file mode 100644
index 76ad3d58d03a..000000000000
--- a/app-emulation/cadvisor/cadvisor-0.34.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-EGO_PN="github.com/google/cadvisor"
-
-inherit user golang-build golang-vcs-snapshot
-SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-COMMIT="24a6a52"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Analyzes resource usage and performance characteristics of running containers"
-HOMEPAGE="https://github.com/google/cadvisor"
-
-LICENSE="Apache-2.0 BSD BSD-2 ISC MIT"
-SLOT="0"
-IUSE=""
-
-pkg_setup() {
- enewgroup ${PN}
- enewuser ${PN} -1 -1 /dev/null ${PN}
-}
-
-src_prepare() {
- sed -i -e "/go get/d" src/${EGO_PN}/build/assets.sh || die
- sed -i -e "s/git describe.*/echo ${PV} )/"\
- -e "s/git rev-parse --short HEAD.*/echo ${COMMIT} )/"\
- src/${EGO_PN}/build/build.sh || die
- default
-}
-
-src_compile() {
- export -n GOCACHE XDG_CACHE_HOME
- pushd "src/${EGO_PN}"
- GO_FLAGS="-v -work -x" VERBOSE="true" GOPATH="${S}:$(get_golibdir_gopath)" emake build
- popd || die
-}
-
-src_install() {
- newinitd "${FILESDIR}"/${PN}.initd-r1 ${PN}
- dobin src/${EGO_PN}/${PN}
- keepdir /var/log/${PN}
- fowners ${PN}:${PN} /var/log/${PN}
-}
diff --git a/app-emulation/cadvisor/cadvisor-0.35.0.ebuild b/app-emulation/cadvisor/cadvisor-0.35.0.ebuild
deleted file mode 100644
index 06fd94f5eb73..000000000000
--- a/app-emulation/cadvisor/cadvisor-0.35.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-EGO_PN="github.com/google/cadvisor"
-COMMIT=49033161
-inherit golang-build golang-vcs-snapshot
-
-DESCRIPTION="Analyzes resource usage and performance characteristics of running containers"
-HOMEPAGE="https://github.com/google/cadvisor"
-SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0 BSD BSD-2 ISC MIT"
-KEYWORDS="~amd64"
-SLOT="0"
-
-COMMON_DEPEND="acct-group/cadvisor
- acct-user/cadvisor"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}"
-
-src_prepare() {
- sed -i -e "/go get/d" src/${EGO_PN}/build/assets.sh || die
- sed -i -e "s/git describe.*/echo ${PV} )/"\
- -e "s/git rev-parse --short HEAD.*/echo ${COMMIT} )/"\
- src/${EGO_PN}/build/build.sh || die
- default
-}
-
-src_compile() {
- export -n GOCACHE XDG_CACHE_HOME
- pushd "src/${EGO_PN}"
- GO_FLAGS="-v -work -x" VERBOSE="true" GOPATH="${S}:$(get_golibdir_gopath)" emake build
- popd || die
-}
-
-src_install() {
- newinitd "${FILESDIR}"/${PN}.initd-r1 ${PN}
- dobin src/${EGO_PN}/${PN}
- keepdir /var/log/${PN}
- fowners ${PN}:${PN} /var/log/${PN}
-}
diff --git a/app-emulation/cadvisor/files/cadvisor.initd b/app-emulation/cadvisor/files/cadvisor.initd
deleted file mode 100644
index 19e36b2c81a5..000000000000
--- a/app-emulation/cadvisor/files/cadvisor.initd
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 2016-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-description="cAdvisor - Analyzes resource usage and performance characteristics of running containers"
-pidfile=${pidfile:-"/run/${SVCNAME}.pid"}
-user=${user:-${SVCNAME}}
-group=${group:-${SVCNAME}}
-
-command="/usr/bin/cadvisor"
-command_background="true"
-start_stop_daemon_args="--user ${user} --group ${group} \
- --stdout /var/log/${SVCNAME}/${SVCNAME}.log \
- --stderr /var/log/${SVCNAME}/${SVCNAME}.log"
-
-depend() {
- after net
-}
diff --git a/app-emulation/docker-swarm/Manifest b/app-emulation/docker-swarm/Manifest
index 5c30c4fd9692..e67d6adbf65b 100644
--- a/app-emulation/docker-swarm/Manifest
+++ b/app-emulation/docker-swarm/Manifest
@@ -1,5 +1 @@
-DIST docker-swarm-1.2.5.tar.gz 4619026 BLAKE2B cae94bcb1bbb1f495b18662ac62ad3295d22547b332d6b6c4e55c070650fc3a1c314ef1ef696787b3109c0c5dce3c48979adc85031c0d65834d3d8ff5bd417b3 SHA512 2684c1fbb8e01c062c62137c874825120d0f2da0ca13808c1558ef01680a6f4d77bbff3769d1f59d9bb8011066f202dbb89c23d25597283cc24245db70731992
-DIST gobrake-2.0.8.tar.gz 6392 BLAKE2B ec3eccd5a52442163108c9e8f83e2e7a19ed45438c91e541d75af5cd44f382899098cecc5130c5d36a62ca53f1dc2062a82ec9e04b17e2db835cecdfbaa3b565 SHA512 76d1dfc55ddcbfa0b719d9eb3a75a0c8bc9d2f0308fef391cc59efa7c6b7607860c61c1e77d609d3a2d2cad473da359d0f1df98775a6da791a70d81f98ce5e6c
-DIST gogo-protobuf-0.3.tar.gz 2116795 BLAKE2B 6b90ad97648e75724c69bb9b8d3cfb17b919a1121813c09ec463df99c290c117b0e0b87f43b285eb5147a205f2f926c223cc4b4d58205a286af2afa87dbd7f5b SHA512 57e1b1715d4811800da8cf9f2c72d202deae622d89715d7eff2ff0c406a0ea3778c187443abb17b072ae6fe57382844807f103837032759dab5420c860b99fb8
-DIST logrus-0.11.0.tar.gz 24165 BLAKE2B 5d71a4b78d5c46e71401a08d9b0228236f74e864d14206bd6450268a3a41d5f2ac7155c39f250b9906ec132fa63ace6e8888f0ec482ed4a0828696326bbba25e SHA512 ee0b813e277cef0533800a966e6e07884b8de64e75c200439979f00986d84f98cfc750f7d4cb2a2b57d6524941fbba0c6211ce37da50d9a8ca99274f81639620
-DIST logrus-airbrake-hook-2.1.1.tar.gz 3896 BLAKE2B a41877c8201d39f79fd0fabb7bba8d513c14931ab6a2d59b9dbe5907ce32a67d852f8cd25a2ed058ee95d321e430818d5258b4e047f3b809503da58a96bc8876 SHA512 8559f821731ee086a267f43f6e150e18b24a32a2556c45499b2ec42a85642a0581a862fc827b8b9a1949d003b5e36e69972df92a005111b94e2aa9678c336240
+DIST docker-swarm-1.2.9.tar.gz 1532493 BLAKE2B 243a3cb6d2e9f719d81947429c6616e93cf1b08187685922ad5daf732e61db12bd626fa26f30174af7e779c8ba45ecce7d2cfb33835ef985bdd57657e30e2228 SHA512 cc0e0e27d0ed4845abd99d1554630cc8e2ab0645d40a76358a83b2ea6d1bc5287dbf5d1aefdd2eb4302aeef3894725e75cae3f5da2353b045492a4357631daa2
diff --git a/app-emulation/docker-swarm/docker-swarm-1.2.5.ebuild b/app-emulation/docker-swarm/docker-swarm-1.2.5.ebuild
deleted file mode 100644
index 95e2cbea5ca8..000000000000
--- a/app-emulation/docker-swarm/docker-swarm-1.2.5.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KEYWORDS="~amd64"
-EGO_PN=github.com/docker/${PN##*-}/...
-SRC_URI="https://${EGO_PN%/*}/archive/${PV}.tar.gz -> ${P}.tar.gz
- https://github.com/gogo/protobuf/archive/v0.3.tar.gz -> gogo-protobuf-0.3.tar.gz
- https://github.com/gemnasium/logrus-airbrake-hook/archive/v2.1.1.tar.gz -> logrus-airbrake-hook-2.1.1.tar.gz
- https://github.com/airbrake/gobrake/archive/v2.0.8.tar.gz -> gobrake-2.0.8.tar.gz
- https://github.com/Sirupsen/logrus/archive/v0.11.0.tar.gz -> logrus-0.11.0.tar.gz"
-DESCRIPTION="A Docker-native clustering system"
-HOMEPAGE="https://docs.docker.com/swarm"
-LICENSE="Apache-2.0 CC-BY-SA-4.0 BSD BSD-2 ISC MIT MPL-2.0 WTFPL-2"
-SLOT="0"
-IUSE=""
-RESTRICT="test"
-DEPEND=">=dev-lang/go-1.6:=
- !! ${P}.tar.gz"
+DESCRIPTION="Swarm Classic: a container clustering system"
+HOMEPAGE="https://docs.docker.com/swarm"
+LICENSE="Apache-2.0 CC-BY-SA-4.0 BSD BSD-2 ISC MIT MPL-2.0 WTFPL-2"
+SLOT="0"
+IUSE=""
+RESTRICT="test"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_prepare() {
+ # It would require internet access to run `go mod vendor`, so
+ # generate approximate go.mod and vendor/modules.txt from the
+ # content of vendor.conf. Use a dummy vendor_version that is
+ # good enough for go to recognize as a valid version.
+ rm -f go.mod vendor/modules.txt || die
+ local x vendor_version=v1.0.0
+ printf -- 'module %s\n' "${EGO_PN}" >> go.mod || die
+ printf -- 'go 1.14\n' >> go.mod || die
+ printf -- 'require (\n' >> go.mod || die
+ while read -r x; do
+ printf -- '\t%s %s\n' "${x}" "${vendor_version}" >> go.mod || die
+ printf -- '# %s %s\n' "${x}" "${vendor_version}" >> vendor/modules.txt || die
+ printf -- '## explicit\n' >> vendor/modules.txt || die
+ printf -- '%s\n' "${x}" >> vendor/modules.txt || die
+ done < <(grep -Eo "^[^#[:space:]]+" vendor.conf)
+ printf -- ')\n' >> go.mod || die
+ default
+}
+
+src_compile() {
+ GOBIN="${S}/bin" \
+ go install -v -work -x -mod=vendor -x \
+ -ldflags "-w -X github.com/docker/swarm/version.GITCOMMIT=${EGIT_COMMIT} \
+ -X github.com/docker/swarm/version.BUILDTIME=$(date -u +%FT%T%z)" \
+ ./... || die
+}
+
+src_install() {
+ dobin bin/swarm
+ dosym swarm /usr/bin/docker-swarm
+ dodoc CHANGELOG.md CONTRIBUTING.md logo.png README.md
+}
diff --git a/app-emulation/open-vm-tools/Manifest b/app-emulation/open-vm-tools/Manifest
index 7a4c2c3d6bf1..3860659e62e1 100644
--- a/app-emulation/open-vm-tools/Manifest
+++ b/app-emulation/open-vm-tools/Manifest
@@ -1 +1,2 @@
DIST open-vm-tools-11.0.1-14773994.tar.gz 3972888 BLAKE2B 8ead9b37e9fa861386087d50af4e20274a9ee9fafd929da3ca0652ea2c4eecff4c203cadf02d38401bfd7ff0129ebcc7895d2819785cf2d818aac91a46f8d163 SHA512 3f500b3f0daaed01f787cf271d094b693baa18304491c3b58c79b64ab7db41b1b4a4747440e0039b2d9f9cc7e1474ee15f0ee7413544a34c2c9402443c145276
+DIST open-vm-tools-11.1.0-16036546.tar.gz 3986835 BLAKE2B f02e9426fb324ec0f4f78f43554a55ce0b615f609f888c008e8ecaf59332b9e25b0c865730cd263be1936d223c9cd5e078d304d1ddd8903cec88512cd63c258b SHA512 cd1f8399b9660ecac8222cfdc0d6331dce67db2f3a1788f21b18b201066dbcd059f429130f1fb5b416bb9a06b4882ec462a134aa8ca595f17dc48af0b7f59e8e
diff --git a/app-emulation/open-vm-tools/open-vm-tools-11.1.0.ebuild b/app-emulation/open-vm-tools/open-vm-tools-11.1.0.ebuild
new file mode 100644
index 000000000000..b9f5c70c0417
--- /dev/null
+++ b/app-emulation/open-vm-tools/open-vm-tools-11.1.0.ebuild
@@ -0,0 +1,142 @@
+# Copyright 2007-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools linux-info pam systemd toolchain-funcs
+
+DESCRIPTION="Opensourced tools for VMware guests"
+HOMEPAGE="https://github.com/vmware/open-vm-tools"
+MY_P="${P}-16036546"
+SRC_URI="https://github.com/vmware/open-vm-tools/releases/download/stable-${PV}/${MY_P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="X +deploypkg +dnet doc +fuse gtkmm +icu multimon pam +resolutionkms +ssl static-libs +vgauth"
+REQUIRED_USE="
+ multimon? ( X )
+ vgauth? ( ssl )
+"
+
+RDEPEND="
+ dev-libs/glib
+ net-libs/libtirpc
+ deploypkg? ( dev-libs/libmspack )
+ fuse? ( sys-fs/fuse:0 )
+ pam? ( sys-libs/pam )
+ ssl? ( dev-libs/openssl:0 )
+ vgauth? (
+ dev-libs/libxml2
+ dev-libs/xmlsec
+ )
+ X? (
+ x11-libs/libXext
+ multimon? ( x11-libs/libXinerama )
+ x11-libs/libXi
+ x11-libs/libXrender
+ x11-libs/libXrandr
+ x11-libs/libXtst
+ x11-libs/libSM
+ x11-libs/libXcomposite
+ x11-libs/gdk-pixbuf:2
+ x11-libs/gtk+:3
+ gtkmm? (
+ dev-cpp/gtkmm:3.0
+ dev-libs/libsigc++:2
+ )
+ )
+ dnet? ( dev-libs/libdnet )
+ icu? ( dev-libs/icu:= )
+ resolutionkms? (
+ x11-libs/libdrm[video_cards_vmware]
+ virtual/libudev
+ )
+"
+
+DEPEND="${RDEPEND}
+ net-libs/rpcsvc-proto
+"
+
+BDEPEND="
+ dev-util/glib-utils
+ virtual/pkgconfig
+ doc? ( app-doc/doxygen )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+ "${FILESDIR}/10.1.0-mount.vmhgfs.patch"
+ "${FILESDIR}/10.1.0-Werror.patch"
+)
+
+pkg_setup() {
+ local CONFIG_CHECK="~VMWARE_BALLOON ~VMWARE_PVSCSI ~VMXNET3"
+ use X && CONFIG_CHECK+=" ~DRM_VMWGFX"
+ kernel_is -lt 3 9 || CONFIG_CHECK+=" ~VMWARE_VMCI ~VMWARE_VMCI_VSOCKETS"
+ kernel_is -lt 3 || CONFIG_CHECK+=" ~FUSE_FS"
+ kernel_is -lt 5 5 || CONFIG_CHECK+=" ~X86_IOPL_IOPERM"
+ linux-info_pkg_setup
+}
+
+src_prepare() {
+ eapply -p2 "${PATCHES[@]}"
+ eapply_user
+ eautoreconf
+}
+
+src_configure() {
+ local myeconfargs=(
+ --without-root-privileges
+ $(use_enable multimon)
+ $(use_with X x)
+ $(use_with X gtk3)
+ $(use_with gtkmm gtkmm3)
+ $(use_enable doc docs)
+ --disable-tests
+ $(use_enable resolutionkms)
+ $(use_enable static-libs static)
+ $(use_enable deploypkg)
+ $(use_with pam)
+ $(use_enable vgauth)
+ $(use_with dnet)
+ $(use_with icu)
+ )
+ # Avoid a bug in configure.ac
+ use ssl || myeconfargs+=( --without-ssl )
+
+ econf "${myeconfargs[@]}"
+}
+
+src_install() {
+ default
+ find "${ED}" -name '*.la' -delete || die
+
+ if use pam; then
+ rm "${ED}"/etc/pam.d/vmtoolsd || die
+ pamd_mimic_system vmtoolsd auth account
+ fi
+
+ newinitd "${FILESDIR}/open-vm-tools.initd" vmware-tools
+ newconfd "${FILESDIR}/open-vm-tools.confd" vmware-tools
+
+ if use vgauth; then
+ systemd_newunit "${FILESDIR}"/vmtoolsd.vgauth.service vmtoolsd.service
+ systemd_dounit "${FILESDIR}"/vgauthd.service
+ else
+ systemd_dounit "${FILESDIR}"/vmtoolsd.service
+ fi
+
+ # Replace mount.vmhgfs with a wrapper
+ mv "${ED}"/usr/sbin/{mount.vmhgfs,hgfsmounter} || die
+ dosbin "${FILESDIR}/mount.vmhgfs"
+
+ # Make fstype = vmhgfs-fuse work in fstab
+ dosym vmhgfs-fuse /usr/bin/mount.vmhgfs-fuse
+
+ if use X; then
+ fperms 4711 /usr/bin/vmware-user-suid-wrapper
+ dobin scripts/common/vmware-xdg-detect-de
+ fi
+}
diff --git a/app-emulation/slirp4netns/Manifest b/app-emulation/slirp4netns/Manifest
index 2bcb29f87ea9..397b20493281 100644
--- a/app-emulation/slirp4netns/Manifest
+++ b/app-emulation/slirp4netns/Manifest
@@ -1,2 +1 @@
-DIST slirp4netns-1.0.0.tar.gz 51919 BLAKE2B 9d2d95de80e644981f185a6c243949e55761b25cb908c1ee727f06264d08e794e8228a197e0cc858f81f582d3ddb349c5d6cd2566944c63f41299fb2a5a0d3d2 SHA512 fe0256f0b91647b361999915c6c2b975ee33c437afef3cf490f5e33f582da4db97e360e86654831d7e9b2a8b0d78c91080874a9377247693ac54ffdb60ca6fb9
DIST slirp4netns-1.0.1.tar.gz 51911 BLAKE2B d125dd2c24fd7a817d2b8f16c6bac66399a4a0f37c49d43541f336e7ff09673bca2d6ed2c62cc856034b8e2f6e11ac1ff3753d3546148e68ddf085e8b9aca354 SHA512 4947e32d88c3c8f1b7b2e94a1e73041a48cc8ddf75ffaf691d44cb6ebeaef5cf0b0abb7a8df8919682dfc854a76d73fc5bdebcf01b3ace97be187068d704bf63
diff --git a/app-emulation/slirp4netns/slirp4netns-1.0.0.ebuild b/app-emulation/slirp4netns/slirp4netns-1.0.0.ebuild
deleted file mode 100644
index 4aaf598fb7e5..000000000000
--- a/app-emulation/slirp4netns/slirp4netns-1.0.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="User-mode networking for unprivileged network namespaces"
-HOMEPAGE="https://github.com/rootless-containers/slirp4netns"
-SRC_URI="https://github.com/rootless-containers/slirp4netns/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-KEYWORDS="~amd64"
-LICENSE="GPL-2"
-SLOT="0"
-
-RDEPEND="
- dev-libs/glib:2=
- dev-libs/libpcre:=
- net-libs/libslirp:=
- sys-libs/libseccomp:=
- sys-libs/libcap:="
-
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-RESTRICT="test"
-
-src_prepare() {
- eautoreconf
- default
-}
-
-pkg_postinst() {
- if [[ -z ${REPLACING_VERSIONS} ]]; then
- elog "You need to have the tun kernel module loaded in order to have"
- elog "slirp4netns working"
- fi
-}
diff --git a/app-emulation/slirp4netns/slirp4netns-1.0.1.ebuild b/app-emulation/slirp4netns/slirp4netns-1.0.1.ebuild
index 4aaf598fb7e5..2d9af4a06ab7 100644
--- a/app-emulation/slirp4netns/slirp4netns-1.0.1.ebuild
+++ b/app-emulation/slirp4netns/slirp4netns-1.0.1.ebuild
@@ -25,6 +25,9 @@ DEPEND="${RDEPEND}
RESTRICT="test"
src_prepare() {
+ # Respect AR variable for bug 722162.
+ sed -e 's|^AC_PROG_CC$|AC_DEFUN([AC_PROG_AR], [AC_CHECK_TOOL(AR, ar, :)])\nAC_PROG_AR\n\0|' \
+ -i configure.ac || die
eautoreconf
default
}
diff --git a/app-emulation/wine-staging/Manifest b/app-emulation/wine-staging/Manifest
index a7def3eb9a32..d735139783c7 100644
--- a/app-emulation/wine-staging/Manifest
+++ b/app-emulation/wine-staging/Manifest
@@ -1,9 +1,9 @@
DIST gentoo-wine-patches-20191222.tar.xz 59236 BLAKE2B 1b2c7b3ab69e5603d0f176a88c13b6d532f94f319ad29821faa699e828d90cfbe92c02b6e73b72eb16e565707c49885833fe557809ed16f4a6f0f182de9bb6e6 SHA512 a030fad55be5e1d909bc50e430c9a99846b88d7555f12749e101ba83f04df5af23eeb726b5ed78f847a66d11ac0a838bc69bd5bf8cf53da77ad454d2a2fe65cf
-DIST wine-5.4.tar.xz 22917904 BLAKE2B ceaa8516ddc0c2421b92da0ef047465cfa9fc203dfce93b42ca76409bab5e24709d173a4ed519b78f32d8ee99ffd9f0d06ee4156357f995c75e434b0249a31e2 SHA512 892e8b875484ada01eaddab4ea50992f95cf3ced6730f8e2ca1f0765770d7fa53a21080c526772b9b3ac83b3559d3d68e83ad3af3afbe9d6f931d833afde7e98
DIST wine-5.5.tar.xz 23630916 BLAKE2B 52855c891bb2f6431d0cb02e7b64b28525ad952b548771dd7ff89f95842f9f8e27c941cef7e963b8fb4c7d84c6fd28dba8edfbab90ba683b9f32c41583837e0a SHA512 9c7870dd829effe5fd1be342f85a85e2d1f791bfd871279253dd91becd97dea41c6c4f7a9faec0153e58e360d4e3b4d659daf0d21f07a142d06534e0c229aacd
DIST wine-5.6.tar.xz 23678216 BLAKE2B 7aee9a46c037d46d07a551a839056783c020d2e5c66c9caf9c8dacd5071cc9bc9df1c3ea56d6ec07cf83ac681baee6849e786a1202d99f139e1645c374c72704 SHA512 b12b0eff228ecd783fec8bf91f97e4387125226b172046d800e1fbffa303ceca32f1f647b9e8ceb24d303c23eb57188be14ddd8ba5fc04ba781a69186fbe6be4
DIST wine-5.7.tar.xz 23723624 BLAKE2B fbea8f753dee57368f7532eef6fe6bf366ba52e9c2b970147207cf879858b86a74d0dfb1f813cfd31058462aaa09f74dd07924370b4c3f032f0dcd0015eab90b SHA512 46a8050cb21edf1116c93fd73fdc3bbbc1a19e18d77c38bc192f13e55954d3e503122c780ca9c1a50005b0bca6f3b0c640f3de05267f25289e08660321e27407
-DIST wine-staging-5.4.tar.gz 9924147 BLAKE2B c82fa66470645e62e63e8760d68cb92e4a04c209db712371bc1a534756c6b16c109e247bb1866edc514bdb24ba6a9e9f4ccb5c0db204d51541da0af82fd3b96f SHA512 d4958e73cea34a4a722f516487116d9f77a22099cb80b9c79f2468fbe28855acec131dacecfd255a9934fb88bcf34809bfb2e2e518d89ac23bcae125b6d6c86b
+DIST wine-5.8.tar.xz 23753648 BLAKE2B 086f37ce469f6d176eab8daa2d124b1774526727e2f6fe4ecdd39862c13ed493ac4164cf98848d5bc8cba3675e13365f6ea2b34591d518c40c34d09556851578 SHA512 7b9df380655a72e8b9e95ca271a62308262d8efabbeb2ad459071afc9ed51518b42b1f75b019fe8d6b53cf5185e9cfc45ac1b8a7092f118fa2aff14f99c012de
DIST wine-staging-5.5.tar.gz 9920540 BLAKE2B 21b24fd3a2b3ee9c9ea029e1114d0faaf0b8a4ef732eafb4f7e0301886aee9160699867147c4087515a37edc57a42919c662b1e203bf9df674d78579b3be3c39 SHA512 8e926d73f275ed36b1c1e55235831c171b427501265a0e859accc7ca6b5077513bc2b3d37d973842b76b57a56798d11c101a387c626c96ed422d8a06cd908221
DIST wine-staging-5.6.tar.gz 9922611 BLAKE2B 945e7a6398d6f3f8f85f334a06462282647405cf0b7d0e9d1985c9c5daa460c1bb9f8dc66d090311aeb8136d0603e836084bbeb2904833f4f73d7fdd9dd9bef1 SHA512 7ddf5699834a6e04b094a7cae008175c874415d22554bac38176f3121b9533071ef610f8b5a0dd3ce3e4adf8a9d4ac214aa1cee7634959c5150b66fbb74710b7
DIST wine-staging-5.7.tar.gz 9913511 BLAKE2B f5d803a067ec61c5d698d7ebf0623b55f0e4fee487e6fcfb4de057d742ff4d55bf184004c4427e8b93052efa74fe9e14da2a41a826c79a0c62ef25de7b6e10ef SHA512 042bcf7b90769c9d88d5cd844009301fb768568ee10ebf7aed9c3397ca35f6d6b512db2010917695f32bed9edf174d95f80a141d5af75a43871444b1830f2922
+DIST wine-staging-5.8.tar.gz 9878712 BLAKE2B a96f7e4aa1d1dddcda1a9d6a30ab3b564fb365a09efde22e5b7abab1ac015da0bc242b2fec6d4ae14dc5ddad38e3314a5f8c430e6eb10853ed8619e805bf5787 SHA512 3ea2a90ab0613b680274c95cf7ef3d3a7d807571fb792e05fc1df9bbd7a35c80a0d7c38342fea8858c5557ae3f12287a7ce09d0cdab5064000b79ec6c891ad15
diff --git a/app-emulation/wine-staging/wine-staging-5.4.ebuild b/app-emulation/wine-staging/wine-staging-5.8.ebuild
similarity index 98%
rename from app-emulation/wine-staging/wine-staging-5.4.ebuild
rename to app-emulation/wine-staging/wine-staging-5.8.ebuild
index 81084a55cb34..59a4de5dea0d 100644
--- a/app-emulation/wine-staging/wine-staging-5.4.ebuild
+++ b/app-emulation/wine-staging/wine-staging-5.8.ebuild
@@ -44,7 +44,7 @@ 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 v4l vaapi vkd3d vulkan +X +xcomposite xinerama +xml"
+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"
REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
X? ( truetype )
elibc_glibc? ( threads )
@@ -112,6 +112,7 @@ COMMON_DEPEND="
truetype? ( >=media-libs/freetype-2.0.0[${MULTILIB_USEDEP}] )
udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
+ unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
vaapi? ( x11-libs/libva[X,${MULTILIB_USEDEP}] )
vkd3d? ( app-emulation/vkd3d[${MULTILIB_USEDEP}] )
@@ -129,7 +130,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:4.9.4 )
+ mono? ( app-emulation/wine-mono:5.0.0 )
perl? (
dev-lang/perl
dev-perl/XML-Simple
@@ -165,7 +166,6 @@ 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=()
@@ -353,7 +353,7 @@ src_prepare() {
ewarn "Applying the Wine-Staging patchset. Any bug reports to the"
ewarn "Wine bugzilla should explicitly state that staging was used."
- local STAGING_EXCLUDE=""
+ local STAGING_EXCLUDE="-W winemenubuilder-Desktop_Icon_Path" #652176
use pipelight || STAGING_EXCLUDE="${STAGING_EXCLUDE} -W Pipelight"
# Launch wine-staging patcher in a subshell, using eapply as a backend, and gitapply.sh as a backend for binary patches
@@ -473,6 +473,7 @@ multilib_src_configure() {
$(use_enable test tests)
$(use_with truetype freetype)
$(use_with udev)
+ $(use_with unwind)
$(use_with v4l v4l2)
$(use_with vkd3d)
$(use_with vulkan)
diff --git a/app-emulation/wine-vanilla/Manifest b/app-emulation/wine-vanilla/Manifest
index e661a90e131c..cef95d5845fe 100644
--- a/app-emulation/wine-vanilla/Manifest
+++ b/app-emulation/wine-vanilla/Manifest
@@ -2,7 +2,7 @@ DIST gentoo-wine-patches-20180120.tar.xz 58672 BLAKE2B 84d621075b65475cec41a0642
DIST gentoo-wine-patches-20191222.tar.xz 59236 BLAKE2B 1b2c7b3ab69e5603d0f176a88c13b6d532f94f319ad29821faa699e828d90cfbe92c02b6e73b72eb16e565707c49885833fe557809ed16f4a6f0f182de9bb6e6 SHA512 a030fad55be5e1d909bc50e430c9a99846b88d7555f12749e101ba83f04df5af23eeb726b5ed78f847a66d11ac0a838bc69bd5bf8cf53da77ad454d2a2fe65cf
DIST wine-4.0.3.tar.xz 21680420 BLAKE2B a7caf4b82fa2594f77e31f29b2a3da59c08bb58f213268d61bdf48998345162bc36fbfc24db94d11cb07b6da347b3471e9d8976d9abfa0f76c183c0a519aa73e SHA512 a8fde0bcf600eaec56c3ce58c9aa992386784c85cf1c93aa84d50aff4c842b12a6b099c23391d3ad9a0059f3dc9069c0f8e00fad293305ba8a33afc70bf26e14
DIST wine-5.0.tar.xz 22469428 BLAKE2B d26938e707545d31ed932c67eaaa9fd137e42daa6facadeaea2897797ec816658edc1b89c649e0cb5c453ca53ebea5d7156fdd188f1afe2a55ca7834e012e276 SHA512 681de951804c3dd3ae8c677a0ea52d172b04cac58594698b191cd972b25899cd2030d01a25fc2ad2eb6b99976a30319d2bd5ba8b7ff98b1a8b43832fa6514b83
-DIST wine-5.4.tar.xz 22917904 BLAKE2B ceaa8516ddc0c2421b92da0ef047465cfa9fc203dfce93b42ca76409bab5e24709d173a4ed519b78f32d8ee99ffd9f0d06ee4156357f995c75e434b0249a31e2 SHA512 892e8b875484ada01eaddab4ea50992f95cf3ced6730f8e2ca1f0765770d7fa53a21080c526772b9b3ac83b3559d3d68e83ad3af3afbe9d6f931d833afde7e98
DIST wine-5.5.tar.xz 23630916 BLAKE2B 52855c891bb2f6431d0cb02e7b64b28525ad952b548771dd7ff89f95842f9f8e27c941cef7e963b8fb4c7d84c6fd28dba8edfbab90ba683b9f32c41583837e0a SHA512 9c7870dd829effe5fd1be342f85a85e2d1f791bfd871279253dd91becd97dea41c6c4f7a9faec0153e58e360d4e3b4d659daf0d21f07a142d06534e0c229aacd
DIST wine-5.6.tar.xz 23678216 BLAKE2B 7aee9a46c037d46d07a551a839056783c020d2e5c66c9caf9c8dacd5071cc9bc9df1c3ea56d6ec07cf83ac681baee6849e786a1202d99f139e1645c374c72704 SHA512 b12b0eff228ecd783fec8bf91f97e4387125226b172046d800e1fbffa303ceca32f1f647b9e8ceb24d303c23eb57188be14ddd8ba5fc04ba781a69186fbe6be4
DIST wine-5.7.tar.xz 23723624 BLAKE2B fbea8f753dee57368f7532eef6fe6bf366ba52e9c2b970147207cf879858b86a74d0dfb1f813cfd31058462aaa09f74dd07924370b4c3f032f0dcd0015eab90b SHA512 46a8050cb21edf1116c93fd73fdc3bbbc1a19e18d77c38bc192f13e55954d3e503122c780ca9c1a50005b0bca6f3b0c640f3de05267f25289e08660321e27407
+DIST wine-5.8.tar.xz 23753648 BLAKE2B 086f37ce469f6d176eab8daa2d124b1774526727e2f6fe4ecdd39862c13ed493ac4164cf98848d5bc8cba3675e13365f6ea2b34591d518c40c34d09556851578 SHA512 7b9df380655a72e8b9e95ca271a62308262d8efabbeb2ad459071afc9ed51518b42b1f75b019fe8d6b53cf5185e9cfc45ac1b8a7092f118fa2aff14f99c012de
diff --git a/app-emulation/wine-vanilla/wine-vanilla-5.4.ebuild b/app-emulation/wine-vanilla/wine-vanilla-5.8.ebuild
similarity index 98%
rename from app-emulation/wine-vanilla/wine-vanilla-5.4.ebuild
rename to app-emulation/wine-vanilla/wine-vanilla-5.8.ebuild
index ab4b0c11da26..f1b0c2c98e78 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-5.4.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-5.8.ebuild
@@ -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 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 +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"
REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
X? ( truetype )
elibc_glibc? ( threads )
@@ -93,6 +93,7 @@ COMMON_DEPEND="
truetype? ( >=media-libs/freetype-2.0.0[${MULTILIB_USEDEP}] )
udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
+ unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
vkd3d? ( app-emulation/vkd3d[${MULTILIB_USEDEP}] )
vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] )
@@ -109,7 +110,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:4.9.4 )
+ mono? ( app-emulation/wine-mono:5.0.0 )
perl? (
dev-lang/perl
dev-perl/XML-Simple
@@ -141,7 +142,6 @@ 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=()
@@ -406,6 +406,7 @@ multilib_src_configure() {
$(use_enable test tests)
$(use_with truetype freetype)
$(use_with udev)
+ $(use_with unwind)
$(use_with v4l v4l2)
$(use_with vkd3d)
$(use_with vulkan)
diff --git a/app-forensics/Manifest.gz b/app-forensics/Manifest.gz
index 48e0a247fc9b..a64de3cd5e3b 100644
Binary files a/app-forensics/Manifest.gz and b/app-forensics/Manifest.gz differ
diff --git a/app-forensics/foremost/files/foremost-1.5.7-set-but-unused.patch b/app-forensics/foremost/files/foremost-1.5.7-set-but-unused.patch
new file mode 100644
index 000000000000..59b52c68615d
--- /dev/null
+++ b/app-forensics/foremost/files/foremost-1.5.7-set-but-unused.patch
@@ -0,0 +1,230 @@
+diff --git a/api.c b/api.c
+index e3ee339..67463a6 100755
+--- a/api.c
++++ b/api.c
+@@ -478,7 +478,7 @@ int dump_dirent(int which_one)
+ {
+ int i;
+ char *p;
+- short unknown;
++ // short unknown;
+ struct OLE_DIR *dir;
+
+ dir = (struct OLE_DIR *) &buffer[which_one * sizeof(struct OLE_DIR)];
+@@ -493,7 +493,7 @@ int dump_dirent(int which_one)
+ p = dir->name;
+ if (*p < ' ')
+ {
+- unknown = *((short *)p);
++ //unknown = *((short *)p);
+
+ //fprintf (stderr, "%04x\t", unknown);
+ p += 2; /* step over unknown short */
+diff --git a/engine.c b/engine.c
+index 85add5f..4a1ef13 100755
+--- a/engine.c
++++ b/engine.c
+@@ -316,7 +316,6 @@ int search_chunk(f_state *s, unsigned char *buf, f_info *i, u_int64_t chunk_size
+ //u_int64_t buf_off = 0;
+
+ unsigned char *foundat = buf;
+- unsigned char *current_pos = NULL;
+ unsigned char *header_pos = NULL;
+ unsigned char *newbuf = NULL;
+ unsigned char *ind_ptr = NULL;
+@@ -461,7 +460,6 @@ int search_chunk(f_state *s, unsigned char *buf, f_info *i, u_int64_t chunk_size
+ }
+
+ c_offset = (foundat - buf);
+- current_pos = foundat;
+
+ /*Now lets analyze the file and see if we can determine its size*/
+
+@@ -511,12 +509,12 @@ int search_chunk(f_state *s, unsigned char *buf, f_info *i, u_int64_t chunk_size
+ newbuf = read_from_disk(c_offset + f_offset, i, needle->max_len);
+ if (newbuf == NULL)
+ break;
+- current_pos = extract_file(s,
+- c_offset,
+- newbuf,
+- needle->max_len,
+- needle,
+- f_offset);
++ extract_file(s,
++ c_offset,
++ newbuf,
++ needle->max_len,
++ needle,
++ f_offset);
+
+ /*Lets put the fp back*/
+ fseeko(i->handle, saveme, SEEK_SET);
+diff --git a/extract.c b/extract.c
+index 9639117..4fecde5 100755
+--- a/extract.c
++++ b/extract.c
+@@ -553,7 +553,6 @@ unsigned char *extract_htm(f_state *s, u_int64_t c_offset, unsigned char *founda
+ {
+ unsigned char *buf = foundat;
+ unsigned char *extractbuf = NULL;
+- unsigned char *currentpos = NULL;
+
+ int bytes_to_search = 0;
+ int i = 0;
+@@ -582,7 +581,6 @@ unsigned char *extract_htm(f_state *s, u_int64_t c_offset, unsigned char *founda
+ }
+
+ /*Store the current position and search for the HTML> tag*/
+- currentpos = foundat;
+ foundat = bm_search(needle->footer,
+ needle->footer_len,
+ foundat,
+@@ -1146,15 +1144,15 @@ unsigned char *extract_mov(f_state *s, u_int64_t c_offset, unsigned char *founda
+ unsigned char *extract_wmv(f_state *s, u_int64_t c_offset, unsigned char *foundat, u_int64_t buflen,
+ s_spec *needle, u_int64_t f_offset)
+ {
+-
+- unsigned char *currentpos = NULL;
++#ifdef DEBUG
++ u_int64_t fileObjHeaderSize = 0;
++#endif
+ unsigned char *header = foundat;
+ unsigned char *extractbuf = NULL;
+ unsigned char *buf = foundat;
+ unsigned int size = 0;
+ u_int64_t file_size = 0;
+ u_int64_t headerSize = 0;
+- u_int64_t fileObjHeaderSize = 0;
+ int numberofHeaderObjects = 0;
+ int reserved[2];
+ int bytes_to_search = 0;
+@@ -1184,7 +1182,6 @@ unsigned char *extract_wmv(f_state *s, u_int64_t c_offset, unsigned char *founda
+ return foundat;
+ }
+
+- currentpos = foundat;
+ if (buflen - (foundat - buf) >= needle->max_len)
+ bytes_to_search = needle->max_len;
+ else
+@@ -1201,7 +1198,9 @@ unsigned char *extract_wmv(f_state *s, u_int64_t c_offset, unsigned char *founda
+ if (foundat)
+ {
+ foundat += 16; /*jump to the headersize*/
++#ifdef DEBUG
+ fileObjHeaderSize = htoll(foundat, FOREMOST_LITTLE_ENDIAN);
++#endif
+ //printx(foundat,0,8);
+ foundat += 24; //Jump to the file size obj
+ size = htoi(foundat, FOREMOST_LITTLE_ENDIAN);
+@@ -1401,7 +1400,6 @@ unsigned char *extract_gif(f_state *s, u_int64_t c_offset, unsigned char *founda
+ s_spec *needle, u_int64_t f_offset)
+ {
+ unsigned char *buf = foundat;
+- unsigned char *currentpos = foundat;
+ unsigned char *extractbuf = NULL;
+ int bytes_to_search = 0;
+ unsigned short width = 0;
+@@ -1420,7 +1418,6 @@ unsigned char *extract_gif(f_state *s, u_int64_t c_offset, unsigned char *founda
+ sprintf(comment, " (%d x %d)", width, height);
+ strcat(needle->comment, comment);
+
+- currentpos = foundat;
+ if (buflen - (foundat - buf) >= needle->max_len)
+ bytes_to_search = needle->max_len;
+ else
+@@ -1821,7 +1818,6 @@ unsigned char *extract_jpeg(f_state *s, u_int64_t c_offset, unsigned char *found
+ s_spec *needle, u_int64_t f_offset)
+ {
+ unsigned char *buf = foundat;
+- unsigned char *currentpos = NULL;
+
+ unsigned char *extractbuf = NULL;
+ unsigned short headersize;
+@@ -1899,8 +1895,6 @@ unsigned char *extract_jpeg(f_state *s, u_int64_t c_offset, unsigned char *found
+ return buf + needle->header_len;
+ }
+
+- currentpos = foundat;
+-
+ //sprintf("Searching for footer\n");
+ if (buflen < (foundat - buf)) {
+ #ifdef DEBUG
+@@ -2094,19 +2088,21 @@ unsigned char *extract_exe(f_state *s, u_int64_t c_offset, unsigned char *founda
+ unsigned char *extractbuf = NULL;
+ u_int64_t file_size = 0;
+ unsigned short pe_offset = 0;
+- unsigned int SizeOfCode = 0;
+- unsigned int SizeOfInitializedData = 0;
+- unsigned int SizeOfUninitializedData = 0;
+- unsigned int rva = 0;
+ unsigned int offset = 0;
+ unsigned short sections = 0;
+- unsigned int sizeofimage = 0;
+ unsigned int raw_section_size = 0;
+- unsigned int size_of_headers = 0;
+ unsigned short dll = 0;
+ unsigned int sum = 0;
+ unsigned short exe_char = 0;
++#ifdef DEBUG
++ unsigned int SizeOfInitializedData = 0;
++ unsigned int SizeOfUninitializedData = 0;
++ unsigned int SizeOfCode = 0;
++ unsigned int rva = 0;
++ unsigned int sizeofimage = 0;
++ unsigned int size_of_headers = 0;
+ unsigned int align = 0;
++#endif
+ int i = 0;
+ time_t compile_time = 0;
+ struct tm *ret_time;
+@@ -2167,14 +2163,16 @@ unsigned char *extract_exe(f_state *s, u_int64_t c_offset, unsigned char *founda
+
+ foundat += 0x18; /*Jump to opt header should be 0x0b 0x01*/
+
++#ifdef DEBUG
+ SizeOfCode = htoi(&foundat[4], FOREMOST_LITTLE_ENDIAN);
+ SizeOfInitializedData = htoi(&foundat[8], FOREMOST_LITTLE_ENDIAN);
+ SizeOfUninitializedData = htoi(&foundat[12], FOREMOST_LITTLE_ENDIAN);
+ rva = htoi(&foundat[16], FOREMOST_LITTLE_ENDIAN);
+ align = htoi(&foundat[36], FOREMOST_LITTLE_ENDIAN);
+-
+ sizeofimage = htoi(&foundat[56], FOREMOST_LITTLE_ENDIAN);
+ size_of_headers = htoi(&foundat[60], FOREMOST_LITTLE_ENDIAN);
++#endif
++
+ foundat += 224;
+
+ /*Start of sections*/
+@@ -2193,13 +2191,13 @@ unsigned char *extract_exe(f_state *s, u_int64_t c_offset, unsigned char *founda
+ sum = offset + raw_section_size;
+ }
+
+- /*
++#ifdef DEBUG
+ printf("rva is %d sum= %d\n",rva,sum);
+ printf("soi is %d,soh is %d \n",sizeofimage,size_of_headers);
+ printf("we are off by %d\n",sum-buflen);
+ printf("soc=%d ,soidr=%d, souid=%d\n",SizeOfCode,SizeOfInitializedData,SizeOfUninitializedData);
+ printf("fs=%d ,extr=%d\n",SizeOfCode+SizeOfInitializedData,SizeOfUninitializedData);
+- */
++#endif
+ file_size = sum;
+ if (file_size < 512 || file_size > 4 * MEGABYTE)
+ {
+@@ -2267,7 +2265,6 @@ unsigned char *extract_rar(f_state *s, u_int64_t c_offset, unsigned char *founda
+ {
+ unsigned char *buf = foundat;
+ unsigned char *extractbuf = NULL;
+- u_int64_t file_size = 0;
+ unsigned short headersize = 0;
+ unsigned short flags = 0;
+ unsigned int filesize = 0;
+@@ -2424,8 +2421,6 @@ unsigned char *extract_rar(f_state *s, u_int64_t c_offset, unsigned char *founda
+
+ /*We found the EOF, write the file to disk and return*/
+ tot_file_size = (foundat - buf);
+- if (tot_file_size > buflen)
+- file_size = buflen;
+
+ extractbuf = buf;
+ write_to_disk(s, needle, tot_file_size, extractbuf, c_offset + f_offset);
diff --git a/app-forensics/foremost/foremost-1.5.7-r3.ebuild b/app-forensics/foremost/foremost-1.5.7-r3.ebuild
index 531cf1318f8e..56cdeee6ed5d 100644
--- a/app-forensics/foremost/foremost-1.5.7-r3.ebuild
+++ b/app-forensics/foremost/foremost-1.5.7-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -15,12 +15,9 @@ KEYWORDS="amd64 ppc x86"
IUSE=""
LICENSE="public-domain"
SLOT="0"
-
-src_prepare() {
- epatch "${FILESDIR}/${PN}-1.4-config-location.patch"
- epatch "${FILESDIR}/${PN}-1.5.7-format-security.patch"
- default_src_prepare
-}
+PATCHES=("${FILESDIR}/${PN}-1.4-config-location.patch"
+ "${FILESDIR}/${PN}-1.5.7-format-security.patch"
+ "${FILESDIR}/${PN}-1.5.7-set-but-unused.patch")
src_compile() {
emake RAW_FLAGS="${CFLAGS} -Wall ${LDFLAGS}" RAW_CC="$(tc-getCC) -DVERSION=\\\"${PV}\\\"" \
diff --git a/app-forensics/sleuthkit/sleuthkit-4.9.0.ebuild b/app-forensics/sleuthkit/sleuthkit-4.9.0.ebuild
index d33581455203..12d63a2f552c 100644
--- a/app-forensics/sleuthkit/sleuthkit-4.9.0.ebuild
+++ b/app-forensics/sleuthkit/sleuthkit-4.9.0.ebuild
@@ -37,7 +37,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.gz
LICENSE="BSD CPL-1.0 GPL-2+ IBM java? ( Apache-2.0 )"
SLOT="0/13" # subslot = major soname version
-KEYWORDS="~amd64 ~hppa ~ppc ~x86"
+KEYWORDS="~amd64 hppa ~ppc ~x86"
IUSE="aff doc ewf java postgres static-libs test +threads zlib"
RESTRICT="!test? ( test )"
diff --git a/app-i18n/Manifest.gz b/app-i18n/Manifest.gz
index eee000437e7e..2b5e41794368 100644
Binary files a/app-i18n/Manifest.gz and b/app-i18n/Manifest.gz differ
diff --git a/app-i18n/ibus-typing-booster/Manifest b/app-i18n/ibus-typing-booster/Manifest
index 784179cf17b6..cabeed7662bd 100644
--- a/app-i18n/ibus-typing-booster/Manifest
+++ b/app-i18n/ibus-typing-booster/Manifest
@@ -1,2 +1,2 @@
-DIST ibus-typing-booster-2.7.0.tar.gz 7364094 BLAKE2B 60a45121b398032b2581d1f3e5929e74e69ee22bf0807b069529afb30797daacece47e83b0696397e6b9c3f6adc28012c7f2b7102387e03eb360383946e836b2 SHA512 a11d2cad660dc813022eda89bb690e3fe7cd517ad6a3cbc7f31879afb60c5d1628f25beb423f922b26d7dd92c685471c767084cdd3a35aff1e2314a21cd757c1
DIST ibus-typing-booster-2.8.0.tar.gz 8018809 BLAKE2B 9306b980623094a8b72d6824292d8d52a90df69b7f1f7df11c0df63c5d2c4f2aa1ca4e2765320096915b30cc807fbe24f64a219c3beb1bec4a1d81be4511779a SHA512 64c112275ec63ac3d3c13202256be8bfded152da7b08dde7e6eb01dd38fd48535d63daaa6c2fcc09e64dcd4927931380ccd0a0be739f04330fb15dc0d4fe1823
+DIST ibus-typing-booster-2.8.2.tar.gz 8161995 BLAKE2B 79c7bacb7c5a07139c710ddf063b58ed6bc15d1f58529dfaa0d8f1935cb513fe27ad5e95af0ca7383922f5642d1197cf74183ba2463a3fa81637add5d8376691 SHA512 3dffc21aae59ebc8c7b3ef3df588f958b4a42a2025dc6a82613e9bb1b324f8c999d01b8d98ed48794b3ea8fd5c3221df489a88f8c54c154a69be9908beda85b5
diff --git a/app-i18n/ibus-typing-booster/ibus-typing-booster-2.8.0.ebuild b/app-i18n/ibus-typing-booster/ibus-typing-booster-2.8.0.ebuild
index 0091f717eeca..f22450c777f4 100644
--- a/app-i18n/ibus-typing-booster/ibus-typing-booster-2.8.0.ebuild
+++ b/app-i18n/ibus-typing-booster/ibus-typing-booster-2.8.0.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
PYTHON_REQ_USE="sqlite(+)"
inherit python-single-r1
@@ -18,7 +18,7 @@ IUSE=""
RESTRICT="test"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-CDEPEND="${PYTHON_DEPS}
+DEPEND="${PYTHON_DEPS}
dev-libs/m17n-lib
$(python_gen_cond_dep '
app-i18n/ibus[python(+),${PYTHON_MULTI_USEDEP}]
@@ -27,8 +27,7 @@ CDEPEND="${PYTHON_DEPS}
dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
dev-python/pyxdg[${PYTHON_MULTI_USEDEP}]
')"
-RDEPEND="${CDEPEND}
+RDEPEND="${DEPEND}
>=dev-db/m17n-db-1.7"
-DEPEND="${RDEPEND}
- sys-devel/gettext
+BDEPEND="sys-devel/gettext
virtual/pkgconfig"
diff --git a/app-i18n/ibus-typing-booster/ibus-typing-booster-2.7.0-r1.ebuild b/app-i18n/ibus-typing-booster/ibus-typing-booster-2.8.2.ebuild
similarity index 87%
rename from app-i18n/ibus-typing-booster/ibus-typing-booster-2.7.0-r1.ebuild
rename to app-i18n/ibus-typing-booster/ibus-typing-booster-2.8.2.ebuild
index 99d431fc2d5c..f22450c777f4 100644
--- a/app-i18n/ibus-typing-booster/ibus-typing-booster-2.7.0-r1.ebuild
+++ b/app-i18n/ibus-typing-booster/ibus-typing-booster-2.8.2.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
-PYTHON_COMPAT=( python{3_6,3_7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
PYTHON_REQ_USE="sqlite(+)"
inherit python-single-r1
@@ -18,7 +18,7 @@ IUSE=""
RESTRICT="test"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-CDEPEND="${PYTHON_DEPS}
+DEPEND="${PYTHON_DEPS}
dev-libs/m17n-lib
$(python_gen_cond_dep '
app-i18n/ibus[python(+),${PYTHON_MULTI_USEDEP}]
@@ -27,8 +27,7 @@ CDEPEND="${PYTHON_DEPS}
dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
dev-python/pyxdg[${PYTHON_MULTI_USEDEP}]
')"
-RDEPEND="${CDEPEND}
+RDEPEND="${DEPEND}
>=dev-db/m17n-db-1.7"
-DEPEND="${RDEPEND}
- sys-devel/gettext
+BDEPEND="sys-devel/gettext
virtual/pkgconfig"
diff --git a/app-metrics/Manifest.gz b/app-metrics/Manifest.gz
index a9f4b5f9913f..46525d1306ae 100644
Binary files a/app-metrics/Manifest.gz and b/app-metrics/Manifest.gz differ
diff --git a/app-metrics/collectd/collectd-5.11.0-r1.ebuild b/app-metrics/collectd/collectd-5.11.0-r2.ebuild
similarity index 99%
rename from app-metrics/collectd/collectd-5.11.0-r1.ebuild
rename to app-metrics/collectd/collectd-5.11.0-r2.ebuild
index dffe882cb45d..85a978ee3c47 100644
--- a/app-metrics/collectd/collectd-5.11.0-r1.ebuild
+++ b/app-metrics/collectd/collectd-5.11.0-r2.ebuild
@@ -131,6 +131,7 @@ COMMON_DEPEND="
collectd_plugins_sensors? ( sys-apps/lm-sensors:= )
collectd_plugins_sigrok? ( ${P}.tar.gz
- $(go-module_vendor_uris)"
-
-LICENSE="BSD MIT Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DEPEND="
- acct-group/dnsmasq_exporter
- acct-user/dnsmasq_exporter"
- RDEPEND="${DEPEND}"
-
-src_compile() {
- go build || die
-}
-
-src_install() {
- dobin dnsmasq_exporter
- keepdir /var/log/ddnsmasq_exporter
- fowners ${PN}:${PN} /var/log/ddnsmasq_exporter
- newinitd "${FILESDIR}"/${PN}.initd ${PN}
- newconfd "${FILESDIR}"/${PN}.confd ${PN}
-}
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index 39c4a5ebc8ab..623cbd3c4671 100644
Binary files a/app-misc/Manifest.gz and b/app-misc/Manifest.gz differ
diff --git a/app-misc/faq/faq-0.0.6.ebuild b/app-misc/faq/faq-0.0.6.ebuild
index 2d12deb9e4b3..a35fcb1a74be 100644
--- a/app-misc/faq/faq-0.0.6.ebuild
+++ b/app-misc/faq/faq-0.0.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
diff --git a/app-misc/pet/Manifest b/app-misc/pet/Manifest
index ff256356fe72..0c6126fd7d9b 100644
--- a/app-misc/pet/Manifest
+++ b/app-misc/pet/Manifest
@@ -1,22 +1,45 @@
-DIST github.com-BurntSushi-toml-v0.3.0.tar.gz 41554 BLAKE2B 2af83c65e70addb9d95a242c3ad7748d6d273578564009bd29fecf8537194e965f29d5087975792e60c39f250e3bafe313ce313305ef481ca6f05b81b4f33aa6 SHA512 3f3cc441787c41029c4b4944e6437919abbd31d3d53b361ce22f6237d76655357936bab90ee8f3340ea9550cbe90f3a369b3209321e8bb6bbeca0892babca6fe
-DIST github.com-briandowns-spinner-48dbb65d7bd5c74ab50d53d04c949f20e3d14944.tar.gz 11663 BLAKE2B 17e4c4d8403663b27c85074f456c60f7da3d43c875816b6f4da32ccc4c422b59cb28c11a894705430b6001766ba3a63ddaade95ab1510f87ce19cfe0b1391d04 SHA512 9ba6de3249259ddbc81faef63e0c801822687f875acb5965dcdfd52c85bca887dd5248be731e0731f1dcf274de64a87630cb902fc2e15718ffb327922f023bea
-DIST github.com-chzyer-readline-2972be24d48e78746da79ba8e24e8b488c9880de.tar.gz 36832 BLAKE2B a66fdb5126e9a9f7dfd52360d0a26916764a96df95b1d995ea1a83aac26227e16d3a2c3a419746c8ad03ba5bef4724a6abadf0ee3fdd84f347d595b9db88b6e1 SHA512 fb84020d5519cd0c5c2c06df598122e1bad3a31ed6b545aae66547e43d48d3da04a75799db9ca8957af1bd47ce2c1542440287c6722e0ab2c27b23ea9631e09a
-DIST github.com-fatih-color-v1.7.0.tar.gz 816449 BLAKE2B f006f51cbd1a0288380b339d7d2b493e447aa1e6bd783f11de5670d4db6ff8c1463cbe957a04127c1f24186a9362be8c40ecdf4394cbbc0e2c6c2cb598c012ac SHA512 ee5668ce828ad3e5461c54d971aee4b10a578f697717010d60fdda641948430816e74580563dfea6a4c66a9840175ff5b63c2ca9cf1af213cfac5be7b8ddac36
-DIST github.com-golang-appengine-v1.0.0.tar.gz 230886 BLAKE2B 1edb9998d1e7add28dd7f900874d1f2de83c9ae6bde94556dbe221e0077d665bd77f07bf7461eb5baaf5ce5bdbb765de41cb2412dbc618a4b475ff73c481c50f SHA512 0948582b3cf0520f0f2052aa04bda2409ee5f2f6d4781b95d208f2c6121bfe3383099ccf99f6c78ac90c6c35ae9e7dd7d0c317917daaa0e8bc7fe99f0b7d09b9
-DIST github.com-golang-crypto-8ac0e0d97ce45cd83d1d7243c060cb8461dda5e9.tar.gz 1613170 BLAKE2B e151da61e2070a138d449767c1151be43b53b301daeba95935af2b871cf1216d76f764ccc43263947091c70120323dc50e34645013454f6cfc3bf8123497025b SHA512 c36a53920a68eb0157ca36aec22f32cb5a3fd43d777268dd834787ce941335472ad97f173db7ace7fd60a9a53235b684431d245d03d2de63b0a403e6b136f6d6
-DIST github.com-golang-net-1e491301e022f8f977054da4c2d852decd59571f.tar.gz 950358 BLAKE2B 7b5a47d00de2d3261d3031f8b1bcc15ca037dc320c0ecdd43b53d03202a8b4ff30b03906e322466177bb489e446c25b4dea6696bfea636fe68bad3ef85fed6c3 SHA512 adf4db073e376178fe180c98908c071be49919a87d9d5476407c4371ef397fcd469c20363f0133a856a8dbb2b1a54c9590029386079c88df72fc09effccd95d7
-DIST github.com-golang-oauth2-1e0a3fa8ba9a5c9eb35c271780101fdaf1b205d7.tar.gz 42533 BLAKE2B 7eb92ec84a084767aa43c89882c13bfdb4db437fe8354e430fb110f673816de9bfc219cb81c7d55d15fd7c3a08a1cccae8f539e115177e50598a0560170c8fe8 SHA512 9321bd14f949990ea9befcc9f5c0db5e5f7139eae7b498c36694bff1797e675d621f344992b472e021c06062363b47fcc61aa6492014af594bc9590e4db5f6ea
-DIST github.com-golang-sys-9527bec2660bd847c050fda93a0f0c6dee0800bb.tar.gz 972371 BLAKE2B a4814d48cf7356deef16c543150f8ba291ccd50c39542f8d218fca3c3569645c9dda938caa609b8daf8fe330f5758b9137ec5961b16eabf31d7a1c0d4753d4f7 SHA512 dc3279b4b85b90f3d1eed61cdc0c80b42d6306999bada8d68fdb4fbd6a4c30a9c9aa965b55429130d75d489f220a3bad06fa62ea716f461a0162b0400ca0ea62
-DIST github.com-google-go-github-v15.0.0.tar.gz 195725 BLAKE2B c8a04c0bdf2f19874ee681d02ebe8fe69b02236f605a76aa639addf9f1d662515ced5e363896d388c01670a9117166a65ea91e04b4b1c9dab2e7ab7ca34e3731 SHA512 c05867feb415826713b0ba90b3a904f2429771f1ca769cd2b21ba616798177c42a35f72c69752d3f12562eb36243b25ef20794911735cbc74ad206abe548fb67
-DIST github.com-google-go-querystring-53e6ce116135b80d037921a7fdd5138cf32d7a8a.tar.gz 7489 BLAKE2B 93ae5c6fc79a511852fa71da41cc9a53d4c93f9e7da43b4b105481f6d77efcbbf30379e7a90ba8e4330553956fa435e3d2e93d8865e7dfda293bbebe9b0ddfa1 SHA512 18830dbf6e14eb7757f7bdee1405e278b6c966fc7632be3decf34ea947705d66f8c0def8060371aa1e3c90cee7ca4324e67d9926627243f987281db52ffa2bca
-DIST github.com-inconshreveable-mousetrap-v1.0.0.tar.gz 2290 BLAKE2B bd46103e50dd916bad41aafbf8c1945d835222c131a88f4d3fba35feb4b11ae83c900280c9dafc6f0ef92f71b6a3ba02996dcb31d67eb49314b29d23fda2c8b8 SHA512 6f68bd6b7b1c7aa6651fe83b5230b6c8398b85561b01ca6a36ee638e186c325cc70444818de7a569db240159ba5840ed24f212e0defdf9f9890803a7641285d9
-DIST github.com-jroimartin-gocui-v0.4.0.tar.gz 28376 BLAKE2B 00775b321258c59d031adadb3f56a553c194e113138490b6ca75320c8b5fe685b89ffee046cc87f5e73c5c6826bfa7f4c22e208066e87e755a421f9939b88b41 SHA512 47cd84a3383bb18e22532c022d1730dfafc69d978f57e1402bd8057be91e810a13783675efb7fd29fc7e68a91284554d643f0efe923f9ff32c63582371454db0
-DIST github.com-mattn-go-colorable-v0.0.9.tar.gz 7593 BLAKE2B ce0e8b4ea658b41da2f1bf38eb5eef108393e672792adef98baa56a5885508766ed0cec4041f2cbcd8baf20d03a967c3d62d539a9bb07a0b90651123a3f3a647 SHA512 59be33ee1ff5f2410f57421f4af21dbd85d0b48e3070a4179c016eee1fd9017ff83058eca2b0e31a5af725ae48b794b49ade37a5cf5ab0a1954606eb52bd06b6
-DIST github.com-mattn-go-isatty-v0.0.3.tar.gz 3364 BLAKE2B 1df33a5e546b1e9be70dc6eba5f91b31ded363602b9cce856773e7db5d8fbe16c39a44bc4240f2c82ccfa173ec56544f2b5f408404d5fd4beb70ad2cfb174286 SHA512 60afa46beefe482bb13ab9dd0b94c45719a91d7f5d98f87452154636b520648fd900961b0df2bb3170bf42cdb62635073cfc48f923639aa2391ddccd6382fb1d
-DIST github.com-mattn-go-runewidth-v0.0.2.tar.gz 22367 BLAKE2B 9e98e1c6b042e6e11023be3a3d64c24f56d47ceb70670e6d9a3df967496fe5c964674598c07987b90e58485f0c4722a6dc13c06449b51bfac32fc7349c20eb5b SHA512 fc76cafb03e6dbf28c8208070293ed64173a85b62dbb768d288e050cc1e41db63263f1f5322bbddc233d545143bda8f00ca3ae1668810e8ce2919ed5ee6aae2f
-DIST github.com-nsf-termbox-go-21a4d435a86280a2927985fd6296de56cbce453e.tar.gz 31588 BLAKE2B f29b919f24be6b3e7abb733c7bb97270ade14fc7b6c500b84bafc8c289aed835a2d37181e1ea0381d5aa7659bfa2a407f4baf90f9d635162bb4319eeba758955 SHA512 c2370a310eacbf50a11263b10a005bc9ee95e25c2bd3f17f87d8e407562ceec4b6bb6fbba039f89afd32d5538a96b72570c6e93719d4878fd66e95addedcaf27
-DIST github.com-pkg-errors-v0.8.0.tar.gz 11344 BLAKE2B 50fd44e65872bc2c365f649b79784f1f88adf5101c9654f632fc0f96cde67ce0a839dd799b7f195f056f8cb12bbdcfa3167a54b6ffc107575d32f97e6705eb5b SHA512 82055b10c02f13a8ce497388729568ddde7ae61e9fb2592b9acb11c61dfe94d5554432aee168e7c7adbd8345511c3e4ce0ba4c1b23cf253480e199a95316c443
-DIST github.com-spf13-cobra-v0.0.3.tar.gz 101526 BLAKE2B 8613eccdd5bbd31429b7aa8260ee9367e34a5cc78075b394b09db91a97445ed1dadfb53a86105b55cb6ea3b4c2f9d50553e9198d64dfb6033dd1db2805984a2c SHA512 c38db9432a168f913b41a1e1b11d84bedfade82ff70791be9d343a6cc86b8a05b18bae344d67ebd8bae4c98662db7ac664a9dc86fa9b9ad4aa5c96cbf0178efb
-DIST github.com-spf13-pflag-v1.0.1.tar.gz 43244 BLAKE2B 7391fc9b28285d28fec041634ece2cad5ee54a2b46979772fb3d1b42888fbdea1624444c3618938083539b0af05eb5985b74881f37ff81baca99881ba3ca0226 SHA512 e09066442bd7c98b3a3c2de815d89ce27d97ccec242e1e47ff38e4f8ece442657573bddab5bd560f644f62304ca6bdca3b4e002ebc330b78e69a96eccd8e778b
-DIST github.com-xanzy-go-gitlab-v0.10.5.tar.gz 80919 BLAKE2B c1aba2dfa8d22e508f361f1a91a2062c23e95d0e24201da12188ec226ca2bb831df996c25fd8ab8a11c66c9bfecfc6d5246eafd9f1933da342483a51938d0ced SHA512 31baafbb9d9e34619b0f050661fcb770e1503569f48bcad15de474992737a6071bd64c6de8f776d7a62fed8bd3fd6f2d759cb6e2094b498df49946f6a69df518
+DIST github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.0.mod 34 BLAKE2B ce54a247aef91043830bdf0603c8452ba38eceb1495af6e7a74c9119234a0dc5cd080cb25258c28f5e270acf91189a5ed33e361cbf17de2be5e37dadbda1d90d SHA512 320941bc3b7fb8bc595e6135cbc513a7583d129f0cd92508055291e141191066303cf75148e25198c21f6c6c539a790ea3210f3ecf5de6a2a03b70c753091146
+DIST github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.0.zip 54634 BLAKE2B 450cff7b2a430041558719dc4c8123c39e949b405619a0c0a7a96cef679509205de96b5d83ccd7cface295e726b2fcbbcad8ad814c6e925d100e35a8d41fedee SHA512 f7aa20244cdb1fc517afffc5d2ed60e5ce606a6ab46d57dfee5d522a6430214311ec28e74543e2ca908159c8b6f6df673acf7ac84816ce7ccb86184d7f5b634e
+DIST github.com%2Fbriandowns%2Fspinner%2F@v%2Fv0.0.0-20170614154858-48dbb65d7bd5.mod 37 BLAKE2B 82fb1b9639e7aa661cfe879b3e583d675df564a383f857271e391ac6859a30c9f86e5fa51c33ea5b797d14ea48145924033ccb8000597a5e5cfd8698255cecb2 SHA512 079002450fa1864441b0c66e4196038d9ef2f7deb5d2466e708d6cfb7148bd037b182f2ecaac7abe5b787145a0c6e094df4798337f2451370dad68a02b5a3bd6
+DIST github.com%2Fbriandowns%2Fspinner%2F@v%2Fv0.0.0-20170614154858-48dbb65d7bd5.zip 14443 BLAKE2B 874b81cf3b2cf95076cb5d296b55e250a3253b5ca446f8014281061b4d80de277d71ed0cea6d047931c312dcf3b29ec90cdbbee3935eed84b5a40832a075f6e3 SHA512 602a49cff5cd31b0a7894e03cd16e6e0fc747cd3e6041d30ae1e932d25ae37d27350ff58612073623c086ec73f3e42677c6c920897f69b2551cf71f253dfae30
+DIST github.com%2Fchzyer%2Freadline%2F@v%2Fv0.0.0-20180603132655-2972be24d48e.mod 34 BLAKE2B b1e2e3052b202324b63ddd8e580c76da40ff0bdf1df2e9e2f3d7b2f5287d75469a544e1a586352130ce636bb08c9d4ca517f0fd49c892bc17365412cb791dcaa SHA512 c0d4f293bac15a26df2433bb909794b75ecbc5cb4ffdb33a8fbf3c8f421597780eb6bb036cfb11a8346ec959ceb8e36efa8ebb84d8ebbd606485735ba171f98d
+DIST github.com%2Fchzyer%2Freadline%2F@v%2Fv0.0.0-20180603132655-2972be24d48e.zip 56640 BLAKE2B 4a31c288981856d09a5a4fcf4f0b8223502952284ec1e2ae698214e2f950cbf618c3a938096bba4f8f3531b8b75d62c17396ae7a5b7a29304c138e32f4529978 SHA512 e63fa5b49cd41a7166b01167bab86540635ea079a36763e559da108046923897adc43b0ff7e19faa7060e0580b2042981c9a32d10ffcdcf6fea1f22eaf32313c
+DIST github.com%2Ffatih%2Fcolor%2F@v%2Fv1.7.0.mod 30 BLAKE2B cdd74965525563fa7e3db19aae87c777b2de65faeaf2987957ea3bb4c0c6a91ab82fe02bfeeab4d6f523214bc2e929628c082edb967d49309e75483ff4c3bb41 SHA512 2dfc66b2f6accb7ecaccc48cb3daa338173f4751d954cb2912025d881f17a7a2df0457b2d7420f2d93b50519a2437a763450c4d639a26b3289fce7bdec5bb144
+DIST github.com%2Ffatih%2Fcolor%2F@v%2Fv1.7.0.zip 11987 BLAKE2B bb585868c568466b366c1c50762376d9e2b6f3d3ac287af94c45f7d348516d2e80ee96c6980a4b5fede40f1302f0e3e900e24aae16fec29801a795cb7e514dec SHA512 70f78081c04bdbb52e8f5d24b8926b39a28c4f069beaee0d7bf24be946f2b0ee3bc08d8ecc1305412623670e1767433a37d458df3fc849d244c63b6222f1f599
+DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.1.0.mod 34 BLAKE2B a4239cba934b6e80714b93d47e88f22ad28ce41d1d984c4261cc3f5f3b857fb28785223fa911b258e2665be2a9d24ffbd925e9e0f374452a2aacd712ad9d5f75 SHA512 e059a34363bb826bbcb8981adbfc10da90e04b86dc5376ab20bdfe1fab135953cff41ef1daa116aff10e9f3e6503168f6baf902f09aa0e8cd9a0da96b932f4b6
+DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.1.0.zip 473783 BLAKE2B 78f0e771c6ad1bca65780994413055cb5f83d1b2ba3cf16cf21285c5cee875a2d3eb3ca8d8b57d89899808c76eb5b6c61b32e311bb0d92d45ab91b60168a47ea SHA512 c22665c5f590a415041a302d128a1e0a5606de4b21c8bcb79a77852795fb19bedeef4107b6edeffe87d1fe2295aa26579fd8c8d2b14cd4c960ce7a29138f1e06
+DIST github.com%2Fgoogle%2Fgo-github%2F@v%2Fv15.0.0+incompatible.mod 35 BLAKE2B 87a5884f51a766419a5bfaca4d6b317f2e86680e7347d29dba287e4c2004db6b8a8afcb2b2b8145cc3f9a502b768105eab89ba0f3e99db44427fd3eab9d3ac8c SHA512 6d285a58dc91fb57f990b76b3c2634247bee990ec1bb3e0f11b19fe1edb3b9b1998030def12b20a6f05c574965ddcefda6883121f5aae70c695e031e72425178
+DIST github.com%2Fgoogle%2Fgo-github%2F@v%2Fv15.0.0+incompatible.zip 317363 BLAKE2B 4d35766283a86e9851f88730dfbb165a5fa956a7669c0be6de2366aaa64058b76b7d9ce28fa04bd6401e3fd7f87d7c9008dfe91ee1c8456b5d1e050b0ecf65b2 SHA512 fb78c49083169e8f6ea482abb454e8ad61acfe117cbd686a7ef7c81b6724f92be3202eb056b1e3763fb50846fa81bfeebb027621fe28805b8a73d2f26a1a0abe
+DIST github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv0.0.0-20170111101155-53e6ce116135.mod 40 BLAKE2B 081291e204018d8256655052c8f518c8d489818e899a6932325f2efe7a33dd7228f1bab1fe31f190c2cd1a022b8f320c2a779910231122de430bdb6c196ca95e SHA512 b47c833f93e2d2f9746276fb7608dfe01295cead6b0c9cad36863e9c6da80e3abe8e7d79afb113fe382f73b641fcfd717090a8d6ca2d94bf2807fec07cd57574
+DIST github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv0.0.0-20170111101155-53e6ce116135.zip 9257 BLAKE2B 4082e7b230ac5242c79ba7e1c2ed5d51e76b5cfab0e0b366aac04daeb99d77ce6d2e78fc9ba5d6b7b470cad128bba917a914b6a11ed532559d108e8a0aed3cf1 SHA512 05954f59ae284c142a0526af3b155e78f3b9728fc016e9fb7a8294214139a6268fa8012a8be993f5ce4854022e15eb5d58ba1b1c7811305d575fb69878149ff2
+DIST github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.mod 44 BLAKE2B 764581d416faa477a91695a42c68cef5638d019a1622fb3bcee976c1581e904995d33c79ffed1d3b805f660931ece844b3e17437f158f8b82ddae82e95f0358f SHA512 0c77200112d96f9cddf8cf7da0059204914b06a8c400e2e672443bd02a45d9ebb3274275c20e6e7ee0728992e77579d945b36de44ccbaab2ee92fd55f382f7ac
+DIST github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.zip 3712 BLAKE2B f4f79741bb83862583f51f2ac5e80181eb0e9c2a4578df32f7e24eb98f4f548b99333e0e6a377e03ef701057b01e852e6b710ab885b65170c861bef556863da4 SHA512 e16bd414c1df566a12944e4a99ebd84d2103f0cb3bf8ec312e3de400f20b3eae27845db50672801c10474dbf1dc61d0c2e16e5dcd3c4447681c0b77f9114a411
+DIST github.com%2Fjroimartin%2Fgocui%2F@v%2Fv0.4.0.mod 35 BLAKE2B 7d6e3be931c82c55b77d6a588fcce4208d665e478bb43477ab97599fc95e352c74edf617dcab4eefb316f32ecb6a618b4797967427c19d3f0fd6e8ff4b27c5b3 SHA512 ae85b86a5c32924a9307390741186a4b9d7a1e7d9b0c1640a7d7a59ef9411fb4087e3075487c13293e851d7af21a5389ea66012e3a9424de1fc03554db7617e2
+DIST github.com%2Fjroimartin%2Fgocui%2F@v%2Fv0.4.0.zip 45403 BLAKE2B c97ef51fe19ae7fa4292f2f99ff2532ac9a7c606bb3fda115842731c48746e3c54dcf87480c542e50eca11bc891aa68b9b29cedd44958eda149ef788245d654a SHA512 1aac147819d2fc215baf8437523572469661c38a9bf7dee349b45dc33bf35ce253376d8885d2b548aacb4493283669300419ee3780b8dc648b6af65dd0106ec8
+DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.0.9.mod 37 BLAKE2B 6bd675a05c0bb6f9dc12d09203d13de115801888cf8c02cb5d609f72d214b7e7ebf13a72ddfa2eb9172e9c2ba1f3e5a040f089a86ce9fe873d49288d5f7dc5a7 SHA512 3cc3ae26618b96a0fc076b18bab6f8f0f6a1064d6a9913c1015a9867fd3571d17f5d2867d72cec008e9bc7005883a596edb21424084f82ad5b572443de90f976
+DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.0.9.zip 10606 BLAKE2B d9aed996970ecc4828716e86ddbc85a7949f60ceacc7326708ce499bfc09250bc8ee336806b229a44064839e7ce34f5cb2a7607da5e82c417a737ea869f97f03 SHA512 dd1763a8d04540b3e579d397fa4888c4bd8c00c3963cfcd1fe42af7c1990ef85f9a2e2fd5c5f2c7d3e6817448df5e2237241ff5a2cda651b061cc8932e0afdca
+DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.3.mod 34 BLAKE2B 55253c2475bc0169df729915bc92689eaad2908ff7b9dd81b8a553bd75d5f866c308a85fd69d664d31b0d2d373d8d52ee1701677cbebb07e361612ab8cf17f2a SHA512 00c272b4652db259c46875641b29489ecada2602e38beede8c8bd529d73b6e123bff58f8e0f8cadd2d680a6a5485aadffa448e9445548abbd2fb424b059a31e1
+DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.3.zip 7014 BLAKE2B 077be89b06969ca8149b1f3838940633896f1da465e21a189809ca1efda41755d33c5f52b3c6dab971726c2d8044b169950198c62f3223cc01ff813f6439bcb4 SHA512 bb4845cfecd934818a6352ee9d9311d795e0c6e7f8af97da4676b9e2085154bd0175599f745e3cc30ddf123cc807ce50ca02d82fdb665b2582edb842c001a8f7
+DIST github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.2.mod 37 BLAKE2B f36ba4b667bc5bebbf49062ee5be234891ecc0a2be075c7bf57f5e39ee7fa2657d6bc086ba9a89728468ddd0623d27edb3c357ba4e91f79563bc9747d1d9ae63 SHA512 b891712f639a850e41582c15bcb384a985fad4f8aa86ce2d3f4d2554354aa1a9619667f60837a8280f869fc07dd58dc676c222bac23aaa5b2b00c06284b2f475
+DIST github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.2.zip 24025 BLAKE2B e814fb5f02c39b111715c1b39b66cd720c03ce5011c2534f6255eb2b6fe9d6666eae2003431e8c23438f0af500b6b738ee71c715a4f4abe49df63d2e81d75fd9 SHA512 02d32d992b0fdf082ee703e36f2d3a82c2e8c1e260db4f2ea83b9f73f44f8486187aae2190d4d8c506426a2b81a5468e0482cae946ad488d26d7d9f6becf9e92
+DIST github.com%2Fnsf%2Ftermbox-go%2F@v%2Fv0.0.0-20180509163535-21a4d435a862.mod 33 BLAKE2B 3b94575248b0ca76fa0f9ace94919d628824ba1328d5dc087b270247c29817ad0d4fd6f24cb218541f598443828d440efad018d1d96c26ff070554fce840cd49 SHA512 d96b326f421417a67e9db79350043b29f2b2c9b7ca00f696955303f0ba090c8fd82f018f312ebef4d443ef87732af99d807dcb6f6e16187d00ba0c0502d78876
+DIST github.com%2Fnsf%2Ftermbox-go%2F@v%2Fv0.0.0-20180509163535-21a4d435a862.zip 45463 BLAKE2B 33e711fa13dbeca64a4ec76fa6cdbfecd72cfc0518a7ad8ff840791e38b866e3942cf6b009bda31e3f0abd231db9160186bc8e4b378ee9c38fae57ceb4f14d04 SHA512 7c4cbd363627f2e4ce2b1c20b507b276e983b60c6bb36b0369d913c21ecaa296281ef5041963ae7ee3db7de4a315281589e070bc070b278799377890d49ef9dc
+DIST github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.0.mod 29 BLAKE2B 7fb53b19bd1be0e783039647b42ecbe2070f51af102e473ec6d3544eea0ffa5863f1874ca1615348d5f8abbaa39c841b4fe18d43a8a615fa648cf22f35955e38 SHA512 0c156e21d35c45a89c1a1b69ff1976b4f7511b3870bf96126121f5a5effa3723eb45bf080e840d5c8b96898c65207dba83eb3e1a23668dd8a5e20ee6be775cc0
+DIST github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.0.zip 14743 BLAKE2B c0c06d296c0583be2a6eb06359659b50941ea516bc768833bbfe252b73a2d81616dbe2d2db1991bd196b4a615b253c60046bbc6d56ca7268ded5b0ff40a4dc81 SHA512 2975fb8868fddaff560951be41194b82b631138d617705c3f6162acb76ace8697cc8ebc8f610ca1fb1a5167c6b6b0ecc87c150133a757447831463a0da18f392
+DIST github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.3.mod 30 BLAKE2B cb72701c052ce4059500f4c6b3d0c4fb336d118865bf1f7f45ce0b0279e1d01b6e58d49f82182c2523681a97bcaa7a70216d63ceeca0ea1d09c1921226f6bc4e SHA512 ea13ed8e166d16a7bcd14a7cde90af1cacc0b05995d1c5ec245fa536208e0cbfffd689dd460d66c0a1ad315f2b0ae9f4b803ed72bcdfd89c4a98a7ed934289c7
+DIST github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.3.zip 139997 BLAKE2B c20d7292a69fd548bf0dbd62751dc08a41c66f120bd8b5142e96f498aafd208328ed4888d7ac59404b64dace96bcad210f64734e432f15ae63ce6d39dd308cf4 SHA512 1476716a98d5aa26c34af6d85eb93886cae211beac7cdc8f886d2030bf7f83802409aa56510ba09cbdb609dcd2faf87d3490c4e5392922e0e034edcd3d9fb1bf
+DIST github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.1.mod 30 BLAKE2B 18c9fb79a291aaf800991a296c8d7b1933cf45bf56082301a64ce17ea64dd15fd304094fd4b0561bd99c48ada545dfe7fa8cf47a15593cd3166eb66657a5e114 SHA512 d08b4540b799cee9c5f088c4e1fe002c9fda86f1634380409eec1404598b84376d3ca26b4c1cbcf58bc19234ab56531ab11db8a00c6dd2e15a53f3b4ae757efc
+DIST github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.1.zip 69054 BLAKE2B 03dffa3333ad0656875adf9c3681e7aa966a119a22e7136de21ab517d960b25f36f5f64b8790951351a8bbe49a6682162b0e09198b10c71d0049072cfd1f7ca1 SHA512 63b2847f7eb93fef4af239ec91df153dc85af0b1283c302880793f1427ececad90b5dffaadea6b2d2e560fb57f29559b82b417cf317f2a7e9b7e1bed7f50c225
+DIST github.com%2Fxanzy%2Fgo-gitlab%2F@v%2Fv0.10.5.mod 34 BLAKE2B 061901c538048ebbccc74500f109af5cfdad19383233fd2f04b0f43e5561a4d31bf9816e0e0b2d38bc6a23c4d261c91929199665277d974af1938027c28a08f4 SHA512 0be77b5cff76531f726f11a0d146be637dd56185616e14442a290eff5ccd9e3cbce686aafc0ae73cc4fb50d468a89c1d8ce5e6bea678fe8135a93d700b583c69
+DIST github.com%2Fxanzy%2Fgo-gitlab%2F@v%2Fv0.10.5.zip 135499 BLAKE2B d67d886adf45c572d91bad2f910e6bfdb5f044bdbb0e491fa2e1c5a1b62f8e1e56e506d7dd64c8b0fbcf48e638a767dd8bf8c4504229d578c94c3cd69b74012e SHA512 5834cd7fd455a2672f0c8c1f9598e192c822375118308376d3dcd283aad7dc8087b4cff6d388b909623ebaecc52f7662ed055f0c237f15a7b52f07229d741ddc
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20180608092829-8ac0e0d97ce4.mod 27 BLAKE2B f91145aab2cee00c3567772e97f6162b9681d6cbcbe67a1b5b2f59b8f912572f705a0d1280fdced086d92efd10c50ecede26d1cfa3d5419217e5eef95097b4b1 SHA512 a88da5b983ff482a4e8b512761eeee466a8b0664b42da54ec9772c2eb3cb1bc5b7545045e283bac82552336802d8bc8efe137ba16f3530228b529366744a33e6
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20180608092829-8ac0e0d97ce4.zip 1733563 BLAKE2B 4fcffc09ead3dc0c1325e4512817f9e97da0b7c29052a90a4595af175cc0e186120f66e6fb4c1221a58a74637c08447fcf1be5dadce7a53606fdc47f26178786 SHA512 2748d31f038db5bbb376a70f0c6e7ba8f040bf0ad979bdadfe064abe8d33f62adeeb0579c58e3ba92c59a7ada3f55ecb35042dd3a00f33563d1c41edf0abf5bc
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180530234432-1e491301e022.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180530234432-1e491301e022.zip 1312726 BLAKE2B 1dca12911496bccb6ba2828a2aabde1364a447640e3467dc47c422654d9afc81269a35992b2ce392f5c2d2ade37b1320180674ea7d924f6c0332406d60978a47 SHA512 e7aedf4a42893e627f4fe8aa6b0f1d0b4e9dc039d28d6a1ed63439bb28e6e929f6a76f7190dfcd077b546c9cb41807cf6c20c4824ca38a5815b50a802b341fd6
+DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20180603041954-1e0a3fa8ba9a.mod 27 BLAKE2B 078fc99b981406f4ee3f8da94c83954e80619e76ea63cf6323f27614bbcb870bb650eb5ffaac865a374f3ed0ef0619d97e11f05924c92e395e72cb73f28630e6 SHA512 53431e560b5d6a9b50f44997ef6755f71741ccca155767dd954da41f11f53a3e8d01d7e01a2bb9de1fdd551dd2e734cb65e5641cf5de5c9a8a6a25a4894336f5
+DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20180603041954-1e0a3fa8ba9a.zip 79902 BLAKE2B 8b04d8c10a2ad8070c2c707b8cfe002adebdec15fd799473e2c89fe97f34ef152c2a30e41af188336c17e71e929dd234cd94b4450c7fdb985860559cdefb1713 SHA512 b9127df2ee676b411b25246cc5b54660f943e4a350cec50d4d37dba67c78e3db7d0013d526dab73b47a703f32d28a965d30bfeaf243fbddd15e1c7165ca21ae1
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180606202747-9527bec2660b.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180606202747-9527bec2660b.zip 1264148 BLAKE2B 85c0baf03f582f4facfff63b80dde6c2b3deff94c57c89fa534306903affc4609a7470afac87abe0450420550c0a29172d20cd96361f086931a78107f9bf9330 SHA512 526378397eb74322568fbee78ae1bfa6f842bac02ea9f138bc62d5b2ffac844638313e77e533de5241ef751edebf8c5ef80dda26460aa71f66f3fb4f3405270b
+DIST google.golang.org%2Fappengine%2F@v%2Fv1.0.0.mod 35 BLAKE2B 24fb6ba95138448c45da7f1ecc4c87391485006b54b8e7ff96ec582c2659f9ea77574b4d5fef2442eff9e5564f3c3263ed8e6963c5d21cde8772a7143d82f3ed SHA512 6644c398d639794470e49cad4402d17765422934915b5a13e13e1f84d8890cc8fad9e6ea8c580d114aefea70d894242e05ce3a432ee596f772b98b6b73069fe2
+DIST google.golang.org%2Fappengine%2F@v%2Fv1.0.0.zip 310156 BLAKE2B 1c3465601193c1d59640a7f329853a0414318fd7c5278cb6b351815cb6161867b3e6ec353160700812f7cdd6aa437d2027de31bcfa7314fe77db39263947dc98 SHA512 72ad399ab4badfe9d180c742b39ab528f515b76931baebab25b83cd39338585ce8aebb0b53582319f2ed49156b12e733116533946127456116997b2340674d6e
DIST pet-0.3.6.tar.gz 2739396 BLAKE2B 16fd9cd2e80d742b7f56819318f709ebe40902e9096c4b5f11b4dfb5341c78b491e70b1d5e6ff81d758413b9b2276e9bd87e99eb320592a70f93a2c75c805892 SHA512 366eabd93865ac72f9d251d51393ba9ad5904195d40f26da80a371d6d2183b5e81156930b137b1551ef2bd372cbf235847dd8a7ac8c7d4584c9d326325d30f79
diff --git a/app-misc/pet/pet-0.3.6.ebuild b/app-misc/pet/pet-0.3.6.ebuild
index d39d9096873e..9ea71089cd92 100644
--- a/app-misc/pet/pet-0.3.6.ebuild
+++ b/app-misc/pet/pet-0.3.6.ebuild
@@ -2,60 +2,73 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
+inherit go-module
-EGO_VENDOR=( "github.com/BurntSushi/toml v0.3.0"
- "github.com/briandowns/spinner 48dbb65d7bd5c74ab50d53d04c949f20e3d14944"
- "github.com/chzyer/readline 2972be24d48e78746da79ba8e24e8b488c9880de"
+DESCRIPTION="Simple command-line snippet manager"
+HOMEPAGE="https://github.com/knqyf263/pet"
+
+EGO_SUM=(
+ "github.com/BurntSushi/toml v0.3.0"
+ "github.com/BurntSushi/toml v0.3.0/go.mod"
+ "github.com/briandowns/spinner v0.0.0-20170614154858-48dbb65d7bd5"
+ "github.com/briandowns/spinner v0.0.0-20170614154858-48dbb65d7bd5/go.mod"
+ "github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e"
+ "github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod"
"github.com/fatih/color v1.7.0"
- "github.com/google/go-github v15.0.0"
+ "github.com/fatih/color v1.7.0/go.mod"
+ "github.com/golang/protobuf v1.1.0"
+ "github.com/golang/protobuf v1.1.0/go.mod"
+ "github.com/google/go-github v15.0.0+incompatible"
+ "github.com/google/go-github v15.0.0+incompatible/go.mod"
+ "github.com/google/go-querystring v0.0.0-20170111101155-53e6ce116135"
+ "github.com/google/go-querystring v0.0.0-20170111101155-53e6ce116135/go.mod"
"github.com/inconshreveable/mousetrap v1.0.0"
+ "github.com/inconshreveable/mousetrap v1.0.0/go.mod"
"github.com/jroimartin/gocui v0.4.0"
+ "github.com/jroimartin/gocui v0.4.0/go.mod"
"github.com/mattn/go-colorable v0.0.9"
+ "github.com/mattn/go-colorable v0.0.9/go.mod"
"github.com/mattn/go-isatty v0.0.3"
+ "github.com/mattn/go-isatty v0.0.3/go.mod"
"github.com/mattn/go-runewidth v0.0.2"
- "github.com/nsf/termbox-go 21a4d435a86280a2927985fd6296de56cbce453e"
+ "github.com/mattn/go-runewidth v0.0.2/go.mod"
+ "github.com/nsf/termbox-go v0.0.0-20180509163535-21a4d435a862"
+ "github.com/nsf/termbox-go v0.0.0-20180509163535-21a4d435a862/go.mod"
"github.com/pkg/errors v0.8.0"
+ "github.com/pkg/errors v0.8.0/go.mod"
"github.com/spf13/cobra v0.0.3"
+ "github.com/spf13/cobra v0.0.3/go.mod"
"github.com/spf13/pflag v1.0.1"
+ "github.com/spf13/pflag v1.0.1/go.mod"
"github.com/xanzy/go-gitlab v0.10.5"
- "golang.org/x/crypto 8ac0e0d97ce45cd83d1d7243c060cb8461dda5e9 github.com/golang/crypto"
- "golang.org/x/net 1e491301e022f8f977054da4c2d852decd59571f github.com/golang/net"
- "golang.org/x/oauth2 1e0a3fa8ba9a5c9eb35c271780101fdaf1b205d7 github.com/golang/oauth2"
- "golang.org/x/sys 9527bec2660bd847c050fda93a0f0c6dee0800bb github.com/golang/sys"
- "github.com/google/go-querystring 53e6ce116135b80d037921a7fdd5138cf32d7a8a"
- "google.golang.org/appengine v1.0.0 github.com/golang/appengine" )
-
-EGO_PN="github.com/knqyf263/${PN}"
-
-inherit golang-build golang-vcs-snapshot
-
-DESCRIPTION="Simple command-line snippet manager"
-HOMEPAGE="https://github.com/knqyf263/pet"
-SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
- ${EGO_VENDOR_URI}"
+ "github.com/xanzy/go-gitlab v0.10.5/go.mod"
+ "golang.org/x/crypto v0.0.0-20180608092829-8ac0e0d97ce4"
+ "golang.org/x/crypto v0.0.0-20180608092829-8ac0e0d97ce4/go.mod"
+ "golang.org/x/net v0.0.0-20180530234432-1e491301e022"
+ "golang.org/x/net v0.0.0-20180530234432-1e491301e022/go.mod"
+ "golang.org/x/oauth2 v0.0.0-20180603041954-1e0a3fa8ba9a"
+ "golang.org/x/oauth2 v0.0.0-20180603041954-1e0a3fa8ba9a/go.mod"
+ "golang.org/x/sys v0.0.0-20180606202747-9527bec2660b"
+ "golang.org/x/sys v0.0.0-20180606202747-9527bec2660b/go.mod"
+ "google.golang.org/appengine v1.0.0"
+ "google.golang.org/appengine v1.0.0/go.mod"
+ )
+go-module_set_globals
+SRC_URI="https://github.com/knqyf263/pet/archive/v${PV}.tar.gz -> ${P}.tar.gz
+ ${EGO_SUM_SRC_URI}"
LICENSE="Apache-2.0 BSD BSD-2 MIT"
SLOT="0"
KEYWORDS="~amd64"
-IUSE="zsh-completion"
-
-RDEPEND="zsh-completion? ( app-shells/zsh-completions )"
-
-S="${WORKDIR}/${P}/src/${EGO_PN}"
src_compile() {
- export -n GOCACHE XDG_CACHE_HOME
- GOPATH="${WORKDIR}/${P}" GO111MODULE=on \
- go build -mod=vendor -v -work -x "${EGO_BUILD_FLAGS}" "${EGO_PN}" || die
+ go build || die
}
src_install() {
dobin pet
-
- if use zsh-completion ; then
- insinto /usr/share/zsh/site-functions
- doins misc/completions/zsh/_pet
- fi
+ insinto /usr/share/zsh/site-functions
+ doins misc/completions/zsh/_pet
}
pkg_postinst() {
diff --git a/app-misc/tek/metadata.xml b/app-misc/tek/metadata.xml
index b51edd0de5da..747e72299490 100644
--- a/app-misc/tek/metadata.xml
+++ b/app-misc/tek/metadata.xml
@@ -1,10 +1,7 @@
-
- aidecoe@gentoo.org
- Amadeusz Żołnowski
-
+
m-ou-se/tek
diff --git a/app-misc/timew/metadata.xml b/app-misc/timew/metadata.xml
index 674f5ad944f3..7a38bb900964 100644
--- a/app-misc/timew/metadata.xml
+++ b/app-misc/timew/metadata.xml
@@ -1,8 +1,5 @@
-
- aidecoe@gentoo.org
- Amadeusz Żołnowski
-
+
diff --git a/app-pda/Manifest.gz b/app-pda/Manifest.gz
index 5c0f30b85c08..b93769c0e9e6 100644
Binary files a/app-pda/Manifest.gz and b/app-pda/Manifest.gz differ
diff --git a/app-pda/libplist/Manifest b/app-pda/libplist/Manifest
index 9671223444f2..9004ee690105 100644
--- a/app-pda/libplist/Manifest
+++ b/app-pda/libplist/Manifest
@@ -1,2 +1 @@
-DIST libplist-2.0.0.tar.bz2 421405 BLAKE2B 2f6e22c871ad3b5ace2a2c6aab09706e8a8c1759f1656c5c07164e5b89a1b5eae24d2d7472e0dcca7eddd96b641715acfe5a0a791b0b994ec5fbcdf70627acf9 SHA512 81508bf6773483528816725c3b5b868563b84fd7810999404072e5ea9efa7fc9f11ef997f32208e4421aa26b15edd0c65f87c67c1472e8c4e356f1e9fe7740ee
DIST libplist-2.1.0.tar.bz2 120602 BLAKE2B 8abfe3c295c4ebd242f2c4d49c80d1f214097df84f1d2fcf2696519bbbca4e8a5ce13c04690ac64fd981f84d585df25fc65c268a4e4f4092319053583e67736c SHA512 23156e882835bb0b894a05b57018b5e76f9f8f8f4b1d3fdad7b1970d2ef695033c98de74a1fa81bdf0829742a058fd65075cebc1512313d2be42e2f5367274be
diff --git a/app-pda/libplist/libplist-2.0.0.ebuild b/app-pda/libplist/libplist-2.0.0.ebuild
deleted file mode 100644
index c1aa521a377c..000000000000
--- a/app-pda/libplist/libplist-2.0.0.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_COMPAT=( python{3_6,3_7,3_8} )
-inherit autotools eutils ltprune python-r1
-
-DESCRIPTION="Support library to deal with Apple Property Lists (Binary & XML)"
-HOMEPAGE="http://www.libimobiledevice.org/"
-SRC_URI="http://www.libimobiledevice.org/downloads/${P}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0/3.1.0" # based on SONAME of libplist.so
-KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 x86"
-IUSE="python static-libs"
-
-RDEPEND="python? ( ${PYTHON_DEPS} )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- python? ( >=dev-python/cython-0.17[${PYTHON_USEDEP}] )"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DOCS=( AUTHORS NEWS README )
-
-BUILD_DIR="${S}_build"
-
-src_prepare() {
- default
-
- eautoreconf
-}
-
-src_configure() {
- local ECONF_SOURCE=${S}
- local myeconfargs=( $(use_enable static-libs static) )
-
- do_configure() {
- mkdir -p "${BUILD_DIR}" || die
- pushd "${BUILD_DIR}" >/dev/null || die
- econf "${myeconfargs[@]}" "${@}"
- popd >/dev/null || die
- }
-
- do_configure_python() {
- local -x PYTHON_LDFLAGS="$(python_get_LIBS)"
- do_configure "$@"
- }
-
- do_configure --without-cython
- use python && python_foreach_impl do_configure_python
-}
-
-src_compile() {
- python_compile() {
- emake -C "${BUILD_DIR}"/cython -j1 \
- VPATH="${S}/cython:${native_builddir}/cython" \
- plist_la_LIBADD="${native_builddir}/src/libplist.la"
- }
-
- local native_builddir=${BUILD_DIR}
- pushd "${BUILD_DIR}" >/dev/null || die
- emake -j1
- use python && python_foreach_impl python_compile
- popd >/dev/null || die
-}
-
-src_install() {
- python_install() {
- emake -C "${BUILD_DIR}/cython" -j1 \
- VPATH="${S}/cython:${native_builddir}/cython" \
- DESTDIR="${D}" install
- }
-
- local native_builddir=${BUILD_DIR}
- pushd "${BUILD_DIR}" >/dev/null || die
- emake -j1 DESTDIR="${D}" install
- use python && python_foreach_impl python_install
- popd >/dev/null || die
-
- einstalldocs
-
- if use python ; then
- insinto /usr/include/plist/cython
- doins cython/plist.pxd
- fi
- prune_libtool_files --all
-}
diff --git a/app-pda/usbmuxd/usbmuxd-1.1.1_pre20200121.ebuild b/app-pda/usbmuxd/usbmuxd-1.1.1_pre20200121.ebuild
index 371f8cb38f28..1dda2f314a9d 100644
--- a/app-pda/usbmuxd/usbmuxd-1.1.1_pre20200121.ebuild
+++ b/app-pda/usbmuxd/usbmuxd-1.1.1_pre20200121.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://cgit.libimobiledevice.org/usbmuxd.git/snapshot/usbmuxd-${COMMIT
# src/utils.h is LGPL-2.1+, rest is found in COPYING*
LICENSE="GPL-2 GPL-3 LGPL-2.1+"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~x86"
IUSE="systemd"
DEPEND="
diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index c6096e9374a9..c21d82691ad4 100644
Binary files a/app-portage/Manifest.gz and b/app-portage/Manifest.gz differ
diff --git a/app-portage/elogviewer/elogviewer-3.0-r1.ebuild b/app-portage/elogviewer/elogviewer-3.0-r1.ebuild
deleted file mode 100644
index aca7afc730bb..000000000000
--- a/app-portage/elogviewer/elogviewer-3.0-r1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-DISABLE_AUTOFORMATTING=true
-
-inherit desktop python-single-r1 readme.gentoo-r1
-
-DESCRIPTION="Elog viewer for Gentoo"
-HOMEPAGE="https://sourceforge.net/projects/elogviewer"
-SRC_URI="https://github.com/Synss/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
- $(python_gen_cond_dep '
- dev-python/PyQt5[gui,widgets,${PYTHON_MULTI_USEDEP}]
- >=sys-apps/portage-2.1[${PYTHON_MULTI_USEDEP}]
- ')
- $(python_gen_cond_dep 'dev-python/enum34[${PYTHON_MULTI_USEDEP}]' python2_7)
-"
-DEPEND="${RDEPEND}
- $(python_gen_cond_dep '
- dev-python/setuptools[${PYTHON_MULTI_USEDEP}]
- ')
-"
-
-DOC_CONTENTS="In order to use this software, you need to activate
-Portage's elog features. Required is
- PORTAGE_ELOG_SYSTEM=\"save\"
-and at least one of
- PORTAGE_ELOG_CLASSES=\"warn error info log qa\"
-More information on the elog system can be found in
-/usr/share/portage/config/make.conf.example
-
-To operate properly this software needs the directory
-${PORT_LOGDIR:-/var/log/portage}/elog created, belonging to group portage.
-To start the software as a user, add yourself to the portage group."
-
-src_compile() {
- rm -f Makefile
-}
-
-src_install() {
- python_newscript elogviewer.py elogviewer
-
- make_desktop_entry ${PN} ${PN} ${PN} System
-
- doman elogviewer.1
- readme.gentoo_create_doc
-}
-
-pkg_postinst() {
- readme.gentoo_print_elog
-
- ewarn "The elogviewer's configuration file is now saved in:"
- ewarn "~/.config/elogviewer/ (was ~/.config/Mathias\ Laurin/)."
- ewarn "Please migrate any user specific settings to the new config file."
-}
diff --git a/app-portage/elogviewer/elogviewer-3.0-r2.ebuild b/app-portage/elogviewer/elogviewer-3.0-r2.ebuild
index f733ba8a7fe5..84768cd4e957 100644
--- a/app-portage/elogviewer/elogviewer-3.0-r2.ebuild
+++ b/app-portage/elogviewer/elogviewer-3.0-r2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/Synss/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
IUSE=""
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/app-portage/overlint/overlint-0.5.3-r2.ebuild b/app-portage/overlint/overlint-0.5.3-r2.ebuild
index 341df749e53f..d0962b7d2cca 100644
--- a/app-portage/overlint/overlint-0.5.3-r2.ebuild
+++ b/app-portage/overlint/overlint-0.5.3-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://www.hartwork.org/public/${P}.tar.gz"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 arm ~x86 ~amd64-linux ~x86-linux"
IUSE=""
RDEPEND="sys-apps/portage[${PYTHON_USEDEP}]"
diff --git a/app-shells/Manifest.gz b/app-shells/Manifest.gz
index ae8f42c04fd0..4b75b888e22b 100644
Binary files a/app-shells/Manifest.gz and b/app-shells/Manifest.gz differ
diff --git a/app-shells/bash/bash-5.0_p17.ebuild b/app-shells/bash/bash-5.0_p17.ebuild
index e126f60f3740..d3ec8df9e06e 100644
--- a/app-shells/bash/bash-5.0_p17.ebuild
+++ b/app-shells/bash/bash-5.0_p17.ebuild
@@ -46,7 +46,7 @@ fi
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="afs bashlogger examples mem-scramble +net nls plugins +readline"
DEPEND="
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index b9eb07671426..752adaa76baf 100644
Binary files a/app-text/Manifest.gz and b/app-text/Manifest.gz differ
diff --git a/app-text/dbacl/metadata.xml b/app-text/dbacl/metadata.xml
index 505ddc59ff8b..708c728bb7ef 100644
--- a/app-text/dbacl/metadata.xml
+++ b/app-text/dbacl/metadata.xml
@@ -1,10 +1,7 @@
-
-aidecoe@gentoo.org
-Amadeusz Żołnowski
-
+
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index d3fe646c4d1d..1f6f0234af7d 100644
Binary files a/dev-db/Manifest.gz and b/dev-db/Manifest.gz differ
diff --git a/dev-db/mysql/mysql-5.7.30.ebuild b/dev-db/mysql/mysql-5.7.30.ebuild
index 5c1651a1f62d..fab0a6937cb6 100644
--- a/dev-db/mysql/mysql-5.7.30.ebuild
+++ b/dev-db/mysql/mysql-5.7.30.ebuild
@@ -30,7 +30,7 @@ RESTRICT="!test? ( test ) libressl? ( test )"
REQUIRED_USE="?? ( tcmalloc jemalloc )"
-KEYWORDS="~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
# Shorten the path because the socket path length must be shorter than 107 chars
# and we will run a mysql server during test phase
diff --git a/dev-db/mysql/mysql-8.0.20.ebuild b/dev-db/mysql/mysql-8.0.20.ebuild
index afc6a016f68b..7a1ea0b39205 100644
--- a/dev-db/mysql/mysql-8.0.20.ebuild
+++ b/dev-db/mysql/mysql-8.0.20.ebuild
@@ -37,7 +37,7 @@ REQUIRED_USE="?? ( tcmalloc jemalloc )
router? ( server )
tcmalloc? ( server )"
-KEYWORDS="~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
# Shorten the path because the socket path length must be shorter than 107 chars
# and we will run a mysql server during test phase
diff --git a/dev-db/qdbm/files/qdbm-configure.patch b/dev-db/qdbm/files/qdbm-configure.patch
index 364c5c9f653e..4eb62949f32f 100644
--- a/dev-db/qdbm/files/qdbm-configure.patch
+++ b/dev-db/qdbm/files/qdbm-configure.patch
@@ -18,10 +18,13 @@
#================================================================
--- a/configure.in
+++ b/configure.in
-@@ -20,15 +20,6 @@
- LD="ld"
- AR="ar"
-
+@@ -17,17 +17,6 @@
+ MYDEFS=""
+ MYOPTS=""
+ MGWLIBS=""
+-LD="ld"
+-AR="ar"
+-
-# Building paths
-pathtmp="$PATH"
-PATH="$HOME/bin:/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin"
@@ -30,16 +33,56 @@
-LD_LIBRARY_PATH="$HOME/lib:/usr/local/lib:$LD_LIBRARY_PATH"
-CPATH="$HOME/include:/usr/local/include:$CPATH"
-export PATH LIBRARY_PATH LD_LIBRARY_PATH CPATH
--
- #================================================================
+
+@@ -186,19 +175,15 @@
+ then
+ MYOPTS="-O1 -fno-omit-frame-pointer -fno-force-addr"
+ fi
+-if gcc --version | egrep -i '^2\.(8|9)' > /dev/null 2>&1
++if $CC --version | egrep -i '^2\.(8|9)' > /dev/null 2>&1
+ then
+ MYOPTS="-O1 -fno-omit-frame-pointer -fno-force-addr"
+ fi
+
+ # Linker
+-printf 'checking for ld... '
+-if which ld | grep '/ld$' > /dev/null 2>&1
++AC_CHECK_TOOL(LD, ld, no)
++if test "$LD" = "no"
+ then
+- LD=`which ld`
+- printf '%s\n' "$LD"
+-else
+- printf 'no\n'
+ if test "$isnowarn" != "yes"
+ then
+ printf '#================================================================\n' 1>&2
+@@ -208,13 +193,9 @@
+ fi
+
+ # Archiver
+-printf 'checking for ar... '
+-if which ar | grep '/ar$' > /dev/null 2>&1
++AC_CHECK_TOOL(AR, ar, no)
++if test "$AR" = "no"
+ then
+- AR=`which ar`
+- printf '%s\n' "$AR"
+-else
+- printf 'no\n'
+ if test "$isnowarn" != "yes"
+ then
+ printf '#================================================================\n' 1>&2
--- a/java/configure.in
+++ b/java/configure.in
-@@ -25,15 +25,6 @@
+@@ -23,16 +23,6 @@
+ JAVARUN="java"
+ MYDEFS=""
MYOPTS=""
- LD="ld"
-
+-LD="ld"
+-
-# Building paths
-pathtmp="$PATH"
-PATH="$HOME/bin:/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin"
@@ -48,10 +91,32 @@
-LD_LIBRARY_PATH="$HOME/lib:/usr/local/lib:$LD_LIBRARY_PATH"
-CPATH="$HOME/include:/usr/local/include:$CPATH"
-export PATH LIBRARY_PATH LD_LIBRARY_PATH CPATH
--
- #================================================================
+
+@@ -162,19 +152,15 @@
+ then
+ MYOPTS="-O1"
+ fi
+-if gcc --version | egrep -i '^2\.(8|9)' > /dev/null 2>&1
++if $CC --version | egrep -i '^2\.(8|9)' > /dev/null 2>&1
+ then
+ MYOPTS="-O1"
+ fi
+
+ # Linker
+-printf 'checking for ld... '
+-if which ld | grep '/ld$' > /dev/null 2>&1
++AC_CHECK_TOOL(LD, ld, no)
++if test "$LD" = "no"
+ then
+- LD=`which ld`
+- printf '%s\n' "$LD"
+-else
+- printf 'no\n'
+ printf '#================================================================\n' 1>&2
+ printf '# WARNING: ld is not found in PATH.\n' 1>&2
+ printf '#================================================================\n' 1>&2
--- a/perl/configure.in
+++ b/perl/configure.in
@@ -5,15 +5,6 @@
@@ -72,10 +137,13 @@
then
--- a/plus/configure.in
+++ b/plus/configure.in
-@@ -19,15 +19,6 @@
- LD="ld"
- AR="ar"
-
+@@ -16,17 +16,6 @@
+ TARGETS="all"
+ MYDEFS=""
+ MYOPTS=""
+-LD="ld"
+-AR="ar"
+-
-# Building paths
-pathtmp="$PATH"
-PATH="$HOME/bin:/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin"
@@ -84,10 +152,47 @@
-LD_LIBRARY_PATH="$HOME/lib:/usr/local/lib:$LD_LIBRARY_PATH"
-CPATH="$HOME/include:/usr/local/include:$CPATH"
-export PATH LIBRARY_PATH LD_LIBRARY_PATH CPATH
--
- #================================================================
+
+@@ -75,32 +64,24 @@
+ then
+ MYOPTS="-O1"
+ fi
+-if gcc --version | egrep -i '^2\.(8|9)' > /dev/null 2>&1
++if $CXX --version | egrep -i '^2\.(8|9)' > /dev/null 2>&1
+ then
+ MYOPTS="-O1"
+ fi
+
+ # Linker
+-printf 'checking for ld... '
+-if which ld | grep '/ld$' > /dev/null 2>&1
++AC_CHECK_TOOL(LD, ld, no)
++if test "$LD" = "no"
+ then
+- LD=`which ld`
+- printf '%s\n' "$LD"
+-else
+- printf 'no\n'
+ printf '#================================================================\n' 1>&2
+ printf '# WARNING: ld is not found in PATH.\n' 1>&2
+ printf '#================================================================\n' 1>&2
+ fi
+
+ # Archiver
+-printf 'checking for ar... '
+-if which ar | grep '/ar$' > /dev/null 2>&1
++AC_CHECK_TOOL(AR, ar, no)
++if test "$AR" = "no"
+ then
+- AR=`which ar`
+- printf '%s\n' "$AR"
+-else
+- printf 'no\n'
+ printf '#================================================================\n' 1>&2
+ printf '# WARNING: ar is not found in PATH.\n' 1>&2
+ printf '#================================================================\n' 1>&2
--- a/ruby/configure.in
+++ b/ruby/configure.in
@@ -5,15 +5,6 @@
diff --git a/dev-db/qdbm/qdbm-1.8.78-r2.ebuild b/dev-db/qdbm/qdbm-1.8.78-r2.ebuild
index dc3d6dfc8c02..034733d2ae95 100644
--- a/dev-db/qdbm/qdbm-1.8.78-r2.ebuild
+++ b/dev-db/qdbm/qdbm-1.8.78-r2.ebuild
@@ -1,8 +1,8 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="6"
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
+EAPI="7"
+USE_RUBY="ruby24 ruby25 ruby26"
RUBY_OPTIONAL="yes"
inherit autotools flag-o-matic java-pkg-opt-2 perl-functions ruby-ng
diff --git a/dev-erlang/Manifest.gz b/dev-erlang/Manifest.gz
index b70e0b5a89b0..a8afc58c8c91 100644
Binary files a/dev-erlang/Manifest.gz and b/dev-erlang/Manifest.gz differ
diff --git a/dev-erlang/hamcrest/hamcrest-0.1.0_p20160709.ebuild b/dev-erlang/hamcrest/hamcrest-0.1.0_p20160709.ebuild
index 6d92d2d1f421..9880f72dcd6f 100644
--- a/dev-erlang/hamcrest/hamcrest-0.1.0_p20160709.ebuild
+++ b/dev-erlang/hamcrest/hamcrest-0.1.0_p20160709.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -7,7 +7,7 @@ inherit rebar
DESCRIPTION="Erlang port of Hamcrest"
HOMEPAGE="https://github.com/hyperthunk/hamcrest-erlang"
-SRC_URI="https://dev.gentoo.org/~aidecoe/distfiles/${CATEGORY}/${PN}/${P}.tar.gz"
+SRC_URI="https://dev.gentoo.org/~hanno/distfiles/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
diff --git a/dev-games/Manifest.gz b/dev-games/Manifest.gz
index 979022c764dd..c1a07d755db2 100644
Binary files a/dev-games/Manifest.gz and b/dev-games/Manifest.gz differ
diff --git a/dev-games/freecell-solver/Manifest b/dev-games/freecell-solver/Manifest
index 4cf4cd906265..829a8b93375e 100644
--- a/dev-games/freecell-solver/Manifest
+++ b/dev-games/freecell-solver/Manifest
@@ -1,2 +1 @@
-DIST freecell-solver-5.14.0.tar.xz 407912 BLAKE2B c9da3557d9d073e017215cb0e0c64bfabeeb001c6e8373cc7e35aac40b2722f18966bb7ebf041e869c9e5c1fdbf0fc24e652fef688707c3ee69b300d8fdc246c SHA512 21c8898673e402514c6d40ae0045d6e9077b1606430465bfb146507fbe098be6ca4f88d976e2dafadbc8e84b5aeb9325b58ce8a384ea4ed6de4f5fec485d51ea
DIST freecell-solver-5.22.1.tar.xz 421948 BLAKE2B 173a6bb25110695dfaf590f8339f4728e96ad112788efa73ff05ef311effd48b1e037aaa9ed8446cfe3408012f81bb785e6d7a17d249c95108ca38e2473ee0f7 SHA512 8472ce519168481fcbfa0347d1d86859c7344fe34a58bbef694d22653c02f09e70722bf92e052bda5b3f9bce8cee0f745ac45c9e08712b15c34bb40306f510f6
diff --git a/dev-games/freecell-solver/files/freecell-solver-5.14.0-cmake.patch b/dev-games/freecell-solver/files/freecell-solver-5.14.0-cmake.patch
deleted file mode 100644
index 3eef53666837..000000000000
--- a/dev-games/freecell-solver/files/freecell-solver-5.14.0-cmake.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Package wants to install all kinds of doc files. It does not help us.
-
---- a/CMakeLists.txt 2019-09-12 23:04:19.628187073 +0200
-+++ b/CMakeLists.txt 2019-09-12 23:06:38.928231282 +0200
-@@ -858,14 +858,6 @@
- INSTALL_MAN ("${fc_solve_manpage}" 6)
- ENDIF ()
-
--INSTALL(
-- FILES
-- ${docs_to_install}
-- "README.win32.txt"
-- DESTINATION
-- "share/doc/freecell-solver-5.14.0"
--)
--
- SET (dest "include/freecell-solver")
- INSTALL(
- FILES
diff --git a/dev-games/freecell-solver/freecell-solver-5.14.0-r1.ebuild b/dev-games/freecell-solver/freecell-solver-5.14.0-r1.ebuild
deleted file mode 100644
index 996f3aa184b5..000000000000
--- a/dev-games/freecell-solver/freecell-solver-5.14.0-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-inherit cmake python-single-r1
-
-DESCRIPTION="C library for automatically solving Freecell and some other solitaire variants"
-HOMEPAGE="https://fc-solve.shlomifish.org/"
-SRC_URI="https://fc-solve.shlomifish.org/downloads/fc-solve/${P}.tar.xz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm64 x86"
-IUSE="tcmalloc"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
- $(python_gen_cond_dep '
- dev-python/pysol_cards[${PYTHON_MULTI_USEDEP}]
- dev-python/random2[${PYTHON_MULTI_USEDEP}]
- dev-python/six[${PYTHON_MULTI_USEDEP}]
- ')
- tcmalloc? ( dev-util/google-perftools )
-"
-DEPEND="${RDEPEND}
- dev-perl/Path-Tiny
- dev-perl/Template-Toolkit
-"
-
-DOCS=( README.html )
-
-PATCHES=( "${FILESDIR}/${P}-cmake.patch" )
-
-src_prepare() {
- sed -i -e "s|share/doc/freecell-solver/|share/doc/${P}|" CMakeLists.txt || die
-
- python_fix_shebang board_gen
-
- cmake_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- -DBUILD_STATIC_LIBRARY=OFF
- -DFCS_BUILD_DOCS=OFF
- -DFCS_WITH_TEST_SUITE=OFF #requires unpackaged dependencies
- -DFCS_AVOID_TCMALLOC=$(usex !tcmalloc)
- )
-
- cmake_src_configure
-}
diff --git a/dev-games/freecell-solver/freecell-solver-5.22.1.ebuild b/dev-games/freecell-solver/freecell-solver-5.22.1.ebuild
index 67975b0abe75..c8e88cfcd6eb 100644
--- a/dev-games/freecell-solver/freecell-solver-5.22.1.ebuild
+++ b/dev-games/freecell-solver/freecell-solver-5.22.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://fc-solve.shlomifish.org/downloads/fc-solve/${P}.tar.xz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
IUSE="tcmalloc"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index fc261465255c..d81f170f632f 100644
Binary files a/dev-java/Manifest.gz and b/dev-java/Manifest.gz differ
diff --git a/dev-java/icedtea/Manifest b/dev-java/icedtea/Manifest
index ee269e4710e6..789b3ac4114d 100644
--- a/dev-java/icedtea/Manifest
+++ b/dev-java/icedtea/Manifest
@@ -9,5 +9,16 @@ DIST icedtea-3.15-nashorn-04210bbb67cd.tar.xz 2319568 BLAKE2B 1078f8847eefffffbd
DIST icedtea-3.15-openjdk-c0ec72b715dd.tar.xz 362300 BLAKE2B e5bd5766bd9f436f09fb5146ab1c0ee3e82f9d32526fc41e2c9320c2e330a4603883206e0ebcfd076ffeff8ccdd3c289a5018f718223b68852e08bf4822167e0 SHA512 d7dca834fc65b67b1888c4cfbd50e263e58604b70560b4dd4e8e7ca518fcd54a70eaf9e5cff89fa1954beaa3071f5b55ef36fffb36589f5008e4be39e5a1aa38
DIST icedtea-3.15-shenandoah-9fcff2250bb4.tar.xz 7077244 BLAKE2B 1122b74e12683577e0a8fdc18be5b4db6c2ee59d64424200940c18889e6c39567f9471b44f4d7199bc1816ed2f5d2a16bfe06e0b1b1c0d93bc0722202c272115 SHA512 0c229ab3c1a2de6c24715d9713250e35c415f919ee3c4e99b0b101bc3f51fea54814f235da345d0d4954d4f3283c7757091076a7128847c879399fd1c8a6c15d
DIST icedtea-3.15.0.tar.xz 1532664 BLAKE2B cdaa6fedc3ca804d63c9025c7798287948ddf917a4e04e15019c5b9b96db661ea339e51dc94b68647e4c19a01498c21a1a61da5496bc6cd873f144fd0c76d1db SHA512 7c5917acc03b19a41b5001beb71a72b3f63e65b3c97c5f9173067fbd795088f9578f628b386bfa0e934caa8f4faab4cfcae80329ee7180c0cbe49563309c84ca
+DIST icedtea-3.16-aarch32-ecc1eb1dc760.tar.xz 6854900 BLAKE2B a4b0a4fec267f0dd64618aa83a2cf487e83bfa133e03914a079d451abb6be573e4d157f12372d6d2eaa66f834d4a1ec0bad8f1a65d2619468bb3de8567863036 SHA512 20ba1980a4f4161c632e8ec02330c3b0c971a5eff19456a568b2df4622fcfedb18594c7e350318a15a31a5395c0544899160d71805f0a3d3886ae7a16019c010
+DIST icedtea-3.16-corba-ea3169880d70.tar.xz 947604 BLAKE2B 22e7fdab5168b01501791c9537b72f884cdd008ec912e1e7afb05c410e47ab9fffc37aeeab78400a39b6216612927eb63bdc6ba2169fc7e74fe8d6c60b1af978 SHA512 bf90c95f401d4628e32b9a7ea78b7d43944f82882818a81d2ff368f09e49148091bf823d78ed56c343c175fe6d25492d9b78e25b725f218592ea94c4ae285e56
+DIST icedtea-3.16-hotspot-eeb08cfebded.tar.xz 6906968 BLAKE2B 78bd9ecef9801a190ce2993d1023d6eb3db8276cc7fc726cccbf406e630a4bc62401299885de42df85f92611da10c732ae50600af9e337dcf3014472777ba38a SHA512 19490ccc377fde5dc3d4396425e945f32e121ad0cc4be394b07f8698a7e3805b16fc41e427bab5fa290cb84efc7edb62acf8ca98072176343f5584d692592d2d
+DIST icedtea-3.16-jaxp-883803235596.tar.xz 2293880 BLAKE2B c749477661d9e492ab15e0b773d641f68865196c8d2897eceeafd341cacf143e73c6b55face57d528ca5d1a648798db4533e7b924daa918c2ce62d26b407bf5b SHA512 86e8c18741c1f4baca27d784b068765e404a5c2ee6ecb172c826fc1d6192b5776133f103b749839c39154fcaec87a0df95e8fd5bcb56b1e9b811711b296a4836
+DIST icedtea-3.16-jaxws-e5d96dc9988a.tar.xz 2276192 BLAKE2B 79c33b530f95ab098297d0cdb5844660df4330555195c366611cadde8478711cc4a0fef3b68a23bbd710d4213298cd4293cdec3d12a07c0682f6e264489e9d11 SHA512 824ef15aa70ec629406fd9b98a69e5699fe8f6a8ab06be00ac546bcda1daf485b20de6ea0310064e000efbaf35b1cebee25bf69033634fdce8434efb3bb16f1d
+DIST icedtea-3.16-jdk-bb9b9a0ad162.tar.xz 39849832 BLAKE2B 2b9b3ca3988955015760c82481a86af73c13b37b0c26714fbdac33de73b70ecf2fb3abcd908406dfe7dc202b02c70d66ba6b64f838b8e0b2ecb55a46944998c3 SHA512 9202f88b360637ad474920d8a6f85740e6a425679617ef713efd67778b4c7ca0b3eba7e4fc9d33de0bbd5dacda4862c8a9b63a13880204388b01af29d5fb6a55
+DIST icedtea-3.16-langtools-e47d37e5fe0b.tar.xz 2078808 BLAKE2B 2f7286c15c90607e67eea8b8ca560cc83a21e4a3ebbb5846afeb79ccfefe0713fe27ebe56a505f263276476e0a99c470171030cbaa406fbbc7cdef13acbf89b1 SHA512 1858bb3b7dd37edd817a52c67a878b48bc9b790623e77d9a6107f54b141638cb101ae3b8df560e3352c9ca2925aa5d493b4924e36a238be5a9628c714cc23642
+DIST icedtea-3.16-nashorn-1d70dcb4ab53.tar.xz 2319492 BLAKE2B c328c3a99fbd49be1efbecbb12e46be57d4cb78c65ca778f95644e2d193a4390ed1ad1ce3cddc6f737241d5e02b18b50adbc37748907db3eabe406a4880a6afb SHA512 4bf87e7441ac747f133612e1fba5c06946c6731bae76132ffc614b41fcb689fda9d9ceb1e1fee3765765c6109894c85cf0f6e6fa9eb301f9a2d640ea6cd1c16c
+DIST icedtea-3.16-openjdk-bca1f7228ce8.tar.xz 363112 BLAKE2B aff804d5b5d58dcb25f9a576aa0a23355d2229f89d5dc69142580d5fab3bdd688225d2e33090714a3d292d9d98758867feaef9c179a4c77b5cab37c21c5f0610 SHA512 76b32457958c2cdbb0006629bb41652286a1a9bfbda862665eddf822d4653d4858f9f2565e849b0e49f031b7667be73be8fe8c71abc65e1795eb570a96d1fd1e
+DIST icedtea-3.16-shenandoah-e4e81ae21643.tar.xz 7081200 BLAKE2B bbbd4f3cc7f3adb34a3c3497c62eeb1336d554f7396b952b94ad8f573295c1537e9c3416fc2d2881efef6d6a1750bd069da0fac37a0d556eeb55a0ace9b7b385 SHA512 adbb279d59d4978403b222caf9f0823b3ae2a0d6e27911a38243fe6ef9b1a7f0d8640d71b67fa510c341dc175031e52b4b6aa6187a37ac467372a55946ae37d3
+DIST icedtea-3.16.0.tar.xz 1534432 BLAKE2B ef8ffc6773c2ea1d71a2bad1f425f891edd65cb61fd22b1c36b06539b9656f211422d897e35b707bac1b0005eaa95d31bab3079c5e31454383be01d9750394ba SHA512 67964f283b5a220ded7c86141ac359fc51f41077686d3e68568a9f303d2e5e6d62472bef2d6f5f9d53897a55589c84d3212983194607b9a6704192752f8ad2ac
DIST icedtea-cacao-c182f119eaad.tar.xz 3056520 BLAKE2B 6b1be66ce19f491d49f1591babcd8c088e8e327f828dca3f30b8f8b04c132140f8b9f487ef6d91aed212aebab2c7c3052d79fa3f2d76d3832341d94d48e77089 SHA512 22e8a031db5f93f82b276b310c175f1e926e48d64e1e50bebe51138e0f66391cd005501491a959d31663f338f27a29ec984ac29f77078f59472856e4d08edef7
DIST icedtea-jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz 317187 BLAKE2B 1ca581a02be4cf5c09162687bbc90ec01b58b4910d866d11512cf17a1caff181fdc69e42f7498b2df9deb875ddc6efc6bc2888428f411da94bbc2313ddf5a2c9 SHA512 a31348481e1c02747f5bb9db333f855c45a1555aa187ee35de5ef553a10a8a47dfcc1beb1e69502046c1758438b91958a328e0a0015812c153221f67734a70a6
diff --git a/dev-java/icedtea/icedtea-3.16.0.ebuild b/dev-java/icedtea/icedtea-3.16.0.ebuild
new file mode 100644
index 000000000000..de38d49e5933
--- /dev/null
+++ b/dev-java/icedtea/icedtea-3.16.0.ebuild
@@ -0,0 +1,376 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Build written by Andrew John Hughes (gnu_andrew@member.fsf.org)
+
+# *********************************************************
+# * IF YOU CHANGE THIS EBUILD, CHANGE ICEDTEA-6.* AS WELL *
+# *********************************************************
+
+EAPI="6"
+SLOT="8"
+
+inherit check-reqs flag-o-matic java-pkg-2 java-vm-2 multiprocessing pax-utils prefix versionator xdg-utils
+
+ICEDTEA_VER=$(get_version_component_range 1-3)
+ICEDTEA_BRANCH=$(get_version_component_range 1-2)
+ICEDTEA_PKG=icedtea-${ICEDTEA_VER}
+ICEDTEA_PRE=$(get_version_component_range _)
+
+CORBA_TARBALL="ea3169880d70.tar.xz"
+JAXP_TARBALL="883803235596.tar.xz"
+JAXWS_TARBALL="e5d96dc9988a.tar.xz"
+JDK_TARBALL="bb9b9a0ad162.tar.xz"
+LANGTOOLS_TARBALL="e47d37e5fe0b.tar.xz"
+OPENJDK_TARBALL="bca1f7228ce8.tar.xz"
+NASHORN_TARBALL="1d70dcb4ab53.tar.xz"
+HOTSPOT_TARBALL="eeb08cfebded.tar.xz"
+SHENANDOAH_TARBALL="e4e81ae21643.tar.xz"
+AARCH32_TARBALL="ecc1eb1dc760.tar.xz"
+
+CACAO_TARBALL="cacao-c182f119eaad.tar.xz"
+JAMVM_TARBALL="jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz"
+
+CORBA_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-corba-${CORBA_TARBALL}"
+JAXP_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-jaxp-${JAXP_TARBALL}"
+JAXWS_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-jaxws-${JAXWS_TARBALL}"
+JDK_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-jdk-${JDK_TARBALL}"
+LANGTOOLS_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-langtools-${LANGTOOLS_TARBALL}"
+OPENJDK_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-openjdk-${OPENJDK_TARBALL}"
+NASHORN_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-nashorn-${NASHORN_TARBALL}"
+HOTSPOT_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-hotspot-${HOTSPOT_TARBALL}"
+SHENANDOAH_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-shenandoah-${SHENANDOAH_TARBALL}"
+AARCH32_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-aarch32-${AARCH32_TARBALL}"
+
+CACAO_GENTOO_TARBALL="icedtea-${CACAO_TARBALL}"
+JAMVM_GENTOO_TARBALL="icedtea-${JAMVM_TARBALL}"
+
+DROP_URL="https://icedtea.classpath.org/download/drops"
+ICEDTEA_URL="${DROP_URL}/icedtea${SLOT}/${ICEDTEA_VER}"
+
+DESCRIPTION="A harness to build OpenJDK using Free Software build tools and dependencies"
+HOMEPAGE="https://icedtea.classpath.org"
+SRC_PKG="${ICEDTEA_PKG}.tar.xz"
+SRC_URI="
+ https://icedtea.classpath.org/download/source/${SRC_PKG}
+ ${ICEDTEA_URL}/openjdk.tar.xz -> ${OPENJDK_GENTOO_TARBALL}
+ ${ICEDTEA_URL}/corba.tar.xz -> ${CORBA_GENTOO_TARBALL}
+ ${ICEDTEA_URL}/jaxp.tar.xz -> ${JAXP_GENTOO_TARBALL}
+ ${ICEDTEA_URL}/jaxws.tar.xz -> ${JAXWS_GENTOO_TARBALL}
+ ${ICEDTEA_URL}/jdk.tar.xz -> ${JDK_GENTOO_TARBALL}
+ ${ICEDTEA_URL}/hotspot.tar.xz -> ${HOTSPOT_GENTOO_TARBALL}
+ ${ICEDTEA_URL}/nashorn.tar.xz -> ${NASHORN_GENTOO_TARBALL}
+ ${ICEDTEA_URL}/langtools.tar.xz -> ${LANGTOOLS_GENTOO_TARBALL}
+ shenandoah? ( ${ICEDTEA_URL}/shenandoah.tar.xz -> ${SHENANDOAH_GENTOO_TARBALL} )
+ arm? ( ${ICEDTEA_URL}/aarch32.tar.xz -> ${AARCH32_GENTOO_TARBALL} )
+ ${DROP_URL}/cacao/${CACAO_TARBALL} -> ${CACAO_GENTOO_TARBALL}
+ ${DROP_URL}/jamvm/${JAMVM_TARBALL} -> ${JAMVM_GENTOO_TARBALL}"
+
+LICENSE="Apache-1.1 Apache-2.0 GPL-1 GPL-2 GPL-2-with-linking-exception LGPL-2 MPL-1.0 MPL-1.1 public-domain W3C"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+IUSE="+alsa cacao +cups doc examples +gtk headless-awt
+ jamvm +jbootstrap kerberos libressl nsplugin pax_kernel +pch
+ pulseaudio sctp selinux shenandoah smartcard +source +system-lcms test webstart zero"
+
+RESTRICT="!test? ( test )"
+REQUIRED_USE="gtk? ( !headless-awt )"
+
+# Ideally the following were optional at build time.
+ALSA_COMMON_DEP="
+ >=media-libs/alsa-lib-1.0"
+CUPS_COMMON_DEP="
+ >=net-print/cups-1.2.12"
+X_COMMON_DEP="
+ >=media-libs/giflib-4.1.6:0=
+ >=media-libs/libpng-1.2:0=
+ >=x11-libs/libX11-1.1.3
+ >=x11-libs/libXext-1.1.1
+ >=x11-libs/libXi-1.1.3
+ >=x11-libs/libXrender-0.9.4
+ >=x11-libs/libXtst-1.0.3
+ x11-libs/libXcomposite"
+X_DEPEND="
+ x11-base/xorg-proto
+ >=x11-libs/libXau-1.0.3
+ >=x11-libs/libXdmcp-1.0.2
+ >=x11-libs/libXinerama-1.0.2"
+
+# The Javascript requirement is obsolete; OpenJDK 8+ has Nashorn
+COMMON_DEP="
+ >=dev-libs/glib-2.26:2=
+ >=dev-util/systemtap-1
+ media-libs/fontconfig:1.0=
+ >=media-libs/freetype-2.5.3:2=
+ >=sys-libs/zlib-1.2.3
+ virtual/jpeg:0=
+ kerberos? ( virtual/krb5 )
+ sctp? ( net-misc/lksctp-tools )
+ smartcard? ( sys-apps/pcsc-lite )
+ system-lcms? ( >=media-libs/lcms-2.9:2= )"
+
+# Gtk+ will move to COMMON_DEP in time; PR1982
+# gsettings-desktop-schemas will be needed for native proxy support; PR1976
+RDEPEND="${COMMON_DEP}
+ !dev-java/icedtea:0
+ !dev-java/icedtea-web:7
+ >=gnome-base/gsettings-desktop-schemas-3.12.2
+ >=sys-apps/baselayout-java-0.1.0-r1
+ virtual/ttf-fonts
+ alsa? ( ${ALSA_COMMON_DEP} )
+ cups? ( ${CUPS_COMMON_DEP} )
+ gtk? (
+ >=dev-libs/atk-1.30.0
+ >=x11-libs/cairo-1.8.8
+ x11-libs/gdk-pixbuf:2
+ >=x11-libs/gtk+-2.8:2
+ >=x11-libs/pango-1.24.5
+ )
+ !headless-awt? ( ${X_COMMON_DEP} )
+ selinux? ( sec-policy/selinux-java )"
+
+# ca-certificates, perl and openssl are used for the cacerts keystore generation
+# perl is needed for running the SystemTap tests and the bootstrap javac
+# lsb-release is used to obtain distro information for the version & crash dump output
+# attr is needed for xattr.h which defines the extended attribute syscalls used by NIO2
+# x11-libs/libXt is needed for headers only (Intrinsic.h, IntrinsicP.h, Shell.h, StringDefs.h)
+# Ant is no longer needed under the new build system
+DEPEND="${COMMON_DEP} ${ALSA_COMMON_DEP} ${CUPS_COMMON_DEP} ${X_COMMON_DEP} ${X_DEPEND}
+ || (
+ dev-java/icedtea-bin:8
+ dev-java/icedtea:8
+ dev-java/openjdk:8
+ dev-java/openjdk-bin:8
+ )
+ app-arch/cpio
+ app-arch/unzip
+ app-arch/zip
+ app-misc/ca-certificates
+ dev-lang/perl
+ !libressl? ( dev-libs/openssl:0 )
+ libressl? ( dev-libs/libressl:0 )
+ sys-apps/attr
+ sys-apps/lsb-release
+ x11-libs/libXt
+ virtual/pkgconfig
+ pax_kernel? ( sys-apps/elfix )"
+
+PDEPEND="webstart? ( >=dev-java/icedtea-web-1.6.1:0 )
+ nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] )
+ pulseaudio? ( dev-java/icedtea-sound )"
+
+S="${WORKDIR}"/${ICEDTEA_PKG}
+
+icedtea_check_requirements() {
+ local CHECKREQS_DISK_BUILD
+
+ if use doc; then
+ CHECKREQS_DISK_BUILD="9000M"
+ else
+ CHECKREQS_DISK_BUILD="8500M"
+ fi
+
+ check-reqs_pkg_${EBUILD_PHASE}
+}
+
+pkg_pretend() {
+ icedtea_check_requirements
+}
+
+pkg_setup() {
+ icedtea_check_requirements
+
+ JAVA_PKG_WANT_BUILD_VM="
+ icedtea-8 icedtea-bin-8
+ openjdk-8 openjdk-bin-8"
+ JAVA_PKG_WANT_SOURCE="1.5"
+ JAVA_PKG_WANT_TARGET="1.5"
+
+ java-vm-2_pkg_setup
+ java-pkg-2_pkg_setup
+}
+
+src_unpack() {
+ unpack ${SRC_PKG}
+}
+
+src_configure() {
+ # GCC10/-fno-common handling
+ append-flags -fcommon
+
+ # For bootstrap builds as the sandbox control file might not yet exist.
+ addpredict /proc/self/coredump_filter #nowarn
+
+ # icedtea doesn't like some locales. #330433 #389717
+ export LANG="C" LC_ALL="C"
+
+ local cacao_config config hotspot_port hs_config jamvm_config use_cacao use_jamvm use_zero zero_config
+ local vm=$(java-pkg_get-current-vm)
+
+ # gcj-jdk ensures ecj is present.
+ if use jbootstrap || has "${vm}" gcj-jdk; then
+ use jbootstrap || einfo "bootstrap is necessary when building with ${vm}, ignoring USE=\"-jbootstrap\""
+ config+=" --enable-bootstrap"
+ else
+ config+=" --disable-bootstrap"
+ fi
+
+ # Use Zero if requested
+ if use zero; then
+ use_zero="yes"
+ fi
+
+ # Use JamVM if requested
+ if use jamvm; then
+ use_jamvm="yes"
+ fi
+
+ # Use CACAO if requested
+ if use cacao; then
+ use_cacao="yes"
+ fi
+
+ # Are we on a architecture with a HotSpot port?
+ # In-tree JIT ports are available for amd64, arm, arm64, ppc64 (be&le), SPARC and x86.
+ if { use amd64 || use arm || use arm64 || use ppc64 || use sparc || use x86; }; then
+ hotspot_port="yes"
+ # Work around stack alignment issue, bug #647954.
+ use x86 && append-flags -mincoming-stack-boundary=2
+ fi
+
+ # Always use HotSpot as the primary VM if available. #389521 #368669 #357633 ...
+ # Otherwise use Zero for now until alternate VMs are working
+ if test "x${hotspot_port}" != "xyes"; then
+ use_zero="yes"
+ fi
+
+ if use shenandoah; then
+ if { use amd64 || use arm64; }; then
+ hs_config="--with-hotspot-build=shenandoah"
+ hs_config+=" --with-hotspot-src-zip="${DISTDIR}/${SHENANDOAH_GENTOO_TARBALL}""
+ else
+ eerror "Shenandoah is only supported on arm64 and x86_64. Please re-build with USE="-shenandoah""
+ fi
+ else
+ if use arm ; then
+ hs_config="--with-hotspot-src-zip="${DISTDIR}/${AARCH32_GENTOO_TARBALL}""
+ else
+ hs_config="--with-hotspot-src-zip="${DISTDIR}/${HOTSPOT_GENTOO_TARBALL}""
+ fi
+ fi
+
+ # Turn on JamVM if needed (non-HS archs) or requested
+ if test "x${use_jamvm}" = "xyes"; then
+ if test "x${hotspot_port}" = "xyes"; then
+ ewarn 'Enabling JamVM on an architecture with HotSpot support; issues may result.'
+ ewarn 'If so, please rebuild with USE="-jamvm"'
+ fi
+ ewarn 'JamVM is known to still have issues with IcedTea 3.x; please rebuild with USE="-jamvm"'
+ jamvm_config="--enable-jamvm"
+ fi
+
+ # Turn on CACAO if needed (non-HS archs) or requested
+ if test "x${use_cacao}" = "xyes"; then
+ if test "x${hotspot_port}" = "xyes"; then
+ ewarn 'Enabling CACAO on an architecture with HotSpot support; issues may result.'
+ ewarn 'If so, please rebuild with USE="-cacao"'
+ fi
+ ewarn 'CACAO is known to still have issues with IcedTea 3.x; please rebuild with USE="-cacao"'
+ cacao_config="--enable-cacao"
+ fi
+
+ # Turn on Zero if needed (non-HS/CACAO archs) or requested
+ if test "x${use_zero}" = "xyes"; then
+ if test "x${hotspot_port}" = "xyes"; then
+ ewarn 'Enabling Zero on an architecture with HotSpot support; performance will be significantly reduced.'
+ fi
+ zero_config="--enable-zero"
+ fi
+
+ # PaX breaks pch, bug #601016
+ if use pch && ! host-is-pax; then
+ config+=" --enable-precompiled-headers"
+ else
+ config+=" --disable-precompiled-headers"
+ fi
+
+ config+=" --with-parallel-jobs=$(makeopts_jobs)"
+
+ unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS
+
+ econf ${config} \
+ --with-openjdk-src-zip="${DISTDIR}/${OPENJDK_GENTOO_TARBALL}" \
+ --with-corba-src-zip="${DISTDIR}/${CORBA_GENTOO_TARBALL}" \
+ --with-jaxp-src-zip="${DISTDIR}/${JAXP_GENTOO_TARBALL}" \
+ --with-jaxws-src-zip="${DISTDIR}/${JAXWS_GENTOO_TARBALL}" \
+ --with-jdk-src-zip="${DISTDIR}/${JDK_GENTOO_TARBALL}" \
+ --with-langtools-src-zip="${DISTDIR}/${LANGTOOLS_GENTOO_TARBALL}" \
+ --with-nashorn-src-zip="${DISTDIR}/${NASHORN_GENTOO_TARBALL}" \
+ --with-cacao-src-zip="${DISTDIR}/${CACAO_GENTOO_TARBALL}" \
+ --with-jamvm-src-zip="${DISTDIR}/${JAMVM_GENTOO_TARBALL}" \
+ --with-jdk-home="$(java-config -O)" \
+ --prefix="${EPREFIX}/usr/$(get_libdir)/icedtea${SLOT}" \
+ --mandir="${EPREFIX}/usr/$(get_libdir)/icedtea${SLOT}/man" \
+ --with-pkgversion="Gentoo ${PF}" \
+ --disable-ccache \
+ --disable-downloading --disable-Werror --disable-tests \
+ --disable-systemtap-tests --enable-improved-font-rendering \
+ --enable-system-jpeg --enable-system-zlib \
+ $(use_enable headless-awt headless) \
+ $(use_enable !headless-awt system-gif) \
+ $(use_enable !headless-awt system-png) \
+ $(use_enable doc docs) \
+ $(use_enable kerberos system-kerberos) \
+ $(use_enable system-lcms) \
+ $(use_with pax_kernel pax "${EPREFIX}/usr/sbin/paxmark.sh") \
+ $(use_enable sctp system-sctp) \
+ $(use_enable smartcard system-pcsc) \
+ ${zero_config} ${cacao_config} ${jamvm_config} ${hs_config}
+}
+
+src_compile() {
+ default
+}
+
+src_test() {
+ default
+}
+
+src_install() {
+ default
+
+ local dest="/usr/$(get_libdir)/icedtea${SLOT}"
+ local ddest="${ED}${dest#/}"
+
+ if ! use alsa; then
+ rm -v "${ddest}"/jre/lib/$(get_system_arch)/libjsoundalsa.* || die
+ fi
+
+ if ! use examples; then
+ rm -r "${ddest}"/demo "${ddest}"/sample || die
+ fi
+
+ if ! use source; then
+ rm -v "${ddest}"/src.zip || die
+ fi
+
+ dosym ../../../usr/share/doc/"${PF}" usr/share/doc/"${PN}${SLOT}"
+
+ # Fix the permissions.
+ find "${ddest}" \! -type l \( -perm /111 -exec chmod 755 {} \; -o -exec chmod 644 {} \; \) || die
+
+ dosym ../../../../../../etc/ssl/certs/java/cacerts "${dest}"/jre/lib/security/cacerts
+
+ java-vm_install-env "${FILESDIR}/icedtea.env.sh"
+ java-vm_sandbox-predict /proc/self/coredump_filter
+}
+
+pkg_postinst() {
+ xdg_icon_cache_update
+ java-vm-2_pkg_postinst
+}
+
+pkg_postrm() {
+ xdg_icon_cache_update
+ java-vm-2_pkg_postrm
+}
diff --git a/dev-java/openjdk-bin/Manifest b/dev-java/openjdk-bin/Manifest
index 0fcefaaf76db..2caa77f52f89 100644
--- a/dev-java/openjdk-bin/Manifest
+++ b/dev-java/openjdk-bin/Manifest
@@ -1,16 +1,8 @@
-DIST OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.6_10.tar.gz 195417692 BLAKE2B 7834b8d29535eebbd62b6e7d1de71a8d49ab323d64d60c7e7a2d54247236e4ff1628907f1cae0807d19292a888894e060175673499cf802ec1af1881eaeda4a5 SHA512 ba26ccd26990888c6905a52c706ddd06584d61cffd2cd0c2d8fd030c9cf23d0ac5518e50aba3c1949fd9fcc73ca3736659cdb5315c13279950504ba25a77aa70
DIST OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.7_10.tar.gz 190134743 BLAKE2B 294ff3be6e68f14e9c53df04e7c4092a73fc27bfb5e1c35ab686ce6a30c69d0f7e9133815ddfdc0217098af287e1cd50353aaa204d3a813052d7c4375a8b8f1b SHA512 71054ff5c996a2ab4409d06d84900525ddd66e6b68bb2c558f0054343fb5fdc92efb4727ef6d9b91b1359e2b9c719ff3eb224eb1a9c5096753e723f12604535b
-DIST OpenJDK11U-jdk_arm_linux_hotspot_11.0.6_10.tar.gz 183667331 BLAKE2B 534ac147022ab93e862d062559999c008a0b8365418dc8e56b531dffa57f5b9a6675053fd09bae612fa350929035be961764017c12a1dbb04f3da0b0c3378595 SHA512 9f066212ab05db8d830d9fa01e754b925d0a56f14ce318184b40dfc4e1c52e2a757af2493ecc75235eba30f2059079985c0b737127c00a3c645f5b79558d08d1
DIST OpenJDK11U-jdk_arm_linux_hotspot_11.0.7_10.tar.gz 178497327 BLAKE2B 59d84c0c09368e4bae499469efb0bc2f1f9c6f518fbcfbf75190e6e06eb4592b9da021b9101c769e6e6bd4c83e88217f177b489103f36f0ba92ba757df216989 SHA512 1ecc0b25295708af3011a5428f811a5c6c14f7edf17f853c7ed286687a3b2f982d4f8b0a45d9c7c24b476ccc60143f5e71c75464fab4d2d8be16c186f1e48341
-DIST OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.6_10.tar.gz 181717626 BLAKE2B e918d7be5bf119472772d6bbe90dc27d4ae8c18e7f80c508e94388a6c7642d50b9b6a1b8055d56f6f2d9d01e4d9df84a8589959b9c1334720f05e7c9374e42b3 SHA512 bd42374b96b26afea0fae9922d2c98da8511cc182b063a8f0da30272e0c6e1ce85faeb1ae3f58eb33f3fbeb2eb4e313c0a4c74a96e00b1bc87f18eabcefe83f0
DIST OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.7_10.tar.gz 176497292 BLAKE2B 2bf45400c5d201cb6530d01b234da28078cf3a8e8bb23470a3c698b982ca700828baf653d00cf4aa1933193742474fc81b5df9054f33706545c46733a1ccc79d SHA512 adc40402de81f49fd691c7c07e805f6ee3a4298353417c5e92dd14d791253f4eaafcdb68837d614d7850f82006701b048df04cd6a1d25a16d125a2a38bc277d5
-DIST OpenJDK11U-jdk_x64_linux_hotspot_11.0.6_10.tar.gz 197198464 BLAKE2B 8b629b5257823517499f362183ab6a76b023374898a85269efcff824059f1d93a2a79c4c6907a13971b833aecb30f7d07697c1fafe10e26fa12f44e9a5d023ff SHA512 e8fd5b64049c4d9a50e1b3a9391e19d07d40f7ebc68464a0952396dabf0c9270f934e695b4ad33c0e2c2fa64585a81f4fdce488d5ade95d9a74fd352f2dbae43
DIST OpenJDK11U-jdk_x64_linux_hotspot_11.0.7_10.tar.gz 193346198 BLAKE2B 506fc32c3c1ea729e79a044f31bafad995aaf7ac23bda47b21926493aa8d473195067a2d7989b0eafb91d7054222ebd5d924567b1d4b6935be7cff9fd25b1e90 SHA512 fa19880289ce8fa4a72fddd5633cf86a33d9f81346a5a7e51c06d7fc48f1953da01f020d15151d74a624ecc22a9f8f2c8ee4f996a4b3ac2ec79f0fb5207a40f8
DIST OpenJDK8U-jdk_aarch64_linux_hotspot_8u252b09.tar.gz 102238546 BLAKE2B ffa0aec56e4f6fe03cab88e0423e5b1ee24ccbe9eb0bd37d37449c596095d69e7fcb9044c0846a750d3d1a842c2f719d18a28510bd226a8aa9b383e4ae29993b SHA512 a6ef9864cde15e96abcb94f2e72db77f473e609fd162934fc3d35225223a20e20c464e44ce0c022dbf15f6d68d25bf2187271d8643e5cff2894f1839929050ae
-DIST OpenJDK8U-jdk_aarch64_linux_hotspot_jdk8u242-b08.tar.gz 104602970 BLAKE2B f666c127369ae3edb79887fa8a4f58e60def6078c7e22e3df8e648b6e793eb8c3284204b1039c55a5eca86ad5d81b7d53de815df7a869315943a02ca182cc0a4 SHA512 a800057129aacac01090a108c795b7e5f84ec99b1a030fcda0baf2ab6362ac225ef408a1308138d4aa36d84bde80ba7cde9e27214522b6973546a27a3c11c902
-DIST OpenJDK8U-jdk_arm_linux_hotspot_8u242b08.tar.gz 99282910 BLAKE2B 83ac54a33f8f898423dece75d02e759a908ca68d9a4ec7719a51b5d40386404d162108c9ce157c9ef995678491588a6542777a13dd961dab46d2974d4613855c SHA512 bf754ad63c1be8cad20eff0e159fe5d90dd0b138d28e95509f7bb8fc37b9282295c105bbaa3822c48c12be32a698e9b30f29400aa2a2e2e44d0ad8cb018b6075
DIST OpenJDK8U-jdk_arm_linux_hotspot_8u252b09.tar.gz 96925784 BLAKE2B 3e294a9a38729e453dd74d691bad4abd043fefd2a850a1d8fa142e5e5c2b908a1c7a0d9f2ebf1760ecf065cb615a59a930c84e86e86a339da01a794f1f3319ed SHA512 a361cb07b43ebaf7d1aa277c15ee41493fb25ff78dcad1801436ef68a54c4a89f2361c3f57ce328c507b9f36c81a301d95d9315d32aa888163d533d7d741effd
-DIST OpenJDK8U-jdk_ppc64le_linux_hotspot_8u242b08.tar.gz 101817012 BLAKE2B e86abc1708f23fd9e3809824fbe3084dddbf115a5b5d5fac7a4936e16f78033dafea0ee6e6113dc463e33f55907caefed4ae2cb85864ef1d59e7b45e2708a564 SHA512 c304aab812559a5da9b346759533ddb3e1bb6320e959e8dd01a0ae5cb3b85a6282492e7bdfafef40573c3970b79b8bac8e2abff021a43966a4b7e7edf80ae70a
DIST OpenJDK8U-jdk_ppc64le_linux_hotspot_8u252b09.tar.gz 99444051 BLAKE2B 87f691298c7335c0adb285db6eff8ecb3897bb7b229bc6491b992375bd63c93eef126702ee461609b3a781240747d3f1372b4ed711a420cca1248878a82a2b6f SHA512 875d0d74088744a0a56a4706cd86a78ef2c5eb1a5792ba94ef2f51bf894a94123e761ab8fa0e5e74272c2f350a881073e4054e9f1c504421f43bb93b837d26a4
-DIST OpenJDK8U-jdk_x64_linux_hotspot_8u242b08.tar.gz 104566766 BLAKE2B a928ce93989d87382a654beacfc7600090816005f1ef21fe4fabbeaed8c5e446292a8f3c651e93bba28b2b95169a99a4edd849db8ff7c9eac5cc5507d710bc65 SHA512 f72f91fcbecb1fe48dd56bab86c6ae53b3bd2a622a1228b5feace8f9cd84f60d6073f9d1d3e6215c894b6d14f213bf052e955c2935fe57d4757ac09bbca12cce
DIST OpenJDK8U-jdk_x64_linux_hotspot_8u252b09.tar.gz 102170196 BLAKE2B 529630d67553064d302a81079eb61f10da8fc7fbcb69375020f5572fa4e9a46a679e6b0de99b7f67d9f40305a5347e9337cb6dec1c3cac5576671f52866beb2e SHA512 923a3122aa15db27f1605d1f988efa4a5bc920ad132121ba906f9d4cea11b8bfdcfe5b777ea7f37f5789e0be85135f24f1ddf7cbdff40594336fde7fc0474a6d
diff --git a/dev-java/openjdk-bin/openjdk-bin-11.0.6_p10.ebuild b/dev-java/openjdk-bin/openjdk-bin-11.0.6_p10.ebuild
deleted file mode 100644
index bde265d1c316..000000000000
--- a/dev-java/openjdk-bin/openjdk-bin-11.0.6_p10.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit java-vm-2 toolchain-funcs
-
-abi_uri() {
- echo "${2-$1}? (
- https://github.com/AdoptOpenJDK/openjdk${SLOT}-binaries/releases/download/jdk-${MY_PV}/OpenJDK${SLOT}U-jdk_${1}_linux_hotspot_${MY_PV//+/_}.tar.gz
- )"
-}
-
-MY_PV=${PV/_p/+}
-SLOT=${MY_PV%%[.+]*}
-
-SRC_URI="
- $(abi_uri arm)
- $(abi_uri aarch64 arm64)
- $(abi_uri ppc64le ppc64)
- $(abi_uri x64 amd64)
-"
-
-DESCRIPTION="Prebuilt Java JDK binaries provided by AdoptOpenJDK"
-HOMEPAGE="https://adoptopenjdk.net"
-LICENSE="GPL-2-with-classpath-exception"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
-IUSE="alsa cups doc examples +gentoo-vm headless-awt nsplugin selinux source webstart"
-
-RDEPEND="
- media-libs/fontconfig:1.0
- media-libs/freetype:2
- >=sys-apps/baselayout-java-0.1.0-r1
- >=sys-libs/glibc-2.2.5:*
- sys-libs/zlib
- alsa? ( media-libs/alsa-lib )
- cups? ( net-print/cups )
- doc? ( dev-java/java-sdk-docs:${SLOT} )
- selinux? ( sec-policy/selinux-java )
- !headless-awt? (
- x11-libs/libX11
- x11-libs/libXext
- x11-libs/libXi
- x11-libs/libXrender
- x11-libs/libXtst
- )"
-
-PDEPEND="webstart? ( >=dev-java/icedtea-web-1.6.1:0 )
- nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] )"
-
-RESTRICT="preserve-libs splitdebug"
-QA_PREBUILT="*"
-
-S="${WORKDIR}/jdk-${MY_PV}"
-
-pkg_pretend() {
- if [[ "$(tc-is-softfloat)" != "no" ]]; then
- die "These binaries require a hardfloat system."
- fi
-}
-
-src_install() {
- local dest="/opt/${P}"
- local ddest="${ED%/}/${dest#/}"
-
- # Not sure why they bundle this as it's commonly available and they
- # only do so on x86_64. It's needed by libfontmanager.so. IcedTea
- # also has an explicit dependency while Oracle seemingly dlopens it.
- rm -vf lib/libfreetype.so || die
-
- # Oracle and IcedTea have libjsoundalsa.so depending on
- # libasound.so.2 but AdoptOpenJDK only has libjsound.so. Weird.
- if ! use alsa ; then
- rm -v lib/libjsound.* || die
- fi
-
- if ! use examples ; then
- rm -vr demo/ || die
- fi
-
- if use headless-awt ; then
- rm -v lib/lib*{[jx]awt,splashscreen}* || die
- fi
-
- if ! use source ; then
- rm -v lib/src.zip || die
- fi
-
- rm -v lib/security/cacerts || die
- dosym ../../../../etc/ssl/certs/java/cacerts \
- "${dest}"/lib/security/cacerts
-
- dodir "${dest}"
- cp -pPR * "${ddest}" || die
-
- use gentoo-vm && java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh
- java-vm_set-pax-markings "${ddest}"
- java-vm_revdep-mask
- java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
-}
-
-pkg_postinst() {
- java-vm-2_pkg_postinst
-
- if use gentoo-vm ; then
- ewarn "WARNING! You have enabled the gentoo-vm USE flag, making this JDK"
- ewarn "recognised by the system. This will almost certainly break"
- ewarn "many java ebuilds as they are not ready for openjdk-11"
- else
- ewarn "The experimental gentoo-vm USE flag has not been enabled so this JDK"
- ewarn "will not be recognised by the system. For example, simply calling"
- ewarn "\"java\" will launch a different JVM. This is necessary until Gentoo"
- ewarn "fully supports Java 11. This JDK must therefore be invoked using its"
- ewarn "absolute location under ${EPREFIX}/opt/${P}."
- fi
-}
diff --git a/dev-java/openjdk-bin/openjdk-bin-8.242_p08.ebuild b/dev-java/openjdk-bin/openjdk-bin-8.242_p08.ebuild
deleted file mode 100644
index 8ca8ff8c3fe4..000000000000
--- a/dev-java/openjdk-bin/openjdk-bin-8.242_p08.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eapi7-ver java-vm-2
-
-abi_uri() {
- echo "${2-$1}? (
- https://github.com/AdoptOpenJDK/openjdk${SLOT}-binaries/releases/download/jdk${MY_PV}/OpenJDK8U-jdk_${1}_linux_hotspot_${MY_PV/-/}.tar.gz
- )"
-}
-
-MY_PV=$(ver_rs 1 'u' 2 '-' ${PV//p/b})
-SLOT="$(ver_cut 1)"
-
-DESCRIPTION="Prebuilt Java JDK binaries provided by AdoptOpenJDK"
-HOMEPAGE="https://adoptopenjdk.net"
-SRC_URI="
- arm64? ( https://github.com/AdoptOpenJDK/openjdk${SLOT}-binaries/releases/download/jdk${MY_PV}/OpenJDK8U-jdk_aarch64_linux_hotspot_jdk${MY_PV}.tar.gz )
- $(abi_uri arm)
- $(abi_uri ppc64le ppc64)
- $(abi_uri x64 amd64)
-"
-
-LICENSE="GPL-2-with-classpath-exception"
-KEYWORDS="amd64 ~arm arm64 ppc64"
-
-IUSE="alsa cups examples headless-awt nsplugin selinux source webstart"
-
-RDEPEND="
- media-libs/fontconfig:1.0
- media-libs/freetype:2
- >=sys-apps/baselayout-java-0.1.0-r1
- >=sys-libs/glibc-2.2.5:*
- sys-libs/zlib
- alsa? ( media-libs/alsa-lib )
- cups? ( net-print/cups )
- selinux? ( sec-policy/selinux-java )
- !headless-awt? (
- x11-libs/libX11
- x11-libs/libXext
- x11-libs/libXi
- x11-libs/libXrender
- x11-libs/libXtst
- )"
-
-PDEPEND="webstart? ( >=dev-java/icedtea-web-1.6.1:0 )
- nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] )"
-
-RESTRICT="preserve-libs strip"
-QA_PREBUILT="*"
-
-S="${WORKDIR}/jdk${MY_PV}"
-
-src_install() {
- local dest="/opt/${P}"
- local ddest="${ED%/}/${dest#/}"
-
- rm ASSEMBLY_EXCEPTION LICENSE THIRD_PARTY_README || die
-
- # this does not exist on arm64 hence -f
- rm -fv jre/lib/*/libfreetype.so* || die
-
- if ! use alsa ; then
- rm -v jre/lib/*/libjsoundalsa.so* || die
- fi
-
- if ! use examples ; then
- rm -vr sample || die
- fi
-
- if use headless-awt ; then
- rm -fvr {,jre/}lib/*/lib*{[jx]awt,splashscreen}* \
- {,jre/}bin/policytool bin/appletviewer || die
- fi
-
- if ! use source ; then
- rm -v src.zip || die
- fi
-
- rm -v jre/lib/security/cacerts || die
- dosym ../../../../../etc/ssl/certs/java/cacerts \
- "${dest}"/jre/lib/security/cacerts
-
- dodir "${dest}"
- cp -pPR * "${ddest}" || die
-
- java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh
- java-vm_set-pax-markings "${ddest}"
- java-vm_revdep-mask
- java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
-}
diff --git a/dev-java/openjdk-bin/openjdk-bin-8.252_p09.ebuild b/dev-java/openjdk-bin/openjdk-bin-8.252_p09.ebuild
index 8d580d26cdd2..31d2a22f51d4 100644
--- a/dev-java/openjdk-bin/openjdk-bin-8.252_p09.ebuild
+++ b/dev-java/openjdk-bin/openjdk-bin-8.252_p09.ebuild
@@ -24,7 +24,7 @@ SRC_URI="
"
LICENSE="GPL-2-with-classpath-exception"
-KEYWORDS="amd64 ~arm arm64 ~ppc64"
+KEYWORDS="amd64 ~arm arm64 ppc64"
IUSE="alsa cups examples headless-awt nsplugin selinux source webstart"
diff --git a/dev-java/openjdk-jre-bin/Manifest b/dev-java/openjdk-jre-bin/Manifest
index 8aec8cb14aab..46d9e603e242 100644
--- a/dev-java/openjdk-jre-bin/Manifest
+++ b/dev-java/openjdk-jre-bin/Manifest
@@ -1,4 +1,2 @@
-DIST OpenJDK11U-jre_x64_linux_hotspot_11.0.6_10.tar.gz 42198347 BLAKE2B e0022f46f0f3de41d28baf19bcea2c7d6237e80586b7a1e3fb2b97aced18d564fe03a6706b8a3fe97375ff6be395aceafd1e0dba6adaddaa7285b0b8eb24310b SHA512 0d1366c68ad12fafc76edddc7d385f612751182b5492cff4309d542a0e12b13c9b17ca89a0a8218ad0f8182b24285189158c43759db54645758c7ea8dc4d6ce9
DIST OpenJDK11U-jre_x64_linux_hotspot_11.0.7_10.tar.gz 42917723 BLAKE2B c5635b3727e10462396891cab89e257ded57c59f56e9bcb84a3d040ce8a27d7d67d6b78e5f55b63806dd93f6151b767df42e4428d12e763f9722196ca0736a08 SHA512 a776dd9168e3c2635a8492405d58628713e646292d7ee16454681d46866e7ea41afa712227e94ed2e8ce52c727e445f4631db63a02408aa817f1c79af8057dbe
-DIST OpenJDK8U-jre_x64_linux_hotspot_8u242b08.tar.gz 40987250 BLAKE2B ba3f15b938b4462a186c13ca8ea12c5e5e5bbfe5e716af1911e9525875e6956caf3155423f32433be05ebd1a3c873d94b33a797298d6d09577a775c7dfe2a658 SHA512 11dddf75813aa3b88b2bfb2ca89e186cc15601f75ec4f9cbe92c8b60f61438f75a76e45c26bc614eb54de16a584e906f8935cb2146937b96f2970eb89dddea09
DIST OpenJDK8U-jre_x64_linux_hotspot_8u252b09.tar.gz 41104123 BLAKE2B 52a9f288054c4a96ed5d70c2c9c6cf14ceb32262ec3a38f547286518ccc14a4695d330adc19e272436c0a7154771cddd9b0672b05beb6d5013c44c69be0ad25a SHA512 b1b0627e8495b11e0ef3e4ecb387d92537bb97b3f3045213658d48b6f2dffa0bc975b1bc92e84c487152b43d1f0ee0449730bf84dd62d98d13354bf73d3a0a20
diff --git a/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.6_p10.ebuild b/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.6_p10.ebuild
deleted file mode 100644
index ec55ede52337..000000000000
--- a/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.6_p10.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit java-vm-2
-
-abi_uri() {
- echo "${2-$1}? (
- https://github.com/AdoptOpenJDK/openjdk${SLOT}-binaries/releases/download/jdk-${MY_PV}/OpenJDK${SLOT}U-jre_${1}_linux_hotspot_${MY_PV//+/_}.tar.gz
- )"
-}
-
-MY_PV=${PV/_p/+}
-SLOT=${MY_PV%%[.+]*}
-
-SRC_URI="
- $(abi_uri x64 amd64)
-"
-
-DESCRIPTION="Prebuilt Java JRE binaries provided by AdoptOpenJDK"
-HOMEPAGE="https://adoptopenjdk.net"
-LICENSE="GPL-2-with-classpath-exception"
-KEYWORDS="amd64"
-IUSE="alsa cups +gentoo-vm headless-awt nsplugin selinux webstart"
-
-RDEPEND="
- media-libs/fontconfig:1.0
- media-libs/freetype:2
- >net-libs/libnet-1.1
- >=sys-apps/baselayout-java-0.1.0-r1
- >=sys-libs/glibc-2.2.5:*
- sys-libs/zlib
- alsa? ( media-libs/alsa-lib )
- cups? ( net-print/cups )
- selinux? ( sec-policy/selinux-java )
- !headless-awt? (
- x11-libs/libX11
- x11-libs/libXext
- x11-libs/libXi
- x11-libs/libXrender
- x11-libs/libXtst
- )"
-
-PDEPEND="webstart? ( >=dev-java/icedtea-web-1.6.1:0 )
- nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] )"
-
-RESTRICT="preserve-libs splitdebug"
-QA_PREBUILT="*"
-
-S="${WORKDIR}/jdk-${MY_PV}-jre"
-
-src_install() {
- local dest="/opt/${P}"
- local ddest="${ED%/}/${dest#/}"
-
- # Not sure why they bundle this as it's commonly available and they
- # only do so on x86_64. It's needed by libfontmanager.so. IcedTea
- # also has an explicit dependency while Oracle seemingly dlopens it.
- rm -vf lib/libfreetype.so || die
-
- # Oracle and IcedTea have libjsoundalsa.so depending on
- # libasound.so.2 but AdoptOpenJDK only has libjsound.so. Weird.
- if ! use alsa ; then
- rm -v lib/libjsound.* || die
- fi
-
- if use headless-awt ; then
- rm -v lib/lib*{[jx]awt,splashscreen}* || die
- fi
-
- rm -v lib/security/cacerts || die
- dosym ../../../../etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts
-
- dodir "${dest}"
- cp -pPR * "${ddest}" || die
-
- use gentoo-vm && java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh
- java-vm_set-pax-markings "${ddest}"
- java-vm_revdep-mask
- java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
-}
-
-pkg_postinst() {
- java-vm-2_pkg_postinst
-
- if use gentoo-vm ; then
- ewarn "WARNING! You have enabled the gentoo-vm USE flag, making this JRE"
- ewarn "recognised by the system. This will almost certainly break things."
- else
- ewarn "The experimental gentoo-vm USE flag has not been enabled so this JRE"
- ewarn "will not be recognised by the system. For example, simply calling"
- ewarn "\"java\" will launch a different JVM. This is necessary until Gentoo"
- ewarn "fully supports Java 11. This JRE must therefore be invoked using its"
- ewarn "absolute location under ${EPREFIX}/opt/${P}."
- fi
-}
diff --git a/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.242_p08-r1.ebuild b/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.242_p08-r1.ebuild
deleted file mode 100644
index 512f8678a758..000000000000
--- a/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.242_p08-r1.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eapi7-ver java-vm-2
-
-abi_uri() {
- echo "${2-$1}? (
- https://github.com/AdoptOpenJDK/openjdk${SLOT}-binaries/releases/download/jdk${MY_PV}/OpenJDK8U-jre_${1}_linux_hotspot_${MY_PV/-/}.tar.gz
- )"
-}
-
-MY_PV=$(ver_rs 1 'u' 2 '-' ${PV//p/b})
-SLOT="$(ver_cut 1)"
-
-DESCRIPTION="Prebuilt Java JRE binaries provided by AdoptOpenJDK"
-HOMEPAGE="https://adoptopenjdk.net"
-SRC_URI="
- $(abi_uri x64 amd64)
-"
-
-LICENSE="GPL-2-with-classpath-exception"
-KEYWORDS="amd64"
-
-IUSE="alsa cups headless-awt nsplugin selinux webstart"
-
-RDEPEND="
- media-libs/fontconfig:1.0
- media-libs/freetype:2
- >net-libs/libnet-1.1
- >=sys-apps/baselayout-java-0.1.0-r1
- >=sys-libs/glibc-2.2.5:*
- sys-libs/zlib
- alsa? ( media-libs/alsa-lib )
- cups? ( net-print/cups )
- selinux? ( sec-policy/selinux-java )
- !headless-awt? (
- x11-libs/libX11
- x11-libs/libXext
- x11-libs/libXi
- x11-libs/libXrender
- x11-libs/libXtst
- )"
-
-PDEPEND="
- webstart? ( >=dev-java/icedtea-web-1.6.1:0 )
- nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] )"
-
-RESTRICT="preserve-libs splitdebug"
-QA_PREBUILT="*"
-
-S="${WORKDIR}/jdk${MY_PV}-jre"
-
-src_install() {
- local dest="/opt/${P}"
- local ddest="${ED%/}/${dest#/}"
-
- rm ASSEMBLY_EXCEPTION LICENSE THIRD_PARTY_README || die
-
- # this does not exist on arm64 hence -f
- rm -fv lib/*/libfreetype.so* || die
-
- if ! use alsa ; then
- rm -v lib/*/libjsoundalsa.so* || die
- fi
-
- if use headless-awt ; then
- rm -fvr lib/*/lib*{[jx]awt,splashscreen}* \
- bin/policytool || die
- fi
-
- rm -v lib/security/cacerts || die
- dosym ../../../../../etc/ssl/certs/java/cacerts \
- "${dest}"/lib/security/cacerts
-
- dodir "${dest}"
- cp -pPR * "${ddest}" || die
-
- java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh
- java-vm_set-pax-markings "${ddest}"
- java-vm_revdep-mask
- java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
-}
diff --git a/dev-java/openjdk/Manifest b/dev-java/openjdk/Manifest
index eb7d4c53c251..0062a4f8d08a 100644
--- a/dev-java/openjdk/Manifest
+++ b/dev-java/openjdk/Manifest
@@ -1,18 +1,9 @@
-DIST openjdk-11.0.6.tar.bz2 90755968 BLAKE2B 5bf23cc107ffae4cfc82be4f9b4b17de57575ee13e8fd461027e319a441c89c65fc852affb89f98a54307fa865ed5cdfb216809c6196866b31dfaa7011ad3d57 SHA512 d2296556c947c46883c16df3c1b7d809e6987dd6fd1a2667333e1245049560f3da744f6a51609a918cd9c509316b01160de2c080d5b9d3ed1af0b312dcbc575e
DIST openjdk-11.0.7_p10.tar.bz2 91317054 BLAKE2B 113f6d0b1ea97aa6c3a619a3f4183b72f5e0448422d17b6ffc4d778ce50eee68e4495d610845d1f3aace2e5660703dad96583203c6d12b5528e0f33f78df7cec SHA512 c6776bd05e2cbb42134ccf5cd522e4b73d1662e3cf136a8718c5d302b9c44e76b74a554b81aa14c5deda20bee76abc80a144f5c2e1941b70c9503579c325aa12
-DIST openjdk-8.242.tar.bz2 452896 BLAKE2B 73176533ad62942f9a9547378aa5547a5f064076d24be527d0fb8b13c30a48680957bca731ee54771cae66e78f8800995426431ec266f0c61330a573efaacc23 SHA512 2a98dcead63b8e5dc6db841416b16c12a84f557c8efa6272bc4dc125333de1e20ab83050d1ee441a77f78b47b2c52dbc7d29810ce562218129eff29a5c79daca
DIST openjdk-8.252_p09.tar.bz2 454656 BLAKE2B 7132af72a09da9ded1759ccf92da6237a24e3fd15209b8d5aecb7011b890cd3484b4724f6b6a144e4bc5cb41931076985f75a9089c178938be62ac1a1d2a7f07 SHA512 0f03f1549dea1577cb01895d4e34721d16443977c5e7b3f0744af9cf2c0b09e60cb6d91b35a5e474c593d518d5610fb4c14fc4b9a907a7e13bb2351cea51bd06
-DIST openjdk-corba-8.242.tar.bz2 1033721 BLAKE2B 5e0cee4d5b8faa0e940ed096f807ef231ce7c10b180ac89d5faf9ae276bab1044ca1ae6e826490e9d66f17ebd55026c17e7675a62dd4bf633cecfa3390944f97 SHA512 cf2cefcb590b7a1c637b709ce9f59c56a5354f90a3095726c3168962f4808ccb27a82909234343f510ad90dda56b83c934fa9ccb788ddf0f66e60c65b06d8e84
DIST openjdk-corba-8.252_p09.tar.bz2 1034367 BLAKE2B d281a0b2e092c637adae4a206ac4b3f7beeb65f0fce5862f996ac71a814c5c3ee3261dd1145660cb50fde0398e42ca1e8c86d6aad07e43b44aa1f903c204b21c SHA512 08f348849eeadefee3dce9658b519091a14b9f972a1ee1dc51c37a3cd766e5265faed1931b967410ebff2132dd18cedf8840277d804b402ee43a862e37575ab1
-DIST openjdk-hotspot-8.242.tar.bz2 7953409 BLAKE2B 84ddc5bc00bca06c821219189ef19cd88cf0c5e9e43301b0fc654e1a31c68af0d7cab32d5ffedeb10b5593c3e8a846fc308076ffdc3292e0622a504650dfad56 SHA512 c67c7dd81e37b7e5ed43b0a720240ae55ebf7c31e58ebc1fc20cebb1bbecc91cda575a508ebe907d6ad21bad149596bcd913a24108c50fe2c26767910b5fe570
DIST openjdk-hotspot-8.252_p09.tar.bz2 7954548 BLAKE2B a791d3c3385be3c8543bea1fc8d5bee9b3de873122ec850c3ad0082430083ec9dff2aa7c0cae33e628047a18a76fca8146b68aa52f32845cf7a61a45fdc8d9eb SHA512 53079cc255f75f246a67937bdf2b7715882f9baf8bcbc46ab2963c259359b1008642aeeae7ba7705c39f7a04e69ba286421a83b90294e81071f8e630db48ba7c
-DIST openjdk-jaxp-8.242.tar.bz2 2735931 BLAKE2B b8106b903000ef0b920b3a1228eda06bfaeb073138a2d0a5193f8258f285d0f7044b93d2ef3c7e9c28bb9a39c964475f8dfcbe012d49d4c2b7a1a7c5d6fb4906 SHA512 2c2148aba457c7fe6f2cdba444ef730d7d6bb91604327bf6c465f549acb768a711e4482d79db1848f9495c84ac650f42c48989bee47537c1be065e3204115896
DIST openjdk-jaxp-8.252_p09.tar.bz2 2736174 BLAKE2B c198f144be7d0e7439e2184768db8649973f9e6869e67d3a950abd4872584160f4aaec1f4bec727f0d38830d34a4be7bd2f3e897b8ca10c758212262fa1672c3 SHA512 8027676e2928087a7d396c4f1edd3366336aaf8e3f201e2006cb7ddf91e518c9258d7ab6cc1c4fcc27e3e87bcecd96c55b2550d49f28b98beabf7553ea54ba3f
-DIST openjdk-jaxws-8.242.tar.bz2 2541712 BLAKE2B 020f47e5e9f9fed3d3dd506703ccc58bf04f696a093013e3e9eecf6e8a842ffe51d24188d204c9a84bc32157094e8ed2701beab8bfa2e6cad100ee093fa15107 SHA512 b0cce73a84887d35906a73006f36ef0913bcaf1fc27dc58e8873c95ee3b125b5bd977c23619f0a4f2489493776d4818d380ad1f126c62f325e2b155f6fc10dbf
DIST openjdk-jaxws-8.252_p09.tar.bz2 2542417 BLAKE2B cf898e0c56269ea1f468c6b9e6cfbdf552caea562f833ade234d207f05be6f39f86d9d6794cc8b365ed3fde4bac5df41949e76cbaef61553f5557ec86dd593e6 SHA512 cadeec8825073db1fea13f1d83903ba2799324cfa8e25012c5dc98ec31976bd91b22526f98fc871d0ee01156943f4fc4ec115f7a81feb10e9f7d96f3f39a9313
-DIST openjdk-jdk-8.242.tar.bz2 47256764 BLAKE2B b4fadc09640ce2267d461052bb8e42a7872022675fd8193b4f45ef23d69ab33b0ab95745d01e723a10bb4359055caa94d5113b3c77b97a8ff14191677c5c49c8 SHA512 3796599041134924bb673f06390c7c2fe9c76842ec799338dd02b183a3578f46c93095591f39f60a0c9e106659d6b0abba1ec1a647610b45a0f337f71afa28b8
DIST openjdk-jdk-8.252_p09.tar.bz2 47507382 BLAKE2B 4638256df52aa48a1ccace15fe65b284cb2a1e3a3c45f32ae69a807ae4bd9b9ce3cf9f464a9b8a87d07c49f2d7c48c8516b43d9d4372f578ad1cd4dfa17abb80 SHA512 96188acc8078c312c7118abfbc39874429f71e63c2e282fef2da9df29731ee13396bda28a8a1041b17b50da4bb00b1fe88404d682b0a850e5db10e59e39994f2
-DIST openjdk-langtools-8.242.tar.bz2 2397745 BLAKE2B 94748fa5304217a6354b4de29e80f3642e935a1d6259d11dd23d007e5d7022643a8ffabdf5e12c7c7915a33e7edb263704eb60653dc2253e10aee6ca183fc84e SHA512 820e5828ae74c868f4c548e23ea1e7625e74d3b52fe951afe5a583910405658cd14d3d40b7b5f4bbb87d71439cafb77590ee2fe111fb9ad2f7c8f972d0380e53
DIST openjdk-langtools-8.252_p09.tar.bz2 2399354 BLAKE2B aa3f0cb647986490612b9574fb0c78955f5ffb8969dbd06dfae5406436d6fecdbbb09896bdb0acc18d56f51bcd4ad1eadb19cc544185762ad623a47fde2e4a85 SHA512 d84ff97294ac612cd4e49deb2d7470026a564208c0e1fa23d5692db45efaaf564483966921ce642506a97aa90a2a8593617f944ebc6d18c9db5a808fd3946864
-DIST openjdk-nashorn-8.242.tar.bz2 2856246 BLAKE2B 87343677e79b13baa0181b988f248f1dc1ccd265117e407e5be8d848813322a0e7cc53f5ea50bd7796b06b9c0b07320ca1b0ad8623f690c5bda3a4519656b6d6 SHA512 3f5fb2917fc65c85f007aea7842d0f1fef6c20050ef66a593d7ae25ced38a9eb5f1a4bb3c3d6b9757832a7d450d1cde06f98e383523707d93046e34ee70814c6
DIST openjdk-nashorn-8.252_p09.tar.bz2 2852104 BLAKE2B 570fbe605ed27c4b3a5db5f6e9dbb4269ad2c895654a989d366a4a6f238ea06fec398140563ca2700303856dfa795ae40dbf9485dd9e9a46ef438f5418fd8b8b SHA512 996e7068d8c6f8ca192e6037eaf7f98ff94188c02670caadf1042e4e0909a3d51835a8cd2250d1f0a8bbdedb107f3713b614466ba4d2915b955e19fdcc2cbb91
diff --git a/dev-java/openjdk/files/generate-cacerts.pl b/dev-java/openjdk/files/generate-cacerts.pl
deleted file mode 100644
index 17d29b36676d..000000000000
--- a/dev-java/openjdk/files/generate-cacerts.pl
+++ /dev/null
@@ -1,358 +0,0 @@
-#!/usr/bin/perl
-
-# Copyright (C) 2007, 2008 Red Hat, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-
-# generate-cacerts.pl generates a JKS keystore named 'cacerts' from
-# OpenSSL's certificate bundle using OpenJDK's keytool.
-
-# First extract each of OpenSSL's bundled certificates into its own
-# aliased filename.
-
-# Downloaded from http://cvs.fedoraproject.org/viewvc/rpms/ca-certificates/F-12/generate-cacerts.pl?revision=1.2
-# Check and prevention of duplicate aliases added by Vlastimil Babka
-
-$file = $ARGV[1];
-open(CERTS, $file);
-@certs = ;
-close(CERTS);
-
-$pem_file_count = 0;
-$in_cert_block = 0;
-$write_current_cert = 1;
-foreach $cert (@certs)
-{
- if ($cert =~ /Issuer: /)
- {
- $_ = $cert;
- if ($cert =~ /personal-freemail/)
- {
- $cert_alias = "thawtepersonalfreemailca";
- }
- elsif ($cert =~ /personal-basic/)
- {
- $cert_alias = "thawtepersonalbasicca";
- }
- elsif ($cert =~ /personal-premium/)
- {
- $cert_alias = "thawtepersonalpremiumca";
- }
- elsif ($cert =~ /server-certs/)
- {
- $cert_alias = "thawteserverca";
- }
- elsif ($cert =~ /premium-server/)
- {
- $cert_alias = "thawtepremiumserverca";
- }
- elsif ($cert =~ /Class 1 Public Primary Certification Authority$/)
- {
- $cert_alias = "verisignclass1ca";
- }
- elsif ($cert =~ /Class 1 Public Primary Certification Authority - G2/)
- {
- $cert_alias = "verisignclass1g2ca";
- }
- elsif ($cert =~
- /VeriSign Class 1 Public Primary Certification Authority - G3/)
- {
- $cert_alias = "verisignclass1g3ca";
- }
- elsif ($cert =~ /Class 2 Public Primary Certification Authority$/)
- {
- $cert_alias = "verisignclass2ca";
- }
- elsif ($cert =~ /Class 2 Public Primary Certification Authority - G2/)
- {
- $cert_alias = "verisignclass2g2ca";
- }
- elsif ($cert =~
- /VeriSign Class 2 Public Primary Certification Authority - G3/)
- {
- $cert_alias = "verisignclass2g3ca";
- }
- elsif ($cert =~ /Class 3 Public Primary Certification Authority$/)
- {
- $cert_alias = "verisignclass3ca";
- }
- # Version 1 of Class 3 Public Primary Certification Authority
- # - G2 is added. Version 3 is excluded. See below.
- elsif ($cert =~
- /VeriSign Class 3 Public Primary Certification Authority - G3/)
- {
- $cert_alias = "verisignclass3g3ca";
- }
- elsif ($cert =~
- /RSA Data Security.*Secure Server Certification Authority/)
- {
- $cert_alias = "verisignserverca";
- }
- elsif ($cert =~ /GTE CyberTrust Global Root/)
- {
- $cert_alias = "gtecybertrustglobalca";
- }
- elsif ($cert =~ /Baltimore CyberTrust Root/)
- {
- $cert_alias = "baltimorecybertrustca";
- }
- elsif ($cert =~ /www.entrust.net\/Client_CA_Info\/CPS/)
- {
- $cert_alias = "entrustclientca";
- }
- elsif ($cert =~ /www.entrust.net\/GCCA_CPS/)
- {
- $cert_alias = "entrustglobalclientca";
- }
- elsif ($cert =~ /www.entrust.net\/CPS_2048/)
- {
- $cert_alias = "entrust2048ca";
- }
- elsif ($cert =~ /www.entrust.net\/CPS /)
- {
- $cert_alias = "entrustsslca";
- }
- elsif ($cert =~ /www.entrust.net\/SSL_CPS/)
- {
- $cert_alias = "entrustgsslca";
- }
- elsif ($cert =~ /The Go Daddy Group/)
- {
- $cert_alias = "godaddyclass2ca";
- }
- elsif ($cert =~ /Starfield Class 2 Certification Authority/)
- {
- $cert_alias = "starfieldclass2ca";
- }
- elsif ($cert =~ /ValiCert Class 2 Policy Validation Authority/)
- {
- $cert_alias = "valicertclass2ca";
- }
- elsif ($cert =~ /GeoTrust Global CA$/)
- {
- $cert_alias = "geotrustglobalca";
- }
- elsif ($cert =~ /Equifax Secure Certificate Authority/)
- {
- $cert_alias = "equifaxsecureca";
- }
- elsif ($cert =~ /Equifax Secure eBusiness CA-1/)
- {
- $cert_alias = "equifaxsecureebusinessca1";
- }
- elsif ($cert =~ /Equifax Secure eBusiness CA-2/)
- {
- $cert_alias = "equifaxsecureebusinessca2";
- }
- elsif ($cert =~ /Equifax Secure Global eBusiness CA-1/)
- {
- $cert_alias = "equifaxsecureglobalebusinessca1";
- }
- elsif ($cert =~ /Sonera Class1 CA/)
- {
- $cert_alias = "soneraclass1ca";
- }
- elsif ($cert =~ /Sonera Class2 CA/)
- {
- $cert_alias = "soneraclass2ca";
- }
- elsif ($cert =~ /AAA Certificate Services/)
- {
- $cert_alias = "comodoaaaca";
- }
- elsif ($cert =~ /AddTrust Class 1 CA Root/)
- {
- $cert_alias = "addtrustclass1ca";
- }
- elsif ($cert =~ /AddTrust External CA Root/)
- {
- $cert_alias = "addtrustexternalca";
- }
- elsif ($cert =~ /AddTrust Qualified CA Root/)
- {
- $cert_alias = "addtrustqualifiedca";
- }
- elsif ($cert =~ /UTN-USERFirst-Hardware/)
- {
- $cert_alias = "utnuserfirsthardwareca";
- }
- elsif ($cert =~ /UTN-USERFirst-Client Authentication and Email/)
- {
- $cert_alias = "utnuserfirstclientauthemailca";
- }
- elsif ($cert =~ /UTN - DATACorp SGC/)
- {
- $cert_alias = "utndatacorpsgcca";
- }
- elsif ($cert =~ /UTN-USERFirst-Object/)
- {
- $cert_alias = "utnuserfirstobjectca";
- }
- elsif ($cert =~ /America Online Root Certification Authority 1/)
- {
- $cert_alias = "aolrootca1";
- }
- elsif ($cert =~ /DigiCert Assured ID Root CA/)
- {
- $cert_alias = "digicertassuredidrootca";
- }
- elsif ($cert =~ /DigiCert Global Root CA/)
- {
- $cert_alias = "digicertglobalrootca";
- }
- elsif ($cert =~ /DigiCert High Assurance EV Root CA/)
- {
- $cert_alias = "digicerthighassuranceevrootca";
- }
- elsif ($cert =~ /GlobalSign Root CA$/)
- {
- $cert_alias = "globalsignca";
- }
- elsif ($cert =~ /GlobalSign Root CA - R2/)
- {
- $cert_alias = "globalsignr2ca";
- }
- elsif ($cert =~ /Elektronik.*Kas.*2005/)
- {
- $cert_alias = "extra-elektronikkas2005";
- }
- elsif ($cert =~ /Elektronik/)
- {
- $cert_alias = "extra-elektronik2005";
- }
- # Mozilla does not provide these certificates:
- # baltimorecodesigningca
- # gtecybertrust5ca
- # trustcenterclass2caii
- # trustcenterclass4caii
- # trustcenteruniversalcai
- else
- {
- # Generate an alias using the OU and CN attributes of the
- # Issuer field if both are present, otherwise use only the
- # CN attribute. The Issuer field must have either the OU
- # or the CN attribute.
- $_ = $cert;
- if ($cert =~ /OU=/)
- {
- s/Issuer:.*?OU=//;
- # Remove other occurrences of OU=.
- s/OU=.*CN=//;
- # Remove CN= if there were not other occurrences of OU=.
- s/CN=//;
- s/\/emailAddress.*//;
- s/Certificate Authority/ca/g;
- s/Certification Authority/ca/g;
- }
- elsif ($cert =~ /CN=/)
- {
- s/Issuer:.*CN=//;
- s/\/emailAddress.*//;
- s/Certificate Authority/ca/g;
- s/Certification Authority/ca/g;
- }
- s/\W//g;
- tr/A-Z/a-z/;
- $cert_alias = "extra-$_";
-
- }
- while (-e "$cert_alias.pem")
- {
- $cert_alias = "$cert_alias" . "_";
- }
- }
- # When it attempts to parse:
- #
- # Class 3 Public Primary Certification Authority - G2, Version 3
- #
- # keytool says:
- #
- # #2: ObjectId: 1.3.6.1.5.5.7.1.1 Criticality=false
- # Unparseable AuthorityInfoAccess extension due to
- # java.io.IOException: Invalid encoding of URI
- #
- # If we do not exclude this file
- # openjdk/jdk/test/lib/security/cacerts/VerifyCACerts.java fails
- # on this cert, printing:
- #
- # Couldn't verify: java.security.SignatureException: Signature
- # does not match.
- #
- elsif ($cert =~
- /A6:0F:34:C8:62:6C:81:F6:8B:F7:7D:A9:F6:67:58:8A:90:3F:7D:36/)
- {
- $write_current_cert = 0;
- $pem_file_count--;
- }
- elsif ($cert eq "-----BEGIN CERTIFICATE-----\n")
- {
- if ($in_cert_block != 0)
- {
- die "$file is malformed.";
- }
- $in_cert_block = 1;
- if ($write_current_cert == 1)
- {
- $pem_file_count++;
- if (-e "$cert_alias.pem")
- {
- print "$cert_alias";
- die "already exists"
- }
- open(PEM, ">$cert_alias.pem");
- print PEM $cert;
- }
- }
- elsif ($cert eq "-----END CERTIFICATE-----\n")
- {
- $in_cert_block = 0;
- if ($write_current_cert == 1)
- {
- print PEM $cert;
- close(PEM);
- }
- $write_current_cert = 1
- }
- else
- {
- if ($in_cert_block == 1 && $write_current_cert == 1)
- {
- print PEM $cert;
- }
- }
-}
-
-# Check that the correct number of .pem files were produced.
-@pem_files = <*.pem>;
-if (@pem_files != $pem_file_count)
-{
- print "$pem_file_count";
- die "Number of .pem files produced does not match".
- " number of certs read from $file.";
-}
-
-# Now store each cert in the 'cacerts' file using keytool.
-$certs_written_count = 0;
-foreach $pem_file (@pem_files)
-{
- system "$ARGV[0] -noprompt -import".
- " -alias `basename $pem_file .pem`".
- " -keystore cacerts -storepass 'changeit' -file $pem_file";
- unlink($pem_file);
- $certs_written_count++;
-}
-
-# Check that the correct number of certs were added to the keystore.
-if ($certs_written_count != $pem_file_count)
-{
- die "Number of certs added to keystore does not match".
- " number of certs read from $file.";
-}
diff --git a/dev-java/openjdk/openjdk-11.0.6.ebuild b/dev-java/openjdk/openjdk-11.0.6.ebuild
deleted file mode 100644
index 0f8e793023de..000000000000
--- a/dev-java/openjdk/openjdk-11.0.6.ebuild
+++ /dev/null
@@ -1,271 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools check-reqs flag-o-matic java-pkg-2 java-vm-2 multiprocessing pax-utils toolchain-funcs
-
-MY_PV="${PV}-ga"
-SLOT="${MY_PV%%[.+]*}"
-
-DESCRIPTION="Open source implementation of the Java programming language"
-HOMEPAGE="https://openjdk.java.net"
-SRC_URI="https://hg.${PN}.java.net/jdk-updates/jdk${SLOT}u/archive/jdk-${MY_PV}.tar.bz2 -> ${P}.tar.bz2"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
-
-IUSE="alsa cups debug doc examples gentoo-vm headless-awt javafx +jbootstrap nsplugin +pch selinux source systemtap webstart"
-
-COMMON_DEPEND="
- media-libs/freetype:2=
- media-libs/giflib:0/7
- media-libs/libpng:0=
- media-libs/lcms:2=
- sys-libs/zlib
- virtual/jpeg:0=
- systemtap? ( dev-util/systemtap )
-"
-
-# Many libs are required to build, but not to run, make is possible to remove
-# by listing conditionally in RDEPEND unconditionally in DEPEND
-RDEPEND="
- ${COMMON_DEPEND}
- >=sys-apps/baselayout-java-0.1.0-r1
- !headless-awt? (
- x11-libs/libX11
- x11-libs/libXext
- x11-libs/libXi
- x11-libs/libXrandr
- x11-libs/libXrender
- x11-libs/libXt
- x11-libs/libXtst
- )
- alsa? ( media-libs/alsa-lib )
- cups? ( net-print/cups )
- selinux? ( sec-policy/selinux-java )
-"
-
-DEPEND="
- ${COMMON_DEPEND}
- app-arch/zip
- media-libs/alsa-lib
- net-print/cups
- x11-base/xorg-proto
- x11-libs/libX11
- x11-libs/libXext
- x11-libs/libXi
- x11-libs/libXrandr
- x11-libs/libXrender
- x11-libs/libXt
- x11-libs/libXtst
- javafx? ( dev-java/openjfx:${SLOT}= )
- || (
- dev-java/openjdk-bin:${SLOT}
- dev-java/openjdk:${SLOT}
- )
-"
-
-PDEPEND="
- webstart? ( >=dev-java/icedtea-web-1.6.1:0 )
- nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] )
-"
-
-REQUIRED_USE="javafx? ( alsa !headless-awt )"
-
-PATCHES=( "${FILESDIR}/openjdk-11-make43.patch" )
-
-S="${WORKDIR}/jdk${SLOT}u-jdk-${MY_PV}"
-
-# The space required to build varies wildly depending on USE flags,
-# ranging from 2GB to 16GB. This function is certainly not exact but
-# should be close enough to be useful.
-openjdk_check_requirements() {
- local M
- M=2048
- M=$(( $(usex jbootstrap 2 1) * $M ))
- M=$(( $(usex debug 3 1) * $M ))
- M=$(( $(usex doc 320 0) + $(usex source 128 0) + 192 + $M ))
-
- CHECKREQS_DISK_BUILD=${M}M check-reqs_pkg_${EBUILD_PHASE}
-}
-
-pkg_pretend() {
- openjdk_check_requirements
- has ccache ${FEATURES} && die "FEATURES=ccache doesn't work with ${PN}"
-}
-
-pkg_setup() {
- openjdk_check_requirements
- java-vm-2_pkg_setup
-
- JAVA_PKG_WANT_BUILD_VM="openjdk-${SLOT} openjdk-bin-${SLOT}"
- JAVA_PKG_WANT_SOURCE="${SLOT}"
- JAVA_PKG_WANT_TARGET="${SLOT}"
-
- # The nastiness below is necessary while the gentoo-vm USE flag is
- # masked. First we call java-pkg-2_pkg_setup if it looks like the
- # flag was unmasked against one of the possible build VMs. If not,
- # we try finding one of them in their expected locations. This would
- # have been slightly less messy if openjdk-bin had been installed to
- # /opt/${PN}-${SLOT} or if there was a mechanism to install a VM env
- # file but disable it so that it would not normally be selectable.
-
- local vm
- for vm in ${JAVA_PKG_WANT_BUILD_VM}; do
- if [[ -d ${EPREFIX}/usr/lib/jvm/${vm} ]]; then
- java-pkg-2_pkg_setup
- return
- fi
- done
-
- if has_version --host-root dev-java/openjdk:${SLOT}; then
- export JDK_HOME=${EPREFIX}/usr/$(get_libdir)/openjdk-${SLOT}
- else
- if [[ ${MERGE_TYPE} != "binary" ]]; then
- JDK_HOME=$(best_version --host-root dev-java/openjdk-bin:${SLOT})
- [[ -n ${JDK_HOME} ]] || die "Build VM not found!"
- JDK_HOME=${JDK_HOME#*/}
- JDK_HOME=${EPREFIX}/opt/${JDK_HOME%-r*}
- export JDK_HOME
- fi
- fi
-}
-
-src_prepare() {
- default
- chmod +x configure || die
-}
-
-src_configure() {
- # Work around stack alignment issue, bug #647954. in case we ever have x86
- use x86 && append-flags -mincoming-stack-boundary=2
-
- # Enabling full docs appears to break doc building. If not
- # explicitly disabled, the flag will get auto-enabled if pandoc and
- # graphviz are detected. pandoc has loads of dependencies anyway.
-
- local myconf=(
- --disable-ccache
- --enable-full-docs=no
- --with-boot-jdk="${JDK_HOME}"
- --with-extra-cflags="${CFLAGS}"
- --with-extra-cxxflags="${CXXFLAGS}"
- --with-extra-ldflags="${LDFLAGS}"
- --with-giflib=system
- --with-lcms=system
- --with-libjpeg=system
- --with-libpng=system
- --with-native-debug-symbols=$(usex debug internal none)
- --with-vendor-name="Gentoo"
- --with-vendor-url="https://gentoo.org"
- --with-vendor-bug-url="https://bugs.gentoo.org"
- --with-vendor-vm-bug-url="https://bugs.openjdk.java.net"
- --with-vendor-version-string="${PV}"
- --with-version-pre=""
- --with-version-string=${MY_PV%+*}
- --with-version-build=${MY_PV#*+}
- --with-zlib=system
- --enable-dtrace=$(usex systemtap yes no)
- --enable-headless-only=$(usex headless-awt yes no)
- )
-
- if use javafx; then
- local zip="${EROOT%/}/usr/$(get_libdir)/openjfx-${SLOT}/javafx-exports.zip"
- if [[ -r ${zip} ]]; then
- myconf+=( --with-import-modules="${zip}" )
- else
- die "${zip} not found or not readable"
- fi
- fi
-
- # PaX breaks pch, bug #601016
- if use pch && ! host-is-pax; then
- myconf+=( --enable-precompiled-headers )
- else
- myconf+=( --disable-precompiled-headers )
- fi
-
- (
- unset _JAVA_OPTIONS JAVA JAVA_TOOL_OPTIONS JAVAC XARGS
- CFLAGS= CXXFLAGS= LDFLAGS= \
- CONFIG_SITE=/dev/null \
- econf "${myconf[@]}"
- )
-}
-
-src_compile() {
- local myemakeargs=(
- JOBS=$(makeopts_jobs)
- LOG=debug
- CFLAGS_WARNINGS_ARE_ERRORS= # No -Werror
- $(usex doc docs '')
- $(usex jbootstrap bootcycle-images product-images)
- )
- emake "${myemakeargs[@]}" -j1 #nowarn
-}
-
-src_install() {
- local dest="/usr/$(get_libdir)/${PN}-${SLOT}"
- local ddest="${ED}${dest#/}"
-
- cd "${S}"/build/*-release/images/jdk || die
-
- # Create files used as storage for system preferences.
- mkdir .systemPrefs || die
- touch .systemPrefs/.system.lock || die
- touch .systemPrefs/.systemRootModFile || die
-
- # Oracle and IcedTea have libjsoundalsa.so depending on
- # libasound.so.2 but OpenJDK only has libjsound.so. Weird.
- if ! use alsa ; then
- rm -v lib/libjsound.* || die
- fi
-
- if ! use examples ; then
- rm -vr demo/ || die
- fi
-
- if ! use source ; then
- rm -v lib/src.zip || die
- fi
-
- rm -v lib/security/cacerts || die
-
- dodir "${dest}"
- cp -pPR * "${ddest}" || die
-
- dosym ../../../../../etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts
-
- # must be done before running itself
- java-vm_set-pax-markings "${ddest}"
-
- einfo "Creating the Class Data Sharing archives and disabling usage tracking"
- "${ddest}/bin/java" -server -Xshare:dump -Djdk.disableLastUsageTracking || die
-
- use gentoo-vm && java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh
- java-vm_revdep-mask
- java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
-
- if use doc ; then
- docinto html
- dodoc -r "${S}"/build/*-release/images/docs/*
- dosym ../../../usr/share/doc/"${PF}" /usr/share/doc/"${PN}-${SLOT}"
- fi
-}
-
-pkg_postinst() {
- java-vm-2_pkg_postinst
-
- if use gentoo-vm ; then
- ewarn "WARNING! You have enabled the gentoo-vm USE flag, making this JDK"
- ewarn "recognised by the system. This will almost certainly break"
- ewarn "many java ebuilds as they are not ready for openjdk-11"
- else
- ewarn "The experimental gentoo-vm USE flag has not been enabled so this JDK"
- ewarn "will not be recognised by the system. For example, simply calling"
- ewarn "\"java\" will launch a different JVM. This is necessary until Gentoo"
- ewarn "fully supports Java ${SLOT}. This JDK must therefore be invoked using its"
- ewarn "absolute location under ${EPREFIX}/usr/$(get_libdir)/${PN}-${SLOT}."
- fi
-}
diff --git a/dev-java/openjdk/openjdk-11.0.7_p10.ebuild b/dev-java/openjdk/openjdk-11.0.7_p10.ebuild
index 76d41a4eb082..b5d448dd9e84 100644
--- a/dev-java/openjdk/openjdk-11.0.7_p10.ebuild
+++ b/dev-java/openjdk/openjdk-11.0.7_p10.ebuild
@@ -96,7 +96,9 @@ openjdk_check_requirements() {
pkg_pretend() {
openjdk_check_requirements
- has ccache ${FEATURES} && die "FEATURES=ccache doesn't work with ${PN}"
+ if [[ ${MERGE_TYPE} != binary ]]; then
+ has ccache ${FEATURES} && die "FEATURES=ccache doesn't work with ${PN}"
+ fi
}
pkg_setup() {
diff --git a/dev-java/openjdk/openjdk-8.242.ebuild b/dev-java/openjdk/openjdk-8.242.ebuild
deleted file mode 100644
index 617bc845036a..000000000000
--- a/dev-java/openjdk/openjdk-8.242.ebuild
+++ /dev/null
@@ -1,218 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit check-reqs eapi7-ver flag-o-matic java-pkg-2 java-vm-2 multiprocessing pax-utils toolchain-funcs
-
-MY_PV=$(ver_rs 1 'u' 2 '-' ${PV}-ga)
-
-BASE_URI="https://hg.${PN}.java.net/jdk8u/jdk8u"
-
-DESCRIPTION="Open source implementation of the Java programming language"
-HOMEPAGE="https://openjdk.java.net"
-SRC_URI="
- ${BASE_URI}/archive/jdk${MY_PV}.tar.bz2 -> ${P}.tar.bz2
- ${BASE_URI}/corba/archive/jdk${MY_PV}.tar.bz2 -> ${PN}-corba-${PV}.tar.bz2
- ${BASE_URI}/hotspot/archive/jdk${MY_PV}.tar.bz2 -> ${PN}-hotspot-${PV}.tar.bz2
- ${BASE_URI}/jaxp/archive/jdk${MY_PV}.tar.bz2 -> ${PN}-jaxp-${PV}.tar.bz2
- ${BASE_URI}/jaxws/archive/jdk${MY_PV}.tar.bz2 -> ${PN}-jaxws-${PV}.tar.bz2
- ${BASE_URI}/jdk/archive/jdk${MY_PV}.tar.bz2 -> ${PN}-jdk-${PV}.tar.bz2
- ${BASE_URI}/langtools/archive/jdk${MY_PV}.tar.bz2 -> ${PN}-langtools-${PV}.tar.bz2
- ${BASE_URI}/nashorn/archive/jdk${MY_PV}.tar.bz2 -> ${PN}-nashorn-${PV}.tar.bz2
-"
-
-LICENSE="GPL-2"
-SLOT="$(ver_cut 1)"
-KEYWORDS="amd64 ppc64 ~x86"
-IUSE="alsa debug cups doc examples headless-awt +jbootstrap nsplugin +pch selinux source webstart"
-
-COMMON_DEPEND="
- media-libs/freetype:2=
- media-libs/giflib:0/7
- sys-libs/zlib
-"
-# Many libs are required to build, but not to run, make is possible to remove
-# by listing conditionally in RDEPEND unconditionally in DEPEND
-RDEPEND="
- ${COMMON_DEPEND}
- >=sys-apps/baselayout-java-0.1.0-r1
- !headless-awt? (
- x11-libs/libX11
- x11-libs/libXext
- x11-libs/libXi
- x11-libs/libXrender
- x11-libs/libXt
- x11-libs/libXtst
- )
- alsa? ( media-libs/alsa-lib )
- cups? ( net-print/cups )
- selinux? ( sec-policy/selinux-java )
-"
-
-DEPEND="
- ${COMMON_DEPEND}
- app-arch/zip
- media-libs/alsa-lib
- net-print/cups
- x11-base/xorg-proto
- x11-libs/libX11
- x11-libs/libXext
- x11-libs/libXi
- x11-libs/libXrender
- x11-libs/libXt
- x11-libs/libXtst
- || (
- dev-java/openjdk-bin:${SLOT}
- dev-java/icedtea-bin:${SLOT}
- dev-java/openjdk:${SLOT}
- dev-java/icedtea:${SLOT}
- )
-"
-
-PDEPEND="
- webstart? ( >=dev-java/icedtea-web-1.6.1:0 )
- nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] )
-"
-
-S="${WORKDIR}/jdk${SLOT}u-jdk${MY_PV}"
-
-# The space required to build varies wildly depending on USE flags,
-# ranging from 2GB to 16GB. This function is certainly not exact but
-# should be close enough to be useful.
-openjdk_check_requirements() {
- local M
- M=2048
- M=$(( $(usex debug 3 1) * $M ))
- M=$(( $(usex jbootstrap 2 1) * $M ))
- M=$(( $(usex doc 320 0) + $(usex source 128 0) + 192 + $M ))
-
- CHECKREQS_DISK_BUILD=${M}M check-reqs_pkg_${EBUILD_PHASE}
-}
-
-pkg_pretend() {
- openjdk_check_requirements
- has ccache ${FEATURES} && die "FEATURES=ccache doesn't work with ${PN}"
-}
-
-pkg_setup() {
- openjdk_check_requirements
-
- JAVA_PKG_WANT_BUILD_VM="openjdk-${SLOT} openjdk-bin-${SLOT} icedtea-${SLOT} icedtea-bin-${SLOT}"
- JAVA_PKG_WANT_SOURCE="${SLOT}"
- JAVA_PKG_WANT_TARGET="${SLOT}"
-
- java-vm-2_pkg_setup
- java-pkg-2_pkg_setup
-}
-
-src_prepare() {
- default
- chmod +x configure || die
- local repo
- for repo in corba hotspot jdk jaxp jaxws langtools nashorn; do
- ln -s ../"${repo}-jdk${MY_PV}" "${repo}" || die
- done
- # new warnings in new gcc https://bugs.gentoo.org/685426
- sed -i '/^WARNINGS_ARE_ERRORS/ s/-Werror/-Wno-error/' \
- hotspot/make/linux/makefiles/gcc.make || die
-}
-
-src_configure() {
- # general build info found here:
- #https://hg.openjdk.java.net/jdk8/jdk8/raw-file/tip/README-builds.html
-
- # Work around stack alignment issue, bug #647954.
- use x86 && append-flags -mincoming-stack-boundary=2
-
- local myconf=(
- --disable-ccache
- --enable-unlimited-crypto
- --with-boot-jdk="${JDK_HOME}"
- --with-extra-cflags="${CFLAGS}"
- --with-extra-cxxflags="${CXXFLAGS}"
- --with-extra-ldflags="${LDFLAGS}"
- --with-giflib=system
- --with-jtreg=no
- --with-jobs=1
- --with-num-cores=1
- --with-update-version="$(ver_cut 2)"
- --with-build-number="b$(ver_cut 4)"
- --with-milestone="fcs" # magic variable that means "release version"
- --with-vendor-name="Gentoo"
- --with-vendor-url="https://gentoo.org"
- --with-vendor-bug-url="https://bugs.gentoo.org"
- --with-vendor-vm-bug-url="https://bugs.openjdk.java.net"
- --with-zlib=system
- --with-native-debug-symbols=$(usex debug internal none)
- $(usex headless-awt --disable-headful '')
- )
-
- # PaX breaks pch, bug #601016
- if use pch && ! host-is-pax; then
- myconf+=( --enable-precompiled-headers )
- else
- myconf+=( --disable-precompiled-headers )
- fi
-
- (
- unset _JAVA_OPTIONS JAVA JAVA_TOOL_OPTIONS JAVAC XARGS
- CFLAGS= CXXFLAGS= LDFLAGS= \
- CONFIG_SITE=/dev/null \
- econf "${myconf[@]}"
- )
-}
-
-src_compile() {
- local myemakeargs=(
- JOBS=$(makeopts_jobs)
- LOG=debug
- $(usex doc docs '')
- $(usex jbootstrap bootcycle-images images)
- )
- emake "${myemakeargs[@]}" -j1 #nowarn
-}
-
-src_install() {
- local dest="/usr/$(get_libdir)/${PN}-${SLOT}"
- local ddest="${ED%/}/${dest#/}"
-
- cd "${S}"/build/*-release/images/j2sdk-image || die
-
- if ! use alsa; then
- rm -v jre/lib/$(get_system_arch)/libjsoundalsa.* || die
- fi
-
- # stupid build system does not remove that
- if use headless-awt ; then
- rm -fvr jre/lib/$(get_system_arch)/lib*{[jx]awt,splashscreen}* \
- {,jre/}bin/policytool bin/appletviewer || die
- fi
-
- if ! use examples ; then
- rm -vr demo/ || die
- fi
-
- if ! use source ; then
- rm -v src.zip || die
- fi
-
- dodir "${dest}"
- cp -pPR * "${ddest}" || die
-
- dosym ../../../../../../etc/ssl/certs/java/cacerts "${dest}"/jre/lib/security/cacerts
-
- java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh
- java-vm_set-pax-markings "${ddest}"
- java-vm_revdep-mask
- java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
-
- if use doc ; then
- docinto html
- dodoc -r "${S}"/build/*-release/docs/*
- fi
-}
-
-pkg_postinst() {
- java-vm-2_pkg_postinst
-}
diff --git a/dev-java/openjdk/openjdk-8.252_p09.ebuild b/dev-java/openjdk/openjdk-8.252_p09.ebuild
index 8ccbcba477f0..1b3576eacaf4 100644
--- a/dev-java/openjdk/openjdk-8.252_p09.ebuild
+++ b/dev-java/openjdk/openjdk-8.252_p09.ebuild
@@ -27,7 +27,7 @@ SRC_URI="
LICENSE="GPL-2"
SLOT="$(ver_cut 1)"
-KEYWORDS="amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ppc64 ~x86"
IUSE="alsa debug cups doc examples headless-awt +jbootstrap nsplugin +pch selinux source webstart"
COMMON_DEPEND="
@@ -95,7 +95,9 @@ openjdk_check_requirements() {
pkg_pretend() {
openjdk_check_requirements
- has ccache ${FEATURES} && die "FEATURES=ccache doesn't work with ${PN}"
+ if [[ ${MERGE_TYPE} != binary ]]; then
+ has ccache ${FEATURES} && die "FEATURES=ccache doesn't work with ${PN}"
+ fi
}
pkg_setup() {
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index fd29999104ce..9316558d3c15 100644
Binary files a/dev-lang/Manifest.gz and b/dev-lang/Manifest.gz differ
diff --git a/dev-lang/go/go-1.12.17.ebuild b/dev-lang/go/go-1.12.17.ebuild
index b04884336be6..a265bb088d5d 100644
--- a/dev-lang/go/go-1.12.17.ebuild
+++ b/dev-lang/go/go-1.12.17.ebuild
@@ -200,7 +200,7 @@ src_compile()
fi
cd src
- ./make.bash || die "build failed"
+ bash -x ./make.bash || die "build failed"
}
src_test()
diff --git a/dev-lang/go/go-1.13.10.ebuild b/dev-lang/go/go-1.13.10.ebuild
index 83042be033f3..1f323d04c2e8 100644
--- a/dev-lang/go/go-1.13.10.ebuild
+++ b/dev-lang/go/go-1.13.10.ebuild
@@ -151,7 +151,7 @@ src_compile()
fi
cd src
- ./make.bash -v || die "build failed"
+ bash -x ./make.bash || die "build failed"
}
src_test()
diff --git a/dev-lang/go/go-1.14.2.ebuild b/dev-lang/go/go-1.14.2.ebuild
index 0829486e3571..178eb1504f2f 100644
--- a/dev-lang/go/go-1.14.2.ebuild
+++ b/dev-lang/go/go-1.14.2.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
@@ -137,7 +137,7 @@ src_compile()
fi
cd src
- ./make.bash -v || die "build failed"
+ bash -x ./make.bash || die "build failed"
}
src_test()
diff --git a/dev-lang/go/go-9999.ebuild b/dev-lang/go/go-9999.ebuild
index 3c87c2a4e5f0..fa07749bdeb3 100644
--- a/dev-lang/go/go-9999.ebuild
+++ b/dev-lang/go/go-9999.ebuild
@@ -137,7 +137,7 @@ src_compile()
fi
cd src
- ./make.bash -v || die "build failed"
+ bash -x ./make.bash || die "build failed"
}
src_test()
diff --git a/dev-lang/ruby/metadata.xml b/dev-lang/ruby/metadata.xml
index ad18c95606a5..3a5415201c60 100644
--- a/dev-lang/ruby/metadata.xml
+++ b/dev-lang/ruby/metadata.xml
@@ -1,12 +1,13 @@
-
- ruby@gentoo.org
- Gentoo Ruby Project
-
-
+
+ ruby@gentoo.org
+ Gentoo Ruby Project
+
+
diff --git a/dev-lang/ruby/ruby-2.5.8-r1.ebuild b/dev-lang/ruby/ruby-2.5.8-r1.ebuild
new file mode 100644
index 000000000000..ab80427fda65
--- /dev/null
+++ b/dev-lang/ruby/ruby-2.5.8-r1.ebuild
@@ -0,0 +1,222 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic multilib
+
+MY_P="${PN}-$(ver_cut 1-3)"
+S=${WORKDIR}/${MY_P}
+
+SLOT=$(ver_cut 1-2)
+MY_SUFFIX=$(ver_rs 1 '' ${SLOT})
+RUBYVERSION=${SLOT}.0
+
+DESCRIPTION="An object-oriented scripting language"
+HOMEPAGE="https://www.ruby-lang.org/"
+SRC_URI="https://cache.ruby-lang.org/pub/ruby/${SLOT}/${MY_P}.tar.xz"
+
+LICENSE="|| ( Ruby-BSD BSD-2 )"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="berkdb debug doc examples gdbm ipv6 jemalloc libressl +rdoc rubytests socks5 +ssl static-libs systemtap tk xemacs"
+
+RDEPEND="
+ berkdb? ( sys-libs/db:= )
+ gdbm? ( sys-libs/gdbm:= )
+ jemalloc? ( dev-libs/jemalloc )
+ ssl? (
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl )
+ )
+ socks5? ( >=net-proxy/dante-1.1.13 )
+ systemtap? ( dev-util/systemtap )
+ tk? (
+ dev-lang/tcl:0=[threads]
+ dev-lang/tk:0=[threads]
+ )
+ dev-libs/libyaml
+ dev-libs/libffi:=
+ sys-libs/readline:0=
+ sys-libs/zlib
+ >=app-eselect/eselect-ruby-20171225
+"
+
+DEPEND="${RDEPEND}"
+
+BUNDLED_GEMS="
+ >=dev-ruby/did_you_mean-1.2.0:2.5[ruby_targets_ruby25]
+ >=dev-ruby/minitest-5.10.3[ruby_targets_ruby25]
+ >=dev-ruby/net-telnet-0.1.1[ruby_targets_ruby25]
+ >=dev-ruby/power_assert-1.1.1[ruby_targets_ruby25]
+ >=dev-ruby/rake-12.3.0[ruby_targets_ruby25]
+ >=dev-ruby/test-unit-3.2.7[ruby_targets_ruby25]
+ >=dev-ruby/xmlrpc-0.3.0[ruby_targets_ruby25]
+"
+
+PDEPEND="
+ ${BUNDLED_GEMS}
+ virtual/rubygems[ruby_targets_ruby25]
+ >=dev-ruby/json-2.0.2[ruby_targets_ruby25]
+ rdoc? ( >=dev-ruby/rdoc-6.1.2[ruby_targets_ruby25] )
+ xemacs? ( app-xemacs/ruby-modes )"
+
+src_prepare() {
+ eapply "${FILESDIR}"/${SLOT}/{001,005,011}*.patch
+
+ einfo "Unbundling gems..."
+ cd "$S"
+ # Remove bundled gems that we will install via PDEPEND, bug
+ # 539700. Use explicit version numbers to ensure rm fails when they
+ # change so we can update dependencies accordingly.
+ rm -f gems/{did_you_mean-1.2.0,minitest-5.10.3,net-telnet-0.1.1,power_assert-1.1.1,rake-12.3.0,test-unit-3.2.7,xmlrpc-0.3.0}.gem || die
+
+ einfo "Removing bundled libraries..."
+ rm -fr ext/fiddle/libffi-3.2.1 || die
+
+ eapply_user
+
+ eautoreconf
+}
+
+src_configure() {
+ local modules= myconf=
+
+ # -fomit-frame-pointer makes ruby segfault, see bug #150413.
+ filter-flags -fomit-frame-pointer
+ # In many places aliasing rules are broken; play it safe
+ # as it's risky with newer compilers to leave it as it is.
+ append-flags -fno-strict-aliasing
+
+ # Socks support via dante
+ if use socks5 ; then
+ # Socks support can't be disabled as long as SOCKS_SERVER is
+ # set and socks library is present, so need to unset
+ # SOCKS_SERVER in that case.
+ unset SOCKS_SERVER
+ fi
+
+ # Increase GC_MALLOC_LIMIT if set (default is 8000000)
+ if [ -n "${RUBY_GC_MALLOC_LIMIT}" ] ; then
+ append-flags "-DGC_MALLOC_LIMIT=${RUBY_GC_MALLOC_LIMIT}"
+ fi
+
+ # ipv6 hack, bug 168939. Needs --enable-ipv6.
+ use ipv6 || myconf="${myconf} --with-lookup-order-hack=INET"
+
+ # Determine which modules *not* to build depending in the USE flags.
+ if ! use berkdb ; then
+ modules="${modules},dbm"
+ fi
+ if ! use gdbm ; then
+ modules="${modules},gdbm"
+ fi
+ if ! use ssl ; then
+ modules="${modules},openssl"
+ fi
+ if ! use tk ; then
+ modules="${modules},tk"
+ fi
+
+ # Provide an empty LIBPATHENV because we disable rpath but we do not
+ # need LD_LIBRARY_PATH by default since that breaks USE=multitarget
+ # #564272
+ INSTALL="${EPREFIX}/usr/bin/install -c" LIBPATHENV="" econf \
+ --program-suffix=${MY_SUFFIX} \
+ --with-soname=ruby${MY_SUFFIX} \
+ --enable-shared \
+ --enable-pthread \
+ --disable-rpath \
+ --with-out-ext="${modules}" \
+ $(use_with jemalloc jemalloc) \
+ $(use_enable socks5 socks) \
+ $(use_enable systemtap dtrace) \
+ $(use_enable doc install-doc) \
+ --enable-ipv6 \
+ $(use_enable static-libs static) \
+ $(use_enable static-libs install-static-library) \
+ $(use_with static-libs static-linked-ext) \
+ $(use_enable debug) \
+ ${myconf} \
+ --enable-option-checking=no
+}
+
+src_compile() {
+ emake V=1 EXTLDFLAGS="${LDFLAGS}"
+}
+
+src_test() {
+ emake -j1 V=1 test
+
+ elog "Ruby's make test has been run. Ruby also ships with a make check"
+ elog "that cannot be run until after ruby has been installed."
+ elog
+ if use rubytests; then
+ elog "You have enabled rubytests, so they will be installed to"
+ elog "/usr/share/${PN}-${SLOT}/test. To run them you must be a user other"
+ elog "than root, and you must place them into a writeable directory."
+ elog "Then call: "
+ elog
+ elog "ruby${MY_SUFFIX} -C /location/of/tests runner.rb"
+ else
+ elog "Enable the rubytests USE flag to install the make check tests"
+ fi
+}
+
+src_install() {
+ # Remove the remaining bundled gems. We do this late in the process
+ # since they are used during the build to e.g. create the
+ # documentation.
+ rm -rf ext/json || die
+
+ # Ruby is involved in the install process, we don't want interference here.
+ unset RUBYOPT
+
+ local MINIRUBY=$(echo -e 'include Makefile\ngetminiruby:\n\t@echo $(MINIRUBY)'|make -f - getminiruby)
+
+ LD_LIBRARY_PATH="${S}:${ED}/usr/$(get_libdir)${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}"
+ RUBYLIB="${S}:${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}"
+ for d in $(find "${S}/ext" -type d) ; do
+ RUBYLIB="${RUBYLIB}:$d"
+ done
+ export LD_LIBRARY_PATH RUBYLIB
+
+ emake V=1 DESTDIR="${D}" install
+
+ # Remove installed rubygems and rdoc copy
+ rm -rf "${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}/rubygems" || die "rm rubygems failed"
+ rm -rf "${ED}/usr/bin/"gem"${MY_SUFFIX}" || die "rm rdoc bins failed"
+ rm -rf "${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}"/rdoc* || die "rm rdoc failed"
+ rm -rf "${ED}/usr/bin/"{ri,rdoc}"${MY_SUFFIX}" || die "rm rdoc bins failed"
+
+ if use doc; then
+ make DESTDIR="${D}" install-doc || die "make install-doc failed"
+ fi
+
+ if use examples; then
+ dodoc -r sample
+ fi
+
+ dodoc ChangeLog NEWS doc/NEWS* README*
+
+ if use rubytests; then
+ pushd test
+ insinto /usr/share/${PN}-${SLOT}/test
+ doins -r .
+ popd
+ fi
+}
+
+pkg_postinst() {
+ if [[ ! -n $(readlink "${EROOT}"/usr/bin/ruby) ]] ; then
+ eselect ruby set ruby${MY_SUFFIX}
+ fi
+
+ elog
+ elog "To switch between available Ruby profiles, execute as root:"
+ elog "\teselect ruby set ruby(23|24|...)"
+ elog
+}
+
+pkg_postrm() {
+ eselect ruby cleanup
+}
diff --git a/dev-lang/ruby/ruby-2.6.6-r2.ebuild b/dev-lang/ruby/ruby-2.6.6-r2.ebuild
new file mode 100644
index 000000000000..68311ff8543d
--- /dev/null
+++ b/dev-lang/ruby/ruby-2.6.6-r2.ebuild
@@ -0,0 +1,234 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic multilib
+
+MY_P="${PN}-$(ver_cut 1-3)"
+S=${WORKDIR}/${MY_P}
+
+SLOT=$(ver_cut 1-2)
+MY_SUFFIX=$(ver_rs 1 '' ${SLOT})
+RUBYVERSION=${SLOT}.0
+
+DESCRIPTION="An object-oriented scripting language"
+HOMEPAGE="https://www.ruby-lang.org/"
+SRC_URI="https://cache.ruby-lang.org/pub/ruby/${SLOT}/${MY_P}.tar.xz"
+
+LICENSE="|| ( Ruby-BSD BSD-2 )"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="berkdb debug doc examples gdbm ipv6 jemalloc jit libressl +rdoc rubytests socks5 +ssl static-libs systemtap tk xemacs"
+
+RDEPEND="
+ berkdb? ( sys-libs/db:= )
+ gdbm? ( sys-libs/gdbm:= )
+ jemalloc? ( dev-libs/jemalloc )
+ jit? ( || ( sys-devel/gcc:* sys-devel/clang:* ) )
+ ssl? (
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl )
+ )
+ socks5? ( >=net-proxy/dante-1.1.13 )
+ systemtap? ( dev-util/systemtap )
+ tk? (
+ dev-lang/tcl:0=[threads]
+ dev-lang/tk:0=[threads]
+ )
+ dev-libs/libyaml
+ dev-libs/libffi:=
+ sys-libs/readline:0=
+ sys-libs/zlib
+ >=app-eselect/eselect-ruby-20181225
+"
+
+DEPEND="${RDEPEND}"
+
+BUNDLED_GEMS="
+ >=dev-ruby/did_you_mean-1.2.1[ruby_targets_ruby26]
+ >=dev-ruby/minitest-5.11.3[ruby_targets_ruby26]
+ >=dev-ruby/net-telnet-0.2.0[ruby_targets_ruby26]
+ >=dev-ruby/power_assert-1.1.3[ruby_targets_ruby26]
+ >=dev-ruby/rake-12.3.2[ruby_targets_ruby26]
+ >=dev-ruby/test-unit-3.2.9[ruby_targets_ruby26]
+ >=dev-ruby/xmlrpc-0.3.0[ruby_targets_ruby26]
+"
+
+PDEPEND="
+ ${BUNDLED_GEMS}
+ virtual/rubygems[ruby_targets_ruby26]
+ >=dev-ruby/bundler-1.17.2[ruby_targets_ruby26]
+ >=dev-ruby/json-2.0.2[ruby_targets_ruby26]
+ rdoc? ( >=dev-ruby/rdoc-6.1.2[ruby_targets_ruby26] )
+ xemacs? ( app-xemacs/ruby-modes )"
+
+src_prepare() {
+ # 005 does not compile bigdecimal and is questionable because it
+ # compiles ruby in a non-standard way, may be dropped
+ eapply "${FILESDIR}"/2.6/010*.patch
+
+ einfo "Unbundling gems..."
+ cd "$S"
+ # Remove bundled gems that we will install via PDEPEND, bug
+ # 539700.
+ rm -fr gems/* || die
+
+ einfo "Removing bundled libraries..."
+ rm -fr ext/fiddle/libffi-3.2.1 || die
+
+ eapply_user
+
+ eautoreconf
+}
+
+src_configure() {
+ local modules= myconf=
+
+ # -fomit-frame-pointer makes ruby segfault, see bug #150413.
+ filter-flags -fomit-frame-pointer
+ # In many places aliasing rules are broken; play it safe
+ # as it's risky with newer compilers to leave it as it is.
+ append-flags -fno-strict-aliasing
+
+ # Socks support via dante
+ if use socks5 ; then
+ # Socks support can't be disabled as long as SOCKS_SERVER is
+ # set and socks library is present, so need to unset
+ # SOCKS_SERVER in that case.
+ unset SOCKS_SERVER
+ fi
+
+ # Increase GC_MALLOC_LIMIT if set (default is 8000000)
+ if [ -n "${RUBY_GC_MALLOC_LIMIT}" ] ; then
+ append-flags "-DGC_MALLOC_LIMIT=${RUBY_GC_MALLOC_LIMIT}"
+ fi
+
+ # ipv6 hack, bug 168939. Needs --enable-ipv6.
+ use ipv6 || myconf="${myconf} --with-lookup-order-hack=INET"
+
+ # Determine which modules *not* to build depending in the USE flags.
+ if ! use berkdb ; then
+ modules="${modules},dbm"
+ fi
+ if ! use gdbm ; then
+ modules="${modules},gdbm"
+ fi
+ if ! use ssl ; then
+ modules="${modules},openssl"
+ fi
+ if ! use tk ; then
+ modules="${modules},tk"
+ fi
+
+ # Provide an empty LIBPATHENV because we disable rpath but we do not
+ # need LD_LIBRARY_PATH by default since that breaks USE=multitarget
+ # #564272
+ INSTALL="${EPREFIX}/usr/bin/install -c" LIBPATHENV="" econf \
+ --program-suffix=${MY_SUFFIX} \
+ --with-soname=ruby${MY_SUFFIX} \
+ --enable-shared \
+ --enable-pthread \
+ --disable-rpath \
+ --with-out-ext="${modules}" \
+ $(use_with jemalloc jemalloc) \
+ $(use_enable jit jit-support ) \
+ $(use_enable socks5 socks) \
+ $(use_enable systemtap dtrace) \
+ $(use_enable doc install-doc) \
+ --enable-ipv6 \
+ $(use_enable static-libs static) \
+ $(use_enable static-libs install-static-library) \
+ $(use_with static-libs static-linked-ext) \
+ $(use_enable debug) \
+ ${myconf} \
+ --enable-option-checking=no
+
+ # Makefile is broken because it lacks -ldl
+ rm -rf ext/-test-/popen_deadlock || die
+}
+
+src_compile() {
+ emake V=1 EXTLDFLAGS="${LDFLAGS}" MJIT_CFLAGS="${CFLAGS}" MJIT_OPTFLAGS="" MJIT_DEBUGFLAGS=""
+}
+
+src_test() {
+ emake -j1 V=1 test
+
+ elog "Ruby's make test has been run. Ruby also ships with a make check"
+ elog "that cannot be run until after ruby has been installed."
+ elog
+ if use rubytests; then
+ elog "You have enabled rubytests, so they will be installed to"
+ elog "/usr/share/${PN}-${SLOT}/test. To run them you must be a user other"
+ elog "than root, and you must place them into a writeable directory."
+ elog "Then call: "
+ elog
+ elog "ruby${MY_SUFFIX} -C /location/of/tests runner.rb"
+ else
+ elog "Enable the rubytests USE flag to install the make check tests"
+ fi
+}
+
+src_install() {
+ # Remove the remaining bundled gems. We do this late in the process
+ # since they are used during the build to e.g. create the
+ # documentation.
+ rm -rf ext/json || die
+ rm -rf lib/bundler* lib/rdoc/rdoc.gemspec || die
+
+ # Ruby is involved in the install process, we don't want interference here.
+ unset RUBYOPT
+
+ local MINIRUBY=$(echo -e 'include Makefile\ngetminiruby:\n\t@echo $(MINIRUBY)'|make -f - getminiruby)
+
+ LD_LIBRARY_PATH="${S}:${ED}/usr/$(get_libdir)${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}"
+ RUBYLIB="${S}:${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}"
+ for d in $(find "${S}/ext" -type d) ; do
+ RUBYLIB="${RUBYLIB}:$d"
+ done
+ export LD_LIBRARY_PATH RUBYLIB
+
+ # Create directory for the default gems
+ local gem_home="${EPREFIX}/usr/$(get_libdir)/ruby/gems/${RUBYVERSION}"
+ mkdir -p "${D}/${gem_home}" || die "mkdir gem home failed"
+
+ emake V=1 DESTDIR="${D}" GEM_DESTDIR=${gem_home} install
+
+ # Remove installed rubygems and rdoc copy
+ rm -rf "${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}/rubygems" || die "rm rubygems failed"
+ rm -rf "${ED}/usr/bin/"gem"${MY_SUFFIX}" || die "rm rdoc bins failed"
+ rm -rf "${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}"/rdoc* || die "rm rdoc failed"
+ rm -rf "${ED}/usr/bin/"{bundle,bundler,ri,rdoc}"${MY_SUFFIX}" || die "rm rdoc bins failed"
+
+ if use doc; then
+ emake DESTDIR="${D}" GEM_DESTDIR=${gem_home} install-doc
+ fi
+
+ if use examples; then
+ dodoc -r sample
+ fi
+
+ dodoc ChangeLog NEWS doc/NEWS* README*
+
+ if use rubytests; then
+ pushd test
+ insinto /usr/share/${PN}-${SLOT}/test
+ doins -r .
+ popd
+ fi
+}
+
+pkg_postinst() {
+ if [[ ! -n $(readlink "${EROOT}"/usr/bin/ruby) ]] ; then
+ eselect ruby set ruby${MY_SUFFIX}
+ fi
+
+ elog
+ elog "To switch between available Ruby profiles, execute as root:"
+ elog "\teselect ruby set ruby(23|24|...)"
+ elog
+}
+
+pkg_postrm() {
+ eselect ruby cleanup
+}
diff --git a/dev-lang/ruby/ruby-2.7.1-r2.ebuild b/dev-lang/ruby/ruby-2.7.1-r2.ebuild
new file mode 100644
index 000000000000..e4e8048e083a
--- /dev/null
+++ b/dev-lang/ruby/ruby-2.7.1-r2.ebuild
@@ -0,0 +1,237 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic multilib
+
+MY_P="${PN}-$(ver_cut 1-3)"
+S=${WORKDIR}/${MY_P}
+
+SLOT=$(ver_cut 1-2)
+MY_SUFFIX=$(ver_rs 1 '' ${SLOT})
+RUBYVERSION=${SLOT}.0
+
+DESCRIPTION="An object-oriented scripting language"
+HOMEPAGE="https://www.ruby-lang.org/"
+SRC_URI="https://cache.ruby-lang.org/pub/ruby/${SLOT}/${MY_P}.tar.xz"
+
+LICENSE="|| ( Ruby-BSD BSD-2 )"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="berkdb debug doc examples gdbm ipv6 jemalloc jit libressl +rdoc rubytests socks5 +ssl static-libs systemtap tk xemacs"
+
+RDEPEND="
+ berkdb? ( sys-libs/db:= )
+ gdbm? ( sys-libs/gdbm:= )
+ jemalloc? ( dev-libs/jemalloc )
+ jit? ( || ( sys-devel/gcc:* sys-devel/clang:* ) )
+ ssl? (
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl )
+ )
+ socks5? ( >=net-proxy/dante-1.1.13 )
+ systemtap? ( dev-util/systemtap )
+ tk? (
+ dev-lang/tcl:0=[threads]
+ dev-lang/tk:0=[threads]
+ )
+ dev-libs/libyaml
+ dev-libs/libffi:=
+ sys-libs/readline:0=
+ sys-libs/zlib
+ >=app-eselect/eselect-ruby-20191222
+"
+
+DEPEND="${RDEPEND}"
+
+BUNDLED_GEMS="
+ >=dev-ruby/minitest-5.13.0[ruby_targets_ruby27]
+ >=dev-ruby/net-telnet-0.2.0[ruby_targets_ruby27]
+ >=dev-ruby/power_assert-1.1.7[ruby_targets_ruby27]
+ >=dev-ruby/rake-13.0.1[ruby_targets_ruby27]
+ >=dev-ruby/test-unit-3.3.4[ruby_targets_ruby27]
+ >=dev-ruby/xmlrpc-0.3.0[ruby_targets_ruby27]
+"
+
+PDEPEND="
+ ${BUNDLED_GEMS}
+ virtual/rubygems[ruby_targets_ruby27]
+ >=dev-ruby/bundler-2.1.4[ruby_targets_ruby27]
+ >=dev-ruby/did_you_mean-1.3.1[ruby_targets_ruby27]
+ >=dev-ruby/json-2.0.2[ruby_targets_ruby27]
+ rdoc? ( >=dev-ruby/rdoc-6.1.2[ruby_targets_ruby27] )
+ xemacs? ( app-xemacs/ruby-modes )"
+
+src_prepare() {
+ # 005 does not compile bigdecimal and is questionable because it
+ # compiles ruby in a non-standard way, may be dropped
+ eapply "${FILESDIR}"/2.7/010*.patch
+
+ einfo "Unbundling gems..."
+ cd "$S"
+ # Remove bundled gems that we will install via PDEPEND, bug
+ # 539700.
+ rm -fr gems/* || die
+ # Don't install CLI tools since they will clash with the gem
+ rm -f bin/{racc,racc2y,y2racc} || die
+ sed -i -e '/executables/ s:^:#:' lib/racc/racc.gemspec || die
+
+ einfo "Removing bundled libraries..."
+ rm -fr ext/fiddle/libffi-3.2.1 || die
+
+ eapply_user
+
+ eautoreconf
+}
+
+src_configure() {
+ local modules= myconf=
+
+ # -fomit-frame-pointer makes ruby segfault, see bug #150413.
+ filter-flags -fomit-frame-pointer
+ # In many places aliasing rules are broken; play it safe
+ # as it's risky with newer compilers to leave it as it is.
+ append-flags -fno-strict-aliasing
+
+ # Socks support via dante
+ if use socks5 ; then
+ # Socks support can't be disabled as long as SOCKS_SERVER is
+ # set and socks library is present, so need to unset
+ # SOCKS_SERVER in that case.
+ unset SOCKS_SERVER
+ fi
+
+ # Increase GC_MALLOC_LIMIT if set (default is 8000000)
+ if [ -n "${RUBY_GC_MALLOC_LIMIT}" ] ; then
+ append-flags "-DGC_MALLOC_LIMIT=${RUBY_GC_MALLOC_LIMIT}"
+ fi
+
+ # ipv6 hack, bug 168939. Needs --enable-ipv6.
+ use ipv6 || myconf="${myconf} --with-lookup-order-hack=INET"
+
+ # Determine which modules *not* to build depending in the USE flags.
+ if ! use berkdb ; then
+ modules="${modules},dbm"
+ fi
+ if ! use gdbm ; then
+ modules="${modules},gdbm"
+ fi
+ if ! use ssl ; then
+ modules="${modules},openssl"
+ fi
+ if ! use tk ; then
+ modules="${modules},tk"
+ fi
+
+ # Provide an empty LIBPATHENV because we disable rpath but we do not
+ # need LD_LIBRARY_PATH by default since that breaks USE=multitarget
+ # #564272
+ INSTALL="${EPREFIX}/usr/bin/install -c" LIBPATHENV="" econf \
+ --program-suffix=${MY_SUFFIX} \
+ --with-soname=ruby${MY_SUFFIX} \
+ --enable-shared \
+ --enable-pthread \
+ --disable-rpath \
+ --with-out-ext="${modules}" \
+ $(use_with jemalloc jemalloc) \
+ $(use_enable jit jit-support ) \
+ $(use_enable socks5 socks) \
+ $(use_enable systemtap dtrace) \
+ $(use_enable doc install-doc) \
+ --enable-ipv6 \
+ $(use_enable static-libs static) \
+ $(use_enable static-libs install-static-library) \
+ $(use_with static-libs static-linked-ext) \
+ $(use_enable debug) \
+ ${myconf} \
+ --enable-option-checking=no
+
+ # Makefile is broken because it lacks -ldl
+ rm -rf ext/-test-/popen_deadlock || die
+}
+
+src_compile() {
+ emake V=1 EXTLDFLAGS="${LDFLAGS}" MJIT_CFLAGS="${CFLAGS}" MJIT_OPTFLAGS="" MJIT_DEBUGFLAGS=""
+}
+
+src_test() {
+ emake -j1 V=1 test
+
+ elog "Ruby's make test has been run. Ruby also ships with a make check"
+ elog "that cannot be run until after ruby has been installed."
+ elog
+ if use rubytests; then
+ elog "You have enabled rubytests, so they will be installed to"
+ elog "/usr/share/${PN}-${SLOT}/test. To run them you must be a user other"
+ elog "than root, and you must place them into a writeable directory."
+ elog "Then call: "
+ elog
+ elog "ruby${MY_SUFFIX} -C /location/of/tests runner.rb"
+ else
+ elog "Enable the rubytests USE flag to install the make check tests"
+ fi
+}
+
+src_install() {
+ # Remove the remaining bundled gems. We do this late in the process
+ # since they are used during the build to e.g. create the
+ # documentation.
+ rm -rf ext/json || die
+ rm -rf lib/bundler* lib/rdoc/rdoc.gemspec || die
+
+ # Ruby is involved in the install process, we don't want interference here.
+ unset RUBYOPT
+
+ local MINIRUBY=$(echo -e 'include Makefile\ngetminiruby:\n\t@echo $(MINIRUBY)'|make -f - getminiruby)
+
+ LD_LIBRARY_PATH="${S}:${ED}/usr/$(get_libdir)${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}"
+ RUBYLIB="${S}:${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}"
+ for d in $(find "${S}/ext" -type d) ; do
+ RUBYLIB="${RUBYLIB}:$d"
+ done
+ export LD_LIBRARY_PATH RUBYLIB
+
+ # Create directory for the default gems
+ local gem_home="${EPREFIX}/usr/$(get_libdir)/ruby/gems/${RUBYVERSION}"
+ mkdir -p "${D}/${gem_home}" || die "mkdir gem home failed"
+
+ emake V=1 DESTDIR="${D}" GEM_DESTDIR=${gem_home} install
+
+ # Remove installed rubygems and rdoc copy
+ rm -rf "${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}/rubygems" || die "rm rubygems failed"
+ rm -rf "${ED}/usr/bin/"gem"${MY_SUFFIX}" || die "rm rdoc bins failed"
+ rm -rf "${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}"/rdoc* || die "rm rdoc failed"
+ rm -rf "${ED}/usr/bin/"{bundle,bundler,ri,rdoc}"${MY_SUFFIX}" || die "rm rdoc bins failed"
+
+ if use doc; then
+ emake DESTDIR="${D}" GEM_DESTDIR=${gem_home} install-doc
+ fi
+
+ if use examples; then
+ dodoc -r sample
+ fi
+
+ dodoc ChangeLog NEWS doc/NEWS* README*
+
+ if use rubytests; then
+ pushd test
+ insinto /usr/share/${PN}-${SLOT}/test
+ doins -r .
+ popd
+ fi
+}
+
+pkg_postinst() {
+ if [[ ! -n $(readlink "${EROOT}"/usr/bin/ruby) ]] ; then
+ eselect ruby set ruby${MY_SUFFIX}
+ fi
+
+ elog
+ elog "To switch between available Ruby profiles, execute as root:"
+ elog "\teselect ruby set ruby(23|24|...)"
+ elog
+}
+
+pkg_postrm() {
+ eselect ruby cleanup
+}
diff --git a/dev-lang/swi-prolog/Manifest b/dev-lang/swi-prolog/Manifest
index d4fd02ba3982..a0348fa4e9cf 100644
--- a/dev-lang/swi-prolog/Manifest
+++ b/dev-lang/swi-prolog/Manifest
@@ -1,3 +1,3 @@
DIST swipl-8.0.3.tar.gz 10418553 BLAKE2B d7d381a3070384164f9788060e1c431cc4658dd3e2144fc4c186c9f5395fb7356593766dcaff3ff424f19f917c8a4b56da31b019bd2206a7f794ece549043b76 SHA512 e3a0788befb5499be6f70524ef398dc3282a38891f20519dd23ec92f216fc1919a76656e4b648c3dc9d94e578dc2663439ff976eb52ca0dba5a6594f8d4d3037
-DIST swipl-8.1.25.tar.gz 10896679 BLAKE2B 69c20e02d59d25d317f1d4c339b430af8faa7d9027e91a5224eeb13ffc6b92a0eb08b9ff8602f17e449410da4cd007c59b08f43f29049f0b475004bebde6f65b SHA512 f034ae521da9d27d9c8681a3b9404047b61c77449d6257fea599b3ba0a5ba572b559f0dcd2653ebbf70eb7588bbf99d3d43149411e373a346d27e16c620fe638
-DIST swipl-8.1.26.tar.gz 10893132 BLAKE2B 7ddaec9a292e454bd5ceefbbd00d489ae3669be66ba7237a0788b4c714910f49dac9f659a52c715075b91dd638f0590efb0234b8c88cbe2090ceb735faf38a9a SHA512 a89a09f2958182f05ebec161ec5b271664fe9dc0cbc29bb3246ea6418b4ba5fa2a0542ad5448c3f4d7dda080cd8575391b856e04ca01eb41907e00a194d8e502
+DIST swipl-8.1.27.tar.gz 10911864 BLAKE2B d65dfe1103fd82adfbb81251c45b085c70d7c494ca0f484dc2d14b74658418272d679107981ac04814f1151ef5c71ec1d68176ae792540936c2047572e521e21 SHA512 f5cc8ed07c28a3f6a67213f66647e0e8fef80fd31871852283ac99d4b137da560734c8f0cf6c12563b0576f8fce8def752caa2b9f84619ca8a8c11d42c5949b9
+DIST swipl-8.1.28.tar.gz 10905268 BLAKE2B 91d2838b74384a78f32649a84c64aa0d9c66495bd45c6729f15e7a8f894521996827da792eb5449f78ed3778722426a02aad54221f3bea5d505b1e639cefe300 SHA512 0ea387aaabcc028362ee42a87b72237b59f6ddc8fccadeef81f0480136a6b8492a7420a3209ef7501425fa16fd362915c7d828a6f1bd3ff84b537ecba802ade7
diff --git a/dev-lang/swi-prolog/swi-prolog-8.1.26.ebuild b/dev-lang/swi-prolog/swi-prolog-8.1.27.ebuild
similarity index 100%
rename from dev-lang/swi-prolog/swi-prolog-8.1.26.ebuild
rename to dev-lang/swi-prolog/swi-prolog-8.1.27.ebuild
diff --git a/dev-lang/swi-prolog/swi-prolog-8.1.25.ebuild b/dev-lang/swi-prolog/swi-prolog-8.1.28.ebuild
similarity index 97%
rename from dev-lang/swi-prolog/swi-prolog-8.1.25.ebuild
rename to dev-lang/swi-prolog/swi-prolog-8.1.28.ebuild
index 8f4583928061..2293c183ae1c 100644
--- a/dev-lang/swi-prolog/swi-prolog-8.1.25.ebuild
+++ b/dev-lang/swi-prolog/swi-prolog-8.1.28.ebuild
@@ -56,16 +56,13 @@ BUILD_DIR="${S}/build"
CMAKE_USE_DIR="${S}"
src_prepare() {
- EPATCH_FORCE=yes
- EPATCH_SUFFIX=patch
if [[ -d "${WORKDIR}"/${PV} ]] ; then
- epatch "${WORKDIR}"/${PV}
+ eapply "${WORKDIR}"/${PV}
fi
+ eapply_user
sed -i -e "s|\(SWIPL_INSTALL_PREFIX\) lib/.*)|\1 $(get_libdir)/swipl)|" CMakeLists.txt || die
- eapply_user
-
cmake-utils_src_prepare
}
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 6ea7e7a1e0f4..a5db1897295c 100644
Binary files a/dev-libs/Manifest.gz and b/dev-libs/Manifest.gz differ
diff --git a/dev-libs/bemenu/Manifest b/dev-libs/bemenu/Manifest
index a0f36bdb3f58..24af94defea8 100644
--- a/dev-libs/bemenu/Manifest
+++ b/dev-libs/bemenu/Manifest
@@ -1 +1,2 @@
DIST bemenu-0.3.0.tar.gz 120059 BLAKE2B 5db3e7bcc4c67e9f7030fc803a5531994746787ebecfba91c7f09128ea9077b3b06e8f542c1a2980811b8364db3a54fefbdb0af1afaca2f58f098473a4fbd5d6 SHA512 7e68d11954517f41c9669055c28b375c4f13ddfee8aae6a8e67c3282fe9118229d9ab072dc5e264e4204803b1a5ab715c6a5c9565ad4b7436cc172b9e455c05b
+DIST bemenu-0.4.1.tar.gz 110388 BLAKE2B 229f75887b8efc336c7790745b1a3402481a1cb86f92311c0c46ec123777ad051351fede5f7d59bce532a3a906bcab8d956f1e93d5aeac44dd7a49e7210e8e9f SHA512 d86b80b2eccbfca73287975f6f5ff9d86c7541900caec858c9aeff9cb7da2ee563e34e378561822671ba16e0f2af3440e0329f5c77f06ff5adcf332451452bf2
diff --git a/dev-libs/bemenu/bemenu-0.4.1.ebuild b/dev-libs/bemenu/bemenu-0.4.1.ebuild
new file mode 100644
index 000000000000..06c598e8072c
--- /dev/null
+++ b/dev-libs/bemenu/bemenu-0.4.1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="dmenu clone for wayland"
+HOMEPAGE="https://github.com/Cloudef/bemenu"
+if [[ ${PV} == 9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/Cloudef/bemenu.git"
+else
+ SRC_URI="https://github.com/Cloudef/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="doc ncurses wayland X"
+
+# Require at least one backend be built
+REQUIRED_USE="|| ( ncurses wayland X )"
+
+DEPEND="
+ ncurses? ( sys-libs/ncurses:0 )
+ wayland? (
+ dev-libs/wayland
+ dev-libs/wayland-protocols
+ x11-libs/cairo
+ x11-libs/pango
+ )
+ X? (
+ x11-libs/libxcb
+ x11-libs/libXext
+ x11-libs/libX11
+ x11-libs/cairo[X]
+ x11-libs/pango[X]
+ x11-libs/libXinerama
+ )
+"
+RDEPEND="${DEPEND}"
+BDEPEND="doc? ( app-doc/doxygen )"
+
+src_compile() {
+ emake clients $(usex ncurses curses) $(usex X x11) $(usex wayland wayland)
+ use doc && emake doxygen
+}
+
+src_install() {
+ emake install PREFIX="${D}"/usr libdir=/$(get_libdir)
+}
diff --git a/dev-libs/check/check-0.14.0-r2.ebuild b/dev-libs/check/check-0.14.0-r2.ebuild
index a57332eb0ce1..9dd07e7b1329 100644
--- a/dev-libs/check/check-0.14.0-r2.ebuild
+++ b/dev-libs/check/check-0.14.0-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/lib${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="LGPL-2.1+"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="doc subunit test"
RESTRICT="!test? ( test )"
diff --git a/dev-libs/efl/Manifest b/dev-libs/efl/Manifest
index 7e1ea58e219c..ec815626670a 100644
--- a/dev-libs/efl/Manifest
+++ b/dev-libs/efl/Manifest
@@ -1,2 +1,2 @@
DIST efl-1.23.3.tar.xz 77485032 BLAKE2B e5f65080aec1d11a43f1e1786b8ac4e7be70ddd9614b53db822177c28ee73f9590f63d032df5ddf00db6224730b45b045d9f91da2287a4dec7589e902cbcde28 SHA512 47ad067c43d39b534834195f89a745c4a47d867f33aaa68c28c6dccd147379e9bc2416bd68878cc16585f8cb60e926a7df62102658b205756c01985f37f0d297
-DIST efl-1.24.0.tar.xz 72274848 BLAKE2B f1652f334de618778eb1c70d05f101554b57676bd6bce462c21169969d3c005b52c35c4d95dcd015641e202fc3dc1034387f6d7d41b47521ca890fb62543b0fb SHA512 a3415e79eb0d13c1393f80728527d2b663b35e1b9ec815fadd0b43d754320ee8461aeade781b0264853e7935e920df7a5cc0b438c6b8a15a5744380a32f55080
+DIST efl-1.24.1.tar.xz 72277640 BLAKE2B 1568df21256bd9c223214d72df38520941d6e117a3590511144627947bfa903e74eaac45085e18172c5c44127b7d14b6f1e03f4a4cba12c6f3d2b55a8b2650f4 SHA512 6fe4d87a9db1e0022c1dff94c14d334d61e561608016072bcb1d2633054ff9a6a74c84bc9903592d716abc9e1fae48b6ff66b259a5a59114a1cd54f083ce8b51
diff --git a/dev-libs/efl/efl-1.24.0.ebuild b/dev-libs/efl/efl-1.24.1.ebuild
similarity index 99%
rename from dev-libs/efl/efl-1.24.0.ebuild
rename to dev-libs/efl/efl-1.24.1.ebuild
index 2c2dcccfc5bc..745ca8e21df7 100644
--- a/dev-libs/efl/efl-1.24.0.ebuild
+++ b/dev-libs/efl/efl-1.24.1.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-inherit flag-o-matic meson xdg-utils
+inherit meson xdg-utils
DESCRIPTION="Enlightenment Foundation Libraries all-in-one package"
HOMEPAGE="https://www.enlightenment.org"
@@ -244,8 +244,6 @@ src_configure() {
fi
emesonargs+=( -D lua-interpreter="${luaChoice}" )
- append-cflags -fcommon
-
meson_src_configure
}
diff --git a/dev-libs/elfutils/elfutils-0.177.ebuild b/dev-libs/elfutils/elfutils-0.177.ebuild
index 7198d5d86567..e0fb96346a94 100644
--- a/dev-libs/elfutils/elfutils-0.177.ebuild
+++ b/dev-libs/elfutils/elfutils-0.177.ebuild
@@ -43,6 +43,11 @@ src_prepare() {
src_configure() {
use test && append-flags -g #407135
+
+ # Symbol aliases are implemented as asm statements.
+ # Will require porting: https://gcc.gnu.org/PR48200
+ filter-flags '-flto*'
+
multilib-minimal_src_configure
}
diff --git a/dev-libs/elfutils/elfutils-0.179.ebuild b/dev-libs/elfutils/elfutils-0.179.ebuild
index a4b4ed4c2f86..5313453d1a02 100644
--- a/dev-libs/elfutils/elfutils-0.179.ebuild
+++ b/dev-libs/elfutils/elfutils-0.179.ebuild
@@ -45,6 +45,11 @@ src_prepare() {
src_configure() {
use test && append-flags -g #407135
+
+ # Symbol aliases are implemented as asm statements.
+ # Will require porting: https://gcc.gnu.org/PR48200
+ filter-flags '-flto*'
+
multilib-minimal_src_configure
}
diff --git a/dev-libs/kdiagram/Manifest b/dev-libs/kdiagram/Manifest
index e0ae9fbccd02..00956ee72377 100644
--- a/dev-libs/kdiagram/Manifest
+++ b/dev-libs/kdiagram/Manifest
@@ -1,3 +1,2 @@
-DIST kdiagram-2.6.1.tar.xz 674016 BLAKE2B 323fcc1101f4bba527426923652ee53a1986edff1c7a0d17a478585019c97f731675fa30477064f1e5375ef0a3da27ba1918ee21cf6758ac445ea0d7f1b7611c SHA512 caa1f6f8bffb4b311224edfed115f189fa9c88e4b9d8bc9d4b7bc963c6b8c896813b438ad89fa9e91e4cde2f55ae822cfc7ba559bbdad517c60a037591dc5128
DIST kdiagram-2.6.3.tar.xz 673788 BLAKE2B 467c376a2979e5a8b0c33b014f0490819f9fafca7a87fa95e44c073d166424f84d82771c787995eba05b97c6c8949270cc7101342eb3a2a91ed92d89d2ddc0a9 SHA512 307b0b17c314d5c4672100e2e949c3e8faf38eee7f9d504a15a01da77434e2b6274cb1857d36ea868025499e806643e32c27bb87aa7dfbce36e8dec6e53b11ef
DIST kdiagram-2.7.0.tar.xz 681384 BLAKE2B 0736525293200873cd10f8752b76b8589324e5e1fa9a89c6e3a1c30fc8d82fdf627cb5043eac5633858574a027c9f3ec98549c69718636c8a65cd4199acd7c9e SHA512 d5004b409bbb79ca858755a02a3673a16a54ffa7c1ed530b9526b8d928bdf0a2ba9730f47fb67203a09ef49d48c0af9b3d933f8f934ca19290376bdb3eefde1d
diff --git a/dev-libs/kdiagram/files/kdiagram-2.6.1-fix-horizontal-bars.patch b/dev-libs/kdiagram/files/kdiagram-2.6.1-fix-horizontal-bars.patch
deleted file mode 100644
index fae29982773e..000000000000
--- a/dev-libs/kdiagram/files/kdiagram-2.6.1-fix-horizontal-bars.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From d3783f643367b264800e853c7c55c515f17c2a3d Mon Sep 17 00:00:00 2001
-From: Dag Andersen
-Date: Thu, 23 Aug 2018 10:47:05 +0200
-Subject: Fix painting bar diagrams with horizontal bars
-
----
- .../Cartesian/DiagramFlavors/KChartNormalLyingBarDiagram_p.cpp | 5 +++--
- .../Cartesian/DiagramFlavors/KChartPercentLyingBarDiagram_p.cpp | 4 ++--
- .../Cartesian/DiagramFlavors/KChartStackedLyingBarDiagram_p.cpp | 4 ++--
- 3 files changed, 7 insertions(+), 6 deletions(-)
-
-diff --git a/src/KChart/Cartesian/DiagramFlavors/KChartNormalLyingBarDiagram_p.cpp b/src/KChart/Cartesian/DiagramFlavors/KChartNormalLyingBarDiagram_p.cpp
-index 0a262ee..d2343ee 100644
---- a/src/KChart/Cartesian/DiagramFlavors/KChartNormalLyingBarDiagram_p.cpp
-+++ b/src/KChart/Cartesian/DiagramFlavors/KChartNormalLyingBarDiagram_p.cpp
-@@ -158,13 +158,13 @@ void NormalLyingBarDiagram::paint( PaintContext* ctx )
- }
- }
-
-- for ( int column = 0; column < colCount; column++ ) {
-+ for ( int column = colCount-1; column >= 0; --column ) {
- // paint one group
- const CartesianDiagramDataCompressor::CachePosition position( row, column );
- const CartesianDiagramDataCompressor::DataPoint point = compressor().data( position );
- const QModelIndex sourceIndex = attributesModel()->mapToSource( point.index );
-
-- QPointF dataPoint( 0, rowCount - ( point.key + 0.5 ) );
-+ QPointF dataPoint( 0, ( point.key + 0.5 ) );
- const QPointF topLeft = ctx->coordinatePlane()->translate( dataPoint );
- dataPoint.rx() += point.value;
- const QPointF bottomRight = ctx->coordinatePlane()->translate( dataPoint ) +
-@@ -173,6 +173,7 @@ void NormalLyingBarDiagram::paint( PaintContext* ctx )
- const QRectF rect = QRectF( topLeft, bottomRight ).translated( 1.0, offset );
- m_private->addLabel( &lpc, sourceIndex, 0, PositionPoints( rect ), Position::North,
- Position::South, point.value );
-+
- paintBars( ctx, sourceIndex, rect, maxDepth );
-
- offset += barWidth + spaceBetweenBars;
-diff --git a/src/KChart/Cartesian/DiagramFlavors/KChartPercentLyingBarDiagram_p.cpp b/src/KChart/Cartesian/DiagramFlavors/KChartPercentLyingBarDiagram_p.cpp
-index fee53d3..10dca65 100644
---- a/src/KChart/Cartesian/DiagramFlavors/KChartPercentLyingBarDiagram_p.cpp
-+++ b/src/KChart/Cartesian/DiagramFlavors/KChartPercentLyingBarDiagram_p.cpp
-@@ -192,11 +192,11 @@ void PercentLyingBarDiagram::paint( PaintContext* ctx )
-
- QPointF point, previousPoint;
- if ( sumValuesVector.at( curRow ) != 0 && value > 0 ) {
-- QPointF dataPoint( ( stackedValues / sumValuesVector.at( curRow ) * maxValue ), rowCount - key );
-+ QPointF dataPoint( ( stackedValues / sumValuesVector.at( curRow ) * maxValue ), key + 1 );
- point = ctx->coordinatePlane()->translate( dataPoint );
- point.ry() += offset / 2 + threeDOffset;
-
-- previousPoint = ctx->coordinatePlane()->translate( QPointF( ( ( stackedValues - value) / sumValuesVector.at( curRow ) * maxValue ), rowCount - key ) );
-+ previousPoint = ctx->coordinatePlane()->translate( QPointF( ( ( stackedValues - value) / sumValuesVector.at( curRow ) * maxValue ), key + 1 ) );
- }
-
- const qreal barHeight = point.x() - previousPoint.x();
-diff --git a/src/KChart/Cartesian/DiagramFlavors/KChartStackedLyingBarDiagram_p.cpp b/src/KChart/Cartesian/DiagramFlavors/KChartStackedLyingBarDiagram_p.cpp
-index 70cbba0..1a5b003 100644
---- a/src/KChart/Cartesian/DiagramFlavors/KChartStackedLyingBarDiagram_p.cpp
-+++ b/src/KChart/Cartesian/DiagramFlavors/KChartStackedLyingBarDiagram_p.cpp
-@@ -184,9 +184,9 @@ void StackedLyingBarDiagram::paint( PaintContext* ctx )
- stackedValues += point.value;
- key = point.key;
- }
-- QPointF point = ctx->coordinatePlane()->translate( QPointF( stackedValues, rowCount - key ) );
-+ QPointF point = ctx->coordinatePlane()->translate( QPointF( stackedValues, key + 1 ) );
- point.ry() += offset / 2 + threeDOffset;
-- const QPointF previousPoint = ctx->coordinatePlane()->translate( QPointF( stackedValues - value, rowCount - key ) );
-+ const QPointF previousPoint = ctx->coordinatePlane()->translate( QPointF( stackedValues - value, key + 1 ) );
- const qreal barHeight = point.x() - previousPoint.x();
- point.rx() -= barHeight;
-
---
-cgit v1.1
diff --git a/dev-libs/kdiagram/kdiagram-2.6.1-r1.ebuild b/dev-libs/kdiagram/kdiagram-2.6.1-r1.ebuild
deleted file mode 100644
index 9ee52c2d9149..000000000000
--- a/dev-libs/kdiagram/kdiagram-2.6.1-r1.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
-
-ECM_EXAMPLES="true"
-ECM_QTHELP="true"
-ECM_TEST="true"
-QTMIN=5.12.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Powerful libraries (KChart, KGantt) for creating business diagrams"
-HOMEPAGE="https://api.kde.org/extragear-api/graphics-apidocs/kdiagram/html/index.html
-https://www.kdab.com/development-resources/qt-tools/kd-chart/"
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
- SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
- KEYWORDS="amd64 arm64 x86"
-fi
-
-LICENSE="GPL-2" # TODO CHECK
-SLOT="5"
-
-REQUIRED_USE="test? ( examples )"
-
-BDEPEND="
- >=dev-qt/linguist-tools-${QTMIN}:5
-"
-DEPEND="
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtprintsupport-${QTMIN}:5
- >=dev-qt/qtsvg-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/${P}-fix-horizontal-bars.patch" )
diff --git a/dev-libs/kdiagram/kdiagram-2.6.3.ebuild b/dev-libs/kdiagram/kdiagram-2.6.3.ebuild
index 3a28eac60d9f..12b840ff0e2e 100644
--- a/dev-libs/kdiagram/kdiagram-2.6.3.ebuild
+++ b/dev-libs/kdiagram/kdiagram-2.6.3.ebuild
@@ -16,7 +16,7 @@ https://www.kdab.com/development-resources/qt-tools/kd-chart/"
if [[ ${KDE_BUILD_TYPE} = release ]]; then
SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
- KEYWORDS="~amd64 ~arm64 ~x86"
+ KEYWORDS="amd64 arm64 x86"
fi
LICENSE="GPL-2" # TODO CHECK
diff --git a/dev-libs/libfmt/Manifest b/dev-libs/libfmt/Manifest
index 151bd564f699..0a0fbac1a381 100644
--- a/dev-libs/libfmt/Manifest
+++ b/dev-libs/libfmt/Manifest
@@ -1,2 +1,3 @@
DIST libfmt-6.1.2.tar.gz 723160 BLAKE2B 36e7451a8732c62dcbf47e6d287ea582827b6196a468b8648803ea1bc9a37a5f681d87488f748d749183d97783ac7fb47a3f2aeed64fc6a684f9ee85b67ae28d SHA512 8770bf4bd2bb6d938e75e0cf1e665c41930dbd9d2a6825274a5a43cd1d85b9c9ca621bb040ed099429f0e16bddbc3399361c453eb1bf3fc01376e6ad9dd875b7
DIST libfmt-6.2.0.tar.gz 733403 BLAKE2B c7ff69a56b90ec8df7d1af5c9934592449f2052046192aa498a6440d2aab76f10c17fa2833a41475b777dca2e3a1ae671021530bf0ef8be12443541f0f5212b3 SHA512 0003543f437bae416600a2b982eb133f65588bd36d7506fa7d883ae3133fcaf7ad825904af9b588ea22e5d91e56560aaf4243a6afa11ff6d8aace2e4bb1b0cee
+DIST libfmt-6.2.1.tar.gz 733646 BLAKE2B 74394efc67065bf7a2259f5c16521b1cc4fb08bd599fe99be86b97b712c60d8790f39d65257ab18fe95bcde3d115d97e91c41d23309596f279cf51ebd4d2957d SHA512 520ef3addfecd9796253c347e0ecf4c18ef2f86d3b1b6b714f7834741f4737f1b7ed8365d3be46c9186617898911b23680cad2ae3cb7aadaf641ab32e327b0dc
diff --git a/dev-libs/libfmt/libfmt-6.2.1.ebuild b/dev-libs/libfmt/libfmt-6.2.1.ebuild
new file mode 100644
index 000000000000..78c2d74959bb
--- /dev/null
+++ b/dev-libs/libfmt/libfmt-6.2.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS=cmake
+inherit cmake-multilib
+
+DESCRIPTION="Small, safe and fast formatting library"
+HOMEPAGE="https://github.com/fmtlib/fmt"
+
+LICENSE="MIT"
+IUSE="test"
+SLOT="0/$(ver_cut 1)"
+
+if [[ ${PV} == *9999 ]] ; then
+ EGIT_REPO_URI="https://github.com/fmtlib/fmt.git"
+ inherit git-r3
+else
+ SRC_URI="https://github.com/fmtlib/fmt/archive/${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+ S="${WORKDIR}/fmt-${PV}"
+fi
+
+DEPEND=""
+RDEPEND=""
+RESTRICT="!test? ( test )"
+
+multilib_src_configure() {
+ local mycmakeargs=(
+ -DFMT_CMAKE_DIR="$(get_libdir)/cmake/fmt"
+ -DFMT_LIB_DIR="$(get_libdir)"
+ -DFMT_TEST=$(usex test)
+ )
+ cmake_src_configure
+}
diff --git a/dev-libs/libpcre2/Manifest b/dev-libs/libpcre2/Manifest
index a8947feadd79..8497efa4857e 100644
--- a/dev-libs/libpcre2/Manifest
+++ b/dev-libs/libpcre2/Manifest
@@ -1,2 +1,3 @@
DIST libpcre2-10.34-patchset-01.tar.xz 1208 BLAKE2B 615b7eff085bd52bb3aed30c90ec5b8cec406f96c58bdfb0304dd59311517662067e68f85bc9930ed6f749820ecfe3c483e261616187bc1077ebb053670d4950 SHA512 d881665701bc330f237d19ee48491a81dc8b952b0b8e529eb83c3ffdf14710f68eb934f872ed76ef6b0bee1864261453e7e71e60e14217c004e4e12c6baa499f
DIST pcre2-10.34.tar.bz2 1714731 BLAKE2B f731339b3acdb084ddb1462cf4638edefbfc4a95e63e44c8c75ded55fd9b98334336dbda5f31bd8e9410e63ccd83dc7e707cc20f03df4d801f182ff4939b6cc6 SHA512 77ad75f8b0b8bbfc2f57932596151bca25b06bd621e0f047e476f38cd127f43e2052460b95c281a7e874aad2b7fd86c8f3413f4a323abb74b9440a42d0ee9524
+DIST pcre2-10.35.tar.bz2 1725214 BLAKE2B f97412258f0d2c09dc18c5973156e616730ae301713a0172fb2f467e5d2857bf64c6d02ac247e797ce4c96e2fb9b122888f71aede3f5eb3540731f6c3c254ed4 SHA512 ecfb8d48e219daff02874783b7b436fe7d70d8471e44eb66e1e29abb7b0aa67547e6b5fba7058b074ac90eef265ece7d12728f80afdda45b6b8124435f4561fd
diff --git a/dev-libs/libpcre2/libpcre2-10.35.ebuild b/dev-libs/libpcre2/libpcre2-10.35.ebuild
new file mode 100644
index 000000000000..89944f501ccb
--- /dev/null
+++ b/dev-libs/libpcre2/libpcre2-10.35.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic libtool multilib-minimal toolchain-funcs usr-ldscript
+
+PATCH_SET="${PN}-10.34-patchset-01.tar.xz"
+
+DESCRIPTION="Perl-compatible regular expression library"
+HOMEPAGE="https://www.pcre.org/"
+MY_P="pcre2-${PV/_rc/-RC}"
+if [[ ${PV} != *_rc* ]] ; then
+ # Only the final releases are available here.
+ SRC_URI="mirror://sourceforge/pcre/${MY_P}.tar.bz2
+ https://ftp.pcre.org/pub/pcre/${MY_P}.tar.bz2"
+else
+ SRC_URI="https://ftp.pcre.org/pub/pcre/Testing/${MY_P}.tar.bz2"
+fi
+
+if [[ -n "${PATCH_SET}" ]] ; then
+ SRC_URI+=" https://dev.gentoo.org/~whissi/dist/${PN}/${PATCH_SET}
+ https://dev.gentoo.org/~polynomial-c/dist/${PATCH_SET}"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="bzip2 +jit libedit pcre16 pcre32 +readline +recursion-limit static-libs unicode zlib"
+REQUIRED_USE="?? ( libedit readline )"
+
+BDEPEND="
+ virtual/pkgconfig
+ userland_GNU? ( >=sys-apps/findutils-4.4.0 )
+"
+RDEPEND="
+ bzip2? ( app-arch/bzip2 )
+ libedit? ( dev-libs/libedit )
+ readline? ( sys-libs/readline:0= )
+ zlib? ( sys-libs/zlib )
+"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+MULTILIB_CHOST_TOOLS=(
+ /usr/bin/pcre2-config
+)
+
+src_prepare() {
+ [[ -d "${WORKDIR}/patches" ]] && eapply "${WORKDIR}"/patches
+
+ default
+
+ elibtoolize
+}
+
+multilib_src_configure() {
+ local myeconfargs=(
+ --enable-pcre2-8
+ --enable-shared
+ --with-match-limit-depth=$(usex recursion-limit 8192 MATCH_LIMIT)
+ $(multilib_native_use_enable bzip2 pcre2grep-libbz2)
+ $(multilib_native_use_enable libedit pcre2test-libedit)
+ $(multilib_native_use_enable readline pcre2test-libreadline)
+ $(multilib_native_use_enable zlib pcre2grep-libz)
+ $(use_enable jit)
+ $(use_enable jit pcre2grep-jit)
+ $(use_enable pcre16 pcre2-16)
+ $(use_enable pcre32 pcre2-32)
+ $(use_enable static-libs static)
+ $(use_enable unicode)
+ )
+ ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_compile() {
+ emake V=1 $(multilib_is_native_abi || echo "bin_PROGRAMS=")
+}
+
+multilib_src_install() {
+ emake \
+ DESTDIR="${D}" \
+ $(multilib_is_native_abi || echo "bin_PROGRAMS= dist_html_DATA=") \
+ install
+ multilib_is_native_abi && gen_usr_ldscript -a pcre2-posix
+}
+
+multilib_src_install_all() {
+ find "${ED}" -type f -name "*.la" -delete || die
+}
diff --git a/dev-libs/rinutils/rinutils-0.4.0.ebuild b/dev-libs/rinutils/rinutils-0.4.0.ebuild
index fa04b75970b8..84f476ca6c2e 100644
--- a/dev-libs/rinutils/rinutils-0.4.0.ebuild
+++ b/dev-libs/rinutils/rinutils-0.4.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/shlomif/${PN}/releases/download/${PV}/${P}.tar.xz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
src_configure() {
local mycmakeargs=(
diff --git a/dev-php/Manifest.gz b/dev-php/Manifest.gz
index 2185a306c745..e50aa3f3c61a 100644
Binary files a/dev-php/Manifest.gz and b/dev-php/Manifest.gz differ
diff --git a/dev-php/PEAR-Crypt_CHAP/PEAR-Crypt_CHAP-1.5.0-r3.ebuild b/dev-php/PEAR-Crypt_CHAP/PEAR-Crypt_CHAP-1.5.0-r3.ebuild
index 9b6018f6ea74..b85782cf6a84 100644
--- a/dev-php/PEAR-Crypt_CHAP/PEAR-Crypt_CHAP-1.5.0-r3.ebuild
+++ b/dev-php/PEAR-Crypt_CHAP/PEAR-Crypt_CHAP-1.5.0-r3.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Generating CHAP packets"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ia64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~hppa ~ia64 ~ppc64 ~sparc ~x86"
IUSE="test"
RESTRICT="!test? ( test )"
# Crypt_CHAP_MSv1 needs mcrypt which is gone in 7.2+
diff --git a/dev-php/PEAR-File_SMBPasswd/PEAR-File_SMBPasswd-1.0.3-r1.ebuild b/dev-php/PEAR-File_SMBPasswd/PEAR-File_SMBPasswd-1.0.3-r1.ebuild
index 16b5fcac23e4..0a284fedeb2f 100644
--- a/dev-php/PEAR-File_SMBPasswd/PEAR-File_SMBPasswd-1.0.3-r1.ebuild
+++ b/dev-php/PEAR-File_SMBPasswd/PEAR-File_SMBPasswd-1.0.3-r1.ebuild
@@ -7,7 +7,7 @@ inherit php-pear-r2
DESCRIPTION="Class for managing SAMBA style password files"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="amd64 ~hppa ~ia64 ~sparc ~x86"
+KEYWORDS="amd64 ~hppa ~ia64 ~ppc64 ~sparc ~x86"
IUSE=""
RDEPEND=">=dev-lang/php-5.3:*
>=dev-php/PEAR-Crypt_CHAP-1.0.0"
diff --git a/dev-php/pecl-mcrypt/pecl-mcrypt-1.0.3.ebuild b/dev-php/pecl-mcrypt/pecl-mcrypt-1.0.3.ebuild
index add2c0d31741..fffb03d449aa 100644
--- a/dev-php/pecl-mcrypt/pecl-mcrypt-1.0.3.ebuild
+++ b/dev-php/pecl-mcrypt/pecl-mcrypt-1.0.3.ebuild
@@ -15,7 +15,7 @@ inherit php-ext-pecl-r3
DESCRIPTION="Bindings for the libmcrypt library"
LICENSE="PHP-3.01"
SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ia64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~hppa ~ia64 ~ppc64 ~sparc ~x86"
DEPEND="dev-libs/libmcrypt"
RDEPEND="${DEPEND}"
diff --git a/dev-python/BitVector/BitVector-3.4.9.ebuild b/dev-python/BitVector/BitVector-3.4.9.ebuild
index 735899359764..563c11c30c40 100644
--- a/dev-python/BitVector/BitVector-3.4.9.ebuild
+++ b/dev-python/BitVector/BitVector-3.4.9.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://engineering.purdue.edu/kak/dist/ https://pypi.org/project/BitV
SRC_URI="https://engineering.purdue.edu/kak/dist/${P}.tar.gz"
LICENSE="PSF-2"
SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="test"
RESTRICT="!test? ( test )"
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/GitPython/GitPython-3.1.1.ebuild b/dev-python/GitPython/GitPython-3.1.1.ebuild
index 5a2501f83968..828e9672b499 100644
--- a/dev-python/GitPython/GitPython-3.1.1.ebuild
+++ b/dev-python/GitPython/GitPython-3.1.1.ebuild
@@ -23,7 +23,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz
LICENSE="BSD"
SLOT="0"
-KEYWORDS="amd64 arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm64 x86 ~amd64-linux ~x86-linux"
RDEPEND="
dev-vcs/git
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index ab5192790909..ad15a86b2cfc 100644
Binary files a/dev-python/Manifest.gz and b/dev-python/Manifest.gz differ
diff --git a/dev-python/PyRSS2Gen/PyRSS2Gen-1.1.ebuild b/dev-python/PyRSS2Gen/PyRSS2Gen-1.1-r1.ebuild
similarity index 84%
rename from dev-python/PyRSS2Gen/PyRSS2Gen-1.1.ebuild
rename to dev-python/PyRSS2Gen/PyRSS2Gen-1.1-r1.ebuild
index 2c5e40a8cba8..b8aae6657b2b 100644
--- a/dev-python/PyRSS2Gen/PyRSS2Gen-1.1.ebuild
+++ b/dev-python/PyRSS2Gen/PyRSS2Gen-1.1-r1.ebuild
@@ -1,8 +1,10 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
-PYTHON_COMPAT=( python3_6 )
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+DISTUTILS_USE_SETUPTOOLS=no
inherit distutils-r1
@@ -13,4 +15,3 @@ SRC_URI="http://www.dalkescientific.com/Python/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
KEYWORDS="amd64 x86"
-IUSE=""
diff --git a/dev-python/QtPy/QtPy-1.9.0-r2.ebuild b/dev-python/QtPy/QtPy-1.9.0-r2.ebuild
index 8448fcdcc034..d4497c544268 100644
--- a/dev-python/QtPy/QtPy-1.9.0-r2.ebuild
+++ b/dev-python/QtPy/QtPy-1.9.0-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="designer gui opengl svg testlib webengine"
RDEPEND="
diff --git a/dev-python/ansi2html/ansi2html-1.5.2.ebuild b/dev-python/ansi2html/ansi2html-1.5.2.ebuild
index dbe978a6042c..8f6a5190749c 100644
--- a/dev-python/ansi2html/ansi2html-1.5.2.ebuild
+++ b/dev-python/ansi2html/ansi2html-1.5.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="LGPL-3+"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 arm x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/argcomplete/argcomplete-1.11.1-r1.ebuild b/dev-python/argcomplete/argcomplete-1.11.1-r1.ebuild
index b8764d725fa4..a05a6d23449c 100644
--- a/dev-python/argcomplete/argcomplete-1.11.1-r1.ebuild
+++ b/dev-python/argcomplete/argcomplete-1.11.1-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/autobahn/autobahn-20.4.3.ebuild b/dev-python/autobahn/autobahn-20.4.3.ebuild
index b9380e38dc98..396e8da241b2 100644
--- a/dev-python/autobahn/autobahn-20.4.3.ebuild
+++ b/dev-python/autobahn/autobahn-20.4.3.ebuild
@@ -71,8 +71,8 @@ python_test() {
python_install_all() {
distutils-r1_python_install_all
- # delete the dropin.cache so we don't have collisions
- rm "${D}"/usr/lib*/python*/site-packages/twisted/plugins//dropin.cache || die
+ # delete the dropin.cache so we don't have collisions if it exists
+ rm "${D}"/usr/lib*/python*/site-packages/twisted/plugins//dropin.cache > /dev/null
}
pkg_postinst() {
diff --git a/dev-python/beautifulsoup/beautifulsoup-4.8.2.ebuild b/dev-python/beautifulsoup/beautifulsoup-4.8.2.ebuild
index b3caab2e8556..5909b953a352 100644
--- a/dev-python/beautifulsoup/beautifulsoup-4.8.2.ebuild
+++ b/dev-python/beautifulsoup/beautifulsoup-4.8.2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
LICENSE="MIT"
SLOT="4"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86"
# html5lib is optional however hard coding since its use is actively discouraged in the devmanual
RDEPEND="
diff --git a/dev-python/betamax/betamax-0.8.1.ebuild b/dev-python/betamax/betamax-0.8.1.ebuild
index 4b6c873d8b0d..4bdaeeb01282 100644
--- a/dev-python/betamax/betamax-0.8.1.ebuild
+++ b/dev-python/betamax/betamax-0.8.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ppc64 ~sparc x86"
IUSE="test"
RDEPEND="dev-python/requests[${PYTHON_USEDEP}]"
diff --git a/dev-python/bitstring/bitstring-3.1.6.ebuild b/dev-python/bitstring/bitstring-3.1.6.ebuild
index 2a59cf36bde2..57771fd55f93 100644
--- a/dev-python/bitstring/bitstring-3.1.6.ebuild
+++ b/dev-python/bitstring/bitstring-3.1.6.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://github.com/scott-griffiths/bitstring"
SRC_URI="https://github.com/scott-griffiths/${PN}/archive/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
IUSE="test"
RESTRICT="!test? ( test )"
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/blessings/blessings-1.7-r1.ebuild b/dev-python/blessings/blessings-1.7-r1.ebuild
index 81fd061d5abf..d9b166b70bc5 100644
--- a/dev-python/blessings/blessings-1.7-r1.ebuild
+++ b/dev-python/blessings/blessings-1.7-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/erikrose/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
SLOT="0"
LICENSE="MIT"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
IUSE="doc test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/chameleon/chameleon-3.7.0.ebuild b/dev-python/chameleon/chameleon-3.7.0.ebuild
index da9e94fee7c5..691d011358e2 100644
--- a/dev-python/chameleon/chameleon-3.7.0.ebuild
+++ b/dev-python/chameleon/chameleon-3.7.0.ebuild
@@ -16,6 +16,6 @@ SRC_URI="
LICENSE="repoze"
SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
distutils_enable_tests setup.py
diff --git a/dev-python/commonmark/commonmark-0.9.1.ebuild b/dev-python/commonmark/commonmark-0.9.1.ebuild
index 6ee997312157..769345825071 100644
--- a/dev-python/commonmark/commonmark-0.9.1.ebuild
+++ b/dev-python/commonmark/commonmark-0.9.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/curtsies/curtsies-0.3.0-r2.ebuild b/dev-python/curtsies/curtsies-0.3.0-r2.ebuild
index 8b80bac006ee..72e5411576e2 100644
--- a/dev-python/curtsies/curtsies-0.3.0-r2.ebuild
+++ b/dev-python/curtsies/curtsies-0.3.0-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
SLOT="0"
LICENSE="MIT"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/cx_Freeze/cx_Freeze-6.1.ebuild b/dev-python/cx_Freeze/cx_Freeze-6.1.ebuild
index 30ace6e5dca5..66538ec88265 100644
--- a/dev-python/cx_Freeze/cx_Freeze-6.1.ebuild
+++ b/dev-python/cx_Freeze/cx_Freeze-6.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="PYTHON"
SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
PATCHES=(
"${FILESDIR}/${PN}-5.0.2-buildsystem.patch" # bug #491602
diff --git a/dev-python/dbus-python/Manifest b/dev-python/dbus-python/Manifest
index cd0ce5fb0149..40ba4cdce245 100644
--- a/dev-python/dbus-python/Manifest
+++ b/dev-python/dbus-python/Manifest
@@ -1,4 +1 @@
-DIST dbus-python-1.2.12.tar.gz 574727 BLAKE2B e5516e7109fad089af51d3e5db3921d056f327c27f9b74a870b1b31b04ba952ad3c9ba5916a18d674ab1179b94cf516b24e046feded8f2e542b196d162038944 SHA512 6f90eaeeb74ea71a026a331d4c611911eda6dfb6c9086a0a80352f9963a9ae126db6f3e32d183916b8517f177fc947f1ddb15df83ff0b5c886532116868383b4
-DIST dbus-python-1.2.14.tar.gz 576181 BLAKE2B 4e36c3d0ed07ce6c7514e2699b6cf5d0a75332c8dab3ca90e2d451d6649c26f61b2173b4b7f230c54df2b9f4214d0f3c54a45c233d6e8fd38bf39a6312f480fc SHA512 773d66e40ab514639f1c5c619362659f290ddd5ae944eb8e09b5752624f3c86305b6c1d5562e290b36f1e6cf43f6d39cd4a227e18ff41499877546982ceebb51
DIST dbus-python-1.2.16.tar.gz 576701 BLAKE2B 58d9f9ea092cd3a6b872c084a6159baf03f1aab615282e161a0e3da1d01ff5f4940862e693d21907b0c146d285b9067386759a1306ae2e6907f5e2ff4ef9944d SHA512 e76c00c5fd3fe6884e4c24f258987fd3b80d21bd4e0f96aa8fda152078a860b62321324f6efcbfe7226d5ab2521a14b5bda7cf2468d2cae5f376c124a71aa05c
-DIST dbus-python-1.2.4.tar.gz 612112 BLAKE2B cccd3e2f5d700c0d228e7d21fd85e2307357778371742a7fe26a0e419af41886efebb27a73f642d2ecd4603c79f4afe6e7002af95c831180e0e7844c079b2c8c SHA512 efdd9d96a8b56e813c93208d34777f1ca2db96c076d31f13afbcaec3c7770a16a623d5531fe23443130c555240949802503f171f2064d45eee97546d6251304b
diff --git a/dev-python/dbus-python/dbus-python-1.2.12.ebuild b/dev-python/dbus-python/dbus-python-1.2.12.ebuild
deleted file mode 100644
index f540a4a3c54c..000000000000
--- a/dev-python/dbus-python/dbus-python-1.2.12.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit autotools python-r1
-
-DESCRIPTION="Python bindings for the D-Bus messagebus"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/DBusBindings https://dbus.freedesktop.org/doc/dbus-python/"
-SRC_URI="https://dbus.freedesktop.org/releases/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc ~x86"
-
-IUSE="doc examples test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="${PYTHON_DEPS}
- >=sys-apps/dbus-1.8:=
- >=dev-libs/glib-2.40
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
- dev-python/setuptools[${PYTHON_USEDEP}]
- virtual/pkgconfig
- doc? ( $(python_gen_any_dep 'dev-python/sphinx[${PYTHON_USEDEP}]') )
- test? ( dev-python/pygobject:3[${PYTHON_USEDEP}]
- dev-python/tappy[${PYTHON_USEDEP}] )
-"
-
-python_check_deps() {
- has_version "dev-python/sphinx[${PYTHON_USEDEP}]"
-}
-
-src_prepare() {
- default
- # Update py-compile, bug 529502.
- eautoreconf
- python_copy_sources
-}
-
-src_configure() {
- use doc && python_setup
- local SPHINX_IMPL=${EPYTHON}
-
- configuring() {
- local myconf=(
- --disable-documentation
- )
- [[ ${EPYTHON} == ${SPHINX_IMPL} ]] &&
- myconf+=( --enable-documentation )
-
- econf "${myconf[@]}"
- }
- python_foreach_impl run_in_build_dir configuring
-}
-
-src_compile() {
- python_foreach_impl run_in_build_dir default
-}
-
-src_test() {
- unset DBUS_SESSION_BUS_ADDRESS
- python_foreach_impl run_in_build_dir default
-}
-
-src_install() {
- python_foreach_impl run_in_build_dir default
- find "${D}" -name '*.la' -type f -delete || die
-
- use examples && dodoc -r examples
-}
diff --git a/dev-python/dbus-python/dbus-python-1.2.14.ebuild b/dev-python/dbus-python/dbus-python-1.2.14.ebuild
deleted file mode 100644
index b0cfa46ec0a6..000000000000
--- a/dev-python/dbus-python/dbus-python-1.2.14.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit autotools python-r1
-
-DESCRIPTION="Python bindings for the D-Bus messagebus"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/DBusBindings https://dbus.freedesktop.org/doc/dbus-python/"
-SRC_URI="https://dbus.freedesktop.org/releases/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86"
-
-IUSE="doc examples test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="${PYTHON_DEPS}
- >=sys-apps/dbus-1.8:=
- >=dev-libs/glib-2.40
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
- virtual/pkgconfig
- doc? ( $(python_gen_any_dep 'dev-python/sphinx[${PYTHON_USEDEP}]') )
- test? ( dev-python/pygobject:3[${PYTHON_USEDEP}]
- dev-python/tappy[${PYTHON_USEDEP}] )
-"
-
-python_check_deps() {
- has_version "dev-python/sphinx[${PYTHON_USEDEP}]"
-}
-
-src_prepare() {
- default
- # Update py-compile, bug 529502.
- eautoreconf
- python_copy_sources
-}
-
-src_configure() {
- use doc && python_setup
- local SPHINX_IMPL=${EPYTHON}
-
- configuring() {
- local myconf=(
- --disable-documentation
- )
- [[ ${EPYTHON} == ${SPHINX_IMPL} ]] &&
- myconf+=( --enable-documentation )
-
- econf "${myconf[@]}"
- }
- python_foreach_impl run_in_build_dir configuring
-}
-
-src_compile() {
- python_foreach_impl run_in_build_dir default
-}
-
-src_test() {
- unset DBUS_SESSION_BUS_ADDRESS
- python_foreach_impl run_in_build_dir default
-}
-
-src_install() {
- python_foreach_impl run_in_build_dir default
- find "${D}" -name '*.la' -type f -delete || die
-
- use examples && dodoc -r examples
-}
diff --git a/dev-python/dbus-python/dbus-python-1.2.16.ebuild b/dev-python/dbus-python/dbus-python-1.2.16.ebuild
index b0cfa46ec0a6..d7512b4dc8f8 100644
--- a/dev-python/dbus-python/dbus-python-1.2.16.ebuild
+++ b/dev-python/dbus-python/dbus-python-1.2.16.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://dbus.freedesktop.org/releases/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-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"
IUSE="doc examples test"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-python/dbus-python/dbus-python-1.2.4.ebuild b/dev-python/dbus-python/dbus-python-1.2.4.ebuild
deleted file mode 100644
index dcae4ce23b1e..000000000000
--- a/dev-python/dbus-python/dbus-python-1.2.4.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_6 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit autotools eutils ltprune python-r1
-
-DESCRIPTION="Python bindings for the D-Bus messagebus"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/DBusBindings https://dbus.freedesktop.org/doc/dbus-python/"
-SRC_URI="https://dbus.freedesktop.org/releases/${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 ~m68k-mint"
-IUSE="doc examples test"
-RESTRICT="!test? ( test )"
-# API docs generated with epydoc, which is python2-only
-REQUIRED_USE="
- ${PYTHON_REQUIRED_USE}
- doc? ( python_targets_python2_7 )"
-
-RDEPEND="
- >=dev-libs/dbus-glib-0.100:=
- >=sys-apps/dbus-1.6:=
- ${PYTHON_DEPS}"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- doc? (
- dev-python/docutils[python_targets_python2_7?]
- =dev-python/epydoc-3*[python_targets_python2_7?] )
- test? ( dev-python/pygobject:3[${PYTHON_USEDEP}] )"
-
-src_prepare() {
- default
- # Update py-compile, bug 529502.
- eautoreconf
- python_copy_sources
-}
-
-src_configure() {
- configuring() {
- local PYTHON_CONFIG
- python_export PYTHON_CONFIG
-
- # epydoc is python2-only, bug #447642
- local apidocs=--disable-api-docs
- [[ ${EPYTHON/.*} = "python2" ]] && apidocs=$(use_enable doc api-docs)
-
- econf \
- --disable-html-docs \
- ${apidocs} \
- PYTHON_INCLUDES="$(${PYTHON_CONFIG} --includes)" \
- PYTHON_LIBS="$(${PYTHON_CONFIG} --ldflags)"
- # configure assumes that ${PYTHON}-config executable exists :/
- }
- python_foreach_impl run_in_build_dir configuring
-}
-
-src_compile() {
- python_foreach_impl run_in_build_dir default
-}
-
-src_test() {
- unset DBUS_SESSION_BUS_ADDRESS
- python_foreach_impl run_in_build_dir default
-}
-
-src_install() {
- installing() {
- default
- [[ ${EPYTHON/.*} = "python2" ]] && use doc && dohtml -r api/*
- }
- python_foreach_impl run_in_build_dir installing
- prune_libtool_files --modules
-
- if use examples; then
- insinto /usr/share/doc/${PF}
- doins -r examples
- fi
-}
-
-run_in_build_dir() {
- pushd "${BUILD_DIR}" > /dev/null || die
- "$@"
- popd > /dev/null
-}
diff --git a/dev-python/decorator/decorator-4.4.2.ebuild b/dev-python/decorator/decorator-4.4.2.ebuild
index fdc48c81440b..226861ef6e25 100644
--- a/dev-python/decorator/decorator-4.4.2.ebuild
+++ b/dev-python/decorator/decorator-4.4.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
DOCS=( CHANGES.md )
diff --git a/dev-python/diff-match-patch/metadata.xml b/dev-python/diff-match-patch/metadata.xml
index 276558d29c21..f93a14b3b79d 100644
--- a/dev-python/diff-match-patch/metadata.xml
+++ b/dev-python/diff-match-patch/metadata.xml
@@ -1,10 +1,6 @@
-
- aidecoe@gentoo.org
- Amadeusz Żołnowski
-
python@gentoo.org
Python
diff --git a/dev-python/dkimpy/metadata.xml b/dev-python/dkimpy/metadata.xml
index 0c13f3889997..83c7605ab5ba 100644
--- a/dev-python/dkimpy/metadata.xml
+++ b/dev-python/dkimpy/metadata.xml
@@ -1,10 +1,7 @@
-
- aidecoe@gentoo.org
- Amadeusz Żołnowski
-
+
Python module that implements DKIM (DomainKeys Identified Mail) email
signing and verification. It also provides helper scripts for command
diff --git a/dev-python/docutils/docutils-0.16.ebuild b/dev-python/docutils/docutils-0.16.ebuild
index 7ce9aab7e004..462d023f8a46 100644
--- a/dev-python/docutils/docutils-0.16.ebuild
+++ b/dev-python/docutils/docutils-0.16.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD-2 GPL-3 public-domain"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/gitdb/gitdb-4.0.4.ebuild b/dev-python/gitdb/gitdb-4.0.4.ebuild
index dff18f27efde..7bf8943e92ef 100644
--- a/dev-python/gitdb/gitdb-4.0.4.ebuild
+++ b/dev-python/gitdb/gitdb-4.0.4.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="amd64 arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
RDEPEND="
>=dev-python/smmap-3.0.1[${PYTHON_USEDEP}]"
diff --git a/dev-python/ldap3/ldap3-2.7.ebuild b/dev-python/ldap3/ldap3-2.7.ebuild
index e61d2096ba89..51421a4da5f8 100644
--- a/dev-python/ldap3/ldap3-2.7.ebuild
+++ b/dev-python/ldap3/ldap3-2.7.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/cannatag/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="LGPL-3"
SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
RDEPEND="
>=dev-python/pyasn1-0.4.8[${PYTHON_USEDEP}]
diff --git a/dev-python/llvmlite/Manifest b/dev-python/llvmlite/Manifest
index aee8d21a2e8e..1164e21cbb25 100644
--- a/dev-python/llvmlite/Manifest
+++ b/dev-python/llvmlite/Manifest
@@ -1,2 +1,3 @@
DIST llvmlite-0.29.0.gh.tar.gz 196507 BLAKE2B d4870ca042d446857b7409c0c50c370458747ee744c24611e88da4bc8780c26125b2e8db3db7fe9d4f553f9aae5769b62effe1ac94cfaf234bab54d43c8086e9 SHA512 8735b46b1a3053b89306bf6e05c8c6c375d15371d33635f1d27e5533d7a78a85f773e04b7ed8d39ebab40a892c374839e1324665d81459cb797f760d6d2c81d1
DIST llvmlite-0.30.0.gh.tar.gz 199354 BLAKE2B 71ba1b0572d115a28d838a7fa5daca136fb793d41cdebca5834d2977813b4a02837e99d8b1b48d0fa965c5d3bdfe7783314ecbd2a7e7075b82247ea5fa4f90a4 SHA512 e3a64a3170efe1bffb6eeb8d6cfdc5a9bf8cc9e123da0b317b6b8dd93dacd3a54d5117c22eca43226915e7ff2793ab66cdee00c5e6ada442d9c2f7fed6e40763
+DIST llvmlite-0.32.1.gh.tar.gz 194191 BLAKE2B 4d35ce0f4903a17285b6f6296f0260787cc102804f1144c1b329815d41ca7471e1942aaecac26f06aa76804cc1b8a77130063de22376c78f30819554e459716f SHA512 00ce075deb8048350f4d4ac23e2e8a629b7c12aefefe3855e430aaf5e2df8170cf97a043001397a84101a7d0065671b30eb327837b24f86dd36b855309c19bfa
diff --git a/dev-python/llvmlite/llvmlite-0.32.1.ebuild b/dev-python/llvmlite/llvmlite-0.32.1.ebuild
new file mode 100644
index 000000000000..a733f9617dcc
--- /dev/null
+++ b/dev-python/llvmlite/llvmlite-0.32.1.ebuild
@@ -0,0 +1,66 @@
+# 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 llvm
+
+DESCRIPTION="Python wrapper around the llvm C++ library"
+HOMEPAGE="https://llvmlite.pydata.org/"
+SRC_URI="https://github.com/numba/llvmlite/archive/v${PV/_/}.tar.gz -> ${P/_/}.gh.tar.gz"
+S=${WORKDIR}/${P/_/}
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="examples"
+
+LLVM_MAX_SLOT=9
+
+RDEPEND="
+ sys-devel/llvm:${LLVM_MAX_SLOT}
+ sys-libs/zlib:0=
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+ # test_version hardcodes permitted versions
+ # test_parse* relies on exact error message
+ sed -e 's:test_version:_&:' \
+ -e 's:test_parse_bitcode_error:_&:' \
+ -i llvmlite/tests/test_binding.py || die
+
+ distutils-r1_src_prepare
+}
+
+python_configure_all() {
+ # upstream's build system is just horrible, and they ignored the PR
+ # fixing it, so let's build the shared lib properly using implicit
+ # make rules
+
+ export LDLIBS=$(llvm-config --libs all)
+ export CXXFLAGS="$(llvm-config --cxxflags) -fPIC ${CXXFLAGS}"
+ export LDFLAGS="$(llvm-config --ldflags) ${LDFLAGS}"
+
+ local files=( ffi/*.cpp )
+ emake -f - <
+
+
+
+ bircoph@gentoo.org
+ Andrew Savchenko
+
+
+ A set of modules for analyzing and playing with the mechanics of python pickles.
+ Features:
+ * Forgiving: Extracts as much data as possible from the pickle, even if class definitions are unavailable.
+ * Safe: You can safely unpickle data structures from unknown sources
+ * Easy to use: Tools are provided which make it possible to code around the unpickled datastructures as if they were created from the actual class definitions.
+ * Customizeable: Most functionality is easily subclassable to suit your needs.
+ * Create pickles as if you were writing python: Via a few constructs it's possible to create custom pickles with the ease of writing normal python.
+ * Works in both python 2 and 3
+
+
+ CensoredUsername/picklemagic
+
+
diff --git a/dev-python/picklemagic/picklemagic-0.0_pre20160415.ebuild b/dev-python/picklemagic/picklemagic-0.0_pre20160415.ebuild
new file mode 100644
index 000000000000..66c0a794e6ba
--- /dev/null
+++ b/dev-python/picklemagic/picklemagic-0.0_pre20160415.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_{6,7,8}} )
+inherit python-r1
+
+SRC_URI="https://dev.gentoo.org/~bircoph/distfiles/${P}.tar.xz"
+KEYWORDS="~amd64 ~x86"
+DESCRIPTION="A library for analysing python pickles safely"
+HOMEPAGE="https://github.com/CensoredUsername/picklemagic"
+LICENSE="WTFPL-2"
+SLOT="0"
+IUSE="doc"
+
+BDEPEND="doc? ( dev-python/sphinx )"
+DEPEND="${PYTHON_DEPS}"
+RDEPEND="${DEPEND}"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+src_compile() {
+ use doc && emake -C doc html
+}
+
+src_install() {
+ default
+ python_foreach_impl python_domodule *.py
+ use doc && dodoc -r doc/build/html
+}
diff --git a/dev-python/piexif/piexif-1.1.3.ebuild b/dev-python/piexif/piexif-1.1.3.ebuild
index cce3fb7562b3..0577ea544dd2 100644
--- a/dev-python/piexif/piexif-1.1.3.ebuild
+++ b/dev-python/piexif/piexif-1.1.3.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( pypy3 python3_{6,7} )
+PYTHON_COMPAT=( pypy3 python3_{6,7,8} )
inherit distutils-r1
@@ -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 )"
@@ -24,5 +24,5 @@ DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
RDEPEND=""
python_test() {
- "${PYTHON}" setup.py test
+ "${PYTHON}" setup.py test || die
}
diff --git a/dev-python/pip/pip-20.0.2.ebuild b/dev-python/pip/pip-20.0.2.ebuild
index d57ad4ff5954..97704d0af514 100644
--- a/dev-python/pip/pip-20.0.2.ebuild
+++ b/dev-python/pip/pip-20.0.2.ebuild
@@ -25,7 +25,7 @@ SRC_URI="
# setuptools & wheel .whl files are required for testing, exact version is not very important.
LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~ia64 ppc ppc64 sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 sparc ~x86"
SLOT="0"
IUSE="test -vanilla"
diff --git a/dev-python/ply/ply-3.11.ebuild b/dev-python/ply/ply-3.11.ebuild
index 49e25985f91c..b9c1bcae57eb 100644
--- a/dev-python/ply/ply-3.11.ebuild
+++ b/dev-python/ply/ply-3.11.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="examples"
RDEPEND=""
diff --git a/dev-python/potr/metadata.xml b/dev-python/potr/metadata.xml
index 0bfe99d903ae..2f5540da1e6e 100644
--- a/dev-python/potr/metadata.xml
+++ b/dev-python/potr/metadata.xml
@@ -1,10 +1,7 @@
-
- aidecoe@gentoo.org
- Amadeusz Żołnowski
-
+
This is a pure Python OTR implementation; it does not bind to libotr.
diff --git a/dev-python/poyo/poyo-0.5.0.ebuild b/dev-python/poyo/poyo-0.5.0.ebuild
index a444d2233d60..1a42e187e097 100644
--- a/dev-python/poyo/poyo-0.5.0.ebuild
+++ b/dev-python/poyo/poyo-0.5.0.ebuild
@@ -12,6 +12,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
distutils_enable_tests pytest
diff --git a/dev-python/precis-i18n/metadata.xml b/dev-python/precis-i18n/metadata.xml
index 252b16c4bd62..59daf2ee8ffa 100644
--- a/dev-python/precis-i18n/metadata.xml
+++ b/dev-python/precis-i18n/metadata.xml
@@ -1,9 +1,7 @@
-
- aidecoe@gentoo.org
-
+
PRECIS-i18n: Internationalized Usernames and Passwords
diff --git a/dev-python/pybind11/pybind11-2.4.3.ebuild b/dev-python/pybind11/pybind11-2.4.3.ebuild
index a2604ecd8e8d..44b91dbec22b 100644
--- a/dev-python/pybind11/pybind11-2.4.3.ebuild
+++ b/dev-python/pybind11/pybind11-2.4.3.ebuild
@@ -13,5 +13,5 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
IUSE=""
diff --git a/dev-python/pycurl/files/pycurl-7.43.0.5-cc-cflags.patch b/dev-python/pycurl/files/pycurl-7.43.0.5-cc-cflags.patch
new file mode 100644
index 000000000000..b1e66e0942d1
--- /dev/null
+++ b/dev-python/pycurl/files/pycurl-7.43.0.5-cc-cflags.patch
@@ -0,0 +1,34 @@
+From 861ba3143001caf2623ce5d84a1d04a69b502339 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?=
+Date: Mon, 11 May 2020 08:52:04 +0200
+Subject: [PATCH 1/2] Support overriding CC, respect *FLAGS in fake-curl
+
+The shipped libraries (obviously) do not work on non-amd64 platforms,
+and rebuilding without the correct compiler and flags does not work
+on more complex setups such as ppc64 with 32-bit userland. Make
+the Makefile permit CC override while preserving the current default,
+and use user-provided CFLAGS, CPPFLAGS and LDFLAGS.
+---
+ tests/fake-curl/libcurl/Makefile | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/tests/fake-curl/libcurl/Makefile b/tests/fake-curl/libcurl/Makefile
+index b05bc89..8ece206 100644
+--- a/tests/fake-curl/libcurl/Makefile
++++ b/tests/fake-curl/libcurl/Makefile
+@@ -7,8 +7,11 @@ all: \
+
+ .SUFFIXES: .c .so
+
++CC = `curl-config --cc`
++CFLAGS += `curl-config --cflags`
++
+ .c.so:
+- `curl-config --cc` `curl-config --cflags` -shared -fPIC \
++ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -shared -fPIC \
+ -Wl,-soname,$@ -o $@ $<
+
+ show-targets:
+--
+2.26.2
+
diff --git a/dev-python/pycurl/pycurl-7.43.0.5.ebuild b/dev-python/pycurl/pycurl-7.43.0.5.ebuild
index 476a879faeae..1de044968e9a 100644
--- a/dev-python/pycurl/pycurl-7.43.0.5.ebuild
+++ b/dev-python/pycurl/pycurl-7.43.0.5.ebuild
@@ -6,7 +6,7 @@ EAPI=7
# The selftests fail with pypy, and urlgrabber segfaults for me.
PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
-inherit distutils-r1
+inherit distutils-r1 toolchain-funcs
DESCRIPTION="python binding for curl/libcurl"
HOMEPAGE="
@@ -46,11 +46,10 @@ DEPEND="${RDEPEND}
net-misc/curl[curl_ssl_gnutls(-)=,curl_ssl_libressl(-)=,curl_ssl_nss(-)=,curl_ssl_openssl(-)=,-curl_ssl_axtls(-),-curl_ssl_cyassl(-),http2]
>=dev-python/bottle-0.12.7[${PYTHON_USEDEP}]
)"
-# Needed for individual runs of testsuite by python impls.
-DISTUTILS_IN_SOURCE_BUILD=1
PATCHES=(
"${FILESDIR}"/pycurl-7.43.0.5-telnet-test.patch
+ "${FILESDIR}"/pycurl-7.43.0.5-cc-cflags.patch
)
python_prepare_all() {
@@ -66,7 +65,7 @@ python_configure_all() {
src_test() {
# upstream bundles precompiled amd64 libs
rm tests/fake-curl/libcurl/*.so || die
- emake -C tests/fake-curl/libcurl
+ emake -C tests/fake-curl/libcurl CC="$(tc-getCC)"
distutils-r1_src_test
}
diff --git a/dev-python/pyftpdlib/pyftpdlib-1.5.6.ebuild b/dev-python/pyftpdlib/pyftpdlib-1.5.6.ebuild
index 7dc7796f0dba..062c5d9487a9 100644
--- a/dev-python/pyftpdlib/pyftpdlib-1.5.6.ebuild
+++ b/dev-python/pyftpdlib/pyftpdlib-1.5.6.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
IUSE="examples ssl test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/pygments/pygments-2.6.1.ebuild b/dev-python/pygments/pygments-2.6.1.ebuild
index 8ef03f743243..4305b86d23ed 100644
--- a/dev-python/pygments/pygments-2.6.1.ebuild
+++ b/dev-python/pygments/pygments-2.6.1.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/pygpgme/metadata.xml b/dev-python/pygpgme/metadata.xml
index f8b82e891f39..e655296bf6aa 100644
--- a/dev-python/pygpgme/metadata.xml
+++ b/dev-python/pygpgme/metadata.xml
@@ -1,10 +1,6 @@
-
- aidecoe@gentoo.org
- Amadeusz Żołnowski
-
python@gentoo.org
Python
diff --git a/dev-python/pylint/pylint-2.4.4-r1.ebuild b/dev-python/pylint/pylint-2.4.4-r1.ebuild
index 2be2d5797724..dea212ba1bc5 100644
--- a/dev-python/pylint/pylint-2.4.4-r1.ebuild
+++ b/dev-python/pylint/pylint-2.4.4-r1.ebuild
@@ -19,7 +19,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86"
IUSE="examples test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/pyphen/pyphen-0.9.5.ebuild b/dev-python/pyphen/pyphen-0.9.5.ebuild
index ea8a50eaa3d8..747a81d8cd9b 100644
--- a/dev-python/pyphen/pyphen-0.9.5.ebuild
+++ b/dev-python/pyphen/pyphen-0.9.5.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://github.com/Kozea/Pyphen"
LICENSE="GPL-2+ LGPL-2+ MPL-1.1"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
IUSE=""
RDEPEND=""
diff --git a/dev-python/pysol_cards/Manifest b/dev-python/pysol_cards/Manifest
index 4174ef1a3e91..5f0e4b24895c 100644
--- a/dev-python/pysol_cards/Manifest
+++ b/dev-python/pysol_cards/Manifest
@@ -1,2 +1 @@
-DIST pysol_cards-0.8.6.tar.gz 17674 BLAKE2B b46c2a39b04e339e7e9a548cfb4e7f06e49969bbdfd9dc35f2662973bae60e52b576bc2174c86fa9ed33d69703257690d9d024b9ca474a4bbd028c5ec958b5e2 SHA512 da446e0deed0f8ff60a4da82a8bce5d1884d35e52ee887a6b07b82fa6fbf04b07d1758b8039532db5163f89395239295f6eec1f278cd183b22e41f1e90416040
DIST pysol_cards-0.8.9.tar.gz 19522 BLAKE2B 06e257f2ccb43236c311d03436d7b482df977d63c0b886c7705e4cfee4abec4eae495a5557053ba2a18a84da227cc4bd913263e98533ab3a17616843df0a35c7 SHA512 548f586c70a583812731f2273f1c57406a31667b395c4276ec94518471499e69d278d54e2910f7c64a4c52deb670b0e76eef55399af9e2b997422ecbbd9a79a9
diff --git a/dev-python/pysol_cards/pysol_cards-0.8.6.ebuild b/dev-python/pysol_cards/pysol_cards-0.8.6.ebuild
deleted file mode 100644
index 7a532c89e9aa..000000000000
--- a/dev-python/pysol_cards/pysol_cards-0.8.6.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Deal PySol FreeCell cards"
-HOMEPAGE="https://pypi.org/project/pysol-cards/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0 MIT"
-SLOT="0"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="
- dev-python/pbr[${PYTHON_USEDEP}]
- dev-python/random2[${PYTHON_USEDEP}]
- dev-python/six[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/pysol_cards/pysol_cards-0.8.9.ebuild b/dev-python/pysol_cards/pysol_cards-0.8.9.ebuild
index 9407aad9b5fa..2153dd470d0c 100644
--- a/dev-python/pysol_cards/pysol_cards-0.8.9.ebuild
+++ b/dev-python/pysol_cards/pysol_cards-0.8.9.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0 MIT"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
IUSE=""
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/pytest-fixture-config/pytest-fixture-config-1.7.0-r1.ebuild b/dev-python/pytest-fixture-config/pytest-fixture-config-1.7.0-r1.ebuild
index 490c4ade0c92..72fa882d3516 100644
--- a/dev-python/pytest-fixture-config/pytest-fixture-config-1.7.0-r1.ebuild
+++ b/dev-python/pytest-fixture-config/pytest-fixture-config-1.7.0-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
RDEPEND="
dev-python/pytest[${PYTHON_USEDEP}]
diff --git a/dev-python/python-bugzilla/python-bugzilla-2.3.0.ebuild b/dev-python/python-bugzilla/python-bugzilla-2.3.0.ebuild
index 65a529fc935a..1229b0f0a595 100644
--- a/dev-python/python-bugzilla/python-bugzilla-2.3.0.ebuild
+++ b/dev-python/python-bugzilla/python-bugzilla-2.3.0.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="A python module for interacting with Bugzilla over XMLRPC"
HOMEPAGE="https://github.com/python-bugzilla/python-bugzilla"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
LICENSE="GPL-2+"
SLOT="0"
diff --git a/dev-python/python-distutils-extra/python-distutils-extra-2.44-r1.ebuild b/dev-python/python-distutils-extra/python-distutils-extra-2.44-r1.ebuild
index 7780eccb55eb..a53af5d7f0fd 100644
--- a/dev-python/python-distutils-extra/python-distutils-extra-2.44-r1.ebuild
+++ b/dev-python/python-distutils-extra/python-distutils-extra-2.44-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/pytools/pytools-2020.1.ebuild b/dev-python/pytools/pytools-2020.1.ebuild
index 04d206f13f50..72c7f0ada2b6 100644
--- a/dev-python/pytools/pytools-2020.1.ebuild
+++ b/dev-python/pytools/pytools-2020.1.ebuild
@@ -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"
RDEPEND="
>=dev-python/appdirs-1.4.0[${PYTHON_USEDEP}]
diff --git a/dev-python/roman/roman-3.2.ebuild b/dev-python/roman/roman-3.2.ebuild
index 6d30ea2af4a3..5e6d8b33be32 100644
--- a/dev-python/roman/roman-3.2.ebuild
+++ b/dev-python/roman/roman-3.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="PSF-2"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/simpy/simpy-3.0.13.ebuild b/dev-python/simpy/simpy-3.0.13.ebuild
index 6524c90f7767..c3151ab6865f 100644
--- a/dev-python/simpy/simpy-3.0.13.ebuild
+++ b/dev-python/simpy/simpy-3.0.13.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
SLOT="0"
LICENSE="LGPL-2.1"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
IUSE="doc test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/smmap/smmap-3.0.2.ebuild b/dev-python/smmap/smmap-3.0.2.ebuild
index b6226ca7f640..06e92b29a153 100644
--- a/dev-python/smmap/smmap-3.0.2.ebuild
+++ b/dev-python/smmap/smmap-3.0.2.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
-KEYWORDS="amd64 arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
SLOT="0"
distutils_enable_tests unittest
diff --git a/dev-python/snowballstemmer/snowballstemmer-2.0.0.ebuild b/dev-python/snowballstemmer/snowballstemmer-2.0.0.ebuild
index 90e70ce55820..880f5b491b46 100644
--- a/dev-python/snowballstemmer/snowballstemmer-2.0.0.ebuild
+++ b/dev-python/snowballstemmer/snowballstemmer-2.0.0.ebuild
@@ -14,4 +14,4 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-solaris"
diff --git a/dev-python/sphinxcontrib-applehelp/sphinxcontrib-applehelp-1.0.2.ebuild b/dev-python/sphinxcontrib-applehelp/sphinxcontrib-applehelp-1.0.2.ebuild
index 2369d6411152..be57e5ca32f3 100644
--- a/dev-python/sphinxcontrib-applehelp/sphinxcontrib-applehelp-1.0.2.ebuild
+++ b/dev-python/sphinxcontrib-applehelp/sphinxcontrib-applehelp-1.0.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
RDEPEND="dev-python/namespace-sphinxcontrib[${PYTHON_USEDEP}]"
PDEPEND="
diff --git a/dev-python/twisted/twisted-20.3.0.ebuild b/dev-python/twisted/twisted-20.3.0.ebuild
index 90dfb037cdf4..54301b0d0894 100644
--- a/dev-python/twisted/twisted-20.3.0.ebuild
+++ b/dev-python/twisted/twisted-20.3.0.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://twistedmatrix.com/Releases/${TWISTED_PN}"
SRC_URI="${SRC_URI}/${TWISTED_RELEASE}/${TWISTED_P}.tar.bz2
https://dev.gentoo.org/~mgorny/dist/twisted-regen-cache.gz"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~mips ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
LICENSE="MIT"
SLOT="0"
diff --git a/dev-python/urwidtrees/metadata.xml b/dev-python/urwidtrees/metadata.xml
index 142b19f2d854..e312933c461e 100644
--- a/dev-python/urwidtrees/metadata.xml
+++ b/dev-python/urwidtrees/metadata.xml
@@ -1,10 +1,7 @@
-
- aidecoe@gentoo.org
- Amadeusz Żołnowski
-
+
This is a Widget Container API for the urwid toolkit. It uses a MVC
approach and allows to build trees of widgets.
diff --git a/dev-python/webassets/webassets-2.0.ebuild b/dev-python/webassets/webassets-2.0.ebuild
index 5da3b13d94b3..6b0bce61a9a5 100644
--- a/dev-python/webassets/webassets-2.0.ebuild
+++ b/dev-python/webassets/webassets-2.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/miracle2k/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
# dev-ruby/sass confuses the tests, they expect 'sass' as the reference
# compiler
diff --git a/dev-python/webcolors/webcolors-1.11.1.ebuild b/dev-python/webcolors/webcolors-1.11.1.ebuild
index 3d688b4eec81..59a073dd61ca 100644
--- a/dev-python/webcolors/webcolors-1.11.1.ebuild
+++ b/dev-python/webcolors/webcolors-1.11.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
SLOT="0"
LICENSE="BSD"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
BDEPEND="dev-python/six[${PYTHON_USEDEP}]"
diff --git a/dev-python/whichcraft/whichcraft-0.6.1.ebuild b/dev-python/whichcraft/whichcraft-0.6.1.ebuild
index a8eba54e66ad..ba94ca599d3e 100644
--- a/dev-python/whichcraft/whichcraft-0.6.1.ebuild
+++ b/dev-python/whichcraft/whichcraft-0.6.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/pydanny/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
DOCS=( README.rst HISTORY.rst CONTRIBUTING.rst )
diff --git a/dev-python/ws4py/files/ws4py-0.5.1-python3.7+-compatibility.patch b/dev-python/ws4py/files/ws4py-0.5.1-python3.7+-compatibility.patch
new file mode 100644
index 000000000000..12b14111634a
--- /dev/null
+++ b/dev-python/ws4py/files/ws4py-0.5.1-python3.7+-compatibility.patch
@@ -0,0 +1,93 @@
+From: Matthias Klose
+Date: Sun, 29 Jul 2018 09:01:36 +0200
+Subject: Fix compatibility with Python 3.7.
+Origin: http://launchpadlibrarian.net/380629852/python-ws4py_0.4.2+dfsg1-2_0.4.2+dfsg1-2ubuntu1.diff.gz
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=903529
+
+---
+ test/autobahn_test_servers.py | 4 ++--
+ ws4py/async_websocket.py | 9 +++++++--
+ ws4py/server/tulipserver.py | 7 ++++++-
+ 3 files changed, 15 insertions(+), 5 deletions(-)
+
+diff --git a/test/autobahn_test_servers.py b/test/autobahn_test_servers.py
+index 3e33f82..8b77954 100644
+--- a/test/autobahn_test_servers.py
++++ b/test/autobahn_test_servers.py
+@@ -142,7 +142,7 @@ def run_python_wsgi(host="127.0.0.1", port=9002):
+ """
+ run_python_wsgi_async(host, port, False)
+
+-def run_python_wsgi_async(host="127.0.0.1", port=9010, async=True):
++def run_python_wsgi_async(host="127.0.0.1", port=9010, async_=True):
+ """
+ Runs wsgi server on python 2.x with async middleware"
+ """
+@@ -153,7 +153,7 @@ def run_python_wsgi_async(host="127.0.0.1", port=9010, async=True):
+ from ws4py.server.wsgiutils import WebSocketWSGIApplication
+
+ app = WebSocketWSGIApplication(handler_cls=EchoWebSocket)
+- if async:
++ if async_:
+ def middleware(app):
+ def later(environ, start_response):
+ for part in app(environ, start_response):
+diff --git a/ws4py/async_websocket.py b/ws4py/async_websocket.py
+index 9e2a4c7..096763d 100644
+--- a/ws4py/async_websocket.py
++++ b/ws4py/async_websocket.py
+@@ -18,6 +18,11 @@ delegated_generator_websocket_on_top_of_asyncio.py
+ import asyncio
+ import types
+
++try: # pragma: no cover
++ asyncio_ensure_future = asyncio.ensure_future # Python >= 3.5
++except AttributeError: # pragma: no cover
++ asyncio_ensure_future = getattr(asyncio, 'async') # Python < 3.5
++
+ from ws4py.websocket import WebSocket as _WebSocket
+ from ws4py.messaging import Message
+
+@@ -84,7 +89,7 @@ class WebSocket(_WebSocket):
+ def closeit():
+ yield from self.proto.writer.drain()
+ self.proto.writer.close()
+- asyncio.async(closeit())
++ asyncio.asyncio_ensure_future(closeit())
+
+ def _write(self, data):
+ """
+@@ -94,7 +99,7 @@ class WebSocket(_WebSocket):
+ def sendit(data):
+ self.proto.writer.write(data)
+ yield from self.proto.writer.drain()
+- asyncio.async(sendit(data))
++ asyncio.asyncio_ensure_future(sendit(data))
+
+ @asyncio.coroutine
+ def run(self):
+diff --git a/ws4py/server/tulipserver.py b/ws4py/server/tulipserver.py
+index 2786c16..ce2e9fb 100644
+--- a/ws4py/server/tulipserver.py
++++ b/ws4py/server/tulipserver.py
+@@ -6,6 +6,11 @@ import io
+
+ import asyncio
+
++try: # pragma: no cover
++ asyncio_ensure_future = asyncio.ensure_future # Python >= 3.5
++except AttributeError: # pragma: no cover
++ asyncio_ensure_future = getattr(asyncio, 'async') # Python < 3.5
++
+ from ws4py import WS_KEY, WS_VERSION
+ from ws4py.exc import HandshakeError
+ from ws4py.websocket import WebSocket
+@@ -40,7 +45,7 @@ class WebSocketProtocol(asyncio.StreamReaderProtocol):
+ #self.stream.set_transport(transport)
+ asyncio.StreamReaderProtocol.connection_made(self, transport)
+ # Let make it concurrent for others to tag along
+- f = asyncio.async(self.handle_initial_handshake())
++ f = asyncio.asyncio_ensure_future(self.handle_initial_handshake())
+ f.add_done_callback(self.terminated)
+
+ @property
diff --git a/dev-python/ws4py/ws4py-0.5.1-r1.ebuild b/dev-python/ws4py/ws4py-0.5.1-r1.ebuild
new file mode 100644
index 000000000000..21de5cde42da
--- /dev/null
+++ b/dev-python/ws4py/ws4py-0.5.1-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# We could depend on dev-python/cherrypy when USE=server, but
+# that is an optional component ...
+# Same for www-servers/tornado and USE=client ... so why not???
+# pypy is viable but better with a cutdown set of deps
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_REQ_USE="threads(+)?"
+
+inherit distutils-r1
+if [[ ${PV} == "9999" ]] ; then
+ EGIT_REPO_URI="https://github.com/Lawouach/WebSocket-for-Python.git"
+ inherit git-r3
+else
+ SRC_URI="https://github.com/Lawouach/WebSocket-for-Python/archive/${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+DESCRIPTION="WebSocket client and server library for Python 2 and 3 as well as PyPy"
+HOMEPAGE="https://github.com/Lawouach/WebSocket-for-Python"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="+client +server test +threads"
+RESTRICT="!test? ( test )"
+# doc build requires sphinxcontrib ext packages absent from portage
+
+RDEPEND=">=dev-python/greenlet-0.4.1[${PYTHON_USEDEP}]
+ >=dev-python/cython-0.19.1[${PYTHON_USEDEP}]
+ client? ( >=www-servers/tornado-3.1[${PYTHON_USEDEP}] )
+ server? ( >=dev-python/cherrypy-3.2.4[${PYTHON_USEDEP}] )"
+
+DEPEND="test? (
+ >=dev-python/cherrypy-3.2.4[${PYTHON_USEDEP}]
+ dev-python/unittest2[${PYTHON_USEDEP}]
+ >=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
+ )"
+
+PATCHES=( "${FILESDIR}"/${PN}-0.5.1-python3.7+-compatibility.patch )
+
+python_test() {
+ # testsuite displays an issue with mock under py3 but is non fatal
+ "${PYTHON}" -m unittest discover || die "Tests failed under ${EPYTHON}"
+}
+
+python_install() {
+ distutils-r1_python_install
+ use client || rm -rf "${D}$(python_get_sitedir)"/ws4py/client
+ use server || rm -rf "${D}$(python_get_sitedir)"/ws4py/server
+}
diff --git a/dev-python/ws4py/ws4py-9999.ebuild b/dev-python/ws4py/ws4py-9999.ebuild
index 461f735ab784..21de5cde42da 100644
--- a/dev-python/ws4py/ws4py-9999.ebuild
+++ b/dev-python/ws4py/ws4py-9999.ebuild
@@ -6,16 +6,15 @@
# Same for www-servers/tornado and USE=client ... so why not???
# pypy is viable but better with a cutdown set of deps
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-PYTHON_REQ_USE="threads?"
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_REQ_USE="threads(+)?"
inherit distutils-r1
if [[ ${PV} == "9999" ]] ; then
EGIT_REPO_URI="https://github.com/Lawouach/WebSocket-for-Python.git"
inherit git-r3
else
- inherit vcs-snapshot
SRC_URI="https://github.com/Lawouach/WebSocket-for-Python/archive/${PV}.tar.gz -> ${P}.tar.gz"
KEYWORDS="~amd64 ~arm ~x86"
fi
@@ -30,15 +29,18 @@ RESTRICT="!test? ( test )"
# doc build requires sphinxcontrib ext packages absent from portage
RDEPEND=">=dev-python/greenlet-0.4.1[${PYTHON_USEDEP}]
- >=dev-python/cython-0.19.1[${PYTHON_USEDEP}]
- client? ( >=www-servers/tornado-3.1[${PYTHON_USEDEP}] )
- server? ( >=dev-python/cherrypy-3.2.4[${PYTHON_USEDEP}] )"
+ >=dev-python/cython-0.19.1[${PYTHON_USEDEP}]
+ client? ( >=www-servers/tornado-3.1[${PYTHON_USEDEP}] )
+ server? ( >=dev-python/cherrypy-3.2.4[${PYTHON_USEDEP}] )"
+
DEPEND="test? (
>=dev-python/cherrypy-3.2.4[${PYTHON_USEDEP}]
dev-python/unittest2[${PYTHON_USEDEP}]
>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
)"
+PATCHES=( "${FILESDIR}"/${PN}-0.5.1-python3.7+-compatibility.patch )
+
python_test() {
# testsuite displays an issue with mock under py3 but is non fatal
"${PYTHON}" -m unittest discover || die "Tests failed under ${EPYTHON}"
diff --git a/dev-python/wxpython/wxpython-4.0.7.ebuild b/dev-python/wxpython/wxpython-4.0.7.ebuild
index 6bc32c9b1904..6d49fa8e3eba 100644
--- a/dev-python/wxpython/wxpython-4.0.7.ebuild
+++ b/dev-python/wxpython/wxpython-4.0.7.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${MY_PN}/${MY_PN}-${MY_PV}.tar.gz"
LICENSE="wxWinLL-3"
SLOT="4.0"
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
IUSE="test webkit"
RESTRICT="!test? ( test )"
diff --git a/dev-python/zstandard/zstandard-0.13.0.ebuild b/dev-python/zstandard/zstandard-0.13.0.ebuild
index d934c50a8cdb..516c6df24d1c 100644
--- a/dev-python/zstandard/zstandard-0.13.0.ebuild
+++ b/dev-python/zstandard/zstandard-0.13.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
SLOT="0"
LICENSE="BSD"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index d64d8df2a339..3552c52c63ef 100644
Binary files a/dev-ruby/Manifest.gz and b/dev-ruby/Manifest.gz differ
diff --git a/dev-ruby/actionpack/actionpack-6.0.2.2.ebuild b/dev-ruby/actionpack/actionpack-6.0.2.2.ebuild
index 4de989d426cc..4d8bf0f9ee17 100644
--- a/dev-ruby/actionpack/actionpack-6.0.2.2.ebuild
+++ b/dev-ruby/actionpack/actionpack-6.0.2.2.ebuild
@@ -41,6 +41,7 @@ ruby_add_bdepend "
dev-ruby/bundler
>=dev-ruby/capybara-2.15
~dev-ruby/activemodel-${PV}
+ ~dev-ruby/railties-${PV}
>=dev-ruby/rack-cache-1.2:1.2
www-servers/puma
)"
diff --git a/dev-ruby/pastel/Manifest b/dev-ruby/pastel/Manifest
index 535982918250..e771233e073b 100644
--- a/dev-ruby/pastel/Manifest
+++ b/dev-ruby/pastel/Manifest
@@ -1,2 +1,3 @@
DIST pastel-0.7.2.gem 49152 BLAKE2B 37380dd9f44f2e816628bda1ed359aeaa961c9b1c18a0e76b4b04fea39906e53601aba17fd2c1cd0571357697296ee1afce3a52fbdc33475a1560c3c2f52e567 SHA512 83cf7ef04800a77ee91692de5b89c6bfe6590be72f24dda74ee53809b14b7e2e9c6e70e9a829eff7aa8dd02a191057dc5f5c5528d36fe2bfd211e1c499d276f0
DIST pastel-0.7.3.gem 22016 BLAKE2B 0e883969446c9c64389a6280de3f94c6e4970321051bfa718698ea0ce2594ac9a36e32f29946fbceb98015644d529c8dbdafb9f1fdb2fe0825b3d9477b75f4b8 SHA512 71cefdac478c709c8d4899021438945c841e4eada2411aae3165e8444835bd9aed27ad9083fe223b115206311fa579d4160cde136bd7a21df5bdcf2589234177
+DIST pastel-0.7.4.tar.gz 48176 BLAKE2B 3564aba28f9315d2f988dabdd0686e6c7a53c1b200e6e03519c1ebcde917503760d4f0d790e456c7a732b47535f692d7f5b88cf786e5b4236e9b2e8b5eee66d7 SHA512 a1ad8487babd1e788282e141538855370e09bb2745731670b814cb4572c54e0568955108f7657809b98f92b94d9d94cdd555e2db8146b20f80db98bbab3512ea
diff --git a/dev-ruby/pastel/pastel-0.7.4.ebuild b/dev-ruby/pastel/pastel-0.7.4.ebuild
new file mode 100644
index 000000000000..fdd5b02e3bc1
--- /dev/null
+++ b/dev-ruby/pastel/pastel-0.7.4.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby24 ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_GEMSPEC="pastel.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Terminal strings styling with intuitive and clean API"
+HOMEPAGE="https://github.com/piotrmurach/pastel"
+SRC_URI="https://github.com/piotrmurach/pastel/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_rdepend "
+ >=dev-ruby/equatable-0.6:0
+ >=dev-ruby/tty-color-0.5:0
+"
+
+all_ruby_prepare() {
+ echo '-rspec_helper' > .rspec || die
+ sed -i -e 's:_relative ": "./:' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/public_suffix/Manifest b/dev-ruby/public_suffix/Manifest
index 58b700f86b20..f590e18fa6a6 100644
--- a/dev-ruby/public_suffix/Manifest
+++ b/dev-ruby/public_suffix/Manifest
@@ -1,3 +1,4 @@
DIST public_suffix-3.1.1.gem 99840 BLAKE2B ef86b7ecb834a855dbb44b8a0f934de3715edb6d67faefd20f99054898b35bfedffd490b60fbe80236905826868611aa96e13766577bb98ab997321cf9c49b39 SHA512 1e266ed7fa224fa94a49a51dae2868bdadb80ca2de660d2cda9a1e146ccad5aaba2cf68d75272e333a4b1a80e47863d388d85d3a86bddf8f649a320e5e700078
DIST public_suffix-4.0.3.gem 105472 BLAKE2B 5654fb2323161eb04fe6e30194593fc521148e181a112378c8214fa6980d0edeb0d03e7745333b1cdc55d0f5251f811e1e6707b77b94613b6f199048d6d91ffc SHA512 9c4f6fb0a1a8ea4ceb3203bb0d9c53eda4b0779a6e25b4a6d4236d1cea62f39bbdedc50cb9808492fb54f453311b37548a2a8e0ac3ec83777876a9b6aa279ef5
DIST public_suffix-4.0.4.gem 105472 BLAKE2B c6be420744976bb3c5dd78b4ab4fc4d4293de1a985af95b288520983957a11224c2548ca7d34009d9ac1fa975880d7971a9a7d6267634cb97836ce0486d62a03 SHA512 d6f61d1d1756541a84a4745d02732c769901c0d309ed15c48ef01b153ba7c2a801b227251e02a8a5d85da2ffd0c52888c154ee374fc54a6aabe385b398144696
+DIST public_suffix-4.0.5.gem 106496 BLAKE2B 1b581b2d08e78b156d70f25d1af66f825f7e1e332049311001f4d20982222fea463e4eb79ae12152c51269ee42c883cd966f479225f26c01b8e7a70f870d5ddf SHA512 5de30466e27d853c498f210dbe168c52d0e5efab5b6388c88de5667e40dee151041d6a1a9203780230dfa03bd2fb920a50b1301d05d12a31f4d31f8352218821
diff --git a/dev-ruby/public_suffix/public_suffix-4.0.5.ebuild b/dev-ruby/public_suffix/public_suffix-4.0.5.ebuild
new file mode 100644
index 000000000000..67e0089c6b13
--- /dev/null
+++ b/dev-ruby/public_suffix/public_suffix-4.0.5.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby24 ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_EXTRAINSTALL="data"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Parse and decompose a domain name into top level domain, domain and subdomains"
+HOMEPAGE="https://simonecarletti.com/code/publicsuffix-ruby/"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+IUSE=""
+
+ruby_add_bdepend "test? ( dev-ruby/mocha )"
+
+all_ruby_prepare() {
+ sed -i -e '/rubocop/I s:^:#:' \
+ -e '/yardoc/,/CLOBBER.include/ s:^:#:' \
+ -e '/bundler/ s:^:#:' Rakefile || die
+ sed -i -e '/reporters/I s:^:#:' test/test_helper.rb || die
+}
diff --git a/dev-ruby/racc/racc-1.4.14.ebuild b/dev-ruby/racc/racc-1.4.14.ebuild
index 5ae06002a66a..4688ee338444 100644
--- a/dev-ruby/racc/racc-1.4.14.ebuild
+++ b/dev-ruby/racc/racc-1.4.14.ebuild
@@ -20,6 +20,8 @@ SLOT="0"
KEYWORDS="~alpha amd64 arm arm64 hppa ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="doc test"
+ruby_add_rdepend "virtual/ruby-ssl"
+
ruby_add_bdepend "dev-ruby/rake
test? ( >=dev-ruby/minitest-4.0:0 )"
diff --git a/dev-ruby/racc/racc-1.4.16-r1.ebuild b/dev-ruby/racc/racc-1.4.16-r1.ebuild
index b1180f7dcb83..c3dff6698030 100644
--- a/dev-ruby/racc/racc-1.4.16-r1.ebuild
+++ b/dev-ruby/racc/racc-1.4.16-r1.ebuild
@@ -22,6 +22,8 @@ SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="doc test"
+ruby_add_rdepend "virtual/ruby-ssl"
+
ruby_add_bdepend "dev-ruby/rake
test? ( dev-ruby/minitest )"
diff --git a/dev-ruby/rack-test/rack-test-1.1.0.ebuild b/dev-ruby/rack-test/rack-test-1.1.0.ebuild
index f6144b3869b6..9ddb9c014689 100644
--- a/dev-ruby/rack-test/rack-test-1.1.0.ebuild
+++ b/dev-ruby/rack-test/rack-test-1.1.0.ebuild
@@ -25,9 +25,14 @@ IUSE=""
ruby_add_rdepend ">=dev-ruby/rack-1.0:*
-Date: Mon, 25 May 2015 22:41:31 +0200
-Subject: [PATCH] Clean up Rack::Rewindable
-
----
- lib/rack/rewindable_input.rb | 11 -----------
- 1 file changed, 11 deletions(-)
-
-diff --git a/lib/rack/rewindable_input.rb b/lib/rack/rewindable_input.rb
-index 64efdda..dd6b784 100644
---- a/lib/rack/rewindable_input.rb
-+++ b/lib/rack/rewindable_input.rb
-@@ -57,15 +57,6 @@ def close
-
- private
-
-- # Ruby's Tempfile class has a bug. Subclass it and fix it.
-- class Tempfile < ::Tempfile
-- def _close
-- @tmpfile.close if @tmpfile
-- @data[1] = nil if @data
-- @tmpfile = nil
-- end
-- end
--
- def make_rewindable
- # Buffer all data into a tempfile. Since this tempfile is private to this
- # RewindableInput object, we chmod it so that nobody else can read or write
-@@ -77,8 +68,6 @@ def make_rewindable
- @rewindable_io.set_encoding(Encoding::BINARY) if @rewindable_io.respond_to?(:set_encoding)
- @rewindable_io.binmode
- if filesystem_has_posix_semantics?
-- # Use ::File.unlink as 1.9.1 Tempfile has a bug where unlink closes the file!
-- ::File.unlink @rewindable_io.path
- raise 'Unlink failed. IO closed.' if @rewindable_io.closed?
- @unlinked = true
- end
diff --git a/dev-ruby/sinatra/sinatra-2.0.8.1-r1.ebuild b/dev-ruby/sinatra/sinatra-2.0.8.1-r1.ebuild
index b365cde14ffd..7021116b670b 100644
--- a/dev-ruby/sinatra/sinatra-2.0.8.1-r1.ebuild
+++ b/dev-ruby/sinatra/sinatra-2.0.8.1-r1.ebuild
@@ -23,8 +23,12 @@ IUSE=""
ruby_add_rdepend "
dev-ruby/mustermann:1
- dev-ruby/rack:2.0
+ || ( dev-ruby/rack:2.1 dev-ruby/rack:2.0 )
~dev-ruby/rack-protection-${PV}
dev-ruby/tilt:2"
ruby_add_bdepend "test? ( >=dev-ruby/rack-test-0.5.6 dev-ruby/erubis dev-ruby/builder dev-ruby/activesupport )"
ruby_add_bdepend "doc? ( dev-ruby/yard )"
+
+all_ruby_prepare() {
+ sed -i -e '1igem "rack", "<2.2"' test/helper.rb || die
+}
diff --git a/dev-ruby/slim/Manifest b/dev-ruby/slim/Manifest
index 4a954f29e6af..641a07459dec 100644
--- a/dev-ruby/slim/Manifest
+++ b/dev-ruby/slim/Manifest
@@ -1,2 +1,3 @@
DIST slim-3.0.9.gem 99840 BLAKE2B e449585fe5642c1980b4d8fb0c93979d8c16020c331f1bc2993c6f7b5bb3e55c1b85595711bf3acdc369c6a3fbfdc6873a8208c59aedaa49dead1cd9166347d4 SHA512 220dbcde230aab05e294022924346fbb02a1bf813a7c97910c2f60d7b3a7dd498d04f6f4f2883b895d2a3e6e9f526331914e3ab4560e748de2bd991358cca90d
DIST slim-4.0.1.gem 103424 BLAKE2B cf3629e6bb5254082ee3596dc4ddd05921186071823cfe6c423d3f173f80c46ca874e3cfa9a795ce4d564da2c7aa42a422513677978a6e79545a918ef3b9fb6f SHA512 afdaf01ce8372e270c00bc3fd863b9c2f7d26c851ed032374e648f069e6591e9522d4490f57350d4f13b85c68e6a9038111ad03a644a8e89894dca4ebffa0c90
+DIST slim-4.1.0.gem 103424 BLAKE2B 87de8411d6284569ac56366d4e2f3ee351c6908001cbda2926312f25c1c39520662371e826493d1346722bb507348bd8c117f3b0447b433bdb406435b80a70e2 SHA512 a929edcd1b194bc6abddf5757e0e942835f6c5e1555aa7bf021b0e850d74c9777637a2a0eafbdf2de7f0f0574eb03866c562826c656adcc0517cc4bfcb5ca897
diff --git a/dev-ruby/slim/slim-4.1.0.ebuild b/dev-ruby/slim/slim-4.1.0.ebuild
new file mode 100644
index 000000000000..7f7a6d8b4595
--- /dev/null
+++ b/dev-ruby/slim/slim-4.1.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby24 ruby25 ruby26"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGES README.md"
+
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_RECIPE_DOC="rake"
+RUBY_FAKEGEM_TASK_DOC="yard"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A template language aiming to reduce the syntax to the essential parts"
+HOMEPAGE="http://slim-lang.com/"
+LICENSE="MIT"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+SLOT="$(ver_cut 1)"
+IUSE="doc"
+
+ruby_add_rdepend ">=dev-ruby/tilt-2.0.6:* =dev-ruby/tilt-2.0*:*
+ >=dev-ruby/temple-0.7.6:0.7
+ !!=dev-ruby/ethon-0.9.0"
+
+ruby_add_bdepend "test? ( dev-ruby/json >=dev-ruby/faraday-0.9 >=dev-ruby/sinatra-1.3 >=dev-ruby/redis-3.0 >=dev-ruby/dalli-2.7.9 )"
+
+all_ruby_prepare() {
+ sed -e '/bundler/I s:^:#:' -i Rakefile spec/spec_helper.rb || die
+}
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 064f48ee8a6d..559e513be6ff 100644
Binary files a/dev-util/Manifest.gz and b/dev-util/Manifest.gz differ
diff --git a/dev-util/catalyst/catalyst-9999.ebuild b/dev-util/catalyst/catalyst-9999.ebuild
index 89afd4a55294..e50d1271d9a4 100644
--- a/dev-util/catalyst/catalyst-9999.ebuild
+++ b/dev-util/catalyst/catalyst-9999.ebuild
@@ -37,6 +37,7 @@ RDEPEND="
>=dev-python/pydecomp-0.3[${PYTHON_USEDEP}]
app-arch/lbzip2
app-arch/tar[xattr]
+ dev-vcs/git
sys-fs/dosfstools
sys-fs/squashfs-tools-ng
ccache? ( dev-util/ccache )
diff --git a/dev-util/clazy/Manifest b/dev-util/clazy/Manifest
index 3a2f8b7277a2..85c2cfdf47b4 100644
--- a/dev-util/clazy/Manifest
+++ b/dev-util/clazy/Manifest
@@ -1,2 +1 @@
-DIST clazy-1.5.tar.xz 352344 BLAKE2B 0f7200900f1a8bcad3020cf98522e3ac9ba01dddc9b2200f08a8a86102e4389af7a4a86e1832ee4c0e750267948a908627032385a01af94d8d0ae5f438114b9e SHA512 863cb9609d02a2260b61bc6cb3e6d8a84975d3b4e4f1c94a82e8c600d95a28483c323f47ac39c39ecef24d0f51871b358055868c63a49b136cf8ee3060df5a52
DIST clazy-1.6.tar.xz 364292 BLAKE2B 01da58e34d5a7cb1e812d10264cebe15e90369589535e07f2c9f4520971f2e95b2c70494e99e34f7077957ec1bf01352fa6a72a64f0572e8a5db422267ab727a SHA512 dc7cb9590bbc40a2ac51abe305b6520ebc1ff7128ff21b4f6111d18f14eb8c2ab66d907636a18c7508143b708e70ba69f9d6fad88ffce12dec981a9bdd0edcc0
diff --git a/dev-util/clazy/clazy-1.5-r1.ebuild b/dev-util/clazy/clazy-1.5-r1.ebuild
deleted file mode 100644
index cc5cf804601c..000000000000
--- a/dev-util/clazy/clazy-1.5-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Compiler plugin which allows clang to understand Qt semantics"
-HOMEPAGE="https://cgit.kde.org/clazy.git/tree/README.md"
-SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE=""
-
-RDEPEND="
- =sys-devel/llvm-3.8:=
-"
-DEPEND="${RDEPEND}"
-
-DOCS=( README.md )
-
-src_prepare() {
- cmake_src_prepare
-
- sed -e '/install(FILES README.md COPYING-LGPL2.txt checks.json DESTINATION/d' \
- -i CMakeLists.txt || die
-
- sed -e 's|${MAN_INSTALL_DIR}|share/man/man1|' \
- -i docs/man/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 "
-
- aidecoe@gentoo.org
- Amadeusz Żołnowski
-
+
Rebar3 is an Erlang tool that makes it easy to create, develop, and
release Erlang libraries, applications, and systems in a repeatable
diff --git a/dev-util/unrpyc/Manifest b/dev-util/unrpyc/Manifest
new file mode 100644
index 000000000000..137c525b9114
--- /dev/null
+++ b/dev-util/unrpyc/Manifest
@@ -0,0 +1 @@
+DIST unrpyc-1.1.3.tar.gz 77662 BLAKE2B e2fdf9015e67ee389ff84c49bd89c64d65178a26aaa7b8600202f491291e03a568bec2d8d09e47c407a9bcd025dab3b84e5167f07c9673d19bdb5bf7846c1eed SHA512 5883d58e11b2f52cffdeae744e17bf6bf2039340e53365f8ce58f716b991011bbca71c6473395a9d70c32bc77529eea3e7a9e3b8da7dc3cc8362cc0fdcbe5cf0
diff --git a/dev-util/unrpyc/metadata.xml b/dev-util/unrpyc/metadata.xml
new file mode 100644
index 000000000000..69df492b06ae
--- /dev/null
+++ b/dev-util/unrpyc/metadata.xml
@@ -0,0 +1,22 @@
+
+
+
+
+ bircoph@gentoo.org
+ Andrew Savchenko
+
+
+ Unrpyc is a script to decompile Ren'Py (http://www.renpy.org/) compiled
+ .rpyc script files. It will not extract files from .rpa archives.
+ For that, use app-arch/unrpa.
+
+
+ CensoredUsername/unrpyc
+
+
+
diff --git a/dev-util/unrpyc/unrpyc-1.1.3.ebuild b/dev-util/unrpyc/unrpyc-1.1.3.ebuild
new file mode 100644
index 000000000000..e754cac60c4a
--- /dev/null
+++ b/dev-util/unrpyc/unrpyc-1.1.3.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+inherit distutils-r1
+
+SRC_URI="https://github.com/CensoredUsername/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64 ~x86"
+DESCRIPTION="Ren'Py's rpyc scripts decompiler"
+HOMEPAGE="https://github.com/CensoredUsername/unrpyc"
+LICENSE="BSD-1 BSD"
+SLOT="0"
+
+IUSE="+module proto0 proto1 proto2"
+
+DEPEND="module? ( dev-python/picklemagic[${PYTHON_USEDEP}] )"
+
+src_prepare() {
+ sed -i 's/unrpyc.py/unrpyc/g' README.md setup.py || die
+ mv unrpyc.py unrpyc || die
+ distutils-r1_src_prepare
+}
+
+src_compile() {
+ distutils-r1_src_compile
+
+ if use module; then
+ local proto=1
+ use proto0 && proto=0
+ use proto1 && proto=1
+ use proto2 && proto=2
+
+ cd un.rpyc || die
+ python_setup 'python2*'
+ ./compile.py -p${proto} || die
+ fi
+}
+
+src_install() {
+ distutils-r1_src_install
+
+ if use module; then
+ install -Dpm 0644 -t "${ED}/usr/share/${PN}" un.rpyc/un.rpyc || die
+ einfo "For run-time rpyc decompiling copy ${EPREFIX}/usr/share/${PN}/un.rpyc to your game dir."
+ newdoc un.rpyc/README.md README-un.rpyc.md
+ fi
+}
diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz
index 73ed0ac5f502..4d2f0d9afc9d 100644
Binary files a/dev-vcs/Manifest.gz and b/dev-vcs/Manifest.gz differ
diff --git a/dev-vcs/hg-evolve/Manifest b/dev-vcs/hg-evolve/Manifest
index 95f3b6a05d73..b0cc36f4a4ff 100644
--- a/dev-vcs/hg-evolve/Manifest
+++ b/dev-vcs/hg-evolve/Manifest
@@ -1,2 +1 @@
-DIST hg-evolve-8.5.1.tar.gz 755965 BLAKE2B c9d6ea06f91cc537e1ea9266a09cded59e3dfb69f0bb5300a40b971bda6f9ce680c81978c23806972ca88931d9f2d67eedce14ba1f56670fa3c18194b63e2999 SHA512 7c5d9608d03ab81fc7291edb3f0ddb016cd4b267997bf66fcb221c9c917fbd34bfb4637bbb0c60b460a32304ee45fd7e30db929312dfbaa94df17baf7947482e
-DIST hg-evolve-9.3.1.tar.gz 798989 BLAKE2B b4992275e75c096535156cb42946f3eb90f8667b8691de5570099b7b4ff371da3b17ec3b44802c95cac21e196b1a7b8349707039de08ddbddf930bc620ee71e6 SHA512 453104989ec1e4a7072098f8c453290d66270f1992ab1a9a7c94be96f1c3e2b9989940796579de1e11f298ffdb7eaf7b9c9bb05def61fba4feeb5e2f39299670
+DIST hg-evolve-10.0.0.tar.gz 808587 BLAKE2B ec6c5f3edf8967df9556413326d2dc66830461c65a4697963513429aeb601999461012ec19a17ed8ba0d88a7fcf9ef41749428b71819e99a39b261d6d2541157 SHA512 4c88af31584d61df7fe397015e185d0191a021f89a23630b6d71ead5acb233f4b71638f3637e12e1d04b03fb79f127a754eeac0e85ab2b8d045665645d528d13
diff --git a/dev-vcs/hg-evolve/hg-evolve-9.3.1.ebuild b/dev-vcs/hg-evolve/hg-evolve-10.0.0.ebuild
similarity index 100%
rename from dev-vcs/hg-evolve/hg-evolve-9.3.1.ebuild
rename to dev-vcs/hg-evolve/hg-evolve-10.0.0.ebuild
diff --git a/dev-vcs/hg-evolve/hg-evolve-8.5.1.ebuild b/dev-vcs/hg-evolve/hg-evolve-8.5.1.ebuild
deleted file mode 100644
index a89ef7e4eea3..000000000000
--- a/dev-vcs/hg-evolve/hg-evolve-8.5.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="enables the changeset evolution feature of Mercurial"
-HOMEPAGE="https://www.mercurial-scm.org/doc/evolution/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-RDEPEND="
- >=dev-vcs/mercurial-4.4[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
- doc? ( dev-python/sphinx )"
-
-python_prepare_all() {
- rm hgext3rd/__init__.py || die
-
- distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
- use doc && emake -C docs all
-}
-
-python_install_all() {
- distutils-r1_python_install_all
-
- if use doc; then
- dodoc -r html/
- fi
-}
diff --git a/dev-vcs/mercurial/mercurial-5.3.2.ebuild b/dev-vcs/mercurial/mercurial-5.3.2.ebuild
index 25750d8586ff..ad8d7db68a7c 100644
--- a/dev-vcs/mercurial/mercurial-5.3.2.ebuild
+++ b/dev-vcs/mercurial/mercurial-5.3.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://www.mercurial-scm.org/release/${P}.tar.gz"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="+chg emacs gpg test tk zsh-completion"
BROKEN_PYTHON="
diff --git a/dev-vcs/subversion/metadata.xml b/dev-vcs/subversion/metadata.xml
index 1bf5eabc57bf..b2b200e9148b 100644
--- a/dev-vcs/subversion/metadata.xml
+++ b/dev-vcs/subversion/metadata.xml
@@ -1,7 +1,14 @@
-
+
+ dilfridge@gentoo.org
+ Andreas K. Hüttel
+
+
+ zlogene@gentoo.org
+ Mikle Kolyada
+