gentoo resync : 01.01.2018

4 files changed, 2 insertions, 88 deletions

diff --git a/net-dns/ldns-utils/Manifest b/net-dns/ldns-utils/Manifest
index e65b647c2c05..82356be227b8 100644
--- a/net-dns/ldns-utils/Manifest
+++ b/net-dns/ldns-utils/Manifest
@@ -1,9 +1,6 @@
-AUX 1.6.12-cflags.patch 938 BLAKE2B 9dbcc10a21d0fade4422098c325be04a13d46d17021288501801c5e80233ea3695ddaae4a5a8ac1a8d4d818e94ec7995836b03af374b2e1ab3a7cad809b3ad88 SHA512 bd03ef07cdc407d2ad3714027c91339ada3d79bc3302884b05c4e0ada18d93d232cd718b67a35234b98c29a35f26730df631e0854b8a64399498a7e9f83e6216
-DIST ldns-1.6.12.tar.gz 1057607 BLAKE2B c9f20afb850b7ce8849996a808ef29bb3c5596416350854805b9e212925ec58be1440acfdf5f9b2fb2d47c86605eb05f8bb8aceebc0ed9a23cabbad96839e052 SHA512 f928be35a5c0bc2b918f005dd592cc531451f373ed9d77a54d5207a2a80b9d525faabf75bba75483d3476cfeff75a66ad4d9527a84a983216dae4fac30213773
 DIST ldns-1.6.17.tar.gz 1315403 BLAKE2B 67cf163c0fc529730f6de6a7ed3c581a2fdc3be7eb3f1d2cdc4ff51c98e6b78f93fab96d19d665f2dc8592f80d92ec5d3dd16da9760124f0604eb48c09ffd201 SHA512 5de42b4b8622591db51efb0956735deee9cd5e0bee12249a03b65c5b45d7c51bf9c2edb310ef9d7431af49aef77d968bfa2455a7dedfa80cde3d433436c83785
 DIST ldns-1.7.0.tar.gz 1304424 BLAKE2B 2f37aa2d00c1d9cf18711bd4f873f4722df01c4f4d0f627e054f04b2473c0fbf19449e293a130d5c8b98dcebafeb3d7b3f5923ae0244bd80139cea77f2171e06 SHA512 8a4e48bcc2a244b92447a9830b60efbb656fb7955f3559ef2eb6f8e724c4c0208776350c44ccf7dcf1ffe0b7b9d9ccc4cbddc5bc16e8888db494ab4d0bce3bd8
-EBUILD ldns-utils-1.6.12.ebuild 1351 BLAKE2B c2d36cf2b3924821904af1632d3df395d92ec0835030cce8f03d150478ccae743be26e795ab9e6e7a104771bd7119832efcfe05f1b9f9790472d25a91a457d57 SHA512 74b2120348484901b4736f10cc4fc4f36b4ae728fb3173623c8e5274205c1bbe5b6d535ddf62c20e367fedbcdc0591a870fae871ac99679325267a67721b3829
 EBUILD ldns-utils-1.6.17.ebuild 1138 BLAKE2B 0731e3377961d21b35e5a4237d72079a24b22ed76a24efd8deb0d275f9c54ca40968901802b7a25d1033a4fbc6e0f8322775ff23f81263766a6e65e8c9ef6f7d SHA512 3ae6b8549ed43e1957127129094ece798f1e7f64dae5521f83eeb59a37bc72ae7e97963b68fadf3c5446c8c019d3800ce06f7e29acaf2c6e748750aed6db03d0
-EBUILD ldns-utils-1.7.0-r1.ebuild 1194 BLAKE2B e72fa642bc58ae33c84cd82a8febaeaaca845b6568ce3ba20512e370ea8eb1ec515c78aa1cad8e15878e0ac1d498bbe037a34a968211ddbb648e1509c1b43f81 SHA512 27f16b7924c0a3dfdd166324504384a31728210f580ead91f3ceacac6d16df3ef869f2399a2878e433144c15ea8d9a50294cde28e34de6ec9423aa620c25a141
+EBUILD ldns-utils-1.7.0-r1.ebuild 1193 BLAKE2B f2e5efb2445d3bd17c67fd11f335c1b939a10f64c2681cbb938e3ff93e54f1b1d93ceda71e3ca92793b7762b19892e2a48cf9f51292699e35a30e40d45aeb352 SHA512 3f2269ec3805b6e298dc297c45a34ef76aa393556460b880bc9c543de801c65c8b616d3c936f4f735f2bd2d21d12a38c0bf09a0478a14af3b58e5a78a21d937f
 EBUILD ldns-utils-1.7.0.ebuild 1138 BLAKE2B 7a7d609335d3ee0e6f7591953a3a4217db3685268a9243d89fbdb67014ed5b906522745bad4ed0ab1fc3a36be6e48519991b92377b78578f4f1fbed6cb50ca60 SHA512 7969ea780081157652a9e3c601f19b34b1aef9565c53fdab51e5d4a8f55fc7b29186d5c2a47eb3eb0cf54f2785a1d2cf0ae52b57d83962ecb6b564c588992363
 MISC metadata.xml 742 BLAKE2B 78bcba18e70bea755bab35347639a1a529961e91b709b789c045db918525939e9fdb4a7adb6dd7801c64bd02090503d5b3edbe444fbf34615ec3ebb5342d2288 SHA512 a0c0fc0a7dd05890fa9b2d6bf99c5b96990d76993d27d18a382ab69e1200aa5f472865c5de928575d773f70ef21314519bc46a1d2a138da34d569bf56a7d8748
