diff --git a/Manifest.files.gz b/Manifest.files.gz
index 81bb00bc58d7..6265a5250af4 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 f0a5c088bf0d..2be8ba956196 100644
Binary files a/acct-group/Manifest.gz and b/acct-group/Manifest.gz differ
diff --git a/virtual/libgudev/Manifest b/acct-group/tomcat/Manifest
similarity index 100%
rename from virtual/libgudev/Manifest
rename to acct-group/tomcat/Manifest
diff --git a/acct-group/tomcat/metadata.xml b/acct-group/tomcat/metadata.xml
new file mode 100644
index 000000000000..0fa782095498
--- /dev/null
+++ b/acct-group/tomcat/metadata.xml
@@ -0,0 +1,8 @@
+
+
+
+
+ java@gentoo.org
+ Gentoo Java Project
+
+
diff --git a/acct-group/tomcat/tomcat-0.ebuild b/acct-group/tomcat/tomcat-0.ebuild
new file mode 100644
index 000000000000..ddef1fa45694
--- /dev/null
+++ b/acct-group/tomcat/tomcat-0.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for Apache Tomcat"
+ACCT_GROUP_ID=265
diff --git a/acct-group/zabbix/Manifest b/acct-group/zabbix/Manifest
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/acct-group/zabbix/metadata.xml b/acct-group/zabbix/metadata.xml
new file mode 100644
index 000000000000..11287d1296cc
--- /dev/null
+++ b/acct-group/zabbix/metadata.xml
@@ -0,0 +1,8 @@
+
+
+
+
+ fordfrog@gentoo.org
+ Miroslav Šulc
+
+
diff --git a/acct-group/zabbix/zabbix-0.ebuild b/acct-group/zabbix/zabbix-0.ebuild
new file mode 100644
index 000000000000..73561e628222
--- /dev/null
+++ b/acct-group/zabbix/zabbix-0.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for Zabbix"
+ACCT_GROUP_ID=329
diff --git a/acct-user/Manifest.gz b/acct-user/Manifest.gz
index ea87ddca2bfc..ced9c166a540 100644
Binary files a/acct-user/Manifest.gz and b/acct-user/Manifest.gz differ
diff --git a/acct-user/tomcat/Manifest b/acct-user/tomcat/Manifest
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/acct-user/tomcat/metadata.xml b/acct-user/tomcat/metadata.xml
new file mode 100644
index 000000000000..0fa782095498
--- /dev/null
+++ b/acct-user/tomcat/metadata.xml
@@ -0,0 +1,8 @@
+
+
+
+
+ java@gentoo.org
+ Gentoo Java Project
+
+
diff --git a/acct-user/tomcat/tomcat-0.ebuild b/acct-user/tomcat/tomcat-0.ebuild
new file mode 100644
index 000000000000..fd230aa19e0b
--- /dev/null
+++ b/acct-user/tomcat/tomcat-0.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for Apache Tomcat"
+ACCT_USER_ID=265
+ACCT_USER_GROUPS=( "${PN}" )
+
+acct-user_add_deps
diff --git a/acct-user/zabbix/Manifest b/acct-user/zabbix/Manifest
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/acct-user/zabbix/metadata.xml b/acct-user/zabbix/metadata.xml
new file mode 100644
index 000000000000..11287d1296cc
--- /dev/null
+++ b/acct-user/zabbix/metadata.xml
@@ -0,0 +1,8 @@
+
+
+
+
+ fordfrog@gentoo.org
+ Miroslav Šulc
+
+
diff --git a/acct-user/zabbix/zabbix-0.ebuild b/acct-user/zabbix/zabbix-0.ebuild
new file mode 100644
index 000000000000..35b1bc820d1e
--- /dev/null
+++ b/acct-user/zabbix/zabbix-0.ebuild
@@ -0,0 +1,15 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for Zabbix"
+ACCT_USER_ID=329
+# see https://www.zabbix.com/documentation/current/manual/installation/install
+ACCT_USER_HOME=/var/lib/${PN}
+ACCT_USER_HOME_PERMS=770
+ACCT_USER_GROUPS=( "${PN}" )
+
+acct-user_add_deps
diff --git a/app-backup/Manifest.gz b/app-backup/Manifest.gz
index 513920ca5b85..716a0853ee0a 100644
Binary files a/app-backup/Manifest.gz and b/app-backup/Manifest.gz differ
diff --git a/app-backup/amanda/amanda-3.5.1-r2.ebuild b/app-backup/amanda/amanda-3.5.1-r3.ebuild
similarity index 70%
rename from app-backup/amanda/amanda-3.5.1-r2.ebuild
rename to app-backup/amanda/amanda-3.5.1-r3.ebuild
index 98bcf0c20ae9..81acd43577df 100644
--- a/app-backup/amanda/amanda-3.5.1-r2.ebuild
+++ b/app-backup/amanda/amanda-3.5.1-r3.ebuild
@@ -72,7 +72,6 @@ AMANDA_PORTS_UDP AMANDA_PORTS_TCP AMANDA_PORTS_BOTH AMANDA_PORTS
AMANDA_CONFIG_NAME AMANDA_TMPDIR"
amanda_variable_setup() {
-
# Setting vars
local currentamanda
@@ -86,32 +85,31 @@ amanda_variable_setup() {
# This installs Amanda, with the server. However, it could be a client,
# just specify an alternate server name in AMANDA_SERVER.
- [[ -z "${AMANDA_SERVER}" ]] && AMANDA_SERVER="${HOSTNAME}"
- [[ -z "${AMANDA_SERVER_TAPE}" ]] && AMANDA_SERVER_TAPE="${AMANDA_SERVER}"
- [[ -z "${AMANDA_SERVER_TAPE_DEVICE}" ]] && AMANDA_SERVER_TAPE_DEVICE="/dev/nst0"
- [[ -z "${AMANDA_SERVER_INDEX}" ]] && AMANDA_SERVER_INDEX="${AMANDA_SERVER}"
- [[ -z "${AMANDA_TAR_LISTDIR}" ]] && AMANDA_TAR_LISTDIR=${AMANDA_USER_HOMEDIR}/tar-lists
- [[ -z "${AMANDA_CONFIG_NAME}" ]] && AMANDA_CONFIG_NAME=DailySet1
- [[ -z "${AMANDA_TMPDIR}" ]] && AMANDA_TMPDIR=/var/tmp/amanda
- [[ -z "${AMANDA_DBGDIR}" ]] && AMANDA_DBGDIR="$AMANDA_TMPDIR"
+ : ${AMANDA_SERVER:=${HOSTNAME}}
+ : ${AMANDA_SERVER_TAPE:=${AMANDA_SERVER}}
+ : ${AMANDA_SERVER_TAPE_DEVICE:="${EPREFIX}"/dev/nst0}
+ : ${AMANDA_SERVER_INDEX:=${AMANDA_SERVER}}
+ : ${AMANDA_TAR_LISTDIR:=${AMANDA_USER_HOMEDIR}/tar-lists}
+ : ${AMANDA_CONFIG_NAME:=DailySet1}
+ : ${AMANDA_TMPDIR:="${EPREFIX}"/var/tmp/amanda}
+ : ${AMANDA_DBGDIR:=${AMANDA_TMPDIR}}
# These are left empty by default
- [[ -z "${AMANDA_PORTS_UDP}" ]] && AMANDA_PORTS_UDP=
- [[ -z "${AMANDA_PORTS_TCP}" ]] && AMANDA_PORTS_TCP=
- [[ -z "${AMANDA_PORTS_BOTH}" ]] && AMANDA_PORTS_BOTH=
- [[ -z "${AMANDA_PORTS}" ]] && AMANDA_PORTS=
+ : ${AMANDA_PORTS_UDP:=""}
+ : ${AMANDA_PORTS_TCP:=""}
+ : ${AMANDA_PORTS_BOTH:=""}
+ : ${AMANDA_PORTS:=""}
# What tar to use
- [[ -z "${AMANDA_TAR}" ]] && AMANDA_TAR=/bin/tar
+ : ${AMANDA_TAR:=/bin/tar}
# Now pull in the old stuff
- if [[ -f "${EROOT}${ENVDIR}/${ENVDFILE}" ]]; then
+ if [[ -f ${EROOT}${ENVDIR}/${ENVDFILE} ]]; then
# We don't just source it as we don't want everything in there.
eval $(egrep "^AMANDA_" "${EROOT}${ENVDIR}/${ENVDFILE}" | grep -v '^AMANDA_ENV_SETTINGS')
fi
# Re-apply the new settings if any
- [ -n "${currentamanda}" ] && eval $(echo "${currentamanda}")
-
+ [[ -n ${currentamanda} ]] && eval $(echo "${currentamanda}")
}
pkg_setup() {
@@ -119,7 +117,7 @@ pkg_setup() {
# If USE=minimal, give out a warning, if AMANDA_SERVER is not set to
# another host than HOSTNAME.
- if use minimal && [ "${AMANDA_SERVER}" = "${HOSTNAME}" ] ; then
+ if use minimal && [[ ${AMANDA_SERVER} == ${HOSTNAME} ]]; then
elog "You are installing a client-only version of Amanda."
elog "You should set the variable \$AMANDA_SERVER to point at your"
elog "Amanda-tape-server, otherwise you will have to specify its name"
@@ -132,7 +130,7 @@ pkg_setup() {
src_unpack() {
# we do not want the perl src_unpack
- default_src_unpack
+ default
}
src_prepare() {
@@ -159,14 +157,14 @@ src_prepare() {
local i # our iterator
local sedexpr # var for sed expr
sedexpr=''
- for i in ${ENV_SETTINGS_AMANDA} ; do
+ for i in ${ENV_SETTINGS_AMANDA}; do
local val
eval "val=\"\${${i}}\""
sedexpr="${sedexpr}s|__${i}__|${val}|g;"
done
# now apply the sed expr
- for i in "${FILESDIR}"/amanda-* ; do
+ for i in "${FILESDIR}"/amanda-*; do
sed -re "${sedexpr}" <"${i}" >"${MYFILESDIR}/`basename ${i}`" || die
done
@@ -188,126 +186,155 @@ src_configure() {
addpredict /run/blkid
addpredict /etc/blkid.tab
- [ ! -f "${TMPENVFILE}" ] && die "Variable setting file (${TMPENVFILE}) should exist!"
+ [[ ! -f ${TMPENVFILE} ]] && die "Variable setting file (${TMPENVFILE}) should exist!"
source "${TMPENVFILE}"
- local myconf
+ local myconf=()
einfo "Using ${AMANDA_SERVER_TAPE} for tape server."
- myconf="${myconf} --with-tape-server=${AMANDA_SERVER_TAPE}"
+ myconf+=( --with-tape-server="${AMANDA_SERVER_TAPE}" )
einfo "Using ${AMANDA_SERVER_TAPE_DEVICE} for tape server."
- myconf="${myconf} --with-tape-device=${AMANDA_SERVER_TAPE_DEVICE}"
+ myconf+=( --with-tape-device="${AMANDA_SERVER_TAPE_DEVICE}" )
einfo "Using ${AMANDA_SERVER_INDEX} for index server."
- myconf="${myconf} --with-index-server=${AMANDA_SERVER_INDEX}"
+ myconf+=( --with-index-server="${AMANDA_SERVER_INDEX}" )
einfo "Using ${AMANDA_USER_NAME} for amanda user."
- myconf="${myconf} --with-user=${AMANDA_USER_NAME}"
+ myconf+=( --with-user="${AMANDA_USER_NAME}" )
einfo "Using ${AMANDA_GROUP_NAME} for amanda group."
- myconf="${myconf} --with-group=${AMANDA_GROUP_NAME}"
+ myconf+=( --with-group="${AMANDA_GROUP_NAME}" )
einfo "Using ${AMANDA_TAR} as Tar implementation."
- myconf="${myconf} --with-gnutar=${AMANDA_TAR}"
+ myconf+=( --with-gnutar="${AMANDA_TAR}" )
einfo "Using ${AMANDA_TAR_LISTDIR} as tar listdir."
- myconf="${myconf} --with-gnutar-listdir=${AMANDA_TAR_LISTDIR}"
+ myconf+=( --with-gnutar-listdir="${AMANDA_TAR_LISTDIR}" )
einfo "Using ${AMANDA_CONFIG_NAME} as default config name."
- myconf="${myconf} --with-config=${AMANDA_CONFIG_NAME}"
+ myconf+=( --with-config="${AMANDA_CONFIG_NAME}" )
einfo "Using ${AMANDA_TMPDIR} as Amanda temporary directory."
- myconf="${myconf} --with-tmpdir=${AMANDA_TMPDIR}"
+ myconf+=( --with-tmpdir="${AMANDA_TMPDIR}" )
- if [ -n "${AMANDA_PORTS_UDP}" ] && [ -n "${AMANDA_PORTS_TCP}" ] && [ -z "${AMANDA_PORTS_BOTH}" ] ; then
+ if [[ -n ${AMANDA_PORTS_UDP} && -n ${AMANDA_PORTS_TCP} && -z ${AMANDA_PORTS_BOTH} ]]; then
eerror "If you want _both_ UDP and TCP ports, please use only the"
eerror "AMANDA_PORTS environment variable for identical ports, or set"
eerror "AMANDA_PORTS_BOTH."
die "Bad port setup!"
fi
- if [ -n "${AMANDA_PORTS_UDP}" ]; then
+ if [[ -n ${AMANDA_PORTS_UDP} ]]; then
einfo "Using UDP ports ${AMANDA_PORTS_UDP/,/-}"
- myconf="${myconf} --with-udpportrange=${AMANDA_PORTS_UDP}"
+ myconf+=( --with-udpportrange="${AMANDA_PORTS_UDP}" )
fi
- if [ -n "${AMANDA_PORTS_TCP}" ]; then
+ if [[ -n ${AMANDA_PORTS_TCP} ]]; then
einfo "Using TCP ports ${AMANDA_PORTS_TCP/,/-}"
- myconf="${myconf} --with-tcpportrange=${AMANDA_PORTS_TCP}"
+ myconf+=( --with-tcpportrange="${AMANDA_PORTS_TCP}" )
fi
- if [ -n "${AMANDA_PORTS}" ]; then
+ if [[ -n ${AMANDA_PORTS} ]]; then
einfo "Using ports ${AMANDA_PORTS/,/-}"
- myconf="${myconf} --with-portrange=${AMANDA_PORTS}"
+ myconf+=( --with-portrange="${AMANDA_PORTS}" )
fi
# Extras
# Speed option
- myconf="${myconf} --with-buffered-dump"
+ myconf+=( --with-buffered-dump )
# "debugging" in the configuration is NOT debug in the conventional sense.
# It is actually just useful output in the application, and should remain
# enabled. There are some cases of breakage with MTX tape changers as of
# 2.5.1p2 that it exposes when turned off as well.
- myconf="${myconf} --with-debugging"
+ myconf+=( --with-debugging )
# Where to put our files
- myconf="${myconf} --localstatedir=${AMANDA_USER_HOMEDIR}"
+ myconf+=( --localstatedir="${AMANDA_USER_HOMEDIR}" )
# Samba support
- myconf="${myconf} $(use_with samba smbclient /usr/bin/smbclient)"
+ myconf+=( $(use_with samba smbclient /usr/bin/smbclient) )
# Support for BSD, SSH, BSDUDP, BSDTCP security methods all compiled in by
# default
- myconf="${myconf} --with-bsd-security"
- myconf="${myconf} --with-ssh-security"
- myconf="${myconf} --with-bsdudp-security"
- myconf="${myconf} --with-bsdtcp-security"
+ myconf+=( --with-bsd-security )
+ myconf+=( --with-ssh-security )
+ myconf+=( --with-bsdudp-security )
+ myconf+=( --with-bsdtcp-security )
# kerberos-security mechanism version 5
- myconf="${myconf} $(use_with kerberos krb5-security)"
+ myconf+=( $(use_with kerberos krb5-security) )
# Amazon S3 support
- myconf="${myconf} `use_enable s3 s3-device`"
+ myconf+=( $(use_enable s3 s3-device) )
# libcurl is required for S3 but otherwise optional
if ! use s3; then
- myconf="${myconf} $(use_with curl libcurl)"
+ myconf+=( $(use_with curl libcurl) )
fi
# Client only, as requested in bug #127725
- if use minimal ; then
- myconf="${myconf} --without-server"
+ if use minimal; then
+ myconf+=( --without-server )
else
# amplot
- myconf="${myconf} $(use_with gnuplot)"
+ myconf+=( $(use_with gnuplot) )
fi
# IPv6 fun.
- myconf="${myconf} `use_with ipv6`"
+ myconf+=( $(use_with ipv6) )
# This is to prevent the IPv6-is-working test
# As the test fails on binpkg build hosts with no IPv6.
use ipv6 && export amanda_cv_working_ipv6=yes
# I18N
- myconf="${myconf} `use_enable nls`"
+ myconf+=( $(use_enable nls) )
# Bug #296634: Perl location
perl_set_version
- myconf="${myconf} --with-amperldir=${VENDOR_LIB}"
+ myconf+=( --with-amperldir="${VENDOR_LIB}" )
# Bug 296633: --disable-syntax-checks
# Some tests are not safe for production systems
- myconf="${myconf} --disable-syntax-checks"
+ myconf+=( --disable-syntax-checks )
# build manpages
- myconf="${myconf} --enable-manpage-build"
+ myconf+=( --enable-manpage-build )
# Bug #636262
- myconf="${myconf} $(use_with ndmp ndmp)"
+ myconf+=( $(use_with ndmp ndmp) )
# bug #483120
tc-export AR
econf \
+ --disable-static \
$(use_with readline) \
- ${myconf}
+ "${myconf[@]}"
}
src_compile() {
# Again, do not want the perl-module src_compile
- default_src_compile
+ default
+}
+
+# We do not want the perl-module tests.
+src_test() {
+ default
+}
+
+# We have had reports of amanda file permissions getting screwed up.
+# Losing setuid, becoming too lax etc.
+# ONLY root and users in the amanda group should be able to run these binaries!
+amanda_permissions_fix() {
+ local root="$1"
+ [[ -z ${root} ]] && die "Failed to pass root argument to amanda_permissions_fix!"
+ local i le=/usr/libexec/amanda
+ for i in "${le}"/calcsize "${le}"/killpgrp "${le}"/rundump "${le}"/runtar; do
+ [[ -e ${root}/${i} ]] || continue
+ chown root:${AMANDA_GROUP_NAME} "${root}"/${i} || die
+ chmod u=srwx,g=rx,o= "${root}"/${i} || die
+ done
+
+ # amanda-security.conf is a config file with similar requirements:
+ # writable only by root
+ # world-readable
+ # 3.3.9: introduced in /etc/amanda-security.conf
+ # 3.4.2: moved to /etc/amanda/amanda-security.conf
+ f=/etc/amanda/amanda-security.conf
+ chown root:root "${root}""${f}" || die
+ chmod u=rw,go=r "${root}""${f}" || die
}
src_install() {
- [ ! -f "${TMPENVFILE}" ] && die "Variable setting file (${TMPENVFILE}) should exist!"
+ [[ ! -f ${TMPENVFILE} ]] && die "Variable setting file (${TMPENVFILE}) should exist!"
source ${TMPENVFILE}
einfo "Doing stock install"
@@ -315,18 +342,14 @@ src_install() {
# Build the envdir file
# Don't forget this..
- einfo "Building environment file"
- (
- echo "# These settings are what was present in the environment when this"
- echo "# Amanda was compiled. Changing anything below this comment will"
- echo "# have no effect on your application, but it merely exists to"
- echo "# preserve them for your next emerge of Amanda"
- cat "${TMPENVFILE}" | sed "s,=\$,='',g"
- ) >> "${MYFILESDIR}/${ENVDFILE}"
-
- # Env.d
einfo "Installing environment config file"
- doenvd "${MYFILESDIR}/${ENVDFILE}"
+ newenvd - "${ENVDFILE}" <<- _EOF_
+ # These settings are what was present in the environment when this
+ # Amanda was compiled. Changing anything below this comment will
+ # have no effect on your application, but it merely exists to
+ # preserve them for your next emerge of Amanda
+ $(cat "${TMPENVFILE}" | sed "s,=\$,='',g")
+ _EOF_
einfo "Installing systemd service and socket files for Amanda"
systemd_dounit "${FILESDIR}"/amanda.socket
@@ -337,7 +360,7 @@ src_install() {
# Installing Amanda Xinetd Services Definition
einfo "Installing xinetd service file"
insinto /etc/xinetd.d
- if use minimal ; then
+ if use minimal; then
newins "${MYFILESDIR}"/amanda-xinetd-2.6.1_p1-client amanda
else
newins "${MYFILESDIR}"/amanda-xinetd-2.6.1_p1-server amanda
@@ -360,11 +383,11 @@ src_install() {
newins "${MYFILESDIR}"/amanda-profile .profile
insinto /etc/amanda
- doins "${S}/example/amanda-client.conf"
- if ! use minimal ; then
+ doins example/amanda-client.conf
+ if ! use minimal; then
insinto "/etc/amanda/${AMANDA_CONFIG_NAME}"
- doins "${S}/example/amanda.conf"
- doins "${S}/example/disklist"
+ doins example/amanda.conf
+ doins example/disklist
keepdir "${AMANDA_USER_HOMEDIR}/${AMANDA_CONFIG_NAME}/index"
fi
@@ -386,14 +409,14 @@ src_install() {
"${AMANDA_USER_HOMEDIR}/amanda" \
/etc/amanda
- if ! use minimal ; then
+ if ! use minimal; then
fperms 0700 \
"${AMANDA_USER_HOMEDIR}/${AMANDA_CONFIG_NAME}" \
/etc/amanda/${AMANDA_CONFIG_NAME}
fi
einfo "Setting setuid permissions"
- amanda_permissions_fix "${D}"
+ amanda_permissions_fix "${ED}"
# Relax permissions again
insopts -m0644
@@ -403,11 +426,11 @@ src_install() {
dodoc AUTHORS ChangeLog DEVELOPING NEWS README ReleaseNotes UPGRADING
# our inetd sample
einfo "Installing standard inetd sample"
- newdoc "${MYFILESDIR}/amanda-inetd.amanda.sample-2.6.0_p2-r2" amanda-inetd.amanda.sample
+ newdoc "${MYFILESDIR}"/amanda-inetd.amanda.sample-2.6.0_p2-r2 amanda-inetd.amanda.sample
# Amanda example configs
einfo "Installing example configurations"
- rm "${D}"/usr/share/amanda/{COPYRIGHT,ChangeLog,NEWS,ReleaseNotes} || die
- mv "${D}/usr/share/amanda/example" "${D}/usr/share/doc/${PF}/" || die
+ rm "${ED}"/usr/share/amanda/{COPYRIGHT,ChangeLog,NEWS,ReleaseNotes} || die
+ mv "${ED}"/usr/share/amanda/example "${ED}"/usr/share/doc/${PF}/ || die
docinto example1
newdoc "${FILESDIR}"/example_amanda.conf amanda.conf
newdoc "${FILESDIR}"/example_disklist-2.5.1_p3-r1 disklist
@@ -415,30 +438,29 @@ src_install() {
einfo "Cleaning up dud .la files"
perl_set_version
- find "${D}"/"${VENDOR_LIB}" -name '*.la' -delete || die
+
+ find "${ED}" -name '*.la' -delete || die
}
pkg_postinst() {
- [ ! -f "${TMPENVFILE}" -a "$MERGE_TYPE" == "binary" ] && \
- TMPENVFILE="${ROOT}${ENVDIR}/${ENVDFILE}"
- [ ! -f "${TMPENVFILE}" ] && die "Variable setting file (${TMPENVFILE}) should exist!"
+ [[ ! -f ${TMPENVFILE} && ${MERGE_TYPE} == "binary" ]] && TMPENVFILE="${EROOT}${ENVDIR}/${ENVDFILE}"
+ [[ ! -f ${TMPENVFILE} ]] && die "Variable setting file (${TMPENVFILE}) should exist!"
source "${TMPENVFILE}"
# Migration of amandates from /etc to $localstatedir/amanda
- if [ -f "${ROOT}/etc/amandates" -a \
- ! -f "${ROOT}/${AMANDA_USER_HOMEDIR}/amanda/amandates" ]; then
+ if [[ -f ${EROOT}/etc/amandates && ! -f ${EROOT}/${AMANDA_USER_HOMEDIR}/amanda/amandates ]]; then
einfo "Migrating amandates from /etc/ to ${AMANDA_USER_HOMEDIR}/amanda"
einfo "A backup is also placed at /etc/amandates.orig"
- cp -dp "${ROOT}/etc/amandates" "${ROOT}/etc/amandates.orig" || die
- mkdir -p "${ROOT}/${AMANDA_USER_HOMEDIR}/amanda/" || die
- cp -dp "${ROOT}/etc/amandates" "${ROOT}/${AMANDA_USER_HOMEDIR}/amanda/amandates" || die
+ cp -dp "${EROOT}"/etc/amandates "${EROOT}"/etc/amandates.orig || die
+ mkdir -p "${EROOT}/${AMANDA_USER_HOMEDIR}/amanda/" || die
+ cp -dp "${EROOT}"/etc/amandates "${EROOT}"/${AMANDA_USER_HOMEDIR}/amanda/amandates || die
fi
- if [ -f "${ROOT}/etc/amandates" ]; then
+ if [[ -f ${EROOT}/etc/amandates ]]; then
einfo "If you have migrated safely, please delete /etc/amandates"
fi
einfo "Checking setuid permissions"
- amanda_permissions_fix "${ROOT}"
+ amanda_permissions_fix "${EROOT}"/
elog "You should configure Amanda in /etc/amanda now."
elog
@@ -466,33 +488,3 @@ pkg_postinst() {
elog "virtual/inetd, as it supports modes where an inetd is not needed"
elog "(see bug #506028 for details)."
}
-
-# We have had reports of amanda file permissions getting screwed up.
-# Losing setuid, becoming too lax etc.
-# ONLY root and users in the amanda group should be able to run these binaries!
-amanda_permissions_fix() {
- local root="$1"
- [ -z "${root}" ] && die "Failed to pass root argument to amanda_permissions_fix!"
- local le="/usr/libexec/amanda"
- local i
- for i in "${le}"/calcsize "${le}"/killpgrp \
- "${le}"/rundump "${le}"/runtar ; do
- [ -e "${root}"/${i} ] || continue
- chown root:${AMANDA_GROUP_NAME} "${root}"/${i} || die
- chmod u=srwx,g=rx,o= "${root}"/${i} || die
- done
-
- # amanda-security.conf is a config file with similar requirements:
- # writable only by root
- # world-readable
- # 3.3.9: introduced in /etc/amanda-security.conf
- # 3.4.2: moved to /etc/amanda/amanda-security.conf
- f=/etc/amanda/amanda-security.conf
- chown root:root "${root}""${f}" || die
- chmod u=rw,go=r "${root}""${f}" || die
-}
-
-# We do not want the perl-module tests.
-src_test() {
- default_src_test
-}
diff --git a/app-cdr/Manifest.gz b/app-cdr/Manifest.gz
index 1252ba02a4c9..176dd58eb880 100644
Binary files a/app-cdr/Manifest.gz and b/app-cdr/Manifest.gz differ
diff --git a/app-cdr/dvdisaster/dvdisaster-0.79.5.ebuild b/app-cdr/dvdisaster/dvdisaster-0.79.5.ebuild
index da320cf5b6a4..242cffbb8bb8 100644
--- a/app-cdr/dvdisaster/dvdisaster-0.79.5.ebuild
+++ b/app-cdr/dvdisaster/dvdisaster-0.79.5.ebuild
@@ -35,6 +35,11 @@ PATCHES=( "${FILESDIR}"/${P}-fno-common.patch )
DOCS=( CHANGELOG CREDITS.en README README.MODIFYING TODO TRANSLATION.HOWTO )
+src_prepare() {
+ default
+ sed -i -e "s@CC=gcc@CC=$(tc-getCC)@" scripts/bash-based-configure || die
+}
+
src_configure() {
./configure \
--prefix="${EPREFIX}"/usr \
diff --git a/app-doc/Manifest.gz b/app-doc/Manifest.gz
index 41a7af23b295..5ca1cc75daa3 100644
Binary files a/app-doc/Manifest.gz and b/app-doc/Manifest.gz differ
diff --git a/app-doc/gnucash-docs/Manifest b/app-doc/gnucash-docs/Manifest
index 78b78705394a..9962a1dd0fe0 100644
--- a/app-doc/gnucash-docs/Manifest
+++ b/app-doc/gnucash-docs/Manifest
@@ -1 +1,2 @@
DIST gnucash-docs-4.2.tar.gz 62497632 BLAKE2B 764387cbbc1d072ac3e245a86b78eb484cfa05371dcf4c17d0441bf08e00f85523975c50a88ecde24e9d949572228a723d53fcce7df397553b0e50145be28686 SHA512 e54082dcd7f92d7ca3f31cea5968ecd4167dc9e1e12f23d8684af3e2af4c696d8afed3cf477df771bb11da125ee5887d09ead1edff961ca4bedfb58fd61efdf2
+DIST gnucash-docs-4.4.tar.gz 62534210 BLAKE2B 0c3cdc3ccdf1cfb7a54e44dcde9ea10672cb312e6d6e083ae9bb65bc52b044e8559647a8491f6fa762d9bb84c33f22dd9cacb3a862548994bdc7c56b3e634aa9 SHA512 60e34af3fdb144fefc835d6497fd442daad1417c4e40f8b4fd8f66a37cd0cfa1d789aa03de435d4654ee2368a4b85e9b0cfba8eeef61829e0ca190a453a9abdc
diff --git a/app-doc/gnucash-docs/gnucash-docs-4.4.ebuild b/app-doc/gnucash-docs/gnucash-docs-4.4.ebuild
new file mode 100644
index 000000000000..3ed9ef17540e
--- /dev/null
+++ b/app-doc/gnucash-docs/gnucash-docs-4.4.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools optfeature
+
+DESCRIPTION="Documentation package for GnuCash"
+HOMEPAGE="https://www.gnucash.org/"
+SRC_URI="https://github.com/Gnucash/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2 FDL-1.1"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+LOCALES=( de it ja pt )
+IUSE="${LOCALES[*]/#/l10n_}"
+
+DEPEND="
+ app-text/docbook-xml-dtd:4.5
+ app-text/docbook-xsl-stylesheets
+ app-text/rarian
+ dev-libs/libxml2
+ dev-libs/libxslt
+"
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
+src_compile() {
+ :
+}
+
+src_install() {
+ local doc_type my_lang
+
+ for doc_type in help guide; do
+ for my_lang in C ${L10N}; do
+ case $my_lang in
+ # Both help and guides translated
+ C|de|it|pt) ;;
+ ja) # Only guides translated
+ if [[ ${doc_type} = "help" ]] ; then
+ elog "Help documentation hasn't been translated for $my_lang"
+ elog "Will do English instead."
+ continue
+ fi
+ ;;
+ *)
+ die "Invalid locale: $my_lang"
+ ;;
+ esac
+
+ emake -C "${doc_type}/${my_lang}" DESTDIR="${D}" install
+ done
+ done
+
+ einstalldocs
+}
+
+pkg_postinst() {
+ optfeature "You need dev-java/fop to generate pdf files." dev-java/fop
+ optfeature "You need gnome-extra/yelp to view the docs." gnome-extra/yelp
+}
diff --git a/app-mobilephone/Manifest.gz b/app-mobilephone/Manifest.gz
index 028f0e825ef9..14c0fde203e0 100644
Binary files a/app-mobilephone/Manifest.gz and b/app-mobilephone/Manifest.gz differ
diff --git a/app-mobilephone/gammu/gammu-1.41.0.ebuild b/app-mobilephone/gammu/gammu-1.41.0.ebuild
index 2af395f25322..fcfddd4947de 100644
--- a/app-mobilephone/gammu/gammu-1.41.0.ebuild
+++ b/app-mobilephone/gammu/gammu-1.41.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019 Gentoo Authors
+# Copyright 2019-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -16,7 +16,7 @@ IUSE="bluetooth curl dbi debug irda mysql nls odbc postgres usb"
DEPEND="
dev-libs/glib:2=
- virtual/libgudev:=
+ dev-libs/libgudev:=
virtual/libiconv
bluetooth? ( net-wireless/bluez:= )
curl? ( net-misc/curl:= )
diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index 97879ea936d7..eda0110a6bbd 100644
Binary files a/app-office/Manifest.gz and b/app-office/Manifest.gz differ
diff --git a/app-office/gnucash/Manifest b/app-office/gnucash/Manifest
index 2ea7859d92fe..074b589319e0 100644
--- a/app-office/gnucash/Manifest
+++ b/app-office/gnucash/Manifest
@@ -1 +1,2 @@
DIST gnucash-4.2.tar.bz2 14225695 BLAKE2B be77c5876cd1720e9b7422c6afbb05f0144a20cf45d7dac0e8bd3362139f4b4d18f47f0edcb6db9db7a2485263d6bff5e0546f5691fe097fe1d4912852bc0ce4 SHA512 f730d2ba5d6b310e0c467767aa4c4e6a153b441b6b9aed948344b9a9b9dee351f3cba9fac1d655385136f5ce4313f8f37ef305e9b93b0ea32c40525d9293b070
+DIST gnucash-4.4.tar.bz2 14430959 BLAKE2B 7a9e04957919a99e083dd5c1ac04150f77ab64eef277c0cd63ef90ade4a82875447f291d4f14499a14e987a86a7b7615d4a3cbb79a980be7022cb4f511b71368 SHA512 5882e5a91081bb9279ac5dc8798352cb15ebb934d1d37c6d6639244602108e067ece5b7f51ba32c9c413c1469d08ca32a73369e6af34e41c3ef704033c71f336
diff --git a/app-office/gnucash/gnucash-4.4.ebuild b/app-office/gnucash/gnucash-4.4.ebuild
new file mode 100644
index 000000000000..db9eef24408a
--- /dev/null
+++ b/app-office/gnucash/gnucash-4.4.ebuild
@@ -0,0 +1,234 @@
+# 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 cmake gnome2-utils python-single-r1 toolchain-funcs xdg-utils
+
+DESCRIPTION="A personal finance manager"
+HOMEPAGE="https://www.gnucash.org/"
+SRC_URI="https://github.com/Gnucash/${PN}/releases/download/${PV}/${P}.tar.bz2"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+
+IUSE="aqbanking debug doc examples gnome-keyring +gui mysql nls ofx postgres
+ python quotes -register2 smartcard sqlite test"
+RESTRICT="!test? ( test )"
+
+# Examples doesn't build unless GUI is also built
+REQUIRED_USE="
+ examples? ( gui )
+ python? ( ${PYTHON_REQUIRED_USE} )
+ smartcard? ( aqbanking )"
+
+# dev-libs/boost must always be built with nls enabled.
+# net-libs/aqbanking dropped gtk with v6. So, to simplify the
+# dependency, we just rely on that.
+RDEPEND="
+ >=dev-libs/glib-2.56.1:2
+ >=dev-scheme/guile-2.2.0:=[regex]
+ >=sys-libs/zlib-1.1.4
+ dev-libs/boost:=[icu,nls]
+ dev-libs/icu:=
+ dev-libs/libxml2:2
+ dev-libs/libxslt
+ aqbanking? (
+ >=net-libs/aqbanking-6[ofx?]
+ sys-libs/gwenhywfar:=
+ smartcard? ( sys-libs/libchipcard )
+ )
+ gnome-keyring? ( >=app-crypt/libsecret-0.18 )
+ gui? (
+ >=x11-libs/gtk+-3.22.30:3
+ gnome-base/dconf
+ net-libs/webkit-gtk:4=
+ aqbanking? ( sys-libs/gwenhywfar:=[gtk] )
+ )
+ mysql? (
+ dev-db/libdbi
+ dev-db/libdbi-drivers[mysql]
+ )
+ ofx? ( >=dev-libs/libofx-0.9.1:= )
+ postgres? (
+ dev-db/libdbi
+ dev-db/libdbi-drivers[postgres]
+ )
+ python? ( ${PYTHON_DEPS} )
+ quotes? (
+ >=dev-perl/Finance-Quote-1.11
+ dev-perl/Date-Manip
+ dev-perl/HTML-TableExtract
+ )
+ sqlite? (
+ dev-db/libdbi
+ dev-db/libdbi-drivers[sqlite]
+ )
+"
+
+DEPEND="${RDEPEND}
+ >=dev-cpp/gtest-1.8.0
+ >=sys-devel/gettext-0.20
+ dev-lang/perl
+ dev-perl/XML-Parser
+ sys-devel/libtool
+"
+
+BDEPEND="
+ dev-lang/swig
+ dev-util/cmake
+ virtual/pkgconfig
+ || (
+ >=sys-devel/gcc-8:*
+ >=sys-devel/clang-6:*
+ )
+"
+
+PDEPEND="doc? (
+ ~app-doc/gnucash-docs-${PV}
+ gnome-extra/yelp
+)"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-3.2-no-gui.patch
+ "${FILESDIR}"/${PN}-3.8-examples-subdir.patch
+ "${FILESDIR}"/${PN}-3.8-exclude-license.patch
+)
+
+S="${WORKDIR}/${PN}-$(ver_cut 1-2)"
+
+pkg_pretend() {
+ if tc-is-gcc; then
+ if [[ $(gcc-major-version) -lt 8 ]]; then
+ die "GnuCash needs at least GCC version 8."
+ fi
+ elif tc-is-clang; then
+ if [[ $(clang-major-version) -lt 6 ]]; then
+ die "GnuCash needs at least clang version 6."
+ fi
+ fi
+}
+
+pkg_setup() {
+ use python && python-single-r1_pkg_setup
+ xdg_environment_reset
+}
+
+src_prepare() {
+ cmake_src_prepare
+
+ # Fix tests writing to /tmp
+ local fixtestfiles=(
+ gnucash/report/test/test-report-html.scm
+ gnucash/report/reports/standard/test/test-invoice.scm
+ gnucash/report/reports/standard/test/test-new-owner-report.scm
+ gnucash/report/reports/standard/test/test-owner-report.scm
+ gnucash/report/reports/standard/test/test-transaction.scm
+ gnucash/report/reports/standard/test/test-portfolios.scm
+ gnucash/report/reports/standard/test/test-charts.scm
+ gnucash/report/test/test-report.scm
+ gnucash/report/test/test-commodity-utils.scm
+ gnucash/report/test/test-report-extras.scm
+ libgnucash/backend/dbi/test/test-backend-dbi-basic.cpp
+ libgnucash/backend/xml/test/test-xml-pricedb.cpp
+ )
+ for x in "${fixtestfiles[@]}"; do
+ sed -i -e "s|\"/tmp/|\"${T}/|g" "${S}/${x}" || die "sed of "${S}/${x}" failed"
+ done
+}
+
+src_configure() {
+ export GUILE_AUTO_COMPILE=0
+
+ local sql_on_off="OFF"
+ if use mysql || use postgres || use sqlite ; then
+ sql_on_off="ON"
+ fi
+
+ local mycmakeargs=(
+ -DCOMPILE_GSCHEMAS=OFF
+ -DDISABLE_NLS=$(usex !nls)
+ -DENABLE_REGISTER2=$(usex register2)
+ -DWITH_AQBANKING=$(usex aqbanking)
+ -DWITH_OFX=$(usex ofx)
+ -DWITH_PYTHON=$(usex python)
+ -DWITH_SQL=${sql_on_off}
+ -DWITH_GNUCASH=$(usex gui)
+ )
+
+ cmake_src_configure
+}
+
+src_test() {
+ if use python ; then
+ cp common/test-core/unittest_support.py \
+ "${BUILD_DIR}"/common/test-core/ || die
+ fi
+
+ LOCALE_TESTS=
+ if type locale >/dev/null 2>&1; then
+ MY_LOCALES="$(locale -a)"
+ if [[ "${MY_LOCALES}" != *en_US* ||
+ "${MY_LOCALES}" != *en_GB* ||
+ "${MY_LOCALES}" != *fr_FR* ]] ; then
+ ewarn "Missing one or more of en_US, en_GB, or fr_FR locales."
+ else
+ LOCALE_TESTS=true
+ fi
+ else
+ ewarn "'locale' not found."
+ fi
+
+ if [[ ! ${LOCALE_TESTS} ]]; then
+ ewarn "Disabling test-qof and test-gnc-numeric."
+ echo 'set(CTEST_CUSTOM_TESTS_IGNORE test-qof test-gnc-numeric)' \
+ > "${BUILD_DIR}"/CTestCustom.cmake || die
+ fi
+
+ cd "${BUILD_DIR}" || die
+ XDG_DATA_HOME="${T}/$(whoami)" eninja check
+}
+
+src_install() {
+ cmake_src_install
+
+ # strip is unable to recognise the format of the input files (*.go)
+ dostrip -x /usr/$(get_libdir)/guile
+
+ if use examples ; then
+ docompress -x /usr/share/doc/${PF}/examples
+ else
+ rm -r "${ED}"/usr/share/doc/${PF}/examples
+ fi
+
+ if use python ; then
+ python_optimize
+ python_optimize "${ED}"/usr/share/gnucash/python
+ fi
+}
+
+pkg_postinst() {
+ if use gui ; then
+ xdg_icon_cache_update
+ gnome2_schemas_update
+ fi
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+
+ ewarn "Backup all financial files or databases before using GnuCash >=2.7.0!"
+ ewarn
+ ewarn "GnuCash 2.7.0 introduced large changes in its file format and database"
+ ewarn "schema that WILL prevent you from reverting back to GnuCash 2.6."
+}
+
+pkg_postrm() {
+ if use gui ; then
+ xdg_icon_cache_update
+ gnome2_schemas_update
+ fi
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+}
diff --git a/app-office/libreoffice-bin-debug/Manifest b/app-office/libreoffice-bin-debug/Manifest
index 4bfb76df1f8e..fd156edc2d38 100644
--- a/app-office/libreoffice-bin-debug/Manifest
+++ b/app-office/libreoffice-bin-debug/Manifest
@@ -1,12 +1,24 @@
DIST amd64-debug-libreoffice-6.4.7.2_p1.tar.xz 1110421236 BLAKE2B b7aad45577e4a9604d3cef7a8a6d90f50772075ca041aff14bac3d0cd60ef9c42c0dc0fe4bc93dc8f6fe40c8105ff4ca3711eb5d4f54535717f224cf620f3d3a SHA512 c832575c7d32117ba22da36db3bfef17587275e99dfe58be489f97495ec9d3cbaeed0640ba1a8d9621d8d1c95f0aeabeb7a62e2fbd486e3f5ce2737390aacc6f
+DIST amd64-debug-libreoffice-6.4.7.2_p2.tar.xz 1110439052 BLAKE2B 54aa720a740c94d146fe2ae8c5ba11bd4e65efbbd18188bbf6b7aedc88a3d8907a18beb74cf901cc3fcf7b7053816f5c3b7c08c1513ff3e9d3e8130fdf995a28 SHA512 f3392bdfffb47abcca83ddc50b0fb3f3cb5fdbe6f1b70d4dd866cca4586a61def6c21439ea34ae8bf758bb3cfa77ddaffe0f4e9bfac5ee3ccd354bed24e14aef
DIST amd64-debug-libreoffice-gnome-6.4.7.2_p1.xd3 1137103 BLAKE2B 94bb01a6eb22de43778590729e96f4b60eccb2531a08df9c3cafcdf69222b0a29eb64e79f14306b265532f3d0fa5e7b24bd19b93e9104d3497f5fc381916221f SHA512 8a28e2250bb8f057fff56481e739e0ffd36c1c2cd2f0ed70c018e640b5b5f7e3512bbbeec2fb2d9123e7cee53d02125c36e2bc2de7964ed0a2d94c306306da26
+DIST amd64-debug-libreoffice-gnome-6.4.7.2_p2.xd3 1136937 BLAKE2B 49749de74736b6749ece897dac2f7f1a4ebbb2a3cdce82b27e3eae8ae045dbc9b4849238e8ff8631a0db9f1004cc51a2ee00f34f4df82a118982a45f3474e1c3 SHA512 372e9173f269555102f7e5fc7f2dc6c668ae6d4c18eab9d2e96e6b28db056a9ed12a1e7aca18094ddf54419a26ea1aa8b12b40527c29f4d146b3e4370f9f6606
DIST amd64-debug-libreoffice-gnome-java-6.4.7.2_p1.xd3 505924630 BLAKE2B 4b56f6d58a9d6a4f856f5c4b95c8d6036ac16b7c19f8f68ae6f6fa8003937bb37e01541180c0d6bbb8f50b89b943153bf18a99d86bfc4c8e9d37539cf27194b8 SHA512 2f9352b0a2e336992444f513fd1eed5be90ad46077a9e734a2b777d7415edf256eec04ebffd77a178c8ecb0dbbae27ee6a03b93e7e8aa1f05dbbbc6ff4c8e869
+DIST amd64-debug-libreoffice-gnome-java-6.4.7.2_p2.xd3 505817824 BLAKE2B a911ebe4fb2f0ab5efc644b41c966cf18d9904bd13cce8fbc8c57e8cf2433a5a43c2b6fd7bbf3cd957c82153518932b5e124d11ca5711ff195a2089ddc8bfc10 SHA512 11138384e355e08fd5bb98fe5a0e4aacbd02cea53b0c416bb78e2406b604f6dbcc839bc5b6318183186a2e04e1597e56dbf2267e0202e9d2dbf54d4f3b523e21
DIST amd64-debug-libreoffice-java-6.4.7.2_p1.xd3 504793922 BLAKE2B f5b138b430af48e9efb61f7d203c09ab20ab73e035a817d4d8b542fd3fa50dff493954818ae89f572c43312c1ca8bbbd1020d1543892e1253b8243cae9dc2397 SHA512 f2fca65534a03af999e47d6a5d2f79a69a0bad9f577d561fe4ab0638d221a19f5ba8b0370c3f05c410a69d474e709902ad8565aa72b6feed69f09d0f0c6b7016
+DIST amd64-debug-libreoffice-java-6.4.7.2_p2.xd3 504686001 BLAKE2B 7bb5b84f06c91495a1765e00d54ef933aa73e237a3c28f4c87956c34577cdc6e5ca55a19a287a43c21f42b218c41d0c7a5fc0ab698fbfd6163a026ca00af9447 SHA512 008e79263223f430acbf2f3aa29050319de8ef20e5a2d50c424eb644bcf3e3103e0a2fdb2b566d25b4e266e7a70de693b596266c849510c641d6f1bfabed7f79
DIST amd64-debug-libreoffice-kde-6.4.7.2_p1.xd3 294249182 BLAKE2B 177ebea55369432c3e3b28763d8ab8bce5b9e88cf6c6eeebb4844e8e6f36a1fcef95fe12d8972c19a1f8ecba28ec3c24117fbe007980635b4b6e9caf4ab054f8 SHA512 689023e9b69291f27edd9d1ff3844d56124e519a0d04c843a1222ae0760868b34748dcf310865d004876b91b167c4a1adf0494f6ef6b6be49bec1f691a278f10
+DIST amd64-debug-libreoffice-kde-6.4.7.2_p2.xd3 294278544 BLAKE2B feb74b38abb5d8f11442d5437c50a1e33f31aaa077a29a908e083936afdbc9a8bd42fff035f587391df510c9af4a481b4625783e181a05f66d7f1661ebd2a634 SHA512 ebf44dc2af818b2190dfae1d418b1a3705def0dfdca59cd01957bf2b6687a1d64814d755afbb1215300d49c3efdb16fd37650fcfbf2ab164bbf981e7384f389c
DIST amd64-debug-libreoffice-kde-java-6.4.7.2_p1.xd3 513057171 BLAKE2B a91c73bd6d4b4883a5ada8ea9198dee1e4c5d2693be36996b73b2c092ebc3b10805e320a14927e323709167392d6e5a0473b7081c6c799665b7939711c86f6ac SHA512 f90350bd5120e64ebf6c42e3aecb0006d302c35f2192cf0fa51a99a77abf7cf6a4f3d562d40598e9ca1839b9c181835640645963795b30a22fbf3071403afdeb
+DIST amd64-debug-libreoffice-kde-java-6.4.7.2_p2.xd3 512988426 BLAKE2B f2558a4d962e991ec18ddcedbb8d25c0720f6cddc02f542695c5623ae1ad8ea76896139749620c96d69bce76ecea1d1ff7985ee3c0907705f332e4a67b3701cf SHA512 84a1d7ebb4460a9615863e0136a3b6d2acac5dbf8d3812633142a1b3092fbc324570dd3e0faf9f3e55e25001d308b0b03bc0217a08f9c1aa90479b6705ec0251
DIST x86-debug-libreoffice-6.4.7.2_p1.tar.xz 1108972372 BLAKE2B 509f6482e83bdd5539e9f1affab16489ce473168251e73b260bee5be72e12de1fef1f66ec4d2c6f7e72999cf25ec515a47e6050387d3ca474c62440d75630d75 SHA512 cf8aea2a8c8c52d1d42d2a4771ceaeb0641242aa21316b47a02f9c34d4d76f96a3602102bcd8a458e7a0591848a2059a3dd4fcefb34f6cc6fda411225938c535
+DIST x86-debug-libreoffice-6.4.7.2_p2.tar.xz 1108975220 BLAKE2B b5cba545c995462b3281146fc5a86c597157a89696b1cc76c1b249d583223f3e1c9355c8d3452eb59216cbdf2968f73f7e804fcaa675e67d7d310da590c8db1c SHA512 0613735ef4f11cb80cd8589f7d1713c4d6fa7ad8e1dd7a611598e744075afd016b00440a0cb75c107fe20995252a7f01062ddce2060f6825da719e1cb86279a3
DIST x86-debug-libreoffice-gnome-6.4.7.2_p1.xd3 1133117 BLAKE2B b45195154069fb8216967f0093ea59f6ecf1f872d636f4afcac58f500e2281275b7262176666f88d6599dd9b41072cde083ed6f6b7f939b8c1f3d3167b233f79 SHA512 31eccf49c4ab11fd3ac6ef354802e72122042efdc683ddbd3b48f25fed1ee87c1be9f9d222c1da8ee3066c2ce9b090d91d27ef3af57a84a2f275d7e5d01922ae
+DIST x86-debug-libreoffice-gnome-6.4.7.2_p2.xd3 1134093 BLAKE2B 6d53b91a5c9c37b0bdee0b08f3600403e342ccdd470f508ec374284a0c4e548ad39af554b079619a67a079212ae690098ef4d2c6825733ff57b009db3ac127b5 SHA512 5c2fbc64f88e0e3f6129cf7a3210a16e7edc4483903aee24a73bdfa80896e0a743e217e8566c7352d727f79afe100490d2952cfb3d29345ed716ecaace90d1ee
DIST x86-debug-libreoffice-gnome-java-6.4.7.2_p1.xd3 505451908 BLAKE2B f313c0eabb4ff2fc812db2fc0ed08a85e34c081bf8616c52d231db5a35a30907ecd3d1facf4dfcbbcde84db850d7914476acb8bdadb5398fe6d1800823e21681 SHA512 47f73b23276b7a8f4a6d29cb415d60f9ccb1ac66cc403bec371dd89de659e62e8158665bed69365aa3c4471ff5e28f30db15e6b17f7331c20e929ef6c538480d
+DIST x86-debug-libreoffice-gnome-java-6.4.7.2_p2.xd3 505408886 BLAKE2B ca886fcd42c9f3c2b1e634974e0dcdb18b5001db8cc0015465f6146487d830c4ca5e56d0543cd550a3f19b81eece2cbb9d421716f9203191254335f7724b4df2 SHA512 74c5fa80c9e0716befda497e90405cf85a5aa5ed5d27c129dfd48e65cf123a4d28457e70fa4592a583a0ff2f111ddc6fc6d7481a130f8520d48039b3f267f02d
DIST x86-debug-libreoffice-java-6.4.7.2_p1.xd3 504312380 BLAKE2B de2fb9ba9dca1b76cb4c92b5a24540598b0e01d6cc94cf2d483190e5acf6dd6024868fcb50085ec55bd4d03a552a07dad886505a0e63678066883c7fcdf852ca SHA512 dce66dd9c5f7f3cd601dc148e838887c90bfb48a599a7051701086a1f1794fb8a5dd4d0eab3ae7ebfe48b7c99c48732a0086e16496174688370afdcf27a49cfa
+DIST x86-debug-libreoffice-java-6.4.7.2_p2.xd3 504269108 BLAKE2B f89d79891225c5c3c87f006cceffef9f8228990f2dcb9777721dc3f8a1f7988b2c0753b10d03a77ff42090aa9471d4034b802309dfdf4958cbb03ab2b162c691 SHA512 55c1eb19f3f7a0fe365f946f1f46d2ec57437bfda514f3111e63eea284c8cd7e1ee33ad047fa776edf6231fc1f39a6369793d09012204a4aa1c1c687a91d87b4
DIST x86-debug-libreoffice-kde-6.4.7.2_p1.xd3 285518032 BLAKE2B a213129359e4d5912dd514c4d00d879fdd5635f2a6237bba9771f064811a1f48bc3d0be706a3a2237ca7a48df6f1e1aae1cc0b790ac3e5c02310ace18b4fc141 SHA512 93a0475bb64849414fbf72199f6c2cffe2e67dbb64d89d8edec77af881cbdc6eb55d53362052296846619911be4f8d3e2f1d0a1b94e1eda0977d12b68e460d6e
+DIST x86-debug-libreoffice-kde-6.4.7.2_p2.xd3 285508996 BLAKE2B 5779310599eb281247a137f2565067b829b6711beb7823a54973cc35f31b20ef0c64da29e3615426eb548e6033416b0f2189a17a0f4f0f5435520dae5400ba45 SHA512 d2312309477a96e33c6101e33aa68c42389c191a4969cb4f6378138faeb231c1cde941818af81366da87ef544531a412fea6a402c1c7fdbd3d4bcbdcb99d54ac
DIST x86-debug-libreoffice-kde-java-6.4.7.2_p1.xd3 504334898 BLAKE2B 20ef380020b1688b769f5d01f440cee328ba5b94e4ccd60ec6616e45d409d2e4d966ddf37d9ec1e5093cfde48874f4f866a728efa0c0015252739d4979082c2e SHA512 75498a9104e66b4acf95d765cf1c97ff61dac26c4b64e743b02cae94d4de87e3daa8971b1a069de1ba300af6bf51e2146ed0c2d118dc8cef17810b4cce031e93
+DIST x86-debug-libreoffice-kde-java-6.4.7.2_p2.xd3 504189621 BLAKE2B aca65755c930755d97c64f860160b8c090bb04cbfb48d5a413419a16828b8fb50bc8dd2d42941181f4996733b6c04e351cd6b2017cfb0b0776b0f44baeae3a55 SHA512 e6e5d91fb4e063a0dc432b0d546a0af9a744c33f223c03b583a223e5d118de0729fb717c8b580252ee142560522bdbb5ea970755a79d768da5048d528a25c8b3
diff --git a/app-office/libreoffice-bin-debug/libreoffice-bin-debug-6.4.7.2_p2.ebuild b/app-office/libreoffice-bin-debug/libreoffice-bin-debug-6.4.7.2_p2.ebuild
new file mode 100644
index 000000000000..6e24ae1fb030
--- /dev/null
+++ b/app-office/libreoffice-bin-debug/libreoffice-bin-debug-6.4.7.2_p2.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+BASE_PACKAGENAME="debug"
+BASE_AMD64_URI="https://tamiko.43-1.org/distfiles/amd64-${BASE_PACKAGENAME}-"
+BASE_X86_URI="https://tamiko.43-1.org/distfiles/x86-${BASE_PACKAGENAME}-"
+
+DESCRIPTION="LibreOffice, a full office productivity suite. Binary package, debug info"
+HOMEPAGE="https://www.libreoffice.org"
+SRC_URI_AMD64="
+ ${BASE_AMD64_URI}libreoffice-${PV}.tar.xz
+ kde? (
+ !java? ( ${BASE_AMD64_URI}libreoffice-kde-${PV}.xd3 )
+ java? ( ${BASE_AMD64_URI}libreoffice-kde-java-${PV}.xd3 )
+ )
+ gnome? (
+ !java? ( ${BASE_AMD64_URI}libreoffice-gnome-${PV}.xd3 )
+ java? ( ${BASE_AMD64_URI}libreoffice-gnome-java-${PV}.xd3 )
+ )
+ !kde? ( !gnome? (
+ java? ( ${BASE_AMD64_URI}libreoffice-java-${PV}.xd3 )
+ ) )
+"
+SRC_URI_X86="
+ ${BASE_X86_URI}libreoffice-${PV}.tar.xz
+ kde? (
+ !java? ( ${BASE_X86_URI}libreoffice-kde-${PV}.xd3 )
+ java? ( ${BASE_X86_URI}libreoffice-kde-java-${PV}.xd3 )
+ )
+ gnome? (
+ !java? ( ${BASE_X86_URI}libreoffice-gnome-${PV}.xd3 )
+ java? ( ${BASE_X86_URI}libreoffice-gnome-java-${PV}.xd3 )
+ )
+ !kde? ( !gnome? (
+ java? ( ${BASE_X86_URI}libreoffice-java-${PV}.xd3 )
+ ) )
+"
+
+SRC_URI="
+ amd64? ( ${SRC_URI_AMD64} )
+ x86? ( ${SRC_URI_X86} )
+"
+
+IUSE="gnome java kde"
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+
+RDEPEND="~app-office/${PN/-debug}-${PV}[gnome=,java=,kde=]"
+
+DEPEND="dev-util/xdelta:3"
+
+RESTRICT="test strip"
+
+S="${WORKDIR}"
+
+QA_PREBUILT="/usr/*"
+
+src_unpack() {
+ einfo "Uncompressing distfile ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PV}.tar.xz"
+ xz -cd "${DISTDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PV}.tar.xz" > "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PV}.tar" || die
+
+ local patchname
+ use kde && patchname="-kde"
+ use gnome && patchname="-gnome"
+ use java && patchname="${patchname}-java"
+
+ if [[ -n "${patchname}" ]]; then
+ einfo "Patching distfile ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PV}.tar using ${ARCH}-${BASE_PACKAGENAME}-libreoffice${patchname}-${PV}.xd3"
+ xdelta3 -d -s "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PV}.tar" "${DISTDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice${patchname}-${PV}.xd3" "${WORKDIR}/tmpdist.tar" || die
+ mv "${WORKDIR}/tmpdist.tar" "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PV}.tar" || die
+ fi
+
+ einfo "Unpacking new ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PV}.tar"
+ unpack "./${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PV}.tar"
+}
+
+src_configure() { :; }
+
+src_compile() { :; }
+
+src_install() {
+ dodir /usr
+ cp -aR "${S}"/usr/* "${ED}"/usr/ || die
+}
diff --git a/app-office/libreoffice-bin/Manifest b/app-office/libreoffice-bin/Manifest
index bf3472caaf30..e3d654b4eef7 100644
--- a/app-office/libreoffice-bin/Manifest
+++ b/app-office/libreoffice-bin/Manifest
@@ -1,12 +1,24 @@
DIST amd64-bin-libreoffice-6.4.7.2_p1.tar.xz 132939056 BLAKE2B bf289afca20492f6fe099ad180d33a730e90ccba60c133fa9ddd034d6751b86ef5f68b630ac1e67738d67d94bb79d39946df52cdd49b38fce401d33521926db4 SHA512 5138d6caf05817f658377b938927053fde3b98a8496cca9555202e862dabef75f35cbcd91c6a570611e2b908e150f6f38b3b775b9af9048cbe0ac31d7b912182
+DIST amd64-bin-libreoffice-6.4.7.2_p2.tar.xz 132899212 BLAKE2B daab7c709cef0298e445e8c2ebb1690a7df1b6bef2932bf3a1d965d80117bc3f5a1aedb293ec7a7c73b61a81cb6ba9d595fa4698636eba066453461dde83d28c SHA512 50715cefdbf6e949b010d449c831387ffe7f1444cdb6f8dfa890113e034401cf4d19774043604475c9ea6fd840f21ed7299234eec742177d82f2b9a3095dee42
DIST amd64-bin-libreoffice-gnome-6.4.7.2_p1.xd3 1921163 BLAKE2B 15da9d0e63cc85026ab7a3a9a98dfef7a0971722d2a663d54e6c1f9af069f007b3cbdca8b4730007b70d2ce5b6594732f2672578a3739e5be8f1f37d41fa8d51 SHA512 b0e1039cb094eee47e7e146c60e17f1ae0e2c49400a66741c8f9a4f34c32129028b4387a03881a28fdce6c9e56ca71ce0c28d07972821a22a78901670112bca0
+DIST amd64-bin-libreoffice-gnome-6.4.7.2_p2.xd3 1915838 BLAKE2B 4ac09d0e9cadd34b8bf374b91526763d8059f36faa0e701310df76f01dd471a781e7a4a57eca0458200b55cd73803e44d2fa902bc4cf9ffdc9b7819583f66e61 SHA512 bd6754ba2512f1679ab7a98af007723b5a2bcd64f1813c6a2c2b61c5aef65bee1cfd866016b67a456e4bb2295b3664cdbf73923dea9900aff5b88d5f42baa535
DIST amd64-bin-libreoffice-gnome-java-6.4.7.2_p1.xd3 29288984 BLAKE2B c1379fd0ef1899244a513b1f53bba861d41bfd5eae26518fe6931bd805e9b2a8ac5be79710415b4f539d48e38fd964f198f3401f29c073c14d1af0f57ca8e51e SHA512 69bd379194cbf6c376738408a1979f4822b52d2012d1442c32b4320ce410768e69dcaf323527936aa3a9f183c4a846da95f00d8379dffaff055130d2ede4ba8b
+DIST amd64-bin-libreoffice-gnome-java-6.4.7.2_p2.xd3 29294532 BLAKE2B fc9d82a6dc3986dbb6d68f8d17deb5bb2477ca1cabaa3abcb214800e668440f3b80338767329aeeb1c0c0c9f2793e482d6749021798c8123f1a07c7f0bbf0ad8 SHA512 b6852c3e504a4a37f151d50df92c6f545434dd285e6635791516e279d93b51b7dd7bdd65d40157aaf5ea9d1cd8bdf06630fceecd4953626ebcfe42f1f015c835
DIST amd64-bin-libreoffice-java-6.4.7.2_p1.xd3 29140522 BLAKE2B 957fe72caa6c1f8b156d217b8d66b45275bd44b08769ebbc4d1d2cc9e1d4b3918a4c720bc873b9ba181203496a5fa66defb596b3f1ab1d0a7cef07cfbc1f21f9 SHA512 6bc23b125754e0da7c27101e650adf3a0660088306c2dd70ffa6cb403873e1ae0cfdbe4384913575ee4698be9f52ad77d845c8c11bf7a040f09c409da944d28d
+DIST amd64-bin-libreoffice-java-6.4.7.2_p2.xd3 29174648 BLAKE2B 1349e5db1bde42d695bd12dab39af30b8288f0ac318a662b1bfced9e3b18b67d02bb2d00201b1e8ae40f5f860d02be132e4e27ff686f703c229d1ec3c6de3e41 SHA512 ec281709877764827b9fb481be480b0f1177fbb3a281a6be7fc50a75733cca9d8212d9b2d420ec823605a9e2881a02da8716c482c82d85e7a7d9b43efa3fe469
DIST amd64-bin-libreoffice-kde-6.4.7.2_p1.xd3 19705370 BLAKE2B 8548d25cda6812f20e2a7f8b9a7e0a87a92de4755f7883edd2291cc7b042f316ab43c0825cdcd6b2ad87cf86f715a5d12a63ca81de57feb383ee51410e71bd9b SHA512 1967b746f68e764e3f2499d4f8b23ecfc3c53cc07ab8b17c40b311dc5211b4624218db257058772bebe2455e9ac2dbc243764e9e142663a5fe6dff944a91aa6a
+DIST amd64-bin-libreoffice-kde-6.4.7.2_p2.xd3 19690260 BLAKE2B 902b28eaf17c8ba8eb2496674c1c03fa7317eb7eb5455c0650752f9f0313a1b18910775844ab26933aa95d00be57e4c01b3c93f8a0d7dac15198e56138ec404d SHA512 356014519693e5ca73761f13720abac5e8ff715cd9939bfc50581892946d073664753c373ef501cf6bd407cbce7d85fc232eeac1af3fe5279f65f10585e07635
DIST amd64-bin-libreoffice-kde-java-6.4.7.2_p1.xd3 29774822 BLAKE2B ae1ee0dcd887eecd425a723827ee831e143369f4d0b4674d0c88ca8a00b1b976940b1d9d6fa56b11beae80955ffb9c6177a823f2aa187f86c7ecb96729500730 SHA512 c31abcdb7402f602e3b912831ebaa7ba41350399866b0955d5852e7c946efc676be8dcee1614478ff4217ce090a3947ea2cc1fe266bfb5c29f462bc5f264e98b
+DIST amd64-bin-libreoffice-kde-java-6.4.7.2_p2.xd3 29809537 BLAKE2B f975c8bb30067a97eb6fd8b7a13b95e6788c5593c7da7eef870dc52ac1d7c3d7c8d3dfbdb92998f88cd69f4578044ed783477e072f1aa4f91cedcca362c467c4 SHA512 802326419d9bcf88add3dd0712d1feb2c8663a9663c762dc1d08e28cb577e4aa0ac4800ef27b39dd523729df8edc069098a69c25f57b461ba908a4cd2064bba3
DIST x86-bin-libreoffice-6.4.7.2_p1.tar.xz 134606628 BLAKE2B b6bba84073dc16b473947b7bf2f103f2e66226e172e66f612a396d1b206253229eac4320766f0977e8f531290e8365d7c491a6a4ced066f57ada553549741bce SHA512 dbab1dcbb39909b88d77351314441d096ec59d69c383c9a8bcbb82801477e14f0674932e0215ea1945630f328da8de8875b8e240c7e5c8494e57de233a030f0b
+DIST x86-bin-libreoffice-6.4.7.2_p2.tar.xz 134593448 BLAKE2B 26b57979c917dd379c590891fb630485d1ba51eddc18407fd2287de03fd76403137c61a8e8b4a49a2a34c71638b15918912187eb0e7a682ca4b338467d376a77 SHA512 62364be3d5513247d95c839a90643bff630ddc075b6e1c1cc9fe46f8c98338f93fce55c939913417423c0f559c697f1156e2d4a0448f08501b23f65a354d82df
DIST x86-bin-libreoffice-gnome-6.4.7.2_p1.xd3 1918270 BLAKE2B 3ac058041b731c79e45920a88c6258408acb6b3fdb664da0cd17d0747a1656b1df61c4ab7929c00755fb2b9f62e2f79789a1d915e5f93806435b96ecde072b26 SHA512 7a9ae3883f3abbdd80a63a52d12fe263540686c1a33203693c2ec1d729677017776f3cb9fc391d0796743bedd8315b203603eaeee4a35948d105f5c2265cd24f
+DIST x86-bin-libreoffice-gnome-6.4.7.2_p2.xd3 1892727 BLAKE2B d1cf2b679a91dd5c1947ec60be83fde839159f5b1e514925b90f47cfc28bf0a902d22c4d57834e9548f8fe6867a1452d4d42d098ac08a8632d341110fa550691 SHA512 d9ef6b5fe1b60fd4085feadb0b7f00ea239d4ce86828db7a3f2d07a89dc1bd879d4d6e2e5277a6b98518dd2c52cc692b1b84b74964ee287a1d9e749e6a47ab8c
DIST x86-bin-libreoffice-gnome-java-6.4.7.2_p1.xd3 27287304 BLAKE2B 8631b35146ed208577dbb621ddd947e3bded055419c34fc20fde02d942bf5b09ab614849ef8ce3fb8374f2761eeda074af6504c122e7072ce93256b603acb57b SHA512 794ad30ce84e4fb2b57fe4de985cd5dbd035317eac1e3a3951b0012204feb581134e57cccf7d113f9129f0a4891cdd65a5c419c35bce866d29dcc37e84abc87e
+DIST x86-bin-libreoffice-gnome-java-6.4.7.2_p2.xd3 27275582 BLAKE2B 4b91ba882e76747227f780b505ca691d7d5dc2bc2a1d3a8305b43248df595e4c429769bc998724dbbd8d0949951b2fb3d19b00f0c76339ee15182bf5193e95ab SHA512 e62fd9d5e7864ef9d7dd745364768e390e3313cee9ea55f021d5f0a12d935132e526c2134c1733c9564622730645c0e1200da9194521f96f5884a678e09391c0
DIST x86-bin-libreoffice-java-6.4.7.2_p1.xd3 27166653 BLAKE2B 2773a3776d63c87a4fefabbee8336f759c86b08cce6c035da3da88f18a6a5ee3d64ed56e26fe1fc7321aaacce9f1f2df07005765fbf9a5eabdd33df000aff1f5 SHA512 2042f578bfc5610a7d07e754f6eec56a1fc654f254e4a75295171c8ea032b629994ca07b4fa9c4cb96f440677f3bf59a4816de38d1e3eca7dca81a4543cea84c
+DIST x86-bin-libreoffice-java-6.4.7.2_p2.xd3 27169643 BLAKE2B b84c5e9851ff563e5ecc9cb0368aba008f3f43cda15f81d832c3a5fec97953665fcba6b3d1231a7bb14effd5358cc0a363567d5cdf1d00265a093c18ec9035f2 SHA512 39f4465c340fd6b70717fad48905e38519dfb274fdd97f9b018572814bcd2e903690f5a627e40eb20eff004a55cd3a8157e2943d90685ae872f8c51ddbcb6b05
DIST x86-bin-libreoffice-kde-6.4.7.2_p1.xd3 17414679 BLAKE2B acb084343f735bf0d0cce5eca48a0c66f36ee59d189ba76e664fb65cac76663a83baf7ec921b1a601e142f2a3f4cf90a7a53479c6459dd766a04dd749a95cda0 SHA512 30b6ad2b27ccd3c2e26e0da6a868fa48e5e5648e235cc056f5186718f688fc937158f01ebd8b3916819dab9339db812e470d1543a2254ef8b57b9a92b25b1a72
+DIST x86-bin-libreoffice-kde-6.4.7.2_p2.xd3 17409833 BLAKE2B 032f5b6ca8262443e2d891dbaa8bbbfd8b7a6a2257a40eafbdd06273fc947cd3a9b96cc10334e3a11086fce7ba3cfc5596e767640d1e5d9258f6bf78ad4266af SHA512 d107cfa5310ee9d139e73cf84bb128d91485caf1b51c62168e29697416649e428e0e55cc55d0347ae8e20f4893907e522515e0f5d4fa350417fe9d181de75a9b
DIST x86-bin-libreoffice-kde-java-6.4.7.2_p1.xd3 27725217 BLAKE2B 30ef34c9234fda34194e11abac36522a97dde1b62ada1cc67fdd54d03f805ca1c65ad9a97c7484023801d15644a85a652c2f4c30c32c18a715bd3b9dddb263da SHA512 753ec089ed19f65fa2b371f02fb3183d34f9f280d6ecb3c93698f394f4376de89b7111d0a8248379f7ee96ae28cc770b66f3efbba5804403f390131fd29d476d
+DIST x86-bin-libreoffice-kde-java-6.4.7.2_p2.xd3 27721907 BLAKE2B 9ef839325facb31ce7b90f9aae404098d49bf135d9507b1941eb3af2c3f7919783f4bee289549c49041a843d87336bbc8a91cc10a0c72a1d9a48d5dd06ef99e7 SHA512 1965b8b044dbef3f3b02b5fde8fbc2b4fb7890ffb01e337d5471b1886361096fd7a5d06d2955bf6df2a448bd143df4f5263aa203a13d5d92f61e2f3cf4961879
diff --git a/app-office/libreoffice-bin/libreoffice-bin-6.4.7.2_p2.ebuild b/app-office/libreoffice-bin/libreoffice-bin-6.4.7.2_p2.ebuild
new file mode 100644
index 000000000000..8660dfccd524
--- /dev/null
+++ b/app-office/libreoffice-bin/libreoffice-bin-6.4.7.2_p2.ebuild
@@ -0,0 +1,251 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+BASE_PACKAGENAME="bin"
+BASE_AMD64_URI="https://tamiko.43-1.org/distfiles/amd64-${BASE_PACKAGENAME}-"
+BASE_X86_URI="https://tamiko.43-1.org/distfiles/x86-${BASE_PACKAGENAME}-"
+
+PYTHON_COMPAT=( python3_8 )
+PYTHON_REQ_USE="xml"
+
+inherit java-pkg-opt-2 python-single-r1 prefix toolchain-funcs xdg-utils
+
+DESCRIPTION="A full office productivity suite. Binary package"
+HOMEPAGE="https://www.libreoffice.org"
+SRC_URI_AMD64="
+ ${BASE_AMD64_URI}libreoffice-${PV}.tar.xz
+ kde? (
+ !java? ( ${BASE_AMD64_URI}libreoffice-kde-${PV}.xd3 )
+ java? ( ${BASE_AMD64_URI}libreoffice-kde-java-${PV}.xd3 )
+ )
+ gnome? (
+ !java? ( ${BASE_AMD64_URI}libreoffice-gnome-${PV}.xd3 )
+ java? ( ${BASE_AMD64_URI}libreoffice-gnome-java-${PV}.xd3 )
+ )
+ !kde? ( !gnome? (
+ java? ( ${BASE_AMD64_URI}libreoffice-java-${PV}.xd3 )
+ ) )
+"
+SRC_URI_X86="
+ ${BASE_X86_URI}libreoffice-${PV}.tar.xz
+ kde? (
+ !java? ( ${BASE_X86_URI}libreoffice-kde-${PV}.xd3 )
+ java? ( ${BASE_X86_URI}libreoffice-kde-java-${PV}.xd3 )
+ )
+ gnome? (
+ !java? ( ${BASE_X86_URI}libreoffice-gnome-${PV}.xd3 )
+ java? ( ${BASE_X86_URI}libreoffice-gnome-java-${PV}.xd3 )
+ )
+ !kde? ( !gnome? (
+ java? ( ${BASE_X86_URI}libreoffice-java-${PV}.xd3 )
+ ) )
+"
+
+SRC_URI="
+ amd64? ( ${SRC_URI_AMD64} )
+ x86? ( ${SRC_URI_X86} )
+"
+
+IUSE="gnome java kde"
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+
+BIN_COMMON_DEPEND="
+ app-text/hunspell:0/1.7
+ =app-text/libexttextcat-3.4*
+ =app-text/libmwaw-0.3*
+ dev-libs/boost:0/1.74.0
+ dev-libs/icu:0/68.2
+ dev-libs/liborcus:0/0.15
+ >=media-gfx/graphite2-1.3.10
+ media-libs/harfbuzz:0/0.9.18[icu]
+ media-libs/libpng:0/16
+ >=sys-devel/gcc-9.3.0
+ >=sys-libs/glibc-2.32
+ virtual/jpeg-compat:62
+"
+
+# PLEASE place any restrictions that are specific to the binary builds
+# into the BIN_COMMON_DEPEND block above.
+# All dependencies below this point should remain identical to those in
+# the source ebuilds.
+
+COMMON_DEPEND="
+ ${BIN_COMMON_DEPEND}
+ ${PYTHON_DEPS}
+ app-arch/unzip
+ app-arch/zip
+ app-crypt/gpgme[cxx]
+ app-text/hunspell:=
+ >=app-text/libabw-0.1.0
+ >=app-text/libebook-0.1
+ app-text/libepubgen
+ >=app-text/libetonyek-0.1
+ app-text/libexttextcat
+ app-text/liblangtag
+ >=app-text/libmspub-0.1.0
+ >=app-text/libmwaw-0.3.1
+ app-text/libnumbertext
+ >=app-text/libodfgen-0.1.0
+ app-text/libqxp
+ app-text/libstaroffice
+ app-text/libwpd:0.10[tools]
+ app-text/libwpg:0.3
+ >=app-text/libwps-0.4
+ app-text/mythes
+ >=dev-cpp/clucene-2.3.3.4-r2
+ >=dev-cpp/libcmis-0.5.2
+ dev-db/unixODBC
+ dev-lang/perl
+ >=dev-libs/boost-1.72.0:=[nls]
+ dev-libs/expat
+ dev-libs/hyphen
+ dev-libs/icu:=
+ dev-libs/libassuan
+ dev-libs/libgpg-error
+ dev-libs/liborcus:0/0.15
+ dev-libs/librevenge
+ dev-libs/libxml2
+ dev-libs/libxslt
+ dev-libs/nspr
+ dev-libs/nss
+ >=dev-libs/redland-1.0.16
+ >=dev-libs/xmlsec-1.2.28[nss]
+ media-gfx/fontforge
+ media-gfx/graphite2
+ media-libs/fontconfig
+ media-libs/freetype:2
+ >=media-libs/harfbuzz-0.9.42:=[graphite,icu]
+ media-libs/lcms:2
+ >=media-libs/libcdr-0.1.0
+ >=media-libs/libepoxy-1.3.1[X]
+ >=media-libs/libfreehand-0.1.0
+ media-libs/libpagemaker
+ >=media-libs/libpng-1.4:0=
+ >=media-libs/libvisio-0.1.0
+ media-libs/libzmf
+ net-libs/neon
+ net-misc/curl
+ sci-mathematics/lpsolve
+ sys-libs/zlib
+ virtual/glu
+ virtual/jpeg:0
+ virtual/opengl
+ x11-libs/cairo[X]
+ x11-libs/libXinerama
+ x11-libs/libXrandr
+ x11-libs/libXrender
+ net-print/cups
+ sys-apps/dbus[X]
+ gnome? (
+ dev-libs/glib:2
+ gnome-base/dconf
+ gnome-extra/evolution-data-server
+ )
+ media-libs/gstreamer:1.0
+ media-libs/gst-plugins-base:1.0
+ !kde? (
+ dev-libs/glib:2
+ dev-libs/gobject-introspection
+ gnome-base/dconf
+ media-libs/mesa[egl]
+ x11-libs/gtk+:3
+ x11-libs/pango
+ )
+ kde? (
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtx11extras:5
+ kde-frameworks/kconfig:5
+ kde-frameworks/kcoreaddons:5
+ kde-frameworks/ki18n:5
+ kde-frameworks/kio:5
+ kde-frameworks/kwindowsystem:5
+ )
+ dev-db/mariadb-connector-c
+"
+
+RDEPEND="${COMMON_DEPEND}
+ !app-office/libreoffice
+ !app-office/openoffice
+ media-fonts/liberation-fonts
+ || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
+ java? ( >=virtual/jre-1.8 )
+ kde? ( kde-frameworks/breeze-icons:* )
+"
+
+PDEPEND="
+ =app-office/libreoffice-l10n-$(ver_cut 1-4)*
+"
+
+DEPEND="dev-util/xdelta:3"
+
+# only one flavor at a time
+REQUIRED_USE="kde? ( !gnome ) gnome? ( !kde ) ${PYTHON_REQUIRED_USE}"
+
+RESTRICT="test strip"
+
+S="${WORKDIR}"
+
+PYTHON_UPDATER_IGNORE="1"
+
+QA_PREBUILT="/usr/*"
+
+pkg_setup() {
+ python-single-r1_pkg_setup
+}
+
+src_unpack() {
+ einfo "Uncompressing distfile ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PV}.tar.xz"
+ xz -cd "${DISTDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PV}.tar.xz" > "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PV}.tar" || die
+
+ local patchname
+ use kde && patchname="-kde"
+ use gnome && patchname="-gnome"
+ use java && patchname="${patchname}-java"
+
+ if [[ -n "${patchname}" ]]; then
+ einfo "Patching distfile ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PV}.tar using ${ARCH}-${BASE_PACKAGENAME}-libreoffice${patchname}-${PV}.xd3"
+ xdelta3 -d -s "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PV}.tar" "${DISTDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice${patchname}-${PV}.xd3" "${WORKDIR}/tmpdist.tar" || die
+ mv "${WORKDIR}/tmpdist.tar" "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PV}.tar" || die
+ fi
+
+ einfo "Unpacking new ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PV}.tar"
+ unpack "./${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PV}.tar"
+}
+
+src_prepare() {
+ cp "${FILESDIR}"/50-${PN} "${T}"
+ eprefixify "${T}"/50-${PN}
+ default
+}
+
+src_configure() { :; }
+
+src_compile() { :; }
+
+src_install() {
+ dodir /usr
+ cp -aR "${S}"/usr/* "${ED}"/usr/
+
+ # prevent revdep-rebuild from attempting to rebuild all the time
+ insinto /etc/revdep-rebuild && doins "${T}/50-${PN}"
+}
+
+pkg_postinst() {
+ xdg_icon_cache_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+
+ ewarn 'If you plan to use the Base application you should use a source build and enable java and firebird.'
+}
+
+pkg_postrm() {
+ xdg_icon_cache_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+}
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 6c68d29752ff..76fa85c142c0 100644
Binary files a/dev-libs/Manifest.gz and b/dev-libs/Manifest.gz differ
diff --git a/dev-libs/isl/isl-0.23-r1.ebuild b/dev-libs/isl/isl-0.23-r1.ebuild
index 48075003b467..fa4c7a330258 100644
--- a/dev-libs/isl/isl-0.23-r1.ebuild
+++ b/dev-libs/isl/isl-0.23-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://isl.gforge.inria.fr/${P}.tar.xz"
LICENSE="LGPL-2.1"
SLOT="0/23"
-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 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="static-libs"
RDEPEND=">=dev-libs/gmp-5.1.3-r1[${MULTILIB_USEDEP}]"
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 1a852e96f232..4459e112001f 100644
Binary files a/dev-python/Manifest.gz and b/dev-python/Manifest.gz differ
diff --git a/dev-python/jsonpickle/metadata.xml b/dev-python/jsonpickle/metadata.xml
index 6ee6ba05b2b7..bb556639ea8b 100644
--- a/dev-python/jsonpickle/metadata.xml
+++ b/dev-python/jsonpickle/metadata.xml
@@ -5,6 +5,7 @@
python@gentoo.org
Python
+
jsonpickle
jsonpickle/jsonpickle
diff --git a/dev-python/keyring/Manifest b/dev-python/keyring/Manifest
index b92afdcb531e..7cc4968003c3 100644
--- a/dev-python/keyring/Manifest
+++ b/dev-python/keyring/Manifest
@@ -2,3 +2,4 @@ DIST keyring-21.4.0.tar.gz 73591 BLAKE2B ad8fe71a6a8bd3180b01ce3ca0372f9d1dc493d
DIST keyring-21.5.0.tar.gz 45885 BLAKE2B 73fe60f0d414cad3b36e0c995b63f048f75358b9f4d389f41ae3a32d68c82ccb9d1fe76d9bd375d06519bcebb8ad9aa34ba98676bf37f3c5a10d9424c161e074 SHA512 25cbbcac0810829e48e6ff4c9497b8c9f3c03011047e76a6901f6c422d6eb1711e535233a90d96f8dc16a77352d4228114f3b447d9e196184a9d87402658f5bd
DIST keyring-21.6.0.tar.gz 46983 BLAKE2B 847d4de4ec23ce0280684a00a9c2de77a13dc23bfe14e8ee22b4e2442a7c17ae61416c99997cef3177291ea835d4f3d24c8ac27a00a71bb95196c99d49921493 SHA512 892c5f019fecb145546488045152c2bfa5897e05ace9c370979a9d239f7ca50ed8e6f818a1306bfabaad62f1b5e4983784384e52b404e5108b397b1bd7125b5f
DIST keyring-21.7.0.tar.gz 46998 BLAKE2B 469d2de254ed88604a40a4e05c001f50986f55296d35b54969cfa8612473cbd5184f36bd6babdfb6631ab908e03f81858434b7e52471a2d366f97293c2c0ed93 SHA512 8fc5e8f0f0cf2a336c6ce900d59fcd31b4ec270d62559a1c2b4c36803428532b463bad0b2ace9af33b6fb0d50de94229449c4ef4042287ecaa8f1fac37c5faf8
+DIST keyring-21.8.0.tar.gz 47639 BLAKE2B 3b8b11cd7ea121f9d8544a5775d9f62de23613da0265f0d815687ad311f4a7b6ed431142682df3059fbe43a342c6151871782a850c416a5b50c1df14a64d609a SHA512 4acadf421946644466b5c43481eddd111170185ba3993f4fec38cad0129259bd17aebad4dc2e2d2e88e84aa814e62d37b39efe7385ccd569e40a5291d5f4ae40
diff --git a/dev-python/keyring/keyring-21.8.0.ebuild b/dev-python/keyring/keyring-21.8.0.ebuild
new file mode 100644
index 000000000000..e2a8239584f5
--- /dev/null
+++ b/dev-python/keyring/keyring-21.8.0.ebuild
@@ -0,0 +1,45 @@
+# 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..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 ~x64-macos"
+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
+ rm tests/backends/test_kwallet.py || die
+
+ distutils-r1_python_prepare_all
+
+ export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+}
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 146de1c73c02..5c0d9ea1eea4 100644
Binary files a/dev-util/Manifest.gz and b/dev-util/Manifest.gz differ
diff --git a/dev-util/lttng-ust/Manifest b/dev-util/lttng-ust/Manifest
index edc6ca21cf31..c19ca7642412 100644
--- a/dev-util/lttng-ust/Manifest
+++ b/dev-util/lttng-ust/Manifest
@@ -1,2 +1,3 @@
+DIST lttng-ust-2.11.0.tar.bz2 824285 BLAKE2B 161d50282a95cce47ab3811216241ade73e2002d8f03aa2266b5add36d06552f5620b912eeecff1173f43eec107b385f1b93783905f36a42baf5a63c37ea35fc SHA512 fb7258961a7e913487806a7e0129c95becff8c631382b119ff1d78f95cdd7460ec24e62671642160fdb006a3a292b2b10f35c8424f0367ce7c6a41cbcca77a09
DIST lttng-ust-2.12.0.tar.bz2 853127 BLAKE2B 6a6655a4aa33ec6318255d05d0e000c19fb66d4049873f091b8e19f3f9ea0c15731db70af77dbab1d597edcafcd745f1dae2670cd38759c9b54ea38b1135b590 SHA512 d69772170f57b9669b99cea372ca537777151a31b82002e1e5ec80da3ceb302c23f0f85d63a2c95c90a375b879e266aa5297e7d6444050dd40feb1253d863801
DIST lttng-ust-2.8.1.tar.bz2 743271 BLAKE2B d6adac00525ab747306288dd71f27ce982dd93e4ff42b9938064ae1435ad1c0867acebe3030a33748dc9aa78b6200ba2c47631e4359a963772fc4685472d21ae SHA512 15c459620cb73ef5be8c7df2ef02663ef650555b973a3d1ed976ae38068b53a8c83143a611bcb53e91a3f211361c44cd2a331cb41dd53d28a69924f7ac44cc95
diff --git a/dev-util/lttng-ust/lttng-ust-2.11.0.ebuild b/dev-util/lttng-ust/lttng-ust-2.11.0.ebuild
new file mode 100644
index 000000000000..bbe2663203dd
--- /dev/null
+++ b/dev-util/lttng-ust/lttng-ust-2.11.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+MY_P="${P/_rc/-rc}"
+MY_SLOT="$(ver_cut 1-2)"
+
+DESCRIPTION="Linux Trace Toolkit - UST library"
+HOMEPAGE="https://lttng.org"
+SRC_URI="https://lttng.org/files/${PN}/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0/${MY_SLOT}"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86"
+IUSE="examples numa"
+
+DEPEND="
+ dev-libs/userspace-rcu:=
+ numa? ( sys-process/numactl )
+ "
+RDEPEND="${DEPEND}"
+
+PATCHES=("${FILESDIR}"/${P}-fno-common.patch)
+
+S="${WORKDIR}"/${MY_P}
+
+src_prepare() {
+ default
+ if ! use examples; then
+ sed -i -e '/SUBDIRS/s:examples::' doc/Makefile.am || die
+ fi
+ eautoreconf
+}
+
+src_configure() {
+ econf $(use_enable numa)
+}
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index f764e2f88aa1..5c6e458ead30 100644
Binary files a/media-gfx/Manifest.gz and b/media-gfx/Manifest.gz differ
diff --git a/media-gfx/valentina/valentina-0.6.1-r1.ebuild b/media-gfx/valentina/valentina-0.6.1-r1.ebuild
index ac59849d9eea..d6decfb393ab 100644
--- a/media-gfx/valentina/valentina-0.6.1-r1.ebuild
+++ b/media-gfx/valentina/valentina-0.6.1-r1.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-inherit qmake-utils gnome2-utils xdg
+inherit qmake-utils xdg
DESCRIPTION="Cloth patternmaking software"
HOMEPAGE="https://valentinaproject.bitbucket.io/"
@@ -21,24 +21,25 @@ for LANG in ${LANGS}; do
IUSE="${IUSE} l10n_${LANG}"
done
-CDEPEND="
+RDEPEND="
app-text/poppler
- dev-qt/linguist:5
dev-qt/qtconcurrent:5
dev-qt/qtcore:5
dev-qt/qtgui:5
dev-qt/qtnetwork:5[ssl]
- dev-qt/qtopengl
+ dev-qt/qtopengl:5
dev-qt/qtprintsupport:5
dev-qt/qtsvg:5
dev-qt/qtwidgets:5
dev-qt/qtxml:5
dev-qt/qtxmlpatterns:5"
-RDEPEND="${CDEPEND}"
DEPEND="
- ${CDEPEND}
+ ${RDEPEND}
dev-qt/qttest:5
"
+BDEPEND="
+ dev-qt/linguist-tools:5
+"
S=${WORKDIR}/${PN}-v${PV}
diff --git a/media-gfx/valentina/valentina-9999.ebuild b/media-gfx/valentina/valentina-9999.ebuild
index abe4eee7ed04..5a7446534735 100644
--- a/media-gfx/valentina/valentina-9999.ebuild
+++ b/media-gfx/valentina/valentina-9999.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-inherit qmake-utils gnome2-utils xdg git-r3
+inherit qmake-utils xdg git-r3
DESCRIPTION="Cloth patternmaking software"
HOMEPAGE="https://gitlab.com/smart-pattern/valentina"
@@ -21,24 +21,25 @@ for LANG in ${LANGS}; do
IUSE="${IUSE} l10n_${LANG}"
done
-CDEPEND="
+RDEPEND="
app-text/poppler
- dev-qt/linguist:5
dev-qt/qtconcurrent:5
dev-qt/qtcore:5
dev-qt/qtgui:5
dev-qt/qtnetwork:5[ssl]
- dev-qt/qtopengl
+ dev-qt/qtopengl:5
dev-qt/qtprintsupport:5
dev-qt/qtsvg:5
dev-qt/qtwidgets:5
dev-qt/qtxml:5
dev-qt/qtxmlpatterns:5"
-RDEPEND="${CDEPEND}"
DEPEND="
- ${CDEPEND}
+ ${RDEPEND}
dev-qt/qttest:5
"
+BDEPEND="
+ dev-qt/linguist-tools:5
+"
src_configure() {
local locales=""
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 4806223bb62b..06155ed77278 100644
Binary files a/media-libs/Manifest.gz and b/media-libs/Manifest.gz differ
diff --git a/media-libs/libkeyfinder/Manifest b/media-libs/libkeyfinder/Manifest
new file mode 100644
index 000000000000..37c7a17c0762
--- /dev/null
+++ b/media-libs/libkeyfinder/Manifest
@@ -0,0 +1 @@
+DIST libkeyfinder-2.2.3.tar.gz 117373 BLAKE2B a6d3ff64f26e0842c95dea125ae86f3c642db101fe934bf0a54a3586276cea1f2ee427e480e4f375067b80b2c9d9623f9276110371cc91c8b8d9319c92fd91d3 SHA512 7617bb7305854790e2d5fba5e401387612cad4fa61e9209a6af45301ee8dcc990c116e478c70a5d845d12fc6dfaf63362dca608f4774640bc6c29459ca192f45
diff --git a/media-libs/libkeyfinder/libkeyfinder-2.2.3.ebuild b/media-libs/libkeyfinder/libkeyfinder-2.2.3.ebuild
new file mode 100644
index 000000000000..9a3be69a665b
--- /dev/null
+++ b/media-libs/libkeyfinder/libkeyfinder-2.2.3.ebuild
@@ -0,0 +1,30 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Musical key detection library for digital audio"
+HOMEPAGE="https://github.com/mixxxdj/libKeyFinder"
+SRC_URI="https://github.com/mixxxdj/libKeyFinder/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+ sci-libs/fftw:3.0
+"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/libKeyFinder-${PV}
+
+src_prepare() {
+ sed -i -e "s/NAMES fftw /NAMES /" \
+ cmake/FindFFTW.cmake || die
+ sed -i -e "s/DESTINATION lib/DESTINATION $(get_libdir)/" \
+ CMakeLists.txt || die
+ cmake_src_prepare
+}
diff --git a/media-libs/libkeyfinder/metadata.xml b/media-libs/libkeyfinder/metadata.xml
new file mode 100644
index 000000000000..e1df46e39c20
--- /dev/null
+++ b/media-libs/libkeyfinder/metadata.xml
@@ -0,0 +1,8 @@
+
+
+
+
+ proaudio@gentoo.org
+ Gentoo ProAudio Project
+
+
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 001f21ca96be..35ec65ac4ab2 100644
Binary files a/media-sound/Manifest.gz and b/media-sound/Manifest.gz differ
diff --git a/media-sound/guitarix/Manifest b/media-sound/guitarix/Manifest
index 5b7603f1c81f..734320f450c8 100644
--- a/media-sound/guitarix/Manifest
+++ b/media-sound/guitarix/Manifest
@@ -1 +1,2 @@
DIST guitarix2-0.41.0.tar.xz 70865716 BLAKE2B d3caa51f297153c16df624ababaffc1405ddb10f04ae01672720bb2229d4be3426b33f75021b1862f996fb09466eaad008f748b42cb8382f08d14e23758cfc9b SHA512 27fe6f2b87c8913feafae1c17472150d37df46ed3437b033cd22f509edf67420fb8f4024e404d5bec901a687dbe948acda702bf37cb0c738feb5b3b8e5ebb8aa
+DIST guitarix2-0.42.1.tar.xz 71825372 BLAKE2B 06b2a19d68e77c622eea222e3f0658d9f89c6c8377e9b0442d581e14342f82f97948ca0ebb7ff40f4abd6cab0c9ba582fa6f43f74cad5e112d2e762445f2ab43 SHA512 66a71b4d66e0cbcff7feeceae6317c016e497626c9fde3ca44e1f06e42d9021b2857151660c1c49832cc8e6f2aa27de68dfea67d4e896c7e89f84865f8ba1eb0
diff --git a/media-sound/guitarix/guitarix-0.42.1.ebuild b/media-sound/guitarix/guitarix-0.42.1.ebuild
new file mode 100644
index 000000000000..2c8d5e6f5a0f
--- /dev/null
+++ b/media-sound/guitarix/guitarix-0.42.1.ebuild
@@ -0,0 +1,90 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+PYTHON_REQ_USE='threads(+)'
+
+inherit python-any-r1 waf-utils xdg
+
+MY_P="${PN}2-${PV}"
+
+DESCRIPTION="Virtual guitar amplifier for Linux"
+HOMEPAGE="https://guitarix.org/"
+SRC_URI="mirror://sourceforge/guitarix/guitarix/${MY_P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="bluetooth debug lv2 nls nsm +standalone zeroconf"
+REQUIRED_USE="|| ( lv2 standalone )"
+
+DEPEND="
+ dev-cpp/eigen:3
+ dev-cpp/glibmm:2
+ dev-cpp/gtkmm:3.0
+ dev-libs/glib:2
+ >=media-libs/libsndfile-1.0.17
+ >=media-libs/zita-convolver-3:=
+ media-libs/zita-resampler
+ >=net-misc/curl-7.26.0
+ >=sci-libs/fftw-3.3.8:3.0=
+ x11-libs/gtk+:3
+ lv2? ( media-libs/lv2 )
+ standalone? (
+ dev-libs/boost:=
+ media-libs/liblrdf
+ media-libs/lilv
+ virtual/jack
+ bluetooth? ( net-wireless/bluez )
+ nsm? ( media-libs/liblo )
+ zeroconf? ( net-dns/avahi )
+ )
+"
+# roboto fonts are required for correct ui rendering
+RDEPEND="
+ ${DEPEND}
+ standalone? (
+ media-fonts/roboto
+ )
+"
+BDEPEND="
+ ${PYTHON_DEPS}
+ virtual/pkgconfig
+ standalone? (
+ dev-lang/sassc
+ nls? (
+ dev-util/intltool
+ sys-devel/gettext
+ )
+ )
+"
+
+DOCS=( changelog README )
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.41.0-nostrip.patch
+)
+
+src_configure() {
+ local myconf=(
+ --cxxflags-debug=""
+ --cxxflags-release="-DNDEBUG"
+ --ldflags="${LDFLAGS}"
+ --enable-lfs
+ --lib-dev
+ --no-desktop-update
+ --no-faust
+ --no-ldconfig
+ --shared-lib
+ $(use_enable nls)
+ $(usex bluetooth "" "--no-bluez")
+ $(usex debug "--debug" "")
+ $(usex lv2 "--lv2dir=${EPREFIX}/usr/$(get_libdir)/lv2" "--no-lv2 --no-lv2-gui")
+ $(usex nsm "" "--no-nsm")
+ $(usex standalone "" "--no-standalone")
+ $(usex zeroconf "" "--no-avahi")
+ )
+ waf-utils_src_configure "${myconf[@]}"
+}
diff --git a/media-sound/guitarix/guitarix-9999.ebuild b/media-sound/guitarix/guitarix-9999.ebuild
index 1f66e9647b1f..5bd6d0e7b8af 100644
--- a/media-sound/guitarix/guitarix-9999.ebuild
+++ b/media-sound/guitarix/guitarix-9999.ebuild
@@ -1,9 +1,9 @@
# Copyright 2019-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
PYTHON_REQ_USE='threads(+)'
inherit python-any-r1 waf-utils xdg git-r3
@@ -21,7 +21,8 @@ KEYWORDS=""
IUSE="bluetooth debug lv2 nls nsm +standalone zeroconf"
REQUIRED_USE="|| ( lv2 standalone )"
-COMMON_DEPEND="dev-cpp/eigen:3
+DEPEND="
+ dev-cpp/eigen:3
dev-cpp/glibmm:2
dev-cpp/gtkmm:3.0
dev-libs/glib:2
@@ -29,7 +30,7 @@ COMMON_DEPEND="dev-cpp/eigen:3
>=media-libs/zita-convolver-3:=
media-libs/zita-resampler
>=net-misc/curl-7.26.0
- >=sci-libs/fftw-3.1.2:3.0=
+ >=sci-libs/fftw-3.3.8:3.0=
x11-libs/gtk+:3
lv2? ( media-libs/lv2 )
standalone? (
@@ -43,18 +44,21 @@ COMMON_DEPEND="dev-cpp/eigen:3
)
"
# roboto fonts are required for correct ui rendering
-RDEPEND="${COMMON_DEPEND}
+RDEPEND="
+ ${DEPEND}
standalone? (
media-fonts/roboto
)
"
-DEPEND="${COMMON_DEPEND}
+BDEPEND="
${PYTHON_DEPS}
- dev-lang/sassc
virtual/pkgconfig
- nls? (
- dev-util/intltool
- sys-devel/gettext
+ standalone? (
+ dev-lang/sassc
+ nls? (
+ dev-util/intltool
+ sys-devel/gettext
+ )
)
"
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index b69bac91c4b7..d13d5d02fddb 100644
Binary files a/metadata/Manifest.gz and b/metadata/Manifest.gz differ
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 95a17959f172..d078a61856f5 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Wed, 30 Dec 2020 05:08:33 +0000
+Wed, 30 Dec 2020 15:08:31 +0000
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index a53082b6bf50..eeef05babce9 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Wed, 30 Dec 2020 05:08:34 +0000
+Wed, 30 Dec 2020 15:08:32 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 27e53251cd9d..965180c349ef 100644
Binary files a/metadata/md5-cache/Manifest.gz and b/metadata/md5-cache/Manifest.gz differ
diff --git a/metadata/md5-cache/acct-group/Manifest.gz b/metadata/md5-cache/acct-group/Manifest.gz
index dd16e2408015..3beb782d69f6 100644
Binary files a/metadata/md5-cache/acct-group/Manifest.gz and b/metadata/md5-cache/acct-group/Manifest.gz differ
diff --git a/metadata/md5-cache/acct-group/tomcat-0 b/metadata/md5-cache/acct-group/tomcat-0
new file mode 100644
index 000000000000..67d33f41848e
--- /dev/null
+++ b/metadata/md5-cache/acct-group/tomcat-0
@@ -0,0 +1,7 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group for Apache Tomcat
+EAPI=7
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+SLOT=0
+_eclasses_=acct-group 116bb98dcd4a1bd47e498321249e8845 user b0a0d4ca9e3f79c38f8f4143b8d5a2d8 user-info a2abd4e2f4c3b9b06d64bf1329359a02
+_md5_=22d8c3118d771295733382825aa69ef1
diff --git a/metadata/md5-cache/acct-group/zabbix-0 b/metadata/md5-cache/acct-group/zabbix-0
new file mode 100644
index 000000000000..2c88ee94566f
--- /dev/null
+++ b/metadata/md5-cache/acct-group/zabbix-0
@@ -0,0 +1,7 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=Group for Zabbix
+EAPI=7
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+SLOT=0
+_eclasses_=acct-group 116bb98dcd4a1bd47e498321249e8845 user b0a0d4ca9e3f79c38f8f4143b8d5a2d8 user-info a2abd4e2f4c3b9b06d64bf1329359a02
+_md5_=0e5bccce5fd1cff14837041638da2f18
diff --git a/metadata/md5-cache/acct-user/Manifest.gz b/metadata/md5-cache/acct-user/Manifest.gz
index 79e8af228a63..16b73b7cde42 100644
Binary files a/metadata/md5-cache/acct-user/Manifest.gz and b/metadata/md5-cache/acct-user/Manifest.gz differ
diff --git a/metadata/md5-cache/acct-user/tomcat-0 b/metadata/md5-cache/acct-user/tomcat-0
new file mode 100644
index 000000000000..f2217727b9d8
--- /dev/null
+++ b/metadata/md5-cache/acct-user/tomcat-0
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for Apache Tomcat
+EAPI=7
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+RDEPEND=acct-group/tomcat
+SLOT=0
+_eclasses_=acct-user 2b48e3ed041a5adbb1b59c0dc5e961d4 user b0a0d4ca9e3f79c38f8f4143b8d5a2d8 user-info a2abd4e2f4c3b9b06d64bf1329359a02
+_md5_=3da2a4090298f42182774d22aea7b669
diff --git a/metadata/md5-cache/acct-user/zabbix-0 b/metadata/md5-cache/acct-user/zabbix-0
new file mode 100644
index 000000000000..ed63cf34fb48
--- /dev/null
+++ b/metadata/md5-cache/acct-user/zabbix-0
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install postinst preinst prerm pretend
+DESCRIPTION=User for Zabbix
+EAPI=7
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+RDEPEND=acct-group/zabbix
+SLOT=0
+_eclasses_=acct-user 2b48e3ed041a5adbb1b59c0dc5e961d4 user b0a0d4ca9e3f79c38f8f4143b8d5a2d8 user-info a2abd4e2f4c3b9b06d64bf1329359a02
+_md5_=267e3d4f50e7c0889b5a3dbc7887c0d4
diff --git a/metadata/md5-cache/app-backup/Manifest.gz b/metadata/md5-cache/app-backup/Manifest.gz
index 3663efd51077..cc93993ff0cf 100644
Binary files a/metadata/md5-cache/app-backup/Manifest.gz and b/metadata/md5-cache/app-backup/Manifest.gz differ
diff --git a/metadata/md5-cache/app-backup/amanda-3.5.1-r2 b/metadata/md5-cache/app-backup/amanda-3.5.1-r3
similarity index 98%
rename from metadata/md5-cache/app-backup/amanda-3.5.1-r2
rename to metadata/md5-cache/app-backup/amanda-3.5.1-r3
index be5f1909728a..356da9670e94 100644
--- a/metadata/md5-cache/app-backup/amanda-3.5.1-r2
+++ b/metadata/md5-cache/app-backup/amanda-3.5.1-r3
@@ -11,4 +11,4 @@ RDEPEND=acct-group/amanda acct-user/amanda app-arch/dump app-arch/tar dev-libs/g
SLOT=0
SRC_URI=mirror://sourceforge/amanda/amanda-3.5.1.tar.gz
_eclasses_=autotools 3ec5e49b810b2571ca9c6d76f55867bb libtool f143db5a74ccd9ca28c1234deffede96 multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 perl-functions 6ec4c4d8fc8324200f1c14e8d158c59b perl-module 97206c028d9bdc9f248e022ac5c9fc83 systemd 74b223e42834adf09a2d21fe5fe13741 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
-_md5_=ac7804f641d15385c5af8e872e0f360c
+_md5_=9adb99ce6b2a4a1fe7e0b72f43ea677b
diff --git a/metadata/md5-cache/app-cdr/Manifest.gz b/metadata/md5-cache/app-cdr/Manifest.gz
index dd01df989101..2a6050d29acd 100644
Binary files a/metadata/md5-cache/app-cdr/Manifest.gz and b/metadata/md5-cache/app-cdr/Manifest.gz differ
diff --git a/metadata/md5-cache/app-cdr/dvdisaster-0.79.5 b/metadata/md5-cache/app-cdr/dvdisaster-0.79.5
index 3fad0ca14321..1b7d1d9aab58 100644
--- a/metadata/md5-cache/app-cdr/dvdisaster-0.79.5
+++ b/metadata/md5-cache/app-cdr/dvdisaster-0.79.5
@@ -11,4 +11,4 @@ RDEPEND=dev-libs/glib:2 x11-libs/gdk-pixbuf x11-libs/gtk+:2 nls? ( virtual/libin
SLOT=0
SRC_URI=http://dvdisaster.net/downloads/dvdisaster-0.79.5.tar.bz2
_eclasses_=desktop 7fd20552ce4cc97e8acb132a499a7dd8 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 605c126bed8d87e4378d5ff1645330cb xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
-_md5_=ac823669c34b3ea01b9ae9de527470c5
+_md5_=3513bd6917a9c6faaee7e608ab736c05
diff --git a/metadata/md5-cache/app-doc/Manifest.gz b/metadata/md5-cache/app-doc/Manifest.gz
index 697b05379aec..da1d7678c01f 100644
Binary files a/metadata/md5-cache/app-doc/Manifest.gz and b/metadata/md5-cache/app-doc/Manifest.gz differ
diff --git a/metadata/md5-cache/app-doc/gnucash-docs-4.4 b/metadata/md5-cache/app-doc/gnucash-docs-4.4
new file mode 100644
index 000000000000..77e0a37d370f
--- /dev/null
+++ b/metadata/md5-cache/app-doc/gnucash-docs-4.4
@@ -0,0 +1,13 @@
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile install postinst prepare
+DEPEND=app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets app-text/rarian dev-libs/libxml2 dev-libs/libxslt
+DESCRIPTION=Documentation package for GnuCash
+EAPI=7
+HOMEPAGE=https://www.gnucash.org/
+IUSE=l10n_de l10n_it l10n_ja l10n_pt
+KEYWORDS=~amd64 ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-2 FDL-1.1
+SLOT=0
+SRC_URI=https://github.com/Gnucash/gnucash-docs/archive/4.4.tar.gz -> gnucash-docs-4.4.tar.gz
+_eclasses_=autotools 3ec5e49b810b2571ca9c6d76f55867bb libtool f143db5a74ccd9ca28c1234deffede96 multilib d410501a125f99ffb560b0c523cd3d1e optfeature 6c9aa35fc16df43d7142ef2660e00e25 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
+_md5_=3452227558953a89558df6acf30bcfca
diff --git a/metadata/md5-cache/app-mobilephone/Manifest.gz b/metadata/md5-cache/app-mobilephone/Manifest.gz
index 3b7c1522b8d2..b127780e6c59 100644
Binary files a/metadata/md5-cache/app-mobilephone/Manifest.gz and b/metadata/md5-cache/app-mobilephone/Manifest.gz differ
diff --git a/metadata/md5-cache/app-mobilephone/gammu-1.41.0 b/metadata/md5-cache/app-mobilephone/gammu-1.41.0
index c14a9b968211..34ea2fa24e0d 100644
--- a/metadata/md5-cache/app-mobilephone/gammu-1.41.0
+++ b/metadata/md5-cache/app-mobilephone/gammu-1.41.0
@@ -1,14 +1,14 @@
BDEPEND=dev-util/ninja dev-util/cmake
DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/glib:2= virtual/libgudev:= virtual/libiconv bluetooth? ( net-wireless/bluez:= ) curl? ( net-misc/curl:= ) dbi? ( >=dev-db/libdbi-0.8.3:= ) irda? ( virtual/os-headers ) mysql? ( dev-db/mysql-connector-c:= ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC ) postgres? ( dev-db/postgresql:= ) usb? ( virtual/libusb:1= )
+DEPEND=dev-libs/glib:2= dev-libs/libgudev:= virtual/libiconv bluetooth? ( net-wireless/bluez:= ) curl? ( net-misc/curl:= ) dbi? ( >=dev-db/libdbi-0.8.3:= ) irda? ( virtual/os-headers ) mysql? ( dev-db/mysql-connector-c:= ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC ) postgres? ( dev-db/postgresql:= ) usb? ( virtual/libusb:1= )
DESCRIPTION=A tool to handle your cellular phone
EAPI=7
HOMEPAGE=https://wammu.eu/gammu/
IUSE=bluetooth curl dbi debug irda mysql nls odbc postgres usb
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
-RDEPEND=dev-libs/glib:2= virtual/libgudev:= virtual/libiconv bluetooth? ( net-wireless/bluez:= ) curl? ( net-misc/curl:= ) dbi? ( >=dev-db/libdbi-0.8.3:= ) irda? ( virtual/os-headers ) mysql? ( dev-db/mysql-connector-c:= ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC ) postgres? ( dev-db/postgresql:= ) usb? ( virtual/libusb:1= ) dev-util/dialog
+RDEPEND=dev-libs/glib:2= dev-libs/libgudev:= virtual/libiconv bluetooth? ( net-wireless/bluez:= ) curl? ( net-misc/curl:= ) dbi? ( >=dev-db/libdbi-0.8.3:= ) irda? ( virtual/os-headers ) mysql? ( dev-db/mysql-connector-c:= ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC ) postgres? ( dev-db/postgresql:= ) usb? ( virtual/libusb:1= ) dev-util/dialog
SLOT=0
SRC_URI=https://dl.cihar.com/gammu/releases/gammu-1.41.0.tar.bz2
_eclasses_=cmake ac7cb516f6a288b6a82bc0649ce49878 edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic 09a8beb8e6a8e02dc1e1bd83ac353741 l10n 8cdd85e169b835d518bc2fd59f780d8e multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 605c126bed8d87e4378d5ff1645330cb wrapper 4251d4c84c25f59094fd557e0063a974 xdg-utils ff2ff954e6b17929574eee4efc5152ba
-_md5_=05f8b7fd1ce4856a6f5c93921c9aedd3
+_md5_=ce000cebf7fbe08fbb09c6e1d4cfd3fc
diff --git a/metadata/md5-cache/app-office/Manifest.gz b/metadata/md5-cache/app-office/Manifest.gz
index 35b8a28e92d8..8962cb6749e5 100644
Binary files a/metadata/md5-cache/app-office/Manifest.gz and b/metadata/md5-cache/app-office/Manifest.gz differ
diff --git a/metadata/md5-cache/app-office/gnucash-4.4 b/metadata/md5-cache/app-office/gnucash-4.4
new file mode 100644
index 000000000000..a8a5eb3b22b9
--- /dev/null
+++ b/metadata/md5-cache/app-office/gnucash-4.4
@@ -0,0 +1,17 @@
+BDEPEND=dev-lang/swig dev-util/cmake virtual/pkgconfig || ( >=sys-devel/gcc-8:* >=sys-devel/clang-6:* ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test
+DEPEND=>=dev-libs/glib-2.56.1:2 >=dev-scheme/guile-2.2.0:=[regex] >=sys-libs/zlib-1.1.4 dev-libs/boost:=[icu,nls] dev-libs/icu:= dev-libs/libxml2:2 dev-libs/libxslt aqbanking? ( >=net-libs/aqbanking-6[ofx?] sys-libs/gwenhywfar:= smartcard? ( sys-libs/libchipcard ) ) gnome-keyring? ( >=app-crypt/libsecret-0.18 ) gui? ( >=x11-libs/gtk+-3.22.30:3 gnome-base/dconf net-libs/webkit-gtk:4= aqbanking? ( sys-libs/gwenhywfar:=[gtk] ) ) mysql? ( dev-db/libdbi dev-db/libdbi-drivers[mysql] ) ofx? ( >=dev-libs/libofx-0.9.1:= ) postgres? ( dev-db/libdbi dev-db/libdbi-drivers[postgres] ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) quotes? ( >=dev-perl/Finance-Quote-1.11 dev-perl/Date-Manip dev-perl/HTML-TableExtract ) sqlite? ( dev-db/libdbi dev-db/libdbi-drivers[sqlite] ) >=dev-cpp/gtest-1.8.0 >=sys-devel/gettext-0.20 dev-lang/perl dev-perl/XML-Parser sys-devel/libtool
+DESCRIPTION=A personal finance manager
+EAPI=7
+HOMEPAGE=https://www.gnucash.org/
+IUSE=aqbanking debug doc examples gnome-keyring +gui mysql nls ofx postgres python quotes -register2 smartcard sqlite test python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
+KEYWORDS=~amd64 ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+PDEPEND=doc? ( ~app-doc/gnucash-docs-4.4 gnome-extra/yelp )
+RDEPEND=>=dev-libs/glib-2.56.1:2 >=dev-scheme/guile-2.2.0:=[regex] >=sys-libs/zlib-1.1.4 dev-libs/boost:=[icu,nls] dev-libs/icu:= dev-libs/libxml2:2 dev-libs/libxslt aqbanking? ( >=net-libs/aqbanking-6[ofx?] sys-libs/gwenhywfar:= smartcard? ( sys-libs/libchipcard ) ) gnome-keyring? ( >=app-crypt/libsecret-0.18 ) gui? ( >=x11-libs/gtk+-3.22.30:3 gnome-base/dconf net-libs/webkit-gtk:4= aqbanking? ( sys-libs/gwenhywfar:=[gtk] ) ) mysql? ( dev-db/libdbi dev-db/libdbi-drivers[mysql] ) ofx? ( >=dev-libs/libofx-0.9.1:= ) postgres? ( dev-db/libdbi dev-db/libdbi-drivers[postgres] ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) quotes? ( >=dev-perl/Finance-Quote-1.11 dev-perl/Date-Manip dev-perl/HTML-TableExtract ) sqlite? ( dev-db/libdbi dev-db/libdbi-drivers[sqlite] )
+REQUIRED_USE=examples? ( gui ) python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 ) ) smartcard? ( aqbanking )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/Gnucash/gnucash/releases/download/4.4/gnucash-4.4.tar.bz2
+_eclasses_=cmake ac7cb516f6a288b6a82bc0649ce49878 edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic 09a8beb8e6a8e02dc1e1bd83ac353741 gnome2-utils c8e3fff820d850c0e003e22208d2eea3 l10n 8cdd85e169b835d518bc2fd59f780d8e multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-single-r1 d3100de905f978df912135806cf27188 python-utils-r1 e41e32d357e5bdd388b5be2ce24f3883 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb wrapper 4251d4c84c25f59094fd557e0063a974 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_md5_=a4268c48c386403cd00513132591d202
diff --git a/metadata/md5-cache/app-office/libreoffice-bin-6.4.7.2_p2 b/metadata/md5-cache/app-office/libreoffice-bin-6.4.7.2_p2
new file mode 100644
index 000000000000..42df92ddf802
--- /dev/null
+++ b/metadata/md5-cache/app-office/libreoffice-bin-6.4.7.2_p2
@@ -0,0 +1,16 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
+DEPEND=dev-util/xdelta:3 java? ( >=dev-java/java-config-2.2.0-r3 )
+DESCRIPTION=A full office productivity suite. Binary package
+EAPI=7
+HOMEPAGE=https://www.libreoffice.org
+IUSE=gnome java kde elibc_FreeBSD java +python_single_target_python3_8
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=LGPL-3
+PDEPEND==app-office/libreoffice-l10n-6.4.7.2*
+RDEPEND=app-text/hunspell:0/1.7 =app-text/libexttextcat-3.4* =app-text/libmwaw-0.3* dev-libs/boost:0/1.74.0 dev-libs/icu:0/68.2 dev-libs/liborcus:0/0.15 >=media-gfx/graphite2-1.3.10 media-libs/harfbuzz:0/0.9.18[icu] media-libs/libpng:0/16 >=sys-devel/gcc-9.3.0 >=sys-libs/glibc-2.32 virtual/jpeg-compat:62 python_single_target_python3_8? ( dev-lang/python:3.8[xml] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) app-arch/unzip app-arch/zip app-crypt/gpgme[cxx] app-text/hunspell:= >=app-text/libabw-0.1.0 >=app-text/libebook-0.1 app-text/libepubgen >=app-text/libetonyek-0.1 app-text/libexttextcat app-text/liblangtag >=app-text/libmspub-0.1.0 >=app-text/libmwaw-0.3.1 app-text/libnumbertext >=app-text/libodfgen-0.1.0 app-text/libqxp app-text/libstaroffice app-text/libwpd:0.10[tools] app-text/libwpg:0.3 >=app-text/libwps-0.4 app-text/mythes >=dev-cpp/clucene-2.3.3.4-r2 >=dev-cpp/libcmis-0.5.2 dev-db/unixODBC dev-lang/perl >=dev-libs/boost-1.72.0:=[nls] dev-libs/expat dev-libs/hyphen dev-libs/icu:= dev-libs/libassuan dev-libs/libgpg-error dev-libs/liborcus:0/0.15 dev-libs/librevenge dev-libs/libxml2 dev-libs/libxslt dev-libs/nspr dev-libs/nss >=dev-libs/redland-1.0.16 >=dev-libs/xmlsec-1.2.28[nss] media-gfx/fontforge media-gfx/graphite2 media-libs/fontconfig media-libs/freetype:2 >=media-libs/harfbuzz-0.9.42:=[graphite,icu] media-libs/lcms:2 >=media-libs/libcdr-0.1.0 >=media-libs/libepoxy-1.3.1[X] >=media-libs/libfreehand-0.1.0 media-libs/libpagemaker >=media-libs/libpng-1.4:0= >=media-libs/libvisio-0.1.0 media-libs/libzmf net-libs/neon net-misc/curl sci-mathematics/lpsolve sys-libs/zlib virtual/glu virtual/jpeg:0 virtual/opengl x11-libs/cairo[X] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender net-print/cups sys-apps/dbus[X] gnome? ( dev-libs/glib:2 gnome-base/dconf gnome-extra/evolution-data-server ) media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 !kde? ( dev-libs/glib:2 dev-libs/gobject-introspection gnome-base/dconf media-libs/mesa[egl] x11-libs/gtk+:3 x11-libs/pango ) kde? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 kde-frameworks/kconfig:5 kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/kio:5 kde-frameworks/kwindowsystem:5 ) dev-db/mariadb-connector-c !app-office/libreoffice !app-office/openoffice media-fonts/liberation-fonts || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools ) java? ( >=virtual/jre-1.8 ) kde? ( kde-frameworks/breeze-icons:* ) java? ( >=dev-java/java-config-2.2.0-r3 )
+REQUIRED_USE=kde? ( !gnome ) gnome? ( !kde ) ^^ ( python_single_target_python3_8 )
+RESTRICT=test strip
+SLOT=0
+SRC_URI=amd64? ( https://tamiko.43-1.org/distfiles/amd64-bin-libreoffice-6.4.7.2_p2.tar.xz kde? ( !java? ( https://tamiko.43-1.org/distfiles/amd64-bin-libreoffice-kde-6.4.7.2_p2.xd3 ) java? ( https://tamiko.43-1.org/distfiles/amd64-bin-libreoffice-kde-java-6.4.7.2_p2.xd3 ) ) gnome? ( !java? ( https://tamiko.43-1.org/distfiles/amd64-bin-libreoffice-gnome-6.4.7.2_p2.xd3 ) java? ( https://tamiko.43-1.org/distfiles/amd64-bin-libreoffice-gnome-java-6.4.7.2_p2.xd3 ) ) !kde? ( !gnome? ( java? ( https://tamiko.43-1.org/distfiles/amd64-bin-libreoffice-java-6.4.7.2_p2.xd3 ) ) ) ) x86? ( https://tamiko.43-1.org/distfiles/x86-bin-libreoffice-6.4.7.2_p2.tar.xz kde? ( !java? ( https://tamiko.43-1.org/distfiles/x86-bin-libreoffice-kde-6.4.7.2_p2.xd3 ) java? ( https://tamiko.43-1.org/distfiles/x86-bin-libreoffice-kde-java-6.4.7.2_p2.xd3 ) ) gnome? ( !java? ( https://tamiko.43-1.org/distfiles/x86-bin-libreoffice-gnome-6.4.7.2_p2.xd3 ) java? ( https://tamiko.43-1.org/distfiles/x86-bin-libreoffice-gnome-java-6.4.7.2_p2.xd3 ) ) !kde? ( !gnome? ( java? ( https://tamiko.43-1.org/distfiles/x86-bin-libreoffice-java-6.4.7.2_p2.xd3 ) ) ) )
+_eclasses_=java-pkg-opt-2 77d2e22d0de7640f817d20e861c0ff3f java-utils-2 378e4cda228ea0231a0ac283cb2ad25c multilib d410501a125f99ffb560b0c523cd3d1e prefix de7d8e2b10085ed5ff09ad70e4753e5c python-single-r1 d3100de905f978df912135806cf27188 python-utils-r1 e41e32d357e5bdd388b5be2ce24f3883 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_md5_=55b6fd06855e90eac2abef9cd18d92f8
diff --git a/metadata/md5-cache/app-office/libreoffice-bin-debug-6.4.7.2_p2 b/metadata/md5-cache/app-office/libreoffice-bin-debug-6.4.7.2_p2
new file mode 100644
index 000000000000..42fc40448ada
--- /dev/null
+++ b/metadata/md5-cache/app-office/libreoffice-bin-debug-6.4.7.2_p2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install unpack
+DEPEND=dev-util/xdelta:3
+DESCRIPTION=LibreOffice, a full office productivity suite. Binary package, debug info
+EAPI=7
+HOMEPAGE=https://www.libreoffice.org
+IUSE=gnome java kde
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=LGPL-3
+RDEPEND=~app-office/libreoffice-bin-6.4.7.2_p2[gnome=,java=,kde=]
+RESTRICT=test strip
+SLOT=0
+SRC_URI=amd64? ( https://tamiko.43-1.org/distfiles/amd64-debug-libreoffice-6.4.7.2_p2.tar.xz kde? ( !java? ( https://tamiko.43-1.org/distfiles/amd64-debug-libreoffice-kde-6.4.7.2_p2.xd3 ) java? ( https://tamiko.43-1.org/distfiles/amd64-debug-libreoffice-kde-java-6.4.7.2_p2.xd3 ) ) gnome? ( !java? ( https://tamiko.43-1.org/distfiles/amd64-debug-libreoffice-gnome-6.4.7.2_p2.xd3 ) java? ( https://tamiko.43-1.org/distfiles/amd64-debug-libreoffice-gnome-java-6.4.7.2_p2.xd3 ) ) !kde? ( !gnome? ( java? ( https://tamiko.43-1.org/distfiles/amd64-debug-libreoffice-java-6.4.7.2_p2.xd3 ) ) ) ) x86? ( https://tamiko.43-1.org/distfiles/x86-debug-libreoffice-6.4.7.2_p2.tar.xz kde? ( !java? ( https://tamiko.43-1.org/distfiles/x86-debug-libreoffice-kde-6.4.7.2_p2.xd3 ) java? ( https://tamiko.43-1.org/distfiles/x86-debug-libreoffice-kde-java-6.4.7.2_p2.xd3 ) ) gnome? ( !java? ( https://tamiko.43-1.org/distfiles/x86-debug-libreoffice-gnome-6.4.7.2_p2.xd3 ) java? ( https://tamiko.43-1.org/distfiles/x86-debug-libreoffice-gnome-java-6.4.7.2_p2.xd3 ) ) !kde? ( !gnome? ( java? ( https://tamiko.43-1.org/distfiles/x86-debug-libreoffice-java-6.4.7.2_p2.xd3 ) ) ) )
+_md5_=859a8b259e4a05e4597976275ba5513b
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index ec5a8fc6d6ec..8b64d9e39a4d 100644
Binary files a/metadata/md5-cache/dev-libs/Manifest.gz and b/metadata/md5-cache/dev-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-libs/isl-0.23-r1 b/metadata/md5-cache/dev-libs/isl-0.23-r1
index 0abb1db674d1..874bafb82c90 100644
--- a/metadata/md5-cache/dev-libs/isl-0.23-r1
+++ b/metadata/md5-cache/dev-libs/isl-0.23-r1
@@ -5,10 +5,10 @@ DESCRIPTION=A library for manipulating integer points bounded by linear constrai
EAPI=7
HOMEPAGE=http://isl.gforge.inria.fr/
IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-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 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=LGPL-2.1
RDEPEND=>=dev-libs/gmp-5.1.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
SLOT=0/23
SRC_URI=http://isl.gforge.inria.fr/isl-0.23.tar.xz
_eclasses_=multibuild 6b3d5ee849dafe6cdfd7b859c211fb01 multilib d410501a125f99ffb560b0c523cd3d1e multilib-build 9a65133006c608964888346a412cc454 multilib-minimal 8bddda43703ba94d8341f4e247f97566 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
-_md5_=d39835e5356f6c1d178fd1c0fe43c69f
+_md5_=9f8567b727c366055e315431e0bf81da
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index f99ad0905253..90a97615b431 100644
Binary files a/metadata/md5-cache/dev-python/Manifest.gz and b/metadata/md5-cache/dev-python/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-python/keyring-21.8.0 b/metadata/md5-cache/dev-python/keyring-21.8.0
new file mode 100644
index 000000000000..8c1f009cf0eb
--- /dev/null
+++ b/metadata/md5-cache/dev-python/keyring-21.8.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-python/setuptools_scm[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/toml[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( dev-python/secretstorage[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/entrypoints[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jeepney[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_6? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/jaraco-packaging[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/rst-linker[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/jaraco-packaging[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/rst-linker[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/jaraco-packaging[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/rst-linker[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ( dev-lang/python:3.6 dev-python/sphinx[python_targets_python3_6(-),-python_single_target_python3_6(-)] dev-python/jaraco-packaging[python_targets_python3_6(-),-python_single_target_python3_6(-)] dev-python/rst-linker[python_targets_python3_6(-),-python_single_target_python3_6(-)] ) ( >=dev-python/pypy3-7.3.0:0 dev-python/sphinx[python_targets_pypy3(-),-python_single_target_pypy3(-)] dev-python/jaraco-packaging[python_targets_pypy3(-),-python_single_target_pypy3(-)] dev-python/rst-linker[python_targets_pypy3(-),-python_single_target_pypy3(-)] ) ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Provides access to the system keyring service
+EAPI=7
+HOMEPAGE=https://github.com/jaraco/keyring
+IUSE=doc test doc python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos
+LICENSE=PSF-2
+RDEPEND=dev-python/secretstorage[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/entrypoints[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jeepney[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_6? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/jaraco/keyring/archive/v21.8.0.tar.gz -> keyring-21.8.0.tar.gz
+_eclasses_=distutils-r1 f847d402a7ecea58af1958f5b4ec23da multibuild 6b3d5ee849dafe6cdfd7b859c211fb01 multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 f1d4277b3ad100890cbd62e137f0a769 python-utils-r1 e41e32d357e5bdd388b5be2ce24f3883 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
+_md5_=9d89afa39a5d3bd6893dcbaefd7fba94
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index 5e82b829f500..cad63ad08f9e 100644
Binary files a/metadata/md5-cache/dev-util/Manifest.gz and b/metadata/md5-cache/dev-util/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-util/lttng-ust-2.11.0 b/metadata/md5-cache/dev-util/lttng-ust-2.11.0
new file mode 100644
index 000000000000..ea5f2907d8a7
--- /dev/null
+++ b/metadata/md5-cache/dev-util/lttng-ust-2.11.0
@@ -0,0 +1,14 @@
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure prepare
+DEPEND=dev-libs/userspace-rcu:= numa? ( sys-process/numactl )
+DESCRIPTION=Linux Trace Toolkit - UST library
+EAPI=7
+HOMEPAGE=https://lttng.org
+IUSE=examples numa
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/userspace-rcu:= numa? ( sys-process/numactl )
+SLOT=0/2.11
+SRC_URI=https://lttng.org/files/lttng-ust/lttng-ust-2.11.0.tar.bz2
+_eclasses_=autotools 3ec5e49b810b2571ca9c6d76f55867bb libtool f143db5a74ccd9ca28c1234deffede96 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
+_md5_=ae07a91d02ef706cba252e715693e38f
diff --git a/metadata/md5-cache/media-gfx/Manifest.gz b/metadata/md5-cache/media-gfx/Manifest.gz
index 9160756277ab..99c78b11e7e0 100644
Binary files a/metadata/md5-cache/media-gfx/Manifest.gz and b/metadata/md5-cache/media-gfx/Manifest.gz differ
diff --git a/metadata/md5-cache/media-gfx/valentina-0.6.1-r1 b/metadata/md5-cache/media-gfx/valentina-0.6.1-r1
index 487da3b4aa24..13664dce5e1b 100644
--- a/metadata/md5-cache/media-gfx/valentina-0.6.1-r1
+++ b/metadata/md5-cache/media-gfx/valentina-0.6.1-r1
@@ -1,13 +1,14 @@
+BDEPEND=dev-qt/linguist-tools:5
DEFINED_PHASES=configure install postinst postrm preinst prepare
-DEPEND=app-text/poppler dev-qt/linguist:5 dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtopengl dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 dev-qt/qttest:5 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=app-text/poppler dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 dev-qt/qttest:5 dev-util/desktop-file-utils x11-misc/shared-mime-info
DESCRIPTION=Cloth patternmaking software
EAPI=7
HOMEPAGE=https://valentinaproject.bitbucket.io/
IUSE=l10n_cs l10n_de l10n_el l10n_en l10n_en l10n_es l10n_fi l10n_fr l10n_he l10n_id l10n_it l10n_nl l10n_pt-BR l10n_ro l10n_ru l10n_uk l10n_zh-CN
KEYWORDS=amd64 x86
LICENSE=GPL-3
-RDEPEND=app-text/poppler dev-qt/linguist:5 dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtopengl dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5
+RDEPEND=app-text/poppler dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5
SLOT=0
SRC_URI=https://gitlab.com/smart-pattern/valentina/-/archive/v0.6.1/valentina-v0.6.1.tar.bz2 https://dev.gentoo.org/~fordfrog/distfiles/valentina-5858.patch.bz2
-_eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 2d5b3f4b315094768576b6799e4f926e gnome2-utils c8e3fff820d850c0e003e22208d2eea3 l10n 8cdd85e169b835d518bc2fd59f780d8e multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb wrapper 4251d4c84c25f59094fd557e0063a974 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
-_md5_=feb920e60471a99cb3476f17a3764bc6
+_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_md5_=aaadfa072fdc17f53f65c4dce9849617
diff --git a/metadata/md5-cache/media-gfx/valentina-9999 b/metadata/md5-cache/media-gfx/valentina-9999
index 778359674ac8..8afbf3cfe4ae 100644
--- a/metadata/md5-cache/media-gfx/valentina-9999
+++ b/metadata/md5-cache/media-gfx/valentina-9999
@@ -1,13 +1,13 @@
-BDEPEND=>=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=dev-qt/linguist-tools:5 >=dev-vcs/git-1.8.2.1[curl]
DEFINED_PHASES=configure install postinst postrm preinst prepare unpack
-DEPEND=app-text/poppler dev-qt/linguist:5 dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtopengl dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 dev-qt/qttest:5 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=app-text/poppler dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 dev-qt/qttest:5 dev-util/desktop-file-utils x11-misc/shared-mime-info
DESCRIPTION=Cloth patternmaking software
EAPI=7
HOMEPAGE=https://gitlab.com/smart-pattern/valentina
IUSE=l10n_cs l10n_de l10n_el l10n_en l10n_en l10n_es l10n_fi l10n_fr l10n_he l10n_id l10n_it l10n_nl l10n_pt-BR l10n_ro l10n_ru l10n_uk l10n_zh-CN
LICENSE=GPL-3
PROPERTIES=live
-RDEPEND=app-text/poppler dev-qt/linguist:5 dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtopengl dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5
+RDEPEND=app-text/poppler dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5
SLOT=0
-_eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 2d5b3f4b315094768576b6799e4f926e git-r3 3e7ec3d6619213460c85e2aa48398441 gnome2-utils c8e3fff820d850c0e003e22208d2eea3 l10n 8cdd85e169b835d518bc2fd59f780d8e multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb wrapper 4251d4c84c25f59094fd557e0063a974 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
-_md5_=19ee8eae59621d96d0d632f3a4f98e56
+_eclasses_=git-r3 3e7ec3d6619213460c85e2aa48398441 multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_md5_=6434b2c8c3204ee6593acaa2c29e46b7
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index 35ccfce227f7..80ad8bb3e625 100644
Binary files a/metadata/md5-cache/media-libs/Manifest.gz and b/metadata/md5-cache/media-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/media-libs/libkeyfinder-2.2.3 b/metadata/md5-cache/media-libs/libkeyfinder-2.2.3
new file mode 100644
index 000000000000..97ed50d89c23
--- /dev/null
+++ b/metadata/md5-cache/media-libs/libkeyfinder-2.2.3
@@ -0,0 +1,13 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=sci-libs/fftw:3.0
+DESCRIPTION=Musical key detection library for digital audio
+EAPI=7
+HOMEPAGE=https://github.com/mixxxdj/libKeyFinder
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+
+RDEPEND=sci-libs/fftw:3.0
+SLOT=0
+SRC_URI=https://github.com/mixxxdj/libKeyFinder/archive/v2.2.3.tar.gz -> libkeyfinder-2.2.3.tar.gz
+_eclasses_=cmake ac7cb516f6a288b6a82bc0649ce49878 edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic 09a8beb8e6a8e02dc1e1bd83ac353741 l10n 8cdd85e169b835d518bc2fd59f780d8e multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 605c126bed8d87e4378d5ff1645330cb wrapper 4251d4c84c25f59094fd557e0063a974 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_md5_=734f880975fcb158596404b014375455
diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz
index 4aea398e105c..a31dc5d5163b 100644
Binary files a/metadata/md5-cache/media-sound/Manifest.gz and b/metadata/md5-cache/media-sound/Manifest.gz differ
diff --git a/metadata/md5-cache/media-sound/guitarix-0.42.1 b/metadata/md5-cache/media-sound/guitarix-0.42.1
new file mode 100644
index 000000000000..0f8198164b31
--- /dev/null
+++ b/metadata/md5-cache/media-sound/guitarix-0.42.1
@@ -0,0 +1,15 @@
+BDEPEND=|| ( dev-lang/python:3.9[threads(+)] dev-lang/python:3.8[threads(+)] dev-lang/python:3.7[threads(+)] dev-lang/python:3.6[threads(+)] ) virtual/pkgconfig standalone? ( dev-lang/sassc nls? ( dev-util/intltool sys-devel/gettext ) )
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
+DEPEND=dev-cpp/eigen:3 dev-cpp/glibmm:2 dev-cpp/gtkmm:3.0 dev-libs/glib:2 >=media-libs/libsndfile-1.0.17 >=media-libs/zita-convolver-3:= media-libs/zita-resampler >=net-misc/curl-7.26.0 >=sci-libs/fftw-3.3.8:3.0= x11-libs/gtk+:3 lv2? ( media-libs/lv2 ) standalone? ( dev-libs/boost:= media-libs/liblrdf media-libs/lilv virtual/jack bluetooth? ( net-wireless/bluez ) nsm? ( media-libs/liblo ) zeroconf? ( net-dns/avahi ) ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Virtual guitar amplifier for Linux
+EAPI=7
+HOMEPAGE=https://guitarix.org/
+IUSE=bluetooth debug lv2 nls nsm +standalone zeroconf
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=dev-cpp/eigen:3 dev-cpp/glibmm:2 dev-cpp/gtkmm:3.0 dev-libs/glib:2 >=media-libs/libsndfile-1.0.17 >=media-libs/zita-convolver-3:= media-libs/zita-resampler >=net-misc/curl-7.26.0 >=sci-libs/fftw-3.3.8:3.0= x11-libs/gtk+:3 lv2? ( media-libs/lv2 ) standalone? ( dev-libs/boost:= media-libs/liblrdf media-libs/lilv virtual/jack bluetooth? ( net-wireless/bluez ) nsm? ( media-libs/liblo ) zeroconf? ( net-dns/avahi ) ) standalone? ( media-fonts/roboto )
+REQUIRED_USE=|| ( lv2 standalone )
+SLOT=0
+SRC_URI=mirror://sourceforge/guitarix/guitarix/guitarix2-0.42.1.tar.xz
+_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 python-any-r1 f630b6d8702353cdc13f2d4dd882e16e python-utils-r1 e41e32d357e5bdd388b5be2ce24f3883 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb waf-utils 0a6e492cdcbd52b1304cfcd9eba5abc6 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_md5_=59cba808ea42494a56960193e385683e
diff --git a/metadata/md5-cache/media-sound/guitarix-9999 b/metadata/md5-cache/media-sound/guitarix-9999
index e5db82733b34..e2029600c627 100644
--- a/metadata/md5-cache/media-sound/guitarix-9999
+++ b/metadata/md5-cache/media-sound/guitarix-9999
@@ -1,13 +1,14 @@
+BDEPEND=|| ( dev-lang/python:3.9[threads(+)] dev-lang/python:3.8[threads(+)] dev-lang/python:3.7[threads(+)] dev-lang/python:3.6[threads(+)] ) virtual/pkgconfig standalone? ( dev-lang/sassc nls? ( dev-util/intltool sys-devel/gettext ) ) >=dev-vcs/git-1.8.2.1[curl]
DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=dev-cpp/eigen:3 dev-cpp/glibmm:2 dev-cpp/gtkmm:3.0 dev-libs/glib:2 >=media-libs/libsndfile-1.0.17 >=media-libs/zita-convolver-3:= media-libs/zita-resampler >=net-misc/curl-7.26.0 >=sci-libs/fftw-3.1.2:3.0= x11-libs/gtk+:3 lv2? ( media-libs/lv2 ) standalone? ( dev-libs/boost:= media-libs/liblrdf media-libs/lilv virtual/jack bluetooth? ( net-wireless/bluez ) nsm? ( media-libs/liblo ) zeroconf? ( net-dns/avahi ) ) || ( dev-lang/python:3.8[threads(+)] dev-lang/python:3.7[threads(+)] dev-lang/python:3.6[threads(+)] ) dev-lang/sassc virtual/pkgconfig nls? ( dev-util/intltool sys-devel/gettext ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=dev-cpp/eigen:3 dev-cpp/glibmm:2 dev-cpp/gtkmm:3.0 dev-libs/glib:2 >=media-libs/libsndfile-1.0.17 >=media-libs/zita-convolver-3:= media-libs/zita-resampler >=net-misc/curl-7.26.0 >=sci-libs/fftw-3.3.8:3.0= x11-libs/gtk+:3 lv2? ( media-libs/lv2 ) standalone? ( dev-libs/boost:= media-libs/liblrdf media-libs/lilv virtual/jack bluetooth? ( net-wireless/bluez ) nsm? ( media-libs/liblo ) zeroconf? ( net-dns/avahi ) ) dev-util/desktop-file-utils x11-misc/shared-mime-info
DESCRIPTION=Virtual guitar amplifier for Linux
-EAPI=6
+EAPI=7
HOMEPAGE=https://guitarix.org/
IUSE=bluetooth debug lv2 nls nsm +standalone zeroconf
LICENSE=GPL-2
PROPERTIES=live
-RDEPEND=dev-cpp/eigen:3 dev-cpp/glibmm:2 dev-cpp/gtkmm:3.0 dev-libs/glib:2 >=media-libs/libsndfile-1.0.17 >=media-libs/zita-convolver-3:= media-libs/zita-resampler >=net-misc/curl-7.26.0 >=sci-libs/fftw-3.1.2:3.0= x11-libs/gtk+:3 lv2? ( media-libs/lv2 ) standalone? ( dev-libs/boost:= media-libs/liblrdf media-libs/lilv virtual/jack bluetooth? ( net-wireless/bluez ) nsm? ( media-libs/liblo ) zeroconf? ( net-dns/avahi ) ) standalone? ( media-fonts/roboto )
+RDEPEND=dev-cpp/eigen:3 dev-cpp/glibmm:2 dev-cpp/gtkmm:3.0 dev-libs/glib:2 >=media-libs/libsndfile-1.0.17 >=media-libs/zita-convolver-3:= media-libs/zita-resampler >=net-misc/curl-7.26.0 >=sci-libs/fftw-3.3.8:3.0= x11-libs/gtk+:3 lv2? ( media-libs/lv2 ) standalone? ( dev-libs/boost:= media-libs/liblrdf media-libs/lilv virtual/jack bluetooth? ( net-wireless/bluez ) nsm? ( media-libs/liblo ) zeroconf? ( net-dns/avahi ) ) standalone? ( media-fonts/roboto )
REQUIRED_USE=|| ( lv2 standalone )
SLOT=0
_eclasses_=git-r3 3e7ec3d6619213460c85e2aa48398441 multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 python-any-r1 f630b6d8702353cdc13f2d4dd882e16e python-utils-r1 e41e32d357e5bdd388b5be2ce24f3883 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb waf-utils 0a6e492cdcbd52b1304cfcd9eba5abc6 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
-_md5_=ac51fbaac29cb1f6ea01a6b487bf5b2e
+_md5_=985cb4450bcb5ca6d4359275392320f1
diff --git a/metadata/md5-cache/net-analyzer/Manifest.gz b/metadata/md5-cache/net-analyzer/Manifest.gz
index 4a42107417bf..d227eacf72ba 100644
Binary files a/metadata/md5-cache/net-analyzer/Manifest.gz and b/metadata/md5-cache/net-analyzer/Manifest.gz differ
diff --git a/metadata/md5-cache/net-analyzer/zabbix-3.0.31-r2 b/metadata/md5-cache/net-analyzer/zabbix-3.0.31-r2
index f8a000c39894..a7079bdfea79 100644
--- a/metadata/md5-cache/net-analyzer/zabbix-3.0.31-r2
+++ b/metadata/md5-cache/net-analyzer/zabbix-3.0.31-r2
@@ -7,9 +7,9 @@ HOMEPAGE=https://www.zabbix.com/
IUSE=+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle +postgres proxy server ssh ssl snmp sqlite odbc static elibc_FreeBSD java
KEYWORDS=amd64 x86
LICENSE=GPL-2
-RDEPEND=curl? ( net-misc/curl ) java? ( >=virtual/jdk-1.8:* ) ldap? ( =dev-libs/cyrus-sasl-2* net-libs/gnutls net-nds/openldap ) libxml2? ( dev-libs/libxml2 ) mysql? ( dev-db/mysql-connector-c ) odbc? ( dev-db/unixODBC ) openipmi? ( sys-libs/openipmi ) oracle? ( dev-db/oracle-instantclient-basic ) postgres? ( dev-db/postgresql:* ) proxy? ( sys-libs/zlib ) server? ( dev-libs/libevent sys-libs/zlib ) snmp? ( net-analyzer/net-snmp ) sqlite? ( dev-db/sqlite ) ssh? ( net-libs/libssh2 ) ssl? ( dev-libs/openssl:=[-bindist] ) xmpp? ( dev-libs/iksemel ) java? ( >=virtual/jre-1.8:* ) mysql? ( virtual/mysql ) proxy? ( net-analyzer/fping[suid] ) server? ( app-admin/webapp-config dev-libs/libevent dev-libs/libpcre net-analyzer/fping[suid] ) frontend? ( app-admin/webapp-config dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] media-libs/gd[png] virtual/httpd-php:* mysql? ( dev-lang/php[mysqli] ) odbc? ( dev-lang/php[odbc] ) oracle? ( dev-lang/php[oci8-instant-client] ) postgres? ( dev-lang/php[postgres] ) sqlite? ( dev-lang/php[sqlite] ) ) java? ( >=dev-java/java-config-2.2.0-r3 )
+RDEPEND=curl? ( net-misc/curl ) java? ( >=virtual/jdk-1.8:* ) ldap? ( =dev-libs/cyrus-sasl-2* net-libs/gnutls net-nds/openldap ) libxml2? ( dev-libs/libxml2 ) mysql? ( dev-db/mysql-connector-c ) odbc? ( dev-db/unixODBC ) openipmi? ( sys-libs/openipmi ) oracle? ( dev-db/oracle-instantclient-basic ) postgres? ( dev-db/postgresql:* ) proxy? ( sys-libs/zlib ) server? ( dev-libs/libevent sys-libs/zlib ) snmp? ( net-analyzer/net-snmp ) sqlite? ( dev-db/sqlite ) ssh? ( net-libs/libssh2 ) ssl? ( dev-libs/openssl:=[-bindist] ) xmpp? ( dev-libs/iksemel ) acct-group/zabbix acct-user/zabbix java? ( >=virtual/jre-1.8:* ) mysql? ( virtual/mysql ) proxy? ( net-analyzer/fping[suid] ) server? ( app-admin/webapp-config dev-libs/libevent dev-libs/libpcre net-analyzer/fping[suid] ) frontend? ( app-admin/webapp-config dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] media-libs/gd[png] virtual/httpd-php:* mysql? ( dev-lang/php[mysqli] ) odbc? ( dev-lang/php[odbc] ) oracle? ( dev-lang/php[oci8-instant-client] ) postgres? ( dev-lang/php[postgres] ) sqlite? ( dev-lang/php[sqlite] ) ) java? ( >=dev-java/java-config-2.2.0-r3 )
REQUIRED_USE=|| ( agent frontend proxy server ) proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) ) server? ( ^^ ( mysql oracle postgres odbc ) ) static? ( !oracle !snmp )
SLOT=0/3.0
SRC_URI=https://cdn.zabbix.com/stable/3.0.31/zabbix-3.0.31.tar.gz
-_eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic 09a8beb8e6a8e02dc1e1bd83ac353741 java-pkg-opt-2 77d2e22d0de7640f817d20e861c0ff3f java-utils-2 378e4cda228ea0231a0ac283cb2ad25c l10n 8cdd85e169b835d518bc2fd59f780d8e multilib d410501a125f99ffb560b0c523cd3d1e systemd 74b223e42834adf09a2d21fe5fe13741 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb user b0a0d4ca9e3f79c38f8f4143b8d5a2d8 user-info a2abd4e2f4c3b9b06d64bf1329359a02 webapp 1d03df021d958f89f4cc78e289d0b116 wrapper 4251d4c84c25f59094fd557e0063a974
-_md5_=c9a3b6880a699b976c9fa8ddc8e2cc65
+_eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic 09a8beb8e6a8e02dc1e1bd83ac353741 java-pkg-opt-2 77d2e22d0de7640f817d20e861c0ff3f java-utils-2 378e4cda228ea0231a0ac283cb2ad25c l10n 8cdd85e169b835d518bc2fd59f780d8e multilib d410501a125f99ffb560b0c523cd3d1e systemd 74b223e42834adf09a2d21fe5fe13741 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb webapp 1d03df021d958f89f4cc78e289d0b116 wrapper 4251d4c84c25f59094fd557e0063a974
+_md5_=9dcc45262bef67e7912a269caf8f532b
diff --git a/metadata/md5-cache/net-analyzer/zabbix-4.0.26-r1 b/metadata/md5-cache/net-analyzer/zabbix-4.0.26-r1
index fde141fe52b3..17af8c9d700c 100644
--- a/metadata/md5-cache/net-analyzer/zabbix-4.0.26-r1
+++ b/metadata/md5-cache/net-analyzer/zabbix-4.0.26-r1
@@ -7,9 +7,9 @@ HOMEPAGE=https://www.zabbix.com/
IUSE=+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle +postgres proxy server ssh ssl snmp sqlite odbc static elibc_FreeBSD java
KEYWORDS=amd64 x86
LICENSE=GPL-2
-RDEPEND=curl? ( net-misc/curl ) java? ( >=virtual/jdk-1.8:* ) ldap? ( =dev-libs/cyrus-sasl-2* net-libs/gnutls net-nds/openldap ) libxml2? ( dev-libs/libxml2 ) mysql? ( dev-db/mysql-connector-c ) odbc? ( dev-db/unixODBC ) openipmi? ( sys-libs/openipmi ) oracle? ( dev-db/oracle-instantclient-basic ) postgres? ( dev-db/postgresql:* ) proxy? ( sys-libs/zlib ) server? ( dev-libs/libevent sys-libs/zlib ) snmp? ( net-analyzer/net-snmp ) sqlite? ( dev-db/sqlite ) ssh? ( net-libs/libssh2 ) ssl? ( dev-libs/openssl:=[-bindist] ) xmpp? ( dev-libs/iksemel ) java? ( >=virtual/jre-1.8:* ) mysql? ( virtual/mysql ) proxy? ( net-analyzer/fping[suid] ) server? ( app-admin/webapp-config dev-libs/libevent dev-libs/libpcre net-analyzer/fping[suid] ) frontend? ( app-admin/webapp-config dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] media-libs/gd[png] virtual/httpd-php:* mysql? ( dev-lang/php[mysqli] ) odbc? ( dev-lang/php[odbc] ) oracle? ( dev-lang/php[oci8-instant-client] ) postgres? ( dev-lang/php[postgres] ) sqlite? ( dev-lang/php[sqlite] ) ) java? ( >=dev-java/java-config-2.2.0-r3 )
+RDEPEND=curl? ( net-misc/curl ) java? ( >=virtual/jdk-1.8:* ) ldap? ( =dev-libs/cyrus-sasl-2* net-libs/gnutls net-nds/openldap ) libxml2? ( dev-libs/libxml2 ) mysql? ( dev-db/mysql-connector-c ) odbc? ( dev-db/unixODBC ) openipmi? ( sys-libs/openipmi ) oracle? ( dev-db/oracle-instantclient-basic ) postgres? ( dev-db/postgresql:* ) proxy? ( sys-libs/zlib ) server? ( dev-libs/libevent sys-libs/zlib ) snmp? ( net-analyzer/net-snmp ) sqlite? ( dev-db/sqlite ) ssh? ( net-libs/libssh2 ) ssl? ( dev-libs/openssl:=[-bindist] ) xmpp? ( dev-libs/iksemel ) acct-group/zabbix acct-user/zabbix java? ( >=virtual/jre-1.8:* ) mysql? ( virtual/mysql ) proxy? ( net-analyzer/fping[suid] ) server? ( app-admin/webapp-config dev-libs/libevent dev-libs/libpcre net-analyzer/fping[suid] ) frontend? ( app-admin/webapp-config dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] media-libs/gd[png] virtual/httpd-php:* mysql? ( dev-lang/php[mysqli] ) odbc? ( dev-lang/php[odbc] ) oracle? ( dev-lang/php[oci8-instant-client] ) postgres? ( dev-lang/php[postgres] ) sqlite? ( dev-lang/php[sqlite] ) ) java? ( >=dev-java/java-config-2.2.0-r3 )
REQUIRED_USE=|| ( agent frontend proxy server ) proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) ) server? ( ^^ ( mysql oracle postgres odbc ) ) static? ( !oracle !snmp )
SLOT=0/4.0
SRC_URI=https://cdn.zabbix.com/zabbix/sources/stable/4.0/zabbix-4.0.26.tar.gz
-_eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic 09a8beb8e6a8e02dc1e1bd83ac353741 java-pkg-opt-2 77d2e22d0de7640f817d20e861c0ff3f java-utils-2 378e4cda228ea0231a0ac283cb2ad25c l10n 8cdd85e169b835d518bc2fd59f780d8e multilib d410501a125f99ffb560b0c523cd3d1e systemd 74b223e42834adf09a2d21fe5fe13741 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb user b0a0d4ca9e3f79c38f8f4143b8d5a2d8 user-info a2abd4e2f4c3b9b06d64bf1329359a02 webapp 1d03df021d958f89f4cc78e289d0b116 wrapper 4251d4c84c25f59094fd557e0063a974
-_md5_=b1b972d5cae46ffc56bf0167074071a4
+_eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic 09a8beb8e6a8e02dc1e1bd83ac353741 java-pkg-opt-2 77d2e22d0de7640f817d20e861c0ff3f java-utils-2 378e4cda228ea0231a0ac283cb2ad25c l10n 8cdd85e169b835d518bc2fd59f780d8e multilib d410501a125f99ffb560b0c523cd3d1e systemd 74b223e42834adf09a2d21fe5fe13741 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb webapp 1d03df021d958f89f4cc78e289d0b116 wrapper 4251d4c84c25f59094fd557e0063a974
+_md5_=781efd496223ed0afd665822e18f87f9
diff --git a/metadata/md5-cache/net-analyzer/zabbix-4.0.27-r1 b/metadata/md5-cache/net-analyzer/zabbix-4.0.27-r1
index 0c412fa0f22d..bef5af0eb54f 100644
--- a/metadata/md5-cache/net-analyzer/zabbix-4.0.27-r1
+++ b/metadata/md5-cache/net-analyzer/zabbix-4.0.27-r1
@@ -7,9 +7,9 @@ HOMEPAGE=https://www.zabbix.com/
IUSE=+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle +postgres proxy server ssh ssl snmp sqlite odbc static elibc_FreeBSD java
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
-RDEPEND=curl? ( net-misc/curl ) java? ( >=virtual/jdk-1.8:* ) ldap? ( =dev-libs/cyrus-sasl-2* net-libs/gnutls net-nds/openldap ) libxml2? ( dev-libs/libxml2 ) mysql? ( dev-db/mysql-connector-c ) odbc? ( dev-db/unixODBC ) openipmi? ( sys-libs/openipmi ) oracle? ( dev-db/oracle-instantclient-basic ) postgres? ( dev-db/postgresql:* ) proxy? ( sys-libs/zlib ) server? ( dev-libs/libevent sys-libs/zlib ) snmp? ( net-analyzer/net-snmp ) sqlite? ( dev-db/sqlite ) ssh? ( net-libs/libssh2 ) ssl? ( dev-libs/openssl:=[-bindist] ) xmpp? ( dev-libs/iksemel ) java? ( >=virtual/jre-1.8:* ) mysql? ( virtual/mysql ) proxy? ( net-analyzer/fping[suid] ) server? ( app-admin/webapp-config dev-libs/libevent dev-libs/libpcre net-analyzer/fping[suid] ) frontend? ( app-admin/webapp-config dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] media-libs/gd[png] virtual/httpd-php:* mysql? ( dev-lang/php[mysqli] ) odbc? ( dev-lang/php[odbc] ) oracle? ( dev-lang/php[oci8-instant-client] ) postgres? ( dev-lang/php[postgres] ) sqlite? ( dev-lang/php[sqlite] ) ) java? ( >=dev-java/java-config-2.2.0-r3 )
+RDEPEND=curl? ( net-misc/curl ) java? ( >=virtual/jdk-1.8:* ) ldap? ( =dev-libs/cyrus-sasl-2* net-libs/gnutls net-nds/openldap ) libxml2? ( dev-libs/libxml2 ) mysql? ( dev-db/mysql-connector-c ) odbc? ( dev-db/unixODBC ) openipmi? ( sys-libs/openipmi ) oracle? ( dev-db/oracle-instantclient-basic ) postgres? ( dev-db/postgresql:* ) proxy? ( sys-libs/zlib ) server? ( dev-libs/libevent sys-libs/zlib ) snmp? ( net-analyzer/net-snmp ) sqlite? ( dev-db/sqlite ) ssh? ( net-libs/libssh2 ) ssl? ( dev-libs/openssl:=[-bindist] ) xmpp? ( dev-libs/iksemel ) acct-group/zabbix acct-user/zabbix java? ( >=virtual/jre-1.8:* ) mysql? ( virtual/mysql ) proxy? ( net-analyzer/fping[suid] ) server? ( app-admin/webapp-config dev-libs/libevent dev-libs/libpcre net-analyzer/fping[suid] ) frontend? ( app-admin/webapp-config dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] media-libs/gd[png] virtual/httpd-php:* mysql? ( dev-lang/php[mysqli] ) odbc? ( dev-lang/php[odbc] ) oracle? ( dev-lang/php[oci8-instant-client] ) postgres? ( dev-lang/php[postgres] ) sqlite? ( dev-lang/php[sqlite] ) ) java? ( >=dev-java/java-config-2.2.0-r3 )
REQUIRED_USE=|| ( agent frontend proxy server ) proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) ) server? ( ^^ ( mysql oracle postgres odbc ) ) static? ( !oracle !snmp )
SLOT=0/4.0
SRC_URI=https://cdn.zabbix.com/zabbix/sources/stable/4.0/zabbix-4.0.27.tar.gz
-_eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic 09a8beb8e6a8e02dc1e1bd83ac353741 java-pkg-opt-2 77d2e22d0de7640f817d20e861c0ff3f java-utils-2 378e4cda228ea0231a0ac283cb2ad25c l10n 8cdd85e169b835d518bc2fd59f780d8e multilib d410501a125f99ffb560b0c523cd3d1e systemd 74b223e42834adf09a2d21fe5fe13741 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb user b0a0d4ca9e3f79c38f8f4143b8d5a2d8 user-info a2abd4e2f4c3b9b06d64bf1329359a02 webapp 1d03df021d958f89f4cc78e289d0b116 wrapper 4251d4c84c25f59094fd557e0063a974
-_md5_=3968485bf3a001f885889fb841d83265
+_eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic 09a8beb8e6a8e02dc1e1bd83ac353741 java-pkg-opt-2 77d2e22d0de7640f817d20e861c0ff3f java-utils-2 378e4cda228ea0231a0ac283cb2ad25c l10n 8cdd85e169b835d518bc2fd59f780d8e multilib d410501a125f99ffb560b0c523cd3d1e systemd 74b223e42834adf09a2d21fe5fe13741 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb webapp 1d03df021d958f89f4cc78e289d0b116 wrapper 4251d4c84c25f59094fd557e0063a974
+_md5_=43d24e970180583d603faede8e8f49fb
diff --git a/metadata/md5-cache/net-analyzer/zabbix-5.0.5-r1 b/metadata/md5-cache/net-analyzer/zabbix-5.0.5-r1
index 783f0b106702..f27fe900cf04 100644
--- a/metadata/md5-cache/net-analyzer/zabbix-5.0.5-r1
+++ b/metadata/md5-cache/net-analyzer/zabbix-5.0.5-r1
@@ -7,9 +7,9 @@ HOMEPAGE=https://www.zabbix.com/
IUSE=+agent java curl frontend ipv6 ldap libxml2 mysql openipmi oracle +postgres proxy server ssh ssl snmp sqlite odbc static elibc_FreeBSD java
KEYWORDS=amd64 x86
LICENSE=GPL-2
-RDEPEND=curl? ( net-misc/curl ) java? ( >=virtual/jdk-1.8:* ) ldap? ( =dev-libs/cyrus-sasl-2* net-libs/gnutls net-nds/openldap ) libxml2? ( dev-libs/libxml2 ) mysql? ( dev-db/mysql-connector-c ) odbc? ( dev-db/unixODBC ) openipmi? ( sys-libs/openipmi ) oracle? ( dev-db/oracle-instantclient-basic ) postgres? ( dev-db/postgresql:* ) proxy? ( sys-libs/zlib ) server? ( dev-libs/libevent sys-libs/zlib ) snmp? ( net-analyzer/net-snmp ) sqlite? ( dev-db/sqlite ) ssh? ( net-libs/libssh2 ) ssl? ( dev-libs/openssl:=[-bindist] ) java? ( >=virtual/jre-1.8:* ) mysql? ( virtual/mysql ) proxy? ( net-analyzer/fping[suid] ) server? ( app-admin/webapp-config dev-libs/libevent dev-libs/libpcre net-analyzer/fping[suid] ) frontend? ( app-admin/webapp-config dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] media-libs/gd[png] virtual/httpd-php:* mysql? ( dev-lang/php[mysqli] ) odbc? ( dev-lang/php[odbc] ) oracle? ( dev-lang/php[oci8-instant-client] ) postgres? ( dev-lang/php[postgres] ) sqlite? ( dev-lang/php[sqlite] ) ) java? ( >=dev-java/java-config-2.2.0-r3 )
+RDEPEND=curl? ( net-misc/curl ) java? ( >=virtual/jdk-1.8:* ) ldap? ( =dev-libs/cyrus-sasl-2* net-libs/gnutls net-nds/openldap ) libxml2? ( dev-libs/libxml2 ) mysql? ( dev-db/mysql-connector-c ) odbc? ( dev-db/unixODBC ) openipmi? ( sys-libs/openipmi ) oracle? ( dev-db/oracle-instantclient-basic ) postgres? ( dev-db/postgresql:* ) proxy? ( sys-libs/zlib ) server? ( dev-libs/libevent sys-libs/zlib ) snmp? ( net-analyzer/net-snmp ) sqlite? ( dev-db/sqlite ) ssh? ( net-libs/libssh2 ) ssl? ( dev-libs/openssl:=[-bindist] ) acct-group/zabbix acct-user/zabbix java? ( >=virtual/jre-1.8:* ) mysql? ( virtual/mysql ) proxy? ( net-analyzer/fping[suid] ) server? ( app-admin/webapp-config dev-libs/libevent dev-libs/libpcre net-analyzer/fping[suid] ) frontend? ( app-admin/webapp-config dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] media-libs/gd[png] virtual/httpd-php:* mysql? ( dev-lang/php[mysqli] ) odbc? ( dev-lang/php[odbc] ) oracle? ( dev-lang/php[oci8-instant-client] ) postgres? ( dev-lang/php[postgres] ) sqlite? ( dev-lang/php[sqlite] ) ) java? ( >=dev-java/java-config-2.2.0-r3 )
REQUIRED_USE=|| ( agent frontend proxy server ) proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) ) server? ( ^^ ( mysql oracle postgres odbc ) ) static? ( !oracle !snmp )
SLOT=0/5.0
SRC_URI=https://cdn.zabbix.com/zabbix/sources/stable/5.0/zabbix-5.0.5.tar.gz
-_eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic 09a8beb8e6a8e02dc1e1bd83ac353741 java-pkg-opt-2 77d2e22d0de7640f817d20e861c0ff3f java-utils-2 378e4cda228ea0231a0ac283cb2ad25c l10n 8cdd85e169b835d518bc2fd59f780d8e multilib d410501a125f99ffb560b0c523cd3d1e systemd 74b223e42834adf09a2d21fe5fe13741 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb user b0a0d4ca9e3f79c38f8f4143b8d5a2d8 user-info a2abd4e2f4c3b9b06d64bf1329359a02 webapp 1d03df021d958f89f4cc78e289d0b116 wrapper 4251d4c84c25f59094fd557e0063a974
-_md5_=6a52e2337962d2f86da1a6bd6cd15b5e
+_eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic 09a8beb8e6a8e02dc1e1bd83ac353741 java-pkg-opt-2 77d2e22d0de7640f817d20e861c0ff3f java-utils-2 378e4cda228ea0231a0ac283cb2ad25c l10n 8cdd85e169b835d518bc2fd59f780d8e multilib d410501a125f99ffb560b0c523cd3d1e systemd 74b223e42834adf09a2d21fe5fe13741 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb webapp 1d03df021d958f89f4cc78e289d0b116 wrapper 4251d4c84c25f59094fd557e0063a974
+_md5_=cde7b9ecdfaa58345174173e4db38330
diff --git a/metadata/md5-cache/net-analyzer/zabbix-5.0.6-r1 b/metadata/md5-cache/net-analyzer/zabbix-5.0.6-r1
index 6083dc485e7d..a88fdca86682 100644
--- a/metadata/md5-cache/net-analyzer/zabbix-5.0.6-r1
+++ b/metadata/md5-cache/net-analyzer/zabbix-5.0.6-r1
@@ -7,9 +7,9 @@ HOMEPAGE=https://www.zabbix.com/
IUSE=+agent java curl frontend ipv6 ldap libxml2 mysql openipmi oracle +postgres proxy server ssh ssl snmp sqlite odbc static elibc_FreeBSD java
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
-RDEPEND=curl? ( net-misc/curl ) java? ( >=virtual/jdk-1.8:* ) ldap? ( =dev-libs/cyrus-sasl-2* net-libs/gnutls net-nds/openldap ) libxml2? ( dev-libs/libxml2 ) mysql? ( dev-db/mysql-connector-c ) odbc? ( dev-db/unixODBC ) openipmi? ( sys-libs/openipmi ) oracle? ( dev-db/oracle-instantclient-basic ) postgres? ( dev-db/postgresql:* ) proxy? ( sys-libs/zlib ) server? ( dev-libs/libevent sys-libs/zlib ) snmp? ( net-analyzer/net-snmp ) sqlite? ( dev-db/sqlite ) ssh? ( net-libs/libssh2 ) ssl? ( dev-libs/openssl:=[-bindist] ) java? ( >=virtual/jre-1.8:* ) mysql? ( virtual/mysql ) proxy? ( net-analyzer/fping[suid] ) server? ( app-admin/webapp-config dev-libs/libevent dev-libs/libpcre net-analyzer/fping[suid] ) frontend? ( app-admin/webapp-config dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] media-libs/gd[png] virtual/httpd-php:* mysql? ( dev-lang/php[mysqli] ) odbc? ( dev-lang/php[odbc] ) oracle? ( dev-lang/php[oci8-instant-client] ) postgres? ( dev-lang/php[postgres] ) sqlite? ( dev-lang/php[sqlite] ) ) java? ( >=dev-java/java-config-2.2.0-r3 )
+RDEPEND=curl? ( net-misc/curl ) java? ( >=virtual/jdk-1.8:* ) ldap? ( =dev-libs/cyrus-sasl-2* net-libs/gnutls net-nds/openldap ) libxml2? ( dev-libs/libxml2 ) mysql? ( dev-db/mysql-connector-c ) odbc? ( dev-db/unixODBC ) openipmi? ( sys-libs/openipmi ) oracle? ( dev-db/oracle-instantclient-basic ) postgres? ( dev-db/postgresql:* ) proxy? ( sys-libs/zlib ) server? ( dev-libs/libevent sys-libs/zlib ) snmp? ( net-analyzer/net-snmp ) sqlite? ( dev-db/sqlite ) ssh? ( net-libs/libssh2 ) ssl? ( dev-libs/openssl:=[-bindist] ) acct-group/zabbix acct-user/zabbix java? ( >=virtual/jre-1.8:* ) mysql? ( virtual/mysql ) proxy? ( net-analyzer/fping[suid] ) server? ( app-admin/webapp-config dev-libs/libevent dev-libs/libpcre net-analyzer/fping[suid] ) frontend? ( app-admin/webapp-config dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] media-libs/gd[png] virtual/httpd-php:* mysql? ( dev-lang/php[mysqli] ) odbc? ( dev-lang/php[odbc] ) oracle? ( dev-lang/php[oci8-instant-client] ) postgres? ( dev-lang/php[postgres] ) sqlite? ( dev-lang/php[sqlite] ) ) java? ( >=dev-java/java-config-2.2.0-r3 )
REQUIRED_USE=|| ( agent frontend proxy server ) proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) ) server? ( ^^ ( mysql oracle postgres odbc ) ) static? ( !oracle !snmp )
SLOT=0/5.0
SRC_URI=https://cdn.zabbix.com/zabbix/sources/stable/5.0/zabbix-5.0.6.tar.gz
-_eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic 09a8beb8e6a8e02dc1e1bd83ac353741 java-pkg-opt-2 77d2e22d0de7640f817d20e861c0ff3f java-utils-2 378e4cda228ea0231a0ac283cb2ad25c l10n 8cdd85e169b835d518bc2fd59f780d8e multilib d410501a125f99ffb560b0c523cd3d1e systemd 74b223e42834adf09a2d21fe5fe13741 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb user b0a0d4ca9e3f79c38f8f4143b8d5a2d8 user-info a2abd4e2f4c3b9b06d64bf1329359a02 webapp 1d03df021d958f89f4cc78e289d0b116 wrapper 4251d4c84c25f59094fd557e0063a974
-_md5_=b333a2431f7f7a1495b9dc5d7ce0ed0c
+_eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic 09a8beb8e6a8e02dc1e1bd83ac353741 java-pkg-opt-2 77d2e22d0de7640f817d20e861c0ff3f java-utils-2 378e4cda228ea0231a0ac283cb2ad25c l10n 8cdd85e169b835d518bc2fd59f780d8e multilib d410501a125f99ffb560b0c523cd3d1e systemd 74b223e42834adf09a2d21fe5fe13741 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb webapp 1d03df021d958f89f4cc78e289d0b116 wrapper 4251d4c84c25f59094fd557e0063a974
+_md5_=5a34c016af59189cf9a5f7a6414a1c48
diff --git a/metadata/md5-cache/net-analyzer/zabbix-5.0.7 b/metadata/md5-cache/net-analyzer/zabbix-5.0.7
new file mode 100644
index 000000000000..ed3bd8c93f92
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/zabbix-5.0.7
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst preinst prepare prerm setup
+DEPEND=curl? ( net-misc/curl ) java? ( >=virtual/jdk-1.8:* ) ldap? ( =dev-libs/cyrus-sasl-2* net-libs/gnutls net-nds/openldap ) libxml2? ( dev-libs/libxml2 ) mysql? ( dev-db/mysql-connector-c ) odbc? ( dev-db/unixODBC ) openipmi? ( sys-libs/openipmi ) oracle? ( dev-db/oracle-instantclient-basic ) postgres? ( dev-db/postgresql:* ) proxy? ( sys-libs/zlib ) server? ( dev-libs/libevent sys-libs/zlib ) snmp? ( net-analyzer/net-snmp ) sqlite? ( dev-db/sqlite ) ssh? ( net-libs/libssh2 ) ssl? ( dev-libs/openssl:=[-bindist] ) static? ( curl? ( net-misc/curl[static-libs] ) ldap? ( =dev-libs/cyrus-sasl-2*[static-libs] net-libs/gnutls[static-libs] net-nds/openldap[static-libs] ) libxml2? ( dev-libs/libxml2[static-libs] ) mysql? ( dev-db/mysql-connector-c[static-libs] ) odbc? ( dev-db/unixODBC[static-libs] ) postgres? ( dev-db/postgresql:*[static-libs] ) sqlite? ( dev-db/sqlite[static-libs] ) ssh? ( net-libs/libssh2 ) ) java? ( >=dev-java/java-config-2.2.0-r3 )
+DESCRIPTION=ZABBIX is software for monitoring of your applications, network and servers
+EAPI=7
+HOMEPAGE=https://www.zabbix.com/
+IUSE=+agent java curl frontend ipv6 ldap libxml2 mysql openipmi oracle +postgres proxy server ssh ssl snmp sqlite odbc static elibc_FreeBSD java
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=curl? ( net-misc/curl ) java? ( >=virtual/jdk-1.8:* ) ldap? ( =dev-libs/cyrus-sasl-2* net-libs/gnutls net-nds/openldap ) libxml2? ( dev-libs/libxml2 ) mysql? ( dev-db/mysql-connector-c ) odbc? ( dev-db/unixODBC ) openipmi? ( sys-libs/openipmi ) oracle? ( dev-db/oracle-instantclient-basic ) postgres? ( dev-db/postgresql:* ) proxy? ( sys-libs/zlib ) server? ( dev-libs/libevent sys-libs/zlib ) snmp? ( net-analyzer/net-snmp ) sqlite? ( dev-db/sqlite ) ssh? ( net-libs/libssh2 ) ssl? ( dev-libs/openssl:=[-bindist] ) acct-group/zabbix acct-user/zabbix java? ( >=virtual/jre-1.8:* ) mysql? ( virtual/mysql ) proxy? ( net-analyzer/fping[suid] ) server? ( app-admin/webapp-config dev-libs/libevent dev-libs/libpcre net-analyzer/fping[suid] ) frontend? ( app-admin/webapp-config dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] media-libs/gd[png] virtual/httpd-php:* mysql? ( dev-lang/php[mysqli] ) odbc? ( dev-lang/php[odbc] ) oracle? ( dev-lang/php[oci8-instant-client] ) postgres? ( dev-lang/php[postgres] ) sqlite? ( dev-lang/php[sqlite] ) ) java? ( >=dev-java/java-config-2.2.0-r3 )
+REQUIRED_USE=|| ( agent frontend proxy server ) proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) ) server? ( ^^ ( mysql oracle postgres odbc ) ) static? ( !oracle !snmp )
+SLOT=0/5.0
+SRC_URI=https://cdn.zabbix.com/zabbix/sources/stable/5.0/zabbix-5.0.7.tar.gz
+_eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic 09a8beb8e6a8e02dc1e1bd83ac353741 java-pkg-opt-2 77d2e22d0de7640f817d20e861c0ff3f java-utils-2 378e4cda228ea0231a0ac283cb2ad25c l10n 8cdd85e169b835d518bc2fd59f780d8e multilib d410501a125f99ffb560b0c523cd3d1e systemd 74b223e42834adf09a2d21fe5fe13741 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb webapp 1d03df021d958f89f4cc78e289d0b116 wrapper 4251d4c84c25f59094fd557e0063a974
+_md5_=5a34c016af59189cf9a5f7a6414a1c48
diff --git a/metadata/md5-cache/net-analyzer/zabbix-5.2.1-r1 b/metadata/md5-cache/net-analyzer/zabbix-5.2.1-r1
index 4b063575dd77..58e850c36334 100644
--- a/metadata/md5-cache/net-analyzer/zabbix-5.2.1-r1
+++ b/metadata/md5-cache/net-analyzer/zabbix-5.2.1-r1
@@ -7,9 +7,9 @@ HOMEPAGE=https://www.zabbix.com/
IUSE=+agent java curl frontend ipv6 ldap libxml2 mysql openipmi oracle +postgres proxy server ssh ssl snmp sqlite odbc static elibc_FreeBSD java
KEYWORDS=amd64 x86
LICENSE=GPL-2
-RDEPEND=curl? ( net-misc/curl ) java? ( >=virtual/jdk-1.8:* ) ldap? ( =dev-libs/cyrus-sasl-2* net-libs/gnutls net-nds/openldap ) libxml2? ( dev-libs/libxml2 ) mysql? ( dev-db/mysql-connector-c ) odbc? ( dev-db/unixODBC ) openipmi? ( sys-libs/openipmi ) oracle? ( dev-db/oracle-instantclient-basic ) postgres? ( dev-db/postgresql:* ) proxy? ( sys-libs/zlib ) server? ( dev-libs/libevent sys-libs/zlib ) snmp? ( net-analyzer/net-snmp ) sqlite? ( dev-db/sqlite ) ssh? ( net-libs/libssh2 ) ssl? ( dev-libs/openssl:=[-bindist] ) java? ( >=virtual/jre-1.8:* ) mysql? ( virtual/mysql ) proxy? ( net-analyzer/fping[suid] ) server? ( app-admin/webapp-config dev-libs/libevent dev-libs/libpcre net-analyzer/fping[suid] ) frontend? ( app-admin/webapp-config dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] media-libs/gd[png] virtual/httpd-php:* mysql? ( dev-lang/php[mysqli] ) odbc? ( dev-lang/php[odbc] ) oracle? ( dev-lang/php[oci8-instant-client] ) postgres? ( dev-lang/php[postgres] ) sqlite? ( dev-lang/php[sqlite] ) ) java? ( >=dev-java/java-config-2.2.0-r3 )
+RDEPEND=curl? ( net-misc/curl ) java? ( >=virtual/jdk-1.8:* ) ldap? ( =dev-libs/cyrus-sasl-2* net-libs/gnutls net-nds/openldap ) libxml2? ( dev-libs/libxml2 ) mysql? ( dev-db/mysql-connector-c ) odbc? ( dev-db/unixODBC ) openipmi? ( sys-libs/openipmi ) oracle? ( dev-db/oracle-instantclient-basic ) postgres? ( dev-db/postgresql:* ) proxy? ( sys-libs/zlib ) server? ( dev-libs/libevent sys-libs/zlib ) snmp? ( net-analyzer/net-snmp ) sqlite? ( dev-db/sqlite ) ssh? ( net-libs/libssh2 ) ssl? ( dev-libs/openssl:=[-bindist] ) acct-group/zabbix acct-user/zabbix java? ( >=virtual/jre-1.8:* ) mysql? ( virtual/mysql ) proxy? ( net-analyzer/fping[suid] ) server? ( app-admin/webapp-config dev-libs/libevent dev-libs/libpcre net-analyzer/fping[suid] ) frontend? ( app-admin/webapp-config dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] media-libs/gd[png] virtual/httpd-php:* mysql? ( dev-lang/php[mysqli] ) odbc? ( dev-lang/php[odbc] ) oracle? ( dev-lang/php[oci8-instant-client] ) postgres? ( dev-lang/php[postgres] ) sqlite? ( dev-lang/php[sqlite] ) ) java? ( >=dev-java/java-config-2.2.0-r3 )
REQUIRED_USE=|| ( agent frontend proxy server ) proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) ) server? ( ^^ ( mysql oracle postgres odbc ) ) static? ( !oracle !snmp )
SLOT=0/5.2
SRC_URI=https://cdn.zabbix.com/zabbix/sources/stable/5.2/zabbix-5.2.1.tar.gz
-_eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic 09a8beb8e6a8e02dc1e1bd83ac353741 java-pkg-opt-2 77d2e22d0de7640f817d20e861c0ff3f java-utils-2 378e4cda228ea0231a0ac283cb2ad25c l10n 8cdd85e169b835d518bc2fd59f780d8e multilib d410501a125f99ffb560b0c523cd3d1e systemd 74b223e42834adf09a2d21fe5fe13741 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb user b0a0d4ca9e3f79c38f8f4143b8d5a2d8 user-info a2abd4e2f4c3b9b06d64bf1329359a02 webapp 1d03df021d958f89f4cc78e289d0b116 wrapper 4251d4c84c25f59094fd557e0063a974
-_md5_=6a52e2337962d2f86da1a6bd6cd15b5e
+_eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic 09a8beb8e6a8e02dc1e1bd83ac353741 java-pkg-opt-2 77d2e22d0de7640f817d20e861c0ff3f java-utils-2 378e4cda228ea0231a0ac283cb2ad25c l10n 8cdd85e169b835d518bc2fd59f780d8e multilib d410501a125f99ffb560b0c523cd3d1e systemd 74b223e42834adf09a2d21fe5fe13741 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb webapp 1d03df021d958f89f4cc78e289d0b116 wrapper 4251d4c84c25f59094fd557e0063a974
+_md5_=cde7b9ecdfaa58345174173e4db38330
diff --git a/metadata/md5-cache/net-analyzer/zabbix-5.2.2-r1 b/metadata/md5-cache/net-analyzer/zabbix-5.2.2-r1
index aed29ba1fd16..9fd0acc32d36 100644
--- a/metadata/md5-cache/net-analyzer/zabbix-5.2.2-r1
+++ b/metadata/md5-cache/net-analyzer/zabbix-5.2.2-r1
@@ -7,9 +7,9 @@ HOMEPAGE=https://www.zabbix.com/
IUSE=+agent java curl frontend ipv6 ldap libxml2 mysql openipmi oracle +postgres proxy server ssh ssl snmp sqlite odbc static elibc_FreeBSD java
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
-RDEPEND=curl? ( net-misc/curl ) java? ( >=virtual/jdk-1.8:* ) ldap? ( =dev-libs/cyrus-sasl-2* net-libs/gnutls net-nds/openldap ) libxml2? ( dev-libs/libxml2 ) mysql? ( dev-db/mysql-connector-c ) odbc? ( dev-db/unixODBC ) openipmi? ( sys-libs/openipmi ) oracle? ( dev-db/oracle-instantclient-basic ) postgres? ( dev-db/postgresql:* ) proxy? ( sys-libs/zlib ) server? ( dev-libs/libevent sys-libs/zlib ) snmp? ( net-analyzer/net-snmp ) sqlite? ( dev-db/sqlite ) ssh? ( net-libs/libssh2 ) ssl? ( dev-libs/openssl:=[-bindist] ) java? ( >=virtual/jre-1.8:* ) mysql? ( virtual/mysql ) proxy? ( net-analyzer/fping[suid] ) server? ( app-admin/webapp-config dev-libs/libevent dev-libs/libpcre net-analyzer/fping[suid] ) frontend? ( app-admin/webapp-config dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] media-libs/gd[png] virtual/httpd-php:* mysql? ( dev-lang/php[mysqli] ) odbc? ( dev-lang/php[odbc] ) oracle? ( dev-lang/php[oci8-instant-client] ) postgres? ( dev-lang/php[postgres] ) sqlite? ( dev-lang/php[sqlite] ) ) java? ( >=dev-java/java-config-2.2.0-r3 )
+RDEPEND=curl? ( net-misc/curl ) java? ( >=virtual/jdk-1.8:* ) ldap? ( =dev-libs/cyrus-sasl-2* net-libs/gnutls net-nds/openldap ) libxml2? ( dev-libs/libxml2 ) mysql? ( dev-db/mysql-connector-c ) odbc? ( dev-db/unixODBC ) openipmi? ( sys-libs/openipmi ) oracle? ( dev-db/oracle-instantclient-basic ) postgres? ( dev-db/postgresql:* ) proxy? ( sys-libs/zlib ) server? ( dev-libs/libevent sys-libs/zlib ) snmp? ( net-analyzer/net-snmp ) sqlite? ( dev-db/sqlite ) ssh? ( net-libs/libssh2 ) ssl? ( dev-libs/openssl:=[-bindist] ) acct-group/zabbix acct-user/zabbix java? ( >=virtual/jre-1.8:* ) mysql? ( virtual/mysql ) proxy? ( net-analyzer/fping[suid] ) server? ( app-admin/webapp-config dev-libs/libevent dev-libs/libpcre net-analyzer/fping[suid] ) frontend? ( app-admin/webapp-config dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] media-libs/gd[png] virtual/httpd-php:* mysql? ( dev-lang/php[mysqli] ) odbc? ( dev-lang/php[odbc] ) oracle? ( dev-lang/php[oci8-instant-client] ) postgres? ( dev-lang/php[postgres] ) sqlite? ( dev-lang/php[sqlite] ) ) java? ( >=dev-java/java-config-2.2.0-r3 )
REQUIRED_USE=|| ( agent frontend proxy server ) proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) ) server? ( ^^ ( mysql oracle postgres odbc ) ) static? ( !oracle !snmp )
SLOT=0/5.2
SRC_URI=https://cdn.zabbix.com/zabbix/sources/stable/5.2/zabbix-5.2.2.tar.gz
-_eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic 09a8beb8e6a8e02dc1e1bd83ac353741 java-pkg-opt-2 77d2e22d0de7640f817d20e861c0ff3f java-utils-2 378e4cda228ea0231a0ac283cb2ad25c l10n 8cdd85e169b835d518bc2fd59f780d8e multilib d410501a125f99ffb560b0c523cd3d1e systemd 74b223e42834adf09a2d21fe5fe13741 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb user b0a0d4ca9e3f79c38f8f4143b8d5a2d8 user-info a2abd4e2f4c3b9b06d64bf1329359a02 webapp 1d03df021d958f89f4cc78e289d0b116 wrapper 4251d4c84c25f59094fd557e0063a974
-_md5_=b333a2431f7f7a1495b9dc5d7ce0ed0c
+_eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic 09a8beb8e6a8e02dc1e1bd83ac353741 java-pkg-opt-2 77d2e22d0de7640f817d20e861c0ff3f java-utils-2 378e4cda228ea0231a0ac283cb2ad25c l10n 8cdd85e169b835d518bc2fd59f780d8e multilib d410501a125f99ffb560b0c523cd3d1e systemd 74b223e42834adf09a2d21fe5fe13741 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb webapp 1d03df021d958f89f4cc78e289d0b116 wrapper 4251d4c84c25f59094fd557e0063a974
+_md5_=5a34c016af59189cf9a5f7a6414a1c48
diff --git a/metadata/md5-cache/net-analyzer/zabbix-5.2.3 b/metadata/md5-cache/net-analyzer/zabbix-5.2.3
new file mode 100644
index 000000000000..5cedac5ac1c5
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/zabbix-5.2.3
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst preinst prepare prerm setup
+DEPEND=curl? ( net-misc/curl ) java? ( >=virtual/jdk-1.8:* ) ldap? ( =dev-libs/cyrus-sasl-2* net-libs/gnutls net-nds/openldap ) libxml2? ( dev-libs/libxml2 ) mysql? ( dev-db/mysql-connector-c ) odbc? ( dev-db/unixODBC ) openipmi? ( sys-libs/openipmi ) oracle? ( dev-db/oracle-instantclient-basic ) postgres? ( dev-db/postgresql:* ) proxy? ( sys-libs/zlib ) server? ( dev-libs/libevent sys-libs/zlib ) snmp? ( net-analyzer/net-snmp ) sqlite? ( dev-db/sqlite ) ssh? ( net-libs/libssh2 ) ssl? ( dev-libs/openssl:=[-bindist] ) static? ( curl? ( net-misc/curl[static-libs] ) ldap? ( =dev-libs/cyrus-sasl-2*[static-libs] net-libs/gnutls[static-libs] net-nds/openldap[static-libs] ) libxml2? ( dev-libs/libxml2[static-libs] ) mysql? ( dev-db/mysql-connector-c[static-libs] ) odbc? ( dev-db/unixODBC[static-libs] ) postgres? ( dev-db/postgresql:*[static-libs] ) sqlite? ( dev-db/sqlite[static-libs] ) ssh? ( net-libs/libssh2 ) ) java? ( >=dev-java/java-config-2.2.0-r3 )
+DESCRIPTION=ZABBIX is software for monitoring of your applications, network and servers
+EAPI=7
+HOMEPAGE=https://www.zabbix.com/
+IUSE=+agent java curl frontend ipv6 ldap libxml2 mysql openipmi oracle +postgres proxy server ssh ssl snmp sqlite odbc static elibc_FreeBSD java
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=curl? ( net-misc/curl ) java? ( >=virtual/jdk-1.8:* ) ldap? ( =dev-libs/cyrus-sasl-2* net-libs/gnutls net-nds/openldap ) libxml2? ( dev-libs/libxml2 ) mysql? ( dev-db/mysql-connector-c ) odbc? ( dev-db/unixODBC ) openipmi? ( sys-libs/openipmi ) oracle? ( dev-db/oracle-instantclient-basic ) postgres? ( dev-db/postgresql:* ) proxy? ( sys-libs/zlib ) server? ( dev-libs/libevent sys-libs/zlib ) snmp? ( net-analyzer/net-snmp ) sqlite? ( dev-db/sqlite ) ssh? ( net-libs/libssh2 ) ssl? ( dev-libs/openssl:=[-bindist] ) acct-group/zabbix acct-user/zabbix java? ( >=virtual/jre-1.8:* ) mysql? ( virtual/mysql ) proxy? ( net-analyzer/fping[suid] ) server? ( app-admin/webapp-config dev-libs/libevent dev-libs/libpcre net-analyzer/fping[suid] ) frontend? ( app-admin/webapp-config dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] media-libs/gd[png] virtual/httpd-php:* mysql? ( dev-lang/php[mysqli] ) odbc? ( dev-lang/php[odbc] ) oracle? ( dev-lang/php[oci8-instant-client] ) postgres? ( dev-lang/php[postgres] ) sqlite? ( dev-lang/php[sqlite] ) ) java? ( >=dev-java/java-config-2.2.0-r3 )
+REQUIRED_USE=|| ( agent frontend proxy server ) proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) ) server? ( ^^ ( mysql oracle postgres odbc ) ) static? ( !oracle !snmp )
+SLOT=0/5.2
+SRC_URI=https://cdn.zabbix.com/zabbix/sources/stable/5.2/zabbix-5.2.3.tar.gz
+_eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic 09a8beb8e6a8e02dc1e1bd83ac353741 java-pkg-opt-2 77d2e22d0de7640f817d20e861c0ff3f java-utils-2 378e4cda228ea0231a0ac283cb2ad25c l10n 8cdd85e169b835d518bc2fd59f780d8e multilib d410501a125f99ffb560b0c523cd3d1e systemd 74b223e42834adf09a2d21fe5fe13741 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb webapp 1d03df021d958f89f4cc78e289d0b116 wrapper 4251d4c84c25f59094fd557e0063a974
+_md5_=5a34c016af59189cf9a5f7a6414a1c48
diff --git a/metadata/md5-cache/net-mail/Manifest.gz b/metadata/md5-cache/net-mail/Manifest.gz
index a1334cce7d0b..f4220c59db61 100644
Binary files a/metadata/md5-cache/net-mail/Manifest.gz and b/metadata/md5-cache/net-mail/Manifest.gz differ
diff --git a/metadata/md5-cache/net-mail/mailbase-1.6 b/metadata/md5-cache/net-mail/mailbase-1.6
index bfd8632e44d4..2fca08b1046f 100644
--- a/metadata/md5-cache/net-mail/mailbase-1.6
+++ b/metadata/md5-cache/net-mail/mailbase-1.6
@@ -3,9 +3,9 @@ DESCRIPTION=MTA layout package
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
IUSE=pam
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=GPL-2
RDEPEND=acct-group/mail acct-user/mail acct-user/postmaster pam? ( sys-libs/pam ) !=dev-libs/libxml2-2.6:2 >=gnome-base/libglade-2.4:2.0 >=net-print/cups-
SLOT=0
SRC_URI=http://gdlp01.c-wss.com/gds/8/0100007658/08/linux-UFRII-drv-v370-uken-05.tar.gz
_eclasses_=autotools 3ec5e49b810b2571ca9c6d76f55867bb libtool f143db5a74ccd9ca28c1234deffede96 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
-_md5_=61a8e171e4f62f56a22a8fe00346759d
+_md5_=d1f5ad570d5dd59bbe2ca7a9b9be2e20
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index 34794ebb5970..004495aa16b8 100644
Binary files a/metadata/md5-cache/sys-apps/Manifest.gz and b/metadata/md5-cache/sys-apps/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-apps/portage-3.0.12 b/metadata/md5-cache/sys-apps/portage-3.0.12
index 9cec7eb0c036..ad198634c347 100644
--- a/metadata/md5-cache/sys-apps/portage-3.0.12
+++ b/metadata/md5-cache/sys-apps/portage-3.0.12
@@ -5,7 +5,7 @@ DESCRIPTION=Portage is the package management and distribution system for Gentoo
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Portage
IUSE=apidoc build doc gentoo-dev +ipc +native-extensions +rsync-verify selinux test xattr python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 kernel_linux
-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
LICENSE=GPL-2
PDEPEND=!build? ( >=net-misc/rsync-2.6.4 userland_GNU? ( >=sys-apps/coreutils-6.4 ) )
RDEPEND=acct-user/portage app-arch/zstd >=app-arch/tar-1.27 dev-lang/python-exec:2 >=sys-apps/findutils-4.4 !build? ( >=sys-apps/sed-4.0.5 app-shells/bash:0[readline] >=app-admin/eselect-1.2 rsync-verify? ( >=app-portage/gemato-14.5[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=app-crypt/openpgp-keys-gentoo-release-20180706 >=app-crypt/gnupg-2.2.4-r2[ssl(-)] ) ) elibc_glibc? ( >=sys-apps/sandbox-2.2 ) elibc_musl? ( >=sys-apps/sandbox-2.2 ) elibc_uclibc? ( >=sys-apps/sandbox-2.2 ) kernel_linux? ( sys-apps/util-linux ) >=app-misc/pax-utils-0.1.17 selinux? ( >=sys-libs/libselinux-2.0.94[python,python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) xattr? ( kernel_linux? ( >=sys-apps/install-xattr-0.3 ) ) !=dev-python/pypy3-7.3.0:0=[bzip2(+),threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[bzip2(+),threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[bzip2(+),threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[bzip2(+),threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[bzip2(+),threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] virtual/tmpfiles
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
SLOT=0
SRC_URI=mirror://gentoo/portage-3.0.12.tar.bz2 https://dev.gentoo.org/~zmedico/portage/archives/portage-3.0.12.tar.bz2
_eclasses_=distutils-r1 f847d402a7ecea58af1958f5b4ec23da linux-info c90a203b1c14cfa77bd3e37a0e96c955 multibuild 6b3d5ee849dafe6cdfd7b859c211fb01 multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 prefix de7d8e2b10085ed5ff09ad70e4753e5c python-r1 f1d4277b3ad100890cbd62e137f0a769 python-utils-r1 e41e32d357e5bdd388b5be2ce24f3883 tmpfiles 6170dc7770585fb3f16efdee789a3218 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
-_md5_=da7a784d3e30b10361734ef6601919f0
+_md5_=b473f219e4f64678e9fe1b9fe2bf7469
diff --git a/metadata/md5-cache/sys-devel/Manifest.gz b/metadata/md5-cache/sys-devel/Manifest.gz
index 7eb7a32cc8c3..cb9438521824 100644
Binary files a/metadata/md5-cache/sys-devel/Manifest.gz and b/metadata/md5-cache/sys-devel/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-devel/crossdev-20201122 b/metadata/md5-cache/sys-devel/crossdev-20201122
deleted file mode 100644
index 793fb740c16e..000000000000
--- a/metadata/md5-cache/sys-devel/crossdev-20201122
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=app-arch/xz-utils
-DESCRIPTION=Gentoo Cross-toolchain generator
-EAPI=7
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Crossdev
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/portage-2.1 >=app-portage/portage-utils-0.55 app-shells/bash sys-apps/gentoo-functions
-SLOT=0
-SRC_URI=mirror://gentoo/crossdev-20201122.tar.xz https://dev.gentoo.org/~slyfox/distfiles/crossdev-20201122.tar.xz
-_md5_=3e9d60c86bb4f62d557178b03a84121f
diff --git a/metadata/md5-cache/sys-devel/crossdev-20201129 b/metadata/md5-cache/sys-devel/crossdev-20201129
index 0afc8d633003..ff15e994c47d 100644
--- a/metadata/md5-cache/sys-devel/crossdev-20201129
+++ b/metadata/md5-cache/sys-devel/crossdev-20201129
@@ -3,9 +3,9 @@ DEPEND=app-arch/xz-utils
DESCRIPTION=Gentoo Cross-toolchain generator
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Crossdev
-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
LICENSE=GPL-2
RDEPEND=>=sys-apps/portage-2.1 >=app-portage/portage-utils-0.55 app-shells/bash sys-apps/gentoo-functions
SLOT=0
SRC_URI=mirror://gentoo/crossdev-20201129.tar.xz https://dev.gentoo.org/~slyfox/distfiles/crossdev-20201129.tar.xz
-_md5_=8879ddb044df4971609b216a3a9dd2ad
+_md5_=3e9d60c86bb4f62d557178b03a84121f
diff --git a/metadata/md5-cache/virtual/Manifest.gz b/metadata/md5-cache/virtual/Manifest.gz
index 10069954f079..32f354188622 100644
Binary files a/metadata/md5-cache/virtual/Manifest.gz and b/metadata/md5-cache/virtual/Manifest.gz differ
diff --git a/metadata/md5-cache/virtual/libgudev-215-r3 b/metadata/md5-cache/virtual/libgudev-215-r3
deleted file mode 100644
index 40a97f8557a5..000000000000
--- a/metadata/md5-cache/virtual/libgudev-215-r3
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual for libgudev providers
-EAPI=5
-IUSE=introspection static-libs systemd abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86
-RDEPEND=|| ( dev-libs/libgudev:0/0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,introspection?,static-libs?] !systemd? ( || ( >=sys-fs/udev-208-r1:0/0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,gudev(-),introspection(-)?,static-libs?] >=sys-fs/eudev-1.5.3-r1:0/0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,gudev(-),introspection(-)?,static-libs?] ) ) systemd? ( >=sys-apps/systemd-212-r5:0/2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,gudev(-),introspection(-)?] ) )
-REQUIRED_USE=systemd? ( !static-libs )
-SLOT=0/0
-_eclasses_=desktop 7fd20552ce4cc97e8acb132a499a7dd8 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch e8f1ec13660dc2f44b32775765d85e42 estack 055c42df72f76a4f45ec92b35e83cd56 eutils 2d5b3f4b315094768576b6799e4f926e l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multibuild 6b3d5ee849dafe6cdfd7b859c211fb01 multilib d410501a125f99ffb560b0c523cd3d1e multilib-build 9a65133006c608964888346a412cc454 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974
-_md5_=0f1f97ec8a795a4c0be4744b31cf4da0
diff --git a/metadata/md5-cache/virtual/libgudev-230 b/metadata/md5-cache/virtual/libgudev-230
deleted file mode 100644
index 0e5438d9babf..000000000000
--- a/metadata/md5-cache/virtual/libgudev-230
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual for libgudev providers
-EAPI=5
-IUSE=introspection static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86
-RDEPEND=dev-libs/libgudev:0/0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,introspection?,static-libs?]
-SLOT=0/0
-_eclasses_=desktop 7fd20552ce4cc97e8acb132a499a7dd8 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch e8f1ec13660dc2f44b32775765d85e42 estack 055c42df72f76a4f45ec92b35e83cd56 eutils 2d5b3f4b315094768576b6799e4f926e l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multibuild 6b3d5ee849dafe6cdfd7b859c211fb01 multilib d410501a125f99ffb560b0c523cd3d1e multilib-build 9a65133006c608964888346a412cc454 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974
-_md5_=ffe2d0b27bef1792d61b2a977fdf9bdc
diff --git a/metadata/md5-cache/virtual/libgudev-232 b/metadata/md5-cache/virtual/libgudev-232
deleted file mode 100644
index 6999fca5212f..000000000000
--- a/metadata/md5-cache/virtual/libgudev-232
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual for libgudev providers
-EAPI=6
-IUSE=introspection static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86
-RDEPEND=>=dev-libs/libgudev-232:0/0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,introspection?,static-libs?]
-SLOT=0/0
-_eclasses_=multibuild 6b3d5ee849dafe6cdfd7b859c211fb01 multilib d410501a125f99ffb560b0c523cd3d1e multilib-build 9a65133006c608964888346a412cc454 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
-_md5_=d2259aff73bdceb75ce16e2867266a8a
diff --git a/metadata/md5-cache/www-servers/Manifest.gz b/metadata/md5-cache/www-servers/Manifest.gz
index c16e40e43a8d..35c686e34a36 100644
Binary files a/metadata/md5-cache/www-servers/Manifest.gz and b/metadata/md5-cache/www-servers/Manifest.gz differ
diff --git a/metadata/md5-cache/www-servers/tomcat-7.0.106 b/metadata/md5-cache/www-servers/tomcat-7.0.106
index 8da3d8dc23d7..97368015b7e2 100644
--- a/metadata/md5-cache/www-servers/tomcat-7.0.106
+++ b/metadata/md5-cache/www-servers/tomcat-7.0.106
@@ -6,9 +6,9 @@ HOMEPAGE=https://tomcat.apache.org/
IUSE=extra-webapps websockets elibc_FreeBSD doc source test elibc_FreeBSD
KEYWORDS=amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris
LICENSE=Apache-2.0
-RDEPEND=dev-java/eclipse-ecj:4.5 ~dev-java/tomcat-servlet-api-7.0.106:3.0 virtual/jre >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RDEPEND=dev-java/eclipse-ecj:4.5 ~dev-java/tomcat-servlet-api-7.0.106:3.0 acct-group/tomcat acct-user/tomcat virtual/jre >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
RESTRICT=test
SLOT=7
SRC_URI=mirror://apache/tomcat/tomcat-7/v7.0.106/src/apache-tomcat-7.0.106-src.tar.gz
-_eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 2d5b3f4b315094768576b6799e4f926e java-ant-2 fb9e1462d72ecaf7c91ae1d169606d9f java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 378e4cda228ea0231a0ac283cb2ad25c l10n 8cdd85e169b835d518bc2fd59f780d8e multilib d410501a125f99ffb560b0c523cd3d1e prefix de7d8e2b10085ed5ff09ad70e4753e5c toolchain-funcs 605c126bed8d87e4378d5ff1645330cb user b0a0d4ca9e3f79c38f8f4143b8d5a2d8 user-info a2abd4e2f4c3b9b06d64bf1329359a02 wrapper 4251d4c84c25f59094fd557e0063a974
-_md5_=6c72698c8175310042f5d30d9e20d337
+_eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 2d5b3f4b315094768576b6799e4f926e java-ant-2 fb9e1462d72ecaf7c91ae1d169606d9f java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 378e4cda228ea0231a0ac283cb2ad25c l10n 8cdd85e169b835d518bc2fd59f780d8e multilib d410501a125f99ffb560b0c523cd3d1e prefix de7d8e2b10085ed5ff09ad70e4753e5c toolchain-funcs 605c126bed8d87e4378d5ff1645330cb wrapper 4251d4c84c25f59094fd557e0063a974
+_md5_=874665d53979e4fb82c2c3d14b623054
diff --git a/metadata/md5-cache/www-servers/tomcat-7.0.107 b/metadata/md5-cache/www-servers/tomcat-7.0.107
index 081a4aaa5018..0034cddb7a10 100644
--- a/metadata/md5-cache/www-servers/tomcat-7.0.107
+++ b/metadata/md5-cache/www-servers/tomcat-7.0.107
@@ -6,9 +6,9 @@ HOMEPAGE=https://tomcat.apache.org/
IUSE=extra-webapps websockets elibc_FreeBSD doc source test elibc_FreeBSD
KEYWORDS=amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris
LICENSE=Apache-2.0
-RDEPEND=dev-java/eclipse-ecj:4.5 ~dev-java/tomcat-servlet-api-7.0.107:3.0 virtual/jre >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RDEPEND=dev-java/eclipse-ecj:4.5 ~dev-java/tomcat-servlet-api-7.0.107:3.0 acct-group/tomcat acct-user/tomcat virtual/jre >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
RESTRICT=test
SLOT=7
SRC_URI=mirror://apache/tomcat/tomcat-7/v7.0.107/src/apache-tomcat-7.0.107-src.tar.gz
-_eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 2d5b3f4b315094768576b6799e4f926e java-ant-2 fb9e1462d72ecaf7c91ae1d169606d9f java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 378e4cda228ea0231a0ac283cb2ad25c l10n 8cdd85e169b835d518bc2fd59f780d8e multilib d410501a125f99ffb560b0c523cd3d1e prefix de7d8e2b10085ed5ff09ad70e4753e5c toolchain-funcs 605c126bed8d87e4378d5ff1645330cb user b0a0d4ca9e3f79c38f8f4143b8d5a2d8 user-info a2abd4e2f4c3b9b06d64bf1329359a02 wrapper 4251d4c84c25f59094fd557e0063a974
-_md5_=6c72698c8175310042f5d30d9e20d337
+_eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 2d5b3f4b315094768576b6799e4f926e java-ant-2 fb9e1462d72ecaf7c91ae1d169606d9f java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 378e4cda228ea0231a0ac283cb2ad25c l10n 8cdd85e169b835d518bc2fd59f780d8e multilib d410501a125f99ffb560b0c523cd3d1e prefix de7d8e2b10085ed5ff09ad70e4753e5c toolchain-funcs 605c126bed8d87e4378d5ff1645330cb wrapper 4251d4c84c25f59094fd557e0063a974
+_md5_=874665d53979e4fb82c2c3d14b623054
diff --git a/metadata/md5-cache/www-servers/tomcat-8.5.60 b/metadata/md5-cache/www-servers/tomcat-8.5.60
index 9893c25fbbc5..e998c0808e20 100644
--- a/metadata/md5-cache/www-servers/tomcat-8.5.60
+++ b/metadata/md5-cache/www-servers/tomcat-8.5.60
@@ -6,9 +6,9 @@ HOMEPAGE=https://tomcat.apache.org/
IUSE=extra-webapps elibc_FreeBSD doc source test elibc_FreeBSD
KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris
LICENSE=Apache-2.0
-RDEPEND=dev-java/eclipse-ecj:4.5 ~dev-java/tomcat-servlet-api-8.5.60:3.1 virtual/jre >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RDEPEND=dev-java/eclipse-ecj:4.5 ~dev-java/tomcat-servlet-api-8.5.60:3.1 acct-group/tomcat acct-user/tomcat virtual/jre >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
RESTRICT=test
SLOT=8.5
SRC_URI=mirror://apache/tomcat/tomcat-8/v8.5.60/src/apache-tomcat-8.5.60-src.tar.gz
-_eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 2d5b3f4b315094768576b6799e4f926e java-ant-2 fb9e1462d72ecaf7c91ae1d169606d9f java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 378e4cda228ea0231a0ac283cb2ad25c l10n 8cdd85e169b835d518bc2fd59f780d8e multilib d410501a125f99ffb560b0c523cd3d1e prefix de7d8e2b10085ed5ff09ad70e4753e5c toolchain-funcs 605c126bed8d87e4378d5ff1645330cb user b0a0d4ca9e3f79c38f8f4143b8d5a2d8 user-info a2abd4e2f4c3b9b06d64bf1329359a02 wrapper 4251d4c84c25f59094fd557e0063a974
-_md5_=14e7207d38b4f51cb0e3774e1b9f42aa
+_eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 2d5b3f4b315094768576b6799e4f926e java-ant-2 fb9e1462d72ecaf7c91ae1d169606d9f java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 378e4cda228ea0231a0ac283cb2ad25c l10n 8cdd85e169b835d518bc2fd59f780d8e multilib d410501a125f99ffb560b0c523cd3d1e prefix de7d8e2b10085ed5ff09ad70e4753e5c toolchain-funcs 605c126bed8d87e4378d5ff1645330cb wrapper 4251d4c84c25f59094fd557e0063a974
+_md5_=a7cd9f2407438a410b60945673707866
diff --git a/metadata/md5-cache/www-servers/tomcat-8.5.61 b/metadata/md5-cache/www-servers/tomcat-8.5.61
index 2e95aabfb575..f987e64b21e1 100644
--- a/metadata/md5-cache/www-servers/tomcat-8.5.61
+++ b/metadata/md5-cache/www-servers/tomcat-8.5.61
@@ -6,9 +6,9 @@ HOMEPAGE=https://tomcat.apache.org/
IUSE=extra-webapps elibc_FreeBSD doc source test elibc_FreeBSD
KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris
LICENSE=Apache-2.0
-RDEPEND=dev-java/eclipse-ecj:4.5 ~dev-java/tomcat-servlet-api-8.5.61:3.1 virtual/jre >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RDEPEND=dev-java/eclipse-ecj:4.5 ~dev-java/tomcat-servlet-api-8.5.61:3.1 acct-group/tomcat acct-user/tomcat virtual/jre >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
RESTRICT=test
SLOT=8.5
SRC_URI=mirror://apache/tomcat/tomcat-8/v8.5.61/src/apache-tomcat-8.5.61-src.tar.gz
-_eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 2d5b3f4b315094768576b6799e4f926e java-ant-2 fb9e1462d72ecaf7c91ae1d169606d9f java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 378e4cda228ea0231a0ac283cb2ad25c l10n 8cdd85e169b835d518bc2fd59f780d8e multilib d410501a125f99ffb560b0c523cd3d1e prefix de7d8e2b10085ed5ff09ad70e4753e5c toolchain-funcs 605c126bed8d87e4378d5ff1645330cb user b0a0d4ca9e3f79c38f8f4143b8d5a2d8 user-info a2abd4e2f4c3b9b06d64bf1329359a02 wrapper 4251d4c84c25f59094fd557e0063a974
-_md5_=422f84211703cc5c559b8f5f893e939a
+_eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 2d5b3f4b315094768576b6799e4f926e java-ant-2 fb9e1462d72ecaf7c91ae1d169606d9f java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 378e4cda228ea0231a0ac283cb2ad25c l10n 8cdd85e169b835d518bc2fd59f780d8e multilib d410501a125f99ffb560b0c523cd3d1e prefix de7d8e2b10085ed5ff09ad70e4753e5c toolchain-funcs 605c126bed8d87e4378d5ff1645330cb wrapper 4251d4c84c25f59094fd557e0063a974
+_md5_=6395b77db41cd91b85c6aaffdd1bff6e
diff --git a/metadata/md5-cache/www-servers/tomcat-9.0.40 b/metadata/md5-cache/www-servers/tomcat-9.0.40
index 535161384322..ccffec648f05 100644
--- a/metadata/md5-cache/www-servers/tomcat-9.0.40
+++ b/metadata/md5-cache/www-servers/tomcat-9.0.40
@@ -6,9 +6,9 @@ HOMEPAGE=https://tomcat.apache.org/
IUSE=extra-webapps elibc_FreeBSD doc source test elibc_FreeBSD
KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris
LICENSE=Apache-2.0
-RDEPEND=dev-java/eclipse-ecj:4.15 dev-java/glassfish-xmlrpc-api:0 ~dev-java/tomcat-servlet-api-9.0.40:4.0 dev-java/wsdl4j:0 virtual/jre >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RDEPEND=dev-java/eclipse-ecj:4.15 dev-java/glassfish-xmlrpc-api:0 ~dev-java/tomcat-servlet-api-9.0.40:4.0 dev-java/wsdl4j:0 acct-group/tomcat acct-user/tomcat virtual/jre >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
RESTRICT=test
SLOT=9
SRC_URI=mirror://apache/tomcat/tomcat-9/v9.0.40/src/apache-tomcat-9.0.40-src.tar.gz https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bnd/5.1.1/biz.aQute.bnd-5.1.1.jar https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bndlib/5.1.1/biz.aQute.bndlib-5.1.1.jar
-_eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 2d5b3f4b315094768576b6799e4f926e java-ant-2 fb9e1462d72ecaf7c91ae1d169606d9f java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 378e4cda228ea0231a0ac283cb2ad25c l10n 8cdd85e169b835d518bc2fd59f780d8e multilib d410501a125f99ffb560b0c523cd3d1e prefix de7d8e2b10085ed5ff09ad70e4753e5c toolchain-funcs 605c126bed8d87e4378d5ff1645330cb user b0a0d4ca9e3f79c38f8f4143b8d5a2d8 user-info a2abd4e2f4c3b9b06d64bf1329359a02 wrapper 4251d4c84c25f59094fd557e0063a974
-_md5_=1436d9c945385b8894df5f8c04c40258
+_eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 2d5b3f4b315094768576b6799e4f926e java-ant-2 fb9e1462d72ecaf7c91ae1d169606d9f java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 378e4cda228ea0231a0ac283cb2ad25c l10n 8cdd85e169b835d518bc2fd59f780d8e multilib d410501a125f99ffb560b0c523cd3d1e prefix de7d8e2b10085ed5ff09ad70e4753e5c toolchain-funcs 605c126bed8d87e4378d5ff1645330cb wrapper 4251d4c84c25f59094fd557e0063a974
+_md5_=e94903bde5066ff57695953db7c65aa4
diff --git a/metadata/md5-cache/www-servers/tomcat-9.0.41 b/metadata/md5-cache/www-servers/tomcat-9.0.41
index 16171fdeb86d..152152452f6a 100644
--- a/metadata/md5-cache/www-servers/tomcat-9.0.41
+++ b/metadata/md5-cache/www-servers/tomcat-9.0.41
@@ -6,9 +6,9 @@ HOMEPAGE=https://tomcat.apache.org/
IUSE=extra-webapps elibc_FreeBSD doc source test elibc_FreeBSD
KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris
LICENSE=Apache-2.0
-RDEPEND=dev-java/eclipse-ecj:4.15 dev-java/glassfish-xmlrpc-api:0 ~dev-java/tomcat-servlet-api-9.0.41:4.0 dev-java/wsdl4j:0 virtual/jre >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RDEPEND=dev-java/eclipse-ecj:4.15 dev-java/glassfish-xmlrpc-api:0 ~dev-java/tomcat-servlet-api-9.0.41:4.0 dev-java/wsdl4j:0 acct-group/tomcat acct-user/tomcat virtual/jre >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
RESTRICT=test
SLOT=9
SRC_URI=mirror://apache/tomcat/tomcat-9/v9.0.41/src/apache-tomcat-9.0.41-src.tar.gz https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bnd/5.1.1/biz.aQute.bnd-5.1.1.jar https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bndlib/5.1.1/biz.aQute.bndlib-5.1.1.jar
-_eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 2d5b3f4b315094768576b6799e4f926e java-ant-2 fb9e1462d72ecaf7c91ae1d169606d9f java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 378e4cda228ea0231a0ac283cb2ad25c l10n 8cdd85e169b835d518bc2fd59f780d8e multilib d410501a125f99ffb560b0c523cd3d1e prefix de7d8e2b10085ed5ff09ad70e4753e5c toolchain-funcs 605c126bed8d87e4378d5ff1645330cb user b0a0d4ca9e3f79c38f8f4143b8d5a2d8 user-info a2abd4e2f4c3b9b06d64bf1329359a02 wrapper 4251d4c84c25f59094fd557e0063a974
-_md5_=d5dfdd3f1300d89a744133736b9c4c93
+_eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 2d5b3f4b315094768576b6799e4f926e java-ant-2 fb9e1462d72ecaf7c91ae1d169606d9f java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 378e4cda228ea0231a0ac283cb2ad25c l10n 8cdd85e169b835d518bc2fd59f780d8e multilib d410501a125f99ffb560b0c523cd3d1e prefix de7d8e2b10085ed5ff09ad70e4753e5c toolchain-funcs 605c126bed8d87e4378d5ff1645330cb wrapper 4251d4c84c25f59094fd557e0063a974
+_md5_=7c5070ea82e326a3ad3159f5ae2ec660
diff --git a/metadata/md5-cache/x11-wm/Manifest.gz b/metadata/md5-cache/x11-wm/Manifest.gz
index 4c34a37bbabc..393642537b98 100644
Binary files a/metadata/md5-cache/x11-wm/Manifest.gz and b/metadata/md5-cache/x11-wm/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-wm/awesome-9999 b/metadata/md5-cache/x11-wm/awesome-9999
index 851c381baaaa..1fa20ec0af26 100644
--- a/metadata/md5-cache/x11-wm/awesome-9999
+++ b/metadata/md5-cache/x11-wm/awesome-9999
@@ -12,4 +12,4 @@ REQUIRED_USE=^^ ( lua_single_target_luajit lua_single_target_lua5-1 lua_single_t
RESTRICT=test
SLOT=0
_eclasses_=cmake ac7cb516f6a288b6a82bc0649ce49878 desktop 7fd20552ce4cc97e8acb132a499a7dd8 edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic 09a8beb8e6a8e02dc1e1bd83ac353741 git-r3 3e7ec3d6619213460c85e2aa48398441 l10n 8cdd85e169b835d518bc2fd59f780d8e lua-single f91b5656f00869c220a6e35ae0521c54 lua-utils 661d14f97b7d04273143565853fdfbfe multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f pax-utils a41d1fd1c111289ffa04490de6ee79d7 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb wrapper 4251d4c84c25f59094fd557e0063a974 xdg-utils ff2ff954e6b17929574eee4efc5152ba
-_md5_=faab6dec31009ddb1a3efa8d2a3d137c
+_md5_=ffe50c2dafbaa382c68a9e6f4d84dce4
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index a53082b6bf50..eeef05babce9 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Wed, 30 Dec 2020 05:08:34 +0000
+Wed, 30 Dec 2020 15:08:32 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index f97273785a76..ba18f33bdc50 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Wed Dec 30 05:08:33 AM UTC 2020
+Wed Dec 30 03:08:31 PM UTC 2020
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 307cf5de5dd4..fee0303cf11a 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Wed, 30 Dec 2020 05:30:01 +0000
+Wed, 30 Dec 2020 15:30:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index e9363baec4ed..f6d4cd83f570 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-eb940ff5f354184c7f53eee7eac50fe372976e71 1609300379 2020-12-30T03:52:59+00:00
+64f419c87524b6a8343c81af4a99a99b660f10b8 1609335384 2020-12-30T13:36:24+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index d4d350626465..1d58c35f03ed 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1609304701 Wed 30 Dec 2020 05:05:01 AM UTC
+1609340701 Wed 30 Dec 2020 03:05:01 PM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 95a17959f172..d078a61856f5 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Wed, 30 Dec 2020 05:08:33 +0000
+Wed, 30 Dec 2020 15:08:31 +0000
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 12d882edf42c..dcfbd28bc9e1 100644
Binary files a/net-analyzer/Manifest.gz and b/net-analyzer/Manifest.gz differ
diff --git a/net-analyzer/zabbix/Manifest b/net-analyzer/zabbix/Manifest
index 543c190339e9..29778a69228f 100644
--- a/net-analyzer/zabbix/Manifest
+++ b/net-analyzer/zabbix/Manifest
@@ -3,5 +3,7 @@ DIST zabbix-4.0.26.tar.gz 17412367 BLAKE2B 7b75eeaa1146faed5e7aeeb3944eeb68df9c3
DIST zabbix-4.0.27.tar.gz 17426383 BLAKE2B 33381d3705bc7cb9d451b1a536fbb4f92a9e7e321afbe9363a7879cbea3cc5977a4866a5f4d1fb70120804edaffaf869ba8c4321a67898c42c9abe2341ee118b SHA512 54690dd778d09d7309c2e2ea3f0bfc6053ef097888bfccd140484e4677766ded829757eb4dfde7da8ce19335307ddbfbb1c132feabc13cc6727a6d28c1591cfa
DIST zabbix-5.0.5.tar.gz 19153153 BLAKE2B 6f78e690b5a8325739148802a8933d6b1e45a7c08c6f384643d4f85dc8a502be73ff2873cf3ec40cc96c2d892c8866c9f07847b055bef80fda9b00f7333727c5 SHA512 5397672fa170e12120526793b48d01764013467cc259eca61991bc52251c25888dd318ccffa6ed30ac3643104e715ceb70baaeec6eeaddb115ed294c22f5e619
DIST zabbix-5.0.6.tar.gz 19359566 BLAKE2B 375fcbed08be46c1f17c7979763dcdfb8a51a25c2523037a1992dbb7ceb798a665f5d01e97e2e6ef023d5170e3e71df933e0fc41d27fd905ba190497d6bcd28d SHA512 c136536eab3c0e3527e8db8528656776de8849554e0a85a1644000e51c66b09044b176985de1c6d1dcc1d4ec03fc2456111c4df8d896ca276eeed2744cdd48be
+DIST zabbix-5.0.7.tar.gz 19382483 BLAKE2B fa0864ba1ac77659e9a18b0c22cee8be1078fad1e76017d01754b626151366bfeb67aa2a5b29ac1c0ac92ebaff53f7ca273a763158f7a37566dd41efe4dee7ff SHA512 8916ff44a2b3ad16e40d37b43ed540b4eefb91423ecbcc4ab9463477f6a29ed8417c79b0951a36e2798df1166a95ee5ed150bd61448b657df694498c2a274403
DIST zabbix-5.2.1.tar.gz 19579218 BLAKE2B 32f8955af5e15dd72f660a2fe1153c8c3d582d9470a87def756516db53a512605fcb67263317ef5980d597d1124324dc15c404e31aa96201105fbd5821549bb8 SHA512 deb69250a91abe24c7988011bfaa369cc13639636b37668ec12e310d92813288adc8e3a2ea7a2a51b0f54d7e6f594277778bb37a481b8f9c3dbb02e528a0cfa0
DIST zabbix-5.2.2.tar.gz 19745101 BLAKE2B 651184d4645ff4cfac1317326bd846b4707d8556a30c64dd0b5ac923fb2bb4439b120a4c2bf43c1f73b57a919d5f3bfba28e3d9efde6a3f48587c5b7d0b1d7db SHA512 7bb79111ff809a90a5911d7f94f86eddec3a3fa4f91fdfbf013178442de81d22dc13359679570b8d62fe41b664c764c42cbe98936fd195521951aab507933d9b
+DIST zabbix-5.2.3.tar.gz 19791383 BLAKE2B ad0c2306f05d1d664068d9dbc6983c79e1e4d13e605a4683076da51968d2ca2dd6330ca16ad5e24fcabca95565ff1c3e4246ce7352f23a32d419ba207869f8c2 SHA512 207d522ab728bb89f6aaf793af94848469210fb257ead34b93e0f7ba7b2a22b4cce65d516dfbb549a36ae873fe6b6d3486c47f11efff8950d3c81570c673ff9e
diff --git a/net-analyzer/zabbix/zabbix-3.0.31-r2.ebuild b/net-analyzer/zabbix/zabbix-3.0.31-r2.ebuild
index 40121fa75537..a0c92d82004e 100644
--- a/net-analyzer/zabbix/zabbix-3.0.31-r2.ebuild
+++ b/net-analyzer/zabbix/zabbix-3.0.31-r2.ebuild
@@ -5,7 +5,7 @@ EAPI=7
# needed to make webapp-config dep optional
WEBAPP_OPTIONAL="yes"
-inherit flag-o-matic webapp java-pkg-opt-2 user systemd toolchain-funcs
+inherit flag-o-matic webapp java-pkg-opt-2 systemd toolchain-funcs
DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
HOMEPAGE="https://www.zabbix.com/"
@@ -49,6 +49,8 @@ COMMON_DEPEND="
"
RDEPEND="${COMMON_DEPEND}
+ acct-group/zabbix
+ acct-user/zabbix
java? ( >=virtual/jre-1.8:* )
mysql? ( virtual/mysql )
proxy? ( net-analyzer/fping[suid] )
@@ -122,9 +124,6 @@ pkg_setup() {
webapp_pkg_setup
fi
- enewgroup zabbix
- enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix
-
java-pkg-opt-2_pkg_setup
}
diff --git a/net-analyzer/zabbix/zabbix-4.0.26-r1.ebuild b/net-analyzer/zabbix/zabbix-4.0.26-r1.ebuild
index c3e0e8de2db6..2c7ebb47a57b 100644
--- a/net-analyzer/zabbix/zabbix-4.0.26-r1.ebuild
+++ b/net-analyzer/zabbix/zabbix-4.0.26-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
# needed to make webapp-config dep optional
WEBAPP_OPTIONAL="yes"
-inherit flag-o-matic webapp java-pkg-opt-2 user systemd toolchain-funcs
+inherit flag-o-matic webapp java-pkg-opt-2 systemd toolchain-funcs
DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
HOMEPAGE="https://www.zabbix.com/"
@@ -49,6 +49,8 @@ COMMON_DEPEND="
"
RDEPEND="${COMMON_DEPEND}
+ acct-group/zabbix
+ acct-user/zabbix
java? ( >=virtual/jre-1.8:* )
mysql? ( virtual/mysql )
proxy? ( net-analyzer/fping[suid] )
@@ -121,9 +123,6 @@ pkg_setup() {
webapp_pkg_setup
fi
- enewgroup zabbix
- enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix
-
java-pkg-opt-2_pkg_setup
}
diff --git a/net-analyzer/zabbix/zabbix-4.0.27-r1.ebuild b/net-analyzer/zabbix/zabbix-4.0.27-r1.ebuild
index c097176110ef..7ce30397049f 100644
--- a/net-analyzer/zabbix/zabbix-4.0.27-r1.ebuild
+++ b/net-analyzer/zabbix/zabbix-4.0.27-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
# needed to make webapp-config dep optional
WEBAPP_OPTIONAL="yes"
-inherit flag-o-matic webapp java-pkg-opt-2 user systemd toolchain-funcs
+inherit flag-o-matic webapp java-pkg-opt-2 systemd toolchain-funcs
DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
HOMEPAGE="https://www.zabbix.com/"
@@ -49,6 +49,8 @@ COMMON_DEPEND="
"
RDEPEND="${COMMON_DEPEND}
+ acct-group/zabbix
+ acct-user/zabbix
java? ( >=virtual/jre-1.8:* )
mysql? ( virtual/mysql )
proxy? ( net-analyzer/fping[suid] )
@@ -121,9 +123,6 @@ pkg_setup() {
webapp_pkg_setup
fi
- enewgroup zabbix
- enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix
-
java-pkg-opt-2_pkg_setup
}
diff --git a/net-analyzer/zabbix/zabbix-5.0.5-r1.ebuild b/net-analyzer/zabbix/zabbix-5.0.5-r1.ebuild
index 04c629c2aced..d236db78534c 100644
--- a/net-analyzer/zabbix/zabbix-5.0.5-r1.ebuild
+++ b/net-analyzer/zabbix/zabbix-5.0.5-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
# needed to make webapp-config dep optional
WEBAPP_OPTIONAL="yes"
-inherit flag-o-matic webapp java-pkg-opt-2 user systemd toolchain-funcs
+inherit flag-o-matic webapp java-pkg-opt-2 systemd toolchain-funcs
DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
HOMEPAGE="https://www.zabbix.com/"
@@ -48,6 +48,8 @@ COMMON_DEPEND="
"
RDEPEND="${COMMON_DEPEND}
+ acct-group/zabbix
+ acct-user/zabbix
java? ( >=virtual/jre-1.8:* )
mysql? ( virtual/mysql )
proxy? ( net-analyzer/fping[suid] )
@@ -120,9 +122,6 @@ pkg_setup() {
webapp_pkg_setup
fi
- enewgroup zabbix
- enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix
-
java-pkg-opt-2_pkg_setup
}
diff --git a/net-analyzer/zabbix/zabbix-5.0.6-r1.ebuild b/net-analyzer/zabbix/zabbix-5.0.6-r1.ebuild
index b95dbdcff0ce..8f6e95562365 100644
--- a/net-analyzer/zabbix/zabbix-5.0.6-r1.ebuild
+++ b/net-analyzer/zabbix/zabbix-5.0.6-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
# needed to make webapp-config dep optional
WEBAPP_OPTIONAL="yes"
-inherit flag-o-matic webapp java-pkg-opt-2 user systemd toolchain-funcs
+inherit flag-o-matic webapp java-pkg-opt-2 systemd toolchain-funcs
DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
HOMEPAGE="https://www.zabbix.com/"
@@ -48,6 +48,8 @@ COMMON_DEPEND="
"
RDEPEND="${COMMON_DEPEND}
+ acct-group/zabbix
+ acct-user/zabbix
java? ( >=virtual/jre-1.8:* )
mysql? ( virtual/mysql )
proxy? ( net-analyzer/fping[suid] )
@@ -120,9 +122,6 @@ pkg_setup() {
webapp_pkg_setup
fi
- enewgroup zabbix
- enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix
-
java-pkg-opt-2_pkg_setup
}
diff --git a/net-analyzer/zabbix/zabbix-5.0.7.ebuild b/net-analyzer/zabbix/zabbix-5.0.7.ebuild
new file mode 100644
index 000000000000..8f6e95562365
--- /dev/null
+++ b/net-analyzer/zabbix/zabbix-5.0.7.ebuild
@@ -0,0 +1,346 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# needed to make webapp-config dep optional
+WEBAPP_OPTIONAL="yes"
+inherit flag-o-matic webapp java-pkg-opt-2 systemd toolchain-funcs
+
+DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
+HOMEPAGE="https://www.zabbix.com/"
+MY_P=${P/_/}
+MY_PV=${PV/_/}
+SRC_URI="https://cdn.zabbix.com/${PN}/sources/stable/$(ver_cut 1-2)/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0/$(ver_cut 1-2)"
+WEBAPP_MANUAL_SLOT="yes"
+KEYWORDS="~amd64 ~x86"
+IUSE="+agent java curl frontend ipv6 ldap libxml2 mysql openipmi oracle +postgres proxy server ssh ssl snmp sqlite odbc static"
+REQUIRED_USE="|| ( agent frontend proxy server )
+ proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) )
+ server? ( ^^ ( mysql oracle postgres odbc ) )
+ static? ( !oracle !snmp )"
+
+COMMON_DEPEND="
+ curl? ( net-misc/curl )
+ java? ( >=virtual/jdk-1.8:* )
+ ldap? (
+ =dev-libs/cyrus-sasl-2*
+ net-libs/gnutls
+ net-nds/openldap
+ )
+ libxml2? ( dev-libs/libxml2 )
+ mysql? ( dev-db/mysql-connector-c )
+ odbc? ( dev-db/unixODBC )
+ openipmi? ( sys-libs/openipmi )
+ oracle? ( dev-db/oracle-instantclient-basic )
+ postgres? ( dev-db/postgresql:* )
+ proxy? ( sys-libs/zlib )
+ server? (
+ dev-libs/libevent
+ sys-libs/zlib
+ )
+ snmp? ( net-analyzer/net-snmp )
+ sqlite? ( dev-db/sqlite )
+ ssh? ( net-libs/libssh2 )
+ ssl? ( dev-libs/openssl:=[-bindist] )
+"
+
+RDEPEND="${COMMON_DEPEND}
+ acct-group/zabbix
+ acct-user/zabbix
+ java? ( >=virtual/jre-1.8:* )
+ mysql? ( virtual/mysql )
+ proxy? ( net-analyzer/fping[suid] )
+ server? (
+ app-admin/webapp-config
+ dev-libs/libevent
+ dev-libs/libpcre
+ net-analyzer/fping[suid]
+ )
+ frontend? (
+ app-admin/webapp-config
+ dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
+ media-libs/gd[png]
+ virtual/httpd-php:*
+ mysql? ( dev-lang/php[mysqli] )
+ odbc? ( dev-lang/php[odbc] )
+ oracle? ( dev-lang/php[oci8-instant-client] )
+ postgres? ( dev-lang/php[postgres] )
+ sqlite? ( dev-lang/php[sqlite] )
+ )
+"
+DEPEND="${COMMON_DEPEND}
+ static? (
+ curl? ( net-misc/curl[static-libs] )
+ ldap? (
+ =dev-libs/cyrus-sasl-2*[static-libs]
+ net-libs/gnutls[static-libs]
+ net-nds/openldap[static-libs]
+ )
+ libxml2? ( dev-libs/libxml2[static-libs] )
+ mysql? ( dev-db/mysql-connector-c[static-libs] )
+ odbc? ( dev-db/unixODBC[static-libs] )
+ postgres? ( dev-db/postgresql:*[static-libs] )
+ sqlite? ( dev-db/sqlite[static-libs] )
+ ssh? ( net-libs/libssh2 )
+ )
+"
+BDEPEND="
+ virtual/pkgconfig
+"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-4.0.18-modulepathfix.patch"
+ "${FILESDIR}/${PN}-3.0.30-security-disable-PidFile.patch"
+)
+
+S=${WORKDIR}/${MY_P}
+
+ZABBIXJAVA_BASE="opt/zabbix_java"
+
+pkg_setup() {
+ if use oracle; then
+ if [ -z "${ORACLE_HOME}" ]; then
+ eerror
+ eerror "The environment variable ORACLE_HOME must be set"
+ eerror "and point to the correct location."
+ eerror "It looks like you don't have Oracle installed."
+ eerror
+ die "Environment variable ORACLE_HOME is not set"
+ fi
+ if has_version 'dev-db/oracle-instantclient-basic'; then
+ ewarn
+ ewarn "Please ensure you have a full install of the Oracle client."
+ ewarn "dev-db/oracle-instantclient* is NOT sufficient."
+ ewarn
+ fi
+ fi
+
+ if use frontend; then
+ webapp_pkg_setup
+ fi
+
+ java-pkg-opt-2_pkg_setup
+}
+
+src_prepare() {
+ default
+}
+
+src_configure() {
+ econf \
+ $(use_enable agent) \
+ $(use_enable ipv6) \
+ $(use_enable java) \
+ $(use_enable proxy) \
+ $(use_enable server) \
+ $(use_enable static) \
+ $(use_with curl libcurl) \
+ $(use_with ldap) \
+ $(use_with libxml2) \
+ $(use_with mysql) \
+ $(use_with odbc unixodbc) \
+ $(use_with openipmi openipmi) \
+ $(use_with oracle) \
+ $(use_with postgres postgresql) \
+ $(use_with snmp net-snmp) \
+ $(use_with sqlite sqlite3) \
+ $(use_with ssh ssh2) \
+ $(use_with ssl openssl)
+}
+
+src_compile() {
+ if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
+ emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)"
+ fi
+}
+
+src_install() {
+ local dirs=(
+ /etc/zabbix
+ /var/lib/zabbix
+ /var/lib/zabbix/home
+ /var/lib/zabbix/scripts
+ /var/lib/zabbix/alertscripts
+ /var/lib/zabbix/externalscripts
+ /var/log/zabbix
+ )
+
+ for dir in "${dirs[@]}"; do
+ dodir "${dir}"
+ keepdir "${dir}"
+ done
+
+ if use server; then
+ insinto /etc/zabbix
+ doins "${S}"/conf/zabbix_server.conf
+ fperms 0640 /etc/zabbix/zabbix_server.conf
+ fowners root:zabbix /etc/zabbix/zabbix_server.conf
+
+ newinitd "${FILESDIR}"/zabbix-server.init zabbix-server
+
+ dosbin src/zabbix_server/zabbix_server
+
+ insinto /usr/share/zabbix
+ doins -r "${S}"/database/
+
+ systemd_dounit "${FILESDIR}"/zabbix-server.service
+ systemd_newtmpfilesd "${FILESDIR}"/zabbix-server.tmpfiles zabbix-server.conf
+ fi
+
+ if use proxy; then
+ insinto /etc/zabbix
+ doins "${S}"/conf/zabbix_proxy.conf
+ fperms 0640 /etc/zabbix/zabbix_proxy.conf
+ fowners root:zabbix /etc/zabbix/zabbix_proxy.conf
+
+ newinitd "${FILESDIR}"/zabbix-proxy.init zabbix-proxy
+
+ dosbin src/zabbix_proxy/zabbix_proxy
+
+ insinto /usr/share/zabbix
+ doins -r "${S}"/database/
+
+ systemd_dounit "${FILESDIR}"/zabbix-proxy.service
+ systemd_newtmpfilesd "${FILESDIR}"/zabbix-proxy.tmpfiles zabbix-proxy.conf
+ fi
+
+ if use agent; then
+ insinto /etc/zabbix
+ doins "${S}"/conf/zabbix_agentd.conf
+ fperms 0640 /etc/zabbix/zabbix_agentd.conf
+ fowners root:zabbix /etc/zabbix/zabbix_agentd.conf
+
+ newinitd "${FILESDIR}"/zabbix-agentd.init zabbix-agentd
+
+ dosbin src/zabbix_agent/zabbix_agentd
+ dobin \
+ src/zabbix_sender/zabbix_sender \
+ src/zabbix_get/zabbix_get
+
+ systemd_dounit "${FILESDIR}"/zabbix-agentd.service
+ systemd_newtmpfilesd "${FILESDIR}"/zabbix-agentd.tmpfiles zabbix-agentd.conf
+ fi
+
+ fowners root:zabbix /etc/zabbix
+ fowners zabbix:zabbix \
+ /var/lib/zabbix \
+ /var/lib/zabbix/home \
+ /var/lib/zabbix/scripts \
+ /var/lib/zabbix/alertscripts \
+ /var/lib/zabbix/externalscripts \
+ /var/log/zabbix
+ fperms 0750 \
+ /etc/zabbix \
+ /var/lib/zabbix \
+ /var/lib/zabbix/home \
+ /var/lib/zabbix/scripts \
+ /var/lib/zabbix/alertscripts \
+ /var/lib/zabbix/externalscripts \
+ /var/log/zabbix
+
+ dodoc README INSTALL NEWS ChangeLog \
+ conf/zabbix_agentd.conf \
+ conf/zabbix_proxy.conf \
+ conf/zabbix_agentd/userparameter_examples.conf \
+ conf/zabbix_agentd/userparameter_mysql.conf \
+ conf/zabbix_server.conf
+
+ if use frontend; then
+ webapp_src_preinst
+ cp -R ui/* "${D}/${MY_HTDOCSDIR}"
+ webapp_configfile \
+ "${MY_HTDOCSDIR}"/include/db.inc.php \
+ "${MY_HTDOCSDIR}"/include/config.inc.php
+ webapp_src_install
+ fi
+
+ if use java; then
+ dodir \
+ /${ZABBIXJAVA_BASE} \
+ /${ZABBIXJAVA_BASE}/bin \
+ /${ZABBIXJAVA_BASE}/lib
+ keepdir /${ZABBIXJAVA_BASE}
+ exeinto /${ZABBIXJAVA_BASE}/bin
+ doexe src/zabbix_java/bin/zabbix-java-gateway-${MY_PV}.jar
+ exeinto /${ZABBIXJAVA_BASE}/lib
+ doexe \
+ src/zabbix_java/lib/logback-classic-0.9.27.jar \
+ src/zabbix_java/lib/logback-console.xml \
+ src/zabbix_java/lib/logback-core-0.9.27.jar \
+ src/zabbix_java/lib/logback.xml \
+ src/zabbix_java/lib/android-json-4.3_r3.1.jar \
+ src/zabbix_java/lib/slf4j-api-1.6.1.jar
+ newinitd "${FILESDIR}"/zabbix-jmx-proxy.init zabbix-jmx-proxy
+ newconfd "${FILESDIR}"/zabbix-jmx-proxy.conf zabbix-jmx-proxy
+ fi
+}
+
+pkg_postinst() {
+ if use server || use proxy ; then
+ elog
+ elog "You may need to configure your database for Zabbix"
+ elog "if you have not already done so."
+ elog
+
+ zabbix_homedir=$(egethome zabbix)
+ if [ -n "${zabbix_homedir}" ] && \
+ [ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then
+ ewarn
+ ewarn "The user 'zabbix' should have his homedir changed"
+ ewarn "to /var/lib/zabbix/home if you want to use"
+ ewarn "custom alert scripts."
+ ewarn
+ ewarn "A real homedir might be needed for configfiles"
+ ewarn "for custom alert scripts."
+ ewarn
+ ewarn "To change the homedir use:"
+ ewarn " usermod -d /var/lib/zabbix/home zabbix"
+ ewarn
+ fi
+ fi
+
+ if use server; then
+ elog
+ elog "For distributed monitoring you have to run:"
+ elog
+ elog "zabbix_server -n "
+ elog
+ elog "This will convert database data for use with Node ID"
+ elog "and also adds a local node."
+ elog
+ fi
+
+ elog "--"
+ elog
+ elog "You may need to add these lines to /etc/services:"
+ elog
+ elog "zabbix-agent 10050/tcp Zabbix Agent"
+ elog "zabbix-agent 10050/udp Zabbix Agent"
+ elog "zabbix-trapper 10051/tcp Zabbix Trapper"
+ elog "zabbix-trapper 10051/udp Zabbix Trapper"
+ elog
+
+ if use server || use proxy ; then
+ # check for fping
+ fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null)
+ case "${fping_perms}" in
+ 4[157][157][157])
+ ;;
+ *)
+ ewarn
+ ewarn "If you want to use the checks 'icmpping' and 'icmppingsec',"
+ ewarn "you have to make /usr/sbin/fping setuid root and executable"
+ ewarn "by everyone. Run the following command to fix it:"
+ ewarn
+ ewarn " chmod u=rwsx,g=rx,o=rx /usr/sbin/fping"
+ ewarn
+ ewarn "Please be aware that this might impose a security risk,"
+ ewarn "depending on the code quality of fping."
+ ewarn
+ ;;
+ esac
+ fi
+}
diff --git a/net-analyzer/zabbix/zabbix-5.2.1-r1.ebuild b/net-analyzer/zabbix/zabbix-5.2.1-r1.ebuild
index 04c629c2aced..d236db78534c 100644
--- a/net-analyzer/zabbix/zabbix-5.2.1-r1.ebuild
+++ b/net-analyzer/zabbix/zabbix-5.2.1-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
# needed to make webapp-config dep optional
WEBAPP_OPTIONAL="yes"
-inherit flag-o-matic webapp java-pkg-opt-2 user systemd toolchain-funcs
+inherit flag-o-matic webapp java-pkg-opt-2 systemd toolchain-funcs
DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
HOMEPAGE="https://www.zabbix.com/"
@@ -48,6 +48,8 @@ COMMON_DEPEND="
"
RDEPEND="${COMMON_DEPEND}
+ acct-group/zabbix
+ acct-user/zabbix
java? ( >=virtual/jre-1.8:* )
mysql? ( virtual/mysql )
proxy? ( net-analyzer/fping[suid] )
@@ -120,9 +122,6 @@ pkg_setup() {
webapp_pkg_setup
fi
- enewgroup zabbix
- enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix
-
java-pkg-opt-2_pkg_setup
}
diff --git a/net-analyzer/zabbix/zabbix-5.2.2-r1.ebuild b/net-analyzer/zabbix/zabbix-5.2.2-r1.ebuild
index b95dbdcff0ce..8f6e95562365 100644
--- a/net-analyzer/zabbix/zabbix-5.2.2-r1.ebuild
+++ b/net-analyzer/zabbix/zabbix-5.2.2-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
# needed to make webapp-config dep optional
WEBAPP_OPTIONAL="yes"
-inherit flag-o-matic webapp java-pkg-opt-2 user systemd toolchain-funcs
+inherit flag-o-matic webapp java-pkg-opt-2 systemd toolchain-funcs
DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
HOMEPAGE="https://www.zabbix.com/"
@@ -48,6 +48,8 @@ COMMON_DEPEND="
"
RDEPEND="${COMMON_DEPEND}
+ acct-group/zabbix
+ acct-user/zabbix
java? ( >=virtual/jre-1.8:* )
mysql? ( virtual/mysql )
proxy? ( net-analyzer/fping[suid] )
@@ -120,9 +122,6 @@ pkg_setup() {
webapp_pkg_setup
fi
- enewgroup zabbix
- enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix
-
java-pkg-opt-2_pkg_setup
}
diff --git a/net-analyzer/zabbix/zabbix-5.2.3.ebuild b/net-analyzer/zabbix/zabbix-5.2.3.ebuild
new file mode 100644
index 000000000000..8f6e95562365
--- /dev/null
+++ b/net-analyzer/zabbix/zabbix-5.2.3.ebuild
@@ -0,0 +1,346 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# needed to make webapp-config dep optional
+WEBAPP_OPTIONAL="yes"
+inherit flag-o-matic webapp java-pkg-opt-2 systemd toolchain-funcs
+
+DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
+HOMEPAGE="https://www.zabbix.com/"
+MY_P=${P/_/}
+MY_PV=${PV/_/}
+SRC_URI="https://cdn.zabbix.com/${PN}/sources/stable/$(ver_cut 1-2)/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0/$(ver_cut 1-2)"
+WEBAPP_MANUAL_SLOT="yes"
+KEYWORDS="~amd64 ~x86"
+IUSE="+agent java curl frontend ipv6 ldap libxml2 mysql openipmi oracle +postgres proxy server ssh ssl snmp sqlite odbc static"
+REQUIRED_USE="|| ( agent frontend proxy server )
+ proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) )
+ server? ( ^^ ( mysql oracle postgres odbc ) )
+ static? ( !oracle !snmp )"
+
+COMMON_DEPEND="
+ curl? ( net-misc/curl )
+ java? ( >=virtual/jdk-1.8:* )
+ ldap? (
+ =dev-libs/cyrus-sasl-2*
+ net-libs/gnutls
+ net-nds/openldap
+ )
+ libxml2? ( dev-libs/libxml2 )
+ mysql? ( dev-db/mysql-connector-c )
+ odbc? ( dev-db/unixODBC )
+ openipmi? ( sys-libs/openipmi )
+ oracle? ( dev-db/oracle-instantclient-basic )
+ postgres? ( dev-db/postgresql:* )
+ proxy? ( sys-libs/zlib )
+ server? (
+ dev-libs/libevent
+ sys-libs/zlib
+ )
+ snmp? ( net-analyzer/net-snmp )
+ sqlite? ( dev-db/sqlite )
+ ssh? ( net-libs/libssh2 )
+ ssl? ( dev-libs/openssl:=[-bindist] )
+"
+
+RDEPEND="${COMMON_DEPEND}
+ acct-group/zabbix
+ acct-user/zabbix
+ java? ( >=virtual/jre-1.8:* )
+ mysql? ( virtual/mysql )
+ proxy? ( net-analyzer/fping[suid] )
+ server? (
+ app-admin/webapp-config
+ dev-libs/libevent
+ dev-libs/libpcre
+ net-analyzer/fping[suid]
+ )
+ frontend? (
+ app-admin/webapp-config
+ dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
+ media-libs/gd[png]
+ virtual/httpd-php:*
+ mysql? ( dev-lang/php[mysqli] )
+ odbc? ( dev-lang/php[odbc] )
+ oracle? ( dev-lang/php[oci8-instant-client] )
+ postgres? ( dev-lang/php[postgres] )
+ sqlite? ( dev-lang/php[sqlite] )
+ )
+"
+DEPEND="${COMMON_DEPEND}
+ static? (
+ curl? ( net-misc/curl[static-libs] )
+ ldap? (
+ =dev-libs/cyrus-sasl-2*[static-libs]
+ net-libs/gnutls[static-libs]
+ net-nds/openldap[static-libs]
+ )
+ libxml2? ( dev-libs/libxml2[static-libs] )
+ mysql? ( dev-db/mysql-connector-c[static-libs] )
+ odbc? ( dev-db/unixODBC[static-libs] )
+ postgres? ( dev-db/postgresql:*[static-libs] )
+ sqlite? ( dev-db/sqlite[static-libs] )
+ ssh? ( net-libs/libssh2 )
+ )
+"
+BDEPEND="
+ virtual/pkgconfig
+"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-4.0.18-modulepathfix.patch"
+ "${FILESDIR}/${PN}-3.0.30-security-disable-PidFile.patch"
+)
+
+S=${WORKDIR}/${MY_P}
+
+ZABBIXJAVA_BASE="opt/zabbix_java"
+
+pkg_setup() {
+ if use oracle; then
+ if [ -z "${ORACLE_HOME}" ]; then
+ eerror
+ eerror "The environment variable ORACLE_HOME must be set"
+ eerror "and point to the correct location."
+ eerror "It looks like you don't have Oracle installed."
+ eerror
+ die "Environment variable ORACLE_HOME is not set"
+ fi
+ if has_version 'dev-db/oracle-instantclient-basic'; then
+ ewarn
+ ewarn "Please ensure you have a full install of the Oracle client."
+ ewarn "dev-db/oracle-instantclient* is NOT sufficient."
+ ewarn
+ fi
+ fi
+
+ if use frontend; then
+ webapp_pkg_setup
+ fi
+
+ java-pkg-opt-2_pkg_setup
+}
+
+src_prepare() {
+ default
+}
+
+src_configure() {
+ econf \
+ $(use_enable agent) \
+ $(use_enable ipv6) \
+ $(use_enable java) \
+ $(use_enable proxy) \
+ $(use_enable server) \
+ $(use_enable static) \
+ $(use_with curl libcurl) \
+ $(use_with ldap) \
+ $(use_with libxml2) \
+ $(use_with mysql) \
+ $(use_with odbc unixodbc) \
+ $(use_with openipmi openipmi) \
+ $(use_with oracle) \
+ $(use_with postgres postgresql) \
+ $(use_with snmp net-snmp) \
+ $(use_with sqlite sqlite3) \
+ $(use_with ssh ssh2) \
+ $(use_with ssl openssl)
+}
+
+src_compile() {
+ if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
+ emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)"
+ fi
+}
+
+src_install() {
+ local dirs=(
+ /etc/zabbix
+ /var/lib/zabbix
+ /var/lib/zabbix/home
+ /var/lib/zabbix/scripts
+ /var/lib/zabbix/alertscripts
+ /var/lib/zabbix/externalscripts
+ /var/log/zabbix
+ )
+
+ for dir in "${dirs[@]}"; do
+ dodir "${dir}"
+ keepdir "${dir}"
+ done
+
+ if use server; then
+ insinto /etc/zabbix
+ doins "${S}"/conf/zabbix_server.conf
+ fperms 0640 /etc/zabbix/zabbix_server.conf
+ fowners root:zabbix /etc/zabbix/zabbix_server.conf
+
+ newinitd "${FILESDIR}"/zabbix-server.init zabbix-server
+
+ dosbin src/zabbix_server/zabbix_server
+
+ insinto /usr/share/zabbix
+ doins -r "${S}"/database/
+
+ systemd_dounit "${FILESDIR}"/zabbix-server.service
+ systemd_newtmpfilesd "${FILESDIR}"/zabbix-server.tmpfiles zabbix-server.conf
+ fi
+
+ if use proxy; then
+ insinto /etc/zabbix
+ doins "${S}"/conf/zabbix_proxy.conf
+ fperms 0640 /etc/zabbix/zabbix_proxy.conf
+ fowners root:zabbix /etc/zabbix/zabbix_proxy.conf
+
+ newinitd "${FILESDIR}"/zabbix-proxy.init zabbix-proxy
+
+ dosbin src/zabbix_proxy/zabbix_proxy
+
+ insinto /usr/share/zabbix
+ doins -r "${S}"/database/
+
+ systemd_dounit "${FILESDIR}"/zabbix-proxy.service
+ systemd_newtmpfilesd "${FILESDIR}"/zabbix-proxy.tmpfiles zabbix-proxy.conf
+ fi
+
+ if use agent; then
+ insinto /etc/zabbix
+ doins "${S}"/conf/zabbix_agentd.conf
+ fperms 0640 /etc/zabbix/zabbix_agentd.conf
+ fowners root:zabbix /etc/zabbix/zabbix_agentd.conf
+
+ newinitd "${FILESDIR}"/zabbix-agentd.init zabbix-agentd
+
+ dosbin src/zabbix_agent/zabbix_agentd
+ dobin \
+ src/zabbix_sender/zabbix_sender \
+ src/zabbix_get/zabbix_get
+
+ systemd_dounit "${FILESDIR}"/zabbix-agentd.service
+ systemd_newtmpfilesd "${FILESDIR}"/zabbix-agentd.tmpfiles zabbix-agentd.conf
+ fi
+
+ fowners root:zabbix /etc/zabbix
+ fowners zabbix:zabbix \
+ /var/lib/zabbix \
+ /var/lib/zabbix/home \
+ /var/lib/zabbix/scripts \
+ /var/lib/zabbix/alertscripts \
+ /var/lib/zabbix/externalscripts \
+ /var/log/zabbix
+ fperms 0750 \
+ /etc/zabbix \
+ /var/lib/zabbix \
+ /var/lib/zabbix/home \
+ /var/lib/zabbix/scripts \
+ /var/lib/zabbix/alertscripts \
+ /var/lib/zabbix/externalscripts \
+ /var/log/zabbix
+
+ dodoc README INSTALL NEWS ChangeLog \
+ conf/zabbix_agentd.conf \
+ conf/zabbix_proxy.conf \
+ conf/zabbix_agentd/userparameter_examples.conf \
+ conf/zabbix_agentd/userparameter_mysql.conf \
+ conf/zabbix_server.conf
+
+ if use frontend; then
+ webapp_src_preinst
+ cp -R ui/* "${D}/${MY_HTDOCSDIR}"
+ webapp_configfile \
+ "${MY_HTDOCSDIR}"/include/db.inc.php \
+ "${MY_HTDOCSDIR}"/include/config.inc.php
+ webapp_src_install
+ fi
+
+ if use java; then
+ dodir \
+ /${ZABBIXJAVA_BASE} \
+ /${ZABBIXJAVA_BASE}/bin \
+ /${ZABBIXJAVA_BASE}/lib
+ keepdir /${ZABBIXJAVA_BASE}
+ exeinto /${ZABBIXJAVA_BASE}/bin
+ doexe src/zabbix_java/bin/zabbix-java-gateway-${MY_PV}.jar
+ exeinto /${ZABBIXJAVA_BASE}/lib
+ doexe \
+ src/zabbix_java/lib/logback-classic-0.9.27.jar \
+ src/zabbix_java/lib/logback-console.xml \
+ src/zabbix_java/lib/logback-core-0.9.27.jar \
+ src/zabbix_java/lib/logback.xml \
+ src/zabbix_java/lib/android-json-4.3_r3.1.jar \
+ src/zabbix_java/lib/slf4j-api-1.6.1.jar
+ newinitd "${FILESDIR}"/zabbix-jmx-proxy.init zabbix-jmx-proxy
+ newconfd "${FILESDIR}"/zabbix-jmx-proxy.conf zabbix-jmx-proxy
+ fi
+}
+
+pkg_postinst() {
+ if use server || use proxy ; then
+ elog
+ elog "You may need to configure your database for Zabbix"
+ elog "if you have not already done so."
+ elog
+
+ zabbix_homedir=$(egethome zabbix)
+ if [ -n "${zabbix_homedir}" ] && \
+ [ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then
+ ewarn
+ ewarn "The user 'zabbix' should have his homedir changed"
+ ewarn "to /var/lib/zabbix/home if you want to use"
+ ewarn "custom alert scripts."
+ ewarn
+ ewarn "A real homedir might be needed for configfiles"
+ ewarn "for custom alert scripts."
+ ewarn
+ ewarn "To change the homedir use:"
+ ewarn " usermod -d /var/lib/zabbix/home zabbix"
+ ewarn
+ fi
+ fi
+
+ if use server; then
+ elog
+ elog "For distributed monitoring you have to run:"
+ elog
+ elog "zabbix_server -n "
+ elog
+ elog "This will convert database data for use with Node ID"
+ elog "and also adds a local node."
+ elog
+ fi
+
+ elog "--"
+ elog
+ elog "You may need to add these lines to /etc/services:"
+ elog
+ elog "zabbix-agent 10050/tcp Zabbix Agent"
+ elog "zabbix-agent 10050/udp Zabbix Agent"
+ elog "zabbix-trapper 10051/tcp Zabbix Trapper"
+ elog "zabbix-trapper 10051/udp Zabbix Trapper"
+ elog
+
+ if use server || use proxy ; then
+ # check for fping
+ fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null)
+ case "${fping_perms}" in
+ 4[157][157][157])
+ ;;
+ *)
+ ewarn
+ ewarn "If you want to use the checks 'icmpping' and 'icmppingsec',"
+ ewarn "you have to make /usr/sbin/fping setuid root and executable"
+ ewarn "by everyone. Run the following command to fix it:"
+ ewarn
+ ewarn " chmod u=rwsx,g=rx,o=rx /usr/sbin/fping"
+ ewarn
+ ewarn "Please be aware that this might impose a security risk,"
+ ewarn "depending on the code quality of fping."
+ ewarn
+ ;;
+ esac
+ fi
+}
diff --git a/net-mail/Manifest.gz b/net-mail/Manifest.gz
index 9d457a0904aa..a59be4036e14 100644
Binary files a/net-mail/Manifest.gz and b/net-mail/Manifest.gz differ
diff --git a/net-mail/mailbase/mailbase-1.6.ebuild b/net-mail/mailbase/mailbase-1.6.ebuild
index 7687676d7b19..b48682ed1741 100644
--- a/net-mail/mailbase/mailbase-1.6.ebuild
+++ b/net-mail/mailbase/mailbase-1.6.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="pam"
RDEPEND="
diff --git a/net-print/Manifest.gz b/net-print/Manifest.gz
index 318778f33cd2..bad3f0ef676d 100644
Binary files a/net-print/Manifest.gz and b/net-print/Manifest.gz differ
diff --git a/net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.70.ebuild b/net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.70.ebuild
index 03e2dcc952f1..41880207f325 100644
--- a/net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.70.ebuild
+++ b/net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.70.ebuild
@@ -64,6 +64,8 @@ src_prepare() {
"s:backenddir = \$(libdir)/cups/backend:backenddir = `cups-config --serverbin`/backend:" \
backend/Makefile.am || die
+ sed -i -e "s@CC=gcc@CC=$(tc-getCC)@" c3plmod_ipc/Makefile || die
+
export "LIBS=-lgtk-x11-2.0 -lgobject-2.0 -lglib-2.0 -lgmodule-2.0"
change_dir mv configure.in configure.ac
change_dir sed -i -e 's/configure.in/configure.ac/' configure.ac
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 170bba01d5cc..776984d040d3 100644
Binary files a/profiles/Manifest.gz and b/profiles/Manifest.gz differ
diff --git a/profiles/package.mask b/profiles/package.mask
index e35cf5bab1a0..6617d8e9e8a7 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -32,6 +32,14 @@
#--- END OF EXAMPLES ---
+# Michał Górny (2020-12-30)
+# Unmaintained. Entirely replaced by media-libs/libjpeg-turbo,
+# to the point that reverse dependencies no longer build with
+# media-libs/jpeg. The two libraries are binary-incompatible,
+# and the current method of switching between them is incorrect.
+# Removal in 30 days. Bug #762634.
+media-libs/jpeg
+
# Hans de Graaff (2020-12-29)
# These slots masked for removal in 30 days due to
# security issues, bug 730786
diff --git a/profiles/targets/desktop/package.use b/profiles/targets/desktop/package.use
index 33f68fa62bc7..e9871000e8a9 100644
--- a/profiles/targets/desktop/package.use
+++ b/profiles/targets/desktop/package.use
@@ -91,7 +91,6 @@ media-libs/libpng apng
# introspection, exception, enabled from here instead of ebuild to skip extra deps for a system package
dev-libs/libgudev introspection
sys-fs/eudev introspection
-virtual/libgudev introspection
# Samuli Suominen (2010-12-19)
# Support for desktop file icons
diff --git a/profiles/targets/systemd/package.use.force b/profiles/targets/systemd/package.use.force
index e5028430d74f..0abe8e8aadcc 100644
--- a/profiles/targets/systemd/package.use.force
+++ b/profiles/targets/systemd/package.use.force
@@ -3,5 +3,4 @@
# Mike Gilbert (2015-04-22)
# Force systemd to avoid depgraph breakage, bug 547360.
-virtual/libgudev systemd
virtual/libudev systemd
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 9fe0acc91f60..06d69d10fd56 100644
Binary files a/sys-apps/Manifest.gz and b/sys-apps/Manifest.gz differ
diff --git a/sys-apps/portage/portage-3.0.12.ebuild b/sys-apps/portage/portage-3.0.12.ebuild
index d6077e4c4c51..6611ac6e1b8c 100644
--- a/sys-apps/portage/portage-3.0.12.ebuild
+++ b/sys-apps/portage/portage-3.0.12.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Portage is the package management and distribution system for Gento
HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
LICENSE="GPL-2"
-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"
SLOT="0"
IUSE="apidoc build doc gentoo-dev +ipc +native-extensions +rsync-verify selinux test xattr"
RESTRICT="!test? ( test )"
diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index a4ed5562dc0a..6553a0269207 100644
Binary files a/sys-devel/Manifest.gz and b/sys-devel/Manifest.gz differ
diff --git a/sys-devel/crossdev/Manifest b/sys-devel/crossdev/Manifest
index 9cc6d11acf2a..d49f6f227540 100644
--- a/sys-devel/crossdev/Manifest
+++ b/sys-devel/crossdev/Manifest
@@ -1,2 +1 @@
-DIST crossdev-20201122.tar.xz 28308 BLAKE2B 66da19024dd03e98ff0f388cdb9bf76a968ef4ac920249e9a782d46c1d32a4cb3047a0aa2d9619a054b9894ef30624ce99bb45f9c45b937fbb280a8a298aede8 SHA512 bbd7ab6a8ea0d2cb13f822277d9b8c19478368b2f365aaa60bd2548b47f9e7a582805593b683631ebb20bfb6d2f496f2d3a5eb6d144207fab58607565a8d1a41
DIST crossdev-20201129.tar.xz 28372 BLAKE2B b59d94a69b83f8db9193bd54ff6059b20617b6dd60c0f9a0ec5acdf4b93adf747886598b9af7d69d2fd9705fab709041a96c149286e623b6557ea709bf2f840a SHA512 7b49795ea266d90e45c48b092bffa485a7207c66550d797297cb7e0756f7c497d045b3cb9b90f50b80a3ada4916a3ba273b2c19b9d02c834fb47d906efe3a8ba
diff --git a/sys-devel/crossdev/crossdev-20201122.ebuild b/sys-devel/crossdev/crossdev-20201122.ebuild
deleted file mode 100644
index 7a6c51ec73f2..000000000000
--- a/sys-devel/crossdev/crossdev-20201122.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ ${PV} == "99999999" ]] ; then
- inherit git-r3
- EGIT_REPO_URI="git://anongit.gentoo.org/proj/crossdev.git"
-else
- SRC_URI="mirror://gentoo/${P}.tar.xz
- https://dev.gentoo.org/~slyfox/distfiles/${P}.tar.xz"
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
-fi
-
-DESCRIPTION="Gentoo Cross-toolchain generator"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Crossdev"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- >=sys-apps/portage-2.1
- >=app-portage/portage-utils-0.55
- app-shells/bash
- sys-apps/gentoo-functions
-"
-DEPEND="app-arch/xz-utils"
-
-src_install() {
- default
-
- if [[ "${PV}" == "99999999" ]] ; then
- sed -i "s:@CDEVPV@:${EGIT_VERSION}:" "${ED}"/usr/bin/crossdev || die
- fi
-}
diff --git a/sys-devel/crossdev/crossdev-20201129.ebuild b/sys-devel/crossdev/crossdev-20201129.ebuild
index 809478863946..7a6c51ec73f2 100644
--- a/sys-devel/crossdev/crossdev-20201129.ebuild
+++ b/sys-devel/crossdev/crossdev-20201129.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == "99999999" ]] ; then
else
SRC_URI="mirror://gentoo/${P}.tar.xz
https://dev.gentoo.org/~slyfox/distfiles/${P}.tar.xz"
- 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="Gentoo Cross-toolchain generator"
diff --git a/virtual/Manifest.gz b/virtual/Manifest.gz
index d8f1380ba4f9..7777386c1f1d 100644
Binary files a/virtual/Manifest.gz and b/virtual/Manifest.gz differ
diff --git a/virtual/libgudev/libgudev-215-r3.ebuild b/virtual/libgudev/libgudev-215-r3.ebuild
deleted file mode 100644
index 3532776abeb4..000000000000
--- a/virtual/libgudev/libgudev-215-r3.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit multilib-build
-
-DESCRIPTION="Virtual for libgudev providers"
-SLOT="0/0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
-IUSE="introspection static-libs systemd"
-REQUIRED_USE="systemd? ( !static-libs )"
-
-RDEPEND="
- || ( dev-libs/libgudev:0/0[${MULTILIB_USEDEP},introspection?,static-libs?]
- !systemd? ( || (
- >=sys-fs/udev-208-r1:0/0[${MULTILIB_USEDEP},gudev(-),introspection(-)?,static-libs?]
- >=sys-fs/eudev-1.5.3-r1:0/0[${MULTILIB_USEDEP},gudev(-),introspection(-)?,static-libs?] )
- )
- systemd? (
- >=sys-apps/systemd-212-r5:0/2[${MULTILIB_USEDEP},gudev(-),introspection(-)?]
- )
- )"
diff --git a/virtual/libgudev/libgudev-230.ebuild b/virtual/libgudev/libgudev-230.ebuild
deleted file mode 100644
index 8e11c3be2dac..000000000000
--- a/virtual/libgudev/libgudev-230.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit multilib-build
-
-DESCRIPTION="Virtual for libgudev providers"
-SLOT="0/0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
-IUSE="introspection static-libs"
-
-RDEPEND="dev-libs/libgudev:0/0[${MULTILIB_USEDEP},introspection?,static-libs?]"
diff --git a/virtual/libgudev/libgudev-232.ebuild b/virtual/libgudev/libgudev-232.ebuild
deleted file mode 100644
index 16d7200f1ac3..000000000000
--- a/virtual/libgudev/libgudev-232.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit multilib-build
-
-DESCRIPTION="Virtual for libgudev providers"
-SLOT="0/0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
-IUSE="introspection static-libs"
-
-RDEPEND=">=dev-libs/libgudev-232:0/0[${MULTILIB_USEDEP},introspection?,static-libs?]"
diff --git a/virtual/libgudev/metadata.xml b/virtual/libgudev/metadata.xml
deleted file mode 100644
index b1c8a60ed0c9..000000000000
--- a/virtual/libgudev/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
- udev-bugs@gentoo.org
-
-
- eudev@gentoo.org
-
-
- systemd@gentoo.org
-
-
diff --git a/www-servers/Manifest.gz b/www-servers/Manifest.gz
index 41cd3f76344f..66f9946b898c 100644
Binary files a/www-servers/Manifest.gz and b/www-servers/Manifest.gz differ
diff --git a/www-servers/tomcat/tomcat-7.0.106.ebuild b/www-servers/tomcat/tomcat-7.0.106.ebuild
index a905c145be4a..84121125211a 100644
--- a/www-servers/tomcat/tomcat-7.0.106.ebuild
+++ b/www-servers/tomcat/tomcat-7.0.106.ebuild
@@ -5,7 +5,7 @@ EAPI=7
JAVA_PKG_IUSE="doc source test"
-inherit eutils java-pkg-2 java-ant-2 prefix user
+inherit eutils java-pkg-2 java-ant-2 prefix
MY_P="apache-${P}-src"
@@ -26,6 +26,8 @@ SAPI_SLOT="3.0"
COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
~dev-java/tomcat-servlet-api-${PV}:${SAPI_SLOT}"
RDEPEND="${COMMON_DEP}
+ acct-group/tomcat
+ acct-user/tomcat
virtual/jre"
DEPEND="${COMMON_DEP}
virtual/jdk:1.8
@@ -33,12 +35,6 @@ DEPEND="${COMMON_DEP}
S=${WORKDIR}/${MY_P}
-pkg_setup() {
- java-pkg-2_pkg_setup
- enewgroup tomcat 265
- enewuser tomcat 265 -1 /dev/null tomcat
-}
-
src_prepare() {
default
diff --git a/www-servers/tomcat/tomcat-7.0.107.ebuild b/www-servers/tomcat/tomcat-7.0.107.ebuild
index a905c145be4a..84121125211a 100644
--- a/www-servers/tomcat/tomcat-7.0.107.ebuild
+++ b/www-servers/tomcat/tomcat-7.0.107.ebuild
@@ -5,7 +5,7 @@ EAPI=7
JAVA_PKG_IUSE="doc source test"
-inherit eutils java-pkg-2 java-ant-2 prefix user
+inherit eutils java-pkg-2 java-ant-2 prefix
MY_P="apache-${P}-src"
@@ -26,6 +26,8 @@ SAPI_SLOT="3.0"
COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
~dev-java/tomcat-servlet-api-${PV}:${SAPI_SLOT}"
RDEPEND="${COMMON_DEP}
+ acct-group/tomcat
+ acct-user/tomcat
virtual/jre"
DEPEND="${COMMON_DEP}
virtual/jdk:1.8
@@ -33,12 +35,6 @@ DEPEND="${COMMON_DEP}
S=${WORKDIR}/${MY_P}
-pkg_setup() {
- java-pkg-2_pkg_setup
- enewgroup tomcat 265
- enewuser tomcat 265 -1 /dev/null tomcat
-}
-
src_prepare() {
default
diff --git a/www-servers/tomcat/tomcat-8.5.60.ebuild b/www-servers/tomcat/tomcat-8.5.60.ebuild
index ae1fd17bba26..3a82c34d5f2c 100644
--- a/www-servers/tomcat/tomcat-8.5.60.ebuild
+++ b/www-servers/tomcat/tomcat-8.5.60.ebuild
@@ -5,7 +5,7 @@ EAPI=7
JAVA_PKG_IUSE="doc source test"
-inherit eutils java-pkg-2 java-ant-2 prefix user
+inherit eutils java-pkg-2 java-ant-2 prefix
MY_P="apache-${P}-src"
@@ -26,6 +26,8 @@ SAPI_SLOT="3.1"
COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
~dev-java/tomcat-servlet-api-${PV}:${SAPI_SLOT}"
RDEPEND="${COMMON_DEP}
+ acct-group/tomcat
+ acct-user/tomcat
virtual/jre"
DEPEND="${COMMON_DEP}
app-admin/pwgen
@@ -42,12 +44,6 @@ DEPEND="${COMMON_DEP}
S=${WORKDIR}/${MY_P}
-pkg_setup() {
- java-pkg-2_pkg_setup
- enewgroup tomcat 265
- enewuser tomcat 265 -1 /dev/null tomcat
-}
-
src_prepare() {
default
diff --git a/www-servers/tomcat/tomcat-8.5.61.ebuild b/www-servers/tomcat/tomcat-8.5.61.ebuild
index 86d3e5d65919..43b89effd490 100644
--- a/www-servers/tomcat/tomcat-8.5.61.ebuild
+++ b/www-servers/tomcat/tomcat-8.5.61.ebuild
@@ -5,7 +5,7 @@ EAPI=7
JAVA_PKG_IUSE="doc source test"
-inherit eutils java-pkg-2 java-ant-2 prefix user
+inherit eutils java-pkg-2 java-ant-2 prefix
MY_P="apache-${P}-src"
@@ -26,6 +26,8 @@ SAPI_SLOT="3.1"
COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
~dev-java/tomcat-servlet-api-${PV}:${SAPI_SLOT}"
RDEPEND="${COMMON_DEP}
+ acct-group/tomcat
+ acct-user/tomcat
virtual/jre"
DEPEND="${COMMON_DEP}
app-admin/pwgen
@@ -42,12 +44,6 @@ DEPEND="${COMMON_DEP}
S=${WORKDIR}/${MY_P}
-pkg_setup() {
- java-pkg-2_pkg_setup
- enewgroup tomcat 265
- enewuser tomcat 265 -1 /dev/null tomcat
-}
-
src_prepare() {
default
diff --git a/www-servers/tomcat/tomcat-9.0.40.ebuild b/www-servers/tomcat/tomcat-9.0.40.ebuild
index 41d3c02f7744..f85b6b5aea23 100644
--- a/www-servers/tomcat/tomcat-9.0.40.ebuild
+++ b/www-servers/tomcat/tomcat-9.0.40.ebuild
@@ -5,7 +5,7 @@ EAPI=7
JAVA_PKG_IUSE="doc source test"
-inherit eutils java-pkg-2 java-ant-2 prefix user
+inherit eutils java-pkg-2 java-ant-2 prefix
MY_P="apache-${PN}-${PV}-src"
@@ -36,6 +36,8 @@ COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
~dev-java/tomcat-servlet-api-${PV}:${SAPI_SLOT}
dev-java/wsdl4j:0"
RDEPEND="${COMMON_DEP}
+ acct-group/tomcat
+ acct-user/tomcat
virtual/jre"
DEPEND="${COMMON_DEP}
app-admin/pwgen
@@ -65,12 +67,6 @@ src_unpack() {
ln -s "${DISTDIR}/${BND}" "${BNDLIB_HOME}/" || die "Failed to symlink bndlib-*.jar"
}
-pkg_setup() {
- java-pkg-2_pkg_setup
- enewgroup tomcat 265
- enewuser tomcat 265 -1 /dev/null tomcat
-}
-
src_prepare() {
default
diff --git a/www-servers/tomcat/tomcat-9.0.41.ebuild b/www-servers/tomcat/tomcat-9.0.41.ebuild
index 7f7ed06bb02d..94eda2d7236b 100644
--- a/www-servers/tomcat/tomcat-9.0.41.ebuild
+++ b/www-servers/tomcat/tomcat-9.0.41.ebuild
@@ -5,7 +5,7 @@ EAPI=7
JAVA_PKG_IUSE="doc source test"
-inherit eutils java-pkg-2 java-ant-2 prefix user
+inherit eutils java-pkg-2 java-ant-2 prefix
MY_P="apache-${PN}-${PV}-src"
@@ -36,6 +36,8 @@ COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
~dev-java/tomcat-servlet-api-${PV}:${SAPI_SLOT}
dev-java/wsdl4j:0"
RDEPEND="${COMMON_DEP}
+ acct-group/tomcat
+ acct-user/tomcat
virtual/jre"
DEPEND="${COMMON_DEP}
app-admin/pwgen
@@ -65,12 +67,6 @@ src_unpack() {
ln -s "${DISTDIR}/${BND}" "${BNDLIB_HOME}/" || die "Failed to symlink bndlib-*.jar"
}
-pkg_setup() {
- java-pkg-2_pkg_setup
- enewgroup tomcat 265
- enewuser tomcat 265 -1 /dev/null tomcat
-}
-
src_prepare() {
default
diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz
index 9e9534c736b8..57eaa87e0ee1 100644
Binary files a/x11-wm/Manifest.gz and b/x11-wm/Manifest.gz differ
diff --git a/x11-wm/awesome/awesome-9999.ebuild b/x11-wm/awesome/awesome-9999.ebuild
index 13a5021a6cc9..9c4176a67a08 100644
--- a/x11-wm/awesome/awesome-9999.ebuild
+++ b/x11-wm/awesome/awesome-9999.ebuild
@@ -90,7 +90,7 @@ src_configure() {
cmake_src_configure
}
-src_rest() {
+src_test() {
# awesome's test suite starts Xvfb by itself, no need for virtualx eclass
HEADLESS=1 cmake_build check -j1
}