diff --git a/Manifest.files.gz b/Manifest.files.gz
index 1bb5819eaf61..b77e6185592c 100644
Binary files a/Manifest.files.gz and b/Manifest.files.gz differ
diff --git a/app-accessibility/Manifest.gz b/app-accessibility/Manifest.gz
index 0c8779cb7714..849542b85061 100644
Binary files a/app-accessibility/Manifest.gz and b/app-accessibility/Manifest.gz differ
diff --git a/app-accessibility/accerciser/accerciser-3.36.2.ebuild b/app-accessibility/accerciser/accerciser-3.36.2.ebuild
index b9c382d195a4..b0b41bfafe3e 100644
--- a/app-accessibility/accerciser/accerciser-3.36.2.ebuild
+++ b/app-accessibility/accerciser/accerciser-3.36.2.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Accerciser"
LICENSE="BSD CC-BY-SA-3.0"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 51e11fe29f65..fe5aa3dd567b 100644
Binary files a/app-admin/Manifest.gz and b/app-admin/Manifest.gz differ
diff --git a/app-admin/r10k/r10k-3.4.1.ebuild b/app-admin/r10k/r10k-3.4.1.ebuild
index b8cab218aa30..240033b4fc8f 100644
--- a/app-admin/r10k/r10k-3.4.1.ebuild
+++ b/app-admin/r10k/r10k-3.4.1.ebuild
@@ -30,7 +30,7 @@ ruby_add_rdepend "
"
ruby_add_bdepend "test? (
- dev-ruby/archive-tar-minitar
+ >=dev-ruby/minitar-0.9
)"
RDEPEND="${RDEPEND} git? ( >=dev-vcs/git-1.6.6 )"
diff --git a/app-backup/Manifest.gz b/app-backup/Manifest.gz
index e4869d80cb47..2f7ddf2d0ec5 100644
Binary files a/app-backup/Manifest.gz and b/app-backup/Manifest.gz differ
diff --git a/app-backup/bacula/bacula-9.6.5.ebuild b/app-backup/bacula/bacula-9.6.5.ebuild
index 9456256ad40c..d2d04673ea7d 100644
--- a/app-backup/bacula/bacula-9.6.5.ebuild
+++ b/app-backup/bacula/bacula-9.6.5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/bacula/${MY_P}.tar.gz"
LICENSE="AGPL-3"
SLOT="0"
-KEYWORDS="~amd64 ppc ~sparc ~x86"
+KEYWORDS="amd64 ppc ~sparc x86"
IUSE="acl bacula-clientonly bacula-nodir bacula-nosd +batch-insert examples ipv6 libressl logwatch mysql postgres qt5 readline +sqlite ssl static tcpd vim-syntax X"
DEPEND="
diff --git a/app-backup/borgmatic/borgmatic-1.5.6.ebuild b/app-backup/borgmatic/borgmatic-1.5.6.ebuild
index 040e887e7ced..81303b9f901e 100644
--- a/app-backup/borgmatic/borgmatic-1.5.6.ebuild
+++ b/app-backup/borgmatic/borgmatic-1.5.6.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
# borg is called as an external tool, hence no pythonic stuff
RDEPEND="app-backup/borgbackup
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index d21b646e4ec5..4510a87407c4 100644
Binary files a/app-crypt/Manifest.gz and b/app-crypt/Manifest.gz differ
diff --git a/app-crypt/mit-krb5/mit-krb5-1.18.2-r1.ebuild b/app-crypt/mit-krb5/mit-krb5-1.18.2-r1.ebuild
index fc2b061cec6c..626da606a476 100644
--- a/app-crypt/mit-krb5/mit-krb5-1.18.2-r1.ebuild
+++ b/app-crypt/mit-krb5/mit-krb5-1.18.2-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://web.mit.edu/kerberos/dist/krb5/${P_DIR}/${MY_P}.tar.gz"
LICENSE="openafs-krb5-a BSD MIT OPENLDAP BSD-2 HPND BSD-4 ISC RSA CC-BY-SA-3.0 || ( BSD-2 GPL-2+ )"
SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
IUSE="cpu_flags_x86_aes doc +keyutils libressl lmdb nls openldap +pkinit selinux +threads test xinetd"
# Test suite requires network access
diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index 794eed5fd68a..abb5a99ca467 100644
Binary files a/app-editors/Manifest.gz and b/app-editors/Manifest.gz differ
diff --git a/app-editors/pyvim/Manifest b/app-editors/pyvim/Manifest
new file mode 100644
index 000000000000..ed95aecc3d88
--- /dev/null
+++ b/app-editors/pyvim/Manifest
@@ -0,0 +1 @@
+DIST pyvim-3.0.2.tar.gz 35227 BLAKE2B 8edc2218b3a0f2ba922531b75f65a5273ad9a2697f72ecf994cf7d2406c6311c3f28b22b6adb1243150a90db74962256ceaa7cf47ec99c2388299742451d6efb SHA512 da961342ba52e5beca44a607cbb923953388e8674409db9ca2b152017eeedce84f92e42a9f6d0e5019c5c4d88d82f4a987cb378f311cf84a169cefa54dc5efce
diff --git a/app-editors/pyvim/metadata.xml b/app-editors/pyvim/metadata.xml
new file mode 100644
index 000000000000..318dcc191ea8
--- /dev/null
+++ b/app-editors/pyvim/metadata.xml
@@ -0,0 +1,16 @@
+
+
+
+
+ vim@gentoo.org
+ Gentoo Vim Project
+
+
+ monsieurp@gentoo.org
+ Patrice Clement
+
+
+ pyvim
+ prompt-toolkit/pyvim
+
+
diff --git a/app-editors/pyvim/pyvim-3.0.2.ebuild b/app-editors/pyvim/pyvim-3.0.2.ebuild
new file mode 100644
index 000000000000..f0ba40a9fbc0
--- /dev/null
+++ b/app-editors/pyvim/pyvim-3.0.2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="An implementation of Vim in Python"
+HOMEPAGE="https://pypi.org/project/pyvim https://github.com/prompt-toolkit/pyvim"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+ app-eselect/eselect-vi
+ dev-python/six[${PYTHON_USEDEP}]
+ dev-python/docopt[${PYTHON_USEDEP}]
+ dev-python/wcwidth[${PYTHON_USEDEP}]
+ dev-python/pyflakes[${PYTHON_USEDEP}]
+ dev-python/pygments[${PYTHON_USEDEP}]
+ dev-python/prompt_toolkit[${PYTHON_USEDEP}]"
+
+eselect_vi_update() {
+ einfo "Calling eselect vi update..."
+ eselect vi update --if-unset
+ eend $?
+}
+
+pkg_postinst() {
+ eselect_vi_update
+}
+
+pkg_postrm() {
+ eselect_vi_update
+}
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index 31eb8de80e63..ed010f45a312 100644
Binary files a/app-emulation/Manifest.gz and b/app-emulation/Manifest.gz differ
diff --git a/app-emulation/wine-staging/Manifest b/app-emulation/wine-staging/Manifest
index 1026abbadf92..e7f36d90267c 100644
--- a/app-emulation/wine-staging/Manifest
+++ b/app-emulation/wine-staging/Manifest
@@ -2,8 +2,8 @@ DIST gentoo-wine-patches-20200523.tar.xz 59740 BLAKE2B 951d7f305a6e5b3759c809562
DIST wine-5.10.tar.xz 23859084 BLAKE2B ee4d06f69e0259de4ec6cf1352c610aa2460762be49211e21f0fb91a7463a4e4ca82b7ea9272eac8ea0c8d1be955c2aefcbdabed37581c4fbf82e7b58a070d1c SHA512 669d6861525cd4ab000113e8d9c5e10822b62b293914542ee34a826696df66e1d2f09b09f576f714e4117e79e25d1fd0b2a06c57d29da0efa0bdfcb9fee59c60
DIST wine-5.11.tar.xz 23881408 BLAKE2B 5da8ab91dcb462f6de460ae80830d6006866970fbc4a23bbd6a2243736ff004c0734282b45196d46e97bb8383c99b415c85f941b2ab613c72ae66995e0162460 SHA512 fac78a98e03e0305c85fff393b7c5d46a3fbe11aff4a0153771187d3ad0212189d1fa88947fc9fe0da7bd8327eb71283f28ff866c4d8b2bc759a2ad2197fc9a1
DIST wine-5.12.tar.xz 23939672 BLAKE2B 97190653a754100fc2832f8bdc544529dc34cae97b6ae68a579dfb529af5c924d2e9b439f304784028ae84a730f3cf9911a20d132f645ab90532479092b39079 SHA512 1272b143d64ed6083cd797474f18dbd2bca7a38d488474ae5f054f47789b4fc1d386c7bbf8aa1bd86f9507908fc799b4f45e10e1d8c628c5bd52c42b1d74c8a8
-DIST wine-5.9.tar.xz 23802356 BLAKE2B 1879c164c647a5b849056e4149a809c390814ae832773a44347cf1902fd49cb6619b4add5ea2d421c189d92b5c907daa0d6f62c37c48a8bd68d0eaa9eb465433 SHA512 edc6d55a275cf37430a62dc6d6d86bff6d5a434e708dbd99d245018db7f6a0abe39581a1d91eb947f204a45ac94cc5c931745169a3b63a2aecf8db277553b74b
+DIST wine-5.13.tar.xz 23955832 BLAKE2B 79cdd8d1f34c866ae239a0b876fdb40396bb19038e1e4eb76abeb445e6a72d281b393283deffa53af3e101660317e856febd173cc5564b4ee587cd594d411434 SHA512 3093be3b974609f83fe2da6ca724237fa07ada260ec503fc00a8729b74d77e22b329044e411ed1e67f287c4e69ef3b16953ddb3e93599d97d3ad1ffffb608704
DIST wine-staging-3f3a05f91c85cb5ccdc4c8185bcc862c6e96cd52.tar.gz 9835238 BLAKE2B 27c0e7fe418e7ee82c7b1cfc13c0c1508a7f4637ef7b8d64675ed4038a42961382170c064221a7bad70a4e168aef7d4e33974d06afc18fc6da4cf5db047b242e SHA512 b2ad84bed89e713f4dc4f01763c40dc785f39f180a8f926c1b9e944a581ffcfd5c422427314201df1359b4b1c27dc2261281353f44ae9408e800d6add7bde366
DIST wine-staging-5.10-r1.tar.gz 9862728 BLAKE2B 4d70b0e4d71b4e06a57f9fa43a8d4c91dfdb149ab0dd6b92ff93928dc9f35ef56a0f9e3dc278b2db19d6dbab32a58478ed110d4cf0c35a3a598611afd39ca326 SHA512 5d6f495c157d4bd1558f976bd044b62e5ffce188b7d12c1e6d5b3d844aa2070503218778f48ca34a787a8b355ab2c09f76381499b7e474a1c047bdc3b15d803a
DIST wine-staging-5.11.tar.gz 9859071 BLAKE2B ae8abb4b48291864ce6ea80300186da77f422da1790bc1a3fb697719fc1bce0f1b1fd41962fc104bf9792f1ac46d99181a1437f52d290e526671b7d5ac43ea75 SHA512 a5cff848077f937d8f910d6f8b4efc033435c99bc6eeb8cf2a39e812b09c9fad5602e91e761eb1a006a1487299f7d81ecf7597d104fcafd076a8692e086af1a5
-DIST wine-staging-5.9.tar.gz 9861847 BLAKE2B 61eb21e4386b772b98472707ea927f74ee77e8ec39caa494b6db2cdafc4b00e3aee503f9828a8df1cea2bbc6fa3aaf272fe28b60965de26132d4761058b59f25 SHA512 8fcf448be21edc0ccf8afef75013298c8f1634b51cd4d927ee5a1d039552d7c29609f65f283519b6561d09eb6eeae91fa6db70b9e78e4fd8bb5318408b39fb33
+DIST wine-staging-5.13.tar.gz 9807468 BLAKE2B 17fea3955affd66082d9cf3d72529b55107fedd86aa7b02c9947f92255042fdab46da2a642977d89a18e05608f7eb7fa1f3ef07df2d52bff450c924bcd30c4d8 SHA512 9bdda76524ea97c9847182d912544a2ecd5efddc03511af151c054d6cce933e40c8cf10722d34d8875115aed7c1888883fdce3e00f481c31116fd33d91304c6d
diff --git a/app-emulation/wine-staging/wine-staging-5.9.ebuild b/app-emulation/wine-staging/wine-staging-5.13.ebuild
similarity index 99%
rename from app-emulation/wine-staging/wine-staging-5.9.ebuild
rename to app-emulation/wine-staging/wine-staging-5.13.ebuild
index 206342ea6a8a..674958ea886a 100644
--- a/app-emulation/wine-staging/wine-staging-5.9.ebuild
+++ b/app-emulation/wine-staging/wine-staging-5.13.ebuild
@@ -130,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:5.0.0 )
+ mono? ( app-emulation/wine-mono:5.1.0 )
perl? (
dev-lang/perl
dev-perl/XML-Simple
diff --git a/app-emulation/wine-vanilla/Manifest b/app-emulation/wine-vanilla/Manifest
index f61fcc5bdb35..858dfaa69a53 100644
--- a/app-emulation/wine-vanilla/Manifest
+++ b/app-emulation/wine-vanilla/Manifest
@@ -6,4 +6,4 @@ DIST wine-5.0.1.tar.xz 22476496 BLAKE2B 8fd7729812c0144b6c9ec7f28ecc25bca5bc7801
DIST wine-5.10.tar.xz 23859084 BLAKE2B ee4d06f69e0259de4ec6cf1352c610aa2460762be49211e21f0fb91a7463a4e4ca82b7ea9272eac8ea0c8d1be955c2aefcbdabed37581c4fbf82e7b58a070d1c SHA512 669d6861525cd4ab000113e8d9c5e10822b62b293914542ee34a826696df66e1d2f09b09f576f714e4117e79e25d1fd0b2a06c57d29da0efa0bdfcb9fee59c60
DIST wine-5.11.tar.xz 23881408 BLAKE2B 5da8ab91dcb462f6de460ae80830d6006866970fbc4a23bbd6a2243736ff004c0734282b45196d46e97bb8383c99b415c85f941b2ab613c72ae66995e0162460 SHA512 fac78a98e03e0305c85fff393b7c5d46a3fbe11aff4a0153771187d3ad0212189d1fa88947fc9fe0da7bd8327eb71283f28ff866c4d8b2bc759a2ad2197fc9a1
DIST wine-5.12.tar.xz 23939672 BLAKE2B 97190653a754100fc2832f8bdc544529dc34cae97b6ae68a579dfb529af5c924d2e9b439f304784028ae84a730f3cf9911a20d132f645ab90532479092b39079 SHA512 1272b143d64ed6083cd797474f18dbd2bca7a38d488474ae5f054f47789b4fc1d386c7bbf8aa1bd86f9507908fc799b4f45e10e1d8c628c5bd52c42b1d74c8a8
-DIST wine-5.9.tar.xz 23802356 BLAKE2B 1879c164c647a5b849056e4149a809c390814ae832773a44347cf1902fd49cb6619b4add5ea2d421c189d92b5c907daa0d6f62c37c48a8bd68d0eaa9eb465433 SHA512 edc6d55a275cf37430a62dc6d6d86bff6d5a434e708dbd99d245018db7f6a0abe39581a1d91eb947f204a45ac94cc5c931745169a3b63a2aecf8db277553b74b
+DIST wine-5.13.tar.xz 23955832 BLAKE2B 79cdd8d1f34c866ae239a0b876fdb40396bb19038e1e4eb76abeb445e6a72d281b393283deffa53af3e101660317e856febd173cc5564b4ee587cd594d411434 SHA512 3093be3b974609f83fe2da6ca724237fa07ada260ec503fc00a8729b74d77e22b329044e411ed1e67f287c4e69ef3b16953ddb3e93599d97d3ad1ffffb608704
diff --git a/app-emulation/wine-vanilla/wine-vanilla-5.9.ebuild b/app-emulation/wine-vanilla/wine-vanilla-5.13.ebuild
similarity index 99%
rename from app-emulation/wine-vanilla/wine-vanilla-5.9.ebuild
rename to app-emulation/wine-vanilla/wine-vanilla-5.13.ebuild
index 62a4fcb10e85..fed13ca5bb03 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-5.9.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-5.13.ebuild
@@ -110,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:5.0.0 )
+ mono? ( app-emulation/wine-mono:5.1.0 )
perl? (
dev-lang/perl
dev-perl/XML-Simple
@@ -419,10 +419,9 @@ multilib_src_configure() {
$(use_with xml xslt)
)
- local PKG_CONFIG AR RANLIB
+ local PKG_CONFIG
# Avoid crossdev's i686-pc-linux-gnu-pkg-config if building wine32 on amd64; #472038
- # set AR and RANLIB to make QA scripts happy; #483342
- tc-export PKG_CONFIG AR RANLIB
+ tc-export PKG_CONFIG
if use amd64; then
if [[ ${ABI} == amd64 ]]; then
diff --git a/app-eselect/Manifest.gz b/app-eselect/Manifest.gz
index dcfdca3a9248..cab417ac7673 100644
Binary files a/app-eselect/Manifest.gz and b/app-eselect/Manifest.gz differ
diff --git a/app-eselect/eselect-iptables/eselect-iptables-20200508.ebuild b/app-eselect/eselect-iptables/eselect-iptables-20200508.ebuild
index 734c7d425d23..a0f938c15386 100644
--- a/app-eselect/eselect-iptables/eselect-iptables-20200508.ebuild
+++ b/app-eselect/eselect-iptables/eselect-iptables-20200508.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://dev.gentoo.org/~chutzpah/dist/iptables/${P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~riscv ~s390 ~sparc x86"
RDEPEND="app-admin/eselect"
diff --git a/app-eselect/eselect-python/Manifest b/app-eselect/eselect-python/Manifest
index 5cbaab212b55..d56cf26998b7 100644
--- a/app-eselect/eselect-python/Manifest
+++ b/app-eselect/eselect-python/Manifest
@@ -1 +1,2 @@
DIST eselect-python-20190417.tar.bz2 46698 BLAKE2B 6f0acad0abb21d8e4768cbeb12f7e871c316a940ebae4c02bdb1336095991cb6b6bf05661ab659115a67f29a09f2a9b57cfb0868019606ed550b5aa1863f6f71 SHA512 a461263a50a29f0493127ee4a027e49ca4d7631e9c8d16cffc8bdb98cc7e75b0796e45e70951d5559fb86f0db14141a3ea6a53bd4cf1e0cc83ed5c7f24173695
+DIST eselect-python-20200719.tar.bz2 47313 BLAKE2B 37270b1f5ad3dfcd4e19c71ae74da585e803afe89c43f8b912bccf0fbdb936916cf58fc780b654692bb9e6ab44310514bae5f10d19dcde6a0e63042f76abe81d SHA512 4b205a099ad079e5e28d3fdbe774c22f54b7c16bff2d28b54d0e20ee36be2339e928d4050eed74ef969d5815bf4bb691bf5ed6e98023b28972da6d5c7d8a2545
diff --git a/app-eselect/eselect-python/eselect-python-20200719.ebuild b/app-eselect/eselect-python/eselect-python-20200719.ebuild
new file mode 100644
index 000000000000..745d4e05cb20
--- /dev/null
+++ b/app-eselect/eselect-python/eselect-python-20200719.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} == "99999999" ]] ; then
+ inherit autotools git-r3
+ EGIT_REPO_URI="git://anongit.gentoo.org/proj/${PN}.git"
+else
+ SRC_URI="https://dev.gentoo.org/~chutzpah/dist/misc/${P}.tar.bz2"
+ 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"
+fi
+
+DESCRIPTION="Eselect module for management of multiple Python versions"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Python"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+# python-exec-2.4.2 for working -l option
+RDEPEND="
+ >=app-admin/eselect-1.2.3
+ >=dev-lang/python-exec-2.4.2
+"
+
+src_prepare() {
+ default
+ [[ ${PV} == "99999999" ]] && eautoreconf
+}
+
+pkg_postinst() {
+ local py
+
+ if has_version 'dev-lang/python'; then
+ eselect python update --if-unset
+ fi
+
+ if has_version "=dev-lang/python-3*"; then
+ eselect python update "--python3" --if-unset
+ fi
+}
diff --git a/app-eselect/eselect-python/eselect-python-99999999.ebuild b/app-eselect/eselect-python/eselect-python-99999999.ebuild
index 8e05fb549b51..745d4e05cb20 100644
--- a/app-eselect/eselect-python/eselect-python-99999999.ebuild
+++ b/app-eselect/eselect-python/eselect-python-99999999.ebuild
@@ -1,13 +1,13 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
if [[ ${PV} == "99999999" ]] ; then
inherit autotools git-r3
EGIT_REPO_URI="git://anongit.gentoo.org/proj/${PN}.git"
else
- SRC_URI="https://dev.gentoo.org/~floppym/dist/${P}.tar.bz2"
+ SRC_URI="https://dev.gentoo.org/~chutzpah/dist/misc/${P}.tar.bz2"
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"
fi
@@ -16,11 +16,12 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Python"
LICENSE="GPL-2"
SLOT="0"
-IUSE=""
# python-exec-2.4.2 for working -l option
-RDEPEND=">=app-admin/eselect-1.2.3
- >=dev-lang/python-exec-2.4.2"
+RDEPEND="
+ >=app-admin/eselect-1.2.3
+ >=dev-lang/python-exec-2.4.2
+"
src_prepare() {
default
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index fab53d459d48..de6858e9d90f 100644
Binary files a/app-misc/Manifest.gz and b/app-misc/Manifest.gz differ
diff --git a/app-misc/OpenRGB/Manifest b/app-misc/OpenRGB/Manifest
new file mode 100644
index 000000000000..951fffac07a9
--- /dev/null
+++ b/app-misc/OpenRGB/Manifest
@@ -0,0 +1 @@
+DIST OpenRGB-0.2.tar.bz2 2064388 BLAKE2B 0001a4f66576cd26e04a87abb2f7d36df243c5d45b449f689a51d7523f6f26079622d58aa1f33166f52634326552ba1788344ff5f6034ceb9123dbc1eadb992b SHA512 06b5026c014674097c5f6b9ad54b1232f9aaa192663dd6324a402be8d12169e648b8ed4e748b4aebd970538519a88203621b45d8cb794fc0e6bae562e15c5f2b
diff --git a/app-misc/OpenRGB/OpenRGB-0.2.ebuild b/app-misc/OpenRGB/OpenRGB-0.2.ebuild
new file mode 100644
index 000000000000..c9b8a8b6db11
--- /dev/null
+++ b/app-misc/OpenRGB/OpenRGB-0.2.ebuild
@@ -0,0 +1,55 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop qmake-utils
+
+MY_P="${PN}-release_${PV}"
+COMMIT_HASH="13414ec9b84c299631e5100744f2b83923cba3c8"
+
+DESCRIPTION="Open source RGB lighting control that doesn't depend on manufacturer software"
+HOMEPAGE="https://gitlab.com/CalcProgrammer1/OpenRGB/"
+SRC_URI="https://gitlab.com/CalcProgrammer1/OpenRGB/-/archive/release_0.2/${P}.tar.bz2"
+S="${WORKDIR}/${MY_P}-${COMMIT_HASH}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+ dev-libs/hidapi:=
+ dev-libs/libbsd:=
+ dev-qt/qtcore:5=
+ dev-qt/qtgui:5=
+ dev-qt/qtwidgets:5=
+ virtual/libusb:1
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+ virtual/pkgconfig
+"
+
+PATCHES=(
+ "${FILESDIR}/OpenRGB-0.2-build-system.patch"
+ "${FILESDIR}/OpenRGB-0.2-use-system-hidapi.patch"
+ "${FILESDIR}/OpenRGB-0.2-install.patch"
+)
+
+src_prepare() {
+ default
+ rm -rf dependencies/{hidapi,libusb}* || die
+}
+
+src_configure() {
+ eqmake5
+}
+
+src_install() {
+ emake INSTALL_ROOT="${D}" install
+
+ dodoc README.md
+
+ make_desktop_entry ${PN} ${PN} ${PN} 'System;Monitor;HardwareSettings;'
+}
diff --git a/app-misc/OpenRGB/files/OpenRGB-0.2-build-system.patch b/app-misc/OpenRGB/files/OpenRGB-0.2-build-system.patch
new file mode 100644
index 000000000000..b2cd6cbd1d58
--- /dev/null
+++ b/app-misc/OpenRGB/files/OpenRGB-0.2-build-system.patch
@@ -0,0 +1,14 @@
+diff --git a/OpenRGB.pro b/OpenRGB.pro
+index 91e0079..7f279dd 100644
+--- a/OpenRGB.pro
++++ b/OpenRGB.pro
+@@ -8,9 +8,6 @@ TEMPLATE = app
+ VERSION = 0.2
+ win32:BUILDDATE = $$system(date /t)
+ unix:BUILDDATE = $$system(date -R)
+-GIT_COMMIT_ID = $$system(git --git-dir $$_PRO_FILE_PWD_/.git --work-tree $$_PRO_FILE_PWD_ rev-parse HEAD)
+-GIT_COMMIT_DATE = $$system(git --git-dir $$_PRO_FILE_PWD_/.git --work-tree $$_PRO_FILE_PWD_ show -s --format=%ci HEAD)
+-GIT_BRANCH = $$system(git --git-dir $$_PRO_FILE_PWD_/.git --work-tree $$_PRO_FILE_PWD_ rev-parse --abbrev-ref HEAD)
+
+ DEFINES += \
+ VERSION_STRING=\\"\"\"$$VERSION\\"\"\" \
diff --git a/app-misc/OpenRGB/files/OpenRGB-0.2-install.patch b/app-misc/OpenRGB/files/OpenRGB-0.2-install.patch
new file mode 100644
index 000000000000..745efe57b2c8
--- /dev/null
+++ b/app-misc/OpenRGB/files/OpenRGB-0.2-install.patch
@@ -0,0 +1,23 @@
+diff --git a/OpenRGB.pro b/OpenRGB.pro
+index 9553b1f..fb4e4be 100644
+--- a/OpenRGB.pro
++++ b/OpenRGB.pro
+@@ -389,3 +389,18 @@ unix:SOURCES += \
+ RGBController/OpenRazerDetect.cpp \
+ RGBController/RGBController_Faustus.cpp \
+ RGBController/RGBController_OpenRazer.cpp \
++
++ #-------------------------------------------------------------------#
++ # Set up install paths #
++ # These install paths are used for AppImage and .deb packaging #
++ #-------------------------------------------------------------------#
++ isEmpty(PREFIX) {
++ PREFIX = /usr
++ }
++
++ target.path=$$PREFIX/bin/
++ desktop.path=$$PREFIX/share/applications/
++ desktop.files+=qt/OpenRGB.desktop
++ pixmap.path=$$PREFIX/share/pixmaps/
++ pixmap.files+=qt/OpenRGB.png
++ INSTALLS += target desktop pixmap
diff --git a/app-misc/OpenRGB/files/OpenRGB-0.2-use-system-hidapi.patch b/app-misc/OpenRGB/files/OpenRGB-0.2-use-system-hidapi.patch
new file mode 100644
index 000000000000..51ca8fca5ccf
--- /dev/null
+++ b/app-misc/OpenRGB/files/OpenRGB-0.2-use-system-hidapi.patch
@@ -0,0 +1,57 @@
+diff --git a/OpenRGB.pro b/OpenRGB.pro
+index 91e0079..306085b 100644
+--- a/OpenRGB.pro
++++ b/OpenRGB.pro
+@@ -23,7 +23,6 @@ RC_ICONS = qt/OpenRGB.ico
+
+ INCLUDEPATH += \
+ dependencies/ColorWheel \
+- dependencies/hidapi \
+ dependencies/libe131/src/ \
+ i2c_smbus/ \
+ i2c_tools/ \
+@@ -64,7 +63,6 @@ INCLUDEPATH += \
+
+ SOURCES += \
+ dependencies/ColorWheel/ColorWheel.cpp \
+- dependencies/hidapi/hidapi.c \
+ dependencies/libe131/src/e131.c \
+ main.cpp \
+ cli.cpp \
+@@ -288,6 +286,7 @@ FORMS += \
+ # Windows specific project configuration
+ #-----------------------------------------------
+ win32:INCLUDEPATH += \
++ dependencies/hidapi \
+ dependencies/inpout32_1501/Win32/ \
+ dependencies/libusb-1.0.22/include \
+ dependencies/NVFC \
+@@ -295,6 +294,7 @@ win32:INCLUDEPATH += \
+ wmi/ \
+
+ win32:SOURCES += \
++ dependencies/hidapi/hidapi.c \
+ dependencies/NVFC/nvapi.cpp \
+ i2c_smbus/i2c_smbus_i801.cpp \
+ i2c_smbus/i2c_smbus_nct6775.cpp \
+@@ -369,6 +369,20 @@ unix:LIBS += \
+ -lusb-1.0 \
+ -lstdc++fs \
+
++ #-------------------------------------------------------------------#
++ # Determine which hidapi to use based on availability #
++ #-------------------------------------------------------------------#
++ packagesExist(hidapi-libusb) {
++ LIBS += -lhidapi-libusb
++ } else {
++ packagesExist(hidapi) {
++ LIBS += -lhidapi
++ } else {
++ LIBS += -lhidapi-libusb
++ }
++ }
++
++
+ unix:SOURCES += \
+ i2c_smbus/i2c_smbus_linux.cpp \
+ serial_port/find_usb_serial_port_linux.cpp \
diff --git a/app-misc/OpenRGB/metadata.xml b/app-misc/OpenRGB/metadata.xml
new file mode 100644
index 000000000000..cee379b15409
--- /dev/null
+++ b/app-misc/OpenRGB/metadata.xml
@@ -0,0 +1,8 @@
+
+
+
+
+ chutzpah@gentoo.org
+ Patrick McLean
+
+
diff --git a/app-misc/colordiff/colordiff-1.0.19.ebuild b/app-misc/colordiff/colordiff-1.0.19.ebuild
index a611018c9e5c..57707b8528d7 100644
--- a/app-misc/colordiff/colordiff-1.0.19.ebuild
+++ b/app-misc/colordiff/colordiff-1.0.19.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.colordiff.org/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
RDEPEND="
dev-lang/perl
diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index cb6bafc83228..5af5e8585a37 100644
Binary files a/app-portage/Manifest.gz and b/app-portage/Manifest.gz differ
diff --git a/app-portage/layman/layman-9999.ebuild b/app-portage/layman/layman-9999.ebuild
index e8ba2aeb5168..b9c60ed0d3d4 100644
--- a/app-portage/layman/layman-9999.ebuild
+++ b/app-portage/layman/layman-9999.ebuild
@@ -68,6 +68,15 @@ python_test() {
unset suite
}
+python_compile_all() {
+ default_python_compile_all
+ # Generate man page. only required for 9999
+ if [[ ${PV} == *9999 ]] ; then
+ # override MAKEOPTS to prevent build failure
+ emake -j1 -C doc
+ fi
+}
+
python_install_all() {
distutils-r1_python_install_all
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 27003ea846f7..ba2946bcbaa6 100644
Binary files a/app-text/Manifest.gz and b/app-text/Manifest.gz differ
diff --git a/app-text/calibre/calibre-4.21.0.ebuild b/app-text/calibre/calibre-4.21.0.ebuild
index 187479a77138..320b6df32ed2 100644
--- a/app-text/calibre/calibre-4.21.0.ebuild
+++ b/app-text/calibre/calibre-4.21.0.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6..8} )
PYTHON_REQ_USE="sqlite,ssl"
inherit bash-completion-r1 desktop toolchain-funcs python-single-r1 xdg-utils
diff --git a/app-text/gv/gv-3.7.3.90.ebuild b/app-text/gv/gv-3.7.3.90.ebuild
index 5d743546b919..aa0f587b889f 100644
--- a/app-text/gv/gv-3.7.3.90.ebuild
+++ b/app-text/gv/gv-3.7.3.90.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu-alpha/gv/${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ppc ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
IUSE="xinerama"
RDEPEND="
diff --git a/app-text/jo/Manifest b/app-text/jo/Manifest
index d436b1cedeaf..9fe47d8696cd 100644
--- a/app-text/jo/Manifest
+++ b/app-text/jo/Manifest
@@ -1,2 +1,3 @@
DIST jo-1.1.tar.gz 50395 BLAKE2B 753e65e5b483cee357bcfc1fb95d93fae008acc8a1eeee75e6e68da6d0ed8c9636cd489278c466ffbd179ceaec7121b4fe3f64fe2e9bf70b81febbe15144c0f2 SHA512 fd220acf53d554cb9e9920510dba2f4a01337b126dca89882e02ba96cdd84bf7a5e935a4c06dddb5200cd808f0609fd697e51a56161dc99b1638e33181494242
DIST jo-1.3.tar.gz 143425 BLAKE2B 32efaa84f64b0d3e82173a5121a30e13ce7fed991ec09f26400c90071e5e3cc5cc8af372550f4d9769cc338e852bf50497782c11ffd7d32a52d5769370742fbf SHA512 3c9480257d0ab9d9f19f1aaeb3a5b72e69caff6dcf87118bea8aca74a3b0864c0d17ed52bfc5550783c4636ee3a6acb8578f08316d976cea4f06af7096c12f02
+DIST jo-1.4.tar.gz 144596 BLAKE2B 0e0a0290d276b18fbfea0c770e134f29ea3f1eea9c7e5ccdd6c7d853dc0a8c70279fa464731f5b231d6d9d48816be4e5a6d93c7abc0e03408a86f0e1691d67a0 SHA512 c283b25e76fa06842c4f7d8ae8d94b207981d92a1bd4a064631e0646bdeedc06c1a00dddac405a455b27bda5eb34aaa7dc6d886ccf750741fd4d7312f692d169
diff --git a/app-text/jo/jo-1.3.ebuild b/app-text/jo/jo-1.3.ebuild
index d2d6974384b1..bf84777ca6d8 100644
--- a/app-text/jo/jo-1.3.ebuild
+++ b/app-text/jo/jo-1.3.ebuild
@@ -19,5 +19,5 @@ src_configure() {
src_install() {
default
- mv $(get_bashcompdir)/jo{.bash,} || die
+ mv "${D}"$(get_bashcompdir)/jo{.bash,} || die
}
diff --git a/app-text/jo/jo-1.4.ebuild b/app-text/jo/jo-1.4.ebuild
new file mode 100644
index 000000000000..bf84777ca6d8
--- /dev/null
+++ b/app-text/jo/jo-1.4.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit bash-completion-r1
+
+DESCRIPTION="JSON output from a shell"
+HOMEPAGE="https://github.com/jpmens/jo"
+SRC_URI="https://github.com/jpmens/${PN}/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+src_configure() {
+ export bashcompdir=$(get_bashcompdir)
+ default
+}
+
+src_install() {
+ default
+ mv "${D}"$(get_bashcompdir)/jo{.bash,} || die
+}
diff --git a/app-text/jo/jo-99999.ebuild b/app-text/jo/jo-99999.ebuild
index 06279f5b7cd7..098a68881de3 100644
--- a/app-text/jo/jo-99999.ebuild
+++ b/app-text/jo/jo-99999.ebuild
@@ -24,5 +24,5 @@ src_configure() {
src_install() {
default
- mv $(get_bashcompdir)/jo{.bash,} || die
+ mv "${D}"$(get_bashcompdir)/jo{.bash,} || die
}
diff --git a/app-text/sigil/sigil-1.2.1-r1.ebuild b/app-text/sigil/sigil-1.2.1-r1.ebuild
index e7b02c1eea76..5f283ccaee82 100644
--- a/app-text/sigil/sigil-1.2.1-r1.ebuild
+++ b/app-text/sigil/sigil-1.2.1-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/Sigil-Ebook/Sigil/archive/${PV}.tar.gz -> ${P}.tar.g
LICENSE="GPL-3+ Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="+plugins system-mathjax"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index d4e40ad82ddf..957daf81d576 100644
Binary files a/dev-cpp/Manifest.gz and b/dev-cpp/Manifest.gz differ
diff --git a/dev-cpp/glibmm/glibmm-2.64.2.ebuild b/dev-cpp/glibmm/glibmm-2.64.2.ebuild
index 6889d9dd390b..cfc31c8cd11d 100644
--- a/dev-cpp/glibmm/glibmm-2.64.2.ebuild
+++ b/dev-cpp/glibmm/glibmm-2.64.2.ebuild
@@ -20,13 +20,22 @@ RDEPEND="
DEPEND="${RDEPEND}"
BDEPEND="
virtual/pkgconfig
- doc? ( app-doc/doxygen )
>=dev-cpp/mm-common-1.0.0
+ sys-devel/m4
+ dev-lang/perl
+ doc? (
+ app-doc/doxygen
+ dev-libs/libxslt
+ media-gfx/graphviz
+ )
"
src_prepare() {
default
+ # giomm_tls_client requires FEATURES=-network-sandbox and glib-networking rdep
+ sed -i -e '/giomm_tls_client/d' tests/meson.build || die
+
if ! use test; then
sed -i -e "/^subdir('tests')/d" meson.build || die
fi
@@ -34,7 +43,7 @@ src_prepare() {
multilib_src_configure() {
local emesonargs=(
- -Dmaintainer-mode=true
+ -Dmaintainer-mode=true # Set false and drop mm-common dep once tarballs are made with meson/ninja
-Dwarnings=min
-Dbuild-deprecated-api=true
-Dbuild-documentation=$(usex doc true false)
diff --git a/dev-cpp/gtest/Manifest b/dev-cpp/gtest/Manifest
index dbb3e6432db2..49066ef5fa41 100644
--- a/dev-cpp/gtest/Manifest
+++ b/dev-cpp/gtest/Manifest
@@ -1,4 +1,2 @@
-DIST gtest-1.10.0.tar.gz 904227 BLAKE2B 96b97b06730a9f55505a4d40bd4861560503a1437d29dadc6e8d3c743ccde020e61b3f96082fb9bda0666d739e69d3990bad06161e9c531c40021dc0826f5547 SHA512 7ebf5b4a80f364564066ccc7ce2e2092b12942a754c4854afd97380f19811e0fd45c300d423234cda0e05966ddbdaebcb1625e856ce55b0c81b0bae0dd971532
-DIST gtest-1.8.0.tar.gz 1281617 BLAKE2B ac052b4d0eb0d8ded03a8c7dff05177818627b8a51f2dbc2c162b2ee2a5d1323539e7d0d02236d9ebb799995e018f0171c2fdaeb4de3bb339548265e50de79e6 SHA512 1dbece324473e53a83a60601b02c92c089f5d314761351974e097b2cf4d24af4296f9eb8653b6b03b1e363d9c5f793897acae1f0c7ac40149216035c4d395d9d
-DIST gtest-1.8.1.tar.gz 992298 BLAKE2B 40ef3417fe424205c0617f07207347ce671ac87605f8ac9b8a333b0b06e3fbef9f556041ee324c18f957f3258ab9fe06704f31cdd038355fb7890180eb77ced1 SHA512 e6283c667558e1fd6e49fa96e52af0e415a3c8037afe1d28b7ff1ec4c2ef8f49beb70a9327b7fc77eb4052a58c4ccad8b5260ec90e4bceeac7a46ff59c4369d7
+DIST gtest-1.10.0_p20200702.tar.gz 866900 BLAKE2B c162d47868583ba270675abe5df935b8f4b9a9c00dbdc80dd88afa7f2b98266640b32b2ea5e8f9f6d6227196b5d2f79dbfda4e9585106224e814cc1503cf777d SHA512 715d887b59b47d4691c7c90ef0cf0ffc3d1e758e500263c76b50fd506e90a9d1c390af745933cfe3f55e1edac5d72dccedef3cb9a50b71a5b796424471a3017b
DIST gtest-1.9.0_pre20190607.tar.gz 958396 BLAKE2B 64ae2c86a320a6ed56d6f99383591f7a0176e3f1291144bddf6dc82733c78177963f95516bbaed494318d3d7451d164aeb0d4a192b415414bcc25b9875cf6e82 SHA512 6c17ba303ec1dc8a989075a6dc0eda9b023345d00f6b43e588676cc2cd291f8c508744e4aba86a6c6b651329ce47419ad04d5765ca5978eda507a1643e8a92c3
diff --git a/dev-cpp/gtest/files/gtest-1.8.0-increase-clone-stack-size.patch b/dev-cpp/gtest/files/gtest-1.10.0_p20200702-increase-clone-stack-size.patch
similarity index 67%
rename from dev-cpp/gtest/files/gtest-1.8.0-increase-clone-stack-size.patch
rename to dev-cpp/gtest/files/gtest-1.10.0_p20200702-increase-clone-stack-size.patch
index 22ac0b6d4a12..3e06777ac9a9 100644
--- a/dev-cpp/gtest/files/gtest-1.8.0-increase-clone-stack-size.patch
+++ b/dev-cpp/gtest/files/gtest-1.10.0_p20200702-increase-clone-stack-size.patch
@@ -1,5 +1,4 @@
-Bug: https://bugs.gentoo.org/629620
-Upstream PR: https://github.com/google/googletest/pull/1274
+Bug: https://bugs.gentoo.org/692464
--- a/googletest/src/gtest-death-test.cc
+++ b/googletest/src/gtest-death-test.cc
@@ -7,8 +6,8 @@ Upstream PR: https://github.com/google/googletest/pull/1274
if (!use_fork) {
static const bool stack_grows_down = StackGrowsDown();
-- const size_t stack_size = getpagesize();
-+ const size_t stack_size = getpagesize() * 10;
+- const auto stack_size = static_cast(getpagesize() * 2);
++ const auto stack_size = static_cast(getpagesize() * 10);
// MMAP_ANONYMOUS is not defined on Mac, so we use MAP_ANON instead.
void* const stack = mmap(NULL, stack_size, PROT_READ | PROT_WRITE,
MAP_ANON | MAP_PRIVATE, -1, 0);
diff --git a/dev-cpp/gtest/files/gtest-1.8.0-fix-doublefree.patch b/dev-cpp/gtest/files/gtest-1.8.0-fix-doublefree.patch
deleted file mode 100644
index 40fa1f6668bc..000000000000
--- a/dev-cpp/gtest/files/gtest-1.8.0-fix-doublefree.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-Bug: https://bugs.gentoo.org/631698
-Upstream PR: https://github.com/google/googletest/pull/1339
-
-From 0663ce9024c9b78ddf6eb3fc1ceb45361ed91767 Mon Sep 17 00:00:00 2001
-From: Romain Geissler
-Date: Sat, 2 Dec 2017 22:47:20 +0100
-Subject: [PATCH] Fix double free when building Gtest/GMock in shared libraries
- and linking a test executable with both.
-
----
- googlemock/CMakeLists.txt | 63 ++++++++++++++++++++++++++++++-----------------
- 1 file changed, 40 insertions(+), 23 deletions(-)
-
-diff --git a/googlemock/CMakeLists.txt b/googlemock/CMakeLists.txt
-index 724fdd5f0..f7bad8afc 100644
---- a/googlemock/CMakeLists.txt
-+++ b/googlemock/CMakeLists.txt
-@@ -86,16 +86,23 @@ endif()
- # Google Mock libraries. We build them using more strict warnings than what
- # are used for other targets, to ensure that Google Mock can be compiled by
- # a user aggressive about warnings.
--cxx_library(gmock
-- "${cxx_strict}"
-- "${gtest_dir}/src/gtest-all.cc"
-- src/gmock-all.cc)
--
--cxx_library(gmock_main
-- "${cxx_strict}"
-- "${gtest_dir}/src/gtest-all.cc"
-- src/gmock-all.cc
-- src/gmock_main.cc)
-+if (MSVC)
-+ cxx_library(gmock
-+ "${cxx_strict}"
-+ "${gtest_dir}/src/gtest-all.cc"
-+ src/gmock-all.cc)
-+
-+ cxx_library(gmock_main
-+ "${cxx_strict}"
-+ "${gtest_dir}/src/gtest-all.cc"
-+ src/gmock-all.cc
-+ src/gmock_main.cc)
-+else()
-+ cxx_library(gmock "${cxx_strict}" src/gmock-all.cc)
-+ target_link_libraries(gmock gtest)
-+ cxx_library(gmock_main "${cxx_strict}" src/gmock_main.cc)
-+ target_link_libraries(gmock_main gmock)
-+endif()
-
- # If the CMake version supports it, attach header directory information
- # to the targets for when we are part of a parent build (ie being pulled
-@@ -175,23 +182,33 @@ if (gmock_build_tests)
- ############################################################
- # C++ tests built with non-standard compiler flags.
-
-- cxx_library(gmock_main_no_exception "${cxx_no_exception}"
-- "${gtest_dir}/src/gtest-all.cc" src/gmock-all.cc src/gmock_main.cc)
--
-- cxx_library(gmock_main_no_rtti "${cxx_no_rtti}"
-- "${gtest_dir}/src/gtest-all.cc" src/gmock-all.cc src/gmock_main.cc)
-+ if (MSVC)
-+ cxx_library(gmock_main_no_exception "${cxx_no_exception}"
-+ "${gtest_dir}/src/gtest-all.cc" src/gmock-all.cc src/gmock_main.cc)
-
-- if (NOT MSVC OR MSVC_VERSION LESS 1600) # 1600 is Visual Studio 2010.
-- # Visual Studio 2010, 2012, and 2013 define symbols in std::tr1 that
-- # conflict with our own definitions. Therefore using our own tuple does not
-- # work on those compilers.
-- cxx_library(gmock_main_use_own_tuple "${cxx_use_own_tuple}"
-+ cxx_library(gmock_main_no_rtti "${cxx_no_rtti}"
- "${gtest_dir}/src/gtest-all.cc" src/gmock-all.cc src/gmock_main.cc)
-
-- cxx_test_with_flags(gmock_use_own_tuple_test "${cxx_use_own_tuple}"
-- gmock_main_use_own_tuple test/gmock-spec-builders_test.cc)
-+ if (MSVC_VERSION LESS 1600) # 1600 is Visual Studio 2010.
-+ # Visual Studio 2010, 2012, and 2013 define symbols in std::tr1 that
-+ # conflict with our own definitions. Therefore using our own tuple does not
-+ # work on those compilers.
-+ cxx_library(gmock_main_use_own_tuple "${cxx_use_own_tuple}"
-+ "${gtest_dir}/src/gtest-all.cc" src/gmock-all.cc src/gmock_main.cc)
-+
-+ cxx_test_with_flags(gmock_use_own_tuple_test "${cxx_use_own_tuple}"
-+ gmock_main_use_own_tuple test/gmock-spec-builders_test.cc)
-+ endif()
-+ else()
-+ cxx_library(gmock_main_no_exception "${cxx_no_exception}" src/gmock_main.cc)
-+ target_link_libraries(gmock_main_no_exception gmock)
-+
-+ cxx_library(gmock_main_no_rtti "${cxx_no_rtti}" src/gmock_main.cc)
-+ target_link_libraries(gmock_main_no_rtti gmock)
-+
-+ cxx_library(gmock_main_use_own_tuple "${cxx_use_own_tuple}" src/gmock_main.cc)
-+ target_link_libraries(gmock_main_use_own_tuple gmock)
- endif()
--
- cxx_test_with_flags(gmock-more-actions_no_exception_test "${cxx_no_exception}"
- gmock_main_no_exception test/gmock-more-actions_test.cc)
-
diff --git a/dev-cpp/gtest/files/gtest-1.8.0-fix-gcc6-undefined-behavior.patch b/dev-cpp/gtest/files/gtest-1.8.0-fix-gcc6-undefined-behavior.patch
deleted file mode 100644
index eadfe6197389..000000000000
--- a/dev-cpp/gtest/files/gtest-1.8.0-fix-gcc6-undefined-behavior.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Fix build with GCC 6 due to lifetime issues.
-
---- a/googletest/src/gtest.cc
-+++ b/googletest/src/gtest.cc
-@@ -2654,10 +2654,12 @@
- test->Run();
- }
-
-- // Deletes the test object.
-- impl->os_stack_trace_getter()->UponLeavingGTest();
-- internal::HandleExceptionsInMethodIfSupported(
-- test, &Test::DeleteSelf_, "the test fixture's destructor");
-+ if (test != NULL) {
-+ // Deletes the test object.
-+ impl->os_stack_trace_getter()->UponLeavingGTest();
-+ internal::HandleExceptionsInMethodIfSupported(
-+ test, &Test::DeleteSelf_, "the test fixture's destructor");
-+ }
-
- result_.set_elapsed_time(internal::GetTimeInMillis() - start);
-
diff --git a/dev-cpp/gtest/files/gtest-1.8.0-multilib-strict.patch b/dev-cpp/gtest/files/gtest-1.8.0-multilib-strict.patch
deleted file mode 100644
index c18b58e16fb6..000000000000
--- a/dev-cpp/gtest/files/gtest-1.8.0-multilib-strict.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- a/googlemock/CMakeLists.txt
-+++ b/googlemock/CMakeLists.txt
-@@ -11,6 +11,8 @@
-
- option(gmock_build_tests "Build all of Google Mock's own tests." OFF)
-
-+set(LIB_INSTALL_DIR lib CACHE STRING "Library install directory")
-+
- # A directory to find Google Test sources.
- if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/gtest/CMakeLists.txt")
- set(gtest_dir gtest)
-@@ -104,7 +106,7 @@
- #
- # Install rules
- install(TARGETS gmock gmock_main
-- DESTINATION lib)
-+ DESTINATION ${LIB_INSTALL_DIR})
- install(DIRECTORY ${gmock_SOURCE_DIR}/include/gmock
- DESTINATION include)
-
---- a/googletest/CMakeLists.txt
-+++ b/googletest/CMakeLists.txt
-@@ -27,6 +27,8 @@
- "Build gtest with internal symbols hidden in shared libraries."
- OFF)
-
-+set(LIB_INSTALL_DIR lib CACHE STRING "Library install directory")
-+
- # Defines pre_project_set_up_hermetic_build() and set_up_hermetic_build().
- include(cmake/hermetic_build.cmake OPTIONAL)
-
-@@ -103,7 +105,7 @@
- #
- # Install rules
- install(TARGETS gtest gtest_main
-- DESTINATION lib)
-+ DESTINATION ${LIB_INSTALL_DIR})
- install(DIRECTORY ${gtest_SOURCE_DIR}/include/gtest
- DESTINATION include)
-
diff --git a/dev-cpp/gtest/files/gtest-1.9.0_pre20190607-increase-clone-stack-size.patch b/dev-cpp/gtest/files/gtest-1.9.0_pre20190607-increase-clone-stack-size.patch
old mode 100755
new mode 100644
diff --git a/dev-cpp/gtest/files/gtest-9999-fix-gcc6-undefined-behavior.patch b/dev-cpp/gtest/files/gtest-9999-fix-gcc6-undefined-behavior.patch
deleted file mode 100644
index 8dfed46d4585..000000000000
--- a/dev-cpp/gtest/files/gtest-9999-fix-gcc6-undefined-behavior.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Fix build with GCC 6 due to lifetime issues.
-
---- a/googletest/src/gtest.cc
-+++ b/googletest/src/gtest.cc
-@@ -2693,10 +2693,12 @@
- test->Run();
- }
-
-+ if (test != NULL) {
- // Deletes the test object.
- impl->os_stack_trace_getter()->UponLeavingGTest();
- internal::HandleExceptionsInMethodIfSupported(
- test, &Test::DeleteSelf_, "the test fixture's destructor");
-+ }
-
- result_.set_elapsed_time(internal::GetTimeInMillis() - start);
-
diff --git a/dev-cpp/gtest/files/gtest-9999-fix-py-tests.patch b/dev-cpp/gtest/files/gtest-9999-fix-py-tests.patch
deleted file mode 100644
index ba63c7b3eeb3..000000000000
--- a/dev-cpp/gtest/files/gtest-9999-fix-py-tests.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Fix python tests that use broken generator expressions
-
---- a/googletest/cmake/internal_utils.cmake
-+++ b/googletest/cmake/internal_utils.cmake
-@@ -247,12 +247,12 @@
- add_test(
- NAME ${name}
- COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/test/${name}.py
-- --build_dir=${CMAKE_CURRENT_BINARY_DIR}/$)
-+ --build_dir=${CMAKE_CURRENT_BINARY_DIR})
- else (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 3.1)
- add_test(
- ${name}
- ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/test/${name}.py
-- --build_dir=${CMAKE_CURRENT_BINARY_DIR}/\${CTEST_CONFIGURATION_TYPE})
-+ --build_dir=${CMAKE_CURRENT_BINARY_DIR})
- endif (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 3.1)
- endif()
- endfunction()
diff --git a/dev-cpp/gtest/gtest-1.10.0.ebuild b/dev-cpp/gtest/gtest-1.10.0_p20200702.ebuild
similarity index 88%
rename from dev-cpp/gtest/gtest-1.10.0.ebuild
rename to dev-cpp/gtest/gtest-1.10.0_p20200702.ebuild
index 12d496c44be4..560a1e282be2 100644
--- a/dev-cpp/gtest/gtest-1.10.0.ebuild
+++ b/dev-cpp/gtest/gtest-1.10.0_p20200702.ebuild
@@ -4,11 +4,12 @@
EAPI=7
# Python is required for tests and some build tasks.
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+
CMAKE_ECLASS=cmake
inherit cmake-multilib python-any-r1
-MY_PV=1.10.x
+GOOGLETEST_COMMIT=aee0f9d9b5b87796ee8a0ab26b7587ec30e8858e
if [[ ${PV} == "9999" ]]; then
inherit git-r3
@@ -32,11 +33,10 @@ SLOT="0"
IUSE="doc examples test"
RESTRICT="!test? ( test )"
-DEPEND="test? ( ${PYTHON_DEPS} )"
-RDEPEND="!dev-cpp/gmock"
+BDEPEND="test? ( ${PYTHON_DEPS} )"
PATCHES=(
- "${FILESDIR}"/${PN}-1.9.0_pre20190607-increase-clone-stack-size.patch
+ "${FILESDIR}"/${PN}-1.10.0_p20200702-increase-clone-stack-size.patch
)
pkg_setup() {
diff --git a/dev-cpp/gtest/gtest-1.8.0-r1.ebuild b/dev-cpp/gtest/gtest-1.8.0-r1.ebuild
deleted file mode 100644
index bf4d578fa31f..000000000000
--- a/dev-cpp/gtest/gtest-1.8.0-r1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# Python is required for tests and some build tasks.
-PYTHON_COMPAT=( python3_6 )
-
-inherit python-any-r1 cmake-multilib
-
-DESCRIPTION="Google C++ Testing Framework"
-HOMEPAGE="https://github.com/google/googletest"
-SRC_URI="https://github.com/google/googletest/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="doc examples test"
-RESTRICT="!test? ( test )"
-
-DEPEND="test? ( ${PYTHON_DEPS} )"
-RDEPEND="!dev-cpp/gmock"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-9999-fix-py-tests.patch
- "${FILESDIR}"/${PN}-1.8.0-fix-gcc6-undefined-behavior.patch
- "${FILESDIR}"/${PN}-1.8.0-multilib-strict.patch
- "${FILESDIR}"/${PN}-1.8.0-increase-clone-stack-size.patch
- "${FILESDIR}"/${PN}-1.8.0-fix-doublefree.patch
-)
-
-S="${WORKDIR}"/googletest-release-${PV}
-
-pkg_setup() {
- use test && python-any-r1_pkg_setup
-}
-
-multilib_src_configure() {
- local mycmakeargs=(
- -DBUILD_GMOCK=ON
- -DBUILD_GTEST=ON
- -DLIB_INSTALL_DIR=$(get_libdir)
- -Dgtest_build_samples=OFF
- -Dgtest_disable_pthreads=OFF
- -DBUILD_SHARED_LIBS=ON
-
- # tests
- -Dgmock_build_tests=$(usex test)
- -Dgtest_build_tests=$(usex test)
- -DPYTHON_EXECUTABLE="${PYTHON}"
- )
- cmake-utils_src_configure mycmakeargs
-}
-
-multilib_src_install_all() {
- einstalldocs
-
- if use doc; then
- docinto googletest
- dodoc -r googletest/docs/*
- docinto googlemock
- dodoc -r googlemock/docs/*
- fi
-
- if use examples; then
- docinto examples
- dodoc googletest/samples/*.{cc,h}
- fi
-}
diff --git a/dev-cpp/gtest/gtest-1.8.0.ebuild b/dev-cpp/gtest/gtest-1.8.0.ebuild
deleted file mode 100644
index 2d1d2af328f7..000000000000
--- a/dev-cpp/gtest/gtest-1.8.0.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# Python is required for tests and some build tasks.
-PYTHON_COMPAT=( python3_6 )
-
-inherit python-any-r1 cmake-multilib
-
-DESCRIPTION="Google C++ Testing Framework"
-HOMEPAGE="https://github.com/google/googletest"
-SRC_URI="https://github.com/google/googletest/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="doc examples test"
-RESTRICT="!test? ( test )"
-
-DEPEND="test? ( ${PYTHON_DEPS} )"
-RDEPEND="!dev-cpp/gmock"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-9999-fix-py-tests.patch
- "${FILESDIR}"/${PN}-1.8.0-fix-gcc6-undefined-behavior.patch
- "${FILESDIR}"/${PN}-1.8.0-multilib-strict.patch
- "${FILESDIR}"/${PN}-1.8.0-increase-clone-stack-size.patch
-)
-
-S="${WORKDIR}"/googletest-release-${PV}
-
-pkg_setup() {
- use test && python-any-r1_pkg_setup
-}
-
-multilib_src_configure() {
- local mycmakeargs=(
- -DBUILD_GMOCK=ON
- -DBUILD_GTEST=ON
- -DLIB_INSTALL_DIR=$(get_libdir)
- -Dgtest_build_samples=OFF
- -Dgtest_disable_pthreads=OFF
- -DBUILD_SHARED_LIBS=ON
-
- # tests
- -Dgmock_build_tests=$(usex test)
- -Dgtest_build_tests=$(usex test)
- -DPYTHON_EXECUTABLE="${PYTHON}"
- )
- cmake-utils_src_configure mycmakeargs
-}
-
-multilib_src_install_all() {
- einstalldocs
-
- if use doc; then
- docinto googletest
- dodoc -r googletest/docs/*
- docinto googlemock
- dodoc -r googlemock/docs/*
- fi
-
- if use examples; then
- docinto examples
- dodoc googletest/samples/*.{cc,h}
- fi
-}
diff --git a/dev-cpp/gtest/gtest-1.8.1-r1.ebuild b/dev-cpp/gtest/gtest-1.8.1-r1.ebuild
deleted file mode 100644
index 030ed3477e90..000000000000
--- a/dev-cpp/gtest/gtest-1.8.1-r1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# Python is required for tests and some build tasks.
-PYTHON_COMPAT=( python2_7 )
-CMAKE_ECLASS=cmake
-inherit cmake-multilib python-any-r1
-
-if [[ ${PV} == "9999" ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/google/googletest"
-else
- SRC_URI="https://github.com/google/googletest/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
- S="${WORKDIR}"/googletest-release-${PV}
-fi
-
-DESCRIPTION="Google C++ Testing Framework"
-HOMEPAGE="https://github.com/google/googletest"
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="doc examples test"
-RESTRICT="!test? ( test )"
-
-DEPEND="test? ( ${PYTHON_DEPS} )"
-RDEPEND="!dev-cpp/gmock"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-9999-fix-gcc6-undefined-behavior.patch
- "${FILESDIR}"/${PN}-1.8.0-increase-clone-stack-size.patch
-)
-
-pkg_setup() {
- use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
- cmake_src_prepare
-
- sed -i -e '/set(cxx_base_flags /s:-Werror::' \
- googletest/cmake/internal_utils.cmake || die "sed failed!"
-}
-
-multilib_src_configure() {
- local mycmakeargs=(
- -DBUILD_GMOCK=ON
- -DINSTALL_GTEST=ON
-
- # tests
- -Dgmock_build_tests=$(usex test)
- -Dgtest_build_tests=$(usex test)
- -DPYTHON_EXECUTABLE="${PYTHON}"
- )
- cmake_src_configure
-}
-
-multilib_src_install_all() {
- einstalldocs
-
- if use doc; then
- docinto googletest
- dodoc -r googletest/docs/.
- docinto googlemock
- dodoc -r googlemock/docs/.
- fi
-
- if use examples; then
- docinto examples
- dodoc googletest/samples/*.{cc,h}
- fi
-}
diff --git a/dev-cpp/gtest/gtest-1.8.1.ebuild b/dev-cpp/gtest/gtest-1.8.1.ebuild
deleted file mode 100644
index 4c66697b04aa..000000000000
--- a/dev-cpp/gtest/gtest-1.8.1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-# Python is required for tests and some build tasks.
-PYTHON_COMPAT=( python2_7 )
-
-inherit cmake-multilib python-any-r1
-
-if [[ ${PV} == "9999" ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/google/googletest"
-else
- SRC_URI="https://github.com/google/googletest/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
- S="${WORKDIR}"/googletest-release-${PV}
-fi
-
-DESCRIPTION="Google C++ Testing Framework"
-HOMEPAGE="https://github.com/google/googletest"
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="doc examples test"
-RESTRICT="!test? ( test )"
-
-DEPEND="test? ( ${PYTHON_DEPS} )"
-RDEPEND="!dev-cpp/gmock"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-9999-fix-gcc6-undefined-behavior.patch
- "${FILESDIR}"/${PN}-1.8.0-increase-clone-stack-size.patch
-)
-
-pkg_setup() {
- use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
- cmake-utils_src_prepare
-
- sed -i -e '/set(cxx_base_flags /s:-Werror::' \
- googletest/cmake/internal_utils.cmake || die "sed failed!"
-}
-
-multilib_src_configure() {
- local mycmakeargs=(
- -DBUILD_GMOCK=ON
- -DINSTALL_GTEST=ON
- -DBUILD_SHARED_LIBS=ON
-
- # tests
- -Dgmock_build_tests=$(usex test)
- -Dgtest_build_tests=$(usex test)
- -DPYTHON_EXECUTABLE="${PYTHON}"
- )
- cmake-utils_src_configure
-}
-
-multilib_src_install_all() {
- einstalldocs
-
- if use doc; then
- docinto googletest
- dodoc -r googletest/docs/.
- docinto googlemock
- dodoc -r googlemock/docs/.
- fi
-
- if use examples; then
- docinto examples
- dodoc googletest/samples/*.{cc,h}
- fi
-}
diff --git a/dev-cpp/gtest/gtest-9999.ebuild b/dev-cpp/gtest/gtest-9999.ebuild
index 753803041fce..40af1cfe82d5 100644
--- a/dev-cpp/gtest/gtest-9999.ebuild
+++ b/dev-cpp/gtest/gtest-9999.ebuild
@@ -4,7 +4,7 @@
EAPI=7
# Python is required for tests and some build tasks.
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
CMAKE_ECLASS=cmake
inherit cmake-multilib python-any-r1
@@ -31,11 +31,10 @@ SLOT="0"
IUSE="doc examples test"
RESTRICT="!test? ( test )"
-DEPEND="test? ( ${PYTHON_DEPS} )"
-RDEPEND="!dev-cpp/gmock"
+BDEPEND="test? ( ${PYTHON_DEPS} )"
PATCHES=(
- "${FILESDIR}"/${PN}-1.9.0_pre20190607-increase-clone-stack-size.patch
+ "${FILESDIR}"/${PN}-1.10.0_p20200702-increase-clone-stack-size.patch
)
pkg_setup() {
diff --git a/dev-erlang/Manifest.gz b/dev-erlang/Manifest.gz
index f4a01f59863b..a1f29e70b7ba 100644
Binary files a/dev-erlang/Manifest.gz and b/dev-erlang/Manifest.gz differ
diff --git a/dev-erlang/base64url/base64url-1.0.1.ebuild b/dev-erlang/base64url/base64url-1.0.1.ebuild
index 3d320992ddfe..9bea27726e87 100644
--- a/dev-erlang/base64url/base64url-1.0.1.ebuild
+++ b/dev-erlang/base64url/base64url-1.0.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/dvv/base64url/archive/${PV}.tar.gz
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
DEPEND=">=dev-lang/erlang-17.1"
RDEPEND="${DEPEND}"
diff --git a/dev-erlang/eimp/eimp-1.0.15.ebuild b/dev-erlang/eimp/eimp-1.0.15.ebuild
index 44b63d1e2af5..6669ad6224c9 100644
--- a/dev-erlang/eimp/eimp-1.0.15.ebuild
+++ b/dev-erlang/eimp/eimp-1.0.15.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/processone/eimp/archive/${PV}.tar.gz
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
RDEPEND=">=dev-lang/erlang-17.1
>=dev-erlang/p1_utils-1.0.19
diff --git a/dev-erlang/idna/idna-6.0.0.ebuild b/dev-erlang/idna/idna-6.0.0.ebuild
index 055a6e9fb24e..dd5f60ec8b83 100644
--- a/dev-erlang/idna/idna-6.0.0.ebuild
+++ b/dev-erlang/idna/idna-6.0.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/benoitc/erlang-idna/archive/${PV}.tar.gz
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
DEPEND=">=dev-lang/erlang-21.0"
diff --git a/dev-erlang/jose/jose-1.10.1.ebuild b/dev-erlang/jose/jose-1.10.1.ebuild
index 6cb4e86bc131..0680fcfc6047 100644
--- a/dev-erlang/jose/jose-1.10.1.ebuild
+++ b/dev-erlang/jose/jose-1.10.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/potatosalad/erlang-jose/archive/${PV}.tar.gz
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
IUSE=""
DEPEND=">=dev-lang/erlang-19.0"
diff --git a/dev-erlang/mqtree/mqtree-1.0.7.ebuild b/dev-erlang/mqtree/mqtree-1.0.7.ebuild
index 54901bfa07a2..3ed3be3d78f0 100644
--- a/dev-erlang/mqtree/mqtree-1.0.7.ebuild
+++ b/dev-erlang/mqtree/mqtree-1.0.7.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~sparc"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc"
DEPEND=">=dev-lang/erlang-17.5
>=dev-erlang/p1_utils-1.0.18"
diff --git a/dev-erlang/p1_acme/p1_acme-1.0.5.ebuild b/dev-erlang/p1_acme/p1_acme-1.0.5.ebuild
index ef4e61ce6b0c..f4e07450779f 100644
--- a/dev-erlang/p1_acme/p1_acme-1.0.5.ebuild
+++ b/dev-erlang/p1_acme/p1_acme-1.0.5.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~sparc"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc"
DEPEND=">=dev-lang/erlang-17.1
>=dev-erlang/jiffy-1.0.1
diff --git a/dev-erlang/pkix/pkix-1.0.5.ebuild b/dev-erlang/pkix/pkix-1.0.5.ebuild
index c14edf0234b7..8daab481714e 100644
--- a/dev-erlang/pkix/pkix-1.0.5.ebuild
+++ b/dev-erlang/pkix/pkix-1.0.5.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~sparc"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc"
DEPEND=">=dev-lang/erlang-17.5"
RDEPEND="${DEPEND}"
diff --git a/dev-erlang/xmpp/xmpp-1.4.7.ebuild b/dev-erlang/xmpp/xmpp-1.4.7.ebuild
index 9386d5999b03..9a617b91783a 100644
--- a/dev-erlang/xmpp/xmpp-1.4.7.ebuild
+++ b/dev-erlang/xmpp/xmpp-1.4.7.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
RDEPEND=">=dev-erlang/ezlib-1.0.7
>=dev-erlang/fast_tls-1.1.6
diff --git a/dev-games/Manifest.gz b/dev-games/Manifest.gz
index d3bafe5dba3f..48c4865a11e6 100644
Binary files a/dev-games/Manifest.gz and b/dev-games/Manifest.gz differ
diff --git a/dev-games/tiled/tiled-1.4.1.ebuild b/dev-games/tiled/tiled-1.4.1.ebuild
index e6816833629d..2579d6320997 100644
--- a/dev-games/tiled/tiled-1.4.1.ebuild
+++ b/dev-games/tiled/tiled-1.4.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/bjorn/tiled/archive/v${PV}/${P}.tar.gz"
LICENSE="BSD BSD-2 GPL-2+"
SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
IUSE="examples python"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/dev-go/Manifest.gz b/dev-go/Manifest.gz
index 9c050054236e..5d406ffa655b 100644
Binary files a/dev-go/Manifest.gz and b/dev-go/Manifest.gz differ
diff --git a/dev-go/golint/golint-0_pre20200301.ebuild b/dev-go/golint/golint-0_pre20200301.ebuild
index 667f9da059da..5a2861e7ffc6 100644
--- a/dev-go/golint/golint-0_pre20200301.ebuild
+++ b/dev-go/golint/golint-0_pre20200301.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
@@ -28,7 +28,7 @@ SRC_URI="https://github.com/golang/lint/archive/${EGIT_COMMIT}.tar.gz -> ${P}.ta
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
S=${WORKDIR}/lint-${EGIT_COMMIT}
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 3f116fde9703..e2a3ed5a1995 100644
Binary files a/dev-java/Manifest.gz and b/dev-java/Manifest.gz differ
diff --git a/dev-java/ant-antlr/ant-antlr-1.10.8.ebuild b/dev-java/ant-antlr/ant-antlr-1.10.8.ebuild
index 5c9652cd583e..dd99b484b40b 100644
--- a/dev-java/ant-antlr/ant-antlr-1.10.8.ebuild
+++ b/dev-java/ant-antlr/ant-antlr-1.10.8.ebuild
@@ -10,7 +10,7 @@ ANT_TASK_DEPNAME=""
inherit ant-tasks
DESCRIPTION="Apache Ant's optional tasks for Antlr"
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND=">=dev-java/antlr-2.7.7-r7:0"
diff --git a/dev-java/ant-apache-bcel/ant-apache-bcel-1.10.8.ebuild b/dev-java/ant-apache-bcel/ant-apache-bcel-1.10.8.ebuild
index 1dc654ff0b8d..52db2870e204 100644
--- a/dev-java/ant-apache-bcel/ant-apache-bcel-1.10.8.ebuild
+++ b/dev-java/ant-apache-bcel/ant-apache-bcel-1.10.8.ebuild
@@ -9,7 +9,7 @@ ANT_TASK_DEPNAME="bcel"
inherit ant-tasks
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
DEPEND=">=dev-java/bcel-5.1-r3:0"
RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-apache-bsf/ant-apache-bsf-1.10.8.ebuild b/dev-java/ant-apache-bsf/ant-apache-bsf-1.10.8.ebuild
index 4fd4bd7de77a..3c8fb636298f 100644
--- a/dev-java/ant-apache-bsf/ant-apache-bsf-1.10.8.ebuild
+++ b/dev-java/ant-apache-bsf/ant-apache-bsf-1.10.8.ebuild
@@ -9,7 +9,7 @@ ANT_TASK_DEPNAME="bsf-2.3"
inherit ant-tasks
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="python javascript tcl"
DEPEND=">=dev-java/bsf-2.4.0-r1:2.3[python?,javascript?,tcl?]"
diff --git a/dev-java/ant-apache-log4j/ant-apache-log4j-1.10.8.ebuild b/dev-java/ant-apache-log4j/ant-apache-log4j-1.10.8.ebuild
index ed32b97a9daa..29c114551b97 100644
--- a/dev-java/ant-apache-log4j/ant-apache-log4j-1.10.8.ebuild
+++ b/dev-java/ant-apache-log4j/ant-apache-log4j-1.10.8.ebuild
@@ -9,7 +9,7 @@ ANT_TASK_DEPNAME="log4j"
inherit ant-tasks
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
DEPEND=">=dev-java/log4j-1.2.13-r2:0"
RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-apache-oro/ant-apache-oro-1.10.8.ebuild b/dev-java/ant-apache-oro/ant-apache-oro-1.10.8.ebuild
index 98ea50b1d731..ed7069776e54 100644
--- a/dev-java/ant-apache-oro/ant-apache-oro-1.10.8.ebuild
+++ b/dev-java/ant-apache-oro/ant-apache-oro-1.10.8.ebuild
@@ -9,7 +9,7 @@ ANT_TASK_DEPNAME="jakarta-oro-2.0"
inherit ant-tasks
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
DEPEND=">=dev-java/jakarta-oro-2.0.8-r2:2.0"
RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-apache-regexp/ant-apache-regexp-1.10.8.ebuild b/dev-java/ant-apache-regexp/ant-apache-regexp-1.10.8.ebuild
index b098bce35acd..d5abad147f74 100644
--- a/dev-java/ant-apache-regexp/ant-apache-regexp-1.10.8.ebuild
+++ b/dev-java/ant-apache-regexp/ant-apache-regexp-1.10.8.ebuild
@@ -9,7 +9,7 @@ ANT_TASK_DEPNAME="jakarta-regexp-1.4"
inherit ant-tasks
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
DEPEND=">=dev-java/jakarta-regexp-1.4-r1:1.4"
RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-apache-resolver/ant-apache-resolver-1.10.8.ebuild b/dev-java/ant-apache-resolver/ant-apache-resolver-1.10.8.ebuild
index 12677e429825..f52a019bb575 100644
--- a/dev-java/ant-apache-resolver/ant-apache-resolver-1.10.8.ebuild
+++ b/dev-java/ant-apache-resolver/ant-apache-resolver-1.10.8.ebuild
@@ -9,7 +9,7 @@ ANT_TASK_DEPNAME="xml-commons-resolver"
inherit ant-tasks
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
DEPEND=">=dev-java/xml-commons-resolver-1.2:0"
RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-apache-xalan2/ant-apache-xalan2-1.10.8.ebuild b/dev-java/ant-apache-xalan2/ant-apache-xalan2-1.10.8.ebuild
index 69c89e747407..2977f62607c5 100644
--- a/dev-java/ant-apache-xalan2/ant-apache-xalan2-1.10.8.ebuild
+++ b/dev-java/ant-apache-xalan2/ant-apache-xalan2-1.10.8.ebuild
@@ -9,7 +9,7 @@ ANT_TASK_DEPNAME="xalan"
inherit ant-tasks
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
DEPEND="dev-java/xalan:0
dev-java/xalan-serializer:0"
diff --git a/dev-java/ant-commons-logging/ant-commons-logging-1.10.8.ebuild b/dev-java/ant-commons-logging/ant-commons-logging-1.10.8.ebuild
index 945cd57c2845..f36466b895fa 100644
--- a/dev-java/ant-commons-logging/ant-commons-logging-1.10.8.ebuild
+++ b/dev-java/ant-commons-logging/ant-commons-logging-1.10.8.ebuild
@@ -8,7 +8,7 @@ ANT_TASK_JREVER=1.8
inherit ant-tasks
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
DEPEND=">=dev-java/commons-logging-1.0.4-r2:0"
RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-commons-net/ant-commons-net-1.10.8.ebuild b/dev-java/ant-commons-net/ant-commons-net-1.10.8.ebuild
index ef7f3b2a5bea..fbaa9bfdc458 100644
--- a/dev-java/ant-commons-net/ant-commons-net-1.10.8.ebuild
+++ b/dev-java/ant-commons-net/ant-commons-net-1.10.8.ebuild
@@ -8,7 +8,7 @@ ANT_TASK_JREVER=1.8
inherit ant-tasks
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
DEPEND=">=dev-java/commons-net-1.4.1-r1:0"
RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-core/ant-core-1.10.8.ebuild b/dev-java/ant-core/ant-core-1.10.8.ebuild
index b7a55bbe6631..12b283e416e4 100644
--- a/dev-java/ant-core/ant-core-1.10.8.ebuild
+++ b/dev-java/ant-core/ant-core-1.10.8.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://archive.apache.org/dist/ant/source/${MY_P}-src.tar.bz2
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
CDEPEND=">=virtual/jdk-1.8:*"
DEPEND="${CDEPEND}"
diff --git a/dev-java/ant-jai/ant-jai-1.10.8.ebuild b/dev-java/ant-jai/ant-jai-1.10.8.ebuild
index 944faa9eca69..3a2873b650bb 100644
--- a/dev-java/ant-jai/ant-jai-1.10.8.ebuild
+++ b/dev-java/ant-jai/ant-jai-1.10.8.ebuild
@@ -9,7 +9,7 @@ ANT_TASK_DEPNAME="sun-jai-bin"
inherit ant-tasks
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ppc64 x86"
# Unmigrated, has textrels and there's also some source one now too.
DEPEND=">=dev-java/sun-jai-bin-1.1.2.01-r1"
diff --git a/dev-java/ant-javamail/ant-javamail-1.10.8.ebuild b/dev-java/ant-javamail/ant-javamail-1.10.8.ebuild
index 43f91c21316d..77606f4804c2 100644
--- a/dev-java/ant-javamail/ant-javamail-1.10.8.ebuild
+++ b/dev-java/ant-javamail/ant-javamail-1.10.8.ebuild
@@ -9,7 +9,7 @@ ANT_TASK_DEPNAME=( "gnu-jaf-1" "oracle-javamail" )
inherit ant-tasks
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
# needs some classes from javax.activation.* which are not in jdk 11
DEPEND="virtual/jdk:1.8
diff --git a/dev-java/ant-jdepend/ant-jdepend-1.10.8.ebuild b/dev-java/ant-jdepend/ant-jdepend-1.10.8.ebuild
index 7d83e53d76be..67fe2f25dbb0 100644
--- a/dev-java/ant-jdepend/ant-jdepend-1.10.8.ebuild
+++ b/dev-java/ant-jdepend/ant-jdepend-1.10.8.ebuild
@@ -8,7 +8,7 @@ ANT_TASK_JREVER=1.8
inherit ant-tasks
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
DEPEND=">=dev-java/jdepend-2.9-r2:0"
RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-jmf/ant-jmf-1.10.8.ebuild b/dev-java/ant-jmf/ant-jmf-1.10.8.ebuild
index 8e604704a6f3..eb69314716d0 100644
--- a/dev-java/ant-jmf/ant-jmf-1.10.8.ebuild
+++ b/dev-java/ant-jmf/ant-jmf-1.10.8.ebuild
@@ -13,4 +13,4 @@ inherit ant-tasks
DESCRIPTION="Apache Ant's optional tasks for the Java Media Framework (JMF)"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
diff --git a/dev-java/ant-jsch/ant-jsch-1.10.8.ebuild b/dev-java/ant-jsch/ant-jsch-1.10.8.ebuild
index d6a324a766ef..1cef81e7b4fd 100644
--- a/dev-java/ant-jsch/ant-jsch-1.10.8.ebuild
+++ b/dev-java/ant-jsch/ant-jsch-1.10.8.ebuild
@@ -8,7 +8,7 @@ ANT_TASK_JREVER=1.8
inherit ant-tasks
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
DEPEND=">=dev-java/jsch-0.1.37:0"
RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-junit/ant-junit-1.10.8.ebuild b/dev-java/ant-junit/ant-junit-1.10.8.ebuild
index 65978134b5b6..e02101593cf1 100644
--- a/dev-java/ant-junit/ant-junit-1.10.8.ebuild
+++ b/dev-java/ant-junit/ant-junit-1.10.8.ebuild
@@ -8,7 +8,7 @@ ANT_TASK_JREVER=1.8
inherit ant-tasks
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
DEPEND="
dev-java/junit:0
diff --git a/dev-java/ant-junit4/ant-junit4-1.10.8.ebuild b/dev-java/ant-junit4/ant-junit4-1.10.8.ebuild
index 5dcdbe73523e..71513c67cad9 100644
--- a/dev-java/ant-junit4/ant-junit4-1.10.8.ebuild
+++ b/dev-java/ant-junit4/ant-junit4-1.10.8.ebuild
@@ -9,7 +9,7 @@ ANT_TASK_DEPNAME="junit-4"
inherit ant-tasks
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ppc64 x86"
DEPEND="dev-java/junit:4
~dev-java/ant-junit-${PV}"
diff --git a/dev-java/ant-junitlauncher/ant-junitlauncher-1.10.8.ebuild b/dev-java/ant-junitlauncher/ant-junitlauncher-1.10.8.ebuild
index 09716cb8ae78..c60d0d72e416 100644
--- a/dev-java/ant-junitlauncher/ant-junitlauncher-1.10.8.ebuild
+++ b/dev-java/ant-junitlauncher/ant-junitlauncher-1.10.8.ebuild
@@ -9,4 +9,4 @@ ANT_TASK_DEPNAME=""
inherit ant-tasks
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
diff --git a/dev-java/ant-swing/ant-swing-1.10.8.ebuild b/dev-java/ant-swing/ant-swing-1.10.8.ebuild
index fb6c2dfced0f..379248be9a9c 100644
--- a/dev-java/ant-swing/ant-swing-1.10.8.ebuild
+++ b/dev-java/ant-swing/ant-swing-1.10.8.ebuild
@@ -12,4 +12,4 @@ inherit ant-tasks
DESCRIPTION="Apache Ant's optional tasks for Swing"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
diff --git a/dev-java/ant-testutil/ant-testutil-1.10.8.ebuild b/dev-java/ant-testutil/ant-testutil-1.10.8.ebuild
index e8763ba32556..dce4d1840353 100644
--- a/dev-java/ant-testutil/ant-testutil-1.10.8.ebuild
+++ b/dev-java/ant-testutil/ant-testutil-1.10.8.ebuild
@@ -9,7 +9,7 @@ ANT_TASK_JREVER=1.8
inherit ant-tasks
DESCRIPTION="Apache Ant's optional test utility classes"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
CDEPEND="dev-java/ant-core:0"
diff --git a/dev-java/ant-xz/ant-xz-1.10.8.ebuild b/dev-java/ant-xz/ant-xz-1.10.8.ebuild
index 2a299ab6dc1b..91ceb9835ab1 100644
--- a/dev-java/ant-xz/ant-xz-1.10.8.ebuild
+++ b/dev-java/ant-xz/ant-xz-1.10.8.ebuild
@@ -11,7 +11,7 @@ inherit ant-tasks
DESCRIPTION="Apache Ant's optional tasks for XZ compression"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
DEPEND="dev-java/xz-java"
RDEPEND="${DEPEND}"
diff --git a/dev-java/ant/ant-1.10.8.ebuild b/dev-java/ant/ant-1.10.8.ebuild
index 28e798b5fdde..20c1a2ead30c 100644
--- a/dev-java/ant/ant-1.10.8.ebuild
+++ b/dev-java/ant/ant-1.10.8.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://ant.apache.org/"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="X +antlr +bcel +bsf +commonslogging +commonsnet jai +javamail +jdepend jmf
+jsch +junit +junit4 +junitlauncher +log4j +oro +regexp +resolver swing testutil xz"
diff --git a/dev-java/antlr/antlr-3.5.2.ebuild b/dev-java/antlr/antlr-3.5.2.ebuild
index 330d0ce8f429..43986264fbcd 100644
--- a/dev-java/antlr/antlr-3.5.2.ebuild
+++ b/dev-java/antlr/antlr-3.5.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="5"
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}3/archive/${PV}.tar.gz -> ${P}.tar.gz
https://www.antlr3.org/download/${P}-complete.jar" # Prebuilt version needed.
LICENSE="BSD"
SLOT="3.5"
-KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="doc test"
RESTRICT="!test? ( test )"
diff --git a/dev-java/asm/asm-5.1.ebuild b/dev-java/asm/asm-5.1.ebuild
index e71765b94842..e210b62e4860 100644
--- a/dev-java/asm/asm-5.1.ebuild
+++ b/dev-java/asm/asm-5.1.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=5
@@ -14,7 +14,7 @@ SRC_URI="http://download.forge.objectweb.org/${PN}/${P}.tar.gz
LICENSE="BSD"
SLOT="4"
IUSE=""
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~x64-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos"
DEPEND=">=virtual/jdk-1.6"
RDEPEND=">=virtual/jre-1.6"
diff --git a/dev-java/bcprov/bcprov-1.54.ebuild b/dev-java/bcprov/bcprov-1.54.ebuild
index 0b89cd3146bc..45c74236f28e 100644
--- a/dev-java/bcprov/bcprov-1.54.ebuild
+++ b/dev-java/bcprov/bcprov-1.54.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=5
@@ -15,7 +15,7 @@ SRC_URI="http://www.bouncycastle.org/download/${MY_P}.tar.gz"
LICENSE="BSD"
SLOT="1.54"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
DEPEND=">=virtual/jdk-1.6
app-arch/unzip"
diff --git a/dev-java/commons-lang/commons-lang-3.6.ebuild b/dev-java/commons-lang/commons-lang-3.6.ebuild
index f6817c81ee26..6bdc27250953 100644
--- a/dev-java/commons-lang/commons-lang-3.6.ebuild
+++ b/dev-java/commons-lang/commons-lang-3.6.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
@@ -14,7 +14,7 @@ HOMEPAGE="http://commons.apache.org/lang"
SRC_URI="mirror://apache/commons/lang/source/${MY_P}-src.tar.gz -> ${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="3.6"
-KEYWORDS="amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris"
CDEPEND="
dev-java/easymock:3.2
diff --git a/dev-java/icu4j/icu4j-56.1.ebuild b/dev-java/icu4j/icu4j-56.1.ebuild
index 3e0a98276d16..f4ff61c4113f 100644
--- a/dev-java/icu4j/icu4j-56.1.ebuild
+++ b/dev-java/icu4j/icu4j-56.1.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"
@@ -13,7 +13,7 @@ SRC_URI="http://download.icu-project.org/files/${PN}/${PV}/${PN}-${PV//./_}.tgz"
LICENSE="icu"
SLOT="56"
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE=""
DEPEND=">=virtual/jdk-1.6"
diff --git a/dev-java/iso-relax/iso-relax-20050331-r4.ebuild b/dev-java/iso-relax/iso-relax-20050331-r4.ebuild
index 16a588c00679..a408e3253220 100644
--- a/dev-java/iso-relax/iso-relax-20050331-r4.ebuild
+++ b/dev-java/iso-relax/iso-relax-20050331-r4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE=""
RESTRICT="test"
diff --git a/dev-java/jansi/jansi-1.11-r1.ebuild b/dev-java/jansi/jansi-1.11-r1.ebuild
index e3cf445bf3ea..0d9a907524da 100644
--- a/dev-java/jansi/jansi-1.11-r1.ebuild
+++ b/dev-java/jansi/jansi-1.11-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/fusesource/${PN}/tarball/${PN}-project-${PV} -> ${P}
LICENSE="Apache-2.0"
SLOT="1.11"
-KEYWORDS="amd64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
CDEPEND="dev-java/jansi-native:0"
diff --git a/dev-java/jdom/jdom-2.0.6-r4.ebuild b/dev-java/jdom/jdom-2.0.6-r4.ebuild
index 8b29afa8593b..30bbc1c03e90 100644
--- a/dev-java/jdom/jdom-2.0.6-r4.ebuild
+++ b/dev-java/jdom/jdom-2.0.6-r4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/hunterhacker/${PN}/archive/${MY_P}.tar.gz"
HOMEPAGE="http://www.jdom.org"
LICENSE="Apache-1.1"
SLOT="2"
-KEYWORDS="amd64 ~arm ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-java/stringtemplate/stringtemplate-4.0.8.ebuild b/dev-java/stringtemplate/stringtemplate-4.0.8.ebuild
index f15d93c44e9f..c29b32ef39e9 100644
--- a/dev-java/stringtemplate/stringtemplate-4.0.8.ebuild
+++ b/dev-java/stringtemplate/stringtemplate-4.0.8.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/antlr/${PN}4/archive/${PV}.tar.gz -> ${P}.tar.gz
http://www.antlr3.org/download/antlr-${ANTLR3}-complete.jar"
LICENSE="BSD"
SLOT="4"
-KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.105.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.105.ebuild
index 91d3702b16cd..0bd7295e539b 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.105.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.105.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-7/v${PV}/src/${MY_P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="3.0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND=">=virtual/jdk-1.6"
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.57.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.57.ebuild
index beddeca2707e..085f83e7999e 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.57.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.57.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-8/v${PV}/src/${MY_P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="3.1"
-KEYWORDS="~amd64 ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND=">=virtual/jdk-1.8"
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.37.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.37.ebuild
index 9ddac4eebd99..146f9bc7ea9f 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.37.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.37.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-9/v${PV}/src/${MY_P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="4.0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND=">=virtual/jdk-1.8"
diff --git a/dev-java/treelayout/treelayout-1.0.2.ebuild b/dev-java/treelayout/treelayout-1.0.2.ebuild
index df9581ab4eb1..a055bd951140 100644
--- a/dev-java/treelayout/treelayout-1.0.2.ebuild
+++ b/dev-java/treelayout/treelayout-1.0.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=5
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/abego/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
HOMEPAGE="https://github.com/abego/treelayout"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="amd64 ~arm ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index ce41f16bd5db..35a478b21599 100644
Binary files a/dev-lang/Manifest.gz and b/dev-lang/Manifest.gz differ
diff --git a/dev-lang/cxprolog/Manifest b/dev-lang/cxprolog/Manifest
new file mode 100644
index 000000000000..22b1f5ee490d
--- /dev/null
+++ b/dev-lang/cxprolog/Manifest
@@ -0,0 +1 @@
+DIST cxprolog-0.98.2.src.tgz 548222 BLAKE2B e1e834384ff161efde961e7a319d9987cb368ed561fa613a4dd2ede353a099de9146de68dedab3d5e74bb5421c880f743b669eb43eb0b265112dbf938820b0ad SHA512 7e16ce238201da2520da3575311a8c56c9fc3926b290ef505e74ca208af9e6a070d4137ae21e708e1d6c9b83e44566ecd818d51a90f033c983c589b65bcbf2b1
diff --git a/dev-lang/cxprolog/cxprolog-0.98.2.ebuild b/dev-lang/cxprolog/cxprolog-0.98.2.ebuild
new file mode 100644
index 000000000000..ca85e4badada
--- /dev/null
+++ b/dev-lang/cxprolog/cxprolog-0.98.2.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+WX_GTK_VER="3.0-gtk3"
+VIRTUALX_REQUIRED="manual"
+
+inherit flag-o-matic java-pkg-opt-2 java-ant-2 toolchain-funcs virtualx wxwidgets
+
+DESCRIPTION="A WAM based Prolog system"
+HOMEPAGE="http://ctp.di.fct.unl.pt/~amd/cxprolog"
+SRC_URI="http://ctp.di.fct.unl.pt/~amd/cxprolog/cxunix/${P}.src.tgz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples java +readline test wxwidgets"
+RESTRICT="!test? ( test )"
+
+RDEPEND="readline? ( sys-libs/readline:= )
+ java? ( >=virtual/jdk-1.8:= )
+ wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X] )"
+
+DEPEND="${RDEPEND}
+ test? (
+ java? ( ${VIRTUALX_DEPEND} )
+ wxwidgets? ( ${VIRTUALX_DEPEND} )
+ )"
+
+S="${WORKDIR}"/${P}
+
+src_prepare() {
+ eapply "${FILESDIR}"/${P}-portage.patch
+ eapply "${FILESDIR}"/${P}-test-io.patch
+ eapply_user
+
+ sed -i -e "s|lib/cxprolog|$(get_libdir)/cxprolog|" "${S}"/src/FileSys.c || die
+ cp "${FILESDIR}"/build.xml "${S}"/build.xml || die
+ cp "${FILESDIR}"/cx_dev_boot.pl "${S}"/cx_dev_boot.pl || die
+ rm -f "${S}"/pl/test_file_io_1.txt
+
+ use wxwidgets && setup-wxwidgets
+}
+
+src_compile() {
+ local CXPROLOG_EXT_LIBS
+
+ if use readline; then
+ append-cflags "-DUSE_READLINE"
+ CXPROLOG_EXT_LIBS="$CXPROLOG_EXT_LIBS -lreadline"
+ fi
+
+ if use java; then
+ local java_arch
+ use x86 && java_arch=i386
+ use amd64 && java_arch=amd64
+ CXPROLOG_JVM="${JAVA_HOME}/jre/lib/${java_arch}/server"
+ append-cflags "-DUSE_JAVA $(java-pkg_get-jni-cflags) -Wl,-rpath,${CXPROLOG_JVM}"
+ CXPROLOG_EXT_LIBS="$CXPROLOG_EXT_LIBS -L${CXPROLOG_JVM} -ljvm -Wl,-rpath,${CXPROLOG_JVM}"
+ fi
+
+ if use wxwidgets; then
+ append-cflags "-DUSE_WXWIDGETS $(${WX_CONFIG} --cflags)"
+ CXPROLOG_EXT_LIBS="$CXPROLOG_EXT_LIBS $(${WX_CONFIG} --libs)"
+ fi
+
+ emake lib \
+ PREFIX=/usr \
+ TMP_DIR="${S}/tmp" \
+ CC=$(tc-getCC) \
+ CPP=$(tc-getCXX) \
+ LD=$(tc-getLD) \
+ CFLAGS="-g -Wall ${CFLAGS}" \
+ EXT_LIBS="${CXPROLOG_EXT_LIBS}"
+
+ if use java; then
+ JAVA_SRC_DIR="${S}/lib/cxprolog/java"
+ eant jar
+ fi
+}
+
+cxprolog_src_test() {
+ cd "${S}"/pl
+
+ LD_LIBRARY_PATH="${S}" \
+ "${S}"/cxprolog_shared \
+ --boot "${S}"/cx_dev_boot.pl \
+ --script "${S}"/pl/test_all.pl \
+ | tee "${S}"/cxprolog_test.log
+}
+
+src_test() {
+ if use java || use wxwidgets; then
+ virtx cxprolog_src_test
+ else
+ cxprolog_src_test
+ fi
+
+ grep -q "ALL THE TESTS PASSED" "${S}"/cxprolog_test.log \
+ || die "cxprolog unit tests failed"
+}
+
+src_install() {
+ newbin cxprolog_shared cxprolog
+ dolib.so libcxprolog.so
+
+ insinto /usr/$(get_libdir)/cxprolog
+ doins lib/cxprolog/lib.pl
+
+ insinto /usr/share/${PN}/pl
+ doins pl/*.{pl,txt}
+
+ if use java; then
+ insinto /usr/$(get_libdir)/cxprolog/java
+ doins dist/prolog.jar
+ fi
+
+ dodoc ChangeLog.txt MANUAL.txt README.txt
+
+ if use examples; then
+ dodoc -r examples
+ fi
+}
diff --git a/dev-lang/cxprolog/files/build.xml b/dev-lang/cxprolog/files/build.xml
new file mode 100644
index 000000000000..3d4d4fba16e1
--- /dev/null
+++ b/dev-lang/cxprolog/files/build.xml
@@ -0,0 +1,49 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/dev-lang/cxprolog/files/cx_dev_boot.pl b/dev-lang/cxprolog/files/cx_dev_boot.pl
new file mode 100644
index 000000000000..2794cabe34b0
--- /dev/null
+++ b/dev-lang/cxprolog/files/cx_dev_boot.pl
@@ -0,0 +1,9 @@
+'$cxprolog_initialise' :-
+ version,
+ fs_cwd(CWD),
+ fs_set_prefix_dir(CWD),
+ '$env_context' := [main].
+
+
+'$cxprolog_top_level_goal' :-
+ true.
diff --git a/dev-lang/cxprolog/files/cxprolog-0.98.2-portage.patch b/dev-lang/cxprolog/files/cxprolog-0.98.2-portage.patch
new file mode 100644
index 000000000000..ed9fb3864c69
--- /dev/null
+++ b/dev-lang/cxprolog/files/cxprolog-0.98.2-portage.patch
@@ -0,0 +1,52 @@
+--- cxprolog-0.98.2.orig/Makefile 2016-09-17 20:33:35.000000000 +0200
++++ cxprolog-0.98.2/Makefile 2020-07-18 18:18:02.605499273 +0200
+@@ -20,9 +20,9 @@
+ ######################################################################
+
+ ##############################################################################
+-# To disable READLINE SUPPORT, uncomment the following line:
++# For READLINE SUPPORT, uncomment the following line:
+ #
+-# READLINE := n
++# READLINE := y
+ #
+ # Nothing more is required.
+ # This functionality is active by default.
+@@ -165,8 +165,7 @@
+ ZLIBS := $(EXTRA) $(LIBS) $(EXT_LIBS)
+ ZPRE :=
+
+-ifeq ($(READLINE),n)
+-else
++ifeq ($(READLINE),y)
+ ifneq ($(OS),MINGW32)
+ ifeq ($(shell if test -e "/usr/local/opt/readline"; then echo "y" ; fi),y)
+ ZDEFINES += -DUSE_READLINE=4 -I/usr/local/opt/readline/include
+@@ -329,7 +328,7 @@
+ endif
+
+ cxprolog_testlib.exe: libcxprolog.a cxprolog.dll
+- gcc -DTESTLIB=1 -o src/TestLib.o -c src/TestLib.c
++ $(CC) -DTESTLIB=1 -o src/TestLib.o -c src/TestLib.c
+ $(CPP) -enable-auto-import -o cxprolog_testlib src/TestLib.o -L./ -lcxprolog
+ rm src/TestLib.o
+
+@@ -337,14 +336,14 @@
+
+ else # Assume Unix
+ libcxprolog.so: $(OBJ_DIR) $(OBJS)
+- $(CPP) -shared -o libcxprolog.so $(OBJS) -lc $(ZLIBS)
++ $(CPP) -shared -Wl,-soname,libcxprolog.so -o libcxprolog.so $(filter-out src/obj/CxProlog.o,$(OBJS)) -lc $(ZLIBS)
+
+ cxprolog_shared: libcxprolog.so
+- $(CPP) $(ZDEFINES) -o cxprolog_shared -L./ -lcxprolog
++ $(CPP) $(ZDEFINES) -o cxprolog_shared src/obj/CxProlog.o -L./ -lcxprolog $(ZLIBS)
+
+ cxprolog_testlib: libcxprolog.so
+- gcc $(ZDEFINES) -DTESTLIB=1 -o src/TestLib.o -c src/TestLib.c
+- $(CPP) $(ZDEFINES) -o cxprolog_testlib src/TestLib.o -L./ -lcxprolog
++ $(CC) $(ZDEFINES) -DTESTLIB=1 -o src/TestLib.o -c src/TestLib.c
++ $(CPP) $(ZDEFINES) -o cxprolog_testlib src/TestLib.o -L./ -lcxprolog $(ZLIBS)
+ rm src/TestLib.o
+
+ lib: libcxprolog.so cxprolog_shared cxprolog_testlib
diff --git a/dev-lang/cxprolog/files/cxprolog-0.98.2-test-io.patch b/dev-lang/cxprolog/files/cxprolog-0.98.2-test-io.patch
new file mode 100644
index 000000000000..d9f7be7b0cf5
--- /dev/null
+++ b/dev-lang/cxprolog/files/cxprolog-0.98.2-test-io.patch
@@ -0,0 +1,20 @@
+--- cxprolog-0.98.2.orig/pl/test_io.pl 2016-01-23 22:07:48.000000000 +0100
++++ cxprolog-0.98.2/pl/test_io.pl 2020-07-18 21:26:20.911026745 +0200
+@@ -17,7 +17,7 @@
+ concat([X,'.\n'],T).
+
+ test_file_io(L,Encoding) :-
+- FileName = 'test_file_io_1.txt',
++ FileName = '/tmp/test_file_io_1.txt',
+ open(FileName,write,S1,[encoding(Encoding),bom(true)]),
+ name(T,L),
+ write(S1,T),
+@@ -25,7 +25,7 @@
+ open(FileName,read,S2), % relies on bom
+ read(S2,X),
+ close(S2),
+- %fs_delete(FileName),
++ fs_delete(FileName),
+ concat([X,'.\n'],T).
+
+ :- current_prolog_flag(encoding,Curr),
diff --git a/media-libs/pymemphis/metadata.xml b/dev-lang/cxprolog/metadata.xml
similarity index 68%
rename from media-libs/pymemphis/metadata.xml
rename to dev-lang/cxprolog/metadata.xml
index 1c984f64751f..96eff3ea40c0 100644
--- a/media-libs/pymemphis/metadata.xml
+++ b/dev-lang/cxprolog/metadata.xml
@@ -2,7 +2,7 @@
- sci-geosciences@gentoo.org
- Gentoo Geosciences Project
+ prolog@gentoo.org
+ Prolog
diff --git a/dev-lang/mercury-extras/Manifest b/dev-lang/mercury-extras/Manifest
index 34143af31a7a..6be97f64c4aa 100644
--- a/dev-lang/mercury-extras/Manifest
+++ b/dev-lang/mercury-extras/Manifest
@@ -1,6 +1,8 @@
DIST mercury-extras-14.01.1-gentoo-patchset-4.tar.gz 4361 BLAKE2B a1939e4b76782cb01fc7ee5dcb1ccbb885e93992d0e6f540552eb987f405b3a70671527dfacb873323f6030bb6de2f6cdd23768dbc36e8b656d836e2890b7d8a SHA512 e30ac4e9c0592a1ea5253663bf351814e91977ea53892dca4d996b217aac959265563910cc21aa64ee12a93ea379cb8143730585c7d32390bcf05f2a1b0590d7
DIST mercury-extras-20.01-gentoo-patchset-0.tar.gz 542 BLAKE2B 4f24f5af21cbd566eb72ce03d618d858f16d02a921b506c933342181ea057d98377077535571223c85b1f1fa5854e52005f67f40dd75bb392929faaad889eed1 SHA512 6a2eb1dbaac1f028c0ce5f0e21a8f24bd4ba9b068f1ea5d8554c5fb7376642797709f0aa93db336d2f015b6f815d0aa27c7d60720aab340ace180d49791bd852
DIST mercury-extras-20.01.1-gentoo-patchset-0.tar.gz 732 BLAKE2B 32287e116b94b540ca0b710eac8921669ff9a56b5d8a812eba8443609ccfc8c937baaa53a0ae4704abdc78013d58eddd0dc5cda7c807d7a0b724ebda1dede723 SHA512 0d3ca2984eb054ec2add5e05fb49d4fa711b3c78038b4e9777c4767083fc3bae552a261677fed6f07c293d2fb1ebf632ba633eb64a3a8ab4880c6f6619a197ea
+DIST mercury-extras-20.01.2-gentoo-patchset-0.tar.gz 715 BLAKE2B f59a10b6f313efb8446d2d8f1e69b5cb5118de01a59e67996897ba48726ed43a38fc763ee7fe9afad43999d416333138e6d9595eb76b31b10d990671e41b6e8e SHA512 a76e59b4737611de24fa7a25fc9e9dfff6df7199749209965ca888d2bd728be2f9092e0e9f73b7a83e165f178300a9a43ab287c1cafb9221246eecc48bf12c6f
DIST mercury-srcdist-14.01.1.tar.gz 52658945 BLAKE2B 6497921a0227b9a6fbcbabdd309ef3325f32dda14fc4ddb443368385b89be4011d677a24b30b3702147d1b782fe2597760ad66dd34503aa6aebaf79707466529 SHA512 a128ef0fd4955abadea32019ec59297ffe32537415f32e9e948cbc1c3439bb40eb09de77569690fb18dd7d6969a2b1141b3ae5baeb87f2627eaa65ad93add92c
DIST mercury-srcdist-20.01.1.tar.gz 47088335 BLAKE2B 1e3285dadc3748934e801b8ac0316d3005fbe24c20c9ceb694e9fc316d820fdb89c659107b25ee474fd6ac50d661dd029af9ca5082016a3b0827dd640a54a707 SHA512 24ad0bbecee46ab6ff669d63d64096b37a0d010bb44978a1785eee2701a8b30a83eab229af97cbbb18bca55b5e89be9ba74fe126d1d430da1e1e909366dc5b90
+DIST mercury-srcdist-20.01.2.tar.gz 46789217 BLAKE2B bc9637c1b4afb81d4bf35cd94a1f1d87b17094d8a6cbb7e5c8b0ff9c99ce59178d9e32bae246dd041ad781fe5d04e68db8f5effbb6bfcc29b76a83aad91a5666 SHA512 0deed9c0a13ebf793fb80def3fe6d9ee0aa4f0f2974865364eff81bdcac1ec0c41aafbec3e0146c8bdcf3245789e1003b2e4f8e219b53bec71e90074867a834d
DIST mercury-srcdist-20.01.tar.gz 47103868 BLAKE2B 68be786e925bdf94dcba6c6a2a746a384da345ee33250785d8d2b9281815694a4525cdd694c26f58051c097f2a897291e640e2139729ccede9bd2e472077d8c9 SHA512 90e36faa375603e596b2dd692363528120fda62ae6d2e2b119cf76de1656dae4028aff00858a4bff3fdfb9b2210ea17db0aa516ce4283604c46a5935dd2cd4b7
diff --git a/dev-lang/mercury-extras/mercury-extras-20.01.2.ebuild b/dev-lang/mercury-extras/mercury-extras-20.01.2.ebuild
new file mode 100644
index 000000000000..99be15c46be3
--- /dev/null
+++ b/dev-lang/mercury-extras/mercury-extras-20.01.2.ebuild
@@ -0,0 +1,317 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit eutils multilib vcs-clean
+
+PATCHSET_VER="0"
+MY_P=mercury-srcdist-${PV}
+
+DESCRIPTION="Additional libraries and tools that are not part of the Mercury standard library"
+HOMEPAGE="https://www.mercurylang.org/index.html"
+SRC_URI="https://dl.mercurylang.org/release/${MY_P}.tar.gz
+ https://dev.gentoo.org/~keri/distfiles/mercury-extras/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="cairo examples glut gmp iodbc ncurses odbc opengl ssl tk tommath X xml"
+REQUIRED_USE="?? ( odbc iodbc )"
+
+RDEPEND="
+ ~dev-lang/mercury-${PV}
+ cairo? ( >=x11-libs/cairo-1.10.0 )
+ gmp? ( dev-libs/gmp:0 )
+ glut? ( media-libs/freeglut )
+ odbc? ( dev-db/unixODBC )
+ iodbc? ( dev-db/libiodbc )
+ tommath? ( dev-libs/libtommath )
+ ncurses? ( sys-libs/ncurses:= )
+ opengl? (
+ virtual/opengl
+ virtual/glu
+ )
+ tk? (
+ dev-lang/tcl:0
+ dev-lang/tk:0
+ )
+ X? ( x11-libs/libX11 )"
+
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}"/${MY_P}/extras
+
+mercury_pkgs() {
+ echo "
+ align_right/align_right:bin:
+ base64/mercury_base64:lib:
+ cgi/mercury_www:lib:
+ complex_numbers/complex_numbers:lib:
+ $(use ncurses && echo \
+ curs/curs:lib:ncurses,panel curses/mcurses:lib:ncurses)
+ dynamic_linking/dl:lib:
+ error/error:bin:
+ fixed/fixed:lib:
+ $(use gmp && echo gmp_int/gmp_int:lib:)
+ $(use tommath && echo mp_int/mp_int:lib:libtommath)
+ $(use X && echo graphics/easyx/easyx:lib:x11)
+ $(use cairo && echo graphics/mercury_cairo/mercury_cairo:lib:cairo)
+ $(use glut && echo graphics/mercury_glut/mercury_glut:lib:freeglut)
+ $(use opengl && echo graphics/mercury_opengl/mercury_opengl:lib:gl,glu)
+ $(use tk && echo graphics/mercury_tcltk/mercury_tcltk:lib:tk)
+ lex/lex:lib:
+ lex/regex:lib:
+ moose/moose:bin:
+ net/net:lib:
+ net/echo:bin:
+ $(use ssl && echo mopenssl/mopenssl:lib:openssl)
+ $(use odbc && echo odbc/odbc:lib:)
+ $(use iodbc && echo odbc/odbc:lib:libiodbc)
+ posix/posix:lib:
+ $(has_version dev-lang/mercury[trail] && echo \
+ references/global:lib: trailed_update/trailed_update:lib:)
+ show_ops/show_ops:bin:
+ solver_types/library/any:lib:
+ $(use xml && echo xml/xml:lib:)"
+}
+
+mercury_pkg_setup() {
+ mercury_pkg=${1%%:*}
+ mercury_pkg_dir=${mercury_pkg%/*}
+ mercury_pkg_name=${mercury_pkg##*/}
+
+ mercury_pkg_atts=${1#*:}
+ mercury_pkg_type=${mercury_pkg_atts%%:*}
+ mercury_pkg_deps=${mercury_pkg_atts#*:}
+
+ cd "${S}"/${mercury_pkg_dir} || die
+
+ echo ">> Preparing Mercury package: ${mercury_pkg}"
+
+ if ! test -f "${S}"/${mercury_pkg_dir}/gentoo.params; then
+ echo "LIBGRADES := \$(filter-out java,\$(LIBGRADES))" \
+ > "${S}"/${mercury_pkg_dir}/gentoo.params
+ echo "LIBGRADES := \$(filter-out erlang,\$(LIBGRADES))" \
+ >> "${S}"/${mercury_pkg_dir}/gentoo.params
+ echo "LIBGRADES := \$(filter-out csharp,\$(LIBGRADES))" \
+ >> "${S}"/${mercury_pkg_dir}/gentoo.params
+ echo "include gentoo.params" > "${S}"/${mercury_pkg_dir}/Mmakefile
+ fi
+
+ if test -n "$mercury_pkg_deps"; then
+ echo "EXTRA_CFLAGS += $(pkg-config --cflags ${mercury_pkg_deps/,/ })" \
+ >> "${S}"/${mercury_pkg_dir}/gentoo.params
+ echo "EXTRA_MLLIBS += $(pkg-config --libs ${mercury_pkg_deps/,/ })" \
+ >> "${S}"/${mercury_pkg_dir}/gentoo.params
+ fi
+
+ if test ${mercury_pkg_name} = dl; then
+ echo "EXTRA_MLLIBS = -ldl" >> "${S}"/${mercury_pkg_dir}/gentoo.params
+ elif test ${mercury_pkg_name} = gmp_int; then
+ echo "EXTRA_MLLIBS = -lgmp" >> "${S}"/${mercury_pkg_dir}/gentoo.params
+ elif test ${mercury_pkg_name} = mercury_tcltk; then
+ echo "EXTRA_CFLAGS += -DUSE_INTERP_RESULT" \
+ >> "${S}"/${mercury_pkg_dir}/gentoo.params
+ elif test ${mercury_pkg_name} = mopenssl; then
+ local net_libdir="${D}/usr/$(get_libdir)/mercury/extras/lib/\$(GRADE)"
+ echo "EXTRA_MLLIBS += -L${net_libdir} -L../net -lnet" \
+ >> "${S}"/${mercury_pkg_dir}/gentoo.params
+ echo "net%:" >> "${S}"/${mercury_pkg_dir}/gentoo.params
+ echo " cp ../net/\$@ \$@" >> "${S}"/${mercury_pkg_dir}/gentoo.params
+ elif test ${mercury_pkg_name} = odbc && use odbc; then
+ echo "EXTRA_CFLAGS = -DMODBC_UNIX -DMODBC_MYSQL" \
+ >> "${S}"/${mercury_pkg_dir}/Mmakefile
+ echo "EXTRA_MLLIBS = -lodbc" >> "${S}"/${mercury_pkg_dir}/gentoo.params
+ elif test ${mercury_pkg_name} = odbc && use iodbc; then
+ echo "EXTRA_CFLAGS += -DMODBC_IODBC -DMODBC_MYSQL" \
+ >> "${S}"/${mercury_pkg_dir}/gentoo.params
+ fi
+}
+
+mercury_pkg_compile() {
+ mercury_pkg=${1%%:*}
+ mercury_pkg_dir=${mercury_pkg%/*}
+ mercury_pkg_name=${mercury_pkg##*/}
+
+ mercury_pkg_atts=${1#*:}
+ mercury_pkg_type=${mercury_pkg_atts%:*}
+
+ cd "${S}"/${mercury_pkg_dir} || die
+
+ echo ">> Compiling Mercury package: ${mercury_pkg}"
+
+ if test "${mercury_pkg_type}" = "bin"; then
+ mercury_mmc_target=${mercury_pkg_name}
+ else
+ mercury_mmc_target=lib${mercury_pkg_name}
+ fi
+
+ # Mercury dependency generation must be run single-threaded
+ mmc -f *.m || die "mmc -f .m failed"
+ mmake -j1 \
+ ${mercury_pkg_name}.depend \
+ || die "mmake ${mercury_pkg} depend failed"
+
+ # Compiling Mercury submodules is not thread-safe
+ mmake -j1 \
+ MLFLAGS=--no-strip \
+ CFLAGS="${CFLAGS}" \
+ LD_LIBFLAGS="${LDFLAGS}" \
+ ${mercury_mmc_target} || die "mmake ${mercury_pkg} failed"
+
+}
+
+mercury_pkg_install() {
+ mercury_pkg=${1%%:*}
+ mercury_pkg_dir=${mercury_pkg%/*}
+ mercury_pkg_name=${mercury_pkg##*/}
+
+ mercury_pkg_atts=${1#*:}
+ mercury_pkg_type=${mercury_pkg_atts%:*}
+
+ cd "${S}"/${mercury_pkg_dir} || die
+
+ echo ">> Installing Mercury package: ${mercury_pkg}"
+
+ if test "${mercury_pkg_type}" = "bin"; then
+ into /usr/$(get_libdir)/mercury/extras
+ dobin ${mercury_pkg_name}
+ else
+ # Compiling Mercury submodules is not thread-safe
+ mmake -j1 \
+ MLFLAGS=--no-strip \
+ CFLAGS="${CFLAGS}" \
+ LD_LIBFLAGS="${LDFLAGS}" \
+ INSTALL_LIBDIR="${D}/usr/$(get_libdir)/mercury/extras" \
+ lib${mercury_pkg_name}.install || die "mmake ${mercury_pkg} failed"
+ fi
+}
+
+src_prepare() {
+ cd "${WORKDIR}"/${MY_P}
+ if [[ -d "${WORKDIR}"/${PV} ]] ; then
+ eapply "${WORKDIR}"/${PV}
+ fi
+ eapply_user
+
+ cd "${S}"
+ for mercury_pkg in $(mercury_pkgs); do
+ mercury_pkg_setup ${mercury_pkg}
+ done
+}
+
+src_compile() {
+ for mercury_pkg in $(mercury_pkgs); do
+ mercury_pkg_compile ${mercury_pkg}
+ done
+}
+
+src_install() {
+ for mercury_pkg in $(mercury_pkgs); do
+ mercury_pkg_install ${mercury_pkg}
+ done
+
+ cd "${S}"
+ dodoc README
+
+ if use examples; then
+ docinto samples/cgi
+ dodoc cgi/form_test.m
+
+ docinto samples/complex_numbers
+ dodoc complex_numbers/samples/*.m
+
+ if use ncurses; then
+ docinto samples/curs
+ dodoc curs/samples/*.m
+
+ docinto samples/curses
+ dodoc curses/sample/*.m
+ fi
+
+ docinto samples/dynamic_linking
+ dodoc dynamic_linking/{hello,dl_test}.m
+
+ docinto samples/gator
+ dodoc -r gator/*
+
+ if use gmp; then
+ docinto samples/gmp_int
+ dodoc gmp_int/gmp_int_test.m
+ fi
+
+ if use tommath; then
+ docinto samples/mp_int
+ dodoc mp_int/mp_int_test.m
+ fi
+
+ if use X; then
+ docinto samples/graphics
+ dodoc graphics/easyx/samples/*.m
+ fi
+
+ if use glut && use opengl; then
+ docinto samples/graphics
+ dodoc graphics/samples/gears/*.m
+ dodoc graphics/samples/maze/*.m
+ fi
+
+ if use tk; then
+ docinto samples/graphics
+ dodoc graphics/samples/calc/*.m
+ fi
+
+ if use opengl && use tk; then
+ docinto samples/graphics
+ dodoc graphics/samples/pent/*.m
+ fi
+
+ docinto samples/lex
+ dodoc lex/samples/*.m
+
+ docinto samples/log4m
+ dodoc log4m/*.m
+
+ docinto samples/monte
+ dodoc monte/*.m
+
+ docinto samples/moose
+ dodoc moose/samples/*
+
+ docinto samples/net
+ dodoc net/test_lookups.m
+
+ if use odbc || use iodbc; then
+ docinto samples/odbc
+ dodoc odbc/odbc_test.m
+ fi
+
+ docinto samples/posix
+ dodoc posix/samples/*.m
+
+ docinto samples/random
+ dodoc random/*.m
+
+ if has_version dev-lang/mercury[trail]; then
+ docinto samples/references
+ dodoc references/samples/*.m
+
+ docinto samples/trail
+ dodoc trail/*.m
+
+ docinto samples/trailed_update
+ dodoc trailed_update/samples/*.m
+ fi
+
+ if use xml; then
+ docinto samples/xml
+ dodoc xml/tryit.m
+ dodoc xml/samples/*
+ dodoc xml_stylesheets/*.xsl
+ fi
+
+ ecvs_clean
+ fi
+}
diff --git a/dev-lang/mercury/Manifest b/dev-lang/mercury/Manifest
index 728f4bebfb42..23652683b6cc 100644
--- a/dev-lang/mercury/Manifest
+++ b/dev-lang/mercury/Manifest
@@ -1,6 +1,8 @@
DIST mercury-14.01.1-gentoo-patchset-5.tar.gz 5693 BLAKE2B 300de3254bc0d2f59493c0e2243b0d8786fccce714134a11ce510120b7d9f05ebe4835f084ec2db2ddaf2d405cbae65e86d809847079a7d63a6a68021d9d29e8 SHA512 3f9f1e2359f372e4f510b9a00c197978657b28d1308d12cba4d08a982877e2311d7fb6e626dad07d0fa09d24f97334575557cb49003508fdc7b32288c1ae8f2d
DIST mercury-20.01-gentoo-patchset-0.tar.gz 3862 BLAKE2B 79ef6d30add63a5d419e3dd5b376fd9c1727038102db2bc0e8ccd8b71cdc1c80e721647f34764b0aa4fd6d58b9e38c9675f234714f381f94be572b9b64b478e1 SHA512 2835b4740453bcc358363f9eaa0264706125b5e5f7a38802d5f280ccd777d4c760124ed3a635f17ecc2ae772767e9fa5d61093c40094358a0a96a726a23ff08e
DIST mercury-20.01.1-gentoo-patchset-0.tar.gz 3943 BLAKE2B 0fd149c622715bf191182bd93e264096327d7869e30aaa10bb19b70bec5563520026e2561cc6607c62801ed00ed6b5907bbae4be997869b9facb2f9d65ec0c7a SHA512 d866b35b6df14645ef60ff25497f9bbf0c2caeae2145bc0aef2adea0e651379c673c1815c717f1a51457d93cc67e9ae3dafe5d9fce1d4734bf1673e4cfcbd367
+DIST mercury-20.01.2-gentoo-patchset-0.tar.gz 3869 BLAKE2B e4bcf2b962836f217e439adb9428e4ca2fb95b3640aba1733c9a2df0321ec1ef1d7e4f8970e28517f48ad4a22207b94b6e654c9f1869725ad23369eb89672917 SHA512 e05f8afa0497cb9b41aaeff0de61828c11a8c51bfb6bbe2ac3d5c1e606aa208c7df6fd1cb7df42614705765d9eeaa853b6de5abfae07b90c2cf47df699021a89
DIST mercury-srcdist-14.01.1.tar.gz 52658945 BLAKE2B 6497921a0227b9a6fbcbabdd309ef3325f32dda14fc4ddb443368385b89be4011d677a24b30b3702147d1b782fe2597760ad66dd34503aa6aebaf79707466529 SHA512 a128ef0fd4955abadea32019ec59297ffe32537415f32e9e948cbc1c3439bb40eb09de77569690fb18dd7d6969a2b1141b3ae5baeb87f2627eaa65ad93add92c
DIST mercury-srcdist-20.01.1.tar.gz 47088335 BLAKE2B 1e3285dadc3748934e801b8ac0316d3005fbe24c20c9ceb694e9fc316d820fdb89c659107b25ee474fd6ac50d661dd029af9ca5082016a3b0827dd640a54a707 SHA512 24ad0bbecee46ab6ff669d63d64096b37a0d010bb44978a1785eee2701a8b30a83eab229af97cbbb18bca55b5e89be9ba74fe126d1d430da1e1e909366dc5b90
+DIST mercury-srcdist-20.01.2.tar.gz 46789217 BLAKE2B bc9637c1b4afb81d4bf35cd94a1f1d87b17094d8a6cbb7e5c8b0ff9c99ce59178d9e32bae246dd041ad781fe5d04e68db8f5effbb6bfcc29b76a83aad91a5666 SHA512 0deed9c0a13ebf793fb80def3fe6d9ee0aa4f0f2974865364eff81bdcac1ec0c41aafbec3e0146c8bdcf3245789e1003b2e4f8e219b53bec71e90074867a834d
DIST mercury-srcdist-20.01.tar.gz 47103868 BLAKE2B 68be786e925bdf94dcba6c6a2a746a384da345ee33250785d8d2b9281815694a4525cdd694c26f58051c097f2a897291e640e2139729ccede9bd2e472077d8c9 SHA512 90e36faa375603e596b2dd692363528120fda62ae6d2e2b119cf76de1656dae4028aff00858a4bff3fdfb9b2210ea17db0aa516ce4283604c46a5935dd2cd4b7
diff --git a/dev-lang/mercury/mercury-20.01.2.ebuild b/dev-lang/mercury/mercury-20.01.2.ebuild
new file mode 100644
index 000000000000..dc94963281ef
--- /dev/null
+++ b/dev-lang/mercury/mercury-20.01.2.ebuild
@@ -0,0 +1,201 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools elisp-common eutils flag-o-matic java-pkg-opt-2 multilib vcs-clean xdg-utils
+
+PATCHSET_VER="0"
+MY_P=${PN}-srcdist-${PV}
+
+DESCRIPTION="Mercury is a modern general-purpose logic/functional programming language"
+HOMEPAGE="https://www.mercurylang.org/index.html"
+SRC_URI="https://dl.mercurylang.org/release-20.01/${MY_P}.tar.gz
+ https://dev.gentoo.org/~keri/distfiles/mercury/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="debug doc emacs erlang examples java mono profile readline threads trail"
+
+DEPEND="net-libs/libnsl:0=
+ readline? ( sys-libs/readline:= )
+ erlang? ( dev-lang/erlang )
+ java? ( >=virtual/jdk-1.6:= )
+ mono? ( dev-lang/mono )
+ doc? ( sys-apps/texinfo )"
+
+RDEPEND="${DEPEND}
+ emacs? ( >=app-editors/emacs-23.1:* )"
+
+S="${WORKDIR}"/${MY_P}
+
+SITEFILE=50${PN}-gentoo.el
+
+src_prepare() {
+ if [[ -d "${WORKDIR}"/${PV} ]] ; then
+ eapply "${WORKDIR}"/${PV}
+ fi
+ eapply_user
+
+ AT_M4DIR=m4 eautoreconf
+
+ xdg_environment_reset
+}
+
+src_configure() {
+ strip-flags
+
+ local myconf
+ myconf="--libdir=/usr/$(get_libdir) \
+ $(use_enable mono csharp-grade) \
+ $(use_enable erlang erlang-grade) \
+ $(use_enable java java-grade) \
+ $(use_enable debug debug-grades) \
+ $(use_enable profile prof-grades) \
+ $(use_enable threads par-grades) \
+ $(use_enable trail trail-grades) \
+ $(use_with readline)"
+
+ econf ${myconf}
+}
+
+src_compile() {
+ # Prepare mmake flags
+ echo "EXTRA_CFLAGS = ${CFLAGS}" >> Mmake.params
+ echo "EXTRA_LD_LIBFLAGS = ${LDFLAGS}" >> Mmake.params
+ echo "EXTRA_MLFLAGS = --no-strip" >> Mmake.params
+
+ echo "EXTRA_LD_LIBFLAGS += -Wl,-soname=libgc.so" >> boehm_gc/Mmake.boehm_gc.params
+ echo "EXTRA_LD_LIBFLAGS += -Wl,-soname=libmer_rt.so" >> runtime/Mmake.runtime.params
+ echo "EXTRA_LD_LIBFLAGS += -Wl,-soname=libmer_std.so" >> library/Mmake.library.params
+
+ # Build Mercury using bootstrap grade
+ emake \
+ PARALLEL="'${MAKEOPTS}'" \
+ TEXI2DVI="" PDFTEX=""
+
+ # We can now patch .m Mercury compiler files since we
+ # have just built mercury_compiler.
+ if [[ -d "${WORKDIR}"/${PV}-mmc ]] ; then
+ eapply "${WORKDIR}"/${PV}-mmc
+ fi
+
+ # Rebuild Mercury compiler using the just built mercury_compiler
+ emake \
+ PARALLEL="'${MAKEOPTS}'" \
+ MERCURY_COMPILER="${S}"/compiler/mercury_compile \
+ TEXI2DVI="" PDFTEX=""
+
+ # The default Mercury grade may not be the same as the bootstrap
+ # grade. Since src_test() is run before src_install() we compile
+ # the default grade now
+ emake \
+ PARALLEL="'${MAKEOPTS}'" \
+ MERCURY_COMPILER="${S}"/compiler/mercury_compile \
+ TEXI2DVI="" PDFTEX="" \
+ default_grade
+}
+
+src_test() {
+ TEST_GRADE=$(scripts/ml --print-grade)
+ if [ -d "${S}"/install_grade_dir.${TEST_GRADE} ] ; then
+ TWS="${S}"/install_grade_dir.${TEST_GRADE}
+ cp runtime/mer_rt.init "${TWS}"/runtime/
+ cp mdbcomp/mer_mdbcomp.init "${TWS}"/mdbcomp/
+ cp browser/mer_browser.init "${TWS}"/browser/
+ else
+ TWS="${S}"
+ fi
+
+ cd "${S}"/tests || die
+ sed -e "s:@WORKSPACE@:${TWS}:" \
+ < WS_FLAGS.ws \
+ > WS_FLAGS \
+ || die "sed WORKSPACE failed"
+ sed -e "s:@WORKSPACE@:${TWS}:" \
+ < .mgnuc_copts.ws \
+ > .mgnuc_copts \
+ || die "sed WORKSPACE failed"
+ find . -mindepth 1 -type d -exec cp .mgnuc_opts {} \;
+ find . -mindepth 1 -type d -exec cp .mgnuc_copts {} \;
+
+ # Mercury tests must be run in C locale since Mercury output is
+ # compared to hard-coded warnings/errors
+ LC_ALL="C" \
+ PATH="${TWS}"/scripts:"${TWS}"/util:"${S}"/slice:"${PATH}" \
+ TERM="" \
+ WORKSPACE="${TWS}" \
+ WORKSPACE_FLAGS=yes \
+ MERCURY_COMPILER="${TWS}"/compiler/mercury_compile \
+ MMAKE_DIR="${TWS}"/scripts \
+ MERCURY_SUPPRESS_STACK_TRACE=yes \
+ GRADE=${TEST_GRADE} \
+ mmake || die "mmake test failed"
+}
+
+src_install() {
+ emake \
+ PARALLEL="'${MAKEOPTS}'" \
+ MERCURY_COMPILER="${S}"/compiler/mercury_compile \
+ TEXI2DVI="" PDFTEX="" \
+ DESTDIR="${D}" \
+ INSTALL_ELISP_DIR="${D}/${SITELISP}"/${PN} \
+ install
+
+ if use java; then
+ keepdir /usr/$(get_libdir)/mercury/modules/java
+ fi
+
+ if use mono; then
+ keepdir /usr/$(get_libdir)/mercury/modules/csharp
+ fi
+
+ if use emacs; then
+ elisp-site-file-install "${FILESDIR}/${SITEFILE}" \
+ || die "elisp-site-file-install failed"
+ fi
+
+ dodoc \
+ BUGS HISTORY LIMITATIONS NEWS README README.Linux \
+ README.Linux-Alpha README.Linux-m68k README.Linux-PPC \
+ RELEASE_NOTES VERSION || die
+
+ if use erlang; then
+ dodoc README.Erlang
+ fi
+
+ if use java; then
+ dodoc README.Java
+ fi
+
+ if use mono; then
+ dodoc README.CSharp
+ fi
+
+ if use examples; then
+ docinto /usr/share/doc/${PF}/samples
+ dodoc samples/{*.m,README,Mmakefile}
+ dodoc -r samples/c_interface \
+ samples/diff \
+ samples/muz \
+ samples/rot13 \
+ samples/solutions \
+ samples/solver_types
+
+ if use java; then
+ dodoc -r samples/java_interface
+ fi
+
+ ecvs_clean "${D}"/usr/share/doc/${PF}/samples
+ fi
+}
+
+pkg_postinst() {
+ use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+ use emacs && elisp-site-regen
+}
diff --git a/dev-lang/php/php-7.2.32.ebuild b/dev-lang/php/php-7.2.32.ebuild
index f464363d73f0..20ab7418c2ad 100644
--- a/dev-lang/php/php-7.2.32.ebuild
+++ b/dev-lang/php/php-7.2.32.ebuild
@@ -18,7 +18,7 @@ LICENSE="PHP-3.01
unicode? ( BSD-2 LGPL-2.1 )"
SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
# We can build the following SAPIs in the given order
SAPIS="embed cli cgi fpm apache2 phpdbg"
diff --git a/dev-lang/php/php-7.3.20.ebuild b/dev-lang/php/php-7.3.20.ebuild
index ee3a67356c9f..4583dedfe50e 100644
--- a/dev-lang/php/php-7.3.20.ebuild
+++ b/dev-lang/php/php-7.3.20.ebuild
@@ -19,7 +19,7 @@ LICENSE="PHP-3.01
unicode? ( BSD-2 LGPL-2.1 )"
SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
S="${WORKDIR}/${PN}-${MY_PV}"
diff --git a/dev-lang/php/php-7.4.8-r1.ebuild b/dev-lang/php/php-7.4.8-r1.ebuild
index ab72e42eca7d..b7203bdf290c 100644
--- a/dev-lang/php/php-7.4.8-r1.ebuild
+++ b/dev-lang/php/php-7.4.8-r1.ebuild
@@ -21,7 +21,7 @@ LICENSE="PHP-3.01
unicode? ( BSD-2 LGPL-2.1 )"
SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
S="${WORKDIR}/${PN}-${MY_PV}"
diff --git a/dev-lang/python/python-2.7.18-r1.ebuild b/dev-lang/python/python-2.7.18-r1.ebuild
index 1813838b038b..7ec8dc53e0ef 100644
--- a/dev-lang/python/python-2.7.18-r1.ebuild
+++ b/dev-lang/python/python-2.7.18-r1.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}"
LICENSE="PSF-2"
SLOT="${PYVER}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
IUSE="-berkdb bluetooth build elibc_uclibc examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl +threads tk +wide-unicode wininst +xml"
# Do not add a dependency on dev-lang/python to this ebuild.
diff --git a/dev-lang/python/python-3.6.11-r1.ebuild b/dev-lang/python/python-3.6.11-r1.ebuild
index de6b80a6766f..f5f9ae333181 100644
--- a/dev-lang/python/python-3.6.11-r1.ebuild
+++ b/dev-lang/python/python-3.6.11-r1.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}"
LICENSE="PSF-2"
SLOT="${PYVER}/${PYVER}m"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
IUSE="bluetooth build examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl test +threads tk wininst +xml"
RESTRICT="!test? ( test )"
diff --git a/dev-lang/python/python-3.6.11-r2.ebuild b/dev-lang/python/python-3.6.11-r2.ebuild
index 823fa8cf986f..17048a16e386 100644
--- a/dev-lang/python/python-3.6.11-r2.ebuild
+++ b/dev-lang/python/python-3.6.11-r2.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}"
LICENSE="PSF-2"
SLOT="${PYVER}/${PYVER}m"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
IUSE="bluetooth build examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl test +threads tk wininst +xml"
RESTRICT="!test? ( test )"
diff --git a/dev-lang/python/python-3.7.8-r1.ebuild b/dev-lang/python/python-3.7.8-r1.ebuild
index 164cc433d959..9b46d558cc30 100644
--- a/dev-lang/python/python-3.7.8-r1.ebuild
+++ b/dev-lang/python/python-3.7.8-r1.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}"
LICENSE="PSF-2"
SLOT="${PYVER}/${PYVER}m"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
IUSE="bluetooth build examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl test tk wininst +xml"
RESTRICT="!test? ( test )"
diff --git a/dev-lang/python/python-3.7.8-r2.ebuild b/dev-lang/python/python-3.7.8-r2.ebuild
index 938eb2e64d64..91c9e36e0a54 100644
--- a/dev-lang/python/python-3.7.8-r2.ebuild
+++ b/dev-lang/python/python-3.7.8-r2.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}"
LICENSE="PSF-2"
SLOT="${PYVER}/${PYVER}m"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
IUSE="bluetooth build examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl test tk wininst +xml"
RESTRICT="!test? ( test )"
diff --git a/dev-lang/python/python-3.8.3-r1.ebuild b/dev-lang/python/python-3.8.3-r1.ebuild
index 9547e2cf12f0..fee828c5a65c 100644
--- a/dev-lang/python/python-3.8.3-r1.ebuild
+++ b/dev-lang/python/python-3.8.3-r1.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}"
LICENSE="PSF-2"
SLOT="${PYVER}"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
IUSE="bluetooth build examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl test tk wininst +xml"
RESTRICT="!test? ( test )"
diff --git a/dev-lang/python/python-3.8.4-r1.ebuild b/dev-lang/python/python-3.8.4-r1.ebuild
index 0a14b28132fb..a404cd57ff76 100644
--- a/dev-lang/python/python-3.8.4-r1.ebuild
+++ b/dev-lang/python/python-3.8.4-r1.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}"
LICENSE="PSF-2"
SLOT="${PYVER}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
IUSE="bluetooth build examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl test tk wininst +xml"
RESTRICT="!test? ( test )"
diff --git a/dev-lang/qu-prolog/qu-prolog-10.4.ebuild b/dev-lang/qu-prolog/qu-prolog-10.4.ebuild
index 458fb4cb4cfb..c06392ec7013 100644
--- a/dev-lang/qu-prolog/qu-prolog-10.4.ebuild
+++ b/dev-lang/qu-prolog/qu-prolog-10.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://www.itee.uq.edu.au/~pjr/HomePages/QPFiles/${MY_P}.tar.gz"
LICENSE="Apache-2.0 GPL-2+"
SLOT="0"
-KEYWORDS="amd64 ppc ~x86"
+KEYWORDS="amd64 ppc x86"
IUSE="debug doc examples pedro qt5 readline threads"
RDEPEND="
diff --git a/dev-lang/tuprolog/Manifest b/dev-lang/tuprolog/Manifest
index 38fcfb70bd61..4b2ae8c599e2 100644
--- a/dev-lang/tuprolog/Manifest
+++ b/dev-lang/tuprolog/Manifest
@@ -1,3 +1,5 @@
DIST tuprolog-2.9.2.tar.gz 6262268 BLAKE2B 39bbc4dcb2336a713f47252ff6f7d00f15aa0072c4864c2d3e453ec43b2c646f9cdc7a69444e21d9cc20ba283ddee5fd980855811f8f80ba4afe7c37cdd47317 SHA512 831c7390fe33fc57cb01d4b1d61485ac5df1aa8ebf386d5aae5c5d32f7677d46aa5aa6cc0eb1d3bb79989a54f8484ad8b97754b7f75fc21af6116ae170a28316
DIST tuprolog-3.0.1.tar.gz 6326591 BLAKE2B a051eb3f22c01e1c269b167fa7d1daec6e4818229e2035c1140401c38094c53451ea720638adaa6d6fda0ea70daf6f5f1bc9ea84f1e4ba9de9f00ca83529697c SHA512 56fa96f717b5c8e56fd2979f2953744964d844e5abf215456e31309d3d92bde142f9bff55e6442b6de55f219c7f143a275ccf89359ff2f2944459bbc94770afa
DIST tuprolog-3.1.0.tar.gz 7201383 BLAKE2B 9d8b610240611cd5b3d0dae104a44c72bb5e7c0512e4dbf3e178204d9d36e461219cd869ca1e16e3054ca3e1ee34d3b2c6fa5c659df16f54e3266c7c826af8d6 SHA512 1093e29a79964cb3991326da14f020cdc8ff64f2444c84dbb6b22aa5c4ecbf48f74dbc26af0af949ccc31020573ce5908684af794db4654fb475efa697a82cbf
+DIST tuprolog-3.2.0-gentoo-patchset-0.tar.gz 1813 BLAKE2B 4ed7ffbb752a821a2b2842cfdbc1f4ec92d14b35a1c5a722207b45ec9dbdc44588acc010fb6386e8ed2e7d30d3bc8d425f0f74e8cc953cb7afad8305904e1499 SHA512 454757fc01f3f697510426e7a2a41b57350c1e3f980e381e197616e10eaf88339155226096f1d417397b9bc6f4964a45b3d547c6794ad23a4a014b06212b08f0
+DIST tuprolog-3.2.0.tar.gz 6242286 BLAKE2B 77a3d3f886673aca72fffd9bb60657efcbe7ea5bb0f84eea7a72df513295d572c8116472f8d544240fac676ac9a6a0fcecfc3166e6426ef7d8af80eac4ba8d85 SHA512 e27bd989d66bae26c646cb69670fb75232ebdd18d1dbb9d600f9847921ecd56d17221736b3ec15c087857509272ce89af8bc44924130430db3860870a06bb499
diff --git a/dev-lang/tuprolog/files/build-3.1.0.xml b/dev-lang/tuprolog/files/build-3.1.0.xml
deleted file mode 100644
index 3b6f5818eaa6..000000000000
--- a/dev-lang/tuprolog/files/build-3.1.0.xml
+++ /dev/null
@@ -1,110 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/dev-lang/tuprolog/files/build-3.0.1.xml b/dev-lang/tuprolog/files/build-3.x.xml
similarity index 100%
rename from dev-lang/tuprolog/files/build-3.0.1.xml
rename to dev-lang/tuprolog/files/build-3.x.xml
diff --git a/dev-lang/tuprolog/tuprolog-3.0.1.ebuild b/dev-lang/tuprolog/tuprolog-3.0.1.ebuild
index 8ca8d7d6bb73..411a1f875b0e 100644
--- a/dev-lang/tuprolog/tuprolog-3.0.1.ebuild
+++ b/dev-lang/tuprolog/tuprolog-3.0.1.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=5
@@ -35,7 +35,7 @@ src_prepare() {
epatch "${FILESDIR}"/${P}-no-ikvm.patch
epatch "${FILESDIR}"/${P}-oolibrary-unit-test.patch
- cp "${FILESDIR}"/build-${PV}.xml "${S}"/build.xml || die
+ cp "${FILESDIR}"/build-3.x.xml "${S}"/build.xml || die
}
src_compile() {
diff --git a/dev-lang/tuprolog/tuprolog-3.1.0-r1.ebuild b/dev-lang/tuprolog/tuprolog-3.1.0-r1.ebuild
index c6c38fcd1e63..4f6dd3c988e9 100644
--- a/dev-lang/tuprolog/tuprolog-3.1.0-r1.ebuild
+++ b/dev-lang/tuprolog/tuprolog-3.1.0-r1.ebuild
@@ -36,7 +36,7 @@ src_prepare() {
eapply "${FILESDIR}"/${P}-test-suite.patch
eapply_user
- cp "${FILESDIR}"/build-${PV}.xml "${S}"/build.xml || die
+ cp "${FILESDIR}"/build-3.x.xml "${S}"/build.xml || die
}
src_compile() {
diff --git a/dev-lang/tuprolog/tuprolog-3.1.0.ebuild b/dev-lang/tuprolog/tuprolog-3.1.0.ebuild
index d04f8f0fad18..d22edc7d11f3 100644
--- a/dev-lang/tuprolog/tuprolog-3.1.0.ebuild
+++ b/dev-lang/tuprolog/tuprolog-3.1.0.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=5
@@ -34,7 +34,7 @@ EANT_GENTOO_CLASSPATH="javassist:3,commons-lang-3.1"
src_prepare() {
epatch "${FILESDIR}"/${P}-no-ikvm.patch
- cp "${FILESDIR}"/build-${PV}.xml "${S}"/build.xml || die
+ cp "${FILESDIR}"/build-3.x.xml "${S}"/build.xml || die
}
src_compile() {
diff --git a/dev-lang/tuprolog/tuprolog-3.2.0.ebuild b/dev-lang/tuprolog/tuprolog-3.2.0.ebuild
new file mode 100644
index 000000000000..0dcda3ed7c64
--- /dev/null
+++ b/dev-lang/tuprolog/tuprolog-3.2.0.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit eutils java-pkg-2 java-ant-2
+
+PATCHSET_VER="0"
+
+DESCRIPTION="tuProlog is a light-weight Prolog for Internet applications and infrastructures"
+HOMEPAGE="http://tuprolog.unibo.it/"
+SRC_URI="https://dev.gentoo.org/~keri/distfiles/tuprolog/${P}.tar.gz
+ https://dev.gentoo.org/~keri/distfiles/tuprolog/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz"
+
+LICENSE="LGPL-3 BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples test"
+RESTRICT="!test? ( test )"
+
+RDEPEND=">=virtual/jdk-1.8:=
+ dev-java/javassist:3
+ dev-java/commons-lang:3.1
+ dev-java/gson:2.6"
+
+DEPEND="${RDEPEND}
+ dev-java/ant-core
+ test? (
+ dev-java/ant-junit4:0
+ dev-java/junit:4
+ dev-java/hamcrest-core:1.3
+ )"
+
+S="${WORKDIR}"/${P}
+
+EANT_GENTOO_CLASSPATH="javassist:3,commons-lang:3.1,gson:2.6"
+
+PATCHES=( "${WORKDIR}/${PV}" )
+
+src_prepare() {
+ default
+
+ cp "${FILESDIR}"/build-3.x.xml "${S}"/build.xml || die
+}
+
+src_compile() {
+ eant jar $(use_doc)
+}
+
+src_test() {
+ cd "${S}"/dist
+ java-pkg_jar-from junit:4
+ java-pkg_jar-from hamcrest-core:1.3
+ cd "${S}"
+ ANT_TASKS="ant-junit4" eant test || die "eant test failed"
+}
+
+src_install() {
+ java-pkg_dojar dist/${PN}.jar
+ java-pkg_dojar dist/2p.jar
+
+ if use doc ; then
+ java-pkg_dohtml -r docs/* || die
+ dodoc doc/tuprolog-guide.pdf
+ fi
+
+ if use examples ; then
+ docinto examples
+ dodoc doc/examples/*.pl
+ fi
+}
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 0299e147b94e..a1d00e1113b1 100644
Binary files a/dev-libs/Manifest.gz and b/dev-libs/Manifest.gz differ
diff --git a/dev-libs/jsonrpc-glib/Manifest b/dev-libs/jsonrpc-glib/Manifest
index af97f716dfb1..15c4ca545ac2 100644
--- a/dev-libs/jsonrpc-glib/Manifest
+++ b/dev-libs/jsonrpc-glib/Manifest
@@ -1 +1,2 @@
DIST jsonrpc-glib-3.32.0.tar.xz 41552 BLAKE2B cea89237cbd622e951b0b4eca02e0aba0f3a9a3dd0db74baa0534ad49671834bf3daab5243d0be6f4e68ed5f441820fb8af1c5f59f7f5a7657280d1c55e5d104 SHA512 c6c52d36d3f8f736bc07c50174ca4a50e3cde6b23928751f260b4482e15cda9726b8279228653e4fde114111592131f344f3c7cf820edcc680fb0b32f9089ea5
+DIST jsonrpc-glib-3.34.0.tar.xz 41792 BLAKE2B 2be0d690e3ead57a7ad71b93d13ad28e23c96d89d36373d93ba608c4ea2aeed3684862938cfb64675cfcba84d9804f6352b877e343ac2af5aed8b2d4b39854f8 SHA512 58908dd11f7848b09e63f7a7ff2185d0742c049ddffb033e768f783bcbcda7e75a658bec923372212694431b25b0fb894e3ea37ce2d7c52c99e49fd230319c10
diff --git a/dev-libs/jsonrpc-glib/jsonrpc-glib-3.34.0.ebuild b/dev-libs/jsonrpc-glib/jsonrpc-glib-3.34.0.ebuild
new file mode 100644
index 000000000000..2a4c35ea0539
--- /dev/null
+++ b/dev-libs/jsonrpc-glib/jsonrpc-glib-3.34.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gnome.org meson xdg vala
+
+DESCRIPTION="JSON-RPC library for GLib"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/jsonrpc-glib"
+
+LICENSE="LGPL-2.1+"
+SLOT="0/1"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="gtk-doc +introspection test vala"
+REQUIRED_USE="vala? ( introspection )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ dev-libs/glib:2
+ dev-libs/json-glib[introspection?]
+ introspection? ( dev-libs/gobject-introspection:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ vala? ( $(vala_depend) )
+ dev-util/glib-utils
+ virtual/pkgconfig
+ gtk-doc? ( dev-util/gtk-doc )
+"
+
+src_prepare() {
+ use vala && vala_src_prepare
+ xdg_src_prepare
+}
+
+src_configure() {
+ local emesonargs=(
+ -Denable_profiling=false # -pg passing
+ $(meson_use introspection with_introspection)
+ $(meson_use vala with_vapi)
+ $(meson_use gtk-doc enable_gtk_doc)
+ $(meson_use test enable_tests)
+ )
+ meson_src_configure
+}
diff --git a/dev-libs/libbase58/metadata.xml b/dev-libs/libbase58/metadata.xml
index 7beabae51605..a2e814a17c26 100644
--- a/dev-libs/libbase58/metadata.xml
+++ b/dev-libs/libbase58/metadata.xml
@@ -6,7 +6,7 @@
Anthony G. Basile
- luke_gentoo_bitcoin@dashjr.org
+ luke-jr+gentoobugs@utopios.org
Luke Dashjr