diff --git a/net-dns/ldns-utils/files/1.6.12-cflags.patch b/net-dns/ldns-utils/files/1.6.12-cflags.patch
deleted file mode 100644
index 5e14a20ad37c..000000000000
--- a/net-dns/ldns-utils/files/1.6.12-cflags.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -Naur ldns-1.6.12.orig/drill/configure.ac ldns-1.6.12/drill/configure.ac
---- ldns-1.6.12.orig/drill/configure.ac	2011-11-17 00:48:16.000000000 +0900
-+++ ldns-1.6.12/drill/configure.ac	2012-01-12 00:20:51.944503474 +0900
-@@ -33,7 +33,6 @@
- ACX_CHECK_COMPILER_FLAG(xc99, [C99FLAG="-xc99"])
- 
- AC_TYPE_SIZE_T
--ACX_CHECK_COMPILER_FLAG(O2, [CFLAGS="$CFLAGS -O2"])
- 
- ACX_CHECK_COMPILER_FLAG_NEEDED($C99FLAG -D__EXTENSIONS__ -D_BSD_SOURCE -D_POSIX_C_SOURCE=200112 -D_XOPEN_SOURCE=600,
- [
-diff -Naur ldns-1.6.12.orig/examples/configure.ac ldns-1.6.12/examples/configure.ac
---- ldns-1.6.12.orig/examples/configure.ac	2011-09-29 22:04:19.000000000 +0900
-+++ ldns-1.6.12/examples/configure.ac	2012-01-12 00:21:03.191504702 +0900
-@@ -31,7 +31,6 @@
- 
- 
- AC_TYPE_SIZE_T
--ACX_CHECK_COMPILER_FLAG(O2, [CFLAGS="$CFLAGS -O2"])
- 
- ACX_CHECK_COMPILER_FLAG_NEEDED($C99FLAG -D__EXTENSIONS__ -D_BSD_SOURCE -D_POSIX_C_SOURCE=200112 -D_XOPEN_SOURCE=600,
- [
diff --git a/net-dns/ldns-utils/ldns-utils-1.6.12.ebuild b/net-dns/ldns-utils/ldns-utils-1.6.12.ebuild
deleted file mode 100644
index 6b15334d520a..000000000000
--- a/net-dns/ldns-utils/ldns-utils-1.6.12.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="3"
-inherit autotools eutils
-
-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="amd64 ppc x86"
-IUSE="examples gost ssl"
-
-DEPEND=">=net-libs/ldns-${PV}[gost?,ssl?]
-	examples? ( net-libs/libpcap )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	# bug #369339
-	epatch "${FILESDIR}/1.6.12-cflags.patch"
-
-	( cd drill && eautoreconf )
-	( cd examples && eautoreconf )
-}
-
-src_configure() {
-	cd "${S}"/drill
-	econf $(use_with ssl) || die
-
-	if use examples; then
-		cd "${S}"/examples
-		econf \
-			$(use_enable gost) \
-			$(use_enable ssl sha2) \
-			$(use_with ssl) || die
-	fi
-}
-
-src_compile() {
-	emake -C drill || die "emake for drill failed"
-	if use examples; then
-		emake -C examples || die "emake for examples failed"
-	fi
-}
-
-src_install() {
-	cd "${S}"/drill
-	emake DESTDIR="${D}" install || die "emake install for drill failed"
-	dodoc ChangeLog.22-nov-2005 README REGRESSIONS || die
-
-	if use examples; then
-		cd "${S}"/examples
-		emake DESTDIR="${D}" install || die "emake install for examples failed"
-		newdoc README README.examples || die
-	fi
-}
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
index f20c34e60540..0f251a68edcd 100644
--- a/net-dns/ldns-utils/ldns-utils-1.7.0-r1.ebuild
+++ b/net-dns/ldns-utils/ldns-utils-1.7.0-r1.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 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
 IUSE="+dane ecdsa examples gost ssl"
 
 REQUIRED_USE="