gentoo xmass resync : 25.12.2021

5 files changed, 3 insertions, 172 deletions

diff --git a/net-dns/ldns-utils/Manifest b/net-dns/ldns-utils/Manifest
index be71deaad364..d6c53e9df6d8 100644
--- a/net-dns/ldns-utils/Manifest
+++ b/net-dns/ldns-utils/Manifest
@@ -1,6 +1,2 @@
-DIST ldns-1.7.1.tar.gz 1244394 BLAKE2B 8f2d9c6e34c4f13924ce1531a5757c4a619fc31ebc5a0a3d4aaf43fcfc8b53e8f371984b1c60ab74f735a05a9ca0710fc29a40fffeaef66eb54395eb3a727a0d SHA512 e8f72a4ff4aa544acac5e7be9a8ba38c6b8d388bb26f9a0ed04c1a921622f8582cc8539beafc76a29187a55c94069b7c1875e77522e1a7e7bb3e297dd1e4c2b7
-DIST ldns-1.8.0.tar.gz 1283220 BLAKE2B f916a8c76d788ac7c52aea8bfe675ad4c614a0c6fb011b61f5a27d4a5dc1a2adb33b5c6992b4813b3758c9b7cceab1c77f8c1d66baaa4de993f23888bce69df1 SHA512 54b306160bb7fd76d181f4be0a13134017f6f98ae96e0c954409f31f262e9dbe611c4b76fb6dff47bb6155c652ed8d026b52a50dfcf611e54d9c204b314c4fd6
-EBUILD ldns-utils-1.7.1.ebuild 1444 BLAKE2B f2d897b11e13ef176b3400ac418329583c8d77ab9a15e3cf1135d49fb1c6233f147375d0eee79bf9baea0f5d548dc1b3fc1382c95560022ce8585d0d96014d70 SHA512 be92ebb6aeeea36326a5293d485014d08b2b56ff07072e99983aee4215719ac8db9f76cf27616d1e29245b43920351593a570267f8b728e096dc8a785060a2b1
-EBUILD ldns-utils-1.8.0-r1.ebuild 1734 BLAKE2B c832ed898eca34469a936fc8d9a3d74622e96ef2b2d5739219302b78b9bc7a74b19ff5e1cd910a6fb74df378c8a852f1fc883849ddc7216dd9754465ee359d94 SHA512 ff154d66c1d35d4915374306c40c57da7b9476f96f71c9eadfb3ef01416a40f1534d12e06c23be2c5f27819cd66fc3076cc688c5a03047c6fa4f67558c7890a9
-EBUILD ldns-utils-1.8.0-r2.ebuild 629 BLAKE2B da54536bfe1678ff9bd6433bb3908e701b87238bb6d8a10aec5fb602d61013561b384a71a2b7fb325ca19796342922ecad46509b5aadc1701243c2b2acbc9cca SHA512 9f8a250d5f0aa8b40b7a75ef8696b99c7fd297bc591a76d682e8a54b6cb180b27b9bf6e77bb81bc9ef43b2d7c451c8a9282151c02d42ef05e11b57af8a734c71
-MISC metadata.xml 849 BLAKE2B 3e5b25a17b5b317e38b857d2e4a65212c9300505832926c3a2fcbd5468fca0bbc3c5fd2260d678ed1c7b1b55b33150fd059f4ed80907c34083e92f00ba22b574 SHA512 9fcf62af1b836fd9f8dbe4406f0ffc8d6bb0bbe9005bbef9e558097b50a11c0c126e66e16faa6be3ca21bcfe55243a536808cbf408fa953e7f46417a068b5043
+EBUILD ldns-utils-1.8.0-r3.ebuild 391 BLAKE2B 851349e3cfec86bcdbafe6f550dc0582c08a79464d2826616ad606b1e117cc254b72aa92ae4d27767c67106d22d8798121212c7493989cb892961bd369d371e7 SHA512 1c35c6545f379b7d365abf97e40585982d8df0b44fc202cc3e64b679e8305d4e57cbdc8245a983f49daee4961a57bae0546bc3832097a2b1719cc7fa20fc13a6
+MISC metadata.xml 532 BLAKE2B f5ba3420ebe50311a12f4be60b7f6d63d1fbe8b28927a5cf6d410a477dff5e94aeba509b6aab244ca7f1774892ef7e57b7cdd93398aca2b9a89c4071e964d621 SHA512 6d2086663622f8f16df57948db7a4cd94c136940e9db05eafe253b3c114549b41ee9a28f54a9229ff6f1135f2a42bdf46041f22501d4586547729379c98c33fe
diff --git a/net-dns/ldns-utils/ldns-utils-1.7.1.ebuild b/net-dns/ldns-utils/ldns-utils-1.7.1.ebuild
deleted file mode 100644
index b0313d3adfbd..000000000000
--- a/net-dns/ldns-utils/ldns-utils-1.7.1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_P=${P/-utils}
-
-DESCRIPTION="Set of utilities to simplify various dns(sec) tasks"
-HOMEPAGE="http://www.nlnetlabs.nl/projects/ldns/"
-SRC_URI="http://www.nlnetlabs.nl/downloads/ldns/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
-IUSE="+dane ecdsa ed25519 ed448 examples gost ssl"
-
-REQUIRED_USE="
-	ecdsa? ( ssl )
-	ed25519? ( ssl )
-	ed448? ( ssl )
-	dane? ( ssl )
-	gost? ( ssl )
-"
-
-DEPEND=">=net-libs/ldns-${PV}[dane?,ecdsa?,ed25519?,ed448?,gost?]
-	examples? ( net-libs/libpcap )"
-RDEPEND="${DEPEND}"
-
-RESTRICT="test"
-
-S=${WORKDIR}/${MY_P}
-
-src_configure() {
-	# >=openssl-1.1.0 required for dane-ta
-	if has_version "<dev-libs/openssl-1.1.0" ; then
-		local dane_ta_usage="--disable-dane-ta-usage"
-	else
-		local dane_ta_usage=""
-	fi
-
-	ECONF_SOURCE=${S} \
-	econf \
-		--with-drill \
-		$(use_with ssl) \
-		$(use_with examples) \
-		$(use_enable dane) \
-		$(use_enable ecdsa) \
-		$(use_enable ed25519) \
-		$(use_enable ed448) \
-		$(use_enable gost) \
-		$(use_enable ssl sha2) \
-		$dane_ta_usage
-}
-
-src_compile() {
-	default
-}
-
-src_install() {
-	#cd "${S}"/drill
-	emake DESTDIR="${D}" install-drill
-	dodoc drill/{ChangeLog.22-nov-2005,README,REGRESSIONS}
-
-	if use examples; then
-		emake DESTDIR="${D}" install-examples
-		newdoc examples/README README.examples
-	fi
-}
diff --git a/net-dns/ldns-utils/ldns-utils-1.8.0-r1.ebuild b/net-dns/ldns-utils/ldns-utils-1.8.0-r1.ebuild
deleted file mode 100644
index b7516aaa9282..000000000000
--- a/net-dns/ldns-utils/ldns-utils-1.8.0-r1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools
-
-MY_P=${P/-utils}
-
-DESCRIPTION="Set of utilities to simplify various dns(sec) tasks"
-HOMEPAGE="http://www.nlnetlabs.nl/projects/ldns/"
-SRC_URI="http://www.nlnetlabs.nl/downloads/ldns/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="+dane ecdsa ed25519 ed448 examples gost ssl"
-
-REQUIRED_USE="
-	ecdsa? ( ssl )
-	ed25519? ( ssl )
-	ed448? ( ssl )
-	dane? ( ssl )
-	gost? ( ssl )
-"
-
-DEPEND=">=net-libs/ldns-${PV}[dane?,ecdsa?,ed25519?,ed448?,gost?]
-	examples? ( net-libs/libpcap )"
-RDEPEND="${DEPEND}"
-
-RESTRICT="test"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	# backport https://github.com/NLnetLabs/ldns/commit/bc9d017f6fd8b6b5d2ff6e4489a2931d0aab8184
-	sed -i 's/AC_SUBST(VERSION_INFO.*/AC_SUBST(VERSION_INFO, [5:0:2])/' "${S}"/configure.ac || die 'could not patch configure.ac'
-
-	default
-}
-
-src_configure() {
-	eautoreconf
-
-	# >=openssl-1.1.0 required for dane-ta
-	if has_version "<dev-libs/openssl-1.1.0" ; then
-		local dane_ta_usage="--disable-dane-ta-usage"
-	else
-		local dane_ta_usage=""
-	fi
-
-	ECONF_SOURCE=${S} \
-	econf \
-		--with-drill \
-		$(use_with ssl) \
-		$(use_with examples) \
-		$(use_enable dane) \
-		$(use_enable ecdsa) \
-		$(use_enable ed25519) \
-		$(use_enable ed448) \
-		$(use_enable gost) \
-		$(use_enable ssl sha2) \
-		$dane_ta_usage
-
-}
-
-src_compile() {
-	default
-}
-
-src_install() {
-	#cd "${S}"/drill
-	emake DESTDIR="${D}" install-drill
-	dodoc drill/{ChangeLog.22-nov-2005,README,REGRESSIONS}
-
-	if use examples; then
-		emake DESTDIR="${D}" install-examples
-		newdoc examples/README README.examples
-	fi
-}
diff --git a/net-dns/ldns-utils/ldns-utils-1.8.0-r2.ebuild b/net-dns/ldns-utils/ldns-utils-1.8.0-r3.ebuild
index 6c68aaf2613b..4b70f566cf04 100644
--- a/net-dns/ldns-utils/ldns-utils-1.8.0-r2.ebuild
+++ b/net-dns/ldns-utils/ldns-utils-1.8.0-r3.ebuild
@@ -11,15 +11,5 @@ HOMEPAGE="http://www.nlnetlabs.nl/projects/ldns/"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
-IUSE="+dane ecdsa ed25519 ed448 examples gost ssl"
 
