diff --git a/Manifest b/Manifest
index 40024b070a92..caf054d307a6 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512
-MANIFEST Manifest.files.gz 29266 BLAKE2B 140be264e2872b91dfa38b6da1a34c09d34c158e9c22a5ed03439077282b4e4ef9fa7c5af8191a37111ceaa83173d3c0a550d48a0c900337d442696b50ecb861 SHA512 345b1e41483597c10d8a59b8f1edbc755e8360f66167ab1db2f4cfc66ae1e8e94c7fda3167f00451806708a5f00e451b72dc4ddcd7907f3cd3783c333183dd02
-TIMESTAMP 2021-04-29T06:08:33Z
+MANIFEST Manifest.files.gz 29297 BLAKE2B f7be25a3c3595c342284a81dd051337ce3367c804324cf6439316d42c67ccfa07de629191c7d3049e523ec87efb724d5a747f999eb8526e69b1157477acc4186 SHA512 a05f96cba90c7e52b0c41d79c127f59aa198e3a63230a9acb47ac2553037fe9753ed952c9c10dce68840fdbdc152b8757b068f661f8be1a39c0c04bdc9d35231
+TIMESTAMP 2021-04-30T12:38:34Z
-----BEGIN PGP SIGNATURE-----
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmCKTWFfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmCL+kpfFIAAAAAALgAo
aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klAUNw//VF0X1QuEey9EnsnGDCxUSIxQ9SURZifvB2ReeGZyXcsvpWY/9YSlhJ08
-u7Om5AmOOdlLeWri0eGjYWEBoovaHJ4BVtx0UrOOxzpMPIo7c4YTTTq9nRUhJiqa
-K1rqY77TZQ2EHvUOog5Oq6eXZ6mwGqxNkTsp3WkUB5uIQYDpwur/A/nxzsb+A9qp
-vs4TlsykSYuDCum8IQ5ml6MYaJ0LiSLv8MaxN54irCZYUUa9dPHFnncNmBnF4jyx
-ZvxUDgyJxC+Vmzdwjaaw39vaP00CoBV67WpBj6WVXSpdtLGfjyDKvy1MaR4y22st
-qDAbQ2HiHR/6CFRd6JWPrI9uX1sF+eSqJfRbUqtkiBdjWsYOkIL9l7vj1mPvD93H
-yN8cv0iu/tsf9IGPjDvYJLSJ51FFVyLeltaXz3egfJajrFGeSKMbfqDueZ1swnfK
-VUfvwF3xLsOoB7+7CruqekW20uERpvvx9LyxfZpR1bBLm3D1TD2QJHNOVPfRqHVr
-XdBfhRIQ6jL5+k5nr5Db9T3x362/a/ZCbSP5K57udqitcyIoS6rgXWyAzETU9vD/
-YcEBQcQONcJ4AfbWcqIYImCDKPJYIIMXIcy9nMcpfEUHju2Dsst1NwC/KmbCKGwk
-le9ddyfRs66zkpHBxTzAcMDXtrZjGrhJGSy/x7r8PMzarzF/5Ms=
-=W3/K
+klAxiQ//Tt0VEQk3MSdZ4yPQZ92ZyKQATTGoIgkjta7kgTLeNZRgomfrlHofIUAd
+FA6blBEduNnZxsfy2ji0px1W/0Ywwhru7uepsfnVVP7qM/prDpexs1jDCx5DDfUX
+8rvn4tsAuu3FIpm7zLlK10o+b8XCSiFloWrkN+8gmiQ1UMgqzPunS4n310NYwUy1
+nT3T7La9B9qcvf9DGQOcpIyZ4n/oI/lq3zjNT1SL++eD+wyIB64sZ+u4bN34RZ9P
+neykk0JoLBDg7hwaGUAT0VMlVNpXfD06XNj7sVqMesvV/iWOGQrWYpd7XFQWi1aO
+wBW/cMUZB9Do9Ey6G59+6O4wlYQTRDRJsoUkJUtvkz4eT00JGZcM0fQETo+XvP+h
+ltSr3xDCd13Gkv7wB7Vlc1RKZgyDSRMbWEdyiYIac6d+MdX9iFP/AonL4TY0ZKlf
+a8coqNHFNN9IeOhJ1mAomGxGfhIw/2om+xhPGKX4Trd4xvzA82dmBXEFU4sNDmOb
+UwTOsIoY3ToxFi68duG5G95rmPotjPgLqXDMqVnUMAKWp+4sasXl04HvRyDtkgZW
+dz6rRAJtzSludRC+oUf/KNWXMiBb57uAoL6YWSs+4NFCEAiarkjQajkGGtr0W8D/
+gmwokMZWn+w7lvVymHnA6mtZ38zYYh2WkCuF3FpmUfeidIBt4OM=
+=r491
-----END PGP SIGNATURE-----
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..6881ce18aa44
--- /dev/null
+++ b/acct-group/opendmarc/Manifest
@@ -0,0 +1,2 @@
+EBUILD opendmarc-0.ebuild 198 BLAKE2B 792ce62e020478d3fc626882785db26ed7db50dff2dd4f9518db91f93d310357cf28bdda843277ef9279cb5be0825098ca92672ff85b6d1b95cbbc9c1e252307 SHA512 4011afa5da5520cdae07a280411d1473d0d2e683e4d1cba0b70bd60df2d0f2fc2403d7b779e8cbe024c6180b6b2e6a429cde4d22bc0296c603805def474ec06c
+MISC metadata.xml 248 BLAKE2B 60e4295b22f6f36039547e98305ae072755044f6516df2e29e65768732900ffc93dac9cbcf1da9e6c731403a62cf272f2f378d0641bd466974f8a234235c862a SHA512 f6fee7363592cb9dcd666011806321b791fb84bf0719fb2454d1f3ceb738650184286c17a13684c077bacd1a93581a71accfe9cef74adcaf40dfda7d8a167d13
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..0c30ed60a7a5
--- /dev/null
+++ b/acct-user/opendmarc/Manifest
@@ -0,0 +1,2 @@
+EBUILD opendmarc-0.ebuild 309 BLAKE2B 23344727f00fc145d2cffc3f643506c5046df64734043e47a3dde52ab454d9fd4a4a936d3f945e71f747966d313887bb9268af395b5067ebe83c2634bd8d0bae SHA512 39a1928977cde0d6114088469e1dec904d36cb8ef03677ab0b70a95ab7f45ab19d1c39ce6a6ab6301dc8910e2b22371c74874f317b5ba4cc5999c1809a04948a
+MISC metadata.xml 248 BLAKE2B 60e4295b22f6f36039547e98305ae072755044f6516df2e29e65768732900ffc93dac9cbcf1da9e6c731403a62cf272f2f378d0641bd466974f8a234235c862a SHA512 f6fee7363592cb9dcd666011806321b791fb84bf0719fb2454d1f3ceb738650184286c17a13684c077bacd1a93581a71accfe9cef74adcaf40dfda7d8a167d13
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 266a9ab6d877..7165fca6d557 100644
--- a/app-admin/apache-tools/Manifest
+++ b/app-admin/apache-tools/Manifest
@@ -1,8 +1,6 @@
AUX apache-tools-2.4.7-Makefile.patch 1695 BLAKE2B 8fac145613ac9f587e49bc6932c5712b7d7cad0d91422e11701edd24152e1d33907cbf31e3bef709555253759cea72199d4537df5d20d3ce9ca5dc898ba26779 SHA512 f597ce5503e590ed5b2621c04dcf0a571a73b70f144df7fe4e5fb7329a4f1558a5eb16913fe3d7c58ac1030f46cd2b1882e08d0f62106fbf8d40a8677c6b9448
-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
-EBUILD apache-tools-2.4.41.ebuild 2524 BLAKE2B 3b2d9368d0cb3088062990484ee7867c6ff3eb2fe82d05b61d34135d8e0b1d1582b8d145e676735f8946539c77158a4d9b6a490d4218e5a751f07fdc05374185 SHA512 2fd21ee79b0822f4ab410e571b27a0ee4b42f66929958cbeeffd10865917592682d9cf1b6b32600a870275b96b4b733a208cfd5a8e8f64980799c53bc0b5d0c9
-EBUILD apache-tools-2.4.43.ebuild 2524 BLAKE2B 3b2d9368d0cb3088062990484ee7867c6ff3eb2fe82d05b61d34135d8e0b1d1582b8d145e676735f8946539c77158a4d9b6a490d4218e5a751f07fdc05374185 SHA512 2fd21ee79b0822f4ab410e571b27a0ee4b42f66929958cbeeffd10865917592682d9cf1b6b32600a870275b96b4b733a208cfd5a8e8f64980799c53bc0b5d0c9
-EBUILD apache-tools-2.4.46.ebuild 2524 BLAKE2B 3b2d9368d0cb3088062990484ee7867c6ff3eb2fe82d05b61d34135d8e0b1d1582b8d145e676735f8946539c77158a4d9b6a490d4218e5a751f07fdc05374185 SHA512 2fd21ee79b0822f4ab410e571b27a0ee4b42f66929958cbeeffd10865917592682d9cf1b6b32600a870275b96b4b733a208cfd5a8e8f64980799c53bc0b5d0c9
+DIST httpd-2.4.47.tar.bz2 7187445 BLAKE2B ba5b6ebac73aaa6f2f0d7a34d5bf9d13bd4ac862ee9d04b105c315c3aad16401b842b6901424dba6a44a0b5d255c0356e0bf72b5d1898b4b091b12192c204c96 SHA512 ac05e878604037572b484c32c767e022bf027e5efa2a2ed28472939d9f536448f1536ede4d809f1e913a29a0247bdd27981bd00d3d8614f978573c14bce7c7af
+EBUILD apache-tools-2.4.46.ebuild 2460 BLAKE2B b472d42e496a6af6baca2790f6b1ed330353d169f721f41af04a27f9660f6d9f5fcff220cf63f8369675f202a29d7509c1872a0a9a340ce10a338a67769a46dc SHA512 667f5a2b8d53f03587b982275cc4b0e8ed8c5d814fb93fae6f589b2438a7bce7895259f54f70a89a9a7b7b3af3846c2c51292c5c4af3a7e53feb6457a5743b1f
+EBUILD apache-tools-2.4.47.ebuild 2469 BLAKE2B 7c4e2b191bfa166d7c89eec4febf97619b7f6cdc49c429d701c9b5401fea022a792a60ba77b27d959dbd5e3ef53d2e754eed0f10d067915b59b349a8b3736edf SHA512 ca8a17e6cfa9a420d79d967a172bc8f520aceee1f95c98bec69e4bc402df4c1c1a97f4187d09fda71b74043b5fe6e3408e1e25245a98ff92948963a0ba088a92
MISC metadata.xml 468 BLAKE2B 850e5a23a188280992a745276f7466b0287d4e1ca9dee8c61046612273bf7484c24e60d95ccc6637c65c88d851719bed812e2c1f3e951fdca1c7058c68aaa0db SHA512 d9b6eabeaba642f760ceca4b4b39b5db7bae5369c6766ce230c5cf0949e3152affa6ec5116ffa4ead983d987387c767600b8f36ebe1b8cf1323ed5c2cb14fab2
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/Manifest b/app-admin/clustershell/Manifest
index 28bfb77e9ff9..2d0cde27bedb 100644
--- a/app-admin/clustershell/Manifest
+++ b/app-admin/clustershell/Manifest
@@ -1,3 +1,3 @@
DIST clustershell-1.8.3.tar.gz 363975 BLAKE2B 3a7bb9103398e96f57f53d0d5d5edc6895ce02b6983e8fed34d65cad83a6d4e86f40b9576f41631e499a99adc8be5f4f422005b8ddc7ac8325fe11abd2c99477 SHA512 5108773e2958d1dae0aa6966d764e9af9d41024f65271005b202468f2bd1a3b63acc977729324fe1305d400dc8b06b0c4672e8d8ded207fa77cef69fb0005108
-EBUILD clustershell-1.8.3.ebuild 1047 BLAKE2B 130379ca1f38ec400ef160fd0ee32aad0b2417815edac16ebb74bac4470b0d440a41ee98af7cc06a81f9d693ae6eae0650c9e7e978ce5c660f5c2b5a3e0c0d62 SHA512 7cd420fbf3791649926fe019c40bcf5544bc393839465bc145ddef1a74cabb62d31ed7c0d9402039c5a5ac674c3ea8914e8fc76302c7cadeadff2df18db3d357
+EBUILD clustershell-1.8.3.ebuild 986 BLAKE2B 10499dd6164ee7a93582f50da614b5e1ba846256e9b557f3649d2d8c13fd0a99557ab70b0e632271e81431ace9f5befef5f4489344ff4485847d8917bbb5e9a1 SHA512 78d74d0c91c04456240c373a34f7e1ea9baa6dfe85d0770d8c4f3bcfdd7f63816ae7ef684a70e3fecb8c8b8c465fa4aa92114c1984aa2b348a7e039d8335ad45
MISC metadata.xml 346 BLAKE2B a7ba198c3d053ce6b8f07d828767b6cc92e87ebf1a0d27c18f4f660d3d683c5c0a53f8a6b3a73b7693c834c05a01735c6481aba7207594bbf9d7ba0b05764f71 SHA512 aa2a78948db02a02e036fdab4e66dc24d98ed1953996b6278da535354b5b505cc28d6c97c218ecbdf54e14ad6cf919d9158b54d7554fb30fda528162c261a1ae
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/Manifest b/app-admin/conserver/Manifest
index c5bdb18a2e83..4da18b1cc709 100644
--- a/app-admin/conserver/Manifest
+++ b/app-admin/conserver/Manifest
@@ -5,6 +5,6 @@ AUX conserver.initd-r1 428 BLAKE2B 574fa8611e928b17e70b1da522060c230b3f51ef0daf8
AUX conserver.pam-pambase 194 BLAKE2B ad284008c94f4c19b911a93279b12893a1c686806b22f7f19500e7216c19768ab161f9ba5cf2405d9d46f412a08c0cb04de0bc05ead15fb75da931575c2c3be2 SHA512 5368394be5b9d97e0ae751d84fbb4848aa27fd57b1a2eea8c7919e56246e390985deca80f0019c2104034103f73ac382a5ab2129113a0ff0b63b0b8bd83648c9
DIST conserver-8.2.3.tar.gz 329825 BLAKE2B 94ceb427a18b38855ee3146e432be50248a518221d9779c833b3bf1190dedf800ff498ffdd88eafc7cea343b2f87f476738977021c85f19c869bf0a012f1da11 SHA512 35b387629973620aa25211d9532f940e17d7891aa7216776c315cb9fde09106b7388e7cef29f5a2ead8660fc35e2be2b14f38a51cd2b3198251b7e7e70a2254d
DIST conserver-8.2.6.tar.gz 437315 BLAKE2B 9f62bb8ac91b57759c6b08d5a6ff31727a547c1991d322d75350a879a247925bbb1bbcab25b8a3d99a2ce6a997ba9f2e6c35338588e913055b29f3574e00e434 SHA512 3b7769675fd0edfd3727e5e84785f33c037b9e7a17c8c69c0ce48a447ea3b7de916e217c0f3b808b8350818b7bc702c917ea7a122ed96ae6b73f81ff0b5ae283
-EBUILD conserver-8.2.3-r1.ebuild 2355 BLAKE2B 69a01594a73817f9970ae9292709d98fe28c1a704f67edf43cb595be1b251c85da60e40bb7895cffe47275747c73e4ede9e615f5d88dd32ed0ec120df1922ccb SHA512 1ca942d8044bfa96a4cf559c35f3bea6ed823ecb6f75ab540726cd306730778af3d1ed6be4edd5b7c34c4205a9078a5514fbe94a4a6e23557fc854e935589854
-EBUILD conserver-8.2.6-r1.ebuild 2382 BLAKE2B 0ffad99ee3fc06041600e544ca79d6e475830c2c50768668e507a6e20ca9b9155b4988291607f69a8b5c1b490c1a08fec92561e9cb659de3bb6e6a4d621e075c SHA512 1be3d84c121974754fcb2717cb198fe8849ddfe8406c6a21b8fe625d38e499eaa5b2f186f93770c974a615e3a1de93d678cf8bb0b7a79581a1121bd1cbd13d0d
+EBUILD conserver-8.2.3-r1.ebuild 2291 BLAKE2B ea9ad5588af79e8832b8eaaecde4710ad17501409faf992289be3161ae2cc11c439ace86a7c193b653e21260d899d78b4e9ebd9ef83c02c4e5ba2bb03bfb59bf SHA512 030c58c3faf35e381d16ff3cddaa062e5033e19c2f8bd9eb9122fd6036b8e4dd75e7791ea8fc80fb8eeddc5454e74686e7bc9d208afed067f1d3fcdf7e67f66a
+EBUILD conserver-8.2.6-r1.ebuild 2318 BLAKE2B ffffc507b6f3639ae60ee24b488009c7724ad700086b5d379e16a9584d66b8d3b13be376238f87db9f1092550afca9704edaaba1cd11e455a88d97c28938a9c8 SHA512 ff33ca0ef70317bf95e45121c77d050ef656e0fea9b0d769562c623b4b3f942b771e2813ba3d3211c76fb2648e9ec90331d614ea5ec860e0389f2f201ae53f33
MISC metadata.xml 1408 BLAKE2B 01acca9d16d6bf1f182d0c582f7c69f1c89a697a3b2fe44a589368faa4aa5117c6e7382214464497bc305cc38bab8f860a86460ebfe57d6b4af74bc4f0781b12 SHA512 604c18ac8e93c5d37a465e61f541a29ea6a5143518a153e5a39da820af53d8859e2ef4fe212ddeaad5e2cebed83735e55f61afda12c5cc0bcbf828d1a8238b3d
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/Manifest b/app-admin/gkrellm/Manifest
index 69b7637d400e..b52e1bb1d176 100644
--- a/app-admin/gkrellm/Manifest
+++ b/app-admin/gkrellm/Manifest
@@ -5,6 +5,6 @@ AUX gkrellmd.conf 250 BLAKE2B 2b0cfcd1940cd695c67db32c13bbb7f372936b1f88938a2e43
AUX gkrellmd.initd 338 BLAKE2B 6ff2ab29e354578efc477af50af6a7e517bb7ec9267575d75fb5d5a12c9894a60996ffa37672760657eeee0680b9b7573d3d03d7d5efbe20122d330e5a55ebd8 SHA512 403431a0bfe8264ccdaf3c7e361e363a18a5e2deda8b2287919030c746c7caf80571b1a2dda407c113a9f878253078e67202017a026d83dec43bc5ca0389cc06
AUX gkrellmd.service 173 BLAKE2B c89a772fd0273b54766f5cea36aab9156d7a1d59f5759bdd673651afebdc21e1bf6108cadbc6328287e6fc62d0edac215eeb7e6dd9d8d6a916c7ff913222c511 SHA512 8703ea4e51d243050034b65b7bc50b3d1862a6369af72b0d9e47285558763066e27dbdfadd54a4316da0402aac0d92c17cf1c42eed2b7926226191ce5d85089d
DIST gkrellm-2.3.11.tar.bz2 783123 BLAKE2B b68c60477e4994e9508a8e5ea39fd09ab5cf0f019fc6b4567b9482b3b1fd315dd2548daed262095b42dda43ac068295d5c3c375c5cb80c91fda76ef8b9834df2 SHA512 e4147aa90e09925b9672728f287880bde26632d77d83d3f0b9458a201593a57158d9eb8cbb31e569e0d71d91a08c9bceba29814f59e542315775663ef9fd27a9
-EBUILD gkrellm-2.3.11-r1.ebuild 3334 BLAKE2B bbd6fe1265a6b72e1e9a9830d829e28875b8604f851f8879564aeb79bf9a807cf716ce06926b7613b043aa42644230927ef1926fe5a89c33313426d5b9791a06 SHA512 d0bdd181eed540ce917e3830cc148dc18723d32b1a825dff53ce61ef083e6d2b9a8aec61f53195588f0194f73969c665d6e56f5f4ee546d863f0eefed8bb39e8
-EBUILD gkrellm-9999.ebuild 3352 BLAKE2B dab875e96a3baacbb110e23b544c412787b5ad1f20cca62196ce6b6d5b89588275836e80fcebd1e3d141f8cd3993695687ed52aaae7af6e9c71c2310146eb13c SHA512 c939397ccb34fce1892a13abac3cc6c990c16dc9e8c3a370f7767d28b0d3c4231cb3813873a5afba938bb0a6c37bee1f0b2ff30c6e84a259cd841bd11d43649b
+EBUILD gkrellm-2.3.11-r1.ebuild 3272 BLAKE2B 76c6fd50b283d7975cf8803fece4d62bda16f75cc3991072e07014c5f447a5fcb4a26ac06ce7641610147d0f182eb8fa0c288619655f30563a76cca78ef73f31 SHA512 64e31dd6ab972459dbba8debca7ef7b9169e6d89bace50b229cdc36f5d4d20e67899fa43d767149609e655e206fb295088bd7573fbffecd3d5a559e817cf85a2
+EBUILD gkrellm-9999.ebuild 3290 BLAKE2B e4e552b0faa7076fbe4240f86c025f6f4aed93dc322086f38a5ef4edcadf9055ec3fd63dd72ed44b7ed615ae5a22dd3d33b845cf11fa523717663a779effff23 SHA512 ca94eadf30b3a70b89bac2c9496239eeeb45ab091a42c86b7a971f02360dd8bb0ea16c4427963813f8ac1d8d20175a511fb513bca890583fc933d3f4554dfac1
MISC metadata.xml 917 BLAKE2B 88567611e5ddaed8c1f81e639c7e82a120f9201f56b9e512bca08d948c78a967e57490e754f7e3b2c9a4a9a2c216b1288c8059593589378b5404b51db50a9644 SHA512 8b880d60459e4cba922f2fe586f0dfdcc4b0f8054e5f5cf8650ab10bacb30380b67f81795c671e28bf0c51bd6f3379c3b653bc78c0ec954bc7456dccdad274f0
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/Manifest b/app-admin/sudo/Manifest
index 4a4f82e79d55..a9f19510a281 100644
--- a/app-admin/sudo/Manifest
+++ b/app-admin/sudo/Manifest
@@ -1,7 +1,7 @@
AUX sudo-1.9.5_p2-NO_ROOT_MAILER_fix.patch 1929 BLAKE2B 404bd5c03b81a9bfbc3796c706fa93a64b4649c651c7859175137e1abb7f9da34f43d7f6e1ca8bca10c567114a30383571771c6390de9975a6bf55d98b0caa7a SHA512 34dd6880a90740eefd3a1bb543b3121047ea6ab8837a127c55cff92ffb7bf9225d0c6adfd88adf299458fdafaaea5351a52f14a9487c04df41aa218c6eeb6e7a
DIST sudo-1.9.5p2.tar.gz 4012277 BLAKE2B 41913887463e4f775564af8d614fb5ed762200aa777dc789ec333842d4f432323474fc952a531fe929b33607cdfbcd18d7fe7470a15d67139deaf855841ed11f SHA512 f0fe914963c31a6f8ab6c86847ff6cdd125bd5a839b27f46dcae03963f4fc413b3d4cca54c1979feb825c8479b44c7df0642c07345c941eecf6f9f1e03ea0e27
DIST sudo-1.9.6p1.tar.gz 4119888 BLAKE2B 02bdb551c46cff11ac56e64937c64e6a29ccd8e0af34ea2f6b33c223bee8f7ad958d0fc3d7ef8ef12bf5bc82565769b923ff112a3f3d6bf6999fa4f6ea55e38e SHA512 632dfe72f04ce9a7a5a7236fcd5c09ce4535e695ced49d24dd848e3a7b1bea7380df44188b9e475af4271069539b5a5816948a98fbb0649ebebaba8b4c4b7745
-EBUILD sudo-1.9.5_p2-r1.ebuild 7028 BLAKE2B 6e1932b3d0350f0e51c662d6d55c6fa1d6ffb86408d6008bffa779c6d9904a82f7402101709b2844e22d1780cf00a0560404e376d66d926dfe116c683e272c4a SHA512 df6b9107da3f05987ccf2226e372a10d6a08cb997c4b82467c1dd8791104d3bbae41faaf14a29eaeff0ade1c410b54c869447c9e51f72ab87df2a2589c652c46
-EBUILD sudo-1.9.6_p1-r1.ebuild 6723 BLAKE2B 6a9cf024a9cf81832ccc974955c3cdb9a64f8427d131832fc7583b28646501f718c523dd866efa2af3bb602f55e460f382677f12d1a9d059897f0c628b903fcd SHA512 8289ea36497c7ebabb2dab6e132621311b251af098f4f9ef68aa1005eef310708f360c45c5117a49b1952430f3d13c7813e41943e7dd731353a16e90d8d7ad28
-EBUILD sudo-9999.ebuild 6723 BLAKE2B 6a9cf024a9cf81832ccc974955c3cdb9a64f8427d131832fc7583b28646501f718c523dd866efa2af3bb602f55e460f382677f12d1a9d059897f0c628b903fcd SHA512 8289ea36497c7ebabb2dab6e132621311b251af098f4f9ef68aa1005eef310708f360c45c5117a49b1952430f3d13c7813e41943e7dd731353a16e90d8d7ad28
-MISC metadata.xml 1161 BLAKE2B 0c501bf06edca82993ece857f9f7565f99da15df36c916bc9dc57e78bccf2b247c382e97dd6c97cc7f5375e1a0513c1a30ecbf097516e96319fd1797257fb117 SHA512 d6bc9cf11ea1bd28c19bfe167580556af517d92c958d63cd7872ab5076840eca39a7ab3d1f56e84fc0fcfb675d7a89c23ccdd3629f665c45232be1140eb950ac
+EBUILD sudo-1.9.5_p2-r1.ebuild 6964 BLAKE2B aadec2121ad557984b5b4e506b627dc334bc204d63525dee5dc3ee5f5e31ade83c88f55a00eccf3118faae8883e0a4b9d7d34a6822395a7cf92150c18c84909c SHA512 0173c240c2865d2298fe01a408c54587414932be1640da655abc7704f8094109a509b278d8c5d24250277872eb14d7684e2a8bab56b4b02fc8add23451722ec2
+EBUILD sudo-1.9.6_p1-r1.ebuild 6659 BLAKE2B 85c293bc01a785f063bd70fb42dded28d0cc07eac8c83f9d3a37e3291de0cc997f9d67a64bb43777e579431fbe17c3626bdd4a7fcad85e94062d2162543488d3 SHA512 9d2b56674ab5ef1d6735c7b12e83a18591661dfeef455d844a61abd2730b5713ff95956e24994bffcb2a5de5e9dc724b9072a3559c9bbab2b5c03800340118ff
+EBUILD sudo-9999.ebuild 6659 BLAKE2B 85c293bc01a785f063bd70fb42dded28d0cc07eac8c83f9d3a37e3291de0cc997f9d67a64bb43777e579431fbe17c3626bdd4a7fcad85e94062d2162543488d3 SHA512 9d2b56674ab5ef1d6735c7b12e83a18591661dfeef455d844a61abd2730b5713ff95956e24994bffcb2a5de5e9dc724b9072a3559c9bbab2b5c03800340118ff
+MISC metadata.xml 1049 BLAKE2B 7b4bbe6469dc6e683d73b81d055ca3b7b3ae610e2889edcde54b735cafa91d1a186268d70c96f5e90a4fcf90f4750ecee9eb4823fcbde5b47dfb9ebf27845b2e SHA512 7a9a9c9e0f457ba15355d5f14dbe0fd187485df6f9fad0c32a4e39850947e4bf1329370a52e4eb7396e0ee55c81fc31ea8569895e0d4608983b4b703d0dcc761
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 @@