diff --git a/Manifest.files.gz b/Manifest.files.gz
index dcf15be83fe1..ad7e716e7f04 100644
Binary files a/Manifest.files.gz and b/Manifest.files.gz differ
diff --git a/acct-group/Manifest.gz b/acct-group/Manifest.gz
index 5ab28a095484..c369f2111289 100644
Binary files a/acct-group/Manifest.gz and b/acct-group/Manifest.gz differ
diff --git a/dev-vcs/git-deps/Manifest b/acct-group/carbon/Manifest
similarity index 100%
rename from dev-vcs/git-deps/Manifest
rename to acct-group/carbon/Manifest
diff --git a/acct-group/carbon/carbon-0.ebuild b/acct-group/carbon/carbon-0.ebuild
new file mode 100644
index 000000000000..09ccc3c9f002
--- /dev/null
+++ b/acct-group/carbon/carbon-0.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=230
diff --git a/app-forensics/volatility/metadata.xml b/acct-group/carbon/metadata.xml
similarity index 68%
rename from app-forensics/volatility/metadata.xml
rename to acct-group/carbon/metadata.xml
index 6dde16e5c4b6..a53ffbea77d3 100644
--- a/app-forensics/volatility/metadata.xml
+++ b/acct-group/carbon/metadata.xml
@@ -2,7 +2,7 @@
- chithanh@gentoo.org
- Chí-Thanh Christopher Nguyễn
+ grobian@gentoo.org
+ Fabian Groffen
diff --git a/acct-user/Manifest.gz b/acct-user/Manifest.gz
index 0497d5417486..124863561904 100644
Binary files a/acct-user/Manifest.gz and b/acct-user/Manifest.gz differ
diff --git a/acct-user/carbon/Manifest b/acct-user/carbon/Manifest
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/acct-user/carbon/carbon-0.ebuild b/acct-user/carbon/carbon-0.ebuild
new file mode 100644
index 000000000000..ba8999d6020d
--- /dev/null
+++ b/acct-user/carbon/carbon-0.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for graphite/carbon suite"
+ACCT_USER_ID=230
+ACCT_USER_GROUPS=( carbon )
+
+acct-user_add_deps
diff --git a/sci-chemistry/modeller/metadata.xml b/acct-user/carbon/metadata.xml
similarity index 58%
rename from sci-chemistry/modeller/metadata.xml
rename to acct-user/carbon/metadata.xml
index da36ecbfcd6a..a53ffbea77d3 100644
--- a/sci-chemistry/modeller/metadata.xml
+++ b/acct-user/carbon/metadata.xml
@@ -1,8 +1,8 @@
-
- sci-chemistry@gentoo.org
- Gentoo Chemistry Project
+
+ grobian@gentoo.org
+ Fabian Groffen
diff --git a/app-accessibility/Manifest.gz b/app-accessibility/Manifest.gz
index dd3b698539e8..51a0c30af019 100644
Binary files a/app-accessibility/Manifest.gz and b/app-accessibility/Manifest.gz differ
diff --git a/app-accessibility/caribou/caribou-0.4.21.ebuild b/app-accessibility/caribou/caribou-0.4.21.ebuild
deleted file mode 100644
index f0844ec4d4ac..000000000000
--- a/app-accessibility/caribou/caribou-0.4.21.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python3_6 )
-PYTHON_REQ_USE="xml"
-
-inherit gnome2 python-r1
-
-DESCRIPTION="Input assistive technology intended for switch and pointer users"
-HOMEPAGE="https://wiki.gnome.org/Projects/Caribou"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
-
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPEND="
- app-accessibility/at-spi2-core
- >=dev-python/pygobject-2.90.3:3[${PYTHON_USEDEP}]
- >=x11-libs/gtk+-3:3[introspection]
- x11-libs/gtk+:2
- >=dev-libs/gobject-introspection-0.10.7:=
- dev-libs/libgee:0.8
- dev-libs/libxml2
- >=media-libs/clutter-1.5.11:1.0[introspection]
- x11-libs/libX11
- x11-libs/libxklavier
- x11-libs/libXtst
- ${PYTHON_DEPS}
-"
-# gsettings-desktop-schemas is needed for the 'toolkit-accessibility' key
-# pyatspi-2.1.90 needed to run caribou if pygobject:3 is installed
-# librsvg needed to load svg images in css styles
-RDEPEND="${COMMON_DEPEND}
- dev-libs/glib[dbus]
- >=dev-python/pyatspi-2.1.90[${PYTHON_USEDEP}]
- >=gnome-base/gsettings-desktop-schemas-3
- gnome-base/librsvg:2
- sys-apps/dbus
-"
-DEPEND="${COMMON_DEPEND}
- dev-libs/libxslt
- >=dev-util/intltool-0.35.5
- virtual/pkgconfig
-"
-
-src_prepare() {
- # FIXME: Now this supports python3 too...
- # delete custom PYTHONPATH, useless on Gentoo and potential bug source
- # + caribou is python2 only so fix the shell scripts
-# sed -e '/export PYTHONPATH=.*python/ d' \
-# -e "s:@PYTHON@:${EPREFIX}/usr/bin/python2:" \
-# -i bin/{antler-keyboard,caribou-preferences}.in ||
-# die "sed failed"
-
- gnome2_src_prepare
-
- prepare_caribou() {
- mkdir -p "${BUILD_DIR}" || die
- }
- python_foreach_impl prepare_caribou
-}
-
-src_configure() {
- ECONF_SOURCE="${S}" python_foreach_impl run_in_build_dir \
- gnome2_src_configure \
- --disable-docs \
- --disable-static \
- --enable-gtk3-module \
- --enable-gtk2-module \
- VALAC=$(type -P true)
- # vala is not needed for tarball builds, but configure checks for it...
-}
-
-src_compile() {
- python_foreach_impl run_in_build_dir gnome2_src_compile
-}
-
-src_test() {
- python_foreach_impl run_in_build_dir default
-}
-
-src_install() {
- python_foreach_impl run_in_build_dir gnome2_src_install
-
- # https://bugzilla.gnome.org/show_bug.cgi?id=769323
- dodoc AUTHORS NEWS README # ChangeLog simply points to git log
-}
diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index aa9a92b560ca..2bbe41cd9b66 100644
Binary files a/app-arch/Manifest.gz and b/app-arch/Manifest.gz differ
diff --git a/app-arch/rar/Manifest b/app-arch/rar/Manifest
index a2e688c7e6ab..eeca2cf5cc7d 100644
--- a/app-arch/rar/Manifest
+++ b/app-arch/rar/Manifest
@@ -1,6 +1,3 @@
-DIST rarlinux-5.9.0_p20200330.tar.gz 606599 BLAKE2B 81803108938b82aec07e0a8aeffe764219c6965ddbda3ac73c04ee0c6c7f8ae6090bf7a39fc0215a639fec8f5b9af7f8518ae2c18bcd2a0f836c0560740fde38 SHA512 0c5328d3113e0c821d840dafdb7bc0b4f5161b8b7d76e2227bae3daa3bf55d99d06a167ece961157f69ec2494259bb56dcd87769b0782962614cc2c4de01892b
DIST rarlinux-5.9.1_p20200625.tar.gz 606675 BLAKE2B fe8f26d422bc816fbba27405f9d2e4063e9af6e136ca4c270bb5274a67e99d9a7c97250b05e6041f3ed27517398b0500aad765a1f599474ff08ebb6bacf5b0a3 SHA512 3ed37adda5f5b2f5502ab2e549614dad2848157321a31174d7259aaf77cc773c6398eb0e19ee6597536c58a938289a587e7db9681e6c47c906a5307c2d362147
-DIST rarlinux-x64-5.9.0_p20200330.tar.gz 595460 BLAKE2B cc8e3dfdbd10a959b9643a4a6b12e8e346f6ed2797fee61fbfecd02b8570212f87514e749943e8998941fb00e026b300597ae52975ac326cc0a2962ba8d1a8a8 SHA512 a7d88a8705e4876686f880eee461180a3d2dac5c4bafb2efeec46a8c2bac2c07b09fc0827f39aa1417d0c8a64d3ed5b55244b08400ce5a0591984e0e9c5c853e
DIST rarlinux-x64-5.9.1_p20200625.tar.gz 595595 BLAKE2B 68eb24da7ecb2fe8a2be68bc3c3397df85490f4cd5517a2dc5390ad0dafbdd0a04d15968276657d600cf6c127cd8f52b74e920f7ee9b86b7083b9edbf0a57141 SHA512 6e0aec1642118331bfe79a35fa654f7d5143e61c0315375fa21d862a3941b672c58eaed4da69b8ea23a024aaafcfd02a277251391e59220b845847d4b3b82562
-DIST winrar-x64-5.9.0_p20200330.exe 3226248 BLAKE2B 50459e4b476bf9ec6b59df712a61f5108442fdaf58f7ccb1c021f1638a3327e155a5b3573e0566d3a262b8129fc28c176ccc2e9a3edf2851986c8a5aeb3288d0 SHA512 8b0791eab87aeed9f30272f11fa304189f1f5d077457d3ea608c59e19dfd6ee9e05f98f03cba4803dbe24b5bb68f8332a59cd9bd2fae76d0da0405a92b8e3b3c
DIST winrar-x64-5.9.1_p20200625.exe 3246712 BLAKE2B c0616e600b11aaa524154b9b0108ab1a62e09cdd27a968b5bf9fa6d742800c9006ee7655df39511f31b24506dd03eb431c3e016ea63a5fe8fff702ccd8d3b358 SHA512 da7a85d56f1ed4dd6204e51297175c90349a26896b223bf210055a0c38f315c59f9d9b8368d5c279049443467d962c72bad48a3c62c1d80f2260f8ecd4d17db6
diff --git a/app-arch/rar/rar-5.9.0_p20200330.ebuild b/app-arch/rar/rar-5.9.0_p20200330.ebuild
deleted file mode 100644
index b90959c703e9..000000000000
--- a/app-arch/rar/rar-5.9.0_p20200330.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-DESCRIPTION="RAR compressor/uncompressor"
-HOMEPAGE="https://rarlab.com/"
-URI_x86="https://mirror.whissi.de/distfiles/rar/rarlinux-${PV}.tar.gz"
-URI_amd64="https://mirror.whissi.de/distfiles/rar/rarlinux-x64-${PV}.tar.gz"
-URI_w64="https://mirror.whissi.de/distfiles/rar/winrar-x64-${PV}.exe"
-SRC_URI="x86? ( ${URI_x86} )
- amd64? ( ${URI_amd64} )
- all_sfx? (
- ${URI_x86}
- ${URI_amd64}
- ${URI_w64}
- )"
-
-LICENSE="RAR BSD BSD-2"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-IUSE="all_sfx"
-RESTRICT="mirror bindist"
-
-DEPEND="all_sfx? ( app-arch/unrar )"
-RDEPEND="sys-libs/glibc"
-
-S="${WORKDIR}/${PN}"
-
-QA_FLAGS_IGNORED="opt/rar/default.sfx
- opt/rar/default-elf32.sfx
- opt/rar/default-elf64.sfx
- opt/rar/default-win32.sfx
- opt/rar/default-win64.sfx
- opt/rar/WinCon.SFX
- opt/rar/WinCon64.SFX
- opt/rar/Zip.SFX
- opt/rar/Zip64.SFX
- opt/rar/unrar
- opt/rar/rar"
-QA_PRESTRIPPED=${QA_FLAGS_IGNORED}
-
-src_unpack() {
- local _file
-
- for _file in ${A}; do
- if [[ "${_file}" == rarli* ]]; then
- if [[ "${_file}" =~ x64 ]]; then
- if ! use amd64; then
- continue
- fi
-
- unpack "${_file}"
- elif [[ ! "${_file}" =~ x64 ]]; then
- if ! use x86; then
- continue
- fi
-
- unpack "${_file}"
- else
- die "Unknown SRC file '${_file}'!"
- fi
- fi
- done
-
- rm -f "${S}"/license.txt
-
- if use all_sfx ; then
- mkdir sfx
- cd sfx
- for _file in ${A}; do
- if [[ "${_file}" == rarli* ]]; then
- unpack "${_file}"
- if [[ "${_file}" =~ x64 ]]; then
- mv rar/default.sfx default-elf64.sfx || die
- else
- mv rar/default.sfx default-elf32.sfx || die
- fi
- elif [[ "${_file}" == winrar* ]]; then
- ln -s "${DISTDIR}"/${_file} w64.rar || die
- unpack ./w64.rar
- mv Default.SFX default-win32.sfx || die
- mv Default64.SFX default-win64.sfx || die
- else
- die "Unknown SFX file '${_file}'!"
- fi
- done
- fi
-}
-
-src_compile() { :; }
-
-src_install() {
- exeinto /opt/rar
- doexe rar unrar
-
- dodir /opt/bin
- dosym ../rar/rar /opt/bin/rar
- dosym ../rar/unrar /opt/bin/unrar
-
- insinto /opt/rar
- if use all_sfx ; then
- doins "${WORKDIR}"/sfx/*.{sfx,SFX}
- else
- doins default.sfx
- fi
- doins rarfiles.lst
- dodoc *.txt
-}
diff --git a/app-arch/rar/rar-5.9.1_p20200625.ebuild b/app-arch/rar/rar-5.9.1_p20200625.ebuild
index 7623c5c7ee5d..b90959c703e9 100644
--- a/app-arch/rar/rar-5.9.1_p20200625.ebuild
+++ b/app-arch/rar/rar-5.9.1_p20200625.ebuild
@@ -18,7 +18,7 @@ SRC_URI="x86? ( ${URI_x86} )
LICENSE="RAR BSD BSD-2"
SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 x86"
IUSE="all_sfx"
RESTRICT="mirror bindist"
diff --git a/app-arch/unar/metadata.xml b/app-arch/unar/metadata.xml
index cf071f3d1c1f..ca136641cf4a 100644
--- a/app-arch/unar/metadata.xml
+++ b/app-arch/unar/metadata.xml
@@ -1,14 +1,7 @@
-
- robin@hallabro-kokko.se
- Robin Hallabro-Kokko
-
-
- proxy-maint@gentoo.org
- Proxy Maintainers
-
+
MacPaw/XADMaster
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index ef14af72f6b8..062500de3bea 100644
Binary files a/app-crypt/Manifest.gz and b/app-crypt/Manifest.gz differ
diff --git a/app-crypt/openpgp-keys-gentoo-auth/Manifest b/app-crypt/openpgp-keys-gentoo-auth/Manifest
index 0f11222da887..ccbd2084acb6 100644
--- a/app-crypt/openpgp-keys-gentoo-auth/Manifest
+++ b/app-crypt/openpgp-keys-gentoo-auth/Manifest
@@ -1 +1,2 @@
DIST gentoo-auth.asc.20191030.gz 6556 BLAKE2B 233df81a8c01ead6524fdded0c64aba7d930d0f9e6214c403e43aa97bc87502a4e1d68c6c415505db5f618d9309d5ba1279d1e9b9e068289002ad30896a500c9 SHA512 c752dc4b5d75937290e469e722ccd48a592413438a7d1c5bc5d4e07114077ae3dfb5fc3cbe6b96d672e4149737cd7db6dc8298e670e63745bdff7426e98fc03b
+DIST gentoo-auth.asc.20200704.gz 4540 BLAKE2B 8ae8a1947ae81e89aef6171b228e97a80331cc58336a0387bbda7c885ec5fff322d17b7fc462d7f3fe88a965455b94d1e16b705903843d75fa53481d525a1965 SHA512 da7d1aa76ea04f465e690560dd2d09306aa120b9f2771abc6fe06d5181c39c9e7db73ae0b9c01b864ccdd55a881a7e9c9716dd87446c809b901bb17c448878f5
diff --git a/app-crypt/openpgp-keys-gentoo-auth/openpgp-keys-gentoo-auth-20200704.ebuild b/app-crypt/openpgp-keys-gentoo-auth/openpgp-keys-gentoo-auth-20200704.ebuild
new file mode 100644
index 000000000000..07b5242d0799
--- /dev/null
+++ b/app-crypt/openpgp-keys-gentoo-auth/openpgp-keys-gentoo-auth-20200704.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Gentoo Authority Keys (GLEP 79)"
+HOMEPAGE="https://www.gentoo.org/downloads/signatures/"
+SRC_URI="https://dev.gentoo.org/~mgorny/dist/openpgp-keys/gentoo-auth.asc.${PV}.gz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+S=${WORKDIR}
+
+# Keys included:
+# ABD00913019D6354BA1D9A132839FE0D796198B1
+# 18F703D702B1B9591373148C55D3238EC050396E
+# 2C13823B8237310FA213034930D132FF0FF50EEB
+
+src_install() {
+ insinto /usr/share/openpgp-keys
+ newins "gentoo-auth.asc.${PV}" gentoo-auth.asc
+ newins - gentoo-auth-ownertrust.txt <<-EOF
+ ABD00913019D6354BA1D9A132839FE0D796198B1:6:
+ EOF
+}
diff --git a/app-crypt/openpgp-keys-gentoo-release/Manifest b/app-crypt/openpgp-keys-gentoo-release/Manifest
index 68c2c7ac2542..e693c54e61c8 100644
--- a/app-crypt/openpgp-keys-gentoo-release/Manifest
+++ b/app-crypt/openpgp-keys-gentoo-release/Manifest
@@ -1,2 +1,3 @@
DIST gentoo-release-test-sigs-20190224.tar.gz 3235 BLAKE2B 924c69a62d5321716f536144f0607bd3ec4a65d76be492adc729864fd9bef82df0086541ae13034a83152ea0c8dc3cbd168be6cff111a3484128a22cbc8ef1d4 SHA512 f8cc2e84bedbdf14ace6abe4aacf8f0c9810c77ff6ae0fac301829d9d4d5cf0c128a76516c773ac993879215bcdb0aab097e1e7e747d8e1a7c4cfc815bd4d3e6
DIST gentoo-release.asc.20191030.gz 23981 BLAKE2B 307ceab69e309a53c2db191cf9d7a484318e852af648d93d9ad4bb2422737ab8de9257b457e5f201d86d226b348447acfbe57d259ce436150f75ccfb9f6ed60e SHA512 f3fbe0198f80f37784613c2a390c29f55e5b6291c44ee64d676806a26745017f8a9168573e13f6fc2fe93910927846c584b9f5cd017c4eac1cc875d7ed30cb8c
+DIST gentoo-release.asc.20200704.gz 17812 BLAKE2B 2173fa236db0ae08d58959732172d20fe0a6a8adc1e2ebcb33c3b9956684d26ebcf74b332a25c7d738d4820abb24c525404a6f255efcb7cedf0ab94c185a83f0 SHA512 fc5c7042570d813d906190f11869605983fcd8815cdb414d7060f8038c849d4f68426feff711a7303728c49c0515f9d836d2cc3fbbbf50811b94668194beca85
diff --git a/app-crypt/openpgp-keys-gentoo-release/openpgp-keys-gentoo-release-20200704.ebuild b/app-crypt/openpgp-keys-gentoo-release/openpgp-keys-gentoo-release-20200704.ebuild
new file mode 100644
index 000000000000..ef55df38d098
--- /dev/null
+++ b/app-crypt/openpgp-keys-gentoo-release/openpgp-keys-gentoo-release-20200704.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="OpenPGP keys used for Gentoo releases (snapshots, stages)"
+HOMEPAGE="https://www.gentoo.org/downloads/signatures/"
+SRC_URI="https://dev.gentoo.org/~mgorny/dist/openpgp-keys/gentoo-release.asc.${PV}.gz
+ test? ( https://dev.gentoo.org/~mgorny/dist/openpgp-keys/gentoo-release-test-sigs-20190224.tar.gz )"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="test? ( app-crypt/gnupg )"
+
+S=${WORKDIR}
+
+# Keys included:
+# DCD05B71EAB94199527F44ACDB6B8C1F96D8BF6D
+# D99EAC7379A850BCE47DA5F29E6438C817072058
+# 13EBBDBEDE7A12775DFDB1BABB572E0E2D182910
+# EF9538C9E8E64311A52CDEDFA13D0EF1914E7A72
+
+src_test() {
+ local old_umask=$(umask)
+ umask 077
+
+ local -x GNUPGHOME=${T}/.gnupg
+ mkdir "${GNUPGHOME}" || die
+ einfo "Importing keys ..."
+ gpg --import "gentoo-release.asc.${PV}" || die "Key import failed"
+
+ local f
+ for f in gentoo-release-test-sigs*/*.asc; do
+ einfo "Testing ${f##*/} ..."
+ gpg -q --trust-model always --verify "${f}" || die "Verification failed on ${f}"
+ done
+
+ umask "${old_umask}"
+}
+
+src_install() {
+ insinto /usr/share/openpgp-keys
+ newins "gentoo-release.asc.${PV}" gentoo-release.asc
+}
diff --git a/app-crypt/openvpn-blacklist/Manifest b/app-crypt/openvpn-blacklist/Manifest
deleted file mode 100644
index f0d35e76c60d..000000000000
--- a/app-crypt/openvpn-blacklist/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST openvpn-blacklist_0.4.tar.gz 1808103 BLAKE2B b7890a9d591128b7f770b2cdbac1ad881c430f737707c2f7c5df41d4da0c1ae52d8ee87f3ffd378718a6788721cc0c988f49c8be9b31d868c4470c204a03bd95 SHA512 3301f7425520eb086306acb30bd718465208b5aa5606e879b65f936161d1955b93254d9c1dd6f5d66ec6480850652afadabb05db2a0df9fd5acb73a5ed5c19e3
-DIST openvpn-blacklist_0.5.tar.gz 1828347 BLAKE2B d55fe46b2efea312782283ac64c7678f8ad67fe8d09be3fb4f5ada25e17cef06dcaebd4d84d6b72a3aa1093088cf2e0319c6908ce77f9f4e9adecd468c69adf1 SHA512 589216cb2f10b6ea0cf2179f8b47ce2d2ed03916ad5d8a62e22dce71f432101a735d16093855ff43a1d6618fe94e75b9127bbd63408556197e91de6735e713aa
diff --git a/app-crypt/openvpn-blacklist/metadata.xml b/app-crypt/openvpn-blacklist/metadata.xml
deleted file mode 100644
index 28ef3c7b080f..000000000000
--- a/app-crypt/openvpn-blacklist/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
-hanno@gentoo.org
-
diff --git a/app-crypt/openvpn-blacklist/openvpn-blacklist-0.4-r1.ebuild b/app-crypt/openvpn-blacklist/openvpn-blacklist-0.4-r1.ebuild
deleted file mode 100644
index 661bca59a64d..000000000000
--- a/app-crypt/openvpn-blacklist/openvpn-blacklist-0.4-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-inherit python-single-r1
-
-DESCRIPTION="Detection of weak openvpn keys produced by certain debian versions in 2006-2008"
-HOMEPAGE="http://packages.debian.org/sid/openvpn-blacklist"
-SRC_URI="mirror://debian/pool/main/o/${PN}/${PN}_${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=${PYTHON_DEPS}
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-src_prepare() {
- python_fix_shebang openvpn-vulnkey
-}
-
-src_install() {
- dobin openvpn-vulnkey
- doman openvpn-vulnkey.1
- dodir /usr/share/openvpn-blacklist
- cat "${S}/debian/blacklist.prefix" > "${D}/usr/share/openssl-blacklist/blacklist.RSA-2048"
- cut "${S}/blacklist.RSA-2048" -d ' ' -f 2 | cut -b13- | sort \
- >> "${D}/usr/share/openvpn-blacklist/blacklist.RSA-2048"
-}
diff --git a/app-crypt/openvpn-blacklist/openvpn-blacklist-0.5.ebuild b/app-crypt/openvpn-blacklist/openvpn-blacklist-0.5.ebuild
deleted file mode 100644
index c6b4f267170e..000000000000
--- a/app-crypt/openvpn-blacklist/openvpn-blacklist-0.5.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-inherit python-single-r1
-
-DESCRIPTION="Detection of weak openvpn keys produced by certain debian versions in 2006-2008"
-HOMEPAGE="http://packages.debian.org/sid/openvpn-blacklist"
-SRC_URI="mirror://debian/pool/main/o/${PN}/${PN}_${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=${PYTHON_DEPS}
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-src_prepare() {
- python_fix_shebang openvpn-vulnkey
-}
-
-src_install() {
- dobin openvpn-vulnkey
- doman openvpn-vulnkey.1
- dodir /usr/share/openvpn-blacklist
- insinto /usr/share/openvpn-blacklist
- newins debian/blacklist.prefix blacklist.RSA-2048
- cut "${S}/blacklist.RSA-2048" -d ' ' -f 2 | cut -b13- | sort \
- >> "${D}/usr/share/openvpn-blacklist/blacklist.RSA-2048"|| die
-}
diff --git a/app-crypt/seahorse/Manifest b/app-crypt/seahorse/Manifest
index 2570ad776f70..87b110101466 100644
--- a/app-crypt/seahorse/Manifest
+++ b/app-crypt/seahorse/Manifest
@@ -1,2 +1 @@
-DIST seahorse-3.32.2.tar.xz 1278668 BLAKE2B cd3fe6794ca02b1b0fd4b833a7128b8180137441a788f1f3ec5bb4186517ebb9e7422fabab2d19f60420b36e6b1ecab8b8326c99122aad185b8e45927232708f SHA512 e372f79907fbc5d60a41ea0db3a91575b0b304c1727c6091f94eec28445cd836faa32754582c59fd1eb8ce784986e63b4c8cabbd46d5e4cacec1150d9ca08481
DIST seahorse-3.34.1.tar.xz 1271616 BLAKE2B 64956d0ee4f15bc048f42cefd827aad91927b34eecf4a2e53d988c379b3eae1ce0ae29ef469c2ff80ec9cceeaf77a271c57e28cb98dd24ae55c048faff487c1d SHA512 d2dff7d73a0968c1a5a8d39460f08b67f6794f22812200f564ef719354ab5cc2dac2213cba0d4bc10a455aecb9f55de8ff39943db4482beaac9cfdc2ca1012b8
diff --git a/app-crypt/seahorse/files/3.32.2-libsecret-0.20-compat.patch b/app-crypt/seahorse/files/3.32.2-libsecret-0.20-compat.patch
deleted file mode 100644
index 38c7ca2c15f7..000000000000
--- a/app-crypt/seahorse/files/3.32.2-libsecret-0.20-compat.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From d9db29db567012b7c72e85e1be1fbf55fcc9b667 Mon Sep 17 00:00:00 2001
-From: Niels De Graef
-Date: Sat, 11 May 2019 09:02:34 +0200
-Subject: [PATCH] gkr: Use 0 on empty flags
-
-A Flags-type variable without any flag set can be replaced with 0, so
-this is a safe thing to do. It also prevents us from having to deal with
-the accidental API break in libsecret (see
-https://gitlab.gnome.org/GNOME/libsecret/merge_requests/19)
----
- gkr/gkr-keyring-add.vala | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/gkr/gkr-keyring-add.vala b/gkr/gkr-keyring-add.vala
-index 4e92a520..f60c9a22 100644
---- a/gkr/gkr-keyring-add.vala
-+++ b/gkr/gkr-keyring-add.vala
-@@ -41,8 +41,7 @@ public class Seahorse.Gkr.KeyringAdd : Gtk.Dialog {
-
- var cancellable = Dialog.begin_request(this);
- var service = Backend.instance().service;
-- Secret.Collection.create.begin(service, this.name_entry.text, null,
-- Secret.CollectionCreateFlags.COLLECTION_CREATE_NONE,
-+ Secret.Collection.create.begin(service, this.name_entry.text, null, 0,
- cancellable, (obj, res) => {
- /* Clear the operation without cancelling it since it is complete */
- Dialog.complete_request(this, false);
---
-2.20.1
-
diff --git a/app-crypt/seahorse/seahorse-3.32.2.ebuild b/app-crypt/seahorse/seahorse-3.32.2.ebuild
deleted file mode 100644
index 3d701d04f420..000000000000
--- a/app-crypt/seahorse/seahorse-3.32.2.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome.org gnome2-utils meson xdg vala
-
-DESCRIPTION="Manage your passwords and encryption keys"
-HOMEPAGE="https://wiki.gnome.org/Apps/Seahorse"
-
-LICENSE="GPL-2+ FDL-1.1+"
-SLOT="0"
-IUSE="ldap zeroconf"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-
-RDEPEND="
- >=dev-libs/glib-2.44:2
- >=app-crypt/gcr-3.11.91:=
- >=app-crypt/gpgme-1.7.0
- >=x11-libs/gtk+-3.22.0:3
- >=app-crypt/gnupg-2.0.12
- >=app-crypt/libsecret-0.16
- dev-libs/libpwquality
- net-misc/openssh
- ldap? ( net-nds/openldap:= )
- >=net-libs/libsoup-2.33.92:2.4
- zeroconf? ( >=net-dns/avahi-0.6:=[dbus] )
-"
-DEPEND="${RDEPEND}
- $(vala_depend)
- dev-libs/appstream-glib
- dev-libs/libxml2:2
- dev-util/gdbus-codegen
- dev-util/glib-utils
- dev-util/itstool
- >=sys-devel/gettext-0.19.8
- virtual/pkgconfig
- app-crypt/gcr[vala]
- app-crypt/libsecret[vala]
-"
-
-PATCHES=(
- "${FILESDIR}"/${PV}-libsecret-0.20-compat.patch # included upstream for 3.34
-)
-
-src_prepare() {
- xdg_src_prepare
- vala_src_prepare
-}
-
-src_configure() {
- local emesonargs=(
- -Dhelp=true
- -Dpgp-support=true
- -Dcheck-compatible-gpg=false # keep lowest version listed as compatible as min dep for gnupg RDEPEND
- -Dpkcs11-support=true
- -Dkeyservers-support=true
- -Dhkp-support=true
- $(meson_use ldap ldap-support)
- $(meson_use zeroconf key-sharing)
- )
- meson_src_configure
-}
-
-pkg_postinst() {
- xdg_pkg_postinst
- gnome2_schemas_update
-}
-
-pkg_postrm() {
- xdg_pkg_postrm
- gnome2_schemas_update
-}
diff --git a/app-doc/Manifest.gz b/app-doc/Manifest.gz
index ddfbd36a48ed..d85fed037d21 100644
Binary files a/app-doc/Manifest.gz and b/app-doc/Manifest.gz differ
diff --git a/app-doc/eclass-manpages/Manifest b/app-doc/eclass-manpages/Manifest
index 84bb330c31bc..caf0f8952671 100644
--- a/app-doc/eclass-manpages/Manifest
+++ b/app-doc/eclass-manpages/Manifest
@@ -1 +1,2 @@
DIST eclass-manpages-20200213.tar.xz 411328 BLAKE2B 71ecb7fefddfa1e2f865841ca557581e78ba17776be0e678ad21fbe47a2494da0d4a13b11c6b449846b6f05ceebaa78add078e763c3b9c910d5a40c149dca6c5 SHA512 16a67c05beb36ff63b75c065fc92852c959cc4645939f7c5a8894a6eecf3a334abe117417d57e45fb222204f233755c6848f53569ca64f911bf7e05f33a0ab26
+DIST eclass-manpages-20200704.tar.xz 409212 BLAKE2B 0b8115d40520bf045bdce487cae53ee152e84d2d3ac47a7956530801c16be60f0cff72f6d7275c95b9ecb40e170cc279272ce846ea94a75ee25081b7f7e22a78 SHA512 8ad4a24352008072c65f4c9b0978b8dec029f9ed04efc13202742aa922b71521c59113ab80b6219dc65ea63279b3f0f3d4b720e542b524cdb0787879849d7ec7
diff --git a/app-doc/eclass-manpages/eclass-manpages-20200704.ebuild b/app-doc/eclass-manpages/eclass-manpages-20200704.ebuild
new file mode 100644
index 000000000000..673d3a042117
--- /dev/null
+++ b/app-doc/eclass-manpages/eclass-manpages-20200704.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+DESCRIPTION="Collection of Gentoo eclass manpages"
+HOMEPAGE="https://github.com/mgorny/eclass-to-manpage"
+SRC_URI="https://dev.gentoo.org/~mgorny/dist/eclass-manpages/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+# Keep the keywords stable. No need to change to ~arch.
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
+
+BDEPEND="app-arch/xz-utils
+ sys-apps/gawk"
+
+src_install() {
+ emake install DESTDIR="${D}" PREFIX="${EPREFIX}/usr"
+}
diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index 58e822deeeb6..05aa56913560 100644
Binary files a/app-editors/Manifest.gz and b/app-editors/Manifest.gz differ
diff --git a/app-editors/gvim/gvim-8.2.0814.ebuild b/app-editors/gvim/gvim-8.2.0814.ebuild
index 3542682bc039..15593afef335 100644
--- a/app-editors/gvim/gvim-8.2.0814.ebuild
+++ b/app-editors/gvim/gvim-8.2.0814.ebuild
@@ -200,7 +200,7 @@ src_configure() {
$(use_enable nls)
$(use_enable perl perlinterp)
$(use_enable python python3interp)
- $(use_with python python3-command $(type -P $(eselect python show --python3)))
+ $(use_with python python3-command "${PYTHON}")
$(use_enable racket mzschemeinterp)
$(use_enable ruby rubyinterp)
$(use_enable selinux)
diff --git a/app-editors/hteditor/Manifest b/app-editors/hteditor/Manifest
index 282dfd9fd8c9..269e9e3ca85d 100644
--- a/app-editors/hteditor/Manifest
+++ b/app-editors/hteditor/Manifest
@@ -1 +1,2 @@
DIST ht-2.1.0.tar.bz2 884139 BLAKE2B c979563cbfc4df7e14f587b250fbf099d9f4683afddb3afc88693284c378c45466dfa3c47555fc69e83e2972cfabab63f3cdd42fd85602842854372131e4063d SHA512 6b5fc5fcbc63b9b7c85721158e044e4578ebfdc38618c760c0e6de06a276bccd3a960ab8bed172de788934515ad94d86349c4abd3228da66b1601deaaa2ce410
+DIST ht-2.1.1_pre20161206.tar.gz 1082309 BLAKE2B 4fb00b0aa6115da3b561436f9f9905c48d93d6768bcf207931bb46840727c85fb5c9a1afda8ed805f71e9ce242161a2b95e26add02ff5aedc407df7f11c6ddec SHA512 33d681ee8c978568dd0d187d6846994362625d000c316baab10c237175fa6a47dc0e7b61cfd503c4dfad8a01d27af7fc87cbf20109087e1d9280048c898fa621
diff --git a/app-editors/hteditor/hteditor-2.1.0-r1.ebuild b/app-editors/hteditor/hteditor-2.1.0-r1.ebuild
index 5b912857bc6f..1660e108bde7 100644
--- a/app-editors/hteditor/hteditor-2.1.0-r1.ebuild
+++ b/app-editors/hteditor/hteditor-2.1.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/hte/${MY_P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc ppc64 x86"
IUSE="X"
RDEPEND="sys-libs/ncurses:0=
diff --git a/app-editors/hteditor/hteditor-2.1.1_pre20161206.ebuild b/app-editors/hteditor/hteditor-2.1.1_pre20161206.ebuild
new file mode 100644
index 000000000000..cd12cdc54f1e
--- /dev/null
+++ b/app-editors/hteditor/hteditor-2.1.1_pre20161206.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_P=${P/editor}
+
+DESCRIPTION="A file viewer, editor and analyzer for text, binary, and executable files"
+HOMEPAGE="http://hte.sourceforge.net/ https://github.com/sebastianbiallas/ht/"
+#SRC_URI="mirror://sourceforge/hte/${MY_P}.tar.bz2"
+# tarball is done as: 'make dist' and then rename to mention latest commt
+SRC_URI="https://dev.gentoo.org/~slyfox/distfiles/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="X"
+
+RDEPEND="sys-libs/ncurses:0=
+ X? ( x11-libs/libX11 )
+ >=dev-libs/lzo-2"
+DEPEND="${RDEPEND}
+ virtual/yacc
+ sys-devel/flex"
+
+DOCS=( AUTHORS ChangeLog KNOWNBUGS README TODO )
+
+S=${WORKDIR}/${MY_P/_pre*}
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.1.0-tinfo.patch
+ "${FILESDIR}"/${PN}-2.1.0-gcc-6-uchar.patch
+)
+
+src_configure() {
+ econf \
+ $(use_enable X x11-textmode) \
+ --enable-maintainermode
+}
+
+src_install() {
+ #For prefix
+ chmod u+x "${S}/install-sh"
+
+ local HTML_DOCS="doc/*.html"
+ doinfo doc/*.info
+
+ default
+}
diff --git a/app-editors/teco/teco-36_p19940820.ebuild b/app-editors/teco/teco-36_p19940820.ebuild
index cb7d37feb456..d37ed3f84e1f 100644
--- a/app-editors/teco/teco-36_p19940820.ebuild
+++ b/app-editors/teco/teco-36_p19940820.ebuild
@@ -6,8 +6,8 @@ EAPI=7
inherit toolchain-funcs flag-o-matic readme.gentoo-r1
DESCRIPTION="Classic TECO editor, Predecessor to EMACS"
-HOMEPAGE="http://www.ibiblio.org/pub/linux/apps/editors/tty/ http://www.ibiblio.org/pub/academic/computer-science/history/pdp-11/teco"
-SRC_URI="http://www.ibiblio.org/pub/linux/apps/editors/tty/teco.tar.gz -> ${P}.tar.gz
+HOMEPAGE="https://www.ibiblio.org/pub/linux/apps/editors/tty/ https://www.ibiblio.org/pub/academic/computer-science/history/pdp-11/teco"
+SRC_URI="https://www.ibiblio.org/pub/linux/apps/editors/tty/teco.tar.gz -> ${P}.tar.gz
doc? ( https://dev.gentoo.org/~ulm/distfiles/tecodoc.tar.gz )"
LICENSE="freedist"
diff --git a/app-editors/vim/vim-8.2.0814.ebuild b/app-editors/vim/vim-8.2.0814.ebuild
index 5bc04c0d2b05..f077cf006b4c 100644
--- a/app-editors/vim/vim-8.2.0814.ebuild
+++ b/app-editors/vim/vim-8.2.0814.ebuild
@@ -204,7 +204,7 @@ src_configure() {
$(use_enable nls)
$(use_enable perl perlinterp)
$(use_enable python python3interp)
- $(use_with python python3-command $(type -P $(eselect python show --python3)))
+ $(use_with python python3-command "${PYTHON}")
$(use_enable racket mzschemeinterp)
$(use_enable ruby rubyinterp)
$(use_enable selinux)
diff --git a/app-editors/vis/Manifest b/app-editors/vis/Manifest
index 54cce819aac0..6258f1a7c753 100644
--- a/app-editors/vis/Manifest
+++ b/app-editors/vis/Manifest
@@ -1,2 +1,4 @@
DIST vis-0.5.tar.gz 390461 BLAKE2B e628891c48dbbd11ed706768a3c625ffe9edf4fea3cd77452b4b41ae0d50194a31647e4cc945b69fb3af8fe7fd76ebf5f7afd8c2baa356f5f9fd3cc04be129ca SHA512 fe6b0394006562177efdf06713d7b95cd12fabf90b171c262eb2620d2b0944e73d3d8bb61f4f0d43d32154f0490c338bbc161a89455b14bb8a9d22cd75097780
+DIST vis-0.6.tar.gz 397707 BLAKE2B 9768f3d5586afd261f3e82721c08bdfddcd1c51a4f76d45c2f75eb954feed49d1ebeb1ee2cb31675cf68b356a0d32bcc33454aa2fbf0fd5c77afeea0a73465cd SHA512 3809b40f75816e03e47e0c2c16d2681cc1c01ad50a3d051285d5f1e9ff0a333160e668228a129a1596109aa079dc8364d3ad060b88e9dba33bb1d60a15eaf4e2
DIST vis-test-0.3.tar.gz 97814 BLAKE2B f62b216df3d846bb8bfdb14f6092309b55f6571cbc980e7a9aed46b1672fbaa65c007ac4617266dff3d5ad0293e3f5e7bd8390252817ebcdd6f64edb350f82ee SHA512 5f68a70cf6f1fb64f9b50c1a56940c966f205e51240c7dd1175bc15f3e42b475fb6842a53e36547113955c2efa359de0cc71e0800305b0e45881c319a14564e5
+DIST vis-test-0.4.tar.gz 98703 BLAKE2B dc9df00ae97ecd58022f885b25cb8163dd8b86f93d95cf93bbe1bd1efcc7690393efc4d47e3dccedc5f0ac6c33519136e6f13e6b9b9707f870b421aa3101537e SHA512 446eea2fdb7b15fd4962901e2076649964981217b9cf47112f16d1404da7cc024ba4b13164df0afa763363cef4f82db4ad9d7283a7554aead2165f29ca0bc9a5
diff --git a/app-editors/vis/vis-0.6.ebuild b/app-editors/vis/vis-0.6.ebuild
new file mode 100644
index 000000000000..7a2ce6eaaa69
--- /dev/null
+++ b/app-editors/vis/vis-0.6.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PTV=0.4
+
+DESCRIPTION="modern, legacy free, simple yet efficient vim-like editor"
+HOMEPAGE="https://github.com/martanne/vis"
+SRC_URI="https://github.com/martanne/vis/releases/download/v${PV}/${P}.tar.gz
+ test? ( https://github.com/martanne/vis-test/releases/download/v${MY_PTV}/vis-test-${MY_PTV}.tar.gz )"
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="+ncurses selinux test tre"
+RESTRICT="!test? ( test )"
+
+# - Known to also work with NetBSD curses
+# - ::lua package done for using >=dev-lang/lua-5.2
+# which is needed for syntax highlighting and settings but masked in ::gentoo
+DEPEND="dev-libs/libtermkey
+ ncurses? ( sys-libs/ncurses:0= )
+ tre? ( dev-libs/tre:= )"
+RDEPEND="${DEPEND}
+ app-eselect/eselect-vi"
+
+src_prepare() {
+ if use test; then
+ rm -r test || die
+ mv "${WORKDIR}/vis-test-${MY_PTV}" test || die
+
+ # https://bugs.gentoo.org/722014 https://github.com/martanne/vis-test/pull/22
+ sed -i 's;./ccan-config > config.h;./ccan-config "${CC}" ${CFLAGS} > config.h;' test/core/Makefile || die
+ fi
+
+ sed -i 's|STRIP?=.*|STRIP=true|' Makefile || die
+ sed -i 's|${DOCPREFIX}/vis|${DOCPREFIX}|' Makefile || die
+ sed -i 's|DOCUMENTATION = LICENSE|DOCUMENTATION =|' Makefile || die
+
+ default
+}
+
+src_configure() {
+ ./configure \
+ --prefix="${EPREFIX}"/usr \
+ --docdir="${EPREFIX}"/usr/share/doc/${PF} \
+ $(use_enable ncurses curses) \
+ $(use_enable selinux) \
+ $(use_enable tre) || die
+}
+
+update_symlinks() {
+ einfo "Calling eselect vi update --if-unset"
+ eselect vi update --if-unset
+}
+
+pkg_postrm() {
+ update_symlinks
+}
+
+pkg_postinst() {
+ update_symlinks
+}
diff --git a/app-editors/vis/vis-9999.ebuild b/app-editors/vis/vis-9999.ebuild
index 72ff783c8404..600b5efb0576 100644
--- a/app-editors/vis/vis-9999.ebuild
+++ b/app-editors/vis/vis-9999.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
inherit git-r3
DESCRIPTION="modern, legacy free, simple yet efficient vim-like editor"
@@ -13,8 +13,9 @@ KEYWORDS=""
IUSE="+ncurses selinux test tre"
RESTRICT="!test? ( test )"
-#Note: vis is reported to also work with NetBSD curses
-#TODO: >=dev-lang/lua-5.2 (needed for syntax highlighting and settings)
+# - Known to also work with NetBSD curses
+# - ::lua package done for using >=dev-lang/lua-5.2
+# which is needed for syntax highlighting and settings but masked in ::gentoo
DEPEND="dev-libs/libtermkey
ncurses? ( sys-libs/ncurses:0= )
tre? ( dev-libs/tre:= )"
@@ -22,10 +23,6 @@ RDEPEND="${DEPEND}
app-eselect/eselect-vi"
src_prepare() {
- if use test && ! type -P vim &>/dev/null; then
- sed -i 's/.*vim.*//' "${S}/test/Makefile" || die
- fi
-
sed -i 's|STRIP?=.*|STRIP=true|' Makefile || die
sed -i 's|${DOCPREFIX}/vis|${DOCPREFIX}|' Makefile || die
sed -i 's|DOCUMENTATION = LICENSE|DOCUMENTATION =|' Makefile || die
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index c9ee0449d311..de8e10cd324e 100644
Binary files a/app-emulation/Manifest.gz and b/app-emulation/Manifest.gz differ
diff --git a/app-emulation/qemu/Manifest b/app-emulation/qemu/Manifest
index 333933242cf5..fa5828b78783 100644
--- a/app-emulation/qemu/Manifest
+++ b/app-emulation/qemu/Manifest
@@ -1,3 +1 @@
-DIST qemu-4.2.0-patches-r2.tar.xz 17868 BLAKE2B 3783d0f923ded66cce1195248981c83bbaf8b7ad2a270207e92e60b4d05d4787cd9324649c113a4616c2a9ddcef99841264f19915615b7a0a24dac9febed48ba SHA512 556f1c595a35ee4279b2d0890d90e48cd43d9d641ccca495e2494f62ab48dfc000dbe23718276271ced3d4b7680c814f8f8846195089ff56186f618063a83b48
-DIST qemu-4.2.0.tar.xz 62222068 BLAKE2B 27c9fbcd5093af425764674817ab9299224bd03f37b5983786f6f437fff1fab3b7da247c55c4ca8b8c42726b9867005944a2f7f04f2d0d94d753961615f901ef SHA512 2a79973c2b07c53e8c57a808ea8add7b6b2cbca96488ed5d4b669ead8c9318907dec2b6109f180fc8ca8f04c0f73a56e82b3a527b5626b799d7e849f2474ec56
DIST qemu-5.0.0.tar.xz 62426192 BLAKE2B 785d02ef79c95b5c4f0556186054885f9893d4e8a9f4b4f2d6199a4e1ae9c31d7c79dd900305469217f85d61bbe74134b601d5c6c1b0eee2b74792d010f1fd63 SHA512 21ef0cbe107c468a40f0fa2635db2a40048c8790b629dfffca5cd62bb1b502ea8eb133bfc40df5ecf1489e2bffe87f6829aee041cb8a380ff04a8afa23b39fcf
diff --git a/app-emulation/qemu/qemu-4.2.0-r6.ebuild b/app-emulation/qemu/qemu-4.2.0-r6.ebuild
deleted file mode 100644
index 8a93874b711e..000000000000
--- a/app-emulation/qemu/qemu-4.2.0-r6.ebuild
+++ /dev/null
@@ -1,834 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python{3_6,3_7,3_8} )
-PYTHON_REQ_USE="ncurses,readline"
-
-PLOCALES="bg de_DE fr_FR hu it tr zh_CN"
-
-FIRMWARE_ABI_VERSION="4.0.0-r50"
-
-inherit eutils linux-info toolchain-funcs multilib python-r1 \
- udev fcaps readme.gentoo-r1 pax-utils l10n xdg-utils
-
-if [[ ${PV} = *9999* ]]; then
- EGIT_REPO_URI="https://git.qemu.org/git/qemu.git"
- EGIT_SUBMODULES=(
- slirp
- tests/fp/berkeley-{test,soft}float-3
- ui/keycodemapdb
- )
- inherit git-r3
- SRC_URI=""
-else
- SRC_URI="https://download.qemu.org/${P}.tar.xz
- https://dev.gentoo.org/~tamiko/distfiles/${P}-patches-r2.tar.xz"
- KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 x86"
-fi
-
-DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"
-HOMEPAGE="http://www.qemu.org http://www.linux-kvm.org"
-
-LICENSE="GPL-2 LGPL-2 BSD-2"
-SLOT="0"
-
-IUSE="accessibility +aio alsa bzip2 capstone +caps +curl debug doc
- +fdt glusterfs gnutls gtk infiniband iscsi jemalloc +jpeg kernel_linux
- kernel_FreeBSD lzo ncurses nfs nls numa opengl +oss +pin-upstream-blobs
- plugins +png pulseaudio python rbd sasl +seccomp sdl sdl-image selinux
- smartcard snappy spice ssh static static-user systemtap tci test usb
- usbredir vde +vhost-net vhost-user-fs virgl virtfs +vnc vte xattr xen
- xfs +xkb"
-
-COMMON_TARGETS="aarch64 alpha arm cris hppa i386 m68k microblaze microblazeel
- mips mips64 mips64el mipsel nios2 or1k ppc ppc64 riscv32 riscv64 s390x
- sh4 sh4eb sparc sparc64 x86_64 xtensa xtensaeb"
-IUSE_SOFTMMU_TARGETS="${COMMON_TARGETS}
- lm32 moxie tricore unicore32"
-IUSE_USER_TARGETS="${COMMON_TARGETS}
- aarch64_be armeb mipsn32 mipsn32el ppc64abi32 ppc64le sparc32plus
- tilegx"
-
-use_softmmu_targets=$(printf ' qemu_softmmu_targets_%s' ${IUSE_SOFTMMU_TARGETS})
-use_user_targets=$(printf ' qemu_user_targets_%s' ${IUSE_USER_TARGETS})
-IUSE+=" ${use_softmmu_targets} ${use_user_targets}"
-
-RESTRICT="!test? ( test )"
-# Allow no targets to be built so that people can get a tools-only build.
-# Block USE flag configurations known to not work.
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
- qemu_softmmu_targets_arm? ( fdt )
- qemu_softmmu_targets_microblaze? ( fdt )
- qemu_softmmu_targets_mips64el? ( fdt )
- qemu_softmmu_targets_ppc64? ( fdt )
- qemu_softmmu_targets_ppc? ( fdt )
- qemu_softmmu_targets_riscv32? ( fdt )
- qemu_softmmu_targets_riscv64? ( fdt )
- static? ( static-user !alsa !gtk !opengl !pulseaudio !plugins !rbd !snappy )
- static-user? ( !plugins )
- virtfs? ( xattr )
- vte? ( gtk )
- plugins? ( !static !static-user )
-"
-
-# Dependencies required for qemu tools (qemu-nbd, qemu-img, qemu-io, ...)
-# and user/softmmu targets (qemu-*, qemu-system-*).
-#
-# Yep, you need both libcap and libcap-ng since virtfs only uses libcap.
-#
-# The attr lib isn't always linked in (although the USE flag is always
-# respected). This is because qemu supports using the C library's API
-# when available rather than always using the external library.
-ALL_DEPEND="
- >=dev-libs/glib-2.0[static-libs(+)]
- sys-libs/zlib[static-libs(+)]
- python? ( ${PYTHON_DEPS} )
- systemtap? ( dev-util/systemtap )
- xattr? ( sys-apps/attr[static-libs(+)] )"
-
-# Dependencies required for qemu tools (qemu-nbd, qemu-img, qemu-io, ...)
-# softmmu targets (qemu-system-*).
-SOFTMMU_TOOLS_DEPEND="
- dev-libs/libxml2[static-libs(+)]
- xkb? ( x11-libs/libxkbcommon[static-libs(+)] )
- >=x11-libs/pixman-0.28.0[static-libs(+)]
- accessibility? (
- app-accessibility/brltty[api]
- app-accessibility/brltty[static-libs(+)]
- )
- aio? ( dev-libs/libaio[static-libs(+)] )
- alsa? ( >=media-libs/alsa-lib-1.0.13 )
- bzip2? ( app-arch/bzip2[static-libs(+)] )
- capstone? ( dev-libs/capstone:= )
- caps? ( sys-libs/libcap-ng[static-libs(+)] )
- curl? ( >=net-misc/curl-7.15.4[static-libs(+)] )
- fdt? ( >=sys-apps/dtc-1.5.0[static-libs(+)] )
- glusterfs? ( >=sys-cluster/glusterfs-3.4.0[static-libs(+)] )
- gnutls? (
- dev-libs/nettle:=[static-libs(+)]
- >=net-libs/gnutls-3.0:=[static-libs(+)]
- )
- gtk? (
- x11-libs/gtk+:3
- vte? ( x11-libs/vte:2.91 )
- )
- infiniband? (
- sys-fabric/libibumad:=[static-libs(+)]
- sys-fabric/libibverbs:=[static-libs(+)]
- sys-fabric/librdmacm:=[static-libs(+)]
- )
- iscsi? ( net-libs/libiscsi )
- jemalloc? ( dev-libs/jemalloc )
- jpeg? ( virtual/jpeg:0=[static-libs(+)] )
- lzo? ( dev-libs/lzo:2[static-libs(+)] )
- ncurses? (
- sys-libs/ncurses:0=[unicode]
- sys-libs/ncurses:0=[static-libs(+)]
- )
- nfs? ( >=net-fs/libnfs-1.9.3:=[static-libs(+)] )
- numa? ( sys-process/numactl[static-libs(+)] )
- opengl? (
- virtual/opengl
- media-libs/libepoxy[static-libs(+)]
- media-libs/mesa[static-libs(+)]
- media-libs/mesa[egl,gbm]
- )
- png? ( media-libs/libpng:0=[static-libs(+)] )
- pulseaudio? ( media-sound/pulseaudio )
- rbd? ( sys-cluster/ceph )
- sasl? ( dev-libs/cyrus-sasl[static-libs(+)] )
- sdl? (
- media-libs/libsdl2[X]
- media-libs/libsdl2[static-libs(+)]
- )
- sdl-image? ( media-libs/sdl2-image[static-libs(+)] )
- seccomp? ( >=sys-libs/libseccomp-2.1.0[static-libs(+)] )
- smartcard? ( >=app-emulation/libcacard-2.5.0[static-libs(+)] )
- snappy? ( app-arch/snappy:= )
- spice? (
- >=app-emulation/spice-protocol-0.12.3
- >=app-emulation/spice-0.12.0[static-libs(+)]
- )
- ssh? ( >=net-libs/libssh-0.8.6[static-libs(+)] )
- usb? ( >=virtual/libusb-1-r2[static-libs(+)] )
- usbredir? ( >=sys-apps/usbredir-0.6[static-libs(+)] )
- vde? ( net-misc/vde[static-libs(+)] )
- virgl? ( media-libs/virglrenderer[static-libs(+)] )
- virtfs? ( sys-libs/libcap )
- xen? ( app-emulation/xen-tools:= )
- xfs? ( sys-fs/xfsprogs[static-libs(+)] )"
-
-X86_FIRMWARE_DEPEND="
- pin-upstream-blobs? (
- ~sys-firmware/edk2-ovmf-201905[binary]
- ~sys-firmware/ipxe-1.0.0_p20190728[binary]
- ~sys-firmware/seabios-1.12.0[binary,seavgabios]
- ~sys-firmware/sgabios-0.1_pre8[binary]
- )
- !pin-upstream-blobs? (
- sys-firmware/edk2-ovmf
- sys-firmware/ipxe
- >=sys-firmware/seabios-1.10.2[seavgabios]
- sys-firmware/sgabios
- )"
-PPC64_FIRMWARE_DEPEND="
- pin-upstream-blobs? (
- ~sys-firmware/seabios-1.12.0[binary,seavgabios]
- )
- !pin-upstream-blobs? (
- >=sys-firmware/seabios-1.10.2[seavgabios]
- )
-"
-
-BDEPEND="
- $(python_gen_impl_dep)
- dev-lang/perl
- sys-apps/texinfo
- virtual/pkgconfig
- doc? ( dev-python/sphinx )
- gtk? ( nls? ( sys-devel/gettext ) )
- test? (
- dev-libs/glib[utils]
- sys-devel/bc
- )
-"
-CDEPEND="
- !static? (
- ${ALL_DEPEND//\[static-libs(+)]}
- ${SOFTMMU_TOOLS_DEPEND//\[static-libs(+)]}
- )
- qemu_softmmu_targets_i386? ( ${X86_FIRMWARE_DEPEND} )
- qemu_softmmu_targets_x86_64? ( ${X86_FIRMWARE_DEPEND} )
- qemu_softmmu_targets_ppc64? ( ${PPC64_FIRMWARE_DEPEND} )
-"
-DEPEND="${CDEPEND}
- kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 )
- static? (
- ${ALL_DEPEND}
- ${SOFTMMU_TOOLS_DEPEND}
- )
- static-user? ( ${ALL_DEPEND} )"
-RDEPEND="${CDEPEND}
- acct-group/kvm
- selinux? ( sec-policy/selinux-qemu )"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-2.5.0-cflags.patch
- "${FILESDIR}"/${PN}-2.11.1-capstone_include_path.patch
- "${FILESDIR}"/${PN}-4.0.0-mkdir_systemtap.patch #684902
- "${FILESDIR}"/${PN}-4.2.0-ati-vga-crash.patch #719266
- "${WORKDIR}"/patches
-)
-
-QA_PREBUILT="
- usr/share/qemu/hppa-firmware.img
- usr/share/qemu/openbios-ppc
- usr/share/qemu/openbios-sparc64
- usr/share/qemu/openbios-sparc32
- usr/share/qemu/palcode-clipper
- usr/share/qemu/s390-ccw.img
- usr/share/qemu/s390-netboot.img
- usr/share/qemu/u-boot.e500"
-
-QA_WX_LOAD="usr/bin/qemu-i386
- usr/bin/qemu-x86_64
- usr/bin/qemu-alpha
- usr/bin/qemu-arm
- usr/bin/qemu-cris
- usr/bin/qemu-m68k
- usr/bin/qemu-microblaze
- usr/bin/qemu-microblazeel
- usr/bin/qemu-mips
- usr/bin/qemu-mipsel
- usr/bin/qemu-or1k
- usr/bin/qemu-ppc
- usr/bin/qemu-ppc64
- usr/bin/qemu-ppc64abi32
- usr/bin/qemu-sh4
- usr/bin/qemu-sh4eb
- usr/bin/qemu-sparc
- usr/bin/qemu-sparc64
- usr/bin/qemu-armeb
- usr/bin/qemu-sparc32plus
- usr/bin/qemu-s390x
- usr/bin/qemu-unicore32"
-
-DOC_CONTENTS="If you don't have kvm compiled into the kernel, make sure you have the
-kernel module loaded before running kvm. The easiest way to ensure that the
-kernel module is loaded is to load it on boot.
- For AMD CPUs the module is called 'kvm-amd'.
- For Intel CPUs the module is called 'kvm-intel'.
-Please review /etc/conf.d/modules for how to load these.
-
-Make sure your user is in the 'kvm' group. Just run
- $ gpasswd -a kvm
-then have re-login.
-
-For brand new installs, the default permissions on /dev/kvm might not let
-you access it. You can tell udev to reset ownership/perms:
- $ udevadm trigger -c add /dev/kvm
-
-If you want to register binfmt handlers for qemu user targets:
-For openrc:
- # rc-update add qemu-binfmt
-For systemd:
- # ln -s /usr/share/qemu/binfmt.d/qemu.conf /etc/binfmt.d/qemu.conf"
-
-pkg_pretend() {
- if use kernel_linux && kernel_is lt 2 6 25; then
- eerror "This version of KVM requres a host kernel of 2.6.25 or higher."
- elif use kernel_linux; then
- if ! linux_config_exists; then
- eerror "Unable to check your kernel for KVM support"
- else
- CONFIG_CHECK="~KVM ~TUN ~BRIDGE"
- ERROR_KVM="You must enable KVM in your kernel to continue"
- ERROR_KVM_AMD="If you have an AMD CPU, you must enable KVM_AMD in"
- ERROR_KVM_AMD+=" your kernel configuration."
- ERROR_KVM_INTEL="If you have an Intel CPU, you must enable"
- ERROR_KVM_INTEL+=" KVM_INTEL in your kernel configuration."
- ERROR_TUN="You will need the Universal TUN/TAP driver compiled"
- ERROR_TUN+=" into your kernel or loaded as a module to use the"
- ERROR_TUN+=" virtual network device if using -net tap."
- ERROR_BRIDGE="You will also need support for 802.1d"
- ERROR_BRIDGE+=" Ethernet Bridging for some network configurations."
- use vhost-net && CONFIG_CHECK+=" ~VHOST_NET"
- ERROR_VHOST_NET="You must enable VHOST_NET to have vhost-net"
- ERROR_VHOST_NET+=" support"
-
- if use amd64 || use x86 || use amd64-linux || use x86-linux; then
- if grep -q AuthenticAMD /proc/cpuinfo; then
- CONFIG_CHECK+=" ~KVM_AMD"
- elif grep -q GenuineIntel /proc/cpuinfo; then
- CONFIG_CHECK+=" ~KVM_INTEL"
- fi
- fi
-
- use python && CONFIG_CHECK+=" ~DEBUG_FS"
- ERROR_DEBUG_FS="debugFS support required for kvm_stat"
-
- # Now do the actual checks setup above
- check_extra_config
- fi
- fi
-
- if grep -qs '/usr/bin/qemu-kvm' "${EROOT}"/etc/libvirt/qemu/*.xml; then
- eerror "The kvm/qemu-kvm wrappers no longer exist, but your libvirt"
- eerror "instances are still pointing to it. Please update your"
- eerror "configs in /etc/libvirt/qemu/ to use the -enable-kvm flag"
- eerror "and the right system binary (e.g. qemu-system-x86_64)."
- die "update your virt configs to not use qemu-kvm"
- fi
-}
-
-# Sanity check to make sure target lists are kept up-to-date.
-check_targets() {
- local var=$1 mak=$2
- local detected sorted
-
- pushd "${S}"/default-configs >/dev/null || die
-
- # Force C locale until glibc is updated. #564936
- detected=$(echo $(printf '%s\n' *-${mak}.mak | sed "s:-${mak}.mak::" | LC_COLLATE=C sort -u))
- sorted=$(echo $(printf '%s\n' ${!var} | LC_COLLATE=C sort -u))
- if [[ ${sorted} != "${detected}" ]] ; then
- eerror "The ebuild needs to be kept in sync."
- eerror "${var}: ${sorted}"
- eerror "$(printf '%-*s' ${#var} configure): ${detected}"
- die "sync ${var} to the list of targets"
- fi
-
- popd >/dev/null
-}
-
-handle_locales() {
- # Make sure locale list is kept up-to-date.
- local detected sorted
- detected=$(echo $(cd po && printf '%s\n' *.po | grep -v messages.po | sed 's:.po$::' | sort -u))
- sorted=$(echo $(printf '%s\n' ${PLOCALES} | sort -u))
- if [[ ${sorted} != "${detected}" ]] ; then
- eerror "The ebuild needs to be kept in sync."
- eerror "PLOCALES: ${sorted}"
- eerror " po/*.po: ${detected}"
- die "sync PLOCALES"
- fi
-
- # Deal with selective install of locales.
- if use nls ; then
- # Delete locales the user does not want. #577814
- rm_loc() { rm po/$1.po || die; }
- l10n_for_each_disabled_locale_do rm_loc
- else
- # Cheap hack to disable gettext .mo generation.
- rm -f po/*.po
- fi
-}
-
-src_prepare() {
- check_targets IUSE_SOFTMMU_TARGETS softmmu
- check_targets IUSE_USER_TARGETS linux-user
-
- default
-
- # Use correct toolchain to fix cross-compiling
- tc-export AR LD NM OBJCOPY PKG_CONFIG RANLIB
- export WINDRES=${CHOST}-windres
-
- # Verbose builds
- MAKEOPTS+=" V=1"
-
- # Run after we've applied all patches.
- handle_locales
-
- # Remove bundled copy of libfdt
- rm -r dtc || die
-}
-
-##
-# configures qemu based on the build directory and the build type
-# we are using.
-#
-qemu_src_configure() {
- debug-print-function ${FUNCNAME} "$@"
-
- local buildtype=$1
- local builddir="${S}/${buildtype}-build"
-
- mkdir "${builddir}"
-
- local conf_opts=(
- --prefix=/usr
- --sysconfdir=/etc
- --bindir=/usr/bin
- --libdir=/usr/$(get_libdir)
- --datadir=/usr/share
- --docdir=/usr/share/doc/${PF}/html
- --mandir=/usr/share/man
- --with-confsuffix=/qemu
- --localstatedir=/var
- --disable-bsd-user
- --disable-guest-agent
- --disable-strip
- --disable-werror
- # We support gnutls/nettle for crypto operations. It is possible
- # to use gcrypt when gnutls/nettle are disabled (but not when they
- # are enabled), but it's not really worth the hassle. Disable it
- # all the time to avoid automatically detecting it. #568856
- --disable-gcrypt
- --python="${PYTHON}"
- --cc="$(tc-getCC)"
- --cxx="$(tc-getCXX)"
- --host-cc="$(tc-getBUILD_CC)"
- $(use_enable debug debug-info)
- $(use_enable debug debug-tcg)
- $(use_enable doc docs)
- $(use_enable plugins)
- $(use_enable tci tcg-interpreter)
- $(use_enable xattr attr)
- )
-
- # Disable options not used by user targets. This simplifies building
- # static user targets (USE=static-user) considerably.
- conf_notuser() {
- if [[ ${buildtype} == "user" ]] ; then
- echo "--disable-${2:-$1}"
- else
- use_enable "$@"
- fi
- }
- conf_opts+=(
- --disable-bluez
- $(conf_notuser accessibility brlapi)
- $(conf_notuser aio linux-aio)
- $(conf_notuser bzip2)
- $(conf_notuser capstone)
- $(conf_notuser caps cap-ng)
- $(conf_notuser curl)
- $(conf_notuser fdt)
- $(conf_notuser glusterfs)
- $(conf_notuser gnutls)
- $(conf_notuser gnutls nettle)
- $(conf_notuser gtk)
- $(conf_notuser infiniband rdma)
- $(conf_notuser iscsi libiscsi)
- $(conf_notuser jemalloc jemalloc)
- $(conf_notuser jpeg vnc-jpeg)
- $(conf_notuser kernel_linux kvm)
- $(conf_notuser lzo)
- $(conf_notuser ncurses curses)
- $(conf_notuser nfs libnfs)
- $(conf_notuser numa)
- $(conf_notuser opengl)
- $(conf_notuser png vnc-png)
- $(conf_notuser rbd)
- $(conf_notuser sasl vnc-sasl)
- $(conf_notuser sdl)
- $(conf_notuser sdl-image)
- $(conf_notuser seccomp)
- $(conf_notuser smartcard)
- $(conf_notuser snappy)
- $(conf_notuser spice)
- $(conf_notuser ssh libssh)
- $(conf_notuser usb libusb)
- $(conf_notuser usbredir usb-redir)
- $(conf_notuser vde)
- $(conf_notuser vhost-net)
- $(conf_notuser vhost-user-fs)
- $(conf_notuser virgl virglrenderer)
- $(conf_notuser virtfs)
- $(conf_notuser vnc)
- $(conf_notuser vte)
- $(conf_notuser xen)
- $(conf_notuser xen xen-pci-passthrough)
- $(conf_notuser xfs xfsctl)
- $(conf_notuser xkb xkbcommon)
- )
-
- if [[ ${buildtype} == "user" ]] ; then
- conf_opts+=( --disable-libxml2 )
- else
- conf_opts+=( --enable-libxml2 )
- fi
-
- if [[ ! ${buildtype} == "user" ]] ; then
- # audio options
- local audio_opts=(
- # Note: backend order matters here: #716202
- # We iterate from higher-level to lower level.
- $(usex pulseaudio pa "")
- $(usev sdl)
- $(usev alsa)
- $(usev oss)
- )
- conf_opts+=(
- --audio-drv-list=$(printf "%s," "${audio_opts[@]}")
- )
- fi
-
- case ${buildtype} in
- user)
- conf_opts+=(
- --enable-linux-user
- --disable-system
- --disable-blobs
- --disable-tools
- )
- local static_flag="static-user"
- ;;
- softmmu)
- conf_opts+=(
- --disable-linux-user
- --enable-system
- --disable-tools
- )
- local static_flag="static"
- ;;
- tools)
- conf_opts+=(
- --disable-linux-user
- --disable-system
- --disable-blobs
- --enable-tools
- )
- local static_flag="static"
- ;;
- esac
-
- local targets="${buildtype}_targets"
- [[ -n ${targets} ]] && conf_opts+=( --target-list="${!targets}" )
-
- # Add support for SystemTAP
- use systemtap && conf_opts+=( --enable-trace-backend=dtrace )
-
- # We always want to attempt to build with PIE support as it results
- # in a more secure binary. But it doesn't work with static or if
- # the current GCC doesn't have PIE support.
- if use ${static_flag}; then
- conf_opts+=( --static --disable-pie )
- else
- tc-enables-pie && conf_opts+=( --enable-pie )
- fi
-
- echo "../configure ${conf_opts[*]}"
- cd "${builddir}"
- ../configure "${conf_opts[@]}" || die "configure failed"
-
- # FreeBSD's kernel does not support QEMU assigning/grabbing
- # host USB devices yet
- use kernel_FreeBSD && \
- sed -i -E -e "s|^(HOST_USB=)bsd|\1stub|" "${S}"/config-host.mak
-}
-
-src_configure() {
- local target
-
- python_setup
-
- softmmu_targets= softmmu_bins=()
- user_targets= user_bins=()
-
- for target in ${IUSE_SOFTMMU_TARGETS} ; do
- if use "qemu_softmmu_targets_${target}"; then
- softmmu_targets+=",${target}-softmmu"
- softmmu_bins+=( "qemu-system-${target}" )
- fi
- done
-
- for target in ${IUSE_USER_TARGETS} ; do
- if use "qemu_user_targets_${target}"; then
- user_targets+=",${target}-linux-user"
- user_bins+=( "qemu-${target}" )
- fi
- done
-
- softmmu_targets=${softmmu_targets#,}
- user_targets=${user_targets#,}
-
- [[ -n ${softmmu_targets} ]] && qemu_src_configure "softmmu"
- [[ -n ${user_targets} ]] && qemu_src_configure "user"
- qemu_src_configure "tools"
-}
-
-src_compile() {
- if [[ -n ${user_targets} ]]; then
- cd "${S}/user-build"
- default
- fi
-
- if [[ -n ${softmmu_targets} ]]; then
- cd "${S}/softmmu-build"
- default
- fi
-
- cd "${S}/tools-build"
- default
-}
-
-src_test() {
- if [[ -n ${softmmu_targets} ]]; then
- cd "${S}/softmmu-build"
- pax-mark m */qemu-system-* #515550
- emake check
- fi
-}
-
-qemu_python_install() {
- python_domodule "${S}/python/qemu"
-
- python_doscript "${S}/scripts/kvm/vmxcap"
- python_doscript "${S}/scripts/qmp/qmp-shell"
- python_doscript "${S}/scripts/qmp/qemu-ga-client"
-}
-
-# Generate binfmt support files.
-# - /etc/init.d/qemu-binfmt script which registers the user handlers (openrc)
-# - /usr/share/qemu/binfmt.d/qemu.conf (for use with systemd-binfmt)
-generate_initd() {
- local out="${T}/qemu-binfmt"
- local out_systemd="${T}/qemu.conf"
- local d="${T}/binfmt.d"
-
- einfo "Generating qemu binfmt scripts and configuration files"
-
- # Generate the debian fragments first.
- mkdir -p "${d}"
- "${S}"/scripts/qemu-binfmt-conf.sh \
- --debian \
- --exportdir "${d}" \
- --qemu-path "${EPREFIX}/usr/bin" \
- || die
- # Then turn the fragments into a shell script we can source.
- sed -E -i \
- -e 's:^([^ ]+) (.*)$:\1="\2":' \
- "${d}"/* || die
-
- # Generate the init.d script by assembling the fragments from above.
- local f qcpu package interpreter magic mask
- cat "${FILESDIR}"/qemu-binfmt.initd.head >"${out}" || die
- for f in "${d}"/qemu-* ; do
- source "${f}"
-
- # Normalize the cpu logic like we do in the init.d for the native cpu.
- qcpu=${package#qemu-}
- case ${qcpu} in
- arm*) qcpu="arm";;
- mips*) qcpu="mips";;
- ppc*) qcpu="ppc";;
- s390*) qcpu="s390";;
- sh*) qcpu="sh";;
- sparc*) qcpu="sparc";;
- esac
-
- # we use 'printf' here to be portable across 'sh'
- # implementations: #679168
- cat <>"${out}"
- if [ "\${cpu}" != "${qcpu}" -a -x "${interpreter}" ] ; then
- printf '%s\n' ':${package}:M::${magic}:${mask}:${interpreter}:'"\${QEMU_BINFMT_FLAGS}" >/proc/sys/fs/binfmt_misc/register
- fi
-EOF
-
- echo ":${package}:M::${magic}:${mask}:${interpreter}:OC" >>"${out_systemd}"
-
- done
- cat "${FILESDIR}"/qemu-binfmt.initd.tail >>"${out}" || die
-}
-
-src_install() {
- if [[ -n ${user_targets} ]]; then
- cd "${S}/user-build"
- emake DESTDIR="${ED}" install
-
- # Install binfmt handler init script for user targets.
- generate_initd
- doinitd "${T}/qemu-binfmt"
-
- # Install binfmt/qemu.conf.
- insinto "/usr/share/qemu/binfmt.d"
- doins "${T}/qemu.conf"
- fi
-
- if [[ -n ${softmmu_targets} ]]; then
- cd "${S}/softmmu-build"
- emake DESTDIR="${ED}" install
-
- # This might not exist if the test failed. #512010
- [[ -e check-report.html ]] && dodoc check-report.html
-
- if use kernel_linux; then
- udev_newrules "${FILESDIR}"/65-kvm.rules-r1 65-kvm.rules
- fi
-
- if use python; then
- python_foreach_impl qemu_python_install
- fi
- fi
-
- cd "${S}/tools-build"
- emake DESTDIR="${ED}" install
-
- # Disable mprotect on the qemu binaries as they use JITs to be fast #459348
- pushd "${ED}"/usr/bin >/dev/null
- pax-mark mr "${softmmu_bins[@]}" "${user_bins[@]}" # bug 575594
- popd >/dev/null
-
- # Install config file example for qemu-bridge-helper
- insinto "/etc/qemu"
- doins "${FILESDIR}/bridge.conf"
-
- cd "${S}"
- dodoc Changelog MAINTAINERS docs/specs/pci-ids.txt
- newdoc pc-bios/README README.pc-bios
-
- # Disallow stripping of prebuilt firmware files.
- dostrip -x ${QA_PREBUILT}
-
- if [[ -n ${softmmu_targets} ]]; then
- # Remove SeaBIOS since we're using the SeaBIOS packaged one
- rm "${ED}/usr/share/qemu/bios.bin"
- rm "${ED}/usr/share/qemu/bios-256k.bin"
- if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
- dosym ../seabios/bios.bin /usr/share/qemu/bios.bin
- dosym ../seabios/bios-256k.bin /usr/share/qemu/bios-256k.bin
- fi
-
- # Remove vgabios since we're using the seavgabios packaged one
- rm "${ED}/usr/share/qemu/vgabios.bin"
- rm "${ED}/usr/share/qemu/vgabios-cirrus.bin"
- rm "${ED}/usr/share/qemu/vgabios-qxl.bin"
- rm "${ED}/usr/share/qemu/vgabios-stdvga.bin"
- rm "${ED}/usr/share/qemu/vgabios-virtio.bin"
- rm "${ED}/usr/share/qemu/vgabios-vmware.bin"
- # PPC64 loads vgabios-stdvga
- if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386 || use qemu_softmmu_targets_ppc64; then
- dosym ../seavgabios/vgabios-isavga.bin /usr/share/qemu/vgabios.bin
- dosym ../seavgabios/vgabios-cirrus.bin /usr/share/qemu/vgabios-cirrus.bin
- dosym ../seavgabios/vgabios-qxl.bin /usr/share/qemu/vgabios-qxl.bin
- dosym ../seavgabios/vgabios-stdvga.bin /usr/share/qemu/vgabios-stdvga.bin
- dosym ../seavgabios/vgabios-virtio.bin /usr/share/qemu/vgabios-virtio.bin
- dosym ../seavgabios/vgabios-vmware.bin /usr/share/qemu/vgabios-vmware.bin
- fi
-
- # Remove sgabios since we're using the sgabios packaged one
- rm "${ED}/usr/share/qemu/sgabios.bin"
- if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
- dosym ../sgabios/sgabios.bin /usr/share/qemu/sgabios.bin
- fi
-
- # Remove iPXE since we're using the iPXE packaged one
- rm "${ED}"/usr/share/qemu/pxe-*.rom
- if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
- dosym ../ipxe/8086100e.rom /usr/share/qemu/pxe-e1000.rom
- dosym ../ipxe/80861209.rom /usr/share/qemu/pxe-eepro100.rom
- dosym ../ipxe/10500940.rom /usr/share/qemu/pxe-ne2k_pci.rom
- dosym ../ipxe/10222000.rom /usr/share/qemu/pxe-pcnet.rom
- dosym ../ipxe/10ec8139.rom /usr/share/qemu/pxe-rtl8139.rom
- dosym ../ipxe/1af41000.rom /usr/share/qemu/pxe-virtio.rom
- fi
- fi
-
- DISABLE_AUTOFORMATTING=true
- readme.gentoo_create_doc
-}
-
-firmware_abi_change() {
- local pv
- for pv in ${REPLACING_VERSIONS}; do
- if ver_test $pv -lt ${FIRMWARE_ABI_VERSION}; then
- return 0
- fi
- done
- return 1
-}
-
-pkg_postinst() {
- if [[ -n ${softmmu_targets} ]] && use kernel_linux; then
- udev_reload
- fi
-
- xdg_icon_cache_update
-
- [[ -z ${EPREFIX} ]] && [[ -f ${EROOT}/usr/libexec/qemu-bridge-helper ]] && \
- fcaps cap_net_admin ${EROOT}/usr/libexec/qemu-bridge-helper
-
- DISABLE_AUTOFORMATTING=true
- readme.gentoo_print_elog
-
- if use pin-upstream-blobs && firmware_abi_change; then
- ewarn "This version of qemu pins new versions of firmware blobs:"
- ewarn " $(best_version sys-firmware/edk2-ovmf)"
- ewarn " $(best_version sys-firmware/ipxe)"
- ewarn " $(best_version sys-firmware/seabios)"
- ewarn " $(best_version sys-firmware/sgabios)"
- ewarn "This might break resume of hibernated guests (started with a different"
- ewarn "firmware version) and live migration to/from qemu versions with different"
- ewarn "firmware. Please (cold) restart all running guests. For functional"
- ewarn "guest migration ensure that all"
- ewarn "hosts run at least"
- ewarn " app-emulation/qemu-${FIRMWARE_ABI_VERSION}."
- fi
-}
-
-pkg_info() {
- echo "Using:"
- echo " $(best_version app-emulation/spice-protocol)"
- echo " $(best_version sys-firmware/edk2-ovmf)"
- if has_version 'sys-firmware/edk2-ovmf[binary]'; then
- echo " USE=binary"
- else
- echo " USE=''"
- fi
- echo " $(best_version sys-firmware/ipxe)"
- echo " $(best_version sys-firmware/seabios)"
- if has_version 'sys-firmware/seabios[binary]'; then
- echo " USE=binary"
- else
- echo " USE=''"
- fi
- echo " $(best_version sys-firmware/sgabios)"
-}
-
-pkg_postrm() {
- xdg_icon_cache_update
-}
diff --git a/app-emulation/wine-staging/Manifest b/app-emulation/wine-staging/Manifest
index aeee6951c3f4..1026abbadf92 100644
--- a/app-emulation/wine-staging/Manifest
+++ b/app-emulation/wine-staging/Manifest
@@ -1,10 +1,9 @@
-DIST gentoo-wine-patches-20191222.tar.xz 59236 BLAKE2B 1b2c7b3ab69e5603d0f176a88c13b6d532f94f319ad29821faa699e828d90cfbe92c02b6e73b72eb16e565707c49885833fe557809ed16f4a6f0f182de9bb6e6 SHA512 a030fad55be5e1d909bc50e430c9a99846b88d7555f12749e101ba83f04df5af23eeb726b5ed78f847a66d11ac0a838bc69bd5bf8cf53da77ad454d2a2fe65cf
DIST gentoo-wine-patches-20200523.tar.xz 59740 BLAKE2B 951d7f305a6e5b3759c8095629d48de4830b8a0c9558de859a9e02d9824fe85553fda2bc0820ca97022a0ca63ac28473dadfe827821220445dbf1a7fd15c7c98 SHA512 46eea45c982b475e3ff444cbd87c6a0a235fc8dcaf3d83d89655a10ed8841a9ddb09e5a638a05803f3bf2c3bd34165c16067aba561efa4c183ee396dc31cdf75
DIST wine-5.10.tar.xz 23859084 BLAKE2B ee4d06f69e0259de4ec6cf1352c610aa2460762be49211e21f0fb91a7463a4e4ca82b7ea9272eac8ea0c8d1be955c2aefcbdabed37581c4fbf82e7b58a070d1c SHA512 669d6861525cd4ab000113e8d9c5e10822b62b293914542ee34a826696df66e1d2f09b09f576f714e4117e79e25d1fd0b2a06c57d29da0efa0bdfcb9fee59c60
DIST wine-5.11.tar.xz 23881408 BLAKE2B 5da8ab91dcb462f6de460ae80830d6006866970fbc4a23bbd6a2243736ff004c0734282b45196d46e97bb8383c99b415c85f941b2ab613c72ae66995e0162460 SHA512 fac78a98e03e0305c85fff393b7c5d46a3fbe11aff4a0153771187d3ad0212189d1fa88947fc9fe0da7bd8327eb71283f28ff866c4d8b2bc759a2ad2197fc9a1
-DIST wine-5.8.tar.xz 23753648 BLAKE2B 086f37ce469f6d176eab8daa2d124b1774526727e2f6fe4ecdd39862c13ed493ac4164cf98848d5bc8cba3675e13365f6ea2b34591d518c40c34d09556851578 SHA512 7b9df380655a72e8b9e95ca271a62308262d8efabbeb2ad459071afc9ed51518b42b1f75b019fe8d6b53cf5185e9cfc45ac1b8a7092f118fa2aff14f99c012de
+DIST wine-5.12.tar.xz 23939672 BLAKE2B 97190653a754100fc2832f8bdc544529dc34cae97b6ae68a579dfb529af5c924d2e9b439f304784028ae84a730f3cf9911a20d132f645ab90532479092b39079 SHA512 1272b143d64ed6083cd797474f18dbd2bca7a38d488474ae5f054f47789b4fc1d386c7bbf8aa1bd86f9507908fc799b4f45e10e1d8c628c5bd52c42b1d74c8a8
DIST wine-5.9.tar.xz 23802356 BLAKE2B 1879c164c647a5b849056e4149a809c390814ae832773a44347cf1902fd49cb6619b4add5ea2d421c189d92b5c907daa0d6f62c37c48a8bd68d0eaa9eb465433 SHA512 edc6d55a275cf37430a62dc6d6d86bff6d5a434e708dbd99d245018db7f6a0abe39581a1d91eb947f204a45ac94cc5c931745169a3b63a2aecf8db277553b74b
+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.8.tar.gz 9878712 BLAKE2B a96f7e4aa1d1dddcda1a9d6a30ab3b564fb365a09efde22e5b7abab1ac015da0bc242b2fec6d4ae14dc5ddad38e3314a5f8c430e6eb10853ed8619e805bf5787 SHA512 3ea2a90ab0613b680274c95cf7ef3d3a7d807571fb792e05fc1df9bbd7a35c80a0d7c38342fea8858c5557ae3f12287a7ce09d0cdab5064000b79ec6c891ad15
DIST wine-staging-5.9.tar.gz 9861847 BLAKE2B 61eb21e4386b772b98472707ea927f74ee77e8ec39caa494b6db2cdafc4b00e3aee503f9828a8df1cea2bbc6fa3aaf272fe28b60965de26132d4761058b59f25 SHA512 8fcf448be21edc0ccf8afef75013298c8f1634b51cd4d927ee5a1d039552d7c29609f65f283519b6561d09eb6eeae91fa6db70b9e78e4fd8bb5318408b39fb33
diff --git a/app-emulation/wine-staging/wine-staging-5.8.ebuild b/app-emulation/wine-staging/wine-staging-5.12.ebuild
similarity index 98%
rename from app-emulation/wine-staging/wine-staging-5.8.ebuild
rename to app-emulation/wine-staging/wine-staging-5.12.ebuild
index 59a4de5dea0d..5be6195c457d 100644
--- a/app-emulation/wine-staging/wine-staging-5.8.ebuild
+++ b/app-emulation/wine-staging/wine-staging-5.12.ebuild
@@ -10,7 +10,7 @@ inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n multili
MY_PN="${PN%%-*}"
MY_P="${MY_PN}-${PV}"
-
+STAGING_COMMIT="3f3a05f91c85cb5ccdc4c8185bcc862c6e96cd52"
if [[ ${PV} == "9999" ]] ; then
EGIT_REPO_URI="https://source.winehq.org/git/wine.git"
EGIT_BRANCH="master"
@@ -24,9 +24,9 @@ else
fi
S="${WORKDIR}/${MY_P}"
-STAGING_P="wine-staging-${PV}"
+STAGING_P="wine-staging-${STAGING_COMMIT}"
STAGING_DIR="${WORKDIR}/${STAGING_P}"
-GWP_V="20191222"
+GWP_V="20200523"
PATCHDIR="${WORKDIR}/gentoo-wine-patches"
DESCRIPTION="Free implementation of Windows(tm) on Unix, with Wine-Staging patchset"
@@ -39,7 +39,7 @@ if [[ ${PV} == "9999" ]] ; then
STAGING_EGIT_REPO_URI="https://github.com/wine-staging/wine-staging.git"
else
SRC_URI="${SRC_URI}
- staging? ( https://github.com/wine-staging/wine-staging/archive/v${PV}.tar.gz -> ${STAGING_P}.tar.gz )"
+ staging? ( https://github.com/wine-staging/wine-staging/archive/${STAGING_COMMIT}.tar.gz -> ${STAGING_P}.tar.gz )"
fi
LICENSE="LGPL-2.1"
@@ -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
@@ -167,6 +167,7 @@ PATCHES=(
"${PATCHDIR}/patches/${MY_PN}-5.0-winegcc.patch" #260726
"${PATCHDIR}/patches/${MY_PN}-4.7-multilib-portage.patch" #395615
"${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" #310611
+ "${PATCHDIR}/patches/${MY_PN}-5.9-Revert-makedep-Install-also-generated-typelib-for-in.patch"
)
PATCHES_BIN=()
diff --git a/app-emulation/wine-vanilla/Manifest b/app-emulation/wine-vanilla/Manifest
index b0d23dbfb5a8..f61fcc5bdb35 100644
--- a/app-emulation/wine-vanilla/Manifest
+++ b/app-emulation/wine-vanilla/Manifest
@@ -3,8 +3,7 @@ DIST gentoo-wine-patches-20191222.tar.xz 59236 BLAKE2B 1b2c7b3ab69e5603d0f176a88
DIST gentoo-wine-patches-20200523.tar.xz 59740 BLAKE2B 951d7f305a6e5b3759c8095629d48de4830b8a0c9558de859a9e02d9824fe85553fda2bc0820ca97022a0ca63ac28473dadfe827821220445dbf1a7fd15c7c98 SHA512 46eea45c982b475e3ff444cbd87c6a0a235fc8dcaf3d83d89655a10ed8841a9ddb09e5a638a05803f3bf2c3bd34165c16067aba561efa4c183ee396dc31cdf75
DIST wine-4.0.3.tar.xz 21680420 BLAKE2B a7caf4b82fa2594f77e31f29b2a3da59c08bb58f213268d61bdf48998345162bc36fbfc24db94d11cb07b6da347b3471e9d8976d9abfa0f76c183c0a519aa73e SHA512 a8fde0bcf600eaec56c3ce58c9aa992386784c85cf1c93aa84d50aff4c842b12a6b099c23391d3ad9a0059f3dc9069c0f8e00fad293305ba8a33afc70bf26e14
DIST wine-5.0.1.tar.xz 22476496 BLAKE2B 8fd7729812c0144b6c9ec7f28ecc25bca5bc7801d9927346928f43fc46ca0be89ecb4caefb7a93cf2f3365e088d11e6bd53a028ea8cc9e170ef864ff63f21a5a SHA512 d9756f0a74417ea9e05d08a94ff29b83ebff3db3a3cbaa90979d5312754371ddfcab6bded73a246ef980252b908d8a26e93de2779b766c4bff92c91f8c315d98
-DIST wine-5.0.tar.xz 22469428 BLAKE2B d26938e707545d31ed932c67eaaa9fd137e42daa6facadeaea2897797ec816658edc1b89c649e0cb5c453ca53ebea5d7156fdd188f1afe2a55ca7834e012e276 SHA512 681de951804c3dd3ae8c677a0ea52d172b04cac58594698b191cd972b25899cd2030d01a25fc2ad2eb6b99976a30319d2bd5ba8b7ff98b1a8b43832fa6514b83
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.8.tar.xz 23753648 BLAKE2B 086f37ce469f6d176eab8daa2d124b1774526727e2f6fe4ecdd39862c13ed493ac4164cf98848d5bc8cba3675e13365f6ea2b34591d518c40c34d09556851578 SHA512 7b9df380655a72e8b9e95ca271a62308262d8efabbeb2ad459071afc9ed51518b42b1f75b019fe8d6b53cf5185e9cfc45ac1b8a7092f118fa2aff14f99c012de
+DIST wine-5.12.tar.xz 23939672 BLAKE2B 97190653a754100fc2832f8bdc544529dc34cae97b6ae68a579dfb529af5c924d2e9b439f304784028ae84a730f3cf9911a20d132f645ab90532479092b39079 SHA512 1272b143d64ed6083cd797474f18dbd2bca7a38d488474ae5f054f47789b4fc1d386c7bbf8aa1bd86f9507908fc799b4f45e10e1d8c628c5bd52c42b1d74c8a8
DIST wine-5.9.tar.xz 23802356 BLAKE2B 1879c164c647a5b849056e4149a809c390814ae832773a44347cf1902fd49cb6619b4add5ea2d421c189d92b5c907daa0d6f62c37c48a8bd68d0eaa9eb465433 SHA512 edc6d55a275cf37430a62dc6d6d86bff6d5a434e708dbd99d245018db7f6a0abe39581a1d91eb947f204a45ac94cc5c931745169a3b63a2aecf8db277553b74b
diff --git a/app-emulation/wine-vanilla/wine-vanilla-5.0.ebuild b/app-emulation/wine-vanilla/wine-vanilla-5.0.ebuild
deleted file mode 100644
index a395c3bba9e2..000000000000
--- a/app-emulation/wine-vanilla/wine-vanilla-5.0.ebuild
+++ /dev/null
@@ -1,536 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PLOCALES="ar ast bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru si sk sl sr_RS@cyrillic sr_RS@latin sv ta te th tr uk wa zh_CN zh_TW"
-PLOCALE_BACKUP="en"
-
-inherit autotools eapi7-ver estack eutils flag-o-matic gnome2-utils l10n ltprune multilib multilib-minimal pax-utils toolchain-funcs virtualx xdg-utils
-
-MY_PN="${PN%%-*}"
-MY_P="${MY_PN}-${PV}"
-
-if [[ ${PV} == "9999" ]] ; then
- EGIT_REPO_URI="https://source.winehq.org/git/wine.git"
- EGIT_BRANCH="master"
- inherit git-r3
- SRC_URI=""
- #KEYWORDS=""
-else
- MAJOR_V=$(ver_cut 1)
- SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.0/${MY_P}.tar.xz"
- KEYWORDS="-* amd64 x86"
-fi
-S="${WORKDIR}/${MY_P}"
-
-GWP_V="20191222"
-PATCHDIR="${WORKDIR}/gentoo-wine-patches"
-
-DESCRIPTION="Free implementation of Windows(tm) on Unix, without external patchsets"
-HOMEPAGE="https://www.winehq.org/"
-SRC_URI="${SRC_URI}
- https://dev.gentoo.org/~sarnex/distfiles/wine/gentoo-wine-patches-${GWP_V}.tar.xz
-"
-
-LICENSE="LGPL-2.1"
-SLOT="${PV}"
-IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +faudio +fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl test +threads +truetype udev +udisks v4l vkd3d vulkan +X +xcomposite xinerama +xml"
-REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
- X? ( truetype )
- elibc_glibc? ( threads )
- osmesa? ( opengl )
- test? ( abi_x86_32 )
- vkd3d? ( vulkan )" # osmesa-opengl #286560 # X-truetype #551124
-
-# FIXME: the test suite is unsuitable for us; many tests require net access
-# or fail due to Xvfb's opengl limitations.
-RESTRICT="test"
-
-COMMON_DEPEND="
- X? (
- x11-libs/libXcursor[${MULTILIB_USEDEP}]
- x11-libs/libXext[${MULTILIB_USEDEP}]
- x11-libs/libXfixes[${MULTILIB_USEDEP}]
- x11-libs/libXrandr[${MULTILIB_USEDEP}]
- x11-libs/libXi[${MULTILIB_USEDEP}]
- x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
- )
- alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
- capi? ( net-libs/libcapi[${MULTILIB_USEDEP}] )
- cups? ( net-print/cups:=[${MULTILIB_USEDEP}] )
- faudio? ( app-emulation/faudio:=[${MULTILIB_USEDEP}] )
- fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] )
- gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
- gsm? ( media-sound/gsm:=[${MULTILIB_USEDEP}] )
- gssapi? ( virtual/krb5[${MULTILIB_USEDEP}] )
- gstreamer? (
- media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
- media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}]
- )
- jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
- kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] )
- lcms? ( media-libs/lcms:2=[${MULTILIB_USEDEP}] )
- ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] )
- mp3? ( >=media-sound/mpg123-1.5.0[${MULTILIB_USEDEP}] )
- ncurses? ( >=sys-libs/ncurses-5.2:0=[${MULTILIB_USEDEP}] )
- netapi? ( net-fs/samba[netapi(+),${MULTILIB_USEDEP}] )
- nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] )
- odbc? ( dev-db/unixODBC:=[${MULTILIB_USEDEP}] )
- openal? ( media-libs/openal:=[${MULTILIB_USEDEP}] )
- opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
- opengl? (
- virtual/glu[${MULTILIB_USEDEP}]
- virtual/opengl[${MULTILIB_USEDEP}]
- )
- osmesa? ( >=media-libs/mesa-13[osmesa,${MULTILIB_USEDEP}] )
- pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] )
- png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] )
- pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
- scanner? ( media-gfx/sane-backends:=[${MULTILIB_USEDEP}] )
- sdl? ( media-libs/libsdl2:=[haptic,joystick,${MULTILIB_USEDEP}] )
- ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
- truetype? ( >=media-libs/freetype-2.0.0[${MULTILIB_USEDEP}] )
- udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
- udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
- v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
- vkd3d? ( app-emulation/vkd3d[${MULTILIB_USEDEP}] )
- vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] )
- xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
- xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
- xml? (
- dev-libs/libxml2[${MULTILIB_USEDEP}]
- dev-libs/libxslt[${MULTILIB_USEDEP}]
- )"
-
-RDEPEND="${COMMON_DEPEND}
- app-emulation/wine-desktop-common
- >app-eselect/eselect-wine-0.3
- !app-emulation/wine:0
- dos? ( >=games-emulation/dosbox-0.74_p20160629 )
- gecko? ( app-emulation/wine-gecko:2.47.1[abi_x86_32?,abi_x86_64?] )
- mono? ( app-emulation/wine-mono:4.9.4 )
- perl? (
- dev-lang/perl
- dev-perl/XML-Simple
- )
- pulseaudio? (
- realtime? ( sys-auth/rtkit )
- )
- samba? ( >=net-fs/samba-3.0.25[winbind] )
- selinux? ( sec-policy/selinux-wine )
- udisks? ( sys-fs/udisks:2 )"
-
-# tools/make_requests requires perl
-DEPEND="${COMMON_DEPEND}
- sys-devel/flex
- >=sys-kernel/linux-headers-2.6
- virtual/pkgconfig
- virtual/yacc
- X? ( x11-base/xorg-proto )
- prelink? ( sys-devel/prelink )
- xinerama? ( x11-base/xorg-proto )"
-
-# These use a non-standard "Wine" category, which is provided by
-# /etc/xdg/applications-merged/wine.menu
-QA_DESKTOP_FILE="usr/share/applications/wine-browsedrive.desktop
-usr/share/applications/wine-notepad.desktop
-usr/share/applications/wine-uninstaller.desktop
-usr/share/applications/wine-winecfg.desktop"
-
-PATCHES=(
- "${PATCHDIR}/patches/${MY_PN}-5.0-winegcc.patch" #260726
- "${PATCHDIR}/patches/${MY_PN}-4.7-multilib-portage.patch" #395615
- "${PATCHDIR}/patches/${MY_PN}-5.0-memset-O3.patch" #480508
- "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" #310611
-)
-PATCHES_BIN=()
-
-# https://bugs.gentoo.org/show_bug.cgi?id=635222
-if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then
- DEPEND+=" dev-util/patchbin"
-fi
-
-wine_compiler_check() {
- [[ ${MERGE_TYPE} = "binary" ]] && return 0
-
- # GCC-specific bugs
- if tc-is-gcc; then
- # bug #549768
- if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then
- ebegin "Checking for gcc-5 ms_abi compiler bug"
- $(tc-getCC) -O2 "${PATCHDIR}/files/pr66838.c" -o "${T}"/pr66838 || die
- # Run in subshell to prevent "Aborted" message
- ( "${T}"/pr66838 || false ) >/dev/null 2>&1
- if ! eend $?; then
- eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0"
- eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild,"
- eerror "or use gcc-config to select a different compiler version."
- eerror "See https://bugs.gentoo.org/549768"
- eerror
- return 1
- fi
- fi
- # bug #574044
- if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then
- ebegin "Checking for gcc-5-3 stack realignment compiler bug"
- # Compile in subshell to prevent "Aborted" message
- ( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${PATCHDIR}/files/pr69140.c" -o "${T}"/pr69140 ) >/dev/null 2>&1
- if ! eend $?; then
- eerror "Wine cannot be built with this version of gcc-5.3"
- eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild,"
- eerror "or use gcc-config to select a different compiler version."
- eerror "See https://bugs.gentoo.org/574044"
- eerror
- return 1
- fi
- fi
- fi
-
- # Ensure compiler support
- if use abi_x86_64; then
- ebegin "Checking for 64-bit compiler with builtin_ms_va_list support"
- # Compile in subshell to prevent "Aborted" message
- ( $(tc-getCC) -O2 "${PATCHDIR}/files/builtin_ms_va_list.c" -o "${T}"/builtin_ms_va_list >/dev/null 2>&1)
- if ! eend $?; then
- eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine"
- eerror
- eerror "You need gcc-4.4+ or clang 3.8+ to build 64-bit wine"
- eerror
- return 1
- fi
- fi
-}
-
-wine_build_environment_check() {
- [[ ${MERGE_TYPE} = "binary" ]] && return 0
-
- if use abi_x86_64; then
- if tc-is-gcc && [[ $(gcc-major-version) -lt 4 || ( $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 4 ) ]]; then
- eerror "You need gcc-4.4+ to compile 64-bit wine"
- die
- elif tc-is-clang && [[ $(clang-major-version) -lt 3 || ( $(clang-major-version) -eq 3 && $(clang-minor-version) -lt 8 ) ]]; then
- eerror "You need clang-3.8+ to compile 64-bit wine"
- die
- fi
- fi
- if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -le 3 ]]; then
- ewarn "GCC-5.0-5.3 suffered from compiler bugs and are no longer supported by"
- ewarn "Gentoo's Toolchain Team. If your ebuild fails the compiler checks in"
- ewarn "the configure phase, either update your compiler or switch to <5.0 || >=5.4"
- fi
- if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -eq 4 ]]; then
- if has "-march=i686" ${CFLAGS} && ! has "-mtune=generic" ${CFLAGS}; then
- ewarn "Compilation can hang with CFLAGS=\"-march=i686\". You can temporarily work"
- ewarn "around this by adding \"-mtune=generic\" to your CFLAGS for wine."
- ewarn "See package.env in man 5 portage for more information on how to do this."
- ewarn "See https://bugs.gentoo.org/show_bug.cgi?id=613128 for more details"
- fi
- fi
-
- if use abi_x86_32 && use opencl && [[ "$(eselect opencl show 2> /dev/null)" == "intel" ]]; then
- eerror "You cannot build wine with USE=opencl because intel-ocl-sdk is 64-bit only."
- eerror "See https://bugs.gentoo.org/487864 for more details."
- eerror
- return 1
- fi
-}
-
-wine_env_vcs_vars() {
- local pn_live_var="${PN//[-+]/_}_LIVE_COMMIT"
- local pn_live_val="${pn_live_var}"
- eval pn_live_val='$'${pn_live_val}
- if [[ ! -z ${EGIT_COMMIT} ]]; then
- eerror "Commits must now be specified using the environmental variables"
- eerror "EGIT_OVERRIDE_COMMIT_WINE"
- eerror
- return 1
- fi
-}
-
-pkg_pretend() {
- wine_build_environment_check || die
-
- # Verify OSS support
- if use oss && ! use kernel_FreeBSD; then
- if ! has_version ">=media-sound/oss-4"; then
- eerror "You cannot build wine with USE=oss without having support from a"
- eerror "FreeBSD kernel or >=media-sound/oss-4 (only available through external repos)"
- eerror
- die
- fi
- fi
-}
-
-pkg_setup() {
- wine_build_environment_check || die
- wine_env_vcs_vars || die
-
- WINE_VARIANT="${PN#wine}-${PV}"
- WINE_VARIANT="${WINE_VARIANT#-}"
-
- MY_PREFIX="${EPREFIX}/usr/lib/wine-${WINE_VARIANT}"
- MY_DATAROOTDIR="${EPREFIX}/usr/share/wine-${WINE_VARIANT}"
- MY_DATADIR="${MY_DATAROOTDIR}"
- MY_INCLUDEDIR="${EPREFIX}/usr/include/wine-${WINE_VARIANT}"
- MY_LIBEXECDIR="${EPREFIX}/usr/libexec/wine-${WINE_VARIANT}"
- MY_LOCALSTATEDIR="${EPREFIX}/var/wine-${WINE_VARIANT}"
- MY_MANDIR="${MY_DATADIR}/man"
-}
-
-src_unpack() {
- if [[ ${PV} == "9999" ]] ; then
- EGIT_CHECKOUT_DIR="${S}" git-r3_src_unpack
- fi
-
- default
-
- l10n_find_plocales_changes "${S}/po" "" ".po"
-}
-
-src_prepare() {
-
- eapply_bin(){
- local patch
- for patch in ${PATCHES_BIN[@]}; do
- patchbin --nogit < "${patch}" || die
- done
- }
-
- local md5="$(md5sum server/protocol.def)"
-
- default
- eapply_bin
- eautoreconf
-
- # Modification of the server protocol requires regenerating the server requests
- if [[ "$(md5sum server/protocol.def)" != "${md5}" ]]; then
- einfo "server/protocol.def was patched; running tools/make_requests"
- tools/make_requests || die #432348
- fi
- sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
- if ! use run-exes; then
- sed -i '/^MimeType/d' loader/wine.desktop || die #117785
- fi
-
- # Edit wine.desktop to work for specific variant
- sed -e "/^Exec=/s/wine /wine-${WINE_VARIANT} /" -i loader/wine.desktop || die
-
- # hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652
- cp "${PATCHDIR}/files/oic_winlogo.ico" dlls/user32/resources/ || die
-
- l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
-
- # Fix manpage generation for locales #469418 and abi_x86_64 #617864
-
- # Duplicate manpages input files for wine64
- local f
- for f in loader/*.man.in; do
- cp ${f} ${f/wine/wine64} || die
- done
- # Add wine64 manpages to Makefile
- if use abi_x86_64; then
- sed -i "/wine.man.in/i \
- \\\twine64.man.in \\\\" loader/Makefile.in || die
- sed -i -E 's/(.*wine)(.*\.UTF-8\.man\.in.*)/&\
-\164\2/' loader/Makefile.in || die
- fi
-
- rm_man_file(){
- local file="${1}"
- loc=${2}
- sed -i "/${loc}\.UTF-8\.man\.in/d" "${file}" || die
- }
-
- while read f; do
- l10n_for_each_disabled_locale_do rm_man_file "${f}"
- done < <(find -name "Makefile.in" -exec grep -q "UTF-8.man.in" "{}" \; -print)
-}
-
-src_configure() {
- wine_compiler_check || die
-
- export LDCONFIG=/bin/true
- use custom-cflags || strip-flags
-
- multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
- local myconf=(
- --prefix="${MY_PREFIX}"
- --datarootdir="${MY_DATAROOTDIR}"
- --datadir="${MY_DATADIR}"
- --includedir="${MY_INCLUDEDIR}"
- --libdir="${EPREFIX}/usr/$(get_libdir)/wine-${WINE_VARIANT}"
- --libexecdir="${MY_LIBEXECDIR}"
- --localstatedir="${MY_LOCALSTATEDIR}"
- --mandir="${MY_MANDIR}"
- --sysconfdir="${EPREFIX}/etc/wine"
- $(use_with alsa)
- $(use_with capi)
- $(use_with lcms cms)
- $(use_with cups)
- $(use_with ncurses curses)
- $(use_with udisks dbus)
- $(use_with faudio)
- $(use_with fontconfig)
- $(use_with ssl gnutls)
- $(use_enable gecko mshtml)
- $(use_with gphoto2 gphoto)
- $(use_with gsm)
- $(use_with gssapi)
- $(use_with gstreamer)
- --without-hal
- $(use_with jpeg)
- $(use_with kerberos krb5)
- $(use_with ldap)
- --without-mingw # linux LDFLAGS leak in mingw32: bug #685172
- $(use_enable mono mscoree)
- $(use_with mp3 mpg123)
- $(use_with netapi)
- $(use_with nls gettext)
- $(use_with openal)
- $(use_with opencl)
- $(use_with opengl)
- $(use_with osmesa)
- $(use_with oss)
- $(use_with pcap)
- $(use_with png)
- $(use_with pulseaudio pulse)
- $(use_with threads pthread)
- $(use_with scanner sane)
- $(use_with sdl)
- $(use_enable test tests)
- $(use_with truetype freetype)
- $(use_with udev)
- $(use_with v4l v4l2)
- $(use_with vkd3d)
- $(use_with vulkan)
- $(use_with X x)
- $(use_with X xfixes)
- $(use_with xcomposite)
- $(use_with xinerama)
- $(use_with xml)
- $(use_with xml xslt)
- )
-
- local PKG_CONFIG AR RANLIB
- # Avoid crossdev's i686-pc-linux-gnu-pkg-config if building wine32 on amd64; #472038
- # set AR and RANLIB to make QA scripts happy; #483342
- tc-export PKG_CONFIG AR RANLIB
-
- if use amd64; then
- if [[ ${ABI} == amd64 ]]; then
- myconf+=( --enable-win64 )
- else
- myconf+=( --disable-win64 )
- fi
-
- # Note: using --with-wine64 results in problems with multilib.eclass
- # CC/LD hackery. We're using separate tools instead.
- fi
-
- ECONF_SOURCE=${S} \
- econf "${myconf[@]}"
- emake depend
-}
-
-multilib_src_test() {
- # FIXME: win32-only; wine64 tests fail with "could not find the Wine loader"
- if [[ ${ABI} == x86 ]]; then
- if [[ $(id -u) == 0 ]]; then
- ewarn "Skipping tests since they cannot be run under the root user."
- ewarn "To run the test ${MY_PN} suite, add userpriv to FEATURES in make.conf"
- return
- fi
-
- WINEPREFIX="${T}/.wine-${ABI}" \
- Xemake test
- fi
-}
-
-multilib_src_install_all() {
- local DOCS=( ANNOUNCE AUTHORS README )
- add_locale_docs() {
- local locale_doc="documentation/README.$1"
- [[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
- }
- l10n_for_each_locale_do add_locale_docs
-
- einstalldocs
- prune_libtool_files --all
-
- if ! use perl ; then # winedump calls function_grep.pl, and winemaker is a perl script
- rm "${D%/}${MY_PREFIX}"/bin/{wine{dump,maker},function_grep.pl} \
- "${D%/}${MY_MANDIR}"/man1/wine{dump,maker}.1 || die
- fi
-
- # Remove wineconsole if neither backend is installed #551124
- if ! use X && ! use ncurses; then
- rm "${D%/}${MY_PREFIX}"/bin/wineconsole* || die
- rm "${D%/}${MY_MANDIR}"/man1/wineconsole* || die
- rm_wineconsole() {
- rm "${D%/}${MY_PREFIX}/$(get_libdir)"/wine/{,fakedlls/}wineconsole.exe* || die
- }
- multilib_foreach_abi rm_wineconsole
- fi
-
- use abi_x86_32 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine{,-preloader} #255055
- use abi_x86_64 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine64{,-preloader}
-
- # Avoid double prefix from dosym and make_wrapper
- MY_PREFIX=${MY_PREFIX#${EPREFIX}}
-
- if use abi_x86_64 && ! use abi_x86_32; then
- dosym wine64 "${MY_PREFIX}"/bin/wine # 404331
- dosym wine64-preloader "${MY_PREFIX}"/bin/wine-preloader
- fi
-
- # Failglob for binloops, shouldn't be necessary, but including to stay safe
- eshopts_push -s failglob #615218
- # Make wrappers for binaries for handling multiple variants
- # Note: wrappers instead of symlinks because some are shell which use basename
- local b
- for b in "${ED%/}${MY_PREFIX}"/bin/*; do
- make_wrapper "${b##*/}-${WINE_VARIANT}" "${MY_PREFIX}/bin/${b##*/}"
- done
- eshopts_pop
-}
-
-pkg_postinst() {
- eselect wine register ${P}
- if [[ ${PN} == "wine-vanilla" ]]; then
- eselect wine register --vanilla ${P} || die
- fi
-
- eselect wine update --all --if-unset || die
-
- xdg_desktop_database_update
-
- if ! use gecko; then
- ewarn "Without Wine Gecko, wine prefixes will not have a default"
- ewarn "implementation of iexplore. Many older windows applications"
- ewarn "rely upon the existence of an iexplore implementation, so"
- ewarn "you will likely need to install an external one, like via winetricks"
- fi
- if ! use mono; then
- ewarn "Without Wine Mono, wine prefixes will not have a default"
- ewarn "implementation of .NET. Many windows applications rely upon"
- ewarn "the existence of a .NET implementation, so you will likely need"
- ewarn "to install an external one, like via winetricks"
- fi
-}
-
-pkg_prerm() {
- eselect wine deregister ${P}
- if [[ ${PN} == "wine-vanilla" ]]; then
- eselect wine deregister --vanilla ${P} || die
- fi
-
- eselect wine update --all --if-unset || die
-}
-
-pkg_postrm() {
- xdg_desktop_database_update
-}
diff --git a/app-emulation/wine-vanilla/wine-vanilla-5.8.ebuild b/app-emulation/wine-vanilla/wine-vanilla-5.12.ebuild
similarity index 98%
rename from app-emulation/wine-vanilla/wine-vanilla-5.8.ebuild
rename to app-emulation/wine-vanilla/wine-vanilla-5.12.ebuild
index f1b0c2c98e78..fed13ca5bb03 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-5.8.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-5.12.ebuild
@@ -24,7 +24,7 @@ else
fi
S="${WORKDIR}/${MY_P}"
-GWP_V="20191222"
+GWP_V="20200523"
PATCHDIR="${WORKDIR}/gentoo-wine-patches"
DESCRIPTION="Free implementation of Windows(tm) on Unix, without external patchsets"
@@ -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
@@ -143,6 +143,7 @@ PATCHES=(
"${PATCHDIR}/patches/${MY_PN}-5.0-winegcc.patch" #260726
"${PATCHDIR}/patches/${MY_PN}-4.7-multilib-portage.patch" #395615
"${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" #310611
+ "${PATCHDIR}/patches/${MY_PN}-5.9-Revert-makedep-Install-also-generated-typelib-for-in.patch"
)
PATCHES_BIN=()
@@ -418,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-forensics/Manifest.gz b/app-forensics/Manifest.gz
index ae5f305dcc2b..becfd21905ad 100644
Binary files a/app-forensics/Manifest.gz and b/app-forensics/Manifest.gz differ
diff --git a/app-forensics/volatility/Manifest b/app-forensics/volatility/Manifest
deleted file mode 100644
index b00b8a284cf1..000000000000
--- a/app-forensics/volatility/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST volatility-2.6.zip 4179806 BLAKE2B 0943551aff2e66769df0e9a8f8fbf01deae12ec8a035d0f549fa4a809f7b6ecb967af93755ae9aede4a43e9638737097275460377d61de413115c74cca4d76af SHA512 1c0b86f270188ba48a6a0ff1d7ad70bde500d0f720d7e1b9d76b6b9498368ae3eb29c5b1c7e7dd76ec9480b83b1e484b4130b4ced7458e4e03ca61fe7d13220f
diff --git a/app-forensics/volatility/volatility-2.6-r1.ebuild b/app-forensics/volatility/volatility-2.6-r1.ebuild
deleted file mode 100644
index c490119d38c7..000000000000
--- a/app-forensics/volatility/volatility-2.6-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-inherit distutils-r1
-
-DESCRIPTION="Framework for analyzing volatile memory"
-HOMEPAGE="https://www.volatilityfoundation.org/"
-SRC_URI="https://downloads.volatilityfoundation.org/releases/${PV}/${P}.zip"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-S=${WORKDIR}/${PN}-master
-
-DEPEND="app-arch/unzip"
-RDEPEND=">=dev-libs/distorm64-3[${PYTHON_USEDEP}]
- dev-libs/libpcre
- || (
- dev-python/pycryptodome[${PYTHON_USEDEP}]
- dev-python/pycrypto[${PYTHON_USEDEP}]
- )"
-
-src_install() {
- distutils-r1_src_install
- mkdir "${D}/usr/share/${PN}" || die
- mv "${D}/usr/contrib/plugins" "${D}/usr/share/${PN}/" || die
- rmdir --ignore-fail-on-non-empty "${D}/usr/contrib" || die
- mv "${D}/usr/tools" "${D}/usr/share/${PN}/" || die
- dosym vol.py /usr/bin/volatility
-}
diff --git a/app-i18n/Manifest.gz b/app-i18n/Manifest.gz
index 564020af3e11..23fdb1badc22 100644
Binary files a/app-i18n/Manifest.gz and b/app-i18n/Manifest.gz differ
diff --git a/app-i18n/fcitx-anthy/fcitx-anthy-0.2.3.ebuild b/app-i18n/fcitx-anthy/fcitx-anthy-0.2.3.ebuild
index 455118af7af9..4230b7a7138f 100644
--- a/app-i18n/fcitx-anthy/fcitx-anthy-0.2.3.ebuild
+++ b/app-i18n/fcitx-anthy/fcitx-anthy-0.2.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2013-2019 Gentoo Authors
+# Copyright 2013-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
@@ -8,11 +8,11 @@ inherit cmake-utils xdg-utils
if [[ "${PV}" =~ (^|\.)9999$ ]]; then
inherit git-r3
- EGIT_REPO_URI="https://gitlab.com/fcitx/fcitx-anthy.git"
+ EGIT_REPO_URI="https://github.com/fcitx/fcitx-anthy"
fi
DESCRIPTION="Japanese Anthy input methods for Fcitx"
-HOMEPAGE="https://fcitx-im.org/ https://gitlab.com/fcitx/fcitx-anthy"
+HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/fcitx-anthy"
if [[ "${PV}" =~ (^|\.)9999$ ]]; then
SRC_URI=""
else
diff --git a/app-i18n/fcitx-anthy/fcitx-anthy-4.9999.ebuild b/app-i18n/fcitx-anthy/fcitx-anthy-4.9999.ebuild
index 24f0e97c1e8f..7bdab3f7755a 100644
--- a/app-i18n/fcitx-anthy/fcitx-anthy-4.9999.ebuild
+++ b/app-i18n/fcitx-anthy/fcitx-anthy-4.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2013-2019 Gentoo Authors
+# Copyright 2013-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
@@ -8,11 +8,11 @@ inherit cmake-utils xdg-utils
if [[ "${PV}" =~ (^|\.)9999$ ]]; then
inherit git-r3
- EGIT_REPO_URI="https://gitlab.com/fcitx/fcitx-anthy.git"
+ EGIT_REPO_URI="https://github.com/fcitx/fcitx-anthy"
fi
DESCRIPTION="Japanese Anthy input methods for Fcitx"
-HOMEPAGE="https://fcitx-im.org/ https://gitlab.com/fcitx/fcitx-anthy"
+HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/fcitx-anthy"
if [[ "${PV}" =~ (^|\.)9999$ ]]; then
SRC_URI=""
else
diff --git a/app-i18n/fcitx-anthy/metadata.xml b/app-i18n/fcitx-anthy/metadata.xml
index c29ae3fb402f..5e15c729652f 100644
--- a/app-i18n/fcitx-anthy/metadata.xml
+++ b/app-i18n/fcitx-anthy/metadata.xml
@@ -10,6 +10,6 @@
Cjk
- fcitx/fcitx-anthy
+ fcitx/fcitx-anthy
diff --git a/app-i18n/fcitx-chewing/fcitx-chewing-0.2.3.ebuild b/app-i18n/fcitx-chewing/fcitx-chewing-0.2.3.ebuild
index 143ad65fd3fd..5c7b46177e7c 100644
--- a/app-i18n/fcitx-chewing/fcitx-chewing-0.2.3.ebuild
+++ b/app-i18n/fcitx-chewing/fcitx-chewing-0.2.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2013-2019 Gentoo Authors
+# Copyright 2013-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
@@ -8,11 +8,11 @@ inherit cmake-utils xdg-utils
if [[ "${PV}" =~ (^|\.)9999$ ]]; then
inherit git-r3
- EGIT_REPO_URI="https://gitlab.com/fcitx/fcitx-chewing.git"
+ EGIT_REPO_URI="https://github.com/fcitx/fcitx-chewing"
fi
DESCRIPTION="Chinese Chewing input method for Fcitx"
-HOMEPAGE="https://fcitx-im.org/ https://gitlab.com/fcitx/fcitx-chewing"
+HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/fcitx-chewing"
if [[ "${PV}" =~ (^|\.)9999$ ]]; then
SRC_URI=""
else
diff --git a/app-i18n/fcitx-chewing/fcitx-chewing-4.9999.ebuild b/app-i18n/fcitx-chewing/fcitx-chewing-4.9999.ebuild
index 37b56eff406c..8b63f929ae44 100644
--- a/app-i18n/fcitx-chewing/fcitx-chewing-4.9999.ebuild
+++ b/app-i18n/fcitx-chewing/fcitx-chewing-4.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2013-2019 Gentoo Authors
+# Copyright 2013-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
@@ -8,11 +8,11 @@ inherit cmake-utils xdg-utils
if [[ "${PV}" =~ (^|\.)9999$ ]]; then
inherit git-r3
- EGIT_REPO_URI="https://gitlab.com/fcitx/fcitx-chewing.git"
+ EGIT_REPO_URI="https://github.com/fcitx/fcitx-chewing"
fi
DESCRIPTION="Chinese Chewing input method for Fcitx"
-HOMEPAGE="https://fcitx-im.org/ https://gitlab.com/fcitx/fcitx-chewing"
+HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/fcitx-chewing"
if [[ "${PV}" =~ (^|\.)9999$ ]]; then
SRC_URI=""
else
diff --git a/app-i18n/fcitx-chewing/metadata.xml b/app-i18n/fcitx-chewing/metadata.xml
index 9a5bbb63bce1..c3d61612ede3 100644
--- a/app-i18n/fcitx-chewing/metadata.xml
+++ b/app-i18n/fcitx-chewing/metadata.xml
@@ -10,6 +10,6 @@
Cjk
- fcitx/fcitx-chewing
+ fcitx/fcitx-chewing
diff --git a/app-i18n/fcitx-cloudpinyin/fcitx-cloudpinyin-0.3.6.ebuild b/app-i18n/fcitx-cloudpinyin/fcitx-cloudpinyin-0.3.6.ebuild
index 7052fba1ce19..2cf1b903b2d9 100644
--- a/app-i18n/fcitx-cloudpinyin/fcitx-cloudpinyin-0.3.6.ebuild
+++ b/app-i18n/fcitx-cloudpinyin/fcitx-cloudpinyin-0.3.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2012-2019 Gentoo Authors
+# Copyright 2012-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
@@ -8,11 +8,11 @@ inherit cmake-utils
if [[ "${PV}" =~ (^|\.)9999$ ]]; then
inherit git-r3
- EGIT_REPO_URI="https://gitlab.com/fcitx/fcitx-cloudpinyin.git"
+ EGIT_REPO_URI="https://github.com/fcitx/fcitx-cloudpinyin"
fi
DESCRIPTION="Internet look-up support for Chinese Pinyin input methods for Fcitx"
-HOMEPAGE="https://fcitx-im.org/ https://gitlab.com/fcitx/fcitx-cloudpinyin"
+HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/fcitx-cloudpinyin"
if [[ "${PV}" =~ (^|\.)9999$ ]]; then
SRC_URI=""
else
diff --git a/app-i18n/fcitx-cloudpinyin/fcitx-cloudpinyin-4.9999.ebuild b/app-i18n/fcitx-cloudpinyin/fcitx-cloudpinyin-4.9999.ebuild
index e4582e24ae36..6a77e0dc6823 100644
--- a/app-i18n/fcitx-cloudpinyin/fcitx-cloudpinyin-4.9999.ebuild
+++ b/app-i18n/fcitx-cloudpinyin/fcitx-cloudpinyin-4.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2012-2019 Gentoo Authors
+# Copyright 2012-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
@@ -8,11 +8,11 @@ inherit cmake-utils
if [[ "${PV}" =~ (^|\.)9999$ ]]; then
inherit git-r3
- EGIT_REPO_URI="https://gitlab.com/fcitx/fcitx-cloudpinyin.git"
+ EGIT_REPO_URI="https://github.com/fcitx/fcitx-cloudpinyin"
fi
DESCRIPTION="Internet look-up support for Chinese Pinyin input methods for Fcitx"
-HOMEPAGE="https://fcitx-im.org/ https://gitlab.com/fcitx/fcitx-cloudpinyin"
+HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/fcitx-cloudpinyin"
if [[ "${PV}" =~ (^|\.)9999$ ]]; then
SRC_URI=""
else
diff --git a/app-i18n/fcitx-cloudpinyin/metadata.xml b/app-i18n/fcitx-cloudpinyin/metadata.xml
index 183e87e5137e..a46ab006f456 100644
--- a/app-i18n/fcitx-cloudpinyin/metadata.xml
+++ b/app-i18n/fcitx-cloudpinyin/metadata.xml
@@ -10,6 +10,6 @@
Cjk
- fcitx/fcitx-cloudpinyin
+ fcitx/fcitx-cloudpinyin
diff --git a/app-i18n/fcitx-configtool/fcitx-configtool-0.4.10.ebuild b/app-i18n/fcitx-configtool/fcitx-configtool-0.4.10.ebuild
index d94a92a71186..9fe46f55f860 100644
--- a/app-i18n/fcitx-configtool/fcitx-configtool-0.4.10.ebuild
+++ b/app-i18n/fcitx-configtool/fcitx-configtool-0.4.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2010-2019 Gentoo Authors
+# Copyright 2010-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
@@ -8,11 +8,11 @@ inherit cmake-utils
if [[ "${PV}" =~ (^|\.)9999$ ]]; then
inherit git-r3
- EGIT_REPO_URI="https://gitlab.com/fcitx/fcitx-configtool.git"
+ EGIT_REPO_URI="https://github.com/fcitx/fcitx-configtool"
fi
DESCRIPTION="GTK+ GUI configuration tool for Fcitx"
-HOMEPAGE="https://fcitx-im.org/ https://gitlab.com/fcitx/fcitx-configtool"
+HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/fcitx-configtool"
if [[ "${PV}" =~ (^|\.)9999$ ]]; then
SRC_URI=""
else
diff --git a/app-i18n/fcitx-configtool/fcitx-configtool-4.9999.ebuild b/app-i18n/fcitx-configtool/fcitx-configtool-4.9999.ebuild
index 1243fa0276e8..19655e98c974 100644
--- a/app-i18n/fcitx-configtool/fcitx-configtool-4.9999.ebuild
+++ b/app-i18n/fcitx-configtool/fcitx-configtool-4.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2010-2019 Gentoo Authors
+# Copyright 2010-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
@@ -8,11 +8,11 @@ inherit cmake-utils
if [[ "${PV}" =~ (^|\.)9999$ ]]; then
inherit git-r3
- EGIT_REPO_URI="https://gitlab.com/fcitx/fcitx-configtool.git"
+ EGIT_REPO_URI="https://github.com/fcitx/fcitx-configtool"
fi
DESCRIPTION="GTK+ GUI configuration tool for Fcitx"
-HOMEPAGE="https://fcitx-im.org/ https://gitlab.com/fcitx/fcitx-configtool"
+HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/fcitx-configtool"
if [[ "${PV}" =~ (^|\.)9999$ ]]; then
SRC_URI=""
else
diff --git a/app-i18n/fcitx-configtool/metadata.xml b/app-i18n/fcitx-configtool/metadata.xml
index 163f08b0b6df..c7779e9268e6 100644
--- a/app-i18n/fcitx-configtool/metadata.xml
+++ b/app-i18n/fcitx-configtool/metadata.xml
@@ -10,6 +10,6 @@
Cjk
- fcitx/fcitx-configtool
+ fcitx/fcitx-configtool
diff --git a/app-i18n/fcitx-hangul/fcitx-hangul-0.3.1.ebuild b/app-i18n/fcitx-hangul/fcitx-hangul-0.3.1.ebuild
index 16855499c911..fdbf7d7716b5 100644
--- a/app-i18n/fcitx-hangul/fcitx-hangul-0.3.1.ebuild
+++ b/app-i18n/fcitx-hangul/fcitx-hangul-0.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2013-2019 Gentoo Authors
+# Copyright 2013-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
@@ -8,11 +8,11 @@ inherit cmake-utils xdg-utils
if [[ "${PV}" =~ (^|\.)9999$ ]]; then
inherit git-r3
- EGIT_REPO_URI="https://gitlab.com/fcitx/fcitx-hangul.git"
+ EGIT_REPO_URI="https://github.com/fcitx/fcitx-hangul"
fi
DESCRIPTION="Korean Hangul input method for Fcitx"
-HOMEPAGE="https://fcitx-im.org/ https://gitlab.com/fcitx/fcitx-hangul"
+HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/fcitx-hangul"
if [[ "${PV}" =~ (^|\.)9999$ ]]; then
SRC_URI=""
else
diff --git a/app-i18n/fcitx-hangul/fcitx-hangul-4.9999.ebuild b/app-i18n/fcitx-hangul/fcitx-hangul-4.9999.ebuild
index 917d7e983d20..0c3f83a8582d 100644
--- a/app-i18n/fcitx-hangul/fcitx-hangul-4.9999.ebuild
+++ b/app-i18n/fcitx-hangul/fcitx-hangul-4.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2013-2019 Gentoo Authors
+# Copyright 2013-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
@@ -8,11 +8,11 @@ inherit cmake-utils xdg-utils
if [[ "${PV}" =~ (^|\.)9999$ ]]; then
inherit git-r3
- EGIT_REPO_URI="https://gitlab.com/fcitx/fcitx-hangul.git"
+ EGIT_REPO_URI="https://github.com/fcitx/fcitx-hangul"
fi
DESCRIPTION="Korean Hangul input method for Fcitx"
-HOMEPAGE="https://fcitx-im.org/ https://gitlab.com/fcitx/fcitx-hangul"
+HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/fcitx-hangul"
if [[ "${PV}" =~ (^|\.)9999$ ]]; then
SRC_URI=""
else
diff --git a/app-i18n/fcitx-hangul/metadata.xml b/app-i18n/fcitx-hangul/metadata.xml
index c07e8a1bcdb6..ef7714e27ba9 100644
--- a/app-i18n/fcitx-hangul/metadata.xml
+++ b/app-i18n/fcitx-hangul/metadata.xml
@@ -10,6 +10,6 @@
Cjk
- fcitx/fcitx-hangul
+ fcitx/fcitx-hangul
diff --git a/app-i18n/fcitx-libpinyin/fcitx-libpinyin-0.5.3.ebuild b/app-i18n/fcitx-libpinyin/fcitx-libpinyin-0.5.3.ebuild
index cfcd437107b6..941ab64d0264 100644
--- a/app-i18n/fcitx-libpinyin/fcitx-libpinyin-0.5.3.ebuild
+++ b/app-i18n/fcitx-libpinyin/fcitx-libpinyin-0.5.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 2012-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -8,11 +8,11 @@ inherit cmake-utils gnome2-utils
if [[ "${PV}" =~ (^|\.)9999$ ]]; then
inherit git-r3
- EGIT_REPO_URI="https://gitlab.com/fcitx/fcitx-libpinyin.git"
+ EGIT_REPO_URI="https://github.com/fcitx/fcitx-libpinyin"
fi
DESCRIPTION="Chinese LibPinyin input methods for Fcitx"
-HOMEPAGE="https://fcitx-im.org/ https://gitlab.com/fcitx/fcitx-libpinyin"
+HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/fcitx-libpinyin"
if [[ "${PV}" =~ (^|\.)9999$ ]]; then
SRC_URI="https://download.fcitx-im.org/data/model.text.20161206.tar.gz -> fcitx-data-model.text.20161206.tar.gz"
else
diff --git a/app-i18n/fcitx-libpinyin/fcitx-libpinyin-4.9999.ebuild b/app-i18n/fcitx-libpinyin/fcitx-libpinyin-4.9999.ebuild
index 38b963d8ecc8..66cc6ae0ed8d 100644
--- a/app-i18n/fcitx-libpinyin/fcitx-libpinyin-4.9999.ebuild
+++ b/app-i18n/fcitx-libpinyin/fcitx-libpinyin-4.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 2012-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -8,11 +8,11 @@ inherit cmake-utils gnome2-utils
if [[ "${PV}" =~ (^|\.)9999$ ]]; then
inherit git-r3
- EGIT_REPO_URI="https://gitlab.com/fcitx/fcitx-libpinyin.git"
+ EGIT_REPO_URI="https://github.com/fcitx/fcitx-libpinyin"
fi
DESCRIPTION="Chinese LibPinyin input methods for Fcitx"
-HOMEPAGE="https://fcitx-im.org/ https://gitlab.com/fcitx/fcitx-libpinyin"
+HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/fcitx-libpinyin"
if [[ "${PV}" =~ (^|\.)9999$ ]]; then
SRC_URI="https://download.fcitx-im.org/data/model.text.20161206.tar.gz -> fcitx-data-model.text.20161206.tar.gz"
else
diff --git a/app-i18n/fcitx-libpinyin/metadata.xml b/app-i18n/fcitx-libpinyin/metadata.xml
index 8cb60642717a..2c68bea1e0eb 100644
--- a/app-i18n/fcitx-libpinyin/metadata.xml
+++ b/app-i18n/fcitx-libpinyin/metadata.xml
@@ -13,6 +13,6 @@
Install dictionary manager
- fcitx/fcitx-libpinyin
+ fcitx/fcitx-libpinyin
diff --git a/app-i18n/fcitx-m17n/fcitx-m17n-0.2.4.ebuild b/app-i18n/fcitx-m17n/fcitx-m17n-0.2.4.ebuild
index 65a80442349f..82a35d462868 100644
--- a/app-i18n/fcitx-m17n/fcitx-m17n-0.2.4.ebuild
+++ b/app-i18n/fcitx-m17n/fcitx-m17n-0.2.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 2016-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -8,11 +8,11 @@ inherit cmake-utils
if [[ "${PV}" =~ (^|\.)9999$ ]]; then
inherit git-r3
- EGIT_REPO_URI="https://gitlab.com/fcitx/fcitx-m17n.git"
+ EGIT_REPO_URI="https://github.com/fcitx/fcitx-m17n"
fi
DESCRIPTION="m17n-provided input methods for Fcitx"
-HOMEPAGE="https://fcitx-im.org/ https://gitlab.com/fcitx/fcitx-m17n"
+HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/fcitx-m17n"
if [[ "${PV}" =~ (^|\.)9999$ ]]; then
SRC_URI=""
else
diff --git a/app-i18n/fcitx-m17n/fcitx-m17n-4.9999.ebuild b/app-i18n/fcitx-m17n/fcitx-m17n-4.9999.ebuild
index 45cd1d24ec28..a043cd7fefa4 100644
--- a/app-i18n/fcitx-m17n/fcitx-m17n-4.9999.ebuild
+++ b/app-i18n/fcitx-m17n/fcitx-m17n-4.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 2016-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -8,11 +8,11 @@ inherit cmake-utils
if [[ "${PV}" =~ (^|\.)9999$ ]]; then
inherit git-r3
- EGIT_REPO_URI="https://gitlab.com/fcitx/fcitx-m17n.git"
+ EGIT_REPO_URI="https://github.com/fcitx/fcitx-m17n"
fi
DESCRIPTION="m17n-provided input methods for Fcitx"
-HOMEPAGE="https://fcitx-im.org/ https://gitlab.com/fcitx/fcitx-m17n"
+HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/fcitx-m17n"
if [[ "${PV}" =~ (^|\.)9999$ ]]; then
SRC_URI=""
else
diff --git a/app-i18n/fcitx-m17n/metadata.xml b/app-i18n/fcitx-m17n/metadata.xml
index 0972630f0941..fcddb15dd181 100644
--- a/app-i18n/fcitx-m17n/metadata.xml
+++ b/app-i18n/fcitx-m17n/metadata.xml
@@ -10,6 +10,6 @@
Cjk
- fcitx/fcitx-m17n
+ fcitx/fcitx-m17n
diff --git a/app-i18n/fcitx-qt5/fcitx-qt5-1.2.3.ebuild b/app-i18n/fcitx-qt5/fcitx-qt5-1.2.3.ebuild
index 99e7fd2bb3e6..0517f4e0d2dc 100644
--- a/app-i18n/fcitx-qt5/fcitx-qt5-1.2.3.ebuild
+++ b/app-i18n/fcitx-qt5/fcitx-qt5-1.2.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2014-2019 Gentoo Authors
+# Copyright 2014-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
@@ -8,11 +8,11 @@ inherit cmake-utils
if [[ "${PV}" =~ (^|\.)9999$ ]]; then
inherit git-r3
- EGIT_REPO_URI="https://gitlab.com/fcitx/fcitx-qt5.git"
+ EGIT_REPO_URI="https://github.com/fcitx/fcitx-qt5"
fi
DESCRIPTION="Fcitx input method module for Qt 5"
-HOMEPAGE="https://fcitx-im.org/ https://gitlab.com/fcitx/fcitx-qt5"
+HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/fcitx-qt5"
if [[ "${PV}" =~ (^|\.)9999$ ]]; then
SRC_URI=""
else
diff --git a/app-i18n/fcitx-qt5/fcitx-qt5-4.9999.ebuild b/app-i18n/fcitx-qt5/fcitx-qt5-4.9999.ebuild
index 3484bb692873..9c1255da7ca4 100644
--- a/app-i18n/fcitx-qt5/fcitx-qt5-4.9999.ebuild
+++ b/app-i18n/fcitx-qt5/fcitx-qt5-4.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2014-2019 Gentoo Authors
+# Copyright 2014-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
@@ -8,11 +8,11 @@ inherit cmake-utils
if [[ "${PV}" =~ (^|\.)9999$ ]]; then
inherit git-r3
- EGIT_REPO_URI="https://gitlab.com/fcitx/fcitx-qt5.git"
+ EGIT_REPO_URI="https://github.com/fcitx/fcitx-qt5"
fi
DESCRIPTION="Fcitx input method module for Qt 5"
-HOMEPAGE="https://fcitx-im.org/ https://gitlab.com/fcitx/fcitx-qt5"
+HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/fcitx-qt5"
if [[ "${PV}" =~ (^|\.)9999$ ]]; then
SRC_URI=""
else
diff --git a/app-i18n/fcitx-qt5/metadata.xml b/app-i18n/fcitx-qt5/metadata.xml
index 8410356fbf60..1a301afceb2d 100644
--- a/app-i18n/fcitx-qt5/metadata.xml
+++ b/app-i18n/fcitx-qt5/metadata.xml
@@ -10,6 +10,6 @@
Cjk
- fcitx/fcitx-qt5
+ fcitx/fcitx-qt5
diff --git a/app-i18n/fcitx-rime/fcitx-rime-0.3.2.ebuild b/app-i18n/fcitx-rime/fcitx-rime-0.3.2.ebuild
index 675cba41e886..a028f7f8ff9e 100644
--- a/app-i18n/fcitx-rime/fcitx-rime-0.3.2.ebuild
+++ b/app-i18n/fcitx-rime/fcitx-rime-0.3.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 2012-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -8,11 +8,11 @@ inherit cmake-utils gnome2-utils
if [[ "${PV}" =~ (^|\.)9999$ ]]; then
inherit git-r3
- EGIT_REPO_URI="https://gitlab.com/fcitx/fcitx-rime.git"
+ EGIT_REPO_URI="https://github.com/fcitx/fcitx-rime"
fi
DESCRIPTION="Chinese RIME input methods for Fcitx"
-HOMEPAGE="https://fcitx-im.org/ https://gitlab.com/fcitx/fcitx-rime"
+HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/fcitx-rime"
if [[ "${PV}" =~ (^|\.)9999$ ]]; then
SRC_URI=""
else
diff --git a/app-i18n/fcitx-rime/fcitx-rime-4.9999.ebuild b/app-i18n/fcitx-rime/fcitx-rime-4.9999.ebuild
index b40865038567..5b17c2b01487 100644
--- a/app-i18n/fcitx-rime/fcitx-rime-4.9999.ebuild
+++ b/app-i18n/fcitx-rime/fcitx-rime-4.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 2012-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -8,11 +8,11 @@ inherit cmake-utils gnome2-utils
if [[ "${PV}" =~ (^|\.)9999$ ]]; then
inherit git-r3
- EGIT_REPO_URI="https://gitlab.com/fcitx/fcitx-rime.git"
+ EGIT_REPO_URI="https://github.com/fcitx/fcitx-rime"
fi
DESCRIPTION="Chinese RIME input methods for Fcitx"
-HOMEPAGE="https://fcitx-im.org/ https://gitlab.com/fcitx/fcitx-rime"
+HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/fcitx-rime"
if [[ "${PV}" =~ (^|\.)9999$ ]]; then
SRC_URI=""
else
diff --git a/app-i18n/fcitx-rime/metadata.xml b/app-i18n/fcitx-rime/metadata.xml
index 867246b6c0f5..c809836fd12d 100644
--- a/app-i18n/fcitx-rime/metadata.xml
+++ b/app-i18n/fcitx-rime/metadata.xml
@@ -17,6 +17,6 @@
Install configuration tool
- fcitx/fcitx-rime
+ fcitx/fcitx-rime
diff --git a/app-i18n/fcitx-sayura/fcitx-sayura-0.1.2.ebuild b/app-i18n/fcitx-sayura/fcitx-sayura-0.1.2.ebuild
index c767ad9702dc..3d0258f459a7 100644
--- a/app-i18n/fcitx-sayura/fcitx-sayura-0.1.2.ebuild
+++ b/app-i18n/fcitx-sayura/fcitx-sayura-0.1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2016-2019 Gentoo Authors
+# Copyright 2016-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
@@ -8,11 +8,11 @@ inherit cmake-utils xdg-utils
if [[ "${PV}" =~ (^|\.)9999$ ]]; then
inherit git-r3
- EGIT_REPO_URI="https://gitlab.com/fcitx/fcitx-sayura.git"
+ EGIT_REPO_URI="https://github.com/fcitx/fcitx-sayura"
fi
DESCRIPTION="Sinhala Sayura input method for Fcitx"
-HOMEPAGE="https://fcitx-im.org/ https://gitlab.com/fcitx/fcitx-sayura"
+HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/fcitx-sayura"
if [[ "${PV}" =~ (^|\.)9999$ ]]; then
SRC_URI=""
else
diff --git a/app-i18n/fcitx-sayura/fcitx-sayura-4.9999.ebuild b/app-i18n/fcitx-sayura/fcitx-sayura-4.9999.ebuild
index 782627256f66..8b9f2d116f0a 100644
--- a/app-i18n/fcitx-sayura/fcitx-sayura-4.9999.ebuild
+++ b/app-i18n/fcitx-sayura/fcitx-sayura-4.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2016-2019 Gentoo Authors
+# Copyright 2016-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
@@ -8,11 +8,11 @@ inherit cmake-utils xdg-utils
if [[ "${PV}" =~ (^|\.)9999$ ]]; then
inherit git-r3
- EGIT_REPO_URI="https://gitlab.com/fcitx/fcitx-sayura.git"
+ EGIT_REPO_URI="https://github.com/fcitx/fcitx-sayura"
fi
DESCRIPTION="Sinhala Sayura input method for Fcitx"
-HOMEPAGE="https://fcitx-im.org/ https://gitlab.com/fcitx/fcitx-sayura"
+HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/fcitx-sayura"
if [[ "${PV}" =~ (^|\.)9999$ ]]; then
SRC_URI=""
else
diff --git a/app-i18n/fcitx-sayura/metadata.xml b/app-i18n/fcitx-sayura/metadata.xml
index 733b3cd2db79..98c49b162783 100644
--- a/app-i18n/fcitx-sayura/metadata.xml
+++ b/app-i18n/fcitx-sayura/metadata.xml
@@ -10,6 +10,6 @@
Cjk
- fcitx/fcitx-sayura
+ fcitx/fcitx-sayura
diff --git a/app-i18n/fcitx-sunpinyin/fcitx-sunpinyin-0.4.2.ebuild b/app-i18n/fcitx-sunpinyin/fcitx-sunpinyin-0.4.2.ebuild
index 9eed3f5a70f1..64c5adb2c758 100644
--- a/app-i18n/fcitx-sunpinyin/fcitx-sunpinyin-0.4.2.ebuild
+++ b/app-i18n/fcitx-sunpinyin/fcitx-sunpinyin-0.4.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 2010-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -8,11 +8,11 @@ inherit cmake-utils gnome2-utils
if [[ "${PV}" =~ (^|\.)9999$ ]]; then
inherit git-r3
- EGIT_REPO_URI="https://gitlab.com/fcitx/fcitx-sunpinyin.git"
+ EGIT_REPO_URI="https://github.com/fcitx/fcitx-sunpinyin"
fi
DESCRIPTION="Chinese SunPinyin input method for Fcitx"
-HOMEPAGE="https://fcitx-im.org/ https://gitlab.com/fcitx/fcitx-sunpinyin"
+HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/fcitx-sunpinyin"
if [[ "${PV}" =~ (^|\.)9999$ ]]; then
SRC_URI=""
else
diff --git a/app-i18n/fcitx-sunpinyin/fcitx-sunpinyin-4.9999.ebuild b/app-i18n/fcitx-sunpinyin/fcitx-sunpinyin-4.9999.ebuild
index 5dcca8662924..cc7a98ca63d7 100644
--- a/app-i18n/fcitx-sunpinyin/fcitx-sunpinyin-4.9999.ebuild
+++ b/app-i18n/fcitx-sunpinyin/fcitx-sunpinyin-4.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 2010-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -8,11 +8,11 @@ inherit cmake-utils gnome2-utils
if [[ "${PV}" =~ (^|\.)9999$ ]]; then
inherit git-r3
- EGIT_REPO_URI="https://gitlab.com/fcitx/fcitx-sunpinyin.git"
+ EGIT_REPO_URI="https://github.com/fcitx/fcitx-sunpinyin"
fi
DESCRIPTION="Chinese SunPinyin input method for Fcitx"
-HOMEPAGE="https://fcitx-im.org/ https://gitlab.com/fcitx/fcitx-sunpinyin"
+HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/fcitx-sunpinyin"
if [[ "${PV}" =~ (^|\.)9999$ ]]; then
SRC_URI=""
else
diff --git a/app-i18n/fcitx-sunpinyin/metadata.xml b/app-i18n/fcitx-sunpinyin/metadata.xml
index 0b3b9ad6abdd..a29735352546 100644
--- a/app-i18n/fcitx-sunpinyin/metadata.xml
+++ b/app-i18n/fcitx-sunpinyin/metadata.xml
@@ -10,6 +10,6 @@
Cjk
- fcitx/fcitx-sunpinyin
+ fcitx/fcitx-sunpinyin
diff --git a/app-i18n/fcitx-table-extra/fcitx-table-extra-0.3.8.ebuild b/app-i18n/fcitx-table-extra/fcitx-table-extra-0.3.8.ebuild
index a2516d917e26..24bb5f73b8b4 100644
--- a/app-i18n/fcitx-table-extra/fcitx-table-extra-0.3.8.ebuild
+++ b/app-i18n/fcitx-table-extra/fcitx-table-extra-0.3.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 2012-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -8,11 +8,11 @@ inherit cmake-utils gnome2-utils
if [[ "${PV}" =~ (^|\.)9999$ ]]; then
inherit git-r3
- EGIT_REPO_URI="https://gitlab.com/fcitx/fcitx-table-extra.git"
+ EGIT_REPO_URI="https://github.com/fcitx/fcitx-table-extra"
fi
DESCRIPTION="Extra Chinese table input methods for Fcitx"
-HOMEPAGE="https://fcitx-im.org/ https://gitlab.com/fcitx/fcitx-table-extra"
+HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/fcitx-table-extra"
if [[ "${PV}" =~ (^|\.)9999$ ]]; then
SRC_URI=""
else
diff --git a/app-i18n/fcitx-table-extra/fcitx-table-extra-4.9999.ebuild b/app-i18n/fcitx-table-extra/fcitx-table-extra-4.9999.ebuild
index 9a7d55beda2c..ac818b0f0b30 100644
--- a/app-i18n/fcitx-table-extra/fcitx-table-extra-4.9999.ebuild
+++ b/app-i18n/fcitx-table-extra/fcitx-table-extra-4.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 2012-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -8,11 +8,11 @@ inherit cmake-utils gnome2-utils
if [[ "${PV}" =~ (^|\.)9999$ ]]; then
inherit git-r3
- EGIT_REPO_URI="https://gitlab.com/fcitx/fcitx-table-extra.git"
+ EGIT_REPO_URI="https://github.com/fcitx/fcitx-table-extra"
fi
DESCRIPTION="Extra Chinese table input methods for Fcitx"
-HOMEPAGE="https://fcitx-im.org/ https://gitlab.com/fcitx/fcitx-table-extra"
+HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/fcitx-table-extra"
if [[ "${PV}" =~ (^|\.)9999$ ]]; then
SRC_URI=""
else
diff --git a/app-i18n/fcitx-table-extra/metadata.xml b/app-i18n/fcitx-table-extra/metadata.xml
index 4c163079a51f..461bba458254 100644
--- a/app-i18n/fcitx-table-extra/metadata.xml
+++ b/app-i18n/fcitx-table-extra/metadata.xml
@@ -10,6 +10,6 @@
Cjk
- fcitx/fcitx-table-extra
+ fcitx/fcitx-table-extra
diff --git a/app-i18n/fcitx-unikey/fcitx-unikey-0.2.7.ebuild b/app-i18n/fcitx-unikey/fcitx-unikey-0.2.7.ebuild
index df756e31e6e0..05e9166a8900 100644
--- a/app-i18n/fcitx-unikey/fcitx-unikey-0.2.7.ebuild
+++ b/app-i18n/fcitx-unikey/fcitx-unikey-0.2.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 2013-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -8,11 +8,11 @@ inherit cmake-utils gnome2-utils
if [[ "${PV}" =~ (^|\.)9999$ ]]; then
inherit git-r3
- EGIT_REPO_URI="https://gitlab.com/fcitx/fcitx-unikey.git"
+ EGIT_REPO_URI="https://github.com/fcitx/fcitx-unikey"
fi
DESCRIPTION="Vietnamese Unikey input methods for Fcitx"
-HOMEPAGE="https://fcitx-im.org/ https://gitlab.com/fcitx/fcitx-unikey"
+HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/fcitx-unikey"
if [[ "${PV}" =~ (^|\.)9999$ ]]; then
SRC_URI=""
else
diff --git a/app-i18n/fcitx-unikey/fcitx-unikey-4.9999.ebuild b/app-i18n/fcitx-unikey/fcitx-unikey-4.9999.ebuild
index f7913c7825a9..c20cc8cad7a2 100644
--- a/app-i18n/fcitx-unikey/fcitx-unikey-4.9999.ebuild
+++ b/app-i18n/fcitx-unikey/fcitx-unikey-4.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 2013-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -8,11 +8,11 @@ inherit cmake-utils gnome2-utils
if [[ "${PV}" =~ (^|\.)9999$ ]]; then
inherit git-r3
- EGIT_REPO_URI="https://gitlab.com/fcitx/fcitx-unikey.git"
+ EGIT_REPO_URI="https://github.com/fcitx/fcitx-unikey"
fi
DESCRIPTION="Vietnamese Unikey input methods for Fcitx"
-HOMEPAGE="https://fcitx-im.org/ https://gitlab.com/fcitx/fcitx-unikey"
+HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/fcitx-unikey"
if [[ "${PV}" =~ (^|\.)9999$ ]]; then
SRC_URI=""
else
diff --git a/app-i18n/fcitx-unikey/metadata.xml b/app-i18n/fcitx-unikey/metadata.xml
index 92ad94a4b881..fbe690dbfe44 100644
--- a/app-i18n/fcitx-unikey/metadata.xml
+++ b/app-i18n/fcitx-unikey/metadata.xml
@@ -13,6 +13,6 @@
Install macro editor
- fcitx/fcitx-unikey
+ fcitx/fcitx-unikey
diff --git a/app-i18n/fcitx/fcitx-4.2.9.6.ebuild b/app-i18n/fcitx/fcitx-4.2.9.6.ebuild
index 0681078c51a6..abf4e1cbdb6a 100644
--- a/app-i18n/fcitx/fcitx-4.2.9.6.ebuild
+++ b/app-i18n/fcitx/fcitx-4.2.9.6.ebuild
@@ -1,18 +1,18 @@
-# Copyright 2003-2019 Gentoo Authors
+# Copyright 2003-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="6"
+EAPI="7"
-inherit cmake-utils gnome2-utils xdg-utils
+inherit cmake gnome2-utils xdg-utils
if [[ "${PV}" =~ (^|\.)9999$ ]]; then
inherit git-r3
- EGIT_REPO_URI="https://gitlab.com/fcitx/fcitx.git"
+ EGIT_REPO_URI="https://github.com/fcitx/fcitx"
fi
DESCRIPTION="Fcitx (Flexible Context-aware Input Tool with eXtension) input method framework"
-HOMEPAGE="https://fcitx-im.org/ https://gitlab.com/fcitx/fcitx"
+HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/fcitx"
if [[ "${PV}" =~ (^|\.)9999$ ]]; then
SRC_URI="https://download.fcitx-im.org/data/pinyin.tar.gz -> fcitx-data-pinyin.tar.gz
https://download.fcitx-im.org/data/table.tar.gz -> fcitx-data-table.tar.gz
@@ -25,12 +25,17 @@ fi
LICENSE="BSD-1 GPL-2+ LGPL-2+ MIT"
SLOT="4"
-KEYWORDS="amd64 ~hppa ppc ppc64 x86"
+KEYWORDS="amd64 ~arm64 ~hppa ppc ppc64 x86"
IUSE="+X +autostart +cairo debug +enchant gtk2 +gtk3 +introspection lua nls opencc +pango static-libs +table test +xml"
-RESTRICT="!test? ( test )"
REQUIRED_USE="cairo? ( X ) pango? ( cairo )"
+RESTRICT="!test? ( test )"
-RDEPEND="dev-libs/glib:2
+BDEPEND="dev-util/glib-utils
+ kde-frameworks/extra-cmake-modules:5
+ virtual/pkgconfig
+ introspection? ( dev-libs/gobject-introspection )
+ nls? ( sys-devel/gettext )"
+DEPEND="dev-libs/glib:2
sys-apps/dbus
sys-apps/util-linux
virtual/libiconv
@@ -55,18 +60,14 @@ RDEPEND="dev-libs/glib:2
enchant? ( app-text/enchant:0= )
gtk2? ( x11-libs/gtk+:2 )
gtk3? ( x11-libs/gtk+:3 )
- introspection? ( dev-libs/gobject-introspection )
lua? ( dev-lang/lua:= )
nls? ( sys-devel/gettext )
- opencc? ( app-i18n/opencc:= )
+ opencc? ( app-i18n/opencc:0= )
xml? (
app-text/iso-codes
dev-libs/libxml2
)"
-DEPEND="${RDEPEND}
- dev-util/glib-utils
- kde-frameworks/extra-cmake-modules:5
- virtual/pkgconfig"
+RDEPEND="${DEPEND}"
DOCS=(AUTHORS ChangeLog THANKS)
@@ -79,7 +80,7 @@ src_prepare() {
ln -s "${DISTDIR}/fcitx-data-en_dict-20121020.tar.gz" src/module/spell/dict/en_dict-20121020.tar.gz || die
fi
- # https://gitlab.com/fcitx/fcitx/issues/250
+ # https://github.com/fcitx/fcitx/issues/250
sed \
-e "/find_package(XkbFile REQUIRED)/i\\ if(ENABLE_X11)" \
-e "/find_package(XkbFile REQUIRED)/s/^/ /" \
@@ -87,47 +88,46 @@ src_prepare() {
-e "/^find_package(XKeyboardConfig REQUIRED)/,+1d" \
-i CMakeLists.txt
- cmake-utils_src_prepare
- xdg_environment_reset
+ cmake_src_prepare
}
src_configure() {
local mycmakeargs=(
-DLIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)"
-DSYSCONFDIR="${EPREFIX}/etc"
- -DENABLE_CAIRO=$(usex cairo)
- -DENABLE_DEBUG=$(usex debug)
- -DENABLE_ENCHANT=$(usex enchant)
- -DENABLE_GETTEXT=$(usex nls)
- -DENABLE_GIR=$(usex introspection)
- -DENABLE_GTK2_IM_MODULE=$(usex gtk2)
- -DENABLE_GTK3_IM_MODULE=$(usex gtk3)
- -DENABLE_LIBXML2=$(usex xml)
- -DENABLE_LUA=$(usex lua)
- -DENABLE_OPENCC=$(usex opencc)
- -DENABLE_PANGO=$(usex pango)
+ -DENABLE_CAIRO=$(usex cairo ON OFF)
+ -DENABLE_DEBUG=$(usex debug ON OFF)
+ -DENABLE_ENCHANT=$(usex enchant ON OFF)
+ -DENABLE_GETTEXT=$(usex nls ON OFF)
+ -DENABLE_GIR=$(usex introspection ON OFF)
+ -DENABLE_GTK2_IM_MODULE=$(usex gtk2 ON OFF)
+ -DENABLE_GTK3_IM_MODULE=$(usex gtk3 ON OFF)
+ -DENABLE_LIBXML2=$(usex xml ON OFF)
+ -DENABLE_LUA=$(usex lua ON OFF)
+ -DENABLE_OPENCC=$(usex opencc ON OFF)
+ -DENABLE_PANGO=$(usex pango ON OFF)
-DENABLE_QT=OFF
-DENABLE_QT_GUI=OFF
-DENABLE_QT_IM_MODULE=OFF
- -DENABLE_SNOOPER=$(if use gtk2 || use gtk3; then echo yes; else echo no; fi)
- -DENABLE_STATIC=$(usex static-libs)
- -DENABLE_TABLE=$(usex table)
- -DENABLE_TEST=$(usex test)
- -DENABLE_X11=$(usex X)
- -DENABLE_XDGAUTOSTART=$(usex autostart)
+ -DENABLE_SNOOPER=$(if use gtk2 || use gtk3; then echo ON; else echo OFF; fi)
+ -DENABLE_STATIC=$(usex static-libs ON OFF)
+ -DENABLE_TABLE=$(usex table ON OFF)
+ -DENABLE_TEST=$(usex test ON OFF)
+ -DENABLE_X11=$(usex X ON OFF)
+ -DENABLE_XDGAUTOSTART=$(usex autostart ON OFF)
)
- cmake-utils_src_configure
+ cmake_src_configure
}
src_install() {
- cmake-utils_src_install
- rm -r "${ED}usr/share/doc/${PN}"
+ cmake_src_install
+ rm -r "${ED}/usr/share/doc/${PN}"
}
pkg_postinst() {
- gnome2_icon_cache_update
xdg_desktop_database_update
+ xdg_icon_cache_update
xdg_mimeinfo_database_update
use gtk2 && gnome2_query_immodules_gtk2
use gtk3 && gnome2_query_immodules_gtk3
@@ -139,8 +139,8 @@ pkg_postinst() {
}
pkg_postrm() {
- gnome2_icon_cache_update
xdg_desktop_database_update
+ xdg_icon_cache_update
xdg_mimeinfo_database_update
use gtk2 && gnome2_query_immodules_gtk2
use gtk3 && gnome2_query_immodules_gtk3
diff --git a/app-i18n/fcitx/fcitx-4.9999.ebuild b/app-i18n/fcitx/fcitx-4.9999.ebuild
index 813284c841dc..53d5b963fa21 100644
--- a/app-i18n/fcitx/fcitx-4.9999.ebuild
+++ b/app-i18n/fcitx/fcitx-4.9999.ebuild
@@ -1,18 +1,18 @@
-# Copyright 2003-2019 Gentoo Authors
+# Copyright 2003-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="6"
+EAPI="7"
-inherit cmake-utils gnome2-utils xdg-utils
+inherit cmake gnome2-utils xdg-utils
if [[ "${PV}" =~ (^|\.)9999$ ]]; then
inherit git-r3
- EGIT_REPO_URI="https://gitlab.com/fcitx/fcitx.git"
+ EGIT_REPO_URI="https://github.com/fcitx/fcitx"
fi
DESCRIPTION="Fcitx (Flexible Context-aware Input Tool with eXtension) input method framework"
-HOMEPAGE="https://fcitx-im.org/ https://gitlab.com/fcitx/fcitx"
+HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/fcitx"
if [[ "${PV}" =~ (^|\.)9999$ ]]; then
SRC_URI="https://download.fcitx-im.org/data/pinyin.tar.gz -> fcitx-data-pinyin.tar.gz
https://download.fcitx-im.org/data/table.tar.gz -> fcitx-data-table.tar.gz
@@ -27,10 +27,15 @@ LICENSE="BSD-1 GPL-2+ LGPL-2+ MIT"
SLOT="4"
KEYWORDS=""
IUSE="+X +autostart +cairo debug +enchant gtk2 +gtk3 +introspection lua nls opencc +pango static-libs +table test +xml"
-RESTRICT="!test? ( test )"
REQUIRED_USE="cairo? ( X ) pango? ( cairo )"
+RESTRICT="!test? ( test )"
-RDEPEND="dev-libs/glib:2
+BDEPEND="dev-util/glib-utils
+ kde-frameworks/extra-cmake-modules:5
+ virtual/pkgconfig
+ introspection? ( dev-libs/gobject-introspection )
+ nls? ( sys-devel/gettext )"
+DEPEND="dev-libs/glib:2
sys-apps/dbus
sys-apps/util-linux
virtual/libiconv
@@ -55,18 +60,14 @@ RDEPEND="dev-libs/glib:2
enchant? ( app-text/enchant:0= )
gtk2? ( x11-libs/gtk+:2 )
gtk3? ( x11-libs/gtk+:3 )
- introspection? ( dev-libs/gobject-introspection )
lua? ( dev-lang/lua:= )
nls? ( sys-devel/gettext )
- opencc? ( app-i18n/opencc:= )
+ opencc? ( app-i18n/opencc:0= )
xml? (
app-text/iso-codes
dev-libs/libxml2
)"
-DEPEND="${RDEPEND}
- dev-util/glib-utils
- kde-frameworks/extra-cmake-modules:5
- virtual/pkgconfig"
+RDEPEND="${DEPEND}"
DOCS=(AUTHORS ChangeLog THANKS)
@@ -79,7 +80,7 @@ src_prepare() {
ln -s "${DISTDIR}/fcitx-data-en_dict-20121020.tar.gz" src/module/spell/dict/en_dict-20121020.tar.gz || die
fi
- # https://gitlab.com/fcitx/fcitx/issues/250
+ # https://github.com/fcitx/fcitx/issues/250
sed \
-e "/find_package(XkbFile REQUIRED)/i\\ if(ENABLE_X11)" \
-e "/find_package(XkbFile REQUIRED)/s/^/ /" \
@@ -87,47 +88,46 @@ src_prepare() {
-e "/^find_package(XKeyboardConfig REQUIRED)/,+1d" \
-i CMakeLists.txt
- cmake-utils_src_prepare
- xdg_environment_reset
+ cmake_src_prepare
}
src_configure() {
local mycmakeargs=(
-DLIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)"
-DSYSCONFDIR="${EPREFIX}/etc"
- -DENABLE_CAIRO=$(usex cairo)
- -DENABLE_DEBUG=$(usex debug)
- -DENABLE_ENCHANT=$(usex enchant)
- -DENABLE_GETTEXT=$(usex nls)
- -DENABLE_GIR=$(usex introspection)
- -DENABLE_GTK2_IM_MODULE=$(usex gtk2)
- -DENABLE_GTK3_IM_MODULE=$(usex gtk3)
- -DENABLE_LIBXML2=$(usex xml)
- -DENABLE_LUA=$(usex lua)
- -DENABLE_OPENCC=$(usex opencc)
- -DENABLE_PANGO=$(usex pango)
+ -DENABLE_CAIRO=$(usex cairo ON OFF)
+ -DENABLE_DEBUG=$(usex debug ON OFF)
+ -DENABLE_ENCHANT=$(usex enchant ON OFF)
+ -DENABLE_GETTEXT=$(usex nls ON OFF)
+ -DENABLE_GIR=$(usex introspection ON OFF)
+ -DENABLE_GTK2_IM_MODULE=$(usex gtk2 ON OFF)
+ -DENABLE_GTK3_IM_MODULE=$(usex gtk3 ON OFF)
+ -DENABLE_LIBXML2=$(usex xml ON OFF)
+ -DENABLE_LUA=$(usex lua ON OFF)
+ -DENABLE_OPENCC=$(usex opencc ON OFF)
+ -DENABLE_PANGO=$(usex pango ON OFF)
-DENABLE_QT=OFF
-DENABLE_QT_GUI=OFF
-DENABLE_QT_IM_MODULE=OFF
- -DENABLE_SNOOPER=$(if use gtk2 || use gtk3; then echo yes; else echo no; fi)
- -DENABLE_STATIC=$(usex static-libs)
- -DENABLE_TABLE=$(usex table)
- -DENABLE_TEST=$(usex test)
- -DENABLE_X11=$(usex X)
- -DENABLE_XDGAUTOSTART=$(usex autostart)
+ -DENABLE_SNOOPER=$(if use gtk2 || use gtk3; then echo ON; else echo OFF; fi)
+ -DENABLE_STATIC=$(usex static-libs ON OFF)
+ -DENABLE_TABLE=$(usex table ON OFF)
+ -DENABLE_TEST=$(usex test ON OFF)
+ -DENABLE_X11=$(usex X ON OFF)
+ -DENABLE_XDGAUTOSTART=$(usex autostart ON OFF)
)
- cmake-utils_src_configure
+ cmake_src_configure
}
src_install() {
- cmake-utils_src_install
- rm -r "${ED}usr/share/doc/${PN}"
+ cmake_src_install
+ rm -r "${ED}/usr/share/doc/${PN}"
}
pkg_postinst() {
- gnome2_icon_cache_update
xdg_desktop_database_update
+ xdg_icon_cache_update
xdg_mimeinfo_database_update
use gtk2 && gnome2_query_immodules_gtk2
use gtk3 && gnome2_query_immodules_gtk3
@@ -139,8 +139,8 @@ pkg_postinst() {
}
pkg_postrm() {
- gnome2_icon_cache_update
xdg_desktop_database_update
+ xdg_icon_cache_update
xdg_mimeinfo_database_update
use gtk2 && gnome2_query_immodules_gtk2
use gtk3 && gnome2_query_immodules_gtk3
diff --git a/app-i18n/fcitx/metadata.xml b/app-i18n/fcitx/metadata.xml
index e9e77497feec..d364159f7497 100644
--- a/app-i18n/fcitx/metadata.xml
+++ b/app-i18n/fcitx/metadata.xml
@@ -19,6 +19,6 @@
Install table input methods for Simplified Chinese
- fcitx/fcitx
+ fcitx/fcitx
diff --git a/app-i18n/kcm-fcitx/kcm-fcitx-0.5.5.ebuild b/app-i18n/kcm-fcitx/kcm-fcitx-0.5.5.ebuild
index e9d8466014b5..7204e2277fe5 100644
--- a/app-i18n/kcm-fcitx/kcm-fcitx-0.5.5.ebuild
+++ b/app-i18n/kcm-fcitx/kcm-fcitx-0.5.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 2013-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -8,11 +8,11 @@ inherit cmake-utils
if [[ "${PV}" =~ (^|\.)9999$ ]]; then
inherit git-r3
- EGIT_REPO_URI="https://gitlab.com/fcitx/kcm-fcitx.git"
+ EGIT_REPO_URI="https://github.com/fcitx/kcm-fcitx"
fi
DESCRIPTION="KDE configuration module for Fcitx"
-HOMEPAGE="https://fcitx-im.org/ https://gitlab.com/fcitx/kcm-fcitx"
+HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/kcm-fcitx"
if [[ "${PV}" =~ (^|\.)9999$ ]]; then
SRC_URI=""
else
diff --git a/app-i18n/kcm-fcitx/kcm-fcitx-4.5.9999.ebuild b/app-i18n/kcm-fcitx/kcm-fcitx-4.5.9999.ebuild
index c0dd64f9323d..bed2c38530a0 100644
--- a/app-i18n/kcm-fcitx/kcm-fcitx-4.5.9999.ebuild
+++ b/app-i18n/kcm-fcitx/kcm-fcitx-4.5.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 2013-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -8,11 +8,11 @@ inherit cmake-utils
if [[ "${PV}" =~ (^|\.)9999$ ]]; then
inherit git-r3
- EGIT_REPO_URI="https://gitlab.com/fcitx/kcm-fcitx.git"
+ EGIT_REPO_URI="https://github.com/fcitx/kcm-fcitx"
fi
DESCRIPTION="KDE configuration module for Fcitx"
-HOMEPAGE="https://fcitx-im.org/ https://gitlab.com/fcitx/kcm-fcitx"
+HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/kcm-fcitx"
if [[ "${PV}" =~ (^|\.)9999$ ]]; then
SRC_URI=""
else
diff --git a/app-i18n/kcm-fcitx/metadata.xml b/app-i18n/kcm-fcitx/metadata.xml
index 0b3021abdac5..68e0523550ca 100644
--- a/app-i18n/kcm-fcitx/metadata.xml
+++ b/app-i18n/kcm-fcitx/metadata.xml
@@ -10,6 +10,6 @@
Cjk
- fcitx/kcm-fcitx
+ fcitx/kcm-fcitx
diff --git a/app-i18n/mozc/mozc-2.23.2815.102.ebuild b/app-i18n/mozc/mozc-2.23.2815.102.ebuild
index 8a55204d5db9..828d6b1e8d6e 100644
--- a/app-i18n/mozc/mozc-2.23.2815.102.ebuild
+++ b/app-i18n/mozc/mozc-2.23.2815.102.ebuild
@@ -34,7 +34,7 @@ fi
# japanese-usage-dictionary: BSD-2
LICENSE="BSD BSD-2 ipadic public-domain unicode"
SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
IUSE="debug emacs fcitx4 +gui +handwriting-tegaki handwriting-tomoe ibus renderer test"
REQUIRED_USE="|| ( emacs fcitx4 ibus ) gui? ( ^^ ( handwriting-tegaki handwriting-tomoe ) ) !gui? ( !handwriting-tegaki !handwriting-tomoe )"
RESTRICT="!test? ( test )"
@@ -92,8 +92,8 @@ src_unpack() {
if use fcitx4; then
local EGIT_SUBMODULES=()
- git-r3_fetch https://gitlab.com/fcitx/mozc.git refs/heads/fcitx
- git-r3_checkout https://gitlab.com/fcitx/mozc.git "${WORKDIR}/fcitx-mozc"
+ git-r3_fetch https://github.com/fcitx/mozc refs/heads/fcitx
+ git-r3_checkout https://github.com/fcitx/mozc "${WORKDIR}/fcitx-mozc"
fi
else
unpack ${P}.tar.gz
diff --git a/app-i18n/mozc/mozc-9999.ebuild b/app-i18n/mozc/mozc-9999.ebuild
index e82d56df3360..615bd291481a 100644
--- a/app-i18n/mozc/mozc-9999.ebuild
+++ b/app-i18n/mozc/mozc-9999.ebuild
@@ -92,8 +92,8 @@ src_unpack() {
if use fcitx4; then
local EGIT_SUBMODULES=()
- git-r3_fetch https://gitlab.com/fcitx/mozc.git refs/heads/fcitx
- git-r3_checkout https://gitlab.com/fcitx/mozc.git "${WORKDIR}/fcitx-mozc"
+ git-r3_fetch https://github.com/fcitx/mozc refs/heads/fcitx
+ git-r3_checkout https://github.com/fcitx/mozc "${WORKDIR}/fcitx-mozc"
fi
else
unpack ${P}.tar.gz
diff --git a/app-i18n/tagainijisho/Manifest b/app-i18n/tagainijisho/Manifest
index 73397ef9cbc5..cad34b8297eb 100644
--- a/app-i18n/tagainijisho/Manifest
+++ b/app-i18n/tagainijisho/Manifest
@@ -1,7 +1,6 @@
-DIST JMdict-2020-01-01.gz 19493878 BLAKE2B a797cbabffaafdcc967078ebf91ba27280d9a2ba040021fa605e674246ad3837774b2f17a7f4386cec3a2f53afb742fcd9f0bb6784b2014659d8785d59e321cd SHA512 691077030421e909dc171c217e6951edd48b567bf0821c7b68da7a2fc410e3f55d73db1943a9b99128763655d03e175e431590d869032645ae32d69dae5acdc1
DIST JMdict-2020-04-01.gz 19606278 BLAKE2B aa4f4287dc57ad825df6a8606840d2dd64bf9901cfc546cf25cacda3c838bc0827430bfb948c92183f6f35d356eb97eaf09b743e70740364293dc278168510ba SHA512 ad3907bff000b684af2d78135da0258756757cc715c5827f02a8703e6b9a3f0796fd6e3d24509ec13d84464ec6591e7acb0b9c253724e55a2cb44a564a7e5602
-DIST kanjidic2-2020-01-01.xml.gz 1482692 BLAKE2B f50f45e982842b1fc161551640aa7bb8bc13e858c64576af25101c0bbdcb5d5734ebba86be180434781ba62d37370eae9b53bad7a30eb06bcffb86233f85f3fe SHA512 df0d0827525ff0406b33811f9b0eb24f7ab99288879dc316af8125c24448b9919224d6cc7c20648791dbbe8f29d05d977e77c9316a9aeb69513e29cf2bc40e92
+DIST JMdict-2020-07-01.gz 19735470 BLAKE2B 06126c07516241af6789c3427ebe68ce6da3a5116414f8d1cd5248c18319a4b302ec241499c36b380e3a49f43cac2b381e4130d2bae4a7b100de76724786eadd SHA512 08c3feed364666dfbf87c73ac5da20a7eaa414e7fde274f314b058a6b268cc197b834225aed57cea74f6cdc95f374031c1a87ee9e3023f421ed9f3f1af4ca1d0
DIST kanjidic2-2020-04-01.xml.gz 1482869 BLAKE2B 05a8ed51adaf56023b41d6ac956496fda780d14e55d1947dfdec0647a78d4bcb2f5cab730e729ab42a176bed7de7548276d9d9fd668ca2c6e045296ba0ab4f7a SHA512 87d0562bb5d4ae7153be8d684d1bd9b199039417a76289d783e96e09ea52b6741d923dc2f38500a7b2299c9f4cd0f6c8d7b8b7e00da2f102681387ec858ce852
+DIST kanjidic2-2020-07-01.xml.gz 1483010 BLAKE2B 7adc1d09bcddccfa549de92ff996c4d1e4ee4283ad845b50f5a453dd7f4051249eeb8fb3bd574b8c95f92a93ce7197f40226fe9046f7ab871f43f086c753166f SHA512 078ea54da499967b03c6eee75d629c9aced8c48381e8b6d1adf2d6440c81a26da8bc532f8db8d388588a74cbdb851bcb92846d1532b882f5ab9d65d653deeb3e
DIST kanjivg-20160426.xml.gz 3587660 BLAKE2B c85291f3671f0980186e8deb296cfa743322df438d6f09fd69a4f5a30c3db6f097d6ff0a817b88c5c9a2c8d4a40c90b31c0a54cb71d681849b557ee364707c48 SHA512 1d35a8cc5d4947f6bedfc71a2f08e2d1fda832d7a02588c00953e1746812b0e51d4d1c39dff49999b4f65ec850788359f6e0d1465f0e688b1bf753c4c67b3c54
-DIST tagainijisho-1.2.0_pre20191230120610.tar.gz 3635034 BLAKE2B 4f86febae1dfe1de236668bd405294c1e11510b8a942abfcb378d0e46c38cc179d16f5365dbb8322c7ad47cc333a816ce883af5993e0be90f11a43f2710cd45d SHA512 4fa93b7a51415c57f1d81748f15f23e90e4d9a1f91c3f0d96447d08a5bf1bbfc6bc2dbd4083e0b9328e32795f01de94bae834b4e7ff1830cfbe0ec215f20d7f8
DIST tagainijisho-1.2.0_pre20200118132551.tar.gz 3635265 BLAKE2B f8f831f698bf0ca56c57e8343adee92d3b42842c95fb971c9d8696eaf660ce458d8fd2108ab4568463bed6711c5295d27efc34f2fab512c3d0bc2a11a4f76c1b SHA512 14d6fc5ce891437159ca2b3db53c776420a6d4e305f6753c7ccf5ce773d43fa31f875ee9582c9db1fe05364b18772cec43dd046a6492b6eb45c12b62f7d60407
diff --git a/app-i18n/tagainijisho/tagainijisho-1.2.0_pre20191230120610_p20200101_p20200101.ebuild b/app-i18n/tagainijisho/tagainijisho-1.2.0_pre20200118132551_p20200701_p20200701.ebuild
similarity index 98%
rename from app-i18n/tagainijisho/tagainijisho-1.2.0_pre20191230120610_p20200101_p20200101.ebuild
rename to app-i18n/tagainijisho/tagainijisho-1.2.0_pre20200118132551_p20200701_p20200701.ebuild
index d79b325e4253..9d1700175eb0 100644
--- a/app-i18n/tagainijisho/tagainijisho-1.2.0_pre20191230120610_p20200101_p20200101.ebuild
+++ b/app-i18n/tagainijisho/tagainijisho-1.2.0_pre20200118132551_p20200701_p20200701.ebuild
@@ -12,7 +12,7 @@ if [[ "${PV}" == 9999 ]]; then
elif [[ "${PV}" == *_pre* ]]; then
inherit vcs-snapshot
- TAGAINIJISHO_GIT_REVISION="1257df3934415ed6f30990c34b725d89b2ffbb8b"
+ TAGAINIJISHO_GIT_REVISION="2d2a3182a70a22bf27b0be42a3e896283513761e"
fi
if [[ "${PV}" != 9999 ]]; then
TAGAINIJISHO_VERSION="${PV%_p*_p*}"
diff --git a/app-i18n/tegaki-zinnia-japanese/tegaki-zinnia-japanese-0.3.ebuild b/app-i18n/tegaki-zinnia-japanese/tegaki-zinnia-japanese-0.3.ebuild
index e760325c474d..b2edab87d288 100644
--- a/app-i18n/tegaki-zinnia-japanese/tegaki-zinnia-japanese-0.3.ebuild
+++ b/app-i18n/tegaki-zinnia-japanese/tegaki-zinnia-japanese-0.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 2013-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -9,7 +9,7 @@ SRC_URI="http://www.tegaki.org/releases/${PV}/models/${P}.zip"
LICENSE="LGPL-2"
SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
IUSE=""
DEPEND="app-arch/unzip"
diff --git a/app-i18n/zinnia-tomoe/zinnia-tomoe-0.6.0_p20080911.ebuild b/app-i18n/zinnia-tomoe/zinnia-tomoe-0.6.0_p20080911.ebuild
index 87c842d657b8..59e943d8c1f0 100644
--- a/app-i18n/zinnia-tomoe/zinnia-tomoe-0.6.0_p20080911.ebuild
+++ b/app-i18n/zinnia-tomoe/zinnia-tomoe-0.6.0_p20080911.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 2013-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/zinnia/${MY_P}.tar.bz2"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
IUSE=""
DEPEND="app-i18n/zinnia"
diff --git a/app-i18n/zinnia/zinnia-0.06-r3.ebuild b/app-i18n/zinnia/zinnia-0.06-r3.ebuild
index 7133d88b29bd..70d37abf609e 100644
--- a/app-i18n/zinnia/zinnia-0.06-r3.ebuild
+++ b/app-i18n/zinnia/zinnia-0.06-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 2010-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/zinnia/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
IUSE="perl static-libs"
PATCHES=(
diff --git a/app-metrics/Manifest.gz b/app-metrics/Manifest.gz
index f35eb101333e..7cfada3843ec 100644
Binary files a/app-metrics/Manifest.gz and b/app-metrics/Manifest.gz differ
diff --git a/app-metrics/bind_exporter/Manifest b/app-metrics/bind_exporter/Manifest
index 11a260628b3c..8a39f9d61057 100644
--- a/app-metrics/bind_exporter/Manifest
+++ b/app-metrics/bind_exporter/Manifest
@@ -1,2 +1 @@
-DIST bind_exporter-0.2.0_p20190226.tar.gz 874497 BLAKE2B ce04a168be6844d43ed2c358aa6469d5dbae1730825e4c3c038805f4bbf071bfae2936a6a5341832939e3ed249e5d484f2ca0908ac0e717cd2b5ced496c44a49 SHA512 95a8ae6f7c6470345d5a5f7e4e36eae282e5ca74393dd4372342f44732b54a6cc977ae037d6d16ae4ce6a9ac526b2e01721f5468a6469c30ae60ca59dfec8d5a
DIST bind_exporter-0.3.0.tar.gz 1796507 BLAKE2B a79b9e0d159d3deb83f1a040325ad34bc0d4ae50b6af205dce4ebf8d7152ccbd4b7d46fda40bf76db953996ddf4237ca13058250478b08cca51b8bea08ccc31b SHA512 762901a63a9493f852e5514429f55b10400931f0a77d2e11c7565e93e1ff759eb30d3bbc9278451bb9df358a983aa099bd55cf57241cf36187d2789c89a3852d
diff --git a/app-metrics/bind_exporter/bind_exporter-0.2.0_p20190226.ebuild b/app-metrics/bind_exporter/bind_exporter-0.2.0_p20190226.ebuild
deleted file mode 100644
index e9417f245b26..000000000000
--- a/app-metrics/bind_exporter/bind_exporter-0.2.0_p20190226.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit user golang-build golang-vcs-snapshot
-
-EGO_PN="github.com/digitalocean/bind_exporter"
-EXPORTER_COMMIT="9289b40af62a455ebd587ed4701dd543f4cc5877"
-ARCHIVE_URI="https://${EGO_PN}/archive/${EXPORTER_COMMIT}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Prometheus exporter for BIND"
-HOMEPAGE="https://github.com/digitalocean/bind_exporter"
-SRC_URI="${ARCHIVE_URI}"
-LICENSE="Apache-2.0 BSD MIT"
-SLOT="0"
-IUSE=""
-
-DEPEND="dev-util/promu"
-
-pkg_setup() {
- enewgroup ${PN}
- enewuser ${PN} -1 -1 -1 ${PN}
-}
-
-src_prepare() {
- default
- sed -i -e "/-s$/d" -e "s/{{.Revision}}/${EXPORTER_COMMIT}/" src/${EGO_PN}/.promu.yml || die
-}
-
-src_compile() {
- pushd src/${EGO_PN} || die
- mkdir -p bin || die
- GOPATH="${S}" promu build -v --prefix bin || die
- popd || die
-}
-
-src_install() {
- pushd src/${EGO_PN} || die
- dobin bin/${PN}
- dodoc {README,CHANGELOG}.md
- popd || die
- keepdir /var/log/${PN}
- fowners ${PN}:${PN} /var/log/${PN}
- newinitd "${FILESDIR}"/${PN}.initd ${PN}
- newconfd "${FILESDIR}"/${PN}.confd ${PN}
-}
-
-pkg_postinst() {
- elog "Make sure BIND was built with libxml2 support. You can check with the"
- elog "following command: named -V | grep libxml2."
- elog "Configure BIND to open a statistics channel. It's recommended to run"
- elog "the bind_exporter next to BIND, so it's only necessary to open a port"
- elog "locally."
- elog ""
- elog "statistics-channels {"
- elog "inet 127.0.0.1 port 8053 allow { 127.0.0.1; };"
- elog "};"
-}
diff --git a/app-metrics/blackbox_exporter/Manifest b/app-metrics/blackbox_exporter/Manifest
index 05c86972c8e3..774f4cb710b1 100644
--- a/app-metrics/blackbox_exporter/Manifest
+++ b/app-metrics/blackbox_exporter/Manifest
@@ -1,2 +1,3 @@
DIST blackbox_exporter-0.15.1.tar.gz 2120525 BLAKE2B c21a621dce663ccbc184c87b66e894ddc6a94bee9bbd2b9fb432a4d349afb35410f07ad150e946c5f8eb9ec8e6e7f2e6d4cbcafe118e8b2efe34902fbd0bf38a SHA512 2c7d0989bc70982a0fd528c7c6ed5ec6686f5e93db0a90db2b06e4e578503443da0750aaa2d6a01ae4fcd4c722eef522c0e06b019aa59a2eb837f233e317d4e2
DIST blackbox_exporter-0.16.0.tar.gz 2121367 BLAKE2B 92c55dbc3f47d7a2d8c37ad116857dd1d7314a6684d9f228039b09cc086edf72bdf5e0c2cc770ce45d687c45a38f6de72e612c0491ec66f836bed28b75b2e5a9 SHA512 85103b62e345ab5d59626e658047ac75649f9ef991c9bbaff32b95ea75ec2da2bf916573e664520766158805c6cf24163f2850c885a594d32b4f9c4c9dbed1a8
+DIST blackbox_exporter-0.17.0.tar.gz 2615179 BLAKE2B 3746ceef8ffdfe017921a78873c09f196d82c3874aa24a0795b56d8858c355f2a4f9f557c65708037358fdbe8445a680c56a3725e7af4d634ef9396419bb4221 SHA512 9e79d083c5c8caebbc19b6feef04dd189bc91a72dcb3aa946a96543fbe28ae2c49cafeed3f42618747661421897adc17988ffc6cf0d7054cf0a385b85eeafc61
diff --git a/app-metrics/blackbox_exporter/blackbox_exporter-0.17.0.ebuild b/app-metrics/blackbox_exporter/blackbox_exporter-0.17.0.ebuild
new file mode 100644
index 000000000000..9d7d5ee5b741
--- /dev/null
+++ b/app-metrics/blackbox_exporter/blackbox_exporter-0.17.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit fcaps go-module user
+
+EGO_PN=github.com/prometheus/blackbox_exporter
+MY_PV="v${PV/_rc/-rc.}"
+GIT_COMMIT=1bc7680
+
+DESCRIPTION="Prometheus exporter for blackbox probing via HTTP, HTTPS, DNS, TCP and ICMP"
+HOMEPAGE="https://github.com/prometheus/blackbox_exporter"
+SRC_URI="https://github.com/prometheus/blackbox_exporter/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0 BSD BSD-2 MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+BDEPEND="dev-util/promu"
+
+FILECAPS=(
+ cap_net_raw usr/bin/blackbox_exporter
+)
+
+pkg_setup() {
+ enewgroup ${PN}
+ enewuser ${PN} -1 -1 -1 ${PN}
+}
+
+src_prepare() {
+ default
+ sed -i -e "s/{{.Revision}}/${GIT_COMMIT}/" .promu.yml || die
+}
+
+src_compile() {
+ mkdir -p bin || die
+ promu build -v --prefix bin || die
+}
+
+src_install() {
+ dobin bin/*
+ dodoc {README,CONFIGURATION}.md blackbox.yml
+ insinto /etc/blackbox_exporter
+ newins example.yml blackbox.yml.example
+ keepdir /var/lib/blackbox_exporter /var/log/blackbox_exporter
+ fowners ${PN}:${PN} /var/lib/blackbox_exporter /var/log/blackbox_exporter
+ newinitd "${FILESDIR}"/${PN}.initd ${PN}
+ newconfd "${FILESDIR}"/${PN}.confd ${PN}
+ insinto /etc/logrotate.d
+ newins "${FILESDIR}/${PN}.logrotated" "${PN}"
+}
diff --git a/app-metrics/github-exporter/Manifest b/app-metrics/github-exporter/Manifest
index 369d2e1e9b54..312c14cedde2 100644
--- a/app-metrics/github-exporter/Manifest
+++ b/app-metrics/github-exporter/Manifest
@@ -1,4 +1,42 @@
DIST github-exporter-04.tar.gz 7023 BLAKE2B a2502fab29f7d987e7fe02a739d9d3bcc34376315581830033dc99d9c16be0bca52a30b8f491682de34ded4732c9216a05e8bfc1d2ac6510a22bd752a50bb5b9 SHA512 4837d78d058e8adb110ced899a9d136eed86aa3facf7258a6d7b392a3a61aa827662e63f8bd64b0ca44e6ed78518a6ae669068018ffc18d3bb42d19f4fb364be
+DIST github-exporter-1.0.1.tar.gz 20538 BLAKE2B 059802e5e735838f25f0fb56482c8d80c2e0325a7b10ba954af9ea4e39cea1826540e267db9b3fbc6ee4eb181185fd6b34128d09202faf43604fd1e3431bdafc SHA512 8f984cc766d8fc40cb230d88f9aac15563713333d4e6bb98e882b5fbf79cd15c1664cfdc09ccb242d11d0de8a29232124f1a2ab6859cdcb7bd84e862bfb56423
+DIST github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20180321164747-3a771d992973.mod 31 BLAKE2B f69b0989e51b0b649f81b044169fe4309f130eba5bcc6ff33aa9666b1b754aa0e524b8c7a627a91000ccc4f93bf93cdee3e97bd3b2184b050878bc3f413f0c72 SHA512 f21fd002853e4435421f8396e6be016f65be1537815c60d23940caf26e3f14dd6f2caac802cb64cd586b1b1f1220b2727de347b3d1816b8e741f68d87ebcf03f
+DIST github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20180321164747-3a771d992973.zip 15013 BLAKE2B daecbcbb12a60a1423c4f419db44a0d63108fe622cf843593abb16fd75dcea703b3cf56f1c13433959eccbfb2a9bd5640f837f4be3296220366438dd7ed04f86 SHA512 44ccb3d6134742a80ac15830613c169d1b0d43e6ce40c2f2fdea07203bec134e1ba80dc57c6d14a007014ea141dca311b3ebe61b12d2181311665a9ffe83ca39
+DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod 34 BLAKE2B 7e09c2779bf7a84a9271e31522ebbe600a1c11b107d651d91f58c8373e4336332a3a881f3e12b382543d75f20398af66085fcb3e780eed341e870e9c30f29267 SHA512 5e079462f7e0dff0efda71f580aa185700cfa936b718a19d0e2a8c63212e47a07022dca0c282832d48e5165aae8e82aeeeb2ac3664268f1148fc772010fb860e
+DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod 34 BLAKE2B 7e09c2779bf7a84a9271e31522ebbe600a1c11b107d651d91f58c8373e4336332a3a881f3e12b382543d75f20398af66085fcb3e780eed341e870e9c30f29267 SHA512 5e079462f7e0dff0efda71f580aa185700cfa936b718a19d0e2a8c63212e47a07022dca0c282832d48e5165aae8e82aeeeb2ac3664268f1148fc772010fb860e
+DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip 60320 BLAKE2B 86bdbc333e5c23ccf4f805945ca9f2aecc5c242d2ae824d20127eceaa2bf7bbab239ff2799572a2c8fa206166a36e97d5eccc8fc5021743d8ad32f39cd53b9eb SHA512 7b4e4df2fea731e23e05437f26f24e32b2e99028d685b72e3a726c1cb616ada4a77ca4fb9db4a6fae48178cc5172e724b74499bc776d63a9110cb97377d5edeb
+DIST github.com%2Ffatih%2Fstructs%2F@v%2Fv1.1.0.mod 32 BLAKE2B a73ae1e577fbb84fd72de422c367c1003355c117a9660cadbb5d6d52fcd0c102fa3b22c7c7dfb6e149dc14ddcb9b5fef847fb2a7b9379a35405c7bd9d83ff1b5 SHA512 2ef8ab60b4320b9358614a28a02b4207f3986c4a06798c3e253a79bfb63692dfb1765476e9d154e15f9d5e30983609c98b6ee39ae910c678a3773fddca208cee
+DIST github.com%2Ffatih%2Fstructs%2F@v%2Fv1.1.0.zip 17890 BLAKE2B 663ee535dd3ddf1a89ae274a400bb744d6e22689a212b58e6f6a3ae45890be76761fd4cd08d1836ffa3b8fc290249a408c798001b343104d0f06d7e2abede6a2 SHA512 e42c37f71719ed662a4b3efc9c03725a3569ce04849d6bc845bb7967228b0e648d6b2cdf73ea18430e54df85486b2a3819aca6170538eca4401ac3ea4a512d3c
+DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.mod 34 BLAKE2B a4239cba934b6e80714b93d47e88f22ad28ce41d1d984c4261cc3f5f3b857fb28785223fa911b258e2665be2a9d24ffbd925e9e0f374452a2aacd712ad9d5f75 SHA512 e059a34363bb826bbcb8981adbfc10da90e04b86dc5376ab20bdfe1fab135953cff41ef1daa116aff10e9f3e6503168f6baf902f09aa0e8cd9a0da96b932f4b6
+DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.zip 482403 BLAKE2B 47db66e9c8187c20b27b9aeb8584f0f2289084103ccda25406eb30059147c3bcb867c76d145c4cab7eae801ed4cf76a63efe23f091e05c9206fcadc3358a02f6 SHA512 d102d00618f077f7d677eea9f0d4aff600e4b95caaca6ae6021355e64ed0a8fe418fd731370baa968f6fd338e377b5d3a2077b0b8a1ee399f992b8a7717cf77f
+DIST github.com%2Finfinityworks%2Fgo-common%2F@v%2Fv0.0.0-20170820165359-7f20a140fd37.mod 42 BLAKE2B 64d26b1f81939711e8f2bca3008ecba725654d555924bedcfc338525482c660ea0e4e320227f7ea11b4c6208b5c2ddf0daba3cb3bcfbd636bd22147f0a04c65e SHA512 d646ee87f12c8b3cb17da15a6b7297862955422015b522f9af1b3b06d11bf6c36116a041a172088bffc92370005352105a2ed818e63ffc7420a0dd9b248de122
+DIST github.com%2Finfinityworks%2Fgo-common%2F@v%2Fv0.0.0-20170820165359-7f20a140fd37.zip 6182 BLAKE2B 61d9dab2f8646634e46e8f52c94cc94f204cef4f475beda1e75c9c647ec0e05e73cafe7d667cd70d8b2725965c2dcae074c111c359a6471fe70a4a724ae0cd0f SHA512 c27fe7b9adf139719cf7fd3559a1f12a764e0904d894a2863d050bc37db8bf353d09e72577be95665de06b6397ebd5f520f3e9b9d0d3daf05eb73fcb3eef5ef9
+DIST github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.mod 58 BLAKE2B 4cf48282c28d2b8237fe9ff852ad25d102cce038fbd1852a1938bcf69c895df05dfdef6e533b3c0b4da28103eb5e3a9561f802414ccdd99b2d3ec2e2db0807ee SHA512 fe33ca4de6588b95f0155458b8b6daab218553b58de5dac220efe54019dfab085838cc6a22012a106fa36a6094447f744825cad04aaf0b158fce5aa676048fe5
+DIST github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.zip 3567 BLAKE2B 80b7bf217df9367160180d44c1fab6a9f10154bb9a6455538860158a08c5bf8c794fff973b899b1376e4e65764a9aa0d6b8b162a6d9ebe1adb1368b9a2a42786 SHA512 27910ae03fc9fbf573ac31454635c43bfd771d2a91325eca544f7be0e24b43c2798ed8e74b4c31e8c20c1a9cd266b835017aea3a3e24c2ecb43a14a6143af8e1
+DIST github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.mod 56 BLAKE2B 50d2d6dc9c1ee92d629af8c9aae9fe5f70a0c6fe270a95a8232cee3c50132ef90c68218ac64a3b5b72d94e23ecbea5f567fef39a81be3d4585bae3f4f5348545 SHA512 5235188477921a263176fefaffccdaca4bf8175a2e248356a06596e37fa868400203172c7fe9fb80d0a65d335d23d80edefd242657de0eb83d9360589e063bba
+DIST github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.zip 44378 BLAKE2B 15ccda2b94bb024656859fb8a6968782b9a1bffb786b0b1ed69a3284b01f4a2100b3f3c46b6ebcb8f7febedb5bd4f6762fe333b7d4f1d14c700f8fce60843352 SHA512 e9349ee2a7d5e5b129ec6a1c0507854aebca82cf9ac2d0a681cac2f4630ea35551ede48e1931494362232a83dc9f26b6b4162c6114e0176084c50101b1da46b0
+DIST github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod 37 BLAKE2B 94636062c94f8ff68cdcab7593a3acae7b9ffff616cad7b1d5c9cd147a4a1042d33666cbeed6fd816d6793113abfb595183097dcc46de7a3dfadc1423ed43e79 SHA512 c3d5c48cdb8ba6af7071a07cfede06e0ab67e3726d9de592a952fad40167dcbdd9621dc2c4df1bd3c28eb99d70b1b6d8d812441237c35bf492e5b7f07bd33902
+DIST github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip 12433 BLAKE2B 0c911c9d173080abd8edbbab1f47222343801d8eeae36b4add24773e3282fc2a39283fdf519a3d4483e39cdb7d9509b8570d151f46841ac1a616f312dc4cb0ba SHA512 3b85697185ba85cdef6202444ab6cabeabfad8a03d66b3839a852586b1f91ddae7897a57c8c138d5647022aa44906c7ef3c5339d520f90eeea0742a935da8cf2
+DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.2.mod 540 BLAKE2B 4d43a0901fa46da74e62fa22f61dfebdf6468f2766bd43dfd487d7a5434f961d181ecf26015ff9134e8d3f9c2dc03da6abbcd0030348facda3a499af9a04665d SHA512 9add81238044589ae2cf38042b963953d507e40945118fd62ac1cbf41bde1b001a69423c50b7045b721488b3d53489b4ce3c544b68f6c4e31e340d2581f7c8a6
+DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.2.zip 193855 BLAKE2B 992f1dd35201c2f388e3fb03bc51a592a4b36db69a27b52d9e840a95d920cfdffcb2dce6fe2b8fc30a718d87b07383df2ce8e97a4a2a40d4f2f0ceec35c1d4a7 SHA512 79cebb06e6a958cded21781e651e1afd406c7502a945f2c97c9b910d0621a46a7a84f8fc8fbe7c21547146ec407a8f475eb0e711f37273e28f2fa5b3062ad19d
+DIST github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20180712105110-5c3871d89910.mod 42 BLAKE2B 5519896b44b7bc3089a8965dc61aae63745c64ba1a390d3fff1202be7f8dd34f59862c04b49e377d6616a93a0341662becce65d431d445703a160ba49eda208b SHA512 c84dfe43954b19c1e4ac5ff8738e79db469f3bc1dc55e69b12503d0a5cf125cc74f4797ddbfe64b2a1bd1e2940575c32678671d51f67161c4f5b53b2a85ac46a
+DIST github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20180712105110-5c3871d89910.zip 68325 BLAKE2B 9b783cb98fd4f1ceb158d8a72ffdc7d0c232a8a9740de221b4321b2c7e240d98bb5f2bfca74222c6a7796368d48b1d3e315229a9d2c0436d5590bc200be31817 SHA512 25290d540c185fa2010b06596a70b6d06d4ae14fd92b4e5596b48074e4e5ef5ec6b990c8d0bc39cb44f0c2a83a0a1ac4415f86ea4e3fb69970bb2496f148d0c9
+DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.0.0-20181126121408-4724e9255275.mod 36 BLAKE2B 39120b6af83d45857c990115ff52d8828278a9ce158b01621d8dcc517c23ff139532a2c2e53ec97616f0c65a2e0db3ede7c5fe59eb33be277e2c60650362b232 SHA512 1b262da0100655c3a56c0e551866491b81d2b88fd5fed9cc43a57bce3634c88c82c798ed1a823237011f6be68b5f0e1fe8284526cd68204851de30a44fc34fbf
+DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.0.0-20181126121408-4724e9255275.zip 132691 BLAKE2B 9bfe80a4f61a6b7a2e0dbd235e1a05ca032982ef14a9989c415ad143c84c42cdcace926a5683f2273b84c5babe8c0e5b95c680805324217a7afa18b3c82b0bec SHA512 4459c32fb8b90650c6fca37477e2ec49c5e3eb68a8151c88099017fd2c9c13d2a066bef75061a47ed27398e96aa40a6cbe2524146ad1f315d94d7359d0a7ba74
+DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181204211112-1dc9a6cbc91a.mod 36 BLAKE2B 3c6acbd1022261065a321c6f3cfa2946b58011f45fae9b98761397eb7e5e0984dae4ea34c4f837f798ab29ca8e26ed3f07771be10e500a99ce7e5e9f4c401b5c SHA512 05f032eba0c264b186936c2b9831624a01999972d4f1bba6aa15c452407eb10d402f1ac674eb41e2d24fa66e85ae2e56efd2326fc4ecc741169b9908d7935335
+DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181204211112-1dc9a6cbc91a.zip 103337 BLAKE2B 0bbcc8096a261b4697bf5cb23b3141a885a5d987db3187d776860206ee796c41e78210e5e36942fdee76862033d629f2e2fbe72522a50c846aef973c22ff6d74 SHA512 132a26cbef951377102cff398932b442920500d12e80ad50bbe05ced623d1618e0d56d95ec5fa36354f4295ef9757e4750fe91a25add4f2175d12e6245269425
+DIST github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.2.mod 337 BLAKE2B 94ce7d2e23281061ee0ac0b1be2f8c3439c86e62c56ecf556a81123d57d819b1e0e95ec3b7c6425f13abaaa1683942b7a3d0bb8ad489577284b2a6063c777b37 SHA512 38a79599dbd09661614d54fc92149fe581575b7833e89dd73a3f754fafa4bc549c6c9078753ab8e2a85ce2be3ab81e528e29b6d19e7c329e0cb0f74896d2e418
+DIST github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.2.zip 58627 BLAKE2B f4276f0095188324c06e4412303ac19e3006b18823985e26ca49b2de54ef58cade626b3d2439f5f2a29c47618420b890951f94e5a4801dbaad4c3294f6555a4e SHA512 3bf6be07dd9a97bde938309857e16dc425587c100e35b2acd1a6f11a9ac196238b0844abbaded43fcc01be0664efa15b64f159f6259322043e3046e7d361dc20
+DIST github.com%2Fsteinfletcher%2Fapitest%2F@v%2Fv1.3.8.mod 84 BLAKE2B 2590cb607a9e6ef1f6c95c7b0c542a761f3c648cf772e4b646736a6ab446ef9545ec76a6e5823ed1d38ff592ec062c606da48132e332a616b7d4e654976958df SHA512 994fd16b71bc9661c9758dcf77f2ddbdd422c3fb2421db59285d9d5dbebb34eef1e27f96c004058595e9acc8ddc36feeb99f435b902d98dc1a48ec49fb4ff731
+DIST github.com%2Fsteinfletcher%2Fapitest%2F@v%2Fv1.3.8.zip 602774 BLAKE2B 6f1d90675cd0b4630ddb158bca32e1e86cb6a7b01b46d7c403c5c15f02c26573d4bc80892a8927ecfa704a35dbc4611d5ae32929a5b773111da444b437e01589 SHA512 c4040d87ce832c3d6bc52828d98862e5ab75c7c5a9fb8dadd614c9e07eafbc0c96ac372f51cb8fb809e35f1ee10da917382aabe9fa5bbaa5de3f3a4788c2393a
+DIST github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod 32 BLAKE2B d698910da1ef00a70a1673b8c74105de195020ccd95d1e70c5dd1e1615210886ff9acbc9cfd03f46e99f5223b60b04695b8d362b9e0edd4e485480f802bd229a SHA512 4e366e5a60559a8863cb2a50280deb307d8bf885ca5440cce1b49a084b4cc4583b3481240125f35f161226592a43f2c0a426152f117d79b68c92c72a93f751d5
+DIST github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.mod 32 BLAKE2B d698910da1ef00a70a1673b8c74105de195020ccd95d1e70c5dd1e1615210886ff9acbc9cfd03f46e99f5223b60b04695b8d362b9e0edd4e485480f802bd229a SHA512 4e366e5a60559a8863cb2a50280deb307d8bf885ca5440cce1b49a084b4cc4583b3481240125f35f161226592a43f2c0a426152f117d79b68c92c72a93f751d5
+DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.mod 35 BLAKE2B 0357260904c9ba41892132c7e07d2add9b10ce4a09e8db4966219d1f515f917581e2afa0987094c90759634bc2aeb66e758074e023ff331a8337f5090c0102f6 SHA512 5b7ce867497852e4918b8cde5f75ecf2f24b9c95ad112478ac132322e904243f1cea3d16f5731646efb669256dbefc129ac70a499c8b1d25403a14c7e4fad10b
+DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.zip 81710 BLAKE2B 245149718759e71d8c882731fb51813924beee131aa16c9d6ea83a72738721011bceee80411d88dedf91653219d3c8ae33f66349e2d373b08931c28aa2e16d8d SHA512 b2cb918d623065d391a318f4f5c532aec12635662d176a441c30cbe3b042b60be848c7eb685679c5258e661f5780ebc3db3f9dbbb8a37e157da214b4f57fde88
+DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod 154 BLAKE2B 60cd7801e7cd33746305cd636b048b25a86270ec3b29a21c3c078c7e95b769bce7e80c2c7c5474113786bd788c7f88f3719e34f02141038e0d161b36e32f39b9 SHA512 bb808fad059f5abd0171e4bdc724411eff2c7e8d303a4ffb3608a00e21bb3cfafe9e83b4b4e9bccd42c9a4331f67ddc6043e3dd5eaa9a122c86626eed43a8383
+DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.zip 83537 BLAKE2B 6d6de57cc5e393aaef1cdc7e2140143eb7fa324bb2ea3b9f63bfe1e8652c02d24eb441fc3b435c6b287f165c5540a008a7c21ab4070d8bc77c77e6fb608f7e46 SHA512 c5cd06f825bbfdcf2ae58ea21edbeea03c110de3fc20fcf69db07aae26c9ae67a8ac57a9ffedec9b3b4f1f3b016089935049d75d92a9a03e45ce6345b4c9c611
+DIST github.com%2Ftomnomnom%2Flinkheader%2F@v%2Fv0.0.0-20180905144013-02ca5825eb80.mod 39 BLAKE2B 840f3d7d2793049b8fa6ac94032a8267e45d4af8ed76c41a359fbd08dac3ca559ca1d5d18e763a64ec5e99634dec94a8e29ab350a32fda00153abef5d2d5fecc SHA512 4e89a196af72b72d06b5a51a0d29d45e10dced6e30f42ad6cc76349b36dd7fc80db3877ee8696eb5ac7fad64ab6cfda4baa2aec863d57f36bae7a598ae5689e1
+DIST github.com%2Ftomnomnom%2Flinkheader%2F@v%2Fv0.0.0-20180905144013-02ca5825eb80.zip 7607 BLAKE2B b13f1ca85260e2eae04a93ce489bab3a40677b1eb0605868d11ae0d0345c51ba8149a72838dc58e393ea29584df88cc5d25dfad8387000e429687880e2545044 SHA512 88653226421d4ba5d8c12c79542e1e3dee0394929b00330f3a5827779c263aac3a87820bc3877c660946d0127861fa7c7dbd436ddcd7d2c0c7b814c4c9eef22d
DIST github.com-beorn7-perks-3a771d9.tar.gz 10800 BLAKE2B 5487155a4d010af70b6ea2625d10ae03b6642507902d7dc168edb5d7cf0efa1777b248d0df34ed1a2564950b12613256c1c6ce1d8c9723cc34977ed883b21c8d SHA512 c6aa5df262ab607c0a5f64372fc2fec1ddda9e5624e9d9a22cdd1bc11822c99736d88bdf5e3fc6050217b5084548417cb2926c3940e156da9397d828d59ce277
DIST github.com-fatih-structs-878a968.tar.gz 14629 BLAKE2B 673a25a39cab677bd275ccaf14675a1fa7847d1a089ceaa20cc981ca01a1cbba597e94467e7accdd1a4319acd44c5d7bd0f6e2de0eebd7fe2f43cc6cc9a94271 SHA512 3c00f10e17e6dd818422a6b8e1ef5454b3dd9cc78da22c56ec3c474bd7a590bb3dd56e803c01882b52ce12a6a4deda7935bbb786c3cebc2e60b379337a884752
DIST github.com-golang-crypto-ff983b9.tar.gz 1645106 BLAKE2B 3d7271479ef812761a02c1d20429800cd29706e802a8ccf57e916bdb8befc87a9b1b1a88d42adb764a32fa5f4c5f5a5e434af63812a5bcd3de625658792a49a3 SHA512 19746e84901c0749da544ba02c74c8ccabfee5f186a0d00509e54f20c191da9ea56844de988265f072af1fae671d78d741a44f782b8c1704c9da0441436c2122
@@ -11,3 +49,8 @@ DIST github.com-prometheus-client_model-f287a10.tar.gz 57203 BLAKE2B 2d56b90ced9
DIST github.com-prometheus-common-2998b13.tar.gz 87368 BLAKE2B fc6c6e197d4cc61afefa9fb8e3a8d6b36ab029f62e3cf9adf8359e4885554f94427f17218d45c90c9d7f4a6985b2e4143a4d304d39f806bd70d2c6f05de29bc2 SHA512 b2095da96596fc500ece6b331cda2558f8c813720853f2489aee3dec65de95eb13f7b0853e3812433fdc040f16990d2f05b2a6b8b41275210c504ff333ca625d
DIST github.com-prometheus-procfs-b1a0a9a.tar.gz 61720 BLAKE2B 2f9b25506527aaf6e1bf560a1b680b958d1281acbaa2bb896bfea50b5b7de8992d10e8e812f8ae449ab67145c88179c15afe1f719851d1717b28963071088082 SHA512 5938b4a8fa9a5ee32be995fed0d0e6b26941765470aca4eda63a7c42db457e83da43fde2f33b2d4ded3545e5643f607ec7060406b0a1b15e64cc732bb2badd4a
DIST github.com-sirupsen-logrus-eef6b76.tar.gz 38613 BLAKE2B 32ff02d46dcdf08b273c406323236b0750433bda16a5072e4161b166863f5a062817166dc871e15fb169bfdb95ff45f167bc30b2e259294e0a51111b8a78afd3 SHA512 e7ca358b72bebbf663af426a110cd8da22bf33e2ec14fb7337af75a1cdd4aecb371436b8cc83f04a52a52ced56c02a762b12c2fe5ae5e64d7aee261a7254b14e
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181201002055-351d144fa1fc.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
+DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181108010431-42b317875d0f.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
+DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181108010431-42b317875d0f.zip 24743 BLAKE2B 916fbb71a738b80833a6e9ab44ac53568d4bf6e9400b8a63197cfcc96488c60b43d602664366fd82fb686bc9b5ebf80d2d6fda3cb791a83042c03d965ab7efb4 SHA512 cbc53e045f3837deea920bc08867a45c5ef3e0afb99f7f5179653790d36a541f4e96e5f9e3e36560aff2b38ebde5a5004992c09a8e2722d44cfaf81d654de5b4
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190422165155-953cdadca894.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190422165155-953cdadca894.zip 1699831 BLAKE2B 66aec13709b2599fcb618806b62a9fe8a9678d320b11df7eee7c217c2eeb7f009d26385895a5165f398ae89051c065d745865f32e6d91e18828d3ac610968f5b SHA512 f8e187d488cd1e6721ccf6f3139c1e09f65e82973f3f08ccad2e84d37a5f83783fbbfe40ab7e270b8f7eabe802c3eb28aa2f291f0296651ffbe752a277ffba84
diff --git a/app-metrics/github-exporter/github-exporter-1.0.1.ebuild b/app-metrics/github-exporter/github-exporter-1.0.1.ebuild
new file mode 100644
index 000000000000..6e6ed68ef853
--- /dev/null
+++ b/app-metrics/github-exporter/github-exporter-1.0.1.ebuild
@@ -0,0 +1,84 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module user systemd
+DESCRIPTION="Github statistics exporter for prometheus"
+HOMEPAGE="https://github.com/infinityworks/github-exporter"
+
+EGO_SUM=(
+ "github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973"
+ "github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod"
+ "github.com/davecgh/go-spew v1.1.0/go.mod"
+ "github.com/davecgh/go-spew v1.1.1"
+ "github.com/davecgh/go-spew v1.1.1/go.mod"
+ "github.com/fatih/structs v1.1.0"
+ "github.com/fatih/structs v1.1.0/go.mod"
+ "github.com/golang/protobuf v1.2.0"
+ "github.com/golang/protobuf v1.2.0/go.mod"
+ "github.com/infinityworks/go-common v0.0.0-20170820165359-7f20a140fd37"
+ "github.com/infinityworks/go-common v0.0.0-20170820165359-7f20a140fd37/go.mod"
+ "github.com/konsorten/go-windows-terminal-sequences v1.0.1"
+ "github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod"
+ "github.com/matttproud/golang_protobuf_extensions v1.0.1"
+ "github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod"
+ "github.com/pmezard/go-difflib v1.0.0"
+ "github.com/pmezard/go-difflib v1.0.0/go.mod"
+ "github.com/prometheus/client_golang v0.9.2"
+ "github.com/prometheus/client_golang v0.9.2/go.mod"
+ "github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910"
+ "github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod"
+ "github.com/prometheus/common v0.0.0-20181126121408-4724e9255275"
+ "github.com/prometheus/common v0.0.0-20181126121408-4724e9255275/go.mod"
+ "github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a"
+ "github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod"
+ "github.com/sirupsen/logrus v1.4.2"
+ "github.com/sirupsen/logrus v1.4.2/go.mod"
+ "github.com/steinfletcher/apitest v1.3.8"
+ "github.com/steinfletcher/apitest v1.3.8/go.mod"
+ "github.com/stretchr/objx v0.1.0/go.mod"
+ "github.com/stretchr/objx v0.1.1/go.mod"
+ "github.com/stretchr/testify v1.2.2"
+ "github.com/stretchr/testify v1.2.2/go.mod"
+ "github.com/stretchr/testify v1.3.0"
+ "github.com/stretchr/testify v1.3.0/go.mod"
+ "github.com/tomnomnom/linkheader v0.0.0-20180905144013-02ca5825eb80"
+ "github.com/tomnomnom/linkheader v0.0.0-20180905144013-02ca5825eb80/go.mod"
+ "golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod"
+ "golang.org/x/sync v0.0.0-20181108010431-42b317875d0f"
+ "golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod"
+ "golang.org/x/sys v0.0.0-20190422165155-953cdadca894"
+ "golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod"
+ )
+go-module_set_globals
+SRC_URI="https://github.com/infinityworks/github-exporter/archive/${PV}.tar.gz -> ${P}.tar.gz
+ ${EGO_SUM_SRC_URI}"
+
+LICENSE="MIT Apache-2.0 BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+
+pkg_setup() {
+ enewgroup ${PN}
+ enewuser ${PN} -1 -1 -1 ${PN}
+}
+
+src_compile() {
+ set -- go build .
+ echo "$@"
+ "$@" || die "build failed"
+}
+
+src_install() {
+ dobin ${PN}
+ dodoc *.md
+ newconfd "${FILESDIR}"/${PN}.confd ${PN}
+ newinitd "${FILESDIR}"/${PN}.initd ${PN}
+}
+
+pkg_postinst() {
+ if [[ -z "${REPLACING_VERSIONS}" ]]; then
+ elog "Before you can use ${PN}, you must configure it in"
+ elog "${EROOT}/etc/conf.d/${PN}"
+ fi
+}
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index 7169aad9a7e5..fcb02d8dc941 100644
Binary files a/app-misc/Manifest.gz and b/app-misc/Manifest.gz differ
diff --git a/app-misc/carbon-c-relay/Manifest b/app-misc/carbon-c-relay/Manifest
index 2bb2d8ffb140..71f937147a37 100644
--- a/app-misc/carbon-c-relay/Manifest
+++ b/app-misc/carbon-c-relay/Manifest
@@ -1,3 +1,3 @@
-DIST carbon-c-relay-3.4.tar.gz 297795 BLAKE2B 48e954af09db99fc6ab8a227be8742fadd268907c2dd203a9bd6b5417fbf77d604f13636416452108e9df77df6fe9350d5a3dba3f34b1f200b31aba5ebfb2d91 SHA512 12e5d952ac34d7ec33999946dc30c1c388fe5fba7d28355ead77377bca90228f003955353e8f92b743c1ccf5e55ffaf6c32188de3bfb0a1ad75a80cc418c5e00
DIST carbon-c-relay-3.5.tar.gz 304570 BLAKE2B 4b2595eb3aecab7793e2f8a96a6f0a28b967d5e753ee25b175d70fcd2c9d6c492252b2ece5012fd446ba586da9f82e80cc10a9ed3f520bd6600f17e7137fd5ec SHA512 5461e9c32b2953e2c182f71bcaebde33f571dc9672d63231aedf88aca65b2576d0787ab24e871905d46fd0a4176b31f817f75aee09f93a66a280ca67caf74e66
DIST carbon-c-relay-3.6.tar.gz 557612 BLAKE2B 9921a6488a0f04d6b8a7bbe54d13d23dcf979331103e1b862a8a504ead92afdc7530c665cd5a8973ac0cee952c7454ca8fcfb7b9e632ebf8c175083e83c10cc1 SHA512 7336e29890610d5248059c9de7653892d761005881897bff8279c0b12396a5d9aaedf4987121338f43951b8d322cddaaab43a2151b89e98eee9e4da8c7188cd4
+DIST carbon-c-relay-3.7.1.tar.gz 560830 BLAKE2B 31a539af2ecb82e13a5c60399920c3d0e98ba250e72d245d652b9d5307454abc696843385f0d8f100114b5c9da8b0d05319eb8d0a11787c4ab934c7f61dce74c SHA512 5447942007304f1f52a895690375d20cd8c7c76a7abb920c7766ac13a9b7719720454dfc8bbf204fdd22aabdd74c965d2f4256e2518c2949298a482bb7823600
diff --git a/app-misc/carbon-c-relay/carbon-c-relay-3.4.ebuild b/app-misc/carbon-c-relay/carbon-c-relay-3.7.1.ebuild
similarity index 86%
rename from app-misc/carbon-c-relay/carbon-c-relay-3.4.ebuild
rename to app-misc/carbon-c-relay/carbon-c-relay-3.7.1.ebuild
index 7afbf976a689..c5e804d282eb 100644
--- a/app-misc/carbon-c-relay/carbon-c-relay-3.4.ebuild
+++ b/app-misc/carbon-c-relay/carbon-c-relay-3.7.1.ebuild
@@ -1,9 +1,7 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
-
-inherit user
+EAPI=7
DESCRIPTION="Enhanced C version of Carbon relay, aggregator and rewriter"
HOMEPAGE="https://github.com/grobian/carbon-c-relay"
@@ -26,14 +24,11 @@ RDEPEND="lz4? ( app-arch/lz4 )
ssl? ( dev-libs/openssl:0 )
!oniguruma? ( !pcre2? ( pcre? ( dev-libs/libpcre ) ) )
pcre2? ( dev-libs/libpcre2 )
- oniguruma? ( dev-libs/oniguruma )"
+ oniguruma? ( dev-libs/oniguruma )
+ acct-group/carbon
+ acct-user/carbon"
DEPEND="${RDEPEND}"
-pkg_preinst() {
- enewgroup carbon
- enewuser carbon -1 -1 -1 carbon
-}
-
src_configure() {
local pcrecfg
if use !pcre2 && use !oniguruma ; then
@@ -49,8 +44,13 @@ src_configure() {
src_install() {
default
+
# rename too generic name
mv "${ED}"/usr/bin/{relay,${PN}} || die
+
+ # remove libfaketime, necessary for testing only
+ rm -f "${ED}"/usr/$(get_libdir)/libfaketime.*
+
dodoc ChangeLog.md
newinitd "${FILESDIR}"/${PN}.initd-r1 ${PN}
diff --git a/app-misc/cmatrix/cmatrix-2.0-r1.ebuild b/app-misc/cmatrix/cmatrix-2.0-r2.ebuild
similarity index 84%
rename from app-misc/cmatrix/cmatrix-2.0-r1.ebuild
rename to app-misc/cmatrix/cmatrix-2.0-r2.ebuild
index c691bbc100c9..e25ae2c50b2a 100644
--- a/app-misc/cmatrix/cmatrix-2.0-r1.ebuild
+++ b/app-misc/cmatrix/cmatrix-2.0-r2.ebuild
@@ -14,17 +14,25 @@ SRC_URI="https://github.com/abishekvashok/${PN}/archive/v${PV}.tar.gz -> ${P}.ta
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="X"
+IUSE="X +unicode"
DEPEND="
- sys-libs/ncurses:0=
+ sys-libs/ncurses:0=[unicode?]
+"
+BDEPEND="
X? ( >=x11-apps/mkfontscale-1.2.0 )
"
-
RDEPEND="
${DEPEND}
"
+src_configure() {
+ mycmakeargs=(
+ -DCURSES_NEED_WIDE=$(usex unicode)
+ )
+ cmake_src_configure
+}
+
src_install() {
cmake_src_install
font_src_install
diff --git a/app-misc/gnote/Manifest b/app-misc/gnote/Manifest
index e8f93da9b9ef..d4cdb802d7d7 100644
--- a/app-misc/gnote/Manifest
+++ b/app-misc/gnote/Manifest
@@ -1,2 +1 @@
-DIST gnote-3.30.0.tar.xz 4017364 BLAKE2B e53240162d4814a0f004863ca5d309dce0b428d8ce4f7e8dc64c0ce683a830ebedc4809191e55818dba98de7d968413ae080f86367abacf3e4f3a404bbd62157 SHA512 7c1348b9fdbc84ea8cc74e214de50b594a1585031a40406ba73a8635362ef1769a37dbce79347188983970debf72d3c0f81523739a48bf27823f0233cc6cfd2b
DIST gnote-3.36.1.tar.xz 3512000 BLAKE2B 00f5f8049085c855722f92fb3231684d53c4a15b96b7148a2a810d8fdd4c02b22510f4c4f9296fd7e2f4ba96e44d55215f71a2eb78ecb60170f8bb7ffbdef6ef SHA512 4c0c9d469836366a7886928beb0b47c48e60ee41591de193b9af597214f373c2c14b25745f6238ccbede8df8e7d4d83f39a34aed1b155895479bba3e043d2cce
diff --git a/app-misc/gnote/gnote-3.30.0.ebuild b/app-misc/gnote/gnote-3.30.0.ebuild
deleted file mode 100644
index a1955b0552a3..000000000000
--- a/app-misc/gnote/gnote-3.30.0.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2 readme.gentoo-r1
-
-DESCRIPTION="Desktop note-taking application"
-HOMEPAGE="https://wiki.gnome.org/Apps/Gnote"
-
-LICENSE="GPL-3+ FDL-1.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="debug"
-
-# Automagic:
-# glib-2.32 dep
-# >=dev-libs/unittest++-1.5.1 (but not detected due to missing .pc)
-# glibmm: first version in tree providing Thread API fix
-COMMON_DEPEND="
- >=app-crypt/libsecret-0.8
- >=app-text/gtkspell-3.0:3
- >=dev-cpp/glibmm-2.52.1-r1:2
- >=dev-cpp/gtkmm-3.18:3.0
- >=dev-libs/glib-2.32:2[dbus]
- >=dev-libs/libxml2-2:2
- dev-libs/libxslt
- >=sys-apps/util-linux-2.16:=
- >=x11-libs/gtk+-3.20:3
-"
-RDEPEND="${COMMON_DEPEND}
- gnome-base/gsettings-desktop-schemas
-"
-DEPEND="${DEPEND}
- app-text/docbook-xml-dtd:4.1.2
- >=dev-util/intltool-0.35.0
- dev-util/itstool
- virtual/pkgconfig
-"
-
-src_prepare() {
- # Do not alter CFLAGS
- sed 's/-DDEBUG -g/-DDEBUG/' -i configure.ac configure || die
-
- gnome2_src_prepare
-
- if has_version net-fs/wdfs; then
- DOC_CONTENTS="You have net-fs/wdfs installed. app-misc/gnote will use it to
- synchronize notes."
- else
- DOC_CONTENTS="Gnote can use net-fs/wdfs to synchronize notes.
- If you want to use that functionality just emerge net-fs/wdfs.
- Gnote will automatically detect that you did and let you use it."
- fi
-}
-
-src_configure() {
- gnome2_src_configure \
- --disable-static \
- $(use_enable debug)
-}
-
-src_install() {
- gnome2_src_install
- readme.gentoo_create_doc
-}
-
-pkg_postinst() {
- gnome2_pkg_postinst
- readme.gentoo_print_elog
-}
diff --git a/app-misc/golly/golly-3.3-r3.ebuild b/app-misc/golly/golly-3.3-r3.ebuild
new file mode 100644
index 000000000000..10240aa63d7d
--- /dev/null
+++ b/app-misc/golly/golly-3.3-r3.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+WX_GTK_VER=3.0-gtk3
+PYTHON_COMPAT=( python{2_7,3_{7,8,9}} )
+
+inherit autotools desktop python-single-r1 wxwidgets xdg-utils
+
+DESCRIPTION="simulator for Conway's Game of Life and other cellular automata"
+HOMEPAGE="http://golly.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="tiff"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="virtual/opengl
+ sys-libs/zlib
+ x11-libs/wxGTK:${WX_GTK_VER}[X,opengl,tiff?]
+ ${PYTHON_DEPS}
+"
+
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${P}-src
+
+PATCHES=(
+ "${FILESDIR}"/${P}-nondynamic-python.patch
+ "${FILESDIR}"/${P}-allow-py23-exec.patch
+ "${FILESDIR}"/${P}-glife-py23.patch
+ "${FILESDIR}"/${P}-allow-py3.patch
+)
+
+pkg_setup() {
+ python-single-r1_pkg_setup
+ setup-wxwidgets
+}
+
+src_prepare() {
+ default
+
+ # patches change configure.ac and Makefile.am
+ pushd gui-wx/configure
+ eautoreconf
+ popd
+}
+
+src_configure() {
+ ECONF_SOURCE=gui-wx/configure econf \
+ --with-wxshared
+}
+
+src_install() {
+ emake docdir= DESTDIR="${D}" install
+ dodoc docs/ReadMe.html
+ newicon --size 32 gui-wx/icons/appicon.xpm ${PN}.xpm
+ make_desktop_entry ${PN} "Golly" ${PN} "Science"
+}
+
+pkg_postinst() {
+ xdg_icon_cache_update
+}
+
+pkg_postrm() {
+ xdg_icon_cache_update
+}
diff --git a/app-misc/joymouse/joymouse-0.5-r1.ebuild b/app-misc/joymouse/joymouse-0.5-r1.ebuild
new file mode 100644
index 000000000000..1d3764620503
--- /dev/null
+++ b/app-misc/joymouse/joymouse-0.5-r1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="An application that translates joystick events to mouse events"
+HOMEPAGE="https://sourceforge.net/projects/joymouse-linux"
+SRC_URI="mirror://sourceforge/joymouse-linux/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~mips ~ppc ~x86"
+
+RDEPEND="x11-libs/libX11
+ x11-libs/libXtst"
+DEPEND="${RDEPEND}
+ x11-base/xorg-proto"
+
+src_prepare() {
+ default
+ sed -i 's/printf(message/fputs(message, stdout/g' src/joymouse.c || die
+}
diff --git a/app-misc/yagtd/Manifest b/app-misc/yagtd/Manifest
deleted file mode 100644
index 13ff511e5087..000000000000
--- a/app-misc/yagtd/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST yagtd-0.3.4.tar.gz 1402287 BLAKE2B 52712e11fb30c6951ea1c6dd7ca826a8e38d68c95c6716cbc93524959d98c97f75413166312cfb6c684d27d6423493c215e9bec22f3a7112e064b1a413c9c16b SHA512 99f8dd5344615285a09e039f9c829fdcb09305baa1beaef03710fb5661ba5dde53491264142e9ed2c207e89e06855cbd64621e447468aa033e9f972b896385a8
diff --git a/app-misc/yagtd/metadata.xml b/app-misc/yagtd/metadata.xml
deleted file mode 100644
index a28d1359ca9c..000000000000
--- a/app-misc/yagtd/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-yaGTD incorporates major features from Allen's 'Getting Things Done' philosophy and
-notion of urgency and importance preached by Stephen Covey
-(cf Seven Habits of Highly Effective People book).
-To resume, if you are comfortable at the command line a simple plain text is an
-age-old but perfect method for tracking your stuff, and yaGTD can help you to
-manage efficiently this file.
-
-
diff --git a/app-misc/yagtd/yagtd-0.3.4-r1.ebuild b/app-misc/yagtd/yagtd-0.3.4-r1.ebuild
deleted file mode 100644
index d1f94ec737ae..000000000000
--- a/app-misc/yagtd/yagtd-0.3.4-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="CLI todo list manager based on the 'Getting Things Done' philosophy"
-HOMEPAGE="https://gna.org/projects/yagtd/"
-SRC_URI="http://download.gna.org/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-src_prepare() {
- #fix doc install location
- sed -i -e "s:\/doc\/yagtd:\/doc\/${P}:g" setup.py || die
-
- distutils-r1_src_prepare
-}
-
-python_install() {
- distutils-r1_python_install
- ln -s yagtd.py "${D}$(python_get_scriptdir)"/yagtd || die
-}
-
-src_install() {
- distutils-r1_src_install
- dosym yagtd.py /usr/bin/yagtd
-}
diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index db43689a058a..3da492a2dae7 100644
Binary files a/app-portage/Manifest.gz and b/app-portage/Manifest.gz differ
diff --git a/app-portage/nattka/nattka-0.2.9.ebuild b/app-portage/nattka/nattka-0.2.9.ebuild
index c2d438a421a4..bd639516448b 100644
--- a/app-portage/nattka/nattka-0.2.9.ebuild
+++ b/app-portage/nattka/nattka-0.2.9.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/mgorny/nattka/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
IUSE="depgraph-order"
RDEPEND="
diff --git a/app-portage/tatt/tatt-0.7-r1.ebuild b/app-portage/tatt/tatt-0.7-r1.ebuild
index 3a97fcb51d4a..7a01b56de4ca 100644
--- a/app-portage/tatt/tatt-0.7-r1.ebuild
+++ b/app-portage/tatt/tatt-0.7-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/gentoo/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 hppa ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 hppa ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux"
IUSE="+templates"
RDEPEND="
diff --git a/app-shells/Manifest.gz b/app-shells/Manifest.gz
index 1470c9fc91f6..741d5e96e4df 100644
Binary files a/app-shells/Manifest.gz and b/app-shells/Manifest.gz differ
diff --git a/app-shells/gentoo-bashcomp/gentoo-bashcomp-20190211.ebuild b/app-shells/gentoo-bashcomp/gentoo-bashcomp-20190211.ebuild
index 228eba698120..02f6a3dceced 100644
--- a/app-shells/gentoo-bashcomp/gentoo-bashcomp-20190211.ebuild
+++ b/app-shells/gentoo-bashcomp/gentoo-bashcomp-20190211.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris"
src_install() {
emake DESTDIR="${D}" install \
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 05d2906b10c9..96b9ee22a94a 100644
Binary files a/app-text/Manifest.gz and b/app-text/Manifest.gz differ
diff --git a/app-text/binfind/binfind-0.0.3.ebuild b/app-text/binfind/binfind-0.0.3.ebuild
index 8e402c5ed0e1..0285f93dbe53 100644
--- a/app-text/binfind/binfind-0.0.3.ebuild
+++ b/app-text/binfind/binfind-0.0.3.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
DESCRIPTION="Search files for a byte sequence specified on the command line"
-HOMEPAGE="http://www.lith.at/binfind/"
-SRC_URI="http://www.lith.at/binfind/${P}.tar.gz"
+HOMEPAGE="https://www.lith.at/binfind/"
+SRC_URI="https://www.lith.at/binfind/${P}.tar.gz"
LICENSE="GPL-2+"
SLOT="0"
diff --git a/app-text/cwtext/cwtext-0.96-r1.ebuild b/app-text/cwtext/cwtext-0.96-r1.ebuild
index d95b65bce481..25b8dac1a7a3 100644
--- a/app-text/cwtext/cwtext-0.96-r1.ebuild
+++ b/app-text/cwtext/cwtext-0.96-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -13,11 +13,15 @@ SLOT="0"
KEYWORDS="amd64 ~mips ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE=""
-PATCHES=( "${FILESDIR}"/${PN}-0.94-asneeded.patch )
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.96-pcm.patch
+ "${FILESDIR}"/${PN}-0.94-asneeded.patch
+)
+
DOCS=( Changes README TODO )
src_prepare() {
- eapply -p0 "${PATCHES}"
+ eapply -p0 "${PATCHES[@]}"
# change install directory to ${S}
sed -i -e "/^PREFIX/ s:=.*:=\"${S}\":" makefile || \
die "sed makefile failed"
diff --git a/app-text/cwtext/files/cwtext-0.96-pcm.patch b/app-text/cwtext/files/cwtext-0.96-pcm.patch
new file mode 100644
index 000000000000..f14a1d06182b
--- /dev/null
+++ b/app-text/cwtext/files/cwtext-0.96-pcm.patch
@@ -0,0 +1,11 @@
+--- pcm.c.orig
++++ pcm.c
+@@ -60,7 +60,7 @@ int mStoSamples(int hVox, int time) {
+ float samples;
+ float fsr;
+
+- if (!valid(hVox)) return;
++ if (!valid(hVox)) return 0;
+
+ timelen = (float) time;
+ fsr = (float) voxref(hVox).samplerate;
diff --git a/app-text/pylize/Manifest b/app-text/pylize/Manifest
deleted file mode 100644
index 9a0697265e9a..000000000000
--- a/app-text/pylize/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST pylize-1.3b.tar.bz2 70979 BLAKE2B 3b90d60ef7c314e6f7683ebdfa4d518b64ebbfe3bbe39148409d50c41577c7850304eb11e588f99e9c22d550548cf81f5f93265624200395e7abe7557d738a0e SHA512 271be57bdebb605566a7ee0340d34247f8ede4df7ba729c85c23f6df1ca24cadb25c870cce5b1ac35544205d90e716742cd31e150b9a8f98b2dcfae441a76454
diff --git a/app-text/pylize/files/pylize-pillow.patch b/app-text/pylize/files/pylize-pillow.patch
deleted file mode 100644
index 0b454b0b1712..000000000000
--- a/app-text/pylize/files/pylize-pillow.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Change PIL imports for Pillow compat
-https://bugs.gentoo.org/show_bug.cgi?id=471502
---- a/pylize.in
-+++ b/pylize.in
-@@ -113,7 +113,7 @@
- def mkLogoLink(meta):
- if meta.has_key('logo'):
- try:
-- import Image
-+ from PIL import Image
- if os.path.exists(meta['logo']):
- i = Image.open(meta['logo'])
- else:
diff --git a/app-text/pylize/metadata.xml b/app-text/pylize/metadata.xml
deleted file mode 100644
index cd617926fcf3..000000000000
--- a/app-text/pylize/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-pylize is a Python script that generates a set of HTML files that
-make up an on-screen presentation from a master file. The HTML files
-can be viewed with any CSS-aware browser. The master file contains
-the text for all the slides and some additional information like
-title, author etc. pylize can also create a template master file for
-you
-
-
diff --git a/app-text/pylize/pylize-1.3b-r2.ebuild b/app-text/pylize/pylize-1.3b-r2.ebuild
deleted file mode 100644
index 1dc2b94a9c30..000000000000
--- a/app-text/pylize/pylize-1.3b-r2.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_SINGLE_IMPL=1
-
-inherit distutils-r1
-
-DESCRIPTION="Python HTML Slideshow Generator using HTML and CSS"
-HOMEPAGE="http://www.chrisarndt.de/en/software/pylize/"
-SRC_URI="http://www.chrisarndt.de/en/software/pylize/download/${P}.tar.bz2"
-
-IUSE="doc"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-
-DEPEND="
- $(python_gen_cond_dep '
- dev-python/empy[${PYTHON_MULTI_USEDEP}]
- dev-python/pillow[${PYTHON_MULTI_USEDEP}]
- ')"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/${PN}-pillow.patch" )
-
-python_configure() {
- set -- "${PYTHON}" configure.py
- echo "$@"
- "$@" || die
-}
-
-python_compile_all() {
- if use doc; then
- emake -C doc PYTHON="${PYTHON}" PYLIZE="../pylize"
- fi
-}
-
-python_install() {
- distutils-r1_python_install
- python_optimize "${ED%/}/usr/share/pylize"
-}
-
-python_install_all() {
- local DOCS=( Changelog README README.empy TODO )
- use doc && local HTML_DOCS=( doc/. )
- distutils-r1_python_install_all
-}
diff --git a/app-text/texlive/texlive-2020-r3.ebuild b/app-text/texlive/texlive-2020-r4.ebuild
similarity index 98%
rename from app-text/texlive/texlive-2020-r3.ebuild
rename to app-text/texlive/texlive-2020-r4.ebuild
index a75573b772d6..b06a7f6c1a0c 100644
--- a/app-text/texlive/texlive-2020-r3.ebuild
+++ b/app-text/texlive/texlive-2020-r4.ebuild
@@ -79,8 +79,7 @@ RDEPEND="${DEPEND}
l10n_ar? ( >=${TEXLIVE_CAT}/texlive-langarabic-${PV} )
l10n_fa? ( >=${TEXLIVE_CAT}/texlive-langarabic-${PV} )
l10n_hy? ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
- cjk? ( >=${TEXLIVE_CAT}/texlive-langcjk-${PV}
- >=dev-tex/cjk-latex-4.8.4 )
+ cjk? ( >=${TEXLIVE_CAT}/texlive-langcjk-${PV} )
l10n_hr? ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
l10n_bg? ( >=${TEXLIVE_CAT}/texlive-langcyrillic-${PV} )
l10n_br? ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
diff --git a/app-vim/Manifest.gz b/app-vim/Manifest.gz
index 665384a64a99..6dc3766c3531 100644
Binary files a/app-vim/Manifest.gz and b/app-vim/Manifest.gz differ
diff --git a/app-vim/easytags/Manifest b/app-vim/easytags/Manifest
deleted file mode 100644
index 1cd43cb38f27..000000000000
--- a/app-vim/easytags/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST easytags-3.11.tar.gz 40572 BLAKE2B a6b228743f493bd467aff6685b6799de7e4862d384e14c81a084d7a211cf165d62cf902415a3c98a69858eded64c606bd4565f6e0c43fab7c078ba81d0ec5217 SHA512 9c1985a02b2718315d825ed29c06cbf78050e693893a9a7530a774031cbe9e6a27ee1dc91878950a1fbcaf7ea685faeb799d1e5b218b9ce25718783409f66130
diff --git a/app-vim/easytags/easytags-3.11-r1.ebuild b/app-vim/easytags/easytags-3.11-r1.ebuild
deleted file mode 100644
index cbd424d4f07a..000000000000
--- a/app-vim/easytags/easytags-3.11-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{3_6,3_7,3_8} )
-
-inherit python-single-r1 vim-plugin
-
-DESCRIPTION="vim plugin: automated tag file generation and syntax highlighting"
-HOMEPAGE="http://peterodding.com/code/vim/easytags/"
-SRC_URI="https://github.com/xolox/vim-${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="MIT"
-KEYWORDS="~amd64 ~x86"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
- ${PYTHON_DEPS}
- app-vim/vim-misc
- dev-util/ctags"
-
-VIM_PLUGIN_HELPFILES="${PN}.txt"
-
-S="${WORKDIR}/vim-${P}"
-
-PATCHES=( "${FILESDIR}/${P}-fix-ctags-detection.patch" )
-
-src_prepare() {
- default
- rm addon-info.json INSTALL.md README.md || die
-}
-
-src_install() {
- vim-plugin_src_install
-
- fperms 755 /usr/share/vim/vimfiles/misc/easytags/{normalize-tags,why-so-slow}.py
-
- # fix scripts
- local f
- for f in $(find "${ED}" -type f -name \*.py); do
- ebegin "Fixing $(basename ${f})"
- if [[ $f =~ highlight.py ]]; then
- sed -e '1 i\#!/usr/bin/env python3' -i "${f}" || die "can't sed patch ${f}"
- fi
- 2to3 -w -n --no-diffs "${f}" >& /dev/null || die "can't convert ${f} to Python 3"
- python_fix_shebang -q -f "${f}"
- eend $?
- done
-}
diff --git a/app-vim/easytags/easytags-3.11.ebuild b/app-vim/easytags/easytags-3.11.ebuild
deleted file mode 100644
index 3b3fa9986ce5..000000000000
--- a/app-vim/easytags/easytags-3.11.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-single-r1 vim-plugin
-
-DESCRIPTION="vim plugin: automated tag file generation and syntax highlighting"
-HOMEPAGE="http://peterodding.com/code/vim/easytags/"
-SRC_URI="https://github.com/xolox/vim-${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="MIT"
-KEYWORDS="amd64 x86"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
- ${PYTHON_DEPS}
- >=app-vim/vim-misc-1.17.6
- dev-util/ctags"
-
-VIM_PLUGIN_HELPFILES="${PN}.txt"
-
-S="${WORKDIR}/vim-${P}"
-
-PATCHES=( "${FILESDIR}/${P}-fix-ctags-detection.patch" )
-
-src_prepare() {
- default
- # remove unnecessary files
- rm addon-info.json INSTALL.md README.md || die
-}
-
-src_install() {
- vim-plugin_src_install
-
- # fix scripts
- fperms 755 /usr/share/vim/vimfiles/misc/easytags/{normalize-tags,why-so-slow}.py
- python_fix_shebang "${ED}"/usr/share/vim/vimfiles/misc/easytags/{normalize-tags,why-so-slow}.py
-}
diff --git a/app-vim/easytags/files/easytags-3.11-fix-ctags-detection.patch b/app-vim/easytags/files/easytags-3.11-fix-ctags-detection.patch
deleted file mode 100644
index 56b24dfe406f..000000000000
--- a/app-vim/easytags/files/easytags-3.11-fix-ctags-detection.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From f5746bdfd9942b00c349e53f3f4917ae73bb6797 Mon Sep 17 00:00:00 2001
-From: Mathias Andersson
-Date: Thu, 24 Dec 2015 14:24:34 +0100
-Subject: [PATCH] Fix detection of Universal Ctags.
-
-Recently Universal Ctags changed version from 'Development' to '0.0.0'
-which broke the detection.
----
- autoload/xolox/easytags.vim | 32 +++++++++++++++++++-------------
- 1 file changed, 19 insertions(+), 13 deletions(-)
-
-diff --git a/autoload/xolox/easytags.vim b/autoload/xolox/easytags.vim
-index d0dec21..3c85e6a 100644
---- a/autoload/xolox/easytags.vim
-+++ b/autoload/xolox/easytags.vim
-@@ -78,19 +78,25 @@ function! xolox#easytags#check_ctags_compatible(name, min_version) " {{{2
- call xolox#misc#msg#debug("easytags.vim %s: Command '%s' returned nonzero exit code %i!", g:xolox#easytags#version, a:name, result['exit_code'])
- else
- " Extract the version number from the output.
-- let pattern = '\(Exuberant\|Universal\) Ctags \zs\(\d\+\(\.\d\+\)*\|Development\)'
-- let g:easytags_ctags_version = matchstr(get(result['stdout'], 0, ''), pattern)
-- " Deal with development builds.
-- if g:easytags_ctags_version == 'Development'
-- call xolox#misc#msg#debug("easytags.vim %s: Assuming development build is compatible ..", g:xolox#easytags#version, a:name)
-- return 1
-- endif
-- " Make sure the version is compatible.
-- if xolox#misc#version#at_least(a:min_version, g:easytags_ctags_version)
-- call xolox#misc#msg#debug("easytags.vim %s: Version is compatible! :-)", g:xolox#easytags#version)
-- return 1
-- else
-- call xolox#misc#msg#debug("easytags.vim %s: Version is not compatible! :-(", g:xolox#easytags#version)
-+ let pattern = '\(\w\+\) Ctags \(\d\+\(\.\d\+\)*\|Development\)'
-+ let match = matchlist(get(result['stdout'], 0, ''), pattern)
-+ let g:easytags_ctags_fork = match[1]
-+ let g:easytags_ctags_version = match[2]
-+ if g:easytags_ctags_fork != '' && g:easytags_ctags_version != ''
-+ call xolox#misc#msg#debug("easytags.vim %s: Detected %s Ctags %s", g:xolox#easytags#version, g:easytags_ctags_fork, g:easytags_ctags_version)
-+ if g:easytags_ctags_fork == 'Universal'
-+ " All versions should be compatible.
-+ call xolox#misc#msg#debug("easytags.vim %s: Assuming all versions is compatible ..", g:xolox#easytags#version)
-+ return 1
-+ elseif g:easytags_ctags_fork == 'Exuberant'
-+ " Make sure the version is compatible.
-+ if xolox#misc#version#at_least(a:min_version, g:easytags_ctags_version)
-+ call xolox#misc#msg#debug("easytags.vim %s: Version is compatible! :-)", g:xolox#easytags#version)
-+ return 1
-+ else
-+ call xolox#misc#msg#debug("easytags.vim %s: Version is not compatible! :-(", g:xolox#easytags#version)
-+ endif
-+ endif
- endif
- endif
- call xolox#misc#msg#debug("easytags.vim %s: Standard output of command: %s", g:xolox#easytags#version, string(result['stdout']))
diff --git a/app-vim/easytags/metadata.xml b/app-vim/easytags/metadata.xml
deleted file mode 100644
index f13cee8dc033..000000000000
--- a/app-vim/easytags/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
- vim@gentoo.org
- Gentoo Vim Project
-
-
- xolox/vim-easytags
-
-
diff --git a/app-vim/notes/Manifest b/app-vim/notes/Manifest
deleted file mode 100644
index 096eb6ad9365..000000000000
--- a/app-vim/notes/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST notes-0.33.4.tar.gz 239372 BLAKE2B f326c5d6adf25cce9261ac555541261750926c55f73d3a3f57885f7f03f9fae97e03f20882cb74f5fcd78b1ec06c2e0a5b1eb977aadf6a9771c679205a4a48e9 SHA512 7f2147e786582e69760c6d76d7144bc1fd0f8934ce6574184e16f463f5ca9c21e9e0fc87f88b56922b8195b26be7b0f99435cef773ccbc360077cf568b98b98a
diff --git a/app-vim/notes/metadata.xml b/app-vim/notes/metadata.xml
deleted file mode 100644
index 2e0c837525af..000000000000
--- a/app-vim/notes/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
- vim@gentoo.org
- Gentoo Vim Project
-
-
- xolox/vim-notes
-
-
diff --git a/app-vim/notes/notes-0.33.4-r1.ebuild b/app-vim/notes/notes-0.33.4-r1.ebuild
deleted file mode 100644
index d436975d1828..000000000000
--- a/app-vim/notes/notes-0.33.4-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{3_6,3_7,3_8} )
-
-PYTHON_REQ_USE="sqlite"
-
-inherit vim-plugin python-single-r1
-
-DESCRIPTION="vim plugin: easy note taking in vim"
-HOMEPAGE="http://peterodding.com/code/vim/notes/"
-SRC_URI="https://github.com/xolox/vim-notes/archive/${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="MIT"
-KEYWORDS="~amd64 ~x86"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
- ${PYTHON_DEPS}
- app-vim/vim-misc"
-
-VIM_PLUGIN_HELPFILES="${PN}.txt"
-
-S="${WORKDIR}/vim-${P}"
-
-src_prepare() {
- default
-
- # remove unnecessary files
- rm addon-info.json INSTALL.md README.md || die
-
- python_fix_shebang "${S}"
-}
diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index d561c0390e75..472a4f16b46b 100644
Binary files a/dev-cpp/Manifest.gz and b/dev-cpp/Manifest.gz differ
diff --git a/dev-cpp/asio/asio-1.16.1.ebuild b/dev-cpp/asio/asio-1.16.1.ebuild
index d14123c94662..9af756e04a9c 100644
--- a/dev-cpp/asio/asio-1.16.1.ebuild
+++ b/dev-cpp/asio/asio-1.16.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}/${P}.tar.bz2"
LICENSE="Boost-1.0"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
IUSE="doc examples libressl ssl test"
RESTRICT="!test? ( test )"
diff --git a/dev-cpp/catch/catch-1.12.2.ebuild b/dev-cpp/catch/catch-1.12.2.ebuild
index 62eb5b9f606f..22741eef0105 100644
--- a/dev-cpp/catch/catch-1.12.2.ebuild
+++ b/dev-cpp/catch/catch-1.12.2.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999 ]]; then
else
MY_P=${PN^}-${PV}
SRC_URI="https://github.com/catchorg/Catch2/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
- KEYWORDS="amd64 ~arm ~ppc64 x86"
+ KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
S="${WORKDIR}/${PN^}2-${PV}"
fi
diff --git a/dev-cpp/catch/catch-2.9.1.ebuild b/dev-cpp/catch/catch-2.9.1.ebuild
index b450352957d4..77dac8be453e 100644
--- a/dev-cpp/catch/catch-2.9.1.ebuild
+++ b/dev-cpp/catch/catch-2.9.1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]]; then
else
MY_P=${PN^}2-${PV}
SRC_URI="https://github.com/catchorg/Catch2/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
- KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
+ KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
S=${WORKDIR}/${MY_P}
fi
diff --git a/dev-cpp/mm-common/Manifest b/dev-cpp/mm-common/Manifest
index 898ab40de92b..00a918b3133f 100644
--- a/dev-cpp/mm-common/Manifest
+++ b/dev-cpp/mm-common/Manifest
@@ -1,2 +1 @@
-DIST mm-common-0.9.12.tar.xz 304588 BLAKE2B 8fd443b4077d803bb1513c897aa44965e50591cf36518469f1f2f74c40ff2b4f687152f9fc31e2d543ac97ae7a5a0a58efdc8c362959e015eee54b8bd518809e SHA512 99701d91994ca2783fe5b8bfd44cdea9f14e16dbbc116f894d9f3df746912cdbcdbdb0d5fdf6e235c9d22621a314de7aaac9b87a18f3ab742a0ad2ebbaad8ec7
DIST mm-common-1.0.0.tar.xz 269312 BLAKE2B 549708486f3c7df699b966e818dde4888048f30db94a78b721b8ba0e6cffa949f0c6b32e3f03861a3646f4547724997441a2f4eee1a597fb78c28e89882344e6 SHA512 5f90964ae7f47ef16919c5ae20fa38436d04e0cf6eb4b868c3a498631e1995dc5363728ebfed2678266de08adbd1c326d1a77755b232d98d02acc034f08412db
diff --git a/dev-cpp/mm-common/mm-common-0.9.12.ebuild b/dev-cpp/mm-common/mm-common-0.9.12.ebuild
deleted file mode 100644
index 74506878137c..000000000000
--- a/dev-cpp/mm-common/mm-common-0.9.12.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-GCONF_DEBUG="no"
-
-inherit gnome2
-
-DESCRIPTION="Build infrastructure and utilities for GNOME C++ bindings"
-HOMEPAGE="https://www.gtkmm.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND=""
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index 059b9190ad28..00def086dadd 100644
Binary files a/dev-db/Manifest.gz and b/dev-db/Manifest.gz differ
diff --git a/dev-db/metakit/Manifest b/dev-db/metakit/Manifest
deleted file mode 100644
index 490e378a2695..000000000000
--- a/dev-db/metakit/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST metakit-2.4.9.7.tar.gz 868310 BLAKE2B 2c32d17f8f7fcc709c6861834bc08b0dbeb009e73ade98b5103cdc9e58feb4318599ea0253c78e54093763796c16c55b26ca481e6cc883d482af55c3b5534a2f SHA512 94be6ae8ae5f1f24d255a427b0c01eccd2543cd49c5620df7c47f5bf09854ed464a01c52fc8441f7a8e9d5bdc8b966dc77ed34c15cbf9cdfe75a3063572cb8b9
diff --git a/dev-db/metakit/files/metakit-2.4.9.7-linking.patch b/dev-db/metakit/files/metakit-2.4.9.7-linking.patch
deleted file mode 100644
index 55453a2d8e4a..000000000000
--- a/dev-db/metakit/files/metakit-2.4.9.7-linking.patch
+++ /dev/null
@@ -1,45 +0,0 @@
- unix/Makefile.in | 10 +++++-----
- 1 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/unix/Makefile.in b/unix/Makefile.in
-index bf187ba..763558f 100755
---- a/unix/Makefile.in
-+++ b/unix/Makefile.in
-@@ -43,7 +43,7 @@ CXX_FLAGS = @CPPFLAGS@ @CXXFLAGS@ @MK_THREADS@ @SHLIB_CFLAGS@ \
- # (e.g. in Mk4py). This does not affect standard operation, *only* errors.
- # Happens in gcc 2.95.3, it has been disabled for now (even though slower).
- #CXXFLAGS = -fomit-frame-pointer $(CXX_FLAGS)
--CXXFLAGS = $(CXX_FLAGS)
-+CXXFLAGS += -I$(srcdir)/../include
- #CXXFLAGS = -Dq4_CHECK $(CXX_FLAGS)
- #CXXFLAGS = -Wall -pedantic -Wno-unused $(CXX_FLAGS)
-
-@@ -134,24 +134,24 @@ libmk4$(LIB_SUFFIX): $(LOBJS)
- ranlib $@
-
- libmk4$(SHLIB_SUFFIX): $(LOBJS) $(LINK_SPECIAL_FILES)
-- $(SHLIB_LD) -o $@ $(LOBJS) $(LINK_SPECIAL_FLAGS)
-+ $(SHLIB_LD) $(LDFLAGS) -o $@ $(LOBJS) $(LINK_SPECIAL_FLAGS)
-
- Mk4tcl$(LIB_SUFFIX): mk4tcl.o mk4too.o $(LOBJS)
- ar rcu $@ mk4tcl.o mk4too.o $(LOBJS)
- ranlib $@
-
- Mk4tcl$(SHLIB_SUFFIX): mk4tcl.o mk4too.o $(LOBJS) $(LINK_SPECIAL_FILES)
-- $(SHLIB_LD) -o $@ mk4tcl.o mk4too.o $(LOBJS) $(LINK_SPECIAL_FLAGS)
-+ $(SHLIB_LD) $(LDFLAGS) -o $@ mk4tcl.o mk4too.o $(LOBJS) $(LINK_SPECIAL_FLAGS)
-
- Mk4py$(LIB_SUFFIX): $(PYOBJS) $(LOBJS)
- ar cru $@ $(PYOBJS) $(LOBJS)
- ranlib $@
-
- Mk4py$(SHLIB_SUFFIX): $(PYOBJS) $(LOBJS) $(LINK_SPECIAL_FILES)
-- $(SHLIB_LD) -o $@ $(PYOBJS) $(LOBJS) $(LINK_SPECIAL_FLAGS)
-+ $(SHLIB_LD) $(LDFLAGS) -o $@ $(PYOBJS) -L. -lmk4 $(LINK_SPECIAL_FLAGS) $(PYTHON_LIB)
-
- Mk4lua$(SHLIB_SUFFIX): mk4lua.o $(LOBJS) $(LINK_SPECIAL_FILES)
-- $(SHLIB_LD) -o $@ mk4lua.o $(LOBJS) $(LINK_SPECIAL_FLAGS)
-+ $(SHLIB_LD) $(LDFLAGS) -o $@ mk4lua.o $(LOBJS) $(LINK_SPECIAL_FLAGS)
-
- demo: $(srcdir)/../demos/demo.cpp libmk4$(LIBEXT)
- $(CXX) $(CXX_SWITCHES) -o $@$(EXEEXT) \
diff --git a/dev-db/metakit/files/metakit-2.4.9.7-tcltk86.patch b/dev-db/metakit/files/metakit-2.4.9.7-tcltk86.patch
deleted file mode 100644
index cbf4ce3549f6..000000000000
--- a/dev-db/metakit/files/metakit-2.4.9.7-tcltk86.patch
+++ /dev/null
@@ -1,70 +0,0 @@
- tcl/mk4tcl.cpp | 10 +++++++---
- tcl/mk4too.cpp | 6 +++++-
- 2 files changed, 12 insertions(+), 4 deletions(-)
-
-diff --git a/tcl/mk4tcl.cpp b/tcl/mk4tcl.cpp
-index 049bf8e..8d2249e 100755
---- a/tcl/mk4tcl.cpp
-+++ b/tcl/mk4tcl.cpp
-@@ -28,6 +28,10 @@
- #define MyInitStubs(x) 1
- #endif
-
-+#if 10 * TCL_MAJOR_VERSION + TCL_MINOR_VERSION < 86
-+#define Tcl_GetErrorLine(interp) (interp)->errorLine
-+#endif
-+
- // definition of valid property name - alpha numerics, underscore, percent,
- // or any extended utf-8 character
- #define ISNAME(c) (isalnum((c)) || (c) == '_' || (c) == '%' || (c) & 0x80)
-@@ -979,7 +983,7 @@ const c4_Property &AsProperty(Tcl_Obj *objPtr, const c4_View &view_) {
- void *tag = (&view_[0])._seq; // horrific hack to get at c4_Sequence pointer
- if (objPtr->typePtr != &mkPropertyType || objPtr
- ->internalRep.twoPtrValue.ptr1 != tag) {
-- Tcl_ObjType *oldTypePtr = objPtr->typePtr;
-+ CONST86 Tcl_ObjType *oldTypePtr = objPtr->typePtr;
-
- char type = 'S';
-
-@@ -1083,7 +1087,7 @@ int SetCursorFromAny(Tcl_Interp *interp, Tcl_Obj *objPtr) {
- }
-
- if (objPtr->typePtr != &mkCursorType) {
-- Tcl_ObjType *oldTypePtr = objPtr->typePtr;
-+ CONST86 Tcl_ObjType *oldTypePtr = objPtr->typePtr;
-
- const char *string = Tcl_GetStringFromObj(objPtr, 0);
-
-@@ -2156,7 +2160,7 @@ int MkTcl::LoopCmd() {
- _error = TCL_OK;
- else if (_error == TCL_ERROR) {
- char msg[100];
-- sprintf(msg, "\n (\"mk::loop\" body line %d)", interp->errorLine);
-+ sprintf(msg, "\n (\"mk::loop\" body line %d)", Tcl_GetErrorLine(interp));
- Tcl_AddObjErrorInfo(interp, msg, - 1);
- }
- break;
-diff --git a/tcl/mk4too.cpp b/tcl/mk4too.cpp
-index 7c845c0..ffcbc4e 100644
---- a/tcl/mk4too.cpp
-+++ b/tcl/mk4too.cpp
-@@ -7,6 +7,10 @@
- #include
- #include
-
-+#if 10 * TCL_MAJOR_VERSION + TCL_MINOR_VERSION < 86
-+#define Tcl_GetErrorLine(interp) (interp)->errorLine
-+#endif
-+
- ///////////////////////////////////////////////////////////////////////////////
- // Defined in this file:
-
-@@ -612,7 +616,7 @@ int MkView::LoopCmd() {
- _error = TCL_OK;
- else if (_error == TCL_ERROR) {
- char msg[100];
-- sprintf(msg, "\n (\"mk::loop\" body line %d)", interp->errorLine);
-+ sprintf(msg, "\n (\"mk::loop\" body line %d)", Tcl_GetErrorLine(interp));
- Tcl_AddObjErrorInfo(interp, msg, - 1);
- }
- break;
diff --git a/dev-db/metakit/metadata.xml b/dev-db/metakit/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/dev-db/metakit/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
-
-
diff --git a/dev-db/metakit/metakit-2.4.9.7-r2.ebuild b/dev-db/metakit/metakit-2.4.9.7-r2.ebuild
deleted file mode 100644
index 3d8abacaa649..000000000000
--- a/dev-db/metakit/metakit-2.4.9.7-r2.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils flag-o-matic multilib python-single-r1 toolchain-funcs
-
-DESCRIPTION="Embedded database library"
-HOMEPAGE="http://www.equi4.com/metakit/"
-SRC_URI="http://www.equi4.com/pub/mk/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="python static tcl"
-
-DEPEND="
- python? ( ${PYTHON_DEPS} )
- tcl? ( >=dev-lang/tcl-8.6:0= )"
-RDEPEND="${DEPEND}"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RESTRICT="test"
-
-pkg_setup() {
- use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
- epatch \
- "${FILESDIR}"/${P}-linking.patch \
- "${FILESDIR}"/${P}-tcltk86.patch
-}
-
-src_configure() {
- local myconf mycxxflags
- use tcl && myconf+=" --with-tcl=${EPREFIX}/usr/include,${EPREFIX}/usr/$(get_libdir)"
- use static && myconf+=" --disable-shared"
- use static || append-cxxflags -fPIC
-
- CXXFLAGS="${CXXFLAGS} ${mycxxflags}" unix/configure \
- ${myconf} \
- --host=${CHOST} \
- --prefix="${EPREFIX}/usr" \
- --libdir="${EPREFIX}/usr/$(get_libdir)" \
- --infodir="${EPREFIX}/usr/share/info" \
- --mandir="${EPREFIX}/usr/share/man"
-}
-
-src_compile() {
- emake SHLIB_LD="$(tc-getCXX) -shared -Wl,-soname,libmk4.so.2.4"
-
- if use python; then
- emake \
- SHLIB_LD="$(tc-getCXX) -shared" \
- pyincludedir="$(python_get_includedir)" \
- PYTHON_LIB="-l${EPYTHON}" \
- python
- fi
-}
-
-src_install() {
- default
-
- mv "${ED}"//usr/$(get_libdir)/libmk4.so{,.2.4}
- dosym libmk4.so.2.4 /usr/$(get_libdir)/libmk4.so.2
- dosym libmk4.so.2.4 /usr/$(get_libdir)/libmk4.so
-
- if use python; then
- mkdir -p "${D%/}$(python_get_sitedir)" || die
- emake \
- DESTDIR="${D}" \
- pylibdir="$(python_get_sitedir)" \
- install-python
- fi
-
- dohtml Metakit.html
- dohtml -a html,gif,png,jpg -r doc/*
-}
diff --git a/dev-db/postgresql/postgresql-11.7.ebuild b/dev-db/postgresql/postgresql-11.7.ebuild
index 372964685b53..affe9b75b798 100644
--- a/dev-db/postgresql/postgresql-11.7.ebuild
+++ b/dev-db/postgresql/postgresql-11.7.ebuild
@@ -22,7 +22,7 @@ SRC_URI="https://ftp.postgresql.org/pub/source/v${MY_PV}/postgresql-${MY_PV}.tar
LICENSE="POSTGRESQL GPL-2"
DESCRIPTION="PostgreSQL RDBMS"
-HOMEPAGE="http://www.postgresql.org/"
+HOMEPAGE="https://www.postgresql.org/"
IUSE="debug doc icu kerberos kernel_linux ldap libressl llvm nls pam
perl python +readline selinux +server systemd ssl static-libs tcl
@@ -290,7 +290,7 @@ pkg_postinst() {
elog "https://wiki.gentoo.org/wiki/PostgreSQL"
elog
elog "Official documentation:"
- elog "http://www.postgresql.org/docs/${SLOT}/static/index.html"
+ elog "https://www.postgresql.org/docs/${SLOT}/static/index.html"
elog
elog "The default location of the Unix-domain socket is:"
elog " ${EROOT}/run/postgresql/"
@@ -363,8 +363,8 @@ pkg_config() {
einfo " ${EROOT}/etc/conf.d/postgresql-${SLOT}"
einfo
einfo "Information on options that can be passed to initdb are found at:"
- einfo " http://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
- einfo " http://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
+ einfo " https://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
+ einfo " https://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
einfo
einfo "PG_INITDB_OPTS is currently set to:"
if [[ -z "${PG_INITDB_OPTS}" ]] ; then
diff --git a/dev-db/postgresql/postgresql-11.8.ebuild b/dev-db/postgresql/postgresql-11.8.ebuild
index fadb6959719b..e17cfba0e92b 100644
--- a/dev-db/postgresql/postgresql-11.8.ebuild
+++ b/dev-db/postgresql/postgresql-11.8.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://ftp.postgresql.org/pub/source/v${MY_PV}/postgresql-${MY_PV}.tar
LICENSE="POSTGRESQL GPL-2"
DESCRIPTION="PostgreSQL RDBMS"
-HOMEPAGE="http://www.postgresql.org/"
+HOMEPAGE="https://www.postgresql.org/"
IUSE="debug doc icu kerberos kernel_linux ldap libressl llvm nls pam
perl python +readline selinux +server systemd ssl static-libs tcl
@@ -281,7 +281,7 @@ pkg_postinst() {
elog "https://wiki.gentoo.org/wiki/PostgreSQL"
elog
elog "Official documentation:"
- elog "http://www.postgresql.org/docs/${SLOT}/static/index.html"
+ elog "https://www.postgresql.org/docs/${SLOT}/static/index.html"
elog
elog "The default location of the Unix-domain socket is:"
elog " ${EROOT}/run/postgresql/"
@@ -354,8 +354,8 @@ pkg_config() {
einfo " ${EROOT}/etc/conf.d/postgresql-${SLOT}"
einfo
einfo "Information on options that can be passed to initdb are found at:"
- einfo " http://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
- einfo " http://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
+ einfo " https://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
+ einfo " https://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
einfo
einfo "PG_INITDB_OPTS is currently set to:"
if [[ -z "${PG_INITDB_OPTS}" ]] ; then
diff --git a/dev-db/postgresql/postgresql-12.2.ebuild b/dev-db/postgresql/postgresql-12.2.ebuild
index 57f10573d891..b6592df117f9 100644
--- a/dev-db/postgresql/postgresql-12.2.ebuild
+++ b/dev-db/postgresql/postgresql-12.2.ebuild
@@ -22,7 +22,7 @@ SRC_URI="https://ftp.postgresql.org/pub/source/v${MY_PV}/postgresql-${MY_PV}.tar
LICENSE="POSTGRESQL GPL-2"
DESCRIPTION="PostgreSQL RDBMS"
-HOMEPAGE="http://www.postgresql.org/"
+HOMEPAGE="https://www.postgresql.org/"
IUSE="debug doc icu kerberos kernel_linux ldap libressl llvm nls pam
perl python +readline selinux +server systemd ssl static-libs tcl
@@ -290,7 +290,7 @@ pkg_postinst() {
elog "https://wiki.gentoo.org/wiki/PostgreSQL"
elog
elog "Official documentation:"
- elog "http://www.postgresql.org/docs/${SLOT}/static/index.html"
+ elog "https://www.postgresql.org/docs/${SLOT}/static/index.html"
elog
elog "The default location of the Unix-domain socket is:"
elog " ${EROOT}/run/postgresql/"
@@ -363,8 +363,8 @@ pkg_config() {
einfo " ${EROOT}/etc/conf.d/postgresql-${SLOT}"
einfo
einfo "Information on options that can be passed to initdb are found at:"
- einfo " http://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
- einfo " http://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
+ einfo " https://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
+ einfo " https://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
einfo
einfo "PG_INITDB_OPTS is currently set to:"
if [[ -z "${PG_INITDB_OPTS}" ]] ; then
diff --git a/dev-db/postgresql/postgresql-12.3.ebuild b/dev-db/postgresql/postgresql-12.3.ebuild
index e0a0549f88af..cfae19554b2d 100644
--- a/dev-db/postgresql/postgresql-12.3.ebuild
+++ b/dev-db/postgresql/postgresql-12.3.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://ftp.postgresql.org/pub/source/v${MY_PV}/postgresql-${MY_PV}.tar
LICENSE="POSTGRESQL GPL-2"
DESCRIPTION="PostgreSQL RDBMS"
-HOMEPAGE="http://www.postgresql.org/"
+HOMEPAGE="https://www.postgresql.org/"
IUSE="debug doc icu kerberos kernel_linux ldap libressl llvm nls pam
perl python +readline selinux +server systemd ssl static-libs tcl
@@ -281,7 +281,7 @@ pkg_postinst() {
elog "https://wiki.gentoo.org/wiki/PostgreSQL"
elog
elog "Official documentation:"
- elog "http://www.postgresql.org/docs/${SLOT}/static/index.html"
+ elog "https://www.postgresql.org/docs/${SLOT}/static/index.html"
elog
elog "The default location of the Unix-domain socket is:"
elog " ${EROOT}/run/postgresql/"
@@ -354,8 +354,8 @@ pkg_config() {
einfo " ${EROOT}/etc/conf.d/postgresql-${SLOT}"
einfo
einfo "Information on options that can be passed to initdb are found at:"
- einfo " http://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
- einfo " http://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
+ einfo " https://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
+ einfo " https://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
einfo
einfo "PG_INITDB_OPTS is currently set to:"
if [[ -z "${PG_INITDB_OPTS}" ]] ; then
diff --git a/dev-db/postgresql/postgresql-13_beta1.ebuild b/dev-db/postgresql/postgresql-13_beta1.ebuild
index 888813e90a41..000f3085aa8e 100644
--- a/dev-db/postgresql/postgresql-13_beta1.ebuild
+++ b/dev-db/postgresql/postgresql-13_beta1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://ftp.postgresql.org/pub/source/v${MY_PV}/postgresql-${MY_PV}.tar
LICENSE="POSTGRESQL GPL-2"
DESCRIPTION="PostgreSQL RDBMS"
-HOMEPAGE="http://www.postgresql.org/"
+HOMEPAGE="https://www.postgresql.org/"
IUSE="debug doc icu kerberos kernel_linux ldap libressl llvm nls pam
perl python +readline selinux +server systemd ssl static-libs tcl
@@ -281,7 +281,7 @@ pkg_postinst() {
elog "https://wiki.gentoo.org/wiki/PostgreSQL"
elog
elog "Official documentation:"
- elog "http://www.postgresql.org/docs/${SLOT}/static/index.html"
+ elog "https://www.postgresql.org/docs/${SLOT}/static/index.html"
elog
elog "The default location of the Unix-domain socket is:"
elog " ${EROOT}/run/postgresql/"
@@ -354,8 +354,8 @@ pkg_config() {
einfo " ${EROOT}/etc/conf.d/postgresql-${SLOT}"
einfo
einfo "Information on options that can be passed to initdb are found at:"
- einfo " http://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
- einfo " http://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
+ einfo " https://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
+ einfo " https://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
einfo
einfo "PG_INITDB_OPTS is currently set to:"
if [[ -z "${PG_INITDB_OPTS}" ]] ; then
diff --git a/dev-db/sqlite/Manifest b/dev-db/sqlite/Manifest
index a5126e72a2e2..f1c2a7767c1e 100644
--- a/dev-db/sqlite/Manifest
+++ b/dev-db/sqlite/Manifest
@@ -1,3 +1,5 @@
DIST sqlite-autoconf-3310100.tar.gz 2887243 BLAKE2B ef5d40b6e6c59a51ae95368eb9f6a938188813f89d5328ea1c1180ef35f124c14b3e83b0832ae5c2fa24cc2df352f1b0ea5f20b64d0762d50a700d9895f9a12e SHA512 d85250ba5f78f0c918880f663741709aba662192f04888b2324a0df17affdf5b8540e8428c6c7315119806e7adad758ea281c9b403c0ad94ac6a9bd1b93fd617
DIST sqlite-doc-3310100.zip 9600405 BLAKE2B 324fb7a0a38bc56476e41504c14996e9d5d83ac659403991515413d49f5ee3aad064ccece25f52b6041ef26bf23f320a9be1b6b02c5fbe96c36372107f54fc2e SHA512 5572e2c2dac30c014ef9cd60a620b7a7bb610f91a47e2890c0641540d39b9d5ce0e914ee697583130317633918b7827e2612a7cbc024f5bd6aa22ad28a78b56b
+DIST sqlite-doc-3320300.zip 9772933 BLAKE2B efd72c18d0398c103e3f9c4cfeb03e7794fd69691b1bcea95b74a0c5d8af22aa13abc84ce8dc5864b5f4cb79be239433933b4daca34d1adfcc6f31ce2cde66bf SHA512 af9dca970b4c03c058d7d1cd55a3d11fa4b112dccac942b8660d82a7e9ba2956963fcb429eedfdc85915637c102e1f904ace98c8e0455c4120422bbd9f2f3cd0
DIST sqlite-src-3310100.zip 12510166 BLAKE2B a856695e8552b8b4dcb28452fdbd48305fdb9072f9d6587f4b1f4445daf386e920eb936dcb50fdfe41a49f84b26a7c5fedcffea5acf3ba3fa935c36695d4b8ee SHA512 af92a00877bcd90372d6f83a27fea12b4fe8d1155b223a6bccbccc31bb8e3d2269cd9e68f329bc55f70d1068ccbf220ff5abccea6f593fd7a3a4bdd732d1cdbe
+DIST sqlite-src-3320300.zip 12461750 BLAKE2B 59cce74d284191cfc69ac09b6014701ddd2b7b3d7ebaad5da4ad71cc200e70285b3b201ff174819aa8dde5f610589d7947f547450334f0f17149014078316185 SHA512 7e027c7163a760fb9b6dbfd2e4ccffb39d4972280583fb0d7f8390017101dfed3b12a36653b3130a548ae4d04c6abb11c0a1921b6f09c54c6ae1e72fbdcb2fd4
diff --git a/dev-db/sqlite/files/sqlite-3.32.1-full_archive-build_1.patch b/dev-db/sqlite/files/sqlite-3.32.1-full_archive-build_1.patch
new file mode 100644
index 000000000000..aec90e4c07ad
--- /dev/null
+++ b/dev-db/sqlite/files/sqlite-3.32.1-full_archive-build_1.patch
@@ -0,0 +1,670 @@
+Add initialization functions for internal usage in libsqlite3.so.
+
+--- /ext/misc/carray.c
++++ /ext/misc/carray.c
+@@ -383,16 +383,8 @@
+
+ #endif /* SQLITE_OMIT_VIRTUALTABLE */
+
+-#ifdef _WIN32
+-__declspec(dllexport)
+-#endif
+-int sqlite3_carray_init(
+- sqlite3 *db,
+- char **pzErrMsg,
+- const sqlite3_api_routines *pApi
+-){
++int sqlite3CarrayInit(sqlite3 *db){
+ int rc = SQLITE_OK;
+- SQLITE_EXTENSION_INIT2(pApi);
+ #ifndef SQLITE_OMIT_VIRTUALTABLE
+ rc = sqlite3_create_module(db, "carray", &carrayModule, 0);
+ #ifdef SQLITE_TEST
+@@ -404,3 +396,18 @@
+ #endif /* SQLITE_OMIT_VIRTUALTABLE */
+ return rc;
+ }
++
++#if !defined(SQLITE_CORE) || defined(SQLITE_TEST)
++#ifdef _WIN32
++__declspec(dllexport)
++#endif
++int sqlite3_carray_init(
++ sqlite3 *db,
++ char **pzErrMsg,
++ const sqlite3_api_routines *pApi
++){
++ SQLITE_EXTENSION_INIT2(pApi);
++ (void)pzErrMsg; /* Unused parameter */
++ return sqlite3CarrayInit(db);
++}
++#endif /* !defined(SQLITE_CORE) || defined(SQLITE_TEST) */
+--- /ext/misc/completion.c
++++ /ext/misc/completion.c
+@@ -483,12 +483,13 @@
+ return rc;
+ }
+
++#if !defined(SQLITE_CORE) || defined(SQLITE_TEST)
+ #ifdef _WIN32
+ __declspec(dllexport)
+ #endif
+ int sqlite3_completion_init(
+- sqlite3 *db,
+- char **pzErrMsg,
++ sqlite3 *db,
++ char **pzErrMsg,
+ const sqlite3_api_routines *pApi
+ ){
+ int rc = SQLITE_OK;
+@@ -499,3 +500,4 @@
+ #endif
+ return rc;
+ }
++#endif /* !defined(SQLITE_CORE) || defined(SQLITE_TEST) */
+--- /ext/misc/csv.c
++++ /ext/misc/csv.c
+@@ -928,6 +928,22 @@
+ #endif /* !defined(SQLITE_OMIT_VIRTUALTABLE) */
+
+
++int sqlite3CsvInit(sqlite3 *db){
++#ifndef SQLITE_OMIT_VIRTUALTABLE
++ int rc;
++ rc = sqlite3_create_module(db, "csv", &CsvModule, 0);
++#ifdef SQLITE_TEST
++ if( rc==SQLITE_OK ){
++ rc = sqlite3_create_module(db, "csv_wr", &CsvModuleFauxWrite, 0);
++ }
++#endif
++ return rc;
++#else
++ return SQLITE_OK;
++#endif
++}
++
++#if !defined(SQLITE_CORE) || defined(SQLITE_TEST)
+ #ifdef _WIN32
+ __declspec(dllexport)
+ #endif
+@@ -941,17 +957,8 @@
+ char **pzErrMsg,
+ const sqlite3_api_routines *pApi
+ ){
+-#ifndef SQLITE_OMIT_VIRTUALTABLE
+- int rc;
+ SQLITE_EXTENSION_INIT2(pApi);
+- rc = sqlite3_create_module(db, "csv", &CsvModule, 0);
+-#ifdef SQLITE_TEST
+- if( rc==SQLITE_OK ){
+- rc = sqlite3_create_module(db, "csv_wr", &CsvModuleFauxWrite, 0);
+- }
+-#endif
+- return rc;
+-#else
+- return SQLITE_OK;
+-#endif
++ (void)pzErrMsg; /* Unused parameter */
++ return sqlite3CsvInit(db);
+ }
++#endif /* !defined(SQLITE_CORE) || defined(SQLITE_TEST) */
+--- /ext/misc/dbdata.c
++++ /ext/misc/dbdata.c
+@@ -803,7 +803,7 @@
+ /*
+ ** Invoke this routine to register the "sqlite_dbdata" virtual table module
+ */
+-static int sqlite3DbdataRegister(sqlite3 *db){
++int sqlite3DbdataRegister(sqlite3 *db){
+ static sqlite3_module dbdata_module = {
+ 0, /* iVersion */
+ 0, /* xCreate */
+@@ -838,6 +838,7 @@
+ return rc;
+ }
+
++#if !defined(SQLITE_CORE) || defined(SQLITE_TEST)
+ #ifdef _WIN32
+ __declspec(dllexport)
+ #endif
+@@ -849,3 +850,4 @@
+ SQLITE_EXTENSION_INIT2(pApi);
+ return sqlite3DbdataRegister(db);
+ }
++#endif /* !defined(SQLITE_CORE) || defined(SQLITE_TEST) */
+--- /ext/misc/eval.c
++++ /ext/misc/eval.c
+@@ -102,6 +102,20 @@
+ }
+
+
++int sqlite3EvalInit(sqlite3 *db){
++ int rc = SQLITE_OK;
++ rc = sqlite3_create_function(db, "eval", 1,
++ SQLITE_UTF8|SQLITE_DIRECTONLY, 0,
++ sqlEvalFunc, 0, 0);
++ if( rc==SQLITE_OK ){
++ rc = sqlite3_create_function(db, "eval", 2,
++ SQLITE_UTF8|SQLITE_DIRECTONLY, 0,
++ sqlEvalFunc, 0, 0);
++ }
++ return rc;
++}
++
++#if !defined(SQLITE_CORE) || defined(SQLITE_TEST)
+ #ifdef _WIN32
+ __declspec(dllexport)
+ #endif
+@@ -110,16 +124,8 @@
+ char **pzErrMsg,
+ const sqlite3_api_routines *pApi
+ ){
+- int rc = SQLITE_OK;
+ SQLITE_EXTENSION_INIT2(pApi);
+ (void)pzErrMsg; /* Unused parameter */
+- rc = sqlite3_create_function(db, "eval", 1,
+- SQLITE_UTF8|SQLITE_DIRECTONLY, 0,
+- sqlEvalFunc, 0, 0);
+- if( rc==SQLITE_OK ){
+- rc = sqlite3_create_function(db, "eval", 2,
+- SQLITE_UTF8|SQLITE_DIRECTONLY, 0,
+- sqlEvalFunc, 0, 0);
+- }
+- return rc;
++ return sqlite3EvalInit(db);
+ }
++#endif /* !defined(SQLITE_CORE) || defined(SQLITE_TEST) */
+--- /ext/misc/fileio.c
++++ /ext/misc/fileio.c
+@@ -340,7 +340,7 @@
+ ** This function does the work for the writefile() UDF. Refer to
+ ** header comments at the top of this file for details.
+ */
+-static int writeFile(
++static int writeFileContents(
+ sqlite3_context *pCtx, /* Context to return bytes written in */
+ const char *zFile, /* File to write */
+ sqlite3_value *pData, /* Data to write */
+@@ -480,10 +480,10 @@
+ mtime = sqlite3_value_int64(argv[3]);
+ }
+
+- res = writeFile(context, zFile, argv[1], mode, mtime);
++ res = writeFileContents(context, zFile, argv[1], mode, mtime);
+ if( res==1 && errno==ENOENT ){
+ if( makeDirectory(zFile)==SQLITE_OK ){
+- res = writeFile(context, zFile, argv[1], mode, mtime);
++ res = writeFileContents(context, zFile, argv[1], mode, mtime);
+ }
+ }
+
+@@ -970,18 +970,9 @@
+ # define fsdirRegister(x) SQLITE_OK
+ #endif
+
+-#ifdef _WIN32
+-__declspec(dllexport)
+-#endif
+-int sqlite3_fileio_init(
+- sqlite3 *db,
+- char **pzErrMsg,
+- const sqlite3_api_routines *pApi
+-){
++int sqlite3FileioInit(sqlite3 *db){
+ int rc = SQLITE_OK;
+- SQLITE_EXTENSION_INIT2(pApi);
+- (void)pzErrMsg; /* Unused parameter */
+- rc = sqlite3_create_function(db, "readfile", 1,
++ rc = sqlite3_create_function(db, "readfile", 1,
+ SQLITE_UTF8|SQLITE_DIRECTONLY, 0,
+ readfileFunc, 0, 0);
+ if( rc==SQLITE_OK ){
+@@ -998,3 +989,18 @@
+ }
+ return rc;
+ }
++
++#if !defined(SQLITE_CORE) || defined(SQLITE_TEST)
++#ifdef _WIN32
++__declspec(dllexport)
++#endif
++int sqlite3_fileio_init(
++ sqlite3 *db,
++ char **pzErrMsg,
++ const sqlite3_api_routines *pApi
++){
++ SQLITE_EXTENSION_INIT2(pApi);
++ (void)pzErrMsg; /* Unused parameter */
++ return sqlite3FileioInit(db);
++}
++#endif /* !defined(SQLITE_CORE) || defined(SQLITE_TEST) */
+--- /ext/misc/ieee754.c
++++ /ext/misc/ieee754.c
+@@ -110,6 +110,20 @@
+ }
+
+
++int sqlite3IeeeInit(sqlite3 *db){
++ int rc = SQLITE_OK;
++ rc = sqlite3_create_function(db, "ieee754", 1,
++ SQLITE_UTF8|SQLITE_INNOCUOUS, 0,
++ ieee754func, 0, 0);
++ if( rc==SQLITE_OK ){
++ rc = sqlite3_create_function(db, "ieee754", 2,
++ SQLITE_UTF8|SQLITE_INNOCUOUS, 0,
++ ieee754func, 0, 0);
++ }
++ return rc;
++}
++
++#if !defined(SQLITE_CORE) || defined(SQLITE_TEST)
+ #ifdef _WIN32
+ __declspec(dllexport)
+ #endif
+@@ -118,16 +132,8 @@
+ char **pzErrMsg,
+ const sqlite3_api_routines *pApi
+ ){
+- int rc = SQLITE_OK;
+ SQLITE_EXTENSION_INIT2(pApi);
+ (void)pzErrMsg; /* Unused parameter */
+- rc = sqlite3_create_function(db, "ieee754", 1,
+- SQLITE_UTF8|SQLITE_INNOCUOUS, 0,
+- ieee754func, 0, 0);
+- if( rc==SQLITE_OK ){
+- rc = sqlite3_create_function(db, "ieee754", 2,
+- SQLITE_UTF8|SQLITE_INNOCUOUS, 0,
+- ieee754func, 0, 0);
+- }
+- return rc;
++ return sqlite3IeeeInit(db);
+ }
++#endif /* !defined(SQLITE_CORE) || defined(SQLITE_TEST) */
+--- /ext/misc/regexp.c
++++ /ext/misc/regexp.c
+@@ -740,10 +740,18 @@
+ }
+ }
+
++int sqlite3RegexpInit(sqlite3 *db){
++ int rc = SQLITE_OK;
++ rc = sqlite3_create_function(db, "regexp", 2, SQLITE_UTF8|SQLITE_INNOCUOUS,
++ 0, re_sql_func, 0, 0);
++ return rc;
++}
++
+ /*
+ ** Invoke this routine to register the regexp() function with the
+ ** SQLite database connection.
+ */
++#if !defined(SQLITE_CORE) || defined(SQLITE_TEST)
+ #ifdef _WIN32
+ __declspec(dllexport)
+ #endif
+@@ -752,9 +760,8 @@
+ char **pzErrMsg,
+ const sqlite3_api_routines *pApi
+ ){
+- int rc = SQLITE_OK;
+ SQLITE_EXTENSION_INIT2(pApi);
+- rc = sqlite3_create_function(db, "regexp", 2, SQLITE_UTF8|SQLITE_INNOCUOUS,
+- 0, re_sql_func, 0, 0);
+- return rc;
++ (void)pzErrMsg; /* Unused parameter */
++ return sqlite3RegexpInit(db);
+ }
++#endif /* !defined(SQLITE_CORE) || defined(SQLITE_TEST) */
+--- /ext/misc/sha1.c
++++ /ext/misc/sha1.c
+@@ -175,7 +175,7 @@
+ }
+
+ /* Compute a string using sqlite3_vsnprintf() and hash it */
+-static void hash_step_vformat(
++static void sha1_hash_step_vformat(
+ SHA1Context *p, /* Add content to this context */
+ const char *zFormat,
+ ...
+@@ -306,7 +306,7 @@
+ nCol = sqlite3_column_count(pStmt);
+ z = sqlite3_sql(pStmt);
+ n = (int)strlen(z);
+- hash_step_vformat(&cx,"S%d:",n);
++ sha1_hash_step_vformat(&cx,"S%d:",n);
+ hash_step(&cx,(unsigned char*)z,n);
+
+ /* Compute a hash over the result of the query */
+@@ -349,14 +349,14 @@
+ case SQLITE_TEXT: {
+ int n2 = sqlite3_column_bytes(pStmt, i);
+ const unsigned char *z2 = sqlite3_column_text(pStmt, i);
+- hash_step_vformat(&cx,"T%d:",n2);
++ sha1_hash_step_vformat(&cx,"T%d:",n2);
+ hash_step(&cx, z2, n2);
+ break;
+ }
+ case SQLITE_BLOB: {
+ int n2 = sqlite3_column_bytes(pStmt, i);
+ const unsigned char *z2 = sqlite3_column_blob(pStmt, i);
+- hash_step_vformat(&cx,"B%d:",n2);
++ sha1_hash_step_vformat(&cx,"B%d:",n2);
+ hash_step(&cx, z2, n2);
+ break;
+ }
+@@ -370,6 +370,20 @@
+ }
+
+
++int sqlite3ShaInit(sqlite3 *db){
++ int rc = SQLITE_OK;
++ rc = sqlite3_create_function(db, "sha1", 1,
++ SQLITE_UTF8 | SQLITE_INNOCUOUS | SQLITE_DETERMINISTIC,
++ 0, sha1Func, 0, 0);
++ if( rc==SQLITE_OK ){
++ rc = sqlite3_create_function(db, "sha1_query", 1,
++ SQLITE_UTF8|SQLITE_DIRECTONLY, 0,
++ sha1QueryFunc, 0, 0);
++ }
++ return rc;
++}
++
++#if !defined(SQLITE_CORE) || defined(SQLITE_TEST)
+ #ifdef _WIN32
+ __declspec(dllexport)
+ #endif
+@@ -378,16 +392,8 @@
+ char **pzErrMsg,
+ const sqlite3_api_routines *pApi
+ ){
+- int rc = SQLITE_OK;
+ SQLITE_EXTENSION_INIT2(pApi);
+ (void)pzErrMsg; /* Unused parameter */
+- rc = sqlite3_create_function(db, "sha1", 1,
+- SQLITE_UTF8 | SQLITE_INNOCUOUS | SQLITE_DETERMINISTIC,
+- 0, sha1Func, 0, 0);
+- if( rc==SQLITE_OK ){
+- rc = sqlite3_create_function(db, "sha1_query", 1,
+- SQLITE_UTF8|SQLITE_DIRECTONLY, 0,
+- sha1QueryFunc, 0, 0);
+- }
+- return rc;
++ return sqlite3ShaInit(db);
+ }
++#endif /* !defined(SQLITE_CORE) || defined(SQLITE_TEST) */
+--- /ext/misc/shathree.c
++++ /ext/misc/shathree.c
+@@ -527,7 +527,7 @@
+ /* Compute a string using sqlite3_vsnprintf() with a maximum length
+ ** of 50 bytes and add it to the hash.
+ */
+-static void hash_step_vformat(
++static void sha3_hash_step_vformat(
+ SHA3Context *p, /* Add content to this context */
+ const char *zFormat,
+ ...
+@@ -622,7 +622,7 @@
+ nCol = sqlite3_column_count(pStmt);
+ z = sqlite3_sql(pStmt);
+ n = (int)strlen(z);
+- hash_step_vformat(&cx,"S%d:",n);
++ sha3_hash_step_vformat(&cx,"S%d:",n);
+ SHA3Update(&cx,(unsigned char*)z,n);
+
+ /* Compute a hash over the result of the query */
+@@ -665,14 +665,14 @@
+ case SQLITE_TEXT: {
+ int n2 = sqlite3_column_bytes(pStmt, i);
+ const unsigned char *z2 = sqlite3_column_text(pStmt, i);
+- hash_step_vformat(&cx,"T%d:",n2);
++ sha3_hash_step_vformat(&cx,"T%d:",n2);
+ SHA3Update(&cx, z2, n2);
+ break;
+ }
+ case SQLITE_BLOB: {
+ int n2 = sqlite3_column_bytes(pStmt, i);
+ const unsigned char *z2 = sqlite3_column_blob(pStmt, i);
+- hash_step_vformat(&cx,"B%d:",n2);
++ sha3_hash_step_vformat(&cx,"B%d:",n2);
+ SHA3Update(&cx, z2, n2);
+ break;
+ }
+@@ -685,17 +685,8 @@
+ }
+
+
+-#ifdef _WIN32
+-__declspec(dllexport)
+-#endif
+-int sqlite3_shathree_init(
+- sqlite3 *db,
+- char **pzErrMsg,
+- const sqlite3_api_routines *pApi
+-){
++int sqlite3ShathreeInit(sqlite3 *db){
+ int rc = SQLITE_OK;
+- SQLITE_EXTENSION_INIT2(pApi);
+- (void)pzErrMsg; /* Unused parameter */
+ rc = sqlite3_create_function(db, "sha3", 1,
+ SQLITE_UTF8 | SQLITE_INNOCUOUS | SQLITE_DETERMINISTIC,
+ 0, sha3Func, 0, 0);
+@@ -716,3 +707,18 @@
+ }
+ return rc;
+ }
++
++#if !defined(SQLITE_CORE) || defined(SQLITE_TEST)
++#ifdef _WIN32
++__declspec(dllexport)
++#endif
++int sqlite3_shathree_init(
++ sqlite3 *db,
++ char **pzErrMsg,
++ const sqlite3_api_routines *pApi
++){
++ SQLITE_EXTENSION_INIT2(pApi);
++ (void)pzErrMsg; /* Unused parameter */
++ return sqlite3ShathreeInit(db);
++}
++#endif /* !defined(SQLITE_CORE) || defined(SQLITE_TEST) */
+--- /ext/misc/sqlar.c
++++ /ext/misc/sqlar.c
+@@ -14,6 +14,8 @@
+ ** for working with sqlar archives and used by the shell tool's built-in
+ ** sqlar support.
+ */
++#ifdef SQLITE_HAVE_ZLIB
++
+ #include "sqlite3ext.h"
+ SQLITE_EXTENSION_INIT1
+ #include
+@@ -101,6 +103,20 @@
+ }
+
+
++int sqlite3SqlarInit(sqlite3 *db){
++ int rc = SQLITE_OK;
++ rc = sqlite3_create_function(db, "sqlar_compress", 1,
++ SQLITE_UTF8|SQLITE_INNOCUOUS, 0,
++ sqlarCompressFunc, 0, 0);
++ if( rc==SQLITE_OK ){
++ rc = sqlite3_create_function(db, "sqlar_uncompress", 2,
++ SQLITE_UTF8|SQLITE_INNOCUOUS, 0,
++ sqlarUncompressFunc, 0, 0);
++ }
++ return rc;
++}
++
++#if !defined(SQLITE_CORE) || defined(SQLITE_TEST)
+ #ifdef _WIN32
+ __declspec(dllexport)
+ #endif
+@@ -109,16 +125,10 @@
+ char **pzErrMsg,
+ const sqlite3_api_routines *pApi
+ ){
+- int rc = SQLITE_OK;
+ SQLITE_EXTENSION_INIT2(pApi);
+ (void)pzErrMsg; /* Unused parameter */
+- rc = sqlite3_create_function(db, "sqlar_compress", 1,
+- SQLITE_UTF8|SQLITE_INNOCUOUS, 0,
+- sqlarCompressFunc, 0, 0);
+- if( rc==SQLITE_OK ){
+- rc = sqlite3_create_function(db, "sqlar_uncompress", 2,
+- SQLITE_UTF8|SQLITE_INNOCUOUS, 0,
+- sqlarUncompressFunc, 0, 0);
+- }
+- return rc;
++ return sqlite3SqlarInit(db);
+ }
++#endif /* !defined(SQLITE_CORE) || defined(SQLITE_TEST) */
++
++#endif /* SQLITE_HAVE_ZLIB */
+--- /ext/misc/totype.c
++++ /ext/misc/totype.c
+@@ -491,17 +491,8 @@
+ #pragma warning(default: 4748)
+ #endif
+
+-#ifdef _WIN32
+-__declspec(dllexport)
+-#endif
+-int sqlite3_totype_init(
+- sqlite3 *db,
+- char **pzErrMsg,
+- const sqlite3_api_routines *pApi
+-){
++int sqlite3TotypeInit(sqlite3 *db){
+ int rc = SQLITE_OK;
+- SQLITE_EXTENSION_INIT2(pApi);
+- (void)pzErrMsg; /* Unused parameter */
+ rc = sqlite3_create_function(db, "tointeger", 1,
+ SQLITE_UTF8 | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS, 0,
+ tointegerFunc, 0, 0);
+@@ -512,3 +503,18 @@
+ }
+ return rc;
+ }
++
++#if !defined(SQLITE_CORE) || defined(SQLITE_TEST)
++#ifdef _WIN32
++__declspec(dllexport)
++#endif
++int sqlite3_totype_init(
++ sqlite3 *db,
++ char **pzErrMsg,
++ const sqlite3_api_routines *pApi
++){
++ SQLITE_EXTENSION_INIT2(pApi);
++ (void)pzErrMsg; /* Unused parameter */
++ return sqlite3TotypeInit(db);
++}
++#endif /* !defined(SQLITE_CORE) || defined(SQLITE_TEST) */
+--- /ext/misc/uint.c
++++ /ext/misc/uint.c
+@@ -78,6 +78,11 @@
+ return (nKey1 - i) - (nKey2 - j);
+ }
+
++int sqlite3UintInit(sqlite3 *db){
++ return sqlite3_create_collation(db, "UINT", SQLITE_UTF8, 0, uintCollFunc);
++}
++
++#if !defined(SQLITE_CORE) || defined(SQLITE_TEST)
+ #ifdef _WIN32
+ __declspec(dllexport)
+ #endif
+@@ -88,5 +93,6 @@
+ ){
+ SQLITE_EXTENSION_INIT2(pApi);
+ (void)pzErrMsg; /* Unused parameter */
+- return sqlite3_create_collation(db, "uint", SQLITE_UTF8, 0, uintCollFunc);
++ return sqlite3UintInit(db);
+ }
++#endif /* !defined(SQLITE_CORE) || defined(SQLITE_TEST) */
+--- /ext/misc/uuid.c
++++ /ext/misc/uuid.c
+@@ -206,21 +206,12 @@
+ sqlite3_result_blob(context, pBlob, 16, SQLITE_TRANSIENT);
+ }
+
+-#ifdef _WIN32
+-__declspec(dllexport)
+-#endif
+-int sqlite3_uuid_init(
+- sqlite3 *db,
+- char **pzErrMsg,
+- const sqlite3_api_routines *pApi
+-){
++int sqlite3UuidInit(sqlite3 *db){
+ int rc = SQLITE_OK;
+- SQLITE_EXTENSION_INIT2(pApi);
+- (void)pzErrMsg; /* Unused parameter */
+ rc = sqlite3_create_function(db, "uuid", 0, SQLITE_UTF8|SQLITE_INNOCUOUS, 0,
+ sqlite3UuidFunc, 0, 0);
+ if( rc==SQLITE_OK ){
+- rc = sqlite3_create_function(db, "uuid_str", 1,
++ rc = sqlite3_create_function(db, "uuid_str", 1,
+ SQLITE_UTF8|SQLITE_INNOCUOUS|SQLITE_DETERMINISTIC,
+ 0, sqlite3UuidStrFunc, 0, 0);
+ }
+@@ -231,3 +222,18 @@
+ }
+ return rc;
+ }
++
++#if !defined(SQLITE_CORE) || defined(SQLITE_TEST)
++#ifdef _WIN32
++__declspec(dllexport)
++#endif
++int sqlite3_uuid_init(
++ sqlite3 *db,
++ char **pzErrMsg,
++ const sqlite3_api_routines *pApi
++){
++ SQLITE_EXTENSION_INIT2(pApi);
++ (void)pzErrMsg; /* Unused parameter */
++ return sqlite3UuidInit(db);
++}
++#endif /* !defined(SQLITE_CORE) || defined(SQLITE_TEST) */
+--- /ext/misc/zipfile.c
++++ /ext/misc/zipfile.c
+@@ -24,6 +24,8 @@
+ ** * No support for zip64 extensions
+ ** * Only the "inflate/deflate" (zlib) compression method is supported
+ */
++#ifdef SQLITE_HAVE_ZLIB
++
+ #include "sqlite3ext.h"
+ SQLITE_EXTENSION_INIT1
+ #include
+@@ -2137,7 +2139,7 @@
+ /*
+ ** Register the "zipfile" virtual table.
+ */
+-static int zipfileRegister(sqlite3 *db){
++int sqlite3ZipfileInit(sqlite3 *db){
+ static sqlite3_module zipfileModule = {
+ 1, /* iVersion */
+ zipfileConnect, /* xCreate */
+@@ -2171,9 +2173,10 @@
+ return rc;
+ }
+ #else /* SQLITE_OMIT_VIRTUALTABLE */
+-# define zipfileRegister(x) SQLITE_OK
++# define sqlite3ZipfileInit(x) SQLITE_OK
+ #endif
+
++#if !defined(SQLITE_CORE) || defined(SQLITE_TEST)
+ #ifdef _WIN32
+ __declspec(dllexport)
+ #endif
+@@ -2184,5 +2187,8 @@
+ ){
+ SQLITE_EXTENSION_INIT2(pApi);
+ (void)pzErrMsg; /* Unused parameter */
+- return zipfileRegister(db);
++ return sqlite3ZipfileInit(db);
+ }
++#endif /* !defined(SQLITE_CORE) || defined(SQLITE_TEST) */
++
++#endif /* SQLITE_HAVE_ZLIB */
diff --git a/dev-db/sqlite/files/sqlite-3.32.1-full_archive-build_2.patch b/dev-db/sqlite/files/sqlite-3.32.1-full_archive-build_2.patch
new file mode 100644
index 000000000000..f12c0b22a483
--- /dev/null
+++ b/dev-db/sqlite/files/sqlite-3.32.1-full_archive-build_2.patch
@@ -0,0 +1,640 @@
+Enable some extensions in libsqlite3.so.
+Move some code to libsqlite3.so to avoid duplication.
+Link executables against libsqlite3.so.
+Increase timeout for fuzzcheck.
+Fix building with dlopen() not available.
+
+--- /Makefile.in
++++ /Makefile.in
+@@ -313,6 +313,9 @@
+ # Source code for extensions
+ #
+ SRC += \
++ $(TOP)/ext/expert/sqlite3expert.c \
++ $(TOP)/ext/expert/sqlite3expert.h
++SRC += \
+ $(TOP)/ext/fts1/fts1.c \
+ $(TOP)/ext/fts1/fts1.h \
+ $(TOP)/ext/fts1/fts1_hash.c \
+@@ -365,8 +368,24 @@
+ $(TOP)/ext/rbu/sqlite3rbu.h \
+ $(TOP)/ext/rbu/sqlite3rbu.c
+ SRC += \
++ $(TOP)/ext/misc/appendvfs.c \
++ $(TOP)/ext/misc/carray.c \
++ $(TOP)/ext/misc/completion.c \
++ $(TOP)/ext/misc/csv.c \
++ $(TOP)/ext/misc/dbdata.c \
++ $(TOP)/ext/misc/eval.c \
++ $(TOP)/ext/misc/fileio.c \
++ $(TOP)/ext/misc/ieee754.c \
+ $(TOP)/ext/misc/json1.c \
+- $(TOP)/ext/misc/stmt.c
++ $(TOP)/ext/misc/regexp.c \
++ $(TOP)/ext/misc/sha1.c \
++ $(TOP)/ext/misc/shathree.c \
++ $(TOP)/ext/misc/sqlar.c \
++ $(TOP)/ext/misc/stmt.c \
++ $(TOP)/ext/misc/totype.c \
++ $(TOP)/ext/misc/uint.c \
++ $(TOP)/ext/misc/uuid.c \
++ $(TOP)/ext/misc/zipfile.c
+
+ # Generated source code files
+ #
+@@ -437,33 +456,24 @@
+ # Statically linked extensions
+ #
+ TESTSRC += \
+- $(TOP)/ext/expert/sqlite3expert.c \
+ $(TOP)/ext/expert/test_expert.c \
+ $(TOP)/ext/misc/amatch.c \
+- $(TOP)/ext/misc/carray.c \
+ $(TOP)/ext/misc/closure.c \
+- $(TOP)/ext/misc/csv.c \
+- $(TOP)/ext/misc/eval.c \
+ $(TOP)/ext/misc/explain.c \
+- $(TOP)/ext/misc/fileio.c \
+ $(TOP)/ext/misc/fuzzer.c \
+ $(TOP)/ext/fts5/fts5_tcl.c \
+ $(TOP)/ext/fts5/fts5_test_mi.c \
+ $(TOP)/ext/fts5/fts5_test_tok.c \
+- $(TOP)/ext/misc/ieee754.c \
+ $(TOP)/ext/misc/mmapwarm.c \
+ $(TOP)/ext/misc/nextchar.c \
+ $(TOP)/ext/misc/normalize.c \
+ $(TOP)/ext/misc/percentile.c \
+ $(TOP)/ext/misc/prefixes.c \
+- $(TOP)/ext/misc/regexp.c \
+ $(TOP)/ext/misc/remember.c \
+ $(TOP)/ext/misc/series.c \
+ $(TOP)/ext/misc/spellfix.c \
+- $(TOP)/ext/misc/totype.c \
+ $(TOP)/ext/misc/unionvtab.c \
+ $(TOP)/ext/misc/wholenumber.c \
+- $(TOP)/ext/misc/zipfile.c \
+ $(TOP)/ext/userauth/userauth.c
+
+ # Source code to the library files needed by the test fixture
+@@ -645,25 +655,25 @@
+
+ libtclsqlite3.la: tclsqlite.lo libsqlite3.la
+ $(LTLINK) -no-undefined -o $@ tclsqlite.lo \
+- libsqlite3.la @TCL_STUB_LIB_SPEC@ $(TLIBS) \
++ libsqlite3.la @TCL_STUB_LIB_SPEC@ \
+ -rpath "$(TCLLIBDIR)" \
+ -version-info "8:6:8" \
+ -avoid-version
+
+-sqlite3$(TEXE): shell.c sqlite3.c
+- $(LTLINK) $(READLINE_FLAGS) $(SHELL_OPT) -o $@ \
+- shell.c sqlite3.c \
+- $(LIBREADLINE) $(TLIBS) -rpath "$(libdir)"
++sqlite3$(TEXE): shell.c libsqlite3.la
++ $(LTLINK) $(READLINE_FLAGS) -o $@ \
++ shell.c libsqlite3.la \
++ $(LIBREADLINE)
+
+-sqldiff$(TEXE): $(TOP)/tool/sqldiff.c sqlite3.lo sqlite3.h
+- $(LTLINK) -o $@ $(TOP)/tool/sqldiff.c sqlite3.lo $(TLIBS)
++sqldiff$(TEXE): $(TOP)/tool/sqldiff.c libsqlite3.la
++ $(LTLINK) -o $@ $(TOP)/tool/sqldiff.c libsqlite3.la
+
+-dbhash$(TEXE): $(TOP)/tool/dbhash.c sqlite3.lo sqlite3.h
+- $(LTLINK) -o $@ $(TOP)/tool/dbhash.c sqlite3.lo $(TLIBS)
++dbhash$(TEXE): $(TOP)/tool/dbhash.c libsqlite3.la
++ $(LTLINK) -o $@ $(TOP)/tool/dbhash.c libsqlite3.la
+
+-scrub$(TEXE): $(TOP)/ext/misc/scrub.c sqlite3.lo
++scrub$(TEXE): $(TOP)/ext/misc/scrub.c libsqlite3.la
+ $(LTLINK) -o $@ -I. -DSCRUB_STANDALONE \
+- $(TOP)/ext/misc/scrub.c sqlite3.lo $(TLIBS)
++ $(TOP)/ext/misc/scrub.c libsqlite3.la
+
+ srcck1$(BEXE): $(TOP)/tool/srcck1.c
+ $(BCC) -o srcck1$(BEXE) $(TOP)/tool/srcck1.c
+@@ -774,7 +784,7 @@
+ # Rule to build the amalgamation
+ #
+ sqlite3.lo: sqlite3.c
+- $(LTCOMPILE) $(TEMP_STORE) -c sqlite3.c
++ $(LTCOMPILE) $(SHELL_OPT) $(TEMP_STORE) -c sqlite3.c
+
+ # Rules to build the LEMON compiler generator
+ #
+@@ -1074,15 +1084,6 @@
+ # Source files that go into making shell.c
+ SHELL_SRC = \
+ $(TOP)/src/shell.c.in \
+- $(TOP)/ext/misc/appendvfs.c \
+- $(TOP)/ext/misc/shathree.c \
+- $(TOP)/ext/misc/fileio.c \
+- $(TOP)/ext/misc/completion.c \
+- $(TOP)/ext/misc/sqlar.c \
+- $(TOP)/ext/misc/uint.c \
+- $(TOP)/ext/expert/sqlite3expert.c \
+- $(TOP)/ext/expert/sqlite3expert.h \
+- $(TOP)/ext/misc/zipfile.c \
+ $(TOP)/ext/misc/memtrace.c \
+ $(TOP)/src/test_windirent.c
+
+@@ -1251,11 +1252,11 @@
+
+ # Fuzz testing
+ fuzztest: fuzzcheck$(TEXE) $(FUZZDATA) sessionfuzz$(TEXE) $(TOP)/test/sessionfuzz-data1.db
+- ./fuzzcheck$(TEXE) $(FUZZDATA)
++ ./fuzzcheck$(TEXE) --timeout 3600 $(FUZZDATA)
+ ./sessionfuzz$(TEXE) run $(TOP)/test/sessionfuzz-data1.db
+
+ valgrindfuzz: fuzzcheck$(TEXT) $(FUZZDATA) sessionfuzz$(TEXE) $(TOP)/test/sessionfuzz-data1.db
+- valgrind ./fuzzcheck$(TEXE) --cell-size-check --limit-mem 10M --timeout 600 $(FUZZDATA)
++ valgrind ./fuzzcheck$(TEXE) --cell-size-check --limit-mem 10M --timeout 3600 $(FUZZDATA)
+ valgrind ./sessionfuzz$(TEXE) run $(TOP)/test/sessionfuzz-data1.db
+
+ # The veryquick.test TCL tests.
+@@ -1286,24 +1287,23 @@
+ smoketest: $(TESTPROGS) fuzzcheck$(TEXE)
+ ./testfixture$(TEXE) $(TOP)/test/main.test $(TESTOPTS)
+
+-sqlite3_analyzer.c: sqlite3.c $(TOP)/src/tclsqlite.c $(TOP)/tool/spaceanal.tcl $(TOP)/tool/mkccode.tcl $(TOP)/tool/sqlite3_analyzer.c.in
++sqlite3_analyzer.c: $(TOP)/src/tclsqlite.c $(TOP)/tool/spaceanal.tcl $(TOP)/tool/mkccode.tcl $(TOP)/tool/sqlite3_analyzer.c.in
+ $(TCLSH_CMD) $(TOP)/tool/mkccode.tcl $(TOP)/tool/sqlite3_analyzer.c.in >sqlite3_analyzer.c
+
+-sqlite3_analyzer$(TEXE): sqlite3_analyzer.c
+- $(LTLINK) sqlite3_analyzer.c -o $@ $(LIBTCL) $(TLIBS)
++sqlite3_analyzer$(TEXE): sqlite3_analyzer.c libsqlite3.la
++ $(LTLINK) sqlite3_analyzer.c -o $@ libsqlite3.la $(LIBTCL)
+
+-sqltclsh.c: sqlite3.c $(TOP)/src/tclsqlite.c $(TOP)/tool/sqltclsh.tcl $(TOP)/ext/misc/appendvfs.c $(TOP)/tool/mkccode.tcl $(TOP)/tool/sqltclsh.c.in
++sqltclsh.c: $(TOP)/src/tclsqlite.c $(TOP)/tool/sqltclsh.tcl $(TOP)/tool/mkccode.tcl $(TOP)/tool/sqltclsh.c.in
+ $(TCLSH_CMD) $(TOP)/tool/mkccode.tcl $(TOP)/tool/sqltclsh.c.in >sqltclsh.c
+
+-sqltclsh$(TEXE): sqltclsh.c
+- $(LTLINK) sqltclsh.c -o $@ $(LIBTCL) $(TLIBS)
++sqltclsh$(TEXE): sqltclsh.c libsqlite3.la
++ $(LTLINK) sqltclsh.c -o $@ libsqlite3.la $(LIBTCL)
+
+-sqlite3_expert$(TEXE): $(TOP)/ext/expert/sqlite3expert.h $(TOP)/ext/expert/sqlite3expert.c $(TOP)/ext/expert/expert.c sqlite3.c
+- $(LTLINK) $(TOP)/ext/expert/sqlite3expert.h $(TOP)/ext/expert/sqlite3expert.c $(TOP)/ext/expert/expert.c sqlite3.c -o sqlite3_expert $(TLIBS)
++sqlite3_expert$(TEXE): $(TOP)/ext/expert/sqlite3expert.h $(TOP)/ext/expert/expert.c libsqlite3.la
++ $(LTLINK) $(TOP)/ext/expert/expert.c -o sqlite3_expert libsqlite3.la
+
+ CHECKER_DEPS =\
+ $(TOP)/tool/mkccode.tcl \
+- sqlite3.c \
+ $(TOP)/src/tclsqlite.c \
+ $(TOP)/ext/repair/sqlite3_checker.tcl \
+ $(TOP)/ext/repair/checkindex.c \
+@@ -1314,36 +1314,36 @@
+ sqlite3_checker.c: $(CHECKER_DEPS)
+ $(TCLSH_CMD) $(TOP)/tool/mkccode.tcl $(TOP)/ext/repair/sqlite3_checker.c.in >$@
+
+-sqlite3_checker$(TEXE): sqlite3_checker.c
+- $(LTLINK) sqlite3_checker.c -o $@ $(LIBTCL) $(TLIBS)
++sqlite3_checker$(TEXE): sqlite3_checker.c libsqlite3.la
++ $(LTLINK) sqlite3_checker.c -o $@ libsqlite3.la $(LIBTCL)
+
+-dbdump$(TEXE): $(TOP)/ext/misc/dbdump.c sqlite3.lo
++dbdump$(TEXE): $(TOP)/ext/misc/dbdump.c libsqlite3.la
+ $(LTLINK) -DDBDUMP_STANDALONE -o $@ \
+- $(TOP)/ext/misc/dbdump.c sqlite3.lo $(TLIBS)
++ $(TOP)/ext/misc/dbdump.c libsqlite3.la
+
+-dbtotxt$(TEXE): $(TOP)/tool/dbtotxt.c
+- $(LTLINK)-o $@ $(TOP)/tool/dbtotxt.c
++dbtotxt$(TEXE): $(TOP)/tool/dbtotxt.c
++ $(LTLINK) -o $@ $(TOP)/tool/dbtotxt.c
+
+-showdb$(TEXE): $(TOP)/tool/showdb.c sqlite3.lo
+- $(LTLINK) -o $@ $(TOP)/tool/showdb.c sqlite3.lo $(TLIBS)
++showdb$(TEXE): $(TOP)/tool/showdb.c libsqlite3.la
++ $(LTLINK) -o $@ $(TOP)/tool/showdb.c libsqlite3.la
+
+-showstat4$(TEXE): $(TOP)/tool/showstat4.c sqlite3.lo
+- $(LTLINK) -o $@ $(TOP)/tool/showstat4.c sqlite3.lo $(TLIBS)
++showstat4$(TEXE): $(TOP)/tool/showstat4.c libsqlite3.la
++ $(LTLINK) -o $@ $(TOP)/tool/showstat4.c libsqlite3.la
+
+-showjournal$(TEXE): $(TOP)/tool/showjournal.c sqlite3.lo
+- $(LTLINK) -o $@ $(TOP)/tool/showjournal.c sqlite3.lo $(TLIBS)
++showjournal$(TEXE): $(TOP)/tool/showjournal.c
++ $(LTLINK) -o $@ $(TOP)/tool/showjournal.c
+
+-showwal$(TEXE): $(TOP)/tool/showwal.c sqlite3.lo
+- $(LTLINK) -o $@ $(TOP)/tool/showwal.c sqlite3.lo $(TLIBS)
++showwal$(TEXE): $(TOP)/tool/showwal.c
++ $(LTLINK) -o $@ $(TOP)/tool/showwal.c
+
+ showshm$(TEXE): $(TOP)/tool/showshm.c
+ $(LTLINK) -o $@ $(TOP)/tool/showshm.c
+
+-index_usage$(TEXE): $(TOP)/tool/index_usage.c sqlite3.lo
+- $(LTLINK) $(SHELL_OPT) -o $@ $(TOP)/tool/index_usage.c sqlite3.lo $(TLIBS)
++index_usage$(TEXE): $(TOP)/tool/index_usage.c libsqlite3.la
++ $(LTLINK) -o $@ $(TOP)/tool/index_usage.c libsqlite3.la
+
+-changeset$(TEXE): $(TOP)/ext/session/changeset.c sqlite3.lo
+- $(LTLINK) -o $@ $(TOP)/ext/session/changeset.c sqlite3.lo $(TLIBS)
++changeset$(TEXE): $(TOP)/ext/session/changeset.c libsqlite3.la
++ $(LTLINK) -o $@ $(TOP)/ext/session/changeset.c libsqlite3.la
+
+ changesetfuzz$(TEXE): $(TOP)/ext/session/changesetfuzz.c sqlite3.lo
+ $(LTLINK) -o $@ $(TOP)/ext/session/changesetfuzz.c sqlite3.lo $(TLIBS)
+@@ -1368,11 +1368,11 @@
+ kvtest$(TEXE): $(TOP)/test/kvtest.c sqlite3.c
+ $(LTLINK) $(KV_OPT) -o $@ $(TOP)/test/kvtest.c sqlite3.c $(TLIBS)
+
+-rbu$(EXE): $(TOP)/ext/rbu/rbu.c $(TOP)/ext/rbu/sqlite3rbu.c sqlite3.lo
+- $(LTLINK) -I. -o $@ $(TOP)/ext/rbu/rbu.c sqlite3.lo $(TLIBS)
++rbu$(EXE): $(TOP)/ext/rbu/rbu.c libsqlite3.la
++ $(LTLINK) -I. -o $@ $(TOP)/ext/rbu/rbu.c libsqlite3.la
+
+-loadfts$(EXE): $(TOP)/tool/loadfts.c libsqlite3.la
+- $(LTLINK) $(TOP)/tool/loadfts.c libsqlite3.la -o $@ $(TLIBS)
++loadfts$(EXE): $(TOP)/tool/loadfts.c libsqlite3.la
++ $(LTLINK) $(TOP)/tool/loadfts.c libsqlite3.la -o $@
+
+ # This target will fail if the SQLite amalgamation contains any exported
+ # symbols that do not begin with "sqlite3_". It is run as part of the
+--- /configure.ac
++++ /configure.ac
+@@ -587,6 +587,9 @@
+ if test "${enable_load_extension}" = "yes" ; then
+ OPT_FEATURE_FLAGS=""
+ AC_SEARCH_LIBS(dlopen, dl)
++ if test "${ac_cv_search_dlopen}" = "no" ; then
++ OPT_FEATURE_FLAGS="-DSQLITE_OMIT_LOAD_EXTENSION=1"
++ fi
+ else
+ OPT_FEATURE_FLAGS="-DSQLITE_OMIT_LOAD_EXTENSION=1"
+ fi
+--- /ext/repair/sqlite3_checker.c.in
++++ /ext/repair/sqlite3_checker.c.in
+@@ -2,6 +2,7 @@
+ ** Read an SQLite database file and analyze its space utilization. Generate
+ ** text on standard output.
+ */
++#define SQLITE_CORE 1
+ #define TCLSH_INIT_PROC sqlite3_checker_init_proc
+ #define SQLITE_ENABLE_DBPAGE_VTAB 1
+ #define SQLITE_ENABLE_JSON1 1
+@@ -14,7 +15,7 @@
+ #define SQLITE_OMIT_SHARED_CACHE 1
+ #define SQLITE_DEFAULT_MEMSTATUS 0
+ #define SQLITE_MAX_EXPR_DEPTH 0
+-INCLUDE sqlite3.c
++#include "sqlite3.h"
+ INCLUDE $ROOT/src/tclsqlite.c
+ INCLUDE $ROOT/ext/misc/btreeinfo.c
+ INCLUDE $ROOT/ext/repair/checkindex.c
+--- /src/main.c
++++ /src/main.c
+@@ -50,12 +50,31 @@
+ #ifdef SQLITE_ENABLE_FTS5
+ int sqlite3Fts5Init(sqlite3*);
+ #endif
++#if !defined(SQLITE_OMIT_VIRTUALTABLE) && defined(SQLITE_ENABLE_DBPAGE_VTAB)
++int sqlite3DbdataRegister(sqlite3*);
++#endif
+ #ifdef SQLITE_ENABLE_JSON1
+ int sqlite3Json1Init(sqlite3*);
+ #endif
+ #ifdef SQLITE_ENABLE_STMTVTAB
+ int sqlite3StmtVtabInit(sqlite3*);
+ #endif
++int sqlite3CarrayInit(sqlite3*);
++int sqlite3CompletionVtabInit(sqlite3*);
++int sqlite3CsvInit(sqlite3*);
++int sqlite3EvalInit(sqlite3*);
++int sqlite3FileioInit(sqlite3*);
++int sqlite3IeeeInit(sqlite3*);
++int sqlite3RegexpInit(sqlite3*);
++int sqlite3ShaInit(sqlite3*);
++int sqlite3ShathreeInit(sqlite3*);
++int sqlite3TotypeInit(sqlite3*);
++int sqlite3UintInit(sqlite3*);
++int sqlite3UuidInit(sqlite3*);
++#if !defined(SQLITE_OMIT_VIRTUALTABLE) && defined(SQLITE_HAVE_ZLIB)
++int sqlite3ZipfileInit(sqlite3*);
++int sqlite3SqlarInit(sqlite3*);
++#endif
+
+ /*
+ ** An array of pointers to extension initializer functions for
+@@ -83,6 +102,9 @@
+ #ifdef SQLITE_ENABLE_DBPAGE_VTAB
+ sqlite3DbpageRegister,
+ #endif
++#if !defined(SQLITE_OMIT_VIRTUALTABLE) && defined(SQLITE_ENABLE_DBPAGE_VTAB)
++ sqlite3DbdataRegister,
++#endif
+ #ifdef SQLITE_ENABLE_DBSTAT_VTAB
+ sqlite3DbstatRegister,
+ #endif
+@@ -96,6 +118,22 @@
+ #ifdef SQLITE_ENABLE_BYTECODE_VTAB
+ sqlite3VdbeBytecodeVtabInit,
+ #endif
++ sqlite3CarrayInit,
++ sqlite3CompletionVtabInit,
++ sqlite3CsvInit,
++ sqlite3EvalInit,
++ sqlite3FileioInit,
++ sqlite3IeeeInit,
++ sqlite3RegexpInit,
++ sqlite3ShaInit,
++ sqlite3ShathreeInit,
++ sqlite3TotypeInit,
++ sqlite3UintInit,
++ sqlite3UuidInit,
++#if !defined(SQLITE_OMIT_VIRTUALTABLE) && defined(SQLITE_HAVE_ZLIB)
++ sqlite3ZipfileInit,
++ sqlite3SqlarInit,
++#endif
+ };
+
+ #ifndef SQLITE_AMALGAMATION
+--- /src/shell.c.in
++++ /src/shell.c.in
+@@ -69,6 +69,7 @@
+ #include
+ #include
+ #include "sqlite3.h"
++#include "ext/expert/sqlite3expert.h"
+ typedef sqlite3_int64 i64;
+ typedef sqlite3_uint64 u64;
+ typedef unsigned char u8;
+@@ -135,6 +136,10 @@
+ # define SHELL_USE_LOCAL_GETLINE 1
+ #endif
+
++#ifdef SQLITE_HAVE_ZLIB
++#include
++#endif
++
+
+ #if defined(_WIN32) || defined(WIN32)
+ # if SQLITE_OS_WINRT
+@@ -1005,22 +1010,7 @@
+ INCLUDE test_windirent.c
+ #define dirent DIRENT
+ #endif
+-INCLUDE ../ext/misc/shathree.c
+-INCLUDE ../ext/misc/fileio.c
+-INCLUDE ../ext/misc/completion.c
+-INCLUDE ../ext/misc/appendvfs.c
+ INCLUDE ../ext/misc/memtrace.c
+-INCLUDE ../ext/misc/uint.c
+-#ifdef SQLITE_HAVE_ZLIB
+-INCLUDE ../ext/misc/zipfile.c
+-INCLUDE ../ext/misc/sqlar.c
+-#endif
+-INCLUDE ../ext/expert/sqlite3expert.h
+-INCLUDE ../ext/expert/sqlite3expert.c
+-
+-#if !defined(SQLITE_OMIT_VIRTUALTABLE) && defined(SQLITE_ENABLE_DBPAGE_VTAB)
+-INCLUDE ../ext/misc/dbdata.c
+-#endif
+
+ #if defined(SQLITE_ENABLE_SESSION)
+ /*
+@@ -4261,17 +4251,6 @@
+ #ifndef SQLITE_OMIT_LOAD_EXTENSION
+ sqlite3_enable_load_extension(p->db, 1);
+ #endif
+- sqlite3_fileio_init(p->db, 0, 0);
+- sqlite3_shathree_init(p->db, 0, 0);
+- sqlite3_completion_init(p->db, 0, 0);
+- sqlite3_uint_init(p->db, 0, 0);
+-#if !defined(SQLITE_OMIT_VIRTUALTABLE) && defined(SQLITE_ENABLE_DBPAGE_VTAB)
+- sqlite3_dbdata_init(p->db, 0, 0);
+-#endif
+-#ifdef SQLITE_HAVE_ZLIB
+- sqlite3_zipfile_init(p->db, 0, 0);
+- sqlite3_sqlar_init(p->db, 0, 0);
+-#endif
+ sqlite3_create_function(p->db, "shell_add_schema", 3, SQLITE_UTF8, 0,
+ shellAddSchemaName, 0, 0);
+ sqlite3_create_function(p->db, "shell_module_schema", 1, SQLITE_UTF8, 0,
+@@ -6281,8 +6260,6 @@
+ );
+ goto end_ar_command;
+ }
+- sqlite3_fileio_init(cmd.db, 0, 0);
+- sqlite3_sqlar_init(cmd.db, 0, 0);
+ sqlite3_create_function(cmd.db, "shell_putsnl", 1, SQLITE_UTF8, cmd.p,
+ shellPutsFunc, 0, 0);
+
+@@ -10621,6 +10598,7 @@
+ #endif
+ }
+ data.out = stdout;
++ extern int sqlite3_appendvfs_init(sqlite3 *, char **, const sqlite3_api_routines *);
+ sqlite3_appendvfs_init(0,0,0);
+
+ /* Go ahead and open the database file if it already exists. If the
+--- /src/test_config.c
++++ /src/test_config.c
+@@ -540,6 +540,8 @@
+ Tcl_SetVar2(interp, "sqlite_options", "progress", "1", TCL_GLOBAL_ONLY);
+ #endif
+
++ Tcl_SetVar2(interp, "sqlite_options", "regexp", "1", TCL_GLOBAL_ONLY);
++
+ #ifdef SQLITE_OMIT_REINDEX
+ Tcl_SetVar2(interp, "sqlite_options", "reindex", "0", TCL_GLOBAL_ONLY);
+ #else
+@@ -662,6 +664,8 @@
+ Tcl_SetVar2(interp, "sqlite_options", "truncate_opt", "1", TCL_GLOBAL_ONLY);
+ #endif
+
++ Tcl_SetVar2(interp, "sqlite_options", "uint", "1", TCL_GLOBAL_ONLY);
++
+ #ifdef SQLITE_OMIT_UTF16
+ Tcl_SetVar2(interp, "sqlite_options", "utf16", "0", TCL_GLOBAL_ONLY);
+ #else
+--- /test/e_expr.test
++++ /test/e_expr.test
+@@ -1078,7 +1078,7 @@
+ #
+ # There is a regexp function if ICU is enabled though.
+ #
+-ifcapable !icu {
++ifcapable !icu&&!regexp {
+ do_catchsql_test e_expr-18.1.1 {
+ SELECT regexp('abc', 'def')
+ } {1 {no such function: regexp}}
+--- /test/icu.test
++++ /test/icu.test
+@@ -41,7 +41,7 @@
+ #
+ test_expr icu-1.1 {i1='hello'} {i1 REGEXP 'hello'} 1
+ test_expr icu-1.2 {i1='hello'} {i1 REGEXP '.ello'} 1
+- test_expr icu-1.3 {i1='hello'} {i1 REGEXP '.ell'} 0
++ test_expr icu-1.3 {i1='hello'} {i1 REGEXP '.ell$'} 0
+ test_expr icu-1.4 {i1='hello'} {i1 REGEXP '.ell.*'} 1
+ test_expr icu-1.5 {i1=NULL} {i1 REGEXP '.ell.*'} {}
+
+--- /test/pragma.test
++++ /test/pragma.test
+@@ -1360,17 +1360,32 @@
+ } ;# ifcapable trigger
+
+ ifcapable schema_pragmas {
+- do_test pragma-11.1 {
+- execsql2 {
+- pragma collation_list;
+- }
+- } {seq 0 name RTRIM seq 1 name NOCASE seq 2 name BINARY}
+- do_test pragma-11.2 {
+- db collate New_Collation blah...
+- execsql {
+- pragma collation_list;
+- }
+- } {0 New_Collation 1 RTRIM 2 NOCASE 3 BINARY}
++ ifcapable uint {
++ do_test pragma-11.1 {
++ execsql2 {
++ pragma collation_list;
++ }
++ } {seq 0 name UINT seq 1 name RTRIM seq 2 name NOCASE seq 3 name BINARY}
++ do_test pragma-11.2 {
++ db collate New_Collation blah...
++ execsql {
++ pragma collation_list;
++ }
++ } {0 New_Collation 1 UINT 2 RTRIM 3 NOCASE 4 BINARY}
++ }
++ ifcapable !uint {
++ do_test pragma-11.1 {
++ execsql2 {
++ pragma collation_list;
++ }
++ } {seq 0 name RTRIM seq 1 name NOCASE seq 2 name BINARY}
++ do_test pragma-11.2 {
++ db collate New_Collation blah...
++ execsql {
++ pragma collation_list;
++ }
++ } {0 New_Collation 1 RTRIM 2 NOCASE 3 BINARY}
++ }
+ }
+
+ ifcapable schema_pragmas&&tempdb {
+--- /test/sessionfuzz.c
++++ /test/sessionfuzz.c
+@@ -700,42 +700,6 @@
+ #include
+ #include "zlib.h"
+
+-/*
+-** Implementation of the "sqlar_uncompress(X,SZ)" SQL function
+-**
+-** Parameter SZ is interpreted as an integer. If it is less than or
+-** equal to zero, then this function returns a copy of X. Or, if
+-** SZ is equal to the size of X when interpreted as a blob, also
+-** return a copy of X. Otherwise, decompress blob X using zlib
+-** utility function uncompress() and return the results (another
+-** blob).
+-*/
+-static void sqlarUncompressFunc(
+- sqlite3_context *context,
+- int argc,
+- sqlite3_value **argv
+-){
+- uLong nData;
+- uLongf sz;
+-
+- assert( argc==2 );
+- sz = sqlite3_value_int(argv[1]);
+-
+- if( sz<=0 || sz==(nData = sqlite3_value_bytes(argv[0])) ){
+- sqlite3_result_value(context, argv[0]);
+- }else{
+- const Bytef *pData= sqlite3_value_blob(argv[0]);
+- Bytef *pOut = sqlite3_malloc(sz);
+- if( Z_OK!=uncompress(pOut, &sz, pData, nData) ){
+- sqlite3_result_error(context, "error in uncompress()", -1);
+- }else{
+- sqlite3_result_blob(context, pOut, sz, SQLITE_TRANSIENT);
+- }
+- sqlite3_free(pOut);
+- }
+-}
+-
+-
+ /* Run a chunk of SQL. If any errors happen, print an error message
+ ** and exit.
+ */
+--- /tool/mksqlite3c.tcl
++++ /tool/mksqlite3c.tcl
+@@ -117,6 +117,7 @@
+ rtree.h
+ sqlite3session.h
+ sqlite3.h
++ sqlite3expert.h
+ sqlite3ext.h
+ sqlite3rbu.h
+ sqliteicu.h
+@@ -404,6 +405,23 @@
+ sqlite3session.c
+ fts5.c
+ stmt.c
++ appendvfs.c
++ carray.c
++ completion.c
++ csv.c
++ dbdata.c
++ eval.c
++ fileio.c
++ ieee754.c
++ regexp.c
++ sha1.c
++ shathree.c
++ sqlar.c
++ sqlite3expert.c
++ totype.c
++ uint.c
++ uuid.c
++ zipfile.c
+ } {
+ copy_file tsrc/$file
+ }
+--- /tool/sqlite3_analyzer.c.in
++++ /tool/sqlite3_analyzer.c.in
+@@ -14,9 +14,6 @@
+ #define SQLITE_DEFAULT_MEMSTATUS 0
+ #define SQLITE_MAX_EXPR_DEPTH 0
+ #define SQLITE_OMIT_LOAD_EXTENSION 1
+-#ifndef USE_EXTERNAL_SQLITE
+-INCLUDE sqlite3.c
+-#endif
+ INCLUDE $ROOT/src/tclsqlite.c
+
+ const char *sqlite3_analyzer_init_proc(Tcl_Interp *interp){
+--- /tool/sqltclsh.c.in
++++ /tool/sqltclsh.c.in
+@@ -27,21 +27,13 @@
+ #define SQLITE_OMIT_SHARED_CACHE 1
+ #define SQLITE_DEFAULT_MEMSTATUS 0
+ #define SQLITE_MAX_EXPR_DEPTH 0
+-INCLUDE sqlite3.c
+-INCLUDE $ROOT/ext/misc/appendvfs.c
+-#ifdef SQLITE_HAVE_ZLIB
+-INCLUDE $ROOT/ext/misc/zipfile.c
+-INCLUDE $ROOT/ext/misc/sqlar.c
+-#endif
++#include "sqlite3.h"
+ INCLUDE $ROOT/src/tclsqlite.c
+
+ const char *sqlite3_tclapp_init_proc(Tcl_Interp *interp){
+ (void)interp;
++ extern int sqlite3_appendvfs_init(sqlite3 *,char **, const sqlite3_api_routines *);
+ sqlite3_appendvfs_init(0,0,0);
+-#ifdef SQLITE_HAVE_ZLIB
+- sqlite3_auto_extension((void(*)(void))sqlite3_sqlar_init);
+- sqlite3_auto_extension((void(*)(void))sqlite3_zipfile_init);
+-#endif
+
+ return
+ BEGIN_STRING
diff --git a/dev-db/sqlite/files/sqlite-3.32.3-security_fixes.patch b/dev-db/sqlite/files/sqlite-3.32.3-security_fixes.patch
new file mode 100644
index 000000000000..ad2a3bfe16d0
--- /dev/null
+++ b/dev-db/sqlite/files/sqlite-3.32.3-security_fixes.patch
@@ -0,0 +1,146 @@
+https://sqlite.org/src/info/cc888878ea8d5bc7
+https://sqlite.org/src/info/be545f85a6ef09cc
+https://sqlite.org/src/info/6e0ffa2053124168
+https://sqlite.org/src/info/4d0cfb1236884349
+
+--- /ext/fts3/fts3.c
++++ /ext/fts3/fts3.c
+@@ -5208,10 +5208,12 @@
+ );
+ if( res ){
+ nNew = (int)(pOut - pPhrase->doclist.pList) - 1;
+- assert( pPhrase->doclist.pList[nNew]=='\0' );
+- assert( nNew<=pPhrase->doclist.nList && nNew>0 );
+- memset(&pPhrase->doclist.pList[nNew], 0, pPhrase->doclist.nList - nNew);
+- pPhrase->doclist.nList = nNew;
++ if( nNew>=0 ){
++ assert( pPhrase->doclist.pList[nNew]=='\0' );
++ assert( nNew<=pPhrase->doclist.nList && nNew>0 );
++ memset(&pPhrase->doclist.pList[nNew], 0, pPhrase->doclist.nList - nNew);
++ pPhrase->doclist.nList = nNew;
++ }
+ *paPoslist = pPhrase->doclist.pList;
+ *pnToken = pPhrase->nToken;
+ }
+--- /ext/fts3/fts3_write.c
++++ /ext/fts3/fts3_write.c
+@@ -341,7 +341,9 @@
+ ** created by merging the oldest :2 segments from absolute level :1. See
+ ** function sqlite3Fts3Incrmerge() for details. */
+ /* 29 */ "SELECT 2 * total(1 + leaves_end_block - start_block) "
+- " FROM %Q.'%q_segdir' WHERE level = ? AND idx < ?",
++ " FROM (SELECT * FROM %Q.'%q_segdir' "
++ " WHERE level = ? ORDER BY idx ASC LIMIT ?"
++ " )",
+
+ /* SQL_DELETE_SEGDIR_ENTRY
+ ** Delete the %_segdir entry on absolute level :1 with index :2. */
+@@ -2853,6 +2855,19 @@
+ return SQLITE_OK;
+ }
+
++static int fts3GrowSegReaderBuffer(Fts3MultiSegReader *pCsr, int nReq){
++ if( nReq>pCsr->nBuffer ){
++ char *aNew;
++ pCsr->nBuffer = nReq*2;
++ aNew = sqlite3_realloc(pCsr->aBuffer, pCsr->nBuffer);
++ if( !aNew ){
++ return SQLITE_NOMEM;
++ }
++ pCsr->aBuffer = aNew;
++ }
++ return SQLITE_OK;
++}
++
+
+ int sqlite3Fts3SegReaderStep(
+ Fts3Table *p, /* Virtual table handle */
+@@ -2987,15 +3002,9 @@
+ }
+
+ nByte = sqlite3Fts3VarintLen(iDelta) + (isRequirePos?nList+1:0);
+- if( nDoclist+nByte>pCsr->nBuffer ){
+- char *aNew;
+- pCsr->nBuffer = (nDoclist+nByte)*2;
+- aNew = sqlite3_realloc(pCsr->aBuffer, pCsr->nBuffer);
+- if( !aNew ){
+- return SQLITE_NOMEM;
+- }
+- pCsr->aBuffer = aNew;
+- }
++
++ rc = fts3GrowSegReaderBuffer(pCsr, nByte+nDoclist);
++ if( rc ) return rc;
+
+ if( isFirst ){
+ char *a = &pCsr->aBuffer[nDoclist];
+@@ -3020,6 +3029,9 @@
+ fts3SegReaderSort(apSegment, nMerge, j, xCmp);
+ }
+ if( nDoclist>0 ){
++ rc = fts3GrowSegReaderBuffer(pCsr, nDoclist+FTS3_NODE_PADDING);
++ if( rc ) return rc;
++ memset(&pCsr->aBuffer[nDoclist], 0, FTS3_NODE_PADDING);
+ pCsr->aDoclist = pCsr->aBuffer;
+ pCsr->nDoclist = nDoclist;
+ rc = SQLITE_ROW;
+--- /src/expr.c
++++ /src/expr.c
+@@ -4272,7 +4272,9 @@
+ int nCol;
+ testcase( op==TK_EXISTS );
+ testcase( op==TK_SELECT );
+- if( op==TK_SELECT && (nCol = pExpr->x.pSelect->pEList->nExpr)!=1 ){
++ if( pParse->db->mallocFailed ){
++ return 0;
++ }else if( op==TK_SELECT && (nCol = pExpr->x.pSelect->pEList->nExpr)!=1 ){
+ sqlite3SubselectError(pParse, nCol, 1);
+ }else{
+ return sqlite3CodeSubselect(pParse, pExpr);
+--- /test/fts3corrupt4.test
++++ /test/fts3corrupt4.test
+@@ -6123,4 +6123,44 @@
+ SELECT offsets(t1) FROM t1 WHERE t1 MATCH 'rtree ner "json1^enable"';
+ }
+
++#-------------------------------------------------------------------------
++do_execsql_test 42.1 {
++ CREATE VIRTUAL TABLE f USING fts3(a, b);
++}
++do_execsql_test 42.2 {
++ INSERT INTO f_segdir VALUES(0,2,1111,0,0,X'00');
++ INSERT INTO f_segdir VALUES(0,3,0 ,0,0,X'00013003010200');
++}
++do_execsql_test 42.3 {
++ INSERT INTO f(f) VALUES ('merge=107,2');
++}
++
++#-------------------------------------------------------------------------
++reset_db
++set saved $sqlite_fts3_enable_parentheses
++set sqlite_fts3_enable_parentheses 1
++do_execsql_test 43.1 {
++ CREATE VIRTUAL TABLE def USING fts3(xyz);
++ INSERT INTO def_segdir VALUES(0,0,0,0,0, X'0001310301c9000103323334050d81');
++} {}
++
++do_execsql_test 43.2 {
++ SELECT rowid FROM def WHERE def MATCH '1 NEAR 1'
++} {1}
++
++set sqlite_fts3_enable_parentheses $saved
++
++#-------------------------------------------------------------------------
++reset_db
++do_execsql_test 44.1 {
++ CREATE VIRTUAL TABLE t0 USING fts3(col0 INTEGER PRIMARY KEY,col1 VARCHAR(8),col2 BINARY,col3 BINARY);
++ INSERT INTO t0_content VALUES(0,NULL,NULL,NULL,NULL);
++ INSERT INTO t0_segdir VALUES(0,0,0,0,'0 42',X'00013103010200010332333405010201ba00000461616161050101020200000462626262050101030200');
++}
++
++do_execsql_test 44.2 {
++ SELECT matchinfo(t0, t0) IS NULL FROM t0 WHERE t0 MATCH '1*'
++} {0}
++
++
+ finish_test
diff --git a/dev-db/sqlite/sqlite-3.32.3.ebuild b/dev-db/sqlite/sqlite-3.32.3.ebuild
new file mode 100644
index 000000000000..d23c7e7cd724
--- /dev/null
+++ b/dev-db/sqlite/sqlite-3.32.3.ebuild
@@ -0,0 +1,340 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit autotools flag-o-matic multilib-minimal toolchain-funcs
+
+if [[ "${PV}" != "9999" ]]; then
+ SRC_PV="$(printf "%u%02u%02u%02u" $(ver_rs 1- " "))"
+ DOC_PV="${SRC_PV}"
+ # DOC_PV="$(printf "%u%02u%02u00" $(ver_rs 1-3 " "))"
+fi
+
+DESCRIPTION="SQL database engine"
+HOMEPAGE="https://sqlite.org/"
+if [[ "${PV}" == "9999" ]]; then
+ SRC_URI=""
+else
+ SRC_URI="https://sqlite.org/2020/${PN}-src-${SRC_PV}.zip
+ doc? ( https://sqlite.org/2020/${PN}-doc-${DOC_PV}.zip )"
+fi
+
+LICENSE="public-domain"
+SLOT="3"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="debug doc icu +readline secure-delete static-libs tcl test tools"
+if [[ "${PV}" == "9999" ]]; then
+ PROPERTIES="live"
+fi
+RESTRICT="!test? ( test )"
+
+if [[ "${PV}" == "9999" ]]; then
+ BDEPEND=">=dev-lang/tcl-8.6:0
+ dev-vcs/fossil"
+else
+ BDEPEND="app-arch/unzip
+ >=dev-lang/tcl-8.6:0"
+fi
+RDEPEND="sys-libs/zlib:0=[${MULTILIB_USEDEP}]
+ icu? ( dev-libs/icu:0=[${MULTILIB_USEDEP}] )
+ readline? ( sys-libs/readline:0=[${MULTILIB_USEDEP}] )
+ tcl? ( dev-lang/tcl:0=[${MULTILIB_USEDEP}] )
+ tools? ( dev-lang/tcl:0=[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+ test? ( >=dev-lang/tcl-8.6:0[${MULTILIB_USEDEP}] )"
+
+if [[ "${PV}" == "9999" ]]; then
+ S="${WORKDIR}/${PN}"
+else
+ S="${WORKDIR}/${PN}-src-${SRC_PV}"
+fi
+
+src_unpack() {
+ if [[ "${PV}" == "9999" ]]; then
+ local distdir="${PORTAGE_ACTUAL_DISTDIR:-${DISTDIR}}"
+ addwrite "${distdir}"
+ mkdir -p "${distdir}/fossil-src/${PN}" || die
+
+ mkdir "${WORKDIR}/${PN}" || die
+ pushd "${WORKDIR}/${PN}" > /dev/null || die
+ if [[ ! -f "${distdir}/fossil-src/${PN}/sqlite.fossil" ]]; then
+ einfo fossil clone --verbose https://sqlite.org/src sqlite.fossil
+ fossil clone --verbose https://sqlite.org/src sqlite.fossil || die
+ echo
+ else
+ cp -p "${distdir}/fossil-src/${PN}/sqlite.fossil" . || die
+ einfo fossil pull --repository sqlite.fossil --verbose https://sqlite.org/src
+ fossil pull --repository sqlite.fossil --verbose https://sqlite.org/src || die
+ echo
+ fi
+ cp -p sqlite.fossil "${distdir}/fossil-src/${PN}" || die
+ einfo fossil open --quiet sqlite.fossil
+ fossil open --quiet sqlite.fossil || die
+ echo
+ popd > /dev/null || die
+
+ if use doc; then
+ mkdir "${WORKDIR}/${PN}-doc" || die
+ pushd "${WORKDIR}/${PN}-doc" > /dev/null || die
+ if [[ ! -f "${distdir}/fossil-src/${PN}/sqlite-doc.fossil" ]]; then
+ einfo fossil clone --verbose https://sqlite.org/docsrc sqlite-doc.fossil
+ fossil clone --verbose https://sqlite.org/docsrc sqlite-doc.fossil || die
+ echo
+ else
+ cp -p "${distdir}/fossil-src/${PN}/sqlite-doc.fossil" . || die
+ einfo fossil pull --repository sqlite-doc.fossil --verbose https://sqlite.org/docsrc
+ fossil pull --repository sqlite-doc.fossil --verbose https://sqlite.org/docsrc || die
+ echo
+ fi
+ cp -p sqlite-doc.fossil "${distdir}/fossil-src/${PN}" || die
+ einfo fossil open --quiet sqlite-doc.fossil
+ fossil open --quiet sqlite-doc.fossil || die
+ echo
+ popd > /dev/null || die
+ fi
+ else
+ default
+ fi
+}
+
+src_prepare() {
+ eapply "${FILESDIR}/${PN}-3.32.1-full_archive-build_1.patch"
+ eapply "${FILESDIR}/${PN}-3.32.1-full_archive-build_2.patch"
+ eapply "${FILESDIR}/${PN}-3.32.3-security_fixes.patch"
+
+ eapply_user
+
+ # Fix AC_CHECK_FUNCS.
+ # https://mailinglists.sqlite.org/cgi-bin/mailman/private/sqlite-dev/2016-March/002762.html
+ sed -e "s/AC_CHECK_FUNCS(.*)/AC_CHECK_FUNCS([fdatasync fullfsync gmtime_r isnan localtime_r localtime_s malloc_usable_size posix_fallocate pread pread64 pwrite pwrite64 strchrnul usleep utime])/" -i configure.ac || die "sed failed"
+
+ eautoreconf
+
+ multilib_copy_sources
+}
+
+multilib_src_configure() {
+ local -x CPPFLAGS="${CPPFLAGS}" CFLAGS="${CFLAGS}"
+ local options=()
+
+ options+=(
+ --enable-load-extension
+ --enable-threadsafe
+ )
+
+ # Support detection of misuse of SQLite API.
+ # https://sqlite.org/compile.html#enable_api_armor
+ append-cppflags -DSQLITE_ENABLE_API_ARMOR
+
+ # Support bytecode and tables_used virtual tables.
+ # https://sqlite.org/bytecodevtab.html
+ append-cppflags -DSQLITE_ENABLE_BYTECODE_VTAB
+
+ # Support column metadata functions.
+ # https://sqlite.org/c3ref/column_database_name.html
+ append-cppflags -DSQLITE_ENABLE_COLUMN_METADATA
+
+ # Support sqlite_dbpage virtual table.
+ # https://sqlite.org/dbpage.html
+ append-cppflags -DSQLITE_ENABLE_DBPAGE_VTAB
+
+ # Support dbstat virtual table.
+ # https://sqlite.org/dbstat.html
+ append-cppflags -DSQLITE_ENABLE_DBSTAT_VTAB
+
+ # Support sqlite3_serialize() and sqlite3_deserialize() functions.
+ # https://sqlite.org/c3ref/serialize.html
+ # https://sqlite.org/c3ref/deserialize.html
+ append-cppflags -DSQLITE_ENABLE_DESERIALIZE
+
+ # Support comments in output of EXPLAIN.
+ # https://sqlite.org/compile.html#enable_explain_comments
+ append-cppflags -DSQLITE_ENABLE_EXPLAIN_COMMENTS
+
+ # Support Full-Text Search versions 3, 4 and 5.
+ # https://sqlite.org/fts3.html
+ # https://sqlite.org/fts5.html
+ append-cppflags -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_FTS3_PARENTHESIS -DSQLITE_ENABLE_FTS4
+ options+=(--enable-fts5)
+
+ # Support hidden columns.
+ append-cppflags -DSQLITE_ENABLE_HIDDEN_COLUMNS
+
+ # Support JSON1 extension.
+ # https://sqlite.org/json1.html
+ append-cppflags -DSQLITE_ENABLE_JSON1
+
+ # Support memsys5 memory allocator.
+ # https://sqlite.org/malloc.html#memsys5
+ append-cppflags -DSQLITE_ENABLE_MEMSYS5
+
+ # Support sqlite3_normalized_sql() function.
+ # https://sqlite.org/c3ref/expanded_sql.html
+ append-cppflags -DSQLITE_ENABLE_NORMALIZE
+
+ # Support sqlite_offset() function.
+ # https://sqlite.org/lang_corefunc.html#sqlite_offset
+ append-cppflags -DSQLITE_ENABLE_OFFSET_SQL_FUNC
+
+ # Support pre-update hook functions.
+ # https://sqlite.org/c3ref/preupdate_count.html
+ append-cppflags -DSQLITE_ENABLE_PREUPDATE_HOOK
+
+ # Support Resumable Bulk Update extension.
+ # https://sqlite.org/rbu.html
+ append-cppflags -DSQLITE_ENABLE_RBU
+
+ # Support R*Trees.
+ # https://sqlite.org/rtree.html
+ # https://sqlite.org/geopoly.html
+ append-cppflags -DSQLITE_ENABLE_RTREE -DSQLITE_ENABLE_GEOPOLY
+
+ # Support scan status functions.
+ # https://sqlite.org/c3ref/stmt_scanstatus.html
+ # https://sqlite.org/c3ref/stmt_scanstatus_reset.html
+ append-cppflags -DSQLITE_ENABLE_STMT_SCANSTATUS
+
+ # Support sqlite_stmt virtual table.
+ # https://sqlite.org/stmt.html
+ append-cppflags -DSQLITE_ENABLE_STMTVTAB
+
+ # Support Session extension.
+ # https://sqlite.org/sessionintro.html
+ options+=(--enable-session)
+
+ # Support unknown() function.
+ # https://sqlite.org/compile.html#enable_unknown_sql_function
+ append-cppflags -DSQLITE_ENABLE_UNKNOWN_SQL_FUNCTION
+
+ # Support unlock notification.
+ # https://sqlite.org/unlock_notify.html
+ append-cppflags -DSQLITE_ENABLE_UNLOCK_NOTIFY
+
+ # Support LIMIT and ORDER BY clauses on DELETE and UPDATE statements.
+ # https://sqlite.org/lang_delete.html#optional_limit_and_order_by_clauses
+ # https://sqlite.org/lang_update.html#optional_limit_and_order_by_clauses
+ append-cppflags -DSQLITE_ENABLE_UPDATE_DELETE_LIMIT
+
+ # Support soundex() function.
+ # https://sqlite.org/lang_corefunc.html#soundex
+ append-cppflags -DSQLITE_SOUNDEX
+
+ # Support URI filenames.
+ # https://sqlite.org/uri.html
+ append-cppflags -DSQLITE_USE_URI
+
+ # debug USE flag.
+ options+=($(use_enable debug))
+
+ # icu USE flag.
+ if use icu; then
+ # Support ICU extension.
+ # https://sqlite.org/compile.html#enable_icu
+ append-cppflags -DSQLITE_ENABLE_ICU
+ sed -e "s/^TLIBS = @LIBS@/& -licui18n -licuuc/" -i Makefile.in || die "sed failed"
+ fi
+
+ # readline USE flag.
+ options+=(
+ --disable-editline
+ $(use_enable readline)
+ )
+ if use readline; then
+ options+=(--with-readline-inc="-I${EPREFIX}/usr/include/readline")
+ fi
+
+ # secure-delete USE flag.
+ if use secure-delete; then
+ # Enable secure_delete pragma by default.
+ # https://sqlite.org/pragma.html#pragma_secure_delete
+ append-cppflags -DSQLITE_SECURE_DELETE
+ fi
+
+ # static-libs USE flag.
+ options+=($(use_enable static-libs static))
+
+ # tcl, test, tools USE flags.
+ options+=(--enable-tcl)
+
+ if [[ "${CHOST}" == *-mint* ]]; then
+ append-cppflags -DSQLITE_OMIT_WAL
+ fi
+
+ if [[ "${ABI}" == "x86" ]]; then
+ if $(tc-getCC) ${CPPFLAGS} ${CFLAGS} -E -P -dM - < /dev/null 2> /dev/null | grep -q "^#define __SSE__ 1$"; then
+ append-cflags -mfpmath=sse
+ else
+ append-cflags -ffloat-store
+ fi
+ fi
+
+ econf "${options[@]}"
+}
+
+multilib_src_compile() {
+ emake HAVE_TCL="$(usex tcl 1 "")" TCLLIBDIR="${EPREFIX}/usr/$(get_libdir)/${P}"
+
+ if use tools && multilib_is_native_abi; then
+ emake changeset dbdump dbhash dbtotxt index_usage rbu scrub showdb showjournal showshm showstat4 showwal sqldiff sqlite3_analyzer sqlite3_checker sqlite3_expert sqltclsh
+ fi
+}
+
+multilib_src_test() {
+ if [[ "${EUID}" -eq 0 ]]; then
+ ewarn "Skipping tests due to root permissions"
+ return
+ fi
+
+ local -x SQLITE_HISTORY="${T}/sqlite_history_${ABI}"
+
+ emake HAVE_TCL="$(usex tcl 1 "")" $(use debug && echo fulltest || echo test)
+}
+
+multilib_src_install() {
+ emake DESTDIR="${D}" HAVE_TCL="$(usex tcl 1 "")" TCLLIBDIR="${EPREFIX}/usr/$(get_libdir)/${P}" install
+
+ if use tools && multilib_is_native_abi; then
+ install_tool() {
+ if [[ -f ".libs/${1}" ]]; then
+ newbin ".libs/${1}" "${2}"
+ else
+ newbin "${1}" "${2}"
+ fi
+ }
+
+ install_tool changeset sqlite3-changeset
+ install_tool dbdump sqlite3-db-dump
+ install_tool dbhash sqlite3-db-hash
+ install_tool dbtotxt sqlite3-db-to-txt
+ install_tool index_usage sqlite3-index-usage
+ install_tool rbu sqlite3-rbu
+ install_tool scrub sqlite3-scrub
+ install_tool showdb sqlite3-show-db
+ install_tool showjournal sqlite3-show-journal
+ install_tool showshm sqlite3-show-shm
+ install_tool showstat4 sqlite3-show-stat4
+ install_tool showwal sqlite3-show-wal
+ install_tool sqldiff sqlite3-diff
+ install_tool sqlite3_analyzer sqlite3-analyzer
+ install_tool sqlite3_checker sqlite3-checker
+ install_tool sqlite3_expert sqlite3-expert
+ install_tool sqltclsh sqlite3-tclsh
+
+ unset -f install_tool
+ fi
+}
+
+multilib_src_install_all() {
+ find "${D}" -name "*.la" -type f -delete || die
+
+ doman sqlite3.1
+
+ if use doc; then
+ rm "${WORKDIR}/${PN}-doc-${DOC_PV}/"*.{db,txt} || die
+ (
+ docinto html
+ dodoc -r "${WORKDIR}/${PN}-doc-${DOC_PV}/"*
+ )
+ fi
+}
diff --git a/dev-erlang/Manifest.gz b/dev-erlang/Manifest.gz
index cbfb5efcde0b..be57260b5a64 100644
Binary files a/dev-erlang/Manifest.gz and b/dev-erlang/Manifest.gz differ
diff --git a/dev-erlang/p1_mysql/Manifest b/dev-erlang/p1_mysql/Manifest
index 2bf8904fa064..4001fe45dfd3 100644
--- a/dev-erlang/p1_mysql/Manifest
+++ b/dev-erlang/p1_mysql/Manifest
@@ -1,3 +1,4 @@
DIST p1_mysql-1.0.11.tar.gz 25958 BLAKE2B 6c94287fc584ed530d70e9609cc565c2c66a2b90b8bb47d85e370353e8e56dd9cb8e902406eaf330692f70c264f44977f22534e6805017a12accdcb5828a45e1 SHA512 2929b1e66aa887258b46f7dcda71f935230b9b7ea9fccf0baff2cda0782a5b7da26b9b396ed2bf3b16f07d397c88f5881ea93913a11e262be802654ac46dd9ed
DIST p1_mysql-1.0.14.tar.gz 26922 BLAKE2B 83b22c454a069fc14f7cfb82a7cb42eb4d43d3f560329159ddf503bbfe19a5f44ee7279489c5c0d028b63285c47d62e1416af24f70ad38927125de466c2b9414 SHA512 ab60ab6b43e3cca9e14e28075f1276cff02dc796a3074662c797ac2e46a38afb2726719de64bfd61e9a27b2d31665f33551d0680e137eb6167b9d32c8721e1e5
+DIST p1_mysql-1.0.15.tar.gz 26943 BLAKE2B 191a7dcfae3b5f9e3f7c317aa10ad818147f0fa81b2ab06263ba45eea9c2771133c2c8b43a707d32ea4faf875d711ec63d14882eb58aed7a4715fd27e42fbdf8 SHA512 ef1d94095ef7dbe0e260a85cd0ec9c9449e199456acd991bfa42434126a2d6d731c6068e613de4cd4a9dbc3b3540f14bf85cce127e324475ea8a72f61657acb6
DIST p1_mysql-1.0.2.tar.gz 19512 BLAKE2B 8cf7cded80d6ca1239019f3d1bbb7d4babbe0336a09b6c8ebb55e116eeb592e35a6f332ee6950c78ac6559a3850bdc1dbfa50ded2d30e008deb8e8d50b5c86d2 SHA512 ac0656b3134cfae47161a4643188784cf71e8ea19bbd5856e58d4f1d508a8771534975a631da51e7574e5adb3f64cdd250ab59ab7e9138fd5cb865e80522bd11
diff --git a/dev-erlang/p1_mysql/p1_mysql-1.0.15.ebuild b/dev-erlang/p1_mysql/p1_mysql-1.0.15.ebuild
new file mode 100644
index 000000000000..ffcadac2a5d6
--- /dev/null
+++ b/dev-erlang/p1_mysql/p1_mysql-1.0.15.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit rebar
+
+DESCRIPTION="Pure Erlang MySQL driver"
+HOMEPAGE="https://github.com/processone/p1_mysql"
+SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
+ -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+
+DEPEND=">=dev-lang/erlang-17.1"
+RDEPEND="${DEPEND}"
+
+DOCS=( CHANGELOG.md README.md )
diff --git a/dev-erlang/stringprep/Manifest b/dev-erlang/stringprep/Manifest
index d3d2b62d00fb..33bdfd932483 100644
--- a/dev-erlang/stringprep/Manifest
+++ b/dev-erlang/stringprep/Manifest
@@ -1,3 +1,4 @@
DIST stringprep-1.0.17.tar.gz 98819 BLAKE2B c1db7be3bd3618c4c1a943080a39104342b11102b9e894e457ee6f7510696a4e160b3bd50fd945be9d8d7dda4bf9eb5e5517e59f7e69cffd9b71e1db9e022e4a SHA512 170d4c96882eebf4602f0a6c87764b6c10d6a063b832c4473df11741656ac03c7b7bbb7d176a991747364f7fb9487ed0cbdbf6792378daefd41672ed685e9dd8
DIST stringprep-1.0.19.tar.gz 98841 BLAKE2B 6478699a8e784c1173a97d4329309c259bfb4376503a871277395ee160748fc32f5c207d98e645d9a1c153dca3e25b4d5fb3ca66a671b8afd709d8e8fd742438 SHA512 b4a41cb1e89d5c940468629404e351a2f0a3ea46ae4e78567ab137802d85adaac44d94eb69cec9c1f77adf2497d44b9fe5939008bdf4cdf0d0f895cb1bf68ecf
+DIST stringprep-1.0.20.tar.gz 98836 BLAKE2B 8928bbc502f98101d93554430fce240b441ce6eff5c3c8f2f7727d77821ae7f92a63d2a4d9b1883ca8b8e61cdbf07858e1c2d2892cefda15797ae536430fcee5 SHA512 402556387e4467d5770694378c923676fa4a429ee6709c7d6aa94901b1215fc7227dc1ad9d9561ca4d94880175ee64241e6ab1274c2c20212d27fc56faffae8d
DIST stringprep-1.0.8.tar.gz 95586 BLAKE2B 62fa68021c32dfc6d1d46473d9cc756cd5f0e2d3932f6f4dc78f71a1ba05e5124574a4b210d74ab555b2cc40f2c43b5eb6d0aac709a028f7cc6324189fde5ee9 SHA512 6680450a3e6226b088b06c79dd6ef1ca689ee8787b9f7eaa53ec073e9dcd70fac48ed2f5fb0b12871607092514db71f63b0617a938912a88a51d36518738a911
diff --git a/dev-erlang/stringprep/stringprep-1.0.20.ebuild b/dev-erlang/stringprep/stringprep-1.0.20.ebuild
new file mode 100644
index 000000000000..31dfc6baaf3e
--- /dev/null
+++ b/dev-erlang/stringprep/stringprep-1.0.20.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit rebar
+
+DESCRIPTION="Fast Stringprep implementation for Erlang and Elixir"
+HOMEPAGE="https://github.com/processone/stringprep"
+SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
+ -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0 tcltk"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+
+DEPEND=">=dev-lang/erlang-17.1
+ >=dev-erlang/p1_utils-1.0.19"
+RDEPEND="${DEPEND}"
+
+DOCS=( CHANGELOG.md README.md )
diff --git a/dev-erlang/xmpp/Manifest b/dev-erlang/xmpp/Manifest
index be85e587e2ce..e8df1e36eba2 100644
--- a/dev-erlang/xmpp/Manifest
+++ b/dev-erlang/xmpp/Manifest
@@ -3,3 +3,4 @@ DIST xmpp-1.2.5.tar.gz 459997 BLAKE2B 73157baa9b4616a76472f76f0e290efc1312b6ea61
DIST xmpp-1.4.2.tar.gz 479072 BLAKE2B fc6d6892c3d14662470dbca4b9fb10e7ec61f44ce2793694e629b3918fe761c32cd9666f15188a010e592d824144863a2d85d59cdf8e640e2a34f390500596f1 SHA512 1071bd4f424235ff680428169007beb7c660341d20e98ac740296cdb3ab5b2c746e94926a15c1192b7c0d53d62e4ee44987e66fa3da11bb120a2fec6aa746eef
DIST xmpp-1.4.5.tar.gz 479170 BLAKE2B e216e1014c766eed5c2c10b7947754fd1f640957158c10c91721137e1583412910a63e37db4d7dde7f99a7447b50788af734c0a0b21009c149c061b6a7d859e8 SHA512 ceee5150fb5fc942b993bfc5beaa23c453cdc32cbb25bf9988dd096ee0b62adbc1b2abf3f69c847189e4fc14c0e08c3491f1a6f742e0937990c7462682b8646a
DIST xmpp-1.4.6.tar.gz 482938 BLAKE2B 842630e92496365922822c1bbb4a3d766270b03ff334d793c7a0587965e6c17f62052e80c7d336bb01a90e86b5ec83ea2837a4f61b0b2aeae19e42e3093a9f49 SHA512 fb091ae8649d7e4abc7a32317c6aa164be5eb52adf8648c7950226d27f48f932f554316cc1fa54e69c92bbaa8c51da3c844fa09ae85599988169592c0d26fbdb
+DIST xmpp-1.4.7.tar.gz 483070 BLAKE2B fae845a165a44c6c43e2f23ebf67a272c9a9b7dabcd221c8be6b83b6f560e7eee896a7906b9d621cba49de1af2163e64cd93d24bfd1341fe1d232c2746f80237 SHA512 37968de29bfeba698424f69a91f11c9adeca3bbac342cb9267ce4012471c10aeb030b691af2c5c01c6eaf9e1f866666982a8660a0e937829f75e0548ae5516cd
diff --git a/dev-erlang/xmpp/xmpp-1.4.7.ebuild b/dev-erlang/xmpp/xmpp-1.4.7.ebuild
new file mode 100644
index 000000000000..686c7f5db378
--- /dev/null
+++ b/dev-erlang/xmpp/xmpp-1.4.7.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit rebar
+
+DESCRIPTION="XMPP parsing and serialization library on top of Fast XML"
+HOMEPAGE="https://github.com/processone/xmpp"
+SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
+ -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~ppc"
+
+RDEPEND=">=dev-erlang/ezlib-1.0.7
+ >=dev-erlang/fast_tls-1.1.6
+ >=dev-erlang/fast_xml-1.1.41
+ >=dev-erlang/p1_utils-1.0.19
+ >=dev-erlang/stringprep-1.0.19
+ >=dev-erlang/idna-6.0.0"
+DEPEND="${RDEPEND}"
+
+DOCS=( CHANGELOG.md README.md )
+
+src_prepare() {
+ rebar_src_prepare
+ rebar_fix_include_path fast_xml
+}
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index c06d887995e6..3ec662b4f5ca 100644
Binary files a/dev-java/Manifest.gz and b/dev-java/Manifest.gz differ
diff --git a/dev-java/ant-antlr/Manifest b/dev-java/ant-antlr/Manifest
index f5b5cdc72b9f..400ef9f3de52 100644
--- a/dev-java/ant-antlr/Manifest
+++ b/dev-java/ant-antlr/Manifest
@@ -1,2 +1,4 @@
DIST ant-1.10.7-gentoo.tar.bz2 6686 BLAKE2B 77e5850b68ab079f26722b5b2ff1afb29a35197afb79f80ae2f775855e2d8f3a478324b1175e9a73695b4e6a6798bf4458dc84d2f763a1d72c331505d31303ea SHA512 f5c5a2ea99a780413a71799d56e783f3ac861169bd7f29c3a85d039f61240abb91ed223eeb111c67a6a1328a6cf2203d7cbf93ad762e49bc11f9a948e7f2091c
+DIST ant-1.10.8-gentoo.tar.bz2 6674 BLAKE2B da52696eb20d74f6c3d36bd57c60927d9044b637ff9de175695d57596ae2e747db509cbde7ec862f9e99f2cee564803232e0edd0755f931dc070b150c4e38b21 SHA512 de14a55105888bc30921418c0e6ef5dac340d3d02bfab35ca7a62021505df94e71fc05eb864ffc276add5a2fce483338fe2cf02fcc04e693bb5b709c6b080490
DIST apache-ant-1.10.7-src.tar.bz2 4530166 BLAKE2B 6998fffbda6a0adbe3434ef0013b3e669ec8f15a09d9a5917509733f3232a538e9be83758b9eacccd673522812a8d482e1fd526d5493634d9c08759f47bfc7a7 SHA512 5849e81aa037b9ba7f4e67057a0cde50301d183fc244673c7f11e34997b11d21c33306c07ab820bf60d454afa8ad5b159c3442427c8cb5403896f29ed179b10d
+DIST apache-ant-1.10.8-src.tar.bz2 4848256 BLAKE2B bd0668e5592c6d2e77233dcffbf2311f9b072f60e7a0c2d5b1a0a6567fc015e1fda46caf1c6c2a3a6730df561f87a8477e0df54a12eeab866cd8d4cb8b2d1f7e SHA512 15563c339298dc576ffb0fb59858bed5f6deabb519ad3f5237e465e6dffd5307bb86fc120f7d7893332936b9f767c47e522cdd1da809b599ceec0070dcb20338
diff --git a/dev-java/ant-antlr/ant-antlr-1.10.8.ebuild b/dev-java/ant-antlr/ant-antlr-1.10.8.ebuild
new file mode 100644
index 000000000000..5c9652cd583e
--- /dev/null
+++ b/dev-java/ant-antlr/ant-antlr-1.10.8.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ANT_TASK_JDKVER=1.8
+ANT_TASK_JREVER=1.8
+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"
+
+RDEPEND=">=dev-java/antlr-2.7.7-r7:0"
+
+src_install() {
+ ant-tasks_src_install
+ java-pkg_register-dependency antlr
+}
diff --git a/dev-java/ant-apache-bcel/Manifest b/dev-java/ant-apache-bcel/Manifest
index f5b5cdc72b9f..400ef9f3de52 100644
--- a/dev-java/ant-apache-bcel/Manifest
+++ b/dev-java/ant-apache-bcel/Manifest
@@ -1,2 +1,4 @@
DIST ant-1.10.7-gentoo.tar.bz2 6686 BLAKE2B 77e5850b68ab079f26722b5b2ff1afb29a35197afb79f80ae2f775855e2d8f3a478324b1175e9a73695b4e6a6798bf4458dc84d2f763a1d72c331505d31303ea SHA512 f5c5a2ea99a780413a71799d56e783f3ac861169bd7f29c3a85d039f61240abb91ed223eeb111c67a6a1328a6cf2203d7cbf93ad762e49bc11f9a948e7f2091c
+DIST ant-1.10.8-gentoo.tar.bz2 6674 BLAKE2B da52696eb20d74f6c3d36bd57c60927d9044b637ff9de175695d57596ae2e747db509cbde7ec862f9e99f2cee564803232e0edd0755f931dc070b150c4e38b21 SHA512 de14a55105888bc30921418c0e6ef5dac340d3d02bfab35ca7a62021505df94e71fc05eb864ffc276add5a2fce483338fe2cf02fcc04e693bb5b709c6b080490
DIST apache-ant-1.10.7-src.tar.bz2 4530166 BLAKE2B 6998fffbda6a0adbe3434ef0013b3e669ec8f15a09d9a5917509733f3232a538e9be83758b9eacccd673522812a8d482e1fd526d5493634d9c08759f47bfc7a7 SHA512 5849e81aa037b9ba7f4e67057a0cde50301d183fc244673c7f11e34997b11d21c33306c07ab820bf60d454afa8ad5b159c3442427c8cb5403896f29ed179b10d
+DIST apache-ant-1.10.8-src.tar.bz2 4848256 BLAKE2B bd0668e5592c6d2e77233dcffbf2311f9b072f60e7a0c2d5b1a0a6567fc015e1fda46caf1c6c2a3a6730df561f87a8477e0df54a12eeab866cd8d4cb8b2d1f7e SHA512 15563c339298dc576ffb0fb59858bed5f6deabb519ad3f5237e465e6dffd5307bb86fc120f7d7893332936b9f767c47e522cdd1da809b599ceec0070dcb20338
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
new file mode 100644
index 000000000000..1dc654ff0b8d
--- /dev/null
+++ b/dev-java/ant-apache-bcel/ant-apache-bcel-1.10.8.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ANT_TASK_JDKVER=1.8
+ANT_TASK_JREVER=1.8
+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"
+
+DEPEND=">=dev-java/bcel-5.1-r3:0"
+RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-apache-bsf/Manifest b/dev-java/ant-apache-bsf/Manifest
index f5b5cdc72b9f..400ef9f3de52 100644
--- a/dev-java/ant-apache-bsf/Manifest
+++ b/dev-java/ant-apache-bsf/Manifest
@@ -1,2 +1,4 @@
DIST ant-1.10.7-gentoo.tar.bz2 6686 BLAKE2B 77e5850b68ab079f26722b5b2ff1afb29a35197afb79f80ae2f775855e2d8f3a478324b1175e9a73695b4e6a6798bf4458dc84d2f763a1d72c331505d31303ea SHA512 f5c5a2ea99a780413a71799d56e783f3ac861169bd7f29c3a85d039f61240abb91ed223eeb111c67a6a1328a6cf2203d7cbf93ad762e49bc11f9a948e7f2091c
+DIST ant-1.10.8-gentoo.tar.bz2 6674 BLAKE2B da52696eb20d74f6c3d36bd57c60927d9044b637ff9de175695d57596ae2e747db509cbde7ec862f9e99f2cee564803232e0edd0755f931dc070b150c4e38b21 SHA512 de14a55105888bc30921418c0e6ef5dac340d3d02bfab35ca7a62021505df94e71fc05eb864ffc276add5a2fce483338fe2cf02fcc04e693bb5b709c6b080490
DIST apache-ant-1.10.7-src.tar.bz2 4530166 BLAKE2B 6998fffbda6a0adbe3434ef0013b3e669ec8f15a09d9a5917509733f3232a538e9be83758b9eacccd673522812a8d482e1fd526d5493634d9c08759f47bfc7a7 SHA512 5849e81aa037b9ba7f4e67057a0cde50301d183fc244673c7f11e34997b11d21c33306c07ab820bf60d454afa8ad5b159c3442427c8cb5403896f29ed179b10d
+DIST apache-ant-1.10.8-src.tar.bz2 4848256 BLAKE2B bd0668e5592c6d2e77233dcffbf2311f9b072f60e7a0c2d5b1a0a6567fc015e1fda46caf1c6c2a3a6730df561f87a8477e0df54a12eeab866cd8d4cb8b2d1f7e SHA512 15563c339298dc576ffb0fb59858bed5f6deabb519ad3f5237e465e6dffd5307bb86fc120f7d7893332936b9f767c47e522cdd1da809b599ceec0070dcb20338
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
new file mode 100644
index 000000000000..4fd4bd7de77a
--- /dev/null
+++ b/dev-java/ant-apache-bsf/ant-apache-bsf-1.10.8.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ANT_TASK_JDKVER=1.8
+ANT_TASK_JREVER=1.8
+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"
+IUSE="python javascript tcl"
+
+DEPEND=">=dev-java/bsf-2.4.0-r1:2.3[python?,javascript?,tcl?]"
+RDEPEND="${DEPEND}"
+
+pkg_postinst() {
+ if [[ -z "${REPLACING_VERSIONS}" ]]; then
+ elog "Also, >=dev-java/bsf-2.4.0-r1 adds optional support for groovy,"
+ elog "ruby and beanshell. See its postinst elog messages for instructions."
+ fi
+}
diff --git a/dev-java/ant-apache-log4j/Manifest b/dev-java/ant-apache-log4j/Manifest
index f5b5cdc72b9f..400ef9f3de52 100644
--- a/dev-java/ant-apache-log4j/Manifest
+++ b/dev-java/ant-apache-log4j/Manifest
@@ -1,2 +1,4 @@
DIST ant-1.10.7-gentoo.tar.bz2 6686 BLAKE2B 77e5850b68ab079f26722b5b2ff1afb29a35197afb79f80ae2f775855e2d8f3a478324b1175e9a73695b4e6a6798bf4458dc84d2f763a1d72c331505d31303ea SHA512 f5c5a2ea99a780413a71799d56e783f3ac861169bd7f29c3a85d039f61240abb91ed223eeb111c67a6a1328a6cf2203d7cbf93ad762e49bc11f9a948e7f2091c
+DIST ant-1.10.8-gentoo.tar.bz2 6674 BLAKE2B da52696eb20d74f6c3d36bd57c60927d9044b637ff9de175695d57596ae2e747db509cbde7ec862f9e99f2cee564803232e0edd0755f931dc070b150c4e38b21 SHA512 de14a55105888bc30921418c0e6ef5dac340d3d02bfab35ca7a62021505df94e71fc05eb864ffc276add5a2fce483338fe2cf02fcc04e693bb5b709c6b080490
DIST apache-ant-1.10.7-src.tar.bz2 4530166 BLAKE2B 6998fffbda6a0adbe3434ef0013b3e669ec8f15a09d9a5917509733f3232a538e9be83758b9eacccd673522812a8d482e1fd526d5493634d9c08759f47bfc7a7 SHA512 5849e81aa037b9ba7f4e67057a0cde50301d183fc244673c7f11e34997b11d21c33306c07ab820bf60d454afa8ad5b159c3442427c8cb5403896f29ed179b10d
+DIST apache-ant-1.10.8-src.tar.bz2 4848256 BLAKE2B bd0668e5592c6d2e77233dcffbf2311f9b072f60e7a0c2d5b1a0a6567fc015e1fda46caf1c6c2a3a6730df561f87a8477e0df54a12eeab866cd8d4cb8b2d1f7e SHA512 15563c339298dc576ffb0fb59858bed5f6deabb519ad3f5237e465e6dffd5307bb86fc120f7d7893332936b9f767c47e522cdd1da809b599ceec0070dcb20338
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
new file mode 100644
index 000000000000..ed32b97a9daa
--- /dev/null
+++ b/dev-java/ant-apache-log4j/ant-apache-log4j-1.10.8.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ANT_TASK_JDKVER=1.8
+ANT_TASK_JREVER=1.8
+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"
+
+DEPEND=">=dev-java/log4j-1.2.13-r2:0"
+RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-apache-oro/Manifest b/dev-java/ant-apache-oro/Manifest
index f5b5cdc72b9f..400ef9f3de52 100644
--- a/dev-java/ant-apache-oro/Manifest
+++ b/dev-java/ant-apache-oro/Manifest
@@ -1,2 +1,4 @@
DIST ant-1.10.7-gentoo.tar.bz2 6686 BLAKE2B 77e5850b68ab079f26722b5b2ff1afb29a35197afb79f80ae2f775855e2d8f3a478324b1175e9a73695b4e6a6798bf4458dc84d2f763a1d72c331505d31303ea SHA512 f5c5a2ea99a780413a71799d56e783f3ac861169bd7f29c3a85d039f61240abb91ed223eeb111c67a6a1328a6cf2203d7cbf93ad762e49bc11f9a948e7f2091c
+DIST ant-1.10.8-gentoo.tar.bz2 6674 BLAKE2B da52696eb20d74f6c3d36bd57c60927d9044b637ff9de175695d57596ae2e747db509cbde7ec862f9e99f2cee564803232e0edd0755f931dc070b150c4e38b21 SHA512 de14a55105888bc30921418c0e6ef5dac340d3d02bfab35ca7a62021505df94e71fc05eb864ffc276add5a2fce483338fe2cf02fcc04e693bb5b709c6b080490
DIST apache-ant-1.10.7-src.tar.bz2 4530166 BLAKE2B 6998fffbda6a0adbe3434ef0013b3e669ec8f15a09d9a5917509733f3232a538e9be83758b9eacccd673522812a8d482e1fd526d5493634d9c08759f47bfc7a7 SHA512 5849e81aa037b9ba7f4e67057a0cde50301d183fc244673c7f11e34997b11d21c33306c07ab820bf60d454afa8ad5b159c3442427c8cb5403896f29ed179b10d
+DIST apache-ant-1.10.8-src.tar.bz2 4848256 BLAKE2B bd0668e5592c6d2e77233dcffbf2311f9b072f60e7a0c2d5b1a0a6567fc015e1fda46caf1c6c2a3a6730df561f87a8477e0df54a12eeab866cd8d4cb8b2d1f7e SHA512 15563c339298dc576ffb0fb59858bed5f6deabb519ad3f5237e465e6dffd5307bb86fc120f7d7893332936b9f767c47e522cdd1da809b599ceec0070dcb20338
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
new file mode 100644
index 000000000000..98ea50b1d731
--- /dev/null
+++ b/dev-java/ant-apache-oro/ant-apache-oro-1.10.8.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ANT_TASK_JDKVER=1.8
+ANT_TASK_JREVER=1.8
+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"
+
+DEPEND=">=dev-java/jakarta-oro-2.0.8-r2:2.0"
+RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-apache-regexp/Manifest b/dev-java/ant-apache-regexp/Manifest
index f5b5cdc72b9f..400ef9f3de52 100644
--- a/dev-java/ant-apache-regexp/Manifest
+++ b/dev-java/ant-apache-regexp/Manifest
@@ -1,2 +1,4 @@
DIST ant-1.10.7-gentoo.tar.bz2 6686 BLAKE2B 77e5850b68ab079f26722b5b2ff1afb29a35197afb79f80ae2f775855e2d8f3a478324b1175e9a73695b4e6a6798bf4458dc84d2f763a1d72c331505d31303ea SHA512 f5c5a2ea99a780413a71799d56e783f3ac861169bd7f29c3a85d039f61240abb91ed223eeb111c67a6a1328a6cf2203d7cbf93ad762e49bc11f9a948e7f2091c
+DIST ant-1.10.8-gentoo.tar.bz2 6674 BLAKE2B da52696eb20d74f6c3d36bd57c60927d9044b637ff9de175695d57596ae2e747db509cbde7ec862f9e99f2cee564803232e0edd0755f931dc070b150c4e38b21 SHA512 de14a55105888bc30921418c0e6ef5dac340d3d02bfab35ca7a62021505df94e71fc05eb864ffc276add5a2fce483338fe2cf02fcc04e693bb5b709c6b080490
DIST apache-ant-1.10.7-src.tar.bz2 4530166 BLAKE2B 6998fffbda6a0adbe3434ef0013b3e669ec8f15a09d9a5917509733f3232a538e9be83758b9eacccd673522812a8d482e1fd526d5493634d9c08759f47bfc7a7 SHA512 5849e81aa037b9ba7f4e67057a0cde50301d183fc244673c7f11e34997b11d21c33306c07ab820bf60d454afa8ad5b159c3442427c8cb5403896f29ed179b10d
+DIST apache-ant-1.10.8-src.tar.bz2 4848256 BLAKE2B bd0668e5592c6d2e77233dcffbf2311f9b072f60e7a0c2d5b1a0a6567fc015e1fda46caf1c6c2a3a6730df561f87a8477e0df54a12eeab866cd8d4cb8b2d1f7e SHA512 15563c339298dc576ffb0fb59858bed5f6deabb519ad3f5237e465e6dffd5307bb86fc120f7d7893332936b9f767c47e522cdd1da809b599ceec0070dcb20338
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
new file mode 100644
index 000000000000..b098bce35acd
--- /dev/null
+++ b/dev-java/ant-apache-regexp/ant-apache-regexp-1.10.8.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ANT_TASK_JDKVER=1.8
+ANT_TASK_JREVER=1.8
+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"
+
+DEPEND=">=dev-java/jakarta-regexp-1.4-r1:1.4"
+RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-apache-resolver/Manifest b/dev-java/ant-apache-resolver/Manifest
index f5b5cdc72b9f..400ef9f3de52 100644
--- a/dev-java/ant-apache-resolver/Manifest
+++ b/dev-java/ant-apache-resolver/Manifest
@@ -1,2 +1,4 @@
DIST ant-1.10.7-gentoo.tar.bz2 6686 BLAKE2B 77e5850b68ab079f26722b5b2ff1afb29a35197afb79f80ae2f775855e2d8f3a478324b1175e9a73695b4e6a6798bf4458dc84d2f763a1d72c331505d31303ea SHA512 f5c5a2ea99a780413a71799d56e783f3ac861169bd7f29c3a85d039f61240abb91ed223eeb111c67a6a1328a6cf2203d7cbf93ad762e49bc11f9a948e7f2091c
+DIST ant-1.10.8-gentoo.tar.bz2 6674 BLAKE2B da52696eb20d74f6c3d36bd57c60927d9044b637ff9de175695d57596ae2e747db509cbde7ec862f9e99f2cee564803232e0edd0755f931dc070b150c4e38b21 SHA512 de14a55105888bc30921418c0e6ef5dac340d3d02bfab35ca7a62021505df94e71fc05eb864ffc276add5a2fce483338fe2cf02fcc04e693bb5b709c6b080490
DIST apache-ant-1.10.7-src.tar.bz2 4530166 BLAKE2B 6998fffbda6a0adbe3434ef0013b3e669ec8f15a09d9a5917509733f3232a538e9be83758b9eacccd673522812a8d482e1fd526d5493634d9c08759f47bfc7a7 SHA512 5849e81aa037b9ba7f4e67057a0cde50301d183fc244673c7f11e34997b11d21c33306c07ab820bf60d454afa8ad5b159c3442427c8cb5403896f29ed179b10d
+DIST apache-ant-1.10.8-src.tar.bz2 4848256 BLAKE2B bd0668e5592c6d2e77233dcffbf2311f9b072f60e7a0c2d5b1a0a6567fc015e1fda46caf1c6c2a3a6730df561f87a8477e0df54a12eeab866cd8d4cb8b2d1f7e SHA512 15563c339298dc576ffb0fb59858bed5f6deabb519ad3f5237e465e6dffd5307bb86fc120f7d7893332936b9f767c47e522cdd1da809b599ceec0070dcb20338
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
new file mode 100644
index 000000000000..12677e429825
--- /dev/null
+++ b/dev-java/ant-apache-resolver/ant-apache-resolver-1.10.8.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ANT_TASK_JDKVER=1.8
+ANT_TASK_JREVER=1.8
+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"
+
+DEPEND=">=dev-java/xml-commons-resolver-1.2:0"
+RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-apache-xalan2/Manifest b/dev-java/ant-apache-xalan2/Manifest
index f5b5cdc72b9f..400ef9f3de52 100644
--- a/dev-java/ant-apache-xalan2/Manifest
+++ b/dev-java/ant-apache-xalan2/Manifest
@@ -1,2 +1,4 @@
DIST ant-1.10.7-gentoo.tar.bz2 6686 BLAKE2B 77e5850b68ab079f26722b5b2ff1afb29a35197afb79f80ae2f775855e2d8f3a478324b1175e9a73695b4e6a6798bf4458dc84d2f763a1d72c331505d31303ea SHA512 f5c5a2ea99a780413a71799d56e783f3ac861169bd7f29c3a85d039f61240abb91ed223eeb111c67a6a1328a6cf2203d7cbf93ad762e49bc11f9a948e7f2091c
+DIST ant-1.10.8-gentoo.tar.bz2 6674 BLAKE2B da52696eb20d74f6c3d36bd57c60927d9044b637ff9de175695d57596ae2e747db509cbde7ec862f9e99f2cee564803232e0edd0755f931dc070b150c4e38b21 SHA512 de14a55105888bc30921418c0e6ef5dac340d3d02bfab35ca7a62021505df94e71fc05eb864ffc276add5a2fce483338fe2cf02fcc04e693bb5b709c6b080490
DIST apache-ant-1.10.7-src.tar.bz2 4530166 BLAKE2B 6998fffbda6a0adbe3434ef0013b3e669ec8f15a09d9a5917509733f3232a538e9be83758b9eacccd673522812a8d482e1fd526d5493634d9c08759f47bfc7a7 SHA512 5849e81aa037b9ba7f4e67057a0cde50301d183fc244673c7f11e34997b11d21c33306c07ab820bf60d454afa8ad5b159c3442427c8cb5403896f29ed179b10d
+DIST apache-ant-1.10.8-src.tar.bz2 4848256 BLAKE2B bd0668e5592c6d2e77233dcffbf2311f9b072f60e7a0c2d5b1a0a6567fc015e1fda46caf1c6c2a3a6730df561f87a8477e0df54a12eeab866cd8d4cb8b2d1f7e SHA512 15563c339298dc576ffb0fb59858bed5f6deabb519ad3f5237e465e6dffd5307bb86fc120f7d7893332936b9f767c47e522cdd1da809b599ceec0070dcb20338
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
new file mode 100644
index 000000000000..69c89e747407
--- /dev/null
+++ b/dev-java/ant-apache-xalan2/ant-apache-xalan2-1.10.8.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ANT_TASK_JDKVER=1.8
+ANT_TASK_JREVER=1.8
+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"
+
+DEPEND="dev-java/xalan:0
+ dev-java/xalan-serializer:0"
+
+RDEPEND="${DEPEND}"
+
+src_unpack() {
+ ant-tasks_src_unpack all
+ java-pkg_jar-from xalan-serializer
+}
diff --git a/dev-java/ant-commons-logging/Manifest b/dev-java/ant-commons-logging/Manifest
index f5b5cdc72b9f..400ef9f3de52 100644
--- a/dev-java/ant-commons-logging/Manifest
+++ b/dev-java/ant-commons-logging/Manifest
@@ -1,2 +1,4 @@
DIST ant-1.10.7-gentoo.tar.bz2 6686 BLAKE2B 77e5850b68ab079f26722b5b2ff1afb29a35197afb79f80ae2f775855e2d8f3a478324b1175e9a73695b4e6a6798bf4458dc84d2f763a1d72c331505d31303ea SHA512 f5c5a2ea99a780413a71799d56e783f3ac861169bd7f29c3a85d039f61240abb91ed223eeb111c67a6a1328a6cf2203d7cbf93ad762e49bc11f9a948e7f2091c
+DIST ant-1.10.8-gentoo.tar.bz2 6674 BLAKE2B da52696eb20d74f6c3d36bd57c60927d9044b637ff9de175695d57596ae2e747db509cbde7ec862f9e99f2cee564803232e0edd0755f931dc070b150c4e38b21 SHA512 de14a55105888bc30921418c0e6ef5dac340d3d02bfab35ca7a62021505df94e71fc05eb864ffc276add5a2fce483338fe2cf02fcc04e693bb5b709c6b080490
DIST apache-ant-1.10.7-src.tar.bz2 4530166 BLAKE2B 6998fffbda6a0adbe3434ef0013b3e669ec8f15a09d9a5917509733f3232a538e9be83758b9eacccd673522812a8d482e1fd526d5493634d9c08759f47bfc7a7 SHA512 5849e81aa037b9ba7f4e67057a0cde50301d183fc244673c7f11e34997b11d21c33306c07ab820bf60d454afa8ad5b159c3442427c8cb5403896f29ed179b10d
+DIST apache-ant-1.10.8-src.tar.bz2 4848256 BLAKE2B bd0668e5592c6d2e77233dcffbf2311f9b072f60e7a0c2d5b1a0a6567fc015e1fda46caf1c6c2a3a6730df561f87a8477e0df54a12eeab866cd8d4cb8b2d1f7e SHA512 15563c339298dc576ffb0fb59858bed5f6deabb519ad3f5237e465e6dffd5307bb86fc120f7d7893332936b9f767c47e522cdd1da809b599ceec0070dcb20338
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
new file mode 100644
index 000000000000..945cd57c2845
--- /dev/null
+++ b/dev-java/ant-commons-logging/ant-commons-logging-1.10.8.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ANT_TASK_JDKVER=1.8
+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"
+
+DEPEND=">=dev-java/commons-logging-1.0.4-r2:0"
+RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-commons-net/Manifest b/dev-java/ant-commons-net/Manifest
index f5b5cdc72b9f..400ef9f3de52 100644
--- a/dev-java/ant-commons-net/Manifest
+++ b/dev-java/ant-commons-net/Manifest
@@ -1,2 +1,4 @@
DIST ant-1.10.7-gentoo.tar.bz2 6686 BLAKE2B 77e5850b68ab079f26722b5b2ff1afb29a35197afb79f80ae2f775855e2d8f3a478324b1175e9a73695b4e6a6798bf4458dc84d2f763a1d72c331505d31303ea SHA512 f5c5a2ea99a780413a71799d56e783f3ac861169bd7f29c3a85d039f61240abb91ed223eeb111c67a6a1328a6cf2203d7cbf93ad762e49bc11f9a948e7f2091c
+DIST ant-1.10.8-gentoo.tar.bz2 6674 BLAKE2B da52696eb20d74f6c3d36bd57c60927d9044b637ff9de175695d57596ae2e747db509cbde7ec862f9e99f2cee564803232e0edd0755f931dc070b150c4e38b21 SHA512 de14a55105888bc30921418c0e6ef5dac340d3d02bfab35ca7a62021505df94e71fc05eb864ffc276add5a2fce483338fe2cf02fcc04e693bb5b709c6b080490
DIST apache-ant-1.10.7-src.tar.bz2 4530166 BLAKE2B 6998fffbda6a0adbe3434ef0013b3e669ec8f15a09d9a5917509733f3232a538e9be83758b9eacccd673522812a8d482e1fd526d5493634d9c08759f47bfc7a7 SHA512 5849e81aa037b9ba7f4e67057a0cde50301d183fc244673c7f11e34997b11d21c33306c07ab820bf60d454afa8ad5b159c3442427c8cb5403896f29ed179b10d
+DIST apache-ant-1.10.8-src.tar.bz2 4848256 BLAKE2B bd0668e5592c6d2e77233dcffbf2311f9b072f60e7a0c2d5b1a0a6567fc015e1fda46caf1c6c2a3a6730df561f87a8477e0df54a12eeab866cd8d4cb8b2d1f7e SHA512 15563c339298dc576ffb0fb59858bed5f6deabb519ad3f5237e465e6dffd5307bb86fc120f7d7893332936b9f767c47e522cdd1da809b599ceec0070dcb20338
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
new file mode 100644
index 000000000000..ef7f3b2a5bea
--- /dev/null
+++ b/dev-java/ant-commons-net/ant-commons-net-1.10.8.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ANT_TASK_JDKVER=1.8
+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"
+
+DEPEND=">=dev-java/commons-net-1.4.1-r1:0"
+RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-core/Manifest b/dev-java/ant-core/Manifest
index f5b5cdc72b9f..400ef9f3de52 100644
--- a/dev-java/ant-core/Manifest
+++ b/dev-java/ant-core/Manifest
@@ -1,2 +1,4 @@
DIST ant-1.10.7-gentoo.tar.bz2 6686 BLAKE2B 77e5850b68ab079f26722b5b2ff1afb29a35197afb79f80ae2f775855e2d8f3a478324b1175e9a73695b4e6a6798bf4458dc84d2f763a1d72c331505d31303ea SHA512 f5c5a2ea99a780413a71799d56e783f3ac861169bd7f29c3a85d039f61240abb91ed223eeb111c67a6a1328a6cf2203d7cbf93ad762e49bc11f9a948e7f2091c
+DIST ant-1.10.8-gentoo.tar.bz2 6674 BLAKE2B da52696eb20d74f6c3d36bd57c60927d9044b637ff9de175695d57596ae2e747db509cbde7ec862f9e99f2cee564803232e0edd0755f931dc070b150c4e38b21 SHA512 de14a55105888bc30921418c0e6ef5dac340d3d02bfab35ca7a62021505df94e71fc05eb864ffc276add5a2fce483338fe2cf02fcc04e693bb5b709c6b080490
DIST apache-ant-1.10.7-src.tar.bz2 4530166 BLAKE2B 6998fffbda6a0adbe3434ef0013b3e669ec8f15a09d9a5917509733f3232a538e9be83758b9eacccd673522812a8d482e1fd526d5493634d9c08759f47bfc7a7 SHA512 5849e81aa037b9ba7f4e67057a0cde50301d183fc244673c7f11e34997b11d21c33306c07ab820bf60d454afa8ad5b159c3442427c8cb5403896f29ed179b10d
+DIST apache-ant-1.10.8-src.tar.bz2 4848256 BLAKE2B bd0668e5592c6d2e77233dcffbf2311f9b072f60e7a0c2d5b1a0a6567fc015e1fda46caf1c6c2a3a6730df561f87a8477e0df54a12eeab866cd8d4cb8b2d1f7e SHA512 15563c339298dc576ffb0fb59858bed5f6deabb519ad3f5237e465e6dffd5307bb86fc120f7d7893332936b9f767c47e522cdd1da809b599ceec0070dcb20338
diff --git a/dev-java/ant-core/ant-core-1.10.8.ebuild b/dev-java/ant-core/ant-core-1.10.8.ebuild
new file mode 100644
index 000000000000..b7a55bbe6631
--- /dev/null
+++ b/dev-java/ant-core/ant-core-1.10.8.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# Don't depend on itself.
+JAVA_ANT_DISABLE_ANT_CORE_DEP="true"
+
+# Rewriting build.xml files for the testcases has no use at the moment.
+JAVA_PKG_BSFIX_ALL="no"
+JAVA_PKG_IUSE="doc source"
+
+inherit eutils java-pkg-2 java-ant-2 prefix
+
+MY_P="apache-ant-${PV}"
+
+DESCRIPTION="Java-based build tool similar to 'make' that uses XML configuration files"
+HOMEPAGE="https://ant.apache.org/"
+SRC_URI="https://archive.apache.org/dist/ant/source/${MY_P}-src.tar.bz2
+ https://dev.gentoo.org/~fordfrog/distfiles/ant-${PV}-gentoo.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"
+
+CDEPEND=">=virtual/jdk-1.8:*"
+DEPEND="${CDEPEND}"
+RDEPEND="${CDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+RESTRICT="test"
+
+PATCHES=(
+ "${WORKDIR}/${PV}-build.patch"
+ "${WORKDIR}/${PV}-launch.patch"
+)
+
+src_prepare() {
+ default
+
+ eprefixify "${S}/src/script/ant"
+
+ # Fixes bug 556008.
+ java-ant_xml-rewrite -f build.xml \
+ -c -e javadoc \
+ -a failonerror \
+ -v "false"
+
+ # See bug #196080 for more details.
+ java-ant_bsfix_one build.xml
+ java-pkg-2_src_prepare
+
+ # Remove JDK9+ stuff
+ einfo "Removing JDK9+ classes (Jmod and Link)"
+ rm "${S}"/src/main/org/apache/tools/ant/taskdefs/modules/{Jmod,Link}.java
+}
+
+src_compile() {
+ export ANT_HOME=""
+ # Avoid error message that package ant-core was not found
+ export ANT_TASKS="none"
+
+ local bsyscp
+
+ # This ensures that when building ant with bootstrapped ant,
+ # only the source is used for resolving references, and not
+ # the classes in bootstrapped ant but jikes in kaffe has issues with this...
+ if ! java-pkg_current-vm-matches kaffe; then
+ bsyscp="-Dbuild.sysclasspath=ignore"
+ fi
+
+ CLASSPATH="$(java-config -t)" ./build.sh ${bsyscp} jars dist-internal \
+ $(use_doc javadocs) || die "build failed"
+}
+
+src_install() {
+ dodir /usr/share/ant/lib
+
+ for jar in ant.jar ant-bootstrap.jar ant-launcher.jar ; do
+ java-pkg_dojar build/lib/${jar}
+ dosym ../../${PN}/lib/${jar} /usr/share/ant/lib/${jar}
+ done
+
+ dobin src/script/ant
+
+ dodir /usr/share/${PN}/bin
+ for each in antRun antRun.pl runant.pl runant.py ; do
+ dobin "${S}/src/script/${each}"
+ dosym ../../../bin/${each} /usr/share/${PN}/bin/${each}
+ done
+ dosym ../${PN}/bin /usr/share/ant/bin
+
+ insinto /usr/share/${PN}
+ doins -r dist/etc
+ dosym ../${PN}/etc /usr/share/ant/etc
+
+ echo "ANT_HOME=\"${EPREFIX}/usr/share/ant\"" > "${T}/20ant"
+ doenvd "${T}/20ant"
+
+ dodoc NOTICE README WHATSNEW KEYS
+
+ if use doc; then
+ dodoc -r manual/*
+ java-pkg_dojavadoc --symlink manual/api build/javadocs
+ fi
+
+ use source && java-pkg_dosrc src/main/*
+}
diff --git a/dev-java/ant-jai/Manifest b/dev-java/ant-jai/Manifest
index f5b5cdc72b9f..400ef9f3de52 100644
--- a/dev-java/ant-jai/Manifest
+++ b/dev-java/ant-jai/Manifest
@@ -1,2 +1,4 @@
DIST ant-1.10.7-gentoo.tar.bz2 6686 BLAKE2B 77e5850b68ab079f26722b5b2ff1afb29a35197afb79f80ae2f775855e2d8f3a478324b1175e9a73695b4e6a6798bf4458dc84d2f763a1d72c331505d31303ea SHA512 f5c5a2ea99a780413a71799d56e783f3ac861169bd7f29c3a85d039f61240abb91ed223eeb111c67a6a1328a6cf2203d7cbf93ad762e49bc11f9a948e7f2091c
+DIST ant-1.10.8-gentoo.tar.bz2 6674 BLAKE2B da52696eb20d74f6c3d36bd57c60927d9044b637ff9de175695d57596ae2e747db509cbde7ec862f9e99f2cee564803232e0edd0755f931dc070b150c4e38b21 SHA512 de14a55105888bc30921418c0e6ef5dac340d3d02bfab35ca7a62021505df94e71fc05eb864ffc276add5a2fce483338fe2cf02fcc04e693bb5b709c6b080490
DIST apache-ant-1.10.7-src.tar.bz2 4530166 BLAKE2B 6998fffbda6a0adbe3434ef0013b3e669ec8f15a09d9a5917509733f3232a538e9be83758b9eacccd673522812a8d482e1fd526d5493634d9c08759f47bfc7a7 SHA512 5849e81aa037b9ba7f4e67057a0cde50301d183fc244673c7f11e34997b11d21c33306c07ab820bf60d454afa8ad5b159c3442427c8cb5403896f29ed179b10d
+DIST apache-ant-1.10.8-src.tar.bz2 4848256 BLAKE2B bd0668e5592c6d2e77233dcffbf2311f9b072f60e7a0c2d5b1a0a6567fc015e1fda46caf1c6c2a3a6730df561f87a8477e0df54a12eeab866cd8d4cb8b2d1f7e SHA512 15563c339298dc576ffb0fb59858bed5f6deabb519ad3f5237e465e6dffd5307bb86fc120f7d7893332936b9f767c47e522cdd1da809b599ceec0070dcb20338
diff --git a/dev-java/ant-jai/ant-jai-1.10.8.ebuild b/dev-java/ant-jai/ant-jai-1.10.8.ebuild
new file mode 100644
index 000000000000..944faa9eca69
--- /dev/null
+++ b/dev-java/ant-jai/ant-jai-1.10.8.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ANT_TASK_JDKVER=1.8
+ANT_TASK_JREVER=1.8
+ANT_TASK_DEPNAME="sun-jai-bin"
+
+inherit ant-tasks
+
+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"
+RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-javamail/Manifest b/dev-java/ant-javamail/Manifest
index f5b5cdc72b9f..400ef9f3de52 100644
--- a/dev-java/ant-javamail/Manifest
+++ b/dev-java/ant-javamail/Manifest
@@ -1,2 +1,4 @@
DIST ant-1.10.7-gentoo.tar.bz2 6686 BLAKE2B 77e5850b68ab079f26722b5b2ff1afb29a35197afb79f80ae2f775855e2d8f3a478324b1175e9a73695b4e6a6798bf4458dc84d2f763a1d72c331505d31303ea SHA512 f5c5a2ea99a780413a71799d56e783f3ac861169bd7f29c3a85d039f61240abb91ed223eeb111c67a6a1328a6cf2203d7cbf93ad762e49bc11f9a948e7f2091c
+DIST ant-1.10.8-gentoo.tar.bz2 6674 BLAKE2B da52696eb20d74f6c3d36bd57c60927d9044b637ff9de175695d57596ae2e747db509cbde7ec862f9e99f2cee564803232e0edd0755f931dc070b150c4e38b21 SHA512 de14a55105888bc30921418c0e6ef5dac340d3d02bfab35ca7a62021505df94e71fc05eb864ffc276add5a2fce483338fe2cf02fcc04e693bb5b709c6b080490
DIST apache-ant-1.10.7-src.tar.bz2 4530166 BLAKE2B 6998fffbda6a0adbe3434ef0013b3e669ec8f15a09d9a5917509733f3232a538e9be83758b9eacccd673522812a8d482e1fd526d5493634d9c08759f47bfc7a7 SHA512 5849e81aa037b9ba7f4e67057a0cde50301d183fc244673c7f11e34997b11d21c33306c07ab820bf60d454afa8ad5b159c3442427c8cb5403896f29ed179b10d
+DIST apache-ant-1.10.8-src.tar.bz2 4848256 BLAKE2B bd0668e5592c6d2e77233dcffbf2311f9b072f60e7a0c2d5b1a0a6567fc015e1fda46caf1c6c2a3a6730df561f87a8477e0df54a12eeab866cd8d4cb8b2d1f7e SHA512 15563c339298dc576ffb0fb59858bed5f6deabb519ad3f5237e465e6dffd5307bb86fc120f7d7893332936b9f767c47e522cdd1da809b599ceec0070dcb20338
diff --git a/dev-java/ant-javamail/ant-javamail-1.10.8.ebuild b/dev-java/ant-javamail/ant-javamail-1.10.8.ebuild
new file mode 100644
index 000000000000..43f91c21316d
--- /dev/null
+++ b/dev-java/ant-javamail/ant-javamail-1.10.8.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ANT_TASK_JDKVER=1.8
+ANT_TASK_JREVER=1.8
+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"
+
+# needs some classes from javax.activation.* which are not in jdk 11
+DEPEND="virtual/jdk:1.8
+ dev-java/gnu-jaf:1
+ dev-java/oracle-javamail:0"
+RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-jdepend/Manifest b/dev-java/ant-jdepend/Manifest
index f5b5cdc72b9f..400ef9f3de52 100644
--- a/dev-java/ant-jdepend/Manifest
+++ b/dev-java/ant-jdepend/Manifest
@@ -1,2 +1,4 @@
DIST ant-1.10.7-gentoo.tar.bz2 6686 BLAKE2B 77e5850b68ab079f26722b5b2ff1afb29a35197afb79f80ae2f775855e2d8f3a478324b1175e9a73695b4e6a6798bf4458dc84d2f763a1d72c331505d31303ea SHA512 f5c5a2ea99a780413a71799d56e783f3ac861169bd7f29c3a85d039f61240abb91ed223eeb111c67a6a1328a6cf2203d7cbf93ad762e49bc11f9a948e7f2091c
+DIST ant-1.10.8-gentoo.tar.bz2 6674 BLAKE2B da52696eb20d74f6c3d36bd57c60927d9044b637ff9de175695d57596ae2e747db509cbde7ec862f9e99f2cee564803232e0edd0755f931dc070b150c4e38b21 SHA512 de14a55105888bc30921418c0e6ef5dac340d3d02bfab35ca7a62021505df94e71fc05eb864ffc276add5a2fce483338fe2cf02fcc04e693bb5b709c6b080490
DIST apache-ant-1.10.7-src.tar.bz2 4530166 BLAKE2B 6998fffbda6a0adbe3434ef0013b3e669ec8f15a09d9a5917509733f3232a538e9be83758b9eacccd673522812a8d482e1fd526d5493634d9c08759f47bfc7a7 SHA512 5849e81aa037b9ba7f4e67057a0cde50301d183fc244673c7f11e34997b11d21c33306c07ab820bf60d454afa8ad5b159c3442427c8cb5403896f29ed179b10d
+DIST apache-ant-1.10.8-src.tar.bz2 4848256 BLAKE2B bd0668e5592c6d2e77233dcffbf2311f9b072f60e7a0c2d5b1a0a6567fc015e1fda46caf1c6c2a3a6730df561f87a8477e0df54a12eeab866cd8d4cb8b2d1f7e SHA512 15563c339298dc576ffb0fb59858bed5f6deabb519ad3f5237e465e6dffd5307bb86fc120f7d7893332936b9f767c47e522cdd1da809b599ceec0070dcb20338
diff --git a/dev-java/ant-jdepend/ant-jdepend-1.10.8.ebuild b/dev-java/ant-jdepend/ant-jdepend-1.10.8.ebuild
new file mode 100644
index 000000000000..7d83e53d76be
--- /dev/null
+++ b/dev-java/ant-jdepend/ant-jdepend-1.10.8.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ANT_TASK_JDKVER=1.8
+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"
+
+DEPEND=">=dev-java/jdepend-2.9-r2:0"
+RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-jmf/Manifest b/dev-java/ant-jmf/Manifest
index f5b5cdc72b9f..400ef9f3de52 100644
--- a/dev-java/ant-jmf/Manifest
+++ b/dev-java/ant-jmf/Manifest
@@ -1,2 +1,4 @@
DIST ant-1.10.7-gentoo.tar.bz2 6686 BLAKE2B 77e5850b68ab079f26722b5b2ff1afb29a35197afb79f80ae2f775855e2d8f3a478324b1175e9a73695b4e6a6798bf4458dc84d2f763a1d72c331505d31303ea SHA512 f5c5a2ea99a780413a71799d56e783f3ac861169bd7f29c3a85d039f61240abb91ed223eeb111c67a6a1328a6cf2203d7cbf93ad762e49bc11f9a948e7f2091c
+DIST ant-1.10.8-gentoo.tar.bz2 6674 BLAKE2B da52696eb20d74f6c3d36bd57c60927d9044b637ff9de175695d57596ae2e747db509cbde7ec862f9e99f2cee564803232e0edd0755f931dc070b150c4e38b21 SHA512 de14a55105888bc30921418c0e6ef5dac340d3d02bfab35ca7a62021505df94e71fc05eb864ffc276add5a2fce483338fe2cf02fcc04e693bb5b709c6b080490
DIST apache-ant-1.10.7-src.tar.bz2 4530166 BLAKE2B 6998fffbda6a0adbe3434ef0013b3e669ec8f15a09d9a5917509733f3232a538e9be83758b9eacccd673522812a8d482e1fd526d5493634d9c08759f47bfc7a7 SHA512 5849e81aa037b9ba7f4e67057a0cde50301d183fc244673c7f11e34997b11d21c33306c07ab820bf60d454afa8ad5b159c3442427c8cb5403896f29ed179b10d
+DIST apache-ant-1.10.8-src.tar.bz2 4848256 BLAKE2B bd0668e5592c6d2e77233dcffbf2311f9b072f60e7a0c2d5b1a0a6567fc015e1fda46caf1c6c2a3a6730df561f87a8477e0df54a12eeab866cd8d4cb8b2d1f7e SHA512 15563c339298dc576ffb0fb59858bed5f6deabb519ad3f5237e465e6dffd5307bb86fc120f7d7893332936b9f767c47e522cdd1da809b599ceec0070dcb20338
diff --git a/dev-java/ant-jmf/ant-jmf-1.10.8.ebuild b/dev-java/ant-jmf/ant-jmf-1.10.8.ebuild
new file mode 100644
index 000000000000..8e604704a6f3
--- /dev/null
+++ b/dev-java/ant-jmf/ant-jmf-1.10.8.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ANT_TASK_JDKVER=1.8
+ANT_TASK_JREVER=1.8
+# Seems we don't need to depend on jmf-bin, the classes ant imports are in J2SE
+# API since version 1.3.
+ANT_TASK_DEPNAME=""
+
+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"
diff --git a/dev-java/ant-jsch/Manifest b/dev-java/ant-jsch/Manifest
index f5b5cdc72b9f..400ef9f3de52 100644
--- a/dev-java/ant-jsch/Manifest
+++ b/dev-java/ant-jsch/Manifest
@@ -1,2 +1,4 @@
DIST ant-1.10.7-gentoo.tar.bz2 6686 BLAKE2B 77e5850b68ab079f26722b5b2ff1afb29a35197afb79f80ae2f775855e2d8f3a478324b1175e9a73695b4e6a6798bf4458dc84d2f763a1d72c331505d31303ea SHA512 f5c5a2ea99a780413a71799d56e783f3ac861169bd7f29c3a85d039f61240abb91ed223eeb111c67a6a1328a6cf2203d7cbf93ad762e49bc11f9a948e7f2091c
+DIST ant-1.10.8-gentoo.tar.bz2 6674 BLAKE2B da52696eb20d74f6c3d36bd57c60927d9044b637ff9de175695d57596ae2e747db509cbde7ec862f9e99f2cee564803232e0edd0755f931dc070b150c4e38b21 SHA512 de14a55105888bc30921418c0e6ef5dac340d3d02bfab35ca7a62021505df94e71fc05eb864ffc276add5a2fce483338fe2cf02fcc04e693bb5b709c6b080490
DIST apache-ant-1.10.7-src.tar.bz2 4530166 BLAKE2B 6998fffbda6a0adbe3434ef0013b3e669ec8f15a09d9a5917509733f3232a538e9be83758b9eacccd673522812a8d482e1fd526d5493634d9c08759f47bfc7a7 SHA512 5849e81aa037b9ba7f4e67057a0cde50301d183fc244673c7f11e34997b11d21c33306c07ab820bf60d454afa8ad5b159c3442427c8cb5403896f29ed179b10d
+DIST apache-ant-1.10.8-src.tar.bz2 4848256 BLAKE2B bd0668e5592c6d2e77233dcffbf2311f9b072f60e7a0c2d5b1a0a6567fc015e1fda46caf1c6c2a3a6730df561f87a8477e0df54a12eeab866cd8d4cb8b2d1f7e SHA512 15563c339298dc576ffb0fb59858bed5f6deabb519ad3f5237e465e6dffd5307bb86fc120f7d7893332936b9f767c47e522cdd1da809b599ceec0070dcb20338
diff --git a/dev-java/ant-jsch/ant-jsch-1.10.8.ebuild b/dev-java/ant-jsch/ant-jsch-1.10.8.ebuild
new file mode 100644
index 000000000000..d6a324a766ef
--- /dev/null
+++ b/dev-java/ant-jsch/ant-jsch-1.10.8.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ANT_TASK_JDKVER=1.8
+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"
+
+DEPEND=">=dev-java/jsch-0.1.37:0"
+RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-junit/Manifest b/dev-java/ant-junit/Manifest
index f5b5cdc72b9f..400ef9f3de52 100644
--- a/dev-java/ant-junit/Manifest
+++ b/dev-java/ant-junit/Manifest
@@ -1,2 +1,4 @@
DIST ant-1.10.7-gentoo.tar.bz2 6686 BLAKE2B 77e5850b68ab079f26722b5b2ff1afb29a35197afb79f80ae2f775855e2d8f3a478324b1175e9a73695b4e6a6798bf4458dc84d2f763a1d72c331505d31303ea SHA512 f5c5a2ea99a780413a71799d56e783f3ac861169bd7f29c3a85d039f61240abb91ed223eeb111c67a6a1328a6cf2203d7cbf93ad762e49bc11f9a948e7f2091c
+DIST ant-1.10.8-gentoo.tar.bz2 6674 BLAKE2B da52696eb20d74f6c3d36bd57c60927d9044b637ff9de175695d57596ae2e747db509cbde7ec862f9e99f2cee564803232e0edd0755f931dc070b150c4e38b21 SHA512 de14a55105888bc30921418c0e6ef5dac340d3d02bfab35ca7a62021505df94e71fc05eb864ffc276add5a2fce483338fe2cf02fcc04e693bb5b709c6b080490
DIST apache-ant-1.10.7-src.tar.bz2 4530166 BLAKE2B 6998fffbda6a0adbe3434ef0013b3e669ec8f15a09d9a5917509733f3232a538e9be83758b9eacccd673522812a8d482e1fd526d5493634d9c08759f47bfc7a7 SHA512 5849e81aa037b9ba7f4e67057a0cde50301d183fc244673c7f11e34997b11d21c33306c07ab820bf60d454afa8ad5b159c3442427c8cb5403896f29ed179b10d
+DIST apache-ant-1.10.8-src.tar.bz2 4848256 BLAKE2B bd0668e5592c6d2e77233dcffbf2311f9b072f60e7a0c2d5b1a0a6567fc015e1fda46caf1c6c2a3a6730df561f87a8477e0df54a12eeab866cd8d4cb8b2d1f7e SHA512 15563c339298dc576ffb0fb59858bed5f6deabb519ad3f5237e465e6dffd5307bb86fc120f7d7893332936b9f767c47e522cdd1da809b599ceec0070dcb20338
diff --git a/dev-java/ant-junit/ant-junit-1.10.8.ebuild b/dev-java/ant-junit/ant-junit-1.10.8.ebuild
new file mode 100644
index 000000000000..65978134b5b6
--- /dev/null
+++ b/dev-java/ant-junit/ant-junit-1.10.8.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ANT_TASK_JDKVER=1.8
+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"
+
+DEPEND="
+ dev-java/junit:0
+ dev-java/junit:4
+"
+RDEPEND="${DEPEND}"
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+EANT_GENTOO_CLASSPATH="junit-4"
+
+src_compile() {
+ eant jar-junit
+}
diff --git a/dev-java/ant-junit4/Manifest b/dev-java/ant-junit4/Manifest
index f5b5cdc72b9f..400ef9f3de52 100644
--- a/dev-java/ant-junit4/Manifest
+++ b/dev-java/ant-junit4/Manifest
@@ -1,2 +1,4 @@
DIST ant-1.10.7-gentoo.tar.bz2 6686 BLAKE2B 77e5850b68ab079f26722b5b2ff1afb29a35197afb79f80ae2f775855e2d8f3a478324b1175e9a73695b4e6a6798bf4458dc84d2f763a1d72c331505d31303ea SHA512 f5c5a2ea99a780413a71799d56e783f3ac861169bd7f29c3a85d039f61240abb91ed223eeb111c67a6a1328a6cf2203d7cbf93ad762e49bc11f9a948e7f2091c
+DIST ant-1.10.8-gentoo.tar.bz2 6674 BLAKE2B da52696eb20d74f6c3d36bd57c60927d9044b637ff9de175695d57596ae2e747db509cbde7ec862f9e99f2cee564803232e0edd0755f931dc070b150c4e38b21 SHA512 de14a55105888bc30921418c0e6ef5dac340d3d02bfab35ca7a62021505df94e71fc05eb864ffc276add5a2fce483338fe2cf02fcc04e693bb5b709c6b080490
DIST apache-ant-1.10.7-src.tar.bz2 4530166 BLAKE2B 6998fffbda6a0adbe3434ef0013b3e669ec8f15a09d9a5917509733f3232a538e9be83758b9eacccd673522812a8d482e1fd526d5493634d9c08759f47bfc7a7 SHA512 5849e81aa037b9ba7f4e67057a0cde50301d183fc244673c7f11e34997b11d21c33306c07ab820bf60d454afa8ad5b159c3442427c8cb5403896f29ed179b10d
+DIST apache-ant-1.10.8-src.tar.bz2 4848256 BLAKE2B bd0668e5592c6d2e77233dcffbf2311f9b072f60e7a0c2d5b1a0a6567fc015e1fda46caf1c6c2a3a6730df561f87a8477e0df54a12eeab866cd8d4cb8b2d1f7e SHA512 15563c339298dc576ffb0fb59858bed5f6deabb519ad3f5237e465e6dffd5307bb86fc120f7d7893332936b9f767c47e522cdd1da809b599ceec0070dcb20338
diff --git a/dev-java/ant-junit4/ant-junit4-1.10.8.ebuild b/dev-java/ant-junit4/ant-junit4-1.10.8.ebuild
new file mode 100644
index 000000000000..5dcdbe73523e
--- /dev/null
+++ b/dev-java/ant-junit4/ant-junit4-1.10.8.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ANT_TASK_JDKVER=1.8
+ANT_TASK_JREVER=1.8
+ANT_TASK_DEPNAME="junit-4"
+
+inherit ant-tasks
+
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+DEPEND="dev-java/junit:4
+ ~dev-java/ant-junit-${PV}"
+
+RDEPEND="${DEPEND}"
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+EANT_GENTOO_CLASSPATH="junit-4,ant-junit"
+
+src_prepare() {
+ default
+
+ java-pkg_jar-from --build-only --into "${S}/lib" ant-junit
+}
+
+src_install() {
+ # No registration as ant-task, would be loaded together with ant-junit.
+ java-pkg_dojar build/lib/ant-junit4.jar
+
+ # As we dont't want to depend on and-junit in package.env, because it depends
+ # on junit:0. Instead, we "steal" its jar and record it to our package.env as
+ # if it belongs to this package's classpath.
+ java-pkg_getjar --build-only ant-junit ant-junit.jar
+ java-pkg_regjar $(java-pkg_getjar --build-only ant-junit ant-junit.jar)
+}
diff --git a/dev-java/ant-junitlauncher/Manifest b/dev-java/ant-junitlauncher/Manifest
index f5b5cdc72b9f..400ef9f3de52 100644
--- a/dev-java/ant-junitlauncher/Manifest
+++ b/dev-java/ant-junitlauncher/Manifest
@@ -1,2 +1,4 @@
DIST ant-1.10.7-gentoo.tar.bz2 6686 BLAKE2B 77e5850b68ab079f26722b5b2ff1afb29a35197afb79f80ae2f775855e2d8f3a478324b1175e9a73695b4e6a6798bf4458dc84d2f763a1d72c331505d31303ea SHA512 f5c5a2ea99a780413a71799d56e783f3ac861169bd7f29c3a85d039f61240abb91ed223eeb111c67a6a1328a6cf2203d7cbf93ad762e49bc11f9a948e7f2091c
+DIST ant-1.10.8-gentoo.tar.bz2 6674 BLAKE2B da52696eb20d74f6c3d36bd57c60927d9044b637ff9de175695d57596ae2e747db509cbde7ec862f9e99f2cee564803232e0edd0755f931dc070b150c4e38b21 SHA512 de14a55105888bc30921418c0e6ef5dac340d3d02bfab35ca7a62021505df94e71fc05eb864ffc276add5a2fce483338fe2cf02fcc04e693bb5b709c6b080490
DIST apache-ant-1.10.7-src.tar.bz2 4530166 BLAKE2B 6998fffbda6a0adbe3434ef0013b3e669ec8f15a09d9a5917509733f3232a538e9be83758b9eacccd673522812a8d482e1fd526d5493634d9c08759f47bfc7a7 SHA512 5849e81aa037b9ba7f4e67057a0cde50301d183fc244673c7f11e34997b11d21c33306c07ab820bf60d454afa8ad5b159c3442427c8cb5403896f29ed179b10d
+DIST apache-ant-1.10.8-src.tar.bz2 4848256 BLAKE2B bd0668e5592c6d2e77233dcffbf2311f9b072f60e7a0c2d5b1a0a6567fc015e1fda46caf1c6c2a3a6730df561f87a8477e0df54a12eeab866cd8d4cb8b2d1f7e SHA512 15563c339298dc576ffb0fb59858bed5f6deabb519ad3f5237e465e6dffd5307bb86fc120f7d7893332936b9f767c47e522cdd1da809b599ceec0070dcb20338
diff --git a/dev-java/ant-junitlauncher/ant-junitlauncher-1.10.8.ebuild b/dev-java/ant-junitlauncher/ant-junitlauncher-1.10.8.ebuild
new file mode 100644
index 000000000000..09716cb8ae78
--- /dev/null
+++ b/dev-java/ant-junitlauncher/ant-junitlauncher-1.10.8.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ANT_TASK_JDKVER=1.8
+ANT_TASK_JREVER=1.8
+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"
diff --git a/dev-java/ant-swing/Manifest b/dev-java/ant-swing/Manifest
index f5b5cdc72b9f..400ef9f3de52 100644
--- a/dev-java/ant-swing/Manifest
+++ b/dev-java/ant-swing/Manifest
@@ -1,2 +1,4 @@
DIST ant-1.10.7-gentoo.tar.bz2 6686 BLAKE2B 77e5850b68ab079f26722b5b2ff1afb29a35197afb79f80ae2f775855e2d8f3a478324b1175e9a73695b4e6a6798bf4458dc84d2f763a1d72c331505d31303ea SHA512 f5c5a2ea99a780413a71799d56e783f3ac861169bd7f29c3a85d039f61240abb91ed223eeb111c67a6a1328a6cf2203d7cbf93ad762e49bc11f9a948e7f2091c
+DIST ant-1.10.8-gentoo.tar.bz2 6674 BLAKE2B da52696eb20d74f6c3d36bd57c60927d9044b637ff9de175695d57596ae2e747db509cbde7ec862f9e99f2cee564803232e0edd0755f931dc070b150c4e38b21 SHA512 de14a55105888bc30921418c0e6ef5dac340d3d02bfab35ca7a62021505df94e71fc05eb864ffc276add5a2fce483338fe2cf02fcc04e693bb5b709c6b080490
DIST apache-ant-1.10.7-src.tar.bz2 4530166 BLAKE2B 6998fffbda6a0adbe3434ef0013b3e669ec8f15a09d9a5917509733f3232a538e9be83758b9eacccd673522812a8d482e1fd526d5493634d9c08759f47bfc7a7 SHA512 5849e81aa037b9ba7f4e67057a0cde50301d183fc244673c7f11e34997b11d21c33306c07ab820bf60d454afa8ad5b159c3442427c8cb5403896f29ed179b10d
+DIST apache-ant-1.10.8-src.tar.bz2 4848256 BLAKE2B bd0668e5592c6d2e77233dcffbf2311f9b072f60e7a0c2d5b1a0a6567fc015e1fda46caf1c6c2a3a6730df561f87a8477e0df54a12eeab866cd8d4cb8b2d1f7e SHA512 15563c339298dc576ffb0fb59858bed5f6deabb519ad3f5237e465e6dffd5307bb86fc120f7d7893332936b9f767c47e522cdd1da809b599ceec0070dcb20338
diff --git a/dev-java/ant-swing/ant-swing-1.10.8.ebuild b/dev-java/ant-swing/ant-swing-1.10.8.ebuild
new file mode 100644
index 000000000000..fb6c2dfced0f
--- /dev/null
+++ b/dev-java/ant-swing/ant-swing-1.10.8.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ANT_TASK_JDKVER=1.8
+ANT_TASK_JREVER=1.8
+# No extra dependencies are needed.
+ANT_TASK_DEPNAME=""
+
+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"
diff --git a/dev-java/ant-testutil/Manifest b/dev-java/ant-testutil/Manifest
index f5b5cdc72b9f..400ef9f3de52 100644
--- a/dev-java/ant-testutil/Manifest
+++ b/dev-java/ant-testutil/Manifest
@@ -1,2 +1,4 @@
DIST ant-1.10.7-gentoo.tar.bz2 6686 BLAKE2B 77e5850b68ab079f26722b5b2ff1afb29a35197afb79f80ae2f775855e2d8f3a478324b1175e9a73695b4e6a6798bf4458dc84d2f763a1d72c331505d31303ea SHA512 f5c5a2ea99a780413a71799d56e783f3ac861169bd7f29c3a85d039f61240abb91ed223eeb111c67a6a1328a6cf2203d7cbf93ad762e49bc11f9a948e7f2091c
+DIST ant-1.10.8-gentoo.tar.bz2 6674 BLAKE2B da52696eb20d74f6c3d36bd57c60927d9044b637ff9de175695d57596ae2e747db509cbde7ec862f9e99f2cee564803232e0edd0755f931dc070b150c4e38b21 SHA512 de14a55105888bc30921418c0e6ef5dac340d3d02bfab35ca7a62021505df94e71fc05eb864ffc276add5a2fce483338fe2cf02fcc04e693bb5b709c6b080490
DIST apache-ant-1.10.7-src.tar.bz2 4530166 BLAKE2B 6998fffbda6a0adbe3434ef0013b3e669ec8f15a09d9a5917509733f3232a538e9be83758b9eacccd673522812a8d482e1fd526d5493634d9c08759f47bfc7a7 SHA512 5849e81aa037b9ba7f4e67057a0cde50301d183fc244673c7f11e34997b11d21c33306c07ab820bf60d454afa8ad5b159c3442427c8cb5403896f29ed179b10d
+DIST apache-ant-1.10.8-src.tar.bz2 4848256 BLAKE2B bd0668e5592c6d2e77233dcffbf2311f9b072f60e7a0c2d5b1a0a6567fc015e1fda46caf1c6c2a3a6730df561f87a8477e0df54a12eeab866cd8d4cb8b2d1f7e SHA512 15563c339298dc576ffb0fb59858bed5f6deabb519ad3f5237e465e6dffd5307bb86fc120f7d7893332936b9f767c47e522cdd1da809b599ceec0070dcb20338
diff --git a/dev-java/ant-testutil/ant-testutil-1.10.8.ebuild b/dev-java/ant-testutil/ant-testutil-1.10.8.ebuild
new file mode 100644
index 000000000000..e8763ba32556
--- /dev/null
+++ b/dev-java/ant-testutil/ant-testutil-1.10.8.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ANT_TASK_JDKVER=1.8
+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"
+
+CDEPEND="dev-java/ant-core:0"
+
+DEPEND="${CDEPEND}
+ >=virtual/jdk-1.8
+ >=dev-java/junit-4.11:4
+ ~dev-java/ant-swing-${PV}
+ ~dev-java/ant-junit4-${PV}
+ ~dev-java/ant-junitlauncher-${PV}"
+
+RDEPEND="${CDEPEND}
+ >=virtual/jre-1.8"
+
+# The build system builds much more than it actually packages, so there are many
+# build-only deps, but since those are quite common, it wasn't worth to patch it.
+
+src_unpack() {
+ ant-tasks_src_unpack base
+ java-pkg_jar-from --build-only junit-4,ant-junit4,ant-junitlauncher,ant-swing
+ java-pkg_jar-from --build-only ant-core ant-launcher.jar
+}
+
+src_compile() {
+ eant test-jar
+}
diff --git a/dev-java/ant-xz/Manifest b/dev-java/ant-xz/Manifest
index f5b5cdc72b9f..400ef9f3de52 100644
--- a/dev-java/ant-xz/Manifest
+++ b/dev-java/ant-xz/Manifest
@@ -1,2 +1,4 @@
DIST ant-1.10.7-gentoo.tar.bz2 6686 BLAKE2B 77e5850b68ab079f26722b5b2ff1afb29a35197afb79f80ae2f775855e2d8f3a478324b1175e9a73695b4e6a6798bf4458dc84d2f763a1d72c331505d31303ea SHA512 f5c5a2ea99a780413a71799d56e783f3ac861169bd7f29c3a85d039f61240abb91ed223eeb111c67a6a1328a6cf2203d7cbf93ad762e49bc11f9a948e7f2091c
+DIST ant-1.10.8-gentoo.tar.bz2 6674 BLAKE2B da52696eb20d74f6c3d36bd57c60927d9044b637ff9de175695d57596ae2e747db509cbde7ec862f9e99f2cee564803232e0edd0755f931dc070b150c4e38b21 SHA512 de14a55105888bc30921418c0e6ef5dac340d3d02bfab35ca7a62021505df94e71fc05eb864ffc276add5a2fce483338fe2cf02fcc04e693bb5b709c6b080490
DIST apache-ant-1.10.7-src.tar.bz2 4530166 BLAKE2B 6998fffbda6a0adbe3434ef0013b3e669ec8f15a09d9a5917509733f3232a538e9be83758b9eacccd673522812a8d482e1fd526d5493634d9c08759f47bfc7a7 SHA512 5849e81aa037b9ba7f4e67057a0cde50301d183fc244673c7f11e34997b11d21c33306c07ab820bf60d454afa8ad5b159c3442427c8cb5403896f29ed179b10d
+DIST apache-ant-1.10.8-src.tar.bz2 4848256 BLAKE2B bd0668e5592c6d2e77233dcffbf2311f9b072f60e7a0c2d5b1a0a6567fc015e1fda46caf1c6c2a3a6730df561f87a8477e0df54a12eeab866cd8d4cb8b2d1f7e SHA512 15563c339298dc576ffb0fb59858bed5f6deabb519ad3f5237e465e6dffd5307bb86fc120f7d7893332936b9f767c47e522cdd1da809b599ceec0070dcb20338
diff --git a/dev-java/ant-xz/ant-xz-1.10.8.ebuild b/dev-java/ant-xz/ant-xz-1.10.8.ebuild
new file mode 100644
index 000000000000..2a299ab6dc1b
--- /dev/null
+++ b/dev-java/ant-xz/ant-xz-1.10.8.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ANT_TASK_JDKVER=1.8
+ANT_TASK_JREVER=1.8
+ANT_TASK_DEPNAME="xz-java"
+
+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"
+
+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
new file mode 100644
index 000000000000..28e798b5fdde
--- /dev/null
+++ b/dev-java/ant/ant-1.10.8.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Java-based build tool similar to 'make' that uses XML configuration files"
+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"
+
+IUSE="X +antlr +bcel +bsf +commonslogging +commonsnet jai +javamail +jdepend jmf
+ +jsch +junit +junit4 +junitlauncher +log4j +oro +regexp +resolver swing testutil xz"
+
+DEPEND="~dev-java/ant-core-${PV}"
+
+RDEPEND="${DEPEND}
+ ~dev-java/ant-core-${PV}
+ ~dev-java/ant-junit-${PV}
+ ~dev-java/ant-apache-xalan2-${PV}
+ antlr? ( ~dev-java/ant-antlr-${PV} )
+ bcel? ( ~dev-java/ant-apache-bcel-${PV} )
+ bsf? ( ~dev-java/ant-apache-bsf-${PV} )
+ commonslogging? ( ~dev-java/ant-commons-logging-${PV} )
+ commonsnet? ( ~dev-java/ant-commons-net-${PV} )
+ jai? ( ~dev-java/ant-jai-${PV} )
+ javamail? ( ~dev-java/ant-javamail-${PV} )
+ jdepend? ( ~dev-java/ant-jdepend-${PV} )
+ jmf? ( ~dev-java/ant-jmf-${PV} )
+ jsch? ( ~dev-java/ant-jsch-${PV} )
+ junit? ( ~dev-java/ant-junit-${PV} )
+ junit4? ( ~dev-java/ant-junit4-${PV} )
+ junitlauncher? ( ~dev-java/ant-junitlauncher-${PV} )
+ log4j? ( ~dev-java/ant-apache-log4j-${PV} )
+ oro? ( ~dev-java/ant-apache-oro-${PV} )
+ regexp? ( ~dev-java/ant-apache-regexp-${PV} )
+ resolver? ( ~dev-java/ant-apache-resolver-${PV} )
+ swing? ( ~dev-java/ant-swing-${PV} )
+ testutil? ( ~dev-java/ant-testutil-${PV} )
+ X? ( ~dev-java/ant-swing-${PV} )
+ xz? ( ~dev-java/ant-xz-${PV} )
+"
+
+S="${WORKDIR}"
+
+src_compile() { :; }
diff --git a/dev-java/java-config/java-config-2.3.1.ebuild b/dev-java/java-config/java-config-2.3.1.ebuild
index 8a71761b2180..8f719c63474c 100644
--- a/dev-java/java-config/java-config-2.3.1.ebuild
+++ b/dev-java/java-config/java-config-2.3.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-java/protobuf-java/Manifest b/dev-java/protobuf-java/Manifest
index 806addb1d665..4667b310046c 100644
--- a/dev-java/protobuf-java/Manifest
+++ b/dev-java/protobuf-java/Manifest
@@ -1,2 +1,3 @@
DIST protobuf-3.10.1.tar.gz 4905995 BLAKE2B 1dde3b6260918da8430c2ce69210462f339c492b2a4e53d5d9c1bea3747aead905370507fc4bd703560f6885c0f3f8393a998b875c19744ad94827109ecbb49f SHA512 aba0c4034c0d3b1759904adb6270eee94dd5dc568f433b219e3f1f70c0033993cdfa3bf476ad3f5767c7629edb9fd029c686405abf93731dde808286b336330d
DIST protobuf-3.11.4.tar.gz 5140799 BLAKE2B 97b450c0623593efe6a42b66582ff183344b8831689e6a5b4d36096dbd57c33da9569bbf26578536aaf73ecd866ac0588b6cb7d55a6a9b9a6e840d4c57099001 SHA512 777bbb0e9e2375eaebe6b8c87abd660bac70ee469c9ad00dd25917b82d7fb5bbe33cf87f0d69c90e19d55c07a7285ec20974ba4768623ce9ccfadf147fd5e261
+DIST protobuf-3.12.2.tar.gz 5309688 BLAKE2B 6f04ab75a165d8135b4c1de210f8698f56f309f73d664192209de10580e0ef850bf56f6f394b860f21912e341141f7bbb1f63198eaee55fd7ad74d86b00c3b1f SHA512 84a349a1dcb5bce6a6a892cf11264390b557ed1e7b05883b71fa9cfb7460d9f73119da1f2861066869e33c752246ea438d5ce2c2b3ff7a4b07696d9450b7916b
diff --git a/dev-java/protobuf-java/protobuf-java-3.12.2.ebuild b/dev-java/protobuf-java/protobuf-java-3.12.2.ebuild
new file mode 100644
index 000000000000..09a8150fe7e7
--- /dev/null
+++ b/dev-java/protobuf-java/protobuf-java-3.12.2.ebuild
@@ -0,0 +1,53 @@
+# Copyright 2008-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+if [[ "${PV}" == "9999" ]]; then
+ inherit git-r3
+
+ EGIT_REPO_URI="https://github.com/protocolbuffers/protobuf"
+ EGIT_SUBMODULES=()
+fi
+
+DESCRIPTION="Google's Protocol Buffers - Java bindings"
+HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf"
+if [[ "${PV}" == "9999" ]]; then
+ SRC_URI=""
+else
+ SRC_URI="https://github.com/protocolbuffers/protobuf/archive/v${PV}.tar.gz -> protobuf-${PV}.tar.gz"
+fi
+
+LICENSE="BSD"
+SLOT="0/23"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE=""
+
+BDEPEND="~dev-libs/protobuf-${PV}
+ >=virtual/jdk-1.7"
+DEPEND=">=virtual/jdk-1.7"
+RDEPEND=">=virtual/jre-1.7
+ !/dev/null || die
+ elisp-compile *.el
+ popd &>/dev/null || die
+ fi
+}
+
+extract_version() {
+ local path="$1"
+ local var_name="$2"
+ sed -n -e "/^${var_name} = \(.*\)$/s::\1:p" "${S}/${path}/vsn.mk" || die "extract_version() failed"
+}
+
+src_install() {
+ local erl_libdir_rel="$(get_libdir)/erlang"
+ local erl_libdir="/usr/${erl_libdir_rel}"
+ local erl_interface_ver="$(extract_version lib/erl_interface EI_VSN)"
+ local erl_erts_ver="$(extract_version erts VSN)"
+ local my_manpath="/usr/share/${PN}/man"
+
+ [[ -z "${erl_erts_ver}" ]] && die "Couldn't determine erts version"
+ [[ -z "${erl_interface_ver}" ]] && die "Couldn't determine interface version"
+
+ emake INSTALL_PREFIX="${D}" install
+
+ if use doc ; then
+ # Note: we explicitly install docs into:
+ # /usr/share/doc/${PF}/{doc,lib,erts-*}
+ # To maintain that layout we gather everything in 'html-docs'.
+ # See bug #684376.
+ mkdir html-docs || die
+ mv "${WORKDIR}"/doc "${WORKDIR}"/lib "${WORKDIR}"/erts-* html-docs/ || die
+ local DOCS=( "AUTHORS" "HOWTO"/* "README.md" "CONTRIBUTING.md" html-docs/. )
+ docompress -x /usr/share/doc/${PF}
+ else
+ local DOCS=("README.md")
+ fi
+
+ einstalldocs
+
+ dosym "../${erl_libdir_rel}/bin/erl" /usr/bin/erl
+ dosym "../${erl_libdir_rel}/bin/erlc" /usr/bin/erlc
+ dosym "../${erl_libdir_rel}/bin/escript" /usr/bin/escript
+ dosym "../${erl_libdir_rel}/lib/erl_interface-${erl_interface_ver}/bin/erl_call" /usr/bin/erl_call
+ dosym "../${erl_libdir_rel}/erts-${erl_erts_ver}/bin/beam.smp" /usr/bin/beam.smp
+
+ ## Clean up the no longer needed files
+ rm "${ED}/${erl_libdir}/Install" || die
+
+ insinto "${my_manpath}"
+ doins -r "${WORKDIR}"/man/*
+ # extend MANPATH, so the normal man command can find it
+ # see bug 189639
+ newenvd - "90erlang" <<-_EOF_
+ MANPATH="${my_manpath}"
+ _EOF_
+
+ if use emacs ; then
+ elisp-install erlang lib/tools/emacs/*.{el,elc}
+ sed -e "s:/usr/share:${EPREFIX}/usr/share:g" \
+ "${FILESDIR}/${SITEFILE}" > "${T}/${SITEFILE}" || die
+ elisp-site-file-install "${T}/${SITEFILE}"
+ fi
+
+ newinitd "${FILESDIR}"/epmd.init-r2 epmd
+ newconfd "${FILESDIR}"/epmd.confd-r2 epmd
+ use systemd && systemd_newunit "${FILESDIR}"/epmd.service-r1 epmd.service
+}
+
+pkg_postinst() {
+ use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+ use emacs && elisp-site-regen
+}
diff --git a/dev-lang/go/Manifest b/dev-lang/go/Manifest
index b145f68c8dfa..f98079fd5f05 100644
--- a/dev-lang/go/Manifest
+++ b/dev-lang/go/Manifest
@@ -11,8 +11,6 @@ DIST go-linux-s390x-bootstrap-1.8.tbz 57124869 BLAKE2B 920a176b8f4fc3a816e724324
DIST go-solaris-amd64-bootstrap-1.8.tbz 54926326 BLAKE2B 0a45312f090d81ebf46fe5950cb65c059e2801394231e715e94145d1f918eb59b10472b2385e57ebd5cfb9eca0ad7290fb118436486b665520bb540970f971ab SHA512 52b849e5b9a940e10de7ba3df0ebdf6e1c5d631de9581d936c9edf8f38e6bb3314acbc2b2d5202b0528fde2a359d52bc0c6f39acf9b1b614725e4b4a947ed10d
DIST go1.12.17.src.tar.gz 20725913 BLAKE2B 2eef7374195302656268a42409619445dfeb3ede1f9218ae4eab195916876b97f7510cc62585a0bfdd9f86dddf8a74000032a84b29bc9891d84fc69db94f0274 SHA512 069f8f445d9d2268ebb14b2446fab34843d56283c04561636d122fd8b4c1ea0b63640a84437db7a7be71039440ffe170cd3f8025b03b0acf95f2a56fa2febec6
DIST go1.13.10.src.tar.gz 21702804 BLAKE2B 586494604455594c552d25a207634d70ae7f5ad142e18e22f5ef462c6488327cc01630c0bc99a4ede9dee0d649982802cf79f34f35ad7f810ca0701c35a7d555 SHA512 9e020dd89ab6201c4cbb893caecc0b077d5fbb2e10381e1b76a29ddc18c141d8db67a1b0f607ed915b0e9c40c4fb2c65b0319472535892534a31ad962e72fe05
-DIST go1.13.11.src.tar.gz 21702851 BLAKE2B 35ead9f337ecd4aab52705db3fd5ae55c8237af4e14a387c0dadda51f699b936e1115d3547c206aff8d01b290259f587d8073ea7fdc9ae47858c6545c69bb98c SHA512 2342e70779d2d5a77da00815078e8ed4f00ed5cc0509e332e4d46eb441f0a50e7697b7afe3ba0b12c3be697b9beb6650c196f0e603d602d255e4415a703ed7df
DIST go1.13.12.src.tar.gz 21703700 BLAKE2B d503b864edd753d838ab2776c00ee29d79c4dadaa8f9414291d7fd9ef420950361e676d78111db171d4d7bad9f28d23897333720d77c259691231cac81aa7b2a SHA512 85ffe18171cd131fc5bdfaa8f5e944643399ef1f270a599cdccbe0212f1d1651a87075d11877220466d18ff590bb9eadeac48851b630ab9f0e06c199c0286cc4
DIST go1.14.2.src.tar.gz 22454649 BLAKE2B edd8a1081e7da6988532b9fefe6d6f789a7d336562d61d5e585a8b881fb45d77721bee9837ae79318295471aea138e175650c2138175a587f0b7957988e8e209 SHA512 3f6804e1a60df6a7c55c294fe4147b2d6f028c619ad4ae5b1ae8793c6be637a1e6a62721cc7ce0b28918ab3441a89fa9acda72cb5450bf5af8d7872411d28015
-DIST go1.14.3.src.tar.gz 22534103 BLAKE2B 986ee88ac89a6ad8c492d7311271fadf5a0df5763f79ca0688dc94e2c49c36ea808f2184b7d57df2cfd24948d74e45103ef2171c5c6cdc2e0b6d5237cf78dc6a SHA512 ab7454cf5e364a4b8d3035320bb8af5a3064accba51cb98211d2ba8afb116d07cedd6f637d068b31df6185b2f26a649da910bc865c4d52ee72b2664bfb6229bc
DIST go1.14.4.src.tar.gz 22535243 BLAKE2B 8dc44b2144587e24ef53adcffdf335ec03dbcbb1101e38ac54611eb9e6216d3a676f5a24daab24342018b549b7de2a8730e556abfda5e18199c55d266ac3a44b SHA512 b0d657ea33331062db5a4da0aff14798f292ca967a53665af1a93e04eba7a03e49a3dbc4768c4f099ec5ff25a31885750f7658f819057057093e2d7bfb085575
diff --git a/dev-lang/go/go-1.13.11.ebuild b/dev-lang/go/go-1.13.11.ebuild
deleted file mode 100644
index d71bff70d905..000000000000
--- a/dev-lang/go/go-1.13.11.ebuild
+++ /dev/null
@@ -1,197 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-
-MY_PV=${PV/_/}
-
-inherit toolchain-funcs
-
-case ${PV} in
-*9999*)
- EGIT_REPO_URI="https://github.com/golang/go.git"
- inherit git-r3
- ;;
-*)
- SRC_URI="https://storage.googleapis.com/golang/go${MY_PV}.src.tar.gz "
- S="${WORKDIR}"/go
- case ${PV} in
- *_beta*|*_rc*) ;;
- *)
- KEYWORDS="-* ~amd64 ~arm ~arm64 ~ppc64 ~s390 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
- # The upstream tests fail under portage but pass if the build is
- # run according to their documentation [1].
- # I am restricting the tests on released versions until this is
- # solved.
- # [1] https://golang.org/issues/18442
- RESTRICT="test"
- ;;
- esac
-esac
-
-DESCRIPTION="A concurrent garbage collected and typesafe programming language"
-HOMEPAGE="https://golang.org"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-
-BDEPEND="|| (
- dev-lang/go
- dev-lang/go-bootstrap )"
-RDEPEND="!
-Date: Sat, 4 Apr 2020 14:11:25 -0400
-Subject: [PATCH] test.support.unlink: ignore EACCES
-
-Resolves test errors when running in the Gentoo sandbox environment.
-
-Bug: https://bugs.gentoo.org/679628
----
- Lib/test/support/__init__.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Lib/test/support/__init__.py b/Lib/test/support/__init__.py
-index ccc11c1b4b0..d47bdebda5c 100644
---- a/Lib/test/support/__init__.py
-+++ b/Lib/test/support/__init__.py
-@@ -291,7 +291,7 @@ def unlink(filename):
- try:
- _unlink(filename)
- except OSError as exc:
-- if exc.errno not in (errno.ENOENT, errno.ENOTDIR):
-+ if exc.errno not in (errno.ENOENT, errno.ENOTDIR, errno.EACCES):
- raise
-
- def rmdir(dirname):
---
-2.26.0
-
diff --git a/dev-lang/python/files/test.support.unlink-ignore-PermissionError.patch b/dev-lang/python/files/test.support.unlink-ignore-PermissionError.patch
deleted file mode 100644
index 6cae17b55189..000000000000
--- a/dev-lang/python/files/test.support.unlink-ignore-PermissionError.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 6e6402caa7962a9c9f7c5327f3c802545824f7f9 Mon Sep 17 00:00:00 2001
-From: Mike Gilbert
-Date: Fri, 3 Apr 2020 10:37:56 -0400
-Subject: [PATCH] test.support.unlink: ignore PermissionError
-
-Resolves test errors when running in the Gentoo sandbox environment.
-
-Bug: https://bugs.gentoo.org/679628
----
- Lib/test/support/__init__.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Lib/test/support/__init__.py b/Lib/test/support/__init__.py
-index 1f792d8514d..a0772480eb4 100644
---- a/Lib/test/support/__init__.py
-+++ b/Lib/test/support/__init__.py
-@@ -488,7 +488,7 @@ else:
- def unlink(filename):
- try:
- _unlink(filename)
-- except (FileNotFoundError, NotADirectoryError):
-+ except (FileNotFoundError, NotADirectoryError, PermissionError):
- pass
-
- def rmdir(dirname):
---
-2.26.0
-
diff --git a/dev-lang/python/python-2.7.17-r2.ebuild b/dev-lang/python/python-2.7.17-r2.ebuild
deleted file mode 100644
index 7cb8c9b155e4..000000000000
--- a/dev-lang/python/python-2.7.17-r2.ebuild
+++ /dev/null
@@ -1,369 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-WANT_LIBTOOL="none"
-
-inherit autotools flag-o-matic pax-utils python-utils-r1 toolchain-funcs
-
-MY_P="Python-${PV}"
-PYVER=$(ver_cut 1-2)
-PATCHSET="python-gentoo-patches-2.7.17-r1"
-
-DESCRIPTION="An interpreted, interactive, object-oriented programming language"
-HOMEPAGE="https://www.python.org/"
-SRC_URI="https://www.python.org/ftp/python/${PV}/${MY_P}.tar.xz
- https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="PSF-2"
-SLOT="${PYVER}"
-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.
-# If you need to apply a patch which requires python for bootstrapping, please
-# run the bootstrap code on your dev box and include the results in the
-# patchset. See bug 447752.
-
-RDEPEND="app-arch/bzip2:=
- dev-libs/libffi:=
- >=sys-libs/zlib-1.1.3:=
- virtual/libcrypt:=
- virtual/libintl
- berkdb? ( || (
- sys-libs/db:5.3
- sys-libs/db:5.1
- sys-libs/db:4.8
- sys-libs/db:4.7
- sys-libs/db:4.6
- sys-libs/db:4.5
- sys-libs/db:4.4
- sys-libs/db:4.3
- sys-libs/db:4.2
- ) )
- gdbm? ( sys-libs/gdbm:=[berkdb] )
- ncurses? ( >=sys-libs/ncurses-5.2:= )
- readline? ( >=sys-libs/readline-4.1:= )
- sqlite? ( >=dev-db/sqlite-3.3.8:3= )
- ssl? (
- !libressl? ( dev-libs/openssl:= )
- libressl? ( dev-libs/libressl:= )
- )
- tk? (
- >=dev-lang/tcl-8.0:=
- >=dev-lang/tk-8.0:=
- dev-tcltk/blt:=
- dev-tcltk/tix
- )
- xml? ( >=dev-libs/expat-2.1:= )"
-# bluetooth requires headers from bluez
-DEPEND="${RDEPEND}
- bluetooth? ( net-wireless/bluez )
- virtual/pkgconfig
- !sys-devel/gcc[libffi(-)]"
-RDEPEND+=" !build? ( app-misc/mime-types )"
-PDEPEND=">=app-eselect/eselect-python-20140125-r1"
-
-pkg_setup() {
- if use berkdb; then
- ewarn "'bsddb' module is out-of-date and no longer maintained inside"
- ewarn "dev-lang/python. 'bsddb' and 'dbhash' modules have been additionally"
- ewarn "removed in Python 3. A maintained alternative of 'bsddb3' module"
- ewarn "is provided by dev-python/bsddb3."
- else
- if has_version "=${CATEGORY}/${PN}-${PV%%.*}*[berkdb]"; then
- ewarn "You are migrating from =${CATEGORY}/${PN}-${PV%%.*}*[berkdb]"
- ewarn "to =${CATEGORY}/${PN}-${PV%%.*}*[-berkdb]."
- ewarn "You might need to migrate your databases."
- fi
- fi
-}
-
-src_prepare() {
- # Ensure that internal copies of expat, libffi and zlib are not used.
- rm -fr Modules/expat || die
- rm -fr Modules/_ctypes/libffi* || die
- rm -fr Modules/zlib || die
-
- local PATCHES=(
- "${WORKDIR}/${PATCHSET}"
- "${FILESDIR}/test.support.unlink-ignore-EACCES.patch"
- )
-
- default
-
- sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \
- Lib/distutils/command/install.py \
- Lib/distutils/sysconfig.py \
- Lib/site.py \
- Lib/sysconfig.py \
- Lib/test/test_site.py \
- Makefile.pre.in \
- Modules/Setup.dist \
- Modules/getpath.c \
- setup.py || die "sed failed to replace @@GENTOO_LIBDIR@@"
-
- eautoreconf
-}
-
-src_configure() {
- # dbm module can be linked against berkdb or gdbm.
- # Defaults to gdbm when both are enabled, #204343.
- local disable
- use berkdb || use gdbm || disable+=" dbm"
- use berkdb || disable+=" _bsddb"
- # disable automagic bluetooth headers detection
- use bluetooth || export ac_cv_header_bluetooth_bluetooth_h=no
- use gdbm || disable+=" gdbm"
- use ncurses || disable+=" _curses _curses_panel"
- use readline || disable+=" readline"
- use sqlite || disable+=" _sqlite3"
- use ssl || export PYTHON_DISABLE_SSL="1"
- use tk || disable+=" _tkinter"
- use xml || disable+=" _elementtree pyexpat" # _elementtree uses pyexpat.
- export PYTHON_DISABLE_MODULES="${disable}"
-
- if ! use xml; then
- ewarn "You have configured Python without XML support."
- ewarn "This is NOT a recommended configuration as you"
- ewarn "may face problems parsing any XML documents."
- fi
-
- if [[ -n "${PYTHON_DISABLE_MODULES}" ]]; then
- einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}"
- fi
-
- if [[ "$(gcc-major-version)" -ge 4 ]]; then
- append-flags -fwrapv
- fi
-
- filter-flags -malign-double
-
- # https://bugs.gentoo.org/show_bug.cgi?id=50309
- if is-flagq -O3; then
- is-flagq -fstack-protector-all && replace-flags -O3 -O2
- use hardened && replace-flags -O3 -O2
- fi
-
- if tc-is-cross-compiler; then
- # Force some tests that try to poke fs paths.
- export ac_cv_file__dev_ptc=no
- export ac_cv_file__dev_ptmx=yes
- fi
-
- # Export CXX so it ends up in /usr/lib/python2.X/config/Makefile.
- tc-export CXX
- # The configure script fails to use pkg-config correctly.
- # http://bugs.python.org/issue15506
- export ac_cv_path_PKG_CONFIG=$(tc-getPKG_CONFIG)
-
- # Set LDFLAGS so we link modules with -lpython2.7 correctly.
- # Needed on FreeBSD unless Python 2.7 is already installed.
- # Please query BSD team before removing this!
- append-ldflags "-L."
-
- local dbmliborder
- if use gdbm; then
- dbmliborder+="${dbmliborder:+:}gdbm"
- fi
- if use berkdb; then
- dbmliborder+="${dbmliborder:+:}bdb"
- fi
-
- local myeconfargs=(
- # The check is broken on clang, and gives false positive:
- # https://bugs.gentoo.org/596798
- # (upstream dropped this flag in 3.2a4 anyway)
- ac_cv_opt_olimit_ok=no
- # glibc-2.30 removes it; since we can't cleanly force-rebuild
- # Python on glibc upgrade, remove it proactively to give
- # a chance for users rebuilding python before glibc
- ac_cv_header_stropts_h=no
-
- --with-fpectl
- --enable-shared
- $(use_enable ipv6)
- $(use_with threads)
- $(use wide-unicode && echo "--enable-unicode=ucs4" || echo "--enable-unicode=ucs2")
- --infodir='${prefix}/share/info'
- --mandir='${prefix}/share/man'
- --with-computed-gotos
- --with-dbmliborder="${dbmliborder}"
- --with-libc=
- --enable-loadable-sqlite-extensions
- --with-system-expat
- --with-system-ffi
- --without-ensurepip
- )
-
- OPT="" econf "${myeconfargs[@]}"
-
- if use threads && grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then
- eerror "configure has detected that the sem_open function is broken."
- eerror "Please ensure that /dev/shm is mounted as a tmpfs with mode 1777."
- die "Broken sem_open function (bug 496328)"
- fi
-}
-
-src_compile() {
- # Ensure sed works as expected
- # https://bugs.gentoo.org/594768
- local -x LC_ALL=C
-
- # Avoid invoking pgen for cross-compiles.
- touch Include/graminit.h Python/graminit.c
-
- emake
-
- # Work around bug 329499. See also bug 413751 and 457194.
- if has_version dev-libs/libffi[pax_kernel]; then
- pax-mark E python
- else
- pax-mark m python
- fi
-}
-
-src_test() {
- # Tests will not work when cross compiling.
- if tc-is-cross-compiler; then
- elog "Disabling tests due to crosscompiling."
- return
- fi
-
- # Skip failing tests.
- local skipped_tests="distutils gdb"
-
- for test in ${skipped_tests}; do
- mv "${S}"/Lib/test/test_${test}.py "${T}"
- done
-
- # bug 660358
- local -x COLUMNS=80
-
- # Daylight saving time problem
- # https://bugs.python.org/issue22067
- # https://bugs.gentoo.org/610628
- local -x TZ=UTC
-
- # Rerun failed tests in verbose mode (regrtest -w).
- emake test EXTRATESTOPTS="-w" < /dev/tty
- local result="$?"
-
- for test in ${skipped_tests}; do
- mv "${T}/test_${test}.py" "${S}"/Lib/test
- done
-
- elog "The following tests have been skipped:"
- for test in ${skipped_tests}; do
- elog "test_${test}.py"
- done
-
- elog "If you would like to run them, you may:"
- elog "cd '${EPREFIX}/usr/$(get_libdir)/python${PYVER}/test'"
- elog "and run the tests separately."
-
- if [[ ${result} -ne 0 ]]; then
- die "emake test failed"
- fi
-}
-
-src_install() {
- local libdir=${ED}/usr/$(get_libdir)/python${PYVER}
-
- emake DESTDIR="${D}" altinstall
-
- sed -e "s/\(LDFLAGS=\).*/\1/" -i "${libdir}/config/Makefile" || die
-
- # Fix collisions between different slots of Python.
- mv "${ED}/usr/bin/2to3" "${ED}/usr/bin/2to3-${PYVER}" || die
- mv "${ED}/usr/bin/pydoc" "${ED}/usr/bin/pydoc${PYVER}" || die
- mv "${ED}/usr/bin/idle" "${ED}/usr/bin/idle${PYVER}" || die
- rm "${ED}/usr/bin/smtpd.py" || die
-
- use berkdb || rm -r "${libdir}/"{bsddb,dbhash.py*,test/test_bsddb*} || die
- use sqlite || rm -r "${libdir}/"{sqlite3,test/test_sqlite*} || die
- use tk || rm -r "${ED}/usr/bin/idle${PYVER}" "${libdir}/"{idlelib,lib-tk} || die
- use elibc_uclibc && rm -fr "${libdir}/"{bsddb/test,test}
-
- use threads || rm -r "${libdir}/multiprocessing" || die
- use wininst || rm "${libdir}/distutils/command/"wininst-*.exe || die
-
- dodoc Misc/{ACKS,HISTORY,NEWS}
-
- if use examples; then
- docinto examples
- dodoc -r Tools
- fi
- insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510
- local libname=$(printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' | \
- emake --no-print-directory -s -f - 2>/dev/null)
- newins "${S}"/Tools/gdb/libpython.py "${libname}"-gdb.py
-
- newconfd "${FILESDIR}/pydoc.conf" pydoc-${PYVER}
- newinitd "${FILESDIR}/pydoc.init" pydoc-${PYVER}
- sed \
- -e "s:@PYDOC_PORT_VARIABLE@:PYDOC${PYVER/./_}_PORT:" \
- -e "s:@PYDOC@:pydoc${PYVER}:" \
- -i "${ED}/etc/conf.d/pydoc-${PYVER}" \
- "${ED}/etc/init.d/pydoc-${PYVER}" || die "sed failed"
-
- # for python-exec
- local vars=( EPYTHON PYTHON_SITEDIR PYTHON_SCRIPTDIR )
-
- # if not using a cross-compiler, use the fresh binary
- if ! tc-is-cross-compiler; then
- local -x PYTHON=./python
- local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}${PWD}
- else
- vars=( PYTHON "${vars[@]}" )
- fi
-
- python_export "python${PYVER}" "${vars[@]}"
- echo "EPYTHON='${EPYTHON}'" > epython.py || die
- python_domodule epython.py
-
- # python-exec wrapping support
- local pymajor=${PYVER%.*}
- mkdir -p "${D}${PYTHON_SCRIPTDIR}" || die
- # python and pythonX
- ln -s "../../../bin/python${PYVER}" \
- "${D}${PYTHON_SCRIPTDIR}/python${pymajor}" || die
- ln -s "python${pymajor}" "${D}${PYTHON_SCRIPTDIR}/python" || die
- # python-config and pythonX-config
- ln -s "../../../bin/python${PYVER}-config" \
- "${D}${PYTHON_SCRIPTDIR}/python${pymajor}-config" || die
- ln -s "python${pymajor}-config" \
- "${D}${PYTHON_SCRIPTDIR}/python-config" || die
- # 2to3, pydoc, pyvenv
- ln -s "../../../bin/2to3-${PYVER}" \
- "${D}${PYTHON_SCRIPTDIR}/2to3" || die
- ln -s "../../../bin/pydoc${PYVER}" \
- "${D}${PYTHON_SCRIPTDIR}/pydoc" || die
- # idle
- if use tk; then
- ln -s "../../../bin/idle${PYVER}" \
- "${D}${PYTHON_SCRIPTDIR}/idle" || die
- fi
-}
-
-eselect_python_update() {
- if [[ -z "$(eselect python show)" || \
- ! -f "${EROOT}/usr/bin/$(eselect python show)" ]]; then
- eselect python update
- fi
-
- if [[ -z "$(eselect python show --python${PV%%.*})" || \
- ! -f "${EROOT}/usr/bin/$(eselect python show --python${PV%%.*})" ]]
- then
- eselect python update --python${PV%%.*}
- fi
-}
-
-pkg_postinst() {
- eselect_python_update
-}
-
-pkg_postrm() {
- eselect_python_update
-}
diff --git a/dev-lang/python/python-3.6.10-r1.ebuild b/dev-lang/python/python-3.6.11-r1.ebuild
similarity index 91%
rename from dev-lang/python/python-3.6.10-r1.ebuild
rename to dev-lang/python/python-3.6.11-r1.ebuild
index f6477a029f60..e6a339432683 100644
--- a/dev-lang/python/python-3.6.10-r1.ebuild
+++ b/dev-lang/python/python-3.6.11-r1.ebuild
@@ -8,7 +8,7 @@ inherit autotools flag-o-matic pax-utils python-utils-r1 toolchain-funcs
MY_P="Python-${PV}"
PYVER=$(ver_cut 1-2)
-PATCHSET="python-gentoo-patches-3.6.10"
+PATCHSET="python-gentoo-patches-3.6.11-r1"
DESCRIPTION="An interpreted, interactive, object-oriented programming language"
HOMEPAGE="https://www.python.org/"
@@ -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 )"
@@ -65,7 +65,6 @@ src_prepare() {
local PATCHES=(
"${WORKDIR}/${PATCHSET}"
- "${FILESDIR}/test.support.unlink-ignore-PermissionError.patch"
)
default
@@ -280,49 +279,47 @@ src_install() {
-i "${ED}/etc/conf.d/pydoc-${PYVER}" \
"${ED}/etc/init.d/pydoc-${PYVER}" || die "sed failed"
- # for python-exec
- local vars=( EPYTHON PYTHON_SITEDIR PYTHON_SCRIPTDIR )
-
+ local -x EPYTHON=python${PYVER}
# if not using a cross-compiler, use the fresh binary
if ! tc-is-cross-compiler; then
local -x PYTHON=./python
local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}${PWD}
else
- vars=( PYTHON "${vars[@]}" )
+ local -x PYTHON=${EPREFIX}/usr/bin/${EPYTHON}
fi
- python_export "python${PYVER}" "${vars[@]}"
echo "EPYTHON='${EPYTHON}'" > epython.py || die
python_domodule epython.py
# python-exec wrapping support
local pymajor=${PYVER%.*}
- mkdir -p "${D}${PYTHON_SCRIPTDIR}" || die
+ local scriptdir=${D}$(python_get_scriptdir)
+ mkdir -p "${scriptdir}" || die
# python and pythonX
ln -s "../../../bin/${abiver}" \
- "${D}${PYTHON_SCRIPTDIR}/python${pymajor}" || die
- ln -s "python${pymajor}" "${D}${PYTHON_SCRIPTDIR}/python" || die
+ "${scriptdir}/python${pymajor}" || die
+ ln -s "python${pymajor}" "${scriptdir}/python" || die
# python-config and pythonX-config
# note: we need to create a wrapper rather than symlinking it due
# to some random dirname(argv[0]) magic performed by python-config
- cat > "${D}${PYTHON_SCRIPTDIR}/python${pymajor}-config" <<-EOF || die
+ cat > "${scriptdir}/python${pymajor}-config" <<-EOF || die
#!/bin/sh
exec "${abiver}-config" "\${@}"
EOF
- chmod +x "${D}${PYTHON_SCRIPTDIR}/python${pymajor}-config" || die
+ chmod +x "${scriptdir}/python${pymajor}-config" || die
ln -s "python${pymajor}-config" \
- "${D}${PYTHON_SCRIPTDIR}/python-config" || die
+ "${scriptdir}/python-config" || die
# 2to3, pydoc, pyvenv
ln -s "../../../bin/2to3-${PYVER}" \
- "${D}${PYTHON_SCRIPTDIR}/2to3" || die
+ "${scriptdir}/2to3" || die
ln -s "../../../bin/pydoc${PYVER}" \
- "${D}${PYTHON_SCRIPTDIR}/pydoc" || die
+ "${scriptdir}/pydoc" || die
ln -s "../../../bin/pyvenv-${PYVER}" \
- "${D}${PYTHON_SCRIPTDIR}/pyvenv" || die
+ "${scriptdir}/pyvenv" || die
# idle
if use tk; then
ln -s "../../../bin/idle${PYVER}" \
- "${D}${PYTHON_SCRIPTDIR}/idle" || die
+ "${scriptdir}/idle" || die
fi
}
diff --git a/dev-lang/python/python-3.7.7-r1.ebuild b/dev-lang/python/python-3.7.7-r1.ebuild
deleted file mode 100644
index e56bc4bd7cc6..000000000000
--- a/dev-lang/python/python-3.7.7-r1.ebuild
+++ /dev/null
@@ -1,346 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-WANT_LIBTOOL="none"
-
-inherit autotools flag-o-matic pax-utils python-utils-r1 toolchain-funcs
-
-MY_P="Python-${PV}"
-PYVER=$(ver_cut 1-2)
-PATCHSET="python-gentoo-patches-3.7.6"
-
-DESCRIPTION="An interpreted, interactive, object-oriented programming language"
-HOMEPAGE="https://www.python.org/"
-SRC_URI="https://www.python.org/ftp/python/${PV}/${MY_P}.tar.xz
- https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz"
-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"
-IUSE="bluetooth build examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl test tk wininst +xml"
-RESTRICT="!test? ( test )"
-
-# Do not add a dependency on dev-lang/python to this ebuild.
-# If you need to apply a patch which requires python for bootstrapping, please
-# run the bootstrap code on your dev box and include the results in the
-# patchset. See bug 447752.
-
-RDEPEND="app-arch/bzip2:=
- app-arch/xz-utils:=
- dev-libs/libffi:=
- sys-apps/util-linux:=
- >=sys-libs/zlib-1.1.3:=
- virtual/libcrypt:=
- virtual/libintl
- gdbm? ( sys-libs/gdbm:=[berkdb] )
- ncurses? ( >=sys-libs/ncurses-5.2:= )
- readline? ( >=sys-libs/readline-4.1:= )
- sqlite? ( >=dev-db/sqlite-3.3.8:3= )
- ssl? (
- !libressl? ( dev-libs/openssl:= )
- libressl? ( dev-libs/libressl:= )
- )
- tk? (
- >=dev-lang/tcl-8.0:=
- >=dev-lang/tk-8.0:=
- dev-tcltk/blt:=
- dev-tcltk/tix
- )
- xml? ( >=dev-libs/expat-2.1:= )"
-# bluetooth requires headers from bluez
-DEPEND="${RDEPEND}
- bluetooth? ( net-wireless/bluez )
- test? ( app-arch/xz-utils[extra-filters(+)] )
- virtual/pkgconfig
- !sys-devel/gcc[libffi(-)]"
-RDEPEND+=" !build? ( app-misc/mime-types )"
-PDEPEND=">=app-eselect/eselect-python-20140125-r1"
-
-src_prepare() {
- # Ensure that internal copies of expat, libffi and zlib are not used.
- rm -fr Modules/expat || die
- rm -fr Modules/_ctypes/libffi* || die
- rm -fr Modules/zlib || die
-
- local PATCHES=(
- "${WORKDIR}/${PATCHSET}"
- "${FILESDIR}/test.support.unlink-ignore-PermissionError.patch"
- )
-
- default
-
- sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \
- setup.py || die "sed failed to replace @@GENTOO_LIBDIR@@"
-
- eautoreconf
-}
-
-src_configure() {
- local disable
- # disable automagic bluetooth headers detection
- use bluetooth || export ac_cv_header_bluetooth_bluetooth_h=no
- use gdbm || disable+=" gdbm"
- use ncurses || disable+=" _curses _curses_panel"
- use readline || disable+=" readline"
- use sqlite || disable+=" _sqlite3"
- use ssl || export PYTHON_DISABLE_SSL="1"
- use tk || disable+=" _tkinter"
- use xml || disable+=" _elementtree pyexpat" # _elementtree uses pyexpat.
- export PYTHON_DISABLE_MODULES="${disable}"
-
- if ! use xml; then
- ewarn "You have configured Python without XML support."
- ewarn "This is NOT a recommended configuration as you"
- ewarn "may face problems parsing any XML documents."
- fi
-
- if [[ -n "${PYTHON_DISABLE_MODULES}" ]]; then
- einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}"
- fi
-
- if [[ "$(gcc-major-version)" -ge 4 ]]; then
- append-flags -fwrapv
- fi
-
- filter-flags -malign-double
-
- # https://bugs.gentoo.org/show_bug.cgi?id=50309
- if is-flagq -O3; then
- is-flagq -fstack-protector-all && replace-flags -O3 -O2
- use hardened && replace-flags -O3 -O2
- fi
-
- # Export CXX so it ends up in /usr/lib/python3.X/config/Makefile.
- tc-export CXX
-
- # Set LDFLAGS so we link modules with -lpython3.2 correctly.
- # Needed on FreeBSD unless Python 3.2 is already installed.
- # Please query BSD team before removing this!
- append-ldflags "-L."
-
- # Fix implicit declarations on cross and prefix builds. Bug #674070.
- use ncurses && append-cppflags -I"${ESYSROOT}"/usr/include/ncursesw
-
- local dbmliborder
- if use gdbm; then
- dbmliborder+="${dbmliborder:+:}gdbm"
- fi
-
- local myeconfargs=(
- # glibc-2.30 removes it; since we can't cleanly force-rebuild
- # Python on glibc upgrade, remove it proactively to give
- # a chance for users rebuilding python before glibc
- ac_cv_header_stropts_h=no
-
- --enable-shared
- $(use_enable ipv6)
- --infodir='${prefix}/share/info'
- --mandir='${prefix}/share/man'
- --with-computed-gotos
- --with-dbmliborder="${dbmliborder}"
- --with-libc=
- --enable-loadable-sqlite-extensions
- --without-ensurepip
- --with-system-expat
- --with-system-ffi
- )
-
- OPT="" econf "${myeconfargs[@]}"
-}
-
-src_compile() {
- # Ensure sed works as expected
- # https://bugs.gentoo.org/594768
- local -x LC_ALL=C
-
- emake CPPFLAGS= CFLAGS= LDFLAGS=
-
- # Work around bug 329499. See also bug 413751 and 457194.
- if has_version dev-libs/libffi[pax_kernel]; then
- pax-mark E python
- else
- pax-mark m python
- fi
-}
-
-src_test() {
- # Tests will not work when cross compiling.
- if tc-is-cross-compiler; then
- elog "Disabling tests due to crosscompiling."
- return
- fi
-
- # Skip failing tests.
- local skipped_tests="gdb"
-
- for test in ${skipped_tests}; do
- mv "${S}"/Lib/test/test_${test}.py "${T}"
- done
-
- # bug 660358
- local -x COLUMNS=80
-
- local -x PYTHONDONTWRITEBYTECODE=
-
- emake test EXTRATESTOPTS="-u-network" CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty
- local result=$?
-
- for test in ${skipped_tests}; do
- mv "${T}/test_${test}.py" "${S}"/Lib/test
- done
-
- elog "The following tests have been skipped:"
- for test in ${skipped_tests}; do
- elog "test_${test}.py"
- done
-
- elog "If you would like to run them, you may:"
- elog "cd '${EPREFIX}/usr/lib/python${PYVER}/test'"
- elog "and run the tests separately."
-
- if [[ ${result} -ne 0 ]]; then
- die "emake test failed"
- fi
-}
-
-src_install() {
- local libdir=${ED}/usr/lib/python${PYVER}
-
- emake DESTDIR="${D}" altinstall
-
- # Remove static library
- rm "${ED}"/usr/$(get_libdir)/libpython*.a || die
-
- sed \
- -e "s/\(CONFIGURE_LDFLAGS=\).*/\1/" \
- -e "s/\(PY_LDFLAGS=\).*/\1/" \
- -i "${libdir}/config-${PYVER}"*/Makefile || die "sed failed"
-
- # Fix collisions between different slots of Python.
- rm "${ED}/usr/$(get_libdir)/libpython3.so" || die
-
- # Cheap hack to get version with ABIFLAGS
- local abiver=$(cd "${ED}/usr/include"; echo python*)
- if [[ ${abiver} != python${PYVER} ]]; then
- # Replace python3.X with a symlink to python3.Xm
- rm "${ED}/usr/bin/python${PYVER}" || die
- dosym "${abiver}" "/usr/bin/python${PYVER}"
- # Create python3.X-config symlink
- dosym "${abiver}-config" "/usr/bin/python${PYVER}-config"
- # Create python-3.5m.pc symlink
- dosym "python-${PYVER}.pc" "/usr/$(get_libdir)/pkgconfig/${abiver/${PYVER}/-${PYVER}}.pc"
- fi
-
- # python seems to get rebuilt in src_install (bug 569908)
- # Work around it for now.
- if has_version dev-libs/libffi[pax_kernel]; then
- pax-mark E "${ED}/usr/bin/${abiver}"
- else
- pax-mark m "${ED}/usr/bin/${abiver}"
- fi
-
- use sqlite || rm -r "${libdir}/"{sqlite3,test/test_sqlite*} || die
- use tk || rm -r "${ED}/usr/bin/idle${PYVER}" "${libdir}/"{idlelib,tkinter,test/test_tk*} || die
-
- use wininst || rm "${libdir}/distutils/command/"wininst-*.exe || die
-
- dodoc Misc/{ACKS,HISTORY,NEWS}
-
- if use examples; then
- docinto examples
- find Tools -name __pycache__ -exec rm -fr {} + || die
- dodoc -r Tools
- fi
- insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510
- local libname=$(printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' | \
- emake --no-print-directory -s -f - 2>/dev/null)
- newins "${S}"/Tools/gdb/libpython.py "${libname}"-gdb.py
-
- newconfd "${FILESDIR}/pydoc.conf" pydoc-${PYVER}
- newinitd "${FILESDIR}/pydoc.init" pydoc-${PYVER}
- sed \
- -e "s:@PYDOC_PORT_VARIABLE@:PYDOC${PYVER/./_}_PORT:" \
- -e "s:@PYDOC@:pydoc${PYVER}:" \
- -i "${ED}/etc/conf.d/pydoc-${PYVER}" \
- "${ED}/etc/init.d/pydoc-${PYVER}" || die "sed failed"
-
- # for python-exec
- local vars=( EPYTHON PYTHON_SITEDIR PYTHON_SCRIPTDIR )
-
- # if not using a cross-compiler, use the fresh binary
- if ! tc-is-cross-compiler; then
- local -x PYTHON=./python
- local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}${PWD}
- else
- vars=( PYTHON "${vars[@]}" )
- fi
-
- python_export "python${PYVER}" "${vars[@]}"
- echo "EPYTHON='${EPYTHON}'" > epython.py || die
- python_domodule epython.py
-
- # python-exec wrapping support
- local pymajor=${PYVER%.*}
- mkdir -p "${D}${PYTHON_SCRIPTDIR}" || die
- # python and pythonX
- ln -s "../../../bin/${abiver}" \
- "${D}${PYTHON_SCRIPTDIR}/python${pymajor}" || die
- ln -s "python${pymajor}" "${D}${PYTHON_SCRIPTDIR}/python" || die
- # python-config and pythonX-config
- # note: we need to create a wrapper rather than symlinking it due
- # to some random dirname(argv[0]) magic performed by python-config
- cat > "${D}${PYTHON_SCRIPTDIR}/python${pymajor}-config" <<-EOF || die
- #!/bin/sh
- exec "${abiver}-config" "\${@}"
- EOF
- chmod +x "${D}${PYTHON_SCRIPTDIR}/python${pymajor}-config" || die
- ln -s "python${pymajor}-config" \
- "${D}${PYTHON_SCRIPTDIR}/python-config" || die
- # 2to3, pydoc, pyvenv
- ln -s "../../../bin/2to3-${PYVER}" \
- "${D}${PYTHON_SCRIPTDIR}/2to3" || die
- ln -s "../../../bin/pydoc${PYVER}" \
- "${D}${PYTHON_SCRIPTDIR}/pydoc" || die
- ln -s "../../../bin/pyvenv-${PYVER}" \
- "${D}${PYTHON_SCRIPTDIR}/pyvenv" || die
- # idle
- if use tk; then
- ln -s "../../../bin/idle${PYVER}" \
- "${D}${PYTHON_SCRIPTDIR}/idle" || die
- fi
-}
-
-pkg_preinst() {
- if has_version "<${CATEGORY}/${PN}-${PYVER}" && ! has_version ">=${CATEGORY}/${PN}-${PYVER}_alpha"; then
- python_updater_warning="1"
- fi
-}
-
-eselect_python_update() {
- if [[ -z "$(eselect python show)" || \
- ! -f "${EROOT}/usr/bin/$(eselect python show)" ]]; then
- eselect python update
- fi
-
- if [[ -z "$(eselect python show --python${PV%%.*})" || \
- ! -f "${EROOT}/usr/bin/$(eselect python show --python${PV%%.*})" ]]
- then
- eselect python update --python${PV%%.*}
- fi
-}
-
-pkg_postinst() {
- eselect_python_update
-
- if [[ "${python_updater_warning}" == "1" ]]; then
- ewarn "You have just upgraded from an older version of Python."
- ewarn
- ewarn "Please adjust PYTHON_TARGETS (if so desired), and run emerge with the --newuse or --changed-use option to rebuild packages installing python modules."
- fi
-}
-
-pkg_postrm() {
- eselect_python_update
-}
diff --git a/dev-lang/python/python-3.7.8.ebuild b/dev-lang/python/python-3.7.8-r1.ebuild
similarity index 98%
rename from dev-lang/python/python-3.7.8.ebuild
rename to dev-lang/python/python-3.7.8-r1.ebuild
index c88e819e8b18..0189b2861593 100644
--- a/dev-lang/python/python-3.7.8.ebuild
+++ b/dev-lang/python/python-3.7.8-r1.ebuild
@@ -8,7 +8,7 @@ inherit autotools flag-o-matic pax-utils python-utils-r1 toolchain-funcs
MY_P="Python-${PV}"
PYVER=$(ver_cut 1-2)
-PATCHSET="python-gentoo-patches-3.7.8"
+PATCHSET="python-gentoo-patches-3.7.8-r1"
DESCRIPTION="An interpreted, interactive, object-oriented programming language"
HOMEPAGE="https://www.python.org/"
@@ -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.2-r1.ebuild b/dev-lang/python/python-3.8.2-r1.ebuild
deleted file mode 100644
index 22fab4254618..000000000000
--- a/dev-lang/python/python-3.8.2-r1.ebuild
+++ /dev/null
@@ -1,351 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-WANT_LIBTOOL="none"
-
-inherit autotools flag-o-matic pax-utils python-utils-r1 toolchain-funcs
-
-MY_P="Python-${PV}"
-PYVER=$(ver_cut 1-2)
-PATCHSET="python-gentoo-patches-3.8.1-r2"
-
-DESCRIPTION="An interpreted, interactive, object-oriented programming language"
-HOMEPAGE="https://www.python.org/"
-SRC_URI="https://www.python.org/ftp/python/${PV}/${MY_P}.tar.xz
- https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="PSF-2"
-SLOT="${PYVER}"
-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 )"
-
-# Do not add a dependency on dev-lang/python to this ebuild.
-# If you need to apply a patch which requires python for bootstrapping, please
-# run the bootstrap code on your dev box and include the results in the
-# patchset. See bug 447752.
-
-RDEPEND="app-arch/bzip2:=
- app-arch/xz-utils:=
- dev-libs/libffi:=
- sys-apps/util-linux:=
- >=sys-libs/zlib-1.1.3:=
- virtual/libcrypt:=
- virtual/libintl
- gdbm? ( sys-libs/gdbm:=[berkdb] )
- ncurses? ( >=sys-libs/ncurses-5.2:= )
- readline? ( >=sys-libs/readline-4.1:= )
- sqlite? ( >=dev-db/sqlite-3.3.8:3= )
- ssl? (
- !libressl? ( dev-libs/openssl:= )
- libressl? ( dev-libs/libressl:= )
- )
- tk? (
- >=dev-lang/tcl-8.0:=
- >=dev-lang/tk-8.0:=
- dev-tcltk/blt:=
- dev-tcltk/tix
- )
- xml? ( >=dev-libs/expat-2.1:= )"
-# bluetooth requires headers from bluez
-DEPEND="${RDEPEND}
- bluetooth? ( net-wireless/bluez )
- test? ( app-arch/xz-utils[extra-filters(+)] )
- virtual/pkgconfig
- !sys-devel/gcc[libffi(-)]"
-RDEPEND+=" !build? ( app-misc/mime-types )"
-PDEPEND=">=app-eselect/eselect-python-20140125-r1"
-
-src_prepare() {
- # Ensure that internal copies of expat, libffi and zlib are not used.
- rm -fr Modules/expat || die
- rm -fr Modules/_ctypes/libffi* || die
- rm -fr Modules/zlib || die
-
- local PATCHES=(
- "${WORKDIR}/${PATCHSET}"
- "${FILESDIR}/test.support.unlink-ignore-PermissionError.patch"
- # add module importing numpy to blacklist
- "${FILESDIR}/test-__all__-numpy.patch"
- )
-
- default
-
- sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \
- setup.py || die "sed failed to replace @@GENTOO_LIBDIR@@"
-
- eautoreconf
-}
-
-src_configure() {
- local disable
- # disable automagic bluetooth headers detection
- use bluetooth || export ac_cv_header_bluetooth_bluetooth_h=no
- use gdbm || disable+=" gdbm"
- use ncurses || disable+=" _curses _curses_panel"
- use readline || disable+=" readline"
- use sqlite || disable+=" _sqlite3"
- use ssl || export PYTHON_DISABLE_SSL="1"
- use tk || disable+=" _tkinter"
- use xml || disable+=" _elementtree pyexpat" # _elementtree uses pyexpat.
- export PYTHON_DISABLE_MODULES="${disable}"
-
- if ! use xml; then
- ewarn "You have configured Python without XML support."
- ewarn "This is NOT a recommended configuration as you"
- ewarn "may face problems parsing any XML documents."
- fi
-
- if [[ -n "${PYTHON_DISABLE_MODULES}" ]]; then
- einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}"
- fi
-
- if [[ "$(gcc-major-version)" -ge 4 ]]; then
- append-flags -fwrapv
- fi
-
- filter-flags -malign-double
-
- # https://bugs.gentoo.org/show_bug.cgi?id=50309
- if is-flagq -O3; then
- is-flagq -fstack-protector-all && replace-flags -O3 -O2
- use hardened && replace-flags -O3 -O2
- fi
-
- # https://bugs.gentoo.org/700012
- if is-flagq -flto || is-flagq '-flto=*'; then
- append-cflags $(test-flags-CC -ffat-lto-objects)
- fi
-
- # Export CXX so it ends up in /usr/lib/python3.X/config/Makefile.
- tc-export CXX
-
- # Set LDFLAGS so we link modules with -lpython3.2 correctly.
- # Needed on FreeBSD unless Python 3.2 is already installed.
- # Please query BSD team before removing this!
- append-ldflags "-L."
-
- # Fix implicit declarations on cross and prefix builds. Bug #674070.
- use ncurses && append-cppflags -I"${ESYSROOT}"/usr/include/ncursesw
-
- local dbmliborder
- if use gdbm; then
- dbmliborder+="${dbmliborder:+:}gdbm"
- fi
-
- local myeconfargs=(
- # glibc-2.30 removes it; since we can't cleanly force-rebuild
- # Python on glibc upgrade, remove it proactively to give
- # a chance for users rebuilding python before glibc
- ac_cv_header_stropts_h=no
-
- --enable-shared
- $(use_enable ipv6)
- --infodir='${prefix}/share/info'
- --mandir='${prefix}/share/man'
- --with-computed-gotos
- --with-dbmliborder="${dbmliborder}"
- --with-libc=
- --enable-loadable-sqlite-extensions
- --without-ensurepip
- --with-system-expat
- --with-system-ffi
- )
-
- OPT="" econf "${myeconfargs[@]}"
-}
-
-src_compile() {
- # Ensure sed works as expected
- # https://bugs.gentoo.org/594768
- local -x LC_ALL=C
-
- emake CPPFLAGS= CFLAGS= LDFLAGS=
-
- # Work around bug 329499. See also bug 413751 and 457194.
- if has_version dev-libs/libffi[pax_kernel]; then
- pax-mark E python
- else
- pax-mark m python
- fi
-}
-
-src_test() {
- # Tests will not work when cross compiling.
- if tc-is-cross-compiler; then
- elog "Disabling tests due to crosscompiling."
- return
- fi
-
- # Skip failing tests.
- local skipped_tests="gdb"
-
- for test in ${skipped_tests}; do
- mv "${S}"/Lib/test/test_${test}.py "${T}"
- done
-
- # bug 660358
- local -x COLUMNS=80
-
- local -x PYTHONDONTWRITEBYTECODE=
-
- emake test EXTRATESTOPTS="-u-network" CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty
- local result=$?
-
- for test in ${skipped_tests}; do
- mv "${T}/test_${test}.py" "${S}"/Lib/test
- done
-
- elog "The following tests have been skipped:"
- for test in ${skipped_tests}; do
- elog "test_${test}.py"
- done
-
- elog "If you would like to run them, you may:"
- elog "cd '${EPREFIX}/usr/lib/python${PYVER}/test'"
- elog "and run the tests separately."
-
- if [[ ${result} -ne 0 ]]; then
- die "emake test failed"
- fi
-}
-
-src_install() {
- local libdir=${ED}/usr/lib/python${PYVER}
-
- emake DESTDIR="${D}" altinstall
-
- # Remove static library
- rm "${ED}"/usr/$(get_libdir)/libpython*.a || die
-
- sed \
- -e "s/\(CONFIGURE_LDFLAGS=\).*/\1/" \
- -e "s/\(PY_LDFLAGS=\).*/\1/" \
- -i "${libdir}/config-${PYVER}"*/Makefile || die "sed failed"
-
- # Fix collisions between different slots of Python.
- rm "${ED}/usr/$(get_libdir)/libpython3.so" || die
-
- # Cheap hack to get version with ABIFLAGS
- local abiver=$(cd "${ED}/usr/include"; echo python*)
- if [[ ${abiver} != python${PYVER} ]]; then
- # Replace python3.X with a symlink to python3.Xm
- rm "${ED}/usr/bin/python${PYVER}" || die
- dosym "${abiver}" "/usr/bin/python${PYVER}"
- # Create python3.X-config symlink
- dosym "${abiver}-config" "/usr/bin/python${PYVER}-config"
- # Create python-3.5m.pc symlink
- dosym "python-${PYVER}.pc" "/usr/$(get_libdir)/pkgconfig/${abiver/${PYVER}/-${PYVER}}.pc"
- fi
-
- # python seems to get rebuilt in src_install (bug 569908)
- # Work around it for now.
- if has_version dev-libs/libffi[pax_kernel]; then
- pax-mark E "${ED}/usr/bin/${abiver}"
- else
- pax-mark m "${ED}/usr/bin/${abiver}"
- fi
-
- use sqlite || rm -r "${libdir}/"{sqlite3,test/test_sqlite*} || die
- use tk || rm -r "${ED}/usr/bin/idle${PYVER}" "${libdir}/"{idlelib,tkinter,test/test_tk*} || die
-
- use wininst || rm "${libdir}/distutils/command/"wininst-*.exe || die
-
- dodoc Misc/{ACKS,HISTORY,NEWS}
-
- if use examples; then
- docinto examples
- find Tools -name __pycache__ -exec rm -fr {} + || die
- dodoc -r Tools
- fi
- insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510
- local libname=$(printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' | \
- emake --no-print-directory -s -f - 2>/dev/null)
- newins "${S}"/Tools/gdb/libpython.py "${libname}"-gdb.py
-
- newconfd "${FILESDIR}/pydoc.conf" pydoc-${PYVER}
- newinitd "${FILESDIR}/pydoc.init" pydoc-${PYVER}
- sed \
- -e "s:@PYDOC_PORT_VARIABLE@:PYDOC${PYVER/./_}_PORT:" \
- -e "s:@PYDOC@:pydoc${PYVER}:" \
- -i "${ED}/etc/conf.d/pydoc-${PYVER}" \
- "${ED}/etc/init.d/pydoc-${PYVER}" || die "sed failed"
-
- # for python-exec
- local vars=( EPYTHON PYTHON_SITEDIR PYTHON_SCRIPTDIR )
-
- # if not using a cross-compiler, use the fresh binary
- if ! tc-is-cross-compiler; then
- local -x PYTHON=./python
- local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}${PWD}
- else
- vars=( PYTHON "${vars[@]}" )
- fi
-
- python_export "python${PYVER}" "${vars[@]}"
- echo "EPYTHON='${EPYTHON}'" > epython.py || die
- python_domodule epython.py
-
- # python-exec wrapping support
- local pymajor=${PYVER%.*}
- mkdir -p "${D}${PYTHON_SCRIPTDIR}" || die
- # python and pythonX
- ln -s "../../../bin/${abiver}" \
- "${D}${PYTHON_SCRIPTDIR}/python${pymajor}" || die
- ln -s "python${pymajor}" "${D}${PYTHON_SCRIPTDIR}/python" || die
- # python-config and pythonX-config
- # note: we need to create a wrapper rather than symlinking it due
- # to some random dirname(argv[0]) magic performed by python-config
- cat > "${D}${PYTHON_SCRIPTDIR}/python${pymajor}-config" <<-EOF || die
- #!/bin/sh
- exec "${abiver}-config" "\${@}"
- EOF
- chmod +x "${D}${PYTHON_SCRIPTDIR}/python${pymajor}-config" || die
- ln -s "python${pymajor}-config" \
- "${D}${PYTHON_SCRIPTDIR}/python-config" || die
- # 2to3, pydoc
- ln -s "../../../bin/2to3-${PYVER}" \
- "${D}${PYTHON_SCRIPTDIR}/2to3" || die
- ln -s "../../../bin/pydoc${PYVER}" \
- "${D}${PYTHON_SCRIPTDIR}/pydoc" || die
- # idle
- if use tk; then
- ln -s "../../../bin/idle${PYVER}" \
- "${D}${PYTHON_SCRIPTDIR}/idle" || die
- fi
-}
-
-pkg_preinst() {
- if has_version "<${CATEGORY}/${PN}-${PYVER}" && ! has_version ">=${CATEGORY}/${PN}-${PYVER}_alpha"; then
- python_updater_warning="1"
- fi
-}
-
-eselect_python_update() {
- if [[ -z "$(eselect python show)" || \
- ! -f "${EROOT}/usr/bin/$(eselect python show)" ]]; then
- eselect python update
- fi
-
- if [[ -z "$(eselect python show --python${PV%%.*})" || \
- ! -f "${EROOT}/usr/bin/$(eselect python show --python${PV%%.*})" ]]
- then
- eselect python update --python${PV%%.*}
- fi
-}
-
-pkg_postinst() {
- eselect_python_update
-
- if [[ "${python_updater_warning}" == "1" ]]; then
- ewarn "You have just upgraded from an older version of Python."
- ewarn
- ewarn "Please adjust PYTHON_TARGETS (if so desired), and run emerge with the --newuse or --changed-use option to rebuild packages installing python modules."
- fi
-}
-
-pkg_postrm() {
- eselect_python_update
-}
diff --git a/dev-lang/python/python-3.8.3.ebuild b/dev-lang/python/python-3.8.3-r1.ebuild
similarity index 98%
rename from dev-lang/python/python-3.8.3.ebuild
rename to dev-lang/python/python-3.8.3-r1.ebuild
index c1cb51ab328b..d03fc26b63f8 100644
--- a/dev-lang/python/python-3.8.3.ebuild
+++ b/dev-lang/python/python-3.8.3-r1.ebuild
@@ -8,7 +8,7 @@ inherit autotools flag-o-matic pax-utils python-utils-r1 toolchain-funcs
MY_P="Python-${PV}"
PYVER=$(ver_cut 1-2)
-PATCHSET="python-gentoo-patches-3.8.3"
+PATCHSET="python-gentoo-patches-3.8.3-r1"
DESCRIPTION="An interpreted, interactive, object-oriented programming language"
HOMEPAGE="https://www.python.org/"
@@ -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.9.0_alpha6.ebuild b/dev-lang/python/python-3.9.0_alpha6.ebuild
deleted file mode 100644
index 2e417caf95f9..000000000000
--- a/dev-lang/python/python-3.9.0_alpha6.ebuild
+++ /dev/null
@@ -1,327 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-WANT_LIBTOOL="none"
-
-inherit autotools check-reqs flag-o-matic pax-utils python-utils-r1 \
- toolchain-funcs
-
-MY_P="Python-${PV/_alpha/a}"
-PYVER=$(ver_cut 1-2)
-PATCHSET="python-gentoo-patches-3.9.0_alpha6"
-
-DESCRIPTION="An interpreted, interactive, object-oriented programming language"
-HOMEPAGE="https://www.python.org/"
-SRC_URI="https://www.python.org/ftp/python/${PV%_*}/${MY_P}.tar.xz
- https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="PSF-2"
-SLOT="${PYVER}"
-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 )"
-
-# Do not add a dependency on dev-lang/python to this ebuild.
-# If you need to apply a patch which requires python for bootstrapping, please
-# run the bootstrap code on your dev box and include the results in the
-# patchset. See bug 447752.
-
-RDEPEND="app-arch/bzip2:=
- app-arch/xz-utils:=
- dev-libs/libffi:=
- sys-apps/util-linux:=
- >=sys-libs/zlib-1.1.3:=
- virtual/libcrypt:=
- virtual/libintl
- gdbm? ( sys-libs/gdbm:=[berkdb] )
- ncurses? ( >=sys-libs/ncurses-5.2:= )
- readline? ( >=sys-libs/readline-4.1:= )
- sqlite? ( >=dev-db/sqlite-3.3.8:3= )
- ssl? (
- !libressl? ( dev-libs/openssl:= )
- libressl? ( dev-libs/libressl:= )
- )
- tk? (
- >=dev-lang/tcl-8.0:=
- >=dev-lang/tk-8.0:=
- dev-tcltk/blt:=
- dev-tcltk/tix
- )
- xml? ( >=dev-libs/expat-2.1:= )"
-# bluetooth requires headers from bluez
-DEPEND="${RDEPEND}
- bluetooth? ( net-wireless/bluez )
- test? ( app-arch/xz-utils[extra-filters(+)] )
- virtual/pkgconfig
- !sys-devel/gcc[libffi(-)]"
-RDEPEND+=" !build? ( app-misc/mime-types )"
-PDEPEND=">=app-eselect/eselect-python-20140125-r1"
-
-# large file tests involve a 2.5G file being copied (duplicated)
-CHECKREQS_DISK_BUILD=5500M
-
-pkg_pretend() {
- use test && check-reqs_pkg_pretend
-
- ewarn "This is an early developer preview of Python 3.9. New features"
- ewarn "can still be added up to 2020-05-18. It's not suitable for production"
- ewarn "use, and it is not supported for Gentoo packages."
-}
-
-pkg_setup() {
- use test && check-reqs_pkg_setup
-}
-
-src_prepare() {
- # Ensure that internal copies of expat, libffi and zlib are not used.
- rm -fr Modules/expat || die
- rm -fr Modules/_ctypes/libffi* || die
- rm -fr Modules/zlib || die
-
- local PATCHES=(
- "${WORKDIR}/${PATCHSET}"
- )
-
- default
-
- sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \
- setup.py || die "sed failed to replace @@GENTOO_LIBDIR@@"
-
- eautoreconf
-}
-
-src_configure() {
- local disable
- # disable automagic bluetooth headers detection
- use bluetooth || export ac_cv_header_bluetooth_bluetooth_h=no
- use gdbm || disable+=" gdbm"
- use ncurses || disable+=" _curses _curses_panel"
- use readline || disable+=" readline"
- use sqlite || disable+=" _sqlite3"
- use ssl || export PYTHON_DISABLE_SSL="1"
- use tk || disable+=" _tkinter"
- use xml || disable+=" _elementtree pyexpat" # _elementtree uses pyexpat.
- export PYTHON_DISABLE_MODULES="${disable}"
-
- if ! use xml; then
- ewarn "You have configured Python without XML support."
- ewarn "This is NOT a recommended configuration as you"
- ewarn "may face problems parsing any XML documents."
- fi
-
- if [[ -n "${PYTHON_DISABLE_MODULES}" ]]; then
- einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}"
- fi
-
- if [[ "$(gcc-major-version)" -ge 4 ]]; then
- append-flags -fwrapv
- fi
-
- filter-flags -malign-double
-
- # https://bugs.gentoo.org/show_bug.cgi?id=50309
- if is-flagq -O3; then
- is-flagq -fstack-protector-all && replace-flags -O3 -O2
- use hardened && replace-flags -O3 -O2
- fi
-
- # https://bugs.gentoo.org/700012
- if is-flagq -flto || is-flagq '-flto=*'; then
- append-cflags $(test-flags-CC -ffat-lto-objects)
- fi
-
- # Export CXX so it ends up in /usr/lib/python3.X/config/Makefile.
- tc-export CXX
-
- # Set LDFLAGS so we link modules with -lpython3.2 correctly.
- # Needed on FreeBSD unless Python 3.2 is already installed.
- # Please query BSD team before removing this!
- append-ldflags "-L."
-
- # Fix implicit declarations on cross and prefix builds. Bug #674070.
- use ncurses && append-cppflags -I"${ESYSROOT}"/usr/include/ncursesw
-
- local dbmliborder
- if use gdbm; then
- dbmliborder+="${dbmliborder:+:}gdbm"
- fi
-
- local myeconfargs=(
- # glibc-2.30 removes it; since we can't cleanly force-rebuild
- # Python on glibc upgrade, remove it proactively to give
- # a chance for users rebuilding python before glibc
- ac_cv_header_stropts_h=no
-
- --enable-shared
- $(use_enable ipv6)
- --infodir='${prefix}/share/info'
- --mandir='${prefix}/share/man'
- --with-computed-gotos
- --with-dbmliborder="${dbmliborder}"
- --with-libc=
- --enable-loadable-sqlite-extensions
- --without-ensurepip
- --with-system-expat
- --with-system-ffi
- )
-
- OPT="" econf "${myeconfargs[@]}"
-}
-
-src_compile() {
- # Ensure sed works as expected
- # https://bugs.gentoo.org/594768
- local -x LC_ALL=C
-
- emake CPPFLAGS= CFLAGS= LDFLAGS=
-
- # Work around bug 329499. See also bug 413751 and 457194.
- if has_version dev-libs/libffi[pax_kernel]; then
- pax-mark E python
- else
- pax-mark m python
- fi
-}
-
-src_test() {
- # Tests will not work when cross compiling.
- if tc-is-cross-compiler; then
- elog "Disabling tests due to crosscompiling."
- return
- fi
-
- # Skip failing tests.
- local skipped_tests="gdb"
-
- for test in ${skipped_tests}; do
- mv "${S}"/Lib/test/test_${test}.py "${T}"
- done
-
- # bug 660358
- local -x COLUMNS=80
-
- local -x PYTHONDONTWRITEBYTECODE=
-
- emake test EXTRATESTOPTS="-u-network" CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty
- local result=$?
-
- for test in ${skipped_tests}; do
- mv "${T}/test_${test}.py" "${S}"/Lib/test
- done
-
- elog "The following tests have been skipped:"
- for test in ${skipped_tests}; do
- elog "test_${test}.py"
- done
-
- elog "If you would like to run them, you may:"
- elog "cd '${EPREFIX}/usr/lib/python${PYVER}/test'"
- elog "and run the tests separately."
-
- if [[ ${result} -ne 0 ]]; then
- die "emake test failed"
- fi
-}
-
-src_install() {
- local libdir=${ED}/usr/lib/python${PYVER}
-
- emake DESTDIR="${D}" altinstall
-
- # Remove static library
- rm "${ED}"/usr/$(get_libdir)/libpython*.a || die
-
- sed \
- -e "s/\(CONFIGURE_LDFLAGS=\).*/\1/" \
- -e "s/\(PY_LDFLAGS=\).*/\1/" \
- -i "${libdir}/config-${PYVER}"*/Makefile || die "sed failed"
-
- # Fix collisions between different slots of Python.
- rm "${ED}/usr/$(get_libdir)/libpython3.so" || die
-
- # Cheap hack to get version with ABIFLAGS
- local abiver=$(cd "${ED}/usr/include"; echo python*)
- if [[ ${abiver} != python${PYVER} ]]; then
- # Replace python3.X with a symlink to python3.Xm
- rm "${ED}/usr/bin/python${PYVER}" || die
- dosym "${abiver}" "/usr/bin/python${PYVER}"
- # Create python3.X-config symlink
- dosym "${abiver}-config" "/usr/bin/python${PYVER}-config"
- # Create python-3.5m.pc symlink
- dosym "python-${PYVER}.pc" "/usr/$(get_libdir)/pkgconfig/${abiver/${PYVER}/-${PYVER}}.pc"
- fi
-
- # python seems to get rebuilt in src_install (bug 569908)
- # Work around it for now.
- if has_version dev-libs/libffi[pax_kernel]; then
- pax-mark E "${ED}/usr/bin/${abiver}"
- else
- pax-mark m "${ED}/usr/bin/${abiver}"
- fi
-
- use sqlite || rm -r "${libdir}/"{sqlite3,test/test_sqlite*} || die
- use tk || rm -r "${ED}/usr/bin/idle${PYVER}" "${libdir}/"{idlelib,tkinter,test/test_tk*} || die
-
- dodoc Misc/{ACKS,HISTORY,NEWS}
-
- if use examples; then
- docinto examples
- find Tools -name __pycache__ -exec rm -fr {} + || die
- dodoc -r Tools
- fi
- insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510
- local libname=$(printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' | \
- emake --no-print-directory -s -f - 2>/dev/null)
- newins "${S}"/Tools/gdb/libpython.py "${libname}"-gdb.py
-
- newconfd "${FILESDIR}/pydoc.conf" pydoc-${PYVER}
- newinitd "${FILESDIR}/pydoc.init" pydoc-${PYVER}
- sed \
- -e "s:@PYDOC_PORT_VARIABLE@:PYDOC${PYVER/./_}_PORT:" \
- -e "s:@PYDOC@:pydoc${PYVER}:" \
- -i "${ED}/etc/conf.d/pydoc-${PYVER}" \
- "${ED}/etc/init.d/pydoc-${PYVER}" || die "sed failed"
-
- local -x EPYTHON=python${PYVER}
- # if not using a cross-compiler, use the fresh binary
- if ! tc-is-cross-compiler; then
- local -x PYTHON=./python
- local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}${PWD}
- else
- local -x PYTHON=${EPREFIX}/usr/bin/${EPYTHON}
- fi
-
- echo "EPYTHON='${EPYTHON}'" > epython.py || die
- python_domodule epython.py
-
- # python-exec wrapping support
- local pymajor=${PYVER%.*}
- local scriptdir=${D}$(python_get_scriptdir)
- mkdir -p "${scriptdir}" || die
- # python and pythonX
- ln -s "../../../bin/${abiver}" \
- "${scriptdir}/python${pymajor}" || die
- ln -s "python${pymajor}" "${scriptdir}/python" || die
- # python-config and pythonX-config
- # note: we need to create a wrapper rather than symlinking it due
- # to some random dirname(argv[0]) magic performed by python-config
- cat > "${scriptdir}/python${pymajor}-config" <<-EOF || die
- #!/bin/sh
- exec "${abiver}-config" "\${@}"
- EOF
- chmod +x "${scriptdir}/python${pymajor}-config" || die
- ln -s "python${pymajor}-config" \
- "${scriptdir}/python-config" || die
- # 2to3, pydoc
- ln -s "../../../bin/2to3-${PYVER}" \
- "${scriptdir}/2to3" || die
- ln -s "../../../bin/pydoc${PYVER}" \
- "${scriptdir}/pydoc" || die
- # idle
- if use tk; then
- ln -s "../../../bin/idle${PYVER}" \
- "${scriptdir}/idle" || die
- fi
-}
diff --git a/dev-lang/python/python-3.9.0_beta1.ebuild b/dev-lang/python/python-3.9.0_beta1.ebuild
deleted file mode 100644
index b1c8280ab7ae..000000000000
--- a/dev-lang/python/python-3.9.0_beta1.ebuild
+++ /dev/null
@@ -1,323 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-WANT_LIBTOOL="none"
-
-inherit autotools check-reqs flag-o-matic pax-utils python-utils-r1 \
- toolchain-funcs
-
-MY_P="Python-${PV/_beta/b}"
-PYVER=$(ver_cut 1-2)
-PATCHSET="python-gentoo-patches-3.9.0_alpha6"
-
-DESCRIPTION="An interpreted, interactive, object-oriented programming language"
-HOMEPAGE="https://www.python.org/"
-SRC_URI="https://www.python.org/ftp/python/${PV%_*}/${MY_P}.tar.xz
- https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="PSF-2"
-SLOT="${PYVER}"
-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 )"
-
-# Do not add a dependency on dev-lang/python to this ebuild.
-# If you need to apply a patch which requires python for bootstrapping, please
-# run the bootstrap code on your dev box and include the results in the
-# patchset. See bug 447752.
-
-RDEPEND="app-arch/bzip2:=
- app-arch/xz-utils:=
- dev-libs/libffi:=
- sys-apps/util-linux:=
- >=sys-libs/zlib-1.1.3:=
- virtual/libcrypt:=
- virtual/libintl
- gdbm? ( sys-libs/gdbm:=[berkdb] )
- ncurses? ( >=sys-libs/ncurses-5.2:= )
- readline? ( >=sys-libs/readline-4.1:= )
- sqlite? ( >=dev-db/sqlite-3.3.8:3= )
- ssl? (
- !libressl? ( dev-libs/openssl:= )
- libressl? ( dev-libs/libressl:= )
- )
- tk? (
- >=dev-lang/tcl-8.0:=
- >=dev-lang/tk-8.0:=
- dev-tcltk/blt:=
- dev-tcltk/tix
- )
- xml? ( >=dev-libs/expat-2.1:= )"
-# bluetooth requires headers from bluez
-DEPEND="${RDEPEND}
- bluetooth? ( net-wireless/bluez )
- test? ( app-arch/xz-utils[extra-filters(+)] )
- virtual/pkgconfig
- !sys-devel/gcc[libffi(-)]"
-RDEPEND+=" !build? ( app-misc/mime-types )"
-PDEPEND=">=app-eselect/eselect-python-20140125-r1"
-
-# large file tests involve a 2.5G file being copied (duplicated)
-CHECKREQS_DISK_BUILD=5500M
-
-pkg_pretend() {
- use test && check-reqs_pkg_pretend
-}
-
-pkg_setup() {
- use test && check-reqs_pkg_setup
-}
-
-src_prepare() {
- # Ensure that internal copies of expat, libffi and zlib are not used.
- rm -fr Modules/expat || die
- rm -fr Modules/_ctypes/libffi* || die
- rm -fr Modules/zlib || die
-
- local PATCHES=(
- "${WORKDIR}/${PATCHSET}"
- )
-
- default
-
- sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \
- setup.py || die "sed failed to replace @@GENTOO_LIBDIR@@"
-
- eautoreconf
-}
-
-src_configure() {
- local disable
- # disable automagic bluetooth headers detection
- use bluetooth || export ac_cv_header_bluetooth_bluetooth_h=no
- use gdbm || disable+=" gdbm"
- use ncurses || disable+=" _curses _curses_panel"
- use readline || disable+=" readline"
- use sqlite || disable+=" _sqlite3"
- use ssl || export PYTHON_DISABLE_SSL="1"
- use tk || disable+=" _tkinter"
- use xml || disable+=" _elementtree pyexpat" # _elementtree uses pyexpat.
- export PYTHON_DISABLE_MODULES="${disable}"
-
- if ! use xml; then
- ewarn "You have configured Python without XML support."
- ewarn "This is NOT a recommended configuration as you"
- ewarn "may face problems parsing any XML documents."
- fi
-
- if [[ -n "${PYTHON_DISABLE_MODULES}" ]]; then
- einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}"
- fi
-
- if [[ "$(gcc-major-version)" -ge 4 ]]; then
- append-flags -fwrapv
- fi
-
- filter-flags -malign-double
-
- # https://bugs.gentoo.org/show_bug.cgi?id=50309
- if is-flagq -O3; then
- is-flagq -fstack-protector-all && replace-flags -O3 -O2
- use hardened && replace-flags -O3 -O2
- fi
-
- # https://bugs.gentoo.org/700012
- if is-flagq -flto || is-flagq '-flto=*'; then
- append-cflags $(test-flags-CC -ffat-lto-objects)
- fi
-
- # Export CXX so it ends up in /usr/lib/python3.X/config/Makefile.
- tc-export CXX
-
- # Set LDFLAGS so we link modules with -lpython3.2 correctly.
- # Needed on FreeBSD unless Python 3.2 is already installed.
- # Please query BSD team before removing this!
- append-ldflags "-L."
-
- # Fix implicit declarations on cross and prefix builds. Bug #674070.
- use ncurses && append-cppflags -I"${ESYSROOT}"/usr/include/ncursesw
-
- local dbmliborder
- if use gdbm; then
- dbmliborder+="${dbmliborder:+:}gdbm"
- fi
-
- local myeconfargs=(
- # glibc-2.30 removes it; since we can't cleanly force-rebuild
- # Python on glibc upgrade, remove it proactively to give
- # a chance for users rebuilding python before glibc
- ac_cv_header_stropts_h=no
-
- --enable-shared
- $(use_enable ipv6)
- --infodir='${prefix}/share/info'
- --mandir='${prefix}/share/man'
- --with-computed-gotos
- --with-dbmliborder="${dbmliborder}"
- --with-libc=
- --enable-loadable-sqlite-extensions
- --without-ensurepip
- --with-system-expat
- --with-system-ffi
- )
-
- OPT="" econf "${myeconfargs[@]}"
-}
-
-src_compile() {
- # Ensure sed works as expected
- # https://bugs.gentoo.org/594768
- local -x LC_ALL=C
-
- emake CPPFLAGS= CFLAGS= LDFLAGS=
-
- # Work around bug 329499. See also bug 413751 and 457194.
- if has_version dev-libs/libffi[pax_kernel]; then
- pax-mark E python
- else
- pax-mark m python
- fi
-}
-
-src_test() {
- # Tests will not work when cross compiling.
- if tc-is-cross-compiler; then
- elog "Disabling tests due to crosscompiling."
- return
- fi
-
- # Skip failing tests.
- local skipped_tests="gdb"
-
- for test in ${skipped_tests}; do
- mv "${S}"/Lib/test/test_${test}.py "${T}"
- done
-
- # bug 660358
- local -x COLUMNS=80
-
- local -x PYTHONDONTWRITEBYTECODE=
-
- emake test EXTRATESTOPTS="-u-network" CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty
- local result=$?
-
- for test in ${skipped_tests}; do
- mv "${T}/test_${test}.py" "${S}"/Lib/test
- done
-
- elog "The following tests have been skipped:"
- for test in ${skipped_tests}; do
- elog "test_${test}.py"
- done
-
- elog "If you would like to run them, you may:"
- elog "cd '${EPREFIX}/usr/lib/python${PYVER}/test'"
- elog "and run the tests separately."
-
- if [[ ${result} -ne 0 ]]; then
- die "emake test failed"
- fi
-}
-
-src_install() {
- local libdir=${ED}/usr/lib/python${PYVER}
-
- emake DESTDIR="${D}" altinstall
-
- # Remove static library
- rm "${ED}"/usr/$(get_libdir)/libpython*.a || die
-
- sed \
- -e "s/\(CONFIGURE_LDFLAGS=\).*/\1/" \
- -e "s/\(PY_LDFLAGS=\).*/\1/" \
- -i "${libdir}/config-${PYVER}"*/Makefile || die "sed failed"
-
- # Fix collisions between different slots of Python.
- rm "${ED}/usr/$(get_libdir)/libpython3.so" || die
-
- # Cheap hack to get version with ABIFLAGS
- local abiver=$(cd "${ED}/usr/include"; echo python*)
- if [[ ${abiver} != python${PYVER} ]]; then
- # Replace python3.X with a symlink to python3.Xm
- rm "${ED}/usr/bin/python${PYVER}" || die
- dosym "${abiver}" "/usr/bin/python${PYVER}"
- # Create python3.X-config symlink
- dosym "${abiver}-config" "/usr/bin/python${PYVER}-config"
- # Create python-3.5m.pc symlink
- dosym "python-${PYVER}.pc" "/usr/$(get_libdir)/pkgconfig/${abiver/${PYVER}/-${PYVER}}.pc"
- fi
-
- # python seems to get rebuilt in src_install (bug 569908)
- # Work around it for now.
- if has_version dev-libs/libffi[pax_kernel]; then
- pax-mark E "${ED}/usr/bin/${abiver}"
- else
- pax-mark m "${ED}/usr/bin/${abiver}"
- fi
-
- use sqlite || rm -r "${libdir}/"{sqlite3,test/test_sqlite*} || die
- use tk || rm -r "${ED}/usr/bin/idle${PYVER}" "${libdir}/"{idlelib,tkinter,test/test_tk*} || die
-
- dodoc Misc/{ACKS,HISTORY,NEWS}
-
- if use examples; then
- docinto examples
- find Tools -name __pycache__ -exec rm -fr {} + || die
- dodoc -r Tools
- fi
- insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510
- local libname=$(printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' | \
- emake --no-print-directory -s -f - 2>/dev/null)
- newins "${S}"/Tools/gdb/libpython.py "${libname}"-gdb.py
-
- newconfd "${FILESDIR}/pydoc.conf" pydoc-${PYVER}
- newinitd "${FILESDIR}/pydoc.init" pydoc-${PYVER}
- sed \
- -e "s:@PYDOC_PORT_VARIABLE@:PYDOC${PYVER/./_}_PORT:" \
- -e "s:@PYDOC@:pydoc${PYVER}:" \
- -i "${ED}/etc/conf.d/pydoc-${PYVER}" \
- "${ED}/etc/init.d/pydoc-${PYVER}" || die "sed failed"
-
- local -x EPYTHON=python${PYVER}
- # if not using a cross-compiler, use the fresh binary
- if ! tc-is-cross-compiler; then
- local -x PYTHON=./python
- local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}${PWD}
- else
- local -x PYTHON=${EPREFIX}/usr/bin/${EPYTHON}
- fi
-
- echo "EPYTHON='${EPYTHON}'" > epython.py || die
- python_domodule epython.py
-
- # python-exec wrapping support
- local pymajor=${PYVER%.*}
- local scriptdir=${D}$(python_get_scriptdir)
- mkdir -p "${scriptdir}" || die
- # python and pythonX
- ln -s "../../../bin/${abiver}" \
- "${scriptdir}/python${pymajor}" || die
- ln -s "python${pymajor}" "${scriptdir}/python" || die
- # python-config and pythonX-config
- # note: we need to create a wrapper rather than symlinking it due
- # to some random dirname(argv[0]) magic performed by python-config
- cat > "${scriptdir}/python${pymajor}-config" <<-EOF || die
- #!/bin/sh
- exec "${abiver}-config" "\${@}"
- EOF
- chmod +x "${scriptdir}/python${pymajor}-config" || die
- ln -s "python${pymajor}-config" \
- "${scriptdir}/python-config" || die
- # 2to3, pydoc
- ln -s "../../../bin/2to3-${PYVER}" \
- "${scriptdir}/2to3" || die
- ln -s "../../../bin/pydoc${PYVER}" \
- "${scriptdir}/pydoc" || die
- # idle
- if use tk; then
- ln -s "../../../bin/idle${PYVER}" \
- "${scriptdir}/idle" || die
- fi
-}
diff --git a/dev-lang/python/python-3.9.0_beta2.ebuild b/dev-lang/python/python-3.9.0_beta4.ebuild
similarity index 99%
rename from dev-lang/python/python-3.9.0_beta2.ebuild
rename to dev-lang/python/python-3.9.0_beta4.ebuild
index b1c8280ab7ae..8a98fd0b0c77 100644
--- a/dev-lang/python/python-3.9.0_beta2.ebuild
+++ b/dev-lang/python/python-3.9.0_beta4.ebuild
@@ -9,7 +9,7 @@ inherit autotools check-reqs flag-o-matic pax-utils python-utils-r1 \
MY_P="Python-${PV/_beta/b}"
PYVER=$(ver_cut 1-2)
-PATCHSET="python-gentoo-patches-3.9.0_alpha6"
+PATCHSET="python-gentoo-patches-3.9.0b3"
DESCRIPTION="An interpreted, interactive, object-oriented programming language"
HOMEPAGE="https://www.python.org/"
diff --git a/dev-lang/squirrel/Manifest b/dev-lang/squirrel/Manifest
index a8083522606b..0df0a5920aef 100644
--- a/dev-lang/squirrel/Manifest
+++ b/dev-lang/squirrel/Manifest
@@ -1 +1,2 @@
DIST squirrel-3.1.tar.gz 175612 BLAKE2B 48a21b0ecd881dc3bea104e86013c3f3d5a4bc1e590cd67ef7e679e01383b7454aad4ea9b8ecec9b836a0ee44e8c9e470309f9c71050ed6d8deb76caac726aea SHA512 8aec059c801a8f6a1ddb9585cebd51457cfd43743cb0b03494e022fd47392e7b4b88e4703f184f4dcba2be8c0fb756e9b260e2f230e1bd92b37cdcb86d4f1141
+DIST squirrel-3.1_p20200612.tar.gz 181047 BLAKE2B f6965b5e721919c6c33426843a9b73fb27f39b7341763c2ff01421e6b6dce6cb86c6a02df65af9cb2266e8a63d6612c0e857456c4bb6e2546760f937d1979990 SHA512 e9853c92c151ca35e137a91ba4e3c9ad9c4c6d95a22c3686ebbae74cea7c1bf704ec5274d610f9d8158d8662a2b1b1445664f3f33c11689553cfc090a957b204
diff --git a/dev-lang/squirrel/squirrel-3.1_p20200612.ebuild b/dev-lang/squirrel/squirrel-3.1_p20200612.ebuild
new file mode 100644
index 000000000000..96d17ed9268c
--- /dev/null
+++ b/dev-lang/squirrel/squirrel-3.1_p20200612.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake vcs-snapshot
+
+DESCRIPTION="A interpreted language mainly used for games"
+HOMEPAGE="http://squirrel-lang.org/"
+commit=40050fa249733c85485adde533774ec066d29aca
+SRC_URI="https://github.com/albertodemichelis/squirrel/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/albertodemichelis/squirrel/archive/${commit}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples static-libs"
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
+
+src_configure() {
+ local mycmakeargs=(
+ $(usex static-libs '' -DDISABLE_STATIC=YES)
+ # /usr/bin/sq is used by app-text/ispell
+ # /usr/lib/libsquirrel.so is used by app-shells/squirrelsh
+ -DLONG_OUTPUT_NAMES=YES
+ )
+
+ cmake_src_configure
+}
+
+src_install() {
+ cmake_src_install
+
+ dodoc HISTORY
+
+ if use examples; then
+ docompress -x /usr/share/doc/${PF}/samples
+ dodoc -r samples
+ fi
+}
diff --git a/dev-lang/swi-prolog/swi-prolog-8.2.0.ebuild b/dev-lang/swi-prolog/swi-prolog-8.2.0.ebuild
index f1cf278d9e4e..402d9a2877e8 100644
--- a/dev-lang/swi-prolog/swi-prolog-8.2.0.ebuild
+++ b/dev-lang/swi-prolog/swi-prolog-8.2.0.ebuild
@@ -8,8 +8,8 @@ inherit cmake-utils eutils flag-o-matic multilib
PATCHSET_VER="0"
DESCRIPTION="versatile implementation of the Prolog programming language"
-HOMEPAGE="http://www.swi-prolog.org/"
-SRC_URI="http://www.swi-prolog.org/download/stable/src/swipl-${PV}.tar.gz"
+HOMEPAGE="https://www.swi-prolog.org/"
+SRC_URI="https://www.swi-prolog.org/download/stable/src/swipl-${PV}.tar.gz"
LICENSE="BSD-2"
SLOT="0"
diff --git a/dev-lang/swi-prolog/swi-prolog-8.3.0.ebuild b/dev-lang/swi-prolog/swi-prolog-8.3.0.ebuild
index 2293c183ae1c..357aecc392e2 100644
--- a/dev-lang/swi-prolog/swi-prolog-8.3.0.ebuild
+++ b/dev-lang/swi-prolog/swi-prolog-8.3.0.ebuild
@@ -8,8 +8,8 @@ inherit cmake-utils eutils flag-o-matic multilib
PATCHSET_VER="0"
DESCRIPTION="versatile implementation of the Prolog programming language"
-HOMEPAGE="http://www.swi-prolog.org/"
-SRC_URI="http://www.swi-prolog.org/download/devel/src/swipl-${PV}.tar.gz"
+HOMEPAGE="https://www.swi-prolog.org/"
+SRC_URI="https://www.swi-prolog.org/download/devel/src/swipl-${PV}.tar.gz"
LICENSE="BSD-2"
SLOT="0"
diff --git a/dev-lang/swi-prolog/swi-prolog-8.3.1.ebuild b/dev-lang/swi-prolog/swi-prolog-8.3.1.ebuild
index 2293c183ae1c..357aecc392e2 100644
--- a/dev-lang/swi-prolog/swi-prolog-8.3.1.ebuild
+++ b/dev-lang/swi-prolog/swi-prolog-8.3.1.ebuild
@@ -8,8 +8,8 @@ inherit cmake-utils eutils flag-o-matic multilib
PATCHSET_VER="0"
DESCRIPTION="versatile implementation of the Prolog programming language"
-HOMEPAGE="http://www.swi-prolog.org/"
-SRC_URI="http://www.swi-prolog.org/download/devel/src/swipl-${PV}.tar.gz"
+HOMEPAGE="https://www.swi-prolog.org/"
+SRC_URI="https://www.swi-prolog.org/download/devel/src/swipl-${PV}.tar.gz"
LICENSE="BSD-2"
SLOT="0"
diff --git a/dev-lang/swi-prolog/swi-prolog-8.3.2.ebuild b/dev-lang/swi-prolog/swi-prolog-8.3.2.ebuild
index 2293c183ae1c..357aecc392e2 100644
--- a/dev-lang/swi-prolog/swi-prolog-8.3.2.ebuild
+++ b/dev-lang/swi-prolog/swi-prolog-8.3.2.ebuild
@@ -8,8 +8,8 @@ inherit cmake-utils eutils flag-o-matic multilib
PATCHSET_VER="0"
DESCRIPTION="versatile implementation of the Prolog programming language"
-HOMEPAGE="http://www.swi-prolog.org/"
-SRC_URI="http://www.swi-prolog.org/download/devel/src/swipl-${PV}.tar.gz"
+HOMEPAGE="https://www.swi-prolog.org/"
+SRC_URI="https://www.swi-prolog.org/download/devel/src/swipl-${PV}.tar.gz"
LICENSE="BSD-2"
SLOT="0"
diff --git a/dev-lang/vala/Manifest b/dev-lang/vala/Manifest
index df0c061ce3f4..63206de66ce3 100644
--- a/dev-lang/vala/Manifest
+++ b/dev-lang/vala/Manifest
@@ -3,5 +3,7 @@ DIST vala-0.40.20.tar.xz 3443256 BLAKE2B 4cb53448ffabd29ea2c1411d019aa3749be1133
DIST vala-0.40.23.tar.xz 3462092 BLAKE2B 49eb5f7205d59b0806e807fc0f99771ace4d188222be60f12ef2f503bf8da9116ee7eedb742a6e50400655ae86d1eeb383f3b8ac1832e82f2787b0162c2a4dc2 SHA512 9d5638d44d8a42124fefd02b66454d19cc5d24291ec1525e1fd9c1c8df814d55d2bdc6f5be0168639a8712766cb4828abf3ae70ebfc9e0a72393dd584c25853d
DIST vala-0.44.11.tar.xz 3370248 BLAKE2B c111b6175e6339148e30bedc77f62a9ef3ec912ad0621c9303fc5dba31694173b49ccc433d3681303d64a1e442ed9b7b064f27931369cb13fa028bfc25ffa3c9 SHA512 6111699039ed37084426d7603b82dfa9bd497c66ba7353ee22e8541bf15a2cbb634d315593c093f18c20bac877ae34884e5b570cd25237ce12aa73e941c4c540
DIST vala-0.46.10.tar.xz 3417400 BLAKE2B 2f78de3e198f994a148e7ed4c82ef2417b70c19af3ce1874ee80aa7d0160691a50db24ad4898a04520e91d67a41bb508d3854ac2f4d90d2507a5a6558854716c SHA512 ae3734036f6a1b7088bac45083b75a49eee76947219f530493f81aa4ee60807cfa5424cf1b982d8d8f28f56119d66f06a9150b67884d80dd4b6724e152e32e62
+DIST vala-0.46.11.tar.xz 3424380 BLAKE2B b4af8b8345ac14793ba4b67dd2785408aac7c59ee4ea491c6e83c645d25b0cd7b795cdc35edd7f94a7c36eb40acbea7a8d7e08b41370f386f231733a3185e188 SHA512 c2b61f88deb787622680e49078d4caaaf210c19818607ec5b0ccd4564c5127657eeeba24b98c48e78c093456170b7f8aeea232125d702c1d7e624b6af854cec9
DIST vala-0.46.7.tar.xz 3402828 BLAKE2B c028875e2c6036a6657244bff62d3a2eec2104c06ec3c993f4d59371f2ec7947cfd36f577d41a2c4ba52f6dd7fb03251cad989e3b2787e2817bd988cc16030ca SHA512 609694c2b773abdd8f47d0e9dd8e1dabac2053f7e0321eac7232b3931b15df30e095541dbb02965fc74f3a29b7562b7a326c56ce7c570e6528f8cfa480363c76
DIST vala-0.48.6.tar.xz 3451004 BLAKE2B 9c880cff885b934e1d82d21285839e040addecb0b3ce81936d5be118a951bd219eea2b8381ea42f13e6e858a1937a3789a3dee6d067735e5ee21eaced38b4646 SHA512 220a916d42cbae3853afdd7c35a72afb446a92fca039d8c660a478fd793686a0c82cbaf90a7c94ae182c1f41eec6df1aedb804013ab38e6e4bcc6d26e40e5375
+DIST vala-0.48.7.tar.xz 3460968 BLAKE2B d2630c3695d3e3915751d74581ed85f493cb1f63c49ef8a2a36c396a86fefee4f9b608d5161f680eff9c4ebee0563fc158b3e1102dbe4ac56e2ab1c2bb938f2e SHA512 93ed6f98ff3be35d327794c5d81f30239c84838d49991b70dced1672f070e4675576da43b7555748d66ecae70102cd422e6af9b562f22bb34b40c07c73bac882
diff --git a/dev-lang/vala/vala-0.46.11.ebuild b/dev-lang/vala/vala-0.46.11.ebuild
new file mode 100644
index 000000000000..afe20bbc8ab5
--- /dev/null
+++ b/dev-lang/vala/vala-0.46.11.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome2
+
+DESCRIPTION="Compiler for the GObject type system"
+HOMEPAGE="https://wiki.gnome.org/Projects/Vala"
+
+LICENSE="LGPL-2.1+"
+SLOT="0.46"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-linux"
+IUSE="test valadoc"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ >=dev-libs/glib-2.48.0:2
+ >=dev-libs/vala-common-${PV}
+ valadoc? ( >=media-gfx/graphviz-2.16 )
+ != it, which would be bad
+# as the newer is not required with older vala when those are picked instead of 0.46.
+# vala-0.45.91 ships a broken libsoup-2.4.vapi copy too, but that'll be fixed by 0.45.92
+DEPEND="${RDEPEND}
+ dev-libs/libxslt
+ sys-devel/flex
+ virtual/pkgconfig
+ virtual/yacc
+ test? (
+ dev-libs/dbus-glib
+ >=dev-libs/glib-2.26:2
+ dev-libs/gobject-introspection )
+"
+
+src_configure() {
+ # weasyprint enables generation of PDF from HTML
+ gnome2_src_configure \
+ --disable-unversioned \
+ $(use_enable valadoc) \
+ VALAC=: \
+ WEASYPRINT=:
+}
+
+src_install() {
+ default
+ find "${D}" -name "*.la" -delete || die
+}
diff --git a/dev-lang/vala/vala-0.48.7.ebuild b/dev-lang/vala/vala-0.48.7.ebuild
new file mode 100644
index 000000000000..1f7c05bd15c1
--- /dev/null
+++ b/dev-lang/vala/vala-0.48.7.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome2
+
+DESCRIPTION="Compiler for the GObject type system"
+HOMEPAGE="https://wiki.gnome.org/Projects/Vala"
+
+LICENSE="LGPL-2.1+"
+SLOT="0.48"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-linux"
+IUSE="test valadoc"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ >=dev-libs/glib-2.48.0:2
+ >=dev-libs/vala-common-${PV}
+ valadoc? ( >=media-gfx/graphviz-2.16 )
+ != it, which would be bad
+# as the newer is not required with older vala when those are picked instead of 0.46.
+# vala-0.45.91 ships a broken libsoup-2.4.vapi copy too, but that'll be fixed by 0.45.92
+DEPEND="${RDEPEND}
+ dev-libs/libxslt
+ sys-devel/flex
+ virtual/pkgconfig
+ virtual/yacc
+ test? (
+ dev-libs/dbus-glib
+ >=dev-libs/glib-2.26:2
+ dev-libs/gobject-introspection )
+"
+
+src_configure() {
+ # weasyprint enables generation of PDF from HTML
+ gnome2_src_configure \
+ --disable-unversioned \
+ $(use_enable valadoc) \
+ VALAC=: \
+ WEASYPRINT=:
+}
+
+src_install() {
+ default
+ find "${D}" -name "*.la" -delete || die
+}
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index b4044a6adf0f..48040e477d6c 100644
Binary files a/dev-libs/Manifest.gz and b/dev-libs/Manifest.gz differ
diff --git a/dev-libs/argtable/argtable-2.13-r1.ebuild b/dev-libs/argtable/argtable-2.13-r1.ebuild
index c36d3e6638a1..bb91214c70ff 100644
--- a/dev-libs/argtable/argtable-2.13-r1.ebuild
+++ b/dev-libs/argtable/argtable-2.13-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
LICENSE="LGPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
IUSE="doc debug examples static-libs"
S="${WORKDIR}/${MY_P}"
diff --git a/dev-libs/bemenu/Manifest b/dev-libs/bemenu/Manifest
index 24af94defea8..1b2f35bd70de 100644
--- a/dev-libs/bemenu/Manifest
+++ b/dev-libs/bemenu/Manifest
@@ -1,2 +1,2 @@
-DIST bemenu-0.3.0.tar.gz 120059 BLAKE2B 5db3e7bcc4c67e9f7030fc803a5531994746787ebecfba91c7f09128ea9077b3b06e8f542c1a2980811b8364db3a54fefbdb0af1afaca2f58f098473a4fbd5d6 SHA512 7e68d11954517f41c9669055c28b375c4f13ddfee8aae6a8e67c3282fe9118229d9ab072dc5e264e4204803b1a5ab715c6a5c9565ad4b7436cc172b9e455c05b
DIST bemenu-0.4.1.tar.gz 110388 BLAKE2B 229f75887b8efc336c7790745b1a3402481a1cb86f92311c0c46ec123777ad051351fede5f7d59bce532a3a906bcab8d956f1e93d5aeac44dd7a49e7210e8e9f SHA512 d86b80b2eccbfca73287975f6f5ff9d86c7541900caec858c9aeff9cb7da2ee563e34e378561822671ba16e0f2af3440e0329f5c77f06ff5adcf332451452bf2
+DIST bemenu-0.5.0.tar.gz 110749 BLAKE2B dbc6d295262e51c381a9208c6936c0f40e05f3667af6a562716501577861d04c7b28ba836acbce2a6644950a191e56f865efe2f126eccdad67ea68d42f2d30b5 SHA512 5f4397bcb77d3e22340988bfb131feced1782f724ff637e40bf03c36a4377f38127c827f55faccc0dcce2ca482b9353fca7c6bfe700e6cac8e095e0df3b87a31
diff --git a/dev-libs/bemenu/bemenu-0.3.0.ebuild b/dev-libs/bemenu/bemenu-0.5.0.ebuild
similarity index 73%
rename from dev-libs/bemenu/bemenu-0.3.0.ebuild
rename to dev-libs/bemenu/bemenu-0.5.0.ebuild
index cc3b01f2040d..e7510494e8a6 100644
--- a/dev-libs/bemenu/bemenu-0.3.0.ebuild
+++ b/dev-libs/bemenu/bemenu-0.5.0.ebuild
@@ -3,8 +3,6 @@
EAPI=7
-inherit cmake-utils
-
DESCRIPTION="dmenu clone for wayland"
HOMEPAGE="https://github.com/Cloudef/bemenu"
if [[ ${PV} == 9999 ]]; then
@@ -36,21 +34,17 @@ DEPEND="
x11-libs/libX11
x11-libs/cairo[X]
x11-libs/pango[X]
+ x11-libs/libXinerama
)
"
RDEPEND="${DEPEND}"
BDEPEND="doc? ( app-doc/doxygen )"
-src_configure() {
- local mycmakeargs=(
- -DCURSES_LIBRARY=/usr/$(get_libdir)/libncursesw.so
- -DBEMENU_CURSES_RENDERER=$(usex ncurses ON OFF)
- -DBEMENU_WAYLAND_RENDERER=$(usex wayland ON OFF)
- -DBEMENU_X11_RENDERER=$(usex X ON OFF)
- )
- cmake-utils_src_configure
+src_compile() {
+ emake clients $(usex ncurses curses "") $(usex X x11 "") $(usex wayland wayland "") PREFIX=/usr libdir=/$(get_libdir)
+ use doc && emake doxygen PREFIX=/usr libdir=/$(get_libdir)
}
src_install() {
- cmake-utils_src_install
+ emake install PREFIX="${D}"/usr libdir=/$(get_libdir)
}
diff --git a/dev-libs/capstone/capstone-4.0.2-r1.ebuild b/dev-libs/capstone/capstone-4.0.2-r2.ebuild
similarity index 96%
rename from dev-libs/capstone/capstone-4.0.2-r1.ebuild
rename to dev-libs/capstone/capstone-4.0.2-r2.ebuild
index 6de5971d2cdc..99f181cb326c 100644
--- a/dev-libs/capstone/capstone-4.0.2-r1.ebuild
+++ b/dev-libs/capstone/capstone-4.0.2-r2.ebuild
@@ -27,6 +27,10 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
S=${WORKDIR}/${P/_rc/-rc}
+PATCHES=(
+ "${FILESDIR}"/${P}-libsuffix.patch
+)
+
wrap_python() {
if use python; then
pushd bindings/python >/dev/null || die
diff --git a/dev-libs/capstone/files/capstone-4.0.2-libsuffix.patch b/dev-libs/capstone/files/capstone-4.0.2-libsuffix.patch
new file mode 100644
index 000000000000..056140be13df
--- /dev/null
+++ b/dev-libs/capstone/files/capstone-4.0.2-libsuffix.patch
@@ -0,0 +1,12 @@
+cmake does not provide 'LIBSUFFIX' variables, but provides 'LIB_SUFFIX'.
+https://bugs.gentoo.org/730722
+--- a/capstone.pc.in
++++ b/capstone.pc.in
+@@ -1,6 +1,6 @@
+ prefix=@CMAKE_INSTALL_PREFIX@
+ exec_prefix=${prefix}
+-libdir=${prefix}/lib@LIBSUFFIX@
++libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
+ includedir=${prefix}/include/capstone
+
+ Name: capstone
diff --git a/dev-libs/cloog/Manifest b/dev-libs/cloog/Manifest
index abc759ecd58e..272172379935 100644
--- a/dev-libs/cloog/Manifest
+++ b/dev-libs/cloog/Manifest
@@ -1,2 +1 @@
-DIST cloog-0.18.1.tar.gz 3857324 BLAKE2B 5898cb8d8f36e55dbe38e7866e07c0abaf8ca0b9e619a5ff963ae975148166fc9bb1c77a33aef1ea2014e739e4ea1c37e4bc2ce5e7411d900fb472192e6fed7b SHA512 0b12d9f3c39a2425e28e1d7c0a2b3787287fe3e6e3052f094d2ab6cffeb205ce19044100cbfd805659b3e6b3d21ac2f5a3c92848f476de54edfe6b1cbd2172e9
DIST cloog-0.18.4.tar.gz 4796456 BLAKE2B 9d1f281abe48d40f726c3fc66c58c0d7cb90f6d3ca47af02c8f00b5cc69c6de6b0362b2dc406a8cb6310e07c6b2991f6de3b6b407ad7db0190b9bc69ac82773f SHA512 d35d67b08ffe13c1a010b65bfe4dd02b0ae013d5b489e330dc950bd3514defca8f734bd37781856dcedf0491ff6122c34eecb4b0fe32a22d7e6bdadea98c8c23
diff --git a/dev-libs/cloog/cloog-0.18.1.ebuild b/dev-libs/cloog/cloog-0.18.1.ebuild
deleted file mode 100644
index 8babf3e9203d..000000000000
--- a/dev-libs/cloog/cloog-0.18.1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils ltprune multilib-minimal
-
-DESCRIPTION="A loop generator for scanning polyhedra"
-HOMEPAGE="http://www.bastoul.net/cloog/"
-SRC_URI="http://www.bastoul.net/cloog/pages/download/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/4"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
-IUSE="static-libs"
-
-RDEPEND=">=dev-libs/gmp-5.1.3-r1[${MULTILIB_USEDEP}]
- >=dev-libs/isl-0.12.2:0/10[${MULTILIB_USEDEP}]"
-DEPEND="${DEPEND}
- virtual/pkgconfig"
-
-DOCS=( README )
-
-src_prepare() {
- # m4/ax_create_pkgconfig_info.m4 includes LDFLAGS
- # sed to avoid eautoreconf
- sed -i -e '/Libs:/s:@LDFLAGS@ ::' configure || die
-}
-
-multilib_src_configure() {
- ECONF_SOURCE="${S}" econf \
- --with-gmp=system \
- --with-isl=system \
- $(use_enable static-libs static)
-}
-
-multilib_src_install_all() {
- einstalldocs
- prune_libtool_files
-}
diff --git a/dev-libs/distorm64/Manifest b/dev-libs/distorm64/Manifest
index 500308122ca6..dcb628b42c2c 100644
--- a/dev-libs/distorm64/Manifest
+++ b/dev-libs/distorm64/Manifest
@@ -1,3 +1,2 @@
-DIST distorm3-3.4.2.tar.gz 182134 BLAKE2B 82bff5b12503acce156be2b2b16d2d60eb39329092dabfdd51815c468a7fa1e0cfe27351fb09e3f587054ec8262f5535d1b29f1269ccde94e01e1d326ba3df85 SHA512 a723bce70f0fddf065aa53fa7ea48c5e9f354c0fbe241c70ffd1404950fcf79b5ad6c6be64d20cb80567024bdc05e6bb41f788267a069c8e7b7b9dbb7c5c01af
DIST distorm3-3.4.4.tar.gz 134803 BLAKE2B 4c496db182c874b1f2d3e1433b53f59c51000d18c2e128d642e8088cb3150757a54d16d4f8303a2d46dfa0e83a941f9e75798d03643835938451c4b4903fd1f4 SHA512 ee39054a37436bb2137261d8fcf6da5e4849ef649bfa323c4523c195c1d9ee90708057fd1e1818f676300a410a184006d8db54ec3eef9aa8f5fcd455b25fc7a2
DIST distorm3-3.5.0.tar.gz 137500 BLAKE2B 01d426f0b76a232503ebe4e1edb719bcdd1480a6ab729f3e49eff3e3fee5e9e4af6e6051c1e7675b14aa39a2fc999df2c1535976bb0981a23baef0e78aec8bd3 SHA512 ad9415a0a1a65a7ad3824b19ec83df90459eeb153494efb6623a8f02c60b6d0cf61d7dae4143eb1dd0586f5c7a7115f4a53cea5609296f703e5db612ce925011
diff --git a/dev-libs/distorm64/distorm64-3.4.2.ebuild b/dev-libs/distorm64/distorm64-3.4.2.ebuild
deleted file mode 100644
index a1522b970ad8..000000000000
--- a/dev-libs/distorm64/distorm64-3.4.2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{2_7,3_{6,7,8}} )
-
-inherit distutils-r1
-
-DESCRIPTION="The ultimate disassembler library (X86-32, X86-64)"
-HOMEPAGE="http://www.ragestorm.net/distorm/"
-
-MY_PN=distorm3
-MY_P=${MY_PN}-${PV}
-
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-DEPEND=""
-RDEPEND=""
-
-LICENSE="BSD-4"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-python_install() {
- distutils-r1_python_install
-
- # don't know why it does not happen by default
- python_optimize
-}
diff --git a/dev-libs/isl/Manifest b/dev-libs/isl/Manifest
index cc1f62d7b155..ab3f442f2d32 100644
--- a/dev-libs/isl/Manifest
+++ b/dev-libs/isl/Manifest
@@ -1,2 +1 @@
-DIST isl-0.12.2.tar.bz2 1319434 BLAKE2B 53f009dc8093fb3d7d2db40db8f6fd9d7de630777e0308ac3c5918c2c106eda0edd7451df18c954ed6c9fc3ed7d18c73708d7b1f94c8c5c55aa94f8845f5b219 SHA512 b5dea4d6b504fac22f2d8cd9c47d6896994d3966635a514d45010243db44cfbc009574b808f3587f35d91de629110bc11b52941d4075e21f8646c59656e62aea
DIST isl-0.22.1.tar.xz 1676948 BLAKE2B cf1661f785344d8132e8f8a339ed8d457677ca1bf943a597d3d0be1e80d8c42e788cdde79fd073d130d681424da7a8e3ca9fa2cd4cd4232220f5c5a1ce99ab99 SHA512 8dc7b0c14e5bfdca8f2161be51d3c9afcd18bc217bb19b7de01dbba0c6f3fdc2b725fb999f8562c77bf2918d3005c9247f7a58474a6da7697390067944d4d4aa
diff --git a/dev-libs/isl/isl-0.12.2.ebuild b/dev-libs/isl/isl-0.12.2.ebuild
deleted file mode 100644
index 5dceee321adc..000000000000
--- a/dev-libs/isl/isl-0.12.2.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils ltprune multilib-minimal
-
-DESCRIPTION="A library for manipulating integer points bounded by linear constraints"
-HOMEPAGE="http://isl.gforge.inria.fr/"
-SRC_URI="http://isl.gforge.inria.fr/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0/10"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
-IUSE="static-libs"
-
-RDEPEND=">=dev-libs/gmp-5.1.3-r1[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-DOCS=( ChangeLog AUTHORS doc/manual.pdf )
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-0.07-gdb-autoload-dir.patch
-
- # m4/ax_create_pkgconfig_info.m4 is broken but avoid eautoreconf
- # https://groups.google.com/group/isl-development/t/37ad876557e50f2c
- sed -i -e '/Libs:/s:@LDFLAGS@ ::' configure || die #382737
-}
-
-multilib_src_configure() {
- ECONF_SOURCE="${S}" econf $(use_enable static-libs static)
-}
-
-multilib_src_install_all() {
- einstalldocs
- prune_libtool_files
-}
diff --git a/dev-libs/jansson/jansson-2.12.ebuild b/dev-libs/jansson/jansson-2.12.ebuild
index 7e824cc73235..9abc7bbffbf3 100644
--- a/dev-libs/jansson/jansson-2.12.ebuild
+++ b/dev-libs/jansson/jansson-2.12.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.digip.org/jansson/releases/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
IUSE="doc static-libs"
BDEPEND="doc? ( >=dev-python/sphinx-1.0.4 )"
diff --git a/dev-libs/json-c/json-c-0.14-r3.ebuild b/dev-libs/json-c/json-c-0.14-r3.ebuild
index 2b34de77a7fe..0d4ff648a369 100644
--- a/dev-libs/json-c/json-c-0.14-r3.ebuild
+++ b/dev-libs/json-c/json-c-0.14-r3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://s3.amazonaws.com/json-c_releases/releases/${P}.tar.gz"
LICENSE="MIT"
SLOT="0/5"
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="doc static-libs threads"
+IUSE="cpu-flags-x86-rdrand doc static-libs threads"
PATCHES=(
"${FILESDIR}/${PN}-0.14-cmake-static-libs.patch"
@@ -34,6 +34,7 @@ multilib_src_configure() {
-DBUILD_DOCUMENTATION=$(multilib_native_usex doc)
-DBUILD_STATIC_LIBS=$(usex static-libs)
-DDISABLE_WERROR=ON
+ -DENABLE_RDRAND=$(usex cpu-flags-x86-rdrand)
-DENABLE_THREADING=$(usex threads)
)
diff --git a/dev-libs/json-c/json-c-9999.ebuild b/dev-libs/json-c/json-c-9999.ebuild
index eac441be4e78..51583e0b0ad4 100644
--- a/dev-libs/json-c/json-c-9999.ebuild
+++ b/dev-libs/json-c/json-c-9999.ebuild
@@ -12,7 +12,7 @@ EGIT_REPO_URI="https://github.com/json-c/json-c.git"
LICENSE="MIT"
SLOT="0/5"
-IUSE="doc static-libs threads"
+IUSE="cpu-flags-x86-rdrand doc static-libs threads"
MULTILIB_WRAPPED_HEADERS=(
/usr/include/json-c/config.h
@@ -27,6 +27,7 @@ multilib_src_configure() {
-DBUILD_DOCUMENTATION=$(multilib_native_usex doc)
-DDISABLE_WERROR=ON
-DENABLE_THREADING=$(usex threads)
+ -DENABLE_RDRAND=$(usex cpu-flags-x86-rdrand)
-DBUILD_STATIC_LIBS=$(usex static-libs)
)
diff --git a/dev-libs/json-c/metadata.xml b/dev-libs/json-c/metadata.xml
index ca10c6aa7ae5..4165aa7d278a 100644
--- a/dev-libs/json-c/metadata.xml
+++ b/dev-libs/json-c/metadata.xml
@@ -13,6 +13,9 @@
proxy-maint@gentoo.org
Proxy Maintainers
+
"A JSON implementation in C" is probably the better description, and then
"JSON-C implements a reference counting object model that allows you to
diff --git a/dev-libs/libbulletml/files/libbulletml-0.0.6-Makefile.patch b/dev-libs/libbulletml/files/libbulletml-0.0.6-Makefile.patch
new file mode 100644
index 000000000000..05400d2c506f
--- /dev/null
+++ b/dev-libs/libbulletml/files/libbulletml-0.0.6-Makefile.patch
@@ -0,0 +1,119 @@
+--- a/Makefile
++++ b/Makefile
+@@ -1,10 +1,5 @@
+-CC = g++
+ INCLUDES = -I.
+ LIBS = tinyxml/tinyxml.o tinyxml/tinyxmlparser.o tinyxml/tinyxmlerror.o
+-#CXXFLAGS = -g -W -Wall -ansi -pedantic
+-#CXXFLAGS = -pg -g -W -Wall -ansi -pedantic
+-CXXFLAGS = -O2 -W -Wall -ansi -pedantic
+-CFLAGS = -O2
+ OBJS = bulletmlparser-tinyxml.o bulletmlparser.o bulletmltree.o calc.o formula-variables.o bulletmlrunner.o bulletmlrunnerimpl.o
+
+ all: libbulletml.a
+@@ -21,7 +16,7 @@
+ bison -y calc.yy && mv y.tab.c calc.cpp
+
+ $(OBJS): %.o: %.cpp
+- $(CC) -c $(CXXFLAGS) $(INCLUDES) $<
++ $(CXX) $(CXXFLAGS) $(CPPFLAGS) $(INCLUDES) -c $< -o $@
+
+ doxy:
+ doxygen
+--- a/tinyxml/Makefile
++++ b/tinyxml/Makefile
+@@ -14,41 +14,6 @@
+ PROFILE := NO
+
+ #****************************************************************************
+-
+-CC := gcc
+-CXX := g++
+-LD := g++
+-AR := ar rc
+-RANLIB := ranlib
+-
+-DEBUG_CFLAGS := -Wall -Wno-unknown-pragmas -Wno-format -g -DDEBUG
+-RELEASE_CFLAGS := -Wall -Wno-unknown-pragmas -Wno-format -O2
+-
+-LIBS :=
+-
+-DEBUG_CXXFLAGS := ${DEBUG_CFLAGS}
+-RELEASE_CXXFLAGS := ${RELEASE_CFLAGS}
+-
+-DEBUG_LDFLAGS := -g
+-RELEASE_LDFLAGS :=
+-
+-ifeq (YES, ${DEBUG})
+- CFLAGS += ${DEBUG_CFLAGS}
+- CXXFLAGS += ${DEBUG_CXXFLAGS}
+- LDFLAGS += ${DEBUG_LDFLAGS}
+-else
+- CFLAGS += ${RELEASE_CFLAGS}
+- CXXFLAGS += ${RELEASE_CXXFLAGS}
+- LDFLAGS += ${RELEASE_LDFLAGS}
+-endif
+-
+-ifeq (YES, ${PROFILE})
+- CFLAGS := ${CFLAGS} -pg
+- CXXFLAGS := ${CXXFLAGS} -pg
+- LDFLAGS := ${LDFLAGS} -pg
+-endif
+-
+-#****************************************************************************
+ # Preprocessor directives
+ #****************************************************************************
+
+@@ -70,8 +35,8 @@
+ # Makefile code common to all platforms
+ #****************************************************************************
+
+-CFLAGS := ${CFLAGS} ${DEFS}
+-CXXFLAGS := ${CXXFLAGS} ${DEFS}
++CFLAGS += ${DEFS}
++CXXFLAGS += ${DEFS}
+
+ #****************************************************************************
+ # Targets of the build
+@@ -98,7 +63,7 @@
+ #****************************************************************************
+
+ ${OUTPUT}: ${OBJS}
+- ${LD} -o $@ ${LDFLAGS} ${OBJS} ${LIBS} ${EXTRA_LIBS}
++ ${CXX} ${LDFLAGS} -o $@ ${OBJS} ${LIBS} ${EXTRA_LIBS}
+
+ #****************************************************************************
+ # common rules
+@@ -106,10 +71,10 @@
+
+ # Rules for compiling source files to object files
+ %.o : %.cpp
+- ${CXX} -c ${CXXFLAGS} ${INCS} $< -o $@
++ ${CXX} ${CXXFLAGS} ${CPPFLAGS} ${INCS} -c $< -o $@
+
+ %.o : %.c
+- ${CC} -c ${CFLAGS} ${INCS} $< -o $@
++ ${CC} ${CFLAGS} ${CPPFLAGS} ${INCS} -c $< -o $@
+
+ clean:
+ -rm -f core ${OBJS} ${OUTPUT}
+--- a/ygg/Makefile
++++ b/ygg/Makefile
+@@ -2,8 +2,6 @@
+ LIBS =
+ #CXXFLAGS = -g -W -Wall
+ #CXXFLAGS = -pg -g -W -Wall
+-CXXFLAGS = -O2 -W -Wall
+-CFLAGS = -O2
+ OBJS = ygg.o
+
+ all: $(OBJS)
+@@ -12,7 +10,7 @@
+ rm -f *.o *.a
+
+ $(OBJS): %.o: %.cpp
+- $(CXX) -c $(CXXFLAGS) $(INCLUDES) $<
++ $(CXX) $(CXXFLAGS) $(CPPFLAGS) $(INCLUDES) -c $< -o $@
+
+ distdir:
+
diff --git a/dev-libs/libbulletml/libbulletml-0.0.6.ebuild b/dev-libs/libbulletml/libbulletml-0.0.6.ebuild
index 045879e2c0f5..5bd9fa9717b4 100644
--- a/dev-libs/libbulletml/libbulletml-0.0.6.ebuild
+++ b/dev-libs/libbulletml/libbulletml-0.0.6.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
+inherit toolchain-funcs
+
DESCRIPTION="A Library of Bullet Markup Language"
HOMEPAGE="https://shinh.skr.jp/libbulletml/index_en.html"
SRC_URI="https://shinh.skr.jp/libbulletml/${P}.tar.bz2"
@@ -10,25 +12,24 @@ SRC_URI="https://shinh.skr.jp/libbulletml/${P}.tar.bz2"
LICENSE="BSD"
SLOT="0"
KEYWORDS="amd64 ppc x86"
-IUSE=""
DEPEND="dev-libs/boost"
RDEPEND=${DEPEND}
-PATCHES=( "${FILESDIR}"/${P}-gcc4{3,6}.patch )
+PATCHES=(
+ "${FILESDIR}"/${P}-gcc4{3,6}.patch
+ "${FILESDIR}"/${P}-Makefile.patch
+)
S="${WORKDIR}"/${PN#lib}/src
src_prepare() {
default
rm -r boost || die
-
- # don't override the system-wide flags
- sed -i -e '/^CFLAGS =/d;/^CXXFLAGS =/d' Makefile ygg/Makefile || die
}
-src_compile() {
- emake CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}"
+src_configure() {
+ tc-export AR CXX
}
src_install() {
diff --git a/dev-libs/libevent/Manifest b/dev-libs/libevent/Manifest
index 4c9f0fea2008..f1f1c08b55bb 100644
--- a/dev-libs/libevent/Manifest
+++ b/dev-libs/libevent/Manifest
@@ -1,2 +1,2 @@
DIST libevent-2.1.11.tar.gz 1082234 BLAKE2B c6721589834bff027a8149ee0076e1877fba000d1712a405e20030192d9c81b892d0930bc1a4774650bef4cb08c60ac81b5928dc17346492ae7e4ded2125579a SHA512 9d0517b117f128f4f196b19a810524814bab75fa967d533063aaa619d3cf2dca97b443edd5805b764da2993d8e37caa536dce39f68ffcc2a88d32a89204c2de3
-DIST libevent-2.1.8.tar.gz 1026485 BLAKE2B f1ceb740aa776a7c26f52916d771af7f4bb351cadf858ef991ab015e5897e34579c6af1f4ed3b516d5be2ac7cb3a7c27ac9d3020dbb04ac7670118616a264561 SHA512 a2fd3dd111e73634e4aeb1b29d06e420b15c024d7b47778883b5f8a4ff320b5057a8164c6d50b53bd196c79d572ce2639fe6265e03a93304b09c22b41e4c2a17
+DIST libevent-2.1.12.tar.gz 1100847 BLAKE2B bc1ace15f639ecef2e6b3f95976b8830c1d86f1d06606dd949e2978611fdf9859ed4eb9292d13e6e90e3835063edb94aae64a15c518d5dabe680f37d5a7f5290 SHA512 88d8944cd75cbe78bc4e56a6741ca67c017a3686d5349100f1c74f8a68ac0b6410ce64dff160be4a4ba0696ee29540dfed59aaf3c9a02f0c164b00307fcfe84f
diff --git a/dev-libs/libevent/libevent-2.1.8.ebuild b/dev-libs/libevent/libevent-2.1.12.ebuild
similarity index 56%
rename from dev-libs/libevent/libevent-2.1.8.ebuild
rename to dev-libs/libevent/libevent-2.1.12.ebuild
index 5af707d91492..89f9d1095ebe 100644
--- a/dev-libs/libevent/libevent-2.1.8.ebuild
+++ b/dev-libs/libevent/libevent-2.1.12.ebuild
@@ -1,39 +1,41 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
-inherit eutils ltprune multilib-minimal
+EAPI=7
+inherit multilib-minimal
DESCRIPTION="Library to execute a function when a specific event occurs on a file descriptor"
HOMEPAGE="
https://libevent.org/
https://github.com/libevent/libevent/
"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/release-${PV}-stable/${P}-stable.tar.gz -> ${P}.tar.gz"
-
+SRC_URI="
+ https://github.com/${PN}/${PN}/releases/download/release-${PV/_/-}-stable/${P/_/-}-stable.tar.gz -> ${P}.tar.gz
+"
LICENSE="BSD"
-# libevent-2.1.so.6
-SLOT="0/2.1-6"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="debug libressl +ssl static-libs test +threads"
+
+SLOT="0/2.1-7"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="
+ +clock-gettime debug libressl malloc-replacement +ssl static-libs test
+ +threads verbose-debug
+"
RESTRICT="!test? ( test )"
DEPEND="
ssl? (
!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
- libressl? ( dev-libs/libressl:=[${MULTILIB_USEDEP}] )
+ libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
)
"
RDEPEND="
${DEPEND}
!<=dev-libs/9libs-1.0
"
-
MULTILIB_WRAPPED_HEADERS=(
/usr/include/event2/event-config.h
)
-
-S=${WORKDIR}/${P}-stable
+S=${WORKDIR}/${P/_/-}-stable
multilib_src_configure() {
# fix out-of-source builds
@@ -41,13 +43,15 @@ multilib_src_configure() {
ECONF_SOURCE="${S}" \
econf \
- --disable-samples \
+ $(use_enable clock-gettime) \
$(use_enable debug debug-mode) \
- $(use_enable debug malloc-replacement) \
+ $(use_enable malloc-replacement malloc-replacement) \
$(use_enable ssl openssl) \
$(use_enable static-libs static) \
$(use_enable test libevent-regress) \
- $(use_enable threads thread-support)
+ $(use_enable threads thread-support) \
+ $(use_enable verbose-debug) \
+ --disable-samples
}
src_test() {
@@ -61,5 +65,5 @@ DOCS=( ChangeLog{,-1.4,-2.0} )
multilib_src_install_all() {
einstalldocs
- prune_libtool_files
+ find "${ED}" -name '*.la' -delete || die
}
diff --git a/dev-libs/libevent/libevent-2.1.9999.ebuild b/dev-libs/libevent/libevent-2.1.9999.ebuild
index c9ecb810481e..5bc82f314e7a 100644
--- a/dev-libs/libevent/libevent-2.1.9999.ebuild
+++ b/dev-libs/libevent/libevent-2.1.9999.ebuild
@@ -16,7 +16,10 @@ LICENSE="BSD"
# libevent-2.1.so.6
SLOT="0/2.1-7"
KEYWORDS=""
-IUSE="debug libressl +ssl static-libs test +threads"
+IUSE="
+ +clock-gettime debug libressl malloc-replacement +ssl static-libs test
+ +threads verbose-debug
+"
RESTRICT="test"
DEPEND="
@@ -48,13 +51,15 @@ multilib_src_configure() {
ECONF_SOURCE="${S}" \
econf \
- --disable-samples \
+ $(use_enable clock-gettime) \
$(use_enable debug debug-mode) \
- $(use_enable debug malloc-replacement) \
+ $(use_enable malloc-replacement malloc-replacement) \
$(use_enable ssl openssl) \
$(use_enable static-libs static) \
$(use_enable test libevent-regress) \
- $(use_enable threads thread-support)
+ $(use_enable threads thread-support) \
+ $(use_enable verbose-debug) \
+ --disable-samples
}
multilib_src_install_all() {
diff --git a/dev-libs/libevent/libevent-9999.ebuild b/dev-libs/libevent/libevent-9999.ebuild
index 4a9b798d3529..71d7fb943c27 100644
--- a/dev-libs/libevent/libevent-9999.ebuild
+++ b/dev-libs/libevent/libevent-9999.ebuild
@@ -14,7 +14,10 @@ HOMEPAGE="
LICENSE="BSD"
SLOT="0"
KEYWORDS=""
-IUSE="debug libressl +ssl static-libs test +threads"
+IUSE="
+ +clock-gettime debug libressl malloc-replacement +ssl static-libs test
+ +threads verbose-debug
+"
RESTRICT="test"
DEPEND="
@@ -46,13 +49,15 @@ multilib_src_configure() {
ECONF_SOURCE="${S}" \
econf \
- --disable-samples \
+ $(use_enable clock-gettime) \
$(use_enable debug debug-mode) \
- $(use_enable debug malloc-replacement) \
+ $(use_enable malloc-replacement malloc-replacement) \
$(use_enable ssl openssl) \
$(use_enable static-libs static) \
$(use_enable test libevent-regress) \
- $(use_enable threads thread-support)
+ $(use_enable threads thread-support) \
+ $(use_enable verbose-debug) \
+ --disable-samples
}
multilib_src_install_all() {
diff --git a/dev-libs/libevent/metadata.xml b/dev-libs/libevent/metadata.xml
index 6036c10bd580..0669d49f12f1 100644
--- a/dev-libs/libevent/metadata.xml
+++ b/dev-libs/libevent/metadata.xml
@@ -11,6 +11,9 @@
libevent/libevent
diff --git a/dev-libs/libjcat/libjcat-0.1.3-r1.ebuild b/dev-libs/libjcat/libjcat-0.1.3-r1.ebuild
index ccbbdf6c2393..141c38f2a5fd 100644
--- a/dev-libs/libjcat/libjcat-0.1.3-r1.ebuild
+++ b/dev-libs/libjcat/libjcat-0.1.3-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/hughsie/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="LGPL-2.1+"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~x86"
IUSE="gpg gtk-doc +introspection +man pkcs7 test vala"
RDEPEND="dev-libs/glib:2
diff --git a/dev-libs/libmanette/Manifest b/dev-libs/libmanette/Manifest
index 664fce416807..c594bc23b75e 100644
--- a/dev-libs/libmanette/Manifest
+++ b/dev-libs/libmanette/Manifest
@@ -1,2 +1 @@
-DIST libmanette-0.2.3.tar.xz 33620 BLAKE2B ec811e0a939713e99eb931a2aa0c1b67a2de1fad4c4e399e47975b795da7672ab56a217cda94f4642f749aed1ff4379c67b58da349f8ac8434c95a80c7909980 SHA512 23d3feae3b0ba81deb75b0ff911eb37f3d0d767a0ae65815d34cadf69f78ca7f081177a2161105ea3979ba9222b3641e6b776bf4fcf3e46a9de716bdce475df6
DIST libmanette-0.2.4.tar.xz 38196 BLAKE2B d9bd8817ec03c9414eb249ce50d3468e2eb2dee78ba36b7a1ac9b04d87e1888d086766594109ee8d89fc4f48fea8d6e7949c7fe44646cacae00145b14f416697 SHA512 713686e3fd515a09846def3283a9e687571dfe47357af00f95739b6e888a454ab14c526a11b38c4ad19bdf928fc3b13b8be32612557dd0ecc743efd2cb6e0792
diff --git a/dev-libs/libmanette/files/0.2.3-optional-introspection-vapi.patch b/dev-libs/libmanette/files/0.2.3-optional-introspection-vapi.patch
deleted file mode 100644
index 15558b47be3d..000000000000
--- a/dev-libs/libmanette/files/0.2.3-optional-introspection-vapi.patch
+++ /dev/null
@@ -1,114 +0,0 @@
-From b561bd29d8797ae2e72d45df8fc122164fc88b6c Mon Sep 17 00:00:00 2001
-From: Mart Raudsepp
-Date: Sun, 20 Oct 2019 14:57:43 +0300
-Subject: [PATCH] build: Support disabling introspection and vapi generation
-
----
- meson_options.txt | 14 +++++++++++
- src/meson.build | 64 ++++++++++++++++++++++++++---------------------
- 2 files changed, 49 insertions(+), 29 deletions(-)
-
-diff --git a/meson_options.txt b/meson_options.txt
-index a7ce738..c794d4b 100644
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -4,3 +4,17 @@ option (
- description: 'Find devices via udev',
- value: 'auto'
- )
-+
-+option (
-+ 'introspection',
-+ type: 'boolean',
-+ description: 'Generate introspection data (requires gobject-introspection)',
-+ value: true
-+)
-+
-+option (
-+ 'vapi',
-+ type: 'boolean',
-+ description: 'Generate vapi data (requires vapigen and introspection option)',
-+ value: true
-+)
-diff --git a/src/meson.build b/src/meson.build
-index 7ac916b..50cad92 100644
---- a/src/meson.build
-+++ b/src/meson.build
-@@ -90,39 +90,45 @@ if gudev.found()
- libmanette_gir_includes += [ 'GUdev-1.0' ]
- endif
-
--libmanette_gir = gnome.generate_gir(
-- libmanette_lib,
-- extra_args: libmanette_gir_args,
-- export_packages: libmanette_module,
-- sources: libmanette_headers + libmanette_sources,
-- nsversion: api_version,
-- namespace: 'Manette',
-- identifier_prefix: 'Manette',
-- includes: libmanette_gir_includes,
-- header: libmanette_main_header,
-- install: true,
-- symbol_prefix: 'manette',
--)
--
--libmanette_vapi_packages = [
-- 'gobject-2.0',
-- 'gio-2.0',
--]
--
--if gudev.found()
-- libmanette_vapi_packages += [ 'gudev-1.0' ]
-+built_girs = []
-+if get_option('introspection')
-+ libmanette_gir = gnome.generate_gir(
-+ libmanette_lib,
-+ extra_args: libmanette_gir_args,
-+ export_packages: libmanette_module,
-+ sources: libmanette_headers + libmanette_sources,
-+ nsversion: api_version,
-+ namespace: 'Manette',
-+ identifier_prefix: 'Manette',
-+ includes: libmanette_gir_includes,
-+ header: libmanette_main_header,
-+ install: true,
-+ symbol_prefix: 'manette',
-+ )
-+ built_girs += [ libmanette_gir ]
-+
-+ if get_option('vapi')
-+ libmanette_vapi_packages = [
-+ 'gobject-2.0',
-+ 'gio-2.0',
-+ ]
-+
-+ if gudev.found()
-+ libmanette_vapi_packages += [ 'gudev-1.0' ]
-+ endif
-+
-+ gnome.generate_vapi(
-+ libmanette_module,
-+ install: true,
-+ packages: libmanette_vapi_packages,
-+ sources: libmanette_gir[0],
-+ )
-+ endif
- endif
-
--gnome.generate_vapi(
-- libmanette_module,
-- install: true,
-- packages: libmanette_vapi_packages,
-- sources: libmanette_gir[0],
--)
--
- libmanette_dep = declare_dependency(
- link_with: libmanette_lib,
-- sources: libmanette_gir,
-+ sources: built_girs,
- include_directories: confinc,
- dependencies: libmanette_deps,
- )
---
-2.20.1
-
diff --git a/dev-libs/libmanette/libmanette-0.2.3.ebuild b/dev-libs/libmanette/libmanette-0.2.3.ebuild
deleted file mode 100644
index e936a0a38c13..000000000000
--- a/dev-libs/libmanette/libmanette-0.2.3.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit gnome.org gnome2-utils meson vala xdg
-
-DESCRIPTION="Simple GObject game controller library"
-HOMEPAGE="https://gitlab.gnome.org/aplazas/libmanette"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="+introspection +udev +vala"
-REQUIRED_USE="vala? ( introspection )"
-
-RDEPEND="
- >=dev-libs/glib-2.50:2
- udev? ( dev-libs/libgudev[introspection?] )
- dev-libs/libevdev
- introspection? ( >=dev-libs/gobject-introspection-1.56:= )
-"
-DEPEND="${DEPEND}
- vala? ( $(vala_depend) )
- virtual/pkgconfig
-"
-
-PATCHES=(
- # https://gitlab.gnome.org/aplazas/libmanette/merge_requests/18
- "${FILESDIR}"/${PV}-optional-introspection-vapi.patch
-)
-
-src_prepare() {
- xdg_src_prepare
- use vala && vala_src_prepare
-}
-
-src_configure() {
- local emesonargs=(
- $(meson_feature udev gudev)
- $(meson_use introspection)
- $(meson_use vala vapi)
- )
- meson_src_configure
-}
diff --git a/dev-libs/libuv/Manifest b/dev-libs/libuv/Manifest
index 876c30aa2d49..83f302f5d160 100644
--- a/dev-libs/libuv/Manifest
+++ b/dev-libs/libuv/Manifest
@@ -1,3 +1,4 @@
DIST libuv-1.35.0.tar.gz 1253950 BLAKE2B 81ed766d0ca6fc0f8d2ed0b530b9a43104a2f985f86974a30b2d0abe08327cfeb7dfdd7c5b31619fbfcd8f9ca2e03987e16856d8abfef8b9eb9afa7f8c7b0b27 SHA512 a05bfd7cab6ae74022e7120a48772a6594522fb5bc467c8c05eb4809d7c78b68fa4843d86e2e34a68d439767a27dbc49f3b1dcbc8df85bec64471c1b459989c3
DIST libuv-1.37.0.tar.gz 1249701 BLAKE2B 4c48e2062eaaa259623908db99e3ca4b63f27dcbae097b05af542b32860d79aa5aaf5b388c48902a1927b9c4ad6e88b1c2dc2c052815e1321c3e17932c7f09c6 SHA512 ae0d864f5455696507b3a7680170d26e0e333aaeeb74dc2647fc9774a89912ba8ac2be056dbd5cd2b0224ec36ef7bb223fbc851a77302be82c531f8ea01545e0
DIST libuv-1.38.0.tar.gz 1261216 BLAKE2B 837a98e176878e81a9dbe10ee178fa1f738c406eb765308017cc3507ba8343ffbb0c09a68dd1376c855e5c0eb938196ab477aeef764219b64f1999468cadf72b SHA512 da9af33ec17f46f2390661f84e942115c442e665cb63ba5637eb12d2cb0b034889e0d816f261abe7fff3b4d0b44ab8bb63c81f3ec1917325cf0ca93e01921641
+DIST libuv-1.38.1.tar.gz 1262516 BLAKE2B 1c9f04c717a5d814575b86f7b222c18f08a2cea46bfcb48796776c569539363c4a55a2b3c6a8803b89a3964ea4cbacee75d4bccf653250b0823629a4150c972f SHA512 96a52399828b13623bebaa017f401322a5552f596443301d1159ec310112132abe47da0cd39ad3eeae3e8b14d575f2b6bf3d900c2032aac49c0b0260b30f3952
diff --git a/dev-libs/libuv/libuv-1.38.1.ebuild b/dev-libs/libuv/libuv-1.38.1.ebuild
new file mode 100644
index 000000000000..a9a8ca340c4c
--- /dev/null
+++ b/dev-libs/libuv/libuv-1.38.1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools multilib-minimal
+
+DESCRIPTION="Cross-platform asychronous I/O"
+HOMEPAGE="https://github.com/libuv/libuv"
+SRC_URI="https://github.com/libuv/libuv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD BSD-2 ISC MIT"
+SLOT="0/1"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="static-libs"
+RESTRICT="test"
+
+BDEPEND="
+ sys-devel/libtool
+ virtual/pkgconfig
+"
+
+src_prepare() {
+ default
+
+ echo "m4_define([UV_EXTRA_AUTOMAKE_FLAGS], [serial-tests])" \
+ > m4/libuv-extra-automake-flags.m4 || die
+
+ # upstream fails to ship a configure script
+ eautoreconf
+}
+
+multilib_src_configure() {
+ local myeconfargs=(
+ cc_cv_cflags__g=no
+ $(use_enable static-libs static)
+ )
+ ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_test() {
+ mkdir "${BUILD_DIR}"/test || die
+ cp -pPR "${S}"/test/fixtures "${BUILD_DIR}"/test/fixtures || die
+ default
+}
+
+multilib_src_install_all() {
+ einstalldocs
+ find "${D}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/link-grammar/link-grammar-5.3.11.ebuild b/dev-libs/link-grammar/link-grammar-5.3.11.ebuild
index 0d428f04aba8..d8cf07fb2078 100644
--- a/dev-libs/link-grammar/link-grammar-5.3.11.ebuild
+++ b/dev-libs/link-grammar/link-grammar-5.3.11.ebuild
@@ -8,8 +8,8 @@ PYTHON_COMPAT=( python3_6 )
inherit autotools eutils gnome2 java-pkg-opt-2 python-r1
DESCRIPTION="A Syntactic English parser"
-HOMEPAGE="http://www.abisource.com/projects/link-grammar/ http://www.link.cs.cmu.edu/link/"
-SRC_URI="http://www.abisource.com/downloads/${PN}/${PV}/${P}.tar.gz"
+HOMEPAGE="https://www.abisource.com/projects/link-grammar/ https://www.link.cs.cmu.edu/link/"
+SRC_URI="https://www.abisource.com/downloads/${PN}/${PV}/${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
diff --git a/dev-libs/protobuf/Manifest b/dev-libs/protobuf/Manifest
index 806addb1d665..4667b310046c 100644
--- a/dev-libs/protobuf/Manifest
+++ b/dev-libs/protobuf/Manifest
@@ -1,2 +1,3 @@
DIST protobuf-3.10.1.tar.gz 4905995 BLAKE2B 1dde3b6260918da8430c2ce69210462f339c492b2a4e53d5d9c1bea3747aead905370507fc4bd703560f6885c0f3f8393a998b875c19744ad94827109ecbb49f SHA512 aba0c4034c0d3b1759904adb6270eee94dd5dc568f433b219e3f1f70c0033993cdfa3bf476ad3f5767c7629edb9fd029c686405abf93731dde808286b336330d
DIST protobuf-3.11.4.tar.gz 5140799 BLAKE2B 97b450c0623593efe6a42b66582ff183344b8831689e6a5b4d36096dbd57c33da9569bbf26578536aaf73ecd866ac0588b6cb7d55a6a9b9a6e840d4c57099001 SHA512 777bbb0e9e2375eaebe6b8c87abd660bac70ee469c9ad00dd25917b82d7fb5bbe33cf87f0d69c90e19d55c07a7285ec20974ba4768623ce9ccfadf147fd5e261
+DIST protobuf-3.12.2.tar.gz 5309688 BLAKE2B 6f04ab75a165d8135b4c1de210f8698f56f309f73d664192209de10580e0ef850bf56f6f394b860f21912e341141f7bbb1f63198eaee55fd7ad74d86b00c3b1f SHA512 84a349a1dcb5bce6a6a892cf11264390b557ed1e7b05883b71fa9cfb7460d9f73119da1f2861066869e33c752246ea438d5ce2c2b3ff7a4b07696d9450b7916b
diff --git a/dev-libs/protobuf/files/protobuf-3.12.0-disable_no-warning-test.patch b/dev-libs/protobuf/files/protobuf-3.12.0-disable_no-warning-test.patch
new file mode 100644
index 000000000000..d7dd5b5b1bb9
--- /dev/null
+++ b/dev-libs/protobuf/files/protobuf-3.12.0-disable_no-warning-test.patch
@@ -0,0 +1,19 @@
+Disable no-warning-test which is compiled with -Werror option and whose only purpose is checking if compilation results in any warnings.
+
+--- /src/Makefile.am
++++ /src/Makefile.am
+@@ -717,7 +717,7 @@
+ GOOGLEMOCK_SRC_DIR=$(srcdir)/../third_party/googletest/googlemock
+ check_PROGRAMS = protoc protobuf-test protobuf-lazy-descriptor-test \
+ protobuf-lite-test test_plugin protobuf-lite-arena-test \
+- no-warning-test $(GZCHECKPROGRAMS)
++ $(GZCHECKPROGRAMS)
+ protobuf_test_LDADD = $(PTHREAD_LIBS) libprotobuf.la libprotoc.la \
+ $(GOOGLETEST_BUILD_DIR)/lib/libgtest.la \
+ $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock.la \
+@@ -904,4 +904,4 @@
+
+ TESTS = protobuf-test protobuf-lazy-descriptor-test protobuf-lite-test \
+ google/protobuf/compiler/zip_output_unittest.sh $(GZTESTS) \
+- protobuf-lite-arena-test no-warning-test
++ protobuf-lite-arena-test
diff --git a/dev-libs/protobuf/files/protobuf-3.12.0-protoc_input_output_files.patch b/dev-libs/protobuf/files/protobuf-3.12.0-protoc_input_output_files.patch
new file mode 100644
index 000000000000..3123ae5b27b5
--- /dev/null
+++ b/dev-libs/protobuf/files/protobuf-3.12.0-protoc_input_output_files.patch
@@ -0,0 +1,262 @@
+https://github.com/protocolbuffers/protobuf/pull/235
+
+--- /src/google/protobuf/compiler/command_line_interface.cc
++++ /src/google/protobuf/compiler/command_line_interface.cc
+@@ -997,6 +997,28 @@
+ }
+
+ if (mode_ == MODE_ENCODE || mode_ == MODE_DECODE) {
++ bool success = false;
++ int in_fd = STDIN_FILENO;
++ int out_fd = STDOUT_FILENO;
++
++ if (!protobuf_in_path_.empty()) {
++ in_fd = open(protobuf_in_path_.c_str(), O_RDONLY);
++ if (in_fd == -1) {
++ std::cerr << protobuf_in_path_ << ": error: failed to open file." << std::endl;
++ return 1;
++ }
++ }
++ if (!protobuf_out_path_.empty()) {
++ out_fd = open(protobuf_out_path_.c_str(),
++ O_WRONLY | O_CREAT | O_TRUNC,
++ 0644);
++ if (out_fd == -1) {
++ std::cerr << protobuf_out_path_ << ": error: failed to open file." << std::endl;
++ close(in_fd);
++ return 1;
++ }
++ }
++
+ if (codec_type_.empty()) {
+ // HACK: Define an EmptyMessage type to use for decoding.
+ DescriptorPool pool;
+@@ -1005,13 +1027,20 @@
+ file.add_message_type()->set_name("EmptyMessage");
+ GOOGLE_CHECK(pool.BuildFile(file) != NULL);
+ codec_type_ = "EmptyMessage";
+- if (!EncodeOrDecode(&pool)) {
+- return 1;
+- }
++ success = EncodeOrDecode(&pool, in_fd, out_fd);
+ } else {
+- if (!EncodeOrDecode(descriptor_pool.get())) {
+- return 1;
+- }
++ success = EncodeOrDecode(descriptor_pool.get(), in_fd, out_fd);
++ }
++
++ if (in_fd != STDIN_FILENO) {
++ close(in_fd);
++ }
++ if (out_fd != STDOUT_FILENO) {
++ close(out_fd);
++ }
++
++ if (!success) {
++ return 1;
+ }
+ }
+
+@@ -1049,6 +1078,11 @@
+ for (int i = 0; i < proto_path_.size(); i++) {
+ source_tree->MapPath(proto_path_[i].first, proto_path_[i].second);
+ }
++ if (mode_ == MODE_COMPILE &&
++ (!protobuf_in_path_.empty() || !protobuf_out_path_.empty())) {
++ std::cerr << "--protobuf_in and --protobuf_out are only valid with "
++ << "decode operations. Ignoring.";
++ }
+
+ // Map input files to virtual paths if possible.
+ if (!MakeInputsBeProtoPathRelative(source_tree, fallback_database)) {
+@@ -1750,6 +1784,12 @@
+
+ codec_type_ = value;
+
++ } else if (name == "--protobuf_in") {
++ protobuf_in_path_ = value;
++
++ } else if (name == "--protobuf_out") {
++ protobuf_out_path_ = value;
++
+ } else if (name == "--error_format") {
+ if (value == "gcc") {
+ error_format_ = ERROR_FORMAT_GCC;
+@@ -1886,29 +1926,50 @@
+ " -h, --help Show this text and exit.\n"
+ " --encode=MESSAGE_TYPE Read a text-format message of the "
+ "given type\n"
+- " from standard input and write it in "
+- "binary\n"
+- " to standard output. The message type "
+- "must\n"
++ " and write it in binary. The message "
++ "type must\n"
+ " be defined in PROTO_FILES or their "
+ "imports.\n"
++ " The input/output protobuf files are "
++ "specified\n"
++ " using the --protobuf_in and "
++ "--protobuf_out\n"
++ " command line flags.\n"
+ " --decode=MESSAGE_TYPE Read a binary message of the given "
+- "type from\n"
+- " standard input and write it in text "
+- "format\n"
+- " to standard output. The message type "
+- "must\n"
+- " be defined in PROTO_FILES or their "
+- "imports.\n"
++ "type and\n"
++ " write it in text format. The message "
++ "type\n"
++ " must be defined in PROTO_FILES or "
++ "their imports.\n"
++ " The input/output protobuf files are "
++ "specified\n"
++ " using the --protobuf_in and "
++ "--protobuf_out\n"
++ " command line flags.\n"
+ " --decode_raw Read an arbitrary protocol message "
+- "from\n"
+- " standard input and write the raw "
+- "tag/value\n"
+- " pairs in text format to standard "
+- "output. No\n"
++ "and write\n"
++ " the raw tag/value pairs in text format."
++ " No\n"
+ " PROTO_FILES should be given when using "
+ "this\n"
+- " flag.\n"
++ " flag. The input/output protobuf files "
++ "are\n"
++ " specified using the --protobuf_in and\n"
++ " --protobuf_out command line flags.\n"
++ " --protobuf_in=FILE Absolute path to the protobuf file "
++ "from which\n"
++ " input of encoding/decoding operation "
++ "will be\n"
++ " read. If omitted, input will be read "
++ "from\n"
++ " standard input.\n"
++ " --protobuf_out=FILE Absolute path to the protobuf file "
++ "to which\n"
++ " output of encoding/decoding operation "
++ "will be\n"
++ " written. If omitted, output will be "
++ "written to\n"
++ " standard output.\n"
+ " --descriptor_set_in=FILES Specifies a delimited list of FILES\n"
+ " each containing a FileDescriptorSet "
+ "(a\n"
+@@ -2254,7 +2315,9 @@
+ return true;
+ }
+
+-bool CommandLineInterface::EncodeOrDecode(const DescriptorPool* pool) {
++bool CommandLineInterface::EncodeOrDecode(const DescriptorPool* pool,
++ int in_fd,
++ int out_fd) {
+ // Look up the type.
+ const Descriptor* type = pool->FindMessageTypeByName(codec_type_);
+ if (type == NULL) {
+@@ -2266,15 +2329,15 @@
+ std::unique_ptr message(dynamic_factory.GetPrototype(type)->New());
+
+ if (mode_ == MODE_ENCODE) {
+- SetFdToTextMode(STDIN_FILENO);
+- SetFdToBinaryMode(STDOUT_FILENO);
++ SetFdToTextMode(in_fd);
++ SetFdToBinaryMode(out_fd);
+ } else {
+- SetFdToBinaryMode(STDIN_FILENO);
+- SetFdToTextMode(STDOUT_FILENO);
++ SetFdToBinaryMode(in_fd);
++ SetFdToTextMode(out_fd);
+ }
+
+- io::FileInputStream in(STDIN_FILENO);
+- io::FileOutputStream out(STDOUT_FILENO);
++ io::FileInputStream in(in_fd);
++ io::FileOutputStream out(out_fd);
+
+ if (mode_ == MODE_ENCODE) {
+ // Input is text.
+--- /src/google/protobuf/compiler/command_line_interface.h
++++ /src/google/protobuf/compiler/command_line_interface.h
+@@ -296,7 +296,9 @@
+ GeneratorContext* generator_context, std::string* error);
+
+ // Implements --encode and --decode.
+- bool EncodeOrDecode(const DescriptorPool* pool);
++ bool EncodeOrDecode(const DescriptorPool* pool,
++ int in_fd,
++ int out_fd);
+
+ // Implements the --descriptor_set_out option.
+ bool WriteDescriptorSet(
+@@ -428,6 +430,13 @@
+ // parsed FileDescriptorSets to be used for loading protos. Otherwise, empty.
+ std::vector descriptor_set_in_names_;
+
++ // When using --encode / --decode / --decode_raw absolute path to the output
++ // file. (Empty string indicates write to STDOUT).
++ std::string protobuf_out_path_;
++ // When using --encode / --decode / --decode_raw, absolute path to the input
++ // file. (Empty string indicates read from STDIN).
++ std::string protobuf_in_path_;
++
+ // If --descriptor_set_out was given, this is the filename to which the
+ // FileDescriptorSet should be written. Otherwise, empty.
+ std::string descriptor_set_out_name_;
+--- /src/google/protobuf/compiler/command_line_interface_unittest.cc
++++ /src/google/protobuf/compiler/command_line_interface_unittest.cc
+@@ -95,7 +95,7 @@
+ virtual void SetUp();
+ virtual void TearDown();
+
+- // Runs the CommandLineInterface with the given command line. The
++ // Run the CommandLineInterface with the given command line. The
+ // command is automatically split on spaces, and the string "$tmpdir"
+ // is replaced with TestTempDir().
+ void Run(const std::string& command);
+@@ -2625,6 +2625,17 @@
+ std::string::npos);
+ }
+
++ void ExpectBinaryFilesMatch(const string &expected_file,
++ const string &actual_file) {
++ string expected_output, actual_output;
++ ASSERT_TRUE(File::ReadFileToString(expected_file, &expected_output));
++ ASSERT_TRUE(File::ReadFileToString(actual_file, &actual_output));
++
++ // Don't use EXPECT_EQ because we don't want to print raw binary data to
++ // stdout on failure.
++ EXPECT_TRUE(expected_output == actual_output);
++ }
++
+ private:
+ void WriteUnittestProtoDescriptorSet() {
+ unittest_proto_descriptor_set_filename_ =
+@@ -2719,6 +2730,19 @@
+ "net/proto2/internal/no_such_file.proto: No such file or directory\n");
+ }
+
++TEST_P(EncodeDecodeTest, RedirectInputOutput) {
++ string out_file = TestTempDir() + "/golden_message_out.pbf";
++ EXPECT_TRUE(
++ Run(TestUtil::MaybeTranslatePath("net/proto2/internal/unittest.proto") +
++ " --encode=protobuf_unittest.TestAllTypes" +
++ " --protobuf_in=" + TestUtil::GetTestDataPath(
++ "net/proto2/internal/"
++ "testdata/text_format_unittest_data_oneof_implemented.txt") +
++ " --protobuf_out=" + out_file));
++ ExpectBinaryFilesMatch(out_file, TestUtil::GetTestDataPath(
++ "net/proto2/internal/testdata/golden_message_oneof_implemented"));
++}
++
+ INSTANTIATE_TEST_SUITE_P(FileDescriptorSetSource, EncodeDecodeTest,
+ testing::Values(PROTO_PATH, DESCRIPTOR_SET_IN));
+ } // anonymous namespace
diff --git a/dev-libs/protobuf/files/protobuf-3.12.0-system_libraries.patch b/dev-libs/protobuf/files/protobuf-3.12.0-system_libraries.patch
new file mode 100644
index 000000000000..cd7c3493da86
--- /dev/null
+++ b/dev-libs/protobuf/files/protobuf-3.12.0-system_libraries.patch
@@ -0,0 +1,121 @@
+--- /Makefile.am
++++ /Makefile.am
+@@ -11,28 +11,10 @@
+ # Always include third_party directories in distributions.
+ DIST_SUBDIRS = src conformance benchmarks third_party/googletest
+
+-# Build gmock before we build protobuf tests. We don't add gmock to SUBDIRS
+-# because then "make check" would also build and run all of gmock's own tests,
+-# which takes a lot of time and is generally not useful to us. Also, we don't
+-# want "make install" to recurse into gmock since we don't want to overwrite
+-# the installed version of gmock if there is one.
+ check-local:
+- @echo "Making lib/libgmock.a lib/libgmock_main.a in gmock"
+- @cd third_party/googletest/googletest && $(MAKE) $(AM_MAKEFLAGS) lib/libgtest.la lib/libgtest_main.la
+- @cd third_party/googletest/googlemock && $(MAKE) $(AM_MAKEFLAGS) lib/libgmock.la lib/libgmock_main.la
+
+-# We would like to clean gmock when "make clean" is invoked. But we have to
+-# be careful because clean-local is also invoked during "make distclean", but
+-# "make distclean" already recurses into gmock because it's listed among the
+-# DIST_SUBDIRS. distclean will delete gmock/Makefile, so if we then try to
+-# cd to the directory again and "make clean" it will fail. So, check that the
+-# Makefile exists before recursing.
+ clean-local:
+- @if test -e third_party/googletest/Makefile; then \
+- echo "Making clean in googletest"; \
+- cd third_party/googletest && $(MAKE) $(AM_MAKEFLAGS) clean; \
+- fi; \
+- if test -e conformance/Makefile; then \
++ @if test -e conformance/Makefile; then \
+ echo "Making clean in conformance"; \
+ cd conformance && $(MAKE) $(AM_MAKEFLAGS) clean; \
+ fi; \
+--- /configure.ac
++++ /configure.ac
+@@ -223,12 +223,5 @@
+ esac
+ AM_CONDITIONAL([OBJC_CONFORMANCE_TEST], [test $OBJC_CONFORMANCE_TEST = 1])
+
+-# HACK: Make gmock's configure script pick up our copy of CFLAGS and CXXFLAGS,
+-# since the flags added by ACX_CHECK_SUNCC must be used when compiling gmock
+-# too.
+-export CFLAGS
+-export CXXFLAGS
+-AC_CONFIG_SUBDIRS([third_party/googletest])
+-
+ AC_CONFIG_FILES([Makefile src/Makefile benchmarks/Makefile conformance/Makefile protobuf.pc protobuf-lite.pc])
+ AC_OUTPUT
+--- /src/Makefile.am
++++ /src/Makefile.am
+@@ -711,19 +711,11 @@
+ google/protobuf/testing/file.cc \
+ google/protobuf/testing/file.h
+
+-GOOGLETEST_BUILD_DIR=../third_party/googletest/googletest
+-GOOGLEMOCK_BUILD_DIR=../third_party/googletest/googlemock
+-GOOGLETEST_SRC_DIR=$(srcdir)/../third_party/googletest/googletest
+-GOOGLEMOCK_SRC_DIR=$(srcdir)/../third_party/googletest/googlemock
+ check_PROGRAMS = protoc protobuf-test protobuf-lazy-descriptor-test \
+ protobuf-lite-test test_plugin protobuf-lite-arena-test \
+ $(GZCHECKPROGRAMS)
+ protobuf_test_LDADD = $(PTHREAD_LIBS) libprotobuf.la libprotoc.la \
+- $(GOOGLETEST_BUILD_DIR)/lib/libgtest.la \
+- $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock.la \
+- $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock_main.la
+-protobuf_test_CPPFLAGS = -I$(GOOGLETEST_SRC_DIR)/include \
+- -I$(GOOGLEMOCK_SRC_DIR)/include
++ -lgtest -lgmock -lgmock_main
+ # Disable optimization for tests unless the user explicitly asked for it,
+ # since test_util.cc takes forever to compile with optimization (with GCC).
+ # See configure.ac for more info.
+@@ -815,12 +807,8 @@
+ # Run cpp_unittest again with PROTOBUF_TEST_NO_DESCRIPTORS defined.
+ protobuf_lazy_descriptor_test_LDADD = $(PTHREAD_LIBS) libprotobuf.la \
+ libprotoc.la \
+- $(GOOGLETEST_BUILD_DIR)/lib/libgtest.la \
+- $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock.la \
+- $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock_main.la
+-protobuf_lazy_descriptor_test_CPPFLAGS = -I$(GOOGLEMOCK_SRC_DIR)/include \
+- -I$(GOOGLETEST_SRC_DIR)/include \
+- -DPROTOBUF_TEST_NO_DESCRIPTORS
++ -lgtest -lgmock -lgmock_main
++protobuf_lazy_descriptor_test_CPPFLAGS = -DPROTOBUF_TEST_NO_DESCRIPTORS
+ protobuf_lazy_descriptor_test_CXXFLAGS = $(NO_OPT_CXXFLAGS)
+ protobuf_lazy_descriptor_test_SOURCES = \
+ google/protobuf/compiler/cpp/cpp_unittest.cc \
+@@ -841,11 +829,7 @@
+ # full runtime and we want to make sure this test builds without full
+ # runtime.
+ protobuf_lite_test_LDADD = $(PTHREAD_LIBS) libprotobuf-lite.la \
+- $(GOOGLETEST_BUILD_DIR)/lib/libgtest.la \
+- $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock.la \
+- $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock_main.la
+-protobuf_lite_test_CPPFLAGS= -I$(GOOGLEMOCK_SRC_DIR)/include \
+- -I$(GOOGLETEST_SRC_DIR)/include
++ -lgtest -lgmock -lgmock_main
+ protobuf_lite_test_CXXFLAGS = $(NO_OPT_CXXFLAGS)
+ protobuf_lite_test_SOURCES = \
+ google/protobuf/lite_unittest.cc \
+@@ -857,11 +841,7 @@
+ # gtest when building the test internally our memory sanitizer doesn't detect
+ # memory leaks (don't know why).
+ protobuf_lite_arena_test_LDADD = $(PTHREAD_LIBS) libprotobuf-lite.la \
+- $(GOOGLETEST_BUILD_DIR)/lib/libgtest.la \
+- $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock.la \
+- $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock_main.la
+-protobuf_lite_arena_test_CPPFLAGS = -I$(GOOGLEMOCK_SRC_DIR)/include \
+- -I$(GOOGLETEST_SRC_DIR)/include
++ -lgtest -lgmock -lgmock_main
+ protobuf_lite_arena_test_CXXFLAGS = $(NO_OPT_CXXFLAGS)
+ protobuf_lite_arena_test_SOURCES = \
+ google/protobuf/lite_arena_unittest.cc \
+@@ -871,8 +851,7 @@
+
+ # Test plugin binary.
+ test_plugin_LDADD = $(PTHREAD_LIBS) libprotobuf.la libprotoc.la \
+- $(GOOGLETEST_BUILD_DIR)/lib/libgtest.la
+-test_plugin_CPPFLAGS = -I$(GOOGLETEST_SRC_DIR)/include
++ -lgtest
+ test_plugin_SOURCES = \
+ google/protobuf/compiler/mock_code_generator.cc \
+ google/protobuf/testing/file.cc \
diff --git a/dev-libs/protobuf/protobuf-3.12.2.ebuild b/dev-libs/protobuf/protobuf-3.12.2.ebuild
new file mode 100644
index 000000000000..16f0b7ed8c10
--- /dev/null
+++ b/dev-libs/protobuf/protobuf-3.12.2.ebuild
@@ -0,0 +1,128 @@
+# Copyright 2008-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit autotools elisp-common flag-o-matic multilib-minimal toolchain-funcs
+
+if [[ "${PV}" == "9999" ]]; then
+ inherit git-r3
+
+ EGIT_REPO_URI="https://github.com/protocolbuffers/protobuf"
+ EGIT_SUBMODULES=()
+fi
+
+DESCRIPTION="Google's Protocol Buffers - Extensible mechanism for serializing structured data"
+HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf"
+if [[ "${PV}" == "9999" ]]; then
+ SRC_URI=""
+else
+ SRC_URI="https://github.com/protocolbuffers/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+LICENSE="BSD"
+SLOT="0/23"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE="emacs examples static-libs test zlib"
+RESTRICT="!test? ( test )"
+
+BDEPEND="emacs? ( app-editors/emacs:* )"
+DEPEND="test? ( >=dev-cpp/gtest-1.9[${MULTILIB_USEDEP}] )
+ zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )"
+RDEPEND="emacs? ( app-editors/emacs:* )
+ zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-3.12.0-disable_no-warning-test.patch"
+ "${FILESDIR}/${PN}-3.12.0-system_libraries.patch"
+ "${FILESDIR}/${PN}-3.12.0-protoc_input_output_files.patch"
+)
+
+DOCS=(CHANGES.txt CONTRIBUTORS.txt README.md)
+
+src_prepare() {
+ default
+
+ # https://github.com/protocolbuffers/protobuf/issues/7413
+ sed -e "/^AC_PROG_CXX_FOR_BUILD$/d" -i configure.ac || die
+
+ eautoreconf
+}
+
+src_configure() {
+ append-cppflags -DGOOGLE_PROTOBUF_NO_RTTI
+
+ if tc-ld-is-gold; then
+ # https://sourceware.org/bugzilla/show_bug.cgi?id=24527
+ tc-ld-disable-gold
+ fi
+
+ multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+ local options=(
+ $(use_enable static-libs static)
+ $(use_with zlib)
+ )
+
+ if tc-is-cross-compiler; then
+ # Build system uses protoc when building, so protoc copy runnable on host is needed.
+ mkdir -p "${WORKDIR}/build" || die
+ pushd "${WORKDIR}/build" > /dev/null || die
+ ECONF_SOURCE="${S}" econf_build "${options[@]}"
+ options+=(--with-protoc="$(pwd)/src/protoc")
+ popd > /dev/null || die
+ fi
+
+ ECONF_SOURCE="${S}" econf "${options[@]}"
+}
+
+src_compile() {
+ multilib-minimal_src_compile
+
+ if use emacs; then
+ elisp-compile editors/protobuf-mode.el
+ fi
+}
+
+multilib_src_compile() {
+ if tc-is-cross-compiler; then
+ emake -C "${WORKDIR}/build/src" protoc
+ fi
+
+ default
+}
+
+multilib_src_test() {
+ emake check
+}
+
+multilib_src_install_all() {
+ find "${D}" -name "*.la" -type f -delete || die
+
+ insinto /usr/share/vim/vimfiles/syntax
+ doins editors/proto.vim
+ insinto /usr/share/vim/vimfiles/ftdetect
+ doins "${FILESDIR}/proto.vim"
+
+ if use emacs; then
+ elisp-install ${PN} editors/protobuf-mode.el*
+ elisp-site-file-install "${FILESDIR}/70${PN}-gentoo.el"
+ fi
+
+ if use examples; then
+ DOCS+=(examples)
+ docompress -x /usr/share/doc/${PF}/examples
+ fi
+
+ einstalldocs
+}
+
+pkg_postinst() {
+ use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+ use emacs && elisp-site-regen
+}
diff --git a/dev-libs/protobuf/protobuf-9999.ebuild b/dev-libs/protobuf/protobuf-9999.ebuild
index eebedecd5f12..4b1a78fbac4b 100644
--- a/dev-libs/protobuf/protobuf-9999.ebuild
+++ b/dev-libs/protobuf/protobuf-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2008-2019 Gentoo Authors
+# Copyright 2008-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
@@ -21,7 +21,7 @@ else
fi
LICENSE="BSD"
-SLOT="0/22"
+SLOT="0/23"
KEYWORDS=""
IUSE="emacs examples static-libs test zlib"
RESTRICT="!test? ( test )"
@@ -33,9 +33,9 @@ RDEPEND="emacs? ( app-editors/emacs:* )
zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )"
PATCHES=(
- "${FILESDIR}/${PN}-3.11.0-disable_no-warning-test.patch"
- "${FILESDIR}/${PN}-3.11.0-system_libraries.patch"
- "${FILESDIR}/${PN}-3.11.0-protoc_input_output_files.patch"
+ "${FILESDIR}/${PN}-3.12.0-disable_no-warning-test.patch"
+ "${FILESDIR}/${PN}-3.12.0-system_libraries.patch"
+ "${FILESDIR}/${PN}-3.12.0-protoc_input_output_files.patch"
)
DOCS=(CHANGES.txt CONTRIBUTORS.txt README.md)
diff --git a/dev-libs/vala-common/Manifest b/dev-libs/vala-common/Manifest
index 27e2dbddbb54..4182b5753a51 100644
--- a/dev-libs/vala-common/Manifest
+++ b/dev-libs/vala-common/Manifest
@@ -1,3 +1,4 @@
DIST vala-0.46.10.tar.xz 3417400 BLAKE2B 2f78de3e198f994a148e7ed4c82ef2417b70c19af3ce1874ee80aa7d0160691a50db24ad4898a04520e91d67a41bb508d3854ac2f4d90d2507a5a6558854716c SHA512 ae3734036f6a1b7088bac45083b75a49eee76947219f530493f81aa4ee60807cfa5424cf1b982d8d8f28f56119d66f06a9150b67884d80dd4b6724e152e32e62
DIST vala-0.46.7.tar.xz 3402828 BLAKE2B c028875e2c6036a6657244bff62d3a2eec2104c06ec3c993f4d59371f2ec7947cfd36f577d41a2c4ba52f6dd7fb03251cad989e3b2787e2817bd988cc16030ca SHA512 609694c2b773abdd8f47d0e9dd8e1dabac2053f7e0321eac7232b3931b15df30e095541dbb02965fc74f3a29b7562b7a326c56ce7c570e6528f8cfa480363c76
DIST vala-0.48.6.tar.xz 3451004 BLAKE2B 9c880cff885b934e1d82d21285839e040addecb0b3ce81936d5be118a951bd219eea2b8381ea42f13e6e858a1937a3789a3dee6d067735e5ee21eaced38b4646 SHA512 220a916d42cbae3853afdd7c35a72afb446a92fca039d8c660a478fd793686a0c82cbaf90a7c94ae182c1f41eec6df1aedb804013ab38e6e4bcc6d26e40e5375
+DIST vala-0.48.7.tar.xz 3460968 BLAKE2B d2630c3695d3e3915751d74581ed85f493cb1f63c49ef8a2a36c396a86fefee4f9b608d5161f680eff9c4ebee0563fc158b3e1102dbe4ac56e2ab1c2bb938f2e SHA512 93ed6f98ff3be35d327794c5d81f30239c84838d49991b70dced1672f070e4675576da43b7555748d66ecae70102cd422e6af9b562f22bb34b40c07c73bac882
diff --git a/dev-libs/vala-common/vala-common-0.48.7.ebuild b/dev-libs/vala-common/vala-common-0.48.7.ebuild
new file mode 100644
index 000000000000..ee55cfcad100
--- /dev/null
+++ b/dev-libs/vala-common/vala-common-0.48.7.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+GNOME_ORG_MODULE="vala"
+
+inherit gnome.org
+
+DESCRIPTION="Build infrastructure for packages that use Vala"
+HOMEPAGE="https://wiki.gnome.org/Projects/Vala"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+IUSE=""
+
+RDEPEND=""
+DEPEND=""
+BDEPEND=""
+
+src_configure() { :; }
+
+src_compile() { :; }
+
+src_install() {
+ insinto /usr/share/aclocal
+ doins vala.m4 vapigen/vapigen.m4
+ insinto /usr/share/vala
+ doins vapigen/Makefile.vapigen
+}
diff --git a/dev-libs/xxhash/Manifest b/dev-libs/xxhash/Manifest
index 7c0dbf8865dc..bc75bc4546f7 100644
--- a/dev-libs/xxhash/Manifest
+++ b/dev-libs/xxhash/Manifest
@@ -1,3 +1,3 @@
DIST xxhash-0.6.5.tar.gz 37521 BLAKE2B cfd4268bdb9079108c436c057f37c1c23a13a89f8a3d6c936ab27d3b339dbca3fa88e8ddc4fc9878501d6875622edd2ba50f465b4c361f1eb42d8f7a8f8a6fbd SHA512 085643b52e091ac0eedd54c4459220b3643d825ca71a11e952d00ea2041c570ff57d8553d0378f34e038ca9ee3b40d2048ed02d44d5aff1fbfcbf5e642487ba0
-DIST xxhash-0.7.1.tar.gz 76328 BLAKE2B 8ef64a1a44763417441dbec396d54b5d57ee225058f6c1bfb6baa8983bae49d84ab55a59743f7edf8580be52acc1bfb622c590f43450891af4d17cbd2ac48972 SHA512 03aa89c35fffafa8fc81b249ff4fa0dd3f7985466106815a9f36b00314ce82e3e2586e7abec5b56dd94d9b785768ac9562b03973817390b716cad8cd53e9ebc1
DIST xxhash-0.7.3.tar.gz 126405 BLAKE2B 1304251c36a839f5d1b935c0633016222d6b517932d05b84d10ae8a3ee3fccd6cfd31d8e3768f033ca8adcbf2bb9728ffd6c4ccd7a9878ef59d289b49a497656 SHA512 72949010a267f063768241b182464c386005b4078f56902fee2f7804bd01f6c27878a6a4ec2a266cd59162934a7e471264ac5757dba570a97a2b5dad7703c664
+DIST xxhash-0.7.4.tar.gz 143886 BLAKE2B 94305d8de0fbfc713b8ff093289d1bc496a0a7ca49e79c85205d7f502f421951d5eec543f6768d335d94f2aaaf6143868594e3027e2ab73b7317656ce1c5d8f3 SHA512 9dbf8424b355d6551c18cff7ed7dbd26d4e5735b9a07fe54911b7438d6ffed3a3c2429ac09b616de630ea16cf32ff73529b6c3fad4af78ae0cb2b06155086aea
diff --git a/dev-libs/xxhash/xxhash-0.7.3.ebuild b/dev-libs/xxhash/xxhash-0.7.3.ebuild
index baba81c88143..ed6943693aea 100644
--- a/dev-libs/xxhash/xxhash-0.7.3.ebuild
+++ b/dev-libs/xxhash/xxhash-0.7.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/Cyan4973/xxHash/archive/v${PV}.tar.gz -> ${P}.tar.gz
LICENSE="BSD-2 GPL-2+"
# https://abi-laboratory.pro/tracker/timeline/xxhash
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
IUSE="static-libs"
S="${WORKDIR}/xxHash-${PV}"
diff --git a/dev-libs/xxhash/xxhash-0.7.1.ebuild b/dev-libs/xxhash/xxhash-0.7.4.ebuild
similarity index 89%
rename from dev-libs/xxhash/xxhash-0.7.1.ebuild
rename to dev-libs/xxhash/xxhash-0.7.4.ebuild
index 8973996851d3..baba81c88143 100644
--- a/dev-libs/xxhash/xxhash-0.7.1.ebuild
+++ b/dev-libs/xxhash/xxhash-0.7.4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/Cyan4973/xxHash/archive/v${PV}.tar.gz -> ${P}.tar.gz
LICENSE="BSD-2 GPL-2+"
# https://abi-laboratory.pro/tracker/timeline/xxhash
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
IUSE="static-libs"
S="${WORKDIR}/xxHash-${PV}"
diff --git a/dev-perl/Any-Moose/Any-Moose-0.270.0.ebuild b/dev-perl/Any-Moose/Any-Moose-0.270.0.ebuild
index e4cf9c5ceacb..4258d6654890 100644
--- a/dev-perl/Any-Moose/Any-Moose-0.270.0.ebuild
+++ b/dev-perl/Any-Moose/Any-Moose-0.270.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Use Moose or Mouse modules (DEPRECATED)"
SLOT="0"
-KEYWORDS="amd64 ~arm hppa ppc x86"
+KEYWORDS="amd64 ~arm ~arm64 hppa ppc x86"
IUSE="test"
RESTRICT="!test? ( test )"
PERL_RM_FILES=(
diff --git a/dev-perl/B-COW/B-COW-0.4.0-r1.ebuild b/dev-perl/B-COW/B-COW-0.4.0-r1.ebuild
new file mode 100644
index 000000000000..bf93505dcd25
--- /dev/null
+++ b/dev-perl/B-COW/B-COW-0.4.0-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DIST_AUTHOR=ATOOMIC
+DIST_VERSION=0.004
+DIST_EXAMPLES=("examples/*")
+inherit perl-module
+
+DESCRIPTION="additional B helpers to check COW status"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+ virtual/perl-ExtUtils-MakeMaker
+ test? (
+ virtual/perl-File-Spec
+ virtual/perl-Test-Simple
+ )
+"
+src_compile() {
+ mymake=(
+ "OPTIMIZE=${CFLAGS}"
+ )
+ perl-module_src_compile
+}
diff --git a/dev-perl/B-Flags/B-Flags-0.170.0-r1.ebuild b/dev-perl/B-Flags/B-Flags-0.170.0-r1.ebuild
new file mode 100644
index 000000000000..999940b63696
--- /dev/null
+++ b/dev-perl/B-Flags/B-Flags-0.170.0-r1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DIST_AUTHOR=RURBAN
+DIST_VERSION=0.17
+inherit perl-module
+
+DESCRIPTION="Friendlier flags for B"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="${RDEPEND}
+ virtual/perl-ExtUtils-MakeMaker
+"
+src_compile() {
+ mymake=(
+ "OPTIMIZE=${CFLAGS}"
+ )
+ perl-module_src_compile
+}
diff --git a/dev-perl/B-Hooks-OP-Check/B-Hooks-OP-Check-0.220.0-r1.ebuild b/dev-perl/B-Hooks-OP-Check/B-Hooks-OP-Check-0.220.0-r1.ebuild
new file mode 100644
index 000000000000..488138509ffa
--- /dev/null
+++ b/dev-perl/B-Hooks-OP-Check/B-Hooks-OP-Check-0.220.0-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DIST_AUTHOR=ETHER
+DIST_VERSION=0.22
+inherit perl-module
+
+DESCRIPTION="Wrap OP check callbacks"
+
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="virtual/perl-parent"
+BDEPEND="${RDEPEND}
+ >=dev-perl/ExtUtils-Depends-0.302.0
+ virtual/perl-ExtUtils-MakeMaker
+ test? (
+ >=virtual/perl-CPAN-Meta-2.120.900
+ virtual/perl-File-Spec
+ virtual/perl-Test-Simple
+ )
+"
+src_compile() {
+ mymake=(
+ "OPTIMIZE=${CFLAGS}"
+ )
+ perl-module_src_compile
+}
diff --git a/dev-perl/B-Hooks-Parser/B-Hooks-Parser-0.210.0-r1.ebuild b/dev-perl/B-Hooks-Parser/B-Hooks-Parser-0.210.0-r1.ebuild
new file mode 100644
index 000000000000..2d76e80a60d7
--- /dev/null
+++ b/dev-perl/B-Hooks-Parser/B-Hooks-Parser-0.210.0-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DIST_AUTHOR=ETHER
+DIST_VERSION=0.21
+inherit perl-module
+
+DESCRIPTION="Interface to perls parser variables"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ >=dev-perl/B-Hooks-OP-Check-0.180.0
+ virtual/perl-XSLoader
+ virtual/perl-parent
+"
+BDEPEND="${RDEPEND}
+ >=dev-perl/ExtUtils-Depends-0.302.0
+ virtual/perl-ExtUtils-MakeMaker
+ test? (
+ dev-perl/B-Hooks-EndOfScope
+ virtual/perl-File-Spec
+ dev-perl/Test-Fatal
+ virtual/perl-Test-Simple
+ )
+"
+src_compile() {
+ mymake=(
+ "OPTIMIZE=${CFLAGS}"
+ )
+ perl-module_src_compile
+}
diff --git a/dev-perl/B-OPCheck/B-OPCheck-0.320.0-r1.ebuild b/dev-perl/B-OPCheck/B-OPCheck-0.320.0-r1.ebuild
new file mode 100644
index 000000000000..2c2e6ab8c967
--- /dev/null
+++ b/dev-perl/B-OPCheck/B-OPCheck-0.320.0-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DIST_AUTHOR=ETHER
+DIST_VERSION=0.32
+inherit perl-module
+
+DESCRIPTION="PL_check hacks using Perl callbacks"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ >=dev-perl/B-Utils-0.80.0
+ virtual/perl-Carp
+ virtual/perl-Scalar-List-Utils
+ dev-perl/Scope-Guard
+ virtual/perl-XSLoader
+"
+BDEPEND="${RDEPEND}
+ virtual/perl-ExtUtils-MakeMaker
+ >=dev-perl/ExtUtils-Depends-0.302.0
+ test? (
+ virtual/perl-File-Spec
+ virtual/perl-Module-Metadata
+ virtual/perl-Test-Simple
+ )
+"
+src_compile() {
+ mymake=(
+ "OPTIMIZE=${CFLAGS}"
+ )
+ perl-module_src_compile
+}
diff --git a/dev-perl/B-Utils/B-Utils-0.270.0-r2.ebuild b/dev-perl/B-Utils/B-Utils-0.270.0-r2.ebuild
new file mode 100644
index 000000000000..873e3bd16ee1
--- /dev/null
+++ b/dev-perl/B-Utils/B-Utils-0.270.0-r2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DIST_AUTHOR=ETHER
+DIST_VERSION=0.27
+inherit perl-module
+
+DESCRIPTION="Helper functions for op tree manipulation"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+# needs Scalar::Util
+RDEPEND="
+ virtual/perl-Exporter
+ virtual/perl-Scalar-List-Utils
+ dev-perl/Task-Weaken
+"
+BDEPEND="${RDEPEND}
+ virtual/perl-ExtUtils-CBuilder
+ >=dev-perl/ExtUtils-Depends-0.301.0
+ test? (
+ virtual/perl-Test-Simple
+ )
+"
+PERL_RM_FILES=(
+ # These useless no-op tests that simply clutter test output
+ t/utils/{31oldname,32kids,33ancestors,34descendants,35siblings,36previous,37stringify}.t
+ t/utils/{41walkfilt,42all,43allfilt,44optrep}.t
+ t/utils/{50carp,51croak}.t
+)
+src_compile() {
+ mymake=(
+ "OPTIMIZE=${CFLAGS}"
+ )
+ perl-module_src_compile
+}
diff --git a/dev-perl/BDB/BDB-1.920.0-r1.ebuild b/dev-perl/BDB/BDB-1.920.0-r1.ebuild
new file mode 100644
index 000000000000..d7e98227eee0
--- /dev/null
+++ b/dev-perl/BDB/BDB-1.920.0-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DIST_AUTHOR=MLEHMANN
+DIST_VERSION=1.92
+DIST_EXAMPLES=("eg/*")
+inherit perl-module
+
+DESCRIPTION="Asynchronous Berkeley DB access"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+ dev-perl/common-sense
+ sys-libs/db:=
+"
+DEPEND="
+ sys-libs/db:=
+"
+BDEPEND="${RDEPEND}
+ virtual/perl-ExtUtils-MakeMaker
+"
+src_compile() {
+ mymake=(
+ "OPTIMIZE=${CFLAGS}"
+ )
+ perl-module_src_compile
+}
diff --git a/dev-perl/BSD-Resource/BSD-Resource-1.291.100-r2.ebuild b/dev-perl/BSD-Resource/BSD-Resource-1.291.100-r2.ebuild
new file mode 100644
index 000000000000..a4ab2219cf24
--- /dev/null
+++ b/dev-perl/BSD-Resource/BSD-Resource-1.291.100-r2.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DIST_AUTHOR=JHI
+DIST_VERSION=1.2911
+inherit perl-module
+
+DESCRIPTION="Perl module for BSD process resource limit and priority functions"
+LICENSE="|| ( Artistic-2 LGPL-2 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+
+BDEPEND="virtual/perl-ExtUtils-MakeMaker"
+
+PERL_RM_FILES=(
+ "t/pod.t"
+ "t/pod-coverage.t"
+)
+src_compile() {
+ mymake=(
+ "OPTIMIZE=${CFLAGS}"
+ )
+ perl-module_src_compile
+}
diff --git a/dev-perl/BerkeleyDB/BerkeleyDB-0.630.0-r1.ebuild b/dev-perl/BerkeleyDB/BerkeleyDB-0.630.0-r1.ebuild
new file mode 100644
index 000000000000..848dcc667f74
--- /dev/null
+++ b/dev-perl/BerkeleyDB/BerkeleyDB-0.630.0-r1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DIST_AUTHOR=PMQS
+DIST_VERSION=0.63
+inherit perl-module db-use
+
+DESCRIPTION="This module provides Berkeley DB interface for Perl"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+# Install DB_File if you want older support. BerkleyDB no longer
+# supports less than 2.0.
+
+RDEPEND="
+ >=sys-libs/db-2.0:=
+ "${S}"/config.in || die "Can't write config.in"
+
+ perl-module_src_prepare
+}
+src_compile() {
+ mymake=(
+ "OPTIMIZE=${CFLAGS}"
+ )
+ perl-module_src_compile
+}
diff --git a/dev-perl/Bio-DB-HTS/Bio-DB-HTS-3.10.0-r1.ebuild b/dev-perl/Bio-DB-HTS/Bio-DB-HTS-3.10.0-r1.ebuild
new file mode 100644
index 000000000000..dcae1156e881
--- /dev/null
+++ b/dev-perl/Bio-DB-HTS/Bio-DB-HTS-3.10.0-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DIST_AUTHOR=AVULLO
+DIST_VERSION=3.01
+
+inherit perl-module
+
+DESCRIPTION="Perl bindings for sci-libs/htslib"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ sci-biology/bioperl
+ sci-libs/htslib:=
+"
+DEPEND="
+ dev-perl/Module-Build
+ sci-libs/htslib:=
+"
+BDEPEND="${RDEPEND}
+ dev-perl/Module-Build
+ test? ( dev-perl/Test-LeakTrace )"
+
+PATCHES=(
+ "${FILESDIR}/2.11-build_env_ldflags.patch"
+ "${FILESDIR}/2.11-build_split_htslib_opts.patch"
+)
+
+src_configure() {
+ local myconf="--htslib-includedir=${EPREFIX}/usr/include/htslib --htslib-libdir=${EPREFIX}/usr/$(get_libdir)"
+ unset LD
+ if [[ -n "${CCLD}" ]]; then
+ export LD="${CCLD}"
+ fi
+ perl-module_src_configure
+}
+src_compile() {
+ ./Build --config optimize="${CFLAGS}" build || die
+}
diff --git a/dev-perl/Bio-DB-HTS/metadata.xml b/dev-perl/Bio-DB-HTS/metadata.xml
index 95abbb699ad4..126683a7c28f 100644
--- a/dev-perl/Bio-DB-HTS/metadata.xml
+++ b/dev-perl/Bio-DB-HTS/metadata.xml
@@ -13,5 +13,32 @@
Ensembl/Bio-DB-HTS
Bio-DB-HTS
Bio::DB::HTS
+ Bio::DB::HTS::AlignWrapper
+ Bio::DB::HTS::Alignment
+ Bio::DB::HTS::Constants
+ Bio::DB::HTS::Fai
+ Bio::DB::HTS::Faidx
+ Bio::DB::HTS::FetchIterator
+ Bio::DB::HTS::Kseq
+ Bio::DB::HTS::Kseq::Record
+ Bio::DB::HTS::Pileup
+ Bio::DB::HTS::PileupWrapper
+ Bio::DB::HTS::Query
+ Bio::DB::HTS::ReadIterator
+ Bio::DB::HTS::Segment
+ Bio::DB::HTS::Segment::Iterator
+ Bio::DB::HTS::SplitAlignmentPart
+ Bio::DB::HTS::Tabix
+ Bio::DB::HTS::Tabix::Iterator
+ Bio::DB::HTS::Target
+ Bio::DB::HTS::VCF
+ Bio::DB::HTS::VCF::Header
+ Bio::DB::HTS::VCF::HeaderPtr
+ Bio::DB::HTS::VCF::Iterator
+ Bio::DB::HTS::VCF::Row
+ Bio::DB::HTS::VCF::RowPtr
+ Bio::DB::HTS::VCF::Sweep
+ Bio::DB::HTSfile
+ Bio::SeqFeature::HTSCoverage
diff --git a/dev-perl/Bio-SamTools/Bio-SamTools-1.430.0-r2.ebuild b/dev-perl/Bio-SamTools/Bio-SamTools-1.430.0-r2.ebuild
new file mode 100644
index 000000000000..ed1ab08f8255
--- /dev/null
+++ b/dev-perl/Bio-SamTools/Bio-SamTools-1.430.0-r2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DIST_AUTHOR=LDS
+DIST_VERSION=1.43
+inherit perl-module toolchain-funcs multilib
+
+DESCRIPTION="Read SAM/BAM database files"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+LICENSE="|| ( Apache-2.0 Artistic-2 GPL-1+ )"
+
+RDEPEND="
+ >=sci-biology/bioperl-1.6.9
+ sci-biology/samtools:0.1-legacy=
+"
+DEPEND="
+ dev-perl/Module-Build
+ sci-biology/samtools:0.1-legacy=
+"
+BDEPEND="${RDEPEND}
+ virtual/perl-ExtUtils-CBuilder
+ >=dev-perl/Module-Build-0.420.0
+"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.430.0-legacy-r1.patch
+)
+
+src_configure() {
+ tc-export CC
+ unset LD
+ if [[ -n "${CCLD}" ]]; then
+ export LD="${CCLD}"
+ fi
+ SAM_LIB="${EPREFIX}/usr/$(get_libdir)/libbam-0.1-legacy.so" \
+ SAM_INCLUDE="${EPREFIX}/usr/include/bam-0.1-legacy" \
+ perl-module_src_configure
+}
+src_compile() {
+ ./Build --config optimize="${CFLAGS}" build || die
+}
diff --git a/dev-perl/Bit-Vector/Bit-Vector-7.400.0-r2.ebuild b/dev-perl/Bit-Vector/Bit-Vector-7.400.0-r2.ebuild
new file mode 100644
index 000000000000..d419c8e6b134
--- /dev/null
+++ b/dev-perl/Bit-Vector/Bit-Vector-7.400.0-r2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DIST_AUTHOR=STBEY
+DIST_VERSION=7.4
+inherit perl-module
+
+DESCRIPTION="Efficient bit vector, set of integers and big int math library"
+# License note: upstream mess, bug #721222
+LICENSE="|| ( Artistic ( GPL-1 GPL-1+ ) ) LGPL-2 LGPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+RDEPEND="
+ >=dev-perl/Carp-Clan-5.300.0
+ >=virtual/perl-Storable-2.210.0
+"
+BDEPEND="${RDEPEND}
+ virtual/perl-ExtUtils-MakeMaker
+"
+src_compile() {
+ mymake=(
+ "OPTIMIZE=${CFLAGS}"
+ )
+ perl-module_src_compile
+}
diff --git a/dev-perl/CBOR-XS/CBOR-XS-1.710.0-r1.ebuild b/dev-perl/CBOR-XS/CBOR-XS-1.710.0-r1.ebuild
new file mode 100644
index 000000000000..249754da5781
--- /dev/null
+++ b/dev-perl/CBOR-XS/CBOR-XS-1.710.0-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DIST_AUTHOR=MLEHMANN
+DIST_VERSION=1.71
+inherit perl-module
+
+DESCRIPTION="Concise Binary Object Representation (CBOR, RFC7049)"
+# License note: see bottom of ecb.h license block
+LICENSE="GPL-3 || ( GPL-2+ BSD )"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ dev-perl/Types-Serialiser
+ dev-perl/common-sense
+"
+DEPEND="${RDEPEND}
+ dev-perl/Canary-Stability
+ >=virtual/perl-ExtUtils-MakeMaker-6.520.0
+"
+src_compile() {
+ mymake=(
+ "OPTIMIZE=${CFLAGS}"
+ )
+ perl-module_src_compile
+}
diff --git a/dev-perl/CDB_File/CDB_File-1.20.0-r1.ebuild b/dev-perl/CDB_File/CDB_File-1.20.0-r1.ebuild
new file mode 100644
index 000000000000..a753c1041d5f
--- /dev/null
+++ b/dev-perl/CDB_File/CDB_File-1.20.0-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DIST_AUTHOR=TODDR
+DIST_VERSION=1.02
+DIST_EXAMPLES=("examples/*")
+inherit perl-module
+
+DESCRIPTION="Tie to CDB (Bernstein's constant DB) files"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+ virtual/perl-ExtUtils-MakeMaker
+ test? (
+ dev-perl/B-COW
+ virtual/perl-File-Temp
+ virtual/perl-Test-Simple
+ )
+"
+# Parallel breaks
+DIST_TEST="do"
+
+src_prepare() {
+ mkdir "${S}/examples" || die "Can't make examples dir"
+ einfo "Moving bun-x.pl to examples/"
+ cp "${S}/bun-x.pl" "${S}/examples/" || die "Can't copy example to examples/"
+ perl_rm_files bun-x.pl
+ perl-module_src_prepare
+}
+
+src_compile() {
+ mymake=(
+ "OPTIMIZE=${CFLAGS}"
+ )
+ perl-module_src_compile
+}
diff --git a/dev-perl/CSS-Minifier-XS/CSS-Minifier-XS-0.90.0-r2.ebuild b/dev-perl/CSS-Minifier-XS/CSS-Minifier-XS-0.90.0-r2.ebuild
new file mode 100644
index 000000000000..eaa4bd52d5f0
--- /dev/null
+++ b/dev-perl/CSS-Minifier-XS/CSS-Minifier-XS-0.90.0-r2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DIST_AUTHOR=GTERMARS
+DIST_VERSION="0.09"
+
+inherit perl-module
+
+DESCRIPTION="XS based CSS minifier"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+ dev-perl/Module-Build
+"
+BDEPEND="
+ >=dev-perl/Module-Build-0.40.0
+ virtual/perl-ExtUtils-CBuilder
+"
+src_configure() {
+ unset LD
+ [[ -n "${CCLD}" ]] && export LD="${CCLD}"
+ perl-module_src_configure
+}
+src_compile() {
+ ./Build --config optimize="${CFLAGS}" build || die
+}
diff --git a/dev-perl/Cache-FastMmap/Cache-FastMmap-1.490.0-r1.ebuild b/dev-perl/Cache-FastMmap/Cache-FastMmap-1.490.0-r1.ebuild
new file mode 100644
index 000000000000..4d61b8f8c8d9
--- /dev/null
+++ b/dev-perl/Cache-FastMmap/Cache-FastMmap-1.490.0-r1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+DIST_AUTHOR=ROBM
+DIST_VERSION=1.49
+inherit perl-module
+
+DESCRIPTION="Uses an mmaped file to act as a shared memory interprocess cache"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+ virtual/perl-Storable
+"
+BDEPEND="${RDEPEND}
+ virtual/perl-ExtUtils-MakeMaker
+"
+src_compile() {
+ mymake=(
+ "OPTIMIZE=${CFLAGS}"
+ )
+ perl-module_src_compile
+}
diff --git a/dev-perl/Cache-Memcached-Fast/Cache-Memcached-Fast-0.260.0-r1.ebuild b/dev-perl/Cache-Memcached-Fast/Cache-Memcached-Fast-0.260.0-r1.ebuild
new file mode 100644
index 000000000000..1c39f3f15862
--- /dev/null
+++ b/dev-perl/Cache-Memcached-Fast/Cache-Memcached-Fast-0.260.0-r1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DIST_AUTHOR=RAZ
+DIST_VERSION=0.26
+DIST_EXAMPLES=("script/*")
+inherit perl-module
+
+DESCRIPTION="Perl client for memcached, in C language"
+# License note: Perl 5.x or newer, + "when C parts used as standalone library"
+# Bug: https://bugs.gentoo.org/718946#c4
+LICENSE="|| ( Artistic GPL-1+ ) LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+ "${FILESDIR}/0.230.0-parallel-make.patch"
+ "${FILESDIR}/${PN}-0.250.0-no-flto.patch"
+)
+RDEPEND="virtual/perl-Storable"
+BDEPEND="${RDEPEND}
+ virtual/perl-ExtUtils-MakeMaker
+ test? (
+ net-misc/memcached
+ virtual/perl-Test-Simple
+ )
+"
+PERL_RM_FILES=(
+ "t/pod-coverage.t"
+ "t/pod.t"
+)
+
+src_compile() {
+ mymake=(
+ "OPTIMIZE=${CFLAGS}"
+ )
+ perl-module_src_compile
+}
+src_test() {
+ ewarn "t/commands.t is known to fail: https://bugs.gentoo.org/722848"
+ local memcached_opts=( -d -P "${T}/memcached.pid" -p 11211 -l 127.0.0.1 )
+ [[ ${EUID} == 0 ]] && memcached_opts+=( -u portage )
+ memcached "${memcached_opts[@]}" || die "Can't start memcached test server"
+
+ local exit_status
+ perl-module_src_test
+ exit_status=$?
+
+ kill "$(<"${T}/memcached.pid")"
+ return ${exit_status}
+}
diff --git a/dev-perl/Cairo-GObject/Cairo-GObject-1.5.0-r1.ebuild b/dev-perl/Cairo-GObject/Cairo-GObject-1.5.0-r1.ebuild
new file mode 100644
index 000000000000..81a8a90d9066
--- /dev/null
+++ b/dev-perl/Cairo-GObject/Cairo-GObject-1.5.0-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DIST_AUTHOR=XAOC
+DIST_VERSION=1.005
+DIST_EXAMPLES=("examples/*")
+inherit perl-module
+
+DESCRIPTION="Integrate Cairo into the Glib type system"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+ x11-libs/cairo[glib]
+ >=dev-perl/glib-perl-1.224.0
+ >=dev-perl/Cairo-1.80.0
+"
+DEPEND="
+ x11-libs/cairo[glib]
+"
+BDEPEND="${RDEPEND}
+ virtual/perl-ExtUtils-MakeMaker
+ >=dev-perl/ExtUtils-Depends-0.200.0
+ >=dev-perl/ExtUtils-PkgConfig-1.0.0
+"
+src_compile() {
+ mymake=(
+ "OPTIMIZE=${CFLAGS}"
+ )
+ perl-module_src_compile
+}
diff --git a/dev-perl/Cairo/Cairo-1.107.0-r1.ebuild b/dev-perl/Cairo/Cairo-1.107.0-r1.ebuild
new file mode 100644
index 000000000000..37c59892cafe
--- /dev/null
+++ b/dev-perl/Cairo/Cairo-1.107.0-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DIST_AUTHOR=XAOC
+DIST_VERSION=1.107
+DIST_EXAMPLES=("examples/*")
+inherit perl-module
+
+DESCRIPTION="Perl interface to the cairo library"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ >=x11-libs/cairo-1.0.0
+"
+DEPEND="
+ >=x11-libs/cairo-1.0.0
+"
+BDEPEND="${RDEPEND}
+ virtual/perl-ExtUtils-MakeMaker
+ >=dev-perl/ExtUtils-Depends-0.200.0
+ >=dev-perl/ExtUtils-PkgConfig-1.0.0
+ test? (
+ dev-perl/Test-Number-Delta
+ )
+"
+PATCHES=(
+ "${FILESDIR}/${PN}-1.107-fatal-exit.patch"
+)
+src_compile() {
+ mymake=(
+ "OPTIMIZE=${CFLAGS}"
+ )
+ perl-module_src_compile
+}
diff --git a/dev-perl/Class-C3-XS/Class-C3-XS-0.150.0-r1.ebuild b/dev-perl/Class-C3-XS/Class-C3-XS-0.150.0-r1.ebuild
new file mode 100644
index 000000000000..c59e0624cfc6
--- /dev/null
+++ b/dev-perl/Class-C3-XS/Class-C3-XS-0.150.0-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DIST_AUTHOR=ETHER
+DIST_VERSION=0.15
+inherit perl-module
+
+DESCRIPTION="XS speedups for Class::C3"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~ppc ~sparc ~x86 ~x86-solaris"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ virtual/perl-XSLoader
+"
+BDEPEND="${RDEPEND}
+ virtual/perl-ExtUtils-MakeMaker
+ test? (
+ virtual/perl-File-Spec
+ virtual/perl-Test-Simple
+ )
+"
+src_compile() {
+ mymake=(
+ "OPTIMIZE=${CFLAGS}"
+ )
+ perl-module_src_compile
+}
diff --git a/dev-perl/Class-Load-XS/Class-Load-XS-0.100.0-r1.ebuild b/dev-perl/Class-Load-XS/Class-Load-XS-0.100.0-r1.ebuild
new file mode 100644
index 000000000000..c94646abc63e
--- /dev/null
+++ b/dev-perl/Class-Load-XS/Class-Load-XS-0.100.0-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DIST_AUTHOR=ETHER
+DIST_VERSION=0.10
+inherit perl-module
+
+DESCRIPTION="XS implementation of parts of Class::Load"
+
+LICENSE="Artistic-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ >=dev-perl/Class-Load-0.200.0
+ virtual/perl-XSLoader
+"
+BDEPEND="${RDEPEND}
+ virtual/perl-ExtUtils-MakeMaker
+ test? (
+ virtual/perl-File-Spec
+ >=virtual/perl-CPAN-Meta-2.120.900
+ >=virtual/perl-Test-Simple-0.880.0
+ >=dev-perl/Module-Implementation-0.40.0
+ dev-perl/Test-Fatal
+ dev-perl/Test-Needs
+ virtual/perl-version
+ )
+"
+src_compile() {
+ mymake=(
+ "OPTIMIZE=${CFLAGS}"
+ )
+ perl-module_src_compile
+}
diff --git a/dev-perl/Clone/Clone-0.450.0.ebuild b/dev-perl/Clone/Clone-0.450.0.ebuild
index 040e2a89c354..7bc03be63a65 100644
--- a/dev-perl/Clone/Clone-0.450.0.ebuild
+++ b/dev-perl/Clone/Clone-0.450.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Recursively copy Perl datatypes"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Conf-Libconfig/Conf-Libconfig-0.100.0-r1.ebuild b/dev-perl/Conf-Libconfig/Conf-Libconfig-0.100.0-r1.ebuild
new file mode 100644
index 000000000000..6d48e73fb60e
--- /dev/null
+++ b/dev-perl/Conf-Libconfig/Conf-Libconfig-0.100.0-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DIST_AUTHOR=CNANGEL
+DIST_VERSION="0.100"
+
+inherit perl-module
+
+DESCRIPTION="Perl extension for libconfig"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+PERL_RM_FILES=(
+ "t/boilerplate.t"
+ "t/pod-coverage.t"
+ "t/pod-spell.t"
+ "t/pod.t"
+)
+RDEPEND="
+ dev-libs/libconfig
+ virtual/perl-XSLoader
+"
+DEPEND="
+ dev-libs/libconfig
+"
+BDEPEND="${RDEPEND}
+ dev-perl/ExtUtils-PkgConfig
+ test? (
+ >=dev-perl/Test-Exception-0.430.0
+ >=dev-perl/Test-Deep-1.127.0
+ >=dev-perl/Test-Warn-0.320.0
+ )
+"
+src_compile() {
+ mymake=(
+ "OPTIMIZE=${CFLAGS}"
+ )
+ perl-module_src_compile
+}
diff --git a/dev-perl/Coro/Coro-6.550.0.ebuild b/dev-perl/Coro/Coro-6.550.0.ebuild
new file mode 100644
index 000000000000..7ba23ca2253e
--- /dev/null
+++ b/dev-perl/Coro/Coro-6.550.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DIST_AUTHOR=MLEHMANN
+DIST_VERSION=6.55
+DIST_EXAMPLES=( "eg/*" )
+inherit perl-module
+
+DESCRIPTION="The only real threads in perl"
+LICENSE="|| ( Artistic GPL-1+ ) LGPL-2.1+ || ( BSD-2 GPL-2+ )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+ev event"
+
+RDEPEND="
+ >=dev-perl/AnyEvent-7
+ ev? ( >=dev-perl/EV-4.0.0 )
+ event? ( >=dev-perl/Event-1.80.0 )
+ >=dev-perl/Guard-0.500.0
+ virtual/perl-Scalar-List-Utils
+ >=virtual/perl-Storable-2.150.0
+ dev-perl/common-sense
+"
+BDEPEND="${RDEPEND}
+ dev-perl/Canary-Stability
+ >=virtual/perl-ExtUtils-MakeMaker-6.520.0
+"
+PATCHES=(
+ "${FILESDIR}/6.514.0-ev-config.patch"
+)
+src_configure() {
+ local myopts=()
+ use ev && myopts+=("EV")
+ use event && myopts+=( "Event" )
+ GENTOO_OPTS="${myopts[@]}" perl-module_src_configure
+}
+src_compile() {
+ mymake=(
+ "OPTIMIZE=${CFLAGS}"
+ )
+ perl-module_src_compile
+}
diff --git a/dev-perl/Coro/Manifest b/dev-perl/Coro/Manifest
index fd2a02abdf9f..c245de2d104d 100644
--- a/dev-perl/Coro/Manifest
+++ b/dev-perl/Coro/Manifest
@@ -1 +1,2 @@
DIST Coro-6.514.tar.gz 195122 BLAKE2B d512a990f54e22af20ea91165817d00bab20dcbe0e9111988f704799556cf246f96a40a8b59b56977edefbabf8830453662001ceb35eb4d0f1761ce7c3da3fb7 SHA512 340eea9bc2a33c40813f4852d3a12ff947426fd329a4867a36262a9ece936c9e43d36ba5e4355d1f8f91cb40690de3bb1637ab0b0651518c22fb17a34ee90b37
+DIST Coro-6.55.tar.gz 195586 BLAKE2B b2f6f47f91fcb4af584896cd91c2631d5622556d63206eb1e7a5796cc3b7d0498d40021f06a8367402a34b0771b7ccc80776598a61811cc67d828828bb8a5f4a SHA512 47f22033e52d1734755d7f68175b86784c688a8b8e87d0ce0295e7fe9df9134d5ac9fce8915e8ea1d9355a6d1f3642c44c3c4d745e1e6afb0a9e61c15b47d41e
diff --git a/dev-perl/Crypt-OpenSSL-Guess/Crypt-OpenSSL-Guess-0.110.0.ebuild b/dev-perl/Crypt-OpenSSL-Guess/Crypt-OpenSSL-Guess-0.110.0.ebuild
index 1a4da0faf42b..44148bf52078 100644
--- a/dev-perl/Crypt-OpenSSL-Guess/Crypt-OpenSSL-Guess-0.110.0.ebuild
+++ b/dev-perl/Crypt-OpenSSL-Guess/Crypt-OpenSSL-Guess-0.110.0.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
DESCRIPTION="Guess OpenSSL include path"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
IUSE="libressl test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Crypt-OpenSSL-RSA/Crypt-OpenSSL-RSA-0.310.0.ebuild b/dev-perl/Crypt-OpenSSL-RSA/Crypt-OpenSSL-RSA-0.310.0.ebuild
index 87892490f35e..f80a7318d11d 100644
--- a/dev-perl/Crypt-OpenSSL-RSA/Crypt-OpenSSL-RSA-0.310.0.ebuild
+++ b/dev-perl/Crypt-OpenSSL-RSA/Crypt-OpenSSL-RSA-0.310.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="RSA encoding and decoding using the OpenSSL libraries"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
IUSE="libressl test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Crypt-OpenSSL-Random/Crypt-OpenSSL-Random-0.150.0.ebuild b/dev-perl/Crypt-OpenSSL-Random/Crypt-OpenSSL-Random-0.150.0.ebuild
index d4ea000050b5..cd9c7dc71f95 100644
--- a/dev-perl/Crypt-OpenSSL-Random/Crypt-OpenSSL-Random-0.150.0.ebuild
+++ b/dev-perl/Crypt-OpenSSL-Random/Crypt-OpenSSL-Random-0.150.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="OpenSSL/LibreSSL pseudo-random number generator access"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
IUSE="libressl"
RDEPEND="
diff --git a/dev-perl/Cwd-Guard/Cwd-Guard-0.50.0.ebuild b/dev-perl/Cwd-Guard/Cwd-Guard-0.50.0.ebuild
index 9124f2a50a6b..2c29043339ae 100644
--- a/dev-perl/Cwd-Guard/Cwd-Guard-0.50.0.ebuild
+++ b/dev-perl/Cwd-Guard/Cwd-Guard-0.50.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Temporary changing working directory (chdir)"
SLOT="0"
-KEYWORDS="amd64 ~arm hppa ~ppc x86"
+KEYWORDS="amd64 ~arm ~arm64 hppa ~ppc x86"
IUSE="test minimal"
RESTRICT="!test? ( test )"
# Cwd -> perl-File-Spec
diff --git a/dev-perl/Devel-CallChecker/Devel-CallChecker-0.8.0-r1.ebuild b/dev-perl/Devel-CallChecker/Devel-CallChecker-0.8.0-r1.ebuild
new file mode 100644
index 000000000000..6270059b6140
--- /dev/null
+++ b/dev-perl/Devel-CallChecker/Devel-CallChecker-0.8.0-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DIST_AUTHOR=ZEFRAM
+DIST_VERSION=0.008
+inherit perl-module
+
+DESCRIPTION="Custom OP checking attached to subroutines"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ >=dev-perl/DynaLoader-Functions-0.1.0
+ virtual/perl-Exporter
+ virtual/perl-XSLoader
+ virtual/perl-parent
+"
+DEPEND="
+ dev-perl/Module-Build
+"
+BDEPEND="${RDEPEND}
+ dev-perl/Module-Build
+ test? (
+ >=virtual/perl-ExtUtils-CBuilder-0.150.0
+ virtual/perl-ExtUtils-ParseXS
+ virtual/perl-File-Spec
+ virtual/perl-IO
+ virtual/perl-Test-Simple
+ )
+"
+src_configure() {
+ unset LD
+ [[ -n "${CCLD}" ]] && export LD="${CCLD}"
+ perl-module_src_configure
+}
+src_compile() {
+ ./Build --config optimize="${CFLAGS}" build || die
+}
diff --git a/dev-perl/Devel-CheckCompiler/Devel-CheckCompiler-0.70.0.ebuild b/dev-perl/Devel-CheckCompiler/Devel-CheckCompiler-0.70.0.ebuild
index cafe7214afcb..499d02f88593 100644
--- a/dev-perl/Devel-CheckCompiler/Devel-CheckCompiler-0.70.0.ebuild
+++ b/dev-perl/Devel-CheckCompiler/Devel-CheckCompiler-0.70.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Check the compiler's availability"
SLOT="0"
-KEYWORDS="amd64 ~arm hppa ~ppc x86"
+KEYWORDS="amd64 ~arm ~arm64 hppa ~ppc x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/File-Copy-Link/File-Copy-Link-0.140.0.ebuild b/dev-perl/File-Copy-Link/File-Copy-Link-0.140.0.ebuild
index 0cb7ae1a2171..1f3f0a6c02d1 100644
--- a/dev-perl/File-Copy-Link/File-Copy-Link-0.140.0.ebuild
+++ b/dev-perl/File-Copy-Link/File-Copy-Link-0.140.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Perl extension for replacing a link by a copy of the linked file"
SLOT="0"
-KEYWORDS="amd64 ~arm hppa ~ppc x86"
+KEYWORDS="amd64 ~arm ~arm64 hppa ~ppc x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Inline-C/Inline-C-0.780.0.ebuild b/dev-perl/Inline-C/Inline-C-0.780.0.ebuild
index 722934793d56..018ce17a6320 100644
--- a/dev-perl/Inline-C/Inline-C-0.780.0.ebuild
+++ b/dev-perl/Inline-C/Inline-C-0.780.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=6
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="C Language Support for Inline"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ~sparc x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Manifest.gz b/dev-perl/Manifest.gz
index 8083501a5023..fb0d5fe0e720 100644
Binary files a/dev-perl/Manifest.gz and b/dev-perl/Manifest.gz differ
diff --git a/dev-perl/Module-Build-XSUtil/Module-Build-XSUtil-0.180.0.ebuild b/dev-perl/Module-Build-XSUtil/Module-Build-XSUtil-0.180.0.ebuild
index cd07328a2094..f7a2a97f79cc 100644
--- a/dev-perl/Module-Build-XSUtil/Module-Build-XSUtil-0.180.0.ebuild
+++ b/dev-perl/Module-Build-XSUtil/Module-Build-XSUtil-0.180.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="A Module::Build class for building XS modules"
SLOT="0"
-KEYWORDS="amd64 ~arm hppa ~ppc x86"
+KEYWORDS="amd64 ~arm ~arm64 hppa ~ppc x86"
IUSE="test examples"
RESTRICT="!test? ( test )"
# File::Basename -> perl
diff --git a/dev-perl/MooseX-Types/MooseX-Types-0.500.0.ebuild b/dev-perl/MooseX-Types/MooseX-Types-0.500.0.ebuild
index 87d70632883f..3e65d0867f08 100644
--- a/dev-perl/MooseX-Types/MooseX-Types-0.500.0.ebuild
+++ b/dev-perl/MooseX-Types/MooseX-Types-0.500.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="Organise your Moose types in libraries"
SLOT="0"
-KEYWORDS="amd64 ~arm hppa ppc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 hppa ppc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Mouse/Mouse-2.4.10.ebuild b/dev-perl/Mouse/Mouse-2.4.10.ebuild
index 723415a04acb..b5cb6aeeb4f9 100644
--- a/dev-perl/Mouse/Mouse-2.4.10.ebuild
+++ b/dev-perl/Mouse/Mouse-2.4.10.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="Moose minus the antlers"
SLOT="0"
-KEYWORDS="amd64 ~arm hppa ~ppc x86"
+KEYWORDS="amd64 ~arm ~arm64 hppa ~ppc x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/MouseX-NativeTraits/MouseX-NativeTraits-1.90.0-r2.ebuild b/dev-perl/MouseX-NativeTraits/MouseX-NativeTraits-1.90.0-r2.ebuild
index 667f0f544edb..047220dac2e1 100644
--- a/dev-perl/MouseX-NativeTraits/MouseX-NativeTraits-1.90.0-r2.ebuild
+++ b/dev-perl/MouseX-NativeTraits/MouseX-NativeTraits-1.90.0-r2.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Extend your attribute interfaces for Mouse"
SLOT="0"
-KEYWORDS="amd64 ~arm x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Pegex/Pegex-0.640.0.ebuild b/dev-perl/Pegex/Pegex-0.640.0.ebuild
index a14dfa437313..ae7c9c68b519 100644
--- a/dev-perl/Pegex/Pegex-0.640.0.ebuild
+++ b/dev-perl/Pegex/Pegex-0.640.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=6
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="Acmeist PEG Parser Framework"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ~sparc x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Sub-Exporter-ForMethods/Sub-Exporter-ForMethods-0.100.52.ebuild b/dev-perl/Sub-Exporter-ForMethods/Sub-Exporter-ForMethods-0.100.52.ebuild
index 1a8b0a6a72b3..17f8a9f59cd9 100644
--- a/dev-perl/Sub-Exporter-ForMethods/Sub-Exporter-ForMethods-0.100.52.ebuild
+++ b/dev-perl/Sub-Exporter-ForMethods/Sub-Exporter-ForMethods-0.100.52.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Helper routines for using Sub::Exporter to build methods"
SLOT="0"
-KEYWORDS="amd64 ~arm hppa ppc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 hppa ppc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/X11-XCB/X11-XCB-0.170.0-r1.ebuild b/dev-perl/X11-XCB/X11-XCB-0.170.0-r1.ebuild
index 139e7903be78..8bb5ff58406c 100644
--- a/dev-perl/X11-XCB/X11-XCB-0.170.0-r1.ebuild
+++ b/dev-perl/X11-XCB/X11-XCB-0.170.0-r1.ebuild
@@ -9,7 +9,7 @@ inherit perl-module virtualx
DESCRIPTION="Perl bindings for libxcb"
SLOT="0"
-KEYWORDS="amd64 ~arm x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/XML-Descent/XML-Descent-1.40.0.ebuild b/dev-perl/XML-Descent/XML-Descent-1.40.0.ebuild
index 59cc609bf7a2..96fbe2ab45e3 100644
--- a/dev-perl/XML-Descent/XML-Descent-1.40.0.ebuild
+++ b/dev-perl/XML-Descent/XML-Descent-1.40.0.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
DESCRIPTION="Recursive decent XML parsing"
SLOT="0"
-KEYWORDS="amd64 ~arm x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/XML-TokeParser/XML-TokeParser-0.50.0.ebuild b/dev-perl/XML-TokeParser/XML-TokeParser-0.50.0.ebuild
index 1a01e6e59969..0642b6d819ee 100644
--- a/dev-perl/XML-TokeParser/XML-TokeParser-0.50.0.ebuild
+++ b/dev-perl/XML-TokeParser/XML-TokeParser-0.50.0.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
DESCRIPTION="Simplified interface to XML::Parser"
SLOT="0"
-KEYWORDS="amd64 ~arm x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/XS-Object-Magic/XS-Object-Magic-0.40.0-r3.ebuild b/dev-perl/XS-Object-Magic/XS-Object-Magic-0.40.0-r3.ebuild
index 4a37960786e5..aed96f7746ba 100644
--- a/dev-perl/XS-Object-Magic/XS-Object-Magic-0.40.0-r3.ebuild
+++ b/dev-perl/XS-Object-Magic/XS-Object-Magic-0.40.0-r3.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
DESCRIPTION="Opaque, extensible XS pointer backed objects using sv_magic"
SLOT="0"
-KEYWORDS="amd64 ~arm x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/bareword-filehandles/bareword-filehandles-0.7.0-r1.ebuild b/dev-perl/bareword-filehandles/bareword-filehandles-0.7.0-r1.ebuild
new file mode 100644
index 000000000000..1e9f50c24c61
--- /dev/null
+++ b/dev-perl/bareword-filehandles/bareword-filehandles-0.7.0-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DIST_AUTHOR=ILMARI
+DIST_VERSION=0.007
+inherit perl-module
+
+DESCRIPTION="Disables bareword filehandles"
+
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+# Lexical::SealRequireHints only required with Perl < 5.12
+# We could add alternation here, but it would be work without benefit
+# which would complicate stabilization
+RDEPEND="
+ dev-perl/B-Hooks-OP-Check
+ virtual/perl-if
+ virtual/perl-XSLoader
+"
+BDEPEND="${RDEPEND}
+ virtual/perl-ExtUtils-MakeMaker
+ dev-perl/ExtUtils-Depends
+ test? ( >=virtual/perl-Test-Simple-0.880.0 )
+"
+src_compile() {
+ mymake=(
+ "OPTIMIZE=${CFLAGS}"
+ )
+ perl-module_src_compile
+}
diff --git a/dev-perl/local-lib/local-lib-2.0.24.ebuild b/dev-perl/local-lib/local-lib-2.0.24.ebuild
index 2a37814b9b45..9b0a9ba53b3e 100644
--- a/dev-perl/local-lib/local-lib-2.0.24.ebuild
+++ b/dev-perl/local-lib/local-lib-2.0.24.ebuild
@@ -8,7 +8,7 @@ inherit perl-module
DESCRIPTION='create and use a local lib/ for perl modules with PERL5LIB'
SLOT="0"
-KEYWORDS="amd64 ~arm x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 9c058748b1e9..171987edcf33 100644
Binary files a/dev-python/Manifest.gz and b/dev-python/Manifest.gz differ
diff --git a/dev-python/argcomplete/argcomplete-1.11.1-r1.ebuild b/dev-python/argcomplete/argcomplete-1.11.1-r1.ebuild
index 036d621fad96..57ba1b2a551a 100644
--- a/dev-python/argcomplete/argcomplete-1.11.1-r1.ebuild
+++ b/dev-python/argcomplete/argcomplete-1.11.1-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/asgiref/asgiref-3.2.7.ebuild b/dev-python/asgiref/asgiref-3.2.7.ebuild
index 5a179cf49004..f9e5cece6393 100644
--- a/dev-python/asgiref/asgiref-3.2.7.ebuild
+++ b/dev-python/asgiref/asgiref-3.2.7.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 x86"
BDEPEND="
test? ( dev-python/pytest-asyncio[${PYTHON_USEDEP}] )"
diff --git a/dev-python/aws-sam-translator/aws-sam-translator-1.24.0.ebuild b/dev-python/aws-sam-translator/aws-sam-translator-1.24.0.ebuild
index e570b035756d..e8ea18cbab4e 100644
--- a/dev-python/aws-sam-translator/aws-sam-translator-1.24.0.ebuild
+++ b/dev-python/aws-sam-translator/aws-sam-translator-1.24.0.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/serverless-application-model-${PV}"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
RDEPEND="
>=dev-python/boto3-1.5[${PYTHON_USEDEP}]
diff --git a/dev-python/backports-lzma/backports-lzma-0.0.13.ebuild b/dev-python/backports-lzma/backports-lzma-0.0.13.ebuild
index 63344d21c828..38f82d82fa25 100644
--- a/dev-python/backports-lzma/backports-lzma-0.0.13.ebuild
+++ b/dev-python/backports-lzma/backports-lzma-0.0.13.ebuild
@@ -27,6 +27,12 @@ DEPEND="${RDEPEND}
S=${WORKDIR}/${MY_P}
+src_prepare() {
+ # unforce -L/usr/lib
+ sed -i -e '/library_dirs =/,/\]/d' setup.py || die
+ distutils-r1_src_prepare
+}
+
python_test() {
"${EPYTHON}" test/test_lzma.py || die "tests failed with ${EPYTHON}"
}
diff --git a/dev-python/backports-shutil_get_terminal_size/Manifest b/dev-python/backports-shutil_get_terminal_size/Manifest
deleted file mode 100644
index c82df6234216..000000000000
--- a/dev-python/backports-shutil_get_terminal_size/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST backports.shutil_get_terminal_size-1.0.0.tar.gz 4279 BLAKE2B 8f4772c8c9b7e80c4d1402ef9cf3fefaa7ab61a1baed26b87fa0d347bea6ad704f5ae7d9379cd266bd949509eff9e89cda9d87ecedc9832c5cb332c5ed6496d0 SHA512 b74341c6616f9aace5abcc7fd657fc33801b558b6227c533002ccaf588734490b465a4a27d2bdc8047a385771afdcded610edef832dfa5ef24632f4541729050
diff --git a/dev-python/backports-shutil_get_terminal_size/backports-shutil_get_terminal_size-1.0.0-r1.ebuild b/dev-python/backports-shutil_get_terminal_size/backports-shutil_get_terminal_size-1.0.0-r1.ebuild
deleted file mode 100644
index 1e2ab25acb17..000000000000
--- a/dev-python/backports-shutil_get_terminal_size/backports-shutil_get_terminal_size-1.0.0-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-MY_PN="backports.shutil_get_terminal_size"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A backport of the get_terminal_size function from Python 3.3's shutil"
-HOMEPAGE="https://pypi.org/project/backports.shutil_get_terminal_size/ https://github.com/chrippa/backports.shutil_get_terminal_size"
-SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="dev-python/backports[${PYTHON_USEDEP}]"
-
-S=${WORKDIR}/${MY_P}
-
-python_install() {
- distutils-r1_python_install
-
- # main namespace provided by dev-python/backports
- rm "${D}$(python_get_sitedir)"/backports/__init__.py* || die
-}
diff --git a/dev-python/backports-shutil_get_terminal_size/metadata.xml b/dev-python/backports-shutil_get_terminal_size/metadata.xml
deleted file mode 100644
index f9b37db2f8db..000000000000
--- a/dev-python/backports-shutil_get_terminal_size/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
- python@gentoo.org
- Python
-
-
- backports.shutil_get_terminal_size
- chrippa/backports.shutil_get_terminal_size
-
-
diff --git a/dev-python/backports-shutil_which/Manifest b/dev-python/backports-shutil_which/Manifest
deleted file mode 100644
index a8b102d94aa9..000000000000
--- a/dev-python/backports-shutil_which/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST backports.shutil_which-3.5.1.tar.gz 3020 BLAKE2B 9df216cb71d0af039ddd38dcd3a9e4de311afff742fcdd1a91e2d29520d3f9c2f8dfd44d2b8471cdb76b54d7cae3ba81c02c77d92fba617936dccfa6e79387e1 SHA512 066096f6cde0d245f2a8ff27b8e99bcec7088a2c9667c6b3dc73dd8866ea98acfb32c63222e8349eb906460b8ade864b18cf88a627070e20e28d5c00aded3ae4
diff --git a/dev-python/backports-shutil_which/backports-shutil_which-3.5.1.ebuild b/dev-python/backports-shutil_which/backports-shutil_which-3.5.1.ebuild
deleted file mode 100644
index abe245de1db7..000000000000
--- a/dev-python/backports-shutil_which/backports-shutil_which-3.5.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-MY_PN="backports.shutil_which"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Backport of shutil.which from Python 3.3"
-HOMEPAGE="https://pypi.org/project/backports.shutil_which/ https://github.com/minrk/backports.shutil_which"
-SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="dev-python/backports[${PYTHON_USEDEP}]"
-
-S=${WORKDIR}/${MY_P}
-
-python_install() {
- distutils-r1_python_install
-
- # main namespace provided by dev-python/backports
- rm "${D}$(python_get_sitedir)"/backports/__init__.py* || die
-}
diff --git a/dev-python/backports-shutil_which/metadata.xml b/dev-python/backports-shutil_which/metadata.xml
deleted file mode 100644
index bb2287b53848..000000000000
--- a/dev-python/backports-shutil_which/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
- python@gentoo.org
- Python
-
-
- backports.shutil_which
- minrk/backports.shutil_which
-
-
diff --git a/dev-python/backports-ssl-match-hostname/Manifest b/dev-python/backports-ssl-match-hostname/Manifest
deleted file mode 100644
index 0024cbe11c59..000000000000
--- a/dev-python/backports-ssl-match-hostname/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST backports.ssl_match_hostname-3.5.0.1.tar.gz 5605 BLAKE2B b9c346cc7414fbda97c2b1646ec406942ab5527b6537338a9fe0ed60d62d8515cd03fdeb68cfed10862c23f1d6e37ffc13bd479e55f6a9310abb4be14e3de83c SHA512 414c2b6f302a4655c3db3ef09e1dca4916ae4e8c4aa69e43c63bbb920303ea4b2618150c2c35d8a2e1e1283b1d65ccd10a350888fd771addda533c19c20b7e82
diff --git a/dev-python/backports-ssl-match-hostname/backports-ssl-match-hostname-3.5.0.1-r1.ebuild b/dev-python/backports-ssl-match-hostname/backports-ssl-match-hostname-3.5.0.1-r1.ebuild
deleted file mode 100644
index 744d6bb51f76..000000000000
--- a/dev-python/backports-ssl-match-hostname/backports-ssl-match-hostname-3.5.0.1-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-# This is a backport from python3.5+
-# Do not add python3.5 or later support here, there's no need for it.
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-MY_PN=${PN/-/.}
-MY_PN=${MY_PN//-/_}
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Backport of the ssl.match_hostname function"
-HOMEPAGE="https://pypi.org/project/backports.ssl_match_hostname/"
-SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="PYTHON"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="dev-python/backports[${PYTHON_USEDEP}]"
-
-S=${WORKDIR}/${MY_P}
-
-python_install_all() {
- local DOCS=( backports/ssl_match_hostname/README.txt )
- distutils-r1_python_install_all
-}
-
-python_install() {
- # main namespace provided by dev-python/backports
- rm "${BUILD_DIR}"/lib/backports/__init__.py || die
- distutils-r1_python_install --skip-build
-}
diff --git a/dev-python/backports-ssl-match-hostname/metadata.xml b/dev-python/backports-ssl-match-hostname/metadata.xml
deleted file mode 100644
index 3a0e0db9e926..000000000000
--- a/dev-python/backports-ssl-match-hostname/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
- python@gentoo.org
- Python
-
-
- backports.ssl_match_hostname
-
-
diff --git a/dev-python/betamax/betamax-0.8.1.ebuild b/dev-python/betamax/betamax-0.8.1.ebuild
index 6fd86ef812c5..2da451680c4b 100644
--- a/dev-python/betamax/betamax-0.8.1.ebuild
+++ b/dev-python/betamax/betamax-0.8.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~ppc ~ppc64 sparc x86"
IUSE="test"
RDEPEND="dev-python/requests[${PYTHON_USEDEP}]"
diff --git a/dev-python/bottleneck/bottleneck-1.3.2.ebuild b/dev-python/bottleneck/bottleneck-1.3.2.ebuild
index 6532decb92e7..44d762f10206 100644
--- a/dev-python/bottleneck/bottleneck-1.3.2.ebuild
+++ b/dev-python/bottleneck/bottleneck-1.3.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/kwgoodman/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
SLOT="0"
LICENSE="BSD"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/cfn-python-lint/cfn-python-lint-0.30.1.ebuild b/dev-python/cfn-python-lint/cfn-python-lint-0.30.1.ebuild
index a707f4ad926a..48ce07a63854 100644
--- a/dev-python/cfn-python-lint/cfn-python-lint-0.30.1.ebuild
+++ b/dev-python/cfn-python-lint/cfn-python-lint-0.30.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/aws-cloudformation/${PN}/archive/v${PV}.tar.gz -> ${
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
RDEPEND="
>=dev-python/aws-sam-translator-1.21.0[${PYTHON_USEDEP}]
diff --git a/dev-python/cheroot/cheroot-8.3.0.ebuild b/dev-python/cheroot/cheroot-8.3.0.ebuild
index 0124db04df17..5c5eff35de05 100644
--- a/dev-python/cheroot/cheroot-8.3.0.ebuild
+++ b/dev-python/cheroot/cheroot-8.3.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/C/${PN/c/C}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 x86"
# Unit tests are temporarily disabled for this version, see below for
# what needs to be done.
#IUSE="test"
diff --git a/dev-python/cherrypy/cherrypy-18.5.0.ebuild b/dev-python/cherrypy/cherrypy-18.5.0.ebuild
index 0cdaca1585c5..3c194f0a74e4 100644
--- a/dev-python/cherrypy/cherrypy-18.5.0.ebuild
+++ b/dev-python/cherrypy/cherrypy-18.5.0.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 x86"
IUSE="ssl test"
RDEPEND=">=dev-python/cheroot-8.2.1[${PYTHON_USEDEP}]
diff --git a/dev-python/clang-python/clang-python-10.0.0.ebuild b/dev-python/clang-python/clang-python-10.0.0.ebuild
index 55385ff45617..f0886b6c9c3f 100644
--- a/dev-python/clang-python/clang-python-10.0.0.ebuild
+++ b/dev-python/clang-python/clang-python-10.0.0.ebuild
@@ -13,7 +13,7 @@ llvm.org_set_globals
LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~x86"
IUSE="test"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
RESTRICT="!test? ( test )"
diff --git a/dev-python/click-default-group/click-default-group-1.2.2.ebuild b/dev-python/click-default-group/click-default-group-1.2.2.ebuild
index edf62155eec3..ecc753222cf1 100644
--- a/dev-python/click-default-group/click-default-group-1.2.2.ebuild
+++ b/dev-python/click-default-group/click-default-group-1.2.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/click-contrib/${PN}/archive/v${PV}.tar.gz -> ${P}.ta
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~ppc ~ppc64 sparc x86"
RDEPEND="dev-python/click[${PYTHON_USEDEP}]"
BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/cloudpickle/cloudpickle-1.4.1.ebuild b/dev-python/cloudpickle/cloudpickle-1.4.1.ebuild
index a9f5293b0924..ffd4fa45f18a 100644
--- a/dev-python/cloudpickle/cloudpickle-1.4.1.ebuild
+++ b/dev-python/cloudpickle/cloudpickle-1.4.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
BDEPEND="
test? (
diff --git a/dev-python/configobj/configobj-5.0.6.ebuild b/dev-python/configobj/configobj-5.0.6.ebuild
index ef9974e7a717..70a8bf984564 100644
--- a/dev-python/configobj/configobj-5.0.6.ebuild
+++ b/dev-python/configobj/configobj-5.0.6.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
diff --git a/dev-python/cppy/cppy-1.1.0.ebuild b/dev-python/cppy/cppy-1.1.0.ebuild
index e441a5e5ed02..52f05ad9821d 100644
--- a/dev-python/cppy/cppy-1.1.0.ebuild
+++ b/dev-python/cppy/cppy-1.1.0.ebuild
@@ -13,6 +13,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
distutils_enable_tests pytest
diff --git a/dev-python/dicttoxml/dicttoxml-1.7.4-r1.ebuild b/dev-python/dicttoxml/dicttoxml-1.7.4-r1.ebuild
index 5544ba09be89..e66ba0e7cee2 100644
--- a/dev-python/dicttoxml/dicttoxml-1.7.4-r1.ebuild
+++ b/dev-python/dicttoxml/dicttoxml-1.7.4-r1.ebuild
@@ -12,4 +12,4 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
diff --git a/dev-python/django/django-3.0.6.ebuild b/dev-python/django/django-3.0.6.ebuild
index 7e80304959ab..b8fb17375cf5 100644
--- a/dev-python/django/django-3.0.6.ebuild
+++ b/dev-python/django/django-3.0.6.ebuild
@@ -23,7 +23,7 @@ LICENSE+=" Apache-2.0"
# admin icons, jquery, xregexp.js
LICENSE+=" MIT"
SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 x86"
IUSE="doc sqlite test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/elementpath/elementpath-1.4.5.ebuild b/dev-python/elementpath/elementpath-1.4.5.ebuild
index 5cd74ecf88b4..545914f1a7b0 100644
--- a/dev-python/elementpath/elementpath-1.4.5.ebuild
+++ b/dev-python/elementpath/elementpath-1.4.5.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~ppc ~ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~ppc ~ppc64 sparc x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/frozen-flask/frozen-flask-0.15.ebuild b/dev-python/frozen-flask/frozen-flask-0.15.ebuild
index 7c56458ab8b6..bf4745f067cd 100644
--- a/dev-python/frozen-flask/frozen-flask-0.15.ebuild
+++ b/dev-python/frozen-flask/frozen-flask-0.15.ebuild
@@ -10,7 +10,7 @@ MY_PN="Frozen-Flask"
MY_P="${MY_PN}-${PV}"
DESCRIPTION="Freezes a Flask application into a set of static files"
-HOMEPAGE="https://github.com/SimonSapin/Frozen-Flask https://pypi.org/project/Frozen-Flask/"
+HOMEPAGE="https://github.com/Frozen-Flask/Frozen-Flask https://pypi.org/project/Frozen-Flask/"
SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/frozen-flask/metadata.xml b/dev-python/frozen-flask/metadata.xml
index d142ed38f2cd..7a2661fc5876 100644
--- a/dev-python/frozen-flask/metadata.xml
+++ b/dev-python/frozen-flask/metadata.xml
@@ -7,6 +7,6 @@
Frozen-Flask
- SimonSapin/Frozen-Flask
+ Frozen-Flask/Frozen-Flask
diff --git a/dev-python/geventhttpclient/Manifest b/dev-python/geventhttpclient/Manifest
index 6f2baae226d8..64e53ed868e3 100644
--- a/dev-python/geventhttpclient/Manifest
+++ b/dev-python/geventhttpclient/Manifest
@@ -1,2 +1,3 @@
DIST geventhttpclient-1.3.1.tar.gz 82598 BLAKE2B 5fef20a74c431ed53be4eedb3ec7e040572ad960363d41dda8b93c8f08f3eb05ba6160676c1c3ed957d1528a12aa297400063377f3788754e9e76401bb3421ae SHA512 a50486e1485c449a821176f0aa139cb05a3c7675fb045086e086cc7bb71d6e1d75191fae6972b381e7e69dba89d23c387464503845badd29fa361e03aa866079
DIST geventhttpclient-1.4.2.tar.gz 57535 BLAKE2B f3c17140698b1609d9953110790fb536d982782c60165c717b6cee290c0b8fa5ae99cd6935401b6b617f0bd021783dd3f836c7cff775f513b9084714da1575a7 SHA512 3252d27f07a4642ba34d449664f50451b2ca4e44dc508345133d21acf659251a66be72784bacd312c074de4025dd5e080bdf35c84d9f7d40057132184a4d285d
+DIST geventhttpclient-1.4.3.tar.gz 57541 BLAKE2B 6b28cba862eb01bb1a298c2e228eac4f4bfbf91cd138d0e77f54a91184672f089d3233b7287940b3892fd7e732c924612044abba0704054112f8c0563d9ed741 SHA512 1360a95d367b3bbf03294be916f70f8c2e655b77180a7ff44e67a40508584500e4a0017416639c0a90a974fe53cc7895dc9c3f7bf43d3a34fc4484f804793c21
diff --git a/dev-python/geventhttpclient/geventhttpclient-1.4.3.ebuild b/dev-python/geventhttpclient/geventhttpclient-1.4.3.ebuild
new file mode 100644
index 000000000000..4d3f4094b52b
--- /dev/null
+++ b/dev-python/geventhttpclient/geventhttpclient-1.4.3.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python{2_7,3_{6,7,8,9}} )
+
+inherit distutils-r1
+
+DESCRIPTION="A high performance, concurrent HTTP client library for Python using gevent"
+HOMEPAGE="https://github.com/gwik/geventhttpclient"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ dev-python/certifi[${PYTHON_USEDEP}]
+ dev-python/gevent[${PYTHON_USEDEP}]
+ dev-python/six[${PYTHON_USEDEP}]
+"
+BDEPEND="
+ test? (
+ ${RDEPEND}
+ dev-python/mock[${PYTHON_USEDEP}]
+ dev-python/pytest[${PYTHON_USEDEP}]
+ )
+"
+
+python_prepare_all() {
+ # Skip SNI tests which require dpkt
+ sed -i '/^import dpkt.ssl/d' src/geventhttpclient/tests/test_ssl.py || die
+ distutils-r1_python_prepare_all
+}
+
+python_test() {
+ local skipped_tests=(
+ # Require dpkt
+ src/geventhttpclient/tests/test_ssl.py::test_implicit_sni_from_host_in_ssl
+ src/geventhttpclient/tests/test_ssl.py::test_implicit_sni_from_header_in_ssl
+ src/geventhttpclient/tests/test_ssl.py::test_explicit_sni_in_ssl
+ )
+ # Append to sys.path to avoid ImportError
+ # https://bugs.gentoo.org/667758
+ # Skip tests which require internet access
+ pytest --import-mode=append -vv ${skipped_tests[@]/#/--deselect } \
+ -m "not online" || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/hypothesis/hypothesis-5.16.0.ebuild b/dev-python/hypothesis/hypothesis-5.16.0.ebuild
index 494668bd6a8e..81f7303b7f82 100644
--- a/dev-python/hypothesis/hypothesis-5.16.0.ebuild
+++ b/dev-python/hypothesis/hypothesis-5.16.0.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${PN}-${PN}-python-${PV}/${PN}-python"
LICENSE="MPL-2.0"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~ppc ~ppc64 sparc ~x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/importlib_resources/Manifest b/dev-python/importlib_resources/Manifest
index 15a372764ddf..1d1473b6b5b3 100644
--- a/dev-python/importlib_resources/Manifest
+++ b/dev-python/importlib_resources/Manifest
@@ -1,2 +1,3 @@
DIST importlib_resources-1.5.0.tar.gz 23660 BLAKE2B aed7a2d730f945505083812355a63d3a88e07b057cf46394f3475135143e535e33dc3ebded24d233797020c805dc35decf5c5ce53758798b093f03f2951daa87 SHA512 34d14c1ff3121cc6f9ef1d3d4417831e3476e9facfcc9b35152c28a59a2c75d7723f171f4b48852f79ec46cbf54b066580745744bc54d349e2bfe12a353a9aed
DIST importlib_resources-2.0.1.tar.gz 26060 BLAKE2B 739cd7fd90cc12b5b586eb1bf3386b85cde2399e80cfe05cae5173ba5177fb1d15f7e44e7f78473ef03e37d563861f57b7c470782d1aab161eae4c40d530ca29 SHA512 7f62c5bb5650dd2689a41ddef2e9131f01d5edc99b284a7a4257fce18190f2e78c38a2c260d6fe5e6db122666435e079c417bd9011e68e35724932854c90a1bd
+DIST importlib_resources-3.0.0.tar.gz 26725 BLAKE2B e2517b0d1e576ce949ac05230892acbad59c09fa4b84401b3c957e83f40b50d12bc02360b135fe949d12c43f8f557006824e4e4a3e9ff2ce879c03362569a00c SHA512 cd29e268cacef3729024af6cae8394ce5aa8c1d8a28397fd8f009c7eaa908ed3775508bde86c26b0d233c25261b8509abb1e16c378c7c8a9bb0906224f3fdd54
diff --git a/dev-python/importlib_resources/importlib_resources-3.0.0-r1.ebuild b/dev-python/importlib_resources/importlib_resources-3.0.0-r1.ebuild
new file mode 100644
index 000000000000..8de5a9670ffd
--- /dev/null
+++ b/dev-python/importlib_resources/importlib_resources-3.0.0-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# This is a backport of Python 3.9's importlib.resources
+PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7,8}} )
+
+inherit distutils-r1
+
+DESCRIPTION="Read resources from Python packages"
+HOMEPAGE="https://importlib-resources.readthedocs.io/en/latest/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+
+RDEPEND="
+ $(python_gen_cond_dep '
+ dev-python/contextlib2[${PYTHON_USEDEP}]
+ dev-python/pathlib2[${PYTHON_USEDEP}]
+ dev-python/singledispatch[${PYTHON_USEDEP}]
+ dev-python/typing[${PYTHON_USEDEP}]
+ ' -2)
+ $(python_gen_cond_dep '
+ dev-python/zipp[${PYTHON_USEDEP}]
+ ' -2 pypy3 python3_{6,7})
+"
+BDEPEND="
+ dev-python/toml[${PYTHON_USEDEP}]
+ >=dev-python/setuptools_scm-3.4.1[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests unittest
+distutils_enable_sphinx docs dev-python/rst-linker dev-python/jaraco-packaging
+
+python_compile() {
+ distutils-r1_python_compile
+ if ! python_is_python3; then
+ rm "${BUILD_DIR}/lib/importlib_resources/_py3.py" || die
+ fi
+}
+
+python_install() {
+ distutils-r1_python_install --skip-build
+}
diff --git a/dev-python/incremental/incremental-17.5.0.ebuild b/dev-python/incremental/incremental-17.5.0.ebuild
index 4ef2d97ce5f4..3ede4a78f6f1 100644
--- a/dev-python/incremental/incremental-17.5.0.ebuild
+++ b/dev-python/incremental/incremental-17.5.0.ebuild
@@ -8,7 +8,7 @@ DISTUTILS_USE_SETUPTOOLS=rdepend
inherit distutils-r1
DESCRIPTION="Incremental is a small library that versions your Python projects"
-HOMEPAGE="https://github.com/hawkowl/incremental https://pypi.org/project/incremental/"
+HOMEPAGE="https://github.com/twisted/incremental https://pypi.org/project/incremental/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/incremental/metadata.xml b/dev-python/incremental/metadata.xml
index 090da7e79e74..178cdb1dc9ea 100644
--- a/dev-python/incremental/metadata.xml
+++ b/dev-python/incremental/metadata.xml
@@ -11,6 +11,6 @@
Amber Brown
incremental
- hawkowl/incremental
+ twisted/incremental
diff --git a/dev-python/intelhex/intelhex-2.2.1-r1.ebuild b/dev-python/intelhex/intelhex-2.2.1-r1.ebuild
index 8d8d9bcfffbc..1ff64afbdb08 100644
--- a/dev-python/intelhex/intelhex-2.2.1-r1.ebuild
+++ b/dev-python/intelhex/intelhex-2.2.1-r1.ebuild
@@ -9,7 +9,7 @@ PYTHON_COMPAT=( python3_{6,7,8} )
inherit distutils-r1
DESCRIPTION="Python library for Intel HEX files manipulations"
-HOMEPAGE="https://pypi.org/project/IntelHex/ https://github.com/bialix/intelhex"
+HOMEPAGE="https://pypi.org/project/IntelHex/ https://github.com/python-intelhex/intelhex"
SRC_URI="mirror://pypi/I/IntelHex/${P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/intelhex/metadata.xml b/dev-python/intelhex/metadata.xml
index 90caf113b01a..efa5242c52cb 100644
--- a/dev-python/intelhex/metadata.xml
+++ b/dev-python/intelhex/metadata.xml
@@ -7,6 +7,6 @@
IntelHex
- bialix/intelhex
+ python-intelhex/intelhex
diff --git a/dev-python/ipy/ipy-1.00.ebuild b/dev-python/ipy/ipy-1.00.ebuild
index afbead463014..79f544a9c627 100644
--- a/dev-python/ipy/ipy-1.00.ebuild
+++ b/dev-python/ipy/ipy-1.00.ebuild
@@ -11,7 +11,7 @@ MY_PN="IPy"
MY_P="${MY_PN}-${PV}"
DESCRIPTION="Class and tools for handling of IPv4 and IPv6 addresses and networks"
-HOMEPAGE="https://github.com/haypo/python-ipy/wiki https://pypi.org/project/IPy/"
+HOMEPAGE="https://github.com/autocracy/python-ipy/wiki https://pypi.org/project/IPy/"
SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/ipy/metadata.xml b/dev-python/ipy/metadata.xml
index 13405b9629d2..4ec74958c566 100644
--- a/dev-python/ipy/metadata.xml
+++ b/dev-python/ipy/metadata.xml
@@ -7,6 +7,6 @@
IPy
- haypo/python-ipy
+ autocracy/python-ipy
diff --git a/dev-python/isort/isort-4.3.21_p2-r1.ebuild b/dev-python/isort/isort-4.3.21_p2-r1.ebuild
index a6450aede40b..ccbf059104a5 100644
--- a/dev-python/isort/isort-4.3.21_p2-r1.ebuild
+++ b/dev-python/isort/isort-4.3.21_p2-r1.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${PN}-${MY_PV}"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~ia64 ppc ppc64 sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc ~x86"
RDEPEND="
dev-python/pipfile[${PYTHON_USEDEP}]
diff --git a/dev-python/jaraco-classes/jaraco-classes-3.1.0.ebuild b/dev-python/jaraco-classes/jaraco-classes-3.1.0.ebuild
index 72a6f7164ec9..c481c7d3e84e 100644
--- a/dev-python/jaraco-classes/jaraco-classes-3.1.0.ebuild
+++ b/dev-python/jaraco-classes/jaraco-classes-3.1.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/jaraco-collections/jaraco-collections-3.0.0.ebuild b/dev-python/jaraco-collections/jaraco-collections-3.0.0.ebuild
index 680c710ccb08..8faa9577fa49 100644
--- a/dev-python/jaraco-collections/jaraco-collections-3.0.0.ebuild
+++ b/dev-python/jaraco-collections/jaraco-collections-3.0.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/jaraco-functools/jaraco-functools-3.0.1.ebuild b/dev-python/jaraco-functools/jaraco-functools-3.0.1.ebuild
index 21d365d3af3d..d710dab91887 100644
--- a/dev-python/jaraco-functools/jaraco-functools-3.0.1.ebuild
+++ b/dev-python/jaraco-functools/jaraco-functools-3.0.1.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/jaraco-text/jaraco-text-3.2.0.ebuild b/dev-python/jaraco-text/jaraco-text-3.2.0.ebuild
index 9a3c00ccc7dd..2a6a242eb065 100644
--- a/dev-python/jaraco-text/jaraco-text-3.2.0.ebuild
+++ b/dev-python/jaraco-text/jaraco-text-3.2.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/jsondiff/jsondiff-1.2.0.ebuild b/dev-python/jsondiff/jsondiff-1.2.0.ebuild
index 83f6954f2d86..bf249970d18f 100644
--- a/dev-python/jsondiff/jsondiff-1.2.0.ebuild
+++ b/dev-python/jsondiff/jsondiff-1.2.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/fzumstein/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
BDEPEND="
test? (
diff --git a/dev-python/kiwisolver/kiwisolver-1.2.0.ebuild b/dev-python/kiwisolver/kiwisolver-1.2.0.ebuild
index 2d2ec37813ab..4ffa6137e5e2 100644
--- a/dev-python/kiwisolver/kiwisolver-1.2.0.ebuild
+++ b/dev-python/kiwisolver/kiwisolver-1.2.0.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}"/kiwi-${PV}
LICENSE="Clear-BSD"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
RDEPEND="
>=dev-python/cppy-1.1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/lit/lit-10.0.0.ebuild b/dev-python/lit/lit-10.0.0.ebuild
index 55b531a08716..75ceb7ef0556 100644
--- a/dev-python/lit/lit-10.0.0.ebuild
+++ b/dev-python/lit/lit-10.0.0.ebuild
@@ -15,7 +15,7 @@ llvm.org_set_globals
LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/markdown2/markdown2-2.3.9.ebuild b/dev-python/markdown2/markdown2-2.3.9.ebuild
index 34140e887c9c..9a9a8370c9ed 100644
--- a/dev-python/markdown2/markdown2-2.3.9.ebuild
+++ b/dev-python/markdown2/markdown2-2.3.9.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://github.com/trentm/python-markdown2"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux"
RDEPEND="dev-python/pygments[${PYTHON_USEDEP}]"
diff --git a/dev-python/matplotlib/matplotlib-3.2.1.ebuild b/dev-python/matplotlib/matplotlib-3.2.1.ebuild
index 5f616ebccb19..33f602a189db 100644
--- a/dev-python/matplotlib/matplotlib-3.2.1.ebuild
+++ b/dev-python/matplotlib/matplotlib-3.2.1.ebuild
@@ -23,7 +23,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
# Fonts: BitstreamVera, OFL-1.1
LICENSE="BitstreamVera BSD matplotlib MIT OFL-1.1"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
IUSE="cairo doc excel examples gtk3 latex qt5 tk wxwidgets"
# internal copy of pycxx highly patched
diff --git a/dev-python/networkx/networkx-2.4-r1.ebuild b/dev-python/networkx/networkx-2.4-r1.ebuild
index ef197baa3467..162e31bbac9c 100644
--- a/dev-python/networkx/networkx-2.4-r1.ebuild
+++ b/dev-python/networkx/networkx-2.4-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE="examples extras pandas scipy test xml yaml"
RESTRICT="!test? ( test )"
diff --git a/dev-python/nose-random/nose-random-1.0.0.ebuild b/dev-python/nose-random/nose-random-1.0.0.ebuild
index 973cf59a42b7..661b2bfb4ebf 100644
--- a/dev-python/nose-random/nose-random-1.0.0.ebuild
+++ b/dev-python/nose-random/nose-random-1.0.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/fzumstein/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
RDEPEND="dev-python/nose[${PYTHON_USEDEP}]"
diff --git a/dev-python/numpy/numpy-1.18.5.ebuild b/dev-python/numpy/numpy-1.18.5.ebuild
index eb27fd1bee00..cb014a08a67d 100644
--- a/dev-python/numpy/numpy-1.18.5.ebuild
+++ b/dev-python/numpy/numpy-1.18.5.ebuild
@@ -24,7 +24,7 @@ SRC_URI="
)"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="doc lapack"
RDEPEND="
diff --git a/dev-python/numpydoc/Manifest b/dev-python/numpydoc/Manifest
index 400c35f3121d..4373ddddf55b 100644
--- a/dev-python/numpydoc/Manifest
+++ b/dev-python/numpydoc/Manifest
@@ -1,2 +1,3 @@
DIST numpydoc-0.9.1.tar.gz 27583 BLAKE2B 91764f74b35a740790efa9faade69622d48777fe97a62824b91d78ebf62f806f8c5ec34b1e6c4a4afee6e87358edfa40ca0d316ea41f7ed8501733a51797611b SHA512 85a47ed86823baa3125dde4bb2760ce56f6fed9bb29dc64187dee4101f6344b5065146209f603d50a84a5d9cf0b7f4e5134fc0b495219e68100e05e028b61f2a
DIST numpydoc-0.9.2.tar.gz 27555 BLAKE2B 47b7788c502a26c40889c84563c0b94983655a653fa1f783f47d667021c65c7ffc0d2cdd14a16dfcb982da48642c0b07c949f57336d5b67c897a78815684bcac SHA512 db8f5c3b409ece0a40f1c2ccb06eaa182896d173a5c913c7e6c5780fd021d746c48557fee6f050db8c42cfa41a5021901342bbb93dfd8b8daf7d43fead9cf94a
+DIST numpydoc-1.1.0.tar.gz 609482 BLAKE2B 475be835a760dd148b7132a3149a1b79193425b70bbaa51b29a3909c73ed11a933181c917a0f0d0b56d8d30baced2142897e0a931b5eeb6449092d0a2a81632b SHA512 10dfc5e40ca851401be7d7cca3cbf24bf8ded8573c01344976321cd65fe351d985ee0bf48a92a485a43f8fb191c246e4822545a1583c87c1214d819a5fdfc106
diff --git a/dev-python/numpydoc/numpydoc-1.1.0.ebuild b/dev-python/numpydoc/numpydoc-1.1.0.ebuild
new file mode 100644
index 000000000000..442eae403592
--- /dev/null
+++ b/dev-python/numpydoc/numpydoc-1.1.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Sphinx extension to support docstrings in Numpy format"
+HOMEPAGE="https://pypi.org/project/numpydoc/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+
+RDEPEND="
+ dev-python/jinja[${PYTHON_USEDEP}]
+ dev-python/sphinx[${PYTHON_USEDEP}]
+"
+BDEPEND="
+ test? (
+ >=dev-python/matplotlib-3.2.1[${PYTHON_USEDEP}]
+ )
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+ sed -i -e 's:--cov-report= --cov=numpydoc::' setup.cfg || die
+
+ # these require Internet (intersphinx)
+ sed -e 's:test_MyClass:_&:' \
+ -e 's:test_my_function:_&:' \
+ -i numpydoc/tests/test_full.py || die
+
+ distutils-r1_src_prepare
+}
+
+python_test() {
+ pytest -vv --pyargs numpydoc || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/objgraph/objgraph-3.4.1.ebuild b/dev-python/objgraph/objgraph-3.4.1.ebuild
index 9d9fca972a5f..e4146e4f9b3c 100644
--- a/dev-python/objgraph/objgraph-3.4.1.ebuild
+++ b/dev-python/objgraph/objgraph-3.4.1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://mg.pov.lt/objgraph/"
SRC_URI="mirror://pypi/o/${PN}/${P}.tar.gz"
LICENSE="MIT"
-KEYWORDS="~amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
SLOT="0"
IUSE="doc"
diff --git a/dev-python/parameterized/parameterized-0.7.4.ebuild b/dev-python/parameterized/parameterized-0.7.4.ebuild
index 31b1b638ad95..a402f340e284 100644
--- a/dev-python/parameterized/parameterized-0.7.4.ebuild
+++ b/dev-python/parameterized/parameterized-0.7.4.ebuild
@@ -13,6 +13,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
distutils_enable_tests nose
diff --git a/dev-python/passlib/passlib-1.7.2.ebuild b/dev-python/passlib/passlib-1.7.2.ebuild
index b73ac55fce4b..7785f63d58f5 100644
--- a/dev-python/passlib/passlib-1.7.2.ebuild
+++ b/dev-python/passlib/passlib-1.7.2.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://foss.heptapod.net/python-libs/passlib/wikis/home"
SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
LICENSE="BSD-2"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~ppc ~ppc64 sparc x86"
SLOT="0"
IUSE="+bcrypt doc +scrypt +totp"
diff --git a/dev-python/pillow/pillow-7.1.2.ebuild b/dev-python/pillow/pillow-7.1.2.ebuild
index 71526b251ea9..473f42c783f0 100644
--- a/dev-python/pillow/pillow-7.1.2.ebuild
+++ b/dev-python/pillow/pillow-7.1.2.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}"
LICENSE="HPND"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
IUSE="examples imagequant jpeg jpeg2k lcms test tiff tk truetype webp xcb zlib"
REQUIRED_USE="test? ( jpeg tiff )"
RESTRICT="!test? ( test )"
diff --git a/dev-python/pipfile/pipfile-0.0.2.ebuild b/dev-python/pipfile/pipfile-0.0.2.ebuild
index 9845ba0ce4a8..3d58625f753a 100644
--- a/dev-python/pipfile/pipfile-0.0.2.ebuild
+++ b/dev-python/pipfile/pipfile-0.0.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/pypa/pipfile/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="Apache-2.0 BSD-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~ia64 ppc ppc64 sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc ~x86"
RDEPEND="dev-python/toml[${PYTHON_USEDEP}]"
BDEPEND="${RDEPEND}
diff --git a/dev-python/pkginfo/pkginfo-1.5.0.1.ebuild b/dev-python/pkginfo/pkginfo-1.5.0.1.ebuild
index d53afeb7c882..691b93ab8084 100644
--- a/dev-python/pkginfo/pkginfo-1.5.0.1.ebuild
+++ b/dev-python/pkginfo/pkginfo-1.5.0.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86"
IUSE="doc"
distutils_enable_tests nose
diff --git a/dev-python/protobuf-python/Manifest b/dev-python/protobuf-python/Manifest
index 81632cac52b0..91e20f9553ba 100644
--- a/dev-python/protobuf-python/Manifest
+++ b/dev-python/protobuf-python/Manifest
@@ -1 +1,2 @@
DIST protobuf-3.11.4.tar.gz 5140799 BLAKE2B 97b450c0623593efe6a42b66582ff183344b8831689e6a5b4d36096dbd57c33da9569bbf26578536aaf73ecd866ac0588b6cb7d55a6a9b9a6e840d4c57099001 SHA512 777bbb0e9e2375eaebe6b8c87abd660bac70ee469c9ad00dd25917b82d7fb5bbe33cf87f0d69c90e19d55c07a7285ec20974ba4768623ce9ccfadf147fd5e261
+DIST protobuf-3.12.2.tar.gz 5309688 BLAKE2B 6f04ab75a165d8135b4c1de210f8698f56f309f73d664192209de10580e0ef850bf56f6f394b860f21912e341141f7bbb1f63198eaee55fd7ad74d86b00c3b1f SHA512 84a349a1dcb5bce6a6a892cf11264390b557ed1e7b05883b71fa9cfb7460d9f73119da1f2861066869e33c752246ea438d5ce2c2b3ff7a4b07696d9450b7916b
diff --git a/dev-python/protobuf-python/protobuf-python-3.12.2.ebuild b/dev-python/protobuf-python/protobuf-python-3.12.2.ebuild
new file mode 100644
index 000000000000..c8110e56cd84
--- /dev/null
+++ b/dev-python/protobuf-python/protobuf-python-3.12.2.ebuild
@@ -0,0 +1,63 @@
+# Copyright 2008-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_COMPAT=(python{2_7,3_6,3_7,3_8})
+DISTUTILS_USE_SETUPTOOLS="manual"
+
+inherit distutils-r1
+
+if [[ "${PV}" == "9999" ]]; then
+ inherit git-r3
+
+ EGIT_REPO_URI="https://github.com/protocolbuffers/protobuf"
+ EGIT_SUBMODULES=()
+fi
+
+DESCRIPTION="Google's Protocol Buffers - Python bindings"
+HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf"
+if [[ "${PV}" == "9999" ]]; then
+ SRC_URI=""
+else
+ SRC_URI="https://github.com/protocolbuffers/protobuf/archive/v${PV}.tar.gz -> protobuf-${PV}.tar.gz"
+fi
+
+LICENSE="BSD"
+SLOT="0/23"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE=""
+
+BDEPEND="${PYTHON_DEPS}
+ ~dev-libs/protobuf-${PV}
+ dev-python/namespace-google[${PYTHON_USEDEP}]
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ dev-python/six[${PYTHON_USEDEP}]"
+DEPEND="${PYTHON_DEPS}
+ ~dev-libs/protobuf-${PV}"
+RDEPEND="${BDEPEND}
+ !pyproj
pyproj
- jswhit/pyproj
+ pyproj4/pyproj
diff --git a/dev-python/pyproj/pyproj-2.4.2-r1.ebuild b/dev-python/pyproj/pyproj-2.4.2-r1.ebuild
index df41d38524cc..2a90bfb128a2 100644
--- a/dev-python/pyproj/pyproj-2.4.2-r1.ebuild
+++ b/dev-python/pyproj/pyproj-2.4.2-r1.ebuild
@@ -9,7 +9,7 @@ PYTHON_COMPAT=( python3_{6,7,8} )
inherit distutils-r1
DESCRIPTION="Python interface to the PROJ library"
-HOMEPAGE="https://github.com/jswhit/pyproj"
+HOMEPAGE="https://github.com/pyproj4/pyproj"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/pyquery/pyquery-1.4.1-r1.ebuild b/dev-python/pyquery/pyquery-1.4.1-r1.ebuild
index 8e7fb742bda8..a525b1fb3f95 100644
--- a/dev-python/pyquery/pyquery-1.4.1-r1.ebuild
+++ b/dev-python/pyquery/pyquery-1.4.1-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~ppc ppc64 s390 sparc x86"
IUSE="test"
RDEPEND="
diff --git a/dev-python/pytest-localserver/pytest-localserver-0.5.0.ebuild b/dev-python/pytest-localserver/pytest-localserver-0.5.0.ebuild
index 25e11c83f598..f2d356ba54ca 100644
--- a/dev-python/pytest-localserver/pytest-localserver-0.5.0.ebuild
+++ b/dev-python/pytest-localserver/pytest-localserver-0.5.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~ppc ~ppc64 sparc x86"
RDEPEND=">=dev-python/werkzeug-0.10[${PYTHON_USEDEP}]"
BDEPEND="
diff --git a/dev-python/pytest-services/pytest-services-2.0.1.ebuild b/dev-python/pytest-services/pytest-services-2.0.1.ebuild
index 8875cb0a0719..1309c5837b86 100644
--- a/dev-python/pytest-services/pytest-services-2.0.1.ebuild
+++ b/dev-python/pytest-services/pytest-services-2.0.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/pytest-dev/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 x86"
IUSE="test"
RDEPEND="
diff --git a/dev-python/pytest-virtualenv/pytest-virtualenv-1.7.0-r1.ebuild b/dev-python/pytest-virtualenv/pytest-virtualenv-1.7.0-r1.ebuild
index 238b2714e536..432c97688576 100644
--- a/dev-python/pytest-virtualenv/pytest-virtualenv-1.7.0-r1.ebuild
+++ b/dev-python/pytest-virtualenv/pytest-virtualenv-1.7.0-r1.ebuild
@@ -23,6 +23,7 @@ RDEPEND="
dev-python/virtualenv[${PYTHON_USEDEP}]
"
BDEPEND="
+ dev-python/setuptools-git[${PYTHON_USEDEP}]
test? (
dev-python/mock[${PYTHON_USEDEP}]
)
diff --git a/dev-python/pytest-virtualenv/pytest-virtualenv-1.7.0.ebuild b/dev-python/pytest-virtualenv/pytest-virtualenv-1.7.0.ebuild
index 2a2037b22018..9fb5ec3100f4 100644
--- a/dev-python/pytest-virtualenv/pytest-virtualenv-1.7.0.ebuild
+++ b/dev-python/pytest-virtualenv/pytest-virtualenv-1.7.0.ebuild
@@ -23,6 +23,7 @@ RDEPEND="
dev-python/virtualenv[${PYTHON_USEDEP}]
"
BDEPEND="
+ dev-python/setuptools-git[${PYTHON_USEDEP}]
test? (
dev-python/mock[${PYTHON_USEDEP}]
)
diff --git a/dev-python/pytest/pytest-4.6.11.ebuild b/dev-python/pytest/pytest-4.6.11.ebuild
index bc5454e1edee..e8c7ad74937a 100644
--- a/dev-python/pytest/pytest-4.6.11.ebuild
+++ b/dev-python/pytest/pytest-4.6.11.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ~ppc64 ~sparc x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/pytest/pytest-5.4.2.ebuild b/dev-python/pytest/pytest-5.4.2.ebuild
index c8caedd2dddb..ca4430ada62a 100644
--- a/dev-python/pytest/pytest-5.4.2.ebuild
+++ b/dev-python/pytest/pytest-5.4.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~ppc ~ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~ppc ~ppc64 sparc x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/python-bugzilla/Manifest b/dev-python/python-bugzilla/Manifest
index 7b85b75efb38..94db4d8e6dbd 100644
--- a/dev-python/python-bugzilla/Manifest
+++ b/dev-python/python-bugzilla/Manifest
@@ -1,3 +1,4 @@
DIST python-bugzilla-2.1.0.tar.gz 78791 BLAKE2B 31819e04ea5627b5513c22e9cb963cdea4d1ef8d6d4db78d14bf08b8b5fb373afaad4bddb2bc0b05d4637f966bf8b4f3699ace58ceff8ea226d9ffd4aacc7f61 SHA512 40dd331e2dbb4d70ce6d356eb800d6242ef9878112310087761c8dccb7f05b259f0f5fdee6821713a84c68f1e5f9e0bb6ee45542bc385f00822b97344371239e
DIST python-bugzilla-2.3.0.tar.gz 79002 BLAKE2B d3aaeaebf25bd56286fa1c4adcbf154ff2d84a28918bd1fd80e1f83b30bfe0f54f7418c75afc446c60046d69cf4ff6219718434158ce9cf040b0b2f7b94136ec SHA512 cd6e1c3f142ad74b8165fdd503ebaeb5e512ad8055dfc1e47e794908ac21cece6e39365544b94c123067f1d6527b65765431f2656336086e6dda940e446b763b
DIST python-bugzilla-2.4.0.tar.gz 109556 BLAKE2B cf2c7a5a0f491e92c484f2270ab6c8cf67e4ea87419000474ee8ca80e2b406a837d699915fd3c76f62dd79e4338a7276e88ed653fd0d81efcefba5e259559129 SHA512 cbe1d735d4a733eb91d5c6f278a1b7c23a0b142a515eb8a4efed1bf0446a692afa9780f6bfd99e21a079cd4921c4b11d20f65596886b2eba3ba08abdc8593515
+DIST python-bugzilla-2.5.0.tar.gz 110931 BLAKE2B e7a4dc0ee00abd4bd4c55aafac8a8d2902ade116b9f35d881c3ea07441b340dc247405951b5437545720c1742f54aae3c28fe64f93191a4d7f178a3cd2db7a0e SHA512 a840db5790a7f45cdcf6ef9e261d86c6b930db30ab6340a1f351b3fd32f32e4d0f6afb68af9befef5d4e84969d568471c5c236be047f6dbab52534af3570a244
diff --git a/dev-python/python-bugzilla/python-bugzilla-2.5.0.ebuild b/dev-python/python-bugzilla/python-bugzilla-2.5.0.ebuild
new file mode 100644
index 000000000000..4b57c486410d
--- /dev/null
+++ b/dev-python/python-bugzilla/python-bugzilla-2.5.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="A python module for interacting with Bugzilla over XMLRPC"
+HOMEPAGE="https://github.com/python-bugzilla/python-bugzilla"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+KEYWORDS="~amd64 ~x86"
+LICENSE="GPL-2+"
+SLOT="0"
+
+RDEPEND="
+ || ( dev-python/python-magic[${PYTHON_USEDEP}] sys-apps/file[python,${PYTHON_USEDEP}] )
+ dev-python/requests[${PYTHON_USEDEP}]"
+BDEPEND="
+ dev-python/docutils[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
diff --git a/dev-python/python-jose/python-jose-3.1.0.ebuild b/dev-python/python-jose/python-jose-3.1.0.ebuild
index 58a59dfc0efc..245db2d0d907 100644
--- a/dev-python/python-jose/python-jose-3.1.0.ebuild
+++ b/dev-python/python-jose/python-jose-3.1.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/mpdavis/python-jose/archive/${PV}.tar.gz -> ${P}.tar
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
RDEPEND="
dev-python/cryptography[${PYTHON_USEDEP}]
diff --git a/dev-python/python-wpactrl/Manifest b/dev-python/python-wpactrl/Manifest
deleted file mode 100644
index 863aa847d92a..000000000000
--- a/dev-python/python-wpactrl/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST python-wpactrl-20081102.tar.bz2 16947 BLAKE2B 4e3171e786e44dc7894b00016d73530612d40f197b251af16fcd7236e2f75fe0f016e3ed6b1ea8a3c9a324ed5133d25a9be8b15305aba8aea88687e6aa6d4fcd SHA512 ddb059b846af21bacd9b6bfe0b5df3661a0d29dd5f56c2343eb24c462eed4771584d7b06a239e484bb89e69376d4e5784d79628cf962a063e640e62cb3b7f588
diff --git a/dev-python/python-wpactrl/metadata.xml b/dev-python/python-wpactrl/metadata.xml
deleted file mode 100644
index a5c911a491f5..000000000000
--- a/dev-python/python-wpactrl/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
- python@gentoo.org
- Python
-
-
diff --git a/dev-python/python-wpactrl/python-wpactrl-20081102-r1.ebuild b/dev-python/python-wpactrl/python-wpactrl-20081102-r1.ebuild
deleted file mode 100644
index 3f3978751861..000000000000
--- a/dev-python/python-wpactrl/python-wpactrl-20081102-r1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="A Python extension for wpa_supplicant/hostapd control interface access"
-HOMEPAGE="http://projects.otaku42.de/wiki/PythonWpaCtrl"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="|| ( GPL-2 BSD )"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
diff --git a/dev-python/readme_renderer/readme_renderer-25.0.ebuild b/dev-python/readme_renderer/readme_renderer-25.0.ebuild
index 2513f39528f9..52ac02be2de8 100644
--- a/dev-python/readme_renderer/readme_renderer-25.0.ebuild
+++ b/dev-python/readme_renderer/readme_renderer-25.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa sparc x86"
RDEPEND="
>=dev-python/bleach-2.1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/requests-toolbelt/requests-toolbelt-0.9.1.ebuild b/dev-python/requests-toolbelt/requests-toolbelt-0.9.1.ebuild
index 811fe75444f0..c0ad011c109f 100644
--- a/dev-python/requests-toolbelt/requests-toolbelt-0.9.1.ebuild
+++ b/dev-python/requests-toolbelt/requests-toolbelt-0.9.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~ppc ~ppc64 sparc x86"
IUSE="test"
RDEPEND=" ${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ppc ppc64 sparc ~x86"
# doc disabled because of missing deps in tree
IUSE="test"
diff --git a/dev-python/tqdm/tqdm-4.45.0.ebuild b/dev-python/tqdm/tqdm-4.45.0.ebuild
index 2c4a44d12e74..bb72c95335bc 100644
--- a/dev-python/tqdm/tqdm-4.45.0.ebuild
+++ b/dev-python/tqdm/tqdm-4.45.0.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]]; then
EGIT_REPO_URI="https://github.com/tqdm/tqdm"
else
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
- KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa sparc ~x86"
+ KEYWORDS="~alpha ~amd64 arm arm64 hppa sparc ~x86"
fi
DESCRIPTION="Add a progress meter to your loops in a second"
diff --git a/dev-python/translate-toolkit/translate-toolkit-2.5.0.ebuild b/dev-python/translate-toolkit/translate-toolkit-2.5.0.ebuild
index 8cb0310220df..282d9f9bccf0 100644
--- a/dev-python/translate-toolkit/translate-toolkit-2.5.0.ebuild
+++ b/dev-python/translate-toolkit/translate-toolkit-2.5.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/translate/translate/releases/download/${PV}/${P}.tar
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm64 ~x86 ~amd64-linux ~x86-linux"
IUSE="doc +html +ical +ini +subtitles +yaml"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-python/twine/twine-1.15.0.ebuild b/dev-python/twine/twine-1.15.0.ebuild
index 48fb322e6a9f..8bc1fbf5680f 100644
--- a/dev-python/twine/twine-1.15.0.ebuild
+++ b/dev-python/twine/twine-1.15.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/pypa/twine/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/virtualenv/virtualenv-16.7.10.ebuild b/dev-python/virtualenv/virtualenv-16.7.10.ebuild
index a50edc6e731b..4dfc7a77e14d 100644
--- a/dev-python/virtualenv/virtualenv-16.7.10.ebuild
+++ b/dev-python/virtualenv/virtualenv-16.7.10.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/pypa/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="MIT"
#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-KEYWORDS="~alpha ~amd64 arm ~arm64 hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~ppc ~ppc64 sparc ~x86 ~amd64-linux ~x86-linux"
SLOT="0"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/webtest/webtest-2.0.35.ebuild b/dev-python/webtest/webtest-2.0.35.ebuild
index 2a82d27844c9..da24b168973c 100644
--- a/dev-python/webtest/webtest-2.0.35.ebuild
+++ b/dev-python/webtest/webtest-2.0.35.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 sparc ~x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/wsgiproxy2/wsgiproxy2-0.4.6-r1.ebuild b/dev-python/wsgiproxy2/wsgiproxy2-0.4.6-r1.ebuild
index 0f5f947be439..ea77c586f964 100644
--- a/dev-python/wsgiproxy2/wsgiproxy2-0.4.6-r1.ebuild
+++ b/dev-python/wsgiproxy2/wsgiproxy2-0.4.6-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~ppc ppc64 s390 sparc x86"
RDEPEND="
dev-python/requests[${PYTHON_USEDEP}]
diff --git a/dev-python/xmlschema/xmlschema-1.1.3.ebuild b/dev-python/xmlschema/xmlschema-1.1.3.ebuild
index 970be7400279..3cf647432300 100644
--- a/dev-python/xmlschema/xmlschema-1.1.3.ebuild
+++ b/dev-python/xmlschema/xmlschema-1.1.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 sparc x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index 4f1152cc323b..72585a219f04 100644
Binary files a/dev-ruby/Manifest.gz and b/dev-ruby/Manifest.gz differ
diff --git a/dev-ruby/actioncable/Manifest b/dev-ruby/actioncable/Manifest
index 0055cbcdc29d..1bbbb8882dac 100644
--- a/dev-ruby/actioncable/Manifest
+++ b/dev-ruby/actioncable/Manifest
@@ -1,6 +1,2 @@
-DIST rails-5.2.4.2.tgz 8823143 BLAKE2B 273bee6ccc2354bcfd8d24b320fe69c24f643c196eba053c727d30b13d4178069068c430a0a4112ae28c3e4b5a5dde0b66a7c46c7c28054f2b7a678427f478af SHA512 21561407a0b606dbd2fb6ad12ef910c0bdf3d5162db7e55f4f41f698280ba73664b0b5594930d4cebcb42a66e2e5e22de3523789818eb424443e8c5b2316b8fc
DIST rails-5.2.4.3.tgz 8824955 BLAKE2B 7db1bdda581e345713b796152c68e13911076c0af752aa91016a559fb380ee33b5f1822576120940995968efa6351165af0e21f97ff2e201bc8250f7e3178089 SHA512 b01b454f38593b50788cecef4f2b25938b0e176d24476bf0a8145b581c7327e0d8572a62fab4256372b51d75a9463431bbd98470a31298a6ff4d5f81f7ff92ce
-DIST rails-6.0.2.2.tgz 18556125 BLAKE2B f4ed5cc6cbbfa84fb687aba5a6c8f2f6ab68febb41147c40ed8dbc6253c128adbac6503e65e89fe672f50270716d197d8c05b4e1e286aafd76581fc167e6c5da SHA512 c1aab2d6c72948c75a047aec9d9f651f0c1bae78bb17e2fa0cb393113ee1e59980dc093e6f3fd3b2f3839c9b3bb4afcd0b0badfd9574b35b932275a9d9800689
-DIST rails-6.0.3.1.tgz 18567937 BLAKE2B fe6b58c2cb389f766d356f983787ddd602ee835e90cdbe26c25586c1304aa8c80d4ace2e0956326c0dd428dcd51a624d68d64667c2294c326779498a809ea6c9 SHA512 fcdaff0b0e4877a53f89b2b69c9271213297db8df8abccd071da5f2b2d3e3e6855914e1059596903f761b9a3891b31c2fdf10e887183f4433b260f84c4ebccdf
DIST rails-6.0.3.2.tgz 18568792 BLAKE2B 574d4b7da1bf0ff308ca1a64369c16e29396c8faddf741bc0f2b7d0c0761e440d64dade6ef67ba4923045c7eab1cd0689d45b6b26f3e3077020157a2b29fb17f SHA512 ea019bef7facc1b8b0d2f181da45d70456a895f2d57eb2410e4a06ba7bea0165dacc0f15fe5080150e4b4ef3c81dacee70b200468232da857fdf60def85b5aec
-DIST rails-6.0.3.tgz 18565682 BLAKE2B fe8601aec070535f487801eec16d944809be824e4833b7a906b47b4099dd5e72515ac3e492e4301dd651657fc2c4547ecbdd2c12265e04aad2758e9e284ad385 SHA512 f4572b4ebba9a79a6910c554f06e71efab5ccc0090e1a620e80b9d3b479cdd21d5a041437d90313e045e47ccc6e44eb21d4e56cc9fe1fb791cf5593427d0501b
diff --git a/dev-ruby/actioncable/actioncable-5.2.4.2.ebuild b/dev-ruby/actioncable/actioncable-5.2.4.2.ebuild
deleted file mode 100644
index a6339fadbd1c..000000000000
--- a/dev-ruby/actioncable/actioncable-5.2.4.2.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_DOCDIR=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-RUBY_FAKEGEM_EXTRAINSTALL="app"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem eapi7-ver
-
-DESCRIPTION="Integrated WebSockets for Rails"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-# Tests require many new dependencies, skipping for now
-RESTRICT="test"
-
-ruby_add_rdepend "
- ~dev-ruby/actionpack-${PV}:*
- dev-ruby/nio4r:2
- >=dev-ruby/websocket-driver-0.6.1:0
-"
-
-ruby_add_bdepend "
- test? (
- >=dev-ruby/railties-4.2.0
- dev-ruby/test-unit:2
- >=dev-ruby/mocha-0.14.0:0.14
- )"
diff --git a/dev-ruby/actioncable/actioncable-6.0.2.2.ebuild b/dev-ruby/actioncable/actioncable-6.0.2.2.ebuild
deleted file mode 100644
index e52e0ab9a501..000000000000
--- a/dev-ruby/actioncable/actioncable-6.0.2.2.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_DOC=""
-RUBY_FAKEGEM_DOCDIR=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-RUBY_FAKEGEM_EXTRAINSTALL="app"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Integrated WebSockets for Rails"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-# Tests require many new dependencies, skipping for now
-RESTRICT="test"
-
-ruby_add_rdepend "
- ~dev-ruby/actionpack-${PV}:*
- dev-ruby/nio4r:2
- >=dev-ruby/websocket-driver-0.6.1:*
-"
-
-ruby_add_bdepend "
- test? (
- >=dev-ruby/railties-4.2.0
- dev-ruby/test-unit:2
- >=dev-ruby/mocha-0.14.0:0.14
- )"
diff --git a/dev-ruby/actioncable/actioncable-6.0.3.1.ebuild b/dev-ruby/actioncable/actioncable-6.0.3.1.ebuild
deleted file mode 100644
index e52e0ab9a501..000000000000
--- a/dev-ruby/actioncable/actioncable-6.0.3.1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_DOC=""
-RUBY_FAKEGEM_DOCDIR=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-RUBY_FAKEGEM_EXTRAINSTALL="app"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Integrated WebSockets for Rails"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-# Tests require many new dependencies, skipping for now
-RESTRICT="test"
-
-ruby_add_rdepend "
- ~dev-ruby/actionpack-${PV}:*
- dev-ruby/nio4r:2
- >=dev-ruby/websocket-driver-0.6.1:*
-"
-
-ruby_add_bdepend "
- test? (
- >=dev-ruby/railties-4.2.0
- dev-ruby/test-unit:2
- >=dev-ruby/mocha-0.14.0:0.14
- )"
diff --git a/dev-ruby/actioncable/actioncable-6.0.3.ebuild b/dev-ruby/actioncable/actioncable-6.0.3.ebuild
deleted file mode 100644
index e52e0ab9a501..000000000000
--- a/dev-ruby/actioncable/actioncable-6.0.3.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_DOC=""
-RUBY_FAKEGEM_DOCDIR=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-RUBY_FAKEGEM_EXTRAINSTALL="app"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Integrated WebSockets for Rails"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-# Tests require many new dependencies, skipping for now
-RESTRICT="test"
-
-ruby_add_rdepend "
- ~dev-ruby/actionpack-${PV}:*
- dev-ruby/nio4r:2
- >=dev-ruby/websocket-driver-0.6.1:*
-"
-
-ruby_add_bdepend "
- test? (
- >=dev-ruby/railties-4.2.0
- dev-ruby/test-unit:2
- >=dev-ruby/mocha-0.14.0:0.14
- )"
diff --git a/dev-ruby/actionmailbox/Manifest b/dev-ruby/actionmailbox/Manifest
index 9ef4ce7b0e0f..cb299d005b4a 100644
--- a/dev-ruby/actionmailbox/Manifest
+++ b/dev-ruby/actionmailbox/Manifest
@@ -1,4 +1 @@
-DIST rails-6.0.2.2.tgz 18556125 BLAKE2B f4ed5cc6cbbfa84fb687aba5a6c8f2f6ab68febb41147c40ed8dbc6253c128adbac6503e65e89fe672f50270716d197d8c05b4e1e286aafd76581fc167e6c5da SHA512 c1aab2d6c72948c75a047aec9d9f651f0c1bae78bb17e2fa0cb393113ee1e59980dc093e6f3fd3b2f3839c9b3bb4afcd0b0badfd9574b35b932275a9d9800689
-DIST rails-6.0.3.1.tgz 18567937 BLAKE2B fe6b58c2cb389f766d356f983787ddd602ee835e90cdbe26c25586c1304aa8c80d4ace2e0956326c0dd428dcd51a624d68d64667c2294c326779498a809ea6c9 SHA512 fcdaff0b0e4877a53f89b2b69c9271213297db8df8abccd071da5f2b2d3e3e6855914e1059596903f761b9a3891b31c2fdf10e887183f4433b260f84c4ebccdf
DIST rails-6.0.3.2.tgz 18568792 BLAKE2B 574d4b7da1bf0ff308ca1a64369c16e29396c8faddf741bc0f2b7d0c0761e440d64dade6ef67ba4923045c7eab1cd0689d45b6b26f3e3077020157a2b29fb17f SHA512 ea019bef7facc1b8b0d2f181da45d70456a895f2d57eb2410e4a06ba7bea0165dacc0f15fe5080150e4b4ef3c81dacee70b200468232da857fdf60def85b5aec
-DIST rails-6.0.3.tgz 18565682 BLAKE2B fe8601aec070535f487801eec16d944809be824e4833b7a906b47b4099dd5e72515ac3e492e4301dd651657fc2c4547ecbdd2c12265e04aad2758e9e284ad385 SHA512 f4572b4ebba9a79a6910c554f06e71efab5ccc0090e1a620e80b9d3b479cdd21d5a041437d90313e045e47ccc6e44eb21d4e56cc9fe1fb791cf5593427d0501b
diff --git a/dev-ruby/actionmailbox/actionmailbox-6.0.2.2.ebuild b/dev-ruby/actionmailbox/actionmailbox-6.0.2.2.ebuild
deleted file mode 100644
index bbdab69175ce..000000000000
--- a/dev-ruby/actionmailbox/actionmailbox-6.0.2.2.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="actionmailbox.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-RUBY_FAKEGEM_EXTRAINSTALL="app config db"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Framework for designing email-service layers"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
- ~dev-ruby/actionpack-${PV}
- ~dev-ruby/activejob-${PV}
- ~dev-ruby/activerecord-${PV}
- ~dev-ruby/activestorage-${PV}
- ~dev-ruby/activesupport-${PV}
- >=dev-ruby/mail-2.7.1:*
-"
-
-ruby_add_bdepend "test? (
- dev-ruby/mocha
-)"
-
-all_ruby_prepare() {
- # Remove items from the common Gemfile that we don't need for this
- # test run. This also requires handling some gemspecs.
- sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|sprockets\|stackprof\|websocket-client-simple\|libxml-ruby\|redis\|blade\|aws-sdk\|google-cloud\|azure-storage\|selenium\|webdrivers\|minitest-bisect\|minitest-retry\|minitest-reporters\|listen\|rack-cache\|capybara\)/ s:^:#:" \
- -e '/:job/,/end/ s:^:#:' \
- -e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
- rm ../Gemfile.lock || die
-}
-
-each_ruby_prepare() {
- sed -i -e 's:ruby:'${RUBY}':' test/dummy/bin/* || die
-}
diff --git a/dev-ruby/actionmailbox/actionmailbox-6.0.3.1.ebuild b/dev-ruby/actionmailbox/actionmailbox-6.0.3.1.ebuild
deleted file mode 100644
index bbdab69175ce..000000000000
--- a/dev-ruby/actionmailbox/actionmailbox-6.0.3.1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="actionmailbox.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-RUBY_FAKEGEM_EXTRAINSTALL="app config db"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Framework for designing email-service layers"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
- ~dev-ruby/actionpack-${PV}
- ~dev-ruby/activejob-${PV}
- ~dev-ruby/activerecord-${PV}
- ~dev-ruby/activestorage-${PV}
- ~dev-ruby/activesupport-${PV}
- >=dev-ruby/mail-2.7.1:*
-"
-
-ruby_add_bdepend "test? (
- dev-ruby/mocha
-)"
-
-all_ruby_prepare() {
- # Remove items from the common Gemfile that we don't need for this
- # test run. This also requires handling some gemspecs.
- sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|sprockets\|stackprof\|websocket-client-simple\|libxml-ruby\|redis\|blade\|aws-sdk\|google-cloud\|azure-storage\|selenium\|webdrivers\|minitest-bisect\|minitest-retry\|minitest-reporters\|listen\|rack-cache\|capybara\)/ s:^:#:" \
- -e '/:job/,/end/ s:^:#:' \
- -e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
- rm ../Gemfile.lock || die
-}
-
-each_ruby_prepare() {
- sed -i -e 's:ruby:'${RUBY}':' test/dummy/bin/* || die
-}
diff --git a/dev-ruby/actionmailbox/actionmailbox-6.0.3.ebuild b/dev-ruby/actionmailbox/actionmailbox-6.0.3.ebuild
deleted file mode 100644
index bbdab69175ce..000000000000
--- a/dev-ruby/actionmailbox/actionmailbox-6.0.3.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="actionmailbox.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-RUBY_FAKEGEM_EXTRAINSTALL="app config db"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Framework for designing email-service layers"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
- ~dev-ruby/actionpack-${PV}
- ~dev-ruby/activejob-${PV}
- ~dev-ruby/activerecord-${PV}
- ~dev-ruby/activestorage-${PV}
- ~dev-ruby/activesupport-${PV}
- >=dev-ruby/mail-2.7.1:*
-"
-
-ruby_add_bdepend "test? (
- dev-ruby/mocha
-)"
-
-all_ruby_prepare() {
- # Remove items from the common Gemfile that we don't need for this
- # test run. This also requires handling some gemspecs.
- sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|sprockets\|stackprof\|websocket-client-simple\|libxml-ruby\|redis\|blade\|aws-sdk\|google-cloud\|azure-storage\|selenium\|webdrivers\|minitest-bisect\|minitest-retry\|minitest-reporters\|listen\|rack-cache\|capybara\)/ s:^:#:" \
- -e '/:job/,/end/ s:^:#:' \
- -e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
- rm ../Gemfile.lock || die
-}
-
-each_ruby_prepare() {
- sed -i -e 's:ruby:'${RUBY}':' test/dummy/bin/* || die
-}
diff --git a/dev-ruby/actionmailer/Manifest b/dev-ruby/actionmailer/Manifest
index 0055cbcdc29d..1bbbb8882dac 100644
--- a/dev-ruby/actionmailer/Manifest
+++ b/dev-ruby/actionmailer/Manifest
@@ -1,6 +1,2 @@
-DIST rails-5.2.4.2.tgz 8823143 BLAKE2B 273bee6ccc2354bcfd8d24b320fe69c24f643c196eba053c727d30b13d4178069068c430a0a4112ae28c3e4b5a5dde0b66a7c46c7c28054f2b7a678427f478af SHA512 21561407a0b606dbd2fb6ad12ef910c0bdf3d5162db7e55f4f41f698280ba73664b0b5594930d4cebcb42a66e2e5e22de3523789818eb424443e8c5b2316b8fc
DIST rails-5.2.4.3.tgz 8824955 BLAKE2B 7db1bdda581e345713b796152c68e13911076c0af752aa91016a559fb380ee33b5f1822576120940995968efa6351165af0e21f97ff2e201bc8250f7e3178089 SHA512 b01b454f38593b50788cecef4f2b25938b0e176d24476bf0a8145b581c7327e0d8572a62fab4256372b51d75a9463431bbd98470a31298a6ff4d5f81f7ff92ce
-DIST rails-6.0.2.2.tgz 18556125 BLAKE2B f4ed5cc6cbbfa84fb687aba5a6c8f2f6ab68febb41147c40ed8dbc6253c128adbac6503e65e89fe672f50270716d197d8c05b4e1e286aafd76581fc167e6c5da SHA512 c1aab2d6c72948c75a047aec9d9f651f0c1bae78bb17e2fa0cb393113ee1e59980dc093e6f3fd3b2f3839c9b3bb4afcd0b0badfd9574b35b932275a9d9800689
-DIST rails-6.0.3.1.tgz 18567937 BLAKE2B fe6b58c2cb389f766d356f983787ddd602ee835e90cdbe26c25586c1304aa8c80d4ace2e0956326c0dd428dcd51a624d68d64667c2294c326779498a809ea6c9 SHA512 fcdaff0b0e4877a53f89b2b69c9271213297db8df8abccd071da5f2b2d3e3e6855914e1059596903f761b9a3891b31c2fdf10e887183f4433b260f84c4ebccdf
DIST rails-6.0.3.2.tgz 18568792 BLAKE2B 574d4b7da1bf0ff308ca1a64369c16e29396c8faddf741bc0f2b7d0c0761e440d64dade6ef67ba4923045c7eab1cd0689d45b6b26f3e3077020157a2b29fb17f SHA512 ea019bef7facc1b8b0d2f181da45d70456a895f2d57eb2410e4a06ba7bea0165dacc0f15fe5080150e4b4ef3c81dacee70b200468232da857fdf60def85b5aec
-DIST rails-6.0.3.tgz 18565682 BLAKE2B fe8601aec070535f487801eec16d944809be824e4833b7a906b47b4099dd5e72515ac3e492e4301dd651657fc2c4547ecbdd2c12265e04aad2758e9e284ad385 SHA512 f4572b4ebba9a79a6910c554f06e71efab5ccc0090e1a620e80b9d3b479cdd21d5a041437d90313e045e47ccc6e44eb21d4e56cc9fe1fb791cf5593427d0501b
diff --git a/dev-ruby/actionmailer/actionmailer-5.2.4.2.ebuild b/dev-ruby/actionmailer/actionmailer-5.2.4.2.ebuild
deleted file mode 100644
index 24a51c252868..000000000000
--- a/dev-ruby/actionmailer/actionmailer-5.2.4.2.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="actionmailer.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem eapi7-ver
-
-DESCRIPTION="Framework for designing email-service layers"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
- ~dev-ruby/actionpack-${PV}
- ~dev-ruby/actionview-${PV}
- ~dev-ruby/activejob-${PV}
- >=dev-ruby/mail-2.5.4:* =dev-ruby/mail-2*:*
- dev-ruby/rails-dom-testing:2"
-
-ruby_add_bdepend "test? (
- dev-ruby/mocha
-)"
-
-all_ruby_prepare() {
- # Set test environment to our hand.
- rm "${S}/../Gemfile" || die "Unable to remove Gemfile"
- sed -e '/\/load_paths/d' \
- -e '1igem "railties", "~> 5.2.0"' \
- -e '1igem "actionpack", "~> 5.2.0"' \
- -e '1igem "activejob", "~> 5.2.0"' \
- -i test/abstract_unit.rb || die "Unable to remove load paths"
-
- # Avoid a test failing only on attachment ordering, since this is a
- # security release.
- sed -i -e '/adding inline attachments while rendering mail works/askip "gentoo: fails on ordering"' test/base_test.rb || die
-}
diff --git a/dev-ruby/actionmailer/actionmailer-6.0.2.2.ebuild b/dev-ruby/actionmailer/actionmailer-6.0.2.2.ebuild
deleted file mode 100644
index 9de7bbb7b27e..000000000000
--- a/dev-ruby/actionmailer/actionmailer-6.0.2.2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="actionmailer.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Framework for designing email-service layers"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
- ~dev-ruby/actionpack-${PV}
- ~dev-ruby/actionview-${PV}
- ~dev-ruby/activejob-${PV}
- >=dev-ruby/mail-2.5.4:* =dev-ruby/mail-2*:*
- dev-ruby/rails-dom-testing:2"
-
-ruby_add_bdepend "test? (
- dev-ruby/mocha
-)"
-
-all_ruby_prepare() {
- # Set test environment to our hand.
- rm "${S}/../Gemfile" || die "Unable to remove Gemfile"
- sed -i -e '/\/load_paths/d' test/abstract_unit.rb || die "Unable to remove load paths"
-
- # Avoid a test failing only on attachment ordering, since this is a
- # security release.
- sed -i -e '/adding inline attachments while rendering mail works/askip "gentoo: fails on ordering"' test/base_test.rb || die
-}
diff --git a/dev-ruby/actionmailer/actionmailer-6.0.3.1.ebuild b/dev-ruby/actionmailer/actionmailer-6.0.3.1.ebuild
deleted file mode 100644
index 9de7bbb7b27e..000000000000
--- a/dev-ruby/actionmailer/actionmailer-6.0.3.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="actionmailer.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Framework for designing email-service layers"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
- ~dev-ruby/actionpack-${PV}
- ~dev-ruby/actionview-${PV}
- ~dev-ruby/activejob-${PV}
- >=dev-ruby/mail-2.5.4:* =dev-ruby/mail-2*:*
- dev-ruby/rails-dom-testing:2"
-
-ruby_add_bdepend "test? (
- dev-ruby/mocha
-)"
-
-all_ruby_prepare() {
- # Set test environment to our hand.
- rm "${S}/../Gemfile" || die "Unable to remove Gemfile"
- sed -i -e '/\/load_paths/d' test/abstract_unit.rb || die "Unable to remove load paths"
-
- # Avoid a test failing only on attachment ordering, since this is a
- # security release.
- sed -i -e '/adding inline attachments while rendering mail works/askip "gentoo: fails on ordering"' test/base_test.rb || die
-}
diff --git a/dev-ruby/actionmailer/actionmailer-6.0.3.ebuild b/dev-ruby/actionmailer/actionmailer-6.0.3.ebuild
deleted file mode 100644
index 9de7bbb7b27e..000000000000
--- a/dev-ruby/actionmailer/actionmailer-6.0.3.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="actionmailer.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Framework for designing email-service layers"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
- ~dev-ruby/actionpack-${PV}
- ~dev-ruby/actionview-${PV}
- ~dev-ruby/activejob-${PV}
- >=dev-ruby/mail-2.5.4:* =dev-ruby/mail-2*:*
- dev-ruby/rails-dom-testing:2"
-
-ruby_add_bdepend "test? (
- dev-ruby/mocha
-)"
-
-all_ruby_prepare() {
- # Set test environment to our hand.
- rm "${S}/../Gemfile" || die "Unable to remove Gemfile"
- sed -i -e '/\/load_paths/d' test/abstract_unit.rb || die "Unable to remove load paths"
-
- # Avoid a test failing only on attachment ordering, since this is a
- # security release.
- sed -i -e '/adding inline attachments while rendering mail works/askip "gentoo: fails on ordering"' test/base_test.rb || die
-}
diff --git a/dev-ruby/actionpack/Manifest b/dev-ruby/actionpack/Manifest
index 0055cbcdc29d..1bbbb8882dac 100644
--- a/dev-ruby/actionpack/Manifest
+++ b/dev-ruby/actionpack/Manifest
@@ -1,6 +1,2 @@
-DIST rails-5.2.4.2.tgz 8823143 BLAKE2B 273bee6ccc2354bcfd8d24b320fe69c24f643c196eba053c727d30b13d4178069068c430a0a4112ae28c3e4b5a5dde0b66a7c46c7c28054f2b7a678427f478af SHA512 21561407a0b606dbd2fb6ad12ef910c0bdf3d5162db7e55f4f41f698280ba73664b0b5594930d4cebcb42a66e2e5e22de3523789818eb424443e8c5b2316b8fc
DIST rails-5.2.4.3.tgz 8824955 BLAKE2B 7db1bdda581e345713b796152c68e13911076c0af752aa91016a559fb380ee33b5f1822576120940995968efa6351165af0e21f97ff2e201bc8250f7e3178089 SHA512 b01b454f38593b50788cecef4f2b25938b0e176d24476bf0a8145b581c7327e0d8572a62fab4256372b51d75a9463431bbd98470a31298a6ff4d5f81f7ff92ce
-DIST rails-6.0.2.2.tgz 18556125 BLAKE2B f4ed5cc6cbbfa84fb687aba5a6c8f2f6ab68febb41147c40ed8dbc6253c128adbac6503e65e89fe672f50270716d197d8c05b4e1e286aafd76581fc167e6c5da SHA512 c1aab2d6c72948c75a047aec9d9f651f0c1bae78bb17e2fa0cb393113ee1e59980dc093e6f3fd3b2f3839c9b3bb4afcd0b0badfd9574b35b932275a9d9800689
-DIST rails-6.0.3.1.tgz 18567937 BLAKE2B fe6b58c2cb389f766d356f983787ddd602ee835e90cdbe26c25586c1304aa8c80d4ace2e0956326c0dd428dcd51a624d68d64667c2294c326779498a809ea6c9 SHA512 fcdaff0b0e4877a53f89b2b69c9271213297db8df8abccd071da5f2b2d3e3e6855914e1059596903f761b9a3891b31c2fdf10e887183f4433b260f84c4ebccdf
DIST rails-6.0.3.2.tgz 18568792 BLAKE2B 574d4b7da1bf0ff308ca1a64369c16e29396c8faddf741bc0f2b7d0c0761e440d64dade6ef67ba4923045c7eab1cd0689d45b6b26f3e3077020157a2b29fb17f SHA512 ea019bef7facc1b8b0d2f181da45d70456a895f2d57eb2410e4a06ba7bea0165dacc0f15fe5080150e4b4ef3c81dacee70b200468232da857fdf60def85b5aec
-DIST rails-6.0.3.tgz 18565682 BLAKE2B fe8601aec070535f487801eec16d944809be824e4833b7a906b47b4099dd5e72515ac3e492e4301dd651657fc2c4547ecbdd2c12265e04aad2758e9e284ad385 SHA512 f4572b4ebba9a79a6910c554f06e71efab5ccc0090e1a620e80b9d3b479cdd21d5a041437d90313e045e47ccc6e44eb21d4e56cc9fe1fb791cf5593427d0501b
diff --git a/dev-ruby/actionpack/actionpack-5.2.4.2.ebuild b/dev-ruby/actionpack/actionpack-5.2.4.3-r1.ebuild
similarity index 83%
rename from dev-ruby/actionpack/actionpack-5.2.4.2.ebuild
rename to dev-ruby/actionpack/actionpack-5.2.4.3-r1.ebuild
index 92a68b49adb7..c90f763ca990 100644
--- a/dev-ruby/actionpack/actionpack-5.2.4.2.ebuild
+++ b/dev-ruby/actionpack/actionpack-5.2.4.3-r1.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz
LICENSE="MIT"
SLOT="$(ver_cut 1-2)"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
IUSE=""
RUBY_S="rails-${PV}/${PN}"
@@ -29,7 +29,7 @@ RUBY_S="rails-${PV}/${PN}"
ruby_add_rdepend "
~dev-ruby/activesupport-${PV}
~dev-ruby/actionview-${PV}
- >=dev-ruby/rack-2.0.8:2.0
+ || ( dev-ruby/rack:2.2 dev-ruby/rack:2.1 >=dev-ruby/rack-2.0.8:2.0 )
>=dev-ruby/rack-test-0.6.3:*
>=dev-ruby/rails-html-sanitizer-1.0.2:1
dev-ruby/rails-dom-testing:2
@@ -60,4 +60,8 @@ all_ruby_prepare() {
# Use different timezone notation, this changed at some point due to an external dependency changing.
sed -i -e 's/-0000/GMT/' test/dispatch/response_test.rb test/dispatch/cookies_test.rb test/dispatch/session/cookie_store_test.rb || die
+
+ # Avoid broken tests already fixed upstream
+ sed -i -e '/cookie syntax resilience/askip "broken test"' test/dispatch/request_test.rb || die
+ sed -i -e '/test_keeps_original_headers_behavior/askip "broken test"' test/dispatch/ssl_test.rb || die
}
diff --git a/dev-ruby/actionpack/actionpack-6.0.2.2.ebuild b/dev-ruby/actionpack/actionpack-6.0.2.2.ebuild
deleted file mode 100644
index 4d8bf0f9ee17..000000000000
--- a/dev-ruby/actionpack/actionpack-6.0.2.2.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="actionpack.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Eases web-request routing, handling, and response"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
- ~dev-ruby/activesupport-${PV}
- ~dev-ruby/actionview-${PV}
- dev-ruby/rack:2.0
- >=dev-ruby/rack-test-0.6.3:*
- >=dev-ruby/rails-html-sanitizer-1.2.0:1
- dev-ruby/rails-dom-testing:2
-"
-
-ruby_add_bdepend "
- test? (
- dev-ruby/mocha:0.14
- dev-ruby/bundler
- >=dev-ruby/capybara-2.15
- ~dev-ruby/activemodel-${PV}
- ~dev-ruby/railties-${PV}
- >=dev-ruby/rack-cache-1.2:1.2
- www-servers/puma
- )"
-
-all_ruby_prepare() {
- # Remove items from the common Gemfile that we don't need for this
- # test run. This also requires handling some gemspecs.
- sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|sprockets\|stackprof\)/ s:^:#:" \
- -e '/:job/,/end/ s:^:#:' \
- -e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
- rm ../Gemfile.lock || die
-
- # Use different timezone notation, this changed at some point due to an external dependency changing.
- sed -i -e 's/-0000/GMT/' test/dispatch/response_test.rb test/dispatch/cookies_test.rb test/dispatch/session/cookie_store_test.rb || die
-}
diff --git a/dev-ruby/actionpack/actionpack-6.0.3.1.ebuild b/dev-ruby/actionpack/actionpack-6.0.3.2-r1.ebuild
similarity index 96%
rename from dev-ruby/actionpack/actionpack-6.0.3.1.ebuild
rename to dev-ruby/actionpack/actionpack-6.0.3.2-r1.ebuild
index 3ae431f685a6..b9f96b9946de 100644
--- a/dev-ruby/actionpack/actionpack-6.0.3.1.ebuild
+++ b/dev-ruby/actionpack/actionpack-6.0.3.2-r1.ebuild
@@ -29,7 +29,7 @@ RUBY_S="rails-${PV}/${PN}"
ruby_add_rdepend "
~dev-ruby/activesupport-${PV}
~dev-ruby/actionview-${PV}
- dev-ruby/rack:2.0
+ || ( dev-ruby/rack:2.2 dev-ruby/rack:2.1 >=dev-ruby/rack-2.0.8:2.0 )
>=dev-ruby/rack-test-0.6.3:*
>=dev-ruby/rails-html-sanitizer-1.2.0:1
dev-ruby/rails-dom-testing:2
diff --git a/dev-ruby/actionpack/actionpack-6.0.3.ebuild b/dev-ruby/actionpack/actionpack-6.0.3.ebuild
deleted file mode 100644
index 3ae431f685a6..000000000000
--- a/dev-ruby/actionpack/actionpack-6.0.3.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="actionpack.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Eases web-request routing, handling, and response"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
- ~dev-ruby/activesupport-${PV}
- ~dev-ruby/actionview-${PV}
- dev-ruby/rack:2.0
- >=dev-ruby/rack-test-0.6.3:*
- >=dev-ruby/rails-html-sanitizer-1.2.0:1
- dev-ruby/rails-dom-testing:2
-"
-
-ruby_add_bdepend "
- test? (
- dev-ruby/mocha:0.14
- dev-ruby/bundler
- >=dev-ruby/capybara-2.15
- ~dev-ruby/activemodel-${PV}
- ~dev-ruby/railties-${PV}
- >=dev-ruby/rack-cache-1.2:1.2
- www-servers/puma
- )"
-
-all_ruby_prepare() {
- # Remove items from the common Gemfile that we don't need for this
- # test run. This also requires handling some gemspecs.
- sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|sprockets\|stackprof\)/ s:^:#:" \
- -e '/:job/,/end/ s:^:#:' \
- -e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
- rm ../Gemfile.lock || die
-
- # Use different timezone notation, this changed at some point due to an external dependency changing.
- sed -i -e 's/-0000/GMT/' test/dispatch/response_test.rb test/dispatch/cookies_test.rb test/dispatch/session/cookie_store_test.rb || die
-}
diff --git a/dev-ruby/actiontext/Manifest b/dev-ruby/actiontext/Manifest
index 9ef4ce7b0e0f..cb299d005b4a 100644
--- a/dev-ruby/actiontext/Manifest
+++ b/dev-ruby/actiontext/Manifest
@@ -1,4 +1 @@
-DIST rails-6.0.2.2.tgz 18556125 BLAKE2B f4ed5cc6cbbfa84fb687aba5a6c8f2f6ab68febb41147c40ed8dbc6253c128adbac6503e65e89fe672f50270716d197d8c05b4e1e286aafd76581fc167e6c5da SHA512 c1aab2d6c72948c75a047aec9d9f651f0c1bae78bb17e2fa0cb393113ee1e59980dc093e6f3fd3b2f3839c9b3bb4afcd0b0badfd9574b35b932275a9d9800689
-DIST rails-6.0.3.1.tgz 18567937 BLAKE2B fe6b58c2cb389f766d356f983787ddd602ee835e90cdbe26c25586c1304aa8c80d4ace2e0956326c0dd428dcd51a624d68d64667c2294c326779498a809ea6c9 SHA512 fcdaff0b0e4877a53f89b2b69c9271213297db8df8abccd071da5f2b2d3e3e6855914e1059596903f761b9a3891b31c2fdf10e887183f4433b260f84c4ebccdf
DIST rails-6.0.3.2.tgz 18568792 BLAKE2B 574d4b7da1bf0ff308ca1a64369c16e29396c8faddf741bc0f2b7d0c0761e440d64dade6ef67ba4923045c7eab1cd0689d45b6b26f3e3077020157a2b29fb17f SHA512 ea019bef7facc1b8b0d2f181da45d70456a895f2d57eb2410e4a06ba7bea0165dacc0f15fe5080150e4b4ef3c81dacee70b200468232da857fdf60def85b5aec
-DIST rails-6.0.3.tgz 18565682 BLAKE2B fe8601aec070535f487801eec16d944809be824e4833b7a906b47b4099dd5e72515ac3e492e4301dd651657fc2c4547ecbdd2c12265e04aad2758e9e284ad385 SHA512 f4572b4ebba9a79a6910c554f06e71efab5ccc0090e1a620e80b9d3b479cdd21d5a041437d90313e045e47ccc6e44eb21d4e56cc9fe1fb791cf5593427d0501b
diff --git a/dev-ruby/actiontext/actiontext-6.0.2.2.ebuild b/dev-ruby/actiontext/actiontext-6.0.2.2.ebuild
deleted file mode 100644
index 81ba03261fc8..000000000000
--- a/dev-ruby/actiontext/actiontext-6.0.2.2.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="actiontext.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-RUBY_FAKEGEM_EXTRAINSTALL="app db package.json"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Edit and display rich text in Rails applications"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
- ~dev-ruby/actionpack-${PV}
- ~dev-ruby/activerecord-${PV}
- ~dev-ruby/activestorage-${PV}
- ~dev-ruby/activesupport-${PV}
- >=dev-ruby/nokogiri-1.8.5
-"
-
-ruby_add_bdepend "test? (
- dev-ruby/mocha
-)"
-
-all_ruby_prepare() {
- # Remove items from the common Gemfile that we don't need for this
- # test run. This also requires handling some gemspecs.
- sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|sprockets\|stackprof\|websocket-client-simple\|libxml-ruby\|redis\|blade\|aws-sdk\|google-cloud\|azure-storage\|selenium\|webdrivers\|minitest-bisect\|minitest-retry\|minitest-reporters\|listen\|rack-cache\)/ s:^:#:" \
- -e '/:job/,/end/ s:^:#:' \
- -e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
- rm ../Gemfile.lock || die
-}
-
-each_ruby_prepare() {
- sed -i -e 's:ruby:'${RUBY}':' test/dummy/bin/* || die
-}
diff --git a/dev-ruby/actiontext/actiontext-6.0.3.1.ebuild b/dev-ruby/actiontext/actiontext-6.0.3.1.ebuild
deleted file mode 100644
index 81ba03261fc8..000000000000
--- a/dev-ruby/actiontext/actiontext-6.0.3.1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="actiontext.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-RUBY_FAKEGEM_EXTRAINSTALL="app db package.json"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Edit and display rich text in Rails applications"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
- ~dev-ruby/actionpack-${PV}
- ~dev-ruby/activerecord-${PV}
- ~dev-ruby/activestorage-${PV}
- ~dev-ruby/activesupport-${PV}
- >=dev-ruby/nokogiri-1.8.5
-"
-
-ruby_add_bdepend "test? (
- dev-ruby/mocha
-)"
-
-all_ruby_prepare() {
- # Remove items from the common Gemfile that we don't need for this
- # test run. This also requires handling some gemspecs.
- sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|sprockets\|stackprof\|websocket-client-simple\|libxml-ruby\|redis\|blade\|aws-sdk\|google-cloud\|azure-storage\|selenium\|webdrivers\|minitest-bisect\|minitest-retry\|minitest-reporters\|listen\|rack-cache\)/ s:^:#:" \
- -e '/:job/,/end/ s:^:#:' \
- -e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
- rm ../Gemfile.lock || die
-}
-
-each_ruby_prepare() {
- sed -i -e 's:ruby:'${RUBY}':' test/dummy/bin/* || die
-}
diff --git a/dev-ruby/actiontext/actiontext-6.0.3.ebuild b/dev-ruby/actiontext/actiontext-6.0.3.ebuild
deleted file mode 100644
index 81ba03261fc8..000000000000
--- a/dev-ruby/actiontext/actiontext-6.0.3.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="actiontext.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-RUBY_FAKEGEM_EXTRAINSTALL="app db package.json"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Edit and display rich text in Rails applications"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
- ~dev-ruby/actionpack-${PV}
- ~dev-ruby/activerecord-${PV}
- ~dev-ruby/activestorage-${PV}
- ~dev-ruby/activesupport-${PV}
- >=dev-ruby/nokogiri-1.8.5
-"
-
-ruby_add_bdepend "test? (
- dev-ruby/mocha
-)"
-
-all_ruby_prepare() {
- # Remove items from the common Gemfile that we don't need for this
- # test run. This also requires handling some gemspecs.
- sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|sprockets\|stackprof\|websocket-client-simple\|libxml-ruby\|redis\|blade\|aws-sdk\|google-cloud\|azure-storage\|selenium\|webdrivers\|minitest-bisect\|minitest-retry\|minitest-reporters\|listen\|rack-cache\)/ s:^:#:" \
- -e '/:job/,/end/ s:^:#:' \
- -e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
- rm ../Gemfile.lock || die
-}
-
-each_ruby_prepare() {
- sed -i -e 's:ruby:'${RUBY}':' test/dummy/bin/* || die
-}
diff --git a/dev-ruby/actionview/Manifest b/dev-ruby/actionview/Manifest
index 0055cbcdc29d..1bbbb8882dac 100644
--- a/dev-ruby/actionview/Manifest
+++ b/dev-ruby/actionview/Manifest
@@ -1,6 +1,2 @@
-DIST rails-5.2.4.2.tgz 8823143 BLAKE2B 273bee6ccc2354bcfd8d24b320fe69c24f643c196eba053c727d30b13d4178069068c430a0a4112ae28c3e4b5a5dde0b66a7c46c7c28054f2b7a678427f478af SHA512 21561407a0b606dbd2fb6ad12ef910c0bdf3d5162db7e55f4f41f698280ba73664b0b5594930d4cebcb42a66e2e5e22de3523789818eb424443e8c5b2316b8fc
DIST rails-5.2.4.3.tgz 8824955 BLAKE2B 7db1bdda581e345713b796152c68e13911076c0af752aa91016a559fb380ee33b5f1822576120940995968efa6351165af0e21f97ff2e201bc8250f7e3178089 SHA512 b01b454f38593b50788cecef4f2b25938b0e176d24476bf0a8145b581c7327e0d8572a62fab4256372b51d75a9463431bbd98470a31298a6ff4d5f81f7ff92ce
-DIST rails-6.0.2.2.tgz 18556125 BLAKE2B f4ed5cc6cbbfa84fb687aba5a6c8f2f6ab68febb41147c40ed8dbc6253c128adbac6503e65e89fe672f50270716d197d8c05b4e1e286aafd76581fc167e6c5da SHA512 c1aab2d6c72948c75a047aec9d9f651f0c1bae78bb17e2fa0cb393113ee1e59980dc093e6f3fd3b2f3839c9b3bb4afcd0b0badfd9574b35b932275a9d9800689
-DIST rails-6.0.3.1.tgz 18567937 BLAKE2B fe6b58c2cb389f766d356f983787ddd602ee835e90cdbe26c25586c1304aa8c80d4ace2e0956326c0dd428dcd51a624d68d64667c2294c326779498a809ea6c9 SHA512 fcdaff0b0e4877a53f89b2b69c9271213297db8df8abccd071da5f2b2d3e3e6855914e1059596903f761b9a3891b31c2fdf10e887183f4433b260f84c4ebccdf
DIST rails-6.0.3.2.tgz 18568792 BLAKE2B 574d4b7da1bf0ff308ca1a64369c16e29396c8faddf741bc0f2b7d0c0761e440d64dade6ef67ba4923045c7eab1cd0689d45b6b26f3e3077020157a2b29fb17f SHA512 ea019bef7facc1b8b0d2f181da45d70456a895f2d57eb2410e4a06ba7bea0165dacc0f15fe5080150e4b4ef3c81dacee70b200468232da857fdf60def85b5aec
-DIST rails-6.0.3.tgz 18565682 BLAKE2B fe8601aec070535f487801eec16d944809be824e4833b7a906b47b4099dd5e72515ac3e492e4301dd651657fc2c4547ecbdd2c12265e04aad2758e9e284ad385 SHA512 f4572b4ebba9a79a6910c554f06e71efab5ccc0090e1a620e80b9d3b479cdd21d5a041437d90313e045e47ccc6e44eb21d4e56cc9fe1fb791cf5593427d0501b
diff --git a/dev-ruby/actionview/actionview-5.2.4.2.ebuild b/dev-ruby/actionview/actionview-5.2.4.2.ebuild
deleted file mode 100644
index 87622071e472..000000000000
--- a/dev-ruby/actionview/actionview-5.2.4.2.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem eapi7-ver
-
-DESCRIPTION="Simple, battle-tested conventions and helpers for building web pages"
-HOMEPAGE="https://github.com/rails/rails/"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
- ~dev-ruby/activesupport-${PV}
- >=dev-ruby/builder-3.1:* =dev-ruby/builder-3*:*
- >=dev-ruby/erubi-1.4:0
- >=dev-ruby/rails-html-sanitizer-1.0.3:1
- dev-ruby/rails-dom-testing:2
-"
-
-ruby_add_bdepend "
- test? (
- dev-ruby/mocha
- ~dev-ruby/actionpack-${PV}
- ~dev-ruby/activemodel-${PV}
- )"
-
-all_ruby_prepare() {
- # Remove items from the common Gemfile that we don't need for this
- # test run. This also requires handling some gemspecs.
- sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|'mysql'\|journey\|rack-cache\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|redcarpet\|bcrypt\|uglifier\|mime-types\|minitest\|sprockets\|stackprof\)/ s:^:#:" \
- -e '/:job/,/end/ s:^:#:' \
- -e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
- rm ../Gemfile.lock || die
-
- # Avoid activerecord integration tests because they are very sensitive to the specifics
- # of the environment.
- sed -i -e 's/, "test:integration:active_record"//' Rakefile || die
-
- sed -e '2igem "actionpack", "~> 5.2.0"' \
- -e '2igem "activemodel", "~> 5.2.0"' \
- -e '2igem "railties", "~> 5.2.0"' \
- -e '/active_record/ s:^:#:' \
- -i test/abstract_unit.rb || die
-}
diff --git a/dev-ruby/actionview/actionview-6.0.2.2.ebuild b/dev-ruby/actionview/actionview-6.0.2.2.ebuild
deleted file mode 100644
index 7cb9b269205c..000000000000
--- a/dev-ruby/actionview/actionview-6.0.2.2.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Simple, battle-tested conventions and helpers for building web pages"
-HOMEPAGE="https://github.com/rails/rails/"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
- ~dev-ruby/activesupport-${PV}
- >=dev-ruby/builder-3.1:* =dev-ruby/builder-3*:*
- >=dev-ruby/erubi-1.4:0
- >=dev-ruby/rails-html-sanitizer-1.2.0:1
- dev-ruby/rails-dom-testing:2
-"
-
-ruby_add_bdepend "
- test? (
- dev-ruby/mocha
- ~dev-ruby/actionpack-${PV}
- ~dev-ruby/activemodel-${PV}
- ~dev-ruby/activerecord-${PV}
- )"
-
-all_ruby_prepare() {
- # Remove items from the common Gemfile that we don't need for this
- # test run. This also requires handling some gemspecs.
- sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|'mysql'\|journey\|rack-cache\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|redcarpet\|bcrypt\|uglifier\|mime-types\|minitest\|sprockets\|stackprof\)/ s:^:#:" \
- -e '/:job/,/end/ s:^:#:' \
- -e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
- rm ../Gemfile.lock || die
-
- # Avoid tests failing due to missing logger setup in activerecord,
- # most likely related to test environment setup.
- rm -f test/activerecord/render_partial_with_record_identification_test.rb || die
-}
diff --git a/dev-ruby/actionview/actionview-6.0.3.1.ebuild b/dev-ruby/actionview/actionview-6.0.3.1.ebuild
deleted file mode 100644
index 0e67c4aa83c1..000000000000
--- a/dev-ruby/actionview/actionview-6.0.3.1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Simple, battle-tested conventions and helpers for building web pages"
-HOMEPAGE="https://github.com/rails/rails/"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
- ~dev-ruby/activesupport-${PV}
- >=dev-ruby/builder-3.1:* =dev-ruby/builder-3*:*
- >=dev-ruby/erubi-1.4:0
- >=dev-ruby/rails-html-sanitizer-1.2.0:1
- dev-ruby/rails-dom-testing:2
-"
-
-ruby_add_bdepend "
- test? (
- dev-ruby/mocha
- ~dev-ruby/actionpack-${PV}
- ~dev-ruby/activemodel-${PV}
- ~dev-ruby/activerecord-${PV}
- dev-ruby/sqlite3
- )"
-
-all_ruby_prepare() {
- # Remove items from the common Gemfile that we don't need for this
- # test run. This also requires handling some gemspecs.
- sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|'mysql'\|journey\|rack-cache\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|redcarpet\|bcrypt\|uglifier\|mime-types\|minitest\|sprockets\|stackprof\)/ s:^:#:" \
- -e '/:job/,/end/ s:^:#:' \
- -e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
- rm ../Gemfile.lock || die
-
- # Avoid tests failing due to missing logger setup in activerecord,
- # most likely related to test environment setup.
- #rm -f test/activerecord/render_partial_with_record_identification_test.rb || die
-
- # Fix loading of activerecord integration tests. This avoids loading
- # activerecord twice and thus redefining constants leading to
- # failures. Bug #719342
- sed -e '/abstract_unit/arequire "active_record/fixtures"' \
- -e '/defined/ s/FixtureSet/ActiveRecord::FixtureSet/' \
- -i test/active_record_unit.rb || die
-}
diff --git a/dev-ruby/actionview/actionview-6.0.3.ebuild b/dev-ruby/actionview/actionview-6.0.3.ebuild
deleted file mode 100644
index 0b4fd032262f..000000000000
--- a/dev-ruby/actionview/actionview-6.0.3.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Simple, battle-tested conventions and helpers for building web pages"
-HOMEPAGE="https://github.com/rails/rails/"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
- ~dev-ruby/activesupport-${PV}
- >=dev-ruby/builder-3.1:* =dev-ruby/builder-3*:*
- >=dev-ruby/erubi-1.4:0
- >=dev-ruby/rails-html-sanitizer-1.2.0:1
- dev-ruby/rails-dom-testing:2
-"
-
-ruby_add_bdepend "
- test? (
- dev-ruby/mocha
- ~dev-ruby/actionpack-${PV}
- ~dev-ruby/activemodel-${PV}
- ~dev-ruby/activerecord-${PV}
- )"
-
-all_ruby_prepare() {
- # Remove items from the common Gemfile that we don't need for this
- # test run. This also requires handling some gemspecs.
- sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|'mysql'\|journey\|rack-cache\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|redcarpet\|bcrypt\|uglifier\|mime-types\|minitest\|sprockets\|stackprof\)/ s:^:#:" \
- -e '/:job/,/end/ s:^:#:' \
- -e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
- rm ../Gemfile.lock || die
-
- # Avoid tests failing due to missing logger setup in activerecord,
- # most likely related to test environment setup.
- #rm -f test/activerecord/render_partial_with_record_identification_test.rb || die
-
- # Fix loading of activerecord integration tests. This avoids loading
- # activerecord twice and thus redefining constants leading to
- # failures. Bug #719342
- sed -e '/abstract_unit/arequire "active_record/fixtures"' \
- -e '/defined/ s/FixtureSet/ActiveRecord::FixtureSet/' \
- -i test/active_record_unit.rb || die
-}
diff --git a/dev-ruby/activejob/Manifest b/dev-ruby/activejob/Manifest
index 0055cbcdc29d..1bbbb8882dac 100644
--- a/dev-ruby/activejob/Manifest
+++ b/dev-ruby/activejob/Manifest
@@ -1,6 +1,2 @@
-DIST rails-5.2.4.2.tgz 8823143 BLAKE2B 273bee6ccc2354bcfd8d24b320fe69c24f643c196eba053c727d30b13d4178069068c430a0a4112ae28c3e4b5a5dde0b66a7c46c7c28054f2b7a678427f478af SHA512 21561407a0b606dbd2fb6ad12ef910c0bdf3d5162db7e55f4f41f698280ba73664b0b5594930d4cebcb42a66e2e5e22de3523789818eb424443e8c5b2316b8fc
DIST rails-5.2.4.3.tgz 8824955 BLAKE2B 7db1bdda581e345713b796152c68e13911076c0af752aa91016a559fb380ee33b5f1822576120940995968efa6351165af0e21f97ff2e201bc8250f7e3178089 SHA512 b01b454f38593b50788cecef4f2b25938b0e176d24476bf0a8145b581c7327e0d8572a62fab4256372b51d75a9463431bbd98470a31298a6ff4d5f81f7ff92ce
-DIST rails-6.0.2.2.tgz 18556125 BLAKE2B f4ed5cc6cbbfa84fb687aba5a6c8f2f6ab68febb41147c40ed8dbc6253c128adbac6503e65e89fe672f50270716d197d8c05b4e1e286aafd76581fc167e6c5da SHA512 c1aab2d6c72948c75a047aec9d9f651f0c1bae78bb17e2fa0cb393113ee1e59980dc093e6f3fd3b2f3839c9b3bb4afcd0b0badfd9574b35b932275a9d9800689
-DIST rails-6.0.3.1.tgz 18567937 BLAKE2B fe6b58c2cb389f766d356f983787ddd602ee835e90cdbe26c25586c1304aa8c80d4ace2e0956326c0dd428dcd51a624d68d64667c2294c326779498a809ea6c9 SHA512 fcdaff0b0e4877a53f89b2b69c9271213297db8df8abccd071da5f2b2d3e3e6855914e1059596903f761b9a3891b31c2fdf10e887183f4433b260f84c4ebccdf
DIST rails-6.0.3.2.tgz 18568792 BLAKE2B 574d4b7da1bf0ff308ca1a64369c16e29396c8faddf741bc0f2b7d0c0761e440d64dade6ef67ba4923045c7eab1cd0689d45b6b26f3e3077020157a2b29fb17f SHA512 ea019bef7facc1b8b0d2f181da45d70456a895f2d57eb2410e4a06ba7bea0165dacc0f15fe5080150e4b4ef3c81dacee70b200468232da857fdf60def85b5aec
-DIST rails-6.0.3.tgz 18565682 BLAKE2B fe8601aec070535f487801eec16d944809be824e4833b7a906b47b4099dd5e72515ac3e492e4301dd651657fc2c4547ecbdd2c12265e04aad2758e9e284ad385 SHA512 f4572b4ebba9a79a6910c554f06e71efab5ccc0090e1a620e80b9d3b479cdd21d5a041437d90313e045e47ccc6e44eb21d4e56cc9fe1fb791cf5593427d0501b
diff --git a/dev-ruby/activejob/activejob-5.2.4.2.ebuild b/dev-ruby/activejob/activejob-5.2.4.2.ebuild
deleted file mode 100644
index 7e36b898f263..000000000000
--- a/dev-ruby/activejob/activejob-5.2.4.2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_DOCDIR=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem eapi7-ver
-
-DESCRIPTION="Job framework with pluggable queues"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
- ~dev-ruby/activesupport-${PV}
- >=dev-ruby/globalid-0.3.6
-"
-
-ruby_add_bdepend "
- test? (
- dev-ruby/mocha
- )"
-
-all_ruby_prepare() {
- # Set test environment to our hand.
- sed -i -e '/load_paths/d' test/helper.rb || die "Unable to remove load paths"
-
- # Remove all currently unpackaged queues.
- sed -i -e 's/que queue_classic resque sidekiq sneakers sucker_punch backburner//' \
- -e 's/delayed_job//' Rakefile || die
-}
diff --git a/dev-ruby/activejob/activejob-6.0.2.2.ebuild b/dev-ruby/activejob/activejob-6.0.2.2.ebuild
deleted file mode 100644
index e34fafaa96cd..000000000000
--- a/dev-ruby/activejob/activejob-6.0.2.2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_DOC=""
-RUBY_FAKEGEM_DOCDIR=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Job framework with pluggable queues"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~sparc ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
- ~dev-ruby/activesupport-${PV}
- >=dev-ruby/globalid-0.3.6
-"
-
-ruby_add_bdepend "
- test? (
- dev-ruby/mocha
- )"
-
-all_ruby_prepare() {
- # Set test environment to our hand.
- sed -i -e '/load_paths/d' test/helper.rb || die "Unable to remove load paths"
-
- # Remove all currently unpackaged queues.
- sed -i -e 's/que queue_classic resque sidekiq sneakers sucker_punch backburner//' \
- -e 's/delayed_job//' Rakefile || die
- sed -i -e '/SneakersAdapter/ s:^:#:' test/cases/exceptions_test.rb || die
-}
diff --git a/dev-ruby/activejob/activejob-6.0.3.1.ebuild b/dev-ruby/activejob/activejob-6.0.3.1.ebuild
deleted file mode 100644
index e34fafaa96cd..000000000000
--- a/dev-ruby/activejob/activejob-6.0.3.1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_DOC=""
-RUBY_FAKEGEM_DOCDIR=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Job framework with pluggable queues"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~sparc ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
- ~dev-ruby/activesupport-${PV}
- >=dev-ruby/globalid-0.3.6
-"
-
-ruby_add_bdepend "
- test? (
- dev-ruby/mocha
- )"
-
-all_ruby_prepare() {
- # Set test environment to our hand.
- sed -i -e '/load_paths/d' test/helper.rb || die "Unable to remove load paths"
-
- # Remove all currently unpackaged queues.
- sed -i -e 's/que queue_classic resque sidekiq sneakers sucker_punch backburner//' \
- -e 's/delayed_job//' Rakefile || die
- sed -i -e '/SneakersAdapter/ s:^:#:' test/cases/exceptions_test.rb || die
-}
diff --git a/dev-ruby/activejob/activejob-6.0.3.ebuild b/dev-ruby/activejob/activejob-6.0.3.ebuild
deleted file mode 100644
index e34fafaa96cd..000000000000
--- a/dev-ruby/activejob/activejob-6.0.3.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_DOC=""
-RUBY_FAKEGEM_DOCDIR=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Job framework with pluggable queues"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~sparc ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
- ~dev-ruby/activesupport-${PV}
- >=dev-ruby/globalid-0.3.6
-"
-
-ruby_add_bdepend "
- test? (
- dev-ruby/mocha
- )"
-
-all_ruby_prepare() {
- # Set test environment to our hand.
- sed -i -e '/load_paths/d' test/helper.rb || die "Unable to remove load paths"
-
- # Remove all currently unpackaged queues.
- sed -i -e 's/que queue_classic resque sidekiq sneakers sucker_punch backburner//' \
- -e 's/delayed_job//' Rakefile || die
- sed -i -e '/SneakersAdapter/ s:^:#:' test/cases/exceptions_test.rb || die
-}
diff --git a/dev-ruby/activemodel/Manifest b/dev-ruby/activemodel/Manifest
index 0055cbcdc29d..1bbbb8882dac 100644
--- a/dev-ruby/activemodel/Manifest
+++ b/dev-ruby/activemodel/Manifest
@@ -1,6 +1,2 @@
-DIST rails-5.2.4.2.tgz 8823143 BLAKE2B 273bee6ccc2354bcfd8d24b320fe69c24f643c196eba053c727d30b13d4178069068c430a0a4112ae28c3e4b5a5dde0b66a7c46c7c28054f2b7a678427f478af SHA512 21561407a0b606dbd2fb6ad12ef910c0bdf3d5162db7e55f4f41f698280ba73664b0b5594930d4cebcb42a66e2e5e22de3523789818eb424443e8c5b2316b8fc
DIST rails-5.2.4.3.tgz 8824955 BLAKE2B 7db1bdda581e345713b796152c68e13911076c0af752aa91016a559fb380ee33b5f1822576120940995968efa6351165af0e21f97ff2e201bc8250f7e3178089 SHA512 b01b454f38593b50788cecef4f2b25938b0e176d24476bf0a8145b581c7327e0d8572a62fab4256372b51d75a9463431bbd98470a31298a6ff4d5f81f7ff92ce
-DIST rails-6.0.2.2.tgz 18556125 BLAKE2B f4ed5cc6cbbfa84fb687aba5a6c8f2f6ab68febb41147c40ed8dbc6253c128adbac6503e65e89fe672f50270716d197d8c05b4e1e286aafd76581fc167e6c5da SHA512 c1aab2d6c72948c75a047aec9d9f651f0c1bae78bb17e2fa0cb393113ee1e59980dc093e6f3fd3b2f3839c9b3bb4afcd0b0badfd9574b35b932275a9d9800689
-DIST rails-6.0.3.1.tgz 18567937 BLAKE2B fe6b58c2cb389f766d356f983787ddd602ee835e90cdbe26c25586c1304aa8c80d4ace2e0956326c0dd428dcd51a624d68d64667c2294c326779498a809ea6c9 SHA512 fcdaff0b0e4877a53f89b2b69c9271213297db8df8abccd071da5f2b2d3e3e6855914e1059596903f761b9a3891b31c2fdf10e887183f4433b260f84c4ebccdf
DIST rails-6.0.3.2.tgz 18568792 BLAKE2B 574d4b7da1bf0ff308ca1a64369c16e29396c8faddf741bc0f2b7d0c0761e440d64dade6ef67ba4923045c7eab1cd0689d45b6b26f3e3077020157a2b29fb17f SHA512 ea019bef7facc1b8b0d2f181da45d70456a895f2d57eb2410e4a06ba7bea0165dacc0f15fe5080150e4b4ef3c81dacee70b200468232da857fdf60def85b5aec
-DIST rails-6.0.3.tgz 18565682 BLAKE2B fe8601aec070535f487801eec16d944809be824e4833b7a906b47b4099dd5e72515ac3e492e4301dd651657fc2c4547ecbdd2c12265e04aad2758e9e284ad385 SHA512 f4572b4ebba9a79a6910c554f06e71efab5ccc0090e1a620e80b9d3b479cdd21d5a041437d90313e045e47ccc6e44eb21d4e56cc9fe1fb791cf5593427d0501b
diff --git a/dev-ruby/activemodel/activemodel-5.2.4.2.ebuild b/dev-ruby/activemodel/activemodel-5.2.4.2.ebuild
deleted file mode 100644
index 7a9cd885fe20..000000000000
--- a/dev-ruby/activemodel/activemodel-5.2.4.2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_DOCDIR=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="activemodel.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem eapi7-ver
-
-DESCRIPTION="Toolkit for building modeling frameworks like Active Record and Active Resource"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
- ~dev-ruby/activesupport-${PV}:*
-"
-
-ruby_add_bdepend "
- test? (
- ~dev-ruby/railties-${PV}
- dev-ruby/test-unit:2
- dev-ruby/mocha
- >=dev-ruby/bcrypt-ruby-3.1.7
- )"
-
-all_ruby_prepare() {
- # Set test environment to our hand.
- sed -i -e '/load_paths/d' test/cases/helper.rb || die "Unable to remove load paths"
-}
diff --git a/dev-ruby/activemodel/activemodel-6.0.2.2.ebuild b/dev-ruby/activemodel/activemodel-6.0.2.2.ebuild
deleted file mode 100644
index 84c440523f59..000000000000
--- a/dev-ruby/activemodel/activemodel-6.0.2.2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="activemodel.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Toolkit for building modeling frameworks like Active Record and Active Resource"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~sparc ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
- ~dev-ruby/activesupport-${PV}:*
-"
-
-ruby_add_bdepend "
- test? (
- ~dev-ruby/railties-${PV}
- dev-ruby/test-unit:2
- dev-ruby/mocha
- >=dev-ruby/bcrypt-ruby-3.1.7
- )"
-
-all_ruby_prepare() {
- # Set test environment to our hand.
- sed -i -e '/load_paths/d' test/cases/helper.rb || die "Unable to remove load paths"
-}
diff --git a/dev-ruby/activemodel/activemodel-6.0.3.1.ebuild b/dev-ruby/activemodel/activemodel-6.0.3.1.ebuild
deleted file mode 100644
index 1494c493a78d..000000000000
--- a/dev-ruby/activemodel/activemodel-6.0.3.1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="activemodel.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Toolkit for building modeling frameworks like Active Record and Active Resource"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~sparc ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
- ~dev-ruby/activesupport-${PV}:*
-"
-
-ruby_add_bdepend "
- test? (
- ~dev-ruby/railties-${PV}
- dev-ruby/test-unit:2
- dev-ruby/mocha
- >=dev-ruby/bcrypt-ruby-3.1.7
- )"
-
-all_ruby_prepare() {
- # Set test environment to our hand.
- sed -i -e '/load_paths/d' test/cases/helper.rb || die "Unable to remove load paths"
-}
diff --git a/dev-ruby/activemodel/activemodel-6.0.3.ebuild b/dev-ruby/activemodel/activemodel-6.0.3.ebuild
deleted file mode 100644
index 1494c493a78d..000000000000
--- a/dev-ruby/activemodel/activemodel-6.0.3.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="activemodel.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Toolkit for building modeling frameworks like Active Record and Active Resource"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~sparc ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
- ~dev-ruby/activesupport-${PV}:*
-"
-
-ruby_add_bdepend "
- test? (
- ~dev-ruby/railties-${PV}
- dev-ruby/test-unit:2
- dev-ruby/mocha
- >=dev-ruby/bcrypt-ruby-3.1.7
- )"
-
-all_ruby_prepare() {
- # Set test environment to our hand.
- sed -i -e '/load_paths/d' test/cases/helper.rb || die "Unable to remove load paths"
-}
diff --git a/dev-ruby/activerecord/Manifest b/dev-ruby/activerecord/Manifest
index 0055cbcdc29d..1bbbb8882dac 100644
--- a/dev-ruby/activerecord/Manifest
+++ b/dev-ruby/activerecord/Manifest
@@ -1,6 +1,2 @@
-DIST rails-5.2.4.2.tgz 8823143 BLAKE2B 273bee6ccc2354bcfd8d24b320fe69c24f643c196eba053c727d30b13d4178069068c430a0a4112ae28c3e4b5a5dde0b66a7c46c7c28054f2b7a678427f478af SHA512 21561407a0b606dbd2fb6ad12ef910c0bdf3d5162db7e55f4f41f698280ba73664b0b5594930d4cebcb42a66e2e5e22de3523789818eb424443e8c5b2316b8fc
DIST rails-5.2.4.3.tgz 8824955 BLAKE2B 7db1bdda581e345713b796152c68e13911076c0af752aa91016a559fb380ee33b5f1822576120940995968efa6351165af0e21f97ff2e201bc8250f7e3178089 SHA512 b01b454f38593b50788cecef4f2b25938b0e176d24476bf0a8145b581c7327e0d8572a62fab4256372b51d75a9463431bbd98470a31298a6ff4d5f81f7ff92ce
-DIST rails-6.0.2.2.tgz 18556125 BLAKE2B f4ed5cc6cbbfa84fb687aba5a6c8f2f6ab68febb41147c40ed8dbc6253c128adbac6503e65e89fe672f50270716d197d8c05b4e1e286aafd76581fc167e6c5da SHA512 c1aab2d6c72948c75a047aec9d9f651f0c1bae78bb17e2fa0cb393113ee1e59980dc093e6f3fd3b2f3839c9b3bb4afcd0b0badfd9574b35b932275a9d9800689
-DIST rails-6.0.3.1.tgz 18567937 BLAKE2B fe6b58c2cb389f766d356f983787ddd602ee835e90cdbe26c25586c1304aa8c80d4ace2e0956326c0dd428dcd51a624d68d64667c2294c326779498a809ea6c9 SHA512 fcdaff0b0e4877a53f89b2b69c9271213297db8df8abccd071da5f2b2d3e3e6855914e1059596903f761b9a3891b31c2fdf10e887183f4433b260f84c4ebccdf
DIST rails-6.0.3.2.tgz 18568792 BLAKE2B 574d4b7da1bf0ff308ca1a64369c16e29396c8faddf741bc0f2b7d0c0761e440d64dade6ef67ba4923045c7eab1cd0689d45b6b26f3e3077020157a2b29fb17f SHA512 ea019bef7facc1b8b0d2f181da45d70456a895f2d57eb2410e4a06ba7bea0165dacc0f15fe5080150e4b4ef3c81dacee70b200468232da857fdf60def85b5aec
-DIST rails-6.0.3.tgz 18565682 BLAKE2B fe8601aec070535f487801eec16d944809be824e4833b7a906b47b4099dd5e72515ac3e492e4301dd651657fc2c4547ecbdd2c12265e04aad2758e9e284ad385 SHA512 f4572b4ebba9a79a6910c554f06e71efab5ccc0090e1a620e80b9d3b479cdd21d5a041437d90313e045e47ccc6e44eb21d4e56cc9fe1fb791cf5593427d0501b
diff --git a/dev-ruby/activerecord/activerecord-5.2.4.2.ebuild b/dev-ruby/activerecord/activerecord-5.2.4.2.ebuild
deleted file mode 100644
index ade4146d39dc..000000000000
--- a/dev-ruby/activerecord/activerecord-5.2.4.2.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby24 ruby25 ruby26"
-
-# this is not null so that the dependencies will actually be filled
-RUBY_FAKEGEM_TASK_TEST="test"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="activerecord.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem eapi7-ver
-
-DESCRIPTION="Implements the ActiveRecord pattern (Fowler, PoEAA) for ORM"
-HOMEPAGE="https://github.com/rails/rails/"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
-IUSE="mysql postgres sqlite"
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "~dev-ruby/activesupport-${PV}
- ~dev-ruby/activemodel-${PV}
- dev-ruby/arel:9.0
- sqlite? ( >=dev-ruby/sqlite3-1.3.6 )
- mysql? ( || ( dev-ruby/mysql2:0.5 dev-ruby/mysql2:0.4 ) )
- postgres? ( >=dev-ruby/pg-0.18.0:* )"
-
-ruby_add_bdepend "
- test? (
- dev-ruby/bundler
- ~dev-ruby/actionpack-${PV}
- ~dev-ruby/actionmailer-${PV}
- >=dev-ruby/sqlite3-1.3.6
- dev-ruby/mocha
- dev-ruby/minitest:5
- )"
-
-DEPEND+=" test? ( >=dev-db/sqlite-3.12.1 )"
-
-all_ruby_prepare() {
- # Remove items from the common Gemfile that we don't need for this
- # test run. This also requires handling some gemspecs.
- rm ../Gemfile.lock || die
- sed -i -e "/\(uglifier\|system_timer\|sdoc\|w3c_validators\|pg\|jquery-rails\|execjs\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|redcarpet\|minitest\|sprockets\|stackprof\)/ s:^:#:" \
- -e '/:job/,/end/ s:^:#:' \
- -e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
- sed -i -e '/rack-ssl/d' -e 's/~> 3.4/>= 3.4/' ../railties/railties.gemspec || die
- sed -e '/bcrypt/ s/3.0.0/3.0/' \
- -i ../Gemfile || die
-
- # Add back json in the Gemfile because we dropped some dependencies
- # earlier that implicitly required it.
- sed -i -e '$agem "json"' \
- ../Gemfile || die
-
- sed -e '3i gem "activesupport", "~> 5.2.0"' \
- -e '3i gem "activerecord", "~> 5.2.0"' \
- -e '3i gem "activemodel", "~> 5.2.0"' \
- -i test/cases/helper.rb || die
-
- # Avoid test depending on mysql adapter which we don't support for
- # this Rails version to simplify our dependencies.
- rm test/cases/connection_specification/resolver_test.rb || die
-
- # Avoid single test using mysql dependencies.
- rm test/cases/invalid_connection_test.rb || die
-
- # Avoid failing test that makes bad assumptions on database state.
- sed -i -e '/test_do_not_call_callbacks_for_delete_all/,/^ end/ s:^:#:' \
- test/cases/associations/has_many_associations_test.rb
-
- # Avoid test failing to bind limit length in favor of security release
- sed -i -e '/test_too_many_binds/askip "Fails on Gentoo"' test/cases/bind_parameter_test.rb || die
-}
-
-each_ruby_test() {
- if use sqlite; then
- MT_NO_PLUGINS=true ${RUBY} -S rake test_sqlite3 || die "sqlite3 tests failed"
- fi
-}
diff --git a/dev-ruby/activerecord/activerecord-6.0.2.2.ebuild b/dev-ruby/activerecord/activerecord-6.0.2.2.ebuild
deleted file mode 100644
index 8db6007cbcd6..000000000000
--- a/dev-ruby/activerecord/activerecord-6.0.2.2.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26"
-
-# this is not null so that the dependencies will actually be filled
-RUBY_FAKEGEM_TASK_TEST="test"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="activerecord.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Implements the ActiveRecord pattern (Fowler, PoEAA) for ORM"
-HOMEPAGE="https://github.com/rails/rails/"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~sparc ~x86"
-IUSE="mysql postgres sqlite"
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "~dev-ruby/activesupport-${PV}
- ~dev-ruby/activemodel-${PV}
- sqlite? ( >=dev-ruby/sqlite3-1.4 )
- mysql? ( || ( dev-ruby/mysql2:0.5 >=dev-ruby/mysql2-0.4.4:0.4 ) )
- postgres? ( || ( dev-ruby/pg:1 >=dev-ruby/pg-0.18.0:0 ) )"
-
-ruby_add_bdepend "
- test? (
- dev-ruby/bundler
- ~dev-ruby/actionpack-${PV}
- >=dev-ruby/sqlite3-1.3.6
- dev-ruby/mocha
- dev-ruby/minitest:5
- )"
-
-DEPEND+=" test? ( >=dev-db/sqlite-3.12.1 )"
-
-all_ruby_prepare() {
- # Remove items from the common Gemfile that we don't need for this
- # test run. This also requires handling some gemspecs.
- rm ../Gemfile.lock || die
- sed -i -e "/\(uglifier\|system_timer\|sdoc\|w3c_validators\|pg\|jquery-rails\|execjs\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|redcarpet\|minitest\|sprockets\|stackprof\)/ s:^:#:" \
- -e '/:job/,/end/ s:^:#:' \
- -e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
- sed -i -e '/rack-ssl/d' -e 's/~> 3.4/>= 3.4/' ../railties/railties.gemspec || die
- sed -e '/bcrypt/ s/3.0.0/3.0/' \
- -i ../Gemfile || die
-
- # Add back json in the Gemfile because we dropped some dependencies
- # earlier that implicitly required it.
- sed -i -e '$agem "json"' ../Gemfile || die
-
- # Avoid test depending on mysql adapter which we don't support for
- # this Rails version to simplify our dependencies.
- rm test/cases/connection_specification/resolver_test.rb || die
-
- # Avoid single tests using mysql or postgres dependencies.
- rm test/cases/invalid_connection_test.rb || die
- sed -e '/test_switching_connections_with_database_url/askip "postgres"' \
- -i test/cases/connection_adapters/connection_handlers_multi_db_test.rb || die
-
- # Avoid failing test that makes bad assumptions on database state.
- sed -i -e '/test_do_not_call_callbacks_for_delete_all/,/^ end/ s:^:#:' \
- test/cases/associations/has_many_associations_test.rb
-
- # Avoid test failing to bind limit length in favor of security release
- sed -i -e '/test_too_many_binds/askip "Fails on Gentoo"' test/cases/bind_parameter_test.rb || die
-}
-
-each_ruby_test() {
- if use sqlite; then
- ${RUBY} -S rake test_sqlite3 || die "sqlite3 tests failed"
- fi
-}
diff --git a/dev-ruby/activerecord/activerecord-6.0.3.1.ebuild b/dev-ruby/activerecord/activerecord-6.0.3.1.ebuild
deleted file mode 100644
index 952512d4e312..000000000000
--- a/dev-ruby/activerecord/activerecord-6.0.3.1.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
-
-# this is not null so that the dependencies will actually be filled
-RUBY_FAKEGEM_TASK_TEST="test"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="activerecord.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Implements the ActiveRecord pattern (Fowler, PoEAA) for ORM"
-HOMEPAGE="https://github.com/rails/rails/"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~sparc ~x86"
-IUSE="mysql postgres sqlite"
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "~dev-ruby/activesupport-${PV}
- ~dev-ruby/activemodel-${PV}
- sqlite? ( >=dev-ruby/sqlite3-1.4 )
- mysql? ( || ( dev-ruby/mysql2:0.5 >=dev-ruby/mysql2-0.4.4:0.4 ) )
- postgres? ( || ( dev-ruby/pg:1 >=dev-ruby/pg-0.18.0:0 ) )"
-
-ruby_add_bdepend "
- test? (
- dev-ruby/bundler
- ~dev-ruby/actionpack-${PV}
- >=dev-ruby/sqlite3-1.3.6
- dev-ruby/mocha
- dev-ruby/minitest:5
- )"
-
-DEPEND+=" test? ( >=dev-db/sqlite-3.12.1 )"
-
-all_ruby_prepare() {
- # Remove items from the common Gemfile that we don't need for this
- # test run. This also requires handling some gemspecs.
- rm ../Gemfile.lock || die
- sed -i -e "/\(uglifier\|system_timer\|sdoc\|w3c_validators\|pg\|jquery-rails\|execjs\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|redcarpet\|minitest\|sprockets\|stackprof\)/ s:^:#:" \
- -e '/:job/,/end/ s:^:#:' \
- -e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
- sed -i -e '/rack-ssl/d' -e 's/~> 3.4/>= 3.4/' ../railties/railties.gemspec || die
- sed -e '/bcrypt/ s/3.0.0/3.0/' \
- -i ../Gemfile || die
-
- # Add back json in the Gemfile because we dropped some dependencies
- # earlier that implicitly required it.
- sed -i -e '$agem "json"' ../Gemfile || die
-
- # Avoid test depending on mysql adapter which we don't support for
- # this Rails version to simplify our dependencies.
- rm test/cases/connection_specification/resolver_test.rb || die
-
- # Avoid single tests using mysql or postgres dependencies.
- rm test/cases/invalid_connection_test.rb || die
- sed -e '/test_switching_connections_with_database_url/askip "postgres"' \
- -i test/cases/connection_adapters/connection_handlers_multi_db_test.rb || die
-
- # Avoid failing test that makes bad assumptions on database state.
- sed -i -e '/test_do_not_call_callbacks_for_delete_all/,/^ end/ s:^:#:' \
- test/cases/associations/has_many_associations_test.rb
-
- # Avoid test failing to bind limit length in favor of security release
- sed -i -e '/test_too_many_binds/askip "Fails on Gentoo"' test/cases/bind_parameter_test.rb || die
-
- # Avoid test failing related to rubygems
- sed -i -e '/test_generates_absolute_path_with_given_root/askip "rubygems actiovation monitor"' test/cases/tasks/sqlite_rake_test.rb || die
-}
-
-each_ruby_test() {
- if use sqlite; then
- ${RUBY} -S rake test_sqlite3 || die "sqlite3 tests failed"
- fi
-}
diff --git a/dev-ruby/activerecord/activerecord-6.0.3.ebuild b/dev-ruby/activerecord/activerecord-6.0.3.ebuild
deleted file mode 100644
index 952512d4e312..000000000000
--- a/dev-ruby/activerecord/activerecord-6.0.3.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
-
-# this is not null so that the dependencies will actually be filled
-RUBY_FAKEGEM_TASK_TEST="test"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="activerecord.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Implements the ActiveRecord pattern (Fowler, PoEAA) for ORM"
-HOMEPAGE="https://github.com/rails/rails/"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~sparc ~x86"
-IUSE="mysql postgres sqlite"
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "~dev-ruby/activesupport-${PV}
- ~dev-ruby/activemodel-${PV}
- sqlite? ( >=dev-ruby/sqlite3-1.4 )
- mysql? ( || ( dev-ruby/mysql2:0.5 >=dev-ruby/mysql2-0.4.4:0.4 ) )
- postgres? ( || ( dev-ruby/pg:1 >=dev-ruby/pg-0.18.0:0 ) )"
-
-ruby_add_bdepend "
- test? (
- dev-ruby/bundler
- ~dev-ruby/actionpack-${PV}
- >=dev-ruby/sqlite3-1.3.6
- dev-ruby/mocha
- dev-ruby/minitest:5
- )"
-
-DEPEND+=" test? ( >=dev-db/sqlite-3.12.1 )"
-
-all_ruby_prepare() {
- # Remove items from the common Gemfile that we don't need for this
- # test run. This also requires handling some gemspecs.
- rm ../Gemfile.lock || die
- sed -i -e "/\(uglifier\|system_timer\|sdoc\|w3c_validators\|pg\|jquery-rails\|execjs\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|redcarpet\|minitest\|sprockets\|stackprof\)/ s:^:#:" \
- -e '/:job/,/end/ s:^:#:' \
- -e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
- sed -i -e '/rack-ssl/d' -e 's/~> 3.4/>= 3.4/' ../railties/railties.gemspec || die
- sed -e '/bcrypt/ s/3.0.0/3.0/' \
- -i ../Gemfile || die
-
- # Add back json in the Gemfile because we dropped some dependencies
- # earlier that implicitly required it.
- sed -i -e '$agem "json"' ../Gemfile || die
-
- # Avoid test depending on mysql adapter which we don't support for
- # this Rails version to simplify our dependencies.
- rm test/cases/connection_specification/resolver_test.rb || die
-
- # Avoid single tests using mysql or postgres dependencies.
- rm test/cases/invalid_connection_test.rb || die
- sed -e '/test_switching_connections_with_database_url/askip "postgres"' \
- -i test/cases/connection_adapters/connection_handlers_multi_db_test.rb || die
-
- # Avoid failing test that makes bad assumptions on database state.
- sed -i -e '/test_do_not_call_callbacks_for_delete_all/,/^ end/ s:^:#:' \
- test/cases/associations/has_many_associations_test.rb
-
- # Avoid test failing to bind limit length in favor of security release
- sed -i -e '/test_too_many_binds/askip "Fails on Gentoo"' test/cases/bind_parameter_test.rb || die
-
- # Avoid test failing related to rubygems
- sed -i -e '/test_generates_absolute_path_with_given_root/askip "rubygems actiovation monitor"' test/cases/tasks/sqlite_rake_test.rb || die
-}
-
-each_ruby_test() {
- if use sqlite; then
- ${RUBY} -S rake test_sqlite3 || die "sqlite3 tests failed"
- fi
-}
diff --git a/dev-ruby/activestorage/Manifest b/dev-ruby/activestorage/Manifest
index 0055cbcdc29d..1bbbb8882dac 100644
--- a/dev-ruby/activestorage/Manifest
+++ b/dev-ruby/activestorage/Manifest
@@ -1,6 +1,2 @@
-DIST rails-5.2.4.2.tgz 8823143 BLAKE2B 273bee6ccc2354bcfd8d24b320fe69c24f643c196eba053c727d30b13d4178069068c430a0a4112ae28c3e4b5a5dde0b66a7c46c7c28054f2b7a678427f478af SHA512 21561407a0b606dbd2fb6ad12ef910c0bdf3d5162db7e55f4f41f698280ba73664b0b5594930d4cebcb42a66e2e5e22de3523789818eb424443e8c5b2316b8fc
DIST rails-5.2.4.3.tgz 8824955 BLAKE2B 7db1bdda581e345713b796152c68e13911076c0af752aa91016a559fb380ee33b5f1822576120940995968efa6351165af0e21f97ff2e201bc8250f7e3178089 SHA512 b01b454f38593b50788cecef4f2b25938b0e176d24476bf0a8145b581c7327e0d8572a62fab4256372b51d75a9463431bbd98470a31298a6ff4d5f81f7ff92ce
-DIST rails-6.0.2.2.tgz 18556125 BLAKE2B f4ed5cc6cbbfa84fb687aba5a6c8f2f6ab68febb41147c40ed8dbc6253c128adbac6503e65e89fe672f50270716d197d8c05b4e1e286aafd76581fc167e6c5da SHA512 c1aab2d6c72948c75a047aec9d9f651f0c1bae78bb17e2fa0cb393113ee1e59980dc093e6f3fd3b2f3839c9b3bb4afcd0b0badfd9574b35b932275a9d9800689
-DIST rails-6.0.3.1.tgz 18567937 BLAKE2B fe6b58c2cb389f766d356f983787ddd602ee835e90cdbe26c25586c1304aa8c80d4ace2e0956326c0dd428dcd51a624d68d64667c2294c326779498a809ea6c9 SHA512 fcdaff0b0e4877a53f89b2b69c9271213297db8df8abccd071da5f2b2d3e3e6855914e1059596903f761b9a3891b31c2fdf10e887183f4433b260f84c4ebccdf
DIST rails-6.0.3.2.tgz 18568792 BLAKE2B 574d4b7da1bf0ff308ca1a64369c16e29396c8faddf741bc0f2b7d0c0761e440d64dade6ef67ba4923045c7eab1cd0689d45b6b26f3e3077020157a2b29fb17f SHA512 ea019bef7facc1b8b0d2f181da45d70456a895f2d57eb2410e4a06ba7bea0165dacc0f15fe5080150e4b4ef3c81dacee70b200468232da857fdf60def85b5aec
-DIST rails-6.0.3.tgz 18565682 BLAKE2B fe8601aec070535f487801eec16d944809be824e4833b7a906b47b4099dd5e72515ac3e492e4301dd651657fc2c4547ecbdd2c12265e04aad2758e9e284ad385 SHA512 f4572b4ebba9a79a6910c554f06e71efab5ccc0090e1a620e80b9d3b479cdd21d5a041437d90313e045e47ccc6e44eb21d4e56cc9fe1fb791cf5593427d0501b
diff --git a/dev-ruby/activestorage/activestorage-5.2.4.2.ebuild b/dev-ruby/activestorage/activestorage-5.2.4.2.ebuild
deleted file mode 100644
index 1d20b96d4df8..000000000000
--- a/dev-ruby/activestorage/activestorage-5.2.4.2.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_DOCDIR=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="activestorage.gemspec"
-
-RUBY_FAKEGEM_EXTRAINSTALL="app config db"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem eapi7-ver
-
-DESCRIPTION="Attach cloud and local files in Rails applications"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-DEPEND+=" test? ( app-text/mupdf ) "
-
-ruby_add_rdepend "
- ~dev-ruby/actionpack-${PV}:*
- ~dev-ruby/activerecord-${PV}:*
- >=dev-ruby/marcel-0.3.1 =dev-ruby/marcel-0.3*
-"
-
-ruby_add_bdepend "
- test? (
- ~dev-ruby/railties-${PV}
- dev-ruby/test-unit:2
- dev-ruby/mini_magick
- dev-ruby/mocha
- dev-ruby/rake
- dev-ruby/sqlite3
- )"
-
-all_ruby_prepare() {
- # Remove items from the common Gemfile that we don't need for this
- # test run. This also requires handling some gemspecs.
- sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|aws-sdk-s3\|google-cloud-storage\|azure-storage\|blade\|bootsnap\|hiredis\|qunit-selenium\|chromedriver-helper\|redis\|rb-inotify\|sprockets\|stackprof\|websocket-client-simple\|libxml-ruby\|sass-rails\|rubocop\|capybara\|rack-cache\|json\|dalli\|listen\|connection_pool\|puma\|mysql2\)/ s:^:#:" \
- -e '/dalli/ s/2.7.7/2.7.9/' \
- -e '/:job/,/end/ s:^:#:' \
- -e '/:test/,/^end/ s:^:#:' \
- -e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
- rm ../Gemfile.lock || die
-}
diff --git a/dev-ruby/activestorage/activestorage-6.0.2.2.ebuild b/dev-ruby/activestorage/activestorage-6.0.2.2.ebuild
deleted file mode 100644
index a866c2b3677f..000000000000
--- a/dev-ruby/activestorage/activestorage-6.0.2.2.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_DOC=""
-RUBY_FAKEGEM_DOCDIR=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="activestorage.gemspec"
-
-RUBY_FAKEGEM_EXTRAINSTALL="app config db"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Attach cloud and local files in Rails applications"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-DEPEND+=" test? ( app-text/mupdf ) "
-
-ruby_add_rdepend "
- ~dev-ruby/actionpack-${PV}:*
- ~dev-ruby/activerecord-${PV}:*
- >=dev-ruby/marcel-0.3.1 =dev-ruby/marcel-0.3*
-"
-
-ruby_add_bdepend "
- test? (
- ~dev-ruby/railties-${PV}
- >=dev-ruby/image_processing-1.2:0
- dev-ruby/test-unit:2
- dev-ruby/mini_magick
- dev-ruby/mocha
- dev-ruby/rake
- dev-ruby/sqlite3
- )"
-
-all_ruby_prepare() {
- # Remove items from the common Gemfile that we don't need for this
- # test run. This also requires handling some gemspecs.
- sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|aws-sdk-s3\|aws-sdk-sns\|google-cloud-storage\|azure-storage\|blade\|bootsnap\|hiredis\|qunit-selenium\|chromedriver-helper\|redis\|rb-inotify\|sprockets\|stackprof\|websocket-client-simple\|libxml-ruby\|sass-rails\|rubocop\|capybara\|rack-cache\|selenium\|json\|dalli\|listen\|connection_pool\|puma\|mysql2\|webdrivers\)/ s:^:#:" \
- -e '/dalli/ s/2.7.7/2.7.9/' \
- -e '/:job/,/end/ s:^:#:' \
- -e '/:test/,/^end/ s:^:#:' \
- -e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
- rm ../Gemfile.lock || die
-}
diff --git a/dev-ruby/activestorage/activestorage-6.0.3.1.ebuild b/dev-ruby/activestorage/activestorage-6.0.3.1.ebuild
deleted file mode 100644
index a866c2b3677f..000000000000
--- a/dev-ruby/activestorage/activestorage-6.0.3.1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_DOC=""
-RUBY_FAKEGEM_DOCDIR=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="activestorage.gemspec"
-
-RUBY_FAKEGEM_EXTRAINSTALL="app config db"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Attach cloud and local files in Rails applications"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-DEPEND+=" test? ( app-text/mupdf ) "
-
-ruby_add_rdepend "
- ~dev-ruby/actionpack-${PV}:*
- ~dev-ruby/activerecord-${PV}:*
- >=dev-ruby/marcel-0.3.1 =dev-ruby/marcel-0.3*
-"
-
-ruby_add_bdepend "
- test? (
- ~dev-ruby/railties-${PV}
- >=dev-ruby/image_processing-1.2:0
- dev-ruby/test-unit:2
- dev-ruby/mini_magick
- dev-ruby/mocha
- dev-ruby/rake
- dev-ruby/sqlite3
- )"
-
-all_ruby_prepare() {
- # Remove items from the common Gemfile that we don't need for this
- # test run. This also requires handling some gemspecs.
- sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|aws-sdk-s3\|aws-sdk-sns\|google-cloud-storage\|azure-storage\|blade\|bootsnap\|hiredis\|qunit-selenium\|chromedriver-helper\|redis\|rb-inotify\|sprockets\|stackprof\|websocket-client-simple\|libxml-ruby\|sass-rails\|rubocop\|capybara\|rack-cache\|selenium\|json\|dalli\|listen\|connection_pool\|puma\|mysql2\|webdrivers\)/ s:^:#:" \
- -e '/dalli/ s/2.7.7/2.7.9/' \
- -e '/:job/,/end/ s:^:#:' \
- -e '/:test/,/^end/ s:^:#:' \
- -e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
- rm ../Gemfile.lock || die
-}
diff --git a/dev-ruby/activestorage/activestorage-6.0.3.ebuild b/dev-ruby/activestorage/activestorage-6.0.3.ebuild
deleted file mode 100644
index a866c2b3677f..000000000000
--- a/dev-ruby/activestorage/activestorage-6.0.3.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_DOC=""
-RUBY_FAKEGEM_DOCDIR=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="activestorage.gemspec"
-
-RUBY_FAKEGEM_EXTRAINSTALL="app config db"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Attach cloud and local files in Rails applications"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-DEPEND+=" test? ( app-text/mupdf ) "
-
-ruby_add_rdepend "
- ~dev-ruby/actionpack-${PV}:*
- ~dev-ruby/activerecord-${PV}:*
- >=dev-ruby/marcel-0.3.1 =dev-ruby/marcel-0.3*
-"
-
-ruby_add_bdepend "
- test? (
- ~dev-ruby/railties-${PV}
- >=dev-ruby/image_processing-1.2:0
- dev-ruby/test-unit:2
- dev-ruby/mini_magick
- dev-ruby/mocha
- dev-ruby/rake
- dev-ruby/sqlite3
- )"
-
-all_ruby_prepare() {
- # Remove items from the common Gemfile that we don't need for this
- # test run. This also requires handling some gemspecs.
- sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|aws-sdk-s3\|aws-sdk-sns\|google-cloud-storage\|azure-storage\|blade\|bootsnap\|hiredis\|qunit-selenium\|chromedriver-helper\|redis\|rb-inotify\|sprockets\|stackprof\|websocket-client-simple\|libxml-ruby\|sass-rails\|rubocop\|capybara\|rack-cache\|selenium\|json\|dalli\|listen\|connection_pool\|puma\|mysql2\|webdrivers\)/ s:^:#:" \
- -e '/dalli/ s/2.7.7/2.7.9/' \
- -e '/:job/,/end/ s:^:#:' \
- -e '/:test/,/^end/ s:^:#:' \
- -e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
- rm ../Gemfile.lock || die
-}
diff --git a/dev-ruby/activesupport/Manifest b/dev-ruby/activesupport/Manifest
index 0055cbcdc29d..1bbbb8882dac 100644
--- a/dev-ruby/activesupport/Manifest
+++ b/dev-ruby/activesupport/Manifest
@@ -1,6 +1,2 @@
-DIST rails-5.2.4.2.tgz 8823143 BLAKE2B 273bee6ccc2354bcfd8d24b320fe69c24f643c196eba053c727d30b13d4178069068c430a0a4112ae28c3e4b5a5dde0b66a7c46c7c28054f2b7a678427f478af SHA512 21561407a0b606dbd2fb6ad12ef910c0bdf3d5162db7e55f4f41f698280ba73664b0b5594930d4cebcb42a66e2e5e22de3523789818eb424443e8c5b2316b8fc
DIST rails-5.2.4.3.tgz 8824955 BLAKE2B 7db1bdda581e345713b796152c68e13911076c0af752aa91016a559fb380ee33b5f1822576120940995968efa6351165af0e21f97ff2e201bc8250f7e3178089 SHA512 b01b454f38593b50788cecef4f2b25938b0e176d24476bf0a8145b581c7327e0d8572a62fab4256372b51d75a9463431bbd98470a31298a6ff4d5f81f7ff92ce
-DIST rails-6.0.2.2.tgz 18556125 BLAKE2B f4ed5cc6cbbfa84fb687aba5a6c8f2f6ab68febb41147c40ed8dbc6253c128adbac6503e65e89fe672f50270716d197d8c05b4e1e286aafd76581fc167e6c5da SHA512 c1aab2d6c72948c75a047aec9d9f651f0c1bae78bb17e2fa0cb393113ee1e59980dc093e6f3fd3b2f3839c9b3bb4afcd0b0badfd9574b35b932275a9d9800689
-DIST rails-6.0.3.1.tgz 18567937 BLAKE2B fe6b58c2cb389f766d356f983787ddd602ee835e90cdbe26c25586c1304aa8c80d4ace2e0956326c0dd428dcd51a624d68d64667c2294c326779498a809ea6c9 SHA512 fcdaff0b0e4877a53f89b2b69c9271213297db8df8abccd071da5f2b2d3e3e6855914e1059596903f761b9a3891b31c2fdf10e887183f4433b260f84c4ebccdf
DIST rails-6.0.3.2.tgz 18568792 BLAKE2B 574d4b7da1bf0ff308ca1a64369c16e29396c8faddf741bc0f2b7d0c0761e440d64dade6ef67ba4923045c7eab1cd0689d45b6b26f3e3077020157a2b29fb17f SHA512 ea019bef7facc1b8b0d2f181da45d70456a895f2d57eb2410e4a06ba7bea0165dacc0f15fe5080150e4b4ef3c81dacee70b200468232da857fdf60def85b5aec
-DIST rails-6.0.3.tgz 18565682 BLAKE2B fe8601aec070535f487801eec16d944809be824e4833b7a906b47b4099dd5e72515ac3e492e4301dd651657fc2c4547ecbdd2c12265e04aad2758e9e284ad385 SHA512 f4572b4ebba9a79a6910c554f06e71efab5ccc0090e1a620e80b9d3b479cdd21d5a041437d90313e045e47ccc6e44eb21d4e56cc9fe1fb791cf5593427d0501b
diff --git a/dev-ruby/activesupport/activesupport-5.2.4.2.ebuild b/dev-ruby/activesupport/activesupport-5.2.4.2.ebuild
deleted file mode 100644
index d3a60061e699..000000000000
--- a/dev-ruby/activesupport/activesupport-5.2.4.2.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_TASK_DOC=""
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="activesupport.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem eapi7-ver
-
-DESCRIPTION="Utility Classes and Extension to the Standard Library"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
- >=dev-ruby/concurrent-ruby-1.0.2:1
- dev-ruby/i18n:1
- >=dev-ruby/tzinfo-1.1:1
- >=dev-ruby/minitest-5.1:5"
-
-# memcache-client, nokogiri, and builder are not strictly
-# needed, but there are tests using this code.
-ruby_add_bdepend "test? (
- >=dev-ruby/dalli-2.2.1
- >=dev-ruby/nokogiri-1.4.5
- >=dev-ruby/builder-3.1.0
- >=dev-ruby/listen-3.0.5:3
- dev-ruby/rack
- dev-ruby/mocha
- )"
-
-all_ruby_prepare() {
- # Set the secure permissions that tests expect.
- chmod 0755 "${HOME}" || die "Failed to fix permissions on home"
-
- # Remove items from the common Gemfile that we don't need for this
- # test run. This also requires handling some gemspecs.
- sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|mysql\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|minitest\|sprockets\|stackprof\|rack-cache\|redis\|sqlite\)/ s:^:#:" \
- -e '/:job/,/end/ s:^:#:' \
- -e '/group :doc/,/^end/ s:^:#:' \
- -e 's/gemspec/gemspec path: "activesupport"/' \
- -e '5igem "builder"; gem "rack"' ../Gemfile || die
- rm ../Gemfile.lock || die
- sed -i -e '1igem "tzinfo", "~> 1.1"' test/abstract_unit.rb || die
-
- # Avoid test that depends on timezone
- sed -i -e '/test_implicit_coercion/,/^ end/ s:^:#:' test/core_ext/duration_test.rb || die
-
- # Avoid tests that seem to trigger race conditions.
- rm -f test/evented_file_update_checker_test.rb || die
-
- # Avoid test that generates filename that is too long
- sed -i -e '/test_filename_max_size/askip "gentoo"' test/cache/stores/file_store_test.rb || die
-
- # Avoid tests requiring a live redis running
- rm -f test/cache/stores/redis_cache_store_test.rb || die
- sed -i -e '/cache_stores:redis/ s:^:#:' Rakefile || die
-}
diff --git a/dev-ruby/activesupport/activesupport-6.0.2.2.ebuild b/dev-ruby/activesupport/activesupport-6.0.2.2.ebuild
deleted file mode 100644
index 29e908aae235..000000000000
--- a/dev-ruby/activesupport/activesupport-6.0.2.2.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="activesupport.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Utility Classes and Extension to the Standard Library"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~sparc ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
- >=dev-ruby/concurrent-ruby-1.0.2:1
- dev-ruby/i18n:1
- >=dev-ruby/tzinfo-1.1:1
- >=dev-ruby/minitest-5.1:5
- >=dev-ruby/zeitwerk-2.1.8:2
-"
-
-# memcache-client, nokogiri, and builder are not strictly
-# needed, but there are tests using this code.
-ruby_add_bdepend "test? (
- >=dev-ruby/dalli-2.2.1
- >=dev-ruby/nokogiri-1.4.5
- >=dev-ruby/builder-3.1.0
- >=dev-ruby/listen-3.0.5:3
- dev-ruby/rack
- dev-ruby/mocha
- )"
-
-all_ruby_prepare() {
- # Set the secure permissions that tests expect.
- chmod 0755 "${HOME}" || die "Failed to fix permissions on home"
-
- # Remove items from the common Gemfile that we don't need for this
- # test run. This also requires handling some gemspecs.
- sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|mysql\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|minitest\|sprockets\|stackprof\|rack-cache\|redis\|sqlite\)/ s:^:#:" \
- -e '/:job/,/end/ s:^:#:' \
- -e '/group :doc/,/^end/ s:^:#:' \
- -e 's/gemspec/gemspec path: "activesupport"/' \
- -e '5igem "builder"; gem "rack"' ../Gemfile || die
- rm ../Gemfile.lock || die
- sed -i -e '1igem "tzinfo", "~> 1.1"' test/abstract_unit.rb || die
-
- # Avoid test that depends on timezone
- sed -i -e '/test_implicit_coercion/,/^ end/ s:^:#:' test/core_ext/duration_test.rb || die
-
- # Avoid tests that seem to trigger race conditions.
- rm -f test/evented_file_update_checker_test.rb || die
-
- # Avoid test that generates filename that is too long
- sed -i -e '/test_filename_max_size/askip "gentoo"' test/cache/stores/file_store_test.rb || die
-
- # Avoid tests requiring a live redis running
- rm -f test/cache/stores/redis_cache_store_test.rb || die
- sed -i -e '/cache_stores:redis/ s:^:#:' Rakefile || die
-}
diff --git a/dev-ruby/activesupport/activesupport-6.0.3.1.ebuild b/dev-ruby/activesupport/activesupport-6.0.3.1.ebuild
deleted file mode 100644
index bf4536107f91..000000000000
--- a/dev-ruby/activesupport/activesupport-6.0.3.1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="activesupport.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Utility Classes and Extension to the Standard Library"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~sparc ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
- >=dev-ruby/concurrent-ruby-1.0.2:1
- dev-ruby/i18n:1
- >=dev-ruby/tzinfo-1.1:1
- >=dev-ruby/minitest-5.1:5
- >=dev-ruby/zeitwerk-2.1.8:2
-"
-
-# memcache-client, nokogiri, builder, and redis are not strictly needed,
-# but there are tests using this code.
-ruby_add_bdepend "test? (
- >=dev-ruby/dalli-2.2.1
- >=dev-ruby/nokogiri-1.4.5
- >=dev-ruby/builder-3.1.0
- >=dev-ruby/listen-3.0.5:3
- dev-ruby/rack
- dev-ruby/mocha
- )"
-
-all_ruby_prepare() {
- # Set the secure permissions that tests expect.
- chmod 0755 "${HOME}" || die "Failed to fix permissions on home"
-
- # Remove items from the common Gemfile that we don't need for this
- # test run. This also requires handling some gemspecs.
- sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|mysql\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|minitest\|sprockets\|stackprof\|rack-cache\|redis\|sqlite\)/ s:^:#:" \
- -e '/:job/,/end/ s:^:#:' \
- -e '/group :doc/,/^end/ s:^:#:' \
- -e 's/gemspec/gemspec path: "activesupport"/' \
- -e '5igem "builder"; gem "rack"' ../Gemfile || die
- rm ../Gemfile.lock || die
- sed -i -e '1igem "tzinfo", "~> 1.1"' test/abstract_unit.rb || die
-
- # Avoid test that depends on timezone
- sed -i -e '/test_implicit_coercion/,/^ end/ s:^:#:' test/core_ext/duration_test.rb || die
-
- # Avoid tests that seem to trigger race conditions.
- rm -f test/evented_file_update_checker_test.rb || die
-
- # Avoid test that generates filename that is too long
- sed -i -e '/test_filename_max_size/askip "gentoo"' test/cache/stores/file_store_test.rb || die
-
- # Avoid tests requiring a live redis running
- rm -f test/cache/stores/redis_cache_store_test.rb || die
- sed -i -e '/cache_stores:redis/ s:^:#:' Rakefile || die
- sed -i -e '/test_redis_cache_store/askip "lacking keywords"' test/cache/cache_store_setting_test.rb || die
-}
diff --git a/dev-ruby/activesupport/activesupport-6.0.3.ebuild b/dev-ruby/activesupport/activesupport-6.0.3.ebuild
deleted file mode 100644
index bf4536107f91..000000000000
--- a/dev-ruby/activesupport/activesupport-6.0.3.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="activesupport.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Utility Classes and Extension to the Standard Library"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~sparc ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
- >=dev-ruby/concurrent-ruby-1.0.2:1
- dev-ruby/i18n:1
- >=dev-ruby/tzinfo-1.1:1
- >=dev-ruby/minitest-5.1:5
- >=dev-ruby/zeitwerk-2.1.8:2
-"
-
-# memcache-client, nokogiri, builder, and redis are not strictly needed,
-# but there are tests using this code.
-ruby_add_bdepend "test? (
- >=dev-ruby/dalli-2.2.1
- >=dev-ruby/nokogiri-1.4.5
- >=dev-ruby/builder-3.1.0
- >=dev-ruby/listen-3.0.5:3
- dev-ruby/rack
- dev-ruby/mocha
- )"
-
-all_ruby_prepare() {
- # Set the secure permissions that tests expect.
- chmod 0755 "${HOME}" || die "Failed to fix permissions on home"
-
- # Remove items from the common Gemfile that we don't need for this
- # test run. This also requires handling some gemspecs.
- sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|mysql\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|minitest\|sprockets\|stackprof\|rack-cache\|redis\|sqlite\)/ s:^:#:" \
- -e '/:job/,/end/ s:^:#:' \
- -e '/group :doc/,/^end/ s:^:#:' \
- -e 's/gemspec/gemspec path: "activesupport"/' \
- -e '5igem "builder"; gem "rack"' ../Gemfile || die
- rm ../Gemfile.lock || die
- sed -i -e '1igem "tzinfo", "~> 1.1"' test/abstract_unit.rb || die
-
- # Avoid test that depends on timezone
- sed -i -e '/test_implicit_coercion/,/^ end/ s:^:#:' test/core_ext/duration_test.rb || die
-
- # Avoid tests that seem to trigger race conditions.
- rm -f test/evented_file_update_checker_test.rb || die
-
- # Avoid test that generates filename that is too long
- sed -i -e '/test_filename_max_size/askip "gentoo"' test/cache/stores/file_store_test.rb || die
-
- # Avoid tests requiring a live redis running
- rm -f test/cache/stores/redis_cache_store_test.rb || die
- sed -i -e '/cache_stores:redis/ s:^:#:' Rakefile || die
- sed -i -e '/test_redis_cache_store/askip "lacking keywords"' test/cache/cache_store_setting_test.rb || die
-}
diff --git a/dev-ruby/asciimath/Manifest b/dev-ruby/asciimath/Manifest
index bcf688aab8b8..851b31bed4b7 100644
--- a/dev-ruby/asciimath/Manifest
+++ b/dev-ruby/asciimath/Manifest
@@ -1,3 +1,4 @@
DIST asciimath-1.0.4.gem 14336 BLAKE2B 84aac2d2b987f72a17288cee6d00197c429e04c216fad62ecd23b5f3eebe9590ead519df86cdaf99246dcfee4c18bab67176a0d47a1b864de6e44bdb4b90b70c SHA512 e99e6f869dda3e0236392039e6dccf5912b095e32ee7acbfb4684a5d723d05f4d3c9961554d5beab2a3d703b1ef50c45ed15c0dbda2179ab35d3b1b6b8759b49
DIST asciimath-1.0.9.gem 18944 BLAKE2B 3ccc3f594d7a0d8b6996349d85356179ef3a9052a84f923ad1d0976e42f58670a350473b41d1c4a0c4f70a3cc4687e6adaa7987bd811ef32bd3da41f100f4246 SHA512 32c4f2cb7e9d330c371e9b9abcdf9e31bf44014c5c0b0044589302116b55840a2e1a41ab006d61a2258e4a5c2d4a772dad77f579150fc9bf099a7a4d19c6cd44
DIST asciimath-2.0.0.gem 57344 BLAKE2B 18cb2ca27a626bbb241768d070c47c981ae1f3a626cd9f476e7511f04f73154a1c3742338d92540bbd78fadbf775f4db7d2558c451fc8a276002fc5adc044ece SHA512 4823e7fa2e3107765d2804d15f5250dc30572099405df988ffe13f17ed584043bb7e48794cabc9b9853997083c57af5f3d73d20223ada95d00f997363130bedd
+DIST asciimath-2.0.1.gem 58880 BLAKE2B 6c17698f6515468c1c0b17408968f492a40a90cbec5184e78da8c9b9c23f2a6887f4d8ed1c99a68ed36489d27187dd73dc6ce992efc3ce144091131e36bc5e40 SHA512 e8c63e5f6035189460ac4975bb0471ffa418ba139ab806ae46badb74c1164d2852aef3aa799a0713a01486cea5c6087add6115ea22908bf3b70d1ab5fe339768
diff --git a/dev-ruby/asciimath/asciimath-2.0.1.ebuild b/dev-ruby/asciimath/asciimath-2.0.1.ebuild
new file mode 100644
index 000000000000..af059ffbabe4
--- /dev/null
+++ b/dev-ruby/asciimath/asciimath-2.0.1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.adoc README.adoc"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A pure Ruby AsciiMath parsing and conversion library"
+HOMEPAGE="https://github.com/pepijnve/asciimath"
+
+LICENSE="MIT"
+SLOT="1"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+ruby_add_bdepend "test? ( dev-ruby/nokogiri )"
diff --git a/dev-ruby/htmlentities/htmlentities-4.3.4.ebuild b/dev-ruby/htmlentities/htmlentities-4.3.4.ebuild
index 31ea5330efcb..5a0fe5319db3 100644
--- a/dev-ruby/htmlentities/htmlentities-4.3.4.ebuild
+++ b/dev-ruby/htmlentities/htmlentities-4.3.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
+USE_RUBY="ruby24 ruby25 ruby26 ruby27"
RUBY_FAKEGEM_TASK_TEST=""
RUBY_FAKEGEM_TASK_DOC=""
diff --git a/dev-ruby/itextomml/itextomml-1.6.0.ebuild b/dev-ruby/itextomml/itextomml-1.6.0.ebuild
index 22fcbeb33d94..e1e1d94cfb46 100644
--- a/dev-ruby/itextomml/itextomml-1.6.0.ebuild
+++ b/dev-ruby/itextomml/itextomml-1.6.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
+USE_RUBY="ruby24 ruby25 ruby26 ruby27"
RUBY_FAKEGEM_TASK_DOC=""
RUBY_FAKEGEM_EXTRADOC="README"
diff --git a/dev-ruby/locale/locale-2.1.3.ebuild b/dev-ruby/locale/locale-2.1.3.ebuild
index 088f8aa41a3f..105fbdb56368 100644
--- a/dev-ruby/locale/locale-2.1.3.ebuild
+++ b/dev-ruby/locale/locale-2.1.3.ebuild
@@ -20,7 +20,7 @@ HOMEPAGE="https://github.com/ruby-gettext/locale"
LICENSE="|| ( Ruby GPL-2 )"
SRC_URI="https://github.com/ruby-gettext/locale/archive/${PV}.tar.gz -> ${P}-git.tgz"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ppc ppc64 sparc x86 ~x86-macos"
SLOT="0"
IUSE=""
diff --git a/dev-ruby/net-sftp/Manifest b/dev-ruby/net-sftp/Manifest
index 8d1e5a666ea7..067884c48708 100644
--- a/dev-ruby/net-sftp/Manifest
+++ b/dev-ruby/net-sftp/Manifest
@@ -1,2 +1 @@
-DIST net-sftp-2.1.2.gem 67584 BLAKE2B 6b8e15f42c7a18f8c9aa7118e5822281eda6505c34697282cc9c52375ea0e4042f3045f41c2e9a15b8fd20f02946bfe6f3ad557aa5859a8e54e4c0ae8bd1d53d SHA512 126a9537a4ac45150096db4d46ad19e0d8a1833fef3733a1b66ff01463c0d109415f0ef807706ff88be8c5c1395bbd4620e529f06e3c9f746a4ed6ec2cb7d18d
DIST net-sftp-3.0.0.tar.gz 63542 BLAKE2B e09e209aa0d102a6da7611cabf49970c9a4e572d51946d5dc0688879db97c92e8a39713dd0011a4234391ff0ab685a978c491917c041f7d10a8f092fde5c876a SHA512 c28411cfa8522dec893fe7a1588a16bb761a9d7692c81c453d9a9ad817988637614c6afd754db8547e845a16062882e2b7e95974b889631676f092d9e84b83e7
diff --git a/dev-ruby/net-sftp/net-sftp-2.1.2-r4.ebuild b/dev-ruby/net-sftp/net-sftp-2.1.2-r4.ebuild
deleted file mode 100644
index c3a90e27d991..000000000000
--- a/dev-ruby/net-sftp/net-sftp-2.1.2-r4.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGES.txt README.rdoc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="SFTP in pure Ruby"
-HOMEPAGE="https://github.com/net-ssh/net-sftp"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE=""
-
-PATCHES=( "${FILESDIR}/${P}-net-ssh-4.patch" )
-
-ruby_add_rdepend "dev-ruby/net-ssh:4"
-
-ruby_add_bdepend "
- test? (
- >=dev-ruby/mocha-0.13
- )"
diff --git a/dev-ruby/oauth2/oauth2-1.4.4.ebuild b/dev-ruby/oauth2/oauth2-1.4.4.ebuild
index 50da772debc5..a2d97514e360 100644
--- a/dev-ruby/oauth2/oauth2-1.4.4.ebuild
+++ b/dev-ruby/oauth2/oauth2-1.4.4.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://github.com/intridea/oauth2/archive/v${PV}.tar.gz -> ${P}.tar.gz
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~ppc64"
IUSE=""
ruby_add_rdepend ">=dev-ruby/faraday-0.8 =dev-ruby/bundler-1.3:*
- >=dev-ruby/sprockets-rails-2.0.0:*
- asset-pipeline? (
- dev-ruby/jquery-rails:*
- >=dev-ruby/sass-rails-5.0:5.0
- >=dev-ruby/uglifier-1.3.0:*
- >=dev-ruby/coffee-rails-4.1.0:*
- )"
-
-# also: turbolinks, >=jbuilder-1.2:1
diff --git a/dev-ruby/rails/rails-6.0.2.2.ebuild b/dev-ruby/rails/rails-6.0.2.2.ebuild
deleted file mode 100644
index 3be9b73306e0..000000000000
--- a/dev-ruby/rails/rails-6.0.2.2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="ruby on rails is a web-application and persistance framework"
-HOMEPAGE="https://rubyonrails.org"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64"
-
-IUSE=""
-
-ruby_add_rdepend "
- ~dev-ruby/actioncable-${PV}
- ~dev-ruby/actionmailbox-${PV}
- ~dev-ruby/actionmailer-${PV}
- ~dev-ruby/actionpack-${PV}
- ~dev-ruby/actiontext-${PV}
- ~dev-ruby/actionview-${PV}
- ~dev-ruby/activejob-${PV}
- ~dev-ruby/activemodel-${PV}
- ~dev-ruby/activerecord-${PV}
- ~dev-ruby/activestorage-${PV}
- ~dev-ruby/activesupport-${PV}
- ~dev-ruby/railties-${PV}
- >=dev-ruby/bundler-1.3:*
- >=dev-ruby/sprockets-rails-2.0.0:*
-"
diff --git a/dev-ruby/rails/rails-6.0.3.1.ebuild b/dev-ruby/rails/rails-6.0.3.1.ebuild
deleted file mode 100644
index 3be9b73306e0..000000000000
--- a/dev-ruby/rails/rails-6.0.3.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="ruby on rails is a web-application and persistance framework"
-HOMEPAGE="https://rubyonrails.org"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64"
-
-IUSE=""
-
-ruby_add_rdepend "
- ~dev-ruby/actioncable-${PV}
- ~dev-ruby/actionmailbox-${PV}
- ~dev-ruby/actionmailer-${PV}
- ~dev-ruby/actionpack-${PV}
- ~dev-ruby/actiontext-${PV}
- ~dev-ruby/actionview-${PV}
- ~dev-ruby/activejob-${PV}
- ~dev-ruby/activemodel-${PV}
- ~dev-ruby/activerecord-${PV}
- ~dev-ruby/activestorage-${PV}
- ~dev-ruby/activesupport-${PV}
- ~dev-ruby/railties-${PV}
- >=dev-ruby/bundler-1.3:*
- >=dev-ruby/sprockets-rails-2.0.0:*
-"
diff --git a/dev-ruby/rails/rails-6.0.3.ebuild b/dev-ruby/rails/rails-6.0.3.ebuild
deleted file mode 100644
index 3be9b73306e0..000000000000
--- a/dev-ruby/rails/rails-6.0.3.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="ruby on rails is a web-application and persistance framework"
-HOMEPAGE="https://rubyonrails.org"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64"
-
-IUSE=""
-
-ruby_add_rdepend "
- ~dev-ruby/actioncable-${PV}
- ~dev-ruby/actionmailbox-${PV}
- ~dev-ruby/actionmailer-${PV}
- ~dev-ruby/actionpack-${PV}
- ~dev-ruby/actiontext-${PV}
- ~dev-ruby/actionview-${PV}
- ~dev-ruby/activejob-${PV}
- ~dev-ruby/activemodel-${PV}
- ~dev-ruby/activerecord-${PV}
- ~dev-ruby/activestorage-${PV}
- ~dev-ruby/activesupport-${PV}
- ~dev-ruby/railties-${PV}
- >=dev-ruby/bundler-1.3:*
- >=dev-ruby/sprockets-rails-2.0.0:*
-"
diff --git a/dev-ruby/railties/Manifest b/dev-ruby/railties/Manifest
index 0055cbcdc29d..1bbbb8882dac 100644
--- a/dev-ruby/railties/Manifest
+++ b/dev-ruby/railties/Manifest
@@ -1,6 +1,2 @@
-DIST rails-5.2.4.2.tgz 8823143 BLAKE2B 273bee6ccc2354bcfd8d24b320fe69c24f643c196eba053c727d30b13d4178069068c430a0a4112ae28c3e4b5a5dde0b66a7c46c7c28054f2b7a678427f478af SHA512 21561407a0b606dbd2fb6ad12ef910c0bdf3d5162db7e55f4f41f698280ba73664b0b5594930d4cebcb42a66e2e5e22de3523789818eb424443e8c5b2316b8fc
DIST rails-5.2.4.3.tgz 8824955 BLAKE2B 7db1bdda581e345713b796152c68e13911076c0af752aa91016a559fb380ee33b5f1822576120940995968efa6351165af0e21f97ff2e201bc8250f7e3178089 SHA512 b01b454f38593b50788cecef4f2b25938b0e176d24476bf0a8145b581c7327e0d8572a62fab4256372b51d75a9463431bbd98470a31298a6ff4d5f81f7ff92ce
-DIST rails-6.0.2.2.tgz 18556125 BLAKE2B f4ed5cc6cbbfa84fb687aba5a6c8f2f6ab68febb41147c40ed8dbc6253c128adbac6503e65e89fe672f50270716d197d8c05b4e1e286aafd76581fc167e6c5da SHA512 c1aab2d6c72948c75a047aec9d9f651f0c1bae78bb17e2fa0cb393113ee1e59980dc093e6f3fd3b2f3839c9b3bb4afcd0b0badfd9574b35b932275a9d9800689
-DIST rails-6.0.3.1.tgz 18567937 BLAKE2B fe6b58c2cb389f766d356f983787ddd602ee835e90cdbe26c25586c1304aa8c80d4ace2e0956326c0dd428dcd51a624d68d64667c2294c326779498a809ea6c9 SHA512 fcdaff0b0e4877a53f89b2b69c9271213297db8df8abccd071da5f2b2d3e3e6855914e1059596903f761b9a3891b31c2fdf10e887183f4433b260f84c4ebccdf
DIST rails-6.0.3.2.tgz 18568792 BLAKE2B 574d4b7da1bf0ff308ca1a64369c16e29396c8faddf741bc0f2b7d0c0761e440d64dade6ef67ba4923045c7eab1cd0689d45b6b26f3e3077020157a2b29fb17f SHA512 ea019bef7facc1b8b0d2f181da45d70456a895f2d57eb2410e4a06ba7bea0165dacc0f15fe5080150e4b4ef3c81dacee70b200468232da857fdf60def85b5aec
-DIST rails-6.0.3.tgz 18565682 BLAKE2B fe8601aec070535f487801eec16d944809be824e4833b7a906b47b4099dd5e72515ac3e492e4301dd651657fc2c4547ecbdd2c12265e04aad2758e9e284ad385 SHA512 f4572b4ebba9a79a6910c554f06e71efab5ccc0090e1a620e80b9d3b479cdd21d5a041437d90313e045e47ccc6e44eb21d4e56cc9fe1fb791cf5593427d0501b
diff --git a/dev-ruby/railties/railties-5.2.4.2.ebuild b/dev-ruby/railties/railties-5.2.4.2.ebuild
deleted file mode 100644
index 8759d5a09f8a..000000000000
--- a/dev-ruby/railties/railties-5.2.4.2.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_TASK_TEST="test:regular"
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="railties.gemspec"
-
-RUBY_FAKEGEM_BINDIR="exe"
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem eapi7-ver
-
-DESCRIPTION="Tools for creating, working with, and running Rails applications"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-# The test suite has many failures, most likely due to a mismatch in
-# exact dependencies or environment specifics. Needs further
-# investigation.
-RESTRICT="test"
-
-RDEPEND+=">=app-eselect/eselect-rails-0.24"
-
-ruby_add_rdepend "
- ~dev-ruby/activesupport-${PV}
- ~dev-ruby/actionpack-${PV}
- >=dev-ruby/thor-0.18.1
- >=dev-ruby/rake-0.8.7
- dev-ruby/method_source
-"
-
-ruby_add_bdepend "
- test? (
- ~dev-ruby/actionview-${PV}
- dev-ruby/mocha:0.14
- )"
-
-all_ruby_prepare() {
- rm "${S}/../Gemfile" || die "Unable to remove Gemfile"
- sed -i -e '/load_paths/d' test/abstract_unit.rb || die "Unable to remove load paths"
- sed -i -e '1igem "minitest", "~>4.0"' test/abstract_unit.rb || die
-}
-
-all_ruby_install() {
- all_fakegem_install
-
- ruby_fakegem_binwrapper rails rails-${PV}
-}
-
-pkg_postinst() {
- elog "To select between slots of rails, use:"
- elog "\teselect rails"
-
- eselect rails update
-}
-
-pkg_postrm() {
- eselect rails update
-}
diff --git a/dev-ruby/railties/railties-6.0.2.2.ebuild b/dev-ruby/railties/railties-6.0.2.2.ebuild
deleted file mode 100644
index 965e9f44c026..000000000000
--- a/dev-ruby/railties/railties-6.0.2.2.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26"
-
-RUBY_FAKEGEM_TASK_TEST="test:regular"
-RUBY_FAKEGEM_RECIPE_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="railties.gemspec"
-
-RUBY_FAKEGEM_BINDIR="exe"
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Tools for creating, working with, and running Rails applications"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-# The test suite has many failures, most likely due to a mismatch in
-# exact dependencies or environment specifics. Needs further
-# investigation.
-RESTRICT="test"
-
-RDEPEND+=">=app-eselect/eselect-rails-0.24"
-
-ruby_add_rdepend "
- ~dev-ruby/activesupport-${PV}
- ~dev-ruby/actionpack-${PV}
- >=dev-ruby/thor-0.20.3
- >=dev-ruby/rake-0.8.7
- dev-ruby/method_source
-"
-
-ruby_add_bdepend "
- test? (
- ~dev-ruby/actionview-${PV}
- dev-ruby/mocha:0.14
- )"
-
-all_ruby_prepare() {
- rm "${S}/../Gemfile" || die "Unable to remove Gemfile"
- sed -i -e '/load_paths/d' test/abstract_unit.rb || die "Unable to remove load paths"
- sed -i -e '1igem "minitest", "~>4.0"' test/abstract_unit.rb || die
-}
-
-all_ruby_install() {
- all_fakegem_install
-
- ruby_fakegem_binwrapper rails rails-${PV}
-}
-
-pkg_postinst() {
- elog "To select between slots of rails, use:"
- elog "\teselect rails"
-
- eselect rails update
-}
-
-pkg_postrm() {
- eselect rails update
-}
diff --git a/dev-ruby/railties/railties-6.0.3.1.ebuild b/dev-ruby/railties/railties-6.0.3.1.ebuild
deleted file mode 100644
index 828467ed5289..000000000000
--- a/dev-ruby/railties/railties-6.0.3.1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_TASK_TEST="test:regular"
-RUBY_FAKEGEM_RECIPE_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="railties.gemspec"
-
-RUBY_FAKEGEM_BINDIR="exe"
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Tools for creating, working with, and running Rails applications"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-# The test suite has many failures, most likely due to a mismatch in
-# exact dependencies or environment specifics. Needs further
-# investigation.
-RESTRICT="test"
-
-RDEPEND+=">=app-eselect/eselect-rails-0.24"
-
-ruby_add_rdepend "
- ~dev-ruby/activesupport-${PV}
- ~dev-ruby/actionpack-${PV}
- >=dev-ruby/thor-0.20.3
- >=dev-ruby/rake-0.8.7
- dev-ruby/method_source
-"
-
-ruby_add_bdepend "
- test? (
- ~dev-ruby/actionview-${PV}
- dev-ruby/mocha:0.14
- )"
-
-all_ruby_prepare() {
- rm "${S}/../Gemfile" || die "Unable to remove Gemfile"
- sed -i -e '/load_paths/d' test/abstract_unit.rb || die "Unable to remove load paths"
- sed -i -e '1igem "minitest", "~>4.0"' test/abstract_unit.rb || die
-}
-
-all_ruby_install() {
- all_fakegem_install
-
- ruby_fakegem_binwrapper rails rails-${PV}
-}
-
-pkg_postinst() {
- elog "To select between slots of rails, use:"
- elog "\teselect rails"
-
- eselect rails update
-}
-
-pkg_postrm() {
- eselect rails update
-}
diff --git a/dev-ruby/railties/railties-6.0.3.ebuild b/dev-ruby/railties/railties-6.0.3.ebuild
deleted file mode 100644
index 828467ed5289..000000000000
--- a/dev-ruby/railties/railties-6.0.3.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_TASK_TEST="test:regular"
-RUBY_FAKEGEM_RECIPE_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="railties.gemspec"
-
-RUBY_FAKEGEM_BINDIR="exe"
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Tools for creating, working with, and running Rails applications"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-# The test suite has many failures, most likely due to a mismatch in
-# exact dependencies or environment specifics. Needs further
-# investigation.
-RESTRICT="test"
-
-RDEPEND+=">=app-eselect/eselect-rails-0.24"
-
-ruby_add_rdepend "
- ~dev-ruby/activesupport-${PV}
- ~dev-ruby/actionpack-${PV}
- >=dev-ruby/thor-0.20.3
- >=dev-ruby/rake-0.8.7
- dev-ruby/method_source
-"
-
-ruby_add_bdepend "
- test? (
- ~dev-ruby/actionview-${PV}
- dev-ruby/mocha:0.14
- )"
-
-all_ruby_prepare() {
- rm "${S}/../Gemfile" || die "Unable to remove Gemfile"
- sed -i -e '/load_paths/d' test/abstract_unit.rb || die "Unable to remove load paths"
- sed -i -e '1igem "minitest", "~>4.0"' test/abstract_unit.rb || die
-}
-
-all_ruby_install() {
- all_fakegem_install
-
- ruby_fakegem_binwrapper rails rails-${PV}
-}
-
-pkg_postinst() {
- elog "To select between slots of rails, use:"
- elog "\teselect rails"
-
- eselect rails update
-}
-
-pkg_postrm() {
- eselect rails update
-}
diff --git a/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.7.2.ebuild b/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.7.2.ebuild
index ddafe5b470cc..ff836e1b91e6 100644
--- a/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.7.2.ebuild
+++ b/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.7.2.ebuild
@@ -16,7 +16,7 @@ RUBY_S="$MY_P"/bindings/ruby
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
IUSE="graph test"
RESTRICT="!test? ( test )"
REQUIRED_USE="test? ( graph )"
diff --git a/dev-ruby/rspec-stubbed_env/rspec-stubbed_env-1.0.0.ebuild b/dev-ruby/rspec-stubbed_env/rspec-stubbed_env-1.0.0.ebuild
index b0045d2c164b..c75bc46040e7 100644
--- a/dev-ruby/rspec-stubbed_env/rspec-stubbed_env-1.0.0.ebuild
+++ b/dev-ruby/rspec-stubbed_env/rspec-stubbed_env-1.0.0.ebuild
@@ -18,6 +18,6 @@ IUSE=""
SLOT="1"
LICENSE="MIT"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~ppc64"
ruby_add_rdepend ">=dev-ruby/rspec-3.0"
diff --git a/dev-ruby/ruby-gettext/Manifest b/dev-ruby/ruby-gettext/Manifest
index f5b0c05e68df..8dbf8c746a80 100644
--- a/dev-ruby/ruby-gettext/Manifest
+++ b/dev-ruby/ruby-gettext/Manifest
@@ -1,5 +1,2 @@
DIST gettext-3.2.9.gem 285696 BLAKE2B a7bc40b2102f5b937d5f0e407dbaa23ead1da59eb9284c10a249c59548d0e2ad5fcd56b8855439893d2d31b57e0109bb6a9d5cc2d24075f5e360dc16b9291137 SHA512 21496c38cfc16a2b280f30bb94ff4560007eaa7f02c2341cb26aca2969a663c0863cdb650b4eadfd262d8585111dfb572e2ebc66a7a879045de50bf9da80a501
-DIST gettext-3.3.2.gem 289280 BLAKE2B f18af8ca573c7a503983c741cb719896208f062b83382533fe818c0ca2e6b3eb5c4491150dd43ba5701ec0fa9a52c1b7686b938d05da6e4a35c5823fe447b4f9 SHA512 92ec140795fe4477754349375413061f20933daddf71f024b989b85fa05a773aa63583c11d982f7c65ab6e842ed03d2083834883ddd45a76f84655ae814969c2
-DIST gettext-3.3.3.gem 290304 BLAKE2B 17a9020660c0f9793d86428cf5738485e9b76d88d23a41aef053ef2c7034d6b98f1c880a61a37c6b04dfce37dc82672bbd6659312da5279e6e0c85212206559a SHA512 f14cd5166d16c592cec6e9b3ad5b2e5e27889cee0380b70abc3a6a69bcd8bcd1f742c88021e58ba843655d22e731decaeb1151e359fb49f613e71721e675cbf8
-DIST gettext-3.3.4.gem 290304 BLAKE2B 70b24b598dcbbe85ab9d1cf6c6e59e911b67f7ceccc3482b16096abb0bec2ac94197febf36b839ff1d6917fe44df69c570ae15a2d44a3bc2dc070ed9ca864382 SHA512 79b731968f94287597b3bd6219c1f5cf3c37206d3a024f5998cde9a61ef60334557d1bb51f1e439de64eb8cc6bc60511577763a71e6f3b3c65cc7c52ac221aa4
DIST gettext-3.3.5.gem 290816 BLAKE2B 74434c3feaedc16a17ee530669dacbc4b32ae0be95eb903ce89131619e862e1c823351653ce3c5f95f0882c183e3b2fe87b423a245aa2d8803688ce7e6afb5f7 SHA512 6777b96dd73b3d454c0a14a40d2ac0eac52894fa58067ba9ec976627c96efc98b294b1498bed965d0426bcaa1b371dcde5745101e05e21e408397b4e8d31894b
diff --git a/dev-ruby/ruby-gettext/ruby-gettext-3.3.2.ebuild b/dev-ruby/ruby-gettext/ruby-gettext-3.3.2.ebuild
deleted file mode 100644
index f1094d10f26b..000000000000
--- a/dev-ruby/ruby-gettext/ruby-gettext-3.3.2.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26"
-
-RUBY_FAKEGEM_NAME="${PN/ruby-/}"
-RUBY_FAKEGEM_VERSION="${PV%_*}"
-
-RUBY_FAKEGEM_RECIPE_DOC="yard"
-RUBY_FAKEGEM_EXTRADOC="README.md doc/text/news.md"
-
-RUBY_FAKEGEM_TASK_TEST="none"
-
-RUBY_FAKEGEM_EXTRAINSTALL="locale po"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Native Language Support Library and Tools modeled after GNU gettext package"
-HOMEPAGE="https://ruby-gettext.github.io/"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="doc test"
-SLOT="0"
-LICENSE="|| ( Ruby LGPL-3+ )"
-
-ruby_add_rdepend ">=dev-ruby/locale-2.0.5 >=dev-ruby/text-1.3.0"
-
-ruby_add_bdepend "doc? ( dev-ruby/yard )
- dev-ruby/racc"
-ruby_add_bdepend "test? (
- dev-ruby/test-unit:2
- dev-ruby/test-unit-rr )"
-
-RDEPEND+=" sys-devel/gettext"
-DEPEND+=" sys-devel/gettext"
-
-all_ruby_prepare() {
- # Fix broken racc invocation
- sed -i -e '/command_line/ s/#{racc}/-S racc/' Rakefile || die
-
- # Avoid bundler dependency
- sed -i -e '/bundler/,/helper.install/ s:^:#:' \
- -e 's/helper.gemspec/Gem::Specification.new/' Rakefile || die
-
- # Avoid dependency on developer-specific tools.
- sed -i -e '/notify/ s:^:#:' test/run-test.rb || die
-
- # Avoid tests failing due to a missing test file.
- #sed -i -e '/test_invalid_charset/,/end/ s:^:#:' test/test_mo.rb || die
-
- # Avoid SAFE mode test that fails on ruby 2.6
- sed -i -e '/test_safe_mode/aomit' test/test_gettext.rb || die
-}
-
-each_ruby_test() {
- # Upstream tries to daisy-chain rake calls but they fail badly
- # with our setup, so run it manually.
- ${RUBY} test/run-test.rb || die "tests failed"
-}
-
-all_ruby_install() {
- all_fakegem_install
-
- dodoc -r samples
-}
diff --git a/dev-ruby/ruby-gettext/ruby-gettext-3.3.3.ebuild b/dev-ruby/ruby-gettext/ruby-gettext-3.3.3.ebuild
deleted file mode 100644
index f1094d10f26b..000000000000
--- a/dev-ruby/ruby-gettext/ruby-gettext-3.3.3.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26"
-
-RUBY_FAKEGEM_NAME="${PN/ruby-/}"
-RUBY_FAKEGEM_VERSION="${PV%_*}"
-
-RUBY_FAKEGEM_RECIPE_DOC="yard"
-RUBY_FAKEGEM_EXTRADOC="README.md doc/text/news.md"
-
-RUBY_FAKEGEM_TASK_TEST="none"
-
-RUBY_FAKEGEM_EXTRAINSTALL="locale po"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Native Language Support Library and Tools modeled after GNU gettext package"
-HOMEPAGE="https://ruby-gettext.github.io/"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="doc test"
-SLOT="0"
-LICENSE="|| ( Ruby LGPL-3+ )"
-
-ruby_add_rdepend ">=dev-ruby/locale-2.0.5 >=dev-ruby/text-1.3.0"
-
-ruby_add_bdepend "doc? ( dev-ruby/yard )
- dev-ruby/racc"
-ruby_add_bdepend "test? (
- dev-ruby/test-unit:2
- dev-ruby/test-unit-rr )"
-
-RDEPEND+=" sys-devel/gettext"
-DEPEND+=" sys-devel/gettext"
-
-all_ruby_prepare() {
- # Fix broken racc invocation
- sed -i -e '/command_line/ s/#{racc}/-S racc/' Rakefile || die
-
- # Avoid bundler dependency
- sed -i -e '/bundler/,/helper.install/ s:^:#:' \
- -e 's/helper.gemspec/Gem::Specification.new/' Rakefile || die
-
- # Avoid dependency on developer-specific tools.
- sed -i -e '/notify/ s:^:#:' test/run-test.rb || die
-
- # Avoid tests failing due to a missing test file.
- #sed -i -e '/test_invalid_charset/,/end/ s:^:#:' test/test_mo.rb || die
-
- # Avoid SAFE mode test that fails on ruby 2.6
- sed -i -e '/test_safe_mode/aomit' test/test_gettext.rb || die
-}
-
-each_ruby_test() {
- # Upstream tries to daisy-chain rake calls but they fail badly
- # with our setup, so run it manually.
- ${RUBY} test/run-test.rb || die "tests failed"
-}
-
-all_ruby_install() {
- all_fakegem_install
-
- dodoc -r samples
-}
diff --git a/dev-ruby/ruby-gettext/ruby-gettext-3.3.4.ebuild b/dev-ruby/ruby-gettext/ruby-gettext-3.3.4.ebuild
deleted file mode 100644
index f1094d10f26b..000000000000
--- a/dev-ruby/ruby-gettext/ruby-gettext-3.3.4.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26"
-
-RUBY_FAKEGEM_NAME="${PN/ruby-/}"
-RUBY_FAKEGEM_VERSION="${PV%_*}"
-
-RUBY_FAKEGEM_RECIPE_DOC="yard"
-RUBY_FAKEGEM_EXTRADOC="README.md doc/text/news.md"
-
-RUBY_FAKEGEM_TASK_TEST="none"
-
-RUBY_FAKEGEM_EXTRAINSTALL="locale po"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Native Language Support Library and Tools modeled after GNU gettext package"
-HOMEPAGE="https://ruby-gettext.github.io/"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="doc test"
-SLOT="0"
-LICENSE="|| ( Ruby LGPL-3+ )"
-
-ruby_add_rdepend ">=dev-ruby/locale-2.0.5 >=dev-ruby/text-1.3.0"
-
-ruby_add_bdepend "doc? ( dev-ruby/yard )
- dev-ruby/racc"
-ruby_add_bdepend "test? (
- dev-ruby/test-unit:2
- dev-ruby/test-unit-rr )"
-
-RDEPEND+=" sys-devel/gettext"
-DEPEND+=" sys-devel/gettext"
-
-all_ruby_prepare() {
- # Fix broken racc invocation
- sed -i -e '/command_line/ s/#{racc}/-S racc/' Rakefile || die
-
- # Avoid bundler dependency
- sed -i -e '/bundler/,/helper.install/ s:^:#:' \
- -e 's/helper.gemspec/Gem::Specification.new/' Rakefile || die
-
- # Avoid dependency on developer-specific tools.
- sed -i -e '/notify/ s:^:#:' test/run-test.rb || die
-
- # Avoid tests failing due to a missing test file.
- #sed -i -e '/test_invalid_charset/,/end/ s:^:#:' test/test_mo.rb || die
-
- # Avoid SAFE mode test that fails on ruby 2.6
- sed -i -e '/test_safe_mode/aomit' test/test_gettext.rb || die
-}
-
-each_ruby_test() {
- # Upstream tries to daisy-chain rake calls but they fail badly
- # with our setup, so run it manually.
- ${RUBY} test/run-test.rb || die "tests failed"
-}
-
-all_ruby_install() {
- all_fakegem_install
-
- dodoc -r samples
-}
diff --git a/dev-ruby/ruby-gettext/ruby-gettext-3.3.5.ebuild b/dev-ruby/ruby-gettext/ruby-gettext-3.3.5.ebuild
index 7ce7349633f1..899f02e370ee 100644
--- a/dev-ruby/ruby-gettext/ruby-gettext-3.3.5.ebuild
+++ b/dev-ruby/ruby-gettext/ruby-gettext-3.3.5.ebuild
@@ -20,7 +20,7 @@ inherit ruby-fakegem
DESCRIPTION="Native Language Support Library and Tools modeled after GNU gettext package"
HOMEPAGE="https://ruby-gettext.github.io/"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ppc ppc64 sparc x86"
IUSE="doc test"
SLOT="0"
LICENSE="|| ( Ruby LGPL-3+ )"
diff --git a/dev-ruby/sanitize/Manifest b/dev-ruby/sanitize/Manifest
index 2257fc237800..569814bcbf42 100644
--- a/dev-ruby/sanitize/Manifest
+++ b/dev-ruby/sanitize/Manifest
@@ -1,5 +1,2 @@
DIST sanitize-4.6.6.tar.gz 1349809 BLAKE2B d34f3359f1241881f96d48cfce6aa554796e7c7a2282c729dc93b6db7f1c5d2ec1677ebd1cddb79cb14f84d7724ddb7dad551136cd130bd89750ab5851a8094f SHA512 6f2567601dea9fd08996fe537e5543c7618e407a68580a19b74333a6e840d1123891a087e6c57c88f887390cd04e4c25af71547d7d9622e61369dc4ffe92f220
-DIST sanitize-5.0.0.tar.gz 1350342 BLAKE2B 0c4a8e442a2dc9748dfb4ab2cf13862bbb2692665194ae8aa18bf84bac200e5622fa05cf2a022d7a0c3a7ddd901996f028948f517f8f6227d0aad2479f05996c SHA512 dcfaec0666bb017580deaa4a9fb2c6e50dc678fe26bd57db7451472e1558ff7adaa6e0bd43554ceb68501a92d25405415ce6570806b177d7d92f138666f5169c
-DIST sanitize-5.1.0.tar.gz 1351620 BLAKE2B 098fc23c87d02d73341e466b6bb4440037f5a46841a898e05f37bc3379df8534ade8948e58173725d93b620627d8ba9c5a9a9e55b6d29f52b43fd7328cd6fd3f SHA512 d6c1f28795f881ab7fd11283c29f8e09b15bf393ee1b419aa9b8bbe41a7a7a28b5644a1c55b8e87534acf0ac73f1a07c14964c3d158814302dee57eaf2e91f90
-DIST sanitize-5.2.0.tar.gz 1352054 BLAKE2B a0502805472bbe3d9bfb7c647bde6fd67d7204addf7e351c890e3db001c7095f0292d19b338aef73ef35f3f46525b9365bfcac820820025578b5bcf60afaa01d SHA512 9851145f9a4e07c18da15de809ca8120739d6062bdbc10d39947bbffc8b41385f6d8e8e5abebb5c4d29c5dfa68ff772767758cc079fe13b44e055a61bd978ab4
DIST sanitize-5.2.1.tar.gz 1352785 BLAKE2B 2742085ac296869b8be36cf803f999475032c147d94aa0fba77fb83b8305470baf144f4c68fc5711871779f327c9bf1ba8b3b817f3777a04fb0b9c726318ee1d SHA512 3384d01db244f9f7feeb67bf2fae5773a85f512411bd761db6a71ab3fb690fac33c0caae848e5a4df6f202be7dd7cc52f8bac4c82bef447d20dbc70a586ed82f
diff --git a/dev-ruby/sanitize/sanitize-5.0.0.ebuild b/dev-ruby/sanitize/sanitize-5.0.0.ebuild
deleted file mode 100644
index 3b5304727231..000000000000
--- a/dev-ruby/sanitize/sanitize-5.0.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="HISTORY.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Sanitize is a whitelist-based HTML sanitizer"
-HOMEPAGE="https://github.com/rgrove/sanitize"
-SRC_URI="https://github.com/rgrove/sanitize/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="5"
-KEYWORDS="~amd64 ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-
-ruby_add_rdepend "
- >=dev-ruby/crass-1.0.2 =dev-ruby/crass-1.0*
- >=dev-ruby/nokogiri-1.8.0
- dev-ruby/nokogumbo:2"
-ruby_add_bdepend "test? ( dev-ruby/minitest )"
-
-each_ruby_test() {
- ${RUBY} -Ilib test/test_sanitize.rb || die
-}
diff --git a/dev-ruby/sanitize/sanitize-5.1.0.ebuild b/dev-ruby/sanitize/sanitize-5.1.0.ebuild
deleted file mode 100644
index c5bc9ca51fd6..000000000000
--- a/dev-ruby/sanitize/sanitize-5.1.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="HISTORY.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Sanitize is a whitelist-based HTML sanitizer"
-HOMEPAGE="https://github.com/rgrove/sanitize"
-SRC_URI="https://github.com/rgrove/sanitize/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="5"
-KEYWORDS="~amd64 ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-
-ruby_add_rdepend "
- >=dev-ruby/crass-1.0.2 =dev-ruby/crass-1.0*
- >=dev-ruby/nokogiri-1.8.0
- dev-ruby/nokogumbo:2"
-ruby_add_bdepend "test? ( dev-ruby/minitest )"
-
-each_ruby_test() {
- ${RUBY} -Ilib test/test_sanitize.rb || die
-}
diff --git a/dev-ruby/sanitize/sanitize-5.2.0.ebuild b/dev-ruby/sanitize/sanitize-5.2.0.ebuild
deleted file mode 100644
index 980f5a48297e..000000000000
--- a/dev-ruby/sanitize/sanitize-5.2.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="HISTORY.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Sanitize is a whitelist-based HTML sanitizer"
-HOMEPAGE="https://github.com/rgrove/sanitize"
-SRC_URI="https://github.com/rgrove/sanitize/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="5"
-KEYWORDS="~amd64 ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-
-ruby_add_rdepend "
- >=dev-ruby/crass-1.0.2 =dev-ruby/crass-1.0*
- >=dev-ruby/nokogiri-1.8.0
- dev-ruby/nokogumbo:2"
-ruby_add_bdepend "test? ( dev-ruby/minitest )"
-
-each_ruby_test() {
- ${RUBY} -Ilib test/test_sanitize.rb || die
-}
diff --git a/dev-ruby/sinatra/Manifest b/dev-ruby/sinatra/Manifest
index c10a3cd61587..fb75b2b5080f 100644
--- a/dev-ruby/sinatra/Manifest
+++ b/dev-ruby/sinatra/Manifest
@@ -1,4 +1,2 @@
DIST sinatra-1.4.8.gem 369152 BLAKE2B 8a344f85c34dc8736180551690bc55ee615118a243c48421711339f2ef366e6c6facfecf914594f0440a825244e13f98648d11903fd9053054767a58a34aa285 SHA512 e56a5a6d7ceb0be4bc537feb6ada2956f1fd64b452dee347b259837aa02041dfa53d9808531cdd0a02a91093ba92f7c505c39f0dd990dfbc6e872681f40bc5e9
-DIST sinatra-2.0.5.tar.gz 490580 BLAKE2B 6e82a02bf57f8ec6f0c5313b6b6e89e899a5cdc9ff39e897903b6991f990ec75135483c2ef5ac71032abf7afdc84402bbad431f9ae579bab94e3b140d3ce6911 SHA512 da626d584f065f924fa5a42802b0e7a03e40e780cfd92e9cb072c86e9cb6d8ba4a699d7383a81b13ac0ffd0ce427900cdf059b77565ace5961dbd00c088ce0f9
-DIST sinatra-2.0.7.tar.gz 490969 BLAKE2B 292bc4902ad3c5ff0665f12825ede4ea44bd4db39cd622289ffe1801dac4fe4865e90a223a7b37feb9a48b4c404edb3ef62b5e061fc080d5b02fdf96aaf3114c SHA512 dd894b4eb55ff19b92142b7d87b3c60ceb7eacd70b8f524a6e86e8938c64a409098c91b8dae4af68e73b6ef04b184bb4efb29e418caba2b9288cd2b6325840c8
DIST sinatra-2.0.8.1.tar.gz 507102 BLAKE2B 7b88f50b2b2960c17aaa4f0ffbffaf70ece16c1bb29b3ee4706904ebc8e779ad84058ca49ae7cea28f86e635eb9b10ab6f5d94c6eeb4de72637bf5b74d4cac42 SHA512 c6c166e14f2be53cda18263121876ca191c670e12c2c42abb10d0f4a0d8db2916210a6775ef894cf00201c445cd185e5f13c5cd8a1ab0e78e12faa6cb51ee69b
diff --git a/dev-ruby/sinatra/sinatra-2.0.5.ebuild b/dev-ruby/sinatra/sinatra-2.0.5.ebuild
deleted file mode 100644
index f7e9be6290a7..000000000000
--- a/dev-ruby/sinatra/sinatra-2.0.5.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_TASK_TEST="test:core"
-
-RUBY_FAKEGEM_TASK_DOC="doc"
-RUBY_FAKEGEM_EXTRADOC="README.md AUTHORS.md CHANGELOG.md"
-
-RUBY_FAKEGEM_GEMSPEC="sinatra.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A DSL for quickly creating web applications in Ruby with minimal effort"
-HOMEPAGE="http://www.sinatrarb.com/"
-SRC_URI="https://github.com/sinatra/sinatra/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="2"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
-IUSE=""
-
-ruby_add_rdepend "
- dev-ruby/mustermann:1
- dev-ruby/rack:2.0
- ~dev-ruby/rack-protection-${PV}
- dev-ruby/tilt:2"
-ruby_add_bdepend "test? ( >=dev-ruby/rack-test-0.5.6 dev-ruby/erubis dev-ruby/builder dev-ruby/activesupport )"
-ruby_add_bdepend "doc? ( dev-ruby/yard )"
diff --git a/dev-ruby/sinatra/sinatra-2.0.7.ebuild b/dev-ruby/sinatra/sinatra-2.0.7.ebuild
deleted file mode 100644
index 98223fedbcb5..000000000000
--- a/dev-ruby/sinatra/sinatra-2.0.7.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_TASK_TEST="test:core"
-
-RUBY_FAKEGEM_EXTRADOC="README.md AUTHORS.md CHANGELOG.md"
-
-RUBY_FAKEGEM_GEMSPEC="sinatra.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A DSL for quickly creating web applications in Ruby with minimal effort"
-HOMEPAGE="http://www.sinatrarb.com/"
-SRC_URI="https://github.com/sinatra/sinatra/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="2"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
-IUSE=""
-
-ruby_add_rdepend "
- dev-ruby/mustermann:1
- dev-ruby/rack:2.0
- ~dev-ruby/rack-protection-${PV}
- dev-ruby/tilt:2"
-ruby_add_bdepend "test? ( >=dev-ruby/rack-test-0.5.6 dev-ruby/erubis dev-ruby/builder dev-ruby/activesupport )"
-ruby_add_bdepend "doc? ( dev-ruby/yard )"
diff --git a/dev-ruby/tty-reader/Manifest b/dev-ruby/tty-reader/Manifest
index ee48fe5cfad5..4b4b9e7c1c9e 100644
--- a/dev-ruby/tty-reader/Manifest
+++ b/dev-ruby/tty-reader/Manifest
@@ -1,2 +1,3 @@
DIST tty-reader-0.6.0.gem 24576 BLAKE2B a89c74bc97a57961c3779b96aa328b536d110517ab2663fbf566f84f434eb552f9a38dd00c644d64430a4e8806611b454ee6d46a76e9c89fb4c93c276f050eb1 SHA512 562c204f0dd43539b64bab0f55731ad8650b17d8052c245467aa60cc113e6b31998086fcb7f37f8503ec51ae4511241d5994e8ae1586ed528a07c5ebdc3fce83
DIST tty-reader-0.7.0.gem 25600 BLAKE2B 41af0db92c337cdebb428a93b924f466d72f67042267abd4b3cc97a319e01757c2f1f302ec0002de5b90fa1ebecca0d6bffcdc621be2e435d549263779ed3712 SHA512 29f41a15ff9d86300d9cb6067028a2bf540d258d8a8ca11892e26d40e423854ce32706a33a5cb75037d99d8d30d42998ecc6876a99f3c30bbddacffe61fbf70e
+DIST tty-reader-0.8.0.tar.gz 459623 BLAKE2B c787eebf03fa6169e710d7f838ee02f558577bbd806988e088a9f950c3cf5ef6d4f9e3569f2a29f4a81bcaa2222e029128dc48e439eae075741b077e42c70246 SHA512 8fbae094bbba287c2a2176e9838d0769ad33d6d464165f8b46484d47902ce4131842f196d3b7c0fa6f9be10bb37e2315b1dba517d46872b6f8e5a4fb3a6790da
diff --git a/dev-ruby/tty-reader/tty-reader-0.8.0.ebuild b/dev-ruby/tty-reader/tty-reader-0.8.0.ebuild
new file mode 100644
index 000000000000..608ff92905d6
--- /dev/null
+++ b/dev-ruby/tty-reader/tty-reader-0.8.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+RUBY_FAKEGEM_GEMSPEC="tty-reader.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Methods for processing keyboard input in character, line and multiline modes"
+HOMEPAGE="https://github.com/piotrmurach/tty-reader"
+SRC_URI="https://github.com/piotrmurach/tty-reader/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_rdepend "
+ >=dev-ruby/tty-cursor-0.7:0
+ >=dev-ruby/tty-screen-0.8:0
+ =dev-ruby/wisper-2.0*
+"
+
+all_ruby_prepare() {
+ sed -i -e '/bundler/ s:^:#:' spec/spec_helper.rb || die
+ sed -i -e 's:_relative ": "./:' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/tty-screen/Manifest b/dev-ruby/tty-screen/Manifest
index c956894e0b91..64add772221b 100644
--- a/dev-ruby/tty-screen/Manifest
+++ b/dev-ruby/tty-screen/Manifest
@@ -1,2 +1,3 @@
DIST tty-screen-0.7.0.gem 12288 BLAKE2B e61b5462d6c2a8dae96d6e89d8025f2d2ea8bba8328318e067d612832b479ccd34a457a74432ccbe4cf27f26e439f44d67890a492dfa6f8836d2b86512ce9198 SHA512 1851c0ea90af65cd1fa9a4a2b4c93d3fa2badf81507d4bb149183aa49578208ddef0065f3047cef4ffa23d3f34840af919ac4f6a2805f7ce0f01096f27101694
DIST tty-screen-0.7.1.tar.gz 11377 BLAKE2B 485b5610bc81524cfe525f8a837e99d13788da499dd8fa0f7c3be3f580ada63861f04652031e84817ef6ee49ce099c5fa97104b6634fc306d9ee0bbed0828ac3 SHA512 1ef5ce12cdd6337c47f09e5b6ae116985a80efe9f493d52c404496319f1377d4308cd829343d84f5c653b70327c033955232ca62fc8a134503a87a33a264130a
+DIST tty-screen-0.8.0.tar.gz 12956 BLAKE2B 647a6d06eff154ab99e59a92287a4f6c041ae9e4738869de857cf9508f4a3274c4742e80b3dc3722b17a0e69e4deec1f4dd767b3281fd6c49663ad66232e6be5 SHA512 5a612cdd9169c029c5d521a8a33f52c0c5d21ee5e6a404577c04b150822c616c0624be96640ce8084dd596b02cb7cceb67ab2d1385321fa7fbe9cd1da4fb7022
diff --git a/dev-ruby/tty-screen/tty-screen-0.8.0.ebuild b/dev-ruby/tty-screen/tty-screen-0.8.0.ebuild
new file mode 100644
index 000000000000..8ed94995bac7
--- /dev/null
+++ b/dev-ruby/tty-screen/tty-screen-0.8.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+RUBY_FAKEGEM_GEMSPEC="tty-screen.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Terminal screen size detection which works on Linux, OS X and Windows/Cygwin"
+HOMEPAGE="https://github.com/piotrmurach/tty-screen"
+SRC_URI="https://github.com/piotrmurach/tty-screen/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+all_ruby_prepare() {
+ echo '-rspec_helper' > .rspec || die
+ sed -i -e 's:require_relative ":require "./:' ${RUBY_FAKEGEM_GEMSPEC} || die
+ rm -f spec/perf/size_spec.rb || die
+}
diff --git a/dev-ruby/x25519/x25519-1.0.8.ebuild b/dev-ruby/x25519/x25519-1.0.8.ebuild
index cd2b4a702e7f..4030532414fc 100644
--- a/dev-ruby/x25519/x25519-1.0.8.ebuild
+++ b/dev-ruby/x25519/x25519-1.0.8.ebuild
@@ -30,6 +30,7 @@ all_ruby_prepare() {
# The precomputed implementation only works on amd64
if ! use amd64 ; then
sed -i -e '/\(x25519_precomputed\|X25519::Provider::Precomputed\)/ s:^:#:' lib/x25519.rb || die
+ rm -f spec/x25519/provider/precomputed_spec.rb || die
fi
}
diff --git a/dev-tcltk/Manifest.gz b/dev-tcltk/Manifest.gz
index 631bccc365ff..dc1766b82e84 100644
Binary files a/dev-tcltk/Manifest.gz and b/dev-tcltk/Manifest.gz differ
diff --git a/dev-tcltk/togl/togl-2.0-r2.ebuild b/dev-tcltk/togl/togl-2.0-r2.ebuild
deleted file mode 100644
index f1ac42438d2b..000000000000
--- a/dev-tcltk/togl/togl-2.0-r2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-MY_P=Togl${PV}
-
-DESCRIPTION="A Tk widget for OpenGL rendering"
-HOMEPAGE="http://togl.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}-src.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="debug +threads"
-
-RDEPEND="
- dev-lang/tk
- virtual/opengl
- x11-libs/libXmu"
-DEPEND="${RDEPEND}"
-
-# tests directory is missing
-RESTRICT="test"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
- sed \
- -e 's:-fomit-frame-pointer::g' \
- -e 's:-O2::g' \
- -e 's:-pipe::g' \
- -i configure || die
-}
-
-src_configure() {
- econf \
- $(use_enable debug symbols) \
- $(use_enable threads)
-}
-
-src_install() {
- emake DESTDIR="${D}" install
- dohtml doc/*
- dodoc README*
-}
diff --git a/dev-tcltk/togl/togl-2.0-r3.ebuild b/dev-tcltk/togl/togl-2.0-r3.ebuild
index 22ee83318cb4..0dca35bff9b8 100644
--- a/dev-tcltk/togl/togl-2.0-r3.ebuild
+++ b/dev-tcltk/togl/togl-2.0-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}-src.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
IUSE="debug +threads"
RDEPEND="
diff --git a/dev-tex/Manifest.gz b/dev-tex/Manifest.gz
index c2bb1d09879a..6c6cd2dd6c32 100644
Binary files a/dev-tex/Manifest.gz and b/dev-tex/Manifest.gz differ
diff --git a/dev-tex/cjk-latex/cjk-latex-4.8.4.ebuild b/dev-tex/cjk-latex/cjk-latex-4.8.4-r1.ebuild
similarity index 94%
rename from dev-tex/cjk-latex/cjk-latex-4.8.4.ebuild
rename to dev-tex/cjk-latex/cjk-latex-4.8.4-r1.ebuild
index 1169c3dc6911..c8ab85a83a96 100644
--- a/dev-tex/cjk-latex/cjk-latex-4.8.4.ebuild
+++ b/dev-tex/cjk-latex/cjk-latex-4.8.4-r1.ebuild
@@ -119,7 +119,7 @@ src_install() {
popd &>/dev/null || die
insinto "${TEXMF}/tex/latex/${PN}"
- doins -r texinput
+ doins -r texinput/.
doins -r contrib/wadalab
if use emacs ; then
@@ -137,31 +137,30 @@ src_install() {
# jisksp40 stuff
insinto ${TEXMF}
- doins -r jisksp40/texmf
+ doins -r jisksp40/texmf/.
# kanji48 stuff
insinto ${TEXMF}
- doins -r kanji48/texmf
+ doins -r kanji48/texmf/.
use doc || rm -rf texmf/doc
insinto ${TEXMF}
- doins -r texmf
+ doins -r texmf/.
# Move fonts because hbf2gf expects them in MISCFONTS
mv "${ED}/${TEXMF}/fonts/hbf" "${ED}/${TEXMF}/fonts/misc" || die "mv font failed"
insinto ${TEXMF}/hbf2gf
- doins -r utils/hbf2gf/cfg/
+ doins -r utils/hbf2gf/cfg/.
insinto ${TEXMF}/scripts/subfonts
- doins -r utils/subfonts/
+ doins -r utils/subfonts/.
rm -f doc/COPYING doc/INSTALL || die
dodoc ChangeLog README
if use doc ; then
- insinto /usr/share/doc/${PF}
- doins -r doc
- doins -r examples
+ dodoc -r doc/.
+ dodoc -r examples
fi
docinto uwpatch
dodoc uwpatch/README
diff --git a/dev-texlive/Manifest.gz b/dev-texlive/Manifest.gz
index 1f1ca50dc8bd..ebcf08f7330d 100644
Binary files a/dev-texlive/Manifest.gz and b/dev-texlive/Manifest.gz differ
diff --git a/dev-texlive/texlive-langcjk/Manifest b/dev-texlive/texlive-langcjk/Manifest
index 77fd82b47f28..c31ff8ff02c9 100644
--- a/dev-texlive/texlive-langcjk/Manifest
+++ b/dev-texlive/texlive-langcjk/Manifest
@@ -2,12 +2,16 @@ DIST tl-adobemapping-2020.tar.xz 2169892 BLAKE2B 52b3d8ad9c49f5d0308b12aded3912f
DIST tl-c90-2020.tar.xz 1928 BLAKE2B cc997cc634feddfb0abdae6bb81b2377ffcdb29f231cad43711082305fcbd703b7e4d7cc0d85586435b2026a04358238fb678f790996830ab6276dcff2f9af0a SHA512 f7e7aeb931bd215d38b41e1ded6d8fd046f90e54946a1bd1d4dc04b7ede4f6c20a3501d57397601f8a423fed9518672fffa9d45f17515f56b05217ebd59efe81
DIST tl-c90.doc-2020.tar.xz 86524 BLAKE2B 7f6311056e53c85051c0483cf82ad0ade3f5138fc062f3838ca2c8581d10f0660e143f770f5ff64707848c738afe46444f7b7556217f3388f36d2c5a4df4e588 SHA512 dbf3f9d28bfad1d52dae43f9e9804d082525ea6deef94ba4ebbef6d06b06ad6010f5944c52ce992b1ba4cb5f3877a8eb3b694f106f0eaaef48ef350f62c76e8e
DIST tl-c90.source-2020.tar.xz 9824 BLAKE2B e1b76221e033a7f7a7e9d71df6be469b67bb79797d0c121bb6977761db31fcc3741afbf47883345fe274ef67a66af33699faa4bda55dfe3f1fa0104c58011e83 SHA512 fac23323734b4cf9357067cf6d5304d36e669798494636d6b3283a074cbf3ec74168138f6d9bac3d6cb7e3ce3c7d5e35f7d98672865fa9dc87ea59d4227e337e
+DIST tl-cjk-2020.tar.xz 58340 BLAKE2B bb7d1a52aace5d3958c00136c5373d586b03b8b8eca0b7fc82de06e407e365d7605fcaeb5c4e565563ae8a1ea7c9536bc6cc97ddc55d36e08ee28ed692d86fe1 SHA512 c35be1fc1d9f9d44e78effd6e7e539591020d785ae255a1cfa0d7e2508fcdd496d94e4bb0096bc7a281ee93b0b8e461efc6724c82f49d589dbcbdda35143c811
DIST tl-cjk-gs-integrate-2020.tar.xz 35252 BLAKE2B c037882d103adee770aa09d3cfcc7f4d2ac72331708dca01d915f92ce009446a5623308b19815ece327b104bf9040bf656c44e943010862d338ac4a5baa89b80 SHA512 f584536c3d70ab767407f9ea8f048ab9592133c0b1a76d8eec76e132aa0009cc5b1fe1ee6fc86174aaac618ebb2b5fa7258da79a12acfea9fc2aba4be0184ac5
DIST tl-cjk-gs-integrate.doc-2020.tar.xz 12720 BLAKE2B d693a9c5b9f98e9a700db9650b0706fea3c8c7c15aa4193ca9594ca071ed6b5cef2222516a5b09a8f3708f937f0f17539e36d7b4a61ff8f3c6a1ad37a3e22eea SHA512 7e4196ecac219d6d6b5520490b3b4691329cabd16fedb62b8f4e2d70e5ddef19c4c5da64092d9cd708beb7954f819b9167cfcf773bee708e1df5bc46f9c815a8
DIST tl-cjk-gs-integrate.source-2020.tar.xz 560 BLAKE2B 055cc43b97f85cc5305ea00be22b8ab92ff16e3e1d8357d965c29798fff699f717b4e0c7589934641e7e9d5bb8b13985bb79d98a36133e84acd34f5c563116e8 SHA512 39a7990c8e91a5c19af2341b5ad56f83deb7a1bfbe88cc73bad36e735a563622401393f3cb70c47fd2806ecd7b44cfe4c4ded48f440606eb3cb03dd71995f8a6
+DIST tl-cjk.doc-2020.tar.xz 1458280 BLAKE2B f29ad8ed5061753490fefb6b73b2ab8a1bd7f90bfb00ab6fe8d8b3952bb666a5a39591e31908952478222c9e270a8277b43de7d1d59f4ecdd89fcf9f80014bc9 SHA512 d598d599d02ca95b1375b8e989649b441980ae6467348270c366a670d79d606b1ca79801febdf5c8c636f2d1c7fa30eb87bd87f90f75b5b4436443ecdab53b73
DIST tl-cjkpunct-2020.tar.xz 4060 BLAKE2B 9254c3d83c48ec197b76ea8c90e4fe233b9fbf5772773055a6ab0b2f6949ae071838ed1d5bcf9f67c72ffcb565bf0fb6201782a77dd926a3ddf7faaebab73be5 SHA512 cb44aa3386cd79f05980e5402adcbbf9f8b67fa76bdd5b293063fe9810520edbdf243656cfb54fe17d6ca43d405e6b16e8012eda63bae3cb3d8fc0f7755e2551
DIST tl-cjkpunct.doc-2020.tar.xz 143540 BLAKE2B 9d9a450bc59270f522e32d93821971b68bcbf0c2d7f15260953cd1e248601cf95622575cdba8dfc986f470c09ad48ba1fd363d7df1ab8ce53af1f3f245ec3d38 SHA512 cb9383b6d3fe9ffd5926d10dddcb1ea758aabda232f015b22f61dc8a9b316193b30ca2d8e2b849b1c03d92e0073bba6d90cc5b3b50f47b28a745dff2f7229486
DIST tl-cjkpunct.source-2020.tar.xz 7020 BLAKE2B 6158ca3eb05f7f75e2dc8ffc233eaa11da22d17e1abd5e9b1306fe52d9f69c7cad2f211731604a167522377ce968099fc4413e1a381f565ca542c155caf964ab SHA512 0155261e5a1a22634a4c6c779054198534bc2b6ef1f1d85d471a25bde59b7e872db01627f08db6dc76c7fe6fd08d9a2363c47e79425c80ec5319648c994cbf48
+DIST tl-cjkutils-2020.tar.xz 2016 BLAKE2B 9bb3075d174380775926f8f3e3c3dee45ce9d1b955e55d8caba62ac5af28c7bba90e183804c39e7c0b74aafe4ab063cb5c68bfd49f5e84f56894d8e70b9ee0ec SHA512 84ae942d24c6a5b6dc8a5ae9a7aed0e1da511e68a2730c26d022d935974869c810600321f4ec1b8c5aeb00d17c6eb360d2735b2ac529bee6aaf85bbf4e44ec2b
+DIST tl-cjkutils.doc-2020.tar.xz 98060 BLAKE2B d5db4101e3b2fe475de3b24a0f699bcbfa60be4342e0dd18b3a5682f64f0c4050e0a8657a75c6525354a2f2155e52881c026139901e173a3d00001d914bc2a2a SHA512 f135a594a95a0d30262a00bbe8279a2d58c6549dba65533b6d1032f99b517b9ff91217ff3ece3768bffdd086e50ce99b56db494aea24dc460c7b077771e97921
DIST tl-collection-langcjk-2020.tar.xz 572 BLAKE2B 52de9b79068ebabcbc3540bdfcf883e8dd138c05df417efc877050ff58dcb7147518ee967026371cc9b634d17ae952e51ca8e87fcd5f98dea6bf8ab283345907 SHA512 959ee256fdf82076f8fa0d5a35f876b3c030e69feaf94cecc68e6e1061d968a72b9389e62b5c18c4d7fd4e98e707a1dfffecca7b7149d0c30388cb0c73870059
DIST tl-dnp-2020.tar.xz 856 BLAKE2B 244cb1b1f6641d6726b498185914c294e8e9568e996517a5885b3eaf5d1706750ee8e6464a78811a8a617f99e033c79fb1b5fb5818e528c6274c93e9dc1f8681 SHA512 9cccb6befd2059b13571e083664e4c85215cc12c96b41afdd9efdeb758b444a95edd4c2586ee1b44dca70fe31f38c4eea821cf08cc1237a82d67e0e567d65d8a
DIST tl-fixjfm-2020.tar.xz 2400 BLAKE2B afd8097b2db0e36f7ed131286d572d13e897c763934cd75b665f43d2e8941a9b5f2cd419957b01eaf6d2a047749c576d8e2970cf4992bd7cd5cb33681b307dac SHA512 5ed8db53c1757c4ab6f14e763f9e58a76e5f8c594c30c1d1fd4d7c9a49d65da90d72650c88375806997d0f268b1a75215bf6969f45e45ef3a2127c422415bf16
diff --git a/dev-texlive/texlive-langcjk/texlive-langcjk-2020.ebuild b/dev-texlive/texlive-langcjk/texlive-langcjk-2020.ebuild
index 0121f92c5df5..ca8ec15a7082 100644
--- a/dev-texlive/texlive-langcjk/texlive-langcjk-2020.ebuild
+++ b/dev-texlive/texlive-langcjk/texlive-langcjk-2020.ebuild
@@ -3,9 +3,9 @@
EAPI="7"
-TEXLIVE_MODULE_CONTENTS="adobemapping c90 cjk-gs-integrate cjkpunct dnp garuda-c90 fixjfm jfmutil norasi-c90 pxtatescale xcjk2uni zxjafont collection-langcjk
+TEXLIVE_MODULE_CONTENTS="adobemapping c90 cjk cjk-gs-integrate cjkpunct cjkutils dnp garuda-c90 fixjfm jfmutil norasi-c90 pxtatescale xcjk2uni zxjafont collection-langcjk
"
-TEXLIVE_MODULE_DOC_CONTENTS="c90.doc cjk-gs-integrate.doc cjkpunct.doc fixjfm.doc jfmutil.doc pxtatescale.doc xcjk2uni.doc zxjafont.doc "
+TEXLIVE_MODULE_DOC_CONTENTS="c90.doc cjk-gs-integrate.doc cjk.doc cjkpunct.doc cjkutils.doc fixjfm.doc jfmutil.doc pxtatescale.doc xcjk2uni.doc zxjafont.doc "
TEXLIVE_MODULE_SRC_CONTENTS="c90.source cjk-gs-integrate.source cjkpunct.source garuda-c90.source norasi-c90.source xcjk2uni.source "
inherit texlive-module
DESCRIPTION="TeXLive Chinese/Japanese/Korean (base)"
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 308ec842274d..d2c6a6c08f28 100644
Binary files a/dev-util/Manifest.gz and b/dev-util/Manifest.gz differ
diff --git a/dev-util/anjuta/Manifest b/dev-util/anjuta/Manifest
index 871d38262c3c..a73adb3b9299 100644
--- a/dev-util/anjuta/Manifest
+++ b/dev-util/anjuta/Manifest
@@ -1,2 +1 @@
-DIST anjuta-3.28.0.tar.xz 6382736 BLAKE2B 8872736d80d0a09d35706ef69c0de56c84b9abf025f9552ae4b21b0b51c3ab8ad93f07dd1564601422890e92155cc7be80bae8de77106035621a54316608832b SHA512 c8de0b0debf0a511d6c50fe2582077a33c04290a045cce637c05c15df984cc3e8ee942c0c3a75bfd01c48e6c302d5424565c4e54fe6eb118c87a3590563505ef
DIST anjuta-3.34.0.tar.xz 6420472 BLAKE2B a5e10ea3bb60499e54def8d1b78603b0c809167ad03a3e11f9dbd031514f1a7cb566d9c7694be23fe3165e617fbfc3d1e6ce36f7dc8c0672044f26390aed6d5a SHA512 9d5a4c23751893ff7e21cd55c1f112f27b53fe2ea5ac645c63e2da627efce202b88696e3e5d860ad75a5c13c88a9082775d74f4482208161b5e63d56c4004d57
diff --git a/dev-util/anjuta/anjuta-3.28.0-r1.ebuild b/dev-util/anjuta/anjuta-3.28.0-r1.ebuild
deleted file mode 100644
index 73fadd9f40f5..000000000000
--- a/dev-util/anjuta/anjuta-3.28.0-r1.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_7 )
-# libanjuta-language-vala.so links to a specific slot of libvala; we want to
-# avoid automagic behavior.
-VALA_MIN_API_VERSION="0.40"
-VALA_MAX_API_VERSION="${VALA_MIN_API_VERSION}"
-
-# We inherit autotools explicitly because GNOME2_EAUTORECONF is set only conditionally later, so gnome2.eclass doesn't do it for us
-inherit autotools gnome2 flag-o-matic readme.gentoo-r1 python-single-r1 vala
-
-DESCRIPTION="A versatile IDE for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Anjuta"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~sparc x86"
-
-IUSE="debug devhelp glade +introspection packagekit subversion terminal test vala"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# FIXME: automagically uses libgda:6 if available
-# FIXME: make python dependency non-automagic
-COMMON_DEPEND="
- >=dev-libs/glib-2.34:2[dbus]
- x11-libs/gdk-pixbuf:2
- >=x11-libs/gtk+-3.10:3
- >=dev-libs/libxml2-2.4.23
- >=dev-libs/gdl-3.5.5:3=
- >=x11-libs/gtksourceview-3:3.0
-
- sys-devel/autogen
-
- >=gnome-extra/libgda-5:5=
- dev-util/ctags
-
- x11-libs/libXext
- x11-libs/libXrender
-
- ${PYTHON_DEPS}
-
- devhelp? ( >=dev-util/devhelp-3.7.4:= )
- glade? ( >=dev-util/glade-3.12:3.10= )
- introspection? ( >=dev-libs/gobject-introspection-0.9.5:= )
- subversion? (
- >=dev-vcs/subversion-1.8:=
- >=net-libs/serf-1.2:1=
- >=dev-libs/apr-1:=
- >=dev-libs/apr-util-1:= )
- terminal? ( >=x11-libs/vte-0.27.6:2.91 )
- vala? ( $(vala_depend) )
-"
-RDEPEND="${COMMON_DEPEND}
- gnome-base/gsettings-desktop-schemas
- packagekit? ( app-admin/packagekit-base )
-"
-DEPEND="${COMMON_DEPEND}
- >=dev-lang/perl-5
- >=dev-util/gtk-doc-am-1.4
- >=dev-util/intltool-0.40.1
- sys-devel/bison
- sys-devel/flex
- >=sys-devel/gettext-0.17
- virtual/pkgconfig
- !!dev-libs/gnome-build
- test? (
- app-text/docbook-xml-dtd:4.1.2
- app-text/docbook-xml-dtd:4.5 )
- app-text/yelp-tools
- dev-libs/gobject-introspection-common
- gnome-base/gnome-common
-"
-# yelp-tools, gi-common and gnome-common are required by eautoreconf
-
-pkg_setup() {
- python-single-r1_pkg_setup
-}
-
-src_prepare() {
- if use vala; then
- DISABLE_AUTOFORMATTING="yes"
- DOC_CONTENTS="To create a generic vala project you will need to specify
-desired valac versioned binary to be used, to do that you
-will need to:
-1. Go to 'Build' -> 'Configure project'
-2. Add 'VALAC=/usr/bin/valac-X.XX' (respecting quotes) to
-'Configure options'."
-
- sed -i -e "s/\[0.40\], \[0.38\], \[0.36\], \[0.34\], \[0.32\], \[0.30\], \[0.28\], \[0.26\], \[0.24\], \[0.22\], \[0.20\], \[0.18\]/[${VALA_MAX_API_VERSION}]/" configure.ac || die
- GNOME2_EAUTORECONF="yes"
- fi
-
- # COPYING is used in Anjuta's help/about entry
- DOCS="AUTHORS ChangeLog COPYING FUTURE MAINTAINERS NEWS README ROADMAP THANKS TODO"
-
- # Conflicts with -pg in a plugin, bug #266777
- filter-flags -fomit-frame-pointer
-
- # Do not build benchmarks, they are not installed and for dev purpose only
- sed -e '/SUBDIRS =/ s/benchmark//' \
- -i plugins/symbol-db/Makefile.{am,in} || die
-
- use vala && vala_src_prepare
- gnome2_src_prepare
-}
-
-src_configure() {
- gnome2_src_configure \
- --disable-neon \
- --disable-static \
- $(use_enable debug) \
- $(use_enable devhelp plugin-devhelp) \
- $(use_enable glade plugin-glade) \
- $(use_enable glade glade-catalog) \
- $(use_enable introspection) \
- $(use_enable packagekit) \
- $(use_enable subversion plugin-subversion) \
- $(use_enable subversion serf) \
- $(use_enable terminal plugin-terminal) \
- $(use_enable vala)
-}
-
-src_install() {
- # COPYING is used in Anjuta's help/about entry
- docompress -x "/usr/share/doc/${PF}/COPYING"
-
- # Anjuta uses a custom rule to install DOCS, get rid of it
- gnome2_src_install
- rm -rf "${ED}"/usr/share/doc/${PN} || die "rm failed"
-
- use vala && readme.gentoo_create_doc
-}
-
-pkg_postinst() {
- gnome2_pkg_postinst
- use vala && readme.gentoo_print_elog
-}
diff --git a/dev-util/anjuta/metadata.xml b/dev-util/anjuta/metadata.xml
index 0073ebca1b62..6c441a3f9d48 100644
--- a/dev-util/anjuta/metadata.xml
+++ b/dev-util/anjuta/metadata.xml
@@ -8,7 +8,6 @@
diff --git a/dev-util/bakefile/Manifest b/dev-util/bakefile/Manifest
deleted file mode 100644
index dd7e07611892..000000000000
--- a/dev-util/bakefile/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST bakefile-0.2.9.tar.gz 775528 BLAKE2B e8e70c30cf6b4469323d28d0ea86d202243eb64b9b5eb438a84cfadbaf3dfdf96e3accfaa4435ba3c9fa4872240cc96ddde0c7a397305a36f26eb0f94ff89aef SHA512 dc28a3a68c080dababef68b9f39ad141739ecb5e4e1129620274bd80ac13f68cddd6e5625776f23c508f20e1f984a8830a949c425457cfeada8b44081873102f
diff --git a/dev-util/bakefile/bakefile-0.2.9-r1.ebuild b/dev-util/bakefile/bakefile-0.2.9-r1.ebuild
deleted file mode 100644
index 49816b527e48..000000000000
--- a/dev-util/bakefile/bakefile-0.2.9-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-single-r1 bash-completion-r1
-
-DESCRIPTION="Native makefiles generator"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-HOMEPAGE="http://bakefile.sourceforge.net"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}"
-DEPEND=""
-
-src_install() {
- default
-
- if use doc ; then
- dohtml -r doc/html/.
- fi
-
- # TODO: symlink the two
- newbashcomp bash_completion bakefile
- newbashcomp bash_completion bakefile_gen
-}
diff --git a/dev-util/bakefile/metadata.xml b/dev-util/bakefile/metadata.xml
deleted file mode 100644
index 58052d45a7e1..000000000000
--- a/dev-util/bakefile/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
- wxwidgets@gentoo.org
- Gentoo wxWidgets Project
-
-
- bakefile
-
-
diff --git a/dev-util/bloaty/Manifest b/dev-util/bloaty/Manifest
index 320f82f838b4..62eeef4698b9 100644
--- a/dev-util/bloaty/Manifest
+++ b/dev-util/bloaty/Manifest
@@ -1 +1,2 @@
DIST bloaty-0_p20170420.tar.gz 3100016 BLAKE2B 74a3b44a5e63f8f06da7b554588be0ced62a0f6792513984fbf7cfab520f6f6173868d588427dd9ca322c6fbc29fd1b8931453ec045c591fd8de58904178bf2c SHA512 93947fd0c49c3223c1ec216c88fe22b24e68654511d4b9d4fb2bcbc816b92bbdaf47344abc1dc8f80ed0b38a8c8b09909f862f916fd9182048235582aa10feb0
+DIST bloaty-1.1.tar.bz2 5363836 BLAKE2B a538cf5634ed72844bb128238a521caf375eaab34fd3cce8fdd46002bcbc6c53ba986cc7c1e4b761b1253b2f01cb557c94e1e1585507ff89bec10c891e5f5a88 SHA512 142d0dd58fc0aadce3aee6e9260c6ed792a18cf5fe260c89051d51b9357c7527ba352c3d6c9e23a3494796fba3d88314b6ed8a3a76c6c0d111d4c509cae6b216
diff --git a/dev-util/bloaty/bloaty-1.1.ebuild b/dev-util/bloaty/bloaty-1.1.ebuild
new file mode 100644
index 000000000000..227dcc50dcdf
--- /dev/null
+++ b/dev-util/bloaty/bloaty-1.1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="A size profiler for binaries"
+HOMEPAGE="https://github.com/google/bloaty"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ ${PV} == 9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/google/${PN}"
+ IUSE="test"
+ RESTRICT="!test? ( test )"
+else
+ SRC_URI="https://github.com/google/${PN}/releases/download/v${PV}/${P}.tar.bz2"
+ KEYWORDS="~amd64"
+fi
+
+BDEPEND="
+ virtual/pkgconfig
+"
+DEPEND="
+ dev-libs/capstone:=
+ dev-libs/protobuf:=
+ dev-libs/re2:=
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+ local mycmakeargs=(
+ -DBLOATY_ENABLE_CMAKETARGETS=OFF
+ -DBUILD_SHARED_LIBS=OFF
+ )
+ if [[ ${PV} == 9999 ]]; then
+ mycmakeargs+=(
+ -DBUILD_TESTING=$(usex test)
+ $(usex test -DINSTALL_GTEST=OFF "")
+ )
+ fi
+ cmake_src_configure
+}
diff --git a/dev-util/bloaty/bloaty-9999.ebuild b/dev-util/bloaty/bloaty-9999.ebuild
new file mode 100644
index 000000000000..4aa412ab17d3
--- /dev/null
+++ b/dev-util/bloaty/bloaty-9999.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="A size profiler for binaries"
+HOMEPAGE="https://github.com/google/bloaty"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ ${PV} == 9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/google/${PN}"
+ IUSE="test"
+ RESTRICT="!test? ( test )"
+else
+ SRC_URI="https://github.com/google/${PN}/releases/download/v${PV}/${P}.tar.bz2"
+ KEYWORDS="~amd64"
+fi
+
+BDEPEND="
+ virtual/pkgconfig
+"
+DEPEND="
+ dev-libs/capstone:=
+ dev-libs/protobuf:=
+ dev-libs/re2:=
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+ local mycmakeargs=(
+ -DBLOATY_ENABLE_CMAKETARGETS=OFF
+ )
+ if [[ ${PV} == 9999 ]]; then
+ mycmakeargs+=(
+ -DBUILD_TESTING=$(usex test)
+ )
+ fi
+ cmake_src_configure
+}
diff --git a/dev-util/bloaty/metadata.xml b/dev-util/bloaty/metadata.xml
index 146d5f454ee7..36b90a82850e 100644
--- a/dev-util/bloaty/metadata.xml
+++ b/dev-util/bloaty/metadata.xml
@@ -1,8 +1,15 @@
-
-
- google/bloaty
-
+
+ ngg@ngg.hu
+ Gergely Nagy
+
+
+ proxy-maint@gentoo.org
+ Proxy Maintainers
+
+
+ google/bloaty
+
diff --git a/dev-util/cargo-c/cargo-c-0.6.2.ebuild b/dev-util/cargo-c/cargo-c-0.6.2.ebuild
index 1623f218879e..abcdd98321e6 100644
--- a/dev-util/cargo-c/cargo-c-0.6.2.ebuild
+++ b/dev-util/cargo-c/cargo-c-0.6.2.ebuild
@@ -153,7 +153,7 @@ RESTRICT="mirror"
# use cargo-license for a more accurate license picture
LICENSE="Apache-2.0 MIT"
SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm64"
IUSE="libressl"
DEPEND=""
diff --git a/dev-util/ccache/Manifest b/dev-util/ccache/Manifest
index 3e63a2bd6538..cd325e2ded7b 100644
--- a/dev-util/ccache/Manifest
+++ b/dev-util/ccache/Manifest
@@ -1,3 +1,2 @@
DIST ccache-3.7.10.tar.xz 353792 BLAKE2B d7c06ee55a79afb4b72cdc20ec3d6413a5417301c63a0c822a4f82e6b9542c7a9cdf9f1bbd60a4698c335fdddfadcb9d674bff02c6dad1c2df9932212fdf6477 SHA512 64b0d42af7fd2dfdda65668b04dbd16807a22324e336e61f6c6a91c00110fb535c7ac9062a9c14c924a7ddaf42247f69a43d83dd0fd187ce3b0737158b5bb8fc
-DIST ccache-3.7.7.tar.xz 351592 BLAKE2B 0b211cb77ceb42b7ee5dfcde98d9f53bf222cf18b8d38a7cf6fc9631c5e1c79ca82e6d0a0dbacfe2d5f61b2acefebe202e06fc3b8035f0f25a5f9954554a18cd SHA512 f93380aeb45e815964abc3b62f1963abafe22e0c6a7b61d039e710c7f935221e02678e21af65add4fd59fd5a141824ab95f4a7afc8dd557de36737c365cab816
DIST ccache-3.7.9.tar.xz 352948 BLAKE2B 791491c3f9da58f06bb0a58e411d9a7b3e39e460102793ef736820913d43d488ce7daffba572c21f507ea78d8da04edc3aaa47eb1a0fbec8cb35461a60b770e9 SHA512 5d39baeb66265451b0e9cef250f6d9c5f6869cd87e27c108c9a50bef80050122ed4280ff662a81bba8d1d1311f2004bcaf9ada6b783a42eedc67ca01ebc48bb4
diff --git a/dev-util/ccache/ccache-3.7.7-r1.ebuild b/dev-util/ccache/ccache-3.7.7-r1.ebuild
deleted file mode 100644
index 915fe80c14aa..000000000000
--- a/dev-util/ccache/ccache-3.7.7-r1.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit readme.gentoo-r1
-
-DESCRIPTION="fast compiler cache"
-HOMEPAGE="https://ccache.dev/"
-SRC_URI="https://github.com/ccache/ccache/releases/download/v${PV}/ccache-${PV}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
-IUSE="test"
-
-DEPEND="app-arch/xz-utils
- sys-libs/zlib"
-RDEPEND="${DEPEND}
- dev-util/shadowman
- sys-apps/gentoo-functions"
-# clang-specific tests use it to compare objects for equality.
-# Let's pull in the dependency unconditionally.
-DEPEND+="
- test? ( dev-libs/elfutils )"
-
-RESTRICT="!test? ( test )"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-3.5-nvcc-test.patch
-)
-
-src_prepare() {
- default
-
- # make sure we always use system zlib
- rm -rf src/zlib || die
- sed \
- -e "/^EPREFIX=/s:'':'${EPREFIX}':" \
- "${FILESDIR}"/ccache-config-3 > ccache-config || die
-}
-
-src_compile() {
- emake V=1
-}
-
-src_test() {
- emake check V=1
-}
-
-src_install() {
- DOCS=( doc/{AUTHORS,MANUAL,NEWS}.adoc CONTRIBUTING.md README.md )
- default
-
- dobin ccache-config
- insinto /usr/share/shadowman/tools
- newins - ccache <<<"${EPREFIX}/usr/lib/ccache/bin"
-
- DOC_CONTENTS="
-To use ccache with **non-Portage** C compiling, add
-'${EPREFIX}/usr/lib/ccache/bin' to the beginning of your path, before
-'${EPREFIX}/usr/bin'. Portage will automatically take advantage of ccache with
-no additional steps. If this is your first install of ccache, type
-something like this to set a maximum cache size of 2GB:\\n
-# ccache -M 2G\\n
-If you are upgrading from an older version than 3.x you should clear all of your caches like so:\\n
-# CCACHE_DIR='${CCACHE_DIR:-${PORTAGE_TMPDIR}/ccache}' ccache -C\\n
-ccache now supports sys-devel/clang and dev-lang/icc, too!"
-
- readme.gentoo_create_doc
-}
-
-pkg_prerm() {
- if [[ -z ${REPLACED_BY_VERSION} && ${ROOT:-/} == / ]] ; then
- eselect compiler-shadow remove ccache
- fi
-}
-
-pkg_postinst() {
- if [[ ${ROOT:-/} == / ]]; then
- eselect compiler-shadow update ccache
- fi
-
- # nuke broken symlinks from previous versions that shouldn't exist
- rm -rf "${EROOT}"/usr/lib/ccache.backup || die
-
- readme.gentoo_print_elog
-}
diff --git a/dev-util/devhelp/Manifest b/dev-util/devhelp/Manifest
index 539e0c13fdce..a4b76e460429 100644
--- a/dev-util/devhelp/Manifest
+++ b/dev-util/devhelp/Manifest
@@ -1,2 +1 @@
-DIST devhelp-3.30.1.tar.xz 317956 BLAKE2B 8646fb97f0649bc166c8a21472f4c638f37bdfdc9e34b7214f0e5bd32c1c78664cc320f978fb27e313de54e88cf31685596f4bf7f43235ae96345292db6a9fc1 SHA512 f6f028948edd4c6954eaeeb026bf69c11284d725925d354ef42ecc67275cdcac66e8d3657d95d50926350543489b2bb2fa3a194d99d01494bedac60d3a2b4bbc
DIST devhelp-3.34.0.tar.xz 288352 BLAKE2B 26c8c05c161e5607492fc26f012280468ed247ad4c166013e9df5fc1c76d59f98034a157cb58be9554ec65f46520b7d0d2ba78de00134570e84ca5a5ba0dc504 SHA512 34ed48ed323827b01f7d32e186da856c788ddfe37d6836082a81e6c8e4cd7bfc2265309cc3b298a0aea542b85e9261987d47a5a4396d865ec7e4cc13a9d05814
diff --git a/dev-util/devhelp/devhelp-3.30.1.ebuild b/dev-util/devhelp/devhelp-3.30.1.ebuild
deleted file mode 100644
index f953d1ca536a..000000000000
--- a/dev-util/devhelp/devhelp-3.30.1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit gnome.org gnome2-utils meson python-single-r1 xdg
-
-DESCRIPTION="An API documentation browser for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Devhelp"
-
-LICENSE="GPL-3+"
-SLOT="0/3-6" # subslot = 3-(libdevhelp-3 soname version)
-KEYWORDS="~alpha amd64 ~arm ~ppc ~ppc64 ~sparc x86"
-IUSE="gedit gtk-doc +introspection"
-REQUIRED_USE="gedit? ( ${PYTHON_REQUIRED_USE} )"
-
-COMMON_DEPEND="
- >=dev-libs/glib-2.56:2
- >=x11-libs/gtk+-3.22:3[introspection?]
- >=net-libs/webkit-gtk-2.20:4[introspection?]
- >=gui-libs/amtk-5.0:5
- gnome-base/gsettings-desktop-schemas
- introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-"
-RDEPEND="${COMMON_DEPEND}
- gedit? (
- ${PYTHON_DEPS}
- $(python_gen_cond_dep '
- app-editors/gedit[introspection,python,${PYTHON_SINGLE_USEDEP}]
- dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
- ')
- )
-"
-# libxml2 required for glib-compile-resources
-DEPEND="${COMMON_DEPEND}
- ${PYTHON_DEPS}
- dev-libs/libxml2:2
- dev-util/glib-utils
- dev-util/itstool
- gtk-doc? (
- >=dev-util/gtk-doc-1.25
- app-text/docbook-xml-dtd:4.3 )
- >=sys-devel/gettext-0.19.8
- virtual/pkgconfig
-"
-
-PATCHES=(
- "${FILESDIR}"/${PV}-optional-introspection.patch
- "${FILESDIR}"/${PV}-optional-gedit.patch
-)
-
-pkg_setup() {
- use gedit && python-single-r1_pkg_setup
-}
-
-src_configure() {
- local emesonargs=(
- -Dflatpak_build=false
- $(meson_use gedit gedit_plugin)
- $(meson_use gtk-doc gtk_doc)
- $(meson_use introspection)
- )
- meson_src_configure
-}
-
-src_install() {
- meson_src_install
- use gedit && python_optimize "${ED%/}"/usr/$(get_libdir)/gedit/plugins
-}
-
-pkg_postinst() {
- xdg_pkg_postinst
- gnome2_schemas_update
-}
-
-pkg_postrm() {
- xdg_pkg_postrm
- gnome2_schemas_update
-}
diff --git a/dev-util/diffoscope/Manifest b/dev-util/diffoscope/Manifest
index 579c87cb3421..b58c1ff32383 100644
--- a/dev-util/diffoscope/Manifest
+++ b/dev-util/diffoscope/Manifest
@@ -1 +1 @@
-DIST diffoscope-149.tar.gz 1570458 BLAKE2B 8182822f01805277937bf6993094a2ad2e32fde47a67a01a071691487582c22f9be9e299701ad2feda85ce79d5952747348e3180b22e60878d01f28f6e8a9ff5 SHA512 557f0edcd5620a097668108a223f3f58338890eaeb096982c398f1182e26219027c4d62dab688a19743be1167d0affa9dbd6b7b7440fcf86a7f55ade7e3be288
+DIST diffoscope-150.tar.gz 1570701 BLAKE2B 74b146ca6940313817025ba1285ae529c17da82d3cb13dae1b3550cf900d626e774eda3b993f930cf2cc7cc72e0f47830c02ec8ad0d5eff18cefb259757663d3 SHA512 ae2932bcb44078c1ab932512251dfbdfb4d3df0113388b22c5d77e74b74f7efc0f9b4c0bffd6d79422d89d3be6bfe07f9aad337365e5ee704f2710de36cbf4b7
diff --git a/dev-util/diffoscope/diffoscope-149.ebuild b/dev-util/diffoscope/diffoscope-150.ebuild
similarity index 100%
rename from dev-util/diffoscope/diffoscope-149.ebuild
rename to dev-util/diffoscope/diffoscope-150.ebuild
diff --git a/dev-util/glslang/glslang-8.13.3743-r1.ebuild b/dev-util/glslang/glslang-8.13.3743-r1.ebuild
index c6ed470a423f..e9187c7c25cb 100644
--- a/dev-util/glslang/glslang-8.13.3743-r1.ebuild
+++ b/dev-util/glslang/glslang-8.13.3743-r1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999* ]]; then
else
SNAPSHOT_COMMIT="${PV}"
SRC_URI="https://github.com/KhronosGroup/${PN}/archive/${SNAPSHOT_COMMIT}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="amd64 ~ppc64 x86"
+ KEYWORDS="amd64 ~arm64 ~ppc64 x86"
S="${WORKDIR}/${PN}-${SNAPSHOT_COMMIT}"
fi
diff --git a/dev-util/gtk-doc-am/gtk-doc-am-1.32.ebuild b/dev-util/gtk-doc-am/gtk-doc-am-1.32.ebuild
index 4c848dbeb476..10c4538abc8a 100644
--- a/dev-util/gtk-doc-am/gtk-doc-am-1.32.ebuild
+++ b/dev-util/gtk-doc-am/gtk-doc-am-1.32.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://www.gtk.org/gtk-doc/"
LICENSE="GPL-2 FDL-1.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND=""
DEPEND="${RDEPEND}
diff --git a/dev-util/gtk-doc/gtk-doc-1.32-r1.ebuild b/dev-util/gtk-doc/gtk-doc-1.32-r1.ebuild
index 8d725f8fbcde..4abe6de1c034 100644
--- a/dev-util/gtk-doc/gtk-doc-1.32-r1.ebuild
+++ b/dev-util/gtk-doc/gtk-doc-1.32-r1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://www.gtk.org/gtk-doc/"
LICENSE="GPL-2 FDL-1.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
IUSE="debug doc emacs"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-util/gtk-update-icon-cache/Manifest b/dev-util/gtk-update-icon-cache/Manifest
index c591952c86c4..a915b841f2ec 100644
--- a/dev-util/gtk-update-icon-cache/Manifest
+++ b/dev-util/gtk-update-icon-cache/Manifest
@@ -1,2 +1,3 @@
DIST gtk-update-icon-cache-3.24.16.tar.bz2 91713 BLAKE2B 883c1437ecbff8cdec545fb3a59270569de32f59c48cb7e2401332a2547ccf41487ff2778e382815695eca34cf88baddc955acf8b2b7b7ab1edf06dec5be8683 SHA512 53bdaa8d29e1c343cf9e5d0acddd852d1a3d43a9c03e8e7c186245f5ab536742b39bd7c76b9fee3a2b5342ab573be621d59f7282f41b08097061c8f5df158c06
DIST gtk-update-icon-cache-3.24.20.tar.bz2 91769 BLAKE2B 4fb1d4e06117924377e2e3f28f733ffd4f929414e6e36855a4486d6aa2a63f3a37cf5710c8dffdb6c32470c24861070a3160b8373dfa10a3831d098446f5701f SHA512 2ba23145e3cd46d3cd7129c68355c6918a271688935b828be110049e6a912879d25f88a8105c8dd1484de8b0c89d220bb6e8f4282aaf083602ad88e2cef9a54e
+DIST gtk-update-icon-cache-3.24.21.tar.bz2 91918 BLAKE2B b9cf0f944f13c3280ad615a6453e8fe80424b481d66af7bfd98826354f124f67c3a75afece07cd38cb8722eb1beeeb23b1cb7e23ae8d68f2dca195a155c69508 SHA512 207449dc92b029f735f40cf4e9cc59dd02103bab7c382a69feb7162873e2cf7b1fa6a7ce818533888305424667795da86be55e5befc89f8bfc8809d6aa6cd92a
diff --git a/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.21.ebuild b/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.21.ebuild
new file mode 100644
index 000000000000..4c02aa74fa1a
--- /dev/null
+++ b/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.21.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit meson
+
+DESCRIPTION="GTK update icon cache"
+HOMEPAGE="https://www.gtk.org/ https://gitlab.gnome.org/Community/gentoo/gtk-update-icon-cache"
+SRC_URI="https://gitlab.gnome.org/Community/gentoo/${PN}/-/archive/${PV}/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+IUSE=""
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+# man page was previously installed by gtk+:3 ebuild
+RDEPEND="
+ >=dev-libs/glib-2.53.4:2
+ >=x11-libs/gdk-pixbuf-2.30:2
+ !
-Date: Mon, 13 Jan 2020 23:46:09 -0500
-Subject: [PATCH] test_pkgconfig_gen_deps: set
- PKG_CONFIG_SYSTEM_LIBRARY_PATH=/usr/lib
-
-pkgconf automatically prunes "system library paths" from its output. The
-system library paths depend on the system toolchain. A common value on a
-64-bit system is as follows:
-
-/lib64:/usr/lib64:/usr/local/lib64
-
-So, if -L/usr/lib64 appears in the Libs section, it will be pruned from
-the output of pkg-config --libs.
-
-The pc files generated for this test contain something like this:
-
-libdir=/usr/lib
-Libs: -L${libdir} ...
-
-pkgconf may not consider /usr/lib to be a system library path, so it is
-not pruned as the test expects. To work around this, override the
-compiled-in list of paths via the PKG_CONFIG_SYSTEM_LIBRARY_PATH
-environment variable.
-
-Fixes: https://github.com/mesonbuild/meson/issues/6004
----
- run_unittests.py | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/run_unittests.py b/run_unittests.py
-index 898f05e54d..5a60b9b6a4 100755
---- a/run_unittests.py
-+++ b/run_unittests.py
-@@ -4832,7 +4832,10 @@ def test_pkgconfig_gen_deps(self):
- privatedir2 = self.privatedir
-
- os.environ
-- env = {'PKG_CONFIG_LIBDIR': os.pathsep.join([privatedir1, privatedir2])}
-+ env = {
-+ 'PKG_CONFIG_LIBDIR': os.pathsep.join([privatedir1, privatedir2]),
-+ 'PKG_CONFIG_SYSTEM_LIBRARY_PATH': '/usr/lib',
-+ }
- self._run(['pkg-config', 'dependency-test', '--validate'], override_envvars=env)
-
- # pkg-config strips some duplicated flags so we have to parse the
diff --git a/dev-util/meson/files/0.53.1-remove-asan-ld_preload.patch b/dev-util/meson/files/0.53.1-remove-asan-ld_preload.patch
deleted file mode 100644
index 4ee11829904d..000000000000
--- a/dev-util/meson/files/0.53.1-remove-asan-ld_preload.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 75f2d7a004387edc7a7e73da5097bf01daf38769 Mon Sep 17 00:00:00 2001
-From: William Hubbs
-Date: Sat, 15 Feb 2020 12:24:42 -0600
-Subject: [PATCH 1/2] remove asan ld_preload
-
-ASAN and sandbox both want control over LD_PRELOAD
-https://bugs.gentoo.org/673016
----
- run_unittests.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/run_unittests.py b/run_unittests.py
-index 676604f4..1c9aaf0c 100755
---- a/run_unittests.py
-+++ b/run_unittests.py
-@@ -4985,7 +4985,7 @@ class LinuxlikeTests(BasePlatformTests):
- r'Run-time dependency qt5 \(modules: Core\) found: YES 5.* \(pkg-config\)\n')
-
- @skip_if_not_base_option('b_sanitize')
-- def test_generate_gir_with_address_sanitizer(self):
-+ def _test_generate_gir_with_address_sanitizer(self):
- if is_cygwin():
- raise unittest.SkipTest('asan not available on Cygwin')
- if is_openbsd():
---
-2.24.1
-
diff --git a/dev-util/meson/files/0.53.1-remove-asan.patch b/dev-util/meson/files/0.53.1-remove-asan.patch
deleted file mode 100644
index 4cc2aead0ba6..000000000000
--- a/dev-util/meson/files/0.53.1-remove-asan.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 9ddb289ca9611281a45734d92fdfd2d5fb83f050 Mon Sep 17 00:00:00 2001
-From: William Hubbs
-Date: Sat, 15 Feb 2020 12:28:35 -0600
-Subject: [PATCH 2/2] remove asan
-
-ASAN is unsupported on some targets
-https://bugs.gentoo.org/692822
----
- run_unittests.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/run_unittests.py b/run_unittests.py
-index 1c9aaf0c..171ee0f0 100755
---- a/run_unittests.py
-+++ b/run_unittests.py
-@@ -5475,7 +5475,7 @@ class LinuxlikeTests(BasePlatformTests):
- self.assertEqual(install_rpath, 'baz')
-
- @skip_if_not_base_option('b_sanitize')
-- def test_pch_with_address_sanitizer(self):
-+ def _test_pch_with_address_sanitizer(self):
- if is_cygwin():
- raise unittest.SkipTest('asan not available on Cygwin')
- if is_openbsd():
---
-2.24.1
-
diff --git a/dev-util/meson/meson-0.52.1.ebuild b/dev-util/meson/meson-0.52.1.ebuild
deleted file mode 100644
index 077d7508af29..000000000000
--- a/dev-util/meson/meson-0.52.1.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 2016-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
-DISTUTILS_USE_SETUPTOOLS="rdepend"
-
-if [[ ${PV} = *9999* ]]; then
- EGIT_REPO_URI="https://github.com/mesonbuild/meson"
- inherit git-r3
-else
- SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
-fi
-
-inherit distutils-r1 toolchain-funcs
-
-DESCRIPTION="Open source build system"
-HOMEPAGE="https://mesonbuild.com/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
- test? (
- dev-libs/glib:2
- dev-libs/gobject-introspection
- dev-util/ninja
- dev-vcs/git
- sys-libs/zlib[static-libs(+)]
- virtual/pkgconfig
- )
-"
-
-python_prepare_all() {
- local PATCHES=(
- "${FILESDIR}"/0.52.1-test_pkgconfig_gen_deps.patch
- )
-
- # ASAN and sandbox both want control over LD_PRELOAD
- # https://bugs.gentoo.org/673016
- sed -i -e 's/test_generate_gir_with_address_sanitizer/_&/' run_unittests.py || die
-
- # ASAN is unsupported on some targets
- # https://bugs.gentoo.org/692822
- sed -i -e 's/test_pch_with_address_sanitizer/_&/' run_unittests.py || die
-
- # Broken due to python2 script created by python_wrapper_setup
- rm -r "test cases/frameworks/1 boost" || die
-
- distutils-r1_python_prepare_all
-}
-
-src_test() {
- tc-export PKG_CONFIG
- if ${PKG_CONFIG} --exists Qt5Core && ! ${PKG_CONFIG} --exists Qt5Gui; then
- ewarn "Found Qt5Core but not Qt5Gui; skipping tests"
- else
- # https://bugs.gentoo.org/687792
- unset PKG_CONFIG
- distutils-r1_src_test
- fi
-}
-
-python_test() {
- (
- # test_meson_installed
- unset PYTHONDONTWRITEBYTECODE
-
- # test_cross_file_system_paths
- unset XDG_DATA_HOME
-
- ${EPYTHON} -u run_tests.py
- ) || die "Testing failed with ${EPYTHON}"
-}
-
-python_install_all() {
- distutils-r1_python_install_all
-
- insinto /usr/share/vim/vimfiles
- doins -r data/syntax-highlighting/vim/{ftdetect,indent,syntax}
- insinto /usr/share/zsh/site-functions
- doins data/shell-completions/zsh/_meson
-}
diff --git a/dev-util/meson/meson-0.53.1.ebuild b/dev-util/meson/meson-0.53.1.ebuild
deleted file mode 100644
index a0802ef4fcb5..000000000000
--- a/dev-util/meson/meson-0.53.1.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 2016-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
-DISTUTILS_USE_SETUPTOOLS="rdepend"
-
-if [[ ${PV} = *9999* ]]; then
- EGIT_REPO_URI="https://github.com/mesonbuild/meson"
- inherit git-r3
-else
- SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
-fi
-
-inherit distutils-r1 toolchain-funcs
-
-DESCRIPTION="Open source build system"
-HOMEPAGE="https://mesonbuild.com/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
- test? (
- dev-libs/glib:2
- dev-libs/gobject-introspection
- dev-util/ninja
- dev-vcs/git
- sys-libs/zlib[static-libs(+)]
- virtual/pkgconfig
- )
-"
-
-PATCHES=(
- # ASAN and sandbox both want control over LD_PRELOAD
- # https://bugs.gentoo.org/673016
- "${FILESDIR}"/0.53.1-remove-asan-ld_preload.patch
- # ASAN is unsupported on some targets
- # https://bugs.gentoo.org/692822
- "${FILESDIR}"/0.53.1-remove-asan.patch
- )
-
-python_prepare_all() {
-
- # Broken due to python2 script created by python_wrapper_setup
- rm -r "test cases/frameworks/1 boost" || die
-
- distutils-r1_python_prepare_all
-}
-
-src_test() {
- tc-export PKG_CONFIG
- if ${PKG_CONFIG} --exists Qt5Core && ! ${PKG_CONFIG} --exists Qt5Gui; then
- ewarn "Found Qt5Core but not Qt5Gui; skipping tests"
- else
- # https://bugs.gentoo.org/687792
- unset PKG_CONFIG
- distutils-r1_src_test
- fi
-}
-
-python_test() {
- (
- # test_meson_installed
- unset PYTHONDONTWRITEBYTECODE
-
- # test_cross_file_system_paths
- unset XDG_DATA_HOME
-
- ${EPYTHON} -u run_tests.py
- ) || die "Testing failed with ${EPYTHON}"
-}
-
-python_install_all() {
- distutils-r1_python_install_all
-
- insinto /usr/share/vim/vimfiles
- doins -r data/syntax-highlighting/vim/{ftdetect,indent,syntax}
- insinto /usr/share/zsh/site-functions
- doins data/shell-completions/zsh/_meson
-}
diff --git a/dev-util/meson/meson-0.54.0.ebuild b/dev-util/meson/meson-0.54.0.ebuild
deleted file mode 100644
index 77f6244e6e29..000000000000
--- a/dev-util/meson/meson-0.54.0.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 2016-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
-DISTUTILS_USE_SETUPTOOLS="rdepend"
-
-if [[ ${PV} = *9999* ]]; then
- EGIT_REPO_URI="https://github.com/mesonbuild/meson"
- inherit git-r3
-else
- SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
-fi
-
-inherit distutils-r1 toolchain-funcs
-
-DESCRIPTION="Open source build system"
-HOMEPAGE="https://mesonbuild.com/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
- test? (
- dev-libs/glib:2
- dev-libs/gobject-introspection
- dev-util/ninja
- dev-vcs/git
- sys-libs/zlib[static-libs(+)]
- virtual/pkgconfig
- )
-"
-
-src_test() {
- tc-export PKG_CONFIG
- if ${PKG_CONFIG} --exists Qt5Core && ! ${PKG_CONFIG} --exists Qt5Gui; then
- ewarn "Found Qt5Core but not Qt5Gui; skipping tests"
- else
- # https://bugs.gentoo.org/687792
- unset PKG_CONFIG
- distutils-r1_src_test
- fi
-}
-
-python_test() {
- (
- # test_meson_installed
- unset PYTHONDONTWRITEBYTECODE
-
- # test_cross_file_system_paths
- unset XDG_DATA_HOME
-
- ${EPYTHON} -u run_tests.py
- ) || die "Testing failed with ${EPYTHON}"
-}
-
-python_install_all() {
- distutils-r1_python_install_all
-
- insinto /usr/share/vim/vimfiles
- doins -r data/syntax-highlighting/vim/{ftdetect,indent,syntax}
- insinto /usr/share/zsh/site-functions
- doins data/shell-completions/zsh/_meson
-}
diff --git a/dev-util/meson/meson-0.54.1.ebuild b/dev-util/meson/meson-0.54.1.ebuild
deleted file mode 100644
index 053a12bbeb2f..000000000000
--- a/dev-util/meson/meson-0.54.1.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 2016-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
-DISTUTILS_USE_SETUPTOOLS="rdepend"
-
-if [[ ${PV} = *9999* ]]; then
- EGIT_REPO_URI="https://github.com/mesonbuild/meson"
- inherit git-r3
-else
- SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
-fi
-
-inherit distutils-r1 toolchain-funcs
-
-DESCRIPTION="Open source build system"
-HOMEPAGE="https://mesonbuild.com/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
- test? (
- dev-libs/glib:2
- dev-libs/gobject-introspection
- dev-util/ninja
- dev-vcs/git
- sys-libs/zlib[static-libs(+)]
- virtual/pkgconfig
- )
-"
-
-python_prepare_all() {
- # ASAN and sandbox both want control over LD_PRELOAD
- # https://bugs.gentoo.org/673016
- sed -i -e 's/test_generate_gir_with_address_sanitizer/_&/' run_unittests.py || die
-
- # ASAN is unsupported on some targets
- # https://bugs.gentoo.org/692822
- sed -i -e 's/test_pch_with_address_sanitizer/_&/' run_unittests.py || die
-
- # Broken due to python2 script created by python_wrapper_setup
- rm -r "test cases/frameworks/1 boost" || die
-
- distutils-r1_python_prepare_all
-}
-
-src_test() {
- tc-export PKG_CONFIG
- if ${PKG_CONFIG} --exists Qt5Core && ! ${PKG_CONFIG} --exists Qt5Gui; then
- ewarn "Found Qt5Core but not Qt5Gui; skipping tests"
- else
- # https://bugs.gentoo.org/687792
- unset PKG_CONFIG
- distutils-r1_src_test
- fi
-}
-
-python_test() {
- (
- # test_meson_installed
- unset PYTHONDONTWRITEBYTECODE
-
- # test_cross_file_system_paths
- unset XDG_DATA_HOME
-
- ${EPYTHON} -u run_tests.py
- ) || die "Testing failed with ${EPYTHON}"
-}
-
-python_install_all() {
- distutils-r1_python_install_all
-
- insinto /usr/share/vim/vimfiles
- doins -r data/syntax-highlighting/vim/{ftdetect,indent,syntax}
- insinto /usr/share/zsh/site-functions
- doins data/shell-completions/zsh/_meson
-}
diff --git a/dev-util/pkgcheck/Manifest b/dev-util/pkgcheck/Manifest
index 4265fd5ff9bf..b120eec4bdcc 100644
--- a/dev-util/pkgcheck/Manifest
+++ b/dev-util/pkgcheck/Manifest
@@ -1 +1,2 @@
DIST pkgcheck-0.7.6.tar.gz 234637 BLAKE2B 31c31d987aed03e4a61f58a3dc3074985a4f436e3598f11257d602a668525f24e45c540d56e5779237cd36299b0ab73b9a59e3482099cb5accbb3ea8437cd7c5 SHA512 cfded3a5a0249ee9279fe93156ef524cafe7302915dfbbb01acd0bdc3acefcd1e90c6bcfbf3dc40bd5cb71680cc6453b1de045878d75a9ade00c432e663fd136
+DIST pkgcheck-0.7.7.tar.gz 236359 BLAKE2B 46628e6fe1ab711773209785f3160ad5521f7173a676363a44102bd26b443eafe4f88829d9a6c9cf10538ebfa7ca8b28cb8c27f9719f98217ff626d1b5a9a0b3 SHA512 ac88a3aa689983bfac0efa85240e3a02c822a075095ff9940fac0cdc188428126e7612807e57a7582f21fcf1d668dba29d4785d062d757f6444fa024d0437751
diff --git a/dev-util/pkgcheck/pkgcheck-0.7.6-r1.ebuild b/dev-util/pkgcheck/pkgcheck-0.7.6-r1.ebuild
index 1a6b8a9bd231..84cec761d99e 100644
--- a/dev-util/pkgcheck/pkgcheck-0.7.6-r1.ebuild
+++ b/dev-util/pkgcheck/pkgcheck-0.7.6-r1.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]] ; then
EGIT_REPO_URI="https://github.com/pkgcore/pkgcheck.git"
inherit git-r3
else
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+ KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
fi
diff --git a/dev-util/pkgcheck/pkgcheck-0.7.7.ebuild b/dev-util/pkgcheck/pkgcheck-0.7.7.ebuild
new file mode 100644
index 000000000000..19f05125eb14
--- /dev/null
+++ b/dev-util/pkgcheck/pkgcheck-0.7.7.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_{6..9} )
+DISTUTILS_IN_SOURCE_BUILD=1
+inherit distutils-r1 eutils
+
+if [[ ${PV} == *9999 ]] ; then
+ EGIT_REPO_URI="https://github.com/pkgcore/pkgcheck.git"
+ inherit git-r3
+else
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+fi
+
+DESCRIPTION="pkgcore-based QA utility for ebuild repos"
+HOMEPAGE="https://github.com/pkgcore/pkgcheck"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+if [[ ${PV} == *9999 ]]; then
+ RDEPEND="
+ ~dev-python/snakeoil-9999[${PYTHON_USEDEP}]
+ ~sys-apps/pkgcore-9999[${PYTHON_USEDEP}]"
+else
+ RDEPEND="
+ >=dev-python/snakeoil-0.8.8[${PYTHON_USEDEP}]
+ >=sys-apps/pkgcore-0.10.13[${PYTHON_USEDEP}]"
+fi
+RDEPEND+="
+ dev-python/chardet[${PYTHON_USEDEP}]
+ dev-python/lxml[${PYTHON_USEDEP}]
+ dev-python/pathspec[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+"
+
+python_test() {
+ esetup.py test
+}
+
+python_install_all() {
+ local DOCS=( NEWS.rst )
+ [[ ${PV} == *9999 ]] || doman man/*
+ distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+ optfeature "Network check support" dev-python/requests
+ optfeature "Perl module version check support" dev-perl/Gentoo-PerlMod-Version
+}
diff --git a/dev-util/pkgcheck/pkgcheck-9999.ebuild b/dev-util/pkgcheck/pkgcheck-9999.ebuild
index c05954b53f8a..19f05125eb14 100644
--- a/dev-util/pkgcheck/pkgcheck-9999.ebuild
+++ b/dev-util/pkgcheck/pkgcheck-9999.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]] ; then
EGIT_REPO_URI="https://github.com/pkgcore/pkgcheck.git"
inherit git-r3
else
- KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
fi
@@ -29,7 +29,7 @@ if [[ ${PV} == *9999 ]]; then
else
RDEPEND="
>=dev-python/snakeoil-0.8.8[${PYTHON_USEDEP}]
- >=sys-apps/pkgcore-0.10.11[${PYTHON_USEDEP}]"
+ >=sys-apps/pkgcore-0.10.13[${PYTHON_USEDEP}]"
fi
RDEPEND+="
dev-python/chardet[${PYTHON_USEDEP}]
diff --git a/dev-util/spirv-headers/spirv-headers-1.5.3.ebuild b/dev-util/spirv-headers/spirv-headers-1.5.3.ebuild
index 56d8e9cf84c5..1a4119266b38 100644
--- a/dev-util/spirv-headers/spirv-headers-1.5.3.ebuild
+++ b/dev-util/spirv-headers/spirv-headers-1.5.3.ebuild
@@ -12,6 +12,6 @@ SRC_URI="https://github.com/KhronosGroup/SPIRV-Headers/archive/${EGIT_COMMIT}.ta
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
S="${WORKDIR}/SPIRV-Headers-${EGIT_COMMIT}"
diff --git a/dev-util/spirv-tools/spirv-tools-2020.3.ebuild b/dev-util/spirv-tools/spirv-tools-2020.3.ebuild
index 98b310bfca1b..c81f16e22913 100644
--- a/dev-util/spirv-tools/spirv-tools-2020.3.ebuild
+++ b/dev-util/spirv-tools/spirv-tools-2020.3.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999* ]]; then
inherit git-r3
else
SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="amd64 ~ppc64 x86"
+ KEYWORDS="amd64 ~arm64 ~ppc64 x86"
S="${WORKDIR}"/${MY_PN}-${PV}
fi
diff --git a/dev-util/sysprof-capture/Manifest b/dev-util/sysprof-capture/Manifest
index c718e91a09e2..153e4d5187a0 100644
--- a/dev-util/sysprof-capture/Manifest
+++ b/dev-util/sysprof-capture/Manifest
@@ -1 +1,2 @@
DIST sysprof-3.34.1.tar.xz 372612 BLAKE2B 3a50a00f29866ae8bf03cc7a57b598e40a6a37ad88ac2159087e4f2a8a6a5cef09b345dc5332fb1df9036c4e159e98f19adda45588150b059af313878b9b554c SHA512 5f2d820935291a3b578222d5daa87b0a2f74cd16d14daca19065495be61cf7359f00f12f452a5c0b4e05dfeb94e2376017c2288cad92dc0c4bb9bca51b903d19
+DIST sysprof-3.36.0.tar.xz 435956 BLAKE2B 990a6c6c28339594df915ed1fb98f504bf6b080a5e3c31af0cc4bcfd208027361f02a9068291692d082787a6fd42ab414079122a63e4706aee2511040379f0c8 SHA512 41f99cc3446a6624ea74fcdecd7a29a2e5e2d4086383d59a9064c4a3df5d9b8d08f4903ff4dcc85ffa9c6d42bd84dec5c03f6010fffd4415cc8fecf4dc0b23f4
diff --git a/dev-util/sysprof-capture/sysprof-capture-3.36.0.ebuild b/dev-util/sysprof-capture/sysprof-capture-3.36.0.ebuild
new file mode 100644
index 000000000000..aeb811d08afa
--- /dev/null
+++ b/dev-util/sysprof-capture/sysprof-capture-3.36.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+GNOME_ORG_MODULE="sysprof"
+
+inherit gnome.org meson systemd
+
+DESCRIPTION="Static library for sysprof capture data generation"
+HOMEPAGE="http://sysprof.com/"
+
+LICENSE="GPL-3+ GPL-2+"
+SLOT="3"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-libs/glib-2.61.3:2
+ !=dev-util/sysprof-3.34.1-r0"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ dev-util/gdbus-codegen
+ >=sys-kernel/linux-headers-2.6.32
+ virtual/pkgconfig
+"
+
+src_prepare() {
+ default
+ # We want to ship org.gnome.Sysprof3.Profiler.xml here for the benefit of x11-wm/mutter
+ sed -i -e "s|if get_option('libsysprof')|if true|g" src/meson.build || die
+}
+
+src_configure() {
+ local emesonargs=(
+ -Denable_gtk=false
+ -Dlibsysprof=false
+ -Dwith_sysprofd=none
+ -Dsystemdunitdir=$(systemd_get_systemunitdir)
+ # -Ddebugdir
+ -Dhelp=false
+ -Dlibunwind=false
+ )
+ meson_src_configure
+}
diff --git a/dev-util/sysprof/Manifest b/dev-util/sysprof/Manifest
index c718e91a09e2..153e4d5187a0 100644
--- a/dev-util/sysprof/Manifest
+++ b/dev-util/sysprof/Manifest
@@ -1 +1,2 @@
DIST sysprof-3.34.1.tar.xz 372612 BLAKE2B 3a50a00f29866ae8bf03cc7a57b598e40a6a37ad88ac2159087e4f2a8a6a5cef09b345dc5332fb1df9036c4e159e98f19adda45588150b059af313878b9b554c SHA512 5f2d820935291a3b578222d5daa87b0a2f74cd16d14daca19065495be61cf7359f00f12f452a5c0b4e05dfeb94e2376017c2288cad92dc0c4bb9bca51b903d19
+DIST sysprof-3.36.0.tar.xz 435956 BLAKE2B 990a6c6c28339594df915ed1fb98f504bf6b080a5e3c31af0cc4bcfd208027361f02a9068291692d082787a6fd42ab414079122a63e4706aee2511040379f0c8 SHA512 41f99cc3446a6624ea74fcdecd7a29a2e5e2d4086383d59a9064c4a3df5d9b8d08f4903ff4dcc85ffa9c6d42bd84dec5c03f6010fffd4415cc8fecf4dc0b23f4
diff --git a/dev-util/sysprof/metadata.xml b/dev-util/sysprof/metadata.xml
index 7b2b574988e8..dea417a2e622 100644
--- a/dev-util/sysprof/metadata.xml
+++ b/dev-util/sysprof/metadata.xml
@@ -5,6 +5,9 @@
gnome@gentoo.org
Gentoo GNOME Desktop
+
Sysprof is a sampling CPU profiler for Linux that profiles the entire system,
not just a single application.
diff --git a/dev-util/sysprof/sysprof-3.36.0.ebuild b/dev-util/sysprof/sysprof-3.36.0.ebuild
new file mode 100644
index 000000000000..f177e8ac8280
--- /dev/null
+++ b/dev-util/sysprof/sysprof-3.36.0.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gnome.org gnome2-utils meson systemd xdg
+
+DESCRIPTION="System-wide Linux Profiler"
+HOMEPAGE="http://sysprof.com/"
+
+LICENSE="GPL-3+ GPL-2+"
+API_VERSION="3"
+SLOT="0/${API_VERSION}"
+KEYWORDS="~amd64 ~x86"
+IUSE="gtk +unwind"
+
+RDEPEND="
+ >=dev-libs/glib-2.61.3:2
+ gtk? (
+ >=x11-libs/gtk+-3.22.0:3
+ >=dev-libs/libdazzle-3.30.0
+ )
+ >=sys-auth/polkit-0.114
+ unwind? ( sys-libs/libunwind:= )
+ >=dev-util/sysprof-capture-${PV}:${API_VERSION}
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ dev-libs/appstream-glib
+ dev-util/gdbus-codegen
+ dev-util/itstool
+ >=sys-devel/gettext-0.19.8
+ >=sys-kernel/linux-headers-2.6.32
+ virtual/pkgconfig
+"
+
+src_prepare() {
+ xdg_src_prepare
+ # These are installed by dev-util/sysprof-capture
+ sed -i -e '/install/d' src/libsysprof-capture/meson.build || die
+ sed -i -e 's/pkgconfig\.generate/subdir_done()\npkgconfig\.generate/' src/libsysprof-capture/meson.build || die
+ # We want to ship org.gnome.Sysprof3.Profiler.xml in sysprof-capture for the benefit of x11-wm/mutter
+ sed -i -e "s|if get_option('libsysprof')|if false|g" src/meson.build || die
+}
+
+src_configure() {
+ # -Dwith_sysprofd=host currently unavailable from ebuild
+ local emesonargs=(
+ $(meson_use gtk enable_gtk)
+ -Dlibsysprof=true
+ -Dwith_sysprofd=bundled
+ -Dsystemdunitdir=$(systemd_get_systemunitdir)
+ # -Ddebugdir
+ -Dhelp=true
+ $(meson_use unwind libunwind)
+ )
+ meson_src_configure
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+ gnome2_schemas_update
+
+ elog "On many systems, especially amd64, it is typical that with a modern"
+ elog "toolchain -fomit-frame-pointer for gcc is the default, because"
+ elog "debugging is still possible thanks to gcc4/gdb location list feature."
+ elog "However sysprof is not able to construct call trees if frame pointers"
+ elog "are not present. Therefore -fno-omit-frame-pointer CFLAGS is suggested"
+ elog "for the libraries and applications involved in the profiling. That"
+ elog "means a CPU register is used for the frame pointer instead of other"
+ elog "purposes, which means a very minimal performance loss when there is"
+ elog "register pressure."
+}
+
+pkg_postrm() {
+ xdg_pkg_postrm
+ gnome2_schemas_update
+}
diff --git a/dev-util/vulkan-headers/vulkan-headers-1.2.143.ebuild b/dev-util/vulkan-headers/vulkan-headers-1.2.143.ebuild
index 7d33f79e5418..eeb29c318b7e 100644
--- a/dev-util/vulkan-headers/vulkan-headers-1.2.143.ebuild
+++ b/dev-util/vulkan-headers/vulkan-headers-1.2.143.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999* ]]; then
inherit git-r3
else
SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="amd64 ~ppc64 x86"
+ KEYWORDS="amd64 ~arm64 ~ppc64 x86"
S="${WORKDIR}"/${MY_PN}-${PV}
fi
diff --git a/dev-util/vulkan-tools/vulkan-tools-1.2.141.ebuild b/dev-util/vulkan-tools/vulkan-tools-1.2.141.ebuild
index c2805c77cf4a..4704f31811af 100644
--- a/dev-util/vulkan-tools/vulkan-tools-1.2.141.ebuild
+++ b/dev-util/vulkan-tools/vulkan-tools-1.2.141.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999* ]]; then
inherit git-r3
else
SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="amd64 ~ppc64"
+ KEYWORDS="amd64 ~arm64 ~ppc64"
S="${WORKDIR}"/${MY_PN}-${PV}
fi
diff --git a/dev-util/xdelta/xdelta-3.0.11.ebuild b/dev-util/xdelta/xdelta-3.0.11.ebuild
index 23d1fb802b53..12dd58fbb5c1 100644
--- a/dev-util/xdelta/xdelta-3.0.11.ebuild
+++ b/dev-util/xdelta/xdelta-3.0.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 2002-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/jmacd/xdelta-gpl/releases/download/v${PV}/${MY_P}.ta
LICENSE="GPL-2"
SLOT="3"
-KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~arm64 hppa ~ia64 ppc ppc64 sparc x86"
IUSE="examples lzma"
RDEPEND="lzma? ( app-arch/xz-utils:= )"
diff --git a/dev-util/xdelta/xdelta-3.1.0.ebuild b/dev-util/xdelta/xdelta-3.1.0.ebuild
index 13da9efc6daa..5e4c9b097d66 100644
--- a/dev-util/xdelta/xdelta-3.1.0.ebuild
+++ b/dev-util/xdelta/xdelta-3.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 2002-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/jmacd/xdelta-gpl/releases/download/v${PV}/${MY_P}.ta
LICENSE="GPL-2"
SLOT="3"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
IUSE="examples test"
RESTRICT="!test? ( test )"
diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz
index 21354b5ab3f3..955af4fdef81 100644
Binary files a/dev-vcs/Manifest.gz and b/dev-vcs/Manifest.gz differ
diff --git a/dev-vcs/git-deps/git-deps-9999.ebuild b/dev-vcs/git-deps/git-deps-9999.ebuild
deleted file mode 100644
index 57d46ddb9f56..000000000000
--- a/dev-vcs/git-deps/git-deps-9999.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGIT_REPO_URI="https://github.com/aspiers/git-deps"
-EGIT_BRANCH=master
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils git-r3 python-single-r1
-
-DESCRIPTION="git commit dependency analysis tool"
-HOMEPAGE="https://github.com/aspiers/git-deps"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-RDEPEND="
- $(python_gen_cond_dep '
- dev-python/flask[${PYTHON_MULTI_USEDEP}]
- dev-python/pygit2[${PYTHON_MULTI_USEDEP}]
- ')
- net-libs/nodejs
- ${PYTHON_DEPS}
- "
-DEPEND="${RDEPEND}"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-HTML_DOCS="html/."
-
-pkg_setup() {
- python-single-r1_pkg_setup
-}
-
-src_install() {
- python_newscript git-deps.py git-deps
- einstalldocs
-}
-
-pkg_postinst() {
- elog "Notes regarding the '--serve' option:"
- elog "Please run 'npm install browserify' once"
- elog "Copy the html sources:"
- elog "rsync -av ${EROOT}/usr/share/${PN}/html ~/git-deps-html"
- elog "cd ~/git-deps-html"
- elog "npm install"
- elog "browserify -t coffeeify -d js/git-deps-graph.coffee -o js/bundle.js"
-}
diff --git a/dev-vcs/git-deps/metadata.xml b/dev-vcs/git-deps/metadata.xml
deleted file mode 100644
index 1a9f54bc290b..000000000000
--- a/dev-vcs/git-deps/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-
- nicolasbock@gentoo.org
- Nicolas Bock
-
-
- git-deps is a tool for performing automatic analysis of dependencies
- between commits in a git repository.
-
-
- aspiers/git-deps
-
-
diff --git a/dev-vcs/git-lfs/Manifest b/dev-vcs/git-lfs/Manifest
index ef8409bb47ac..0a2f26c8da8c 100644
--- a/dev-vcs/git-lfs/Manifest
+++ b/dev-vcs/git-lfs/Manifest
@@ -1,89 +1 @@
-DIST git-lfs-2.10.0.tar.gz 2771571 BLAKE2B 02818efcadd3915a283bcea9c50baa305d1a325e9832ac6613f3b221e27c26cf5c6c5b54b2dd7ee8e0247e41924d4f1a2b02e1ea6400a2f5c2255c2125057ef0 SHA512 a4bfb3f674ef93e903e815ab0721f25ac78f772df416c865a7c57f7d19790b9efa8d4662723f2e3d87f294346d7924942d05cbfcdd8a010316e8b0420bd71e8a
DIST git-lfs-2.11.0.tar.gz 2839623 BLAKE2B e9d0e8ea37f19617a4f727abdc93c3c937052ad98b6ac40de27ced6b250789701797d04f1bf795b259e83155e5d8a1ca122dbf8b40503c2c41d6d891a3ecf096 SHA512 2117b425864a36f773c14d34c78999636d836646184cf8d89045ef6de90cbded873d4de4613ecfafb0fa2ea8ae068e11f5ae22eed6af01715b5fac9be70f033b
-DIST github.com%2Falexbrainman%2Fsspi%2F@v%2Fv0.0.0-20180125232955-4729b3d4d858.mod 36 BLAKE2B 63449f57a292772e178e1064008cd63f520a7cf20095c51ef6ff88075129828019e66734f79b6a0b81c0873b0ddce10d941f62c7b9951f716ccb251967201087 SHA512 be9b456cad78b6194afa1fa9d6df1a77331706d03102e092a36d7efaa19a9d708fc72245ad224ea1cd87ccd59087b6024f949176aa76e4547f6bd9e7f98231f1
-DIST github.com%2Falexbrainman%2Fsspi%2F@v%2Fv0.0.0-20180125232955-4729b3d4d858.zip 29798 BLAKE2B 36bab471360ec0ac95260e34c348ad7958f5946c88a00ba1799fafd8a783a6f0bf07d97f2c6157a277cccbc6986da66b98d8e5569f37a5d6862e9b018b2fc319 SHA512 cb56fca8c7b386039e9437fe029a05b5fca8f4e47d9066d05227ba5b27c9c5b3029aadde3930a2748ae8f1e1c0dafbece73339e5077819d61b8b4046cdf6f4a1
-DIST github.com%2Favast%2Fretry-go%2F@v%2Fv2.4.2+incompatible.mod 33 BLAKE2B aa9ff95903d70d79a59246a577ffd5a06778c11ef2595294b4aad0023e7b1d5d0a94caf09d6332371719c1564b5e8d31710dc6d38ffef08f73456d84d4851f76 SHA512 87e9e766f71571384f11693b81a8ae95f2a603f9fa26e3159616ed9a5c2a18723d0a9512e2d9d14273a19fb3347ca4efa912d64e2303944d6fc9ef6dcadc0a73
-DIST github.com%2Favast%2Fretry-go%2F@v%2Fv2.4.2+incompatible.zip 12642 BLAKE2B 7c02212c6dd25c75415a1b5268bcfc313a667ef298c4d0b3940405cede2fcb159a91088a33cb32a482653aa10391afbe9ddcdeda78351fc31838747b80087140 SHA512 c6b98e24e642f21ce0551f974c55711066a36e77b66201a085ab728bb4b9614aa7ec35b01cd7225f945d0a32d069d974eb542d6eddb2e5681fa11c2f13d35a94
-DIST github.com%2Fcreack%2Fpty%2F@v%2Fv1.1.7.mod 29 BLAKE2B 6d29d882c7c8c863cc1cfa01de2e2347b09e8cf4470c0bae2737f7436ce6d6ab34eb6714eba9f869974c1c8d7a332bfb90ac842b9fb7a07bd1a4c8b0e460eefe SHA512 a41a722efe7f634eebd689a9793f9ee3a89924e6c7917008c6661761c8829d6a897dc71c496f761068c36c590a800f06bbefa4ac59f7761cc0ee2cc68ac5c14c
-DIST github.com%2Fcreack%2Fpty%2F@v%2Fv1.1.7.zip 19233 BLAKE2B 72d5eb2b25cc20e8f22d29948913981975ad9b19669e4bc898b380e946e73b2ae7791c9bb14ac69a6949a28fa4b64f0cf8e2d8c08c5b647119b33856f8b00d51 SHA512 e2c2738bf03022c96e739fbfb9a43c19988d49a54e45eade73ab9b8deaa9f94bbcbbeed910051eb370699de1519da9d5d2ce7c42e22b9d15784b599daf393d4a
-DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod 34 BLAKE2B 7e09c2779bf7a84a9271e31522ebbe600a1c11b107d651d91f58c8373e4336332a3a881f3e12b382543d75f20398af66085fcb3e780eed341e870e9c30f29267 SHA512 5e079462f7e0dff0efda71f580aa185700cfa936b718a19d0e2a8c63212e47a07022dca0c282832d48e5165aae8e82aeeeb2ac3664268f1148fc772010fb860e
-DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip 60320 BLAKE2B 86bdbc333e5c23ccf4f805945ca9f2aecc5c242d2ae824d20127eceaa2bf7bbab239ff2799572a2c8fa206166a36e97d5eccc8fc5021743d8ad32f39cd53b9eb SHA512 7b4e4df2fea731e23e05437f26f24e32b2e99028d685b72e3a726c1cb616ada4a77ca4fb9db4a6fae48178cc5172e724b74499bc776d63a9110cb97377d5edeb
-DIST github.com%2Fdpotapov%2Fgo-spnego%2F@v%2Fv0.0.0-20190506202455-c2c609116ad0.mod 435 BLAKE2B dcea8c3add36f7ecb313d92e11d39f5264d16d271381a19baed85a0fc9d249e1883a9c5647383f127f60382a67a859acdd4f6041b39761e97d1dc34c1b2b493a SHA512 ca651f150aff45faa479ae01e4b1395e2b99410a67db085dd0ed83baf2a2cf4afb44e3b82e5bd3949c1fb54891cf1101ca9dc6dd2dc35269ef4216d2d12cbdc6
-DIST github.com%2Fdpotapov%2Fgo-spnego%2F@v%2Fv0.0.0-20190506202455-c2c609116ad0.zip 6840 BLAKE2B 700a0608fad677bb63ec5d2b62d48751a34abc8a859615bb36b339f6b2bdf2c6a69c8335a4afd0d765d430c06ab598662818d695c4742d41ae8a7a478aaa3044 SHA512 e7a6e0be8f9334f75dca8e5597a7245ac122f4eb292a91efec9dda1db5e574287fac2bf40fa5aaa46510748a7f2ca27434aad23d525db194c94d5b9afff2457d
-DIST github.com%2Fgit-lfs%2Fgitobj%2F@v%2Fv1.4.1.mod 188 BLAKE2B 2100922969411d51d69c6a2ac413d40c5cd052f77fa7613e271395b10826fd23566ea127750ac3eb6baeae49065564845bd9dc9547ce79add2a054fa32ddacaa SHA512 a5b15632aee28801c4936e007690e79d6cfaa5774a1dfcbfca097a887eb32c69f6e9d37b0ad482d553407efff311c1ac8d1103b1a462f0a585616f703776e2d5
-DIST github.com%2Fgit-lfs%2Fgitobj%2F@v%2Fv1.4.1.zip 74183 BLAKE2B b482ac58262d037545d40f546998497263f0cab2f529bf9003c515bd35c8f89b5e3602d554bf742032eac8eb41a2b0364dc0074fa94be740518e96343263775d SHA512 f5de6a5528af1da18ecbb175c0e3f441ed82f3ed60a519c82cb2d039616e1ce83f5d9faa562aea59360c9009e4a7f8f7f38859f7f292f4c7462d9da3d102d165
-DIST github.com%2Fgit-lfs%2Fgo-netrc%2F@v%2Fv0.0.0-20180525200031-e0e9ca483a18.mod 35 BLAKE2B 43066e606442ae213bb16491e41fe4d5bb2d2b362e0ef20025cd002200363632b4a3169ff571292e2f46b7a9996393a534f4bacdfca59f1fe62dbda2e81ee119 SHA512 768f54e3986f35c9a5acf9aaaf9b55b3e12ada7fb6c602303542709e1dd8ce3e03c40837949f07f943f2ac9f59b7affe8cd14d1e57b1de5fbe488ab2e6f13f90
-DIST github.com%2Fgit-lfs%2Fgo-netrc%2F@v%2Fv0.0.0-20180525200031-e0e9ca483a18.zip 10433 BLAKE2B bee92ebd9cccc446b4460200f6a18348d0c0b1b6ba40ea531c4d01c367e0943ea9701122929186133570929b6b875dfe56b0d79d636c14d8df210655a527e386 SHA512 9c173f6dc2e5e67212499b5c93d7e3a48c17ed3913c5d430593120e5da2698e65647f2a3195324bc7b77ce177432395723226558f369378fb95a4e5d4d314441
-DIST github.com%2Fgit-lfs%2Fgo-ntlm%2F@v%2Fv0.0.0-20190307203151-c5056e7fa066.mod 34 BLAKE2B f8dadc50a4ab22fd40d808c626939e31e6f690efb9635ade663b260c733d9362bff4dd90b6650d603a15edc0911d45db27bf994fe15760b8feae4a5d3d46f50b SHA512 f15829aff2bf18e2143bebec19f4954d14d4c6daec7dc94314d6349715efd4af00e818f6dea04cf482edafb6a61aa84967aeadd6dcf6792de73bf7277aa71fc9
-DIST github.com%2Fgit-lfs%2Fgo-ntlm%2F@v%2Fv0.0.0-20190307203151-c5056e7fa066.zip 52531 BLAKE2B d48ecd448cf4efd735162f903f0c2bfc85af931a3ba21341c11506f438d7678bd79abe9da9c800ffcec8d615bd984f00c5c9df578ba1b097d2a222695c79aae8 SHA512 4c5007a58dc642fff9028bc1f62afe1e6db9d80ea26c58dce2d7895de2b1e175a339a4f8ff2302cc8a4c3a38c8c9bd29d5967b1f996cac702a8ce51b90e1242d
-DIST github.com%2Fgit-lfs%2Fgo-ntlm%2F@v%2Fv0.0.0-20190401175752-c5056e7fa066.mod 34 BLAKE2B f8dadc50a4ab22fd40d808c626939e31e6f690efb9635ade663b260c733d9362bff4dd90b6650d603a15edc0911d45db27bf994fe15760b8feae4a5d3d46f50b SHA512 f15829aff2bf18e2143bebec19f4954d14d4c6daec7dc94314d6349715efd4af00e818f6dea04cf482edafb6a61aa84967aeadd6dcf6792de73bf7277aa71fc9
-DIST github.com%2Fgit-lfs%2Fgo-ntlm%2F@v%2Fv0.0.0-20190401175752-c5056e7fa066.zip 52531 BLAKE2B 9944d8eb2cf6b2b563400f148878b5a2d52021b122e90801cf3e865e13fb2c3e933e4d932607efd9fb3628293381dd6b22f2242d8e6eae02d015d61004fd6417 SHA512 c72344a9bb059d69ab817e4ff0edde7f8bd8f3c997bdc9aac4309505e8448857d5e2ef05f1ddc96b164ed3656c71b4aaa823ce952d1b7ef2045d1ee55760233f
-DIST github.com%2Fgit-lfs%2Fwildmatch%2F@v%2Fv1.0.2.mod 36 BLAKE2B 89773b60ff9f0acd76a9d44c161f0450641660a70a5525c5a3b33a2a9c736e94ebb17142c71ed26fb265104286ac151671b2a37b6ca46069be5cc25616752329 SHA512 a3c7c83c46a232a865065dac86772048d18e170c4e1c2a0f032cb398a280bf2aec45ace671c0a814fd5827c9ab152beb5fceeba8bc208c84571720e2cd7b6257
-DIST github.com%2Fgit-lfs%2Fwildmatch%2F@v%2Fv1.0.2.zip 11224 BLAKE2B b97eed19670371b600909a81d7495cdc4d165019911f0d21856f70d9f6245c3dc19bb38f3d762fb1d997789118ca3cf383fe708e904a99c0453f8cde531a4560 SHA512 c19b7eb82e5185e33031b3744764eb7ef9709df557add63422d3fd87bd96f6c1077f568cb9e01e65ca150126a820e5827529dddd3783cba1e1ca597c33488036
-DIST github.com%2Fgit-lfs%2Fwildmatch%2F@v%2Fv1.0.4.mod 36 BLAKE2B 89773b60ff9f0acd76a9d44c161f0450641660a70a5525c5a3b33a2a9c736e94ebb17142c71ed26fb265104286ac151671b2a37b6ca46069be5cc25616752329 SHA512 a3c7c83c46a232a865065dac86772048d18e170c4e1c2a0f032cb398a280bf2aec45ace671c0a814fd5827c9ab152beb5fceeba8bc208c84571720e2cd7b6257
-DIST github.com%2Fgit-lfs%2Fwildmatch%2F@v%2Fv1.0.4.zip 11268 BLAKE2B e4cdcd3d6a40ed2ea5f6d77500f9a2246fe8a966256704254d95545a1a0b4035f5e196877b285c6c764161310e8a896e9a53c2f0bbd7eea927eb72dcaa76ce78 SHA512 fbdd73f1c7c09792a7b040ce8625bd84edf7dc5539425c94fd32dcc2ea38c3dd0b83dc03051520e97be9b3c9a96e1d8291a67715e5d4562d85383df24166e3c3
-DIST github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.1.mod 36 BLAKE2B 8596defaedca9def85f29cb25a0ae25f8d2ec8eb64d64bd143a237d54d4d23b6851cad71a580667127188cc22d499be07628ce9c916dba946e7b189b612cfc76 SHA512 900755decba72d81cb348184648aa676c4a4c7359cc88ba3b41ebdd7691eeff401a41a495bdca7747e82274b3b2b61499b599e67b5c7369caaf766ea3e488d0e
-DIST github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.1.zip 7804 BLAKE2B 118a166e041d64c446114e195ab870455fb75db45554e02f0ca1b0a2ee76938022120848bcd5d3668a9711c32345db5911cc627977a602bfdcaa875be791199e SHA512 3a3e4b23b82bea9b094f407662f5c63659ae427bd0e922c37f0dcafa1e3cbb16f4117f265cacf2a0219f5240d378aad7aa4cd2f9960e07b7cc7200859b0d6699
-DIST github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.mod 44 BLAKE2B 764581d416faa477a91695a42c68cef5638d019a1622fb3bcee976c1581e904995d33c79ffed1d3b805f660931ece844b3e17437f158f8b82ddae82e95f0358f SHA512 0c77200112d96f9cddf8cf7da0059204914b06a8c400e2e672443bd02a45d9ebb3274275c20e6e7ee0728992e77579d945b36de44ccbaab2ee92fd55f382f7ac
-DIST github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.zip 3712 BLAKE2B f4f79741bb83862583f51f2ac5e80181eb0e9c2a4578df32f7e24eb98f4f548b99333e0e6a377e03ef701057b01e852e6b710ab885b65170c861bef556863da4 SHA512 e16bd414c1df566a12944e4a99ebd84d2103f0cb3bf8ec312e3de400f20b3eae27845db50672801c10474dbf1dc61d0c2e16e5dcd3c4447681c0b77f9114a411
-DIST github.com%2Fjcmturner%2Fgofork%2F@v%2Fv0.0.0-20190328161633-dc7c13fece03.mod 35 BLAKE2B 152ed61bf84dd1666421e11827c23eeee0c7c50edd35851a50ce21f4fefa13660a7a6cead25a0f9d8f1b748c2c4277d21639eb781c484359aef00e77921139e0 SHA512 5e94601c72f24a3d8a115759a8fd6fd3420b662995ce94d7dbcfe4f86437bdf81a42c77c82accf7fdb926b75a5898bb34706fff864e00b38d891cdd076fc89ec
-DIST github.com%2Fjcmturner%2Fgofork%2F@v%2Fv1.0.0.mod 35 BLAKE2B 152ed61bf84dd1666421e11827c23eeee0c7c50edd35851a50ce21f4fefa13660a7a6cead25a0f9d8f1b748c2c4277d21639eb781c484359aef00e77921139e0 SHA512 5e94601c72f24a3d8a115759a8fd6fd3420b662995ce94d7dbcfe4f86437bdf81a42c77c82accf7fdb926b75a5898bb34706fff864e00b38d891cdd076fc89ec
-DIST github.com%2Fjcmturner%2Fgofork%2F@v%2Fv1.0.0.zip 31175 BLAKE2B 17e0ba33bedb9809d12ffefe034baf727e7c2a66aa19adeb87de3e3659c085f176fa48951f1afff4e5fe132c73d4520ac7061deb0e24d86520936e6ed6b63845 SHA512 d1717086c3d429838c88ad276d3bebda858fb4afafff46a204cf252685d9c7f1e2b15916f3cf7f8c03fd54e68d2d1c3ecb64e9d73975ebe9ae188039f0aa4570
-DIST github.com%2Fjcmturner%2Fgokrb5%2F@v%2Fv7.3.0+incompatible.mod 35 BLAKE2B 44663b670e1c572c79b294c3397a4b7dc73407959179930c0e5c10624ccb894b7832361602773eff578f0a9529e988d092e760394d8f5e7e53d33da1181bb4bd SHA512 ffa712356c1dc8863a74ad99539e7cbbec4b69cf3f4cadd4105a957292ef1d66c6a24da5ccbb45bff01230b2c9e93ced4bcc1d486eafecc1802b96d242e5c23b
-DIST github.com%2Fjcmturner%2Fgokrb5%2F@v%2Fv7.3.0+incompatible.zip 55269161 BLAKE2B 9eaffa5814fc5a212bb538b74265f228291a1742910175ad205d6b5c1072e4e22d8c148c1248c0a47d37085f336971f43c35dc7b2aa288c55b5bb1395f17f299 SHA512 99d171582a103624d7e5fc3e30b0028b5f2493104c0c3ca6abb8e09bed997db9a76454989cb52b5f94f8e33f031f2f27a43aacafde34826d537769c2871019a6
-DIST github.com%2Fkr%2Fpty%2F@v%2Fv1.1.8.mod 72 BLAKE2B 796a88b0b7d88f469e90e59f66d12a3c515e0230eb2a7ec83f00f5266266d93eea475b752677f2ec81a7c99243a5034ec1a2e9f4e23a83b61bfe6e855246b6d3 SHA512 9c13eb40018d27bb2f5623251df11cee7b8c08eaee681b4678f854d7c023bfd3885bf04ae085183c7501e637d86386a00e3a979088aaf2c37a03f732d7655a5a
-DIST github.com%2Fkr%2Fpty%2F@v%2Fv1.1.8.zip 2820 BLAKE2B 5346e57c8be648f632bd459638c3c76412875e92d6f9a64c1a3c6a0da1eb91c29e3366bb1341b23d921a34b04f4bfeae69ccefd7caf36357bae18ea9fb688894 SHA512 7215285ec564e6b4985d2b46646b46927a7c642c4637541277bfff94032c67423d5d22e3dfb07c2f4a658ffc7772c4e4a33661d327eb16cc65f634bdec169e9e
-DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.4.mod 34 BLAKE2B 55253c2475bc0169df729915bc92689eaad2908ff7b9dd81b8a553bd75d5f866c308a85fd69d664d31b0d2d373d8d52ee1701677cbebb07e361612ab8cf17f2a SHA512 00c272b4652db259c46875641b29489ecada2602e38beede8c8bd529d73b6e123bff58f8e0f8cadd2d680a6a5485aadffa448e9445548abbd2fb424b059a31e1
-DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.4.zip 7026 BLAKE2B 3cebbd0bdebcd1d32b7fc618b7190b7813876a1df010d1c3ca3800c41acd64b6537e4b3e4d4a574e3eb736822a27eda7bb2fffa197063baf9a347a820573883f SHA512 829b0596279218a2fad36695fa42036f265ce79903a0f5aad27495dfc7c6a33e8bad32010e59f4dc6853f1e38fd9e9f635ca2f56adaf5ea47e4914f2a892d251
-DIST github.com%2Folekukonko%2Fts%2F@v%2Fv0.0.0-20171002115256-78ecb04241c0.mod 32 BLAKE2B ce8c7a373f3b37f9a8a0bb7239780b9d6ca07647f00a3b40222d7835a5d3b9e2256357c03431d9cc8e156ef3ec8c6b2805c045eb7c0f731d0245f4dc6d88b612 SHA512 730b63cc1eec7cb9428b4baf631a2be2a33d1f862a6608812d8629db81f58f01531e4e6a3199de4b26cebb0dd21c4c962c5d589ac383a5e9d667820e809d5fcf
-DIST github.com%2Folekukonko%2Fts%2F@v%2Fv0.0.0-20171002115256-78ecb04241c0.zip 8361 BLAKE2B 22e84fe7da572d8425a57b43db4b4a12e5187de2a9a6b94b2d3a12e288c80c941a320d189c2acb600b91b9f8c7c1c46e7f457646b014c4e982bf39043067c74f SHA512 a4826c1622c94e81dff76dbca28e35230b07bd66849b816491d573be139905562747ae00f2e57a79d0246adca6ee059cccacccba068aec67a0f0a3aea6139305
-DIST github.com%2Fpkg%2Ferrors%2F@v%2Fv0.0.0-20170505043639-c605e284fe17.mod 29 BLAKE2B 7fb53b19bd1be0e783039647b42ecbe2070f51af102e473ec6d3544eea0ffa5863f1874ca1615348d5f8abbaa39c841b4fe18d43a8a615fa648cf22f35955e38 SHA512 0c156e21d35c45a89c1a1b69ff1976b4f7511b3870bf96126121f5a5effa3723eb45bf080e840d5c8b96898c65207dba83eb3e1a23668dd8a5e20ee6be775cc0
-DIST github.com%2Fpkg%2Ferrors%2F@v%2Fv0.0.0-20170505043639-c605e284fe17.zip 15552 BLAKE2B 52e02a4451147e9ff6a1fe36c5a7bf0828fd3ed7a39eb0aa4c5232edd0ea67adb4c86c2c3eef31de62ed7d986297244c8c5a80300529876e9cb346bd098cda19 SHA512 71e05b6feec8687b143da3d966a31cf26325550d482afe49dcfa7cc31a71d31d48d849138aba53982e5bb40b3be4f7420af7d6c6f441bc557d85bff69f450de4
-DIST github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod 37 BLAKE2B 94636062c94f8ff68cdcab7593a3acae7b9ffff616cad7b1d5c9cd147a4a1042d33666cbeed6fd816d6793113abfb595183097dcc46de7a3dfadc1423ed43e79 SHA512 c3d5c48cdb8ba6af7071a07cfede06e0ab67e3726d9de592a952fad40167dcbdd9621dc2c4df1bd3c28eb99d70b1b6d8d812441237c35bf492e5b7f07bd33902
-DIST github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip 12433 BLAKE2B 0c911c9d173080abd8edbbab1f47222343801d8eeae36b4add24773e3282fc2a39283fdf519a3d4483e39cdb7d9509b8570d151f46841ac1a616f312dc4cb0ba SHA512 3b85697185ba85cdef6202444ab6cabeabfad8a03d66b3839a852586b1f91ddae7897a57c8c138d5647022aa44906c7ef3c5339d520f90eeea0742a935da8cf2
-DIST github.com%2Frubyist%2Ftracerx%2F@v%2Fv0.0.0-20170927163412-787959303086.mod 34 BLAKE2B 6677a842c35332fccff0bdd56bf1fa95d9bfce605963135fde6155c7192805bf2c527635c699cf04a56661f08ff6b927c35fd3f308bf5c40f91f5a5cadf5b3f1 SHA512 c5c45a7c08d1dec68894c3667dd087e1dc650595f3a676ab6d5f835e0660fdfd0d9c2d34cec0922c736fb274d974aa61a452b8f1ec919ba0ee42d63e5e66c8fd
-DIST github.com%2Frubyist%2Ftracerx%2F@v%2Fv0.0.0-20170927163412-787959303086.zip 3452 BLAKE2B acd1eff5e4192c4d51b390ada100f99e04c32427d763f95ef5e42808acac6ebf682f3b6e4712fa34587e7568974a77c7048619fc075a406b261a957c94b4fe06 SHA512 ff524efebe039e9ee8156b7fd9f0bde6f26acef8b8ef788d2d18451380edf8ddb947d1ebfdb7bbc0d27762ddecdc320b15a8b937a09e5acb8f01e48499e0525a
-DIST github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.3.mod 30 BLAKE2B cb72701c052ce4059500f4c6b3d0c4fb336d118865bf1f7f45ce0b0279e1d01b6e58d49f82182c2523681a97bcaa7a70216d63ceeca0ea1d09c1921226f6bc4e SHA512 ea13ed8e166d16a7bcd14a7cde90af1cacc0b05995d1c5ec245fa536208e0cbfffd689dd460d66c0a1ad315f2b0ae9f4b803ed72bcdfd89c4a98a7ed934289c7
-DIST github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.3.zip 139997 BLAKE2B c20d7292a69fd548bf0dbd62751dc08a41c66f120bd8b5142e96f498aafd208328ed4888d7ac59404b64dace96bcad210f64734e432f15ae63ce6d39dd308cf4 SHA512 1476716a98d5aa26c34af6d85eb93886cae211beac7cdc8f886d2030bf7f83802409aa56510ba09cbdb609dcd2faf87d3490c4e5392922e0e034edcd3d9fb1bf
-DIST github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.3.mod 30 BLAKE2B 18c9fb79a291aaf800991a296c8d7b1933cf45bf56082301a64ce17ea64dd15fd304094fd4b0561bd99c48ada545dfe7fa8cf47a15593cd3166eb66657a5e114 SHA512 d08b4540b799cee9c5f088c4e1fe002c9fda86f1634380409eec1404598b84376d3ca26b4c1cbcf58bc19234ab56531ab11db8a00c6dd2e15a53f3b4ae757efc
-DIST github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.3.zip 74638 BLAKE2B 0e9d2a40aa6e68cae69ae24f76385e840e0b53b2a4afcf89ac5ea61ee144462c113dde938c5de728c8e54e7e46dc099786ce85020bdd60859e1ac04393556246 SHA512 c33aa1ac5cf2a8441bc849a49b65a614de6c9e0c5d37a77f0b6972bdd8f25a651752743b1172e0a83fdbb384aa7e8b0685af5c5dad1bc128310c60e13cc9b56d
-DIST github.com%2Fssgelm%2Fcookiejarparser%2F@v%2Fv1.0.1.mod 111 BLAKE2B d7ae50b4cb2613d12853bbdcd1f753df7a5f928da1ae830ef87893c79db32849493b84e77cf8785befa9e18d9b4e61a106014f1aee125273f171f828c7a20e1e SHA512 9072c355893740098181558167e4c6a7c5f19d035dbff17cae61a239bd14da0ae572325eb6f6be650c5a45d5c884ecd2be2a090886e267f78bca513ec7e438a5
-DIST github.com%2Fssgelm%2Fcookiejarparser%2F@v%2Fv1.0.1.zip 4705 BLAKE2B e3bcdf0cefa570d0a42ee139ac506334723562a247b84702b373e91ee80c2cc1ba7670bf33767fadacaec5520c7754c71e7684fb19e8dfdaf4e3a59f591525a4 SHA512 951817c4a30d818dad335fe79950c4a47f0d9b9986f3b6f61c530fda59136140b7062b9b1bcde06f362a26c09b654e72a19ef538a6284be37de898532358d897
-DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.mod 35 BLAKE2B 0357260904c9ba41892132c7e07d2add9b10ce4a09e8db4966219d1f515f917581e2afa0987094c90759634bc2aeb66e758074e023ff331a8337f5090c0102f6 SHA512 5b7ce867497852e4918b8cde5f75ecf2f24b9c95ad112478ac132322e904243f1cea3d16f5731646efb669256dbefc129ac70a499c8b1d25403a14c7e4fad10b
-DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.zip 81710 BLAKE2B 245149718759e71d8c882731fb51813924beee131aa16c9d6ea83a72738721011bceee80411d88dedf91653219d3c8ae33f66349e2d373b08931c28aa2e16d8d SHA512 b2cb918d623065d391a318f4f5c532aec12635662d176a441c30cbe3b042b60be848c7eb685679c5258e661f5780ebc3db3f9dbbb8a37e157da214b4f57fde88
-DIST github.com%2Fxeipuuv%2Fgojsonpointer%2F@v%2Fv0.0.0-20180127040702-4e3ac2762d5f.mod 40 BLAKE2B bd8fe364e43fdad423aa574d01229ce91e9b3211cbe3a0234070805150d960d3c0fc0c6ec229e7ce5b4079906f2595a2b5f50a8da7bbe9bd906a72a6a7a7434b SHA512 cdd8a665fc41a4b04c59e869b021d5a9b793b9a441c320a234bf2a13be67af9aa60378c58991161f73d83c184039a52fc3f11cd121490996737f0508e277e1cc
-DIST github.com%2Fxeipuuv%2Fgojsonpointer%2F@v%2Fv0.0.0-20180127040702-4e3ac2762d5f.zip 9425 BLAKE2B b18ec4a4e021332404866950e4839e8b00db652a3bc196fee5f7ea928085d25b44584baa3b8e65f5a26edc4a84450152fb40c8eb11dabe82641c2f569d6de126 SHA512 41675a07bc201e97344136fb7afab6afc3974a7d4252068311c5f24968f6a46b979e763865e61586c5d3c8f2478a046915e62b5a7829785c703d180f4c2af58f
-DIST github.com%2Fxeipuuv%2Fgojsonreference%2F@v%2Fv0.0.0-20180127040603-bd5ef7bd5415.mod 42 BLAKE2B c2d6fb272d8ae4e541c98023713bcf0b7f47f334d09ad7f9f375ed13eb14d27ee2995745782ecea40d31a561e28702fddeae4b5e32750726c7188118d741cf82 SHA512 14c839017eebd5dcf49dd3495a1ef6421d522389a2943c010d7869d214f757fe7d19d6ac3482fb3d8cbaaeb3977c5c311523aba90e9f7909fb1ba593ba57ae8a
-DIST github.com%2Fxeipuuv%2Fgojsonreference%2F@v%2Fv0.0.0-20180127040603-bd5ef7bd5415.zip 8632 BLAKE2B db207b3c4a00178e3a2fd24a1c453ff54e8714792d5ae2ab324bebf8efdac9bf1492e3c1f6360a99459c4e88970395bc74dddc4611acec4478ce8a287dc872f9 SHA512 84eca639af26023555a96ac40edc73c5607712c4cbb42f9e9ea80c5e63c3a145e43e10d920891bb7553ddf39ada40f3b7e8cdb72891ac363a609964a3067eceb
-DIST github.com%2Fxeipuuv%2Fgojsonschema%2F@v%2Fv0.0.0-20170210233622-6b67b3fab74d.mod 39 BLAKE2B 4a9a7321d9c10929abaf038e336248709fcfcde17c0ec9ec8e96407a9e12910b84e7008a7a847f533bd8695b56a8e35313d5771931d2fb1dfddd74ff59b58d5b SHA512 8ee8fb19b40e1366446a91a48a495fa96e4626f594903b7d4a53355069043c5a2958612dd0bf0f8b0a01a4fadf9dd92d0b9dfafbd10ab9c8ee6e3bcaa01853d2
-DIST github.com%2Fxeipuuv%2Fgojsonschema%2F@v%2Fv0.0.0-20170210233622-6b67b3fab74d.zip 169335 BLAKE2B bf00103293e4987a9698b217eff2c28b6d91659c2b9e648d752d802f80bb44d5ac413976263f097561faee690041ea9b8a0c2e97a5b73cde18b211f0efcc2489 SHA512 9a651c2c7228e4a18b917b1dc9e0a4e84a81149f52a05d9adca01b2215e1c2f999088c8a715016d5508d4748323d6144226539ae2610fb1d95303d2e244a7d12
-DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod 88 BLAKE2B aec7d0eea1278eb3d1568d5bfb4041267501ad14457ebfcbdbc5fe21473170b8616ca4028f52af2edbfd85922cbe04540b4b0df7f69f63197698143cc5557a7a SHA512 2df49895053b36fed7ea905aa73f86568fbafd79ff0a7976679d8c77cf15025129435d9dbfd89367b611b1aadbea4f4bd1835eb4efa9ea702466e443638d379e
-DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.zip 1776515 BLAKE2B 5833fc2a16dec541a1362c9df7c02abe04a54e92e04eaafd5767c1a923e3a9cf90bc8d8ae0ee3c60b9745f5f0e3234350be1cafd984052353594d6e6b9fba041 SHA512 a1418dbc50d1e41495fd68ccba2ac84fed5edfd3e613c68850068afcce1136c3456e99d226674908a77c9648f16d7861edacb70afebcf3a7e73ea3dcdf8edbe7
-DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190426145343-a29dc8fdc734.mod 146 BLAKE2B 6fe18cbe4eb6c3f6c26a4d2f9f309c48eb9ea59017125179cbfd61bb1e62395515c8cb286e1139fbcf54d37dcb2baa1a2f98dcfbcb6178b7f7df3b51929ff5c5 SHA512 f40c7b620b28b5bdc6ce92d43768af71b5869e7f0eb7872dd0f2751eed2bd15a17f7af26bf2dc5c6f7e6b816a174d010bfd22b3f8f5dd72f22dc4e4357dea842
-DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190426145343-a29dc8fdc734.zip 1806150 BLAKE2B 55682fbe3693b848335acdd64fe896a8a61bb63423192160926bf89ac20435d96b3743f1409fdf423a93352fead9ada4be631f5d319c730d0067f6af6acbe12d SHA512 4e3dc4ab13b622a0941b1417c47b572b7850fc225ef8614d287e2f2532d03e8da4b6f13ef1d002323ccf1b14e1b3af206efea7a5550c0a64dbbc29705120972f
-DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod 119 BLAKE2B e042b2716739483252c3340451b2c3c7b421fdf8d6b3e0333e979802fca66159596982ea63a24b6a64457b2757a0ad24cbb9ea032bab4c5377edf84a3ea18b97 SHA512 26b6c92eecd2208967336d4d23f8a71f77f9a73643ad1e5cd84dee36b2f626fffc806e4dd33acc284831a0961e2b363d898a747903235945fbfb665c5b4d5ef2
-DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.zip 1277629 BLAKE2B becbc737f58b56645d8b449a7cdaf786a6bf70ab4db8d1876a4825b2f3d52b85e506fc9caf6a23a5857f992104b662e0f824e6fa23e7c92e27ba0ada574b255d SHA512 0d740cd05300d902cf60f54692cbdf91758457ac21a66738beac133b3a31930b3833b10978750efb59450d75f0b750985e28218d04e1d8e3e68c4c883fadab58
-DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191027093000-83d349e8ac1a.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
-DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191027093000-83d349e8ac1a.zip 1427877 BLAKE2B 52bd4b9622823732749728095a61afa43750c1c64d5413c208081aec044e7005225b55af0e4a6ae34d73830cd1671ea5128f2626180fb274d7ba144b20692053 SHA512 c1ccb61c4d8de2f493419cdba154f758641e07ac385f0e286344b2b2265a4e6ac58ebc5609ffaf79c27d117da4f41adcc4e4da733e4211f2c3ea45c6411f3915
-DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181221193216-37e7f081c4d4.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
-DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181221193216-37e7f081c4d4.zip 24746 BLAKE2B 743f3b4641f002cdfec6805ead87d196b43a4de1ec59c788f8516f4bc78ef2d58fc8f0cc34a52e8762f39f0845470dfe4e50f269036576d021d65a5f30aaf08a SHA512 f7622fbf44dcdf894cd397edc8399e38b734cdfc6a6ef4f8e81af9408c9d912a1b96544e713c42237fb3116e70678755e829da8f5f628bc1cbf6767921cd380e
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.zip 1584596 BLAKE2B 2d891f4ee749bbf528b0a44acc8cc71a56432961fc47864ec9dd47543a8a1a97d55399dbb95a0654b0588ca2dc95289ae31746ada83afd9a667662c371b6747d SHA512 8431fd78425186e55e07be9cfdb81d294b517d1695f99da3612477b8275d9a64038b60097658a02f399ed99d2f399197e572f3c307f70fa075b4995943caddb8
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190412213103-97732733099d.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190412213103-97732733099d.zip 1697094 BLAKE2B 72e52dab100cd79a22a5f8adaa1af24cf245d193dcdfbfa10c25b440d23eda9a1e0f3c1f2b9684b5fbc9159055f482ff8eae12732c40d9d4dbcdfbf5ae93ca88 SHA512 a981d025dbb8bc8d3b48cbe7327076531e614f9bb9662f24b5f89997d8f9612d750ac53b9191e7df42dc326a36913b29350acaf7fe2f4bf2f08b986a510e95da
-DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod 25 BLAKE2B 31009af0fdcd0f8730c9985287e6e364ec4e5183e57e92560dbc80a2010eced51b8a90f01a82b49384268c8a0adbf69d179c205d3f68e0eb459169d2ea9528f0 SHA512 ca081ef7cccd7bbedc6843fbe0c452352661a07e1298cd02ff338ed79d807c6401d613a3cf20011189d2f98a794ffa410547b3e352eb58a6f0a84822285d391d
-DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.zip 6349244 BLAKE2B 0aa464ac7b7d17fa7ec0627b64cd2301ed4f2819f837807db7a55725950dacb40be899b5148b07ea31b51530818edcccc6444a9800755e1d369ba8f1bce949b0 SHA512 982d78f580a7eac99a0c51e6f1fd2b2c3b91f56cd5e2b96fe960510049f7daf5915264f73f55f05675eee232a52998f9667fa84a9ccba15ed7819e4c93f583a7
-DIST gopkg.in%2Fjcmturner%2Faescts.v1%2F@v%2Fv1.0.1.mod 36 BLAKE2B 1f653e0e7fe93701b9e5c212697ee615f635c03fad64811a4741f57b9df6e53a632cd6665c12d2d56b5788639c386ec8461cafb4c5721610787e63b82579c539 SHA512 508e5b91b64eda9f137bdeb45512ca617294a48b9078670938190231eac59f96169462ab6dba748b9344df62479a48588db73c1d211977514f1e9baec3013167
-DIST gopkg.in%2Fjcmturner%2Faescts.v1%2F@v%2Fv1.0.1.zip 8138 BLAKE2B d74df3115a331373ed39003d512a89a9c6fe59d571d74bbf1a6ff3ebb06b87a71bc9ec11df8105c1dccf58226fa9a354d5ebfec11a74c05d5a9b689cd6ca20c2 SHA512 a4583a6b2c3a476459184ae8890109d36594a37ed9884fcdb42a8c6985c17edaa20179233750116bb262a851aee59520030c9f4ef36639d56219e6df7f250489
-DIST gopkg.in%2Fjcmturner%2Fdnsutils.v1%2F@v%2Fv1.0.1.mod 38 BLAKE2B d1cedc414de193540de5ac312000e4304212ba989a9b7bbe10b1a2db5effa33c82ec01cfd5ac4cb9d826460a1a0dd11c4f932c8649831d9b0ca3c21db602effe SHA512 894183b8527a1a4b541f8e5dc359e62d05dfa8aa66fabe8438db3f376e4075af51e781717e6ad01b3266384719bade2bf85dbb161c3c6468a40b9640f50d1cd8
-DIST gopkg.in%2Fjcmturner%2Fdnsutils.v1%2F@v%2Fv1.0.1.zip 7425 BLAKE2B e25afce5349dcf85fff01c6282db6db594626bb20a021e77330868d666cd283306b5efacf2f8d8cc9627380e81763a50477b4ffdf1c0a0f4a71f2b2ba7d8f4ba SHA512 1aac5cca82fd087586924f69e49ecd68c7401a46368fa980c2e1ddcd3e59e170d8e2dc067d96c235442db9fac53817b631c0ded1b75557217385a3888ab5833e
-DIST gopkg.in%2Fjcmturner%2Fgoidentity.v3%2F@v%2Fv3.0.0.mod 40 BLAKE2B 3e77c43f0108e2eb7585bd5558385a198b301e2adc7f813cce7981d0979567808d015e60cfd7ac7c6a17e9c0a5d616642c4b9bec919cd5de8d2fd6f86dd00845 SHA512 c498fb321f358d43c35d98913d17242517c415fc3c26d497fd821f30e6c656ca9ba3ce3a73657c43c677d35eab70c90065a7f93dab73214502e604efbc44a180
-DIST gopkg.in%2Fjcmturner%2Fgoidentity.v3%2F@v%2Fv3.0.0.zip 7069 BLAKE2B db430bd56c95cb5a40e95368be1f8b23ffa067e4f491ba6a641c12f78855bbd691268f60b4d57307aeede99671a23c437171a446a47ca6ebc1eeaf9defb0755d SHA512 4972724984d58b174b50c1ea81842bc5baa1fca3d74ea5163b6339c2f4a9fee1731eae3dd19f8cb67bca9465a762e44f856537bdc907bbf37394dfc656b2edbc
-DIST gopkg.in%2Fjcmturner%2Fgokrb5.v5%2F@v%2Fv5.3.0.mod 36 BLAKE2B 54c17ea419af77ec0df0606dd637ed36bae1e216c7f102fe803c3833433ec94aa1912c1505f2589ab9a5025c68ab7243359b3332d52e9a27c638cdf54a9213de SHA512 4d64e2ce7fa9b6df45e713638f40e1eb6216f7fff2415dd87972c3eba424fdd72afcf3481664646835e1f969596113a175fe9db5e91b51883650dd19e4d26bea
-DIST gopkg.in%2Fjcmturner%2Fgokrb5.v5%2F@v%2Fv5.3.0.zip 55249420 BLAKE2B 82e8f06a955fae9f309db731e84f16dd9f3ed1fea25d71c78d9fc14e50a7b26f2abfb9abf64840bc0ea06df206c1a932577c4d5a13df728ef41c363cf4e9fe91 SHA512 3618e0d68ddc0f36a11df43c797cbb4d7ddfbfa6fb7c5753dd5ae04b90216aac733fb02d17d6e31ec81e3c206452cd77d932ba0efee1797d140d98ae88fcecc4
-DIST gopkg.in%2Fjcmturner%2Fgokrb5.v7%2F@v%2Fv7.3.0.mod 36 BLAKE2B 268adc19223fdd60f8dc01a4eb96290f6c4ae0fe2576d3bac9f82caa3e683e79151d9147a8bf76bfe9b2341ec2bd28d6447248fccfd10e4ed348fd02a88473ed SHA512 a963f19cd93e788d0f5de9873a5b0aa152ea592d829c1513e74c277718ac496d6d2a9dcae0462951fb92ad1fdc59381c30eb5b1bcc2dbb3bcab1cb11928ce05e
-DIST gopkg.in%2Fjcmturner%2Fgokrb5.v7%2F@v%2Fv7.3.0.zip 55262753 BLAKE2B 42ecb6953d818d5b70bb6ca430ffbb5ee9d2e66feca01d89c41856b99c5d3738b031a1c743cd45860499ae6dd8c0fbe6e949c4954f969dc6bf20be39744f5afd SHA512 8d24dac1e8429af5d26697bb75407490f5a36860cfe5fcb4303c17e931c37454b17d51dd54d6b70112475704da0cdbcb851ed21e1303bde950768192749a822b
-DIST gopkg.in%2Fjcmturner%2Frpc.v0%2F@v%2Fv0.0.2.mod 33 BLAKE2B feb586b107a0b480aae5583b8a92b996ea6b17d7ba9830e375f87b26481b0f3d912dfe6dc79c73f1544781d56e9c6e20a2c7dac8160705b06f170dce55c33074 SHA512 39b339953dbcae89f53b4af25fcd1973d415408db0c224b03881e557ad35f8e8b754dfa75a8975cdd0c6593e9fb8afc4b31faae173ebe86900b28a010562c25f
-DIST gopkg.in%2Fjcmturner%2Frpc.v0%2F@v%2Fv0.0.2.zip 10299 BLAKE2B 6c10b7e229e214a8e3e5a00a626a1e037f347db0c8bfa508bad0da273c51bc9a78560b6703441f629e30bfad1888aa35b71cda3aeb7a422d65581e2b5f69c39d SHA512 79b4d6764407e85c1428716bf49992d90effd46fcce43092305ce9a3ae4c2f577eba1d61ce990a470b083c367c91b1307699c20f3aad99c5d7bf6aedb6594bbd
-DIST gopkg.in%2Fjcmturner%2Frpc.v1%2F@v%2Fv1.1.0.mod 33 BLAKE2B 0c256369010fa14f2dd95100b3f1b75357816012d226e52588c91c6615eb5b56459061d3bdc8201a84985136912c4d8e62dc281600cb53fd2e9e2a545eb3f35d SHA512 0513089b977716c7cb885b4edced551183b397858963f74f002a078920fd1e2178376261abad2c1c475e7de7ba262670de9d25e8a6e801b4c78385370cd0a489
-DIST gopkg.in%2Fjcmturner%2Frpc.v1%2F@v%2Fv1.1.0.zip 42124 BLAKE2B 172da6e6ccc58989dc4827d113bc8b93dfefef6321344bc9f569786ca152dd50369e98e7fdf718096d42eec90c1cd14d05cf908afbcc12dce8de6e2248d8463d SHA512 056ad239cc4831d56ef60f0e36c7cfe78a3a4d67160ee81619f63f27ff975247eb53e2b3461b8ee461f8aeee2fe8c37131832304e3eafadbc5ed5a4fb90a994a
diff --git a/dev-vcs/git-lfs/git-lfs-2.10.0.ebuild b/dev-vcs/git-lfs/git-lfs-2.10.0.ebuild
deleted file mode 100644
index 7b2b8d5f0e57..000000000000
--- a/dev-vcs/git-lfs/git-lfs-2.10.0.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-EGO_PN="github.com/${PN}/${PN}"
-
-inherit golang-base go-module
-
-EGO_SUM=(
- "github.com/alexbrainman/sspi v0.0.0-20180125232955-4729b3d4d858"
- "github.com/alexbrainman/sspi v0.0.0-20180125232955-4729b3d4d858/go.mod"
- "github.com/avast/retry-go v2.4.2+incompatible"
- "github.com/avast/retry-go v2.4.2+incompatible/go.mod"
- "github.com/creack/pty v1.1.7"
- "github.com/creack/pty v1.1.7/go.mod"
- "github.com/davecgh/go-spew v1.1.1"
- "github.com/davecgh/go-spew v1.1.1/go.mod"
- "github.com/dpotapov/go-spnego v0.0.0-20190506202455-c2c609116ad0"
- "github.com/dpotapov/go-spnego v0.0.0-20190506202455-c2c609116ad0/go.mod"
- "github.com/git-lfs/gitobj v1.4.1"
- "github.com/git-lfs/gitobj v1.4.1/go.mod"
- "github.com/git-lfs/go-netrc v0.0.0-20180525200031-e0e9ca483a18"
- "github.com/git-lfs/go-netrc v0.0.0-20180525200031-e0e9ca483a18/go.mod"
- "github.com/git-lfs/go-ntlm v0.0.0-20190307203151-c5056e7fa066"
- "github.com/git-lfs/go-ntlm v0.0.0-20190307203151-c5056e7fa066/go.mod"
- "github.com/git-lfs/go-ntlm v0.0.0-20190401175752-c5056e7fa066"
- "github.com/git-lfs/go-ntlm v0.0.0-20190401175752-c5056e7fa066/go.mod"
- "github.com/git-lfs/wildmatch v1.0.2"
- "github.com/git-lfs/wildmatch v1.0.2/go.mod"
- "github.com/git-lfs/wildmatch v1.0.4"
- "github.com/git-lfs/wildmatch v1.0.4/go.mod"
- "github.com/hashicorp/go-uuid v1.0.1"
- "github.com/hashicorp/go-uuid v1.0.1/go.mod"
- "github.com/inconshreveable/mousetrap v1.0.0"
- "github.com/inconshreveable/mousetrap v1.0.0/go.mod"
- "github.com/jcmturner/gofork v0.0.0-20190328161633-dc7c13fece03/go.mod"
- "github.com/jcmturner/gofork v1.0.0"
- "github.com/jcmturner/gofork v1.0.0/go.mod"
- "github.com/jcmturner/gokrb5 v7.3.0+incompatible"
- "github.com/jcmturner/gokrb5 v7.3.0+incompatible/go.mod"
- "github.com/kr/pty v1.1.8"
- "github.com/kr/pty v1.1.8/go.mod"
- "github.com/mattn/go-isatty v0.0.4"
- "github.com/mattn/go-isatty v0.0.4/go.mod"
- "github.com/olekukonko/ts v0.0.0-20171002115256-78ecb04241c0"
- "github.com/olekukonko/ts v0.0.0-20171002115256-78ecb04241c0/go.mod"
- "github.com/pkg/errors v0.0.0-20170505043639-c605e284fe17"
- "github.com/pkg/errors v0.0.0-20170505043639-c605e284fe17/go.mod"
- "github.com/pmezard/go-difflib v1.0.0"
- "github.com/pmezard/go-difflib v1.0.0/go.mod"
- "github.com/rubyist/tracerx v0.0.0-20170927163412-787959303086"
- "github.com/rubyist/tracerx v0.0.0-20170927163412-787959303086/go.mod"
- "github.com/spf13/cobra v0.0.3"
- "github.com/spf13/cobra v0.0.3/go.mod"
- "github.com/spf13/pflag v1.0.3"
- "github.com/spf13/pflag v1.0.3/go.mod"
- "github.com/ssgelm/cookiejarparser v1.0.1"
- "github.com/ssgelm/cookiejarparser v1.0.1/go.mod"
- "github.com/stretchr/testify v1.2.2"
- "github.com/stretchr/testify v1.2.2/go.mod"
- "github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f"
- "github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod"
- "github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415"
- "github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod"
- "github.com/xeipuuv/gojsonschema v0.0.0-20170210233622-6b67b3fab74d"
- "github.com/xeipuuv/gojsonschema v0.0.0-20170210233622-6b67b3fab74d/go.mod"
- "golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2"
- "golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod"
- "golang.org/x/crypto v0.0.0-20190426145343-a29dc8fdc734"
- "golang.org/x/crypto v0.0.0-20190426145343-a29dc8fdc734/go.mod"
- "golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3"
- "golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod"
- "golang.org/x/net v0.0.0-20191027093000-83d349e8ac1a"
- "golang.org/x/net v0.0.0-20191027093000-83d349e8ac1a/go.mod"
- "golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4"
- "golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod"
- "golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a"
- "golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod"
- "golang.org/x/sys v0.0.0-20190412213103-97732733099d"
- "golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod"
- "golang.org/x/text v0.3.0"
- "golang.org/x/text v0.3.0/go.mod"
- "gopkg.in/jcmturner/aescts.v1 v1.0.1"
- "gopkg.in/jcmturner/aescts.v1 v1.0.1/go.mod"
- "gopkg.in/jcmturner/dnsutils.v1 v1.0.1"
- "gopkg.in/jcmturner/dnsutils.v1 v1.0.1/go.mod"
- "gopkg.in/jcmturner/goidentity.v3 v3.0.0"
- "gopkg.in/jcmturner/goidentity.v3 v3.0.0/go.mod"
- "gopkg.in/jcmturner/gokrb5.v5 v5.3.0"
- "gopkg.in/jcmturner/gokrb5.v5 v5.3.0/go.mod"
- "gopkg.in/jcmturner/gokrb5.v7 v7.3.0"
- "gopkg.in/jcmturner/gokrb5.v7 v7.3.0/go.mod"
- "gopkg.in/jcmturner/rpc.v0 v0.0.2"
- "gopkg.in/jcmturner/rpc.v0 v0.0.2/go.mod"
- "gopkg.in/jcmturner/rpc.v1 v1.1.0"
- "gopkg.in/jcmturner/rpc.v1 v1.1.0/go.mod"
-)
-go-module_set_globals
-
-if [[ ${PV} == *9999 ]]; then
- inherit golang-vcs
- # Upstream deps for testing change to fast to track them here.
- RESTRICT="test"
-else
- SRC_URI="
- https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
- test? ( ${EGO_SUM_SRC_URI} )
- "
- KEYWORDS="amd64 ~amd64-linux ~x86-linux"
-fi
-
-HOMEPAGE="https://git-lfs.github.com/"
-DESCRIPTION="Command line extension and specification for managing large files with git"
-
-LICENSE="Apache-2.0 BSD BSD-2 BSD-4 ISC MIT"
-SLOT="0"
-IUSE="doc test"
-
-RESTRICT="!test? ( test )"
-
-BDEPEND="dev-lang/go
- doc? ( app-text/ronn )"
-RDEPEND="dev-vcs/git"
-
-src_compile() {
- set -- go build \
- -ldflags="-X ${EGO_PN}/config.GitCommit=${GIT_COMMIT}" \
- -mod vendor -v -work -x \
- -o git-lfs git-lfs.go
- echo "$@"
- "$@" || die
-
- if use doc; then
- ronn docs/man/*.ronn || die "man building failed"
- fi
-}
-
-src_install() {
- dobin git-lfs
- dodoc {CHANGELOG,CODE-OF-CONDUCT,CONTRIBUTING,README}.md
- use doc && doman docs/man/*.1
-}
diff --git a/dev-vcs/git-remote-hg/Manifest b/dev-vcs/git-remote-hg/Manifest
deleted file mode 100644
index 6e1d26b61663..000000000000
--- a/dev-vcs/git-remote-hg/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST git-remote-hg-1.0.1.tar.gz 57856 BLAKE2B 635073fbd0d9fe0ebbc2e9b5e49298bdb9f6b02f964219271a4bd930746e892e58fabde2afa94e998e4bd4aede91d9ac80291eef1bd3eb16cf82f6691514259b SHA512 b665cb6dc0564dc7f2cacade9000378f895b77a3186e091b841e58ddef37834e3cc87e81a76ab713997c6f837a768eff91d6b8a156c6277da0e34a2f156a5290
diff --git a/dev-vcs/git-remote-hg/git-remote-hg-1.0.1.ebuild b/dev-vcs/git-remote-hg/git-remote-hg-1.0.1.ebuild
deleted file mode 100644
index 6351daeb396a..000000000000
--- a/dev-vcs/git-remote-hg/git-remote-hg-1.0.1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Semi-official Mercurial bridge from Git project"
-HOMEPAGE="https://github.com/mnauw/git-remote-hg"
-SRC_URI="https://github.com/mnauw/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-BDEPEND="
- app-text/asciidoc
-"
-RDEPEND="
- dev-vcs/git
- dev-vcs/mercurial
-"
-
-# Some tests fail.
-RESTRICT="test"
-
-src_compile() {
- distutils-r1_src_compile
- emake doc
-}
-
-src_install() {
- distutils-r1_src_install
- emake DESTDIR="${D}" prefix="${EPREFIX}/usr" install-doc
-}
-
-src_test() {
- default
-}
diff --git a/dev-vcs/git-remote-hg/metadata.xml b/dev-vcs/git-remote-hg/metadata.xml
deleted file mode 100644
index 516b1c49f64f..000000000000
--- a/dev-vcs/git-remote-hg/metadata.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
-
- realnc@gmail.com
- Nikos Chantziaras
-
-
- proxy-maint@gentoo.org
- Proxy Maintainers
-
-
- 'git-remote-hg' is the semi-official Mercurial bridge from Git project,
- once installed, it allows you to clone, fetch and push to and from
- Mercurial repositories as if they were Git ones.
-
-
- mnauw/git-remote-hg
-
-
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz
index 835a4e310255..b7df73cb9e76 100644
Binary files a/eclass/Manifest.gz and b/eclass/Manifest.gz differ
diff --git a/eclass/acct-user.eclass b/eclass/acct-user.eclass
index b66fbbf9d0c2..e82f3c56dbbe 100644
--- a/eclass/acct-user.eclass
+++ b/eclass/acct-user.eclass
@@ -143,8 +143,8 @@ acct-user_add_deps() {
# << Helper functions >>
# @FUNCTION: eislocked
-# @INTERNAL
# @USAGE:
+# @INTERNAL
# @DESCRIPTION:
# Check whether the specified user account is currently locked.
# Returns 0 if it is locked, 1 if it is not, 2 if the platform
@@ -176,8 +176,8 @@ eislocked() {
}
# @FUNCTION: elockuser
-# @INTERNAL
# @USAGE:
+# @INTERNAL
# @DESCRIPTION:
# Lock the specified user account, using the available platform-specific
# functions. This should prevent any login to the account.
@@ -221,8 +221,8 @@ elockuser() {
}
# @FUNCTION: eunlockuser
-# @INTERNAL
# @USAGE:
+# @INTERNAL
# @DESCRIPTION:
# Unlock the specified user account, using the available platform-
# specific functions.
diff --git a/eclass/ada.eclass b/eclass/ada.eclass
index 361ffb65cd10..4b568a8c20a3 100644
--- a/eclass/ada.eclass
+++ b/eclass/ada.eclass
@@ -38,6 +38,7 @@ esac
EXPORT_FUNCTIONS pkg_setup
# @ECLASS-VARIABLE: ADA_DEPS
+# @OUTPUT_VARIABLE
# @DESCRIPTION:
# This is an eclass-generated Ada dependency string for all
# implementations listed in ADA_COMPAT.
diff --git a/eclass/git-r3.eclass b/eclass/git-r3.eclass
index e0cf41e4342f..6c75d11218ce 100644
--- a/eclass/git-r3.eclass
+++ b/eclass/git-r3.eclass
@@ -90,6 +90,8 @@ fi
: ${EGIT_MIN_CLONE_TYPE:=shallow}
# @ECLASS-VARIABLE: EGIT3_STORE_DIR
+# @USER_VARIABLE
+# @DEFAULT_UNSET
# @DESCRIPTION:
# Storage directory for git sources.
#
@@ -176,6 +178,7 @@ fi
# to the merge commit date.
# @ECLASS-VARIABLE: EGIT_CHECKOUT_DIR
+# @DEFAULT_UNSET
# @DESCRIPTION:
# The directory to check the git sources out to.
#
diff --git a/eclass/kernel-2.eclass b/eclass/kernel-2.eclass
index 4ac5cf86e774..b515a3f63fc5 100644
--- a/eclass/kernel-2.eclass
+++ b/eclass/kernel-2.eclass
@@ -605,6 +605,7 @@ if [[ ${ETYPE} == sources ]]; then
sys-devel/make
>=sys-libs/ncurses-5.2
virtual/libelf
+ virtual/pkgconfig
)"
SLOT="${PVR}"
diff --git a/eclass/meson.eclass b/eclass/meson.eclass
index 1590c1f14cf5..21338280df33 100644
--- a/eclass/meson.eclass
+++ b/eclass/meson.eclass
@@ -54,7 +54,7 @@ EXPORT_FUNCTIONS src_configure src_compile src_test src_install
if [[ -z ${_MESON_ECLASS} ]]; then
_MESON_ECLASS=1
-MESON_DEPEND=">=dev-util/meson-0.51.2
+MESON_DEPEND=">=dev-util/meson-0.54.0
>=dev-util/ninja-1.8.2"
if [[ ${EAPI:-0} == [6] ]]; then
@@ -373,20 +373,7 @@ meson_src_configure() {
local -x BOOST_LIBRARYDIR="${BOOST_LIBRARYDIR-${EPREFIX}/usr/$(get_libdir)}"
(
- # https://bugs.gentoo.org/720860
- if ver_test "$(meson --version)" -lt "0.54"; then
- local -x CFLAGS=${BUILD_CFLAGS}
- local -x CPPFLAGS=${BUILD_CPPFLAGS}
- local -x CXXFLAGS=${BUILD_CXXFLAGS}
- local -x FFLAGS=${BUILD_FCFLAGS}
- local -x OBJCFLAGS=${BUILD_OBJCFLAGS}
- local -x OBJCXXFLAGS=${BUILD_OBJCXXFLAGS}
- local -x LDFLAGS=${BUILD_LDFLAGS}
- else
- # https://bugs.gentoo.org/720818
- export -n {C,CPP,CXX,F,OBJC,OBJCXX,LD}FLAGS PKG_CONFIG_{LIBDIR,PATH}
- fi
-
+ export -n {C,CPP,CXX,F,OBJC,OBJCXX,LD}FLAGS PKG_CONFIG_{LIBDIR,PATH}
echo "${mesonargs[@]}" >&2
"${mesonargs[@]}"
) || die
diff --git a/eclass/mozcoreconf-v4.eclass b/eclass/mozcoreconf-v4.eclass
index eef1b5e7da70..ba9a65349fd1 100644
--- a/eclass/mozcoreconf-v4.eclass
+++ b/eclass/mozcoreconf-v4.eclass
@@ -53,8 +53,8 @@ mozconfig_use_enable() {
mozconfig_annotate "$(use $1 && echo +$1 || echo -$1)" "${flag}"
}
-# @FUNCTION mozconfig_use_with
-# @DESCRIPTION
+# @FUNCTION: mozconfig_use_with
+# @DESCRIPTION:
# add a line to .mozconfig based on a USE-flag
#
# Example:
@@ -65,8 +65,8 @@ mozconfig_use_with() {
mozconfig_annotate "$(use $1 && echo +$1 || echo -$1)" "${flag}"
}
-# @FUNCTION mozconfig_use_extension
-# @DESCRIPTION
+# @FUNCTION: mozconfig_use_extension
+# @DESCRIPTION:
# enable or disable an extension based on a USE-flag
#
# Example:
diff --git a/eclass/mozcoreconf-v5.eclass b/eclass/mozcoreconf-v5.eclass
index ab8440b94273..a78b190aff69 100644
--- a/eclass/mozcoreconf-v5.eclass
+++ b/eclass/mozcoreconf-v5.eclass
@@ -53,8 +53,8 @@ mozconfig_use_enable() {
mozconfig_annotate "$(use $1 && echo +$1 || echo -$1)" "${flag}"
}
-# @FUNCTION mozconfig_use_with
-# @DESCRIPTION
+# @FUNCTION: mozconfig_use_with
+# @DESCRIPTION:
# add a line to .mozconfig based on a USE-flag
#
# Example:
@@ -65,8 +65,8 @@ mozconfig_use_with() {
mozconfig_annotate "$(use $1 && echo +$1 || echo -$1)" "${flag}"
}
-# @FUNCTION mozconfig_use_extension
-# @DESCRIPTION
+# @FUNCTION: mozconfig_use_extension
+# @DESCRIPTION:
# enable or disable an extension based on a USE-flag
#
# Example:
diff --git a/eclass/mozcoreconf-v6.eclass b/eclass/mozcoreconf-v6.eclass
index 04320849a747..045aabc164c8 100644
--- a/eclass/mozcoreconf-v6.eclass
+++ b/eclass/mozcoreconf-v6.eclass
@@ -51,8 +51,8 @@ mozconfig_use_enable() {
mozconfig_annotate "$(use $1 && echo +$1 || echo -$1)" "${flag}"
}
-# @FUNCTION mozconfig_use_with
-# @DESCRIPTION
+# @FUNCTION: mozconfig_use_with
+# @DESCRIPTION:
# add a line to .mozconfig based on a USE-flag
#
# Example:
@@ -63,8 +63,8 @@ mozconfig_use_with() {
mozconfig_annotate "$(use $1 && echo +$1 || echo -$1)" "${flag}"
}
-# @FUNCTION mozconfig_use_extension
-# @DESCRIPTION
+# @FUNCTION: mozconfig_use_extension
+# @DESCRIPTION:
# enable or disable an extension based on a USE-flag
#
# Example:
diff --git a/eclass/multibuild.eclass b/eclass/multibuild.eclass
index 169c0fa00843..dd5d627ad960 100644
--- a/eclass/multibuild.eclass
+++ b/eclass/multibuild.eclass
@@ -27,6 +27,7 @@ esac
if [[ ! ${_MULTIBUILD} ]]; then
# @ECLASS-VARIABLE: MULTIBUILD_VARIANTS
+# @REQUIRED
# @DESCRIPTION:
# An array specifying all enabled variants which multibuild_foreach*
# can execute the process for.
@@ -43,6 +44,7 @@ if [[ ! ${_MULTIBUILD} ]]; then
# @CODE
# @ECLASS-VARIABLE: MULTIBUILD_VARIANT
+# @OUTPUT_VARIABLE
# @DESCRIPTION:
# The current variant which the function was executed for.
#
@@ -52,6 +54,7 @@ if [[ ! ${_MULTIBUILD} ]]; then
# @CODE
# @ECLASS-VARIABLE: MULTIBUILD_ID
+# @OUTPUT_VARIABLE
# @DESCRIPTION:
# The unique identifier for a multibuild run. In a simple run, it is
# equal to MULTIBUILD_VARIANT. In a nested multibuild environment, it
@@ -65,6 +68,8 @@ if [[ ! ${_MULTIBUILD} ]]; then
# @CODE
# @ECLASS-VARIABLE: BUILD_DIR
+# @OUTPUT_VARIABLE
+# @DEFAULT_UNSET
# @DESCRIPTION:
# The current build directory. In global scope, it is supposed
# to contain an 'initial' build directory. If unset, ${S} is used.
diff --git a/eclass/multilib-build.eclass b/eclass/multilib-build.eclass
index 828fc772066f..620bdcedce58 100644
--- a/eclass/multilib-build.eclass
+++ b/eclass/multilib-build.eclass
@@ -79,6 +79,7 @@ readonly _MULTILIB_FLAGS
# @CODE
# @ECLASS-VARIABLE: MULTILIB_USEDEP
+# @OUTPUT_VARIABLE
# @DESCRIPTION:
# The USE-dependency to be used on dependencies (libraries) needing
# to support multilib as well.
@@ -90,7 +91,7 @@ readonly _MULTILIB_FLAGS
# @CODE
# @ECLASS-VARIABLE: MULTILIB_ABI_FLAG
-# @DEFAULT_UNSET
+# @OUTPUT_VARIABLE
# @DESCRIPTION:
# The complete ABI name. Resembles the USE flag name.
#
@@ -320,6 +321,7 @@ multilib_copy_sources() {
}
# @ECLASS-VARIABLE: MULTILIB_WRAPPED_HEADERS
+# @DEFAULT_UNSET
# @DESCRIPTION:
# A list of headers to wrap for multilib support. The listed headers
# will be moved to a non-standard location and replaced with a file
@@ -342,6 +344,7 @@ multilib_copy_sources() {
# @CODE
# @ECLASS-VARIABLE: MULTILIB_CHOST_TOOLS
+# @DEFAULT_UNSET
# @DESCRIPTION:
# A list of tool executables to preserve for each multilib ABI.
# The listed executables will be renamed to ${CHOST}-${basename},
diff --git a/eclass/php-ext-source-r3.eclass b/eclass/php-ext-source-r3.eclass
index 12e4a24facd6..b2eae22fb74d 100644
--- a/eclass/php-ext-source-r3.eclass
+++ b/eclass/php-ext-source-r3.eclass
@@ -81,9 +81,9 @@ esac
# This allows ordering of extensions such that one is loaded before
# or after another. Defaults to the PHP_EXT_NAME.
# Example (produces 40-foo.ini file):
-# @CODE@
+# @CODE
# PHP_INI_NAME="40-foo"
-# @CODE@
+# @CODE
: ${PHP_INI_NAME:=${PHP_EXT_NAME}}
# @ECLASS-VARIABLE: PHP_EXT_NEEDED_USE
diff --git a/eclass/python-any-r1.eclass b/eclass/python-any-r1.eclass
index eef4c57b7e25..c634e19813e0 100644
--- a/eclass/python-any-r1.eclass
+++ b/eclass/python-any-r1.eclass
@@ -69,7 +69,8 @@ EXPORT_FUNCTIONS pkg_setup
# @CODE
# @ECLASS-VARIABLE: PYTHON_COMPAT_OVERRIDE
-# @INTERNAL
+# @USER_VARIABLE
+# @DEFAULT_UNSET
# @DESCRIPTION:
# This variable can be used when working with ebuilds to override
# the in-ebuild PYTHON_COMPAT. It is a string naming the implementation
@@ -105,6 +106,7 @@ EXPORT_FUNCTIONS pkg_setup
# @CODE
# @ECLASS-VARIABLE: PYTHON_DEPS
+# @OUTPUT_VARIABLE
# @DESCRIPTION:
# This is an eclass-generated Python dependency string for all
# implementations listed in PYTHON_COMPAT.
@@ -124,6 +126,7 @@ EXPORT_FUNCTIONS pkg_setup
# @CODE
# @ECLASS-VARIABLE: PYTHON_USEDEP
+# @OUTPUT_VARIABLE
# @DESCRIPTION:
# An eclass-generated USE-dependency string for the currently tested
# implementation. It is set locally for python_check_deps() call.
diff --git a/eclass/python-r1.eclass b/eclass/python-r1.eclass
index 8687b595123a..8c3ff5b08095 100644
--- a/eclass/python-r1.eclass
+++ b/eclass/python-r1.eclass
@@ -72,7 +72,8 @@ fi
# @CODE
# @ECLASS-VARIABLE: PYTHON_COMPAT_OVERRIDE
-# @INTERNAL
+# @USER_VARIABLE
+# @DEFAULT_UNSET
# @DESCRIPTION:
# This variable can be used when working with ebuilds to override
# the in-ebuild PYTHON_COMPAT. It is a string listing all
@@ -111,6 +112,7 @@ fi
# @CODE
# @ECLASS-VARIABLE: PYTHON_DEPS
+# @OUTPUT_VARIABLE
# @DESCRIPTION:
# This is an eclass-generated Python dependency string for all
# implementations listed in PYTHON_COMPAT.
@@ -130,6 +132,7 @@ fi
# @CODE
# @ECLASS-VARIABLE: PYTHON_USEDEP
+# @OUTPUT_VARIABLE
# @DESCRIPTION:
# This is an eclass-generated USE-dependency string which can be used to
# depend on another Python package being built for the same Python
@@ -150,6 +153,7 @@ fi
# @CODE
# @ECLASS-VARIABLE: PYTHON_REQUIRED_USE
+# @OUTPUT_VARIABLE
# @DESCRIPTION:
# This is an eclass-generated required-use expression which ensures at
# least one Python implementation has been enabled.
@@ -273,8 +277,8 @@ _python_validate_useflags() {
}
# @FUNCTION: _python_gen_usedep
-# @INTERNAL
# @USAGE: [...]
+# @INTERNAL
# @DESCRIPTION:
# Output a USE dependency string for Python implementations which
# are both in PYTHON_COMPAT and match any of the patterns passed
@@ -574,6 +578,8 @@ python_gen_any_dep() {
}
# @ECLASS-VARIABLE: BUILD_DIR
+# @OUTPUT_VARIABLE
+# @DEFAULT_UNSET
# @DESCRIPTION:
# The current build directory. In global scope, it is supposed to
# contain an initial build directory; if unset, it defaults to ${S}.
diff --git a/eclass/python-single-r1.eclass b/eclass/python-single-r1.eclass
index d516e3629696..6fedc7cdf4e0 100644
--- a/eclass/python-single-r1.eclass
+++ b/eclass/python-single-r1.eclass
@@ -80,7 +80,8 @@ EXPORT_FUNCTIONS pkg_setup
# @CODE
# @ECLASS-VARIABLE: PYTHON_COMPAT_OVERRIDE
-# @INTERNAL
+# @USER_VARIABLE
+# @DEFAULT_UNSET
# @DESCRIPTION:
# This variable can be used when working with ebuilds to override
# the in-ebuild PYTHON_COMPAT. It is a string naming the implementation
@@ -119,6 +120,7 @@ EXPORT_FUNCTIONS pkg_setup
# @CODE
# @ECLASS-VARIABLE: PYTHON_DEPS
+# @OUTPUT_VARIABLE
# @DESCRIPTION:
# This is an eclass-generated Python dependency string for all
# implementations listed in PYTHON_COMPAT.
@@ -140,6 +142,7 @@ EXPORT_FUNCTIONS pkg_setup
# @CODE
# @ECLASS-VARIABLE: PYTHON_SINGLE_USEDEP
+# @OUTPUT_VARIABLE
# @DESCRIPTION:
# This is an eclass-generated USE-dependency string which can be used to
# depend on another python-single-r1 package being built for the same
@@ -159,6 +162,7 @@ EXPORT_FUNCTIONS pkg_setup
# @CODE
# @ECLASS-VARIABLE: PYTHON_USEDEP
+# @OUTPUT_VARIABLE
# @DESCRIPTION:
# This is a placeholder variable supported by python_gen_cond_dep,
# in order to depend on python-r1 packages built for the same Python
@@ -177,11 +181,13 @@ EXPORT_FUNCTIONS pkg_setup
# @CODE
# @ECLASS-VARIABLE: PYTHON_MULTI_USEDEP
+# @OUTPUT_VARIABLE
# @DESCRIPTION:
# This is a backwards-compatibility placeholder. Use PYTHON_USEDEP
# instead.
# @ECLASS-VARIABLE: PYTHON_REQUIRED_USE
+# @OUTPUT_VARIABLE
# @DESCRIPTION:
# This is an eclass-generated required-use expression which ensures
# that exactly one PYTHON_SINGLE_TARGET value has been enabled.
@@ -266,8 +272,8 @@ unset -f _python_single_set_globals
if [[ ! ${_PYTHON_SINGLE_R1} ]]; then
# @FUNCTION: _python_gen_usedep
-# @INTERNAL
# @USAGE: [...]
+# @INTERNAL
# @DESCRIPTION:
# Output a USE dependency string for Python implementations which
# are both in PYTHON_COMPAT and match any of the patterns passed
diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass
index 1067d2367aba..9bad72a77e98 100644
--- a/eclass/python-utils-r1.eclass
+++ b/eclass/python-utils-r1.eclass
@@ -1164,8 +1164,8 @@ python_fix_shebang() {
# @FUNCTION: _python_check_locale_sanity
# @USAGE:
-# @INTERNAL
# @RETURN: 0 if sane, 1 otherwise
+# @INTERNAL
# @DESCRIPTION:
# Check whether the specified locale sanely maps between lowercase
# and uppercase ASCII characters.
diff --git a/eclass/scons-utils.eclass b/eclass/scons-utils.eclass
index 33838e3ec8bb..c616e4a3f455 100644
--- a/eclass/scons-utils.eclass
+++ b/eclass/scons-utils.eclass
@@ -217,8 +217,8 @@ escons() {
}
# @FUNCTION: _scons_clean_makeopts
-# @INTERNAL
# @USAGE: [makeflags] [...]
+# @INTERNAL
# @DESCRIPTION:
# Strip the supplied makeflags (or ${MAKEOPTS} if called without
# an argument) of options not supported by SCons and make sure --jobs
diff --git a/games-action/Manifest.gz b/games-action/Manifest.gz
index d70dd6ccd9f5..ad7ee0442a6e 100644
Binary files a/games-action/Manifest.gz and b/games-action/Manifest.gz differ
diff --git a/games-action/d1x-rebirth/Manifest b/games-action/d1x-rebirth/Manifest
deleted file mode 100644
index c4e1db0f4709..000000000000
--- a/games-action/d1x-rebirth/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-DIST d1datapt.zip 439942 BLAKE2B dbe0c0fc4aeb25d7ea01296e78680a5388aed622452ee7d7ce163eb1e60741216e998730a30da0404963561a78ffb28e12d154efa3654c40cfca49d2a3451b5d SHA512 41b7777ef679ed0904a5e64534ef0b145e9c49546c9449a569cf0ac75ada3d6095a603136211f939daaf97aa7f09511db85416fefea7ce1447cfe8df7a16b555
-DIST d1x-rebirth_v0.58.1-src.tar.gz 1247599 BLAKE2B 813b971e695a5376129991424ec349b448bf9fda21dfc04f2665a7aa344ecefbd48d7c44cd6e474d3ff8648e13aa9c09498034c19d447f526ac4cfbf8afecefb SHA512 d1bdaeee07c5ac34b2e6839fea1449344d206f76f1eb2ba3fd4fa7cbe6acd82c2e8d7140b2d6297add3d5e8fb7fe4ca2b1c22c900def94603c218f6660644c80
-DIST d1xr-briefings-ger.zip 16798 BLAKE2B f5e1f4f91cb3464b3d356fab1e3993700cc19f3f2db8682f5194e59aa5d2623efa427db4135c3595534e5dac0f2589b53aac7df3610501b759407e1ead342458 SHA512 956a3ef1fe7379b71d5f651fdcb1f26b786883a35193a0a22009204e885a12fceb3a69c6accbeb2bd20be65afe087d23532d7ef3439edd97cc8904968bf519e3
-DIST d1xr-opl3-music.zip 81503503 BLAKE2B b560597e0f08139109a6dc4ee7996c05010561686029d1fd754375278b8a11e6df0f6106c797d524e92d4998683d6e1e07b6cfc982ea3ff167a0b9ca92ba0dc2 SHA512 4ac82c4bc2ddb02e2941746921443e38b698c6e54cfcab317fc9108f84ada7b868ec2ee3c70b28c1dfe9f41e2aadab4124c8daa65a409905cba5d674f0aab8a8
-DIST d1xr-sc55-music.zip 72803408 BLAKE2B eb52491f5c43e9f04aea5715cffc0a47d029dda0b8e5ae1a79ec36122a17c01e3b2a731f369d72fe0e069e1188bdaf03f82d0845b574d76b6798be33481e3b84 SHA512 3cdce5b6535e28397b3216cc9ca05cccf7194349c62d64c54300f02f39248b98598d170599e5c61b6900d780e4917f905c3c31eb814fbb8429221c804cbd8bf9
-DIST d1xrdata.zip 1364601 BLAKE2B b17f76cf9a0f967d4462275d48113ca0161df09053c98eb6031766ce424632b5fb190386f852887242d1e709fc18ec5fad93490a610b754f047b9482c2e9de95 SHA512 9ca4ac459367476250bef6eb7f3fccdb4070f4ed5c00dad318c1d63e7bcb2c61ef8cb8233f3f2156f46ed4ba57232033f2b456078f883a96ab7ebd5b5df84c59
-DIST dxx-rebirth_icons.zip 137392 BLAKE2B 34b975cd0b1ada2d7ba6f8b39bf2e4b753462b5876be18dbc2fb6e19767814b61af850533f575bb12446e4f6b42d1bd1960f19cc1af26e0d96a18cb7f0571a99 SHA512 d13edc1897cf047a1fa0bf23c2b64334f095d9a28255fb500f7f0ffb6122559eb10fea372b02c52c71ac467d8276ece4c7dff4069585ab74dfa9ebb8bda2deb2
diff --git a/games-action/d1x-rebirth/d1x-rebirth-0.58.1.ebuild b/games-action/d1x-rebirth/d1x-rebirth-0.58.1.ebuild
deleted file mode 100644
index 04e178288320..000000000000
--- a/games-action/d1x-rebirth/d1x-rebirth-0.58.1.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-CDROM_OPTIONAL="yes"
-inherit eutils cdrom scons-utils games
-
-DV=1
-MY_P=${PN}_v${PV}-src
-DESCRIPTION="Descent Rebirth - enhanced Descent ${DV} engine"
-HOMEPAGE="https://www.dxx-rebirth.com/"
-SRC_URI="https://www.dxx-rebirth.com/download/dxx/${MY_P}.tar.gz
- https://www.dxx-rebirth.com/download/dxx/res/d1xrdata.zip
- https://www.dxx-rebirth.com/download/dxx/res/dxx-rebirth_icons.zip
- opl3-musicpack? ( https://www.dxx-rebirth.com/download/dxx/res/d${DV}xr-opl3-music.zip )
- sc55-musicpack? ( https://www.dxx-rebirth.com/download/dxx/res/d${DV}xr-sc55-music.zip )
- cdinstall? ( https://www.dxx-rebirth.com/download/dxx/res/d1datapt.zip )
- l10n_de? ( https://www.dxx-rebirth.com/download/dxx/res/d${DV}xr-briefings-ger.zip )"
-
-LICENSE="D1X GPL-2 public-domain"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="cdinstall debug demo ipv6 l10n_de +music opengl opl3-musicpack sc55-musicpack"
-REQUIRED_USE="?? ( cdinstall demo )
- ?? ( opl3-musicpack sc55-musicpack )
- opl3-musicpack? ( music )
- sc55-musicpack? ( music )"
-
-RDEPEND="dev-games/physfs[hog,zip]
- media-libs/libsdl[X,sound,joystick,opengl?,video]
- cdinstall? ( !games-action/descent1-demodata )
- music? (
- media-libs/sdl-mixer[timidity]
- )
- opengl? (
- virtual/opengl
- virtual/glu
- )"
-DEPEND="${RDEPEND}
- app-arch/unzip"
-PDEPEND="demo? ( games-action/descent1-demodata )"
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
- unpack ${MY_P}.tar.gz dxx-rebirth_icons.zip
- if use cdinstall ; then
- unpack d1datapt.zip
- cdrom_get_cds descent/descent.hog
- mkdir "${S}"/Data
- cp \
- ${CDROM_ROOT}/descent/descent.{hog,pig} \
- ${CDROM_ROOT}/descent/chaos.{hog,msn} \
- "${S}"/Data || die
- fi
-}
-
-src_prepare() {
- if use cdinstall ; then
- cd Data
- patch -p0 < "${WORKDIR}"/d1datapt/descent.hog.diff descent.hog
- patch -p0 < "${WORKDIR}"/d1datapt/descent.pig.diff descent.pig
- fi
- epatch "${FILESDIR}"/${P}-flags.patch
-}
-
-src_compile() {
- escons \
- verbosebuild=1 \
- sharepath="${GAMES_DATADIR}/d${DV}x" \
- $(use_scons ipv6) \
- $(use_scons music sdlmixer) \
- $(use_scons debug) \
- $(use_scons opengl) || die
-}
-
-src_install() {
- dodoc {CHANGELOG,INSTALL,README,RELEASE-NOTES}.txt
-
- insinto "${GAMES_DATADIR}/d${DV}x"
- doins "${DISTDIR}"/d1xrdata.zip
- # None of the following zip files need to be extracted.
- use l10n_de && doins "${DISTDIR}"/d${DV}xr-briefings-ger.zip
- use opl3-musicpack && doins "${DISTDIR}"/d${DV}xr-opl3-music.zip
- use sc55-musicpack && doins "${DISTDIR}"/d${DV}xr-sc55-music.zip
-
- if use cdinstall ; then
- doins Data/descent.{hog,pig}
- insinto "${GAMES_DATADIR}"/d${DV}x/missions
- doins Data/chaos.{hog,msn}
- fi
- doicon "${WORKDIR}/${PN}.xpm"
-
- dogamesbin d${DV}x-rebirth
- make_desktop_entry d${DV}x-rebirth "Descent ${DV} Rebirth"
- prepgamesdirs
-}
-
-pkg_postinst() {
- games_pkg_postinst
- if ! use cdinstall ; then
- echo
- elog "To play the full game enable USE=\"cdinstall\" or manually "
- elog "copy the files to ${GAMES_DATADIR}/d${DV}x."
- elog "See /usr/share/doc/${PF}/INSTALL.txt for details."
- echo
- fi
-}
diff --git a/games-action/d1x-rebirth/files/d1x-rebirth-0.58.1-flags.patch b/games-action/d1x-rebirth/files/d1x-rebirth-0.58.1-flags.patch
deleted file mode 100644
index 51723ffb137b..000000000000
--- a/games-action/d1x-rebirth/files/d1x-rebirth-0.58.1-flags.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -ru d1x-rebirth_v0.58.1-src.orig/SConstruct d1x-rebirth_v0.58.1-src/SConstruct
---- d1x-rebirth_v0.58.1-src.orig/SConstruct 2013-08-03 08:13:39.000000000 -0400
-+++ d1x-rebirth_v0.58.1-src/SConstruct 2015-01-27 02:38:03.847800615 -0500
-@@ -218,7 +218,6 @@
- env.Append(CPPFLAGS = ['-g'])
- else:
- env.Append(CPPDEFINES = ['NDEBUG', 'RELEASE'])
-- env.Append(CPPFLAGS = ['-O2'])
-
- # profiler?
- if (self.user_settings.profiler == 1):
diff --git a/games-action/d1x-rebirth/metadata.xml b/games-action/d1x-rebirth/metadata.xml
deleted file mode 100644
index 23d592266dfb..000000000000
--- a/games-action/d1x-rebirth/metadata.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
-
- games@gentoo.org
- Gentoo Games Project
-
-
- Descent 1 is a classic first-person shooter released in 1995 by Interplay
- and Parallax. It was one of the first games with true 3-dimensional
- graphics, movement, and light sourcing. D1X-Rebirth is a modification of the
- Descent 1 source that was released by Parallax and is based on the D1X source.
-
-
-
diff --git a/games-action/descent1-freedata/Manifest b/games-action/descent1-freedata/Manifest
new file mode 100644
index 000000000000..8580b3528ec5
--- /dev/null
+++ b/games-action/descent1-freedata/Manifest
@@ -0,0 +1,4 @@
+DIST d1xr-briefings-ger.dxa 16798 BLAKE2B f5e1f4f91cb3464b3d356fab1e3993700cc19f3f2db8682f5194e59aa5d2623efa427db4135c3595534e5dac0f2589b53aac7df3610501b759407e1ead342458 SHA512 956a3ef1fe7379b71d5f651fdcb1f26b786883a35193a0a22009204e885a12fceb3a69c6accbeb2bd20be65afe087d23532d7ef3439edd97cc8904968bf519e3
+DIST d1xr-hires.dxa 1426884 BLAKE2B c4d9b950353fc450c64568779bc3d2e93a46e17980c8df08a2ef06bff5b9709869fdbbaf4fb6698be994b3faae7a75036a53357743d47b728bb3ef9df126afd8 SHA512 3fc84d5610ba40ee383c1720f80513a21b4644ff8b6da4b84ebca13b11c1131deb4897ded6324b54845b6c847dfc0f16700535e16afdd7ebe83bfff042892302
+DIST d1xr-opl3-music.dxa 81503503 BLAKE2B b560597e0f08139109a6dc4ee7996c05010561686029d1fd754375278b8a11e6df0f6106c797d524e92d4998683d6e1e07b6cfc982ea3ff167a0b9ca92ba0dc2 SHA512 4ac82c4bc2ddb02e2941746921443e38b698c6e54cfcab317fc9108f84ada7b868ec2ee3c70b28c1dfe9f41e2aadab4124c8daa65a409905cba5d674f0aab8a8
+DIST d1xr-sc55-music.dxa 72803408 BLAKE2B eb52491f5c43e9f04aea5715cffc0a47d029dda0b8e5ae1a79ec36122a17c01e3b2a731f369d72fe0e069e1188bdaf03f82d0845b574d76b6798be33481e3b84 SHA512 3cdce5b6535e28397b3216cc9ca05cccf7194349c62d64c54300f02f39248b98598d170599e5c61b6900d780e4917f905c3c31eb814fbb8429221c804cbd8bf9
diff --git a/games-action/descent1-freedata/descent1-freedata-1.ebuild b/games-action/descent1-freedata/descent1-freedata-1.ebuild
new file mode 100644
index 000000000000..6339583ee80b
--- /dev/null
+++ b/games-action/descent1-freedata/descent1-freedata-1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2019 DXX Rebirth project contributors
+# Distributed under the terms of the GNU General Public License v2
+
+# This file is part of the DXX-Rebirth project.
+#
+# It is copyright by its individual contributors, as recorded in the
+# project's Git history. See COPYING.txt at the top level for license
+# terms and a link to the Git history.
+
+EAPI=7
+
+DXX_ENGINE="${PN:7:1}"
+DESCRIPTION="Free content for games-action/d${DXX_ENGINE}x-rebirth"
+HOMEPAGE="https://www.dxx-rebirth.com/"
+IUSE="l10n_de opl3-musicpack sc55-musicpack"
+SRC_URI="
+ l10n_de? ( https://www.dxx-rebirth.com/download/dxx/res/d${DXX_ENGINE}xr-briefings-ger.dxa )
+ opl3-musicpack? ( https://www.dxx-rebirth.com/download/dxx/res/d${DXX_ENGINE}xr-opl3-music.dxa )
+ sc55-musicpack? ( https://www.dxx-rebirth.com/download/dxx/res/d${DXX_ENGINE}xr-sc55-music.dxa )
+"
+
+if [[ "${PN}" = descent1-freedata ]]; then
+ IUSE+=" +textures"
+ SRC_URI+="
+ textures? ( https://www.dxx-rebirth.com/download/dxx/res/d1xr-hires.dxa )
+"
+fi
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+S="$WORKDIR"
+
+# If all USE flags are unset, this ebuild installs zero files. Require
+# at least one to be set.
+REQUIRED_USE="|| ( ${IUSE//+/} )"
+
+RDEPEND="
+ !
+
+
+
+ games@gentoo.org
+ Gentoo Games Project
+
+
+ iansilvester@fastmail.fm
+ Ian Silvester
+
+
+ Descent 1 is a classic first-person shooter released in 1995
+ by Interplay and Parallax. Descent 2 released for the PC in
+ 1996. It, along with its predecessor, was one of the first
+ games with true 3-dimensional graphics, 6 degrees of freedom
+ in movement, light sourcing, and the capability to join
+ multiplayer games on-the-fly. D1X-Rebirth and DXX-Rebirth are
+ modifications of the original Descent 1 and 2 sources that was
+ released by Parallax (and are based on the D1X and D2X
+ sources). It offering OpenGL graphics, advanced multiplayer,
+ new features, and cross-platform compatibility. Now code bases
+ of D1X-Rebirth and DXX-Rebirth merged and released as
+ DXX-Rebirth. This package provides the free level data.
+
+
+
+ dxx-rebirth/dxx-rebirth
+
+
diff --git a/games-action/descent2-freedata/Manifest b/games-action/descent2-freedata/Manifest
new file mode 100644
index 000000000000..244090267112
--- /dev/null
+++ b/games-action/descent2-freedata/Manifest
@@ -0,0 +1,3 @@
+DIST d2xr-briefings-ger.dxa 11717 BLAKE2B 27af93656ac91bf5490195d2aebc9c9f252cb730094cccb53298b07f2e2031935033b8db765b40fdad93fb55b157a2be07906ea45185b754e5ec7c205803cc92 SHA512 479aa577dc65271c705e80404ec46e6c59ee3a5122d6e9705dbdd16b71b16c0d3447426e3e74937aa20eb7026f67a3896c5e814fbfcede9164bd557b6eb8423c
+DIST d2xr-opl3-music.dxa 22710919 BLAKE2B 82bdf29b6afe88305d4c7b69bb8b094efcf33ad23becec223311775cd50600ed399c207ee3a05da3800bcc5e123d00f9f8fa7d2d4f4d4be57bbf71e1c2482a9c SHA512 876321a9a16403f6e9d12e10bb73c9cdc57e1a106fa64833a1be8cc17b74f6f13e57e40f051a1b40e7bc88b95bfe86cff181c93c8619383dfdeb74f36f5cce86
+DIST d2xr-sc55-music.dxa 19579531 BLAKE2B 16091e24477a49319f2685884a7538a3597a9132707ac1d59405fa08ce7492158075df4ee680a5c7ba44aa0bd0b16170057f6a8956eab4b56913d00ee2f1f339 SHA512 290713b05627bf65bdc55fc6631a0c86e50f484a167f3fd20b3fe2bc5b772437939b5bf32eea852874dd983fbd47f160cae2412a2d6c5319f0d1583a33d28da6
diff --git a/games-action/descent2-freedata/descent2-freedata-1.ebuild b/games-action/descent2-freedata/descent2-freedata-1.ebuild
new file mode 100644
index 000000000000..6339583ee80b
--- /dev/null
+++ b/games-action/descent2-freedata/descent2-freedata-1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2019 DXX Rebirth project contributors
+# Distributed under the terms of the GNU General Public License v2
+
+# This file is part of the DXX-Rebirth project.
+#
+# It is copyright by its individual contributors, as recorded in the
+# project's Git history. See COPYING.txt at the top level for license
+# terms and a link to the Git history.
+
+EAPI=7
+
+DXX_ENGINE="${PN:7:1}"
+DESCRIPTION="Free content for games-action/d${DXX_ENGINE}x-rebirth"
+HOMEPAGE="https://www.dxx-rebirth.com/"
+IUSE="l10n_de opl3-musicpack sc55-musicpack"
+SRC_URI="
+ l10n_de? ( https://www.dxx-rebirth.com/download/dxx/res/d${DXX_ENGINE}xr-briefings-ger.dxa )
+ opl3-musicpack? ( https://www.dxx-rebirth.com/download/dxx/res/d${DXX_ENGINE}xr-opl3-music.dxa )
+ sc55-musicpack? ( https://www.dxx-rebirth.com/download/dxx/res/d${DXX_ENGINE}xr-sc55-music.dxa )
+"
+
+if [[ "${PN}" = descent1-freedata ]]; then
+ IUSE+=" +textures"
+ SRC_URI+="
+ textures? ( https://www.dxx-rebirth.com/download/dxx/res/d1xr-hires.dxa )
+"
+fi
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+S="$WORKDIR"
+
+# If all USE flags are unset, this ebuild installs zero files. Require
+# at least one to be set.
+REQUIRED_USE="|| ( ${IUSE//+/} )"
+
+RDEPEND="
+ !
+
+
+
+ games@gentoo.org
+ Gentoo Games Project
+
+
+ iansilvester@fastmail.fm
+ Ian Silvester
+
+
+ Descent 1 is a classic first-person shooter released in 1995
+ by Interplay and Parallax. Descent 2 released for the PC in
+ 1996. It, along with its predecessor, was one of the first
+ games with true 3-dimensional graphics, 6 degrees of freedom
+ in movement, light sourcing, and the capability to join
+ multiplayer games on-the-fly. D1X-Rebirth and DXX-Rebirth are
+ modifications of the original Descent 1 and 2 sources that was
+ released by Parallax (and are based on the D1X and D2X
+ sources). It offering OpenGL graphics, advanced multiplayer,
+ new features, and cross-platform compatibility. Now code bases
+ of D1X-Rebirth and DXX-Rebirth merged and released as
+ DXX-Rebirth. This package provides the free level data.
+
+
+
+ dxx-rebirth/dxx-rebirth
+
+
diff --git a/games-action/dxx-rebirth/Manifest b/games-action/dxx-rebirth/Manifest
index 5a8d4fe15ad1..730b013b2649 100644
--- a/games-action/dxx-rebirth/Manifest
+++ b/games-action/dxx-rebirth/Manifest
@@ -5,4 +5,5 @@ DIST d1xr-sc55-music.dxa 72803408 BLAKE2B eb52491f5c43e9f04aea5715cffc0a47d029dd
DIST d2xr-briefings-ger.dxa 11717 BLAKE2B 27af93656ac91bf5490195d2aebc9c9f252cb730094cccb53298b07f2e2031935033b8db765b40fdad93fb55b157a2be07906ea45185b754e5ec7c205803cc92 SHA512 479aa577dc65271c705e80404ec46e6c59ee3a5122d6e9705dbdd16b71b16c0d3447426e3e74937aa20eb7026f67a3896c5e814fbfcede9164bd557b6eb8423c
DIST d2xr-opl3-music.dxa 22710919 BLAKE2B 82bdf29b6afe88305d4c7b69bb8b094efcf33ad23becec223311775cd50600ed399c207ee3a05da3800bcc5e123d00f9f8fa7d2d4f4d4be57bbf71e1c2482a9c SHA512 876321a9a16403f6e9d12e10bb73c9cdc57e1a106fa64833a1be8cc17b74f6f13e57e40f051a1b40e7bc88b95bfe86cff181c93c8619383dfdeb74f36f5cce86
DIST d2xr-sc55-music.dxa 19579531 BLAKE2B 16091e24477a49319f2685884a7538a3597a9132707ac1d59405fa08ce7492158075df4ee680a5c7ba44aa0bd0b16170057f6a8956eab4b56913d00ee2f1f339 SHA512 290713b05627bf65bdc55fc6631a0c86e50f484a167f3fd20b3fe2bc5b772437939b5bf32eea852874dd983fbd47f160cae2412a2d6c5319f0d1583a33d28da6
+DIST dxx-rebirth-0.61.0_pre20200615.tar.gz 1959226 BLAKE2B 08d66eb1599100172e2bd8dcb8e13ca11314f3b06658c36851ddc7d91897a8376899b7c33b6e7a2d7b72e93cf7f20f157994d06f880e138dc807350e4c64c517 SHA512 3470e2b9cf20268f1af5e8084f0b361d1dd5d797bee9a1d97ce5509046f79750ac214d0f34e7eef1acc4ee4ae868ad3f34d33b45ff163863333e9d8a7d758db2
DIST dxx-rebirth_v0.59.100-src.tar.gz 1809614 BLAKE2B 6826380312fa23dbc99459db9272cf7ffb5a00a14cfdd777339633fbd943a288af00f182692ebc3078e4c39bf6b6cc9fb05cc6a533ec126b8c881eb22c465868 SHA512 dc9b7ad263e189e779756b62613d4bc62371cb5fec2176a4013395fc18c9d03ab0c9ddc5ccf2668b87e4a77b25d500bdef373126f176bfce49f73b5a98de23d7
diff --git a/games-action/dxx-rebirth/dxx-rebirth-0.61.0_pre20200615.ebuild b/games-action/dxx-rebirth/dxx-rebirth-0.61.0_pre20200615.ebuild
new file mode 100644
index 000000000000..484618e8c27c
--- /dev/null
+++ b/games-action/dxx-rebirth/dxx-rebirth-0.61.0_pre20200615.ebuild
@@ -0,0 +1,262 @@
+# Copyright 2017-2020 DXX Rebirth project contributors
+# Distributed under the terms of the GNU General Public License v2
+
+# This file is part of the DXX-Rebirth project.
+#
+# It is copyright by its individual contributors, as recorded in the
+# project's Git history. See COPYING.txt at the top level for license
+# terms and a link to the Git history.
+
+EAPI=7
+PYTHON_COMPAT=( python3_7 )
+
+inherit desktop eutils python-any-r1 scons-utils toolchain-funcs xdg
+if [[ "$PV" = 9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/dxx-rebirth/dxx-rebirth"
+ # Live ebuilds have blank keywords.
+ KEYWORDS=
+ PROPERTIES="live"
+else
+ # dxx-rebirth-0.61.0_pre20190720.ebuild
+ #MY_COMMIT='a17792c89fd49dd12fdf5981670dd7f64b42850f'
+ # dxx-rebirth-0.61.0_pre20200615.ebuild
+ MY_COMMIT='0c2fcf691ffb2a586991350d67f3efd1cca2a1f3'
+ # dxx-rebirth-0.61.0_pre20200627.ebuild
+ #MY_COMMIT='aba40babb47d36a88011af01e4bc0fc00dca74ef'
+ S="$WORKDIR/$PN-$MY_COMMIT"
+ #SRC_URI="https://github.com/dxx-rebirth/dxx-rebirth/archive/$MY_COMMIT.tar.gz -> $PN-$PVR.tar.gz"
+ SRC_URI="https://codeload.github.com/dxx-rebirth/dxx-rebirth/tar.gz/$MY_COMMIT -> $PN-$PVR.tar.gz"
+ unset MY_COMMIT
+
+ # Games under Gentoo are marked as 'testing' by convention
+ #
+ # Other architectures are reported to work, but not tested regularly by
+ # the core team.
+ #
+ # Raspberry Pi support is tested by an outside contributor, and his
+ # fixes are merged into the main source by upstream.
+ #
+ # Cross-compilation to Windows is also supported.
+ KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Descent Rebirth - enhanced Descent 1 & 2 engine"
+HOMEPAGE="https://www.dxx-rebirth.com/"
+
+LICENSE="DXX-Rebirth GPL-3"
+SLOT="0"
+
+# Default to building both game engines. The total size is relatively
+# small.
+IUSE="+d1x +d2x +data debug editor +flac ipv6 +joystick l10n_de +midi +mp3 +music +opengl opl3-musicpack +png sc55-musicpack sdl2 tracker valgrind +vorbis"
+
+# Game data is stored in HOG files.
+# Game movies are in MVL files.
+# Various add-ons use zip files to bundle their content together.
+#
+# PNG support enables writing screenshots as PNG instead of TGA (for
+# USE=opengl) or PCX (for USE=-opengl).
+DEPEND="dev-games/physfs[hog,mvl,zip]
+ opengl? (
+ virtual/opengl
+ virtual/glu )
+ png? ( media-libs/libpng )
+"
+
+# As of this writing, there is no Portage shorthand syntax to express:
+# "
+# flag1? ( package[flag1] )
+# flag2? ( package[flag2] )
+# ...
+# flagN? ( package[flagN] )
+# ", such that unsetting all flags removes the dependency on package.
+# Fake it by using a text fragment that is repeatedly expanded with
+# differing substitutions.
+#
+# The use of single quotes is intentional here. The ${word} is a
+# placeholder to be matched by text substitution when the fragment is
+# expanded, not a shell variable reference.
+#
+# For each flag, depend on freedata using the same flag. If none of the
+# flags are set, freedata is not needed.
+DXX_RDEPEND_USE_FREEDATA_FRAGMENT='
+ ${USE}? ( games-action/descent${ENGINE}-freedata[${USE}] )
+'
+# Block <0.59.100 due to file collision.
+#
+# If USE=data, then require a game data package.
+# The build process does not use the game data, nor change how the game
+# is built based on what game data will be used. At startup, the game
+# will search for both types of game data and use what it finds. Users
+# can switch between shareware/retail data at any time by
+# adding/removing the appropriate data packages. A rebuild is _not_
+# required after swapping the data files.
+#
+# USE-depend on freedata for various extras, but only if any of those
+# extras are enabled.
+DXX_RDEPEND_ENGINE_FRAGMENT='
+ d${ENGINE}x? (
+ !
dxx-rebirth/dxx-rebirth
diff --git a/games-action/heroes/files/heroes-0.21-automake-1.12.patch b/games-action/heroes/files/heroes-0.21-automake-1.12.patch
deleted file mode 100644
index 1a645df91acb..000000000000
--- a/games-action/heroes/files/heroes-0.21-automake-1.12.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- heroes-0.21/configure.ac
-+++ heroes-0.21/configure.ac
-@@ -112,7 +112,7 @@
- # Checks for typedefs, structures, and compiler characteristics.
- # ==============================================================
-
--AM_C_PROTOTYPES
-+AC_C_PROTOTYPES
- AC_C_CONST
- AC_TYPE_UID_T dnl This checks for gid_t too.
- AC_CHECK_TYPES([ssize_t])
diff --git a/games-action/heroes/files/heroes-0.21-autotools.patch b/games-action/heroes/files/heroes-0.21-autotools.patch
new file mode 100644
index 000000000000..c6dfb9fab1a7
--- /dev/null
+++ b/games-action/heroes/files/heroes-0.21-autotools.patch
@@ -0,0 +1,30 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -44,6 +44,7 @@
+ AM_PROG_CC_C_O
+ AC_PROG_CPP
+ AC_PROG_AWK
++AM_PROG_AR
+ AC_PROG_RANLIB
+ AC_PROG_LN_S
+
+@@ -112,7 +113,7 @@
+ # Checks for typedefs, structures, and compiler characteristics.
+ # ==============================================================
+
+-AM_C_PROTOTYPES
++AC_C_PROTOTYPES
+ AC_C_CONST
+ AC_TYPE_UID_T dnl This checks for gid_t too.
+ AC_CHECK_TYPES([ssize_t])
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -42,7 +42,7 @@
+ heroeslvl_SOURCES = heroeslvl.c
+
+ heroes_LDADD = lvl/libhlvl.a media/libhmcommon.a ../lib/libheroes.a \
+- $(INTLLIBS) $(LIBALT_LOCAL_XLDADD) $(LIBALT_XLDADD)
++ $(INTLLIBS) $(LIBALT_LOCAL_XLDADD) $(LIBALT_XLDADD) -lm
+ heroes_LDFLAGS = $(LIBALT_XLDFLAGS)
+
+ ## Depend upon Makefile because the value of LIBALT_LOCAL_LDADD might
diff --git a/games-action/heroes/files/heroes-0.21-underlink.patch b/games-action/heroes/files/heroes-0.21-underlink.patch
deleted file mode 100644
index 18a0fca28f3c..000000000000
--- a/games-action/heroes/files/heroes-0.21-underlink.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/Makefile.am 2011-06-10 11:32:03.905618275 +0200
-+++ b/src/Makefile.am 2011-06-10 11:32:15.539347083 +0200
-@@ -42,7 +42,7 @@
- heroeslvl_SOURCES = heroeslvl.c
-
- heroes_LDADD = lvl/libhlvl.a media/libhmcommon.a ../lib/libheroes.a \
-- $(INTLLIBS) $(LIBALT_LOCAL_XLDADD) $(LIBALT_XLDADD)
-+ $(INTLLIBS) $(LIBALT_LOCAL_XLDADD) $(LIBALT_XLDADD) -lm
- heroes_LDFLAGS = $(LIBALT_XLDFLAGS)
-
- ## Depend upon Makefile because the value of LIBALT_LOCAL_LDADD might
diff --git a/games-action/heroes/heroes-0.21-r2.ebuild b/games-action/heroes/heroes-0.21-r2.ebuild
index 9e7f8d9fcc0d..a576ebf8f758 100644
--- a/games-action/heroes/heroes-0.21-r2.ebuild
+++ b/games-action/heroes/heroes-0.21-r2.ebuild
@@ -20,10 +20,11 @@ LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="ggi nls sdl"
+REQUIRED_USE="^^ ( ggi sdl )"
RESTRICT="test"
-REQUIRED_USE="^^ ( ggi sdl )"
-RDEPEND="ggi? (
+RDEPEND="
+ ggi? (
media-libs/libggi
media-libs/libgii
media-libs/libmikmod
@@ -33,49 +34,41 @@ RDEPEND="ggi? (
media-libs/libsdl
media-libs/sdl-mixer
)"
-DEPEND="${RDEPEND}
- nls? ( sys-devel/gettext )"
+DEPEND="${RDEPEND}"
+BDEPEND="nls? ( sys-devel/gettext )"
- #56118
PATCHES=(
- "${FILESDIR}/${P}"-automake-1.12.patch
- "${FILESDIR}/${P}"-gcc4.patch
- "${FILESDIR}/${P}"-underlink.patch
- "${FILESDIR}/${P}"-cvs-segfault-fix.patch
- "${FILESDIR}/${P}"-compilation.patch
- "${FILESDIR}/${P}"-gcc10.patch
+ "${FILESDIR}"/${P}-autotools.patch
+ "${FILESDIR}"/${P}-gcc4.patch
+ "${FILESDIR}"/${P}-cvs-segfault-fix.patch
+ "${FILESDIR}"/${P}-compilation.patch
+ "${FILESDIR}"/${P}-gcc10.patch
)
src_prepare() {
default
- sed -i 's:$(localedir):/usr/share/locale:' \
- $(find . -name 'Makefile.in*') || die
eautoreconf
}
src_configure() {
- local myconf=(
- $(use_with sdl)
- $(use_with sdl sdl-mixer)
- $(use_with ggi)
- $(use_with ggi mikmod)
- $(use_enable nls)
- )
-
local pkg
- for pkg in ${A//.tar.bz2} ; do
- cd "${WORKDIR}"/${pkg}
+ for pkg in ${A//.tar.bz2}; do
+ cd "${WORKDIR}"/${pkg} || die
econf \
--disable-heroes-debug \
--disable-optimizations \
- "${myconf[@]}"
+ $(use_with sdl) \
+ $(use_with sdl sdl-mixer) \
+ $(use_with ggi) \
+ $(use_with ggi mikmod) \
+ $(use_enable nls)
done
}
src_install() {
local pkg
for pkg in ${A//.tar.bz2} ; do
- cd "${WORKDIR}"/${pkg}
+ cd "${WORKDIR}"/${pkg} || die
emake DESTDIR="${D}" install
done
}
diff --git a/games-action/koth/files/koth-0.8.0-autotools.patch b/games-action/koth/files/koth-0.8.0-autotools.patch
new file mode 100644
index 000000000000..0303a0e0bec6
--- /dev/null
+++ b/games-action/koth/files/koth-0.8.0-autotools.patch
@@ -0,0 +1,20 @@
+--- a/configure.in
++++ b/configure.in
+@@ -4,15 +4,14 @@
+ AM_CONFIG_HEADER(config.h)
+ AC_PROG_MAKE_SET
+
+-USER_CFLAGS=$CFLAGS
+-
+ dnl Checks for programs.
+ AC_PROG_CC
+ AC_ISC_POSIX
++AM_PROG_AR
+ AC_PROG_RANLIB
+
+
+-CFLAGS="-g -O2 -Wall -Wimplicit $USER_CFLAGS"
++CFLAGS="${CFLAGS} -Wall -Wimplicit"
+ dnl Checks for library functions.
+ AC_ARG_ENABLE(client, [ --disable-client disable libggi detection (can only build server)],
+ if test $enableval == no; then
diff --git a/games-action/koth/files/koth-0.8.0-gcc.patch b/games-action/koth/files/koth-0.8.0-gcc.patch
new file mode 100644
index 000000000000..999498da7005
--- /dev/null
+++ b/games-action/koth/files/koth-0.8.0-gcc.patch
@@ -0,0 +1,72 @@
+--- a/src/ballistics.c
++++ b/src/ballistics.c
+@@ -92,6 +92,7 @@
+ break;
+ case WALL_LAST:
+ /* just to satisfy gcc -Wall */
++ ;
+ }
+ }
+
+@@ -210,7 +211,7 @@
+ break;
+ case WALL_RANDOM: /* both of this can't happen, */
+ case WALL_LAST: /* so they are here to satisfy gcc -Wall */
+-
++ ;
+ }
+ }
+ return FLYING;
+--- a/src/gfx.c
++++ b/src/gfx.c
+@@ -51,7 +51,7 @@
+ int gfx_armorBar=0;
+
+ /* The maximum value for a color. */
+-#define CMAX ((uint16)(~0))
++#define CMAX ((uint16_t)(~0))
+ #define MAX(a, b) (((a) > (b)) ? (a) : (b))
+ #define MIN(a, b) (((a) < (b)) ? (a) : (b))
+
+--- a/src/gfx.h
++++ b/src/gfx.h
+@@ -24,7 +24,7 @@
+ #include "terrain.h"
+
+ /* The maximum value for a color. */
+-#define CMAX ((uint16)(~0))
++#define CMAX ((uint16_t)(~0))
+ #define MAX_WALLS 6
+
+ extern ggi_visual_t gfx_vis;
+--- a/src/log.c
++++ b/src/log.c
+@@ -26,7 +26,7 @@
+
+ Levels_log log_level = INTERESTING;
+
+-inline void logPrintf(Levels_log level, char *fmt, ...)
++void logPrintf(Levels_log level, char *fmt, ...)
+ {
+ if(log_level < level)
+ return;
+--- a/src/log.h
++++ b/src/log.h
+@@ -25,6 +25,6 @@
+
+ extern Levels_log log_level;
+
+-inline void logPrintf(Levels_log level, char *fmt, ...);
++void logPrintf(Levels_log level, char *fmt, ...);
+
+ #endif
+--- a/src/relay.c
++++ b/src/relay.c
+@@ -260,6 +260,7 @@
+ else goto bail;
+ goto nextpkt;
+ bail:
++ ;
+ }
+ }
+ }
diff --git a/games-action/koth/files/koth-0.8.0-r1-gcc-3.4.patch b/games-action/koth/files/koth-0.8.0-r1-gcc-3.4.patch
deleted file mode 100644
index 145f17dbccdd..000000000000
--- a/games-action/koth/files/koth-0.8.0-r1-gcc-3.4.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- a/src/relay.c 2004-11-01 09:19:04.835537536 +0000
-+++ b/src/relay.c 2004-11-01 09:19:59.453234384 +0000
-@@ -260,6 +260,7 @@
- else goto bail;
- goto nextpkt;
- bail:
-+ ;
- }
- }
- }
---- a/src/ballistics.c 2004-11-01 09:19:33.132235784 +0000
-+++ b/src/ballistics.c 2004-11-01 09:20:16.849589736 +0000
-@@ -92,6 +92,7 @@
- break;
- case WALL_LAST:
- /* just to satisfy gcc -Wall */
-+ ;
- }
- }
-
-@@ -210,7 +211,7 @@
- break;
- case WALL_RANDOM: /* both of this can't happen, */
- case WALL_LAST: /* so they are here to satisfy gcc -Wall */
--
-+ ;
- }
- }
- return FLYING;
diff --git a/games-action/koth/koth-0.8.0-r1.ebuild b/games-action/koth/koth-0.8.0-r1.ebuild
index 988f9bf485dc..3030dcd88d94 100644
--- a/games-action/koth/koth-0.8.0-r1.ebuild
+++ b/games-action/koth/koth-0.8.0-r1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
-inherit eutils flag-o-matic
+EAPI=7
+
+inherit autotools
DESCRIPTION="Multiplayer, networked game of little tanks with really big weapons"
HOMEPAGE="http://www.nongnu.org/koth/"
@@ -11,26 +12,25 @@ SRC_URI="https://savannah.nongnu.org/download/${PN}/default.pkg/${PV}/${P}.tar.b
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~x86"
-IUSE=""
DEPEND="media-libs/libggi"
RDEPEND="${DEPEND}"
PATCHES=(
- "${FILESDIR}"/${PF}-gcc-3.4.patch
+ "${FILESDIR}"/${P}-autotools.patch
+ "${FILESDIR}"/${P}-gcc.patch
)
src_prepare() {
default
- sed -i 's:-g -O2::' configure || die
- sed -i 's:(uint16):(uint16_t):' src/gfx.c src/gfx.h || die
- append-cflags -std=gnu89 # build with gcc5 (bug #570730)
+ mv configure.{in,ac} || die
+ eautoreconf
}
src_install() {
- DOCS="AUTHORS ChangeLog NEWS README doc/*.txt" \
- default
- dodir /etc/koth
+ default
+ dodoc doc/*.txt
+
insinto /etc/koth
doins src/koth.cfg
}
diff --git a/games-action/maelstrom/files/maelstrom-3.0.6-autotools.patch b/games-action/maelstrom/files/maelstrom-3.0.6-autotools.patch
new file mode 100644
index 000000000000..256578494857
--- /dev/null
+++ b/games-action/maelstrom/files/maelstrom-3.0.6-autotools.patch
@@ -0,0 +1,34 @@
+--- a/configure.in
++++ b/configure.in
+@@ -13,6 +13,7 @@
+ AC_PROG_MAKE_SET
+ AC_PROG_CC
+ AC_PROG_CXX
++AM_PROG_AR
+ AC_PROG_RANLIB
+ AC_PROG_INSTALL
+
+@@ -102,10 +103,10 @@
+ ;;
+ *-*-beos*)
+ ac_default_prefix=/boot/beos
+- GAME_INSTALLDIR="\$(prefix)/games/$PACKAGE"
++ GAME_INSTALLDIR="\$(datadir)/$PACKAGE"
+ ;;
+ *)
+- GAME_INSTALLDIR="\$(prefix)/games/$PACKAGE"
++ GAME_INSTALLDIR="\$(datadir)/$PACKAGE"
+ ;;
+ esac
+ AC_SUBST(GAME_INSTALLDIR)
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -65,7 +65,7 @@
+
+ # Special install rule for the game
+ install:
+- make install_gamedata target=@GAME_INSTALLDIR@
++ $(MAKE) install-binPROGRAMS install_gamedata target=$(DESTDIR)/@GAME_INSTALLDIR@
+
+ install_gamedata:
+ sh mkinstalldirs $(target)/
diff --git a/games-action/maelstrom/maelstrom-3.0.6-r3.ebuild b/games-action/maelstrom/maelstrom-3.0.6-r3.ebuild
index db33e84ab966..50639f25c725 100644
--- a/games-action/maelstrom/maelstrom-3.0.6-r3.ebuild
+++ b/games-action/maelstrom/maelstrom-3.0.6-r3.ebuild
@@ -1,25 +1,25 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
-inherit autotools eutils
+EAPI=7
+
+inherit autotools desktop
-MY_P=Maelstrom-${PV}
DESCRIPTION="An asteroids battle game"
HOMEPAGE="http://www.libsdl.org/projects/Maelstrom/"
-SRC_URI="http://www.libsdl.org/projects/Maelstrom/src/${MY_P}.tar.gz"
+SRC_URI="http://www.libsdl.org/projects/Maelstrom/src/${P^}.tar.gz"
-KEYWORDS="~alpha ~amd64 ~x86"
-SLOT="0"
LICENSE="GPL-2"
-IUSE=""
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~x86"
-DEPEND="acct-group/gamestat
+DEPEND="
+ acct-group/gamestat
media-libs/libsdl[sound,joystick,video]
media-libs/sdl-net"
RDEPEND="${DEPEND}"
-S=${WORKDIR}/${MY_P}
+S="${WORKDIR}/${P^}"
PATCHES=(
"${FILESDIR}"/${P}-security.patch
@@ -27,21 +27,17 @@ PATCHES=(
"${FILESDIR}"/${P}-gcc34.patch
"${FILESDIR}"/${P}-warnings.patch
"${FILESDIR}"/${P}-gcc53.patch
+ "${FILESDIR}"/${P}-autotools.patch
)
src_prepare() {
default
- # Install the data into $(datadir)/..., not $(prefix)/games/...
- sed -i \
- -e "s:(prefix)/games/:(datadir)/:" configure.in || die
- sed -i \
- -e '/make install_gamedata/ { s:=:=$(DESTDIR)/:; s/make/$(MAKE)/; s/install_gamedata/install-binPROGRAMS install_gamedata/; }' Makefile.am || die
# Install the high scores file in ${GAMES_STATEDIR}
sed -i \
-e "s:path.Path(MAELSTROM_SCORES):\"/var/games/\"MAELSTROM_SCORES:" scores.cpp || die
- mv configure.{in,ac}
- rm aclocal.m4 acinclude.m4
+ mv configure.{in,ac} || die
+ rm aclocal.m4 acinclude.m4 || die
eautoreconf
}
@@ -49,17 +45,17 @@ src_install() {
default
dodoc Changelog Docs/{Maelstrom-Announce,*FAQ,MaelstromGPL_press_release,*.Paper,Technical_Notes*}
- newicon "${D}/usr/share/Maelstrom/icon.xpm" maelstrom.xpm
+ newicon "${ED}"/usr/share/Maelstrom/icon.xpm maelstrom.xpm
make_desktop_entry Maelstrom "Maelstrom" maelstrom
# Put the high scores file in the right place
insinto /var/games
- doins "${D}/usr/share/Maelstrom/Maelstrom-Scores"
+ doins "${ED}"/usr/share/Maelstrom/Maelstrom-Scores
# clean up some cruft
- rm -f \
- "${D}/usr/share/Maelstrom/Maelstrom-Scores" \
- "${D}/usr/share/Maelstrom/Images/Makefile*"
+ rm \
+ "${ED}"/usr/share/Maelstrom/Maelstrom-Scores \
+ "${ED}"/usr/share/Maelstrom/Images/Makefile* || die
# make sure we can update the high scores
fowners root:gamestat /var/games/Maelstrom-Scores /usr/bin/Maelstrom{,-netd}
diff --git a/games-arcade/Manifest.gz b/games-arcade/Manifest.gz
index 39d62cb761fe..4a02d1b248e1 100644
Binary files a/games-arcade/Manifest.gz and b/games-arcade/Manifest.gz differ
diff --git a/games-arcade/insaneodyssey/files/insaneodyssey-000311-datafiles.patch b/games-arcade/insaneodyssey/files/insaneodyssey-000311-datafiles.patch
index 3aab4eeaf9da..f4114cfc8e88 100644
--- a/games-arcade/insaneodyssey/files/insaneodyssey-000311-datafiles.patch
+++ b/games-arcade/insaneodyssey/files/insaneodyssey-000311-datafiles.patch
@@ -1,5 +1,5 @@
---- a/io.cpp.orig 2004-06-01 19:11:16.000000000 +0300
-+++ b/io.cpp 2004-06-01 19:21:14.000000000 +0300
+--- a/insaneodyssey/io.cpp
++++ b/insaneodyssey/io.cpp
@@ -42,7 +42,11 @@
{
SDL_Surface *image, *surface;
diff --git a/games-arcade/insaneodyssey/files/insaneodyssey-000311-gcc6.patch b/games-arcade/insaneodyssey/files/insaneodyssey-000311-gcc6.patch
index 4fd35438d24b..74b4bf644d49 100644
--- a/games-arcade/insaneodyssey/files/insaneodyssey-000311-gcc6.patch
+++ b/games-arcade/insaneodyssey/files/insaneodyssey-000311-gcc6.patch
@@ -1,7 +1,7 @@
Bug: https://bugs.gentoo.org/600894
---- a/io.cpp
-+++ b/io.cpp
+--- a/insaneodyssey/io.cpp
++++ b/insaneodyssey/io.cpp
@@ -22,6 +22,7 @@
#include
#include
diff --git a/games-arcade/insaneodyssey/insaneodyssey-000311-r1.ebuild b/games-arcade/insaneodyssey/insaneodyssey-000311-r1.ebuild
index 0383afc0b2b3..a96e26451519 100644
--- a/games-arcade/insaneodyssey/insaneodyssey-000311-r1.ebuild
+++ b/games-arcade/insaneodyssey/insaneodyssey-000311-r1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
-inherit desktop
+EAPI=7
+
+inherit autotools desktop
DESCRIPTION="Help West Muldune escape from a futuristic mental hospital"
HOMEPAGE="http://members.fortunecity.com/rivalentertainment/iox.html"
@@ -13,30 +14,28 @@ SRC_URI="mirror://gentoo/io${PV}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE=""
-DEPEND="media-libs/libsdl[sound,video]
+DEPEND="
+ media-libs/libsdl[sound,video]
media-libs/sdl-mixer
- media-libs/sdl-image
-"
+ media-libs/sdl-image"
RDEPEND="${DEPEND}"
S="${WORKDIR}/${PN}"
-src_prepare() {
- default
-
- cd ${PN}
-
+PATCHES=(
# Modify data load code and paths to game data
- eapply "${FILESDIR}"/${P}-datafiles.patch
+ "${FILESDIR}"/${P}-datafiles.patch
+ "${FILESDIR}"/${P}-gcc6.patch
+)
- eapply "${FILESDIR}"/${P}-gcc6.patch
+src_prepare() {
+ default
sed -i \
-e "/lvl/s:^:/usr/share/${PN}/:" \
-e "s:night:/usr/share/${PN}/night:" \
- levels.dat || die
+ insaneodyssey/levels.dat || die
sed -i \
-e "s:tiles.dat:/usr/share/${PN}/tiles.dat:" \
-e "s:sprites.dat:/usr/share/${PN}/sprites.dat:" \
@@ -44,17 +43,23 @@ src_prepare() {
-e "s:IO_T:/usr/share/${PN}/IO_T:" \
-e "s:tiles.att:/usr/share/${PN}/tiles.att:" \
-e "s:shot:/usr/share/${PN}/shot:" \
- io.cpp || die
+ insaneodyssey/io.cpp || die
sed -i \
-e 's:\[32:[100:' \
- io.h || die
+ insaneodyssey/io.h || die
+
+ mv configure.{in,ac} || die
+ eautoreconf
}
src_install() {
- cd ${PN}
- dobin ${PN}
- insinto /usr/share/${PN}
+ cd insaneodyssey || die
+
+ dobin insaneodyssey
+
+ insinto /usr/share/insaneodyssey
doins *bmp *png *dat *att *lvl *wav *mod *IT
- newicon west00r.png ${PN}.png
- make_desktop_entry ${PN} "Insane Odyssey"
+
+ newicon west00r.png insaneodyssey.png
+ make_desktop_entry insaneodyssey "Insane Odyssey"
}
diff --git a/games-arcade/lbreakout2/files/lbreakout2-2.6.5-gentoo.patch b/games-arcade/lbreakout2/files/lbreakout2-2.6.5-gentoo.patch
index 365274c581b9..3284426749af 100644
--- a/games-arcade/lbreakout2/files/lbreakout2-2.6.5-gentoo.patch
+++ b/games-arcade/lbreakout2/files/lbreakout2-2.6.5-gentoo.patch
@@ -1,34 +1,24 @@
---- lbreakout2-2.6.1.orig/Makefile.am
-+++ lbreakout2-2.6.1/Makefile.am
-@@ -1,13 +1,8 @@
- SUBDIRS = intl m4 po common gui game server client docs
-
- EXTRA_DIST = config.rpath AUTHORS COPYING ChangeLog INSTALL README \
--README-SDL.txt TODO lbreakout2.spec touchall lbreakout32.gif \
--lbreakout48.gif lbreakout2.desktop.in win32_mancomp win32_preparchive
--
--desktopdir = $(datadir)/applications
--desktop_DATA = lbreakout2.desktop
--icondir = $(datadir)/icons
--icon_DATA = lbreakout48.gif
-+README-SDL.txt TODO lbreakout2.spec touchall \
-+win32_mancomp win32_preparchive
-
- WIN32_TEXT = AUTHORS COPYING ChangeLog INSTALL README README-SDL.txt \
- TODO lbreakout2.spec ABOUT-NLS
---- lbreakout2-2.6.1.orig/common/gettext.h
-+++ lbreakout2-2.6.1/common/gettext.h
+--- a/common/gettext.h
++++ b/common/gettext.h
@@ -24,6 +24,7 @@
/* Get declarations of GNU message catalog functions. */
# include
+# include
- #else
+ /* We need locale.h too, otherwise setlocale() bails out; cf. #643471 */
+ #if HAVE_LOCALE_H
+--- a/configure.in
++++ b/configure.in
+@@ -12,6 +12,7 @@
+ dnl Checks for programs.
+ AM_GNU_GETTEXT
+ AC_PROG_CC
++AM_PROG_AR
+ AC_PROG_RANLIB
+ AC_EXEEXT
---- lbreakout2-2.6.1.orig/configure.in
-+++ lbreakout2-2.6.1/configure.in
-@@ -80,8 +80,6 @@
+@@ -80,8 +81,6 @@
[ --enable-netdebug Enable net packet debugging.], netdebug_flag="-DNET_DEBUG_MSG" )
AC_SUBST(netdebug_flag)
@@ -37,8 +27,8 @@
locdir_flag="-DLOCALEDIR=\\\"$localedir\\\""
dnl installation&highscore path
---- lbreakout2-2.6.1.orig/docs/Makefile.am
-+++ lbreakout2-2.6.1/docs/Makefile.am
+--- a/docs/Makefile.am
++++ b/docs/Makefile.am
@@ -7,11 +7,11 @@
warp.jpg screen.jpg
@@ -54,8 +44,26 @@
win32-install-script:
@for file in $(EXTRA_DIST); do \
---- lbreakout2-2.6.1.orig/po/Makefile.in.in
-+++ lbreakout2-2.6.1/po/Makefile.in.in
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,13 +1,8 @@
+ SUBDIRS = intl m4 po common gui game server client docs
+
+ EXTRA_DIST = config.rpath AUTHORS COPYING ChangeLog INSTALL README \
+-README-SDL.txt TODO lbreakout2.spec touchall lbreakout32.gif \
+-lbreakout48.gif lbreakout2.desktop.in win32_mancomp win32_preparchive
+-
+-desktopdir = $(datadir)/applications
+-desktop_DATA = lbreakout2.desktop
+-icondir = $(datadir)/icons
+-icon_DATA = lbreakout48.gif
++README-SDL.txt TODO lbreakout2.spec touchall \
++win32_mancomp win32_preparchive
+
+ WIN32_TEXT = AUTHORS COPYING ChangeLog INSTALL README README-SDL.txt \
+ TODO lbreakout2.spec ABOUT-NLS
+--- a/po/Makefile.in.in
++++ b/po/Makefile.in.in
@@ -24,7 +24,7 @@
exec_prefix = @exec_prefix@
datadir = @datadir@
diff --git a/games-arcade/lbreakout2/lbreakout2-2.6.5-r1.ebuild b/games-arcade/lbreakout2/lbreakout2-2.6.5-r1.ebuild
index 5be797a596df..129ed748d93f 100644
--- a/games-arcade/lbreakout2/lbreakout2-2.6.5-r1.ebuild
+++ b/games-arcade/lbreakout2/lbreakout2-2.6.5-r1.ebuild
@@ -1,7 +1,8 @@
# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
+
inherit autotools desktop flag-o-matic gnome2-utils
levels_V=20141220
@@ -24,36 +25,38 @@ RDEPEND="
media-libs/libsdl[sound,joystick,video]
media-libs/sdl-net
media-libs/sdl-mixer
- nls? ( virtual/libintl )
-"
-DEPEND="${RDEPEND}
- nls? ( sys-devel/gettext )
-"
+ nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}"
+BDEPEND="nls? ( sys-devel/gettext )"
+
+PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
src_unpack() {
unpack ${P}.tar.gz
- cd "${S}/client/levels"
+ cd "${S}/client/levels" || die
unpack ${PN}-levelsets-${levels_V}.tar.gz
- if use themes ; then
- mkdir "${WORKDIR}/themes"
- cd "${WORKDIR}/themes"
+ if use themes; then
+ mkdir "${WORKDIR}"/themes || die
+ cd "${WORKDIR}"/themes || die
unpack ${PN}-themes-${themes_V}.tar.gz
# Delete a few duplicate themes (already shipped with lbreakout2
# tarball). Some of them have different case than built-in themes, so it
# is harder to just compare if the filename is the same.
- rm -f absoluteB.zip oz.zip moiree.zip
+ rm -f absoluteB.zip oz.zip moiree.zip || die
+ local f
for f in *.zip; do
- unzip -q "$f" && rm -f "$f" || die
+ unzip -q "${f}" || die
+ rm -f "${f}" || die
done
fi
}
src_prepare() {
default
- eapply "${FILESDIR}"/${P}-gentoo.patch
+ mv configure.{in,ac} || die
eautoreconf
}
@@ -61,17 +64,16 @@ src_configure() {
filter-flags -O?
econf \
--enable-sdl-net \
- --localedir=/usr/share/locale \
- --with-docdir="/usr/share/doc/${PF}/html" \
+ --with-docdir="${EPREFIX}/usr/share/doc/${PF}/html" \
$(use_enable nls)
}
src_install() {
default
- if use themes ; then
+ if use themes; then
insinto /usr/share/lbreakout2/gfx
- doins -r "${WORKDIR}/themes/"*
+ doins -r "${WORKDIR}"/themes/.
fi
newicon client/gfx/win_icon.png ${PN}.png
diff --git a/games-arcade/tuxpuck/files/tuxpuck-0.8.2-Makefile.patch b/games-arcade/tuxpuck/files/tuxpuck-0.8.2-Makefile.patch
new file mode 100644
index 000000000000..30b97283a2e2
--- /dev/null
+++ b/games-arcade/tuxpuck/files/tuxpuck-0.8.2-Makefile.patch
@@ -0,0 +1,139 @@
+--- a/data/Makefile
++++ b/data/Makefile
+@@ -1,5 +1,4 @@
+ # Makefile for TuxPuck , Copyright Jacob Kroon 2001-2002
+-CC = gcc
+ SOURCES = pad_png.c puck_png.c tux_png.c glass_png.c scoreboard_png.c \
+ arcana_png.c mousebar_png.c title_jpg.c board_jpg.c \
+ logo_jpg.c crash_ogg.c nock_ogg.c tux_apps_ogg.c \
+@@ -9,27 +8,33 @@
+
+ OBJS=$(SOURCES:.c=.o)
+
+-%.o : %.c
+- $(CC) $(CFLAGS) -c -o $@ $<
+-
+ libdata.a : $(OBJS)
+- ar r libdata.a $(OBJS)
+- ranlib libdata.a
++ $(AR) r libdata.a $(OBJS)
++ $(RANLIB) libdata.a
+
+-$(SOURCES):
+- cd ../utils/; $(MAKE)
++monos_fnt.c:
+ ../utils/ttf2font ttfs/mono.ttf monos.fnt 30 30
+ ../utils/data2c monos.fnt monos_fnt
++ rm monos.fnt
++monob_fnt.c:
+ ../utils/ttf2font ttfs/mono.ttf monob.fnt 45 45
+ ../utils/data2c monob.fnt monob_fnt
+- rm *.fnt
++ rm monob.fnt
++title_jpg.c:
+ ../utils/data2c jpgs/title.jpg title_jpg
++board_jpg.c:
+ ../utils/data2c jpgs/board.jpg board_jpg
++logo_jpg.c:
+ ../utils/data2c jpgs/logo.jpg logo_jpg
++pad_png.c: pngs/pad.png
+ ../utils/data2c pngs/pad.png pad_png
++puck_png.c: pngs/puck.png
+ ../utils/data2c pngs/puck.png puck_png
++scoreboard_png.c:
+ ../utils/data2c pngs/scoreboard.png scoreboard_png
++mousebar_png.c:
+ ../utils/data2c pngs/mousebar.png mousebar_png
++glass_png.c:
+ ../utils/data2c pngs/glass.png glass_png
+ ../utils/data2c pngs/piece1.png piece1_png
+ ../utils/data2c pngs/piece2.png piece2_png
+@@ -38,15 +43,22 @@
+ ../utils/data2c pngs/piece5.png piece5_png
+ mv glass_png.c temp; cat temp piece?_png.c > glass_png.c
+ rm piece?_png.c temp
++crash_ogg.c:
+ ../utils/data2c sounds/crash.ogg crash_ogg
++nock_ogg.c:
+ ../utils/data2c sounds/nock.ogg nock_ogg
++tux_eyes_spr.c:
+ # Tux
+ ../utils/anim tux/eyes.ac tux_eyes.spr
+ ../utils/data2c tux_eyes.spr tux_eyes_spr
+ rm tux_eyes.spr
++tux_png.c: tux/tux.png
+ ../utils/data2c tux/tux.png tux_png
++tux_apps_ogg.c:
+ ../utils/data2c tux/apps.ogg tux_apps_ogg
++tux_boos_ogg.c:
+ ../utils/data2c tux/boos.ogg tux_boos_ogg
++arcana_png.c:
+ # Arcana
+ ../utils/data2c arcana/arcana.png arcana_png
+ clean :
+--- a/Makefile
++++ b/Makefile
+@@ -1,13 +1,14 @@
+ # Makefile for TuxPuck , Copyright Jacob Kroon 2001-2002
+ NAME = tuxpuck
+ VERSION = 0.8.2
+-CC = gcc
+-CFLAGS += -D_VERSION=\"$(VERSION)\" -g -Wall
++CPPFLAGS += -D_VERSION=\"$(VERSION)\"
++CFLAGS += -Wall
+ CSOURCES = tuxpuck.c video.c audio.c menu.c sprite.c font.c timer.c \
+ board.c entity.c glass.c scoreboard.c player.c zoom.c png.c \
+ jpg.c intro.c tux.c arcana.c
+ INCLUDES = tuxpuck.h video.h audio.h font.h
+-
++SDL_CFLAGS = $(shell $$PKG_CONFIG --cflags sdl)
++SDL_LIBS = $(shell $$PKG_CONFIG --libs sdl)
+
+ #############################################################
+
+@@ -17,11 +18,11 @@
+ endif
+
+ %.o : %.c
+- $(CC) $(CFLAGS) `sdl-config --cflags` -c -o $@ $<
++ $(CC) $(CFLAGS) $(CPPFLAGS) $(SDL_CFLAGS) -c -o $@ $<
+
+ $(NAME) : $(OBJS)
+- cd data; $(MAKE)
+- $(CC) $(CFLAGS) $(OBJS) data/libdata.a `sdl-config --libs` -lm -lpng \
++ cd data && $(MAKE)
++ $(CC) $(LDFLAGS) $(CFLAGS) $(OBJS) data/libdata.a $(SDL_LIBS) -lm -lpng \
+ -ljpeg -lz -lvorbisfile -lvorbis -logg -o $(NAME)
+
+ w32icon.o : data/icons/tuxpuck.ico
+--- a/utils/Makefile
++++ b/utils/Makefile
+@@ -1,18 +1,23 @@
+ # Makefile for TuxPuck Utils , Copyright Jacob Kroon 2001-2002
+-CC = gcc
+-CFLAGS += -g -Wall -Werror
++CFLAGS += -Wall
++
++FREETYPE_CFLAGS = $(shell $$PKG_CONFIG --cflags freetype2)
++FREETYPE_LIBS = $(shell $$PKG_CONFIG --libs freetype2)
++
++SDL_CFLAGS = $(shell $$PKG_CONFIG --cflags sdl)
++SDL_LIBS = $(shell $$PKG_CONFIG --libs sdl)
+ #############################################################
+
+ all : ttf2font data2c anim
+
+ ttf2font : ttf2font.c
+- $(CC) $(CFLAGS) ttf2font.c `freetype-config --cflags --libs` -o ttf2font
++ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) ttf2font.c -o ttf2font $(FREETYPE_CFLAGS) $(FREETYPE_LIBS)
+
+ data2c : data2c.c
+- $(CC) $(CFLAGS) data2c.c `sdl-config --cflags --libs` -o data2c
++ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) data2c.c -o data2c $(SDL_CFLAGS) $(SDL_LIBS)
+
+ anim : anim.c
+- $(CC) $(CFLAGS) anim.c `sdl-config --cflags --libs` -o anim
++ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) anim.c -o anim $(SDL_CFLAGS) $(SDL_LIBS)
+
+ clean :
+ rm -f *~ data2c ttf2font anim
diff --git a/games-arcade/tuxpuck/files/tuxpuck-0.8.2-freetype_pkgconfig.patch b/games-arcade/tuxpuck/files/tuxpuck-0.8.2-freetype_pkgconfig.patch
deleted file mode 100644
index 410024e48dcd..000000000000
--- a/games-arcade/tuxpuck/files/tuxpuck-0.8.2-freetype_pkgconfig.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- tuxpuck-0.8.2/utils/Makefile
-+++ tuxpuck-0.8.2/utils/Makefile
-@@ -6,7 +6,7 @@
- all : ttf2font data2c anim
-
- ttf2font : ttf2font.c
-- $(CC) $(CFLAGS) ttf2font.c `freetype-config --cflags --libs` -o ttf2font
-+ $(CC) $(CFLAGS) ttf2font.c `pkg-config --cflags --libs freetype2` -o ttf2font
-
- data2c : data2c.c
- $(CC) $(CFLAGS) data2c.c `sdl-config --cflags --libs` -o data2c
diff --git a/games-arcade/tuxpuck/files/tuxpuck-0.8.2-ldflags.patch b/games-arcade/tuxpuck/files/tuxpuck-0.8.2-ldflags.patch
deleted file mode 100644
index b4abb60f0fd4..000000000000
--- a/games-arcade/tuxpuck/files/tuxpuck-0.8.2-ldflags.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Makefile.old 2010-10-05 10:34:57.000000000 +0200
-+++ b/Makefile 2010-10-05 10:35:28.000000000 +0200
-@@ -20,7 +20,7 @@
-
- $(NAME) : $(OBJS)
- cd data; $(MAKE)
-- $(CC) $(CFLAGS) $(OBJS) data/libdata.a `sdl-config --libs` -lm -lpng \
-+ $(CC) $(LDFLAGS) $(CFLAGS) $(OBJS) data/libdata.a `sdl-config --libs` -lm -lpng \
- -ljpeg -lz -lvorbisfile -lvorbis -logg -o $(NAME)
-
- w32icon.o : data/icons/tuxpuck.ico
diff --git a/games-arcade/tuxpuck/files/tuxpuck-0.8.2-parallel.patch b/games-arcade/tuxpuck/files/tuxpuck-0.8.2-parallel.patch
deleted file mode 100644
index 7d9b199f55cf..000000000000
--- a/games-arcade/tuxpuck/files/tuxpuck-0.8.2-parallel.patch
+++ /dev/null
@@ -1,58 +0,0 @@
---- a/data/Makefile.old 2015-01-07 14:22:34.852150894 +0100
-+++ b/data/Makefile 2015-01-07 14:57:44.079822614 +0100
-@@ -15,20 +15,29 @@
- ar r libdata.a $(OBJS)
- ranlib libdata.a
-
--$(SOURCES):
-- cd ../utils/; $(MAKE)
-+monos_fnt.c:
- ../utils/ttf2font ttfs/mono.ttf monos.fnt 30 30
- ../utils/data2c monos.fnt monos_fnt
-+ rm monos.fnt
-+monob_fnt.c:
- ../utils/ttf2font ttfs/mono.ttf monob.fnt 45 45
- ../utils/data2c monob.fnt monob_fnt
-- rm *.fnt
-+ rm monob.fnt
-+title_jpg.c:
- ../utils/data2c jpgs/title.jpg title_jpg
-+board_jpg.c:
- ../utils/data2c jpgs/board.jpg board_jpg
-+logo_jpg.c:
- ../utils/data2c jpgs/logo.jpg logo_jpg
-+pad_png.c: pngs/pad.png
- ../utils/data2c pngs/pad.png pad_png
-+puck_png.c: pngs/puck.png
- ../utils/data2c pngs/puck.png puck_png
-+scoreboard_png.c:
- ../utils/data2c pngs/scoreboard.png scoreboard_png
-+mousebar_png.c:
- ../utils/data2c pngs/mousebar.png mousebar_png
-+glass_png.c:
- ../utils/data2c pngs/glass.png glass_png
- ../utils/data2c pngs/piece1.png piece1_png
- ../utils/data2c pngs/piece2.png piece2_png
-@@ -37,15 +46,22 @@
- ../utils/data2c pngs/piece5.png piece5_png
- mv glass_png.c temp; cat temp piece?_png.c > glass_png.c
- rm piece?_png.c temp
-+crash_ogg.c:
- ../utils/data2c sounds/crash.ogg crash_ogg
-+nock_ogg.c:
- ../utils/data2c sounds/nock.ogg nock_ogg
-+tux_eyes_spr.c:
- # Tux
- ../utils/anim tux/eyes.ac tux_eyes.spr
- ../utils/data2c tux_eyes.spr tux_eyes_spr
- rm tux_eyes.spr
-+tux_png.c: tux/tux.png
- ../utils/data2c tux/tux.png tux_png
-+tux_apps_ogg.c:
- ../utils/data2c tux/apps.ogg tux_apps_ogg
-+tux_boos_ogg.c:
- ../utils/data2c tux/boos.ogg tux_boos_ogg
-+arcana_png.c:
- # Arcana
- ../utils/data2c arcana/arcana.png arcana_png
- clean :
diff --git a/games-arcade/tuxpuck/tuxpuck-0.8.2-r2.ebuild b/games-arcade/tuxpuck/tuxpuck-0.8.2-r2.ebuild
index d853da6c5d16..d2fdb0c45bcc 100644
--- a/games-arcade/tuxpuck/tuxpuck-0.8.2-r2.ebuild
+++ b/games-arcade/tuxpuck/tuxpuck-0.8.2-r2.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
-inherit desktop
+EAPI=7
+
+inherit desktop toolchain-funcs
DESCRIPTION="Hover hockey"
HOMEPAGE="http://home.no.net/munsuun/tuxpuck/"
@@ -11,38 +12,32 @@ SRC_URI="http://home.no.net/munsuun/tuxpuck/files/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~x86"
-IUSE=""
RDEPEND="
media-libs/libsdl
media-libs/libpng:0=
- virtual/jpeg:0
media-libs/libvorbis
-"
+ virtual/jpeg:0"
DEPEND="${RDEPEND}
- media-libs/freetype:2
- virtual/pkgconfig
-"
+ media-libs/freetype:2"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-Makefile.patch
+ "${FILESDIR}"/${P}-png15.patch
+)
src_prepare() {
default
+
# Bug #376741 - Make unpack call compatible with both
# PMS and
+-#include
++#include
+ #include
+ #include
+ #include
+--- a/src/client/misc.c
++++ b/src/client/misc.c
+@@ -1,4 +1,5 @@
+ #include
++#include
+ #include
+ #include
+ #include
+--- a/src/ggz/client/ggz.c
++++ b/src/ggz/client/ggz.c
+@@ -33,6 +33,7 @@
+ #include
+ #include
+ #include
++#include
+
+ static char *name=NULL;
+ static int ggz_sock;
diff --git a/games-arcade/xtux/files/xtux-20030306-tux_serv-path.patch b/games-arcade/xtux/files/xtux-20030306-tux_serv-path.patch
new file mode 100644
index 000000000000..87e6043f2178
--- /dev/null
+++ b/games-arcade/xtux/files/xtux-20030306-tux_serv-path.patch
@@ -0,0 +1,13 @@
+--- a/src/client/menu.c
++++ b/src/client/menu.c
+@@ -726,8 +726,8 @@
+ for( i=0 ; i<3 ; i++ )
+ close(i); /* Close STD-IN, -OUT, -ERR */
+
+- system("./tux_serv -e");
+- /* execlp( "./tux_serv", "-e" );
++ system("tux_serv -e");
++ /* execlp( "tux_serv", "-e" );
+ perror("execlp"); */
+ exit(-1);
+ }
diff --git a/games-arcade/xtux/xtux-20030306-r1.ebuild b/games-arcade/xtux/xtux-20030306-r1.ebuild
index 929e81c88666..55e94f38231a 100644
--- a/games-arcade/xtux/xtux-20030306-r1.ebuild
+++ b/games-arcade/xtux/xtux-20030306-r1.ebuild
@@ -1,8 +1,9 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
-inherit desktop
+EAPI=7
+
+inherit desktop toolchain-funcs
DESCRIPTION="Multiplayer Gauntlet-style arcade game"
HOMEPAGE="http://xtux.sourceforge.net/"
@@ -11,30 +12,27 @@ SRC_URI="mirror://sourceforge/xtux/xtux-src-${PV}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE=""
DEPEND="x11-libs/libXpm"
RDEPEND="${DEPEND}
- media-fonts/font-adobe-75dpi
-"
+ media-fonts/font-adobe-75dpi"
S="${WORKDIR}/${PN}"
+PATCHES=(
+ "${FILESDIR}"/${P}-Makefile.patch
+ "${FILESDIR}"/${P}-particles.patch
+ "${FILESDIR}"/${P}-tux_serv-path.patch
+ "${FILESDIR}"/${P}-missing-include.patch
+)
+
src_prepare() {
default
+ find data/ -type d -name .xvpics -exec rm -rf \{\} + || die
+}
- find data/ -type d -name .xvpics -exec rm -rf \{\} +
- sed -i \
- -e "s:-g -Wall -O2:${CFLAGS}:" \
- src/{client,common,server}/Makefile \
- || die "sed failed"
- sed -i \
- -e "s:./tux_serv:tux_serv:" \
- src/client/menu.c \
- || die "sed failed"
-
- eapply "${FILESDIR}/${P}-particles.patch" \
- "${FILESDIR}"/${P}-ldflags.patch
+src_configure() {
+ tc-export AR CC RANLIB
}
src_compile() {
@@ -47,9 +45,13 @@ src_compile() {
src_install() {
dobin xtux tux_serv
- insinto "/usr/share/xtux"
- doins -r data/
- dodoc AUTHORS CHANGELOG README README.GGZ doc/*
+
+ einstalldocs
+ dodoc -r doc/.
+
+ insinto /usr/share/xtux
+ doins -r data
+
newicon data/images/icon.xpm ${PN}.xpm
make_desktop_entry xtux "Xtux"
}
diff --git a/games-board/Manifest.gz b/games-board/Manifest.gz
index 699b2af95ce8..1161eeff29a9 100644
Binary files a/games-board/Manifest.gz and b/games-board/Manifest.gz differ
diff --git a/games-board/cgoban/cgoban-1.9.14-r2.ebuild b/games-board/cgoban/cgoban-1.9.14-r2.ebuild
index ad2c9a790a3d..2abce46ebda7 100644
--- a/games-board/cgoban/cgoban-1.9.14-r2.ebuild
+++ b/games-board/cgoban/cgoban-1.9.14-r2.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
-inherit eutils autotools
+EAPI=7
+
+inherit autotools desktop
DESCRIPTION="A Go-frontend"
HOMEPAGE="http://cgoban1.sourceforge.net/"
@@ -11,7 +12,6 @@ SRC_URI="mirror://sourceforge/cgoban1/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE=""
RDEPEND="
virtual/imagemagick-tools
@@ -25,17 +25,16 @@ PATCHES=(
)
src_prepare() {
- # ${P}-cflags.patch patches configure.ac, not .in:
- mv configure.{in,ac} || die
-
default
-
cp cgoban_icon.png ${PN}.png || die
+
+ mv configure.{in,ac} || die
eautoreconf
}
src_install() {
default
+
doicon ${PN}.png
make_desktop_entry cgoban Cgoban
}
diff --git a/games-board/cgoban/files/cgoban-1.9.14-cflags.patch b/games-board/cgoban/files/cgoban-1.9.14-cflags.patch
index a496dbf0602d..cf6d0edfc7ae 100644
--- a/games-board/cgoban/files/cgoban-1.9.14-cflags.patch
+++ b/games-board/cgoban/files/cgoban-1.9.14-cflags.patch
@@ -1,5 +1,5 @@
---- a/configure.ac 2012-09-03 18:34:15.358122626 +0200
-+++ b/configure.ac 2012-09-03 18:35:30.279156534 +0200
+--- a/configure.in
++++ b/configure.in
@@ -1,8 +1,9 @@
#for autoconf 2.1x start configure script with next three lines
@@ -12,9 +12,7 @@
#for autoconf 2.5x start configure script with next four lines
# AC_PREREQ(2.50)
---- a/configure.ac 2012-09-03 20:17:48.037549487 +0200
-+++ b/configure.ac 2012-09-03 20:18:00.267371203 +0200
-@@ -146,7 +146,7 @@
+@@ -145,7 +146,7 @@
######################################################################
export VERSION
@@ -23,9 +21,15 @@
AC_PREFIX_DEFAULT(/usr/games)
dayNum=`echo $date | awk '{ print $1 }'`
---- a/configure.ac 2012-09-03 20:23:29.174470309 +0200
-+++ b/configure.ac 2012-09-03 20:23:51.895996955 +0200
-@@ -169,7 +169,6 @@
+@@ -160,6 +161,7 @@
+ AC_DEFINE_UNQUOTED(DATE,$DATE)
+ AC_DEFINE_UNQUOTED(DATE_FRENCH,$DATE_FRENCH)
+
++AM_PROG_AR
+ AC_PROG_MAKE_SET
+ AC_PROG_INSTALL
+ AC_PROG_CC
+@@ -168,7 +170,6 @@
AC_MINIX
AC_PROG_CPP
AC_EXEEXT
diff --git a/games-board/iagno/Manifest b/games-board/iagno/Manifest
index 5e6e37742e9a..c74a1827671e 100644
--- a/games-board/iagno/Manifest
+++ b/games-board/iagno/Manifest
@@ -1 +1,2 @@
DIST iagno-3.34.5.tar.xz 563824 BLAKE2B 6933c1ca3ab5a31eebf285be1fa0ba6da18c5564589ec7a3083426dd22d0f050fbf87ef75c5cdc1b5e93822aba58d576e10f12c81785689739abb81fee659467 SHA512 5994d834302e52072e540ac882e8a5e39197a9ddd04972209362965d841565d942d341c91decedd1d11289c09336e13157414209c8d2d5c6816365d17e8f9379
+DIST iagno-3.34.8.tar.xz 565656 BLAKE2B cf06f9259b8f31d69c6f734c0239dc89432cd7a4082bcd451a9e02efe882bc6f5245454d7ab5e89e69d171a9e27f88c927435c06a48454e4a88bdbcfdd193a23 SHA512 b966b4d5baafe517de7e09a585703c1642139348d1b178702afbb8a31be1433f2bf3c20869525835e8d9e0bd3ed3cf6306e50eb453a5f78f2ac1189cf0c3e90b
diff --git a/games-board/iagno/iagno-3.34.8.ebuild b/games-board/iagno/iagno-3.34.8.ebuild
new file mode 100644
index 000000000000..96b715c67b8d
--- /dev/null
+++ b/games-board/iagno/iagno-3.34.8.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit gnome.org gnome2-utils meson vala xdg
+
+DESCRIPTION="Dominate the board in a classic version of Reversi"
+HOMEPAGE="https://wiki.gnome.org/Apps/Iagno"
+
+LICENSE="GPL-3+ CC-BY-SA-3.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+RDEPEND="
+ >=dev-libs/glib-2.40.0:2
+ >=media-libs/gsound-1.0.2
+ >=x11-libs/gtk+-3.24.0:3
+ >=gnome-base/librsvg-2.32.0:2
+"
+DEPEND="${RDEPEND}"
+# libxml2:2 needed for glib-compile-resources xml-stripblanks attributes
+BDEPEND="
+ dev-libs/appstream-glib
+ dev-libs/libxml2:2
+ dev-util/itstool
+ >=sys-devel/gettext-0.19.8
+ virtual/pkgconfig
+ $(vala_depend)
+ media-libs/gsound[vala]
+ gnome-base/librsvg:2[vala]
+"
+
+src_prepare() {
+ xdg_src_prepare
+ vala_src_prepare
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+ gnome2_schemas_update
+}
+
+pkg_postrm() {
+ xdg_pkg_postrm
+ gnome2_schemas_update
+}
diff --git a/games-board/tali/Manifest b/games-board/tali/Manifest
index 4feff4b8ac7b..8fb3c79909fd 100644
--- a/games-board/tali/Manifest
+++ b/games-board/tali/Manifest
@@ -1 +1,2 @@
DIST tali-3.32.1.tar.xz 1636032 BLAKE2B 2d8ea2bac7c0a74833a3cd6768bb5cd394c4b02ee5a7fad151d662f417a536b5cc4784ad4338435d80bdc9db025da2a258c05cbb54b7edd038a37b0c990889ca SHA512 78abdfca84a86100be94a1509f0bd00bb84d9f97bfed87f6378e55adedb0c8d7349a9ebead6d8eac8b9c52b52ae6e7b2a868ac9a2262dffafc4e5ad23a455e7d
+DIST tali-3.36.4.tar.xz 1765348 BLAKE2B 0d4d8bb3b66d58295ecd13e6f985149efb412a6af420baefaea603c9cb043aaa3d353a4930abb18809f42ed2690c81455954778b1a326ca2e9ce36426d0a4668 SHA512 cd01a93ba96d5c8c264e2a73fba3dc16be72a1a1d50f40555e3ef381d3ab03797f25de2a2c7603bd35ac87568f3d43e3763ee65e95dffebe92eafb59d332a3df
diff --git a/games-board/tali/tali-3.36.4.ebuild b/games-board/tali/tali-3.36.4.ebuild
new file mode 100644
index 000000000000..30aa2eafaba5
--- /dev/null
+++ b/games-board/tali/tali-3.36.4.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit gnome.org gnome2-utils meson xdg
+
+DESCRIPTION="Beat the odds in a poker-style dice game"
+HOMEPAGE="https://wiki.gnome.org/Apps/Tali"
+
+LICENSE="GPL-2+ FDL-1.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+DEPEND="
+ dev-libs/glib:2
+ >=x11-libs/gtk+-3.16:3
+"
+RDEPEND="${DEPEND}
+ >=gnome-base/librsvg-2.32:2
+"
+DEPEND="
+ dev-libs/appstream-glib
+ dev-util/itstool
+ >=sys-devel/gettext-0.19.8
+ virtual/pkgconfig
+"
+
+pkg_postinst() {
+ xdg_pkg_postinst
+ gnome2_schemas_update
+}
+
+pkg_postrm() {
+ xdg_pkg_postrm
+ gnome2_schemas_update
+}
diff --git a/games-board/xmahjongg/files/xmahjongg-3.7-autotools.patch b/games-board/xmahjongg/files/xmahjongg-3.7-autotools.patch
new file mode 100644
index 000000000000..9efc02399804
--- /dev/null
+++ b/games-board/xmahjongg/files/xmahjongg-3.7-autotools.patch
@@ -0,0 +1,26 @@
+--- a/configure.in
++++ b/configure.in
+@@ -9,8 +9,11 @@
+ AC_PROG_CPP
+ AC_PROG_CXX
+ AC_PROG_CXXCPP
++AM_PROG_AR
+ AC_PROG_RANLIB
+-if test -n "$GCC" ; then CC="$CC -Wall"; CXX="$CXX -Wall"; fi
++
++CFLAGS="${CFLAGS} -Wall"
++CXXFLAGS="${CXXFLAGS} -Wall"
+
+ AC_PATH_XTRA
+
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -32,7 +32,7 @@
+
+ INCLUDES = $(X_CFLAGS) -I$(top_srcdir)/include
+
+-xmahjongg_LDADD = $(LDADD) ../liblcdf/liblcdf.a @X_LIBS@ @X_PRE_LIBS@ -lX11 @X_EXTRA_LIBS@
++xmahjongg_LDADD = $(LDADD) ../liblcdf/liblcdf.a @X_LIBS@ -lX11 @X_EXTRA_LIBS@
+
+
+ #
diff --git a/games-board/xmahjongg/xmahjongg-3.7-r1.ebuild b/games-board/xmahjongg/xmahjongg-3.7-r1.ebuild
index e05ea7454d84..15198d767d8a 100644
--- a/games-board/xmahjongg/xmahjongg-3.7-r1.ebuild
+++ b/games-board/xmahjongg/xmahjongg-3.7-r1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
-inherit eutils
+EAPI=7
+
+inherit autotools desktop
DESCRIPTION="friendly GUI version of xmahjongg"
HOMEPAGE="http://www.lcdf.org/xmahjongg/"
@@ -11,21 +12,22 @@ SRC_URI="http://www.lcdf.org/xmahjongg/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~mips ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE=""
RDEPEND="x11-libs/libX11"
DEPEND="${RDEPEND}
x11-libs/libXt"
+PATCHES=( "${FILESDIR}"/${P}-autotools.patch )
+
src_prepare() {
default
- sed -i \
- -e '/X_PRE_LIBS/s:-lSM -lICE::' \
- configure || die
+ mv configure.{in,ac} || die
+ eautoreconf
}
src_install() {
default
+
newicon share/tiles/small.gif ${PN}.gif
make_desktop_entry xmahjongg "Xmahjongg" /usr/share/pixmaps/${PN}.gif
}
diff --git a/games-emulation/Manifest.gz b/games-emulation/Manifest.gz
index 9849dec0c40d..08645d8f24fa 100644
Binary files a/games-emulation/Manifest.gz and b/games-emulation/Manifest.gz differ
diff --git a/games-emulation/dgen-sdl/dgen-sdl-1.33-r1.ebuild b/games-emulation/dgen-sdl/dgen-sdl-1.33-r1.ebuild
index 5d9acdc094b9..3d541bd2cb8c 100644
--- a/games-emulation/dgen-sdl/dgen-sdl-1.33-r1.ebuild
+++ b/games-emulation/dgen-sdl/dgen-sdl-1.33-r1.ebuild
@@ -1,7 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
+
+inherit autotools
DESCRIPTION="A Linux/SDL-Port of the famous DGen MegaDrive/Genesis-Emulator"
HOMEPAGE="http://dgen.sourceforge.net/"
@@ -15,13 +17,20 @@ IUSE="joystick opengl"
RDEPEND="
media-libs/libsdl[joystick?,opengl?]
app-arch/libarchive
- opengl? ( virtual/opengl )
-"
-DEPEND="${RDEPEND}
- x86? ( dev-lang/nasm )
-"
-
-PATCHES=( "${FILESDIR}"/${P}-joystick.patch )
+ opengl? ( virtual/opengl )"
+DEPEND="${RDEPEND}"
+BDEPEND="x86? ( dev-lang/nasm )"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-joystick.patch
+ "${FILESDIR}"/${P}-AM_PROG_AR.patch
+ "${FILESDIR}"/${P}-clang-c++11.patch
+)
+
+src_prepare() {
+ default
+ eautoreconf
+}
src_configure() {
econf \
@@ -36,5 +45,6 @@ src_compile() {
}
src_install() {
- DOCS="AUTHORS ChangeLog README sample.dgenrc" default
+ default
+ dodoc sample.dgenrc
}
diff --git a/games-emulation/dgen-sdl/files/dgen-sdl-1.33-AM_PROG_AR.patch b/games-emulation/dgen-sdl/files/dgen-sdl-1.33-AM_PROG_AR.patch
new file mode 100644
index 000000000000..e04efcc01f38
--- /dev/null
+++ b/games-emulation/dgen-sdl/files/dgen-sdl-1.33-AM_PROG_AR.patch
@@ -0,0 +1,10 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -25,6 +25,7 @@
+ AC_PROG_CXXCPP
+ AC_PROG_INSTALL
+ AC_PROG_LN_S
++AM_PROG_AR
+ AC_PROG_RANLIB
+
+ dnl Set the value of make, if make doesn't already.
diff --git a/games-emulation/dgen-sdl/files/dgen-sdl-1.33-clang-c++11.patch b/games-emulation/dgen-sdl/files/dgen-sdl-1.33-clang-c++11.patch
new file mode 100644
index 000000000000..55810b004f2c
--- /dev/null
+++ b/games-emulation/dgen-sdl/files/dgen-sdl-1.33-clang-c++11.patch
@@ -0,0 +1,20 @@
+--- a/main.cpp
++++ b/main.cpp
+@@ -82,7 +82,7 @@
+ static void help()
+ {
+ printf(
+- "DGen/SDL v"VER"\n"
++ "DGen/SDL v" VER "\n"
+ "Usage: dgen [options] [romname [...]]\n\n"
+ "Where options are:\n"
+ " -v Print version number and exit.\n"
+@@ -256,7 +256,7 @@
+ {
+ case 'v':
+ // Show version and exit
+- printf("DGen/SDL version "VER"\n");
++ printf("DGen/SDL version " VER "\n");
+ return 0;
+ case 'r':
+ // Parse another RC file or stdin
diff --git a/games-emulation/dolphin/Manifest b/games-emulation/dolphin/Manifest
index 94f826d6911d..9062bef840b6 100644
--- a/games-emulation/dolphin/Manifest
+++ b/games-emulation/dolphin/Manifest
@@ -1 +1,2 @@
DIST dolphin-5.0.tar.gz 38246344 BLAKE2B 540eb5d0d3f2250d0b562caaef113bcae66ea47c3b6c2884f5612f36f990592d2c83ad0348cb83d71f5329414580f6cbf07081bdef2661bd277ee2f7613dc661 SHA512 8de76f811abfb82e19502336734e86ba600c11d9fa95bcf7f70a2a525165d07ead826854c39377602aab7856a057af9ba91bff458cf2dd008712527290489d3a
+DIST dolphin-5.0_p20200705.tar.gz 41580877 BLAKE2B 78fce8cb10543857633d66789999b0ebb8f195e10652b9316f3346d5c84797dea96a31f509f86cb9470b4b9677ca58c4a865494121277cd0bc7dcc93932da9f4 SHA512 8b1aed8c98ff7205d7b1716aea3faad0bfa3d1ff3fe3a616431a421ae62592a57887e18295276b7a0fee52d19e641b72d5dc00e071cefea7fbe40adc9f3f01a1
diff --git a/games-emulation/dolphin/dolphin-5.0_p20200705.ebuild b/games-emulation/dolphin/dolphin-5.0_p20200705.ebuild
new file mode 100644
index 000000000000..2c2a6b61d4a0
--- /dev/null
+++ b/games-emulation/dolphin/dolphin-5.0_p20200705.ebuild
@@ -0,0 +1,182 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PLOCALES="ar ca cs da de el en es fa fr hr hu it ja ko ms nb nl pl pt pt_BR ro ru sr sv tr zh_CN zh_TW"
+PLOCALE_BACKUP="en"
+
+inherit cmake desktop xdg-utils l10n pax-utils
+
+if [[ ${PV} == *9999 ]]
+then
+ EGIT_REPO_URI="https://github.com/dolphin-emu/dolphin"
+ inherit git-r3
+else
+ inherit vcs-snapshot
+ commit=0dbe8fb2eaa608a6540df3d269648a596c29cf4b
+ SRC_URI="https://github.com/dolphin-emu/dolphin/archive/${commit}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="Gamecube and Wii game emulator"
+HOMEPAGE="https://www.dolphin-emu.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="alsa bluetooth discord-presence doc +evdev ffmpeg log lto profile pulseaudio +qt5 systemd upnp"
+
+RDEPEND="
+ dev-libs/hidapi:0=
+ dev-libs/libfmt:0=
+ dev-libs/lzo:2=
+ dev-libs/pugixml:0=
+ media-libs/libpng:0=
+ media-libs/libsfml
+ media-libs/mesa[egl]
+ net-libs/enet:1.3
+ net-libs/mbedtls:0=
+ net-misc/curl:0=
+ sys-libs/readline:0=
+ sys-libs/zlib:0=
+ x11-libs/libXext
+ x11-libs/libXi
+ x11-libs/libXrandr
+ virtual/libusb:1
+ virtual/opengl
+ alsa? ( media-libs/alsa-lib )
+ bluetooth? ( net-wireless/bluez )
+ evdev? (
+ dev-libs/libevdev
+ virtual/udev
+ )
+ ffmpeg? ( media-video/ffmpeg:= )
+ profile? ( dev-util/oprofile )
+ pulseaudio? ( media-sound/pulseaudio )
+ qt5? (
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+ )
+ systemd? ( sys-apps/systemd:0= )
+ upnp? ( net-libs/miniupnpc )
+"
+DEPEND="${RDEPEND}
+ app-arch/zip
+ media-libs/freetype
+ sys-devel/gettext
+ virtual/pkgconfig"
+
+# vulkan-loader required for vulkan backend which can be selected
+# at runtime.
+RDEPEND="${RDEPEND}
+ media-libs/vulkan-loader"
+
+src_prepare() {
+ cmake_src_prepare
+
+ # Remove all the bundled libraries that support system-installed
+ # preference. See CMakeLists.txt for conditional 'add_subdirectory' calls.
+ local KEEP_SOURCES=(
+ Bochs_disasm
+ FreeSurround
+
+ # vulkan's API is not backwards-compatible:
+ # new release dropped VK_PRESENT_MODE_RANGE_SIZE_KHR
+ # but dolphin still relies on it, bug #729832
+ Vulkan
+
+ cpp-optparse
+ # no support for for using system library
+ glslang
+ imgui
+ # FIXME: xxhash can't be found by cmake
+ xxhash
+ # no support for for using system library
+ minizip
+ # soundtouch uses shorts, not floats
+ soundtouch
+ cubeb
+ discord-rpc
+ # Their build set up solely relies on the build in gtest.
+ gtest
+ # gentoo's version requires exception support.
+ # dolphin disables exceptions and fails the build.
+ picojson
+ # No code to detect shared library.
+ zstd
+ )
+ local s
+ for s in "${KEEP_SOURCES[@]}"; do
+ mv -v "Externals/${s}" . || die
+ done
+ einfo "removing sources: $(echo Externals/*)"
+ rm -r Externals/* || die "Failed to delete Externals dir."
+ for s in "${KEEP_SOURCES[@]}"; do
+ mv -v "${s}" "Externals/" || die
+ done
+
+ remove_locale() {
+ # Ensure preservation of the backup locale when no valid LINGUA is set
+ if [[ "${PLOCALE_BACKUP}" == "${1}" ]] && [[ "${PLOCALE_BACKUP}" == "$(l10n_get_locales)" ]]; then
+ return
+ else
+ rm "Languages/po/${1}.po" || die
+ fi
+ }
+
+ l10n_find_plocales_changes "Languages/po/" "" '.po'
+ l10n_for_each_disabled_locale_do remove_locale
+}
+
+src_configure() {
+ local mycmakeargs=(
+ # Use ccache only when user did set FEATURES=ccache (or similar)
+ # not when ccache binary is present in system (automagic).
+ -DCCACHE_BIN=CCACHE_BIN-NOTFOUND
+ -DENABLE_ALSA=$(usex alsa)
+ -DENABLE_BLUEZ=$(usex bluetooth)
+ -DENABLE_EVDEV=$(usex evdev)
+ -DENCODE_FRAMEDUMPS=$(usex ffmpeg)
+ -DENABLE_LLVM=OFF
+ -DENABLE_LTO=$(usex lto)
+ -DENABLE_PULSEAUDIO=$(usex pulseaudio)
+ -DENABLE_QT=$(usex qt5)
+ -DENABLE_SDL=OFF # not supported: #666558
+ -DFASTLOG=$(usex log)
+ -DOPROFILING=$(usex profile)
+ -DUSE_DISCORD_PRESENCE=$(usex discord-presence)
+ -DUSE_SHARED_ENET=ON
+ -DUSE_UPNP=$(usex upnp)
+
+ # Undo cmake-utils.eclass's defaults.
+ # All dolphin's libraries are private
+ # and rely on circular dependency resolution.
+ -DBUILD_SHARED_LIBS=OFF
+ )
+
+ cmake_src_configure
+}
+
+src_install() {
+ cmake_src_install
+
+ dodoc Readme.md
+ if use doc; then
+ dodoc -r docs/ActionReplay docs/DSP docs/WiiMote
+ fi
+
+ doicon -s 48 Data/dolphin-emu.png
+ doicon -s scalable Data/dolphin-emu.svg
+ doicon Data/dolphin-emu.svg
+}
+
+pkg_postinst() {
+ # Add pax markings for hardened systems
+ pax-mark -m "${EPREFIX}"/usr/games/bin/"${PN}"-emu
+ xdg_icon_cache_update
+}
+
+pkg_postrm() {
+ xdg_icon_cache_update
+}
diff --git a/games-emulation/dolphin/dolphin-9999.ebuild b/games-emulation/dolphin/dolphin-9999.ebuild
index 55392d47b0fd..2c2a6b61d4a0 100644
--- a/games-emulation/dolphin/dolphin-9999.ebuild
+++ b/games-emulation/dolphin/dolphin-9999.ebuild
@@ -1,19 +1,21 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
PLOCALES="ar ca cs da de el en es fa fr hr hu it ja ko ms nb nl pl pt pt_BR ro ru sr sv tr zh_CN zh_TW"
PLOCALE_BACKUP="en"
-inherit cmake-utils desktop gnome2-utils l10n pax-utils
+inherit cmake desktop xdg-utils l10n pax-utils
if [[ ${PV} == *9999 ]]
then
EGIT_REPO_URI="https://github.com/dolphin-emu/dolphin"
inherit git-r3
else
- SRC_URI="https://github.com/${PN}-emu/${PN}/archive/${PV}.zip -> ${P}.zip"
+ inherit vcs-snapshot
+ commit=0dbe8fb2eaa608a6540df3d269648a596c29cf4b
+ SRC_URI="https://github.com/dolphin-emu/dolphin/archive/${commit}.tar.gz -> ${P}.tar.gz"
KEYWORDS="~amd64"
fi
@@ -71,7 +73,7 @@ RDEPEND="${RDEPEND}
media-libs/vulkan-loader"
src_prepare() {
- cmake-utils_src_prepare
+ cmake_src_prepare
# Remove all the bundled libraries that support system-installed
# preference. See CMakeLists.txt for conditional 'add_subdirectory' calls.
@@ -146,13 +148,18 @@ src_configure() {
-DUSE_DISCORD_PRESENCE=$(usex discord-presence)
-DUSE_SHARED_ENET=ON
-DUSE_UPNP=$(usex upnp)
+
+ # Undo cmake-utils.eclass's defaults.
+ # All dolphin's libraries are private
+ # and rely on circular dependency resolution.
+ -DBUILD_SHARED_LIBS=OFF
)
- cmake-utils_src_configure
+ cmake_src_configure
}
src_install() {
- cmake-utils_src_install
+ cmake_src_install
dodoc Readme.md
if use doc; then
@@ -167,9 +174,9 @@ src_install() {
pkg_postinst() {
# Add pax markings for hardened systems
pax-mark -m "${EPREFIX}"/usr/games/bin/"${PN}"-emu
- gnome2_icon_cache_update
+ xdg_icon_cache_update
}
pkg_postrm() {
- gnome2_icon_cache_update
+ xdg_icon_cache_update
}
diff --git a/games-emulation/generator/files/generator-0.35_p4-configure.patch b/games-emulation/generator/files/generator-0.35_p4-autoconf.patch
similarity index 94%
rename from games-emulation/generator/files/generator-0.35_p4-configure.patch
rename to games-emulation/generator/files/generator-0.35_p4-autoconf.patch
index a918c4a97113..ccc9655a2a72 100644
--- a/games-emulation/generator/files/generator-0.35_p4-configure.patch
+++ b/games-emulation/generator/files/generator-0.35_p4-autoconf.patch
@@ -1,5 +1,5 @@
---- a/configure.ac.original 2008-03-17 13:07:48.000000000 -0400
-+++ b/configure.ac 2008-03-17 13:08:03.000000000 -0400
+--- a/configure.ac
++++ b/configure.ac
@@ -28,15 +28,12 @@
AC_ARG_WITH(tcltk,
AS_HELP_STRING(--with-tcltk,Create tcltk version),
@@ -68,7 +68,15 @@
AC_CHECK_LIB(jpeg, jpeg_start_compress,
[ MY_LIBS="-ljpeg $MY_LIBS"; AC_DEFINE(JPEG, 1, [JPEG features]) ])
-@@ -272,14 +225,7 @@
+@@ -259,6 +212,7 @@
+ AC_PROG_CC
+ AC_PROG_CPP
+ AC_PROG_RANLIB
++ AM_PROG_AR
+ AC_PROG_MAKE_SET
+ AC_ISC_POSIX
+ AC_PROG_INSTALL
+@@ -272,14 +226,7 @@
AC_PATH_XTRA
@@ -84,7 +92,7 @@
MY_SUBDIRS="gtkopts $MY_SUBDIRS"
AM_PATH_SDL(1.2.6,,AC_MSG_ERROR(Generator needs sdk 1.2.6 or later))
-@@ -305,6 +251,7 @@
+@@ -305,6 +252,7 @@
AC_CHECK_SIZEOF(unsigned long, 4)
AC_CHECK_SIZEOF(unsigned long long, 8)
AC_CHECK_HEADERS(sys/param.h)
diff --git a/games-emulation/generator/files/generator-0.35_p4-automake.patch b/games-emulation/generator/files/generator-0.35_p4-automake.patch
new file mode 100644
index 000000000000..e04ed94b9be8
--- /dev/null
+++ b/games-emulation/generator/files/generator-0.35_p4-automake.patch
@@ -0,0 +1,26 @@
+--- a/cpu68k/Makefile.am
++++ b/cpu68k/Makefile.am
+@@ -29,6 +29,7 @@
+
+ gen68k_SOURCES = gen68k.c tab68k.c
+ gen68k_DEPENDENCIES = def68k-iibs.h
++BUILT_SOURCES = def68k-iibs.h
+
+ noinst_LIBRARIES = lib68k.a
+ lib68k_a_SOURCES = cpu68k-0.c cpu68k-1.c cpu68k-2.c cpu68k-3.c \
+--- a/main/Makefile.am
++++ b/main/Makefile.am
+@@ -3,11 +3,11 @@
+ INCLUDES = -I../hdr -I. -I../cpu68k -I../ym2612 -I../raze -I../cmz80 \
+ -I../sn76496 -I../gtkopts \
+ -DFNAME_TCLSCRIPT=\"${datadir}/generator/gen.tcl\" \
+- @GTK_CFLAGS@ @SDL_CFLAGS@
++ @SDL_CFLAGS@
+ bin_PROGRAMS = @PROGRAM@
+ EXTRA_PROGRAMS = generator-svgalib generator-tcltk generator-allegro \
+ generator-gtk generator-sdl
+-LDADD = ../cpu68k/lib68k.a ../ym2612/libym2612.a @MY_LIBS@ \
++LDADD = ../cpu68k/lib68k.a ../ym2612/libym2612.a @MY_LIBS@ -lm \
+ ../sn76496/libsn76496.a
+
+ ## this should be generator_tcltk_DATA but it won't let me do that
diff --git a/games-emulation/generator/files/generator-0.35_p4-gcc-9.patch b/games-emulation/generator/files/generator-0.35_p4-gcc-9.patch
deleted file mode 100644
index 7b8eeafb7154..000000000000
--- a/games-emulation/generator/files/generator-0.35_p4-gcc-9.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-https://bugs.gentoo.org/698944
-
---- a/main/vdp.c
-+++ b/main/vdp.c
-@@ -87,7 +87,7 @@ void vdp_describe(void);
- void vdp_eventinit(void);
- void vdp_layer_simple(unsigned int layer, unsigned int priority,
- uint8 *fielddata, unsigned int lineoffset);
--inline void vdp_plotcell(uint8 *patloc, uint8 palette, uint8 flags,
-+static void vdp_plotcell(uint8 *patloc, uint8 palette, uint8 flags,
- uint8 *cellloc, unsigned int lineoffset);
- void vdp_sprites(unsigned int line, uint8 *pridata, uint8 *outdata);
- int vdp_sprite_simple(unsigned int priority, uint8 *framedata,
-@@ -1733,7 +1733,7 @@ void vdp_endfield(void)
- vdp_event_endline); */
- }
-
--inline void vdp_plotcell(uint8 *patloc, uint8 palette, uint8 flags,
-+static void vdp_plotcell(uint8 *patloc, uint8 palette, uint8 flags,
- uint8 *cellloc, unsigned int lineoffset)
- {
- int y, x;
diff --git a/games-emulation/generator/files/generator-0.35_p4-gcc.patch b/games-emulation/generator/files/generator-0.35_p4-gcc.patch
new file mode 100644
index 000000000000..e82512f0e3fb
--- /dev/null
+++ b/games-emulation/generator/files/generator-0.35_p4-gcc.patch
@@ -0,0 +1,53 @@
+--- a/hdr/cpuz80.h
++++ b/hdr/cpuz80.h
+@@ -5,7 +5,7 @@
+ # include "raze.h"
+ #else
+ # include "cmz80.h"
+-CONTEXTMZ80 cpuz80_z80; /* extern'd for save state code */
++extern CONTEXTMZ80 cpuz80_z80; /* extern'd for save state code */
+ #endif
+
+ #define LEN_SRAM 0x2000
+--- a/main/event.c
++++ b/main/event.c
+@@ -15,7 +15,7 @@
+
+ /* time for next event - update vdp_event - return when to call again */
+
+-inline void event_nextevent(void)
++void event_nextevent(void)
+ {
+ /* call this when it *is* time for the next event as dictated by vdp_event,
+ so we switch on it and update vdp_event at the same time */
+--- a/main/vdp.c
++++ b/main/vdp.c
+@@ -87,7 +87,7 @@
+ void vdp_eventinit(void);
+ void vdp_layer_simple(unsigned int layer, unsigned int priority,
+ uint8 *fielddata, unsigned int lineoffset);
+-inline void vdp_plotcell(uint8 *patloc, uint8 palette, uint8 flags,
++static void vdp_plotcell(uint8 *patloc, uint8 palette, uint8 flags,
+ uint8 *cellloc, unsigned int lineoffset);
+ void vdp_sprites(unsigned int line, uint8 *pridata, uint8 *outdata);
+ int vdp_sprite_simple(unsigned int priority, uint8 *framedata,
+@@ -1733,7 +1733,7 @@
+ vdp_event_endline); */
+ }
+
+-inline void vdp_plotcell(uint8 *patloc, uint8 palette, uint8 flags,
++static void vdp_plotcell(uint8 *patloc, uint8 palette, uint8 flags,
+ uint8 *cellloc, unsigned int lineoffset)
+ {
+ int y, x;
+--- a/ym2612/support.h
++++ b/ym2612/support.h
+@@ -3,7 +3,7 @@
+ #include "config.h"
+
+ #define errorlog 0
+-#define INLINE inline
++#define INLINE
+ #define HAS_YM2612 1
+ #define YM2612UpdateRequest(x)
+ #define AY8910_set_clock(chip,clock)
diff --git a/games-emulation/generator/files/generator-0.35_p4-inline.patch b/games-emulation/generator/files/generator-0.35_p4-inline.patch
deleted file mode 100644
index e7f09fa3689c..000000000000
--- a/games-emulation/generator/files/generator-0.35_p4-inline.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -aur generator-0.35-cbiere-r4/ym2612/support.h generator-0.35-cbiere-r4-patched/ym2612/support.h
---- generator-0.35-cbiere-r4/ym2612/support.h 2005-08-27 05:12:29.000000000 -0400
-+++ generator-0.35-cbiere-r4-patched/ym2612/support.h 2018-03-26 11:49:36.000000000 -0400
-@@ -3,7 +3,7 @@
- #include "config.h"
-
- #define errorlog 0
--#define INLINE inline
-+#define INLINE
- #define HAS_YM2612 1
- #define YM2612UpdateRequest(x)
- #define AY8910_set_clock(chip,clock)
diff --git a/games-emulation/generator/files/generator-0.35_p4-underlink.patch b/games-emulation/generator/files/generator-0.35_p4-underlink.patch
deleted file mode 100644
index b350e8b8a334..000000000000
--- a/games-emulation/generator/files/generator-0.35_p4-underlink.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/main/Makefile.am.old 2011-06-20 21:35:25.832460030 +0200
-+++ b/main/Makefile.am 2011-06-20 21:36:29.490503981 +0200
-@@ -7,7 +7,7 @@
- bin_PROGRAMS = @PROGRAM@
- EXTRA_PROGRAMS = generator-svgalib generator-tcltk generator-allegro \
- generator-gtk generator-sdl
--LDADD = ../cpu68k/lib68k.a ../ym2612/libym2612.a @MY_LIBS@ \
-+LDADD = ../cpu68k/lib68k.a ../ym2612/libym2612.a @MY_LIBS@ -lm \
- ../sn76496/libsn76496.a
-
- ## this should be generator_tcltk_DATA but it won't let me do that
diff --git a/games-emulation/generator/generator-0.35_p4-r1.ebuild b/games-emulation/generator/generator-0.35_p4-r1.ebuild
index 54614d750d78..4b25e85945f4 100644
--- a/games-emulation/generator/generator-0.35_p4-r1.ebuild
+++ b/games-emulation/generator/generator-0.35_p4-r1.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
+
inherit autotools toolchain-funcs
MY_P="${PN}-${PV/_p/-cbiere-r}"
@@ -14,26 +15,22 @@ SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="+sdlaudio"
-DEPEND="
+RDEPEND="
virtual/jpeg:0
media-libs/libsdl[joystick,video]
- sdlaudio? ( media-libs/libsdl[sound] )
-"
-RDEPEND="${DEPEND}"
+ sdlaudio? ( media-libs/libsdl[sound] )"
+DEPEND="${RDEPEND}"
S="${WORKDIR}/${MY_P}"
PATCHES=(
- "${FILESDIR}"/${P}-configure.patch
- "${FILESDIR}"/${P}-underlink.patch
- "${FILESDIR}"/${P}-inline.patch
- "${FILESDIR}"/${P}-gcc-9.patch
+ "${FILESDIR}"/${P}-autoconf.patch
+ "${FILESDIR}"/${P}-automake.patch
+ "${FILESDIR}"/${P}-gcc.patch
)
src_prepare() {
default
-
- sed -i -e 's/@GTK_CFLAGS@//g' main/Makefile.am || die
eautoreconf
}
@@ -48,5 +45,7 @@ src_configure() {
src_install() {
dobin main/generator-sdl
- dodoc AUTHORS ChangeLog NEWS README TODO docs/*
+
+ einstalldocs
+ dodoc -r docs/.
}
diff --git a/games-emulation/openmsx/Manifest b/games-emulation/openmsx/Manifest
deleted file mode 100644
index 24b84ce9f2ba..000000000000
--- a/games-emulation/openmsx/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST openmsx-0.14.0.tar.gz 3338719 BLAKE2B e9c09d29bb994f4f40e22271c090580688724cb7024910f0f829a59d0e65e6e70e1c037b943582aac644ee51a00b7e439e751bd84e5828168486b74ee09e8b78 SHA512 74a30de89b4a7cb4d8d5a0ad0c16ab6b58244251ebcbe470cc3cccec6a636492fa8779d1667d76646eabcf8d7d67c53094d5e0a313d452a4a679d797e9394a9b
diff --git a/games-emulation/openmsx/files/sdl-ttf.patch b/games-emulation/openmsx/files/sdl-ttf.patch
deleted file mode 100644
index 6ff469e509ed..000000000000
--- a/games-emulation/openmsx/files/sdl-ttf.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur a/build/libraries.py b/build/libraries.py
---- a/build/libraries.py 2017-08-03 11:26:28.000000000 +0100
-+++ b/build/libraries.py 2018-08-29 23:11:04.392981071 +0100
-@@ -304,7 +304,7 @@
- class SDL_ttf(Library):
- libName = 'SDL_ttf'
- makeName = 'SDL_TTF'
-- header = ''
-+ header = ''
- function = 'TTF_OpenFont'
- dependsOn = ('SDL', 'FREETYPE')
-
diff --git a/games-emulation/openmsx/metadata.xml b/games-emulation/openmsx/metadata.xml
deleted file mode 100644
index c4d0622638ee..000000000000
--- a/games-emulation/openmsx/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
- games@gentoo.org
- Gentoo Games Project
-
-
- openmsx
-
-
diff --git a/games-emulation/openmsx/openmsx-0.14.0.ebuild b/games-emulation/openmsx/openmsx-0.14.0.ebuild
deleted file mode 100644
index 42d560e04cdc..000000000000
--- a/games-emulation/openmsx/openmsx-0.14.0.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit desktop python-any-r1 readme.gentoo-r1
-
-DESCRIPTION="MSX emulator that aims for perfection"
-HOMEPAGE="http://openmsx.org/"
-SRC_URI="https://github.com/openMSX/openMSX/releases/download/RELEASE_${PV//./_}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-
-RDEPEND="
- dev-lang/tcl:0=
- dev-libs/libxml2
- media-libs/libpng:0=
- media-libs/libsdl[sound,video]
- >=media-libs/glew-1.3.2:0=
- media-libs/sdl-image[png]
- media-libs/sdl-ttf
- virtual/opengl
-"
-DEPEND="
- ${RDEPEND}
- ${PYTHON_DEPS}
-"
-
-PATCHES=(
- "${FILESDIR}"/sdl-ttf.patch
-)
-
-DOC_CONTENTS="
-If you want to if you want to emulate real MSX systems and not
-only the free C-BIOS machines, put the system ROMs in one of
-the following directories: /usr/share/${PN}/systemroms
-or ~/.openMSX/share/systemroms
-"
-
-src_prepare() {
- default
- sed -i \
- -e '/^LDFLAGS:=/d' \
- -e '/LINK_FLAGS_PREFIX/d' \
- -e '/LINK_FLAGS+=/s/-s//' \
- -e '/LINK_FLAGS+=\$(TARGET_FLAGS)/s/$/ $(LDFLAGS)/' \
- build/main.mk \
- || die
- sed -i -e '/SYMLINK/s:true:false:' build/custom.mk || die
- sed -i -e 's/GPL.txt//' doc/node.mk || die
-}
-
-src_compile() {
- emake \
- CXXFLAGS="${CXXFLAGS}" \
- INSTALL_SHARE_DIR=/usr/share/${PN} \
- V=1
-}
-
-src_install() {
- emake \
- V=1 \
- INSTALL_BINARY_DIR="${ED}/usr/bin" \
- INSTALL_SHARE_DIR="${ED}/usr/share/${PN}" \
- INSTALL_DOC_DIR="${D}"/usr/share/doc/${PF} \
- install
-
- einstalldocs
- readme.gentoo_create_doc
-
- for i in 16 32 48 64 128 256 ; do
- newicon -s "${i}" "share/icons/openMSX-logo-${i}.png" "${PN}.png"
- done
- make_desktop_entry "${PN}" "openMSX"
-}
-
-pkg_postinst() {
- readme.gentoo_print_elog
-}
diff --git a/games-kids/Manifest.gz b/games-kids/Manifest.gz
index 4bbc62cafd17..5b6749b5ad9c 100644
Binary files a/games-kids/Manifest.gz and b/games-kids/Manifest.gz differ
diff --git a/games-kids/childsplay/Manifest b/games-kids/childsplay/Manifest
deleted file mode 100644
index 0a951c37912b..000000000000
--- a/games-kids/childsplay/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST childsplay-0.90.2.tgz 2330022 BLAKE2B 83370489c52bd62ae46aee6f2d01d5ff42c17887105c5e4b1ba2c9f95c8869b8e315447fe60f6f325d6d6479c7ebf2c82832ffadf4414419976ed1507ed0a889 SHA512 0cc59f893f43f47fec18a6ba04e3d5b4c4b41e6c387fcd64859a65a0660b4d1c8803cd092932fc9d24a4d4b9784d6cc62cc2efc4e841ca62a205f17aec8dec68
-DIST childsplay_plugins-0.90.tgz 4528735 BLAKE2B 1aacd311138c97a868cacca723941ec582ef049831ce1ddb10f2e524f1109ceb81cf4bd34d16f2c857c4ce42ac49f7f5cb9d785e229e11f540476544093e6cb1 SHA512 f1c47c544da364bde6023cf8450d96423d214749f800d783661b6fb16f73c8bbc899ee7f997f36e11b43aff7655332c29445f865ff22dd475ad4ce4a0557e763
-DIST childsplay_plugins_lfc-0.90.tgz 6159653 BLAKE2B eb117a526f6c2caf43578dc0027d8d3b2849529d132ffc55b92d59efbfc12681f31961c265b3f6ab592a17db1a05987458b265bdf68054cef16386b71d2e28a1 SHA512 4fa8f59aae64520de03fd6527dbe7339f320ef377deca19fe91cf5591b364d853cfb9d73b8469417178fcf4bc074d6ed39a1704a20cb5a82657722862c749313
diff --git a/games-kids/childsplay/childsplay-0.90.2-r2.ebuild b/games-kids/childsplay/childsplay-0.90.2-r2.ebuild
deleted file mode 100644
index a0714b344639..000000000000
--- a/games-kids/childsplay/childsplay-0.90.2-r2.ebuild
+++ /dev/null
@@ -1,149 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-inherit eutils python-single-r1 games
-
-DESCRIPTION="A suite of educational games for young children"
-HOMEPAGE="http://childsplay.sourceforge.net/"
-PLUGINS_VERSION="0.90"
-PLUGINS_LFC_VERSION="0.90"
-SRC_URI="mirror://sourceforge/childsplay/${P}.tgz
- mirror://sourceforge/childsplay/${PN}_plugins-${PLUGINS_VERSION}.tgz
- mirror://sourceforge/childsplay/${PN}_plugins_lfc-${PLUGINS_LFC_VERSION}.tgz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="${PYTHON_DEPS}
- $(python_gen_cond_dep '
- dev-python/pygame[${PYTHON_MULTI_USEDEP}]
- ')
- media-libs/sdl-image[gif,jpeg,png]
- media-libs/sdl-ttf
- media-libs/sdl-mixer[vorbis]
- media-libs/libogg"
-RDEPEND="${DEPEND}"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-pkg_setup() {
- python-single-r1_pkg_setup
- games_pkg_setup
-}
-
-src_prepare() {
- local DIR
-
- # Copy the plugins into the main package.
- mv ../${PN}_plugins-${PLUGINS_VERSION}/Data/AlphabetSounds Data || die
- mv ../${PN}_plugins-${PLUGINS_VERSION}/add-score.py . || die
- for DIR in ${PN}_plugins-${PLUGINS_VERSION} ${PN}_plugins_lfc-${PLUGINS_LFC_VERSION}; do
- mv ../${DIR}/Data/*.icon.png Data/icons || die
- cp -r ../${DIR}/lib/* lib || die
- mv ../${DIR}/assetml/${PN}/* assetml/${PN} || die
- rm -rf ../${DIR}
- done
- gunzip man/childsplay.6.gz
- epatch "${FILESDIR}"/${P}-gentoo.patch
- python_fix_shebang .
-}
-
-src_install() {
- local fn
-
- # The following variables are based on Childsplay's INSTALL.sh
- _LOCALEDIR=/usr/share/locale
- _ASSETMLDIR=/usr/share/assetml
- _SCOREDIR=${GAMES_STATEDIR}
- _SCOREFILE=${_SCOREDIR}/childsplay.score
- _CPDIR=$(games_get_libdir)/childsplay
- _SHAREDIR=${GAMES_DATADIR}/childsplay
- _LIBDIR=${_CPDIR}/lib
- _MODULESDIR=${_LIBDIR}
- _SHARELIBDATADIR=${_SHAREDIR}/lib
- _SHAREDATADIR=${_SHAREDIR}/Data
- _RCDIR=${_SHARELIBDATADIR}/ConfigData
- _HOME_DIR_NAME=.childsplay
- _CHILDSPLAYRC=childsplayrc
-
- dodir \
- "${_CPDIR}" \
- "${_LIBDIR}" \
- "${_SHAREDIR}" \
- "${_SHARELIBDATADIR}" \
- "${_SCOREDIR}" \
- "${_LOCALEDIR}" \
- "${_ASSETMLDIR}"
-
- # create BASEPATH.py
- cat >BASEPATH.py <
-
-
-
- games@gentoo.org
- Gentoo Games Project
-
-
-Childsplay is a suite of educational games for young children, like gcompris,
-but without the overkill of c/c++ and the gnome environ.
-
-
- childsplay
-
-
diff --git a/games-mud/Manifest.gz b/games-mud/Manifest.gz
index 506acb847695..781915659890 100644
Binary files a/games-mud/Manifest.gz and b/games-mud/Manifest.gz differ
diff --git a/games-mud/lyntin/Manifest b/games-mud/lyntin/Manifest
deleted file mode 100644
index 5af064f841eb..000000000000
--- a/games-mud/lyntin/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST lyntin-4.2.tar.gz 180111 BLAKE2B e54c7c609f9f6150a6aa30b0ef9d913cad16ada0e227bdd9369dd02b27b5f6871cd64f10e0f404cef68ba91ab4be2d28e77e6dcbbee95d35bb21ebaae9f0ee28 SHA512 72792b0ffd3f07d6ad7ec335beca2b064e348c7e30c7517edb07a90ece0608b34ce68798fb7a0aa7ef6568ebbed14f5246368421f5e14c7520d306ae6a29e432
diff --git a/games-mud/lyntin/lyntin-4.2-r2.ebuild b/games-mud/lyntin/lyntin-4.2-r2.ebuild
deleted file mode 100644
index a579a566c971..000000000000
--- a/games-mud/lyntin/lyntin-4.2-r2.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="tk?"
-
-inherit distutils-r1
-
-DESCRIPTION="tintin mud client clone implemented in Python"
-HOMEPAGE="http://lyntin.sourceforge.net/"
-SRC_URI="mirror://sourceforge/lyntin/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="tk"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
-
-DOCS=( COMMANDS PKG-INFO HACKING README )
-
-python_install() {
- distutils-r1_python_install --install-scripts=/usr/bin
-}
-
-src_prepare() {
- distutils-r1_src_prepare
-}
-
-src_compile() {
- distutils-r1_src_compile
-}
-
-src_install() {
- distutils-r1_src_install
-}
-
-pkg_postinst() {
- if use tk ; then
- elog "To start lyntin in GUI mode, create a config file"
- elog "with this in it:"
- elog
- elog "[Lyntin]"
- elog "ui: tk"
- elog
- elog "Then start lyntin like this:"
- elog
- elog "runlyntin -c /path/to/config_file\n"
- fi
-}
diff --git a/games-puzzle/Manifest.gz b/games-puzzle/Manifest.gz
index 47c5adc215dc..0296286c8bad 100644
Binary files a/games-puzzle/Manifest.gz and b/games-puzzle/Manifest.gz differ
diff --git a/games-puzzle/bff-or-die/Manifest b/games-puzzle/bff-or-die/Manifest
new file mode 100644
index 000000000000..bdc152a2bccd
--- /dev/null
+++ b/games-puzzle/bff-or-die/Manifest
@@ -0,0 +1 @@
+DIST BffOrDie_Linux.zip 194773335 BLAKE2B a32d6b26e446d84110db13340d527ad1ccc423ddb1dfcdacabaf80c0b326f7c7c3d8315b26cc3a8cf4c403b4943e94cd954c77d01edc1963e4fc3b773a4f1042 SHA512 4767fea4c3a94fcf4ad6ca2a313ba1c10d9e6d0d593a63aa336f90f38599f1c43064f56c3e8fd18615ff08bd01dbc0cabe0bd01a798276075c160143f6102650
diff --git a/games-puzzle/bff-or-die/bff-or-die-20200614.ebuild b/games-puzzle/bff-or-die/bff-or-die-20200614.ebuild
new file mode 100644
index 000000000000..1f5014cfab27
--- /dev/null
+++ b/games-puzzle/bff-or-die/bff-or-die-20200614.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit eutils desktop xdg
+
+MY_PN="BffOrDie"
+DESCRIPTION="Time travelling alien couch co-op puzzle game for 1-4 players"
+HOMEPAGE="https://www.bffordie.com/"
+SRC_URI="${MY_PN}_Linux.zip"
+LICENSE="all-rights-reserved"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+RESTRICT="bindist fetch splitdebug"
+
+RDEPEND="
+ sys-libs/zlib
+ virtual/opengl
+"
+
+BDEPEND="
+ app-arch/unzip
+"
+
+S="${WORKDIR}/${MY_PN}_Linux"
+
+DIR="/opt/${PN}"
+QA_PREBUILT="${DIR#/}/*"
+
+pkg_nofetch() {
+ einfo "Please buy and download ${SRC_URI} from:"
+ einfo " https://asa-studio.itch.io/${PN}"
+ einfo "and move it to your distfiles directory."
+}
+
+src_install() {
+ exeinto "${DIR}"
+ newexe ${MY_PN}.$(usex amd64 x86_64 x86) ${MY_PN}
+ make_wrapper ${PN} "${DIR}"/${MY_PN}
+
+ insinto "${DIR}"
+ doins -r ${MY_PN}_Data/
+ rm -r "${ED}/${DIR}"/${MY_PN}_Data/*/$(usex amd64 x86 x86_64) || die
+
+ # Some Unity games have a GUI launcher but this one doesn't use it.
+ rm "${ED}/${DIR}"/${MY_PN}_Data/Plugins/*/ScreenSelector.so || die
+
+ newicon -s 128 ${MY_PN}_Data/Resources/UnityPlayer.png ${PN}.png
+ make_desktop_entry ${PN} "BFF or Die"
+}
diff --git a/games-mud/lyntin/metadata.xml b/games-puzzle/bff-or-die/metadata.xml
similarity index 76%
rename from games-mud/lyntin/metadata.xml
rename to games-puzzle/bff-or-die/metadata.xml
index 5b5b19a5e7cc..26079e608bed 100644
--- a/games-mud/lyntin/metadata.xml
+++ b/games-puzzle/bff-or-die/metadata.xml
@@ -5,7 +5,4 @@
games@gentoo.org
Gentoo Games Project
-
- lyntin
-
diff --git a/games-sports/Manifest.gz b/games-sports/Manifest.gz
index c782e1898df3..1e7ff0e3d897 100644
Binary files a/games-sports/Manifest.gz and b/games-sports/Manifest.gz differ
diff --git a/games-sports/ski/Manifest b/games-sports/ski/Manifest
deleted file mode 100644
index ffc26f2beabf..000000000000
--- a/games-sports/ski/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST ski-6.9.tar.gz 17543 BLAKE2B aedc697ba636f12a3e180d351d2e0c409debcca2aba1eaa8bd5ecf93503b3903845424f9ed99ea83e26b311841b8287702a3c71730c60dbb3fa8e47eea05ead4 SHA512 bdcd9a267153b23bc1e4b99f0073d9d26ff8a8d670d70ec06cc27b91cd4a3bdaf821507671d73a359b3447261d52e596c61cbf9596eead7191102d1a089178b6
diff --git a/games-sports/ski/metadata.xml b/games-sports/ski/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-sports/ski/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
- games@gentoo.org
- Gentoo Games Project
-
-
diff --git a/games-sports/ski/ski-6.9-r1.ebuild b/games-sports/ski/ski-6.9-r1.ebuild
deleted file mode 100644
index 6be1d60fd09c..000000000000
--- a/games-sports/ski/ski-6.9-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils python-single-r1
-
-DESCRIPTION="A simple text-mode skiing game"
-HOMEPAGE="http://www.catb.org/~esr/ski/"
-SRC_URI="http://www.catb.org/~esr/ski/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}"
-DEPEND="${RDEPEND}"
-
-# games-sports/ski and app-emulation/ski both install 'ski' binary, bug #653110
-RDEPEND="${RDEPEND} !!app-emulation/ski"
-
-src_install() {
- dobin ski
- dodoc NEWS README
- doman ski.6
- domenu ski.desktop
- doicon ski.png
- python_fix_shebang "${ED}/usr/bin"
-}
diff --git a/gnome-base/Manifest.gz b/gnome-base/Manifest.gz
index 90c3cd442f5d..172d7c89852d 100644
Binary files a/gnome-base/Manifest.gz and b/gnome-base/Manifest.gz differ
diff --git a/gnome-base/gnome-desktop/Manifest b/gnome-base/gnome-desktop/Manifest
index 659227cea5ef..941e9414f182 100644
--- a/gnome-base/gnome-desktop/Manifest
+++ b/gnome-base/gnome-desktop/Manifest
@@ -1,2 +1 @@
-DIST gnome-desktop-3.34.5.tar.xz 718008 BLAKE2B a09daf4f575b26774beeef8e9edb4ed757ead7c0155aab4d7c132bf503d29096c40b06d52aa261594c6db367ac7a638c33de4445748ab3d94a095c23f8ddd705 SHA512 bc59b420d5698b15697404efcf452e830933efa23b6dba9011eade1c7521dbd4fb6f6e6e2be822d231611b2133e36f2ec42ed49ecabd175127366e0e7d59955c
DIST gnome-desktop-3.34.7.tar.xz 718220 BLAKE2B 89bfd00a356cd47d865aa4df1079b37b08c6a85f4380b5424181ce247248c7f11f0ca135858afb0c00fc4ff47175ff2acbb0b67cebe75e0b0a9f27263f0a9d69 SHA512 efc466d2a7a8a142e76a07c8cb75bad51aafbb2e70432e339713965890e6a83554a5f77ef6cdb6aa9e3ebace4883fb6d3d06004d7a2446d6960319cacbec7639
diff --git a/gnome-base/gnome-desktop/gnome-desktop-3.34.5.ebuild b/gnome-base/gnome-desktop/gnome-desktop-3.34.5.ebuild
deleted file mode 100644
index 665870f47137..000000000000
--- a/gnome-base/gnome-desktop/gnome-desktop-3.34.5.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit gnome.org gnome2-utils meson virtualx xdg
-
-DESCRIPTION="Library with common API for various GNOME modules"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-desktop/"
-
-LICENSE="GPL-2+ LGPL-2+ FDL-1.1+"
-SLOT="3/18" # subslot = libgnome-desktop-3 soname version
-IUSE="debug gtk-doc +introspection seccomp systemd udev"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
-
-# cairo[X] needed for gnome-bg
-COMMON_DEPEND="
- >=x11-libs/gdk-pixbuf-2.36.5:2[introspection?]
- >=x11-libs/gtk+-3.3.6:3[X,introspection?]
- >=dev-libs/glib-2.53.0:2
- >=gnome-base/gsettings-desktop-schemas-3.27.0[introspection?]
- x11-misc/xkeyboard-config
- app-text/iso-codes
- x11-libs/libX11
- systemd? ( sys-apps/systemd:= )
- udev? (
- sys-apps/hwids
- virtual/libudev:= )
- seccomp? ( sys-libs/libseccomp )
-
- x11-libs/cairo:=[X]
- introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-"
-DEPEND="${COMMON_DEPEND}
- media-libs/fontconfig
-"
-RDEPEND="${COMMON_DEPEND}
- seccomp? ( sys-apps/bubblewrap )
-"
-BDEPEND="
- app-text/docbook-xml-dtd:4.1.2
- dev-util/gdbus-codegen
- gtk-doc? ( >=dev-util/gtk-doc-1.14 )
- dev-util/itstool
- >=sys-devel/gettext-0.19.8
- x11-base/xorg-proto
- virtual/pkgconfig
-"
-# Includes X11/Xatom.h in libgnome-desktop/gnome-bg.c which comes from xorg-proto
-
-PATCHES=(
- "${FILESDIR}"/3.32.2-optional-introspection.patch # add introspection meson option
-)
-
-src_prepare() {
- # Don't build manual test programs that will never get run
- sed -i -e "/'test-.*'/d" libgnome-desktop/meson.build || die
- xdg_src_prepare
-}
-
-src_configure() {
- local emesonargs=(
- -Dgnome_distributor=Gentoo
- -Ddate_in_gnome_version=true
- -Ddesktop_docs=true
- $(meson_use debug debug_tools)
- $(meson_use introspection)
- $(meson_feature udev)
- $(meson_feature systemd)
- $(meson_use gtk-doc gtk_doc)
- -Dinstalled_tests=false
- )
- meson_src_configure
-}
-
-src_test() {
- virtx meson_src_test
-}
diff --git a/gnome-base/nautilus/Manifest b/gnome-base/nautilus/Manifest
index 3f0d9d1bc254..0656aa44fb42 100644
--- a/gnome-base/nautilus/Manifest
+++ b/gnome-base/nautilus/Manifest
@@ -1,2 +1 @@
-DIST nautilus-3.34.2.tar.xz 3196976 BLAKE2B 38424061cb5591fc1df5824dd80e282637345bde148955c81632d4894153e10f3840389bb4e43dffe8c28f10eb6e64c1cc89f1bffdcf80fa581a5d47b7724dee SHA512 1a4e24fea3201f68b0316b95425bbc90078baa1ae7dccef2d2e48beda4007ecf2986254cde243d310c548e47a4693d84d1255654199649ce08429a99fb3a3a51
DIST nautilus-3.34.3.tar.xz 3213260 BLAKE2B a417ee5d5e032befed704b71b9ffd29cc9a2a6fae0612f96601756b876b0990625cc78eb2c7679bdce914f3dd30208b60243f403a508cf87a6761ea56251140d SHA512 f8ef86b5b67ef2b8eced492ee6b8d77155a9d6ec5ba6bb18132d678e6f12870963da9bcf4ff0bfbb8f4791bf068314557f9551febc23234c48d722e529c6ed9d
diff --git a/gnome-base/nautilus/metadata.xml b/gnome-base/nautilus/metadata.xml
index 6d7557c2caa1..576e3a2f23ff 100644
--- a/gnome-base/nautilus/metadata.xml
+++ b/gnome-base/nautilus/metadata.xml
@@ -7,8 +7,6 @@