diff --git a/Manifest.files.gz b/Manifest.files.gz
index 8eb99ec274fc..50c2d7c56872 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 72c16927f188..f1adae2d61bc 100644
Binary files a/app-admin/Manifest.gz and b/app-admin/Manifest.gz differ
diff --git a/app-admin/pwgen/pwgen-2.08.ebuild b/app-admin/pwgen/pwgen-2.08.ebuild
index 2c41684279be..c70ff192f432 100644
--- a/app-admin/pwgen/pwgen-2.08.ebuild
+++ b/app-admin/pwgen/pwgen-2.08.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/pwgen/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="livecd"
src_configure() {
diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index df4204d4b65d..78e95b63a850 100644
Binary files a/app-arch/Manifest.gz and b/app-arch/Manifest.gz differ
diff --git a/app-arch/libarchive/libarchive-3.4.3.ebuild b/app-arch/libarchive/libarchive-3.4.3.ebuild
index d25232eddc91..485e963c263c 100644
--- a/app-arch/libarchive/libarchive-3.4.3.ebuild
+++ b/app-arch/libarchive/libarchive-3.4.3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://www.libarchive.org/downloads/${P}.tar.gz"
LICENSE="BSD BSD-2 BSD-4 public-domain"
SLOT="0/13"
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="acl blake2 +bzip2 +e2fsprogs expat +iconv kernel_linux libressl lz4 +lzma lzo nettle static-libs +threads xattr +zlib zstd"
RDEPEND="
diff --git a/app-backup/Manifest.gz b/app-backup/Manifest.gz
index 86bcbc2a4a42..00f2c9de0d6f 100644
Binary files a/app-backup/Manifest.gz and b/app-backup/Manifest.gz differ
diff --git a/app-backup/bareos/files/tmpfiles.d-bareos.conf b/app-backup/bareos/files/tmpfiles.d-bareos.conf
new file mode 100644
index 000000000000..6e2dacc41ad3
--- /dev/null
+++ b/app-backup/bareos/files/tmpfiles.d-bareos.conf
@@ -0,0 +1 @@
+d /run/bareos 0770 bareos bareos -
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index e04b23ffaeff..40636aeaf72c 100644
Binary files a/app-crypt/Manifest.gz and b/app-crypt/Manifest.gz differ
diff --git a/app-crypt/eid-mw/Manifest b/app-crypt/eid-mw/Manifest
index 587b27afaada..c8855194e4a1 100644
--- a/app-crypt/eid-mw/Manifest
+++ b/app-crypt/eid-mw/Manifest
@@ -1,3 +1 @@
-DIST eid-mw-4.4.1.tar.gz 7708697 BLAKE2B 7bdbaa37af1cdd5a8abd1519939f663c7c871cea49850932d97c391465de362885b061c024285ab2690473a4bb1ba57a70fdc12a720246b2a610ac9525f6395e SHA512 9de54858ac052eeff101070dd11c5cf60ab1d29b8dc8d946680745acf9aa6ba1044ca5451eca6066b5b467fbc32a2a23bbe7e8551ca7559e6003a4097a304cfc
-DIST eid-mw-4.4.19.tar.gz 7941144 BLAKE2B c02f975081eacf7803839461ae91e3c6a24c3e2fc60064a981cc71f629925679b0df997e8acbe2da2f1e58dcc665b8633e3c9bf28b07be90ac8cdd0448e80848 SHA512 21530111461302123be662dd60f3fbd56ffd8a0537cac88c99d5a6bcd9163a27bc34e05beaf7502dd5ada247ca324d21590a866907b5a7a02ce3d8d78fcac634
-DIST eid-mw-4.4.23.tar.gz 7502185 BLAKE2B ab223c2d860f44806a6043a40891d89ab3418dd232bba1d60bd9b0b6871a77e6e24bc73c49afcffabc8ae7f16c235aabfb17efb8af7543b0e2bd3fe76ba655f7 SHA512 7c90d7ca08dcd2ba4d0c918b5ba6305da6107de457209acb9a0cc3243891c9b654b1c12fe4da53ec8bad65617198c0caffdb0482e343a8d807f00762e6672310
+DIST eid-mw-4.4.27.tar.gz 7481892 BLAKE2B 5d1268946a62436eec74a7ed83e8391c1ceb0274ef8798b95bee2087e4e439d46ea5f88b8237cff1e925d31d1762fe979a959ce35efd4d6210dda580827bab3b SHA512 c4e9917907bb351b9dd427eb48c2124e55de0d8a73cfd142b9cb5e81c84f91e62a39a90bb1fbd109fb59aeb089898ffcd18ef5ccf2ab72c883b41ec4d9b9edf1
diff --git a/app-crypt/eid-mw/eid-mw-4.4.1.ebuild b/app-crypt/eid-mw/eid-mw-4.4.1.ebuild
deleted file mode 100644
index f446179c580b..000000000000
--- a/app-crypt/eid-mw/eid-mw-4.4.1.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools gnome2-utils
-
-DESCRIPTION="Electronic Identity Card middleware supplied by the Belgian Federal Government"
-HOMEPAGE="https://eid.belgium.be"
-SRC_URI="https://codeload.github.com/fedict/${PN}/tar.gz/v${PV} -> ${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="+dialogs +gtk p11-kit"
-
-RDEPEND=">=sys-apps/pcsc-lite-1.2.9
- gtk? (
- x11-libs/gdk-pixbuf[jpeg]
- x11-libs/gtk+:*
- dev-libs/libxml2
- net-misc/curl[ssl]
- net-libs/libproxy
- !app-misc/eid-viewer-bin
- )
- p11-kit? ( app-crypt/p11-kit )"
-
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-REQUIRED_USE="dialogs? ( gtk )"
-
-src_prepare() {
- default
-
- sed -i -e 's:/beid/rsaref220:/rsaref220:' configure.ac || die
- sed -i -e 's:/beid::' cardcomm/pkcs11/src/libbeidpkcs11.pc.in || die
-
- # Buggy internal versioning when autoreconf a tarball release.
- # Weird numbering is required otherwise we get a seg fault in
- # about-eid-mw program.
- echo "${PV}-v${PV}" > .version
- sed -i \
- -e '/^GITDESC/ d' \
- -e '/^VERCLEAN/ d' \
- scripts/build-aux/genver.sh
-
- # legacy xpi module : we don't want it anymore
- sed -i -e 's:plugins_tools/xpi$::' Makefile.am || die
- sed -i -e '/plugins_tools\/xpi/ d' configure.ac || die
-
- # hardcoded lsb_info
- sed -i \
- -e "s:get_lsb_info('i'):strdup(_(\"Gentoo\")):" \
- -e "s:get_lsb_info('r'):strdup(_(\"n/a\")):" \
- -e "s:get_lsb_info('c'):strdup(_(\"n/a\")):" \
- plugins_tools/aboutmw/gtk/about-main.c || die
-
- eautoreconf
-}
-
-src_configure() {
- econf \
- $(use_enable dialogs) \
- $(use_enable p11-kit p11kit) \
- $(use_with gtk gtkvers 'detect') \
- --with-gnu-ld \
- --disable-static
-}
-
-src_install() {
- default
- rm -r "${ED}"/usr/$(get_libdir)/*.la || die
- if use gtk; then
- domenu plugins_tools/eid-viewer/eid-viewer.desktop
- doicon plugins_tools/eid-viewer/gtk/eid-viewer.png
- fi
-}
-
-pkg_postinst() {
- if use gtk; then
- gnome2_schemas_update
- gnome2_icon_cache_update
- fi
-}
-
-pkg_postrm() {
- if use gtk; then
- gnome2_schemas_update
- gnome2_icon_cache_update
- fi
-}
diff --git a/app-crypt/eid-mw/eid-mw-4.4.19.ebuild b/app-crypt/eid-mw/eid-mw-4.4.19.ebuild
deleted file mode 100644
index a73a18dec69e..000000000000
--- a/app-crypt/eid-mw/eid-mw-4.4.19.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools desktop gnome2-utils xdg-utils
-
-DESCRIPTION="Electronic Identity Card middleware supplied by the Belgian Federal Government"
-HOMEPAGE="https://eid.belgium.be"
-SRC_URI="https://codeload.github.com/fedict/${PN}/tar.gz/v${PV} -> ${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="+dialogs +gtk +p11v220 p11-kit"
-
-RDEPEND=">=sys-apps/pcsc-lite-1.2.9
- gtk? (
- x11-libs/gdk-pixbuf[jpeg]
- x11-libs/gtk+:*
- dev-libs/libxml2
- net-misc/curl[ssl]
- net-libs/libproxy
- !app-misc/eid-viewer-bin
- )
- p11-kit? ( app-crypt/p11-kit )"
-
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-REQUIRED_USE="dialogs? ( gtk )"
-
-src_prepare() {
- default
-
- sed -i -e 's:/beid/rsaref220:/rsaref220:' configure.ac || die
- sed -i -e 's:/beid::' cardcomm/pkcs11/src/libbeidpkcs11.pc.in || die
-
- # Buggy internal versioning when autoreconf a tarball release.
- # Weird numbering is required otherwise we get a seg fault in
- # about-eid-mw program.
- echo "${PV}-v${PV}" > .version
- sed -i \
- -e '/^GITDESC/ d' \
- -e '/^VERCLEAN/ d' \
- scripts/build-aux/genver.sh
-
- # legacy xpi module : we don't want it anymore
- sed -i -e '/SUBDIRS/ s:plugins_tools/xpi ::' Makefile.am || die
- sed -i -e '/plugins_tools\/xpi/ d' configure.ac || die
-
- # hardcoded lsb_info
- sed -i \
- -e "s:get_lsb_info('i'):strdup(_(\"Gentoo\")):" \
- -e "s:get_lsb_info('r'):strdup(_(\"n/a\")):" \
- -e "s:get_lsb_info('c'):strdup(_(\"n/a\")):" \
- plugins_tools/aboutmw/gtk/about-main.c || die
-
- # Fix libdir for pkcs11_manifestdir
- sed -i \
- -e "/pkcs11_manifestdir/ s:prefix)/lib:libdir):" \
- cardcomm/pkcs11/src/Makefile.am || die
-
- # See bug #691308
- eapply "${FILESDIR}/eid-sign-test-${PV}.patch"
-
- eautoreconf
-}
-
-src_configure() {
- econf \
- $(use_enable dialogs) \
- $(use_enable p11v220) \
- $(use_enable p11-kit p11kit) \
- $(use_with gtk gtkvers 'detect') \
- --with-gnu-ld \
- --disable-static
-}
-
-src_install() {
- default
- rm -r "${ED}"/usr/$(get_libdir)/*.la || die
- if use gtk; then
- domenu plugins_tools/eid-viewer/eid-viewer.desktop
- doicon plugins_tools/eid-viewer/gtk/eid-viewer.png
- fi
-}
-
-pkg_postinst() {
- if use gtk; then
- gnome2_schemas_update
- xdg_desktop_database_update
- xdg_icon_cache_update
- fi
-}
-
-pkg_postrm() {
- if use gtk; then
- gnome2_schemas_update
- xdg_desktop_database_update
- xdg_icon_cache_update
- fi
-}
diff --git a/app-crypt/eid-mw/eid-mw-4.4.23.ebuild b/app-crypt/eid-mw/eid-mw-4.4.27.ebuild
similarity index 96%
rename from app-crypt/eid-mw/eid-mw-4.4.23.ebuild
rename to app-crypt/eid-mw/eid-mw-4.4.27.ebuild
index 6dc98d418711..38d7672f996b 100644
--- a/app-crypt/eid-mw/eid-mw-4.4.23.ebuild
+++ b/app-crypt/eid-mw/eid-mw-4.4.27.ebuild
@@ -64,6 +64,11 @@ src_prepare() {
# See bug #691308
eapply "${FILESDIR}/eid-sign-test-4.4.19.patch"
+ # See bug #732994
+ sed -i \
+ -e '/LDFLAGS="/ s:$CPPFLAGS:$LDFLAGS:' \
+ configure.ac || die
+
eautoreconf
}
diff --git a/app-crypt/eid-mw/eid-mw-9999.ebuild b/app-crypt/eid-mw/eid-mw-9999.ebuild
index 023f52ee56b0..2535311a44f2 100644
--- a/app-crypt/eid-mw/eid-mw-9999.ebuild
+++ b/app-crypt/eid-mw/eid-mw-9999.ebuild
@@ -1,9 +1,9 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
-inherit autotools gnome2-utils git-r3
+inherit autotools desktop gnome2-utils xdg-utils git-r3
DESCRIPTION="Electronic Identity Card middleware supplied by the Belgian Federal Government"
HOMEPAGE="https://eid.belgium.be"
@@ -16,7 +16,7 @@ IUSE="+dialogs +gtk +p11v220 p11-kit"
RDEPEND=">=sys-apps/pcsc-lite-1.2.9
gtk? (
x11-libs/gdk-pixbuf[jpeg]
- x11-libs/gtk+:*
+ x11-libs/gtk+:3
dev-libs/libxml2
net-misc/curl[ssl]
net-libs/libproxy
@@ -46,6 +46,16 @@ src_prepare() {
-e "s:get_lsb_info('c'):strdup(_(\"n/a\")):" \
plugins_tools/aboutmw/gtk/about-main.c || die
+ # Fix libdir for pkcs11_manifestdir
+ sed -i \
+ -e "/pkcs11_manifestdir/ s:prefix)/lib:libdir):" \
+ cardcomm/pkcs11/src/Makefile.am || die
+
+ # See bug #732994
+ sed -i \
+ -e '/LDFLAGS="/ s:$CPPFLAGS:$LDFLAGS:' \
+ configure.ac || die
+
eautoreconf
}
@@ -71,13 +81,15 @@ src_install() {
pkg_postinst() {
if use gtk; then
gnome2_schemas_update
- gnome2_icon_cache_update
+ xdg_desktop_database_update
+ xdg_icon_cache_update
fi
}
pkg_postrm() {
if use gtk; then
gnome2_schemas_update
- gnome2_icon_cache_update
+ xdg_desktop_database_update
+ xdg_icon_cache_update
fi
}
diff --git a/app-crypt/mit-krb5/Manifest b/app-crypt/mit-krb5/Manifest
index b6666567e379..dfcf9ea639c5 100644
--- a/app-crypt/mit-krb5/Manifest
+++ b/app-crypt/mit-krb5/Manifest
@@ -1,5 +1 @@
-DIST krb5-1.17.1.tar.gz 8765399 BLAKE2B 46be864e2db9c70d164532d82776195bf57342ce4f1fd7dfcf3cf6bd72a3639a69954f742607a2b8950b4dea8acfac5d633aa379d669de20bafe54b407bab94b SHA512 e0c3dc0a6554ab3105ac32f3f01519f56064500213aa743816235d83250abc1db9a9ca38a2ba93a938d562b4af135a013017ce96346d6742bca0c812b842ceef
-DIST krb5-1.17.tar.gz 8761763 BLAKE2B 76f636836c67e9eefca91c9417118efdcf4437c1220691f43f3d246daf3eabd53b40a30956f0e57703c3fde5d7193b1d86b68becf3ae1c0c803d2462e79d3014 SHA512 7462a578b936bd17f155a362dbb5d388e157a80a096549028be6c55400b11361c7f8a28e424fd5674801873651df4e694d536cae66728b7ae5e840e532358c52
-DIST krb5-1.18.1.tar.gz 8711772 BLAKE2B 98ea02b686760d1e080e1b038601fedcb85ceb4c61dbbba717c300f54a784e8494ff0fc7c0139e95fffd6b1cbe2a65158c9a3af71ea76c1b86905642c29cd93a SHA512 c96c9ed676c8ccb9b65d17bb1d982c266228c75030a2d8fd5d7952ee8cdf362a22d202e93018d1011a5e7bd9a9fabe69aa1578d1d2e4839a78b9916d8b8019ce
DIST krb5-1.18.2.tar.gz 8713927 BLAKE2B f0eb34e67adcb86f347c59ec6ef74970a57530cc56336a84909f852cd6135079ea89828e77c906a272f54e0faf6a4a0497f2b648446eb9d048d1c51e4ec513af SHA512 7cbb1b28e677fea3e0794e93951f3caaa2c49bb1175dd187951e72a466cc69d96c3b833d838000fe911c1a437d96a558e550f27c53a8b332fb9dfc7cbb7ec44c
-DIST krb5-1.18.tar.gz 8706395 BLAKE2B d2b700c2f869733a7fc9ac735ec27e3973868efcf62c6b130fb5ff33aaaed0571816af519123e9077fc0bc240ee71a6179e87a4f724ae06dba8a70fd1d594b9a SHA512 36a01ea310b4b3d0a3d209b641739575239e1ca5e93b3de99cb1fec83e82f9a70ad0761dd6eb77cda5c18c53044ab80168b00725642a0c2dfde0e492c42af6a9
diff --git a/app-crypt/mit-krb5/mit-krb5-1.17-r1.ebuild b/app-crypt/mit-krb5/mit-krb5-1.17-r1.ebuild
deleted file mode 100644
index 583ed9364cf4..000000000000
--- a/app-crypt/mit-krb5/mit-krb5-1.17-r1.ebuild
+++ /dev/null
@@ -1,165 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-inherit autotools flag-o-matic multilib-minimal python-any-r1 systemd
-
-MY_P="${P/mit-}"
-P_DIR=$(ver_cut 1-2)
-DESCRIPTION="MIT Kerberos V"
-HOMEPAGE="https://web.mit.edu/kerberos/www/"
-SRC_URI="https://web.mit.edu/kerberos/dist/krb5/${P_DIR}/${MY_P}.tar.gz"
-
-LICENSE="openafs-krb5-a BSD MIT OPENLDAP BSD-2 HPND BSD-4 ISC RSA CC-BY-SA-3.0 || ( BSD-2 GPL-2+ )"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
-IUSE="cpu_flags_x86_aes doc +keyutils libressl lmdb nls openldap +pkinit selinux +threads test xinetd"
-
-# Test suite requires network access
-RESTRICT="test"
-
-DEPEND="
- !!app-crypt/heimdal
- >=sys-libs/e2fsprogs-libs-1.42.9[${MULTILIB_USEDEP}]
- || (
- >=dev-libs/libverto-0.2.5[libev,${MULTILIB_USEDEP}]
- >=dev-libs/libverto-0.2.5[libevent,${MULTILIB_USEDEP}]
- >=dev-libs/libverto-0.2.5[tevent,${MULTILIB_USEDEP}]
- )
- keyutils? ( >=sys-apps/keyutils-1.5.8:=[${MULTILIB_USEDEP}] )
- lmdb? ( dev-db/lmdb )
- nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] )
- openldap? ( >=net-nds/openldap-2.4.38-r1[${MULTILIB_USEDEP}] )
- pkinit? (
- !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
- libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
- )
- xinetd? ( sys-apps/xinetd )
- "
-BDEPEND="
- ${PYTHON_DEPS}
- virtual/yacc
- cpu_flags_x86_aes? (
- amd64? ( dev-lang/yasm )
- x86? ( dev-lang/yasm )
- )
- doc? ( virtual/latex-base )
- test? (
- ${PYTHON_DEPS}
- dev-lang/tcl:0
- dev-util/dejagnu
- dev-util/cmocka
- )"
-RDEPEND="${DEPEND}
- selinux? ( sec-policy/selinux-kerberos )"
-
-S=${WORKDIR}/${MY_P}/src
-
-PATCHES=(
- "${FILESDIR}/${PN}-1.12_warn_cflags.patch"
- "${FILESDIR}/${PN}-config_LDFLAGS-r1.patch"
- "${FILESDIR}/${PN}-1.16.3-libressl-r1.patch"
-)
-
-MULTILIB_CHOST_TOOLS=(
- /usr/bin/krb5-config
-)
-
-src_prepare() {
- default
- # Make sure we always use the system copies.
- rm -rf util/{et,ss,verto}
- sed -i 's:^[[:space:]]*util/verto$::' configure.in || die
-
- eautoreconf
-}
-
-src_configure() {
- # QA
- append-flags -fno-strict-aliasing
- append-flags -fno-strict-overflow
-
- multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
- use keyutils || export ac_cv_header_keyutils_h=no
- ECONF_SOURCE=${S} \
- WARN_CFLAGS="set" \
- econf \
- $(use_with openldap ldap) \
- "$(multilib_native_use_with test tcl "${EPREFIX}/usr")" \
- $(use_enable nls) \
- $(use_enable pkinit) \
- $(use_enable threads thread-support) \
- $(use_with lmdb) \
- --without-hesiod \
- --enable-shared \
- --with-system-et \
- --with-system-ss \
- --enable-dns-for-realm \
- --enable-kdc-lookaside-cache \
- --with-system-verto \
- --disable-rpath
-}
-
-multilib_src_compile() {
- emake -j1
-}
-
-multilib_src_test() {
- multilib_is_native_abi && emake -j1 check
-}
-
-multilib_src_install() {
- emake \
- DESTDIR="${D}" \
- EXAMPLEDIR="${EPREFIX}/usr/share/doc/${PF}/examples" \
- install
-}
-
-multilib_src_install_all() {
- # default database dir
- keepdir /var/lib/krb5kdc
-
- rmdir "${ED}"/var/lib/{run/krb5kdc,run}
-
- cd ..
- dodoc README
-
- if use doc; then
- dodoc -r doc/html
- docinto pdf
- dodoc doc/pdf/*.pdf
- fi
-
- newinitd "${FILESDIR}"/mit-krb5kadmind.initd-r2 mit-krb5kadmind
- newinitd "${FILESDIR}"/mit-krb5kdc.initd-r2 mit-krb5kdc
- newinitd "${FILESDIR}"/mit-krb5kpropd.initd-r2 mit-krb5kpropd
- newconfd "${FILESDIR}"/mit-krb5kadmind.confd mit-krb5kadmind
- newconfd "${FILESDIR}"/mit-krb5kdc.confd mit-krb5kdc
- newconfd "${FILESDIR}"/mit-krb5kpropd.confd mit-krb5kpropd
-
- systemd_newunit "${FILESDIR}"/mit-krb5kadmind.service mit-krb5kadmind.service
- systemd_newunit "${FILESDIR}"/mit-krb5kdc.service mit-krb5kdc.service
- systemd_newunit "${FILESDIR}"/mit-krb5kpropd.service mit-krb5kpropd.service
- systemd_newunit "${FILESDIR}"/mit-krb5kpropd_at.service "mit-krb5kpropd@.service"
- systemd_newunit "${FILESDIR}"/mit-krb5kpropd.socket mit-krb5kpropd.socket
-
- insinto /etc
- newins "${ED}/usr/share/doc/${PF}/examples/krb5.conf" krb5.conf.example
- insinto /var/lib/krb5kdc
- newins "${ED}/usr/share/doc/${PF}/examples/kdc.conf" kdc.conf.example
-
- if use openldap ; then
- insinto /etc/openldap/schema
- doins "${S}/plugins/kdb/ldap/libkdb_ldap/kerberos.schema"
- fi
-
- if use xinetd ; then
- insinto /etc/xinetd.d
- newins "${FILESDIR}/kpropd.xinetd" kpropd
- fi
-}
diff --git a/app-crypt/mit-krb5/mit-krb5-1.17.1.ebuild b/app-crypt/mit-krb5/mit-krb5-1.17.1.ebuild
deleted file mode 100644
index 48fb6f79c765..000000000000
--- a/app-crypt/mit-krb5/mit-krb5-1.17.1.ebuild
+++ /dev/null
@@ -1,165 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-inherit autotools flag-o-matic multilib-minimal python-any-r1 systemd
-
-MY_P="${P/mit-}"
-P_DIR=$(ver_cut 1-2)
-DESCRIPTION="MIT Kerberos V"
-HOMEPAGE="https://web.mit.edu/kerberos/www/"
-SRC_URI="https://web.mit.edu/kerberos/dist/krb5/${P_DIR}/${MY_P}.tar.gz"
-
-LICENSE="openafs-krb5-a BSD MIT OPENLDAP BSD-2 HPND BSD-4 ISC RSA CC-BY-SA-3.0 || ( BSD-2 GPL-2+ )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="cpu_flags_x86_aes doc +keyutils libressl lmdb nls openldap +pkinit selinux +threads test xinetd"
-RESTRICT="!test? ( test )"
-
-# Test suite requires network access
-RESTRICT="test"
-
-DEPEND="
- !!app-crypt/heimdal
- >=sys-libs/e2fsprogs-libs-1.42.9[${MULTILIB_USEDEP}]
- || (
- >=dev-libs/libverto-0.2.5[libev,${MULTILIB_USEDEP}]
- >=dev-libs/libverto-0.2.5[libevent,${MULTILIB_USEDEP}]
- >=dev-libs/libverto-0.2.5[tevent,${MULTILIB_USEDEP}]
- )
- keyutils? ( >=sys-apps/keyutils-1.5.8:=[${MULTILIB_USEDEP}] )
- lmdb? ( dev-db/lmdb )
- nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] )
- openldap? ( >=net-nds/openldap-2.4.38-r1[${MULTILIB_USEDEP}] )
- pkinit? (
- !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
- libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
- )
- xinetd? ( sys-apps/xinetd )
- "
-BDEPEND="
- ${PYTHON_DEPS}
- virtual/yacc
- cpu_flags_x86_aes? (
- amd64? ( dev-lang/yasm )
- x86? ( dev-lang/yasm )
- )
- doc? ( virtual/latex-base )
- test? (
- ${PYTHON_DEPS}
- dev-lang/tcl:0
- dev-util/dejagnu
- dev-util/cmocka
- )"
-RDEPEND="${DEPEND}
- selinux? ( sec-policy/selinux-kerberos )"
-
-S=${WORKDIR}/${MY_P}/src
-
-PATCHES=(
- "${FILESDIR}/${PN}-1.12_warn_cflags.patch"
- "${FILESDIR}/${PN}-config_LDFLAGS-r1.patch"
- "${FILESDIR}/${PN}-1.16.3-libressl-r1.patch"
- "${FILESDIR}/${PN}_dont_create_run.patch"
-)
-
-MULTILIB_CHOST_TOOLS=(
- /usr/bin/krb5-config
-)
-
-src_prepare() {
- default
- # Make sure we always use the system copies.
- rm -rf util/{et,ss,verto}
- sed -i 's:^[[:space:]]*util/verto$::' configure.in || die
-
- eautoreconf
-}
-
-src_configure() {
- # QA
- append-flags -fno-strict-aliasing
- append-flags -fno-strict-overflow
-
- multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
- use keyutils || export ac_cv_header_keyutils_h=no
- ECONF_SOURCE=${S} \
- WARN_CFLAGS="set" \
- econf \
- $(use_with openldap ldap) \
- "$(multilib_native_use_with test tcl "${EPREFIX}/usr")" \
- $(use_enable nls) \
- $(use_enable pkinit) \
- $(use_enable threads thread-support) \
- $(use_with lmdb) \
- --without-hesiod \
- --enable-shared \
- --with-system-et \
- --with-system-ss \
- --enable-dns-for-realm \
- --enable-kdc-lookaside-cache \
- --with-system-verto \
- --disable-rpath
-}
-
-multilib_src_compile() {
- emake -j1
-}
-
-multilib_src_test() {
- multilib_is_native_abi && emake -j1 check
-}
-
-multilib_src_install() {
- emake \
- DESTDIR="${D}" \
- EXAMPLEDIR="${EPREFIX}/usr/share/doc/${PF}/examples" \
- install
-}
-
-multilib_src_install_all() {
- # default database dir
- keepdir /var/lib/krb5kdc
-
- cd ..
- dodoc README
-
- if use doc; then
- dodoc -r doc/html
- docinto pdf
- dodoc doc/pdf/*.pdf
- fi
-
- newinitd "${FILESDIR}"/mit-krb5kadmind.initd-r2 mit-krb5kadmind
- newinitd "${FILESDIR}"/mit-krb5kdc.initd-r2 mit-krb5kdc
- newinitd "${FILESDIR}"/mit-krb5kpropd.initd-r2 mit-krb5kpropd
- newconfd "${FILESDIR}"/mit-krb5kadmind.confd mit-krb5kadmind
- newconfd "${FILESDIR}"/mit-krb5kdc.confd mit-krb5kdc
- newconfd "${FILESDIR}"/mit-krb5kpropd.confd mit-krb5kpropd
-
- systemd_newunit "${FILESDIR}"/mit-krb5kadmind.service mit-krb5kadmind.service
- systemd_newunit "${FILESDIR}"/mit-krb5kdc.service mit-krb5kdc.service
- systemd_newunit "${FILESDIR}"/mit-krb5kpropd.service mit-krb5kpropd.service
- systemd_newunit "${FILESDIR}"/mit-krb5kpropd_at.service "mit-krb5kpropd@.service"
- systemd_newunit "${FILESDIR}"/mit-krb5kpropd.socket mit-krb5kpropd.socket
-
- insinto /etc
- newins "${ED}/usr/share/doc/${PF}/examples/krb5.conf" krb5.conf.example
- insinto /var/lib/krb5kdc
- newins "${ED}/usr/share/doc/${PF}/examples/kdc.conf" kdc.conf.example
-
- if use openldap ; then
- insinto /etc/openldap/schema
- doins "${S}/plugins/kdb/ldap/libkdb_ldap/kerberos.schema"
- fi
-
- if use xinetd ; then
- insinto /etc/xinetd.d
- newins "${FILESDIR}/kpropd.xinetd" kpropd
- fi
-}
diff --git a/app-crypt/mit-krb5/mit-krb5-1.18.1.ebuild b/app-crypt/mit-krb5/mit-krb5-1.18.1.ebuild
deleted file mode 100644
index e830a8bea5d0..000000000000
--- a/app-crypt/mit-krb5/mit-krb5-1.18.1.ebuild
+++ /dev/null
@@ -1,165 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-inherit autotools flag-o-matic multilib-minimal python-any-r1 systemd
-
-MY_P="${P/mit-}"
-P_DIR=$(ver_cut 1-2)
-DESCRIPTION="MIT Kerberos V"
-HOMEPAGE="https://web.mit.edu/kerberos/www/"
-SRC_URI="https://web.mit.edu/kerberos/dist/krb5/${P_DIR}/${MY_P}.tar.gz"
-
-LICENSE="openafs-krb5-a BSD MIT OPENLDAP BSD-2 HPND BSD-4 ISC RSA CC-BY-SA-3.0 || ( BSD-2 GPL-2+ )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="cpu_flags_x86_aes doc +keyutils libressl lmdb nls openldap +pkinit selinux +threads test xinetd"
-
-# Test suite requires network access
-RESTRICT="test"
-
-DEPEND="
- !!app-crypt/heimdal
- >=sys-libs/e2fsprogs-libs-1.42.9[${MULTILIB_USEDEP}]
- || (
- >=dev-libs/libverto-0.2.5[libev,${MULTILIB_USEDEP}]
- >=dev-libs/libverto-0.2.5[libevent,${MULTILIB_USEDEP}]
- >=dev-libs/libverto-0.2.5[tevent,${MULTILIB_USEDEP}]
- )
- keyutils? ( >=sys-apps/keyutils-1.5.8:=[${MULTILIB_USEDEP}] )
- lmdb? ( dev-db/lmdb )
- nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] )
- openldap? ( >=net-nds/openldap-2.4.38-r1[${MULTILIB_USEDEP}] )
- pkinit? (
- !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
- libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
- )
- xinetd? ( sys-apps/xinetd )
- "
-BDEPEND="
- ${PYTHON_DEPS}
- virtual/yacc
- cpu_flags_x86_aes? (
- amd64? ( dev-lang/yasm )
- x86? ( dev-lang/yasm )
- )
- doc? ( virtual/latex-base )
- test? (
- ${PYTHON_DEPS}
- dev-lang/tcl:0
- dev-util/dejagnu
- dev-util/cmocka
- )"
-RDEPEND="${DEPEND}
- selinux? ( sec-policy/selinux-kerberos )"
-
-S=${WORKDIR}/${MY_P}/src
-
-PATCHES=(
- "${FILESDIR}/${PN}-1.12_warn_cflags.patch"
- "${FILESDIR}/${PN}-config_LDFLAGS-r1.patch"
- "${FILESDIR}/${PN}-1.16.3-libressl-r1.patch"
- "${FILESDIR}/${PN}_dont_create_run.patch"
- "${FILESDIR}/${PN}-1.18-libressl.patch"
-)
-
-MULTILIB_CHOST_TOOLS=(
- /usr/bin/krb5-config
-)
-
-src_prepare() {
- default
- # Make sure we always use the system copies.
- rm -rf util/{et,ss,verto}
- sed -i 's:^[[:space:]]*util/verto$::' configure.ac || die
-
- eautoreconf
-}
-
-src_configure() {
- # QA
- append-flags -fno-strict-aliasing
- append-flags -fno-strict-overflow
-
- multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
- ECONF_SOURCE=${S} \
- WARN_CFLAGS="set" \
- econf \
- $(use_with openldap ldap) \
- "$(multilib_native_use_with test tcl "${EPREFIX}/usr")" \
- $(use_enable nls) \
- $(use_enable pkinit) \
- $(use_enable threads thread-support) \
- $(use_with lmdb) \
- $(use_with keyutils) \
- --without-hesiod \
- --enable-shared \
- --with-system-et \
- --with-system-ss \
- --enable-dns-for-realm \
- --enable-kdc-lookaside-cache \
- --with-system-verto \
- --disable-rpath
-}
-
-multilib_src_compile() {
- emake -j1
-}
-
-multilib_src_test() {
- multilib_is_native_abi && emake -j1 check
-}
-
-multilib_src_install() {
- emake \
- DESTDIR="${D}" \
- EXAMPLEDIR="${EPREFIX}/usr/share/doc/${PF}/examples" \
- install
-}
-
-multilib_src_install_all() {
- # default database dir
- keepdir /var/lib/krb5kdc
-
- cd ..
- dodoc README
-
- if use doc; then
- dodoc -r doc/html
- docinto pdf
- dodoc doc/pdf/*.pdf
- fi
-
- newinitd "${FILESDIR}"/mit-krb5kadmind.initd-r2 mit-krb5kadmind
- newinitd "${FILESDIR}"/mit-krb5kdc.initd-r2 mit-krb5kdc
- newinitd "${FILESDIR}"/mit-krb5kpropd.initd-r2 mit-krb5kpropd
- newconfd "${FILESDIR}"/mit-krb5kadmind.confd mit-krb5kadmind
- newconfd "${FILESDIR}"/mit-krb5kdc.confd mit-krb5kdc
- newconfd "${FILESDIR}"/mit-krb5kpropd.confd mit-krb5kpropd
-
- systemd_newunit "${FILESDIR}"/mit-krb5kadmind.service mit-krb5kadmind.service
- systemd_newunit "${FILESDIR}"/mit-krb5kdc.service mit-krb5kdc.service
- systemd_newunit "${FILESDIR}"/mit-krb5kpropd.service mit-krb5kpropd.service
- systemd_newunit "${FILESDIR}"/mit-krb5kpropd_at.service "mit-krb5kpropd@.service"
- systemd_newunit "${FILESDIR}"/mit-krb5kpropd.socket mit-krb5kpropd.socket
-
- insinto /etc
- newins "${ED}/usr/share/doc/${PF}/examples/krb5.conf" krb5.conf.example
- insinto /var/lib/krb5kdc
- newins "${ED}/usr/share/doc/${PF}/examples/kdc.conf" kdc.conf.example
-
- if use openldap ; then
- insinto /etc/openldap/schema
- doins "${S}/plugins/kdb/ldap/libkdb_ldap/kerberos.schema"
- fi
-
- if use xinetd ; then
- insinto /etc/xinetd.d
- newins "${FILESDIR}/kpropd.xinetd" kpropd
- fi
-}
diff --git a/app-crypt/mit-krb5/mit-krb5-1.18.2.ebuild b/app-crypt/mit-krb5/mit-krb5-1.18.2.ebuild
deleted file mode 100644
index b47db6eeb0ce..000000000000
--- a/app-crypt/mit-krb5/mit-krb5-1.18.2.ebuild
+++ /dev/null
@@ -1,165 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-inherit autotools flag-o-matic multilib-minimal python-any-r1 systemd
-
-MY_P="${P/mit-}"
-P_DIR=$(ver_cut 1-2)
-DESCRIPTION="MIT Kerberos V"
-HOMEPAGE="https://web.mit.edu/kerberos/www/"
-SRC_URI="https://web.mit.edu/kerberos/dist/krb5/${P_DIR}/${MY_P}.tar.gz"
-
-LICENSE="openafs-krb5-a BSD MIT OPENLDAP BSD-2 HPND BSD-4 ISC RSA CC-BY-SA-3.0 || ( BSD-2 GPL-2+ )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="cpu_flags_x86_aes doc +keyutils libressl lmdb nls openldap +pkinit selinux +threads test xinetd"
-
-# Test suite requires network access
-RESTRICT="test"
-
-DEPEND="
- !!app-crypt/heimdal
- >=sys-libs/e2fsprogs-libs-1.42.9[${MULTILIB_USEDEP}]
- || (
- >=dev-libs/libverto-0.2.5[libev,${MULTILIB_USEDEP}]
- >=dev-libs/libverto-0.2.5[libevent,${MULTILIB_USEDEP}]
- >=dev-libs/libverto-0.2.5[tevent,${MULTILIB_USEDEP}]
- )
- keyutils? ( >=sys-apps/keyutils-1.5.8:=[${MULTILIB_USEDEP}] )
- lmdb? ( dev-db/lmdb )
- nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] )
- openldap? ( >=net-nds/openldap-2.4.38-r1[${MULTILIB_USEDEP}] )
- pkinit? (
- !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
- libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
- )
- xinetd? ( sys-apps/xinetd )
- "
-BDEPEND="
- ${PYTHON_DEPS}
- virtual/yacc
- cpu_flags_x86_aes? (
- amd64? ( dev-lang/yasm )
- x86? ( dev-lang/yasm )
- )
- doc? ( virtual/latex-base )
- test? (
- ${PYTHON_DEPS}
- dev-lang/tcl:0
- dev-util/dejagnu
- dev-util/cmocka
- )"
-RDEPEND="${DEPEND}
- selinux? ( sec-policy/selinux-kerberos )"
-
-S=${WORKDIR}/${MY_P}/src
-
-PATCHES=(
- "${FILESDIR}/${PN}-1.12_warn_cflags.patch"
- "${FILESDIR}/${PN}-config_LDFLAGS-r1.patch"
- "${FILESDIR}/${PN}-1.16.3-libressl-r1.patch"
- "${FILESDIR}/${PN}_dont_create_run.patch"
- "${FILESDIR}/${PN}-1.18-libressl.patch"
-)
-
-MULTILIB_CHOST_TOOLS=(
- /usr/bin/krb5-config
-)
-
-src_prepare() {
- default
- # Make sure we always use the system copies.
- rm -rf util/{et,ss,verto}
- sed -i 's:^[[:space:]]*util/verto$::' configure.ac || die
-
- eautoreconf
-}
-
-src_configure() {
- # QA
- append-flags -fno-strict-aliasing
- append-flags -fno-strict-overflow
-
- multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
- ECONF_SOURCE=${S} \
- WARN_CFLAGS="set" \
- econf \
- $(use_with openldap ldap) \
- "$(multilib_native_use_with test tcl "${EPREFIX}/usr")" \
- $(use_enable nls) \
- $(use_enable pkinit) \
- $(use_enable threads thread-support) \
- $(use_with lmdb) \
- $(use_with keyutils) \
- --without-hesiod \
- --enable-shared \
- --with-system-et \
- --with-system-ss \
- --enable-dns-for-realm \
- --enable-kdc-lookaside-cache \
- --with-system-verto \
- --disable-rpath
-}
-
-multilib_src_compile() {
- emake -j1
-}
-
-multilib_src_test() {
- multilib_is_native_abi && emake -j1 check
-}
-
-multilib_src_install() {
- emake \
- DESTDIR="${D}" \
- EXAMPLEDIR="${EPREFIX}/usr/share/doc/${PF}/examples" \
- install
-}
-
-multilib_src_install_all() {
- # default database dir
- keepdir /var/lib/krb5kdc
-
- cd ..
- dodoc README
-
- if use doc; then
- dodoc -r doc/html
- docinto pdf
- dodoc doc/pdf/*.pdf
- fi
-
- newinitd "${FILESDIR}"/mit-krb5kadmind.initd-r2 mit-krb5kadmind
- newinitd "${FILESDIR}"/mit-krb5kdc.initd-r2 mit-krb5kdc
- newinitd "${FILESDIR}"/mit-krb5kpropd.initd-r2 mit-krb5kpropd
- newconfd "${FILESDIR}"/mit-krb5kadmind.confd mit-krb5kadmind
- newconfd "${FILESDIR}"/mit-krb5kdc.confd mit-krb5kdc
- newconfd "${FILESDIR}"/mit-krb5kpropd.confd mit-krb5kpropd
-
- systemd_newunit "${FILESDIR}"/mit-krb5kadmind.service mit-krb5kadmind.service
- systemd_newunit "${FILESDIR}"/mit-krb5kdc.service mit-krb5kdc.service
- systemd_newunit "${FILESDIR}"/mit-krb5kpropd.service mit-krb5kpropd.service
- systemd_newunit "${FILESDIR}"/mit-krb5kpropd_at.service "mit-krb5kpropd@.service"
- systemd_newunit "${FILESDIR}"/mit-krb5kpropd.socket mit-krb5kpropd.socket
-
- insinto /etc
- newins "${ED}/usr/share/doc/${PF}/examples/krb5.conf" krb5.conf.example
- insinto /var/lib/krb5kdc
- newins "${ED}/usr/share/doc/${PF}/examples/kdc.conf" kdc.conf.example
-
- if use openldap ; then
- insinto /etc/openldap/schema
- doins "${S}/plugins/kdb/ldap/libkdb_ldap/kerberos.schema"
- fi
-
- if use xinetd ; then
- insinto /etc/xinetd.d
- newins "${FILESDIR}/kpropd.xinetd" kpropd
- fi
-}
diff --git a/app-crypt/mit-krb5/mit-krb5-1.18.ebuild b/app-crypt/mit-krb5/mit-krb5-1.18.ebuild
deleted file mode 100644
index 57ab56ddfb38..000000000000
--- a/app-crypt/mit-krb5/mit-krb5-1.18.ebuild
+++ /dev/null
@@ -1,166 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-inherit autotools flag-o-matic multilib-minimal python-any-r1 systemd
-
-MY_P="${P/mit-}"
-P_DIR=$(ver_cut 1-2)
-DESCRIPTION="MIT Kerberos V"
-HOMEPAGE="https://web.mit.edu/kerberos/www/"
-SRC_URI="https://web.mit.edu/kerberos/dist/krb5/${P_DIR}/${MY_P}.tar.gz"
-
-LICENSE="openafs-krb5-a BSD MIT OPENLDAP BSD-2 HPND BSD-4 ISC RSA CC-BY-SA-3.0 || ( BSD-2 GPL-2+ )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="cpu_flags_x86_aes doc +keyutils libressl lmdb nls openldap +pkinit selinux +threads test xinetd"
-RESTRICT="!test? ( test )"
-
-# Test suite requires network access
-RESTRICT="test"
-
-DEPEND="
- !!app-crypt/heimdal
- >=sys-libs/e2fsprogs-libs-1.42.9[${MULTILIB_USEDEP}]
- || (
- >=dev-libs/libverto-0.2.5[libev,${MULTILIB_USEDEP}]
- >=dev-libs/libverto-0.2.5[libevent,${MULTILIB_USEDEP}]
- >=dev-libs/libverto-0.2.5[tevent,${MULTILIB_USEDEP}]
- )
- keyutils? ( >=sys-apps/keyutils-1.5.8:=[${MULTILIB_USEDEP}] )
- lmdb? ( dev-db/lmdb )
- nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] )
- openldap? ( >=net-nds/openldap-2.4.38-r1[${MULTILIB_USEDEP}] )
- pkinit? (
- !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
- libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
- )
- xinetd? ( sys-apps/xinetd )
- "
-BDEPEND="
- ${PYTHON_DEPS}
- virtual/yacc
- cpu_flags_x86_aes? (
- amd64? ( dev-lang/yasm )
- x86? ( dev-lang/yasm )
- )
- doc? ( virtual/latex-base )
- test? (
- ${PYTHON_DEPS}
- dev-lang/tcl:0
- dev-util/dejagnu
- dev-util/cmocka
- )"
-RDEPEND="${DEPEND}
- selinux? ( sec-policy/selinux-kerberos )"
-
-S=${WORKDIR}/${MY_P}/src
-
-PATCHES=(
- "${FILESDIR}/${PN}-1.12_warn_cflags.patch"
- "${FILESDIR}/${PN}-config_LDFLAGS-r1.patch"
- "${FILESDIR}/${PN}-1.16.3-libressl-r1.patch"
- "${FILESDIR}/${PN}_dont_create_run.patch"
- "${FILESDIR}/${P}-libressl.patch"
-)
-
-MULTILIB_CHOST_TOOLS=(
- /usr/bin/krb5-config
-)
-
-src_prepare() {
- default
- # Make sure we always use the system copies.
- rm -rf util/{et,ss,verto}
- sed -i 's:^[[:space:]]*util/verto$::' configure.ac || die
-
- eautoreconf
-}
-
-src_configure() {
- # QA
- append-flags -fno-strict-aliasing
- append-flags -fno-strict-overflow
-
- multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
- ECONF_SOURCE=${S} \
- WARN_CFLAGS="set" \
- econf \
- $(use_with openldap ldap) \
- "$(multilib_native_use_with test tcl "${EPREFIX}/usr")" \
- $(use_enable nls) \
- $(use_enable pkinit) \
- $(use_enable threads thread-support) \
- $(use_with lmdb) \
- $(use_with keyutils) \
- --without-hesiod \
- --enable-shared \
- --with-system-et \
- --with-system-ss \
- --enable-dns-for-realm \
- --enable-kdc-lookaside-cache \
- --with-system-verto \
- --disable-rpath
-}
-
-multilib_src_compile() {
- emake -j1
-}
-
-multilib_src_test() {
- multilib_is_native_abi && emake -j1 check
-}
-
-multilib_src_install() {
- emake \
- DESTDIR="${D}" \
- EXAMPLEDIR="${EPREFIX}/usr/share/doc/${PF}/examples" \
- install
-}
-
-multilib_src_install_all() {
- # default database dir
- keepdir /var/lib/krb5kdc
-
- cd ..
- dodoc README
-
- if use doc; then
- dodoc -r doc/html
- docinto pdf
- dodoc doc/pdf/*.pdf
- fi
-
- newinitd "${FILESDIR}"/mit-krb5kadmind.initd-r2 mit-krb5kadmind
- newinitd "${FILESDIR}"/mit-krb5kdc.initd-r2 mit-krb5kdc
- newinitd "${FILESDIR}"/mit-krb5kpropd.initd-r2 mit-krb5kpropd
- newconfd "${FILESDIR}"/mit-krb5kadmind.confd mit-krb5kadmind
- newconfd "${FILESDIR}"/mit-krb5kdc.confd mit-krb5kdc
- newconfd "${FILESDIR}"/mit-krb5kpropd.confd mit-krb5kpropd
-
- systemd_newunit "${FILESDIR}"/mit-krb5kadmind.service mit-krb5kadmind.service
- systemd_newunit "${FILESDIR}"/mit-krb5kdc.service mit-krb5kdc.service
- systemd_newunit "${FILESDIR}"/mit-krb5kpropd.service mit-krb5kpropd.service
- systemd_newunit "${FILESDIR}"/mit-krb5kpropd_at.service "mit-krb5kpropd@.service"
- systemd_newunit "${FILESDIR}"/mit-krb5kpropd.socket mit-krb5kpropd.socket
-
- insinto /etc
- newins "${ED}/usr/share/doc/${PF}/examples/krb5.conf" krb5.conf.example
- insinto /var/lib/krb5kdc
- newins "${ED}/usr/share/doc/${PF}/examples/kdc.conf" kdc.conf.example
-
- if use openldap ; then
- insinto /etc/openldap/schema
- doins "${S}/plugins/kdb/ldap/libkdb_ldap/kerberos.schema"
- fi
-
- if use xinetd ; then
- insinto /etc/xinetd.d
- newins "${FILESDIR}/kpropd.xinetd" kpropd
- fi
-}
diff --git a/app-crypt/pgpdump/pgpdump-0.33.ebuild b/app-crypt/pgpdump/pgpdump-0.33.ebuild
index 6a23e5364f66..8372332fd7e8 100644
--- a/app-crypt/pgpdump/pgpdump-0.33.ebuild
+++ b/app-crypt/pgpdump/pgpdump-0.33.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
@@ -9,7 +9,7 @@ SRC_URI="http://www.mew.org/~kazu/proj/pgpdump/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="amd64 ppc sparc x86"
+KEYWORDS="amd64 ~arm64 ppc sparc x86"
IUSE=""
DEPEND="sys-libs/zlib
diff --git a/app-crypt/qca/qca-2.3.1.ebuild b/app-crypt/qca/qca-2.3.1.ebuild
index 848ff4467833..b954f235e01f 100644
--- a/app-crypt/qca/qca-2.3.1.ebuild
+++ b/app-crypt/qca/qca-2.3.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
LICENSE="LGPL-2.1"
SLOT="2"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
IUSE="botan debug doc examples gcrypt gpg logger nss pkcs11 sasl softstore +ssl test"
RESTRICT="!test? ( test )"
diff --git a/app-dicts/Manifest.gz b/app-dicts/Manifest.gz
index 4e0379e9fdce..81d914204427 100644
Binary files a/app-dicts/Manifest.gz and b/app-dicts/Manifest.gz differ
diff --git a/app-dicts/sword-GerHfa2002/sword-GerHfa2002-1.1.ebuild b/app-dicts/sword-GerHfa2002/sword-GerHfa2002-1.1.ebuild
index c0564d5d3e0d..219c4b21763f 100644
--- a/app-dicts/sword-GerHfa2002/sword-GerHfa2002-1.1.ebuild
+++ b/app-dicts/sword-GerHfa2002/sword-GerHfa2002-1.1.ebuild
@@ -9,5 +9,16 @@ inherit sword-module
DESCRIPTION="Hoffnung fuer alle - Die Bibel"
HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=GerHfa2002"
-LICENSE="freedist"
+LICENSE="sword-GerHfa2002"
KEYWORDS="~amd64 ~ppc ~x86"
+
+pkg_postinst() {
+ if [[ -z "${REPLACING_VERSIONS}" ]]; then
+ elog "This SWORD module is locked. If you haven't done so yet, please visit"
+ elog
+ elog "https://crosswire.org/sword/modules/registration/gerhfa2002.jsp"
+ elog "(in German only)"
+ elog
+ elog "for information about purchasing and installing an unlock key."
+ fi
+}
diff --git a/app-dicts/sword-GerHfaLex2002/sword-GerHfaLex2002-1.0.1.ebuild b/app-dicts/sword-GerHfaLex2002/sword-GerHfaLex2002-1.0.1.ebuild
index 68d2493be47e..ec86c8cbc72f 100644
--- a/app-dicts/sword-GerHfaLex2002/sword-GerHfaLex2002-1.0.1.ebuild
+++ b/app-dicts/sword-GerHfaLex2002/sword-GerHfaLex2002-1.0.1.ebuild
@@ -9,5 +9,16 @@ inherit sword-module
DESCRIPTION="Hoffnung fuer alle - Worterklaerungen"
HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=GerHfaLex2002"
-LICENSE="freedist"
+LICENSE="sword-GerHfa2002"
KEYWORDS="~amd64 ~ppc ~x86"
+
+pkg_postinst() {
+ if [[ -z "${REPLACING_VERSIONS}" ]]; then
+ elog "This SWORD module is locked. If you haven't done so yet, please visit"
+ elog
+ elog "https://crosswire.org/sword/modules/registration/gerhfa2002.jsp"
+ elog "(in German only)"
+ elog
+ elog "for information about purchasing and installing an unlock key."
+ fi
+}
diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index 625e6909482c..19b3cdb05e64 100644
Binary files a/app-editors/Manifest.gz and b/app-editors/Manifest.gz differ
diff --git a/app-editors/nano/nano-4.9.3.ebuild b/app-editors/nano/nano-4.9.3.ebuild
index 99ad346b01fa..57c31ee2a850 100644
--- a/app-editors/nano/nano-4.9.3.ebuild
+++ b/app-editors/nano/nano-4.9.3.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
else
MY_P="${PN}-${PV/_}"
SRC_URI="https://www.nano-editor.org/dist/v${PV:0:1}/${MY_P}.tar.gz"
- KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
DESCRIPTION="GNU GPL'd Pico clone with more functionality"
diff --git a/app-emacs/Manifest.gz b/app-emacs/Manifest.gz
index bef1a74609c1..be71d38f5a54 100644
Binary files a/app-emacs/Manifest.gz and b/app-emacs/Manifest.gz differ
diff --git a/app-emacs/vterm/Manifest b/app-emacs/vterm/Manifest
new file mode 100644
index 000000000000..f04e9cddcdd8
--- /dev/null
+++ b/app-emacs/vterm/Manifest
@@ -0,0 +1 @@
+DIST vterm-0.0.1_pre20200713.tar.gz 48160 BLAKE2B 96c45ddb139d19f3020d7a8eebc1ee31a7dc098f47c16cfffc7bf3327261a4366763744a8158d3c8a066ec94be4966a5ef78804db95c9025eee06fb8c9e4aa76 SHA512 17726ad0957daeab2a87b398bfa24dbe3c4c48dfba932138a71cd8c992bf20bd2925a7118a89247bbd674dbecd7fda8663c564a278168bb207034efb03e50cd0
diff --git a/app-emacs/vterm/files/50vterm-gentoo.el b/app-emacs/vterm/files/50vterm-gentoo.el
new file mode 100644
index 000000000000..b3e234eba1cb
--- /dev/null
+++ b/app-emacs/vterm/files/50vterm-gentoo.el
@@ -0,0 +1,5 @@
+(add-to-list 'load-path "@SITELISP@")
+(add-to-list 'load-path "@EMACSMODULES@")
+(autoload 'vterm "vterm" "Create a new vterm." t)
+(autoload 'vterm-other-window "vterm"
+ "Create a new vterm in another window." t)
diff --git a/app-emacs/vterm/files/vterm-dont-compile.patch b/app-emacs/vterm/files/vterm-dont-compile.patch
new file mode 100644
index 000000000000..6b08ae812360
--- /dev/null
+++ b/app-emacs/vterm/files/vterm-dont-compile.patch
@@ -0,0 +1,22 @@
+Simply error out if the module is not found. Don't confuse the user
+with messages about compiling the module, which won't work outside of
+the package's source tree.
+
+--- a/vterm.el
++++ b/vterm.el
+@@ -121,14 +121,7 @@
+ (message "Compilation of `emacs-libvterm' module succeeded")
+ (error "Compilation of `emacs-libvterm' module failed!")))))
+
+-;; If the vterm-module is not compiled yet, compile it
+-(unless (require 'vterm-module nil t)
+- (if (or vterm-always-compile-module
+- (y-or-n-p "Vterm needs `vterm-module' to work. Compile it now? "))
+- (progn
+- (vterm-module-compile)
+- (require 'vterm-module))
+- (error "Vterm will not work until `vterm-module' is compiled!")))
++(require 'vterm-module)
+
+ ;; Silence compiler warnings by informing it of what functions are defined
+ (declare-function display-line-numbers-update-width "display-line-numbers")
diff --git a/app-emacs/vterm/metadata.xml b/app-emacs/vterm/metadata.xml
new file mode 100644
index 000000000000..ac2faa79e283
--- /dev/null
+++ b/app-emacs/vterm/metadata.xml
@@ -0,0 +1,17 @@
+
+
+
+
+ gnu-emacs@gentoo.org
+ Gentoo GNU Emacs project
+
+
+ Emacs-libvterm (vterm) is fully-fledged terminal emulator inside
+ GNU Emacs based on libvterm, a C library. As a result of using
+ compiled code (instead of elisp), emacs-libvterm is fully capable,
+ fast, and it can seamlessly handle large outputs.
+
+
+ akermu/emacs-libvterm
+
+
diff --git a/app-emacs/vterm/vterm-0.0.1_pre20200713.ebuild b/app-emacs/vterm/vterm-0.0.1_pre20200713.ebuild
new file mode 100644
index 000000000000..898f9f5d34a4
--- /dev/null
+++ b/app-emacs/vterm/vterm-0.0.1_pre20200713.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+NEED_EMACS=26
+COMMIT="f41849c2c9c1899f22d1c3d4f871ec47c82627ce"
+
+inherit cmake elisp
+
+MY_PN="emacs-libvterm"
+DESCRIPTION="Fully-featured terminal emulator based on libvterm"
+HOMEPAGE="https://github.com/akermu/emacs-libvterm"
+SRC_URI="https://github.com/akermu/${MY_PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="dev-libs/libvterm"
+RDEPEND="${DEPEND}
+ >=app-editors/emacs-26:*[dynamic-loading]"
+
+S="${WORKDIR}/${MY_PN}-${COMMIT}"
+PATCHES=( "${FILESDIR}"/${PN}-dont-compile.patch )
+SITEFILE="50${PN}-gentoo.el"
+DOCS="README.md"
+
+src_prepare() {
+ cmake_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=( "-DUSE_SYSTEM_LIBVTERM=ON" )
+ cmake_src_configure
+}
+
+src_compile() {
+ cmake_src_compile
+ elisp_src_compile
+}
+
+src_install() {
+ elisp_src_install
+ elisp-modules-install ${PN} vterm-module.so
+}
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index 6fa6dff35ac3..ccbd86fd7993 100644
Binary files a/app-emulation/Manifest.gz and b/app-emulation/Manifest.gz differ
diff --git a/app-emulation/ganeti/files/ganeti-2.15-disable-docs.patch b/app-emulation/ganeti/files/ganeti-2.15-disable-docs.patch
new file mode 100644
index 000000000000..adc2813d6a30
--- /dev/null
+++ b/app-emulation/ganeti/files/ganeti-2.15-disable-docs.patch
@@ -0,0 +1,44 @@
+--- a/Makefile.am 2020-08-04 18:21:12.395282115 +0000
++++ b/Makefile.am 2020-08-04 18:21:48.636729501 +0000
+@@ -1160,41 +1160,6 @@
+ # has to exist in order for the sphinx module to be loaded
+ # successfully, but we certainly don't want the docs to be rebuilt if
+ # it changes
+-doc/html/index.html doc/man-html/index.html: $(docinput) doc/conf.py \
+- configure.ac $(RUN_IN_TEMPDIR) lib/build/sphinx_ext.py \
+- lib/build/shell_example_lexer.py lib/ht.py \
+- doc/css/style.css lib/rapi/connector.py lib/rapi/rlib2.py \
+- autotools/sphinx-wrapper | $(built_python_sources)
+- @test -n "$(SPHINX)" || \
+- { echo 'sphinx-build' not found during configure; exit 1; }
+-if !MANPAGES_IN_DOC
+- if test -n '$(ENABLE_MANPAGES)'; then \
+- echo 'Man pages in documentation were disabled at configure time' >&2; \
+- exit 1; \
+- fi
+-endif
+-## Sphinx provides little control over what content should be included. Some
+-## mechanisms exist, but they all have drawbacks or actual issues. Since we
+-## build two different versions of the documentation--once without man pages and
+-## once, if enabled, with them--some control is necessary. xmpp-wrapper provides
+-## us with this, but requires running in a temporary directory. It moves the
+-## correct files into place depending on environment variables.
+- dir=$(dir $@) && \
+- @mkdir_p@ $$dir && \
+- PYTHONPATH=. ENABLE_MANPAGES=$(ENABLE_MANPAGES) COPY_DOC=1 \
+- HTML_THEME=$(SPHINX_HTML_THEME) \
+- $(RUN_IN_TEMPDIR) autotools/sphinx-wrapper $(SPHINX) -q -W -b html \
+- -d . \
+- -D version="$(VERSION_MAJOR).$(VERSION_MINOR)" \
+- -D release="$(PACKAGE_VERSION)" \
+- -D graphviz_dot="$(DOT)" \
+- doc $(CURDIR)/$$dir && \
+- rm -f $$dir/.buildinfo $$dir/objects.inv
+- touch $@
+-
+-doc/html: doc/html/index.html
+-
+-doc/man-html: doc/man-html/index.html
+
+ doc/install-quick.rst: INSTALL
+ doc/news.rst: NEWS
diff --git a/app-emulation/ganeti/ganeti-2.15.2-r11.ebuild b/app-emulation/ganeti/ganeti-2.15.2-r11.ebuild
index 13b15c795463..0bd0b47f753a 100644
--- a/app-emulation/ganeti/ganeti-2.15.2-r11.ebuild
+++ b/app-emulation/ganeti/ganeti-2.15.2-r11.ebuild
@@ -20,6 +20,7 @@ SRC_URI="
KEYWORDS="~amd64 ~x86"
PATCHES=(
"${FILESDIR}"/ganeti-2.15-use-balloon-device.patch
+ "${FILESDIR}"/ganeti-2.15-disable-docs.patch
"${WORKDIR}"/debian/patches/do-not-backup-export-dir.patch
"${WORKDIR}"/debian/patches/Makefile.am-use-C.UTF-8
"${WORKDIR}"/debian/patches/relax-deps
diff --git a/app-emulation/lxc/Manifest b/app-emulation/lxc/Manifest
index 224587192592..ae4ea385e379 100644
--- a/app-emulation/lxc/Manifest
+++ b/app-emulation/lxc/Manifest
@@ -1,2 +1 @@
-DIST lxc-4.0.2.tar.gz 1352667 BLAKE2B 2ecc076bacb9bb1c2a808422f7b2e0cbfc74bf3bec6ca89ea58eb6ef4a414353c2e58163bff17b3304beb39f4980d10f54365f739645c1581bfca9f6079bf57c SHA512 0de6c1f9649d161579b45fc28a735f703c4498eff9c588462b838220aeab73f91921db628f77bc461eff38c7583cac10a38951263181956e2d33412a406f3ef3
DIST lxc-4.0.3.tar.gz 1368461 BLAKE2B 861bd8f3736ecda9075c57338845d386811ae3aeceb72cd054023a25a9758d5d7c9ceec917fc634c118a13f8fb142b28bd93f27138b9ee1d0817f8360fda88da SHA512 a5d45626b1f26c0f098f6f0f5852472ea065f65f9918b972826e087a9a71a34253c85dd6f1b6b6837ca97303f8d43478a66595057d65a6e72a72334a3257ef88
diff --git a/app-emulation/lxc/lxc-4.0.2-r2.ebuild b/app-emulation/lxc/lxc-4.0.2-r2.ebuild
deleted file mode 100644
index 18554a5e703a..000000000000
--- a/app-emulation/lxc/lxc-4.0.2-r2.ebuild
+++ /dev/null
@@ -1,160 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools bash-completion-r1 linux-info flag-o-matic pam readme.gentoo-r1 systemd
-
-DESCRIPTION="LinuX Containers userspace utilities"
-HOMEPAGE="https://linuxcontainers.org/ https://github.com/lxc/lxc"
-SRC_URI="https://linuxcontainers.org/downloads/lxc/${P}.tar.gz"
-
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
-
-LICENSE="LGPL-3"
-SLOT="0"
-IUSE="apparmor +caps doc examples libressl pam seccomp selinux +ssl +templates +tools"
-
-RDEPEND="app-misc/pax-utils
- sys-apps/util-linux
- sys-libs/libcap
- virtual/awk
- caps? ( sys-libs/libcap )
- pam? ( sys-libs/pam )
- seccomp? ( sys-libs/libseccomp )
- selinux? ( sys-libs/libselinux )
- ssl? (
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:0= )
- )"
-DEPEND="${RDEPEND}
- >=app-text/docbook-sgml-utils-0.6.14-r2
- >=sys-kernel/linux-headers-3.2
- apparmor? ( sys-apps/apparmor )"
-BDEPEND="doc? ( app-doc/doxygen )"
-PDEPEND="templates? ( app-emulation/lxc-templates )"
-
-CONFIG_CHECK="~CGROUPS ~CGROUP_DEVICE
- ~CPUSETS ~CGROUP_CPUACCT
- ~CGROUP_SCHED
-
- ~NAMESPACES
- ~IPC_NS ~USER_NS ~PID_NS
-
- ~CGROUP_FREEZER
- ~UTS_NS ~NET_NS
- ~VETH ~MACVLAN
-
- ~POSIX_MQUEUE
- ~!NETPRIO_CGROUP"
-
-ERROR_CGROUP_FREEZER="CONFIG_CGROUP_FREEZER: needed to freeze containers"
-ERROR_UTS_NS="CONFIG_UTS_NS: needed to unshare hostnames and uname info"
-ERROR_NET_NS="CONFIG_NET_NS: needed for unshared network"
-ERROR_VETH="CONFIG_VETH: needed for internal (host-to-container) networking"
-ERROR_MACVLAN="CONFIG_MACVLAN: needed for internal (inter-container) networking"
-ERROR_POSIX_MQUEUE="CONFIG_POSIX_MQUEUE: needed for lxc-execute command"
-ERROR_NETPRIO_CGROUP="CONFIG_NETPRIO_CGROUP: as of kernel 3.3 and lxc 0.8.0_rc1 this causes LXCs to fail booting."
-
-DOCS=( AUTHORS CONTRIBUTING MAINTAINERS NEWS README doc/FAQ.txt )
-
-pkg_setup() {
- linux-info_pkg_setup
-}
-
-PATCHES=(
- "${FILESDIR}"/${PN}-3.0.0-bash-completion.patch
- "${FILESDIR}"/${PN}-2.0.5-omit-sysconfig.patch # bug 558854
-)
-
-src_prepare() {
- default
- eautoreconf
-}
-
-src_configure() {
- append-flags -fno-strict-aliasing
-
- # --enable-doc is for manpages which is why we don't link it to a "doc"
- # USE flag. We always want man pages.
- local myeconfargs=(
- --bindir=/usr/bin
- --localstatedir=/var
- --sbindir=/usr/bin
-
- --with-config-path=/var/lib/lxc
- --with-distro=gentoo
- --with-init-script=systemd
- --with-rootfs-path=/var/lib/lxc/rootfs
- --with-runtime-path=/run
- --with-systemdsystemunitdir=$(systemd_get_systemunitdir)
-
- --disable-asan
- --disable-coverity-build
- --disable-dlog
- --disable-mutex-debugging
- --disable-rpath
- --disable-tests
- --disable-ubsan
- --disable-werror
-
- --enable-bash
- --enable-commands
- --enable-doc
- --enable-memfd-rexec
- --enable-thread-safety
-
- $(use_enable apparmor)
- $(use_enable caps capabilities)
- $(use_enable doc api-docs)
- $(use_enable examples)
- $(use_enable pam)
- $(use_enable seccomp)
- $(use_enable selinux)
- $(use_enable ssl openssl)
- $(use_enable tools)
-
- $(use_with pam pamdir $(getpam_mod_dir))
- )
-
- econf "${myeconfargs[@]}"
-}
-
-src_install() {
- default
-
- mv "${ED}"/usr/share/bash-completion/completions/${PN} "${ED}"/$(get_bashcompdir)/${PN}-start || die
- bashcomp_alias ${PN}-start \
- ${PN}-{attach,cgroup,copy,console,create,destroy,device,execute,freeze,info,monitor,snapshot,stop,unfreeze,wait}
-
- keepdir /etc/lxc /var/lib/lxc/rootfs /var/log/lxc
- rmdir "${D}"/var/cache/lxc "${D}"/var/cache || die "rmdir failed"
-
- find "${D}" -name '*.la' -delete -o -name '*.a' -delete || die
-
- # Gentoo-specific additions!
- newinitd "${FILESDIR}/${PN}.initd.8" ${PN}
-
- # Remember to compare our systemd unit file with the upstream one
- # config/init/systemd/lxc.service.in
- systemd_newunit "${FILESDIR}"/${PN}_at.service.4.0.0 "lxc@.service"
-
- DOC_CONTENTS="
- For openrc, there is an init script provided with the package.
- You _should_ only need to symlink /etc/init.d/lxc to
- /etc/init.d/lxc.configname to start the container defined in
- /etc/lxc/configname.conf.
-
- Correspondingly, for systemd a service file lxc@.service is installed.
- Enable and start lxc@configname in order to start the container defined
- in /etc/lxc/configname.conf.
-
- If you want checkpoint/restore functionality, please install criu
- (sys-process/criu)."
- DISABLE_AUTOFORMATTING=true
- readme.gentoo_create_doc
-}
-
-pkg_postinst() {
- readme.gentoo_print_elog
-}
diff --git a/app-emulation/lxc/lxc-4.0.3.ebuild b/app-emulation/lxc/lxc-4.0.3.ebuild
index 9f71458a5e7e..18554a5e703a 100644
--- a/app-emulation/lxc/lxc-4.0.3.ebuild
+++ b/app-emulation/lxc/lxc-4.0.3.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="LinuX Containers userspace utilities"
HOMEPAGE="https://linuxcontainers.org/ https://github.com/lxc/lxc"
SRC_URI="https://linuxcontainers.org/downloads/lxc/${P}.tar.gz"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
LICENSE="LGPL-3"
SLOT="0"
diff --git a/app-i18n/Manifest.gz b/app-i18n/Manifest.gz
index 129bc952d143..91cf9de5440f 100644
Binary files a/app-i18n/Manifest.gz and b/app-i18n/Manifest.gz differ
diff --git a/app-i18n/yaskkserv/yaskkserv-1.1.1.ebuild b/app-i18n/yaskkserv/yaskkserv-1.1.1.ebuild
index aa86f7b65fdc..2ddbb09ee7fc 100644
--- a/app-i18n/yaskkserv/yaskkserv-1.1.1.ebuild
+++ b/app-i18n/yaskkserv/yaskkserv-1.1.1.ebuild
@@ -31,7 +31,7 @@ src_configure() {
econf \
$(use_enable gnutls) \
$(use_enable systemd) \
- --compiler="${tc-getCXX}"
+ --compiler="$(tc-getCXX)"
}
src_install() {
diff --git a/app-metrics/Manifest.gz b/app-metrics/Manifest.gz
index 3a5df972d7d4..7eb86d999a6e 100644
Binary files a/app-metrics/Manifest.gz and b/app-metrics/Manifest.gz differ
diff --git a/app-metrics/collectd/collectd-5.10.0.ebuild b/app-metrics/collectd/collectd-5.10.0.ebuild
index 16fc096048b0..08653b81531b 100644
--- a/app-metrics/collectd/collectd-5.10.0.ebuild
+++ b/app-metrics/collectd/collectd-5.10.0.ebuild
@@ -56,7 +56,7 @@ COLLECTD_TESTED_PLUGINS="aggregation amqp apache apcups ascent battery bind
memcachec memcached memory modbus mqtt multimeter mysql netlink
network network nfs nginx notify_desktop notify_email notify_nagios
ntpd numa nut olsrd onewire openldap openvpn oracle ovs_events
- ovs_stats perl ping postgresql powerdns processes protocols python
+ ovs_stats perl ping postgresql powerdns processes protocols
python redis routeros rrdcached rrdtool sensors serial sigrok smart
snmp snmp_agent statsd swap sysevent syslog table tail tail_csv
target_notification target_replace target_scale target_set tcpconns
diff --git a/app-metrics/collectd/collectd-5.11.0-r2.ebuild b/app-metrics/collectd/collectd-5.11.0-r2.ebuild
index 85a978ee3c47..d8acd70eb213 100644
--- a/app-metrics/collectd/collectd-5.11.0-r2.ebuild
+++ b/app-metrics/collectd/collectd-5.11.0-r2.ebuild
@@ -59,7 +59,7 @@ COLLECTD_TESTED_PLUGINS="aggregation amqp apache apcups ascent battery bind
multimeter mysql netlink network network nfs nginx notify_desktop
notify_email notify_nagios ntpd numa nut olsrd onewire openldap
openvpn oracle ovs_events ovs_stats pcie_errors perl ping postgresql
- powerdns procevent processes protocols python python redis routeros
+ powerdns procevent processes protocols python redis routeros
rrdcached rrdtool sensors serial sigrok slurm smart snmp snmp_agent
statsd swap synproxy sysevent syslog table tail tail_csv
target_notification target_replace target_scale target_set tcpconns
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index aa4639f6f17b..3150dce33309 100644
Binary files a/app-misc/Manifest.gz and b/app-misc/Manifest.gz differ
diff --git a/app-misc/datovka/Manifest b/app-misc/datovka/Manifest
index f500389aadf6..c63f3d1cf672 100644
--- a/app-misc/datovka/Manifest
+++ b/app-misc/datovka/Manifest
@@ -1 +1,2 @@
DIST datovka-4.15.0.tar.xz 2816380 BLAKE2B 4e7d74bfc95286f9b6af3e84cd1439ca22b9aa83735cdde76827d49957bc210105ef82d6c1cb2c6ab861cd38ef852d043bf1fc30c22264aedb22f598c6c78ab0 SHA512 c379c61e091b92db0a061bff943f0f95e8627b2806641e001de090fafe8407b9a1167697b0b009217c0999c4ec2f61cb2bf3d3a8f5b234ed823ec6b88b6232fb
+DIST datovka-4.15.1.tar.xz 2821764 BLAKE2B ebc0eb75b239579224f77f1894d05fb617dc1556033ee1e82a27fb13b71284dcbe3b4dfff1711084869f7cc82837487f3676d9c3d681e91b0232cee0c77b7da0 SHA512 7f2286f6af5350be668a83098d65f49ead31473b0d2f3d4d336089bdd73cf6a6cec007112c0e10f08ecbb90e1a29c2ee12cd4773f41c677ebe1127366d06ca20
diff --git a/app-misc/datovka/datovka-4.15.0.ebuild b/app-misc/datovka/datovka-4.15.0.ebuild
index b0cb647f2d37..c1b58089938d 100644
--- a/app-misc/datovka/datovka-4.15.0.ebuild
+++ b/app-misc/datovka/datovka-4.15.0.ebuild
@@ -33,7 +33,8 @@ DEPEND="
>=dev-qt/linguist-tools-${QT_PV}
virtual/pkgconfig
"
-PATCHES=( "${FILESDIR}/${P}-appdata-to-metainfo.patch" )
+PATCHES=( "${FILESDIR}/${P}-appdata-to-metainfo.patch"
+ "${FILESDIR}/${P}-include-QPainterPath.patch" )
DOCS=( ChangeLog README )
src_configure() {
diff --git a/app-misc/datovka/datovka-4.15.1.ebuild b/app-misc/datovka/datovka-4.15.1.ebuild
new file mode 100644
index 000000000000..89144ad68b57
--- /dev/null
+++ b/app-misc/datovka/datovka-4.15.1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit qmake-utils xdg-utils
+
+DESCRIPTION="GUI to access the Czech data box e-government system"
+HOMEPAGE="https://www.datovka.cz/"
+SRC_URI="https://secure.nic.cz/files/datove_schranky/${PV}/${P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# minimum Qt version required
+QT_PV="5.14.0:5"
+
+RDEPEND="
+ >=dev-libs/openssl-1.0.2:0=
+ >=dev-qt/qtcore-${QT_PV}
+ >=dev-qt/qtgui-${QT_PV}
+ >=dev-qt/qtnetwork-${QT_PV}
+ >=dev-qt/qtprintsupport-${QT_PV}
+ >=dev-qt/qtsql-${QT_PV}[sqlite]
+ >=dev-qt/qtsvg-${QT_PV}
+ >=dev-qt/qtwidgets-${QT_PV}
+ >=net-libs/libisds-0.11
+"
+DEPEND="
+ ${RDEPEND}
+ >=dev-qt/linguist-tools-${QT_PV}
+ virtual/pkgconfig
+"
+DOCS=( ChangeLog README )
+
+src_configure() {
+ lrelease datovka.pro || die
+ eqmake5 PREFIX="/usr" DISABLE_VERSION_NOTIFICATION=1 TEXT_FILES_INST_DIR="/usr/share/${PN}/"
+}
+
+src_install() {
+ emake install INSTALL_ROOT="${D}"
+ einstalldocs
+}
+
+pkg_postinst() {
+ xdg_icon_cache_update
+}
+
+pkg_postrm() {
+ xdg_icon_cache_update
+}
diff --git a/app-misc/datovka/files/datovka-4.15.0-include-QPainterPath.patch b/app-misc/datovka/files/datovka-4.15.0-include-QPainterPath.patch
new file mode 100644
index 000000000000..e381c40b5925
--- /dev/null
+++ b/app-misc/datovka/files/datovka-4.15.0-include-QPainterPath.patch
@@ -0,0 +1,10 @@
+--- a/src/delegates/tag_item.cpp 2020-03-04 11:05:08.000000000 +0100
++++ b/src/delegates/tag_item.cpp 2020-06-08 14:52:06.000000000 +0200
+@@ -23,6 +23,7 @@
+
+ #include /* std::sort */
+ #include
++#include
+
+ #include "src/datovka_shared/localisation/localisation.h"
+ #include "src/datovka_shared/log/log.h"
diff --git a/app-misc/ddccontrol-db/Manifest b/app-misc/ddccontrol-db/Manifest
index dbe1b1972389..c612b957c0af 100644
--- a/app-misc/ddccontrol-db/Manifest
+++ b/app-misc/ddccontrol-db/Manifest
@@ -1 +1,3 @@
DIST ddccontrol-db-20061014_p20121105.tar.gz 62043 BLAKE2B 558af647f21839f6df8a19cb84237aeb8ad5d023b1373de3180b9a88fcf7425d17797348cc0e2d44a4d5d1d715a429475873b82d0d8c728d8177b17d77b9cc42 SHA512 323c2ac498f634d20a183ea96e67868b8f3e8bb26da0133b91848b06accbef5605b3d5ca56b4861a8d28d9da9a28b11579a2e1fcc248624835190cdb01943c80
+DIST ddccontrol-db-20190826.tar.gz 76861 BLAKE2B e5f88dc74363b985b34ab7c5427555f725a4c0ad76e9496ceb914062f136443afa85e77710e7966884208e7fb2c30922d340501f365328d1369e76a9088003ce SHA512 f1939568fd77b9a6faf5d848cefe90910134ed4a661d07a399c88bdfdba7f087111dfe95332355080be90fa88011909e28b302248d42a9b909028eaf39a40a7c
+DIST ddccontrol-db-20190826_p20200613.tar.gz 85044 BLAKE2B 6f80a7a53843dc29ff6158614dd36eba3d7f8172e21592776426464729b4bdcfd3bea51b8412919aa5231015f75766da51eb71f4d808b4c280c045209a4edf1a SHA512 9171193fd31c877699df9e8740cbed0a8de68acc41b614ded36022a25be27f01cf34129033ae3c219211bff54ea82882a955f587dfa87fa7571d3992ac3fa4de
diff --git a/app-misc/ddccontrol-db/ddccontrol-db-20190826.ebuild b/app-misc/ddccontrol-db/ddccontrol-db-20190826.ebuild
new file mode 100644
index 000000000000..afe9ca3a52f7
--- /dev/null
+++ b/app-misc/ddccontrol-db/ddccontrol-db-20190826.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit autotools
+
+DESCRIPTION="DDCControl monitor database"
+HOMEPAGE="http://ddccontrol.sourceforge.net/"
+#COMMIT_ID="..."
+MY_PV=${COMMIT_ID:-${PV}}
+SRC_URI="https://github.com/ddccontrol/ddccontrol-db/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="nls"
+
+S=${WORKDIR}/${PN}-${MY_PV}
+
+RDEPEND="nls? ( sys-devel/gettext )"
+DEPEND="${RDEPEND}
+ dev-util/intltool
+ dev-perl/XML-Parser"
+
+src_prepare() {
+ touch db/options.xml.h ABOUT-NLS config.rpath || die
+ eautoreconf
+}
+
+src_configure() {
+ econf $(use_enable nls)
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+ dodoc AUTHORS ChangeLog NEWS README.md
+}
diff --git a/app-misc/ddccontrol-db/ddccontrol-db-20190826_p20200613.ebuild b/app-misc/ddccontrol-db/ddccontrol-db-20190826_p20200613.ebuild
new file mode 100644
index 000000000000..773bddb8a141
--- /dev/null
+++ b/app-misc/ddccontrol-db/ddccontrol-db-20190826_p20200613.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit eutils autotools
+
+DESCRIPTION="DDCControl monitor database"
+HOMEPAGE="http://ddccontrol.sourceforge.net/"
+COMMIT_ID="e75714979448b2f513d5ce65929899fa32a59044"
+MY_PV=${COMMIT_ID:-${PV}}
+SRC_URI="https://github.com/ddccontrol/ddccontrol-db/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="nls"
+
+S=${WORKDIR}/${PN}-${MY_PV}
+
+RDEPEND="nls? ( sys-devel/gettext )"
+DEPEND="${RDEPEND}
+ dev-util/intltool
+ dev-perl/XML-Parser"
+
+src_prepare() {
+ touch db/options.xml.h ABOUT-NLS config.rpath || die
+ eapply_user
+ eautoreconf
+}
+
+src_configure() {
+ econf $(use_enable nls)
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+ dodoc AUTHORS ChangeLog NEWS README.md
+}
diff --git a/app-misc/ddccontrol/Manifest b/app-misc/ddccontrol/Manifest
index 2fea6e00e678..5f850579a23c 100644
--- a/app-misc/ddccontrol/Manifest
+++ b/app-misc/ddccontrol/Manifest
@@ -1 +1,4 @@
DIST ddccontrol-0.4.2_p20140105.tar.gz 177771 BLAKE2B eaaef394a6e9240d1742cc7fbd4ed80ff58315713d3977f8bd1c64f09465fb6a6f9cfb6ccb49e3190291256b6c816512128b95e2dfa16f31e8fadc2aa9367457 SHA512 7a28e9b81ee14e0431c57d372c8d43f861f61c35b441111e1f42d1aa62c333b0cc6a101dcb39d30e9661aaa85a02d755e4adef3a9b20a6952e1599e3ac12c72f
+DIST ddccontrol-0.4.4.tar.gz 164389 BLAKE2B 480b712fc5911fde35a55ff8602866888850edfd6366bf0fb78ac3c726afed7745975b70c3359ae81c2583506ec1b2a2fc3c8a7aab9e8032f16bf27612430084 SHA512 6bc5587bc790492f13c677bd7a48f5ddbaa42f680c56c2fa18488ba5d322b853f6fb520c1317415a20a5df03c24c06edddb5e777d6fb34a34ee459170ae92119
+DIST ddccontrol-0.4.4_p20180123.tar.gz 165833 BLAKE2B d1af2e5f2d78bb9d8cb817e8f2666f70c5fc431a3a535931ea91fef5a2e9500e20e989d24d4cdea4a1c83631df120071bfbf845d342b1e826760f622c9dc5844 SHA512 c49a37e6231f0002a1dd387e2f2f0e1e4f989406bc84320011a55f596c8d1d7e0f094c8ed574db30fd0546fde64c8bd16350412cd4f64cc83b8d44a5469afe1d
+DIST ddccontrol-0.4.4_p20200630.tar.gz 173792 BLAKE2B 7a7ef330eb471f1cbddbfd90745e212a8a66f4be6cc6a4ccb8014c41498a86a09e4bc0226a300201102c202da37c0f4b8020aa88f08b5e2acaa92ac0dc2971b6 SHA512 7aaadf98eaf24d4b040073dce6f469e6e4aaae1efde0e8f988fb9c5fb99b776b1836573c069b9d8f12eaa724d3b39df5d4f247aa47ca2b7911dc9a9df727a50a
diff --git a/app-misc/ddccontrol/ddccontrol-0.4.4.ebuild b/app-misc/ddccontrol/ddccontrol-0.4.4.ebuild
new file mode 100644
index 000000000000..5421c981fa01
--- /dev/null
+++ b/app-misc/ddccontrol/ddccontrol-0.4.4.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils autotools
+
+DESCRIPTION="DDCControl allows control of monitor parameters via DDC"
+HOMEPAGE="http://ddccontrol.sourceforge.net/"
+SRC_URI="https://github.com/ddccontrol/ddccontrol/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="doc gtk nls +pci static-libs"
+#S=${WORKDIR}/${PN}-${COMMIT_ID}
+
+RDEPEND="app-misc/ddccontrol-db
+ dev-libs/libxml2:2
+ app-arch/xz-utils
+ gtk? ( x11-libs/gtk+:2 )
+ nls? ( sys-devel/gettext )
+ pci? ( sys-apps/pciutils )"
+DEPEND="${RDEPEND}
+ dev-perl/XML-Parser
+ dev-util/intltool
+ sys-kernel/linux-headers
+ doc? (
+ >=app-text/docbook-xsl-stylesheets-1.65.1
+ >=dev-libs/libxslt-1.1.6
+ app-text/htmltidy
+ )"
+
+src_prepare() {
+ sed -i 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die #467574
+ sed -i '/;Application/d' src/gddccontrol/gddccontrol.desktop.in || die
+
+ # ppc/ppc64 do not have inb/outb/ioperm
+ # they also do not have (sys|asm)/io.h
+ if ! use amd64 && ! use x86 ; then
+ local card
+ for card in sis intel810 ; do
+ sed -r -i \
+ -e "/${card}.Po/d" \
+ -e "s~${card}[^[:space:]]*~ ~g" \
+ src/ddcpci/Makefile.{am,ini} || die
+ done
+ sed -i \
+ -e '/sis_/d' \
+ -e '/i810_/d' \
+ src/ddcpci/main.c || die
+ fi
+
+ ## Save for a rainy day or future patching
+ touch config.rpath ABOUT-NLS
+ eautoreconf
+ intltoolize --force || die "intltoolize failed"
+}
+
+src_configure() {
+ # amdadl broken, bug #527268
+ econf \
+ --htmldir='$(datarootdir)'/doc/${PF}/html \
+ --disable-gnome-applet \
+ --disable-amdadl \
+ $(use_enable doc) \
+ $(use_enable gtk gnome) \
+ $(use_enable nls) \
+ $(use_enable pci ddcpci) \
+ $(use_enable static-libs static)
+}
+
+src_install() {
+ default
+ use static-libs || find "${ED}" -name '*.la' -delete
+}
diff --git a/app-misc/ddccontrol/ddccontrol-0.4.4_p20180123.ebuild b/app-misc/ddccontrol/ddccontrol-0.4.4_p20180123.ebuild
new file mode 100644
index 000000000000..ef19bb42b26a
--- /dev/null
+++ b/app-misc/ddccontrol/ddccontrol-0.4.4_p20180123.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils autotools
+
+DESCRIPTION="DDCControl allows control of monitor parameters via DDC"
+HOMEPAGE="http://ddccontrol.sourceforge.net/"
+COMMIT_ID="7c74181ed03839fb91e36c6012784cfce2ebe1a5"
+MY_PV=${COMMIT_ID:-${PV}}
+SRC_URI="https://github.com/ddccontrol/ddccontrol/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="doc gtk nls +pci static-libs"
+S=${WORKDIR}/${PN}-${COMMIT_ID}
+
+RDEPEND="app-misc/ddccontrol-db
+ dev-libs/libxml2:2
+ app-arch/xz-utils
+ gtk? ( x11-libs/gtk+:2 )
+ nls? ( sys-devel/gettext )
+ pci? ( sys-apps/pciutils )"
+DEPEND="${RDEPEND}
+ dev-perl/XML-Parser
+ dev-util/intltool
+ sys-kernel/linux-headers
+ doc? (
+ >=app-text/docbook-xsl-stylesheets-1.65.1
+ >=dev-libs/libxslt-1.1.6
+ app-text/htmltidy
+ )"
+
+src_prepare() {
+ sed -i 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die #467574
+ sed -i '/;Application/d' src/gddccontrol/gddccontrol.desktop.in || die
+
+ # ppc/ppc64 do not have inb/outb/ioperm
+ # they also do not have (sys|asm)/io.h
+ if ! use amd64 && ! use x86 ; then
+ local card
+ for card in sis intel810 ; do
+ sed -r -i \
+ -e "/${card}.Po/d" \
+ -e "s~${card}[^[:space:]]*~ ~g" \
+ src/ddcpci/Makefile.{am,ini} || die
+ done
+ sed -i \
+ -e '/sis_/d' \
+ -e '/i810_/d' \
+ src/ddcpci/main.c || die
+ fi
+
+ ## Save for a rainy day or future patching
+ touch config.rpath ABOUT-NLS
+ eautoreconf
+ intltoolize --force || die "intltoolize failed"
+}
+
+src_configure() {
+ # amdadl broken, bug #527268
+ econf \
+ --htmldir='$(datarootdir)'/doc/${PF}/html \
+ --disable-gnome-applet \
+ --disable-amdadl \
+ $(use_enable doc) \
+ $(use_enable gtk gnome) \
+ $(use_enable nls) \
+ $(use_enable pci ddcpci) \
+ $(use_enable static-libs static)
+}
+
+src_install() {
+ default
+ use static-libs || find "${ED}" -name '*.la' -delete
+}
diff --git a/app-misc/ddccontrol/ddccontrol-0.4.4_p20200630.ebuild b/app-misc/ddccontrol/ddccontrol-0.4.4_p20200630.ebuild
new file mode 100644
index 000000000000..2f7c7e8748e4
--- /dev/null
+++ b/app-misc/ddccontrol/ddccontrol-0.4.4_p20200630.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit eutils autotools
+
+DESCRIPTION="DDCControl allows control of monitor parameters via DDC"
+HOMEPAGE="http://ddccontrol.sourceforge.net/"
+COMMIT_ID="f3d003f63aaa0407d3147b04848e0722f78695d5"
+MY_PV=${COMMIT_ID:-${PV}}
+SRC_URI="https://github.com/ddccontrol/ddccontrol/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="doc gtk nls +pci static-libs"
+S=${WORKDIR}/${PN}-${COMMIT_ID}
+
+RDEPEND="app-misc/ddccontrol-db
+ dev-libs/libxml2:2
+ app-arch/xz-utils
+ gtk? ( x11-libs/gtk+:2 )
+ nls? ( sys-devel/gettext )
+ pci? ( sys-apps/pciutils )"
+DEPEND="${RDEPEND}
+ dev-perl/XML-Parser
+ dev-util/intltool
+ sys-kernel/linux-headers
+ doc? (
+ >=app-text/docbook-xsl-stylesheets-1.65.1
+ >=dev-libs/libxslt-1.1.6
+ app-text/htmltidy
+ )"
+
+src_prepare() {
+ sed -i 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die #467574
+ sed -i '/;Application/d' src/gddccontrol/gddccontrol.desktop.in || die
+
+ # ppc/ppc64 do not have inb/outb/ioperm
+ # they also do not have (sys|asm)/io.h
+ if ! use amd64 && ! use x86 ; then
+ local card
+ for card in sis intel810 ; do
+ sed -r -i \
+ -e "/${card}.Po/d" \
+ -e "s~${card}[^[:space:]]*~ ~g" \
+ src/ddcpci/Makefile.{am,ini} || die
+ done
+ sed -i \
+ -e '/sis_/d' \
+ -e '/i810_/d' \
+ src/ddcpci/main.c || die
+ fi
+
+ eapply_user
+
+ ## Save for a rainy day or future patching
+ touch config.rpath ABOUT-NLS
+ eautoreconf
+ intltoolize --force || die "intltoolize failed"
+}
+
+src_configure() {
+ # amdadl broken, bug #527268
+ econf \
+ --htmldir='$(datarootdir)'/doc/${PF}/html \
+ --disable-gnome-applet \
+ --disable-amdadl \
+ $(use_enable doc) \
+ $(use_enable gtk gnome) \
+ $(use_enable nls) \
+ $(use_enable pci ddcpci) \
+ $(use_enable static-libs static)
+}
+
+src_install() {
+ default
+ use static-libs || find "${ED}" -name '*.la' -delete
+}
diff --git a/app-misc/golly/Manifest b/app-misc/golly/Manifest
index 3400cf99a3a7..212e4446b77f 100644
--- a/app-misc/golly/Manifest
+++ b/app-misc/golly/Manifest
@@ -1 +1,2 @@
DIST golly-3.3-src.tar.gz 5465595 BLAKE2B e74da3799d1086a46fba523e6b087e6bc50c908098b27a80573936629fd5ad6195968df46b2933a9984cff85068222a80040761254298c5f648b040d5532a7ba SHA512 2aa9c2e7b2ebe3fe85bcb6177e58ee83bd08475e0a37a04cdb7e649b9faf5c2f936c534af62c8cf2322baade65c6e5197768901dfb464c17b20b941e1fa77265
+DIST golly-3.4-src.tar.gz 5480295 BLAKE2B 6bd0c71083d021adb660ed8fd333399865e5f486b6d95d2851aefd31fd2ad09a04419e6e3b2e0ff38b1d934ebb975525c07ca841210cc05f60f9ecf92362bc48 SHA512 bb2b1a653f9556901aa18d2d56c75c2c5e55bd7451b2b5bfb6268793758c12a6b00d30fa52c08ebd47e5db98fbec6fb80c64194cd93a1a41846adbd824c7af47
diff --git a/app-misc/golly/golly-3.4.ebuild b/app-misc/golly/golly-3.4.ebuild
new file mode 100644
index 000000000000..33eaee6f7422
--- /dev/null
+++ b/app-misc/golly/golly-3.4.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+WX_GTK_VER=3.0-gtk3
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+inherit autotools desktop python-single-r1 wxwidgets xdg-utils
+
+DESCRIPTION="simulator for Conway's Game of Life and other cellular automata"
+HOMEPAGE="http://golly.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="tiff"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="virtual/opengl
+ sys-libs/zlib
+ x11-libs/wxGTK:${WX_GTK_VER}[X,opengl,tiff?]
+ ${PYTHON_DEPS}
+"
+
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${P}-src
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-3.3-nondynamic-python.patch
+ "${FILESDIR}"/${PN}-3.3-allow-py23-exec.patch
+ "${FILESDIR}"/${PN}-3.3-glife-py23.patch
+ "${FILESDIR}"/${PN}-3.3-allow-py3.patch
+)
+
+pkg_setup() {
+ python-single-r1_pkg_setup
+ setup-wxwidgets
+}
+
+src_prepare() {
+ default
+
+ # patches change configure.ac and Makefile.am
+ pushd gui-wx/configure
+ eautoreconf
+ popd
+}
+
+src_configure() {
+ ECONF_SOURCE=gui-wx/configure econf \
+ --with-wxshared
+}
+
+src_install() {
+ emake docdir= DESTDIR="${D}" install
+ dodoc docs/ReadMe.html
+ newicon --size 32 gui-wx/icons/appicon.xpm ${PN}.xpm
+ make_desktop_entry ${PN} "Golly" ${PN} "Science"
+}
+
+pkg_postinst() {
+ xdg_icon_cache_update
+}
+
+pkg_postrm() {
+ xdg_icon_cache_update
+}
diff --git a/app-misc/ktoblzcheck/ktoblzcheck-1.49-r2.ebuild b/app-misc/ktoblzcheck/ktoblzcheck-1.49-r2.ebuild
new file mode 100644
index 000000000000..70b76b0106e5
--- /dev/null
+++ b/app-misc/ktoblzcheck/ktoblzcheck-1.49-r2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Library to check account numbers and bank codes of German banks"
+HOMEPAGE="http://ktoblzcheck.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND="
+ app-text/recode:0=
+ sys-apps/grep
+ sys-apps/sed
+ virtual/awk
+ || ( net-misc/wget www-client/lynx )
+"
+DEPEND="${RDEPEND}
+ sys-devel/libtool
+"
+
+DOCS=( AUTHORS ChangeLog NEWS README )
+
+src_configure() {
+ econf --disable-python
+}
+
+src_install() {
+ default
+ find "${D}" -name '*.la' -type f -delete || die
+}
diff --git a/app-misc/screenie/Manifest b/app-misc/screenie/Manifest
index 9d5243103cd2..bc81f2ead9c1 100644
--- a/app-misc/screenie/Manifest
+++ b/app-misc/screenie/Manifest
@@ -1 +1,2 @@
DIST screenie-1.30.0.tar.bz2 10068 BLAKE2B 49bbb8f81141c2b0707aab04e8a43f27e5ccd5c4241cf0e0e7ee3a7bd7944dc61c11f3a9ac5ae3040fecae1947a4271561e9b164b64512043916e3b39f25901c SHA512 8068421aaa461df32bccbe72e23474b20ef3f761e78a3e520c1f9f19a383d9ad9fd0377e2cdf1c4f023ca570b172a40ebff63d3cb538b96d1e1706fe83d03fdd
+DIST screenie-20120406.tar.gz 3437 BLAKE2B 354410d41e1aa9c6bcef3951f26aafcabf8e5af5ba4abd69627e62575127c1190abc78db4ee72552b02ad5cbcde0b6c910dfbb9191f2fd8444e57dff36d16701 SHA512 73e9c9cf53792c51785d45319f65559f5d8f1c97f8637d3c3262384eb1a3835f3ba380e4c9284858e163e8d2021938c2ef3ab50f2854d5f932e96847b9a4c153
diff --git a/app-misc/screenie/screenie-20120406.ebuild b/app-misc/screenie/screenie-20120406.ebuild
new file mode 100644
index 000000000000..2b2e7eb357cf
--- /dev/null
+++ b/app-misc/screenie/screenie-20120406.ebuild
@@ -0,0 +1,22 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="A small and lightweight screen wrapper"
+HOMEPAGE="https://sourceforge.net/projects/screenie/"
+SRC_URI="http://downloads.sourceforge.net/project/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~sparc ~x86"
+
+RDEPEND="app-misc/screen"
+
+S="${WORKDIR}/${PN}"
+
+src_install() {
+ einstalldocs
+ dobin screenie
+ doman screenie.1
+}
diff --git a/app-misc/tmux/tmux-3.1b.ebuild b/app-misc/tmux/tmux-3.1b.ebuild
index 7fa6ae4bb786..056d702b6f2d 100644
--- a/app-misc/tmux/tmux-3.1b.ebuild
+++ b/app-misc/tmux/tmux-3.1b.ebuild
@@ -14,7 +14,7 @@ if [[ "${PV}" == 9999 ]] ; then
else
SRC_URI="https://github.com/tmux/tmux/releases/download/${PV}/${P/_/-}.tar.gz"
[[ "${PV}" == *_rc* ]] || \
- KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
S="${WORKDIR}/${P/_/-}"
fi
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 6f075ac912ff..9170071d7131 100644
Binary files a/app-text/Manifest.gz and b/app-text/Manifest.gz differ
diff --git a/app-text/fbpdf/fbpdf-0_p20190202.ebuild b/app-text/fbpdf/fbpdf-0_p20190202-r1.ebuild
similarity index 78%
rename from app-text/fbpdf/fbpdf-0_p20190202.ebuild
rename to app-text/fbpdf/fbpdf-0_p20190202-r1.ebuild
index 2cae3b100718..79bea0cffbde 100644
--- a/app-text/fbpdf/fbpdf-0_p20190202.ebuild
+++ b/app-text/fbpdf/fbpdf-0_p20190202-r1.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
inherit toolchain-funcs vcs-snapshot
@@ -19,17 +19,13 @@ KEYWORDS="~amd64 ~x86"
RDEPEND="
>=app-text/mupdf-1.10:0=
app-text/djvu:0=
- dev-lang/mujs:0=
- dev-libs/openssl:0=
!media-gfx/fbida[fbcon(-)]
- media-libs/freetype:2=
- media-libs/jbig2dec:0=
- media-libs/openjpeg:0=
- virtual/jpeg:0=
"
DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
S=${WORKDIR}/${P}-${COMMIT}
PATCHES=(
@@ -38,7 +34,7 @@ PATCHES=(
)
src_compile() {
- emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
+ emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS}"
}
src_install() {
diff --git a/app-text/fbpdf/files/fbpdf-0_p20190202-drop-unused.patch b/app-text/fbpdf/files/fbpdf-0_p20190202-drop-unused.patch
new file mode 100644
index 000000000000..3e60b9149433
--- /dev/null
+++ b/app-text/fbpdf/files/fbpdf-0_p20190202-drop-unused.patch
@@ -0,0 +1,16 @@
+--- a/Makefile
++++ b/Makefile
+@@ -12,11 +12,11 @@ clean:
+
+ # pdf support using mupdf
+ fbpdf: fbpdf.o mupdf.o draw.o
+- $(CC) -o $@ $^ $(LDFLAGS) $(shell $(PKG_CONFIG) --libs mupdf) -lm
++ $(CC) -o $@ $^ $(LDFLAGS) $(shell $(PKG_CONFIG) --libs mupdf)
+
+ # djvu support
+ fbdjvu: fbpdf.o djvulibre.o draw.o
+- $(CXX) -o $@ $^ $(LDFLAGS) $(shell $(PKG_CONFIG) --libs ddjvuapi) -ljpeg -lm -lpthread
++ $(CXX) -o $@ $^ $(LDFLAGS) $(shell $(PKG_CONFIG) --libs ddjvuapi)
+
+ # pdf support using poppler
+ poppler.o: poppler.c
diff --git a/app-text/gv/gv-3.7.3.90.ebuild b/app-text/gv/gv-3.7.3.90.ebuild
index aa0f587b889f..1bb2e687a1e2 100644
--- a/app-text/gv/gv-3.7.3.90.ebuild
+++ b/app-text/gv/gv-3.7.3.90.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu-alpha/gv/${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm hppa ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
IUSE="xinerama"
RDEPEND="
diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
index fdd913cd3759..dcada4680228 100644
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -1,4 +1,4 @@
DIST poppler-0.88.0.tar.xz 1604348 BLAKE2B 3c78d15871398fb5f2125596f959d98a173de198c8460907be39ca5c5b91a05f0f4048a6ba01b59edb4643c4fdd2333462edf7ab0e0648cd607ffd2deb5a3b18 SHA512 2c4c1333d5bd7411eb6b05fa1c5967b8577798e439a22b2fd119cf7a8e7d519e04b253464c6892d31bae7483a8bda8492755089cef4131f760f95bc3f4e56880
DIST poppler-0.89.0.tar.xz 1612156 BLAKE2B 071724f823214f3b3a775a1e6ee57992c18c65815cc139d88953ea3a7b348066981ce7933bd00ea27ddb60bf9f2f34a245bf09944d8cfda9732f0e33feecb017 SHA512 e2af2ab20cc1bba72080d42e229379bda0802aff355d2932dd970ee5924f454577529aef21f0f90fc57efba54caf15cd973c75446f309498f88199d5c2d93f11
-DIST poppler-0.90.0.tar.xz 1619960 BLAKE2B 479c89b6e0881c674beb5c760e08e9277df40c08904dcb1bfc1b039e9ca95f3d24d4548017b3d06ac4e1324172b2c9e412db665d6ee1d7ffd11da0f3d0a0b42c SHA512 3b2a45c7fcdc41b0dad80b6454cd8bb50a6625537edbc537898790ef4b6425bb62e1934fd2aaa8565be9c045ab1ac40a8de2e939c5b5abf0254d8e6c833b4450
DIST poppler-0.90.1.tar.xz 1633804 BLAKE2B 5c7256bca74af6cc2732fb6c413bec10ea579f28fe623ccb5d4863c62d39329a4264c240ee0e395a78de577a960a5156ba20f957990c0cde91efcee72dbc2fef SHA512 c0a38c3c40196f8b847f0737152d0cbb40656870a8ceb766134ee22ec7c21bc979a13f56b7596a13ae2f08f1a9a2c396ba7f5ff176d02c262af7e863c2afde34
+DIST poppler-20.08.0.tar.xz 1635372 BLAKE2B ca8829fe031bc9565baea71dd7a565d16160aa26645fdd6b30fa0d26c427f8b9d966766df95ca0c1e98552af2e3104c45721f7111db0bcd47f9f29620d1b37ed SHA512 e3d7d85356c854e298bb96ac8a563d9b97174e07d220eb5e7fe0372354a9105a3a1f6ea16e2a34af09d65c61f5fb349412fa7100e7fdda3c98e5030d82b48679
diff --git a/app-text/poppler/poppler-0.90.0.ebuild b/app-text/poppler/poppler-20.08.0.ebuild
similarity index 97%
rename from app-text/poppler/poppler-0.90.0.ebuild
rename to app-text/poppler/poppler-20.08.0.ebuild
index 7c34ec504ee9..39d7375ed1b8 100644
--- a/app-text/poppler/poppler-0.90.0.ebuild
+++ b/app-text/poppler/poppler-20.08.0.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999* ]] ; then
else
SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
- SLOT="0/101" # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
+ SLOT="0/102" # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
fi
DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
@@ -105,6 +105,7 @@ src_configure() {
$(cmake_use_find_package qt5 Qt5Core)
-DWITH_TIFF=$(usex tiff)
-DENABLE_UTILS=$(usex utils)
+ -DENABLE_QT6=OFF
)
use cairo && mycmakeargs+=( -DWITH_GObjectIntrospection=$(usex introspection) )
diff --git a/app-text/poppler/poppler-9999.ebuild b/app-text/poppler/poppler-9999.ebuild
index 41cf49269b78..39d7375ed1b8 100644
--- a/app-text/poppler/poppler-9999.ebuild
+++ b/app-text/poppler/poppler-9999.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999* ]] ; then
else
SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
- SLOT="0/101" # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
+ SLOT="0/102" # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
fi
DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
diff --git a/app-text/sword-modules/sword-modules-2.ebuild b/app-text/sword-modules/sword-modules-2.ebuild
index dc8a112bcfcc..8229d7f3c1cf 100644
--- a/app-text/sword-modules/sword-modules-2.ebuild
+++ b/app-text/sword-modules/sword-modules-2.ebuild
@@ -88,8 +88,6 @@ RDEPEND="
app-dicts/sword-GerElb1871
app-dicts/sword-GerElb1905
app-dicts/sword-GerGruenewald
- app-dicts/sword-GerHfa2002
- app-dicts/sword-GerHfaLex2002
app-dicts/sword-GerLeoNA28
app-dicts/sword-GerLeoRP18
app-dicts/sword-GerLut1545
diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index 48ebcd7880c2..b35700164d67 100644
Binary files a/dev-cpp/Manifest.gz and b/dev-cpp/Manifest.gz differ
diff --git a/dev-cpp/gtest/gtest-1.10.0_p20200702.ebuild b/dev-cpp/gtest/gtest-1.10.0_p20200702.ebuild
index 560a1e282be2..46b32ba09b0c 100644
--- a/dev-cpp/gtest/gtest-1.10.0_p20200702.ebuild
+++ b/dev-cpp/gtest/gtest-1.10.0_p20200702.ebuild
@@ -21,7 +21,7 @@ else
URI_PV=${MY_PV:=${GOOGLETEST_COMMIT}}
fi
SRC_URI="https://github.com/google/googletest/archive/${URI_PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
S="${WORKDIR}"/googletest-${MY_PV}
fi
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index 7d86f101e26e..3c8ae8117c67 100644
Binary files a/dev-db/Manifest.gz and b/dev-db/Manifest.gz differ
diff --git a/dev-db/phppgadmin/Manifest b/dev-db/phppgadmin/Manifest
index 3c7c0c8634c2..0e3ddedaaa89 100644
--- a/dev-db/phppgadmin/Manifest
+++ b/dev-db/phppgadmin/Manifest
@@ -1,2 +1 @@
-DIST phpPgAdmin-5.6.0.tar.bz2 880640 BLAKE2B a49fb97c26c35323b567f06002cc6da9f3efacb4be99633e6ad4d6a53015e557ef3c98a4bf9c4dedf525b86354816e744f6159bad7db6f52fe2c03223f0be9a1 SHA512 afe4c99322bb24bf1895afb20dd87dcad1fc7d887b9271d9dd6b56779a7b5c8aa7293cdc7fa560a62a830adbf5453914a4783a1265915b24594779c0beeaecda
DIST phpPgAdmin-7.12.1.tar.bz2 579723 BLAKE2B 58d4992424fb6c9bf8565843c6d76ceecb68212cc311d15d43303fd6b63fe2a611ce146761b8f6b8f992798060d065a0b0e528aed5df217a3078cef9e56c49da SHA512 d64b4796c5acad990ef81b12ebd377474d04c1a65adc41a91a2d278bb975812389bb6eae23490de3f5ce09502d36adea3cacfdec0e868c6a0e0bcb639b8a94db
diff --git a/dev-db/phppgadmin/phppgadmin-5.6.0.ebuild b/dev-db/phppgadmin/phppgadmin-5.6.0.ebuild
deleted file mode 100644
index e0ec4521ab80..000000000000
--- a/dev-db/phppgadmin/phppgadmin-5.6.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit webapp
-
-MY_P="phpPgAdmin-${PV}"
-
-DESCRIPTION="Web-based administration for Postgres database in php"
-HOMEPAGE="http://phppgadmin.sourceforge.net/"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/REL_$(ver_rs 1- -)/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="dev-lang/php[postgres,session]"
-
-S="${WORKDIR}/${MY_P}"
-
-src_install() {
- webapp_src_preinst
-
- local doc
- local docs="CREDITS DEVELOPERS FAQ HISTORY INSTALL TODO TRANSLATORS"
- dodoc ${docs}
- mv conf/config.inc.php-dist conf/config.inc.php
-
- cp -r * "${D}"${MY_HTDOCSDIR}
- for doc in ${docs} INSTALL LICENSE; do
- rm -f "${D}"${MY_HTDOCSDIR}/${doc}
- done
-
- webapp_configfile ${MY_HTDOCSDIR}/conf/config.inc.php
- webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
- webapp_src_install
-}
diff --git a/dev-db/redis/redis-5.0.9-r1.ebuild b/dev-db/redis/redis-5.0.9-r1.ebuild
index 93a792860f43..72dfaa9420f5 100644
--- a/dev-db/redis/redis-5.0.9-r1.ebuild
+++ b/dev-db/redis/redis-5.0.9-r1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://redis.io"
SRC_URI="http://download.redis.io/releases/${P}.tar.gz"
LICENSE="BSD"
-KEYWORDS="~amd64 arm ~arm64 hppa ppc ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
+KEYWORDS="~amd64 arm arm64 hppa ppc ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
IUSE="+jemalloc tcmalloc luajit test"
RESTRICT="!test? ( test )"
SLOT="0"
diff --git a/dev-games/Manifest.gz b/dev-games/Manifest.gz
index b88e67f4111d..7d56bac8191e 100644
Binary files a/dev-games/Manifest.gz and b/dev-games/Manifest.gz differ
diff --git a/dev-games/freecell-solver/Manifest b/dev-games/freecell-solver/Manifest
index 308b112852dc..accc4d32658f 100644
--- a/dev-games/freecell-solver/Manifest
+++ b/dev-games/freecell-solver/Manifest
@@ -1,2 +1 @@
-DIST freecell-solver-5.22.1.tar.xz 421948 BLAKE2B 173a6bb25110695dfaf590f8339f4728e96ad112788efa73ff05ef311effd48b1e037aaa9ed8446cfe3408012f81bb785e6d7a17d249c95108ca38e2473ee0f7 SHA512 8472ce519168481fcbfa0347d1d86859c7344fe34a58bbef694d22653c02f09e70722bf92e052bda5b3f9bce8cee0f745ac45c9e08712b15c34bb40306f510f6
DIST freecell-solver-5.24.0.tar.xz 422468 BLAKE2B 3fc98a6ba5116bbbdc79c8c09c820b3992fd666c14736fca98b2191c752b5c5a465dcf4ad3fc79ac944d2189647097aad70f99b140e6feff133bae26d4d52411 SHA512 264a7e016a5dbd093f126aab520b36c98c02111a3834ba09646ba527046973163aeefe41449e05d161d1790d2f599c6a3302402442b96b9bd524e97fc4f54b91
diff --git a/dev-games/freecell-solver/freecell-solver-5.22.1.ebuild b/dev-games/freecell-solver/freecell-solver-5.22.1.ebuild
deleted file mode 100644
index c8e88cfcd6eb..000000000000
--- a/dev-games/freecell-solver/freecell-solver-5.22.1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-inherit cmake python-single-r1
-
-DESCRIPTION="C library for automatically solving Freecell and some other solitaire variants"
-HOMEPAGE="https://fc-solve.shlomifish.org/"
-SRC_URI="https://fc-solve.shlomifish.org/downloads/fc-solve/${P}.tar.xz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm64 x86"
-IUSE="tcmalloc"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
- $(python_gen_cond_dep '
- dev-python/pysol_cards[${PYTHON_MULTI_USEDEP}]
- dev-python/random2[${PYTHON_MULTI_USEDEP}]
- dev-python/six[${PYTHON_MULTI_USEDEP}]
- ')
- tcmalloc? ( dev-util/google-perftools )
-"
-DEPEND="${RDEPEND}
- dev-perl/Path-Tiny
- dev-perl/Template-Toolkit
-"
-
-DOCS=( README.html )
-
-PATCHES=( "${FILESDIR}/${P}-no-docs.patch" )
-
-src_prepare() {
- python_fix_shebang board_gen
- cmake_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- -DBUILD_STATIC_LIBRARY=OFF
- -DFCS_BUILD_DOCS=OFF
- -DFCS_WITH_TEST_SUITE=OFF #requires unpackaged dependencies
- -DFCS_AVOID_TCMALLOC=$(usex !tcmalloc)
- )
-
- cmake_src_configure
-}
diff --git a/dev-games/freecell-solver/freecell-solver-5.24.0.ebuild b/dev-games/freecell-solver/freecell-solver-5.24.0.ebuild
index 00f2b015b2af..e2375962e0ee 100644
--- a/dev-games/freecell-solver/freecell-solver-5.24.0.ebuild
+++ b/dev-games/freecell-solver/freecell-solver-5.24.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://fc-solve.shlomifish.org/downloads/fc-solve/${P}.tar.xz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="amd64 arm64 x86"
IUSE="tcmalloc"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-games/simgear/simgear-2020.1.2.ebuild b/dev-games/simgear/simgear-2020.1.2.ebuild
index 318b71674130..0b85c837275b 100644
--- a/dev-games/simgear/simgear-2020.1.2.ebuild
+++ b/dev-games/simgear/simgear-2020.1.2.ebuild
@@ -6,7 +6,7 @@ EAPI=7
inherit cmake toolchain-funcs flag-o-matic
DESCRIPTION="Development library for simulation games"
-HOMEPAGE="http://www.simgear.org/"
+HOMEPAGE="https://www.flightgear.org/"
SRC_URI="mirror://sourceforge/flightgear/${P}.tar.bz2"
LICENSE="GPL-2"
diff --git a/dev-games/simgear/simgear-9999.ebuild b/dev-games/simgear/simgear-9999.ebuild
index b0146cf1b283..e4fa4059f41d 100644
--- a/dev-games/simgear/simgear-9999.ebuild
+++ b/dev-games/simgear/simgear-9999.ebuild
@@ -6,7 +6,7 @@ EAPI=7
inherit eutils cmake toolchain-funcs flag-o-matic git-r3
DESCRIPTION="Development library for simulation games"
-HOMEPAGE="http://www.simgear.org/"
+HOMEPAGE="https://www.flightgear.org/"
EGIT_REPO_URI="git://git.code.sf.net/p/flightgear/${PN}
git://mapserver.flightgear.org/${PN}"
EGIT_BRANCH="next"
diff --git a/dev-haskell/Manifest.gz b/dev-haskell/Manifest.gz
index 1b79ec67e61a..40fe857ebbf7 100644
Binary files a/dev-haskell/Manifest.gz and b/dev-haskell/Manifest.gz differ
diff --git a/dev-haskell/aws/Manifest b/dev-haskell/aws/Manifest
index b0ee06ca1980..f7b3eacc87cf 100644
--- a/dev-haskell/aws/Manifest
+++ b/dev-haskell/aws/Manifest
@@ -1,4 +1 @@
-DIST aws-0.11.3.tar.gz 90102 BLAKE2B 4a22b5fe3cabdaeda68229ac9bd653221242a17c259245c650a9e92fed87ee8d58ed3cef4cbc732d0c5f8e92481b42d4a3be4a5b3ecb5c183e52e9e922941938 SHA512 0343d8ef17ad06525c7c131eb97408d3298c46f4dd472604bd4b3a20c2bb1e880e12f9a0e345ee2fe9bfe56b684fd653e9a99b7919e8d97fce4ca0cdd720afb5
-DIST aws-0.12.1.tar.gz 90763 BLAKE2B ef33803420a163c51386165e3d3b94efb61d1e8d4983ab7c23e6c94b09b4f8638e2663657587a1b1ed381446e01a9bc120ca4a3ef9057114698ab870332961e2 SHA512 8c89a982196b654ad4f001d30cb415a9272aacb582c8879173babc4183ca4eb21c025399f1bb5e2624a77a1c38da9b4637bf1dfa0a5bbccb888808a5e654bbf9
-DIST aws-0.14.1.tar.gz 95017 BLAKE2B eab2eccdfc160b16ccd35e6028854e8bcaebf3309269199be752a240a2757a69be496eae0e6d757a814d1d0f6b30f0d3f6cd87954a95a5aaf2d8347245956b29 SHA512 0616d085291748d3ec1ef24d7914562f85fde0577f8100b0dd7f8bc2c817fffb4945372fb80aad98dce652fbf1f063a55afe3ba7aff89ddd5bcd2ba43047ad8c
DIST aws-0.22.tar.gz 106122 BLAKE2B b4ff46e2742d53323c80952c303a4605d13600fd60085a2e0501af2fc0a74f0c2769c6bf0692710bbfd972c474b9cab26fd97e9126fdcfb3eaff90afbab1d9ae SHA512 e7ff376c47a7ca7a65c8f10f19e591d4a4b4d2cfa333b4727f88f0b170d7acb0aff402617f2d617c522fe5d16ce92b249a23f1fb0a8bfe5bbefaef2931b786bd
diff --git a/dev-haskell/aws/aws-0.11.3-r1.ebuild b/dev-haskell/aws/aws-0.11.3-r1.ebuild
deleted file mode 100644
index 2281a78aba40..000000000000
--- a/dev-haskell/aws/aws-0.11.3-r1.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
-inherit base haskell-cabal
-
-DESCRIPTION="Amazon Web Services (AWS) for Haskell"
-HOMEPAGE="https://github.com/aristidb/aws"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples"
-
-RESTRICT=test # needs aws accound
-
-RDEPEND=">=dev-haskell/aeson-0.6:=[profile?]
- >=dev-haskell/attoparsec-0.11:=[profile?] =dev-haskell/base16-bytestring-0.1:=[profile?] =dev-haskell/base64-bytestring-1.0:=[profile?] =dev-haskell/blaze-builder-0.2.1.4:=[profile?] =dev-haskell/byteable-0.1:=[profile?] =dev-haskell/case-insensitive-0.2:=[profile?] =dev-haskell/cereal-0.3:=[profile?] =dev-haskell/conduit-1.1:=[profile?] =dev-haskell/conduit-extra-1.1:=[profile?] =dev-haskell/cryptohash-0.11:=[profile?] =dev-haskell/data-default-0.5.3:=[profile?] =dev-haskell/http-conduit-2.1:=[profile?] =dev-haskell/http-types-0.7:=[profile?] =dev-haskell/lifted-base-0.1:=[profile?] =dev-haskell/monad-control-0.3:=[profile?]
- >=dev-haskell/mtl-2:=[profile?] =dev-haskell/network-2:=[profile?] =dev-haskell/old-locale-1:=[profile?] =dev-haskell/resourcet-1.1:=[profile?] =dev-haskell/safe-0.3:=[profile?] =dev-haskell/scientific-0.3:=[profile?]
- >=dev-haskell/tagged-0.7:=[profile?] =dev-haskell/text-0.11:=[profile?]
- >=dev-haskell/unordered-containers-0.2:=[profile?]
- >=dev-haskell/utf8-string-0.3:=[profile?] =dev-haskell/vector-0.10:=[profile?]
- >=dev-haskell/xml-conduit-1.2:=[profile?] =dev-lang/ghc-7.4.1:=
- examples? ( >=dev-haskell/errors-1.4:=[profile?]
- dev-haskell/exceptions:=[profile?]
- >=dev-haskell/transformers-0.3:=[profile?] =dev-haskell/transformers-0.2.2:=[profile?] = 0.7 && < 0.8' 'tagged >= 0.7 && < 0.9'
-}
-
-src_configure() {
- haskell-cabal_src_configure \
- $(cabal_flag examples examples)
-}
diff --git a/dev-haskell/aws/aws-0.12.1.ebuild b/dev-haskell/aws/aws-0.12.1.ebuild
deleted file mode 100644
index 80a2473ebaa4..000000000000
--- a/dev-haskell/aws/aws-0.12.1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Amazon Web Services (AWS) for Haskell"
-HOMEPAGE="https://github.com/aristidb/aws"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples"
-
-RESTRICT=test # needs aws accound
-
-RDEPEND=">=dev-haskell/aeson-0.6:=[profile?]
- >=dev-haskell/attoparsec-0.11:=[profile?] =dev-haskell/base16-bytestring-0.1:=[profile?] =dev-haskell/base64-bytestring-1.0:=[profile?] =dev-haskell/blaze-builder-0.2.1.4:=[profile?] =dev-haskell/byteable-0.1:=[profile?] =dev-haskell/case-insensitive-0.2:=[profile?] =dev-haskell/cereal-0.3:=[profile?] =dev-haskell/conduit-1.1:=[profile?] =dev-haskell/conduit-extra-1.1:=[profile?] =dev-haskell/cryptohash-0.11:=[profile?] =dev-haskell/data-default-0.5.3:=[profile?] =dev-haskell/http-conduit-2.1:=[profile?] =dev-haskell/http-types-0.7:=[profile?] =dev-haskell/lifted-base-0.1:=[profile?] =dev-haskell/monad-control-0.3:=[profile?]
- >=dev-haskell/mtl-2:=[profile?] =dev-haskell/network-2:=[profile?] =dev-haskell/old-locale-1:=[profile?] =dev-haskell/resourcet-1.1:=[profile?] =dev-haskell/safe-0.3:=[profile?] =dev-haskell/scientific-0.3:=[profile?]
- >=dev-haskell/tagged-0.7:=[profile?] =dev-haskell/text-0.11:=[profile?]
- >=dev-haskell/unordered-containers-0.2:=[profile?]
- >=dev-haskell/utf8-string-0.3:=[profile?] =dev-haskell/vector-0.10:=[profile?]
- >=dev-haskell/xml-conduit-1.2:=[profile?] =dev-lang/ghc-7.6.1:=
- examples? ( >=dev-haskell/errors-1.4:=[profile?] =dev-haskell/transformers-0.3:=[profile?] =dev-haskell/transformers-0.2.2:=[profile?] =4.6.0.1 && <4.15' 'base >=4.6.0.1' && <5 \
+ 'binary >=0.5.1.1 && <0.8.9' 'binary >=0.5.1.1'
+}
diff --git a/dev-haskell/binary-instances/metadata.xml b/dev-haskell/binary-instances/metadata.xml
new file mode 100644
index 000000000000..b7878815d80d
--- /dev/null
+++ b/dev-haskell/binary-instances/metadata.xml
@@ -0,0 +1,8 @@
+
+
+
+
+ haskell@gentoo.org
+ Gentoo Haskell
+
+
diff --git a/dev-haskell/binary-orphans/Manifest b/dev-haskell/binary-orphans/Manifest
index 22d2f261ac3b..98559dfdceab 100644
--- a/dev-haskell/binary-orphans/Manifest
+++ b/dev-haskell/binary-orphans/Manifest
@@ -1 +1,2 @@
DIST binary-orphans-0.1.6.0.tar.gz 5320 BLAKE2B 3e8393e64ee737316457ee7f36f740404b0f4adaac2134701c935608ac90714473148d8844c167262a058de607f86a2d8d0b2527e6cb07f50f054b77629df97d SHA512 646410b79d92a20ef7b6d6583fca38da672e7fe072d2d5a7a9d50bacd1fb3da20efd9ab42e74029279dcd5a2c4b80218b860ae8e45bef348a692b23bcc8ea351
+DIST binary-orphans-1.0.1.tar.gz 4425 BLAKE2B 2f94e8e2fa70578b0feaa338ea5148f2f373cabdf4fcfaa3092ff7f92484fc7708da09bba8ea51de626c70c74de3051a6eae6c0a2280d125504d168c730e0f14 SHA512 067df608ec5fee2907c1648c19116a4de7a237c41101e811ba02789fbe22c5726443d4950b03bd156ad8ea336acc6c71da3efe7a6cf1127519ec5eb9778ec11d
diff --git a/dev-haskell/binary-orphans/binary-orphans-1.0.1.ebuild b/dev-haskell/binary-orphans/binary-orphans-1.0.1.ebuild
new file mode 100644
index 000000000000..bd12ad351575
--- /dev/null
+++ b/dev-haskell/binary-orphans/binary-orphans-1.0.1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.1.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Orphan instances for binary"
+HOMEPAGE="http://hackage.haskell.org/package/binary-orphans"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/fail-4.9:=[profile?] =dev-haskell/nats-1.1.2:=[profile?] =dev-haskell/semigroups-0.18.5:=[profile?]
+ >=dev-haskell/void-0.7.3:=[profile?] =dev-lang/ghc-7.8.2:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.18.1.3
+ test? ( >=dev-haskell/quickcheck-2.13.1 =dev-haskell/quickcheck-instances-0.3.21 =dev-haskell/tagged-0.8.6 =dev-haskell/tasty-0.10.1.2 =dev-haskell/tasty-quickcheck-0.8.3.2 =4.5 && <4.14' 'base >=4.5' \
+ 'binary >=0.5.1.0 && <0.6 || >=0.7.1.0 && <0.8 || >=0.8.3.0 && <0.8.7' 'binary >=0.5.1.0 && <0.6 || >=0.7.1.0 && <0.8 || >=0.8.3.0 && <0.8.9' \
+ 'semigroups >=0.18.5 && <0.19.1' 'semigroups >=0.18.5'
+}
diff --git a/dev-haskell/binary-tagged/Manifest b/dev-haskell/binary-tagged/Manifest
index f4f364033fb9..8f77de916282 100644
--- a/dev-haskell/binary-tagged/Manifest
+++ b/dev-haskell/binary-tagged/Manifest
@@ -1 +1,2 @@
DIST binary-tagged-0.1.4.2.tar.gz 9318 BLAKE2B 19a3878d755a57fbeebed38451c55c5695637ee136491ded830a127dcb4f33106bbaf7efb3d3101dc0c37f752e30e93c2ec1216a33343093431d0144c0dcff48 SHA512 381ac0833c13c9b50174d2c5d3695e4af9955631dbaa20719556084ce013973ea37993cb86ac4880f41044fbf178dabe6f100cc53c2d982037a2ca9826878706
+DIST binary-tagged-0.2.tar.gz 9570 BLAKE2B 06519bc4862da1ad4804c487f5b250600e20dff479d47db88dc0b83030a08078b41d1a6691a7b9dc2de62defb797d30bc8081158e722a6c564e08e1a89287971 SHA512 03bcf80b39d5f8e1256ac45b557904d6750d1786f4b4da0c1b9e5c004503d5375699480f89426145a3eea103555c5f4fc820cb87053a2b6ccf4c7e1d6faf7120
diff --git a/dev-haskell/binary-tagged/binary-tagged-0.2.ebuild b/dev-haskell/binary-tagged/binary-tagged-0.2.ebuild
new file mode 100644
index 000000000000..f53ead554f72
--- /dev/null
+++ b/dev-haskell/binary-tagged/binary-tagged-0.2.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.1.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Tagged binary serialisation"
+HOMEPAGE="https://github.com/phadej/binary-tagged#readme"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/aeson-0.8:=[profile?] =dev-haskell/base16-bytestring-0.1.1.6:=[profile?] =dev-haskell/cryptohash-sha1-0.11.100.1:=[profile?] =dev-haskell/generics-sop-0.3.2.0:=[profile?] =dev-haskell/hashable-1.2:=[profile?] =dev-haskell/scientific-0.3:=[profile?] =dev-haskell/semigroups-0.18.5:=[profile?] =dev-haskell/tagged-0.7:=[profile?] =dev-haskell/text-1.2.3.0:=[profile?] =dev-haskell/unordered-containers-0.2:=[profile?] =dev-haskell/vector-0.10:=[profile?] =dev-lang/ghc-7.10.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.22.2.0
+ test? ( dev-haskell/bifunctors
+ >=dev-haskell/binary-instances-1 =4.7.0.2 && <4.13' 'base >=4.7.0.2' \
+ 'time >=1.4.2 && <1.9' 'time >=1.4.2'
+}
diff --git a/dev-haskell/bitwise/Manifest b/dev-haskell/bitwise/Manifest
index 12d3fb985069..6760cec93e69 100644
--- a/dev-haskell/bitwise/Manifest
+++ b/dev-haskell/bitwise/Manifest
@@ -1 +1,2 @@
DIST bitwise-0.1.1.1.tar.gz 17107 BLAKE2B 0e4ef87c50a0505aa04f248eb3356b8c3311a8a85c67d13a50621cef0e77416bd1111fcf8823c0b8d35eccd48db5241571da2f0dac8b912e4a6fd2a8ca87217d SHA512 f599411c6ce68a0ac71045ade891ae9c70a2b94b79285cdbac9e694bf227df5f0e65f115321ac62ac2878232aa91b5a6a376ae43654671fda0de2f9b0b65c70e
+DIST bitwise-1.0.0.1.tar.gz 16473 BLAKE2B e7caa6d1ac864d6c12ff471a7080559da93f3973eeb5949e54ee2a2f205cab4a9c452578c0a22102fe613964af4f9367b037552a30dd711b08cac2dd2c3ccdca SHA512 b8653549ef0d0f4eb608802f6124cd969c16cbeb6f26dd83839bbaab7d56cf0c1b39a7ac3dba40f3fa00f3f67f38bad091ee0f01e7f6aea7f9c0bafa34efb443
diff --git a/dev-haskell/bitwise/bitwise-1.0.0.1.ebuild b/dev-haskell/bitwise/bitwise-1.0.0.1.ebuild
new file mode 100644
index 000000000000..7c437a36a1a8
--- /dev/null
+++ b/dev-haskell/bitwise/bitwise-1.0.0.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.5.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="fast multi-dimensional unboxed bit packed Bool arrays"
+HOMEPAGE="https://code.mathr.co.uk/bitwise"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-lang/ghc-7.8.2:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.18.1.3
+ test? ( >=dev-haskell/quickcheck-2.4 )
+"
+
+src_prepare() {
+ default
+
+ cabal_chdeps \
+ 'QuickCheck >= 2.4 && < 2.12' 'QuickCheck >= 2.4' \
+ 'base >= 4.7 && < 4.12' 'base >= 4.7'
+}
diff --git a/dev-haskell/bytestring-show/bytestring-show-0.3.5.6-r1.ebuild b/dev-haskell/bytestring-show/bytestring-show-0.3.5.6-r1.ebuild
index 034819b9da95..c9d31c589831 100644
--- a/dev-haskell/bytestring-show/bytestring-show-0.3.5.6-r1.ebuild
+++ b/dev-haskell/bytestring-show/bytestring-show-0.3.5.6-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
# ebuild generated by hackport 0.3.6.9999
@@ -25,6 +25,11 @@ DEPEND="${RDEPEND}
"
src_prepare() {
+ default
+
+ # Use default for compatibility with Cabal-3
+ rm Setup.lhs || die
cabal_chdeps \
- 'binary < 0.8' 'binary'
+ 'binary < 0.8' 'binary' \
+ 'containers < 0.6' 'containers'
}
diff --git a/dev-haskell/bzlib/Manifest b/dev-haskell/bzlib/Manifest
index 473401cfae45..0cd799382dd5 100644
--- a/dev-haskell/bzlib/Manifest
+++ b/dev-haskell/bzlib/Manifest
@@ -1 +1,2 @@
DIST bzlib-0.5.0.5.tar.gz 46627 BLAKE2B e229e4c586c45e5ff440a043bf413c2a45a6b38b1a2d3ad529cbaeba5a4811953572a2be54a75cec24599f43c9393c71268c5c2ba0c54100fb6c43b2842169df SHA512 fe4b6e1a4d67573a9ff72808cfd0bf47a127885593e98debcaa505c488c76af364bed31cdb8ee9308295514f154536e958ff5e2a1c3157eeb5b16f8011424819
+DIST bzlib-0.5.1.0.tar.gz 46082 BLAKE2B d17e3832d71ca745da6884f1762aaae8ad22babed44fda9a87d2dae731334b8c1af398c78d2f79e02183ef22a53717e0a9f127fc1837f220eba35ad9397fe22f SHA512 2d4e200abc8ef7f158b4b726e81a389d5018615dd04f5704f50323498f5a1991e217a05abd10f86cab791326bc95802d22a17b55656e5289cb07ca93698a1537
diff --git a/dev-haskell/bzlib/bzlib-0.5.1.0.ebuild b/dev-haskell/bzlib/bzlib-0.5.1.0.ebuild
new file mode 100644
index 000000000000..990fa523d982
--- /dev/null
+++ b/dev-haskell/bzlib/bzlib-0.5.1.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.5.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Compression and decompression in the bzip2 format"
+HOMEPAGE="http://hackage.haskell.org/package/bzlib"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="app-arch/bzip2
+ >=dev-haskell/fail-4.9:=[profile?] =dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.10
+"
diff --git a/dev-haskell/cassava/Manifest b/dev-haskell/cassava/Manifest
index 8ce182e6c1c3..567666013021 100644
--- a/dev-haskell/cassava/Manifest
+++ b/dev-haskell/cassava/Manifest
@@ -1,2 +1,3 @@
DIST cassava-0.4.4.0.tar.gz 32631 BLAKE2B dd7bf6e4b4378ffd0dad3c402465b20f8a830d1dd156826fbb0eedced28598297d0f5056d25acc1e2c8457934f077a4ac34b2caa1852397d9d0fe17b875ac3b9 SHA512 af0954754bbcfe8068ccd029417327770c60a62ecc5503b3cce5a58962940a804e167688760aec7ead42ec99b404295715d2f8fd65e4b4ed2918e1c5e063b36b
DIST cassava-0.4.5.0.tar.gz 33104 BLAKE2B 0b0726f3060f0857ecb4135bbf71cba7e6a8b108268f948b29d6a0f61d09336097689f24bcbe77e913b5461e3872b07f6ba2d0a9e35738dc125add0a05d2650d SHA512 24f017ac44f48cdf000cab4108023d6f30a67638964831f0d7cd167bcd96ba85337d3aec6855128d370b9b383394042b3adf8dfd7299e616a385fd09125005a5
+DIST cassava-0.5.2.0.tar.gz 37411 BLAKE2B 64351820bf75bfef0f29e44d1c3f9177ba41474d3419985b9853893aa4cee1485bbb1dfdd4d11b4c8df2673775fdfa211942b13f11124e8077ac25b91c6fc8d4 SHA512 f7f3fc2ebf58491847fb20b21ecf18595933d296bfd4c48249d35c52e72988c4e2758d7a6d2095a9edb3bed8e154a11170920a7c08262270c9f60cb853085383
diff --git a/dev-haskell/cassava/cassava-0.5.2.0.ebuild b/dev-haskell/cassava/cassava-0.5.2.0.ebuild
new file mode 100644
index 000000000000..73aa92acc462
--- /dev/null
+++ b/dev-haskell/cassava/cassava-0.5.2.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.1.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="A CSV parsing and encoding library"
+HOMEPAGE="https://github.com/hvr/cassava"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/attoparsec-0.11.3.0:=[profile?] =dev-haskell/fail-4.9:=[profile?] =dev-haskell/nats-1:=[profile?] =dev-haskell/only-0.1:=[profile?] =dev-haskell/scientific-0.3.4.7:=[profile?] =dev-haskell/semigroups-0.18.2:=[profile?] =dev-haskell/text-short-0.1:=[profile?] =dev-haskell/vector-0.8:=[profile?] =dev-lang/ghc-7.8.2:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.18.1.3
+ test? ( =dev-haskell/quickcheck-2.13 =dev-haskell/quickcheck-instances-0.3.12 =dev-haskell/test-framework-0.8 =dev-haskell/test-framework-hunit-0.3 =dev-haskell/test-framework-quickcheck2-0.3 = 4.5 && < 4.14' 'base >= 4.5'
+}
diff --git a/dev-haskell/cgi/Manifest b/dev-haskell/cgi/Manifest
index 377afd9a500d..fae4cc465a54 100644
--- a/dev-haskell/cgi/Manifest
+++ b/dev-haskell/cgi/Manifest
@@ -1,3 +1,4 @@
DIST cgi-3001.1.8.3.tar.gz 21319 BLAKE2B 68bb0a52f7664830d486f5ca09713944473088372292148d52790973c401a8aae8f56915f683d3d3a483763c11981569dcfb7d41cd05532bb985ce6227490295 SHA512 421ed1a7c7548f1785a693074807fab91cdf4c86b9085a0520b0ffc6127cf53b095dfc07e6f9ed65d475445a28e485ec219d742de369e6271c0c6fe5e7599957
DIST cgi-3001.1.8.4.tar.gz 21421 BLAKE2B fe94e59621df341d943124d66615304607803a52d4efa032c0474f187f444a919c6da636ef6861dbc65fe3de2c16d4e4e8ee449e762f7fb753cbfb11dbe2f8a7 SHA512 0ccbad2b1393cf4149c84eaf9d5601ce976998554cf9240a61a72348eee917869c7b1e00286b22dcac3280c79c551e2947c1040ddeac3c1ec91483dbe2c18ed0
DIST cgi-3001.2.2.2.tar.gz 17270 BLAKE2B d9ba0d6bae5e93600b8d7c6f8650f726baa27f3859138a180cbbf6a708fc9c65b3fa7804d97e7b3dc33fde7e2bc84a29237e62ba85230a38d9d0b1c12ed63f70 SHA512 cc59574d6f8711977e2f733c9a58378b6775b20de1ca07fb343f6b989a787e54bbeddb76ab8f6248cf80aebf007d8c31fbfaa03bbbde503d4402a7769957126d
+DIST cgi-3001.5.0.0.tar.gz 19626 BLAKE2B a84ab0e78a7d7a4902f804501e0982bb22491aa04d28db8b10b61c9f298cd2d1383b07dd7d4e3fc35c0d3d42539fc210d0e0d9334254b5dde2cae6c6b9e07c7d SHA512 460f6d1494ac731c785b1cdffec541733639749bb1ad83605acaa52332b6c9e15a25982cdbf2bba5fcd69fa0317da832e6bf60c38642e394873eb5fa87b58881
diff --git a/dev-haskell/cgi/cgi-3001.5.0.0.ebuild b/dev-haskell/cgi/cgi-3001.5.0.0.ebuild
new file mode 100644
index 000000000000..816add53a854
--- /dev/null
+++ b/dev-haskell/cgi/cgi-3001.5.0.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.1.9999
+#hackport: flags: -old-mtl
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="A library for writing CGI programs"
+HOMEPAGE="https://github.com/cheecheeo/haskell-cgi"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples"
+
+RDEPEND=">=dev-haskell/exceptions-0.10:=[profile?] dev-haskell/mtl-2.2.0.1:=[profile?] =dev-haskell/multipart-0.1.2:=[profile?] =dev-haskell/network-uri-2.6:=[profile?] =dev-haskell/parsec-2.0:=[profile?] =dev-haskell/xhtml-3000.0.0:=[profile?] =dev-lang/ghc-8.0.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.24.0.0
+"
+
+src_configure() {
+ haskell-cabal_src_configure \
+ $(cabal_flag examples install-examples) \
+ --flag=-old-mtl
+}
diff --git a/dev-haskell/chasingbottoms/Manifest b/dev-haskell/chasingbottoms/Manifest
index 509811e7dd5d..62e67f66f976 100644
--- a/dev-haskell/chasingbottoms/Manifest
+++ b/dev-haskell/chasingbottoms/Manifest
@@ -2,3 +2,4 @@ DIST ChasingBottoms-1.3.0.11.tar.gz 31437 BLAKE2B 9db3ffe3b2c6d896138d826b093678
DIST ChasingBottoms-1.3.0.13.tar.gz 31474 BLAKE2B dcb059a1501933e477d09ecaba51b08aa30cf9ec97370e6c0d7f01c358b6a2c8c62a3529ccf8d39b6790bfafcc66acd7f1c089cfc5c5e6e176c7572c136da138 SHA512 050d66670a77de274f16d70dfbc231ab469067ce34af962a851c7f041b7e0812bb6480e3b3166e4ceda2509454ff3d1d85fdd977f63471d6f45c1162184aeb7d
DIST ChasingBottoms-1.3.0.14.tar.gz 31485 BLAKE2B de7f8ec14712d7ae534de4b98d417c6939e837968a0c7575068dd222aeff5b2ea62f9edc5b5f6e31f266beee71dd2916787d687923acbde88f207fa8c47542e3 SHA512 672dbfb236b14cedd7c0039476c7d799b1718843336a60905816faf6f5d80491eaef59bdf4a8b000f0104ab452760964b64c5f09293535d517b3a33e6d382e13
DIST ChasingBottoms-1.3.1.2.tar.gz 31555 BLAKE2B 106413449aaa4d88e140be3692a4eb37d340e6d73e91166e0da8ce1b9477e8868fa975e57e14642d01fcb2474df6d3d653cc617ab3b387f279d7a2560764680d SHA512 84d05b26916bda14bd0b33ff90154da88b5a8c01cae692a8cc11339aea2259b8d0001f3c3b21199ef59efbfb028dfd877f11f8543b55828ecf563f7c5cd711e0
+DIST ChasingBottoms-1.3.1.9.tar.gz 31942 BLAKE2B b94cb27358a1af57e2617ac5b967826d1f20709817622e9c8619fdc8270eb0fc12ea8630f06f012d657f03bded69231ba86039bb07d2ffd4ed3b52ae95c0bc28 SHA512 15b05c3080e7e5960d9f84d4c3a3941a08a8f15a4c8241f7fee11f24054e09092925093f88bdd7ac38eedc57a02fa76c468e61c5ad08cb0c599a2a01bbe6b88b
diff --git a/dev-haskell/chasingbottoms/chasingbottoms-1.3.1.9.ebuild b/dev-haskell/chasingbottoms/chasingbottoms-1.3.1.9.ebuild
new file mode 100644
index 000000000000..34dd21581270
--- /dev/null
+++ b/dev-haskell/chasingbottoms/chasingbottoms-1.3.1.9.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.4.9999
+#hackport: flags: -build-tests
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+MY_PN="ChasingBottoms"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="For testing partial and infinite values"
+HOMEPAGE="http://hackage.haskell.org/package/ChasingBottoms"
+SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/mtl-2:=[profile?] =dev-haskell/quickcheck-2.10:2=[profile?] =dev-haskell/random-1.0:=[profile?] =dev-haskell/syb-0.1.0.2:=[profile?] =dev-lang/ghc-7.6.2:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.16.0
+"
+
+S="${WORKDIR}/${MY_P}"
+
+src_configure() {
+ haskell-cabal_src_configure \
+ --flag=-build-tests
+}
diff --git a/dev-haskell/cipher-aes128/files/cipher-aes128-0.7.0.3-ghc-8.6.patch b/dev-haskell/cipher-aes128/files/cipher-aes128-0.7.0.3-ghc-8.6.patch
deleted file mode 100644
index a5d056e71c94..000000000000
--- a/dev-haskell/cipher-aes128/files/cipher-aes128-0.7.0.3-ghc-8.6.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -ru cipher-aes128-0.7.0.3.orig/Setup.hs cipher-aes128-0.7.0.3/Setup.hs
---- cipher-aes128-0.7.0.3.orig/Setup.hs 2016-08-31 01:58:48.000000000 -0400
-+++ cipher-aes128-0.7.0.3/Setup.hs 2018-07-04 22:06:10.880373751 -0400
-@@ -13,10 +13,8 @@
- main = defaultMainWithHooks hk
- where
- hk = simpleUserHooks { buildHook = \pd lbi uh bf -> do
-- let ccProg = Program "gcc" undefined undefined undefined
-- hcProg = Program "ghc" undefined undefined undefined
-- mConf = lookupProgram ccProg (withPrograms lbi)
-- hcConf = lookupProgram hcProg (withPrograms lbi)
-+ let mConf = lookupProgram gccProgram (withPrograms lbi)
-+ hcConf = lookupProgram ghcProgram (withPrograms lbi)
- err = error "Could not determine C compiler"
- _cc = locationPath . programLocation . maybe err id $ mConf
- hc = locationPath . programLocation . maybe err id $ hcConf
diff --git a/dev-haskell/deepseq-generics/deepseq-generics-0.2.0.0.ebuild b/dev-haskell/deepseq-generics/deepseq-generics-0.2.0.0.ebuild
index 141b385467a4..72295880e3a5 100644
--- a/dev-haskell/deepseq-generics/deepseq-generics-0.2.0.0.ebuild
+++ b/dev-haskell/deepseq-generics/deepseq-generics-0.2.0.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
# ebuild generated by hackport 0.4.7.9999
@@ -25,3 +25,11 @@ DEPEND="${RDEPEND}
dev-haskell/test-framework
dev-haskell/test-framework-hunit )
"
+
+src_prepare() {
+ default
+
+ cabal_chdeps \
+ 'base >= 4.5 && < 4.10' 'base >= 4.5' \
+ 'ghc-prim >= 0.2 && < 0.6' 'ghc-prim >= 0.2'
+}
diff --git a/dev-haskell/deriving-compat/Manifest b/dev-haskell/deriving-compat/Manifest
index 161187479a6f..c78a6c818113 100644
--- a/dev-haskell/deriving-compat/Manifest
+++ b/dev-haskell/deriving-compat/Manifest
@@ -1 +1,2 @@
DIST deriving-compat-0.3.5.tar.gz 60418 BLAKE2B c3b56d5bbb0054b5bcfea50c38a742df35030d723e4051f5f441b0e341bfaa88aab7691a0cc77ba8b2df623e7e7c0e2b272ca63a11e27827d9b8e67e68cc4803 SHA512 73facb605f26edb05ce299cf40443a12d4508abc28a7a08bcb88e60edd12bd4c015023004abfc78794239f38e622e0b4309df63e40f8a5dd621fcd15cf1ede7a
+DIST deriving-compat-0.5.8.tar.gz 67468 BLAKE2B 0d5ea2e882e598590b69e8682d6a751fadd8cc78cbadc97d884db74730972e93b4045276aa86369d744d4edd9db4942acbdde4abae18002c599d7b0728112be1 SHA512 e0a807142bc324a0205bd3b98fc9c68292100808d448edaf800ed41c073ec0745329458dbbb6c1fe33cc86872a9d2555d76f57c6b9d8a1dcd891dda1a9fcf158
diff --git a/dev-haskell/deriving-compat/deriving-compat-0.5.8.ebuild b/dev-haskell/deriving-compat/deriving-compat-0.5.8.ebuild
new file mode 100644
index 000000000000..8b27d4f7f63f
--- /dev/null
+++ b/dev-haskell/deriving-compat/deriving-compat-0.5.8.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.2
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Backports of GHC deriving extensions"
+HOMEPAGE="https://github.com/haskell-compat/deriving-compat"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/th-abstraction-0.3:=[profile?] =dev-haskell/transformers-compat-0.5:=[profile?]
+ >=dev-lang/ghc-7.8.2:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.18.1.3
+ test? ( >=dev-haskell/base-compat-0.8.1 =dev-haskell/base-orphans-0.5 =dev-haskell/hspec-1.8
+ >=dev-haskell/quickcheck-2 =dev-haskell/tagged-0.7 =dev-haskell/aeson-0.4:=[profile?] =dev-haskell/ekg-core-0.1:=[profile?] =dev-haskell/ekg-json-0.1:=[profile?] =dev-lang/ghc-7.8.2:=
@@ -30,3 +30,13 @@ RDEPEND="= 4.5 && < 4.12' 'base >=4.5' \
+ 'aeson >= 0.4 && < 1.3' 'aeson >= 0.4' \
+ 'network < 2.7' 'network' \
+ 'time < 1.9' 'time'
+}
diff --git a/dev-haskell/ekg/ekg-0.4.0.8.ebuild b/dev-haskell/ekg/ekg-0.4.0.8.ebuild
deleted file mode 100644
index 786f6ec4983a..000000000000
--- a/dev-haskell/ekg/ekg-0.4.0.8.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Remote monitoring of processes"
-HOMEPAGE="https://github.com/tibbe/ekg"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="=dev-haskell/ekg-core-0.1:=[profile?] =dev-haskell/ekg-json-0.1:=[profile?] =dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.8
-"
diff --git a/dev-haskell/ekg/ekg-0.4.0.9.ebuild b/dev-haskell/ekg/ekg-0.4.0.9.ebuild
deleted file mode 100644
index b969ebc4b791..000000000000
--- a/dev-haskell/ekg/ekg-0.4.0.9.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.7.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Remote monitoring of processes"
-HOMEPAGE="https://github.com/tibbe/ekg"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="=dev-haskell/ekg-core-0.1:=[profile?] =dev-haskell/ekg-json-0.1:=[profile?] =dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.8
-"
diff --git a/dev-haskell/enumerator/enumerator-0.4.20.ebuild b/dev-haskell/enumerator/enumerator-0.4.20.ebuild
index 135477c4a952..c8d35ee60ce3 100644
--- a/dev-haskell/enumerator/enumerator-0.4.20.ebuild
+++ b/dev-haskell/enumerator/enumerator-0.4.20.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
# ebuild generated by hackport 0.3.4.9999
@@ -24,3 +24,7 @@ RDEPEND=">=dev-haskell/text-0.7:=[profile?]
DEPEND="${RDEPEND}
>=dev-haskell/cabal-1.6.0.3
"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-ghc84.patch
+)
diff --git a/dev-haskell/enumerator/files/enumerator-0.4.20-ghc84.patch b/dev-haskell/enumerator/files/enumerator-0.4.20-ghc84.patch
new file mode 100644
index 000000000000..d992228d2e5c
--- /dev/null
+++ b/dev-haskell/enumerator/files/enumerator-0.4.20-ghc84.patch
@@ -0,0 +1,21 @@
+--- a/enumerator.cabal
++++ b/enumerator.cabal
+@@ -152,2 +152,5 @@ library
+
++ if !impl(ghc >= 8.0)
++ build-depends: semigroups == 0.18.*
++
+ exposed-modules:
+--- a/lib/Data/Enumerator/Internal.hs
++++ b/lib/Data/Enumerator/Internal.hs
+@@ -50,2 +50,3 @@ import Data.Function (fix)
+ import Data.Monoid (Monoid, mempty, mappend, mconcat)
++import qualified Data.Semigroup as S
+
+@@ -73,2 +74,6 @@ instance Monad Stream where
+
++instance S.Semigroup (Stream a) where
++ (<>) (Chunks xs) (Chunks ys) = Chunks (xs ++ ys)
++ (<>) _ _ = EOF
++
+ instance Monoid (Stream a) where
diff --git a/dev-haskell/filestore/Manifest b/dev-haskell/filestore/Manifest
index 79313cc76bef..87733e6a4da3 100644
--- a/dev-haskell/filestore/Manifest
+++ b/dev-haskell/filestore/Manifest
@@ -1,3 +1,4 @@
DIST filestore-0.6.1.tar.gz 31837 BLAKE2B 8aa628da69bb84fbc0654c8d82bad208f0cecb4749f7ec82e8e4261a48464e008f2a7690e504e442cec368afef5d977073cb1544a346d1e915adc0dc3f2c35ee SHA512 48d307b928c7a79974e057b604cde80cb4394f6840300aae637f82884f7741553a7edc791f5b0d7c002eec2a025f4ae015a326453525c351368050fe5cf255b4
DIST filestore-0.6.2.tar.gz 31096 BLAKE2B 2477879d7cb361e96bc030dfdf1bd6e00b865d5a77133d428b358c8aac514f64c957d8500f5ca96ea2f905bdcc0c98b5138da212faba83589117feb5491f86b5 SHA512 3cc3ab2e46cbd6210dc507a6411db347c626219cc9bdfc39fcdc63f10f813b6066c069b3f614a2a4e2f5522608be11f64a11742570270f2d06da4b330ea97b44
DIST filestore-0.6.3.4.tar.gz 32070 BLAKE2B a4096d31aa1382eab3c41eb55c58c19171de67caea3078f5383dea61fb13b51adb71bbdae0b8d670c61b72be9394494d776c0dc797c4d2b71d3d49a13851f8c8 SHA512 d5a7cf4ca3bc3fbc8d8f066fad5e3913d8fef4c13d894f3df604fab91ad2c4e1bb585c5c067220055e9356dc99a860b03b281e46c3b16517bce130a8bc57eda7
+DIST filestore-0.6.4.tar.gz 32225 BLAKE2B 49fd010ddabb0b940d228b7adae61908fb98d81bd8aa74f8d910e7ec0f1086a6d9741e9894d0c96d61cbf489814574d08375dd32c60c8c6c2e6ae03dac4eab06 SHA512 07a8ce976b354139ae4894c3e6751b9ef02957191a15e18b2eccc8cfbc97344eca2ad44b6cca863ccf7c43b444ed999355c33d99cd20b87c126f04d8f248cabb
diff --git a/dev-haskell/filestore/filestore-0.6.4.ebuild b/dev-haskell/filestore/filestore-0.6.4.ebuild
new file mode 100644
index 000000000000..045963f9258e
--- /dev/null
+++ b/dev-haskell/filestore/filestore-0.6.4.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.4.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Interface for versioning file stores"
+HOMEPAGE="http://hackage.haskell.org/package/filestore"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+maxcount"
+
+RESTRICT=test # requires mercurial
+
+RDEPEND=">=dev-haskell/diff-0.4:=[profile?] =dev-haskell/old-locale-1.0:=[profile?] =dev-haskell/parsec-2:=[profile?] =dev-haskell/split-0.1:=[profile?] =dev-haskell/utf8-string-0.3:=[profile?] =dev-haskell/xml-1.3:=[profile?] =dev-lang/ghc-7.10.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.22.2.0
+ test? ( >=dev-haskell/hunit-1.2
diff --git a/dev-haskell/hcodecs/Manifest b/dev-haskell/hcodecs/Manifest
index 5da700c8d810..d64283357b09 100644
--- a/dev-haskell/hcodecs/Manifest
+++ b/dev-haskell/hcodecs/Manifest
@@ -1,2 +1,3 @@
DIST HCodecs-0.5.1.tar.gz 24209 BLAKE2B f466bff90fafd4ecc26d21eee26749ef5fc92d97849eea5a5aa88b0b2882f6b9b575bc38ca599d2c33bd9a2b9ec839577b12b42d665cea7eab239e65eb64576e SHA512 470d3fbbb096b0a5e40e9c529d0b7c738ec905237bd43acec9c8b5676e0e214a864684e09614af16678a48883f670cc52e691fe93e3db14815028408cd96b3a0
+DIST HCodecs-0.5.2.tar.gz 24397 BLAKE2B 267a230f124c7ecb50f918fd5ba293373ac82b9b38d6b3ede715f79f8f7ace3e7a7f3ad2280fbdb6225febd647fec5837b4cb6d2a00c05ec3b9a514fac2e5e7b SHA512 454f499e93c9a99bb0f5b210d84e89ea1edb1714a639826ea012caa49e744de3fe024eab25a9288317135d081cab0cfb19b4fb2537c14a6c27dbb228e70c9a49
DIST HCodecs-0.5.tar.gz 24232 BLAKE2B 0af06721ba03658c421fc3ec66370736fc439bce403307148174363179d08586a93fbde6bb957c68909cc0e876c93b828a715b9fdb872786ca533947a630d02b SHA512 40ee73995c06b34b799f1e8bd310faadc6ab267735313bdb62c0fb7ea95c13e3b443fc230cd529eb5f8ce02685d0506c80bcab3e802f2c407ef7584f6abdbe1d
diff --git a/dev-haskell/hcodecs/hcodecs-0.5.2.ebuild b/dev-haskell/hcodecs/hcodecs-0.5.2.ebuild
new file mode 100644
index 000000000000..ff997f5b7a61
--- /dev/null
+++ b/dev-haskell/hcodecs/hcodecs-0.5.2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+MY_PN="HCodecs"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="A library to read, write and manipulate MIDI, WAVE, and SoundFont2 files"
+HOMEPAGE="http://www-db.informatik.uni-tuebingen.de/team/giorgidze"
+SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-haskell/fail:=[profile?]
+ >=dev-haskell/quickcheck-2.0:2=[profile?]
+ dev-haskell/random:=[profile?]
+ dev-haskell/semigroups:=[profile?]
+ >=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.8
+"
+
+S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/hcodecs/metadata.xml b/dev-haskell/hcodecs/metadata.xml
index 4ac3a65a9972..02cadfb9cc8e 100644
--- a/dev-haskell/hcodecs/metadata.xml
+++ b/dev-haskell/hcodecs/metadata.xml
@@ -6,8 +6,12 @@
Gentoo Haskell
- The library provides functions to read, write and manipulate MIDI, WAVE and SoundFont2 multimedia files. It is written entirely in Haskell (without any FFI). It uses efficient parsing and building combinators for binary data stored in ByteStrings (based on the one in 'binary' package).
+ The library provides functions to read, write and manipulate MIDI, WAVE and
+ SoundFont2 multimedia files. It is written entirely in Haskell (without any
+ FFI). It uses efficient parsing and building combinators for binary data
+ stored in ByteStrings (based on the one in 'binary' package).
- Correctness of significant parts of the library has been validated with QuickCheck and Haskell Program Coverage (HPC) tool-kits.
+ Correctness of significant parts of the library has been validated with
+ QuickCheck and Haskell Program Coverage (HPC) tool-kits.
diff --git a/dev-haskell/hoauth2/Manifest b/dev-haskell/hoauth2/Manifest
index 4bb4daf0afc2..c6128d2f3fae 100644
--- a/dev-haskell/hoauth2/Manifest
+++ b/dev-haskell/hoauth2/Manifest
@@ -1,2 +1,3 @@
DIST hoauth2-0.4.8.tar.gz 8599 BLAKE2B 9cfaf6bf26937a5b3e9e03489843cd9173aea20d4360bfbbdbb9e083f7ec0c2191f19b6c8b86f07d5216c8fa064558183203d0f3d05e8390afb2a7d3a2f82455 SHA512 b2abf00d0ae7d15911f4a1e17d90d6f0b3931800bc66d77545c566fc64de527cfc86121b57a4ff4187a4a0aa81aea2e150412bf928fdec8e506ab24f9e1bea29
DIST hoauth2-0.5.7.tar.gz 12245 BLAKE2B 641c30f90c4420c40e0c73397d5a830c1b9f24095bf31108531303fbfc8d56e4a614a09c2e2fdc11204521d2299faf2c15fd8dc6a0541627c0804ce485cd8bc6 SHA512 218c5cb722861af099efa1cf66025b3fbdaba3574b19fbe39db5bb3ca8431c8436329b9bf9cd7a642227e2bca964843bba6b94cb70d5020321b3f743cc020569
+DIST hoauth2-1.8.9.tar.gz 16766 BLAKE2B ee95c10f571815683989f05e64539012b04009f6ee967d62ab6ed40c09d4a7f555f144452eb1a137f9a5f9d79077d8eac042c20bd9199356b8092eaaa46f1475 SHA512 c77f66f54310dea587de5d0f5a37c4d113881705a80b525a9180c94a3eae9d9d8a691ec3759bfd7681f467a633a2692df2e4ef69b6919b5147ee5546c9b49aa4
diff --git a/dev-haskell/hoauth2/hoauth2-1.8.9.ebuild b/dev-haskell/hoauth2/hoauth2-1.8.9.ebuild
new file mode 100644
index 000000000000..0d8f917b5795
--- /dev/null
+++ b/dev-haskell/hoauth2/hoauth2-1.8.9.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.9999
+#hackport: flags: -test
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Haskell OAuth2 authentication client"
+HOMEPAGE="https://github.com/freizl/hoauth2"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/aeson-1.3.0.0:=[profile?] =dev-haskell/exceptions-0.8.3:=[profile?] =dev-haskell/http-conduit-2.1:=[profile?] =dev-haskell/http-types-0.11:=[profile?] =dev-haskell/microlens-0.4.0:=[profile?] =dev-haskell/text-0.11:=[profile?] =dev-haskell/unordered-containers-0.2.5:=[profile?]
+ >=dev-haskell/uri-bytestring-0.2.3.1:=[profile?] =dev-haskell/uri-bytestring-aeson-0.1:=[profile?] =dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.10
+"
+
+src_configure() {
+ haskell-cabal_src_configure \
+ --flag=-test
+}
diff --git a/dev-haskell/hostname/hostname-1.0.ebuild b/dev-haskell/hostname/hostname-1.0-r1.ebuild
similarity index 68%
rename from dev-haskell/hostname/hostname-1.0.ebuild
rename to dev-haskell/hostname/hostname-1.0-r1.ebuild
index 5f206b1d2b91..33cfc64af5e5 100644
--- a/dev-haskell/hostname/hostname-1.0.ebuild
+++ b/dev-haskell/hostname/hostname-1.0-r1.ebuild
@@ -1,22 +1,24 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-# ebuild generated by hackport 0.2.14
+EAPI=7
-EAPI="4"
+# ebuild generated by hackport 0.6.4.9999
CABAL_FEATURES="lib profile haddock hoogle hscolour"
inherit haskell-cabal
DESCRIPTION="A a cross-platform means of determining the hostname"
-HOMEPAGE="https://hackage.haskell.org/package/hostname"
+HOMEPAGE="http://hackage.haskell.org/package/hostname"
SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
-SLOT="0"
+SLOT="0/${PV}"
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
IUSE=""
-RDEPEND=">=dev-lang/ghc-6.8.2"
+RDEPEND=">=dev-lang/ghc-7.4.1:=
+"
DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.2"
+ >=dev-haskell/cabal-1.2
+"
diff --git a/dev-haskell/hostname/metadata.xml b/dev-haskell/hostname/metadata.xml
index 055b354b3aa2..b7878815d80d 100644
--- a/dev-haskell/hostname/metadata.xml
+++ b/dev-haskell/hostname/metadata.xml
@@ -5,7 +5,4 @@
haskell@gentoo.org
Gentoo Haskell
-
- A very simple package providing a cross-platform means of determining the hostname
-
diff --git a/dev-haskell/http-streams/Manifest b/dev-haskell/http-streams/Manifest
index e13b548e8080..79a81c594237 100644
--- a/dev-haskell/http-streams/Manifest
+++ b/dev-haskell/http-streams/Manifest
@@ -1 +1,2 @@
DIST http-streams-0.8.4.0.tar.gz 35330 BLAKE2B 6e6c0fbd9a61c6ea587d7140fb0219c5a415c798ee55b47f45642c19cc67f67a6c1098d74c8451bb6285fdc001d6cac389459a3dbd5ba9409a59e47e4bf4c9a5 SHA512 763287042b37eca43941369dd2b7a7693f545ef37d87bdadb0b5ee686648bc0c3e7d2a8edee37648bb61ebc1dfefb029ca3ce22a44519a16775eab98de0b0a1a
+DIST http-streams-0.8.7.1.tar.gz 35149 BLAKE2B c7b754b694b612f167b072e17abf14a537aa36422ee4a55695c25b84e8780a6acff61ad9d2041b0ee2cc2cf51f77cdee732021870418d506cbf07a80cbb1b88e SHA512 6c2613cc6bcc1b54916c484834779fb3388085082df33216beb12685eb8e56c0f45b2bf24d657acc6c0295ea429c0e1947213a1235c4373cfdcf10899c93bee1
diff --git a/dev-haskell/http-streams/http-streams-0.8.7.1.ebuild b/dev-haskell/http-streams/http-streams-0.8.7.1.ebuild
new file mode 100644
index 000000000000..f508569b5ad7
--- /dev/null
+++ b/dev-haskell/http-streams/http-streams-0.8.7.1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.3
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="An HTTP client using io-streams"
+HOMEPAGE="https://github.com/afcowie/http-streams/"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+network-uri"
+
+RESTRICT=test #circular test depend: http-streams -> snap-server -> http-streams
+
+RDEPEND="dev-haskell/aeson:=[profile?]
+ dev-haskell/attoparsec:=[profile?]
+ dev-haskell/base64-bytestring:=[profile?]
+ >=dev-haskell/blaze-builder-0.4:=[profile?]
+ dev-haskell/case-insensitive:=[profile?]
+ >=dev-haskell/hsopenssl-0.11.2:=[profile?]
+ >=dev-haskell/http-common-0.8.2:=[profile?]
+ >=dev-haskell/io-streams-1.3:=[profile?] =dev-haskell/openssl-streams-1.1:=[profile?] =dev-lang/ghc-7.8.2:=
+ network-uri? ( >=dev-haskell/network-2.6:=[profile?]
+ >=dev-haskell/network-uri-2.6:=[profile?] )
+ !network-uri? ( = 4.5 && < 4.13' 'base >= 4.5' \
+ 'network >= 2.3 && < 3.1' 'network >= 2.3 && < 3.2'
+}
diff --git a/dev-haskell/io-streams/Manifest b/dev-haskell/io-streams/Manifest
index 435a0a830d2e..3cb233c7ae27 100644
--- a/dev-haskell/io-streams/Manifest
+++ b/dev-haskell/io-streams/Manifest
@@ -1 +1,2 @@
DIST io-streams-1.3.6.0.tar.gz 61651 BLAKE2B d71a5ba3d264b98d3284470021fc1d9622700b37ef1a67142d12d4d6321233eb28ad5274925e08f9d0c251ee77e25e2187c811d197a9f7b68e33479d8ea602ab SHA512 9ef5a2daa43600796b48104771c71d698f40e29def536e785421b53a310683e7db202b254310a0a5f2d1fa507dcad27c25f328c64fffe796c06d4c0d98ca982d
+DIST io-streams-1.5.1.0.tar.gz 64044 BLAKE2B 9a1a4dce626f3a569f4a7866f93d5663e9e4e8b863d1c2332bffbeb2e4481e0a250c84b75ae375144a32473b62538dbd87b53dd0a08034daea855484660aa07a SHA512 01ddf89f09cba429ab600e55994cb6740d4fcdeb23ce85822098d39dbe530a74256d66ea52429798787d9d549db3cd99a5078362b333a7f49c4926e74e0b460c
diff --git a/dev-haskell/io-streams/io-streams-1.5.1.0-r1.ebuild b/dev-haskell/io-streams/io-streams-1.5.1.0-r1.ebuild
new file mode 100644
index 000000000000..001dda035c1c
--- /dev/null
+++ b/dev-haskell/io-streams/io-streams-1.5.1.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
+
+# ebuild generated by hackport 0.5.6.9999
+#hackport: flags: +nointeractivetests
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Simple, composable, and easy-to-use stream I/O"
+HOMEPAGE="https://hackage.haskell.org/package/io-streams"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RESTRICT=test # one test case requires network access
+
+RDEPEND=">=dev-haskell/attoparsec-0.10:=[profile?] =dev-haskell/bytestring-builder-0.10:=[profile?] =dev-haskell/network-2.3:=[profile?]
+ >=dev-haskell/primitive-0.2:=[profile?]
+ >=dev-haskell/text-0.10:=[profile?] =dev-haskell/vector-0.7:=[profile?] =dev-haskell/zlib-bindings-0.1:=[profile?] =dev-lang/ghc-7.8.2:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.18.1.3
+ test? ( >=dev-haskell/hunit-1.2 =dev-haskell/mtl-2 =dev-haskell/quickcheck-2.3.0.2 =dev-haskell/test-framework-0.6 =dev-haskell/test-framework-hunit-0.2.7 =dev-haskell/test-framework-quickcheck2-0.2.12.1 =dev-haskell/zlib-0.5 = 2.3 && <3.1' 'network >= 2.3' \
+ 'primitive >= 0.2 && <0.7' 'primitive >= 0.2'
+}
+
+src_configure() {
+ haskell-cabal_src_configure \
+ --flag=nointeractivetests
+}
diff --git a/dev-haskell/language-bash/Manifest b/dev-haskell/language-bash/Manifest
index b50df16a11a9..1cbbc76d58d5 100644
--- a/dev-haskell/language-bash/Manifest
+++ b/dev-haskell/language-bash/Manifest
@@ -1 +1,2 @@
DIST language-bash-0.6.1.tar.gz 20224 BLAKE2B 28f3fc67bf9df96bd22be997ee6cb3ece85651ca332b57f28f1212625517171dc8cccaaf3a31bfcf40d19a840e37d0d26bf432cdf08fb68bc772544c63248430 SHA512 2dfb3344a0bd15051f2d3f8bdb7185154b019141473e7f56b0decc1b840880bcccf69a910b16ef1958f149c5df5e90a4e7b6035b75b52c21d5829b018f66c143
+DIST language-bash-0.9.0.tar.gz 23660 BLAKE2B de074d6c397200514357838c621157c28c4610c7f5eab0920f99dd9c2bb1648420829822e589cde66774b8a3467fb66fe6bb1363994182d4a219ca8119ca1391 SHA512 cf14e6353b1afa487515a85b99f5cc2d93d614f3e6d653bacf55328921f5966ce5083fe19f51c0e952513c539101541c14664858315288d96b23d12d6b587fc8
diff --git a/dev-haskell/language-bash/language-bash-0.9.0.ebuild b/dev-haskell/language-bash/language-bash-0.9.0.ebuild
new file mode 100644
index 000000000000..442f6094633e
--- /dev/null
+++ b/dev-haskell/language-bash/language-bash-0.9.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.2
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Parsing and pretty-printing Bash shell scripts"
+HOMEPAGE="https://github.com/knrafto/language-bash/"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RESTRICT=test # fails, "getDirectoryContents:openDirStream: does not exist"
+
+RDEPEND=">=dev-haskell/parsec-3.0:=[profile?] =dev-haskell/prettyprinter-1.2:=[profile?] =dev-lang/ghc-7.8.2:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.18.1.3
+ test? ( dev-haskell/quickcheck
+ dev-haskell/tasty
+ dev-haskell/tasty-expected-failure
+ dev-haskell/tasty-golden
+ dev-haskell/tasty-hunit
+ dev-haskell/tasty-quickcheck )
+"
diff --git a/dev-haskell/language-css/files/language-css-0.0.3-ghc84.patch b/dev-haskell/language-css/files/language-css-0.0.3-ghc84.patch
new file mode 100644
index 000000000000..43acce4e7314
--- /dev/null
+++ b/dev-haskell/language-css/files/language-css-0.0.3-ghc84.patch
@@ -0,0 +1,7 @@
+--- a/src/Language/Css/Pretty.hs
++++ b/src/Language/Css/Pretty.hs
+@@ -6,3 +6,3 @@ import Text.PrettyPrint
+ import Language.Css.Syntax
+-
++import Prelude hiding ((<>))
+
diff --git a/dev-haskell/language-css/language-css-0.0.3.ebuild b/dev-haskell/language-css/language-css-0.0.3.ebuild
index a246056d761e..6113d48e4a89 100644
--- a/dev-haskell/language-css/language-css-0.0.3.ebuild
+++ b/dev-haskell/language-css/language-css-0.0.3.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
# ebuild generated by hackport 0.5.9999
@@ -9,7 +9,7 @@ CABAL_FEATURES="lib profile haddock hoogle hscolour"
inherit haskell-cabal
DESCRIPTION="CSS 2.1 syntax"
-HOMEPAGE="https://hackage.haskell.org/package/language-css"
+HOMEPAGE="http://hackage.haskell.org/package/language-css"
SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
@@ -22,3 +22,7 @@ RDEPEND=">=dev-lang/ghc-7.4.1:=
DEPEND="${RDEPEND}
>=dev-haskell/cabal-1.2
"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-ghc84.patch
+)
diff --git a/dev-haskell/language-dot/Manifest b/dev-haskell/language-dot/Manifest
index 2a0131034165..0c19bc8ed26d 100644
--- a/dev-haskell/language-dot/Manifest
+++ b/dev-haskell/language-dot/Manifest
@@ -1 +1,2 @@
DIST language-dot-0.1.0.tar.gz 8042 BLAKE2B e83130172cc777126f54ea16b1ee0337b275a318b0ae66c2f9fb1485b04a56444e6db14e1a8738df170c0612e78dfefcb64cf0caf65c51d812ee4c6f5eee7e1a SHA512 4166a345a31d075f6492cd519dff19b5ec4fb4c4a953ef4ddaa92acdad618a2b61271d5eaa87920b6541d7f0d72611887ed2a68764d7fa446c31db66501b1467
+DIST language-dot-0.1.1.tar.gz 8076 BLAKE2B 02d1ea0cf861d8052846961d0ad8792e83f252711f6ff64443a237f5e5aedaa8a93d3e6c32f9fd2d916fede3e6927e69fc6986311e1b367133dde8cc9de002d4 SHA512 a9a3abe5ee617614bce73952384be4e5d53942f0c011817b6a92fd6452dce8c37ba39e05ff4733be404315ef95c2de9c0d4134e7aab4e875e7f414dcdb5bfcd9
diff --git a/dev-haskell/language-dot/language-dot-0.1.1.ebuild b/dev-haskell/language-dot/language-dot-0.1.1.ebuild
new file mode 100644
index 000000000000..cdd922c51593
--- /dev/null
+++ b/dev-haskell/language-dot/language-dot-0.1.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.1
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="A library for the analysis and creation of Graphviz DOT files"
+HOMEPAGE="http://hackage.haskell.org/package/language-dot"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+executable"
+
+RDEPEND=">=dev-haskell/parsec-3:=[profile?] =dev-lang/ghc-7.4.1:=
+ >=dev-haskell/mtl-1:=[profile?]
+
+
+
+ haskell@gentoo.org
+ Gentoo Haskell
+
+
+ This package provides a canonical anonymous 1-tuple type missing
+ from Haskell for attaching typeclass instances.
+
+ NOTE: There is also the </package/OneTuple OneTuple package> which
+ by using a boxed @data@-type provides a 1-tuple type which has
+ laziness properties which are more faithful to the ones of Haskell's
+ native tuples; whereas the primary purpose of 'Only' is to
+ provide the traditionally so named type-wrapper for attaching typeclass
+ instances.
+
+
diff --git a/dev-haskell/only/only-0.1.ebuild b/dev-haskell/only/only-0.1.ebuild
new file mode 100644
index 000000000000..f83748215b38
--- /dev/null
+++ b/dev-haskell/only/only-0.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.5.3.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+MY_PN="Only"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="The 1-tuple type or single-value \"collection\""
+HOMEPAGE="http://hackage.haskell.org/package/Only"
+SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.10
+"
+
+S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/openssl-streams/openssl-streams-1.2.2.0.ebuild b/dev-haskell/openssl-streams/openssl-streams-1.2.2.0.ebuild
index 5846920d9bdc..79422fe4d712 100644
--- a/dev-haskell/openssl-streams/openssl-streams-1.2.2.0.ebuild
+++ b/dev-haskell/openssl-streams/openssl-streams-1.2.2.0.ebuild
@@ -17,6 +17,8 @@ SLOT="0/${PV}"
KEYWORDS="~amd64 ~x86"
IUSE=""
+RESTRICT=test # requires network access
+
RDEPEND=">=dev-haskell/hsopenssl-0.10.3:=[profile?] =dev-haskell/io-streams-1.0:=[profile?] =dev-haskell/network-2.4:=[profile?] = 4.3 && < 4.14' 'base >= 4.3'
+}
+
+src_configure() {
+ haskell-cabal_src_configure \
+ --flag=newbase \
+ --flag=splitbase
+}
diff --git a/dev-haskell/snap-core/Manifest b/dev-haskell/snap-core/Manifest
index c7df9f0867c4..24e0c5754d89 100644
--- a/dev-haskell/snap-core/Manifest
+++ b/dev-haskell/snap-core/Manifest
@@ -1,2 +1,2 @@
-DIST snap-core-0.9.8.0.tar.gz 91610 BLAKE2B 291dd696482f3406b58081fc3dede958cd255ef725ee84d0e4706b096c9c468832b99e5e3d61771e0c652cc0463e831a9c7119595328f18443deedd901625417 SHA512 8bf98590294b3f8752255612b90378f19cec14067f2eaddab496cee5fddb4b8be954aada5a7831b81611d7ffc04d74156eb8fdb5d3c5f45e30259c7f86605585
DIST snap-core-1.0.1.0.tar.gz 139670 BLAKE2B 13c0839ef95b2260e1272dbf26c9ee1f8970094e3f9ffea728d760f4bf11a260ad73120495a39305e8d8d05cb39c230db08ae1e4094efcaf7879acf4680f61c3 SHA512 ed862530f235adca6f193c96d45b31705534089c58637bf8d0d9d8cd898db8f25494990e210151adc737c34e3cc59f5e0a47cc6b1e638dae9104e991e27dbe8b
+DIST snap-core-1.0.4.2.tar.gz 163146 BLAKE2B 2fc037fa239eed3771c84ede4ed247f34169fb45464f5724e7d770baa0992409eeff4b066a9eaea3cdebf46a9846dd8ac94dab42deb36047bb26654df5642f9b SHA512 42e710ac58a7d3cf58f9fdeca6c9c4880a94765ee0dc42fbcdaf68a6c2c337e1715f8b89863c7f911232af493bf5622b647d4c962237f211f97d731572fd94f5
diff --git a/dev-haskell/snap-core/snap-core-0.9.8.0.ebuild b/dev-haskell/snap-core/snap-core-0.9.8.0.ebuild
deleted file mode 100644
index 7aaa43d11b24..000000000000
--- a/dev-haskell/snap-core/snap-core-0.9.8.0.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Snap: A Haskell Web Framework (core interfaces and types)"
-HOMEPAGE="http://snapframework.com/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug portable"
-
-RDEPEND=">=dev-haskell/attoparsec-0.10:=[profile?] =dev-haskell/attoparsec-enumerator-0.3:=[profile?] =dev-haskell/blaze-builder-0.2.1.4:=[profile?] =dev-haskell/blaze-builder-enumerator-0.2:=[profile?] =dev-haskell/case-insensitive-0.3:=[profile?] =dev-haskell/enumerator-0.4.15:=[profile?] =dev-haskell/hunit-1.2:=[profile?] =dev-haskell/monadcatchio-transformers-0.2.1:=[profile?] =dev-haskell/mtl-2.0:=[profile?] =dev-haskell/random-1:=[profile?] =dev-haskell/regex-posix-0.95:=[profile?] =dev-haskell/text-0.11:=[profile?] =dev-haskell/unix-compat-0.2:=[profile?] =dev-haskell/unordered-containers-0.1.4.3:=[profile?] =dev-haskell/vector-0.6:=[profile?] =dev-haskell/zlib-enum-0.2.1:=[profile?] =dev-lang/ghc-7.4.1:=
- >=dev-haskell/hashable-1.1:=[profile?] =dev-haskell/time-locale-compat-0.1:=[profile?] =dev-haskell/bytestring-mmap-0.2.2:=[profile?] =dev-haskell/old-locale-1:=[profile?] = 1.0 && < 1.6' 'time >= 1.0'
-}
-
-src_configure() {
- haskell-cabal_src_configure \
- $(cabal_flag debug debug) \
- $(cabal_flag portable portable)
-}
diff --git a/dev-haskell/snap-core/snap-core-1.0.4.2.ebuild b/dev-haskell/snap-core/snap-core-1.0.4.2.ebuild
new file mode 100644
index 000000000000..0a9b8c777f02
--- /dev/null
+++ b/dev-haskell/snap-core/snap-core-1.0.4.2.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.5.9999
+#hackport: flags: +network-uri
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Snap: A Haskell Web Framework (core interfaces and types)"
+HOMEPAGE="http://snapframework.com/"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug portable"
+
+RDEPEND=">=dev-haskell/attoparsec-0.12:=[profile?] =dev-haskell/bytestring-builder-0.10.4:=[profile?] =dev-haskell/case-insensitive-1.1:=[profile?] =dev-haskell/fail-4.9:=[profile?] =dev-haskell/hashable-1.2.0.6:=[profile?] =dev-haskell/hunit-1.2:=[profile?] =dev-haskell/io-streams-1.3:=[profile?] =dev-haskell/lifted-base-0.1:=[profile?] =dev-haskell/monad-control-1.0:=[profile?] =dev-haskell/mtl-2.0:=[profile?] =dev-haskell/network-2.6:=[profile?] =dev-haskell/network-uri-2.6:=[profile?] =dev-haskell/random-1:=[profile?] =dev-haskell/readable-0.1:=[profile?] =dev-haskell/regex-posix-0.95:=[profile?] =dev-haskell/semigroups-0.18:=[profile?] =dev-haskell/text-0.11:=[profile?] =dev-haskell/transformers-base-0.4:=[profile?] =dev-haskell/unix-compat-0.3:=[profile?] =dev-haskell/unordered-containers-0.1.4.3:=[profile?] =dev-haskell/vector-0.6:=[profile?] =dev-lang/ghc-7.8.2:=
+ portable? ( >=dev-haskell/time-locale-compat-0.1:=[profile?] =dev-haskell/old-locale-1:=[profile?] = 0.10 && < 0.13' 'attoparsec >= 0.10 && < 0.14' \
- 'time >= 1.0 && < 1.6' 'time >= 1.0'
-}
-
-src_configure() {
- haskell-cabal_src_configure \
- $(cabal_flag openssl openssl) \
- $(cabal_flag portable portable)
-}
diff --git a/dev-haskell/snap-server/snap-server-1.1.1.2.ebuild b/dev-haskell/snap-server/snap-server-1.1.1.2.ebuild
new file mode 100644
index 000000000000..4cebd1763301
--- /dev/null
+++ b/dev-haskell/snap-server/snap-server-1.1.1.2.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.5.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="A fast, iteratee-based, epoll-enabled web server for the Snap Framework"
+HOMEPAGE="http://snapframework.com/"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="build-pong debug openssl portable"
+
+RDEPEND=">=dev-haskell/attoparsec-0.12:=[profile?] =dev-haskell/blaze-builder-0.4:=[profile?] =dev-haskell/bytestring-builder-0.10.4:=[profile?] =dev-haskell/case-insensitive-1.1:=[profile?] =dev-haskell/clock-0.7.1:=[profile?] =dev-haskell/io-streams-1.3:=[profile?] =dev-haskell/io-streams-haproxy-1.0:=[profile?] =dev-haskell/lifted-base-0.1:=[profile?] =dev-haskell/mtl-2.0:=[profile?] =dev-haskell/network-2.3:=[profile?] =dev-haskell/old-locale-1.0:=[profile?] =dev-haskell/semigroups-0.16:=[profile?] =dev-haskell/snap-core-1.0:=[profile?] =dev-haskell/text-0.11:=[profile?] =dev-haskell/unix-compat-0.2:=[profile?] =dev-haskell/vector-0.7:=[profile?] =dev-lang/ghc-7.6.2:=
+ openssl? ( >=dev-haskell/hsopenssl-0.10.4:=[profile?] =dev-haskell/openssl-streams-1.1:=[profile?]
+
+
+
+ haskell@gentoo.org
+ Gentoo Haskell
+
+
+
+ This package provides the 'ShortText' type which is suitable for keeping many short strings in memory. This is similiar to how 'ShortByteString' relates to 'ByteString'.
+
+ The main difference between 'Text' and 'ShortText' is that 'ShortText' uses UTF-8 instead of UTF-16 internally and also doesn't support zero-copy slicing (thereby saving 2 words). Consequently, the memory footprint of a (boxed) 'ShortText' value is 4 words (2 words when unboxed) plus the length of the UTF-8 encoded payload.
+
+
diff --git a/dev-haskell/text-short/text-short-0.1.3.ebuild b/dev-haskell/text-short/text-short-0.1.3.ebuild
new file mode 100644
index 000000000000..794540cc2fdf
--- /dev/null
+++ b/dev-haskell/text-short/text-short-0.1.3.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Memory-efficient representation of Unicode text strings"
+HOMEPAGE="http://hackage.haskell.org/package/text-short"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="asserts"
+
+RDEPEND=">=dev-haskell/hashable-1.2.6:=[profile?] =dev-haskell/semigroups-0.18.2:=[profile?] =dev-haskell/text-1.0:=[profile?] =dev-lang/ghc-7.8.2:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.18.1.3
+ test? ( >=dev-haskell/quickcheck-instances-0.3.14 =dev-haskell/tasty-1.0.0 =dev-haskell/tasty-hunit-0.10.0 =dev-haskell/tasty-quickcheck-0.10 = 4.7 && < 4.13' 'base >= 4.7' \
+ 'ghc-prim >= 0.3.1 && < 0.6' 'ghc-prim >= 0.3.1'
+}
+
+src_configure() {
+ haskell-cabal_src_configure \
+ $(cabal_flag asserts asserts)
+}
diff --git a/dev-haskell/tls/Manifest b/dev-haskell/tls/Manifest
index 747942a29958..18747ebe8b5f 100644
--- a/dev-haskell/tls/Manifest
+++ b/dev-haskell/tls/Manifest
@@ -1,4 +1,2 @@
-DIST tls-1.2.18.tar.gz 74115 BLAKE2B 5fda3b303d095afc079516e55dfa403cf01de4c77d5c1cb09ba39ad4604b021fae13932bf5d544f9d888aa42214c946fa1597bfb70595f8b5bb76bf9c4afe03b SHA512 34648a2f42c2a0f54b50a10daf3f9b8fb8452aa48e811122f8c69336621c45214a293fa85f8db5a9d568a5cbe7f114c8eef97968c76147d9ef016a8c3d2375ab
-DIST tls-1.3.4.tar.gz 77920 BLAKE2B d82deb31a6fc08b2c9b4ae1ae33b130f05b0de52fbded6af42ce8f503fd504951446d0ba5220281b3b27120e91ada05668177294fc1362515dc3cfb5f94ebb48 SHA512 8b90cd2e9f31ea5dabe0fc8669bea43ac144ee7dfa3fdcb465a31975c35c45fb8b82cdc6175801fce7dbb9f52aaa594b82e16ededdbb7fd697d5fa673ed7c777
DIST tls-1.3.9.tar.gz 88354 BLAKE2B 1d3d6be5ead5074c5583a2238a2f3352ba4b1f4398a891642e3ff2e5fc4375c669a81de64f9f10f1b13ade6c3a2e57e3b6507ea0d31bae0e6a218107558115c4 SHA512 bb7d573e44707121fef65c66b83086b0bd477d3fe526d0bcc9dfa0a59059d340eea6091bb0d6b36819bd2999d2ffa581d3591dbc4b2000bf5e1ba6dd40923446
DIST tls-1.5.4.tar.gz 150171 BLAKE2B 03085bd5f0d20b27fd5ea31e5e6179a15ac5893cc585d5a274523444838e8e05e9f3f4028b44147d6bb20df2c37e293046255765c253b57d2be4584066f24f8b SHA512 fb95ab6012ed95d82a41810b83e6f779645fa56d46c57f34a954a6885c295737808edcdcdca9e88e5b3c663f5aee71f104fe1fdd9ab35fb6a8ade4a202376d4a
diff --git a/dev-haskell/tls/metadata.xml b/dev-haskell/tls/metadata.xml
index 5e8b0cfbd3f1..b95ef7b625de 100644
--- a/dev-haskell/tls/metadata.xml
+++ b/dev-haskell/tls/metadata.xml
@@ -22,7 +22,6 @@
vincenthz/hs-tls
diff --git a/dev-haskell/tls/tls-1.2.18.ebuild b/dev-haskell/tls/tls-1.2.18.ebuild
deleted file mode 100644
index b7c559d95b97..000000000000
--- a/dev-haskell/tls/tls-1.2.18.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="TLS/SSL protocol native implementation (Server and Client)"
-HOMEPAGE="https://github.com/vincenthz/hs-tls"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+compat"
-
-RDEPEND="dev-haskell/asn1-encoding:=[profile?]
- >=dev-haskell/asn1-types-0.2.0:=[profile?]
- dev-haskell/async:=[profile?]
- dev-haskell/byteable:=[profile?]
- >=dev-haskell/cereal-0.4:=[profile?]
- >=dev-haskell/cipher-aes-0.2:=[profile?] =dev-haskell/crypto-cipher-types-0.0.8:=[profile?]
- dev-haskell/crypto-numbers:=[profile?]
- >=dev-haskell/crypto-pubkey-0.2.8:=[profile?]
- >=dev-haskell/crypto-pubkey-types-0.4:=[profile?]
- >=dev-haskell/crypto-random-0.0:=[profile?] =dev-haskell/cryptohash-0.6:=[profile?]
- dev-haskell/data-default-class:=[profile?]
- dev-haskell/mtl:=[profile?]
- dev-haskell/network:=[profile?]
- dev-haskell/transformers:=[profile?]
- >=dev-haskell/x509-1.5.0:=[profile?] =dev-haskell/x509-store-1.5.0:=[profile?]
- >=dev-haskell/x509-validation-1.5.1:=[profile?] =dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.8
- test? ( >=dev-haskell/cprng-aes-0.5
- dev-haskell/hourglass
- dev-haskell/quickcheck
- dev-haskell/tasty
- dev-haskell/tasty-quickcheck )
-"
-
-src_configure() {
- haskell-cabal_src_configure \
- $(cabal_flag compat compat)
-}
diff --git a/dev-haskell/tls/tls-1.3.4.ebuild b/dev-haskell/tls/tls-1.3.4.ebuild
deleted file mode 100644
index 70448327f8d3..000000000000
--- a/dev-haskell/tls/tls-1.3.4.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-#hackport: flags: -hans
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="TLS/SSL protocol native implementation (Server and Client)"
-HOMEPAGE="https://github.com/vincenthz/hs-tls"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+compat +network"
-
-RDEPEND="dev-haskell/asn1-encoding:=[profile?]
- >=dev-haskell/asn1-types-0.2.0:=[profile?]
- dev-haskell/async:=[profile?]
- >=dev-haskell/cereal-0.4:=[profile?]
- >=dev-haskell/cryptonite-0.7:=[profile?]
- dev-haskell/data-default-class:=[profile?]
- dev-haskell/memory:=[profile?]
- >=dev-haskell/mtl-2:=[profile?]
- dev-haskell/transformers:=[profile?]
- >=dev-haskell/x509-1.6.2:=[profile?] =dev-haskell/x509-store-1.6:=[profile?]
- >=dev-haskell/x509-validation-1.6.3:=[profile?] =dev-lang/ghc-7.4.1:=
- network? ( dev-haskell/network:=[profile?] )
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.8
- test? ( dev-haskell/hourglass
- dev-haskell/quickcheck
- dev-haskell/tasty
- dev-haskell/tasty-quickcheck )
-"
-
-src_configure() {
- haskell-cabal_src_configure \
- $(cabal_flag compat compat) \
- --flag=-hans \
- $(cabal_flag network network)
-}
diff --git a/dev-haskell/tls/tls-1.5.4.ebuild b/dev-haskell/tls/tls-1.5.4.ebuild
index e3524550f229..e8454a5db2c0 100644
--- a/dev-haskell/tls/tls-1.5.4.ebuild
+++ b/dev-haskell/tls/tls-1.5.4.ebuild
@@ -4,7 +4,7 @@
EAPI=7
# ebuild generated by hackport 0.6.4
-
+#hackport: flags: -hans
CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
inherit haskell-cabal
@@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
KEYWORDS="~amd64 ~x86"
-IUSE="+compat hans +network"
+IUSE="+compat +network"
RDEPEND="dev-haskell/asn1-encoding:=[profile?]
>=dev-haskell/asn1-types-0.2.0:=[profile?]
@@ -30,7 +30,6 @@ RDEPEND="dev-haskell/asn1-encoding:=[profile?]
>=dev-haskell/x509-store-1.6:=[profile?]
>=dev-haskell/x509-validation-1.6.5:=[profile?]
>=dev-lang/ghc-8.0.1:=
- hans? ( dev-haskell/hans:=[profile?] )
network? ( >=dev-haskell/network-2.4.0.0:=[profile?] )
"
DEPEND="${RDEPEND}
@@ -43,6 +42,6 @@ DEPEND="${RDEPEND}
src_configure() {
haskell-cabal_src_configure \
$(cabal_flag compat compat) \
- $(cabal_flag hans hans) \
+ --flag=-hans \
$(cabal_flag network network)
}
diff --git a/dev-haskell/top/files/top-1.7-ghc84.patch b/dev-haskell/top/files/top-1.7-ghc84.patch
new file mode 100644
index 000000000000..58ed02d3ff2a
--- /dev/null
+++ b/dev-haskell/top/files/top-1.7-ghc84.patch
@@ -0,0 +1,12 @@
+--- a/src/Top/Solver.hs
++++ b/src/Top/Solver.hs
+@@ -26,2 +26,3 @@ import Top.Constraint.Information
+ import Control.Monad.Writer
++import qualified Data.Semigroup as S
+
+@@ -170,2 +171,5 @@ evalBasicMonad = runWriter . flip evalStateFixT empty
+
++instance S.Semigroup LogEntries where
++ (<>) (LogEntries f) (LogEntries g) = LogEntries (f . g)
++
+ instance Monoid LogEntries where
diff --git a/dev-haskell/top/top-1.7.ebuild b/dev-haskell/top/top-1.7.ebuild
index 505c0ee09fb7..f3d825ce4f66 100644
--- a/dev-haskell/top/top-1.7.ebuild
+++ b/dev-haskell/top/top-1.7.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
# ebuild generated by hackport 0.4.4.9999
@@ -30,6 +30,7 @@ DEPEND="${RDEPEND}
S="${WORKDIR}/${MY_P}"
-src_prepare() {
- epatch "${FILESDIR}"/${P}-ghc-7.10.patch
-}
+PATCHES=(
+ "${FILESDIR}"/${P}-ghc-7.10.patch
+ "${FILESDIR}"/${P}-ghc84.patch
+)
diff --git a/dev-haskell/uri-bytestring-aeson/Manifest b/dev-haskell/uri-bytestring-aeson/Manifest
new file mode 100644
index 000000000000..54fed325d21a
--- /dev/null
+++ b/dev-haskell/uri-bytestring-aeson/Manifest
@@ -0,0 +1 @@
+DIST uri-bytestring-aeson-0.1.0.7.tar.gz 2034 BLAKE2B 192e5a077083ff1b8fa6ec85d2352d15ab613067949f41526f6828715311504ed650bef7729b359b2ac99fc0e3f76d6a16f5fe7a5fb75a0277f0ef05da996d04 SHA512 8327273af53e2d1124aa741b8a216c308c98435c2e74c46897dfec9a043dcfe7e7deec88cdf865da07e703ac8c57557439e3c4106479aec54f9b39a6fd4c5b2c
diff --git a/dev-haskell/uri-bytestring-aeson/metadata.xml b/dev-haskell/uri-bytestring-aeson/metadata.xml
new file mode 100644
index 000000000000..b7878815d80d
--- /dev/null
+++ b/dev-haskell/uri-bytestring-aeson/metadata.xml
@@ -0,0 +1,8 @@
+
+
+
+
+ haskell@gentoo.org
+ Gentoo Haskell
+
+
diff --git a/dev-haskell/uri-bytestring-aeson/uri-bytestring-aeson-0.1.0.7.ebuild b/dev-haskell/uri-bytestring-aeson/uri-bytestring-aeson-0.1.0.7.ebuild
new file mode 100644
index 000000000000..ccad9643a5ed
--- /dev/null
+++ b/dev-haskell/uri-bytestring-aeson/uri-bytestring-aeson-0.1.0.7.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.5.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Aeson instances for URI Bytestring"
+HOMEPAGE="https://github.com/reactormonk/uri-bytestring-aeson"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/aeson-0.11:=[profile?] =dev-haskell/text-1.1.1.0:=[profile?]
+ >=dev-haskell/uri-bytestring-0.2:=[profile?] =dev-lang/ghc-8.0.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.24.0.0
+"
diff --git a/dev-haskell/uri-bytestring/Manifest b/dev-haskell/uri-bytestring/Manifest
index c5c14de6b3a3..69d2e4e2717b 100644
--- a/dev-haskell/uri-bytestring/Manifest
+++ b/dev-haskell/uri-bytestring/Manifest
@@ -1 +1,2 @@
DIST uri-bytestring-0.2.2.1.tar.gz 20755 BLAKE2B a91e0de79e3493e342349dfb45d443bbed19265dc78fbd52f9c20e4ff66e2a64433d0dd4f0e3ccee280091ddb843392ae1e8fac15dd5eaa293ac9a80d55eb74a SHA512 d540722657b80039de25a6893067ea8fa50228420725ea22b95a6b7fb3e99803e41b18006b307973fd38fe5ba58d611d3115d1b677e3a36c38168b92289fee97
+DIST uri-bytestring-0.3.2.2.tar.gz 22743 BLAKE2B fc4a5e2421350bc71c07d7353a4934150b6fd46dcacb68ec77c516113c13324663fcf1d09a5b21303bb4c9d5f9587f52a3e0779db35f4c02eb1000744ad19932 SHA512 82565afbdb00b9b4a56f8eaa3ccd42732a16a79f894c950c67cede6346af5112dcb2d226f4b11bde135cf6cfacc687799d33f660d98556d031d262ffe65cf422
diff --git a/dev-haskell/uri-bytestring/uri-bytestring-0.3.2.2.ebuild b/dev-haskell/uri-bytestring/uri-bytestring-0.3.2.2.ebuild
new file mode 100644
index 000000000000..05a82249e7a7
--- /dev/null
+++ b/dev-haskell/uri-bytestring/uri-bytestring-0.3.2.2.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.1.9999
+#hackport: flags: -lib-werror
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Haskell URI parsing as ByteStrings"
+HOMEPAGE="https://github.com/Soostone/uri-bytestring"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/attoparsec-0.13.1.0:=[profile?]
+ >=dev-haskell/blaze-builder-0.3.0.0:=[profile?]
+ >=dev-haskell/fail-4.9:=[profile?] =dev-haskell/semigroups-0.16.2.2:=[profile?] =dev-haskell/th-lift-0.7.5:=[profile?]
+ >=dev-haskell/th-lift-instances-0.1.8:=[profile?]
+ >=dev-lang/ghc-7.8.2:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.18.1.3
+ test? ( >=dev-haskell/base-compat-0.7.0
+ dev-haskell/hedgehog
+ dev-haskell/hunit
+ dev-haskell/safe
+ dev-haskell/tasty
+ dev-haskell/tasty-hedgehog
+ dev-haskell/tasty-hunit )
+"
+
+src_prepare() {
+ default
+
+ cabal_chdeps \
+ 'th-lift >= 0.7.5 && < 0.8' 'th-lift >= 0.7.5'
+}
+
+src_configure() {
+ haskell-cabal_src_configure \
+ --flag=-lib-werror
+}
diff --git a/dev-haskell/vector-binary-instances/Manifest b/dev-haskell/vector-binary-instances/Manifest
index 10399a2c68bb..336df1853d3d 100644
--- a/dev-haskell/vector-binary-instances/Manifest
+++ b/dev-haskell/vector-binary-instances/Manifest
@@ -1,2 +1,3 @@
DIST vector-binary-instances-0.2.1.0.tar.gz 3114 BLAKE2B 24982160160805717302f602ca7e7aa97487ea1af51ebab7577eb5a744c38dbeefc56fbe46538a492095e16db13df7aaa9978dd8d2ed2c0c082bebce6f584a34 SHA512 37955552fc7ea24f35760f8e791d115329591ac720f66bc94db172cf609c67b51d8f075cdcda96e3fcbf9f4fd566557ebdeb306d86e7512e8acf526d691b4ff7
DIST vector-binary-instances-0.2.3.2.tar.gz 3989 BLAKE2B 69d25cdce13e999551ca0027171d252a5b2cf8868ef8f2415b1dfaa6df5f955bfdf257837ac67fb73a82526374b6d562afbf6705e6431659e234df186a16c0ba SHA512 ef3ef6a11dc5b35c2b24eb8b6487e6ad3ba73267107e8e8b4b172afbdd10d1d283d653025cfbd9089d4c2135d881e2b7efb5427a8dabcbef51de4ecadb332d62
+DIST vector-binary-instances-0.2.5.1.tar.gz 4067 BLAKE2B 4c4bc50e10be05d0a063cd417198c52e5f79e94547b69eac5d87d26762e62e92dbcb9dfc3209a4d105ca6e3ae772a918de1b983856beeb9117c5c9fdae467b21 SHA512 a16202b8ca3f88df82c27b37511087008579296363c73fe09ab19b00dee0fbaf98699b79b08d7e7410fcd062c03f2c5d1560f6b1c9ebf1ab8290596a35758be0
diff --git a/dev-haskell/vector-binary-instances/vector-binary-instances-0.2.5.1.ebuild b/dev-haskell/vector-binary-instances/vector-binary-instances-0.2.5.1.ebuild
new file mode 100644
index 000000000000..b0d4d4dbe607
--- /dev/null
+++ b/dev-haskell/vector-binary-instances/vector-binary-instances-0.2.5.1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.5.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Instances of Data.Binary and Data.Serialize for vector"
+HOMEPAGE="https://github.com/bos/vector-binary-instances"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/vector-0.6:=[profile?] =dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.8
+ test? ( dev-haskell/tasty
+ dev-haskell/tasty-quickcheck )
+"
+
+src_prepare() {
+ default
+
+ cabal_chdeps \
+ 'base > 3 && < 4.13' 'base > 3'
+}
diff --git a/dev-haskell/vector-instances/Manifest b/dev-haskell/vector-instances/Manifest
index a6f6cabd75cd..00b97fc0dbd7 100644
--- a/dev-haskell/vector-instances/Manifest
+++ b/dev-haskell/vector-instances/Manifest
@@ -1 +1,2 @@
DIST vector-instances-3.3.1.tar.gz 3726 BLAKE2B d7d592c0cac6745449aefabc87c6475bcd26012a6917e9a5d5d1167384f3901e75aeb53653ab9fe3644575a5601049d1b0a7b99e8425fd447eee9ac05c375c47 SHA512 0416532a83ee6f750e51296f1c8a3cf1f374a316bbc30638501e663199434fca28f85064660a9fc0bdbfb08ff5919c0ba1662dba704ff50bd8a7bd1ce09d56ae
+DIST vector-instances-3.4.tar.gz 5276 BLAKE2B ca68a6cb0a4b9aeab81409e757d7d5d5a18c53ed826668fa75725b52e374d4047ee096d392557c9c316aaa9740c307165d0aa5658542edb8827be5ddf9a883cc SHA512 67ffd6b941909bda1b6f26c8c7579fc495267425461f15f20bbaecf22b67d3dbf4ee88eb2ac76232f47917c26558eb325fedfe8ffc97368bbe1ad90fb427a7b1
diff --git a/dev-haskell/vector-instances/metadata.xml b/dev-haskell/vector-instances/metadata.xml
index bcf46045ad08..a07a56ad4976 100644
--- a/dev-haskell/vector-instances/metadata.xml
+++ b/dev-haskell/vector-instances/metadata.xml
@@ -5,6 +5,9 @@
haskell@gentoo.org
Gentoo Haskell
+
Orphan Instances for 'Data.Vector'
diff --git a/dev-haskell/vector-instances/vector-instances-3.4.ebuild b/dev-haskell/vector-instances/vector-instances-3.4.ebuild
new file mode 100644
index 000000000000..80286959a696
--- /dev/null
+++ b/dev-haskell/vector-instances/vector-instances-3.4.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.5.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Orphan Instances for 'Data.Vector'"
+HOMEPAGE="https://github.com/ekmett/vector-instances"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+hashable"
+
+RDEPEND=">=dev-haskell/comonad-3:=[profile?]
+ >=dev-haskell/keys-3:=[profile?]
+ >=dev-haskell/pointed-3:=[profile?]
+ >=dev-haskell/semigroupoids-3:=[profile?]
+ >=dev-haskell/semigroups-0.8.3.1:=[profile?]
+ >=dev-haskell/vector-0.9:=[profile?] =dev-lang/ghc-7.4.1:=
+ hashable? ( >=dev-haskell/hashable-1.1.1.0:=[profile?] )
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.6
+"
+
+src_configure() {
+ haskell-cabal_src_configure \
+ $(cabal_flag hashable hashable)
+}
diff --git a/dev-haskell/x11/files/x11-1.9-cabal-3.patch b/dev-haskell/x11/files/x11-1.9-cabal-3.patch
deleted file mode 100644
index fc4ea175de04..000000000000
--- a/dev-haskell/x11/files/x11-1.9-cabal-3.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- a/Setup.hs
-+++ b/Setup.hs
-@@ -3,4 +3,4 @@ module Main (main) where
- import Distribution.Simple
-
- main :: IO ()
--main = defaultMainWithHooks defaultUserHooks
-+main = defaultMainWithHooks autoconfUserHooks
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 06d26bf7b755..1c4fe6565981 100644
Binary files a/dev-java/Manifest.gz and b/dev-java/Manifest.gz differ
diff --git a/dev-java/jansi-native/jansi-native-1.5.ebuild b/dev-java/jansi-native/jansi-native-1.5.ebuild
index c8f3b978c70f..3df7f09b8ac9 100644
--- a/dev-java/jansi-native/jansi-native-1.5.ebuild
+++ b/dev-java/jansi-native/jansi-native-1.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="5"
@@ -18,10 +18,10 @@ KEYWORDS="amd64 ~arm64 ppc64 x86"
CDEPEND="dev-java/hawtjni-runtime:0"
DEPEND="${CDEPEND}
- >=virtual/jdk-1.5"
+ >=virtual/jdk-1.8"
RDEPEND="${CDEPEND}
- >=virtual/jre-1.5"
+ >=virtual/jre-1.8"
S="${WORKDIR}/${P}"
diff --git a/dev-java/openjdk-bin/Manifest b/dev-java/openjdk-bin/Manifest
index 4be7435a8d8b..697e44935189 100644
--- a/dev-java/openjdk-bin/Manifest
+++ b/dev-java/openjdk-bin/Manifest
@@ -1,20 +1,8 @@
-DIST OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.7_10.tar.gz 190134743 BLAKE2B 294ff3be6e68f14e9c53df04e7c4092a73fc27bfb5e1c35ab686ce6a30c69d0f7e9133815ddfdc0217098af287e1cd50353aaa204d3a813052d7c4375a8b8f1b SHA512 71054ff5c996a2ab4409d06d84900525ddd66e6b68bb2c558f0054343fb5fdc92efb4727ef6d9b91b1359e2b9c719ff3eb224eb1a9c5096753e723f12604535b
DIST OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.8_10.tar.gz 190206674 BLAKE2B 1e5ac030b23cdcd16e9efb696bf4f22da1178234241c4951b36d19e9567c8e838e99311be0aafe336b92cd5cecd2a53bb4dcfdd40f7ad13a26abaf41dddc5cbc SHA512 e81cc6a0d3aa3afdf021b8a5c39fc821827eba3010c437d97ad219336749b15cbb057bc92b129b0899da104066003554065e5591a6fda622b9852db2ad895237
-DIST OpenJDK11U-jdk_arm_linux_hotspot_11.0.7_10.tar.gz 178497327 BLAKE2B 59d84c0c09368e4bae499469efb0bc2f1f9c6f518fbcfbf75190e6e06eb4592b9da021b9101c769e6e6bd4c83e88217f177b489103f36f0ba92ba757df216989 SHA512 1ecc0b25295708af3011a5428f811a5c6c14f7edf17f853c7ed286687a3b2f982d4f8b0a45d9c7c24b476ccc60143f5e71c75464fab4d2d8be16c186f1e48341
DIST OpenJDK11U-jdk_arm_linux_hotspot_11.0.8_10.tar.gz 182327847 BLAKE2B ad71bfd979f27ffd05abea804069402a7a47906cff70cbe68c29a8185d97043e4e28471d6444af757955c9be5d73d8d17f3f73120b8d2997dc5fb5b21f9045dc SHA512 32843b32d89125da14c8e77509e4dfb86b1aae55407edabb52a592a29ecb3ba17d300b91751f937189f370edfd57d60fa622cb9da2a9e190f35b219d0cd58774
-DIST OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.7_10.tar.gz 176497292 BLAKE2B 2bf45400c5d201cb6530d01b234da28078cf3a8e8bb23470a3c698b982ca700828baf653d00cf4aa1933193742474fc81b5df9054f33706545c46733a1ccc79d SHA512 adc40402de81f49fd691c7c07e805f6ee3a4298353417c5e92dd14d791253f4eaafcdb68837d614d7850f82006701b048df04cd6a1d25a16d125a2a38bc277d5
DIST OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.8_10.tar.gz 176566452 BLAKE2B 584adc02d816cda72e5396d9e2a34768fe9c1ad3f6b37ad4b599ee45ee008389d7bec93ca983aec3e91995fa05548137f4ecb5c84b524333e0c7a35c5fc917ec SHA512 ab7768556488f0d13c3868e65ee22bedfaffc904d2b6af6d1c0ad48a382c2bc761dce99bd3a196e4ddd2a67f56019774a84edeab7db3e9e4650ef020f0d2e0a5
-DIST OpenJDK11U-jdk_x64_linux_hotspot_11.0.7_10.tar.gz 193346198 BLAKE2B 506fc32c3c1ea729e79a044f31bafad995aaf7ac23bda47b21926493aa8d473195067a2d7989b0eafb91d7054222ebd5d924567b1d4b6935be7cff9fd25b1e90 SHA512 fa19880289ce8fa4a72fddd5633cf86a33d9f81346a5a7e51c06d7fc48f1953da01f020d15151d74a624ecc22a9f8f2c8ee4f996a4b3ac2ec79f0fb5207a40f8
DIST OpenJDK11U-jdk_x64_linux_hotspot_11.0.8_10.tar.gz 193398310 BLAKE2B 079f48381bf58edb7b9b75f4305df72184710c90101588fccce4edb0535b976b2f6332b66fdd8cf8b442eebbeee5a6044e0445519f9bbd8ed20b02f50e9fc203 SHA512 115b5627d6d1245f8393e3cd869bdb7accb42c35bc0e9030fb60701f61253ea8ce382edec75ded85ff5b0a0c8bbfbecdec81b16aef87fb6fc76c684628abf1e5
-DIST OpenJDK8U-jdk_aarch64_linux_hotspot_8u252b09.tar.gz 102238546 BLAKE2B ffa0aec56e4f6fe03cab88e0423e5b1ee24ccbe9eb0bd37d37449c596095d69e7fcb9044c0846a750d3d1a842c2f719d18a28510bd226a8aa9b383e4ae29993b SHA512 a6ef9864cde15e96abcb94f2e72db77f473e609fd162934fc3d35225223a20e20c464e44ce0c022dbf15f6d68d25bf2187271d8643e5cff2894f1839929050ae
-DIST OpenJDK8U-jdk_aarch64_linux_hotspot_8u262b10.tar.gz 103188555 BLAKE2B 2d1c8add4d0a3939a423dd24b2ade8a7e7240597d1d49a6194e768f8262977aa7b8c8f8a3f564c88bfe3e4bac74cbd3f2cdd17fafcbaf7b9b50ad3cade34e21b SHA512 86f24cd72ac398b606006dc64fb0f5d335bb633d87c7a7f96f2efb26a9abc6486ea1f803ccb33e74efc9e8f48ef3c723516dc690479a6e67d9161d67a5b8e94c
DIST OpenJDK8U-jdk_aarch64_linux_hotspot_8u265b01.tar.gz 103150208 BLAKE2B 70880514e63402b740554cde3eba80106e2494d354751a620e54cde0376cebbf1ca5c2b10b0c340f59d9d1f390791c07ba39b13e72c938872e2a8b102b608f34 SHA512 37d9efe9c087dae9c180ee47e9f4f010e7726f4578edb5638d40ab4aea450912e3fa5e1d9254f6290779f43ffb5b0c6d1e3e9ac42c889b0c50072645deadbddb
-DIST OpenJDK8U-jdk_arm_linux_hotspot_8u252b09.tar.gz 96925784 BLAKE2B 3e294a9a38729e453dd74d691bad4abd043fefd2a850a1d8fa142e5e5c2b908a1c7a0d9f2ebf1760ecf065cb615a59a930c84e86e86a339da01a794f1f3319ed SHA512 a361cb07b43ebaf7d1aa277c15ee41493fb25ff78dcad1801436ef68a54c4a89f2361c3f57ce328c507b9f36c81a301d95d9315d32aa888163d533d7d741effd
-DIST OpenJDK8U-jdk_arm_linux_hotspot_8u262b10.tar.gz 97642302 BLAKE2B 0bc6d676eaa4efb1ff2b9358f8ddf2b578223d390f59a2deb1269dc55d2be4e39104680c8cc5608c7d8ba1350a289cc5d5673d1df5f6b495739df0cdac563ebd SHA512 7abb787dce0d5ed8c0a6f4cb0c7036e2c341b90b1a967e3c2b45d1c33bf88bb08a6cccecde1579edf811f304d5dc287816becd60ab429dda6a913f37511f4c68
DIST OpenJDK8U-jdk_arm_linux_hotspot_8u265b01.tar.gz 97641656 BLAKE2B 76d24e975c2ec173b6b4806d145f79d02828e12e2dd412b60a921648fba20920b3b69b03630ece8d5cefeaf408dad01573b15db7f4a7bbdd024806a7b01bd6ae SHA512 8f96d73038579d2873b84d19bfbcc7f481b031a91c35d86d35e127951b6c743a6a1d5230a61ebcacddf854b73c55b18cc53112b9a2759b283254bf93fd691459
-DIST OpenJDK8U-jdk_ppc64le_linux_hotspot_8u252b09.tar.gz 99444051 BLAKE2B 87f691298c7335c0adb285db6eff8ecb3897bb7b229bc6491b992375bd63c93eef126702ee461609b3a781240747d3f1372b4ed711a420cca1248878a82a2b6f SHA512 875d0d74088744a0a56a4706cd86a78ef2c5eb1a5792ba94ef2f51bf894a94123e761ab8fa0e5e74272c2f350a881073e4054e9f1c504421f43bb93b837d26a4
-DIST OpenJDK8U-jdk_ppc64le_linux_hotspot_8u262b10.tar.gz 100454023 BLAKE2B aa76a05f981b72b0e5a976c1fc50e857ebbab731cc97c4e1f1f91bbd81ea305a6c85ab88ffa78fe4f3e6da3c2e197817aecbf2f52104ab9fa8b0d27de0e61509 SHA512 656da319bccaeaed88e60618e17d2efc5e1b0de89d50c5214710ef0b1257eec9607574b3b4df28d42ca3cb4f63e06efedf338de2abd2392e9195ef2054fe712c
DIST OpenJDK8U-jdk_ppc64le_linux_hotspot_8u265b01.tar.gz 100453105 BLAKE2B e57230d5f90821cb8f4c35baf0e5a9580164ad7df10ac67a528b959154317ea14b7bc0dd5c530a2b826ab6322611ddf2387617bc8dd1f444039b00a778a30025 SHA512 6de5694d0415e905848cc99ec6863e96640fca3ded4e851528c794dad82a0961e097f64f8338304d9325357729ae9ea5bc5d2eceecefebdad69a14bc7b50194a
-DIST OpenJDK8U-jdk_x64_linux_hotspot_8u252b09.tar.gz 102170196 BLAKE2B 529630d67553064d302a81079eb61f10da8fc7fbcb69375020f5572fa4e9a46a679e6b0de99b7f67d9f40305a5347e9337cb6dec1c3cac5576671f52866beb2e SHA512 923a3122aa15db27f1605d1f988efa4a5bc920ad132121ba906f9d4cea11b8bfdcfe5b777ea7f37f5789e0be85135f24f1ddf7cbdff40594336fde7fc0474a6d
-DIST OpenJDK8U-jdk_x64_linux_hotspot_8u262b10.tar.gz 103200089 BLAKE2B 8d747c7ebcf29690dafb7e87a45c602077e22ed626a8b88843c8fcf080a691328aea244f7a4f499d824954a4758ced5e5255521e8b81b238afd19cd5bc741d5d SHA512 3ea2c2638c858a05e520d38493dfe240ee67195fd831a216e28a030ccaa17f890f64f1c723cefca1cead412c602a8cbe42f845345ab01e6d5ab1bde9825980fc
DIST OpenJDK8U-jdk_x64_linux_hotspot_8u265b01.tar.gz 103157351 BLAKE2B efd8a4bcab5472c9775997713b09ab9e94ef4636564f07392263d6963850e07dc07569b2c066856846c16229f1641c169eecedcbb61533067af330262f07b927 SHA512 932fe2702aa3575bcb08d01e384fbd6a49768280931fdc1fb56314656343dc2f8e5b2650c8d72369d0294ac6024df0a142fd14cb0768f9aa7831aa986679e9ae
diff --git a/dev-java/openjdk-bin/openjdk-bin-11.0.7_p10-r1.ebuild b/dev-java/openjdk-bin/openjdk-bin-11.0.7_p10-r1.ebuild
deleted file mode 100644
index 4ccc0089139d..000000000000
--- a/dev-java/openjdk-bin/openjdk-bin-11.0.7_p10-r1.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit java-vm-2 toolchain-funcs
-
-abi_uri() {
- echo "${2-$1}? (
- https://github.com/AdoptOpenJDK/openjdk${SLOT}-binaries/releases/download/jdk-${MY_PV}/OpenJDK${SLOT}U-jdk_${1}_linux_hotspot_${MY_PV//+/_}.tar.gz
- )"
-}
-
-MY_PV=${PV/_p/+}
-SLOT=${MY_PV%%[.+]*}
-
-SRC_URI="
- $(abi_uri arm)
- $(abi_uri aarch64 arm64)
- $(abi_uri ppc64le ppc64)
- $(abi_uri x64 amd64)
-"
-
-DESCRIPTION="Prebuilt Java JDK binaries provided by AdoptOpenJDK"
-HOMEPAGE="https://adoptopenjdk.net"
-LICENSE="GPL-2-with-classpath-exception"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
-IUSE="alsa cups doc +gentoo-vm headless-awt nsplugin selinux source webstart"
-
-RDEPEND="
- media-libs/fontconfig:1.0
- media-libs/freetype:2
- >=sys-apps/baselayout-java-0.1.0-r1
- >=sys-libs/glibc-2.2.5:*
- sys-libs/zlib
- alsa? ( media-libs/alsa-lib )
- cups? ( net-print/cups )
- doc? ( dev-java/java-sdk-docs:${SLOT} )
- selinux? ( sec-policy/selinux-java )
- !headless-awt? (
- x11-libs/libX11
- x11-libs/libXext
- x11-libs/libXi
- x11-libs/libXrender
- x11-libs/libXtst
- )"
-
-PDEPEND="webstart? ( >=dev-java/icedtea-web-1.6.1:0 )
- nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] )"
-
-RESTRICT="preserve-libs splitdebug"
-QA_PREBUILT="*"
-
-S="${WORKDIR}/jdk-${MY_PV}"
-
-pkg_pretend() {
- if [[ "$(tc-is-softfloat)" != "no" ]]; then
- die "These binaries require a hardfloat system."
- fi
-}
-
-src_install() {
- local dest="/opt/${P}"
- local ddest="${ED%/}/${dest#/}"
-
- # Not sure why they bundle this as it's commonly available and they
- # only do so on x86_64. It's needed by libfontmanager.so. IcedTea
- # also has an explicit dependency while Oracle seemingly dlopens it.
- rm -vf lib/libfreetype.so || die
-
- # Oracle and IcedTea have libjsoundalsa.so depending on
- # libasound.so.2 but AdoptOpenJDK only has libjsound.so. Weird.
- if ! use alsa ; then
- rm -v lib/libjsound.* || die
- fi
-
- if use headless-awt ; then
- rm -v lib/lib*{[jx]awt,splashscreen}* || die
- fi
-
- if ! use source ; then
- rm -v lib/src.zip || die
- fi
-
- rm -v lib/security/cacerts || die
- dosym ../../../../etc/ssl/certs/java/cacerts \
- "${dest}"/lib/security/cacerts
-
- dodir "${dest}"
- cp -pPR * "${ddest}" || die
-
- # provide stable symlink
- dosym "${P}" "/opt/${PN}-${SLOT}"
-
- use gentoo-vm && java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh
- java-vm_set-pax-markings "${ddest}"
- java-vm_revdep-mask
- java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
-}
-
-pkg_postinst() {
- java-vm-2_pkg_postinst
-
- if use gentoo-vm ; then
- ewarn "WARNING! You have enabled the gentoo-vm USE flag, making this JDK"
- ewarn "recognised by the system. This will almost certainly break"
- ewarn "many java ebuilds as they are not ready for openjdk-11"
- else
- ewarn "The experimental gentoo-vm USE flag has not been enabled so this JDK"
- ewarn "will not be recognised by the system. For example, simply calling"
- ewarn "\"java\" will launch a different JVM. This is necessary until Gentoo"
- ewarn "fully supports Java 11. This JDK must therefore be invoked using its"
- ewarn "absolute location under ${EPREFIX}/opt/${P}."
- fi
-}
diff --git a/dev-java/openjdk-bin/openjdk-bin-8.252_p09.ebuild b/dev-java/openjdk-bin/openjdk-bin-8.252_p09.ebuild
deleted file mode 100644
index 31d2a22f51d4..000000000000
--- a/dev-java/openjdk-bin/openjdk-bin-8.252_p09.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eapi7-ver java-vm-2
-
-abi_uri() {
- echo "${2-$1}? (
- https://github.com/AdoptOpenJDK/openjdk${SLOT}-binaries/releases/download/jdk${MY_PV}/OpenJDK8U-jdk_${1}_linux_hotspot_${MY_PV/-/}.tar.gz
- )"
-}
-
-MY_PV=$(ver_rs 1 'u' 2 '-' ${PV//p/b})
-SLOT="$(ver_cut 1)"
-
-DESCRIPTION="Prebuilt Java JDK binaries provided by AdoptOpenJDK"
-HOMEPAGE="https://adoptopenjdk.net"
-SRC_URI="
- $(abi_uri aarch64 arm64)
- $(abi_uri arm)
- $(abi_uri ppc64le ppc64)
- $(abi_uri x64 amd64)
-"
-
-LICENSE="GPL-2-with-classpath-exception"
-KEYWORDS="amd64 ~arm arm64 ppc64"
-
-IUSE="alsa cups examples headless-awt nsplugin selinux source webstart"
-
-RDEPEND="
- media-libs/fontconfig:1.0
- media-libs/freetype:2
- >=sys-apps/baselayout-java-0.1.0-r1
- >=sys-libs/glibc-2.2.5:*
- sys-libs/zlib
- alsa? ( media-libs/alsa-lib )
- cups? ( net-print/cups )
- selinux? ( sec-policy/selinux-java )
- !headless-awt? (
- x11-libs/libX11
- x11-libs/libXext
- x11-libs/libXi
- x11-libs/libXrender
- x11-libs/libXtst
- )"
-
-PDEPEND="webstart? ( >=dev-java/icedtea-web-1.6.1:0 )
- nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] )"
-
-RESTRICT="preserve-libs strip"
-QA_PREBUILT="*"
-
-S="${WORKDIR}/jdk${MY_PV}"
-
-src_install() {
- local dest="/opt/${P}"
- local ddest="${ED%/}/${dest#/}"
-
- rm ASSEMBLY_EXCEPTION LICENSE THIRD_PARTY_README || die
-
- # this does not exist on arm64 hence -f
- rm -fv jre/lib/*/libfreetype.so* || die
-
- if ! use alsa ; then
- rm -v jre/lib/*/libjsoundalsa.so* || die
- fi
-
- if ! use examples ; then
- rm -vr sample || die
- fi
-
- if use headless-awt ; then
- rm -fvr {,jre/}lib/*/lib*{[jx]awt,splashscreen}* \
- {,jre/}bin/policytool bin/appletviewer || die
- fi
-
- if ! use source ; then
- rm -v src.zip || die
- fi
-
- rm -v jre/lib/security/cacerts || die
- dosym ../../../../../etc/ssl/certs/java/cacerts \
- "${dest}"/jre/lib/security/cacerts
-
- dodir "${dest}"
- cp -pPR * "${ddest}" || die
-
- java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh
- java-vm_set-pax-markings "${ddest}"
- java-vm_revdep-mask
- java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
-}
diff --git a/dev-java/openjdk-bin/openjdk-bin-8.262_p10.ebuild b/dev-java/openjdk-bin/openjdk-bin-8.262_p10.ebuild
deleted file mode 100644
index 8d580d26cdd2..000000000000
--- a/dev-java/openjdk-bin/openjdk-bin-8.262_p10.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eapi7-ver java-vm-2
-
-abi_uri() {
- echo "${2-$1}? (
- https://github.com/AdoptOpenJDK/openjdk${SLOT}-binaries/releases/download/jdk${MY_PV}/OpenJDK8U-jdk_${1}_linux_hotspot_${MY_PV/-/}.tar.gz
- )"
-}
-
-MY_PV=$(ver_rs 1 'u' 2 '-' ${PV//p/b})
-SLOT="$(ver_cut 1)"
-
-DESCRIPTION="Prebuilt Java JDK binaries provided by AdoptOpenJDK"
-HOMEPAGE="https://adoptopenjdk.net"
-SRC_URI="
- $(abi_uri aarch64 arm64)
- $(abi_uri arm)
- $(abi_uri ppc64le ppc64)
- $(abi_uri x64 amd64)
-"
-
-LICENSE="GPL-2-with-classpath-exception"
-KEYWORDS="amd64 ~arm arm64 ~ppc64"
-
-IUSE="alsa cups examples headless-awt nsplugin selinux source webstart"
-
-RDEPEND="
- media-libs/fontconfig:1.0
- media-libs/freetype:2
- >=sys-apps/baselayout-java-0.1.0-r1
- >=sys-libs/glibc-2.2.5:*
- sys-libs/zlib
- alsa? ( media-libs/alsa-lib )
- cups? ( net-print/cups )
- selinux? ( sec-policy/selinux-java )
- !headless-awt? (
- x11-libs/libX11
- x11-libs/libXext
- x11-libs/libXi
- x11-libs/libXrender
- x11-libs/libXtst
- )"
-
-PDEPEND="webstart? ( >=dev-java/icedtea-web-1.6.1:0 )
- nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] )"
-
-RESTRICT="preserve-libs strip"
-QA_PREBUILT="*"
-
-S="${WORKDIR}/jdk${MY_PV}"
-
-src_install() {
- local dest="/opt/${P}"
- local ddest="${ED%/}/${dest#/}"
-
- rm ASSEMBLY_EXCEPTION LICENSE THIRD_PARTY_README || die
-
- # this does not exist on arm64 hence -f
- rm -fv jre/lib/*/libfreetype.so* || die
-
- if ! use alsa ; then
- rm -v jre/lib/*/libjsoundalsa.so* || die
- fi
-
- if ! use examples ; then
- rm -vr sample || die
- fi
-
- if use headless-awt ; then
- rm -fvr {,jre/}lib/*/lib*{[jx]awt,splashscreen}* \
- {,jre/}bin/policytool bin/appletviewer || die
- fi
-
- if ! use source ; then
- rm -v src.zip || die
- fi
-
- rm -v jre/lib/security/cacerts || die
- dosym ../../../../../etc/ssl/certs/java/cacerts \
- "${dest}"/jre/lib/security/cacerts
-
- dodir "${dest}"
- cp -pPR * "${ddest}" || die
-
- java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh
- java-vm_set-pax-markings "${ddest}"
- java-vm_revdep-mask
- java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
-}
diff --git a/dev-java/openjdk-bin/openjdk-bin-8.265_p01.ebuild b/dev-java/openjdk-bin/openjdk-bin-8.265_p01.ebuild
index 309fc4391f2e..1d7080434ca7 100644
--- a/dev-java/openjdk-bin/openjdk-bin-8.265_p01.ebuild
+++ b/dev-java/openjdk-bin/openjdk-bin-8.265_p01.ebuild
@@ -24,7 +24,7 @@ SRC_URI="
"
LICENSE="GPL-2-with-classpath-exception"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
+KEYWORDS="amd64 ~arm arm64 ~ppc64"
IUSE="alsa cups examples headless-awt nsplugin selinux source webstart"
diff --git a/dev-java/openjdk-jre-bin/Manifest b/dev-java/openjdk-jre-bin/Manifest
index 0235ffc940e3..3c7fe33149f5 100644
--- a/dev-java/openjdk-jre-bin/Manifest
+++ b/dev-java/openjdk-jre-bin/Manifest
@@ -1,5 +1,2 @@
-DIST OpenJDK11U-jre_x64_linux_hotspot_11.0.7_10.tar.gz 42917723 BLAKE2B c5635b3727e10462396891cab89e257ded57c59f56e9bcb84a3d040ce8a27d7d67d6b78e5f55b63806dd93f6151b767df42e4428d12e763f9722196ca0736a08 SHA512 a776dd9168e3c2635a8492405d58628713e646292d7ee16454681d46866e7ea41afa712227e94ed2e8ce52c727e445f4631db63a02408aa817f1c79af8057dbe
DIST OpenJDK11U-jre_x64_linux_hotspot_11.0.8_10.tar.gz 42904191 BLAKE2B cfd04b2a422e95465cd2938449f7632d29fe655eadadf5745045db6eb74625dffa0e02d8713a93e0bc8fa7da6dc57116fbbd9217a9b30723becd5b9eaceefccd SHA512 55ab4c6122422f4765542df747bce5c65bc78e0e5f4fff4b7efc95342d81eb34d72dbdc13c820781c626f92a2c3687161d0c7edfbe4f83c455c75fcecf8ae3d0
-DIST OpenJDK8U-jre_x64_linux_hotspot_8u252b09.tar.gz 41104123 BLAKE2B 52a9f288054c4a96ed5d70c2c9c6cf14ceb32262ec3a38f547286518ccc14a4695d330adc19e272436c0a7154771cddd9b0672b05beb6d5013c44c69be0ad25a SHA512 b1b0627e8495b11e0ef3e4ecb387d92537bb97b3f3045213658d48b6f2dffa0bc975b1bc92e84c487152b43d1f0ee0449730bf84dd62d98d13354bf73d3a0a20
-DIST OpenJDK8U-jre_x64_linux_hotspot_8u262b10.tar.gz 41755965 BLAKE2B b417d12ba18f58fec1e692a567bd5c0551fcbe023370fe52c2e525692d0d2151d4c296f86e6f4e3b1178e8f933ec6ddb9559e358c5d080cc2dba94ce38680ab5 SHA512 63d65c576d40b798dbbf2c6923151d07ba74312d8e8b6dc722d4358c38855a3a5c9e9e7c267569d390065c4dcc7f4bcfddc3f78e8388b4faef1a61501e2b7b8c
DIST OpenJDK8U-jre_x64_linux_hotspot_8u265b01.tar.gz 41757024 BLAKE2B 39c184654dd5c4c17c617a48e962a392e3a4aaebe56a4286b6e5b0e980345b7260effbc54e2b197f8b747c57856e5260a048cf572cd4f375a2b38f3abebbde2f SHA512 01090a26bb18d226da19c82fca173f0d994ba56562178757347b565d39989b6735f5ff37bb22163c9ea270380fe922098bd0efa87d52615b50cde9f0e8291095
diff --git a/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.7_p10-r1.ebuild b/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.7_p10-r1.ebuild
deleted file mode 100644
index 23e7a0fbadc0..000000000000
--- a/dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.7_p10-r1.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 java-vm-2
-
-abi_uri() {
- echo "${2-$1}? (
- https://github.com/AdoptOpenJDK/openjdk${SLOT}-binaries/releases/download/jdk-${MY_PV}/OpenJDK${SLOT}U-jre_${1}_linux_hotspot_${MY_PV//+/_}.tar.gz
- )"
-}
-
-MY_PV=${PV/_p/+}
-SLOT=${MY_PV%%[.+]*}
-
-SRC_URI="
- $(abi_uri x64 amd64)
-"
-
-DESCRIPTION="Prebuilt Java JRE binaries provided by AdoptOpenJDK"
-HOMEPAGE="https://adoptopenjdk.net"
-LICENSE="GPL-2-with-classpath-exception"
-KEYWORDS="~amd64"
-IUSE="alsa cups +gentoo-vm headless-awt nsplugin selinux webstart"
-
-RDEPEND="
- media-libs/fontconfig:1.0
- media-libs/freetype:2
- >net-libs/libnet-1.1
- >=sys-apps/baselayout-java-0.1.0-r1
- >=sys-libs/glibc-2.2.5:*
- sys-libs/zlib
- alsa? ( media-libs/alsa-lib )
- cups? ( net-print/cups )
- selinux? ( sec-policy/selinux-java )
- !headless-awt? (
- x11-libs/libX11
- x11-libs/libXext
- x11-libs/libXi
- x11-libs/libXrender
- x11-libs/libXtst
- )"
-
-PDEPEND="webstart? ( >=dev-java/icedtea-web-1.6.1:0 )
- nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] )"
-
-RESTRICT="preserve-libs splitdebug"
-QA_PREBUILT="*"
-
-S="${WORKDIR}/jdk-${MY_PV}-jre"
-
-src_install() {
- local dest="/opt/${P}"
- local ddest="${ED%/}/${dest#/}"
-
- # Not sure why they bundle this as it's commonly available and they
- # only do so on x86_64. It's needed by libfontmanager.so. IcedTea
- # also has an explicit dependency while Oracle seemingly dlopens it.
- rm -vf lib/libfreetype.so || die
-
- # Oracle and IcedTea have libjsoundalsa.so depending on
- # libasound.so.2 but AdoptOpenJDK only has libjsound.so. Weird.
- if ! use alsa ; then
- rm -v lib/libjsound.* || die
- fi
-
- if use headless-awt ; then
- rm -v lib/lib*{[jx]awt,splashscreen}* || die
- fi
-
- rm -v lib/security/cacerts || die
- dosym ../../../../etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts
-
- dodir "${dest}"
- cp -pPR * "${ddest}" || die
-
- # provide stable symlink
- dosym "${P}" "/opt/${PN}-${SLOT}"
-
- use gentoo-vm && java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh
- java-vm_set-pax-markings "${ddest}"
- java-vm_revdep-mask
- java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
-}
-
-pkg_postinst() {
- java-vm-2_pkg_postinst
-
- if use gentoo-vm ; then
- ewarn "WARNING! You have enabled the gentoo-vm USE flag, making this JRE"
- ewarn "recognised by the system. This will almost certainly break things."
- else
- ewarn "The experimental gentoo-vm USE flag has not been enabled so this JRE"
- ewarn "will not be recognised by the system. For example, simply calling"
- ewarn "\"java\" will launch a different JVM. This is necessary until Gentoo"
- ewarn "fully supports Java 11. This JRE must therefore be invoked using its"
- ewarn "absolute location under ${EPREFIX}/opt/${P}."
- fi
-}
diff --git a/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.252_p09.ebuild b/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.252_p09.ebuild
deleted file mode 100644
index 512f8678a758..000000000000
--- a/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.252_p09.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eapi7-ver java-vm-2
-
-abi_uri() {
- echo "${2-$1}? (
- https://github.com/AdoptOpenJDK/openjdk${SLOT}-binaries/releases/download/jdk${MY_PV}/OpenJDK8U-jre_${1}_linux_hotspot_${MY_PV/-/}.tar.gz
- )"
-}
-
-MY_PV=$(ver_rs 1 'u' 2 '-' ${PV//p/b})
-SLOT="$(ver_cut 1)"
-
-DESCRIPTION="Prebuilt Java JRE binaries provided by AdoptOpenJDK"
-HOMEPAGE="https://adoptopenjdk.net"
-SRC_URI="
- $(abi_uri x64 amd64)
-"
-
-LICENSE="GPL-2-with-classpath-exception"
-KEYWORDS="amd64"
-
-IUSE="alsa cups headless-awt nsplugin selinux webstart"
-
-RDEPEND="
- media-libs/fontconfig:1.0
- media-libs/freetype:2
- >net-libs/libnet-1.1
- >=sys-apps/baselayout-java-0.1.0-r1
- >=sys-libs/glibc-2.2.5:*
- sys-libs/zlib
- alsa? ( media-libs/alsa-lib )
- cups? ( net-print/cups )
- selinux? ( sec-policy/selinux-java )
- !headless-awt? (
- x11-libs/libX11
- x11-libs/libXext
- x11-libs/libXi
- x11-libs/libXrender
- x11-libs/libXtst
- )"
-
-PDEPEND="
- webstart? ( >=dev-java/icedtea-web-1.6.1:0 )
- nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] )"
-
-RESTRICT="preserve-libs splitdebug"
-QA_PREBUILT="*"
-
-S="${WORKDIR}/jdk${MY_PV}-jre"
-
-src_install() {
- local dest="/opt/${P}"
- local ddest="${ED%/}/${dest#/}"
-
- rm ASSEMBLY_EXCEPTION LICENSE THIRD_PARTY_README || die
-
- # this does not exist on arm64 hence -f
- rm -fv lib/*/libfreetype.so* || die
-
- if ! use alsa ; then
- rm -v lib/*/libjsoundalsa.so* || die
- fi
-
- if use headless-awt ; then
- rm -fvr lib/*/lib*{[jx]awt,splashscreen}* \
- bin/policytool || die
- fi
-
- rm -v lib/security/cacerts || die
- dosym ../../../../../etc/ssl/certs/java/cacerts \
- "${dest}"/lib/security/cacerts
-
- dodir "${dest}"
- cp -pPR * "${ddest}" || die
-
- java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh
- java-vm_set-pax-markings "${ddest}"
- java-vm_revdep-mask
- java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
-}
diff --git a/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.262_p10.ebuild b/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.262_p10.ebuild
deleted file mode 100644
index a38a136210d8..000000000000
--- a/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.262_p10.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eapi7-ver java-vm-2
-
-abi_uri() {
- echo "${2-$1}? (
- https://github.com/AdoptOpenJDK/openjdk${SLOT}-binaries/releases/download/jdk${MY_PV}/OpenJDK8U-jre_${1}_linux_hotspot_${MY_PV/-/}.tar.gz
- )"
-}
-
-MY_PV=$(ver_rs 1 'u' 2 '-' ${PV//p/b})
-SLOT="$(ver_cut 1)"
-
-DESCRIPTION="Prebuilt Java JRE binaries provided by AdoptOpenJDK"
-HOMEPAGE="https://adoptopenjdk.net"
-SRC_URI="
- $(abi_uri x64 amd64)
-"
-
-LICENSE="GPL-2-with-classpath-exception"
-KEYWORDS="~amd64"
-
-IUSE="alsa cups headless-awt nsplugin selinux webstart"
-
-RDEPEND="
- media-libs/fontconfig:1.0
- media-libs/freetype:2
- >net-libs/libnet-1.1
- >=sys-apps/baselayout-java-0.1.0-r1
- >=sys-libs/glibc-2.2.5:*
- sys-libs/zlib
- alsa? ( media-libs/alsa-lib )
- cups? ( net-print/cups )
- selinux? ( sec-policy/selinux-java )
- !headless-awt? (
- x11-libs/libX11
- x11-libs/libXext
- x11-libs/libXi
- x11-libs/libXrender
- x11-libs/libXtst
- )"
-
-PDEPEND="
- webstart? ( >=dev-java/icedtea-web-1.6.1:0 )
- nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] )"
-
-RESTRICT="preserve-libs splitdebug"
-QA_PREBUILT="*"
-
-S="${WORKDIR}/jdk${MY_PV}-jre"
-
-src_install() {
- local dest="/opt/${P}"
- local ddest="${ED%/}/${dest#/}"
-
- rm ASSEMBLY_EXCEPTION LICENSE THIRD_PARTY_README || die
-
- # this does not exist on arm64 hence -f
- rm -fv lib/*/libfreetype.so* || die
-
- if ! use alsa ; then
- rm -v lib/*/libjsoundalsa.so* || die
- fi
-
- if use headless-awt ; then
- rm -fvr lib/*/lib*{[jx]awt,splashscreen}* \
- bin/policytool || die
- fi
-
- rm -v lib/security/cacerts || die
- dosym ../../../../../etc/ssl/certs/java/cacerts \
- "${dest}"/lib/security/cacerts
-
- dodir "${dest}"
- cp -pPR * "${ddest}" || die
-
- java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh
- java-vm_set-pax-markings "${ddest}"
- java-vm_revdep-mask
- java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
-}
diff --git a/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.265_p01.ebuild b/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.265_p01.ebuild
index a38a136210d8..512f8678a758 100644
--- a/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.265_p01.ebuild
+++ b/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.265_p01.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
"
LICENSE="GPL-2-with-classpath-exception"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
IUSE="alsa cups headless-awt nsplugin selinux webstart"
diff --git a/dev-java/openjdk/Manifest b/dev-java/openjdk/Manifest
index c3e413b9dd0c..e5d12e87686a 100644
--- a/dev-java/openjdk/Manifest
+++ b/dev-java/openjdk/Manifest
@@ -1,26 +1,9 @@
-DIST openjdk-11.0.7_p10.tar.bz2 91317054 BLAKE2B 113f6d0b1ea97aa6c3a619a3f4183b72f5e0448422d17b6ffc4d778ce50eee68e4495d610845d1f3aace2e5660703dad96583203c6d12b5528e0f33f78df7cec SHA512 c6776bd05e2cbb42134ccf5cd522e4b73d1662e3cf136a8718c5d302b9c44e76b74a554b81aa14c5deda20bee76abc80a144f5c2e1941b70c9503579c325aa12
DIST openjdk-11.0.8_p10.tar.bz2 91141175 BLAKE2B eeef0f6b6a8f804e043cde01de256c86ed35d5a391588100caea49c8c2b617c3f06aa37df894feaa89734e68c32fe28d8bc5337755050c457d657cf88fcff7f3 SHA512 f8fd26a11cb044197d3b04a1347e27e177e79cb58436e67116f63025a2a5c39c0083ac17362e7d2234caf89df530422ead088e3fc4546f8d9f68482fc75eb7a0
-DIST openjdk-8.252_p09.tar.bz2 454656 BLAKE2B 7132af72a09da9ded1759ccf92da6237a24e3fd15209b8d5aecb7011b890cd3484b4724f6b6a144e4bc5cb41931076985f75a9089c178938be62ac1a1d2a7f07 SHA512 0f03f1549dea1577cb01895d4e34721d16443977c5e7b3f0744af9cf2c0b09e60cb6d91b35a5e474c593d518d5610fb4c14fc4b9a907a7e13bb2351cea51bd06
-DIST openjdk-8.262_p10.tar.bz2 455868 BLAKE2B 22637a8ecd2af97b8cdc335fff5d4a14c56f53a26f0fe1ccb61f7f6542961126f4a2dadfc596ae561ea27cfdbc5f23fb10350d1533f43f1740540367565cb160 SHA512 196e201cbbd53132a78f276df7407346ba611798d813272c68cd3d654f34b84874009cda1df62e51fd5e33c5bc4aa4bdda6bd0ef7cac9857c609fcdb3fa3fd53
DIST openjdk-8.265_p01.tar.bz2 456095 BLAKE2B 8de4d0293f3062583654da99a29d5be02197c323772f663d37ab21bdfdf32a723412d301094e6f70cbba99883241f52406a799a91c3d7c2a69ab7b35932c0a38 SHA512 686b869f9278462c6cb52036c4c9261e1689b917ce0afd4e6b47bb3d3207b2e79b2d03c2d3808a5853ab2fa070ac2206877849f5837282cb6deb80f610ba67f5
-DIST openjdk-corba-8.252_p09.tar.bz2 1034367 BLAKE2B d281a0b2e092c637adae4a206ac4b3f7beeb65f0fce5862f996ac71a814c5c3ee3261dd1145660cb50fde0398e42ca1e8c86d6aad07e43b44aa1f903c204b21c SHA512 08f348849eeadefee3dce9658b519091a14b9f972a1ee1dc51c37a3cd766e5265faed1931b967410ebff2132dd18cedf8840277d804b402ee43a862e37575ab1
-DIST openjdk-corba-8.262_p10.tar.bz2 1033428 BLAKE2B 979f86546dc4c558c8615e4cc1887bcc4a0b82845cf6474ef3802321cb205037c2c753c55f0c219cba3e0771bc2e1a7096b6ad93ce8582e45ef6b5815c0c593b SHA512 4b91cbcc55b983719aa1e0fb683bf2d169b908eb4d4e24857dfd918f4f086e6ce1317f980ba89ff911673131c71c27149091ee114deb75e6f98f31b0922bc04f
DIST openjdk-corba-8.265_p01.tar.bz2 1034140 BLAKE2B 4b176bf2d9ff461b5682ad7f4b994091acf017df2caabf292dcda9baa34abd7d8016f56f2aff0866508eac565f4079e6f8ba8cbd8167abf1e38cd1fac727e141 SHA512 d92b69ab33176c29c5b7c0a5a21947d5d28dafa32a5933414bea5d16d4e68e1a381b2a73114952d507e7ee76c132e70dc8234175edfd3a086c4775417eaa7d9a
-DIST openjdk-hotspot-8.252_p09.tar.bz2 7954548 BLAKE2B a791d3c3385be3c8543bea1fc8d5bee9b3de873122ec850c3ad0082430083ec9dff2aa7c0cae33e628047a18a76fca8146b68aa52f32845cf7a61a45fdc8d9eb SHA512 53079cc255f75f246a67937bdf2b7715882f9baf8bcbc46ab2963c259359b1008642aeeae7ba7705c39f7a04e69ba286421a83b90294e81071f8e630db48ba7c
-DIST openjdk-hotspot-8.262_p10.tar.bz2 8204485 BLAKE2B dd4411fdceb36c378d15fce45dc75ea6b2e19c219a6b46e10de3864407d9eff0a4fcb7fcf2f5f0bc613b68cd54766404f25c76346c7500e7a2018c0001ad4981 SHA512 11880562cebbdc4abd59cd2ac234ca697316c1ec78ad291fa41d69fe8f5f01f30db0c3e224226521afcaf798619a5afc9055ea12fcd41f5da179a353351dff2a
DIST openjdk-hotspot-8.265_p01.tar.bz2 8204133 BLAKE2B 3c574da38c9c787e2b40dafa6d7885f9632804a158de26fb4e6f9b5266c955adad8adb1917043eecba97fbb1e53c063da08231e806f5ba8f6c0ef762e88c45b6 SHA512 a3fbc527456aeb8566db24f910e6a64f976e3434fe3717058ee91e66e88d03d77641d342801002f7fa35fb8bb94ce397c95ac2abb86c0616ff25f167878b478b
-DIST openjdk-jaxp-8.252_p09.tar.bz2 2736174 BLAKE2B c198f144be7d0e7439e2184768db8649973f9e6869e67d3a950abd4872584160f4aaec1f4bec727f0d38830d34a4be7bd2f3e897b8ca10c758212262fa1672c3 SHA512 8027676e2928087a7d396c4f1edd3366336aaf8e3f201e2006cb7ddf91e518c9258d7ab6cc1c4fcc27e3e87bcecd96c55b2550d49f28b98beabf7553ea54ba3f
-DIST openjdk-jaxp-8.262_p10.tar.bz2 2735942 BLAKE2B 0445bffe29772968775d4ef5c516e16e53564a27828487ac69224591f008659548bf561eb5e8ac90d1c6129c52e5b91da142b66eb3c4117504752d8a151202ba SHA512 6ff35eaf23a21376643252a0cdcf7d82588c49f9e231e069b14c930d0379f1ef5973996918ae964729d2038d677f2afeec094af904df7e294c3c81a09f12c0b1
DIST openjdk-jaxp-8.265_p01.tar.bz2 2735823 BLAKE2B 84a1248b4eb56f4afff62c5dc0f3517c98a6dc5c7e434012c667d59f05a1719372f68594d9d6b13c04e98887913a01b05eefcdadb3a028275555b2a9720502ba SHA512 d0f9da699d4141fa5535abbdf244b4da0fd466b8b5eca3fcaa7cc739326d79a5aa5ffac90988f8bedb39f80d7d4f1feaac3cf5fb1b019203cc96eae9746d9bbc
-DIST openjdk-jaxws-8.252_p09.tar.bz2 2542417 BLAKE2B cf898e0c56269ea1f468c6b9e6cfbdf552caea562f833ade234d207f05be6f39f86d9d6794cc8b365ed3fde4bac5df41949e76cbaef61553f5557ec86dd593e6 SHA512 cadeec8825073db1fea13f1d83903ba2799324cfa8e25012c5dc98ec31976bd91b22526f98fc871d0ee01156943f4fc4ec115f7a81feb10e9f7d96f3f39a9313
-DIST openjdk-jaxws-8.262_p10.tar.bz2 2543114 BLAKE2B 1329a7157335374e6a61572843c067fbb8125ccdc425ce54a5fc723750d2efdde255390393dfbdb3993fe21943bc9c18bb0aa22a177d7095bbe1343cd4fed1b4 SHA512 d229dea6d1feb0f404f438e8e2fe7760866965db3d0dfe2c3be52122723a915b502114716b99a243029f4377ea701918568dfe7a8426922e7186addb2ea9a36a
DIST openjdk-jaxws-8.265_p01.tar.bz2 2543597 BLAKE2B c83256ab68837cc44d65414343d4bfa7d908926b1a092416cb16551593ed58eb4e28333a6e0417fdad7426ea2b648cffe9e8ef9531f76b7ff9a29851cb27918b SHA512 3a23ae92cbc1f5f47a1f2dffaaef1999acc34125176f67139040f17c3b6fe4cf78ee8c506a73c8fd38ddbb59bfb22c61f2e45ebf8739be7eb7df83cc65303433
-DIST openjdk-jdk-8.252_p09.tar.bz2 47507382 BLAKE2B 4638256df52aa48a1ccace15fe65b284cb2a1e3a3c45f32ae69a807ae4bd9b9ce3cf9f464a9b8a87d07c49f2d7c48c8516b43d9d4372f578ad1cd4dfa17abb80 SHA512 96188acc8078c312c7118abfbc39874429f71e63c2e282fef2da9df29731ee13396bda28a8a1041b17b50da4bb00b1fe88404d682b0a850e5db10e59e39994f2
-DIST openjdk-jdk-8.262_p10.tar.bz2 48030557 BLAKE2B 5aba38969729686718527acbf469086afc241c65667a69ddd2a71af4250dd2d931ea267a0c956a1ab342eea032a981ff66a31875f3d7ccca9dcdff82e02df10e SHA512 120b0f613ed9b13c07e68cfc074a1d812567edbc209cbc14d15b477fb7e67a779139f620bc7c65423e420c7b240211727760ca69b532d2f009452f7bfbecacd4
DIST openjdk-jdk-8.265_p01.tar.bz2 48017864 BLAKE2B b30a573a79a06abfe98e5963521f762e3517bda2bf6849af758285b7ea61cc57d89290ec47538b1082eea99646d3dd6295b98ad65edd62d1b1fd2480c0928a74 SHA512 44ad75bf3b3c6fd6b782ee5383edfa60fb49ac2e40493b18487bcb8a4dac926ffcf5b663adbb8d3267021bd47d5b60652771a88257fbaff77aa2e1f627252418
-DIST openjdk-langtools-8.252_p09.tar.bz2 2399354 BLAKE2B aa3f0cb647986490612b9574fb0c78955f5ffb8969dbd06dfae5406436d6fecdbbb09896bdb0acc18d56f51bcd4ad1eadb19cc544185762ad623a47fde2e4a85 SHA512 d84ff97294ac612cd4e49deb2d7470026a564208c0e1fa23d5692db45efaaf564483966921ce642506a97aa90a2a8593617f944ebc6d18c9db5a808fd3946864
-DIST openjdk-langtools-8.262_p10.tar.bz2 2398186 BLAKE2B 874461ecd6655edab66541ca681e60eb1f0dd3331d26ad806f59c486658fb7cdf26a65869316ae7e1ba04aa1a4b45f1bc2848b695e89a87b878f399b08b12bb4 SHA512 a109d8dd94c83b0caddd1527c2467c12f05c344c1916a5af7bac0127a5694107d6a902679bf609a48aad434b3c623d42cce6ece83b205051435d3e3aab1824f7
DIST openjdk-langtools-8.265_p01.tar.bz2 2399426 BLAKE2B 550a3dcee38b41feaf8c5b6b88f700c52f870ed0c3f25fa23f34bb3f40c333965e911ac126f4b038057472acea2b684917692a6881e46e4aa68b05cd7e4346da SHA512 24d0978a8e6254a96a5399420831d320ea2b2f5b7055ceba030802b85fcb9630031499504ca72305361fa3a386c2ca0a8c38082ee2b15b8569fdf7e815730be6
-DIST openjdk-nashorn-8.252_p09.tar.bz2 2852104 BLAKE2B 570fbe605ed27c4b3a5db5f6e9dbb4269ad2c895654a989d366a4a6f238ea06fec398140563ca2700303856dfa795ae40dbf9485dd9e9a46ef438f5418fd8b8b SHA512 996e7068d8c6f8ca192e6037eaf7f98ff94188c02670caadf1042e4e0909a3d51835a8cd2250d1f0a8bbdedb107f3713b614466ba4d2915b955e19fdcc2cbb91
-DIST openjdk-nashorn-8.262_p10.tar.bz2 2852351 BLAKE2B f7c4650981e6193f5e7495971b1a1777e086d734befe79ef53bc20382cc738f14ea95e6bd1baa51e128a071c96ca3885eac93494fe1db92de4eb2820f1392ebd SHA512 55119e12a7dc2f1acc31c655f5b3fb9f417b06310c99d4e93c355bd638950f839e62137509f784dafd7f402940dddefc4c0952a5e182d4801f46d78830086e97
DIST openjdk-nashorn-8.265_p01.tar.bz2 2852124 BLAKE2B 380202d487e62e08784b7fd5cb720c22a2b93d802898b90bf2686bac803fe2bc41d8d4b3d56b45bfb45686a2976d208359818b17b96ccce73fd55b389f4d04af SHA512 12522a06f16f1c63d6b6df525011d01ff91ba05f06ee7ade239faa31527ca9aaa9fa609c1ad261f0ae8d75cc195fe1af66e026815bdc0669fb6a286a49f86a5e
diff --git a/dev-java/openjdk/files/openjdk-11.0.7_p10-sigsegv.patch b/dev-java/openjdk/files/openjdk-11.0.7_p10-sigsegv.patch
deleted file mode 100644
index 04c61c06589e..000000000000
--- a/dev-java/openjdk/files/openjdk-11.0.7_p10-sigsegv.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-
-# HG changeset patch
-# User ccheung
-# Date 1564075552 25200
-# Node ID f1332f6025515e4fc9e42fbf79f983d782abaaf0
-# Parent 966fc6d784a737ec25cd0b1be48109a4a3fa02ad
-8228407: JVM crashes with shared archive file mismatch
-Summary: Stop processing other header fields if initial header check has failed.
-Reviewed-by: dholmes, jiangli
-
-diff -r 966fc6d784a7 -r f1332f602551 src/hotspot/share/memory/filemap.cpp
---- a/src/hotspot/share/memory/filemap.cpp Mon Mar 02 12:30:59 2020 +0100
-+++ b/src/hotspot/share/memory/filemap.cpp Thu Jul 25 10:25:52 2019 -0700
-@@ -1287,7 +1287,9 @@
- }
-
- init_from_file(_fd);
-- if (!validate_header()) {
-+ // UseSharedSpaces could be disabled if the checking of some of the header fields in
-+ // init_from_file has failed.
-+ if (!UseSharedSpaces || !validate_header()) {
- return false;
- }
- return true;
-diff -r 966fc6d784a7 -r f1332f602551 test/hotspot/jtreg/runtime/appcds/SharedArchiveConsistency.java
---- a/test/hotspot/jtreg/runtime/appcds/SharedArchiveConsistency.java Mon Mar 02 12:30:59 2020 +0100
-+++ b/test/hotspot/jtreg/runtime/appcds/SharedArchiveConsistency.java Thu Jul 25 10:25:52 2019 -0700
-@@ -385,8 +385,16 @@
- output.shouldNotContain("Checksum verification failed");
-
- copyFile(orgJsaFile, jsa);
-+ // modify _jvm_ident and run with -Xshare:auto
-+ System.out.println("\n2b. Corrupt _jvm_ident run with -Xshare:auto\n");
-+ modifyJvmIdent();
-+ output = TestCommon.execAuto(execArgs);
-+ output.shouldContain("The shared archive file was created by a different version or build of HotSpot");
-+ output.shouldContain("Hello World");
-+
-+ copyFile(orgJsaFile, jsa);
- // modify _magic and _paths_misc_info_size, test should fail
-- System.out.println("\n2b. Corrupt _magic and _paths_misc_info_size, should fail\n");
-+ System.out.println("\n2c. Corrupt _magic and _paths_misc_info_size, should fail\n");
- modifyHeaderIntField(offset_magic, 0x00000000);
- modifyHeaderIntField(offset_paths_misc_info_size, Integer.MAX_VALUE);
- output = TestCommon.execCommon(execArgs);
-@@ -395,7 +403,7 @@
-
- copyFile(orgJsaFile, jsa);
- // modify _version and _paths_misc_info_size, test should fail
-- System.out.println("\n2c. Corrupt _version and _paths_misc_info_size, should fail\n");
-+ System.out.println("\n2d. Corrupt _version and _paths_misc_info_size, should fail\n");
- modifyHeaderIntField(offset_version, 0x00000000);
- modifyHeaderIntField(offset_paths_misc_info_size, Integer.MAX_VALUE);
- output = TestCommon.execCommon(execArgs);
-
diff --git a/dev-java/openjdk/files/openjdk-8-detect-gcc10.patch b/dev-java/openjdk/files/openjdk-8-detect-gcc10.patch
deleted file mode 100644
index b47e012d4a39..000000000000
--- a/dev-java/openjdk/files/openjdk-8-detect-gcc10.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 6d96aaac5662f734b0a933397ebb8cd4ff66606d Mon Sep 17 00:00:00 2001
-From: Georgy Yakovlev
-Date: Sat, 23 May 2020 20:48:10 -0700
-Subject: [PATCH] backport gcc10 fix
-
-https://hg.openjdk.java.net/jdk8u/jdk8u/rev/39a7914e14a0
----
- common/autoconf/generated-configure.sh | 4 ++--
- common/autoconf/toolchain.m4 | 2 +-
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/common/autoconf/generated-configure.sh b/common/autoconf/generated-configure.sh
-index 5e71c50..90c017d 100644
---- a/common/autoconf/generated-configure.sh
-+++ b/common/autoconf/generated-configure.sh
-@@ -27955,7 +27955,7 @@ $as_echo "$as_me: The result from running with --version was: \"$COMPILER_VERSIO
- COMPILER_VERSION_STRING=`$ECHO $COMPILER_VERSION_OUTPUT | \
- $SED -e 's/ *Copyright .*//'`
- COMPILER_VERSION_NUMBER=`$ECHO $COMPILER_VERSION_OUTPUT | \
-- $SED -e 's/^.* \([1-9]\.[0-9.]*\) .*$/\1/'`
-+ $SED -e 's/^.* \([1-9][0-9]*\.[0-9.]*\) .*$/\1/'`
- elif test "x$TOOLCHAIN_TYPE" = xclang; then
- # clang --version output typically looks like
- # Apple LLVM version 5.0 (clang-500.2.79) (based on LLVM 3.3svn)
-@@ -29696,7 +29696,7 @@ $as_echo "$as_me: The result from running with --version was: \"$COMPILER_VERSIO
- COMPILER_VERSION_STRING=`$ECHO $COMPILER_VERSION_OUTPUT | \
- $SED -e 's/ *Copyright .*//'`
- COMPILER_VERSION_NUMBER=`$ECHO $COMPILER_VERSION_OUTPUT | \
-- $SED -e 's/^.* \([1-9]\.[0-9.]*\) .*$/\1/'`
-+ $SED -e 's/^.* \([1-9][0-9]*\.[0-9.]*\) .*$/\1/'`
- elif test "x$TOOLCHAIN_TYPE" = xclang; then
- # clang --version output typically looks like
- # Apple LLVM version 5.0 (clang-500.2.79) (based on LLVM 3.3svn)
-diff --git a/common/autoconf/toolchain.m4 b/common/autoconf/toolchain.m4
-index e3a82c8..c0a4af5 100644
---- a/common/autoconf/toolchain.m4
-+++ b/common/autoconf/toolchain.m4
-@@ -433,7 +433,7 @@ AC_DEFUN([TOOLCHAIN_EXTRACT_COMPILER_VERSION],
- COMPILER_VERSION_STRING=`$ECHO $COMPILER_VERSION_OUTPUT | \
- $SED -e 's/ *Copyright .*//'`
- COMPILER_VERSION_NUMBER=`$ECHO $COMPILER_VERSION_OUTPUT | \
-- $SED -e 's/^.* \(@<:@1-9@:>@\.@<:@0-9.@:>@*\) .*$/\1/'`
-+ $SED -e 's/^.* \(@<:@1-9@:>@@<:@0-9@:>@*\.@<:@0-9.@:>@*\) .*$/\1/'`
- elif test "x$TOOLCHAIN_TYPE" = xclang; then
- # clang --version output typically looks like
- # Apple LLVM version 5.0 (clang-500.2.79) (based on LLVM 3.3svn)
---
-2.26.2
-
diff --git a/dev-java/openjdk/openjdk-11.0.7_p10.ebuild b/dev-java/openjdk/openjdk-11.0.7_p10.ebuild
deleted file mode 100644
index b5d448dd9e84..000000000000
--- a/dev-java/openjdk/openjdk-11.0.7_p10.ebuild
+++ /dev/null
@@ -1,280 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools check-reqs flag-o-matic java-pkg-2 java-vm-2 multiprocessing pax-utils toolchain-funcs
-
-# we need -ga tag to fetch tarball and unpack it, but exact number everywhere else to
-# set build version properly
-MY_PV="${PV%_p*}-ga"
-SLOT="${MY_PV%%[.+]*}"
-
-DESCRIPTION="Open source implementation of the Java programming language"
-HOMEPAGE="https://openjdk.java.net"
-SRC_URI="https://hg.${PN}.java.net/jdk-updates/jdk${SLOT}u/archive/jdk-${MY_PV}.tar.bz2 -> ${P}.tar.bz2"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
-
-IUSE="alsa cups debug doc examples gentoo-vm headless-awt javafx +jbootstrap nsplugin +pch selinux source systemtap webstart"
-
-COMMON_DEPEND="
- media-libs/freetype:2=
- media-libs/giflib:0/7
- media-libs/libpng:0=
- media-libs/lcms:2=
- sys-libs/zlib
- virtual/jpeg:0=
- systemtap? ( dev-util/systemtap )
-"
-
-# Many libs are required to build, but not to run, make is possible to remove
-# by listing conditionally in RDEPEND unconditionally in DEPEND
-RDEPEND="
- ${COMMON_DEPEND}
- >=sys-apps/baselayout-java-0.1.0-r1
- !headless-awt? (
- x11-libs/libX11
- x11-libs/libXext
- x11-libs/libXi
- x11-libs/libXrandr
- x11-libs/libXrender
- x11-libs/libXt
- x11-libs/libXtst
- )
- alsa? ( media-libs/alsa-lib )
- cups? ( net-print/cups )
- selinux? ( sec-policy/selinux-java )
-"
-
-DEPEND="
- ${COMMON_DEPEND}
- app-arch/zip
- media-libs/alsa-lib
- net-print/cups
- x11-base/xorg-proto
- x11-libs/libX11
- x11-libs/libXext
- x11-libs/libXi
- x11-libs/libXrandr
- x11-libs/libXrender
- x11-libs/libXt
- x11-libs/libXtst
- javafx? ( dev-java/openjfx:${SLOT}= )
- || (
- dev-java/openjdk-bin:${SLOT}
- dev-java/openjdk:${SLOT}
- )
-"
-
-PDEPEND="
- webstart? ( >=dev-java/icedtea-web-1.6.1:0 )
- nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] )
-"
-
-REQUIRED_USE="javafx? ( alsa !headless-awt )"
-
-S="${WORKDIR}/jdk${SLOT}u-jdk-${MY_PV}"
-
-PATCHES=(
- "${FILESDIR}/${P}-sigsegv.patch"
-)
-
-# The space required to build varies wildly depending on USE flags,
-# ranging from 2GB to 16GB. This function is certainly not exact but
-# should be close enough to be useful.
-openjdk_check_requirements() {
- local M
- M=2048
- M=$(( $(usex jbootstrap 2 1) * $M ))
- M=$(( $(usex debug 3 1) * $M ))
- M=$(( $(usex doc 320 0) + $(usex source 128 0) + 192 + $M ))
-
- CHECKREQS_DISK_BUILD=${M}M check-reqs_pkg_${EBUILD_PHASE}
-}
-
-pkg_pretend() {
- openjdk_check_requirements
- if [[ ${MERGE_TYPE} != binary ]]; then
- has ccache ${FEATURES} && die "FEATURES=ccache doesn't work with ${PN}"
- fi
-}
-
-pkg_setup() {
- openjdk_check_requirements
- java-vm-2_pkg_setup
-
- JAVA_PKG_WANT_BUILD_VM="openjdk-${SLOT} openjdk-bin-${SLOT}"
- JAVA_PKG_WANT_SOURCE="${SLOT}"
- JAVA_PKG_WANT_TARGET="${SLOT}"
-
- # The nastiness below is necessary while the gentoo-vm USE flag is
- # masked. First we call java-pkg-2_pkg_setup if it looks like the
- # flag was unmasked against one of the possible build VMs. If not,
- # we try finding one of them in their expected locations. This would
- # have been slightly less messy if openjdk-bin had been installed to
- # /opt/${PN}-${SLOT} or if there was a mechanism to install a VM env
- # file but disable it so that it would not normally be selectable.
-
- local vm
- for vm in ${JAVA_PKG_WANT_BUILD_VM}; do
- if [[ -d ${EPREFIX}/usr/lib/jvm/${vm} ]]; then
- java-pkg-2_pkg_setup
- return
- fi
- done
-
- if has_version --host-root dev-java/openjdk:${SLOT}; then
- export JDK_HOME=${EPREFIX}/usr/$(get_libdir)/openjdk-${SLOT}
- else
- if [[ ${MERGE_TYPE} != "binary" ]]; then
- JDK_HOME=$(best_version --host-root dev-java/openjdk-bin:${SLOT})
- [[ -n ${JDK_HOME} ]] || die "Build VM not found!"
- JDK_HOME=${JDK_HOME#*/}
- JDK_HOME=${EPREFIX}/opt/${JDK_HOME%-r*}
- export JDK_HOME
- fi
- fi
-}
-
-src_prepare() {
- default
- chmod +x configure || die
-}
-
-src_configure() {
- # Work around stack alignment issue, bug #647954. in case we ever have x86
- use x86 && append-flags -mincoming-stack-boundary=2
-
- # Work around -fno-common ( GCC10 default ), bug #713180
- append-flags -fcommon
-
- # Enabling full docs appears to break doc building. If not
- # explicitly disabled, the flag will get auto-enabled if pandoc and
- # graphviz are detected. pandoc has loads of dependencies anyway.
-
- local myconf=(
- --disable-ccache
- --enable-full-docs=no
- --with-boot-jdk="${JDK_HOME}"
- --with-extra-cflags="${CFLAGS}"
- --with-extra-cxxflags="${CXXFLAGS}"
- --with-extra-ldflags="${LDFLAGS}"
- --with-giflib=system
- --with-lcms=system
- --with-libjpeg=system
- --with-libpng=system
- --with-native-debug-symbols=$(usex debug internal none)
- --with-vendor-name="Gentoo"
- --with-vendor-url="https://gentoo.org"
- --with-vendor-bug-url="https://bugs.gentoo.org"
- --with-vendor-vm-bug-url="https://bugs.openjdk.java.net"
- --with-vendor-version-string="${PVR}"
- --with-version-pre=""
- --with-version-string="${PV%_p*}"
- --with-version-build="${PV#*_p}"
- --with-zlib=system
- --enable-dtrace=$(usex systemtap yes no)
- --enable-headless-only=$(usex headless-awt yes no)
- )
-
- if use javafx; then
- local zip="${EROOT%/}/usr/$(get_libdir)/openjfx-${SLOT}/javafx-exports.zip"
- if [[ -r ${zip} ]]; then
- myconf+=( --with-import-modules="${zip}" )
- else
- die "${zip} not found or not readable"
- fi
- fi
-
- # PaX breaks pch, bug #601016
- if use pch && ! host-is-pax; then
- myconf+=( --enable-precompiled-headers )
- else
- myconf+=( --disable-precompiled-headers )
- fi
-
- (
- unset _JAVA_OPTIONS JAVA JAVA_TOOL_OPTIONS JAVAC XARGS
- CFLAGS= CXXFLAGS= LDFLAGS= \
- CONFIG_SITE=/dev/null \
- econf "${myconf[@]}"
- )
-}
-
-src_compile() {
- local myemakeargs=(
- JOBS=$(makeopts_jobs)
- LOG=debug
- CFLAGS_WARNINGS_ARE_ERRORS= # No -Werror
- $(usex doc docs '')
- $(usex jbootstrap bootcycle-images product-images)
- )
- emake "${myemakeargs[@]}" -j1 #nowarn
-}
-
-src_install() {
- local dest="/usr/$(get_libdir)/${PN}-${SLOT}"
- local ddest="${ED}${dest#/}"
-
- cd "${S}"/build/*-release/images/jdk || die
-
- # Create files used as storage for system preferences.
- mkdir .systemPrefs || die
- touch .systemPrefs/.system.lock || die
- touch .systemPrefs/.systemRootModFile || die
-
- # Oracle and IcedTea have libjsoundalsa.so depending on
- # libasound.so.2 but OpenJDK only has libjsound.so. Weird.
- if ! use alsa ; then
- rm -v lib/libjsound.* || die
- fi
-
- if ! use examples ; then
- rm -vr demo/ || die
- fi
-
- if ! use source ; then
- rm -v lib/src.zip || die
- fi
-
- rm -v lib/security/cacerts || die
-
- dodir "${dest}"
- cp -pPR * "${ddest}" || die
-
- dosym ../../../../../etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts
-
- # must be done before running itself
- java-vm_set-pax-markings "${ddest}"
-
- einfo "Creating the Class Data Sharing archives and disabling usage tracking"
- "${ddest}/bin/java" -server -Xshare:dump -Djdk.disableLastUsageTracking || die
-
- use gentoo-vm && java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh
- java-vm_revdep-mask
- java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
-
- if use doc ; then
- docinto html
- dodoc -r "${S}"/build/*-release/images/docs/*
- dosym ../../../usr/share/doc/"${PF}" /usr/share/doc/"${PN}-${SLOT}"
- fi
-}
-
-pkg_postinst() {
- java-vm-2_pkg_postinst
-
- if use gentoo-vm ; then
- ewarn "WARNING! You have enabled the gentoo-vm USE flag, making this JDK"
- ewarn "recognised by the system. This will almost certainly break"
- ewarn "many java ebuilds as they are not ready for openjdk-11"
- else
- ewarn "The experimental gentoo-vm USE flag has not been enabled so this JDK"
- ewarn "will not be recognised by the system. For example, simply calling"
- ewarn "\"java\" will launch a different JVM. This is necessary until Gentoo"
- ewarn "fully supports Java ${SLOT}. This JDK must therefore be invoked using its"
- ewarn "absolute location under ${EPREFIX}/usr/$(get_libdir)/${PN}-${SLOT}."
- fi
-}
diff --git a/dev-java/openjdk/openjdk-8.252_p09.ebuild b/dev-java/openjdk/openjdk-8.252_p09.ebuild
deleted file mode 100644
index 45c3e3cc90ca..000000000000
--- a/dev-java/openjdk/openjdk-8.252_p09.ebuild
+++ /dev/null
@@ -1,231 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit check-reqs eapi7-ver flag-o-matic java-pkg-2 java-vm-2 multiprocessing pax-utils toolchain-funcs
-
-# we need latest -ga tag from hg, but want to keep build number as well
-# as _p component of the gentoo version string.
-
-MY_PV=$(ver_rs 1 'u' 2 '-' ${PV%_p*}-ga)
-
-BASE_URI="https://hg.${PN}.java.net/jdk8u/jdk8u"
-
-DESCRIPTION="Open source implementation of the Java programming language"
-HOMEPAGE="https://openjdk.java.net"
-SRC_URI="
- ${BASE_URI}/archive/jdk${MY_PV}.tar.bz2 -> ${P}.tar.bz2
- ${BASE_URI}/corba/archive/jdk${MY_PV}.tar.bz2 -> ${PN}-corba-${PV}.tar.bz2
- ${BASE_URI}/hotspot/archive/jdk${MY_PV}.tar.bz2 -> ${PN}-hotspot-${PV}.tar.bz2
- ${BASE_URI}/jaxp/archive/jdk${MY_PV}.tar.bz2 -> ${PN}-jaxp-${PV}.tar.bz2
- ${BASE_URI}/jaxws/archive/jdk${MY_PV}.tar.bz2 -> ${PN}-jaxws-${PV}.tar.bz2
- ${BASE_URI}/jdk/archive/jdk${MY_PV}.tar.bz2 -> ${PN}-jdk-${PV}.tar.bz2
- ${BASE_URI}/langtools/archive/jdk${MY_PV}.tar.bz2 -> ${PN}-langtools-${PV}.tar.bz2
- ${BASE_URI}/nashorn/archive/jdk${MY_PV}.tar.bz2 -> ${PN}-nashorn-${PV}.tar.bz2
-"
-
-LICENSE="GPL-2"
-SLOT="$(ver_cut 1)"
-KEYWORDS="amd64 ppc64 ~x86"
-IUSE="alsa debug cups doc examples headless-awt +jbootstrap nsplugin +pch selinux source webstart"
-
-COMMON_DEPEND="
- media-libs/freetype:2=
- media-libs/giflib:0/7
- sys-libs/zlib
-"
-# Many libs are required to build, but not to run, make is possible to remove
-# by listing conditionally in RDEPEND unconditionally in DEPEND
-RDEPEND="
- ${COMMON_DEPEND}
- >=sys-apps/baselayout-java-0.1.0-r1
- !headless-awt? (
- x11-libs/libX11
- x11-libs/libXext
- x11-libs/libXi
- x11-libs/libXrender
- x11-libs/libXt
- x11-libs/libXtst
- )
- alsa? ( media-libs/alsa-lib )
- cups? ( net-print/cups )
- selinux? ( sec-policy/selinux-java )
-"
-
-DEPEND="
- ${COMMON_DEPEND}
- app-arch/zip
- media-libs/alsa-lib
- net-print/cups
- x11-base/xorg-proto
- x11-libs/libX11
- x11-libs/libXext
- x11-libs/libXi
- x11-libs/libXrender
- x11-libs/libXt
- x11-libs/libXtst
- || (
- dev-java/openjdk-bin:${SLOT}
- dev-java/icedtea-bin:${SLOT}
- dev-java/openjdk:${SLOT}
- dev-java/icedtea:${SLOT}
- )
-"
-
-PDEPEND="
- webstart? ( >=dev-java/icedtea-web-1.6.1:0 )
- nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] )
-"
-
-S="${WORKDIR}/jdk${SLOT}u-jdk${MY_PV}"
-
-# bug 721970, JDK-8244760
-PATCHES=(
- "${FILESDIR}/openjdk-8-detect-gcc10.patch"
-)
-
-# The space required to build varies wildly depending on USE flags,
-# ranging from 2GB to 16GB. This function is certainly not exact but
-# should be close enough to be useful.
-openjdk_check_requirements() {
- local M
- M=2048
- M=$(( $(usex debug 3 1) * $M ))
- M=$(( $(usex jbootstrap 2 1) * $M ))
- M=$(( $(usex doc 320 0) + $(usex source 128 0) + 192 + $M ))
-
- CHECKREQS_DISK_BUILD=${M}M check-reqs_pkg_${EBUILD_PHASE}
-}
-
-pkg_pretend() {
- openjdk_check_requirements
- if [[ ${MERGE_TYPE} != binary ]]; then
- has ccache ${FEATURES} && die "FEATURES=ccache doesn't work with ${PN}"
- fi
-}
-
-pkg_setup() {
- openjdk_check_requirements
-
- JAVA_PKG_WANT_BUILD_VM="openjdk-${SLOT} openjdk-bin-${SLOT} icedtea-${SLOT} icedtea-bin-${SLOT}"
- JAVA_PKG_WANT_SOURCE="${SLOT}"
- JAVA_PKG_WANT_TARGET="${SLOT}"
-
- java-vm-2_pkg_setup
- java-pkg-2_pkg_setup
-}
-
-src_prepare() {
- default
- chmod +x configure || die
- local repo
- for repo in corba hotspot jdk jaxp jaxws langtools nashorn; do
- ln -s ../"${repo}-jdk${MY_PV}" "${repo}" || die
- done
- # new warnings in new gcc https://bugs.gentoo.org/685426
- sed -i '/^WARNINGS_ARE_ERRORS/ s/-Werror/-Wno-error/' \
- hotspot/make/linux/makefiles/gcc.make || die
-}
-
-src_configure() {
- # general build info found here:
- #https://hg.openjdk.java.net/jdk8/jdk8/raw-file/tip/README-builds.html
-
- # Work around stack alignment issue, bug #647954.
- use x86 && append-flags -mincoming-stack-boundary=2
-
- # Work around -fno-common ( GCC10 default ), bug #706638
- append-flags -fcommon
-
- local myconf=(
- --disable-ccache
- --enable-unlimited-crypto
- --with-boot-jdk="${JDK_HOME}"
- --with-extra-cflags="${CFLAGS}"
- --with-extra-cxxflags="${CXXFLAGS}"
- --with-extra-ldflags="${LDFLAGS}"
- --with-giflib=system
- --with-jtreg=no
- --with-jobs=1
- --with-num-cores=1
- --with-update-version="$(ver_cut 2)"
- --with-build-number="b$(ver_cut 4)"
- --with-milestone="fcs" # magic variable that means "release version"
- --with-vendor-name="Gentoo"
- --with-vendor-url="https://gentoo.org"
- --with-vendor-bug-url="https://bugs.gentoo.org"
- --with-vendor-vm-bug-url="https://bugs.openjdk.java.net"
- --with-zlib=system
- --with-native-debug-symbols=$(usex debug internal none)
- $(usex headless-awt --disable-headful '')
- )
-
- # PaX breaks pch, bug #601016
- if use pch && ! host-is-pax; then
- myconf+=( --enable-precompiled-headers )
- else
- myconf+=( --disable-precompiled-headers )
- fi
-
- (
- unset _JAVA_OPTIONS JAVA JAVA_TOOL_OPTIONS JAVAC XARGS
- CFLAGS= CXXFLAGS= LDFLAGS= \
- CONFIG_SITE=/dev/null \
- econf "${myconf[@]}"
- )
-}
-
-src_compile() {
- local myemakeargs=(
- JOBS=$(makeopts_jobs)
- LOG=debug
- $(usex doc docs '')
- $(usex jbootstrap bootcycle-images images)
- )
- emake "${myemakeargs[@]}" -j1 #nowarn
-}
-
-src_install() {
- local dest="/usr/$(get_libdir)/${PN}-${SLOT}"
- local ddest="${ED%/}/${dest#/}"
-
- cd "${S}"/build/*-release/images/j2sdk-image || die
-
- if ! use alsa; then
- rm -v jre/lib/$(get_system_arch)/libjsoundalsa.* || die
- fi
-
- # stupid build system does not remove that
- if use headless-awt ; then
- rm -fvr jre/lib/$(get_system_arch)/lib*{[jx]awt,splashscreen}* \
- {,jre/}bin/policytool bin/appletviewer || die
- fi
-
- if ! use examples ; then
- rm -vr demo/ || die
- fi
-
- if ! use source ; then
- rm -v src.zip || die
- fi
-
- dodir "${dest}"
- cp -pPR * "${ddest}" || die
-
- dosym ../../../../../../etc/ssl/certs/java/cacerts "${dest}"/jre/lib/security/cacerts
-
- java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh
- java-vm_set-pax-markings "${ddest}"
- java-vm_revdep-mask
- java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
-
- if use doc ; then
- docinto html
- dodoc -r "${S}"/build/*-release/docs/*
- fi
-}
-
-pkg_postinst() {
- java-vm-2_pkg_postinst
-}
diff --git a/dev-java/openjdk/openjdk-8.262_p10.ebuild b/dev-java/openjdk/openjdk-8.262_p10.ebuild
deleted file mode 100644
index ceee66cafaea..000000000000
--- a/dev-java/openjdk/openjdk-8.262_p10.ebuild
+++ /dev/null
@@ -1,226 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit check-reqs eapi7-ver flag-o-matic java-pkg-2 java-vm-2 multiprocessing pax-utils toolchain-funcs
-
-# we need latest -ga tag from hg, but want to keep build number as well
-# as _p component of the gentoo version string.
-
-MY_PV=$(ver_rs 1 'u' 2 '-' ${PV%_p*}-ga)
-
-BASE_URI="https://hg.${PN}.java.net/jdk8u/jdk8u"
-
-DESCRIPTION="Open source implementation of the Java programming language"
-HOMEPAGE="https://openjdk.java.net"
-SRC_URI="
- ${BASE_URI}/archive/jdk${MY_PV}.tar.bz2 -> ${P}.tar.bz2
- ${BASE_URI}/corba/archive/jdk${MY_PV}.tar.bz2 -> ${PN}-corba-${PV}.tar.bz2
- ${BASE_URI}/hotspot/archive/jdk${MY_PV}.tar.bz2 -> ${PN}-hotspot-${PV}.tar.bz2
- ${BASE_URI}/jaxp/archive/jdk${MY_PV}.tar.bz2 -> ${PN}-jaxp-${PV}.tar.bz2
- ${BASE_URI}/jaxws/archive/jdk${MY_PV}.tar.bz2 -> ${PN}-jaxws-${PV}.tar.bz2
- ${BASE_URI}/jdk/archive/jdk${MY_PV}.tar.bz2 -> ${PN}-jdk-${PV}.tar.bz2
- ${BASE_URI}/langtools/archive/jdk${MY_PV}.tar.bz2 -> ${PN}-langtools-${PV}.tar.bz2
- ${BASE_URI}/nashorn/archive/jdk${MY_PV}.tar.bz2 -> ${PN}-nashorn-${PV}.tar.bz2
-"
-
-LICENSE="GPL-2"
-SLOT="$(ver_cut 1)"
-KEYWORDS="amd64 ~ppc64 ~x86"
-IUSE="alsa debug cups doc examples headless-awt +jbootstrap nsplugin +pch selinux source webstart"
-
-COMMON_DEPEND="
- media-libs/freetype:2=
- media-libs/giflib:0/7
- sys-libs/zlib
-"
-# Many libs are required to build, but not to run, make is possible to remove
-# by listing conditionally in RDEPEND unconditionally in DEPEND
-RDEPEND="
- ${COMMON_DEPEND}
- >=sys-apps/baselayout-java-0.1.0-r1
- !headless-awt? (
- x11-libs/libX11
- x11-libs/libXext
- x11-libs/libXi
- x11-libs/libXrender
- x11-libs/libXt
- x11-libs/libXtst
- )
- alsa? ( media-libs/alsa-lib )
- cups? ( net-print/cups )
- selinux? ( sec-policy/selinux-java )
-"
-
-DEPEND="
- ${COMMON_DEPEND}
- app-arch/zip
- media-libs/alsa-lib
- net-print/cups
- x11-base/xorg-proto
- x11-libs/libX11
- x11-libs/libXext
- x11-libs/libXi
- x11-libs/libXrender
- x11-libs/libXt
- x11-libs/libXtst
- || (
- dev-java/openjdk-bin:${SLOT}
- dev-java/icedtea-bin:${SLOT}
- dev-java/openjdk:${SLOT}
- dev-java/icedtea:${SLOT}
- )
-"
-
-PDEPEND="
- webstart? ( >=dev-java/icedtea-web-1.6.1:0 )
- nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] )
-"
-
-S="${WORKDIR}/jdk${SLOT}u-jdk${MY_PV}"
-
-# The space required to build varies wildly depending on USE flags,
-# ranging from 2GB to 16GB. This function is certainly not exact but
-# should be close enough to be useful.
-openjdk_check_requirements() {
- local M
- M=2048
- M=$(( $(usex debug 3 1) * $M ))
- M=$(( $(usex jbootstrap 2 1) * $M ))
- M=$(( $(usex doc 320 0) + $(usex source 128 0) + 192 + $M ))
-
- CHECKREQS_DISK_BUILD=${M}M check-reqs_pkg_${EBUILD_PHASE}
-}
-
-pkg_pretend() {
- openjdk_check_requirements
- if [[ ${MERGE_TYPE} != binary ]]; then
- has ccache ${FEATURES} && die "FEATURES=ccache doesn't work with ${PN}"
- fi
-}
-
-pkg_setup() {
- openjdk_check_requirements
-
- JAVA_PKG_WANT_BUILD_VM="openjdk-${SLOT} openjdk-bin-${SLOT} icedtea-${SLOT} icedtea-bin-${SLOT}"
- JAVA_PKG_WANT_SOURCE="${SLOT}"
- JAVA_PKG_WANT_TARGET="${SLOT}"
-
- java-vm-2_pkg_setup
- java-pkg-2_pkg_setup
-}
-
-src_prepare() {
- default
- chmod +x configure || die
- local repo
- for repo in corba hotspot jdk jaxp jaxws langtools nashorn; do
- ln -s ../"${repo}-jdk${MY_PV}" "${repo}" || die
- done
- # new warnings in new gcc https://bugs.gentoo.org/685426
- sed -i '/^WARNINGS_ARE_ERRORS/ s/-Werror/-Wno-error/' \
- hotspot/make/linux/makefiles/gcc.make || die
-}
-
-src_configure() {
- # general build info found here:
- #https://hg.openjdk.java.net/jdk8/jdk8/raw-file/tip/README-builds.html
-
- # Work around stack alignment issue, bug #647954.
- use x86 && append-flags -mincoming-stack-boundary=2
-
- # Work around -fno-common ( GCC10 default ), bug #706638
- append-flags -fcommon
-
- local myconf=(
- --disable-ccache
- --enable-unlimited-crypto
- --with-boot-jdk="${JDK_HOME}"
- --with-extra-cflags="${CFLAGS}"
- --with-extra-cxxflags="${CXXFLAGS}"
- --with-extra-ldflags="${LDFLAGS}"
- --with-giflib=system
- --with-jtreg=no
- --with-jobs=1
- --with-num-cores=1
- --with-update-version="$(ver_cut 2)"
- --with-build-number="b$(ver_cut 4)"
- --with-milestone="fcs" # magic variable that means "release version"
- --with-vendor-name="Gentoo"
- --with-vendor-url="https://gentoo.org"
- --with-vendor-bug-url="https://bugs.gentoo.org"
- --with-vendor-vm-bug-url="https://bugs.openjdk.java.net"
- --with-zlib=system
- --with-native-debug-symbols=$(usex debug internal none)
- $(usex headless-awt --disable-headful '')
- )
-
- # PaX breaks pch, bug #601016
- if use pch && ! host-is-pax; then
- myconf+=( --enable-precompiled-headers )
- else
- myconf+=( --disable-precompiled-headers )
- fi
-
- (
- unset _JAVA_OPTIONS JAVA JAVA_TOOL_OPTIONS JAVAC XARGS
- CFLAGS= CXXFLAGS= LDFLAGS= \
- CONFIG_SITE=/dev/null \
- econf "${myconf[@]}"
- )
-}
-
-src_compile() {
- local myemakeargs=(
- JOBS=$(makeopts_jobs)
- LOG=debug
- $(usex doc docs '')
- $(usex jbootstrap bootcycle-images images)
- )
- emake "${myemakeargs[@]}" -j1 #nowarn
-}
-
-src_install() {
- local dest="/usr/$(get_libdir)/${PN}-${SLOT}"
- local ddest="${ED%/}/${dest#/}"
-
- cd "${S}"/build/*-release/images/j2sdk-image || die
-
- if ! use alsa; then
- rm -v jre/lib/$(get_system_arch)/libjsoundalsa.* || die
- fi
-
- # stupid build system does not remove that
- if use headless-awt ; then
- rm -fvr jre/lib/$(get_system_arch)/lib*{[jx]awt,splashscreen}* \
- {,jre/}bin/policytool bin/appletviewer || die
- fi
-
- if ! use examples ; then
- rm -vr demo/ || die
- fi
-
- if ! use source ; then
- rm -v src.zip || die
- fi
-
- dodir "${dest}"
- cp -pPR * "${ddest}" || die
-
- dosym ../../../../../../etc/ssl/certs/java/cacerts "${dest}"/jre/lib/security/cacerts
-
- java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh
- java-vm_set-pax-markings "${ddest}"
- java-vm_revdep-mask
- java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
-
- if use doc ; then
- docinto html
- dodoc -r "${S}"/build/*-release/docs/*
- fi
-}
-
-pkg_postinst() {
- java-vm-2_pkg_postinst
-}
diff --git a/dev-java/openjdk/openjdk-8.265_p01.ebuild b/dev-java/openjdk/openjdk-8.265_p01.ebuild
index 3bf95edeea43..d88de6a02a77 100644
--- a/dev-java/openjdk/openjdk-8.265_p01.ebuild
+++ b/dev-java/openjdk/openjdk-8.265_p01.ebuild
@@ -27,7 +27,7 @@ SRC_URI="
LICENSE="GPL-2"
SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ppc64 x86"
IUSE="alsa debug cups doc examples headless-awt +jbootstrap nsplugin +pch selinux source webstart"
COMMON_DEPEND="
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index 88ba34c16f70..6348cfe0142a 100644
Binary files a/dev-lang/Manifest.gz and b/dev-lang/Manifest.gz differ
diff --git a/dev-lang/mono/Manifest b/dev-lang/mono/Manifest
index 4cb35e69183b..5263681050bc 100644
--- a/dev-lang/mono/Manifest
+++ b/dev-lang/mono/Manifest
@@ -1 +1,2 @@
+DIST mono-6.10.0.104.tar.xz 292616252 BLAKE2B 705fb45ab280eae0e66b4c0fa0fc0e3ee87ed47164dd5bfa2f11115c30fb7b788bd9b25bfe7d820db88178bf0863b1cc984def94fe291c9924b311454735deed SHA512 73b853e9fc9af2e1bf5e45f7accb8893dd7e48f9723f74b03d99ea11cf565e2c5bb2d6ae4c81c7e7be0cdfa489016da909ed7b12808c8f84d9d25e33e1cb9874
DIST mono-6.6.0.161.tar.xz 241179396 BLAKE2B 88cb0599cd5698500431dc8a78fa3b44a148bdc11d3067e950f0019c6bbeff9ebf2142e90f3b1023721c982fc4a59605ee969d84ee2137f968dee66b1ea0b55c SHA512 0b0c72daef9e1c10c0d566292997d4a923766390793ec1196a063b885e853b47a12503238632879cf7397f03b34909137e24c53db9300a4f209164e973284186
diff --git a/dev-lang/mono/mono-6.10.0.104.ebuild b/dev-lang/mono/mono-6.10.0.104.ebuild
new file mode 100644
index 000000000000..817de94a28c0
--- /dev/null
+++ b/dev-lang/mono/mono-6.10.0.104.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux"
+
+SLOT="0"
+
+IUSE="nls minimal pax_kernel xen doc"
+
+inherit autotools eutils linux-info mono-env flag-o-matic pax-utils multilib-minimal
+
+DESCRIPTION="Mono runtime and class libraries, a C# compiler/interpreter"
+HOMEPAGE="https://mono-project.com"
+LICENSE="MIT LGPL-2.1 GPL-2 BSD-4 NPL-1.1 Ms-PL GPL-2-with-linking-exception IDPL"
+
+SRC_URI="https://download.mono-project.com/sources/mono/${P}.tar.xz"
+
+#Note: mono works incorrect with older versions of libgdiplus
+#details on dotnet overlay issue: https://github.com/gentoo/dotnet/issues/429
+COMMONDEPEND="
+ !minimal? ( >=dev-dotnet/libgdiplus-6.0.2 )
+ ia64? ( sys-libs/libunwind )
+ nls? ( sys-devel/gettext )
+"
+RDEPEND="${COMMONDEPEND}"
+DEPEND="${COMMONDEPEND}
+ sys-devel/bc
+ virtual/yacc
+ pax_kernel? ( sys-apps/elfix )
+ dev-util/cmake
+"
+
+PATCHES=(
+ "${FILESDIR}"/mono-5.12-try-catch.patch
+)
+
+pkg_pretend() {
+ linux-info_pkg_setup
+ if use kernel_linux; then
+ if linux_config_exists; then
+ linux_chkconfig_builtin SYSVIPC || die "SYSVIPC not enabled in the kernel"
+ else
+ # https://github.com/gentoo/gentoo/blob/f200e625bda8de696a28338318c9005b69e34710/eclass/linux-info.eclass#L686
+ ewarn "kernel config not found"
+ ewarn "If CONFIG_SYSVIPC is not set in your kernel .config, mono will hang while compiling."
+ ewarn "See https://bugs.gentoo.org/261869 for more info."
+ fi
+ fi
+}
+
+pkg_setup() {
+ mono-env_pkg_setup
+}
+
+src_prepare() {
+ # we need to sed in the paxctl-ng -mr in the runtime/mono-wrapper.in so it don't
+ # get killed in the build proces when MPROTECT is enable. #286280
+ # RANDMMAP kill the build proces to #347365
+ # use paxmark.sh to get PT/XT logic #532244
+ if use pax_kernel ; then
+ ewarn "We are disabling MPROTECT on the mono binary."
+
+ # issue 9 : https://github.com/Heather/gentoo-dotnet/issues/9
+ sed '/exec "/ i\paxmark.sh -mr "$r/@mono_runtime@"' -i "${S}"/runtime/mono-wrapper.in || die "Failed to sed mono-wrapper.in"
+ fi
+
+ # mono build system can fail otherwise
+ strip-flags
+
+ default
+
+ # PATCHES contains configure.ac patch
+ eautoreconf
+ multilib_copy_sources
+}
+
+multilib_src_configure() {
+ local myeconfargs=(
+ $(use_with xen xen_opt)
+ --without-ikvm-native
+ --disable-dtrace
+ --enable-system-aot
+ $(use_with doc mcs-docs)
+ $(use_enable nls)
+ )
+
+ econf "${myeconfargs[@]}"
+}
+
+multilib_src_test() {
+ cd mcs/tests || die
+ emake check
+}
+
+multilib_src_install() {
+ default_src_install
+
+ # Remove files not respecting LDFLAGS and that we are not supposed to provide, see Fedora
+ # mono.spec and http://www.mail-archive.com/mono-devel-list@lists.ximian.com/msg24870.html
+ # for reference.
+ rm -f "${ED}"/usr/lib/mono/{2.0,4.5}/mscorlib.dll.so || die
+ rm -f "${ED}"/usr/lib/mono/{2.0,4.5}/mcs.exe.so || die
+}
diff --git a/dev-lang/rust-bin/Manifest b/dev-lang/rust-bin/Manifest
index 741989972e8b..0af2fbfbd0ba 100644
--- a/dev-lang/rust-bin/Manifest
+++ b/dev-lang/rust-bin/Manifest
@@ -40,3 +40,17 @@ DIST rust-1.45.1-powerpc64le-unknown-linux-gnu.tar.xz 119234164 BLAKE2B 4148957f
DIST rust-1.45.1-s390x-unknown-linux-gnu.tar.xz 124758156 BLAKE2B ff62e14d5ae9f7213ebc24d694317ff292cb0d7d2a67f0ca284cddd2b9f594547b01a6c647780d47989d4405072f377d37fc03933431a3df804e37bc1248e803 SHA512 278411c6308eaa4d732ff4c0f448d808a5ee74dae5f3eaf04773ccf65c9bc5963153f62346d30de0f577dd6da89c55bed280c2fb0e50d2075e3c30a3649fc4e8
DIST rust-1.45.1-x86_64-unknown-linux-gnu.tar.xz 117764080 BLAKE2B cafe6e4f7c28112879089d75703a1b1ce7c0cf9b5ab5beeb4ddf343f7bc93e8704bc105ba0bd95f1df6d62439f206d8f4ae9090330af857ec0a249540eb63122 SHA512 13ee5ff7cae29440e32fb140404ff01414d66f0ea8d79777fb1586541de1ee6ef8e12f9249c35374501460a2352f7d0f6035b5bdc2f0daa91d772a157657ec0b
DIST rust-1.45.1-x86_64-unknown-linux-musl.tar.xz 123820216 BLAKE2B 1afe48589e5eec15d8fdb31d52b2ada49688e78a311298d421a8b2d4c0cc6a708223e5976518d66506584dc2adc63651b62b8c1fc3c3ccfaff80e2ef7ade5078 SHA512 39875878acfeb05d7b72bab2dea51063a523fa7ad136d582ba28603df7f8b1c3360e5838e5f9b08f396969e52bb1fc672fa4c08cf5f8ffc39128af129b6b17a6
+DIST rust-1.45.2-aarch64-unknown-linux-gnu.tar.xz 110433136 BLAKE2B e2aa575c71757ea54b361940ca0813728bc6ef63db491a6891c05ff91d6fb6e2bf49aaebd05daf648cf2ae07b5937e142ab26fd243665bbac202e1237b20900c SHA512 b4b3fb198bf85192563fb8b6017cf07f92b9c26d6e590efa9476aa878871839315db935e3353c664e635a229f17b0979bcfd31488e29e02ce0dc266d252b9e41
+DIST rust-1.45.2-arm-unknown-linux-gnueabi.tar.xz 114729036 BLAKE2B 8169a3827e8192de80bb654a667bcaa01c5f1bb49f2882b781d7d46bd20d5531204a477317c743c772e6067b225b1a3f78d333e2864e4dfcadb18777618d2811 SHA512 ecd79ba14feed330f81555854a7eadd894b9926482a2aad376c1f04aee16df01a3d929ec071e69b0f531466bbe00021c902bbb6b0ea4374c8ea5e2941d09d806
+DIST rust-1.45.2-arm-unknown-linux-gnueabihf.tar.xz 114488160 BLAKE2B 69ee32914d75a0d3f1e84bcf760177d5125e0d989b023cc8f5499c37894949d05b1d5e61340832d248b3a305ba1dcd670280a0e5ed0439984815e5c8e46b8d09 SHA512 e18e53016417ea0d9ae5bee90a3fcf75dc2b7b8b5dd0c71426e353b9ad162353bdb2dd1b071c63bf91342eb803a9eb7fdf348ef15d678d91e6d221a911a3770e
+DIST rust-1.45.2-armv7-unknown-linux-gnueabihf.tar.xz 116516572 BLAKE2B 8a658c21cbfa5dfdd25d5890d37581c29b37ca447b54b0bb1bfb929ec80592f873b1ee5a871a0c417d2ed821d6d0fdcdc078ba17ff58636668996f6fbf1274cf SHA512 dbf36643e87fc31cda5c0d5fc8b1589ce80531a94379060106ce81d525cd77c36ac6f89d5ae05d8872020baf31e5391422ed58c01ec6f801428d67e2e10896fb
+DIST rust-1.45.2-i686-unknown-linux-gnu.tar.xz 131555580 BLAKE2B b701374ba340aa965a1eacca89a18d7c8547b8c45d07fa1601bea10be7a5c4bf550f4a0dd5e99edc8eda4112b09fc2ec0477d4c1ea063d66263214d0cb283ae0 SHA512 afe81d38d8692e5792e111c3b2c83da4dffa99c9a8a89b5f1e10a6e449e49d4dd19d68c96d7b2f5013054d141bf4b1a08da1c2b877c7bbe87f81c19232020ecb
+DIST rust-1.45.2-mips-unknown-linux-gnu.tar.xz 101990496 BLAKE2B cd15ebe38be6774b01fdbf6278aef1f0fba13fac5500e47c8025a84b09e2d9ab953b0d461e01e5d92a2f63aa96f1f0950295079f0065288736a499b12fab2264 SHA512 7ed3d8d3c83515706516a1c85b232dfa5fef578558ccbd394c609fdf1ca8344e696c095d57eae7604aadeabcbb43dc19abac0db2b979690f70ca4b0ed17853e7
+DIST rust-1.45.2-mips64-unknown-linux-gnuabi64.tar.xz 106772956 BLAKE2B 0a9ecf20e3913a65ddfdb3fb90c284ccae5617bfd05af05557201ef8a6b55aaefa871b6763b7d712f90436e2b45f448ab7ac253c240cf3c22b557e82200c3e4a SHA512 6a45dcaf4c69df055e2563a5f8da37da08757e664af777b95f2ff2747b8ef1b5b72a0379b1395e836e3bf3019fdb8dd87da89cbe080bcdb0e59e941d1eaade9f
+DIST rust-1.45.2-mipsel-unknown-linux-gnu.tar.xz 104105424 BLAKE2B 88dee69ae51bc8d8200dfae5e7178de753b369c3a358b2713003eefebd135ce498654ee58d42be53db1b689f303bbe979ee29d8e547a4f41aebbb5845f04a424 SHA512 9be8c08a325346513ec5d78c2a555a79acb9b416d41d3d47cb4562a1612cb9e0e53490c2ea32be38fb884cf51bf529e4e8817b9f5ceb19f38ba30a4d512a8970
+DIST rust-1.45.2-powerpc-unknown-linux-gnu.tar.xz 104037748 BLAKE2B ba929a7613ead5edf806b9ce25f40dca308bfbef6a58a9f994e22c2f8e3573d8bedef3a55a5373d34369dd7965d1385623cf6e40f974e2901e684c14e1873e0a SHA512 dab05dbf487197ac95310c950fec92f8f1001d972df7b00f3f8ba58f1761da97b065de33ce19a18e5b2cf09519fc2fc54ef5863c118a7b8812b28ea5447ba857
+DIST rust-1.45.2-powerpc64-unknown-linux-gnu.tar.xz 114778460 BLAKE2B 5731791ff34c211c4008ada25d493b4b6a3331275d70340825b3ccd95d76849c016101ef6130a51bec912824bd86e594905262d7b0657216b4dbccbcdba861db SHA512 fbf909e5f9135d5216dbbc1be0d1e3159000c58b83bcdeb9839a12f5a9ff56261a61edfab93cd21800a90ff56bb9eff8a1ad83c60fa54bf0cf4b149219dbe914
+DIST rust-1.45.2-powerpc64le-unknown-linux-gnu.tar.xz 118941136 BLAKE2B 96b297b08cd2cdb4b25992b6b0eefbdc3c453c31fec5f36597d185d2a43a8e04d0f4d0ec7523c1c79b7d62d89b0f98be01e524d0d69a20d2f50771f97906e3f8 SHA512 6cb169efae4c847ba204fa24c1f40b4320e53928ab8966727971a5bc7a565eaa6142f40904cec93927543b25450db23d816c20653f53d3aa36ac616fe85ee6ba
+DIST rust-1.45.2-s390x-unknown-linux-gnu.tar.xz 125144128 BLAKE2B 66d8ee3b94b427cd55f8b662cae9f3b86ea108706c51bedfbc6e68018b40a7d0ad1162eb649b4af3c60e425c46cbdb23ef966d670abd698df383eae834a3b854 SHA512 7727cfbeed29e8a1e79398392332b25b5498900f593f3d08414c70b44da0cd06dca0791a361956c47c3367e6572d59d885085d3cd99fd4a9c28c431a158ddbfd
+DIST rust-1.45.2-x86_64-unknown-linux-gnu.tar.xz 118135364 BLAKE2B 0ad1277674284d29c4e4bc1cdf0163794caf37e39d28381f4dac29303381690a0c125fb2a56437ca735746c2bd6de7961dbfd325808939758ee2d4a15d72aec2 SHA512 dfd3ce0cc42ae82a2d13866c5c94c304b031e253a1485ccc1d6ecd62cc05018b01ac7b2183297bc45ada286b5e91d1344aa3d8417694ab834f8265c7838b4fd2
+DIST rust-1.45.2-x86_64-unknown-linux-musl.tar.xz 124782956 BLAKE2B dac6f48204aee39598a5c83c16b6b1bfbd239a8842bc681450645ef4b7f030666694e6f005473933a5613e5545fc80b9090c0aeb3b3db3a213d8899a7e90e5bf SHA512 14f556599b29f85c4bac39774142e580dbbe68268a16d32f539169defc73353a3c9fd44835358bc53262db43345bb139d14143dd5b6ae64823b9c98b25c4eb75
diff --git a/dev-lang/rust-bin/rust-bin-1.45.2.ebuild b/dev-lang/rust-bin/rust-bin-1.45.2.ebuild
new file mode 100644
index 000000000000..b36387480c97
--- /dev/null
+++ b/dev-lang/rust-bin/rust-bin-1.45.2.ebuild
@@ -0,0 +1,175 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit bash-completion-r1 rust-toolchain toolchain-funcs multilib-minimal
+
+MY_P="rust-${PV}"
+
+DESCRIPTION="Systems programming language from Mozilla"
+HOMEPAGE="https://www.rust-lang.org/"
+SRC_URI="$(rust_all_arch_uris ${MY_P})"
+
+LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA"
+SLOT="stable"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="clippy cpu_flags_x86_sse2 doc rustfmt"
+
+DEPEND=""
+RDEPEND=">=app-eselect/eselect-rust-20190311"
+
+REQUIRED_USE="x86? ( cpu_flags_x86_sse2 )"
+
+QA_PREBUILT="
+ opt/${P}/bin/*-${PV}
+ opt/${P}/lib/*.so
+ opt/${P}/lib/rustlib/*/bin/*
+ opt/${P}/lib/rustlib/*/lib/*.so
+ opt/${P}/lib/rustlib/*/lib/*.rlib*
+"
+
+pkg_pretend() {
+ if [[ "$(tc-is-softfloat)" != "no" ]] && [[ ${CHOST} == armv7* ]]; then
+ die "${CHOST} is not supported by upstream Rust. You must use a hard float version."
+ fi
+}
+
+src_unpack() {
+ default
+ mv "${WORKDIR}/${MY_P}-$(rust_abi)" "${S}" || die
+}
+
+multilib_src_install() {
+ if multilib_is_native_abi; then
+
+ # start native abi install
+ pushd "${S}" >/dev/null || die
+ local std
+ std="$(grep 'std' ./components)"
+ local components="rustc,cargo,${std}"
+ use doc && components="${components},rust-docs"
+ use clippy && components="${components},clippy-preview"
+ use rustfmt && components="${components},rustfmt-preview"
+ ./install.sh \
+ --components="${components}" \
+ --disable-verify \
+ --prefix="${ED}/opt/${P}" \
+ --mandir="${ED}/opt/${P}/man" \
+ --disable-ldconfig \
+ || die
+
+ local rustc=rustc-bin-${PV}
+ local rustdoc=rustdoc-bin-${PV}
+ local rustgdb=rust-gdb-bin-${PV}
+ local rustgdbgui=rust-gdbgui-bin-${PV}
+ local rustlldb=rust-lldb-bin-${PV}
+
+ mv "${ED}/opt/${P}/bin/rustc" "${ED}/opt/${P}/bin/${rustc}" || die
+ mv "${ED}/opt/${P}/bin/rustdoc" "${ED}/opt/${P}/bin/${rustdoc}" || die
+ mv "${ED}/opt/${P}/bin/rust-gdb" "${ED}/opt/${P}/bin/${rustgdb}" || die
+ mv "${ED}/opt/${P}/bin/rust-gdbgui" "${ED}/opt/${P}/bin/${rustgdbgui}" || die
+ mv "${ED}/opt/${P}/bin/rust-lldb" "${ED}/opt/${P}/bin/${rustlldb}" || die
+
+ dosym "${rustc}" "/opt/${P}/bin/rustc"
+ dosym "${rustdoc}" "/opt/${P}/bin/rustdoc"
+ dosym "${rustgdb}" "/opt/${P}/bin/rust-gdb"
+ dosym "${rustgdbgui}" "/opt/${P}/bin/rust-gdbgui"
+ dosym "${rustlldb}" "/opt/${P}/bin/rust-lldb"
+
+ dosym "../../opt/${P}/bin/${rustc}" "/usr/bin/${rustc}"
+ dosym "../../opt/${P}/bin/${rustdoc}" "/usr/bin/${rustdoc}"
+ dosym "../../opt/${P}/bin/${rustgdb}" "/usr/bin/${rustgdb}"
+ dosym "../../opt/${P}/bin/${rustgdbgui}" "/usr/bin/${rustgdbgui}"
+ dosym "../../opt/${P}/bin/${rustlldb}" "/usr/bin/${rustlldb}"
+
+ local cargo=cargo-bin-${PV}
+ mv "${ED}/opt/${P}/bin/cargo" "${ED}/opt/${P}/bin/${cargo}" || die
+ dosym "${cargo}" "/opt/${P}/bin/cargo"
+ dosym "../../opt/${P}/bin/${cargo}" "/usr/bin/${cargo}"
+
+ if use clippy; then
+ local clippy_driver=clippy-driver-bin-${PV}
+ local cargo_clippy=cargo-clippy-bin-${PV}
+ mv "${ED}/opt/${P}/bin/clippy-driver" "${ED}/opt/${P}/bin/${clippy_driver}" || die
+ mv "${ED}/opt/${P}/bin/cargo-clippy" "${ED}/opt/${P}/bin/${cargo_clippy}" || die
+ dosym "${clippy_driver}" "/opt/${P}/bin/clippy-driver"
+ dosym "${cargo_clippy}" "/opt/${P}/bin/cargo-clippy"
+ dosym "../../opt/${P}/bin/${clippy_driver}" "/usr/bin/${clippy_driver}"
+ dosym "../../opt/${P}/bin/${cargo_clippy}" "/usr/bin/${cargo_clippy}"
+ fi
+ if use rustfmt; then
+ local rustfmt=rustfmt-bin-${PV}
+ local cargo_fmt=cargo-fmt-bin-${PV}
+ mv "${ED}/opt/${P}/bin/rustfmt" "${ED}/opt/${P}/bin/${rustfmt}" || die
+ mv "${ED}/opt/${P}/bin/cargo-fmt" "${ED}/opt/${P}/bin/${cargo_fmt}" || die
+ dosym "${rustfmt}" "/opt/${P}/bin/rustfmt"
+ dosym "${cargo_fmt}" "/opt/${P}/bin/cargo-fmt"
+ dosym "../../opt/${P}/bin/${rustfmt}" "/usr/bin/${rustfmt}"
+ dosym "../../opt/${P}/bin/${cargo_fmt}" "/usr/bin/${cargo_fmt}"
+ fi
+
+ cat <<-EOF > "${T}"/50${P}
+ LDPATH="/opt/${P}/lib"
+ MANPATH="/opt/${P}/man"
+ EOF
+ doenvd "${T}"/50${P}
+
+ # note: eselect-rust adds EROOT to all paths below
+ cat <<-EOF > "${T}/provider-${P}"
+ /usr/bin/rustdoc
+ /usr/bin/rust-gdb
+ /usr/bin/rust-gdbgui
+ /usr/bin/rust-lldb
+ EOF
+ echo /usr/bin/cargo >> "${T}/provider-${P}"
+ if use clippy; then
+ echo /usr/bin/clippy-driver >> "${T}/provider-${P}"
+ echo /usr/bin/cargo-clippy >> "${T}/provider-${P}"
+ fi
+ if use rustfmt; then
+ echo /usr/bin/rustfmt >> "${T}/provider-${P}"
+ echo /usr/bin/cargo-fmt >> "${T}/provider-${P}"
+ fi
+
+ insinto /etc/env.d/rust
+ doins "${T}/provider-${P}"
+ popd >/dev/null || die
+ #end native abi install
+
+ else
+ local rust_target
+ rust_target="$(rust_abi $(get_abi_CHOST ${v##*.}))"
+ dodir "/opt/${P}/lib/rustlib"
+ cp -vr "${WORKDIR}/rust-${PV}-${rust_target}/rust-std-${rust_target}/lib/rustlib/${rust_target}"\
+ "${ED}/opt/${P}/lib/rustlib" || die
+ fi
+}
+
+pkg_postinst() {
+ eselect rust update --if-unset
+
+ elog "Rust installs a helper script for calling GDB now,"
+ elog "for your convenience it is installed under /usr/bin/rust-gdb-bin-${PV},"
+
+ if has_version app-editors/emacs; then
+ elog "install app-emacs/rust-mode to get emacs support for rust."
+ fi
+
+ if has_version app-editors/gvim || has_version app-editors/vim; then
+ elog "install app-vim/rust-vim to get vim support for rust."
+ fi
+
+ if use elibc_musl; then
+ ewarn "${PN} on *-musl targets is configured with crt-static"
+ ewarn ""
+ ewarn "you will need to set RUSTFLAGS=\"-C target-feature=-crt-static\" in make.conf"
+ ewarn "to use it with portage, otherwise you may see failures like"
+ ewarn "error: cannot produce proc-macro for serde_derive as the target "
+ ewarn "x86_64-unknown-linux-musl does not support these crate types"
+ fi
+}
+
+pkg_postrm() {
+ eselect rust cleanup
+}
diff --git a/dev-lang/rust/Manifest b/dev-lang/rust/Manifest
index 850e643071c8..a043cedde165 100644
--- a/dev-lang/rust/Manifest
+++ b/dev-lang/rust/Manifest
@@ -29,3 +29,4 @@ DIST rust-1.44.1-x86_64-unknown-linux-musl.tar.xz 117456616 BLAKE2B fd2752cf867e
DIST rustc-1.44.1-src.tar.xz 94756856 BLAKE2B 60f536c3ba0fa1fec4b6333ee57809ee5226090ad5041c14a136b4356ff3b898062e06c3fe54effe873e27931ac8fcb902cd48a38615a8de7eebc6ecb3bdc2bd SHA512 1c17002edae844a710db9b144c17171416330dc565343c65af8a6e112fb61555e2025bb4cf33cac1229d7df689e6ff8858b91ae00552400ccacafaf1de11849b
DIST rustc-1.45.0-src.tar.xz 98677856 BLAKE2B 2558ba9444a53268de4f1604f13e701077a27e9480c97732a30706d656682672c17f87d8c015da3b839ed3b38081ef8d132bbab3522911bf9b50f018367e6ec7 SHA512 ff049eb65b36e6c64531d56251ebd446336a782f26504eccf375df1c22fa94b5f18e84660cef423edb815c1b31a1a7c9e57aea4aa0779576f3b0d7e81e19427b
DIST rustc-1.45.1-src.tar.xz 98686408 BLAKE2B 49eec97cccc9932915877cf28cc6b27b8008d5fecc2c6255d8974d9ee52375b95933d0052fad23ed2e60f4f08fcc305e1ca47239e8f5adaa8a3acb62eb2c1e14 SHA512 ef71a1706c84fa8557f481d310033285a41ecd9b8d537bacb846d01ed9954b679b915272db57cd96d5ee097cc0134899e584d517c467a9d2949496312e5995df
+DIST rustc-1.45.2-src.tar.xz 98683036 BLAKE2B a4102a5d4744b7ccc9b076aba00c39d69532f777e7d39e0e4ce2033b663b43e27b55034fdb3a1e13379fae9a16bff9e7748865a84507f7388ef0ebf9d421eac7 SHA512 cc6250c0bc844e77ca6dd7ae013e434ed3009b001914114866ed31f28edf3960221454d131e298b15050e3b8153fb8298d509559c2f7307c64611aa8e36b4d25
diff --git a/dev-lang/rust/rust-1.45.2.ebuild b/dev-lang/rust/rust-1.45.2.ebuild
new file mode 100644
index 000000000000..60b307bbd5f1
--- /dev/null
+++ b/dev-lang/rust/rust-1.45.2.ebuild
@@ -0,0 +1,550 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit bash-completion-r1 check-reqs estack flag-o-matic llvm multiprocessing multilib-build python-any-r1 rust-toolchain toolchain-funcs
+
+if [[ ${PV} = *beta* ]]; then
+ betaver=${PV//*beta}
+ BETA_SNAPSHOT="${betaver:0:4}-${betaver:4:2}-${betaver:6:2}"
+ MY_P="rustc-beta"
+ SLOT="beta/${PV}"
+ SRC="${BETA_SNAPSHOT}/rustc-beta-src.tar.xz"
+else
+ ABI_VER="$(ver_cut 1-2)"
+ SLOT="stable/${ABI_VER}"
+ MY_P="rustc-${PV}"
+ SRC="${MY_P}-src.tar.xz"
+ KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+fi
+
+RUST_STAGE0_VERSION="1.$(($(ver_cut 2) - 1)).1"
+
+DESCRIPTION="Systems programming language from Mozilla"
+HOMEPAGE="https://www.rust-lang.org/"
+
+SRC_URI="
+ https://static.rust-lang.org/dist/${SRC} -> rustc-${PV}-src.tar.xz
+ !system-bootstrap? ( $(rust_all_arch_uris rust-${RUST_STAGE0_VERSION}) )
+"
+
+ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM BPF Hexagon Lanai Mips MSP430
+ NVPTX PowerPC RISCV Sparc SystemZ WebAssembly X86 XCore )
+ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
+LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/?}
+
+LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA"
+
+IUSE="clippy cpu_flags_x86_sse2 debug doc libressl miri nightly parallel-compiler rls rustfmt system-bootstrap system-llvm wasm ${ALL_LLVM_TARGETS[*]}"
+
+# Please keep the LLVM dependency block separate. Since LLVM is slotted,
+# we need to *really* make sure we're not pulling more than one slot
+# simultaneously.
+
+# How to use it:
+# 1. List all the working slots (with min versions) in ||, newest first.
+# 2. Update the := to specify *max* version, e.g. < 11.
+# 3. Specify LLVM_MAX_SLOT, e.g. 10.
+LLVM_DEPEND="
+ || (
+ sys-devel/llvm:10[${LLVM_TARGET_USEDEPS// /,}]
+ sys-devel/llvm:9[${LLVM_TARGET_USEDEPS// /,}]
+ )
+ /dev/null) )
+ rustc_version=${rustc_version[0]#rust-bin-}
+ rustc_version=${rustc_version#rust-}
+
+ [[ -z "${rustc_version}" ]] && die "Failed to determine rustc version!"
+
+ if ver_test "${rustc_version}" -lt "${rustc_wanted}" ; then
+ eerror "Rust >=${rustc_wanted} is required"
+ eerror "please run \'eselect rust\' and set correct rust version"
+ die
+ else
+ einfo "Using rust ${rustc_version} to build"
+ fi
+}
+
+pre_build_checks() {
+ local M=6144
+ M=$(( $(usex clippy 128 0) + ${M} ))
+ M=$(( $(usex miri 128 0) + ${M} ))
+ M=$(( $(usex rls 512 0) + ${M} ))
+ M=$(( $(usex rustfmt 256 0) + ${M} ))
+ M=$(( $(usex system-llvm 0 2048) + ${M} ))
+ M=$(( $(usex wasm 256 0) + ${M} ))
+ M=$(( $(usex debug 15 10) * ${M} / 10 ))
+ eshopts_push -s extglob
+ if is-flagq '-g?(gdb)?([1-9])'; then
+ M=$(( 15 * ${M} / 10 ))
+ fi
+ eshopts_pop
+ M=$(( $(usex system-bootstrap 0 1024) + ${M} ))
+ M=$(( $(usex doc 256 0) + ${M} ))
+ CHECKREQS_DISK_BUILD=${M}M check-reqs_pkg_${EBUILD_PHASE}
+}
+
+pkg_pretend() {
+ pre_build_checks
+}
+
+pkg_setup() {
+ pre_build_checks
+ python-any-r1_pkg_setup
+ use system-bootstrap && boostrap_rust_version_check
+
+ # required to link agains system libs, otherwise
+ # crates use bundled sources and compile own static version
+ export LIBGIT2_SYS_USE_PKG_CONFIG=1
+ export LIBSSH2_SYS_USE_PKG_CONFIG=1
+ export PKG_CONFIG_ALLOW_CROSS=1
+
+ if use system-llvm; then
+ llvm_pkg_setup
+
+ local llvm_config="$(get_llvm_prefix "$LLVM_MAX_SLOT")/bin/llvm-config"
+
+ export LLVM_LINK_SHARED=1
+ export RUSTFLAGS="${RUSTFLAGS} -Lnative=$("${llvm_config}" --libdir)"
+ fi
+}
+
+src_prepare() {
+ if ! use system-bootstrap; then
+ local rust_stage0_root="${WORKDIR}"/rust-stage0
+ local rust_stage0="rust-${RUST_STAGE0_VERSION}-$(rust_abi)"
+
+ "${WORKDIR}/${rust_stage0}"/install.sh --disable-ldconfig \
+ --destdir="${rust_stage0_root}" --prefix=/ || die
+ fi
+
+ default
+}
+
+src_configure() {
+ local rust_target="" rust_targets="" arch_cflags
+
+ # Collect rust target names to compile standard libs for all ABIs.
+ for v in $(multilib_get_enabled_abi_pairs); do
+ rust_targets="${rust_targets},\"$(rust_abi $(get_abi_CHOST ${v##*.}))\""
+ done
+ if use wasm; then
+ rust_targets="${rust_targets},\"wasm32-unknown-unknown\""
+ if use system-llvm; then
+ # un-hardcode rust-lld linker for this target
+ # https://bugs.gentoo.org/715348
+ sed -i '/linker:/ s/rust-lld/wasm-ld/' src/librustc_target/spec/wasm32_base.rs || die
+ fi
+ fi
+ rust_targets="${rust_targets#,}"
+
+ local tools="\"cargo\","
+ if use clippy; then
+ tools="\"clippy\",$tools"
+ fi
+ if use miri; then
+ tools="\"miri\",$tools"
+ fi
+ if use rls; then
+ tools="\"rls\",\"analysis\",\"src\",$tools"
+ fi
+ if use rustfmt; then
+ tools="\"rustfmt\",$tools"
+ fi
+
+ local rust_stage0_root
+ if use system-bootstrap; then
+ rust_stage0_root="$(rustc --print sysroot)"
+ else
+ rust_stage0_root="${WORKDIR}"/rust-stage0
+ fi
+
+ rust_target="$(rust_abi)"
+
+ cat <<- EOF > "${S}"/config.toml
+ [llvm]
+ optimize = $(toml_usex !debug)
+ release-debuginfo = $(toml_usex debug)
+ assertions = $(toml_usex debug)
+ ninja = true
+ targets = "${LLVM_TARGETS// /;}"
+ experimental-targets = ""
+ link-shared = $(toml_usex system-llvm)
+ [build]
+ build = "${rust_target}"
+ host = ["${rust_target}"]
+ target = [${rust_targets}]
+ cargo = "${rust_stage0_root}/bin/cargo"
+ rustc = "${rust_stage0_root}/bin/rustc"
+ docs = $(toml_usex doc)
+ compiler-docs = $(toml_usex doc)
+ submodules = false
+ python = "${EPYTHON}"
+ locked-deps = true
+ vendor = true
+ extended = true
+ tools = [${tools}]
+ verbose = 2
+ sanitizers = false
+ profiler = false
+ cargo-native-static = false
+ [install]
+ prefix = "${EPREFIX}/usr"
+ libdir = "$(get_libdir)/${P}"
+ docdir = "share/doc/${PF}"
+ mandir = "share/${P}/man"
+ [rust]
+ optimize = true
+ debug = $(toml_usex debug)
+ debug-assertions = $(toml_usex debug)
+ debuginfo-level-rustc = 0
+ backtrace = true
+ incremental = false
+ default-linker = "$(tc-getCC)"
+ parallel-compiler = $(toml_usex parallel-compiler)
+ channel = "$(usex nightly nightly stable)"
+ rpath = false
+ verbose-tests = true
+ optimize-tests = $(toml_usex !debug)
+ codegen-tests = true
+ dist-src = false
+ remap-debuginfo = true
+ lld = $(usex system-llvm false $(toml_usex wasm))
+ backtrace-on-ice = true
+ jemalloc = false
+ [dist]
+ src-tarball = false
+ EOF
+
+ for v in $(multilib_get_enabled_abi_pairs); do
+ rust_target=$(rust_abi $(get_abi_CHOST ${v##*.}))
+ arch_cflags="$(get_abi_CFLAGS ${v##*.})"
+
+ cat <<- EOF >> "${S}"/config.env
+ CFLAGS_${rust_target}=${arch_cflags}
+ EOF
+
+ cat <<- EOF >> "${S}"/config.toml
+ [target.${rust_target}]
+ cc = "$(tc-getBUILD_CC)"
+ cxx = "$(tc-getBUILD_CXX)"
+ linker = "$(tc-getCC)"
+ ar = "$(tc-getAR)"
+ EOF
+ # librustc_target/spec/linux_musl_base.rs sets base.crt_static_default = true;
+ if use elibc_musl; then
+ cat <<- EOF >> "${S}"/config.toml
+ crt-static = false
+ EOF
+ fi
+ if use system-llvm; then
+ cat <<- EOF >> "${S}"/config.toml
+ llvm-config = "$(get_llvm_prefix "${LLVM_MAX_SLOT}")/bin/llvm-config"
+ EOF
+ fi
+ done
+ if use wasm; then
+ cat <<- EOF >> "${S}"/config.toml
+ [target.wasm32-unknown-unknown]
+ linker = "$(usex system-llvm lld rust-lld)"
+ EOF
+ fi
+
+ if [[ -n ${I_KNOW_WHAT_I_AM_DOING_CROSS} ]]; then #whitespace intentionally shifted below
+ # experimental cross support
+ # discussion: https://bugs.gentoo.org/679878
+ # TODO: c*flags, clang, system-llvm, cargo.eclass target support
+ # it would be much better if we could split out stdlib
+ # complilation to separate ebuild and abuse CATEGORY to
+ # just install to /usr/lib/rustlib/
+
+ # extra targets defined as a bash array
+ # spec format: ::
+ # best place would be /etc/portage/env/dev-lang/rust
+ # Example:
+ # RUST_CROSS_TARGETS=(
+ # "AArch64:aarch64-unknown-linux-gnu:aarch64-unknown-linux-gnu"
+ # )
+ # no extra hand holding is done, no target transformations, all
+ # values are passed as-is with just basic checks, so it's up to user to supply correct values
+ # valid rust targets can be obtained with
+ # rustc --print target-list
+ # matching cross toolchain has to be installed
+ # matching LLVM_TARGET has to be enabled for both rust and llvm (if using system one)
+ # only gcc toolchains installed with crossdev are checked for now.
+
+ # BUG: we can't pass host flags to cross compiler, so just filter for now
+ # BUG: this should be more fine-grained.
+ filter-flags '-mcpu=*' '-march=*' '-mtune=*'
+
+ local cross_target_spec
+ for cross_target_spec in "${RUST_CROSS_TARGETS[@]}";do
+ # extracts first element form ::
+ local cross_llvm_target="${cross_target_spec%%:*}"
+ # extracts toolchain triples, :
+ local cross_triples="${cross_target_spec#*:}"
+ # extracts first element after before : separator
+ local cross_rust_target="${cross_triples%%:*}"
+ # extracts last element after : separator
+ local cross_toolchain="${cross_triples##*:}"
+ use llvm_targets_${cross_llvm_target} || die "need llvm_targets_${cross_llvm_target} target enabled"
+ command -v ${cross_toolchain}-gcc > /dev/null 2>&1 || die "need ${cross_toolchain} cross toolchain"
+
+ cat <<- EOF >> "${S}"/config.toml
+ [target.${cross_rust_target}]
+ cc = "${cross_toolchain}-gcc"
+ cxx = "${cross_toolchain}-g++"
+ linker = "${cross_toolchain}-gcc"
+ ar = "${cross_toolchain}-ar"
+ EOF
+ if use system-llvm; then
+ cat <<- EOF >> "${S}"/config.toml
+ llvm-config = "$(get_llvm_prefix "${LLVM_MAX_SLOT}")/bin/llvm-config"
+ EOF
+ fi
+
+ # append cross target to "normal" target list
+ # example 'target = ["powerpc64le-unknown-linux-gnu"]'
+ # becomes 'target = ["powerpc64le-unknown-linux-gnu","aarch64-unknown-linux-gnu"]'
+
+ rust_targets="${rust_targets},\"${cross_rust_target}\""
+ sed -i "/^target = \[/ s#\[.*\]#\[${rust_targets}\]#" config.toml || die
+
+ ewarn
+ ewarn "Enabled ${cross_rust_target} rust target"
+ ewarn "Using ${cross_toolchain} cross toolchain"
+ ewarn
+ if ! has_version -b 'sys-devel/binutils[multitarget]' ; then
+ ewarn "'sys-devel/binutils[multitarget]' is not installed"
+ ewarn "'strip' will be unable to strip cross libraries"
+ ewarn "cross targets will be installed with full debug information"
+ ewarn "enable 'multitarget' USE flag for binutils to be able to strip object files"
+ ewarn
+ ewarn "Alternatively llvm-strip can be used, it supports stripping any target"
+ ewarn "define STRIP=\"llvm-strip\" to use it (experimental)"
+ ewarn
+ fi
+ done
+ fi # I_KNOW_WHAT_I_AM_DOING_CROSS
+
+ einfo "Rust configured with the following settings:"
+ cat "${S}"/config.toml || die
+}
+
+src_compile() {
+ env $(cat "${S}"/config.env) RUST_BACKTRACE=1\
+ "${EPYTHON}" ./x.py build -vv --config="${S}"/config.toml -j$(makeopts_jobs) || die
+}
+
+src_test() {
+ env $(cat "${S}"/config.env) RUST_BACKTRACE=1\
+ "${EPYTHON}" ./x.py test -vv --config="${S}"/config.toml -j$(makeopts_jobs) --no-doc --no-fail-fast \
+ src/test/codegen \
+ src/test/codegen-units \
+ src/test/compile-fail \
+ src/test/incremental \
+ src/test/mir-opt \
+ src/test/pretty \
+ src/test/run-fail \
+ src/test/run-make \
+ src/test/run-make-fulldeps \
+ src/test/ui \
+ src/test/ui-fulldeps || die
+}
+
+src_install() {
+ env $(cat "${S}"/config.env) DESTDIR="${D}" \
+ "${EPYTHON}" ./x.py install -vv --config="${S}"/config.toml || die
+
+ # bug #689562, #689160
+ rm "${D}/etc/bash_completion.d/cargo" || die
+ rmdir "${D}"/etc{/bash_completion.d,} || die
+ dobashcomp build/tmp/dist/cargo-image/etc/bash_completion.d/cargo
+
+ mv "${ED}/usr/bin/rustc" "${ED}/usr/bin/rustc-${PV}" || die
+ mv "${ED}/usr/bin/rustdoc" "${ED}/usr/bin/rustdoc-${PV}" || die
+ mv "${ED}/usr/bin/rust-gdb" "${ED}/usr/bin/rust-gdb-${PV}" || die
+ mv "${ED}/usr/bin/rust-gdbgui" "${ED}/usr/bin/rust-gdbgui-${PV}" || die
+ mv "${ED}/usr/bin/rust-lldb" "${ED}/usr/bin/rust-lldb-${PV}" || die
+ mv "${ED}/usr/bin/cargo" "${ED}/usr/bin/cargo-${PV}" || die
+ if use clippy; then
+ mv "${ED}/usr/bin/clippy-driver" "${ED}/usr/bin/clippy-driver-${PV}" || die
+ mv "${ED}/usr/bin/cargo-clippy" "${ED}/usr/bin/cargo-clippy-${PV}" || die
+ fi
+ if use miri; then
+ mv "${ED}/usr/bin/miri" "${ED}/usr/bin/miri-${PV}" || die
+ mv "${ED}/usr/bin/cargo-miri" "${ED}/usr/bin/cargo-miri-${PV}" || die
+ fi
+ if use rls; then
+ mv "${ED}/usr/bin/rls" "${ED}/usr/bin/rls-${PV}" || die
+ fi
+ if use rustfmt; then
+ mv "${ED}/usr/bin/rustfmt" "${ED}/usr/bin/rustfmt-${PV}" || die
+ mv "${ED}/usr/bin/cargo-fmt" "${ED}/usr/bin/cargo-fmt-${PV}" || die
+ fi
+
+ # Copy shared library versions of standard libraries for all targets
+ # into the system's abi-dependent lib directories because the rust
+ # installer only does so for the native ABI.
+
+ local abi_libdir rust_target
+ for v in $(multilib_get_enabled_abi_pairs); do
+ if [ ${v##*.} = ${DEFAULT_ABI} ]; then
+ continue
+ fi
+ abi_libdir=$(get_abi_LIBDIR ${v##*.})
+ rust_target=$(rust_abi $(get_abi_CHOST ${v##*.}))
+ mkdir -p "${ED}/usr/${abi_libdir}/${P}"
+ cp "${ED}/usr/$(get_libdir)/${P}/rustlib/${rust_target}/lib"/*.so \
+ "${ED}/usr/${abi_libdir}/${P}" || die
+ done
+
+ # versioned libdir/mandir support
+ newenvd - "50${P}" <<-_EOF_
+ LDPATH="${EPREFIX}/usr/$(get_libdir)/${P}"
+ MANPATH="${EPREFIX}/usr/share/${P}/man"
+ _EOF_
+
+ dodoc COPYRIGHT
+ rm -rf "${ED}/usr/$(get_libdir)/${P}"/*.old || die
+ rm "${ED}/usr/share/doc/${P}"/*.old || die
+ rm "${ED}/usr/share/doc/${P}/LICENSE-APACHE" || die
+ rm "${ED}/usr/share/doc/${P}/LICENSE-MIT" || die
+
+ # note: eselect-rust adds EROOT to all paths below
+ cat <<-EOF > "${T}/provider-${P}"
+ /usr/bin/cargo
+ /usr/bin/rustdoc
+ /usr/bin/rust-gdb
+ /usr/bin/rust-gdbgui
+ /usr/bin/rust-lldb
+ EOF
+ if use clippy; then
+ echo /usr/bin/clippy-driver >> "${T}/provider-${P}"
+ echo /usr/bin/cargo-clippy >> "${T}/provider-${P}"
+ fi
+ if use miri; then
+ echo /usr/bin/miri >> "${T}/provider-${P}"
+ echo /usr/bin/cargo-miri >> "${T}/provider-${P}"
+ fi
+ if use rls; then
+ echo /usr/bin/rls >> "${T}/provider-${P}"
+ fi
+ if use rustfmt; then
+ echo /usr/bin/rustfmt >> "${T}/provider-${P}"
+ echo /usr/bin/cargo-fmt >> "${T}/provider-${P}"
+ fi
+
+ insinto /etc/env.d/rust
+ doins "${T}/provider-${P}"
+}
+
+pkg_postinst() {
+ eselect rust update --if-unset
+
+ elog "Rust installs a helper script for calling GDB and LLDB,"
+ elog "for your convenience it is installed under /usr/bin/rust-{gdb,lldb}-${PV}."
+
+ if has_version app-editors/emacs; then
+ elog "install app-emacs/rust-mode to get emacs support for rust."
+ fi
+
+ if has_version app-editors/gvim || has_version app-editors/vim; then
+ elog "install app-vim/rust-vim to get vim support for rust."
+ fi
+
+ if use elibc_musl; then
+ ewarn "${PN} on *-musl targets is configured with crt-static"
+ ewarn ""
+ ewarn "you will need to set RUSTFLAGS=\"-C target-feature=-crt-static\" in make.conf"
+ ewarn "to use it with portage, otherwise you may see failures like"
+ ewarn "error: cannot produce proc-macro for serde_derive v1.0.98 as the target "
+ ewarn "x86_64-unknown-linux-musl does not support these crate types"
+ fi
+}
+
+pkg_postrm() {
+ eselect rust cleanup
+}
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 606146661f04..aab611135ff6 100644
Binary files a/dev-libs/Manifest.gz and b/dev-libs/Manifest.gz differ
diff --git a/dev-libs/cdk/cdk-5.0.20160131.ebuild b/dev-libs/cdk/cdk-5.0.20160131.ebuild
index 13066606ab74..8fb480622f85 100644
--- a/dev-libs/cdk/cdk-5.0.20160131.ebuild
+++ b/dev-libs/cdk/cdk-5.0.20160131.ebuild
@@ -12,7 +12,7 @@ SRC_URI="ftp://invisible-island.net/cdk/${MY_P}.tgz"
LICENSE="BSD"
SLOT="0/6" # subslot = soname version
-KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
IUSE="examples static-libs unicode"
DEPEND=">=sys-libs/ncurses-5.2:0=[unicode?]"
diff --git a/dev-libs/cyberjack/Manifest b/dev-libs/cyberjack/Manifest
index 7e47e7d63c22..6497d260a643 100644
--- a/dev-libs/cyberjack/Manifest
+++ b/dev-libs/cyberjack/Manifest
@@ -1 +1 @@
-DIST pcsc-cyberjack-3.99.5final.SP14.tar.bz2 1090014 BLAKE2B 15c9d0225f03d1fcbc636b6f8ae29f265243af35bc78c48f2e9cca27c7731ebb30069eb5bf377ce66d2c7afb31e1fb5d839001fa21e854a4bdc56237bf780327 SHA512 f39e4f13776d8c4e4bc5ea3cc64e64649d8dea334f50b9bcc9cc6f1fc9e7433ef32b8fcb00b5dad78867029dab0a099c0d7799d7e8f80d0f310b0f53dbd2a7b9
+DIST pcsc-cyberjack_3.99.5final.SP14.tar.bz2 1682821 BLAKE2B 389b0da28beec42e3e2f1766b76dd77efec24bf7aea906ff14ad206c182162125431ac6c81e9242813c088b4936958b8056f5e7c71424c95de6e8e1ac2357aed SHA512 c83e142d6c071f7f20f9f15b9b76ed819873760bda4b49ec042506b2d7ef9ad8674c953abe67f08a1c4b178ce44767ba6479ea1148d8eeb38797e4775b2a9e82
diff --git a/dev-libs/cyberjack/cyberjack-3.99.5_p14.ebuild b/dev-libs/cyberjack/cyberjack-3.99.5_p14-r1.ebuild
similarity index 89%
rename from dev-libs/cyberjack/cyberjack-3.99.5_p14.ebuild
rename to dev-libs/cyberjack/cyberjack-3.99.5_p14-r1.ebuild
index eb2bb547afb8..e783316e8716 100644
--- a/dev-libs/cyberjack/cyberjack-3.99.5_p14.ebuild
+++ b/dev-libs/cyberjack/cyberjack-3.99.5_p14-r1.ebuild
@@ -5,13 +5,13 @@ EAPI=7
MY_PN="pcsc-${PN}"
MY_PV="${PV/_p/final.SP}"
-MY_P="${MY_PN}-${MY_PV}"
+MY_P="${MY_PN}_${MY_PV}"
inherit autotools flag-o-matic linux-info toolchain-funcs udev
DESCRIPTION="REINER SCT cyberJack USB chipcard reader user space driver"
HOMEPAGE="https://www.reiner-sct.de/"
-SRC_URI="http://kernelport.com/reiner-sct/SP$(ver_cut 5)/${MY_P}.tar.bz2"
+SRC_URI="https://support.reiner-sct.de/downloads/LINUX/V${PV/_p/_SP}/${MY_P}.tar.gz -> ${MY_P}.tar.bz2"
KEYWORDS="amd64 x86"
LICENSE="GPL-2+ LGPL-2.1+"
@@ -77,7 +77,7 @@ src_install() {
default
use tools && dobin tools/cjflash/cjflash tools/cjgeldkarte/cjgeldkarte
- use udev && udev_newrules debian/libifd-cyberjack6.udev 99-${PN}.rules
+ use udev && udev_newrules "${FILESDIR}"/libifd-cyberjack6.udev 99-cyberjack.rules
dodoc debian/changelog doc/{LIESMICH,README}.{pdf,txt,xml}
diff --git a/dev-libs/cyberjack/files/libifd-cyberjack6.udev b/dev-libs/cyberjack/files/libifd-cyberjack6.udev
new file mode 100644
index 000000000000..6d5c99a1247e
--- /dev/null
+++ b/dev-libs/cyberjack/files/libifd-cyberjack6.udev
@@ -0,0 +1,27 @@
+# If not adding the device, go away
+ACTION!="add", GOTO="cyberjack_rules_end"
+SUBSYSTEM!="usb", GOTO="cyberjack_rules_end"
+ENV{DEVTYPE}!="usb_device", GOTO="cyberjack_rules_end"
+
+ATTR{idVendor}=="0c4b", ATTR{idProduct}=="0100", MODE="660", GROUP="pcscd"
+ATTR{idVendor}=="0c4b", ATTR{idProduct}=="0300", MODE="660", GROUP="pcscd"
+ATTR{idVendor}=="0c4b", ATTR{idProduct}=="0400", MODE="660", GROUP="pcscd"
+ATTR{idVendor}=="0c4b", ATTR{idProduct}=="0401", MODE="660", GROUP="pcscd"
+ATTR{idVendor}=="0c4b", ATTR{idProduct}=="0412", MODE="660", GROUP="pcscd"
+ATTR{idVendor}=="0c4b", ATTR{idProduct}=="0485", MODE="660", GROUP="pcscd"
+ATTR{idVendor}=="0c4b", ATTR{idProduct}=="0500", ENV{PCSCD}="1"
+ATTR{idVendor}=="0c4b", ATTR{idProduct}=="0501", MODE="660", GROUP="pcscd"
+ATTR{idVendor}=="0c4b", ATTR{idProduct}=="0502", MODE="660", GROUP="pcscd"
+ATTR{idVendor}=="0c4b", ATTR{idProduct}=="0503", MODE="660", GROUP="pcscd"
+ATTR{idVendor}=="0c4b", ATTR{idProduct}=="0504", MODE="660", GROUP="pcscd"
+ATTR{idVendor}=="0c4b", ATTR{idProduct}=="0505", MODE="660", GROUP="pcscd"
+ATTR{idVendor}=="0c4b", ATTR{idProduct}=="0506", MODE="660", GROUP="pcscd"
+ATTR{idVendor}=="0c4b", ATTR{idProduct}=="0507", MODE="660", GROUP="pcscd"
+ATTR{idVendor}=="0c4b", ATTR{idProduct}=="0525", MODE="660", GROUP="pcscd"
+ATTR{idVendor}=="0c4b", ATTR{idProduct}=="0580", MODE="660", GROUP="pcscd"
+ATTR{idVendor}=="0c4b", ATTR{idProduct}=="2000", MODE="660", GROUP="pcscd"
+ATTR{idVendor}=="0c4b", ATTR{idProduct}=="0551", MODE="660", GROUP="pcscd"
+ATTR{idVendor}=="0c4b", ATTR{idProduct}=="2002", MODE="660", GROUP="pcscd"
+
+# All done
+LABEL="cyberjack_rules_end"
diff --git a/dev-libs/efl/Manifest b/dev-libs/efl/Manifest
index c524060f7479..f801c3eec4a1 100644
--- a/dev-libs/efl/Manifest
+++ b/dev-libs/efl/Manifest
@@ -1,2 +1 @@
-DIST efl-1.23.3.tar.xz 77485032 BLAKE2B e5f65080aec1d11a43f1e1786b8ac4e7be70ddd9614b53db822177c28ee73f9590f63d032df5ddf00db6224730b45b045d9f91da2287a4dec7589e902cbcde28 SHA512 47ad067c43d39b534834195f89a745c4a47d867f33aaa68c28c6dccd147379e9bc2416bd68878cc16585f8cb60e926a7df62102658b205756c01985f37f0d297
DIST efl-1.24.3.tar.xz 72278592 BLAKE2B c5d07e947139087976a0a974c3129ea31211be4c235e94d6fc3c2b9c7ec0be97b78fcf6a18aebd4b4d476224c9e6f5a29ad41d93e6c10065ff7591c2792b8481 SHA512 3791955c588bc1b2ca55caa19dc0fb351c9f6c681791bfe76a435255edd55257c9c5ab2f16d0d91ec2d55113bd9d24d45c0f9026ae72d9f6afbddfd093975089
diff --git a/dev-libs/efl/efl-1.23.3.ebuild b/dev-libs/efl/efl-1.23.3.ebuild
deleted file mode 100644
index 65c7e876c084..000000000000
--- a/dev-libs/efl/efl-1.23.3.ebuild
+++ /dev/null
@@ -1,297 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic meson xdg-utils
-
-DESCRIPTION="Enlightenment Foundation Libraries all-in-one package"
-HOMEPAGE="https://www.enlightenment.org"
-SRC_URI="https://download.enlightenment.org/rel/libs/${PN}/${P}.tar.xz"
-
-LICENSE="BSD-2 GPL-2 LGPL-2.1 ZLIB"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86"
-IUSE="+X bmp connman dds debug doc drm +eet elogind examples fbcon fontconfig
- fribidi gif gles2 gnutls glib +gstreamer harfbuzz hyphen ibus ico libressl
- lua +luajit jpeg2k json nls mono opengl +pdf physics pmaps postscript psd
- pulseaudio raw scim sdl +sound +ssl static-libs +svg +system-lz4 systemd
- tga tgv tiff tslib unwind v4l vlc vnc wayland webp xcf xim xine xpm
- xpresent zeroconf"
-
-REQUIRED_USE="
- ?? ( elogind systemd )
- ?? ( gles2 opengl )
- ^^ ( lua luajit )
- ssl
- drm? ( gles2 )
- examples? ( eet svg )
- gles2? ( || ( wayland X ) )
- pulseaudio? ( sound )
- wayland? ( gles2 !opengl )
- xim? ( X )
- xpresent? ( X )
-"
-
-# Requires everything to be enabled unconditionally.
-RESTRICT="test"
-
-RDEPEND="
- dev-libs/check
- net-misc/curl
- media-libs/giflib:=
- media-libs/libpng:0=
- sys-apps/dbus
- sys-libs/zlib
- virtual/jpeg:0=
- X? (
- media-libs/freetype
- x11-libs/libX11
- x11-libs/libXcomposite
- x11-libs/libXcursor
- x11-libs/libXdamage
- x11-libs/libXdmcp
- x11-libs/libXext
- x11-libs/libXfixes
- x11-libs/libXi
- x11-libs/libXinerama
- x11-libs/libXrandr
- x11-libs/libXrender
- x11-libs/libXtst
- x11-libs/libXScrnSaver
- wayland? ( x11-libs/libxkbcommon[X] )
- )
- connman? ( net-misc/connman )
- drm? (
- dev-libs/libinput
- dev-libs/wayland
- media-libs/mesa[gbm]
- x11-libs/libdrm
- x11-libs/libxkbcommon
- )
- elogind? (
- sys-auth/elogind
- virtual/libudev
- )
- fontconfig? ( media-libs/fontconfig )
- fribidi? ( dev-libs/fribidi )
- gles2? (
- media-libs/mesa[egl,gles2]
- virtual/opengl
- )
- glib? ( dev-libs/glib:2 )
- gstreamer? (
- media-libs/gstreamer:1.0
- media-libs/gst-plugins-base:1.0
- )
- hyphen? ( dev-libs/hyphen )
- ibus? ( app-i18n/ibus )
- jpeg2k? ( media-libs/openjpeg:= )
- json? ( >=media-libs/rlottie-0.0.1_pre20191101 )
- lua? ( dev-lang/lua:* )
- luajit? ( dev-lang/luajit:* )
- mono? ( dev-lang/mono )
- opengl? ( virtual/opengl )
- pdf? ( app-text/poppler:=[cxx] )
- physics? ( sci-physics/bullet:= )
- postscript? ( app-text/libspectre )
- pulseaudio? ( media-sound/pulseaudio )
- raw? ( media-libs/libraw:= )
- scim? ( app-i18n/scim )
- sdl? ( media-libs/libsdl2 )
- sound? ( media-libs/libsndfile )
- ssl? (
- gnutls? ( net-libs/gnutls:= )
- !gnutls? (
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:= )
- )
- )
- svg? ( gnome-base/librsvg )
- system-lz4? ( app-arch/lz4 )
- systemd? ( sys-apps/systemd:= )
- tiff? ( media-libs/tiff:0= )
- tslib? ( x11-libs/tslib:= )
- unwind? ( sys-libs/libunwind )
- v4l? ( media-libs/libv4l )
- vlc? ( media-video/vlc )
- vnc? ( net-libs/libvncserver )
- wayland? (
- dev-libs/wayland
- media-libs/mesa[gles2,wayland]
- x11-libs/libxkbcommon
- )
- webp? ( media-libs/libwebp:= )
- xine? ( media-libs/xine-lib )
- xpm? ( x11-libs/libXpm )
- xpresent? ( x11-libs/libXpresent )
- zeroconf? ( net-dns/avahi )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig
- doc? ( app-doc/doxygen )
- nls? ( sys-devel/gettext )"
-
-src_configure() {
- local emesonargs=(
- --buildtype=release
-
- -D buffer=false
- -D cocoa=false
- -D drm-deprecated=false
- -D g-mainloop=false
- -D install-eo-files=false
- -D mono-beta=false
- -D pixman=false
- -D wl-deprecated=false
- -D xgesture=false
-
- -D edje-sound-and-video=true
- -D eeze=true
- -D libmount=true
- -D native-arch-optimization=true
- -D xinput2=true
- -D xinput22=true
-
- $(meson_use X x11)
- $(meson_use debug debug-threads)
- $(meson_use drm)
- $(meson_use elogind)
- $(meson_use examples build-examples)
- $(meson_use fbcon fb)
- $(meson_use fontconfig)
- $(meson_use fribidi)
- $(meson_use glib)
- $(meson_use gstreamer)
- $(meson_use harfbuzz)
- $(meson_use hyphen)
- $(meson_use luajit elua)
- $(meson_use nls)
- $(meson_use physics)
- $(meson_use pulseaudio)
- $(meson_use sdl)
- $(meson_use sound audio)
- $(meson_use systemd)
- $(meson_use tslib)
- $(meson_use v4l v4l2)
- $(meson_use vnc vnc-server)
- $(meson_use wayland wl)
- $(meson_use xpresent)
- $(meson_use zeroconf avahi)
-
- $(meson_use !system-lz4 embedded-lz4)
- )
-
- if use opengl; then
- emesonargs+=( -D opengl=full )
- elif use gles2; then
- emesonargs+=( -D opengl=es-egl )
- else
- emesonargs+=( -D opengl=none )
- fi
-
- if use gnutls; then
- emesonargs+=( -D crypto=gnutls )
- else
- emesonargs+=( -D crypto=openssl )
- fi
-
- if use connman; then
- emesonargs+=( -D network-backend=connman )
- else
- emesonargs+=( -D network-backend=none )
- fi
-
- if use static-libs; then
- emesonargs+=( -D evas-modules=static )
- else
- emesonargs+=( -D evas-modules=shared )
- fi
-
- local disabledEvasLoaders=""
- ! use bmp && disabledEvasLoaders+="bmp,wbmp,"
- ! use dds && disabledEvasLoaders+="dds,"
- ! use eet && disabledEvasLoaders+="eet,"
- ! use gstreamer && disabledEvasLoaders+="gst,"
- ! use ico && disabledEvasLoaders+="ico,"
- ! use jpeg2k && disabledEvasLoaders+="jp2k,"
- ! use json && disabledEvasLoaders+="json,"
- ! use pdf && disabledEvasLoaders+="pdf,"
- ! use pmaps && disabledEvasLoaders+="pmaps,"
- ! use postscript && disabledEvasLoaders+="ps,"
- ! use psd && disabledEvasLoaders+="psd,"
- ! use raw && disabledEvasLoaders+="raw,"
- ! use svg && disabledEvasLoaders+="rsvg,svg,"
- ! use tga && disabledEvasLoaders+="tga,"
- ! use tgv && disabledEvasLoaders+="tgv,"
- ! use tiff && disabledEvasLoaders+="tiff,"
- ! use webp && disabledEvasLoaders+="webp,"
- ! use xcf && disabledEvasLoaders+="xcf,"
- ! use xpm && disabledEvasLoaders+="xpm,"
- [[ ! -z "$disabledEvasLoaders" ]] && disabledEvasLoaders=${disabledEvasLoaders::-1}
- emesonargs+=( -D evas-loaders-disabler="${disabledEvasLoaders}" )
-
- local disabledImfLoaders=""
- ! use ibus && disabledImfLoaders+="ibus,"
- ! use scim && disabledImfLoaders+="scim,"
- ! use xim && disabledImfLoaders+="xim,"
- [[ ! -z "$disabledImfLoaders" ]] && disabledImfLoaders=${disabledImfLoaders::-1}
- emesonargs+=( -D ecore-imf-loaders-disabler="${disabledImfLoaders}" )
-
- local disabledEmotionLoaders="gstreamer,"
- ! use gstreamer && disabledEmotionLoaders+="gstreamer1,"
- ! use vlc && disabledEmotionLoaders+="libvlc,"
- ! use xine && disabledEmotionLoaders+="xine,"
- disabledEmotionLoaders=${disabledEmotionLoaders::-1}
- emesonargs+=( -D emotion-loaders-disabler="${disabledEmotionLoaders}" )
-
- local disabledGenericEmotionLoaders=""
- ! use vlc && disabledGenericEmotionLoaders+="vlc"
- emesonargs+=( -D emotion-generic-loaders-disabler="${disabledGenericEmotionLoaders}" )
-
- local bindingsList="cxx,"
- use luajit && bindingsList+="luajit,"
- use mono && bindingsList+="mono,"
- [[ ! -z "$bindingsList" ]] && bindingsList=${bindingsList::-1}
- emesonargs+=( -D bindings="${bindingsList}" )
-
- local luaChoice=""
- if use luajit; then
- luaChoice+="luajit"
- else
- luaChoice+="lua"
- fi
- emesonargs+=( -D lua-interpreter="${luaChoice}" )
-
- append-cflags -fcommon
-
- meson_src_configure
-}
-
-src_compile() {
- meson_src_compile
-
- if use doc; then
- cd doc/ || die "Failed to switch into doc/ dir."
- doxygen . || die "Doxygen failed to run."
- fi
-}
-
-src_install() {
- use doc && local HTML_DOCS=( "${S}"/doc/html/. )
- meson_src_install
-
- if use examples; then
- dodoc -r "${BUILD_DIR}"/src/examples/
- fi
-}
-
-pkg_postinst() {
- xdg_icon_cache_update
- xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
- xdg_icon_cache_update
- xdg_mimeinfo_database_update
-}
diff --git a/dev-libs/efl/metadata.xml b/dev-libs/efl/metadata.xml
index 4d01748725e9..de7dc1cf76d8 100644
--- a/dev-libs/efl/metadata.xml
+++ b/dev-libs/efl/metadata.xml
@@ -11,7 +11,6 @@
Enable DRM engine
Enable Eet image loader
Enable bidirectional text support
- Enable the OpenGL ES GL implementation
Enable dev-libs/glib support
Enable complex text shaping and layout support
Enable text hyphenation support
@@ -29,7 +28,6 @@
Enable Tgv image loader
Enable x11-libs/tslib for touchscreen events
Enable debug support via sys-libs/libunwind
- Enable media-video/vlc support
Enable XCF image loader
Enable X Input Method
Enable x11-libs/libXpresent support
diff --git a/dev-libs/jsoncpp/jsoncpp-1.9.3.ebuild b/dev-libs/jsoncpp/jsoncpp-1.9.3.ebuild
index 56100b5bcc4f..998f47233e11 100644
--- a/dev-libs/jsoncpp/jsoncpp-1.9.3.ebuild
+++ b/dev-libs/jsoncpp/jsoncpp-1.9.3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
LICENSE="|| ( public-domain MIT )"
SLOT="0/24"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc ~x86"
IUSE="doc test"
RESTRICT="!test? ( test )"
diff --git a/dev-libs/kpeoplevcard/kpeoplevcard-0.1.ebuild b/dev-libs/kpeoplevcard/kpeoplevcard-0.1.ebuild
index bfa637c05761..7d21913d4eb4 100644
--- a/dev-libs/kpeoplevcard/kpeoplevcard-0.1.ebuild
+++ b/dev-libs/kpeoplevcard/kpeoplevcard-0.1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://invent.kde.org/pim/kpeoplevcard"
if [[ ${KDE_BUILD_TYPE} = release ]]; then
SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
- KEYWORDS="amd64 ~arm64 x86"
+ KEYWORDS="amd64 arm64 x86"
fi
LICENSE="LGPL-2.1+"
diff --git a/dev-libs/libclc/libclc-0.2.0_pre20191024.ebuild b/dev-libs/libclc/libclc-0.2.0_pre20191024.ebuild
index cf5cf7c3624f..c2d93937f054 100644
--- a/dev-libs/libclc/libclc-0.2.0_pre20191024.ebuild
+++ b/dev-libs/libclc/libclc-0.2.0_pre20191024.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
inherit llvm prefix python-any-r1 toolchain-funcs
@@ -20,6 +20,8 @@ REQUIRED_USE="|| ( ${IUSE_VIDEO_CARDS} )"
BDEPEND="
|| (
+ sys-devel/clang:12
+ sys-devel/clang:11
sys-devel/clang:10
sys-devel/clang:9
sys-devel/clang:8
diff --git a/dev-libs/libevdev/Manifest b/dev-libs/libevdev/Manifest
index fff33e06310c..b2c037532aa8 100644
--- a/dev-libs/libevdev/Manifest
+++ b/dev-libs/libevdev/Manifest
@@ -1 +1,2 @@
DIST libevdev-1.9.0.tar.xz 443208 BLAKE2B 858567ec82f20d567f66d0c41bd1519ffd023a0374e346cff270a0bae0b5136a469a4fd56fcbd3d53b2a2ace6166821ec5e75c90e08eb347331e7974865ceda7 SHA512 6e7589b5776437ac23fbf65b3194fb1dd3a68a294696145060cdd97bcdeb9b04f355f2be028dc1a5efe98ef2cafca15e4f61115edf5d62591e3a8944dc95942a
+DIST libevdev-1.9.1.tar.xz 442740 BLAKE2B 8a0e6c555ffa09890556c33e346e03b878eb0dac8585164d7561b6e20e5795c39299508f761a1fa15737d0802e362ba5c9d17de89d96fb79f1bfa1afa28423ab SHA512 7d845ce2279d2e2ef12437f6218550265ea0c85e5b6c0d116aff09787b73626b338fe3084baff060085d393688b5ae3d33772689e0581684eff257af01c4c645
diff --git a/dev-libs/libevdev/libevdev-1.9.1.ebuild b/dev-libs/libevdev/libevdev-1.9.1.ebuild
new file mode 100644
index 000000000000..8f8dd07ac544
--- /dev/null
+++ b/dev-libs/libevdev/libevdev-1.9.1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+
+inherit meson multilib-minimal python-any-r1
+
+DESCRIPTION="Handler library for evdev events"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/libevdev/ https://gitlab.freedesktop.org/libevdev/libevdev"
+
+if [[ ${PV} == 9999* ]] ; then
+ EGIT_REPO_URI="https://gitlab.freedesktop.org/libevdev/libevdev.git"
+ inherit git-r3
+else
+ SRC_URI="https://www.freedesktop.org/software/libevdev/${P}.tar.xz"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="doc test"
+
+DEPEND="test? ( dev-libs/check[${MULTILIB_USEDEP}] )"
+BDEPEND="
+ ${PYTHON_DEPS}
+ doc? ( app-doc/doxygen )
+ virtual/pkgconfig
+"
+RESTRICT="!test? ( test )"
+
+multilib_src_configure() {
+ local emesonargs=(
+ $(meson_feature doc documentation)
+ $(meson_feature test tests)
+ )
+ meson_src_configure
+}
+
+multilib_src_compile() {
+ meson_src_compile
+}
+
+multilib_src_test() {
+ meson_src_test
+}
+
+multilib_src_install() {
+ meson_src_install
+}
+
+multilib_src_install_all() {
+ if use doc; then
+ local HTML_DOCS=( doc/html/. )
+ einstalldocs
+ fi
+}
diff --git a/dev-libs/libevdev/libevdev-9999.ebuild b/dev-libs/libevdev/libevdev-9999.ebuild
index 7509db80b34d..8f8dd07ac544 100644
--- a/dev-libs/libevdev/libevdev-9999.ebuild
+++ b/dev-libs/libevdev/libevdev-9999.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
inherit meson multilib-minimal python-any-r1
diff --git a/dev-libs/libinput/Manifest b/dev-libs/libinput/Manifest
index bdf5e050541b..df59275cd86f 100644
--- a/dev-libs/libinput/Manifest
+++ b/dev-libs/libinput/Manifest
@@ -1,2 +1,2 @@
-DIST libinput-1.15.5.tar.xz 582800 BLAKE2B 8575dbe6699230610e05f4c7e9e72aebb1fb765be1d305ba6d9fcf69c6efc990ec78bd0746b29921a2414df99c536c3f267b1dd1d6d98c872e360fc16572e2a4 SHA512 a0a3a325048841fc017e19d3bc5f5490605972ab9e2730dc5678bda7efb7a5b1fa6f531f3c8abd8393899ec383d8d2bcfd586eacee04fc1fbda0e02ba2af956a
DIST libinput-1.15.6.tar.xz 584184 BLAKE2B 9963e9df41cb32c40454a3dc76975315f74a2e8b2549c037868c651c2ada90f77a605048ba603a4c01d0641fc39154b578a766309f1c376c07d3bdd02dfd387c SHA512 90459e5a1f22fd42ffcbab157b461e4514c30803bcebdaced76c65c05cccfa6f259640a50497055fe7ed0b376a6979f6d1d01227ae447fe60ba88fa81142b969
+DIST libinput-1.16.0.tar.xz 593304 BLAKE2B 959b9e5720b1aa196eb45cf772e8edc800032ee0cd2db1c06537ed979cbf83eaef8c50d2f6aa194e8cf668fcfd1bcb46767a897f99679867b7d816e2567c16a8 SHA512 0c932a88f2a1d23ebef0d58c0cdbfb558e9e3d990fca15b21f5b9011bdd1bc2da81aad374fcdb8f4590f6ee2fc45e668e0583371ceb354437e585240e687aac6
diff --git a/dev-libs/libinput/libinput-1.15.5.ebuild b/dev-libs/libinput/libinput-1.16.0.ebuild
similarity index 94%
rename from dev-libs/libinput/libinput-1.15.5.ebuild
rename to dev-libs/libinput/libinput-1.16.0.ebuild
index 931b05cb869e..cfbdf1816876 100644
--- a/dev-libs/libinput/libinput-1.15.5.ebuild
+++ b/dev-libs/libinput/libinput-1.16.0.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
inherit meson python-any-r1 udev
@@ -13,7 +13,7 @@ SRC_URI="https://www.freedesktop.org/software/${PN}/${P}.tar.xz"
LICENSE="MIT"
SLOT="0/10"
[[ "$(ver_cut 3)" -gt 900 ]] || \
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
IUSE="doc input_devices_wacom test"
RESTRICT="!test? ( test )"
@@ -74,7 +74,7 @@ src_install() {
pkg_postinst() {
pkgname="dev-python/python-libevdev"
- if [[ -z "${REPLACING_VERSIONS}" ]] && ! has_version "${pkgname}"; then
+ if [[ -z "${REPLACING_VERSIONS}" ]] && ! has_version "${pkgname}" ; then
einfo "${pkgname} must be installed to use the"
einfo "libinput measure and libinput replay tools."
fi
diff --git a/dev-libs/libudfread/libudfread-1.1.0.ebuild b/dev-libs/libudfread/libudfread-1.1.0.ebuild
index 6dd66e41c5cd..6297184ebd35 100644
--- a/dev-libs/libudfread/libudfread-1.1.0.ebuild
+++ b/dev-libs/libudfread/libudfread-1.1.0.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]] ; then
inherit git-r3
else
SRC_URI="https://code.videolan.org/videolan/libudfread/-/archive/${PV}/${P}.tar.gz"
- KEYWORDS="~amd64 ~x86"
+ KEYWORDS="~amd64 ~arm64 ~x86"
fi
DESCRIPTION="Library for reading UDF from raw devices and image files"
diff --git a/dev-libs/qtkeychain/qtkeychain-0.10.0.ebuild b/dev-libs/qtkeychain/qtkeychain-0.10.0.ebuild
index 99f881d84cba..4c6ec3117e35 100644
--- a/dev-libs/qtkeychain/qtkeychain-0.10.0.ebuild
+++ b/dev-libs/qtkeychain/qtkeychain-0.10.0.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Qt API for storing passwords securely"
if [[ ${PV} != *9999* ]]; then
SRC_URI="https://github.com/frankosterfeld/qtkeychain/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="amd64 ~arm64 ~ppc64 x86"
+ KEYWORDS="amd64 arm64 ~ppc64 x86"
else
inherit git-r3
EGIT_REPO_URI="${HOMEPAGE}.git"
diff --git a/dev-lua/Manifest.gz b/dev-lua/Manifest.gz
index 9fde399870cc..bf3d08dfffad 100644
Binary files a/dev-lua/Manifest.gz and b/dev-lua/Manifest.gz differ
diff --git a/dev-lua/lgi/lgi-0.9.2.ebuild b/dev-lua/lgi/lgi-0.9.2.ebuild
index 7ea7eedc3e06..f5222a9aef6b 100644
--- a/dev-lua/lgi/lgi-0.9.2.ebuild
+++ b/dev-lua/lgi/lgi-0.9.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/pavouk/lgi/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~arm ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 arm ppc ~ppc64 ~x86"
IUSE="examples test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Dist-Zilla-Plugin-RPM/Dist-Zilla-Plugin-RPM-0.16.0.ebuild b/dev-perl/Dist-Zilla-Plugin-RPM/Dist-Zilla-Plugin-RPM-0.16.0.ebuild
new file mode 100644
index 000000000000..34667f9a569b
--- /dev/null
+++ b/dev-perl/Dist-Zilla-Plugin-RPM/Dist-Zilla-Plugin-RPM-0.16.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DIST_AUTHOR=SKYSYMBOL
+DIST_VERSION=0.016
+inherit perl-module
+
+DESCRIPTION="Build an RPM from your Dist::Zilla release"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ virtual/perl-Carp
+ dev-perl/Dist-Zilla
+ virtual/perl-File-Temp
+ dev-perl/IPC-Run
+ dev-perl/Moose
+ dev-perl/Moose-Autobox
+ dev-perl/Path-Class
+ dev-perl/Path-Tiny
+ dev-perl/Text-Template
+ dev-perl/namespace-autoclean
+ app-arch/rpm
+"
+BDEPEND="${RDEPEND}
+ virtual/perl-ExtUtils-MakeMaker
+ test? (
+ dev-perl/File-Which
+ dev-perl/Test-Differences
+ >=virtual/perl-Test-Simple-0.880.0
+ )
+"
diff --git a/dev-perl/Dist-Zilla-Plugin-RPM/Manifest b/dev-perl/Dist-Zilla-Plugin-RPM/Manifest
index fde917e57ee1..d284b9c84512 100644
--- a/dev-perl/Dist-Zilla-Plugin-RPM/Manifest
+++ b/dev-perl/Dist-Zilla-Plugin-RPM/Manifest
@@ -1 +1,2 @@
DIST Dist-Zilla-Plugin-RPM-0.015.tar.gz 14550 BLAKE2B efbc7e37f1c07520f45768dd72b88267aa0e6827a04535911f089cce662d98f65863fc186a2d705db6b290be9f3a2d679a4cf4fd7dd1f0360f27da7a81c895dc SHA512 e3369ef05d8f6b4ad5e6b2d88646ac64129ef81e9f46a95b537ab539b6540ee9d34e6a63ba719f8bebdf4a2167074e542f1b94671169c779e3163774b0300023
+DIST Dist-Zilla-Plugin-RPM-0.016.tar.gz 14436 BLAKE2B a2b23390869e5f4d61fd92fd69774e316d0f5406c685e3d0eeb33b5e57699b304957f44b3c39babea4f79d08ac1c41c1a002a3960daf03cb8cc754d6fe5b3eb3 SHA512 44b4dfabf5bb09df65092b9be8fa78ef80fa221f30cd2b30303ea44cf736e8a47a4d87d7686b47d2ff2fc6b744a0349a4ca4407a62bcc0ba7364296cc1028ba3
diff --git a/dev-perl/Dist-Zilla-Plugin-ReadmeAnyFromPod/Dist-Zilla-Plugin-ReadmeAnyFromPod-0.163.250.ebuild b/dev-perl/Dist-Zilla-Plugin-ReadmeAnyFromPod/Dist-Zilla-Plugin-ReadmeAnyFromPod-0.163.250-r1.ebuild
similarity index 100%
rename from dev-perl/Dist-Zilla-Plugin-ReadmeAnyFromPod/Dist-Zilla-Plugin-ReadmeAnyFromPod-0.163.250.ebuild
rename to dev-perl/Dist-Zilla-Plugin-ReadmeAnyFromPod/Dist-Zilla-Plugin-ReadmeAnyFromPod-0.163.250-r1.ebuild
diff --git a/dev-perl/HTML-TableParser/HTML-TableParser-0.420.0.ebuild b/dev-perl/HTML-TableParser/HTML-TableParser-0.420.0.ebuild
index bb5fb4f388a8..328fd43b5041 100644
--- a/dev-perl/HTML-TableParser/HTML-TableParser-0.420.0.ebuild
+++ b/dev-perl/HTML-TableParser/HTML-TableParser-0.420.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -11,7 +11,7 @@ DESCRIPTION="Extract data from an HTML table"
LICENSE="GPL-3+"
SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm64 x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Manifest.gz b/dev-perl/Manifest.gz
index 8bf1cd069c50..2932ef58105b 100644
Binary files a/dev-perl/Manifest.gz and b/dev-perl/Manifest.gz differ
diff --git a/dev-perl/WWW-Dict-Leo-Org/WWW-Dict-Leo-Org-2.20.0.ebuild b/dev-perl/WWW-Dict-Leo-Org/WWW-Dict-Leo-Org-2.20.0.ebuild
index 56f9175c9c1b..fa2c66cf4278 100644
--- a/dev-perl/WWW-Dict-Leo-Org/WWW-Dict-Leo-Org-2.20.0.ebuild
+++ b/dev-perl/WWW-Dict-Leo-Org/WWW-Dict-Leo-Org-2.20.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -12,7 +12,7 @@ DESCRIPTION="Commandline interface to http://dict.leo.org/"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
IUSE=""
RDEPEND="
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 71d515e752e6..c1398b3deb25 100644
Binary files a/dev-python/Manifest.gz and b/dev-python/Manifest.gz differ
diff --git a/dev-python/PyGithub/Manifest b/dev-python/PyGithub/Manifest
index fa6e76586cc6..457761c0a67e 100644
--- a/dev-python/PyGithub/Manifest
+++ b/dev-python/PyGithub/Manifest
@@ -1 +1,2 @@
DIST PyGithub-1.51.gh.tar.gz 2950990 BLAKE2B 214014b8205d954c559f2d19a38c7bc93800f40500c294397f16d55a4a027b7827910c93d98b6f5dd867bb0049ad1c9618c08ff72996f3717480ad17ce0ec64d SHA512 617b7bbc1fbd680735d5a57910ac1863cf67d9b2afc037d20fbd140a32aaa146164a76f73d76f2395aff1eee1fb13eac7a146c9cd05791b27db9a06a28d520e0
+DIST PyGithub-1.52.gh.tar.gz 3021721 BLAKE2B 399be5cd2c21e29e6da15c271442108e5391711f3f16fb3624d6068ad53c00f2e074ce45544e047fe651748203268c7262a49e47a7a358c55421c1e1917d0e30 SHA512 180d7814cef2c78daa90dac4f7f7ce37099bcfaa738612f7a5a013fd7cd1d108a1e6e1c2ea68ef188f05dcfa996beae97ba03fa0b66159b8d6845315b1be30fa
diff --git a/dev-python/PyGithub/PyGithub-1.52.ebuild b/dev-python/PyGithub/PyGithub-1.52.ebuild
new file mode 100644
index 000000000000..0a466756e898
--- /dev/null
+++ b/dev-python/PyGithub/PyGithub-1.52.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python library to access the Github API v3"
+HOMEPAGE="https://github.com/PyGithub/PyGithub/"
+# Use github since pypi is missing test data
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-python/deprecated[${PYTHON_USEDEP}]
+ dev-python/pyjwt[${PYTHON_USEDEP}]
+ >=dev-python/requests-2.14.0[${PYTHON_USEDEP}]
+ dev-python/six[${PYTHON_USEDEP}]"
+BDEPEND="
+ test? (
+ dev-python/cryptography[${PYTHON_USEDEP}]
+ >=dev-python/httpretty-0.9.6[${PYTHON_USEDEP}]
+ )"
+
+distutils_enable_tests pytest
diff --git a/dev-python/argcomplete/argcomplete-1.11.1-r1.ebuild b/dev-python/argcomplete/argcomplete-1.11.1-r1.ebuild
index 254bb7d63ec5..0a104e1b123b 100644
--- a/dev-python/argcomplete/argcomplete-1.11.1-r1.ebuild
+++ b/dev-python/argcomplete/argcomplete-1.11.1-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/authres/authres-1.2.0.ebuild b/dev-python/authres/authres-1.2.0.ebuild
index ae527433ce74..11a410532d3b 100644
--- a/dev-python/authres/authres-1.2.0.ebuild
+++ b/dev-python/authres/authres-1.2.0.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://launchpad.net/authentication-results-python
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="amd64 arm64 x86"
SLOT="0"
IUSE=""
diff --git a/dev-python/automat/automat-20.2.0.ebuild b/dev-python/automat/automat-20.2.0.ebuild
index 594383a4b329..3ca1eac96eef 100644
--- a/dev-python/automat/automat-20.2.0.ebuild
+++ b/dev-python/automat/automat-20.2.0.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{6..9} pypy3 )
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
DISTUTILS_USE_SETUPTOOLS=rdepend
inherit distutils-r1
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index 3d3ad6db5012..84b9b1b31904 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -4,3 +4,4 @@ DIST boto3-1.14.23.tar.gz 299581 BLAKE2B 57cbb3fbd9a84f334b5874ca96490cb0269bb79
DIST boto3-1.14.27.tar.gz 299871 BLAKE2B b0bca67cc43af0eb6d823ddf256e219c1137793a211c9f02fcbcba364887882496c98d1463b899c68e65127b2ddb3a4781f93237365a2fc539ba07b43714479e SHA512 3576d0ebe1167cf6ce9decd1efd9c55c5e06074303da38bee236c8f0bf1fb0ae459e88ae5719590a0e7aa02936277e5c08a35e5bf08249f50716b6147f7872a4
DIST boto3-1.14.28.tar.gz 299959 BLAKE2B 7318fd60ccd46e12f38eb14aeecfb59fd951ed9749990f2b7bfc991b2a5077d2afe93a37b28f833ec232e85cd85a454887672be3b6b72b37e696677c45c9287c SHA512 e83695d00f2d08ad129be24f2a387fcd7181f727bd4c64df1d3d8a14aff280388262032b60f7a01829ffcaeb639eeebc9e1e85a786f3228e1d28ed4d15166ca7
DIST boto3-1.14.31.tar.gz 300720 BLAKE2B 9dbd002e299c629f28037572c615a00612c80773006c344797d0ad56c81c240b56bfc56e8ffe52e3b404c77a56318532aadfa2d008c254e70f7bfa91e40b7e1a SHA512 e3fe0041bbdc67affcf5d5272c26aa14ef0fa546af2efb99187311bee23531181ab1f1ebc69f2c3ed8250140642f4402334ebbc9acbf422641fa6abed5d5815f
+DIST boto3-1.14.34.tar.gz 300890 BLAKE2B 0f8883ee4edc100207be68b93a5510fcb807adb860c0292cab9a6c2eaab238735f3ed01608ab7763f27d4eacb23e57beb289511ec83770ac91f33e044e5e9425 SHA512 cfe84bf5a1ea99905dbddcc63665bcd8e310cd0fdc37b1990c722ae6ca91e7c2adb17a8305eed19df0a6761f1c0c0c62cb935bd37d2360d84ea746753117a16b
diff --git a/dev-python/boto3/boto3-1.14.34.ebuild b/dev-python/boto3/boto3-1.14.34.ebuild
new file mode 100644
index 000000000000..74bb826bd085
--- /dev/null
+++ b/dev-python/boto3/boto3-1.14.34.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6..9} )
+DISTUTILS_USE_SETUPTOOLS=bdepend
+inherit distutils-r1
+
+DESCRIPTION="The AWS SDK for Python"
+HOMEPAGE="https://github.com/boto/boto3"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+ EGIT_REPO_URI="https://github.com/boto/boto3"
+ inherit git-r3
+ BOTOCORE_PV=${PV}
+else
+ SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+ # botocore is x.(y+3).z
+ BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
+fi
+
+RDEPEND="
+ >=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+ >=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+ >=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+ test? (
+ dev-python/mock[${PYTHON_USEDEP}]
+ )
+"
+
+distutils_enable_sphinx docs/source \
+ 'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+python_prepare_all() {
+ # don't lock versions to narrow ranges
+ sed -e '/botocore/ d' \
+ -e '/jmespath/ d' \
+ -e '/s3transfer/ d' \
+ -i setup.py || die
+
+ # prevent an infinite loop
+ rm tests/functional/docs/test_smoke.py || die
+
+ distutils-r1_python_prepare_all
+}
+
+python_test() {
+ nosetests -v tests/unit/ tests/functional/ || die "test failed under ${EPYTHON}"
+}
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index 71b9e1769bf4..c7bd87499cd0 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -4,3 +4,4 @@ DIST botocore-1.17.23.tar.gz 6564852 BLAKE2B cc1da91f4a45964fe684b015de9db253059
DIST botocore-1.17.27.tar.gz 6637309 BLAKE2B 8c3d8d27b13c55c11b4934e0af35bb0a01c67e0c30d33ce54710d3e3c967101c5d9258fc2317f86c9f8271044e977015b185015aafd3af748fe581f3120ea32d SHA512 9dc3341b6de7801da13f71730bcb2bf9c4295618303a1c98973cabb2aef947b5756352f3a9939b8fbe04a92c3a7cde6ed88f55c982f7dc412f7dff898bc75bc2
DIST botocore-1.17.28.tar.gz 6647521 BLAKE2B e9da32dd9202bc1ad621003bb6196873380f0015553cd906465382d21d30b7b83313e6be4e8d3d8abf4f6472180319a98677a3a245ad69bf6bde5d8e08264577 SHA512 5388518dc0bf598a3ea848df38454c49692abaf7ebe23e0ab0b1416139a4363b712260591e644c415ea3ea4cbac105011fef4d565b95fd3045fe6e4d3c7318a8
DIST botocore-1.17.31.tar.gz 6665851 BLAKE2B dbc89d1216f9fda89c6185baccfdf2878c265d8761e4ad1349a45d334f9a4d5b79ad1ce06a19a7a706b75be1a6d7f2a7bf5bc33d8ffbe7ad8a016472edf0432f SHA512 ab1921fae887846d1c224d624e8d5dd888ab9c0c90a415ac97e5ad2f7563131b199e8870553e7f3dd6f5ff4c7901aa04bfa99160aca4e9da8ef3096cfd922ec9
+DIST botocore-1.17.34.tar.gz 6683317 BLAKE2B a3229c09f7c21a95140e22d9902161b705bccf1a9559b6ba2bf45e5e79f2f2af7e86fcbae3654405faf73e4eb6a8f86a88c407aafb411c646d54aed72af8b162 SHA512 f5fe7803c4e083de7515f7bd58f84709ebaa8007d707273c6bf9fac1391b7d5ab7e8771725db59b9b6b5dd60e71f34140ae5435dec18ffc364c1779172de9bab
diff --git a/dev-python/botocore/botocore-1.17.34.ebuild b/dev-python/botocore/botocore-1.17.34.ebuild
new file mode 100644
index 000000000000..6b14dce9712f
--- /dev/null
+++ b/dev-python/botocore/botocore-1.17.34.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Low-level, data-driven core of boto 3"
+HOMEPAGE="https://github.com/boto/botocore"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+ EGIT_REPO_URI="https://github.com/boto/botocore"
+ inherit git-r3
+else
+ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+ KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+ dev-python/six[${PYTHON_USEDEP}]
+ dev-python/docutils[${PYTHON_USEDEP}]
+ dev-python/jmespath[${PYTHON_USEDEP}]
+ dev-python/python-dateutil[${PYTHON_USEDEP}]
+ dev-python/urllib3[${PYTHON_USEDEP}]
+"
+BDEPEND="
+ test? (
+ dev-python/mock[${PYTHON_USEDEP}]
+ dev-python/jsonschema[${PYTHON_USEDEP}]
+ )
+"
+
+PATCHES=(
+ "${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
+ "${FILESDIR}/botocore-1.16.7-unlock-deps.patch"
+)
+
+distutils_enable_sphinx docs/source \
+ 'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+src_prepare() {
+ # py3.9
+ find -name '*.py' -exec \
+ sed -i -e 's:cElementTree:ElementTree:' {} + || die
+ # very unstable
+ sed -i -e 's:test_stress_test_token_bucket:_&:' \
+ tests/functional/retries/test_bucket.py || die
+ distutils-r1_src_prepare
+}
+
+python_test() {
+ # note: suites need to be run separately as one of the unit tests
+ # seems to be leaking mocks and breaking a few functional tests
+ nosetests -v tests/unit ||
+ die "unit tests failed under ${EPYTHON}"
+ nosetests -v tests/functional ||
+ die "functional tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/certifi/Manifest b/dev-python/certifi/Manifest
index 283e3260e864..dd748ac592ee 100644
--- a/dev-python/certifi/Manifest
+++ b/dev-python/certifi/Manifest
@@ -1 +1 @@
-DIST certifi-shim-9999.tar.gz 3762 BLAKE2B 3ea85314e37a989d4894ea5fc89fb138e06c7912277f90466c6edb121c39f33b031bcc08346c4766c99fb193a2d53801aa1e8ef30cfede9a7e8247c7e443faef SHA512 ca2844f1680a019dbb5a440141d8ebaddd7c78ce47a23a48a50d2d857d012f90d74d4200168964787e31f16b1e9d7c981c033ff99f1e3ea1fa73cbbbf255edbd
+DIST certifi-shim-10001.tar.gz 4061 BLAKE2B 183c573b958921877b14e38e9e26842e8a4f1c1617979a30b65ef1e2bbf001e5ff0aab830e4399906a7d21fb3c71ac12b1e757e4d283aae16cced8e7de7c2a1d SHA512 93beea61e579b2b414bd37c63eba49365e0a1a62304e0c7ac920bedaf5d72cb095a4a46b2240b3c2e6ee31e5b91cd520ae8348b6a8033212d11bbca31db6750c
diff --git a/dev-python/certifi/certifi-9999.ebuild b/dev-python/certifi/certifi-10001.ebuild
similarity index 93%
rename from dev-python/certifi/certifi-9999.ebuild
rename to dev-python/certifi/certifi-10001.ebuild
index 4a299b0c67b7..11944fbf8606 100644
--- a/dev-python/certifi/certifi-9999.ebuild
+++ b/dev-python/certifi/certifi-10001.ebuild
@@ -3,6 +3,7 @@
EAPI=7
+DISTUTILS_USE_SETUPTOOLS=no
PYTHON_COMPAT=( python2_7 python3_{6..9} pypy3 )
inherit distutils-r1
@@ -23,6 +24,8 @@ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sp
RDEPEND="app-misc/ca-certificates"
+distutils_enable_tests unittest
+
src_prepare() {
sed -i -e "s^/etc^${EPREFIX}/etc^" certifi/core.py || die
distutils-r1_src_prepare
diff --git a/dev-python/cliff/Manifest b/dev-python/cliff/Manifest
index 8074332d0b87..8c13072f3abf 100644
--- a/dev-python/cliff/Manifest
+++ b/dev-python/cliff/Manifest
@@ -1 +1,2 @@
DIST cliff-3.3.0.tar.gz 79680 BLAKE2B 844910bc588fb80ee6645735c3be2518fb00fb255eba67d7cf8a572ee9153cc5c1af399296782254d1d94aab89dd14a7107174b5c580cd842eddd62f4aeae155 SHA512 644dc14817e18dbabe8a33bd48545b27f5053f3b2c5be386c7752fe0a89d3de02aa70f6a5d7b0dcc32fb26f73773c744ba17e916c1186d93b8609caee5f08d6c
+DIST cliff-3.4.0.tar.gz 78990 BLAKE2B d7d8209e2fe24614cde6d3e113eb0dbbba981addef045fe318143e71f9a240188c0fb74e831d868b31b6dafb4289f7beabfbb5fe1dade1df196f670c53a55549 SHA512 d625588f4eed0aeee549b4a21e604f1cb886b8c10a12df7c546a5292223ec5bf9067352b4d326d5710673dab56eec47e2fb46c9c5d5df6e9fbf026d030bcde1c
diff --git a/dev-python/cliff/cliff-3.4.0.ebuild b/dev-python/cliff/cliff-3.4.0.ebuild
new file mode 100644
index 000000000000..c64de385c651
--- /dev/null
+++ b/dev-python/cliff/cliff-3.4.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Command Line Interface Formulation Framework"
+HOMEPAGE="https://github.com/openstack/cliff"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+ >=dev-python/cmd2-0.8.0[${PYTHON_USEDEP}]
+ =dev-python/pyparsing-2.1.0[${PYTHON_USEDEP}]
+ >=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+ >=dev-python/stevedore-2.0.1[${PYTHON_USEDEP}]
+ >=dev-python/pyyaml-3.12.0[${PYTHON_USEDEP}]
+"
+BDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+ !~dev-python/pbr-2.1.0
+ test? (
+ dev-python/sphinx[${PYTHON_USEDEP}]
+ >=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
+ >=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+ )
+"
+
+distutils_enable_tests unittest
diff --git a/dev-python/configobj/Manifest b/dev-python/configobj/Manifest
index 09a7a68b3487..a606bd2e893c 100644
--- a/dev-python/configobj/Manifest
+++ b/dev-python/configobj/Manifest
@@ -1 +1,2 @@
+DIST configobj-5.0.6.gh.tar.gz 143664 BLAKE2B b554d0aec903aecb55387a0164cd6f8d442e9fc1ab231ce7f7123e7a5041e07a86f5f7bf70492ca93fcdc1bd3caa5b855c427f060842e3b4a7524afbcc417a76 SHA512 326eb86e362f281ebf07abcb1cf7616abb270c482eafe842371cda8708245ca5e8262f1644b7164664ecc10e9004ed061c9de18cd233a657d4697dbc3ba3c59d
DIST configobj-5.0.6.tar.gz 33248 BLAKE2B b58a22fdf247f1c3022108e24abb4de55620ce75f6aeb5f269f008a5668e07b8c1d0c49e4059d7f4c4c361d269ead39c3784377635c7718f92c2381e69c56cb5 SHA512 f253fdd0bc3fcd37f56c9ceb28f5c8c739b0861e099b07a3929645907c97b2261f0529850a95c1a42507846f72d88a0992fcd1e1d6fa8654dc713d120f769963
diff --git a/dev-python/configobj/configobj-5.0.6-r1.ebuild b/dev-python/configobj/configobj-5.0.6-r1.ebuild
new file mode 100644
index 000000000000..c530f28451b7
--- /dev/null
+++ b/dev-python/configobj/configobj-5.0.6-r1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{6,7,8,9} )
+DISTUTILS_USE_SETUPTOOLS=no
+
+inherit distutils-r1
+
+DESCRIPTION="Simple config file reader and writer"
+HOMEPAGE="http://www.voidspace.org.uk/python/configobj.html https://pypi.org/project/configobj/"
+SRC_URI="https://github.com/DiffSK/${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
+
+PATCHES=( "${FILESDIR}/${P}-fix-py2-tests.patch" )
+
+distutils_enable_tests pytest
diff --git a/dev-python/configobj/files/configobj-5.0.6-fix-py2-tests.patch b/dev-python/configobj/files/configobj-5.0.6-fix-py2-tests.patch
new file mode 100644
index 000000000000..49576b4f43e7
--- /dev/null
+++ b/dev-python/configobj/files/configobj-5.0.6-fix-py2-tests.patch
@@ -0,0 +1,40 @@
+diff --git a/tests/test_validate.py b/tests/test_validate.py
+index bffb0dc..c7d57d3 100644
+--- a/tests/test_validate.py
++++ b/tests/test_validate.py
+@@ -2,7 +2,7 @@
+
+ from configobj import ConfigObj
+ import pytest
+-from validate import Validator, VdtValueTooSmallError
++from validate import Validator, VdtValueTooSmallError, dottedQuadToNum
+
+
+ class TestBasic(object):
+@@ -161,3 +161,26 @@ class TestBasic(object):
+ 'test3': 3,
+ 'test4': 6.0
+ }}}
++
++
++class TestDottedQuadToNum(object):
++
++ def test_stripped(self):
++ assert dottedQuadToNum('192.0.2.0') == 3221225984
++ assert dottedQuadToNum('192.0.2.1 ') == 3221225985
++ assert dottedQuadToNum(' 192.0.2.2') == 3221225986
++ assert dottedQuadToNum('\t\t192.0.2.3\n') == 3221225987
++ with pytest.raises(ValueError) as excinfo:
++ dottedQuadToNum('192. 0. 2. 4')
++ assert str(excinfo.value) == 'Not a good dotted-quad IP: 192. 0. 2. 4'
++
++ def test_boundaries(self):
++ assert dottedQuadToNum('0.0.0.0') == 0
++ assert dottedQuadToNum('255.255.255.255') == 4294967295
++ with pytest.raises(ValueError) as excinfo:
++ dottedQuadToNum('255.255.255.256')
++ assert str(excinfo.value) == (
++ 'Not a good dotted-quad IP: 255.255.255.256')
++ with pytest.raises(ValueError) as excinfo:
++ dottedQuadToNum('-1')
++ assert str(excinfo.value) == 'Not a good dotted-quad IP: -1'
diff --git a/dev-python/constantly/constantly-15.1.0-r1.ebuild b/dev-python/constantly/constantly-15.1.0-r1.ebuild
index b0d5fedc7464..5d0b3f160999 100644
--- a/dev-python/constantly/constantly-15.1.0-r1.ebuild
+++ b/dev-python/constantly/constantly-15.1.0-r1.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{6..9} )
+PYTHON_COMPAT=( python3_{6..9} )
DISTUTILS_USE_SETUPTOOLS=bdepend
inherit distutils-r1
diff --git a/dev-python/csv23/csv23-0.3.2.ebuild b/dev-python/csv23/csv23-0.3.2.ebuild
index 1ee6b7d9aa10..ea2e4c1090e0 100644
--- a/dev-python/csv23/csv23-0.3.2.ebuild
+++ b/dev-python/csv23/csv23-0.3.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/xflr6/csv23/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
# note: upstream really uses mock at runtime
RDEPEND="
diff --git a/dev-python/dask/dask-2.22.0.ebuild b/dev-python/dask/dask-2.22.0.ebuild
index 01da771a26e1..206edb645a45 100644
--- a/dev-python/dask/dask-2.22.0.ebuild
+++ b/dev-python/dask/dask-2.22.0.ebuild
@@ -41,8 +41,6 @@ BDEPEND="
distutils_enable_tests pytest
src_prepare() {
- # don't die on warnings or xpass
- sed -i -e '/error:::/d' -e '/xfail_strict/d' setup.cfg || die
# flaky
sed -e 's:test_time_rolling_methods:_&:' \
-i dask/dataframe/tests/test_rolling.py || die
diff --git a/dev-python/django/Manifest b/dev-python/django/Manifest
index d23d2e337298..22d114b9f615 100644
--- a/dev-python/django/Manifest
+++ b/dev-python/django/Manifest
@@ -1,4 +1,7 @@
DIST Django-2.2.13.tar.gz 8879757 BLAKE2B 4a7986805c6a3674d47aa82b97f31ae63968dd7c0f12db672207cd1d97076acb681fe44e730147122911684b36d7f1e9d5ea18c054d4c40c68b460300fd9294b SHA512 6daf3486d2f19eb159193df77a7525e5173ba5889ad5c587a6ec6bbf02c4ea94fa90b9a30a5310932fc9353a22c413208ab724c05740f844eccfe610da3ca68a
DIST Django-2.2.14.tar.gz 9022051 BLAKE2B 397f1de35f645da9964581d494d933ce2327915315049997aaed238f27214e4fead8c50e779052eafb3d237e065ef47f2d3f151552f712b6348ed23b75d25e52 SHA512 48ad065df161300920abe0c28c3f79cebe536de00fe60c8a7633caee149e0632aa564a848172bad0f254f2a98194cb625a5c169e51a89f3cab95c1213cfe485d
+DIST Django-2.2.15.tar.gz 9023679 BLAKE2B 9619d0ac45a8256a1e605f447b89df6266d67d98969baffd41a9184165e14d57d4edfb898f64a6633cc0f4c23b24a35b16cb446c920d8baf58f771c69d8697ee SHA512 bb91e5b621be54570f8c7676f820ff93fbf0546dea79e035eebd60b70c5c872b0de65395a4606f07af7b9c77de2cf218aaef8ff489fcfabaf5c9b75d28e42dc2
DIST Django-3.0.7.tar.gz 8947502 BLAKE2B c26752f41f04f23ea1db9863d0919c17ed27b75133e22cc342e453e40077f05f6458f8edd290bfdcf828a181e38d89a1b4faeaa9cb44176ff0f7d67910d6b9df SHA512 566a78c3686baaea2ea8f2db2c1762a78ec5e5ae44f0be43f49c83899c2a0a9d1b2297a05ce8f4bc6bc580c494dde66bb2be47a8269cce3e1b007fedd857e5d3
DIST Django-3.0.8.tar.gz 9080731 BLAKE2B b3276527c9c5eba18b380204c498ebd5724e5211640ead9e05284eb013f907ce6799125b29e2030bc37ecd5a1022e6eb3f193eca5e2c6520adef630d6d2114a9 SHA512 92d169fb37883355f1898fc13b54b6732ec14d71f77e4b91db30dd9bfb5df8b34c1c9566af6ddc37e00a9e3eadd38b6a51ff604a4da4285167f66b55215be301
+DIST Django-3.0.9.tar.gz 9081099 BLAKE2B 502f9cf1fafff50d92c771e845319f5406722cdb8ca0570688bb96e7fbc765cee319325b0340b722afeb0a304316d30408ca92154623ad4934877cbdc8ee9259 SHA512 1244b9cff26b9e8d9a3d611e0a39981bd1a46d68fa734a58ba12fd51eeb023fb053605372d7b41b51027e4e609f1870d25f7e0584d0449ceeb8d877f674e49b4
+DIST Django-3.1.tar.gz 9382872 BLAKE2B 31f2a45cf31f87401ac1834be81cf207ca48f720bf6d6885b774fb51f42616be1346b8ab71d6c0b605d99bc7422f27b21665729b78e00c9cc0ba9cf3e4d788f3 SHA512 31f0821966f4ebc6b2a719b69f1137a32a7228414221e8938a66c9b940465c008761bd380ba9ea603e3693d38c233d6f23afe0cbe5647eb2478844ce2d0e7fd4
diff --git a/dev-python/django/django-2.2.13.ebuild b/dev-python/django/django-2.2.13.ebuild
index 5b85d6f488d8..734a55d6bdf3 100644
--- a/dev-python/django/django-2.2.13.ebuild
+++ b/dev-python/django/django-2.2.13.ebuild
@@ -31,10 +31,10 @@ RDEPEND="
dev-python/pytz[${PYTHON_USEDEP}]
dev-python/sqlparse[${PYTHON_USEDEP}]"
BDEPEND="
- dev-python/setuptools[${PYTHON_USEDEP}]
doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
test? (
$(python_gen_impl_dep sqlite)
+ ${RDEPEND}
dev-python/docutils[${PYTHON_USEDEP}]
dev-python/jinja[${PYTHON_USEDEP}]
dev-python/numpy[${PYTHON_USEDEP}]
diff --git a/dev-python/django/django-2.2.14.ebuild b/dev-python/django/django-2.2.14.ebuild
index f2f8b34c1441..2d48305066b2 100644
--- a/dev-python/django/django-2.2.14.ebuild
+++ b/dev-python/django/django-2.2.14.ebuild
@@ -31,10 +31,10 @@ RDEPEND="
dev-python/pytz[${PYTHON_USEDEP}]
>=dev-python/sqlparse-0.2.2[${PYTHON_USEDEP}]"
BDEPEND="
- dev-python/setuptools[${PYTHON_USEDEP}]
doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
test? (
$(python_gen_impl_dep sqlite)
+ ${RDEPEND}
dev-python/docutils[${PYTHON_USEDEP}]
dev-python/jinja[${PYTHON_USEDEP}]
dev-python/numpy[${PYTHON_USEDEP}]
diff --git a/dev-python/django/django-2.2.15.ebuild b/dev-python/django/django-2.2.15.ebuild
new file mode 100644
index 000000000000..2d48305066b2
--- /dev/null
+++ b/dev-python/django/django-2.2.15.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{6..8} )
+PYTHON_REQ_USE='sqlite?,threads(+)'
+
+inherit bash-completion-r1 distutils-r1 eutils
+
+MY_PN="Django"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="High-level Python web framework"
+HOMEPAGE="https://www.djangoproject.com/ https://pypi.org/project/Django/"
+SRC_URI="https://www.djangoproject.com/m/releases/$(ver_cut 1-2)/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="BSD"
+# admin fonts: Roboto (media-fonts/roboto)
+LICENSE+=" Apache-2.0"
+# admin icons, jquery, xregexp.js
+LICENSE+=" MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="doc sqlite test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ dev-python/pytz[${PYTHON_USEDEP}]
+ >=dev-python/sqlparse-0.2.2[${PYTHON_USEDEP}]"
+BDEPEND="
+ doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+ test? (
+ $(python_gen_impl_dep sqlite)
+ ${RDEPEND}
+ dev-python/docutils[${PYTHON_USEDEP}]
+ dev-python/jinja[${PYTHON_USEDEP}]
+ dev-python/numpy[${PYTHON_USEDEP}]
+ dev-python/pillow[webp,${PYTHON_USEDEP}]
+ dev-python/pyyaml[${PYTHON_USEDEP}]
+ dev-python/selenium[${PYTHON_USEDEP}]
+ dev-python/tblib[${PYTHON_USEDEP}]
+ )"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.0.7-bashcomp.patch
+)
+
+distutils_enable_sphinx docs --no-autodoc
+
+python_test() {
+ # Tests have non-standard assumptions about PYTHONPATH,
+ # and don't work with ${BUILD_DIR}/lib.
+ PYTHONPATH=. "${EPYTHON}" tests/runtests.py --settings=test_sqlite -v2 ||
+ die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+ newbashcomp extras/django_bash_completion ${PN}-admin
+ bashcomp_alias ${PN}-admin django-admin.py
+
+ distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+ elog "Additional Backend support can be enabled via"
+ optfeature "MySQL backend support" dev-python/mysqlclient
+ optfeature "PostgreSQL backend support" dev-python/psycopg:2
+ echo ""
+ elog "Other features can be enhanced by"
+ optfeature "GEO Django" "sci-libs/gdal[geos]"
+ optfeature "Memcached support" dev-python/pylibmc dev-python/python-memcached
+ optfeature "ImageField Support" dev-python/pillow
+ optfeature "Password encryption" dev-python/bcrypt
+ optfeature "High-level abstractions for Django forms" dev-python/django-formtools
+}
diff --git a/dev-python/django/django-3.0.7.ebuild b/dev-python/django/django-3.0.7.ebuild
index 7f323539c127..5bc565ca8f8a 100644
--- a/dev-python/django/django-3.0.7.ebuild
+++ b/dev-python/django/django-3.0.7.ebuild
@@ -32,10 +32,10 @@ RDEPEND="
dev-python/pytz[${PYTHON_USEDEP}]
>=dev-python/sqlparse-0.2.2[${PYTHON_USEDEP}]"
BDEPEND="
- dev-python/setuptools[${PYTHON_USEDEP}]
doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
test? (
$(python_gen_impl_dep sqlite)
+ ${RDEPEND}
dev-python/docutils[${PYTHON_USEDEP}]
dev-python/jinja[${PYTHON_USEDEP}]
dev-python/numpy[${PYTHON_USEDEP}]
diff --git a/dev-python/django/django-3.0.8.ebuild b/dev-python/django/django-3.0.8.ebuild
index fbc688b75cbc..b48404f115e9 100644
--- a/dev-python/django/django-3.0.8.ebuild
+++ b/dev-python/django/django-3.0.8.ebuild
@@ -32,10 +32,10 @@ RDEPEND="
dev-python/pytz[${PYTHON_USEDEP}]
>=dev-python/sqlparse-0.2.2[${PYTHON_USEDEP}]"
BDEPEND="
- dev-python/setuptools[${PYTHON_USEDEP}]
doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
test? (
$(python_gen_impl_dep sqlite)
+ ${RDEPEND}
dev-python/docutils[${PYTHON_USEDEP}]
dev-python/jinja[${PYTHON_USEDEP}]
dev-python/numpy[${PYTHON_USEDEP}]
diff --git a/dev-python/django/django-3.0.9.ebuild b/dev-python/django/django-3.0.9.ebuild
new file mode 100644
index 000000000000..b48404f115e9
--- /dev/null
+++ b/dev-python/django/django-3.0.9.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{6..9} )
+PYTHON_REQ_USE='sqlite?,threads(+)'
+
+inherit bash-completion-r1 distutils-r1 eutils
+
+MY_PN="Django"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="High-level Python web framework"
+HOMEPAGE="https://www.djangoproject.com/ https://pypi.org/project/Django/"
+SRC_URI="https://www.djangoproject.com/m/releases/$(ver_cut 1-2)/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="BSD"
+# admin fonts: Roboto (media-fonts/roboto)
+LICENSE+=" Apache-2.0"
+# admin icons, jquery, xregexp.js
+LICENSE+=" MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="doc sqlite test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ dev-python/asgiref[${PYTHON_USEDEP}]
+ dev-python/pytz[${PYTHON_USEDEP}]
+ >=dev-python/sqlparse-0.2.2[${PYTHON_USEDEP}]"
+BDEPEND="
+ doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+ test? (
+ $(python_gen_impl_dep sqlite)
+ ${RDEPEND}
+ dev-python/docutils[${PYTHON_USEDEP}]
+ dev-python/jinja[${PYTHON_USEDEP}]
+ dev-python/numpy[${PYTHON_USEDEP}]
+ dev-python/pillow[webp,${PYTHON_USEDEP}]
+ dev-python/pyyaml[${PYTHON_USEDEP}]
+ dev-python/selenium[${PYTHON_USEDEP}]
+ dev-python/tblib[${PYTHON_USEDEP}]
+ )"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-3.0.6-bashcomp.patch
+)
+
+distutils_enable_sphinx docs --no-autodoc
+
+python_test() {
+ # Tests have non-standard assumptions about PYTHONPATH,
+ # and don't work with ${BUILD_DIR}/lib.
+ PYTHONPATH=. "${EPYTHON}" tests/runtests.py --settings=test_sqlite -v2 ||
+ die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+ newbashcomp extras/django_bash_completion ${PN}-admin
+ bashcomp_alias ${PN}-admin django-admin.py
+
+ distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+ elog "Additional Backend support can be enabled via"
+ optfeature "MySQL backend support" dev-python/mysqlclient
+ optfeature "PostgreSQL backend support" dev-python/psycopg:2
+ echo ""
+ elog "Other features can be enhanced by"
+ optfeature "GEO Django" "sci-libs/gdal[geos]"
+ optfeature "Memcached support" dev-python/pylibmc dev-python/python-memcached
+ optfeature "ImageField Support" dev-python/pillow
+ optfeature "Password encryption" dev-python/bcrypt
+ optfeature "High-level abstractions for Django forms" dev-python/django-formtools
+}
diff --git a/dev-python/django/django-3.1.ebuild b/dev-python/django/django-3.1.ebuild
new file mode 100644
index 000000000000..04d8f1897c18
--- /dev/null
+++ b/dev-python/django/django-3.1.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{6..9} )
+PYTHON_REQ_USE='sqlite?,threads(+)'
+
+inherit bash-completion-r1 distutils-r1 eutils
+
+MY_PN="Django"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="High-level Python web framework"
+HOMEPAGE="https://www.djangoproject.com/ https://pypi.org/project/Django/"
+SRC_URI="https://www.djangoproject.com/m/releases/$(ver_cut 1-2)/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="BSD"
+# admin fonts: Roboto (media-fonts/roboto)
+LICENSE+=" Apache-2.0"
+# admin icons, jquery, xregexp.js
+LICENSE+=" MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="doc sqlite test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ dev-python/asgiref[${PYTHON_USEDEP}]
+ dev-python/pytz[${PYTHON_USEDEP}]
+ >=dev-python/sqlparse-0.2.2[${PYTHON_USEDEP}]"
+BDEPEND="
+ doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+ test? (
+ $(python_gen_impl_dep sqlite)
+ ${RDEPEND}
+ dev-python/docutils[${PYTHON_USEDEP}]
+ dev-python/jinja[${PYTHON_USEDEP}]
+ dev-python/numpy[${PYTHON_USEDEP}]
+ dev-python/pillow[webp,${PYTHON_USEDEP}]
+ dev-python/pyyaml[${PYTHON_USEDEP}]
+ dev-python/selenium[${PYTHON_USEDEP}]
+ dev-python/tblib[${PYTHON_USEDEP}]
+ )"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-3.1-bashcomp.patch
+)
+
+distutils_enable_sphinx docs --no-autodoc
+
+python_test() {
+ # Tests have non-standard assumptions about PYTHONPATH,
+ # and don't work with ${BUILD_DIR}/lib.
+ PYTHONPATH=. "${EPYTHON}" tests/runtests.py --settings=test_sqlite -v2 ||
+ die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+ newbashcomp extras/django_bash_completion ${PN}-admin
+ bashcomp_alias ${PN}-admin django-admin.py
+
+ distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+ elog "Additional Backend support can be enabled via"
+ optfeature "MySQL backend support" dev-python/mysqlclient
+ optfeature "PostgreSQL backend support" dev-python/psycopg:2
+ echo ""
+ elog "Other features can be enhanced by"
+ optfeature "GEO Django" "sci-libs/gdal[geos]"
+ optfeature "Memcached support" dev-python/pylibmc dev-python/python-memcached
+ optfeature "ImageField Support" dev-python/pillow
+ optfeature "Password encryption" dev-python/bcrypt
+ optfeature "High-level abstractions for Django forms" dev-python/django-formtools
+}
diff --git a/dev-python/django/files/django-3.1-bashcomp.patch b/dev-python/django/files/django-3.1-bashcomp.patch
new file mode 100644
index 000000000000..1652842aaa38
--- /dev/null
+++ b/dev-python/django/files/django-3.1-bashcomp.patch
@@ -0,0 +1,56 @@
+From e0a8c0663debeb222bf78b97678f60929313b60a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?=
+Date: Wed, 6 May 2020 07:24:05 +0200
+Subject: [PATCH] Remove completions unsuitable for autoloading
+
+The override of 'python*' completions, as well as the attempt
+to './manage.py' completion are not going to work with autoloader.
+Strip them.
+---
+ extras/django_bash_completion | 33 +--------------------------------
+ 1 file changed, 1 insertion(+), 32 deletions(-)
+
+diff --git a/extras/django_bash_completion b/extras/django_bash_completion
+index fa77d59aff..dfeb439a2e 100755
+--- a/extras/django_bash_completion
++++ b/extras/django_bash_completion
+@@ -37,35 +37,4 @@ _django_completion()
+ DJANGO_AUTO_COMPLETE=1 $1 ) )
+ }
+ # When the django-admin.py deprecation ends, remove django-admin.py.
+-complete -F _django_completion -o default django-admin.py manage.py django-admin
+-
+-_python_django_completion()
+-{
+- if [[ ${COMP_CWORD} -ge 2 ]]; then
+- local PYTHON_EXE=${COMP_WORDS[0]##*/}
+- if echo "$PYTHON_EXE" | grep -qE "python([3-9]\.[0-9])?"; then
+- local PYTHON_SCRIPT=${COMP_WORDS[1]##*/}
+- if echo "$PYTHON_SCRIPT" | grep -qE "manage\.py|django-admin(\.py)?"; then
+- COMPREPLY=( $( COMP_WORDS=( "${COMP_WORDS[*]:1}" )
+- COMP_CWORD=$(( COMP_CWORD-1 ))
+- DJANGO_AUTO_COMPLETE=1 ${COMP_WORDS[*]} ) )
+- fi
+- fi
+- fi
+-}
+-
+-# Support for multiple interpreters.
+-unset pythons
+-if command -v whereis &>/dev/null; then
+- python_interpreters=$(whereis python | cut -d " " -f 2-)
+- for python in $python_interpreters; do
+- [[ $python != *-config ]] && pythons="${pythons} ${python##*/}"
+- done
+- unset python_interpreters
+- pythons=$(echo "$pythons" | tr " " "\n" | sort -u | tr "\n" " ")
+-else
+- pythons=python
+-fi
+-
+-complete -F _python_django_completion -o default $pythons
+-unset pythons
++complete -F _django_completion -o default django-admin.py django-admin
+--
+2.28.0
+
diff --git a/dev-python/dkimpy/dkimpy-1.0.4.ebuild b/dev-python/dkimpy/dkimpy-1.0.4.ebuild
index 459673c351c6..edf55b0d7120 100644
--- a/dev-python/dkimpy/dkimpy-1.0.4.ebuild
+++ b/dev-python/dkimpy/dkimpy-1.0.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 arm64 ~x86"
IUSE=""
RDEPEND="
diff --git a/dev-python/dogpile-cache/Manifest b/dev-python/dogpile-cache/Manifest
index 00c8f21f7d02..3dc3c5352155 100644
--- a/dev-python/dogpile-cache/Manifest
+++ b/dev-python/dogpile-cache/Manifest
@@ -1 +1,2 @@
DIST dogpile.cache-0.9.1.tar.gz 329015 BLAKE2B 23a33ccf024153e39bdccebefc33c866990733432abd2bdd715a0f180f0059a2ff8315024d59d3ad9c79a01561fda3a802a867d359961d7655bdf790556c7a2f SHA512 7d84325dd7ec2d85027472f07cddd51f495b75dc9dbbcbf26bad7aaabfee8c2da99e0c247851282b228528a87e54d98e04d8451a3ca3a571e84a4a2bb33e72f2
+DIST dogpile.cache-1.0.1.tar.gz 339926 BLAKE2B bb6bf3c4908920bdbf4b5b2f23f1bae2f201eb0ee2e05e7e403f732f244aede94c01acc337c519b41157ac0090770694a7794c3530b001455f046d32db1351d1 SHA512 bd50ea84d8a8b3573d5fbd8953110180fc91d703383f7574a40731cf7e0bb6ceb9165ef93e5598f14d5509d39791c05e9e8607014dfad417fa826502c0240902
diff --git a/dev-python/dogpile-cache/dogpile-cache-1.0.1.ebuild b/dev-python/dogpile-cache/dogpile-cache-1.0.1.ebuild
new file mode 100644
index 000000000000..05b79bc35d57
--- /dev/null
+++ b/dev-python/dogpile-cache/dogpile-cache-1.0.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="A locking API for expiring values while a single thread generates a new value."
+HOMEPAGE="https://github.com/sqlalchemy/dogpile.cache"
+SRC_URI="mirror://pypi/${PN:0:1}/dogpile.cache/dogpile.cache-${PV}.tar.gz"
+S="${WORKDIR}/dogpile.cache-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+ >=dev-python/decorator-4.0.0[${PYTHON_USEDEP}]
+ >=dev-python/stevedore-3.0.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+ test? (
+ dev-python/mock[${PYTHON_USEDEP}]
+ dev-python/mako[${PYTHON_USEDEP}]
+ )
+"
+
+distutils_enable_tests pytest
+
+PATCHES=(
+ "${FILESDIR}"/${P}-install-tests.patch
+)
diff --git a/dev-python/dogpile-cache/files/dogpile-cache-1.0.1-install-tests.patch b/dev-python/dogpile-cache/files/dogpile-cache-1.0.1-install-tests.patch
new file mode 100644
index 000000000000..f00d5a15538b
--- /dev/null
+++ b/dev-python/dogpile-cache/files/dogpile-cache-1.0.1-install-tests.patch
@@ -0,0 +1,28 @@
+From 559a5c57c922741461d419b73f1aa547e3231110 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?=
+Date: Mon, 3 Aug 2020 08:50:33 +0200
+Subject: [PATCH] Exclude installing "tests" package from setup.py
+
+---
+ setup.cfg | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/setup.cfg b/setup.cfg
+index ab4008f..2f43889 100644
+--- a/setup.cfg
++++ b/setup.cfg
+@@ -30,6 +30,11 @@ python_requires = >=3.6
+ package_dir =
+ =.
+
++[options.packages.find]
++exclude =
++ tests
++ tests.*
++
+ [options.exclude_package_data]
+ '' = tests*
+
+--
+2.28.0
+
diff --git a/dev-python/dogpile-cache/metadata.xml b/dev-python/dogpile-cache/metadata.xml
index d7821ac6f812..4d8e2abb2a28 100644
--- a/dev-python/dogpile-cache/metadata.xml
+++ b/dev-python/dogpile-cache/metadata.xml
@@ -9,6 +9,10 @@
openstack@gentoo.org
Openstack
+
+ python@gentoo.org
+ Python
+
A caching API built around the concept of a "dogpile lock", which allows
continued access to an expiring data value while
@@ -17,6 +21,6 @@
dogpile.cache
- zzzeek/dogpile.cache
+ sqlalchemy/dogpile.cache
diff --git a/dev-python/hpack/hpack-3.0.0.ebuild b/dev-python/hpack/hpack-3.0.0.ebuild
index 3a62a22097ce..e19f0adffbc8 100644
--- a/dev-python/hpack/hpack-3.0.0.ebuild
+++ b/dev-python/hpack/hpack-3.0.0.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{6,7,8,9})
+PYTHON_COMPAT=( python3_{6,7,8,9})
inherit distutils-r1
diff --git a/dev-python/hyper-h2/hyper-h2-3.2.0.ebuild b/dev-python/hyper-h2/hyper-h2-3.2.0.ebuild
index cb7769975da4..114276642909 100644
--- a/dev-python/hyper-h2/hyper-h2-3.2.0.ebuild
+++ b/dev-python/hyper-h2/hyper-h2-3.2.0.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{6,7,8,9} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
inherit distutils-r1
@@ -21,9 +21,6 @@ RDEPEND="
=dev-python/hpack-3.0.0[${PYTHON_USEDEP}]
=dev-python/enum34-1.1.6[${PYTHON_USEDEP}]
-
keyring
- kang/python-keyring-lib
jaraco/keyring
diff --git a/dev-python/m2crypto/m2crypto-0.35.2.ebuild b/dev-python/m2crypto/m2crypto-0.35.2.ebuild
index 331b570f2441..6df83df59acc 100644
--- a/dev-python/m2crypto/m2crypto-0.35.2.ebuild
+++ b/dev-python/m2crypto/m2crypto-0.35.2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
IUSE="libressl"
RDEPEND="
diff --git a/dev-python/m2r/m2r-0.2.1.ebuild b/dev-python/m2r/m2r-0.2.1.ebuild
index 524fde1d1afb..a0723dd76814 100644
--- a/dev-python/m2r/m2r-0.2.1.ebuild
+++ b/dev-python/m2r/m2r-0.2.1.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{6..9} pypy3 )
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
DISTUTILS_USE_SETUPTOOLS=rdepend
inherit distutils-r1
diff --git a/dev-python/notebook/Manifest b/dev-python/notebook/Manifest
index 80c1229caab7..7abcd075231d 100644
--- a/dev-python/notebook/Manifest
+++ b/dev-python/notebook/Manifest
@@ -1,3 +1,4 @@
DIST notebook-5.0.0.tar.gz 11481080 BLAKE2B 3cc483d338ca22c6b4d7199100875e9425f90e1a7059c016cec07500f0558c437db5f7e367a5c4441520deb68fa891be31c07cd93e858c872a1f12d893530479 SHA512 fbee29cc554f36e94b1fe9804187a50581e840cfb5884bcdf2fef82ad9ae3ae0e2082ea0056f815bfa2a1c2f203679169155e61e53253aa2e9004a43ff7fbcae
DIST notebook-6.0.3.tar.gz 14048151 BLAKE2B ad4e433accc90acc13efc8005146dd8bcf2e645c104473f0e71d8d9fab80d7e128eb4e070b8aa04aee77e0d6115499e61beb841d94cf66b0e098dc50d3916cbd SHA512 fb56d0e10da3f8673e9578cdf04759dc3247547af6be4f479e9b183f3c5bd0a891fbfede187e0f5aca5c6ffdb9cae6ada23fe6dd159aca2d9cdf967f1f150922
DIST notebook-6.1.0.tar.gz 13794330 BLAKE2B bba5bde7b40cac4bf6a730d7f37005b74e19665e182ea8f81f748ed6a1f3790a019a9f57d1c232403373fbccbf446277e0bc6617556f4fce4487c2c968d8d6aa SHA512 be584c13e2a285076977cc94601e0cfe10f53e3c112a641d97b2128422bfcb48514d8651928ae703237ff7a956965a85066a363079dcd6a636f6dd6467371499
+DIST notebook-6.1.1.tar.gz 13758641 BLAKE2B 6971edc37d50e60c50f24ed77a02f8f22a95481a78eb1aed5a3ca4fd5808156fb1e88e982d159811677cf29428f9ab387f4529a18c8f7d471a44a067266521c6 SHA512 dfd7cb0aaac0fc3f96e998228b874abf0ddba5ef2640c5f8b198211362fd9aa51233e4a43038225120fb467168dfd026cf326d8d9bf43750d9da14129b72773d
diff --git a/dev-python/notebook/notebook-6.1.1.ebuild b/dev-python/notebook/notebook-6.1.1.ebuild
new file mode 100644
index 000000000000..aea8ab5d0aa9
--- /dev/null
+++ b/dev-python/notebook/notebook-6.1.1.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{6..9} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Jupyter Interactive Notebook"
+HOMEPAGE="https://jupyter.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="
+ >=dev-libs/mathjax-2.4
+ dev-python/argon2-cffi[${PYTHON_USEDEP}]
+ dev-python/jinja[${PYTHON_USEDEP}]
+ >=dev-python/terminado-0.8.3[${PYTHON_USEDEP}]
+ >=www-servers/tornado-5.0[${PYTHON_USEDEP}]
+ dev-python/ipython_genutils[${PYTHON_USEDEP}]
+ >=dev-python/traitlets-4.2.1[${PYTHON_USEDEP}]
+ >=dev-python/jupyter_core-4.6.1[${PYTHON_USEDEP}]
+ >=dev-python/pyzmq-17[${PYTHON_USEDEP}]
+ >=dev-python/jupyter_client-5.3.4[${PYTHON_USEDEP}]
+ dev-python/nbformat[${PYTHON_USEDEP}]
+ >=dev-python/nbconvert-4.2.0[${PYTHON_USEDEP}]
+ dev-python/ipykernel[${PYTHON_USEDEP}]
+ dev-python/send2trash[${PYTHON_USEDEP}]
+ dev-python/prometheus_client[${PYTHON_USEDEP}]"
+
+# sphinx 2+ seems to have a problem with its github plugin. temporarily adding
+# a version constraint.
+BDEPEND="
+ test? (
+ dev-python/nose[${PYTHON_USEDEP}]
+ dev-python/nose_warnings_filters[${PYTHON_USEDEP}]
+ dev-python/requests[${PYTHON_USEDEP}]
+ dev-python/requests-unixsocket[${PYTHON_USEDEP}]
+ )
+ "
+
+PATCHES=(
+ "${FILESDIR}/${PN}"-5.7.0-no-mathjax.patch
+)
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+ # disable bundled mathjax
+ sed -i 's/^.*MathJax.*$//' bower.json || die
+
+ # require geckodriver
+ rm -r notebook/tests/selenium || die
+ # trash doesn't seem to work for us
+ sed -e 's:test_delete:_&:' \
+ -i notebook/services/contents/tests/test_manager.py || die
+ sed -e 's:test_checkpoints_follow_file:_&:' \
+ -e 's:test_delete:_&:' \
+ -i notebook/services/contents/tests/test_contents_api.py || die
+ # network-sandbox?
+ sed -e 's:test_connections:_&:' \
+ -e 's:test_culling:_&:' \
+ -i notebook/services/kernels/tests/test_kernels_api.py || die
+
+ sed -i -e "/'bdist_egg':/d" setup.py || die
+
+ distutils-r1_python_prepare_all
+}
+
+python_test() {
+ distutils_install_for_testing
+ local -x PATH=${TEST_DIR}/scripts:${PATH}
+ pytest -vv || die "Tests failed with ${EPYTHON}"
+}
+
+python_install() {
+ distutils-r1_python_install
+
+ ln -sf \
+ "${EPREFIX}/usr/share/mathjax" \
+ "${D}$(python_get_sitedir)/notebook/static/components/MathJax" || die
+}
+
+pkg_preinst() {
+ # remove old mathjax folder if present
+ rm -rf "${EROOT}"/usr/lib*/python*/site-packages/notebook/static/components/MathJax || die
+}
diff --git a/dev-python/numpy/numpy-1.19.0.ebuild b/dev-python/numpy/numpy-1.19.0.ebuild
index 609831bb4b7b..4c63f0ecc59e 100644
--- a/dev-python/numpy/numpy-1.19.0.ebuild
+++ b/dev-python/numpy/numpy-1.19.0.ebuild
@@ -24,7 +24,7 @@ SRC_URI="
)"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="doc lapack"
RDEPEND="
diff --git a/dev-python/pip/Manifest b/dev-python/pip/Manifest
index fb76bf56219e..2b4569e4dd8b 100644
--- a/dev-python/pip/Manifest
+++ b/dev-python/pip/Manifest
@@ -1,5 +1,6 @@
DIST pip-20.0.2.tar.gz 6445047 BLAKE2B 8f6e0a8908cf594c8d51818942b0839f59a495697a95dcc0347235e90cbe6d7f035f155761e7da9cfca1ba08b2c5a2c5def52c60c381f5428ef48efd1b6b5131 SHA512 f9965944ca0f319d01db1638ce97cf64772afff1778b3b1271155de73208cfcb3954d89a469c1143c0bf3288a53d4446165a49df994374b16ac6f7ffdae85857
DIST pip-20.1.1.tar.gz 6503229 BLAKE2B 5b0409042c970ec47fa6f947b21a53aca43563a6bb442fd5f91788fa97caf7167a84b4f581de87453eb0e55657d2ccd11dca2d1815c3bfe9ef5923994306a6db SHA512 ee7b0345c08fbe0215811d07b4c57c1ceece826871842f6d1c174d82e8eee0ad810aa5413d6763ecd5a513e151792a53c36623ab99d2049555ef2542d32d1658
+DIST pip-20.2.1.tar.gz 8717384 BLAKE2B a547b85296da67662080309fc8630c8ad3b0a6898319bd523719b411f0919cb15819e4b8e794aad9e7c13d6af2159c102ead0bd8d8f89e0e618017a8552cf985 SHA512 52abcc336a3c06b0e2b790a7fd4283483b46c1cc6be8e89d8640072ae4517d79afa074683622f8374ebf76a7c3516a05f261e35363327d5d68fb15ec6e6718cd
DIST pip-20.2.tar.gz 8715960 BLAKE2B dbcec865314ba0b65112e42477a2c48dc9a60592a07a834d3886025489fcd8de4c83733044d1ad84dd87af084677b2f406d5d8faa301853ab844b3770be168de SHA512 77db7c618b492cbdef54ef98d4e9a94735a809148fb08ef7d065fbeaf047ced26ddc20d0395a0b2db079c66175a267fc15717a24def70392182326b2c659e6f1
DIST setuptools-44.0.0-py2.py3-none-any.whl 583230 BLAKE2B 823e6792471660f247e30a938aa869d345a63db7294e5f9b4bd88f15a7694779011d29740fe317149620985f705fc6e18cbb07a18e5680cc11d7c229ffbc74f6 SHA512 7006fd303181afbeeec0e30cafb9fd1e4d3c6f55cfdd6343fedbc32b17dbb96b3d96ae37f4db27bfb168738727474cf425904ec280ff1d2b789fc48077a8fa84
DIST wheel-0.34.2-py2.py3-none-any.whl 26502 BLAKE2B 3a1bd4571c582245b60ff33c9bf74ff8a2ebafb26e56fc7b9bd215058d059b6bd13bbe21ce46002af257813a54126f27e19253f211e21c4548c7cf84cd15caf7 SHA512 4f1a44f4691ed8baad777d7874f7f4da96a5019eb485fd3a9eed9259aa2a9d5acccc6dc63a72128664347c64ee039a6076c6ca9c3b75a1f94457967864e522ed
diff --git a/dev-python/pip/pip-20.1.1.ebuild b/dev-python/pip/pip-20.1.1.ebuild
index 0eeb5cc40ab8..9ec9561ec8e8 100644
--- a/dev-python/pip/pip-20.1.1.ebuild
+++ b/dev-python/pip/pip-20.1.1.ebuild
@@ -25,7 +25,7 @@ SRC_URI="
# setuptools & wheel .whl files are required for testing, exact version is not very important.
LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
SLOT="0"
IUSE="test -vanilla"
diff --git a/dev-python/pip/pip-20.2.1.ebuild b/dev-python/pip/pip-20.2.1.ebuild
new file mode 100644
index 000000000000..8da2d952643e
--- /dev/null
+++ b/dev-python/pip/pip-20.2.1.ebuild
@@ -0,0 +1,145 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python2_7 python3_{6,7,8,9} pypy3 )
+PYTHON_REQ_USE="ssl(+),threads(+)"
+
+inherit bash-completion-r1 distutils-r1 multiprocessing
+
+SETUPTOOLS_PV="44.0.0"
+WHEEL_PV="0.34.2"
+
+DESCRIPTION="Installs python packages -- replacement for easy_install"
+HOMEPAGE="https://pip.pypa.io/ https://pypi.org/project/pip/ https://github.com/pypa/pip/"
+SRC_URI="
+ https://github.com/pypa/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+ test? (
+ https://files.pythonhosted.org/packages/py2.py3/s/setuptools/setuptools-${SETUPTOOLS_PV}-py2.py3-none-any.whl
+ https://files.pythonhosted.org/packages/py2.py3/w/wheel/wheel-${WHEEL_PV}-py2.py3-none-any.whl
+ )
+"
+# PyPI archive does not have tests, so we need to download from GitHub.
+# setuptools & wheel .whl files are required for testing, exact version is not very important.
+
+LICENSE="MIT"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+SLOT="0"
+IUSE="test -vanilla"
+
+# disable-system-install patch breaks tests
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ >=dev-python/setuptools-39.2.0[${PYTHON_USEDEP}]
+"
+DEPEND="
+ ${RDEPEND}
+ test? (
+ dev-python/cryptography[${PYTHON_USEDEP}]
+ dev-python/csv23[${PYTHON_USEDEP}]
+ dev-python/freezegun[${PYTHON_USEDEP}]
+ dev-python/mock[${PYTHON_USEDEP}]
+ dev-python/pretend[${PYTHON_USEDEP}]
+ dev-python/pytest[${PYTHON_USEDEP}]
+ dev-python/pyyaml[${PYTHON_USEDEP}]
+ dev-python/scripttest[${PYTHON_USEDEP}]
+ "${COMPLETION}" || die
+ newbashcomp "${COMPLETION}" ${PN}
+
+ ${PYTHON} -c "${pipcmd}" completion --zsh > "${COMPLETION}" || die
+ insinto /usr/share/zsh/site-functions
+ newins "${COMPLETION}" _pip
+}
diff --git a/dev-python/priority/priority-1.3.0.ebuild b/dev-python/priority/priority-1.3.0.ebuild
index 5ed8bbaa6c9c..f90fc1f1b489 100644
--- a/dev-python/priority/priority-1.3.0.ebuild
+++ b/dev-python/priority/priority-1.3.0.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{6,7,8,9})
+PYTHON_COMPAT=( python3_{6,7,8,9})
inherit distutils-r1
diff --git a/dev-python/psycopg/psycopg-2.8.5.ebuild b/dev-python/psycopg/psycopg-2.8.5.ebuild
index 4a57c46ea97d..fd36acacf309 100644
--- a/dev-python/psycopg/psycopg-2.8.5.ebuild
+++ b/dev-python/psycopg/psycopg-2.8.5.ebuild
@@ -17,7 +17,7 @@ S=${WORKDIR}/${MY_P}
LICENSE="LGPL-3+"
SLOT="2"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
IUSE="debug"
RDEPEND=">=dev-db/postgresql-8.1:*"
diff --git a/dev-python/pyhamcrest/Manifest b/dev-python/pyhamcrest/Manifest
index deaea02caa3a..a5c41a927641 100644
--- a/dev-python/pyhamcrest/Manifest
+++ b/dev-python/pyhamcrest/Manifest
@@ -1,2 +1 @@
-DIST PyHamcrest-1.10.1.gh.tar.gz 59019 BLAKE2B 1a090533ea8fe2dff9ad232b2e6dbf82841c38f3699e57750e2309b06a46e70ae5a9c7d087baf06de53e17323a5e36edee1a01d7a4442374d15b76a7723c2031 SHA512 f7e79f7d26c4c6add042052e451898bbf5adf21b05a234cc62bce890d68f5997693b042a9daf136f7026040a8ab7bf28b829288417b947973dcb959bf613a37b
DIST PyHamcrest-2.0.2.gh.tar.gz 55491 BLAKE2B 749f227b8cb1180a64e24cdbf97b6f610b9871b21215a761642d19fdd43ad8e175718b12cfb0de2cdb5c6ae8c3c5271e04b7c3b489e01ac689769e24202ece56 SHA512 d6e510ca1e6533b425b424d411e23c4ee2a6bad2d635695e4e68f991fbdc57269c3a433361e431cb5dda7891278951d5de7a05f5c1c167714eecdaf74644d1c8
diff --git a/dev-python/pyhamcrest/pyhamcrest-1.10.1.ebuild b/dev-python/pyhamcrest/pyhamcrest-1.10.1.ebuild
deleted file mode 100644
index 333017e06de0..000000000000
--- a/dev-python/pyhamcrest/pyhamcrest-1.10.1.ebuild
+++ /dev/null
@@ -1,36 +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..9} )
-
-inherit distutils-r1
-
-MY_PN="PyHamcrest"
-
-DESCRIPTION="Hamcrest framework for matcher objects"
-HOMEPAGE="https://github.com/hamcrest/PyHamcrest"
-SRC_URI="https://github.com/hamcrest/PyHamcrest/archive/V${PV}.tar.gz -> ${MY_PN}-${PV}.gh.tar.gz"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="examples test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-python/six-1.4[${PYTHON_USEDEP}]"
-BDEPEND="
- test? (
- dev-python/mock[${PYTHON_USEDEP}]
- )"
-
-distutils_enable_sphinx doc \
- dev-python/sphinx_rtd_theme
-distutils_enable_tests pytest
-
-python_install_all() {
- use examples && dodoc -r examples
- distutils-r1_python_install_all
-}
diff --git a/dev-python/pynacl/pynacl-1.4.0.ebuild b/dev-python/pynacl/pynacl-1.4.0.ebuild
index 521793fab9d3..c2d63b46874d 100644
--- a/dev-python/pynacl/pynacl-1.4.0.ebuild
+++ b/dev-python/pynacl/pynacl-1.4.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/pyca/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux"
RDEPEND="
dev-python/six[${PYTHON_USEDEP}]
diff --git a/dev-python/pysol_cards/Manifest b/dev-python/pysol_cards/Manifest
index 51b24a1a29c9..3c0e3f8a6669 100644
--- a/dev-python/pysol_cards/Manifest
+++ b/dev-python/pysol_cards/Manifest
@@ -1,2 +1 @@
DIST pysol_cards-0.10.1.tar.gz 20670 BLAKE2B 1183502ec0e7c070686ed5fc2972091a5bf91d55e31170690124e949bd592401daaae44cf25e3ac9b213230e27fbc90ea9e58450d75caa09b9467f0d2ba513cc SHA512 40ef02fe919f961688039667b9073913acb452d163eef1a4ef71648788676c678bf615a26b1f4d562ba072167eb3629c4cc463678edff89bfdc62b0878db062c
-DIST pysol_cards-0.8.9.tar.gz 19522 BLAKE2B 06e257f2ccb43236c311d03436d7b482df977d63c0b886c7705e4cfee4abec4eae495a5557053ba2a18a84da227cc4bd913263e98533ab3a17616843df0a35c7 SHA512 548f586c70a583812731f2273f1c57406a31667b395c4276ec94518471499e69d278d54e2910f7c64a4c52deb670b0e76eef55399af9e2b997422ecbbd9a79a9
diff --git a/dev-python/pysol_cards/pysol_cards-0.10.1.ebuild b/dev-python/pysol_cards/pysol_cards-0.10.1.ebuild
index 101dfa3a1ecb..2153dd470d0c 100644
--- a/dev-python/pysol_cards/pysol_cards-0.10.1.ebuild
+++ b/dev-python/pysol_cards/pysol_cards-0.10.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0 MIT"
SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="amd64 arm64 x86"
IUSE=""
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/pysol_cards/pysol_cards-0.8.9.ebuild b/dev-python/pysol_cards/pysol_cards-0.8.9.ebuild
deleted file mode 100644
index 2153dd470d0c..000000000000
--- a/dev-python/pysol_cards/pysol_cards-0.8.9.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Deal PySol FreeCell cards"
-HOMEPAGE="https://pypi.org/project/pysol-cards/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0 MIT"
-SLOT="0"
-KEYWORDS="amd64 arm64 x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="
- dev-python/pbr[${PYTHON_USEDEP}]
- dev-python/random2[${PYTHON_USEDEP}]
- dev-python/six[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/pytest-xdist/pytest-xdist-1.31.0.ebuild b/dev-python/pytest-xdist/pytest-xdist-1.31.0.ebuild
index 6babb2e6cfbf..47f649c8f9e8 100644
--- a/dev-python/pytest-xdist/pytest-xdist-1.31.0.ebuild
+++ b/dev-python/pytest-xdist/pytest-xdist-1.31.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
SLOT="0"
LICENSE="MIT"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/pytest/pytest-4.6.11.ebuild b/dev-python/pytest/pytest-4.6.11.ebuild
index 54d5e917b2ce..dde2b477e88a 100644
--- a/dev-python/pytest/pytest-4.6.11.ebuild
+++ b/dev-python/pytest/pytest-4.6.11.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/python-efl/Manifest b/dev-python/python-efl/Manifest
index 3e2ca161f2d4..5c40865fe973 100644
--- a/dev-python/python-efl/Manifest
+++ b/dev-python/python-efl/Manifest
@@ -1,2 +1 @@
-DIST python-efl-1.23.0.tar.xz 9524832 BLAKE2B d738d3481a0805490c756d38fe169e7d54d9b4c8d6b18ba45265db029b28e59eec8d711675c3fcd52500e19cda8cabc49fb0a2d052d2b9be7800ff9f6dc78f75 SHA512 b2c4389795d704b8f0d8f2d0703b90b09daaeacf7a2d4b372d86f9e0b8f9e2f5b465f8651a0da7cb4bc1800357c317b9cb737afcb415fc0a4cdf4cbed62bdf85
DIST python-efl-1.24.0.tar.xz 9535212 BLAKE2B ab9535d60af75422f3c055e56f3c6297f595afbf682970afcb21f597486b307504fa83ab894c2029fb681dda8d886d1fc837726d1c4ae62df7185fbc0073724a SHA512 5b57de58b2351f00f744454e6aaa16f7bf9cf72b7f73d07a2d98cda4d152eb65810513b5c04b1eda127b6f5caf56e4b9bc9a7c1ef98593edde26a9ed3be953c9
diff --git a/dev-python/python-efl/python-efl-1.23.0.ebuild b/dev-python/python-efl/python-efl-1.23.0.ebuild
deleted file mode 100644
index a0ac7f2e657e..000000000000
--- a/dev-python/python-efl/python-efl-1.23.0.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6..8} )
-
-inherit distutils-r1 flag-o-matic
-
-DESCRIPTION="Python bindings for Enlightenment Foundation Libraries"
-HOMEPAGE="https://phab.enlightenment.org/w/projects/python_bindings_for_efl/"
-SRC_URI="https://download.enlightenment.org/rel/bindings/python/${P}.tar.xz"
-
-LICENSE="|| ( GPL-3 LGPL-3 )"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc test"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="=dev-libs/efl-1.23*
- dev-python/dbus-python[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
- >=dev-python/cython-0.28.4[${PYTHON_USEDEP}]"
-BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
- virtual/pkgconfig
- doc? (
- dev-python/sphinx[${PYTHON_USEDEP}]
- media-gfx/graphviz
- )"
-
-src_prepare() {
- default
-
- # Tries to download a file under /tmp
- rm tests/ecore/test_09_file_download.py || die
-
- # Tries to use that file which failed to download
- rm tests/ecore/test_10_file_monitor.py || die
-
- # Needs an active internet connection
- rm tests/ecore/test_11_con.py || die
-
- # Test fails because of deleted files above
- sed -i 's/>= 13/>= 10/g' tests/ecore/test_08_exe.py || die
-
- # Make tests verbose
- sed -i 's:verbosity=1:verbosity=3:' tests/00_run_all_tests.py || die
-
- # Disable any optimization on x86, #704260
- if use x86; then
- filter-flags -O?
- append-cflags -O0
- fi
-}
-
-python_compile_all() {
- if use doc ; then
- esetup.py build_doc --build-dir "${S}"/build/doc/
- fi
-
- distutils-r1_python_compile
-}
-
-python_test() {
- cd tests/ || die
- ${EPYTHON} 00_run_all_tests.py --verbose || die "Tests failed with ${EPYTHON}"
-}
-
-python_install_all() {
- use doc && local HTML_DOCS=( ./build/doc/html/. )
- distutils-r1_python_install_all
-}
diff --git a/dev-python/reno/reno-2.11.3.ebuild b/dev-python/reno/reno-2.11.3.ebuild
index 0ec706bfa07e..09f1f5e99994 100644
--- a/dev-python/reno/reno-2.11.3.ebuild
+++ b/dev-python/reno/reno-2.11.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~ia64 ~ppc64 ~x86"
IUSE=""
BDEPEND=">=dev-python/pbr-1.4[${PYTHON_USEDEP}]"
diff --git a/dev-python/rq/rq-1.5.0.ebuild b/dev-python/rq/rq-1.5.0.ebuild
index a731f4cecab4..d62e57cf1504 100644
--- a/dev-python/rq/rq-1.5.0.ebuild
+++ b/dev-python/rq/rq-1.5.0.ebuild
@@ -14,10 +14,14 @@ SRC_URI="https://github.com/rq/rq/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
BDEPEND="
- test? ( dev-python/sentry-sdk[${PYTHON_USEDEP}] )
+ test? (
+ dev-db/redis
+ dev-python/mock[${PYTHON_USEDEP}]
+ dev-python/sentry-sdk[${PYTHON_USEDEP}]
+ )
"
DEPEND="
>=dev-python/click-5.0[${PYTHON_USEDEP}]
diff --git a/dev-python/sentry-sdk/sentry-sdk-0.14.4.ebuild b/dev-python/sentry-sdk/sentry-sdk-0.14.4.ebuild
index 6687c9c45aa7..7cf55716208b 100644
--- a/dev-python/sentry-sdk/sentry-sdk-0.14.4.ebuild
+++ b/dev-python/sentry-sdk/sentry-sdk-0.14.4.ebuild
@@ -22,6 +22,8 @@ RDEPEND="
dev-python/certifi
"
+RESTRICT="test"
+
python_test() {
cd "${S}"/src || die
"${PYTHON}" test_typing.py || die "tests failed under ${EPYTHON}"
diff --git a/dev-python/sentry-sdk/sentry-sdk-0.16.3.ebuild b/dev-python/sentry-sdk/sentry-sdk-0.16.3.ebuild
index 180866d812cb..c23ecfdbfc37 100644
--- a/dev-python/sentry-sdk/sentry-sdk-0.16.3.ebuild
+++ b/dev-python/sentry-sdk/sentry-sdk-0.16.3.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/sentry-python-${PV}"
LICENSE="PSF-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
RDEPEND="
dev-python/urllib3[${PYTHON_USEDEP}]
diff --git a/dev-python/setuptools/Manifest b/dev-python/setuptools/Manifest
index f8731d65ae21..69a32fb7790e 100644
--- a/dev-python/setuptools/Manifest
+++ b/dev-python/setuptools/Manifest
@@ -2,3 +2,4 @@ DIST setuptools-44.1.0.zip 858569 BLAKE2B f59f154e121502a731e51294ccd293d60ffcca
DIST setuptools-46.4.0.zip 865912 BLAKE2B 452d36132f5648c79c7e1616a93ff6a39ab2f64b2864ee397b4f57e7f72c47d418ff274f5decd35b0591b09800ad2a7cbd71c283550bd0e60a4d85744a57d4ec SHA512 31e58fd1d682089a45d23aa07c3c2c4c952ca016fa4c3416b2cba979d8b57369f80baef98ce857912e506e87d6cb456497a1ce1c75a0cdf1ee25d4e753b58726
DIST setuptools-49.1.1.zip 2173825 BLAKE2B 44a23a2bb8613b2dcf2368997c7d89ffbd957d7004c1872bbb64631955e5e8ed2f14a49d16fff4c384c42d56b486eb2ee07f2a3e3e72add97502f39309a17fee SHA512 d33c291edb64d015530e3bd66666a612539896018c5f6b6eff65719339ec75967c4f6200be36a60955f885ebc4cb86f9acd5f52d8fd2e1fb1e4919488a986603
DIST setuptools-49.2.0.zip 2174648 BLAKE2B 03d4d2f4df5e20a39bdf8940610e0e0ad02566bc594ba90f58f476a90882dff32f1126eb02a797027d126e45f0e3092d848214e4d28292850b5042a23cdfe6ea SHA512 72de34b2000fba981eb186b612a6b7ccec920c480966ebec4e178dc024db5628aeefde778c1bbd7dae9d38ae86aa9384a1b7d86f9c358429742daeba72ba9850
+DIST setuptools-49.2.1.zip 2173295 BLAKE2B c80cb7bc0e278e38cdaa87f32684476f1e72b69171213ef6019631011d735de62149635471a87791ffb665afdef0a3b70b57b4275cc4ff6bff8cc3c488229931 SHA512 daa4096d079eef9b234c854ae404a2b0f6f3034008f4c3119b0412adc1cbbbff936c518c8e3aeadaed67426ad83bb651681d63352520910833c5b919147f0fb6
diff --git a/dev-python/setuptools/setuptools-49.2.1.ebuild b/dev-python/setuptools/setuptools-49.2.1.ebuild
new file mode 100644
index 000000000000..05a423b05f07
--- /dev/null
+++ b/dev-python/setuptools/setuptools-49.2.1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
+PYTHON_REQ_USE="xml(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Collection of extensions to Distutils"
+HOMEPAGE="https://github.com/pypa/setuptools https://pypi.org/project/setuptools/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+ app-arch/unzip
+ test? (
+ dev-python/mock[${PYTHON_USEDEP}]
+ dev-python/pip[${PYTHON_USEDEP}]
+ >=dev-python/pytest-3.7.0[${PYTHON_USEDEP}]
+ dev-python/pytest-fixture-config[${PYTHON_USEDEP}]
+ dev-python/pytest-virtualenv[${PYTHON_USEDEP}]
+ dev-python/wheel[${PYTHON_USEDEP}]
+ )
+"
+PDEPEND="
+ >=dev-python/certifi-2016.9.26[${PYTHON_USEDEP}]"
+
+# Force in-source build because build system modifies sources.
+DISTUTILS_IN_SOURCE_BUILD=1
+
+DOCS=( {CHANGES,README}.rst docs/{easy_install.txt,pkg_resources.txt,setuptools.txt} )
+
+python_prepare_all() {
+ # disable tests requiring a network connection
+ rm setuptools/tests/test_packageindex.py || die
+
+ # don't run integration tests
+ rm setuptools/tests/test_integration.py || die
+
+ # xpass-es for me on py3
+ #sed -e '/xfail.*710/s:(:(six.PY2, :' \
+ # -i setuptools/tests/test_archive_util.py || die
+
+ # avoid pointless dep on flake8
+ sed -i -e 's:--flake8::' -e 's:--cov::' pytest.ini || die
+
+ # disable the code disabling non-existing coverage plugin
+ sed -i -e 's:cov = .*:return:' conftest.py || die
+
+ distutils-r1_python_prepare_all
+}
+
+python_test() {
+ distutils_install_for_testing
+ # test_easy_install raises a SandboxViolation due to ${HOME}/.pydistutils.cfg
+ # It tries to sandbox the test in a tempdir
+ HOME="${PWD}" pytest -vv ${PN} || die "Tests failed under ${EPYTHON}"
+}
+
+python_install() {
+ export DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT=1
+ distutils-r1_python_install
+}
diff --git a/dev-python/sphinx/sphinx-2.4.4.ebuild b/dev-python/sphinx/sphinx-2.4.4.ebuild
index 8048479c65d1..cc1c8163ec75 100644
--- a/dev-python/sphinx/sphinx-2.4.4.ebuild
+++ b/dev-python/sphinx/sphinx-2.4.4.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/S/${PN^}/${P^}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
IUSE="doc latex test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/tqdm/Manifest b/dev-python/tqdm/Manifest
index 3aea4fbda186..e8dcea048d39 100644
--- a/dev-python/tqdm/Manifest
+++ b/dev-python/tqdm/Manifest
@@ -1,2 +1,4 @@
DIST tqdm-4.47.0.tar.gz 145749 BLAKE2B 77a5efec763a8e58e071ee571077ee0db72d9243308592519ecd2c38f60d6b621fd7362dd87bdd0759a39f25c19cc3cc889e9a8376dc658ed565ca7e19fc68cd SHA512 4023988cef757f43a6f59f7eddc8f40246cbca4994cea91dbb4a788385c0706f376f4c0fd5c8c47146c10eb8c52be2c9d4855b7bea0a5036162c55447aac95d7
DIST tqdm-4.48.0.tar.gz 148578 BLAKE2B 95ce438cc14cad5a4ad7b9b2b89b38d5a5c49e27a4ed797ae1a05d7eb3d9539dfaaee72f6330cd5f3f18721ca4259c5ee3f643ae8dd509f1e2261566ee9c3f02 SHA512 9c23b103603c5f56f9cc84d04e68950a0e6431cf40db856918f6e2f21aea61fafbbf466eff6d80fc14c40bb2a11dd0be80e801c55adbab02762c36ce9bed31a9
+DIST tqdm-4.48.1.tar.gz 148971 BLAKE2B 119b538dc9fadc1b38cb48d6169ecd647397883bbf26257cabe6d613e48fbcded3bebf74399f96ba69603b24589464b559da1f204fd38bd6d87e836539d6cc61 SHA512 fc47674c0c62d83d2bffb2ee46862b562517c4ceef21e1802db4a85006bee53f6a99fba87ebeb9e8ea5d34ae35a21378ae379ba159dd6aab16f28d1ed527f0c3
+DIST tqdm-4.48.2.tar.gz 148978 BLAKE2B 2423a3d23b86ec6b535a2157d0fbaea6921f95873fb2507a08ff57de0fdcf8fcbfb030210393f5410437ee9977da3ad2011f07a866b3f91a057e338082325976 SHA512 849e4dad4bd0819b328e906af8a8f7acf2ebfd559c9ae3ebf822bc64c1b1a5c96e44b9b69d3dedf6387c44cf9eed559f1377ea29f71fadfc8f056c52685425e9
diff --git a/dev-python/tqdm/tqdm-4.48.1.ebuild b/dev-python/tqdm/tqdm-4.48.1.ebuild
new file mode 100644
index 000000000000..27373f57ea4f
--- /dev/null
+++ b/dev-python/tqdm/tqdm-4.48.1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( pypy3 python3_{6,7,8,9} )
+
+inherit distutils-r1
+
+if [[ ${PV} == 9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/tqdm/tqdm"
+else
+ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+DESCRIPTION="Add a progress meter to your loops in a second"
+HOMEPAGE="https://github.com/tqdm/tqdm"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="examples"
+
+distutils_enable_tests nose
+
+python_prepare_all() {
+ sed -r \
+ -e "s:'nose'(,[[:space:]]*|)::" \
+ -e "s:'flake8'(,[[:space:]]*|)::" \
+ -e "s:'coverage'(,[[:space:]]*|)::" \
+ -i setup.py
+
+ distutils-r1_python_prepare_all
+}
+
+python_test() {
+ # tests_main.py requires the package to be installed
+ distutils_install_for_testing
+ # Skip unpredictable performance tests
+ nosetests tqdm -v --ignore 'tests_perf.py' \
+ || die "tests failed with ${EPYTHON}"
+}
+
+python_install() {
+ doman "${BUILD_DIR}"/lib/tqdm/tqdm.1
+ rm "${BUILD_DIR}"/lib/tqdm/tqdm.1 || die
+ distutils-r1_python_install --skip-build
+}
+
+python_install_all() {
+ if use examples; then
+ dodoc -r examples
+ docompress -x /usr/share/doc/${PF}/examples
+ fi
+ distutils-r1_python_install_all
+}
diff --git a/dev-python/tqdm/tqdm-4.48.2.ebuild b/dev-python/tqdm/tqdm-4.48.2.ebuild
new file mode 100644
index 000000000000..27373f57ea4f
--- /dev/null
+++ b/dev-python/tqdm/tqdm-4.48.2.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( pypy3 python3_{6,7,8,9} )
+
+inherit distutils-r1
+
+if [[ ${PV} == 9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/tqdm/tqdm"
+else
+ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+DESCRIPTION="Add a progress meter to your loops in a second"
+HOMEPAGE="https://github.com/tqdm/tqdm"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="examples"
+
+distutils_enable_tests nose
+
+python_prepare_all() {
+ sed -r \
+ -e "s:'nose'(,[[:space:]]*|)::" \
+ -e "s:'flake8'(,[[:space:]]*|)::" \
+ -e "s:'coverage'(,[[:space:]]*|)::" \
+ -i setup.py
+
+ distutils-r1_python_prepare_all
+}
+
+python_test() {
+ # tests_main.py requires the package to be installed
+ distutils_install_for_testing
+ # Skip unpredictable performance tests
+ nosetests tqdm -v --ignore 'tests_perf.py' \
+ || die "tests failed with ${EPYTHON}"
+}
+
+python_install() {
+ doman "${BUILD_DIR}"/lib/tqdm/tqdm.1
+ rm "${BUILD_DIR}"/lib/tqdm/tqdm.1 || die
+ distutils-r1_python_install --skip-build
+}
+
+python_install_all() {
+ if use examples; then
+ dodoc -r examples
+ docompress -x /usr/share/doc/${PF}/examples
+ fi
+ distutils-r1_python_install_all
+}
diff --git a/dev-python/transitions/Manifest b/dev-python/transitions/Manifest
index e98abd16b146..be8117671686 100644
--- a/dev-python/transitions/Manifest
+++ b/dev-python/transitions/Manifest
@@ -1,2 +1,3 @@
DIST transitions-0.7.1.tar.gz 1283833 BLAKE2B 5f2f2813ba158cf5ccac4e2d55700149b986bdd24f9e864cec8d03390724cf79d9d379afa06b1a7b56c6a91376410252fdda169024f6ebbba2ed976fe7a18e7b SHA512 3fe5989faf9dbfdc15d50beaf2656240317f00278727271e5bd64ad465be1640b67e760fb73f4b06a61920343215815a8be03d41dc4d32086222446463ef71d7
DIST transitions-0.8.1.tar.gz 1094152 BLAKE2B 38e687fd30ae5a49c4c5f4339fe31728c4f44539a8d977337b54015d939aa48e39616e2044b1f5a7f6d7f82b34f2a0e807c36b9d416e10fcb0cd04db4bb9f840 SHA512 627f4f26cc24b1ac2e43cd6570341620b32e1f75662d3bde069ba5f3547e2670380d6e58876f8208f0411c91d8d2c21e500e8c91565b3a8748e07d2f4d94b0f6
+DIST transitions-0.8.2.tar.gz 1084797 BLAKE2B 9ff6284e7c42365c5a169388057acffd53dd31c3ca6d9dee240b253ca34118a67d3f070fd8b6a86cb6a01a2e15023e0bad02ccc07813ee0855a54008ac3d7597 SHA512 d10e513806801d0c874be3eb59e92ad61584b5f7992ba26db8828848df1225fb806621abc118a8d43f2efaa353d988b5becbe4296bc054754e551c86495a540f
diff --git a/dev-python/transitions/transitions-0.7.1.ebuild b/dev-python/transitions/transitions-0.7.1-r1.ebuild
similarity index 84%
rename from dev-python/transitions/transitions-0.7.1.ebuild
rename to dev-python/transitions/transitions-0.7.1-r1.ebuild
index d07f7758006c..23b568a3c791 100644
--- a/dev-python/transitions/transitions-0.7.1.ebuild
+++ b/dev-python/transitions/transitions-0.7.1-r1.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..8} )
inherit distutils-r1
@@ -19,7 +19,7 @@ IUSE="examples test"
RESTRICT="!test? ( test )"
RDEPEND="
- dev-python/pygraphviz[${PYTHON_USEDEP}]
+ dev-python/graphviz[${PYTHON_USEDEP}]
dev-python/six[${PYTHON_USEDEP}]
"
@@ -30,15 +30,13 @@ DEPEND="
dev-python/mock[${PYTHON_USEDEP}]
dev-python/nose[${PYTHON_USEDEP}]
dev-python/pycodestyle[${PYTHON_USEDEP}]
- dev-python/pygraphviz[${PYTHON_USEDEP}]
+ dev-python/pytest[${PYTHON_USEDEP}]
)
"
BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-python_test() {
- esetup.py test
-}
+distutils_enable_tests pytest
src_install() {
distutils-r1_src_install
diff --git a/dev-python/transitions/transitions-0.8.1.ebuild b/dev-python/transitions/transitions-0.8.1-r1.ebuild
similarity index 84%
rename from dev-python/transitions/transitions-0.8.1.ebuild
rename to dev-python/transitions/transitions-0.8.1-r1.ebuild
index 60c72178daaa..9256f6b345ca 100644
--- a/dev-python/transitions/transitions-0.8.1.ebuild
+++ b/dev-python/transitions/transitions-0.8.1-r1.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..8} )
inherit distutils-r1
@@ -19,7 +19,7 @@ IUSE="examples test"
RESTRICT="!test? ( test )"
RDEPEND="
- dev-python/pygraphviz[${PYTHON_USEDEP}]
+ dev-python/graphviz[${PYTHON_USEDEP}]
dev-python/six[${PYTHON_USEDEP}]
"
@@ -30,15 +30,13 @@ DEPEND="
dev-python/mock[${PYTHON_USEDEP}]
dev-python/nose[${PYTHON_USEDEP}]
dev-python/pycodestyle[${PYTHON_USEDEP}]
- dev-python/pygraphviz[${PYTHON_USEDEP}]
+ dev-python/pytest[${PYTHON_USEDEP}]
)
"
BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-python_test() {
- esetup.py test
-}
+distutils_enable_tests pytest
src_install() {
distutils-r1_src_install
diff --git a/dev-python/transitions/transitions-0.8.2.ebuild b/dev-python/transitions/transitions-0.8.2.ebuild
new file mode 100644
index 000000000000..9256f6b345ca
--- /dev/null
+++ b/dev-python/transitions/transitions-0.8.2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..8} )
+
+inherit distutils-r1
+
+DESCRIPTION="A lightweight, object-oriented state machine implementation in Python"
+HOMEPAGE="https://github.com/pytransitions/transitions"
+SRC_URI="https://github.com/pytransitions/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ dev-python/graphviz[${PYTHON_USEDEP}]
+ dev-python/six[${PYTHON_USEDEP}]
+"
+
+DEPEND="
+ ${RDEPEND}
+ test? (
+ dev-python/dill[${PYTHON_USEDEP}]
+ dev-python/mock[${PYTHON_USEDEP}]
+ dev-python/nose[${PYTHON_USEDEP}]
+ dev-python/pycodestyle[${PYTHON_USEDEP}]
+ dev-python/pytest[${PYTHON_USEDEP}]
+ )
+"
+
+BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+
+src_install() {
+ distutils-r1_src_install
+
+ use examples && dodoc examples/*.ipynb
+}
diff --git a/dev-python/twisted/twisted-19.10.0.ebuild b/dev-python/twisted/twisted-19.10.0.ebuild
index ed3222af413e..04a0f3af2fd0 100644
--- a/dev-python/twisted/twisted-19.10.0.ebuild
+++ b/dev-python/twisted/twisted-19.10.0.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{6,7,8,9} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
PYTHON_REQ_USE="threads(+)"
inherit distutils-r1 virtualx
diff --git a/dev-python/xlsxwriter/Manifest b/dev-python/xlsxwriter/Manifest
index f60553563352..18f55006a0c3 100644
--- a/dev-python/xlsxwriter/Manifest
+++ b/dev-python/xlsxwriter/Manifest
@@ -1,3 +1,4 @@
DIST xlsxwriter-1.2.8-tests.tar.gz 29222574 BLAKE2B 11a13c5fc4089c8c15dcaa069a6f044555426e71dd040a6abf1038fb2a33788744c80487abaf1da6b3c0fae2db55a389c0cedbac251c793dc828920ea55ee5b3 SHA512 2269235ad3bb243dd8be5cf33efb6503e08e3d7ac42bce042c97737ebb8a9db880db93c05bbb2708b0bb6c621cb11c91f3e7d5b4fa09fce88092b365910b1afb
DIST xlsxwriter-1.2.9-tests.tar.gz 29395878 BLAKE2B 010e3baf191dafe04b4c73986c7997048aeb1002515d24e104a241e7bc80c5e3e4e46b2454e01de72e23418a24ad981b758355dc77dfa1980265d5b119e7c247 SHA512 4680f2eaa96ec8063432f3f0642d27895cd462d3d9b664a452f8e2956bcd16268f41a5780d172cf61cd3951f1f5fbc2dc904ebef1e08e7f45269821a3157c7eb
DIST xlsxwriter-1.3.0-tests.tar.gz 30533927 BLAKE2B 4339cf064147e4f7e05af4b91576cd13eb3b0074ef98a843107e01d13548dd4781f520b589035439e6dfff5e915673462dfaac2d8143ffc5295a69ebbc193656 SHA512 41cb2743dbcf7f9537922060d84683145b82e4e8eac7134356c23b15ba30094c0461767d15cc8d2aec712ce8e1516b3a7811c60305cc365a5d0cb3c18da046fd
+DIST xlsxwriter-1.3.1-tests.tar.gz 31366131 BLAKE2B 10c39c2a4d7c509ae98cf39feb97ae19bf53fc6be2ed0688d59bc6bd26bd3a8ce53edb43eedc83eba41258074fdc8bcdd54f2514297d045d5b283a7f1aacf922 SHA512 822a00911b783eeb907da3563a0fc939693296418b785087d2b7a43db08118b038ea6261f5b8832a1270813c51d54f2937020ccc150bfb4556bee056ae8af34b
diff --git a/dev-python/xlsxwriter/xlsxwriter-1.3.1.ebuild b/dev-python/xlsxwriter/xlsxwriter-1.3.1.ebuild
new file mode 100644
index 000000000000..11100a0ce79a
--- /dev/null
+++ b/dev-python/xlsxwriter/xlsxwriter-1.3.1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
+
+inherit distutils-r1
+
+MY_PN="XlsxWriter"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Python module for creating Excel XLSX files"
+HOMEPAGE="https://github.com/jmcnamara/XlsxWriter"
+SRC_URI="https://github.com/jmcnamara/XlsxWriter/archive/RELEASE_${PV}.tar.gz -> ${P}-tests.tar.gz"
+S="${WORKDIR}/${MY_PN}-RELEASE_${PV}"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+distutils_enable_tests pytest
diff --git a/dev-ros/Manifest.gz b/dev-ros/Manifest.gz
index 9142f8b1458c..608913c1c7d4 100644
Binary files a/dev-ros/Manifest.gz and b/dev-ros/Manifest.gz differ
diff --git a/dev-ros/diagnostic_common_diagnostics/diagnostic_common_diagnostics-1.9.4.ebuild b/dev-ros/diagnostic_common_diagnostics/diagnostic_common_diagnostics-1.9.4.ebuild
index 0cb8f7af2453..7d94a89560d9 100644
--- a/dev-ros/diagnostic_common_diagnostics/diagnostic_common_diagnostics-1.9.4.ebuild
+++ b/dev-ros/diagnostic_common_diagnostics/diagnostic_common_diagnostics-1.9.4.ebuild
@@ -20,4 +20,11 @@ DEPEND="
dev-ros/tf[${PYTHON_SINGLE_USEDEP}]
"
RDEPEND="${DEPEND}
+ $(python_gen_cond_dep "dev-python/psutil[\${PYTHON_USEDEP}]")
app-admin/hddtemp"
+DEPEND="${DEPEND}
+ test? (
+ $(python_gen_cond_dep "dev-python/psutil[\${PYTHON_USEDEP}]")
+ dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
+ )
+"
diff --git a/dev-ros/diagnostic_common_diagnostics/diagnostic_common_diagnostics-9999.ebuild b/dev-ros/diagnostic_common_diagnostics/diagnostic_common_diagnostics-9999.ebuild
index 0cb8f7af2453..7d94a89560d9 100644
--- a/dev-ros/diagnostic_common_diagnostics/diagnostic_common_diagnostics-9999.ebuild
+++ b/dev-ros/diagnostic_common_diagnostics/diagnostic_common_diagnostics-9999.ebuild
@@ -20,4 +20,11 @@ DEPEND="
dev-ros/tf[${PYTHON_SINGLE_USEDEP}]
"
RDEPEND="${DEPEND}
+ $(python_gen_cond_dep "dev-python/psutil[\${PYTHON_USEDEP}]")
app-admin/hddtemp"
+DEPEND="${DEPEND}
+ test? (
+ $(python_gen_cond_dep "dev-python/psutil[\${PYTHON_USEDEP}]")
+ dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
+ )
+"
diff --git a/dev-ros/imu_filter_madgwick/imu_filter_madgwick-1.2.2-r1.ebuild b/dev-ros/imu_filter_madgwick/imu_filter_madgwick-1.2.2-r1.ebuild
index 391c5b9902ab..e32f92ffa33d 100644
--- a/dev-ros/imu_filter_madgwick/imu_filter_madgwick-1.2.2-r1.ebuild
+++ b/dev-ros/imu_filter_madgwick/imu_filter_madgwick-1.2.2-r1.ebuild
@@ -29,5 +29,8 @@ RDEPEND="
DEPEND="${RDEPEND}
dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
- test? ( dev-ros/rosunit )
+ test? (
+ dev-ros/rosunit
+ dev-cpp/gtest
+ )
"
diff --git a/dev-ros/imu_filter_madgwick/imu_filter_madgwick-9999.ebuild b/dev-ros/imu_filter_madgwick/imu_filter_madgwick-9999.ebuild
index 391c5b9902ab..e32f92ffa33d 100644
--- a/dev-ros/imu_filter_madgwick/imu_filter_madgwick-9999.ebuild
+++ b/dev-ros/imu_filter_madgwick/imu_filter_madgwick-9999.ebuild
@@ -29,5 +29,8 @@ RDEPEND="
DEPEND="${RDEPEND}
dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
- test? ( dev-ros/rosunit )
+ test? (
+ dev-ros/rosunit
+ dev-cpp/gtest
+ )
"
diff --git a/dev-ros/kdl_parser_py/kdl_parser_py-1.14.0.ebuild b/dev-ros/kdl_parser_py/kdl_parser_py-1.14.0.ebuild
index de7f14183f6c..5ee3c5b1f3a3 100644
--- a/dev-ros/kdl_parser_py/kdl_parser_py-1.14.0.ebuild
+++ b/dev-ros/kdl_parser_py/kdl_parser_py-1.14.0.ebuild
@@ -15,6 +15,7 @@ IUSE=""
RDEPEND="
>=dev-ros/urdf-1.13[${PYTHON_SINGLE_USEDEP}]
+ $(python_gen_cond_dep "dev-python/python_orocos_kdl[\${PYTHON_USEDEP}]")
"
DEPEND="${RDEPEND}
test? (
diff --git a/dev-ros/kdl_parser_py/kdl_parser_py-9999.ebuild b/dev-ros/kdl_parser_py/kdl_parser_py-9999.ebuild
index de7f14183f6c..5ee3c5b1f3a3 100644
--- a/dev-ros/kdl_parser_py/kdl_parser_py-9999.ebuild
+++ b/dev-ros/kdl_parser_py/kdl_parser_py-9999.ebuild
@@ -15,6 +15,7 @@ IUSE=""
RDEPEND="
>=dev-ros/urdf-1.13[${PYTHON_SINGLE_USEDEP}]
+ $(python_gen_cond_dep "dev-python/python_orocos_kdl[\${PYTHON_USEDEP}]")
"
DEPEND="${RDEPEND}
test? (
diff --git a/dev-ros/resource_retriever/resource_retriever-1.12.6.ebuild b/dev-ros/resource_retriever/resource_retriever-1.12.6.ebuild
index 27d60028ac02..4a7691efbe1e 100644
--- a/dev-ros/resource_retriever/resource_retriever-1.12.6.ebuild
+++ b/dev-ros/resource_retriever/resource_retriever-1.12.6.ebuild
@@ -23,5 +23,10 @@ DEPEND="${RDEPEND}
src_test() {
export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
+ if has network-sandbox ${FEATURES}; then
+ einfo "Skipping network tests due to network sandbox"
+ export GTEST_FILTER='-Retriever.http'
+ export NOSE_TESTMATCH='^(?!test_http).*'
+ fi
ros-catkin_src_test
}
diff --git a/dev-ros/resource_retriever/resource_retriever-9999.ebuild b/dev-ros/resource_retriever/resource_retriever-9999.ebuild
index 27d60028ac02..4a7691efbe1e 100644
--- a/dev-ros/resource_retriever/resource_retriever-9999.ebuild
+++ b/dev-ros/resource_retriever/resource_retriever-9999.ebuild
@@ -23,5 +23,10 @@ DEPEND="${RDEPEND}
src_test() {
export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
+ if has network-sandbox ${FEATURES}; then
+ einfo "Skipping network tests due to network sandbox"
+ export GTEST_FILTER='-Retriever.http'
+ export NOSE_TESTMATCH='^(?!test_http).*'
+ fi
ros-catkin_src_test
}
diff --git a/dev-ros/roslaunch/files/40roslaunch b/dev-ros/roslaunch/files/40roslaunch
index 1e8f4dadcf29..e9dac18dd65f 100644
--- a/dev-ros/roslaunch/files/40roslaunch
+++ b/dev-ros/roslaunch/files/40roslaunch
@@ -1 +1,2 @@
ROS_MASTER_URI="http://localhost:11311/"
+ROS_DISTRO=Gentoo
diff --git a/dev-ros/roslaunch/roslaunch-1.15.8.ebuild b/dev-ros/roslaunch/roslaunch-1.15.8-r1.ebuild
similarity index 89%
rename from dev-ros/roslaunch/roslaunch-1.15.8.ebuild
rename to dev-ros/roslaunch/roslaunch-1.15.8-r1.ebuild
index 6c3529607d8f..b0c3d9412aae 100644
--- a/dev-ros/roslaunch/roslaunch-1.15.8.ebuild
+++ b/dev-ros/roslaunch/roslaunch-1.15.8-r1.ebuild
@@ -32,7 +32,7 @@ DEPEND="${RDEPEND}
)"
src_test() {
- rosdep update
+ export ROS_PACKAGE_PATH="${S}:${S}/../rosmaster/:${EPREFIX}/usr/share/ros_packages/rosparam:${EPREFIX}/usr/share/ros_packages/roslib:${EPREFIX}/usr/share/ros_packages/rosout"
ros-catkin_src_test
}
diff --git a/dev-ros/roslaunch/roslaunch-9999.ebuild b/dev-ros/roslaunch/roslaunch-9999.ebuild
index 6c3529607d8f..b0c3d9412aae 100644
--- a/dev-ros/roslaunch/roslaunch-9999.ebuild
+++ b/dev-ros/roslaunch/roslaunch-9999.ebuild
@@ -32,7 +32,7 @@ DEPEND="${RDEPEND}
)"
src_test() {
- rosdep update
+ export ROS_PACKAGE_PATH="${S}:${S}/../rosmaster/:${EPREFIX}/usr/share/ros_packages/rosparam:${EPREFIX}/usr/share/ros_packages/roslib:${EPREFIX}/usr/share/ros_packages/rosout"
ros-catkin_src_test
}
diff --git a/dev-ros/rostest/Manifest b/dev-ros/rostest/Manifest
index adf4f2af1194..00d95d9416dc 100644
--- a/dev-ros/rostest/Manifest
+++ b/dev-ros/rostest/Manifest
@@ -1,2 +1 @@
-DIST ros_comm-1.15.7.tar.gz 1080092 BLAKE2B d5c0dd1f54eac7aa11be21bbc680f85f988cc9328382c0c675b7d5986e888be603ed82affa5f51a270974d07044debe3ecf86f5647fd59cb29e8e791a227feb9 SHA512 67dc100e8ed03a25ea228cc7d456ec2203324098f9e11c9a249299df73bfc34efc75b1221c0fb6fceb38fece627f1dc5f2c23be93c9a1c85b1075784a45ff20e
DIST ros_comm-1.15.8.tar.gz 1080826 BLAKE2B c1a1e085225a96cf0b50309cb78e1ccdabefce1f23ee669393b7fc747537c7e39bfb6ad382b0d24e3b5507b1d0f3eaf2051a1bee90507b0e724e06a83df301a2 SHA512 b1c34ab6548400fc014eda496e5d1e1c7d134b9062a031386ac4eac3245ca83b034f74f0a189ccf9ec6933c18d6df0ae1a93d05f1526d09debf70c25aa25b6b9
diff --git a/dev-ros/rostest/rostest-1.15.7.ebuild b/dev-ros/rostest/rostest-1.15.7.ebuild
deleted file mode 100644
index bf3e8a239224..000000000000
--- a/dev-ros/rostest/rostest-1.15.7.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=tools/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Integration test suite based on roslaunch compatible with xUnit frameworks"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- dev-ros/rosunit[${PYTHON_SINGLE_USEDEP}]
- dev-libs/boost:=[threads]
-"
-DEPEND="${RDEPEND}"
-RDEPEND="${RDEPEND}
- dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
- dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
- dev-ros/roslaunch[${PYTHON_SINGLE_USEDEP}]
- dev-ros/rosmaster[${PYTHON_SINGLE_USEDEP}]"
-DEPEND="${DEPEND}
- test? (
- ${RDEPEND}
- dev-cpp/gtest
- dev-ros/rostopic
- )"
diff --git a/dev-ros/rostest/rostest-1.15.8.ebuild b/dev-ros/rostest/rostest-1.15.8.ebuild
index bf3e8a239224..37af233ee567 100644
--- a/dev-ros/rostest/rostest-1.15.8.ebuild
+++ b/dev-ros/rostest/rostest-1.15.8.ebuild
@@ -27,6 +27,7 @@ RDEPEND="${RDEPEND}
DEPEND="${DEPEND}
test? (
${RDEPEND}
+ dev-ros/rosservice
dev-cpp/gtest
dev-ros/rostopic
)"
diff --git a/dev-ros/rostest/rostest-9999.ebuild b/dev-ros/rostest/rostest-9999.ebuild
index bf3e8a239224..37af233ee567 100644
--- a/dev-ros/rostest/rostest-9999.ebuild
+++ b/dev-ros/rostest/rostest-9999.ebuild
@@ -27,6 +27,7 @@ RDEPEND="${RDEPEND}
DEPEND="${DEPEND}
test? (
${RDEPEND}
+ dev-ros/rosservice
dev-cpp/gtest
dev-ros/rostopic
)"
diff --git a/dev-ros/roswtf/roswtf-1.15.8.ebuild b/dev-ros/roswtf/roswtf-1.15.8.ebuild
index f29c9e72edb3..e6c601a37116 100644
--- a/dev-ros/roswtf/roswtf-1.15.8.ebuild
+++ b/dev-ros/roswtf/roswtf-1.15.8.ebuild
@@ -16,15 +16,28 @@ IUSE=""
RDEPEND="
$(python_gen_cond_dep "dev-python/paramiko[\${PYTHON_USEDEP}]")
- dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
+ dev-ros/rosbuild[${PYTHON_SINGLE_USEDEP}]
+ dev-ros/rosgraph[${PYTHON_SINGLE_USEDEP}]
+ dev-ros/roslaunch[${PYTHON_SINGLE_USEDEP}]
+ dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
+ dev-ros/rosnode[${PYTHON_SINGLE_USEDEP}]
+ dev-ros/rosservice[${PYTHON_SINGLE_USEDEP}]
"
DEPEND="${RDEPEND}
test? (
dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
+ dev-ros/rosbag[${PYTHON_SINGLE_USEDEP}]
+ dev-ros/roslang[${PYTHON_SINGLE_USEDEP}]
+ dev-ros/std_srvs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
$(python_gen_cond_dep "dev-util/rosdep[\${PYTHON_USEDEP}]")
$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
)"
+BDEPEND="
+ test? (
+ dev-ros/cmake_modules
+ )
+"
src_test() {
# Needed for tests to find internal launch file
diff --git a/dev-ros/roswtf/roswtf-9999.ebuild b/dev-ros/roswtf/roswtf-9999.ebuild
index f29c9e72edb3..e6c601a37116 100644
--- a/dev-ros/roswtf/roswtf-9999.ebuild
+++ b/dev-ros/roswtf/roswtf-9999.ebuild
@@ -16,15 +16,28 @@ IUSE=""
RDEPEND="
$(python_gen_cond_dep "dev-python/paramiko[\${PYTHON_USEDEP}]")
- dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
+ dev-ros/rosbuild[${PYTHON_SINGLE_USEDEP}]
+ dev-ros/rosgraph[${PYTHON_SINGLE_USEDEP}]
+ dev-ros/roslaunch[${PYTHON_SINGLE_USEDEP}]
+ dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
+ dev-ros/rosnode[${PYTHON_SINGLE_USEDEP}]
+ dev-ros/rosservice[${PYTHON_SINGLE_USEDEP}]
"
DEPEND="${RDEPEND}
test? (
dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
+ dev-ros/rosbag[${PYTHON_SINGLE_USEDEP}]
+ dev-ros/roslang[${PYTHON_SINGLE_USEDEP}]
+ dev-ros/std_srvs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
$(python_gen_cond_dep "dev-util/rosdep[\${PYTHON_USEDEP}]")
$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
)"
+BDEPEND="
+ test? (
+ dev-ros/cmake_modules
+ )
+"
src_test() {
# Needed for tests to find internal launch file
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index 3df1fb0d0b36..bad27d304561 100644
Binary files a/dev-ruby/Manifest.gz and b/dev-ruby/Manifest.gz differ
diff --git a/dev-ruby/barby/barby-0.6.8.ebuild b/dev-ruby/barby/barby-0.6.8.ebuild
index 78290277d133..4914a6e63785 100644
--- a/dev-ruby/barby/barby-0.6.8.ebuild
+++ b/dev-ruby/barby/barby-0.6.8.ebuild
@@ -3,7 +3,7 @@
EAPI=6
-USE_RUBY="ruby24 ruby25 ruby26"
+USE_RUBY="ruby24 ruby25 ruby26 ruby27"
RUBY_FAKEGEM_TASK_TEST="test"
diff --git a/dev-ruby/chunky_png/Manifest b/dev-ruby/chunky_png/Manifest
index 77132d83530b..5d39320168d8 100644
--- a/dev-ruby/chunky_png/Manifest
+++ b/dev-ruby/chunky_png/Manifest
@@ -1 +1,2 @@
DIST chunky_png-1.3.11.gem 352768 BLAKE2B a60607830c41921f8e8018b91e459103d0a793a6c3a5491f36399dff0ac83dee09f66173f01e3e8f8f2bcf9fc69b1ffa53a9bc29adda758be75fefec391f7900 SHA512 5935bc7672ef4eb271abe0e2d4b83c2628ecb9d4fc1bb095d28d0f7fd5e13443492bc91b2c9c1de59d8bb669c185cddaeef62d03d3b0df88ecfaaa3c7a2a0ba6
+DIST chunky_png-1.3.12.gem 353792 BLAKE2B dc891b23189ab4ff1f487d1ef3e83ede822261691c77a04d4ec4cb268902a6a3dac0db705644e7cceea6d5d097f520409005ebdf6496f5d3be339f2e0d27b13c SHA512 84325afc3903b3d0b4e4a19ebd9548029e02f68d45896efdcfe6eb23a64360f2c2b3d191c736cc172a11258828bf82687b950f95104cbdae639d00277c37bebf
diff --git a/dev-ruby/chunky_png/chunky_png-1.3.12.ebuild b/dev-ruby/chunky_png/chunky_png-1.3.12.ebuild
new file mode 100644
index 000000000000..58f7a1ed2e69
--- /dev/null
+++ b/dev-ruby/chunky_png/chunky_png-1.3.12.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_DOCDIR=""
+
+RUBY_FAKEGEM_EXTRADOC="BENCHMARKING.rdoc CHANGELOG.rdoc README.md"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+RUBY_FAKEGEM_GEMSPEC="chunky_png.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Pure Ruby library that can read and write PNG images"
+HOMEPAGE="https://wiki.github.com/wvanbergen/chunky_png"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+all_ruby_prepare() {
+ sed -i -e '/[bB]undler/s:^:#:' {spec,benchmarks}/*.rb || die
+ rm Gemfile* || die
+
+ # Avoid git dependency
+ sed -i -e '/s.files/d' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/rqrcode/rqrcode-1.1.1.ebuild b/dev-ruby/rqrcode/rqrcode-1.1.1.ebuild
index 68073826baec..0732f526841c 100644
--- a/dev-ruby/rqrcode/rqrcode-1.1.1.ebuild
+++ b/dev-ruby/rqrcode/rqrcode-1.1.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26"
+USE_RUBY="ruby24 ruby25 ruby26 ruby27"
RUBY_FAKEGEM_EXTRADOC="README.md"
diff --git a/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.7.2.ebuild b/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.7.2.ebuild
index 2f9eb0abb6e8..8bdf154cb92b 100644
--- a/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.7.2.ebuild
+++ b/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.7.2.ebuild
@@ -16,7 +16,7 @@ RUBY_S="$MY_P"/bindings/ruby
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
IUSE="graph test"
RESTRICT="!test? ( test )"
REQUIRED_USE="test? ( graph )"
diff --git a/dev-ruby/ruby-gettext/Manifest b/dev-ruby/ruby-gettext/Manifest
index 8dbf8c746a80..d93c23c99369 100644
--- a/dev-ruby/ruby-gettext/Manifest
+++ b/dev-ruby/ruby-gettext/Manifest
@@ -1,2 +1,3 @@
DIST gettext-3.2.9.gem 285696 BLAKE2B a7bc40b2102f5b937d5f0e407dbaa23ead1da59eb9284c10a249c59548d0e2ad5fcd56b8855439893d2d31b57e0109bb6a9d5cc2d24075f5e360dc16b9291137 SHA512 21496c38cfc16a2b280f30bb94ff4560007eaa7f02c2341cb26aca2969a663c0863cdb650b4eadfd262d8585111dfb572e2ebc66a7a879045de50bf9da80a501
DIST gettext-3.3.5.gem 290816 BLAKE2B 74434c3feaedc16a17ee530669dacbc4b32ae0be95eb903ce89131619e862e1c823351653ce3c5f95f0882c183e3b2fe87b423a245aa2d8803688ce7e6afb5f7 SHA512 6777b96dd73b3d454c0a14a40d2ac0eac52894fa58067ba9ec976627c96efc98b294b1498bed965d0426bcaa1b371dcde5745101e05e21e408397b4e8d31894b
+DIST gettext-3.3.6.gem 291840 BLAKE2B 5ca1a48582cb46e96fd672d9dc9e65ef3d5171560cc82fae147669023dafef761b67a68f31eb32fe1e433d918efe2c4c6983c32d8985093a3f090ab718703fe4 SHA512 ed03d370c03fe7502360aeac33f924c7463d7cde6bcde85c66befe8560b221a00f995ba6208ee14d1ca9cbaad6bd37aa7d0085ed75557f5b07724468de4433a8
diff --git a/dev-ruby/ruby-gettext/ruby-gettext-3.3.6.ebuild b/dev-ruby/ruby-gettext/ruby-gettext-3.3.6.ebuild
new file mode 100644
index 000000000000..7ce7349633f1
--- /dev/null
+++ b/dev-ruby/ruby-gettext/ruby-gettext-3.3.6.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_NAME="${PN/ruby-/}"
+RUBY_FAKEGEM_VERSION="${PV%_*}"
+
+RUBY_FAKEGEM_RECIPE_DOC="yard"
+RUBY_FAKEGEM_EXTRADOC="README.md doc/text/news.md"
+
+RUBY_FAKEGEM_TASK_TEST="none"
+
+RUBY_FAKEGEM_EXTRAINSTALL="locale po"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Native Language Support Library and Tools modeled after GNU gettext package"
+HOMEPAGE="https://ruby-gettext.github.io/"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc test"
+SLOT="0"
+LICENSE="|| ( Ruby LGPL-3+ )"
+
+ruby_add_rdepend ">=dev-ruby/locale-2.0.5 >=dev-ruby/text-1.3.0"
+
+ruby_add_bdepend "doc? ( dev-ruby/yard )
+ dev-ruby/racc"
+ruby_add_bdepend "test? (
+ dev-ruby/test-unit:2
+ dev-ruby/test-unit-rr )"
+
+RDEPEND+=" sys-devel/gettext"
+DEPEND+=" sys-devel/gettext"
+
+all_ruby_prepare() {
+ # Fix broken racc invocation
+ sed -i -e '/command_line/ s/#{racc}/-S racc/' Rakefile || die
+
+ # Avoid bundler dependency
+ sed -i -e '/bundler/,/helper.install/ s:^:#:' \
+ -e 's/helper.gemspec/Gem::Specification.new/' Rakefile || die
+
+ # Avoid dependency on developer-specific tools.
+ sed -i -e '/notify/ s:^:#:' test/run-test.rb || die
+
+ # Avoid tests failing due to a missing test file.
+ #sed -i -e '/test_invalid_charset/,/end/ s:^:#:' test/test_mo.rb || die
+
+ # Avoid SAFE mode test that fails on ruby 2.6
+ sed -i -e '/test_safe_mode/aomit' test/test_gettext.rb || die
+}
+
+each_ruby_test() {
+ # Upstream tries to daisy-chain rake calls but they fail badly
+ # with our setup, so run it manually.
+ ${RUBY} test/run-test.rb || die "tests failed"
+}
+
+all_ruby_install() {
+ all_fakegem_install
+
+ dodoc -r samples
+}
diff --git a/dev-tex/Manifest.gz b/dev-tex/Manifest.gz
index bec311299201..a420f29732ad 100644
Binary files a/dev-tex/Manifest.gz and b/dev-tex/Manifest.gz differ
diff --git a/dev-tex/cjk-latex/Manifest b/dev-tex/cjk-latex/Manifest
deleted file mode 100644
index c97a714026a8..000000000000
--- a/dev-tex/cjk-latex/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST cjk-4.8.4-doc.tar.gz 2152418 BLAKE2B 09b72aa75efa01ea880a99bf0c289dd3f7d0c107080b38fb99390a39c1179884eb55fcd32f978f07fdad25898aabbc636367e3ab83d1f1c1ce95aedfeb46efb7 SHA512 453ff48554d950eeba53481e0643dcd96214627a12e685e1c39476e19aee9f5284ae347cf694df583c43cc273be44a5b56511bfc622144552f07e51d9e1e0877
-DIST cjk-4.8.4-fonts.zip 20384230 BLAKE2B 6b73b20381b6a1de91cc7de6760f9c453616857b5fe493e90944145ae16c42b85f760018f2b2a6397fd8f1b02801b58b6e35f2a5493fcf0b367be2d25463664d SHA512 ec55aa604f1e8b19936d0e22949f8100f6442c6c93a5f240a78c9891289d838dd29350dcb4d20998c3e7a13ba05d451934ed29a2d7e7cbbaf517db06a92204d1
-DIST cjk-4.8.4.tar.gz 556197 BLAKE2B c884d8482dc107344c6afd3d2eba49c84907fdeaa9bd422c1239f2c43ed643991ad7c16c3c2a6dbf7d7bb0642c8f41d707feb98a5d08fc32c40de69615eb08bc SHA512 d1dc754c176331d0694561158554072083e6b8f2bbeb2516915c8bc8b15bbcedff81f2a14655cc9d77d832121971a5f9792e3c477336f9b5bcb77c8f15f8cfa3
diff --git a/dev-tex/cjk-latex/cjk-latex-4.8.4-r1.ebuild b/dev-tex/cjk-latex/cjk-latex-4.8.4-r1.ebuild
deleted file mode 100644
index c8ab85a83a96..000000000000
--- a/dev-tex/cjk-latex/cjk-latex-4.8.4-r1.ebuild
+++ /dev/null
@@ -1,167 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit latex-package elisp-common toolchain-funcs flag-o-matic
-
-MY_P="${P/-latex/}"
-
-DESCRIPTION="LaTeX package to use CJK (Chinese/Japanese/Korean) scripts in various encodings"
-HOMEPAGE="https://cjk.ffii.org/"
-# fonts are taken from ftp://ftp.ctan.org/tex-archive/fonts/CJK.zip
-SRC_URI="ftp://ftp.ffii.org/pub/cjk/${MY_P}.tar.gz
- mirror://gentoo/${MY_P}-fonts.zip
- doc? ( ftp://ftp.ffii.org/pub/cjk/${MY_P}-doc.tar.gz )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="doc emacs"
-
-RDEPEND="virtual/latex-base
- dev-libs/kpathsea
- emacs? ( >=app-editors/emacs-23.1:* )"
-
-DEPEND="${RDEPEND}"
-
-BDEPEND="app-arch/unzip
- virtual/pkgconfig"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
- default
- for i in "${WORKDIR}"/CJK/*.tar.gz; do
- tar -xzf ${i} || die "failed to unpack $i"
- done
- find texmf/fonts/hbf -type f -exec cp {} "${T}" \; || die
- sed -i -e "/^pk_files/s/no/yes/" \
- -e "/^dpi_x/s/300/500/" \
- texmf/hbf2gf/*.cfg || die
-}
-
-src_configure() {
- has_version '>=dev-libs/kpathsea-6.2.1' && append-cppflags "$($(tc-getPKG_CONFIG) --cflags kpathsea)"
- cd utils || die
- for d in *conv; do
- cd ${d} || die
- local f=`echo ${d} | tr '[:upper:]' '[:lower:]'`
- echo "all: $f" >> Makefile
- if [ ${d} = CEFconv ] ; then
- echo "all: cef5conv cefsconv" >> Makefile
- fi
- cd - || die
- done
- cd hbf2gf || die
- econf --with-kpathsea-lib="${EPREFIX}"/usr/$(get_libdir) \
- --with-kpathsea-include="${EPREFIX}"/usr/include/kpathsea
-}
-
-src_compile() {
- tc-export CC
- cd utils || die
- for d in *conv; do
- cd ${d} || die
- emake
- cd - || die
- done
- cd hbf2gf || die
- emake
- cd - || die
-
- if use emacs ; then
- cd lisp || die
- elisp-compile *.el
- cd emacs || die
- elisp-compile *.el
- cd ../mule-2.3 || die
- elisp-compile *.el
- fi
-
- cd "${T}" || die
-
- for f in "${S}"/texmf/hbf2gf/*.cfg ; do
- env TEXMFCNF="${EPREFIX}/etc/texmf/web2c" HBF_TARGET="${S}/texmf/fonts" "${S}/utils/hbf2gf/hbf2gf" $f || die
- done
-
- einfo "Generating pk fonts"
- for gf in *.gf ; do
- einfo "${gf}"
- gftopk $gf || die
- done
-}
-
-src_install() {
- cd utils || die
- for d in *conv; do
- cd ${d} || die
- local f=`echo $d | tr '[:upper:]' '[:lower:]'`
- dobin *latex *conv
- doman *.1
- cd - || die
- done
- cd hbf2gf || die
- doman hbf2gf.1
- dobin hbf2gf
- dodir "${TEXMF}/fonts/hbf"
-
- cd "${S}" || die
-
- # Install pk fonts
- pushd texmf &>/dev/null || die
- for d in fonts/pk/modeless/*/* ; do
- insinto ${TEXMF}/${d}
- for f in "${T}"/${d##*/}*.pk ; do
- newins ${f} `basename ${f/.pk/.500pk}`
- done
- done
- popd &>/dev/null || die
-
- insinto "${TEXMF}/tex/latex/${PN}"
- doins -r texinput/.
- doins -r contrib/wadalab
-
- if use emacs ; then
- cd utils/lisp || die
- elisp-install ${PN} *.el{,c} emacs/*.el{,c} mule-2.3/*.el{,c}
- fi
-
- cd "${S}" || die
-
- # uwpatch stuff
- insinto ${TEXMF}/scripts/uwpatch
- doins uwpatch/uwpatchold.sh
- insinto ${TEXMF}/fonts/afm/uwpatch
- doins uwpatch/*.afm
-
- # jisksp40 stuff
- insinto ${TEXMF}
- doins -r jisksp40/texmf/.
-
- # kanji48 stuff
- insinto ${TEXMF}
- doins -r kanji48/texmf/.
-
- use doc || rm -rf texmf/doc
- insinto ${TEXMF}
- doins -r texmf/.
-
- # Move fonts because hbf2gf expects them in MISCFONTS
- mv "${ED}/${TEXMF}/fonts/hbf" "${ED}/${TEXMF}/fonts/misc" || die "mv font failed"
-
- insinto ${TEXMF}/hbf2gf
- doins -r utils/hbf2gf/cfg/.
-
- insinto ${TEXMF}/scripts/subfonts
- doins -r utils/subfonts/.
-
- rm -f doc/COPYING doc/INSTALL || die
- dodoc ChangeLog README
- if use doc ; then
- dodoc -r doc/.
- dodoc -r examples
- fi
- docinto uwpatch
- dodoc uwpatch/README
-}
diff --git a/dev-tex/cjk-latex/metadata.xml b/dev-tex/cjk-latex/metadata.xml
deleted file mode 100644
index ce43799eecd6..000000000000
--- a/dev-tex/cjk-latex/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
- tex@gentoo.org
- Gentoo TeX Project
-
-
- cjk@gentoo.org
- Cjk
-
-
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 2998c7c7b3a9..22b7ab4ee461 100644
Binary files a/dev-util/Manifest.gz and b/dev-util/Manifest.gz differ
diff --git a/dev-util/bless/Manifest b/dev-util/bless/Manifest
index befbc79aed60..06151ce36783 100644
--- a/dev-util/bless/Manifest
+++ b/dev-util/bless/Manifest
@@ -1,2 +1 @@
-DIST bless-0.6.0.tar.gz 745694 BLAKE2B eb23edf3fd9c45b9848810ff022a7e9b7d760c22444426bbbaf63d69ee45754d085eb105c4951c0d57fce7b284c6b0a8fb9b7e061219a55d109c9ef844b61c35 SHA512 69d2279b64503b97c8a67991c2a7a527d872835e3acfad7eafa8d87e376d2cecf3fa27de9e12726680a8f3c8ac92b888a4895a1f342c4beeaceef9e1f3ededdb
DIST bless-0.6.2.tar.gz 514695 BLAKE2B 2c9681e03992d42b20d0073e9107e5bd83d6f1699235b49fb6cf14fb5f9bc87e682e96b4f8bab2b45a3211515a8990e72b80922a62198c7ad603aeb5f3d3c406 SHA512 3fef715ed138323af50437ef8cda3d9f53987498042f1b4df2d9ce23f00dade68147cbdf28b85aed8b9c594fb5c43839c9dedbc14a994ad609fd4cedd89bfcf5
diff --git a/dev-util/bless/bless-0.6.0-r3.ebuild b/dev-util/bless/bless-0.6.0-r3.ebuild
deleted file mode 100644
index d4c3ef7205fd..000000000000
--- a/dev-util/bless/bless-0.6.0-r3.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools gnome2 mono-env
-
-DESCRIPTION="GTK# Hex Editor"
-HOMEPAGE="https://github.com/bwrsandman/Bless/"
-SRC_URI="https://dev.gentoo.org/~ikelos/devoverlay-distfiles/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-RDEPEND="
- >=dev-lang/mono-1.1.14
- >=dev-dotnet/gtk-sharp-2.12.21
-"
-DEPEND="${RDEPEND}
- app-text/rarian
- >=sys-devel/gettext-0.15
- virtual/pkgconfig
-"
-
-# See bug 278162
-# Waiting on nunit ebuild entering the tree
-RESTRICT="test"
-
-pkg_setup() {
- # Stolen from enlightenment.eclass
- cp $(type -p gettextize) "${T}/" || die "Could not copy gettextize"
- sed -i -e 's:read dummy < /dev/tty::' "${T}/gettextize"
-
- mono-env_pkg_setup
-}
-
-src_prepare() {
- einfo "Running gettextize -f --no-changelog..."
- ( "${T}/gettextize" -f --no-changelog > /dev/null ) || die "gettexize failed"
- eapply "${FILESDIR}/${P}-pixmap.patch"
- eapply "${FILESDIR}/${P}-docpath.patch"
- eapply "${FILESDIR}/${P}-mono-4.patch"
- eautoreconf
- gnome2_src_prepare
-}
-
-src_configure() {
- gnome2_src_configure \
- --enable-unix-specific \
- $(use_enable debug)
-}
diff --git a/dev-util/bless/bless-0.6.0-r4.ebuild b/dev-util/bless/bless-0.6.0-r4.ebuild
deleted file mode 100644
index e7ae88c0e92e..000000000000
--- a/dev-util/bless/bless-0.6.0-r4.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools gnome2 mono-env
-
-DESCRIPTION="GTK# Hex Editor"
-HOMEPAGE="https://github.com/bwrsandman/Bless/"
-SRC_URI="https://dev.gentoo.org/~ikelos/devoverlay-distfiles/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-RDEPEND="
- >=dev-lang/mono-1.1.14
- >=dev-dotnet/gtk-sharp-2.12.21:2
-"
-DEPEND="${RDEPEND}
- app-text/rarian
- >=sys-devel/gettext-0.15
- virtual/pkgconfig
-"
-
-# See bug 278162
-# Waiting on nunit ebuild entering the tree
-RESTRICT="test"
-
-pkg_setup() {
- # Stolen from enlightenment.eclass
- cp $(type -p gettextize) "${T}/" || die "Could not copy gettextize"
- sed -i -e 's:read dummy < /dev/tty::' "${T}/gettextize"
-
- mono-env_pkg_setup
-}
-
-src_prepare() {
- einfo "Running gettextize -f --no-changelog..."
- ( "${T}/gettextize" -f --no-changelog > /dev/null ) || die "gettexize failed"
- eapply "${FILESDIR}/${P}-pixmap.patch"
- eapply "${FILESDIR}/${P}-docpath.patch"
- eapply "${FILESDIR}/${P}-mono-4.patch"
- eautoreconf
- gnome2_src_prepare
-}
-
-src_configure() {
- gnome2_src_configure \
- --enable-unix-specific \
- $(use_enable debug)
-}
diff --git a/dev-util/bless/bless-0.6.2-r1.ebuild b/dev-util/bless/bless-0.6.2-r1.ebuild
index 06741696a4d9..92feecfe9620 100644
--- a/dev-util/bless/bless-0.6.2-r1.ebuild
+++ b/dev-util/bless/bless-0.6.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019 Gentoo Authors
+# Copyright 2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -28,6 +28,7 @@ DEPEND="${RDEPEND}
# See bug 278162
# Waiting on nunit ebuild entering the tree
RESTRICT="test"
+PATCHES=("${FILESDIR}/bless-0.6.2-range-disambiguation.patch")
pkg_setup() {
mono-env_pkg_setup
diff --git a/dev-util/bless/files/bless-0.6.0-docpath.patch b/dev-util/bless/files/bless-0.6.0-docpath.patch
deleted file mode 100644
index b1121424d88b..000000000000
--- a/dev-util/bless/files/bless-0.6.0-docpath.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-diff --git a/Makefile.am b/Makefile.am
-index 33f265b..346326d 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -1,6 +1,9 @@
- EXTRA_DIST = AUTHORS COPYING NEWS README README.packaging \
- bless.mdp bless.mds bless.spec autogen.sh bless.mi
-
-+doc_DATA = AUTHORS COPYING INSTALL ChangeLog NEWS \
-+ README README.packaging bless.spec
-+
- SUBDIRS = po builder src bin data doc . tests
-
- DIST_SUBDIRS= po builder src bin doc data tests
-@@ -34,11 +37,5 @@ bless-builder:
- dist-hook:
- bzr log > $(distdir)/ChangeLog
-
--install-data-local:
-- $(INSTALL) -d $(DESTDIR)$(datadir)/doc/$(PACKAGE_NAME)
-- $(INSTALL_DATA) AUTHORS COPYING INSTALL ChangeLog NEWS \
-- README README.packaging bless.spec \
-- $(DESTDIR)$(datadir)/doc/$(PACKAGE_NAME)
--
- uninstall-local:
- rm -rf $(DESTDIR)$(libdir)/$(PACKAGE_NAME)
-diff --git a/doc/Makefile.am b/doc/Makefile.am
-index b18e94a..d7eecc6 100644
---- a/doc/Makefile.am
-+++ b/doc/Makefile.am
-@@ -1,4 +1 @@
- SUBDIRS= developer user
--
--uninstall-local:
-- rm -rf $(DESTDIR)$(datadir)/doc/$(PACKAGE_NAME)
-diff --git a/doc/user/Makefile.am b/doc/user/Makefile.am
-index 729b295..58a1358 100644
---- a/doc/user/Makefile.am
-+++ b/doc/user/Makefile.am
-@@ -7,6 +7,11 @@ CLEANFILES=$(OMF)
-
- noinst_SCRIPTS=$(OMF)
-
-+docmandir=$(docdir)/user
-+docfigsdir=$(docmandir)/figures
-+
-+docfigs_DATA=$(FIGURES)
-+docman_DATA=$(DOCS) $(wildcard *.html)
-
- $(OMF): $(OMF).in
- if [ -x `which scrollkeeper-preinstall` ]; then \
-@@ -27,11 +32,6 @@ dist-hook: doc
- rm html_file_list
-
- install-data-local:
-- $(INSTALL) -d $(DESTDIR)$(datadir)/doc/$(PACKAGE_NAME)/user
-- $(INSTALL) -d $(DESTDIR)$(datadir)/doc/$(PACKAGE_NAME)/user/figures
-- $(INSTALL_DATA) $(DOCS) $(wildcard *.html) \
-- $(DESTDIR)$(datadir)/doc/$(PACKAGE_NAME)/user
-- $(INSTALL_DATA) $(FIGURES) $(DESTDIR)$(datadir)/doc/$(PACKAGE_NAME)/user/figures
- $(INSTALL) -d $(DESTDIR)$(datadir)/omf/$(PACKAGE_NAME)
- $(INSTALL_DATA) $(OMF) $(DESTDIR)$(datadir)/omf/$(PACKAGE_NAME)
- if WITH_SCROLLKEEPER
-@@ -39,7 +39,6 @@ if WITH_SCROLLKEEPER
- endif
-
- uninstall-local:
-- rm -rf $(DESTDIR)$(datadir)/doc/$(PACKAGE_NAME)/user
- rm $(DESTDIR)$(datadir)/omf/$(PACKAGE_NAME)/$(OMF)
- if WITH_SCROLLKEEPER
- scrollkeeper-update -o $(DESTDIR)$(datadir)/omf/$(PACKAGE_NAME)
diff --git a/dev-util/bless/files/bless-0.6.0-mono-4.patch b/dev-util/bless/files/bless-0.6.0-mono-4.patch
deleted file mode 100644
index 92b1100cf0e7..000000000000
--- a/dev-util/bless/files/bless-0.6.0-mono-4.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff --git a/builder/ModuleBuilder.cs b/builder/ModuleBuilder.cs
-index 0f62e92..7edb1ab 100644
---- a/builder/ModuleBuilder.cs
-+++ b/builder/ModuleBuilder.cs
-@@ -119,7 +119,7 @@ public class ModuleBuilder
- //System.Console.WriteLine("gmcs {0}", sb.ToString());
- System.Console.WriteLine(">> Building module {0}...", module.Name);
-
-- Process buildProcess = Process.Start("gmcs", sb.ToString());
-+ Process buildProcess = Process.Start("mcs", sb.ToString());
- buildProcess.WaitForExit();
-
- if (buildProcess.ExitCode == 0) {
-@@ -137,4 +137,4 @@ public class ModuleBuilder
- }
-
-
--}
-\ No newline at end of file
-+}
-diff --git a/configure.ac b/configure.ac
-index 415cc64..a8e527c 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -24,9 +24,9 @@ if test "x$PKG_CONFIG" = "xno"; then
- fi
-
- # C# compiler
--AC_PATH_PROG(MCS, gmcs, no)
-+AC_PATH_PROG(MCS, mcs, no)
-
--CS="gmcs C#"
-+CS="mcs C#"
- if test "x$MCS" = "xno" ; then
- AC_MSG_ERROR([No $CS compiler found])
- fi
diff --git a/dev-util/bless/files/bless-0.6.0-pixmap.patch b/dev-util/bless/files/bless-0.6.0-pixmap.patch
deleted file mode 100644
index de77cb84e750..000000000000
--- a/dev-util/bless/files/bless-0.6.0-pixmap.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-=== modified file 'src/gui/drawers/HexDrawer.cs'
---- a/src/gui/drawers/HexDrawer.cs 2007-06-13 12:20:53 +0000
-+++ b/src/gui/drawers/HexDrawer.cs 2009-04-10 23:21:41 +0000
-@@ -57,11 +57,14 @@
-
- //System.Console.WriteLine(s);
-
-- pangoLayout.SetText(s);
-+ pangoLayout.SetText(s.Substring(0,256));
-
-
- gc.RgbFgColor = fg;
- pix.DrawLayout(gc, 0, 0, pangoLayout);
-+
-+ pangoLayout.SetText(s.Substring(256,256));
-+ pix.DrawLayout(gc, 128*2*width, 0, pangoLayout);
-
- return pix;
- }
-
diff --git a/dev-util/bless/files/bless-0.6.2-range-disambiguation.patch b/dev-util/bless/files/bless-0.6.2-range-disambiguation.patch
new file mode 100644
index 000000000000..788a57866cba
--- /dev/null
+++ b/dev-util/bless/files/bless-0.6.2-range-disambiguation.patch
@@ -0,0 +1,202 @@
+From 84801988f908e51d9843c3e0ee8f2cd05c0a2d97 Mon Sep 17 00:00:00 2001
+From: davidcim
+Date: Thu, 3 Oct 2019 12:38:25 +0200
+Subject: [PATCH] Fix building error CS0104: 'Range' is an ambiguous reference
+
+---
+ src/buffers/ByteBuffer.cs | 2 +-
+ src/gui/DataBookFinder.cs | 4 ++--
+ src/gui/areas/AreaGroup.cs | 20 ++++++++++----------
+ src/tools/find/FindOperations.cs | 6 +++---
+ src/tools/find/IFindStrategy.cs | 10 +++++-----
+ src/tools/find/IFinder.cs | 4 ++--
+ 6 files changed, 23 insertions(+), 23 deletions(-)
+
+diff --git a/src/buffers/ByteBuffer.cs b/src/buffers/ByteBuffer.cs
+index b9d9a24..72c1b42 100644
+--- a/src/buffers/ByteBuffer.cs
++++ b/src/buffers/ByteBuffer.cs
+@@ -671,7 +671,7 @@ public byte[] RangeToByteArray(IRange range)
+ /// Returns as a SegmentCollection the data contained in
+ /// the specified range in the buffer.
+ ///
+- public SegmentCollection RangeToSegmentCollection(Range range)
++ public SegmentCollection RangeToSegmentCollection(Util.Range range)
+ {
+ if (range.Size == 0)
+ return null;
+diff --git a/src/gui/DataBookFinder.cs b/src/gui/DataBookFinder.cs
+index 50b5034..3248d3a 100644
+--- a/src/gui/DataBookFinder.cs
++++ b/src/gui/DataBookFinder.cs
+@@ -234,7 +234,7 @@ void FindAsyncCallback(IAsyncResult ar)
+ {
+ GenericFindOperation state = (GenericFindOperation)ar.AsyncState;
+ ThreadedAsyncOperation.OperationResult result = state.Result;
+- Range match = state.Match;
++ Util.Range match = state.Match;
+
+ DataView dv = null;
+
+@@ -381,7 +381,7 @@ void ReplaceAllAsyncCallback(IAsyncResult ar)
+ {
+ ReplaceAllOperation state = (ReplaceAllOperation)ar.AsyncState;
+ ThreadedAsyncOperation.OperationResult result = state.Result;
+- Range firstMatch = state.FirstMatch;
++ Util.Range firstMatch = state.FirstMatch;
+
+ DataView dv = null;
+
+diff --git a/src/gui/areas/AreaGroup.cs b/src/gui/areas/AreaGroup.cs
+index 58ee147..4a27190 100644
+--- a/src/gui/areas/AreaGroup.cs
++++ b/src/gui/areas/AreaGroup.cs
+@@ -198,7 +198,7 @@ enum Changes { Offset = 1, Cursor = 2, Highlights = 4}
+ set { drawingArea = value; }
+ }
+
+- public Range Selection {
++ public Util.Range Selection {
+ get { return selection; }
+ set {
+ if (selection == value)
+@@ -251,7 +251,7 @@ public AreaGroup()
+ /// Get the range of bytes and the number of rows that
+ /// are displayed in the current view.
+ ///
+- public Range GetViewRange(out int nrows)
++ public Util.Range GetViewRange(out int nrows)
+ {
+ // find out number of rows, bytes in current view
+
+@@ -271,9 +271,9 @@ public Range GetViewRange(out int nrows)
+
+ // make sure we get an empty clipping Range when bleft==0
+ if (bleft > 0)
+- return new Range(offset, offset + bleft - 1);
++ return new Util.Range(offset, offset + bleft - 1);
+ else
+- return new Range();
++ return new Util.Range();
+ }
+
+ ///
+@@ -381,7 +381,7 @@ private void ClearHighlights()
+ private void SetupBufferCache()
+ {
+ int nrows;
+- Range view = GetViewRange(out nrows);
++ Util.Range view = GetViewRange(out nrows);
+ if (view.Size != bufferCache.Length)
+ bufferCache = new byte[view.Size];
+
+@@ -444,7 +444,7 @@ private void RenderExtra()
+ }
+ }
+ ///
+- /// Renders a of data using a specified
++ /// Renders a of data using a specified
+ ///
+ private void RenderHighlight(AtomicHighlight h)
+ {
+@@ -474,12 +474,12 @@ private AtomicHighlight[] SplitAtomicPrioritized(AtomicHighlight q, Highlight r)
+
+ if (q.Type > r.Type) {
+ ha = new AtomicHighlight[3]{new AtomicHighlight(r), new AtomicHighlight(q), new AtomicHighlight(r)};
+- Range.SplitAtomic(ha, r, q);
++ Util.Range.SplitAtomic(ha, r, q);
+ ha[1].AddContainer(r);
+ }
+ else {
+ ha = new AtomicHighlight[3]{new AtomicHighlight(q), new AtomicHighlight(r), new AtomicHighlight(q)};
+- Range.SplitAtomic(ha, q, r);
++ Util.Range.SplitAtomic(ha, q, r);
+ foreach (Highlight h in q.Containers)
+ ha[1].AddContainer(h);
+ }
+@@ -533,7 +533,7 @@ private IntervalTree BreakDownHighlights(Highlight s, IList GetAtomicHighlights()
+ {
+ int nrows;
+- Range clip = GetViewRange(out nrows);
++ Util.Range clip = GetViewRange(out nrows);
+ Highlight view = new Highlight(clip, Drawer.HighlightType.Normal);
+
+ // get all highlights in current view
+@@ -618,7 +618,7 @@ private void RenderCursor(IntervalTree atomicHighlights)
+ // if we don't find an overlap this means that either
+ // 1. the prev cursor position is not visible on the screen
+ // 2. the prev cursor position is at or beyond the end of the file
+- IList