-REQUIRED_USE="
-	ecdsa? ( ssl )
-	ed25519? ( ssl )
-	ed448? ( ssl )
-	dane? ( ssl )
-	gost? ( ssl )
-"
-
-RDEPEND=">=net-libs/ldns-1.8.0-r3[dane?,ecdsa?,ed25519?,ed448?,gost?]
-	examples? ( >=net-libs/ldns-1.8.0-r3[examples(-)] )"
+RDEPEND=">=net-libs/ldns-1.8.0-r3"
diff --git a/net-dns/ldns-utils/metadata.xml b/net-dns/ldns-utils/metadata.xml
index a9f2606f4927..0fdb9aa842a6 100644
--- a/net-dns/ldns-utils/metadata.xml
+++ b/net-dns/ldns-utils/metadata.xml
@@ -11,11 +11,4 @@
   level API which allows a programmer to (for instance) create or sign
   packets.
   </longdescription>
-  <use>
-    <flag name="dane">Enable DNS-based Authentication of Named Entities (DANE) support</flag>
-    <flag name="ecdsa">Enable ECDSA support</flag>
-    <flag name="ed25519">Enable ED25519 support</flag>
-    <flag name="ed448">Enable ED448 support</flag>
-    <flag name="gost">Enable GOST support</flag>
-  </use>
 </pkgmetadata>