diff --git a/Manifest.files.gz b/Manifest.files.gz
index 36d1675c529e..3557bd3b9a33 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 03f32ce962e4..5ee9a85f5d97 100644
Binary files a/app-admin/Manifest.gz and b/app-admin/Manifest.gz differ
diff --git a/app-admin/ansible/Manifest b/app-admin/ansible/Manifest
index ccdb31c5f7de..547a03e7134d 100644
--- a/app-admin/ansible/Manifest
+++ b/app-admin/ansible/Manifest
@@ -1,2 +1,3 @@
+DIST ansible-2.10.0.tar.gz 25454980 BLAKE2B 91f930518b90b36aa2c21f553092233059fada86fd1674c9c6e881484b1bd4e68a3eaa05d82e15115906e55da99c43394c3de36a898e26bb222f780b82f8a5bd SHA512 878036f06e1705e4392223bda210b2acae0232069d0cec02a47f13f6b3bc6c9538fb515a2d2dc6003695bcf0915fdd3dfc5b8dc59355e37e2ca8fa48bbd79657
DIST ansible-2.9.12.tar.gz 14260349 BLAKE2B 6d7fdc82489df755196b890b39c166e9639c94e4238b4bf33686a3ab17fcc92c6b3a05f80e1276795b966aaa318ec7d9003099950102c014adb1a5d730928633 SHA512 6c05c49e363d4d68516dfea448cead3e2c281d1288c9467a0b6dd083504f303df694ed1c5957ae6582b28acc937d12d13333254328e13bac430b9b7fa4354f23
DIST ansible-2.9.13.tar.gz 14261322 BLAKE2B 5de939a99cd703eaf240f536a9a4b707e3931364647782dde2bbebd5b755253594cbb1cf8c4e9f22a14fca85c9f018ee6ea26bce1cbe2145ba72e5f5ec313670 SHA512 cb08adf62df0f3650425a5d960baadd7439c7c1e95b8f9df3d08e7504f9622b9e5f7104b8700b0f1e9fe318d349a6a5728e9178f0193fb4a190456e30a2f1eb2
diff --git a/app-admin/ansible/ansible-2.10.0.ebuild b/app-admin/ansible/ansible-2.10.0.ebuild
new file mode 100644
index 000000000000..d62ac3db6e36
--- /dev/null
+++ b/app-admin/ansible/ansible-2.10.0.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+
+inherit distutils-r1 eutils
+
+DESCRIPTION="Model-driven deployment, config management, and command execution framework"
+HOMEPAGE="https://ansible.com/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos"
+IUSE="doc test"
+RESTRICT="test"
+
+RDEPEND="
+ dev-python/paramiko[${PYTHON_USEDEP}]
+ dev-python/jinja[${PYTHON_USEDEP}]
+ dev-python/pyyaml[${PYTHON_USEDEP}]
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ dev-python/cryptography[${PYTHON_USEDEP}]
+ dev-python/httplib2[${PYTHON_USEDEP}]
+ dev-python/six[${PYTHON_USEDEP}]
+ dev-python/netaddr[${PYTHON_USEDEP}]
+ dev-python/pexpect[${PYTHON_USEDEP}]
+ net-misc/sshpass
+ virtual/ssh
+ !app-admin/ansible-base
+"
+DEPEND="
+ !app-admin/ansible-base
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ >=dev-python/packaging-16.6[${PYTHON_USEDEP}]
+ doc? (
+ dev-python/sphinx[${PYTHON_USEDEP}]
+ dev-python/sphinx-notfound-page[${PYTHON_USEDEP}]
+ >=dev-python/pygments-2.4.0[${PYTHON_USEDEP}]
+ )
+ test? (
+ ${RDEPEND}
+ dev-python/nose[${PYTHON_USEDEP}]
+ >=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
+ dev-python/passlib[${PYTHON_USEDEP}]
+ dev-python/coverage[${PYTHON_USEDEP}]
+ dev-python/unittest2[${PYTHON_USEDEP}]
+ dev-vcs/git
+ )"
+
+ANSIBLE_SKIP_CONFLICT_CHECK=1
+
+python_compile_all() {
+ if use doc; then
+ cd docs/docsite || die
+ export CPUS=4
+ emake -f Makefile.sphinx html
+ fi
+}
+
+python_test() {
+ nosetests -d -w test/units -v --with-coverage --cover-package=ansible --cover-branches || die
+}
+
+python_install_all() {
+ use doc && local HTML_DOCS=( docs/docsite/_build/html/. )
+ distutils-r1_python_install_all
+}
diff --git a/app-admin/op-cli-bin/Manifest b/app-admin/op-cli-bin/Manifest
new file mode 100644
index 000000000000..7d7f96f02d9f
--- /dev/null
+++ b/app-admin/op-cli-bin/Manifest
@@ -0,0 +1 @@
+DIST op_linux_amd64_v1.7.0.zip 3989846 BLAKE2B 074bcc248438c1cfa0436726fb3b101e5d60c477c406434d00bb7689d6004796373d8562e22fa870239c9d2234cfae21d7a8aa2b90e7807cb15df8870b2afd64 SHA512 7ab0792ba737a8f95ec874dc111fdb6cd45d552c5b5cfb9d35423a76f444c15718269e77faae978d773bfcaa7e7607f4b8b7e93616c8f7fc91caafb35c856a5e
diff --git a/sys-cluster/pbs-python/metadata.xml b/app-admin/op-cli-bin/metadata.xml
similarity index 59%
rename from sys-cluster/pbs-python/metadata.xml
rename to app-admin/op-cli-bin/metadata.xml
index 8bf4b5f36954..c36c37139fad 100644
--- a/sys-cluster/pbs-python/metadata.xml
+++ b/app-admin/op-cli-bin/metadata.xml
@@ -1,8 +1,8 @@
-
- cluster@gentoo.org
- Gentoo Cluster Project
+
+ williamh@gentoo.org
+ William Hubbs
diff --git a/app-admin/op-cli-bin/op-cli-bin-1.7.0.ebuild b/app-admin/op-cli-bin/op-cli-bin-1.7.0.ebuild
new file mode 100644
index 000000000000..a1bbc9ae0b9c
--- /dev/null
+++ b/app-admin/op-cli-bin/op-cli-bin-1.7.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="command line interface for the 1password password manager"
+HOMEPAGE="https://1password.com/downloads/command-line"
+SITE="https://cache.agilebits.com/dist/1P/op/pkg/v${PV}/"
+SRC_URI="${SITE}/op_linux_amd64_v${PV}.zip"
+
+LICENSE="all-rights-reserved"
+SLOT="0"
+KEYWORDS="~amd64"
+
+BDEPEND="app-arch/unzip"
+
+QA_PREBUILT="usr/bin/op"
+RESTRICT="bindist mirror"
+S="${WORKDIR}"
+
+src_install() {
+ dobin op
+}
diff --git a/app-admin/xkcdpass/xkcdpass-1.17.3.ebuild b/app-admin/xkcdpass/xkcdpass-1.17.3-r1.ebuild
similarity index 96%
rename from app-admin/xkcdpass/xkcdpass-1.17.3.ebuild
rename to app-admin/xkcdpass/xkcdpass-1.17.3-r1.ebuild
index 982abbe2a248..172601c94032 100644
--- a/app-admin/xkcdpass/xkcdpass-1.17.3.ebuild
+++ b/app-admin/xkcdpass/xkcdpass-1.17.3-r1.ebuild
@@ -4,6 +4,7 @@
EAPI=7
PYTHON_COMPAT=( python3_{7,8,9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
inherit distutils-r1
DESCRIPTION="Password generator inspired by XKCD 936"
diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index fd8c9e9f216c..cf925f76e271 100644
Binary files a/app-arch/Manifest.gz and b/app-arch/Manifest.gz differ
diff --git a/app-arch/rpm/Manifest b/app-arch/rpm/Manifest
index 7529e899a903..08fa264efdf5 100644
--- a/app-arch/rpm/Manifest
+++ b/app-arch/rpm/Manifest
@@ -1 +1,2 @@
DIST rpm-4.14.2.1.tar.bz2 4156574 BLAKE2B 2eb0cf621eecef7d8977d28d52be922156ceb64b14d2aefda0f5a927b90cf3d3e9c055d773e05ed52422254397153b79557dc94bdb43ca28a2ea126153a43c1f SHA512 0aad457f91918904c15649a1764ce7cbfaf38e083678031286e866f7997be0435a6b7b73596706d97e9263cff7b4df4a3150b142d81e6e3fddbfcf67bd83f990
+DIST rpm-4.16.0.tar.bz2 4341683 BLAKE2B 5161e5dcc6d9a1f1d4b8e44740fb368050b808fd9e8b8276fb17b530a4642e1b9ad104b5a30c0071215aef7f823eeab10988dd41f73af1c52d575529c374b5eb SHA512 177119c3ac3d48980db55bb4ba0fdbb2a911968e5efc690bfa8cc343f850fc90531cc0dee6dd8e45d2b14f0d951ced35bd8893d24011b7f270745d281ddf4e3d
diff --git a/app-arch/rpm/files/rpm-4.16.0-autotools.patch b/app-arch/rpm/files/rpm-4.16.0-autotools.patch
new file mode 100644
index 000000000000..9b1f71ad86e5
--- /dev/null
+++ b/app-arch/rpm/files/rpm-4.16.0-autotools.patch
@@ -0,0 +1,13 @@
+diff -uNr rpm-4.16.0.ORIG/configure.ac rpm-4.16.0/configure.ac
+--- rpm-4.16.0.ORIG/configure.ac 2020-10-01 11:02:21.605485875 +0100
++++ rpm-4.16.0/configure.ac 2020-10-01 11:05:34.077157904 +0100
+@@ -552,9 +552,6 @@
+
+ AM_CONDITIONAL([BDB], [test "x$have_bdb" != "xno"])
+ AM_CONDITIONAL([WITH_INTERNAL_DB],[test "x$have_bdb" = "xinternal"])
+-if test "x$have_bdb" = "xinternal"; then
+- AC_CONFIG_SUBDIRS(db3)
+-fi
+
+
+ #=================
diff --git a/app-arch/rpm/files/rpm-4.16.0-libdir.patch b/app-arch/rpm/files/rpm-4.16.0-libdir.patch
new file mode 100644
index 000000000000..c9f5f297233b
--- /dev/null
+++ b/app-arch/rpm/files/rpm-4.16.0-libdir.patch
@@ -0,0 +1,34 @@
+diff -uNr rpm-4.16.0.ORIG/configure.ac rpm-4.16.0/configure.ac
+--- rpm-4.16.0.ORIG/configure.ac 2020-10-01 11:08:43.780842602 +0100
++++ rpm-4.16.0/configure.ac 2020-10-01 11:09:03.533705353 +0100
+@@ -935,13 +935,7 @@
+ AC_DEFINE_UNQUOTED([RUNDIR],["${RUNDIR}"],[run-time variable directory])
+ AC_SUBST(RUNDIR)
+
+-if test X"$prefix" = XNONE ; then
+- usrprefix="$ac_default_prefix"
+-else
+- usrprefix=$prefix
+-fi
+-
+-RPMCONFIGDIR="`echo ${usrprefix}/lib/rpm`"
++RPMCONFIGDIR="`echo ${libexecdir}/rpm/`"
+ AC_SUBST(RPMCONFIGDIR)
+
+ AC_SUBST(OBJDUMP)
+diff -uNr rpm-4.16.0.ORIG/rpm.am rpm-4.16.0/rpm.am
+--- rpm-4.16.0.ORIG/rpm.am 2020-10-01 11:08:43.743842859 +0100
++++ rpm-4.16.0/rpm.am 2020-10-01 11:09:03.533705353 +0100
+@@ -1,10 +1,8 @@
+ # Internal binaries
+-## HACK: It probably should be $(libexecdir)/rpm or $(libdir)/rpm
+-rpmlibexecdir = $(prefix)/lib/rpm
++rpmlibexecdir = $(pkglibexecdir)
+
+ # Host independent config files
+-## HACK: it probably should be $(datadir)/rpm
+-rpmconfigdir = $(prefix)/lib/rpm
++rpmconfigdir = $(pkglibexecdir)
+
+ # Libtool version (current-revision-age) for all our libraries
+ rpm_version_info = 10:0:1
diff --git a/app-arch/rpm/rpm-4.16.0.ebuild b/app-arch/rpm/rpm-4.16.0.ebuild
new file mode 100644
index 000000000000..67132e47a629
--- /dev/null
+++ b/app-arch/rpm/rpm-4.16.0.ebuild
@@ -0,0 +1,139 @@
+# 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 autotools flag-o-matic perl-module python-single-r1
+
+DESCRIPTION="Red Hat Package Management Utils"
+HOMEPAGE="https://rpm.org
+ https://github.com/rpm-software-management/rpm"
+SRC_URI="http://ftp.rpm.org/releases/rpm-$(ver_cut 1-2).x/${P}.tar.bz2"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+# Tests are broken. See bug 657500
+RESTRICT="test"
+
+IUSE="acl caps doc dbus lua nls python selinux test +zstd"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+CDEPEND="!app-arch/rpm5
+ app-arch/libarchive
+ >=sys-libs/db-4.5:*
+ >=sys-libs/zlib-1.2.3-r1
+ >=app-arch/bzip2-1.0.1
+ >=dev-libs/popt-1.7
+ >=app-crypt/gnupg-1.2
+ dbus? ( sys-apps/dbus )
+ dev-libs/elfutils
+ virtual/libintl
+ >=dev-lang/perl-5.8.8
+ dev-libs/nss
+ python? ( ${PYTHON_DEPS} )
+ nls? ( virtual/libintl )
+ lua? ( dev-lang/lua:5.2 )
+ acl? ( virtual/acl )
+ caps? ( >=sys-libs/libcap-2.0 )
+ zstd? ( app-arch/zstd )
+"
+DEPEND="${CDEPEND}
+ nls? ( sys-devel/gettext )
+ doc? ( app-doc/doxygen )
+ virtual/pkgconfig
+ test? ( sys-apps/fakechroot )
+"
+RDEPEND="${CDEPEND}
+ selinux? ( sec-policy/selinux-rpm )
+"
+
+pkg_setup() {
+ use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+ eapply "${FILESDIR}"/${P}-autotools.patch
+ eapply "${FILESDIR}"/${PN}-4.8.1-db-path.patch
+ eapply "${FILESDIR}"/${P}-libdir.patch
+
+ # fix #356769
+ sed -i 's:%{_var}/tmp:/var/tmp:' macros.in || die "Fixing tmppath failed"
+ # fix #492642
+ sed -i "s:@__PYTHON@:${PYTHON}:" macros.in || die "Fixing %__python failed"
+
+ eapply_user
+
+ eautoreconf
+
+ # Prevent automake maintainer mode from kicking in (#450448).
+ touch -r Makefile.am preinstall.am
+}
+
+src_configure() {
+ append-cppflags -I"${EPREFIX}/usr/include/nss" -I"${EPREFIX}/usr/include/nspr"
+ econf \
+ --without-selinux \
+ --with-crypto=nss \
+ $(use_enable python) \
+ $(use_enable nls) \
+ $(use_enable dbus inhibit-plugin) \
+ $(use_with lua) \
+ $(use_with caps cap) \
+ $(use_with acl) \
+ $(use_enable zstd zstd $(usex zstd yes no))
+}
+
+src_install() {
+ default
+
+ # remove la files
+ find "${ED}" -name '*.la' -delete || die
+
+ # fix symlinks to /bin/rpm (#349840)
+ for binary in rpmquery rpmverify;do
+ ln -sf rpm "${ED}"/usr/bin/${binary} || die
+ done
+
+ if ! use nls; then
+ rm -rf "${ED}"/usr/share/man/?? || die
+ fi
+
+ keepdir /usr/src/rpm/{SRPMS,SPECS,SOURCES,RPMS,BUILD}
+
+ dodoc CREDITS README*
+ if use doc; then
+ for docname in librpm; do
+ docinto "html/${docname}"
+ dodoc -r "doc/${docname}/html/."
+ done
+ fi
+
+ # Fix perllocal.pod file collision
+ perl_delete_localpod
+
+ use python && python_optimize
+}
+
+src_test() {
+ # Known to fail with FEATURES=usersandbox (bug #657500):
+ if has usersandbox $FEATURES ; then
+ ewarn "You are emerging ${P} with 'usersandbox' enabled." \
+ "Expect some test failures or emerge with 'FEATURES=-usersandbox'!"
+ fi
+
+ emake check
+}
+
+pkg_postinst() {
+ if [[ -f "${EROOT}"/var/lib/rpm/Packages ]] ; then
+ einfo "RPM database found... Rebuilding database (may take a while)..."
+ "${EROOT}"/usr/bin/rpmdb --rebuilddb --root="${EROOT}/" || die
+ else
+ einfo "No RPM database found... Creating database..."
+ "${EROOT}"/usr/bin/rpmdb --initdb --root="${EROOT}/" || die
+ fi
+}
diff --git a/app-backup/Manifest.gz b/app-backup/Manifest.gz
index 2028b991655b..9ef964afbccc 100644
Binary files a/app-backup/Manifest.gz and b/app-backup/Manifest.gz differ
diff --git a/app-backup/duplicity/duplicity-0.8.15.ebuild b/app-backup/duplicity/duplicity-0.8.15.ebuild
index ab86fd3ebc15..7b8519212934 100644
--- a/app-backup/duplicity/duplicity-0.8.15.ebuild
+++ b/app-backup/duplicity/duplicity-0.8.15.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://code.launchpad.net/${PN}/$(ver_cut 1-2)-series/$(ver_cut 1-3)/+
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
IUSE="s3 test"
CDEPEND="
diff --git a/app-cdr/Manifest.gz b/app-cdr/Manifest.gz
index c1fedd23089c..6b052d77df7d 100644
Binary files a/app-cdr/Manifest.gz and b/app-cdr/Manifest.gz differ
diff --git a/app-cdr/dumpet/dumpet-2.1_p20140601-r2.ebuild b/app-cdr/dumpet/dumpet-2.1_p20140601-r3.ebuild
similarity index 94%
rename from app-cdr/dumpet/dumpet-2.1_p20140601-r2.ebuild
rename to app-cdr/dumpet/dumpet-2.1_p20140601-r3.ebuild
index fb18f5b349bd..7af0358a39a8 100644
--- a/app-cdr/dumpet/dumpet-2.1_p20140601-r2.ebuild
+++ b/app-cdr/dumpet/dumpet-2.1_p20140601-r3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/rhboot/dumpet/archive/${COMMIT}.tar.gz -> ${P}.tar.g
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="test"
#Restrict tests since required test file is unavailable
RESTRICT="test"
@@ -31,6 +31,7 @@ src_prepare() {
-e "s/^install : all$/install :/" \
-e "s/^CFLAGS:=/CFLAGS?=/" \
-e "s/^CC:=/CC?=/" \
+ -e '/^LFLAGS/ s/$/$(LDFLAGS)/' \
|| die
default
}
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index 8d9096327217..1f5f64ebf48a 100644
Binary files a/app-crypt/Manifest.gz and b/app-crypt/Manifest.gz differ
diff --git a/app-crypt/acme/acme-1.7.0.ebuild b/app-crypt/acme/acme-1.7.0.ebuild
index 6b82a2abd3c2..da638d5ba966 100644
--- a/app-crypt/acme/acme-1.7.0.ebuild
+++ b/app-crypt/acme/acme-1.7.0.ebuild
@@ -3,6 +3,7 @@
EAPI=7
PYTHON_COMPAT=(python{3_6,3_7,3_8})
+DISTUTILS_USE_SETUPTOOLS=rdepend
if [[ ${PV} == 9999* ]]; then
EGIT_REPO_URI="https://github.com/certbot/certbot.git"
@@ -46,7 +47,6 @@ DEPEND="
dev-python/pytest[${PYTHON_USEDEP}]
dev-python/pytest-xdist[${PYTHON_USEDEP}]
)
- >=dev-python/setuptools-1.0[${PYTHON_USEDEP}]
"
src_compile() {
diff --git a/app-crypt/acme/acme-1.8.0.ebuild b/app-crypt/acme/acme-1.8.0.ebuild
index a3d394a31a62..9c58fbb71ad7 100644
--- a/app-crypt/acme/acme-1.8.0.ebuild
+++ b/app-crypt/acme/acme-1.8.0.ebuild
@@ -3,6 +3,7 @@
EAPI=7
PYTHON_COMPAT=(python{3_6,3_7,3_8})
+DISTUTILS_USE_SETUPTOOLS=rdepend
if [[ ${PV} == 9999* ]]; then
EGIT_REPO_URI="https://github.com/certbot/certbot.git"
@@ -46,7 +47,6 @@ DEPEND="
dev-python/pytest[${PYTHON_USEDEP}]
dev-python/pytest-xdist[${PYTHON_USEDEP}]
)
- >=dev-python/setuptools-1.0[${PYTHON_USEDEP}]
"
src_compile() {
diff --git a/app-crypt/acme/acme-9999.ebuild b/app-crypt/acme/acme-9999.ebuild
index a3d394a31a62..9c58fbb71ad7 100644
--- a/app-crypt/acme/acme-9999.ebuild
+++ b/app-crypt/acme/acme-9999.ebuild
@@ -3,6 +3,7 @@
EAPI=7
PYTHON_COMPAT=(python{3_6,3_7,3_8})
+DISTUTILS_USE_SETUPTOOLS=rdepend
if [[ ${PV} == 9999* ]]; then
EGIT_REPO_URI="https://github.com/certbot/certbot.git"
@@ -46,7 +47,6 @@ DEPEND="
dev-python/pytest[${PYTHON_USEDEP}]
dev-python/pytest-xdist[${PYTHON_USEDEP}]
)
- >=dev-python/setuptools-1.0[${PYTHON_USEDEP}]
"
src_compile() {
diff --git a/app-crypt/certbot-apache/certbot-apache-1.7.0.ebuild b/app-crypt/certbot-apache/certbot-apache-1.7.0.ebuild
index ae20aed95bb9..2977a0aff13d 100644
--- a/app-crypt/certbot-apache/certbot-apache-1.7.0.ebuild
+++ b/app-crypt/certbot-apache/certbot-apache-1.7.0.ebuild
@@ -3,6 +3,7 @@
EAPI=7
PYTHON_COMPAT=(python{3_6,3_7,3_8})
+DISTUTILS_USE_SETUPTOOLS=rdepend
if [[ ${PV} == 9999* ]]; then
EGIT_REPO_URI="https://github.com/certbot/certbot.git"
@@ -30,8 +31,7 @@ RDEPEND=">=app-crypt/acme-0.29.0[${PYTHON_USEDEP}]
dev-python/zope-component[${PYTHON_USEDEP}]
dev-python/zope-interface[${PYTHON_USEDEP}]"
DEPEND="test? ( ${RDEPEND}
- dev-python/pytest[${PYTHON_USEDEP}] )
- dev-python/setuptools[${PYTHON_USEDEP}]"
+ dev-python/pytest[${PYTHON_USEDEP}] )"
python_test() {
esetup.py test || die
diff --git a/app-crypt/certbot-apache/certbot-apache-1.8.0.ebuild b/app-crypt/certbot-apache/certbot-apache-1.8.0.ebuild
index 323d9f35ff3a..3a367b955f0a 100644
--- a/app-crypt/certbot-apache/certbot-apache-1.8.0.ebuild
+++ b/app-crypt/certbot-apache/certbot-apache-1.8.0.ebuild
@@ -3,6 +3,7 @@
EAPI=7
PYTHON_COMPAT=(python{3_6,3_7,3_8})
+DISTUTILS_USE_SETUPTOOLS=rdepend
if [[ ${PV} == 9999* ]]; then
EGIT_REPO_URI="https://github.com/certbot/certbot.git"
@@ -30,8 +31,7 @@ RDEPEND=">=app-crypt/acme-0.29.0[${PYTHON_USEDEP}]
dev-python/zope-component[${PYTHON_USEDEP}]
dev-python/zope-interface[${PYTHON_USEDEP}]"
DEPEND="test? ( ${RDEPEND}
- dev-python/pytest[${PYTHON_USEDEP}] )
- dev-python/setuptools[${PYTHON_USEDEP}]"
+ dev-python/pytest[${PYTHON_USEDEP}] )"
python_test() {
esetup.py test || die
diff --git a/app-crypt/certbot-apache/certbot-apache-9999.ebuild b/app-crypt/certbot-apache/certbot-apache-9999.ebuild
index 323d9f35ff3a..3a367b955f0a 100644
--- a/app-crypt/certbot-apache/certbot-apache-9999.ebuild
+++ b/app-crypt/certbot-apache/certbot-apache-9999.ebuild
@@ -3,6 +3,7 @@
EAPI=7
PYTHON_COMPAT=(python{3_6,3_7,3_8})
+DISTUTILS_USE_SETUPTOOLS=rdepend
if [[ ${PV} == 9999* ]]; then
EGIT_REPO_URI="https://github.com/certbot/certbot.git"
@@ -30,8 +31,7 @@ RDEPEND=">=app-crypt/acme-0.29.0[${PYTHON_USEDEP}]
dev-python/zope-component[${PYTHON_USEDEP}]
dev-python/zope-interface[${PYTHON_USEDEP}]"
DEPEND="test? ( ${RDEPEND}
- dev-python/pytest[${PYTHON_USEDEP}] )
- dev-python/setuptools[${PYTHON_USEDEP}]"
+ dev-python/pytest[${PYTHON_USEDEP}] )"
python_test() {
esetup.py test || die
diff --git a/app-crypt/certbot-nginx/certbot-nginx-1.7.0.ebuild b/app-crypt/certbot-nginx/certbot-nginx-1.7.0.ebuild
index 3fd20448a069..51368c8f499e 100644
--- a/app-crypt/certbot-nginx/certbot-nginx-1.7.0.ebuild
+++ b/app-crypt/certbot-nginx/certbot-nginx-1.7.0.ebuild
@@ -3,6 +3,7 @@
EAPI=7
PYTHON_COMPAT=(python{3_6,3_7,3_8})
+DISTUTILS_USE_SETUPTOOLS=rdepend
if [[ ${PV} == 9999* ]]; then
EGIT_REPO_URI="https://github.com/certbot/certbot.git"
@@ -23,11 +24,9 @@ LICENSE="Apache-2.0"
SLOT="0"
IUSE=""
-CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="${CDEPEND}
+RDEPEND="
>=app-crypt/acme-1.4.0[${PYTHON_USEDEP}]
>=app-crypt/certbot-1.6.0[${PYTHON_USEDEP}]
dev-python/pyopenssl[${PYTHON_USEDEP}]
>=dev-python/pyparsing-1.5.5[${PYTHON_USEDEP}]
dev-python/zope-interface[${PYTHON_USEDEP}]"
-DEPEND="${CDEPEND}"
diff --git a/app-crypt/certbot-nginx/certbot-nginx-1.8.0.ebuild b/app-crypt/certbot-nginx/certbot-nginx-1.8.0.ebuild
index 1d92bc0c30fa..383e16073c64 100644
--- a/app-crypt/certbot-nginx/certbot-nginx-1.8.0.ebuild
+++ b/app-crypt/certbot-nginx/certbot-nginx-1.8.0.ebuild
@@ -3,6 +3,7 @@
EAPI=7
PYTHON_COMPAT=(python{3_6,3_7,3_8})
+DISTUTILS_USE_SETUPTOOLS=rdepend
if [[ ${PV} == 9999* ]]; then
EGIT_REPO_URI="https://github.com/certbot/certbot.git"
@@ -23,11 +24,9 @@ LICENSE="Apache-2.0"
SLOT="0"
IUSE=""
-CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="${CDEPEND}
+RDEPEND="
>=app-crypt/acme-1.4.0[${PYTHON_USEDEP}]
>=app-crypt/certbot-1.6.0[${PYTHON_USEDEP}]
dev-python/pyopenssl[${PYTHON_USEDEP}]
>=dev-python/pyparsing-1.5.5[${PYTHON_USEDEP}]
dev-python/zope-interface[${PYTHON_USEDEP}]"
-DEPEND="${CDEPEND}"
diff --git a/app-crypt/certbot-nginx/certbot-nginx-9999.ebuild b/app-crypt/certbot-nginx/certbot-nginx-9999.ebuild
index 1d92bc0c30fa..383e16073c64 100644
--- a/app-crypt/certbot-nginx/certbot-nginx-9999.ebuild
+++ b/app-crypt/certbot-nginx/certbot-nginx-9999.ebuild
@@ -3,6 +3,7 @@
EAPI=7
PYTHON_COMPAT=(python{3_6,3_7,3_8})
+DISTUTILS_USE_SETUPTOOLS=rdepend
if [[ ${PV} == 9999* ]]; then
EGIT_REPO_URI="https://github.com/certbot/certbot.git"
@@ -23,11 +24,9 @@ LICENSE="Apache-2.0"
SLOT="0"
IUSE=""
-CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="${CDEPEND}
+RDEPEND="
>=app-crypt/acme-1.4.0[${PYTHON_USEDEP}]
>=app-crypt/certbot-1.6.0[${PYTHON_USEDEP}]
dev-python/pyopenssl[${PYTHON_USEDEP}]
>=dev-python/pyparsing-1.5.5[${PYTHON_USEDEP}]
dev-python/zope-interface[${PYTHON_USEDEP}]"
-DEPEND="${CDEPEND}"
diff --git a/app-crypt/certbot/certbot-1.7.0.ebuild b/app-crypt/certbot/certbot-1.7.0.ebuild
index 7a862586d0d5..6f5c706cae23 100644
--- a/app-crypt/certbot/certbot-1.7.0.ebuild
+++ b/app-crypt/certbot/certbot-1.7.0.ebuild
@@ -3,6 +3,7 @@
EAPI=7
PYTHON_COMPAT=(python{3_6,3_7,3_8})
+DISTUTILS_USE_SETUPTOOLS=rdepend
if [[ ${PV} == 9999* ]]; then
EGIT_REPO_URI="https://github.com/certbot/certbot.git"
@@ -23,9 +24,7 @@ SLOT="0"
IUSE="test"
RESTRICT="!test? ( test )"
-CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
RDEPEND="
- ${CDEPEND}
>=app-crypt/acme-1.6.0[${PYTHON_USEDEP}]
>=dev-python/configargparse-0.9.3[${PYTHON_USEDEP}]
dev-python/configobj[${PYTHON_USEDEP}]
@@ -37,7 +36,6 @@ RDEPEND="
dev-python/pytz[${PYTHON_USEDEP}]
dev-python/zope-component[${PYTHON_USEDEP}]
dev-python/zope-interface[${PYTHON_USEDEP}]"
-DEPEND="${CDEPEND}"
distutils_enable_tests pytest
diff --git a/app-crypt/certbot/certbot-1.8.0.ebuild b/app-crypt/certbot/certbot-1.8.0.ebuild
index f5147fca7936..8496941da96c 100644
--- a/app-crypt/certbot/certbot-1.8.0.ebuild
+++ b/app-crypt/certbot/certbot-1.8.0.ebuild
@@ -3,6 +3,7 @@
EAPI=7
PYTHON_COMPAT=(python{3_6,3_7,3_8})
+DISTUTILS_USE_SETUPTOOLS=rdepend
if [[ ${PV} == 9999* ]]; then
EGIT_REPO_URI="https://github.com/certbot/certbot.git"
@@ -23,9 +24,7 @@ SLOT="0"
IUSE="test"
RESTRICT="!test? ( test )"
-CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
RDEPEND="
- ${CDEPEND}
>=app-crypt/acme-1.6.0[${PYTHON_USEDEP}]
>=dev-python/configargparse-0.9.3[${PYTHON_USEDEP}]
dev-python/configobj[${PYTHON_USEDEP}]
@@ -37,7 +36,6 @@ RDEPEND="
dev-python/pytz[${PYTHON_USEDEP}]
dev-python/zope-component[${PYTHON_USEDEP}]
dev-python/zope-interface[${PYTHON_USEDEP}]"
-DEPEND="${CDEPEND}"
distutils_enable_tests pytest
diff --git a/app-crypt/certbot/certbot-9999.ebuild b/app-crypt/certbot/certbot-9999.ebuild
index f5147fca7936..8496941da96c 100644
--- a/app-crypt/certbot/certbot-9999.ebuild
+++ b/app-crypt/certbot/certbot-9999.ebuild
@@ -3,6 +3,7 @@
EAPI=7
PYTHON_COMPAT=(python{3_6,3_7,3_8})
+DISTUTILS_USE_SETUPTOOLS=rdepend
if [[ ${PV} == 9999* ]]; then
EGIT_REPO_URI="https://github.com/certbot/certbot.git"
@@ -23,9 +24,7 @@ SLOT="0"
IUSE="test"
RESTRICT="!test? ( test )"
-CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
RDEPEND="
- ${CDEPEND}
>=app-crypt/acme-1.6.0[${PYTHON_USEDEP}]
>=dev-python/configargparse-0.9.3[${PYTHON_USEDEP}]
dev-python/configobj[${PYTHON_USEDEP}]
@@ -37,7 +36,6 @@ RDEPEND="
dev-python/pytz[${PYTHON_USEDEP}]
dev-python/zope-component[${PYTHON_USEDEP}]
dev-python/zope-interface[${PYTHON_USEDEP}]"
-DEPEND="${CDEPEND}"
distutils_enable_tests pytest
diff --git a/app-crypt/tpm2-totp/Manifest b/app-crypt/tpm2-totp/Manifest
index 5e4f68674f25..58600b79dae1 100644
--- a/app-crypt/tpm2-totp/Manifest
+++ b/app-crypt/tpm2-totp/Manifest
@@ -1 +1 @@
-DIST tpm2-totp-0.2.1.tar.gz 427226 BLAKE2B e6a9dbcdac4d7fc31048aff968e3eea097752c79a3c1b8551d22558a6b143a758e7bb507722185c648000f4b1edd2f0bbdd443890b5763b297f3d42cfbd84d9d SHA512 2bda34e89b76319a40206e08c0208b0f139309c0b0e40e7168b5e7562096750df504dfcae3a39e6f82fdccbf7a79ed0802d115fbd7560dc3f5b52d81fe8fb59c
+DIST tpm2-totp-0.3.0.tar.gz 428874 BLAKE2B 413f4418cd1ce9a996f36c83e27c3fe256b2d3f5ff36e7df1dc1b651e38afa222be9742d5cfa76287263a4e1402dabea3400b41a1e1bde9f31fe03f82894f4f1 SHA512 d47cc8155a60a464afe602c3114ff8e6b2ff825457e6069693947421716b97c34b00f70adbcb4cda1b5b9639b8a3dfc7800295bbff99822da7a8077ebf78d6b2
diff --git a/app-crypt/tpm2-totp/metadata.xml b/app-crypt/tpm2-totp/metadata.xml
index ff3a177c4bdd..fb1b2ed30d06 100644
--- a/app-crypt/tpm2-totp/metadata.xml
+++ b/app-crypt/tpm2-totp/metadata.xml
@@ -12,4 +12,7 @@
tpm2-software/tpm2-totp
+
diff --git a/app-crypt/tpm2-totp/tpm2-totp-0.2.1-r1.ebuild b/app-crypt/tpm2-totp/tpm2-totp-0.3.0.ebuild
similarity index 59%
rename from app-crypt/tpm2-totp/tpm2-totp-0.2.1-r1.ebuild
rename to app-crypt/tpm2-totp/tpm2-totp-0.3.0.ebuild
index e2c2d163e572..b02901ba1dcd 100644
--- a/app-crypt/tpm2-totp/tpm2-totp-0.2.1-r1.ebuild
+++ b/app-crypt/tpm2-totp/tpm2-totp-0.3.0.ebuild
@@ -12,12 +12,26 @@ SRC_URI="https://github.com/tpm2-software/${PN}/releases/download/v${PV}/${P}.ta
LICENSE="BSD"
SLOT="0"
KEYWORDS="~amd64"
+IUSE="plymouth test"
+
+REQUIRED_USE="test? ( plymouth )"
+
+RDEPEND="app-crypt/tpm2-tss
+ media-gfx/qrencode
+ plymouth? ( sys-boot/plymouth )"
+DEPEND="${RDEPEND}
+ test? (
+ app-crypt/swtpm
+ app-crypt/tpm2-tools
+ >=app-crypt/tpm2-tss-3.0.0
+ sys-apps/fakeroot
+ sys-auth/oath-toolkit
+ )"
-RDEPEND=">=app-crypt/tpm2-tss-2.0
- media-gfx/qrencode:="
-DEPEND="${RDEPEND}"
BDEPEND="virtual/pkgconfig"
+RESTRICT="!test? ( test )"
+
src_prepare() {
default
eautoreconf
@@ -26,7 +40,9 @@ src_prepare() {
src_configure() {
econf \
--disable-static \
- --disable-defaultflags
+ --disable-defaultflags \
+ $(use_enable plymouth) \
+ $(use_enable test integration)
}
src_install() {
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index 547d7c3a7455..ad7b53e683a7 100644
Binary files a/app-emulation/Manifest.gz and b/app-emulation/Manifest.gz differ
diff --git a/app-emulation/cloud-init/cloud-init-19.4.ebuild b/app-emulation/cloud-init/cloud-init-19.4.ebuild
index 97718a899ce0..6ece034faa12 100644
--- a/app-emulation/cloud-init/cloud-init-19.4.ebuild
+++ b/app-emulation/cloud-init/cloud-init-19.4.ebuild
@@ -3,6 +3,7 @@
EAPI=7
PYTHON_COMPAT=( python3_6 python3_7 )
+DISTUTILS_USE_SETUPTOOLS=rdepend
inherit distutils-r1
@@ -28,7 +29,6 @@ CDEPEND="
dev-python/six[${PYTHON_USEDEP}]
"
DEPEND="
- dev-python/setuptools[${PYTHON_USEDEP}]
test? (
${CDEPEND}
>=dev-python/httpretty-0.7.1[${PYTHON_USEDEP}]
diff --git a/app-emulation/cloud-init/cloud-init-20.1.ebuild b/app-emulation/cloud-init/cloud-init-20.1.ebuild
index 15cdfecdd9cf..2ab63c9b9602 100644
--- a/app-emulation/cloud-init/cloud-init-20.1.ebuild
+++ b/app-emulation/cloud-init/cloud-init-20.1.ebuild
@@ -3,6 +3,7 @@
EAPI=7
PYTHON_COMPAT=( python3_6 python3_7 python3_8 )
+DISTUTILS_USE_SETUPTOOLS=rdepend
inherit distutils-r1
@@ -34,7 +35,6 @@ CDEPEND="
dev-python/six[${PYTHON_USEDEP}]
"
DEPEND="
- dev-python/setuptools[${PYTHON_USEDEP}]
test? (
${CDEPEND}
>=dev-python/httpretty-0.7.1[${PYTHON_USEDEP}]
diff --git a/app-emulation/cloud-init/cloud-init-9999.ebuild b/app-emulation/cloud-init/cloud-init-9999.ebuild
index f1f5ed321e91..581d49cdff12 100644
--- a/app-emulation/cloud-init/cloud-init-9999.ebuild
+++ b/app-emulation/cloud-init/cloud-init-9999.ebuild
@@ -3,6 +3,7 @@
EAPI=7
PYTHON_COMPAT=( python3_6 python3_7 python3_8 )
+DISTUTILS_USE_SETUPTOOLS=rdepend
inherit distutils-r1
@@ -34,7 +35,6 @@ CDEPEND="
dev-python/six[${PYTHON_USEDEP}]
"
DEPEND="
- dev-python/setuptools[${PYTHON_USEDEP}]
test? (
${CDEPEND}
>=dev-python/httpretty-0.7.1[${PYTHON_USEDEP}]
diff --git a/app-emulation/diskimage-builder/diskimage-builder-3.2.1.ebuild b/app-emulation/diskimage-builder/diskimage-builder-3.2.1.ebuild
index 3f1829944bee..893f0c3ae6b6 100644
--- a/app-emulation/diskimage-builder/diskimage-builder-3.2.1.ebuild
+++ b/app-emulation/diskimage-builder/diskimage-builder-3.2.1.ebuild
@@ -4,6 +4,7 @@
EAPI=7
PYTHON_COMPAT=( python3_{6,7,8} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
inherit distutils-r1
DESCRIPTION="Golden Disk Image builder."
@@ -22,8 +23,7 @@ IUSE=""
CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
-DEPEND="${CDEPEND}
- dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="${CDEPEND}"
RDEPEND="${CDEPEND}
>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
!~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
diff --git a/app-emulation/diskimage-builder/diskimage-builder-3.3.1.ebuild b/app-emulation/diskimage-builder/diskimage-builder-3.3.1.ebuild
index 720474e33c48..eb082f7274ea 100644
--- a/app-emulation/diskimage-builder/diskimage-builder-3.3.1.ebuild
+++ b/app-emulation/diskimage-builder/diskimage-builder-3.3.1.ebuild
@@ -4,6 +4,7 @@
EAPI=7
PYTHON_COMPAT=( python3_{6,7,8} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
inherit distutils-r1
DESCRIPTION="Golden Disk Image builder."
@@ -22,8 +23,7 @@ IUSE=""
CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
-DEPEND="${CDEPEND}
- dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="${CDEPEND}"
RDEPEND="${CDEPEND}
>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
!~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
diff --git a/app-emulation/diskimage-builder/diskimage-builder-9999.ebuild b/app-emulation/diskimage-builder/diskimage-builder-9999.ebuild
index 720474e33c48..eb082f7274ea 100644
--- a/app-emulation/diskimage-builder/diskimage-builder-9999.ebuild
+++ b/app-emulation/diskimage-builder/diskimage-builder-9999.ebuild
@@ -4,6 +4,7 @@
EAPI=7
PYTHON_COMPAT=( python3_{6,7,8} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
inherit distutils-r1
DESCRIPTION="Golden Disk Image builder."
@@ -22,8 +23,7 @@ IUSE=""
CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
-DEPEND="${CDEPEND}
- dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="${CDEPEND}"
RDEPEND="${CDEPEND}
>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
!~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
diff --git a/app-emulation/libvirt/Manifest b/app-emulation/libvirt/Manifest
index efead371cabe..d0484121929d 100644
--- a/app-emulation/libvirt/Manifest
+++ b/app-emulation/libvirt/Manifest
@@ -1,2 +1,4 @@
DIST libvirt-6.2.0.tar.xz 8307248 BLAKE2B 9d449e041fc548a688f974d0801e625cf023ef0df49c40028e486e88fcf14181869e0dfd87f0eabcdd184df67dda5b5fbdc0c2375832f1534faff531779255dd SHA512 96bef701fd73aef93d1490f0bc331901a0ff6250a4f36a3e4844f76cc262dc0ae4cce8686a603c2a9c575ce489d8d5ed1521ebd22b92aff8301efdb74dee91e4
DIST libvirt-6.5.0.tar.xz 9407160 BLAKE2B 592aace555a3b72311cb430784587180fa7dbf74f75509cd8373a046339b9c4c0707bf530dd2d06146d78a85f8af3dba5d0b146ecec180d3cc4d3bf78c19da61 SHA512 30a032270304b97945ff2c5087c72c2f5510634186f2eaf7c3d834a72cddcaec97bbe5ccc86802728a59f4c80b5bb54757400683df5f20175757cfe07ce67453
+DIST libvirt-6.7.0.tar.xz 8362140 BLAKE2B d0afe33fcdaab3cc0f2ea8c552e7550bcece018b049a3b58e5c05ee85b39e2b3ebf42fa1b70ddb1d2a541d1114b6b49734f23a889b3589397a30a672f27a3a56 SHA512 cabfb6aa65a3a1412b0111654ad3a7d0a6dfc63399a892c540ca39ab4e56f87626a067037e4480bb55418a371d2b5e9ac74862c92a3cdea69822ec3d158d769f
+DIST libvirt-6.8.0.tar.xz 8412092 BLAKE2B c118ca6b263054bb6941c62f3d1415f7ed1a3f29a35294272d04bc726643247ee5691e0310a1bf013faeba856d7aadd00a90fe8dbdca6ff4c7eb480e94d92fa2 SHA512 9b69f3dcceb5e40470a78908654faf51b643f6793e556f3115daa4bfe08743af290882dd51f15eb27c38d589eb210d495de7c44a40b363420ab4f4d3a6393cc9
diff --git a/app-emulation/libvirt/files/libvirt-6.7.0-do-not-use-sysconfig.patch b/app-emulation/libvirt/files/libvirt-6.7.0-do-not-use-sysconfig.patch
new file mode 100644
index 000000000000..f3d2e3c39162
--- /dev/null
+++ b/app-emulation/libvirt/files/libvirt-6.7.0-do-not-use-sysconfig.patch
@@ -0,0 +1,169 @@
+--- a/src/interface/virtinterfaced.service.in
++++ b/src/interface/virtinterfaced.service.in
+@@ -13,7 +13,6 @@
+
+ [Service]
+ Type=notify
+-EnvironmentFile=-@sysconfdir@/sysconfig/virtinterfaced
+ ExecStart=@sbindir@/virtinterfaced $VIRTINTERFACED_ARGS
+ ExecReload=/bin/kill -HUP $MAINPID
+ Restart=on-failure
+--- a/src/libxl/virtxend.service.in
++++ b/src/libxl/virtxend.service.in
+@@ -17,7 +17,6 @@
+
+ [Service]
+ Type=notify
+-EnvironmentFile=-@sysconfdir@/sysconfig/virtxend
+ ExecStart=@sbindir@/virtxend $VIRTXEND_ARGS
+ ExecReload=/bin/kill -HUP $MAINPID
+ Restart=on-failure
+--- a/src/locking/virtlockd.service.in
++++ b/src/locking/virtlockd.service.in
+@@ -7,8 +7,7 @@
+ Documentation=https://libvirt.org
+
+ [Service]
+-EnvironmentFile=-@sysconfdir@/sysconfig/virtlockd
+-ExecStart=@sbindir@/virtlockd $VIRTLOCKD_ARGS
++ExecStart=@sbindir@/virtlockd
+ ExecReload=/bin/kill -USR1 $MAINPID
+ # Loosing the locks is a really bad thing that will
+ # cause the machine to be fenced (rebooted), so make
+--- a/src/logging/virtlogd.service.in
++++ b/src/logging/virtlogd.service.in
+@@ -7,8 +7,7 @@
+ Documentation=https://libvirt.org
+
+ [Service]
+-EnvironmentFile=-@sysconfdir@/sysconfig/virtlogd
+-ExecStart=@sbindir@/virtlogd $VIRTLOGD_ARGS
++ExecStart=@sbindir@/virtlogd
+ ExecReload=/bin/kill -USR1 $MAINPID
+ # Loosing the logs is a really bad thing that will
+ # cause the machine to be fenced (rebooted), so make
+--- a/src/lxc/virtlxcd.service.in
++++ b/src/lxc/virtlxcd.service.in
+@@ -18,7 +18,6 @@
+
+ [Service]
+ Type=notify
+-EnvironmentFile=-@sysconfdir@/sysconfig/virtlxcd
+ ExecStart=@sbindir@/virtlxcd $VIRTLXCD_ARGS
+ ExecReload=/bin/kill -HUP $MAINPID
+ KillMode=process
+--- a/src/network/virtnetworkd.service.in
++++ b/src/network/virtnetworkd.service.in
+@@ -16,7 +16,6 @@
+
+ [Service]
+ Type=notify
+-EnvironmentFile=-@sysconfdir@/sysconfig/virtnetworkd
+ ExecStart=@sbindir@/virtnetworkd $VIRTNETWORKD_ARGS
+ ExecReload=/bin/kill -HUP $MAINPID
+ Restart=on-failure
+--- a/src/node_device/virtnodedevd.service.in
++++ b/src/node_device/virtnodedevd.service.in
+@@ -13,7 +13,6 @@
+
+ [Service]
+ Type=notify
+-EnvironmentFile=-@sysconfdir@/sysconfig/virtnodedevd
+ ExecStart=@sbindir@/virtnodedevd $VIRTNODEDEVD_ARGS
+ ExecReload=/bin/kill -HUP $MAINPID
+ Restart=on-failure
+--- a/src/nwfilter/virtnwfilterd.service.in
++++ b/src/nwfilter/virtnwfilterd.service.in
+@@ -13,7 +13,6 @@
+
+ [Service]
+ Type=notify
+-EnvironmentFile=-@sysconfdir@/sysconfig/virtnwfilterd
+ ExecStart=@sbindir@/virtnwfilterd $VIRTNWFILTERD_ARGS
+ ExecReload=/bin/kill -HUP $MAINPID
+ Restart=on-failure
+--- a/src/qemu/virtqemud.service.in
++++ b/src/qemu/virtqemud.service.in
+@@ -18,7 +18,6 @@
+
+ [Service]
+ Type=notify
+-EnvironmentFile=-@sysconfdir@/sysconfig/virtqemud
+ ExecStart=@sbindir@/virtqemud $VIRTQEMUD_ARGS
+ ExecReload=/bin/kill -HUP $MAINPID
+ KillMode=process
+--- a/src/remote/libvirtd.service.in
++++ b/src/remote/libvirtd.service.in
+@@ -28,8 +28,7 @@
+
+ [Service]
+ Type=notify
+-EnvironmentFile=-@sysconfdir@/sysconfig/libvirtd
+-ExecStart=@sbindir@/libvirtd $LIBVIRTD_ARGS
++ExecStart=@sbindir@/libvirtd
+ ExecReload=/bin/kill -HUP $MAINPID
+ KillMode=process
+ Restart=on-failure
+--- a/src/remote/virtproxyd.service.in
++++ b/src/remote/virtproxyd.service.in
+@@ -13,7 +13,6 @@
+
+ [Service]
+ Type=notify
+-EnvironmentFile=-@sysconfdir@/sysconfig/virtproxyd
+ ExecStart=@sbindir@/virtproxyd $VIRTPROXYD_ARGS
+ ExecReload=/bin/kill -HUP $MAINPID
+ Restart=on-failure
+--- a/src/secret/virtsecretd.service.in
++++ b/src/secret/virtsecretd.service.in
+@@ -13,7 +13,6 @@
+
+ [Service]
+ Type=notify
+-EnvironmentFile=-@sysconfdir@/sysconfig/virtsecretd
+ ExecStart=@sbindir@/virtsecretd $VIRTSECRETD_ARGS
+ ExecReload=/bin/kill -HUP $MAINPID
+ Restart=on-failure
+--- a/src/storage/virtstoraged.service.in
++++ b/src/storage/virtstoraged.service.in
+@@ -15,7 +15,6 @@
+
+ [Service]
+ Type=notify
+-EnvironmentFile=-@sysconfdir@/sysconfig/virtstoraged
+ ExecStart=@sbindir@/virtstoraged $VIRTSTORAGED_ARGS
+ ExecReload=/bin/kill -HUP $MAINPID
+ Restart=on-failure
+--- a/src/vbox/virtvboxd.service.in
++++ b/src/vbox/virtvboxd.service.in
+@@ -14,7 +14,6 @@
+
+ [Service]
+ Type=notify
+-EnvironmentFile=-@sysconfdir@/sysconfig/virtvboxd
+ ExecStart=@sbindir@/virtvboxd $VIRTVBOXD_ARGS
+ ExecReload=/bin/kill -HUP $MAINPID
+ Restart=on-failure
+--- a/tools/libvirt-guests.service.in
++++ b/tools/libvirt-guests.service.in
+@@ -10,7 +10,7 @@
+ Documentation=https://libvirt.org
+
+ [Service]
+-EnvironmentFile=-@sysconfdir@/sysconfig/libvirt-guests
++EnvironmentFile=-/etc/libvirt/libvirt-guests.conf
+ # Hack just call traditional service until we factor
+ # out the code
+ ExecStart=@libexecdir@/libvirt-guests.sh start
+--- a/tools/libvirt-guests.sysconf
++++ b/tools/libvirt-guests.sysconf
+@@ -1,3 +1,9 @@
++#
++# Warning: This configuration file is only sourced by the systemd
++# libvirt-guests.service unit. The coresponding openrc facility is in
++# /etc/init.d/libvirtd and /etc/conf.d/libvirtd
++#
++
+ # Customizations for the libvirt-guests.service systemd unit
+
+ # URIs to check for running guests
diff --git a/app-emulation/libvirt/files/libvirt-6.7.0-doc-path.patch b/app-emulation/libvirt/files/libvirt-6.7.0-doc-path.patch
new file mode 100644
index 000000000000..65eb35f3e346
--- /dev/null
+++ b/app-emulation/libvirt/files/libvirt-6.7.0-doc-path.patch
@@ -0,0 +1,9 @@
+--- a/meson.build 2020-09-26 21:25:08.557345415 +0000
++++ b/meson.build 2020-09-26 21:25:59.507348156 +0000
+@@ -84,7 +84,7 @@ sbindir = prefix / get_option('sbindir')
+ sharedstatedir = prefix / get_option('sharedstatedir')
+
+ confdir = sysconfdir / meson.project_name()
+-docdir = datadir / 'doc' / meson.project_name()
++docdir = datadir / 'doc' / '@0@-@1@'.format(meson.project_name(), meson.project_version())
+ pkgdatadir = datadir / meson.project_name()
diff --git a/app-emulation/libvirt/files/libvirt-6.7.0-fix-paths-for-apparmor.patch b/app-emulation/libvirt/files/libvirt-6.7.0-fix-paths-for-apparmor.patch
new file mode 100644
index 000000000000..1ca700300626
--- /dev/null
+++ b/app-emulation/libvirt/files/libvirt-6.7.0-fix-paths-for-apparmor.patch
@@ -0,0 +1,26 @@
+diff --git a/src/security/apparmor/libvirt-qemu b/src/security/apparmor/libvirt-qemu
+index 80986ae..d550d8c 100644
+--- a/src/security/apparmor/libvirt-qemu
++++ b/src/security/apparmor/libvirt-qemu
+@@ -88,6 +88,7 @@
+ /usr/share/sgabios/** r,
+ /usr/share/slof/** r,
+ /usr/share/vgabios/** r,
++ /usr/share/seavgabios/** r,
+
+ # pki for libvirt-vnc and libvirt-spice (LP: #901272, #1690140)
+ /etc/pki/CA/ r,
+diff --git a/src/security/apparmor/usr.lib.libvirt.virt-aa-helper.in b/src/security/apparmor/usr.libexec.virt-aa-helper.in
+similarity index 97%
+rename from src/security/apparmor/usr.lib.libvirt.virt-aa-helper.in
+rename to src/security/apparmor/usr.libexec.virt-aa-helper.in
+index dd18c8a..d06f9cb 100644
+--- a/src/security/apparmor/usr.lib.libvirt.virt-aa-helper.in
++++ b/src/security/apparmor/usr.libexec.virt-aa-helper.in
+@@ -69,5 +69,5 @@ profile virt-aa-helper @libexecdir@/virt-aa-helper {
+ /**.[iI][sS][oO] r,
+ /**/disk{,.*} r,
+
+- #include
++ #include
+ }
diff --git a/app-emulation/libvirt/libvirt-6.7.0.ebuild b/app-emulation/libvirt/libvirt-6.7.0.ebuild
new file mode 100644
index 000000000000..0ac6ec64febf
--- /dev/null
+++ b/app-emulation/libvirt/libvirt-6.7.0.ebuild
@@ -0,0 +1,344 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+inherit meson bash-completion-r1 eutils linux-info python-any-r1 readme.gentoo-r1 systemd
+
+if [[ ${PV} = *9999* ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://gitlab.com/libvirt/libvirt.git"
+ SRC_URI=""
+ SLOT="0"
+else
+ SRC_URI="https://libvirt.org/sources/${P}.tar.xz"
+ KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+ SLOT="0/${PV}"
+fi
+
+DESCRIPTION="C toolkit to manipulate virtual machines"
+HOMEPAGE="https://www.libvirt.org/"
+LICENSE="LGPL-2.1"
+IUSE="
+ apparmor audit +caps +dbus dtrace firewalld fuse glusterfs iscsi
+ iscsi-direct +libvirtd lvm libssh lxc +macvtap nfs nls numa openvz
+ parted pcap policykit +qemu rbd sasl selinux +udev +vepa
+ virtualbox virt-network wireshark-plugins xen zfs
+"
+
+REQUIRED_USE="
+ firewalld? ( virt-network )
+ libvirtd? ( || ( lxc openvz qemu virtualbox xen ) )
+ lxc? ( caps libvirtd )
+ openvz? ( libvirtd )
+ policykit? ( dbus )
+ qemu? ( libvirtd )
+ vepa? ( macvtap )
+ virt-network? ( libvirtd )
+ virtualbox? ( libvirtd )
+ xen? ( libvirtd )"
+
+BDEPEND="
+ acct-user/qemu
+ policykit? ( acct-group/libvirt )
+ app-text/xhtml1
+ dev-lang/perl
+ dev-libs/libxslt
+ dev-perl/XML-XPath
+ dev-python/docutils
+ virtual/pkgconfig"
+
+# gettext.sh command is used by the libvirt command wrappers, and it's
+# non-optional, so put it into RDEPEND.
+# We can use both libnl:1.1 and libnl:3, but if you have both installed, the
+# package will use 3 by default. Since we don't have slot pinning in an API,
+# we must go with the most recent
+RDEPEND="
+ app-misc/scrub
+ >=dev-libs/glib-2.48.0
+ dev-libs/libgcrypt:0
+ dev-libs/libnl:3
+ >=dev-libs/libxml2-2.7.6
+ >=net-analyzer/openbsd-netcat-1.105-r1
+ >=net-libs/gnutls-1.0.25:0=
+ net-libs/libssh2
+ net-libs/libtirpc
+ net-libs/rpcsvc-proto
+ >=net-misc/curl-7.18.0
+ sys-apps/dmidecode
+ sys-devel/gettext
+ sys-libs/ncurses:0=
+ sys-libs/readline:=
+ apparmor? ( sys-libs/libapparmor )
+ audit? ( sys-process/audit )
+ caps? ( sys-libs/libcap-ng )
+ dbus? ( sys-apps/dbus )
+ dtrace? ( dev-util/systemtap )
+ firewalld? ( >=net-firewall/firewalld-0.6.3 )
+ fuse? ( sys-fs/fuse:0= )
+ glusterfs? ( >=sys-cluster/glusterfs-3.4.1 )
+ iscsi? ( sys-block/open-iscsi )
+ iscsi-direct? ( >=net-libs/libiscsi-1.18.0 )
+ libssh? ( net-libs/libssh )
+ lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] )
+ nfs? ( net-fs/nfs-utils )
+ numa? (
+ >sys-process/numactl-2.0.2
+ sys-process/numad
+ )
+ parted? (
+ >=sys-block/parted-1.8[device-mapper]
+ sys-fs/lvm2[-device-mapper-only(-)]
+ )
+ pcap? ( >=net-libs/libpcap-1.0.0 )
+ policykit? ( >=sys-auth/polkit-0.9 )
+ qemu? (
+ >=app-emulation/qemu-1.5.0
+ dev-libs/yajl
+ )
+ rbd? ( sys-cluster/ceph )
+ sasl? ( dev-libs/cyrus-sasl )
+ selinux? ( >=sys-libs/libselinux-2.0.85 )
+ virt-network? (
+ net-dns/dnsmasq[script]
+ net-firewall/ebtables
+ >=net-firewall/iptables-1.4.10[ipv6]
+ net-misc/radvd
+ sys-apps/iproute2[-minimal]
+ )
+ wireshark-plugins? ( net-analyzer/wireshark:= )
+ xen? (
+ >=app-emulation/xen-4.6.0
+ app-emulation/xen-tools:=
+ )
+ udev? (
+ virtual/libudev
+ >=x11-libs/libpciaccess-0.10.9
+ )
+ zfs? ( sys-fs/zfs )"
+
+DEPEND="${BDEPEND}
+ ${RDEPEND}
+ ${PYTHON_DEPS}"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-6.0.0-fix_paths_in_libvirt-guests_sh.patch
+ "${FILESDIR}"/${PN}-6.7.0-do-not-use-sysconfig.patch
+ "${FILESDIR}"/${PN}-6.7.0-doc-path.patch
+ "${FILESDIR}"/${PN}-6.7.0-fix-paths-for-apparmor.patch
+)
+
+pkg_setup() {
+ # Check kernel configuration:
+ CONFIG_CHECK=""
+ use fuse && CONFIG_CHECK+="
+ ~FUSE_FS"
+
+ use lvm && CONFIG_CHECK+="
+ ~BLK_DEV_DM
+ ~DM_MULTIPATH
+ ~DM_SNAPSHOT"
+
+ use lxc && CONFIG_CHECK+="
+ ~BLK_CGROUP
+ ~CGROUP_CPUACCT
+ ~CGROUP_DEVICE
+ ~CGROUP_FREEZER
+ ~CGROUP_NET_PRIO
+ ~CGROUP_PERF
+ ~CGROUPS
+ ~CGROUP_SCHED
+ ~CPUSETS
+ ~IPC_NS
+ ~MACVLAN
+ ~NAMESPACES
+ ~NET_CLS_CGROUP
+ ~NET_NS
+ ~PID_NS
+ ~POSIX_MQUEUE
+ ~SECURITYFS
+ ~USER_NS
+ ~UTS_NS
+ ~VETH
+ ~!GRKERNSEC_CHROOT_MOUNT
+ ~!GRKERNSEC_CHROOT_DOUBLE
+ ~!GRKERNSEC_CHROOT_PIVOT
+ ~!GRKERNSEC_CHROOT_CHMOD
+ ~!GRKERNSEC_CHROOT_CAPS"
+
+ kernel_is lt 4 7 && use lxc && CONFIG_CHECK+="
+ ~DEVPTS_MULTIPLE_INSTANCES"
+
+ use macvtap && CONFIG_CHECK+="
+ ~MACVTAP"
+
+ use virt-network && CONFIG_CHECK+="
+ ~BRIDGE_EBT_MARK_T
+ ~BRIDGE_NF_EBTABLES
+ ~NETFILTER_ADVANCED
+ ~NETFILTER_XT_CONNMARK
+ ~NETFILTER_XT_MARK
+ ~NETFILTER_XT_TARGET_CHECKSUM
+ ~IP_NF_FILTER
+ ~IP_NF_MANGLE
+ ~IP_NF_NAT
+ ~IP_NF_TARGET_MASQUERADE
+ ~IP6_NF_FILTER
+ ~IP6_NF_MANGLE
+ ~IP6_NF_NAT"
+ # Bandwidth Limiting Support
+ use virt-network && CONFIG_CHECK+="
+ ~BRIDGE_EBT_T_NAT
+ ~IP_NF_TARGET_REJECT
+ ~NET_ACT_POLICE
+ ~NET_CLS_FW
+ ~NET_CLS_U32
+ ~NET_SCH_HTB
+ ~NET_SCH_INGRESS
+ ~NET_SCH_SFQ"
+
+ # Handle specific kernel versions for different features
+ kernel_is lt 3 6 && CONFIG_CHECK+=" ~CGROUP_MEM_RES_CTLR"
+ if kernel_is ge 3 6; then
+ CONFIG_CHECK+=" ~MEMCG ~MEMCG_SWAP "
+ kernel_is lt 4 5 && CONFIG_CHECK+=" ~MEMCG_KMEM "
+ fi
+
+ ERROR_USER_NS="Optional depending on LXC configuration."
+
+ if [[ -n ${CONFIG_CHECK} ]]; then
+ linux-info_pkg_setup
+ fi
+}
+
+src_prepare() {
+ touch "${S}/.mailmap" || die
+
+ default
+
+ # Tweak the init script:
+ cp "${FILESDIR}/libvirtd.init-r19" "${S}/libvirtd.init" || die
+ sed -e "s/USE_FLAG_FIREWALLD/$(usex firewalld 'need firewalld' '')/" \
+ -i "${S}/libvirtd.init" || die "sed failed"
+}
+
+src_configure() {
+ local emesonargs=(
+ $(meson_feature apparmor)
+ $(meson_use apparmor apparmor_profiles)
+ $(meson_feature audit)
+ $(meson_feature caps capng)
+ $(meson_feature dbus)
+ $(meson_feature dtrace)
+ $(meson_feature firewalld)
+ $(meson_feature fuse)
+ $(meson_feature glusterfs)
+ $(meson_feature glusterfs storage_gluster)
+ $(meson_feature iscsi storage_iscsi)
+ $(meson_feature iscsi-direct storage_iscsi_direct)
+ $(meson_feature libvirtd driver_libvirtd)
+ $(meson_feature libssh)
+ $(meson_feature lvm storage_lvm)
+ $(meson_feature lvm storage_mpath)
+ $(meson_feature lxc driver_lxc)
+ $(meson_feature macvtap)
+ $(meson_feature nls)
+ $(meson_feature numa numactl)
+ $(meson_feature numa numad)
+ $(meson_feature openvz driver_openvz)
+ $(meson_feature parted storage_disk)
+ $(meson_feature pcap libpcap)
+ $(meson_feature policykit polkit)
+ $(meson_feature qemu driver_qemu)
+ $(meson_feature qemu yajl)
+ $(meson_feature rbd storage_rbd)
+ $(meson_feature sasl)
+ $(meson_feature selinux)
+ $(meson_feature udev)
+ $(meson_feature vepa virtualport)
+ $(meson_feature virt-network driver_network)
+ $(meson_feature virtualbox driver_vbox)
+ $(meson_feature wireshark-plugins wireshark_dissector)
+ $(meson_feature xen driver_libxl)
+ $(meson_feature zfs storage_zfs)
+
+ -Dhal=disabled
+ -Dnetcf=disabled
+ -Dsanlock=disabled
+
+ -Ddriver_esx=enabled
+ -Dinit_script=systemd
+ -Dqemu_user=$(usex caps qemu root)
+ -Dqemu_group=$(usex caps qemu root)
+ -Ddriver_remote=enabled
+ -Dstorage_fs=enabled
+ -Ddriver_vmware=enabled
+
+ --localstatedir="${EPREFIX}/var"
+ -Drunstatedir="${EPREFIX}/run"
+ )
+
+ meson_src_configure
+}
+
+src_test() {
+ # remove problematic tests, bug #591416, bug #591418
+ sed -i -e 's#commandtest$(EXEEXT) # #' \
+ -e 's#virfirewalltest$(EXEEXT) # #' \
+ -e 's#nwfilterebiptablestest$(EXEEXT) # #' \
+ -e 's#nwfilterxml2firewalltest$(EXEEXT)$##' \
+ tests/Makefile
+
+ export VIR_TEST_DEBUG=1
+ meson_src_test
+}
+
+src_install() {
+ meson_src_install
+
+ # Remove bogus, empty directories. They are either not used, or
+ # libvirtd is able to create them on demand
+ rm -rf "${D}"/etc/sysconfig || die
+ rm -rf "${D}"/var || die
+ rm -rf "${D}"/run || die
+
+ newbashcomp "${S}/tools/bash-completion/vsh" virsh
+ bashcomp_alias virsh virt-admin
+
+ use libvirtd || return 0
+ # From here, only libvirtd-related instructions, be warned!
+
+ systemd_newtmpfilesd "${FILESDIR}"/libvirtd.tmpfiles.conf libvirtd.conf
+
+ newinitd "${S}/libvirtd.init" libvirtd
+ newinitd "${FILESDIR}/libvirt-guests.init-r4" libvirt-guests
+ newinitd "${FILESDIR}/virtlockd.init-r2" virtlockd
+ newinitd "${FILESDIR}/virtlogd.init-r2" virtlogd
+
+ newconfd "${FILESDIR}/libvirtd.confd-r5" libvirtd
+ newconfd "${FILESDIR}/libvirt-guests.confd" libvirt-guests
+
+ DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r3")
+ DISABLE_AUTOFORMATTING=true
+ readme.gentoo_create_doc
+}
+
+pkg_preinst() {
+ # we only ever want to generate this once
+ if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then
+ rm -rf "${D}"/etc/libvirt/qemu/networks/default.xml || die
+ fi
+}
+
+pkg_postinst() {
+ if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then
+ touch "${ROOT}"/etc/libvirt/qemu/networks/default.xml || die
+ fi
+
+ use libvirtd || return 0
+ # From here, only libvirtd-related instructions, be warned!
+
+ readme.gentoo_print_elog
+}
diff --git a/app-emulation/libvirt/libvirt-6.8.0.ebuild b/app-emulation/libvirt/libvirt-6.8.0.ebuild
new file mode 100644
index 000000000000..0ac6ec64febf
--- /dev/null
+++ b/app-emulation/libvirt/libvirt-6.8.0.ebuild
@@ -0,0 +1,344 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+inherit meson bash-completion-r1 eutils linux-info python-any-r1 readme.gentoo-r1 systemd
+
+if [[ ${PV} = *9999* ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://gitlab.com/libvirt/libvirt.git"
+ SRC_URI=""
+ SLOT="0"
+else
+ SRC_URI="https://libvirt.org/sources/${P}.tar.xz"
+ KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+ SLOT="0/${PV}"
+fi
+
+DESCRIPTION="C toolkit to manipulate virtual machines"
+HOMEPAGE="https://www.libvirt.org/"
+LICENSE="LGPL-2.1"
+IUSE="
+ apparmor audit +caps +dbus dtrace firewalld fuse glusterfs iscsi
+ iscsi-direct +libvirtd lvm libssh lxc +macvtap nfs nls numa openvz
+ parted pcap policykit +qemu rbd sasl selinux +udev +vepa
+ virtualbox virt-network wireshark-plugins xen zfs
+"
+
+REQUIRED_USE="
+ firewalld? ( virt-network )
+ libvirtd? ( || ( lxc openvz qemu virtualbox xen ) )
+ lxc? ( caps libvirtd )
+ openvz? ( libvirtd )
+ policykit? ( dbus )
+ qemu? ( libvirtd )
+ vepa? ( macvtap )
+ virt-network? ( libvirtd )
+ virtualbox? ( libvirtd )
+ xen? ( libvirtd )"
+
+BDEPEND="
+ acct-user/qemu
+ policykit? ( acct-group/libvirt )
+ app-text/xhtml1
+ dev-lang/perl
+ dev-libs/libxslt
+ dev-perl/XML-XPath
+ dev-python/docutils
+ virtual/pkgconfig"
+
+# gettext.sh command is used by the libvirt command wrappers, and it's
+# non-optional, so put it into RDEPEND.
+# We can use both libnl:1.1 and libnl:3, but if you have both installed, the
+# package will use 3 by default. Since we don't have slot pinning in an API,
+# we must go with the most recent
+RDEPEND="
+ app-misc/scrub
+ >=dev-libs/glib-2.48.0
+ dev-libs/libgcrypt:0
+ dev-libs/libnl:3
+ >=dev-libs/libxml2-2.7.6
+ >=net-analyzer/openbsd-netcat-1.105-r1
+ >=net-libs/gnutls-1.0.25:0=
+ net-libs/libssh2
+ net-libs/libtirpc
+ net-libs/rpcsvc-proto
+ >=net-misc/curl-7.18.0
+ sys-apps/dmidecode
+ sys-devel/gettext
+ sys-libs/ncurses:0=
+ sys-libs/readline:=
+ apparmor? ( sys-libs/libapparmor )
+ audit? ( sys-process/audit )
+ caps? ( sys-libs/libcap-ng )
+ dbus? ( sys-apps/dbus )
+ dtrace? ( dev-util/systemtap )
+ firewalld? ( >=net-firewall/firewalld-0.6.3 )
+ fuse? ( sys-fs/fuse:0= )
+ glusterfs? ( >=sys-cluster/glusterfs-3.4.1 )
+ iscsi? ( sys-block/open-iscsi )
+ iscsi-direct? ( >=net-libs/libiscsi-1.18.0 )
+ libssh? ( net-libs/libssh )
+ lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] )
+ nfs? ( net-fs/nfs-utils )
+ numa? (
+ >sys-process/numactl-2.0.2
+ sys-process/numad
+ )
+ parted? (
+ >=sys-block/parted-1.8[device-mapper]
+ sys-fs/lvm2[-device-mapper-only(-)]
+ )
+ pcap? ( >=net-libs/libpcap-1.0.0 )
+ policykit? ( >=sys-auth/polkit-0.9 )
+ qemu? (
+ >=app-emulation/qemu-1.5.0
+ dev-libs/yajl
+ )
+ rbd? ( sys-cluster/ceph )
+ sasl? ( dev-libs/cyrus-sasl )
+ selinux? ( >=sys-libs/libselinux-2.0.85 )
+ virt-network? (
+ net-dns/dnsmasq[script]
+ net-firewall/ebtables
+ >=net-firewall/iptables-1.4.10[ipv6]
+ net-misc/radvd
+ sys-apps/iproute2[-minimal]
+ )
+ wireshark-plugins? ( net-analyzer/wireshark:= )
+ xen? (
+ >=app-emulation/xen-4.6.0
+ app-emulation/xen-tools:=
+ )
+ udev? (
+ virtual/libudev
+ >=x11-libs/libpciaccess-0.10.9
+ )
+ zfs? ( sys-fs/zfs )"
+
+DEPEND="${BDEPEND}
+ ${RDEPEND}
+ ${PYTHON_DEPS}"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-6.0.0-fix_paths_in_libvirt-guests_sh.patch
+ "${FILESDIR}"/${PN}-6.7.0-do-not-use-sysconfig.patch
+ "${FILESDIR}"/${PN}-6.7.0-doc-path.patch
+ "${FILESDIR}"/${PN}-6.7.0-fix-paths-for-apparmor.patch
+)
+
+pkg_setup() {
+ # Check kernel configuration:
+ CONFIG_CHECK=""
+ use fuse && CONFIG_CHECK+="
+ ~FUSE_FS"
+
+ use lvm && CONFIG_CHECK+="
+ ~BLK_DEV_DM
+ ~DM_MULTIPATH
+ ~DM_SNAPSHOT"
+
+ use lxc && CONFIG_CHECK+="
+ ~BLK_CGROUP
+ ~CGROUP_CPUACCT
+ ~CGROUP_DEVICE
+ ~CGROUP_FREEZER
+ ~CGROUP_NET_PRIO
+ ~CGROUP_PERF
+ ~CGROUPS
+ ~CGROUP_SCHED
+ ~CPUSETS
+ ~IPC_NS
+ ~MACVLAN
+ ~NAMESPACES
+ ~NET_CLS_CGROUP
+ ~NET_NS
+ ~PID_NS
+ ~POSIX_MQUEUE
+ ~SECURITYFS
+ ~USER_NS
+ ~UTS_NS
+ ~VETH
+ ~!GRKERNSEC_CHROOT_MOUNT
+ ~!GRKERNSEC_CHROOT_DOUBLE
+ ~!GRKERNSEC_CHROOT_PIVOT
+ ~!GRKERNSEC_CHROOT_CHMOD
+ ~!GRKERNSEC_CHROOT_CAPS"
+
+ kernel_is lt 4 7 && use lxc && CONFIG_CHECK+="
+ ~DEVPTS_MULTIPLE_INSTANCES"
+
+ use macvtap && CONFIG_CHECK+="
+ ~MACVTAP"
+
+ use virt-network && CONFIG_CHECK+="
+ ~BRIDGE_EBT_MARK_T
+ ~BRIDGE_NF_EBTABLES
+ ~NETFILTER_ADVANCED
+ ~NETFILTER_XT_CONNMARK
+ ~NETFILTER_XT_MARK
+ ~NETFILTER_XT_TARGET_CHECKSUM
+ ~IP_NF_FILTER
+ ~IP_NF_MANGLE
+ ~IP_NF_NAT
+ ~IP_NF_TARGET_MASQUERADE
+ ~IP6_NF_FILTER
+ ~IP6_NF_MANGLE
+ ~IP6_NF_NAT"
+ # Bandwidth Limiting Support
+ use virt-network && CONFIG_CHECK+="
+ ~BRIDGE_EBT_T_NAT
+ ~IP_NF_TARGET_REJECT
+ ~NET_ACT_POLICE
+ ~NET_CLS_FW
+ ~NET_CLS_U32
+ ~NET_SCH_HTB
+ ~NET_SCH_INGRESS
+ ~NET_SCH_SFQ"
+
+ # Handle specific kernel versions for different features
+ kernel_is lt 3 6 && CONFIG_CHECK+=" ~CGROUP_MEM_RES_CTLR"
+ if kernel_is ge 3 6; then
+ CONFIG_CHECK+=" ~MEMCG ~MEMCG_SWAP "
+ kernel_is lt 4 5 && CONFIG_CHECK+=" ~MEMCG_KMEM "
+ fi
+
+ ERROR_USER_NS="Optional depending on LXC configuration."
+
+ if [[ -n ${CONFIG_CHECK} ]]; then
+ linux-info_pkg_setup
+ fi
+}
+
+src_prepare() {
+ touch "${S}/.mailmap" || die
+
+ default
+
+ # Tweak the init script:
+ cp "${FILESDIR}/libvirtd.init-r19" "${S}/libvirtd.init" || die
+ sed -e "s/USE_FLAG_FIREWALLD/$(usex firewalld 'need firewalld' '')/" \
+ -i "${S}/libvirtd.init" || die "sed failed"
+}
+
+src_configure() {
+ local emesonargs=(
+ $(meson_feature apparmor)
+ $(meson_use apparmor apparmor_profiles)
+ $(meson_feature audit)
+ $(meson_feature caps capng)
+ $(meson_feature dbus)
+ $(meson_feature dtrace)
+ $(meson_feature firewalld)
+ $(meson_feature fuse)
+ $(meson_feature glusterfs)
+ $(meson_feature glusterfs storage_gluster)
+ $(meson_feature iscsi storage_iscsi)
+ $(meson_feature iscsi-direct storage_iscsi_direct)
+ $(meson_feature libvirtd driver_libvirtd)
+ $(meson_feature libssh)
+ $(meson_feature lvm storage_lvm)
+ $(meson_feature lvm storage_mpath)
+ $(meson_feature lxc driver_lxc)
+ $(meson_feature macvtap)
+ $(meson_feature nls)
+ $(meson_feature numa numactl)
+ $(meson_feature numa numad)
+ $(meson_feature openvz driver_openvz)
+ $(meson_feature parted storage_disk)
+ $(meson_feature pcap libpcap)
+ $(meson_feature policykit polkit)
+ $(meson_feature qemu driver_qemu)
+ $(meson_feature qemu yajl)
+ $(meson_feature rbd storage_rbd)
+ $(meson_feature sasl)
+ $(meson_feature selinux)
+ $(meson_feature udev)
+ $(meson_feature vepa virtualport)
+ $(meson_feature virt-network driver_network)
+ $(meson_feature virtualbox driver_vbox)
+ $(meson_feature wireshark-plugins wireshark_dissector)
+ $(meson_feature xen driver_libxl)
+ $(meson_feature zfs storage_zfs)
+
+ -Dhal=disabled
+ -Dnetcf=disabled
+ -Dsanlock=disabled
+
+ -Ddriver_esx=enabled
+ -Dinit_script=systemd
+ -Dqemu_user=$(usex caps qemu root)
+ -Dqemu_group=$(usex caps qemu root)
+ -Ddriver_remote=enabled
+ -Dstorage_fs=enabled
+ -Ddriver_vmware=enabled
+
+ --localstatedir="${EPREFIX}/var"
+ -Drunstatedir="${EPREFIX}/run"
+ )
+
+ meson_src_configure
+}
+
+src_test() {
+ # remove problematic tests, bug #591416, bug #591418
+ sed -i -e 's#commandtest$(EXEEXT) # #' \
+ -e 's#virfirewalltest$(EXEEXT) # #' \
+ -e 's#nwfilterebiptablestest$(EXEEXT) # #' \
+ -e 's#nwfilterxml2firewalltest$(EXEEXT)$##' \
+ tests/Makefile
+
+ export VIR_TEST_DEBUG=1
+ meson_src_test
+}
+
+src_install() {
+ meson_src_install
+
+ # Remove bogus, empty directories. They are either not used, or
+ # libvirtd is able to create them on demand
+ rm -rf "${D}"/etc/sysconfig || die
+ rm -rf "${D}"/var || die
+ rm -rf "${D}"/run || die
+
+ newbashcomp "${S}/tools/bash-completion/vsh" virsh
+ bashcomp_alias virsh virt-admin
+
+ use libvirtd || return 0
+ # From here, only libvirtd-related instructions, be warned!
+
+ systemd_newtmpfilesd "${FILESDIR}"/libvirtd.tmpfiles.conf libvirtd.conf
+
+ newinitd "${S}/libvirtd.init" libvirtd
+ newinitd "${FILESDIR}/libvirt-guests.init-r4" libvirt-guests
+ newinitd "${FILESDIR}/virtlockd.init-r2" virtlockd
+ newinitd "${FILESDIR}/virtlogd.init-r2" virtlogd
+
+ newconfd "${FILESDIR}/libvirtd.confd-r5" libvirtd
+ newconfd "${FILESDIR}/libvirt-guests.confd" libvirt-guests
+
+ DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r3")
+ DISABLE_AUTOFORMATTING=true
+ readme.gentoo_create_doc
+}
+
+pkg_preinst() {
+ # we only ever want to generate this once
+ if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then
+ rm -rf "${D}"/etc/libvirt/qemu/networks/default.xml || die
+ fi
+}
+
+pkg_postinst() {
+ if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then
+ touch "${ROOT}"/etc/libvirt/qemu/networks/default.xml || die
+ fi
+
+ use libvirtd || return 0
+ # From here, only libvirtd-related instructions, be warned!
+
+ readme.gentoo_print_elog
+}
diff --git a/app-emulation/libvirt/libvirt-9999.ebuild b/app-emulation/libvirt/libvirt-9999.ebuild
index 2f977b0b4a98..de48572e6c52 100644
--- a/app-emulation/libvirt/libvirt-9999.ebuild
+++ b/app-emulation/libvirt/libvirt-9999.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8,9} )
+PYTHON_COMPAT=( python3_{7,8,9} )
inherit meson bash-completion-r1 eutils linux-info python-any-r1 readme.gentoo-r1 systemd
@@ -40,14 +40,22 @@ REQUIRED_USE="
virtualbox? ( libvirtd )
xen? ( libvirtd )"
+BDEPEND="
+ acct-user/qemu
+ policykit? ( acct-group/libvirt )
+ app-text/xhtml1
+ dev-lang/perl
+ dev-libs/libxslt
+ dev-perl/XML-XPath
+ dev-python/docutils
+ virtual/pkgconfig"
+
# gettext.sh command is used by the libvirt command wrappers, and it's
# non-optional, so put it into RDEPEND.
# We can use both libnl:1.1 and libnl:3, but if you have both installed, the
# package will use 3 by default. Since we don't have slot pinning in an API,
# we must go with the most recent
RDEPEND="
- acct-user/qemu
- policykit? ( acct-group/libvirt )
app-misc/scrub
>=dev-libs/glib-2.48.0
dev-libs/libgcrypt:0
@@ -60,7 +68,6 @@ RDEPEND="
net-libs/rpcsvc-proto
>=net-misc/curl-7.18.0
sys-apps/dmidecode
- >=sys-apps/util-linux-2.17
sys-devel/gettext
sys-libs/ncurses:0=
sys-libs/readline:=
@@ -101,26 +108,20 @@ RDEPEND="
net-misc/radvd
sys-apps/iproute2[-minimal]
)
- virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) )
wireshark-plugins? ( net-analyzer/wireshark:= )
xen? (
>=app-emulation/xen-4.6.0
app-emulation/xen-tools:=
)
udev? (
- virtual/udev
+ virtual/libudev
>=x11-libs/libpciaccess-0.10.9
)
zfs? ( sys-fs/zfs )"
-DEPEND="${RDEPEND}
- ${PYTHON_DEPS}
- app-text/xhtml1
- dev-lang/perl
- dev-libs/libxslt
- dev-perl/XML-XPath
- dev-python/docutils
- virtual/pkgconfig"
+DEPEND="${BDEPEND}
+ ${RDEPEND}
+ ${PYTHON_DEPS}"
PATCHES=(
"${FILESDIR}"/${PN}-6.0.0-fix_paths_in_libvirt-guests_sh.patch
@@ -210,7 +211,7 @@ pkg_setup() {
}
src_prepare() {
- touch "${S}/.mailmap"
+ touch "${S}/.mailmap" || die
default
@@ -296,9 +297,9 @@ src_install() {
# Remove bogus, empty directories. They are either not used, or
# libvirtd is able to create them on demand
- rm -rf "${D}"/etc/sysconfig
- rm -rf "${D}"/var
- rm -rf "${D}"/run
+ rm -rf "${D}"/etc/sysconfig || die
+ rm -rf "${D}"/var || die
+ rm -rf "${D}"/run || die
newbashcomp "${S}/tools/bash-completion/vsh" virsh
bashcomp_alias virsh virt-admin
@@ -324,13 +325,13 @@ src_install() {
pkg_preinst() {
# we only ever want to generate this once
if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then
- rm -rf "${D}"/etc/libvirt/qemu/networks/default.xml
+ rm -rf "${D}"/etc/libvirt/qemu/networks/default.xml || die
fi
}
pkg_postinst() {
if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then
- touch "${ROOT}"/etc/libvirt/qemu/networks/default.xml
+ touch "${ROOT}"/etc/libvirt/qemu/networks/default.xml || die
fi
use libvirtd || return 0
diff --git a/app-emulation/qemu/qemu-5.1.0-r1.ebuild b/app-emulation/qemu/qemu-5.1.0-r1.ebuild
index 369d862dc879..6c6c19919a67 100644
--- a/app-emulation/qemu/qemu-5.1.0-r1.ebuild
+++ b/app-emulation/qemu/qemu-5.1.0-r1.ebuild
@@ -23,7 +23,7 @@ if [[ ${PV} = *9999* ]]; then
SRC_URI=""
else
SRC_URI="https://download.qemu.org/${P}.tar.xz"
- KEYWORDS="~amd64 arm64 ~ppc ~ppc64 ~x86"
+ KEYWORDS="amd64 arm64 ~ppc ~ppc64 ~x86"
fi
DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"
diff --git a/app-eselect/Manifest.gz b/app-eselect/Manifest.gz
index 6be7b37c5334..6cc13dd6deb0 100644
Binary files a/app-eselect/Manifest.gz and b/app-eselect/Manifest.gz differ
diff --git a/app-eselect/eselect-awk/Manifest b/app-eselect/eselect-awk/Manifest
index 89ee8d4d4bdf..1b9c5367e32d 100644
--- a/app-eselect/eselect-awk/Manifest
+++ b/app-eselect/eselect-awk/Manifest
@@ -1,2 +1 @@
-DIST eselect-awk-0.2.tar.gz 1541 BLAKE2B 4ad07b02869672bef3c905a7417706344ccc11a9a46fcfe85cefa95881a4e727c11481bcefe17f96a77f1adc64d5ad3b1f2dfcc259bfcb8365d03ad68d88d365 SHA512 ef00ac8e8b962c17dc8094d64e5cbf44654a747cc648a5cf38346c3a90e0d685726693094ac265398b40d9d325600073ea2c4905b813f1e40fbfc7627930a5de
DIST eselect-awk-0.3.tar.gz 1543 BLAKE2B 9ff340002d76a3bc3569501d7b92a8d216eac65e9c009be2a7b43802512050fdae962b53e66bbd0e5df6d295968aa4e3d56c8442adce5eac5d7c8b1f30b1e924 SHA512 d90ed1c8edddd996e2b62b4a927d2c5ead5790aff275e3a79f4a1361358c4debef0c50ec2c8d6da5a210755a5d51cad4b2c5d6ee90553227f0f24b251b52e383
diff --git a/app-eselect/eselect-awk/eselect-awk-0.2.ebuild b/app-eselect/eselect-awk/eselect-awk-0.2.ebuild
deleted file mode 100644
index 0b44c4f51ed4..000000000000
--- a/app-eselect/eselect-awk/eselect-awk-0.2.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-DESCRIPTION="Manages the {,/usr}/bin/awk symlink"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-SRC_URI="https://dev.gentoo.org/~junghans/distfiles/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-macos"
-IUSE=""
-
-src_install() {
- insinto /usr/share/eselect/modules
- doins awk.eselect
-}
diff --git a/app-i18n/Manifest.gz b/app-i18n/Manifest.gz
index 11f14b861808..b02a32991f84 100644
Binary files a/app-i18n/Manifest.gz and b/app-i18n/Manifest.gz differ
diff --git a/app-i18n/fcitx-libpinyin/fcitx-libpinyin-0.5.3.ebuild b/app-i18n/fcitx-libpinyin/fcitx-libpinyin-0.5.3.ebuild
index 079c6e3c5fa3..1742c97885a1 100644
--- a/app-i18n/fcitx-libpinyin/fcitx-libpinyin-0.5.3.ebuild
+++ b/app-i18n/fcitx-libpinyin/fcitx-libpinyin-0.5.3.ebuild
@@ -1,9 +1,9 @@
# Copyright 2012-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="6"
+EAPI="7"
-inherit cmake-utils xdg-utils
+inherit cmake xdg-utils
if [[ "${PV}" =~ (^|\.)9999$ ]]; then
inherit git-r3
@@ -24,7 +24,14 @@ SLOT="4"
KEYWORDS="amd64 ppc ppc64 x86"
IUSE="dictionary-manager"
-RDEPEND=">=app-i18n/fcitx-4.2.9:4
+BDEPEND=">=app-i18n/fcitx-4.2.9:4
+ >=app-i18n/libpinyin-2.1.0
+ virtual/pkgconfig
+ dictionary-manager? (
+ >=dev-qt/qtcore-5.7:5
+ >=dev-qt/qtwidgets-5.7:5
+ )"
+DEPEND=">=app-i18n/fcitx-4.2.9:4
>=app-i18n/libpinyin-2.1.0:=
dev-libs/glib:2
sys-apps/dbus
@@ -38,8 +45,7 @@ RDEPEND=">=app-i18n/fcitx-4.2.9:4
>=dev-qt/qtwebengine-5.7:5[widgets]
>=dev-qt/qtwidgets-5.7:5
)"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
+RDEPEND="${DEPEND}"
DOCS=(AUTHORS)
@@ -48,7 +54,7 @@ src_prepare() {
ln -s "${DISTDIR}/fcitx-data-model.text.20161206.tar.gz" data/model.text.20161206.tar.gz || die
fi
- cmake-utils_src_prepare
+ cmake_src_prepare
}
src_configure() {
@@ -56,7 +62,7 @@ src_configure() {
-DENABLE_QT=$(usex dictionary-manager)
)
- cmake-utils_src_configure
+ cmake_src_configure
}
pkg_postinst() {
diff --git a/app-i18n/fcitx-libpinyin/fcitx-libpinyin-4.9999.ebuild b/app-i18n/fcitx-libpinyin/fcitx-libpinyin-4.9999.ebuild
index af2da3f65dcd..23aae0d11f68 100644
--- a/app-i18n/fcitx-libpinyin/fcitx-libpinyin-4.9999.ebuild
+++ b/app-i18n/fcitx-libpinyin/fcitx-libpinyin-4.9999.ebuild
@@ -1,9 +1,9 @@
# Copyright 2012-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="6"
+EAPI="7"
-inherit cmake-utils xdg-utils
+inherit cmake xdg-utils
if [[ "${PV}" =~ (^|\.)9999$ ]]; then
inherit git-r3
@@ -24,7 +24,14 @@ SLOT="4"
KEYWORDS=""
IUSE="dictionary-manager"
-RDEPEND=">=app-i18n/fcitx-4.2.9:4
+BDEPEND=">=app-i18n/fcitx-4.2.9:4
+ >=app-i18n/libpinyin-2.1.0
+ virtual/pkgconfig
+ dictionary-manager? (
+ >=dev-qt/qtcore-5.7:5
+ >=dev-qt/qtwidgets-5.7:5
+ )"
+DEPEND=">=app-i18n/fcitx-4.2.9:4
>=app-i18n/libpinyin-2.1.0:=
dev-libs/glib:2
sys-apps/dbus
@@ -38,8 +45,7 @@ RDEPEND=">=app-i18n/fcitx-4.2.9:4
>=dev-qt/qtwebengine-5.7:5[widgets]
>=dev-qt/qtwidgets-5.7:5
)"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
+RDEPEND="${DEPEND}"
DOCS=(AUTHORS)
@@ -48,7 +54,7 @@ src_prepare() {
ln -s "${DISTDIR}/fcitx-data-model.text.20161206.tar.gz" data/model.text.20161206.tar.gz || die
fi
- cmake-utils_src_prepare
+ cmake_src_prepare
}
src_configure() {
@@ -56,7 +62,7 @@ src_configure() {
-DENABLE_QT=$(usex dictionary-manager)
)
- cmake-utils_src_configure
+ cmake_src_configure
}
pkg_postinst() {
diff --git a/app-i18n/fcitx-m17n/fcitx-m17n-0.2.4.ebuild b/app-i18n/fcitx-m17n/fcitx-m17n-0.2.4.ebuild
index 82a35d462868..f282e295308e 100644
--- a/app-i18n/fcitx-m17n/fcitx-m17n-0.2.4.ebuild
+++ b/app-i18n/fcitx-m17n/fcitx-m17n-0.2.4.ebuild
@@ -1,9 +1,9 @@
# Copyright 2016-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="6"
+EAPI="7"
-inherit cmake-utils
+inherit cmake
if [[ "${PV}" =~ (^|\.)9999$ ]]; then
inherit git-r3
@@ -24,10 +24,11 @@ SLOT="4"
KEYWORDS="amd64 ~hppa ppc ppc64 x86"
IUSE=""
-RDEPEND=">=app-i18n/fcitx-4.2.9:4
+BDEPEND=">=app-i18n/fcitx-4.2.9:4
+ virtual/pkgconfig"
+DEPEND=">=app-i18n/fcitx-4.2.9:4
dev-libs/m17n-lib
virtual/libintl"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
+RDEPEND="${DEPEND}"
DOCS=()
diff --git a/app-i18n/fcitx-m17n/fcitx-m17n-4.9999.ebuild b/app-i18n/fcitx-m17n/fcitx-m17n-4.9999.ebuild
index a043cd7fefa4..2c40502ee4c3 100644
--- a/app-i18n/fcitx-m17n/fcitx-m17n-4.9999.ebuild
+++ b/app-i18n/fcitx-m17n/fcitx-m17n-4.9999.ebuild
@@ -1,9 +1,9 @@
# Copyright 2016-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="6"
+EAPI="7"
-inherit cmake-utils
+inherit cmake
if [[ "${PV}" =~ (^|\.)9999$ ]]; then
inherit git-r3
@@ -24,10 +24,11 @@ SLOT="4"
KEYWORDS=""
IUSE=""
-RDEPEND=">=app-i18n/fcitx-4.2.9:4
+BDEPEND=">=app-i18n/fcitx-4.2.9:4
+ virtual/pkgconfig"
+DEPEND=">=app-i18n/fcitx-4.2.9:4
dev-libs/m17n-lib
virtual/libintl"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
+RDEPEND="${DEPEND}"
DOCS=()
diff --git a/app-i18n/fcitx-rime/fcitx-rime-0.3.2.ebuild b/app-i18n/fcitx-rime/fcitx-rime-0.3.2.ebuild
index 273db4b0c27a..18b40399bbf0 100644
--- a/app-i18n/fcitx-rime/fcitx-rime-0.3.2.ebuild
+++ b/app-i18n/fcitx-rime/fcitx-rime-0.3.2.ebuild
@@ -1,9 +1,9 @@
# Copyright 2012-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="6"
+EAPI="7"
-inherit cmake-utils xdg-utils
+inherit cmake xdg-utils
if [[ "${PV}" =~ (^|\.)9999$ ]]; then
inherit git-r3
@@ -24,12 +24,13 @@ SLOT="4"
KEYWORDS="amd64 ppc ppc64 x86"
IUSE=""
-RDEPEND=">=app-i18n/fcitx-4.2.9:4
+BDEPEND=">=app-i18n/fcitx-4.2.9:4
+ virtual/pkgconfig"
+DEPEND=">=app-i18n/fcitx-4.2.9:4
>=app-i18n/librime-1.0.0:=
- app-i18n/rime-data
virtual/libintl"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
+RDEPEND="${DEPEND}
+ app-i18n/rime-data"
DOCS=()
@@ -38,7 +39,7 @@ src_configure() {
-DRIME_DATA_DIR="${EPREFIX}/usr/share/rime-data"
)
- cmake-utils_src_configure
+ cmake_src_configure
}
pkg_postinst() {
diff --git a/app-i18n/fcitx-rime/fcitx-rime-4.9999.ebuild b/app-i18n/fcitx-rime/fcitx-rime-4.9999.ebuild
index 382c68ff7502..49fb4753f008 100644
--- a/app-i18n/fcitx-rime/fcitx-rime-4.9999.ebuild
+++ b/app-i18n/fcitx-rime/fcitx-rime-4.9999.ebuild
@@ -1,9 +1,9 @@
# Copyright 2012-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="6"
+EAPI="7"
-inherit cmake-utils xdg-utils
+inherit cmake xdg-utils
if [[ "${PV}" =~ (^|\.)9999$ ]]; then
inherit git-r3
@@ -24,9 +24,14 @@ SLOT="4"
KEYWORDS=""
IUSE="+configuration_tool"
-RDEPEND=">=app-i18n/fcitx-4.2.9:4
+BDEPEND=">=app-i18n/fcitx-4.2.9:4
+ virtual/pkgconfig
+ configuration_tool? (
+ dev-qt/qtcore:5
+ dev-qt/qtwidgets:5
+ )"
+DEPEND=">=app-i18n/fcitx-4.2.9:4
>=app-i18n/librime-1.0.0:=
- app-i18n/rime-data
virtual/libintl
configuration_tool? (
>=app-i18n/fcitx-qt5-1.1:4
@@ -34,8 +39,9 @@ RDEPEND=">=app-i18n/fcitx-4.2.9:4
dev-qt/qtgui:5
dev-qt/qtwidgets:5
)"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
+RDEPEND="${DEPEND}
+ app-i18n/rime-data"
+DEPEND="${DEPEND}
configuration_tool? ( dev-qt/qtconcurrent:5 )"
DOCS=()
@@ -46,7 +52,7 @@ src_configure() {
-DENABLE_QT5GUI=$(usex configuration_tool)
)
- cmake-utils_src_configure
+ cmake_src_configure
}
pkg_postinst() {
diff --git a/app-i18n/fcitx-sayura/fcitx-sayura-0.1.2.ebuild b/app-i18n/fcitx-sayura/fcitx-sayura-0.1.2.ebuild
index 3d0258f459a7..69fb1d323273 100644
--- a/app-i18n/fcitx-sayura/fcitx-sayura-0.1.2.ebuild
+++ b/app-i18n/fcitx-sayura/fcitx-sayura-0.1.2.ebuild
@@ -3,7 +3,7 @@
EAPI="7"
-inherit cmake-utils xdg-utils
+inherit cmake xdg-utils
if [[ "${PV}" =~ (^|\.)9999$ ]]; then
inherit git-r3
diff --git a/app-i18n/fcitx-sayura/fcitx-sayura-4.9999.ebuild b/app-i18n/fcitx-sayura/fcitx-sayura-4.9999.ebuild
index 8b9f2d116f0a..071943eb140c 100644
--- a/app-i18n/fcitx-sayura/fcitx-sayura-4.9999.ebuild
+++ b/app-i18n/fcitx-sayura/fcitx-sayura-4.9999.ebuild
@@ -3,7 +3,7 @@
EAPI="7"
-inherit cmake-utils xdg-utils
+inherit cmake xdg-utils
if [[ "${PV}" =~ (^|\.)9999$ ]]; then
inherit git-r3
diff --git a/app-i18n/kcm-fcitx/kcm-fcitx-0.5.5.ebuild b/app-i18n/kcm-fcitx/kcm-fcitx-0.5.5.ebuild
index 7204e2277fe5..c8f903b0e905 100644
--- a/app-i18n/kcm-fcitx/kcm-fcitx-0.5.5.ebuild
+++ b/app-i18n/kcm-fcitx/kcm-fcitx-0.5.5.ebuild
@@ -1,7 +1,7 @@
# Copyright 2013-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="6"
+EAPI="7"
inherit cmake-utils
@@ -24,7 +24,13 @@ SLOT="4-plasma5"
KEYWORDS="amd64 x86"
IUSE=""
-RDEPEND=">=app-i18n/fcitx-4.2.9:4
+BDEPEND=">=app-i18n/fcitx-4.2.9:4
+ dev-qt/qtcore:5
+ dev-qt/qtwidgets:5
+ kde-frameworks/extra-cmake-modules:5
+ sys-devel/gettext
+ virtual/pkgconfig"
+DEPEND=">=app-i18n/fcitx-4.2.9:4
>=app-i18n/fcitx-qt5-1.1:4
dev-qt/qtcore:5
dev-qt/qtdbus:5
@@ -40,12 +46,9 @@ RDEPEND=">=app-i18n/fcitx-4.2.9:4
kde-frameworks/kwidgetsaddons:5
virtual/libintl
x11-libs/libX11
- x11-libs/libxkbfile
- !${CATEGORY}/${PN}:4[-minimal(-)]"
-DEPEND="${RDEPEND}
- kde-frameworks/extra-cmake-modules:5
- sys-devel/gettext
- virtual/pkgconfig"
+ x11-libs/libxkbfile"
+RDEPEND="${DEPEND}
+ !${CATEGORY}/${PN}:4-plasma4[-minimal(-)]"
src_configure() {
local mycmakeargs=(
diff --git a/app-i18n/kcm-fcitx/kcm-fcitx-4.5.9999.ebuild b/app-i18n/kcm-fcitx/kcm-fcitx-4.5.9999.ebuild
index bed2c38530a0..5edbbf830dd2 100644
--- a/app-i18n/kcm-fcitx/kcm-fcitx-4.5.9999.ebuild
+++ b/app-i18n/kcm-fcitx/kcm-fcitx-4.5.9999.ebuild
@@ -1,7 +1,7 @@
# Copyright 2013-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="6"
+EAPI="7"
inherit cmake-utils
@@ -24,7 +24,13 @@ SLOT="4-plasma5"
KEYWORDS=""
IUSE=""
-RDEPEND=">=app-i18n/fcitx-4.2.9:4
+BDEPEND=">=app-i18n/fcitx-4.2.9:4
+ dev-qt/qtcore:5
+ dev-qt/qtwidgets:5
+ kde-frameworks/extra-cmake-modules:5
+ sys-devel/gettext
+ virtual/pkgconfig"
+DEPEND=">=app-i18n/fcitx-4.2.9:4
>=app-i18n/fcitx-qt5-1.1:4
dev-qt/qtcore:5
dev-qt/qtdbus:5
@@ -40,12 +46,9 @@ RDEPEND=">=app-i18n/fcitx-4.2.9:4
kde-frameworks/kwidgetsaddons:5
virtual/libintl
x11-libs/libX11
- x11-libs/libxkbfile
- !${CATEGORY}/${PN}:4[-minimal(-)]"
-DEPEND="${RDEPEND}
- kde-frameworks/extra-cmake-modules:5
- sys-devel/gettext
- virtual/pkgconfig"
+ x11-libs/libxkbfile"
+RDEPEND="${DEPEND}
+ !${CATEGORY}/${PN}:4-plasma4[-minimal(-)]"
src_configure() {
local mycmakeargs=(
diff --git a/app-i18n/scim-wijesekera/Manifest b/app-i18n/scim-wijesekera/Manifest
deleted file mode 100644
index ea2b39271164..000000000000
--- a/app-i18n/scim-wijesekera/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST scim-wijesekera-0.3.3.tar.gz 193023 BLAKE2B 6d8b4757e851a9e17b074c0bdda03e01b32a547a29d9755f82eb8828f8accf830a44aac8cc71ba6c6b18c7649a9a6e3009108e2fdc27992e9dc8d84d99a0c201 SHA512 98bfbb7a3cf499c7980c06504083744f46ce352b27e8e80362190359e8bfa88472a5510568f3753503c7d409d1730e7d1ae1162e3d43a5475e466c334b0a91fc
diff --git a/app-i18n/scim-wijesekera/files/scim-wijesekera-0.3.3-gcc43.patch b/app-i18n/scim-wijesekera/files/scim-wijesekera-0.3.3-gcc43.patch
deleted file mode 100644
index 1fa083fd7c8d..000000000000
--- a/app-i18n/scim-wijesekera/files/scim-wijesekera-0.3.3-gcc43.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -Naur scim-wijesekera-0.3.3.orig/src/scim_wijesekera_imengine.cpp scim-wijesekera-0.3.3/src/scim_wijesekera_imengine.cpp
---- scim-wijesekera-0.3.3.orig/src/scim_wijesekera_imengine.cpp 2008-04-26 17:45:15.000000000 +0900
-+++ scim-wijesekera-0.3.3/src/scim_wijesekera_imengine.cpp 2008-12-29 01:07:23.000000000 +0900
-@@ -33,6 +33,7 @@
- #endif
-
- #include
-+#include
- #include
- #include
- #include
-diff -Naur scim-wijesekera-0.3.3.orig/src/scim_wijesekera_imengine_setup.cpp scim-wijesekera-0.3.3/src/scim_wijesekera_imengine_setup.cpp
---- scim-wijesekera-0.3.3.orig/src/scim_wijesekera_imengine_setup.cpp 2008-04-26 17:45:15.000000000 +0900
-+++ scim-wijesekera-0.3.3/src/scim_wijesekera_imengine_setup.cpp 2008-12-29 01:07:03.000000000 +0900
-@@ -30,6 +30,7 @@
- #ifdef HAVE_CONFIG_H
- #include
- #endif
-+#include
-
- #include
- #include
diff --git a/app-i18n/scim-wijesekera/scim-wijesekera-0.3.3-r1.ebuild b/app-i18n/scim-wijesekera/scim-wijesekera-0.3.3-r1.ebuild
deleted file mode 100644
index 28914bc279f6..000000000000
--- a/app-i18n/scim-wijesekera/scim-wijesekera-0.3.3-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="Wijesekara keyboard for Sinhala input using scim"
-HOMEPAGE="http://sinhala.sourceforge.net/"
-SRC_URI="http://sinhala.sourceforge.net/files/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=app-i18n/scim-0.99.8[-gtk3]"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-PATCHES=( "${FILESDIR}"/${P}-gcc43.patch )
-
-src_prepare() {
- default
- eautoreconf
-}
-
-src_configure() {
- econf --disable-static
-}
-
-src_install() {
- default
-
- # plugin module, no point in .la files
- find "${D}" -name '*.la' -delete || die
-}
diff --git a/app-i18n/tagainijisho/Manifest b/app-i18n/tagainijisho/Manifest
index cad34b8297eb..6d6c2ed98d48 100644
--- a/app-i18n/tagainijisho/Manifest
+++ b/app-i18n/tagainijisho/Manifest
@@ -1,6 +1,6 @@
-DIST JMdict-2020-04-01.gz 19606278 BLAKE2B aa4f4287dc57ad825df6a8606840d2dd64bf9901cfc546cf25cacda3c838bc0827430bfb948c92183f6f35d356eb97eaf09b743e70740364293dc278168510ba SHA512 ad3907bff000b684af2d78135da0258756757cc715c5827f02a8703e6b9a3f0796fd6e3d24509ec13d84464ec6591e7acb0b9c253724e55a2cb44a564a7e5602
DIST JMdict-2020-07-01.gz 19735470 BLAKE2B 06126c07516241af6789c3427ebe68ce6da3a5116414f8d1cd5248c18319a4b302ec241499c36b380e3a49f43cac2b381e4130d2bae4a7b100de76724786eadd SHA512 08c3feed364666dfbf87c73ac5da20a7eaa414e7fde274f314b058a6b268cc197b834225aed57cea74f6cdc95f374031c1a87ee9e3023f421ed9f3f1af4ca1d0
-DIST kanjidic2-2020-04-01.xml.gz 1482869 BLAKE2B 05a8ed51adaf56023b41d6ac956496fda780d14e55d1947dfdec0647a78d4bcb2f5cab730e729ab42a176bed7de7548276d9d9fd668ca2c6e045296ba0ab4f7a SHA512 87d0562bb5d4ae7153be8d684d1bd9b199039417a76289d783e96e09ea52b6741d923dc2f38500a7b2299c9f4cd0f6c8d7b8b7e00da2f102681387ec858ce852
+DIST JMdict-2020-10-01.gz 19845877 BLAKE2B f75e9cb1096c1f35276606119d1f0e1cf2687f69d9afe2bced55a6b75aa8ada0c8f245e05e8f7246d73463ed895cd232f1ee30ccd639cb32801c51cbc9a56dcc SHA512 4e6490eda15928a48cbfff59bf73d21dea19d2e80dffce70f65a247b0a9393bea787c8378b06b7e7c807eeb9a296971efac9f3ec2d3ab6771c7a016e0e747113
DIST kanjidic2-2020-07-01.xml.gz 1483010 BLAKE2B 7adc1d09bcddccfa549de92ff996c4d1e4ee4283ad845b50f5a453dd7f4051249eeb8fb3bd574b8c95f92a93ce7197f40226fe9046f7ab871f43f086c753166f SHA512 078ea54da499967b03c6eee75d629c9aced8c48381e8b6d1adf2d6440c81a26da8bc532f8db8d388588a74cbdb851bcb92846d1532b882f5ab9d65d653deeb3e
+DIST kanjidic2-2020-10-01.xml.gz 1483702 BLAKE2B 0a1aa65084f5d6e35ac188c77c4264449ffa0c07e39fb464760049740e70187252e56212e1b95a5be930f326b42f2ef8689dcf7d53dfcbcd9ef250e0e05e26f2 SHA512 f47f0f9b401e2f30f9669bc61417424ed4f423a542115d56b3b176f4c8253a7025c02ba4e28d1180effa558f6cd6fca7f07fcd47c716839cd48ac7f2c8b6ac78
DIST kanjivg-20160426.xml.gz 3587660 BLAKE2B c85291f3671f0980186e8deb296cfa743322df438d6f09fd69a4f5a30c3db6f097d6ff0a817b88c5c9a2c8d4a40c90b31c0a54cb71d681849b557ee364707c48 SHA512 1d35a8cc5d4947f6bedfc71a2f08e2d1fda832d7a02588c00953e1746812b0e51d4d1c39dff49999b4f65ec850788359f6e0d1465f0e688b1bf753c4c67b3c54
DIST tagainijisho-1.2.0_pre20200118132551.tar.gz 3635265 BLAKE2B f8f831f698bf0ca56c57e8343adee92d3b42842c95fb971c9d8696eaf660ce458d8fd2108ab4568463bed6711c5295d27efc34f2fab512c3d0bc2a11a4f76c1b SHA512 14d6fc5ce891437159ca2b3db53c776420a6d4e305f6753c7ccf5ce773d43fa31f875ee9582c9db1fe05364b18772cec43dd046a6492b6eb45c12b62f7d60407
diff --git a/app-i18n/tagainijisho/tagainijisho-1.2.0_pre20200118132551_p20200401_p20200401.ebuild b/app-i18n/tagainijisho/tagainijisho-1.2.0_pre20200118132551_p20201001_p20201001.ebuild
similarity index 100%
rename from app-i18n/tagainijisho/tagainijisho-1.2.0_pre20200118132551_p20200401_p20200401.ebuild
rename to app-i18n/tagainijisho/tagainijisho-1.2.0_pre20200118132551_p20201001_p20201001.ebuild
diff --git a/app-i18n/tomoe/files/tomoe-glibc-2.32.patch b/app-i18n/tomoe/files/tomoe-glibc-2.32.patch
new file mode 100644
index 000000000000..5d296cdcdd39
--- /dev/null
+++ b/app-i18n/tomoe/files/tomoe-glibc-2.32.patch
@@ -0,0 +1,11 @@
+--- /lib/tomoe-xml-parser.c
++++ /lib/tomoe-xml-parser.c
+@@ -441,7 +441,7 @@
+ f = fopen (filename, "rb");
+ if (!f) {
+ g_warning ("failed to open dictionary file %s: %s", filename,
+- sys_errlist[errno]);
++ strerror(errno));
+ }
+ g_return_val_if_fail (f, FALSE);
+
diff --git a/app-i18n/tomoe/tomoe-0.6.0-r6.ebuild b/app-i18n/tomoe/tomoe-0.6.0-r6.ebuild
index 00b0c32111b1..ad6822db39c6 100644
--- a/app-i18n/tomoe/tomoe-0.6.0-r6.ebuild
+++ b/app-i18n/tomoe/tomoe-0.6.0-r6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 2006-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -39,6 +39,7 @@ DEPEND="${RDEPEND}
PATCHES=(
"${FILESDIR}"/${PN}-gentoo.patch
"${FILESDIR}"/${PN}-export-symbols.patch
+ "${FILESDIR}"/${PN}-glibc-2.32.patch
"${FILESDIR}"/${PN}-glib-2.32.patch
"${FILESDIR}"/${PN}-ruby19.patch
)
diff --git a/app-i18n/transifex-client/Manifest b/app-i18n/transifex-client/Manifest
index 7db2792949cc..0df52ab374fc 100644
--- a/app-i18n/transifex-client/Manifest
+++ b/app-i18n/transifex-client/Manifest
@@ -1 +1,2 @@
+DIST transifex-client-0.13.12.tar.gz 211369 BLAKE2B e536e2d1c33c9a64326cac9bab2a5d162fc554185127b2e8d3fc77e81cb4f19b8c2b66b5bd4502cf3129bbf1f0aa2c6649552392831b3d2b6ed322170de31952 SHA512 e4a5c78f3cdf589ad186a09b8ada09e06a725499234c03a037f8a8fb33447fb25edaf921a395ce8cb31c11c08a21dbb1b7b35cf54276995d255ddb2382e549c9
DIST transifex-client-0.13.9.tar.gz 197283 BLAKE2B 9fd6f63a54d09f190f7dd6701e4994e4fd67e23cf630dcb49641a3c7356e55f1146be7c2a590fb09a52cccfa99e709c48fffd7df416d1d4c10231c4f42919380 SHA512 3dc4a1e713a797ce1ea626c9e85dd353fec3034ba21ab04bc89e5b927e0298b4f6560a793eec50d1a99c7ab340462c33d18c1e159697c476001be868cb7f87fa
diff --git a/app-i18n/transifex-client/transifex-client-0.13.12.ebuild b/app-i18n/transifex-client/transifex-client-0.13.12.ebuild
new file mode 100644
index 000000000000..9a36eedf7f4e
--- /dev/null
+++ b/app-i18n/transifex-client/transifex-client-0.13.12.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="A command line interface for Transifex"
+HOMEPAGE="https://pypi.org/project/transifex-client/ https://www.transifex.net/"
+SRC_URI="mirror://pypi/t/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="test? ( dev-python/mock[${PYTHON_USEDEP}] )"
+RDEPEND="dev-python/GitPython[${PYTHON_USEDEP}]
+ =app-crypt/gnupg-2.2.20-r1
+ dev-python/requests[${PYTHON_USEDEP}]
+ )"
+BDEPEND="
+ test? (
+ >=app-crypt/gnupg-2.2.20-r1
+ >=dev-python/pytest-5[${PYTHON_USEDEP}]
+ dev-python/requests[${PYTHON_USEDEP}]
+ dev-python/responses[${PYTHON_USEDEP}]
+ )"
+
+distutils_enable_tests pytest
+
+python_install_all() {
+ distutils-r1_python_install_all
+
+ if use tools; then
+ exeinto /usr/share/gemato
+ doexe utils/*.{bash,py}
+ fi
+}
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 2c20e1b5cbb0..42ecacb02b96 100644
Binary files a/app-text/Manifest.gz and b/app-text/Manifest.gz differ
diff --git a/app-text/discount/discount-2.2.7.ebuild b/app-text/discount/discount-2.2.7.ebuild
index aeb8772ac125..d636db11738b 100644
--- a/app-text/discount/discount-2.2.7.ebuild
+++ b/app-text/discount/discount-2.2.7.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.pell.portland.or.us/~orc/Code/${PN}/${P}.tar.bz2"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~ia64 ppc ppc64 sparc ~x86"
IUSE="minimal test"
RESTRICT="!test? ( test )"
diff --git a/app-text/fbless/Manifest b/app-text/fbless/Manifest
deleted file mode 100644
index 766cc34198e4..000000000000
--- a/app-text/fbless/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST fbless-0.2.3.tar.gz 115622 BLAKE2B c9ab9f9a4b5d5c4e6d2ec82318865b30d61674882efbf23c241516a8019cd99b9cc4e28e13f39877b85e485beab322aaf14e831268784fb208ec5efed7b36d76 SHA512 b5188b0b4c0654915487a49930987c02a3e9bc3ba47a830f744362b464235a502fb28e20bb8c91cea15a5bdbeea54775697bf57ca581f5ebbadb84134dfdbafd
diff --git a/app-text/fbless/fbless-0.2.3.ebuild b/app-text/fbless/fbless-0.2.3.ebuild
deleted file mode 100644
index 9dcad0fd14eb..000000000000
--- a/app-text/fbless/fbless-0.2.3.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="ncurses,xml"
-inherit distutils-r1
-
-DESCRIPTION="Python-based console fb2 reader with less-like interface"
-HOMEPAGE="https://github.com/matimatik/fbless"
-SRC_URI="https://github.com/matimatik/fbless/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
diff --git a/app-text/fbless/metadata.xml b/app-text/fbless/metadata.xml
deleted file mode 100644
index d6c5780297ba..000000000000
--- a/app-text/fbless/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
- pinkbyte@gentoo.org
- Sergey Popov
-
-
- matimatik/fbless
-
-
diff --git a/app-text/ghostscript-gpl/Manifest b/app-text/ghostscript-gpl/Manifest
index 53a4276914f9..89d82f3d4896 100644
--- a/app-text/ghostscript-gpl/Manifest
+++ b/app-text/ghostscript-gpl/Manifest
@@ -2,5 +2,6 @@ DIST ghostscript-9.52.tar.xz 39711040 BLAKE2B 317042ae7e2bfdeded2ae9d9a1bd152142
DIST ghostscript-9.53.0.tar.xz 41358720 BLAKE2B 9a8b5872dc799f14759033685c37890f2da28450b1e115fcc63a2a920bb22bfc02db078d3f39dc62778da2a2518b82c2fc91f349486e83914c88c70d1e15d7e8 SHA512 fa594ef99e58257074b651e4d078bd1025f7bc2c435cd2a5454ba59c2a98cc82e93339ccd1eaa4fe624275165aacefeabc6f8336476027946f56aeb02e93da30
DIST ghostscript-9.53.1.tar.xz 41362600 BLAKE2B f4f3e9c067d120195cdcbd8ba3ecbb5618d668e0582408cc76b0e13627aca06c40064a7ae96d0ebe8c313ec282c4d3f5dddddabef3d0194ff9aaf98832b5a50c SHA512 5c78ed0a03983cbf9d55885c5ee8fbfc987db367b020ad0148b8861de42923e38c688447cfc6efcea5521121545ecfbea9690058fd3c4438629a43b5990800c5
DIST ghostscript-9.53.2.tar.xz 41362364 BLAKE2B 1ff4d00661d28f7f9a14064928182147fa0b20b41accb287b779a40651fbc45047eefc8522242b7dd909324b6e3ebc15f421b351c69fb248fef2095210c81461 SHA512 fe430e96b67a082b58942d66193a89b8af042574929e8299e1f8b1ef2a7f71565ba5a96b72d26db38f4a05e70119a019c5fe73b842d51afd357d642d39d95320
+DIST ghostscript-9.53.3.tar.xz 41368160 BLAKE2B 6b5840a420d7527c7155bfb707fe19b3412bdd3a6707f44d058c20f607e6695cfc878cf5df4c4528686c1c1f488b2dbdb81ef5fdf38b950eb15751d2ebafb0a9 SHA512 eb832c27eecd30f15e346408c592d7096fd23ef0a6fa59bd50ca327578915434530a4868e69249c2594def0910c527302e99d54f0877f726a8ca8bea6f0f17b7
DIST ghostscript-gpl-9.52-patchset-01.tar.xz 3292 BLAKE2B b6ac4f06c149301b07f57a5dd1f4507cc1e6d17ea60132b64177972ca58a29b2f6ff2f034b20b8ac083b60ea999f50ff75b74f86eec0cd73179741ed8a1486a8 SHA512 2498c5f396807a282727a7a9bd678e2008a1e4112722745aab48a12601661b08557c5d49f0a5ee67fb636f8c2b00c737640e894523b904ef3600f66d107999cb
DIST ghostscript-gpl-9.53-patchset-01.tar.xz 2340 BLAKE2B 55d82c88f1b57c084318839e1382ffa112461d074411b1f6586a5a9ace37772b144abdda9f742defd077ce937df590d63bd7a2306bad52438949d1036bb7900c SHA512 ab58485df9152bb32c6f0eb25bd45689089bd17ffb0323c54e1977c5f810ec5eb09f358637251c428591749bfb42c6f8489c74d4bd0a7ae5d696eb2346503c44
diff --git a/app-text/ghostscript-gpl/ghostscript-gpl-9.53.3.ebuild b/app-text/ghostscript-gpl/ghostscript-gpl-9.53.3.ebuild
new file mode 100644
index 000000000000..0d3acf4a9d16
--- /dev/null
+++ b/app-text/ghostscript-gpl/ghostscript-gpl-9.53.3.ebuild
@@ -0,0 +1,189 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic toolchain-funcs
+
+DESCRIPTION="Interpreter for the PostScript language and PDF"
+HOMEPAGE="https://ghostscript.com/"
+
+MY_PN=${PN/-gpl}
+MY_P="${MY_PN}-${PV/_}"
+PVM=$(ver_cut 1-2)
+PVM_S=$(ver_rs 1-2 "")
+
+MY_PATCHSET="ghostscript-gpl-9.53-patchset-01.tar.xz"
+
+SRC_URI="https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs${PVM_S}/${MY_P}.tar.xz"
+
+if [[ -n "${MY_PATCHSET}" ]] ; then
+ SRC_URI+=" https://dev.gentoo.org/~whissi/dist/ghostscript-gpl/${MY_PATCHSET}"
+fi
+
+LICENSE="AGPL-3 CPL-1.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="cups dbus gtk l10n_de static-libs unicode X"
+
+LANGS="ja ko zh-CN zh-TW"
+for X in ${LANGS} ; do
+ IUSE="${IUSE} l10n_${X}"
+done
+
+DEPEND="
+ app-text/libpaper
+ media-libs/fontconfig
+ >=media-libs/freetype-2.4.9:2=
+ >=media-libs/jbig2dec-0.19:=
+ >=media-libs/lcms-2.6:2
+ >=media-libs/libpng-1.6.2:0=
+ >=media-libs/openjpeg-2.1.0:2=
+ >=media-libs/tiff-4.0.1:0=
+ >=sys-libs/zlib-1.2.7
+ virtual/jpeg:0
+ cups? ( >=net-print/cups-1.3.8 )
+ dbus? ( sys-apps/dbus )
+ gtk? ( || ( x11-libs/gtk+:3 x11-libs/gtk+:2 ) )
+ unicode? ( net-dns/libidn:0= )
+ X? ( x11-libs/libXt x11-libs/libXext )
+"
+BDEPEND="virtual/pkgconfig"
+RDEPEND="${DEPEND}
+ app-text/poppler-data
+ >=media-fonts/urw-fonts-2.4.9
+ l10n_ja? ( media-fonts/kochi-substitute )
+ l10n_ko? ( media-fonts/baekmuk-fonts )
+ l10n_zh-CN? ( media-fonts/arphicfonts )
+ l10n_zh-TW? ( media-fonts/arphicfonts )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+ if [[ -n "${MY_PATCHSET}" ]] ; then
+ # apply various patches, many borrowed from Fedora
+ # https://src.fedoraproject.org/rpms/ghostscript
+ # and Debian
+ # https://salsa.debian.org/printing-team/ghostscript/tree/debian/master/debian/patches
+ eapply "${WORKDIR}/patches/"*.patch
+ fi
+
+ default
+
+ # remove internal copies of various libraries
+ rm -r cups/libs || die
+ rm -r freetype || die
+ rm -r jbig2dec || die
+ rm -r jpeg || die
+ rm -r lcms2mt || die
+ rm -r libpng || die
+ rm -r tiff || die
+ rm -r zlib || die
+ rm -r openjpeg || die
+ # remove internal CMaps (CMaps from poppler-data are used instead)
+ rm -r Resource/CMap || die
+
+ if ! use gtk ; then
+ sed -e "s:\$(GSSOX)::" \
+ -e "s:.*\$(GSSOX_XENAME)$::" \
+ -i base/unix-dll.mak || die "sed failed"
+ fi
+
+ # Force the include dirs to a neutral location.
+ sed -e "/^ZLIBDIR=/s:=.*:=${T}:" \
+ -i configure.ac || die
+ # Some files depend on zlib.h directly. Redirect them. #573248
+ # Also make sure to not define OPJ_STATIC to avoid linker errors due to
+ # hidden symbols (https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=203327#c1)
+ sed -e '/^zlib_h/s:=.*:=:' \
+ -e 's|-DOPJ_STATIC ||' \
+ -i base/lib.mak || die
+
+ # search path fix
+ # put LDFLAGS after BINDIR, bug #383447
+ sed -e "s:\$\(gsdatadir\)/lib:@datarootdir@/ghostscript/${PVM}/$(get_libdir):" \
+ -e "s:exdir=.*:exdir=@datarootdir@/doc/${PF}/examples:" \
+ -e "s:docdir=.*:docdir=@datarootdir@/doc/${PF}/html:" \
+ -e "s:GS_DOCDIR=.*:GS_DOCDIR=@datarootdir@/doc/${PF}/html:" \
+ -e 's:-L$(BINDIR):& $(LDFLAGS):g' \
+ -i Makefile.in base/*.mak || die "sed failed"
+
+ # remove incorrect symlink, bug 590384
+ rm ijs/ltmain.sh || die
+ eautoreconf
+
+ cd ijs || die
+ eautoreconf
+}
+
+src_configure() {
+ local FONTPATH
+ for path in \
+ "${EPREFIX}"/usr/share/fonts/urw-fonts \
+ "${EPREFIX}"/usr/share/fonts/Type1 \
+ "${EPREFIX}"/usr/share/fonts \
+ "${EPREFIX}"/usr/share/poppler/cMap/Adobe-CNS1 \
+ "${EPREFIX}"/usr/share/poppler/cMap/Adobe-GB1 \
+ "${EPREFIX}"/usr/share/poppler/cMap/Adobe-Japan1 \
+ "${EPREFIX}"/usr/share/poppler/cMap/Adobe-Japan2 \
+ "${EPREFIX}"/usr/share/poppler/cMap/Adobe-Korea1
+ do
+ FONTPATH="$FONTPATH${FONTPATH:+:}${EPREFIX}$path"
+ done
+
+ PKGCONFIG=$(type -P $(tc-getPKG_CONFIG)) \
+ econf \
+ --enable-dynamic \
+ --enable-freetype \
+ --enable-fontconfig \
+ --enable-openjpeg \
+ --disable-compile-inits \
+ --with-drivers=ALL \
+ --with-fontpath="$FONTPATH" \
+ --with-ijs \
+ --with-jbig2dec \
+ --with-libpaper \
+ --with-system-libtiff \
+ --without-luratech \
+ $(use_enable cups) \
+ $(use_enable dbus) \
+ $(use_enable gtk) \
+ $(use_with cups pdftoraster) \
+ $(use_with unicode libidn) \
+ $(use_with X x)
+
+ cd "${S}/ijs" || die
+ econf \
+ --enable-shared \
+ $(use_enable static-libs static)
+}
+
+src_compile() {
+ emake so all
+
+ cd ijs || die
+ emake
+}
+
+src_install() {
+ emake DESTDIR="${D}" install-so install
+
+ # move gsc to gs, bug #343447
+ # gsc collides with gambit, bug #253064
+ mv -f "${ED}"/usr/bin/{gsc,gs} || die
+
+ cd "${S}/ijs" || die
+ emake DESTDIR="${D}" install
+
+ # install the CMaps from poppler-data properly, bug #409361
+ dosym ../../../poppler/cMaps "/usr/share/ghostscript/${PVM}/Resource/CMap"
+
+ if ! use static-libs; then
+ find "${ED}" -name '*.la' -delete || die
+ fi
+
+ if ! use l10n_de; then
+ rm -r "${ED}"/usr/share/man/de || die
+ fi
+}
diff --git a/app-text/master-pdf-editor/Manifest b/app-text/master-pdf-editor/Manifest
index 0e5e99aed5c2..c5a1fc148d82 100644
--- a/app-text/master-pdf-editor/Manifest
+++ b/app-text/master-pdf-editor/Manifest
@@ -1,3 +1,4 @@
DIST master-pdf-editor-5.2.20_qt5.amd64.tar.gz 16261577 BLAKE2B 112c8d308875d36e3a71d28ae407eb78a0f714383fc005dc020cdb911a5596548274a55466133d8e03cbf47df29c062973f243f88ad0b1e9caa8410fbdfe2b8d SHA512 85b095603da1114cd4749ddbcf7bdd513c868ee17434df47037f7e0b914546fd13a6911949579ee981b5c33dcb13eb0ffa9585d4cbedd9bff4dc56e32bdcf4cb
DIST master-pdf-editor-5.3.22_qt5.amd64.tar.gz 16410658 BLAKE2B fc9cb09e58625534d12b8fe4ff657917f76a14578341c678d6be909a5f2e7a75b4587c2f1abfac66741c088b43943a30874f6ae1414ae735ee01254f019c02b3 SHA512 033914e94c9ae4114243e79be445f523a6bbc6c39527db786613ef7220bedb2412ea75c83210ed8b6096d045afce73bc8f6141b55995f2f9c464ef4a7fd69d16
DIST master-pdf-editor-5.4.38-qt5-all.amd64.tar.gz 38044035 BLAKE2B 60fbbaaaea47a1a572ea39a0c15e0d5a9b8a2f6d9fa68c06eea6279e5728cc84016514db5e91fc2a2a0b35a462325fc8cd66b1f9eb5bff5b4815c926587eeec5 SHA512 1f94bdd6a70d352c246081a40cd81801cf9b658ff1121572a91ee5bb3589e36d6db3c5db7ad54692334e04487c29ce6ef0b9381a6895467f1bb6ef0d9e00e00e
+DIST master-pdf-editor-5.6.42-qt5.x86_64.tar.gz 15961232 BLAKE2B b4d4fc35e55753fc6c86305a037817c0a62e7753cb171b4098b651316ad5e120d9de5b02350899c89a798b407a79e24e6b0c733255d2c5f9757258c29e43b22b SHA512 600796efc92be65fa82346cf02836e43aa467188c82a0f6a59ed7dc7d0e44f9ad6f004e099f7afdd5d37fb5c9b585dc812d68bba808603b42c0da3ef12c98aa9
diff --git a/app-text/master-pdf-editor/master-pdf-editor-5.6.42.ebuild b/app-text/master-pdf-editor/master-pdf-editor-5.6.42.ebuild
new file mode 100644
index 000000000000..6c0124f20cc4
--- /dev/null
+++ b/app-text/master-pdf-editor/master-pdf-editor-5.6.42.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop xdg-utils
+
+DESCRIPTION="A complete solution for viewing and editing PDF files"
+HOMEPAGE="https://code-industry.net/free-pdf-editor/"
+SRC_URI="https://code-industry.net/public/${P}-qt5.x86_64.tar.gz"
+
+LICENSE="master-pdf-editor"
+SLOT="0"
+KEYWORDS="~amd64"
+RESTRICT="mirror"
+
+RDEPEND="
+ >=dev-qt/qtcore-5.9.8:5
+ >=dev-qt/qtgui-5.9.8:5
+ >=dev-qt/qtnetwork-5.9.8:5
+ >=dev-qt/qtprintsupport-5.9.8:5
+ >=dev-qt/qtsvg-5.9.8:5
+ >=media-gfx/sane-backends-1.0
+"
+
+QA_PREBUILT="/opt/${PN}/masterpdfeditor5"
+
+S="${WORKDIR}/${PN}-${PV%%.*}"
+
+src_install() {
+ insinto /opt/${PN}
+ doins -r fonts lang stamps templates masterpdfeditor5.png
+
+ exeinto /opt/${PN}
+ doexe masterpdfeditor5
+ dosym ../${PN}/masterpdfeditor5 /opt/bin/masterpdfeditor5
+
+ make_desktop_entry "masterpdfeditor5 %f" \
+ "Master PDF Editor ${PV}" /opt/${PN}/masterpdfeditor5.png \
+ "Office;Graphics;Viewer" \
+ "MimeType=application/pdf;application/x-bzpdf;application/x-gzpdf;\nTerminal=false"
+}
+
+pkg_postinst() {
+ xdg_desktop_database_update
+}
+
+pkg_postrm() {
+ xdg_desktop_database_update
+}
diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
index c043ab287ab5..d0cb619887c2 100644
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -1,2 +1,3 @@
DIST poppler-0.90.1.tar.xz 1633804 BLAKE2B 5c7256bca74af6cc2732fb6c413bec10ea579f28fe623ccb5d4863c62d39329a4264c240ee0e395a78de577a960a5156ba20f957990c0cde91efcee72dbc2fef SHA512 c0a38c3c40196f8b847f0737152d0cbb40656870a8ceb766134ee22ec7c21bc979a13f56b7596a13ae2f08f1a9a2c396ba7f5ff176d02c262af7e863c2afde34
DIST poppler-20.09.0.tar.xz 1642932 BLAKE2B be61275560bf57c639f185b5ebbd8b37b99fd008412f49890ed644e95f4d8f2c4ca865b081eea99f2604d44fa1c0c31bd551339340f03cb43ab7f5a03992f760 SHA512 fbd57dd0754279d4b0a20ccbdbfb06abc5a5d84e63915676353fd42d5b80318904cf7e6ae462db445ed6c6e011fc24675dccbb8bd3597fc6532657a4ea23406a
+DIST poppler-20.10.0.tar.xz 1644528 BLAKE2B ce38491805ff8ecb45eea45c44c93ec85404cb310ed6da49d7ce752a4e572abfbd7f5740448d6fb0c0958aa5661ebf87a3a2988bf51b0d0f0b1ea102110952b9 SHA512 edbcd53a06df9a5911a58fd05066e44dc8ab9a1dbc6da852b40bbc5627b9c0fcb35d97f46e3fcd78f7d08f86cba37e2ab3ff81b9a18fad300571df2bf1ef91a9
diff --git a/app-text/poppler/poppler-20.10.0.ebuild b/app-text/poppler/poppler-20.10.0.ebuild
new file mode 100644
index 000000000000..6d79d6797ded
--- /dev/null
+++ b/app-text/poppler/poppler-20.10.0.ebuild
@@ -0,0 +1,124 @@
+# Copyright 2005-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake toolchain-funcs xdg-utils
+
+if [[ ${PV} == *9999* ]] ; then
+ inherit git-r3
+ EGIT_REPO_URI="https://anongit.freedesktop.org/git/poppler/poppler.git"
+ SLOT="0/9999"
+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/103" # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
+fi
+
+DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
+HOMEPAGE="https://poppler.freedesktop.org/"
+
+LICENSE="GPL-2"
+IUSE="cairo cjk curl +cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt5 tiff +utils"
+
+# No test data provided
+RESTRICT="test"
+
+BDEPEND="
+ dev-util/glib-utils
+ virtual/pkgconfig
+"
+DEPEND="
+ media-libs/fontconfig
+ media-libs/freetype
+ sys-libs/zlib
+ cairo? (
+ dev-libs/glib:2
+ x11-libs/cairo
+ introspection? ( dev-libs/gobject-introspection:= )
+ )
+ curl? ( net-misc/curl )
+ jpeg? ( virtual/jpeg:0 )
+ jpeg2k? ( >=media-libs/openjpeg-2.3.0-r1:2= )
+ lcms? ( media-libs/lcms:2 )
+ nss? ( >=dev-libs/nss-3.19:0 )
+ png? ( media-libs/libpng:0= )
+ qt5? (
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtxml:5
+ )
+ tiff? ( media-libs/tiff:0 )
+"
+RDEPEND="${DEPEND}
+ cjk? ( app-text/poppler-data )
+"
+
+DOCS=( AUTHORS NEWS README.md README-XPDF )
+
+PATCHES=(
+ "${FILESDIR}/${PN}-0.60.1-qt5-dependencies.patch"
+ "${FILESDIR}/${PN}-0.28.1-fix-multilib-configuration.patch"
+ "${FILESDIR}/${PN}-0.82.0-respect-cflags.patch"
+ "${FILESDIR}/${PN}-0.61.0-respect-cflags.patch"
+ "${FILESDIR}/${PN}-0.57.0-disable-internal-jpx.patch"
+)
+
+src_prepare() {
+ cmake_src_prepare
+
+ # Clang doesn't grok this flag, the configure nicely tests that, but
+ # cmake just uses it, so remove it if we use clang
+ if [[ ${CC} == clang ]] ; then
+ sed -e 's/-fno-check-new//' -i cmake/modules/PopplerMacros.cmake || die
+ fi
+
+ if ! grep -Fq 'cmake_policy(SET CMP0002 OLD)' CMakeLists.txt ; then
+ sed -e '/^cmake_minimum_required/acmake_policy(SET CMP0002 OLD)' \
+ -i CMakeLists.txt || die
+ else
+ einfo "policy(SET CMP0002 OLD) - workaround can be removed"
+ fi
+}
+
+src_configure() {
+ xdg_environment_reset
+ local mycmakeargs=(
+ -DBUILD_GTK_TESTS=OFF
+ -DBUILD_QT5_TESTS=OFF
+ -DBUILD_CPP_TESTS=OFF
+ -DRUN_GPERF_IF_PRESENT=OFF
+ -DENABLE_SPLASH=ON
+ -DENABLE_ZLIB=ON
+ -DENABLE_ZLIB_UNCOMPRESS=OFF
+ -DENABLE_UNSTABLE_API_ABI_HEADERS=ON
+ -DUSE_FLOAT=OFF
+ -DWITH_Cairo=$(usex cairo)
+ -DENABLE_LIBCURL=$(usex curl)
+ -DENABLE_CPP=$(usex cxx)
+ -DWITH_JPEG=$(usex jpeg)
+ -DENABLE_DCTDECODER=$(usex jpeg libjpeg none)
+ -DENABLE_LIBOPENJPEG=$(usex jpeg2k openjpeg2 none)
+ -DENABLE_CMS=$(usex lcms lcms2 none)
+ -DWITH_NSS3=$(usex nss)
+ -DWITH_PNG=$(usex png)
+ $(cmake_use_find_package qt5 Qt5Core)
+ -DWITH_TIFF=$(usex tiff)
+ -DENABLE_UTILS=$(usex utils)
+ -DENABLE_QT6=OFF
+ )
+ use cairo && mycmakeargs+=( -DWITH_GObjectIntrospection=$(usex introspection) )
+
+ cmake_src_configure
+}
+
+src_install() {
+ cmake_src_install
+
+ # live version doesn't provide html documentation
+ if use cairo && use doc && [[ ${PV} != *9999* ]]; then
+ # For now install gtk-doc there
+ insinto /usr/share/gtk-doc/html/poppler
+ doins -r "${S}"/glib/reference/html/*
+ fi
+}
diff --git a/app-text/poppler/poppler-9999.ebuild b/app-text/poppler/poppler-9999.ebuild
index 39d7375ed1b8..6d79d6797ded 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/102" # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
+ SLOT="0/103" # 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/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index c84be58a83a9..28feb9dd9a23 100644
Binary files a/dev-cpp/Manifest.gz and b/dev-cpp/Manifest.gz differ
diff --git a/dev-cpp/icnc/Manifest b/dev-cpp/icnc/Manifest
deleted file mode 100644
index 7edb8f85b34b..000000000000
--- a/dev-cpp/icnc/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST icnc-1.0.100.tar.gz 27164070 BLAKE2B 74c9e79b3d8fa0f75ee924910bde79bf0ac1535ce0e7e5e74dcac33a8219f574aadf7382a8d73ae281858ee3ae8f186ca55d33c22dfce223d1bb84c28ca42ddf SHA512 b6c231504ed36676d5c4a9c651c7ce6bee078a415c8d365dbe66208a5226a71c62924ee7bc0b36f8c35bff20ed5f0baf2710f581595d08fe10a1d799b3982a8b
diff --git a/dev-cpp/icnc/icnc-1.0.100.ebuild b/dev-cpp/icnc/icnc-1.0.100.ebuild
deleted file mode 100644
index 85a28e528c1d..000000000000
--- a/dev-cpp/icnc/icnc-1.0.100.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit cmake-utils multilib python-any-r1
-
-DESCRIPTION="Intel Concurrent Collections for C++ - Parallelism without the Pain"
-HOMEPAGE="https://software.intel.com/en-us/articles/intel-concurrent-collections-for-cc"
-
-if [[ $PV = 9999 ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/icnc/icnc.git"
- KEYWORDS=
-else
- SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="doc examples mpi test"
-RESTRICT="test" #currently tests only work if icnc is already installed
-
-RDEPEND="
- >=dev-cpp/tbb-4.2
- sys-libs/glibc
- mpi? ( virtual/mpi )
- "
-DEPEND="
- ${RDEPEND}
- doc? ( app-doc/doxygen )
- test? ( ${PYTHON_DEPS} )
- "
-
-src_configure() {
- local mycmakeargs=(
- $(cmake-utils_use mpi BUILD_LIBS_FOR_MPI)
- -DLIB=$(get_libdir)
- $(cmake-utils_use_find_package doc Doxygen)
- )
- cmake-utils_src_configure
- if use test ; then
- mycmakeargs=( -DRUN_DIST=OFF )
- CMAKE_USE_DIR="${S}/tests" \
- BUILD_DIR="${WORKDIR}/${P}_tests_build" \
- cmake-utils_src_configure
- fi
-}
-
-src_compile() {
- cmake-utils_src_compile
- use test && BUILD_DIR="${WORKDIR}/${P}_tests_build" cmake-utils_src_compile
-}
-
-src_test() {
- BUILD_DIR="${WORKDIR}/${P}_tests_build" cmake-utils_src_test
-}
-
-src_install() {
- cmake-utils_src_install
- if use doc ; then
- insinto /usr/share/doc/${P}/html
- doins -r "${ED}"/usr/doc/api/*
- fi
- rm -fr "${ED}"/usr/doc
- if use examples ; then
- insinto /usr/share/${PN}/examples
- doins -r "${ED}"/usr/samples/*
- fi
- rm -r "${ED}"/usr/samples || die
- insinto /usr/share/${PN}/
- doins -r "${ED}"/usr/misc/*
- rm -r "${ED}"/usr/misc/ || die
-}
diff --git a/dev-cpp/icnc/metadata.xml b/dev-cpp/icnc/metadata.xml
deleted file mode 100644
index fa8784ee0534..000000000000
--- a/dev-cpp/icnc/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
- junghans@gentoo.org
- Christoph Junghans
-
-
- icnc/icnc
-
-
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index f6d89652421c..e983609e9eef 100644
Binary files a/dev-db/Manifest.gz and b/dev-db/Manifest.gz differ
diff --git a/dev-db/opendbx/opendbx-1.4.6-r3.ebuild b/dev-db/opendbx/opendbx-1.4.6-r3.ebuild
index 425a43a399a9..daae3dd90bd8 100644
--- a/dev-db/opendbx/opendbx-1.4.6-r3.ebuild
+++ b/dev-db/opendbx/opendbx-1.4.6-r3.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 @@ SRC_URI="https://www.linuxnetworks.de/opendbx/download/${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
IUSE="firebird +man +mysql oracle postgres sqlite"
RESTRICT="firebird? ( bindist )"
diff --git a/dev-db/oracle-instantclient-basic/Manifest b/dev-db/oracle-instantclient-basic/Manifest
index 761a199639fe..e69de29bb2d1 100644
--- a/dev-db/oracle-instantclient-basic/Manifest
+++ b/dev-db/oracle-instantclient-basic/Manifest
@@ -1,4 +0,0 @@
-DIST instantclient-basic-linux-11.2.0.4.0.zip 58793148 BLAKE2B e0f92f119a5e8890a4507160179cd49af15ed14bd7c48480d3f685a3e4918a96e6444e75c6ea11d34681a6c66ff0e8011f44840de5f080e2dc3c03079361e4a1 SHA512 b333c9334e960617ac7cc68ad1c7b45f990d5c24c7a5bc8e51b3bc8ff6476acfb6a032521f75ba39327c71ee9676d1163b252066d52e97c1dfe9c092a92a62a0
-DIST instantclient-basic-linux.x64-11.2.0.4.0.zip 60704657 BLAKE2B 77735e81a0acf88221fefff38447536a81a32a6f5cb09dcd4526d43315be1fabb6882bb9e7a5703a4188ac9e112fba611f3e2c064a128eb66512935a1af62b33 SHA512 01ed32f1771bfa2f8ef1b81314843fb2b7b81582f33c07d86670c959bbb08355dc7cc8da586852bb353a3a914658d1e7828d6b5df884215de8d76881c956a989
-DIST instantclient-sdk-linux-11.2.0.4.0.zip 643080 BLAKE2B 9ea15b227d260f7e24b572be1238074dc3a3033a2ab6313d95b750ae48468bda018c52ac604664caa128396024c0ff4bcbc0d401b7900ae27f5f3877a4b44123 SHA512 09e14a0ed88182b685a00b6370da4379710c4179fcf2d5ebdb43684b7099484122f7f5181a80352464f03ae9d0150f5c2ee5f20ede98faa9073294324b9faec8
-DIST instantclient-sdk-linux.x64-11.2.0.4.0.zip 643089 BLAKE2B 710f0a2a81dde6cabdfb2e1472f40cb715d1e060377bec1d05d8b1c794ec05b023f4feca30603202487b52527723ed9d60f73371443ce76ad2781da9c1ed5412 SHA512 7198ddc7d8804353900e45b36de79659d75dee0197c4dd58bd4d69408e7131c95025223bbd1f39ef208269bff379daa6e05f4371af83a82b83997cafadc1d642
diff --git a/dev-db/oracle-instantclient-basic/files/11.2.0.3-makefile.patch b/dev-db/oracle-instantclient-basic/files/11.2.0.3-makefile.patch
deleted file mode 100644
index efcc2c6fac7c..000000000000
--- a/dev-db/oracle-instantclient-basic/files/11.2.0.3-makefile.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-Fake demo_xe.mk found in Oracle eXpress Edition,
-known by CPAN DBD::Oracle (bug#165834).
-This provides absolute paths for headers and libraries.
-
-Paranoia drops those REMOVE lines.
---- sdk/demo/demo.mk.orig 2012-03-06 17:11:57.636990449 +0100
-+++ sdk/demo/demo.mk 2012-03-06 17:19:37.985324293 +0100
-@@ -28,8 +28,9 @@
- CC=/opt/SunProd/SUNWspro6.1/bin/CC
- cc=/opt/SunProd/SUNWspro6.1/bin/cc
-
--ICINCHOME=../
--ICLIBHOME=../../
-+LIBDIR=lib
-+ICINCHOME=$(ORACLE_HOME)/
-+ICLIBHOME=$(ORACLE_HOME)/$(LIBDIR)
- ICLIBPATH=-L$(ICLIBHOME)
- THREADLIBS=-lthread
- CCLIB=$(ICLIBPATH) -locci -lclntsh $(THREADLIBS)
-@@ -64,18 +64,18 @@
- all: clean buildoci $(OCCIDEMO) $(OCCIOBJDEMO)
-
- buildoci: $(CLNCACHE) $(LIBCLNT) $(CDEMOOBJS)
-- $(MKLINK) $(ICLIBHOME)libclntsh$(SO_EXT).11.1 $(ICLIBHOME)libclntsh$(SO_EXT)
-- $(MKLINK) $(ICLIBHOME)libocci$(SO_EXT).11.1 $(ICLIBHOME)libocci$(SO_EXT)
-+# $(MKLINK) $(ICLIBHOME)libclntsh$(SO_EXT).11.1 $(ICLIBHOME)libclntsh$(SO_EXT)
-+# $(MKLINK) $(ICLIBHOME)libocci$(SO_EXT).11.1 $(ICLIBHOME)libocci$(SO_EXT)
- $(CC) -o $(CDEMOEXE) $(LDFLAGS) $(CDEMOOBJS) $(CCLIB)
-- $(REMOVE) $(ICLIBHOME)libclntsh$(SO_EXT)
-- $(REMOVE) $(ICLIBHOME)libocci$(SO_EXT)
-+# $(REMOVE) $(ICLIBHOME)libclntsh$(SO_EXT)
-+# $(REMOVE) $(ICLIBHOME)libocci$(SO_EXT)
-
- buildocci: $(CLNCACHE) $(LIBCLNT) $(OBJS)
-- $(MKLINK) $(ICLIBHOME)libclntsh$(SO_EXT).11.1 $(ICLIBHOME)libclntsh$(SO_EXT)
-- $(MKLINK) $(ICLIBHOME)libocci$(SO_EXT).11.1 $(ICLIBHOME)libocci$(SO_EXT)
-+# $(MKLINK) $(ICLIBHOME)libclntsh$(SO_EXT).11.1 $(ICLIBHOME)libclntsh$(SO_EXT)
-+# $(MKLINK) $(ICLIBHOME)libocci$(SO_EXT).11.1 $(ICLIBHOME)libocci$(SO_EXT)
- $(CC) -o $(EXE) $(LDFLAGS) $(OBJS) $(CCLIB)
-- $(REMOVE) $(ICLIBHOME)libclntsh$(SO_EXT)
-- $(REMOVE) $(ICLIBHOME)libocci$(SO_EXT)
-+# $(REMOVE) $(ICLIBHOME)libclntsh$(SO_EXT)
-+# $(REMOVE) $(ICLIBHOME)libocci$(SO_EXT)
-
- $(OCCIDEMO):
- $(MAKE) -f $(MAKEFILE) buildocci OBJS=$@.o EXE=$@
-@@ -93,8 +93,8 @@
-
- cleancache:
- $(REMOVE) $(CACHEDIR)
-- $(REMOVE) $(ICLIBHOME)libclntsh$(SO_EXT)
-- $(REMOVE) $(ICLIBHOME)libocci$(SO_EXT)
-+# $(REMOVE) $(ICLIBHOME)libclntsh$(SO_EXT)
-+# $(REMOVE) $(ICLIBHOME)libocci$(SO_EXT)
-
- clean: $(CLNCACHE)
- $(REMOVE) cdemo81 cdemo81.o occidml occidml.o occiobj occiobj.o occiobjo* occiobjm* occiobj.h occiobjout.type
diff --git a/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-11.2.0.4.ebuild b/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-11.2.0.4.ebuild
deleted file mode 100644
index 0dfbc6395439..000000000000
--- a/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-11.2.0.4.ebuild
+++ /dev/null
@@ -1,199 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit eutils multilib-minimal
-
-MY_PLAT_x86="Linux x86"
-MY_BITS_x86=32
-MY_A_x86="${PN/oracle-/}-linux-${PV}.0.zip"
-MY_ASDK_x86="${MY_A_x86/basic/sdk}"
-
-MY_PLAT_amd64="Linux x86-64"
-MY_BITS_amd64=64
-MY_A_amd64="${PN/oracle-}-linux.x64-${PV}.0.zip"
-MY_ASDK_amd64="${MY_A_amd64/basic/sdk}"
-
-DESCRIPTION="Oracle 11g Instant Client with SDK"
-HOMEPAGE="http://www.oracle.com/technetwork/database/features/instant-client/index.html"
-SRC_URI="
- abi_x86_32? ( ${MY_A_x86} !abi_x86_64? ( ${MY_ASDK_x86} ) )
- abi_x86_64? ( ${MY_A_amd64} ${MY_ASDK_amd64} )
-"
-
-LICENSE="OTN"
-SLOT="0"
-KEYWORDS="amd64 x86"
-RESTRICT="fetch splitdebug"
-IUSE=""
-
-DEPEND="app-arch/unzip"
-RDEPEND=">=dev-libs/libaio-0.3.109-r5[${MULTILIB_USEDEP}]"
-
-S="${WORKDIR}"
-
-QA_PREBUILT="usr/lib*/oracle/${PV}/client/lib*/lib*"
-
-set_my_abivars() {
- S="${WORKDIR}/${ABI}/instantclient_11_2"
-
- local abi=${ABI}
- [[ ${abi} == 'default' ]] && abi=${ARCH}
- MY_PLAT=MY_PLAT_${abi}; MY_PLAT=${!MY_PLAT} # platform name
- MY_BITS=MY_BITS_${abi}; MY_BITS=${!MY_BITS} # platform bitwidth
- MY_A=MY_A_${abi} ; MY_A=${!MY_A} # runtime distfile
- MY_ASDK=MY_ASDK_${abi}; MY_ASDK=${!MY_ASDK} # sdk distfile
-
- [[ -n ${MY_PLAT} ]]
-}
-
-oic_distfile_status() {
- if [[ -r ${DISTDIR}/${1} ]]; then
- echo "already here"
- else
- echo "still absent"
- fi
-}
-
-pkg_nofetch() {
- eerror "Please go to"
- eerror " ${HOMEPAGE%/*}/index-097480.html"
- eerror " and download"
- local ABI
- for ABI in $(multilib_get_enabled_abis)
- do
- set_my_abivars || continue
- eerror "Instant Client for ${MY_PLAT}"
- eerror " Basic: ($(oic_distfile_status ${MY_A})) ${MY_A}"
- multilib_is_native_abi &&
- eerror " SDK: ($(oic_distfile_status ${MY_ASDK})) ${MY_ASDK}"
- done
- eerror "After downloading these files (for *all* shown architectures), put them in:"
- eerror " ${DISTDIR}/"
-}
-
-src_unpack() {
- local ABI
- for ABI in $(multilib_get_enabled_abis)
- do
- set_my_abivars || continue
- mkdir "${WORKDIR}"/${ABI} || die
- cd "${WORKDIR}"/${ABI} || die
- unpack ${MY_A}
- multilib_is_native_abi &&
- unpack ${MY_ASDK}
- done
-}
-
-src_prepare() {
- local ABI
- for ABI in $(multilib_get_enabled_abis)
- do : # need to patch for the final ABI only
- done
- set_my_abivars || die "${ABI} ABI not supported!"
- cd "${S}" || die
- epatch "${FILESDIR}"/11.2.0.3-makefile.patch
-}
-
-# suppress configure&compile messages from multilib-minimal
-src_configure() { :; }
-src_compile() { :; }
-
-src_install() {
- # all binaries go here
- local oracle_home=/usr/$(get_libdir)/oracle/${PV}/client
- into "${oracle_home}"
-
- local ldpath= ABI
- for ABI in $(multilib_get_enabled_abis) # last iteration is final ABI
- do
- if ! set_my_abivars; then
- elog "Skipping unsupported ABI ${ABI}."
- continue
- fi
- einfo "Installing runtime for ${MY_PLAT} ..."
-
- cd "${S}" || die
-
- # shared libraries
- dolib.so lib*$(get_libname)*
-
- # ensure to be linkable
- [[ -e libocci$(get_libname) ]] ||
- dosym libocci$(get_libname 11.1) \
- "${oracle_home}"/$(get_libdir)/libocci$(get_libname)
- [[ -e libclntsh$(get_libname) ]] ||
- dosym libclntsh$(get_libname 11.1) \
- "${oracle_home}"/$(get_libdir)/libclntsh$(get_libname)
-
- # java archives
- insinto "${oracle_home}"/$(get_libdir)
- doins *.jar
-
- # runtime library path
- ldpath+=${ldpath:+:}${oracle_home}/$(get_libdir)
-
- eend $?
- done
-
- # ensure ORACLE_HOME/lib exists
- [[ -e ${ED}${oracle_home}/lib ]] ||
- dosym $(get_libdir) "${oracle_home}"/lib
-
- einfo "Installing SDK ..."
- cd "${S}"/sdk || die
-
- # SDK makefile, for #165834
- # As we change the relative filesystem layout compared
- # to vanilla instantclient.zip content, it feels easier
- # to fake the layout found in Oracle eXpress Edition.
- # Both layouts are known to DBD::Oracle (cpan).
- insinto "${oracle_home}"/rdbms/demo
- newins demo/demo.mk demo_xe.mk
-
- # Remove ldap.h, #299562
- rm include/ldap.h || die
- # DBD::Oracle needs rdbms/public as real directory
- insinto "${oracle_home}"/rdbms/public
- doins include/*.h
- dosym rdbms/public "${oracle_home}"/include
- # ruby-oci8 expects the headers here
- dosym "${oracle_home}"/rdbms/public /usr/include/oracle/${PV}/client
-
- dodoc demo/*
-
- eend $?
-
- # create path for tnsnames.ora
- insinto /etc/oracle
- doins "${FILESDIR}"/tnsnames.ora.sample
-
- # Add OCI libs to library path
- {
- echo "ORACLE_HOME=${EPREFIX}${oracle_home}"
- echo "LDPATH=${ldpath}"
-# who does need this?
-# echo "C_INCLUDE_PATH=${oracle_home}/include"
- echo "TNS_ADMIN=/etc/oracle/"
- } > "${T}"/50oracle-instantclient-basic
- doenvd "${T}"/50oracle-instantclient-basic
-}
-
-pkg_postinst() {
- elog "${P} does not provide an sqlnet.ora"
- elog "configuration file, redirecting oracle diagnostics for database-"
- elog "and network-issues into ~USER/oradiag_USER/ instead."
- elog "It should be safe to ignore this message in sqlnet.log there:"
- elog " Directory does not exist for read/write [ORACLE_HOME/client/log] []"
- elog "See https://bugs.gentoo.org/show_bug.cgi?id=465252 for reference."
- elog "If you want to directly analyse low-level debug info or don't want"
- elog "to see it at all, so you really need an sqlnet.ora file, please"
- elog "consult http://search.oracle.com/search/search?q=sqlnet.ora"
- elog ""
- elog "TNS_ADMIN has been set to ${EROOT}etc/oracle by default,"
- elog "put your tnsnames.ora there or configure TNS_ADMIN"
- elog "to point to your user specific configuration."
- ewarn "Please re-source your shell settings for ORACLE_HOME"
- ewarn " changes, such as: source /etc/profile"
-}
diff --git a/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-12.ebuild b/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-12.ebuild
index cc98d68c83ab..e377ea56810f 100644
--- a/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-12.ebuild
+++ b/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-12.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=""
LICENSE="metapackage"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
DEPEND=""
diff --git a/dev-db/oracle-instantclient-jdbc/Manifest b/dev-db/oracle-instantclient-jdbc/Manifest
index 90e44a21c8a8..e69de29bb2d1 100644
--- a/dev-db/oracle-instantclient-jdbc/Manifest
+++ b/dev-db/oracle-instantclient-jdbc/Manifest
@@ -1,2 +0,0 @@
-DIST instantclient-jdbc-linux-11.2.0.4.0.zip 1562440 BLAKE2B e3f377802958b22aede4d91c9bc16a85f5c0ff2cec3066a4a49f5c71ab90c17f9b7c6f29da146304327569cb3d5d533a3807941e4061254e0cf57a8387a55b04 SHA512 0a92a6529642203d48846d3f22f3756ada22942ea5e7c36d779d220dc7195301d4016edd8ee5124f9e51429bb77d9890602c1a18884eec58ff40c2aed24e55f9
-DIST instantclient-jdbc-linux.x64-11.2.0.4.0.zip 1562474 BLAKE2B f93a05ad324bb364ddab83b0bc75f6c0bc8d7224f53cf337c9887f99e07c98a8752e7d4581b19ca38c70bbe3fcf1b492d753f715bed7ba8144f37c03cc9524c0 SHA512 289a08bddc81687b73a42fb35ae6ea294dd8f536ae9d3e95142ab78ad72eeebf66947fa6f5585e48e35b7f92e65fe6a295fb564b8353d389e76bfecf35c48c18
diff --git a/dev-db/oracle-instantclient-jdbc/oracle-instantclient-jdbc-11.2.0.4.ebuild b/dev-db/oracle-instantclient-jdbc/oracle-instantclient-jdbc-11.2.0.4.ebuild
deleted file mode 100644
index 75696a7a33b6..000000000000
--- a/dev-db/oracle-instantclient-jdbc/oracle-instantclient-jdbc-11.2.0.4.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit eutils multilib-minimal
-
-MY_PLAT_x86="Linux x86"
-MY_A_x86="${PN/oracle-/}-linux-${PV}.0.zip"
-
-MY_PLAT_amd64="Linux x86-64"
-MY_A_amd64="${PN/oracle-/}-linux.x64-${PV}.0.zip"
-
-DESCRIPTION="Oracle 11g Instant Client: JDBC supplement"
-HOMEPAGE="http://www.oracle.com/technetwork/database/features/instant-client/index.html"
-SRC_URI="
- abi_x86_32? ( ${MY_A_x86} )
- abi_x86_64? ( ${MY_A_amd64} )
-"
-
-LICENSE="OTN"
-SLOT="0"
-KEYWORDS="amd64 x86"
-RESTRICT="fetch splitdebug"
-IUSE=""
-
-DEPEND="app-arch/unzip"
-RDEPEND="~dev-db/oracle-instantclient-basic-${PV}"
-
-S="${WORKDIR}"
-
-QA_PREBUILT="usr/lib*/oracle/${PV}/client/lib*/lib*"
-
-set_my_abivars() {
- MY_PLAT=MY_PLAT_${ABI}; MY_PLAT=${!MY_PLAT} # platform name
- MY_A=MY_A_${ABI} ; MY_A=${!MY_A} # runtime distfile
- # ABI sourcedir
- MY_S="${S}/${ABI}/instantclient_11_2"
-
- [[ -n ${MY_PLAT} ]]
-}
-
-pkg_nofetch() {
- eerror "Please go to"
- eerror " ${HOMEPAGE%/*}/index-097480.html"
- eerror " and download"
- local ABI
- for ABI in $(multilib_get_enabled_abis)
- do
- set_my_abivars || continue
- eerror "Instant Client for ${MY_PLAT}"
- eerror " JDBC: ${MY_A}"
- done
- eerror "After downloading, put them in:"
- eerror " ${DISTDIR}/"
-}
-
-src_unpack() {
- local ABI
- for ABI in $(multilib_get_enabled_abis)
- do
- set_my_abivars || continue
- mkdir -p "${MY_S%/*}" || die
- cd "${MY_S%/*}" || die
- unpack ${MY_A}
- done
-}
-
-src_install() {
- # all binaries go here
- local oracle_home=/usr/$(get_libdir)/oracle/${PV}/client
- into "${oracle_home}"
-
- local ABI
- for ABI in $(multilib_get_enabled_abis)
- do
- if ! set_my_abivars; then
- elog "Skipping unsupported ABI ${ABI}."
- continue
- fi
- einfo "Installing runtime for ${MY_PLAT} ..."
-
- cd "${MY_S}" || die
-
- dolib.so lib*$(get_libname)*
-
- insinto "${oracle_home}"/$(get_libdir)
- doins *.jar
-
- eend $?
- done
-}
diff --git a/dev-db/oracle-instantclient-jdbc/oracle-instantclient-jdbc-12.ebuild b/dev-db/oracle-instantclient-jdbc/oracle-instantclient-jdbc-12.ebuild
index 4a7e10b94d67..2768c076665b 100644
--- a/dev-db/oracle-instantclient-jdbc/oracle-instantclient-jdbc-12.ebuild
+++ b/dev-db/oracle-instantclient-jdbc/oracle-instantclient-jdbc-12.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=""
LICENSE="metapackage"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
DEPEND=""
diff --git a/dev-db/oracle-instantclient-odbc/Manifest b/dev-db/oracle-instantclient-odbc/Manifest
index 0653181c4ad1..e69de29bb2d1 100644
--- a/dev-db/oracle-instantclient-odbc/Manifest
+++ b/dev-db/oracle-instantclient-odbc/Manifest
@@ -1,2 +0,0 @@
-DIST instantclient-odbc-linux-11.2.0.4.0.zip 274999 BLAKE2B 33855608fcd61a7f4ebcab3f969b028069d636d5a709676c07733aeb20dcb4335f485844ec72cb0816307e36c7f0b6748c08ea6e5c67c853999ddc1b0c23eae8 SHA512 64d75c6f9aa4e5b74da12a2a293e6ee7017017a12a724596d51606d3a8d7a9d9653c158d389a5faeb02893ca6a6a93650605d71f885f9439427847583f5cc820
-DIST instantclient-odbc-linux.x64-11.2.0.4.0.zip 310560 BLAKE2B dc97373ac00f07b4d02beb45ed053d5aa8909fc380990426c118e3fb42b08e8e5e699a518aa137b3fe159107c73929e61d59c997e741a343803f5c26036adf9b SHA512 19f999207e5ea2b5db18b40c0eb40c6ec1ea8a3117915a723338e5c423122b747c5e371446d631c00a5c01005453f85da1d2e680a2c1771a495dc0b68812df69
diff --git a/dev-db/oracle-instantclient-odbc/oracle-instantclient-odbc-11.2.0.4.ebuild b/dev-db/oracle-instantclient-odbc/oracle-instantclient-odbc-11.2.0.4.ebuild
deleted file mode 100644
index 716c88d51cad..000000000000
--- a/dev-db/oracle-instantclient-odbc/oracle-instantclient-odbc-11.2.0.4.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit eutils multilib-minimal
-
-MY_PLAT_x86="Linux x86"
-MY_A_x86="${PN/oracle-/}-linux-${PV}.0.zip"
-
-MY_PLAT_amd64="Linux x86-64"
-MY_A_amd64="${PN/oracle-/}-linux.x64-${PV}.0.zip"
-
-DESCRIPTION="Oracle 11g Instant Client: ODBC supplement"
-HOMEPAGE="http://www.oracle.com/technetwork/database/features/instant-client/index.html"
-SRC_URI="
- abi_x86_32? ( ${MY_A_x86} )
- abi_x86_64? ( ${MY_A_amd64} )
-"
-
-LICENSE="OTN"
-SLOT="0"
-KEYWORDS="amd64 x86"
-RESTRICT="fetch splitdebug"
-IUSE=""
-
-DEPEND="app-arch/unzip"
-RDEPEND="~dev-db/oracle-instantclient-basic-${PV}"
-
-S="${WORKDIR}"
-
-QA_PREBUILT="usr/lib*/oracle/${PV}/client/lib*/lib*"
-
-set_my_abivars() {
- MY_PLAT=MY_PLAT_${ABI}; MY_PLAT=${!MY_PLAT} # platform name
- MY_A=MY_A_${ABI} ; MY_A=${!MY_A} # runtime distfile
- # ABI sourcedir
- MY_S="${S}/${ABI}/instantclient_11_2"
-
- [[ -n ${MY_PLAT} ]]
-}
-
-pkg_nofetch() {
- eerror "Please go to"
- eerror " ${HOMEPAGE%/*}/index-097480.html"
- eerror " and download"
- local ABI
- for ABI in $(multilib_get_enabled_abis)
- do
- set_my_abivars || continue
- eerror "Instant Client for ${MY_PLAT}"
- eerror " ODBC: ${MY_A}"
- done
- eerror "After downloading, put them in:"
- eerror " ${DISTDIR}/"
-}
-
-src_unpack() {
- local ABI
- for ABI in $(multilib_get_enabled_abis)
- do
- set_my_abivars || continue
- mkdir -p "${MY_S%/*}" || die
- cd "${MY_S%/*}" || die
- unpack ${MY_A}
- done
-}
-
-src_install() {
- # all binaries go here
- local oracle_home=/usr/$(get_libdir)/oracle/${PV}/client
- into "${oracle_home}"
-
- local ABI
- for ABI in $(multilib_get_enabled_abis)
- do
- if ! set_my_abivars; then
- elog "Skipping unsupported ABI ${ABI}."
- continue
- fi
- einfo "Installing runtime for ${MY_PLAT} ..."
-
- cd "${MY_S}" || die
-
- dolib.so libsqora*$(get_libname)*
-
- # ensure to be linkable
- [[ -e libsqora$(get_libname) ]] ||
- dosym libsqora$(get_libname 11.1) "${oracle_home}"/$(get_libdir)/libsqora$(get_libname)
-
- eend $?
- done
-
- dobin odbc_update_ini.sh
- dodoc *htm*
-}
diff --git a/dev-db/oracle-instantclient-odbc/oracle-instantclient-odbc-12.ebuild b/dev-db/oracle-instantclient-odbc/oracle-instantclient-odbc-12.ebuild
index efa4b23d3e5e..0b1a3fb696e5 100644
--- a/dev-db/oracle-instantclient-odbc/oracle-instantclient-odbc-12.ebuild
+++ b/dev-db/oracle-instantclient-odbc/oracle-instantclient-odbc-12.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=""
LICENSE="metapackage"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
DEPEND=""
diff --git a/dev-db/oracle-instantclient-sqlplus/Manifest b/dev-db/oracle-instantclient-sqlplus/Manifest
index 1425c27a01d4..e69de29bb2d1 100644
--- a/dev-db/oracle-instantclient-sqlplus/Manifest
+++ b/dev-db/oracle-instantclient-sqlplus/Manifest
@@ -1,2 +0,0 @@
-DIST instantclient-sqlplus-linux-11.2.0.4.0.zip 792608 BLAKE2B c3e8f0843700df9f95428b01520400d95076df5e19169f2a79982293e54ce6cc74321de0f34a0e7865d5d29535e38b60bcca127be06343c979a40985bf349012 SHA512 8f5ff27043a036eab038080bbdc056325cc2c197e12de34e74a8da17bf69b44e4fd4200b638881d86fdf1dc1450d8e1d033daaa56386bd2c8784d556ba0093ce
-DIST instantclient-sqlplus-linux.x64-11.2.0.4.0.zip 834491 BLAKE2B 487091d97c0f2ec383018c39a957c8a27b030c4c8754a6c2714237dc875b89b250b47dbd28ca228a98c6199323ddd031452e1cc90c60824fbcca536aa38bff1f SHA512 b7180b5667e604564cf379b9eb55a2fc8994b87cfb993e728b4c1bdd297cab134a55580018429bdbb2b101ebdf8a350bacc1ddf5a30e1cc419092054c79a108b
diff --git a/dev-db/oracle-instantclient-sqlplus/oracle-instantclient-sqlplus-11.2.0.4.ebuild b/dev-db/oracle-instantclient-sqlplus/oracle-instantclient-sqlplus-11.2.0.4.ebuild
deleted file mode 100644
index c01045c3709c..000000000000
--- a/dev-db/oracle-instantclient-sqlplus/oracle-instantclient-sqlplus-11.2.0.4.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit eutils pax-utils
-
-MY_PLAT_x86="Linux x86"
-MY_A_x86="${PN#oracle-}-linux-${PV}.0.zip"
-
-MY_PLAT_amd64="Linux x86-64"
-MY_A_amd64="${PN#oracle-}-linux.x64-${PV}.0.zip"
-
-DESCRIPTION="Oracle 11g Instant Client: SQL*Plus"
-HOMEPAGE="http://www.oracle.com/technetwork/database/features/instant-client/index.html"
-SRC_URI="
- x86? ( ${MY_A_x86} )
- amd64? ( ${MY_A_amd64} )
-"
-
-LICENSE="OTN"
-SLOT="0"
-KEYWORDS="amd64 x86"
-RESTRICT="fetch splitdebug"
-IUSE=""
-
-DEPEND="app-arch/unzip"
-RDEPEND="~dev-db/oracle-instantclient-basic-${PV}"
-
-S="${WORKDIR}"/instantclient_11_2
-
-QA_PREBUILT="
- usr/lib*/oracle/${PV}/client/lib*/lib*
- usr/lib*/oracle/${PV}/client/bin/sqlplus
-"
-
-my_arch() {
- # platform name
- MY_PLAT=MY_PLAT_${ARCH}
- export MY_PLAT=${!MY_PLAT}
- # distfile
- MY_A=MY_A_${ARCH}
- export MY_A=${!MY_A}
-}
-
-pkg_nofetch() {
- my_arch
- eerror "Please go to"
- eerror " ${HOMEPAGE%/*}/index-097480.html"
- eerror " and download"
- eerror "Instant Client for ${MY_PLAT}"
- eerror " SQL*Plus: ${MY_A}"
- eerror "After downloading, put it into your DISTDIR directory."
-}
-
-src_install() {
- # all binaries go here
- local oracle_home=usr/$(get_libdir)/oracle/${PV}/client
- into /"${oracle_home}"
-
- dolib.so libsqlplus$(get_libname) libsqlplusic$(get_libname)
- dobin sqlplus
-
- insinto /"${oracle_home}"/sqlplus/admin
- doins glogin.sql
-
- pax-mark -c "${ED}${oracle_home}"/bin/sqlplus || die
-
- dosym /"${oracle_home}"/bin/sqlplus /usr/bin/sqlplus
-}
diff --git a/dev-db/oracle-instantclient-sqlplus/oracle-instantclient-sqlplus-12.ebuild b/dev-db/oracle-instantclient-sqlplus/oracle-instantclient-sqlplus-12.ebuild
index 177f4e9be8de..b0eb59d9bb6e 100644
--- a/dev-db/oracle-instantclient-sqlplus/oracle-instantclient-sqlplus-12.ebuild
+++ b/dev-db/oracle-instantclient-sqlplus/oracle-instantclient-sqlplus-12.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=""
LICENSE="metapackage"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
DEPEND=""
diff --git a/dev-db/oracle-instantclient/oracle-instantclient-19.6.0.0-r1.ebuild b/dev-db/oracle-instantclient/oracle-instantclient-19.6.0.0-r1.ebuild
index 4779da161c1b..f17ec30870d6 100644
--- a/dev-db/oracle-instantclient/oracle-instantclient-19.6.0.0-r1.ebuild
+++ b/dev-db/oracle-instantclient/oracle-instantclient-19.6.0.0-r1.ebuild
@@ -72,7 +72,7 @@ SRC_URI="
LICENSE="OTN"
SLOT="0/${MY_SOVER}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
RESTRICT="mirror splitdebug test"
DEPEND="app-arch/unzip"
diff --git a/dev-db/sqlite/sqlite-3.33.0.ebuild b/dev-db/sqlite/sqlite-3.33.0.ebuild
index 854ed01b48ce..f14e706720a5 100644
--- a/dev-db/sqlite/sqlite-3.33.0.ebuild
+++ b/dev-db/sqlite/sqlite-3.33.0.ebuild
@@ -22,7 +22,7 @@ fi
LICENSE="public-domain"
SLOT="3"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="debug doc icu +readline secure-delete static-libs tcl test tools"
if [[ "${PV}" == "9999" ]]; then
PROPERTIES="live"
diff --git a/dev-db/tokumx/Manifest b/dev-db/tokumx/Manifest
deleted file mode 100644
index 01a67acd1baf..000000000000
--- a/dev-db/tokumx/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST tokumx-enterprise-2.0.2.tar.gz 16756175 BLAKE2B 8caaf9f12db713192ab1eaa31284fd390c1a54ffb9e6c12601b9a8c88a101f51868ba548ae8bcb1cd39ea875b6a937c8b5e4b45792f7da88e454d6a02955fe07 SHA512 8d063abcbe16ce50b5b7f99ae6deec348cf60bb8bb57a3b06e478c03af7ded7501ca6ca15ac63ef07bf3fa0da59a30571b9a799fa5c5a9dcbac741c0a674b1f6
-DIST tokumx-git-tag-1.5.0.tar.bz2 13059584 BLAKE2B f662d72c8eb65551c074f11e36dac0fa68f5a0b86fe9654e49160c42511576146e9194c3d3cd607c8fba4272992c35f4268ad3db7032ae9dfb7c9417f954e8c8 SHA512 ba19237db7d3dcbd3ac07b8cc4860549830fa065fa4d26cbae685274524cd5b89f671d5f126ec25bee605c99929ce0436bb2ac32d67efdbb8dd6d7526d3f1c24
diff --git a/dev-db/tokumx/files/1.5.0-Werror.diff b/dev-db/tokumx/files/1.5.0-Werror.diff
deleted file mode 100644
index a865fe074f37..000000000000
--- a/dev-db/tokumx/files/1.5.0-Werror.diff
+++ /dev/null
@@ -1,45 +0,0 @@
-diff -uNr work.ORIG/mongo/CMakeLists.txt work/mongo/CMakeLists.txt
---- work.ORIG/mongo/CMakeLists.txt 2014-08-01 11:51:20.832614062 +0100
-+++ work/mongo/CMakeLists.txt 2014-08-01 11:51:36.898614862 +0100
-@@ -71,14 +71,13 @@
- endforeach(flag)
- endmacro(set_cxxflags_if_supported)
-
--set(CMAKE_C_FLAGS "-fPIC -fno-strict-aliasing -ggdb -Wall -Wsign-compare -Wno-unknown-pragmas -Winvalid-pch -Werror -pipe")
-+set(CMAKE_C_FLAGS "-fPIC -fno-strict-aliasing -ggdb -Wall -Wsign-compare -Wno-unknown-pragmas -Winvalid-pch -pipe")
- set(CMAKE_CXX_FLAGS "-fPIC -fno-strict-aliasing -ggdb")
- set_cxxflags_if_supported(
- -Wall
- -Wsign-compare
- -Wno-unknown-pragmas
- -Winvalid-pch
-- -Werror
- -pipe
- -Wnon-virtual-dtor
- -Woverloaded-virtual
-diff -uNr work.ORIG/mongo/src/third_party/ft-index/cmake_modules/TokuSetupCompiler.cmake work/mongo/src/third_party/ft-index/cmake_modules/TokuSetupCompiler.cmake
---- work.ORIG/mongo/src/third_party/ft-index/cmake_modules/TokuSetupCompiler.cmake 2014-08-01 11:51:20.696614056 +0100
-+++ work/mongo/src/third_party/ft-index/cmake_modules/TokuSetupCompiler.cmake 2014-08-01 11:51:36.898614862 +0100
-@@ -174,8 +174,8 @@
- endif ()
-
- ## always want these
--set(CMAKE_C_FLAGS "-Wall -Werror ${CMAKE_C_FLAGS}")
--set(CMAKE_CXX_FLAGS "-Wall -Werror ${CMAKE_CXX_FLAGS}")
-+set(CMAKE_C_FLAGS "-Wall ${CMAKE_C_FLAGS}")
-+set(CMAKE_CXX_FLAGS "-Wall ${CMAKE_CXX_FLAGS}")
-
- ## need to set -stdlib=libc++ to get real c++11 support on darwin
- if (APPLE)
-diff -uNr work.ORIG/mongo/src/third_party/ft-index/examples/Makefile work/mongo/src/third_party/ft-index/examples/Makefile
---- work.ORIG/mongo/src/third_party/ft-index/examples/Makefile 2014-08-01 11:51:20.676614055 +0100
-+++ work/mongo/src/third_party/ft-index/examples/Makefile 2014-08-01 11:51:36.898614862 +0100
-@@ -1,7 +1,7 @@
- SRCS = $(wildcard *.c)
- TARGETS = $(patsubst %.c,%,$(SRCS)) $(patsubst %.c,%-bdb,$(SRCS))
- CPPFLAGS = -I../include -D_GNU_SOURCE
--CFLAGS = -g -std=c99 -Wall -Wextra -Werror -Wno-missing-field-initializers
-+CFLAGS = -g -std=c99 -Wall -Wextra -Wno-missing-field-initializers
- ifeq ($(USE_STATIC_LIBS),1)
- LIBTOKUDB = tokufractaltree_static
- LIBTOKUPORTABILITY = tokuportability_static
diff --git a/dev-db/tokumx/files/1.5.0-boost-57.diff b/dev-db/tokumx/files/1.5.0-boost-57.diff
deleted file mode 100644
index e66aec168712..000000000000
--- a/dev-db/tokumx/files/1.5.0-boost-57.diff
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -uNr work.ORIG/mongo/src/mongo/shell/linenoise_utf8.h work/mongo/src/mongo/shell/linenoise_utf8.h
---- work.ORIG/mongo/src/mongo/shell/linenoise_utf8.h 2017-03-30 15:20:51.880842717 +0100
-+++ work/mongo/src/mongo/shell/linenoise_utf8.h 2017-03-30 15:21:26.002844416 +0100
-@@ -16,6 +16,7 @@
- */
-
- #include
-+#include
- #include
-
- namespace linenoise_utf8 {
diff --git a/dev-db/tokumx/files/tokumx-2.0.2-boost-57.patch b/dev-db/tokumx/files/tokumx-2.0.2-boost-57.patch
deleted file mode 100644
index 52b3b9f12064..000000000000
--- a/dev-db/tokumx/files/tokumx-2.0.2-boost-57.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -uNr tokumx-enterprise-2.0.2.ORIG/src/mongo/shell/linenoise.cpp tokumx-enterprise-2.0.2/src/mongo/shell/linenoise.cpp
---- tokumx-enterprise-2.0.2.ORIG/src/mongo/shell/linenoise.cpp 2016-11-21 11:52:54.883542356 +0000
-+++ tokumx-enterprise-2.0.2/src/mongo/shell/linenoise.cpp 2016-11-21 11:53:11.995543208 +0000
-@@ -117,6 +117,7 @@
- #include "mk_wcwidth.h"
- #include
- #include
-+#include
- #include
-
- using std::string;
-diff -uNr tokumx-enterprise-2.0.2.ORIG/src/mongo/shell/linenoise_utf8.h tokumx-enterprise-2.0.2/src/mongo/shell/linenoise_utf8.h
---- tokumx-enterprise-2.0.2.ORIG/src/mongo/shell/linenoise_utf8.h 2016-11-21 11:52:54.883542356 +0000
-+++ tokumx-enterprise-2.0.2/src/mongo/shell/linenoise_utf8.h 2016-11-21 11:53:31.610544185 +0000
-@@ -15,6 +15,7 @@
- * limitations under the License.
- */
-
-+#include
- #include
- #include
-
diff --git a/dev-db/tokumx/files/tokumx-2.0.2-gcc-7.patch b/dev-db/tokumx/files/tokumx-2.0.2-gcc-7.patch
deleted file mode 100644
index 1203d1fc8098..000000000000
--- a/dev-db/tokumx/files/tokumx-2.0.2-gcc-7.patch
+++ /dev/null
@@ -1,102 +0,0 @@
-diff -uNr tokumx-enterprise-2.0.2.ORIG/src/mongo/db/client_load.cpp tokumx-enterprise-2.0.2/src/mongo/db/client_load.cpp
---- tokumx-enterprise-2.0.2.ORIG/src/mongo/db/client_load.cpp 2018-07-03 15:57:40.709360944 +0100
-+++ tokumx-enterprise-2.0.2/src/mongo/db/client_load.cpp 2018-07-03 15:57:48.127361253 +0100
-@@ -74,7 +74,7 @@
- }
-
- bool Client::loadInProgress() const {
-- return _loadInfo;
-+ return bool(_loadInfo);
- }
-
- } // namespace mongo
-diff -uNr tokumx-enterprise-2.0.2.ORIG/src/mongo/db/collection_map.h tokumx-enterprise-2.0.2/src/mongo/db/collection_map.h
---- tokumx-enterprise-2.0.2.ORIG/src/mongo/db/collection_map.h 2018-07-03 15:57:40.709360944 +0100
-+++ tokumx-enterprise-2.0.2/src/mongo/db/collection_map.h 2018-07-03 15:57:48.127361253 +0100
-@@ -66,7 +66,7 @@
- // which must succeed, by the first invariant.
- Collection *getCollection(const StringData &ns);
-
-- bool allocated() const { return _metadb; }
-+ bool allocated() const { return bool(_metadb); }
-
- void getNamespaces( list& tofill );
-
-diff -uNr tokumx-enterprise-2.0.2.ORIG/src/mongo/db/ops/query.cpp tokumx-enterprise-2.0.2/src/mongo/db/ops/query.cpp
---- tokumx-enterprise-2.0.2.ORIG/src/mongo/db/ops/query.cpp 2018-07-03 15:57:40.703360944 +0100
-+++ tokumx-enterprise-2.0.2/src/mongo/db/ops/query.cpp 2018-07-03 15:58:08.348362094 +0100
-@@ -635,7 +635,7 @@
- shared_ptr ret
- ( new SimpleCursorExplainStrategy( ancillaryInfo, _cursor ) );
- ret->notePlan( queryPlan.valid() && queryPlan.scanAndOrderRequired,
-- queryPlan.keyFieldsOnly );
-+ bool(queryPlan.keyFieldsOnly) );
- return ret;
- }
-
-diff -uNr tokumx-enterprise-2.0.2.ORIG/src/mongo/db/pipeline/document_source_sort.cpp tokumx-enterprise-2.0.2/src/mongo/db/pipeline/document_source_sort.cpp
---- tokumx-enterprise-2.0.2.ORIG/src/mongo/db/pipeline/document_source_sort.cpp 2018-07-03 15:57:40.707360944 +0100
-+++ tokumx-enterprise-2.0.2/src/mongo/db/pipeline/document_source_sort.cpp 2018-07-03 15:57:48.128361253 +0100
-@@ -106,7 +106,7 @@
- bool DocumentSourceSort::coalesce(const intrusive_ptr &pNextSource) {
- if (!limitSrc) {
- limitSrc = dynamic_cast(pNextSource.get());
-- return limitSrc; // false if next is not a $limit
-+ return bool(limitSrc); // false if next is not a $limit
- }
- else {
- return limitSrc->coalesce(pNextSource);
-diff -uNr tokumx-enterprise-2.0.2.ORIG/src/mongo/db/queryoptimizercursorimpl.cpp tokumx-enterprise-2.0.2/src/mongo/db/queryoptimizercursorimpl.cpp
---- tokumx-enterprise-2.0.2.ORIG/src/mongo/db/queryoptimizercursorimpl.cpp 2018-07-03 15:57:40.702360944 +0100
-+++ tokumx-enterprise-2.0.2/src/mongo/db/queryoptimizercursorimpl.cpp 2018-07-03 15:57:48.128361253 +0100
-@@ -370,7 +370,7 @@
-
- // The query plan must have a matcher. The matcher's constructor performs some aspects
- // of query validation that should occur before a cursor is returned.
-- fassert( 16449, singlePlan->matcher() );
-+ fassert( 16449, bool(singlePlan->matcher()) );
-
- if ( needMatcher ) {
- single->setMatcher( singlePlan->matcher() );
-diff -uNr tokumx-enterprise-2.0.2.ORIG/src/mongo/db/query_optimizer_internal.cpp tokumx-enterprise-2.0.2/src/mongo/db/query_optimizer_internal.cpp
---- tokumx-enterprise-2.0.2.ORIG/src/mongo/db/query_optimizer_internal.cpp 2018-07-03 15:57:40.707360944 +0100
-+++ tokumx-enterprise-2.0.2/src/mongo/db/query_optimizer_internal.cpp 2018-07-03 15:57:48.129361253 +0100
-@@ -234,7 +234,7 @@
- // The query plan must have a matcher. The matcher's constructor performs some aspects
- // of query validation that should occur as part of this class's init() if not handled
- // already.
-- fassert( 16249, queryPlan().matcher() );
-+ fassert( 16249, bool(queryPlan().matcher()) );
-
- // TODO This violates the current Cursor interface abstraction, but for now it's simpler to keep our own set of
- // dups rather than avoid poisoning the cursor's dup set with unreturned documents. Deduping documents
-@@ -257,7 +257,7 @@
- _explainPlanInfo.reset( new ExplainPlanInfo() );
- _explainPlanInfo->notePlan( *_c,
- queryPlan().scanAndOrderRequired(),
-- queryPlan().keyFieldsOnly() );
-+ bool(queryPlan().keyFieldsOnly()) );
- return _explainPlanInfo;
- }
-
-@@ -1226,7 +1226,7 @@
- _explainPlanInfo.reset( new ExplainPlanInfo() );
- _explainPlanInfo->notePlan( *_c,
- _queryPlan->scanAndOrderRequired(),
-- _queryPlan->keyFieldsOnly() );
-+ bool(_queryPlan->keyFieldsOnly()) );
- shared_ptr clauseInfo( new ExplainClauseInfo() );
- clauseInfo->addPlanInfo( _explainPlanInfo );
- _mps->addClauseInfo( clauseInfo );
-diff -uNr tokumx-enterprise-2.0.2.ORIG/src/mongo/db/query_plan_summary.h tokumx-enterprise-2.0.2/src/mongo/db/query_plan_summary.h
---- tokumx-enterprise-2.0.2.ORIG/src/mongo/db/query_plan_summary.h 2018-07-03 15:57:40.705360944 +0100
-+++ tokumx-enterprise-2.0.2/src/mongo/db/query_plan_summary.h 2018-07-03 15:57:48.129361253 +0100
-@@ -35,7 +35,7 @@
- * The 'fieldRangeMulti' attribute is required, and its presence indicates the object has
- * been configured with a query plan.
- */
-- bool valid() const { return fieldRangeSetMulti; }
-+ bool valid() const { return bool(fieldRangeSetMulti); }
-
- // A description of the valid values for the fields of a query, in the context of a multikey
- // index or in memory sort.
diff --git a/dev-db/tokumx/files/tokumx-2.0.2-no-delete-null-pointer-checks.patch b/dev-db/tokumx/files/tokumx-2.0.2-no-delete-null-pointer-checks.patch
deleted file mode 100644
index 551770553d77..000000000000
--- a/dev-db/tokumx/files/tokumx-2.0.2-no-delete-null-pointer-checks.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -uNr tokumx-enterprise-2.0.2.ORIG/CMakeLists.txt tokumx-enterprise-2.0.2/CMakeLists.txt
---- tokumx-enterprise-2.0.2.ORIG/CMakeLists.txt 2018-07-17 16:20:18.712013701 +0100
-+++ tokumx-enterprise-2.0.2/CMakeLists.txt 2018-07-17 16:22:06.063018495 +0100
-@@ -83,7 +83,7 @@
- endmacro(set_cxxflags_if_supported)
-
- set(CMAKE_C_FLAGS "-fPIC -fno-strict-aliasing -ggdb -Wall -Wsign-compare -Wno-unknown-pragmas -Winvalid-pch -pipe")
--set(CMAKE_CXX_FLAGS "-fPIC -fno-strict-aliasing -ggdb")
-+set(CMAKE_CXX_FLAGS "-fPIC -fno-strict-aliasing -fno-delete-null-pointer-checks -ggdb")
- set_cxxflags_if_supported(
- -Wall
- -Wsign-compare
-diff -uNr tokumx-enterprise-2.0.2.ORIG/SConstruct tokumx-enterprise-2.0.2/SConstruct
---- tokumx-enterprise-2.0.2.ORIG/SConstruct 2018-07-17 16:20:18.712013701 +0100
-+++ tokumx-enterprise-2.0.2/SConstruct 2018-07-17 16:22:40.459020031 +0100
-@@ -702,6 +702,7 @@
- # -Winvalid-pch Warn if a precompiled header (see Precompiled Headers) is found in the search path but can't be used.
- env.Append( CCFLAGS=["-fPIC",
- "-fno-strict-aliasing",
-+ "-fno-delete-null-pointer-checks",
- "-ggdb",
- "-pthread",
- "-Wall",
diff --git a/dev-db/tokumx/files/tokumx-2.0.2-no-werror.patch b/dev-db/tokumx/files/tokumx-2.0.2-no-werror.patch
deleted file mode 100644
index 5a0c160e8866..000000000000
--- a/dev-db/tokumx/files/tokumx-2.0.2-no-werror.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-diff -uNr tokumx-enterprise-2.0.2.ORIG/CMakeLists.txt tokumx-enterprise-2.0.2/CMakeLists.txt
---- tokumx-enterprise-2.0.2.ORIG/CMakeLists.txt 2016-11-21 11:15:27.517430430 +0000
-+++ tokumx-enterprise-2.0.2/CMakeLists.txt 2016-11-21 11:16:27.874433436 +0000
-@@ -82,14 +82,13 @@
- endforeach(flag)
- endmacro(set_cxxflags_if_supported)
-
--set(CMAKE_C_FLAGS "-fPIC -fno-strict-aliasing -ggdb -Wall -Wsign-compare -Wno-unknown-pragmas -Winvalid-pch -Werror -pipe")
-+set(CMAKE_C_FLAGS "-fPIC -fno-strict-aliasing -ggdb -Wall -Wsign-compare -Wno-unknown-pragmas -Winvalid-pch -pipe")
- set(CMAKE_CXX_FLAGS "-fPIC -fno-strict-aliasing -ggdb")
- set_cxxflags_if_supported(
- -Wall
- -Wsign-compare
- -Wno-unknown-pragmas
- -Winvalid-pch
-- -Werror
- -pipe
- -Wnon-virtual-dtor
- -Woverloaded-virtual
-diff -uNr tokumx-enterprise-2.0.2.ORIG/SConstruct tokumx-enterprise-2.0.2/SConstruct
---- tokumx-enterprise-2.0.2.ORIG/SConstruct 2016-11-21 11:15:27.517430430 +0000
-+++ tokumx-enterprise-2.0.2/SConstruct 2016-11-21 11:16:27.875433436 +0000
-@@ -710,7 +710,7 @@
- "-Winvalid-pch"] )
- # env.Append( " -Wconversion" ) TODO: this doesn't really work yet
- if linux:
-- env.Append( CCFLAGS=["-Werror", "-pipe"] )
-+ env.Append( CCFLAGS=["-pipe"] )
- if not has_option('clang'):
- env.Append( CCFLAGS=["-fno-builtin-memcmp"] ) # glibc's memcmp is faster than gcc's
-
-diff -uNr tokumx-enterprise-2.0.2.ORIG/src/third_party/backup/CMakeLists.txt tokumx-enterprise-2.0.2/src/third_party/backup/CMakeLists.txt
---- tokumx-enterprise-2.0.2.ORIG/src/third_party/backup/CMakeLists.txt 2016-11-21 11:15:27.392430424 +0000
-+++ tokumx-enterprise-2.0.2/src/third_party/backup/CMakeLists.txt 2016-11-21 11:17:22.576436161 +0000
-@@ -10,7 +10,7 @@
- _FILE_OFFSET_BITS=64
- _LARGEFILE64_SOURCE)
-
--set(CMAKE_CXX_FLAGS "-Werror -W -Wall -Wshadow ${CMAKE_CXX_FLAGS}")
-+set(CMAKE_CXX_FLAGS "-W -Wall -Wshadow ${CMAKE_CXX_FLAGS}")
-
- set(USE_VALGRIND ON CACHE BOOL "whether to use valgrind headers")
- if (USE_VALGRIND)
-diff -uNr tokumx-enterprise-2.0.2.ORIG/src/third_party/backup/remote/Makefile tokumx-enterprise-2.0.2/src/third_party/backup/remote/Makefile
---- tokumx-enterprise-2.0.2.ORIG/src/third_party/backup/remote/Makefile 2016-11-21 11:15:27.393430424 +0000
-+++ tokumx-enterprise-2.0.2/src/third_party/backup/remote/Makefile 2016-11-21 11:17:38.840436971 +0000
-@@ -1,4 +1,4 @@
- backup.pb.o: backup.pb.h
--CXXFLAGS = -W -Wall -Werror -O1
-+CXXFLAGS = -W -Wall -O1
- backup.pb.cc backup.bp.h: backup.proto
- protoc -I=. --cpp_out=. backup.proto
-diff -uNr tokumx-enterprise-2.0.2.ORIG/src/third_party/ft-index/cmake_modules/TokuSetupCompiler.cmake tokumx-enterprise-2.0.2/src/third_party/ft-index/cmake_modules/TokuSetupCompiler.cmake
---- tokumx-enterprise-2.0.2.ORIG/src/third_party/ft-index/cmake_modules/TokuSetupCompiler.cmake 2016-11-21 11:15:27.422430426 +0000
-+++ tokumx-enterprise-2.0.2/src/third_party/ft-index/cmake_modules/TokuSetupCompiler.cmake 2016-11-21 11:16:54.312434753 +0000
-@@ -181,8 +181,8 @@
- endif ()
-
- ## always want these
--set(CMAKE_C_FLAGS "-Wall -Werror ${CMAKE_C_FLAGS}")
--set(CMAKE_CXX_FLAGS "-Wall -Werror ${CMAKE_CXX_FLAGS}")
-+set(CMAKE_C_FLAGS "-Wall ${CMAKE_C_FLAGS}")
-+set(CMAKE_CXX_FLAGS "-Wall ${CMAKE_CXX_FLAGS}")
-
- ## need to set -stdlib=libc++ to get real c++11 support on darwin
- if (APPLE)
-diff -uNr tokumx-enterprise-2.0.2.ORIG/src/third_party/v8/CMakeLists.txt tokumx-enterprise-2.0.2/src/third_party/v8/CMakeLists.txt
---- tokumx-enterprise-2.0.2.ORIG/src/third_party/v8/CMakeLists.txt 2016-11-21 11:15:27.452430427 +0000
-+++ tokumx-enterprise-2.0.2/src/third_party/v8/CMakeLists.txt 2016-11-21 11:16:27.876433437 +0000
-@@ -126,7 +126,6 @@
-
- set(V8_CXX_FLAGS
- -Wall
-- -Werror
- -W
- -Wno-unused-parameter
- -Woverloaded-virtual
-diff -uNr tokumx-enterprise-2.0.2.ORIG/src/third_party/v8/SConscript tokumx-enterprise-2.0.2/src/third_party/v8/SConscript
---- tokumx-enterprise-2.0.2.ORIG/src/third_party/v8/SConscript 2016-11-21 11:15:27.452430427 +0000
-+++ tokumx-enterprise-2.0.2/src/third_party/v8/SConscript 2016-11-21 11:16:27.876433437 +0000
-@@ -47,7 +47,6 @@
- 'gcc': {
- 'all': {
- 'CCFLAGS': ['-Wall',
-- '-Werror',
- '-W',
- '-Wno-unused-parameter',
- '-Woverloaded-virtual',
diff --git a/dev-db/tokumx/files/tokumx-2.0.2-undefined-reference.patch b/dev-db/tokumx/files/tokumx-2.0.2-undefined-reference.patch
deleted file mode 100644
index d56f7745d1e9..000000000000
--- a/dev-db/tokumx/files/tokumx-2.0.2-undefined-reference.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -uNr a/src/third_party/backup/CMakeLists.txt b/src/third_party/backup/CMakeLists.txt
---- a/src/third_party/backup/CMakeLists.txt 2018-07-06 20:36:58.242767167 +0200
-+++ b/src/third_party/backup/CMakeLists.txt 2018-07-06 20:37:31.575390786 +0200
-@@ -1,11 +1,6 @@
- cmake_minimum_required(VERSION 2.8.8)
- project(HotBackup)
-
--# No implicit templates, since that's how mysql compiles.
--if (NOT CMAKE_CXX_COMPILER_ID MATCHES Clang)
-- set(CMAKE_CXX_FLAGS "-fno-implicit-templates ${CMAKE_CXX_FLAGS}")
--endif ()
--
- set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS
- _FILE_OFFSET_BITS=64
- _LARGEFILE64_SOURCE)
diff --git a/dev-db/tokumx/files/tokumx-disable-bundled-libs.patch b/dev-db/tokumx/files/tokumx-disable-bundled-libs.patch
deleted file mode 100644
index 66d8db3980fa..000000000000
--- a/dev-db/tokumx/files/tokumx-disable-bundled-libs.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -auwrN a/src/third_party/ft-index/CMakeLists.txt b/src/third_party/ft-index/CMakeLists.txt
---- a/src/third_party/ft-index/CMakeLists.txt 2014-08-01 04:37:33.000000000 -0400
-+++ b/src/third_party/ft-index/CMakeLists.txt 2014-08-01 10:38:28.134869689 -0400
-@@ -35,7 +35,6 @@
- include(TokuFeatureDetection)
- include(TokuSetupCompiler)
- include(TokuSetupCTest)
--include(TokuThirdParty)
-
- set(TOKU_CMAKE_SCRIPT_DIR "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
- include(TokuMergeLibs)
diff --git a/dev-db/tokumx/metadata.xml b/dev-db/tokumx/metadata.xml
deleted file mode 100644
index aecb193ea796..000000000000
--- a/dev-db/tokumx/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
- chainsaw@gentoo.org
- Tony Vroon
-
-
-
diff --git a/dev-db/tokumx/tokumx-1.5.0-r2.ebuild b/dev-db/tokumx/tokumx-1.5.0-r2.ebuild
deleted file mode 100644
index ef1062ab8695..000000000000
--- a/dev-db/tokumx/tokumx-1.5.0-r2.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-CMAKE_BUILD_TYPE=Release
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-r1 pax-utils cmake-utils
-
-MY_P=${PN}-git-tag-${PV}
-
-DESCRIPTION="An open source, high-performance distribution of MongoDB"
-HOMEPAGE="http://www.tokutek.com/products/tokumx-for-mongodb/"
-SRC_URI="mirror://gentoo/${MY_P}.tar.bz2"
-
-LICENSE="AGPL-3 Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="pax_kernel"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="!dev-db/mongodb
- ${PYTHON_DEPS}
- dev-libs/jemalloc
- >=dev-libs/boost-1.50[threads(+)]
- >=dev-libs/libpcre-8.30[cxx]
- net-libs/libpcap"
-DEPEND="${RDEPEND}
- sys-libs/ncurses
- sys-libs/readline
- pax_kernel? ( sys-apps/paxctl sys-apps/elfix )"
-
-S="${WORKDIR}/mongo"
-BUILD_DIR="${WORKDIR}/mongo/build"
-QA_PRESTRIPPED="/usr/lib64/libHotBackup.so"
-
-src_prepare() {
- cd "${WORKDIR}"
- epatch "${FILESDIR}/${PV}-Werror.diff"
- epatch "${FILESDIR}/${PV}-boost-57.diff"
- epatch "${FILESDIR}/${PN}-disable-bundled-libs.patch"
- cd "${S}"
- cmake-utils_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- -D TOKU_DEBUG_PARANOID=OFF
- -D USE_VALGRIND=OFF
- -D USE_BDB=OFF
- -D BUILD_TESTING=OFF
- -D TOKUMX_DISTNAME=${PV}
- -D LIBJEMALLOC="jemalloc"
- -D TOKUMX_STRIP_BINARIES=0
- -D USE_SYSTEM_PCRE=1
- -D USE_SYSTEM_BOOST=1
- )
- cmake-utils_src_configure
-}
-
-src_install() {
- cmake-utils_src_install
- pax-mark -m "${D}"/usr/bin/mongo
-
- # Remove unnecessary files
- rm -r "${D}usr/buildscripts" "${D}usr/scripts" "${D}usr/src" "${D}usr/include/db.h" || die
-
- # Correctly install this python script
- python_foreach_impl python_doscript scripts/tokumxstat.py
-
- # Clean up documentation installed to /usr
- pushd "${D}usr/" || die
- rm GNU-AGPL-3.0 LICENSE.txt NEWS README README.md README-TOKUDB README-TOKUKV SConstruct THIRD-PARTY-NOTICES || die
- popd || die
- dodoc README.md distsrc/NEWS distsrc/README distsrc/THIRD-PARTY-NOTICES
- newdoc src/third_party/ft-index/README-TOKUDB README-TOKUKV
-}
diff --git a/dev-db/tokumx/tokumx-2.0.2-r2.ebuild b/dev-db/tokumx/tokumx-2.0.2-r2.ebuild
deleted file mode 100644
index b1fbf2a7fdf9..000000000000
--- a/dev-db/tokumx/tokumx-2.0.2-r2.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-CMAKE_BUILD_TYPE=Release
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-r1 cmake-utils pax-utils check-reqs
-
-MY_P=${PN}-enterprise-${PV}
-
-DESCRIPTION="An open source, high-performance distribution of MongoDB"
-HOMEPAGE="https://www.percona.com/software/mongo-database/percona-tokumx"
-SRC_URI="https://www.percona.com/downloads/percona-tokumx/${MY_P}/source/tarball/${MY_P}.tar.gz"
-
-LICENSE="AGPL-3 Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="pax_kernel"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="!app-admin/mongo-tools
- !dev-db/mongodb
- !dev-libs/mongo-cxx-driver
- ${PYTHON_DEPS}
- dev-libs/jemalloc
- >=dev-libs/boost-1.50[threads(+)]
- >=dev-libs/libpcre-8.30[cxx]
- net-libs/libpcap"
-DEPEND="${RDEPEND}
- dev-util/valgrind
- sys-libs/ncurses
- sys-libs/readline
- pax_kernel? ( sys-apps/paxctl sys-apps/elfix )
-"
-
-S="${WORKDIR}/${MY_P}"
-QA_PRESTRIPPED="/usr/lib64/libHotBackup.so"
-CHECKREQS_DISK_BUILD="13G"
-
-src_prepare() {
- eapply "${FILESDIR}/${P}-no-werror.patch"
- eapply "${FILESDIR}/${P}-boost-57.patch"
- eapply "${FILESDIR}/${P}-gcc-7.patch"
- eapply "${FILESDIR}/${P}-undefined-reference.patch"
- eapply "${FILESDIR}/${P}-no-delete-null-pointer-checks.patch"
- cmake-utils_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- -DTOKU_DEBUG_PARANOID=OFF
- -DUSE_VALGRIND=OFF
- -DBUILD_TESTING=OFF
- -DTOKUMX_DISTNAME=${PV}
- -DLIBJEMALLOC="jemalloc"
- -DTOKUMX_STRIP_BINARIES=0
- -DUSE_SYSTEM_PCRE=1
- -DUSE_SYSTEM_BOOST=1
- )
- cmake-utils_src_configure
-}
-
-src_install() {
- cmake-utils_src_install
- pax-mark -m "${D}"/usr/bin/mongo
-
- # Remove unnecessary files
- rm -r "${D}usr/buildscripts" "${D}usr/scripts" "${D}usr/src" "${D}usr/include/db.h" || die
-
- # Correctly install this python script
- python_foreach_impl python_doscript scripts/tokumxstat.py
-
- # Clean up documentation installed to /usr
- pushd "${D}usr/" || die
- rm GNU-AGPL-3.0 LICENSE.txt NEWS README README.md README-TOKUDB README-TOKUKV SConstruct THIRD-PARTY-NOTICES || die
- popd || die
- dodoc README.md distsrc/NEWS distsrc/README distsrc/THIRD-PARTY-NOTICES
- newdoc src/third_party/ft-index/README-TOKUDB README-TOKUKV
-}
diff --git a/dev-go/Manifest.gz b/dev-go/Manifest.gz
index 1fcac0e95ad8..2ac1c612c39d 100644
Binary files a/dev-go/Manifest.gz and b/dev-go/Manifest.gz differ
diff --git a/dev-go/siphash/Manifest b/dev-go/siphash/Manifest
deleted file mode 100644
index db0fe08936e9..000000000000
--- a/dev-go/siphash/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST siphash-1.0.0.tar.gz 4462 BLAKE2B 2939eee829189db0939e2a0ff15701e7bc20b34213a5ea7b0e268a19d8eeb4618b26c11c537fd2902ce7bf3d573845a899f002155274a5172b67472879768cc5 SHA512 e52dc9857974ab362f2d7b2f7389644fbc07e7bb5507a93f138b3f692c1065303846611bb51b3d9c637d851a4d20cc20af146719a553801a8f7e17ec900a736a
-DIST siphash-1.2.1.tar.gz 10729 BLAKE2B 445e7839565224045ecb920787b7b75441fce6b028c22af6cbc498820e53c174f81851aff4e390f6d318557b720b4f32332b82f9ce4b4ba3a8725d74866a635f SHA512 bb59a152322350ce4d88f3a8795fcb319621f0c5b2e535f251e7c159ea574b22678f0e29c6dc0fde08ff1be628cd7c76534e902e3f1d332009031cae01491e11
diff --git a/dev-go/siphash/metadata.xml b/dev-go/siphash/metadata.xml
deleted file mode 100644
index 3d1f1e5ff3c7..000000000000
--- a/dev-go/siphash/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-
- marecki@gentoo.org
- Marek Szuba
-
-
- blueness@gentoo.org
- Anthony G. Basile
-
-
- dchest/siphash
-
-
diff --git a/dev-go/siphash/siphash-1.0.0.ebuild b/dev-go/siphash/siphash-1.0.0.ebuild
deleted file mode 100644
index 8fa945471411..000000000000
--- a/dev-go/siphash/siphash-1.0.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit golang-build golang-vcs-snapshot
-
-EGO_SRC=github.com/dchest/siphash
-EGO_PN=${EGO_SRC}/...
-EGIT_COMMIT="v${PV}"
-SRC_URI="https://github.com/dchest/siphash/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-DESCRIPTION="Go implementation of SipHash-2.4"
-HOMEPAGE="https://github.com/dchest/siphash"
-
-KEYWORDS="amd64 arm x86"
-
-LICENSE="CC0-1.0"
-SLOT="0"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
diff --git a/dev-go/siphash/siphash-1.2.1.ebuild b/dev-go/siphash/siphash-1.2.1.ebuild
deleted file mode 100644
index 41aeb76b88e0..000000000000
--- a/dev-go/siphash/siphash-1.2.1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit golang-build golang-vcs-snapshot
-
-EGO_SRC=github.com/dchest/siphash
-EGO_PN=${EGO_SRC}/...
-EGIT_COMMIT="v${PV}"
-SRC_URI="https://github.com/dchest/siphash/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-DESCRIPTION="Go implementation of SipHash-2.4"
-HOMEPAGE="https://github.com/dchest/siphash"
-
-KEYWORDS="amd64 arm x86"
-
-LICENSE="CC0-1.0"
-SLOT="0"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 12d5cf2c110c..c3a25ea6ddde 100644
Binary files a/dev-java/Manifest.gz and b/dev-java/Manifest.gz differ
diff --git a/dev-java/ant-antlr/Manifest b/dev-java/ant-antlr/Manifest
index fbf293080e33..55cdb859de95 100644
--- a/dev-java/ant-antlr/Manifest
+++ b/dev-java/ant-antlr/Manifest
@@ -1,2 +1,4 @@
DIST ant-1.10.8-gentoo.tar.bz2 6674 BLAKE2B da52696eb20d74f6c3d36bd57c60927d9044b637ff9de175695d57596ae2e747db509cbde7ec862f9e99f2cee564803232e0edd0755f931dc070b150c4e38b21 SHA512 de14a55105888bc30921418c0e6ef5dac340d3d02bfab35ca7a62021505df94e71fc05eb864ffc276add5a2fce483338fe2cf02fcc04e693bb5b709c6b080490
+DIST ant-1.10.9-gentoo.tar.bz2 6685 BLAKE2B 2249c7e1628052a2a6896c6995e0c5dd14ea77671ab0ef4402ece9968f41266cdf4411cd669dbb73c4d7043d7c6c5f6e992bfc2705e74899ff1058f0d4942704 SHA512 aade4c5322c29d1b6b4f6b99b229a1a07ff64faed104bdbbff3a82bd482d9cab5596c019dac92eaf4cab875fa9e46e5067ba816f910c2d6c94890ab85c50605b
DIST apache-ant-1.10.8-src.tar.bz2 4848256 BLAKE2B bd0668e5592c6d2e77233dcffbf2311f9b072f60e7a0c2d5b1a0a6567fc015e1fda46caf1c6c2a3a6730df561f87a8477e0df54a12eeab866cd8d4cb8b2d1f7e SHA512 15563c339298dc576ffb0fb59858bed5f6deabb519ad3f5237e465e6dffd5307bb86fc120f7d7893332936b9f767c47e522cdd1da809b599ceec0070dcb20338
+DIST apache-ant-1.10.9-src.tar.bz2 4593589 BLAKE2B afb73e592dbd4e0082f5890005ce70264ab9c59f1359a91cc83abcfb03938d98ed9d1eb797c9f72bd3d017a41c19635a6246e5b46ddcab660749a2530db1baaa SHA512 7a6c96131462dc0e1bcf41e2daa1b129a45d19302f4ee2915bb51c4cf347996fa5f8140f96653b21952decee16816476b8f258f8ad2c094a8305209cebcee4a4
diff --git a/dev-java/ant-antlr/ant-antlr-1.10.9.ebuild b/dev-java/ant-antlr/ant-antlr-1.10.9.ebuild
new file mode 100644
index 000000000000..5c9652cd583e
--- /dev/null
+++ b/dev-java/ant-antlr/ant-antlr-1.10.9.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ANT_TASK_JDKVER=1.8
+ANT_TASK_JREVER=1.8
+ANT_TASK_DEPNAME=""
+
+inherit ant-tasks
+
+DESCRIPTION="Apache Ant's optional tasks for Antlr"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+RDEPEND=">=dev-java/antlr-2.7.7-r7:0"
+
+src_install() {
+ ant-tasks_src_install
+ java-pkg_register-dependency antlr
+}
diff --git a/dev-java/ant-apache-bcel/Manifest b/dev-java/ant-apache-bcel/Manifest
index fbf293080e33..55cdb859de95 100644
--- a/dev-java/ant-apache-bcel/Manifest
+++ b/dev-java/ant-apache-bcel/Manifest
@@ -1,2 +1,4 @@
DIST ant-1.10.8-gentoo.tar.bz2 6674 BLAKE2B da52696eb20d74f6c3d36bd57c60927d9044b637ff9de175695d57596ae2e747db509cbde7ec862f9e99f2cee564803232e0edd0755f931dc070b150c4e38b21 SHA512 de14a55105888bc30921418c0e6ef5dac340d3d02bfab35ca7a62021505df94e71fc05eb864ffc276add5a2fce483338fe2cf02fcc04e693bb5b709c6b080490
+DIST ant-1.10.9-gentoo.tar.bz2 6685 BLAKE2B 2249c7e1628052a2a6896c6995e0c5dd14ea77671ab0ef4402ece9968f41266cdf4411cd669dbb73c4d7043d7c6c5f6e992bfc2705e74899ff1058f0d4942704 SHA512 aade4c5322c29d1b6b4f6b99b229a1a07ff64faed104bdbbff3a82bd482d9cab5596c019dac92eaf4cab875fa9e46e5067ba816f910c2d6c94890ab85c50605b
DIST apache-ant-1.10.8-src.tar.bz2 4848256 BLAKE2B bd0668e5592c6d2e77233dcffbf2311f9b072f60e7a0c2d5b1a0a6567fc015e1fda46caf1c6c2a3a6730df561f87a8477e0df54a12eeab866cd8d4cb8b2d1f7e SHA512 15563c339298dc576ffb0fb59858bed5f6deabb519ad3f5237e465e6dffd5307bb86fc120f7d7893332936b9f767c47e522cdd1da809b599ceec0070dcb20338
+DIST apache-ant-1.10.9-src.tar.bz2 4593589 BLAKE2B afb73e592dbd4e0082f5890005ce70264ab9c59f1359a91cc83abcfb03938d98ed9d1eb797c9f72bd3d017a41c19635a6246e5b46ddcab660749a2530db1baaa SHA512 7a6c96131462dc0e1bcf41e2daa1b129a45d19302f4ee2915bb51c4cf347996fa5f8140f96653b21952decee16816476b8f258f8ad2c094a8305209cebcee4a4
diff --git a/dev-java/ant-apache-bcel/ant-apache-bcel-1.10.9.ebuild b/dev-java/ant-apache-bcel/ant-apache-bcel-1.10.9.ebuild
new file mode 100644
index 000000000000..1dc654ff0b8d
--- /dev/null
+++ b/dev-java/ant-apache-bcel/ant-apache-bcel-1.10.9.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ANT_TASK_JDKVER=1.8
+ANT_TASK_JREVER=1.8
+ANT_TASK_DEPNAME="bcel"
+
+inherit ant-tasks
+
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+DEPEND=">=dev-java/bcel-5.1-r3:0"
+RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-apache-bsf/Manifest b/dev-java/ant-apache-bsf/Manifest
index fbf293080e33..55cdb859de95 100644
--- a/dev-java/ant-apache-bsf/Manifest
+++ b/dev-java/ant-apache-bsf/Manifest
@@ -1,2 +1,4 @@
DIST ant-1.10.8-gentoo.tar.bz2 6674 BLAKE2B da52696eb20d74f6c3d36bd57c60927d9044b637ff9de175695d57596ae2e747db509cbde7ec862f9e99f2cee564803232e0edd0755f931dc070b150c4e38b21 SHA512 de14a55105888bc30921418c0e6ef5dac340d3d02bfab35ca7a62021505df94e71fc05eb864ffc276add5a2fce483338fe2cf02fcc04e693bb5b709c6b080490
+DIST ant-1.10.9-gentoo.tar.bz2 6685 BLAKE2B 2249c7e1628052a2a6896c6995e0c5dd14ea77671ab0ef4402ece9968f41266cdf4411cd669dbb73c4d7043d7c6c5f6e992bfc2705e74899ff1058f0d4942704 SHA512 aade4c5322c29d1b6b4f6b99b229a1a07ff64faed104bdbbff3a82bd482d9cab5596c019dac92eaf4cab875fa9e46e5067ba816f910c2d6c94890ab85c50605b
DIST apache-ant-1.10.8-src.tar.bz2 4848256 BLAKE2B bd0668e5592c6d2e77233dcffbf2311f9b072f60e7a0c2d5b1a0a6567fc015e1fda46caf1c6c2a3a6730df561f87a8477e0df54a12eeab866cd8d4cb8b2d1f7e SHA512 15563c339298dc576ffb0fb59858bed5f6deabb519ad3f5237e465e6dffd5307bb86fc120f7d7893332936b9f767c47e522cdd1da809b599ceec0070dcb20338
+DIST apache-ant-1.10.9-src.tar.bz2 4593589 BLAKE2B afb73e592dbd4e0082f5890005ce70264ab9c59f1359a91cc83abcfb03938d98ed9d1eb797c9f72bd3d017a41c19635a6246e5b46ddcab660749a2530db1baaa SHA512 7a6c96131462dc0e1bcf41e2daa1b129a45d19302f4ee2915bb51c4cf347996fa5f8140f96653b21952decee16816476b8f258f8ad2c094a8305209cebcee4a4
diff --git a/dev-java/ant-apache-bsf/ant-apache-bsf-1.10.9.ebuild b/dev-java/ant-apache-bsf/ant-apache-bsf-1.10.9.ebuild
new file mode 100644
index 000000000000..4fd4bd7de77a
--- /dev/null
+++ b/dev-java/ant-apache-bsf/ant-apache-bsf-1.10.9.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ANT_TASK_JDKVER=1.8
+ANT_TASK_JREVER=1.8
+ANT_TASK_DEPNAME="bsf-2.3"
+
+inherit ant-tasks
+
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="python javascript tcl"
+
+DEPEND=">=dev-java/bsf-2.4.0-r1:2.3[python?,javascript?,tcl?]"
+RDEPEND="${DEPEND}"
+
+pkg_postinst() {
+ if [[ -z "${REPLACING_VERSIONS}" ]]; then
+ elog "Also, >=dev-java/bsf-2.4.0-r1 adds optional support for groovy,"
+ elog "ruby and beanshell. See its postinst elog messages for instructions."
+ fi
+}
diff --git a/dev-java/ant-apache-log4j/Manifest b/dev-java/ant-apache-log4j/Manifest
index fbf293080e33..55cdb859de95 100644
--- a/dev-java/ant-apache-log4j/Manifest
+++ b/dev-java/ant-apache-log4j/Manifest
@@ -1,2 +1,4 @@
DIST ant-1.10.8-gentoo.tar.bz2 6674 BLAKE2B da52696eb20d74f6c3d36bd57c60927d9044b637ff9de175695d57596ae2e747db509cbde7ec862f9e99f2cee564803232e0edd0755f931dc070b150c4e38b21 SHA512 de14a55105888bc30921418c0e6ef5dac340d3d02bfab35ca7a62021505df94e71fc05eb864ffc276add5a2fce483338fe2cf02fcc04e693bb5b709c6b080490
+DIST ant-1.10.9-gentoo.tar.bz2 6685 BLAKE2B 2249c7e1628052a2a6896c6995e0c5dd14ea77671ab0ef4402ece9968f41266cdf4411cd669dbb73c4d7043d7c6c5f6e992bfc2705e74899ff1058f0d4942704 SHA512 aade4c5322c29d1b6b4f6b99b229a1a07ff64faed104bdbbff3a82bd482d9cab5596c019dac92eaf4cab875fa9e46e5067ba816f910c2d6c94890ab85c50605b
DIST apache-ant-1.10.8-src.tar.bz2 4848256 BLAKE2B bd0668e5592c6d2e77233dcffbf2311f9b072f60e7a0c2d5b1a0a6567fc015e1fda46caf1c6c2a3a6730df561f87a8477e0df54a12eeab866cd8d4cb8b2d1f7e SHA512 15563c339298dc576ffb0fb59858bed5f6deabb519ad3f5237e465e6dffd5307bb86fc120f7d7893332936b9f767c47e522cdd1da809b599ceec0070dcb20338
+DIST apache-ant-1.10.9-src.tar.bz2 4593589 BLAKE2B afb73e592dbd4e0082f5890005ce70264ab9c59f1359a91cc83abcfb03938d98ed9d1eb797c9f72bd3d017a41c19635a6246e5b46ddcab660749a2530db1baaa SHA512 7a6c96131462dc0e1bcf41e2daa1b129a45d19302f4ee2915bb51c4cf347996fa5f8140f96653b21952decee16816476b8f258f8ad2c094a8305209cebcee4a4
diff --git a/dev-java/ant-apache-log4j/ant-apache-log4j-1.10.9.ebuild b/dev-java/ant-apache-log4j/ant-apache-log4j-1.10.9.ebuild
new file mode 100644
index 000000000000..ed32b97a9daa
--- /dev/null
+++ b/dev-java/ant-apache-log4j/ant-apache-log4j-1.10.9.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ANT_TASK_JDKVER=1.8
+ANT_TASK_JREVER=1.8
+ANT_TASK_DEPNAME="log4j"
+
+inherit ant-tasks
+
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+DEPEND=">=dev-java/log4j-1.2.13-r2:0"
+RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-apache-oro/Manifest b/dev-java/ant-apache-oro/Manifest
index fbf293080e33..55cdb859de95 100644
--- a/dev-java/ant-apache-oro/Manifest
+++ b/dev-java/ant-apache-oro/Manifest
@@ -1,2 +1,4 @@
DIST ant-1.10.8-gentoo.tar.bz2 6674 BLAKE2B da52696eb20d74f6c3d36bd57c60927d9044b637ff9de175695d57596ae2e747db509cbde7ec862f9e99f2cee564803232e0edd0755f931dc070b150c4e38b21 SHA512 de14a55105888bc30921418c0e6ef5dac340d3d02bfab35ca7a62021505df94e71fc05eb864ffc276add5a2fce483338fe2cf02fcc04e693bb5b709c6b080490
+DIST ant-1.10.9-gentoo.tar.bz2 6685 BLAKE2B 2249c7e1628052a2a6896c6995e0c5dd14ea77671ab0ef4402ece9968f41266cdf4411cd669dbb73c4d7043d7c6c5f6e992bfc2705e74899ff1058f0d4942704 SHA512 aade4c5322c29d1b6b4f6b99b229a1a07ff64faed104bdbbff3a82bd482d9cab5596c019dac92eaf4cab875fa9e46e5067ba816f910c2d6c94890ab85c50605b
DIST apache-ant-1.10.8-src.tar.bz2 4848256 BLAKE2B bd0668e5592c6d2e77233dcffbf2311f9b072f60e7a0c2d5b1a0a6567fc015e1fda46caf1c6c2a3a6730df561f87a8477e0df54a12eeab866cd8d4cb8b2d1f7e SHA512 15563c339298dc576ffb0fb59858bed5f6deabb519ad3f5237e465e6dffd5307bb86fc120f7d7893332936b9f767c47e522cdd1da809b599ceec0070dcb20338
+DIST apache-ant-1.10.9-src.tar.bz2 4593589 BLAKE2B afb73e592dbd4e0082f5890005ce70264ab9c59f1359a91cc83abcfb03938d98ed9d1eb797c9f72bd3d017a41c19635a6246e5b46ddcab660749a2530db1baaa SHA512 7a6c96131462dc0e1bcf41e2daa1b129a45d19302f4ee2915bb51c4cf347996fa5f8140f96653b21952decee16816476b8f258f8ad2c094a8305209cebcee4a4
diff --git a/dev-java/ant-apache-oro/ant-apache-oro-1.10.9.ebuild b/dev-java/ant-apache-oro/ant-apache-oro-1.10.9.ebuild
new file mode 100644
index 000000000000..98ea50b1d731
--- /dev/null
+++ b/dev-java/ant-apache-oro/ant-apache-oro-1.10.9.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ANT_TASK_JDKVER=1.8
+ANT_TASK_JREVER=1.8
+ANT_TASK_DEPNAME="jakarta-oro-2.0"
+
+inherit ant-tasks
+
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+DEPEND=">=dev-java/jakarta-oro-2.0.8-r2:2.0"
+RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-apache-regexp/Manifest b/dev-java/ant-apache-regexp/Manifest
index fbf293080e33..55cdb859de95 100644
--- a/dev-java/ant-apache-regexp/Manifest
+++ b/dev-java/ant-apache-regexp/Manifest
@@ -1,2 +1,4 @@
DIST ant-1.10.8-gentoo.tar.bz2 6674 BLAKE2B da52696eb20d74f6c3d36bd57c60927d9044b637ff9de175695d57596ae2e747db509cbde7ec862f9e99f2cee564803232e0edd0755f931dc070b150c4e38b21 SHA512 de14a55105888bc30921418c0e6ef5dac340d3d02bfab35ca7a62021505df94e71fc05eb864ffc276add5a2fce483338fe2cf02fcc04e693bb5b709c6b080490
+DIST ant-1.10.9-gentoo.tar.bz2 6685 BLAKE2B 2249c7e1628052a2a6896c6995e0c5dd14ea77671ab0ef4402ece9968f41266cdf4411cd669dbb73c4d7043d7c6c5f6e992bfc2705e74899ff1058f0d4942704 SHA512 aade4c5322c29d1b6b4f6b99b229a1a07ff64faed104bdbbff3a82bd482d9cab5596c019dac92eaf4cab875fa9e46e5067ba816f910c2d6c94890ab85c50605b
DIST apache-ant-1.10.8-src.tar.bz2 4848256 BLAKE2B bd0668e5592c6d2e77233dcffbf2311f9b072f60e7a0c2d5b1a0a6567fc015e1fda46caf1c6c2a3a6730df561f87a8477e0df54a12eeab866cd8d4cb8b2d1f7e SHA512 15563c339298dc576ffb0fb59858bed5f6deabb519ad3f5237e465e6dffd5307bb86fc120f7d7893332936b9f767c47e522cdd1da809b599ceec0070dcb20338
+DIST apache-ant-1.10.9-src.tar.bz2 4593589 BLAKE2B afb73e592dbd4e0082f5890005ce70264ab9c59f1359a91cc83abcfb03938d98ed9d1eb797c9f72bd3d017a41c19635a6246e5b46ddcab660749a2530db1baaa SHA512 7a6c96131462dc0e1bcf41e2daa1b129a45d19302f4ee2915bb51c4cf347996fa5f8140f96653b21952decee16816476b8f258f8ad2c094a8305209cebcee4a4
diff --git a/dev-java/ant-apache-regexp/ant-apache-regexp-1.10.9.ebuild b/dev-java/ant-apache-regexp/ant-apache-regexp-1.10.9.ebuild
new file mode 100644
index 000000000000..b098bce35acd
--- /dev/null
+++ b/dev-java/ant-apache-regexp/ant-apache-regexp-1.10.9.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ANT_TASK_JDKVER=1.8
+ANT_TASK_JREVER=1.8
+ANT_TASK_DEPNAME="jakarta-regexp-1.4"
+
+inherit ant-tasks
+
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+DEPEND=">=dev-java/jakarta-regexp-1.4-r1:1.4"
+RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-apache-resolver/Manifest b/dev-java/ant-apache-resolver/Manifest
index fbf293080e33..55cdb859de95 100644
--- a/dev-java/ant-apache-resolver/Manifest
+++ b/dev-java/ant-apache-resolver/Manifest
@@ -1,2 +1,4 @@
DIST ant-1.10.8-gentoo.tar.bz2 6674 BLAKE2B da52696eb20d74f6c3d36bd57c60927d9044b637ff9de175695d57596ae2e747db509cbde7ec862f9e99f2cee564803232e0edd0755f931dc070b150c4e38b21 SHA512 de14a55105888bc30921418c0e6ef5dac340d3d02bfab35ca7a62021505df94e71fc05eb864ffc276add5a2fce483338fe2cf02fcc04e693bb5b709c6b080490
+DIST ant-1.10.9-gentoo.tar.bz2 6685 BLAKE2B 2249c7e1628052a2a6896c6995e0c5dd14ea77671ab0ef4402ece9968f41266cdf4411cd669dbb73c4d7043d7c6c5f6e992bfc2705e74899ff1058f0d4942704 SHA512 aade4c5322c29d1b6b4f6b99b229a1a07ff64faed104bdbbff3a82bd482d9cab5596c019dac92eaf4cab875fa9e46e5067ba816f910c2d6c94890ab85c50605b
DIST apache-ant-1.10.8-src.tar.bz2 4848256 BLAKE2B bd0668e5592c6d2e77233dcffbf2311f9b072f60e7a0c2d5b1a0a6567fc015e1fda46caf1c6c2a3a6730df561f87a8477e0df54a12eeab866cd8d4cb8b2d1f7e SHA512 15563c339298dc576ffb0fb59858bed5f6deabb519ad3f5237e465e6dffd5307bb86fc120f7d7893332936b9f767c47e522cdd1da809b599ceec0070dcb20338
+DIST apache-ant-1.10.9-src.tar.bz2 4593589 BLAKE2B afb73e592dbd4e0082f5890005ce70264ab9c59f1359a91cc83abcfb03938d98ed9d1eb797c9f72bd3d017a41c19635a6246e5b46ddcab660749a2530db1baaa SHA512 7a6c96131462dc0e1bcf41e2daa1b129a45d19302f4ee2915bb51c4cf347996fa5f8140f96653b21952decee16816476b8f258f8ad2c094a8305209cebcee4a4
diff --git a/dev-java/ant-apache-resolver/ant-apache-resolver-1.10.9.ebuild b/dev-java/ant-apache-resolver/ant-apache-resolver-1.10.9.ebuild
new file mode 100644
index 000000000000..12677e429825
--- /dev/null
+++ b/dev-java/ant-apache-resolver/ant-apache-resolver-1.10.9.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ANT_TASK_JDKVER=1.8
+ANT_TASK_JREVER=1.8
+ANT_TASK_DEPNAME="xml-commons-resolver"
+
+inherit ant-tasks
+
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+DEPEND=">=dev-java/xml-commons-resolver-1.2:0"
+RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-apache-xalan2/Manifest b/dev-java/ant-apache-xalan2/Manifest
index fbf293080e33..55cdb859de95 100644
--- a/dev-java/ant-apache-xalan2/Manifest
+++ b/dev-java/ant-apache-xalan2/Manifest
@@ -1,2 +1,4 @@
DIST ant-1.10.8-gentoo.tar.bz2 6674 BLAKE2B da52696eb20d74f6c3d36bd57c60927d9044b637ff9de175695d57596ae2e747db509cbde7ec862f9e99f2cee564803232e0edd0755f931dc070b150c4e38b21 SHA512 de14a55105888bc30921418c0e6ef5dac340d3d02bfab35ca7a62021505df94e71fc05eb864ffc276add5a2fce483338fe2cf02fcc04e693bb5b709c6b080490
+DIST ant-1.10.9-gentoo.tar.bz2 6685 BLAKE2B 2249c7e1628052a2a6896c6995e0c5dd14ea77671ab0ef4402ece9968f41266cdf4411cd669dbb73c4d7043d7c6c5f6e992bfc2705e74899ff1058f0d4942704 SHA512 aade4c5322c29d1b6b4f6b99b229a1a07ff64faed104bdbbff3a82bd482d9cab5596c019dac92eaf4cab875fa9e46e5067ba816f910c2d6c94890ab85c50605b
DIST apache-ant-1.10.8-src.tar.bz2 4848256 BLAKE2B bd0668e5592c6d2e77233dcffbf2311f9b072f60e7a0c2d5b1a0a6567fc015e1fda46caf1c6c2a3a6730df561f87a8477e0df54a12eeab866cd8d4cb8b2d1f7e SHA512 15563c339298dc576ffb0fb59858bed5f6deabb519ad3f5237e465e6dffd5307bb86fc120f7d7893332936b9f767c47e522cdd1da809b599ceec0070dcb20338
+DIST apache-ant-1.10.9-src.tar.bz2 4593589 BLAKE2B afb73e592dbd4e0082f5890005ce70264ab9c59f1359a91cc83abcfb03938d98ed9d1eb797c9f72bd3d017a41c19635a6246e5b46ddcab660749a2530db1baaa SHA512 7a6c96131462dc0e1bcf41e2daa1b129a45d19302f4ee2915bb51c4cf347996fa5f8140f96653b21952decee16816476b8f258f8ad2c094a8305209cebcee4a4
diff --git a/dev-java/ant-apache-xalan2/ant-apache-xalan2-1.10.9.ebuild b/dev-java/ant-apache-xalan2/ant-apache-xalan2-1.10.9.ebuild
new file mode 100644
index 000000000000..69c89e747407
--- /dev/null
+++ b/dev-java/ant-apache-xalan2/ant-apache-xalan2-1.10.9.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ANT_TASK_JDKVER=1.8
+ANT_TASK_JREVER=1.8
+ANT_TASK_DEPNAME="xalan"
+
+inherit ant-tasks
+
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+DEPEND="dev-java/xalan:0
+ dev-java/xalan-serializer:0"
+
+RDEPEND="${DEPEND}"
+
+src_unpack() {
+ ant-tasks_src_unpack all
+ java-pkg_jar-from xalan-serializer
+}
diff --git a/dev-java/ant-commons-logging/Manifest b/dev-java/ant-commons-logging/Manifest
index fbf293080e33..55cdb859de95 100644
--- a/dev-java/ant-commons-logging/Manifest
+++ b/dev-java/ant-commons-logging/Manifest
@@ -1,2 +1,4 @@
DIST ant-1.10.8-gentoo.tar.bz2 6674 BLAKE2B da52696eb20d74f6c3d36bd57c60927d9044b637ff9de175695d57596ae2e747db509cbde7ec862f9e99f2cee564803232e0edd0755f931dc070b150c4e38b21 SHA512 de14a55105888bc30921418c0e6ef5dac340d3d02bfab35ca7a62021505df94e71fc05eb864ffc276add5a2fce483338fe2cf02fcc04e693bb5b709c6b080490
+DIST ant-1.10.9-gentoo.tar.bz2 6685 BLAKE2B 2249c7e1628052a2a6896c6995e0c5dd14ea77671ab0ef4402ece9968f41266cdf4411cd669dbb73c4d7043d7c6c5f6e992bfc2705e74899ff1058f0d4942704 SHA512 aade4c5322c29d1b6b4f6b99b229a1a07ff64faed104bdbbff3a82bd482d9cab5596c019dac92eaf4cab875fa9e46e5067ba816f910c2d6c94890ab85c50605b
DIST apache-ant-1.10.8-src.tar.bz2 4848256 BLAKE2B bd0668e5592c6d2e77233dcffbf2311f9b072f60e7a0c2d5b1a0a6567fc015e1fda46caf1c6c2a3a6730df561f87a8477e0df54a12eeab866cd8d4cb8b2d1f7e SHA512 15563c339298dc576ffb0fb59858bed5f6deabb519ad3f5237e465e6dffd5307bb86fc120f7d7893332936b9f767c47e522cdd1da809b599ceec0070dcb20338
+DIST apache-ant-1.10.9-src.tar.bz2 4593589 BLAKE2B afb73e592dbd4e0082f5890005ce70264ab9c59f1359a91cc83abcfb03938d98ed9d1eb797c9f72bd3d017a41c19635a6246e5b46ddcab660749a2530db1baaa SHA512 7a6c96131462dc0e1bcf41e2daa1b129a45d19302f4ee2915bb51c4cf347996fa5f8140f96653b21952decee16816476b8f258f8ad2c094a8305209cebcee4a4
diff --git a/dev-java/ant-commons-logging/ant-commons-logging-1.10.9.ebuild b/dev-java/ant-commons-logging/ant-commons-logging-1.10.9.ebuild
new file mode 100644
index 000000000000..945cd57c2845
--- /dev/null
+++ b/dev-java/ant-commons-logging/ant-commons-logging-1.10.9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ANT_TASK_JDKVER=1.8
+ANT_TASK_JREVER=1.8
+
+inherit ant-tasks
+
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+DEPEND=">=dev-java/commons-logging-1.0.4-r2:0"
+RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-commons-net/Manifest b/dev-java/ant-commons-net/Manifest
index fbf293080e33..55cdb859de95 100644
--- a/dev-java/ant-commons-net/Manifest
+++ b/dev-java/ant-commons-net/Manifest
@@ -1,2 +1,4 @@
DIST ant-1.10.8-gentoo.tar.bz2 6674 BLAKE2B da52696eb20d74f6c3d36bd57c60927d9044b637ff9de175695d57596ae2e747db509cbde7ec862f9e99f2cee564803232e0edd0755f931dc070b150c4e38b21 SHA512 de14a55105888bc30921418c0e6ef5dac340d3d02bfab35ca7a62021505df94e71fc05eb864ffc276add5a2fce483338fe2cf02fcc04e693bb5b709c6b080490
+DIST ant-1.10.9-gentoo.tar.bz2 6685 BLAKE2B 2249c7e1628052a2a6896c6995e0c5dd14ea77671ab0ef4402ece9968f41266cdf4411cd669dbb73c4d7043d7c6c5f6e992bfc2705e74899ff1058f0d4942704 SHA512 aade4c5322c29d1b6b4f6b99b229a1a07ff64faed104bdbbff3a82bd482d9cab5596c019dac92eaf4cab875fa9e46e5067ba816f910c2d6c94890ab85c50605b
DIST apache-ant-1.10.8-src.tar.bz2 4848256 BLAKE2B bd0668e5592c6d2e77233dcffbf2311f9b072f60e7a0c2d5b1a0a6567fc015e1fda46caf1c6c2a3a6730df561f87a8477e0df54a12eeab866cd8d4cb8b2d1f7e SHA512 15563c339298dc576ffb0fb59858bed5f6deabb519ad3f5237e465e6dffd5307bb86fc120f7d7893332936b9f767c47e522cdd1da809b599ceec0070dcb20338
+DIST apache-ant-1.10.9-src.tar.bz2 4593589 BLAKE2B afb73e592dbd4e0082f5890005ce70264ab9c59f1359a91cc83abcfb03938d98ed9d1eb797c9f72bd3d017a41c19635a6246e5b46ddcab660749a2530db1baaa SHA512 7a6c96131462dc0e1bcf41e2daa1b129a45d19302f4ee2915bb51c4cf347996fa5f8140f96653b21952decee16816476b8f258f8ad2c094a8305209cebcee4a4
diff --git a/dev-java/ant-commons-net/ant-commons-net-1.10.9.ebuild b/dev-java/ant-commons-net/ant-commons-net-1.10.9.ebuild
new file mode 100644
index 000000000000..ef7f3b2a5bea
--- /dev/null
+++ b/dev-java/ant-commons-net/ant-commons-net-1.10.9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ANT_TASK_JDKVER=1.8
+ANT_TASK_JREVER=1.8
+
+inherit ant-tasks
+
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+DEPEND=">=dev-java/commons-net-1.4.1-r1:0"
+RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-core/Manifest b/dev-java/ant-core/Manifest
index fbf293080e33..55cdb859de95 100644
--- a/dev-java/ant-core/Manifest
+++ b/dev-java/ant-core/Manifest
@@ -1,2 +1,4 @@
DIST ant-1.10.8-gentoo.tar.bz2 6674 BLAKE2B da52696eb20d74f6c3d36bd57c60927d9044b637ff9de175695d57596ae2e747db509cbde7ec862f9e99f2cee564803232e0edd0755f931dc070b150c4e38b21 SHA512 de14a55105888bc30921418c0e6ef5dac340d3d02bfab35ca7a62021505df94e71fc05eb864ffc276add5a2fce483338fe2cf02fcc04e693bb5b709c6b080490
+DIST ant-1.10.9-gentoo.tar.bz2 6685 BLAKE2B 2249c7e1628052a2a6896c6995e0c5dd14ea77671ab0ef4402ece9968f41266cdf4411cd669dbb73c4d7043d7c6c5f6e992bfc2705e74899ff1058f0d4942704 SHA512 aade4c5322c29d1b6b4f6b99b229a1a07ff64faed104bdbbff3a82bd482d9cab5596c019dac92eaf4cab875fa9e46e5067ba816f910c2d6c94890ab85c50605b
DIST apache-ant-1.10.8-src.tar.bz2 4848256 BLAKE2B bd0668e5592c6d2e77233dcffbf2311f9b072f60e7a0c2d5b1a0a6567fc015e1fda46caf1c6c2a3a6730df561f87a8477e0df54a12eeab866cd8d4cb8b2d1f7e SHA512 15563c339298dc576ffb0fb59858bed5f6deabb519ad3f5237e465e6dffd5307bb86fc120f7d7893332936b9f767c47e522cdd1da809b599ceec0070dcb20338
+DIST apache-ant-1.10.9-src.tar.bz2 4593589 BLAKE2B afb73e592dbd4e0082f5890005ce70264ab9c59f1359a91cc83abcfb03938d98ed9d1eb797c9f72bd3d017a41c19635a6246e5b46ddcab660749a2530db1baaa SHA512 7a6c96131462dc0e1bcf41e2daa1b129a45d19302f4ee2915bb51c4cf347996fa5f8140f96653b21952decee16816476b8f258f8ad2c094a8305209cebcee4a4
diff --git a/dev-java/ant-core/ant-core-1.10.9.ebuild b/dev-java/ant-core/ant-core-1.10.9.ebuild
new file mode 100644
index 000000000000..b7a55bbe6631
--- /dev/null
+++ b/dev-java/ant-core/ant-core-1.10.9.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# Don't depend on itself.
+JAVA_ANT_DISABLE_ANT_CORE_DEP="true"
+
+# Rewriting build.xml files for the testcases has no use at the moment.
+JAVA_PKG_BSFIX_ALL="no"
+JAVA_PKG_IUSE="doc source"
+
+inherit eutils java-pkg-2 java-ant-2 prefix
+
+MY_P="apache-ant-${PV}"
+
+DESCRIPTION="Java-based build tool similar to 'make' that uses XML configuration files"
+HOMEPAGE="https://ant.apache.org/"
+SRC_URI="https://archive.apache.org/dist/ant/source/${MY_P}-src.tar.bz2
+ https://dev.gentoo.org/~fordfrog/distfiles/ant-${PV}-gentoo.tar.bz2"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+CDEPEND=">=virtual/jdk-1.8:*"
+DEPEND="${CDEPEND}"
+RDEPEND="${CDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+RESTRICT="test"
+
+PATCHES=(
+ "${WORKDIR}/${PV}-build.patch"
+ "${WORKDIR}/${PV}-launch.patch"
+)
+
+src_prepare() {
+ default
+
+ eprefixify "${S}/src/script/ant"
+
+ # Fixes bug 556008.
+ java-ant_xml-rewrite -f build.xml \
+ -c -e javadoc \
+ -a failonerror \
+ -v "false"
+
+ # See bug #196080 for more details.
+ java-ant_bsfix_one build.xml
+ java-pkg-2_src_prepare
+
+ # Remove JDK9+ stuff
+ einfo "Removing JDK9+ classes (Jmod and Link)"
+ rm "${S}"/src/main/org/apache/tools/ant/taskdefs/modules/{Jmod,Link}.java
+}
+
+src_compile() {
+ export ANT_HOME=""
+ # Avoid error message that package ant-core was not found
+ export ANT_TASKS="none"
+
+ local bsyscp
+
+ # This ensures that when building ant with bootstrapped ant,
+ # only the source is used for resolving references, and not
+ # the classes in bootstrapped ant but jikes in kaffe has issues with this...
+ if ! java-pkg_current-vm-matches kaffe; then
+ bsyscp="-Dbuild.sysclasspath=ignore"
+ fi
+
+ CLASSPATH="$(java-config -t)" ./build.sh ${bsyscp} jars dist-internal \
+ $(use_doc javadocs) || die "build failed"
+}
+
+src_install() {
+ dodir /usr/share/ant/lib
+
+ for jar in ant.jar ant-bootstrap.jar ant-launcher.jar ; do
+ java-pkg_dojar build/lib/${jar}
+ dosym ../../${PN}/lib/${jar} /usr/share/ant/lib/${jar}
+ done
+
+ dobin src/script/ant
+
+ dodir /usr/share/${PN}/bin
+ for each in antRun antRun.pl runant.pl runant.py ; do
+ dobin "${S}/src/script/${each}"
+ dosym ../../../bin/${each} /usr/share/${PN}/bin/${each}
+ done
+ dosym ../${PN}/bin /usr/share/ant/bin
+
+ insinto /usr/share/${PN}
+ doins -r dist/etc
+ dosym ../${PN}/etc /usr/share/ant/etc
+
+ echo "ANT_HOME=\"${EPREFIX}/usr/share/ant\"" > "${T}/20ant"
+ doenvd "${T}/20ant"
+
+ dodoc NOTICE README WHATSNEW KEYS
+
+ if use doc; then
+ dodoc -r manual/*
+ java-pkg_dojavadoc --symlink manual/api build/javadocs
+ fi
+
+ use source && java-pkg_dosrc src/main/*
+}
diff --git a/dev-java/ant-jai/Manifest b/dev-java/ant-jai/Manifest
index fbf293080e33..55cdb859de95 100644
--- a/dev-java/ant-jai/Manifest
+++ b/dev-java/ant-jai/Manifest
@@ -1,2 +1,4 @@
DIST ant-1.10.8-gentoo.tar.bz2 6674 BLAKE2B da52696eb20d74f6c3d36bd57c60927d9044b637ff9de175695d57596ae2e747db509cbde7ec862f9e99f2cee564803232e0edd0755f931dc070b150c4e38b21 SHA512 de14a55105888bc30921418c0e6ef5dac340d3d02bfab35ca7a62021505df94e71fc05eb864ffc276add5a2fce483338fe2cf02fcc04e693bb5b709c6b080490
+DIST ant-1.10.9-gentoo.tar.bz2 6685 BLAKE2B 2249c7e1628052a2a6896c6995e0c5dd14ea77671ab0ef4402ece9968f41266cdf4411cd669dbb73c4d7043d7c6c5f6e992bfc2705e74899ff1058f0d4942704 SHA512 aade4c5322c29d1b6b4f6b99b229a1a07ff64faed104bdbbff3a82bd482d9cab5596c019dac92eaf4cab875fa9e46e5067ba816f910c2d6c94890ab85c50605b
DIST apache-ant-1.10.8-src.tar.bz2 4848256 BLAKE2B bd0668e5592c6d2e77233dcffbf2311f9b072f60e7a0c2d5b1a0a6567fc015e1fda46caf1c6c2a3a6730df561f87a8477e0df54a12eeab866cd8d4cb8b2d1f7e SHA512 15563c339298dc576ffb0fb59858bed5f6deabb519ad3f5237e465e6dffd5307bb86fc120f7d7893332936b9f767c47e522cdd1da809b599ceec0070dcb20338
+DIST apache-ant-1.10.9-src.tar.bz2 4593589 BLAKE2B afb73e592dbd4e0082f5890005ce70264ab9c59f1359a91cc83abcfb03938d98ed9d1eb797c9f72bd3d017a41c19635a6246e5b46ddcab660749a2530db1baaa SHA512 7a6c96131462dc0e1bcf41e2daa1b129a45d19302f4ee2915bb51c4cf347996fa5f8140f96653b21952decee16816476b8f258f8ad2c094a8305209cebcee4a4
diff --git a/dev-java/ant-jai/ant-jai-1.10.9.ebuild b/dev-java/ant-jai/ant-jai-1.10.9.ebuild
new file mode 100644
index 000000000000..944faa9eca69
--- /dev/null
+++ b/dev-java/ant-jai/ant-jai-1.10.9.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ANT_TASK_JDKVER=1.8
+ANT_TASK_JREVER=1.8
+ANT_TASK_DEPNAME="sun-jai-bin"
+
+inherit ant-tasks
+
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+# Unmigrated, has textrels and there's also some source one now too.
+DEPEND=">=dev-java/sun-jai-bin-1.1.2.01-r1"
+RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-javamail/Manifest b/dev-java/ant-javamail/Manifest
index fbf293080e33..55cdb859de95 100644
--- a/dev-java/ant-javamail/Manifest
+++ b/dev-java/ant-javamail/Manifest
@@ -1,2 +1,4 @@
DIST ant-1.10.8-gentoo.tar.bz2 6674 BLAKE2B da52696eb20d74f6c3d36bd57c60927d9044b637ff9de175695d57596ae2e747db509cbde7ec862f9e99f2cee564803232e0edd0755f931dc070b150c4e38b21 SHA512 de14a55105888bc30921418c0e6ef5dac340d3d02bfab35ca7a62021505df94e71fc05eb864ffc276add5a2fce483338fe2cf02fcc04e693bb5b709c6b080490
+DIST ant-1.10.9-gentoo.tar.bz2 6685 BLAKE2B 2249c7e1628052a2a6896c6995e0c5dd14ea77671ab0ef4402ece9968f41266cdf4411cd669dbb73c4d7043d7c6c5f6e992bfc2705e74899ff1058f0d4942704 SHA512 aade4c5322c29d1b6b4f6b99b229a1a07ff64faed104bdbbff3a82bd482d9cab5596c019dac92eaf4cab875fa9e46e5067ba816f910c2d6c94890ab85c50605b
DIST apache-ant-1.10.8-src.tar.bz2 4848256 BLAKE2B bd0668e5592c6d2e77233dcffbf2311f9b072f60e7a0c2d5b1a0a6567fc015e1fda46caf1c6c2a3a6730df561f87a8477e0df54a12eeab866cd8d4cb8b2d1f7e SHA512 15563c339298dc576ffb0fb59858bed5f6deabb519ad3f5237e465e6dffd5307bb86fc120f7d7893332936b9f767c47e522cdd1da809b599ceec0070dcb20338
+DIST apache-ant-1.10.9-src.tar.bz2 4593589 BLAKE2B afb73e592dbd4e0082f5890005ce70264ab9c59f1359a91cc83abcfb03938d98ed9d1eb797c9f72bd3d017a41c19635a6246e5b46ddcab660749a2530db1baaa SHA512 7a6c96131462dc0e1bcf41e2daa1b129a45d19302f4ee2915bb51c4cf347996fa5f8140f96653b21952decee16816476b8f258f8ad2c094a8305209cebcee4a4
diff --git a/dev-java/ant-javamail/ant-javamail-1.10.9.ebuild b/dev-java/ant-javamail/ant-javamail-1.10.9.ebuild
new file mode 100644
index 000000000000..43f91c21316d
--- /dev/null
+++ b/dev-java/ant-javamail/ant-javamail-1.10.9.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ANT_TASK_JDKVER=1.8
+ANT_TASK_JREVER=1.8
+ANT_TASK_DEPNAME=( "gnu-jaf-1" "oracle-javamail" )
+
+inherit ant-tasks
+
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+# needs some classes from javax.activation.* which are not in jdk 11
+DEPEND="virtual/jdk:1.8
+ dev-java/gnu-jaf:1
+ dev-java/oracle-javamail:0"
+RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-jdepend/Manifest b/dev-java/ant-jdepend/Manifest
index fbf293080e33..55cdb859de95 100644
--- a/dev-java/ant-jdepend/Manifest
+++ b/dev-java/ant-jdepend/Manifest
@@ -1,2 +1,4 @@
DIST ant-1.10.8-gentoo.tar.bz2 6674 BLAKE2B da52696eb20d74f6c3d36bd57c60927d9044b637ff9de175695d57596ae2e747db509cbde7ec862f9e99f2cee564803232e0edd0755f931dc070b150c4e38b21 SHA512 de14a55105888bc30921418c0e6ef5dac340d3d02bfab35ca7a62021505df94e71fc05eb864ffc276add5a2fce483338fe2cf02fcc04e693bb5b709c6b080490
+DIST ant-1.10.9-gentoo.tar.bz2 6685 BLAKE2B 2249c7e1628052a2a6896c6995e0c5dd14ea77671ab0ef4402ece9968f41266cdf4411cd669dbb73c4d7043d7c6c5f6e992bfc2705e74899ff1058f0d4942704 SHA512 aade4c5322c29d1b6b4f6b99b229a1a07ff64faed104bdbbff3a82bd482d9cab5596c019dac92eaf4cab875fa9e46e5067ba816f910c2d6c94890ab85c50605b
DIST apache-ant-1.10.8-src.tar.bz2 4848256 BLAKE2B bd0668e5592c6d2e77233dcffbf2311f9b072f60e7a0c2d5b1a0a6567fc015e1fda46caf1c6c2a3a6730df561f87a8477e0df54a12eeab866cd8d4cb8b2d1f7e SHA512 15563c339298dc576ffb0fb59858bed5f6deabb519ad3f5237e465e6dffd5307bb86fc120f7d7893332936b9f767c47e522cdd1da809b599ceec0070dcb20338
+DIST apache-ant-1.10.9-src.tar.bz2 4593589 BLAKE2B afb73e592dbd4e0082f5890005ce70264ab9c59f1359a91cc83abcfb03938d98ed9d1eb797c9f72bd3d017a41c19635a6246e5b46ddcab660749a2530db1baaa SHA512 7a6c96131462dc0e1bcf41e2daa1b129a45d19302f4ee2915bb51c4cf347996fa5f8140f96653b21952decee16816476b8f258f8ad2c094a8305209cebcee4a4
diff --git a/dev-java/ant-jdepend/ant-jdepend-1.10.9.ebuild b/dev-java/ant-jdepend/ant-jdepend-1.10.9.ebuild
new file mode 100644
index 000000000000..7d83e53d76be
--- /dev/null
+++ b/dev-java/ant-jdepend/ant-jdepend-1.10.9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ANT_TASK_JDKVER=1.8
+ANT_TASK_JREVER=1.8
+
+inherit ant-tasks
+
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+DEPEND=">=dev-java/jdepend-2.9-r2:0"
+RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-jmf/Manifest b/dev-java/ant-jmf/Manifest
index fbf293080e33..55cdb859de95 100644
--- a/dev-java/ant-jmf/Manifest
+++ b/dev-java/ant-jmf/Manifest
@@ -1,2 +1,4 @@
DIST ant-1.10.8-gentoo.tar.bz2 6674 BLAKE2B da52696eb20d74f6c3d36bd57c60927d9044b637ff9de175695d57596ae2e747db509cbde7ec862f9e99f2cee564803232e0edd0755f931dc070b150c4e38b21 SHA512 de14a55105888bc30921418c0e6ef5dac340d3d02bfab35ca7a62021505df94e71fc05eb864ffc276add5a2fce483338fe2cf02fcc04e693bb5b709c6b080490
+DIST ant-1.10.9-gentoo.tar.bz2 6685 BLAKE2B 2249c7e1628052a2a6896c6995e0c5dd14ea77671ab0ef4402ece9968f41266cdf4411cd669dbb73c4d7043d7c6c5f6e992bfc2705e74899ff1058f0d4942704 SHA512 aade4c5322c29d1b6b4f6b99b229a1a07ff64faed104bdbbff3a82bd482d9cab5596c019dac92eaf4cab875fa9e46e5067ba816f910c2d6c94890ab85c50605b
DIST apache-ant-1.10.8-src.tar.bz2 4848256 BLAKE2B bd0668e5592c6d2e77233dcffbf2311f9b072f60e7a0c2d5b1a0a6567fc015e1fda46caf1c6c2a3a6730df561f87a8477e0df54a12eeab866cd8d4cb8b2d1f7e SHA512 15563c339298dc576ffb0fb59858bed5f6deabb519ad3f5237e465e6dffd5307bb86fc120f7d7893332936b9f767c47e522cdd1da809b599ceec0070dcb20338
+DIST apache-ant-1.10.9-src.tar.bz2 4593589 BLAKE2B afb73e592dbd4e0082f5890005ce70264ab9c59f1359a91cc83abcfb03938d98ed9d1eb797c9f72bd3d017a41c19635a6246e5b46ddcab660749a2530db1baaa SHA512 7a6c96131462dc0e1bcf41e2daa1b129a45d19302f4ee2915bb51c4cf347996fa5f8140f96653b21952decee16816476b8f258f8ad2c094a8305209cebcee4a4
diff --git a/dev-java/ant-jmf/ant-jmf-1.10.9.ebuild b/dev-java/ant-jmf/ant-jmf-1.10.9.ebuild
new file mode 100644
index 000000000000..8e604704a6f3
--- /dev/null
+++ b/dev-java/ant-jmf/ant-jmf-1.10.9.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ANT_TASK_JDKVER=1.8
+ANT_TASK_JREVER=1.8
+# Seems we don't need to depend on jmf-bin, the classes ant imports are in J2SE
+# API since version 1.3.
+ANT_TASK_DEPNAME=""
+
+inherit ant-tasks
+
+DESCRIPTION="Apache Ant's optional tasks for the Java Media Framework (JMF)"
+
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
diff --git a/dev-java/ant-jsch/Manifest b/dev-java/ant-jsch/Manifest
index fbf293080e33..55cdb859de95 100644
--- a/dev-java/ant-jsch/Manifest
+++ b/dev-java/ant-jsch/Manifest
@@ -1,2 +1,4 @@
DIST ant-1.10.8-gentoo.tar.bz2 6674 BLAKE2B da52696eb20d74f6c3d36bd57c60927d9044b637ff9de175695d57596ae2e747db509cbde7ec862f9e99f2cee564803232e0edd0755f931dc070b150c4e38b21 SHA512 de14a55105888bc30921418c0e6ef5dac340d3d02bfab35ca7a62021505df94e71fc05eb864ffc276add5a2fce483338fe2cf02fcc04e693bb5b709c6b080490
+DIST ant-1.10.9-gentoo.tar.bz2 6685 BLAKE2B 2249c7e1628052a2a6896c6995e0c5dd14ea77671ab0ef4402ece9968f41266cdf4411cd669dbb73c4d7043d7c6c5f6e992bfc2705e74899ff1058f0d4942704 SHA512 aade4c5322c29d1b6b4f6b99b229a1a07ff64faed104bdbbff3a82bd482d9cab5596c019dac92eaf4cab875fa9e46e5067ba816f910c2d6c94890ab85c50605b
DIST apache-ant-1.10.8-src.tar.bz2 4848256 BLAKE2B bd0668e5592c6d2e77233dcffbf2311f9b072f60e7a0c2d5b1a0a6567fc015e1fda46caf1c6c2a3a6730df561f87a8477e0df54a12eeab866cd8d4cb8b2d1f7e SHA512 15563c339298dc576ffb0fb59858bed5f6deabb519ad3f5237e465e6dffd5307bb86fc120f7d7893332936b9f767c47e522cdd1da809b599ceec0070dcb20338
+DIST apache-ant-1.10.9-src.tar.bz2 4593589 BLAKE2B afb73e592dbd4e0082f5890005ce70264ab9c59f1359a91cc83abcfb03938d98ed9d1eb797c9f72bd3d017a41c19635a6246e5b46ddcab660749a2530db1baaa SHA512 7a6c96131462dc0e1bcf41e2daa1b129a45d19302f4ee2915bb51c4cf347996fa5f8140f96653b21952decee16816476b8f258f8ad2c094a8305209cebcee4a4
diff --git a/dev-java/ant-jsch/ant-jsch-1.10.9.ebuild b/dev-java/ant-jsch/ant-jsch-1.10.9.ebuild
new file mode 100644
index 000000000000..d6a324a766ef
--- /dev/null
+++ b/dev-java/ant-jsch/ant-jsch-1.10.9.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ANT_TASK_JDKVER=1.8
+ANT_TASK_JREVER=1.8
+
+inherit ant-tasks
+
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+DEPEND=">=dev-java/jsch-0.1.37:0"
+RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-junit/Manifest b/dev-java/ant-junit/Manifest
index fbf293080e33..55cdb859de95 100644
--- a/dev-java/ant-junit/Manifest
+++ b/dev-java/ant-junit/Manifest
@@ -1,2 +1,4 @@
DIST ant-1.10.8-gentoo.tar.bz2 6674 BLAKE2B da52696eb20d74f6c3d36bd57c60927d9044b637ff9de175695d57596ae2e747db509cbde7ec862f9e99f2cee564803232e0edd0755f931dc070b150c4e38b21 SHA512 de14a55105888bc30921418c0e6ef5dac340d3d02bfab35ca7a62021505df94e71fc05eb864ffc276add5a2fce483338fe2cf02fcc04e693bb5b709c6b080490
+DIST ant-1.10.9-gentoo.tar.bz2 6685 BLAKE2B 2249c7e1628052a2a6896c6995e0c5dd14ea77671ab0ef4402ece9968f41266cdf4411cd669dbb73c4d7043d7c6c5f6e992bfc2705e74899ff1058f0d4942704 SHA512 aade4c5322c29d1b6b4f6b99b229a1a07ff64faed104bdbbff3a82bd482d9cab5596c019dac92eaf4cab875fa9e46e5067ba816f910c2d6c94890ab85c50605b
DIST apache-ant-1.10.8-src.tar.bz2 4848256 BLAKE2B bd0668e5592c6d2e77233dcffbf2311f9b072f60e7a0c2d5b1a0a6567fc015e1fda46caf1c6c2a3a6730df561f87a8477e0df54a12eeab866cd8d4cb8b2d1f7e SHA512 15563c339298dc576ffb0fb59858bed5f6deabb519ad3f5237e465e6dffd5307bb86fc120f7d7893332936b9f767c47e522cdd1da809b599ceec0070dcb20338
+DIST apache-ant-1.10.9-src.tar.bz2 4593589 BLAKE2B afb73e592dbd4e0082f5890005ce70264ab9c59f1359a91cc83abcfb03938d98ed9d1eb797c9f72bd3d017a41c19635a6246e5b46ddcab660749a2530db1baaa SHA512 7a6c96131462dc0e1bcf41e2daa1b129a45d19302f4ee2915bb51c4cf347996fa5f8140f96653b21952decee16816476b8f258f8ad2c094a8305209cebcee4a4
diff --git a/dev-java/ant-junit/ant-junit-1.10.9.ebuild b/dev-java/ant-junit/ant-junit-1.10.9.ebuild
new file mode 100644
index 000000000000..65978134b5b6
--- /dev/null
+++ b/dev-java/ant-junit/ant-junit-1.10.9.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ANT_TASK_JDKVER=1.8
+ANT_TASK_JREVER=1.8
+
+inherit ant-tasks
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+DEPEND="
+ dev-java/junit:0
+ dev-java/junit:4
+"
+RDEPEND="${DEPEND}"
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+EANT_GENTOO_CLASSPATH="junit-4"
+
+src_compile() {
+ eant jar-junit
+}
diff --git a/dev-java/ant-junit4/Manifest b/dev-java/ant-junit4/Manifest
index fbf293080e33..55cdb859de95 100644
--- a/dev-java/ant-junit4/Manifest
+++ b/dev-java/ant-junit4/Manifest
@@ -1,2 +1,4 @@
DIST ant-1.10.8-gentoo.tar.bz2 6674 BLAKE2B da52696eb20d74f6c3d36bd57c60927d9044b637ff9de175695d57596ae2e747db509cbde7ec862f9e99f2cee564803232e0edd0755f931dc070b150c4e38b21 SHA512 de14a55105888bc30921418c0e6ef5dac340d3d02bfab35ca7a62021505df94e71fc05eb864ffc276add5a2fce483338fe2cf02fcc04e693bb5b709c6b080490
+DIST ant-1.10.9-gentoo.tar.bz2 6685 BLAKE2B 2249c7e1628052a2a6896c6995e0c5dd14ea77671ab0ef4402ece9968f41266cdf4411cd669dbb73c4d7043d7c6c5f6e992bfc2705e74899ff1058f0d4942704 SHA512 aade4c5322c29d1b6b4f6b99b229a1a07ff64faed104bdbbff3a82bd482d9cab5596c019dac92eaf4cab875fa9e46e5067ba816f910c2d6c94890ab85c50605b
DIST apache-ant-1.10.8-src.tar.bz2 4848256 BLAKE2B bd0668e5592c6d2e77233dcffbf2311f9b072f60e7a0c2d5b1a0a6567fc015e1fda46caf1c6c2a3a6730df561f87a8477e0df54a12eeab866cd8d4cb8b2d1f7e SHA512 15563c339298dc576ffb0fb59858bed5f6deabb519ad3f5237e465e6dffd5307bb86fc120f7d7893332936b9f767c47e522cdd1da809b599ceec0070dcb20338
+DIST apache-ant-1.10.9-src.tar.bz2 4593589 BLAKE2B afb73e592dbd4e0082f5890005ce70264ab9c59f1359a91cc83abcfb03938d98ed9d1eb797c9f72bd3d017a41c19635a6246e5b46ddcab660749a2530db1baaa SHA512 7a6c96131462dc0e1bcf41e2daa1b129a45d19302f4ee2915bb51c4cf347996fa5f8140f96653b21952decee16816476b8f258f8ad2c094a8305209cebcee4a4
diff --git a/dev-java/ant-junit4/ant-junit4-1.10.9.ebuild b/dev-java/ant-junit4/ant-junit4-1.10.9.ebuild
new file mode 100644
index 000000000000..5dcdbe73523e
--- /dev/null
+++ b/dev-java/ant-junit4/ant-junit4-1.10.9.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ANT_TASK_JDKVER=1.8
+ANT_TASK_JREVER=1.8
+ANT_TASK_DEPNAME="junit-4"
+
+inherit ant-tasks
+
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+DEPEND="dev-java/junit:4
+ ~dev-java/ant-junit-${PV}"
+
+RDEPEND="${DEPEND}"
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+EANT_GENTOO_CLASSPATH="junit-4,ant-junit"
+
+src_prepare() {
+ default
+
+ java-pkg_jar-from --build-only --into "${S}/lib" ant-junit
+}
+
+src_install() {
+ # No registration as ant-task, would be loaded together with ant-junit.
+ java-pkg_dojar build/lib/ant-junit4.jar
+
+ # As we dont't want to depend on and-junit in package.env, because it depends
+ # on junit:0. Instead, we "steal" its jar and record it to our package.env as
+ # if it belongs to this package's classpath.
+ java-pkg_getjar --build-only ant-junit ant-junit.jar
+ java-pkg_regjar $(java-pkg_getjar --build-only ant-junit ant-junit.jar)
+}
diff --git a/dev-java/ant-junitlauncher/Manifest b/dev-java/ant-junitlauncher/Manifest
index fbf293080e33..55cdb859de95 100644
--- a/dev-java/ant-junitlauncher/Manifest
+++ b/dev-java/ant-junitlauncher/Manifest
@@ -1,2 +1,4 @@
DIST ant-1.10.8-gentoo.tar.bz2 6674 BLAKE2B da52696eb20d74f6c3d36bd57c60927d9044b637ff9de175695d57596ae2e747db509cbde7ec862f9e99f2cee564803232e0edd0755f931dc070b150c4e38b21 SHA512 de14a55105888bc30921418c0e6ef5dac340d3d02bfab35ca7a62021505df94e71fc05eb864ffc276add5a2fce483338fe2cf02fcc04e693bb5b709c6b080490
+DIST ant-1.10.9-gentoo.tar.bz2 6685 BLAKE2B 2249c7e1628052a2a6896c6995e0c5dd14ea77671ab0ef4402ece9968f41266cdf4411cd669dbb73c4d7043d7c6c5f6e992bfc2705e74899ff1058f0d4942704 SHA512 aade4c5322c29d1b6b4f6b99b229a1a07ff64faed104bdbbff3a82bd482d9cab5596c019dac92eaf4cab875fa9e46e5067ba816f910c2d6c94890ab85c50605b
DIST apache-ant-1.10.8-src.tar.bz2 4848256 BLAKE2B bd0668e5592c6d2e77233dcffbf2311f9b072f60e7a0c2d5b1a0a6567fc015e1fda46caf1c6c2a3a6730df561f87a8477e0df54a12eeab866cd8d4cb8b2d1f7e SHA512 15563c339298dc576ffb0fb59858bed5f6deabb519ad3f5237e465e6dffd5307bb86fc120f7d7893332936b9f767c47e522cdd1da809b599ceec0070dcb20338
+DIST apache-ant-1.10.9-src.tar.bz2 4593589 BLAKE2B afb73e592dbd4e0082f5890005ce70264ab9c59f1359a91cc83abcfb03938d98ed9d1eb797c9f72bd3d017a41c19635a6246e5b46ddcab660749a2530db1baaa SHA512 7a6c96131462dc0e1bcf41e2daa1b129a45d19302f4ee2915bb51c4cf347996fa5f8140f96653b21952decee16816476b8f258f8ad2c094a8305209cebcee4a4
diff --git a/dev-java/ant-junitlauncher/ant-junitlauncher-1.10.9.ebuild b/dev-java/ant-junitlauncher/ant-junitlauncher-1.10.9.ebuild
new file mode 100644
index 000000000000..09716cb8ae78
--- /dev/null
+++ b/dev-java/ant-junitlauncher/ant-junitlauncher-1.10.9.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ANT_TASK_JDKVER=1.8
+ANT_TASK_JREVER=1.8
+ANT_TASK_DEPNAME=""
+
+inherit ant-tasks
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
diff --git a/dev-java/ant-swing/Manifest b/dev-java/ant-swing/Manifest
index fbf293080e33..55cdb859de95 100644
--- a/dev-java/ant-swing/Manifest
+++ b/dev-java/ant-swing/Manifest
@@ -1,2 +1,4 @@
DIST ant-1.10.8-gentoo.tar.bz2 6674 BLAKE2B da52696eb20d74f6c3d36bd57c60927d9044b637ff9de175695d57596ae2e747db509cbde7ec862f9e99f2cee564803232e0edd0755f931dc070b150c4e38b21 SHA512 de14a55105888bc30921418c0e6ef5dac340d3d02bfab35ca7a62021505df94e71fc05eb864ffc276add5a2fce483338fe2cf02fcc04e693bb5b709c6b080490
+DIST ant-1.10.9-gentoo.tar.bz2 6685 BLAKE2B 2249c7e1628052a2a6896c6995e0c5dd14ea77671ab0ef4402ece9968f41266cdf4411cd669dbb73c4d7043d7c6c5f6e992bfc2705e74899ff1058f0d4942704 SHA512 aade4c5322c29d1b6b4f6b99b229a1a07ff64faed104bdbbff3a82bd482d9cab5596c019dac92eaf4cab875fa9e46e5067ba816f910c2d6c94890ab85c50605b
DIST apache-ant-1.10.8-src.tar.bz2 4848256 BLAKE2B bd0668e5592c6d2e77233dcffbf2311f9b072f60e7a0c2d5b1a0a6567fc015e1fda46caf1c6c2a3a6730df561f87a8477e0df54a12eeab866cd8d4cb8b2d1f7e SHA512 15563c339298dc576ffb0fb59858bed5f6deabb519ad3f5237e465e6dffd5307bb86fc120f7d7893332936b9f767c47e522cdd1da809b599ceec0070dcb20338
+DIST apache-ant-1.10.9-src.tar.bz2 4593589 BLAKE2B afb73e592dbd4e0082f5890005ce70264ab9c59f1359a91cc83abcfb03938d98ed9d1eb797c9f72bd3d017a41c19635a6246e5b46ddcab660749a2530db1baaa SHA512 7a6c96131462dc0e1bcf41e2daa1b129a45d19302f4ee2915bb51c4cf347996fa5f8140f96653b21952decee16816476b8f258f8ad2c094a8305209cebcee4a4
diff --git a/dev-java/ant-swing/ant-swing-1.10.9.ebuild b/dev-java/ant-swing/ant-swing-1.10.9.ebuild
new file mode 100644
index 000000000000..fb6c2dfced0f
--- /dev/null
+++ b/dev-java/ant-swing/ant-swing-1.10.9.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ANT_TASK_JDKVER=1.8
+ANT_TASK_JREVER=1.8
+# No extra dependencies are needed.
+ANT_TASK_DEPNAME=""
+
+inherit ant-tasks
+
+DESCRIPTION="Apache Ant's optional tasks for Swing"
+
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
diff --git a/dev-java/ant-testutil/Manifest b/dev-java/ant-testutil/Manifest
index fbf293080e33..55cdb859de95 100644
--- a/dev-java/ant-testutil/Manifest
+++ b/dev-java/ant-testutil/Manifest
@@ -1,2 +1,4 @@
DIST ant-1.10.8-gentoo.tar.bz2 6674 BLAKE2B da52696eb20d74f6c3d36bd57c60927d9044b637ff9de175695d57596ae2e747db509cbde7ec862f9e99f2cee564803232e0edd0755f931dc070b150c4e38b21 SHA512 de14a55105888bc30921418c0e6ef5dac340d3d02bfab35ca7a62021505df94e71fc05eb864ffc276add5a2fce483338fe2cf02fcc04e693bb5b709c6b080490
+DIST ant-1.10.9-gentoo.tar.bz2 6685 BLAKE2B 2249c7e1628052a2a6896c6995e0c5dd14ea77671ab0ef4402ece9968f41266cdf4411cd669dbb73c4d7043d7c6c5f6e992bfc2705e74899ff1058f0d4942704 SHA512 aade4c5322c29d1b6b4f6b99b229a1a07ff64faed104bdbbff3a82bd482d9cab5596c019dac92eaf4cab875fa9e46e5067ba816f910c2d6c94890ab85c50605b
DIST apache-ant-1.10.8-src.tar.bz2 4848256 BLAKE2B bd0668e5592c6d2e77233dcffbf2311f9b072f60e7a0c2d5b1a0a6567fc015e1fda46caf1c6c2a3a6730df561f87a8477e0df54a12eeab866cd8d4cb8b2d1f7e SHA512 15563c339298dc576ffb0fb59858bed5f6deabb519ad3f5237e465e6dffd5307bb86fc120f7d7893332936b9f767c47e522cdd1da809b599ceec0070dcb20338
+DIST apache-ant-1.10.9-src.tar.bz2 4593589 BLAKE2B afb73e592dbd4e0082f5890005ce70264ab9c59f1359a91cc83abcfb03938d98ed9d1eb797c9f72bd3d017a41c19635a6246e5b46ddcab660749a2530db1baaa SHA512 7a6c96131462dc0e1bcf41e2daa1b129a45d19302f4ee2915bb51c4cf347996fa5f8140f96653b21952decee16816476b8f258f8ad2c094a8305209cebcee4a4
diff --git a/dev-java/ant-testutil/ant-testutil-1.10.9.ebuild b/dev-java/ant-testutil/ant-testutil-1.10.9.ebuild
new file mode 100644
index 000000000000..e8763ba32556
--- /dev/null
+++ b/dev-java/ant-testutil/ant-testutil-1.10.9.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ANT_TASK_JDKVER=1.8
+ANT_TASK_JREVER=1.8
+
+inherit ant-tasks
+
+DESCRIPTION="Apache Ant's optional test utility classes"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+CDEPEND="dev-java/ant-core:0"
+
+DEPEND="${CDEPEND}
+ >=virtual/jdk-1.8
+ >=dev-java/junit-4.11:4
+ ~dev-java/ant-swing-${PV}
+ ~dev-java/ant-junit4-${PV}
+ ~dev-java/ant-junitlauncher-${PV}"
+
+RDEPEND="${CDEPEND}
+ >=virtual/jre-1.8"
+
+# The build system builds much more than it actually packages, so there are many
+# build-only deps, but since those are quite common, it wasn't worth to patch it.
+
+src_unpack() {
+ ant-tasks_src_unpack base
+ java-pkg_jar-from --build-only junit-4,ant-junit4,ant-junitlauncher,ant-swing
+ java-pkg_jar-from --build-only ant-core ant-launcher.jar
+}
+
+src_compile() {
+ eant test-jar
+}
diff --git a/dev-java/ant-xz/Manifest b/dev-java/ant-xz/Manifest
index fbf293080e33..55cdb859de95 100644
--- a/dev-java/ant-xz/Manifest
+++ b/dev-java/ant-xz/Manifest
@@ -1,2 +1,4 @@
DIST ant-1.10.8-gentoo.tar.bz2 6674 BLAKE2B da52696eb20d74f6c3d36bd57c60927d9044b637ff9de175695d57596ae2e747db509cbde7ec862f9e99f2cee564803232e0edd0755f931dc070b150c4e38b21 SHA512 de14a55105888bc30921418c0e6ef5dac340d3d02bfab35ca7a62021505df94e71fc05eb864ffc276add5a2fce483338fe2cf02fcc04e693bb5b709c6b080490
+DIST ant-1.10.9-gentoo.tar.bz2 6685 BLAKE2B 2249c7e1628052a2a6896c6995e0c5dd14ea77671ab0ef4402ece9968f41266cdf4411cd669dbb73c4d7043d7c6c5f6e992bfc2705e74899ff1058f0d4942704 SHA512 aade4c5322c29d1b6b4f6b99b229a1a07ff64faed104bdbbff3a82bd482d9cab5596c019dac92eaf4cab875fa9e46e5067ba816f910c2d6c94890ab85c50605b
DIST apache-ant-1.10.8-src.tar.bz2 4848256 BLAKE2B bd0668e5592c6d2e77233dcffbf2311f9b072f60e7a0c2d5b1a0a6567fc015e1fda46caf1c6c2a3a6730df561f87a8477e0df54a12eeab866cd8d4cb8b2d1f7e SHA512 15563c339298dc576ffb0fb59858bed5f6deabb519ad3f5237e465e6dffd5307bb86fc120f7d7893332936b9f767c47e522cdd1da809b599ceec0070dcb20338
+DIST apache-ant-1.10.9-src.tar.bz2 4593589 BLAKE2B afb73e592dbd4e0082f5890005ce70264ab9c59f1359a91cc83abcfb03938d98ed9d1eb797c9f72bd3d017a41c19635a6246e5b46ddcab660749a2530db1baaa SHA512 7a6c96131462dc0e1bcf41e2daa1b129a45d19302f4ee2915bb51c4cf347996fa5f8140f96653b21952decee16816476b8f258f8ad2c094a8305209cebcee4a4
diff --git a/dev-java/ant-xz/ant-xz-1.10.9.ebuild b/dev-java/ant-xz/ant-xz-1.10.9.ebuild
new file mode 100644
index 000000000000..2a299ab6dc1b
--- /dev/null
+++ b/dev-java/ant-xz/ant-xz-1.10.9.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ANT_TASK_JDKVER=1.8
+ANT_TASK_JREVER=1.8
+ANT_TASK_DEPNAME="xz-java"
+
+inherit ant-tasks
+
+DESCRIPTION="Apache Ant's optional tasks for XZ compression"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+DEPEND="dev-java/xz-java"
+RDEPEND="${DEPEND}"
diff --git a/dev-java/ant/ant-1.10.9.ebuild b/dev-java/ant/ant-1.10.9.ebuild
new file mode 100644
index 000000000000..28e798b5fdde
--- /dev/null
+++ b/dev-java/ant/ant-1.10.9.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Java-based build tool similar to 'make' that uses XML configuration files"
+HOMEPAGE="https://ant.apache.org/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+IUSE="X +antlr +bcel +bsf +commonslogging +commonsnet jai +javamail +jdepend jmf
+ +jsch +junit +junit4 +junitlauncher +log4j +oro +regexp +resolver swing testutil xz"
+
+DEPEND="~dev-java/ant-core-${PV}"
+
+RDEPEND="${DEPEND}
+ ~dev-java/ant-core-${PV}
+ ~dev-java/ant-junit-${PV}
+ ~dev-java/ant-apache-xalan2-${PV}
+ antlr? ( ~dev-java/ant-antlr-${PV} )
+ bcel? ( ~dev-java/ant-apache-bcel-${PV} )
+ bsf? ( ~dev-java/ant-apache-bsf-${PV} )
+ commonslogging? ( ~dev-java/ant-commons-logging-${PV} )
+ commonsnet? ( ~dev-java/ant-commons-net-${PV} )
+ jai? ( ~dev-java/ant-jai-${PV} )
+ javamail? ( ~dev-java/ant-javamail-${PV} )
+ jdepend? ( ~dev-java/ant-jdepend-${PV} )
+ jmf? ( ~dev-java/ant-jmf-${PV} )
+ jsch? ( ~dev-java/ant-jsch-${PV} )
+ junit? ( ~dev-java/ant-junit-${PV} )
+ junit4? ( ~dev-java/ant-junit4-${PV} )
+ junitlauncher? ( ~dev-java/ant-junitlauncher-${PV} )
+ log4j? ( ~dev-java/ant-apache-log4j-${PV} )
+ oro? ( ~dev-java/ant-apache-oro-${PV} )
+ regexp? ( ~dev-java/ant-apache-regexp-${PV} )
+ resolver? ( ~dev-java/ant-apache-resolver-${PV} )
+ swing? ( ~dev-java/ant-swing-${PV} )
+ testutil? ( ~dev-java/ant-testutil-${PV} )
+ X? ( ~dev-java/ant-swing-${PV} )
+ xz? ( ~dev-java/ant-xz-${PV} )
+"
+
+S="${WORKDIR}"
+
+src_compile() { :; }
diff --git a/dev-java/jdepend/jdepend-2.9-r5.ebuild b/dev-java/jdepend/jdepend-2.9-r6.ebuild
similarity index 88%
rename from dev-java/jdepend/jdepend-2.9-r5.ebuild
rename to dev-java/jdepend/jdepend-2.9-r6.ebuild
index efb4182bddad..354bfbb7ce15 100644
--- a/dev-java/jdepend/jdepend-2.9-r5.ebuild
+++ b/dev-java/jdepend/jdepend-2.9-r6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -16,9 +16,9 @@ SLOT="0"
KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
-DEPEND=">=virtual/jdk-1.4
+DEPEND=">=virtual/jdk-1.8
>=app-arch/unzip-5.50-r1"
-RDEPEND=">=virtual/jre-1.4"
+RDEPEND=">=virtual/jre-1.8"
java_prepare() {
rm -v "${S}"/lib/*.jar || die
diff --git a/dev-java/qdox/qdox-1.12.1-r1.ebuild b/dev-java/qdox/qdox-1.12.1-r2.ebuild
similarity index 92%
rename from dev-java/qdox/qdox-1.12.1-r1.ebuild
rename to dev-java/qdox/qdox-1.12.1-r2.ebuild
index 7100ae1aba62..559d80d7961e 100644
--- a/dev-java/qdox/qdox-1.12.1-r1.ebuild
+++ b/dev-java/qdox/qdox-1.12.1-r2.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
JAVA_PKG_IUSE="doc source test"
@@ -19,7 +19,7 @@ S="${WORKDIR}/${PN}-${PN}-${PV}"
CDEPEND="dev-java/ant-core:0"
-DEPEND=">=virtual/jdk-1.4
+DEPEND=">=virtual/jdk-1.8
app-arch/unzip:0
dev-java/byaccj:0
>=dev-java/jflex-1.6.1:0
@@ -27,11 +27,15 @@ DEPEND=">=virtual/jdk-1.4
test? ( dev-java/junit:0 )
${CDEPEND}"
-RDEPEND=">=virtual/jre-1.4
+RDEPEND=">=virtual/jre-1.8
${CDEPEND}"
-java_prepare() {
- epatch "${FILESDIR}"/jflex-1.6.1.patch
+PATCHES=(
+ "${FILESDIR}/jflex-1.6.1.patch"
+)
+
+src_prepare() {
+ default
if ! use test ; then
rm src/java/com/thoughtworks/qdox/tools/QDoxTester.java
diff --git a/dev-java/qdox/qdox-1.6.3-r1.ebuild b/dev-java/qdox/qdox-1.6.3-r2.ebuild
similarity index 87%
rename from dev-java/qdox/qdox-1.6.3-r1.ebuild
rename to dev-java/qdox/qdox-1.6.3-r2.ebuild
index 214262e8879c..8159998cc6ce 100644
--- a/dev-java/qdox/qdox-1.6.3-r1.ebuild
+++ b/dev-java/qdox/qdox-1.6.3-r2.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=6
+EAPI=7
JAVA_PKG_IUSE="doc source"
@@ -16,10 +16,10 @@ SLOT="1.6"
LICENSE="Apache-2.0"
DEPEND="
- >=virtual/jdk-1.6"
+ >=virtual/jdk-1.8"
RDEPEND="
- >=virtual/jre-1.6"
+ >=virtual/jre-1.8"
S="${WORKDIR}"
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index 387f36d53a53..ccf4170b5513 100644
Binary files a/dev-lang/Manifest.gz and b/dev-lang/Manifest.gz differ
diff --git a/dev-lang/coffee-script/Manifest b/dev-lang/coffee-script/Manifest
index de8c29ca0a30..45e9c619a2ff 100644
--- a/dev-lang/coffee-script/Manifest
+++ b/dev-lang/coffee-script/Manifest
@@ -1,3 +1,4 @@
DIST coffee-script-1.12.5.tar.gz 1429494 BLAKE2B b64dc0dce9d2dbcbe5e20fcf002e9fe12116e6987ebdb19c82dadec61d90eaf66de5f4560bab5a3df1c8cef9f557bb0f5c5edd3e1fa5e7062cc0641dcbec28bc SHA512 b83981508c99e52957786d66b6c93e65cea98386b247cddfd516146eb4edb7ccb49451cc976d683fc9127b1ed0ea0a4d54cc47be519af1bf9e8b3dd79159d591
DIST coffee-script-1.9.3.tar.gz 810246 BLAKE2B dbca1d690ad80e38d8997c237f8c4c6e8a6b8d5c1362d5173a0c38d75e1389f5d8c09299bbb4902745e77133901857c8c15cec0dc17cbb883acf84854aefb68f SHA512 660826e27f842ed67ec6ef59f734087c95585e03b6b8c6d25c8ecfc567f3161f59034e730b61e5f806edaaa7ec6c805ad6d14902857aaf09cf6193b0fe14f506
DIST coffee-script-2.3.2.tar.gz 1754957 BLAKE2B 7a276a16f4db9c2f53258161af0cb1cebd71fac6acca94d5ee5b0a67e1d59d17ffca8b98f20b3afbe30297963dfa683af16ae01bf0ed6eda49a20a858f6d4850 SHA512 ab50737ffd46db007fc98cbba5ef1fc6c97b20a40b848f9635282ddf19188c59172f984bd62b345b6aae96a92af3ac046cedb568c16db2a5e29d287314e13cd5
+DIST coffee-script-2.5.1.tar.gz 2226483 BLAKE2B 5a2c5f93d46b111aeda63077f60992232a768008187ba0e41bec885184fbbbb91014620fca5d8e38cfdb5e88de483425d3d95c87779f27d7450de7cbe62b489b SHA512 99f11f0822ffc841552cf6c78a28d152554f070df6d1b729bdd17df8ba6faae6ed2ba9886f7ee13ccb316de698ab8624370287274611fe90bef033d9f76c5865
diff --git a/dev-lang/coffee-script/coffee-script-2.5.1.ebuild b/dev-lang/coffee-script/coffee-script-2.5.1.ebuild
new file mode 100644
index 000000000000..ce12a698c64d
--- /dev/null
+++ b/dev-lang/coffee-script/coffee-script-2.5.1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN="coffeescript"
+
+DESCRIPTION="A little language that compiles into javascript"
+HOMEPAGE="https://coffeescript.org/"
+SRC_URI="https://github.com/jashkenas/${MY_PN}/archive/${PV}.tar.gz
+ -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+# This package has a test suite (that works), but it requires a number
+# of NodeJS/NPM packages that aren't in the tree.
+IUSE="doc examples"
+
+RDEPEND="net-libs/nodejs"
+
+src_install() {
+ local npm_module_dir="/usr/$(get_libdir)/node/${PN}"
+ insinto "${npm_module_dir}"
+ doins *.js package.json
+ doins -r lib
+ dodoc CONTRIBUTING.md README.md
+
+ if use examples; then
+ # Users should be able to run the examples without having to copy
+ # them to another directory and decompress them.
+ docompress -x "/usr/share/doc/${PF}/examples"
+ dodoc -r documentation/examples
+ fi
+
+ if use doc; then
+ # It looks like "docs/v2" contains the output from all of the stuff
+ # under "documentation".
+ docinto "html"
+ dodoc -r docs/v2/*
+ fi
+
+ # The coffee and cake "binaries" use a relative path to find the lib
+ # directory, so we have to symlink them rather than use dobin().
+ exeinto "${npm_module_dir}/bin"
+ doexe bin/cake
+ doexe bin/coffee
+ dosym "${npm_module_dir}/bin/cake" "/usr/bin/cake"
+ dosym "${npm_module_dir}/bin/coffee" "/usr/bin/coffee"
+}
diff --git a/dev-lang/coffee-script/metadata.xml b/dev-lang/coffee-script/metadata.xml
index ccff50578dc8..cd39081640ef 100644
--- a/dev-lang/coffee-script/metadata.xml
+++ b/dev-lang/coffee-script/metadata.xml
@@ -5,4 +5,9 @@
jashkenas/coffeescript
+
+ CoffeeScript is a little language that compiles into JavaScript. Underneath that awkward Java-esque patina, JavaScript has always had a gorgeous heart. CoffeeScript is an attempt to expose the good parts of JavaScript in a simple way.
+
+ The golden rule of CoffeeScript is: "It's just JavaScript." The code compiles one-to-one into the equivalent JS, and there is no interpretation at runtime. You can use any existing JavaScript library seamlessly from CoffeeScript (and vice-versa). The compiled output is readable, pretty-printed, and tends to run as fast or faster than the equivalent handwritten JavaScript.
+
diff --git a/dev-lang/julia-bin/Manifest b/dev-lang/julia-bin/Manifest
index a8b0946c1bfd..9db09b1200ba 100644
--- a/dev-lang/julia-bin/Manifest
+++ b/dev-lang/julia-bin/Manifest
@@ -10,3 +10,8 @@ DIST julia-1.4.0-freebsd-x86_64.tar.gz 90034224 BLAKE2B 3150870a630c43d21520a52a
DIST julia-1.4.0-linux-aarch64.tar.gz 81685205 BLAKE2B 1a07a3ef94423d327e88b5cccb38360b23540806defeee1c64dc0656beee1b39008ca529e3d0cef7aab1e8947adb62fbbb1c6d248a0de2c63f3a5d14b3a5b684 SHA512 51b79e7b1fc85f67a26a595e84f88b656996cb8e14cd634076621b07690fc4f5d1ff1d71ce3a75243501bb7853bffda5d7428f03797570913cd3170dc13f651f
DIST julia-1.4.0-linux-i686.tar.gz 94549552 BLAKE2B b058d81f55e7e579cff5b31054def68193be5032de02f09f6c4239e13bd73a630eee8ebd5f9ccd712f0e3be406932de51951202ec37b1534f20962db4eff5472 SHA512 f0363103713900a682fef900a745732714cd3dcbedbe2aa368afff768c24603241fc2f4be7419caf674e086f6cac59a8b14f3770e578959b7296cd5e26d6d5c9
DIST julia-1.4.0-linux-x86_64.tar.gz 98969249 BLAKE2B bf0a79a8a8f1ed8c5668f2b2836414f8c0ae10199ee96eefea3d5bfefc0dde0902659556a572c3de6982477183d91f8e2f6d38f7334c50872f3257055a5310e3 SHA512 e2ac637d2bbe9ec4b900bc8f59263fdaa573cbe39ffbafd0e8280a5ba1906052f72816e4b5a12fab34f5b05ffd3f5cf95703c00d88f2f6ab6f022c3504cf1c95
+DIST julia-1.5.2-freebsd-x86_64.tar.gz 95898744 BLAKE2B dddafa63acc943bfc06eeae3fa9a3ef9b7484b29b88d37bf064ded255c836678f5d02dec0f7fa788bb763894acae5c51937882ed0391dcf66792198fec7dbce7 SHA512 13e4d1a7e01cd759d64c8ec3d85501904439fde5a9e2cb394963a8977035cd33b241fab27bf0642b069f202ead1d6c84f633002df3b27c4aa60e7adf45a3a8b1
+DIST julia-1.5.2-linux-aarch64.tar.gz 97088109 BLAKE2B 01aa5337cd1fc15655b596959cef8e54b56d8bb11fbced728df301a197aad550f0113b50c0b9e3cab34ea1082e176ced0398cde4e1d7c6d14a72b9a9cab937ea SHA512 09ac5360faae81eb9c78da5831d20f1f2d2c7a93561f6f2857015b579796a059cdecf529c283c9c37dd55163ce3e7b6cd175ee02734f1e11aa12f1163bd6587c
+DIST julia-1.5.2-linux-i686.tar.gz 101473619 BLAKE2B a87cb4cb38236e87041fac1012841d5aed25383bfb212188f4c23f4a961654d8a3b03b85dd5563f83620aa98323e2d2692107eda47559cf9ae332006453a139d SHA512 2ceb56bcae051815d585d3f36b4ae323ad7a3e383e75c07d87cb555fc2463d1a6017fd120f52a1f7110b803bfa546a34e62e8958765b52124612782ac3daf403
+DIST julia-1.5.2-linux-x86_64.tar.gz 105324048 BLAKE2B 410db75cb5b7ed269fd0d8f827773f50ff127ded3346e2f5fe908a1f9c0dd0f00b7600c5343853aaa0dfec3a616f657c52c96290f9c6ea012efcbc2a2b72e701 SHA512 5d14369b6296aa5fa0f7a58ce6b85dc25612ef508ee8dc1dcce7fe3a64de62b77daf419ea5d3a0a78345345787cb3ed563717ecc04df0c4d68b6d60593750f62
+DIST julia-1.5.2-musl-x86_64.tar.gz 101730667 BLAKE2B 1b213a246779815b79f47e6c287f0c7eb438dce42bc9e3e39681dcc0818c7a8c81f7040443c06fd323adb693c96b61cc69099c5df375cae119020ba9d0bb11cd SHA512 5cfbf7938f50286077e132815e10ce4e1e5a589a772ae3b946488d3126713e72ba393e1a45b3bc38b5bc43fc183e7f99b622c8c0d9d939330b142cdee24fccb3
diff --git a/dev-lang/julia-bin/julia-bin-1.5.2.ebuild b/dev-lang/julia-bin/julia-bin-1.5.2.ebuild
new file mode 100644
index 000000000000..acbc1acd341a
--- /dev/null
+++ b/dev-lang/julia-bin/julia-bin-1.5.2.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+MY_PN=${PN/-bin/}
+MY_P=${MY_PN}-${PV/_/-}
+MY_PV=$(ver_cut 1-2)
+BASE_SRC_URI="https://julialang-s3.julialang.org/bin"
+
+DESCRIPTION="High-performance programming language for technical computing"
+HOMEPAGE="https://julialang.org/"
+SRC_URI="
+ x86? ( ${BASE_SRC_URI}/linux/x86/${MY_PV}/${MY_P}-linux-i686.tar.gz )
+ amd64? (
+ elibc_glibc? ( ${BASE_SRC_URI}/linux/x64/${MY_PV}/${MY_P}-linux-x86_64.tar.gz )
+ elibc_musl? ( ${BASE_SRC_URI}/musl/x64/${MY_PV}/${MY_P}-musl-x86_64.tar.gz )
+ )
+ amd64-fbsd? ( ${BASE_SRC_URI}/freebsd/x64/${MY_PV}/${MY_P}-freebsd-x86_64.tar.gz )
+ arm64? ( ${BASE_SRC_URI}/linux/aarch64/${MY_PV}/${MY_P}-linux-aarch64.tar.gz )
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE="elibc_glibc"
+
+RDEPEND="!dev-lang/julia"
+DEPEND="${RDEPEND}"
+
+RESTRICT="strip"
+
+QA_PREBUILT="*"
+
+S="${WORKDIR}/${MY_P}"
+
+src_install() {
+ insinto "/usr/$(get_libdir)/${MY_P}/"
+ doins -r ./etc
+ doins -r ./include
+ doins -r ./lib
+ doins -r ./share
+
+ exeinto "/usr/$(get_libdir)/${MY_P}/bin"
+ doexe bin/julia
+
+ cat > 99julia-bin <<-EOF
+ PATH="${EROOT}/usr/$(get_libdir)/${MY_P}/bin"
+ EOF
+ doenvd 99julia-bin
+}
diff --git a/dev-lang/julia/Manifest b/dev-lang/julia/Manifest
index b7cec95f4a27..bae9e89ef710 100644
--- a/dev-lang/julia/Manifest
+++ b/dev-lang/julia/Manifest
@@ -1,14 +1,18 @@
DIST julia-1.2.0.tar.gz 8255435 BLAKE2B 286b7bd93cae247c545d9c384e244115f84daee977839022993e91c69013eb4107ac77d86f996ec7a8e9f863bf5cab29fb063437b822e5da79e72bc9e0db4b65 SHA512 c99b0b744508b43df4ee334f588dbb57a633969d7cb164d41b76d552c1d14f5ff6f06a8d0da7f7a48fd1e3a3b3c2379998c5af1bfdff4b0c17045132b82a40b8
DIST julia-1.3.0.tar.gz 8793136 BLAKE2B e469d80c94e3b15b198011e62f591a699ec7218c755cf3e0c1be8f94e2a28e9800a10599a152f6865f534652d22f118bb14cd1886d257a96e6875562bce56f0c SHA512 c7fdc5c4435c82688fe608a7009ccee6d622f51a62578bf2323ad623acfd58bfb6ed1252f81481708b5b428c37292e078ce72b10df3fe32d29158b0726be2c2e
DIST julia-1.4.0.tar.gz 7239281 BLAKE2B f11467cf91c2a72f03f77421537f4089bab6a1596ede27963551819453bea2a3a46cad9a43951df8857120a00a44f2f04eb5e23659ea4d1772feddb00ba85d2c SHA512 f8152a595f13932f6cad186cf2fdf2fb0bd64cc49bbb11a76d8299f4745ca6428823ead0e73a7bae1347f1b99bf1181d1f457587d13a7bfc7324ca81afc35cc1
+DIST julia-1.5.2.tar.gz 6945862 BLAKE2B 9dd9f83fb9ae251f66ae65e14a252b662c3c7d6f92638d91ef6e286032020052e1812f2891270854e0ddeda474afff55c8f87d300550503c1093f4c5e0a51959 SHA512 aa177d03bbde4f368dd2fb14f64d21130531616bcd544af7babbb7fb7c9ee5ea7528c756e10f78468aaffebbcbc6f48e92397c1c13dc3f130b64a82e478f43dc
DIST julia-Pkg-49908bffe83790bc7cf3c5d46faf3667f8902ad4.tar.gz 389738 BLAKE2B 1ed9201badf0a1db5142e0566bfe085b364e4681670937ac5fa53c15312ff8eb29d5e783b75fe3f4f379b041ba38c66ce94962fa7d98fcfd0b7b49acd1749d69 SHA512 a85aa80b3080794a8e3ae5ce54856e63457c461659c12fde5dde1b5ec33176ea06af49ee516d01ccd7b78d8358de2fe0ffcd5c6a6d5a5088cdcd76a0133780eb
+DIST julia-UnicodeData-13.0.0.txt 1851767 BLAKE2B 72bbcf352f2f6a004abb3f351fe5da160e83644feea8de0ca154b5a1aa78f36cb04b252d0c7b64a5eeca388e600b2875bb76bc2746ee799a1a6eff97c1fe8b06 SHA512 1a4a662e2ab33469976bf5f91aa6933ed9b73f6d4179a2daffb349e1869d7d6cfa885b164e82d15dcdad7458cd451c81add58d875eb0c70de854589dc97b2055
DIST julia-cacert-2020-01-01.pem 223687 BLAKE2B 29d2ce73380897a5841deef1c7eb5e61ff3f5c278ab95286bbfdf5b1c4d41ae94402dc5cb376975977f2d31030e0df872273942a1b6cc91b7ff35ecfd7efc1c2 SHA512 cc129ae1a4377a43a74b0854b6eccb2b315cdfce018142d1dd5524fb64c8945cde067cb18f366351fa7d6af3f9f36cf21bc1f626f987f9e4627878472ea59cde
DIST julia-dsfmt-2.2.3.tar.gz 291773 BLAKE2B 6ffae90494d72527920c80fc0fb005da1c7b84f8a03a7ecb0789434c0fff97359e5098e85431896dffccc7d5148c414e847aaba5feef648b8788421a466ff65e SHA512 6d8ddcd01aab3f9039f4f0288a8af53e290cc2f293ed8c4a8c9f3b3f12398e7eedfce8016117b425766ba89c61c86c13b3e420035b5f9bf91315b8b814c03662
DIST julia-libgit2-b3e1a56ebb2b9291e82dc027ba9cbcfc3ead54d3.tar.gz 4981505 BLAKE2B b2a414690de2c8eea5247260d76a3ff447e4f925a3c749e88cb9bfe96d1e3086be04534801fdf9d1eb1f8d84c6a6dc0eb4b6401be311ed3d5391ec9d481b1dda SHA512 7384a7eeeb36ac79d4e7e1336546e48f8fc820653f887f944c3902fcaae4e59d855679b39c5279b7372995934e549e34c526e1459a82032206913f9747b3dd08
DIST julia-libuv-2348256acf5759a544e5ca7935f638d2bc091d60.tar.gz 1555710 BLAKE2B 31ce57d23765c142799dd985a5511751d63238cf7e082fd1ad5574bf62201e9d6cb53b8da5dcc724765ccb4abd63da3ca6d6cbd45e078310c2ffa3859d09b8e4 SHA512 c8bf3c736a60feb0c6994aa7cd1b80e1a45bd6096aa66db320ddfc27b59a0797d303338ea75978619173e4f0a680254f3db29c9f6d1b84361030cc11c7729c98
DIST julia-libuv-35b1504507a7a4168caae3d78db54d1121b121e1.tar.gz 1577394 BLAKE2B 8ab36f781619f710a64ddc6cf257a4c2f6d27ac22e33ed6f184902d0c6cc3a3941254e0a825071fcd57f869e3ccc5eaf71856539cf6b484358d5aafe383000a9 SHA512 5932e9105346e952fd0f51f79898e5b9c993261ec1558408437647ab3b3ce282562f1e0a16db5704cb66e7aa7a4c6a75dd7f0da498a98b1b6af48da88b4869f0
DIST julia-libwhich-81e9723c0273d78493dc8c8ed570f68d9ce7e89e.tar.gz 4183 BLAKE2B c932e23b1b476d3fd16cf6f451efd5fc6d9c1ec2c53e8ac086340a100817d9b30dae3eff50b284a42c09b2bbae30b9e2fd38b2881f8cbf4974a89f3bd0c87599 SHA512 6fb77b715d70d9bc95a8546c3bf97bd3677c7ea344b88bb5bc3bbfac9dceabe8a8cde7a0f64dec884cde802e4a3000e30837d3f824b5a9242348c4fe061526a3
+DIST julia-utf8proc-0890a538bf8238cded9be0c81171f57e43f2c755.tar.gz 155521 BLAKE2B 32dc1a8fb641e89057d317e579f1802b7f7dfbdbea7f91c01b282b9a88c2fc6143743d5e45f46d6d465857cfe1b28bd39e9a0da19e80516536c57cb62b139d27 SHA512 95d6dba2bbdfc5003f6d21fd02c926c7db9661895010041aacee55fa11dc2524bcffaa90965e2a9a8f2a9e49e93ec7572d6a4de6d5d9f9e075b787537864ea20
DIST julia-utf8proc-454f60150c7f023526d353e1e6b386f93ee0b116.tar.gz 154318 BLAKE2B 6173490aa458f300f29d6fc0f22b80ccff436f4c52df2ac54786a3f518a140ab6624cef0a7221c8e3800307c9b8490a604215fcb028001b1b95e7630b62ed85d SHA512 50a19aa56edc5c023611c40e75862f4c9c08e1bfad0bac9ec64413406cff8f409ff106a37f8c66202e563cbe3ae1d5a40036b14fd309651b50c30d3f205f08f5
DIST julia-utf8proc-5c632c57426f2e4246e3b64dd2fd088d3920f9e5.tar.gz 154973 BLAKE2B 9696fae33c408abbddd2c5741a0c98b11474c7615d6610e53be919a3cce4a58f129de4ae36bb02636e94d1e57504103e8dd3a3faad3ce7c38e1dba0f513d2d47 SHA512 dec5d7e976bd808bc8edc39dda62b85ecb462b98b6059ace4acee27ec75f6839e0a2899a9baa225379ae5ffb5b568c63a666f52c9958075e5af0376f8a284534
DIST llvm-6.0.1.src.tar.xz 25306628 BLAKE2B 60232d4d22f8096b565cc8d81fea0639f24f14e8fc4f66ade69fa15479181f07f655f26dff3fa24bf105762b495da316c5c9352db234bd0af6b9c3fff6d4d881 SHA512 cbbb00eb99cfeb4aff623ee1a5ba075e7b5a76fc00c5f9f539ff28c108598f5708a0369d5bd92683def5a20c2fe60cab7827b42d628dbfcc79b57e0e91b84dd9
DIST llvm-8.0.1.src.tar.xz 30477608 BLAKE2B 4319c837b36111401e3b0f9659b8d875c89463bcc7816df1aefe1e3ff989860bbaa92504718f8e15416cfd9f3491c13777cd5cb661877b237b342b0e515b93f5 SHA512 82e120be5cabdfd5111aebbea68a663fe229c8861d73802d6ab09a3bf48f60de333e07e61f8fb61beaa14ac2bea24fcd74fa6f761acaf62469f536b79fcb1e16
+DIST llvm-9.0.1.src.tar.xz 33035112 BLAKE2B 5ae7ac42507cb14983eec0785dfc9b9c788cae75d5493ddf6734da55d3733cc90e35634aa39aa536654d4b68c3ccb7c2f989746f21c634c8989a57d9d32a15b2 SHA512 bfb6960a4dd1e18f4005f324f478a781c69e8ec7c20569d9b243fcb9372dc7733b254f26c683373537990cc9c109c78eaf0f65449629ee17caca1bce9b9ccccd
diff --git a/dev-lang/julia/julia-1.4.0-r2.ebuild b/dev-lang/julia/julia-1.4.0-r2.ebuild
index 0755009420f0..6529f36eb263 100644
--- a/dev-lang/julia/julia-1.4.0-r2.ebuild
+++ b/dev-lang/julia/julia-1.4.0-r2.ebuild
@@ -59,7 +59,6 @@ RDEPEND+="
sci-libs/spqr:0=
sci-libs/umfpack:0=
sci-mathematics/glpk:0=
- >=sci-visualization/gr-0.50.0-r1
>=sys-libs/libunwind-1.1:0=
sys-libs/readline:0=
sys-libs/zlib:0=
@@ -202,3 +201,7 @@ src_install() {
mv "${ED}"/usr/share/doc/julia/html "${ED}"/usr/share/doc/${PF} || die
rmdir "${ED}"/usr/share/doc/julia || die
}
+
+pkg_postinst() {
+ elog "To use Plots, you will need to install sci-visualization/gr."
+}
diff --git a/dev-lang/julia/julia-1.5.2.ebuild b/dev-lang/julia/julia-1.5.2.ebuild
new file mode 100644
index 000000000000..20bdb3501e7c
--- /dev/null
+++ b/dev-lang/julia/julia-1.5.2.ebuild
@@ -0,0 +1,204 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit llvm pax-utils toolchain-funcs
+
+# correct versions for stdlibs are in deps/checksums
+# for everything else, run with network-sandbox and wait for the crash
+
+MY_PV="${PV//_rc/-rc}"
+MY_DSFMT_V="2.2.3"
+MY_LIBUV_V="35b1504507a7a4168caae3d78db54d1121b121e1"
+MY_LIBWHICH_V="81e9723c0273d78493dc8c8ed570f68d9ce7e89e"
+MY_LLVM_V="9.0.1"
+MY_PKG_V="49908bffe83790bc7cf3c5d46faf3667f8902ad4"
+MY_UNICODE_V="13.0.0"
+MY_UTF8PROC_V="0890a538bf8238cded9be0c81171f57e43f2c755"
+
+DESCRIPTION="High-performance programming language for technical computing"
+HOMEPAGE="https://julialang.org/"
+SRC_URI="
+ https://github.com/JuliaLang/${PN}/releases/download/v${MY_PV}/${PN}-${MY_PV}.tar.gz
+ https://api.github.com/repos/JuliaLang/libuv/tarball/${MY_LIBUV_V} -> ${PN}-libuv-${MY_LIBUV_V}.tar.gz
+ https://api.github.com/repos/JuliaLang/utf8proc/tarball/${MY_UTF8PROC_V} -> ${PN}-utf8proc-${MY_UTF8PROC_V}.tar.gz
+ https://api.github.com/repos/vtjnash/libwhich/tarball/${MY_LIBWHICH_V} -> ${PN}-libwhich-${MY_LIBWHICH_V}.tar.gz
+ http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/SFMT/dSFMT-src-${MY_DSFMT_V}.tar.gz -> ${PN}-dsfmt-${MY_DSFMT_V}.tar.gz
+ http://www.unicode.org/Public/${MY_UNICODE_V}/ucd/UnicodeData.txt -> ${PN}-UnicodeData-${MY_UNICODE_V}.txt
+ https://dev.gentoo.org/~tamiko/distfiles/Pkg-${MY_PKG_V}.tar.gz -> ${PN}-Pkg-${MY_PKG_V}.tar.gz
+ !system-llvm? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-${MY_LLVM_V}/llvm-${MY_LLVM_V}.src.tar.xz )
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="system-llvm"
+
+RDEPEND="
+ system-llvm? ( sys-devel/llvm:9=[llvm_targets_NVPTX(-)] )
+ !system-llvm? ( dev-util/cmake )
+"
+LLVM_MAX_SLOT=9
+
+RDEPEND+="
+ dev-libs/double-conversion:0=
+ dev-libs/gmp:0=
+ dev-libs/libgit2:0
+ >=dev-libs/libpcre2-10.23:0=[jit,unicode]
+ dev-libs/mpfr:0=
+ dev-libs/openspecfun
+ >=net-libs/mbedtls-2.2
+ sci-libs/amd:0=
+ sci-libs/arpack:0=
+ sci-libs/camd:0=
+ sci-libs/ccolamd:0=
+ sci-libs/cholmod:0=
+ sci-libs/colamd:0=
+ sci-libs/fftw:3.0=[threads]
+ sci-libs/openlibm:0=
+ sci-libs/spqr:0=
+ sci-libs/umfpack:0=
+ sci-mathematics/glpk:0=
+ >=sys-libs/libunwind-1.1:0=
+ sys-libs/readline:0=
+ sys-libs/zlib:0=
+ >=virtual/blas-3.6
+ virtual/lapack"
+
+DEPEND="${RDEPEND}
+ dev-util/patchelf
+ virtual/pkgconfig"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.1.0-fix_build_system.patch
+ "${FILESDIR}"/${PN}-1.1.0-fix_llvm_install.patch
+ "${FILESDIR}"/${PN}-1.4.0-no_symlink_llvm.patch
+)
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+pkg_setup() {
+ use system-llvm && llvm_pkg_setup
+}
+
+src_unpack() {
+ tounpack=(${A})
+ # the main source tree, followed by deps
+ unpack "${A/%\ */}"
+
+ mkdir -p "${S}/deps/srccache/"
+ for i in "${tounpack[@]:1}"; do
+ if [[ $i == *Pkg* ]] || [[ $i = *Statistics* ]]; then
+ # Bundled Pkg and Statistics packages go into ./stdlib
+ local tarball="${i#julia-}"
+ cp "${DISTDIR}/${i}" "${S}/stdlib/srccache/${tarball}" || die
+ # and we have to fix up the sha1sum
+ local name="${tarball%-*}"
+ local sha1="${tarball#*-}"
+ sha1="${sha1%.tar*}"
+ einfo "using patched stdlib package \"${name}\""
+ sed -i -e "s/PKG_SHA1 = .*/PKG_SHA1 = ${sha1}/" "${S}/stdlib/${name}.version" || die
+ else
+ cp "${DISTDIR}/${i}" "${S}/deps/srccache/${i#julia-}" || die
+ fi
+ done
+}
+
+src_prepare() {
+ default
+
+ # Sledgehammer:
+ # - prevent fetching of bundled stuff in compile and install phase
+ # - respect CFLAGS
+ # - respect EPREFIX and Gentoo specific paths
+
+ sed -i \
+ -e "s|GENTOOCFLAGS|${CFLAGS}|g" \
+ -e "s|/usr/include|${EPREFIX}/usr/include|g" \
+ deps/Makefile || die
+
+ sed -i \
+ -e "s|GENTOOCFLAGS|${CFLAGS}|g" \
+ -e "s|GENTOOLIBDIR|$(get_libdir)|" \
+ Make.inc || die
+
+ sed -i \
+ -e "s|,lib)|,$(get_libdir))|g" \
+ -e "s|\$(BUILD)/lib|\$(BUILD)/$(get_libdir)|g" \
+ Makefile || die
+
+ sed -i \
+ -e "s|ar -rcs|$(tc-getAR) -rcs|g" \
+ src/Makefile || die
+
+ # disable doc install starting git fetching
+ sed -i -e 's~install: $(build_depsbindir)/stringreplace $(BUILDROOT)/doc/_build/html/en/index.html~install: $(build_depsbindir)/stringreplace~' Makefile || die
+}
+
+src_configure() {
+ # julia does not play well with the system versions of dsfmt, libuv,
+ # and utf8proc
+
+ use system-llvm && ewarn "You have enabled system-llvm. This is unsupported by upstream and may not work."
+
+ # USE_SYSTEM_LIBM=0 implies using external openlibm
+ cat <<-EOF > Make.user
+ USE_BINARYBUILDER:=0
+ USE_SYSTEM_LLVM:=$(usex system-llvm 1 0)
+ USE_SYSTEM_LIBUNWIND:=1
+ USE_SYSTEM_PCRE:=1
+ USE_SYSTEM_LIBM:=0
+ USE_SYSTEM_OPENLIBM:=1
+ USE_SYSTEM_DSFMT:=0
+ USE_SYSTEM_BLAS:=1
+ USE_SYSTEM_LAPACK:=1
+ USE_SYSTEM_GMP:=1
+ USE_SYSTEM_MPFR:=1
+ USE_SYSTEM_SUITESPARSE:=1
+ USE_SYSTEM_LIBUV:=0
+ USE_SYSTEM_UTF8PROC:=0
+ USE_SYSTEM_MBEDTLS:=1
+ USE_SYSTEM_LIBSSH2:=1
+ USE_SYSTEM_CURL:=1
+ USE_SYSTEM_LIBGIT2:=1
+ USE_SYSTEM_PATCHELF:=1
+ USE_SYSTEM_ZLIB:=1
+ USE_SYSTEM_P7ZIP:=1
+ VERBOSE=1
+ libdir="${EROOT}/usr/$(get_libdir)"
+ EOF
+}
+
+src_compile() {
+
+ # Julia accesses /proc/self/mem on Linux
+ addpredict /proc/self/mem
+
+ emake julia-release \
+ prefix="${EPREFIX}/usr" DESTDIR="${D}" \
+ CC="$(tc-getCC)" CXX="$(tc-getCXX)"
+ pax-mark m "$(file usr/bin/julia-* | awk -F : '/ELF/ {print $1}')"
+ emake
+}
+
+src_install() {
+ emake install \
+ prefix="${EPREFIX}/usr" DESTDIR="${D}" \
+ CC="$(tc-getCC)" CXX="$(tc-getCXX)"
+
+ if ! use system-llvm ; then
+ cp "${S}/usr/lib/libLLVM"-?jl.so "${ED}/usr/$(get_libdir)/julia/" || die
+ fi
+
+ dodoc README.md
+
+ mv "${ED}"/usr/etc/julia "${ED}"/etc || die
+ rmdir "${ED}"/usr/etc || die
+ mv "${ED}"/usr/share/doc/julia/html "${ED}"/usr/share/doc/"${PF}" || die
+ rmdir "${ED}"/usr/share/doc/julia || die
+}
+
+pkg_postinst() {
+ elog "To use Plots, you will need to install sci-visualization/gr."
+}
diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index 18170772b58a..177b6415d2b4 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -1,5 +1,8 @@
DIST php-7.2.33.tar.xz 12310624 BLAKE2B 3eca6a2aee79b791abb6b0427496e6041b63800ac1aeea86b4465e9326fdcde5d7a69e6323902b6874f27cf6197b705397381319d0b5ff6f93605e791bf0eb86 SHA512 1c28e741fc6de88a33e1307bc88ba8dddf1ba767ce6eb9c1f0da35482c7d3ee1154831b997fa746340c4b7ec8de9196b21a9b1cf319c8e69eca2c92602ceee4a
+DIST php-7.2.34.tar.xz 12309432 BLAKE2B 50522786d39296bc7411931c4f357d53c7a25da264192a6a6e7f7594f3dee108e22974e00a4bdc4d3af269ab63d07b28045ff6b4f4f0c79672ed059882647b93 SHA512 7ecc3de3b5db41ec4ff6a5ce6c7e77dc330753c6f3fd87db4d07d6bb763a0b047e83afeef2251b4c6a5d2ff53fd9f3d7e99d091ef2e2c6ab8f18db7447d8a97d
DIST php-7.3.21.tar.xz 12123192 BLAKE2B ff5fca092f6c4e92c009ade9f4bee01ec07686645a4844297cee0518f12b3ebc16a7322b64579d9ee2d3a3f7cd62ed9184d0afbe77dbcf2d24a11139242c88c5 SHA512 fc2b9a40c92a6e79522a49cd025e56c0a52c2c2bd3f7379aaf004ca6b67957cf4ad059c40a5daac45665710abd07962562870430338f700f573856d797df3ff4
DIST php-7.3.22.tar.xz 12134212 BLAKE2B 2a299d0e1a69425e06b71fcdd471bc659747a1a4adce276c0d42715045ee81a5241982b2408daa8122b8737d9dccc898847406dd007ea583a76cf29b893bc555 SHA512 7f06473e394e3236dff1376c8c9e6d15b998eef8b8b1148b103bd13dfd27785c01e1c6b15414ff64ea511f3f5e59e925831a7546f235d7c58bd47dcf46f6ff00
+DIST php-7.3.23.tar.xz 12133616 BLAKE2B 6a241443d75a0b404d4d65580208b67a425b91cf1951050752e5e7d653f439200514efa65ae9d9ae3a6c5375c711b8cc53dde9cb89b87dd68ff533b25a8dc04a SHA512 b5e318bd59951b470a22b2ef2db19cd542d42bed72cf4abe4344c0521eeba606eac31a38ff49d2ab0cb7ed17441655e029d5984584d86b935f576515179777af
DIST php-7.4.10.tar.xz 10298480 BLAKE2B ef5e051da37c0bddc6819459c2e2b00b28bbfe6efbdc7ad9651200d2e453c434e59cb91642d775334db86a95afd9255012c4a57d57dac4d6cf7e1692067d0f90 SHA512 c7beb2d821f4e28b0444c8653c360d210a924e0638cc4b4ebc71bf2c22ef83caedfc880275329c3ffa644adc5858ccff59d35bf36255d57218774089d3376a21
+DIST php-7.4.11.tar.xz 10302076 BLAKE2B e32e77057ddd7b12553766e30366262812d4342742e6dabd0084a261f3d8e82d7c76924e26ead4c9295609f913d34903b9b1c271af76d8d9725f10cd108b7681 SHA512 9bdd29a4a6c1ac55ed75d8fb2203ae5ef41992c518cb7e3b84cf74db62b03cfbe0ef4ea5614a684a37fcd2ae727376022ce49ed3ff32fc3a728e2f1e2474fb92
DIST php-7.4.9.tar.xz 10289560 BLAKE2B 0fd9d82539a46f7ce58857560f5aeb4be6dfe5f5a05f8b8c55c30d6000d19408b4ecc460c9135736298cdb8312ec958ab8358110b2b265bb8c185f80b1522dc6 SHA512 6179c2d867d6775d7f41785003c36d06ce620e7746ea7e6a4d275264e814a66d465776b47b04e2926ed1228cf58f2c15cdda74faf10372435c74ede7aeb79e18
diff --git a/dev-lang/php/php-7.2.34.ebuild b/dev-lang/php/php-7.2.34.ebuild
new file mode 100644
index 000000000000..1b2056f984d8
--- /dev/null
+++ b/dev-lang/php/php-7.2.34.ebuild
@@ -0,0 +1,759 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit flag-o-matic systemd autotools
+
+DESCRIPTION="The PHP language runtime engine"
+HOMEPAGE="https://www.php.net/"
+SRC_URI="https://www.php.net/distributions/${P}.tar.xz"
+
+LICENSE="PHP-3.01
+ BSD
+ Zend-2.0
+ bcmath? ( LGPL-2.1+ )
+ fpm? ( BSD-2 )
+ gd? ( gd )
+ unicode? ( BSD-2 LGPL-2.1 )"
+
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+
+# We can build the following SAPIs in the given order
+SAPIS="embed cli cgi fpm apache2 phpdbg"
+
+# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
+IUSE="${IUSE}
+ ${SAPIS/cli/+cli}
+ threads"
+
+IUSE="${IUSE} acl argon2 bcmath berkdb bzip2 calendar cdb cjk
+ coverage +ctype curl debug
+ enchant exif +fileinfo +filter firebird
+ +flatfile ftp gd gdbm gmp +hash +iconv imap inifile
+ intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit libressl lmdb
+ mhash mssql mysql mysqli nls
+ oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm
+ readline recode selinux +session session-mm sharedmem
+ +simplexml snmp soap sockets sodium spell sqlite ssl
+ sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode wddx webp
+ +xml xmlreader xmlwriter xmlrpc xpm xslt zip zip-encryption zlib"
+
+# The supported (that is, autodetected) versions of BDB are listed in
+# the ./configure script. Other versions *work*, but we need to stick to
+# the ones that can be detected to avoid a repeat of bug #564824.
+COMMON_DEPEND="
+ >=app-eselect/eselect-php-0.9.1[apache2?,fpm?]
+ >=dev-libs/libpcre-8.32[unicode]
+ fpm? ( acl? ( sys-apps/acl ) )
+ apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] )
+ argon2? ( app-crypt/argon2:= )
+ berkdb? ( || ( sys-libs/db:5.3
+ sys-libs/db:5.1
+ sys-libs/db:4.8
+ sys-libs/db:4.7
+ sys-libs/db:4.6
+ sys-libs/db:4.5 ) )
+ bzip2? ( app-arch/bzip2:0= )
+ cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
+ coverage? ( dev-util/lcov )
+ curl? ( >=net-misc/curl-7.10.5 )
+ enchant? ( =virtual/jpeg-0-r3:0 media-libs/libpng:0= sys-libs/zlib )
+ gdbm? ( >=sys-libs/gdbm-1.8.0:0= )
+ gmp? ( dev-libs/gmp:0= )
+ iconv? ( virtual/libiconv )
+ imap? ( >=virtual/imap-c-client-2[kerberos=,ssl=] )
+ intl? ( dev-libs/icu:= )
+ iodbc? ( dev-db/libiodbc )
+ kerberos? ( virtual/krb5 )
+ ldap? ( >=net-nds/openldap-1.2.11 )
+ ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 )
+ libedit? ( dev-libs/libedit )
+ lmdb? ( dev-db/lmdb:= )
+ mssql? ( dev-db/freetds[mssql] )
+ nls? ( sys-devel/gettext )
+ oci8-instant-client? ( dev-db/oracle-instantclient-basic )
+ odbc? ( >=dev-db/unixODBC-1.8.13 )
+ postgres? ( dev-db/postgresql:* )
+ qdbm? ( dev-db/qdbm )
+ readline? ( sys-libs/readline:0= )
+ recode? ( app-text/recode )
+ session-mm? ( dev-libs/mm )
+ simplexml? ( >=dev-libs/libxml2-2.6.8 )
+ snmp? ( >=net-analyzer/net-snmp-5.2 )
+ soap? ( >=dev-libs/libxml2-2.6.8 )
+ sodium? ( dev-libs/libsodium:= )
+ spell? ( >=app-text/aspell-0.50 )
+ sqlite? ( >=dev-db/sqlite-3.7.6.3 )
+ ssl? (
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl:0= )
+ )
+ tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) )
+ tokyocabinet? ( dev-db/tokyocabinet )
+ truetype? ( =media-libs/freetype-2* )
+ unicode? ( dev-libs/oniguruma:= )
+ wddx? ( >=dev-libs/libxml2-2.6.8 )
+ webp? ( media-libs/libwebp:0= )
+ xml? ( >=dev-libs/libxml2-2.6.8 )
+ xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv )
+ xmlreader? ( >=dev-libs/libxml2-2.6.8 )
+ xmlwriter? ( >=dev-libs/libxml2-2.6.8 )
+ xpm? ( x11-libs/libXpm )
+ xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 )
+ zip? ( sys-libs/zlib:0= )
+ zip-encryption? ( >=dev-libs/libzip-1.2.0:= )
+ zlib? ( sys-libs/zlib:0= )
+"
+
+RDEPEND="${COMMON_DEPEND}
+ virtual/mta
+ fpm? (
+ selinux? ( sec-policy/selinux-phpfpm )
+ systemd? ( sys-apps/systemd ) )"
+
+# Bison isn't actually needed when building from a release tarball
+# However, the configure script will warn if it's absent or if you
+# have an incompatible version installed. See bug 593278.
+DEPEND="${COMMON_DEPEND}
+ app-arch/xz-utils
+ >=sys-devel/bison-3.0.1"
+
+BDEPEND="virtual/pkgconfig"
+
+# Without USE=readline or libedit, the interactive "php -a" CLI will hang.
+REQUIRED_USE="
+ || ( cli cgi fpm apache2 embed phpdbg )
+ cli? ( ^^ ( readline libedit ) )
+ truetype? ( gd zlib )
+ webp? ( gd zlib )
+ cjk? ( gd zlib )
+ exif? ( gd zlib )
+ xpm? ( gd zlib )
+ gd? ( zlib )
+ simplexml? ( xml )
+ soap? ( xml )
+ wddx? ( xml )
+ xmlrpc? ( || ( xml iconv ) )
+ xmlreader? ( xml )
+ xslt? ( xml )
+ ldap-sasl? ( ldap )
+ mhash? ( hash )
+ phar? ( hash )
+ qdbm? ( !gdbm )
+ readline? ( !libedit )
+ recode? ( !imap !mysqli !mysql )
+ session-mm? ( session !threads )
+ mysql? ( hash || ( mysqli pdo ) )
+ mysqli? ( hash )
+ zip-encryption? ( zip )
+"
+
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+ "${FILESDIR}/php-freetype-2.9.1.patch"
+ "${FILESDIR}/php-7.2.13-intl-use-icu-namespace.patch"
+)
+
+PHP_MV="$(ver_cut 1)"
+
+php_install_ini() {
+ local phpsapi="${1}"
+
+ # work out where we are installing the ini file
+ php_set_ini_dir "${phpsapi}"
+
+ # Always install the production INI file, bug 611214.
+ local phpinisrc="php.ini-production-${phpsapi}"
+ cp php.ini-production "${phpinisrc}" || die
+
+ # default to /tmp for save_path, bug #282768
+ sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}" || die
+
+ # Set the extension dir
+ sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" \
+ -i "${phpinisrc}" || die
+
+ # Set the include path to point to where we want to find PEAR packages
+ sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}" || die
+
+ insinto "${PHP_INI_DIR#${EPREFIX}}"
+ newins "${phpinisrc}" php.ini
+
+ elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}"
+ elog
+
+ dodir "${PHP_EXT_INI_DIR#${EPREFIX}}"
+ dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}"
+
+ if use opcache; then
+ elog "Adding opcache to $PHP_EXT_INI_DIR"
+ echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> \
+ "${D}/${PHP_EXT_INI_DIR}"/opcache.ini
+ dosym "../ext/opcache.ini" \
+ "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/opcache.ini"
+ fi
+
+ # SAPI-specific handling
+ if [[ "${sapi}" == "fpm" ]] ; then
+ einfo "Installing FPM config files php-fpm.conf and www.conf"
+ insinto "${PHP_INI_DIR#${EPREFIX}}"
+ doins sapi/fpm/php-fpm.conf
+ insinto "${PHP_INI_DIR#${EPREFIX}}/fpm.d"
+ doins sapi/fpm/www.conf
+ fi
+
+ dodoc php.ini-{development,production}
+}
+
+php_set_ini_dir() {
+ PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}"
+ PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext"
+ PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active"
+}
+
+src_prepare() {
+ default
+
+ # In php-7.x, the FPM pool configuration files have been split off
+ # of the main config. By default the pool config files go in
+ # e.g. /etc/php-fpm.d, which isn't slotted. So here we move the
+ # include directory to a subdirectory "fpm.d" of $PHP_INI_DIR. Later
+ # we'll install the pool configuration file "www.conf" there.
+ php_set_ini_dir fpm
+ sed -i "s~^include=.*$~include=${PHP_INI_DIR}/fpm.d/*.conf~" \
+ sapi/fpm/php-fpm.conf.in \
+ || die 'failed to move the include directory in php-fpm.conf'
+
+ # Bug 669566 - necessary so that build tools are updated for commands like pecl
+ # Force rebuilding aclocal.m4
+ rm -f aclocal.m4 || die "failed to remove aclocal.m4 in src_prepare"
+ eautoreconf
+}
+
+src_configure() {
+ addpredict /usr/share/snmp/mibs/.index #nowarn
+ addpredict /var/lib/net-snmp/mib_indexes #nowarn
+
+ PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}"
+
+ # The php-fpm config file wants localstatedir to be ${EPREFIX}/var
+ # and not the Gentoo default ${EPREFIX}/var/lib. See bug 572002.
+ local our_conf=(
+ --prefix="${PHP_DESTDIR}"
+ --mandir="${PHP_DESTDIR}/man"
+ --infodir="${PHP_DESTDIR}/info"
+ --libdir="${PHP_DESTDIR}/lib"
+ --with-libdir="$(get_libdir)"
+ --localstatedir="${EPREFIX}/var"
+ --without-pear
+ $(use_enable threads maintainer-zts)
+ )
+
+ our_conf+=(
+ $(use_with argon2 password-argon2 "${EPREFIX}/usr")
+ $(use_enable bcmath bcmath)
+ $(use_with bzip2 bz2 "${EPREFIX}/usr")
+ $(use_enable calendar calendar)
+ $(use_enable coverage gcov)
+ $(use_enable ctype ctype)
+ $(use_with curl curl "${EPREFIX}/usr")
+ $(use_enable xml dom)
+ $(use_with enchant enchant "${EPREFIX}/usr")
+ $(use_enable exif exif)
+ $(use_enable fileinfo fileinfo)
+ $(use_enable filter filter)
+ $(use_enable ftp ftp)
+ $(use_with nls gettext "${EPREFIX}/usr")
+ $(use_with gmp gmp "${EPREFIX}/usr")
+ $(use_enable hash hash)
+ $(use_with mhash mhash "${EPREFIX}/usr")
+ $(use_with iconv iconv \
+ $(use elibc_glibc || use elibc_musl || use elibc_FreeBSD || echo "${EPREFIX}/usr"))
+ $(use_enable intl intl)
+ $(use_enable ipv6 ipv6)
+ $(use_enable json json)
+ $(use_with kerberos kerberos "${EPREFIX}/usr")
+ $(use_enable xml libxml)
+ $(use_with xml libxml-dir "${EPREFIX}/usr")
+ $(use_enable unicode mbstring)
+ $(use_with unicode onig "${EPREFIX}/usr")
+ $(use_with ssl openssl "${EPREFIX}/usr")
+ $(use_with ssl openssl-dir "${EPREFIX}/usr")
+ $(use_enable pcntl pcntl)
+ $(use_enable phar phar)
+ $(use_enable pdo pdo)
+ $(use_enable opcache opcache)
+ $(use_with postgres pgsql "${EPREFIX}/usr")
+ $(use_enable posix posix)
+ $(use_with spell pspell "${EPREFIX}/usr")
+ $(use_with recode recode "${EPREFIX}/usr")
+ $(use_enable simplexml simplexml)
+ $(use_enable sharedmem shmop)
+ $(use_with snmp snmp "${EPREFIX}/usr")
+ $(use_enable soap soap)
+ $(use_enable sockets sockets)
+ $(use_with sodium sodium "${EPREFIX}/usr")
+ $(use_with sqlite sqlite3 "${EPREFIX}/usr")
+ $(use_enable sysvipc sysvmsg)
+ $(use_enable sysvipc sysvsem)
+ $(use_enable sysvipc sysvshm)
+ $(use_with tidy tidy "${EPREFIX}/usr")
+ $(use_enable tokenizer tokenizer)
+ $(use_enable wddx wddx)
+ $(use_enable xml xml)
+ $(use_enable xmlreader xmlreader)
+ $(use_enable xmlwriter xmlwriter)
+ $(use_with xmlrpc xmlrpc)
+ $(use_with xslt xsl "${EPREFIX}/usr")
+ $(use_enable zip zip)
+ $(use_with zip-encryption libzip "${EPREFIX}/usr")
+ $(use_with zlib zlib "${EPREFIX}/usr")
+ $(use_enable debug debug)
+ )
+
+ # DBA support
+ if use cdb || use berkdb || use flatfile || use gdbm || use inifile \
+ || use qdbm || use lmdb || use tokyocabinet ; then
+ our_conf+=( "--enable-dba${shared}" )
+ fi
+
+ # DBA drivers support
+ our_conf+=(
+ $(use_with cdb cdb)
+ $(use_with berkdb db4 "${EPREFIX}/usr")
+ $(use_enable flatfile flatfile)
+ $(use_with gdbm gdbm "${EPREFIX}/usr")
+ $(use_enable inifile inifile)
+ $(use_with qdbm qdbm "${EPREFIX}/usr")
+ $(use_with lmdb lmdb "${EPREFIX}/usr")
+ )
+
+ # Support for the GD graphics library
+ our_conf+=(
+ $(use_with truetype freetype-dir "${EPREFIX}/usr")
+ $(use_enable cjk gd-jis-conv)
+ $(use_with gd jpeg-dir "${EPREFIX}/usr")
+ $(use_with gd png-dir "${EPREFIX}/usr")
+ $(use_with xpm xpm-dir "${EPREFIX}/usr")
+ )
+ if use webp; then
+ our_conf+=( --with-webp-dir="${EPREFIX}/usr" )
+ fi
+ # enable gd last, so configure can pick up the previous settings
+ our_conf+=( $(use_with gd gd) )
+
+ # IMAP support
+ if use imap ; then
+ our_conf+=(
+ $(use_with imap imap "${EPREFIX}/usr")
+ $(use_with ssl imap-ssl "${EPREFIX}/usr")
+ )
+ fi
+
+ # Interbase/firebird support
+ our_conf+=( $(use_with firebird interbase "${EPREFIX}/usr") )
+
+ # LDAP support
+ if use ldap ; then
+ our_conf+=(
+ $(use_with ldap ldap "${EPREFIX}/usr")
+ $(use_with ldap-sasl ldap-sasl "${EPREFIX}/usr")
+ )
+ fi
+
+ # MySQL support
+ local mysqllib="mysqlnd"
+ local mysqlilib="mysqlnd"
+
+ our_conf+=( $(use_with mysqli mysqli "${mysqlilib}") )
+
+ local mysqlsock="${EPREFIX}/var/run/mysqld/mysqld.sock"
+ if use mysql || use mysqli ; then
+ our_conf+=( $(use_with mysql mysql-sock "${mysqlsock}") )
+ fi
+
+ # ODBC support
+ our_conf+=(
+ $(use_with odbc unixODBC "${EPREFIX}/usr")
+ $(use_with iodbc iodbc "${EPREFIX}/usr")
+ )
+
+ # Oracle support
+ our_conf+=( $(use_with oci8-instant-client oci8) )
+
+ # PDO support
+ if use pdo ; then
+ our_conf+=(
+ $(use_with mssql pdo-dblib "${EPREFIX}/usr")
+ $(use_with mysql pdo-mysql "${mysqllib}")
+ $(use_with postgres pdo-pgsql)
+ $(use_with sqlite pdo-sqlite "${EPREFIX}/usr")
+ $(use_with firebird pdo-firebird "${EPREFIX}/usr")
+ $(use_with odbc pdo-odbc "unixODBC,${EPREFIX}/usr")
+ $(use_with oci8-instant-client pdo-oci)
+ )
+ fi
+
+ # readline/libedit support
+ our_conf+=(
+ $(use_with readline readline "${EPREFIX}/usr")
+ $(use_with libedit libedit "${EPREFIX}/usr")
+ )
+
+ # Session support
+ if use session ; then
+ our_conf+=( $(use_with session-mm mm "${EPREFIX}/usr") )
+ else
+ our_conf+=( $(use_enable session session) )
+ fi
+
+ # Use pic for shared modules such as apache2's mod_php
+ our_conf+=( --with-pic )
+
+ # we use the system copy of pcre
+ # --with-pcre-regex affects ext/pcre
+ # --with-pcre-dir affects ext/filter and ext/zip
+ # --with-pcre-valgrind cannot be enabled with system pcre
+ # Many arches don't support pcre-jit
+ our_conf+=(
+ --with-pcre-regex="${EPREFIX}/usr"
+ --with-pcre-dir="${EPREFIX}/usr"
+ --without-pcre-valgrind
+ --without-pcre-jit
+ )
+
+ # Catch CFLAGS problems
+ # Fixes bug #14067.
+ # Changed order to run it in reverse for bug #32022 and #12021.
+ replace-cpu-flags "k6*" "i586"
+
+ # Cache the ./configure test results between SAPIs.
+ our_conf+=( --cache-file="${T}/config.cache" )
+
+ # Support user-passed configuration parameters
+ our_conf+=( ${EXTRA_ECONF:-} )
+
+ # Support the Apache2 extras, they must be set globally for all
+ # SAPIs to work correctly, especially for external PHP extensions
+
+ local one_sapi
+ local sapi
+ mkdir -p "${WORKDIR}/sapis-build" || die
+ for one_sapi in $SAPIS ; do
+ use "${one_sapi}" || continue
+ php_set_ini_dir "${one_sapi}"
+
+ # The BUILD_DIR variable is used to determine where to output
+ # the files that autotools creates. This was all originally
+ # based on the autotools-utils eclass.
+ BUILD_DIR="${WORKDIR}/sapis-build/${one_sapi}"
+ cp -a "${S}" "${BUILD_DIR}" || die
+ cd "${BUILD_DIR}" || die
+
+ local sapi_conf=(
+ --with-config-file-path="${PHP_INI_DIR}"
+ --with-config-file-scan-dir="${PHP_EXT_INI_DIR_ACTIVE}"
+ )
+
+ for sapi in $SAPIS ; do
+ case "$sapi" in
+ cli|cgi|embed|fpm|phpdbg)
+ if [[ "${one_sapi}" == "${sapi}" ]] ; then
+ sapi_conf+=( "--enable-${sapi}" )
+ if [[ "fpm" == "${sapi}" ]] ; then
+ sapi_conf+=(
+ $(use_with acl fpm-acl)
+ $(use_with systemd fpm-systemd)
+ )
+ fi
+ else
+ sapi_conf+=( "--disable-${sapi}" )
+ fi
+ ;;
+
+ apache2)
+ if [[ "${one_sapi}" == "${sapi}" ]] ; then
+ sapi_conf+=( --with-apxs2="${EPREFIX}/usr/bin/apxs" )
+ else
+ sapi_conf+=( --without-apxs2 )
+ fi
+ ;;
+ esac
+ done
+
+ # Construct the $myeconfargs array by concatenating $our_conf
+ # (the common args) and $sapi_conf (the SAPI-specific args).
+ local myeconfargs=( "${our_conf[@]}" )
+ myeconfargs+=( "${sapi_conf[@]}" )
+
+ pushd "${BUILD_DIR}" > /dev/null || die
+ econf "${myeconfargs[@]}"
+ popd > /dev/null || die
+ done
+}
+
+src_compile() {
+ # snmp seems to run during src_compile, too (bug #324739)
+ addpredict /usr/share/snmp/mibs/.index #nowarn
+ addpredict /var/lib/net-snmp/mib_indexes #nowarn
+
+ local sapi
+ for sapi in ${SAPIS} ; do
+ if use "${sapi}"; then
+ cd "${WORKDIR}/sapis-build/$sapi" || \
+ die "Failed to change dir to ${WORKDIR}/sapis-build/$1"
+ emake
+ fi
+ done
+}
+
+src_install() {
+ # see bug #324739 for what happens when we don't have that
+ addpredict /usr/share/snmp/mibs/.index #nowarn
+
+ # grab the first SAPI that got built and install common files from there
+ local first_sapi="",sapi=""
+ for sapi in $SAPIS ; do
+ if use $sapi ; then
+ first_sapi=$sapi
+ break
+ fi
+ done
+
+ # Makefile forgets to create this before trying to write to it...
+ dodir "${PHP_DESTDIR#${EPREFIX}}/bin"
+
+ # Install php environment (without any sapis)
+ cd "${WORKDIR}/sapis-build/$first_sapi" || die
+ emake INSTALL_ROOT="${D}" \
+ install-build install-headers install-programs
+
+ local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)"
+
+ # Create the directory where we'll put version-specific php scripts
+ keepdir "/usr/share/php${PHP_MV}"
+
+ local file=""
+ local sapi_list=""
+
+ for sapi in ${SAPIS}; do
+ if use "${sapi}" ; then
+ einfo "Installing SAPI: ${sapi}"
+ cd "${WORKDIR}/sapis-build/${sapi}" || die
+
+ if [[ "${sapi}" == "apache2" ]] ; then
+ # We're specifically not using emake install-sapi as libtool
+ # may cause unnecessary relink failures (see bug #351266)
+ insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/"
+ newins ".libs/libphp${PHP_MV}$(get_libname)" \
+ "libphp${PHP_MV}$(get_libname)"
+ keepdir "/usr/$(get_libdir)/apache2/modules"
+ else
+ # needed each time, php_install_ini would reset it
+ local dest="${PHP_DESTDIR#${EPREFIX}}"
+ into "${dest}"
+ case "$sapi" in
+ cli)
+ source="sapi/cli/php"
+ # Install the "phar" archive utility.
+ if use phar ; then
+ emake INSTALL_ROOT="${D}" install-pharcmd
+ dosym "..${dest#/usr}/bin/phar" "/usr/bin/phar${SLOT}"
+ fi
+ ;;
+ cgi)
+ source="sapi/cgi/php-cgi"
+ ;;
+ fpm)
+ source="sapi/fpm/php-fpm"
+ ;;
+ embed)
+ source="libs/libphp${PHP_MV}$(get_libname)"
+ ;;
+ phpdbg)
+ source="sapi/phpdbg/phpdbg"
+ ;;
+ *)
+ die "unhandled sapi in src_install"
+ ;;
+ esac
+
+ if [[ "${source}" == *"$(get_libname)" ]]; then
+ dolib.so "${source}"
+ else
+ dobin "${source}"
+ local name="$(basename ${source})"
+ dosym "..${dest#/usr}/bin/${name}" "/usr/bin/${name}${SLOT}"
+ fi
+ fi
+
+ php_install_ini "${sapi}"
+
+ # construct correct SAPI string for php-config
+ # thanks to ferringb for the bash voodoo
+ if [[ "${sapi}" == "apache2" ]]; then
+ sapi_list="${sapi_list:+${sapi_list} }apache2handler"
+ else
+ sapi_list="${sapi_list:+${sapi_list} }${sapi}"
+ fi
+ fi
+ done
+
+ # Installing opcache module
+ if use opcache ; then
+ into "${PHP_DESTDIR#${EPREFIX}}"
+ dolib.so "modules/opcache$(get_libname)"
+ fi
+
+ # Install env.d files
+ newenvd "${FILESDIR}/20php5-envd" "20php${SLOT}"
+ sed -e "s|/lib/|/$(get_libdir)/|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
+ sed -e "s|php5|php${SLOT}|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
+
+ # set php-config variable correctly (bug #278439)
+ sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \
+ "${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config" || die
+
+ if use fpm ; then
+ if use systemd; then
+ systemd_newunit "${FILESDIR}/php-fpm_at.service" \
+ "php-fpm@${SLOT}.service"
+ else
+ systemd_newunit "${FILESDIR}/php-fpm_at-simple.service" \
+ "php-fpm@${SLOT}.service"
+ fi
+ fi
+}
+
+src_test() {
+ echo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+ PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php"
+ if [[ ! -x "${PHP_BIN}" ]] ; then
+ ewarn "Test phase requires USE=cli, skipping"
+ return
+ else
+ export TEST_PHP_EXECUTABLE="${PHP_BIN}"
+ fi
+
+ if [[ -x "${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi" ]] ; then
+ export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi"
+ fi
+
+ if [[ -x "${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg" ]] ; then
+ export TEST_PHPDBG_EXECUTABLE="${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg"
+ fi
+
+ REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n -d \
+ "session.save_path=${T}" \
+ "${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d \
+ "session.save_path=${T}"
+
+ for name in ${EXPECTED_TEST_FAILURES}; do
+ mv "${name}.out" "${name}.out.orig" 2>/dev/null || die
+ done
+
+ local failed="$(find -name '*.out')"
+ if [[ ${failed} != "" ]] ; then
+ ewarn "The following test cases failed unexpectedly:"
+ for name in ${failed}; do
+ ewarn " ${name/.out/}"
+ done
+ else
+ einfo "No unexpected test failures, all fine"
+ fi
+
+ if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then
+ local passed=""
+ for name in ${EXPECTED_TEST_FAILURES}; do
+ [[ -f "${name}.diff" ]] && continue
+ passed="${passed} ${name}"
+ done
+ if [[ ${passed} != "" ]] ; then
+ einfo "The following test cases passed unexpectedly:"
+ for name in ${passed}; do
+ ewarn " ${passed}"
+ done
+ else
+ einfo "None of the known-to-fail tests passed, all fine"
+ fi
+ fi
+}
+
+pkg_postinst() {
+ # Output some general info to the user
+ if use apache2 ; then
+ elog
+ elog "To enable PHP in apache, you will need to add \"-D PHP\" to"
+ elog "your apache2 command. OpenRC users can append that string to"
+ elog "APACHE2_OPTS in /etc/conf.d/apache2."
+ elog
+ elog "The apache module configuration file 70_mod_php.conf is"
+ elog "provided (and maintained) by eselect-php."
+ elog
+ fi
+
+ # Create the symlinks for php
+ local m
+ for m in ${SAPIS}; do
+ [[ ${m} == 'embed' ]] && continue;
+ if use $m ; then
+ local ci=$(eselect php show $m)
+ if [[ -z $ci ]]; then
+ eselect php set $m php${SLOT} || die
+ einfo "Switched ${m} to use php:${SLOT}"
+ einfo
+ elif [[ $ci != "php${SLOT}" ]] ; then
+ elog "To switch $m to use php:${SLOT}, run"
+ elog " eselect php set $m php${SLOT}"
+ elog
+ fi
+ fi
+ done
+
+ # Remove dead symlinks for SAPIs that were just disabled. For
+ # example, if the user has the cgi SAPI enabled, then he has an
+ # eselect-php symlink for it. If he later reinstalls PHP with
+ # USE="-cgi", that symlink will break. This call to eselect is
+ # supposed to remove that dead link per bug 572436.
+ eselect php cleanup || die
+
+ if ! has "php${SLOT/./-}" ${PHP_TARGETS}; then
+ elog "To build extensions for this version of PHP, you will need to"
+ elog "add php${SLOT/./-} to your PHP_TARGETS USE_EXPAND variable."
+ elog
+ fi
+
+ # Warn about the removal of PHP_INI_VERSION if the user has it set.
+ if [[ -n "${PHP_INI_VERSION}" ]]; then
+ ewarn 'The PHP_INI_VERSION variable has been phased out. You may'
+ ewarn 'remove it from your configuration at your convenience. See'
+ ewarn
+ ewarn ' https://bugs.gentoo.org/611214'
+ ewarn
+ ewarn 'for more information.'
+ fi
+
+ elog "For details on how version slotting works, please see"
+ elog "the wiki:"
+ elog
+ elog " https://wiki.gentoo.org/wiki/PHP"
+ elog
+}
+
+pkg_postrm() {
+ # This serves two purposes. First, if we have just removed the last
+ # installed version of PHP, then this will remove any dead symlinks
+ # belonging to eselect-php. Second, if a user upgrades slots from
+ # (say) 5.6 to 7.0 and depcleans the old slot, then this will update
+ # his existing symlinks to point to the new 7.0 installation. The
+ # latter is bug 432962.
+ #
+ # Note: the eselect-php package may not be installed at this point,
+ # so we can't die() if this command fails.
+ eselect php cleanup
+}
diff --git a/dev-lang/php/php-7.3.23.ebuild b/dev-lang/php/php-7.3.23.ebuild
new file mode 100644
index 000000000000..705d68d153f3
--- /dev/null
+++ b/dev-lang/php/php-7.3.23.ebuild
@@ -0,0 +1,760 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit flag-o-matic systemd autotools
+
+MY_PV=${PV/_rc/RC}
+DESCRIPTION="The PHP language runtime engine"
+HOMEPAGE="https://www.php.net/"
+SRC_URI="https://www.php.net/distributions/${P}.tar.xz"
+
+LICENSE="PHP-3.01
+ BSD
+ Zend-2.0
+ bcmath? ( LGPL-2.1+ )
+ fpm? ( BSD-2 )
+ gd? ( gd )
+ unicode? ( BSD-2 LGPL-2.1 )"
+
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+# We can build the following SAPIs in the given order
+SAPIS="embed cli cgi fpm apache2 phpdbg"
+
+# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
+IUSE="${IUSE}
+ ${SAPIS/cli/+cli}
+ threads"
+
+IUSE="${IUSE} acl argon2 bcmath berkdb bzip2 calendar cdb cjk
+ coverage +ctype curl debug
+ enchant exif +fileinfo +filter firebird
+ +flatfile ftp gd gdbm gmp +hash +iconv imap inifile
+ intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit libressl lmdb
+ mhash mssql mysql mysqli nls
+ oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm
+ readline recode selinux +session session-mm sharedmem
+ +simplexml snmp soap sockets sodium spell sqlite ssl
+ sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode wddx webp
+ +xml xmlreader xmlwriter xmlrpc xpm xslt zip zip-encryption zlib"
+
+# The supported (that is, autodetected) versions of BDB are listed in
+# the ./configure script. Other versions *work*, but we need to stick to
+# the ones that can be detected to avoid a repeat of bug #564824.
+COMMON_DEPEND="
+ >=app-eselect/eselect-php-0.9.1[apache2?,fpm?]
+ >=dev-libs/libpcre2-10.30[unicode]
+ fpm? ( acl? ( sys-apps/acl ) )
+ apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] )
+ argon2? ( app-crypt/argon2:= )
+ berkdb? ( || ( sys-libs/db:5.3
+ sys-libs/db:5.1
+ sys-libs/db:4.8
+ sys-libs/db:4.7
+ sys-libs/db:4.6
+ sys-libs/db:4.5 ) )
+ bzip2? ( app-arch/bzip2:0= )
+ cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
+ coverage? ( dev-util/lcov )
+ curl? ( >=net-misc/curl-7.10.5 )
+ enchant? ( =virtual/jpeg-0-r3:0 media-libs/libpng:0= >=sys-libs/zlib-1.2.0.4 )
+ gdbm? ( >=sys-libs/gdbm-1.8.0:0= )
+ gmp? ( dev-libs/gmp:0= )
+ iconv? ( virtual/libiconv )
+ imap? ( >=virtual/imap-c-client-2[kerberos=,ssl=] )
+ intl? ( dev-libs/icu:= )
+ iodbc? ( dev-db/libiodbc )
+ kerberos? ( virtual/krb5 )
+ ldap? ( >=net-nds/openldap-1.2.11 )
+ ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 )
+ libedit? ( dev-libs/libedit )
+ lmdb? ( dev-db/lmdb:= )
+ mssql? ( dev-db/freetds[mssql] )
+ nls? ( sys-devel/gettext )
+ oci8-instant-client? ( dev-db/oracle-instantclient-basic )
+ odbc? ( >=dev-db/unixODBC-1.8.13 )
+ postgres? ( dev-db/postgresql:* )
+ qdbm? ( dev-db/qdbm )
+ readline? ( sys-libs/readline:0= )
+ recode? ( app-text/recode )
+ session-mm? ( dev-libs/mm )
+ simplexml? ( >=dev-libs/libxml2-2.6.8 )
+ snmp? ( >=net-analyzer/net-snmp-5.2 )
+ soap? ( >=dev-libs/libxml2-2.6.8 )
+ sodium? ( dev-libs/libsodium:= )
+ spell? ( >=app-text/aspell-0.50 )
+ sqlite? ( >=dev-db/sqlite-3.7.6.3 )
+ ssl? (
+ !libressl? ( >=dev-libs/openssl-1.0.1:0= )
+ libressl? ( dev-libs/libressl:0= )
+ )
+ tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) )
+ tokyocabinet? ( dev-db/tokyocabinet )
+ truetype? ( =media-libs/freetype-2* )
+ unicode? ( dev-libs/oniguruma:= )
+ wddx? ( >=dev-libs/libxml2-2.6.8 )
+ webp? ( media-libs/libwebp:0= )
+ xml? ( >=dev-libs/libxml2-2.6.8 )
+ xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv )
+ xmlreader? ( >=dev-libs/libxml2-2.6.8 )
+ xmlwriter? ( >=dev-libs/libxml2-2.6.8 )
+ xpm? ( x11-libs/libXpm )
+ xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 )
+ zip? ( >=sys-libs/zlib-1.2.0.4:0= )
+ zip-encryption? ( >=dev-libs/libzip-1.2.0:= )
+ zlib? ( >=sys-libs/zlib-1.2.0.4:0= )
+"
+
+RDEPEND="${COMMON_DEPEND}
+ virtual/mta
+ fpm? (
+ selinux? ( sec-policy/selinux-phpfpm )
+ systemd? ( sys-apps/systemd ) )"
+
+# Bison isn't actually needed when building from a release tarball
+# However, the configure script will warn if it's absent or if you
+# have an incompatible version installed. See bug 593278.
+DEPEND="${COMMON_DEPEND}
+ app-arch/xz-utils
+ >=sys-devel/bison-3.0.1"
+
+BDEPEND="virtual/pkgconfig"
+
+# Without USE=readline or libedit, the interactive "php -a" CLI will hang.
+REQUIRED_USE="
+ || ( cli cgi fpm apache2 embed phpdbg )
+ cli? ( ^^ ( readline libedit ) )
+ truetype? ( gd zlib )
+ webp? ( gd zlib )
+ cjk? ( gd zlib )
+ exif? ( gd zlib )
+ xpm? ( gd zlib )
+ gd? ( zlib )
+ simplexml? ( xml )
+ soap? ( xml )
+ wddx? ( xml )
+ xmlrpc? ( || ( xml iconv ) )
+ xmlreader? ( xml )
+ xslt? ( xml )
+ ldap-sasl? ( ldap )
+ mhash? ( hash )
+ phar? ( hash )
+ qdbm? ( !gdbm )
+ readline? ( !libedit )
+ recode? ( !imap !mysqli !mysql )
+ session-mm? ( session !threads )
+ mysql? ( || ( mysqli pdo ) )
+ zip-encryption? ( zip )
+"
+
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+ "${FILESDIR}/php-freetype-2.9.1.patch"
+)
+
+PHP_MV="$(ver_cut 1)"
+
+php_install_ini() {
+ local phpsapi="${1}"
+
+ # work out where we are installing the ini file
+ php_set_ini_dir "${phpsapi}"
+
+ # Always install the production INI file, bug 611214.
+ local phpinisrc="php.ini-production-${phpsapi}"
+ cp php.ini-production "${phpinisrc}" || die
+
+ # default to /tmp for save_path, bug #282768
+ sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}" || die
+
+ # Set the extension dir
+ sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" \
+ -i "${phpinisrc}" || die
+
+ # Set the include path to point to where we want to find PEAR packages
+ sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}" || die
+
+ insinto "${PHP_INI_DIR#${EPREFIX}}"
+ newins "${phpinisrc}" php.ini
+
+ elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}"
+ elog
+
+ dodir "${PHP_EXT_INI_DIR#${EPREFIX}}"
+ dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}"
+
+ if use opcache; then
+ elog "Adding opcache to $PHP_EXT_INI_DIR"
+ echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> \
+ "${D}/${PHP_EXT_INI_DIR}"/opcache.ini
+ dosym "../ext/opcache.ini" \
+ "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/opcache.ini"
+ fi
+
+ # SAPI-specific handling
+ if [[ "${sapi}" == "fpm" ]] ; then
+ einfo "Installing FPM config files php-fpm.conf and www.conf"
+ insinto "${PHP_INI_DIR#${EPREFIX}}"
+ doins sapi/fpm/php-fpm.conf
+ insinto "${PHP_INI_DIR#${EPREFIX}}/fpm.d"
+ doins sapi/fpm/www.conf
+ fi
+
+ dodoc php.ini-{development,production}
+}
+
+php_set_ini_dir() {
+ PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}"
+ PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext"
+ PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active"
+}
+
+src_prepare() {
+ default
+
+ # In php-7.x, the FPM pool configuration files have been split off
+ # of the main config. By default the pool config files go in
+ # e.g. /etc/php-fpm.d, which isn't slotted. So here we move the
+ # include directory to a subdirectory "fpm.d" of $PHP_INI_DIR. Later
+ # we'll install the pool configuration file "www.conf" there.
+ php_set_ini_dir fpm
+ sed -i "s~^include=.*$~include=${PHP_INI_DIR}/fpm.d/*.conf~" \
+ sapi/fpm/php-fpm.conf.in \
+ || die 'failed to move the include directory in php-fpm.conf'
+
+ # Bug 669566 - necessary so that build tools are updated for commands like pecl
+ # Force rebuilding aclocal.m4
+ rm -f aclocal.m4 || die "failed to remove aclocal.m4 in src_prepare"
+ eautoreconf
+}
+
+src_configure() {
+ addpredict /usr/share/snmp/mibs/.index #nowarn
+ addpredict /var/lib/net-snmp/mib_indexes #nowarn
+
+ PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}"
+
+ # The php-fpm config file wants localstatedir to be ${EPREFIX}/var
+ # and not the Gentoo default ${EPREFIX}/var/lib. See bug 572002.
+ local our_conf=(
+ --prefix="${PHP_DESTDIR}"
+ --mandir="${PHP_DESTDIR}/man"
+ --infodir="${PHP_DESTDIR}/info"
+ --libdir="${PHP_DESTDIR}/lib"
+ --with-libdir="$(get_libdir)"
+ --localstatedir="${EPREFIX}/var"
+ --without-pear
+ $(use_enable threads maintainer-zts)
+ )
+
+ our_conf+=(
+ $(use_with argon2 password-argon2 "${EPREFIX}/usr")
+ $(use_enable bcmath bcmath)
+ $(use_with bzip2 bz2 "${EPREFIX}/usr")
+ $(use_enable calendar calendar)
+ $(use_enable coverage gcov)
+ $(use_enable ctype ctype)
+ $(use_with curl curl "${EPREFIX}/usr")
+ $(use_enable xml dom)
+ $(use_with enchant enchant "${EPREFIX}/usr")
+ $(use_enable exif exif)
+ $(use_enable fileinfo fileinfo)
+ $(use_enable filter filter)
+ $(use_enable ftp ftp)
+ $(use_with nls gettext "${EPREFIX}/usr")
+ $(use_with gmp gmp "${EPREFIX}/usr")
+ $(use_enable hash hash)
+ $(use_with mhash mhash "${EPREFIX}/usr")
+ $(use_with iconv iconv \
+ $(use elibc_glibc || use elibc_musl || use elibc_FreeBSD || echo "${EPREFIX}/usr"))
+ $(use_enable intl intl)
+ $(use_enable ipv6 ipv6)
+ $(use_enable json json)
+ $(use_with kerberos kerberos "${EPREFIX}/usr")
+ $(use_enable xml libxml)
+ $(use_with xml libxml-dir "${EPREFIX}/usr")
+ $(use_enable unicode mbstring)
+ $(use_with unicode onig "${EPREFIX}/usr")
+ $(use_with ssl openssl "${EPREFIX}/usr")
+ $(use_with ssl openssl-dir "${EPREFIX}/usr")
+ $(use_enable pcntl pcntl)
+ $(use_enable phar phar)
+ $(use_enable pdo pdo)
+ $(use_enable opcache opcache)
+ $(use_with postgres pgsql "${EPREFIX}/usr")
+ $(use_enable posix posix)
+ $(use_with spell pspell "${EPREFIX}/usr")
+ $(use_with recode recode "${EPREFIX}/usr")
+ $(use_enable simplexml simplexml)
+ $(use_enable sharedmem shmop)
+ $(use_with snmp snmp "${EPREFIX}/usr")
+ $(use_enable soap soap)
+ $(use_enable sockets sockets)
+ $(use_with sodium sodium "${EPREFIX}/usr")
+ $(use_with sqlite sqlite3 "${EPREFIX}/usr")
+ $(use_enable sysvipc sysvmsg)
+ $(use_enable sysvipc sysvsem)
+ $(use_enable sysvipc sysvshm)
+ $(use_with tidy tidy "${EPREFIX}/usr")
+ $(use_enable tokenizer tokenizer)
+ $(use_enable wddx wddx)
+ $(use_enable xml xml)
+ $(use_enable xmlreader xmlreader)
+ $(use_enable xmlwriter xmlwriter)
+ $(use_with xmlrpc xmlrpc)
+ $(use_with xslt xsl "${EPREFIX}/usr")
+ $(use_enable zip zip)
+ $(use_with zip-encryption libzip "${EPREFIX}/usr")
+ $(use_with zlib zlib "${EPREFIX}/usr")
+ $(use_enable debug debug)
+ )
+
+ # DBA support
+ if use cdb || use berkdb || use flatfile || use gdbm || use inifile \
+ || use qdbm || use lmdb || use tokyocabinet ; then
+ our_conf+=( "--enable-dba${shared}" )
+ fi
+
+ # DBA drivers support
+ our_conf+=(
+ $(use_with cdb cdb)
+ $(use_with berkdb db4 "${EPREFIX}/usr")
+ $(use_enable flatfile flatfile)
+ $(use_with gdbm gdbm "${EPREFIX}/usr")
+ $(use_enable inifile inifile)
+ $(use_with qdbm qdbm "${EPREFIX}/usr")
+ $(use_with lmdb lmdb "${EPREFIX}/usr")
+ )
+
+ # Support for the GD graphics library
+ our_conf+=(
+ $(use_with truetype freetype-dir "${EPREFIX}/usr")
+ $(use_enable cjk gd-jis-conv)
+ $(use_with gd jpeg-dir "${EPREFIX}/usr")
+ $(use_with gd png-dir "${EPREFIX}/usr")
+ $(use_with xpm xpm-dir "${EPREFIX}/usr")
+ )
+ if use webp; then
+ our_conf+=( --with-webp-dir="${EPREFIX}/usr" )
+ fi
+ # enable gd last, so configure can pick up the previous settings
+ our_conf+=( $(use_with gd gd) )
+
+ # IMAP support
+ if use imap ; then
+ our_conf+=(
+ $(use_with imap imap "${EPREFIX}/usr")
+ $(use_with ssl imap-ssl "${EPREFIX}/usr")
+ )
+ fi
+
+ # Interbase/firebird support
+ our_conf+=( $(use_with firebird interbase "${EPREFIX}/usr") )
+
+ # LDAP support
+ if use ldap ; then
+ our_conf+=(
+ $(use_with ldap ldap "${EPREFIX}/usr")
+ $(use_with ldap-sasl ldap-sasl "${EPREFIX}/usr")
+ )
+ fi
+
+ # MySQL support
+ local mysqllib="mysqlnd"
+ local mysqlilib="mysqlnd"
+
+ our_conf+=( $(use_with mysqli mysqli "${mysqlilib}") )
+
+ local mysqlsock="${EPREFIX}/var/run/mysqld/mysqld.sock"
+ if use mysql || use mysqli ; then
+ our_conf+=( $(use_with mysql mysql-sock "${mysqlsock}") )
+ fi
+
+ # ODBC support
+ our_conf+=(
+ $(use_with odbc unixODBC "${EPREFIX}/usr")
+ $(use_with iodbc iodbc "${EPREFIX}/usr")
+ )
+
+ # Oracle support
+ our_conf+=( $(use_with oci8-instant-client oci8) )
+
+ # PDO support
+ if use pdo ; then
+ our_conf+=(
+ $(use_with mssql pdo-dblib "${EPREFIX}/usr")
+ $(use_with mysql pdo-mysql "${mysqllib}")
+ $(use_with postgres pdo-pgsql)
+ $(use_with sqlite pdo-sqlite "${EPREFIX}/usr")
+ $(use_with firebird pdo-firebird "${EPREFIX}/usr")
+ $(use_with odbc pdo-odbc "unixODBC,${EPREFIX}/usr")
+ $(use_with oci8-instant-client pdo-oci)
+ )
+ fi
+
+ # readline/libedit support
+ our_conf+=(
+ $(use_with readline readline "${EPREFIX}/usr")
+ $(use_with libedit libedit "${EPREFIX}/usr")
+ )
+
+ # Session support
+ if use session ; then
+ our_conf+=( $(use_with session-mm mm "${EPREFIX}/usr") )
+ else
+ our_conf+=( $(use_enable session session) )
+ fi
+
+ # Use pic for shared modules such as apache2's mod_php
+ our_conf+=( --with-pic )
+
+ # we use the system copy of pcre
+ # --with-pcre-regex affects ext/pcre
+ # --with-pcre-dir affects ext/filter and ext/zip
+ # --with-pcre-valgrind cannot be enabled with system pcre
+ # Many arches don't support pcre-jit
+ our_conf+=(
+ --with-pcre-regex="${EPREFIX}/usr"
+ --with-pcre-dir="${EPREFIX}/usr"
+ --without-pcre-valgrind
+ --without-pcre-jit
+ )
+
+ # Catch CFLAGS problems
+ # Fixes bug #14067.
+ # Changed order to run it in reverse for bug #32022 and #12021.
+ replace-cpu-flags "k6*" "i586"
+
+ # Cache the ./configure test results between SAPIs.
+ our_conf+=( --cache-file="${T}/config.cache" )
+
+ # Support user-passed configuration parameters
+ our_conf+=( ${EXTRA_ECONF:-} )
+
+ # Support the Apache2 extras, they must be set globally for all
+ # SAPIs to work correctly, especially for external PHP extensions
+
+ local one_sapi
+ local sapi
+ mkdir -p "${WORKDIR}/sapis-build" || die
+ for one_sapi in $SAPIS ; do
+ use "${one_sapi}" || continue
+ php_set_ini_dir "${one_sapi}"
+
+ # The BUILD_DIR variable is used to determine where to output
+ # the files that autotools creates. This was all originally
+ # based on the autotools-utils eclass.
+ BUILD_DIR="${WORKDIR}/sapis-build/${one_sapi}"
+ cp -a "${S}" "${BUILD_DIR}" || die
+ cd "${BUILD_DIR}" || die
+
+ local sapi_conf=(
+ --with-config-file-path="${PHP_INI_DIR}"
+ --with-config-file-scan-dir="${PHP_EXT_INI_DIR_ACTIVE}"
+ )
+
+ for sapi in $SAPIS ; do
+ case "$sapi" in
+ cli|cgi|embed|fpm|phpdbg)
+ if [[ "${one_sapi}" == "${sapi}" ]] ; then
+ sapi_conf+=( "--enable-${sapi}" )
+ if [[ "fpm" == "${sapi}" ]] ; then
+ sapi_conf+=(
+ $(use_with acl fpm-acl)
+ $(use_with systemd fpm-systemd)
+ )
+ fi
+ else
+ sapi_conf+=( "--disable-${sapi}" )
+ fi
+ ;;
+
+ apache2)
+ if [[ "${one_sapi}" == "${sapi}" ]] ; then
+ sapi_conf+=( --with-apxs2="${EPREFIX}/usr/bin/apxs" )
+ else
+ sapi_conf+=( --without-apxs2 )
+ fi
+ ;;
+ esac
+ done
+
+ # Construct the $myeconfargs array by concatenating $our_conf
+ # (the common args) and $sapi_conf (the SAPI-specific args).
+ local myeconfargs=( "${our_conf[@]}" )
+ myeconfargs+=( "${sapi_conf[@]}" )
+
+ pushd "${BUILD_DIR}" > /dev/null || die
+ econf "${myeconfargs[@]}"
+ popd > /dev/null || die
+ done
+}
+
+src_compile() {
+ # snmp seems to run during src_compile, too (bug #324739)
+ addpredict /usr/share/snmp/mibs/.index #nowarn
+ addpredict /var/lib/net-snmp/mib_indexes #nowarn
+
+ local sapi
+ for sapi in ${SAPIS} ; do
+ if use "${sapi}"; then
+ cd "${WORKDIR}/sapis-build/$sapi" || \
+ die "Failed to change dir to ${WORKDIR}/sapis-build/$1"
+ emake
+ fi
+ done
+}
+
+src_install() {
+ # see bug #324739 for what happens when we don't have that
+ addpredict /usr/share/snmp/mibs/.index #nowarn
+
+ # grab the first SAPI that got built and install common files from there
+ local first_sapi="", sapi=""
+ for sapi in $SAPIS ; do
+ if use $sapi ; then
+ first_sapi=$sapi
+ break
+ fi
+ done
+
+ # Makefile forgets to create this before trying to write to it...
+ dodir "${PHP_DESTDIR#${EPREFIX}}/bin"
+
+ # Install php environment (without any sapis)
+ cd "${WORKDIR}/sapis-build/$first_sapi" || die
+ emake INSTALL_ROOT="${D}" \
+ install-build install-headers install-programs
+
+ local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)"
+
+ # Create the directory where we'll put version-specific php scripts
+ keepdir "/usr/share/php${PHP_MV}"
+
+ local file=""
+ local sapi_list=""
+
+ for sapi in ${SAPIS}; do
+ if use "${sapi}" ; then
+ einfo "Installing SAPI: ${sapi}"
+ cd "${WORKDIR}/sapis-build/${sapi}" || die
+
+ if [[ "${sapi}" == "apache2" ]] ; then
+ # We're specifically not using emake install-sapi as libtool
+ # may cause unnecessary relink failures (see bug #351266)
+ insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/"
+ newins ".libs/libphp${PHP_MV}$(get_libname)" \
+ "libphp${PHP_MV}$(get_libname)"
+ keepdir "/usr/$(get_libdir)/apache2/modules"
+ else
+ # needed each time, php_install_ini would reset it
+ local dest="${PHP_DESTDIR#${EPREFIX}}"
+ into "${dest}"
+ case "$sapi" in
+ cli)
+ source="sapi/cli/php"
+ # Install the "phar" archive utility.
+ if use phar ; then
+ emake INSTALL_ROOT="${D}" install-pharcmd
+ dosym "..${dest#/usr}/bin/phar" "/usr/bin/phar${SLOT}"
+ fi
+ ;;
+ cgi)
+ source="sapi/cgi/php-cgi"
+ ;;
+ fpm)
+ source="sapi/fpm/php-fpm"
+ ;;
+ embed)
+ source="libs/libphp${PHP_MV}$(get_libname)"
+ ;;
+ phpdbg)
+ source="sapi/phpdbg/phpdbg"
+ ;;
+ *)
+ die "unhandled sapi in src_install"
+ ;;
+ esac
+
+ if [[ "${source}" == *"$(get_libname)" ]]; then
+ dolib.so "${source}"
+ else
+ dobin "${source}"
+ local name="$(basename ${source})"
+ dosym "..${dest#/usr}/bin/${name}" "/usr/bin/${name}${SLOT}"
+ fi
+ fi
+
+ php_install_ini "${sapi}"
+
+ # construct correct SAPI string for php-config
+ # thanks to ferringb for the bash voodoo
+ if [[ "${sapi}" == "apache2" ]]; then
+ sapi_list="${sapi_list:+${sapi_list} }apache2handler"
+ else
+ sapi_list="${sapi_list:+${sapi_list} }${sapi}"
+ fi
+ fi
+ done
+
+ # Installing opcache module
+ if use opcache ; then
+ into "${PHP_DESTDIR#${EPREFIX}}"
+ dolib.so "modules/opcache$(get_libname)"
+ fi
+
+ # Install env.d files
+ newenvd "${FILESDIR}/20php5-envd" "20php${SLOT}"
+ sed -e "s|/lib/|/$(get_libdir)/|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
+ sed -e "s|php5|php${SLOT}|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
+
+ # set php-config variable correctly (bug #278439)
+ sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \
+ "${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config" || die
+
+ if use fpm ; then
+ if use systemd; then
+ systemd_newunit "${FILESDIR}/php-fpm_at.service" \
+ "php-fpm@${SLOT}.service"
+ else
+ systemd_newunit "${FILESDIR}/php-fpm_at-simple.service" \
+ "php-fpm@${SLOT}.service"
+ fi
+ fi
+}
+
+src_test() {
+ echo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+ PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php"
+ if [[ ! -x "${PHP_BIN}" ]] ; then
+ ewarn "Test phase requires USE=cli, skipping"
+ return
+ else
+ export TEST_PHP_EXECUTABLE="${PHP_BIN}"
+ fi
+
+ if [[ -x "${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi" ]] ; then
+ export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi"
+ fi
+
+ if [[ -x "${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg" ]] ; then
+ export TEST_PHPDBG_EXECUTABLE="${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg"
+ fi
+
+ REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n -d \
+ "session.save_path=${T}" \
+ "${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d \
+ "session.save_path=${T}"
+
+ for name in ${EXPECTED_TEST_FAILURES}; do
+ mv "${name}.out" "${name}.out.orig" 2>/dev/null || die
+ done
+
+ local failed="$(find -name '*.out')"
+ if [[ ${failed} != "" ]] ; then
+ ewarn "The following test cases failed unexpectedly:"
+ for name in ${failed}; do
+ ewarn " ${name/.out/}"
+ done
+ else
+ einfo "No unexpected test failures, all fine"
+ fi
+
+ if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then
+ local passed=""
+ for name in ${EXPECTED_TEST_FAILURES}; do
+ [[ -f "${name}.diff" ]] && continue
+ passed="${passed} ${name}"
+ done
+ if [[ ${passed} != "" ]] ; then
+ einfo "The following test cases passed unexpectedly:"
+ for name in ${passed}; do
+ ewarn " ${passed}"
+ done
+ else
+ einfo "None of the known-to-fail tests passed, all fine"
+ fi
+ fi
+}
+
+pkg_postinst() {
+ # Output some general info to the user
+ if use apache2 ; then
+ elog
+ elog "To enable PHP in apache, you will need to add \"-D PHP\" to"
+ elog "your apache2 command. OpenRC users can append that string to"
+ elog "APACHE2_OPTS in /etc/conf.d/apache2."
+ elog
+ elog "The apache module configuration file 70_mod_php.conf is"
+ elog "provided (and maintained) by eselect-php."
+ elog
+ fi
+
+ # Create the symlinks for php
+ local m
+ for m in ${SAPIS}; do
+ [[ ${m} == 'embed' ]] && continue;
+ if use $m ; then
+ local ci=$(eselect php show $m)
+ if [[ -z $ci ]]; then
+ eselect php set $m php${SLOT} || die
+ einfo "Switched ${m} to use php:${SLOT}"
+ einfo
+ elif [[ $ci != "php${SLOT}" ]] ; then
+ elog "To switch $m to use php:${SLOT}, run"
+ elog " eselect php set $m php${SLOT}"
+ elog
+ fi
+ fi
+ done
+
+ # Remove dead symlinks for SAPIs that were just disabled. For
+ # example, if the user has the cgi SAPI enabled, then he has an
+ # eselect-php symlink for it. If he later reinstalls PHP with
+ # USE="-cgi", that symlink will break. This call to eselect is
+ # supposed to remove that dead link per bug 572436.
+ eselect php cleanup || die
+
+ if ! has "php${SLOT/./-}" ${PHP_TARGETS}; then
+ elog "To build extensions for this version of PHP, you will need to"
+ elog "add php${SLOT/./-} to your PHP_TARGETS USE_EXPAND variable."
+ elog
+ fi
+
+ # Warn about the removal of PHP_INI_VERSION if the user has it set.
+ if [[ -n "${PHP_INI_VERSION}" ]]; then
+ ewarn 'The PHP_INI_VERSION variable has been phased out. You may'
+ ewarn 'remove it from your configuration at your convenience. See'
+ ewarn
+ ewarn ' https://bugs.gentoo.org/611214'
+ ewarn
+ ewarn 'for more information.'
+ fi
+
+ elog "For details on how version slotting works, please see"
+ elog "the wiki:"
+ elog
+ elog " https://wiki.gentoo.org/wiki/PHP"
+ elog
+}
+
+pkg_postrm() {
+ # This serves two purposes. First, if we have just removed the last
+ # installed version of PHP, then this will remove any dead symlinks
+ # belonging to eselect-php. Second, if a user upgrades slots from
+ # (say) 5.6 to 7.0 and depcleans the old slot, then this will update
+ # his existing symlinks to point to the new 7.0 installation. The
+ # latter is bug 432962.
+ #
+ # Note: the eselect-php package may not be installed at this point,
+ # so we can't die() if this command fails.
+ eselect php cleanup
+}
diff --git a/dev-lang/php/php-7.4.11.ebuild b/dev-lang/php/php-7.4.11.ebuild
new file mode 100644
index 000000000000..3ac0d8c9ace3
--- /dev/null
+++ b/dev-lang/php/php-7.4.11.ebuild
@@ -0,0 +1,750 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+WANT_AUTOMAKE="none"
+
+inherit flag-o-matic systemd autotools
+
+MY_PV=${PV/_rc/RC}
+DESCRIPTION="The PHP language runtime engine"
+HOMEPAGE="https://www.php.net/"
+SRC_URI="https://www.php.net/distributions/${P}.tar.xz"
+
+LICENSE="PHP-3.01
+ BSD
+ Zend-2.0
+ bcmath? ( LGPL-2.1+ )
+ fpm? ( BSD-2 )
+ gd? ( gd )
+ unicode? ( BSD-2 LGPL-2.1 )"
+
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+# We can build the following SAPIs in the given order
+SAPIS="embed cli cgi fpm apache2 phpdbg"
+
+# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
+IUSE="${IUSE}
+ ${SAPIS/cli/+cli}
+ threads"
+
+IUSE="${IUSE} acl argon2 bcmath berkdb bzip2 calendar cdb cjk
+ coverage +ctype curl debug
+ enchant exif ffi +fileinfo +filter firebird
+ +flatfile ftp gd gdbm gmp +iconv imap inifile
+ intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit libressl lmdb
+ mhash mssql mysql mysqli nls
+ oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm
+ readline selinux +session session-mm sharedmem
+ +simplexml snmp soap sockets sodium spell sqlite ssl
+ sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode webp
+ +xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib"
+
+# Without USE=readline or libedit, the interactive "php -a" CLI will hang.
+REQUIRED_USE="
+ || ( cli cgi fpm apache2 embed phpdbg )
+ cli? ( ^^ ( readline libedit ) )
+ !cli? ( ?? ( readline libedit ) )
+ truetype? ( gd zlib )
+ webp? ( gd zlib )
+ cjk? ( gd zlib )
+ exif? ( gd zlib )
+ xpm? ( gd zlib )
+ gd? ( zlib )
+ simplexml? ( xml )
+ soap? ( xml )
+ xmlrpc? ( xml iconv )
+ xmlreader? ( xml )
+ xmlwriter? ( xml )
+ xslt? ( xml )
+ ldap-sasl? ( ldap )
+ qdbm? ( !gdbm )
+ session-mm? ( session !threads )
+ mysql? ( || ( mysqli pdo ) )
+ firebird? ( pdo )
+ mssql? ( pdo )
+"
+
+RESTRICT="!test? ( test )"
+
+# The supported (that is, autodetected) versions of BDB are listed in
+# the ./configure script. Other versions *work*, but we need to stick to
+# the ones that can be detected to avoid a repeat of bug #564824.
+COMMON_DEPEND="
+ >=app-eselect/eselect-php-0.9.1[apache2?,fpm?]
+ >=dev-libs/libpcre2-10.30[unicode]
+ fpm? ( acl? ( sys-apps/acl ) )
+ apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] )
+ argon2? ( app-crypt/argon2:= )
+ berkdb? ( || ( sys-libs/db:5.3
+ sys-libs/db:5.1
+ sys-libs/db:4.8
+ sys-libs/db:4.7
+ sys-libs/db:4.6
+ sys-libs/db:4.5 ) )
+ bzip2? ( app-arch/bzip2:0= )
+ cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
+ coverage? ( dev-util/lcov )
+ curl? ( >=net-misc/curl-7.10.5 )
+ enchant? ( =dev-libs/libffi-3.0.11 )
+ firebird? ( dev-db/firebird )
+ gd? ( >=virtual/jpeg-0-r3:0 media-libs/libpng:0= )
+ gdbm? ( >=sys-libs/gdbm-1.8.0:0= )
+ gmp? ( dev-libs/gmp:0= )
+ iconv? ( virtual/libiconv )
+ imap? ( >=virtual/imap-c-client-2[kerberos=,ssl=] )
+ intl? ( dev-libs/icu:= )
+ kerberos? ( virtual/krb5 )
+ ldap? ( >=net-nds/openldap-1.2.11 )
+ ldap-sasl? ( dev-libs/cyrus-sasl )
+ libedit? ( dev-libs/libedit )
+ lmdb? ( dev-db/lmdb:= )
+ mssql? ( dev-db/freetds[mssql] )
+ nls? ( sys-devel/gettext )
+ oci8-instant-client? ( dev-db/oracle-instantclient-basic )
+ odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( >=dev-db/unixODBC-1.8.13 ) )
+ postgres? ( dev-db/postgresql:* )
+ qdbm? ( dev-db/qdbm )
+ readline? ( sys-libs/readline:0= )
+ session-mm? ( dev-libs/mm )
+ snmp? ( >=net-analyzer/net-snmp-5.2 )
+ sodium? ( dev-libs/libsodium:= )
+ spell? ( >=app-text/aspell-0.50 )
+ sqlite? ( >=dev-db/sqlite-3.7.6.3 )
+ ssl? (
+ !libressl? ( >=dev-libs/openssl-1.0.1:0= )
+ libressl? ( dev-libs/libressl:0= )
+ )
+ tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) )
+ tokyocabinet? ( dev-db/tokyocabinet )
+ truetype? ( =media-libs/freetype-2* )
+ unicode? ( dev-libs/oniguruma:= )
+ webp? ( media-libs/libwebp:0= )
+ xml? ( >=dev-libs/libxml2-2.7.6 )
+ xpm? ( x11-libs/libXpm )
+ xslt? ( dev-libs/libxslt )
+ zip? ( >=dev-libs/libzip-1.2.0:= )
+ zlib? ( >=sys-libs/zlib-1.2.0.4:0= )
+"
+
+RDEPEND="${COMMON_DEPEND}
+ virtual/mta
+ fpm? (
+ selinux? ( sec-policy/selinux-phpfpm )
+ systemd? ( sys-apps/systemd ) )"
+
+# Bison isn't actually needed when building from a release tarball
+# However, the configure script will warn if it's absent or if you
+# have an incompatible version installed. See bug 593278.
+DEPEND="${COMMON_DEPEND}
+ app-arch/xz-utils
+ >=sys-devel/bison-3.0.1"
+
+BDEPEND="virtual/pkgconfig"
+
+PHP_MV="$(ver_cut 1)"
+
+PATCHES=( "${FILESDIR}/php-iodbc-header-location.patch" )
+
+php_install_ini() {
+ local phpsapi="${1}"
+
+ # work out where we are installing the ini file
+ php_set_ini_dir "${phpsapi}"
+
+ # Always install the production INI file, bug 611214.
+ local phpinisrc="php.ini-production-${phpsapi}"
+ cp php.ini-production "${phpinisrc}" || die
+
+ # default to /tmp for save_path, bug #282768
+ sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}" || die
+
+ # Set the extension dir
+ sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" \
+ -i "${phpinisrc}" || die
+
+ # Set the include path to point to where we want to find PEAR packages
+ sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}" || die
+
+ insinto "${PHP_INI_DIR#${EPREFIX}}"
+ newins "${phpinisrc}" php.ini
+
+ elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}"
+ elog
+
+ dodir "${PHP_EXT_INI_DIR#${EPREFIX}}"
+ dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}"
+
+ if use opcache; then
+ elog "Adding opcache to $PHP_EXT_INI_DIR"
+ echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> \
+ "${D}/${PHP_EXT_INI_DIR}"/opcache.ini
+ dosym "../ext/opcache.ini" \
+ "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/opcache.ini"
+ fi
+
+ # SAPI-specific handling
+ if [[ "${sapi}" == "fpm" ]] ; then
+ einfo "Installing FPM config files php-fpm.conf and www.conf"
+ insinto "${PHP_INI_DIR#${EPREFIX}}"
+ doins sapi/fpm/php-fpm.conf
+ insinto "${PHP_INI_DIR#${EPREFIX}}/fpm.d"
+ doins sapi/fpm/www.conf
+ fi
+
+ dodoc php.ini-{development,production}
+}
+
+php_set_ini_dir() {
+ PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}"
+ PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext"
+ PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active"
+}
+
+src_prepare() {
+ default
+
+ # In php-7.x, the FPM pool configuration files have been split off
+ # of the main config. By default the pool config files go in
+ # e.g. /etc/php-fpm.d, which isn't slotted. So here we move the
+ # include directory to a subdirectory "fpm.d" of $PHP_INI_DIR. Later
+ # we'll install the pool configuration file "www.conf" there.
+ php_set_ini_dir fpm
+ sed -i "s~^include=.*$~include=${PHP_INI_DIR}/fpm.d/*.conf~" \
+ sapi/fpm/php-fpm.conf.in \
+ || die 'failed to move the include directory in php-fpm.conf'
+
+ # Emulate buildconf to support cross-compilation
+ rm -fr aclocal.m4 autom4te.cache config.cache \
+ configure main/php_config.h.in || die
+ eautoconf --force
+ eautoheader
+}
+
+src_configure() {
+ addpredict /usr/share/snmp/mibs/.index #nowarn
+ addpredict /var/lib/net-snmp/mib_indexes #nowarn
+
+ PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}"
+
+ # The php-fpm config file wants localstatedir to be ${EPREFIX}/var
+ # and not the Gentoo default ${EPREFIX}/var/lib. See bug 572002.
+ local our_conf=(
+ --prefix="${PHP_DESTDIR}"
+ --mandir="${PHP_DESTDIR}/man"
+ --infodir="${PHP_DESTDIR}/info"
+ --libdir="${PHP_DESTDIR}/lib"
+ --with-libdir="$(get_libdir)"
+ --localstatedir="${EPREFIX}/var"
+ --without-pear
+ $(use_enable threads maintainer-zts)
+ )
+
+ our_conf+=(
+ $(use_with argon2 password-argon2 "${EPREFIX}/usr")
+ $(use_enable bcmath)
+ $(use_with bzip2 bz2 "${EPREFIX}/usr")
+ $(use_enable calendar)
+ $(use_enable coverage gcov)
+ $(use_enable ctype)
+ $(use_with curl)
+ $(use_enable xml dom)
+ $(use_with enchant)
+ $(use_enable exif)
+ $(use_with ffi)
+ $(use_enable fileinfo)
+ $(use_enable filter)
+ $(use_enable ftp)
+ $(use_with nls gettext "${EPREFIX}/usr")
+ $(use_with gmp gmp "${EPREFIX}/usr")
+ $(use_with mhash mhash "${EPREFIX}/usr")
+ $(use_with iconv iconv \
+ $(use elibc_glibc || use elibc_musl || use elibc_FreeBSD || echo "${EPREFIX}/usr"))
+ $(use_enable intl)
+ $(use_enable ipv6)
+ $(use_enable json)
+ $(use_with kerberos)
+ $(use_with xml libxml)
+ $(use_enable unicode mbstring)
+ $(use_with ssl openssl)
+ $(use_enable pcntl)
+ $(use_enable phar)
+ $(use_enable pdo)
+ $(use_enable opcache)
+ $(use_with postgres pgsql "${EPREFIX}/usr")
+ $(use_enable posix)
+ $(use_with spell pspell "${EPREFIX}/usr")
+ $(use_enable simplexml)
+ $(use_enable sharedmem shmop)
+ $(use_with snmp snmp "${EPREFIX}/usr")
+ $(use_enable soap)
+ $(use_enable sockets)
+ $(use_with sodium)
+ $(use_with sqlite sqlite3)
+ $(use_enable sysvipc sysvmsg)
+ $(use_enable sysvipc sysvsem)
+ $(use_enable sysvipc sysvshm)
+ $(use_with tidy tidy "${EPREFIX}/usr")
+ $(use_enable tokenizer)
+ $(use_enable xml)
+ $(use_enable xmlreader)
+ $(use_enable xmlwriter)
+ $(use_with xmlrpc)
+ $(use_with xslt xsl)
+ $(use_with zip)
+ $(use_with zlib zlib "${EPREFIX}/usr")
+ $(use_enable debug)
+ )
+
+ # DBA support
+ if use cdb || use berkdb || use flatfile || use gdbm || use inifile \
+ || use qdbm || use lmdb || use tokyocabinet ; then
+ our_conf+=( "--enable-dba" )
+ fi
+
+ # DBA drivers support
+ our_conf+=(
+ $(use_with cdb)
+ $(use_with berkdb db4 "${EPREFIX}/usr")
+ $(use_enable flatfile)
+ $(use_with gdbm gdbm "${EPREFIX}/usr")
+ $(use_enable inifile)
+ $(use_with qdbm qdbm "${EPREFIX}/usr")
+ $(use_with tokyocabinet tcadb "${EPREFIX}/usr")
+ $(use_with lmdb lmdb "${EPREFIX}/usr")
+ )
+
+ # Support for the GD graphics library
+ our_conf+=(
+ $(use_with truetype freetype)
+ $(use_enable cjk gd-jis-conv)
+ $(use_with gd jpeg)
+ $(use_with xpm)
+ $(use_with webp)
+ )
+ # enable gd last, so configure can pick up the previous settings
+ our_conf+=( $(use_enable gd) )
+
+ # IMAP support
+ if use imap ; then
+ our_conf+=(
+ $(use_with imap imap "${EPREFIX}/usr")
+ $(use_with ssl imap-ssl "${EPREFIX}/usr")
+ )
+ fi
+
+ # LDAP support
+ if use ldap ; then
+ our_conf+=(
+ $(use_with ldap ldap "${EPREFIX}/usr")
+ $(use_with ldap-sasl)
+ )
+ fi
+
+ # MySQL support
+ local mysqllib="mysqlnd"
+ local mysqlilib="mysqlnd"
+
+ our_conf+=( $(use_with mysqli mysqli "${mysqlilib}") )
+
+ local mysqlsock="${EPREFIX}/var/run/mysqld/mysqld.sock"
+ if use mysql || use mysqli ; then
+ our_conf+=( $(use_with mysql mysql-sock "${mysqlsock}") )
+ fi
+
+ # ODBC support
+ if use odbc && use iodbc ; then
+ our_conf+=(
+ --without-unixODBC
+ --with-iodbc
+ $(use_with pdo pdo-odbc "iODBC,${EPREFIX}/usr")
+ )
+ elif use odbc ; then
+ our_conf+=(
+ --with-unixODBC="${EPREFIX}/usr"
+ --without-iodbc
+ $(use_with pdo pdo-odbc "unixODBC,${EPREFIX}/usr")
+ )
+ else
+ our_conf+=(
+ --without-unixODBC
+ --without-iodbc
+ --without-pdo-odbc
+ )
+ fi
+
+ # Oracle support
+ our_conf+=( $(use_with oci8-instant-client oci8) )
+
+ # PDO support
+ if use pdo ; then
+ our_conf+=(
+ $(use_with mssql pdo-dblib "${EPREFIX}/usr")
+ $(use_with mysql pdo-mysql "${mysqllib}")
+ $(use_with postgres pdo-pgsql)
+ $(use_with sqlite pdo-sqlite)
+ $(use_with firebird pdo-firebird "${EPREFIX}/usr")
+ $(use_with oci8-instant-client pdo-oci)
+ )
+ fi
+
+ # readline/libedit support
+ our_conf+=(
+ $(use_with readline readline "${EPREFIX}/usr")
+ $(use_with libedit)
+ )
+
+ # Session support
+ if use session ; then
+ our_conf+=( $(use_with session-mm mm "${EPREFIX}/usr") )
+ else
+ our_conf+=( $(use_enable session) )
+ fi
+
+ # Use pic for shared modules such as apache2's mod_php
+ our_conf+=( --with-pic )
+
+ # we use the system copy of pcre
+ # --with-external-pcre affects ext/pcre
+ # Many arches don't support pcre-jit
+ our_conf+=(
+ --with-external-pcre
+ --without-pcre-jit
+ )
+
+ # Catch CFLAGS problems
+ # Fixes bug #14067.
+ # Changed order to run it in reverse for bug #32022 and #12021.
+ replace-cpu-flags "k6*" "i586"
+
+ # Cache the ./configure test results between SAPIs.
+ our_conf+=( --cache-file="${T}/config.cache" )
+
+ # Support user-passed configuration parameters
+ our_conf+=( ${EXTRA_ECONF:-} )
+
+ # Support the Apache2 extras, they must be set globally for all
+ # SAPIs to work correctly, especially for external PHP extensions
+
+ local one_sapi
+ local sapi
+ mkdir -p "${WORKDIR}/sapis-build" || die
+ for one_sapi in $SAPIS ; do
+ use "${one_sapi}" || continue
+ php_set_ini_dir "${one_sapi}"
+
+ # The BUILD_DIR variable is used to determine where to output
+ # the files that autotools creates. This was all originally
+ # based on the autotools-utils eclass.
+ BUILD_DIR="${WORKDIR}/sapis-build/${one_sapi}"
+ cp -a "${S}" "${BUILD_DIR}" || die
+ cd "${BUILD_DIR}" || die
+
+ local sapi_conf=(
+ --with-config-file-path="${PHP_INI_DIR}"
+ --with-config-file-scan-dir="${PHP_EXT_INI_DIR_ACTIVE}"
+ )
+
+ for sapi in $SAPIS ; do
+ case "$sapi" in
+ cli|cgi|embed|fpm|phpdbg)
+ if [[ "${one_sapi}" == "${sapi}" ]] ; then
+ sapi_conf+=( "--enable-${sapi}" )
+ if [[ "fpm" == "${sapi}" ]] ; then
+ sapi_conf+=(
+ $(use_with acl fpm-acl)
+ $(use_with systemd fpm-systemd)
+ )
+ fi
+ else
+ sapi_conf+=( "--disable-${sapi}" )
+ fi
+ ;;
+
+ apache2)
+ if [[ "${one_sapi}" == "${sapi}" ]] ; then
+ sapi_conf+=( --with-apxs2="${EPREFIX}/usr/bin/apxs" )
+ else
+ sapi_conf+=( --without-apxs2 )
+ fi
+ ;;
+ esac
+ done
+
+ # Construct the $myeconfargs array by concatenating $our_conf
+ # (the common args) and $sapi_conf (the SAPI-specific args).
+ local myeconfargs=( "${our_conf[@]}" )
+ myeconfargs+=( "${sapi_conf[@]}" )
+
+ pushd "${BUILD_DIR}" > /dev/null || die
+ econf "${myeconfargs[@]}"
+ popd > /dev/null || die
+ done
+}
+
+src_compile() {
+ # snmp seems to run during src_compile, too (bug #324739)
+ addpredict /usr/share/snmp/mibs/.index #nowarn
+ addpredict /var/lib/net-snmp/mib_indexes #nowarn
+
+ local sapi
+ for sapi in ${SAPIS} ; do
+ if use "${sapi}"; then
+ cd "${WORKDIR}/sapis-build/$sapi" || \
+ die "Failed to change dir to ${WORKDIR}/sapis-build/$1"
+ emake
+ fi
+ done
+}
+
+src_install() {
+ # see bug #324739 for what happens when we don't have that
+ addpredict /usr/share/snmp/mibs/.index #nowarn
+
+ # grab the first SAPI that got built and install common files from there
+ local first_sapi="", sapi=""
+ for sapi in $SAPIS ; do
+ if use $sapi ; then
+ first_sapi=$sapi
+ break
+ fi
+ done
+
+ # Makefile forgets to create this before trying to write to it...
+ dodir "${PHP_DESTDIR#${EPREFIX}}/bin"
+
+ # Install php environment (without any sapis)
+ cd "${WORKDIR}/sapis-build/$first_sapi" || die
+ emake INSTALL_ROOT="${D}" \
+ install-build install-headers install-programs
+
+ local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)"
+
+ # Create the directory where we'll put version-specific php scripts
+ keepdir "/usr/share/php${PHP_MV}"
+
+ local file=""
+ local sapi_list=""
+
+ for sapi in ${SAPIS}; do
+ if use "${sapi}" ; then
+ einfo "Installing SAPI: ${sapi}"
+ cd "${WORKDIR}/sapis-build/${sapi}" || die
+
+ if [[ "${sapi}" == "apache2" ]] ; then
+ # We're specifically not using emake install-sapi as libtool
+ # may cause unnecessary relink failures (see bug #351266)
+ insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/"
+ newins ".libs/libphp${PHP_MV}$(get_libname)" \
+ "libphp${PHP_MV}$(get_libname)"
+ keepdir "/usr/$(get_libdir)/apache2/modules"
+ else
+ # needed each time, php_install_ini would reset it
+ local dest="${PHP_DESTDIR#${EPREFIX}}"
+ into "${dest}"
+ case "$sapi" in
+ cli)
+ source="sapi/cli/php"
+ # Install the "phar" archive utility.
+ if use phar ; then
+ emake INSTALL_ROOT="${D}" install-pharcmd
+ dosym "..${dest#/usr}/bin/phar" "/usr/bin/phar${SLOT}"
+ fi
+ ;;
+ cgi)
+ source="sapi/cgi/php-cgi"
+ ;;
+ fpm)
+ source="sapi/fpm/php-fpm"
+ ;;
+ embed)
+ source="libs/libphp${PHP_MV}$(get_libname)"
+ ;;
+ phpdbg)
+ source="sapi/phpdbg/phpdbg"
+ ;;
+ *)
+ die "unhandled sapi in src_install"
+ ;;
+ esac
+
+ if [[ "${source}" == *"$(get_libname)" ]]; then
+ dolib.so "${source}"
+ else
+ dobin "${source}"
+ local name="$(basename ${source})"
+ dosym "..${dest#/usr}/bin/${name}" "/usr/bin/${name}${SLOT}"
+ fi
+ fi
+
+ php_install_ini "${sapi}"
+
+ # construct correct SAPI string for php-config
+ # thanks to ferringb for the bash voodoo
+ if [[ "${sapi}" == "apache2" ]]; then
+ sapi_list="${sapi_list:+${sapi_list} }apache2handler"
+ else
+ sapi_list="${sapi_list:+${sapi_list} }${sapi}"
+ fi
+ fi
+ done
+
+ # Installing opcache module
+ if use opcache ; then
+ into "${PHP_DESTDIR#${EPREFIX}}"
+ dolib.so "modules/opcache$(get_libname)"
+ fi
+
+ # Install env.d files
+ newenvd "${FILESDIR}/20php5-envd" "20php${SLOT}"
+ sed -e "s|/lib/|/$(get_libdir)/|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
+ sed -e "s|php5|php${SLOT}|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
+
+ # set php-config variable correctly (bug #278439)
+ sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \
+ "${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config" || die
+
+ if use fpm ; then
+ if use systemd; then
+ systemd_newunit "${FILESDIR}/php-fpm_at.service" \
+ "php-fpm@${SLOT}.service"
+ else
+ systemd_newunit "${FILESDIR}/php-fpm_at-simple.service" \
+ "php-fpm@${SLOT}.service"
+ fi
+ fi
+}
+
+src_test() {
+ echo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+ PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php"
+ if [[ ! -x "${PHP_BIN}" ]] ; then
+ ewarn "Test phase requires USE=cli, skipping"
+ return
+ else
+ export TEST_PHP_EXECUTABLE="${PHP_BIN}"
+ fi
+
+ if [[ -x "${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi" ]] ; then
+ export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi"
+ fi
+
+ if [[ -x "${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg" ]] ; then
+ export TEST_PHPDBG_EXECUTABLE="${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg"
+ fi
+
+ REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n -d \
+ "session.save_path=${T}" \
+ "${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d \
+ "session.save_path=${T}"
+
+ for name in ${EXPECTED_TEST_FAILURES}; do
+ mv "${name}.out" "${name}.out.orig" 2>/dev/null || die
+ done
+
+ local failed="$(find -name '*.out')"
+ if [[ ${failed} != "" ]] ; then
+ ewarn "The following test cases failed unexpectedly:"
+ for name in ${failed}; do
+ ewarn " ${name/.out/}"
+ done
+ else
+ einfo "No unexpected test failures, all fine"
+ fi
+
+ if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then
+ local passed=""
+ for name in ${EXPECTED_TEST_FAILURES}; do
+ [[ -f "${name}.diff" ]] && continue
+ passed="${passed} ${name}"
+ done
+ if [[ ${passed} != "" ]] ; then
+ einfo "The following test cases passed unexpectedly:"
+ for name in ${passed}; do
+ ewarn " ${passed}"
+ done
+ else
+ einfo "None of the known-to-fail tests passed, all fine"
+ fi
+ fi
+}
+
+pkg_postinst() {
+ # Output some general info to the user
+ if use apache2 ; then
+ elog
+ elog "To enable PHP in apache, you will need to add \"-D PHP\" to"
+ elog "your apache2 command. OpenRC users can append that string to"
+ elog "APACHE2_OPTS in /etc/conf.d/apache2."
+ elog
+ elog "The apache module configuration file 70_mod_php.conf is"
+ elog "provided (and maintained) by eselect-php."
+ elog
+ fi
+
+ # Create the symlinks for php
+ local m
+ for m in ${SAPIS}; do
+ [[ ${m} == 'embed' ]] && continue;
+ if use $m ; then
+ local ci=$(eselect php show $m)
+ if [[ -z $ci ]]; then
+ eselect php set $m php${SLOT} || die
+ einfo "Switched ${m} to use php:${SLOT}"
+ einfo
+ elif [[ $ci != "php${SLOT}" ]] ; then
+ elog "To switch $m to use php:${SLOT}, run"
+ elog " eselect php set $m php${SLOT}"
+ elog
+ fi
+ fi
+ done
+
+ # Remove dead symlinks for SAPIs that were just disabled. For
+ # example, if the user has the cgi SAPI enabled, then he has an
+ # eselect-php symlink for it. If he later reinstalls PHP with
+ # USE="-cgi", that symlink will break. This call to eselect is
+ # supposed to remove that dead link per bug 572436.
+ eselect php cleanup || die
+
+ if ! has "php${SLOT/./-}" ${PHP_TARGETS}; then
+ elog "To build extensions for this version of PHP, you will need to"
+ elog "add php${SLOT/./-} to your PHP_TARGETS USE_EXPAND variable."
+ elog
+ fi
+
+ # Warn about the removal of PHP_INI_VERSION if the user has it set.
+ if [[ -n "${PHP_INI_VERSION}" ]]; then
+ ewarn 'The PHP_INI_VERSION variable has been phased out. You may'
+ ewarn 'remove it from your configuration at your convenience. See'
+ ewarn
+ ewarn ' https://bugs.gentoo.org/611214'
+ ewarn
+ ewarn 'for more information.'
+ fi
+
+ elog "For details on how version slotting works, please see"
+ elog "the wiki:"
+ elog
+ elog " https://wiki.gentoo.org/wiki/PHP"
+ elog
+}
+
+pkg_postrm() {
+ # This serves two purposes. First, if we have just removed the last
+ # installed version of PHP, then this will remove any dead symlinks
+ # belonging to eselect-php. Second, if a user upgrades slots from
+ # (say) 5.6 to 7.0 and depcleans the old slot, then this will update
+ # his existing symlinks to point to the new 7.0 installation. The
+ # latter is bug 432962.
+ #
+ # Note: the eselect-php package may not be installed at this point,
+ # so we can't die() if this command fails.
+ eselect php cleanup
+}
diff --git a/dev-lang/python-exec/metadata.xml b/dev-lang/python-exec/metadata.xml
index ef39a52d06f8..751ada8263f2 100644
--- a/dev-lang/python-exec/metadata.xml
+++ b/dev-lang/python-exec/metadata.xml
@@ -11,7 +11,6 @@
Michał Górny
https://github.com/mgorny/python-exec/issues/
- mgorny/python-exec
mgorny/python-exec
diff --git a/dev-lang/python-exec/python-exec-9999.ebuild b/dev-lang/python-exec/python-exec-2.4.6-r2.ebuild
similarity index 86%
rename from dev-lang/python-exec/python-exec-9999.ebuild
rename to dev-lang/python-exec/python-exec-2.4.6-r2.ebuild
index 57a8be114e04..a5edfb3d622c 100644
--- a/dev-lang/python-exec/python-exec-9999.ebuild
+++ b/dev-lang/python-exec/python-exec-2.4.6-r2.ebuild
@@ -3,23 +3,19 @@
EAPI=7
-inherit autotools git-r3 python-utils-r1
+inherit python-utils-r1
DESCRIPTION="Python script wrapper"
HOMEPAGE="https://github.com/mgorny/python-exec/"
-SRC_URI=""
-EGIT_REPO_URI="https://github.com/mgorny/python-exec.git"
+SRC_URI="https://github.com/mgorny/python-exec/releases/download/v${PV}/${P}.tar.bz2"
LICENSE="BSD-2"
SLOT="2"
-KEYWORDS=""
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
# Internal Python project hack. Do not copy it. Ever.
IUSE="${_PYTHON_ALL_IMPLS[@]/#/python_targets_}"
-src_prepare() {
- default
- eautoreconf
-}
+RDEPEND="!<=dev-lang/python-2.7.18-r3:2.7"
src_configure() {
local pyimpls=() i EPYTHON
@@ -46,21 +42,8 @@ src_install() {
newins - python-exec.conf \
< <(sed -n -e '/^#/p' config/python-exec.conf.example)
- local programs=( python )
- local scripts=( python-config 2to3 idle pydoc pyvenv )
- local i
- for i in "${_PYTHON_ALL_IMPLS[@]}"; do
- if use "python_targets_${i}"; then
- # NB: duplicate entries are harmless
- if python_is_python3 "${i}"; then
- programs+=( python3 )
- scripts+=( python3-config )
- else
- programs+=( python2 )
- scripts+=( python2-config )
- fi
- fi
- done
+ local programs=( python python3 )
+ local scripts=( python-config python3-config 2to3 idle pydoc pyvenv )
local f
for f in "${programs[@]}"; do
diff --git a/dev-lang/python/python-2.7.18-r4.ebuild b/dev-lang/python/python-2.7.18-r4.ebuild
new file mode 100644
index 000000000000..456f56833cb3
--- /dev/null
+++ b/dev-lang/python/python-2.7.18-r4.ebuild
@@ -0,0 +1,369 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+WANT_LIBTOOL="none"
+
+inherit autotools flag-o-matic pax-utils python-utils-r1 toolchain-funcs
+
+MY_P="Python-${PV}"
+PYVER=$(ver_cut 1-2)
+PATCHSET="python-gentoo-patches-2.7.18-r3"
+
+DESCRIPTION="An interpreted, interactive, object-oriented programming language"
+HOMEPAGE="https://www.python.org/"
+SRC_URI="https://www.python.org/ftp/python/${PV}/${MY_P}.tar.xz
+ https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="PSF-2"
+SLOT="${PYVER}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="-berkdb bluetooth build elibc_uclibc examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl +threads tk +wide-unicode wininst +xml"
+
+# Do not add a dependency on dev-lang/python to this ebuild.
+# If you need to apply a patch which requires python for bootstrapping, please
+# run the bootstrap code on your dev box and include the results in the
+# patchset. See bug 447752.
+
+RDEPEND="app-arch/bzip2:=
+ dev-libs/libffi:=
+ >=sys-libs/zlib-1.1.3:=
+ virtual/libcrypt:=
+ virtual/libintl
+ berkdb? ( || (
+ sys-libs/db:5.3
+ sys-libs/db:5.1
+ sys-libs/db:4.8
+ sys-libs/db:4.7
+ sys-libs/db:4.6
+ sys-libs/db:4.5
+ sys-libs/db:4.4
+ sys-libs/db:4.3
+ sys-libs/db:4.2
+ ) )
+ gdbm? ( sys-libs/gdbm:=[berkdb] )
+ ncurses? ( >=sys-libs/ncurses-5.2:= )
+ readline? ( >=sys-libs/readline-4.1:= )
+ sqlite? ( >=dev-db/sqlite-3.3.8:3= )
+ ssl? (
+ !libressl? ( dev-libs/openssl:= )
+ libressl? ( dev-libs/libressl:= )
+ )
+ tk? (
+ >=dev-lang/tcl-8.0:=
+ >=dev-lang/tk-8.0:=
+ dev-tcltk/blt:=
+ dev-tcltk/tix
+ )
+ xml? ( >=dev-libs/expat-2.1:= )"
+# bluetooth requires headers from bluez
+DEPEND="${RDEPEND}
+ bluetooth? ( net-wireless/bluez )
+ virtual/pkgconfig
+ !sys-devel/gcc[libffi(-)]"
+RDEPEND+="
+ !build? ( app-misc/mime-types )
+ !<=dev-lang/python-exec-2.4.6-r1"
+PDEPEND=">=app-eselect/eselect-python-20140125-r1"
+
+pkg_setup() {
+ if use berkdb; then
+ ewarn "'bsddb' module is out-of-date and no longer maintained inside"
+ ewarn "dev-lang/python. 'bsddb' and 'dbhash' modules have been additionally"
+ ewarn "removed in Python 3. A maintained alternative of 'bsddb3' module"
+ ewarn "is provided by dev-python/bsddb3."
+ else
+ if has_version "=${CATEGORY}/${PN}-${PV%%.*}*[berkdb]"; then
+ ewarn "You are migrating from =${CATEGORY}/${PN}-${PV%%.*}*[berkdb]"
+ ewarn "to =${CATEGORY}/${PN}-${PV%%.*}*[-berkdb]."
+ ewarn "You might need to migrate your databases."
+ fi
+ fi
+}
+
+src_prepare() {
+ # Ensure that internal copies of expat, libffi and zlib are not used.
+ rm -fr Modules/expat || die
+ rm -fr Modules/_ctypes/libffi* || die
+ rm -fr Modules/zlib || die
+
+ local PATCHES=(
+ "${WORKDIR}/${PATCHSET}"
+ )
+
+ default
+
+ sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \
+ Lib/distutils/command/install.py \
+ Lib/distutils/sysconfig.py \
+ Lib/site.py \
+ Lib/sysconfig.py \
+ Lib/test/test_site.py \
+ Makefile.pre.in \
+ Modules/Setup.dist \
+ Modules/getpath.c \
+ setup.py || die "sed failed to replace @@GENTOO_LIBDIR@@"
+
+ eautoreconf
+}
+
+src_configure() {
+ # dbm module can be linked against berkdb or gdbm.
+ # Defaults to gdbm when both are enabled, #204343.
+ local disable
+ use berkdb || use gdbm || disable+=" dbm"
+ use berkdb || disable+=" _bsddb"
+ # disable automagic bluetooth headers detection
+ use bluetooth || export ac_cv_header_bluetooth_bluetooth_h=no
+ use gdbm || disable+=" gdbm"
+ use ncurses || disable+=" _curses _curses_panel"
+ use readline || disable+=" readline"
+ use sqlite || disable+=" _sqlite3"
+ use ssl || export PYTHON_DISABLE_SSL="1"
+ use tk || disable+=" _tkinter"
+ use xml || disable+=" _elementtree pyexpat" # _elementtree uses pyexpat.
+ export PYTHON_DISABLE_MODULES="${disable}"
+
+ if ! use xml; then
+ ewarn "You have configured Python without XML support."
+ ewarn "This is NOT a recommended configuration as you"
+ ewarn "may face problems parsing any XML documents."
+ fi
+
+ if [[ -n "${PYTHON_DISABLE_MODULES}" ]]; then
+ einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}"
+ fi
+
+ if [[ "$(gcc-major-version)" -ge 4 ]]; then
+ append-flags -fwrapv
+ fi
+
+ filter-flags -malign-double
+
+ # https://bugs.gentoo.org/show_bug.cgi?id=50309
+ if is-flagq -O3; then
+ is-flagq -fstack-protector-all && replace-flags -O3 -O2
+ use hardened && replace-flags -O3 -O2
+ fi
+
+ if tc-is-cross-compiler; then
+ # Force some tests that try to poke fs paths.
+ export ac_cv_file__dev_ptc=no
+ export ac_cv_file__dev_ptmx=yes
+ fi
+
+ # Export CXX so it ends up in /usr/lib/python2.X/config/Makefile.
+ tc-export CXX
+ # The configure script fails to use pkg-config correctly.
+ # http://bugs.python.org/issue15506
+ export ac_cv_path_PKG_CONFIG=$(tc-getPKG_CONFIG)
+
+ # Set LDFLAGS so we link modules with -lpython2.7 correctly.
+ # Needed on FreeBSD unless Python 2.7 is already installed.
+ # Please query BSD team before removing this!
+ append-ldflags "-L."
+
+ local dbmliborder
+ if use gdbm; then
+ dbmliborder+="${dbmliborder:+:}gdbm"
+ fi
+ if use berkdb; then
+ dbmliborder+="${dbmliborder:+:}bdb"
+ fi
+
+ local myeconfargs=(
+ # The check is broken on clang, and gives false positive:
+ # https://bugs.gentoo.org/596798
+ # (upstream dropped this flag in 3.2a4 anyway)
+ ac_cv_opt_olimit_ok=no
+ # glibc-2.30 removes it; since we can't cleanly force-rebuild
+ # Python on glibc upgrade, remove it proactively to give
+ # a chance for users rebuilding python before glibc
+ ac_cv_header_stropts_h=no
+
+ --with-fpectl
+ --enable-shared
+ $(use_enable ipv6)
+ $(use_with threads)
+ $(use wide-unicode && echo "--enable-unicode=ucs4" || echo "--enable-unicode=ucs2")
+ --infodir='${prefix}/share/info'
+ --mandir='${prefix}/share/man'
+ --with-computed-gotos
+ --with-dbmliborder="${dbmliborder}"
+ --with-libc=
+ --enable-loadable-sqlite-extensions
+ --with-system-expat
+ --with-system-ffi
+ --without-ensurepip
+ )
+
+ OPT="" econf "${myeconfargs[@]}"
+
+ if use threads && grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then
+ eerror "configure has detected that the sem_open function is broken."
+ eerror "Please ensure that /dev/shm is mounted as a tmpfs with mode 1777."
+ die "Broken sem_open function (bug 496328)"
+ fi
+}
+
+src_compile() {
+ # Ensure sed works as expected
+ # https://bugs.gentoo.org/594768
+ local -x LC_ALL=C
+
+ # Avoid invoking pgen for cross-compiles.
+ touch Include/graminit.h Python/graminit.c
+
+ emake
+
+ # Work around bug 329499. See also bug 413751 and 457194.
+ if has_version dev-libs/libffi[pax_kernel]; then
+ pax-mark E python
+ else
+ pax-mark m python
+ fi
+}
+
+src_test() {
+ # Tests will not work when cross compiling.
+ if tc-is-cross-compiler; then
+ elog "Disabling tests due to crosscompiling."
+ return
+ fi
+
+ # Skip failing tests.
+ local skipped_tests="distutils gdb"
+
+ for test in ${skipped_tests}; do
+ mv "${S}"/Lib/test/test_${test}.py "${T}"
+ done
+
+ # bug 660358
+ local -x COLUMNS=80
+
+ # Daylight saving time problem
+ # https://bugs.python.org/issue22067
+ # https://bugs.gentoo.org/610628
+ local -x TZ=UTC
+
+ # Rerun failed tests in verbose mode (regrtest -w).
+ emake test EXTRATESTOPTS="-w" < /dev/tty
+ local result="$?"
+
+ for test in ${skipped_tests}; do
+ mv "${T}/test_${test}.py" "${S}"/Lib/test
+ done
+
+ elog "The following tests have been skipped:"
+ for test in ${skipped_tests}; do
+ elog "test_${test}.py"
+ done
+
+ elog "If you would like to run them, you may:"
+ elog "cd '${EPREFIX}/usr/$(get_libdir)/python${PYVER}/test'"
+ elog "and run the tests separately."
+
+ if [[ ${result} -ne 0 ]]; then
+ die "emake test failed"
+ fi
+}
+
+src_install() {
+ local libdir=${ED}/usr/$(get_libdir)/python${PYVER}
+
+ emake DESTDIR="${D}" altinstall
+
+ sed -e "s/\(LDFLAGS=\).*/\1/" -i "${libdir}/config/Makefile" || die
+
+ # Fix collisions between different slots of Python.
+ mv "${ED}/usr/bin/2to3" "${ED}/usr/bin/2to3-${PYVER}" || die
+ mv "${ED}/usr/bin/pydoc" "${ED}/usr/bin/pydoc${PYVER}" || die
+ mv "${ED}/usr/bin/idle" "${ED}/usr/bin/idle${PYVER}" || die
+ rm "${ED}/usr/bin/smtpd.py" || die
+
+ use berkdb || rm -r "${libdir}/"{bsddb,dbhash.py*,test/test_bsddb*} || die
+ use sqlite || rm -r "${libdir}/"{sqlite3,test/test_sqlite*} || die
+ use tk || rm -r "${ED}/usr/bin/idle${PYVER}" "${libdir}/"{idlelib,lib-tk} || die
+ use elibc_uclibc && rm -fr "${libdir}/"{bsddb/test,test}
+
+ use threads || rm -r "${libdir}/multiprocessing" || die
+ use wininst || rm "${libdir}/distutils/command/"wininst-*.exe || die
+
+ dodoc Misc/{ACKS,HISTORY,NEWS}
+
+ if use examples; then
+ docinto examples
+ dodoc -r Tools
+ fi
+ insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510
+ local libname=$(printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' | \
+ emake --no-print-directory -s -f - 2>/dev/null)
+ newins "${S}"/Tools/gdb/libpython.py "${libname}"-gdb.py
+
+ newconfd "${FILESDIR}/pydoc.conf" pydoc-${PYVER}
+ newinitd "${FILESDIR}/pydoc.init" pydoc-${PYVER}
+ sed \
+ -e "s:@PYDOC_PORT_VARIABLE@:PYDOC${PYVER/./_}_PORT:" \
+ -e "s:@PYDOC@:pydoc${PYVER}:" \
+ -i "${ED}/etc/conf.d/pydoc-${PYVER}" \
+ "${ED}/etc/init.d/pydoc-${PYVER}" || die "sed failed"
+
+ local -x EPYTHON=python${PYVER}
+ # if not using a cross-compiler, use the fresh binary
+ if ! tc-is-cross-compiler; then
+ local -x PYTHON=./python
+ local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}${PWD}
+ else
+ local -x PYTHON=${EPREFIX}/usr/bin/${EPYTHON}
+ fi
+
+ echo "EPYTHON='${EPYTHON}'" > epython.py || die
+ python_domodule epython.py
+
+ # python-exec wrapping support
+ local scriptdir=${D}$(python_get_scriptdir)
+ mkdir -p "${scriptdir}" || die
+ # python
+ ln -s "../../../bin/python${PYVER}" \
+ "${scriptdir}/python" || die
+ # python-config
+ ln -s "../../../bin/python${PYVER}-config" \
+ "${scriptdir}/python-config" || die
+ # 2to3, pydoc, pyvenv
+ ln -s "../../../bin/2to3-${PYVER}" \
+ "${scriptdir}/2to3" || die
+ ln -s "../../../bin/pydoc${PYVER}" \
+ "${scriptdir}/pydoc" || die
+ # idle
+ if use tk; then
+ ln -s "../../../bin/idle${PYVER}" \
+ "${scriptdir}/idle" || die
+ fi
+
+ # python2* is no longer wrapped, so just symlink it
+ local pymajor=${PYVER%.*}
+ dosym "python${PYVER}" "/usr/bin/python${pymajor}"
+ dosym "python${PYVER}-config" "/usr/bin/python${pymajor}-config"
+}
+
+eselect_python_update() {
+ if [[ -z "$(eselect python show)" || \
+ ! -f "${EROOT}/usr/bin/$(eselect python show)" ]]; then
+ eselect python update
+ fi
+
+ if [[ -z "$(eselect python show --python${PV%%.*})" || \
+ ! -f "${EROOT}/usr/bin/$(eselect python show --python${PV%%.*})" ]]
+ then
+ eselect python update --python${PV%%.*}
+ fi
+}
+
+pkg_postinst() {
+ eselect_python_update
+}
+
+pkg_postrm() {
+ eselect_python_update
+}
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index e603cee261bf..ad7d821da6bc 100644
Binary files a/dev-libs/Manifest.gz and b/dev-libs/Manifest.gz differ
diff --git a/dev-libs/hsa-ext-rocr/Manifest b/dev-libs/hsa-ext-rocr/Manifest
deleted file mode 100644
index e9f642cc71d6..000000000000
--- a/dev-libs/hsa-ext-rocr/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST hsa-ext-rocr-dev_1.1.30500.0-rocm-rel-3.5-30-def83d8_amd64.deb 336660 BLAKE2B 8c01eb947e55ac5a941852f4d477fb85f15984ae3b8af699b6ba39e29785eeb149e6d95e055d5f0431eee55f56c035cf1b0d695aa65e257ea286d78b3de46d3f SHA512 f1bfdfb4e32f4219f29f19370775ff874201d0c0bfcaea65d680c4b77b49c8a14606fd69cf683be67d9e636484c1c9dd0d7e0650d86598dba270b02875ab072a
diff --git a/dev-libs/hsa-ext-rocr/hsa-ext-rocr-1.1.30500.0.ebuild b/dev-libs/hsa-ext-rocr/hsa-ext-rocr-1.1.30500.0.ebuild
deleted file mode 100644
index 0fb8e67847e1..000000000000
--- a/dev-libs/hsa-ext-rocr/hsa-ext-rocr-1.1.30500.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit unpacker
-
-ROCM_VERSION="3.5.0"
-MY_PV="${PV}-rocm-rel-$(ver_cut 1-2 ${ROCM_VERSION})-30-def83d8"
-
-DESCRIPTION="Proprietary image-support library for Radeon Open Compute"
-HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm#closed-source-components"
-SRC_URI="https://repo.radeon.com/rocm/apt/debian/pool/main/h/${PN}-dev/${PN}-dev_${MY_PV}_amd64.deb"
-
-LICENSE="AMD-GPU-PRO-EULA"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="-deprecated"
-
-RESTRICT="bindist strip"
-
-QA_PREBUILT="/opt/${PN}/lib*/*"
-
-S="${WORKDIR}"
-
-src_unpack() {
- unpack_deb ${A}
-}
-
-src_install() {
- local destdir="/opt/${PN}"
- local soversion=$(ver_cut 1-3)
- local somajor=$(ver_cut 1)
-
- local solibs_to_install=( "libhsa-ext-image64.so" )
- if use deprecated; then
- solibs_to_install+=( "libhsa-runtime-tools64.so" )
- fi
-
- into "${destdir}"
- for solib in ${solibs_to_install[@]}; do
- dolib.so "opt/rocm-${ROCM_VERSION}/hsa/lib/${solib}.${soversion}"
- dosym "../..${destdir}/$(get_libdir)/${solib}.${soversion}" "/usr/$(get_libdir)/${solib}.${soversion}"
- dosym "${solib}.${soversion}" "/usr/$(get_libdir)/${solib}.${somajor}"
- done
-}
diff --git a/dev-libs/hsa-ext-rocr/metadata.xml b/dev-libs/hsa-ext-rocr/metadata.xml
deleted file mode 100644
index d61b59ba30a1..000000000000
--- a/dev-libs/hsa-ext-rocr/metadata.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-
- marecki@gentoo.org
- Marek Szuba
-
-
- candrews@gentoo.org
- Craig Andrews
-
-
- For the time being the ROCm platform relies on a closed-source library
- to provide HSA image support. In the future it will either be deprecated
- or become open source.
- Furthermore, this package optionally provides the "tools"
- debug/trace/profiling library which has already been deprecated.
-
-
-
diff --git a/dev-libs/jansson/jansson-2.13.1.ebuild b/dev-libs/jansson/jansson-2.13.1.ebuild
index 830692135c98..003f216e8fa7 100644
--- a/dev-libs/jansson/jansson-2.13.1.ebuild
+++ b/dev-libs/jansson/jansson-2.13.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.digip.org/jansson/releases/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86"
IUSE="doc static-libs"
# dev-libs/jansson-2.13.1[doc]: fails to build with >=sphinx-3.0, #731668
diff --git a/dev-libs/libbpf/Manifest b/dev-libs/libbpf/Manifest
index b3d862317cd7..c7be82c7c2e0 100644
--- a/dev-libs/libbpf/Manifest
+++ b/dev-libs/libbpf/Manifest
@@ -3,3 +3,4 @@ DIST libbpf-0.0.7.tar.gz 262068 BLAKE2B e77ff25449274881ddb9d32f25cd6ad8988e4524
DIST libbpf-0.0.8.tar.gz 262519 BLAKE2B 2a3620c97834cc23e716476b6966c1c65c1c82064b3ba1ae4ab4906ae362a777d9aa7ae40620f9a259fe969a5a897e97c14d97f627f39c47fa28c89abb1efa9a SHA512 1074fb52b7a158e4e2713c4c7083528ccf2d99b899853078f230234ba112071bfa66e174d8800d36516e26d5bf06da44d100a5b2f866d267f62c9308f431220c
DIST libbpf-0.0.9.tar.gz 273726 BLAKE2B 1277ce5b9dab9037e287910c43a71ee33cd6607d7cbe59d40c6930bf49407e04fcdfa6f4795f98202930fd564c1569c2feef0bca73294334f00abd601a288ed0 SHA512 d54bbdee6f7ea83ffef3fd0abe07f71644bcf83e5cf4a307fb4e03d885503617f1af2d324cc869f0f01a92bcb58836780a4802ac4db83b9f037ea196edc1131a
DIST libbpf-0.1.0.tar.gz 666896 BLAKE2B 5923b4c8fb915722f8cc2015ab8f07773a83c4252a59aef784983e46db7cd784e8ff5cc2284d3f5ded6bb92957f8d73b367a35fa1b5693e0cacaaef414a2f410 SHA512 3a5d823e4751408fd9e3bafe0be0a6a78de7dea0114bbd1166d8b3887938eef4e355ba6221b4bded9fc8a8280edede606c8c8078fd40aebdeaebbbb38f4221fe
+DIST libbpf-0.1.1.tar.gz 666908 BLAKE2B 0efb044b1dc02230d14a6e92c40d66f7cb28c7efbecc3d97d084a52dde581dbd02b02fb7fbbe8b4ca051f2f64497c6240c5dd9c992e6fe4629a1332311b7833c SHA512 b9f68323a8f53b0fb0bf418b8a37685e7d74b6f5ad7aa2f266f65cd57199b3b9b5865bc4579758e5adcfbb027ced83e12ee87f3ff3bf159c7b54cbdcd50fd62f
diff --git a/dev-libs/libbpf/libbpf-0.1.1.ebuild b/dev-libs/libbpf/libbpf-0.1.1.ebuild
new file mode 100644
index 000000000000..1c2508425132
--- /dev/null
+++ b/dev-libs/libbpf/libbpf-0.1.1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic toolchain-funcs
+
+if [[ ${PV} =~ [9]{4,} ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/libbpf/libbpf.git"
+else
+ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+S="${WORKDIR}/${P}/src"
+
+HOMEPAGE="https://github.com/libbpf/libbpf"
+DESCRIPTION="Stand-alone build of libbpf from the Linux kernel"
+
+LICENSE="GPL-2 LGPL-2.1 BSD-2"
+SLOT="0/${PV}"
+IUSE="+static-libs"
+
+COMMON_DEPEND="virtual/libelf
+ !<=dev-util/bcc-0.7.0"
+DEPEND="${COMMON_DEPEND}
+ sys-kernel/linux-headers"
+RDEPEND="${COMMON_DEPEND}"
+
+PATCHES=(
+ "${FILESDIR}/libbpf-0.0.7-paths.patch"
+)
+
+src_compile() {
+ append-cflags -fPIC
+ emake \
+ BUILD_SHARED=y \
+ LIBSUBDIR="$(get_libdir)" \
+ $(usex static-libs 'BUILD_STATIC=y' '' '' '') \
+ CC="$(tc-getCC)"
+}
+
+src_install() {
+ emake \
+ BUILD_SHARED=y \
+ LIBSUBDIR="$(get_libdir)" \
+ DESTDIR="${D}" \
+ $(usex static-libs 'BUILD_STATIC=y' '' '' '') \
+ install install_uapi_headers
+
+ insinto /usr/$(get_libdir)/pkgconfig
+ doins ${PN}.pc
+}
diff --git a/dev-libs/libucl/libucl-0.8.1-r1.ebuild b/dev-libs/libucl/libucl-0.8.1-r1.ebuild
index 3a7e1f46c4f3..c4c4911fe043 100644
--- a/dev-libs/libucl/libucl-0.8.1-r1.ebuild
+++ b/dev-libs/libucl/libucl-0.8.1-r1.ebuild
@@ -35,6 +35,8 @@ DOCS=( README.md doc/api.md )
src_prepare() {
default
+ rm tests/schema/{definitions,ref{,Remote}}.json || die
+
eautoreconf
}
diff --git a/dev-libs/libucl/libucl-9999.ebuild b/dev-libs/libucl/libucl-9999.ebuild
index 3a7e1f46c4f3..c4c4911fe043 100644
--- a/dev-libs/libucl/libucl-9999.ebuild
+++ b/dev-libs/libucl/libucl-9999.ebuild
@@ -35,6 +35,8 @@ DOCS=( README.md doc/api.md )
src_prepare() {
default
+ rm tests/schema/{definitions,ref{,Remote}}.json || die
+
eautoreconf
}
diff --git a/dev-libs/nspr/nspr-4.28.ebuild b/dev-libs/nspr/nspr-4.28.ebuild
index 0c02c60c9fbd..957f712137bf 100644
--- a/dev-libs/nspr/nspr-4.28.ebuild
+++ b/dev-libs/nspr/nspr-4.28.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://archive.mozilla.org/pub/nspr/releases/v${PV}/src/${P}.tar.gz"
LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-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 ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="debug elibc_musl"
MULTILIB_CHOST_TOOLS=(
diff --git a/dev-libs/nss/nss-3.56.ebuild b/dev-libs/nss/nss-3.56.ebuild
index c5e3dea3064d..e3a213766636 100644
--- a/dev-libs/nss/nss-3.56.ebuild
+++ b/dev-libs/nss/nss-3.56.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://archive.mozilla.org/pub/security/nss/releases/${RTM_NAME}/src/$
LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="cacert utils"
# pkg-config called by nss-config -> virtual/pkgconfig in RDEPEND
RDEPEND="
diff --git a/dev-libs/protobuf/protobuf-3.12.2.ebuild b/dev-libs/protobuf/protobuf-3.12.2.ebuild
index c0cc23a4b752..39823af01321 100644
--- a/dev-libs/protobuf/protobuf-3.12.2.ebuild
+++ b/dev-libs/protobuf/protobuf-3.12.2.ebuild
@@ -22,7 +22,7 @@ fi
LICENSE="BSD"
SLOT="0/23"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
IUSE="emacs examples static-libs test zlib"
RESTRICT="!test? ( test )"
diff --git a/dev-libs/serd/Manifest b/dev-libs/serd/Manifest
index fb1dc6121618..6408219cff53 100644
--- a/dev-libs/serd/Manifest
+++ b/dev-libs/serd/Manifest
@@ -1,2 +1,3 @@
DIST serd-0.30.2.tar.bz2 590337 BLAKE2B 7b47f4f9940d9d2d37772c034c3f15801fff2bc8a058d30b40891ae900bdee3a631803e25505230a853e4beb083be4c854c627074eb89c0b23781da42fbde2d5 SHA512 b1e18ac883aac2a8146ee0e1de553ac2b512deba5307e5c9fa2733d9011ed0777d67790aa6527e73b3f11c9da0d8c9a98227457bb412897296f4464228cac0f7
DIST serd-0.30.4.tar.bz2 605441 BLAKE2B 6b9b561db04a612d04726f29b1b56f535b9af57b7cbcf521c2a6afdafaf63b2ff4a205015d2f4c20bf48340348edda586dfed4a7cff24c57363b0f218d185609 SHA512 4cc032f826d891213c6db787b10a41ffb8f4b2a3357ffa536e34013755dc34db7109d1b42f550a0d559d8651f56c3a5dfb3654c3e2047ee6e609ff9a5fe803d6
+DIST serd-0.30.6.tar.bz2 609365 BLAKE2B 35a86847642ffe806797ae8dbcd292ce26f08135edfa3b1fd39652f8964c35d73dba8f8627f32dcff399e9cddc332e5484f14a80580a32d52d93977cd9b42912 SHA512 db08d6c67d8627728679d0ed3770b8219a58f3eef82194ef8ba5682d3ff1f1033e2bbc8d6a1115a3fe0e32990f635c707a81ad8b4f457153fa78ff5991c9c30f
diff --git a/dev-libs/serd/serd-0.30.4.ebuild b/dev-libs/serd/serd-0.30.4.ebuild
index 2c0d9cab644c..07f44f426e3d 100644
--- a/dev-libs/serd/serd-0.30.4.ebuild
+++ b/dev-libs/serd/serd-0.30.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://download.drobilla.net/${P}.tar.bz2"
LICENSE="ISC"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc ~x86"
IUSE="doc static-libs test"
RESTRICT="!test? ( test )"
diff --git a/dev-libs/serd/serd-0.30.6.ebuild b/dev-libs/serd/serd-0.30.6.ebuild
new file mode 100644
index 000000000000..95e7eeadde3b
--- /dev/null
+++ b/dev-libs/serd/serd-0.30.6.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+PYTHON_REQ_USE='threads(+)'
+inherit python-any-r1 waf-utils multilib-build multilib-minimal
+
+DESCRIPTION="Library for RDF syntax which supports reading and writing Turtle and NTriples"
+HOMEPAGE="http://drobilla.net/software/serd/"
+SRC_URI="http://download.drobilla.net/${P}.tar.bz2"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc static-libs test"
+RESTRICT="!test? ( test )"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+ ${PYTHON_DEPS}
+ doc? ( app-doc/doxygen )"
+
+DOCS=( "AUTHORS" "NEWS" "README.md" )
+
+src_prepare() {
+ sed -i -e 's/^.*run_ldconfig/#\0/' wscript || die
+ default
+ multilib_copy_sources
+}
+
+multilib_src_configure() {
+ waf-utils_src_configure \
+ --docdir=/usr/share/doc/${PF} \
+ $(multilib_native_usex doc --docs "") \
+ $(usex test --test "") \
+ $(usex static-libs --static "")
+}
+
+multilib_src_test() {
+ ./waf test || die
+}
+
+multilib_src_compile() {
+ waf-utils_src_compile
+ default
+}
+
+multilib_src_install() {
+ waf-utils_src_install
+ default
+}
diff --git a/dev-perl/Config-AutoConf/Config-AutoConf-0.319.0.ebuild b/dev-perl/Config-AutoConf/Config-AutoConf-0.319.0.ebuild
new file mode 100644
index 000000000000..6151a68e03cf
--- /dev/null
+++ b/dev-perl/Config-AutoConf/Config-AutoConf-0.319.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DIST_AUTHOR=REHSACK
+DIST_VERSION=0.319
+
+inherit perl-module
+
+DESCRIPTION="A module to implement some of AutoConf macros in pure perl"
+
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ dev-perl/Capture-Tiny
+ virtual/perl-Carp
+ virtual/perl-Exporter
+ >=virtual/perl-ExtUtils-CBuilder-0.280.220
+ dev-perl/File-Slurper
+ virtual/perl-File-Spec
+ virtual/perl-File-Temp
+ >=virtual/perl-Scalar-List-Utils-1.180.0
+ virtual/perl-Text-ParseWords
+"
+BDEPEND="${RDEPEND}
+ virtual/perl-ExtUtils-MakeMaker
+ test? ( >=virtual/perl-Test-Simple-0.900.0 )
+"
diff --git a/dev-perl/Config-AutoConf/Manifest b/dev-perl/Config-AutoConf/Manifest
index 01bd4d17b463..c4647872da47 100644
--- a/dev-perl/Config-AutoConf/Manifest
+++ b/dev-perl/Config-AutoConf/Manifest
@@ -1,2 +1,3 @@
DIST Config-AutoConf-0.315.tar.gz 49738 BLAKE2B e1fe0be1c113a66583d4db40c81c74bd7f1884155c1f0da180546c2c26a2bb4b496ab4f8fce9f5a5cf4e22a15ace8fae8f2bf51e5a4cb662e8a58d5a9e83a808 SHA512 ab52d4d19ede25b1f7030b461b931f5cd5bc5f0af50a584a015b367ff2085b2e58826f079290a22194f50ef063c2ba8b469ced913e4c306f788ef28efa41f2e1
DIST Config-AutoConf-0.318.tar.gz 51016 BLAKE2B 816c74e2abc3087b5a89327e462092b6cd11005545510adc76c11ad84348a8f7f8b1fe7af37d10b79769d80ca35f44791b16658dbe4aca128b831898c26d009d SHA512 b125fb1c708a518a251695450ae4208d84c7b0de7e34081e22659bf2b93699868f14867d824805e1162fa99d8e15ed1072caf503d20b3c2cf0e27642b4213077
+DIST Config-AutoConf-0.319.tar.gz 52118 BLAKE2B 8c0596a22d7accab0366f33f4f72315356abb61ccc3c0c816651724fc21a091607c48b4bb69b5441771795c432376e0811ecaa799b3b7b38b05d6cbdae80c29c SHA512 156b40e9728f9b02530cb490b31a0d439414ab5c4b43a216f7f649c23f62462a441923dc02d22735fcd44a70a5314fc8e9465047261f0e61a2013c05ff69a3bd
diff --git a/dev-perl/DateTime-Format-Natural/DateTime-Format-Natural-1.110.0.ebuild b/dev-perl/DateTime-Format-Natural/DateTime-Format-Natural-1.110.0.ebuild
new file mode 100644
index 000000000000..97f030f721f7
--- /dev/null
+++ b/dev-perl/DateTime-Format-Natural/DateTime-Format-Natural-1.110.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DIST_AUTHOR=SCHUBIGER
+DIST_VERSION=1.11
+inherit perl-module
+
+DESCRIPTION="Parse informal natural language date/time strings"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ virtual/perl-Carp
+ dev-perl/Clone
+ dev-perl/Date-Calc
+ dev-perl/DateTime
+ dev-perl/DateTime-TimeZone
+ virtual/perl-Exporter
+ virtual/perl-File-Spec
+ virtual/perl-Getopt-Long
+ dev-perl/List-MoreUtils
+ >=dev-perl/Params-Validate-1.150.0
+ virtual/perl-Scalar-List-Utils
+ virtual/perl-Storable
+ virtual/perl-Term-ReadLine
+ dev-perl/boolean
+"
+DEPEND="
+ dev-perl/Module-Build
+"
+BDEPEND="${RDEPEND}
+ >=dev-perl/Module-Build-0.420.0
+ test? (
+ dev-perl/Module-Util
+ dev-perl/Test-MockTime
+ virtual/perl-Test-Simple
+ )
+"
+PERL_RM_FILES=(
+ t/pod-coverage.t
+ t/pod.t
+)
diff --git a/dev-perl/DateTime-Format-Natural/Manifest b/dev-perl/DateTime-Format-Natural/Manifest
index 262c74de7932..185566c12543 100644
--- a/dev-perl/DateTime-Format-Natural/Manifest
+++ b/dev-perl/DateTime-Format-Natural/Manifest
@@ -1,2 +1,3 @@
DIST DateTime-Format-Natural-1.05.tar.gz 80675 BLAKE2B 7495309aecc2aca50dcbcbbd7732cffac593a1455a438ada473c9cd0b4c068d4ac5f7dd59632d63e07b3b4c05d6d2cb8826996a047a618eb4a3f4f3fb4a29f85 SHA512 d6c07a7e6345321dfffbf608fbd0ef8b050761b612f76ebb0cf06b9e883ca83863b71f846868c8323d6d0c428c9ec93a988bcb53f883045bd1de94926cba9e7e
DIST DateTime-Format-Natural-1.10.tar.gz 80958 BLAKE2B 1d1fc1b4f1aae0e9bc359768960896d3d7da548051886789c21993854a2d550dc1c85e202dc714708a99aa09d26823773c6311f5fd33d91ec1844d5226c6e37d SHA512 41d51364efe242733945bca061fe67562fe24f069788d14962aeb2a5d0589e9078f81212d0fde78e950050853eaed5e1a0cc3868f409b82c7b054849c9dc2600
+DIST DateTime-Format-Natural-1.11.tar.gz 82424 BLAKE2B 454b6c525f3bdee31ad077ba3445b307e175f023dcee3309b7b9f05eced9d9424bde28700dbf22b210910bd056b21293e026290c3a9bf7b47ac3f73d2ac1ccfb SHA512 1e89fe7ea05eec620f453cde4874bba6ced5d4055944e9e396226041c1d2efaa9b5a4852b88484b7dc00d792d2842a5c74f5eb86e70b220a3a8afbc7e1111c80
diff --git a/dev-perl/File-HomeDir/File-HomeDir-1.6.0.ebuild b/dev-perl/File-HomeDir/File-HomeDir-1.6.0.ebuild
new file mode 100644
index 000000000000..da64f6f2f19d
--- /dev/null
+++ b/dev-perl/File-HomeDir/File-HomeDir-1.6.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DIST_AUTHOR=REHSACK
+DIST_VERSION=1.006
+inherit perl-module
+
+DESCRIPTION="Get home directory for self or other user"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="+xdg test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ virtual/perl-Carp
+ >=virtual/perl-File-Path-2.10.0
+ >=virtual/perl-File-Spec-3.120.0
+ >=virtual/perl-File-Temp-0.190.0
+ >=dev-perl/File-Which-0.50.0
+ xdg? ( x11-misc/xdg-user-dirs )
+"
+BDEPEND="${RDEPEND}
+ virtual/perl-ExtUtils-MakeMaker
+ test? (
+ >=virtual/perl-Test-Simple-0.900.0
+ )
+"
diff --git a/dev-perl/File-HomeDir/Manifest b/dev-perl/File-HomeDir/Manifest
index 6ae68b2faf2e..9a337eae97ed 100644
--- a/dev-perl/File-HomeDir/Manifest
+++ b/dev-perl/File-HomeDir/Manifest
@@ -1,2 +1,3 @@
DIST File-HomeDir-1.002.tar.gz 35441 BLAKE2B 01cbebbcc18958cb0056160383880c9749a1e43a4c27e2da9d6a190985929b53b25d3cb50d84766a1a9bc9607c64265c2fd622dc1d0eb4884d7c799edb02ff12 SHA512 4862c78f65785579d4978d3c4d36ba2a71fb78f069b5671d0cedabd6d187fb4377ae40be45b0abfb00df8dd362fbc28032aab2f39acbbe9f1d7bc4a5b24863d4
DIST File-HomeDir-1.004.tar.gz 35400 BLAKE2B 8628feff38783af9b2035f9bf44ed5b6e6dc121683422da23ff48ffb7492be5e9afa8221f5e21ce36de99151ea0c0cef830628a8fd69668e9db6c2717f9c7df2 SHA512 21671f6badb23fc7e89ef7507266a0b85b9bbf38897b24651f6a84795b5174dd4bfa43251231cbdb1566183e12b253e2504f1fe0f8e195c35d9b5e3d639aa334
+DIST File-HomeDir-1.006.tar.gz 35855 BLAKE2B d6339d483dfa32158138cb17e632074236ae67a0ae1ae1529a2bf38efc6fa3d9c83b4163cf6e1b9850353ead5d287625d3d1d1cf753f5757c16dbb664b941e0f SHA512 1ea90d68ed059ef5e890f6afb1280673dd5a597956f282c4ae8b4471c1751aa3cb2fcbe9caa6b2976937d11fd7233aa85a2dea611f87c79e0ddd1a501ceb890d
diff --git a/dev-perl/File-Listing/File-Listing-6.70.0.ebuild b/dev-perl/File-Listing/File-Listing-6.70.0.ebuild
new file mode 100644
index 000000000000..81fc02a1ffd5
--- /dev/null
+++ b/dev-perl/File-Listing/File-Listing-6.70.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DIST_AUTHOR=PLICEASE
+DIST_VERSION=6.07
+inherit perl-module
+
+DESCRIPTION="Parse directory listings"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ virtual/perl-Exporter
+ >=dev-perl/HTTP-Date-6.0.0
+ virtual/perl-Time-Local
+"
+BDEPEND="${RDEPEND}
+ virtual/perl-ExtUtils-MakeMaker
+ test? (
+ virtual/perl-Test-Simple
+ )
+"
diff --git a/dev-perl/File-Listing/Manifest b/dev-perl/File-Listing/Manifest
index 703fc086eddc..d8c7e14f6728 100644
--- a/dev-perl/File-Listing/Manifest
+++ b/dev-perl/File-Listing/Manifest
@@ -1 +1,2 @@
DIST File-Listing-6.04.tar.gz 51536 BLAKE2B 78020016dbe7e8e0ccf3f79f878d732ebd5cc278c597cb5e4ee38b6f632ce960f5c37015db868576ab21d81321af18960fb271aae6f4d116ba97571e6cad0c80 SHA512 a84198bc82003daaf88ed23218e34a7a1552dcd2855a9563e9609ce5df167a8295043501534c31614854fc8dd9c04b4af27b4d7320112c613914f94c86c2eeb2
+DIST File-Listing-6.07.tar.gz 61081 BLAKE2B edd4282dfb134ea5f2ecf4f227596aafd1c5f720d5e0158b1168e6ea93c0cd187f26c88992b08c8721894a3cb2b5ea9922124baf77d279a5eb165226390bf61b SHA512 1d525058e64ed3f3115721df63527752c8f3de2e0b000efea93b48054695e6b8143c613cdc1c652db30178f517f5bc106dfa176d30629553150234e7cd50682f
diff --git a/dev-perl/File-RsyncP/File-RsyncP-0.760.0.ebuild b/dev-perl/File-RsyncP/File-RsyncP-0.760.0.ebuild
new file mode 100644
index 000000000000..8f1d9c6227ff
--- /dev/null
+++ b/dev-perl/File-RsyncP/File-RsyncP-0.760.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DIST_AUTHOR=CBARRATT
+DIST_VERSION=0.76
+inherit perl-module toolchain-funcs
+
+DESCRIPTION="An rsync perl module"
+HOMEPAGE="http://perlrsync.sourceforge.net/ https://metacpan.org/release/File-RsyncP"
+# Bundled files make for some weirdness
+LICENSE="GPL-3+ GPL-2+ RSA"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="
+ >=virtual/perl-Getopt-Long-2.240.0
+ net-misc/rsync
+"
+BDEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}/${PN}-0.700.0-make.patch" )
+
+src_prepare() {
+ perl-module_src_prepare
+ tc-export CC
+}
+src_compile() {
+ mymake=(
+ "OPTIMIZE=${CFLAGS}"
+ )
+ perl-module_src_compile
+}
diff --git a/dev-perl/File-RsyncP/Manifest b/dev-perl/File-RsyncP/Manifest
index 5c301135c24f..f57c4d163b8f 100644
--- a/dev-perl/File-RsyncP/Manifest
+++ b/dev-perl/File-RsyncP/Manifest
@@ -1 +1,2 @@
DIST File-RsyncP-0.74.tar.gz 167122 BLAKE2B a5a5d3fee8301710ce36ba493e8b20c5ac5835f669cd35462bbe2390432b59e4ee38a8b5585cc8616fe11d646bfd4c4a2477b328584c526b4ed354e7b4ee7abf SHA512 0585c2f0b145875e9a13523d829b2ed9907e1e38c526f630a79a5b5dab36b6a9012375620ae92292e5977735c106bfab905bb121f56df5ca4494e1efcbd02cb6
+DIST File-RsyncP-0.76.tar.gz 167744 BLAKE2B e718a8cd18f3bf7c3d8b9ceb440c19b9544c232f2889532a15023ec1da6947085d4d07efb7edf7b1366830005f784e03b76bb9526d5ecb0072b3c0ab5fb88494 SHA512 b81d9ce63181605939e8aff87c9e56ab276899f019f44eb3f149e7ee0d44a94fcbee771381ebe6ca8281c2de0d57d9cbdbcb972ccb7406a0aefd920040603bb3
diff --git a/dev-perl/Manifest.gz b/dev-perl/Manifest.gz
index c3531e6bae02..e96b4bf3c639 100644
Binary files a/dev-perl/Manifest.gz and b/dev-perl/Manifest.gz differ
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index e1dda1e1823d..c833c6f5fc77 100644
Binary files a/dev-python/Manifest.gz and b/dev-python/Manifest.gz differ
diff --git a/dev-python/async_generator/async_generator-1.10.ebuild b/dev-python/async_generator/async_generator-1.10.ebuild
index 328f79e69dc0..b6ae9c877ae2 100644
--- a/dev-python/async_generator/async_generator-1.10.ebuild
+++ b/dev-python/async_generator/async_generator-1.10.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="|| ( MIT Apache-2.0 )"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv sparc x86"
DOCS=( README.rst )
diff --git a/dev-python/blockdiag/blockdiag-2.0.1.ebuild b/dev-python/blockdiag/blockdiag-2.0.1.ebuild
index 9cafe58f8c70..5aff478f9656 100644
--- a/dev-python/blockdiag/blockdiag-2.0.1.ebuild
+++ b/dev-python/blockdiag/blockdiag-2.0.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~ppc ~ppc64 sparc x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index d145e11ac874..a3f33b93b17e 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -10,3 +10,4 @@ DIST boto3-1.15.5.tar.gz 335536 BLAKE2B e4476272346dce929be52be220ac7da2e258bc20
DIST boto3-1.15.6.tar.gz 335618 BLAKE2B 6f3816b6363757ea1dbdef4bd710a68f07b513d2f4b6a7ad05769e2417e8b0a6752dcff8f3600f8bb419f074a24b32c9386c9f11dc549097bd963c32d20a0d23 SHA512 7357f8ac98ca1bb1983af22537d1ed939b1e51371966a7c312ec748f6acf9fbbb102335965a79cf44ebbb2b0b4db9ce859c4470f542d19ceea4513d90eaba274
DIST boto3-1.15.7.tar.gz 335640 BLAKE2B 01becc9a36fc03937153fc7d4a37b5630bb1c1d6f72ff9420de73a05f4ef7e5e39561e4175b6f652241d15efae708123b41673d9d69453b9b902c0f1568282b1 SHA512 4b612fc51e453af77e84ddbe5d3ee8e03e25be37a2b8fe65a960c22b8ee3423b1ddf0a482a189378e470500b3fe78af615571f15f9fb8fa86147a4334ef22ffa
DIST boto3-1.15.8.tar.gz 335724 BLAKE2B 4b034d21108bcf7fc100f71e534e348dfd72cf1ffea7e4ae53fa420e05c1e854216095e3179c4ce16c893a5bd32665830fc5ef3c3a4f0a011797b227ac53501d SHA512 dc6b9816fe58401a391aee2843698d8245141cb9735cc8b3c27181388ce8df070649e15d437ad96bbe3948061c97b0285e323c48e298c57271cd83d11180c768
+DIST boto3-1.15.9.tar.gz 335977 BLAKE2B 9c0e1bfd11408085fe758552ace077dd2db01cb29f038d1f1559f41c6c0921a19457bfc818502d6a36ce9f7f931b75a20a0f0ba8d71bf93217c7b7f1be973c56 SHA512 0d0eb897dd526c5a19308150f28482c8f84ecab6f66d0cbf2c169da44bf55765cd8ee853360867788cb6a99784100e773104fb8c35511ad18d3a058843c50438
diff --git a/dev-python/boto3/boto3-1.15.9.ebuild b/dev-python/boto3/boto3-1.15.9.ebuild
new file mode 100644
index 000000000000..ccc99e1c2415
--- /dev/null
+++ b/dev-python/boto3/boto3-1.15.9.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 ~arm ~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 f4581925b34e..d316944cd0cc 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -10,3 +10,4 @@ DIST botocore-1.18.5.tar.gz 6852318 BLAKE2B 3aeca749a143cba59ce637935a711df14351
DIST botocore-1.18.6.tar.gz 6854270 BLAKE2B d5d8a321adde9c16706768633a8ed32d4db086ec2634dae8e2057c2217b2e729bfd02e2968a9749d660ded41c883ac153a80083256a27496b4b59013b57520e5 SHA512 d4c3f79f1531f85f2ab793bcdeb13f8f51c333e704f404415e49f50d310a715f752f19bc4bc7ce07c5b20f19c5924008f47146f737c318b9204d8a4af4f6fe8d
DIST botocore-1.18.7.tar.gz 6854828 BLAKE2B d4b3095d29fea7157ca8b5499726886527941e04e0c2f274eba3573acc8a8c6ff26fd734f144335e03b9bb25c9fba128bb817a68178c284406a232c1d8881050 SHA512 c94ef62d4cc89317cb13fd96f5661de8ea3b1478c4dbce039d6e3b6af6ac4e58e3e5cf2d7d62c90e5b6b046303fc1e9273041640ae4907086591213ba3f79877
DIST botocore-1.18.8.tar.gz 6865779 BLAKE2B 5b67b67deba73a0a69d4b413bfb105b3eeae5d62a38b0f109d172652270e490eed55b42c8a67c14039aec3f8f0b8b1d1dd9d6945bf9c86d1466bf69d4dc4237f SHA512 467b8ac3c3860777efbf37868add24fc56eecf65003c03692f45669e4ece965c129e18fe3ee0e1ed75b02c886f5762186572927c5e99b3eae85724d7443072d4
+DIST botocore-1.18.9.tar.gz 6897783 BLAKE2B 7b449d58febdf3ca3f04bd75e30c3953d6701e5204578a99ce011cce28c5fb30341da5120d2c105b1240ac20dbe80fbfe958d2c5055a04b688ad099fb616342b SHA512 2cfc6c633a216ad091f02021966b3233bdb41f3bfd46c8c6f13bc7ab653024aba21eeb310c87112ad210385fc2316f77117c9ddf26ed0f0df82971b53dd7223b
diff --git a/dev-python/botocore/botocore-1.18.9.ebuild b/dev-python/botocore/botocore-1.18.9.ebuild
new file mode 100644
index 000000000000..ba67bf7ac94b
--- /dev/null
+++ b/dev-python/botocore/botocore-1.18.9.ebuild
@@ -0,0 +1,59 @@
+# 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 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+ dev-python/six[${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"
+)
+
+distutils_enable_sphinx docs/source \
+ 'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+src_prepare() {
+ # unpin deps
+ sed -i -e "s:>=.*':':" setup.py || 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/cloudpickle/cloudpickle-1.6.0.ebuild b/dev-python/cloudpickle/cloudpickle-1.6.0.ebuild
index 198841d7c8ae..5f94539fd4e8 100644
--- a/dev-python/cloudpickle/cloudpickle-1.6.0.ebuild
+++ b/dev-python/cloudpickle/cloudpickle-1.6.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
BDEPEND="
test? (
diff --git a/dev-python/cmd2/Manifest b/dev-python/cmd2/Manifest
index 10b4b2983314..131f66d05be6 100644
--- a/dev-python/cmd2/Manifest
+++ b/dev-python/cmd2/Manifest
@@ -1,2 +1,3 @@
DIST cmd2-1.3.10.tar.gz 656845 BLAKE2B 56e9b3a201eb8d87922b62160631a54429f03d9b667ed7785f6b1b06f130176aea45316ebd4bb394ba91293e7640f970be64addcbf59115256980cf28a2213ac SHA512 b1d21528fbfef79d2cbec05e4886e9c0d3a29862a3f29eb4a076d598edd8a8968112e383fc882c6d7902cf7e4c301f4c2c912cd40ae3abafbc7ffae3fe9ebaab
+DIST cmd2-1.3.11.tar.gz 657770 BLAKE2B 829023a4ebd2c2034dbbcd276720476ef9e19a0869bdd2dcc18f2b7cb58bf7c9874b9c56c60d6ba15f7458327d768bce5f07890054361b58574697cf8408cfd6 SHA512 bd640a38723cfb7886b74631ded288fee87026fe718db48ea71a1eb3cb61cea514dda2c4ccd1df95b5ade3c8f8a4a14be3dd9d6722c59260a5fe7c4dfba30f24
DIST cmd2-1.3.8.tar.gz 643320 BLAKE2B ca9eb089c4d1a5922d3f762e9fe118168349c807b770265d2e565a183447b938f08da578e0dc7de4a59a52fc39df2b53a63c84c1d86efd75c0ba58950bbe9a9a SHA512 af2b56234e0b257c4de564d46f4be83b56c37fd903ee737e825779558e44a9b60164bac1c0bc35a79c8aa1ba80155331c496c310e5ecad94f984673a30ef6976
diff --git a/dev-python/cmd2/cmd2-1.3.11.ebuild b/dev-python/cmd2/cmd2-1.3.11.ebuild
new file mode 100644
index 000000000000..cdd3428887c2
--- /dev/null
+++ b/dev-python/cmd2/cmd2-1.3.11.ebuild
@@ -0,0 +1,48 @@
+# 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 virtualx
+
+DESCRIPTION="Extra features for standard library's cmd module"
+HOMEPAGE="https://github.com/python-cmd2/cmd2"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+ dev-python/attrs[${PYTHON_USEDEP}]
+ >=dev-python/colorama-0.3.7[${PYTHON_USEDEP}]
+ >=dev-python/pyperclip-1.6[${PYTHON_USEDEP}]
+ dev-python/six[${PYTHON_USEDEP}]
+ dev-python/wcwidth[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ >=dev-python/importlib_metadata-1.6.0[${PYTHON_USEDEP}]
+ ' python3_{6,7})
+"
+BDEPEND="
+ dev-python/setuptools_scm[${PYTHON_USEDEP}]
+ test? ( dev-python/pytest-mock[${PYTHON_USEDEP}] )
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+ sed -i -e 's:test_which_editor_good:_&:' tests/test_cmd2.py || die
+ distutils-r1_src_prepare
+}
+
+src_test() {
+ # tests rely on very specific text wrapping...
+ local -x COLUMNS=80
+ virtx distutils-r1_src_test
+}
+
+python_test() {
+ distutils_install_for_testing
+ pytest -vv || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/collective-checkdocs/collective-checkdocs-0.2-r1.ebuild b/dev-python/collective-checkdocs/collective-checkdocs-0.2-r1.ebuild
new file mode 100644
index 000000000000..9631a340958a
--- /dev/null
+++ b/dev-python/collective-checkdocs/collective-checkdocs-0.2-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python3_{6..9} )
+# TODO: revert to rdepend once this is merged:
+# https://github.com/collective/collective.checkdocs/pull/11
+DISTUTILS_USE_SETUPTOOLS=manual
+
+inherit distutils-r1
+
+MY_PN="${PN/-/.}"
+DESCRIPTION="Distutils command to view/validate packages's rst text long_descriptions."
+HOMEPAGE="https://github.com/collective/collective.checkdocs"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.zip"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+LICENSE="GPL-2" # until https://github.com/collective/collective.checkdocs/issues/8 is fixed
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ dev-python/docutils[${PYTHON_USEDEP}]
+"
+BDEPEND="
+ app-arch/unzip
+ dev-python/setuptools[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests unittest
+
+python_install_all() {
+ distutils-r1_python_install_all
+ find "${D}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/collective-checkdocs/metadata.xml b/dev-python/collective-checkdocs/metadata.xml
index b7deeb302f91..b3409eaec2aa 100644
--- a/dev-python/collective-checkdocs/metadata.xml
+++ b/dev-python/collective-checkdocs/metadata.xml
@@ -11,4 +11,9 @@
collective.checkdocs adds new distutils commands checkdocs and showdocs to validate restructured text in long_description field of Python eggs. This package aims to make Python egg help page publishing and editing easier.
+
+ collective.checkdocs
+ collective/collective.checkdocs
+ https://github.com/collective/collective.checkdocs/issues
+
diff --git a/dev-python/cython/cython-0.29.21-r1.ebuild b/dev-python/cython/cython-0.29.21-r1.ebuild
index 0d37c4e33e83..4bed16412a57 100644
--- a/dev-python/cython/cython-0.29.21-r1.ebuild
+++ b/dev-python/cython/cython-0.29.21-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/cython/cython/archive/${PV}.tar.gz -> ${P}.gh.tar.gz
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
IUSE="emacs test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/cython/cython-0.29.21.ebuild b/dev-python/cython/cython-0.29.21.ebuild
index 765b801e1809..d35cba6eb19c 100644
--- a/dev-python/cython/cython-0.29.21.ebuild
+++ b/dev-python/cython/cython-0.29.21.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/cython/cython/archive/${PV}.tar.gz -> ${P}.gh.tar.gz
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
IUSE="emacs test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/dataclasses/dataclasses-0.7.ebuild b/dev-python/dataclasses/dataclasses-0.7.ebuild
index 1004469d2c0f..f965e1957ff3 100644
--- a/dev-python/dataclasses/dataclasses-0.7.ebuild
+++ b/dev-python/dataclasses/dataclasses-0.7.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc ~x86"
src_test() {
cd test || die
diff --git a/dev-python/denonavr/Manifest b/dev-python/denonavr/Manifest
index 5c827e7d7301..46729fc7722c 100644
--- a/dev-python/denonavr/Manifest
+++ b/dev-python/denonavr/Manifest
@@ -1 +1,2 @@
DIST denonavr-0.9.4.tar.gz 92936 BLAKE2B e7a38f1e967fa375bbc024fb2803ed7f4587b9bbf3540b47b2011bc30df7e907addcadf3ca26158e7a855fdb362c97c43a37d296b674c8774ff095e466a8a3d5 SHA512 32dd78f381a1c98b629e49dd90b127c023fad37b2e6f2fbd1aa4c5a308fe26a8fbca2e3f72e0ae5e26d498a421f029f5673af63353ed057213c2c3c4c77ef77f
+DIST denonavr-0.9.5.tar.gz 94016 BLAKE2B b6a013e6831600316dd4e1e33caec7da18774e17a1e9423dd2ae989c4f787cac471e21e2de06db0e01427345234a87825e298dc27881f21fbf69a720bbb04df4 SHA512 798fe126ab3c57ef285f45978e3b06ff5fab99eb3fc47e277c2d2eeb1786ac30fc09de8d23f2b4f59a1240bc2df4fca8e6946baf5135e051f387d1195a070ac7
diff --git a/dev-python/denonavr/denonavr-0.9.5.ebuild b/dev-python/denonavr/denonavr-0.9.5.ebuild
new file mode 100644
index 000000000000..9273badd2211
--- /dev/null
+++ b/dev-python/denonavr/denonavr-0.9.5.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python3_{6,7,8,9} )
+PYTHON_REQ_USE="xml(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Automation Library for Denon AVR receivers"
+HOMEPAGE="https://github.com/scarface-4711/denonavr"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+ dev-python/netifaces[${PYTHON_USEDEP}]
+ dev-python/requests[${PYTHON_USEDEP}]
+"
+BDEPEND="
+ test? (
+ dev-python/requests-mock[${PYTHON_USEDEP}]
+ dev-python/testtools[${PYTHON_USEDEP}]
+ )
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/django/Manifest b/dev-python/django/Manifest
index 014a9e875285..bfc7019b2054 100644
--- a/dev-python/django/Manifest
+++ b/dev-python/django/Manifest
@@ -1,3 +1,4 @@
DIST Django-2.2.16.tar.gz 8884774 BLAKE2B e65074c44e35921f6c40ca9e2a5fee53ce9a956a7503b96a33c8dbb4588bb0928d2e2b605f1117c3c75cdc84d6c7d1bfe52f4e7888fbe300adb5411a55b0ac27 SHA512 eabcdfc17e27c579001e4739268abd13bebbb018db1a7dbe4fb8482d32320b85bd16b3b18428084c0df947094f23f7cb4b12a3a55bc370748d7d8746af22bc3b
DIST Django-3.0.10.tar.gz 8958332 BLAKE2B 0ff17da9d9175b080d81e334e46ec6daaec5e4cd48f5d9a614c84b448a6d4b93d304b3fd25bcee665d65f589a8f94cf83f002bbd7a27975d23e3516286784e01 SHA512 fcce2815f966a5eb0f7986c16d065b352c73ea2ea4fc1422d440487d84162c5a93aa45b9173ba5d62d6caee2e976a9ac818f228b47ed7f4f50deda27bac995e9
DIST Django-3.1.1.tar.gz 9250616 BLAKE2B 220c53873a70bb30f0ea9b48a70ba71b2de517c11f238e6dc2be20b0e85c99dfdb2ea3b9cfe7b164c7141e0857f19d9d8f93390d7ef36bf34e915ccdb449e8f6 SHA512 5da4282c2ae712ecb2da654a99d46cd60c99aced90f75e681d5a0765b8c08669f27b6c38287bfe7bac028f12ae0643e2be06742752bdc83c62daf82fee60281f
+DIST Django-3.1.2.tar.gz 9387482 BLAKE2B 77e330b4b42f85ef416e90a2690c6315f2a8d30b5705f64b86f62daabe3ff60b24d9fcf8a1276e7425e5cf0e03833a5ca601d15dc3e1aa32f7b5d7a9792302da SHA512 39115e942c26c9af27c4079f590e15caa86cc5c0e012873d7be23809e39de178b2dd935919dee21bbee153bccb17463abcece1db3b1f7dfa95b7b55879488876
diff --git a/dev-python/django/django-3.1.2.ebuild b/dev-python/django/django-3.1.2.ebuild
new file mode 100644
index 000000000000..e13533790e62
--- /dev/null
+++ b/dev-python/django/django-3.1.2.ebuild
@@ -0,0 +1,81 @@
+# 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 optfeature
+
+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 ~arm ~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}]"
+# gettext: https://code.djangoproject.com/ticket/31850
+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}]
+
+Date: Mon Jul 20 13:18:23 2020 +0200
+
+ Tests: Add a value to mocked entry_points, so pytest 6+ can log it
+
+ Pytest 6.0.0rc1 attempts to log a repr of our mocked entry_point,
+ but it fails, becasue the repr metohod expects a valua attribute:
+
+ Reproducer:
+
+ $ tox -e py38 --force-dep 'pytest==6.0.0rc1'
+ ...
+ Traceback (most recent call last):
+ File "/usr/lib/python3.8/logging/__init__.py", line 1081, in emit
+ msg = self.format(record)
+ File "/usr/lib/python3.8/logging/__init__.py", line 925, in format
+ return fmt.format(record)
+ File "/usr/lib/python3.8/logging/__init__.py", line 664, in format
+ record.message = record.getMessage()
+ File "/usr/lib/python3.8/logging/__init__.py", line 369, in getMessage
+ msg = msg % self.args
+ File "/tmp/flake8/.tox/py38/lib/python3.8/site-packages/flake8/plugins/manager.py", line 44, in __repr__
+ self.name, self.entry_point.value
+ File "/tmp/flake8/.tox/py38/lib/python3.8/site-packages/mock/mock.py", line 632, in __getattr__
+ raise AttributeError("Mock object has no attribute %r" % name)
+ AttributeError: Mock object has no attribute 'value'
+
+diff --git a/tests/integration/test_checker.py b/tests/integration/test_checker.py
+index eaab5c3..0acdb6e 100644
+--- a/tests/integration/test_checker.py
++++ b/tests/integration/test_checker.py
+@@ -100,6 +100,7 @@ def mock_file_checker_with_plugin(plugin_target):
+ entry_point = mock.Mock(spec=['load'])
+ entry_point.name = plugin_target.name
+ entry_point.load.return_value = plugin_target
++ entry_point.value = 'mocked:value'
+
+ # Load the checker plugins using the entry point mock
+ with mock.patch.object(
diff --git a/dev-python/flake8/flake8-3.8.3.ebuild b/dev-python/flake8/flake8-3.8.3.ebuild
new file mode 100644
index 000000000000..7fb88e57ff18
--- /dev/null
+++ b/dev-python/flake8/flake8-3.8.3.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python3_{6..8} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="A wrapper around PyFlakes, pep8 & mccabe"
+HOMEPAGE="https://gitlab.com/pycqa/flake8 https://pypi.org/project/flake8/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~s390 ~x86"
+
+# requires.txt inc. mccabe however that creates a circular dep
+RDEPEND="
+ >=dev-python/pyflakes-2.2.0[${PYTHON_USEDEP}]
+ =dev-python/pycodestyle-2.6.0[${PYTHON_USEDEP}]
+ =dev-python/mccabe-0.6.0[${PYTHON_USEDEP}]
+ =dev-python/mock-2.0.0[${PYTHON_USEDEP}]
+ )
+"
+
+PATCHES=( "${FILESDIR}/${P}-pytest6.patch" )
+
+distutils_enable_sphinx docs/source dev-python/sphinx-prompt dev-python/sphinx_rtd_theme
+distutils_enable_tests pytest
+
+python_test() {
+ # Otherwise some tests fail if the package isn't installed
+ distutils_install_for_testing
+ pytest -vv || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/flask-babel/Manifest b/dev-python/flask-babel/Manifest
index b6026340c71d..af1ebc3b96f7 100644
--- a/dev-python/flask-babel/Manifest
+++ b/dev-python/flask-babel/Manifest
@@ -1,2 +1 @@
-DIST Flask-Babel-1.0.0.tar.gz 49680 BLAKE2B 29adeb7b4a6892fabf6e85da9f2fdb72f3871e3c3728c7521e06ffd80d8da505045eb1ef7a30223d8ef40064bc78514f6fc9acd1b8640232adb203ea55876e93 SHA512 3624b2e4877821551267e2719d76b714bda0a1da24e5a3c36d045273039823c4f3bbdf28cad5d8e0d4f0c896578248bfc40aebee720b543e500edf6de607ad8d
DIST Flask-Babel-2.0.0.tar.gz 19588 BLAKE2B dbd5d6f3af38fad15a4eb6d674222473d673a9002ced21ce09a913e0bce3285b1eac9a5a85ce53c1dcebf648444164f33a5c790039a7d01184d45c7734dac05f SHA512 2ad8f80b450db0cab7dd57f46158e7e653556d60869acdb3c2469d42dceca3fa97237cc960986655091c84a1a67a057d72ed510787ccb065d171e6f35764cb1d
diff --git a/dev-python/flask-babel/flask-babel-1.0.0.ebuild b/dev-python/flask-babel/flask-babel-1.0.0.ebuild
deleted file mode 100644
index 3ad5aeec4a4f..000000000000
--- a/dev-python/flask-babel/flask-babel-1.0.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
-
-PYTHON_COMPAT=( pypy3 python3_{6..9} )
-inherit distutils-r1
-
-MY_PN="Flask-Babel"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="i18n and l10n support for Flask based on Babel and pytz"
-HOMEPAGE="
- https://pythonhosted.org/Flask-Babel/
- https://pypi.org/project/Flask-Babel/
- https://github.com/python-babel/flask-babel/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86"
-
-RDEPEND="
- dev-python/Babel[${PYTHON_USEDEP}]
- dev-python/flask[${PYTHON_USEDEP}]
- >=dev-python/jinja-2.5[${PYTHON_USEDEP}]
- dev-python/pytz[${PYTHON_USEDEP}]
- dev-python/werkzeug[${PYTHON_USEDEP}]
-"
-
-distutils_enable_sphinx docs \
- dev-python/flask-sphinx-themes
-distutils_enable_tests unittest
-
-python_test() {
- "${EPYTHON}" tests/tests.py -v || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/funcparserlib/funcparserlib-0.3.6-r1.ebuild b/dev-python/funcparserlib/funcparserlib-0.3.6-r1.ebuild
index 6ea59ec4dca6..0aa5c2561e0a 100644
--- a/dev-python/funcparserlib/funcparserlib-0.3.6-r1.ebuild
+++ b/dev-python/funcparserlib/funcparserlib-0.3.6-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86"
IUSE=""
RDEPEND=""
diff --git a/dev-python/humanize/Manifest b/dev-python/humanize/Manifest
index 2645843bb497..91c9c98f6b85 100644
--- a/dev-python/humanize/Manifest
+++ b/dev-python/humanize/Manifest
@@ -1,2 +1,3 @@
DIST humanize-2.6.0.tar.gz 53753 BLAKE2B 7908100cde103846554264df887ddb54223900cdbf1e52b2a19f029084b2997ab7a02e275f437d0cc04c3c42d6f8c371fbdab23468cdeb8f98a8cd6a64c1c288 SHA512 d1e57672c80ccabc48dadb2bafe65ac0b5b23de13907d7d51a06b6a1f2f01ef254e36afa203c9393420ad3bb5aaa22616a0d5c4c71cc53cf47727436be0b1599
DIST humanize-3.0.0.tar.gz 53458 BLAKE2B c75ddbeed88aaef0019b50691576e6c8dd8ffdbf0ed1f1d1221c40ebfbaa502176f2db463afea3c8384f1b9acea7daaeca1e81f72919dbe2c476ff9d95db166b SHA512 8d566b4fba6b1f7f025e30d5d0402cb7ef7bf4881fb14608b011474d3e6991a0a058d444ccfdbb796205d959c2c4192e0eb98c6c15c31ba9e304f39a7cf8d025
+DIST humanize-3.0.1.tar.gz 53151 BLAKE2B 2f4ddb2f49b8de3ddf7d68620844f476c1ce349b6cfc01a810bb5b52a57739c615f6fd98a18faa108636fd75f2ff624c542279ae62535da2ff187964e5c21c62 SHA512 d2c0dfcc32923d70bb01b384299b3735436ff84328921b57bc436a938b4b8e65b22ce56ef07487aa3ddfc017e649c25a848129a11f1c9d7cd1e808359a1a30c3
diff --git a/dev-python/humanize/humanize-3.0.1.ebuild b/dev-python/humanize/humanize-3.0.1.ebuild
new file mode 100644
index 000000000000..94f1f6012cd1
--- /dev/null
+++ b/dev-python/humanize/humanize-3.0.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python3_{6,7,8,9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Common humanization utilities"
+HOMEPAGE="https://github.com/jmoiron/humanize/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="
+ dev-python/setuptools_scm[${PYTHON_USEDEP}]
+ test? ( dev-python/freezegun[${PYTHON_USEDEP}] )
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+ # The package uses pkg_resources to determine its version
+ distutils_install_for_testing
+ pytest -vv || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/hyper-h2/hyper-h2-4.0.0.ebuild b/dev-python/hyper-h2/hyper-h2-4.0.0.ebuild
index 5937d1f73bda..935c00d5e382 100644
--- a/dev-python/hyper-h2/hyper-h2-4.0.0.ebuild
+++ b/dev-python/hyper-h2/hyper-h2-4.0.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/python-hyper/${PN}/archive/v${PV}.tar.gz -> ${P}.tar
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86"
RDEPEND="
>=dev-python/hyperframe-6.0[${PYTHON_USEDEP}]
diff --git a/dev-python/hyperframe/hyperframe-6.0.0.ebuild b/dev-python/hyperframe/hyperframe-6.0.0.ebuild
index 7337c2d4dc4f..4684a3e1fb69 100644
--- a/dev-python/hyperframe/hyperframe-6.0.0.ebuild
+++ b/dev-python/hyperframe/hyperframe-6.0.0.ebuild
@@ -14,6 +14,6 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86"
distutils_enable_tests pytest
diff --git a/dev-python/hyperframe/metadata.xml b/dev-python/hyperframe/metadata.xml
index 3cd8a5d5e644..3734e16b4ba4 100644
--- a/dev-python/hyperframe/metadata.xml
+++ b/dev-python/hyperframe/metadata.xml
@@ -12,6 +12,7 @@
hyperframe
+
This library contains the HTTP/2 framing code used in the
hyper project. It provides a pure-Python codebase that is capable of
decoding a binary stream into HTTP/2 frames.
diff --git a/dev-python/iniconfig/iniconfig-1.0.0.ebuild b/dev-python/iniconfig/iniconfig-1.0.0.ebuild
index 810b8151db13..77fa2d51ed44 100644
--- a/dev-python/iniconfig/iniconfig-1.0.0.ebuild
+++ b/dev-python/iniconfig/iniconfig-1.0.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv sparc x86"
BDEPEND="dev-python/setuptools_scm[${PYTHON_USEDEP}]"
diff --git a/dev-python/ipython/Manifest b/dev-python/ipython/Manifest
index 2333ec6f393b..578565de48b0 100644
--- a/dev-python/ipython/Manifest
+++ b/dev-python/ipython/Manifest
@@ -1,4 +1,2 @@
DIST ipython-7.16.1.tar.gz 5136303 BLAKE2B 9baf42c9befa50d78eec29d012aeae7f01886f29642a01845afd4a96d0efb7a4df5b14b68aeeb22d1d621e5427b219f717688a1d5074a6e70ad0509c7ca73a46 SHA512 60259fd6270b0355be67b4f620a58b56ae86e69e14debe2df86df6118548f2290ab3927b8dfab20db1ebd675df697d05eb6994b93625a7b8b6ea07112ddf63bd
-DIST ipython-7.17.0.tar.gz 5139470 BLAKE2B df7dfb00ed81d5c3db7ba1408df6a4e26ac8439d6d58c7f9214ae89e446951eadf3f0d4c2be0654acebc0429a77773972b6dd081ef8c009a9d177924968e7b28 SHA512 0dabc6f4079719d2dd75c5ee92e4523b016b4a790776ccc7130a60bdd4ca1b88bcdcfb9ddd192f9c1a4397c27a27e7f7297540275d06832f870af347e2f14dd9
-DIST ipython-7.18.0.tar.gz 5138647 BLAKE2B cb6e81468ff7b0d452bd4666a8dc47dda7a7ee7b4685391f222a84db6fddcffa3d41514c1d8a346f07e0c3a89a942893cc7e16ac5888e1c35cc2603698527846 SHA512 2c1cb414d0125aba54dcf98221011d3024d7db0779b2ba79d7c283e2fe918822b59a7771f67e45bf3a60d1a2582862ff3a97475163278961564644373b416029
DIST ipython-7.18.1.tar.gz 5139337 BLAKE2B 936759db4377767537766a2baf0bff2adf1a95d17438899e1e1611d725e796d8ab78fcb8f1ca14d8d41171af64fa67abe9fadf84c6ca3cf17bb1d83fa2ba4268 SHA512 71f495021df56bbea97fb26b9274e54f7662875b7690a9493bdf682635e048d9ec53a947ee9b0d487634a3a8c639f0d93c6639b3a0dd20bdfefbb4c53fb53799
diff --git a/dev-python/ipython/ipython-7.17.0.ebuild b/dev-python/ipython/ipython-7.17.0.ebuild
deleted file mode 100644
index bdb4b91bc9d8..000000000000
--- a/dev-python/ipython/ipython-7.17.0.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-PYTHON_REQ_USE='readline,sqlite,threads(+)'
-
-inherit distutils-r1 optfeature virtualx
-
-DESCRIPTION="Advanced interactive shell for Python"
-HOMEPAGE="https://ipython.org/ https://github.com/ipython/ipython/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples matplotlib notebook nbconvert qt5 +smp test"
-RESTRICT="!test? ( test )"
-
-CDEPEND="
- dev-python/backcall[${PYTHON_USEDEP}]
- dev-python/decorator[${PYTHON_USEDEP}]
- dev-python/jedi[${PYTHON_USEDEP}]
- dev-python/pexpect[${PYTHON_USEDEP}]
- dev-python/pickleshare[${PYTHON_USEDEP}]
- >=dev-python/prompt_toolkit-2[${PYTHON_USEDEP}]
- =dev-python/ipykernel-5.1.0[${PYTHON_USEDEP}]
- dev-python/nbformat[${PYTHON_USEDEP}]
- dev-python/nose[${PYTHON_USEDEP}]
- >=dev-python/numpy-1.14[${PYTHON_USEDEP}]
- dev-python/requests[${PYTHON_USEDEP}]
- dev-python/testpath[${PYTHON_USEDEP}]
- )
- doc? (
- >=dev-python/ipykernel-5.1.0[${PYTHON_USEDEP}]
- dev-python/matplotlib[${PYTHON_USEDEP}]
- >=dev-python/sphinx-2[${PYTHON_USEDEP}]
- )"
-
-PDEPEND="
- notebook? (
- dev-python/notebook[${PYTHON_USEDEP}]
- dev-python/ipywidgets[${PYTHON_USEDEP}]
- dev-python/widgetsnbextension[${PYTHON_USEDEP}]
- )
- qt5? ( dev-python/qtconsole[${PYTHON_USEDEP}] )
- smp? (
- >=dev-python/ipykernel-5.1.0[${PYTHON_USEDEP}]
- >=dev-python/ipyparallel-6.2.3[${PYTHON_USEDEP}]
- )"
-
-PATCHES=( "${FILESDIR}"/2.1.0-substitute-files.patch )
-
-DISTUTILS_IN_SOURCE_BUILD=1
-
-python_prepare_all() {
- # Remove out of date insource files
- rm IPython/extensions/cythonmagic.py || die
- rm IPython/extensions/rmagic.py || die
-
- # Prevent un-needed download during build
- if use doc; then
- sed -e "/^ 'sphinx.ext.intersphinx',/d" -i docs/source/conf.py || die
- fi
-
- distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
- if use doc; then
- emake -C docs html_noapi
- HTML_DOCS=( docs/build/html/. )
- fi
-}
-
-src_test() {
- virtx distutils-r1_src_test
-}
-
-python_test() {
- distutils_install_for_testing
- pushd "${TEST_DIR}" >/dev/null || die
- "${TEST_DIR}"/scripts/iptest || die
- popd >/dev/null || die
-}
-
-python_install() {
- distutils-r1_python_install
-
- # Create ipythonX.Y symlinks.
- # TODO:
- # 1. do we want them for pypy? No. pypy has no numpy
- # 2. handle it in the eclass instead (use _python_ln_rel).
- # With pypy not an option the dosym becomes unconditional
- dosym ../lib/python-exec/${EPYTHON}/ipython \
- /usr/bin/ipython${EPYTHON#python}
-}
-
-python_install_all() {
- distutils-r1_python_install_all
-
- if use examples; then
- dodoc -r examples
- docompress -x /usr/share/doc/${PF}/examples
- fi
-}
-
-pkg_postinst() {
- optfeature "sympyprinting" dev-python/sympy
- optfeature "cythonmagic" dev-python/cython
- optfeature "%lprun magic command" dev-python/line_profiler
- optfeature "%mprun magic command" dev-python/memory_profiler
-
- if use nbconvert; then
- if ! has_version app-text/pandoc ; then
- einfo "Node.js will be used to convert notebooks to other formats"
- einfo "like HTML. Support for that is still experimental. If you"
- einfo "encounter any problems, please use app-text/pandoc instead."
- fi
- fi
-}
diff --git a/dev-python/ipython/ipython-7.18.0.ebuild b/dev-python/ipython/ipython-7.18.0.ebuild
deleted file mode 100644
index 634ebd345b96..000000000000
--- a/dev-python/ipython/ipython-7.18.0.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-PYTHON_REQ_USE='readline,sqlite,threads(+)'
-
-inherit distutils-r1 optfeature virtualx
-
-DESCRIPTION="Advanced interactive shell for Python"
-HOMEPAGE="https://ipython.org/ https://github.com/ipython/ipython/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples matplotlib notebook nbconvert qt5 +smp test"
-RESTRICT="!test? ( test )"
-
-CDEPEND="
- dev-python/backcall[${PYTHON_USEDEP}]
- dev-python/decorator[${PYTHON_USEDEP}]
- >=dev-python/jedi-0.16[${PYTHON_USEDEP}]
- >=dev-python/pexpect-4.3[${PYTHON_USEDEP}]
- dev-python/pickleshare[${PYTHON_USEDEP}]
- >=dev-python/prompt_toolkit-2[${PYTHON_USEDEP}]
- =dev-python/ipykernel-5.1.0[${PYTHON_USEDEP}]
- dev-python/nbformat[${PYTHON_USEDEP}]
- dev-python/nose[${PYTHON_USEDEP}]
- >=dev-python/numpy-1.14[${PYTHON_USEDEP}]
- dev-python/requests[${PYTHON_USEDEP}]
- dev-python/testpath[${PYTHON_USEDEP}]
- )
- doc? (
- >=dev-python/ipykernel-5.1.0[${PYTHON_USEDEP}]
- dev-python/matplotlib[${PYTHON_USEDEP}]
- >=dev-python/sphinx-2[${PYTHON_USEDEP}]
- )"
-
-PDEPEND="
- notebook? (
- dev-python/notebook[${PYTHON_USEDEP}]
- dev-python/ipywidgets[${PYTHON_USEDEP}]
- dev-python/widgetsnbextension[${PYTHON_USEDEP}]
- )
- qt5? ( dev-python/qtconsole[${PYTHON_USEDEP}] )
- smp? (
- >=dev-python/ipykernel-5.1.0[${PYTHON_USEDEP}]
- >=dev-python/ipyparallel-6.2.3[${PYTHON_USEDEP}]
- )"
-
-PATCHES=( "${FILESDIR}"/2.1.0-substitute-files.patch )
-
-DISTUTILS_IN_SOURCE_BUILD=1
-
-python_prepare_all() {
- # Remove out of date insource files
- rm IPython/extensions/cythonmagic.py || die
- rm IPython/extensions/rmagic.py || die
-
- # Prevent un-needed download during build
- if use doc; then
- sed -e "/^ 'sphinx.ext.intersphinx',/d" -i docs/source/conf.py || die
- fi
-
- distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
- if use doc; then
- emake -C docs html_noapi
- HTML_DOCS=( docs/build/html/. )
- fi
-}
-
-src_test() {
- virtx distutils-r1_src_test
-}
-
-python_test() {
- distutils_install_for_testing
- pushd "${TEST_DIR}" >/dev/null || die
- "${TEST_DIR}"/scripts/iptest || die
- popd >/dev/null || die
-}
-
-python_install() {
- distutils-r1_python_install
-
- # Create ipythonX.Y symlinks.
- # TODO:
- # 1. do we want them for pypy? No. pypy has no numpy
- # 2. handle it in the eclass instead (use _python_ln_rel).
- # With pypy not an option the dosym becomes unconditional
- dosym ../lib/python-exec/${EPYTHON}/ipython \
- /usr/bin/ipython${EPYTHON#python}
-}
-
-python_install_all() {
- distutils-r1_python_install_all
-
- if use examples; then
- dodoc -r examples
- docompress -x /usr/share/doc/${PF}/examples
- fi
-}
-
-pkg_postinst() {
- optfeature "sympyprinting" dev-python/sympy
- optfeature "cythonmagic" dev-python/cython
- optfeature "%lprun magic command" dev-python/line_profiler
- optfeature "%mprun magic command" dev-python/memory_profiler
-
- if use nbconvert; then
- if ! has_version app-text/pandoc ; then
- einfo "Node.js will be used to convert notebooks to other formats"
- einfo "like HTML. Support for that is still experimental. If you"
- einfo "encounter any problems, please use app-text/pandoc instead."
- fi
- fi
-}
diff --git a/dev-python/ipython/ipython-7.18.1.ebuild b/dev-python/ipython/ipython-7.18.1.ebuild
index 306f35fa3ed8..ec8488a4d51a 100644
--- a/dev-python/ipython/ipython-7.18.1.ebuild
+++ b/dev-python/ipython/ipython-7.18.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 x86 ~amd64-linux ~x86-linux"
IUSE="doc examples matplotlib notebook nbconvert qt5 +smp test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/keyring/Manifest b/dev-python/keyring/Manifest
index e1bdfb3daa1e..909857b826eb 100644
--- a/dev-python/keyring/Manifest
+++ b/dev-python/keyring/Manifest
@@ -1,2 +1 @@
-DIST keyring-21.3.0.tar.gz 73120 BLAKE2B 6124e29e4dfa0b4c1f4ad3c1262c282935f860c0aea796a9e66987e64e4737d7f746c9c832b427e49cdadb87e61a33f7bfbd956299400311ff08e59f643cf6ff SHA512 85119a13aeb62456f8b9409990c3f5f6e0c83e9850466ee3b7a3d10e879e3b7fd6d723b2b683a8904b5d20c76fc85471d16aaedbd7ce04d8b88f1d1dd265f0ff
DIST keyring-21.4.0.tar.gz 73591 BLAKE2B ad8fe71a6a8bd3180b01ce3ca0372f9d1dc493d3eb58ced707d1869284d21ceaffaab314c1304b58461d771fa1a4a5981ec8fbcfaf333d602bdef7985d8799eb SHA512 149f1706296c830605d0ff2eddacf3d531c3d80f694465785d83e2af1d55a49204a2112db840522d4de10cd012073cafe571638e2c39a2f61c308821fe5ec901
diff --git a/dev-python/keyring/keyring-21.3.0.ebuild b/dev-python/keyring/keyring-21.3.0.ebuild
deleted file mode 100644
index 8c9cdcffe088..000000000000
--- a/dev-python/keyring/keyring-21.3.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( pypy3 python3_{6,7,8,9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Provides access to the system keyring service"
-HOMEPAGE="https://github.com/jaraco/keyring"
-SRC_URI="https://github.com/jaraco/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="PSF-2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86"
-IUSE="doc"
-
-RDEPEND="
- dev-python/secretstorage[${PYTHON_USEDEP}]
- dev-python/entrypoints[${PYTHON_USEDEP}]
- dev-python/jeepney[${PYTHON_USEDEP}]
- $(python_gen_cond_dep '
- dev-python/importlib_metadata[${PYTHON_USEDEP}]
- ' pypy3 python3_{5,6,7})
-"
-BDEPEND="
- dev-python/setuptools_scm[${PYTHON_USEDEP}]
- dev-python/toml[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs \
- dev-python/jaraco-packaging \
- dev-python/rst-linker
-
-python_prepare_all() {
- sed -i -e 's:--flake8 --black --cov --mypy::' pytest.ini || die
- # relies on cpython's gc behavior
- sed -i -e 's:test_traceback_not_referenced:_&:' \
- tests/test_errors.py || die
-
- rm tests/backends/test_kwallet.py || die
-
- distutils-r1_python_prepare_all
-
- export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-}
diff --git a/dev-python/libvirt-python/Manifest b/dev-python/libvirt-python/Manifest
index d05534d8dbfe..a5ae81b192f2 100644
--- a/dev-python/libvirt-python/Manifest
+++ b/dev-python/libvirt-python/Manifest
@@ -1,2 +1,4 @@
DIST libvirt-python-6.2.0.tar.gz 196971 BLAKE2B e11c82bd98c62072c14992c485339337bcc3639bbd56154185834c145f76984ced9f09f7f05c302609ce6629a8d13db77debd6f3d85e8fdb00c818bbe51cc552 SHA512 91f6940f60670221c914ee7ffc8d89a74222bcacbbf1afd5f679479f1e1bcec563f297a8e8359d6f51a1eee29162e39e2a276f5277fcec551d50f112e304a947
DIST libvirt-python-6.5.0.tar.gz 198753 BLAKE2B 90951af538c664f5da20cfced6b81dc2b06d36e723b3c41a0b2763bf0d73d3036d7e84a2db57f20fa2bd1ede8fb01c45dad9e5097a9f6008579dae319f825898 SHA512 a69c75b615f674bbb89fdb3e5cfc3dddfde68adffd0599e9d03f1552bb765823dc003859fe713ac0a324835c61f909bd43518571ddde8f99c37bee2416f094eb
+DIST libvirt-python-6.7.0.tar.gz 208597 BLAKE2B 335bd89133b688586a55193635b4b75dabe6dd4a741a450e49067ac8a9b9d9da54787b50c23bc6d5322a7fecbe513422f02450e09d541cb112ccfd499ce18101 SHA512 7d5a7f87abc01285c2030c9408838d4e1496d0d0316b9ab775749e49719fa66c20114aad2bd281d6783e2cb4d47ceac5ac60ac584e881288d0b0d9cc76d5b2cb
+DIST libvirt-python-6.8.0.tar.gz 210034 BLAKE2B 667c2713bf9c0936f444c5b621f5af4e5273deda31496bc01c8834286a0ec0eb1c056006549cc5d129ef597264f8582acee62db3a2fd375daa4ebbceacb8fcc1 SHA512 6d2f82fafd414047cff16f0ad655fefd69c8c0da04be07d27da44e3ab17dd03e4e4ff102be1c30948c361268f57ea312978f9198fd128bfb54a3c1a07150e6af
diff --git a/dev-python/libvirt-python/libvirt-python-6.7.0.ebuild b/dev-python/libvirt-python/libvirt-python-6.7.0.ebuild
new file mode 100644
index 000000000000..234224f5717f
--- /dev/null
+++ b/dev-python/libvirt-python/libvirt-python-6.7.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+DISTUTILS_USE_SETUPTOOLS=no
+
+MY_P="${P/_rc/-rc}"
+
+inherit distutils-r1
+
+if [[ ${PV} = *9999* ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://libvirt.org/git/libvirt-python.git"
+ RDEPEND="app-emulation/libvirt:=[-python(-)]"
+else
+ SRC_URI="https://libvirt.org/sources/python/${MY_P}.tar.gz"
+ KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+ RDEPEND="app-emulation/libvirt:0/${PV}"
+fi
+S="${WORKDIR}/${P%_rc*}"
+
+DESCRIPTION="libvirt Python bindings"
+HOMEPAGE="https://www.libvirt.org"
+LICENSE="LGPL-2"
+SLOT="0"
+IUSE="examples test"
+RESTRICT="!test? ( test )"
+
+DEPEND="virtual/pkgconfig"
+BDEPEND="test? (
+ dev-python/lxml[${PYTHON_USEDEP}]
+ dev-python/nose[${PYTHON_USEDEP}]
+)"
+
+distutils_enable_tests setup.py
+
+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/libvirt-python/libvirt-python-6.8.0.ebuild b/dev-python/libvirt-python/libvirt-python-6.8.0.ebuild
new file mode 100644
index 000000000000..234224f5717f
--- /dev/null
+++ b/dev-python/libvirt-python/libvirt-python-6.8.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+DISTUTILS_USE_SETUPTOOLS=no
+
+MY_P="${P/_rc/-rc}"
+
+inherit distutils-r1
+
+if [[ ${PV} = *9999* ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://libvirt.org/git/libvirt-python.git"
+ RDEPEND="app-emulation/libvirt:=[-python(-)]"
+else
+ SRC_URI="https://libvirt.org/sources/python/${MY_P}.tar.gz"
+ KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+ RDEPEND="app-emulation/libvirt:0/${PV}"
+fi
+S="${WORKDIR}/${P%_rc*}"
+
+DESCRIPTION="libvirt Python bindings"
+HOMEPAGE="https://www.libvirt.org"
+LICENSE="LGPL-2"
+SLOT="0"
+IUSE="examples test"
+RESTRICT="!test? ( test )"
+
+DEPEND="virtual/pkgconfig"
+BDEPEND="test? (
+ dev-python/lxml[${PYTHON_USEDEP}]
+ dev-python/nose[${PYTHON_USEDEP}]
+)"
+
+distutils_enable_tests setup.py
+
+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/more-itertools/Manifest b/dev-python/more-itertools/Manifest
index a3a74cd71d1b..d1466377e63a 100644
--- a/dev-python/more-itertools/Manifest
+++ b/dev-python/more-itertools/Manifest
@@ -1,3 +1,2 @@
DIST more-itertools-5.0.0.tar.gz 67359 BLAKE2B a2448b218eea4442cc4739a4df414ba69e0530cd6206a13c5c017a13daa297d00c08a94cec8aec0639d8b03663f4b698702f5e700ae118ae9fb5854a6d105b36 SHA512 f72c8d6c75799c39708443ba75862801ddd3fc0382c9eee7ed24ecf04cbc7d9ff6a8e35b6fff1eaccf45ddd470c2cc8959532eca32c2ff50b0a12588727c68b4
-DIST more-itertools-8.4.0.tar.gz 83626 BLAKE2B 84370e495a6f32c856f751907e45c6155cb5d6331a84607eba26842ee4e964f8f0a01d2c16d4c5446e5e51cc24aaea619105ae24b067b9fabe3fe8741de526dc SHA512 70bf72594cb92b165f1bdc5050bcd3d7d37eeee65db6c631b636222005f8d7707d0c6ab09a229e9f1a23fdcf2be948e96d0882f9fa033f29b7a472ec8441a4d0
DIST more-itertools-8.5.0.tar.gz 86861 BLAKE2B 6c5d7e0e2bfa89b65636115d5539ca5a36de24b7e0971638721d8fa13f6ad84f0fc64b297b5c3c30d380f78e271f6b6622d72a41ffb8f1941945d5918ec6c78a SHA512 f11a4443d4d5e79fe241fc6e170ae51b08cfb1f1093dddad036e1ba043c30d03c53ab9fccbfb4de97279862c6cfe44759ae88ce6027d871515b032e7d9e435e7
diff --git a/dev-python/more-itertools/more-itertools-8.4.0.ebuild b/dev-python/more-itertools/more-itertools-8.4.0.ebuild
deleted file mode 100644
index ef2bb6f5b256..000000000000
--- a/dev-python/more-itertools/more-itertools-8.4.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="More routines for operating on iterables, beyond itertools"
-HOMEPAGE="https://pypi.org/project/more-itertools/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-BDEPEND="
- dev-python/setuptools[${PYTHON_USEDEP}]
-"
-
-distutils_enable_sphinx docs \
- dev-python/sphinx_rtd_theme
-distutils_enable_tests unittest
diff --git a/dev-python/mypy_extensions/mypy_extensions-0.4.3-r1.ebuild b/dev-python/mypy_extensions/mypy_extensions-0.4.3-r1.ebuild
index 694e737a835d..ac824f711934 100644
--- a/dev-python/mypy_extensions/mypy_extensions-0.4.3-r1.ebuild
+++ b/dev-python/mypy_extensions/mypy_extensions-0.4.3-r1.ebuild
@@ -15,7 +15,7 @@ if [[ "${PV}" =~ [9]{4,} ]]; then
EGIT_REPO_URI="https://github.com/python/${PN}"
EGIT_COMMIT="master"
else
- KEYWORDS="~alpha ~amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+ KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv sparc ~x86"
fi
LICENSE="MIT"
diff --git a/dev-python/prompt_toolkit/Manifest b/dev-python/prompt_toolkit/Manifest
index 3a1977516269..07062815046b 100644
--- a/dev-python/prompt_toolkit/Manifest
+++ b/dev-python/prompt_toolkit/Manifest
@@ -1,3 +1,2 @@
DIST prompt_toolkit-2.0.10.tar.gz 347981 BLAKE2B b95cf000d5249da3710f9b51f72d41c3d552f1d3a35dea5493f565f0f62998d890bf2b81b3376140a4d16a19f2c5fd60eb0cb5f2f58180c176ef1543c6fc4ec2 SHA512 b91292cf43607b3a7018ca29827f0aa9bc90efc064c68faffe02ad28e4bb60f45fc2d25bbfd9a40a383a815cb08596975f08237a498f94a5c088d56d3a0a9803
-DIST prompt_toolkit-3.0.6.tar.gz 369730 BLAKE2B 84f5f578a6ae5b8dbbf0ca244a2d3dcb9ecc858ffce3ca5e657f85705c9090d32abbdddcadbb8e139d980d87f279d998db874551be93c47b4a740cc3d2e99c5b SHA512 44c47f8f331b7fca3fb9449cbb9ad6b2703fa83bff30274cabfd888c1d149b1f2305f3a08cf53143c86d9889096775e776272ee56aeb1f3664a8399a4eecae08
DIST prompt_toolkit-3.0.7.tar.gz 3018359 BLAKE2B c1d1f897a422df599d2bfbbfc53851489bf9f41a7ddb57fb1a03cae8411a7468bd047423922a5e95dcdcfb2730dee38029bdaa15eb7dc92ff47066b4b6edc6cb SHA512 3ee4cf65f175343273eb2c1b76250b35430ac3f3ee7cc61bfbcca86a717fdaaf74c723dba400d872b47b06883bed959b166df33b8960173beb466edf9266ff43
diff --git a/dev-python/prompt_toolkit/prompt_toolkit-3.0.6.ebuild b/dev-python/prompt_toolkit/prompt_toolkit-3.0.6.ebuild
deleted file mode 100644
index a280a736898f..000000000000
--- a/dev-python/prompt_toolkit/prompt_toolkit-3.0.6.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# 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="Building powerful interactive command lines in Python"
-HOMEPAGE="https://pypi.org/project/prompt_toolkit/ https://github.com/prompt-toolkit/python-prompt-toolkit"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 x86"
-IUSE=""
-
-RDEPEND="
- >=dev-python/six-1.9.0[${PYTHON_USEDEP}]
- dev-python/wcwidth[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/protobuf-python/protobuf-python-3.12.2-r1.ebuild b/dev-python/protobuf-python/protobuf-python-3.12.2-r1.ebuild
index 5c10c9876757..fecb666aee45 100644
--- a/dev-python/protobuf-python/protobuf-python-3.12.2-r1.ebuild
+++ b/dev-python/protobuf-python/protobuf-python-3.12.2-r1.ebuild
@@ -24,7 +24,7 @@ fi
LICENSE="BSD"
SLOT="0/23"
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
IUSE=""
BDEPEND="${PYTHON_DEPS}
diff --git a/dev-python/pyflakes/files/pyflakes-2.2.0-fix-tests.patch b/dev-python/pyflakes/files/pyflakes-2.2.0-fix-tests.patch
new file mode 100644
index 000000000000..00b1130bf342
--- /dev/null
+++ b/dev-python/pyflakes/files/pyflakes-2.2.0-fix-tests.patch
@@ -0,0 +1,97 @@
+diff --git a/pyflakes/test/test_api.py b/pyflakes/test/test_api.py
+index b579ac8..d379b3b 100644
+--- a/pyflakes/test/test_api.py
++++ b/pyflakes/test/test_api.py
+@@ -515,8 +513,10 @@ def foo(bar=baz, bax):
+ """
+ with self.makeTempFile(source) as sourcePath:
+ if ERROR_HAS_LAST_LINE:
+- if PYPY and sys.version_info >= (3,):
++ if PYPY:
+ column = 7
++ elif sys.version_info >= (3, 9):
++ column = 21
+ elif sys.version_info >= (3, 8):
+ column = 9
+ else:
+@@ -543,8 +543,10 @@ foo(bar=baz, bax)
+ """
+ with self.makeTempFile(source) as sourcePath:
+ if ERROR_HAS_LAST_LINE:
+- if PYPY and sys.version_info >= (3,):
++ if PYPY:
+ column = 12
++ elif sys.version_info >= (3, 9):
++ column = 17
+ elif sys.version_info >= (3, 8):
+ column = 14
+ else:
+@@ -578,7 +580,9 @@ foo(bar=baz, bax)
+ else:
+ position_end = 1
+ if PYPY:
+- column = 6
++ column = 5
++ elif ver >= (3, 9):
++ column = 13
+ else:
+ column = 7
+ # Column has been "fixed" since 3.2.4 and 3.3.1
+@@ -717,13 +721,6 @@ class IntegrationTests(TestCase):
+ """
+ Tests of the pyflakes script that actually spawn the script.
+ """
+-
+- # https://bitbucket.org/pypy/pypy/issues/3069/pypy36-on-windows-incorrect-line-separator
+- if PYPY and sys.version_info >= (3,) and WIN:
+- LINESEP = '\n'
+- else:
+- LINESEP = os.linesep
+-
+ def setUp(self):
+ self.tempdir = tempfile.mkdtemp()
+ self.tempfilepath = os.path.join(self.tempdir, 'temp')
+@@ -784,7 +781,7 @@ class IntegrationTests(TestCase):
+ fd.write("import contraband\n".encode('ascii'))
+ d = self.runPyflakes([self.tempfilepath])
+ expected = UnusedImport(self.tempfilepath, Node(1), 'contraband')
+- self.assertEqual(d, ("%s%s" % (expected, self.LINESEP), '', 1))
++ self.assertEqual(d, ("%s%s" % (expected, os.linesep), '', 1))
+
+ def test_errors_io(self):
+ """
+@@ -794,7 +791,7 @@ class IntegrationTests(TestCase):
+ """
+ d = self.runPyflakes([self.tempfilepath])
+ error_msg = '%s: No such file or directory%s' % (self.tempfilepath,
+- self.LINESEP)
++ os.linesep)
+ self.assertEqual(d, ('', error_msg, 1))
+
+ def test_errors_syntax(self):
+@@ -807,7 +804,7 @@ class IntegrationTests(TestCase):
+ fd.write("import".encode('ascii'))
+ d = self.runPyflakes([self.tempfilepath])
+ error_msg = '{0}:1:{2}: invalid syntax{1}import{1} {3}^{1}'.format(
+- self.tempfilepath, self.LINESEP, 6 if PYPY else 7, '' if PYPY else ' ')
++ self.tempfilepath, os.linesep, 6 if PYPY else 7, '' if PYPY else ' ')
+ self.assertEqual(d, ('', error_msg, 1))
+
+ def test_readFromStdin(self):
+@@ -816,15 +813,13 @@ class IntegrationTests(TestCase):
+ """
+ d = self.runPyflakes([], stdin='import contraband')
+ expected = UnusedImport('', Node(1), 'contraband')
+- self.assertEqual(d, ("%s%s" % (expected, self.LINESEP), '', 1))
++ self.assertEqual(d, ("%s%s" % (expected, os.linesep), '', 1))
+
+
+ class TestMain(IntegrationTests):
+ """
+ Tests of the pyflakes main function.
+ """
+- LINESEP = os.linesep
+-
+ def runPyflakes(self, paths, stdin=None):
+ try:
+ with SysStreamCapturing(stdin) as capture:
diff --git a/dev-python/pyflakes/pyflakes-2.2.0.ebuild b/dev-python/pyflakes/pyflakes-2.2.0.ebuild
index c9d537394f5b..0ce909282377 100644
--- a/dev-python/pyflakes/pyflakes-2.2.0.ebuild
+++ b/dev-python/pyflakes/pyflakes-2.2.0.ebuild
@@ -2,7 +2,10 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
+
+PYTHON_COMPAT=( pypy3 python3_{6..9} )
+# Uses pkg_resources
+DISTUTILS_USE_SETUPTOOLS=rdepend
inherit distutils-r1
@@ -14,6 +17,7 @@ LICENSE="MIT"
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 ~sparc64-solaris ~x64-solaris ~x86-solaris"
-RDEPEND="${BDEPEND}"
+# Should be included in the next release
+PATCHES=( "${FILESDIR}/${P}-fix-tests.patch" )
distutils_enable_tests unittest
diff --git a/dev-python/pymysql/Manifest b/dev-python/pymysql/Manifest
index 28175fb18446..130c1bfa5488 100644
--- a/dev-python/pymysql/Manifest
+++ b/dev-python/pymysql/Manifest
@@ -1,2 +1,3 @@
DIST pymysql-0.10.0.tar.gz 86137 BLAKE2B bcd4746d3e3947c2598b875d46678984beedfa0d9161a1aefb1f7f4b5314e084f5292206435b0a2621fb100744194fd1e2963228e37b41c289c5c4021f475371 SHA512 7d322c526634380cf4d3216f666a7d1f38e120390aab525cb8806bcea3f2fd7eab82e744a0be7270eae47ab1f79be5b5f7409e7e5dc9aaabf1e3c0c8853f578f
+DIST pymysql-0.10.1.tar.gz 86441 BLAKE2B 8e33fbba0544dad68c3eeb5bd538c4bce121222b4660ad06c3c0224b5db6a6c9f45d6697a98d5f0ba20429afa204d46c9ce57a4d9696dbc2a35649c6253a645b SHA512 edc702c54a33350f75648765c60d4cf455449e88818948b018585d557bea280e626d23b1279a410765f2de8e35b3c22ea5c8e0ef3dc72588b674c93a2124a224
DIST pymysql-0.9.3.tar.gz 86715 BLAKE2B 0ed09f7f5c47bd1fae52dd9d0ff0790367962d8e4b89d3933704b8b8d838e1f48b68455a9a3916318bf3c1c1f102fa11b4e1e3401d021f8a2d6137612a4affb9 SHA512 d906b7a6612d91db7d4f7f2d85a9375477e6655c568e0d1e7281ad0263d4a78f0ac4e80263605723f99e12db04c80f51c5c8ed79ed6f209a7afeb4b45bf40648
diff --git a/dev-python/pymysql/pymysql-0.10.1.ebuild b/dev-python/pymysql/pymysql-0.10.1.ebuild
new file mode 100644
index 000000000000..b58055923b2f
--- /dev/null
+++ b/dev-python/pymysql/pymysql-0.10.1.ebuild
@@ -0,0 +1,138 @@
+# 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="PyMySQL"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Pure-Python MySQL Driver"
+HOMEPAGE="https://github.com/PyMySQL/PyMySQL"
+SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+# TODO: support other mysql variants
+BDEPEND="
+ test? ( dev-db/mariadb[server] )"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.10.0-fix-tests.patch
+)
+
+src_prepare() {
+ find -name '*.py' -exec sed -i -e 's:unittest2:unittest:' {} + || die
+
+ # Auth tests don't support socket auth
+ find tests/ -name '*_auth.py' -delete || die
+
+ distutils-r1_src_prepare
+}
+
+src_test() {
+ if [[ -z "${USER}" ]] ; then
+ # Tests require system user
+ local -x USER="$(whoami)"
+ einfo "USER set to '${USER}'"
+ fi
+
+ local PIDFILE="${T}/mysqld.pid"
+ if pkill -0 -F "${PIDFILE}" &>/dev/null ; then
+ einfo "Killing already running mysqld process ..."
+ pkill -F "${PIDFILE}"
+ fi
+
+ if [[ -d "${T}/mysql" ]] ; then
+ einfo "Removing already existing mysqld data dir ..."
+ rm -rf "${T}/mysql" || die
+ fi
+
+ einfo "Creating mysql test instance ..."
+ mkdir -p "${T}"/mysql || die
+ "${BROOT}"/usr/share/mariadb/scripts/mysql_install_db \
+ --no-defaults \
+ --auth-root-authentication-method=normal \
+ --basedir="${BROOT}/usr" \
+ --datadir="${T}"/mysql 1>"${T}"/mysqld_install.log \
+ || die
+
+ einfo "Starting mysql test instance ..."
+ # TODO: random port
+ mysqld \
+ --no-defaults \
+ --character-set-server=utf8 \
+ --bind-address=127.0.0.1 \
+ --port=43306 \
+ --pid-file="${T}"/mysqld.pid \
+ --socket="${T}"/mysqld.sock \
+ --datadir="${T}"/mysql 1>"${T}"/mysqld.log 2>&1 &
+
+ # wait for it to start
+ local i
+ for (( i = 0; i < 10; i++)); do
+ [[ -S ${T}/mysqld.sock ]] && break
+ sleep 1
+ done
+ [[ -S ${T}/mysqld.sock ]] || die "mysqld failed to start"
+
+ einfo "Preparing test mysql instance ..."
+
+ # create test user for auth tests
+ mysql -uroot --socket="${T}"/mysqld.sock -s -e '
+ INSTALL SONAME "auth_ed25519";
+ CREATE FUNCTION ed25519_password RETURNS STRING SONAME "auth_ed25519.so";
+ ' || die "Failed to set up auth_ed25519"
+
+ mysql -uroot --socket="${T}"/mysqld.sock -s -e "
+ SELECT CONCAT('CREATE USER nopass_ed25519 IDENTIFIED VIA ed25519 USING \"',ed25519_password(\"\"),'\";');
+ SELECT CONCAT('CREATE USER user_ed25519 IDENTIFIED VIA ed25519 USING \"',ed25519_password(\"pass_ed25519\"),'\";');
+ " || die "Failed to create ed25519 test users"
+
+ # create test databases
+ mysql -uroot --socket="${T}"/mysqld.sock -s -e '
+ create database test1 DEFAULT CHARACTER SET utf8mb4;
+ create database test2 DEFAULT CHARACTER SET utf8mb4;
+
+ create user test2 identified by "some password";
+ grant all on test2.* to test2;
+
+ create user test2@localhost identified by "some password";
+ grant all on test2.* to test2@localhost;
+ ' || die "Failed to create test databases"
+
+ cat > pymysql/tests/databases.json <<-EOF || die
+ [{
+ "host": "localhost",
+ "user": "root",
+ "passwd": "",
+ "db": "test1",
+ "use_unicode": true,
+ "local_infile": true,
+ "unix_socket": "${T}/mysqld.sock"
+ }, {
+ "host": "localhost",
+ "user": "root",
+ "passwd": "",
+ "db": "test2",
+ "unix_socket": "${T}/mysqld.sock"
+ }]
+ EOF
+
+ distutils-r1_src_test
+
+ if pkill -0 -F "${PIDFILE}" &>/dev/null ; then
+ einfo "Stopping mysql test instance ..."
+ pkill -F "${PIDFILE}"
+ fi
+}
+
+distutils_enable_tests pytest
diff --git a/dev-python/pytest/pytest-6.0.1.ebuild b/dev-python/pytest/pytest-6.0.1.ebuild
index 3720e6e0ee6b..0c95994845e6 100644
--- a/dev-python/pytest/pytest-6.0.1.ebuild
+++ b/dev-python/pytest/pytest-6.0.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 arm arm64 ~hppa ~ia64 ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="~amd64 arm arm64 ~hppa ~ia64 ~ppc64 ~riscv sparc x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/sphinx-aiohttp-theme/sphinx-aiohttp-theme-0.1.6.ebuild b/dev-python/sphinx-aiohttp-theme/sphinx-aiohttp-theme-0.1.6.ebuild
index f6b4193a74ff..e44e2a543db3 100644
--- a/dev-python/sphinx-aiohttp-theme/sphinx-aiohttp-theme-0.1.6.ebuild
+++ b/dev-python/sphinx-aiohttp-theme/sphinx-aiohttp-theme-0.1.6.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv sparc x86"
IUSE=""
RDEPEND="dev-python/sphinx[${PYTHON_USEDEP}]"
diff --git a/dev-python/sphinx-prompt/Manifest b/dev-python/sphinx-prompt/Manifest
index 30c5fbc8d10e..9b30b091c2f9 100644
--- a/dev-python/sphinx-prompt/Manifest
+++ b/dev-python/sphinx-prompt/Manifest
@@ -1 +1,2 @@
DIST sphinx-prompt-1.2.0.tar.gz 7506 BLAKE2B babff99a29b87ba9529d7811a5b34280b1d30a4f7dbde8cea28a3c2ec687d1d4443b6bd8b0fb3ab5bdd002066ef1d3117768a529e46691fbec9de59d5c8771a8 SHA512 e3fe2740bee8a0107a12e131d3a4f90ed22c4bcceab7cb94fc869a534725552d4d3a9d8519a54782c5a1913a2e3bee088fa14db7b3a37f256be3243c7f6a9a1f
+DIST sphinx-prompt-1.3.0.tar.gz 7511 BLAKE2B 3e327b93fdfba48684983b0524fddc2c70f5ca997364e58cddb4e1d1078f51fc73e0102b969c49fa6cb27154624cd0220ea244eb13a0f64444a4e252bfe3f9ca SHA512 21dad50833ee1e00493c208b844caa41420fc2874c48fcb9ce20168a4872f8dc0a654eeea6ca6159d5ff6bbac3de15c2633c2f5abd826ac352c3f0ced37f6146
diff --git a/dev-python/sphinx-prompt/sphinx-prompt-1.3.0.ebuild b/dev-python/sphinx-prompt/sphinx-prompt-1.3.0.ebuild
new file mode 100644
index 000000000000..2dcef95465cc
--- /dev/null
+++ b/dev-python/sphinx-prompt/sphinx-prompt-1.3.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python3_{7..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Sphinx directive to add unselectable prompt"
+HOMEPAGE="https://github.com/sbrunner/sphinx-prompt/"
+SRC_URI="https://github.com/sbrunner/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+ dev-python/sphinx[${PYTHON_USEDEP}]
+ dev-python/pygments[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/sphinx-testing/sphinx-testing-1.0.1-r1.ebuild b/dev-python/sphinx-testing/sphinx-testing-1.0.1-r1.ebuild
index 966d9b666d56..20290d8c0955 100644
--- a/dev-python/sphinx-testing/sphinx-testing-1.0.1-r1.ebuild
+++ b/dev-python/sphinx-testing/sphinx-testing-1.0.1-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD-2"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/sphinxcontrib-blockdiag/sphinxcontrib-blockdiag-2.0.0.ebuild b/dev-python/sphinxcontrib-blockdiag/sphinxcontrib-blockdiag-2.0.0.ebuild
index 82e87dcbf8b6..011fa2fdffdf 100644
--- a/dev-python/sphinxcontrib-blockdiag/sphinxcontrib-blockdiag-2.0.0.ebuild
+++ b/dev-python/sphinxcontrib-blockdiag/sphinxcontrib-blockdiag-2.0.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/blockdiag/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 sparc x86"
RDEPEND="
>=dev-python/sphinx-2.0[${PYTHON_USEDEP}]
diff --git a/dev-python/sphinxcontrib-newsfeed/sphinxcontrib-newsfeed-0.1.4.ebuild b/dev-python/sphinxcontrib-newsfeed/sphinxcontrib-newsfeed-0.1.4.ebuild
index 718fd94f125d..7b66056ce80f 100644
--- a/dev-python/sphinxcontrib-newsfeed/sphinxcontrib-newsfeed-0.1.4.ebuild
+++ b/dev-python/sphinxcontrib-newsfeed/sphinxcontrib-newsfeed-0.1.4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD-2"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
IUSE="examples"
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/vobject/vobject-0.9.6.1-r1.ebuild b/dev-python/vobject/vobject-0.9.6.1-r1.ebuild
deleted file mode 100644
index 1f5d43e37d48..000000000000
--- a/dev-python/vobject/vobject-0.9.6.1-r1.ebuild
+++ /dev/null
@@ -1,29 +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="Python package for parsing and generating vCard and vCalendar files"
-HOMEPAGE="https://eventable.github.io/vobject/
- https://pypi.org/project/vobject/
- https://github.com/eventable/vobject"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86"
-IUSE=""
-
-BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=">=dev-python/python-dateutil-2.4.0[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
-
-DOCS=( ACKNOWLEDGEMENTS.txt README.md )
-
-python_test() {
- "${EPYTHON}" tests.py || die "Testing failed under ${EPYTHON}"
-}
diff --git a/dev-python/zope-interface/Manifest b/dev-python/zope-interface/Manifest
index fae56776040e..d78a0dac4860 100644
--- a/dev-python/zope-interface/Manifest
+++ b/dev-python/zope-interface/Manifest
@@ -1 +1,2 @@
DIST zope.interface-5.1.0.tar.gz 225400 BLAKE2B 6ad412bbf3c0327d2b8f37899c1e71fe4bf63c3840c9f2c7e776e3208ec8999c4812aaae89cb9a78724b40ef3dd883323b00eeccab44714eabef6c33c171be48 SHA512 be8319913222ada47a22559e22322ec12dff3adf17f45335d007c5aa3509d84a7d0a7e6c113967b91810b3613344b5c60e002eb740af2bbb454b2807de8dad98
+DIST zope.interface-5.1.1.tar.gz 228612 BLAKE2B 4452a9e75feb496e933add5b15c17a782c78aaa0274eae09955ce618dd5946997d29aedbd4856952467e243ccdda923b66925af27afefeda03aff78f5f8f1fe4 SHA512 9cf195154592f5bac3335420eb01c55914b856e4b135b1756c9d812aa9418dcbd82a7e8438d3d1b5891867ca655c722641eb4d1606c47132aa8f9523b67c5725
diff --git a/dev-python/zope-interface/zope-interface-5.1.1.ebuild b/dev-python/zope-interface/zope-interface-5.1.1.ebuild
new file mode 100644
index 000000000000..5de915fb7e90
--- /dev/null
+++ b/dev-python/zope-interface/zope-interface-5.1.1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# pkg_resources namespace
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
+
+inherit distutils-r1 flag-o-matic
+
+MY_PN=${PN/-/.}
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Interfaces for Python"
+HOMEPAGE="https://pypi.org/project/zope.interface/ https://github.com/zopefoundation/zope.interface"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="ZPL"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+RDEPEND="dev-python/namespace-zope[${PYTHON_USEDEP}]"
+BDEPEND="
+ test? (
+ dev-python/zope-event[${PYTHON_USEDEP}]
+ dev-python/zope-testing[${PYTHON_USEDEP}]
+ )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+ "${FILESDIR}"/5.1.0-drop-coverage.patch
+)
+
+distutils_enable_tests setup.py
+
+python_compile() {
+ if ! python_is_python3; then
+ local CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}"
+ append-flags -fno-strict-aliasing
+ fi
+
+ distutils-r1_python_compile
+}
+
+python_install_all() {
+ distutils-r1_python_install_all
+
+ # remove .pth files since dev-python/namespace-zope handles the ns
+ find "${D}" -name '*.pth' -delete || die
+}
diff --git a/dev-qt/Manifest.gz b/dev-qt/Manifest.gz
index 9d9fee5b64f9..899508527a92 100644
Binary files a/dev-qt/Manifest.gz and b/dev-qt/Manifest.gz differ
diff --git a/dev-qt/qtstyleplugins/qtstyleplugins-5.0.0_p20170311.ebuild b/dev-qt/qtstyleplugins/qtstyleplugins-5.0.0_p20170311.ebuild
index 24e7e83cdc2f..b9c249781d39 100644
--- a/dev-qt/qtstyleplugins/qtstyleplugins-5.0.0_p20170311.ebuild
+++ b/dev-qt/qtstyleplugins/qtstyleplugins-5.0.0_p20170311.ebuild
@@ -7,7 +7,7 @@ inherit qmake-utils
COMMIT="335dbece103e2cbf6c7cf819ab6672c2956b17b3"
DESCRIPTION="Additional style plugins for Qt5 (gtk2, cleanlook, plastic, motif)"
-HOMEPAGE="https://github.com/qt/qtstyleplugins"
+HOMEPAGE="https://code.qt.io/cgit/qt/qtstyleplugins.git/"
SRC_URI="https://github.com/qt/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="5"
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index 5fd2313d610c..e824c91a3340 100644
Binary files a/dev-ruby/Manifest.gz and b/dev-ruby/Manifest.gz differ
diff --git a/dev-ruby/asciidoctor-diagram/Manifest b/dev-ruby/asciidoctor-diagram/Manifest
index 78b14f6cc021..ed85da09c131 100644
--- a/dev-ruby/asciidoctor-diagram/Manifest
+++ b/dev-ruby/asciidoctor-diagram/Manifest
@@ -1,3 +1,4 @@
DIST asciidoctor-diagram-1.5.19.tar.gz 11707367 BLAKE2B 2088d2a7b424b9a716204e607d6e4c3bb7521b2098caad131210c163ade6f8a07872793945829d6b1e6e88a9d04126738eb439c968e99f326baddc310b48de0e SHA512 14270c8ea0e63163e01171695ecb99f5ef9667e2ec50b26e56495a1fc2c0e8af97fc784f5decb8fc75f1830581a9bc658d699af6aeee52adc20adad82cb1aed9
DIST asciidoctor-diagram-2.0.2.tar.gz 12481283 BLAKE2B f0b12514a7b16f6ab8c3a072aa9550ecfe0c8139e8f9ec1ea660a805813f942530519e4d90357e9b28d5d0e6c48bb9aff5dc1d56bfbe1cb15095653a8311c62c SHA512 8a72ee61b7341c516d1d34610a7cd0cd6d0c8dbd4b970b79c3b313f1230a0cc79ff47fcf553c2de144bd3f1f922183f0236354651a255023ce14b04f17195ee7
DIST asciidoctor-diagram-2.0.3.tar.gz 12483731 BLAKE2B b907ff1747b440ddabe83ca9a562ed9ad7b4b04b07d18fe7d3214f0eea035d4a9b340a121c91a7a5d1f5dc9011d6e56958b784b229a571b6cd2d902205eeda13 SHA512 19bd0263b6d159685f1d0b7955f11428bcce9afd66157903cb797499652bfd587d41d0bd8493f7e97ccf3ee32cfdebcab10c4001b50a21060a890289573adbf1
+DIST asciidoctor-diagram-2.0.5.tar.gz 12482984 BLAKE2B b0ef8596d2f2dfcf11fcbba876141aee38e8615195159f76e07b45c00b46bd85824dd6e8e9f571b396bbd9d082c5d60d4e05cdeac27719bfca53216c0d1b1816 SHA512 7e3bfbfb08d7389a039b1727bc173fca82e05134bebd89f3ca65d5e7860555034ff5e785c32e55ea2cc9826343456c6ecdfa15fc76f4d94858461356ab3ced71
diff --git a/dev-ruby/asciidoctor-diagram/asciidoctor-diagram-2.0.5.ebuild b/dev-ruby/asciidoctor-diagram/asciidoctor-diagram-2.0.5.ebuild
new file mode 100644
index 000000000000..9a6dfb6b1969
--- /dev/null
+++ b/dev-ruby/asciidoctor-diagram/asciidoctor-diagram-2.0.5.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby25 ruby26"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.adoc LICENSE.txt README.adoc"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit multilib ruby-fakegem
+
+DESCRIPTION="A set of Asciidoctor extensions that enable you to add diagrams"
+HOMEPAGE="https://github.com/asciidoctor/asciidoctor-diagram"
+SRC_URI="https://github.com/asciidoctor/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/asciidoctor-1.5.7 ${P}.tar.gz"
+LICENSE="MIT"
+
+KEYWORDS="~amd64"
+SLOT="$(ver_cut 1)"
+IUSE=""
+
+ruby_add_rdepend "dev-ruby/execjs:*"
+
+ruby_add_bdepend "test? (
+ >=dev-ruby/rails-5.0.0
+ dev-ruby/rake
+ dev-ruby/rspec-rails
+)"
+
+all_ruby_prepare() {
+ sed -i -e "/bundler/d" -e "/BUNDLE/d" spec/app/config/boot.rb || die
+ sed -i -e "/Bundler/ s:^:#:" \
+ -e '/config.sass/ s:^:#:' spec/app/config/application.rb || die
+ sed -i -e '1igem "tzinfo", "~>1.0"' spec/spec_helper.rb || die
+ rm -f spec/rails_spec.rb || die
+}
diff --git a/dev-ruby/combustion/Manifest b/dev-ruby/combustion/Manifest
index ecc2ef57f52e..a07b96ae4ab4 100644
--- a/dev-ruby/combustion/Manifest
+++ b/dev-ruby/combustion/Manifest
@@ -1 +1,2 @@
DIST combustion-1.3.0.gem 18944 BLAKE2B 5a6f6f2ffd67ae180d3f34be0501ebb05f5a7e3a008b2588fa7c746c69760201b533fdbbab93df6c97fbeb642b6c3f190605b35fae4cb3c31b0b7b7c16d1fa77 SHA512 32ec2c2ab9b1c6a834cf334b3f41e60e495a9c366e57830fa27bc8554b6eff72e8998d76f4c8e8e2e6d81e6c3574db46edf12a1bff05329cd3bacbea8eeb2a46
+DIST combustion-1.3.1.gem 36864 BLAKE2B 08b0651d33b15ffbf9ee01186f90e7247623a06af3bd9e535f82495d3beb7fb7f0a570bd0f9a2a62233b98fb1f9c91ea1527f59fd747300fc68a8f0054b78ffd SHA512 59f456d29cf0b014b1a87a8996bc596cfc8a7d57a8ca514c726eb26264f35c3075d86b712bc1efa1d154a068afa4d389fd1a3efab44b050f07db5c334d7300f7
diff --git a/dev-ruby/combustion/combustion-1.3.1.ebuild b/dev-ruby/combustion/combustion-1.3.1.ebuild
new file mode 100644
index 000000000000..4b0534f01501
--- /dev/null
+++ b/dev-ruby/combustion/combustion-1.3.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_TASK_TEST=""
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Elegant Rails Engine Testing"
+HOMEPAGE="https://github.com/pat/combustion"
+LICENSE="MIT"
+
+KEYWORDS="~amd64"
+SLOT="0"
+IUSE=""
+
+ruby_add_rdepend "
+ >=dev-ruby/activesupport-3.0.0:*
+ >=dev-ruby/railties-3.0.0:*
+ >=dev-ruby/thor-0.14.6:*
+"
diff --git a/dev-ruby/pdf-reader/Manifest b/dev-ruby/pdf-reader/Manifest
index 5e4e8a550866..be4007b4206f 100644
--- a/dev-ruby/pdf-reader/Manifest
+++ b/dev-ruby/pdf-reader/Manifest
@@ -1,2 +1,3 @@
DIST pdf-reader-1.4.1.tar.gz 10236680 BLAKE2B 86fb137c65b47717e758473b94ddbbf52def3ae0edaecd7b5eb3f0d880f664c9ff6097221f43d64247b006ed18220f4f9a469d6b8574592750a1d8a468ce7ddb SHA512 aaa53dafc2d58dc591f708941907ecf14b1ee73362a7bd6d34659103d51effa90888560733747ca1bfe3d217cb6834109e06b024f40a95214880ca42f54054e5
DIST pdf-reader-2.4.0.tar.gz 11025697 BLAKE2B 6886090ce7e293280db434ab7a8e866f11fa8debad3767ea5fee337f481a8695c98bc9dbd46e7e29b132f7f9675a0ce13b957962189bcffe46d37d826e9a2bef SHA512 965b016f8d71e46f1f483c48470049b2ae7eebe72b8e7ae9e50a7ebbf6e72e409e84bf4a6e612f6b76713afd6b38f7fc7f24ae5e898d12fa8f65e3878575c090
+DIST pdf-reader-2.4.1.tar.gz 12453907 BLAKE2B 9ba4aef6c8bd8ef4cb696e7afd3a47578b16ccc82ee065f49d092200c39bf1b218e886f63af8f38e1a7ba6ae2884021a3759753044b2af583454ce301d4b8341 SHA512 84c30fb8ff521b3d3c86348668ce5bacca8e82d414e35f59aaf6e04a1dfa87b3beead2a527efc42d80534358f27af6bea445f49fdc223ecdc61a910ddb7ca5e2
diff --git a/dev-ruby/pdf-reader/pdf-reader-2.4.1.ebuild b/dev-ruby/pdf-reader/pdf-reader-2.4.1.ebuild
new file mode 100644
index 000000000000..0d9203bbcb24
--- /dev/null
+++ b/dev-ruby/pdf-reader/pdf-reader-2.4.1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+GITHUB_USER=yob
+
+USE_RUBY="ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.md TODO"
+
+RUBY_FAKEGEM_GEMSPEC="pdf-reader.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="PDF parser conforming as much as possible to the PDF specification from Adobe"
+HOMEPAGE="https://github.com/yob/pdf-reader/"
+
+# We cannot use the gem distributions because they don't contain the
+# tests' data, we have to rely on the git tags.
+SRC_URI="https://github.com/${GITHUB_USER}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND+=" !!=dev-ruby/afm-0.2.1 =dev-ruby/afm-0.2*
+ =dev-ruby/ascii85-1*
+ =dev-ruby/hashery-2*
+ dev-ruby/ttfunk:*
+ dev-ruby/ruby-rc4"
+
+all_ruby_prepare() {
+ # Remove bundler support
+ sed -i -e '/[Bb]undler/d' spec/spec_helper.rb || die
+}
+
+all_ruby_install() {
+ all_fakegem_install
+
+ docinto examples
+ dodoc examples/*
+}
diff --git a/dev-ruby/regexp_parser/Manifest b/dev-ruby/regexp_parser/Manifest
index 2af280b03dca..6980112fd2c7 100644
--- a/dev-ruby/regexp_parser/Manifest
+++ b/dev-ruby/regexp_parser/Manifest
@@ -2,3 +2,4 @@ DIST regexp_parser-0.5.0.tar.gz 80554 BLAKE2B 7890e6850e3ffbb927c5e72430ab29e6ae
DIST regexp_parser-1.5.1.tar.gz 82482 BLAKE2B ff1746e52e786e273923dd222ea8c8276eb1e4ffe9bf899068160dec229784709ba679983c1e43736c128ec094861174bd43e0aceea704ee2d38aff4a53e6775 SHA512 4856fbcac800083b417880c30b5d6a5ea445bb85950bdd7898f368bfa2d44b01b1e2058b279f1640cf1cf4d7b28e225d25bc2d356d2c4a7c1be0a2c621dd3827
DIST regexp_parser-1.7.1.tar.gz 83865 BLAKE2B 1aab4f5c4d399ee48951a9fa9f24fef14073ca5267ec29e5011880274d2749a7a3d1f5cb2a6a5107d5c848537367e1f725a6de9bb9af8803ccc8ccedaac415eb SHA512 fda810bc18039484725df5c6092b3d1b31f398e337cbace253cfdfa934274902f2dcb4e64c4fd0bb24379c79ea2976383313c1a5cd4ad246ecb7eabfd1a47d64
DIST regexp_parser-1.8.0.tar.gz 85071 BLAKE2B 1d9f60617372f872e8b372bbee0f808d060add768094d53bc05ef2f4757936fcfb4772dc0a2ba59630884b339a3c66d34336cfa05825f4ef53427ddd3528b9d7 SHA512 bbf2429c00c214288869b77641e44d04591c3917ceeb9262ae8638c0731b020bead4a7b11d397ef2e1a26752c660addcc46fd94a4e557766d230de71b99a9501
+DIST regexp_parser-1.8.1.tar.gz 85379 BLAKE2B 341f16b6fce9654984c9fbab589ef0991d50f42e935558da2741e2dcbfe8cbc21200fd2233abff2907a1bd44c5b350b41a665ef4f993591b92f31d3280a24ba5 SHA512 6642dad18313e10856d86bf3ecd2fc5b0927698ca8e37f17745b755088f750febf2c05fd098e99b87543cd90f944ae0d9c4c03452048d2b44b4b1fb68e986045
diff --git a/dev-ruby/regexp_parser/regexp_parser-1.8.1.ebuild b/dev-ruby/regexp_parser/regexp_parser-1.8.1.ebuild
new file mode 100644
index 000000000000..9a339fd368c9
--- /dev/null
+++ b/dev-ruby/regexp_parser/regexp_parser-1.8.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_TASK_TEST="test:full"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+RUBY_FAKEGEM_GEMSPEC="regexp_parser.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A library for tokenizing, lexing, and parsing Ruby regular expressions"
+HOMEPAGE="https://github.com/ammar/regexp_parser"
+SRC_URI="https://github.com/ammar/regexp_parser/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="1"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~sparc ~x86"
+IUSE=""
+
+DEPEND+=" =dev-util/ragel-6*"
+
+ruby_add_bdepend "dev-ruby/rake
+ test? ( dev-ruby/regexp_property_values dev-ruby/rspec:3 )"
+
+all_ruby_prepare() {
+ sed -i -e '/bundler/I s:^:#:' Rakefile || die
+}
+
+each_ruby_compile() {
+ ${RUBY} -S rake ragel:rb || die
+}
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 8145d62c218b..5db975509e72 100644
Binary files a/dev-util/Manifest.gz and b/dev-util/Manifest.gz differ
diff --git a/dev-util/ccache/Manifest b/dev-util/ccache/Manifest
index 6c35ab7c7bba..eb12073ed681 100644
--- a/dev-util/ccache/Manifest
+++ b/dev-util/ccache/Manifest
@@ -1 +1,2 @@
DIST ccache-3.7.11.tar.xz 354160 BLAKE2B 46fc5d65d6224bb796db7632b35ccca1089e5fed36eeb2ba231cf4c1aaa94be10bf0504f6ef565ce11673e527e09dee64583a764062ca7fea38364d790dd8cc1 SHA512 47b71b3ab4b89bf9b6f6d15941c22d2207b369922f51f9a8fbf4e86554325053dccce669e1c1ed3c0019a7e0a3d610f399e52d3fee68b56111aa7c1b24132c11
+DIST ccache-3.7.12.tar.xz 354684 BLAKE2B b0b1028ede8206622c4b563cdc1351bdbe49ac11aa92d405c778af91db5bac029f7331371ef0a55bc3b1c7a0b60fbc5711277e048481bf0f4ad4b1be8acd3495 SHA512 0eb47869f86d36b3e5fad0d5073973f0444f3efe23fd14469a9e05154ea219228443098b1c5e4a8a0c5c78b4bfa7623735b50ebd6b8b4d0626766061850d6a62
diff --git a/dev-util/ccache/ccache-3.7.12.ebuild b/dev-util/ccache/ccache-3.7.12.ebuild
new file mode 100644
index 000000000000..0e7e1e384c55
--- /dev/null
+++ b/dev-util/ccache/ccache-3.7.12.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="fast compiler cache"
+HOMEPAGE="https://ccache.dev/"
+SRC_URI="https://github.com/ccache/ccache/releases/download/v${PV}/ccache-${PV}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="test"
+
+DEPEND="app-arch/xz-utils
+ sys-libs/zlib"
+RDEPEND="${DEPEND}
+ dev-util/shadowman
+ sys-apps/gentoo-functions"
+# clang-specific tests use dev-libs/elfutils to compare objects for equality.
+# Let's pull in the dependency unconditionally.
+DEPEND+="
+ test? ( dev-libs/elfutils )"
+
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-3.5-nvcc-test.patch
+ "${FILESDIR}"/${PN}-3.7.12-objdump.patch
+)
+
+src_prepare() {
+ default
+
+ sed \
+ -e "/^EPREFIX=/s:'':'${EPREFIX}':" \
+ "${FILESDIR}"/ccache-config-3 > ccache-config || die
+
+ # mainly used in tests
+ tc-export OBJDUMP
+}
+
+src_configure() {
+ econf --without-bundled-zlib
+}
+
+src_compile() {
+ emake V=1
+}
+
+src_test() {
+ emake check V=1
+}
+
+src_install() {
+ DOCS=( doc/{AUTHORS,MANUAL,NEWS}.adoc CONTRIBUTING.md README.md )
+ default
+
+ dobin ccache-config
+ insinto /usr/share/shadowman/tools
+ newins - ccache <<<"${EPREFIX}/usr/lib/ccache/bin"
+}
+
+pkg_prerm() {
+ if [[ -z ${REPLACED_BY_VERSION} && ${ROOT:-/} == / ]] ; then
+ eselect compiler-shadow remove ccache
+ fi
+}
+
+pkg_postinst() {
+ if [[ ${ROOT:-/} == / ]]; then
+ eselect compiler-shadow update ccache
+ fi
+}
diff --git a/dev-util/ccache/files/ccache-3.7.12-objdump.patch b/dev-util/ccache/files/ccache-3.7.12-objdump.patch
new file mode 100644
index 000000000000..f5387104e453
--- /dev/null
+++ b/dev-util/ccache/files/ccache-3.7.12-objdump.patch
@@ -0,0 +1,12 @@
+Allow ${CHOST}-objdump (or any other override)
+--- a/test/suites/debug_prefix_map.bash
++++ b/test/suites/debug_prefix_map.bash
+@@ -24,7 +24,7 @@ objdump_cmd() {
+ if $HOST_OS_APPLE; then
+ xcrun dwarfdump -r0 $1
+ else
+- objdump -W $1
++ ${OBJDUMP-objdump} -W $1
+ fi
+ }
+
diff --git a/dev-util/cgdb/Manifest b/dev-util/cgdb/Manifest
index 4297a57d0ca9..3d1b9838c3fb 100644
--- a/dev-util/cgdb/Manifest
+++ b/dev-util/cgdb/Manifest
@@ -1,3 +1,2 @@
-DIST cgdb-0.6.8.tar.gz 435115 BLAKE2B 31efcd8740dc0a0354c8d655cd7b77b18b25842dc39d1de42a92917305879394b425d7a7b0e555b368fc6a67f535fe9244c3fedeec9105c3622ace313b24c8c8 SHA512 ef3d94820bb5a37a8d7fbac48c8d144e0ac73c4f5a9d25bea33f2c4390080bb2dbdc5e7e21a5ef8a4980515cc48d80f140f7cf1f90eebac3f8bf1cc6168585ea
DIST cgdb-0.7.0.tar.gz 319980 BLAKE2B bfc62f9214f6726e5df081119e85ccdeaea9a2310a9bb7a1746525ab998ea94ec1181efd3a1986ec0d33103c2f2b888e4d93c4ddaa4a996db4e47b0173c3b67c SHA512 83aeb919e96cd0981d8fe5cdd257df3e8d8bfbceea720ea66c1773b28c9f0ecb0e303e0585206c55242bc4438d505e328d43b4991c6ddc4e4202e048558c30d9
DIST cgdb-0.7.1.tar.gz 314768 BLAKE2B 767a57d071fa4e3c75d231a1ec879d871669fcda9c733d157d380fa525dd321f1deb68d7ef7f424b3f36a115043a0a0faae271f24746f934e288ba7d9a4e7fa1 SHA512 050c7bad963d51c1a2cb309530319ca77e9d236f419fb0abac4ab5030ff1068d799fa626959a8b3036321711de98bddf40d264bf9367ff5697075e30ca8168c6
diff --git a/dev-util/cgdb/cgdb-0.6.8.ebuild b/dev-util/cgdb/cgdb-0.6.8.ebuild
deleted file mode 100644
index 357b17b658a2..000000000000
--- a/dev-util/cgdb/cgdb-0.6.8.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-if [[ ${PV} = *9999* ]]; then
- inherit git-r3
- EGIT_REPO_URI="
- https://github.com/cgdb/cgdb.git
- git@github.com:cgdb/cgdb.git"
-else
- SRC_URI="https://github.com/cgdb/cgdb/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
-fi
-
-inherit autotools multilib-minimal
-
-DESCRIPTION="A curses front-end for GDB, the GNU debugger"
-HOMEPAGE="https://cgdb.github.io/"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-COMMONDEPEND="
- sys-libs/ncurses:0=
- sys-libs/readline:0="
-
-DEPEND="${COMMONDEPEND}
- test? ( dev-util/dejagnu )"
-
-RDEPEND="
- ${COMMONDEPEND}
- sys-devel/gdb"
-
-DOCS=( AUTHORS ChangeLog INSTALL NEWS README.md TODO )
-
-PATCHES=(
- # Bug: #724256
- "${FILESDIR}/${PN}-0.7.1-respect-AR.patch"
-)
-
-src_prepare() {
- default
- cp configure.{init,ac} || die "cp failed"
- AT_M4DIR="config" eautoreconf
-}
-
-multilib_src_configure() {
- ECONF_SOURCE="${S}" econf
-}
diff --git a/dev-util/cmake/cmake-3.17.4-r1.ebuild b/dev-util/cmake/cmake-3.17.4-r1.ebuild
index 5517cd95a3d6..ff9f9f259db9 100644
--- a/dev-util/cmake/cmake-3.17.4-r1.ebuild
+++ b/dev-util/cmake/cmake-3.17.4-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://cmake.org/files/v$(ver_cut 1-2)/${MY_P}.tar.gz"
LICENSE="CMake"
SLOT="0"
[[ "${PV}" = *_rc* ]] || \
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="doc emacs ncurses qt5 test"
RESTRICT="!test? ( test )"
diff --git a/dev-util/debugedit/Manifest b/dev-util/debugedit/Manifest
index 6293e1f01152..a8c1f1590b87 100644
--- a/dev-util/debugedit/Manifest
+++ b/dev-util/debugedit/Manifest
@@ -1 +1,2 @@
DIST rpm-4.15.1.tar.bz2 4243893 BLAKE2B 352695e1fdac231127c9a2a775ff1aa05c1f3acbb10b0678e06011f9e4a5124e48cc19dce83417866e0f3c92bfd94e9c52b8c1884151ee77559bea1020d3623e SHA512 6c66835da5a54349bcfba5cc69831c8c57568aabd53c5c2820ec78c361be5116fecd41777b097e9c49458f984a7beb054fa8ed453ff7263cad4a29a11f780767
+DIST rpm-4.16.0.tar.bz2 4341683 BLAKE2B 5161e5dcc6d9a1f1d4b8e44740fb368050b808fd9e8b8276fb17b530a4642e1b9ad104b5a30c0071215aef7f823eeab10988dd41f73af1c52d575529c374b5eb SHA512 177119c3ac3d48980db55bb4ba0fdbb2a911968e5efc690bfa8cc343f850fc90531cc0dee6dd8e45d2b14f0d951ced35bd8893d24011b7f270745d281ddf4e3d
diff --git a/dev-util/debugedit/debugedit-4.16.0.ebuild b/dev-util/debugedit/debugedit-4.16.0.ebuild
new file mode 100644
index 000000000000..d2c338794406
--- /dev/null
+++ b/dev-util/debugedit/debugedit-4.16.0.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic
+
+MY_P=rpm-${PV}
+DESCRIPTION="Stand-alone debugedit from RPM"
+HOMEPAGE="https://rpm.org
+ https://github.com/rpm-software-management/rpm"
+SRC_URI="http://ftp.rpm.org/releases/rpm-$(ver_cut 1-2).x/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2+ LGPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="
+ sys-libs/zlib:=
+ >=dev-libs/popt-1.7
+ >=dev-libs/elfutils-0.176-r1
+ dev-libs/nss
+"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+ eapply_user
+
+ # cheat it into believing we're bundling db
+ mkdir -p db/dist || die
+ touch db/dist/configure || die
+ chmod +x db/dist/configure || die
+ echo 'install:' > db3/Makefile || die
+
+ # TODO: why do we need to do this?
+ mkdir rpm || die
+ find -name '*.h' -exec cp {} rpm/ ';' || die
+}
+
+src_configure() {
+ append-cppflags -I"${EPREFIX}/usr/include/nss" -I"${EPREFIX}/usr/include/nspr"
+ local myconf=(
+ # force linking to static librpmio
+ --disable-shared
+
+ # disable linking compression libraries
+ ac_cv_header_bzlib_h=no
+ ac_cv_header_lzma_h=no
+ --disable-zstd
+
+ # fake some libraries we don't use
+ ac_cv_header_magic_h=yes
+ ac_cv_lib_magic_magic_open=yes
+
+ # use nss as crypto provider
+ --with-crypto=nss
+
+ # disable other stuff irrelevant to debugedit
+ --disable-bdb
+ --disable-nls
+ --disable-plugins
+ --disable-python
+ --without-acl
+ --without-archive
+ --without-cap
+ --without-external-db
+ --without-hackingdocs
+ --without-lua
+ --without-selinux
+ )
+ econf "${myconf[@]}"
+}
+
+src_compile() {
+ emake -C misc
+ emake -C rpmio
+ emake debugedit
+}
+
+src_test() {
+ :
+}
+
+src_install() {
+ dobin debugedit
+}
diff --git a/dev-util/rr/rr-5.3.0-r1.ebuild b/dev-util/rr/rr-5.3.0-r2.ebuild
similarity index 88%
rename from dev-util/rr/rr-5.3.0-r1.ebuild
rename to dev-util/rr/rr-5.3.0-r2.ebuild
index 792f4f9768e2..e46b29249fe7 100644
--- a/dev-util/rr/rr-5.3.0-r1.ebuild
+++ b/dev-util/rr/rr-5.3.0-r2.ebuild
@@ -6,7 +6,7 @@ EAPI=7
PYTHON_COMPAT=( python3_{6,7,8} )
CMAKE_BUILD_TYPE=Release
-inherit cmake-utils linux-info python-single-r1
+inherit cmake linux-info python-single-r1
DESCRIPTION="Record and Replay Framework"
HOMEPAGE="https://rr-project.org/"
@@ -19,8 +19,8 @@ IUSE="multilib test"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
DEPEND="
- sys-libs/zlib
- dev-libs/capnproto
+ sys-libs/zlib:=
+ dev-libs/capnproto:=
${PYTHON_DEPS}"
RDEPEND="${DEPEND}
sys-devel/gdb[xml]"
@@ -44,7 +44,7 @@ pkg_setup() {
}
src_prepare() {
- cmake-utils_src_prepare
+ cmake_src_prepare
sed -i 's:-Werror::' CMakeLists.txt || die #609192
}
@@ -55,7 +55,7 @@ src_test() {
return 0
fi
- cmake-utils_src_test
+ cmake_src_test
}
src_configure() {
@@ -64,5 +64,5 @@ src_configure() {
-Ddisable32bit=$(usex !multilib) #636786
)
- cmake-utils_src_configure
+ cmake_src_configure
}
diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz
index 9c7521141de0..02f0537de441 100644
Binary files a/dev-vcs/Manifest.gz and b/dev-vcs/Manifest.gz differ
diff --git a/dev-vcs/fossil/Manifest b/dev-vcs/fossil/Manifest
index bafd954b09db..90af46f42afe 100644
--- a/dev-vcs/fossil/Manifest
+++ b/dev-vcs/fossil/Manifest
@@ -1,2 +1 @@
-DIST fossil-src-2.11.1.tar.gz 5850806 BLAKE2B 640807055100888d6bfea13539efb02190f07db5edcec58025952e464d50d4bd13992e5e8f5e515b01f52eaa3409d7a536bd4b48aecb5fdcf6214e47dc4963ed SHA512 055306c0d5c2f9b536ace6385ed79b5ced56d77dfc8e08b38f51075e97dfebfffca10aa7e17d2b22b9945c71b12eb131d49f3651e2890820dc9cb04719cd0265
DIST fossil-src-2.12.1.tar.gz 6011181 BLAKE2B f9437c4fb20314706bbbec70efbb6a53e2ac7760986baf88ea72505f03877a5d1069d0d2828aa2bfefac96c1358e4c8f824405d61fd24d490442fa8b768711e9 SHA512 08b7fef5a3071e968dedbc645aebf2e873ecf80049b5986d38f851a407b2b8b0c854cfcdfa5ec80eac5bc1b158c5fac3bb4b263d1adb8be470529e67dc6e8cee
diff --git a/dev-vcs/fossil/fossil-2.11.1.ebuild b/dev-vcs/fossil/fossil-2.11.1.ebuild
deleted file mode 100644
index dc00229d55ae..000000000000
--- a/dev-vcs/fossil/fossil-2.11.1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="Simple, high-reliability, source control management, and more"
-HOMEPAGE="https://www.fossil-scm.org/"
-SRC_URI="https://fossil-scm.org/home/uv/fossil-src-${PV}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 arm ppc ppc64 x86"
-IUSE="debug fusefs json -legacy-mv-rm -miniz system-sqlite +ssl static
- tcl tcl-stubs tcl-private-stubs th1-docs th1-hooks"
-
-REQUIRED_USE="ssl? ( !miniz )"
-
-RDEPEND="
- sys-libs/zlib
- || (
- sys-libs/readline:0
- dev-libs/libedit
- )
- system-sqlite? ( >=dev-db/sqlite-3.28.0:3 )
- ssl? ( dev-libs/openssl:0 )
- tcl? ( dev-lang/tcl:0= )
-"
-
-# Either tcl or jimtcl need to be present to build Fossil (Bug #675778)
-DEPEND="${RDEPEND}
- !tcl? (
- || (
- dev-lang/tcl:*
- dev-lang/jimtcl:*
- )
- )
-"
-
-# Tests can't be run from the build directory
-RESTRICT="test"
-
-# fossil-2.10-check-lib64-for-tcl.patch: Bug 690828
-PATCHES=( "${FILESDIR}"/fossil-2.10-check-lib64-for-tcl.patch )
-
-src_configure() {
- # this is not an autotools situation so don't make it seem like one
- # --with-tcl: works
- # --without-tcl: dies
- local myconf="--with-openssl=$(usex ssl auto none)"
- use debug && myconf+=' --fossil-debug'
- use json && myconf+=' --json'
- use system-sqlite && myconf+=' --disable-internal-sqlite'
- use static && myconf+=' --static'
- use tcl && myconf+=' --with-tcl=1'
- use fusefs || myconf+=' --disable-fusefs'
-
- local u useflags
- useflags=( legacy-mv-rm miniz tcl-stubs tcl-private-stubs
- th1-docs th1-hooks )
- for u in ${useflags[@]} ; do
- use ${u} && myconf+=" --with-${u}"
- done
-
- tc-export CC CXX
- CC_FOR_BUILD=${CC} ./configure ${myconf} || die
-}
-
-src_install() {
- dobin fossil
-}
diff --git a/dev-vcs/fossil/fossil-2.12.1.ebuild b/dev-vcs/fossil/fossil-2.12.1.ebuild
index 1073f6c6472c..71d847dfb53c 100644
--- a/dev-vcs/fossil/fossil-2.12.1.ebuild
+++ b/dev-vcs/fossil/fossil-2.12.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://fossil-scm.org/home/uv/fossil-src-${PV}.tar.gz"
LICENSE="BSD-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm ppc ppc64 x86"
+KEYWORDS="amd64 arm ppc ppc64 x86"
IUSE="debug fusefs json -miniz system-sqlite +ssl static tcl tcl-stubs
tcl-private-stubs th1-docs th1-hooks"
diff --git a/dev-vcs/fossil/metadata.xml b/dev-vcs/fossil/metadata.xml
index 5f61527e696f..b96ecf35bd4d 100644
--- a/dev-vcs/fossil/metadata.xml
+++ b/dev-vcs/fossil/metadata.xml
@@ -12,9 +12,6 @@
- Add support to store results JSON based
Add support for storing in a mongo DB via dev-db/mongodb
diff --git a/net-analyzer/zmap/zmap-2.1.1-r1.ebuild b/net-analyzer/zmap/zmap-2.1.1-r2.ebuild
similarity index 78%
rename from net-analyzer/zmap/zmap-2.1.1-r1.ebuild
rename to net-analyzer/zmap/zmap-2.1.1-r2.ebuild
index dac6ede5634e..92a3c6e4eece 100644
--- a/net-analyzer/zmap/zmap-2.1.1-r1.ebuild
+++ b/net-analyzer/zmap/zmap-2.1.1-r2.ebuild
@@ -1,21 +1,20 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
-inherit cmake-utils fcaps
+inherit cmake fcaps
DESCRIPTION="Fast network scanner designed for Internet-wide network surveys"
HOMEPAGE="https://zmap.io/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/zmap/zmap/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-SLOT="0"
LICENSE="Apache-2.0"
+SLOT="0"
KEYWORDS="~amd64 ~arm ~x86"
-IUSE="json mongo redis"
+IUSE="mongo redis"
-RDEPEND="
- dev-libs/gmp:0
+RDEPEND="dev-libs/gmp:0
net-libs/libpcap
dev-libs/json-c:=
mongo? ( dev-db/mongodb )
@@ -29,7 +28,7 @@ src_prepare() {
sed \
-e '/ggo/s:CMAKE_CURRENT_SOURCE_DIR}:CMAKE_BINARY_DIR}/src:g' \
-i src/CMakeLists.txt || die
- cmake-utils_src_prepare
+ cmake_src_prepare
}
src_configure() {
@@ -39,7 +38,7 @@ src_configure() {
-DWITH_MONGO="$(usex mongo)"
-DWITH_REDIS="$(usex redis)"
)
- cmake-utils_src_configure
+ cmake_src_configure
}
FILECAPS=( cap_net_raw=ep usr/sbin/zmap )
diff --git a/net-analyzer/zmap/zmap-9999.ebuild b/net-analyzer/zmap/zmap-9999.ebuild
index 04e4602032d2..4d5b862277d5 100644
--- a/net-analyzer/zmap/zmap-9999.ebuild
+++ b/net-analyzer/zmap/zmap-9999.ebuild
@@ -1,18 +1,16 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
-inherit cmake-utils fcaps git-r3
+inherit cmake fcaps git-r3
DESCRIPTION="Fast network scanner designed for Internet-wide network surveys"
HOMEPAGE="https://zmap.io/"
-SRC_URI=""
-EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
+EGIT_REPO_URI="https://github.com/zmap/zmap.git"
-SLOT="0"
LICENSE="Apache-2.0"
-KEYWORDS=""
+SLOT="0"
IUSE="redis"
RDEPEND="
@@ -32,7 +30,7 @@ src_configure() {
-DWITH_WERROR=OFF
-DWITH_REDIS="$(usex redis)"
)
- cmake-utils_src_configure
+ cmake_src_configure
}
FILECAPS=( cap_net_raw=ep usr/sbin/zmap )
diff --git a/net-dns/Manifest.gz b/net-dns/Manifest.gz
index bb6aea80aadb..a9444cf14ab6 100644
Binary files a/net-dns/Manifest.gz and b/net-dns/Manifest.gz differ
diff --git a/net-dns/dnsdist/Manifest b/net-dns/dnsdist/Manifest
index 6d2a06fbff8c..773ff1f17b98 100644
--- a/net-dns/dnsdist/Manifest
+++ b/net-dns/dnsdist/Manifest
@@ -1,3 +1,2 @@
-DIST dnsdist-1.3.3.tar.bz2 971253 BLAKE2B e9c36969fc1e4b95b71a3f6885503aea2d527b4d9abce9cb137c290a21aee994a441c0e17c0bf985396fda51020b5ef910753554990259abb16641d93d2d1010 SHA512 c0e3435eafc1f7bcdf41346cecf7b089cc142716f94058f9ec262d0c6ad16467e0b8bed5abc648829c597120c94f998602849ded574e75bfc1a1fb70c1b719ad
-DIST dnsdist-1.4.0.tar.bz2 1044479 BLAKE2B 79aef57ed2b1036f222e8bcfdf615c3221c9dfdbc8fd3f80d778fb050f74bc200958b4d605dcadd5c23ac6c4b5b1a36048108cd85394920e99d6037177b81342 SHA512 c9450e97325d8ad8c8c3a395412c46ea8053cbe1ebe73329a1618212ba29bdf2f8da908ae2b90c314b5aab613387f42363e3a5322b1a36f60190fb48e1c425c5
DIST dnsdist-1.5.0.tar.bz2 1067645 BLAKE2B de07de8f862a633d8eb11ccf632e01c2ce779a35ef61ba2fcf932894d692f2f3edfd638ce77f178bbfbfc1115d8e76f5522e10061fcf61650170a5b59d5cc9ca SHA512 df6f8caae001f152f0d264176c570778842979484d16e4199afe0e2591006392444245dd8ce23287cdcf9613e2c40a9e3564f5236e5f5a6fd67b89d6ea0d9ed4
+DIST dnsdist-1.5.1.tar.bz2 1068061 BLAKE2B 1c0fdd181b62b96fcd433581715cea9dc204fcdd2f65efd26a5293cc9c17d904e0937b51ba33d2dc01ecc8044f491ba2c6c8720c0816587fa5082da73108783e SHA512 68fe5f55fd081ed80a620933af9f8310be0e21c86ba449a9c557975b5c83f4b64e3002e6032dc002582d081e70e1ec2ff080c5d8389fd46a9896bdafd5a41f9f
diff --git a/net-dns/dnsdist/dnsdist-1.3.3-r1.ebuild b/net-dns/dnsdist/dnsdist-1.3.3-r1.ebuild
deleted file mode 100644
index 493fd0f5e4c1..000000000000
--- a/net-dns/dnsdist/dnsdist-1.3.3-r1.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-EGIT_REPO_URI="https://github.com/PowerDNS/pdns.git"
-
-if [[ ${PV} = 9999 ]]; then
- ADDITIONAL_ECLASSES="autotools git-r3"
-fi
-
-inherit eutils flag-o-matic user ${ADDITIONAL_ECLASSES}
-
-DESCRIPTION="A highly DNS-, DoS- and abuse-aware loadbalancer"
-HOMEPAGE="https://dnsdist.org"
-
-if [[ ${PV} == 9999 ]]; then
- SRC_URI=""
- S="${WORKDIR}/${P}/pdns/dnsdistdist"
-else
- SRC_URI="https://downloads.powerdns.com/releases/${P}.tar.bz2"
- KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="dnscrypt gnutls fstrm luajit regex remote-logging snmp +ssl systemd test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="dnscrypt? ( ssl )
- gnutls? ( ssl )"
-
-RDEPEND="
- >=dev-libs/boost-1.35:=
- dev-libs/libedit:=
- fstrm? ( dev-libs/fstrm:= )
- luajit? ( dev-lang/luajit:= )
- !luajit? ( >=dev-lang/lua-5.1:= )
- remote-logging? ( >=dev-libs/protobuf-3:= )
- regex? ( dev-libs/re2:= )
- snmp? ( net-analyzer/net-snmp:= )
- ssl? (
- dev-libs/libsodium:=
- gnutls? ( net-libs/gnutls:= )
- !gnutls? ( dev-libs/openssl:= )
- )
- systemd? ( sys-apps/systemd:0= )
-"
-
-DEPEND="${RDEPEND}
- virtual/pkgconfig
-"
-
-[[ ${PV} == 9999 ]] && DEPEND+="
- app-text/pandoc
- dev-util/ragel
- dev-python/virtualenv
-"
-
-src_prepare() {
- default
- [[ ${PV} == 9999 ]] && eautoreconf
-}
-
-src_configure() {
- econf \
- --sysconfdir=/etc/dnsdist \
- $(use_enable dnscrypt) \
- $(use_enable fstrm) \
- $(use luajit && echo "--with-lua=luajit" || echo "--with-lua=lua" ) \
- $(use_enable regex re2) \
- $(use_with remote-logging protobuf) \
- $(use_with snmp net-snmp) \
- $(use_enable ssl libsodium) \
- $(use ssl && { echo "--enable-dns-over-tls" && use_enable gnutls && use_enable !gnutls libssl;} || echo "--disable-gnutls --disable-libssl") \
- $(use_enable systemd) \
- $(use_enable test unit-tests)
- if [ ${PV} == "1.3.3" ]; then
- sed 's/hardcode_libdir_flag_spec_CXX='\''$wl-rpath $wl$libdir'\''/hardcode_libdir_flag_spec_CXX='\''$wl-rpath $wl\/$libdir'\''/g' \
- -i "${S}/configure"
- fi
-}
-
-src_install() {
- default
-
- insinto /etc/dnsdist
- doins "${FILESDIR}"/dnsdist.conf.example
-
- newconfd "${FILESDIR}"/dnsdist.confd ${PN}
- newinitd "${FILESDIR}"/dnsdist.initd ${PN}
-}
-
-pkg_preinst() {
- enewgroup dnsdist
- enewuser dnsdist -1 -1 -1 dnsdist
-}
-
-pkg_postinst() {
- elog "dnsdist provides multiple instances support. You can create more instances"
- elog "by symlinking the dnsdist init script to another name."
- elog
- elog "The name must be in the format dnsdist. and dnsdist will use the"
- elog "/etc/dnsdist/dnsdist-.conf configuration file instead of the default."
-}
diff --git a/net-dns/dnsdist/dnsdist-1.4.0.ebuild b/net-dns/dnsdist/dnsdist-1.5.1.ebuild
similarity index 95%
rename from net-dns/dnsdist/dnsdist-1.4.0.ebuild
rename to net-dns/dnsdist/dnsdist-1.5.1.ebuild
index dae9b523e363..b36be988dc3b 100644
--- a/net-dns/dnsdist/dnsdist-1.4.0.ebuild
+++ b/net-dns/dnsdist/dnsdist-1.5.1.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-inherit eutils flag-o-matic user
+inherit eutils flag-o-matic
DESCRIPTION="A highly DNS-, DoS- and abuse-aware loadbalancer"
HOMEPAGE="https://dnsdist.org"
@@ -19,7 +19,8 @@ REQUIRED_USE="dnscrypt? ( ssl )
gnutls? ( ssl )
doh? ( ssl !gnutls )"
-RDEPEND="
+RDEPEND="acct-group/dnsdist
+ acct-user/dnsdist
>=dev-libs/boost-1.35:=
dev-libs/libedit:=
dnscrypt? ( dev-libs/libsodium:= )
@@ -74,11 +75,6 @@ src_install() {
newinitd "${FILESDIR}"/dnsdist.initd ${PN}
}
-pkg_preinst() {
- enewgroup dnsdist
- enewuser dnsdist -1 -1 -1 dnsdist
-}
-
pkg_postinst() {
elog "dnsdist provides multiple instances support. You can create more instances"
elog "by symlinking the dnsdist init script to another name."
diff --git a/net-dns/dnsdist/metadata.xml b/net-dns/dnsdist/metadata.xml
index d42d77d511da..52ecd48eab08 100644
--- a/net-dns/dnsdist/metadata.xml
+++ b/net-dns/dnsdist/metadata.xml
@@ -10,7 +10,6 @@
Enable the ability to act as a DNSCrypt server
- Enable support for fstrm via dev-libs/fstrm
Enable support for regular expression matching via dev-libs/re2
Enable support for remote logging via dev-libs/protobuf
Enable support for and encrypted client-server communication via dev-libs/libsodium
diff --git a/net-firewall/Manifest.gz b/net-firewall/Manifest.gz
index ffc8a86875f9..efccbc425ee9 100644
Binary files a/net-firewall/Manifest.gz and b/net-firewall/Manifest.gz differ
diff --git a/net-firewall/arno-iptables-firewall/Manifest b/net-firewall/arno-iptables-firewall/Manifest
index 07714f35f429..70301165c016 100644
--- a/net-firewall/arno-iptables-firewall/Manifest
+++ b/net-firewall/arno-iptables-firewall/Manifest
@@ -1,2 +1,3 @@
DIST arno-iptables-firewall-2.0.3.tar.gz 139445 BLAKE2B 57dade49a4aaacb1354129efeb5ca013060d51baa8c23dea1fc326e52a693c7137047883ea7bbca6cc3221f70a83f7283123a345e22ceac4bb99d3b43410b65d SHA512 c88a560d4c0a2644dd1ec35e0a6e2b1883e52dc6c71075207c3b98a59964a4be3787620e9414ad5e926bddb9dbc7c2674fd8687828526c35f0fb4a53a05aa929
DIST arno-iptables-firewall-2.1.0.tar.gz 140015 BLAKE2B 46ff89db6928bd4f86a5b26a06fa1ab2a88ecc5043f6f92543151c3ca6b74d9704c4b7046e1c5e1371e0b5de552e414cbe0524305947b026ec7953f9d779055d SHA512 b59644e78f281dacdd32045254be15dbd31ecb5f2b26d88a3c9bab60aaf19ea879d87127040db5f72292668e22026d982c17d3ad34c83da16720cdbccebdd07f
+DIST arno-iptables-firewall-2.1.1.tar.gz 141076 BLAKE2B d3f78767a3ac447841aa01becfd73434cfddc9f56142d5c6ac86072527c17a30449434b8cddba74bb45f8234268ba589ab2ea932db462317a2dfb714f31f2450 SHA512 55494c8a214c0b2dacfef23170ea596bf9ecdfc73d1a6b2bd703183278569f68103eb63580d1b18cae97a9460b95373f0091bbf5decf275c80803a1331555d79
diff --git a/net-firewall/arno-iptables-firewall/arno-iptables-firewall-2.1.1.ebuild b/net-firewall/arno-iptables-firewall/arno-iptables-firewall-2.1.1.ebuild
new file mode 100644
index 000000000000..0b622d4894c9
--- /dev/null
+++ b/net-firewall/arno-iptables-firewall/arno-iptables-firewall-2.1.1.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit readme.gentoo-r1 systemd
+
+DESCRIPTION="Arno's iptables firewall script"
+HOMEPAGE="https://rocky.eld.leidenuniv.nl"
+
+MY_PV=$(ver_rs 3 -)
+MY_PV=${MY_PV/rc/RC}
+SRC_URI="https://github.com/${PN}/aif/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+plugins rsyslog"
+
+DEPEND=""
+RDEPEND="net-firewall/ipset
+ net-firewall/iptables
+ sys-apps/coreutils
+ sys-apps/iproute2
+ plugins? ( net-dns/bind-tools )"
+
+S="${WORKDIR}/aif-${MY_PV}"
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="You will need to configure /etc/${PN}/firewall.conf
+before using this package. To start the script, run:
+
+/etc/init.d/${PN} start (for OpenRC)
+systemctl start ${PN} (for systemd)
+
+If you want to start this script at boot, run:
+
+rc-update add ${PN} default (for OpenRC)
+systemctl enable ${PN} (for systemd)"
+
+src_prepare() {
+ sed -i -e 's:/usr/local/share/:/usr/libexec/:' \
+ bin/"${PN}" share/"${PN}"/environment || die "Sed failed!"
+ sed -i -e 's:/usr/local/sbin/:/usr/sbin/:' \
+ lib/systemd/system/"${PN}.service" || die "Sed failed!"
+ eapply_user
+}
+
+src_install() {
+ insinto /etc/"${PN}"
+ doins etc/"${PN}"/firewall.conf
+ doins etc/"${PN}"/custom-rules
+
+ doinitd "${FILESDIR}/${PN}"
+ systemd_dounit lib/systemd/system/"${PN}.service"
+
+ dobin bin/arno-fwfilter
+ dosbin bin/"${PN}"
+
+ insinto /usr/libexec/"${PN}"
+ doins share/"${PN}"/aif-job-execute
+ doins share/"${PN}"/aif-job-processor
+ doins share/"${PN}"/environment
+
+ insinto /etc/logrotate.d
+ doins etc/logrotate.d/"${PN}"
+
+ dodoc CHANGELOG README
+ readme.gentoo_create_doc
+
+ if use plugins
+ then
+ insinto /etc/"${PN}"/plugins
+ doins etc/"${PN}"/plugins/*
+
+ insinto /usr/libexec/"${PN}"/plugins
+ doins share/"${PN}"/plugins/*.plugin
+
+ exeinto /usr/libexec/"${PN}"/plugins
+ doexe share/"${PN}"/plugins/adaptive-ban-helper
+ doexe share/"${PN}"/plugins/dyndns-host-open-helper
+ doexe share/"${PN}"/plugins/parasitic-net-helper
+ doexe share/"${PN}"/plugins/traffic-accounting-helper
+ doexe share/"${PN}"/plugins/traffic-accounting-log-rotate
+ doexe share/"${PN}"/plugins/traffic-accounting-show
+
+ docinto plugins
+ dodoc share/"${PN}"/plugins/*.CHANGELOG
+ fi
+
+ if use rsyslog
+ then
+ insinto /etc/rsyslog.d
+ newins etc/rsyslog.d/"${PN}".conf 60-"${PN}".conf
+ fi
+
+ doman share/man/man1/arno-fwfilter.1 \
+ share/man/man8/"${PN}".8
+}
+
+pkg_postinst() {
+ ewarn "When you stop this script, all firewall rules are flushed!"
+ ewarn "Make sure to not use multiple firewall scripts simultaneously"
+ ewarn "unless you know what you are doing!"
+ readme.gentoo_print_elog
+}
diff --git a/net-fs/Manifest.gz b/net-fs/Manifest.gz
index 1f2efdafd536..bae8bb82d063 100644
Binary files a/net-fs/Manifest.gz and b/net-fs/Manifest.gz differ
diff --git a/net-fs/nfstest/Manifest b/net-fs/nfstest/Manifest
deleted file mode 100644
index c08174329cd8..000000000000
--- a/net-fs/nfstest/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST NFStest-1.0.2.tar.gz 214840 BLAKE2B 67397fdc13116074917c1158f931896c7d376fec0d29db07713a33d47f47dc4eb7b670fe6d926971f2ea8e78634a1ee9a43aae7eaea4c714bbd2fc1ac109a48f SHA512 3758f6af8c3959274a3dfdc33a3c9e76451bd46c85b779ce7352ec4b4d616273ff2b409598fb31dbaf4663b8a2d743f9e0a1cc3a0c4eabcd918d6d5fbed2f09e
-DIST NFStest-2.1.2.tar.gz 357049 BLAKE2B a50743d17938405bf1fd84bb5a70a6012325b584ede31445eb6be122c3370f2a433ed24580dcd4e4ebe88ff023e2a08438bf6da088ec3d7afd717508a4e52a48 SHA512 83d77bd94bb325d1a7badfc48d55fe200c6f53749d13f622c918b2fd6d8a7d279fda5f59e725f86d41b3f573881a14c677556c8b1b36d1a0b5e20d7d9b7639e9
diff --git a/net-fs/nfstest/metadata.xml b/net-fs/nfstest/metadata.xml
deleted file mode 100644
index 97fa5b04edcd..000000000000
--- a/net-fs/nfstest/metadata.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-
- prometheanfire@gentoo.org
-
-
diff --git a/net-fs/nfstest/nfstest-1.0.2.ebuild b/net-fs/nfstest/nfstest-1.0.2.ebuild
deleted file mode 100644
index 697a421617a6..000000000000
--- a/net-fs/nfstest/nfstest-1.0.2.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-MY_PN="NFStest"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Tools for testing either the NFS client or the NFS server"
-HOMEPAGE="http://wiki.linux-nfs.org/wiki/index.php/NFStest"
-SRC_URI="http://www.linux-nfs.org/~mora/nfstest/releases/${MY_P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="net-fs/nfs-utils"
-DEPEND=""
-
-S="${WORKDIR}"/${MY_P}
diff --git a/net-fs/nfstest/nfstest-2.1.2.ebuild b/net-fs/nfstest/nfstest-2.1.2.ebuild
deleted file mode 100644
index 51b29530b7d6..000000000000
--- a/net-fs/nfstest/nfstest-2.1.2.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-MY_PN="NFStest"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Tools for testing either the NFS client or the NFS server"
-HOMEPAGE="http://wiki.linux-nfs.org/wiki/index.php/NFStest"
-SRC_URI="http://www.linux-nfs.org/~mora/nfstest/releases/${MY_P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="net-fs/nfs-utils"
-DEPEND=""
-
-S="${WORKDIR}"/${MY_P}
diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz
index d0f42d6a2cf1..eb37582f2b93 100644
Binary files a/net-im/Manifest.gz and b/net-im/Manifest.gz differ
diff --git a/net-im/skypeforlinux/Manifest b/net-im/skypeforlinux/Manifest
index bb8d382d941b..a27b8433b3b7 100644
--- a/net-im/skypeforlinux/Manifest
+++ b/net-im/skypeforlinux/Manifest
@@ -1 +1,2 @@
DIST skypeforlinux_8.64.0.81-1.x86_64.rpm 114748914 BLAKE2B 918687dc7ba5c1b357f4a9551ee710834a59410b14c6a23e8ef5972dacc1f1c08a040e534e798f63100bca7b5f98e34732f3e8e172c16edd4caaa18a171305ef SHA512 2a5e7a206741421f52c60a2775e1c51011118e49a06d90e72fe6af14a833384ed1bc8f44b26ef3de0e2891cc22dcfc7e3fbec7dc3ad46d9e75a4ac5cd330183f
+DIST skypeforlinux_8.65.0.76-1.x86_64.rpm 115113199 BLAKE2B b5f0fbb70849d3e6ec866b502b11d3b843ce25a27455e86a410c563f7de3b4961c843d461087b613581ebcecd0c79232552c4150684f6eb92eca779b4ffbad28 SHA512 6df1d3d98221ae9636a3f62d6acf0cb68376fce4b8abccbdf5d881092be91f337cc32323d263b708509e6f63bcfe4d0f4c9674ae106419de07acaf36e41434f2
diff --git a/net-im/skypeforlinux/skypeforlinux-8.65.0.76.ebuild b/net-im/skypeforlinux/skypeforlinux-8.65.0.76.ebuild
new file mode 100644
index 000000000000..c2755ee5b06c
--- /dev/null
+++ b/net-im/skypeforlinux/skypeforlinux-8.65.0.76.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MULTILIB_COMPAT=( abi_x86_64 )
+
+inherit chromium-2 desktop pax-utils rpm multilib-build xdg
+
+DESCRIPTION="Instant messaging client, with support for audio and video"
+HOMEPAGE="https://www.skype.com/"
+SRC_URI="https://repo.skype.com/rpm/stable/${PN}_${PV}-1.x86_64.rpm"
+
+LICENSE="Skype-TOS MIT MIT-with-advertising BSD-1 BSD-2 BSD Apache-2.0 Boost-1.0 ISC CC-BY-SA-3.0 CC0-1.0 openssl ZLIB APSL-2 icu Artistic-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="-* ~amd64"
+
+S="${WORKDIR}"
+QA_PREBUILT="*"
+RESTRICT="mirror bindist strip" #299368
+
+RDEPEND="
+ app-crypt/libsecret[${MULTILIB_USEDEP}]
+ dev-libs/atk[${MULTILIB_USEDEP}]
+ dev-libs/expat[${MULTILIB_USEDEP}]
+ dev-libs/glib:2[${MULTILIB_USEDEP}]
+ dev-libs/nspr[${MULTILIB_USEDEP}]
+ dev-libs/nss[${MULTILIB_USEDEP}]
+ media-libs/alsa-lib[${MULTILIB_USEDEP}]
+ media-libs/fontconfig:1.0[${MULTILIB_USEDEP}]
+ media-libs/freetype:2[${MULTILIB_USEDEP}]
+ media-libs/libv4l[${MULTILIB_USEDEP}]
+ net-print/cups[${MULTILIB_USEDEP}]
+ sys-apps/dbus[${MULTILIB_USEDEP}]
+ sys-devel/gcc[cxx]
+ virtual/ttf-fonts
+ x11-libs/cairo[${MULTILIB_USEDEP}]
+ x11-libs/gdk-pixbuf:2[${MULTILIB_USEDEP}]
+ x11-libs/gtk+:3[${MULTILIB_USEDEP}]
+ x11-libs/libX11[${MULTILIB_USEDEP}]
+ x11-libs/libXScrnSaver[${MULTILIB_USEDEP}]
+ x11-libs/libXcomposite[${MULTILIB_USEDEP}]
+ x11-libs/libXcursor[${MULTILIB_USEDEP}]
+ x11-libs/libXdamage[${MULTILIB_USEDEP}]
+ x11-libs/libXext[${MULTILIB_USEDEP}]
+ x11-libs/libXfixes[${MULTILIB_USEDEP}]
+ x11-libs/libXi[${MULTILIB_USEDEP}]
+ x11-libs/libXrandr[${MULTILIB_USEDEP}]
+ x11-libs/libXrender[${MULTILIB_USEDEP}]
+ x11-libs/libXtst[${MULTILIB_USEDEP}]
+ x11-libs/libxcb[${MULTILIB_USEDEP}]
+ x11-libs/libxkbfile[${MULTILIB_USEDEP}]
+ x11-libs/pango[${MULTILIB_USEDEP}]"
+
+pkg_setup() {
+ chromium_suid_sandbox_check_kernel_config
+}
+
+src_unpack() {
+ rpm_src_unpack ${A}
+}
+
+src_prepare() {
+ default
+ sed -e "s!^SKYPE_PATH=.*!SKYPE_PATH=${EPREFIX}/opt/skypeforlinux/skypeforlinux!" \
+ -i usr/bin/skypeforlinux || die
+ sed -e "s!^Categories=.*!Categories=Network;InstantMessaging;Telephony;!" \
+ -e "/^OnlyShowIn=/d" \
+ -i usr/share/applications/skypeforlinux.desktop || die
+}
+
+src_install() {
+ dodir /opt
+ cp -a usr/share/skypeforlinux "${ED}"/opt || die
+
+ # remove chrome-sandbox binary, users should use kernel namespaces
+ # https://bugs.gentoo.org/692692#c18
+ rm "${ED}"/opt/skypeforlinux/chrome-sandbox || die
+
+ dobin usr/bin/skypeforlinux
+
+ dodoc usr/share/skypeforlinux/*.html
+ dodoc -r usr/share/doc/skypeforlinux/.
+ # symlink required for the "Help->3rd Party Notes" menu entry (otherwise frozen skype -> xdg-open)
+ dosym ${PF} usr/share/doc/skypeforlinux
+
+ doicon usr/share/pixmaps/skypeforlinux.png
+
+ local res
+ for res in 16 32 256 512; do
+ newicon -s ${res} usr/share/icons/hicolor/${res}x${res}/apps/skypeforlinux.png skypeforlinux.png
+ done
+
+ domenu usr/share/applications/skypeforlinux.desktop
+
+ pax-mark -m "${ED}"/opt/skypeforlinux/skypeforlinux
+ pax-mark -m "${ED}"/opt/skypeforlinux/resources/app.asar.unpacked/node_modules/slimcore/bin/slimcore.node
+}
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 9b852e6dbc17..5d63cd0dc1bc 100644
Binary files a/net-libs/Manifest.gz and b/net-libs/Manifest.gz differ
diff --git a/net-libs/libssh/libssh-0.9.5.ebuild b/net-libs/libssh/libssh-0.9.5.ebuild
index f8f234b154ac..0d406c747824 100644
--- a/net-libs/libssh/libssh-0.9.5.ebuild
+++ b/net-libs/libssh/libssh-0.9.5.ebuild
@@ -14,7 +14,7 @@ if [[ "${PV}" == *9999 ]] ; then
EGIT_REPO_URI="https://git.libssh.org/projects/libssh.git"
else
SRC_URI="https://www.libssh.org/files/$(ver_cut 1-2)/${P}.tar.xz"
- KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux"
+ KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
fi
LICENSE="LGPL-2.1"
diff --git a/net-libs/libwebsockets/Manifest b/net-libs/libwebsockets/Manifest
index 5fa0adcabe07..e46296387d29 100644
--- a/net-libs/libwebsockets/Manifest
+++ b/net-libs/libwebsockets/Manifest
@@ -1,3 +1,3 @@
DIST libwebsockets-3.2.1.tar.gz 9868342 BLAKE2B d822552c611f7cd0ee416bf9b9576c6052e196c1aa68b12c46a00865d3dcd131840218394317f191485fc61d8f3b7654d4a652a47f11d279a555522df84a2350 SHA512 a2d30a7a0416a26484743efdaa8635542480a74b0ef0f6e172dab5de4688486efb13457fc8a884d9916f76322cab0cbc9ab675f496558edd1dd9b833d087207d
DIST libwebsockets-4.0.20.tar.gz 12342036 BLAKE2B 983190f7f63eb9db09b688ae056c6fdee32ac6d57f4afe3fb42cd662202c290c21a28e9c107d61cd3b2ddb25478f93b56008dc939ced28cd1c5abd6314fb1b32 SHA512 b2ab19623557b67abf157aed0317fb2305304e72c7e40c202c0bc855a499bbef64978e9187adcfdd2ef251497144db4a9fbaebaf37a320c7190720e9d194b67a
-DIST libwebsockets-4.1.0.tar.gz 12674490 BLAKE2B 243fdcdef0cd9c36ee8bcf3c75b7467200f4fa1e6178cdbb9cc78d20d1aca533e910c9892560bd5c50c3ff98d783665616ea6d283ee8faae3f569bc526a31f42 SHA512 7748021f8a26e26474ae200f50ec8b59f19e69fbc612bbb31bbca2524e4381b2a7dde605740ac355109c9e34593fb5aee523d581ac64d821a594ffaadc16b1cb
+DIST libwebsockets-4.1.1.tar.gz 12674646 BLAKE2B 4e05381405390b80fcec2143f3bf6a681b8030229748df7791d07a884f25092b72e8f01f51a18c905aa78c6b69c0e4aab3c19099cb955b721484c020b0063bec SHA512 05a4932a3b88df2933729ed79bdc9773a935eacfab810fcad1d4bccee2beb74ddfc86185e0042935b49acdc3b10aa2a4a431778efbf4243eb180b0e7bf74d91f
diff --git a/net-libs/libwebsockets/libwebsockets-4.1.0.ebuild b/net-libs/libwebsockets/libwebsockets-4.1.1.ebuild
similarity index 100%
rename from net-libs/libwebsockets/libwebsockets-4.1.0.ebuild
rename to net-libs/libwebsockets/libwebsockets-4.1.1.ebuild
diff --git a/net-mail/Manifest.gz b/net-mail/Manifest.gz
index d58d4d8569b0..3697cc6b8feb 100644
Binary files a/net-mail/Manifest.gz and b/net-mail/Manifest.gz differ
diff --git a/net-mail/hyperkitty/Manifest b/net-mail/hyperkitty/Manifest
new file mode 100644
index 000000000000..90e717199218
--- /dev/null
+++ b/net-mail/hyperkitty/Manifest
@@ -0,0 +1 @@
+DIST HyperKitty-1.3.3.tar.gz 1936346 BLAKE2B 8014b62a44989faeb0467779fb53a9e5a0c381bae44fae8102b211a6d3c7dfa63cb76b6cc25ae29bb1b260fdc4bafd9d2c61c39103cc29d76a229263fe704c40 SHA512 4be4630bc0344c3e1633772978880fea996fbf2bb49b728c1d05ae13ab1df8c63b6b7b9b735df32eb2ae31798e76be537748e42c830a63aa01eeff0680f1dc76
diff --git a/net-mail/hyperkitty/hyperkitty-1.3.3.ebuild b/net-mail/hyperkitty/hyperkitty-1.3.3.ebuild
new file mode 100644
index 000000000000..f1a435e28718
--- /dev/null
+++ b/net-mail/hyperkitty/hyperkitty-1.3.3.ebuild
@@ -0,0 +1,44 @@
+# 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="A web interface to access GNU Mailman v3 archives"
+HOMEPAGE="https://www.list.org"
+SRC_URI="mirror://pypi/H/HyperKitty/HyperKitty-${PV}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-python/django[${PYTHON_USEDEP}]
+ net-mail/django-mailman3[${PYTHON_USEDEP}]
+ dev-python/django-gravatar2[${PYTHON_USEDEP}]
+ dev-python/djangorestframework[${PYTHON_USEDEP}]
+ dev-python/robot-detection[${PYTHON_USEDEP}]
+ dev-python/pytz[${PYTHON_USEDEP}]
+ dev-python/django-compressor[${PYTHON_USEDEP}]
+ net-mail/mailmanclient[${PYTHON_USEDEP}]
+ dev-python/python-dateutil[${PYTHON_USEDEP}]
+ dev-python/networkx[${PYTHON_USEDEP}]
+ dev-python/django-haystack[${PYTHON_USEDEP}]
+ dev-python/django-extensions[${PYTHON_USEDEP}]
+ dev-python/flufl-lock[${PYTHON_USEDEP}]
+ dev-python/django-q[${PYTHON_USEDEP}]"
+
+BDEPEND="dev-python/isort[${PYTHON_USEDEP}]
+ test? (
+ dev-python/mock[${PYTHON_USEDEP}]
+ dev-python/whoosh[${PYTHON_USEDEP}]
+ dev-python/beautifulsoup[${PYTHON_USEDEP}]
+ dev-python/django-debug-toolbar[${PYTHON_USEDEP}]
+ )"
+
+DOCS=( README.rst )
+S="${WORKDIR}/HyperKitty-${PV}"
diff --git a/app-i18n/scim-wijesekera/metadata.xml b/net-mail/hyperkitty/metadata.xml
similarity index 57%
rename from app-i18n/scim-wijesekera/metadata.xml
rename to net-mail/hyperkitty/metadata.xml
index 91d1f3a02de3..0c19f8f1d345 100644
--- a/app-i18n/scim-wijesekera/metadata.xml
+++ b/net-mail/hyperkitty/metadata.xml
@@ -1,11 +1,10 @@
-
- cjk@gentoo.org
- Cjk
+
+ hanno@gentoo.org
- sinhala
+ hyperkitty
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 4e0371bb9f6a..e814b59ac04c 100644
Binary files a/net-misc/Manifest.gz and b/net-misc/Manifest.gz differ
diff --git a/net-misc/iputils/iputils-20190709-r1.ebuild b/net-misc/iputils/iputils-20190709-r1.ebuild
index 9f1ae6cb1779..8c298933d65a 100644
--- a/net-misc/iputils/iputils-20190709-r1.ebuild
+++ b/net-misc/iputils/iputils-20190709-r1.ebuild
@@ -50,8 +50,6 @@ LIB_DEPEND="
"
RDEPEND="
- arping? ( !net-misc/arping )
- rarpd? ( !net-misc/rarpd )
traceroute6? ( !net-analyzer/traceroute )
!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
"
diff --git a/net-misc/iputils/iputils-20200821.ebuild b/net-misc/iputils/iputils-20200821.ebuild
index 3365b1ca6cc5..967aaeb3a6ea 100644
--- a/net-misc/iputils/iputils-20200821.ebuild
+++ b/net-misc/iputils/iputils-20200821.ebuild
@@ -28,7 +28,7 @@ HOMEPAGE="https://wiki.linuxfoundation.org/networking/iputils"
LICENSE="BSD GPL-2+ rdisc"
SLOT="0"
-IUSE="+arping caps clockdiff doc gcrypt idn ipv6 libressl nettle nls rarpd rdisc SECURITY_HAZARD ssl static tftpd tracepath traceroute6"
+IUSE="+arping caps clockdiff doc gcrypt idn ipv6 libressl nettle nls rarpd rdisc ssl static tftpd tracepath traceroute6"
BDEPEND="virtual/pkgconfig"
@@ -39,8 +39,6 @@ LIB_DEPEND="
"
RDEPEND="
- arping? ( !net-misc/arping )
- rarpd? ( !net-misc/rarpd )
traceroute6? ( !net-analyzer/traceroute )
!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
"
@@ -66,8 +64,6 @@ fi
PATCHES=()
src_prepare() {
- use SECURITY_HAZARD && PATCHES+=( "${FILESDIR}"/${PN}-20150815-nonroot-floodping.patch )
-
default
l10n_get_locales > po/LINGUAS || die
diff --git a/net-misc/iputils/iputils-99999999.ebuild b/net-misc/iputils/iputils-99999999.ebuild
index 3365b1ca6cc5..967aaeb3a6ea 100644
--- a/net-misc/iputils/iputils-99999999.ebuild
+++ b/net-misc/iputils/iputils-99999999.ebuild
@@ -28,7 +28,7 @@ HOMEPAGE="https://wiki.linuxfoundation.org/networking/iputils"
LICENSE="BSD GPL-2+ rdisc"
SLOT="0"
-IUSE="+arping caps clockdiff doc gcrypt idn ipv6 libressl nettle nls rarpd rdisc SECURITY_HAZARD ssl static tftpd tracepath traceroute6"
+IUSE="+arping caps clockdiff doc gcrypt idn ipv6 libressl nettle nls rarpd rdisc ssl static tftpd tracepath traceroute6"
BDEPEND="virtual/pkgconfig"
@@ -39,8 +39,6 @@ LIB_DEPEND="
"
RDEPEND="
- arping? ( !net-misc/arping )
- rarpd? ( !net-misc/rarpd )
traceroute6? ( !net-analyzer/traceroute )
!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
"
@@ -66,8 +64,6 @@ fi
PATCHES=()
src_prepare() {
- use SECURITY_HAZARD && PATCHES+=( "${FILESDIR}"/${PN}-20150815-nonroot-floodping.patch )
-
default
l10n_get_locales > po/LINGUAS || die
diff --git a/net-misc/openssh/files/openssh-8.4_p1-hpn-14.22-libressl.patch b/net-misc/openssh/files/openssh-8.4_p1-hpn-14.22-libressl.patch
new file mode 100644
index 000000000000..79cc3e5c2d81
--- /dev/null
+++ b/net-misc/openssh/files/openssh-8.4_p1-hpn-14.22-libressl.patch
@@ -0,0 +1,20 @@
+--- a/openssh-8_3_P1-hpn-AES-CTR-14.22.diff 2020-04-17 10:31:37.392120799 -0700
++++ b/openssh-8_3_P1-hpn-AES-CTR-14.22.diff 2020-04-17 10:32:46.143684424 -0700
+@@ -672,7 +672,7 @@
+ +const EVP_CIPHER *
+ +evp_aes_ctr_mt(void)
+ +{
+-+# if OPENSSL_VERSION_NUMBER >= 0x10100000UL
+++# if (OPENSSL_VERSION_NUMBER >= 0x10100000UL || defined(HAVE_OPAQUE_STRUCTS)) && !defined(LIBRESSL_VERSION_NUMBER)
+ + static EVP_CIPHER *aes_ctr;
+ + aes_ctr = EVP_CIPHER_meth_new(NID_undef, 16/*block*/, 16/*key*/);
+ + EVP_CIPHER_meth_set_iv_length(aes_ctr, AES_BLOCK_SIZE);
+@@ -701,7 +701,7 @@
+ + EVP_CIPH_ALWAYS_CALL_INIT | EVP_CIPH_CUSTOM_IV;
+ +# endif /*SSH_OLD_EVP*/
+ + return &aes_ctr;
+-+# endif /*OPENSSH_VERSION_NUMBER*/
+++# endif /*OPENSSL_VERSION_NUMBER*/
+ +}
+ +
+ +#endif /* defined(WITH_OPENSSL) */
diff --git a/net-misc/openssh/openssh-8.4_p1.ebuild b/net-misc/openssh/openssh-8.4_p1.ebuild
index 04544b8f1fd8..6248805da228 100644
--- a/net-misc/openssh/openssh-8.4_p1.ebuild
+++ b/net-misc/openssh/openssh-8.4_p1.ebuild
@@ -188,6 +188,7 @@ src_prepare() {
cp $(printf -- "${DISTDIR}/%s\n" "${HPN_PATCHES[@]}") "${hpn_patchdir}" || die
pushd "${hpn_patchdir}" &>/dev/null || die
eapply "${FILESDIR}"/${P}-hpn-${HPN_VER}-glue.patch
+ eapply "${FILESDIR}"/${PN}-8.4_p1-hpn-${HPN_VER}-libressl.patch
if use X509; then
# einfo "Will disable MT AES cipher due to incompatbility caused by X509 patch set"
# # X509 and AES-CTR-MT don't get along, let's just drop it
diff --git a/net-misc/tigervnc/Manifest b/net-misc/tigervnc/Manifest
index 255751cae3e4..7c7e79a01771 100644
--- a/net-misc/tigervnc/Manifest
+++ b/net-misc/tigervnc/Manifest
@@ -1,2 +1,3 @@
+DIST tigervnc-1.11.0.tar.gz 1346992 BLAKE2B 4935f78154ea1567d58f542962f1a87688cd195e9d1aff8295e99aedc91a87cea7b686e9ef34e68f4abb1e3ce7a93122baff1d6f3564e4cc60b967a7bca6f8ac SHA512 262676f065de6dfb72b1482c0ef1e6d8b764f53360ae6114debbe0986eede45d27e283e1452a72cb9b7540657ab347fd36df5b30b72d6db4a0f8cbea5b591025
DIST tigervnc-1.9.0.tar.gz 1506520 BLAKE2B 292c2e5fb9ffe2573e216257e889d259abfdca5964559492c318e24ea00563211e7477a4f1b2b09d0e962343d4aeb2c12dcfdd6857a3282882ee9f91fdf8103a SHA512 333910f567e6b5e4a5a22d898b2d4c3f4b834cb4cc8fc13ff55d31401894c0d5122a127692ec5eb51e412c945ff3ea5b8146f9ab22cbe1e47541e09239ec8c9d
DIST xorg-server-1.20.0.tar.bz2 6096838 BLAKE2B 34ee6d6dbbde54d54e082a0791e85ad52d728e239a7d8fadb75ebcbdbaab8752b90ca6d075f096d971db7ec68ce4ecac5c70fcf536ce23c20b8dce8f32e2c046 SHA512 1489e8511c9da682ef0460182dfeeddd241c72d4ef4d206d9706f1e39572c09953df851fab18cefb65a1ee4c6710c6ba13c63c9c9fc0bc1b5f12c50780412cde
diff --git a/net-misc/tigervnc/tigervnc-1.11.0-r1.ebuild b/net-misc/tigervnc/tigervnc-1.11.0-r1.ebuild
new file mode 100644
index 000000000000..c156213e877b
--- /dev/null
+++ b/net-misc/tigervnc/tigervnc-1.11.0-r1.ebuild
@@ -0,0 +1,179 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+CMAKE_IN_SOURCE_BUILD=1
+inherit autotools cmake eutils flag-o-matic java-pkg-opt-2 systemd xdg
+
+XSERVER_VERSION="1.20.0"
+
+DESCRIPTION="Remote desktop viewer display system"
+HOMEPAGE="http://www.tigervnc.org"
+SRC_URI="https://github.com/TigerVNC/tigervnc/archive/v${PV}.tar.gz -> ${P}.tar.gz
+ server? ( ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-${XSERVER_VERSION}.tar.bz2 )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="dri3 +drm gnutls java libressl nls +opengl pam server xinerama +xorgmodule"
+
+CDEPEND="
+ virtual/jpeg:0
+ sys-libs/zlib:=
+ >=x11-libs/fltk-1.3.1
+ gnutls? ( net-libs/gnutls:= )
+ nls? ( virtual/libiconv )
+ pam? ( sys-libs/pam )
+ x11-libs/libX11
+ x11-libs/libXext
+ x11-libs/libXrender
+ x11-libs/pixman
+ server? (
+ x11-libs/libXau
+ x11-libs/libXdamage
+ x11-libs/libXdmcp
+ x11-libs/libXfont2
+ x11-libs/libXtst
+ >=x11-libs/pixman-0.27.2
+ >=x11-apps/xauth-1.0.3
+ x11-apps/xsetroot
+ >=x11-misc/xkeyboard-config-2.4.1-r3
+ xorgmodule? ( =x11-base/xorg-server-${XSERVER_VERSION%.*}* )
+ drm? ( x11-libs/libdrm )
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl:0= )
+ )
+ xinerama? ( x11-libs/libXinerama )
+ "
+
+RDEPEND="${CDEPEND}
+ !net-misc/tightvnc
+ !net-misc/vnc
+ !net-misc/xf4vnc
+ java? ( >=virtual/jre-1.5:* )"
+
+DEPEND="${CDEPEND}
+ nls? ( sys-devel/gettext )
+ java? ( >=virtual/jdk-1.5 )
+ x11-base/xorg-proto
+ media-libs/fontconfig
+ x11-libs/libICE
+ x11-libs/libSM
+ x11-libs/libXcursor
+ x11-libs/libXfixes
+ x11-libs/libXft
+ x11-libs/libXi
+ server? (
+ dev-libs/libbsd
+ x11-libs/libxkbfile
+ x11-libs/libxshmfence
+ virtual/pkgconfig
+ media-fonts/font-util
+ x11-misc/util-macros
+ >=x11-libs/xtrans-1.3.3
+ opengl? ( >=media-libs/mesa-10.3.4-r1 )
+ )"
+
+src_prepare() {
+ if use server; then
+ cp -r "${WORKDIR}"/xorg-server-${XSERVER_VERSION}/. unix/xserver || die
+ fi
+
+ cmake_src_prepare
+
+ if use server; then
+ cd unix/xserver || die
+ eapply "${FILESDIR}"/xserver120.patch
+ eapply "${FILESDIR}"/xserver120-drmfourcc-header.patch
+ sed -i -e 's/"gl >= .*"/"gl"/' configure.ac || die
+ eautoreconf
+ fi
+}
+
+src_configure() {
+ if use arm || use hppa; then
+ append-flags "-fPIC"
+ fi
+
+ local mycmakeargs=(
+ -DENABLE_GNUTLS=$(usex gnutls)
+ -DENABLE_NLS=$(usex nls)
+ -DENABLE_PAM=$(usex pam)
+ -DBUILD_JAVA=$(usex java)
+ )
+
+ cmake_src_configure
+
+ if use server; then
+ cd unix/xserver || die
+ econf \
+ $(use_enable opengl glx) \
+ $(use_enable drm libdrm) \
+ --disable-config-hal \
+ --disable-config-udev \
+ --disable-devel-docs \
+ --disable-dmx \
+ --disable-dri \
+ $(use_enable dri3) \
+ --disable-glamor \
+ --disable-kdrive \
+ --disable-libunwind \
+ --disable-linux-acpi \
+ --disable-record \
+ --disable-selective-werror \
+ --disable-static \
+ --disable-unit-tests \
+ --disable-xephyr \
+ $(use_enable xinerama) \
+ --disable-xnest \
+ --disable-xorg \
+ --disable-xvfb \
+ --disable-xwin \
+ --disable-xwayland \
+ --enable-dri2 \
+ --with-pic \
+ --without-dtrace \
+ --disable-present \
+ --with-sha1=libcrypto
+ fi
+}
+
+src_compile() {
+ cmake_src_compile
+
+ if use server; then
+ # deps of the vnc module and the module itself
+ local d subdirs=(
+ fb xfixes Xext dbe $(usex opengl glx "") $(usev dri3) randr render
+ damageext miext Xi xkb composite dix mi os hw/vnc
+ )
+ for d in "${subdirs[@]}"; do
+ emake -C unix/xserver/"${d}"
+ done
+ fi
+}
+
+src_install() {
+ cmake_src_install
+
+ if use server; then
+ emake -C unix/xserver/hw/vnc DESTDIR="${D}" install
+ if ! use xorgmodule; then
+ rm -rv "${ED%/}"/usr/$(get_libdir)/xorg || die
+ else
+ rm -v "${ED%/}"/usr/$(get_libdir)/xorg/modules/extensions/libvnc.la || die
+ fi
+
+ newconfd "${FILESDIR}"/${PN}.confd ${PN}
+ newinitd "${FILESDIR}"/${PN}.initd ${PN}
+
+ systemd_douserunit unix/vncserver/vncserver@.service
+ else
+ local f
+ cd "${ED}" || die
+ for f in vncserver x0vncserver vncconfig; do
+ rm usr/bin/$f || die
+ rm usr/share/man/man1/$f.1 || die
+ done
+ fi
+}
diff --git a/net-print/Manifest.gz b/net-print/Manifest.gz
index 0e40122780dc..05b68c9c0557 100644
Binary files a/net-print/Manifest.gz and b/net-print/Manifest.gz differ
diff --git a/net-print/apsfilter/apsfilter-7.2.8-r1.ebuild b/net-print/apsfilter/apsfilter-7.2.8-r1.ebuild
index dcc618969c3a..4f7f15844cab 100644
--- a/net-print/apsfilter/apsfilter-7.2.8-r1.ebuild
+++ b/net-print/apsfilter/apsfilter-7.2.8-r1.ebuild
@@ -1,42 +1,55 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=4
+EAPI=7
DESCRIPTION="Apsfilter Prints So Fine, It Leads To Extraordinary Results"
HOMEPAGE="http://www.apsfilter.org"
SRC_URI="http://www.apsfilter.org/download/${P}.tar.bz2"
+S="${WORKDIR}/${PN}"
+
KEYWORDS="~alpha ~amd64 ppc sparc x86"
IUSE="cups"
SLOT="0"
LICENSE="GPL-2"
-RDEPEND="|| ( net-print/cups net-print/lprng )
+RDEPEND="
app-text/ghostscript-gpl
>=app-text/psutils-1.17
>=app-text/a2ps-4.13b-r4
+ net-print/cups
virtual/awk
virtual/imagemagick-tools
virtual/mta"
DEPEND="${RDEPEND}"
-S=${WORKDIR}/${PN}
-
src_configure() {
- # assume thet lprng is installed if cups isn't USEd
- use cups && \
- myconf="--with-printcap=/etc/cups/printcap --with-spooldir=/var/spool/cups" || \
- myconf="--with-printcap=/etc/lprng/printcap"
+ local myconf=
+
+ # assume that lprng is installed if cups isn't USEd
+ if use cups ; then
+ myconf="--with-printcap=/etc/cups/printcap --with-spooldir=/var/spool/cups"
+ else
+ myconf="--with-printcap=/etc/lprng/printcap"
+ fi
# econf doesn't work here :(
- ./configure --prefix=/usr --mandir=/usr/share/man \
- --docdir=/usr/share/doc/${PF} --sysconfdir=/etc ${myconf} || die
+ ./configure \
+ --prefix="${EPREFIX}/usr" \
+ --mandir=/usr/share/man \
+ --docdir=/usr/share/doc/${PF} \
+ --sysconfdir=/etc \
+ "${myconf} ${EXTRA_ECONF}" \
+ || die
}
src_install() {
- emake DESTDIR="${D}" install
- dosym /usr/share/apsfilter/SETUP /usr/bin/apsfilter
- use cups && \
- dosym /etc/cups/printcap /etc/printcap || \
- dosym /etc/lprng/printcap /etc/printcap
+ emake DESTDIR="${ED}" install
+ dosym ../share/apsfilter/SETUP /usr/bin/apsfilter
+
+ if use cups ; then
+ dosym ../cups/printcap /etc/printcap
+ else
+ dosym ../lprng/printcap /etc/printcap
+ fi
}
diff --git a/net-wireless/Manifest.gz b/net-wireless/Manifest.gz
index bd39b2f61162..29cbb66b3eac 100644
Binary files a/net-wireless/Manifest.gz and b/net-wireless/Manifest.gz differ
diff --git a/net-wireless/hostapd/hostapd-2.9-r3.ebuild b/net-wireless/hostapd/hostapd-2.9-r3.ebuild
index af3b036853f5..80e1402c487f 100644
--- a/net-wireless/hostapd/hostapd-2.9-r3.ebuild
+++ b/net-wireless/hostapd/hostapd-2.9-r3.ebuild
@@ -21,7 +21,7 @@ else
SRC_URI+=" https://w1.fi/releases/${P}.tar.gz"
fi
# Never stabilize snapshot ebuilds please
- KEYWORDS="~amd64 ~arm arm64 ~mips ppc ~x86"
+ KEYWORDS="~amd64 arm arm64 ~mips ppc ~x86"
fi
LICENSE="BSD"
diff --git a/net-wireless/lorcon/lorcon-0.0_p20200214.ebuild b/net-wireless/lorcon/lorcon-0.0_p20200214.ebuild
index 7e81f8596710..de4194575cff 100644
--- a/net-wireless/lorcon/lorcon-0.0_p20200214.ebuild
+++ b/net-wireless/lorcon/lorcon-0.0_p20200214.ebuild
@@ -20,7 +20,7 @@ else
GIT_HASH="7dbf24ee6f7c277240c0fbd988b6902850577772"
SRC_URI="https://github.com/kismetwireless/lorcon/archive/${GIT_HASH}.tar.gz -> ${P}.tar.gz"
S="${WORKDIR}"/"${PN}-${GIT_HASH}"
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+ KEYWORDS="~amd64 ~arm ~arm64 ppc ~x86 ~amd64-linux ~x86-linux"
fi
LICENSE="GPL-2"
diff --git a/net-wireless/unifi/Manifest b/net-wireless/unifi/Manifest
index 2ff9a7181d9b..2c5f655232ad 100644
--- a/net-wireless/unifi/Manifest
+++ b/net-wireless/unifi/Manifest
@@ -1,4 +1,5 @@
DIST unifi-5.6.42.zip 63581448 BLAKE2B dc12149acc56587043b9f6c45a43327a9a067dda86127c60ad62a4681a0c8ba873435b60183989332f561fb52f71c7207480766ec23d9c0e892cc20c521a9819 SHA512 467c0ad284a84795537484f371867d851e67c7e396215d539a9705f17f374b50db4051121a6634d1944474a2474bdd75fca860ab00b48634a5d3e8749a122989
DIST unifi-6.0.23.zip 183386177 BLAKE2B ee0300c9595bab469e63c8c523f75507e5b4ef88e67947df8948abddb149e6522f4851108191f0f91605cc0168fcaa73170a40a9908fd64b49897f5123dc7a37 SHA512 b21be9cf360bfc6e1f2bff073db431a653a7b53f138cd9249873eaadf93777a3eecde87a8ada2db46f2fe69b2eacf747ed13c78045ba12748469dab3d068c881
DIST unifi-6.0.24.zip 219639979 BLAKE2B a96df3d87ca5e22791ea7480012add840b09a76fe603d24057ffa74f61c12a3fdcceffafe9a2aeb5c31111cdd00348c7bc5193929ef350a2f9dd6730260759a3 SHA512 d12c49d429659b504a132597aa1eba89d173b9671a231c4c4d27ec23c81be2b964e96439469ef467a212af5ca91c1b3bc4080d4ee0c3b71f7d4576b530a5e8b0
+DIST unifi-6.0.26.zip 226932393 BLAKE2B f5c42eccbcfea45af30cf10da69dccbb9b8ddccef53c7c35db059e53ddf5800fecdde84be88dd80320c265c655dc71d18cf25851090e29209204d39552200466 SHA512 3f221035dd27c38cd59b3a1202ce526143eb9bc6253e1e157a82e0cbb765445c8264c09177593830493598a8ef65cce2406bf25b84c242674b35c66db341743e
DIST unifi-6.1.16.zip 220033149 BLAKE2B 4e965c1577ef35d3dd28357aa884f8234f3cc9c45783dd261153ecc87bda24fc4b58ea4f49096304331bd11896251c29eaaa8e8b44046e50ee7e9d54d997223a SHA512 d1b241d5a47ee34c66a08b847405f615f83782fc67a38fe5fc4c281bac6335bc2ab8b021774cafb98753759b9924e773a2c4883a1ed2b30cb2e58ab56b3c07f3
diff --git a/net-wireless/unifi/unifi-6.0.26.ebuild b/net-wireless/unifi/unifi-6.0.26.ebuild
new file mode 100644
index 000000000000..c39e3dc9c77e
--- /dev/null
+++ b/net-wireless/unifi/unifi-6.0.26.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# Set this var for any releases except stable
+RC_SUFFIX="-dfb550c0bf"
+
+inherit systemd
+
+DESCRIPTION="A Management Controller for Ubiquiti Networks UniFi APs"
+HOMEPAGE="https://www.ubnt.com"
+SRC_URI="https://dl.ui.com/unifi/${PV}${RC_SUFFIX}/UniFi.unix.zip -> ${P}.zip"
+
+KEYWORDS="~amd64"
+LICENSE="Apache-1.0 Apache-2.0 BSD-1 BSD-2 BSD CDDL EPL-1.0 GPL-2 LGPL-2.1 LGPL-3 MIT ubiquiti"
+SLOT="0/6.0"
+IUSE="systemd"
+
+RDEPEND="
+ acct-group/unifi
+ acct-user/unifi
+ dev-db/mongodb
+ virtual/jre:1.8
+"
+
+DEPEND="app-arch/unzip"
+
+RESTRICT="bindist mirror"
+
+S="${WORKDIR}/UniFi"
+
+DOCS=( "readme.txt" )
+
+QA_PREBUILT="usr/lib/unifi/lib/native/Linux/x86_64/*.so"
+
+src_prepare() {
+ # Remove unneeded files Linux, Mac and Windows
+ rm -r lib/native/Linux/{aarch64,armv7} lib/native/{Mac,Windows} || die
+ if ! use systemd; then
+ rm lib/native/Linux/x86_64/libubnt_sdnotify_jni.so || die
+ fi
+
+ default
+}
+
+src_install() {
+ insinto /usr/lib/unifi
+ doins -r bin dl lib webapps
+
+ diropts -o unifi -g unifi
+ keepdir /var/lib/unifi/{conf,data,run,tmp,work} /var/log/unifi
+
+ for symlink in conf data run tmp work; do
+ dosym ../../../var/lib/unifi/${symlink} /usr/lib/unifi/${symlink}
+ done
+ dosym ../../../var/log/unifi /usr/lib/unifi/logs
+
+ newinitd "${FILESDIR}"/unifi.initd-r1 unifi
+ systemd_dounit "${FILESDIR}"/unifi.service
+
+ newconfd "${FILESDIR}"/unifi.confd unifi
+
+ echo 'CONFIG_PROTECT="/var/lib/unifi"' > "${T}"/99unifi || die
+ doenvd "${T}"/99unifi
+
+ einstalldocs
+}
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 223b3ceb5d4f..2aa30e2bfc67 100644
Binary files a/profiles/Manifest.gz and b/profiles/Manifest.gz differ
diff --git a/profiles/arch/amd64/package.use.stable.mask b/profiles/arch/amd64/package.use.stable.mask
index 5d986026fe8e..606e9f50aa83 100644
--- a/profiles/arch/amd64/package.use.stable.mask
+++ b/profiles/arch/amd64/package.use.stable.mask
@@ -17,6 +17,11 @@
#--- END OF EXAMPLES ---
+# Thomas Deutschmann (2020-10-02)
+# media-video/pipewire not yet stabilized and without
+# sys-apps/xdg-desktop-portal-gtk not useable at all
+www-client/firefox screencast
+
# Thomas Deutschmann (2020-09-07)
# sys-cluster/slurm has no stable keywords
# dev-util/nvidia-cuda-toolkit has no stable keywords
diff --git a/profiles/arch/arm64/package.use.force b/profiles/arch/arm64/package.use.force
index 97e4c149897b..cf7a4360ee01 100644
--- a/profiles/arch/arm64/package.use.force
+++ b/profiles/arch/arm64/package.use.force
@@ -1,6 +1,10 @@
# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
+# Joonas Niilola (2020-10-02)
+# luajit not available on this arch.
+dev-libs/efl lua
+
# Georgy Yakovlev (2020-06-18)
# Force host target
dev-libs/keystone llvm_targets_AArch64
diff --git a/profiles/arch/arm64/package.use.mask b/profiles/arch/arm64/package.use.mask
index 20ee5ce89276..18598f67f073 100644
--- a/profiles/arch/arm64/package.use.mask
+++ b/profiles/arch/arm64/package.use.mask
@@ -1,6 +1,10 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
+# Joonas Niilola (2020-10-02)
+# luajit not available on this arch.
+dev-libs/efl luajit
+
# Sam James (2020-09-05)
# nvidia-texture-tools not useful here
media-libs/devil nvtt
diff --git a/profiles/arch/x86/package.use.stable.mask b/profiles/arch/x86/package.use.stable.mask
index 328ba2f9cc5d..d808ed1bddd3 100644
--- a/profiles/arch/x86/package.use.stable.mask
+++ b/profiles/arch/x86/package.use.stable.mask
@@ -17,6 +17,11 @@
#--- END OF EXAMPLES ---
+# Thomas Deutschmann (2020-10-02)
+# media-video/pipewire not yet stabilized and without
+# sys-apps/xdg-desktop-portal-gtk not useable at all
+www-client/firefox screencast
+
# Thomas Deutschmann (2020-08-05)
# sys-cluster/slurm has no stable keywords
app-metrics/collectd collectd_plugins_slurm
diff --git a/profiles/default/linux/package.use.mask b/profiles/default/linux/package.use.mask
index ec1ce5cca9d2..2210983ff5a8 100644
--- a/profiles/default/linux/package.use.mask
+++ b/profiles/default/linux/package.use.mask
@@ -1,6 +1,11 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
+# Tony Vroon (2020-10-01)
+# Upstream requires Lua 5.2 which is not a satisfiable
+# dependency at this point in time.
+app-arch/rpm lua
+
# Alexey Shvetsov (2019-12-24)
# Gromacs python module install br0ken
sci-chemistry/gromacs python
diff --git a/profiles/package.mask b/profiles/package.mask
index f555e72c4354..9ba95552a236 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -486,8 +486,6 @@ dev-util/doxy-coverage
dev-util/mpatch
dev-vcs/cvs2svn
dev-vcs/gitstats
-games-rpg/adonthell
-games-rpg/wastesedge
games-strategy/0ad
media-sound/codecgraph
net-misc/pssh
@@ -568,16 +566,6 @@ net-wireless/kismet-ubertooth
# Removal in 30 days. Bug #740100
dev-python/pyinsane
-# Arfrever Frehtes Taifersar Arahesis (2020-09-01)
-# Abandoned long time ago. Last release in 2008. Not ported to GTK+ 3.
-# Masked for deletion in 30 days.
-# Replacement: Sinhala Wijesekera input method is also provided by M17N library
-# which can be used through:
-# - app-i18n/fcitx-m17n
-# - app-i18n/ibus-m17n
-# - app-i18n/scim-m17n
-app-i18n/scim-wijesekera
-
# Arfrever Frehtes Taifersar Arahesis (2020-09-01)
# Mismatched version (bug #695022). Masked to force upgrade to 2.0.4_pre20200306162733.
# (Mask should remain after ebuilds are deleted, until 2021-03-01 or
@@ -587,48 +575,10 @@ app-i18n/scim-wijesekera
~app-i18n/scim-sunpinyin-3.0.0_rc1
~app-i18n/xsunpinyin-3.0.0_rc1
-# Marek Szuba (2020-09-01)
-# Uses golang-* eclasses, only a library, all former reverse
-# dependencies have long since switched to vendoring.
-# Removal in 30 days. Bug #732130.
-dev-go/siphash
-
-# Michał Górny (2020-09-01)
-# The following packages are Python 2 only. All but sys-boot/udk have
-# no reverse dependencies; sys-boot/udk's only revdep is sys-boot/refind
-# and it removed support for udk in its newest version. Their
-# maintainers have either not replied or requested removing the package.
-# Please do not remove the mask unless you port the package to py3.7+.
-# Removal in 30 days. Package bugs found blocking tracker bug #694800.
-dev-cpp/icnc
-dev-db/tokumx
-net-fs/nfstest
-sys-boot/udk
-sys-cluster/pbs-python
-
-# Michał Górny (2020-09-01)
-# The GitHub repository is gone and upstream's homepage lists only old
-# versions. Python 2 only. Debian has a py3 patch but it is incomplete
-# and fbless crashes when opening a file.
-# Removal in 30 days. Bug #734578.
-app-text/fbless
-
-# Sam James (2020-08-30)
-# Serious security vulns, outdated.
-# bug 699834. Removal in 30 days.
-www-apps/ampache
-
# Piotr Karbowski (2020-08-28)
# Temporary mask due to multiple reports of segfaults at startup, bug #739056
=x11-base/xorg-server-1.20.9
-# Marek Szuba (2020-08-26)
-# ROCm has had open-source OpenCL image support since 3.3, and since 3.7
-# it no longer attempts to use the proprietary library even when it is
-# present. Last but not least, upstream no longer publishes this.
-# Removal in 30 days. Bug #739066.
-dev-libs/hsa-ext-rocr
-
# Alfredo Tupone (2020-08-23)
# Ported to py3 but not yet released
# Masked to allow py2.7 removal
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index f06a6c8d6a3a..a474e93e7d15 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -347,6 +347,7 @@ app-crypt/tpm-emulator:mtm-emulator - Build the MTM emulator
app-crypt/tpm-tools:pkcs11 - Build Token data management utilities based on OpenCryptoki's (dev-libs/opencryptoki) PKCS#11 implementation.
app-crypt/tpm2-pkcs11:fapi - Enable feature API backend
app-crypt/tpm2-tools:fapi - Enable feature API tools
+app-crypt/tpm2-totp:plymouth - Add sys-boot/plymouth support
app-crypt/tpm2-tss:fapi - Enable feature API (requires openssl as crypto backend)
app-crypt/tpm2-tss:gcrypt - Use dev-libs/libgcrypt as crypto engine
app-crypt/tpm2-tss:mbedtls - Use net-libs/mbedtls as crypto engine
@@ -1402,7 +1403,6 @@ dev-db/sqldeveloper:sybase - Add support for the Sybase SQL Database Server
dev-db/sqlite:secure-delete - Enable overwriting of deleted content with zeros by default (http://sqlite.org/pragma.html#pragma_secure_delete), causing some performance penalty
dev-db/sqlite:tools - Install additional tools
dev-db/sqlitestudio:cli - Build CLI interface
-dev-db/tokumx:pax_kernel - Apply patch needed for hardened kernels
dev-db/unixODBC:minimal - Disable bundled drivers and extra libraries (most users don't need these)
dev-db/unixODBC:odbcmanual - Administrator, Internal Structure, Programmer and User documentation
dev-embedded/avrdude:ftdi - Enable support for USB FTDI chips via dev-embedded/libftdi
@@ -2109,7 +2109,6 @@ dev-libs/gmp:asm - Enable use of hand optimized assembly routines (faster execut
dev-libs/gmp:pic - Force static libraries to be built as PIC to avoid TEXTRELs.
dev-libs/gobject-introspection:doctool - Install g-ir-doc-tool for generating documentation from introspected data
dev-libs/hidapi:fox - Build a x11-libs/fox GUI
-dev-libs/hsa-ext-rocr:deprecated - Install the deprecated debug/trace/profiling library
dev-libs/input-pad:eekboard - Enable support for dev-libs/eekboard
dev-libs/input-pad:xtest - Enable support for x11-libs/libXtst
dev-libs/intel-neo:l0 - Install the oneAPI Level Zero driver alongside the OpenCL one
@@ -2986,7 +2985,6 @@ dev-vcs/darcs:terminfo - Use the terminfo package for enhanced console support.
dev-vcs/darcs:threaded - Use threading and SMP support.
dev-vcs/fossil:fusefs - Enable the Fuse Filesystem
dev-vcs/fossil:json - Enable the JSON API of Fossil's wiki
-dev-vcs/fossil:legacy-mv-rm - Enable legacy behavior for mv/rm (skip checkout files).
dev-vcs/fossil:miniz - Use the bundled miniz for compression instead of zlib. Incompatible with ssl.
dev-vcs/fossil:system-sqlite - Use the system SQLite instead of the bundled one
dev-vcs/fossil:tcl-private-stubs - Enable Tcl integration via private stubs mechanism
@@ -4429,7 +4427,7 @@ media-libs/zmusic:mpg123 - Enable support for MPEG audio playback via media-soun
media-plugins/alsa-plugins:arcam_av - Enables Arcam AV control plugin
media-plugins/alsa-plugins:mix - Enables upmix and vdownmix plugin
media-plugins/alsa-plugins:usb_stream - Enables usb_stream plugin
-media-plugins/audacious-plugins:ampache - Support controlling audacious via www-apps/ampache
+media-plugins/audacious-plugins:ampache - Support controlling audacious via ampache
media-plugins/audacious-plugins:bs2b - Enable Bauer Bauer stereophonic-to-binaural headphone filter
media-plugins/audacious-plugins:cue - Support CUE sheets using the libcue library
media-plugins/audacious-plugins:fluidsynth - Support FluidSynth as MIDI synth backend
@@ -5475,7 +5473,6 @@ net-analyzer/zabbix:proxy - Enable proxy support
net-analyzer/zabbix:server - Enable zabbix server
net-analyzer/zabbix:ssh - SSH v2 based checks
net-analyzer/zabbix:static - Build statically linked binaries
-net-analyzer/zmap:json - Add support to store results JSON based
net-analyzer/zmap:mongo - Add support for storing in a mongo DB via dev-db/mongodb
net-analyzer/zmap:redis - Add support for storing in a redis DB via dev-libs/hiredis
net-dialup/accel-ppp:ipoe - Build IPoE kernel module
@@ -5525,7 +5522,6 @@ net-dns/ddclient:iproute2 - Use sys-apps/iproute2 instead of sys-apps/net-tools
net-dns/dnsdist:dnscrypt - Enable the ability to act as a DNSCrypt server
net-dns/dnsdist:dnstap - Enable support for dnstap
net-dns/dnsdist:doh - Enable support for dns over http via www-servers/h2o
-net-dns/dnsdist:fstrm - Enable support for fstrm via dev-libs/fstrm
net-dns/dnsdist:lmdb - Enable support for lmdb
net-dns/dnsdist:regex - Enable support for regular expression matching via dev-libs/re2
net-dns/dnsdist:remote-logging - Enable support for remote logging via dev-libs/protobuf
@@ -8612,7 +8608,6 @@ www-apache/mod_security:mlogc - Build and install the ModSecurity Audit Log Coll
www-apache/pwauth:domain-aware - Ignore leading domain names in username (Windows compat)
www-apache/pwauth:faillog - Log failed login attempts
www-apache/pwauth:ignore-case - Ignore string case in username (mostly Windows compat)
-www-apps/ampache:transcode - Install optional dependencies for transcoding support
www-apps/blohg:git - Enable Git support
www-apps/blohg:mercurial - Enable Mercurial support
www-apps/cgit:highlight - Enable source code highlighting
diff --git a/sci-calculators/Manifest.gz b/sci-calculators/Manifest.gz
index 67ac5b962094..29f61db1ea2f 100644
Binary files a/sci-calculators/Manifest.gz and b/sci-calculators/Manifest.gz differ
diff --git a/sci-calculators/units/Manifest b/sci-calculators/units/Manifest
index 0265ac770116..ba47bcea8d72 100644
--- a/sci-calculators/units/Manifest
+++ b/sci-calculators/units/Manifest
@@ -1,3 +1,4 @@
DIST units-2.16.tar.gz 1178197 BLAKE2B 6de569cd70c8067be053c5acb0885f898b76252bf6bafbea5f8b4972eca0acb13adfb4b2bc70ef0a3df747ee31084076fea3d3199922f0c44fc8c6d08232192b SHA512 afca2bf313208db2d0a3f4e96fed7bb86a3e96030b420e1cfa68a140499b9a8f2ef8c166c1d608d03c9ca6260199569a67c67c623d8c6a4b8d52e9d5cb6e3091
DIST units-2.18.tar.gz 1248892 BLAKE2B b1dd86907ba6af3251577c533d6c39705ff4a8cdf099c15c61efaf7876ee9a4131212e09b3e9ca0f2355fc547256e33be4fcb9efc552b38e3e990e76b9465992 SHA512 2ae9f08acb03f2f443514800dafb454434d7d1a43497d2a937c2e9e8429f63d821be11ae3090693e8cadbd2f9cdeafba8f80c1671d84a9cceb0f72ad75d8cad7
DIST units-2.19.tar.gz 1271288 BLAKE2B b6d61661d88e8221d5689e7f1cdba357479d4e34c4c6fd51c336e76850521b3ad7d8f1bfd9ff8173917931151c8da2180928879be940358e35ae3e96a6e30765 SHA512 f28df8f0b95b53620d4d21ed369551b8510663ff3658293ba62de2722e7dc2d87506db7c65dc192e35f3c3a20842e8ed09ddaa7352532f7e3eaeab4c001061c8
+DIST units-2.20.tar.gz 1309242 BLAKE2B 5321e6234cfe4514d1ebccec490e472ff64a0428bb2721f51e3ff626ddef7eec4b4e8822aa947da1f4ddca414078b617ba34308c86a71788f6d8a9ba20dd6846 SHA512 5292588fb7ea0ab12e45e5521a115a0eaba4e37378011677cbd80e6e17a6ffa5f388a57859c590b6d65460fc91a4ff33e6603e27d4909b8122d4ad3696c8600d
diff --git a/sci-calculators/units/files/units-2.20-WIN32.patch b/sci-calculators/units/files/units-2.20-WIN32.patch
new file mode 100644
index 000000000000..fbe7599831c4
--- /dev/null
+++ b/sci-calculators/units/files/units-2.20-WIN32.patch
@@ -0,0 +1,24 @@
+--- a/units.c
++++ b/units.c
+@@ -4087,7 +4087,9 @@
+ checkcwd (char *file)
+ {
+ FILE *fp;
++#ifdef _WIN32
+ char *p;
++#endif
+
+ fp = fopen(file, "r");
+ if (fp){
+@@ -4630,7 +4630,10 @@
+ printversion()
+ {
+ int exists;
+- char *unitsfile, *localemap;
++ char *unitsfile;
++#ifdef _WIN32
++ char *localemap;
++#endif
+
+ if (flags.verbose == 0) {
+ printf("GNU Units version %s\n", VERSION);
diff --git a/sci-calculators/units/files/units-2.20-readerror.patch b/sci-calculators/units/files/units-2.20-readerror.patch
new file mode 100644
index 000000000000..ccb12c681539
--- /dev/null
+++ b/sci-calculators/units/files/units-2.20-readerror.patch
@@ -0,0 +1,11 @@
+--- a/units.c
++++ b/units.c
+@@ -761,7 +761,7 @@
+ }
+
+
+-#define readerror (goterr=1) && errfile && fprintf
++#define readerror(...) do { goterr=1; if (errfile) fprintf(__VA_ARGS__); } while (0)
+
+ #define VAGUE_ERR "%s: error in units file '%s' line %d\n", \
+ progname, file, linenum
diff --git a/sci-calculators/units/units-2.20.ebuild b/sci-calculators/units/units-2.20.ebuild
new file mode 100644
index 000000000000..512e983f4b3a
--- /dev/null
+++ b/sci-calculators/units/units-2.20.ebuild
@@ -0,0 +1,60 @@
+# 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 python-r1
+
+DESCRIPTION="Unit conversion program"
+HOMEPAGE="https://www.gnu.org/software/units/units.html"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+
+LICENSE="FDL-1.3 GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="+units--cur"
+REQUIRED_USE="units--cur? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+ sys-libs/readline:=
+ units--cur? (
+ ${PYTHON_DEPS}
+ $(python_gen_cond_dep '
+ dev-python/future[${PYTHON_USEDEP}]
+ dev-python/requests[${PYTHON_USEDEP}]
+ ')
+ )
+"
+DEPEND="
+ ${RDEPEND}
+"
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.17-network-sandbox.patch
+ "${FILESDIR}"/${PN}-2.20-WIN32.patch
+ "${FILESDIR}"/${PN}-2.20-readerror.patch
+)
+DOCS=(
+ ChangeLog NEWS README
+)
+
+src_configure() {
+ econf \
+ --sharedstatedir="${EROOT}/var/lib" \
+ ac_cv_path_PYTHON=no
+}
+
+src_compile() {
+ emake ${PN}
+}
+
+src_install() {
+ default
+
+ if use units--cur; then
+ sed \
+ -e "/^outfile/s|'.*'|'/usr/share/units/currency.units'|g" \
+ -e 's|^#!|&/usr/bin/python|g' \
+ units_cur_inst > units_cur || die
+ python_foreach_impl python_doscript units_cur
+ fi
+}
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index d721f59f69f5..d6046719a088 100644
Binary files a/sci-libs/Manifest.gz and b/sci-libs/Manifest.gz differ
diff --git a/sci-libs/cholmod/Manifest b/sci-libs/cholmod/Manifest
index 52847a34dd05..650bab1aeb95 100644
--- a/sci-libs/cholmod/Manifest
+++ b/sci-libs/cholmod/Manifest
@@ -1,2 +1,3 @@
DIST cholmod-2.1.2.tar.bz2 656458 BLAKE2B 83a574ad7d3755428d8d732f3f60b07908b8315d73d5a3d3aaf9aac50b54590c532389dd90efc569e67639993095706eb546e72313b735e35af34a1fea398be2 SHA512 7aca97de4c60ff2d7a76a776be4c2d61243a159a51b9e147fa2480f2aaf61a5d966eb0f1cb57c0145510437f6c478fa30384b741709d0a02432b74ada3e78089
DIST cholmod-3.0.13.tar.bz2 696002 BLAKE2B 40a065fe1a3585897b3ca554a25fa80ffc68ac70798f2f803e34a231ec4f532d113a3d00ab7ab61f5eb02503a84e1459cdb7e96cb0b0d1dc6975ed3d533104fe SHA512 c6c80d099386bac27e385a1b8ee8941cd2fb4f2dcfcf302b4b17d6477ac9ee17ad8030aae9191f92576dfaeb521e2c98ec24e867281c2405e42f95580e14f0ab
+DIST cholmod-3.0.14.tar.bz2 696981 BLAKE2B 855927c18833235b3f0835bfba455d83957b9161c0ee885c2d31d126f0f473067f55bcf2cfa163c72efb5de573589ffa54b484a8cf89bc44c9dbf64d43fda5d9 SHA512 f8c12fc3c8787be38bca6c6f84a8279c1380fbe4fabbfba754235fdb042d7050bfb7b5a21ea87ef59dbd5184d28e8cb7667966c38f5dcad78fe8d47111896a3c
diff --git a/sci-libs/cholmod/cholmod-3.0.14.ebuild b/sci-libs/cholmod/cholmod-3.0.14.ebuild
new file mode 100644
index 000000000000..566f5c250c17
--- /dev/null
+++ b/sci-libs/cholmod/cholmod-3.0.14.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="Sparse Cholesky factorization and update/downdate library"
+HOMEPAGE="https://people.engr.tamu.edu/davis/suitesparse.html"
+SRC_URI="http://202.36.178.9/sage/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1+ modify? ( GPL-2+ ) matrixops? ( GPL-2+ )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+IUSE="cuda doc +lapack +matrixops +modify +partition"
+
+BDEPEND="virtual/pkgconfig
+ doc? ( virtual/latex-base )"
+DEPEND="
+ sci-libs/amd
+ sci-libs/colamd
+ cuda? (
+ dev-util/nvidia-cuda-toolkit
+ x11-drivers/nvidia-drivers
+ )
+ lapack? ( virtual/lapack )
+ partition? (
+ sci-libs/camd
+ sci-libs/ccolamd
+ || (
+ >=sci-libs/metis-5.1.0
+ sci-libs/parmetis
+ )
+ )"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+ local lapack_libs=no
+ local blas_libs=no
+ if use lapack; then
+ blas_libs=$($(tc-getPKG_CONFIG) --libs blas)
+ lapack_libs=$($(tc-getPKG_CONFIG) --libs lapack)
+ fi
+
+ local cudaconfargs=( $(use_with cuda) )
+ if use cuda ; then
+ cudaconfargs+=(
+ --with-cublas-libs="-L${EPREFIX}/opt/cuda/$(get_libdir) -lcublas"
+ --with-cublas-cflags="-I${EPREFIX}/opt/cuda/include"
+ )
+ fi
+
+ econf \
+ --disable-static \
+ --with-blas="${blas_libs}" \
+ --with-lapack="${lapack_libs}" \
+ $(use_with doc) \
+ $(use_with modify) \
+ $(use_with matrixops) \
+ $(use_with partition) \
+ $(use_with partition camd) \
+ $(use_with lapack supernodal) \
+ "${cudaconfargs[@]}"
+}
+
+src_install() {
+ default
+
+ # no static archives
+ find "${D}" -name '*.la' -delete || die
+}
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index c0b929532ec9..0750c06e1e11 100644
Binary files a/sys-apps/Manifest.gz and b/sys-apps/Manifest.gz differ
diff --git a/sys-apps/moreutils/moreutils-0.64.ebuild b/sys-apps/moreutils/moreutils-0.64.ebuild
index ad2f9c8167d9..aa5cd4ed0e20 100644
--- a/sys-apps/moreutils/moreutils-0.64.ebuild
+++ b/sys-apps/moreutils/moreutils-0.64.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://git.joeyh.name/index.cgi/moreutils.git/snapshot/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm arm64 hppa ~ppc ~ppc64 ~x86 ~x86-linux"
IUSE="+doc +perl"
RDEPEND="
diff --git a/sys-apps/systemd/systemd-246-r1.ebuild b/sys-apps/systemd/systemd-246-r1.ebuild
index e762aa1e4009..757d69867be3 100644
--- a/sys-apps/systemd/systemd-246-r1.ebuild
+++ b/sys-apps/systemd/systemd-246-r1.ebuild
@@ -16,7 +16,7 @@ else
MY_P=${MY_PN}-${MY_PV}
S=${WORKDIR}/${MY_P}
SRC_URI="https://github.com/systemd/${MY_PN}/archive/v${MY_PV}/${MY_P}.tar.gz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
fi
PYTHON_COMPAT=( python3_{6,7,8} )
diff --git a/sys-block/Manifest.gz b/sys-block/Manifest.gz
index 7c9890b03dd5..6cf14b29ee52 100644
Binary files a/sys-block/Manifest.gz and b/sys-block/Manifest.gz differ
diff --git a/sys-block/mbuffer/Manifest b/sys-block/mbuffer/Manifest
index fac0086ff7fa..9eede0cede40 100644
--- a/sys-block/mbuffer/Manifest
+++ b/sys-block/mbuffer/Manifest
@@ -1 +1,2 @@
DIST mbuffer-20200505.tgz 146020 BLAKE2B b85742f710405e29775c7d25e9c1be733fd94d7157018017b7c8fb5b5cdeab7fa8819b024d297d96af960a73a8982fdeaefe50627c605f797df4d75b0c15435f SHA512 8a1e5721869fd705d02486cf93467bfe0a59b58789826ca337c18a023e9fbb18c1651211bfebdea4cdd45772ad23d0715bb3892bed04ce66f5fbe72406cde9f7
+DIST mbuffer-20200929.tgz 147855 BLAKE2B abbcb4b29013ed24b4135a8b7576a0e728c3b5f1987558f0582711b1b00333caea8b55a02c4506ac179a4dae04977ee64572df09a210bf34bd71fd336be7e418 SHA512 332106205ea8743c9cf47529106c04ac15801a02b116d8e0c0fd3baadad51331c9f4ba1c8fa125edb42940cf401048a45ba23e2dac0e5189671bcf0ecee36996
diff --git a/sys-block/mbuffer/files/mbuffer-20200929-find-OBJDUMP.patch b/sys-block/mbuffer/files/mbuffer-20200929-find-OBJDUMP.patch
new file mode 100644
index 000000000000..891084b6ca7e
--- /dev/null
+++ b/sys-block/mbuffer/files/mbuffer-20200929-find-OBJDUMP.patch
@@ -0,0 +1,11 @@
+--- a/configure.in
++++ b/configure.in
+@@ -113,7 +113,7 @@ AC_PATH_PROG(AWK,awk)
+ AC_SYS_LARGEFILE
+ AC_STRUCT_ST_BLKSIZE
+
+-AC_CHECK_TARGET_TOOLS(OBJDUMP,gobjdump objdump)
++AC_CHECK_TOOLS(OBJDUMP, [gobjdump objdump])
+
+ AC_HEADER_ASSERT
+ AC_CHECK_LIB(pthread, pthread_mutex_init)
diff --git a/sys-block/mbuffer/mbuffer-20200929.ebuild b/sys-block/mbuffer/mbuffer-20200929.ebuild
new file mode 100644
index 000000000000..a0fc6c22696b
--- /dev/null
+++ b/sys-block/mbuffer/mbuffer-20200929.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="M(easuring)buffer is a replacement for buffer with additional functionality"
+HOMEPAGE="https://www.maier-komor.de/mbuffer.html"
+SRC_URI="https://www.maier-komor.de/software/mbuffer/${P}.tgz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+IUSE="debug libressl ssl test"
+
+REQUIRED_USE="test? ( ssl )"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="ssl? (
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl:0= )
+ )"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-20180410-sysconfdir.patch"
+ "${FILESDIR}/${PN}-20200929-find-OBJDUMP.patch"
+)
+
+src_prepare() {
+ ln -s "${DISTDIR}"/${P}.tgz test.tar #258881
+
+ default
+
+ mv configure.in configure.ac || die
+
+ eautoreconf
+}
+
+src_configure() {
+ local myeconfargs=(
+ $(use_enable ssl md5)
+ $(use_enable debug)
+ )
+ econf "${myeconfargs[@]}"
+}
+
+src_test() {
+ if has usersandbox ${FEATURES} || has network-sandbox ${FEATURES}; then
+ ewarn "Some tests may fail with FEATURES=usersandbox or"
+ ewarn "FEATURES=network-sandbox; Skipping tests because"
+ ewarn "test suite would hang forever in such environments!"
+ return 0;
+ fi
+
+ # Enforce MAKEOPTS=-j1 because src_test() spawns multiple listener
+ # using same port and src_install may have problems (with /etc folder)
+ local -x MAKEOPTS=-j1
+
+ default
+}
+
+pkg_postinst() {
+ if ! has_version "app-arch/mt-st"; then
+ elog ""
+ elog "If you want autoloader support you need to install \"app-arch/mt-st\" in addition!"
+ fi
+}
diff --git a/sys-boot/Manifest.gz b/sys-boot/Manifest.gz
index 67efc73cc901..d0f4c4dd2c3e 100644
Binary files a/sys-boot/Manifest.gz and b/sys-boot/Manifest.gz differ
diff --git a/sys-boot/udk/Manifest b/sys-boot/udk/Manifest
deleted file mode 100644
index 5b45c5e5d81f..000000000000
--- a/sys-boot/udk/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST UDK2015.Complete.MyWorkSpace.zip 121736982 BLAKE2B b37bd9ead6ce2c665128199249483ecbcb0f410077d0ca61820bdccb7ae71f6dad870a3cf2dad79f997ad9114678fab3c15a17227ae33aa1ff66f9187aa3a568 SHA512 7856a8f29296f817e8fd09d8eaf7207f4e25a13faa10936d1ceb10cb6a900be265379722c0ade0ef93b1c640fef8693667d2567962e3288b20ae77f607f03d39
-DIST udk-2018-docs.zip 79352781 BLAKE2B 9d08579d4645121cabb7ac52850de6492f9990240da9236064352df0595867bfc6952c9858865a8ce1d81982ec0e2440dc19930a75595454257294462adc60d6 SHA512 6ba2d961f20267cafb94bd020e8fe71e1392f1f2cdbc5c9f0a43212253ddf137b3e12cc789299dfd1ea099bb1541703b995ae20d28f0275395f5f85ed0656954
-DIST udk-2018.tar.gz 38642782 BLAKE2B a10171659451d7d3df737066ec0471db1e5055bd52556d4d0654b244e827512db8d88e2b74b4dfe0189f768e0eab7a705aa32a720e047555995cf339ea50c62f SHA512 8fd9316f08a5c30f8684b2fde73906a943bb067ec91699f41796e27679af73dbc38efaa100a57d4b835656b402d9c08896abc5c10fd0d607a7e0173b3d7a60b2
diff --git a/sys-boot/udk/files/2015-makefile.template b/sys-boot/udk/files/2015-makefile.template
deleted file mode 100644
index c8ae8b6b420e..000000000000
--- a/sys-boot/udk/files/2015-makefile.template
+++ /dev/null
@@ -1,54 +0,0 @@
-TOP := $(abspath $(dir $(lastword $(MAKEFILE_LIST))))
-EXEC = «MODULE».efi
-SRC = $(shell find $(TOP) -type f -name '*.c')
-OBJ = $(SRC:.c=.o)
-INC_DIR = /usr/include/«PACKAGE_NAME»
-LIB_DIR = /usr/lib
-«STATIC_LIBS»
-
-EFI_LDS = $(LIB_DIR)/GccBase.lds
-
-«MODULE_TYPE»
-«IMAGE_ENTRY_POINT»
-
-«CP»
-«RM»
-«CC»
-«DLINK»
-«OBJCOPY»
-«GENFW»
-
-CC_FLAGS = -g -fshort-wchar -fno-strict-aliasing -Wall -Werror \
- -Wno-array-bounds -ffunction-sections -fdata-sections -c -iquote$(TOP) \
- -include AutoGen.h -I$(INC_DIR) -DSTRING_ARRAY_NAME=«MODULE»Strings -m64 \
- -fno-stack-protector "-DEFIAPI=__attribute__((ms_abi))" -DNO_BUILTIN_VA_FUNCS \
- -mno-red-zone -Wno-address -mcmodel=large -Wno-address \
- -Wno-unused-but-set-variable
-DLINK_FLAGS=-nostdlib -n -q --gc-sections --entry $(IMAGE_ENTRY_POINT) \
- -u $(IMAGE_ENTRY_POINT) -melf_x86_64 --oformat=elf64-x86-64 -L $(LIB_DIR) \
- --script=$(EFI_LDS) --defsym=PECOFF_HEADER_SIZE=«PECOFF_HEADER_SIZE»
-«OBJCOPY_FLAGS»
-«GENFW_FLAGS»
-
-all: $(EXEC)
-
-%.efi: $(OBJ)
- $(DLINK) -o $(@:.efi=.dll) $(DLINK_FLAGS) \
- --start-group $(STATIC_LIBRARY_FILES) $^ --end-group
- $(OBJCOPY) $(OBJCOPY_FLAGS) $(@:.efi=.dll)
- $(CP) $(@:.efi=.dll) $(@:.efi=.debug)
- $(OBJCOPY) --strip-unneeded -R .eh_frame $(@:.efi=.dll)
- $(OBJCOPY) --add-gnu-debuglink=$(@:.efi=.debug) $(@:.efi=.dll)
- $(GENFW) -e $(MODULE_TYPE) -o $@ $(@:.efi=.dll) $(GENFW_FLAGS)
- $(RM) $(@:.efi=.dll)
-
-%.o: %.c
- $(CC) $(CC_FLAGS) -o $@ $^
-
-clean:
- $(RM) *.o
-
-mrproper: clean
- $(RM) $(EXEC) $(EXEC:.efi=.debug)
-
-.PHONY: all clean mrproper
diff --git a/sys-boot/udk/files/2015-tools_def.template b/sys-boot/udk/files/2015-tools_def.template
deleted file mode 100644
index 5c866354a85c..000000000000
--- a/sys-boot/udk/files/2015-tools_def.template
+++ /dev/null
@@ -1,42 +0,0 @@
-
-#################
-# My custom toolchain
-#################
-*_CUSTOM_*_*_FAMILY = GCC
-*_CUSTOM_*_MAKE_PATH = make
-*_CUSTOM_*_ASL_PATH = DEF(UNIX_IASL_BIN)
-*_CUSTOM_*_OBJCOPY_PATH = «OBJCOPY»
-*_CUSTOM_*_CC_PATH = «CC»
-*_CUSTOM_*_SLINK_PATH = «AR»
-*_CUSTOM_*_DLINK_PATH = «LD»
-*_CUSTOM_*_ASLDLINK_PATH = «LD»
-*_CUSTOM_*_ASM_PATH = «CC»
-*_CUSTOM_*_PP_PATH = «CC»
-*_CUSTOM_*_VFRPP_PATH = «CC»
-*_CUSTOM_*_ASLCC_PATH = «CC»
-*_CUSTOM_*_ASLPP_PATH = «CC»
-*_CUSTOM_*_RC_PATH = «OBJCOPY»
-*_CUSTOM_*_PP_FLAGS = DEF(GCC_PP_FLAGS)
-*_CUSTOM_*_ASLPP_FLAGS = DEF(GCC_ASLPP_FLAGS)
-*_CUSTOM_*_ASLCC_FLAGS = DEF(GCC_ASLCC_FLAGS)
-*_CUSTOM_*_VFRPP_FLAGS = DEF(GCC_VFRPP_FLAGS)
-*_CUSTOM_*_APP_FLAGS =
-*_CUSTOM_*_ASL_FLAGS = DEF(IASL_FLAGS)
-*_CUSTOM_*_ASL_OUTFLAGS = DEF(IASL_OUTFLAGS)
-*_CUSTOM_*_OBJCOPY_FLAGS =
-*_CUSTOM_IA32_ASLCC_FLAGS = DEF(GCC_ASLCC_FLAGS) -m32
-*_CUSTOM_IA32_ASM_FLAGS = DEF(GCC_ASM_FLAGS) -m32 -march=i386
-*_CUSTOM_IA32_CC_FLAGS = «CFLAGS» -include AutoGen.h -DSTRING_ARRAY_NAME=$(BASE_NAME)Strings -D EFI32
-*_CUSTOM_IA32_ASLDLINK_FLAGS = -nostdlib -n -q --gc-sections -z common-page-size=0x40 --entry ReferenceAcpiTable -u ReferenceAcpiTable -m elf_i386
-*_CUSTOM_IA32_DLINK_FLAGS = -nostdlib -n -q --gc-sections -z common-page-size=0x40 --entry $(IMAGE_ENTRY_POINT) -u $(IMAGE_ENTRY_POINT) -Map $(DEST_DIR_DEBUG)/$(BASE_NAME).map -m elf_i386 --oformat=elf32-i386
-*_CUSTOM_IA32_DLINK2_FLAGS = DEF(GCC_DLINK2_FLAGS_COMMON) --defsym=PECOFF_HEADER_SIZE=0x220
-*_CUSTOM_IA32_RC_FLAGS = DEF(GCC_IA32_RC_FLAGS)
-*_CUSTOM_IA32_NASM_FLAGS = -f elf32
-*_CUSTOM_X64_ASLCC_FLAGS = DEF(GCC_ASLCC_FLAGS) -m64
-*_CUSTOM_X64_ASM_FLAGS = DEF(GCC_ASM_FLAGS) -m64
-*_CUSTOM_X64_CC_FLAGS = «CFLAGS» -include AutoGen.h -DSTRING_ARRAY_NAME=$(BASE_NAME)Strings "-DEFIAPI=__attribute__((ms_abi))" -DNO_BUILTIN_VA_FUNCS
-*_CUSTOM_X64_ASLDLINK_FLAGS = -nostdlib -n -q --gc-sections -z common-page-size=0x40 --entry ReferenceAcpiTable -u ReferenceAcpiTable -m elf_x86_64
-*_CUSTOM_X64_DLINK_FLAGS = -nostdlib -n -q --gc-sections -z common-page-size=0x40 --entry $(IMAGE_ENTRY_POINT) -u $(IMAGE_ENTRY_POINT) -Map $(DEST_DIR_DEBUG)/$(BASE_NAME).map -m elf_x86_64 --oformat=elf64-x86-64
-*_CUSTOM_X64_DLINK2_FLAGS = DEF(GCC_DLINK2_FLAGS_COMMON) --defsym=PECOFF_HEADER_SIZE=0x228
-*_CUSTOM_X64_RC_FLAGS = DEF(GCC_X64_RC_FLAGS)
-*_CUSTOM_X64_NASM_FLAGS = -f elf64
diff --git a/sys-boot/udk/files/udk-workspace.template b/sys-boot/udk/files/udk-workspace.template
deleted file mode 100644
index e119c3ae1a36..000000000000
--- a/sys-boot/udk/files/udk-workspace.template
+++ /dev/null
@@ -1,63 +0,0 @@
-#!/bin/bash
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-SCRIPT_NAME='udk-workspace'
-[ -n "${BASH_SOURCE}" ] && SCRIPT_NAME="${BASH_SOURCE}"
-
-show_usage() {
- if [ ! -z "${1}" ]; then
- echo "${1}" >&2
- echo >&2
- fi
- echo "Usage:"
- echo ". ${SCRIPT_NAME} [folder]"
- echo "where folder is the workspace folder - current directory is used if unspecified"
-}
-
-create_workspace() {
- local workspace_dir="${PWD}"
- if [ ! -z "${1}" ]; then
- workspace_dir="${1}"
- if ! mkdir -p "${1}"; then
- show_usage "Cannot create directory ${1}"
- return 1
- fi
- fi
-
- pushd "${workspace_dir}" >/dev/null
- if ! mkdir -p Conf; then
- show_usage "Cannot create configuration directory"
- return 1
- fi
- export WORKSPACE="${PWD}"
- popd >/dev/null
-}
-
-if [ "${1}" = "-h" ] || [ "${1}" = "--help" ]; then
- show_usage
- # Script may have been sourced
- return 0 2>/dev/null
- exit 0
-elif [ "${SCRIPT_NAME}" = "${0}" ]; then
- show_usage "Script must be sourced"
- exit 1
-elif [ $# -gt 1 ]; then
- show_usage "Too many arguments"
- return 1
-fi
-
-if ! create_workspace "${1}"; then
- return 1
-fi
-unset -f show_usage
-unset -f create_workspace
-shift $#
-
-export EDK_TOOLS_PATH="{EDK_BASE}/BaseTools"
-. "{EDK_BASE}/edksetup.sh"
-
-echo "Do not forget to call this script each time you open a new terminal or work on"
-echo "another workspace."
-echo "For more information, type:"
-echo "${SCRIPT_NAME} --help"
diff --git a/sys-boot/udk/metadata.xml b/sys-boot/udk/metadata.xml
deleted file mode 100644
index a9f04df71ec4..000000000000
--- a/sys-boot/udk/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-
- sveyret@gmail.com
- Stéphane Veyret
-
-
- proxy-maint@gentoo.org
- Proxy Maintainers
-
-
- tianocore/udk
-
-
diff --git a/sys-boot/udk/udk-2015-r1.ebuild b/sys-boot/udk/udk-2015-r1.ebuild
deleted file mode 100644
index 0e6388c5e43c..000000000000
--- a/sys-boot/udk/udk-2015-r1.ebuild
+++ /dev/null
@@ -1,203 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite"
-
-inherit flag-o-matic multiprocessing python-single-r1 toolchain-funcs
-
-MY_V="${PN^^}${PV}"
-
-DESCRIPTION="Tianocore UEFI Development kit"
-HOMEPAGE=" https://github.com/tianocore/tianocore.github.io/wiki/EDK-II"
-SRC_URI="https://github.com/tianocore/${PN}/releases/download/${MY_V}/${MY_V}.Complete.MyWorkSpace.zip"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc examples"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RESTRICT="strip"
-
-RDEPEND="${PYTHON_DEPS}"
-DEPEND="${RDEPEND}
- app-arch/unzip
- dev-lang/nasm"
-
-S="${WORKDIR}/MyWorkSpace"
-
-# Generated libs for EFI can contain WX sections
-QA_EXECSTACK="usr/lib*/libBaseLib.a:*"
-
-pkg_setup() {
- python_setup 'python2.7'
-
- if [[ ${ARCH} == "amd64" ]]; then
- ARCH=X64
- elif [[ ${ARCH} == "x86" ]]; then
- ARCH=IA32
- fi
-
- # We will create a custom toolchain with user defined settings
- TOOLCHAIN_TAG="CUSTOM"
-}
-
-src_unpack() {
- unpack ${A}
- unpack "${WORKDIR}/${MY_V}.MyWorkSpace.zip"
-
- pushd "${S}" || die
- unpack "${WORKDIR}/BaseTools(Unix).tar"
-
- local doc_name
- local f
- if use doc; then
- mkdir -p "${S}/doc" || die
- pushd "${S}/doc" >/dev/null || die
- for f in "${WORKDIR}/Documents/"*" Document.zip"; do
- doc_name=${f##*/}
- doc_name=${doc_name% Document.zip}
- if [[ -f "${WORKDIR}/Documents/${doc_name} Document.zip" ]]; then
- unpack "${WORKDIR}/Documents/${doc_name} Document.zip"
- mv "html" "${doc_name}" || die
- fi
- done
- popd >/dev/null || die
- fi
-
- popd >/dev/null || die
-}
-
-src_configure() {
- # Patch source file for permissive error (issue #639080)
- sed -e "s/\(mStringFileName == \)'\\\\0'/\1NULL/" \
- -i "${S}/BaseTools/Source/C/VfrCompile/VfrUtilityLib.cpp" \
- || die "Failed to patch source file"
- sed -e "s/\((StringPtr != \)L'\\\\0'/\1NULL/" \
- -i "${S}/MdeModulePkg/Library/UefiHiiLib/HiiLib.c" \
- || die "Failed to patch source file"
- # Compile of Base Tools is required for further setting up the environment
- # Base tools does not like parallel make
- sed -e "s|^\(CFLAGS\s*=\).*$|\1 ${CFLAGS} -MD -fshort-wchar -fno-strict-aliasing -nostdlib -c -fPIC|" \
- -i "${S}/BaseTools/Source/C/Makefiles/header.makefile" \
- || die "Failed to update makefile header"
- local make_flags=(
- CC="$(tc-getCC)"
- CXX="$(tc-getCXX)"
- AS="$(tc-getAS)"
- AR="$(tc-getAR)"
- LD="$(tc-getLD)"
- )
- emake "${make_flags[@]}" -j1 -C BaseTools
- . edksetup.sh BaseTools
-
- # Update flags in UDK parameter files
- append-cflags -fshort-wchar -fno-strict-aliasing -c
- append-cflags $(test-flags-CC -ffunction-sections)
- append-cflags $(test-flags-CC -fdata-sections)
- append-cflags $(test-flags-CC -fno-stack-protector)
- append-cflags $(test-flags-CC -fno-asynchronous-unwind-tables)
- if [[ "${ARCH}" == "X64" ]]; then
- append-cflags $(test-flags-CC -m64) $(test-flags-CC -mno-red-zone)
- append-cflags $(test-flags-CC -mcmodel=large)
- else
- append-cflags $(test-flags-CC -m32) $(test-flags-CC -malign-double)
- fi
- sed -e "s|^\(ACTIVE_PLATFORM\s*=\).*$|\1 MdeModulePkg/MdeModulePkg.dsc|" \
- -e "s|^\(TARGET\s*=\).*$|\1 RELEASE|" \
- -e "s|^\(TARGET_ARCH\s*=\).*$|\1 ${ARCH}|" \
- -e "s|^\(TOOL_CHAIN_TAG\s*=\).*$|\1 ${TOOLCHAIN_TAG}|" \
- -e "s|^\(MAX_CONCURRENT_THREAD_NUMBER\s*=\).*$|\1 $(makeopts_jobs)|" \
- -i "${S}/Conf/target.txt" || die "Failed to configure target file"
- sed -e "s|«CC»|$(tc-getCC)|" \
- -e "s|«AR»|$(tc-getAR)|" \
- -e "s|«LD»|$(tc-getLD)|" \
- -e "s|«OBJCOPY»|$(tc-getOBJCOPY)|" \
- -e "s|«CFLAGS»|${CFLAGS}|" \
- "${FILESDIR}/${PV}-tools_def.template" >>"${S}/Conf/tools_def.txt" \
- || die "Failed to prepare tools definition file"
-}
-
-src_compile() {
- if use examples; then
- ewarn "Examples installation does not work anymore"
- ewarn "Try with a most recent version of the package"
- fi
-
- build libraries || die "Failed to compile environment"
-}
-
-src_install() {
- local f
- local build_dir="${S}/Build/MdeModule/RELEASE_${TOOLCHAIN_TAG}/${ARCH}"
-
- for f in "${build_dir}"/*/Library/*/*/OUTPUT/*.lib; do
- local fn="lib${f##*/}"
- newlib.a "${f}" "${fn%.lib}.a"
- done
- dolib.a "${S}/BaseTools/Scripts/GccBase.lds"
-
- insinto "/usr/include/${PN}"
- doins "${S}/MdePkg/Include/"*.h
- doins -r "${S}/MdePkg/Include/"{${ARCH}/.,Guid,IndustryStandard,Library,Pi,Ppi,Protocol,Uefi}
- local hfile
- while read -d '' -r hfile; do
- doins -r "${hfile}/."
- done < <(find "${S}" -name 'BaseTools' -prune -o -name 'MdePkg' -prune -o \
- -name 'CryptoPkg' -prune -o -type d -name Include -print0)
-
- dobin "${S}/BaseTools/Source/C/bin/GenFw"
-
- if use doc; then
- docinto "html"
- # Document installation may be very long, so split it and display message
- for f in "${S}"/doc/*; do
- ebegin "Install documentation for ${f##*/}"
- dodoc -r "${f}"
- eend $?
- done
- fi
-}
-
-##
-# Parameters:
-# 1 - Path where to search for source files.
-# 2 - Path where source files must be copied.
-copySourceFiles() {
- local dest_file
- while read -d '' -r filename; do
- dest_file="${2}${filename#${1}}"
- mkdir -p "${dest_file%/*}" || die
- mv "${filename}" "${dest_file}" || die
- done < <(find "${1}" -name '*.h' -print0 -o -name '*.c' -print0)
-}
-
-##
-# Parameters:
-# 1 - Path of the file to create.
-# 2 - Name of the module.
-# 3 - Path of the generated Makefile.
-createMakefile() {
- local static_libs=$(sed -n '/^STATIC_LIBRARY_FILES\s*=/,/^\s*\$(OUTPUT_DIR)/{/^\s*\$(OUTPUT_DIR)/b;p}' ${3} \
- | sed -e 's|^\s*\$(BIN_DIR).*/\([^/]*\)\.lib|\t-l\1|' -e 's|\\$|\\\\\\n|' | tr --delete '\n')
- local pecoff_header_size;
- [[ $ARCH == X64 ]] && pecoff_header_size='0x228' || pecoff_header_size='0x220'
- sed -e "s|«MODULE»|${2}|" \
- -e "s|«PACKAGE_NAME»|${PN}|" \
- -e "s|«STATIC_LIBS»|${static_libs}|" \
- -e "s|«MODULE_TYPE»|$(grep -e '^MODULE_TYPE\s*=' ${3} | tail -1)|" \
- -e "s|«IMAGE_ENTRY_POINT»|$(grep -e '^IMAGE_ENTRY_POINT\s*=' ${3})|" \
- -e "s|«CP»|$(grep -e '^CP\s*=' ${3})|" \
- -e "s|«RM»|$(grep -e '^RM\s*=' ${3})|" \
- -e "s|«CC»|$(grep -e '^CC\s*=' ${3})|" \
- -e "s|«DLINK»|$(grep -e '^DLINK\s*=' ${3})|" \
- -e "s|«OBJCOPY»|$(grep -e '^OBJCOPY\s*=' ${3})|" \
- -e "s|«GENFW»|$(grep -e '^GENFW\s*=' ${3})|" \
- -e "s|«PECOFF_HEADER_SIZE»|${pecoff_header_size}|" \
- -e "s|«OBJCOPY_FLAGS»|$(grep -e '^OBJCOPY_FLAGS\s*=' ${3})|" \
- -e "s|«GENFW_FLAGS»|$(grep -e '^GENFW_FLAGS\s*=' ${3})|" \
- "${FILESDIR}/${PV}-makefile.template" >${1} \
- || die "Failed to create Makefile"
-}
diff --git a/sys-boot/udk/udk-2018-r1.ebuild b/sys-boot/udk/udk-2018-r1.ebuild
deleted file mode 100644
index 3ad3971c96a4..000000000000
--- a/sys-boot/udk/udk-2018-r1.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite"
-
-inherit multiprocessing python-single-r1 toolchain-funcs
-
-DESCRIPTION="Tianocore UEFI Development kit"
-HOMEPAGE="https://github.com/tianocore/tianocore.github.io/wiki/EDK-II"
-
-if [[ ${PV} == *9999* ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/tianocore/edk2.git"
- KEYWORDS=""
-else
- MY_V="${PN^^}${PV}"
- SRC_URI="https://github.com/tianocore/edk2/archive/v${MY_V}.tar.gz -> ${P}.tar.gz
- doc? ( https://github.com/tianocore/edk2/releases/download/v${MY_V}/${MY_V}.Documents.zip -> ${P}-docs.zip )"
- S="${WORKDIR}/edk2-v${MY_V}"
- KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="BSD-2"
-SLOT="0"
-IUSE="doc"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RESTRICT="strip"
-
-RDEPEND="${PYTHON_DEPS}"
-DEPEND="${RDEPEND}
- >=dev-lang/nasm-2.14.02
- >=sys-power/iasl-20160729
- doc? ( app-arch/unzip )"
-
-DOCDIR="${WORKDIR}/Documents"
-
-# EFI pre-build libs
-QA_PREBUILT="
- usr/lib/${P}/BeagleBoardPkg/Debugger_scripts/rvi_dummy.axf
- usr/lib/${P}/ArmPkg/Library/GccLto/*.a
-"
-# GenBiosId is built upstream
-# VfrCompile does not use LDFLAGS but next upsteam version should change this
-QA_FLAGS_IGNORED="
- usr/lib/udk-2018/BaseTools/Source/C/bin/VfrCompile
- usr/lib/${P}/Vlv2TbltDevicePkg/GenBiosId
-"
-
-pkg_setup() {
- if use x86; then
- EFIARCH=IA32
- elif use amd64; then
- EFIARCH=X64
- fi
-
- # Select toolchain within predefined ones
- if tc-is-gcc; then
- TOOLCHAIN_TAG="GCC5"
- elif tc-is-clang; then
- TOOLCHAIN_TAG="CLANG38"
- else
- TOOLCHAIN_TAG="ELFGCC"
- fi
-}
-
-src_unpack() {
- default
-
- local doc_name
- local f
- if use doc; then
- pushd "${DOCDIR}" >/dev/null || die
- rm -f *.chm || die
- for f in *.zip; do
- unpack "${DOCDIR}/${f}"
- mv html "${f%.zip}" || die
- done
- rm -f *.zip || die
- popd >/dev/null || die
- fi
-}
-
-src_configure() {
- sed -e "s|^\(BUILD_CFLAGS\s*=\).*$|\1 ${CFLAGS} -MD -fshort-wchar -fno-strict-aliasing -nostdlib -c -fPIC|" \
- -e "s|^\(BUILD_LFLAGS\s*=\).*$|\1 ${LDFLAGS}|" \
- -e "s|^\(BUILD_CXXFLAGS\s*=\).*$|\1 ${CXXFLAGS} -Wno-unused-result|" \
- -i "BaseTools/Source/C/Makefiles/header.makefile" \
- || die "Failed to update makefile header"
-}
-
-src_compile() {
- local make_flags=(
- BUILD_CC="$(tc-getBUILD_CC)"
- BUILD_CXX="$(tc-getBUILD_CXX)"
- BUILD_AS="$(tc-getBUILD_AS)"
- BUILD_AR="$(tc-getBUILD_AR)"
- BUILD_LD="$(tc-getBUILD_LD)"
- )
- # Base tools does not like parallel make
- emake "${make_flags[@]}" -j1 -C BaseTools
-
- # Update template parameter files
- sed -e "s|^\(ACTIVE_PLATFORM\s*=\).*$|\1 MdeModulePkg/MdeModulePkg.dsc|" \
- -e "s|^\(TARGET\s*=\).*$|\1 RELEASE|" \
- -e "s|^\(TARGET_ARCH\s*=\).*$|\1 ${EFIARCH}|" \
- -e "s|^\(TOOL_CHAIN_TAG\s*=\).*$|\1 ${TOOLCHAIN_TAG}|" \
- -e "s|^\(MAX_CONCURRENT_THREAD_NUMBER\s*=\).*$|\1 $(makeopts_jobs)|" \
- -i "BaseTools/Conf/target.template" || die "Failed to configure target file"
-
- # Clean unneeded files
- find . -name '*.bat' -o -name '*.exe' -exec rm -f {} \; || die
- find ./BaseTools/Source/C -mindepth 1 -maxdepth 1 \! -name 'bin' -exec rm -rf {} \; || die
-
- # Upsteam hack (symbolic link) should only be created if needed
- rm "${S}/EmulatorPkg/Unix/Host/X11IncludeHack" || die
-
- # Create workspace script file
- sed -e "s|{EDK_BASE}|${EPREFIX}/usr/lib/${P}|" \
- "${FILESDIR}"/udk-workspace.template \
- > "${T}/udk-workspace" || die "Failed to build udk-workspace"
-}
-
-src_install() {
- dobin "${T}/udk-workspace"
-
- # Use mkdir && cp here as doins does not preserve execution bits
- mkdir -p "${ED}/usr/lib/${P}" || die
- cp -pR "${S}"/* "${D}/usr/lib/${P}" || die
- dosym "${P}" "/usr/lib/${PN}"
-
- local HTML_DOCS
- use doc && HTML_DOCS=( "${DOCDIR}"/. )
- einstalldocs
-}
-
-pkg_postinst() {
- elog "To create a new workspace, execute:"
- elog " . udk-workspace [workspace_dir]"
- elog "You can link appropriate packages to your workspace. For example,"
- elog "in order to build MdeModulePkg and examples, you can try:"
- elog " ln -s \"${EROOT}/usr/lib/${P}/\"Mde{Module,}Pkg ."
- elog " build -a ${EFIARCH} all"
-}
diff --git a/sys-cluster/Manifest.gz b/sys-cluster/Manifest.gz
index 6226e8692664..59815d85d6e9 100644
Binary files a/sys-cluster/Manifest.gz and b/sys-cluster/Manifest.gz differ
diff --git a/sys-cluster/ceph/ceph-15.2.4-r3.ebuild b/sys-cluster/ceph/ceph-15.2.4-r3.ebuild
index d3903349156e..5a32d2f37876 100644
--- a/sys-cluster/ceph/ceph-15.2.4-r3.ebuild
+++ b/sys-cluster/ceph/ceph-15.2.4-r3.ebuild
@@ -199,6 +199,7 @@ PATCHES=(
"${FILESDIR}/ceph-15.2.3-spdk-compile.patch"
"${FILESDIR}/ceph-14.2.10-python-warnings.patch"
"${FILESDIR}/ceph-15.2.4-system-uring.patch"
+ "${FILESDIR}/ceph-15.2.5-glibc-2.32.patch"
)
check-reqs_export_vars() {
diff --git a/sys-cluster/ceph/ceph-15.2.5-r1.ebuild b/sys-cluster/ceph/ceph-15.2.5-r1.ebuild
index e86923bb2522..ace42c44650b 100644
--- a/sys-cluster/ceph/ceph-15.2.5-r1.ebuild
+++ b/sys-cluster/ceph/ceph-15.2.5-r1.ebuild
@@ -201,6 +201,7 @@ PATCHES=(
"${FILESDIR}/ceph-15.2.4-system-uring.patch"
"${FILESDIR}/ceph-15.2.5-missing-includes.patch"
"${FILESDIR}/ceph-15.2.5-systemd-unit-fix.patch"
+ "${FILESDIR}/ceph-15.2.5-glibc-2.32.patch"
)
check-reqs_export_vars() {
diff --git a/sys-cluster/ceph/files/ceph-15.2.5-glibc-2.32.patch b/sys-cluster/ceph/files/ceph-15.2.5-glibc-2.32.patch
new file mode 100644
index 000000000000..f8f7fad8b658
--- /dev/null
+++ b/sys-cluster/ceph/files/ceph-15.2.5-glibc-2.32.patch
@@ -0,0 +1,15 @@
+diff -NaurBwdp a/src/global/signal_handler.h src/global/b/signal_handler.h
+--- a/src/global/signal_handler.h 2020-10-01 03:15:48.208164979 +0700
++++ b/src/global/signal_handler.h 2020-10-01 03:15:40.655244081 +0700
+@@ -20,11 +20,7 @@
+
+ typedef void (*signal_handler_t)(int);
+
+-#ifndef HAVE_REENTRANT_STRSIGNAL
+-# define sig_str(signum) sys_siglist[signum]
+-#else
+ # define sig_str(signum) strsignal(signum)
+-#endif
+
+ void install_sighandler(int signum, signal_handler_t handler, int flags);
+
diff --git a/sys-cluster/cinder/Manifest b/sys-cluster/cinder/Manifest
index 0e53d42c82bc..823fc7f95ef5 100644
--- a/sys-cluster/cinder/Manifest
+++ b/sys-cluster/cinder/Manifest
@@ -1,3 +1,5 @@
DIST cinder-16.1.0.tar.gz 5445353 BLAKE2B f7e121845b5db3de191c8782577f680cbb93fd26087113bd0c322eed4b27cf071977763a3eacb933d7b8894b56aaf042a115c2dfd20be47f89c9d45f0556c34a SHA512 97fb157eac466d869a707cd05d287a309512952e8f8267b58123b9108eb1c2df66c8d0b799a3fb83087645a09e679b7c6eb24baa4a21b751a1ce35dbb5bd3f4a
+DIST cinder-16.2.0.tar.gz 5484918 BLAKE2B f2259dd21c060280e856c053bece8fd635f289d8100710b177105227a5ce3a4c4e380b49261671294cf85975c9f665646cefe5f9d66d873e1938a7d141156f4e SHA512 586057d49f9c94daaf163dacf979e62d18be7489b43eeedfa7caa4d23a4a6060f455eea7162020319187466f308d0480a3efb047d0b34ce013f1b5c632e30755
DIST cinder.conf.sample-16.1.0 183294 BLAKE2B 5d0f28b9ad200d912c42c34ca030a5ec3660c57db332677e1b66b314a2865187862c83baf78d122fc0af7f73fbf4f0c7f04b9253882d228dcb863bfc88e37e72 SHA512 faf712a3da37af05e642b3c14f98ce8d4e3db5b736b208d7ca8a18be02ac5626c94b4ed314bd0030d5fa3771b325ba0f24ec3a45188d27fd9de79c97b56e2626
+DIST cinder.conf.sample-16.2.0 183294 BLAKE2B 5d0f28b9ad200d912c42c34ca030a5ec3660c57db332677e1b66b314a2865187862c83baf78d122fc0af7f73fbf4f0c7f04b9253882d228dcb863bfc88e37e72 SHA512 faf712a3da37af05e642b3c14f98ce8d4e3db5b736b208d7ca8a18be02ac5626c94b4ed314bd0030d5fa3771b325ba0f24ec3a45188d27fd9de79c97b56e2626
DIST cinder.conf.sample-2020.1.9999 183294 BLAKE2B 5d0f28b9ad200d912c42c34ca030a5ec3660c57db332677e1b66b314a2865187862c83baf78d122fc0af7f73fbf4f0c7f04b9253882d228dcb863bfc88e37e72 SHA512 faf712a3da37af05e642b3c14f98ce8d4e3db5b736b208d7ca8a18be02ac5626c94b4ed314bd0030d5fa3771b325ba0f24ec3a45188d27fd9de79c97b56e2626
diff --git a/sys-cluster/cinder/cinder-16.2.0.ebuild b/sys-cluster/cinder/cinder-16.2.0.ebuild
new file mode 100644
index 000000000000..3065830afe0f
--- /dev/null
+++ b/sys-cluster/cinder/cinder-16.2.0.ebuild
@@ -0,0 +1,208 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_7 )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+inherit distutils-r1 eutils linux-info
+
+DESCRIPTION="Cinder is the OpenStack Block storage service, a spin out of nova-volumes"
+HOMEPAGE="https://launchpad.net/cinder"
+
+if [[ ${PV} == *9999 ]];then
+ inherit git-r3
+ SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/cinder/ussuri/cinder.conf.sample -> cinder.conf.sample-${PV}"
+ EGIT_REPO_URI="https://github.com/openstack/cinder.git"
+ EGIT_BRANCH="stable/ussuri"
+else
+ SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/cinder/ussuri/cinder.conf.sample -> cinder.conf.sample-${PV}
+ https://tarballs.openstack.org/${PN}/${P}.tar.gz"
+ KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="+api +scheduler +volume infiniband iscsi lvm mysql +memcached postgres rdma sqlite +tcp test +tgt"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="|| ( mysql postgres sqlite ) iscsi? ( tgt ) infiniband? ( rdma )"
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+ !~dev-python/pbr-2.1.0"
+DEPEND="${CDEPEND}
+ app-admin/sudo"
+
+# >=dev-python/oauth2client-1.5.0[${PYTHON_USEDEP}] # do not include, upstream depricated
+RDEPEND="
+ ${CDEPEND}
+ >=dev-python/decorator-3.4.0[${PYTHON_USEDEP}]
+ >=dev-python/defusedxml-0.5.0[${PYTHON_USEDEP}]
+ >=dev-python/eventlet-0.22.0[${PYTHON_USEDEP}]
+ !~dev-python/eventlet-0.23.0[${PYTHON_USEDEP}]
+ !~dev-python/eventlet-0.25.0[${PYTHON_USEDEP}]
+ >=dev-python/greenlet-0.4.1[${PYTHON_USEDEP}]
+ >=dev-python/httplib2-0.9.1[${PYTHON_USEDEP}]
+ >=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
+ >=dev-python/jsonschema-2.6.0[${PYTHON_USEDEP}]
+ >=dev-python/keystoneauth-3.7.0[${PYTHON_USEDEP}]
+ >=dev-python/keystonemiddleware-4.21.0[${PYTHON_USEDEP}]
+ >=dev-python/lxml-3.4.1[${PYTHON_USEDEP}]
+ !~dev-python/lxml-3.7.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-concurrency-3.26.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-context-2.19.2[${PYTHON_USEDEP}]
+ >=dev-python/oslo-db-4.35.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-messaging-6.4.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-middleware-3.31.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-policy-1.44.1[${PYTHON_USEDEP}]
+ >=dev-python/oslo-privsep-1.32.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-reports-1.18.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-rootwrap-5.8.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-serialization-2.18.0[${PYTHON_USEDEP}]
+ !~dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
+ >=dev-python/oslo-service-1.24.0[${PYTHON_USEDEP}]
+ !~dev-python/oslo-service-1.28.1[${PYTHON_USEDEP}]
+ >=dev-python/oslo-upgradecheck-0.1.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-utils-3.34.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-versionedobjects-1.31.2[${PYTHON_USEDEP}]
+ >=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}]
+ >=dev-python/paramiko-2.4.0[${PYTHON_USEDEP}]
+ >=dev-python/paste-2.0.2[${PYTHON_USEDEP}]
+ >=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
+ >=dev-python/psutil-3.2.2[${PYTHON_USEDEP}]
+ >=dev-python/pyparsing-2.1.0[${PYTHON_USEDEP}]
+ >=dev-python/python-barbicanclient-4.5.2[${PYTHON_USEDEP}]
+ >=dev-python/python-glanceclient-2.15.0[${PYTHON_USEDEP}]
+ >=dev-python/python-keystoneclient-3.15.0[${PYTHON_USEDEP}]
+ >=dev-python/python-novaclient-9.1.0[${PYTHON_USEDEP}]
+ >=dev-python/python-swiftclient-3.2.0[${PYTHON_USEDEP}]
+ >=dev-python/pytz-2013.6[${PYTHON_USEDEP}]
+ >=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
+ !~dev-python/requests-2.20.0[${PYTHON_USEDEP}]
+ >=dev-python/retrying-1.2.3[${PYTHON_USEDEP}]
+ !~dev-python/retrying-1.3.0[${PYTHON_USEDEP}]
+ >=dev-python/routes-2.3.1[${PYTHON_USEDEP}]
+ >=dev-python/taskflow-3.2.0[${PYTHON_USEDEP}]
+ >=dev-python/rtslib-fb-2.1.65[${PYTHON_USEDEP}]
+ >=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+ sqlite? (
+ >=dev-python/sqlalchemy-1.0.10[sqlite,${PYTHON_USEDEP}]
+ !~dev-python/sqlalchemy-1.1.5[sqlite,${PYTHON_USEDEP}]
+ !~dev-python/sqlalchemy-1.1.6[sqlite,${PYTHON_USEDEP}]
+ !~dev-python/sqlalchemy-1.1.7[sqlite,${PYTHON_USEDEP}]
+ !~dev-python/sqlalchemy-1.1.8[sqlite,${PYTHON_USEDEP}]
+ )
+ mysql? (
+ >=dev-python/pymysql-0.7.6[${PYTHON_USEDEP}]
+ !~dev-python/pymysql-0.7.7[${PYTHON_USEDEP}]
+ >=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
+ !~dev-python/sqlalchemy-1.1.5[${PYTHON_USEDEP}]
+ !~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}]
+ !~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}]
+ !~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}]
+ )
+ postgres? (
+ >=dev-python/psycopg-2.5.0[${PYTHON_USEDEP}]
+ >=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
+ !~dev-python/sqlalchemy-1.1.5[${PYTHON_USEDEP}]
+ !~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}]
+ !~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}]
+ !~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}]
+ )
+ >=dev-python/sqlalchemy-migrate-0.11.0[${PYTHON_USEDEP}]
+ >=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
+ >=dev-python/tabulate-0.8.5[${PYTHON_USEDEP}]
+ >=dev-python/webob-1.7.1[${PYTHON_USEDEP}]
+ >=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
+ >=dev-python/oslo-vmware-2.35.0[${PYTHON_USEDEP}]
+ >=dev-python/os-brick-2.2.0[${PYTHON_USEDEP}]
+ >=dev-python/os-win-3.0.0[${PYTHON_USEDEP}]
+ >=dev-python/tooz-1.58.0[${PYTHON_USEDEP}]
+ >=dev-python/google-api-python-client-1.4.2[${PYTHON_USEDEP}]
+ >=dev-python/castellan-0.16.0[${PYTHON_USEDEP}]
+ >=dev-python/cryptography-2.1[${PYTHON_USEDEP}]
+ >=dev-python/cursive-0.2.1[${PYTHON_USEDEP}]
+ iscsi? (
+ tgt? ( sys-block/tgt )
+ sys-block/open-iscsi
+ )
+ lvm? ( sys-fs/lvm2 )
+ memcached? ( net-misc/memcached )
+ app-emulation/qemu
+ sys-fs/sysfsutils
+ acct-user/cinder
+ acct-group/cinder"
+# qemu is needed for image conversion
+
+#PATCHES=(
+#)
+
+pkg_pretend() {
+ linux-info_pkg_setup
+ CONFIG_CHECK_MODULES=""
+ if use tcp; then
+ CONFIG_CHECK_MODULES+="SCSI_ISCSI_ATTRS ISCSI_TCP "
+ fi
+ if use rdma; then
+ CONFIG_CHECK_MODULES+="INFINIBAND_ISER "
+ fi
+ if use infiniband; then
+ CONFIG_CHECK_MODULES+="INFINIBAND_IPOIB INFINIBAND_USER_MAD INFINIBAND_USER_ACCESS"
+ fi
+ if linux_config_exists; then
+ for module in ${CONFIG_CHECK_MODULES}; do
+ linux_chkconfig_present ${module} || ewarn "${module} needs to be enabled"
+ done
+ fi
+}
+
+python_prepare_all() {
+ sed -i '/^hacking/d' test-requirements.txt || die
+ # only used for docs
+ sed -i '/^sphinx-feature-classification/d' requirements.txt || die
+ distutils-r1_python_prepare_all
+}
+
+python_test() {
+ # Let's track progress of this # https://bugs.launchpad.net/swift/+bug/1249727
+ nosetests -I test_wsgi.py cinder/tests/ || die "tests failed under python2.7"
+}
+
+python_install_all() {
+ distutils-r1_python_install_all
+ keepdir /etc/cinder
+ dodir /etc/cinder/rootwrap.d
+
+ for svc in api scheduler volume; do
+ newinitd "${FILESDIR}/cinder.initd" cinder-${svc}
+ done
+
+ insinto /etc/cinder
+ insopts -m0640 -o cinder -g cinder
+ doins "etc/cinder/api-httpd.conf"
+ doins "etc/cinder/logging_sample.conf"
+ doins "etc/cinder/rootwrap.conf"
+ doins "etc/cinder/api-paste.ini"
+ doins "etc/cinder/resource_filters.json"
+ newins "${DISTDIR}/cinder.conf.sample-${PV}" "cinder.conf.sample"
+ insinto /etc/cinder/rootwrap.d
+ doins "etc/cinder/rootwrap.d/volume.filters"
+
+ dodir /var/log/cinder
+ fowners cinder:cinder /var/log/cinder
+
+ #add sudoers definitions for user nova
+ insinto /etc/sudoers.d/
+ insopts -m 0440 -o root -g root
+ newins "${FILESDIR}/cinder.sudoersd" cinder
+ # stupid python
+ rm -r "${ED}"/usr/etc
+}
+
+pkg_postinst() {
+ if use iscsi ; then
+ elog "Cinder needs tgtd to be installed and running to work with iscsi"
+ elog "it also needs 'include /var/lib/cinder/volumes/*' in /etc/tgt/targets.conf"
+ fi
+}
diff --git a/sys-cluster/cinder/cinder-2020.1.9999.ebuild b/sys-cluster/cinder/cinder-2020.1.9999.ebuild
index a22eb94ab54d..3065830afe0f 100644
--- a/sys-cluster/cinder/cinder-2020.1.9999.ebuild
+++ b/sys-cluster/cinder/cinder-2020.1.9999.ebuild
@@ -4,6 +4,7 @@
EAPI=7
PYTHON_COMPAT=( python3_7 )
+DISTUTILS_USE_SETUPTOOLS=rdepend
inherit distutils-r1 eutils linux-info
DESCRIPTION="Cinder is the OpenStack Block storage service, a spin out of nova-volumes"
@@ -28,8 +29,7 @@ REQUIRED_USE="|| ( mysql postgres sqlite ) iscsi? ( tgt ) infiniband? ( rdma )"
CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
!~dev-python/pbr-2.1.0"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
- ${CDEPEND}
+DEPEND="${CDEPEND}
app-admin/sudo"
# >=dev-python/oauth2client-1.5.0[${PYTHON_USEDEP}] # do not include, upstream depricated
diff --git a/sys-cluster/pbs-python/Manifest b/sys-cluster/pbs-python/Manifest
deleted file mode 100644
index 78a5d39b3fd3..000000000000
--- a/sys-cluster/pbs-python/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST pbs_python-4.3.3.tar.gz 185442 BLAKE2B cfe72c5baba3476c019c662fb10c42b091f5ccdf21f36be6c077bf680de2b489972ad7c2c73d65cd44ce1593665337236e69c5381efdc71d48c957006b2eadaf SHA512 2a8c49d0be887cd7c5f9c17bd7ce679c7c04481c70e6949fd430007b7678c15636e8416fd30ac16d06cc387680bd4f9d3df8cad8be7b512b6fa2785891338044
diff --git a/sys-cluster/pbs-python/pbs-python-4.3.3-r1.ebuild b/sys-cluster/pbs-python/pbs-python-4.3.3-r1.ebuild
deleted file mode 100644
index d7f9338f422a..000000000000
--- a/sys-cluster/pbs-python/pbs-python-4.3.3-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-MY_P=${P/-/_}
-
-DESCRIPTION="Python bindings to the Torque C API"
-HOMEPAGE="https://subtrac.sara.nl/oss/pbs_python/"
-SRC_URI="ftp://ftp.sara.nl/pub/outgoing/${MY_P}.tar.gz"
-
-LICENSE="openpbs"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples"
-
-DEPEND="sys-cluster/torque"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-python_prepare_all() {
- sed -i -e "s/4.1.3/${PV}/" setup.py.in || die
- distutils-r1_python_prepare_all
-}
-
-python_configure_all() {
- econf
-}
-
-python_install_all() {
- distutils-r1_python_install_all
-
- if use examples; then
- insinto /usr/share/doc/${P}
- doins "${S}"/examples/*
- fi
-}
diff --git a/sys-cluster/spark-bin/Manifest b/sys-cluster/spark-bin/Manifest
index dea72c7a08bf..7d03ef33dd53 100644
--- a/sys-cluster/spark-bin/Manifest
+++ b/sys-cluster/spark-bin/Manifest
@@ -1 +1,2 @@
DIST spark-bin-2.4.6.tgz 233215067 BLAKE2B f2208a59822c98d90be3df95ffb7593ffe4faa74e233771b467732bfc3e01c65866488c74ee5f14c341790308537153f895f14f56beb0194a088a68b52f4fda1 SHA512 3a9f401eda9b5749cdafd246b1d14219229c26387017791c345a23a65782fb8b25a302bf4ac1ed7c16a1fe83108e94e55dad9639a51c751d81c8c0534a4a9641
+DIST spark-bin-3.0.1.tgz 219929956 BLAKE2B dd53df1e0123feae5b69f97193d1edc647bd4802ab78c54e471ed54b3ae6eee32ace51e379569f4947599d24aba5af63b401c11ef2af6234ffc6ac1afbbe275f SHA512 f4a10baec5b8ff1841f10651cac2c4aa39c162d3029ca180a9749149e6060805b5b5ddf9287b4aa321434810172f8cc0534943ac005531bb48b6622fbe228ddc
diff --git a/sys-cluster/spark-bin/spark-bin-3.0.1.ebuild b/sys-cluster/spark-bin/spark-bin-3.0.1.ebuild
new file mode 100644
index 000000000000..c178519a3a77
--- /dev/null
+++ b/sys-cluster/spark-bin/spark-bin-3.0.1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit java-pkg-2
+
+DESCRIPTION="Lightning-fast unified analytics engine"
+HOMEPAGE="https://spark.apache.org"
+SRC_URI="mirror://apache/spark/spark-${PV}/spark-${PV}-bin-hadoop2.7.tgz -> ${P}.tgz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+ >=virtual/jre-1.8"
+
+DEPEND="
+ >=virtual/jdk-1.8"
+
+S="${WORKDIR}/spark-${PV}-bin-hadoop2.7"
+
+DOCS=( LICENSE NOTICE README.md RELEASE )
+
+# Nothing to compile here.
+src_compile() { :; }
+
+src_install() {
+ dodir usr/lib/spark
+ into usr/lib/spark
+
+ dobin bin/beeline \
+ bin/find-spark-home \
+ bin/pyspark \
+ bin/spark-class \
+ bin/spark-shell \
+ bin/spark-sql \
+ bin/spark-submit
+
+ insinto usr/lib/spark/bin
+ doins bin/load-spark-env.sh
+
+ insinto usr/lib/spark
+ doins -r conf
+ doins -r jars
+ doins -r python
+ doins -r sbin
+ doins -r yarn
+
+ dosym ../lib/spark/bin/beeline /usr/bin/beeline
+ dosym ../lib/spark/bin/find-spark-home /usr/bin/find-spark-home
+ dosym ../lib/spark/bin/pyspark /usr/bin/pyspark
+ dosym ../lib/spark/bin/spark-class /usr/bin/spark-class
+ dosym ../lib/spark/bin/spark-shell /usr/bin/spark-shell
+ dosym ../lib/spark/bin/spark-sql /usr/bin/spark-sql
+ dosym ../lib/spark/bin/spark-submit /usr/bin/spark-submit
+
+ doenvd "${FILESDIR}"/99spark
+ einstalldocs
+}
diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index 07118b5042b0..d1a84207f519 100644
Binary files a/sys-devel/Manifest.gz and b/sys-devel/Manifest.gz differ
diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index 5ff615f8de94..13da2c5d6b91 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -1,5 +1,6 @@
DIST ecj-4.5.jar 1470676 BLAKE2B 793c10ba09fd8040c0e1181204141aea16780c9c9088e07126e00da2b510af2ad6f58d876357d7e98cbb02d783a3be434469d5de1df134ccb8cc508e45028d80 SHA512 d4e1bf7538ace56e3d69fa91da5bbd16c272923b4de0a9d8dee23ea2b75f9f38c603de72fc4061df49285c450b63f3df211cee5270e9fffc5447445d1a9c9e4e
DIST gcc-10.2.0-patches-2.tar.bz2 17701 BLAKE2B bed0cf2dcb6b2e35dbd86c43db617cfa0a0973b3d55bd6e12baf9e6495afd0fec855fefd223172c23f11449769996c18359abacfac36f62681310c861d5d2850 SHA512 6ebf5875ecc9f10dea67d4793fcc47178ddd6abe8959fc0390c6ff967fba7318013b4bf251abf451999b86697e97390c8698685b12086956c8e6bc2e97708bc9
+DIST gcc-10.2.0-patches-3.tar.bz2 22752 BLAKE2B 36880dff2b2f2266c7d971391be758a69b2bc452be664594f289f209b5e4f2c326abc38a4d958d81251ff29f8153182cdc759f76200ef34238dc0c27a6ae0879 SHA512 c441eeca05399f3f97f35e623b814b0091251f23756ed71e2842a49e9b8f17d2053e40c0787242da6c963d333834982786dc4ffffa2d249337d174344d15658e
DIST gcc-10.2.0.tar.xz 75004144 BLAKE2B 1d79397330354e61439283cac96a109bf78ffc726265442e6d3ec131f107589ab7349d6612836edd8c8512f7bcc1d901a65a0d5d925d28a5bf3ef5cc3f9787ee SHA512 42ae38928bd2e8183af445da34220964eb690b675b1892bbeb7cd5bb62be499011ec9a93397dba5e2fb681afadfc6f2767d03b9035b44ba9be807187ae6dc65e
DIST gcc-11.0.0-patches-4.tar.bz2 12829 BLAKE2B d0e12c09268e096390c3841e466e35bcd66a735536287c80d9713335a65a82c55ade728b487ed549ba1bfa60c9dd95bcad5ae27a86619f2a7c3236fdf457b41b SHA512 010b90b63ac142efeabc1c51287727f472a469a7a25e0576f5bdc380206cf500ae78060da3e97fa46c3fa7288e6cb1b4a2b7b78d7c8704b6db05a23be902e649
DIST gcc-4.4.3-specs-0.2.0.tar.bz2 2004 BLAKE2B 96f5ba2028bc6e0ef71e009857c37118a54d13d30de24d697c85e5772f9f2b7853615648cf2e4ee81d8385f6518c64588c0b56675c00f95ef39fca2a808f075e SHA512 779ecb0a064d2138b54569c8ae501975b8a6b72e5a3acbf8597619a8db77ee42ef9b0e62608d5192a15e4393e7dfc009bb50b994782236faa744b2c46b5fe517
diff --git a/sys-devel/gcc/gcc-10.2.0-r2.ebuild b/sys-devel/gcc/gcc-10.2.0-r2.ebuild
new file mode 100644
index 000000000000..f6a3a3adee19
--- /dev/null
+++ b/sys-devel/gcc/gcc-10.2.0-r2.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PATCH_VER="3"
+
+inherit toolchain
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND=""
+BDEPEND="${CATEGORY}/binutils"
+
+src_prepare() {
+ has_version '>=sys-libs/glibc-2.32-r1' && rm -v "${WORKDIR}/patch/23_all_disable-riscv32-ABIs.patch"
+ toolchain_src_prepare
+}
diff --git a/sys-firmware/Manifest.gz b/sys-firmware/Manifest.gz
index 3668460d06c4..e671916b592b 100644
Binary files a/sys-firmware/Manifest.gz and b/sys-firmware/Manifest.gz differ
diff --git a/sys-firmware/edk2-ovmf/Manifest b/sys-firmware/edk2-ovmf/Manifest
index fa1a6639d99f..bec7f6b201fe 100644
--- a/sys-firmware/edk2-ovmf/Manifest
+++ b/sys-firmware/edk2-ovmf/Manifest
@@ -1,3 +1,8 @@
+DIST brotli-666c3280cc11dc433c303d79a83d4ffbdd12cc8d.tar.gz 23855739 BLAKE2B 7406ec5b29ac66afbcd7c1376bb3208f298d19b6592b2869c52173aa64947d58bd443f9a61c67deaf046be910a0e31c0b843e5508e97e0e1f5e7bce100d86904 SHA512 df8e90562c4fd7f0e787949df6bc4f5a165b39bd333f442d27874fe65640fbba268f9350d7113e6761a5acceb66d78e75f1a296e5a89b94574edf28109cdc812
DIST edk2-ovmf-201905-bin.tar.xz 3017256 BLAKE2B 6a106f111a363f1c2de33c4e7eba48183da6047654512939c286c6d0369e3b4c7705c271e61fa95299ba2b629022be7b5ef665ff096d41373583f5409b5c32fb SHA512 4a174dc1d64769a93de3bf5f9d787e278bfab57e2317699d722aa772e64e8867b3998b7feee58d5e4c66adc79ba9c5023dae2ce786159db7a740b86cf35d923d
DIST edk2-ovmf-201905-bundled.tar.xz 3538508 BLAKE2B a1766180c84ee83987f50fdb6a6c9891dfb983ff78c98f7bc38635ffe484ebf29d4286ff97d7747080e28a655ff14b5939d4505d75ebe6655ecacc7f9d405469 SHA512 be3d8ef1ffb1ddce64883d9ef8dc598c7026d23d2e33c33949d28de81513b6a7f04f840ccb3d42664e918c6603487fbe594261c327921f3250c3998218572774
DIST edk2-ovmf-201905.tar.gz 14551747 BLAKE2B 6fb3385445fd01c0dea26295a68de2691524e55c96d8a0e85aab1385a9abddc47c13ce3236b952c1299514e542ad0fa4bc9550cc4527945c05109d227a698293 SHA512 91188923f7d1ab83c0d6abf7ec6d59f357d0341a617ad6a3ae05f3d0e041dff43f62b014b0c5fc5d15e16d8f1c279c581a5cd64b31e3d52b340d7ef90adb50f1
+DIST edk2-ovmf-202008-bin.tar.xz 3486024 BLAKE2B 8283db554ad7024e3a55b62ed0a560ed9f729d728f1dee3806814b1eb8d89dabc4fd70433f7f77656b65d9af7919d036074a53a95190a1aa8b65ab7d73495ffc SHA512 d0c8b249a7a2124e8bb63a4358466e86a3a837e76586565dd4762351998d8561374eabb8a1303dbf71ac269c15552d9e8cff71d65bc6fe8a3a81fb4fb032e0d8
+DIST edk2-ovmf-202008-qemu-firmware.tar.xz 680 BLAKE2B 176f8e94a3f605acc72850634cbf155619490f5998125521a392a8e9c7d2b78841b841f0cb5ea860f14645b124cf1921256bbe46960efbe3401805d89bbfbed6 SHA512 b72f248ab4d49503c3e8e686e22beb77f0e48d2c6c9523f389f20504e0c30fa11fa0fcb5607d7d5bb1ba2433894fa458864c5761335e39de4b2a40b01203f043
+DIST edk2-ovmf-202008.tar.gz 13172590 BLAKE2B 10acf77d0e70e21ca425ea41c0062f8cebe2cc607b93a2a253bcd87cea1546e791776a34d43fbf4f1040f4fc32e3ee413d44873d0f00b9e523816519cfed634e SHA512 c32340104f27b9b85f79e934cc9eeb739d47b01e13975c88f39b053e9bc5a1ecfe579ab3b63fc7747cc328e104b337b53d41deb4470c3f20dbbd5552173a4666
+DIST openssl-e2e09d9fba1187f8d6aafaa34d4172f56f1ffb72.tar.gz 9981169 BLAKE2B 33aac7364cdd45fec5654ab6caef84e1a829464380419c8a6bb311055c5a01c0aaff6e046a7c541a87e908fa9d26bae652f5be901461d03df36f2522f9c34b0c SHA512 db2087c04f0b428b3f4e1c8b3ac53cce69e0fd331ed2b86ba00facafd1685864d73f71c13eee48f4fe0af2bddad848f84a2b8ed2a17fabdf7fa2ed7d9eb39371
diff --git a/sys-firmware/edk2-ovmf/edk2-ovmf-201905.ebuild b/sys-firmware/edk2-ovmf/edk2-ovmf-201905.ebuild
index 4a71ef4068c3..0ce07a1b4456 100644
--- a/sys-firmware/edk2-ovmf/edk2-ovmf-201905.ebuild
+++ b/sys-firmware/edk2-ovmf/edk2-ovmf-201905.ebuild
@@ -96,6 +96,11 @@ pkg_setup() {
}
src_prepare() {
+ if ! use binary; then
+ sed -i -r \
+ -e "/function SetupPython3/,/\}/{s,\\\$\(whereis python3\),${EPYTHON},g}" \
+ "${S}"/edksetup.sh || die "Fixing for correct Python3 support failed"
+ fi
if [[ ${PV} != "999999" ]] && use binary; then
eapply_user
return
diff --git a/sys-firmware/edk2-ovmf/edk2-ovmf-202008.ebuild b/sys-firmware/edk2-ovmf/edk2-ovmf-202008.ebuild
new file mode 100644
index 000000000000..bd9480eb4736
--- /dev/null
+++ b/sys-firmware/edk2-ovmf/edk2-ovmf-202008.ebuild
@@ -0,0 +1,186 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_REQ_USE="sqlite"
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+
+inherit eutils python-any-r1 readme.gentoo-r1
+
+DESCRIPTION="UEFI firmware for 64-bit x86 virtual machines"
+HOMEPAGE="https://github.com/tianocore/edk2"
+
+NON_BINARY_DEPEND="
+ app-emulation/qemu
+ >=dev-lang/nasm-2.0.7
+ >=sys-power/iasl-20160729
+ ${PYTHON_DEPS}
+"
+DEPEND=""
+RDEPEND=""
+if [[ ${PV} == "999999" ]] ; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/tianocore/edk2"
+ DEPEND+="
+ ${NON_BINARY_DEPEND}
+ "
+else
+ BUNDLED_OPENSSL_SUBMODULE_SHA="e2e09d9fba1187f8d6aafaa34d4172f56f1ffb72"
+ BUNDLED_BROTLI_SUBMODULE_SHA="666c3280cc11dc433c303d79a83d4ffbdd12cc8d"
+ # Binary versions taken from fedora:
+ # http://download.fedoraproject.org/pub/fedora/linux/development/rawhide/Everything/x86_64/os/Packages/e/
+ # edk2-ovmf-20200801stable-1.fc34.noarch.rpm
+
+ # TODO: talk with tamiko about unbundling
+ SRC_URI="
+ !binary? (
+ https://github.com/tianocore/edk2/archive/edk2-stable${PV}.tar.gz -> ${P}.tar.gz
+ https://github.com/openssl/openssl/archive/${BUNDLED_OPENSSL_SUBMODULE_SHA}.tar.gz -> openssl-${BUNDLED_OPENSSL_SUBMODULE_SHA}.tar.gz
+ https://github.com/google/brotli/archive/${BUNDLED_BROTLI_SUBMODULE_SHA}.tar.gz -> brotli-${BUNDLED_BROTLI_SUBMODULE_SHA}.tar.gz
+ )
+ binary? ( https://dev.gentoo.org/~mva/distfiles/${P}-bin.tar.xz )
+ https://dev.gentoo.org/~mva/distfiles/${P}-qemu-firmware.tar.xz
+ "
+ KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+ IUSE="+binary"
+ REQUIRED_USE+="
+ !amd64? ( binary )
+ "
+ DEPEND+="
+ !binary? (
+ amd64? (
+ ${NON_BINARY_DEPEND}
+ )
+ )"
+ PATCHES=(
+ )
+fi
+
+LICENSE="BSD-2 MIT"
+SLOT="0"
+
+S="${WORKDIR}/edk2-edk2-stable${PV}"
+
+DISABLE_AUTOFORMATTING=true
+DOC_CONTENTS="This package contains the tianocore edk2 UEFI firmware for 64-bit x86
+virtual machines. The firmware is located under
+ /usr/share/edk2-ovmf/OVMF_CODE.fd
+ /usr/share/edk2-ovmf/OVMF_VARS.fd
+ /usr/share/edk2-ovmf/OVMF_CODE.secboot.fd
+
+If USE=binary is enabled, we also install an OVMF variables file (coming from
+fedora) that contains secureboot default keys
+
+ /usr/share/edk2-ovmf/OVMF_VARS.secboot.fd
+
+If you have compiled this package by hand, you need to either populate all
+necessary EFI variables by hand by booting
+ /usr/share/edk2-ovmf/UefiShell.(iso|img)
+or creating OVMF_VARS.secboot.fd by hand:
+ https://github.com/puiterwijk/qemu-ovmf-secureboot
+
+The firmware does not support csm (due to no free csm implementation
+available). If you need a firmware with csm support you have to download
+one for yourself. Firmware blobs are commonly labeled
+ OVMF{,_CODE,_VARS}-with-csm.fd
+
+In order to use the firmware you can run qemu the following way
+
+ $ qemu-system-x86_64 \
+ -drive file=/usr/share/edk2-ovmf/OVMF.fd,if=pflash,format=raw,unit=0,readonly=on \
+ ...
+
+You can register the firmware for use in libvirt by adding to /etc/libvirt/qemu.conf:
+ nvram = [
+ \"/usr/share/edk2-ovmf/OVMF_CODE.fd:/usr/share/edk2-ovmf/OVMF_VARS.fd\"
+ \"/usr/share/edk2-ovmf/OVMF_CODE.secboot.fd:/usr/share/edk2-ovmf/OVMF_VARS.fd\"
+ ]"
+
+pkg_setup() {
+ [[ ${PV} != "999999" ]] && use binary || python-any-r1_pkg_setup
+}
+
+src_prepare() {
+ if ! use binary; then
+ sed -i -r \
+ -e "/function SetupPython3/,/\}/{s,\\\$\(whereis python3\),${EPYTHON},g}" \
+ "${S}"/edksetup.sh || die "Fixing for correct Python3 support failed"
+ fi
+ if [[ ${PV} != "999999" ]]; then
+ if use binary; then
+ eapply_user
+ return
+ else
+ # Bundled submodules
+ cp -rl "${WORKDIR}/openssl-${BUNDLED_OPENSSL_SUBMODULE_SHA}"/* "CryptoPkg/Library/OpensslLib/openssl/"
+ cp -rl "${WORKDIR}/brotli-${BUNDLED_BROTLI_SUBMODULE_SHA}"/* "BaseTools/Source/C/BrotliCompress/brotli/"
+ cp -rl "${WORKDIR}/brotli-${BUNDLED_BROTLI_SUBMODULE_SHA}"/* "MdeModulePkg/Library/BrotliCustomDecompressLib/brotli/"
+ fi
+ fi
+ default
+}
+
+src_compile() {
+ TARGET_ARCH=X64
+ TARGET_NAME=RELEASE
+ TARGET_TOOLS=GCC49
+
+ BUILD_FLAGS="-D TLS_ENABLE \
+ -D HTTP_BOOT_ENABLE \
+ -D NETWORK_IP6_ENABLE \
+ -D FD_SIZE_2MB"
+
+ SECUREBOOT_BUILD_FLAGS="${BUILD_FLAGS} \
+ -D SECURE_BOOT_ENABLE \
+ -D SMM_REQUIRE \
+ -D EXCLUDE_SHELL_FROM_FD"
+
+ [[ ${PV} != "999999" ]] && use binary && return
+
+ emake ARCH=${TARGET_ARCH} -C BaseTools
+
+ . ./edksetup.sh
+
+ # Build all EFI firmware blobs:
+
+ mkdir -p ovmf
+
+ ./OvmfPkg/build.sh \
+ -a "${TARGET_ARCH}" -b "${TARGET_NAME}" -t "${TARGET_TOOLS}" \
+ ${BUILD_FLAGS} || die "OvmfPkg/build.sh failed"
+
+ cp Build/OvmfX64/*/FV/OVMF_*.fd ovmf/
+ rm -rf Build/OvmfX64
+
+ ./OvmfPkg/build.sh \
+ -a "${TARGET_ARCH}" -b "${TARGET_NAME}" -t "${TARGET_TOOLS}" \
+ ${SECUREBOOT_BUILD_FLAGS} || die "OvmfPkg/build.sh failed"
+
+ cp Build/OvmfX64/*/FV/OVMF_CODE.fd ovmf/OVMF_CODE.secboot.fd || die "cp failed"
+ cp Build/OvmfX64/*/X64/Shell.efi ovmf/ || die "cp failed"
+ cp Build/OvmfX64/*/X64/EnrollDefaultKeys.efi ovmf || die "cp failed"
+
+ # Build a convenience UefiShell.img:
+
+ mkdir -p iso_image/efi/boot || die "mkdir failed"
+ cp ovmf/Shell.efi iso_image/efi/boot/bootx64.efi || die "cp failed"
+ cp ovmf/EnrollDefaultKeys.efi iso_image || die "cp failed"
+ qemu-img convert --image-opts \
+ driver=vvfat,floppy=on,fat-type=12,label=UEFI_SHELL,dir=iso_image \
+ ovmf/UefiShell.img || die "qemu-img failed"
+}
+
+src_install() {
+ insinto /usr/share/${PN}
+ doins ovmf/*
+
+ insinto /usr/share/qemu/firmware
+ doins qemu/*
+
+ readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+ readme.gentoo_print_elog
+}
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index 00896c06c9ba..8553950ea6ac 100644
Binary files a/sys-fs/Manifest.gz and b/sys-fs/Manifest.gz differ
diff --git a/sys-fs/udev-init-scripts/udev-init-scripts-34.ebuild b/sys-fs/udev-init-scripts/udev-init-scripts-34.ebuild
index d4241aea076d..ac42fd3ce1d0 100644
--- a/sys-fs/udev-init-scripts/udev-init-scripts-34.ebuild
+++ b/sys-fs/udev-init-scripts/udev-init-scripts-34.ebuild
@@ -11,7 +11,7 @@ if [ "${PV}" = "9999" ]; then
else
SRC_URI="https://gitweb.gentoo.org/proj/${OLD_PN}.git/snapshot/${OLD_P}.tar.gz -> ${P}.tar.gz"
S="${WORKDIR}/${OLD_P}"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
fi
DESCRIPTION="udev startup scripts for openrc"
diff --git a/sys-fs/zfs-kmod/Manifest b/sys-fs/zfs-kmod/Manifest
index fcbe351955d6..e3ff6c2eec99 100644
--- a/sys-fs/zfs-kmod/Manifest
+++ b/sys-fs/zfs-kmod/Manifest
@@ -1,2 +1,3 @@
DIST zfs-0.8.4.tar.gz 9285838 BLAKE2B 776bcd6dfab8825c07d315085e288b29bf543d6957325d5d566b7b78c04505dde9bd25eb6684cb4a1b6a657de8a4e1290d04d2b9079d26d6b834a70f1ec3b569 SHA512 9086dc6a6262dd93ca6ec43f1b4c2e5c804deba708c8a7460b8531aa4802b0bf8cac0917a1a00e6af2e96d4a21cd68b85e226bf571bd94041d0325c457106eb1
DIST zfs-2.0.0-rc2.tar.gz 12854085 BLAKE2B 73cabd565c11eef1bebbc391f8c4ba18acd1610f98f1b8afb507bc844f4b6a64ba32d9727e634c7f26c48fe365a841bf071513df234b9b7a87e954610a6d7f3b SHA512 14b17d06124890efef15b3b073e103c9faeecaea761779fff9a8420e3ab72fa611df9875fa766a323d69646e9025f8b19f918ded4c6705af116cf9f14eea4f40
+DIST zfs-2.0.0-rc3.tar.gz 12860212 BLAKE2B bd29ceb17938180ffda9a26cfee97f4b9b42752cd7a3bf5d72705d94967d219889cc84a71d4c0f59aaf718d596011ecdbf07000788aa39a424087eb7cf62a944 SHA512 c09bebb1d1b19079b51305eea1b3d1a428a46bf1301afc9dfa20871ac670d94dc9f7f9127384b2db501fd909f22a16fad0c1b7383eb9ce31a7c0e696e66a097f
diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.0.0_rc3.ebuild b/sys-fs/zfs-kmod/zfs-kmod-2.0.0_rc3.ebuild
new file mode 100644
index 000000000000..689dcbc44941
--- /dev/null
+++ b/sys-fs/zfs-kmod/zfs-kmod-2.0.0_rc3.ebuild
@@ -0,0 +1,175 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic linux-mod toolchain-funcs
+
+DESCRIPTION="Linux ZFS kernel module for sys-fs/zfs"
+HOMEPAGE="https://github.com/openzfs/zfs"
+
+if [[ ${PV} == "9999" ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/openzfs/zfs.git"
+else
+ MY_PV="${PV/_rc/-rc}"
+ SRC_URI="https://github.com/openzfs/zfs/releases/download/zfs-${MY_PV}/zfs-${MY_PV}.tar.gz"
+ KEYWORDS="~amd64 ~arm64 ~ppc64"
+ S="${WORKDIR}/zfs-${PV%_rc?}"
+ ZFS_KERNEL_COMPAT="5.8"
+fi
+
+LICENSE="CDDL debug? ( GPL-2+ )"
+SLOT="0"
+IUSE="custom-cflags debug +rootfs"
+
+DEPEND=""
+
+RDEPEND="${DEPEND}
+ !sys-kernel/spl
+"
+
+BDEPEND="
+ dev-lang/perl
+ virtual/awk
+"
+
+RESTRICT="debug? ( strip ) test"
+
+DOCS=( AUTHORS COPYRIGHT META README.md )
+
+pkg_setup() {
+ CONFIG_CHECK="
+ !DEBUG_LOCK_ALLOC
+ EFI_PARTITION
+ MODULES
+ !PAX_KERNEXEC_PLUGIN_METHOD_OR
+ !TRIM_UNUSED_KSYMS
+ ZLIB_DEFLATE
+ ZLIB_INFLATE
+ "
+
+ use debug && CONFIG_CHECK="${CONFIG_CHECK}
+ FRAME_POINTER
+ DEBUG_INFO
+ !DEBUG_INFO_REDUCED
+ "
+
+ use rootfs && \
+ CONFIG_CHECK="${CONFIG_CHECK}
+ BLK_DEV_INITRD
+ DEVTMPFS
+ "
+
+ kernel_is -lt 5 && CONFIG_CHECK="${CONFIG_CHECK} IOSCHED_NOOP"
+
+ if [[ ${PV} != "9999" ]]; then
+ local kv_major_max kv_minor_max zcompat
+ zcompat="${ZFS_KERNEL_COMPAT_OVERRIDE:-${ZFS_KERNEL_COMPAT}}"
+ kv_major_max="${zcompat%%.*}"
+ zcompat="${zcompat#*.}"
+ kv_minor_max="${zcompat%%.*}"
+ kernel_is -le "${kv_major_max}" "${kv_minor_max}" || die \
+ "Linux ${kv_major_max}.${kv_minor_max} is the latest supported version"
+
+ fi
+
+ kernel_is -ge 3 10 || die "Linux 3.10 or newer required"
+
+ linux-mod_pkg_setup
+}
+
+src_prepare() {
+ default
+
+ if [[ ${PV} == "9999" ]]; then
+ eautoreconf
+ else
+ # Set module revision number
+ sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" META || die "Could not set Gentoo release"
+ fi
+}
+
+src_configure() {
+ set_arch_to_kernel
+
+ use custom-cflags || strip-flags
+
+ filter-ldflags -Wl,*
+
+ local myconf=(
+ CROSS_COMPILE="${CHOST}-"
+ HOSTCC="$(tc-getBUILD_CC)"
+ --bindir="${EPREFIX}/bin"
+ --sbindir="${EPREFIX}/sbin"
+ --with-config=kernel
+ --with-linux="${KV_DIR}"
+ --with-linux-obj="${KV_OUT_DIR}"
+ $(use_enable debug)
+ )
+
+ econf "${myconf[@]}"
+}
+
+src_compile() {
+ set_arch_to_kernel
+
+ myemakeargs=(
+ CROSS_COMPILE="${CHOST}-"
+ HOSTCC="$(tc-getBUILD_CC)"
+ V=1
+ )
+
+ emake "${myemakeargs[@]}"
+}
+
+src_install() {
+ set_arch_to_kernel
+
+ myemakeargs+=(
+ DEPMOD="/bin/true"
+ DESTDIR="${D}"
+ INSTALL_MOD_PATH="${INSTALL_MOD_PATH:-$EROOT}"
+ )
+
+ emake "${myemakeargs[@]}" install
+
+ einstalldocs
+}
+
+pkg_postinst() {
+ linux-mod_pkg_postinst
+
+ # Remove old modules
+ if [[ -d "${EROOT}/lib/modules/${KV_FULL}/addon/zfs" ]]; then
+ ewarn "${PN} now installs modules in ${EROOT}/lib/modules/${KV_FULL}/extra/zfs"
+ ewarn "Old modules were detected in ${EROOT}/lib/modules/${KV_FULL}/addon/zfs"
+ ewarn "Automatically removing old modules to avoid problems."
+ rm -r "${EROOT}/lib/modules/${KV_FULL}/addon/zfs" || die "Cannot remove modules"
+ rmdir --ignore-fail-on-non-empty "${EROOT}/lib/modules/${KV_FULL}/addon"
+ fi
+
+ if use x86 || use arm; then
+ ewarn "32-bit kernels will likely require increasing vmalloc to"
+ ewarn "at least 256M and decreasing zfs_arc_max to some value less than that."
+ fi
+
+ ewarn "This version of OpenZFS includes support for new feature flags"
+ ewarn "that are incompatible with previous versions. GRUB2 support for"
+ ewarn "/boot with the new feature flags is not yet available."
+ ewarn "Do *NOT* upgrade root pools to use the new feature flags."
+ ewarn "Any new pools will be created with the new feature flags by default"
+ ewarn "and will not be compatible with older versions of ZFSOnLinux. To"
+ ewarn "create a newpool that is backward compatible wih GRUB2, use "
+ ewarn
+ ewarn "zpool create -d -o feature@async_destroy=enabled "
+ ewarn " -o feature@empty_bpobj=enabled -o feature@lz4_compress=enabled"
+ ewarn " -o feature@spacemap_histogram=enabled"
+ ewarn " -o feature@enabled_txg=enabled "
+ ewarn " -o feature@extensible_dataset=enabled -o feature@bookmarks=enabled"
+ ewarn " ..."
+ ewarn
+ ewarn "GRUB2 support will be updated as soon as either the GRUB2"
+ ewarn "developers do a tag or the Gentoo developers find time to backport"
+ ewarn "support from GRUB2 HEAD."
+}
diff --git a/sys-fs/zfs/Manifest b/sys-fs/zfs/Manifest
index fcbe351955d6..e3ff6c2eec99 100644
--- a/sys-fs/zfs/Manifest
+++ b/sys-fs/zfs/Manifest
@@ -1,2 +1,3 @@
DIST zfs-0.8.4.tar.gz 9285838 BLAKE2B 776bcd6dfab8825c07d315085e288b29bf543d6957325d5d566b7b78c04505dde9bd25eb6684cb4a1b6a657de8a4e1290d04d2b9079d26d6b834a70f1ec3b569 SHA512 9086dc6a6262dd93ca6ec43f1b4c2e5c804deba708c8a7460b8531aa4802b0bf8cac0917a1a00e6af2e96d4a21cd68b85e226bf571bd94041d0325c457106eb1
DIST zfs-2.0.0-rc2.tar.gz 12854085 BLAKE2B 73cabd565c11eef1bebbc391f8c4ba18acd1610f98f1b8afb507bc844f4b6a64ba32d9727e634c7f26c48fe365a841bf071513df234b9b7a87e954610a6d7f3b SHA512 14b17d06124890efef15b3b073e103c9faeecaea761779fff9a8420e3ab72fa611df9875fa766a323d69646e9025f8b19f918ded4c6705af116cf9f14eea4f40
+DIST zfs-2.0.0-rc3.tar.gz 12860212 BLAKE2B bd29ceb17938180ffda9a26cfee97f4b9b42752cd7a3bf5d72705d94967d219889cc84a71d4c0f59aaf718d596011ecdbf07000788aa39a424087eb7cf62a944 SHA512 c09bebb1d1b19079b51305eea1b3d1a428a46bf1301afc9dfa20871ac670d94dc9f7f9127384b2db501fd909f22a16fad0c1b7383eb9ce31a7c0e696e66a097f
diff --git a/sys-fs/zfs/zfs-2.0.0_rc3.ebuild b/sys-fs/zfs/zfs-2.0.0_rc3.ebuild
new file mode 100644
index 000000000000..a82918b501fb
--- /dev/null
+++ b/sys-fs/zfs/zfs-2.0.0_rc3.ebuild
@@ -0,0 +1,229 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_OPTIONAL=1
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+
+inherit autotools bash-completion-r1 distutils-r1 flag-o-matic linux-info pam systemd toolchain-funcs udev usr-ldscript
+
+DESCRIPTION="Userland utilities for ZFS Linux kernel module"
+HOMEPAGE="https://github.com/openzfs/zfs"
+
+if [[ ${PV} == "9999" ]] ; then
+ inherit git-r3 linux-mod
+ EGIT_REPO_URI="https://github.com/openzfs/zfs.git"
+else
+ MY_P="${P/_rc/-rc}"
+ SRC_URI="https://github.com/openzfs/${PN}/releases/download/${MY_P}/${MY_P}.tar.gz"
+ KEYWORDS="~amd64 ~arm64 ~ppc64"
+ S="${WORKDIR}/${P%_rc?}"
+fi
+
+LICENSE="BSD-2 CDDL MIT"
+SLOT="0"
+IUSE="custom-cflags debug kernel-builtin libressl minimal nls pam python +rootfs test-suite static-libs"
+
+DEPEND="
+ net-libs/libtirpc[static-libs?]
+ sys-apps/util-linux[static-libs?]
+ sys-libs/zlib[static-libs(+)?]
+ virtual/awk
+ virtual/libudev[static-libs(-)?]
+ libressl? ( dev-libs/libressl:0=[static-libs?] )
+ !libressl? ( dev-libs/openssl:0=[static-libs?] )
+ !minimal? ( ${PYTHON_DEPS} )
+ pam? ( sys-libs/pam )
+ python? (
+ virtual/python-cffi[${PYTHON_USEDEP}]
+ )
+"
+
+BDEPEND="virtual/awk
+ virtual/pkgconfig
+ nls? ( sys-devel/gettext )
+ python? (
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ )
+"
+
+RDEPEND="${DEPEND}
+ !kernel-builtin? ( ~sys-fs/zfs-kmod-${PV} )
+ !prefix? ( virtual/udev )
+ sys-fs/udev-init-scripts
+ rootfs? (
+ app-arch/cpio
+ app-misc/pax-utils
+ !"
+ eerror " Block devices --->"
+ eerror " [X] Loopback device support"
+ fi
+ fi
+ fi
+ fi
+}
+
+src_prepare() {
+ default
+
+ if [[ ${PV} == "9999" ]]; then
+ eautoreconf
+ else
+ # Set revision number
+ sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" META || die "Could not set Gentoo release"
+ fi
+
+ if use python; then
+ pushd contrib/pyzfs >/dev/null || die
+ distutils-r1_src_prepare
+ popd >/dev/null || die
+ fi
+
+ # prevent errors showing up on zfs-mount stop, #647688
+ # openrc will unmount all filesystems anyway.
+ sed -i "/^ZFS_UNMOUNT=/ s/yes/no/" "etc/default/zfs.in" || die
+}
+
+src_configure() {
+ use custom-cflags || strip-flags
+ use minimal || python_setup
+
+ local myconf=(
+ --bindir="${EPREFIX}/bin"
+ --enable-shared
+ --enable-systemd
+ --enable-sysvinit
+ --localstatedir="${EPREFIX}/var"
+ --sbindir="${EPREFIX}/sbin"
+ --with-config=user
+ --with-dracutdir="${EPREFIX}/usr/lib/dracut"
+ --with-linux="${KV_DIR}"
+ --with-linux-obj="${KV_OUT_DIR}"
+ --with-udevdir="$(get_udevdir)"
+ --with-pamconfigsdir="${EPREFIX}/unwanted_files"
+ --with-pammoduledir="$(getpam_mod_dir)"
+ --with-systemdunitdir="$(systemd_get_systemunitdir)"
+ --with-systemdpresetdir="${EPREFIX}/lib/systemd/system-preset"
+ --with-vendor=gentoo
+ $(use_enable debug)
+ $(use_enable nls)
+ $(use_enable pam)
+ $(use_enable python pyzfs)
+ $(use_enable static-libs static)
+ $(usex minimal --without-python --with-python="${EPYTHON}")
+ )
+
+ econf "${myconf[@]}"
+}
+
+src_compile() {
+ default
+ if use python; then
+ pushd contrib/pyzfs >/dev/null || die
+ distutils-r1_src_compile
+ popd >/dev/null || die
+ fi
+}
+
+src_install() {
+ default
+
+ gen_usr_ldscript -a uutil nvpair zpool zfs zfs_core
+
+ use pam && { rm -rv "${ED}/unwanted_files" || die ; }
+
+ use test-suite || { rm -r "${ED}/usr/share/zfs" || die ; }
+
+ if ! use static-libs; then
+ find "${ED}/" -name '*.la' -delete || die
+ fi
+
+ dobashcomp contrib/bash_completion.d/zfs
+ bashcomp_alias zfs zpool
+
+ # strip executable bit from conf.d file
+ fperms 0644 /etc/conf.d/zfs
+
+ if use python; then
+ pushd contrib/pyzfs >/dev/null || die
+ distutils-r1_src_install
+ popd >/dev/null || die
+ fi
+
+ # enforce best available python implementation
+ use minimal || python_fix_shebang "${ED}/bin"
+}
+
+pkg_postinst() {
+ if use rootfs; then
+ if ! has_version sys-kernel/genkernel && ! has_version sys-kernel/dracut; then
+ elog "root on zfs requires initramfs to boot"
+ elog "the following packages known to provide one and tested on regular basis:"
+ elog " sys-kernel/dracut"
+ elog " sys-kernel/genkernel"
+ fi
+ fi
+
+ if ! use kernel-builtin && [[ ${PV} = "9999" ]]; then
+ einfo "Adding ${P} to the module database to ensure that the"
+ einfo "kernel modules and userland utilities stay in sync."
+ update_moduledb
+ fi
+
+ if systemd_is_booted || has_version sys-apps/systemd; then
+ einfo "Please refer to ${EROOT}/lib/systemd/system-preset/50-zfs.preset"
+ einfo "for default zfs systemd service configuration"
+ else
+ [[ -e "${EROOT}/etc/runlevels/boot/zfs-import" ]] || \
+ einfo "You should add zfs-import to the boot runlevel."
+ [[ -e "${EROOT}/etc/runlevels/boot/zfs-mount" ]]|| \
+ einfo "You should add zfs-mount to the boot runlevel."
+ [[ -e "${EROOT}/etc/runlevels/default/zfs-share" ]] || \
+ einfo "You should add zfs-share to the default runlevel."
+ [[ -e "${EROOT}/etc/runlevels/default/zfs-zed" ]] || \
+ einfo "You should add zfs-zed to the default runlevel."
+ fi
+}
+
+pkg_postrm() {
+ if ! use kernel-builtin && [[ ${PV} == "9999" ]]; then
+ remove_moduledb
+ fi
+}
diff --git a/sys-fs/zfs/zfs-9999.ebuild b/sys-fs/zfs/zfs-9999.ebuild
index d2f00419b0c7..a82918b501fb 100644
--- a/sys-fs/zfs/zfs-9999.ebuild
+++ b/sys-fs/zfs/zfs-9999.ebuild
@@ -4,7 +4,7 @@
EAPI=7
DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
inherit autotools bash-completion-r1 distutils-r1 flag-o-matic linux-info pam systemd toolchain-funcs udev usr-ldscript
diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index 6ff00303377d..a1191c90a30e 100644
Binary files a/sys-kernel/Manifest.gz and b/sys-kernel/Manifest.gz differ
diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index a09321b3f584..f895bbdfdcf8 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -7,6 +7,12 @@ DIST gentoo-kernel-5.4.66-1.x86.xpak 53349561 BLAKE2B bac28002f62d4974acd09df425
DIST gentoo-kernel-5.4.68-1.amd64.xpak 61493744 BLAKE2B 3f1797046b421bd1b374e1bfda0cf407a3b13de8d222adbed33bf5d6d3dcb7fce30bc29d823ed34d854701535dbf7e211f3e60022ae8a2da2d52c511af3938d3 SHA512 b7fda56c7d43a962c964acad088a32a763e1fca468fee4b78503c7cf4a75790e3e0d6fb24abbab52d2b8ffb8faf243bfa57f061902755ac08402072409ed3cd9
DIST gentoo-kernel-5.4.68-1.arm64.xpak 56462206 BLAKE2B 75e9b787a0b87d82adeb319501ac03bfa5409086dc6729f18f5bfa1eb0bf101774791ac99ca8949618e4c6185152f325a227875d7284d018ffb027cf31995a7f SHA512 5198cee93955e87ffd654c68e60bebb512f9488531d0b26fd769a2ad8c172fa6c54e0c9119074227f7a04352761036228f52f293037051f344df88bed0c4f624
DIST gentoo-kernel-5.4.68-1.x86.xpak 53358098 BLAKE2B 6a35264a7514c1daa61e590d64c1400a298b602bfe5ef09c4a1f00ad8f5da1e10e6446152b69dd9e6d0eda6d5976d9a225a257efda9a6efb24928909816e9630 SHA512 f0c8ca982dbf382fff4642ffcad6f2bd295a605d7169eec8a2c5c434b663c6030e2679526dae59be30c18ac64bc1842a0e95dd31d604fb7b311a4498fea12999
+DIST gentoo-kernel-5.4.69-1.amd64.xpak 61508476 BLAKE2B 979ca44a37cd0b7ee74f54cf505d9c77b057b52c88a6e66b340d815d534f5ee3fe3f8b569df480a0f8ea8e3ee661050ffd5bd69d4e8f447e9dbc63a99e3b1635 SHA512 68d37ae909449b7019161baccf7debf8452bb62a38a573837ed74a050141ef59bc1a635ab9b62e3d34679a6e641b41592c53d569d1a2cf063f0f87315e3d9de8
+DIST gentoo-kernel-5.4.69-1.arm64.xpak 56454811 BLAKE2B 282577ea53a68934f2b68eba46cfc788e5923fdad705300ed8f8968ee333078b20241544415d203686d268e14d57bb3f9bb72806e001d694b61c56c97b55bedc SHA512 77f323c643055253b5ee2b43ce74e26a7edf8371101b0c7f5d9aa3bf68e4bb4d9a9ce3d64d1f5e4d41d6858b9ed079ecd5329028892ce20cc872509ecea5a884
+DIST gentoo-kernel-5.4.69-1.x86.xpak 53415445 BLAKE2B 33a82ca465c271eb497d929bc71b2400dfd6551937aee3af860b503fbdacec12c44a6da40cf55e94a00dcb09a544a34da8472eca9e0bd627e596ac9266da1ea0 SHA512 f5466dbb14e0b523e42592cd69bfaefdb93ad6be74d318005f5a16ecdf4b65611ed69d51e0c432228530e9c058fdbfa44c24f3aa06074d82ccc625545e2a7eb8
DIST gentoo-kernel-5.8.12-1.amd64.xpak 64106657 BLAKE2B a8167bc714130a6f05811ec522c14c84b5038a6130a4a0ca7d581cad6ada7f47b55a9940198524ecf4a28debad79286929a888cd2f433a7b22e4bce4342254e3 SHA512 e952c7efbd007ad12be3074ffb488593dc5ddd4fb7dba70d7c73173d9ffdfbfc5013c06307ead53daed43c7d816789a608feb2a5d48818341d179e947edbc446
DIST gentoo-kernel-5.8.12-1.arm64.xpak 60541802 BLAKE2B 3d92912c25ee3ebbd48316550fb16f6960d2845a380db93026174a2f147ad1f32eea28c06dc1e350c15122939ecd64401e7b825268b2ce9d38343da3503499d3 SHA512 d937892936ba556529ee15d49acd207592e1142ce4a035d90920575c9ae3a5a8ef0325fddeb3b318b849df47ba436cf50b34fa8c00a01651f241cc805cdf8a09
DIST gentoo-kernel-5.8.12-1.x86.xpak 56133532 BLAKE2B c969778b746896cde2af60afc5b7049db6dba8906079a26db905b7342ef099b1dc400ea482ed2548f3a160b8e3a4ac32eed3243315c4cff6f26e9423e9c8fe8b SHA512 2b1470d9d4d08c29ad0635a65b1ea9e2291210f814ed26c47c52cbe4155cc6bdd59b829a85163f76ad377da6cbc7022771fc5fdbc6f540e43a01ab3a5038e0c0
+DIST gentoo-kernel-5.8.13-1.amd64.xpak 64108552 BLAKE2B 9119f7bdbf1ef9e64f839ef485eb9dcf345d3b71a17a011eb7c2e6a4ee17409096b8ed8ce29fb5b6781c45b7d130baa6a03c6fc8be33972436a49b6233a08e1a SHA512 a18b1812bb547d95346df64b59e9f2cb98f378ad679d319b15fb84e04e7070ad73dd251e4e280d36905bf15f6737ea8b1f269716069a46e4c7cc985395ee15f8
+DIST gentoo-kernel-5.8.13-1.arm64.xpak 60528029 BLAKE2B ff6c8842121f54875697bdc8e710aeedfe4179b02954056a895dc3af06d99518822ef642ac58e5814ad1624ccf8dd2c106651834bb90d099f13e5715ce9e23da SHA512 d0303f782d24eb3b5860811863fdc5f5832cb6fca2382d6d767e4317525b6748ea5b5b4a236747f13b73bdd0c080d670524baba43d32518e37e9398d009015f2
+DIST gentoo-kernel-5.8.13-1.x86.xpak 56174425 BLAKE2B 87a7047433b196c087bc4d1bb4d9f35ed22cca9d3a03b243427657feec1004f9239406a28d9a03e4b0742dc1d529870ec31e5b5c06766f9259bdc1a98a582a89 SHA512 8e4a18fe6ae0e8eec7800fb24287f1ecbe4e41b3ba48b776fd8f52c744014d7e40175b0d2295d6889d158ecd1085ec7d89baa9ae6901770b9ed9c70b39c47380
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.69-r1.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.69-r1.ebuild
new file mode 100644
index 000000000000..2378adc3f352
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.69-r1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-install
+
+MY_P=${P/-bin/}-1
+DESCRIPTION="Pre-built Linux kernel with genpatches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+ amd64? (
+ https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${MY_P}.xpak
+ -> ${MY_P}.amd64.xpak
+ )
+ arm64? (
+ https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${MY_P}.xpak
+ -> ${MY_P}.arm64.xpak
+ )
+ x86? (
+ https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${MY_P}.xpak
+ -> ${MY_P}.x86.xpak
+ )"
+S=${WORKDIR}
+
+LICENSE="GPL-2"
+KEYWORDS="~arm64"
+
+RDEPEND="
+ !sys-kernel/gentoo-kernel:${SLOT}
+ !sys-kernel/vanilla-kernel:${SLOT}
+ !sys-kernel/vanilla-kernel-bin:${SLOT}"
+
+QA_PREBUILT='*'
+
+pkg_pretend() {
+ ewarn "Starting with 5.4.52, Distribution Kernels are switching from Arch"
+ ewarn "Linux configs to Fedora. Please keep a backup kernel just in case."
+
+ kernel-install_pkg_pretend
+}
+
+src_unpack() {
+ ebegin "Unpacking ${MY_P}.${ARCH}.xpak"
+ tar -x < <(xz -c -d --single-stream "${DISTDIR}/${MY_P}.${ARCH}.xpak")
+ eend ${?} || die "Unpacking ${MY_P} failed"
+}
+
+src_test() {
+ kernel-install_test "${PV}" \
+ "${WORKDIR}/usr/src/linux-${PV}/$(kernel-install_get_image_path)" \
+ "lib/modules/${PV}"
+}
+
+src_install() {
+ mv * "${ED}" || die
+}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.69.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.69.ebuild
new file mode 100644
index 000000000000..d6e61fa69369
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.69.ebuild
@@ -0,0 +1,53 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-install
+
+MY_P=${P/-bin/}-1
+DESCRIPTION="Pre-built Linux kernel with genpatches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+ amd64? (
+ https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${MY_P}.xpak
+ -> ${MY_P}.amd64.xpak
+ )
+ x86? (
+ https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${MY_P}.xpak
+ -> ${MY_P}.x86.xpak
+ )"
+S=${WORKDIR}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+ !sys-kernel/gentoo-kernel:${SLOT}
+ !sys-kernel/vanilla-kernel:${SLOT}
+ !sys-kernel/vanilla-kernel-bin:${SLOT}"
+
+QA_PREBUILT='*'
+
+pkg_pretend() {
+ ewarn "Starting with 5.4.52, Distribution Kernels are switching from Arch"
+ ewarn "Linux configs to Fedora. Please keep a backup kernel just in case."
+
+ kernel-install_pkg_pretend
+}
+
+src_unpack() {
+ ebegin "Unpacking ${MY_P}.${ARCH}.xpak"
+ tar -x < <(xz -c -d --single-stream "${DISTDIR}/${MY_P}.${ARCH}.xpak")
+ eend ${?} || die "Unpacking ${MY_P} failed"
+}
+
+src_test() {
+ kernel-install_test "${PV}" \
+ "${WORKDIR}/usr/src/linux-${PV}/$(kernel-install_get_image_path)" \
+ "lib/modules/${PV}"
+}
+
+src_install() {
+ mv * "${ED}" || die
+}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.8.13-r1.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.8.13-r1.ebuild
new file mode 100644
index 000000000000..d5d78a106e7c
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.8.13-r1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-install
+
+MY_P=${P/-bin/}-1
+DESCRIPTION="Pre-built Linux kernel with genpatches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+ amd64? (
+ https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${MY_P}.xpak
+ -> ${MY_P}.amd64.xpak
+ )
+ arm64? (
+ https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${MY_P}.xpak
+ -> ${MY_P}.arm64.xpak
+ )
+ x86? (
+ https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${MY_P}.xpak
+ -> ${MY_P}.x86.xpak
+ )"
+S=${WORKDIR}
+
+LICENSE="GPL-2"
+KEYWORDS="~arm64"
+
+RDEPEND="
+ !sys-kernel/gentoo-kernel:${SLOT}
+ !sys-kernel/vanilla-kernel:${SLOT}
+ !sys-kernel/vanilla-kernel-bin:${SLOT}"
+
+QA_PREBUILT='*'
+
+pkg_pretend() {
+ ewarn "Starting with 5.7.9, Distribution Kernels are switching from Arch"
+ ewarn "Linux configs to Fedora. Please keep a backup kernel just in case."
+
+ kernel-install_pkg_pretend
+}
+
+src_unpack() {
+ ebegin "Unpacking ${MY_P}.${ARCH}.xpak"
+ tar -x < <(xz -c -d --single-stream "${DISTDIR}/${MY_P}.${ARCH}.xpak")
+ eend ${?} || die "Unpacking ${MY_P} failed"
+}
+
+src_test() {
+ kernel-install_test "${PV}" \
+ "${WORKDIR}/usr/src/linux-${PV}/$(kernel-install_get_image_path)" \
+ "lib/modules/${PV}"
+}
+
+src_install() {
+ mv * "${ED}" || die
+}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.8.13.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.8.13.ebuild
new file mode 100644
index 000000000000..dca6aedbd789
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.8.13.ebuild
@@ -0,0 +1,53 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-install
+
+MY_P=${P/-bin/}-1
+DESCRIPTION="Pre-built Linux kernel with genpatches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+ amd64? (
+ https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${MY_P}.xpak
+ -> ${MY_P}.amd64.xpak
+ )
+ x86? (
+ https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${MY_P}.xpak
+ -> ${MY_P}.x86.xpak
+ )"
+S=${WORKDIR}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+ !sys-kernel/gentoo-kernel:${SLOT}
+ !sys-kernel/vanilla-kernel:${SLOT}
+ !sys-kernel/vanilla-kernel-bin:${SLOT}"
+
+QA_PREBUILT='*'
+
+pkg_pretend() {
+ ewarn "Starting with 5.7.9, Distribution Kernels are switching from Arch"
+ ewarn "Linux configs to Fedora. Please keep a backup kernel just in case."
+
+ kernel-install_pkg_pretend
+}
+
+src_unpack() {
+ ebegin "Unpacking ${MY_P}.${ARCH}.xpak"
+ tar -x < <(xz -c -d --single-stream "${DISTDIR}/${MY_P}.${ARCH}.xpak")
+ eend ${?} || die "Unpacking ${MY_P} failed"
+}
+
+src_test() {
+ kernel-install_test "${PV}" \
+ "${WORKDIR}/usr/src/linux-${PV}/$(kernel-install_get_image_path)" \
+ "lib/modules/${PV}"
+}
+
+src_install() {
+ mv * "${ED}" || die
+}
diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest
index edf7e36cd59f..4b0c2f246326 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -4,8 +4,12 @@ DIST genpatches-5.4-67.base.tar.xz 2335352 BLAKE2B ae98701f88da8c3ab823499c6d568
DIST genpatches-5.4-67.extras.tar.xz 1768 BLAKE2B 6e6718c80465485c0271d46231d45412e4bb7e713caed3a333b27f1a655048c2ccea871d5331fc4d6413ddbeb2776df02acf00ad1c399a1d86e65615f05d5c69 SHA512 7da85f2ff8f50f43ae1eb814e34402fa8a55629c7b8e9b362ad657974be2ac60489157adf474f91c05587475d89deb1cb1511c5241b80885d695651bfb122af3
DIST genpatches-5.4-69.base.tar.xz 2362320 BLAKE2B 5f0a1f950d6b4edd2eb2189256e128350df0d9682c218527e8f2c8283cdebefddaddaabb7d77e3f8bc8a09d4fb23fea37a9208ffe3c3bbf748eb5e05df85ba28 SHA512 d323506ceb6d8cdb01ff7be8ee80d6b7d5a72fc7a2411d96a84f58ae12392f2f72565413878cc7b4abf9221bdcd0b505d8dc5ee5920945aebbe6984250f13d88
DIST genpatches-5.4-69.extras.tar.xz 1768 BLAKE2B ab83c9bd71bb08d7356aa93c27c3596911fe67fcadfe97a80313d2a038001be7ccada663ab25aee1d5cc348b220d3c82970d08bd3ebd538a729918a7487e0a1a SHA512 6a780c1a4ab2d2acd313e45c3fca0ae013104e916961855c76b4bc2c4f732f8eec27240b728677bf8e3c0042694605f477e672af41e5e4e50e266320d126fc32
+DIST genpatches-5.4-70.base.tar.xz 2483716 BLAKE2B ec87f655614a22728baa721a291616f3c5f0516ec25dfcfba74ce72a8236e132dc2c66bc8b551cdac6cdd170d29a54545b05fec5d853afba33e70b23b7dd50da SHA512 246f449d7720de05a8527ce19ea47ebf79dfe970d87087674630416b438d31fe499b8fd053b7ea19ad81248435345b56544774eeb6298475145ae59b9ef718ae
+DIST genpatches-5.4-70.extras.tar.xz 1772 BLAKE2B b7dcaf96dabb3dcb2ffac6532b59b9eff8e9e55e309b02b4d774a3c665e4499f0353bfb91ed81f1cbc73b852f0de50adc6a03dc36e8e7beb88f0cf62a5fd9a42 SHA512 3fedd41a60c6941f9ee18485c92b67c3dc69d0b36a134adb89c246106d043e10afcc9114f5448ea4164b956934e2dc9efb1f3af95c2bd1a67eaeef5253b07630
DIST genpatches-5.8-15.base.tar.xz 498912 BLAKE2B 429c079f836b9dc6d2086fe818f4e705264f002bcfcf4e5bdbe144af53aca53c8bfc1c0ac23aa33939bc59111e2194747088bbccff61015fd59ac0e3150aab62 SHA512 936414eaaa159a84bf016080332a8ba29c2024c02e5b83ed559df7b1a910ba405093e5ed36d54a346091a534f1389eba99b95852b23328a92e2f7ba5b07723ee
DIST genpatches-5.8-15.extras.tar.xz 1772 BLAKE2B 690935cb537f442dd48dea34000bc444b9c2861b259ebb156722f1027ba281111b037fafe4cfdb71e68c40603f2dcb27d2639d949d4e4fbada8811fce2716329 SHA512 8dcc4ebb194603036323dcc559b5827d02c6a678b2f162191e306fe6ae52cc860e651937962ac8b52e2a4e229b1326a2cb24f938638556b0ddf4369f140f997b
+DIST genpatches-5.8-16.base.tar.xz 525416 BLAKE2B 53b0e2548b25b93999650cdf8eb920447367305049349a468b954f84368f803d2e1fd591fe4c01722515568257f1457a7480650a2debb1e9196bc41cebc07b5c SHA512 b708d0ad5303cabd7ba73b28391c138bf443c0af1dfc8296eb528e1a16cf00763a5a36aec1cb7bd0b0e9c9b0d844d4a135e2f1f5cf4ddbfa9742d7e05e0a4c0d
+DIST genpatches-5.8-16.extras.tar.xz 1772 BLAKE2B 60238a48924010a7ebe1214de7835522ad1ad5b156dd3bba13d315ad753f69ce7b82a5265bd4f8d8631699304526fd44279ba27413f10cc4f19e1a60880cf30b SHA512 f9760259d90cae491252c409c6521ca5285bc0f7655795055db8bbf7c5e2ca65948ffc5541d2c4499f6255e4462884a90cc3b2db485f37e6133ba03c1a519751
DIST kernel-aarch64-fedora.config.5.8.5 215148 BLAKE2B c71380f46c1b37e9e17bab6d78907114369b377bcbdb54afa2c35b6a222937fd061f25309d8de0cc78ef2329ede7192722270acceeaa3da4629a5f58d8fee809 SHA512 e86e2c60e88b1ea5968db1a471d7d928ccb3146fe850f8f2813ef315f2de0cbfa0daa2f6828dee71acb2299f65f05fc0b6f1572a82fb146ae9f53a905fe94e97
DIST kernel-aarch64.config.5.4.21 199104 BLAKE2B 578ad451a76204df2a9bbbe34b5cb27051d2ac5e2c33967f562b01338c43f35da6dc33a4c2cc67ea6c3b32b155729360d3748ec28dcaa750f18449245b2e8a09 SHA512 66e9a437beb350fdc59512c17b8f72c5b5bfacf2b35070d810d77e66f49cf7929026cc28ad44b04a016d61e65d9fb4a10af6996ba09b604bf97e9c467d08f8ff
DIST kernel-i686-fedora.config.5.8.5 199121 BLAKE2B f6e16e6faac6e730eb4c9c3edc1c173b2988b49fe677d34ef1540541911b8f76e5bdc166327d73237c78c1769d484de18864044c91b7da253795506c674d7303 SHA512 0a2c9abaae11ac1ec2e43da4b53fd1731a9bec983a7fda7b9e20f1d25b816e6b0bd217b255ca95b02a8b6530e923b4fc7de770f6a66411045712e7de61d431af
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.69.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.69.ebuild
new file mode 100644
index 000000000000..ff0e401cd76a
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.69.ebuild
@@ -0,0 +1,137 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-build
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 1 ))
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+CONFIG_VER=5.4.21
+CONFIG_HASH=2809b7faa6a8cb232cd825096c146b7bdc1e08ea
+
+DESCRIPTION="Linux kernel built with Gentoo patches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+ https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+ https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+ amd64? (
+ https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64.config
+ -> kernel-x86_64.config.${CONFIG_VER}
+ )
+ arm64? (
+ https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64.config
+ -> kernel-aarch64.config.${CONFIG_VER}
+ )
+ ppc64? (
+ https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le.config
+ -> kernel-ppc64le.config.${CONFIG_VER}
+ )
+ x86? (
+ https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686.config
+ -> kernel-i686.config.${CONFIG_VER}
+ )"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="debug"
+
+RDEPEND="
+ !sys-kernel/vanilla-kernel:${SLOT}
+ !sys-kernel/vanilla-kernel-bin:${SLOT}"
+BDEPEND="
+ debug? ( dev-util/dwarves )"
+
+pkg_pretend() {
+ ewarn "Starting with 5.4.52, Distribution Kernels are switching from Arch"
+ ewarn "Linux configs to Fedora. Please keep a backup kernel just in case."
+
+ kernel-install_pkg_pretend
+}
+
+src_prepare() {
+ local PATCHES=(
+ # meh, genpatches have no directory
+ "${WORKDIR}"/*.patch
+ )
+ default
+
+ # prepare the default config
+ case ${ARCH} in
+ amd64)
+ cp "${DISTDIR}/kernel-x86_64.config.${CONFIG_VER}" .config || die
+ ;;
+ arm64)
+ cp "${DISTDIR}/kernel-aarch64.config.${CONFIG_VER}" .config || die
+ ;;
+ ppc64)
+ cp "${DISTDIR}/kernel-ppc64le.config.${CONFIG_VER}" .config || die
+ ;;
+ x86)
+ cp "${DISTDIR}/kernel-i686.config.${CONFIG_VER}" .config || die
+ ;;
+ *)
+ die "Unsupported arch ${ARCH}"
+ ;;
+ esac
+
+ local config_tweaks=(
+ # replace (none) with gentoo
+ -e 's:^CONFIG_DEFAULT_HOSTNAME=:&"gentoo":'
+ # we do support x32
+ -e '/CONFIG_X86_X32/s:.*:CONFIG_X86_X32=y:'
+ # disable signatures
+ -e '/CONFIG_MODULE_SIG/d'
+ -e '/CONFIG_SECURITY_LOCKDOWN/d'
+ -e '/CONFIG_KEXEC_SIG/d'
+ -e '/CONFIG_KEXEC_BZIMAGE_VERIFY_SIG/d'
+ -e '/CONFIG_SYSTEM_EXTRA_CERTIFICATE/d'
+ -e '/CONFIG_SIGNATURE/d'
+ # remove massive array of LSMs
+ -e 's/CONFIG_LSM=.*/CONFIG_LSM="yama"/'
+ -e 's/CONFIG_DEFAULT_SECURITY_SELINUX=y/CONFIG_DEFAULT_SECURITY_DAC=y/'
+ # nobody actually wants fips
+ -e '/CONFIG_CRYPTO_FIPS/d'
+ # these tests are really not necessary
+ -e 's/.*CONFIG_CRYPTO_MANAGER_DISABLE_TESTS.*/CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y/'
+ # probably not needed by anybody but developers
+ -e '/CONFIG_CRYPTO_STATS/d'
+ # 1000hz is excessive for laptops
+ -e 's/CONFIG_HZ_1000=y/CONFIG_HZ_300=y/'
+ # nobody is using this kernel on insane super computers
+ -e 's/CONFIG_NR_CPUS=.*/CONFIG_NR_CPUS=512/'
+ # we're not actually producing live patches for folks
+ -e 's/CONFIG_LIVEPATCH=y/CONFIG_LIVEPATCH=n/'
+ # this slows down networking in general
+ -e 's/CONFIG_IP_FIB_TRIE_STATS=y/CONFIG_IP_FIB_TRIE_STATS=n/'
+ # include font for normal and hidpi screens
+ -e 's/.*CONFIG_FONTS.*/CONFIG_FONTS=y\nCONFIG_FONT_8x16=y\nCONFIG_FONT_TER16x32=y/'
+ # we don't need to actually install system headers from this ebuild
+ -e '/CONFIG_HEADERS_INSTALL/d'
+ # enable /proc/config.gz, used by linux-info.eclass
+ -e '/CONFIG_IKCONFIG/s:.*:CONFIG_IKCONFIG=y\nCONFIG_IKCONFIG_PROC=y:'
+ # WireGuard was backported to 5.4 but we use old configs (#739128)
+ -e '$aCONFIG_WIREGUARD=m'
+ )
+ use debug || config_tweaks+=(
+ -e '/CONFIG_DEBUG_INFO/d'
+ -e '/CONFIG_DEBUG_RODATA_TEST/d'
+ -e '/CONFIG_DEBUG_VM/d'
+ -e '/CONFIG_DEBUG_SHIRQ/d'
+ -e '/CONFIG_DEBUG_LIST/d'
+ -e '/CONFIG_BUG_ON_DATA_CORRUPTION/d'
+ -e '/CONFIG_TORTURE_TEST/d'
+ -e '/CONFIG_BOOTTIME_TRACING/d'
+ -e '/CONFIG_RING_BUFFER_BENCHMARK/d'
+ -e '/CONFIG_X86_DECODER_SELFTEST/d'
+ -e '/CONFIG_KGDB/d'
+ )
+ [[ ${ARCH} == x86 ]] && config_tweaks+=(
+ # fix autoenabling 64bit
+ -e '2i\
+# CONFIG_64BIT is not set'
+ )
+ sed -i "${config_tweaks[@]}" .config || die
+}
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.8.13.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.8.13.ebuild
new file mode 100644
index 000000000000..1527024779c4
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.8.13.ebuild
@@ -0,0 +1,134 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-build
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 3 ))
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+CONFIG_VER=5.8.5
+CONFIG_HASH=af8da8d54d21231fd8c7b943216bb985f0a4e223
+
+DESCRIPTION="Linux kernel built with Gentoo patches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+ https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+ https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+ amd64? (
+ https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
+ -> kernel-x86_64-fedora.config.${CONFIG_VER}
+ )
+ arm64? (
+ https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
+ -> kernel-aarch64-fedora.config.${CONFIG_VER}
+ )
+ ppc64? (
+ https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
+ -> kernel-ppc64le-fedora.config.${CONFIG_VER}
+ )
+ x86? (
+ https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
+ -> kernel-i686-fedora.config.${CONFIG_VER}
+ )"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="debug"
+REQUIRED_USE="arm? ( savedconfig )"
+
+RDEPEND="
+ !sys-kernel/vanilla-kernel:${SLOT}
+ !sys-kernel/vanilla-kernel-bin:${SLOT}"
+BDEPEND="
+ debug? ( dev-util/dwarves )"
+
+pkg_pretend() {
+ ewarn "Starting with 5.7.9, Distribution Kernels are switching from Arch"
+ ewarn "Linux configs to Fedora. Please keep a backup kernel just in case."
+
+ kernel-install_pkg_pretend
+}
+
+src_prepare() {
+ local PATCHES=(
+ # meh, genpatches have no directory
+ "${WORKDIR}"/*.patch
+ )
+ default
+
+ # prepare the default config
+ case ${ARCH} in
+ amd64)
+ cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
+ ;;
+ arm)
+ return
+ ;;
+ arm64)
+ cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
+ ;;
+ ppc64)
+ cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
+ ;;
+ x86)
+ cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
+ ;;
+ *)
+ die "Unsupported arch ${ARCH}"
+ ;;
+ esac
+
+ local config_tweaks=(
+ # replace (none) with gentoo
+ -e 's:^CONFIG_DEFAULT_HOSTNAME=:&"gentoo":'
+ # we do support x32
+ -e '/CONFIG_X86_X32/s:.*:CONFIG_X86_X32=y:'
+ # disable signatures
+ -e '/CONFIG_MODULE_SIG/d'
+ -e '/CONFIG_SECURITY_LOCKDOWN/d'
+ -e '/CONFIG_KEXEC_SIG/d'
+ -e '/CONFIG_KEXEC_BZIMAGE_VERIFY_SIG/d'
+ -e '/CONFIG_SYSTEM_EXTRA_CERTIFICATE/d'
+ -e '/CONFIG_SIGNATURE/d'
+ # remove massive array of LSMs
+ -e 's/CONFIG_LSM=.*/CONFIG_LSM="yama"/'
+ -e 's/CONFIG_DEFAULT_SECURITY_SELINUX=y/CONFIG_DEFAULT_SECURITY_DAC=y/'
+ # nobody actually wants fips
+ -e '/CONFIG_CRYPTO_FIPS/d'
+ # these tests are really not necessary
+ -e 's/.*CONFIG_CRYPTO_MANAGER_DISABLE_TESTS.*/CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y/'
+ # probably not needed by anybody but developers
+ -e '/CONFIG_CRYPTO_STATS/d'
+ # 1000hz is excessive for laptops
+ -e 's/CONFIG_HZ_1000=y/CONFIG_HZ_300=y/'
+ # nobody is using this kernel on insane super computers
+ -e 's/CONFIG_NR_CPUS=.*/CONFIG_NR_CPUS=512/'
+ # we're not actually producing live patches for folks
+ -e 's/CONFIG_LIVEPATCH=y/CONFIG_LIVEPATCH=n/'
+ # this slows down networking in general
+ -e 's/CONFIG_IP_FIB_TRIE_STATS=y/CONFIG_IP_FIB_TRIE_STATS=n/'
+ # include font for normal and hidpi screens
+ -e 's/.*CONFIG_FONTS.*/CONFIG_FONTS=y\nCONFIG_FONT_8x16=y\nCONFIG_FONT_TER16x32=y/'
+ # we don't need to actually install system headers from this ebuild
+ -e '/CONFIG_HEADERS_INSTALL/d'
+ # enable /proc/config.gz, used by linux-info.eclass
+ -e '/CONFIG_IKCONFIG/s:.*:CONFIG_IKCONFIG=y\nCONFIG_IKCONFIG_PROC=y:'
+ )
+ use debug || config_tweaks+=(
+ -e '/CONFIG_DEBUG_INFO/d'
+ -e '/CONFIG_DEBUG_RODATA_TEST/d'
+ -e '/CONFIG_DEBUG_VM/d'
+ -e '/CONFIG_DEBUG_SHIRQ/d'
+ -e '/CONFIG_DEBUG_LIST/d'
+ -e '/CONFIG_BUG_ON_DATA_CORRUPTION/d'
+ -e '/CONFIG_TORTURE_TEST/d'
+ -e '/CONFIG_BOOTTIME_TRACING/d'
+ -e '/CONFIG_RING_BUFFER_BENCHMARK/d'
+ -e '/CONFIG_X86_DECODER_SELFTEST/d'
+ -e '/CONFIG_KGDB/d'
+ )
+ sed -i "${config_tweaks[@]}" .config || die
+}
diff --git a/sys-kernel/gentoo-sources/Manifest b/sys-kernel/gentoo-sources/Manifest
index 1b19ddcbf8c6..e712e27e29e8 100644
--- a/sys-kernel/gentoo-sources/Manifest
+++ b/sys-kernel/gentoo-sources/Manifest
@@ -7,6 +7,9 @@ DIST genpatches-4.14-208.extras.tar.xz 17536 BLAKE2B a555b9c78d47323e78c10dc31fb
DIST genpatches-4.14-209.base.tar.xz 4550808 BLAKE2B 74f6acc8724f68676bbe34e7a60555d3f5ba84a6cbf06ea3e8010648df79a5ee97099aa81ab82f2de9aeb5cb9f8e0d8e420a8d85fadb8a339faa1ccde9695a24 SHA512 d4930c82730039ffc2e2ba95e38b3064da267452b3a43c804c3c6593aa7579d113cd2ef7ee003e22ae84c6ed5d7016bfc7a5451158aecd758c9b6f3dedcdc834
DIST genpatches-4.14-209.experimental.tar.xz 6092 BLAKE2B f765f6446d0a40f66ac1108e08a9044c8a60ffc7b259163d9bbb4d4a0c3022d7d8bb1ff7805cd12640910838aca00e1c47f521d00b51f1a898d5706cc7ffc13f SHA512 165d6ad87eb75ebb92915b6f84e55818336a1cadf99d1216fe7b2f7063ddcf02c979ff20f85d725fe8d9fb26be7b349bb8789f253bc8c4f9cb2639231cc20028
DIST genpatches-4.14-209.extras.tar.xz 3336 BLAKE2B 9c1e816171c46d509d634c6de1c4d053e7356c2728fea87ddf3a655b82137a7357d73ab1d33534e31655c39403f2580279861b16b0fe97a410942af6411d5ad2 SHA512 dda86775cc44a5d24d9aa8eaa537a650cda0b07074befd30d96be23dfd8a1df1b1b290174d33facf52e332da3b658530eb22f041f84be3f4c55739f2953b23d4
+DIST genpatches-4.14-210.base.tar.xz 4591536 BLAKE2B 18290f1a140a71871970857b6fb6719f180c13379ea71bda72ca2adcd24142c052c9521abd4d0e62bce83e96c8d181826f7e82121d22b4081f02b2b0d118c5ee SHA512 da4bd3f06174583a21742e23eafc76f569bd90a74637b0c8c0635fbb0d5e3edd2bcbbeb71599c8ce2d7ee597ed11607f71179fdbafdb2dc6d56ad29eadd54f8c
+DIST genpatches-4.14-210.experimental.tar.xz 6092 BLAKE2B 17de3b884f8608422a5bee21f205a65431e26b8cd24006816317d0ba1d954a8056fff96f769d96ecb1a0eb348dac60a16c9ae5ec7c35eeba8c3fd01e0a05aee1 SHA512 09d96e0d5f42cd9446704f158098db34fd0ce457df8d1fd068939188714b2007c48cac96c9f8d5f61ec05704ad470c7776f62c3af477fd0a7a86441eed813618
+DIST genpatches-4.14-210.extras.tar.xz 3340 BLAKE2B ea895af080edc04f4ad7c68ae986fc3f6565707f68fc82a87c5325e0fe5ae018c353302421719d4b95713c0d428e316e143ebf0832f1a154b782db47bcf1fdef SHA512 149609e2ce5e369cf2065633aaa99a80ed16df43f2dbfa06a2ab04193f1250cd2c6b5e852da3f6423ac3146446997a15ef2e1ecbfc87f241b9e4f0022ab0a8ac
DIST genpatches-4.19-140.base.tar.xz 3799532 BLAKE2B 3b090f11a9faca5afc9b1267cc6101de8197a7bb54ceb9fba614b829d30ea97e4a19601e78095ee747e8e98f6dfaa3644ade1f5433607698283c6b210f45921e SHA512 8a8d2ca4cfc19e1c4de5c6402469d34268a98c8e3b853307e96d0fb0fb05335ac302ddaabca2658a98998dc6994378f580aca57cef4afbc9557afaf184785a2a
DIST genpatches-4.19-140.experimental.tar.xz 6984 BLAKE2B 5720cec896e2e2795a89801dd1f58d64926ba6bb5d7126349448ef653cf3c6cc040a3f7556760616124ab21a55ebdce1679a5f9fa8b0a3da7a04dd56115d1b23 SHA512 469bdfd6235a5af80c8b40368d75b2b65132c4d1c2dbc4e1f567b2e6095db9fbfb56df4265a65bb83c0e54320d96d69b307c6c091864a3d555a9c2a3d8fb5141
DIST genpatches-4.19-140.extras.tar.xz 17524 BLAKE2B 1b57f18a9ef73f3bb8d3dfd5158202a3b6131bb6b3dc4532d11e16242935e8dfe489ea8fd96d9db9b8d45244267980ff22207819d5772907ecbec1cc7ad98c92 SHA512 b85062b1acc16d8e012fcb384c49612d098b4727baa09e6c35e769580f84daf5b4f2ba006de785ec22e995bab63eb14fae55dbca9d4664439061f158c1f159e5
@@ -19,6 +22,9 @@ DIST genpatches-4.19-146.extras.tar.xz 3316 BLAKE2B 2de572d8e8ec70f4abde0b2681a9
DIST genpatches-4.19-147.base.tar.xz 3914028 BLAKE2B b6f113387ad1b9270448b01d178ab833d2a91bf52716756fc89a1df0c879fa806edea09cb53336e5584afe1238d914d22434e6abcbb7f8a41055e1aea4cd6a90 SHA512 cf9ea9e52a6a20b2713eab3249e393653ba09baf71fe289af581a341359a5263d00817ff7d9ef6e38c8f3200d24770c88bfc82c3bd556919c99980d1268f546b
DIST genpatches-4.19-147.experimental.tar.xz 6976 BLAKE2B d3a5a26863931de047396f73bc15a19712eaa7d76d836baf3b7e75ab42f263c1f04c95947c69189acf15f7d1df998706277004dfe07d78d1f1f97667f6c999ad SHA512 f34befc03887f2150466b65d7dee1b6b98a019d88348b5a965604412b78b2ca7ab25bc1a705866476f1839d77a64734fb424543fe86a855387de930f0a416e84
DIST genpatches-4.19-147.extras.tar.xz 3316 BLAKE2B 168a00fdecab7530c7e94876a15ac37619db16a6f63956edbcb69e31991908d849671c0dbcd354ebab129f59b79ae3f90b718714940443098ab11a0b1005a75c SHA512 5677ac0bbbba8c9d485b6beddaaaaefbb0525101f2ab53633f8eb36d41f98613b6f4de856e5941f9d0c7b9e0acf8566e9478878f8bc096de6cdab9daa6ce5d4c
+DIST genpatches-4.19-148.base.tar.xz 3980648 BLAKE2B f0c9a65a1132e26a7b4ace1f982d97ed841f4c2ef13050bd20366417391c8b1800e7c00b2db5c8ae75ce8d6e95fcfe401facf2bc76d58df31e29608721e4d1dc SHA512 b75a42bb6eea9418d75e333b3304cd0a6a43a54a4758a8de3e3d69dca3f22c18c75da3347f46b0d188d52642306691237e19db53305f1a83888aa4f85bd92f40
+DIST genpatches-4.19-148.experimental.tar.xz 6972 BLAKE2B 5104106075756bcbc6aa6ea79910b96f7c9ba37457f07a61ddc2c0f81728e910a853707a9e21d6918d57ed2a16d777c2851c1e3888a18eaf9c813d4587def797 SHA512 95d8638a98baf7a2b2569d32c7aeedbe5c85153f1f22b8f3bee72ac9f47169b31c85e47e887068d95a4f9469baf76ac00c5957fea3582573a2de268b161ca120
+DIST genpatches-4.19-148.extras.tar.xz 3316 BLAKE2B 57546aae74073e440e043c4754b2f51bc48a0b24a4ff0a130797d2bd96a0128bd786310a79bcf13b03f20e14eaa8fd8ce10c597d9a7281173cd2debc6b042bb2 SHA512 2971335b2a9e3fb4a7477e8ff40e3170fe40a272a3ff33a99e18bfb58398fe5e6a798ec88e1d35b7bc895dbf68a30297e1956357b05c988b321f06111297f354
DIST genpatches-4.4-234.base.tar.xz 3796056 BLAKE2B eab6e9711dccb5d53ccc8aff4cbb51218c3f2af98e5423fbfdf97eb38388b84e6899990287d595a30a94a1811ad2d7d8665996e89a09e48a11dd5d541ff3ebad SHA512 c35e78b2e13c8fbbcfcbaeff8343334da892af53c10d3f5194bcabc24a3beb5316b71c2afb399bcbfc3bf8e2707999a396240f3725a723fa0ccc4b72daf7f025
DIST genpatches-4.4-234.experimental.tar.xz 83304 BLAKE2B 85ae8e6bfa90de01ae1a72530d2f404784376402b5742895f66e9bd336b653b416bcd014372db25b7950d0f32598dd384aaba40a7f3b7fd4685ef95ece229b6f SHA512 d12ea54b57d4fca7a8f16879d79ad6216cc13742d308d811c806d12040c44095d9830d8cf2f68249c3e7fedf17bafb1ab3f6b1b86663e354b40c1546d8404a1a
DIST genpatches-4.4-234.extras.tar.xz 16504 BLAKE2B 162cf8fa92659ed171184a6dc5c7117a0f16ff1c38481bdd8f98785ce800f9d19d3aebc41dc58d9128fa01ec97e40c5c5bf518fb536c532ed3cd3396181d2547 SHA512 7d7598a5e1c5aae430deae50f94c2b8ca3140256709be7fcbe27341d87a1b2926a558a0764aef45a9b4e038cfea2404aad0536ea8e71de87dcd2f1be6cc595e3
@@ -28,6 +34,9 @@ DIST genpatches-4.4-237.extras.tar.xz 16504 BLAKE2B d4a7f563f97dc81e56cccc49087b
DIST genpatches-4.4-238.base.tar.xz 3845216 BLAKE2B 1416c13d239e44b00587fe3888d63ac394172762e73f949ab36866e6179077e030f4682a754fc90b333341b1249b4b7ba3add7636da1c59ffbba480999040ca7 SHA512 b4e5052cef8e21a9d0874fb5ff0984f7cdc7f67fe2d60e5e9ed4b0b9da53ad85ba9c6107b25500b152d326a2c47772e22e3a352d01a45a3175a6c604377760c0
DIST genpatches-4.4-238.experimental.tar.xz 83304 BLAKE2B 69328d7400f861a2e91314e5c8d439b98fe384f1fb4955b982567cfdc9ae53be33cecb92d6d29fbeecd9696e465f82c4718cb444a69f3a7ef2c403290b4e5b61 SHA512 df3bac3bda0739135f57660824095b5b8444787cc7c132eb8c9b3db6659e49e02b5f02c16b600ac1c5fec63af7596b4b0c3aa80bc2a2e27d8b1d41a9db13db58
DIST genpatches-4.4-238.extras.tar.xz 1780 BLAKE2B bda0efa731810b2a26d7d78bdc52b3620e3a00b05d53a8cd307cefdcbdc4b4914e51bb8b9ad487c163fb4def6cc975c7dfa195d14f853a4781b9be2ce4253ef4 SHA512 5eabc4127b1c2706c43aa2d8950f369d31f510a640230602392e8c47d2f0f923d6e01afba9179259a3f50d48e2e5de519a212e2af79b0df54376758b8bea6db4
+DIST genpatches-4.4-240.base.tar.xz 3863852 BLAKE2B e793c343ed112268936046f2efb63ac1f6f208643aa26255788ce4e05283fbd079ba37ac6f89c733091117d0384e8612677e65be566924c5a73be5e77a826062 SHA512 c25c257b6983df7bcbc627e31a872b9320796a81ba03a543ef6c5bab7d534e09c8299d034a6a1d899e0271a2309d1e05ad21c992f31f589474161156e5acab45
+DIST genpatches-4.4-240.experimental.tar.xz 83268 BLAKE2B 6ccdb27f0bd0e2abf694a417c7a5de9adbb6cd803ae738dafce8a9a69794f5ff5f02fd3aec7df7c21ab0eb3907beed429bbaa820bbd61f72ca309c9062c6191c SHA512 a6e94793e2efc2d9f777fc91142b9c5742886c2c2bc1e5c6c64a3433d8e7821ce37e358ee676014a1a0c7ba74f1cb0fa9e4c9fd069ceb53c57e94771ec63474a
+DIST genpatches-4.4-240.extras.tar.xz 1792 BLAKE2B 6a49f01025a3998bd9b27de0bbf1269013ae7ba6b694274939f6dca6797a2daa8472becc9bee6bfeaca914c63b934cb64ab5c681dadba1c86dc8e3af8b93c9db SHA512 bccc502308ed832ffe8beb9e28343ec2fed1360703d482e6ad59532c33fb763badc4e1322a00d2a810932fc4dfaf5a41162b5efb5b3f901d52ce132c06ec551e
DIST genpatches-4.9-237.base.tar.xz 4215704 BLAKE2B aae3f674659e8ed135129c36b6afe4336a542ed9833f9be3871cb9bcb260968603d3dc4c944dd89815d8c05e178862e3aadeb74157a09b821899a58a57f445bf SHA512 17048947821511ef7d1411fda43f42a2935d1cda4016d89618ea32d54c3723b2ede57dd30a6bc8f6f07aa5b2b1d6f61e261f46266f61583800185f0dc7939ac6
DIST genpatches-4.9-237.experimental.tar.xz 106452 BLAKE2B b927926179e48d1d41ec70215f42705298a90deb541dcbba7b1d5472a734f4f53fee5cb2cf82573e257a2440ecc99595e2a69fe30cc046c6b27dfe26164fe7bf SHA512 5a587a915dfb879b466a61ae4ab65d51d2329258fb2d7d7e8906ebb06cdaac3f7f414b614f6d47fee79be1698901931dd28cef0068b1d3e181e334f67c118482
DIST genpatches-4.9-237.extras.tar.xz 17396 BLAKE2B bb4cbbed886d283c62160ca990ab9d73489924b9d8555d3bb8214612b09a5f51a333b59dfd8db780f8cbf581870c97dc91e823a574ca7738cc2eed1034d4d3d3 SHA512 fc732cd3fadba95c98d1c51a7c11c09336b1d67bc747fb4a82a64f1eedf3ea688c33f6e17bdb0fc5e49f7c04138a2e911ce1a7727ca2c8810d9958c02b3c6723
@@ -37,6 +46,9 @@ DIST genpatches-4.9-240.extras.tar.xz 17396 BLAKE2B 4a22af944b224c879e1d4d56e6bc
DIST genpatches-4.9-241.base.tar.xz 4286860 BLAKE2B cd9ef3a10d282f525f7636202385739f4429f457df221824cdc4434a1edf50865a200412b3688109d7b85aea1157fedbd306fa42a45367b0a349bd745e7d58c1 SHA512 63686d08eb9a1d457f08316bd67306bd0ae548daf8da855aac6aa0a87c056a52451d79d322627c1cf511afc89dafabd2747b4a2a753c4dce099ec3e8169c9e25
DIST genpatches-4.9-241.experimental.tar.xz 106384 BLAKE2B f9bdb6ed9eaac2b8da56de729ee2c5bac3dbcbb62408a7ef86b126ee9df868c660c7f09065d2390097873eeeb16a3e5ae7a929c5e65a4bc35baa098cbd3bc8a7 SHA512 45d6a7de1e459bc3d9c8ebc18d979a48bde5b011afa66466599c87c3c244cbf966e0320f72174eb890984a1e489212b191aa6fe1fc19fd1d9180b74a32618089
DIST genpatches-4.9-241.extras.tar.xz 3336 BLAKE2B 49751b3be239f7189703f475eace8d0c3410998c77fba6d3e2d1a6e79c386f11ce8a0eea759e90ce1e749936eec705012f3abffb5d300759fa6eb0c41d390bf6 SHA512 ca206ff43f84b55ab14788ef550190074c35e425b7b73e92495bcfd296dc6ebb007a0e9a89f284fa4ac61a8ba39313c39c318878d18e1b0fc31a24d3271d4f8e
+DIST genpatches-4.9-242.base.tar.xz 4314764 BLAKE2B 66f14a5cbf6a006f29cd761446b356b72338d3f05c19c24df726eb4d1a6677608d4ac6dbd9f9a43c7f7c2632186d09db21e02745131ae63e74b967fc2e545dcc SHA512 649d0e61d0e08892c44f51395984e0bd38ca141a657e8baa32462be7ac4a441772e51ec75417672e20c47d0ddcc436fa33f10f5bfb5ef530ce8527d565cf1154
+DIST genpatches-4.9-242.experimental.tar.xz 106376 BLAKE2B a0d6d34dffb27fb1d2367e2c4a930a67a924ab2670990f7a5b2b575eef2f3f24ea812bb0381bc0d1a711b12712351b2dd8fef85f18fe319395f6d03dc49c0c1b SHA512 6ad2d6b5f5aba2520601c3987e97596406407219b20a57569b27b4927e00db4e9487724de0af3a360d6c3ece0aba3109cacad89783f313edc884ae3031ecb998
+DIST genpatches-4.9-242.extras.tar.xz 3344 BLAKE2B 9ba902427eaa0672a8bdff653219d9dd5662174b0211046b4accab5f4c6d3ff8f26f606e359131f9c38574f71baac41ce1e3e319f641ad04e14b9a18da420d16 SHA512 68d21149f784143432d604d7f0b5caa3f228bc6a2273580039e8505e5cd167874fdbdb1d42ec968b75474e9e14647ee88c74440fcc896ad2cca68c856f06e94d
DIST genpatches-5.4-61.base.tar.xz 2186332 BLAKE2B f0063cb381a98330178dcf4ffa017ae9262f0406a1d4801b8e60a0300c51238a57b502ec8f72ac30e7b8618e8d54e6a56afdc9513fd8f896fc3129cbe3532446 SHA512 0733161227e3d1f3bb179a4ae8132183ef858166a0521e28669b5e01bf660a924b0b4758268ea4271abaf4bd51b8a49d0ac300173873087820697de5e53452b2
DIST genpatches-5.4-61.experimental.tar.xz 6692 BLAKE2B e847f735003f85ca5ae64284cf4df0114ae171c74c89f32fbe0ad6c55343f8fa18385c2312e47e3758719493038400cd87246c2da877023a561ee6043a796e22 SHA512 c4cb73568826f4e8c0078667254c9863cdd4e648697115b8b4c5adaa188d536c319ca518fa5f15005e8570558df7f93a47771a8577600fa305c49da6855cec88
DIST genpatches-5.4-61.extras.tar.xz 1764 BLAKE2B eeb60ddb3ac1b28aaccca2820d107dc65629b61460073b1e281903b04759f3c1a66ee8dca35459d1ea81fc75410709c8010c3c16aedf802fcc626cf47534ead0 SHA512 35a93c028932e1e6313ccce7fe0aa5277e57cad6c61418a436432aea5a3937e4621d72ae4d2e9b28c7b26342eaf0e63bdd9e55362d9f7b0aa4bb6a64b0c59c37
@@ -49,6 +61,9 @@ DIST genpatches-5.4-68.extras.tar.xz 1764 BLAKE2B af078c5e8d444d6b5f615fa6c1d07b
DIST genpatches-5.4-69.base.tar.xz 2362320 BLAKE2B 5f0a1f950d6b4edd2eb2189256e128350df0d9682c218527e8f2c8283cdebefddaddaabb7d77e3f8bc8a09d4fb23fea37a9208ffe3c3bbf748eb5e05df85ba28 SHA512 d323506ceb6d8cdb01ff7be8ee80d6b7d5a72fc7a2411d96a84f58ae12392f2f72565413878cc7b4abf9221bdcd0b505d8dc5ee5920945aebbe6984250f13d88
DIST genpatches-5.4-69.experimental.tar.xz 6700 BLAKE2B 5dc77757b202a6196554e89a956167b07793315178ada78153a0129673e8e391fdb6eafee51e23fb3e0c66bcadb1e70ba8d7db9b5d2e3fe0cd75d96a652ba3dd SHA512 e36e092a14fa3c5a301d25d09d98c27f32fff0a7900ead1dbcdaa9c94d49e627963f07ef5a4b2b92ad79e31bfd1df8389a6354444e987d2c3fafc382f23dd235
DIST genpatches-5.4-69.extras.tar.xz 1768 BLAKE2B ab83c9bd71bb08d7356aa93c27c3596911fe67fcadfe97a80313d2a038001be7ccada663ab25aee1d5cc348b220d3c82970d08bd3ebd538a729918a7487e0a1a SHA512 6a780c1a4ab2d2acd313e45c3fca0ae013104e916961855c76b4bc2c4f732f8eec27240b728677bf8e3c0042694605f477e672af41e5e4e50e266320d126fc32
+DIST genpatches-5.4-70.base.tar.xz 2483716 BLAKE2B ec87f655614a22728baa721a291616f3c5f0516ec25dfcfba74ce72a8236e132dc2c66bc8b551cdac6cdd170d29a54545b05fec5d853afba33e70b23b7dd50da SHA512 246f449d7720de05a8527ce19ea47ebf79dfe970d87087674630416b438d31fe499b8fd053b7ea19ad81248435345b56544774eeb6298475145ae59b9ef718ae
+DIST genpatches-5.4-70.experimental.tar.xz 6696 BLAKE2B de4e2c647c1f2e71d3a302b284d55584d61f72ab75a22749f65255c3b1d389f904b152e9faaabf704da3542712252d4edda3e9acaa7c683ec82b2d16e032850e SHA512 b29a8e7c05db6f15c5bd6fc51bb16bf92a2301c60392bd377e71db65f997484c57cfde4acdf07d93bf007052c26af91e9e374ba40bc16903e4048457c7a17126
+DIST genpatches-5.4-70.extras.tar.xz 1772 BLAKE2B b7dcaf96dabb3dcb2ffac6532b59b9eff8e9e55e309b02b4d774a3c665e4499f0353bfb91ed81f1cbc73b852f0de50adc6a03dc36e8e7beb88f0cf62a5fd9a42 SHA512 3fedd41a60c6941f9ee18485c92b67c3dc69d0b36a134adb89c246106d043e10afcc9114f5448ea4164b956934e2dc9efb1f3af95c2bd1a67eaeef5253b07630
DIST genpatches-5.8-11.base.tar.xz 400044 BLAKE2B ffa3cbdd4586e142933833859ff3e741a2bf9cfe569aadce43767b671706d256082a07e5c3b11bd9cc849bde645b664c641958590d1ec0b73dd826dab2996f56 SHA512 5dab9eb4f0077d5822b736e282696b95993e17d1078691cd14c2201043e9be9c496c56d5f89cfd38fbb5d0c1da433f62d35ff8b9542423524ef701205bc04577
DIST genpatches-5.8-11.experimental.tar.xz 14248 BLAKE2B 41c0b5453d89c794504fe7bdd02d595553bd70abe0b4018f290328b7ffef0a2f9c3f7be61ae73cbb42827e64844d5ac2ff2bf798760e1bbb4bc0f4812753006c SHA512 3ce760f2b257e8fb9a443583daacee267f35469596bfa3867032e524235cfd5c1f98de5e4f92ecfa5651f9a3ab852c077eca940ce00f344c69386117ee824e57
DIST genpatches-5.8-11.extras.tar.xz 1764 BLAKE2B 3798c0b54dd3056dfd389db8bbcea775462b218d9670c3322240d90d8f894c89bde55a04a80220e76b0d6fd135c32af1d9f5564795f30e9368f3f58d0d45501f SHA512 958d68e317c0140b2540f757dfabc767e28f1878a2b65012599248edd9ab8ac20e7f1736a0f802f01a9f0f22cc743f1a1f9f4665ac287ba6a477521dee323ab1
@@ -64,6 +79,9 @@ DIST genpatches-5.8-14.extras.tar.xz 1768 BLAKE2B b6373b4b1c04b177c0200ce1cb0cbe
DIST genpatches-5.8-15.base.tar.xz 498912 BLAKE2B 429c079f836b9dc6d2086fe818f4e705264f002bcfcf4e5bdbe144af53aca53c8bfc1c0ac23aa33939bc59111e2194747088bbccff61015fd59ac0e3150aab62 SHA512 936414eaaa159a84bf016080332a8ba29c2024c02e5b83ed559df7b1a910ba405093e5ed36d54a346091a534f1389eba99b95852b23328a92e2f7ba5b07723ee
DIST genpatches-5.8-15.experimental.tar.xz 6064 BLAKE2B d447307c194e9e62fff29e71b640730f16d0a88ce148a331d74cac74b1b4661ac2d4b4827f4e9c05edd25de2522e295c15d2a37ed62bed329fc8365cb8333afd SHA512 e6f4701e88cfde590d75bd8fc3954eed48e179bcc84704a4cc0b2ccd2379754a74a16d65355021de7c372571499a290d11d150624b1eeb91ea3170d038048565
DIST genpatches-5.8-15.extras.tar.xz 1772 BLAKE2B 690935cb537f442dd48dea34000bc444b9c2861b259ebb156722f1027ba281111b037fafe4cfdb71e68c40603f2dcb27d2639d949d4e4fbada8811fce2716329 SHA512 8dcc4ebb194603036323dcc559b5827d02c6a678b2f162191e306fe6ae52cc860e651937962ac8b52e2a4e229b1326a2cb24f938638556b0ddf4369f140f997b
+DIST genpatches-5.8-16.base.tar.xz 525416 BLAKE2B 53b0e2548b25b93999650cdf8eb920447367305049349a468b954f84368f803d2e1fd591fe4c01722515568257f1457a7480650a2debb1e9196bc41cebc07b5c SHA512 b708d0ad5303cabd7ba73b28391c138bf443c0af1dfc8296eb528e1a16cf00763a5a36aec1cb7bd0b0e9c9b0d844d4a135e2f1f5cf4ddbfa9742d7e05e0a4c0d
+DIST genpatches-5.8-16.experimental.tar.xz 6068 BLAKE2B 55365934343137e50ab3105e4ade4ce4d4293e58dc6c4965940999efe4e7fa02eef7e672c117054ba5bb21a153c4b88cf247dde0ae46982ea317dad105d17487 SHA512 7dbb46425215aa083fdd0fbef131d65a58437524d1605fcfa891f51ae6610914f9f3d1b0b8c8b416b06efe9f918e619893af5b3015dc3e5249dcccb01c6e5346
+DIST genpatches-5.8-16.extras.tar.xz 1772 BLAKE2B 60238a48924010a7ebe1214de7835522ad1ad5b156dd3bba13d315ad753f69ce7b82a5265bd4f8d8631699304526fd44279ba27413f10cc4f19e1a60880cf30b SHA512 f9760259d90cae491252c409c6521ca5285bc0f7655795055db8bbf7c5e2ca65948ffc5541d2c4499f6255e4462884a90cc3b2db485f37e6133ba03c1a519751
DIST linux-4.14.tar.xz 100770500 BLAKE2B 85dc4aa953fe65e273a24473d8de98e4f204f97c43be9fc87cf5be01f796f94cfde5c8f9c84619751f1cac51f83ce0b4681fb19c5f2965a72d4a94fe5577846a SHA512 77e43a02d766c3d73b7e25c4aafb2e931d6b16e870510c22cef0cdb05c3acb7952b8908ebad12b10ef982c6efbe286364b1544586e715cf38390e483927904d8
DIST linux-4.19.tar.xz 103117552 BLAKE2B 1dbf16cf410867412d17568fe42bc1e90c034183b654d270b650621ff7664a321950943d0639205bc1ee7ef6210be170c1f2c785a042ed8a4ec5e3a486d890e0 SHA512 ab67cc746b375a8b135e8b23e35e1d6787930d19b3c26b2679787d62951cbdbc3bb66f8ededeb9b890e5008b2459397f9018f1a6772fdef67780b06a4cb9f6f4
DIST linux-4.4.tar.xz 87295988 BLAKE2B f260f1858994f5d481fd078c86e51bddbc958f7c5d1586f60dced772e1b1107ecf3aae0558c3e6f39c36f7d3aa1e6cd1e5c64ec9d6f2218f47b98413da6466fb SHA512 13c8459933a8b80608e226a1398e3d1848352ace84bcfb7e6a4a33cb230bbe1ab719d4b58e067283df91ce5311be6d2d595fc8c19e2ae6ecc652499415614b3e
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.14.200.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.14.200.ebuild
new file mode 100644
index 000000000000..4856e3ab6f51
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.14.200.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="210"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+ kernel-2_pkg_postinst
+ einfo "For more info on this patchset, and how to report problems, see:"
+ einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+ kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.19.149.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.19.149.ebuild
new file mode 100644
index 000000000000..70298a97d08c
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.19.149.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="148"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+ kernel-2_pkg_postinst
+ einfo "For more info on this patchset, and how to report problems, see:"
+ einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+ kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.4.238.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.4.238.ebuild
new file mode 100644
index 000000000000..0bd6f3371119
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.4.238.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="240"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+ kernel-2_pkg_postinst
+ einfo "For more info on this patchset, and how to report problems, see:"
+ einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+ kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.9.238.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.9.238.ebuild
new file mode 100644
index 000000000000..6aafc99a47cd
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.9.238.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="242"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+ kernel-2_pkg_postinst
+ einfo "For more info on this patchset, and how to report problems, see:"
+ einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+ kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.4.69.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.4.69.ebuild
new file mode 100644
index 000000000000..5c8160a34020
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-5.4.69.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="70"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+ kernel-2_pkg_postinst
+ einfo "For more info on this patchset, and how to report problems, see:"
+ einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+ kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.8.13.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.8.13.ebuild
new file mode 100644
index 000000000000..e87fd6f59456
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-5.8.13.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="16"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+ kernel-2_pkg_postinst
+ einfo "For more info on this patchset, and how to report problems, see:"
+ einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+ kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/kergen/Manifest b/sys-kernel/kergen/Manifest
index d562d223198c..90a7d032355f 100644
--- a/sys-kernel/kergen/Manifest
+++ b/sys-kernel/kergen/Manifest
@@ -1,2 +1 @@
-DIST kergen-0.1.4.tar.gz 135566 BLAKE2B ae043f8b952423f66645be2f8c4286ceae07141420cfd1fab9d11a7ed76a89a028b7704f4659079bde7902702b129364b46752404a891868a3a2fea56a07dee7 SHA512 40140f66bf3072836dcd187a2b1a8e5ee19da853fbe6a3a3a7203a33332e8b4d3e871045aad187dcc23879f67d5ab11b832682c1ac0b788594b570da40a825d5
DIST kergen-0.1.5.tar.gz 165689 BLAKE2B 4e6f2a9f1682ed89cbf6f7600f49364cd45a25467ff18954186b8ebb9009a6ff911ccf926d787f998d393327ee4ec0958a958f3d9436bf2a33a29c2a8ecc7830 SHA512 b0f46d1d6da2c7662e486582c787cb88708244089600f1fd2f264afa8d0264fccde164cd12afab07956a8ddaee9c81ed33919ad3cb58c73f52934ca2f8b4495f
diff --git a/sys-kernel/kergen/kergen-0.1.4.ebuild b/sys-kernel/kergen/kergen-0.1.4.ebuild
deleted file mode 100644
index 26ba2b7a78c2..000000000000
--- a/sys-kernel/kergen/kergen-0.1.4.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Kernel config generator"
-HOMEPAGE="https://github.com/nichoski/kergen"
-SRC_URI="http://whatishacking.org/${PN}/downloads/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
diff --git a/sys-kernel/kergen/kergen-0.1.5.ebuild b/sys-kernel/kergen/kergen-0.1.5.ebuild
index 68638205b625..7a4fdb6e770b 100644
--- a/sys-kernel/kergen/kergen-0.1.5.ebuild
+++ b/sys-kernel/kergen/kergen-0.1.5.ebuild
@@ -4,7 +4,7 @@
EAPI=7
DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{6..8} )
+PYTHON_COMPAT=( python3_{6..9} )
inherit distutils-r1
@@ -15,4 +15,3 @@ SRC_URI="https://github.com/nichoski/kergen/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="amd64 x86"
-IUSE=""
diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest
index 86a6a7976440..476e32be9c60 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -9,4 +9,6 @@ DIST kernel-x86_64.config.5.4.21 184907 BLAKE2B 0eb2b07c14cea7545350fcdf3a94f2a5
DIST linux-5.4.64.tar.xz 109593152 BLAKE2B f0bea4ef1fac7a4744848d6328175d1cd200023eba9398bc46511e88e7ad51b559732202d642df60bb5032004e42aae753eb9d7b049781d12303f48e3aece6bc SHA512 135e62581e9bef772a5c68a2b1945bbe09689d5d8bda41a09efdd7ba7cd99afa8010c4157a5d23badeb8b6f9832c53ffda49d1dd6c5862f01b9756ceca9ebcec
DIST linux-5.4.66.tar.xz 109584352 BLAKE2B 5b2f08dfac6069f2a5a842de69b572691d4d6857f07c38c3fee2e2d327b3ddfd2ed7c17e18ef60bfaad3f36161ca61d8796ac537b2a783c5a6580d0abae49357 SHA512 06cfd689542805cb843b19993242adee5d41a383ae6f4c730073f4d56e78a2d9e92f8d012de7635a67290c83cf204302a839ca8d4395869a4c0d4e2457283c05
DIST linux-5.4.68.tar.xz 109601148 BLAKE2B 03e25fdfa93a892aa7b8ea0ba4822c1dbf1f8cb498cdb80b3c3f4f8ea2b7d4f02bcecdf3788afc84dd1fbd4de02add0c2a5f9e5d9ededaa02fff4bf5e8310300 SHA512 027f63296a2b3a0fda3eaeed8ac1a3e0075d90469888c76666f355a69f2c81384e9245d31991f74f6fbba657d35ba32bf280a455e7b5abd68b039990f5f8efaa
+DIST linux-5.4.69.tar.xz 109603628 BLAKE2B 8a9b8e44b5a1ae69a4422f22b31c48ea1cf0ccf4b7fe55baa8e68b4797f717b66b38f739a5e525455ce9ecf99fdf312275a856d7f6956f17f3ffbb10a749ab63 SHA512 3a161bce688b1e9d18703f6354b746d1e8c72dcbbf6e3c8759a98ef3611234a32d7e571977aa78f33db9d42cfd9ad82145f3faea028d335a1863eb624b940b6c
DIST linux-5.8.12.tar.xz 114510484 BLAKE2B 85edb8bea54dc1952e7f3ec439d01b22181ac9ba527ca387a04168966398e615a052d7d9585cde47fa4a4f9f09a7dffffaa41508af9b0cb7c93357e9f54ecf15 SHA512 c1daa20dcdaa2cb805e7a973b684ea40327088d8fadf0cf44f4c73284923363397b12f2e1958d64d6a0ff348198366d46b59a5301a72d3431389d319a4bde489
+DIST linux-5.8.13.tar.xz 114511960 BLAKE2B 1b3510440d07032fd38beec3f325fee6cde73ba07f2fa4d0e220c3d86069a21852a9dd16cdb993a714c12eee2a3eff02f13504326f83354126f02ee399205d92 SHA512 38c5c70b4327e1f0a46bde8acac5350882aaeb1308e5e88e5d8fbc229011ea03dca76489a8413c541bedc28a446f6453e3410afa5e84cde6a57d21ec783e6f27
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.69.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.69.ebuild
new file mode 100644
index 000000000000..ee1e12c459a7
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.69.ebuild
@@ -0,0 +1,129 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-build
+
+MY_P=linux-${PV}
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+CONFIG_VER=5.4.21
+CONFIG_HASH=2809b7faa6a8cb232cd825096c146b7bdc1e08ea
+
+DESCRIPTION="Linux kernel built from vanilla upstream sources"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+ amd64? (
+ https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64.config
+ -> kernel-x86_64.config.${CONFIG_VER}
+ )
+ arm64? (
+ https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64.config
+ -> kernel-aarch64.config.${CONFIG_VER}
+ )
+ ppc64? (
+ https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le.config
+ -> kernel-ppc64le.config.${CONFIG_VER}
+ )
+ x86? (
+ https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686.config
+ -> kernel-i686.config.${CONFIG_VER}
+ )"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="debug"
+
+RDEPEND="
+ !sys-kernel/vanilla-kernel-bin:${SLOT}"
+BDEPEND="
+ debug? ( dev-util/dwarves )"
+
+pkg_pretend() {
+ ewarn "Starting with 5.4.52, Distribution Kernels are switching from Arch"
+ ewarn "Linux configs to Fedora. Please keep a backup kernel just in case."
+
+ kernel-install_pkg_pretend
+}
+
+src_prepare() {
+ default
+
+ # prepare the default config
+ case ${ARCH} in
+ amd64)
+ cp "${DISTDIR}/kernel-x86_64.config.${CONFIG_VER}" .config || die
+ ;;
+ arm64)
+ cp "${DISTDIR}/kernel-aarch64.config.${CONFIG_VER}" .config || die
+ ;;
+ ppc64)
+ cp "${DISTDIR}/kernel-ppc64le.config.${CONFIG_VER}" .config || die
+ ;;
+ x86)
+ cp "${DISTDIR}/kernel-i686.config.${CONFIG_VER}" .config || die
+ ;;
+ *)
+ die "Unsupported arch ${ARCH}"
+ ;;
+ esac
+
+ local config_tweaks=(
+ # replace (none) with gentoo
+ -e 's:^CONFIG_DEFAULT_HOSTNAME=:&"gentoo":'
+ # we do support x32
+ -e '/CONFIG_X86_X32/s:.*:CONFIG_X86_X32=y:'
+ # disable signatures
+ -e '/CONFIG_MODULE_SIG/d'
+ -e '/CONFIG_SECURITY_LOCKDOWN/d'
+ -e '/CONFIG_KEXEC_SIG/d'
+ -e '/CONFIG_KEXEC_BZIMAGE_VERIFY_SIG/d'
+ -e '/CONFIG_SYSTEM_EXTRA_CERTIFICATE/d'
+ -e '/CONFIG_SIGNATURE/d'
+ # remove massive array of LSMs
+ -e 's/CONFIG_LSM=.*/CONFIG_LSM="yama"/'
+ -e 's/CONFIG_DEFAULT_SECURITY_SELINUX=y/CONFIG_DEFAULT_SECURITY_DAC=y/'
+ # nobody actually wants fips
+ -e '/CONFIG_CRYPTO_FIPS/d'
+ # these tests are really not necessary
+ -e 's/.*CONFIG_CRYPTO_MANAGER_DISABLE_TESTS.*/CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y/'
+ # probably not needed by anybody but developers
+ -e '/CONFIG_CRYPTO_STATS/d'
+ # 1000hz is excessive for laptops
+ -e 's/CONFIG_HZ_1000=y/CONFIG_HZ_300=y/'
+ # nobody is using this kernel on insane super computers
+ -e 's/CONFIG_NR_CPUS=.*/CONFIG_NR_CPUS=512/'
+ # we're not actually producing live patches for folks
+ -e 's/CONFIG_LIVEPATCH=y/CONFIG_LIVEPATCH=n/'
+ # this slows down networking in general
+ -e 's/CONFIG_IP_FIB_TRIE_STATS=y/CONFIG_IP_FIB_TRIE_STATS=n/'
+ # include font for normal and hidpi screens
+ -e 's/.*CONFIG_FONTS.*/CONFIG_FONTS=y\nCONFIG_FONT_8x16=y\nCONFIG_FONT_TER16x32=y/'
+ # we don't need to actually install system headers from this ebuild
+ -e '/CONFIG_HEADERS_INSTALL/d'
+ # enable /proc/config.gz, used by linux-info.eclass
+ -e '/CONFIG_IKCONFIG/s:.*:CONFIG_IKCONFIG=y\nCONFIG_IKCONFIG_PROC=y:'
+ # WireGuard was backported to 5.4 but we use old configs (#739128)
+ -e '$aCONFIG_WIREGUARD=m'
+ )
+ use debug || config_tweaks+=(
+ -e '/CONFIG_DEBUG_INFO/d'
+ -e '/CONFIG_DEBUG_RODATA_TEST/d'
+ -e '/CONFIG_DEBUG_VM/d'
+ -e '/CONFIG_DEBUG_SHIRQ/d'
+ -e '/CONFIG_DEBUG_LIST/d'
+ -e '/CONFIG_BUG_ON_DATA_CORRUPTION/d'
+ -e '/CONFIG_TORTURE_TEST/d'
+ -e '/CONFIG_BOOTTIME_TRACING/d'
+ -e '/CONFIG_RING_BUFFER_BENCHMARK/d'
+ -e '/CONFIG_X86_DECODER_SELFTEST/d'
+ -e '/CONFIG_KGDB/d'
+ )
+ [[ ${ARCH} == x86 ]] && config_tweaks+=(
+ # fix autoenabling 64bit
+ -e '2i\
+# CONFIG_64BIT is not set'
+ )
+ sed -i "${config_tweaks[@]}" .config || die
+}
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.8.13.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.8.13.ebuild
new file mode 100644
index 000000000000..540a5ea3c744
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.8.13.ebuild
@@ -0,0 +1,127 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-build
+
+MY_P=linux-${PV}
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+CONFIG_VER=5.8.5
+CONFIG_HASH=af8da8d54d21231fd8c7b943216bb985f0a4e223
+
+DESCRIPTION="Linux kernel built from vanilla upstream sources"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+ amd64? (
+ https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
+ -> kernel-x86_64-fedora.config.${CONFIG_VER}
+ )
+ arm64? (
+ https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
+ -> kernel-aarch64-fedora.config.${CONFIG_VER}
+ )
+ ppc64? (
+ https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
+ -> kernel-ppc64le-fedora.config.${CONFIG_VER}
+ )
+ x86? (
+ https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
+ -> kernel-i686-fedora.config.${CONFIG_VER}
+ )"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="debug"
+REQUIRED_USE="
+ arm? ( savedconfig )"
+
+RDEPEND="
+ !sys-kernel/vanilla-kernel-bin:${SLOT}"
+BDEPEND="
+ debug? ( dev-util/dwarves )"
+
+pkg_pretend() {
+ ewarn "Starting with 5.7.9, Distribution Kernels are switching from Arch"
+ ewarn "Linux configs to Fedora. Please keep a backup kernel just in case."
+
+ kernel-install_pkg_pretend
+}
+
+src_prepare() {
+ default
+
+ # prepare the default config
+ case ${ARCH} in
+ amd64)
+ cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
+ ;;
+ arm)
+ return
+ ;;
+ arm64)
+ cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
+ ;;
+ ppc64)
+ cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
+ ;;
+ x86)
+ cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
+ ;;
+ *)
+ die "Unsupported arch ${ARCH}"
+ ;;
+ esac
+
+ local config_tweaks=(
+ # replace (none) with gentoo
+ -e 's:^CONFIG_DEFAULT_HOSTNAME=:&"gentoo":'
+ # we do support x32
+ -e '/CONFIG_X86_X32/s:.*:CONFIG_X86_X32=y:'
+ # disable signatures
+ -e '/CONFIG_MODULE_SIG/d'
+ -e '/CONFIG_SECURITY_LOCKDOWN/d'
+ -e '/CONFIG_KEXEC_SIG/d'
+ -e '/CONFIG_KEXEC_BZIMAGE_VERIFY_SIG/d'
+ -e '/CONFIG_SYSTEM_EXTRA_CERTIFICATE/d'
+ -e '/CONFIG_SIGNATURE/d'
+ # remove massive array of LSMs
+ -e 's/CONFIG_LSM=.*/CONFIG_LSM="yama"/'
+ -e 's/CONFIG_DEFAULT_SECURITY_SELINUX=y/CONFIG_DEFAULT_SECURITY_DAC=y/'
+ # nobody actually wants fips
+ -e '/CONFIG_CRYPTO_FIPS/d'
+ # these tests are really not necessary
+ -e 's/.*CONFIG_CRYPTO_MANAGER_DISABLE_TESTS.*/CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y/'
+ # probably not needed by anybody but developers
+ -e '/CONFIG_CRYPTO_STATS/d'
+ # 1000hz is excessive for laptops
+ -e 's/CONFIG_HZ_1000=y/CONFIG_HZ_300=y/'
+ # nobody is using this kernel on insane super computers
+ -e 's/CONFIG_NR_CPUS=.*/CONFIG_NR_CPUS=512/'
+ # we're not actually producing live patches for folks
+ -e 's/CONFIG_LIVEPATCH=y/CONFIG_LIVEPATCH=n/'
+ # this slows down networking in general
+ -e 's/CONFIG_IP_FIB_TRIE_STATS=y/CONFIG_IP_FIB_TRIE_STATS=n/'
+ # include font for normal and hidpi screens
+ -e 's/.*CONFIG_FONTS.*/CONFIG_FONTS=y\nCONFIG_FONT_8x16=y\nCONFIG_FONT_TER16x32=y/'
+ # we don't need to actually install system headers from this ebuild
+ -e '/CONFIG_HEADERS_INSTALL/d'
+ # enable /proc/config.gz, used by linux-info.eclass
+ -e '/CONFIG_IKCONFIG/s:.*:CONFIG_IKCONFIG=y\nCONFIG_IKCONFIG_PROC=y:'
+ )
+ use debug || config_tweaks+=(
+ -e '/CONFIG_DEBUG_INFO/d'
+ -e '/CONFIG_DEBUG_RODATA_TEST/d'
+ -e '/CONFIG_DEBUG_VM/d'
+ -e '/CONFIG_DEBUG_SHIRQ/d'
+ -e '/CONFIG_DEBUG_LIST/d'
+ -e '/CONFIG_BUG_ON_DATA_CORRUPTION/d'
+ -e '/CONFIG_TORTURE_TEST/d'
+ -e '/CONFIG_BOOTTIME_TRACING/d'
+ -e '/CONFIG_RING_BUFFER_BENCHMARK/d'
+ -e '/CONFIG_X86_DECODER_SELFTEST/d'
+ -e '/CONFIG_KGDB/d'
+ )
+ sed -i "${config_tweaks[@]}" .config || die
+}
diff --git a/sys-kernel/vanilla-sources/Manifest b/sys-kernel/vanilla-sources/Manifest
index 243d853a65ad..6c73a27f897c 100644
--- a/sys-kernel/vanilla-sources/Manifest
+++ b/sys-kernel/vanilla-sources/Manifest
@@ -3,12 +3,10 @@ DIST linux-4.19.tar.xz 103117552 BLAKE2B 1dbf16cf410867412d17568fe42bc1e90c03418
DIST linux-4.4.tar.xz 87295988 BLAKE2B f260f1858994f5d481fd078c86e51bddbc958f7c5d1586f60dced772e1b1107ecf3aae0558c3e6f39c36f7d3aa1e6cd1e5c64ec9d6f2218f47b98413da6466fb SHA512 13c8459933a8b80608e226a1398e3d1848352ace84bcfb7e6a4a33cb230bbe1ab719d4b58e067283df91ce5311be6d2d595fc8c19e2ae6ecc652499415614b3e
DIST linux-4.9.tar.xz 93192404 BLAKE2B 83ae310b17d47f1f18d6d28537c31e10f3e60458c5954c4611158ca99e71cc0da2e051272eabf27d5887df4a7cb4a5dd66ff993077c11d2221e92d300a0b48d7 SHA512 bf67ff812cc3cb7e5059e82cc5db0d9a7c5637f7ed9a42e4730c715bf7047c81ed3a571225f92a33ef0b6d65f35595bc32d773356646df2627da55e9bc7f1f1a
DIST linux-5.4.tar.xz 109441440 BLAKE2B 193bc4a3147e147d5529956164ec4912fad5d5c6fb07f909ff1056e57235834173194afc686993ccd785c1ff15804de0961b625f3008cca0e27493efc8f27b13 SHA512 9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb18419b2656b6795eac5deec0edaa04547fc6723fbda52256bd7f3486898f
-DIST linux-5.7.tar.xz 112690468 BLAKE2B b2b71e231507429b178b6b89be546c4a3ee2757f5d2c58b6137d383f16034a587225a75a9dbca6a01a433056ebe078487132c224e909a2971c9634687e47b1d1 SHA512 45bde01593f6147c8c169b9e46b4b56eee998142552ae0ff82f1dd21b1fd54f3b32f6283f6bd77ea717d374672167849e468c157f235d2f12f7d7816e4623bf6
DIST linux-5.8.tar.xz 114459324 BLAKE2B 7bd97f8fa4527840754434414c07283e89731dc8ebb1e95fa5bc1469a60af1122582c0d3b6e262e77882f023190068df3537bd8b65964b3caa820bb2c8e579c7 SHA512 45a53ecf351096ef6e98242cca4228b8da9b9139ecc6963695791ea6fb7a9484a4e1c19dcca7ce7cbfdfa49de0451b70973bb078f12bdae9cbaddbc3f8092556
-DIST patch-4.14.199.xz 3893364 BLAKE2B c0c4e8d402e9f6f05b65ad243130b011138ece53f6fe791f9e68f89536c8e37a752badc5d4bc53b11133afb3b84760a7c4a57ba65ae7d23cc1d9a60cdc606f60 SHA512 5ca1070e58a8cb6548891c9c470bc8f5d9c8beea1f441032281ca61524d8beb96e4678162479d3aff7f96d02d3682d5376d91dd0718b138f5e13dc4547dda329
-DIST patch-4.19.148.xz 3434156 BLAKE2B 8737101044c2dc5400b64c61f9589a10b0af3eb862cd439098eeb6d2cd0645676f93093549494584789e38786dc19d1843fc5136187797abe6b3bd6713aae721 SHA512 a8790ae1925d1622f469e975e5da3baaca6204d324f5c981159d19011f77df51a600ea76e1d6da6f2bac6e9c1c2cf1b64f0df5e7e288800ca7451195be6146a7
-DIST patch-4.4.237.xz 3318664 BLAKE2B 1771de77c365203b1a40f0c6880a0b2fcb090044c7214bf756aeedffe7ec72fca482ebad2c5efd957b285d341d26fcdefc7731a0512faba6ddc0e4382d7cc78e SHA512 3358f389d334258aca30ba3e2bf1b13b6bb86707dcb1cfce788d83c2ca1674cd437d7aa0484bfa0ace8906f1695af98cb6053e2d902c09deaf66ac1bef9a4598
-DIST patch-4.9.237.xz 3675464 BLAKE2B ab202035a95936544f0b3cce2e14295bac52450c83aa9b6d6cfd36fc108eb72a610ee89d725564e6b2f6c2006a832b3b2fcbe5b4d4d51d5bed3d902e330a136b SHA512 de937e1b64a12fdc86452d97dc5f5d99c5d71851d9a480dcca21712f85bf9f07dd754695cf5678f41df5e67d2ac2aaadce87f7e4a9a725f191168c02a2c9473f
-DIST patch-5.4.68.xz 2007900 BLAKE2B 95b3e0db26a03596dfe2407a709f7fce085d7222e1a99d568073517dc2eb45e806010a91db6e129ba1ce9c75499ef853fcf189e40511aea7dc8acb0ce76b5ca3 SHA512 4db326bc299245e32ccd7e0d988a823fa3d115265d6f7a16ece056f1f6317193405de43b9dbd020ec992822442aa5c0311d9b56ed7408b5bc8587ca49612f962
-DIST patch-5.7.18.xz 773408 BLAKE2B 624c9909c3983e86df6affb562495925c729534ce6108af3c49c73b24c8c74d73cac44843abae2486e507d4f43c55588cb1a00f0f0f1a1204ffd3efbc512f980 SHA512 59fba5b05fbb8b2f072642318bcd49db1c990a46683bbff18c1578ef149be13be15637d353c0423babcab22820cab2a4ca3801dbc33459725e32a5df9d74987f
-DIST patch-5.8.12.xz 482628 BLAKE2B 5c29e28392665d07475c08749c59a3784ccd52dd88d22eda7477a0366c375349cdfee7b15c8d28f69c8d83a19a96e499a0e29c4b72b583241a7980a443c2761c SHA512 46aaf68e7771376688401736b8f36cbfa32e0cf2bbaeeeeaaaed0e9c44e62b427db912397f04415e65981eb801f9a23384503e3f005c1bf34d96bdfe39460b06
+DIST patch-4.14.200.xz 3924520 BLAKE2B a9a03c1d050876122208e988ebd8ac8a02e36478d331fea1b987f49296840d5f68688d14ff52cc3ef62b08217dcd932f87f131ae5c1a4ceb186160bbd4293d0e SHA512 1f80b48bd691a06789a08730227081f42ae2a104ee3b28f2ce023834fc8e500eee9fa2b2773c95aac386d06044406e77022cf692b8022bac0417b57cd0c5906f
+DIST patch-4.19.149.xz 3486848 BLAKE2B 45922aa5a9e22f2851d214417fde10de37a538c26379e758433e92de5e3a7b1079e0098f912eaebf7eec1398e010680e4996f6c9d2735e45507dfa1a7658c1af SHA512 5ec151d66d4c40c6a196e18890d50543f12cee48c1d38785d4e3114ec1acbeb6d2d3a97993b2a92b87090a9bcf72f316142be27272e31d410aca93124ce6e719
+DIST patch-4.4.238.xz 3333168 BLAKE2B 7e5c487c1b3d1e1acff703391438e3ddac0bc904956a6075dcd014432c6b47d46b8d1a5d3aa70ee968e9e1411b83d4196bdd1f74cd448140cc0e9a9a9e7130d1 SHA512 00faa3f0f0db0b54894343b5c671483a86cd7566650e9d33378510319101c7334ba12f9773c9f7e6794e3d818fdca386edf63134a0ae27e8f5ce1ff3aeffa0f6
+DIST patch-4.9.238.xz 3697300 BLAKE2B 7acb0538c9ed95a6058fb74ce2dae90eba483ea1bd516b85d9ecfc38f75b8c742ea6404f16b773ae90ece1615ff769426fd9f49661291ac28e325bb63a8f7076 SHA512 a8cf63afad2b0e773403ea308278b9421dee744412c6af73e3edaa30d080ae6ba8051bd0726b468ad9e06e9c564da027b016cb4bec6c4388a1785edc67e2dca5
+DIST patch-5.4.69.xz 2117080 BLAKE2B 619d336ea9a6bf36b895db92649ba966c4f4b2ac81ef37320d41c52e8a58f64a1ee740a7e1059eeb687903a7ca4eecdf676871ac1772e306823722b3153d1791 SHA512 a929fbf3d2c72717c786ad5911dd59a8a80d0ab52a91ae1087db00ee7c26061a3214c22ae863230a88dda378c313b67660c12f65aeae661dc40d59e1a0ee9cab
+DIST patch-5.8.13.xz 507376 BLAKE2B 1c23aea239e7a9329546aedd161a415bf59b8c2aa9dba1e11c2775cd93013e70541205894acc6f79707ab432840bcc2363ca170fdfb827a2f87684f6bac7aa00 SHA512 4686b149cde34dae709a806b283724a970a2a8ce3b5bc858c160618c756ce3d6dd5628d9e91117a682dc011a68ef23cc3e9c16fbce4ff3537d919201a432ade8
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.14.199.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.14.200.ebuild
similarity index 100%
rename from sys-kernel/vanilla-sources/vanilla-sources-4.14.199.ebuild
rename to sys-kernel/vanilla-sources/vanilla-sources-4.14.200.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.19.148.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.19.149.ebuild
similarity index 100%
rename from sys-kernel/vanilla-sources/vanilla-sources-4.19.148.ebuild
rename to sys-kernel/vanilla-sources/vanilla-sources-4.19.149.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.4.237.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.4.238.ebuild
similarity index 100%
rename from sys-kernel/vanilla-sources/vanilla-sources-4.4.237.ebuild
rename to sys-kernel/vanilla-sources/vanilla-sources-4.4.238.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.9.237.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.9.238.ebuild
similarity index 100%
rename from sys-kernel/vanilla-sources/vanilla-sources-4.9.237.ebuild
rename to sys-kernel/vanilla-sources/vanilla-sources-4.9.238.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-5.4.68.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-5.4.69.ebuild
similarity index 100%
rename from sys-kernel/vanilla-sources/vanilla-sources-5.4.68.ebuild
rename to sys-kernel/vanilla-sources/vanilla-sources-5.4.69.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-5.8.12.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-5.8.12.ebuild
deleted file mode 100644
index 26a9a84f3519..000000000000
--- a/sys-kernel/vanilla-sources/vanilla-sources-5.8.12.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-K_NOUSENAME="yes"
-K_NOSETEXTRAVERSION="yes"
-K_SECURITY_UNSUPPORTED="1"
-ETYPE="sources"
-inherit kernel-2
-detect_version
-
-DESCRIPTION="Full sources for the Linux kernel"
-HOMEPAGE="https://www.kernel.org"
-SRC_URI="${KERNEL_URI}"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-5.7.18.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-5.8.13.ebuild
similarity index 100%
rename from sys-kernel/vanilla-sources/vanilla-sources-5.7.18.ebuild
rename to sys-kernel/vanilla-sources/vanilla-sources-5.8.13.ebuild
diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index cf13ab2b24da..7431b10fb488 100644
Binary files a/sys-libs/Manifest.gz and b/sys-libs/Manifest.gz differ
diff --git a/sys-libs/openipmi/openipmi-2.0.29.ebuild b/sys-libs/openipmi/openipmi-2.0.29.ebuild
index 8e3f1eb3694f..27c9c77642ec 100644
--- a/sys-libs/openipmi/openipmi-2.0.29.ebuild
+++ b/sys-libs/openipmi/openipmi-2.0.29.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
LICENSE="LGPL-2.1 GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~hppa ~ia64 ppc ~ppc64 ~x86"
IUSE="crypt snmp perl python static-libs tcl"
S="${WORKDIR}/${MY_P}"
RESTRICT='test'
diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index f043616ad9df..2f49c94f0fcd 100644
Binary files a/www-apps/Manifest.gz and b/www-apps/Manifest.gz differ
diff --git a/www-apps/ampache/Manifest b/www-apps/ampache/Manifest
deleted file mode 100644
index 5d9513989cd3..000000000000
--- a/www-apps/ampache/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST ampache-3.8.3.tar.gz 8444610 BLAKE2B a08f49ee043ea8dbf89d7ac8a3bed892be389605f6d23aa1454166d7058ae227ec6f24cf397e4d7e9d93c9441a43df54824ece768980cbf7e98bd5a098648a5d SHA512 35deb6bde949641bf39f58e033953bc0d79f1f56033d496e5a3d302d16c998da3468d1d82ac49e0702fada34a6dafb22ffa5bc931fe886e35c81ba2a5cf1233e
-DIST ampache-3.8.8.tar.gz 8453616 BLAKE2B 4cfd19e90dda22012b6dd73d4540bb5252e514682b0e51be35456e7179f86123b6e8a7af8e3d936e53e0889da8927a9975ef07761415d019dc9668fc91461615 SHA512 4aa010b6bb42a192d6e2408265a78e738a356c08bfb43464fbc6e6375d8cdc9e4701280db0b21f73a1302b2792f9474c6dc5c7808c977a29aab2047a80caebfc
diff --git a/www-apps/ampache/ampache-3.8.3-r1.ebuild b/www-apps/ampache/ampache-3.8.3-r1.ebuild
deleted file mode 100644
index 5466c51401ae..000000000000
--- a/www-apps/ampache/ampache-3.8.3-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit webapp
-
-DESCRIPTION="PHP-based tool for managing,updating and playing audio files via a web interface"
-HOMEPAGE="http://www.ampache.org/"
-SRC_URI="https://github.com/ampache/ampache/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-# Remove this and the SLOT line below if the code changes. Added for a dependency only change
-WEBAPP_MANUAL_SLOT="yes"
-SLOT="${PV}"
-LICENSE="GPL-2"
-KEYWORDS="amd64 ~ppc ~sparc x86"
-IUSE="aac flac mp3 ogg transcode"
-
-RDEPEND="dev-lang/php[gd,hash(+),iconv,mysql,pdo,session,unicode,xml,zlib]
- transcode? ( media-sound/lame
- aac? ( || ( media-libs/faad2 media-sound/alac_decoder ) )
- flac? ( media-libs/flac )
- mp3? ( media-sound/mp3splt )
- ogg? ( media-sound/mp3splt media-sound/vorbis-tools )
- )"
-DEPEND=""
-
-need_httpd_cgi
-
-src_install() {
- webapp_src_preinst
-
- doman docs/man/man1/ampache.1
- rm -rf docs/man || die "Unable to remove local man dir"
-
- dodoc docs/*
- rm -rf docs/ || die "Unable to remove local docs dir"
-
- insinto "${MY_HTDOCSDIR}"
- doins -r .
-
- webapp_postinst_txt en "${FILESDIR}"/installdoc.txt
- webapp_src_install
-}
-
-pkg_postinst() {
- elog "Install and upgrade instructions can be found here:"
- elog " /usr/share/doc/${P}/INSTALL.bz2"
- elog " /usr/share/doc/${P}/MIGRATION.bz2"
- webapp_pkg_postinst
-}
diff --git a/www-apps/ampache/ampache-3.8.8-r1.ebuild b/www-apps/ampache/ampache-3.8.8-r1.ebuild
deleted file mode 100644
index 1e494dd35081..000000000000
--- a/www-apps/ampache/ampache-3.8.8-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit webapp
-
-DESCRIPTION="PHP-based tool for managing,updating and playing audio files via a web interface"
-HOMEPAGE="http://www.ampache.org/"
-SRC_URI="https://github.com/ampache/ampache/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-# Remove this and the SLOT line below if the code changes. Added for a dependency only change
-WEBAPP_MANUAL_SLOT="yes"
-SLOT="${PV}"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="aac flac mp3 ogg transcode"
-
-RDEPEND="dev-lang/php[gd,hash(+),iconv,mysql,pdo,session,unicode,xml,zlib]
- transcode? ( media-sound/lame
- aac? ( || ( media-libs/faad2 media-sound/alac_decoder ) )
- flac? ( media-libs/flac )
- mp3? ( media-sound/mp3splt )
- ogg? ( media-sound/mp3splt media-sound/vorbis-tools )
- )"
-DEPEND=""
-
-need_httpd_cgi
-
-src_install() {
- webapp_src_preinst
-
- doman docs/man/man1/ampache.1
- rm -rf docs/man || die "Unable to remove local man dir"
-
- dodoc docs/*
- rm -rf docs/ || die "Unable to remove local docs dir"
-
- insinto "${MY_HTDOCSDIR}"
- doins -r .
-
- webapp_postinst_txt en "${FILESDIR}"/installdoc.txt
- webapp_src_install
-}
-
-pkg_postinst() {
- elog "Install and upgrade instructions can be found here:"
- elog " /usr/share/doc/${P}/INSTALL.bz2"
- elog " /usr/share/doc/${P}/MIGRATION.bz2"
- webapp_pkg_postinst
-}
diff --git a/www-apps/ampache/files/installdoc.txt b/www-apps/ampache/files/installdoc.txt
deleted file mode 100644
index cdd6e118238e..000000000000
--- a/www-apps/ampache/files/installdoc.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-Install and upgrade instructions can be found here:
-/usr/share/doc/ampache-/INSTALL.gz
-/usr/share/doc/ampache-/MIGRATION.gz
-
-For general information please read:
-/usr/share/doc/ampache-/README.gz
diff --git a/www-apps/ampache/metadata.xml b/www-apps/ampache/metadata.xml
deleted file mode 100644
index 56a3a2207a01..000000000000
--- a/www-apps/ampache/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
- Install optional dependencies for transcoding support
-
-
- ampache/ampache
-
-
diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index 75594258d73f..790b2d188aaa 100644
Binary files a/www-client/Manifest.gz and b/www-client/Manifest.gz differ
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 74bcfcc7fca8..258e12ebaaa8 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -1,7 +1,7 @@
DIST chromium-85-patchset-2.tar.xz 9724 BLAKE2B 929d6abe3a66db395a9cedc63510a6a0ed0d79057f92ade22fe26221bf46a63e88fb40d6e54e6ffa837d142ec5da22e2b428f3153db431e3389de0b230fa2aec SHA512 753ce53c2c10cf1abdce334086a633dfcb4543c86a2dccbee0ad1bc8a8a0b642cdd18e2277c67088a380a9fa2ca8fd655e2fc0b3a2931de3230afa046615cd0e
DIST chromium-85.0.4183.121.tar.xz 833194480 BLAKE2B d91302792fc34730795815a39ba91878f1d6d33c7bb810a10efcea2e117c069a6493b3acb1e3d8a04b19d599335b60d70523f47c65c42080cbe0d3981255c264 SHA512 9d61a0782c012fe36467a10f008962d45f4eaa065f6812276d847f7563056124c9fd21d8376dda8ab64e4c3b793da0593bac9d39988bbd60221828084b534945
DIST chromium-86-patchset-6.tar.xz 7152 BLAKE2B 494b412caec2b3e3fd6c838ba4b61d499433f5a6043e4763efc424c811e405ed11461d8df2afe0aa22d898329ef82df0c43c47ae30f7c4a1c0c3f6e5b314e283 SHA512 68833c9dea6a7183ff42a2d432cf811b360c1237c36feed6b4f9163b61d7f98854ce73b33c58851cb800cf72311a638adeedb4555caf15f80b4bd6aca5039aef
-DIST chromium-86.0.4240.53.tar.xz 825355604 BLAKE2B d7a74d2fb82c2f686f502932de79e081c13f5b4a2cf3afc5f01944f1bff9574ce5be6650b1b72443729bd014d4b869af09a08ad784fd1a5984ec8a6d0c7c1261 SHA512 874be536c589b1d6b5c28018de740af414ba431d6de5232047370f5c0e54c784971bde27b3410bfb077254a1e224d488a7d65c9205f8107eec521930c357c8c8
+DIST chromium-86.0.4240.68.tar.xz 825424240 BLAKE2B 69638d0c0fb434593efd63c8d1700992d52e4ed20f5d36f2152d9c5e9aa6a0fc35a83c80c3428e3bc35ffb70e351185380ea2d4b98bcae6ca2dc7186d73ec45b SHA512 85d55d2ed5fa5fc9c835015871df258a7f465d07ba8b959345d309c52c718b70c2bbce476544eb1b432e88ef5f26ed3d1f1aeba50929b3795391f27371748f53
DIST chromium-87-patchset-4.tar.xz 8100 BLAKE2B cf052203bb9ced993f051ebac51270da1482e59999d87aff24fa81d25cc0de228a92a00abb56e0caa91c3f045bdd9df7524d77b375b77f1a0c7c198cb05c7649 SHA512 bc7cb6ad99c7d45999d45e5c9df05d43c80c25212dafe3750146d2cb5b38a7239e32ac1e9bf245331ba7055c0a36e551131eab92ecea907e51878259416b59a9
DIST chromium-87.0.4270.0.tar.xz 831037464 BLAKE2B f9b19b704e252b96c5a6861719828d3b08eee9128d753a8c264b21b0bd26cbc1e7a3d29909d4300e59246ac9c56b88e205f83efd024897915a8b77085fe5f160 SHA512 76cbf88b1390c2e64d6615e29763f00493b94beff5836c240833840b1b50fa782c137ebc66a81a6940f35052895bdc0098fefca5e6cc46f56dbc2b8b2184ca6f
DIST setuptools-44.1.0.zip 858569 BLAKE2B f59f154e121502a731e51294ccd293d60ffccadacf51e23b53bf7ceba38858948b86783238061136c827ac3373ea7ea8e6253d4bb53f3f1dd69284568ec65a68 SHA512 4dfb0f42d334b835758e865a26ecd1e725711fa2b9c38ddc273b8b3849fba04527bc97436d11ba1e98f1a42922aa0f0b9032e32998273c705fac6e10735eacbf
diff --git a/www-client/chromium/chromium-86.0.4240.53.ebuild b/www-client/chromium/chromium-86.0.4240.68.ebuild
similarity index 100%
rename from www-client/chromium/chromium-86.0.4240.53.ebuild
rename to www-client/chromium/chromium-86.0.4240.68.ebuild
diff --git a/www-client/firefox/Manifest b/www-client/firefox/Manifest
index 71a9167243fa..0eef2dfa307c 100644
--- a/www-client/firefox/Manifest
+++ b/www-client/firefox/Manifest
@@ -91,102 +91,6 @@ DIST firefox-68.12.0esr-xh.xpi 470243 BLAKE2B 1c1e8a6ce19687687827bc8e8ac3cf5230
DIST firefox-68.12.0esr-zh-CN.xpi 536443 BLAKE2B 2f0c8f0a541065d63e55673729b110495bfef7d07a71057b1c83cc3663888519ded6af1155ae47305a8468551354a4def2377903e3883e39060080b6b15d0a23 SHA512 30eca263f2e7aa516845305df42cea51646f8b9b7e011a9833df1e8b0e0266f24d20522fd2d070c07aa4ad10fad9509b13135ee747b56903b3e00cc9207b816c
DIST firefox-68.12.0esr-zh-TW.xpi 535854 BLAKE2B eade9f743136204f614a207c7ac4e07124f6f4a81de83b80da5659c42b19b0d794165147268bff847f64b185e370d91a1efe2dc694feb2643515a360eb5d71a7 SHA512 c81b18754fcd4e2bf6be72756bd730291732db41eb1c2320f22380fc4f87b505c162a02e8400833266ce59c43e60fa5d2e37f12f66ad7922acb509a42a9c0565
DIST firefox-68.12.0esr.source.tar.xz 313856956 BLAKE2B eeaa4acc9fabf15ec1b313170a30cee8e1fc10a8b08512b915b83b7d6a81c09b365733ed94638bd434864fd7b0cb8cbf1bc2e43441be69e31117e8e6a099234c SHA512 839b02422e4c87bdb12e0995cd35ca8c1996f3fba00bbb46b419e46b67df5ec48a264cb14632db777ce29166ee4fdcb06e2ee3ce847e64328c58c9a2f9129f4c
-DIST firefox-78.3.0esr-ach.xpi 500682 BLAKE2B cf2428cc06010aa818d541e0c50bd6ebea45e36238b1652e3443ee7036a152fbd6268274177b7b2c8ed0345ea9d9907f639ae454c13ef4d85d359b0968fc2519 SHA512 6d02af8987e18f0827d68d25bc1f916ed4fd163fb33f5c173edafd59038e036129199034839db771570e66aeccc1135ac5effbb7b01455f299cbbef91abaa0b3
-DIST firefox-78.3.0esr-af.xpi 444088 BLAKE2B c494ac63cecb8e4bcd9d41b227f5a2ef8e11012bb2d6b27c98c04a2f65d65303a2d0978dd31cb8d19bfca4e3a782906b11c33c5e74f8723c7f206228a81a6efd SHA512 8d082592d8c57c04b7dd022a1a972a59db8ef842279ca3d9973d350c053db35c11c9ac9eb959e087fdf43ead20f65b043513d975828a2f93bdc0faed382ccd6a
-DIST firefox-78.3.0esr-an.xpi 511470 BLAKE2B 3ad2f995299f96bce1d793cb846a99c025333b0c84e3e20dce6b2cd89804120eda44c976a57edee5d7c08362f2fe136dc579e579d9aedd65b6654360bef1b569 SHA512 4407016fa13849bcf83acc654e805719df4eb731ccdc7c7516e3dea492597f64e08d3fafe72708cc3ed921966af9f1b7eca82a0810a56fc57c573def196f2e20
-DIST firefox-78.3.0esr-ar.xpi 588708 BLAKE2B ac3dd8f0d23b0e940b2518ba89a031f082f41b8e8939ce143fcf9ef1e62acbd787fd786dd9d170b83b515075e0d333d54007a4f35ac5edd26eac522ce2b7450e SHA512 a550f82d4cb8d4bfa459b7b11a5f291d735bf20aa1403934b322dbeeffb69a4b645ffdf7fd1cfa7bf1e041b4f4fc1a9713f78d8e194699318daddd4104428497
-DIST firefox-78.3.0esr-ast.xpi 500545 BLAKE2B fad5d4dfba3a1785496788cfad57a775e0b48aed6632412019c5ad4b15fdcaf95e31411e65c911bea5da2d630f695f256bada4c601b3c114353efc926c487fb1 SHA512 06ee764ffd72eb4742d71face7a13984281ae9bb7fa4d1fdfa76e8e8309952261308a6f8881b716544385b6779cd03c2644beb50fc912511ab11c3f2dc910c94
-DIST firefox-78.3.0esr-az.xpi 537588 BLAKE2B 34597b9eb308816f5a12fd00307685fe160ca84e466528e719578adf6dae87b695c0539083ba09dafb3cd9a05d392a3b094a1e8a722beabf4ead6638e94b0b62 SHA512 91c3e0b14eacda998ac2d96f51304459e57ae3c06bb80178c67385094a930df9a29cfcdf2f36e3dbbbe9cb622d8976a3d717bcf63a4cf8369c9aa00626f4316b
-DIST firefox-78.3.0esr-be.xpi 647672 BLAKE2B 4c602a3403ada1d10351668cded869393f555a8292a947afbde0dec16f8a24743a8c67fd703dab92bafcb99ae3bb66f90c0bd5af1555e4474ca680fa486f3c5b SHA512 ea3ec989f942c8631f53d83a84e7f4b055553ab83503b879af5fc6050626c1a56d34fc2f9f1260213b6d7ffc6baa1fa9d42ada7f23edcdb06a4161f0887fedf9
-DIST firefox-78.3.0esr-bg.xpi 608529 BLAKE2B fed0302aef1330f37a92f14ddda35484945913800b02598ab60414b71a582aa754d9726f362a8d3c365082d62101cb553b4368e30415be816a4b0aaa4cedb499 SHA512 a1cf066661ae467dff419c58534a393b4e71b17e4f21419204cc4bf04fb0da951cd22ed133abecfcb25135ff9fdd56dd3d9c75a5b4a21321fa474d564c6e5315
-DIST firefox-78.3.0esr-bn.xpi 634043 BLAKE2B d2acf1e93bfdf6fae63b72c16195a252389eb2e61c1e940e7cb1ec2d6e854efb0168b4995fd701cab55cf90ffe1cb3bdbf8bb21b023a4434423b39e8aca6eb11 SHA512 e4fc1043f2ebc2f2890f4074ea350fdc3ae6366a922edc732c199998e73a4789e613129c52217a87003babc457bfafec1da660bac8349a9e80e76a1b2e42fc43
-DIST firefox-78.3.0esr-br.xpi 551259 BLAKE2B 333ad7581f4a020b61bc7424efcf5e267ffec2f0322678d7d1f7ec19f68b5ad21cf529381cdcd159300c98d4f215f232ce9026fbf1d4a283f9dbf87b2a46089e SHA512 decbcf6c78d73ced1e71d0dd5708ea6eb5553650826f66711fdbdb0ad88f7f64d00172aa3cf8653cbe748bdfe72a3d1176abff27ceed08289ba4e3881fb7c427
-DIST firefox-78.3.0esr-bs.xpi 506398 BLAKE2B 11b4b9f0780d26d5ed023d128ab79607f8e182519970cd4f308a21d79032b7e4d1c4b8148fc428e624d3f5172e565e27223370f7f5c46e2c20367d5cb18e8b78 SHA512 8fd41cc107473a83e8c90638406b0976f7242f9614b273d20a5030986f8e1fe3bbcf84a41a3657d46364e25172a5d4f2043117c683ef20841b02af50009032c4
-DIST firefox-78.3.0esr-ca-valencia.xpi 558395 BLAKE2B 7f794034c495355445e5c51d29d4af85ec6093380965414ed03e1430431462cd965f69a9699f47449e31ef87f5dc8bf2b16e1b8277d409fe40446c2b6e9e9652 SHA512 9369d644b8a65033c6c35b4da5e3c994e6386743810d1c76c5ab16da684f53a9c238bfb684b74ca0f9c73af4b6832980262f2bbae9bc19e945f355461e27a469
-DIST firefox-78.3.0esr-ca.xpi 552885 BLAKE2B ac9d0bdfbcd00d84ef4b1075fce0ccaa4399c1ffdf41765b25c7c3ac1583564fcdc47329943cdb7d058df2aada649ad8cf5f20c332de6126912f10af54a0c01b SHA512 dbb376de94bfa77af6e3f826a2b31c5e4fa212caf403d7d7fd17fcd899360b7f4e65de0002855e0c62a7bc7fa1e94f0f05272d9069e0337ef875f99ce1763c09
-DIST firefox-78.3.0esr-cak.xpi 584944 BLAKE2B 946b55cf0b0cb25649c41fdc214b87d1982c16296c4ac4ac0ebee61512aecee07430126d964de3dc6c71301af617293fc230fe5c2d0e7a68f893e9a8605dab66 SHA512 e83ff70e45966f1ab42cbf1a6af50372e9beb7ae22c7dad7ee2da6b8542bdece2e1165031588995f3bd32511c8af7ccf0117a70047e96d715028fdca7b190181
-DIST firefox-78.3.0esr-cs.xpi 585532 BLAKE2B 830dd4f7e0d0e7b51cf0d4c2fdf8be8356831f23380b8ba532f862076058efe933b4cd0423f5717da04ac32d09761297b25f85503acf0825e374a5574292735d SHA512 de7fe657cfa1b6ecef487bfa8081003315854a767f749b8e940128ffcf29ad1a249769bcbab86e286de4e1ce5910d82594e96d7bb87e1f8ecbcea172fabd6b3c
-DIST firefox-78.3.0esr-cy.xpi 563223 BLAKE2B 301f7ae058ed8c5bfd88efdbbf528e9ce863498c6b8d476f1d138583fbee4edde6b2a7fd12091e54dd07a5e661440ea573bbbd3998b43f7a32ebaccb20c3a8be SHA512 a8a14b7b11041b6155c26aa6f133542a5d515aaf3e43aeb55d8c80aa3083300e8865148cb5fe6c6e8477d909d7d5c440f04c409efe42565c50909279241af506
-DIST firefox-78.3.0esr-da.xpi 552316 BLAKE2B cb3021d1772836eab2d1aed539abd360662073c8ef63d62bc88a0726fbe063a56a0068695d962f8e377d28e56b0c31208db8edcd8a2a31848e7a25230bf51a12 SHA512 6c4d6d2a276bff85d6817240d964815c81d2c238682eb001afd770f64bc349d06b76e70c31f7e414cdfdc296c6ab75a62ee08315c7ef3abf5a072a16d3cd6c15
-DIST firefox-78.3.0esr-de.xpi 576946 BLAKE2B 5b43bcc1ffe80921231b0bba46631e3d8b637cbc79960e795901f407d897f2c62122ecaff7c4174f3a2325a6121be35ad2d9c19d3dfcfb787a3a1220c17f7b6c SHA512 2def0eae41265af867a088116bddd6bf795d778ceb12f7c99f35f26ca7167f8bc3c307b2a86597b5d71139cb71a6be342c01362c0901d5965a7d1b6c301470ae
-DIST firefox-78.3.0esr-dsb.xpi 589035 BLAKE2B 5a1ade20a3f8e880be54df7933d16566340f45b7fe78f4d4c43e8a683470532137a5a4e6c06c48bb800f8bbb1462c9d41a5c6ddea3a3ee3cddf21ed2010cda88 SHA512 df8b00d9f129badc06ffb0bcdf04cfa4387ac6b52b420b376123b0cc275d6dcb1644c0385a61759edf619f51156ab23c0c4fcce1a117517083f0bcab59e11283
-DIST firefox-78.3.0esr-el.xpi 665906 BLAKE2B 6aae483aa66b1f993f62a005d9c12ace14813b385d1e7b7a8740bc7f1bb0538c98840ae5c78971009e74a3908aef9177dc4735b2c88000fc0eab614ee50f6dec SHA512 1ca05989d02364b4bf8e4096cc8fe72e91c300a07bcc749afb53ea20d9fdec2adc7b5217b1d5cb8b79043ce22bec278f3af0af194cd323064bf6a57061a9eb3a
-DIST firefox-78.3.0esr-en-CA.xpi 531413 BLAKE2B 922e56e1c1fe8bb952368ed65fd16c3dbaebaaa503039aafe01535115b2912e4c4513a44b2bc3f03750c9aa39fb9740803bc1b17d5f305e9ee500ea2d5541e07 SHA512 0ff27080c531d296650cdfc984114518b83f0cf432ea085f7d6710f2c5324e92109ce3a242f847e8920d08306feb25cc3335f20efe966aa1316a4193d4fc5455
-DIST firefox-78.3.0esr-en-GB.xpi 531197 BLAKE2B 824b7bc95c58653d6d6ad1a5731a31443fce7e79e612da10c62c5e46a7da3133522507503a7aad63763fdfea74dcf824f8e72c17bd02c61b4757dc8ecec8fe7d SHA512 b0dac81bc663b8617d2378479727715008ed36b0294ee799add47aa8a74f1e1cb77c579140d8baef281c04f9339fcbf7f95cdd5d770230afb0fd2bbfc1179189
-DIST firefox-78.3.0esr-eo.xpi 558618 BLAKE2B fc0b7bb7ab3809628a0e039f69b23c68bd9ecf34285fd60d4990146379f10bb9f5c9f835646013fdeb600ebc6109f6ee0cc004755134239bbcb1838a2ca1549a SHA512 c5ebea956aea830e8fa7c0a454db89f1f2d6c8bb16eaefdbd703ee3bf3a4a1f6d1ce88444d7d93cb5a31162203c145da4dc137f147d6c422c7fd6b9d335998bf
-DIST firefox-78.3.0esr-es-AR.xpi 568401 BLAKE2B d0eec27d4a63eaed4c4be15b8328333de6deb0214e88213fff0666c91c91c45a1edec8ead65d61d3b2751b765b3512c6e5169c22295e82988ff4716c3b9b6355 SHA512 0c2300762caa233c17ed92411f11e5013ea1a6e40c26f341ce774a8e843aaa82810acc57ee20accd610f6348dfb32041a4bcf8b4e72ae44edc47ef50f4916645
-DIST firefox-78.3.0esr-es-CL.xpi 567586 BLAKE2B 050065738c3240fb6c139cf838ea3f060a419c52b5d67a4b7fc71f2d5d6fd98796b80941e6a8ba77908ee0fb8a6284ce34ae650b131f677e4dfd2cb43ac462f8 SHA512 97ca52f2e0cd83edc896ed386582f00537a29e51711d0c570b4700bc381aeaf427ec03369e41afbecb0f7ebf2db1f029966d44e04eb071814d9f9ba426236677
-DIST firefox-78.3.0esr-es-ES.xpi 551519 BLAKE2B a4a6b7d29ac3648db9d5d597334fd64f978c0bb418391ff6b1e1f83b56dde48d9b40567c7cd255b108cc1bab2b60cf28e81224f441ebb8ad4f871cd467fb2131 SHA512 cea38eb451863188ebf7b4c404b7a8389095ef604c73797820282cdbdc3dbed13281a544cd041dff1fe6aaf61cb7fffd406d9e7c134e3e5fc3deeb50a3473c68
-DIST firefox-78.3.0esr-es-MX.xpi 569785 BLAKE2B adcc399f73e6394ff98ad0d6544e34abe7f3773c60b55ea4087b0c6b2f5aeef81ec49b86a3f7c6a1c56820871af6805ff18b7cc692dc90d8ec9700800fb1424f SHA512 fe3c472ebf68c380810e6639558a7d51370694b016c3a60afeb65114c372e3fc8a7643e78b842e6c4276bbd9146742d9cd2920e4831207d296688167eb1fe868
-DIST firefox-78.3.0esr-et.xpi 535627 BLAKE2B 061beb3800fc32a92929cfb8bdcb32a087d3bd020cec909d05f6dabd659a5816704799563bc004324980531cdd94d777d4d180df47e069956135f8202fc3b1b1 SHA512 c1fdbb27afb0b5ee726441a4c123b29ece59988a01913789dadb859b2534507170f3cc3bde5a58c0f2859c13f724036841a7cb4e45371f29dc27f5a1ba7c20a1
-DIST firefox-78.3.0esr-eu.xpi 556811 BLAKE2B 3e973af9a7a3279b9af4fca3be9a80afdb0c7dce4a8ab614ecab5c5e0d6c60c11e4b99a88aeeb5885d05aac32ec8e659c974b45adfe59146324eadcb222dff6d SHA512 e4514c895ac2a4fb29e6978ec01de299388a67a512601896d4c33e780c6c9aecf1be0a4299467aaef02885dcb2b9b94a2be98005895fd2d29637b64cbef38e47
-DIST firefox-78.3.0esr-fa.xpi 593491 BLAKE2B 67224468f35394c6f1d5a91299b4c5da0b4e1d7d93a454cf9700a243b9f117050715f0110378eb71e7afa5eea31f74ff1209fa46769fd97360dfbafda88ff7b7 SHA512 3d997cffbfa58b726534a41af14762e5cc954982caad8e7ebd06596faccab4d2ab4ef5fa7bd2508f18fdf0030ab2eeb0d6dab9ae5f17862b88a69059635f23a0
-DIST firefox-78.3.0esr-ff.xpi 531569 BLAKE2B 357485219a341d57851a3b7b7aebb1397dd87431abc0a4947d12aa7b23447fe385fb9f07ed01a83505aac3ff4438497e029922686411b2a2fa2d3700621f2bef SHA512 c0308bfd9e46ebb11d96c435f08d09b5e9c9511ecaa1a7a53de35fd3a104f1cc814afa834f6160007b50e85da4df0129e039e28096ebd15b98971a06cbfd8c44
-DIST firefox-78.3.0esr-fi.xpi 554044 BLAKE2B c3837467858a821cf5791455b3fcc1acba70106630e2dc6b189f35cb8e41ff6d72df9b7d720ebc968a04a32ac07b5ea895d1a99f5db3fa90ce6b1aa1f01ced5f SHA512 b6f190c236cc1c16c08a92ecfb40acc1fbc370f1ca24db0ead15af067493129aa7f05ff5c0137641597bdd799a11e518b2cb26427b1bf09b6d6be70f5974afae
-DIST firefox-78.3.0esr-fr.xpi 580679 BLAKE2B 75bfa88984bb50b7fac546cdf1f2791e517c64cff54df9ac0174e09bb8a56348188e4fd9d011dc0d7a0d4912b854b40c3e980a779b2c0a01b123fc8ca1f673e2 SHA512 fd7686e40acb90b673f6c24fb26725bb7ee957fb87cb50f2b2bc2b25d33e1826481daa6550a5ce1e3fbf63317449f565d1f7074097cb2eafc09d2e5dd821c46d
-DIST firefox-78.3.0esr-fy-NL.xpi 565468 BLAKE2B b03519643b344b613ea2103906864a8597c7c7ce31fd9b13a22351d3fafa5cb95e9f738feb95dfcfac422657856e4e074c54cf2beb531f4adca5e0a0eef46e42 SHA512 eb53dc1dc6a2d0cbb0848c2d8b2529a00f2885b4f9e83fbd8843fba22ce04f79417663ed710572b9aba325baf3baaa22d33a7d4af466a57566576e65ddeb7c9e
-DIST firefox-78.3.0esr-ga-IE.xpi 514583 BLAKE2B e3da9447050aa1a7df690ce66a7aee2fd7ceb8251d9fce19917462e22b8351ce6008fa7b1a5c7299931acc8e6532ec665fdce07d71326c4e242dbaf81e8afaeb SHA512 f4a7d8a34039203f767b04ae53276aa1ff7fee141773efcd64e0d8238c2526395b3a417538bd486dfa923237111fc7d3faf340ea2f96555300f634d261f74ce7
-DIST firefox-78.3.0esr-gd.xpi 544413 BLAKE2B 6b1481db2b2ec9d50059e5033abdf237cd6a987d6878220601ac508024a4d0c6fcb56b9eec9f6e183aead26deb77c572af1ab091033cc5fdede9b995f500b203 SHA512 e6c43c09d2fcbdf19ca9bf269cdcecba31027ddfb6bf772b01754c0f293b07abd435de16caee750b1f159f4c21299ca78579e52f8f11ab8e32ca0b34fa281a5e
-DIST firefox-78.3.0esr-gl.xpi 508270 BLAKE2B b0aace1a12114a1ffb9bacd1ad74132e940d459303b5c1a42bc49339332cf0596937210ce4f610796a2a259040667e70b1b5a1b0e32c44976a661754c98dd8f0 SHA512 f5ccf8b24809451527889497fed3204d6c0407aee9ef431e528a8c394c8e88c697f322082460b3a40b46e54078b2d3fae3340ef2d504cb80ab506fe8547a4604
-DIST firefox-78.3.0esr-gn.xpi 582148 BLAKE2B afa9fa67dedd100218ea3372b00e8a93b4927133e318d3aa8a7c724934db07268551601ff695aca4aff4fb9fd1f8a2f0088d8bd96a9b3f170a171db78b5d0317 SHA512 28c6962fa96d539c600df43a856a50615dacd6d6180d15ab8e477026507fed51ee9d3dd4562a32dfe3e95e6e7fa6e7993e9a48e99dc43364e6af7a46f8501916
-DIST firefox-78.3.0esr-gu-IN.xpi 602924 BLAKE2B 61db1d6baf98caa6ff19d698facff4c41b01b380586b7d1c1fc2fb70931f05f282ca672b1f7fad9c8ad5f1c301593925bdc8381ce3ff2a340f62e6604afffd71 SHA512 2bb5595619ba5c7b6ec771ccfe6a1243ad2b9da6e1ca4ccd7211e65455662e91a784066c61ddd1e9a004e98e4dbb15db6a7bb563553057c54a231d13442e46e5
-DIST firefox-78.3.0esr-he.xpi 582419 BLAKE2B 902914c72d4973c82215af0ffa1830ee547dbe2902116d9568e030533ef327df16d3c32efbccf4a8140505b58f5c05dec272b2ac2d3d35dd9c4ed4cd9220fc28 SHA512 12e79d9a47dbdf9bd1d83a3d40045da8a0c2da15305c6e5f47c45ab5714799a2f0e1b8a85afca1523c501d7ba3b80088d056668c483f069031c0023131240c8a
-DIST firefox-78.3.0esr-hi-IN.xpi 622432 BLAKE2B 18f964712018aae867515f7440afdc6b95de5386e12b9337e9ce466027edfca659219c25d81000bc3542f66b985194be7b0f7f057d2add68faccc55419ea7cfd SHA512 cf3ed13276103cb0bc5fa2a627bc20a9639887b4459fa11d7754bd13a4d5f6022fc75c6244223e70831f668130c6e6e2ef7439a9fe4939c4382c6acc6a6be73e
-DIST firefox-78.3.0esr-hr.xpi 560788 BLAKE2B 772b000aecbf349eafcc47e97fb78f6e33ec31a29db52743a2d352636a375b8b064397f9e013fd61df141031f40cb082908248928bf76aa9c72735568e965233 SHA512 cd07c808c7e5a94344b7d61fad47017be6c01d41e4656f54cd21e76883f4cf7af3064f401351f4d056b7ec0408d3b3f52a590a87f4926ef38395f40977e6a888
-DIST firefox-78.3.0esr-hsb.xpi 585295 BLAKE2B 73447a1447da959297deba3980b51f0ea211bb3728f1fd2f1016c85359353526463a026d48ce249cd845bf6ace6f78d435c3b3877043518b5514812511ae15a0 SHA512 4420d54e08e9f326fece0fb6fb315e00810bd930100b545b91369168239714ca2f2b317dfea7ef550ed7f06e36cbd87e6a1b4489622fbd772320f1896d70982f
-DIST firefox-78.3.0esr-hu.xpi 588740 BLAKE2B a58c3329bf4cffe2155f1e1a42d1c75acf0b97c672b734b0f7f89b0262a0833fdcae36d507be08a1077f0bc0f16c5306c3bcaeb1386d366608435b988f9ad96b SHA512 5de6c62c1350e7dba7d37b42498ce74f1ee54d5b0c6a01c0498fed9475174d0b48a9c73808b14ecb65eacfa7c791bfc7097bd56ff54d56fd7fb83717b438ba81
-DIST firefox-78.3.0esr-hy-AM.xpi 649321 BLAKE2B 5e2e3b4c98b0054368e0da107b3cb5af03c6948afd6000d1ae319faadfb7c0b8a787516accbe601ce3f88f62db2386ba47f65edba20bf8446c47ae18ae117fa9 SHA512 2b09ae8159db3f188a33d362ab3d61c9697675346a5d6df9ff872a1a8da614457f47645b7b6a4b5cf0576eab2639a9eec0afe9c4a6037bc528dd86fba212c39d
-DIST firefox-78.3.0esr-ia.xpi 554114 BLAKE2B 974e63a047432aae4561849710d718f9dc7728b29da6318d447eef4396dd784f5af5b0b1f02a191508a43e19b84bb3b9ea9329e747bc303e7ef5d8c439bec572 SHA512 5e4442cdbcadff0eb4c8c054f641959d11436b3e872417b70235b66123263a0ca474ce9fc652fba9cd2bf145ccbb01a23c28ea87763c6cf9c0c2fd01777c0572
-DIST firefox-78.3.0esr-id.xpi 551948 BLAKE2B dc745e26fce4a1db839be26448a97a8d206ab566c734047c7a485b065aa509620da876d9c5f829972bf0d4c84ddadaf3511228a854556e5b10e960e8f7447ebc SHA512 bc8a5cdfa3d8d2134715fabc0f3cdece57702a0ca67afe5d882d1fe9fd2e5ecf69cbca637c6159e1871c2c900a90296a1bd06eb99cb439ceb7fe7f8888d7f421
-DIST firefox-78.3.0esr-is.xpi 527495 BLAKE2B e5d7e1a94a26a5dbbf794d1ddc9830cc6066ab1b99d297ff65da0e6075b143d920f45abde072d525b90aa304c965f5f5bdfd48f0d6f0d300f993708a1f2bdd05 SHA512 0bfea6f0cbb188b26048216ed5ffd05b3e2085f7da5f5fae4916d762ae79508900181bd116b7a41a4b89c40f7f98ba9db03efbe57c375d778e500278d96489d4
-DIST firefox-78.3.0esr-it.xpi 455011 BLAKE2B bb9b80c8afd66d77e090de1ea171e958a7c5fc290747abd7bbd650524f31b98d3107bb3a3b98ba67edafdc66ec8f19fec37b7e1b6dd622e678781b62771e1fad SHA512 8d5c696a189df64e5616a71622973f7be1cb4b49480cb5ed5935fb7f84865a3f29483bc50ce68b91f2c6218780080f5cc7ebe39b7a635ab4264b52958200376c
-DIST firefox-78.3.0esr-ja.xpi 615907 BLAKE2B 9e4c2adb807696bb1acda5b10c732be78f0e0b6db197853f2498fd2d57e4457cbeee7a594a20c557ae57335712aa2b8f65547d017640e41066a6f55aa657d516 SHA512 883ea7d350da791c5f5809677970e8fc86344c46f9127d9a53d0a8ee3491eafb251d5c243f2c07124ec162b135dd8f5d08ae529bfaf4aae887894981dfbb46e4
-DIST firefox-78.3.0esr-ka.xpi 612307 BLAKE2B 0ab9f7f9a95630b9f0aa177d74de7425266280a6a196d20eaaa5aa9faf3eea29d971c6602cd633c33848c21b197aad71ed2df6c90f97cd942431720117e66977 SHA512 acd94f25a1d416a0e18c2d70503ea84d4103bd07f869280cd53bf7a6986fc99181d6ddcd9456645469bab25a6bcf48d466009435742a0e360b0b99a33ef77943
-DIST firefox-78.3.0esr-kab.xpi 574001 BLAKE2B 3e2b35009b4d76c63cd3e6bfd9bdb16ad96514b987d3659a96890f9a6e751cb4423d46a42a685253678114abeae545b2e12e470265a8d83ab5cd7dbe06ad6737 SHA512 e2f643d084e7d0b9216e99b4f6a5a809cf099d0022add05b13cd3e809baa300591db7457626675dab1c0ee3234f4cd1e3ca38076dad47392540b69321efb32ef
-DIST firefox-78.3.0esr-kk.xpi 642150 BLAKE2B 95486ad4de3f1f256a34444a0f23cc61542ad76acd104f27dade39242ba7641fc3abed4d67e572c4a92c7f193bfbbe909fe86f8ac15c88ada062797ab25f0843 SHA512 db650c7082980c5bbe7b8fbd3a4b270f09c99629ed8f80be6ad32181f5a62b73765c802c38581360cf518f2bd1c36e6e4a52cd1663ddac382ca164cd883a6aa1
-DIST firefox-78.3.0esr-km.xpi 567222 BLAKE2B a5f9c41cca58b4d4f67e03e44edb29cbddf3814557570aebe9fa9e1bea82cac318a65319db1e6ff1b337e84e404155b6adf5a0bf84c542e473bcf00e915c2fc7 SHA512 beb53e0a3f2f9f9ee012f658c7081c2b51d6a42711387882e8983b4c792ffd8365d1f43d9b61d53c1910fcca9214a22d7b36516f5e031aa89702466114d90d8d
-DIST firefox-78.3.0esr-kn.xpi 558804 BLAKE2B 723256334f62d518df8552269804c1e9151bda031c1bdd856f7386727b194bd02ec8a120b2d5da2ecd6894d789eb199b23ca55495cafe899d7b95d953050da44 SHA512 05b010d549b1234af0ebaebfe00d6b1962c1aafc884f356fe639f92706c5ca0f76b3c423a5bd37b09f295af9e31f122b0a46bfdb3aa4c94eff5e49a2e5ff6e26
-DIST firefox-78.3.0esr-ko.xpi 602760 BLAKE2B f4c2fec9781c848c26d4f69320fb446762a15f828108ea51533b9205fb91609e849850577081b97849b1b76be20dc9b4d05062fba372df449bf5c5d6c33dce79 SHA512 08219bb5cea7c2ca93948d9ba84070d05dc3f130243a784a0b51ab2dc263d7cb0c8f0261bd697981a645686a572c9ee34cfca3d8395b12da660b59a8b9a591a5
-DIST firefox-78.3.0esr-lij.xpi 526104 BLAKE2B f7d272398516350c8d8c1d27db1933ae332f9d5dbe4ae3f01873b4a791216e9cd34ca8b2d9b46d83a778bd35b493b01e60b23503025890679f9cd52c9f5d531a SHA512 64ead02ada241ae321058ad946b3975ea5587b05f8d25beccaf29c821e72303a93dba3aa1ab2a8341885f47ff9bd369aa4282a709eeef03ca34529b8dc67512f
-DIST firefox-78.3.0esr-lt.xpi 579640 BLAKE2B a7805992aac896db5229662a716572da9563e9b3c44f67f7bb7889e9e41f4b9e43dd8cc730cbb01b997aa7feca3758a7a0e9cbf2afe00f86112682642172ceb0 SHA512 e6f62c425547639998b1a78d33a7de8d88776c76e1bbbebce50b9bd49de0fdb5e36fff225ad9dfacbcf1912b077bab7ad23655eb02e4cb145d804b502adbee26
-DIST firefox-78.3.0esr-lv.xpi 516885 BLAKE2B d2f107234e672f06a10348aa6450e3dcc11edc8cffd31ab0f255b3061209aa70571b4d7e14bc543f170ec1b584a0ef0ced4d1fff290cc3c7c86c722e54eb2d38 SHA512 77b51303a527d23b619f95beb461c86e280ffd8a6ef4f1b317cdb37f138f822b3a72f34b811e74cc85c7bd8ccf1c775abee13f255e462be7918548c519719280
-DIST firefox-78.3.0esr-mk.xpi 482921 BLAKE2B 9246f394e7b6283afcad82ae0a564e49c55e74bf5adf7d4a8d2f255ab89b9d6939d37d8d7e891859cd95b58f5ff5e877d9e8e96fc1a8f65d6fee09e1c6b999e7 SHA512 b19560ff4409c5bd774532c06596a2937de839a25378a3abc1536e20e6a83cd2d17c9211d4126f38d11b2ae3dc02d1d5678c132020aa86a1524c8f5aafe08916
-DIST firefox-78.3.0esr-mr.xpi 599909 BLAKE2B b47c363e78d6185de2183d68dba430eebb48c7e908b75c8992030960cac25fa5f3a57d4103ce161509eef5854df16f1c891e401cc0b98166d08648cf142fc734 SHA512 8a5fded7b9e372050b06e70dabc152659e8b2d4d456f0cb8d076c86c976af373241459a119741aef6c3d3881aa6834593f991ed441de547579d06ad15a4a55c4
-DIST firefox-78.3.0esr-ms.xpi 500963 BLAKE2B 2e13bb37c0af066d5feb7d8fdaeaab33c5bdf2d85d686f2f994e5fbb190b650622eb86dee352e0caa7bd49f056a77433ac687a24ae62ff90158584720def427a SHA512 becaeb0e75eea79fda891b888eb34cc6be2c9bfe2b868540b6d143322a518d55c6c6e4ddb7512739271e0d07f1e93cd8614123b2a2b3c0314b4e24e532f5cbb6
-DIST firefox-78.3.0esr-my.xpi 557190 BLAKE2B 1f8059b3fbeeb48997c91b86822bc147130bed4e4392313abd880e60035236e2dea132aed0a4618f9dc94611c4e79e859f256acdcb47ad0e3e0ec6ff16fac471 SHA512 76988f9b040aa9877f612e462d9295040f87bed2b183ea48cb4980d741d4713199c44cc2763eb62a13804dd7a3f883584afe67d8651ed5540d6e8f170219f9e8
-DIST firefox-78.3.0esr-nb-NO.xpi 549585 BLAKE2B 400aca7a92d4c66df6dc1bb3105fa1040281e16da197ee4591ec4b7e0bb12c98cd5d7a2ec4db366ad9391be1bfca0a8d4aacc9749312a8e8c7f900c886de479d SHA512 4cc0ad05e409afced60cb3cedd8f0033b26dc5a893ecdcfd49875e6d3267338d1b784a598954d52afa6e7f97880bf4ca04b0874f21a88830219e7622a554134e
-DIST firefox-78.3.0esr-ne-NP.xpi 529237 BLAKE2B af2e49484a9fa30a09ee6721b72d62602d6bed6f6d96a63ddfcf5d5c4267ad8f7afae7b9cc33e2dd10b603eae105b94ca1639dd012b25dc129cd4b3262801e07 SHA512 4404cc5ca543b0ad88bce09e9db5a8930a874ac07957b8b52219375cec9f81d448d7e21f83241ae3c71978ad721378ed3311e121317a2bd12d947c2e70dd1a90
-DIST firefox-78.3.0esr-nl.xpi 558792 BLAKE2B 2bd46047aed16a1b3a82a86144ccabed472d4c0c85c45753be9791a7ff2885f418854992ce81a7d34318da4315fcf6d77cc85b412d83cfaa08ce575d49fd87e8 SHA512 2e3e202a81566a1d036bc1dba7c71c5191b8a43359b3baefbd8733646114e9990c93f965686a6c431ca42a0b721bd6896d67d6a3f4bf3cab3ce3f8b84cf8a565
-DIST firefox-78.3.0esr-nn-NO.xpi 552150 BLAKE2B 07353adae442cc7b8bbc14c2f4aeea2da082968bb6678003ab425955dc3385a0d5bdaab8d6383c42ab1ed25681dd3fdb1b7e1da52c791024e2f564ab1940555a SHA512 6242f603970b267cd8776b58322d116da789390f82d339e9b4519b480c193a77794e6033116be02d813732067e6efe0291763afcb609c0cd4b5830686c621a90
-DIST firefox-78.3.0esr-oc.xpi 576260 BLAKE2B 7f361c79ec67eb8f65b96bf9eec1f4561f908f2b2952baca8bf80e59a34bbd35df8976145c4bceb0a51e218d947a9560d6ee9a1880f2409db326dbcdf4042485 SHA512 f73e4b74324e6bb4111af5c3184e432db8f9ec2c97d9743f924fc7fe23fa018bcb5298cd00083c9a526d69642b41ede711546ef6768c297a5fe565ef66a7c9c9
-DIST firefox-78.3.0esr-pa-IN.xpi 606173 BLAKE2B 6f003decd5c1957ffc833f1603d1b362627a9d74fc410650089612c5cb22787b4fadeb57f3037318ccb943af91a016cc68ce6f368ccb7ee1f9527604329a1f83 SHA512 e43d8d072173323e4e9ec8e5109202863d49a46d7a6f3380829b5eb655b0e306b7e4d8694e41d60fb9783adbec3d5ced8f31531c188560527eaeb21255deb47b
-DIST firefox-78.3.0esr-pl.xpi 574905 BLAKE2B 67c8a8a1817aa0c4375b1e8e368cb3bee3b1569fb2c0cf4083b8929ef148f4509a019640bc5f9a47c42b903ed27c0fd96834ba200caccee38cb5bbe9cdf588d0 SHA512 b7adb3b9240d7e5f438aee47cc6b751d84fd655d3bbd0ebc1c7c7979c9b193405680a8888df4713a7feadd58d398dc2719bb1f21fc644b2f21fcd115307ae3b4
-DIST firefox-78.3.0esr-pt-BR.xpi 558015 BLAKE2B fb992389146f5dfe281037e07e9020df56a7364fb4ecd19dc2d96069bd7c8c62b166f188cafebc1479171a1b123038af0c3ce2842263a202896d052cc903e823 SHA512 1e1e3c9eaf6b8865f17ff291abbae5bc1df7fefcec50a91c592f1209eb8dc0e2a40173bdae31a1679f3ad1da223a85c07cf3752fe8496aa88b52bb6d69b646cb
-DIST firefox-78.3.0esr-pt-PT.xpi 565636 BLAKE2B 0436da53682a7827aa73565d06c7e72686f1e3ce95d308d9de558c0011f32e541ca1b1d62dd61bcd664f73734fa356d172bdffa782c5f1c88efd43a29aee82bd SHA512 c36981935727c6f9809de8231d1c8d7aae42d802436231e0ea451a5fbb955fedafb36aaee56d4de103e3da0ee20c9079549192052fd97e0165dd236dd7eb294e
-DIST firefox-78.3.0esr-rm.xpi 557926 BLAKE2B 53696df0d5a81aa2767b77391250086484b5596aeef689e160838865b5502f7826d58a07f0fc0a3f15615f321494d9c14e1c59e16540ad64b18aac589151726e SHA512 22d74c6304baa9a20a983abfe56b8f9934a609cf76eed120bbc9e3c46f96c58568f551e01e8f0839b7935df82619971f39d8108f03cf5d92e084ce81e482e8d1
-DIST firefox-78.3.0esr-ro.xpi 569383 BLAKE2B 0671c39d38ff4079a121b3900508582395f7203752ed42aa4428578914caab2e00544ed8757e19f7a408063d47f36328f4f393da2b98913d37e8a01cf315cfaf SHA512 0560b3dc0576854547027f26499a69ad59c27f6244cb94529989cddb3e31412b85ebfbee630c0cfee83234157dd5f5a82b2e978ffd1ff8ebc5d998135435cf2b
-DIST firefox-78.3.0esr-ru.xpi 650683 BLAKE2B 952fe3437829f63928e0233d894944d62fa70eb6d99fba5028a1819dc29626d25c303bfbf5f5f99eaada03c06a164acfbaa3edf73b4f0271d6101dca95086586 SHA512 402a9411cc1e86ab82ba1445b9d90fa1549000eea59f428452a45e6f059ebf6838fd504db2f2527adde4f79d8ad663d96185242e1dbcecfd92d4e7c3bf661554
-DIST firefox-78.3.0esr-si.xpi 534199 BLAKE2B 24a8187ce61e7c87f3a75b74a2bc527f926b313eb1c2e0c7cb6566edcfd90f2bd431c8b96f7082e663458e5787e23c0d7ac484e2492adc9e30fbc95777d58b3a SHA512 5137226dae2817bd811a084d061d1c19b7e231a454f0ba7e1823a0907a465223362d6722c8ff9f92661b927e7b7da8effd71408aac99bba8ae07251082aabad6
-DIST firefox-78.3.0esr-sk.xpi 578529 BLAKE2B 2ba3d75e14f91694cf9481c21c327ddd022206ecec741d14f1bf87b52c6983406e0ceed2ef7bd714f1e7e8cd1310309c0149bca357547e068d6fe54c1d09ce96 SHA512 c68a995a970c41caf126b0fb250c160ef0be9fdef67a06aabe87e8f235e979eb41f7d888e3dda1532e062864c7b3bf5a339826ad2e95cc20e5bb57ce6061b5d5
-DIST firefox-78.3.0esr-sl.xpi 563041 BLAKE2B 66ec660cc69831ec2c8f261dc28d3a1f59b308ac43deeca7f04d7d51efb8f833776559a9fa217873d0a8ab0b0c843be4d16f9b08f5319a9720219118cf800c0b SHA512 060b0538b9fe0ed956b2e429573c5dc85cb897f5cb328d3a995e880a48bc85576853602b47f3f33568a60f9c8177a68888a17b5d90076eda155e14dd4903bde0
-DIST firefox-78.3.0esr-son.xpi 454251 BLAKE2B 58fa0909f5a201c163ceced02e13f9d0c5aa94446981cc35a970a8ebdc54b0f2c8130ca8e4bc0977a987fe03a2b734ed5658494f1221b6016add0c2cb44b8598 SHA512 cafd081493a60354b0b6a6de607a244adf935c343b7de3416d0f72ebbe79d81c10499ff74fe05b2b883a38359159c09db21df2299aa23746782a45b9a4547d83
-DIST firefox-78.3.0esr-sq.xpi 580012 BLAKE2B 46cded6ec796bbabec107446e79d545e73ae6ddb1fb2f1273ff9c7f5f06cf36df0490fabace6d38e844b7cb9bd098aed99a151790cab8134a75e14c6fe3aaa4d SHA512 7254ac7e75d619e83bc314985028622d87a09551cc78b7506dd002db8f5ec8d784baf2f1d2f6a50289e7fd6ca6145a96c5b2db39e786cad226f64da8c381dd08
-DIST firefox-78.3.0esr-sr.xpi 604539 BLAKE2B 2519ea9b3cb53256d55b33b52fbbe5a466f62aca1223e081d7b9a72519a9d1e28a0b2a28960b0ff0bfcab3c23631fd525400f49cf0e1e94513ec12a8754e75cc SHA512 f5251fcb8a8a3574da1b360c75d00e803b851772736d35b06a7ef61d54cccdf8efcd240366998853705a7e9d5b1c259c4df76c93f1480155f1d9665298800270
-DIST firefox-78.3.0esr-sv-SE.xpi 561876 BLAKE2B fd0f23cdd139b41735696fa5d75a7b9907a8435d9c40f414c0032e1ffa752ec7ebb5617877cb5458d3c16e4422b4b4c4d1ef1ef2c7eb6b3bd0eb0def37814448 SHA512 52430c3373c1de65cd21c62f9d9b61188fb04f086ba2e596bda1c4bb4d3d15e6f49f124f31153b1f88225ce87dc581f15e1f074de7d489ff550a6777806ad10e
-DIST firefox-78.3.0esr-ta.xpi 572350 BLAKE2B fca05092e55129e9be4b29b49b513167b41d934b7a5cce020fafc2653cc8ba934fc2c5b6f41bd78124f05659d9e5ec8801b1fc2125058bb4ac7a6237026843e4 SHA512 16c9f175415c96889148f7a6cb37cccfbfaa7a4b0c0a4015bdb8d67f5f604e2af3240a9aeed01d4f80af3ebb145331e44207fcf898fed62138d494398a0777bc
-DIST firefox-78.3.0esr-te.xpi 591644 BLAKE2B c2f9cac8f83ae43cd8f75d179897a723dc9e338e6e658619945eb803f4ceb3afa15ce788930239ce56de456e200da95f07b0a086dc2cb0bfe21c9d397892336c SHA512 282ada33e70414e1a5cc983102acf1da24d37bd38fb84c241c2dbe371dec98f9a33e1701635258c334c3971a62fe9a434fb3792e5cddb3733ff4ed4397e76d39
-DIST firefox-78.3.0esr-th.xpi 628321 BLAKE2B a142b53e0dcad6ab0b3d9d9d3d9e0533c05d294be9910fdce3adf77564c1cd008a03f41b54816db30ecbb929df6ad1c5b87cc6b383802a5925c2367237c99a2c SHA512 69cbba91cc1a8d4f3e106826bf426d694409dbda99b66f93d36b73f2f65cfd1529eefe0166b3e9a909969e594eb2bd9b0deca1a7a28cc2d8b2f56ebb0e4bc5af
-DIST firefox-78.3.0esr-tl.xpi 552298 BLAKE2B 6010847a8291fc8c7deb3246100aff8d4120ef11bf9c5a3857cb797fa44ceb3ae3c736999e18d8b56a602b96607b43c5c902abcc37509c8ecde1316eee193d57 SHA512 8ad5ab27f6907561c9f0e11ce76b4a9180e3d76dedb1b8b01ed87cca5cfe677b839e3ac7962e227ba7ce5986464b3b90694e95c31cd0a25854943428dc28e7b3
-DIST firefox-78.3.0esr-tr.xpi 576356 BLAKE2B 2dd2159e3811401c0a3cbbfa9dd762f6e455cf8969c6f76c23a8a6e1f2bfe72b481502c1ffac0dc5ab336ad603bdb2cb2923a924e2375408420d9a20438a19d6 SHA512 f20defbbc20a3d2c020ce4c1ceb5823dc5694d94fc5e38893ff59293112130cc9da91657d3ebb6983561c7378e8b3296dde8d3033ea50c5f535d8e416b97b16d
-DIST firefox-78.3.0esr-trs.xpi 540192 BLAKE2B e19c87ae84a23a5c9d2c64d81d984989606d588b553f9d223406003eb1e0c7fcf7cafbedf72d040701870df84cad891084528de9283607b982ee60642b76378e SHA512 205739a745d0856b5157723e55bf0fe02ff649f828ce2fc9ed7ca759a322ad802a9235c4247a419315c01450331bfdce8cbbae2f821009dff615a3ac37ba9a6e
-DIST firefox-78.3.0esr-uk.xpi 646864 BLAKE2B 796a779d263fed8965fca8f73989c9be0af1d27157cc84f31861460bd06f12c40deeaa2769ad912d28addfa4a6835d37df29e7ad6e0e91573890c7718d4f4fe2 SHA512 e70405a6318af6d35e068c452d6014279615fa3a16f31565f06c5f90a1faee9fe3bd7b3b4823e1db2ead8d329e84c53c642ccdf80d1b542c7eac5562a6406aa0
-DIST firefox-78.3.0esr-ur.xpi 608130 BLAKE2B 747526131d83b0691dbafae9a664a613e46a07e87d7fa08dbe559339a549d17d55c69cd117624b74e1c99079b1a9fcbb9fa7b13b6aafa9f83c85232763843dad SHA512 e16b52a1b1444922a36145788ed7e7b53a1ffc2be19c29d43b9080d7ebd92496e5543d0a3034bc5f5e38e718e9fb2ac95507894b6f1dfb4487164b13d53d1678
-DIST firefox-78.3.0esr-uz.xpi 521140 BLAKE2B 91681e284ca1ec82fe35cdd569e5406b522ed156f739ce940b852a94470ce5a5483bb7a08ddcd85c05886829a26b6fffaf1be896f3bbad182e9989d047d0e46b SHA512 b64d33c920dca971bf7f3a8b57693162aac5e4df3b8797f27855b1cd8b5a9714a4a177b9d46f945eb4f7d6adbf1967a74341784d0f0c81ce906960290fd89c58
-DIST firefox-78.3.0esr-vi.xpi 596838 BLAKE2B 4549ee453a89aeda2dd0501062d084f526af0d2baccb3aa54e27026e0cad7c9ce39373776f4b6d6f05bdc39c245963452772bad8f19974cae9ec92ae06640f85 SHA512 4b336d96f79b97a4af6e52ea27bf2071d560710c2ba496d1b3a00dd4241ecdafa2a130294515587417437ab835df98bbb4d6f06e91a7245b214f049622c66063
-DIST firefox-78.3.0esr-xh.xpi 458908 BLAKE2B f9a6769a96540056c37ce1cb077694e98b98293f620c8a163dbdb177de8466803fc11ac5a0d87df48c93b9d322ca1a05671e4a981899cd3509194db9d72a4338 SHA512 2992481f9900e36342314d291354fc76019140130cc2f4405aa41e2696819fea62147e264168067ae505a453e8fcbe43a1609b74ebf42b4a01af635ac573b031
-DIST firefox-78.3.0esr-zh-CN.xpi 600179 BLAKE2B bbdc1cec5c4dbc2efa6913393b4928fe3ceb4f3d68f8615a3ac80510e2fd22bc60b6628e9053c83b263bca5fa2ab6357d0f5f7f8cfad2ea2bc6c23727966c1c5 SHA512 b156e8de8717367c4494744f13f698803cfb0e4b9ca6acc5b06350df3fd400a3dc20dd12c7438bc0ee3fa4ffb25b24c57e858102d1ffccdf7ab90acf255c54c1
-DIST firefox-78.3.0esr-zh-TW.xpi 599257 BLAKE2B c5b28502cd111e8b03f85694be2baebb199aaf35cb8fe7cc466e205ca73098a6e5dbdbff128a89288f416afecd06a563ab59a3083344e503392e4ae3641c160a SHA512 05cd0d99d5caff0dd9b35f5347770854b7aaad9dca71868470ab2c6e00e7c0e38430b8579a1186148ff6955a44139635a2935e6fbde2fac0f0a3081c9e3fa851
-DIST firefox-78.3.0esr.source.tar.xz 331073228 BLAKE2B 01f3d3c0b8b963dedfa89631c518225104c739637a8bf22c121e3a942fa0b1d1f8cf1c4c2edad2e823e0e3922f865cc8d3430c6fc9246deea855295eaff84a0e SHA512 89e12797429d99760b294e302d803432f533b7c2c10f1fcd3781b89b27ec9698173d4fbf1bfe7506186602daf6666c09152407ce5668fb5b7391e38b5566f2f2
DIST firefox-78.3.1esr-ach.xpi 500661 BLAKE2B 30cd981557491e0e813182d8fe769a3f21209bb167b11977b09fcd3aa187fecb029833c1770d976b6ba8be3e4901fd4639e4768c5eb77d9082d61019c6d2f564 SHA512 b3eec643a380cf8768ae716955ed64938a18e259b7698a72ce4fa1eb1353c893785806cda73d4cd8908f3bd3f4bf640bbd4022be99291d1cc509da609541f83e
DIST firefox-78.3.1esr-af.xpi 444078 BLAKE2B ec399291516e2d208439b088679386f97674399249f611b0d0af2db002e5067b9aa48fbbfae44ed210c1cf1205039029a2b6d665da0e011dab78c0a7297c91a3 SHA512 e46488de17fc1324c12aacb74fd9e6521a45ab5f201568379dd6e9c7aab019d7ee34b3313d27f88f33c4002ed84c1b8451a26c03878b03b1b06630e0c8ad76e1
DIST firefox-78.3.1esr-an.xpi 511467 BLAKE2B e2683b61deef571f107add61dc770acd3adff706a01dadcc3e977cb6e515abbd5cb400296ac7dfb74b991aac5bc04384ccb3230b5a9960bd2cd4415dc603b27c SHA512 9990eb0989ec9841519157fb620e6c6cd8451657bc25a93cc127896215fa2d50a7734db7bfe2ef26890104eb97efbad8d8633e6b77a5ef15f830e2df42f7a662
@@ -470,101 +374,6 @@ DIST firefox-80.0.1-zh-TW.xpi 611178 BLAKE2B e84b0defc7990b6c775a9ee9a5ba7dd54a6
DIST firefox-80.0.1.source.tar.xz 334690792 BLAKE2B 47c8cdb2c8c0088b5dc8abbdfba8be685dfdd4d079b155aebb1431a5f8b448b94d90e188d08426053be961f228d3b4e7852626f502397099e99e4a897e7dadfa SHA512 97a54e5f0ff0e34d0994b9ea67250fda1e9a51acb1129a5f6ce632ca5d15132ae4e5eb18c1a9a609a14f5012daf87c6e1a5049e096dd1c32cac9e2c981381d10
DIST firefox-80.0.source.tar.xz 335316448 BLAKE2B 3099426b27cd3c89b63be7d796c8c5a87d0ee9bd8252e5bde23ed3a61f71d611e7427ffee506224e81a88ef109eefe944f2cf3367bd636a6ed46b7351d0a4b1b SHA512 6cfba55615d032e77f973ffdb1d4bb27c3c00d1ef642521284afa3e01a1bd29c6db963181e9ebefb0a44e49b96c3f93e57ce49541eae7e5a54d3360ffa81c1f3
DIST firefox-81-patches-01.tar.xz 27212 BLAKE2B ef544bf38ae2dcb3a385d68f6ecea016a4d0677af895fad8be2ab07a2dab313d953b764fd0390844444f743ae1a2f67fa6f3b67795b72823d9eb47f4ae10cc33 SHA512 88d0ca8f29574ac45afce3be4a59a9816b3761eb5e1741770927c26c4d4afae669ba8632bbef78479cb7ec892e581ef06e2a5da7c2e106a676dce886d2a14ebc
-DIST firefox-81.0-ach.xpi 458704 BLAKE2B 806ed3112f9be7a2609485ae11d71ff573f1ca9b750d0f7d18b8390e273b5a63b6508d7292d665166ec163717c1a2dcbd45103617a2e03d276760dcb17ce09b2 SHA512 18d79ecc95b068b0e23fd58809187eda0732d53c7ae8d5907389cbd45ad88b4ce8213832ac2a7e83eeae1cb0af3c17f9b785ff7f6f2caad66eded80128b22fbe
-DIST firefox-81.0-af.xpi 429003 BLAKE2B 44cd83009fa2c45786fcd4164629a2711ea9ca6b44118c119bddbe6ad0ce5336322bf7cd09dd6544e1e2a687b08f7fd977cb76c0ec25dd7d05b4552f52c9b0d2 SHA512 2dff6d871b63b3cec5512ecbda83e8287974b5a926b5029ebe0279d7d3a7e80db3d8d934d533c4daa67d9c16f2f8fcdaad17795126e9004bd4b626c26b2ddeff
-DIST firefox-81.0-an.xpi 506884 BLAKE2B 167e3ae966f2578a87b8d1cf7e6481843d0cfd737ab359f3c377b23119afddc1843f97cb444dc5683002bdb03a1df6598c30eaf84f20a64014fbc6a8146ac853 SHA512 afc5994c70d8321a1f537f1782b04b086f15713ea8e363751cf227db9f7436125cd6442d59acc3fccdd3d638ee592cc15b16c8126e299cb75d8d0d4fc1cf983b
-DIST firefox-81.0-ar.xpi 548495 BLAKE2B 69352b01f4cdaa0e7c8d316429df4fc745161fbe475cb535c422ce5add9b6ecaf9a015ad14122ec4ef96969afb9ffdca48f9db6b45097893ec6e96e70e726747 SHA512 f63fd9b814d423bc36f75460b6ba13eb0b3a9607e18df8ad3a59179c62590d361305097469cd252edba38d0869faad0e3823697d0f832d9340b0383cba359d0d
-DIST firefox-81.0-ast.xpi 457245 BLAKE2B 9480b71ba35f3f442ac4436f6ad85fe35e2575752ede185f0a1c6ad52387a4099de74348f603c1ffa9bb61a7d4abd1d71ef316643da84ceb39ed7fc751f852e4 SHA512 ca64933d93028c0a593329896747fd29de808928de22f1dec4fb8140d920b47f463be6ceda13cf927b1cabb73fbfc2b62135a7606912a5a0c5b202fe4a1b282e
-DIST firefox-81.0-az.xpi 492768 BLAKE2B da096633f563bff9b56dd9cab81bd1ac5cd2335e7d7d105bc91725f1f3924d4414c5b2591e4d2d38786e55ebbe1e60e794f6ce240c5d21db6b98fe406931f6bf SHA512 ba9378d50c929813b29f627f42ffc3a5744d74e00f7330fb277af8bf0dea8936f252d8a789416119c79d9bd0332fbb9baa74067743175f7f0af4a55c28a27bfc
-DIST firefox-81.0-be.xpi 593036 BLAKE2B 51e00ad4d93645903b4d0582161c6fd0fff1bf4a4eb15772c4d7b6517259946435924cf1a2b7fc8bb90663390eeaa45eed9eb7a3e6fd3e4d67c9b43151d7aec4 SHA512 13551dcb43033a03fc84b335302d55ac3d06267642b8231a2d3022371fc75229fe609cf5b6319891f928bb0399fa7475f5c80b14030ec0c5a6485d5c8b8a57ac
-DIST firefox-81.0-bg.xpi 554712 BLAKE2B 6cb68b15b32b99c8a30a92413257200331e5755305c92de4360dc9d3413eb9b47c8fef9c587d0f9d015615ab92d92827ac5db512f376de66e5613200b6dda42b SHA512 f9ba97ff33012f0ccebfb081de7e8b9579128e94bf30715eab719ca3a8eb98ab3ae7cc4e6075f1f983ee1d10bebf360857cd144e504ab4a7359817632427397c
-DIST firefox-81.0-bn.xpi 572613 BLAKE2B 1f2cbfcd629f83d2c4f30495743e825c89adbd0764176d0a340c021bfee1f5f8ab6cfeb13a633a1183d8372627494835075d06d0db5f1440270f7d9ad8e0914d SHA512 54e164daf50da9f6757907826d5592d0fb8e38a97c3434b0394deb5d48911eeb6ac1766a902caf2e8411476f977c2f1c988206d8bd1a96d76e66627279d01594
-DIST firefox-81.0-br.xpi 506640 BLAKE2B 4cc1c0ee08d1ac31aba0d8cdb2660213530badf2c22e9667d98dea36ddfbd7afddb28c2537f7cb8d6b6829fb1c8c206e27252d513c6970f3364d87ca97629620 SHA512 367063b2e7cefade02fbd9d4968bc35325fb2bf6a15e6baf20eed1d0904b996daf5b185ae65154ef057317ab2ac60fa7db5b2b5dbeb9e5cc05f7189e1a69bc4d
-DIST firefox-81.0-bs.xpi 465218 BLAKE2B 9a6f98e1a3945d877d40524aa568ba172d8a7be09e3676a2bbdb17127dbffff941825da2d98765bbcd0708089863dc8ea99222817e6059fe31948ed1da9df9f2 SHA512 c5783580fd5c9bd3551170d33a6f9ef913159e596d2d1649528e9cf0697f26778d6a0e39c4fb8ddf9d6b2b39c44684df2232246eaaf0d0ab06bb2fd4695ee979
-DIST firefox-81.0-ca-valencia.xpi 517385 BLAKE2B 8bd7602e13de803e753cc8315d4e66f5e756df8d3f9ba72d62b785bcf0de2e7afda5f409de7562af834cd8bc3619244fde47cebf030bf60199314cc41eaa73a3 SHA512 2444a67009bf9da3b7794108586b239ae4b0a7d3bf8e369167c7679520309e8439f6c8aae1b10c7d2e29b374edbb824413fa354bd7e5477895e088050a22b61c
-DIST firefox-81.0-ca.xpi 513594 BLAKE2B a858ba8da67c2cf909b3d48a6eafa75e11cf5a294c73c539c4582fe8c9dd98e88ddc0aa0191ee080ef3db7bd0c358fcefd9156e66e4f0b0d28786f7a4f47ea31 SHA512 7749126c219f7477a6dd664cbf25ea72c7faf6d160d505d6fcd249abf23cf6c6b29e3d01dd9d85d3a04631bc16da1250038783e86477e2da76c6e218cf91fd0b
-DIST firefox-81.0-cak.xpi 541580 BLAKE2B 38e73011724057ce0db3dcb98b2a4436ffce7204dd664eab91770ba0aa1c4653f0569473ebca8becfed5748393e0803b401f0807933ae3532255bc64ab2c0bcc SHA512 c360a54f0270005050a85e59a2fd4fee004059d5195071c0ed19f4e25e80a51f8f20d77c20a128e3bc201b879afba53ec059d71b0cad95c5e609a00ba19ad8fb
-DIST firefox-81.0-cs.xpi 539047 BLAKE2B 03d0caa3f69f7224aad7e74ec055565f3a67542600090313c9a9ba0ccce693508a36f79cad9ada9ff80bf1f395ba0ea43b44c9130beaa71ae82708f733caf1eb SHA512 870be6a294bb3c91d59c873b62546ec18e385bbca8cab5536eef9529f40041bd9acc006674aaa6340b33b928ecca3df9b3b58142f17070f3afabc8108f90ad94
-DIST firefox-81.0-cy.xpi 520840 BLAKE2B f9f5f1b25f090d9acd4c29a654b32efb92ad22210362632e0f4472f983449fae6ee05c014231d05286cac3585d87ceced8469e3df1bf1acc82923819d265cf5c SHA512 6cc6497bc20d3dbb887b183180cb3a00c6787d64568a4ba22cfdf5f29b411970e41e11cdaedd9e220f53643177d0df23a425e519ba6666b452b62e6155596ae1
-DIST firefox-81.0-da.xpi 514311 BLAKE2B 6d575bce8d5a8c98a973dd1fbc413dae0b4c53524ac465c207a13115b4330697f80d936b9f53a42e94d6fa63912f8da58f929f7fb7ca0a74c52560fd69c2ba78 SHA512 00ca3b0dc3b6ca13053cd40ae1c87113deaa8e790b2601c2090e812cc9895818fec8c8559869eef0b807ef54abb944b58ae62666d307032f63e34eecf909b476
-DIST firefox-81.0-de.xpi 533118 BLAKE2B 4cfee5ccb6aea63a373554c4003e4ef64314c571793b7f3f7b1b6c2774a687d33265bc81e10119fad9a9d26dc598b72ac3043b4d409b910f9011cf05c9c584f6 SHA512 2503d3ae4c1f993f0b713d6704b5c6bb80626e8d7e50aab73c1cf1bc981b358720cbef8de7fbc08011b622c501e06d4c21207355872e31e266cab8bc7d98df8b
-DIST firefox-81.0-dsb.xpi 544433 BLAKE2B e331d26aaee701a5524b9c7ec1ad38e6417ac704ac91d809ea5ea0c0d0096800d36ada0dfca0205a8e9f20b35d1d9b2aaf2444ec814a3ffc427a0507d2a83a27 SHA512 2161139c1b3cdf4b15daefa4baa414863c2d33a4af9db44b6f0d4d3c479d22e45cd111aa05cfe94a1bd473471995a08f6db11b140c8aa731c642102ca0dc1f8e
-DIST firefox-81.0-el.xpi 614642 BLAKE2B e416dc9eae09e784acd1f68a993946a6fbce1e0d0bd0198b81ba8e067ca7597dee359c23f122602f5287e53c2a5ee6b4c581be2ff951a8badf699393085a24dd SHA512 69c580ecb279718263236274ebb0b6cd298205d6c7635b9511d2f61d1c64e1533d9d23d33504863121ad1d35cb55d595ad62fe711534a92ebf47ae654427f414
-DIST firefox-81.0-en-CA.xpi 491834 BLAKE2B 2aaf5825e517aeb1058d835adac0302d69a50764d643d753cf0a3fb89ea438495ec895adeb6933d18bb8ef5c6f6f88e60949a3719ab23cd59fda2310c0a98d5b SHA512 a6ff72bb1657ca37e0022c8bac1de3e86e93fb979ad96cbba4807788cf6c7a8548260fe1648b864ce1f7fe138282fa4429ce9363c4c8c2a6b06656e6b1a26519
-DIST firefox-81.0-en-GB.xpi 491773 BLAKE2B cac0e100166c444665acc16923d62488768acd3688b77e854400ba3b88d140386f57070018f3d04749f0f7cba4d4a514d4a410961cde89bc6745aa458581f25b SHA512 9079fa91b93245875bc9061afdcff305e9e7f36d84799eff11da7b081d3397bb685a2291a281443c592eb271bd5668c8b667e91b6fa2762fc195659f2e202a6f
-DIST firefox-81.0-eo.xpi 516394 BLAKE2B 333d1d10c215256cc1815be6619853809e7030654c1e84503a1573ef15c2c75892e701202bf849dea6b7ea20bd6a173cc3a4946d8cb147b6b56f9179589e146a SHA512 47bf9aff7552e18b30acc02aae7d2350ec6045813befb8cc6fda9cc57a9e5c7deed27d239ebe71bf040a11e2b24990fd3ddaa71ec4f101f8fac86952005b99a0
-DIST firefox-81.0-es-AR.xpi 525968 BLAKE2B 7de7c7071b749da2095c6b26ae2c5829847facd8e6ee612b36dd4b1a19131ae1e0bf4d38515d013e1c8f52ecc1228dd8d9fa95bbb388455da1a7c375b01fa945 SHA512 a2e00d9a3a82eee47b0dd6987c679ad1cf44eb598f3315e861523e46c6736bb4d103f6cb28c73e389f0eebf6ebba181d86750b4b94d7f205f117edd2e336292e
-DIST firefox-81.0-es-CL.xpi 525524 BLAKE2B a0a202a4e1539f58fb1ee801a9731e447a337c596e377f349db313622f7e074b54133eece4f48649b802b41b15d654181e7c2e14d67f4cd92b28394a766eef08 SHA512 3272f30e59dfc31f107b9e9e37cca6da47b58665ab20005ba0867cb95ef49d946ac5a992d95f131fcb8667dbe41b42e325a1a49b29f146e2e259ab34a3ad1b86
-DIST firefox-81.0-es-ES.xpi 515141 BLAKE2B a9be452d2c578bec7af8f67afabb4311edfe0be0f8573a6475be97f3c61fbd1a3ce06658fba3a4c9750c4dd4f6b89e482c5282f29ef782409cca318bfb8caad3 SHA512 7222a41b78b520679b8efa782a58f166e02699e68bf77821a29f87531faf07f607be9652687c336472f7350a815957817c94a8f8bcecb03a7df3ec0aa07e3245
-DIST firefox-81.0-es-MX.xpi 529399 BLAKE2B dcd77958ba4cfa76279072901f8f262e3685e9d64e820a8c4f8f179bd6e8684ddcfb536afbfba47d578e7cd4af3454576d166c2717071a01b21ea6b3371c2f2d SHA512 f82a596fa8ad0e2ddf3c5c3eff730f9d4a77a6baf119e455a0b986acaba6c0c4e3077046a384d8f1ca2bbafd3ea6fe7be922273398f124665c087a05855e47fc
-DIST firefox-81.0-et.xpi 486335 BLAKE2B 261fbe37e9eab5878cde1e4cc124b451f3d3367ae242d7b957380f6b806827053d378309a6db010adeff180e8d636f397891761b1052c3832ff782992b368f51 SHA512 118f04947594983d703b0253b8877b06c418ead9355db5306645bf5ab6971d66644302bc406c928c6ff347c888290701891bb4646da75a57642d61b96e4c7cdc
-DIST firefox-81.0-eu.xpi 505704 BLAKE2B c4a8cd5e10dee932705b30a425f1a8077f72916cea76d8b4ef68c11b1633c850f1e6352f2eed4b48def32dd1bc7809fd9ba3432edb1d5c8a8af1c2064dbb138e SHA512 6df46f81c21d515cde9987b1729bd3404c327d9c60ceacca9bf44d069037a435831977a809aed370b3593ae65e9079d797f34375f933806c727df31bd47b7cab
-DIST firefox-81.0-fa.xpi 539089 BLAKE2B a6719c8179f4c38b8f6a5d81649ea44718902dbc3133e97936f863dda2478d3bf1a8d9f65a69f7cb92eef109deaf973b3675c204eeab114da7bbe91a159dd6db SHA512 6dcc1395232476ff75bf9fd6cf9c9b3c5c424b68080fea2b0c0df9c3efcafb9d7e22798c9c72fa2a6fbfd129fa05d1265ef89355c28555592a8e89a7602d72ee
-DIST firefox-81.0-ff.xpi 482668 BLAKE2B 561ace8e6643f19b260324aaafbb4d5482ba16f0ea2a18a82f376d4abd5dcc9341e88133e4435b3f26bd3b5ccc1f9f9d4d52b24f1d96624e764aead5d352325e SHA512 aa6bf84cf802dfbe29eca62e7aaa5f7011027d04cc7913f227aaec5af27f8489ce437928b2b8ebf5892858de6acfe3f2c178014bdd6840cba26b31b27cc0cad1
-DIST firefox-81.0-fi.xpi 512540 BLAKE2B 1a34fe6e5de10e78ab05904844350e1cd748359726a978dc6bf4d1d7bb47f06a74ada06c0a937fe36ae96426a840e74203fa809978b564b71ed620c25b7ff27c SHA512 d33f3c17300e9612d77097d8760bb4ff783db4f36ac201dec74c4139ba72a48c1fb6126baf420233adba2f1ca0abe53e47345ae553d2224783ea96f665e4f1c5
-DIST firefox-81.0-fr.xpi 536852 BLAKE2B a7fc453a1897755130eb7a4d89231a3136fd3ece0e75e207a9d6bc79e2d49114488e02eb4cd264df8d8b56887182fd94065d327491f6cf1ec10c92d63a9e837d SHA512 24be5505b1307d3f4969fb22ca6a3b6c7e6f87692ce342f9d4a40c895cd3eceb714934f87b9cd1d17c6a0f729185fb5d54f2d68a9146ebd653ecdb39e50065c2
-DIST firefox-81.0-fy-NL.xpi 522614 BLAKE2B d1b0b6e9148faa49503829890056e1e0d39ef3d5dc1b5fca088e8677cf69fbaffe4731b6613136dc0cdf8cd6e6130338c295ab263a19fdbdbbe2b6c1c27f1655 SHA512 27effd197340bb4e15c708db7bf85f283b25e0bc50d1e52ba222ea99154946137d4d599f368112e6c3533ca4c8ce2f99a17b2443567c243b1fb3d1f8e8b5455a
-DIST firefox-81.0-ga-IE.xpi 467820 BLAKE2B c9706f571ba7a3e6eafb74591727dd473e0fe7e2f4caa900869b80f8924b0078a9e38c87409697461015518e7fc6977f35465a1254c09505f87685f37fdf2fcc SHA512 a55090c0818c6a42d5edb30da8d83ebb9afe8c0bf1e84831fa273230b1992d24795f3087eda237f1a50b8002ff4643b6ee13b82c8444464808a2a708092822a5
-DIST firefox-81.0-gd.xpi 492742 BLAKE2B 66fc41fcd379359a3b3a86618cdd7c0ccfc5c4f22d66abcb6ebe551eee045ec868aec0039fb9be029cd435b79df26f271ca1f8b4228eb2c05f49504468429426 SHA512 0d47a0704920514c1a3df29a220648ada8b288ecc93f18b9912357abf496045dcf361306ac8849a294361004b76810d32eee8a35a632f610b888b2648c407ef5
-DIST firefox-81.0-gl.xpi 521893 BLAKE2B 199af589e26bf62364e4133ada4e9617fa9a9d98c919cae1f0796a2bb40ecfb9ec0bfe22696a6d7dcde722b7f252c9c6856860debcbd13d3b65b316f56c5ffff SHA512 5461bc38d42999754ca0ad1ff0693eabefe2e3ae70fa4b8f35df9e46b730811212d27dab2667e961eb52dcd283abade9187dbbc895dfea1d546978e28163a628
-DIST firefox-81.0-gn.xpi 536982 BLAKE2B ab6b27a5179cf9d9abe43879e223c6a5f4c54e61ae3ae5959dd8c8b5e02e5f037c27b5dad14605a38e301d9b6540209c31b61d522af6e011d4dd30391d349fc4 SHA512 a20607385917f57f8acd6b171e533256f3d4b68ce7e35be1bfeafefda57046a1dcce6775ed3de82639a76d32ca041168497d9c24c9ea7628087f833419267f73
-DIST firefox-81.0-gu-IN.xpi 541542 BLAKE2B 8b76f19251ec340d885e15259b1cec05f94b4883f4d162a88163913d77f6b83764ca54a62bdae113ad840bb3c9ceb33c2fb9f8b5a5a73f9ffecbfd74dd4fdd98 SHA512 7fe2777ebbcb893fba704e7158138e19ee86611937190c1178044b2abfbe6dd5a0e084a516b9649df5af4ba8499095d0fe4f4a6b3435a66d696b4975eb256f0c
-DIST firefox-81.0-he.xpi 537117 BLAKE2B 2f2579389602ee1dd29c8cb9b37944fd54dfc4d03c4e7ac1da869733e1bbf9032c85163672db9b1cde947884eb8b81aa50a16b2cb01bf550b504f216a0e97104 SHA512 39d204ce15139ef628d6c4862ff25a447bd483195cbc1c4095d28c1f0870067286c60830819a4eb7919ce8f61bf79dc2ede1b1bec57dbe2fe5a1d020f840d5ac
-DIST firefox-81.0-hi-IN.xpi 566847 BLAKE2B 71412a809c76eeaa3521146d9fc6675a0a473ea74cdf13028264f58851e756ec62d4e7bff2236dea4bc27523850cf851dba48e1d2e7c3e72930ea1fb9d156ca8 SHA512 8153617e82c0c52b480fe7eab1b960f4be07cab61c733a60ed3c83ce451ca5475d909c4873eb001ae5e2b7a2f774a199a87bd608f24471c7551a7e0493989336
-DIST firefox-81.0-hr.xpi 516911 BLAKE2B bdfa100f307149e0b0dc947354cdf98c3f56842ccc51453d12716e8fff242cfcbb6888975945813200a2b6ee24cbbbb1e55298284696a6dc631a52af0460331a SHA512 35270b8c2094ade5e59efeacafa55e2db6dd0228e127693afd6d9e5ee91b1979aa036aa03f52f4835b0c04a624a4ff68e55fdc549b7875085f87b57cb3a03494
-DIST firefox-81.0-hsb.xpi 540879 BLAKE2B 6a783ed4497da040ad7f22342d9402900852e7f67de2ed21ee3f347aa2960767cdc65fab6f3ad90114f55ec917df58d8787f1462c87f1196d4c17179eeac8727 SHA512 0d49f3577b80b7604418f9113e745c6885ee2638cc27f3d001aa828a093b168155c5593fbdb1e42460e945a5ad7b1d0183c921d4bc90e0ed5466b7702ce88e7d
-DIST firefox-81.0-hu.xpi 544584 BLAKE2B e6c95b54c04c5ac55b2042bb916da91c925100be5498448ee003c27f9bb84ab105f4416e9c1632a3b657078948786eaf258c4d0aadd1ef7508373e9b9a41b20d SHA512 0884a37e51216c232a81b1606600053bf5a70775e3e2e7f1333570c419edeca8f50a94bea3971354b9b049015349f1552be84aa04d9cd095715de8a08259e27c
-DIST firefox-81.0-hy-AM.xpi 588074 BLAKE2B 25f8cfac7b21759fb8abd3db5315b6af108599cddea06df3d359389e87a9530913c194d656088921a4db377cb021e3887eab4b4615882932075dd4f244e64166 SHA512 747d0cbd608e40540cce31be2111569f6b2440403d4cd44f28725a8fff32779cf08a28917a0a14fd59645c7cec38c35faccedb0ed6bbd3e3f26ec4a83a73a9bb
-DIST firefox-81.0-ia.xpi 512457 BLAKE2B d6923f2226193e19b1023cf9a51b836c2b8b052609c8446fe784c47799e24fbe6d61c3ce2642bbc5ecbfba7bda942c88be9c690507e492626b791d89e1d0e2b8 SHA512 7b1a7663c4106024c04f21d7bd37b048d50ad3b68283b6ff3274ab9e86361bc27b397d5f3f222f5fbea9d32e79fdc57263cae92135b044dda8d06a3cd9edc2d2
-DIST firefox-81.0-id.xpi 506711 BLAKE2B 4e1ef6fa480d3fe8247be522a579375a342a18dc0a411f869416ccd8cfd9f9803bcf195d0df83ebddad998cda2812223e5446bd64b0de812e3c6472278e78c86 SHA512 6bce11838a3d316a70482192f18c4c2351d58bf8fc91fe92c902681a9e0bd4e14249b05b7cc933e3ba04cac2e604944d7616009829c477b5a920767de3fbdb04
-DIST firefox-81.0-is.xpi 478160 BLAKE2B 38b83b2fe68dbe0f9ce9c29b85ff753c237cd87bdb2207d5e0de5389a16efb7e86fd6b59b27218d0c7bffe7881fe9a3989d8dffe8f6749bf6cd737ea98adcdfc SHA512 6bcd23760e7a593c2900914555f7f236a72c9fe8a82485f4d1a2eee1921a7c71a476ae224e68fcb9e814c427c01aaa263e230346b3c85dcf7efac7f2dadef0fc
-DIST firefox-81.0-it.xpi 441428 BLAKE2B cdcdeeef443e8ca3d3887bc683940eb2b1468ae8c26c945342fc34b2071d1499d0bf3efd358c356fbad33e5d1ed80d0f58d64a2087d6457a83dca896384c1c40 SHA512 39ce365c0ecf0f7e65d00b891c2d9fd8ce91b967eab2fc2d192ab05d0c91e32671c45c2111c49cffb470d368c28e016fdd1fd1944d567363b7f759443ced0967
-DIST firefox-81.0-ja.xpi 570539 BLAKE2B 766f8bd2253ec2c7a1e5bfad7d1b0b52218f919ddf2f4eb04dc520cb880bffcd4e32b09bf9402c04bc8bf3c786ad5858b85b683c0b39fe2a9aaefc5293da20d0 SHA512 66dad15c5096dd312a7a56117692e7aa4e626f5610ab3f2b76bbae58eedcffea88ba81ae4da1f78b2501eb936b7f1f775a874d4956fb3910e814d6942d3f8b37
-DIST firefox-81.0-ka.xpi 570426 BLAKE2B 4ab8dc1c5aba4fe7f061760cf16051e5c8ab31787c69a183b82d89fe810344aa31556eee7f31e16ce0ff6d3ccec755efb4f0e313b2bdc3821763466f0eb1745a SHA512 7d68e13ccd2352d51346903208d6dc9f6b2cfe23a1be1368efeadd944d2f5144c4694ef7ccb4499f9a1dfdda2e312a014f28f33ddce5e1afcc549263ad9180fd
-DIST firefox-81.0-kab.xpi 530543 BLAKE2B 2d94dece2b7e3297d0d7ce582fe9f33adc1c14eae770e0bb48a3ee024765c82867665faf0bc83ee0f93e6e4884155ad808adf50922e710b5c73300c51f73e831 SHA512 ff6f99ba240a0acb37b340b636c621cb64fe94fe33447353490d3e2846256fda838946a3afb210ad95ef960a8f2f6632e29cba1ca2934c1f19cb797b258df579
-DIST firefox-81.0-kk.xpi 588942 BLAKE2B ee7a04ee68865b1b633f790ff6b49e823307b996c1910e0278237e1ced3347021f6909fe6eadd2faeb67550b540c7c1c4983666cc112a8ae882519c7fdf545b0 SHA512 cad3858429dcd83c3162a9d254f766cef28effc73bb11b7890814536af7de34d9c5ec52b2758db6b4f5e8d19632c3877cbc734edb93305aa581e293134d8eef0
-DIST firefox-81.0-km.xpi 525938 BLAKE2B da56471f90e51ef3aac16e1752cb115a741adf7606ef142944374418bd9bc630a6e78df3e070225ffa0549e4326a2ea3a53b561fcdfe6d6a72bcc6df6b9c9474 SHA512 384c753a16cf40c05da62fbbc757ab3f3cf81c3b3631475cf453bc53905802a9d8fa3f5f732946aa7e70636b0f078b6133921bfd2a5361678517fc209c65c5ba
-DIST firefox-81.0-kn.xpi 506715 BLAKE2B c443f896ce7b599928827dd18283a898797c602d6538624714206bf82454f8923b2126f4ecc03c9f1df55cd6f7f471d49d5807ab0988fbbcb801230272b27d42 SHA512 ae53945e102925c836b4225f34cd022e6fd52569e129040c00b822d8028764fb61d6f5a06434a58eb0b889d69eeb30c1141bd4d813b8ccaa505b4e13f8631a58
-DIST firefox-81.0-ko.xpi 556928 BLAKE2B 48555bf5e2972ad94b357682dd588ab155c4a477f18a5e76f28158002b42788925cd215e02cadb6ba0288f12ff54372e11199704999511c289f5e60ccfc21950 SHA512 d4eb712c8115b56f5aec04bdac459c23858b9c267a4d04e92e0ee040a66e870334287590a2ed616f3f29c5496332b32881f5a2e2bc9c87da8d28e16519d97411
-DIST firefox-81.0-lij.xpi 476223 BLAKE2B e3ee3b79a0613ffd7a5411002f3f145c27a1c6cac153c092450e05f108dc92f83b92fea5c36ab1ea445972d3293682de763c51ae3b1f227741b28fbccd89c18a SHA512 c91e79d97a0de761a0f7389bcd7be4ceda5cf999c6f57f9a0d3191697762f46afe70ebc0336fa41cf1263847f349e935941b3fe7aae89901c5d9bc33d3ba28ab
-DIST firefox-81.0-lt.xpi 536127 BLAKE2B 50241669fb41b3500ef44021b78c54797ac89be582200cf672ae648bf4cfa8edf253389cc1aafb3c3d0b8699e228aedd93a3907a173f855599f1eb88c55515b8 SHA512 31f0f0eab6f2ce161b164f78e21fca275b0675901dc7112440588d3283da7fbac145e1bfb844e660020f153df87f8cc63e12101164defc4760b6c6138de86b71
-DIST firefox-81.0-lv.xpi 468497 BLAKE2B 96c659bce6ba05a41bb508d918714c4ef4b5157cd22f646a2910fa7ba44d32496b8dc58478a9800fc4f5dba4fd4598d1bbaea859e2ee4a285148825ee0617670 SHA512 5a06107b92f21ec42d5e6230152935ede3030f8b4af446c0e6f7dea35e2c231015d9b49880e93bf74e5a0b3385aae3a1c2f4b11c9ce88bf60d97b9dd64e678fe
-DIST firefox-81.0-mk.xpi 459792 BLAKE2B e4c4e9961b32df90cf4aaa104c87238af3c301b173b8c917de4b319d53e92456c2996e75f851217fd55e567fb2add91eba98c30d5edd174e83100c599317116e SHA512 637ac3d4da9a568bff2d2fde9ac5dec7eaf6fe515ebfd1df0b7f199f2a33d4ebc237dbac61cdce0d7717b10fcb0261c9f597285c1f85927dcb3a20cbfbbba18d
-DIST firefox-81.0-mr.xpi 541691 BLAKE2B cce6dc7d1dfcdd294452643ec9a010dc05dff90a6def78458aade14371270937c0a39fbceb2933dce9c662df0ab9b3071709b4c93c5350eca098d35e9fae8f73 SHA512 9e1e7d76d70749ca586b3d3299cade35fab2b9de1e18393c831eda62a8ea45e027f781be5bbf94637830addc5b6a78005ca6c15c8b6fc6f452dbfcc8de4ca45e
-DIST firefox-81.0-ms.xpi 454299 BLAKE2B 663010cfae9bfa94ae9b91659a7ded5aa3b6339cf6f956c9e0c9ea96f48c476a73e981efeeb5f71d9984f7c2ad8c50414901a855d8acfce1f8299d3cc8685799 SHA512 72e24a5a203d7620de662c21af7dccc109f3748c73185c180dddf9f431936396c0423ad1679623f093b4ea55809c0ccd001bc6151b210726f3d335303962b1bf
-DIST firefox-81.0-my.xpi 526286 BLAKE2B 9d23ac22b770cabf3db3743f820f3200557b61258713c3065000a01c13e1ffbaa334295af0ca35c0c562abeb3fe7e8297a1d64429d39a5ede9ad40a79cd59ac6 SHA512 1bcf447dcf40ca96d5200a9d846f0e431346f8c68b952e0591c8736d7477362b8b002f1bcc38a89b0739cbfabb9fd04b6ef916c6baa2c552a381dc6fd7101b08
-DIST firefox-81.0-nb-NO.xpi 509492 BLAKE2B 14698e6416578a07de2a235cd062da2c177fd02fd5f2805e8eac1af4e5ead6ff150e5a14fe47fc7014df517579b4b66c9f585fe52027e9494c246c2ee11a1f20 SHA512 1f52bf8319e4de2c9929e114a823b2e5544cab4bcf1825d990311785fad7e1971591eda535b7e62a9d3d1666944b4c4ecd4327611f2aa1d4bfc8ffb6f23972ec
-DIST firefox-81.0-ne-NP.xpi 483415 BLAKE2B 54868771ecfb6dfbb8c0e2be87416313720e9ed1fc71117b1aa2c466f71995808b10261b33d2617e6ded52d1f7a5f6c92806a2207dd30f79833c3f7563419ae5 SHA512 ab841041f94cd69249d7824357afa1caf9e76bd820970ab7370558383dceba0190a5f712724bfc5f607ede745dacbda978617ad1a7ddd26df18f49dee552506f
-DIST firefox-81.0-nl.xpi 516617 BLAKE2B 2af159b38ed3af5823f5b98c093e2940697d9058604330d3da9a80648b5e3cb0d9010add7209babce3e5677882391d3b7d23e636cf795500ee6a67593228d203 SHA512 fe20d4b07dd48c839884be85658c9f34cc835b0d7f34b43cf642a7a84e92bf67ea25f6b5f2ff9f3193ac1a0cb9d5864b38362830af95f9aa48975cb185b3b86e
-DIST firefox-81.0-nn-NO.xpi 511954 BLAKE2B 533541ca79d6d5c6a2c3fa1fc3eb5235e6d1596a9a05d98ddbf092e5f755e38eb5c9bf7190c03c20753688954475ac77f3d39a924a1103de79e113e5a244d7ee SHA512 ade0afe3d99627b48094f0bfacf7a904be1bbb8642b9f4b28e3ac08e722b0bdb49fcee5e0a5f3beef911ce94957753e61d54cd4ff09e4ee49395939bb8463b0e
-DIST firefox-81.0-oc.xpi 529760 BLAKE2B ea13cc628f4b80535c54265f6d4f4d1e87396153fe62746d11516406159f7475984811077473923b86521cc48c6664c73c55af5680037d8cdecdd8ae6dae2b80 SHA512 276fd3e1004393bd112e697ee30b288b99c537dc431f2ad387c1534785ae77dadd20e0e7c48d899b741a8c6c786939ad631883c98020113384b32899ade39853
-DIST firefox-81.0-pa-IN.xpi 569877 BLAKE2B 00c589324f687483332c99ad2f840d26dbbce8b1ca12bc7ffe910ba80c294bbe864457ce944df7262a8cdba5bc16857a4ab1be72b0ff12bdbf34c584d270c0f2 SHA512 37d540ede741b43bbd55b8d97ed7eb5d5ccd812f03bedc3c5feb747b8bad5514b3c196f2cb0509af0de8ae5c27b8a53a44a7a88295ab98d6fadf6a316cebb011
-DIST firefox-81.0-pl.xpi 535548 BLAKE2B 252c793aa0654bedd1c74bf9e464b47b04705b45bfdd7031a1e0e5dcb96a91856ab9c0c5a7875e7aaa3302f93c12bf67a079b7ac4a8d11d9aeb746ff2a80ecc7 SHA512 0830d3532ba8a6a715f27300fc41f1b67d24e7d9bbc037b943efedbb6c759f1a83e04484c81bcc355bd2e4c82e64f0dda30bab68d36b5c8ca4325b061c2558a9
-DIST firefox-81.0-pt-BR.xpi 517605 BLAKE2B 62ea9479302f052015ae58bea0772997b687881f0ed141c2d29b85593ed1362fd88bb4ceaee4ec274fd5b796ada8ef7ed0f69a82e7a6dd06abb4558873534e81 SHA512 cd959c9c30c706bae5137cc5502b6db3a33e2d55c35ad0084822ce5a2f9afac8fb46f6d57a6f4422e3157e051b3942b258d5fad6032bb8f584a03eb43972387a
-DIST firefox-81.0-pt-PT.xpi 525638 BLAKE2B 19cf0bcf651d11794845f47ff160698a872104a41d86dc4b24057fa94f815b5411f281660651a3112d047fe2e705d6a98788aabbabca8c80eb616fb7a71e824e SHA512 97d7ffcd9287bd0f1be76c25923e3ea8c4dce31285a0f3263893c0c15942c3e14bf705476a7f90d6d72169f66db46286316f149d525f69d132385f86d15d467c
-DIST firefox-81.0-rm.xpi 514445 BLAKE2B f9828453f34b7b8f7906fb805cbb01391187c8f7f8c1413219aaf301ca667267e8805fcbcdf0eb75b44ba3f6826d9560eed0bf661977293d0fccc43eb88407bd SHA512 5009869c9ba5782ee4a3df510460f16ad281ae053b0c4eb2f47162c3239d4708f736b6f1972d003d11590fc26db7dc91a5b0f447855cdef7a56e710e197cbf48
-DIST firefox-81.0-ro.xpi 532731 BLAKE2B b261f1a6dcca659d236de01236a77d59ea0ac847a99ca58aca6ff247d28ca53bbbb929892cae9b0acb96f0fa18df61ab9c43e5846a8be18dbd082a58216f1dfd SHA512 9e29b641d3dc8f05055e56eff32f5552168c13e42a8f4a7aad119247ece2ae254eefe38c3e07359103b4b8188a4cab36a9a0111cbb2362b2ccefd3058537bf60
-DIST firefox-81.0-ru.xpi 603105 BLAKE2B fa67f816b4c2bd8952576cb61a622e788037abf986f0a5fdeb1723fb841893d939e03aba289f9f5e8a634184e9ba48413ad8a4668323f2ceb106b77e82370526 SHA512 718e6c8e4c7f095dd222e1611aab48ea443a9846753c42feeb57b90371be2c3ab8a2412c6b3c3551b26e8dfc9002791915c095c0e47cdca41f0405ed495cc570
-DIST firefox-81.0-si.xpi 492872 BLAKE2B c13d863caa672f3b40323d9907516424dd4f5cdacea424e22a232f60f79dcfaa46b41cf7ea9f874ceec763f202e0557f6e37b7e183d2e0bc3785b668fa3f3063 SHA512 823637a18d85afc93586c905ceea14519aa0aecad3f62f87266b358f13465b4eecc3576c85a366458748782675a72afeb93416804441ebaf5ee187f02b08a3a3
-DIST firefox-81.0-sk.xpi 533661 BLAKE2B 5f4028d1ea21aaebde31ad1be37f95729a31ff6728ee3edf55b22e3c4aa775b73845853c95996749eaf6b6e4e144401313f069a222979283ef39efaa88c8655c SHA512 00b081a993d6c8234e5e99a0fcc1e9db78df93e73d83f94c351b7e4445cbcbfdb1cf8a0fff9f8843dbf3ffce2b025b8b23244da7e1a4042e0da6aaba07e2cadd
-DIST firefox-81.0-sl.xpi 517954 BLAKE2B 544e8d79558223861bafa9eae1b4aa2bd22aebd1fb833529ccf453ad964dfd86c9fdcbbdd7abcc0b9192d61ad95104a9d81b4a3011df3885061428321dce96d7 SHA512 4aefeef16449e91a215518edf3ff6d44b228494b43367323f8662b019dae8c962e9c83a15c164027ef3473ddf3293b5db5570ccc5919a3970537c406ac76978d
-DIST firefox-81.0-son.xpi 425678 BLAKE2B 4f9241e9cc5fdf1fab6ca41122712b57e0dd2227d0ddba86976203d4d6cdbb7bc3ae4364d11ef9c1b77f1eb608f4ffff5539d722f1e7b4f08c72ff9ed7cab616 SHA512 b31225cb45c573cb9aada41d3490d55a1dfb9ad5970d1ab02f67819a59c794a0f047dc4b335bb73d3fef3dc255bfd5d6d6a85c0d1dacad7c4ef475610c14b285
-DIST firefox-81.0-sq.xpi 533958 BLAKE2B 80c640a319b7414cd9c750b9ab8ad25f739098c849d1bfd26d364a6c4bc577f9b34f6958c2b8050a84d8f8bbe4e5e922918ac05026f9a6891caf4bfb912849c6 SHA512 a538a061390cb5791c41f1f2d220db10d48069feb4270c192cf99184a854accc2017d4b8c8a33e0a0cd5f980e879aa28e4ffef96bab4314d4d36d1f2c58562db
-DIST firefox-81.0-sr.xpi 561053 BLAKE2B bb1d0795f67b9f50121c857c304ef563a3dcd3f80c50ffea432c10dbcff847e6062cbd8b37b6396b6edfad681e2448ef8984dcf1eb307c4440efdb858e6d55b4 SHA512 6caadeb6c666216186a080b025fd269db88cead2d260ca5e2f38909a9bce229d779d60cb19926c9e1aa7b7ff67d549f1d1a6d81fcc90eadb4a238b2231df891b
-DIST firefox-81.0-sv-SE.xpi 520272 BLAKE2B b763b6cddaa03c8070ec2ac8de319dd29dc62eb9d36c75890c7b8bb6f896f46faef3c1e22d74df381ea98f08559679acf14b6fff8c5b4639b1d949d79e50c650 SHA512 9c09df21cc4e88cf9b894bd251aaef72529fbd6d324b363258dbf5f67d929ce30797083323f8b939a9626ff7f1b5ed401a9f0badde931ee6ea0a59a93625c4d1
-DIST firefox-81.0-ta.xpi 521447 BLAKE2B b4640c16728bb06d66bc4d6e76b7525934633f4a33532ab3583325fa2a80b8ab2d76a2ff03a6577004f12432d59d156b4d5b2f9b919171a18ec87f0dbfcad843 SHA512 4049980ee61db971a6d563e9ed2f8f8a747f7ec932c6755b09557af94bd5e7b91cfd8397a13d3adc58f0c47c4736982e91b29ac549bec73647bd8961c6266081
-DIST firefox-81.0-te.xpi 557700 BLAKE2B d492bc00e431d0c47c06685bfd9b5950da1ec646518eaa27063cb021a008343c12a2e38a4b518729c8844f578063a41f910fe8a7e10cc2acb8b6bbd8092108a0 SHA512 1f38500b68b32f429676d0c8a1d12321738022afeed38b4e9f6be47c1651dc3e32ff24436418ad53bdc6cb4633cdfa63c90b38cf7136c1c0cd0ac92af06a81f4
-DIST firefox-81.0-th.xpi 585292 BLAKE2B 7f69422aff85b3e242af5b448a0f68cb7e8417457a2fb45dfbbaa9796677e86d03af4165cecebd713587b766a3b9b791e7e847c89fc2d2c475baa037de5f1c1d SHA512 1d30ca3e7755b3ec9c12d543a175863762fd17e135653844cf30a878f3f949cb7d26b57e8ea8c3272c3e4b2ca3356412c92e7b2fb8223dbfa10b34f1f12837ec
-DIST firefox-81.0-tl.xpi 505733 BLAKE2B 8492d4b783d69158e914449901fee0350ba7730d6e0d7ba8314bcb14ca7644bf992e8ebd98e83480e3c4cfecf6be274e8bc1b487016ee6056cddc017c2e78705 SHA512 fb7a47d960df8389e958b06f88cfde9d94918852e96b1e306a4ea4b724ad0bd85b4e4fcdfe0b24fb945f621d2e5b0639360277e4a4bbdf107197d317f259cff1
-DIST firefox-81.0-tr.xpi 530257 BLAKE2B bdbf22c16935a7321eba766bb9a44e3cb5abd3aef97fb612df5535bdefa5fd481369f53cb7b9f10d1bd9416084955feddd693b84847f287c87a6dfd2b9f9d0a3 SHA512 bf1b0681fa9df4dba76d3fd0e452c3c1f335d8b664c229b08f053daf77d1f167965f17bd6fb2975beaeb17e5c7683fde0e81294a113206a6a1e0f5e984cd7d22
-DIST firefox-81.0-trs.xpi 500282 BLAKE2B b14cf0974d1a82024916ac8b874a718bb549fc624e27b519e9789ce61076271ea42c449e7d152318a265170694bba19f67e3cc97108ddfdf42e85f8df17be253 SHA512 87425291fb8d0d859bce53c7811e29ba9058222b621d3ccb8771296f25c8fc65f9d6fe2608b625df5188480067f4957c7570430bddda63182a061445222c7825
-DIST firefox-81.0-uk.xpi 597212 BLAKE2B 79215b6d7f718d632a9027ea0559c76fee9a9ddf8b71a9f6c9e7ecaf8ec0421957403ca931274936576cb730b4704415bb325e42baa97afbd59f1d3fad604458 SHA512 0e608c6f19f1ed2900fd8ce2cc99a5c409af5ab2035aecee8f4827371f72472f26c9e2e39311d73e4301656f37ed720f05e42ab66ac0f824039aca83bb8f2c05
-DIST firefox-81.0-ur.xpi 558284 BLAKE2B a1a624f52e1994ad5a4e8e1a5b02cd4d023f1c137e64004c7796756d7decae1cc53136981b84d97a24d63310806c2d7b3fcc020ada4337458b886b9b4e8a2aca SHA512 9c96a33cdd87e74ea5b5a6d05a05d0608f60c4ee53cbd66629030c2d440b7b3e52588a7540adf275340b49e780a7be589d429e85352bfe4fef1d859714606ffa
-DIST firefox-81.0-uz.xpi 478097 BLAKE2B 46e7753fc23b793fb9b036e2c0e35cec81cf8c82c15e5cf067a347bf0e178ab412e4f3a79bf84127ebc75b35d020370f412c0e3b40b33c88902868a364cea758 SHA512 60008664e3f125805b477eb633267c8f9bdc3e93a2cfa68e3a4f1219a3834d791e3822b7b6c73e7628b35352c0539386fde641eb4ce26907a0d41c3bd534df4b
-DIST firefox-81.0-vi.xpi 553760 BLAKE2B 7247d2684658cfdac8023ff53ed0b47d8a32a09143baef36962708ab592dab0600956a689e0a994858bdc77a03563b64c6bcc859f34bcea000037a1fa3f72480 SHA512 a3f03bc4be666bed463592efcf7dcca22a62614f716b03513e8d7641e8d81bb775b26fdec772755819ef461961681f12096d430cf701b467216c01b88c034485
-DIST firefox-81.0-xh.xpi 427846 BLAKE2B 753beea068254a3b528a94c90331fb19f347d552eb09abbdacc4f688b186c76044aa5ccb4dace268794d74e80f7c7e72a3282be5078c6ca8a70aeea1d3ae3e9e SHA512 55d7cddb69a6db09b40e8bc5506db8237a229d7ffc48c589ff99f4adcd648fff8e938cea091a159f6f561916fbb90809a592893a87c23e34dcef0e4d47032426
-DIST firefox-81.0-zh-CN.xpi 554382 BLAKE2B 568ae2cd0ab490b552dc26c60714747c3cff4a572cc81dcb9aa9c026882e20b5a64fd677e3496fbf077d4cca4ab4c2a1c498ed18f776d1b3eefd1381fd37e19b SHA512 436e3ee03d1eee0b0e2a3cb88495148e1efa1d4e8787ac27e1951c9d3cbbc4e1fc8bc3cdefa94db583669c215edf423f398987821d53dee152b9cbe195fdc7ef
-DIST firefox-81.0-zh-TW.xpi 554145 BLAKE2B 718a02b0c906fbcd0fb39141a41e8b0c427b50c120b18a6d496e36f10c3fbc39269f02bcde7218a515298f37494027e1fe6bfcae0344a524a16e948920d5d583 SHA512 31b8f7651b1b575eb231325dfd0223f0c84706cc4d5a60d2c3a65f29ffd36f73fa17ef5821f2928f500076737f72dc0b66c9c1078c19c3aa0a41b3a2a287df1e
DIST firefox-81.0.1-ach.xpi 458702 BLAKE2B bc2bbb8174556aa91d8fe9149b5e7debedfbd8682207c62c8c1ca3ad86355bd522a2c08915094871ccb46c3c9b7a0a6dde4cc1a8dd296890176003a7eb349274 SHA512 04a2e8146fce327dfbe19a583c2d1ac45289a14dff7f29af17246d6bf8ae0c61363151cbea50da2a0ca06257c9b1ab4ef1b4d26086cea48b2121f059ca97d977
DIST firefox-81.0.1-af.xpi 429009 BLAKE2B 529a751d6b4ff4e9e1c693cd3c409d199ba5db53f499200718f1dd17c726b4d45b9c4e9a2d4b0fa418afacfc4c2917dfec09f55e5b12db39353e0759b68a4101 SHA512 c704334d07496c5cb0fb7a9755bd53ecc9fcd447772f8d40ab1d601c5a8e7d9ef99a366f3dda287b4a0e11795b5b4b3e06e0da9cc5e09bdedab3ccb3979c32b4
DIST firefox-81.0.1-an.xpi 506886 BLAKE2B 72b0b6d8aeabd3c0db9bdd3bd2e7015bc7245250c450a4844807c320228b3c3fd8423a0677c3b93f913e3acd2cc2d8752ab22a2fb78a5b8a62d4dc03e3e8edef SHA512 3da113ccdb5c219e1fa07b678056460687a2de57f783c5056e1572cbad0b2238fe1fbd5d36d463bebb1ec0ad2842bfd440a2995185e862ab51cb23ed5b1a8d3f
@@ -661,5 +470,4 @@ DIST firefox-81.0.1-xh.xpi 427852 BLAKE2B 74955a6277dde525b39e9e851ad71eec5ddf4a
DIST firefox-81.0.1-zh-CN.xpi 554382 BLAKE2B d58a750a62ac62c3f9ffd9807e2294d6140651b4d0984ef60f768902ad3e220a8df4f5f3a62a0b5f6f669ad0bc3903b8b721121ab67a4ee19637f707a86df192 SHA512 0a19521bdaa79dcb6693c397f0a35aba38a93431f747df50a71550943ffa886ce77390de8a5e82b5404050717c749a8659e357dfb2a0e1178fd80e3978c06a02
DIST firefox-81.0.1-zh-TW.xpi 554155 BLAKE2B 384f9b2aae9c6e15155b9cea2c8680fff3bab2b7118551b51a084e3def1d7b9c49c8c8ca990441a98dae9af1017ae3c4ab817815e9d19059f349b1d1e34aab6b SHA512 c68e1a34e2899f45d576351debac6135a46c304732ae2a1b2c02386caf52404cb10b3f5975e841299444fa92c8b1eed3aa726541bccba93a34b44c6f96dadf33
DIST firefox-81.0.1.source.tar.xz 338268036 BLAKE2B 47b4bcd59c90d28df89afb168c4cf2376b12ba020dc2ec6c3a899e9f8627eec2312ff5eb9ac07193c5487674e03c21a67f4a6927de9533da58a25ecc3a9b84f5 SHA512 3e7c4b95872d46fc21f4c55691a159fd2c245537e4e59072f7699da10eacd44fa4bbbab08a028e421bee46356bd02d157620ea040900305a93d6c21bbd695608
-DIST firefox-81.0.source.tar.xz 340347916 BLAKE2B 0546bad15aa89a7e4d2ca0cc000fed2170b9529f8f2cc1c1c4907649ffbcf72e8ee800083b63a767fc07b643cacb298b424ebc1ce827de209f366716e3a5135b SHA512 29e0af4c53a09451c3b8e6850c3f19538530035fb576ebe99b3b3a7ed55c37f51bdf44d6c02704e0cbb05ef4ce8278c9b47877643e64c68cd594d626e5d86e5b
DIST firefox-esr-78-patches-02.tar.xz 36288 BLAKE2B f177027ea550b4f41616c104865a4d1a99fa0a84ca431176b5191107f23b2fcdd8361ad97493d3182d01dfeb7f2805caf16725b8a81bf1f7847cf400f87018d6 SHA512 7eff0a4f5d2b4abcb0293877b3fe562b5fa2581f46b4905ff8ad839559049e4d903dcca4aad6a7196720cc7b3cd93ae88ca0093da51f70e56609faaadf646c78
diff --git a/www-client/firefox/firefox-78.3.0.ebuild b/www-client/firefox/firefox-78.3.0.ebuild
deleted file mode 100644
index 50806d400ca7..000000000000
--- a/www-client/firefox/firefox-78.3.0.ebuild
+++ /dev/null
@@ -1,1055 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-FIREFOX_PATCHSET="firefox-esr-78-patches-02.tar.xz"
-
-LLVM_MAX_SLOT=11
-
-PYTHON_COMPAT=( python3_{6..9} )
-PYTHON_REQ_USE="ncurses,sqlite,ssl"
-
-WANT_AUTOCONF="2.1"
-
-VIRTUALX_REQUIRED="pgo"
-
-MOZ_ESR=yes
-
-# Convert the ebuild version to the upstream mozilla version, used by mozlinguas
-MOZ_PV="${PV/_alpha/a}" # Handle alpha for SRC_URI
-MOZ_PV="${MOZ_PV/_beta/b}" # Handle beta for SRC_URI
-MOZ_PV="${MOZ_PV%%_rc*}" # Handle rc for SRC_URI
-
-if [[ -n ${MOZ_ESR} ]] ; then
- # ESR releases have slightly different version numbers
- MOZ_PV="${MOZ_PV}esr"
-fi
-
-inherit autotools check-reqs desktop flag-o-matic gnome2-utils llvm \
- multiprocessing pax-utils python-any-r1 toolchain-funcs \
- virtualx xdg
-
-MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${PN}/releases/${MOZ_PV}"
-
-if [[ ${PV} == *_rc* ]] ; then
- MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${PN}/candidates/${MOZ_PV}-candidates/build${PV##*_rc}"
-fi
-
-PATCH_URIS=(
- https://dev.gentoo.org/~{axs,polynomial-c,whissi}/mozilla/patchsets/${FIREFOX_PATCHSET}
-)
-
-SRC_URI="${MOZ_SRC_BASE_URI}/source/${PN}-${MOZ_PV}.source.tar.xz
- ${PATCH_URIS[@]}"
-
-DESCRIPTION="Firefox Web Browser"
-HOMEPAGE="https://www.mozilla.com/firefox"
-
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-
-SLOT="0/esr$(ver_cut 1)"
-LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
-IUSE="clang cpu_flags_arm_neon dbus debug eme-free geckodriver +gmp-autoupdate
- hardened hwaccel jack lto +openh264 pgo pulseaudio screencast selinux
- +system-av1 +system-harfbuzz +system-icu +system-jpeg +system-libevent
- +system-libvpx +system-webp wayland wifi"
-
-REQUIRED_USE="screencast? ( wayland )"
-
-BDEPEND="${PYTHON_DEPS}
- app-arch/unzip
- >=dev-util/cbindgen-0.14.3
- >=net-libs/nodejs-10.19.0
- virtual/pkgconfig
- >=virtual/rust-1.43.0
- || (
- (
- sys-devel/clang:11
- sys-devel/llvm:11
- clang? (
- =sys-devel/lld-11*
- pgo? ( =sys-libs/compiler-rt-sanitizers-11*[profile] )
- )
- )
- (
- sys-devel/clang:10
- sys-devel/llvm:10
- clang? (
- =sys-devel/lld-10*
- pgo? ( =sys-libs/compiler-rt-sanitizers-10*[profile] )
- )
- )
- (
- sys-devel/clang:9
- sys-devel/llvm:9
- clang? (
- =sys-devel/lld-9*
- pgo? ( =sys-libs/compiler-rt-sanitizers-9*[profile] )
- )
- )
- )
- lto? (
- !clang? ( sys-devel/binutils[gold] )
- )
- amd64? ( >=dev-lang/yasm-1.1 )
- x86? ( >=dev-lang/yasm-1.1 )
- !system-av1? (
- amd64? ( >=dev-lang/nasm-2.13 )
- x86? ( >=dev-lang/nasm-2.13 )
- )"
-
-CDEPEND="
- >=dev-libs/nss-3.53.1
- >=dev-libs/nspr-4.25
- dev-libs/atk
- dev-libs/expat
- >=x11-libs/cairo-1.10[X]
- >=x11-libs/gtk+-2.18:2
- >=x11-libs/gtk+-3.4.0:3[X]
- x11-libs/gdk-pixbuf
- >=x11-libs/pango-1.22.0
- >=media-libs/libpng-1.6.35:0=[apng]
- >=media-libs/mesa-10.2:*
- media-libs/fontconfig
- >=media-libs/freetype-2.4.10
- kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) )
- virtual/freedesktop-icon-theme
- >=x11-libs/pixman-0.19.2
- >=dev-libs/glib-2.26:2
- >=sys-libs/zlib-1.2.3
- >=dev-libs/libffi-3.0.10:=
- media-video/ffmpeg
- x11-libs/libX11
- x11-libs/libXcomposite
- x11-libs/libXdamage
- x11-libs/libXext
- x11-libs/libXfixes
- x11-libs/libXrender
- x11-libs/libXt
- dbus? (
- sys-apps/dbus
- dev-libs/dbus-glib
- )
- screencast? ( media-video/pipewire:0/0.3 )
- system-av1? (
- >=media-libs/dav1d-0.3.0:=
- >=media-libs/libaom-1.0.0:=
- )
- system-harfbuzz? (
- >=media-libs/harfbuzz-2.6.8:0=
- >=media-gfx/graphite2-1.3.13
- )
- system-icu? ( >=dev-libs/icu-67.1:= )
- system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 )
- system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] )
- system-libvpx? ( >=media-libs/libvpx-1.8.2:0=[postproc] )
- system-webp? ( >=media-libs/libwebp-1.1.0:0= )
- wifi? (
- kernel_linux? (
- sys-apps/dbus
- dev-libs/dbus-glib
- net-misc/networkmanager
- )
- )
- jack? ( virtual/jack )
- selinux? ( sec-policy/selinux-mozilla )"
-
-RDEPEND="${CDEPEND}
- jack? ( virtual/jack )
- openh264? ( media-libs/openh264:*[plugin] )
- pulseaudio? (
- || (
- media-sound/pulseaudio
- >=media-sound/apulse-0.1.12-r4
- )
- )
- selinux? ( sec-policy/selinux-mozilla )"
-
-DEPEND="${CDEPEND}
- pulseaudio? (
- || (
- media-sound/pulseaudio
- >=media-sound/apulse-0.1.12-r4[sdk]
- )
- )
- wayland? ( >=x11-libs/gtk+-3.11:3[wayland] )
- amd64? ( virtual/opengl )
- x86? ( virtual/opengl )"
-
-S="${WORKDIR}/${PN}-${PV%_*}"
-
-# Allow MOZ_GMP_PLUGIN_LIST to be set in an eclass or
-# overridden in the enviromnent (advanced hackers only)
-if [[ -z "${MOZ_GMP_PLUGIN_LIST+set}" ]] ; then
- MOZ_GMP_PLUGIN_LIST=( gmp-gmpopenh264 gmp-widevinecdm )
-fi
-
-llvm_check_deps() {
- if ! has_version -b "sys-devel/clang:${LLVM_SLOT}" ; then
- ewarn "sys-devel/clang:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
- return 1
- fi
-
- if use clang ; then
- if ! has_version -b "=sys-devel/lld-${LLVM_SLOT}*" ; then
- ewarn "=sys-devel/lld-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
- return 1
- fi
-
- if use pgo ; then
- if ! has_version -b "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}*" ; then
- ewarn "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
- return 1
- fi
- fi
- fi
-
- einfo "Will use LLVM slot ${LLVM_SLOT}!" >&2
-}
-
-MOZ_LANGS=(
- ach af an ar ast az be bg bn br bs ca-valencia ca cak cs cy
- da de dsb el en-CA en-GB en-US eo es-AR es-CL es-ES es-MX et eu
- fa ff fi fr fy-NL ga-IE gd gl gn gu-IN he hi-IN hr hsb hu hy-AM
- ia id is it ja ka kab kk km kn ko lij lt lv mk mr ms my
- nb-NO ne-NP nl nn-NO oc pa-IN pl pt-BR pt-PT rm ro ru
- si sk sl son sq sr sv-SE ta te th tl tr trs uk ur uz vi
- xh zh-CN zh-TW
-)
-
-mozilla_set_globals() {
- # https://bugs.gentoo.org/587334
- local MOZ_TOO_REGIONALIZED_FOR_L10N=(
- fy-NL ga-IE gu-IN hi-IN hy-AM nb-NO ne-NP nn-NO pa-IN sv-SE
- )
-
- local lang xflag
- for lang in "${MOZ_LANGS[@]}" ; do
- # en and en_US are handled internally
- if [[ ${lang} == en ]] || [[ ${lang} == en-US ]] ; then
- continue
- fi
-
- # strip region subtag if $lang is in the list
- if has ${lang} "${MOZ_TOO_REGIONALIZED_FOR_L10N[@]}" ; then
- xflag=${lang%%-*}
- else
- xflag=${lang}
- fi
-
- SRC_URI+=" l10n_${xflag/[_@]/-}? ("
- SRC_URI+=" ${MOZ_SRC_BASE_URI}/linux-x86_64/xpi/${lang}.xpi -> ${PN}-${MOZ_PV}-${lang}.xpi"
- SRC_URI+=" )"
- IUSE+=" l10n_${xflag/[_@]/-}"
- done
-}
-mozilla_set_globals
-
-moz_clear_vendor_checksums() {
- debug-print-function ${FUNCNAME} "$@"
-
- if [[ ${#} -ne 1 ]] ; then
- die "${FUNCNAME} requires exact one argument"
- fi
-
- einfo "Clearing cargo checksums for ${1} ..."
-
- sed -i \
- -e 's/\("files":{\)[^}]*/\1/' \
- "${S}"/third_party/rust/${1}/.cargo-checksum.json \
- || die
-}
-
-moz_install_xpi() {
- debug-print-function ${FUNCNAME} "$@"
-
- if [[ ${#} -lt 2 ]] ; then
- die "${FUNCNAME} requires at least two arguments"
- fi
-
- local DESTDIR=${1}
- shift
-
- insinto "${DESTDIR}"
-
- local emid xpi_file xpi_tmp_dir
- for xpi_file in "${@}" ; do
- emid=
- xpi_tmp_dir=$(mktemp -d --tmpdir="${T}")
-
- # Unpack XPI
- unzip -qq "${xpi_file}" -d "${xpi_tmp_dir}" || die
-
- # Determine extension ID
- if [[ -f "${xpi_tmp_dir}/install.rdf" ]] ; then
- emid=$(sed -n -e '/install-manifest/,$ { /em:id/!d; s/.*[\">]\([^\"<>]*\)[\"<].*/\1/; p; q }' "${xpi_tmp_dir}/install.rdf")
- [[ -z "${emid}" ]] && die "failed to determine extension id from install.rdf"
- elif [[ -f "${xpi_tmp_dir}/manifest.json" ]] ; then
- emid=$(sed -n -e 's/.*"id": "\([^"]*\)".*/\1/p' "${xpi_tmp_dir}/manifest.json")
- [[ -z "${emid}" ]] && die "failed to determine extension id from manifest.json"
- else
- die "failed to determine extension id"
- fi
-
- einfo "Installing ${emid}.xpi into ${ED}${DESTDIR} ..."
- newins "${xpi_file}" "${emid}.xpi"
- done
-}
-
-mozconfig_add_options_ac() {
- debug-print-function ${FUNCNAME} "$@"
-
- if [[ ${#} -lt 2 ]] ; then
- die "${FUNCNAME} requires at least two arguments"
- fi
-
- local reason=${1}
- shift
-
- local option
- for option in ${@} ; do
- echo "ac_add_options ${option} # ${reason}" >>${MOZCONFIG}
- done
-}
-
-mozconfig_add_options_mk() {
- debug-print-function ${FUNCNAME} "$@"
-
- if [[ ${#} -lt 2 ]] ; then
- die "${FUNCNAME} requires at least two arguments"
- fi
-
- local reason=${1}
- shift
-
- local option
- for option in ${@} ; do
- echo "mk_add_options ${option} # ${reason}" >>${MOZCONFIG}
- done
-}
-
-mozconfig_use_enable() {
- debug-print-function ${FUNCNAME} "$@"
-
- if [[ ${#} -lt 1 ]] ; then
- die "${FUNCNAME} requires at least one arguments"
- fi
-
- local flag=$(use_enable "${@}")
- mozconfig_add_options_ac "$(use ${1} && echo +${1} || echo -${1})" "${flag}"
-}
-
-mozconfig_use_with() {
- debug-print-function ${FUNCNAME} "$@"
-
- if [[ ${#} -lt 1 ]] ; then
- die "${FUNCNAME} requires at least one arguments"
- fi
-
- local flag=$(use_with "${@}")
- mozconfig_add_options_ac "$(use ${1} && echo +${1} || echo -${1})" "${flag}"
-}
-
-pkg_pretend() {
- if [[ ${MERGE_TYPE} != binary ]] ; then
- if use pgo ; then
- if ! has usersandbox $FEATURES ; then
- die "You must enable usersandbox as X server can not run as root!"
- fi
- fi
-
- # Ensure we have enough disk space to compile
- if use pgo || use lto || use debug ; then
- CHECKREQS_DISK_BUILD="13G"
- else
- CHECKREQS_DISK_BUILD="5G"
- fi
-
- check-reqs_pkg_pretend
- fi
-}
-
-pkg_setup() {
- if [[ ${MERGE_TYPE} != binary ]] ; then
- if use pgo ; then
- if ! has userpriv ${FEATURES} ; then
- eerror "Building ${PN} with USE=pgo and FEATURES=-userpriv is not supported!"
- fi
- fi
-
- # Ensure we have enough disk space to compile
- if use pgo || use lto || use debug ; then
- CHECKREQS_DISK_BUILD="13G"
- else
- CHECKREQS_DISK_BUILD="5G"
- fi
-
- check-reqs_pkg_setup
-
- llvm_pkg_setup
-
- python-any-r1_pkg_setup
-
- # Avoid PGO profiling problems due to enviroment leakage
- # These should *always* be cleaned up anyway
- unset \
- DBUS_SESSION_BUS_ADDRESS \
- DISPLAY \
- ORBIT_SOCKETDIR \
- SESSION_MANAGER \
- XAUTHORITY \
- XDG_CACHE_HOME \
- XDG_SESSION_COOKIE
-
- # Build system is using /proc/self/oom_score_adj, bug #604394
- addpredict /proc/self/oom_score_adj
-
- if ! mountpoint -q /dev/shm ; then
- # If /dev/shm is not available, configure is known to fail with
- # a traceback report referencing /usr/lib/pythonN.N/multiprocessing/synchronize.py
- ewarn "/dev/shm is not mounted -- expect build failures!"
- fi
-
- # Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
- # Note: These are for Gentoo Linux use ONLY. For your own distribution, please
- # get your own set of keys.
- if [[ -z "${MOZ_API_KEY_GOOGLE+set}" ]] ; then
- MOZ_API_KEY_GOOGLE="AIzaSyDEAOvatFogGaPi0eTgsV_ZlEzx0ObmepsMzfAc"
- fi
- fi
-}
-
-src_unpack() {
- local _lp_dir="${WORKDIR}/language_packs"
- local _src_file
-
- if [[ ! -d "${_lp_dir}" ]] ; then
- mkdir "${_lp_dir}" || die
- fi
-
- for _src_file in ${A} ; do
- if [[ ${_src_file} == *.xpi ]]; then
- cp "${DISTDIR}/${_src_file}" "${_lp_dir}" || die "Failed to copy '${_src_file}' to '${_lp_dir}'!"
- else
- unpack ${_src_file}
- fi
- done
-}
-
-src_prepare() {
- use pgo && rm -v "${WORKDIR}"/firefox-patches/*-LTO-Only-enable-LTO-*.patch
- eapply "${WORKDIR}/firefox-patches"
-
- # Allow user to apply any additional patches without modifing ebuild
- eapply_user
-
- # Make LTO respect MAKEOPTS
- sed -i \
- -e "s/multiprocessing.cpu_count()/$(makeopts_jobs)/" \
- "${S}"/build/moz.configure/lto-pgo.configure \
- || die "sed failed to set num_cores"
-
- # Make ICU respect MAKEOPTS
- sed -i \
- -e "s/multiprocessing.cpu_count()/$(makeopts_jobs)/" \
- "${S}"/intl/icu_sources_data.py \
- || die "sed failed to set num_cores"
-
- # sed-in toolchain prefix
- sed -i \
- -e "s/objdump/${CHOST}-objdump/" \
- "${S}"/python/mozbuild/mozbuild/configure/check_debug_ranges.py \
- || die "sed failed to set toolchain prefix"
-
- sed -i \
- -e 's/ccache_stats = None/return None/' \
- "${S}"/python/mozbuild/mozbuild/controller/building.py \
- || die "sed failed to disable ccache stats call"
-
- einfo "Removing pre-built binaries ..."
- find "${S}"/third_party -type f \( -name '*.so' -o -name '*.o' \) -print -delete || die
-
- # Clearing checksums where we have applied patches
- moz_clear_vendor_checksums target-lexicon-0.9.0
-
- # Create build dir
- BUILD_DIR="${WORKDIR}/${PN}_build"
- mkdir -p "${BUILD_DIR}" || die
-
- # Write API keys to disk
- echo -n "${MOZ_API_KEY_GOOGLE//gGaPi/}" > "${S}"/api-google.key || die
-
- xdg_src_prepare
-}
-
-src_configure() {
- local have_switched_compiler=
- if use clang && ! tc-is-clang ; then
- # Force clang
- einfo "Enforcing the use of clang due to USE=clang ..."
- have_switched_compiler=yes
- CC=${CHOST}-clang
- CXX=${CHOST}-clang++
- elif ! use clang && ! tc-is-gcc ; then
- # Force gcc
- have_switched_compiler=yes
- einfo "Enforcing the use of gcc due to USE=-clang ..."
- CC=${CHOST}-gcc
- CXX=${CHOST}-g++
- fi
-
- if [[ -n "${have_switched_compiler}" ]] ; then
- # Because we switched active compiler we have to ensure
- # that no unsupported flags are set
- strip-unsupported-flags
- fi
-
- # Ensure we use correct toolchain
- export HOST_CC="$(tc-getBUILD_CC)"
- export HOST_CXX="$(tc-getBUILD_CXX)"
- tc-export CC CXX LD AR NM OBJDUMP RANLIB PKG_CONFIG
-
- # Set MOZILLA_FIVE_HOME
- export MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
-
- # python/mach/mach/mixin/process.py fails to detect SHELL
- export SHELL="${EPREFIX}/bin/bash"
-
- # Set MOZCONFIG
- export MOZCONFIG="${S}/.mozconfig"
-
- # Initialize MOZCONFIG
- mozconfig_add_options_ac '' --enable-application=browser
-
- if use lto ; then
- if use clang ; then
- # Upstream only supports lld when using clang
- mozconfig_add_options_ac "forcing ld=lld due to USE=clang and USE=lto" --enable-linker=lld
-
- mozconfig_add_options_ac '+lto' --enable-lto=cross
- else
- # Linking only works when using ld.gold when LTO is enabled
- mozconfig_add_options_ac "forcing ld=gold due to USE=lto" --enable-linker=gold
-
- # ThinLTO is currently broken, see bmo#1644409
- mozconfig_add_options_ac '+lto' --enable-lto=full
- fi
-
- if use pgo ; then
- mozconfig_add_options_ac '+pgo' MOZ_PGO=1
- fi
- else
- # Avoid auto-magic on linker
- if use clang ; then
- # This is upstream's default
- mozconfig_add_options_ac "forcing ld=lld due to USE=clang" --enable-linker=lld
- elif tc-ld-is-gold ; then
- mozconfig_add_options_ac "linker is set to gold" --enable-linker=gold
- else
- mozconfig_add_options_ac "linker is set to bfd" --enable-linker=bfd
- fi
- fi
-
- # LTO flag was handled via configure
- filter-flags '-flto*'
-
- mozconfig_use_enable debug
- if use debug ; then
- if is-flag '-g*' ; then
- mozconfig_add_options_ac '+debug' --enable-debug-symbols=$(get-flag '-g*')
- else
- mozconfig_add_options_ac '+debug' --enable-debug-symbols
- fi
-
- mozconfig_add_options_ac '+debug' --disable-optimize
- else
- if is-flag '-g*' ; then
- mozconfig_add_options_ac '+debug' --enable-debug-symbols=$(get-flag '-g*')
- else
- mozconfig_add_options_ac 'Gentoo default' --disable-debug-symbols
- fi
-
- if is-flag '-O0' ; then
- mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O0
- elif is-flag '-O4' ; then
- mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O4
- elif is-flag '-O3' ; then
- mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O3
- elif is-flag '-O1' ; then
- mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O1
- elif is-flag '-Os' ; then
- mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-Os
- else
- mozconfig_add_options_ac "Gentoo default" --enable-optimize=-O2
- fi
- fi
-
- # Debug flag was handled via configure
- filter-flags '-g*'
-
- # Optimization flag was handled via configure
- filter-flags '-O*'
-
- mozconfig_add_options_ac 'Gentoo default' \
- --allow-addon-sideload \
- --disable-cargo-incremental \
- --disable-crashreporter \
- --disable-install-strip \
- --disable-strip \
- --disable-updater \
- --enable-official-branding \
- --enable-release \
- --enable-system-ffi \
- --enable-system-pixman \
- --host="${CBUILD:-${CHOST}}" \
- --libdir="${EPREFIX}/usr/$(get_libdir)" \
- --prefix="${EPREFIX}/usr" \
- --target="${CHOST}" \
- --without-ccache \
- --with-intl-api \
- --with-libclang-path="$(llvm-config --libdir)" \
- --with-system-nspr \
- --with-system-nss \
- --with-system-png \
- --with-system-zlib \
- --with-toolchain-prefix="${CHOST}-" \
- --with-unsigned-addon-scopes=app,system \
- --x-includes="${SYSROOT}${EPREFIX}/usr/include" \
- --x-libraries="${SYSROOT}${EPREFIX}/usr/$(get_libdir)"
-
- # Set update channel
- local update_channel=release
- [[ -n ${MOZ_ESR} ]] && update_channel=esr
- mozconfig_add_options_ac '' --update-channel=${update_channel}
-
- if ! use x86 && [[ ${CHOST} != armv*h* ]] ; then
- mozconfig_add_options_ac '' --enable-rust-simd
- fi
-
- if [[ -s "${S}/api-google.key" ]] ; then
- local key_origin="Gentoo default"
- if [[ $(cat "${S}/api-google.key" | md5sum | awk '{ print $1 }') != 709560c02f94b41f9ad2c49207be6c54 ]] ; then
- key_origin="User value"
- fi
-
- mozconfig_add_options_ac "${key_origin}" \
- --with-google-location-service-api-keyfile="${S}/api-google.key" \
- --with-google-safebrowsing-api-keyfile="${S}/api-google.key"
- else
- einfo "Building without Google API key ..."
- fi
-
- mozconfig_use_with system-av1
- mozconfig_use_with system-harfbuzz
- mozconfig_use_with system-harfbuzz system-graphite2
- mozconfig_use_with system-icu
- mozconfig_use_with system-jpeg
- mozconfig_use_with system-libevent system-libevent "${SYSROOT}${EPREFIX}/usr"
- mozconfig_use_with system-libvpx
- mozconfig_use_with system-webp
-
- mozconfig_use_enable dbus
-
- use eme-free && mozconfig_annotate '+eme-free' --disable-eme
-
- mozconfig_use_enable geckodriver
-
- if use hardened ; then
- mozconfig_add_options_ac "+hardened" --enable-hardening
- append-ldflags "-Wl,-z,relro -Wl,-z,now"
- fi
-
- mozconfig_use_enable jack
-
- mozconfig_use_enable pulseaudio
- # force the deprecated alsa sound code if pulseaudio is disabled
- if use kernel_linux && ! use pulseaudio ; then
- mozconfig_add_options_ac '-pulseaudio' --enable-alsa
- fi
-
- mozconfig_use_enable screencast pipewire
-
- mozconfig_use_enable wifi necko-wifi
-
- if use wayland ; then
- mozconfig_add_options_ac '+wayland' --enable-default-toolkit=cairo-gtk3-wayland
- else
- mozconfig_add_options_ac '' --enable-default-toolkit=cairo-gtk3
- fi
-
- # Modifications to better support ARM, bug #553364
- if use cpu_flags_arm_neon ; then
- mozconfig_add_options_ac '+cpu_flags_arm_neon' --with-fpu=neon
-
- if ! tc-is-clang ; then
- # thumb options aren't supported when using clang, bug 666966
- mozconfig_add_options_ac '+cpu_flags_arm_neon' \
- --with-thumb=yes \
- --with-thumb-interwork=no
- fi
- fi
-
- if [[ ${CHOST} == armv*h* ]] ; then
- mozconfig_add_options_ac 'CHOST=armv*h*' --with-float-abi=hard
-
- if ! use system-libvpx ; then
- sed -i \
- -e "s|softfp|hard|" \
- "${S}"/media/libvpx/moz.build \
- || die
- fi
- fi
-
- if use clang ; then
- # https://bugzilla.mozilla.org/show_bug.cgi?id=1482204
- # https://bugzilla.mozilla.org/show_bug.cgi?id=1483822
- # toolkit/moz.configure Elfhack section: target.cpu in ('arm', 'x86', 'x86_64')
- local disable_elf_hack=
- if use amd64 ; then
- disable_elf_hack=yes
- elif use x86 ; then
- disable_elf_hack=yes
- elif use arm ; then
- disable_elf_hack=yes
- fi
-
- if [[ -n ${disable_elf_hack} ]] ; then
- mozconfig_add_options_ac 'elf-hack is broken when using Clang' --disable-elf-hack
- fi
- fi
-
- # Additional ARCH support
- case "${ARCH}" in
- arm | ppc64)
- # Reduce the memory requirements for linking
- if use clang ; then
- # Nothing to do
- :;
- elif tc-ld-is-gold ; then
- append-ldflags -Wl,--no-keep-memory
- else
- append-ldflags -Wl,--no-keep-memory -Wl,--reduce-memory-overheads
- fi
- ;;
- esac
-
- # Allow elfhack to work in combination with unstripped binaries
- # when they would normally be larger than 2GiB.
- append-ldflags "-Wl,--compress-debug-sections=zlib"
-
- # Pass $MAKEOPTS to build system
- export MOZ_MAKE_FLAGS="${MAKEOPTS}"
-
- # Use system's Python environment
- export MACH_USE_SYSTEM_PYTHON=1
-
- # Disable notification when build system has finished
- export MOZ_NOSPAM=1
-
- # Build system requires xargs but is unable to find it
- mozconfig_add_options_mk 'Gentoo default' "XARGS=${EPREFIX}/usr/bin/xargs"
-
- # Set build dir
- mozconfig_add_options_mk 'Gentoo default' "MOZ_OBJDIR=${BUILD_DIR}"
-
- # Handle EXTRA_CONF and show summary
- local ac opt hash reason
-
- # Apply EXTRA_ECONF entries to $MOZCONFIG
- if [[ -n ${EXTRA_ECONF} ]] ; then
- IFS=\! read -a ac <<<${EXTRA_ECONF// --/\!}
- for opt in "${ac[@]}"; do
- mozconfig_add_options_ac "EXTRA_ECONF" --${opt#--}
- done
- fi
-
- echo
- echo "=========================================================="
- echo "Building ${PF} with the following configuration"
- grep ^ac_add_options "${MOZCONFIG}" | while read ac opt hash reason; do
- [[ -z ${hash} || ${hash} == \# ]] \
- || die "error reading mozconfig: ${ac} ${opt} ${hash} ${reason}"
- printf " %-30s %s\n" "${opt}" "${reason:-mozilla.org default}"
- done
- echo "=========================================================="
- echo
-
- ./mach configure || die
-}
-
-src_compile() {
- local virtx_cmd=
-
- if use pgo ; then
- virtx_cmd=virtx
-
- # Reset and cleanup environment variables used by GNOME/XDG
- gnome2_environment_reset
-
- addpredict /root
- fi
-
- local -x GDK_BACKEND=x11
-
- ${virtx_cmd} ./mach build --verbose \
- || die
-}
-
-src_install() {
- # xpcshell is getting called during install
- pax-mark m \
- "${BUILD_DIR}"/dist/bin/xpcshell \
- "${BUILD_DIR}"/dist/bin/firefox \
- "${BUILD_DIR}"/dist/bin/plugin-container
-
- DESTDIR="${D}" ./mach install || die
-
- # Upstream cannot ship symlink but we can (bmo#658850)
- rm "${ED}${MOZILLA_FIVE_HOME}/${PN}-bin" || die
- dosym ${PN} ${MOZILLA_FIVE_HOME}/${PN}-bin
-
- # Don't install llvm-symbolizer from sys-devel/llvm package
- if [[ -f "${ED}${MOZILLA_FIVE_HOME}/llvm-symbolizer" ]] ; then
- rm -v "${ED}${MOZILLA_FIVE_HOME}/llvm-symbolizer" || die
- fi
-
- # Install policy (currently only used to disable application updates)
- insinto "${MOZILLA_FIVE_HOME}/distribution"
- newins "${FILESDIR}"/disable-auto-update.policy.json policies.json
-
- # Install system-wide preferences
- local PREFS_DIR="${MOZILLA_FIVE_HOME}/browser/defaults/preferences"
- insinto "${PREFS_DIR}"
- newins "${FILESDIR}"/gentoo-default-prefs.js all-gentoo.js
-
- local GENTOO_PREFS="${ED}${PREFS_DIR}/all-gentoo.js"
-
- # Set dictionary path to use system hunspell
- cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to set spellchecker.dictionary_path pref"
- pref("spellchecker.dictionary_path", "${EPREFIX}/usr/share/myspell");
- EOF
-
- # Force hwaccel prefs if USE=hwaccel is enabled
- if use hwaccel ; then
- cat "${FILESDIR}"/gentoo-hwaccel-prefs.js-1 \
- >>"${GENTOO_PREFS}" \
- || die "failed to add prefs to force hardware-accelerated rendering to all-gentoo.js"
- fi
-
- if ! use gmp-autoupdate ; then
- local plugin
- for plugin in "${MOZ_GMP_PLUGIN_LIST[@]}" ; do
- einfo "Disabling auto-update for ${plugin} plugin ..."
- cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to disable autoupdate for ${plugin} media plugin"
- pref("media.${plugin}.autoupdate", false);
- EOF
- done
- fi
-
- # Force the graphite pref if USE=system-harfbuzz is enabled, since the pref cannot disable it
- if use system-harfbuzz ; then
- cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to set gfx.font_rendering.graphite.enabled pref"
- sticky_pref("gfx.font_rendering.graphite.enabled", true);
- EOF
- fi
-
- # Install language packs
- local langpacks=( $(find "${WORKDIR}/language_packs" -type f -name '*.xpi') )
- if [[ -n "${langpacks}" ]] ; then
- moz_install_xpi "${MOZILLA_FIVE_HOME}/distribution/extensions" "${langpacks[@]}"
- fi
-
- # Install geckodriver
- if use geckodriver ; then
- einfo "Installing geckodriver into ${ED}${MOZILLA_FIVE_HOME} ..."
- pax-mark m "${BUILD_DIR}"/dist/bin/geckodriver
- exeinto "${MOZILLA_FIVE_HOME}"
- doexe "${BUILD_DIR}"/dist/bin/geckodriver
-
- dosym ${MOZILLA_FIVE_HOME}/geckodriver /usr/bin/geckodriver
- fi
-
- # Install icons
- local icon_srcdir="${S}/browser/branding/official"
- local icon_symbolic_file="${FILESDIR}/icon/firefox-symbolic.svg"
-
- insinto /usr/share/icons/hicolor/symbolic/apps
- newins "${icon_symbolic_file}" ${PN}-symbolic.svg
-
- local icon size
- for icon in "${icon_srcdir}"/default*.png ; do
- size=${icon%.png}
- size=${size##*/default}
-
- if [[ ${size} -eq 48 ]] ; then
- newicon "${icon}" ${PN}.png
- fi
-
- newicon -s ${size} "${icon}" ${PN}.png
- done
-
- # Install menus
- local wrapper_wayland="${PN}-wayland.sh"
- local wrapper_x11="${PN}-x11.sh"
- local desktop_file="${FILESDIR}/icon/${PN}-r2.desktop"
- local display_protocols="auto X11"
- local icon="${PN}"
- local name="Mozilla ${PN^}"
- local use_wayland="false"
-
- if use wayland ; then
- display_protocols+=" Wayland"
- use_wayland="true"
- fi
-
- local app_name desktop_filename display_protocol exec_command
- for display_protocol in ${display_protocols} ; do
- app_name="${name} on ${display_protocol}"
- desktop_filename="${PN}-${display_protocol,,}.desktop"
-
- case ${display_protocol} in
- Wayland)
- exec_command="${PN}-wayland --name ${PN}-wayland"
- newbin "${FILESDIR}/${wrapper_wayland}" ${PN}-wayland
- ;;
- X11)
- if ! use wayland ; then
- # Exit loop here because there's no choice so
- # we don't need wrapper/.desktop file for X11.
- continue
- fi
-
- exec_command="${PN}-x11 --name ${PN}-x11"
- newbin "${FILESDIR}/${wrapper_x11}" ${PN}-x11
- ;;
- *)
- app_name="${name}"
- desktop_filename="${PN}.desktop"
- exec_command="${PN}"
- ;;
- esac
-
- cp "${desktop_file}" "${WORKDIR}/${PN}.desktop-template" || die
-
- sed -i \
- -e "s:@NAME@:${app_name}:" \
- -e "s:@EXEC@:${exec_command}:" \
- -e "s:@ICON@:${icon}:" \
- "${WORKDIR}/${PN}.desktop-template" \
- || die
-
- newmenu "${WORKDIR}/${PN}.desktop-template" "${desktop_filename}"
-
- rm "${WORKDIR}/${PN}.desktop-template" || die
- done
-
- # Install generic wrapper script
- rm "${ED}/usr/bin/${PN}" || die
- newbin "${FILESDIR}/${PN}.sh" ${PN}
-
- # Update wrapper
- local wrapper
- for wrapper in \
- "${ED}/usr/bin/${PN}" \
- "${ED}/usr/bin/${PN}-x11" \
- "${ED}/usr/bin/${PN}-wayland" \
- ; do
- [[ ! -f "${wrapper}" ]] && continue
-
- sed -i \
- -e "s:@PREFIX@:${EPREFIX}/usr:" \
- -e "s:@DEFAULT_WAYLAND@:${use_wayland}:" \
- "${wrapper}" \
- || die
- done
-}
-
-pkg_preinst() {
- xdg_pkg_preinst
-
- # If the apulse libs are available in MOZILLA_FIVE_HOME then apulse
- # does not need to be forced into the LD_LIBRARY_PATH
- if use pulseaudio && has_version ">=media-sound/apulse-0.1.12-r4" ; then
- einfo "APULSE found; Generating library symlinks for sound support ..."
- local lib
- pushd "${ED}${MOZILLA_FIVE_HOME}" &>/dev/null || die
- for lib in ../apulse/libpulse{.so{,.0},-simple.so{,.0}} ; do
- # A quickpkg rolled by hand will grab symlinks as part of the package,
- # so we need to avoid creating them if they already exist.
- if [[ ! -L ${lib##*/} ]] ; then
- ln -s "${lib}" ${lib##*/} || die
- fi
- done
- popd &>/dev/null || die
- fi
-}
-
-pkg_postinst() {
- xdg_pkg_postinst
-
- if ! use gmp-autoupdate ; then
- elog "USE='-gmp-autoupdate' has disabled the following plugins from updating or"
- elog "installing into new profiles:"
- local plugin
- for plugin in "${MOZ_GMP_PLUGIN_LIST[@]}" ; do
- elog "\t ${plugin}"
- done
- elog
- fi
-
- if use pulseaudio && has_version ">=media-sound/apulse-0.1.12-r4" ; then
- elog "Apulse was detected at merge time on this system and so it will always be"
- elog "used for sound. If you wish to use pulseaudio instead please unmerge"
- elog "media-sound/apulse."
- elog
- fi
-
- local show_doh_information show_normandy_information
-
- if [[ -z "${REPLACING_VERSIONS}" ]] ; then
- # New install; Tell user that DoH is disabled by default
- show_doh_information=yes
- show_normandy_information=yes
- else
- local replacing_version
- for replacing_version in ${REPLACING_VERSIONS} ; do
- if ver_test "${replacing_version}" -lt 70 ; then
- # Tell user only once about our DoH default
- show_doh_information=yes
- fi
-
- if ver_test "${replacing_version}" -lt 74.0-r2 ; then
- # Tell user only once about our Normandy default
- show_normandy_information=yes
- fi
- done
- fi
-
- if [[ -n "${show_doh_information}" ]] ; then
- elog
- elog "Note regarding Trusted Recursive Resolver aka DNS-over-HTTPS (DoH):"
- elog "Due to privacy concerns (encrypting DNS might be a good thing, sending all"
- elog "DNS traffic to Cloudflare by default is not a good idea and applications"
- elog "should respect OS configured settings), \"network.trr.mode\" was set to 5"
- elog "(\"Off by choice\") by default."
- elog "You can enable DNS-over-HTTPS in ${PN^}'s preferences."
- fi
-
- # bug 713782
- if [[ -n "${show_normandy_information}" ]] ; then
- elog
- elog "Upstream operates a service named Normandy which allows Mozilla to"
- elog "push changes for default settings or even install new add-ons remotely."
- elog "While this can be useful to address problems like 'Armagadd-on 2.0' or"
- elog "revert previous decisions to disable TLS 1.0/1.1, privacy and security"
- elog "concerns prevail, which is why we have switched off the use of this"
- elog "service by default."
- elog
- elog "To re-enable this service set"
- elog
- elog " app.normandy.enabled=true"
- elog
- elog "in about:config."
- fi
-}
diff --git a/www-client/firefox/firefox-78.3.1.ebuild b/www-client/firefox/firefox-78.3.1.ebuild
index 50806d400ca7..533cba545138 100644
--- a/www-client/firefox/firefox-78.3.1.ebuild
+++ b/www-client/firefox/firefox-78.3.1.ebuild
@@ -46,7 +46,7 @@ SRC_URI="${MOZ_SRC_BASE_URI}/source/${PN}-${MOZ_PV}.source.tar.xz
DESCRIPTION="Firefox Web Browser"
HOMEPAGE="https://www.mozilla.com/firefox"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~x86"
SLOT="0/esr$(ver_cut 1)"
LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
@@ -59,10 +59,11 @@ REQUIRED_USE="screencast? ( wayland )"
BDEPEND="${PYTHON_DEPS}
app-arch/unzip
+ app-arch/zip
>=dev-util/cbindgen-0.14.3
>=net-libs/nodejs-10.19.0
virtual/pkgconfig
- >=virtual/rust-1.43.0
+ >=virtual/rust-1.41.0
|| (
(
sys-devel/clang:11
@@ -556,16 +557,10 @@ src_configure() {
mozconfig_use_enable debug
if use debug ; then
- if is-flag '-g*' ; then
- mozconfig_add_options_ac '+debug' --enable-debug-symbols=$(get-flag '-g*')
- else
- mozconfig_add_options_ac '+debug' --enable-debug-symbols
- fi
-
mozconfig_add_options_ac '+debug' --disable-optimize
else
if is-flag '-g*' ; then
- mozconfig_add_options_ac '+debug' --enable-debug-symbols=$(get-flag '-g*')
+ mozconfig_add_options_ac 'from CFLAGS' --enable-debug-symbols=$(get-flag '-g*')
else
mozconfig_add_options_ac 'Gentoo default' --disable-debug-symbols
fi
@@ -651,7 +646,7 @@ src_configure() {
mozconfig_use_enable dbus
- use eme-free && mozconfig_annotate '+eme-free' --disable-eme
+ use eme-free && mozconfig_add_options_ac '+eme-free' --disable-eme
mozconfig_use_enable geckodriver
diff --git a/www-client/firefox/firefox-81.0.1.ebuild b/www-client/firefox/firefox-81.0.1.ebuild
index 72041321a73c..eb407d1a1c97 100644
--- a/www-client/firefox/firefox-81.0.1.ebuild
+++ b/www-client/firefox/firefox-81.0.1.ebuild
@@ -59,6 +59,7 @@ REQUIRED_USE="screencast? ( wayland )"
BDEPEND="${PYTHON_DEPS}
app-arch/unzip
+ app-arch/zip
>=dev-util/cbindgen-0.14.3
>=net-libs/nodejs-10.19.0
virtual/pkgconfig
@@ -556,16 +557,10 @@ src_configure() {
mozconfig_use_enable debug
if use debug ; then
- if is-flag '-g*' ; then
- mozconfig_add_options_ac '+debug' --enable-debug-symbols=$(get-flag '-g*')
- else
- mozconfig_add_options_ac '+debug' --enable-debug-symbols
- fi
-
mozconfig_add_options_ac '+debug' --disable-optimize
else
if is-flag '-g*' ; then
- mozconfig_add_options_ac '+debug' --enable-debug-symbols=$(get-flag '-g*')
+ mozconfig_add_options_ac 'from CFLAGS' --enable-debug-symbols=$(get-flag '-g*')
else
mozconfig_add_options_ac 'Gentoo default' --disable-debug-symbols
fi
@@ -651,7 +646,7 @@ src_configure() {
mozconfig_use_enable dbus
- use eme-free && mozconfig_annotate '+eme-free' --disable-eme
+ use eme-free && mozconfig_add_options_ac '+eme-free' --disable-eme
mozconfig_use_enable geckodriver
diff --git a/www-client/firefox/firefox-81.0.ebuild b/www-client/firefox/firefox-81.0.ebuild
deleted file mode 100644
index 72041321a73c..000000000000
--- a/www-client/firefox/firefox-81.0.ebuild
+++ /dev/null
@@ -1,1055 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-FIREFOX_PATCHSET="firefox-81-patches-01.tar.xz"
-
-LLVM_MAX_SLOT=11
-
-PYTHON_COMPAT=( python3_{6..9} )
-PYTHON_REQ_USE="ncurses,sqlite,ssl"
-
-WANT_AUTOCONF="2.1"
-
-VIRTUALX_REQUIRED="pgo"
-
-MOZ_ESR=
-
-# Convert the ebuild version to the upstream mozilla version, used by mozlinguas
-MOZ_PV="${PV/_alpha/a}" # Handle alpha for SRC_URI
-MOZ_PV="${MOZ_PV/_beta/b}" # Handle beta for SRC_URI
-MOZ_PV="${MOZ_PV%%_rc*}" # Handle rc for SRC_URI
-
-if [[ -n ${MOZ_ESR} ]] ; then
- # ESR releases have slightly different version numbers
- MOZ_PV="${MOZ_PV}esr"
-fi
-
-inherit autotools check-reqs desktop flag-o-matic gnome2-utils llvm \
- multiprocessing pax-utils python-any-r1 toolchain-funcs \
- virtualx xdg
-
-MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${PN}/releases/${MOZ_PV}"
-
-if [[ ${PV} == *_rc* ]] ; then
- MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${PN}/candidates/${MOZ_PV}-candidates/build${PV##*_rc}"
-fi
-
-PATCH_URIS=(
- https://dev.gentoo.org/~{axs,polynomial-c,whissi}/mozilla/patchsets/${FIREFOX_PATCHSET}
-)
-
-SRC_URI="${MOZ_SRC_BASE_URI}/source/${PN}-${MOZ_PV}.source.tar.xz
- ${PATCH_URIS[@]}"
-
-DESCRIPTION="Firefox Web Browser"
-HOMEPAGE="https://www.mozilla.com/firefox"
-
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-
-SLOT="0/$(ver_cut 1)"
-LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
-IUSE="clang cpu_flags_arm_neon dbus debug eme-free geckodriver +gmp-autoupdate
- hardened hwaccel jack lto +openh264 pgo pulseaudio screencast selinux
- +system-av1 +system-harfbuzz +system-icu +system-jpeg +system-libevent
- +system-libvpx +system-webp wayland wifi"
-
-REQUIRED_USE="screencast? ( wayland )"
-
-BDEPEND="${PYTHON_DEPS}
- app-arch/unzip
- >=dev-util/cbindgen-0.14.3
- >=net-libs/nodejs-10.19.0
- virtual/pkgconfig
- >=virtual/rust-1.43.0
- || (
- (
- sys-devel/clang:11
- sys-devel/llvm:11
- clang? (
- =sys-devel/lld-11*
- pgo? ( =sys-libs/compiler-rt-sanitizers-11*[profile] )
- )
- )
- (
- sys-devel/clang:10
- sys-devel/llvm:10
- clang? (
- =sys-devel/lld-10*
- pgo? ( =sys-libs/compiler-rt-sanitizers-10*[profile] )
- )
- )
- (
- sys-devel/clang:9
- sys-devel/llvm:9
- clang? (
- =sys-devel/lld-9*
- pgo? ( =sys-libs/compiler-rt-sanitizers-9*[profile] )
- )
- )
- )
- lto? (
- !clang? ( sys-devel/binutils[gold] )
- )
- amd64? ( >=dev-lang/yasm-1.1 )
- x86? ( >=dev-lang/yasm-1.1 )
- !system-av1? (
- amd64? ( >=dev-lang/nasm-2.13 )
- x86? ( >=dev-lang/nasm-2.13 )
- )"
-
-CDEPEND="
- >=dev-libs/nss-3.56
- >=dev-libs/nspr-4.28
- dev-libs/atk
- dev-libs/expat
- >=x11-libs/cairo-1.10[X]
- >=x11-libs/gtk+-2.18:2
- >=x11-libs/gtk+-3.4.0:3[X]
- x11-libs/gdk-pixbuf
- >=x11-libs/pango-1.22.0
- >=media-libs/libpng-1.6.35:0=[apng]
- >=media-libs/mesa-10.2:*
- media-libs/fontconfig
- >=media-libs/freetype-2.4.10
- kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) )
- virtual/freedesktop-icon-theme
- >=x11-libs/pixman-0.19.2
- >=dev-libs/glib-2.26:2
- >=sys-libs/zlib-1.2.3
- >=dev-libs/libffi-3.0.10:=
- media-video/ffmpeg
- x11-libs/libX11
- x11-libs/libXcomposite
- x11-libs/libXdamage
- x11-libs/libXext
- x11-libs/libXfixes
- x11-libs/libXrender
- x11-libs/libXt
- dbus? (
- sys-apps/dbus
- dev-libs/dbus-glib
- )
- screencast? ( media-video/pipewire:0/0.3 )
- system-av1? (
- >=media-libs/dav1d-0.3.0:=
- >=media-libs/libaom-1.0.0:=
- )
- system-harfbuzz? (
- >=media-libs/harfbuzz-2.6.8:0=
- >=media-gfx/graphite2-1.3.13
- )
- system-icu? ( >=dev-libs/icu-67.1:= )
- system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 )
- system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] )
- system-libvpx? ( >=media-libs/libvpx-1.8.2:0=[postproc] )
- system-webp? ( >=media-libs/libwebp-1.1.0:0= )
- wifi? (
- kernel_linux? (
- sys-apps/dbus
- dev-libs/dbus-glib
- net-misc/networkmanager
- )
- )
- jack? ( virtual/jack )
- selinux? ( sec-policy/selinux-mozilla )"
-
-RDEPEND="${CDEPEND}
- jack? ( virtual/jack )
- openh264? ( media-libs/openh264:*[plugin] )
- pulseaudio? (
- || (
- media-sound/pulseaudio
- >=media-sound/apulse-0.1.12-r4
- )
- )
- selinux? ( sec-policy/selinux-mozilla )"
-
-DEPEND="${CDEPEND}
- pulseaudio? (
- || (
- media-sound/pulseaudio
- >=media-sound/apulse-0.1.12-r4[sdk]
- )
- )
- wayland? ( >=x11-libs/gtk+-3.11:3[wayland] )
- amd64? ( virtual/opengl )
- x86? ( virtual/opengl )"
-
-S="${WORKDIR}/${PN}-${PV%_*}"
-
-# Allow MOZ_GMP_PLUGIN_LIST to be set in an eclass or
-# overridden in the enviromnent (advanced hackers only)
-if [[ -z "${MOZ_GMP_PLUGIN_LIST+set}" ]] ; then
- MOZ_GMP_PLUGIN_LIST=( gmp-gmpopenh264 gmp-widevinecdm )
-fi
-
-llvm_check_deps() {
- if ! has_version -b "sys-devel/clang:${LLVM_SLOT}" ; then
- ewarn "sys-devel/clang:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
- return 1
- fi
-
- if use clang ; then
- if ! has_version -b "=sys-devel/lld-${LLVM_SLOT}*" ; then
- ewarn "=sys-devel/lld-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
- return 1
- fi
-
- if use pgo ; then
- if ! has_version -b "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}*" ; then
- ewarn "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
- return 1
- fi
- fi
- fi
-
- einfo "Will use LLVM slot ${LLVM_SLOT}!" >&2
-}
-
-MOZ_LANGS=(
- ach af an ar ast az be bg bn br bs ca-valencia ca cak cs cy
- da de dsb el en-CA en-GB en-US eo es-AR es-CL es-ES es-MX et eu
- fa ff fi fr fy-NL ga-IE gd gl gn gu-IN he hi-IN hr hsb hu hy-AM
- ia id is it ja ka kab kk km kn ko lij lt lv mk mr ms my
- nb-NO ne-NP nl nn-NO oc pa-IN pl pt-BR pt-PT rm ro ru
- si sk sl son sq sr sv-SE ta te th tl tr trs uk ur uz vi
- xh zh-CN zh-TW
-)
-
-mozilla_set_globals() {
- # https://bugs.gentoo.org/587334
- local MOZ_TOO_REGIONALIZED_FOR_L10N=(
- fy-NL ga-IE gu-IN hi-IN hy-AM nb-NO ne-NP nn-NO pa-IN sv-SE
- )
-
- local lang xflag
- for lang in "${MOZ_LANGS[@]}" ; do
- # en and en_US are handled internally
- if [[ ${lang} == en ]] || [[ ${lang} == en-US ]] ; then
- continue
- fi
-
- # strip region subtag if $lang is in the list
- if has ${lang} "${MOZ_TOO_REGIONALIZED_FOR_L10N[@]}" ; then
- xflag=${lang%%-*}
- else
- xflag=${lang}
- fi
-
- SRC_URI+=" l10n_${xflag/[_@]/-}? ("
- SRC_URI+=" ${MOZ_SRC_BASE_URI}/linux-x86_64/xpi/${lang}.xpi -> ${PN}-${MOZ_PV}-${lang}.xpi"
- SRC_URI+=" )"
- IUSE+=" l10n_${xflag/[_@]/-}"
- done
-}
-mozilla_set_globals
-
-moz_clear_vendor_checksums() {
- debug-print-function ${FUNCNAME} "$@"
-
- if [[ ${#} -ne 1 ]] ; then
- die "${FUNCNAME} requires exact one argument"
- fi
-
- einfo "Clearing cargo checksums for ${1} ..."
-
- sed -i \
- -e 's/\("files":{\)[^}]*/\1/' \
- "${S}"/third_party/rust/${1}/.cargo-checksum.json \
- || die
-}
-
-moz_install_xpi() {
- debug-print-function ${FUNCNAME} "$@"
-
- if [[ ${#} -lt 2 ]] ; then
- die "${FUNCNAME} requires at least two arguments"
- fi
-
- local DESTDIR=${1}
- shift
-
- insinto "${DESTDIR}"
-
- local emid xpi_file xpi_tmp_dir
- for xpi_file in "${@}" ; do
- emid=
- xpi_tmp_dir=$(mktemp -d --tmpdir="${T}")
-
- # Unpack XPI
- unzip -qq "${xpi_file}" -d "${xpi_tmp_dir}" || die
-
- # Determine extension ID
- if [[ -f "${xpi_tmp_dir}/install.rdf" ]] ; then
- emid=$(sed -n -e '/install-manifest/,$ { /em:id/!d; s/.*[\">]\([^\"<>]*\)[\"<].*/\1/; p; q }' "${xpi_tmp_dir}/install.rdf")
- [[ -z "${emid}" ]] && die "failed to determine extension id from install.rdf"
- elif [[ -f "${xpi_tmp_dir}/manifest.json" ]] ; then
- emid=$(sed -n -e 's/.*"id": "\([^"]*\)".*/\1/p' "${xpi_tmp_dir}/manifest.json")
- [[ -z "${emid}" ]] && die "failed to determine extension id from manifest.json"
- else
- die "failed to determine extension id"
- fi
-
- einfo "Installing ${emid}.xpi into ${ED}${DESTDIR} ..."
- newins "${xpi_file}" "${emid}.xpi"
- done
-}
-
-mozconfig_add_options_ac() {
- debug-print-function ${FUNCNAME} "$@"
-
- if [[ ${#} -lt 2 ]] ; then
- die "${FUNCNAME} requires at least two arguments"
- fi
-
- local reason=${1}
- shift
-
- local option
- for option in ${@} ; do
- echo "ac_add_options ${option} # ${reason}" >>${MOZCONFIG}
- done
-}
-
-mozconfig_add_options_mk() {
- debug-print-function ${FUNCNAME} "$@"
-
- if [[ ${#} -lt 2 ]] ; then
- die "${FUNCNAME} requires at least two arguments"
- fi
-
- local reason=${1}
- shift
-
- local option
- for option in ${@} ; do
- echo "mk_add_options ${option} # ${reason}" >>${MOZCONFIG}
- done
-}
-
-mozconfig_use_enable() {
- debug-print-function ${FUNCNAME} "$@"
-
- if [[ ${#} -lt 1 ]] ; then
- die "${FUNCNAME} requires at least one arguments"
- fi
-
- local flag=$(use_enable "${@}")
- mozconfig_add_options_ac "$(use ${1} && echo +${1} || echo -${1})" "${flag}"
-}
-
-mozconfig_use_with() {
- debug-print-function ${FUNCNAME} "$@"
-
- if [[ ${#} -lt 1 ]] ; then
- die "${FUNCNAME} requires at least one arguments"
- fi
-
- local flag=$(use_with "${@}")
- mozconfig_add_options_ac "$(use ${1} && echo +${1} || echo -${1})" "${flag}"
-}
-
-pkg_pretend() {
- if [[ ${MERGE_TYPE} != binary ]] ; then
- if use pgo ; then
- if ! has usersandbox $FEATURES ; then
- die "You must enable usersandbox as X server can not run as root!"
- fi
- fi
-
- # Ensure we have enough disk space to compile
- if use pgo || use lto || use debug ; then
- CHECKREQS_DISK_BUILD="13G"
- else
- CHECKREQS_DISK_BUILD="5G"
- fi
-
- check-reqs_pkg_pretend
- fi
-}
-
-pkg_setup() {
- if [[ ${MERGE_TYPE} != binary ]] ; then
- if use pgo ; then
- if ! has userpriv ${FEATURES} ; then
- eerror "Building ${PN} with USE=pgo and FEATURES=-userpriv is not supported!"
- fi
- fi
-
- # Ensure we have enough disk space to compile
- if use pgo || use lto || use debug ; then
- CHECKREQS_DISK_BUILD="13G"
- else
- CHECKREQS_DISK_BUILD="5G"
- fi
-
- check-reqs_pkg_setup
-
- llvm_pkg_setup
-
- python-any-r1_pkg_setup
-
- # Avoid PGO profiling problems due to enviroment leakage
- # These should *always* be cleaned up anyway
- unset \
- DBUS_SESSION_BUS_ADDRESS \
- DISPLAY \
- ORBIT_SOCKETDIR \
- SESSION_MANAGER \
- XAUTHORITY \
- XDG_CACHE_HOME \
- XDG_SESSION_COOKIE
-
- # Build system is using /proc/self/oom_score_adj, bug #604394
- addpredict /proc/self/oom_score_adj
-
- if ! mountpoint -q /dev/shm ; then
- # If /dev/shm is not available, configure is known to fail with
- # a traceback report referencing /usr/lib/pythonN.N/multiprocessing/synchronize.py
- ewarn "/dev/shm is not mounted -- expect build failures!"
- fi
-
- # Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
- # Note: These are for Gentoo Linux use ONLY. For your own distribution, please
- # get your own set of keys.
- if [[ -z "${MOZ_API_KEY_GOOGLE+set}" ]] ; then
- MOZ_API_KEY_GOOGLE="AIzaSyDEAOvatFogGaPi0eTgsV_ZlEzx0ObmepsMzfAc"
- fi
- fi
-}
-
-src_unpack() {
- local _lp_dir="${WORKDIR}/language_packs"
- local _src_file
-
- if [[ ! -d "${_lp_dir}" ]] ; then
- mkdir "${_lp_dir}" || die
- fi
-
- for _src_file in ${A} ; do
- if [[ ${_src_file} == *.xpi ]]; then
- cp "${DISTDIR}/${_src_file}" "${_lp_dir}" || die "Failed to copy '${_src_file}' to '${_lp_dir}'!"
- else
- unpack ${_src_file}
- fi
- done
-}
-
-src_prepare() {
- use pgo && rm -v "${WORKDIR}"/firefox-patches/*-LTO-Only-enable-LTO-*.patch
- eapply "${WORKDIR}/firefox-patches"
-
- # Allow user to apply any additional patches without modifing ebuild
- eapply_user
-
- # Make LTO respect MAKEOPTS
- sed -i \
- -e "s/multiprocessing.cpu_count()/$(makeopts_jobs)/" \
- "${S}"/build/moz.configure/lto-pgo.configure \
- || die "sed failed to set num_cores"
-
- # Make ICU respect MAKEOPTS
- sed -i \
- -e "s/multiprocessing.cpu_count()/$(makeopts_jobs)/" \
- "${S}"/intl/icu_sources_data.py \
- || die "sed failed to set num_cores"
-
- # sed-in toolchain prefix
- sed -i \
- -e "s/objdump/${CHOST}-objdump/" \
- "${S}"/python/mozbuild/mozbuild/configure/check_debug_ranges.py \
- || die "sed failed to set toolchain prefix"
-
- sed -i \
- -e 's/ccache_stats = None/return None/' \
- "${S}"/python/mozbuild/mozbuild/controller/building.py \
- || die "sed failed to disable ccache stats call"
-
- einfo "Removing pre-built binaries ..."
- find "${S}"/third_party -type f \( -name '*.so' -o -name '*.o' \) -print -delete || die
-
- # Clearing checksums where we have applied patches
- moz_clear_vendor_checksums target-lexicon-0.9.0
-
- # Create build dir
- BUILD_DIR="${WORKDIR}/${PN}_build"
- mkdir -p "${BUILD_DIR}" || die
-
- # Write API keys to disk
- echo -n "${MOZ_API_KEY_GOOGLE//gGaPi/}" > "${S}"/api-google.key || die
-
- xdg_src_prepare
-}
-
-src_configure() {
- local have_switched_compiler=
- if use clang && ! tc-is-clang ; then
- # Force clang
- einfo "Enforcing the use of clang due to USE=clang ..."
- have_switched_compiler=yes
- CC=${CHOST}-clang
- CXX=${CHOST}-clang++
- elif ! use clang && ! tc-is-gcc ; then
- # Force gcc
- have_switched_compiler=yes
- einfo "Enforcing the use of gcc due to USE=-clang ..."
- CC=${CHOST}-gcc
- CXX=${CHOST}-g++
- fi
-
- if [[ -n "${have_switched_compiler}" ]] ; then
- # Because we switched active compiler we have to ensure
- # that no unsupported flags are set
- strip-unsupported-flags
- fi
-
- # Ensure we use correct toolchain
- export HOST_CC="$(tc-getBUILD_CC)"
- export HOST_CXX="$(tc-getBUILD_CXX)"
- tc-export CC CXX LD AR NM OBJDUMP RANLIB PKG_CONFIG
-
- # Set MOZILLA_FIVE_HOME
- export MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
-
- # python/mach/mach/mixin/process.py fails to detect SHELL
- export SHELL="${EPREFIX}/bin/bash"
-
- # Set MOZCONFIG
- export MOZCONFIG="${S}/.mozconfig"
-
- # Initialize MOZCONFIG
- mozconfig_add_options_ac '' --enable-application=browser
-
- if use lto ; then
- if use clang ; then
- # Upstream only supports lld when using clang
- mozconfig_add_options_ac "forcing ld=lld due to USE=clang and USE=lto" --enable-linker=lld
-
- mozconfig_add_options_ac '+lto' --enable-lto=cross
- else
- # Linking only works when using ld.gold when LTO is enabled
- mozconfig_add_options_ac "forcing ld=gold due to USE=lto" --enable-linker=gold
-
- # ThinLTO is currently broken, see bmo#1644409
- mozconfig_add_options_ac '+lto' --enable-lto=full
- fi
-
- if use pgo ; then
- mozconfig_add_options_ac '+pgo' MOZ_PGO=1
- fi
- else
- # Avoid auto-magic on linker
- if use clang ; then
- # This is upstream's default
- mozconfig_add_options_ac "forcing ld=lld due to USE=clang" --enable-linker=lld
- elif tc-ld-is-gold ; then
- mozconfig_add_options_ac "linker is set to gold" --enable-linker=gold
- else
- mozconfig_add_options_ac "linker is set to bfd" --enable-linker=bfd
- fi
- fi
-
- # LTO flag was handled via configure
- filter-flags '-flto*'
-
- mozconfig_use_enable debug
- if use debug ; then
- if is-flag '-g*' ; then
- mozconfig_add_options_ac '+debug' --enable-debug-symbols=$(get-flag '-g*')
- else
- mozconfig_add_options_ac '+debug' --enable-debug-symbols
- fi
-
- mozconfig_add_options_ac '+debug' --disable-optimize
- else
- if is-flag '-g*' ; then
- mozconfig_add_options_ac '+debug' --enable-debug-symbols=$(get-flag '-g*')
- else
- mozconfig_add_options_ac 'Gentoo default' --disable-debug-symbols
- fi
-
- if is-flag '-O0' ; then
- mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O0
- elif is-flag '-O4' ; then
- mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O4
- elif is-flag '-O3' ; then
- mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O3
- elif is-flag '-O1' ; then
- mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O1
- elif is-flag '-Os' ; then
- mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-Os
- else
- mozconfig_add_options_ac "Gentoo default" --enable-optimize=-O2
- fi
- fi
-
- # Debug flag was handled via configure
- filter-flags '-g*'
-
- # Optimization flag was handled via configure
- filter-flags '-O*'
-
- mozconfig_add_options_ac 'Gentoo default' \
- --allow-addon-sideload \
- --disable-cargo-incremental \
- --disable-crashreporter \
- --disable-install-strip \
- --disable-strip \
- --disable-updater \
- --enable-official-branding \
- --enable-release \
- --enable-system-ffi \
- --enable-system-pixman \
- --host="${CBUILD:-${CHOST}}" \
- --libdir="${EPREFIX}/usr/$(get_libdir)" \
- --prefix="${EPREFIX}/usr" \
- --target="${CHOST}" \
- --without-ccache \
- --with-intl-api \
- --with-libclang-path="$(llvm-config --libdir)" \
- --with-system-nspr \
- --with-system-nss \
- --with-system-png \
- --with-system-zlib \
- --with-toolchain-prefix="${CHOST}-" \
- --with-unsigned-addon-scopes=app,system \
- --x-includes="${SYSROOT}${EPREFIX}/usr/include" \
- --x-libraries="${SYSROOT}${EPREFIX}/usr/$(get_libdir)"
-
- # Set update channel
- local update_channel=release
- [[ -n ${MOZ_ESR} ]] && update_channel=esr
- mozconfig_add_options_ac '' --update-channel=${update_channel}
-
- if ! use x86 && [[ ${CHOST} != armv*h* ]] ; then
- mozconfig_add_options_ac '' --enable-rust-simd
- fi
-
- if [[ -s "${S}/api-google.key" ]] ; then
- local key_origin="Gentoo default"
- if [[ $(cat "${S}/api-google.key" | md5sum | awk '{ print $1 }') != 709560c02f94b41f9ad2c49207be6c54 ]] ; then
- key_origin="User value"
- fi
-
- mozconfig_add_options_ac "${key_origin}" \
- --with-google-location-service-api-keyfile="${S}/api-google.key" \
- --with-google-safebrowsing-api-keyfile="${S}/api-google.key"
- else
- einfo "Building without Google API key ..."
- fi
-
- mozconfig_use_with system-av1
- mozconfig_use_with system-harfbuzz
- mozconfig_use_with system-harfbuzz system-graphite2
- mozconfig_use_with system-icu
- mozconfig_use_with system-jpeg
- mozconfig_use_with system-libevent system-libevent "${SYSROOT}${EPREFIX}/usr"
- mozconfig_use_with system-libvpx
- mozconfig_use_with system-webp
-
- mozconfig_use_enable dbus
-
- use eme-free && mozconfig_annotate '+eme-free' --disable-eme
-
- mozconfig_use_enable geckodriver
-
- if use hardened ; then
- mozconfig_add_options_ac "+hardened" --enable-hardening
- append-ldflags "-Wl,-z,relro -Wl,-z,now"
- fi
-
- mozconfig_use_enable jack
-
- mozconfig_use_enable pulseaudio
- # force the deprecated alsa sound code if pulseaudio is disabled
- if use kernel_linux && ! use pulseaudio ; then
- mozconfig_add_options_ac '-pulseaudio' --enable-alsa
- fi
-
- mozconfig_use_enable screencast pipewire
-
- mozconfig_use_enable wifi necko-wifi
-
- if use wayland ; then
- mozconfig_add_options_ac '+wayland' --enable-default-toolkit=cairo-gtk3-wayland
- else
- mozconfig_add_options_ac '' --enable-default-toolkit=cairo-gtk3
- fi
-
- # Modifications to better support ARM, bug #553364
- if use cpu_flags_arm_neon ; then
- mozconfig_add_options_ac '+cpu_flags_arm_neon' --with-fpu=neon
-
- if ! tc-is-clang ; then
- # thumb options aren't supported when using clang, bug 666966
- mozconfig_add_options_ac '+cpu_flags_arm_neon' \
- --with-thumb=yes \
- --with-thumb-interwork=no
- fi
- fi
-
- if [[ ${CHOST} == armv*h* ]] ; then
- mozconfig_add_options_ac 'CHOST=armv*h*' --with-float-abi=hard
-
- if ! use system-libvpx ; then
- sed -i \
- -e "s|softfp|hard|" \
- "${S}"/media/libvpx/moz.build \
- || die
- fi
- fi
-
- if use clang ; then
- # https://bugzilla.mozilla.org/show_bug.cgi?id=1482204
- # https://bugzilla.mozilla.org/show_bug.cgi?id=1483822
- # toolkit/moz.configure Elfhack section: target.cpu in ('arm', 'x86', 'x86_64')
- local disable_elf_hack=
- if use amd64 ; then
- disable_elf_hack=yes
- elif use x86 ; then
- disable_elf_hack=yes
- elif use arm ; then
- disable_elf_hack=yes
- fi
-
- if [[ -n ${disable_elf_hack} ]] ; then
- mozconfig_add_options_ac 'elf-hack is broken when using Clang' --disable-elf-hack
- fi
- fi
-
- # Additional ARCH support
- case "${ARCH}" in
- arm | ppc64)
- # Reduce the memory requirements for linking
- if use clang ; then
- # Nothing to do
- :;
- elif tc-ld-is-gold ; then
- append-ldflags -Wl,--no-keep-memory
- else
- append-ldflags -Wl,--no-keep-memory -Wl,--reduce-memory-overheads
- fi
- ;;
- esac
-
- # Allow elfhack to work in combination with unstripped binaries
- # when they would normally be larger than 2GiB.
- append-ldflags "-Wl,--compress-debug-sections=zlib"
-
- # Pass $MAKEOPTS to build system
- export MOZ_MAKE_FLAGS="${MAKEOPTS}"
-
- # Use system's Python environment
- export MACH_USE_SYSTEM_PYTHON=1
-
- # Disable notification when build system has finished
- export MOZ_NOSPAM=1
-
- # Build system requires xargs but is unable to find it
- mozconfig_add_options_mk 'Gentoo default' "XARGS=${EPREFIX}/usr/bin/xargs"
-
- # Set build dir
- mozconfig_add_options_mk 'Gentoo default' "MOZ_OBJDIR=${BUILD_DIR}"
-
- # Handle EXTRA_CONF and show summary
- local ac opt hash reason
-
- # Apply EXTRA_ECONF entries to $MOZCONFIG
- if [[ -n ${EXTRA_ECONF} ]] ; then
- IFS=\! read -a ac <<<${EXTRA_ECONF// --/\!}
- for opt in "${ac[@]}"; do
- mozconfig_add_options_ac "EXTRA_ECONF" --${opt#--}
- done
- fi
-
- echo
- echo "=========================================================="
- echo "Building ${PF} with the following configuration"
- grep ^ac_add_options "${MOZCONFIG}" | while read ac opt hash reason; do
- [[ -z ${hash} || ${hash} == \# ]] \
- || die "error reading mozconfig: ${ac} ${opt} ${hash} ${reason}"
- printf " %-30s %s\n" "${opt}" "${reason:-mozilla.org default}"
- done
- echo "=========================================================="
- echo
-
- ./mach configure || die
-}
-
-src_compile() {
- local virtx_cmd=
-
- if use pgo ; then
- virtx_cmd=virtx
-
- # Reset and cleanup environment variables used by GNOME/XDG
- gnome2_environment_reset
-
- addpredict /root
- fi
-
- local -x GDK_BACKEND=x11
-
- ${virtx_cmd} ./mach build --verbose \
- || die
-}
-
-src_install() {
- # xpcshell is getting called during install
- pax-mark m \
- "${BUILD_DIR}"/dist/bin/xpcshell \
- "${BUILD_DIR}"/dist/bin/firefox \
- "${BUILD_DIR}"/dist/bin/plugin-container
-
- DESTDIR="${D}" ./mach install || die
-
- # Upstream cannot ship symlink but we can (bmo#658850)
- rm "${ED}${MOZILLA_FIVE_HOME}/${PN}-bin" || die
- dosym ${PN} ${MOZILLA_FIVE_HOME}/${PN}-bin
-
- # Don't install llvm-symbolizer from sys-devel/llvm package
- if [[ -f "${ED}${MOZILLA_FIVE_HOME}/llvm-symbolizer" ]] ; then
- rm -v "${ED}${MOZILLA_FIVE_HOME}/llvm-symbolizer" || die
- fi
-
- # Install policy (currently only used to disable application updates)
- insinto "${MOZILLA_FIVE_HOME}/distribution"
- newins "${FILESDIR}"/disable-auto-update.policy.json policies.json
-
- # Install system-wide preferences
- local PREFS_DIR="${MOZILLA_FIVE_HOME}/browser/defaults/preferences"
- insinto "${PREFS_DIR}"
- newins "${FILESDIR}"/gentoo-default-prefs.js all-gentoo.js
-
- local GENTOO_PREFS="${ED}${PREFS_DIR}/all-gentoo.js"
-
- # Set dictionary path to use system hunspell
- cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to set spellchecker.dictionary_path pref"
- pref("spellchecker.dictionary_path", "${EPREFIX}/usr/share/myspell");
- EOF
-
- # Force hwaccel prefs if USE=hwaccel is enabled
- if use hwaccel ; then
- cat "${FILESDIR}"/gentoo-hwaccel-prefs.js-1 \
- >>"${GENTOO_PREFS}" \
- || die "failed to add prefs to force hardware-accelerated rendering to all-gentoo.js"
- fi
-
- if ! use gmp-autoupdate ; then
- local plugin
- for plugin in "${MOZ_GMP_PLUGIN_LIST[@]}" ; do
- einfo "Disabling auto-update for ${plugin} plugin ..."
- cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to disable autoupdate for ${plugin} media plugin"
- pref("media.${plugin}.autoupdate", false);
- EOF
- done
- fi
-
- # Force the graphite pref if USE=system-harfbuzz is enabled, since the pref cannot disable it
- if use system-harfbuzz ; then
- cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to set gfx.font_rendering.graphite.enabled pref"
- sticky_pref("gfx.font_rendering.graphite.enabled", true);
- EOF
- fi
-
- # Install language packs
- local langpacks=( $(find "${WORKDIR}/language_packs" -type f -name '*.xpi') )
- if [[ -n "${langpacks}" ]] ; then
- moz_install_xpi "${MOZILLA_FIVE_HOME}/distribution/extensions" "${langpacks[@]}"
- fi
-
- # Install geckodriver
- if use geckodriver ; then
- einfo "Installing geckodriver into ${ED}${MOZILLA_FIVE_HOME} ..."
- pax-mark m "${BUILD_DIR}"/dist/bin/geckodriver
- exeinto "${MOZILLA_FIVE_HOME}"
- doexe "${BUILD_DIR}"/dist/bin/geckodriver
-
- dosym ${MOZILLA_FIVE_HOME}/geckodriver /usr/bin/geckodriver
- fi
-
- # Install icons
- local icon_srcdir="${S}/browser/branding/official"
- local icon_symbolic_file="${FILESDIR}/icon/firefox-symbolic.svg"
-
- insinto /usr/share/icons/hicolor/symbolic/apps
- newins "${icon_symbolic_file}" ${PN}-symbolic.svg
-
- local icon size
- for icon in "${icon_srcdir}"/default*.png ; do
- size=${icon%.png}
- size=${size##*/default}
-
- if [[ ${size} -eq 48 ]] ; then
- newicon "${icon}" ${PN}.png
- fi
-
- newicon -s ${size} "${icon}" ${PN}.png
- done
-
- # Install menus
- local wrapper_wayland="${PN}-wayland.sh"
- local wrapper_x11="${PN}-x11.sh"
- local desktop_file="${FILESDIR}/icon/${PN}-r2.desktop"
- local display_protocols="auto X11"
- local icon="${PN}"
- local name="Mozilla ${PN^}"
- local use_wayland="false"
-
- if use wayland ; then
- display_protocols+=" Wayland"
- use_wayland="true"
- fi
-
- local app_name desktop_filename display_protocol exec_command
- for display_protocol in ${display_protocols} ; do
- app_name="${name} on ${display_protocol}"
- desktop_filename="${PN}-${display_protocol,,}.desktop"
-
- case ${display_protocol} in
- Wayland)
- exec_command="${PN}-wayland --name ${PN}-wayland"
- newbin "${FILESDIR}/${wrapper_wayland}" ${PN}-wayland
- ;;
- X11)
- if ! use wayland ; then
- # Exit loop here because there's no choice so
- # we don't need wrapper/.desktop file for X11.
- continue
- fi
-
- exec_command="${PN}-x11 --name ${PN}-x11"
- newbin "${FILESDIR}/${wrapper_x11}" ${PN}-x11
- ;;
- *)
- app_name="${name}"
- desktop_filename="${PN}.desktop"
- exec_command="${PN}"
- ;;
- esac
-
- cp "${desktop_file}" "${WORKDIR}/${PN}.desktop-template" || die
-
- sed -i \
- -e "s:@NAME@:${app_name}:" \
- -e "s:@EXEC@:${exec_command}:" \
- -e "s:@ICON@:${icon}:" \
- "${WORKDIR}/${PN}.desktop-template" \
- || die
-
- newmenu "${WORKDIR}/${PN}.desktop-template" "${desktop_filename}"
-
- rm "${WORKDIR}/${PN}.desktop-template" || die
- done
-
- # Install generic wrapper script
- rm "${ED}/usr/bin/${PN}" || die
- newbin "${FILESDIR}/${PN}.sh" ${PN}
-
- # Update wrapper
- local wrapper
- for wrapper in \
- "${ED}/usr/bin/${PN}" \
- "${ED}/usr/bin/${PN}-x11" \
- "${ED}/usr/bin/${PN}-wayland" \
- ; do
- [[ ! -f "${wrapper}" ]] && continue
-
- sed -i \
- -e "s:@PREFIX@:${EPREFIX}/usr:" \
- -e "s:@DEFAULT_WAYLAND@:${use_wayland}:" \
- "${wrapper}" \
- || die
- done
-}
-
-pkg_preinst() {
- xdg_pkg_preinst
-
- # If the apulse libs are available in MOZILLA_FIVE_HOME then apulse
- # does not need to be forced into the LD_LIBRARY_PATH
- if use pulseaudio && has_version ">=media-sound/apulse-0.1.12-r4" ; then
- einfo "APULSE found; Generating library symlinks for sound support ..."
- local lib
- pushd "${ED}${MOZILLA_FIVE_HOME}" &>/dev/null || die
- for lib in ../apulse/libpulse{.so{,.0},-simple.so{,.0}} ; do
- # A quickpkg rolled by hand will grab symlinks as part of the package,
- # so we need to avoid creating them if they already exist.
- if [[ ! -L ${lib##*/} ]] ; then
- ln -s "${lib}" ${lib##*/} || die
- fi
- done
- popd &>/dev/null || die
- fi
-}
-
-pkg_postinst() {
- xdg_pkg_postinst
-
- if ! use gmp-autoupdate ; then
- elog "USE='-gmp-autoupdate' has disabled the following plugins from updating or"
- elog "installing into new profiles:"
- local plugin
- for plugin in "${MOZ_GMP_PLUGIN_LIST[@]}" ; do
- elog "\t ${plugin}"
- done
- elog
- fi
-
- if use pulseaudio && has_version ">=media-sound/apulse-0.1.12-r4" ; then
- elog "Apulse was detected at merge time on this system and so it will always be"
- elog "used for sound. If you wish to use pulseaudio instead please unmerge"
- elog "media-sound/apulse."
- elog
- fi
-
- local show_doh_information show_normandy_information
-
- if [[ -z "${REPLACING_VERSIONS}" ]] ; then
- # New install; Tell user that DoH is disabled by default
- show_doh_information=yes
- show_normandy_information=yes
- else
- local replacing_version
- for replacing_version in ${REPLACING_VERSIONS} ; do
- if ver_test "${replacing_version}" -lt 70 ; then
- # Tell user only once about our DoH default
- show_doh_information=yes
- fi
-
- if ver_test "${replacing_version}" -lt 74.0-r2 ; then
- # Tell user only once about our Normandy default
- show_normandy_information=yes
- fi
- done
- fi
-
- if [[ -n "${show_doh_information}" ]] ; then
- elog
- elog "Note regarding Trusted Recursive Resolver aka DNS-over-HTTPS (DoH):"
- elog "Due to privacy concerns (encrypting DNS might be a good thing, sending all"
- elog "DNS traffic to Cloudflare by default is not a good idea and applications"
- elog "should respect OS configured settings), \"network.trr.mode\" was set to 5"
- elog "(\"Off by choice\") by default."
- elog "You can enable DNS-over-HTTPS in ${PN^}'s preferences."
- fi
-
- # bug 713782
- if [[ -n "${show_normandy_information}" ]] ; then
- elog
- elog "Upstream operates a service named Normandy which allows Mozilla to"
- elog "push changes for default settings or even install new add-ons remotely."
- elog "While this can be useful to address problems like 'Armagadd-on 2.0' or"
- elog "revert previous decisions to disable TLS 1.0/1.1, privacy and security"
- elog "concerns prevail, which is why we have switched off the use of this"
- elog "service by default."
- elog
- elog "To re-enable this service set"
- elog
- elog " app.normandy.enabled=true"
- elog
- elog "in about:config."
- fi
-}
diff --git a/www-client/google-chrome-unstable/Manifest b/www-client/google-chrome-unstable/Manifest
index 0d7b3a099864..229b724bd193 100644
--- a/www-client/google-chrome-unstable/Manifest
+++ b/www-client/google-chrome-unstable/Manifest
@@ -1 +1 @@
-DIST google-chrome-unstable_87.0.4270.0-1_amd64.deb 71972180 BLAKE2B 739fce44888323ecb1106cac758a1a1821ed198cce08e5d370c2fa38ab3ad3572c586e886b2bebb5d82a89c571bd94616729024903bac87a6befbaade345cbd6 SHA512 017f01abf97d04da55f5a316c2dba9c2f6340b6410024416843205c188caa7fa6931ffdd8b03e5316c0906ce8e5fcd536647637b8ef405c1f508675f250c55d2
+DIST google-chrome-unstable_87.0.4278.0-1_amd64.deb 72610476 BLAKE2B b35e8494ed939ad609341a0ded272d6d51fa31202fcdc407f5379a015f703b1b5adf8cbe0708e552a9a6e001e6580a649bdd03059fb54979cb1fea32064d39c2 SHA512 2aee86b55637968601c69f9e7576cffa80262f77e7951f96737f5612eeef71cee188a2b68c846db8abc0c683ef91dac95cc0e66f75c3b4d9cc31a4d0ec6f59bf
diff --git a/www-client/google-chrome-unstable/google-chrome-unstable-87.0.4270.0.ebuild b/www-client/google-chrome-unstable/google-chrome-unstable-87.0.4278.0.ebuild
similarity index 100%
rename from www-client/google-chrome-unstable/google-chrome-unstable-87.0.4270.0.ebuild
rename to www-client/google-chrome-unstable/google-chrome-unstable-87.0.4278.0.ebuild
diff --git a/www-client/links/links-2.21.ebuild b/www-client/links/links-2.21.ebuild
index 651dfcc9fce9..8847392dc599 100644
--- a/www-client/links/links-2.21.ebuild
+++ b/www-client/links/links-2.21.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://${PN}.twibright.com/download/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="brotli bzip2 fbcon freetype gpm ipv6 jpeg libevent libressl livecd lzip lzma ssl suid svga tiff unicode X zlib zstd"
GRAPHICS_DEPEND="media-libs/libpng:0="
diff --git a/www-client/opera-beta/Manifest b/www-client/opera-beta/Manifest
index 7332f7a4f425..f39797f4e2dc 100644
--- a/www-client/opera-beta/Manifest
+++ b/www-client/opera-beta/Manifest
@@ -1 +1 @@
-DIST opera-beta_71.0.3770.126_amd64.deb 68278732 BLAKE2B edb569db1a790964f36fa0cc8620fb966d60459a6ec75b53a7a8b9130eefa8798d29d4dc44fea8fe9385e54fd5b86513be4de3967b5c795f8063d672fa63b581 SHA512 0a2d3fe294c7a4611ddcd86dd31c33707974cf2760c378af6afa2f85a5c9c4d84ba95b11a11f22aae022ecba0cb971039df3696c6891c217911f2a93164d020b
+DIST opera-beta_72.0.3815.49_amd64.deb 72273100 BLAKE2B 55349662ab55f2954baaff2357cd19a31e6c39403655e01cabffa7b185f99caf8252fb3fe016b7a1660b6f9712e8f8cffa3f69c0b6f96069664742f3fa79f35a SHA512 6c8c13d2906155f8b348afab0acc72c9b4e76f2f4580e74638a3ad8125dac4ac26970be14cffc543cd51ca332b53a943c0bb8983f762c7f288b1285c2fb4f641
diff --git a/www-client/opera-beta/opera-beta-71.0.3770.126.ebuild b/www-client/opera-beta/opera-beta-72.0.3815.49.ebuild
similarity index 100%
rename from www-client/opera-beta/opera-beta-71.0.3770.126.ebuild
rename to www-client/opera-beta/opera-beta-72.0.3815.49.ebuild
diff --git a/www-client/opera/Manifest b/www-client/opera/Manifest
index 6a45208055a4..b5352bcef59c 100644
--- a/www-client/opera/Manifest
+++ b/www-client/opera/Manifest
@@ -1,2 +1 @@
-DIST opera-stable_71.0.3770.171_amd64.deb 67804340 BLAKE2B 973c0dc2ad27e1cf5b9e17dac7ff0f5eb0cc821c909467857b505d17bc1c8d7b29396ee4ef17e3ea01b0d48a9ef99fd756c928deeecc31dda595d22fd057751a SHA512 e6782456b74546227ca6bf80ce32882cde6e4c6f8eab4b3930069e4c2112065b79648ed0f0847cc6fcb1ec6f1dd5a7e37144c3382bb294237dd24f047906bd20
DIST opera-stable_71.0.3770.198_amd64.deb 67830756 BLAKE2B ac0feda2b658bdd3447a17b5e63d29d86ae3ddcd8d762fe8756d4151a7ef152f97623269198c509562bde3a6e105067fed5e00a8345c65af914a1667d9df90a5 SHA512 9eea20f3416b04559270a41c6e35bc6e018de6f4b98673780bb5dd66160239e5a9edd37e364549a68bc2cc26c7db1a4a13c77d5c0f55896ce385cc9ffef15716
diff --git a/www-client/opera/opera-71.0.3770.171.ebuild b/www-client/opera/opera-71.0.3770.171.ebuild
deleted file mode 100644
index 74846af4b10a..000000000000
--- a/www-client/opera/opera-71.0.3770.171.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-CHROMIUM_LANGS="
- be bg bn ca cs da de el en-GB en-US es-419 es fil fi fr-CA fr hi hr hu id
- it ja ko lt lv ms nb nl pl pt-BR pt-PT ro ru sk sr sv sw ta te th tr uk vi
- zh-CN zh-TW
-
-"
-inherit chromium-2 multilib unpacker xdg
-
-DESCRIPTION="A fast and secure web browser"
-HOMEPAGE="https://www.opera.com/"
-LICENSE="OPERA-2014"
-SLOT="0"
-SRC_URI_BASE="
- https://download1.operacdn.com/pub/
- https://download2.operacdn.com/pub/
- https://download3.operacdn.com/pub/
- https://download4.operacdn.com/pub/
-"
-for uri in ${SRC_URI_BASE}; do
-SRC_URI+="
- "${uri}${PN}/desktop/${PV}/linux/${PN}-stable_${PV}_amd64.deb"
-"
-done
-KEYWORDS="amd64"
-
-RDEPEND="
- dev-libs/expat
- dev-libs/glib:2
- dev-libs/nspr
- dev-libs/nss
- media-libs/alsa-lib
- media-libs/fontconfig
- media-libs/freetype
- net-misc/curl
- net-print/cups
- sys-apps/dbus
- x11-libs/cairo
- x11-libs/gdk-pixbuf
- x11-libs/gtk+:3
- x11-libs/libX11
- x11-libs/libXScrnSaver
- x11-libs/libXcomposite
- x11-libs/libXcursor
- x11-libs/libXdamage
- x11-libs/libXext
- x11-libs/libXfixes
- x11-libs/libXi
- x11-libs/libXrandr
- x11-libs/libXrender
- x11-libs/libXtst
- x11-libs/libnotify
- x11-libs/pango[X]
-"
-
-QA_PREBUILT="*"
-S=${WORKDIR}
-
-src_unpack() {
- unpack_deb ${A}
-}
-
-src_prepare() {
- default
-
- OPERA_HOME="usr/$(get_libdir)/${PN}"
-
- case ${ARCH} in
- amd64)
- mv usr/lib/x86_64-linux-gnu usr/$(get_libdir) || die
- rm -r usr/lib || die
- ;;
- esac
-
- rm usr/bin/${PN} || die
-
- rm usr/share/doc/${PN}-stable/copyright || die
- mv usr/share/doc/${PN}-stable usr/share/doc/${PF} || die
- gunzip usr/share/doc/${PF}/changelog.gz || die
-
- pushd "${OPERA_HOME}"/localization > /dev/null || die
- chromium_remove_language_paks
- popd > /dev/null || die
-
- sed -i \
- -e 's|^TargetEnvironment|X-&|g' \
- usr/share/applications/${PN}.desktop || die
-}
-
-src_install() {
- rm "${OPERA_HOME}"/${PN}_autoupdate || die
- mv * "${D}" || die
- dosym ../$(get_libdir)/${PN}/${PN} /usr/bin/${PN}
- fperms 4711 /"${OPERA_HOME}"/opera_sandbox
-}
diff --git a/www-client/opera/opera-71.0.3770.198.ebuild b/www-client/opera/opera-71.0.3770.198.ebuild
index 4a76841018cf..74846af4b10a 100644
--- a/www-client/opera/opera-71.0.3770.198.ebuild
+++ b/www-client/opera/opera-71.0.3770.198.ebuild
@@ -25,7 +25,7 @@ SRC_URI+="
"${uri}${PN}/desktop/${PV}/linux/${PN}-stable_${PV}_amd64.deb"
"
done
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
RDEPEND="
dev-libs/expat
diff --git a/www-client/seamonkey/files/seamonkey-2.53.2-sysctl.patch b/www-client/seamonkey/files/seamonkey-2.53.2-sysctl.patch
new file mode 100644
index 000000000000..4ad673bed603
--- /dev/null
+++ b/www-client/seamonkey/files/seamonkey-2.53.2-sysctl.patch
@@ -0,0 +1,15 @@
+https://src.fedoraproject.org/rpms/seamonkey/c/f3de8ae056fcb36615add0e6311cff147fbdd827?branch=master
+https://bugs.gentoo.org/736892
+
+--- seamonkey-2.53.2/mozilla/memory/build/mozjemalloc.cpp
++++ seamonkey-2.53.2/mozilla/memory/build/mozjemalloc.cpp
+@@ -220,9 +220,6 @@
+ #include
+ #include
+ #include
+-#if !defined(XP_SOLARIS) && !defined(ANDROID)
+-#include
+-#endif
+ #include
+
+ #include
diff --git a/www-client/seamonkey/seamonkey-2.53.4.ebuild b/www-client/seamonkey/seamonkey-2.53.4.ebuild
index ef146756d3d7..5952eb2130de 100644
--- a/www-client/seamonkey/seamonkey-2.53.4.ebuild
+++ b/www-client/seamonkey/seamonkey-2.53.4.ebuild
@@ -188,6 +188,7 @@ src_prepare() {
done
use system-libvpx && eapply "${WORKDIR}/${PN}-2.53.3-system_libvpx-1.8.patch"
+ eapply "${FILESDIR}/${PN}-2.53.2-sysctl.patch" #736892
# Allow user to apply any additional patches without modifing ebuild
eapply_user
diff --git a/www-client/vivaldi-snapshot/Manifest b/www-client/vivaldi-snapshot/Manifest
index e8599d8fb2ea..8aad15959f46 100644
--- a/www-client/vivaldi-snapshot/Manifest
+++ b/www-client/vivaldi-snapshot/Manifest
@@ -18,3 +18,7 @@ DIST vivaldi-snapshot-3.4.2056.19_p1-amd64.deb 73504020 BLAKE2B 6eac459befc2e0af
DIST vivaldi-snapshot-3.4.2056.19_p1-arm64.deb 65922752 BLAKE2B 8a6d813ef23ca4f8daf7c4e8d799ce4af59787c9017902b5497ef0bb0ba9d0668f5fc17af1eccde402ad53d7267d82d9feb94784e5ec79784d0513a7420ac639 SHA512 5180c8f0d5300577da4eff7867c5d41e5a6179a4a78fcec335913ae4b44ce2005b520d78796f280e3473edabfd95e521b6c34f2d972fa4c134e672c6c9f151ef
DIST vivaldi-snapshot-3.4.2056.19_p1-armhf.deb 64889956 BLAKE2B 8a9d3efcf4f6ec700c361cf98561295a17b473fb437e631b1f7c2b8cec2e37bbdb3b733015a363bed21419105a0dafbb6b4b6b3ed15e2d7fe2ff92c4fd8b4d51 SHA512 cbbf57d916cb1cbd3de49405a19a20ffbe09579f0ddad4d1e27ca5fbee824b0240b10064893650217b6ef0f29d4d194875eb30c1fb12786dd006671ad7eeb378
DIST vivaldi-snapshot-3.4.2056.19_p1-i386.deb 70724892 BLAKE2B 17313d53f72931462583784a4619ec39f875994b6340c40fbd9e6303bf3f36b771b05419496c0cafe98323508b20a0fa3aa579b9534b6d6b2ee780ab02d9f8e2 SHA512 050282659fc6392b815bc902b72a4058eed6de0081e8ca170ebfd1909723b4a693313a8099eb56198fa42eff727c29ba31b0d71328700a57fff8e7c412842a92
+DIST vivaldi-snapshot-3.4.2059.2_p1-amd64.deb 73541108 BLAKE2B e8b4117128fa4ffafdabce44d8c166b3a3a56e1ade1a885327f70d3108f3cb73bfa3d2bc7f00b424c40df688b2c672334919ed55ad4e7dc346e5c6e802ef968a SHA512 5d95a47f2bd91a7b026869441da7cc4db777fd564192171334aa4223446f7a48624572c2ed603ae4b60f3af3e3ba186f73aaf371a9301c83cea1639825a662e4
+DIST vivaldi-snapshot-3.4.2059.2_p1-arm64.deb 65939680 BLAKE2B 32c6da96cde3f73784ad4abda051dff839eb78c1e0eedc987259ed6a237b7dd1f95176c0b780fc98443265948c1a4b487c34f20e17b5858324b698bf2822d45d SHA512 86f599f834bb67dd710a11afe94e0b1fbb0543323e87db6a91abe8fae2e9babe3c9054f60c5963a3202f0f8fb599dc751eadb33b5ce57ee8dc5fd6c323217eef
+DIST vivaldi-snapshot-3.4.2059.2_p1-armhf.deb 64921572 BLAKE2B 80aef5d73b76cde268a2175d615836a27cfa80fe578d4a3bcf5889e3d8d2d3afc688a2bb6d97363562d82da34ed2e50cd62e9f6459db7df79a830a16932f85a1 SHA512 5fb552ca6e81a79425fc968922b3be76e9e2507752518cc6729083aaf83589ba6c119819730f011fd32c1afe76556011208bbae3918e0ef57a6e0580f7d038bc
+DIST vivaldi-snapshot-3.4.2059.2_p1-i386.deb 70700552 BLAKE2B bc7453e8488f3e98d84ea71560e3dece878e01338ecff5577443ddbb57b7f29116a2c2681038413be59cec6ab514086305b4c6e3538c3f68db57f5f7af4c3656 SHA512 f1f5b530e5c15b4bfac40156f29bc536c36099c1c8abf2c02efeab2a96ff91af578e4e058bd8ac89b1e4c5f2658ffcd92eeb4cfe415ba1916d42b87018e26b3d
diff --git a/www-client/vivaldi-snapshot/vivaldi-snapshot-3.4.2059.2_p1.ebuild b/www-client/vivaldi-snapshot/vivaldi-snapshot-3.4.2059.2_p1.ebuild
new file mode 100644
index 000000000000..0178e0245253
--- /dev/null
+++ b/www-client/vivaldi-snapshot/vivaldi-snapshot-3.4.2059.2_p1.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+CHROMIUM_LANGS="
+ af am ar be bg bn ca cs da de de-CH el en-GB en-US eo es es-419 es-PE et eu
+ fa fi fil fr fy gd gl gu he hi hr hu hy id io is it ja jbo ka kn ko ku lt
+ lv mk ml mr ms nb nl nn pl pt-BR pt-PT ro ru sc sk sl sq sr sv sw ta te th
+ tr uk vi zh-CN zh-TW
+"
+inherit chromium-2 multilib unpacker toolchain-funcs xdg
+
+VIVALDI_HOME="opt/${PN}"
+DESCRIPTION="A browser for our friends"
+HOMEPAGE="https://vivaldi.com/"
+VIVALDI_BASE_URI="https://downloads.vivaldi.com/snapshot/${PN}_${PV/_p/-}_"
+SRC_URI="
+ amd64? ( ${VIVALDI_BASE_URI}amd64.deb -> ${P}-amd64.deb )
+ arm64? ( ${VIVALDI_BASE_URI}arm64.deb -> ${P}-arm64.deb )
+ arm? ( ${VIVALDI_BASE_URI}armhf.deb -> ${P}-armhf.deb )
+ x86? ( ${VIVALDI_BASE_URI}i386.deb -> ${P}-i386.deb )
+"
+
+LICENSE="Vivaldi"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~arm ~arm64 ~x86"
+RESTRICT="bindist mirror"
+
+DEPEND="
+ virtual/libiconv
+"
+RDEPEND="
+ dev-libs/expat
+ dev-libs/glib:2
+ dev-libs/nspr
+ dev-libs/nss
+ media-libs/alsa-lib
+ media-libs/fontconfig
+ media-libs/freetype
+ media-libs/speex
+ net-print/cups
+ sys-apps/dbus
+ sys-libs/libcap
+ x11-libs/cairo
+ x11-libs/gdk-pixbuf
+ x11-libs/gtk+:3
+ x11-libs/libX11
+ x11-libs/libXScrnSaver
+ x11-libs/libXcomposite
+ x11-libs/libXcursor
+ x11-libs/libXdamage
+ x11-libs/libXext
+ x11-libs/libXfixes
+ x11-libs/libXi
+ x11-libs/libXrandr
+ x11-libs/libXrender
+ x11-libs/libXtst
+ x11-libs/pango[X]
+"
+QA_PREBUILT="*"
+S=${WORKDIR}
+
+src_unpack() {
+ unpack_deb ${A}
+}
+
+src_prepare() {
+ iconv -c -t UTF-8 usr/share/applications/${PN}.desktop > "${T}"/${PN}.desktop || die
+ mv "${T}"/${PN}.desktop usr/share/applications/${PN}.desktop || die
+
+ mv usr/share/doc/${PN} usr/share/doc/${PF} || die
+ chmod 0755 usr/share/doc/${PF} || die
+
+ gunzip usr/share/doc/${PF}/changelog.gz || die
+
+ rm \
+ _gpgbuilder \
+ etc/cron.daily/${PN} \
+ || die
+ rmdir \
+ etc/cron.daily/ \
+ etc/ \
+ || die
+
+ local c d
+ for d in 16 22 24 32 48 64 128 256; do
+ mkdir -p usr/share/icons/hicolor/${d}x${d}/apps || die
+ cp \
+ ${VIVALDI_HOME}/product_logo_${d}.png \
+ usr/share/icons/hicolor/${d}x${d}/apps/${PN}.png || die
+ done
+
+ pushd "${VIVALDI_HOME}/locales" > /dev/null || die
+ chromium_remove_language_paks
+ popd > /dev/null || die
+
+ eapply_user
+}
+
+src_install() {
+ rm -r usr/share/appdata || die
+ mv * "${D}" || die
+ dosym /${VIVALDI_HOME}/${PN} /usr/bin/${PN}
+
+ fperms 4711 /${VIVALDI_HOME}/vivaldi-sandbox
+}
diff --git a/www-plugins/Manifest.gz b/www-plugins/Manifest.gz
index 5b527feb4a5b..4cfa52a9c174 100644
Binary files a/www-plugins/Manifest.gz and b/www-plugins/Manifest.gz differ
diff --git a/www-plugins/chrome-binary-plugins/Manifest b/www-plugins/chrome-binary-plugins/Manifest
index 5fd7997c7dc2..0affe7e7e52a 100644
--- a/www-plugins/chrome-binary-plugins/Manifest
+++ b/www-plugins/chrome-binary-plugins/Manifest
@@ -1,3 +1,3 @@
DIST google-chrome-beta_86.0.4240.68-1_amd64.deb 71155468 BLAKE2B 6b1608251d401665f51cd0ca830c265fd89ed0ee81fb51c80de00d5bf1c0fb890a88464ced51c536cc1ce2ece395d236690d72e137c77732324e7534932987f0 SHA512 67fd5818580d1ada3d513dc9b5ea50cf010c244306f54d42ae08ad48b81659eb5331b8b07c2808202e8f78c449366ea3500c30be88c5d29fe48821c9f9566b38
DIST google-chrome-stable_85.0.4183.121-1_amd64.deb 70233788 BLAKE2B d713968d7ae6ff1715c9b44cf045fa9ec679ec4ced84b10527db3a1d6d2d979fa453bbe4372fbef684084e8c03d0712fbcf3339b0007e4de2631366cb56c2e85 SHA512 343610f549e6e73fddcd334b343d375b2543b75e59d75ed5da391281e7e5d56e64e5bab1b19002f20576186185b88a2306c33a6200528d3cc2d5e7d32b254ef1
-DIST google-chrome-unstable_87.0.4270.0-1_amd64.deb 71972180 BLAKE2B 739fce44888323ecb1106cac758a1a1821ed198cce08e5d370c2fa38ab3ad3572c586e886b2bebb5d82a89c571bd94616729024903bac87a6befbaade345cbd6 SHA512 017f01abf97d04da55f5a316c2dba9c2f6340b6410024416843205c188caa7fa6931ffdd8b03e5316c0906ce8e5fcd536647637b8ef405c1f508675f250c55d2
+DIST google-chrome-unstable_87.0.4278.0-1_amd64.deb 72610476 BLAKE2B b35e8494ed939ad609341a0ded272d6d51fa31202fcdc407f5379a015f703b1b5adf8cbe0708e552a9a6e001e6580a649bdd03059fb54979cb1fea32064d39c2 SHA512 2aee86b55637968601c69f9e7576cffa80262f77e7951f96737f5612eeef71cee188a2b68c846db8abc0c683ef91dac95cc0e66f75c3b4d9cc31a4d0ec6f59bf
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-87.0.4270.0_alpha.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-87.0.4278.0_alpha.ebuild
similarity index 100%
rename from www-plugins/chrome-binary-plugins/chrome-binary-plugins-87.0.4270.0_alpha.ebuild
rename to www-plugins/chrome-binary-plugins/chrome-binary-plugins-87.0.4278.0_alpha.ebuild
diff --git a/www-servers/Manifest.gz b/www-servers/Manifest.gz
index 381c80c7d700..f1bb78e96cf6 100644
Binary files a/www-servers/Manifest.gz and b/www-servers/Manifest.gz differ
diff --git a/www-servers/apache/apache-2.4.46-r1.ebuild b/www-servers/apache/apache-2.4.46-r1.ebuild
index f2ea863d642b..449b79e34862 100644
--- a/www-servers/apache/apache-2.4.46-r1.ebuild
+++ b/www-servers/apache/apache-2.4.46-r1.ebuild
@@ -218,7 +218,7 @@ src_install() {
# Then apache2.4.service can be used and systemd support controlled
# through --enable-systemd
systemd_newunit "${FILESDIR}/apache2.2-hardened.service" "apache2.service"
- systemd_dotmpfilesd "${FILESDIR}/apache.conf"
+ dotmpfiles "${FILESDIR}/apache.conf"
#insinto /etc/apache2/modules.d
#doins "${FILESDIR}/00_systemd.conf"
diff --git a/www-servers/apache/apache-2.4.46.ebuild b/www-servers/apache/apache-2.4.46.ebuild
index ac4fa3b9f318..17d6fb367b7c 100644
--- a/www-servers/apache/apache-2.4.46.ebuild
+++ b/www-servers/apache/apache-2.4.46.ebuild
@@ -216,7 +216,7 @@ src_install() {
# Then apache2.4.service can be used and systemd support controlled
# through --enable-systemd
systemd_newunit "${FILESDIR}/apache2.2-hardened.service" "apache2.service"
- systemd_dotmpfilesd "${FILESDIR}/apache.conf"
+ dotmpfiles "${FILESDIR}/apache.conf"
#insinto /etc/apache2/modules.d
#doins "${FILESDIR}/00_systemd.conf"
diff --git a/www-servers/gunicorn/gunicorn-20.0.4.ebuild b/www-servers/gunicorn/gunicorn-20.0.4.ebuild
index f60c3acde41e..11cedec10ae3 100644
--- a/www-servers/gunicorn/gunicorn-20.0.4.ebuild
+++ b/www-servers/gunicorn/gunicorn-20.0.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT PSF-2 doc? ( BSD )"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86"
RDEPEND="dev-python/setproctitle[${PYTHON_USEDEP}]"
diff --git a/www-servers/varnish/Manifest b/www-servers/varnish/Manifest
index e60281b3d7f4..dd921ec46677 100644
--- a/www-servers/varnish/Manifest
+++ b/www-servers/varnish/Manifest
@@ -1,3 +1,4 @@
DIST varnish-6.0.6.tgz 3136931 BLAKE2B 2ce379622b20a939a977a426cb842ba62e4fd5fd3ba785ec21888956b6a8c16e95bd834962a7ba05dc426dfc36067cabb4f8ade2bee7fe2a094a1f2c4c4c9e06 SHA512 c0881ab051bca928c12f35494c5e2a8109390abdf3acf368da404c5537d1ee0f1153b6e329058a7e1168eacf5af9b86ccf9a6e58cd89dd7d51b8b71d25aa7ba0
DIST varnish-6.3.2.tgz 3323908 BLAKE2B 5bde1b2ececeb8aed884db22ed75bfd74f82d68416e71400a4c0d27483fcceb029fe8e724e30754899c872d7028da5cb759545f0743a11d0e90b0fd604af0ad7 SHA512 0f476c642df834737d446b3bc6ac8afa5981d1de5810dc6e8556eb22b2ca26d64eb531f4ad3332eb86e231a7443fe35393177ec6dbee97a837f405d1aa9d03cd
DIST varnish-6.4.0.tgz 3404617 BLAKE2B 0ef0f7303f5c926bb1b80ec14cdd9755d65c1938fa8645240800ac2997f954022133625a74dd9c30ce21850674c3b00777fcc896309f528e6ba90d347333d7f7 SHA512 cda8f9e1d301a2b79db14685a23e25e36225f37065a1b7f37c5ae12fbb0483be51be9ffcc8ba72c1f65f5a022d1e408825694daed6780e206b9ba91feb2a07a1
+DIST varnish-6.5.0.tgz 3476969 BLAKE2B bafa8704f28dfa96f681805cc053dd6415e143016b1bbff7f8962f2c3ac5cd07be6dc2f4129a423ddfcbf9f9f8afc57388930685d0ed400f3c06ba03bd667d87 SHA512 43f8cd6429a903a353ac4448b6e9aff445b0d52178141a148d3b29b987c0974841820af0da4917731775b46899c12b0327d64d12e3ddbb8fd438e2802ac66a1c
diff --git a/www-servers/varnish/varnish-6.5.0.ebuild b/www-servers/varnish/varnish-6.5.0.ebuild
new file mode 100644
index 000000000000..cd7753a43dbf
--- /dev/null
+++ b/www-servers/varnish/varnish-6.5.0.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python{3_6,3_7} )
+
+inherit autotools systemd python-r1
+
+DESCRIPTION="Varnish is a state-of-the-art, high-performance HTTP accelerator"
+HOMEPAGE="https://varnish-cache.org/"
+SRC_URI="http://varnish-cache.org/_downloads/${P}.tgz"
+
+LICENSE="BSD-2 GPL-2"
+SLOT="0/2"
+KEYWORDS="~amd64 ~mips ~ppc ~ppc64 ~x86"
+IUSE="jemalloc jit static-libs"
+
+CDEPEND="
+ sys-libs/readline:0=
+ dev-libs/libpcre[jit?]
+ jemalloc? ( dev-libs/jemalloc )
+ sys-libs/ncurses:0="
+
+#varnish compiles stuff at run time
+RDEPEND="
+ ${PYTHON_DEPS}
+ ${CDEPEND}
+ acct-user/varnish
+ acct-group/varnish
+ sys-devel/gcc"
+
+DEPEND="
+ ${CDEPEND}
+ dev-python/docutils
+ dev-python/sphinx
+ virtual/pkgconfig"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RESTRICT="test" #315725
+
+src_prepare() {
+ # Remove -Werror bug #528354
+ sed -i -e 's/-Werror\([^=]\)/\1/g' configure.ac
+
+ # Upstream doesn't put varnish.m4 in the m4/ directory
+ # We link because the Makefiles look for the file in
+ # the original location
+ ln -sf ../varnish.m4 m4/varnish.m4
+
+ eapply_user
+
+ eautoreconf
+}
+
+src_configure() {
+ econf \
+ $(use_enable static-libs static) \
+ $(use_enable jit pcre-jit ) \
+ $(use_with jemalloc)
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+
+ python_replicate_script "${D}/usr/share/varnish/vmodtool.py"
+
+ newinitd "${FILESDIR}"/varnishlog.initd varnishlog
+ newconfd "${FILESDIR}"/varnishlog.confd varnishlog
+
+ newinitd "${FILESDIR}"/varnishncsa.initd varnishncsa
+ newconfd "${FILESDIR}"/varnishncsa.confd varnishncsa
+
+ newinitd "${FILESDIR}"/varnishd.initd-r4 varnishd
+ newconfd "${FILESDIR}"/varnishd.confd-r4 varnishd
+
+ insinto /etc/logrotate.d/
+ newins "${FILESDIR}/varnishd.logrotate-r2" varnishd
+
+ diropts -m750
+
+ keepdir /var/lib/varnish
+ keepdir /var/log/varnish
+
+ systemd_dounit "${FILESDIR}/${PN}d.service"
+
+ insinto /etc/varnish/
+ doins lib/libvmod_std/vmod_std.vcc
+ doins etc/example.vcl
+
+ dodoc README.rst
+ dodoc doc/changes.rst
+
+ fowners root:varnish /etc/varnish/
+ fowners varnish:varnish /var/lib/varnish/
+ fperms 0750 /var/lib/varnish/ /etc/varnish/
+}
diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index d41582df98ad..4fc78bc11caa 100644
Binary files a/x11-libs/Manifest.gz and b/x11-libs/Manifest.gz differ
diff --git a/x11-libs/libva/libva-2.7.1.ebuild b/x11-libs/libva/libva-2.7.1.ebuild
index 16471ef454e4..e68b8032b1f5 100644
--- a/x11-libs/libva/libva-2.7.1.ebuild
+++ b/x11-libs/libva/libva-2.7.1.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} = *9999* ]] ; then # Live ebuild
AUTOTOOLS_AUTORECONF="yes"
else
SRC_URI="https://github.com/intel/libva/releases/download/${PV}/${P}.tar.bz2"
- KEYWORDS="amd64 ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
+ KEYWORDS="amd64 arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
fi
LICENSE="MIT"