gentoo christmass resync : 25.12.2020

3 files changed, 2 insertions, 65 deletions

diff --git a/net-dns/ldns-utils/Manifest b/net-dns/ldns-utils/Manifest
index 8f3410d320c5..85de8e2be4a8 100644
--- a/net-dns/ldns-utils/Manifest
+++ b/net-dns/ldns-utils/Manifest
@@ -1,5 +1,3 @@
-DIST ldns-1.7.0.tar.gz 1304424 BLAKE2B 2f37aa2d00c1d9cf18711bd4f873f4722df01c4f4d0f627e054f04b2473c0fbf19449e293a130d5c8b98dcebafeb3d7b3f5923ae0244bd80139cea77f2171e06 SHA512 8a4e48bcc2a244b92447a9830b60efbb656fb7955f3559ef2eb6f8e724c4c0208776350c44ccf7dcf1ffe0b7b9d9ccc4cbddc5bc16e8888db494ab4d0bce3bd8
 DIST ldns-1.7.1.tar.gz 1244394 BLAKE2B 8f2d9c6e34c4f13924ce1531a5757c4a619fc31ebc5a0a3d4aaf43fcfc8b53e8f371984b1c60ab74f735a05a9ca0710fc29a40fffeaef66eb54395eb3a727a0d SHA512 e8f72a4ff4aa544acac5e7be9a8ba38c6b8d388bb26f9a0ed04c1a921622f8582cc8539beafc76a29187a55c94069b7c1875e77522e1a7e7bb3e297dd1e4c2b7
-EBUILD ldns-utils-1.7.0-r1.ebuild 1194 BLAKE2B bd2ee91e3a1adee034b4864ec624e15531bf27cadd9625744344c5df88a2a5adc0fc6c02045ef36bc4e88042bda9e85ad658c076709cdc413ba5f041dbd9c871 SHA512 a59e00760c948641198c9693f503244b62166cc4f628c1fe49fb6aa3a7abddeb47e616fded6d466e85d982a1d921883d51f0776f88dad3c0162f40d017561b22
-EBUILD ldns-utils-1.7.1.ebuild 1476 BLAKE2B 3394248b15bd9111b06f44836692f55bff86d5b1db7d021e2f204d5e17db9513151198e3a014bfad5528c2f41445960dea9481d891486000328e847e11861153 SHA512 a0fd24e05a4b72ef64d54204066ef87302c761e412dbab4272c6b50962af9de2b7cd41e60c2df6200f63d00025b24070037d0de8014a0712fe0275cbf51c1a37
+EBUILD ldns-utils-1.7.1.ebuild 1475 BLAKE2B f1e9d6e35ee543fccd1fc675026ff8018359e33df40f7d256327b9ce27579ac07fa868db3fba8aacf9e0a432e120622c06b020291ef2a098a73f0a6a574ed484 SHA512 c7826a4dbaa260ca456b44ad58e98ba823a12c7df051a810e9c79ef060ed2e4d5556dd7c39599ba40d0383784c382dfba4f531efe434e2ccff50f60900dc5df3
 MISC metadata.xml 848 BLAKE2B a31c8bfb2c5a90add80c4f608cdbd02e3bf15126726ed92203425b166ae01cf8240fa040d98ba44991cd315bdb388664692eca5820fc807cf3fddefc7663ffb4 SHA512 6ce3c5421c6e739f0c15a5b7e9120638cddc78fa3d9c2f564acfccd4c98bb3034512ce1a68422ba0ef7896750c1a41e273f2960d9d1f0ffc21c9028342482366
diff --git a/net-dns/ldns-utils/ldns-utils-1.7.0-r1.ebuild b/net-dns/ldns-utils/ldns-utils-1.7.0-r1.ebuild
deleted file mode 100644
index e9a8f9275263..000000000000
--- a/net-dns/ldns-utils/ldns-utils-1.7.0-r1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-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 examples gost ssl"
-
-REQUIRED_USE="
-	ecdsa? ( ssl )
-	dane? ( ssl )
-	gost? ( ssl )
-"
-
-DEPEND=">=net-libs/ldns-${PV}[dane?,ecdsa?,gost?]
-	examples? ( net-libs/libpcap )"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-src_configure() {
-	cd "${S}"/drill
-	econf $(use_with ssl)
-
-	if use examples; then
-		cd "${S}"/examples
-		econf \
-			$(use_enable dane) \
-			$(use_enable ecdsa) \
-			$(use_enable gost) \
-			$(use_enable ssl sha2) \
-			$(use_with ssl)
-	fi
-}
-
-src_compile() {
-	emake -C drill
-	if use examples; then
-		emake -C examples
-	fi
-}
-
-src_install() {
-	cd "${S}"/drill
-	emake DESTDIR="${D}" install
-	dodoc ChangeLog.22-nov-2005 README REGRESSIONS
-
-	if use examples; then
-		cd "${S}"/examples
-		emake DESTDIR="${D}" install
-		newdoc README README.examples
-	fi
-}
diff --git a/net-dns/ldns-utils/ldns-utils-1.7.1.ebuild b/net-dns/ldns-utils/ldns-utils-1.7.1.ebuild
index 969fdba5b692..c892f13acaaa 100644
--- a/net-dns/ldns-utils/ldns-utils-1.7.1.ebuild
+++ b/net-dns/ldns-utils/ldns-utils-1.7.1.ebuild
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
 IUSE="+dane ecdsa ed25519 ed448 examples gost ssl"
 
 REQUIRED_USE="