diff --git a/Manifest.files.gz b/Manifest.files.gz
index 5535eecf5a3c..8e96d33aed5b 100644
Binary files a/Manifest.files.gz and b/Manifest.files.gz differ
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index e3dd687625a4..3585151e23fe 100644
Binary files a/app-admin/Manifest.gz and b/app-admin/Manifest.gz differ
diff --git a/app-admin/ara/Manifest b/app-admin/ara/Manifest
deleted file mode 100644
index bcd32ea7f789..000000000000
--- a/app-admin/ara/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST ara-0.15.0.tar.gz 1216308 BLAKE2B c1b88891a3859f32e70a3e8dcb383549ea17cf126e3204eb3dd4f8bf28e11f702c3cbb51bde05c03097d2bb2dbf85354027846b8b3d40916d18e855335a5c16c SHA512 848437db36a398c3e4699b4ee500207e7e90bcbe1ede81c6f15e3b6624538beccd76ffcb51af0293f9371f67c27e430e3e23b1e6e0444665103b91f6587d6b9a
diff --git a/app-admin/ara/ara-0.15.0-r1.ebuild b/app-admin/ara/ara-0.15.0-r1.ebuild
deleted file mode 100644
index a99a9059eaba..000000000000
--- a/app-admin/ara/ara-0.15.0-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="ARA Records Ansible"
-HOMEPAGE="https://github.com/openstack/ara"
-SRC_URI="https://github.com/openstack/ara/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
- app-admin/ansible[${PYTHON_USEDEP}]
- dev-python/jinja[${PYTHON_USEDEP}]
- dev-python/flask[${PYTHON_USEDEP}]
- dev-python/flask-migrate[${PYTHON_USEDEP}]
- dev-python/flask-sqlalchemy[${PYTHON_USEDEP}]
- dev-python/flask-script[${PYTHON_USEDEP}]
- dev-python/frozen-flask[${PYTHON_USEDEP}]
- dev-python/decorator[${PYTHON_USEDEP}]
- dev-python/cliff[${PYTHON_USEDEP}]
- dev-python/subunit[${PYTHON_USEDEP}]
- dev-python/pygments[${PYTHON_USEDEP}]
- dev-python/debtcollector[${PYTHON_USEDEP}]
- dev-python/junit-xml[${PYTHON_USEDEP}]
- dev-python/pyfakefs[${PYTHON_USEDEP}]
- >=dev-python/pbr-3.1.1[${PYTHON_USEDEP}]
- dev-python/oslo-serialization[${PYTHON_USEDEP}]
- dev-python/oslo-utils[${PYTHON_USEDEP}]
- dev-python/xstatic[${PYTHON_USEDEP}]
- dev-python/xstatic-bootstrap-scss[${PYTHON_USEDEP}]
- dev-python/xstatic-datatables[${PYTHON_USEDEP}]
- dev-python/xstatic-jquery[${PYTHON_USEDEP}]
- dev-python/xstatic-patternfly[${PYTHON_USEDEP}]
- dev-python/xstatic-patternfly-bootstrap-treeview[${PYTHON_USEDEP}]
-"
-DEPEND="
- dev-python/setuptools[${PYTHON_USEDEP}]
- dev-python/six[${PYTHON_USEDEP}]
-"
-
-python_compile() {
- export PBR_VERSION="${PV}"
- distutils-r1_python_compile
-}
-
-python_install_all() {
- distutils-r1_python_install_all
- einstalldocs
- dodoc -r doc
-}
diff --git a/app-admin/ara/metadata.xml b/app-admin/ara/metadata.xml
deleted file mode 100644
index dd92348f3d07..000000000000
--- a/app-admin/ara/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
-
- ara
-
-
diff --git a/app-admin/installer/Manifest b/app-admin/installer/Manifest
deleted file mode 100644
index a3228855dd07..000000000000
--- a/app-admin/installer/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST installer-0.1.1_beta.tar.gz 49946 BLAKE2B 845df010036446e65479affc3d901fe114248130627ce76583c42adc9ecf9c0e2585600106c1559c8d3dac8c086553fed1d48d00002ede9e9be509fc98632662 SHA512 940272cefed17bd6c370fe26b2941da611cbd0aa8fb1c7f51bfaef483c7f9189f10754fb7e3d84dc099ac687f4644e24ae22e7ec09c41f39efba30d5743c9163
diff --git a/app-admin/installer/installer-0.1.1_beta.ebuild b/app-admin/installer/installer-0.1.1_beta.ebuild
deleted file mode 100644
index 9cfb8df6b15f..000000000000
--- a/app-admin/installer/installer-0.1.1_beta.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-PYTHON_REQ_USE="ncurses(+)"
-
-inherit distutils-r1
-
-MY_PV=${PV/_/-}
-
-DESCRIPTION="A software for Gentoo installation"
-HOMEPAGE="https://github.com/ChrisADR/installer"
-SRC_URI="https://github.com/ChrisADR/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-DOCS=( README.md CONTRIBUTING.md )
diff --git a/app-admin/installer/metadata.xml b/app-admin/installer/metadata.xml
deleted file mode 100644
index f846e48fd956..000000000000
--- a/app-admin/installer/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
- installer is designed to aid users during the installation
- process of Gentoo Linux. It is capable of walk a beginner
- user through the regular installation process following key
- topics from the Gentoo Handbook.
-
-
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index d2f6abd957d0..994827fc0ee1 100644
Binary files a/app-crypt/Manifest.gz and b/app-crypt/Manifest.gz differ
diff --git a/app-crypt/gkeys/Manifest b/app-crypt/gkeys/Manifest
deleted file mode 100644
index a58fc051622b..000000000000
--- a/app-crypt/gkeys/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST gkeys-0.2.tar.bz2 47726 BLAKE2B f85fcad78251ce8e4b49d452332af869140611161256663310c3a050f7a3c5313f6e37836d90c5a40b1abb043ff7412cea3b5decd3f1c6db24ff5811dd1b9709 SHA512 0c594b5f451329e5e85998bb96243812e0c6e7ef7fa4db0f276a870148adffcf41acc31631fb28c44c473690f154e130ddcb10b986d4546ca19e2cc8cda95036
diff --git a/app-crypt/gkeys/gkeys-0.2.ebuild b/app-crypt/gkeys/gkeys-0.2.ebuild
deleted file mode 100644
index 3f6a31b7af09..000000000000
--- a/app-crypt/gkeys/gkeys-0.2.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=(python3_6)
-
-inherit distutils-r1
-
-DESCRIPTION="An OpenPGP/GPG key management tool for seed files and keyrings"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Gentoo-keys"
-SRC_URI="https://dev.gentoo.org/~dolsen/releases/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-
-DEPEND=""
-RDEPEND="${DEPEND}
- app-crypt/gnupg
- >=dev-python/pyGPG-0.2[${PYTHON_USEDEP}]
- >=dev-python/ssl-fetch-0.4[${PYTHON_USEDEP}]
- dev-python/snakeoil[${PYTHON_USEDEP}]
- >=app-crypt/gentoo-keys-201501052117
- "
-
-python_install_all() {
- distutils-r1_python_install_all
- keepdir /var/log/gkeys
- fperms g+w /var/log/gkeys
-}
-
-pkg_preinst() {
- chgrp users "${D}"/var/log/gkeys
-}
-
-pkg_postinst() {
- einfo "This is experimental software."
- einfo "The API's it installs should be considered unstable"
- einfo "and are subject to change."
- einfo
- einfo "This version includes a new gkeys-gpg command"
- einfo "It can be used as an alternate gpg command for git"
- einfo "It will set the correct keyring to verify signed commits"
- einfo "provided the key it needs to verify against is part of the gkeys"
- einfo "keyring system. It only works for verification, any other call "
- einfo "to it will re-direct directly to the normal gpg command."
- einfo
- einfo "Please file any enhancement requests, or bugs"
- einfo "at https://bugs.gentoo.org"
- einfo "We are also on IRC @ #gentoo-keys of the Freenode network"
- einfo
- ewarn "There may be some Python 3 compatibility issues still."
- ewarn "Please help us debug, fix and report them in Bugzilla."
-}
diff --git a/app-crypt/gkeys/gkeys-9999.ebuild b/app-crypt/gkeys/gkeys-9999.ebuild
deleted file mode 100644
index 6729c94cb2fc..000000000000
--- a/app-crypt/gkeys/gkeys-9999.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=(python3_6)
-
-#EGIT_PROJECT="gentoo-keys.git"
-EGIT_BRANCH="master"
-
-inherit distutils-r1 git-r3
-
-EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/gentoo-keys.git"
-
-DESCRIPTION="An OpenPGP/GPG key management tool and python libs"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Gentoo-keys"
-SRC_URI=""
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-KEYWORDS=""
-
-DEPEND=""
-RDEPEND="${DEPEND}
- app-crypt/gnupg
- =dev-python/pyGPG-9999[${PYTHON_USEDEP}]
- =dev-python/ssl-fetch-9999[${PYTHON_USEDEP}]
- >=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}]
- >=app-crypt/gentoo-keys-201501052117
- "
-
-S="${WORKDIR}/$P/gkeys"
-
-python_prepare_all() {
- distutils-r1_python_prepare_all
- # copy these 2 into our subdir from the master level
- cp ../LICENSE ./ || die "cp LICENSE failed"
- cp ../README.md ./ || die "cp README.me failed"
- cp -R ../py2man ./ || die "cp-R py2man failed"
-}
-
-python_install_all() {
- distutils-r1_python_install_all
- keepdir /var/log/gkeys
- fperms g+w /var/log/gkeys
-}
-
-pkg_preinst() {
- chgrp users "${D}"/var/log/gkeys
-}
-
-pkg_postinst() {
- einfo
- einfo "This is experimental software."
- einfo "The API's it installs should be considered unstable"
- einfo "and are subject to change."
- einfo
- einfo "Please file any enhancement requests, or bugs"
- einfo "at https://bugs.gentoo.org"
- einfo "We are also on IRC @ #gentoo-keys of the freenode network"
- einfo
- ewarn "There may be some python 3 compatibility issues still."
- ewarn "Please help debug/fix/report them in bugzilla."
-}
diff --git a/app-crypt/gkeys/metadata.xml b/app-crypt/gkeys/metadata.xml
deleted file mode 100644
index 1937e8c82b4b..000000000000
--- a/app-crypt/gkeys/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
- gkeys@gentoo.org
- Gentoo-keys Project Team
-
-
diff --git a/app-crypt/manuale/Manifest b/app-crypt/manuale/Manifest
deleted file mode 100644
index 1cc5d25b0e8c..000000000000
--- a/app-crypt/manuale/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST manuale-1.1.0.tar.gz 14015 BLAKE2B 1c3eb18e591032c1633e73da46bd91653627c127ccd9d0006d776ccc12d95faaf53b8942a47fcedcb37ef998ad6975efee7a20658f6e366fa51f0b6ddd635f31 SHA512 b78d6468fba14738f0b33cb11817a61692bab2b18a3331b2696c6e1c070a202903be6d6f642da7dd35560b15ee5fe24afecebe51395bdacae59f04cc582b6b44
diff --git a/app-crypt/manuale/manuale-1.1.0.ebuild b/app-crypt/manuale/manuale-1.1.0.ebuild
deleted file mode 100644
index ea17625b0910..000000000000
--- a/app-crypt/manuale/manuale-1.1.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="A fully manual Let's Encrypt client"
-HOMEPAGE="https://github.com/veeti/manuale"
-SRC_URI="https://github.com/veeti/manuale/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}
- dev-python/cryptography[${PYTHON_USEDEP}]
- dev-python/requests[${PYTHON_USEDEP}]"
-
-DOCS=( README.md CHANGELOG.md)
diff --git a/app-crypt/manuale/metadata.xml b/app-crypt/manuale/metadata.xml
deleted file mode 100644
index 0610b7e1cd7e..000000000000
--- a/app-crypt/manuale/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
-
- veeti/manuale
-
-
diff --git a/app-i18n/Manifest.gz b/app-i18n/Manifest.gz
index feeeff00d442..a855b4632a91 100644
Binary files a/app-i18n/Manifest.gz and b/app-i18n/Manifest.gz differ
diff --git a/app-i18n/scim/Manifest b/app-i18n/scim/Manifest
index 13684813add0..3d55a28c3958 100644
--- a/app-i18n/scim/Manifest
+++ b/app-i18n/scim/Manifest
@@ -1,2 +1 @@
-DIST scim-1.4.17.tar.gz 1285383 BLAKE2B 95b9ecb0bb25a15876df8175ee0b9392c301e3b0c554ac6ccba6b863420828ce185d3454f2fef48c03e7451f01815020290be7611b8536d8a028153af3a3fe2b SHA512 a7e0696330bca6fdf929ec0565ab4af1b4d0e5f73592cf5cccf1af6412eb351cd5a5ec9a3e5b83b24d6abad89bbb38a375cbbb0fd978f2fa17f6d64b69da0e3a
DIST scim-1.4.18.tar.gz 1288060 BLAKE2B c2f1ce5608423734899aa6698060245c4ee253048d04d32bf5e853b8c68255340a8d35c0ebaaa50871b07c23ee9018b6bac03b18fbd4fa4dbea0e67c32c9ae30 SHA512 9a6090fc1ab950905a9c54d6678ce3d2a44297d1a992a3e933b0466688638e6cf470c1682daa58a6fbb6de3216b649273faf7edff1ac0ecca1c2c77fc19108fb
diff --git a/app-i18n/scim/scim-1.4.17.ebuild b/app-i18n/scim/scim-1.4.17.ebuild
deleted file mode 100644
index 1365db6b815e..000000000000
--- a/app-i18n/scim/scim-1.4.17.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils flag-o-matic multilib gnome2-utils autotools qmake-utils
-
-DESCRIPTION="Smart Common Input Method (SCIM) is an Input Method (IM) development platform"
-HOMEPAGE="https://sourceforge.net/projects/scim"
-SRC_URI="mirror://sourceforge/scim/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ppc ppc64 sparc x86"
-IUSE="doc gtk3"
-
-RDEPEND="x11-libs/libX11
- dev-libs/glib:2
- gtk3? ( x11-libs/gtk+:3 )
- !gtk3? ( x11-libs/gtk+:2 )
- >=dev-libs/atk-1
- >=x11-libs/pango-1"
-DEPEND="${RDEPEND}
- doc? ( app-doc/doxygen
- >=app-text/docbook-xsl-stylesheets-1.73.1 )
- dev-lang/perl
- virtual/pkgconfig
- >=dev-util/intltool-0.33
- sys-devel/libtool"
-DOCS=(
- README
- AUTHORS
- ChangeLog
- docs/developers
- docs/scim.cfg
-)
-
-src_prepare() {
- default
- eautoreconf
-}
-
-src_configure() {
- # bug #83625
- filter-flags -fvisibility-inlines-hidden -fvisibility=hidden
- econf $(use_with doc doxygen) \
- --enable-ld-version-script \
- $(usex gtk3 --with-gtk-version={3,2}) \
- --disable-qt3-immodule \
- --disable-qt4-immodule
-}
-
-src_compile() {
- default
- use doc && emake docs
-}
-
-src_install() {
- use doc && HTML_DOCS=( "${S}/docs/html/" )
- default
-
- sed -e "s:@EPREFIX@:${EPREFIX}:" "${FILESDIR}/xinput-${PN}" > "${T}/${PN}.conf" || die
- insinto /etc/X11/xinit/xinput.d
- doins "${T}/${PN}.conf"
-}
-
-pkg_postinst() {
- elog
- elog "To use SCIM with both GTK and XIM, you should use the following"
- elog "in your user startup scripts such as .gnomerc or .xinitrc:"
- elog
- elog "LANG='your_language' scim -d"
- elog "export XMODIFIERS=@im=SCIM"
- elog "export GTK_IM_MODULE=\"scim\""
- elog "export QT_IM_MODULE=\"scim\""
- elog
- elog "where 'your_language' can be zh_CN, zh_TW, ja_JP.eucJP or any other"
- elog "UTF-8 locale such as en_US.UTF-8 or ja_JP.UTF-8"
- elog
- elog "To use Chinese input methods:"
- elog " # emerge app-i18n/scim-tables app-i18n/scim-pinyin"
- elog "To use Korean input methods:"
- elog " # emerge app-i18n/scim-hangul"
- elog "To use Japanese input methods:"
- elog " # emerge app-i18n/scim-anthy"
- elog "To use various input methods (more than 30 languages):"
- elog " # emerge app-i18n/scim-m17n"
- elog
- elog "Please modify ${EPREFIX}/etc/scim/global and add your UTF-8 locale to"
- elog "/SupportedUnicodeLocales entry."
- elog
- ewarn
- ewarn "If you upgraded from scim-1.2.x or scim-1.0.x, you should remerge all SCIM modules."
- ewarn
-
- gnome2_query_immodules_gtk2
-}
-
-pkg_postrm() {
- gnome2_query_immodules_gtk2
-}
diff --git a/app-i18n/uim/Manifest b/app-i18n/uim/Manifest
index 0e626d08dace..593def9c836a 100644
--- a/app-i18n/uim/Manifest
+++ b/app-i18n/uim/Manifest
@@ -1,2 +1 @@
-DIST uim-1.8.6.tar.bz2 6500739 BLAKE2B 78623c015cafafa1fbaf32542535de1f0207f8452a422d929a15f4421e4c9926192d0d3b761a7865a38affdf616dc5477e083c0fd8655261ff80ca817fd37029 SHA512 26a95d3b51ef7a99108234b9af30ee7b74141cb3af13d092d4cdbf0749f630934cfd67f74b09dacc3adcdce4a390104489d68a4e2419ec07418645a9b4e5715b
DIST uim-1.8.8.tar.bz2 6228743 BLAKE2B 8fc44b61239f766ba3d9ebf3201c11471b3a844e082237f5ec97dd0fa6fbb04a0a588df5c0479a0aa4bcb4d9c4edcc93c36ec68618701c8aa88fa30732fdce28 SHA512 2257ae48f4f2b79039a5f6be0fc740e218d5609e004dad9a5a1aa5d4066587ee59d0be06bc23c7d567a48901466227fedc4778b480f7184d84b0b3b4dddac9a3
diff --git a/app-i18n/uim/files/uim-1.8.6-gentoo.patch b/app-i18n/uim/files/uim-1.8.6-gentoo.patch
deleted file mode 100644
index 0feee5a70997..000000000000
--- a/app-i18n/uim/files/uim-1.8.6-gentoo.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -36,6 +36,7 @@
- AC_PATH_PROGS(SHA1, sha1 sha1sum)
- AC_PATH_PROGS(SED, sed gsed)
- AX_PATH_QMAKE4
-+PKG_PROG_PKG_CONFIG
-
- AM_MAINTAINER_MODE
-
-@@ -1792,7 +1793,7 @@
- fi
- AX_LANG_WNOERROR # end AC_LANG_WERROR
-
-- QT_CONFIG_OPTS="debug"
-+ QT_CONFIG_OPTS="debug nostrip"
- else
- CFLAGS="$CFLAGS -DNDEBUG"
- CXXFLAGS="$CXXFLAGS -DNDEBUG"
-@@ -1810,7 +1811,7 @@
- AX_CFLAGS_GCC_OPTION([-Wno-unused-variable], [SCIM_CFLAGS])
- AX_LANG_WNOERROR # end AC_LANG_WERROR
-
-- QT_CONFIG_OPTS="release"
-+ QT_CONFIG_OPTS="release nostrip"
- fi
-
- AC_ARG_ENABLE(warnings-into-error,
diff --git a/app-i18n/uim/files/uim-1.8.6-libressl.patch b/app-i18n/uim/files/uim-1.8.6-libressl.patch
deleted file mode 100644
index b14de58433aa..000000000000
--- a/app-i18n/uim/files/uim-1.8.6-libressl.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-From 7a281b1131399f04627986e6f9a54499b08e239d Mon Sep 17 00:00:00 2001
-From: Felix Janda
-Date: Thu, 21 Apr 2016 23:12:10 +0200
-Subject: [PATCH] Make openssl SSLv2 and SSLv3 support optional
-
-Fixes compilation with libressl
----
- uim/openssl.c | 30 ++++++++++++++++++++++++++++++
- 1 file changed, 30 insertions(+)
-
-diff --git a/uim/openssl.c b/uim/openssl.c
-index ba1b238..35ca1ca 100644
---- a/uim/openssl.c
-+++ b/uim/openssl.c
-@@ -208,34 +208,64 @@ c_SSL_write(uim_lisp s_, uim_lisp buf_)
- static uim_lisp
- c_SSLv2_method(void)
- {
-+#ifndef OPENSSL_NO_SSL2
- return MAKE_PTR(SSLv2_method());
-+#else
-+ uim_notify_fatal(N_("uim-openssl: SSLv2_method() is not supported on this system"));
-+ return uim_scm_f();
-+#endif
- }
- static uim_lisp
- c_SSLv2_server_method(void)
- {
-+#ifndef OPENSSL_NO_SSL2
- return MAKE_PTR(SSLv2_server_method());
-+#else
-+ uim_notify_fatal(N_("uim-openssl: SSLv2_server_method() is not supported on this system"));
-+ return uim_scm_f();
-+#endif
- }
- static uim_lisp
- c_SSLv2_client_method(void)
- {
-+#ifndef OPENSSL_NO_SSL2
- return MAKE_PTR(SSLv2_client_method());
-+#else
-+ uim_notify_fatal(N_("uim-openssl: SSLv2_client_method() is not supported on this system"));
-+ return uim_scm_f();
-+#endif
- }
-
- /* SSLv3 */
- static uim_lisp
- c_SSLv3_method(void)
- {
-+#ifndef OPENSSL_NO_SSL3
- return MAKE_PTR(SSLv3_method());
-+#else
-+ uim_notify_fatal(N_("uim-openssl: SSLv3_method() is not supported on this system"));
-+ return uim_scm_f();
-+#endif
- }
- static uim_lisp
- c_SSLv3_server_method(void)
- {
-+#ifndef OPENSSL_NO_SSL3
- return MAKE_PTR(SSLv3_server_method());
-+#else
-+ uim_notify_fatal(N_("uim-openssl: SSLv3_server_method() is not supported on this system"));
-+ return uim_scm_f();
-+#endif
- }
- static uim_lisp
- c_SSLv3_client_method(void)
- {
-+#ifndef OPENSSL_NO_SSL3
- return MAKE_PTR(SSLv3_client_method());
-+#else
-+ uim_notify_fatal(N_("uim-openssl: SSLv3_client_method() is not supported on this system"));
-+ return uim_scm_f();
-+#endif
- }
-
- /* SSLv3 but can rollback to v2 */
diff --git a/app-i18n/uim/files/uim-1.8.6-qt.patch b/app-i18n/uim/files/uim-1.8.6-qt.patch
deleted file mode 100644
index 6c0cb7eee667..000000000000
--- a/app-i18n/uim/files/uim-1.8.6-qt.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- a/m4/ax_path_qmake4.m4
-+++ b/m4/ax_path_qmake4.m4
-@@ -23,10 +23,10 @@
- # the copyright notice and this notice are preserved.
-
- AC_DEFUN([AX_PATH_QMAKE4], [
-- ax_guessed_qt4_dirs="/usr/lib/qt4/bin:/usr/local/lib/qt4/bin:/usr/qt4/bin:/usr/local/qt4/bin:${QT4DIR}/bin:${QTDIR}/bin"
-+ ax_guessed_qt4_dirs="${QT4DIR}/bin:${QTDIR}/bin"
- AC_PROG_EGREP
-- AC_PATH_PROGS(_QMAKE4, [qmake-qt4 qmake4], [], ["$PATH:$ax_guessed_qt4_dirs"])
-- AC_PATH_PROGS(_QMAKE, [qmake], [], ["$PATH:$ax_guessed_qt4_dirs"])
-+ AC_PATH_PROGS(_QMAKE4, [qmake-qt4 qmake4], [], ["$ax_guessed_qt4_dirs:$PATH"])
-+ AC_PATH_PROGS(_QMAKE, [qmake], [], ["$ax_guessed_qt4_dirs:$PATH"])
-
- AC_CACHE_CHECK([for Qt4 version of qmake], ax_cv_path_QMAKE4, [
- ax_cv_path_QMAKE4=no
diff --git a/app-i18n/uim/files/uim-1.8.6-tinfo.patch b/app-i18n/uim/files/uim-1.8.6-tinfo.patch
deleted file mode 100644
index 51105c909f54..000000000000
--- a/app-i18n/uim/files/uim-1.8.6-tinfo.patch
+++ /dev/null
@@ -1,65 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -1058,27 +1058,25 @@
- ;;
- yes|*)
- use_uim_fep="yes"
-- AC_CHECK_LIB(curses, setupterm, FEP_LIBADD="-lcurses $FEP_LIBADD",
-- [AC_CHECK_LIB(ncurses, setupterm, FEP_LIBADD="-lncurses $FEP_LIBADD",
-- AC_MSG_WARN([fep needs setupterm in libcurses or libncurses. disabled...]);use_uim_fep="no")])
-- AC_CHECK_FUNCS(forkpty)
-- if test $ac_cv_func_forkpty = no; then
-- AC_CHECK_LIB(util, forkpty, [AC_DEFINE(HAVE_FORKPTY) FEP_LIBADD="-lutil $FEP_LIBADD"])
-- fi
-- AC_SUBST(FEP_LIBADD)
- ;;
- esac
- ],
-- [ use_uim_fep="yes"
-- AC_CHECK_LIB(curses, setupterm, FEP_LIBADD="-lcurses $FEP_LIBADD",
-- [AC_CHECK_LIB(ncurses, setupterm, FEP_LIBADD="-lncurses $FEP_LIBADD",
-- AC_MSG_WARN([fep needs setupterm in libcurses or libncurses. disabled...]);use_uim_fep="no")])
-- AC_CHECK_FUNCS(forkpty)
-- if test $ac_cv_func_forkpty = no; then
-- AC_CHECK_LIB(util, forkpty, [AC_DEFINE(HAVE_FORKPTY) FEP_LIBADD="-lutil $FEP_LIBADD"])
-- fi
-- AC_SUBST(FEP_LIBADD)
-- ])
-+ [use_uim_fep="yes"])
-+
-+if test "x$use_uim_fep" != "xno"; then
-+ PKG_CHECK_MODULES(CURSES, ncurses,
-+ [FEP_LIBADD="$CURSES_LIBS $FEP_LIBADD"],
-+ [
-+ AC_CHECK_LIB(curses, setupterm, FEP_LIBADD="-lcurses $FEP_LIBADD",
-+ [AC_CHECK_LIB(ncurses, setupterm, FEP_LIBADD="-lncurses $FEP_LIBADD",
-+ AC_MSG_WARN([fep needs setupterm in libcurses or libncurses. disabled...]);use_uim_fep="no")])
-+ ])
-+ AC_CHECK_FUNCS(forkpty)
-+ if test $ac_cv_func_forkpty = no; then
-+ AC_CHECK_LIB(util, forkpty, [AC_DEFINE(HAVE_FORKPTY) FEP_LIBADD="-lutil $FEP_LIBADD"])
-+ fi
-+ AC_SUBST(FEP_LIBADD)
-+fi
-
- AC_ARG_ENABLE(emacs,
- AC_HELP_STRING([--disable-emacs],
-@@ -1210,10 +1208,14 @@
- saved_LDFLAGS=$LDFLAGS
- CPPFLAGS="${CPPFLAGS} -I$libedit_path/include"
- LDFLAGS="${LDFLAGS} -L$libedit_path/lib"
-- AC_CHECK_LIB(curses, tgetent, LIBEDIT_LIBS="-lcurses",
-- [AC_CHECK_LIB(ncurses, tgetent, LIBEDIT_LIBS="-lncurses",
-- AC_MSG_WARN("libedit needs libcurses or libncurses. disabled...")
-- use_libedit="no")])
-+ PKG_CHECK_MODULES(CURSES, ncurses,
-+ [LIBEDIT_LIBS="$CURSES_LIBS"],
-+ [
-+ AC_CHECK_LIB(curses, tgetent, LIBEDIT_LIBS="-lcurses",
-+ [AC_CHECK_LIB(ncurses, tgetent, LIBEDIT_LIBS="-lncurses",
-+ AC_MSG_WARN("libedit needs libcurses or libncurses. disabled...")
-+ use_libedit="no")])
-+ ])
- if test "x$use_libedit" != "xno"; then
- AC_CHECK_LIB(edit, el_init,
- [LIBEDIT_LIBS="-ledit $LIBEDIT_LIBS -L$libedit_path/lib"
diff --git a/app-i18n/uim/uim-1.8.6-r1.ebuild b/app-i18n/uim/uim-1.8.6-r1.ebuild
deleted file mode 100644
index 5b032d6a9eab..000000000000
--- a/app-i18n/uim/uim-1.8.6-r1.ebuild
+++ /dev/null
@@ -1,209 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit autotools elisp-common gnome2-utils qmake-utils
-
-DESCRIPTION="A multilingual input method framework"
-HOMEPAGE="https://github.com/uim/uim"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.bz2"
-
-LICENSE="BSD GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ppc ppc64 x86"
-IUSE="X +anthy canna curl eb emacs expat libffi gtk gtk2 l10n_ja l10n_ko l10n_zh-CN l10n_zh-TW libedit libnotify m17n-lib ncurses nls skk sqlite ssl static-libs xft"
-RESTRICT="test"
-REQUIRED_USE="gtk? ( X )
- gtk2? ( X )
- xft? ( X )"
-
-CDEPEND="!dev-scheme/sigscheme
- X? (
- x11-libs/libICE
- x11-libs/libSM
- x11-libs/libX11
- x11-libs/libXext
- x11-libs/libXft
- x11-libs/libXrender
- x11-libs/libXt
- )
- anthy? ( app-i18n/anthy )
- canna? ( app-i18n/canna )
- curl? ( net-misc/curl )
- eb? ( dev-libs/eb )
- emacs? ( >=app-editors/emacs-23.1:* )
- expat? ( dev-libs/expat )
- libffi? ( virtual/libffi )
- gtk? ( x11-libs/gtk+:3 )
- gtk2? ( x11-libs/gtk+:2 )
- libedit? ( dev-libs/libedit )
- libnotify? ( x11-libs/libnotify )
- m17n-lib? ( dev-libs/m17n-lib )
- ncurses? ( sys-libs/ncurses:0= )
- nls? ( virtual/libintl )
- skk? ( app-i18n/skk-jisyo )
- sqlite? ( dev-db/sqlite:3 )
- ssl? ( dev-libs/openssl:0 )"
-DEPEND="${CDEPEND}
- dev-util/intltool
- sys-devel/gettext
- virtual/pkgconfig
- X? ( x11-base/xorg-proto )"
-RDEPEND="${CDEPEND}
- X? (
- media-fonts/font-sony-misc
- l10n_ja? (
- || (
- media-fonts/font-jis-misc
- media-fonts/intlfonts
- )
- )
- l10n_ko? (
- || (
- media-fonts/font-daewoo-misc
- media-fonts/intlfonts
- )
- )
- l10n_zh-CN? (
- || (
- media-fonts/font-isas-misc
- media-fonts/intlfonts
- )
- )
- l10n_zh-TW? ( media-fonts/intlfonts )
- )"
-
-PATCHES=(
- "${FILESDIR}"/${P}-gentoo.patch
- "${FILESDIR}"/${P}-qt.patch
- "${FILESDIR}"/${P}-tinfo.patch
- "${FILESDIR}"/${PN}-zh-TW.patch
-)
-DOCS=( AUTHORS NEWS README RELNOTE )
-
-AT_NO_RECURSIVE="yes"
-SITEFILE="50${PN}-gentoo.el"
-
-src_prepare() {
- default
- sed -i "s:\$libedit_path/lib:/$(get_libdir):g" configure.ac
-
- eautoreconf
-}
-
-src_configure() {
- local myconf=(
- $(use_with X x)
- $(use_with anthy anthy-utf8)
- $(use_with canna)
- $(use_with curl)
- $(use_with eb)
- $(use_enable emacs)
- $(use_with emacs lispdir "${SITELISP}")
- $(use_with expat)
- $(use_with libedit)
- $(use_with libffi ffi)
- $(use_with gtk gtk3)
- $(use_with gtk2)
- $(use_with m17n-lib m17nlib)
- $(use_enable ncurses fep)
- $(use_enable nls)
- --without-qt4
- --without-qt4-immodule
- --disable-qt4-qt3support
- $(use_with skk)
- $(use_with sqlite sqlite3)
- $(use_enable ssl openssl)
- $(use_enable static-libs static)
- $(use_with xft)
- --without-anthy
- --enable-default-toolkit=$(usex gtk gtk3 $(usex gtk2 gtk))
- --disable-gnome-applet
- --disable-gnome3-applet
- --disable-kde-applet
- --disable-kde4-applet
- --without-mana
- --without-prime
- )
-
- if (use gtk || use gtk2) && (use anthy || use canna); then
- myconf+=( --enable-dict )
- else
- myconf+=( --disable-dict )
- fi
-
- if use libnotify; then
- myconf+=( --enable-notify=libnotify )
- fi
-
- if use gtk || use gtk2; then
- myconf+=( --enable-pref )
- else
- myconf+=( --disable-pref )
- fi
-
- econf "${myconf[@]}"
-}
-
-src_compile() {
- default
-
- if use emacs; then
- cd emacs
- elisp-compile *.el || die
- fi
-}
-
-src_install() {
- # bug #222677
- emake -j1 DESTDIR="${D}" install
- einstalldocs
-
- find "${ED}"/usr/$(get_libdir)/${PN} -name '*.la' -delete || die
- use static-libs || find "${ED}" -name '*.la' -delete || die
-
- insinto /etc/X11/xinit/xinput.d
- sed \
- -e "s:@EPREFIX@:${EPREFIX}:g" \
- "${FILESDIR}"/xinput-${PN} > "${T}"/${PN}.conf
- doins "${T}"/${PN}.conf
-
- if use emacs; then
- elisp-install ${PN}-el emacs/*.el{,c}
- elisp-site-file-install "${FILESDIR}"/${SITEFILE} ${PN}-el
- fi
-}
-
-pkg_postinst() {
- elog "New input method switcher has been introduced. You need to set"
- elog
- elog "% GTK_IM_MODULE=uim ; export GTK_IM_MODULE"
- elog "% QT_IM_MODULE=uim ; export QT_IM_MODULE"
- elog "% XMODIFIERS=@im=uim ; export XMODIFIERS"
- elog
- elog "If you would like to use uim-anthy as default input method, put"
- elog "(define default-im-name 'anthy)"
- elog "to your ~/.uim."
- elog
- elog "All input methods can be found by running uim-im-switcher-gtk, "
- elog "uim-im-switcher-gtk3."
-
- if use emacs; then
- elisp-site-regen
- echo
- elog "uim is autoloaded with Emacs with a minimal set of features:"
- elog "There is no keybinding defined to call it directly, so please"
- elog "create one yourself and choose an input method."
- elog "Integration with LEIM is not done with this ebuild, please have"
- elog "a look at the documentation how to achieve this."
- fi
- use gtk && gnome2_query_immodules_gtk3
- use gtk2 && gnome2_query_immodules_gtk2
-}
-
-pkg_postrm() {
- use emacs && elisp-site-regen
- use gtk && gnome2_query_immodules_gtk3
- use gtk2 && gnome2_query_immodules_gtk2
-}
diff --git a/app-i18n/uim/uim-1.8.6-r2.ebuild b/app-i18n/uim/uim-1.8.6-r2.ebuild
deleted file mode 100644
index 153a4f272422..000000000000
--- a/app-i18n/uim/uim-1.8.6-r2.ebuild
+++ /dev/null
@@ -1,213 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit autotools elisp-common gnome2-utils qmake-utils
-
-DESCRIPTION="A multilingual input method framework"
-HOMEPAGE="https://github.com/uim/uim"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.bz2"
-
-LICENSE="BSD GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
-IUSE="X +anthy canna curl eb emacs expat libffi gtk gtk2 l10n_ja l10n_ko l10n_zh-CN l10n_zh-TW libedit libnotify libressl m17n-lib ncurses nls skk sqlite ssl static-libs xft"
-RESTRICT="test"
-REQUIRED_USE="gtk? ( X )
- gtk2? ( X )
- xft? ( X )"
-
-CDEPEND="!dev-scheme/sigscheme
- X? (
- x11-libs/libICE
- x11-libs/libSM
- x11-libs/libX11
- x11-libs/libXext
- x11-libs/libXft
- x11-libs/libXrender
- x11-libs/libXt
- )
- anthy? ( app-i18n/anthy )
- canna? ( app-i18n/canna )
- curl? ( net-misc/curl )
- eb? ( dev-libs/eb )
- emacs? ( >=app-editors/emacs-23.1:* )
- expat? ( dev-libs/expat )
- libffi? ( virtual/libffi )
- gtk? ( x11-libs/gtk+:3 )
- gtk2? ( x11-libs/gtk+:2 )
- libedit? ( dev-libs/libedit )
- libnotify? ( x11-libs/libnotify )
- m17n-lib? ( dev-libs/m17n-lib )
- ncurses? ( sys-libs/ncurses:0= )
- nls? ( virtual/libintl )
- skk? ( app-i18n/skk-jisyo )
- sqlite? ( dev-db/sqlite:3 )
- ssl? (
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:0= )
- )"
-DEPEND="${CDEPEND}
- dev-util/intltool
- sys-devel/gettext
- virtual/pkgconfig
- X? ( x11-base/xorg-proto )"
-RDEPEND="${CDEPEND}
- X? (
- media-fonts/font-sony-misc
- l10n_ja? (
- || (
- media-fonts/font-jis-misc
- media-fonts/intlfonts
- )
- )
- l10n_ko? (
- || (
- media-fonts/font-daewoo-misc
- media-fonts/intlfonts
- )
- )
- l10n_zh-CN? (
- || (
- media-fonts/font-isas-misc
- media-fonts/intlfonts
- )
- )
- l10n_zh-TW? ( media-fonts/intlfonts )
- )"
-
-PATCHES=(
- "${FILESDIR}"/${P}-gentoo.patch
- "${FILESDIR}"/${P}-libressl.patch
- "${FILESDIR}"/${P}-qt.patch
- "${FILESDIR}"/${P}-tinfo.patch
- "${FILESDIR}"/${PN}-zh-TW.patch
-)
-DOCS=( AUTHORS NEWS README RELNOTE )
-
-AT_NO_RECURSIVE="yes"
-SITEFILE="50${PN}-gentoo.el"
-
-src_prepare() {
- default
- sed -i "s:\$libedit_path/lib:/$(get_libdir):g" configure.ac
-
- eautoreconf
-}
-
-src_configure() {
- local myconf=(
- $(use_with X x)
- $(use_with anthy anthy-utf8)
- $(use_with canna)
- $(use_with curl)
- $(use_with eb)
- $(use_enable emacs)
- $(use_with emacs lispdir "${SITELISP}")
- $(use_with expat)
- $(use_with libedit)
- $(use_with libffi ffi)
- $(use_with gtk gtk3)
- $(use_with gtk2)
- $(use_with m17n-lib m17nlib)
- $(use_enable ncurses fep)
- $(use_enable nls)
- --without-qt4
- --without-qt4-immodule
- --disable-qt4-qt3support
- $(use_with skk)
- $(use_with sqlite sqlite3)
- $(use_enable ssl openssl)
- $(use_enable static-libs static)
- $(use_with xft)
- --without-anthy
- --enable-default-toolkit=$(usex gtk gtk3 $(usex gtk2 gtk))
- --disable-gnome-applet
- --disable-gnome3-applet
- --disable-kde-applet
- --disable-kde4-applet
- --without-mana
- --without-prime
- )
-
- if (use gtk || use gtk2) && (use anthy || use canna); then
- myconf+=( --enable-dict )
- else
- myconf+=( --disable-dict )
- fi
-
- if use libnotify; then
- myconf+=( --enable-notify=libnotify )
- fi
-
- if use gtk || use gtk2; then
- myconf+=( --enable-pref )
- else
- myconf+=( --disable-pref )
- fi
-
- econf "${myconf[@]}"
-}
-
-src_compile() {
- default
-
- if use emacs; then
- cd emacs
- elisp-compile *.el || die
- fi
-}
-
-src_install() {
- # bug #222677
- emake -j1 DESTDIR="${D}" install
- einstalldocs
-
- find "${ED}"/usr/$(get_libdir)/${PN} -name '*.la' -delete || die
- use static-libs || find "${ED}" -name '*.la' -delete || die
-
- insinto /etc/X11/xinit/xinput.d
- sed \
- -e "s:@EPREFIX@:${EPREFIX}:g" \
- "${FILESDIR}"/xinput-${PN} > "${T}"/${PN}.conf
- doins "${T}"/${PN}.conf
-
- if use emacs; then
- elisp-install ${PN}-el emacs/*.el{,c}
- elisp-site-file-install "${FILESDIR}"/${SITEFILE} ${PN}-el
- fi
-}
-
-pkg_postinst() {
- elog "New input method switcher has been introduced. You need to set"
- elog
- elog "% GTK_IM_MODULE=uim ; export GTK_IM_MODULE"
- elog "% QT_IM_MODULE=uim ; export QT_IM_MODULE"
- elog "% XMODIFIERS=@im=uim ; export XMODIFIERS"
- elog
- elog "If you would like to use uim-anthy as default input method, put"
- elog "(define default-im-name 'anthy)"
- elog "to your ~/.uim."
- elog
- elog "All input methods can be found by running uim-im-switcher-gtk, "
- elog "uim-im-switcher-gtk3."
-
- if use emacs; then
- elisp-site-regen
- echo
- elog "uim is autoloaded with Emacs with a minimal set of features:"
- elog "There is no keybinding defined to call it directly, so please"
- elog "create one yourself and choose an input method."
- elog "Integration with LEIM is not done with this ebuild, please have"
- elog "a look at the documentation how to achieve this."
- fi
- use gtk && gnome2_query_immodules_gtk3
- use gtk2 && gnome2_query_immodules_gtk2
-}
-
-pkg_postrm() {
- use emacs && elisp-site-regen
- use gtk && gnome2_query_immodules_gtk3
- use gtk2 && gnome2_query_immodules_gtk2
-}
diff --git a/app-shells/Manifest.gz b/app-shells/Manifest.gz
index 6c12aa8e52df..0fc416b721d3 100644
Binary files a/app-shells/Manifest.gz and b/app-shells/Manifest.gz differ
diff --git a/app-shells/loksh/Manifest b/app-shells/loksh/Manifest
index 5aec28d32822..db8eb720939d 100644
--- a/app-shells/loksh/Manifest
+++ b/app-shells/loksh/Manifest
@@ -1 +1,3 @@
DIST loksh-6.6.tar.gz 251931 BLAKE2B 8671b2a7b5f4d8247c8572a925a078a7bbf7e6f0ae11b9198798c66def35c5bdb5c3b39e5c37e0dcbc068a1757e6cdcb667088640c6c9a556c64a9a4c0582102 SHA512 7f5188b3f0af3167f1c5847043689a35f22d5075cee2ec4ce3ebd324a59233e89db1c864dc62a05ad036ddd541ee89c680fa82e22b85cd2c82ad32c5ebad51be
+DIST loksh-6.7.tar.gz 240036 BLAKE2B 6bbfb4784287405bbc06be36d2c0d8a46d68968be751cf29207089d1fffe444f4fd3deb7be381cce7f5a9e97666b9e62de0d28bc82807d700a351adb51e2294d SHA512 b2f7976697dd3c672c0540e21a1e3a541c7809f397fd539ed4eafc3314987cfec985076bcd9f49f5eed9148eecdb66337fc82233204062ae5c760a84beb79c53
+DIST lolibc-6.7.tar.gz 18265 BLAKE2B 7a7bbbb91924ad2e0a9a617c3ada6a075262c006f492276b1f9a4d2e82e2987344d9bd64bb4e018543dac154a1349dd9db16a1f0c76f66f63e1ce7d7cae49631 SHA512 f9e6d0ef88c44ed093fa7e9389f7995314d2c5583c27f68cf896c2feb7fb5b048764c8498c535a370e9d075c847345e8e3b883ce14b96897228d4957c95d37b8
diff --git a/app-shells/loksh/loksh-6.7.ebuild b/app-shells/loksh/loksh-6.7.ebuild
new file mode 100644
index 000000000000..bf63f3ecf32b
--- /dev/null
+++ b/app-shells/loksh/loksh-6.7.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson
+
+# https://github.com/dimkr/loksh/issues/16
+LOLIBC_COMMIT="f6bbd5bae97e58d0be6ea9fbbe5131853d5b0b70"
+
+DESCRIPTION="Linux port of OpenBSD's ksh"
+HOMEPAGE="https://github.com/dimkr/loksh"
+SRC_URI="https://github.com/dimkr/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+ https://github.com/dimkr/lolibc/archive/${LOLIBC_COMMIT}.tar.gz -> lolibc-${PV}.tar.gz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+DEPEND="sys-libs/ncurses:0="
+BDEPEND="virtual/pkgconfig"
+RDEPEND="${DEPEND}
+ !app-shells/ksh"
+
+src_prepare() {
+ default
+ rmdir "${S}/subprojects/lolibc" || die
+ mv -v "${WORKDIR}/lolibc-${LOLIBC_COMMIT}" "${S}/subprojects/lolibc" || die
+ sed -i "/install_dir/s@loksh@${PF}@" meson.build || die
+}
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 38e542be2523..5168afab2ca5 100644
Binary files a/app-text/Manifest.gz and b/app-text/Manifest.gz differ
diff --git a/app-text/calibre/Manifest b/app-text/calibre/Manifest
index c2605d44278a..5aeb0c1d1da9 100644
--- a/app-text/calibre/Manifest
+++ b/app-text/calibre/Manifest
@@ -2,4 +2,5 @@ DIST calibre-4.11.2.tar.xz 37045372 BLAKE2B 7d76d45afd9228d6346daefaf4ee7cbf4d32
DIST calibre-4.12.0.tar.xz 36823140 BLAKE2B b8dd24152b79790c8d22d3c0aa9482f69250fe177499e01c6c0564bf31946d0266a2e3053549f037c7ea7626b18a27798097bfbe0caf93f97585d4869c475ab9 SHA512 628308273b507ee2557cd089e5c7b77f8304c1728b9aadfe5493b22042bdcf2da4c07652a6432121b5dd432807bcda21fabb81c37e59f87d24ace52539f3244c
DIST calibre-4.15.0.tar.xz 37033864 BLAKE2B fbb8965f438b438e0274fd8fbd23b633fb39bf3d746b0d8d1947e54cb6a21e39346031be6723adc1ecb83b4145562ec8a1e36805b96bad00451c0afbccb8d570 SHA512 d06bebe672864b2270a76f097f353aa727a3918d1c87766c9dbad615a6225621bb12d4040c1001415d188b15f1b7c068e77fec7964f4bf26e83ad7f3609bcc04
DIST calibre-4.16.0.tar.xz 36964244 BLAKE2B e2c94ea882addff3a7def2b7d0bc286fc3bc499190469e9bfea99d710b4cdbb6b59ca2848ef5551d4375d22c582462962634c0329f0adca05dd6dc137dbea0ba SHA512 96803578c7b609cf146571df38cd9ab75c3fcc6e8b429d7083b4383974161193d544a22c249ad3934c621823a3b1d1bd52e564c6ef70fd4012aae40a1056715b
+DIST calibre-4.17.0.tar.xz 37027156 BLAKE2B e1e9fbbb93cc14af0790e400d79b433c774f17bb06d99161e27769217ab7eed5c2660ab8a3e09109bade91684a8f5a8b52795667833ddf454343e530109eea63 SHA512 95719c820839a8548c0734a7be105fa4124c3c070fdd79ceeef5fef7f9c81f89d5b2077a71df3cc6cd103c14b813cd0d42add1c75ec4883686a8596de36ef5d0
DIST calibre-4.9.1.tar.xz 37529656 BLAKE2B 5d703ca0c398b43cc26a54e0628d0fe938c6a5027a4fd0c9cac83944e5143eb08439bf79b2098182be7727eaa042748f17866788b02c7744178dce131f6b1d1e SHA512 bf06aa3cbc8d255934f3f7f3ce20b4798edf107ed9f822943d2b4ae7d95473842928ed79f8ba7571f7e0ebdc267c441916d543d5b7630aae5cb151bcc3184b71
diff --git a/app-text/calibre/calibre-4.17.0.ebuild b/app-text/calibre/calibre-4.17.0.ebuild
new file mode 100644
index 000000000000..0191479d6be6
--- /dev/null
+++ b/app-text/calibre/calibre-4.17.0.ebuild
@@ -0,0 +1,274 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_REQ_USE="sqlite,ssl"
+
+inherit bash-completion-r1 desktop toolchain-funcs python-single-r1 xdg-utils
+
+DESCRIPTION="Ebook management application"
+HOMEPAGE="https://calibre-ebook.com/"
+SRC_URI="https://download.calibre-ebook.com/${PV}/${P}.tar.xz"
+
+LICENSE="
+ GPL-3+
+ GPL-3
+ GPL-2+
+ GPL-2
+ GPL-1+
+ LGPL-3+
+ LGPL-2.1+
+ LGPL-2.1
+ BSD
+ MIT
+ Old-MIT
+ Apache-2.0
+ public-domain
+ || ( Artistic GPL-1+ )
+ CC-BY-3.0
+ OFL-1.1
+ PSF-2
+"
+KEYWORDS="~amd64 ~arm ~x86"
+SLOT="0"
+IUSE="ios +udisks"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+ >=app-text/hunspell-1.7:=
+ >=app-text/podofo-0.9.6_pre20171027:=
+ >=app-text/poppler-0.26.5[qt5]
+ >=dev-libs/chmlib-0.40:=
+ dev-libs/glib:2=
+ dev-libs/hyphen:=
+ >=dev-libs/icu-57.1:=
+ dev-libs/libinput:=
+ >=dev-libs/dbus-glib-0.106
+ >=sys-apps/dbus-1.10.8
+ $(python_gen_cond_dep '
+ >=dev-python/apsw-3.25.2_p1[${PYTHON_MULTI_USEDEP}]
+ dev-python/beautifulsoup:4[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/chardet-3.0.3[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/cssselect-0.7.1[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/css-parser-1.0.4[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/dbus-python-1.2.4[${PYTHON_MULTI_USEDEP}]
+ dev-python/dnspython[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/feedparser-5.2.1[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/html2text-2019.8.11[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/html5-parser-0.4.9[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/lxml-3.8.0[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/markdown-3.0.1[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/mechanize-0.3.5[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/msgpack-0.5.6[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/netifaces-0.10.5[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/pillow-3.2.0[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/psutil-4.3.0[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/pygments-2.3.1[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/python-dateutil-2.5.3[${PYTHON_MULTI_USEDEP}]
+ >=dev-python/PyQt5-5.12[gui,svg,widgets,network,printsupport,${PYTHON_MULTI_USEDEP}]
+ >=dev-python/PyQtWebEngine-5.12[${PYTHON_MULTI_USEDEP}]
+ dev-python/regex[${PYTHON_MULTI_USEDEP}]
+ dev-python/zeroconf[${PYTHON_MULTI_USEDEP}]
+ ')
+ dev-qt/qtcore:5=
+ dev-qt/qtdbus:5=
+ dev-qt/qtgui:5=
+ >=dev-qt/qtwebengine-5.12
+ dev-qt/qtwidgets:5=
+ dev-util/desktop-file-utils
+ dev-util/gtk-update-icon-cache
+ media-fonts/liberation-fonts
+ media-libs/fontconfig:=
+ >=media-libs/freetype-2:=
+ >=media-libs/libmtp-1.1.11:=
+ >=media-libs/libwmf-0.2.8
+ >=media-gfx/optipng-0.7.6
+ >=sys-libs/zlib-1.2.11:=
+ virtual/libusb:1=
+ x11-libs/libxkbcommon:=
+ x11-libs/libX11:=
+ x11-libs/libXext:=
+ x11-libs/libXrender:=
+ x11-misc/shared-mime-info
+ >=x11-misc/xdg-utils-1.0.2-r2
+ ios? (
+ >=app-pda/usbmuxd-1.0.8
+ >=app-pda/libimobiledevice-1.2.0
+ )
+ udisks? ( virtual/libudev )"
+RDEPEND="${COMMON_DEPEND}
+ udisks? ( sys-fs/udisks:2 )"
+DEPEND="${COMMON_DEPEND}
+ $(python_gen_cond_dep '
+ >=dev-python/setuptools-23.1.0[${PYTHON_MULTI_USEDEP}]
+ dev-python/sip[${PYTHON_MULTI_USEDEP}]
+ ')
+ >=virtual/podofo-build-0.9.6_pre20171027
+ virtual/pkgconfig"
+
+pkg_pretend() {
+ if [[ ${MERGE_TYPE} != binary ]] && tc-is-gcc && [[ $(gcc-major-version) -lt 6 ]]; then
+ eerror "Calibre cannot be built with this version of gcc."
+ eerror "You need at least gcc-6.0"
+ die "Your C compiler is too old for this package."
+ fi
+}
+
+src_prepare() {
+ # no_updates: do not annoy user with "new version is availible all the time
+ # disable_plugins: walking sec-hole, wait for upstream to use GHNS interface
+ eapply \
+ "${FILESDIR}/${PN}-2.9.0-no_updates_dialog.patch" \
+ "${FILESDIR}/${PN}-disable_plugins.patch"
+
+ eapply_user
+
+ # Fix outdated version constant.
+ #sed -e "s#\\(^numeric_version =\\).*#\\1 (${PV//./, })#" \
+ # -i src/calibre/constants.py || \
+ # die "sed failed to patch constants.py"
+
+ # Avoid sandbox violation in /usr/share/gnome/apps when linux.py
+ # calls xdg-* (bug #258938).
+ sed -e "s|'xdg-desktop-menu', 'install'|\\0, '--mode', 'user'|" \
+ -e "s|check_call(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \
+ -e "s|\\(CurrentDir(tdir)\\), \\\\\$|\\1:|" \
+ -e "s|, PreserveMIMEDefaults():|:|" \
+ -e "s|'xdg-icon-resource', 'install'|\\0, '--mode', 'user'|" \
+ -e "s|cmd\[2\]|cmd[4]|" \
+ -e "s|cc(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \
+ -e "s|'xdg-mime', 'install'|\\0, '--mode', 'user'|" \
+ -i src/calibre/linux.py || die "sed failed to patch linux.py"
+
+ # Disable unnecessary privilege dropping for bug #287067.
+ sed -e "s:if os.geteuid() == 0:if False and os.geteuid() == 0:" \
+ -i setup/install.py || die "sed failed to patch install.py"
+
+ sed -e "/^ self.check_call(\\[QMAKE\\] + qmc + \\[proname\\])$/a\
+\\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ self.check_call(['sed', \
+'-e', 's|^CFLAGS .*|\\\\\\\\0 ${CFLAGS}|', \
+'-e', 's|^CXXFLAGS .*|\\\\\\\\0 ${CXXFLAGS}|', \
+'-e', 's|^LFLAGS .*|\\\\\\\\0 ${LDFLAGS}|', \
+'-i', 'Makefile'])" \
+ -i setup/build.py || die "sed failed to patch build.py"
+}
+
+src_install() {
+ # calibre works with python 3, so remove the python 2 constraint
+ export CALIBRE_PY3_PORT=1
+
+ # Bypass kbuildsycoca and update-mime-database in order to
+ # avoid sandbox violations if xdg-mime tries to call them.
+ cat - > "${T}/kbuildsycoca" <<-EOF
+ #!${BASH}
+ echo $0 : $@
+ exit 0
+ EOF
+
+ cp "${T}"/{kbuildsycoca,update-mime-database} || die
+ chmod +x "${T}"/{kbuildsycoca,update-mime-database} || die
+
+ export QMAKE="${EPREFIX}/usr/$(get_libdir)/qt5/bin/qmake"
+
+ # Unset DISPLAY in order to prevent xdg-mime from triggering a sandbox
+ # violation with kbuildsycoca as in bug #287067, comment #13.
+ export -n DISPLAY
+
+ # Bug #352625 - Some LANGUAGE values can trigger the following ValueError:
+ # File "/usr/lib/python2.6/locale.py", line 486, in getdefaultlocale
+ # return _parse_localename(localename)
+ # File "/usr/lib/python2.6/locale.py", line 418, in _parse_localename
+ # raise ValueError, 'unknown locale: %s' % localename
+ #ValueError: unknown locale: 46
+ export -n LANG LANGUAGE ${!LC_*}
+ export LC_ALL=C.utf8 #709682
+
+ # Bug #295672 - Avoid sandbox violation in ~/.config by forcing
+ # variables to point to our fake temporary $HOME.
+ export HOME="${T}/fake_homedir"
+ export XDG_CONFIG_HOME="${HOME}/.config"
+ export XDG_DATA_HOME="${HOME}/.local/share"
+ export CALIBRE_CONFIG_DIRECTORY="${XDG_CONFIG_HOME}/calibre"
+ mkdir -p "${XDG_DATA_HOME}" "${CALIBRE_CONFIG_DIRECTORY}" || die
+
+ tc-export CC CXX
+ # Bug #334243 - respect LDFLAGS when building extensions
+ export OVERRIDE_CFLAGS="$CFLAGS" OVERRIDE_LDFLAGS="$LDFLAGS"
+ local libdir=$(get_libdir)
+ [[ -n $libdir ]] || die "get_libdir returned an empty string"
+
+ addpredict /dev/dri #665310
+
+ PATH=${T}:${PATH} PYTHONPATH=${S}/src${PYTHONPATH:+:}${PYTHONPATH} \
+ "${PYTHON}" setup.py install \
+ --root="${D}" \
+ --prefix="${EPREFIX}/usr" \
+ --libdir="${EPREFIX}/usr/${libdir}" \
+ --staging-root="${ED}/usr" \
+ --staging-libdir="${ED}/usr/${libdir}" || die
+
+ rm "${ED}/usr/share/applications/defaults.list" || die
+ find "${ED}"/usr/share -type d -empty -delete
+
+ cd "${ED}"/usr/share/calibre/fonts/liberation || die
+ local x
+ for x in * ; do
+ [[ -f ${EPREFIX}/usr/share/fonts/liberation-fonts/${x} ]] || continue
+ ln -sf "../../../fonts/liberation-fonts/${x}" "${x}" || die
+ done
+
+ einfo "Converting python shebangs"
+ python_fix_shebang --force "${ED}"
+
+ einfo "Compiling python modules"
+ python_optimize "${ED}"/usr/lib/calibre
+
+ newinitd "${FILESDIR}"/calibre-server-3.init calibre-server
+ newconfd "${FILESDIR}"/calibre-server-3.conf calibre-server
+
+ bashcomp_alias calibre \
+ lrfviewer \
+ calibre-debug \
+ ebook-meta \
+ calibre-server \
+ ebook-viewer \
+ ebook-polish \
+ fetch-ebook-metadata \
+ lrf2lrs \
+ ebook-convert \
+ ebook-edit \
+ calibre-smtp \
+ ebook-device
+
+}
+
+pkg_preinst() {
+ # Indentify stray directories from upstream's "Binary install"
+ # method (see bug 622728).
+ CALIBRE_LIB_DIR=/usr/$(get_libdir)/calibre
+ CALIBRE_LIB_CONTENT=$(for x in "${ED}${CALIBRE_LIB_DIR}"/*; do
+ printf -- "${x##*/} "; done) || die "Failed to list ${ED}${CALIBRE_LIB_DIR}"
+}
+
+pkg_postinst() {
+ [[ -n ${CALIBRE_LIB_DIR} ]] || die "CALIBRE_LIB_DIR is unset"
+ local x
+ for x in "${EROOT}${CALIBRE_LIB_DIR}"/*; do
+ if [[ " ${CALIBRE_LIB_CONTENT} " != *" ${x##*/} "* ]]; then
+ elog "Purging '${x}'"
+ rm -rf "${x}"
+ fi
+ done
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+ xdg_icon_cache_update
+}
+
+pkg_postrm() {
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+ xdg_icon_cache_update
+}
diff --git a/dev-ada/Manifest.gz b/dev-ada/Manifest.gz
index 74882fd35f53..5a30a1776b82 100644
Binary files a/dev-ada/Manifest.gz and b/dev-ada/Manifest.gz differ
diff --git a/dev-ada/aws/Manifest b/dev-ada/aws/Manifest
index 69aa2ed1947d..2c16f18538ff 100644
--- a/dev-ada/aws/Manifest
+++ b/dev-ada/aws/Manifest
@@ -1,2 +1,3 @@
DIST aws-2019-20190512-18AB9-src.tar.gz 4241817 BLAKE2B 1054c17c0e79ea4992a7e29fdb1996caa663321407b64ae88cb76cb03d953b7ea36a8c91a28f60328ea2ec3223c1d7f8c2f052f4f181f03b1f59cf33443ee27e SHA512 989043f75504ee8b3736800fa36f4d3a98a6bc745ff4bef38dd4f7c8a7072d5d1ea383dfd2fc090d8558a6d6442953e5f3c65e4633ab16bfb3dacf60ebf79a3b
+DIST aws-2020-20200429-19A9F-src.tar.gz 4120886 BLAKE2B 44156b532dd4382995e5b33eedbb39b4d4fa542f57f3a7d596875a25c1eb59c3e4cc0085cfc60f385566842f2b047086a66a966dc3b9dcd8f48ae7da0c07c01e SHA512 284331bcd07955737ebc6b95a0a72984ace55a1911f1ed809b0ba8e525b03df57a668ccd92d0edfde42be2e06c09a3225e84f5d0501a488a004eb3eeaa746a61
DIST aws-gpl-2018-src.tar.gz 4193276 BLAKE2B 31fa99fc3324f2514799a33cbd282f68a26d133da14ee2a70d3f5091c3670e82a7b77f9f941e593e914a755dd54d5a1e352d201a9dc097991b7bd50aa9f54b3b SHA512 62b85f70dd722148bbf3ad85bfd6cde2d0ab1d8029f673eb7ee42b0890c3dbf0f023c321e96eca99ccd2f0b235347ab577cfb558e7d81993d166683ec815dbe4
diff --git a/dev-ada/aws/aws-2020.ebuild b/dev-ada/aws/aws-2020.ebuild
new file mode 100644
index 000000000000..9efa0313e567
--- /dev/null
+++ b/dev-ada/aws/aws-2020.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ADA_COMPAT=( gnat_2019 )
+inherit ada multiprocessing
+
+MYP=${P}-20200429-19A9F-src
+
+DESCRIPTION="A complete Web development framework"
+HOMEPAGE="http://libre.adacore.com/tools/aws/"
+SRC_URI="https://community.download.adacore.com/v1/c1b0f6863d1a30acaee1df022a65ad11d5737a84?filename=${MYP}.tar.gz
+ -> ${MYP}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-ada/xmlada[${ADA_USEDEP},shared,static-libs]"
+DEPEND="${RDEPEND}
+ dev-ada/asis[${ADA_USEDEP}]
+ dev-ada/gprbuild[${ADA_USEDEP}]"
+
+REQUIRED_USE="${ADA_REQUIRED_USE}"
+
+S="${WORKDIR}"/${MYP}
+
+PATCHES=(
+ "${FILESDIR}"/${P}-gentoo.patch
+)
+
+src_configure() {
+ emake -j1 setup prefix=/usr ENABLE_SHARED=true \
+ GPRBUILD="/usr/bin/gprbuild -v"
+}
+
+src_compile() {
+ emake \
+ PROCESSORS=$(makeopts_jobs) \
+ GPRBUILD="/usr/bin/gprbuild -v"
+}
diff --git a/dev-ada/aws/files/aws-2020-gentoo.patch b/dev-ada/aws/files/aws-2020-gentoo.patch
new file mode 100644
index 000000000000..23f3dc38f1ee
--- /dev/null
+++ b/dev-ada/aws/files/aws-2020-gentoo.patch
@@ -0,0 +1,11 @@
+--- a/include/include.gpr 2017-02-17 22:09:14.361695926 +0100
++++ b/include/include.gpr 2017-02-17 22:11:36.497215517 +0100
+@@ -54,7 +54,7 @@
+
+ when "Release" =>
+ for Default_Switches ("Ada") use
+- ("-gnat2012", "-O2", "-gnatws", "-gnatn") & Shared.Global_Options;
++ ("-gnat2012", "-O2", "-gnatws", "-gnatn") & Shared.Adaflags & Shared.Global_Options;
+ end case;
+
+ case Shared.S_Target is
diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index 84c0bcaa140b..e72b37985ad2 100644
Binary files a/dev-cpp/Manifest.gz and b/dev-cpp/Manifest.gz differ
diff --git a/dev-cpp/cpp-taskflow/Manifest b/dev-cpp/cpp-taskflow/Manifest
new file mode 100644
index 000000000000..4c62f183ab25
--- /dev/null
+++ b/dev-cpp/cpp-taskflow/Manifest
@@ -0,0 +1 @@
+DIST cpp-taskflow-2.4.0.tar.gz 76993334 BLAKE2B 8f257165ab72dbe6c1cf6a86886669008e9f16f1dfd4871defc452bdb9dfa3e45ab9bfbbdc874b4ba566a2a7d8984a666ce2933b2c6d2215467f7fbfa03ac520 SHA512 dd6c7500e39d7058871280d12e120bd28d9609e5289f1d7851b3b59e2c1bfe74d3040d902bd5b26895e558b563c8abad878e7bc343e199e7356940c02a64217f
diff --git a/dev-cpp/cpp-taskflow/cpp-taskflow-2.4.0.ebuild b/dev-cpp/cpp-taskflow/cpp-taskflow-2.4.0.ebuild
new file mode 100644
index 000000000000..a41d26101436
--- /dev/null
+++ b/dev-cpp/cpp-taskflow/cpp-taskflow-2.4.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Modern C++ Parallel Task Programming"
+HOMEPAGE="https://cpp-taskflow.github.io"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+RDEPEND=""
+DEPEND=""
+
+HTML_DOCS=( docs/. )
+
+src_install() {
+ insinto /usr/include
+ doins -r taskflow
+
+ if $(use doc); then
+ einstalldocs
+ fi
+}
diff --git a/dev-cpp/cpp-taskflow/metadata.xml b/dev-cpp/cpp-taskflow/metadata.xml
new file mode 100644
index 000000000000..8406ef2081f1
--- /dev/null
+++ b/dev-cpp/cpp-taskflow/metadata.xml
@@ -0,0 +1,20 @@
+
+
+
+
+ tamiko@gentoo.org
+ Matthias Maier
+
+
+ sci@gentoo.org
+ Gentoo Science Project
+
+
+ Cpp-Taskflow is faster, more expressive, and easier for drop-in
+ integration than many of existing task programming frameworks in
+ handling complex parallel workloads.
+
+
+ cpp-taskflow/cpp-taskflow
+
+
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index 6e02f481d208..3445159da596 100644
Binary files a/dev-lang/Manifest.gz and b/dev-lang/Manifest.gz differ
diff --git a/dev-lang/ghc/ghc-7.10.3.ebuild b/dev-lang/ghc/ghc-7.10.3.ebuild
index 1b8e5de541d7..1112d5068ae6 100644
--- a/dev-lang/ghc/ghc-7.10.3.ebuild
+++ b/dev-lang/ghc/ghc-7.10.3.ebuild
@@ -555,7 +555,7 @@ src_configure() {
echo "utils/ghc-pkg_HC_OPTS += -DBOOTSTRAPPING" >> mk/build.mk
else
econf_args+=(--with-system-libffi)
- econf_args+=(--with-ffi-includes=$(pkg-config libffi --cflags-only-I | sed -e 's@^-I@@'))
+ econf_args+=(--with-ffi-includes=$($(tc-getPKG_CONFIG) libffi --cflags-only-I | sed -e 's@^-I@@'))
fi
elog "Final mk/build.mk:"
diff --git a/dev-lang/ghc/ghc-7.8.4.ebuild b/dev-lang/ghc/ghc-7.8.4.ebuild
index 09a0b30498d4..a8b740d67a78 100644
--- a/dev-lang/ghc/ghc-7.8.4.ebuild
+++ b/dev-lang/ghc/ghc-7.8.4.ebuild
@@ -466,7 +466,7 @@ src_configure() {
if ! use ghcmakebinary; then
econf_args+=(--with-system-libffi)
- econf_args+=(--with-ffi-includes=$(pkg-config libffi --cflags-only-I | sed -e 's@^-I@@'))
+ econf_args+=(--with-ffi-includes=$($(tc-getPKG_CONFIG) libffi --cflags-only-I | sed -e 's@^-I@@'))
fi
econf ${econf_args[@]} --enable-bootstrap-with-devel-snapshot
diff --git a/dev-lang/ghc/ghc-8.0.2.ebuild b/dev-lang/ghc/ghc-8.0.2.ebuild
index aceb46dd71e5..8003bfbdd7a9 100644
--- a/dev-lang/ghc/ghc-8.0.2.ebuild
+++ b/dev-lang/ghc/ghc-8.0.2.ebuild
@@ -551,7 +551,7 @@ src_configure() {
echo "utils/ghc-pkg_HC_OPTS += -DBOOTSTRAPPING" >> mk/build.mk
else
econf_args+=(--with-system-libffi)
- econf_args+=(--with-ffi-includes=$(pkg-config libffi --cflags-only-I | sed -e 's@^-I@@'))
+ econf_args+=(--with-ffi-includes=$($(tc-getPKG_CONFIG) libffi --cflags-only-I | sed -e 's@^-I@@'))
fi
elog "Final mk/build.mk:"
diff --git a/dev-lang/ghc/ghc-8.10.1.ebuild b/dev-lang/ghc/ghc-8.10.1.ebuild
index b9624ca1fcce..7845cce005cc 100644
--- a/dev-lang/ghc/ghc-8.10.1.ebuild
+++ b/dev-lang/ghc/ghc-8.10.1.ebuild
@@ -624,7 +624,7 @@ src_configure() {
# using ${GTARGET}'s libffi is not supported yet:
# GHC embeds full path for ffi includes without /usr/${CTARGET} account.
econf_args+=(--with-system-libffi)
- econf_args+=(--with-ffi-includes=$(pkg-config libffi --cflags-only-I | sed -e 's@^-I@@'))
+ econf_args+=(--with-ffi-includes=$($(tc-getPKG_CONFIG) libffi --cflags-only-I | sed -e 's@^-I@@'))
fi
einfo "Final mk/build.mk:"
diff --git a/dev-lang/ghc/ghc-8.2.1.ebuild b/dev-lang/ghc/ghc-8.2.1.ebuild
index c701609e940a..90df1309d8c9 100644
--- a/dev-lang/ghc/ghc-8.2.1.ebuild
+++ b/dev-lang/ghc/ghc-8.2.1.ebuild
@@ -615,7 +615,7 @@ src_configure() {
# using ${GTARGET}'s libffi is not supported yet:
# GHC embeds full path for ffi includes without /usr/${CTARGET} account.
econf_args+=(--with-system-libffi)
- econf_args+=(--with-ffi-includes=$(pkg-config libffi --cflags-only-I | sed -e 's@^-I@@'))
+ econf_args+=(--with-ffi-includes=$($(tc-getPKG_CONFIG) libffi --cflags-only-I | sed -e 's@^-I@@'))
fi
einfo "Final mk/build.mk:"
diff --git a/dev-lang/ghc/ghc-8.2.2.ebuild b/dev-lang/ghc/ghc-8.2.2.ebuild
index 7304fe4bcc2e..83918fa3f684 100644
--- a/dev-lang/ghc/ghc-8.2.2.ebuild
+++ b/dev-lang/ghc/ghc-8.2.2.ebuild
@@ -616,7 +616,7 @@ src_configure() {
# using ${GTARGET}'s libffi is not supported yet:
# GHC embeds full path for ffi includes without /usr/${CTARGET} account.
econf_args+=(--with-system-libffi)
- econf_args+=(--with-ffi-includes=$(pkg-config libffi --cflags-only-I | sed -e 's@^-I@@'))
+ econf_args+=(--with-ffi-includes=$($(tc-getPKG_CONFIG) libffi --cflags-only-I | sed -e 's@^-I@@'))
fi
einfo "Final mk/build.mk:"
diff --git a/dev-lang/ghc/ghc-8.4.1.ebuild b/dev-lang/ghc/ghc-8.4.1.ebuild
index bb77c83651a1..49cb782a2def 100644
--- a/dev-lang/ghc/ghc-8.4.1.ebuild
+++ b/dev-lang/ghc/ghc-8.4.1.ebuild
@@ -616,7 +616,7 @@ src_configure() {
# using ${GTARGET}'s libffi is not supported yet:
# GHC embeds full path for ffi includes without /usr/${CTARGET} account.
econf_args+=(--with-system-libffi)
- econf_args+=(--with-ffi-includes=$(pkg-config libffi --cflags-only-I | sed -e 's@^-I@@'))
+ econf_args+=(--with-ffi-includes=$($(tc-getPKG_CONFIG) libffi --cflags-only-I | sed -e 's@^-I@@'))
fi
einfo "Final mk/build.mk:"
diff --git a/dev-lang/ghc/ghc-8.4.2.ebuild b/dev-lang/ghc/ghc-8.4.2.ebuild
index 1560843584db..75e813607950 100644
--- a/dev-lang/ghc/ghc-8.4.2.ebuild
+++ b/dev-lang/ghc/ghc-8.4.2.ebuild
@@ -621,7 +621,7 @@ src_configure() {
# using ${GTARGET}'s libffi is not supported yet:
# GHC embeds full path for ffi includes without /usr/${CTARGET} account.
econf_args+=(--with-system-libffi)
- econf_args+=(--with-ffi-includes=$(pkg-config libffi --cflags-only-I | sed -e 's@^-I@@'))
+ econf_args+=(--with-ffi-includes=$($(tc-getPKG_CONFIG) libffi --cflags-only-I | sed -e 's@^-I@@'))
fi
einfo "Final mk/build.mk:"
diff --git a/dev-lang/ghc/ghc-8.4.3.ebuild b/dev-lang/ghc/ghc-8.4.3.ebuild
index 8d8af4264738..0c291814a785 100644
--- a/dev-lang/ghc/ghc-8.4.3.ebuild
+++ b/dev-lang/ghc/ghc-8.4.3.ebuild
@@ -620,7 +620,7 @@ src_configure() {
# using ${GTARGET}'s libffi is not supported yet:
# GHC embeds full path for ffi includes without /usr/${CTARGET} account.
econf_args+=(--with-system-libffi)
- econf_args+=(--with-ffi-includes=$(pkg-config libffi --cflags-only-I | sed -e 's@^-I@@'))
+ econf_args+=(--with-ffi-includes=$($(tc-getPKG_CONFIG) libffi --cflags-only-I | sed -e 's@^-I@@'))
fi
einfo "Final mk/build.mk:"
diff --git a/dev-lang/ghc/ghc-8.6.4.ebuild b/dev-lang/ghc/ghc-8.6.4.ebuild
index 2d192b4e58e0..5a1785491a98 100644
--- a/dev-lang/ghc/ghc-8.6.4.ebuild
+++ b/dev-lang/ghc/ghc-8.6.4.ebuild
@@ -626,7 +626,7 @@ src_configure() {
# using ${GTARGET}'s libffi is not supported yet:
# GHC embeds full path for ffi includes without /usr/${CTARGET} account.
econf_args+=(--with-system-libffi)
- econf_args+=(--with-ffi-includes=$(pkg-config libffi --cflags-only-I | sed -e 's@^-I@@'))
+ econf_args+=(--with-ffi-includes=$($(tc-getPKG_CONFIG) libffi --cflags-only-I | sed -e 's@^-I@@'))
fi
einfo "Final mk/build.mk:"
diff --git a/dev-lang/ghc/ghc-8.6.5.ebuild b/dev-lang/ghc/ghc-8.6.5.ebuild
index e95768813eac..afbbcaccf02c 100644
--- a/dev-lang/ghc/ghc-8.6.5.ebuild
+++ b/dev-lang/ghc/ghc-8.6.5.ebuild
@@ -632,7 +632,7 @@ src_configure() {
# using ${GTARGET}'s libffi is not supported yet:
# GHC embeds full path for ffi includes without /usr/${CTARGET} account.
econf_args+=(--with-system-libffi)
- econf_args+=(--with-ffi-includes=$(pkg-config libffi --cflags-only-I | sed -e 's@^-I@@'))
+ econf_args+=(--with-ffi-includes=$($(tc-getPKG_CONFIG) libffi --cflags-only-I | sed -e 's@^-I@@'))
fi
einfo "Final mk/build.mk:"
diff --git a/dev-lang/ghc/ghc-8.8.1.ebuild b/dev-lang/ghc/ghc-8.8.1.ebuild
index 8d13a22eea76..ca9d69ec96c3 100644
--- a/dev-lang/ghc/ghc-8.8.1.ebuild
+++ b/dev-lang/ghc/ghc-8.8.1.ebuild
@@ -635,7 +635,7 @@ src_configure() {
# using ${GTARGET}'s libffi is not supported yet:
# GHC embeds full path for ffi includes without /usr/${CTARGET} account.
econf_args+=(--with-system-libffi)
- econf_args+=(--with-ffi-includes=$(pkg-config libffi --cflags-only-I | sed -e 's@^-I@@'))
+ econf_args+=(--with-ffi-includes=$($(tc-getPKG_CONFIG) libffi --cflags-only-I | sed -e 's@^-I@@'))
fi
einfo "Final mk/build.mk:"
diff --git a/dev-lang/ghc/ghc-8.8.2.ebuild b/dev-lang/ghc/ghc-8.8.2.ebuild
index 4d206d287dd2..9abdb5cf2423 100644
--- a/dev-lang/ghc/ghc-8.8.2.ebuild
+++ b/dev-lang/ghc/ghc-8.8.2.ebuild
@@ -634,7 +634,7 @@ src_configure() {
# using ${GTARGET}'s libffi is not supported yet:
# GHC embeds full path for ffi includes without /usr/${CTARGET} account.
econf_args+=(--with-system-libffi)
- econf_args+=(--with-ffi-includes=$(pkg-config libffi --cflags-only-I | sed -e 's@^-I@@'))
+ econf_args+=(--with-ffi-includes=$($(tc-getPKG_CONFIG) libffi --cflags-only-I | sed -e 's@^-I@@'))
fi
einfo "Final mk/build.mk:"
diff --git a/dev-lang/ghc/ghc-8.8.3.ebuild b/dev-lang/ghc/ghc-8.8.3.ebuild
index 5d6e67ece459..169068559531 100644
--- a/dev-lang/ghc/ghc-8.8.3.ebuild
+++ b/dev-lang/ghc/ghc-8.8.3.ebuild
@@ -635,7 +635,7 @@ src_configure() {
# using ${GTARGET}'s libffi is not supported yet:
# GHC embeds full path for ffi includes without /usr/${CTARGET} account.
econf_args+=(--with-system-libffi)
- econf_args+=(--with-ffi-includes=$(pkg-config libffi --cflags-only-I | sed -e 's@^-I@@'))
+ econf_args+=(--with-ffi-includes=$($(tc-getPKG_CONFIG) libffi --cflags-only-I | sed -e 's@^-I@@'))
fi
einfo "Final mk/build.mk:"
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index d3b7eb146d91..c0174c92c4cc 100644
Binary files a/dev-libs/Manifest.gz and b/dev-libs/Manifest.gz differ
diff --git a/dev-libs/plasma-wayland-protocols/plasma-wayland-protocols-1.0.ebuild b/dev-libs/plasma-wayland-protocols/plasma-wayland-protocols-1.0.ebuild
index 84be3f2814c0..e4bd9fe14bd9 100644
--- a/dev-libs/plasma-wayland-protocols/plasma-wayland-protocols-1.0.ebuild
+++ b/dev-libs/plasma-wayland-protocols/plasma-wayland-protocols-1.0.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://invent.kde.org/libraries/plasma-wayland-protocols"
if [[ ${KDE_BUILD_TYPE} = release ]]; then
SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
- KEYWORDS="~amd64"
+ KEYWORDS="~amd64 ~ppc64"
fi
LICENSE="LGPL-2.1"
diff --git a/dev-perl/Chart-Math-Axis/Chart-Math-Axis-1.60.0-r3.ebuild b/dev-perl/Chart-Math-Axis/Chart-Math-Axis-1.60.0-r3.ebuild
new file mode 100644
index 000000000000..ddb74910ab11
--- /dev/null
+++ b/dev-perl/Chart-Math-Axis/Chart-Math-Axis-1.60.0-r3.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=ADAMK
+DIST_VERSION=1.06
+inherit perl-module
+
+DESCRIPTION="Implements an algorithm to find good values for chart axis"
+
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~mips ~ppc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ >=virtual/perl-Math-BigInt-1.700.0
+ >=dev-perl/Params-Util-0.150.0
+ >=virtual/perl-Storable-2.120.0
+"
+BDEPEND="${RDEPEND}
+ >=virtual/perl-ExtUtils-MakeMaker-6.420.0
+ test? (
+ >=virtual/perl-Test-Simple-0.420.0
+ )
+"
+PATCHES=(
+ "${FILESDIR}/${PN}-1.06-no-dot-inc.patch"
+)
diff --git a/dev-perl/Chart-Math-Axis/files/Chart-Math-Axis-1.06-no-dot-inc.patch b/dev-perl/Chart-Math-Axis/files/Chart-Math-Axis-1.06-no-dot-inc.patch
new file mode 100644
index 000000000000..2c52938ce7f5
--- /dev/null
+++ b/dev-perl/Chart-Math-Axis/files/Chart-Math-Axis-1.06-no-dot-inc.patch
@@ -0,0 +1,21 @@
+From 64874d89806ec13e6ae58a1b0720cf97dff92654 Mon Sep 17 00:00:00 2001
+From: Kent Fredric
+Date: Sat, 23 May 2020 07:48:07 +1200
+Subject: Include '.' in @INC on perl 5.26+
+
+---
+ Makefile.PL | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/Makefile.PL b/Makefile.PL
+index 54daf04..d6d71f3 100644
+--- a/Makefile.PL
++++ b/Makefile.PL
+@@ -1,3 +1,4 @@
++use lib '.';
+ use inc::Module::Install::DSL 1.00;
+
+ all_from lib/Chart/Math/Axis.pm
+--
+2.26.2
+
diff --git a/dev-perl/Class-Accessor-Chained/Class-Accessor-Chained-0.10.0-r2.ebuild b/dev-perl/Class-Accessor-Chained/Class-Accessor-Chained-0.10.0-r2.ebuild
new file mode 100644
index 000000000000..142aeaab2556
--- /dev/null
+++ b/dev-perl/Class-Accessor-Chained/Class-Accessor-Chained-0.10.0-r2.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=RCLAMP
+DIST_VERSION=0.01
+inherit perl-module
+
+DESCRIPTION="Perl module to make chained class accessors"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~ppc-aix ~x86-solaris"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-perl/Class-Accessor"
+DEPEND="dev-perl/Module-Build"
+BDEPEND="${RDEPEND}
+ dev-perl/Module-Build
+ test? (
+ virtual/perl-Test-Simple
+ )
+"
diff --git a/dev-perl/Class-Accessor-Grouped/Class-Accessor-Grouped-0.100.140.ebuild b/dev-perl/Class-Accessor-Grouped/Class-Accessor-Grouped-0.100.140.ebuild
new file mode 100644
index 000000000000..20116d378603
--- /dev/null
+++ b/dev-perl/Class-Accessor-Grouped/Class-Accessor-Grouped-0.100.140.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=HAARG
+DIST_VERSION=0.10014
+inherit perl-module
+
+DESCRIPTION="Lets you build groups of accessors"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~ppc-aix ~ppc-macos ~x86-solaris"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ virtual/perl-Carp
+ >=dev-perl/Module-Runtime-0.12.0
+ >=dev-perl/Class-XSAccessor-1.190.0
+ >=dev-perl/Sub-Name-0.50.0
+ virtual/perl-Scalar-List-Utils
+"
+DEPEND="${RDEPEND}
+ >=virtual/perl-ExtUtils-MakeMaker-6.590.0
+ test? (
+ >=dev-perl/Test-Exception-0.310.0
+ >=virtual/perl-Test-Simple-0.880.0
+ )
+"
diff --git a/dev-perl/Class-Accessor-Grouped/Manifest b/dev-perl/Class-Accessor-Grouped/Manifest
index 910f76874558..fef45a3c921b 100644
--- a/dev-perl/Class-Accessor-Grouped/Manifest
+++ b/dev-perl/Class-Accessor-Grouped/Manifest
@@ -1 +1,2 @@
DIST Class-Accessor-Grouped-0.10012.tar.gz 47830 BLAKE2B 2097b85d818d7e55a105193a76a7415b9b0b193bf7bd8a7bd70c47c7992197d832c41a4238c91b338e2af5f2707f9574136fe868f2233ed275b0a2ee821724b4 SHA512 195c4b1f9897b50753231ab6c893987a3e49e6283713175d612843651428c8cb2eb791a5385e25607a1db189861811efade33f94ef33c36cd41624e793ca20d1
+DIST Class-Accessor-Grouped-0.10014.tar.gz 28703 BLAKE2B 499b6b4a08a4fa1fc322f57a2d87d8f9572a87031b4d4a2b555a17d05a3523d3a2fa86c4fade5083c684f223e044eed7747e71b5074f88bfd820f19006f28f71 SHA512 d69fe27c3a12845bb4d0abe6c73d1a82eaf550821184f0945c3802e3932c7742e04c6f655e550386923c2a005e7f893f44ed950c56e6e80785b5a23e7b3c80b3
diff --git a/dev-perl/Class-Accessor-Lite/Class-Accessor-Lite-0.80.0-r1.ebuild b/dev-perl/Class-Accessor-Lite/Class-Accessor-Lite-0.80.0-r1.ebuild
new file mode 100644
index 000000000000..88d790529c84
--- /dev/null
+++ b/dev-perl/Class-Accessor-Lite/Class-Accessor-Lite-0.80.0-r1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=KAZUHO
+DIST_VERSION=0.08
+inherit perl-module
+
+DESCRIPTION="A minimalistic variant of Class::Accessor"
+# License note: perl X.y or later perl X
+# https://bugs.gentoo.org/718946#c5
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+BDEPEND=">=virtual/perl-ExtUtils-MakeMaker-6.360.0"
+PATCHES=(
+ "${FILESDIR}/${PN}-0.08-no-dot-inc.patch"
+)
diff --git a/dev-perl/Class-Accessor-Lite/files/Class-Accessor-Lite-0.08-no-dot-inc.patch b/dev-perl/Class-Accessor-Lite/files/Class-Accessor-Lite-0.08-no-dot-inc.patch
new file mode 100644
index 000000000000..d724a7872b00
--- /dev/null
+++ b/dev-perl/Class-Accessor-Lite/files/Class-Accessor-Lite-0.08-no-dot-inc.patch
@@ -0,0 +1,22 @@
+From 8623694ee180732cbcc1e8dcc9225da850d91b24 Mon Sep 17 00:00:00 2001
+From: Kent Fredric
+Date: Sat, 23 May 2020 21:19:49 +1200
+Subject: Include '.' in @INC on perl 5.26+
+
+---
+ Makefile.PL | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/Makefile.PL b/Makefile.PL
+index cdc11bb..08b392f 100644
+--- a/Makefile.PL
++++ b/Makefile.PL
+@@ -1,4 +1,5 @@
+ use strict;
++use lib '.';
+ use inc::Module::Install;
+
+ name('Class-Accessor-Lite');
+--
+2.26.2
+
diff --git a/dev-perl/Class-Accessor/Class-Accessor-0.500.0.ebuild b/dev-perl/Class-Accessor/Class-Accessor-0.500.0.ebuild
new file mode 100644
index 000000000000..79031890270b
--- /dev/null
+++ b/dev-perl/Class-Accessor/Class-Accessor-0.500.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DIST_AUTHOR=KASEI
+DIST_VERSION=0.50
+DIST_EXAMPLES=("examples/*")
+inherit perl-module
+
+DESCRIPTION="Automated accessor generation"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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/Sub-Name"
+BDEPEND="${RDEPEND}
+ virtual/perl-ExtUtils-MakeMaker
+ test? (
+ virtual/perl-Test-Simple
+ )
+"
diff --git a/dev-perl/Class-Accessor/Class-Accessor-0.510.0.ebuild b/dev-perl/Class-Accessor/Class-Accessor-0.510.0.ebuild
new file mode 100644
index 000000000000..787f12a753b0
--- /dev/null
+++ b/dev-perl/Class-Accessor/Class-Accessor-0.510.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DIST_AUTHOR=KASEI
+DIST_VERSION=0.51
+DIST_EXAMPLES=("examples/*")
+inherit perl-module
+
+DESCRIPTION="Automated accessor generation"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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/Sub-Name"
+BDEPEND="${RDEPEND}
+ virtual/perl-ExtUtils-MakeMaker
+ test? (
+ virtual/perl-Test-Simple
+ )
+"
diff --git a/dev-perl/Class-Accessor/Manifest b/dev-perl/Class-Accessor/Manifest
index 97332b5c3cb8..3c67abb0ab0c 100644
--- a/dev-perl/Class-Accessor/Manifest
+++ b/dev-perl/Class-Accessor/Manifest
@@ -1 +1,3 @@
DIST Class-Accessor-0.34.tar.gz 12315 BLAKE2B 8dfc65c7b9f7d63112b6991b0ac3c8c93146fac2f800425ba88281f70ab9c5f27a00f7c2f0eca9cc92dd5391dabc24f7fd3d987075d421e26f1fe5dee77218f8 SHA512 a2978e5b8a7b080ef85e2b2499ee7263c9b5b8a70effc00a04e18fe92694fd59331b50b8162d3b8a6cb48ebedccca3b4780ec0984e6b8728b130a49781e35ee4
+DIST Class-Accessor-0.50.tar.gz 12998 BLAKE2B 067920502bbad3e941d4b70ed325b46821cd2817bc5b2f222693375c07f3c4deb2a69ff3ced59a5ed18abd7aa1f0dad5fb28d0c225a88db5a83abcf887db668a SHA512 e36520805fc5cf404c48bf252dd0cc3cb3298d472b31a8d4b6dde08316e93b9a45527df47ba8d848c29fe5dcfbbfb021eb8ed2565a56aec2896c1362b9ae05b8
+DIST Class-Accessor-0.51.tar.gz 13013 BLAKE2B 6797c0635aac3f0a9b8e1241b95d0286246da8169f2e41f478a69b5d154ce9ff3b1e21bcf94b75f987b14401fd7645428d4d303f4f78bb2c03554159f7de5a4e SHA512 be11acea4747c59e3e524c75d818e0391756cbc08eebff71dca280e737ce228209e76310649298e536e07db1c856d5a71dd64aefc55b49e33cfcb2b3439eab0b
diff --git a/dev-perl/Manifest.gz b/dev-perl/Manifest.gz
index 2d64f81cdfa4..d95e81cf0b4b 100644
Binary files a/dev-perl/Manifest.gz and b/dev-perl/Manifest.gz differ
diff --git a/dev-perl/Net-DNS-SEC/Manifest b/dev-perl/Net-DNS-SEC/Manifest
index 8382d4cfe697..d092dafadea9 100644
--- a/dev-perl/Net-DNS-SEC/Manifest
+++ b/dev-perl/Net-DNS-SEC/Manifest
@@ -1 +1,2 @@
DIST Net-DNS-SEC-1.03.tar.gz 35605 BLAKE2B 8d7ab450986b4cc4f7d31ae50f3efdeb56e6a437269ff6a54d5ece26a863405f12faf16e52aff2ba991d6e8320ed5b5cd3d07fdee20a5b3db7da4683e02c6243 SHA512 17d9f2125b9ed687791941ea777927daf8cfe4a6a379d02cda499fb01a71606b1c01154a3d4f2f2ffb70f5a658aaf02e64c8e5cc308de8c8e0cc543271ee7bce
+DIST Net-DNS-SEC-1.16.tar.gz 46603 BLAKE2B 3f248ebe62b21c68ba06b13a13bab2b8507df4cefd10f87de88191590b05b4ed48cc04b228a78768bf3ff907d319c38eeae46d3e407180eb9722f5eb5ccf2b24 SHA512 47eaaaabfc76666a4c7da89fd9eb189fa065c7e0b60f5c166420c76226a0df938e95e5abfa83e6a1a49b92593aee078883b1a170d39426c84fdef22a2fc50ef0
diff --git a/dev-perl/Net-DNS-SEC/Net-DNS-SEC-1.160.0.ebuild b/dev-perl/Net-DNS-SEC/Net-DNS-SEC-1.160.0.ebuild
new file mode 100644
index 000000000000..940973998048
--- /dev/null
+++ b/dev-perl/Net-DNS-SEC/Net-DNS-SEC-1.160.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=NLNETLABS
+DIST_VERSION=1.16
+inherit perl-module
+
+DESCRIPTION="DNSSEC extensions to Net::DNS"
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~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"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ >=virtual/perl-File-Spec-0.860.0
+ >=virtual/perl-MIME-Base64-2.110.0
+ >=dev-perl/Net-DNS-1.10.0
+"
+DEPEND="${RDEPEND}
+ virtual/perl-ExtUtils-MakeMaker
+ test? (
+ >=virtual/perl-Test-Simple-0.470.0
+ )
+"
+
+src_test() {
+ perl-module_src_test
+}
diff --git a/dev-perl/Net-DNS-SEC/metadata.xml b/dev-perl/Net-DNS-SEC/metadata.xml
index 6117d95ae0ac..70a3cced074f 100644
--- a/dev-perl/Net-DNS-SEC/metadata.xml
+++ b/dev-perl/Net-DNS-SEC/metadata.xml
@@ -9,8 +9,10 @@
Net-DNS-SEC
Net::DNS::SEC
Net::DNS::SEC::DSA
+ Net::DNS::SEC::Digest
Net::DNS::SEC::ECCGOST
Net::DNS::SEC::ECDSA
+ Net::DNS::SEC::EdDSA
Net::DNS::SEC::Keyset
Net::DNS::SEC::Private
Net::DNS::SEC::RSA
diff --git a/dev-perl/Net-DNS/Manifest b/dev-perl/Net-DNS/Manifest
index 1b78d9c06036..4be4b53676a2 100644
--- a/dev-perl/Net-DNS/Manifest
+++ b/dev-perl/Net-DNS/Manifest
@@ -1,2 +1,3 @@
DIST Net-DNS-1.10.tar.gz 261413 BLAKE2B 99dce8425b0ea2d541fa3a91e9d77ba819f31a3e4f8e53249391b06dadee61a43d60c4c0d72bd5e1b80c2b1d228da49937e7b073ce2201b0cb01b5bc83972418 SHA512 2184b0d35f7002d793b10238582ca80d9d1ee06543f10b287e7cb77e5234efc49865ea6b2a87184c45b002bba0b42ad3fd84ff8743f79e2841ccecb597b98962
DIST Net-DNS-1.13.tar.gz 251658 BLAKE2B 3ade04bea24455f6a4dc2d3a5b3dd40f19bd1638945d3622b40feb5bf0e6e6fddb5fe5636fce57d3b5ec270dee4c666aa5b4062113a25b7b483eeff93379678c SHA512 ac42d5b5d1849de11813404b9915f2b54cc4d44e2f6a52c8c5c714ae30bab594b2d27701957238c1dbb09544320822c25f19ff50ce33210c289379aa67400636
+DIST Net-DNS-1.23.tar.gz 257796 BLAKE2B 974ad41111af557e4c066403c93606ca924a900e8892f8dd275e4691beb672ab0dc7e0f3081ca134c39d562368ee1fbf8f174911f3dcca8f0fa3a2a1e44c736d SHA512 23c9df9e12340687d3399cbe7fb5f94dfa4ceae94be77227c42f0f707470ef90194ef64aa953ee36da5c2ba6a28d2bb4b59de04a9722ae3b0db6162916bde2b1
diff --git a/dev-perl/Net-DNS/Net-DNS-1.230.0.ebuild b/dev-perl/Net-DNS/Net-DNS-1.230.0.ebuild
new file mode 100644
index 000000000000..a1e78136037c
--- /dev/null
+++ b/dev-perl/Net-DNS/Net-DNS-1.230.0.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=NLNETLABS
+DIST_VERSION=1.23
+DIST_EXAMPLES=( "contrib" "demo" )
+inherit toolchain-funcs perl-module
+
+DESCRIPTION="Perl Interface to the Domain Name System"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~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"
+IUSE="test minimal"
+RESTRICT="!test? ( test )"
+
+PDEPEND="!minimal? ( >=dev-perl/Net-DNS-SEC-1.30.0 )"
+RDEPEND="
+ >=dev-perl/Digest-HMAC-1.30.0
+ >=virtual/perl-Digest-MD5-2.130.0
+ >=virtual/perl-Digest-SHA-5.230.0
+ >=virtual/perl-File-Spec-0.860.0
+ >=virtual/perl-MIME-Base64-2.130.0
+ >=virtual/perl-Time-Local-1.190.0
+ >=virtual/perl-IO-Socket-IP-0.380.0
+ >=virtual/perl-IO-1.050
+ !minimal? (
+ >=dev-perl/Digest-BubbleBabble-0.10.0
+ >=dev-perl/Net-LibIDN2-1.0.0
+ )
+"
+DEPEND="${RDEPEND}
+ virtual/perl-ExtUtils-MakeMaker
+ test? (
+ >=virtual/perl-Test-Simple-0.520.0
+ )
+"
+
+src_prepare() {
+ perl-module_src_prepare
+ mydoc="TODO"
+ # --IPv6-tests requires that you have external IPv6 connectivity
+ # as it connects to 2001:7b8:206:1:0:1234:be21:e31e
+ if ! use test || ! has network ${DIST_TEST_OVERRIDE:-${DIST_TEST:-do parallel}}; then
+ myconf="${myconf} --no-online-tests --no-IPv6-tests"
+ fi
+}
+
+src_compile() {
+ emake FULL_AR="$(tc-getAR)" OTHERLDFLAGS="${LDFLAGS}"
+}
+src_test() {
+ perl_rm_files t/00-pod.t
+ if ! has network ${DIST_TEST_OVERRIDE:-${DIST_TEST:-do parallel}}; then
+ elog "Network tests disabled without to DIST_TEST_OVERIDE=~network"
+ fi
+ perl-module_src_test
+}
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 7aa6fadc8635..43e7ec551bbe 100644
Binary files a/dev-python/Manifest.gz and b/dev-python/Manifest.gz differ
diff --git a/dev-python/elementpath/Manifest b/dev-python/elementpath/Manifest
index aa6726782329..cdbebaf677c7 100644
--- a/dev-python/elementpath/Manifest
+++ b/dev-python/elementpath/Manifest
@@ -1 +1,2 @@
DIST elementpath-1.4.4.tar.gz 119577 BLAKE2B 65724afc715dcdb4903779933559e85c833cc262cecf2f53a86fd58e542717dc26137270bde13b5bdfcd81bb768a2dd74d7ed7213ad4292c0a1a2a4771855370 SHA512 39ce9f8e8f0a75690d5ccf5faa7e28113f971015c2baeec8b8f443b568c71154589d36dc2c5a3965eeb1d3d4257f65090cf44078747c7711bc7fc8c9ad051d43
+DIST elementpath-1.4.5.tar.gz 120091 BLAKE2B c9ac74c4b76b3a3204364532831563c5600bdc159cfe5e853852c08de0c7abbaec952304120da4f13b14d2239880c9c1612ae8db3535cf4ad1d8ea8498cc3f1a SHA512 be3908056af67f892696edd31d1c836bbd7083a96eca1217d2dc972c5fc3bc583d89b825bed3fedeebd775d5fca53dd9b9a918ff9a3238bba54efe8ac0a51e21
diff --git a/dev-python/elementpath/elementpath-1.4.5.ebuild b/dev-python/elementpath/elementpath-1.4.5.ebuild
new file mode 100644
index 000000000000..fa02bf8a9d4a
--- /dev/null
+++ b/dev-python/elementpath/elementpath-1.4.5.ebuild
@@ -0,0 +1,27 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="XPath 1.0/2.0 parsers and selectors for ElementTree and lxml"
+HOMEPAGE="https://github.com/sissaschool/elementpath
+ https://pypi.org/project/elementpath/"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ test? (
+ dev-python/lxml[${PYTHON_USEDEP}]
+ dev-python/xmlschema[${PYTHON_USEDEP}]
+ )"
+
+distutils_enable_tests unittest
diff --git a/dev-python/fabric/Manifest b/dev-python/fabric/Manifest
deleted file mode 100644
index 299bad69b65a..000000000000
--- a/dev-python/fabric/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST fabric-2.3.1.tar.gz 148829 BLAKE2B 65df8856d7d7ae61ad045ee7710c1aa0517b3be63751380d349c27c4ca4667a9179ae4e7f14612d7fec71cf90de5c98d7c7867508e56717235703c688c54a4e2 SHA512 8341869004b9ec2ac4459245af30b06f8f693f696339ec08aa83a9d56069379390a89f6e04f66ea3f064436d9184de0435a8fb283db8ec5a815471684889dad9
diff --git a/dev-python/fabric/fabric-2.3.1.ebuild b/dev-python/fabric/fabric-2.3.1.ebuild
deleted file mode 100644
index 430bb1ca83dd..000000000000
--- a/dev-python/fabric/fabric-2.3.1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="A simple pythonic tool for remote execution and deployment"
-HOMEPAGE="https://www.fabfile.org https://pypi.org/project/fabric/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="doc fab2"
-# Depends on pytest-relaxed which is not in tree
-RESTRICT="test"
-
-RDEPEND="
- !fab2? ( !dev-python/fabric:0 )
- dev-python/cryptography[${PYTHON_USEDEP}]
- =dev-python/paramiko-2.4[${PYTHON_USEDEP}]"
-
-BDEPEND="
- dev-python/setuptools[${PYTHON_USEDEP}]
- doc? (
- dev-python/alabaster[${PYTHON_USEDEP}]
- dev-python/sphinx[${PYTHON_USEDEP}]
- )"
-
-python_compile() {
- if use fab2; then
- export PACKAGE_AS_FABRIC2=1
- ln -s fabric fabric2 || die "symlink create failed"
- fi
- distutils-r1_python_compile
-}
-
-python_compile_all() {
- if use doc; then
- sphinx-build -b html -c sites/docs/ sites/docs/ sites/docs/html \
- || die "building docs failed"
- fi
-}
-
-python_install_all() {
- use doc && local HTML_DOCS=( sites/docs/html/. )
- distutils-r1_python_install_all
-}
diff --git a/dev-python/fabric/metadata.xml b/dev-python/fabric/metadata.xml
deleted file mode 100644
index 275fb515bd8b..000000000000
--- a/dev-python/fabric/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
- python@gentoo.org
- Python
-
-
-
- Fabric
-
-
diff --git a/dev-python/geventhttpclient/Manifest b/dev-python/geventhttpclient/Manifest
index aca04622a7d2..f754b4a74af5 100644
--- a/dev-python/geventhttpclient/Manifest
+++ b/dev-python/geventhttpclient/Manifest
@@ -1 +1,2 @@
DIST geventhttpclient-1.3.1.tar.gz 82598 BLAKE2B 5fef20a74c431ed53be4eedb3ec7e040572ad960363d41dda8b93c8f08f3eb05ba6160676c1c3ed957d1528a12aa297400063377f3788754e9e76401bb3421ae SHA512 a50486e1485c449a821176f0aa139cb05a3c7675fb045086e086cc7bb71d6e1d75191fae6972b381e7e69dba89d23c387464503845badd29fa361e03aa866079
+DIST geventhttpclient-1.4.0.tar.gz 55844 BLAKE2B 2f025acdea114f513c395f58b585b282e89fca66efd778b3d10a6156e88576f3585cfd20fd84c5cf16798be461ddbfc16a0844074ebc1e96c99aab178852dfc4 SHA512 73adb1fbae7b47e1e89c2c589c58d0d22502a81b8e37596706d284f3ef44a67c7ce9c15a8fbbd375cbf6d80adc7a35727276976bad9686c622fec1380b9876e3
diff --git a/dev-python/geventhttpclient/files/geventhttpclient-1.4.0-dont-install-tests.patch b/dev-python/geventhttpclient/files/geventhttpclient-1.4.0-dont-install-tests.patch
new file mode 100644
index 000000000000..395628dc40f8
--- /dev/null
+++ b/dev-python/geventhttpclient/files/geventhttpclient-1.4.0-dont-install-tests.patch
@@ -0,0 +1,18 @@
+commit 6577190f64072c669c579c78225e23fe79edd90e
+Author: Louis Sautier
+Date: Fri May 22 23:36:38 2020 +0200
+
+ Do not install tests
+
+diff --git a/setup.py b/setup.py
+index 6e7a924..c896644 100644
+--- a/setup.py
++++ b/setup.py
+@@ -50,6 +50,7 @@ setup(name='geventhttpclient',
+ author="Antonin Amand",
+ author_email="antonin.amand@gmail.com",
+ packages=find_packages('src'),
++ exclude_package_data={'geventhttpclient': ['tests/*']},
+ license='LICENSE-MIT',
+ package_dir={'': 'src'},
+ ext_modules = [httpparser],
diff --git a/dev-python/geventhttpclient/geventhttpclient-1.4.0-r1.ebuild b/dev-python/geventhttpclient/geventhttpclient-1.4.0-r1.ebuild
new file mode 100644
index 000000000000..9f4094bf13b5
--- /dev/null
+++ b/dev-python/geventhttpclient/geventhttpclient-1.4.0-r1.ebuild
@@ -0,0 +1,54 @@
+# 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="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="~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}]
+ )
+"
+
+# Do not install tests
+# https://github.com/gwik/geventhttpclient/pull/126
+PATCHES=( "${FILESDIR}/${P}-dont-install-tests.patch" )
+
+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 dpkg
+ 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/invoke/Manifest b/dev-python/invoke/Manifest
deleted file mode 100644
index 52ecb530a240..000000000000
--- a/dev-python/invoke/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST invoke-1.1.1.tar.gz 311831 BLAKE2B 2918c1a03cccbd90be6aa495206a2714f45c9690d8ce1b063adc0cacfa4c7accd36dd94863a83e9cc0c05aaf889bd746c3f528fad5af0db9f64725438866f81a SHA512 2dabf88428a53f244cab45cbc073b3a91fea5dd97a7590a58701a32bfaa14a4afe5d6a2e4ff4ed03ae38e1dfecc5a7c0f811bb18313e0af1f4e116f56c5e9ba7
diff --git a/dev-python/invoke/invoke-1.1.1.ebuild b/dev-python/invoke/invoke-1.1.1.ebuild
deleted file mode 100644
index 76cf2bda89de..000000000000
--- a/dev-python/invoke/invoke-1.1.1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python{3_6,3_7} )
-inherit distutils-r1
-
-DESCRIPTION="Pythonic task execution"
-HOMEPAGE="https://pypi.org/project/invoke/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
-
-# Depends on broken pytest-relaxed plugin
-RESTRICT="test"
diff --git a/dev-python/invoke/metadata.xml b/dev-python/invoke/metadata.xml
deleted file mode 100644
index 04808fe9fc0a..000000000000
--- a/dev-python/invoke/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
- python@gentoo.org
- Python
-
-
- Invoke is a Python (2.7 and 3.4+) task execution tool and library,
- drawing inspiration from various sources to arrive at a powerful and clean feature set.
-
-
diff --git a/dev-python/potr/Manifest b/dev-python/potr/Manifest
deleted file mode 100644
index e237b6b0d80f..000000000000
--- a/dev-python/potr/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST python-potr-1.0.1.zip 30200 BLAKE2B 9dddad5cc902bcbdc5c674487e9f75d50dc711d9e2dcb24bc96abf6638628f22cd50ea2674efc2079e904668eef5cc92accce707811f922beb1453c1aa636a0c SHA512 d38f2fc68ce9f72ccee18923183f8640ee51f079da1e79e1f2f22e37383c99da7a6336a8538e28bd90b483fe8e227956ebc052e9c03aa6d7b49e9fc4e8df5281
diff --git a/dev-python/potr/metadata.xml b/dev-python/potr/metadata.xml
deleted file mode 100644
index 2f5540da1e6e..000000000000
--- a/dev-python/potr/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
- This is a pure Python OTR implementation; it does not bind to libotr.
-
-
- python-potr
- python-otr/pure-python-otr
-
-
diff --git a/dev-python/potr/potr-1.0.1.ebuild b/dev-python/potr/potr-1.0.1.ebuild
deleted file mode 100644
index af7c1eef0477..000000000000
--- a/dev-python/potr/potr-1.0.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MY_PN="python-${PN}"
-MY_P="${MY_PN}-${PV}"
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Pure Python OTR implementation"
-HOMEPAGE="https://github.com/python-otr/pure-python-otr"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.zip"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-CDEPEND=">=dev-python/pycrypto-2.1[${PYTHON_USEDEP}]"
-DEPEND="${CDEPEND}
- dev-python/setuptools[${PYTHON_USEDEP}]
- "
-RDEPEND="${CDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-python/pycrypto/Manifest b/dev-python/pycrypto/Manifest
deleted file mode 100644
index 785c20a83c47..000000000000
--- a/dev-python/pycrypto/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST pycrypto-2.6.1.tar.gz 446240 BLAKE2B 89c9cc5b8cbd446364bd56c170c2733b960ec269a6691085392b3cc0ebc2eb244721f6763ed72a1254f90bfaadee2cc1a8446865a95fca19ffb36700d89711a9 SHA512 20a4aed4dac4e9e61d773ebc1d48ea577e9870c33f396be53d075a9bf8487d93e75e200179882d81e452efd0f6751789bac434f6f431b3e7c1c8ef9dba392847
diff --git a/dev-python/pycrypto/files/pycrypto-2.6.1-CVE-2013-7459.patch b/dev-python/pycrypto/files/pycrypto-2.6.1-CVE-2013-7459.patch
deleted file mode 100644
index 9850f0340510..000000000000
--- a/dev-python/pycrypto/files/pycrypto-2.6.1-CVE-2013-7459.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-From 8dbe0dc3eea5c689d4f76b37b93fe216cf1f00d4 Mon Sep 17 00:00:00 2001
-From: Legrandin
-Date: Sun, 22 Dec 2013 22:24:46 +0100
-Subject: [PATCH] Throw exception when IV is used with ECB or CTR
-
-The IV parameter is currently ignored when initializing
-a cipher in ECB or CTR mode.
-
-For CTR mode, it is confusing: it takes some time to see
-that a different parameter is needed (the counter).
-
-For ECB mode, it is outright dangerous.
-
-This patch forces an exception to be raised.
----
- lib/Crypto/SelfTest/Cipher/common.py | 31 +++++++++++++++++++++++--------
- src/block_template.c | 11 +++++++++++
- 2 files changed, 34 insertions(+), 8 deletions(-)
-
-diff --git a/lib/Crypto/SelfTest/Cipher/common.py b/lib/Crypto/SelfTest/Cipher/common.py
-index 420b6ff..a5f8a88 100644
---- a/lib/Crypto/SelfTest/Cipher/common.py
-+++ b/lib/Crypto/SelfTest/Cipher/common.py
-@@ -239,19 +239,34 @@ def shortDescription(self):
- return """%s .decrypt() output of .encrypt() should not be garbled""" % (self.module_name,)
-
- def runTest(self):
-- for mode in (self.module.MODE_ECB, self.module.MODE_CBC, self.module.MODE_CFB, self.module.MODE_OFB, self.module.MODE_OPENPGP):
-+
-+ ## ECB mode
-+ mode = self.module.MODE_ECB
-+ encryption_cipher = self.module.new(a2b_hex(self.key), mode)
-+ ciphertext = encryption_cipher.encrypt(self.plaintext)
-+ decryption_cipher = self.module.new(a2b_hex(self.key), mode)
-+ decrypted_plaintext = decryption_cipher.decrypt(ciphertext)
-+ self.assertEqual(self.plaintext, decrypted_plaintext)
-+
-+ ## OPENPGP mode
-+ mode = self.module.MODE_OPENPGP
-+ encryption_cipher = self.module.new(a2b_hex(self.key), mode, self.iv)
-+ eiv_ciphertext = encryption_cipher.encrypt(self.plaintext)
-+ eiv = eiv_ciphertext[:self.module.block_size+2]
-+ ciphertext = eiv_ciphertext[self.module.block_size+2:]
-+ decryption_cipher = self.module.new(a2b_hex(self.key), mode, eiv)
-+ decrypted_plaintext = decryption_cipher.decrypt(ciphertext)
-+ self.assertEqual(self.plaintext, decrypted_plaintext)
-+
-+ ## All other non-AEAD modes (but CTR)
-+ for mode in (self.module.MODE_CBC, self.module.MODE_CFB, self.module.MODE_OFB):
- encryption_cipher = self.module.new(a2b_hex(self.key), mode, self.iv)
- ciphertext = encryption_cipher.encrypt(self.plaintext)
--
-- if mode != self.module.MODE_OPENPGP:
-- decryption_cipher = self.module.new(a2b_hex(self.key), mode, self.iv)
-- else:
-- eiv = ciphertext[:self.module.block_size+2]
-- ciphertext = ciphertext[self.module.block_size+2:]
-- decryption_cipher = self.module.new(a2b_hex(self.key), mode, eiv)
-+ decryption_cipher = self.module.new(a2b_hex(self.key), mode, self.iv)
- decrypted_plaintext = decryption_cipher.decrypt(ciphertext)
- self.assertEqual(self.plaintext, decrypted_plaintext)
-
-+
- class PGPTest(unittest.TestCase):
- def __init__(self, module, params):
- unittest.TestCase.__init__(self)
-diff --git a/src/block_template.c b/src/block_template.c
-index f940e0e..d555ceb 100644
---- a/src/block_template.c
-+++ b/src/block_template.c
-@@ -170,6 +170,17 @@ ALGnew(PyObject *self, PyObject *args, PyObject *kwdict)
- "Key cannot be the null string");
- return NULL;
- }
-+ if (IVlen != 0 && mode == MODE_ECB)
-+ {
-+ PyErr_Format(PyExc_ValueError, "ECB mode does not use IV");
-+ return NULL;
-+ }
-+ if (IVlen != 0 && mode == MODE_CTR)
-+ {
-+ PyErr_Format(PyExc_ValueError,
-+ "CTR mode needs counter parameter, not IV");
-+ return NULL;
-+ }
- if (IVlen != BLOCK_SIZE && mode != MODE_ECB && mode != MODE_CTR)
- {
- PyErr_Format(PyExc_ValueError,
diff --git a/dev-python/pycrypto/files/pycrypto-2.6.1-cross-compile.patch b/dev-python/pycrypto/files/pycrypto-2.6.1-cross-compile.patch
deleted file mode 100644
index 2ce24a49cc71..000000000000
--- a/dev-python/pycrypto/files/pycrypto-2.6.1-cross-compile.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-do not hardcode -I/usr/include as it's useless and breaks cross-compiles
-
---- a/setup.py
-+++ b/setup.py
-@@ -370,7 +370,7 @@ kw = {'name':"pycrypto",
- 'ext_modules': plat_ext + [
- # _fastmath (uses GNU mp library)
- Extension("Crypto.PublicKey._fastmath",
-- include_dirs=['src/','/usr/include/'],
-+ include_dirs=['src/'],
- libraries=['gmp'],
- sources=["src/_fastmath.c"]),
-
diff --git a/dev-python/pycrypto/metadata.xml b/dev-python/pycrypto/metadata.xml
deleted file mode 100644
index e14ce6691800..000000000000
--- a/dev-python/pycrypto/metadata.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-
-
-
-
- python@gentoo.org
- Python
-
-
- The Python Cryptography Toolkit is a collection of cryptographic
- algorithms and protocols, implemented for use from Python. Among
- the contents of the package:
-
- * Hash functions: MD2, MD4, RIPEMD, SHA256.
- * Block encryption algorithms: AES, ARC2, Blowfish, CAST, DES, Triple-DES, IDEA, RC5.
- * Stream encryption algorithms: ARC4, simple XOR.
- * Public-key algorithms: RSA, DSA, ElGamal, qNEW.
- * Protocols: All-or-nothing transforms, chaffing/winnowing.
- * Miscellaneous: RFC1751 module for converting 128-key keys into a set of English words, primality testing.
- * Some demo programs (currently all quite old and outdated).
-
-
- このPython言語のクリプトグラフィー・ツールキットは、暗号手法のアルゴリズムとプロ
- トコルの集合で、Python言語から利用されるための実装です。このパッケージ内容は以下
- です。
-
- * Hash ファンクション: MD2, MD4, RIPEMD, SHA256.
- * ブロック・エンクリプション・アルゴリズム: AES, ARC2, Blowfish, CAST, DES, Triple-DES, IDEA, RC5.
- * ストリーム・エンクリプション・アルゴリズム: ARC4, simple XOR.
- * 公開鍵アルゴリズム: RSA, DSA, ElGamal, qNEW.
- * プロトコル: All-or-nothing transforms, chaffing/winnowing.
- * その他: RFC1751 module for converting 128-key keys into a set of English words, primality testing.
- * デモ・プログラム(現在では完全に古く時代遅れなもの)
-
-
diff --git a/dev-python/pycrypto/pycrypto-2.6.1-r2.ebuild b/dev-python/pycrypto/pycrypto-2.6.1-r2.ebuild
deleted file mode 100644
index 2c3100844cef..000000000000
--- a/dev-python/pycrypto/pycrypto-2.6.1-r2.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1 flag-o-matic
-
-DESCRIPTION="Python Cryptography Toolkit"
-HOMEPAGE="https://www.dlitz.net/software/pycrypto/
- https://pypi.org/project/pycrypto/"
-SRC_URI="http://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/${P}.tar.gz"
-
-LICENSE="PSF-2 public-domain"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x86-solaris"
-IUSE="doc +gmp test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="gmp? ( dev-libs/gmp:0= )"
-DEPEND="${RDEPEND}
- doc? (
- dev-python/docutils[${PYTHON_USEDEP}]
- $(python_gen_cond_dep '>=dev-python/epydoc-3[${PYTHON_USEDEP}]' 'python2*')
- )"
-
-REQUIRED_USE="test? ( gmp )"
-
-DOCS=( ACKS ChangeLog README TODO )
-PATCHES=(
- "${FILESDIR}"/${P}-cross-compile.patch
- "${FILESDIR}"/${P}-CVE-2013-7459.patch
-)
-
-python_prepare_all() {
- # Fix Crypto.PublicKey.RSA._RSAobj.exportKey(format="OpenSSH") with Python 3
- # https://github.com/dlitz/pycrypto/commit/ab25c6fe95ee92fac3187dcd90e0560ccacb084a
- sed \
- -e "/keyparts =/s/'ssh-rsa'/b('ssh-rsa')/" \
- -e "s/keystring = ''.join/keystring = b('').join/" \
- -e "s/return 'ssh-rsa '/return b('ssh-rsa ')/" \
- -i lib/Crypto/PublicKey/RSA.py || die
-
- distutils-r1_python_prepare_all
-}
-
-python_configure_all() {
- # the configure does not interact with python in any way,
- # it just sets up the C header file.
- econf \
- $(use_with gmp) \
- --without-mpir
-}
-
-python_compile_all() {
- if use doc; then
- rst2html.py Doc/pycrypt.rst > Doc/index.html || die
- epydoc --config=Doc/epydoc-config --exclude-introspect="^Crypto\.(Random\.OSRNG\.nt|Util\.winrandom)$" || die
- HTML_DOCS=( Doc/apidoc/. Doc/index.html )
- fi
-}
-
-python_compile() {
- if ! python_is_python3; then
- local -x CFLAGS="${CFLAGS}"
- append-cflags -fno-strict-aliasing
- fi
-
- distutils-r1_python_compile
-}
-
-python_test() {
- esetup.py test
-}
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index b1860147f80d..971900943317 100644
Binary files a/dev-ruby/Manifest.gz and b/dev-ruby/Manifest.gz differ
diff --git a/dev-ruby/brotli/Manifest b/dev-ruby/brotli/Manifest
new file mode 100644
index 000000000000..98e45ea64d1c
--- /dev/null
+++ b/dev-ruby/brotli/Manifest
@@ -0,0 +1 @@
+DIST brotli-0.2.3.tar.gz 63304 BLAKE2B 96321a480e855ae7e77b93c06fd09153611a8a273ba66a8952093f844f6ccfa908d4bcabfd4dde084813f7f3961e8843208ed71f78e91f924bfe7e2ddece3628 SHA512 7d057d0055836c79744b802bb2401630375cc924035e9a45069c54e5df32711b9aa25234f4743aea729526028b804c518f36112ab721a6761b55311d07a8b79e
diff --git a/dev-ruby/brotli/brotli-0.2.3.ebuild b/dev-ruby/brotli/brotli-0.2.3.ebuild
new file mode 100644
index 000000000000..fab2f12fe16f
--- /dev/null
+++ b/dev-ruby/brotli/brotli-0.2.3.ebuild
@@ -0,0 +1,39 @@
+# 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_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+RUBY_FAKEGEM_GEMSPEC="brotli.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Brotli compressor/decompressor"
+HOMEPAGE="https://github.com/miyucy/brotli"
+SRC_URI="https://github.com/miyucy/brotli/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND+=" >=app-arch/brotli-1.0.7"
+DEPEND+=" >=app-arch/brotli-1.0.7"
+
+# Depends on the test data in app-arch/brotli
+RESTRICT="test"
+
+each_ruby_configure() {
+ ${RUBY} -Cext/brotli extconf.rb || die
+}
+
+each_ruby_compile() {
+ emake V=1 -Cext/brotli
+ mv ext/brotli/brotli.so lib/brotli/ || die
+}
diff --git a/dev-ruby/libxml/metadata.xml b/dev-ruby/brotli/metadata.xml
similarity index 82%
rename from dev-ruby/libxml/metadata.xml
rename to dev-ruby/brotli/metadata.xml
index 53271e9caf26..eb5be24aa567 100644
--- a/dev-ruby/libxml/metadata.xml
+++ b/dev-ruby/brotli/metadata.xml
@@ -6,6 +6,6 @@
Gentoo Ruby Project
- xml4r/libxml-ruby
+ miyucy/brotli
diff --git a/dev-ruby/eventmachine/eventmachine-1.2.7.ebuild b/dev-ruby/eventmachine/eventmachine-1.2.7.ebuild
index eef8004a177e..2a49e0f72980 100644
--- a/dev-ruby/eventmachine/eventmachine-1.2.7.ebuild
+++ b/dev-ruby/eventmachine/eventmachine-1.2.7.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
@@ -12,7 +12,7 @@ RUBY_FAKEGEM_EXTRADOC="docs/*.md README.md"
inherit ruby-fakegem
DESCRIPTION="EventMachine is a fast, simple event-processing library for Ruby programs"
-HOMEPAGE="http://rubyeventmachine.com"
+HOMEPAGE="https://github.com/eventmachine/eventmachine"
SRC_URI="https://github.com/eventmachine/eventmachine/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="|| ( GPL-2 Ruby )"
diff --git a/dev-ruby/fakeweb/fakeweb-1.3.0.20170806.ebuild b/dev-ruby/fakeweb/fakeweb-1.3.0.20170806.ebuild
index 94a8307834a1..99dd3e6ce4b7 100644
--- a/dev-ruby/fakeweb/fakeweb-1.3.0.20170806.ebuild
+++ b/dev-ruby/fakeweb/fakeweb-1.3.0.20170806.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
# ruby26: not compatible
-USE_RUBY="ruby23 ruby24 ruby25"
+USE_RUBY="ruby24 ruby25"
RUBY_FAKEGEM_RECIPE_DOC="rdoc"
RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.rdoc"
@@ -46,4 +46,7 @@ all_ruby_prepare() {
rm test/test_other_net_http_libraries.rb || die
sed -i -e '/test:preflight/ s:^:#:' Rakefile || die
+
+ # Avoid tests that require a network connection
+ sed -i -e '/test_real_https_request/aomit "requires network"' test/test_fake_web.rb || die
}
diff --git a/dev-ruby/faraday/Manifest b/dev-ruby/faraday/Manifest
index 962a0a34d45b..e2594ef65d26 100644
--- a/dev-ruby/faraday/Manifest
+++ b/dev-ruby/faraday/Manifest
@@ -1,3 +1,2 @@
-DIST faraday-0.15.4.tar.gz 67196 BLAKE2B 4e64e834639a6e59c028ee19d72f51ea72fd6b3be5fc63b6fbbec25716dbd735e97d8a05a210dd1a57b740a1dcd76d30a39b59c7034cab8a531f8856dc132b14 SHA512 6d1a8c66bd6e2ce417ce504bf20ea89cf24c46c2b48491aba110d04f273448e0e8f0cf94a0dd5356a13876aa030d41bbfb80b95365ea4b212fd79d8db624128f
-DIST faraday-0.17.1.tar.gz 75748 BLAKE2B 203f8603ef24846732b7a41f7a8ad4583539b45958773495c8f1b7f96461c4b661fa13ade0ce5d407b8f6efc17c997a4628cdcb77316ccd7baa2f3a8d6915a85 SHA512 b91079cce459d714e518cd2d45e355e0faf4e79b94a91eff6b9aa67e1a534ff52ee8daea6c21c171804a14a0ae8b18eaf79fd1a8d6ea7b733cc537bceb183970
DIST faraday-0.17.3.tar.gz 76786 BLAKE2B 0706f4386233861564aa1ba5fb8da9ad374a0b553a3f6ccd4ce6509b690f6da3e9f695f90605e0e15b41b6354841943ecc4f5eb826638565687bf62b36f1f456 SHA512 346e93b5d980626a0c460d9010ca09091faf84a1a8f2717c16d345ddc51585ce45959d7fcf41fbd0ba248d38460939544945fa0e81bcb80ab73dfe080182e325
+DIST faraday-1.0.1.tar.gz 835557 BLAKE2B ea5c32f0a93bcc4c4a0a7c55d61578b4e9f0173caed484c0c6424201884b8e81304c0fe07e1c1d6ffdbff41be85bdb494904c2a3b3e19b6c89b58995d9fdbfe7 SHA512 6a2dfd751d013ddc7cb005e262b48120f9a6ae2bb50564082ed5c5e47cfe2b07ee91d7d1b6967813d39b9874c7d5c7daf65ac773dd7afdcae65ed38698b1f496
diff --git a/dev-ruby/faraday/faraday-0.15.4.ebuild b/dev-ruby/faraday/faraday-0.15.4.ebuild
deleted file mode 100644
index a0fa609575de..000000000000
--- a/dev-ruby/faraday/faraday-0.15.4.ebuild
+++ /dev/null
@@ -1,71 +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"
-RUBY_FAKEGEM_TASK_DOC=""
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem eutils
-
-DESCRIPTION="HTTP/REST API client library with pluggable components"
-HOMEPAGE="https://github.com/lostisland/faraday"
-SRC_URI="https://github.com/lostisland/faraday/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-IUSE=""
-
-DEPEND+=" test? ( sys-process/lsof )"
-
-ruby_add_rdepend ">=dev-ruby/multipart-post-1.2.0 =dev-ruby/test-unit-2.4
- dev-ruby/httpclient
- dev-ruby/rack-test
- dev-ruby/sinatra
- dev-ruby/net-http-persistent >=dev-ruby/connection_pool-2.2.2
- dev-ruby/patron
- )"
-
-all_ruby_prepare() {
- # Remove bundler support.
- rm Gemfile || die
- sed -i -e '/[Bb]undler/d ; 1irequire "yaml"' Rakefile test/helper.rb || die
- sed -i -e '/bundler/,/^fi/ s:^:#:' script/test || die
-
- # Remove simplecov and coveralls support, not needed to run tests.
- sed -i -e '/simplecov/,/^end/ s:^:#:' \
- test/helper.rb || die
-
- # Remove tests for adapters that are not packaged for Gentoo.
- rm test/adapters/em_http_test.rb test/adapters/em_synchrony_test.rb test/adapters/excon_test.rb test/adapters/typhoeus_test.rb || die
-
- # Remove tests against live services
- sed -i -e '/test_dynamic_no_proxy/askip "live network test"' test/connection_test.rb || die
-
- # The proxy server is already killed, may be OS X vs Linux issue.
- sed -i -e '138 s/^/#/' script/test || die
-
- sed -i -e '/git ls-files/ s:^:#:' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
-
-each_ruby_prepare() {
- # Make sure the test scripts use the right ruby interpreter
- sed -i -e 's:ruby:'${RUBY}':' script/* || die
-}
-
-each_ruby_test() {
- MT_NO_PLUGINS=true each_fakegem_test
-
- # Sleep some time to allow the sinatra test server to die
- einfo "Waiting for test server to stop"
- sleep 10
-}
diff --git a/dev-ruby/faraday/faraday-0.17.1.ebuild b/dev-ruby/faraday/faraday-1.0.1.ebuild
similarity index 60%
rename from dev-ruby/faraday/faraday-0.17.1.ebuild
rename to dev-ruby/faraday/faraday-1.0.1.ebuild
index 545dbb4d61df..3c85417b7a8f 100644
--- a/dev-ruby/faraday/faraday-0.17.1.ebuild
+++ b/dev-ruby/faraday/faraday-1.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -19,7 +19,7 @@ HOMEPAGE="https://github.com/lostisland/faraday"
SRC_URI="https://github.com/lostisland/faraday/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="MIT"
-SLOT="0"
+SLOT="$(ver_cut 1)"
KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
IUSE=""
@@ -28,11 +28,8 @@ DEPEND+=" test? ( sys-process/lsof )"
ruby_add_rdepend ">=dev-ruby/multipart-post-1.2.0 =dev-ruby/test-unit-2.4
- dev-ruby/httpclient
- dev-ruby/rack-test
- dev-ruby/sinatra
- dev-ruby/net-http-persistent >=dev-ruby/connection_pool-2.2.2
- dev-ruby/patron
+ >=dev-ruby/connection_pool-2.2.2
+ || ( dev-ruby/rack:2.0 dev-ruby/rack:1.6 )
)"
all_ruby_prepare() {
@@ -40,12 +37,31 @@ all_ruby_prepare() {
rm Gemfile || die
sed -i -e '/[Bb]undler/d ; 1irequire "yaml"' Rakefile || die
sed -i -e '/bundler/,/^fi/ s:^:#:' script/test || die
- sed -i -e '/[Cc]overall/ s:^:#:' spec/spec_helper.rb || die
+ # Avoid loading all lib files since some of them require unpackaged dependencies.
+ sed -e '/[Cc]overall/ s:^:#:' \
+ -e '/lib\/\*\*/ s:^:#:' \
+ -e '3igem "rack", "<2.1"' \
+ -i spec/spec_helper.rb || die
# The proxy server is already killed, may be OS X vs Linux issue.
#sed -i -e '138 s/^/#/' script/test || die
sed -i -e '/git ls-files/ s:^:#:' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+ # Avoid multipart tests that require an unpackaged dependency
+ # that appears to be no longer maintained.
+ rm -f spec/faraday/request/multipart_spec.rb || die
+ sed -e '/multipart_parser/ s:^:#:' \
+ -i spec/support/helper_methods.rb || die
+
+ # Remove specs for unpackaged adapters
+ rm -f spec/faraday/adapter/{em_http,em_synchrony,excon}_spec.rb || die
+
+ # Make this adapter optional since it comes with a long list of
+ # dependencies.
+ if ! has_version "dev-ruby/typhoeus:1" ; then
+ rm -f spec/faraday/adapter/typhoeus_spec.rb || die
+ fi
}
each_ruby_prepare() {
diff --git a/dev-ruby/faraday_middleware/Manifest b/dev-ruby/faraday_middleware/Manifest
index 90c83bd07f0f..32a370655925 100644
--- a/dev-ruby/faraday_middleware/Manifest
+++ b/dev-ruby/faraday_middleware/Manifest
@@ -1,2 +1,2 @@
-DIST faraday_middleware-0.13.1.tar.gz 25728 BLAKE2B 7899d9115ad4e93ab1dedecfe5147fc425c5f884f66e473870542662b93e616e48392d7c564079fc55dfc7ffc09f5983d8a481894f295b88178d15ac05e2b312 SHA512 ea58c14e4e45cf1118281f42861df2e54c97ed92ab25d1de68a9d9da73b1ace378d464140ac8c0e42c5b36d5b0cd5f760092727c49da26c10b4e2566af9ab768
DIST faraday_middleware-0.14.0.tar.gz 26313 BLAKE2B 2d925f0bd9e4a10505bcdd3b483ac7b8ed2c42dc1187e04069505216dc739af3f10f5c7f2252e3f474e5ddaf972a7b8fe009be9957e66ab625fe49c364a0d217 SHA512 d8e86da166022c04c12acc37981de446ba30050330dc0320eec0414157bdd6c8e92ff49ce92b390a2f5d457c396144dbde698d61993302c0ac416559e7078a8d
+DIST faraday_middleware-1.0.0.tar.gz 28279 BLAKE2B d881f59e106a695e2d41936d552fe6cb16465964fcb2107806123ea1b34ee6db8e82bb1e6fe3a0135af04da70b56a3e8c933e44591b3f75901642a1fe7a3ea1a SHA512 478dd04840c27120c162e5d9c764a210d4cc55ac54f2d44935942ab5195ee5a0f198a4cc0c98805029f3eab4596cc3963a763cda1fcc1ce6daf1811186e0b5a7
diff --git a/dev-ruby/faraday_middleware/faraday_middleware-0.13.1.ebuild b/dev-ruby/faraday_middleware/faraday_middleware-1.0.0.ebuild
similarity index 77%
rename from dev-ruby/faraday_middleware/faraday_middleware-0.13.1.ebuild
rename to dev-ruby/faraday_middleware/faraday_middleware-1.0.0.ebuild
index d82d4eed3f29..21c8c5a7e5bc 100644
--- a/dev-ruby/faraday_middleware/faraday_middleware-0.13.1.ebuild
+++ b/dev-ruby/faraday_middleware/faraday_middleware-1.0.0.ebuild
@@ -1,13 +1,12 @@
-# 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
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
+USE_RUBY="ruby24 ruby25 ruby26"
RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
RUBY_FAKEGEM_EXTRADOC="README.md"
RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
@@ -19,12 +18,12 @@ HOMEPAGE="https://github.com/lostisland/faraday_middleware"
SRC_URI="https://github.com/lostisland/faraday_middleware/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="MIT"
-SLOT="0"
+SLOT="$(ver_cut 1)"
KEYWORDS="~amd64"
IUSE="+parsexml +oauth +mashify +rashify"
ruby_add_rdepend "
- >=dev-ruby/faraday-0.7.4 =dev-ruby/multi_xml-0.5.3 )
oauth? ( >=dev-ruby/simple_oauth-0.1 )
mashify? ( >=dev-ruby/hashie-1.2:* )
@@ -35,7 +34,7 @@ ruby_add_rdepend "
ruby_add_bdepend "test? (
dev-ruby/bundler
dev-ruby/addressable
- dev-ruby/rake
+ >=dev-ruby/rake-12.3.3
dev-ruby/webmock:3
dev-ruby/json
>=dev-ruby/multi_xml-0.5.3
@@ -45,20 +44,15 @@ ruby_add_bdepend "test? (
>=dev-ruby/rash_alt-0.4.3 )"
all_ruby_prepare() {
- sed -i -e '/\(cane\|parallel\|simplecov\|brotli\)/ s:^:#:' \
+ sed -i -e '/\(cane\|parallel\|simplecov\)/ s:^:#:' \
-e '/rspec/ s/>=/~>/' \
-e "/addressable/ s/, '< 2.4'//" \
- -e "/rake/ s/, '< 11'//" \
-e "/rack-cache/ s/, '< 1.3'//" \
-e "/simple_oauth/ s/, '< 0.3'//" \
-e "/webmock/ s/< 2/~> 3.0/" Gemfile || die
# Avoid unneeded dependency on git
sed -i -e '/git ls-files/d' ${RUBY_FAKEGEM_GEMSPEC} || die
-
- # Avoid unpackaged brotli dependency
- sed -i -e 's/jruby?/true/' \
- -e 's/gzip,deflate,br/gzip,deflate/' spec/unit/gzip_spec.rb || die
}
each_ruby_test() {
diff --git a/dev-ruby/faraday_middleware/metadata.xml b/dev-ruby/faraday_middleware/metadata.xml
index 308ea2abc418..38d121a1191a 100644
--- a/dev-ruby/faraday_middleware/metadata.xml
+++ b/dev-ruby/faraday_middleware/metadata.xml
@@ -9,9 +9,6 @@
ruby@gentoo.org
Gentoo Ruby Project
-
- A collection of useful Faraday middleware.
-