diff --git a/Manifest.files.gz b/Manifest.files.gz
index af8ed1ecc5df..4365ebeb0883 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 40a663990b04..0556b835b3e6 100644
Binary files a/acct-group/Manifest.gz and b/acct-group/Manifest.gz differ
diff --git a/acct-group/opendmarc/Manifest b/acct-group/opendmarc/Manifest
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/app-office/ical/metadata.xml b/acct-group/opendmarc/metadata.xml
similarity index 56%
rename from app-office/ical/metadata.xml
rename to acct-group/opendmarc/metadata.xml
index 87b5c68a8975..a53ffbea77d3 100644
--- a/app-office/ical/metadata.xml
+++ b/acct-group/opendmarc/metadata.xml
@@ -1,8 +1,8 @@
-
-
- ical-tcl
-
+
+ grobian@gentoo.org
+ Fabian Groffen
+
diff --git a/acct-group/opendmarc/opendmarc-0.ebuild b/acct-group/opendmarc/opendmarc-0.ebuild
new file mode 100644
index 000000000000..ffdd3c7ce5ad
--- /dev/null
+++ b/acct-group/opendmarc/opendmarc-0.ebuild
@@ -0,0 +1,9 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for mail-filter/opendmarc "
+ACCT_GROUP_ID=244
diff --git a/acct-user/Manifest.gz b/acct-user/Manifest.gz
index efe99a59d634..51edb69b780c 100644
Binary files a/acct-user/Manifest.gz and b/acct-user/Manifest.gz differ
diff --git a/acct-user/opendmarc/Manifest b/acct-user/opendmarc/Manifest
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/acct-user/opendmarc/metadata.xml b/acct-user/opendmarc/metadata.xml
new file mode 100644
index 000000000000..a53ffbea77d3
--- /dev/null
+++ b/acct-user/opendmarc/metadata.xml
@@ -0,0 +1,8 @@
+
+
+
+
+ grobian@gentoo.org
+ Fabian Groffen
+
+
diff --git a/acct-user/opendmarc/opendmarc-0.ebuild b/acct-user/opendmarc/opendmarc-0.ebuild
new file mode 100644
index 000000000000..bd9a6b89f925
--- /dev/null
+++ b/acct-user/opendmarc/opendmarc-0.ebuild
@@ -0,0 +1,16 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for mail-filter/opendmarc"
+
+ACCT_USER_ID=244
+ACCT_USER_GROUPS=( opendmarc )
+
+ACCT_USER_HOME="/var/lib/opendmarc"
+ACCT_USER_HOME_PERMS=0700
+
+acct-user_add_deps
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 0eb725551848..c30ad78f9a1a 100644
Binary files a/app-admin/Manifest.gz and b/app-admin/Manifest.gz differ
diff --git a/app-admin/apache-tools/Manifest b/app-admin/apache-tools/Manifest
index 5e31f89021bb..f37272884e60 100644
--- a/app-admin/apache-tools/Manifest
+++ b/app-admin/apache-tools/Manifest
@@ -1,3 +1,2 @@
-DIST httpd-2.4.41.tar.bz2 7072373 BLAKE2B 88a2390736209d5ef04bffcb867bc8d6019302885e6f3cc63d18123336d4d0657252105a3bfebf4e91b8daa02119d4a61f4c0a9702244858a3193ec6cf681c0f SHA512 350cc7dcd2c439e0590338fa6da3f44df44f9bb885c381e91f91b14c2f48597f6f0bbac0ea118a8a67eaa70ae7edbb769beace368643ed73f6daee44c307b335
-DIST httpd-2.4.43.tar.bz2 7155865 BLAKE2B cd85c7e25500f8f1b4bd6ac5f715718a61bf548dfaf36408a970d27bacbfce256e4dda255ba5b62f89e117c335d0568d6207c93e5fb0d2b1ee84dba4ce0d4bd7 SHA512 16cfeecc8f6fab6eca478065a384bdf1872f7ac42206b0bc2bcac6c0d9c576f392c07107201f39e0601dec1bbafcb33d66153544de4d87d79b9a52094d334b64
DIST httpd-2.4.46.tar.bz2 7187805 BLAKE2B 2cd8a40be0b7b60ae5b06a286aa6dd801b8615fd0483a4653ceea6f9832c9ebb111f67ba4f69827b01acd1e5552e70ac0441df49573c9da0ca26d4c2f589f0bc SHA512 5936784bb662e9d8a4f7fe38b70c043b468114d931cd10ea831bfe74461ea5856b64f88f42c567ab791fc8907640a99884ba4b6a600f86d661781812735b6f13
+DIST httpd-2.4.47.tar.bz2 7187445 BLAKE2B ba5b6ebac73aaa6f2f0d7a34d5bf9d13bd4ac862ee9d04b105c315c3aad16401b842b6901424dba6a44a0b5d255c0356e0bf72b5d1898b4b091b12192c204c96 SHA512 ac05e878604037572b484c32c767e022bf027e5efa2a2ed28472939d9f536448f1536ede4d809f1e913a29a0247bdd27981bd00d3d8614f978573c14bce7c7af
diff --git a/app-admin/apache-tools/apache-tools-2.4.43.ebuild b/app-admin/apache-tools/apache-tools-2.4.43.ebuild
deleted file mode 100644
index 42dcd53ef1e3..000000000000
--- a/app-admin/apache-tools/apache-tools-2.4.43.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit flag-o-matic multilib toolchain-funcs
-
-DESCRIPTION="Useful Apache tools - htdigest, htpasswd, ab, htdbm"
-HOMEPAGE="https://httpd.apache.org/"
-SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris ~x64-solaris"
-IUSE="libressl ssl"
-RESTRICT="test"
-
-RDEPEND=">=dev-libs/apr-1.5.0:1=
- dev-libs/apr-util:1=
- dev-libs/expat
- dev-libs/libpcre
- kernel_linux? ( sys-apps/util-linux )
- ssl? (
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:0= )
- )"
-
-DEPEND="${RDEPEND}
- sys-devel/libtool"
-
-S="${WORKDIR}/httpd-${PV}"
-
-PATCHES=(
- "${FILESDIR}/${PN}-2.4.7-Makefile.patch" #459446
-)
-
-src_prepare() {
- default
-
- # This package really should upgrade to using pcre's .pc file.
- cat <<-\EOF >"${T}"/pcre-config
- #!/bin/bash
- flags=()
- for flag; do
- if [[ ${flag} == "--version" ]]; then
- flags+=( --modversion )
- else
- flags+=( "${flag}" )
- fi
- done
- exec ${PKG_CONFIG} libpcre "${flags[@]}"
- EOF
- chmod a+x "${T}"/pcre-config || die
-}
-
-src_configure() {
- # Brain dead check.
- tc-is-cross-compiler && export ap_cv_void_ptr_lt_long="no"
-
- tc-export PKG_CONFIG
-
- local myeconfargs=(
- --libexecdir="${EPREFIX}"/usr/$(get_libdir)/apache2/modules
- --sbindir="${EPREFIX}"/usr/sbin
- --with-perl="${EPREFIX}"/usr/bin/perl
- --with-expat="${EPREFIX}"/usr
- --with-z="${EPREFIX}"/usr
- --with-apr="${SYSROOT}${EPREFIX}"/usr
- --with-apr-util="${SYSROOT}${EPREFIX}"/usr
- --with-pcre="${T}"/pcre-config
- $(use_enable ssl)
- $(usex ssl '--with-ssl="${EPREFIX}"/usr' '')
- )
- # econf overwrites the stuff from config.layout.
- ac_cv_path_PKGCONFIG=${PKG_CONFIG} \
- econf "${myeconfargs[@]}"
- sed -i \
- -e '/^LTFLAGS/s:--silent::' \
- build/rules.mk build/config_vars.mk || die
-}
-
-src_compile() {
- emake -C support
-}
-
-src_install() {
- emake -C support DESTDIR="${D}" install
- dodoc CHANGES
- doman docs/man/{dbmmanage,htdigest,htpasswd,htdbm,ab,logresolve}.1 \
- docs/man/{htcacheclean,rotatelogs}.8
-
- # Providing compatiblity symlinks for #177697 (which we'll stop to install
- # at some point).
- pushd "${ED}"/usr/sbin >/dev/null || die
- local i
- for i in *; do
- dosym ${i} /usr/sbin/${i}2
- done
- popd >/dev/null || die
-
- # Provide a symlink for ab-ssl
- if use ssl ; then
- dosym ab /usr/bin/ab-ssl
- dosym ab /usr/bin/ab2-ssl
- fi
-}
diff --git a/app-admin/apache-tools/apache-tools-2.4.46.ebuild b/app-admin/apache-tools/apache-tools-2.4.46.ebuild
index 42dcd53ef1e3..6e6a05fad334 100644
--- a/app-admin/apache-tools/apache-tools-2.4.46.ebuild
+++ b/app-admin/apache-tools/apache-tools-2.4.46.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris ~x64-solaris"
-IUSE="libressl ssl"
+IUSE="ssl"
RESTRICT="test"
RDEPEND=">=dev-libs/apr-1.5.0:1=
@@ -19,10 +19,7 @@ RDEPEND=">=dev-libs/apr-1.5.0:1=
dev-libs/expat
dev-libs/libpcre
kernel_linux? ( sys-apps/util-linux )
- ssl? (
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:0= )
- )"
+ ssl? ( dev-libs/openssl:0= )"
DEPEND="${RDEPEND}
sys-devel/libtool"
diff --git a/app-admin/apache-tools/apache-tools-2.4.41.ebuild b/app-admin/apache-tools/apache-tools-2.4.47.ebuild
similarity index 88%
rename from app-admin/apache-tools/apache-tools-2.4.41.ebuild
rename to app-admin/apache-tools/apache-tools-2.4.47.ebuild
index 42dcd53ef1e3..7383d8780bb2 100644
--- a/app-admin/apache-tools/apache-tools-2.4.41.ebuild
+++ b/app-admin/apache-tools/apache-tools-2.4.47.ebuild
@@ -10,8 +10,8 @@ SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris ~x64-solaris"
-IUSE="libressl ssl"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris ~x64-solaris"
+IUSE="ssl"
RESTRICT="test"
RDEPEND=">=dev-libs/apr-1.5.0:1=
@@ -19,10 +19,7 @@ RDEPEND=">=dev-libs/apr-1.5.0:1=
dev-libs/expat
dev-libs/libpcre
kernel_linux? ( sys-apps/util-linux )
- ssl? (
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:0= )
- )"
+ ssl? ( dev-libs/openssl:0= )"
DEPEND="${RDEPEND}
sys-devel/libtool"
@@ -71,7 +68,7 @@ src_configure() {
$(usex ssl '--with-ssl="${EPREFIX}"/usr' '')
)
# econf overwrites the stuff from config.layout.
- ac_cv_path_PKGCONFIG=${PKG_CONFIG} \
+ ac_cv_path_PKGCONFIG="${PKG_CONFIG}" \
econf "${myeconfargs[@]}"
sed -i \
-e '/^LTFLAGS/s:--silent::' \
diff --git a/app-admin/clustershell/clustershell-1.8.3.ebuild b/app-admin/clustershell/clustershell-1.8.3.ebuild
index a369abd0fa26..113e9a21ba5e 100644
--- a/app-admin/clustershell/clustershell-1.8.3.ebuild
+++ b/app-admin/clustershell/clustershell-1.8.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# TODO: test phase
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/cea-hpc/clustershell/archive/v${PV}.tar.gz -> ${P}.t
LICENSE="LGPL-2.1+"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE="doc libressl test"
+IUSE="doc test"
CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
DEPEND="
@@ -27,9 +27,7 @@ DEPEND="
RDEPEND="
${CDEPEND}
dev-python/pyyaml[${PYTHON_USEDEP}]
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:0= )"
-
+ dev-libs/openssl:0="
RESTRICT="test" # currently fail
python_install() {
diff --git a/app-admin/conserver/conserver-8.2.3-r1.ebuild b/app-admin/conserver/conserver-8.2.3-r1.ebuild
index 7a587ea09385..bbd550947e0b 100644
--- a/app-admin/conserver/conserver-8.2.3-r1.ebuild
+++ b/app-admin/conserver/conserver-8.2.3-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
LICENSE="BSD BSD-with-attribution"
SLOT="0"
KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 ~sparc x86"
-IUSE="debug ipv6 freeipmi kerberos libressl pam ssl test tcpd"
+IUSE="debug ipv6 freeipmi kerberos pam ssl test tcpd"
RESTRICT="!test? ( test )"
DEPEND="debug? ( dev-libs/dmalloc:= )
@@ -21,10 +21,7 @@ DEPEND="debug? ( dev-libs/dmalloc:= )
virtual/krb5
net-libs/libgssglue
)
- ssl? (
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:0= )
- )
+ ssl? ( dev-libs/openssl:0= )
pam? ( sys-libs/pam )
tcpd? ( sys-apps/tcp-wrappers )
"
diff --git a/app-admin/conserver/conserver-8.2.6-r1.ebuild b/app-admin/conserver/conserver-8.2.6-r1.ebuild
index 7d0d422f9ba6..138b08fbcf7a 100644
--- a/app-admin/conserver/conserver-8.2.6-r1.ebuild
+++ b/app-admin/conserver/conserver-8.2.6-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
LICENSE="BSD BSD-with-attribution"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="debug ipv6 freeipmi kerberos libressl pam ssl test tcpd"
+IUSE="debug ipv6 freeipmi kerberos pam ssl test tcpd"
RESTRICT="!test? ( test )"
DEPEND="debug? ( dev-libs/dmalloc:= )
@@ -21,10 +21,7 @@ DEPEND="debug? ( dev-libs/dmalloc:= )
virtual/krb5
net-libs/libgssglue
)
- ssl? (
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:0= )
- )
+ ssl? ( dev-libs/openssl:0= )
pam? ( sys-libs/pam )
tcpd? ( sys-apps/tcp-wrappers )
"
diff --git a/app-admin/gkrellm/gkrellm-2.3.11-r1.ebuild b/app-admin/gkrellm/gkrellm-2.3.11-r1.ebuild
index 330be6e934f7..99c4bb7aaf3b 100644
--- a/app-admin/gkrellm/gkrellm-2.3.11-r1.ebuild
+++ b/app-admin/gkrellm/gkrellm-2.3.11-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -18,7 +18,7 @@ else
fi
LICENSE="GPL-3"
SLOT="2"
-IUSE="gnutls hddtemp libressl lm-sensors nls ntlm ssl kernel_FreeBSD X"
+IUSE="gnutls hddtemp lm-sensors nls ntlm ssl kernel_FreeBSD X"
RDEPEND="
acct-group/gkrellmd
@@ -28,8 +28,7 @@ RDEPEND="
ssl? (
gnutls? ( net-libs/gnutls )
!gnutls? (
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:0= )
+ dev-libs/openssl:0=
)
)
lm-sensors? ( sys-apps/lm-sensors:= )
diff --git a/app-admin/gkrellm/gkrellm-9999.ebuild b/app-admin/gkrellm/gkrellm-9999.ebuild
index e757131b4748..01398103d527 100644
--- a/app-admin/gkrellm/gkrellm-9999.ebuild
+++ b/app-admin/gkrellm/gkrellm-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -18,7 +18,7 @@ else
fi
LICENSE="GPL-3"
SLOT="2"
-IUSE="gnutls hddtemp libressl lm-sensors nls ntlm ssl kernel_FreeBSD X"
+IUSE="gnutls hddtemp lm-sensors nls ntlm ssl kernel_FreeBSD X"
RDEPEND="
acct-group/gkrellmd
@@ -28,8 +28,7 @@ RDEPEND="
ssl? (
gnutls? ( net-libs/gnutls )
!gnutls? (
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:0= )
+ dev-libs/openssl:0=
)
)
lm-sensors? ( sys-apps/lm-sensors:= )
diff --git a/app-admin/sudo/metadata.xml b/app-admin/sudo/metadata.xml
index a99f4f7e613f..13a39991dab4 100644
--- a/app-admin/sudo/metadata.xml
+++ b/app-admin/sudo/metadata.xml
@@ -13,7 +13,6 @@