diff --git a/Manifest.files.gz b/Manifest.files.gz
index f5ed7cfe0590..9f33675ba9e7 100644
Binary files a/Manifest.files.gz and b/Manifest.files.gz differ
diff --git a/acct-group/Manifest.gz b/acct-group/Manifest.gz
index c8ad6e6d7412..e8a8308af017 100644
Binary files a/acct-group/Manifest.gz and b/acct-group/Manifest.gz differ
diff --git a/acct-group/davfs2/Manifest b/acct-group/davfs2/Manifest
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/acct-group/davfs2/davfs2-0.ebuild b/acct-group/davfs2/davfs2-0.ebuild
new file mode 100644
index 000000000000..c7a375eb1319
--- /dev/null
+++ b/acct-group/davfs2/davfs2-0.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=420
diff --git a/acct-group/davfs2/metadata.xml b/acct-group/davfs2/metadata.xml
new file mode 100644
index 000000000000..7985a32de123
--- /dev/null
+++ b/acct-group/davfs2/metadata.xml
@@ -0,0 +1,7 @@
+
+
+
+
+ gokturk@gentoo.org
+
+
diff --git a/acct-group/prometheus/Manifest b/acct-group/prometheus/Manifest
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/acct-group/prometheus/metadata.xml b/acct-group/prometheus/metadata.xml
new file mode 100644
index 000000000000..c36c37139fad
--- /dev/null
+++ b/acct-group/prometheus/metadata.xml
@@ -0,0 +1,8 @@
+
+
+
+
+ williamh@gentoo.org
+ William Hubbs
+
+
diff --git a/acct-group/prometheus/prometheus-0.ebuild b/acct-group/prometheus/prometheus-0.ebuild
new file mode 100644
index 000000000000..00fd7dffd132
--- /dev/null
+++ b/acct-group/prometheus/prometheus-0.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=430
diff --git a/acct-group/squid/Manifest b/acct-group/squid/Manifest
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/acct-group/squid/metadata.xml b/acct-group/squid/metadata.xml
new file mode 100644
index 000000000000..6698a4ab7883
--- /dev/null
+++ b/acct-group/squid/metadata.xml
@@ -0,0 +1,8 @@
+
+
+
+
+ zlogene@gentoo.org
+ Mikle Kolyada
+
+
diff --git a/acct-group/squid/squid-0.ebuild b/acct-group/squid/squid-0.ebuild
new file mode 100644
index 000000000000..7295f3099cd9
--- /dev/null
+++ b/acct-group/squid/squid-0.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=301
diff --git a/acct-user/Manifest.gz b/acct-user/Manifest.gz
index c4df66304bef..c0cbd4f2e7f9 100644
Binary files a/acct-user/Manifest.gz and b/acct-user/Manifest.gz differ
diff --git a/acct-user/davfs2/Manifest b/acct-user/davfs2/Manifest
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/acct-user/davfs2/davfs2-0.ebuild b/acct-user/davfs2/davfs2-0.ebuild
new file mode 100644
index 000000000000..fcc2e117501e
--- /dev/null
+++ b/acct-user/davfs2/davfs2-0.ebuild
@@ -0,0 +1,11 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+ACCT_USER_ID=420
+ACCT_USER_GROUPS=( davfs2 )
+
+acct-user_add_deps
diff --git a/acct-user/davfs2/metadata.xml b/acct-user/davfs2/metadata.xml
new file mode 100644
index 000000000000..7985a32de123
--- /dev/null
+++ b/acct-user/davfs2/metadata.xml
@@ -0,0 +1,7 @@
+
+
+
+
+ gokturk@gentoo.org
+
+
diff --git a/acct-user/prometheus/Manifest b/acct-user/prometheus/Manifest
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/acct-user/prometheus/metadata.xml b/acct-user/prometheus/metadata.xml
new file mode 100644
index 000000000000..c36c37139fad
--- /dev/null
+++ b/acct-user/prometheus/metadata.xml
@@ -0,0 +1,8 @@
+
+
+
+
+ williamh@gentoo.org
+ William Hubbs
+
+
diff --git a/acct-user/prometheus/prometheus-0.ebuild b/acct-user/prometheus/prometheus-0.ebuild
new file mode 100644
index 000000000000..df0a3191d93d
--- /dev/null
+++ b/acct-user/prometheus/prometheus-0.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user for prometheus"
+ACCT_USER_ID=430
+ACCT_USER_GROUPS=( prometheus )
+ACCT_USER_HOME=/var/lib/prometheus
+
+acct-user_add_deps
diff --git a/acct-user/squid/Manifest b/acct-user/squid/Manifest
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/acct-user/squid/metadata.xml b/acct-user/squid/metadata.xml
new file mode 100644
index 000000000000..6698a4ab7883
--- /dev/null
+++ b/acct-user/squid/metadata.xml
@@ -0,0 +1,8 @@
+
+
+
+
+ zlogene@gentoo.org
+ Mikle Kolyada
+
+
diff --git a/acct-user/squid/squid-0.ebuild b/acct-user/squid/squid-0.ebuild
new file mode 100644
index 000000000000..97e03021f293
--- /dev/null
+++ b/acct-user/squid/squid-0.ebuild
@@ -0,0 +1,13 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="A user for squid web proxy cache"
+ACCT_USER_ID=301
+ACCT_USER_HOME=/var/cache/squid
+ACCT_USER_GROUPS=( squid )
+
+acct-user_add_deps
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index a8ec4c96da4a..2e30ba4fb76a 100644
Binary files a/app-admin/Manifest.gz and b/app-admin/Manifest.gz differ
diff --git a/app-admin/abrt/Manifest b/app-admin/abrt/Manifest
index 3a2a0e6e70a4..5866ff387575 100644
--- a/app-admin/abrt/Manifest
+++ b/app-admin/abrt/Manifest
@@ -1,2 +1 @@
-DIST abrt-2.10.10.tar.gz 6830586 BLAKE2B 5cd45144678e6355cb1362c3ebe5531104bb150ff95c42d10e3056f7619cdc7dc3da57e4025cab05234866a4634f29bc07fd78f574800d6b303385c6befa25bd SHA512 6daeea898c9328d31b952ef12202162e002f91b4115301e5d66a0e6991251f9a8322b87201128f7efd54b42b76cb94abc4cf01e5d5b563f254f6757ec7e2127d
DIST abrt-2.12.0.tar.gz 6799338 BLAKE2B 57a9b3fac4a4a5f55630be0573b26d4ae2d921d4f09d6566339a77f314c413c1a9e242f882fe20befabf30a58e7df21395edcf1b0d560bfeadf8e854bff6a705 SHA512 3567332399cd9708505a6d05c9388c7da5c14c7432e6fd40e5e76b6bcea8859c17b3b6c52a96ce54740e3682d75d8bf77dbc5fede80bd4fc6f72c60014f9cded
diff --git a/app-admin/abrt/abrt-2.10.10-r2.ebuild b/app-admin/abrt/abrt-2.10.10-r2.ebuild
deleted file mode 100644
index 17e113f87b5c..000000000000
--- a/app-admin/abrt/abrt-2.10.10-r2.ebuild
+++ /dev/null
@@ -1,116 +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 autotools gnome2-utils python-single-r1 systemd user
-
-DESCRIPTION="Automatic bug detection and reporting tool"
-HOMEPAGE="https://github.com/abrt/abrt/wiki/ABRT-Project"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-IUSE="debug selinux"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPEND="${PYTHON_DEPS}
- >=dev-libs/glib-2.43:2
- >=dev-libs/libreport-2.9.5[python]
- dev-libs/libxml2
- dev-libs/nss
- >=gnome-base/gsettings-desktop-schemas-3.15.1
- sys-apps/dbus
- sys-apps/systemd
- sys-auth/polkit
- sys-fs/inotify-tools
- x11-libs/gtk+:3
- >=x11-libs/libnotify-0.7
-"
-RDEPEND="${COMMON_DEPEND}
- app-arch/cpio
- dev-libs/elfutils
- dev-python/argcomplete[${PYTHON_USEDEP}]
- dev-python/argh[${PYTHON_USEDEP}]
- dev-python/humanize[${PYTHON_USEDEP}]
- sys-apps/util-linux
- >=sys-devel/gdb-7
-"
-DEPEND="${COMMON_DEPEND}
- app-text/asciidoc
- app-text/xmlto
- dev-libs/satyr[${PYTHON_USEDEP}]
- >=dev-util/intltool-0.35.0
- virtual/pkgconfig
- >=sys-devel/gettext-0.17
-"
-
-RESTRICT="test" # tests *may* be broken due to all the RHEL crap. explore later.
-
-pkg_setup() {
- python-single-r1_pkg_setup
-
- enewgroup abrt
- enewuser abrt -1 -1 -1 abrt
-}
-
-src_prepare() {
- default
-
- # pyhook test is sensitive to the format of python's error messages, and
- # fails with certain python versions
- sed -e '/pyhook.at/ d' \
- -i tests/Makefile.* tests/testsuite.at || die "sed remove pyhook tests failed"
- ./gen-version || die # Needed to be run before autoreconf
- eautoreconf
-}
-
-src_configure() {
- myeconfargs=(
- --libdir="${EPREFIX}/usr/$(get_libdir)"
- --localstatedir="${EPREFIX}/var"
- --without-bodhi
- # package breaks due to not finding libreport-web with bodhi plugin enabled
- --without-rpm
- $(usex selinux "" "--without-selinux")
- --without-python2
- # Fixes "syntax error in VERSION script" and we aren't supporting Python2 anyway
- --with-python3
- --without-pythondoc
- # package breaks due to no sphinx-build-3
- --without-pythontests
- # kill tests for now until they can be explored.
- )
-
- econf "${myeconfargs[@]}"
-}
-
-src_install() {
- default
- python_optimize #661706
-
- keepdir /var/run/abrt
- # /var/spool/abrt is created by dev-libs/libreport
-
- diropts -m 700 -o abrt -g abrt
- keepdir /var/spool/abrt-upload
-
- diropts -m 775 -o abrt -g abrt
- keepdir /var/cache/abrt-di
-
- find "${D}" -name '*.la' -delete || die
-
- newinitd "${FILESDIR}/${PN}-2.0.12-r1-init" abrt
- newconfd "${FILESDIR}/${PN}-2.0.12-r1-conf" abrt
-}
-
-pkg_postinst() {
- gnome2_icon_cache_update
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
-}
diff --git a/app-admin/abrt/abrt-2.12.0-r1.ebuild b/app-admin/abrt/abrt-2.12.0-r1.ebuild
index c7552e3fad94..2a2d73f27a6a 100644
--- a/app-admin/abrt/abrt-2.12.0-r1.ebuild
+++ b/app-admin/abrt/abrt-2.12.0-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
IUSE="debug selinux"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/app-admin/logrotate/logrotate-3.14.0.ebuild b/app-admin/logrotate/logrotate-3.14.0.ebuild
index f0e25d4dbc28..ab589a26bc26 100644
--- a/app-admin/logrotate/logrotate-3.14.0.ebuild
+++ b/app-admin/logrotate/logrotate-3.14.0.ebuild
@@ -7,7 +7,7 @@ inherit systemd
DESCRIPTION="Rotates, compresses, and mails system logs"
HOMEPAGE="https://github.com/logrotate/logrotate"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
diff --git a/app-admin/logrotate/logrotate-3.15.1.ebuild b/app-admin/logrotate/logrotate-3.15.1.ebuild
index eef82c310b87..aa92d896ca49 100644
--- a/app-admin/logrotate/logrotate-3.15.1.ebuild
+++ b/app-admin/logrotate/logrotate-3.15.1.ebuild
@@ -7,7 +7,7 @@ inherit systemd
DESCRIPTION="Rotates, compresses, and mails system logs"
HOMEPAGE="https://github.com/logrotate/logrotate"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
diff --git a/app-admin/sysstat/sysstat-12.2.1.ebuild b/app-admin/sysstat/sysstat-12.2.1.ebuild
index 2763ca89c3cd..4b18a4f4786b 100644
--- a/app-admin/sysstat/sysstat-12.2.1.ebuild
+++ b/app-admin/sysstat/sysstat-12.2.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86"
IUSE="debug nls lm-sensors selinux static"
CDEPEND="
diff --git a/app-antivirus/Manifest.gz b/app-antivirus/Manifest.gz
index a9d23a6bbd29..0de0861ba182 100644
Binary files a/app-antivirus/Manifest.gz and b/app-antivirus/Manifest.gz differ
diff --git a/app-antivirus/clamav/clamav-0.102.1-r3.ebuild b/app-antivirus/clamav/clamav-0.102.1-r3.ebuild
index 4f9587695b3b..b067114b4b00 100644
--- a/app-antivirus/clamav/clamav-0.102.1-r3.ebuild
+++ b/app-antivirus/clamav/clamav-0.102.1-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.clamav.net/downloads/production/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
IUSE="bzip2 doc clamdtop clamsubmit iconv ipv6 libclamav-only libressl milter metadata-analysis-api selinux static-libs test uclibc xml"
RESTRICT="!test? ( test )"
diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index c91df7b9fae0..3d1ab6ace120 100644
Binary files a/app-arch/Manifest.gz and b/app-arch/Manifest.gz differ
diff --git a/app-arch/file-roller/Manifest b/app-arch/file-roller/Manifest
index 62f7af3ca11c..d60450099648 100644
--- a/app-arch/file-roller/Manifest
+++ b/app-arch/file-roller/Manifest
@@ -1,2 +1 @@
-DIST file-roller-3.32.2.tar.xz 850256 BLAKE2B 5e7f8fed74ff3ff87079753d3fb227cbb77c0a10b75995b84a6019e13434dd4bff16946d38c2b340c85f5dd7879692cc5edd4aa9471f30ea92d2a7fff5176296 SHA512 d1c1e08f12ce343c23c43816305f75c0f3a3f3df32316805864d7c39b5e85b5a00e04a355a0dd8001db8e01ae089daf3b72c3f38fda582795944a6be09451b2a
DIST file-roller-3.32.3.tar.xz 852808 BLAKE2B 939b931d7b179cc45ca3766dd122e2242e4de22b8c15f0942c31b5f9b5e8eed9d636122445d265539f9368f86d2efc10af161aaa046b3de6be05072d2b53004b SHA512 8256995f776524772936c6d60777c6c2668a610a672788a51ed83de1ae1c131b12373d2a918658f64f004757bb8c71b03edbf0c89776fcad6d64b4fc7fdb8e49
diff --git a/app-arch/file-roller/file-roller-3.32.2-r1.ebuild b/app-arch/file-roller/file-roller-3.32.2-r1.ebuild
deleted file mode 100644
index 6b9ff1f80b9f..000000000000
--- a/app-arch/file-roller/file-roller-3.32.2-r1.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit gnome.org gnome2-utils meson readme.gentoo-r1 xdg
-
-DESCRIPTION="Archive manager for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/FileRoller"
-
-LICENSE="GPL-2+ CC-BY-SA-3.0"
-SLOT="0"
-IUSE="libnotify nautilus packagekit"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
-
-# gdk-pixbuf used extensively in the source
-# cairo used in eggtreemultidnd.c
-# pango used in fr-window
-RDEPEND="
- >=app-arch/libarchive-3:=
- >=dev-libs/glib-2.36:2
- >=dev-libs/json-glib-0.14
- >=x11-libs/gtk+-3.13.2:3
- x11-libs/cairo
- x11-libs/gdk-pixbuf:2
- x11-libs/pango
- libnotify? ( >=x11-libs/libnotify-0.4.3:= )
- nautilus? ( >=gnome-base/nautilus-2.22.2 )
- packagekit? ( app-admin/packagekit-base )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
- dev-util/glib-utils
- dev-util/itstool
- >=sys-devel/gettext-0.19.8
- virtual/pkgconfig
-"
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="
-${PN} is a frontend for several archiving utilities. If you want a
-particular archive format support, see ${HOMEPAGE}
-and install the relevant package. For example:
-7-zip - app-arch/p7zip
-ace - app-arch/unace
-arj - app-arch/arj
-brotli - app-arch/brotli
-cpio - app-arch/cpio
-deb - app-arch/dpkg
-iso - app-cdr/cdrtools
-jar,zip - app-arch/zip and app-arch/unzip
-lha - app-arch/lha
-lzop - app-arch/lzop
-lz4 - app-arch/lz4
-rar - app-arch/unrar or app-arch/unar
-rpm - app-arch/rpm
-unstuff - app-arch/stuffit
-zoo - app-arch/zoo"
-
-src_prepare() {
- # File providing Gentoo package names for various archivers
- cp -v "${FILESDIR}"/3.32-packages.match data/packages.match || die
-
- xdg_src_prepare
-}
-
-src_configure() {
- local emesonargs=(
- -Drun-in-place=false
- $(meson_use nautilus nautilus-actions)
- $(meson_use libnotify notification)
- $(meson_use packagekit)
- -Dlibarchive=true
- )
- meson_src_configure
-}
-
-src_install() {
- meson_src_install
- readme.gentoo_create_doc
-}
-
-pkg_postinst() {
- xdg_pkg_postinst
- gnome2_schemas_update
- readme.gentoo_print_elog
-}
-
-pkg_postrm() {
- xdg_pkg_postrm
- gnome2_schemas_update
-}
diff --git a/app-arch/file-roller/file-roller-3.32.3.ebuild b/app-arch/file-roller/file-roller-3.32.3.ebuild
index ff8dd950b902..ded464fcbb6a 100644
--- a/app-arch/file-roller/file-roller-3.32.3.ebuild
+++ b/app-arch/file-roller/file-roller-3.32.3.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/FileRoller"
LICENSE="GPL-2+ CC-BY-SA-3.0"
SLOT="0"
IUSE="libnotify nautilus packagekit"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
# gdk-pixbuf used extensively in the source
# cairo used in eggtreemultidnd.c
diff --git a/app-arch/gnome-autoar/gnome-autoar-0.2.4.ebuild b/app-arch/gnome-autoar/gnome-autoar-0.2.4.ebuild
index 8169cf144556..84e96badd2a8 100644
--- a/app-arch/gnome-autoar/gnome-autoar-0.2.4.ebuild
+++ b/app-arch/gnome-autoar/gnome-autoar-0.2.4.ebuild
@@ -14,7 +14,7 @@ SLOT="0"
IUSE="gtk +introspection vala"
REQUIRED_USE="vala? ( introspection )"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
RDEPEND="
>=app-arch/libarchive-3.2.0
diff --git a/app-arch/libarchive/Manifest b/app-arch/libarchive/Manifest
index 16c2d36b7b2e..c39e2cf187c7 100644
--- a/app-arch/libarchive/Manifest
+++ b/app-arch/libarchive/Manifest
@@ -1,2 +1,3 @@
DIST libarchive-3.3.3.tar.gz 6535598 BLAKE2B 627949d24572b8345800e72a24d1e8d95cd0f19bb7fab70e2f36be011fee6f345eecfa9563640068b10888520aafdf30b1e3426b7e2743589cabd3ab5c270a22 SHA512 9d12b47d6976efa9f98e62c25d8b85fd745d4e9ca7b7e6d36bfe095dfe5c4db017d4e785d110f3758f5938dad6f1a1b009267fd7e82cb7212e93e1aea237bab7
DIST libarchive-3.4.0.tar.gz 6908093 BLAKE2B 6da5798ceabb542d8b877b3d672f6e6431ed7340ec0160a5d8cef28591b516b55d426002379eddc632a478bfd2f034a358f8552f55c9f066fd7f5c31c218b462 SHA512 2f9e2a551a6bcab56fb1a030b5d656df7299a3d151465aa02f0420d344d2fada49dee4755b3abff9095f62519e14dc9af8afa1695ecc6d5fdb4f0b28e6ede852
+DIST libarchive-3.4.1.tar.gz 6931920 BLAKE2B e1175cac67dd265be711005ff19dc16cf807cfd2f3f77f4530165adbc11bb33b58bdb28815b7d787414b8f4c3ec180a5607283618e5c319447a414141c89c19d SHA512 fa7e9e5c8c00cd7e98f0ff373c300771f0a87317bca031c3030bac29b96b02ab66cf34905147e4135824bf9cdfdd1dedf3032e93d6d706c9a11e968da1ed8dad
diff --git a/app-arch/libarchive/libarchive-3.4.1.ebuild b/app-arch/libarchive/libarchive-3.4.1.ebuild
new file mode 100644
index 000000000000..c4d0a5b1fc9f
--- /dev/null
+++ b/app-arch/libarchive/libarchive-3.4.1.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit libtool multilib-minimal toolchain-funcs
+
+DESCRIPTION="Multi-format archive and compression library"
+HOMEPAGE="https://www.libarchive.org/"
+SRC_URI="https://www.libarchive.org/downloads/${P}.tar.gz"
+
+LICENSE="BSD BSD-2 BSD-4 public-domain"
+SLOT="0/13"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="acl blake2 +bzip2 +e2fsprogs expat +iconv kernel_linux libressl lz4 +lzma lzo nettle static-libs +threads xattr +zlib zstd"
+
+RDEPEND="
+ acl? ( virtual/acl[${MULTILIB_USEDEP}] )
+ blake2? ( app-crypt/libb2[${MULTILIB_USEDEP}] )
+ bzip2? ( app-arch/bzip2[${MULTILIB_USEDEP}] )
+ expat? ( dev-libs/expat[${MULTILIB_USEDEP}] )
+ !expat? ( dev-libs/libxml2[${MULTILIB_USEDEP}] )
+ iconv? ( virtual/libiconv[${MULTILIB_USEDEP}] )
+ kernel_linux? (
+ xattr? ( sys-apps/attr[${MULTILIB_USEDEP}] )
+ )
+ !libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
+ libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
+ lz4? ( >=app-arch/lz4-0_p131:0=[${MULTILIB_USEDEP}] )
+ lzma? ( app-arch/xz-utils[threads=,${MULTILIB_USEDEP}] )
+ lzo? ( >=dev-libs/lzo-2[${MULTILIB_USEDEP}] )
+ nettle? ( dev-libs/nettle:0=[${MULTILIB_USEDEP}] )
+ zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )
+ zstd? ( app-arch/zstd[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+ kernel_linux? (
+ virtual/os-headers
+ e2fsprogs? ( sys-fs/e2fsprogs )
+ )"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-3.3.3-libressl.patch
+)
+
+# Various test problems, starting with the fact that sandbox
+# explodes on long paths. https://bugs.gentoo.org/598806
+RESTRICT="test"
+
+src_prepare() {
+ default
+ elibtoolize # is required for Solaris sol2_ld linker fix
+}
+
+multilib_src_configure() {
+ export ac_cv_header_ext2fs_ext2_fs_h=$(usex e2fsprogs) #354923
+
+ local myconf=(
+ $(use_enable acl)
+ $(use_enable static-libs static)
+ $(use_enable xattr)
+ $(use_with blake2 libb2)
+ $(use_with bzip2 bz2lib)
+ $(use_with expat)
+ $(use_with !expat xml2)
+ $(use_with iconv)
+ $(use_with lz4)
+ $(use_with lzma)
+ $(use_with lzo lzo2)
+ $(use_with nettle)
+ $(use_with zlib)
+ $(use_with zstd)
+
+ # Windows-specific
+ --without-cng
+ )
+ if multilib_is_native_abi ; then
+ myconf+=(
+ --enable-bsdcat=$(tc-is-static-only && echo static || echo shared)
+ --enable-bsdcpio=$(tc-is-static-only && echo static || echo shared)
+ --enable-bsdtar=$(tc-is-static-only && echo static || echo shared)
+ )
+ else
+ myconf+=(
+ --disable-bsdcat
+ --disable-bsdcpio
+ --disable-bsdtar
+ )
+ fi
+
+ ECONF_SOURCE="${S}" econf "${myconf[@]}"
+}
+
+multilib_src_compile() {
+ if multilib_is_native_abi ; then
+ emake
+ else
+ emake libarchive.la
+ fi
+}
+
+multilib_src_test() {
+ # Replace the default src_test so that it builds tests in parallel
+ multilib_is_native_abi && emake check
+}
+
+multilib_src_install() {
+ if multilib_is_native_abi ; then
+ emake DESTDIR="${D}" install
+
+ # Create symlinks for FreeBSD
+ if ! use prefix && [[ ${CHOST} == *-freebsd* ]]; then
+ # Exclude cat for the time being #589876
+ for bin in cpio tar; do
+ dosym bsd${bin} /usr/bin/${bin}
+ echo '.so bsd${bin}.1' > "${T}"/${bin}.1
+ doman "${T}"/${bin}.1
+ done
+ fi
+ else
+ local install_targets=(
+ install-includeHEADERS
+ install-libLTLIBRARIES
+ install-pkgconfigDATA
+ )
+ emake DESTDIR="${D}" "${install_targets[@]}"
+ fi
+
+ # Libs.private: should be used from libarchive.pc instead
+ find "${ED}" -type f -name "*.la" -delete || die
+}
+
+multilib_src_install_all() {
+ cd "${S}" || die
+ einstalldocs
+}
diff --git a/app-arch/lzma/lzma-9.20-r1.ebuild b/app-arch/lzma/lzma-9.20-r1.ebuild
index 3be4cdb989e9..7f1a8de904eb 100644
--- a/app-arch/lzma/lzma-9.20-r1.ebuild
+++ b/app-arch/lzma/lzma-9.20-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/sevenzip/${MY_P}.tar.bz2 -> ${P}.tar.bz2"
LICENSE="public-domain"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~mips ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~amd64 ~arm ~ia64 ~mips ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE="doc"
S=${WORKDIR}
diff --git a/app-backup/Manifest.gz b/app-backup/Manifest.gz
index b45e1c478efc..9a3b287f61e0 100644
Binary files a/app-backup/Manifest.gz and b/app-backup/Manifest.gz differ
diff --git a/app-backup/restic/restic-0.9.6.ebuild b/app-backup/restic/restic-0.9.6.ebuild
index 86433cdc3291..f3cbd14139e5 100644
--- a/app-backup/restic/restic-0.9.6.ebuild
+++ b/app-backup/restic/restic-0.9.6.ebuild
@@ -12,7 +12,7 @@ EGO_PN="github.com/restic/restic"
LICENSE="Apache-2.0 BSD BSD-2 LGPL-3-with-linking-exception MIT"
SLOT="0"
-KEYWORDS="~amd64 ~arm x86"
+KEYWORDS="amd64 arm x86"
IUSE=""
RDEPEND="sys-fs/fuse:0"
diff --git a/app-benchmarks/Manifest.gz b/app-benchmarks/Manifest.gz
index 9ba494ca7172..387852bd1ee9 100644
Binary files a/app-benchmarks/Manifest.gz and b/app-benchmarks/Manifest.gz differ
diff --git a/app-benchmarks/geekbench/geekbench-5.1.0.ebuild b/app-benchmarks/geekbench/geekbench-5.1.0.ebuild
index 7349eb155416..b82e245d5d5a 100644
--- a/app-benchmarks/geekbench/geekbench-5.1.0.ebuild
+++ b/app-benchmarks/geekbench/geekbench-5.1.0.ebuild
@@ -7,7 +7,7 @@ DESCRIPTION="A Cross-Platform Benchmark for Android, iOS, Linux, MacOS and Windo
HOMEPAGE="https://www.geekbench.com/"
SRC_URI="https://cdn.geekbench.com/Geekbench-${PV}-Linux.tar.gz"
-KEYWORDS="-* amd64"
+KEYWORDS="-* amd64 x86"
LICENSE="geekbench"
SLOT="5"
diff --git a/app-cdr/Manifest.gz b/app-cdr/Manifest.gz
index 61e8cd28fc12..5bcfdbf19161 100644
Binary files a/app-cdr/Manifest.gz and b/app-cdr/Manifest.gz differ
diff --git a/app-cdr/isomaster/files/isomaster-1.3.14-include-path.patch b/app-cdr/isomaster/files/isomaster-1.3.14-include-path.patch
new file mode 100644
index 000000000000..520a355e595f
--- /dev/null
+++ b/app-cdr/isomaster/files/isomaster-1.3.14-include-path.patch
@@ -0,0 +1,25 @@
+From 50113aa660d2a867f3f8bfd67e1ba601c8b5294a Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping
+Date: Mon, 27 Jan 2020 23:33:49 +0100
+Subject: [PATCH] Add missing (Gentoo specific) include path for iniparser 4
+
+---
+ Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index 8f4f23b..124a035 100644
+--- a/Makefile
++++ b/Makefile
+@@ -65,7 +65,7 @@ CPPFLAGS += -DICONPATH=\"$(ICONPATH)\" -DLOCALEDIR=\"$(LOCALEDIR)\" -DDEFAULT_E
+ CPPFLAGS += -D_FILE_OFFSET_BITS=64
+
+ ifdef USE_SYSTEM_INIPARSER
+-CPPFLAGS += -DUSE_SYSTEM_INIPARSER=$(USE_SYSTEM_INIPARSER)
++CPPFLAGS += -DUSE_SYSTEM_INIPARSER=$(USE_SYSTEM_INIPARSER) -I/usr/include/iniparser4
+ endif
+
+ OBJECTS = isomaster.o window.o browser.o fsbrowser.o isobrowser.o error.o about.o settings.o boot.o editfile.o
+--
+2.24.1
+
diff --git a/app-cdr/isomaster/isomaster-1.3.14.ebuild b/app-cdr/isomaster/isomaster-1.3.14.ebuild
index c30620f0aa1b..cbe941cb2b92 100644
--- a/app-cdr/isomaster/isomaster-1.3.14.ebuild
+++ b/app-cdr/isomaster/isomaster-1.3.14.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
inherit toolchain-funcs xdg-utils
@@ -20,6 +20,10 @@ DEPEND="${RDEPEND}
virtual/pkgconfig
nls? ( >=sys-devel/gettext-0.19.1 )" # bug 512448
+PATCHES=(
+ "${FILESDIR}"/${P}-include-path.patch
+)
+
pkg_setup() {
myisoconf=(
DEFAULT_EDITOR=leafpad
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index 068234c7cd4b..428d8dc06276 100644
Binary files a/app-crypt/Manifest.gz and b/app-crypt/Manifest.gz differ
diff --git a/app-crypt/gcr/gcr-3.34.0-r1.ebuild b/app-crypt/gcr/gcr-3.34.0-r1.ebuild
index 8d068a967d3f..45860e2fe1a0 100644
--- a/app-crypt/gcr/gcr-3.34.0-r1.ebuild
+++ b/app-crypt/gcr/gcr-3.34.0-r1.ebuild
@@ -18,7 +18,7 @@ IUSE="debug gtk +introspection +vala"
RESTRICT="!test? ( test )"
REQUIRED_USE="vala? ( introspection )"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
COMMON_DEPEND="
>=app-crypt/p11-kit-0.19
diff --git a/app-crypt/mcrypt/metadata.xml b/app-crypt/mcrypt/metadata.xml
index 8218d5403d95..69ebb1dfed9f 100644
--- a/app-crypt/mcrypt/metadata.xml
+++ b/app-crypt/mcrypt/metadata.xml
@@ -2,7 +2,7 @@
-
- mcrypt
-
+
+ mcrypt
+
diff --git a/app-crypt/seahorse-sharing/Manifest b/app-crypt/seahorse-sharing/Manifest
index 5a984d96488e..e29bc69a26ce 100644
--- a/app-crypt/seahorse-sharing/Manifest
+++ b/app-crypt/seahorse-sharing/Manifest
@@ -1,2 +1 @@
-DIST seahorse-sharing-3.8.0_p20151117.tar.gz 496497 BLAKE2B 5107eb37c57d8311390399fda59d8df76f59afc6b21f107dfb1cb38dd6c68ea25bda619b1898637ff009c0e9f7617b0557b86f0194ee2c8704d804aa9f8827f9 SHA512 aa43240040f637e3c79c08f07620a92e5e76e81b758c939a8eee5bf43cdd32657f85d4b9d7440401e092ef4d556849ba0a64dc9d5a83e708bc84d9a2d7baf01c
DIST seahorse-sharing-58db1e5b8615d74afaa5d888237ef6556368147b.tar.gz 101549 BLAKE2B c0ac487e826426c5f0a7fcfdc1078bd9b96442751821ac6597da3ffae3f5ab06b3fa4c4cf514536f9b8375f2a36529768942e6b15d6f4ea57ada543e7d95586c SHA512 6b91a8498f6065a0ddfcc53edf96dbf7720f82a73bc904ce6af18b1f52b559459e21ad9c3d550fc24730e3200c2ff9acaa9bdfe64b5bd83939b55db97ea116d9
diff --git a/app-crypt/seahorse-sharing/seahorse-sharing-3.8.0_p20151117.ebuild b/app-crypt/seahorse-sharing/seahorse-sharing-3.8.0_p20151117.ebuild
deleted file mode 100644
index 3abf12384403..000000000000
--- a/app-crypt/seahorse-sharing/seahorse-sharing-3.8.0_p20151117.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-GCONF_DEBUG="yes" # disable asserts
-
-inherit gnome2
-
-DESCRIPTION="Daemon for PGP public key sharing using DNS-SD and HKP"
-HOMEPAGE="https://projects.gnome.org/seahorse/"
-SRC_URI="https://dev.gentoo.org/~eva/distfiles/${PN}/${P//_p*}-19-g61de83c.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-COMMON_DEPEND="
- app-crypt/seahorse
- dev-libs/glib:2
- >=net-dns/avahi-0.6:=[dbus]
- net-libs/libsoup:2.4
- >=x11-libs/gtk+-3:3
-
- >=app-crypt/gpgme-1
- >=app-crypt/gnupg-1.4
-"
-RDEPEND="${COMMON_DEPEND}
- !=dev-util/intltool-0.35
- sys-devel/gettext
- virtual/pkgconfig
-"
-
-S="${WORKDIR}/${PN}-3.8.0"
-
-src_prepare() {
- DOCS="AUTHORS MAINTAINERS NEWS" # ChangeLog has nothing useful
- # Do not pass --enable-tests to configure - package has no tests
-
- gnome2_src_prepare
-
- # Drop stupid CFLAGS
- # FIXME: doing configure.ac triggers maintainer mode rebuild
- sed -e 's:$CFLAGS -g -O0:$CFLAGS:' \
- -i configure || die "sed failed"
-}
-
-pkg_postinst() {
- gnome2_pkg_postinst
-
- if ! has_version net-dns/avahi && \
- ! rc-config list default | grep -q "avahi-daemon" ; then
- elog "To use ${PN}, the Avahi daemon must be running. On an OpenRC"
- elog "system, you can start the Avahi daemon by"
- elog "# /etc/init.d/avahi-daemon start"
- elog "To start Avahi automatically, add it to the default runlevel:"
- elog "# rc-update add avahi-daemon default"
- fi
-}
diff --git a/app-crypt/seahorse-sharing/seahorse-sharing-3.8.0_p20181216.ebuild b/app-crypt/seahorse-sharing/seahorse-sharing-3.8.0_p20181216.ebuild
index 7f956d83096d..2fb2f6507630 100644
--- a/app-crypt/seahorse-sharing/seahorse-sharing-3.8.0_p20181216.ebuild
+++ b/app-crypt/seahorse-sharing/seahorse-sharing-3.8.0_p20181216.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://gitlab.gnome.org/GNOME/${PN}/-/archive/master/${PN}-58db1e5b861
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
IUSE=""
COMMON_DEPEND="
diff --git a/app-doc/Manifest.gz b/app-doc/Manifest.gz
index 0d289cda9412..57971d83fad4 100644
Binary files a/app-doc/Manifest.gz and b/app-doc/Manifest.gz differ
diff --git a/app-doc/devmanual/devmanual-9999.ebuild b/app-doc/devmanual/devmanual-9999.ebuild
index 8ad5f06a357e..0cd5087804b2 100644
--- a/app-doc/devmanual/devmanual-9999.ebuild
+++ b/app-doc/devmanual/devmanual-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -16,12 +16,16 @@ else
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-macos"
fi
-LICENSE="CC-BY-SA-3.0"
+LICENSE="CC-BY-SA-4.0"
SLOT="0"
IUSE="+fallback"
-BDEPEND="dev-libs/libxslt
- media-gfx/imagemagick[truetype,svg,png]"
+BDEPEND="dev-libs/libxml2
+ dev-libs/libxslt
+ gnome-base/librsvg
+ media-fonts/open-sans"
+
+PATCHES=( "${FILESDIR}"/${PN}-eclasses.patch )
src_prepare() {
default
@@ -29,22 +33,18 @@ src_prepare() {
}
src_compile() {
- # Imagemagick uses inkscape (if present) to delegate
- # svg conversions.
- # Inkscape uses g_get_user_config_dir () which in turn
- # uses XDG_CONFIG_HOME to get the config directory for this
- # user. See bug 463380
- export XDG_CONFIG_HOME="${T}/inkscape_home"
- emake
+ emake build
+ use fallback || emake documents.js
}
src_install() {
# clean out XML/XSL before installing
find . \( \
-iname '*.xml' -o \
+ -iname '*.dtd' -o \
-iname '*.xsl' -o \
-iname '*.svg' \) -delete || die
- rm -r README.md xsl LICENSE Makefile || die
+ rm -r bin xsl .git* LICENSE Makefile README.md || die
local HTML_DOCS=( . )
einstalldocs
diff --git a/app-doc/devmanual/files/devmanual-eclasses.patch b/app-doc/devmanual/files/devmanual-eclasses.patch
new file mode 100644
index 000000000000..88b2322c25b6
--- /dev/null
+++ b/app-doc/devmanual/files/devmanual-eclasses.patch
@@ -0,0 +1,20 @@
+The offline version doesn't generate eclass manpages.
+Add a dummy file, otherwise internal links would be broken.
+
+--- /dev/null
++++ b/eclass-reference/text.xml
+@@ -0,0 +1,14 @@
++
++
++
++Eclass Reference
++
++
++
++The offline version of the devmanual does not include the documentation for the
++eclasses. If you need it, emerge app-doc/eclass-manpages.
++
++
++
++
++
diff --git a/app-doc/devmanual/files/devmanual-fallback.patch b/app-doc/devmanual/files/devmanual-fallback.patch
index 789451d13b2b..76cefe2547e2 100644
--- a/app-doc/devmanual/files/devmanual-fallback.patch
+++ b/app-doc/devmanual/files/devmanual-fallback.patch
@@ -3,20 +3,17 @@ https://bugs.gentoo.org/617724
--- a/devbook.xsl
+++ b/devbook.xsl
-@@ -439,11 +439,9 @@
- ../
-
+@@ -451,8 +451,7 @@
--
-+
-
-
++
+
-
-@@ -476,9 +474,6 @@
+@@ -486,9 +485,6 @@
-@@ -566,8 +561,6 @@
+@@ -613,9 +609,6 @@
-
-
-
-