net-dns/ldns-utils: sync with upstream

5 files changed, 2 insertions, 111 deletions

diff --git a/net-dns/ldns-utils/Manifest b/net-dns/ldns-utils/Manifest
index 1c53a2a..e2ae753 100644
--- a/net-dns/ldns-utils/Manifest
+++ b/net-dns/ldns-utils/Manifest
@@ -1,2 +1 @@
-DIST ldns-1.6.12.tar.gz 1057607 SHA256 b966787510a169ca0ed78f9a8a5de01fb309909575e721ead92095d4677aa51c SHA512 f928be35a5c0bc2b918f005dd592cc531451f373ed9d77a54d5207a2a80b9d525faabf75bba75483d3476cfeff75a66ad4d9527a84a983216dae4fac30213773 WHIRLPOOL 0e8cf513991850b065144568ec1ea3188ddb6bbf6b3cf08490186552884b2b2dd42ae8ab8995f54c183a989976ab292772411f2582a5bd595d4d54d25e2b4096
 DIST ldns-1.6.17.tar.gz 1315403 SHA256 8b88e059452118e8949a2752a55ce59bc71fa5bc414103e17f5b6b06f9bcc8cd SHA512 5de42b4b8622591db51efb0956735deee9cd5e0bee12249a03b65c5b45d7c51bf9c2edb310ef9d7431af49aef77d968bfa2455a7dedfa80cde3d433436c83785 WHIRLPOOL 08c8a13df3dbeccd5dc5ceeb52730a61ab231e70a85524e826f9275bbcde6e09d6e2fc5234303a6bceb431d2b91f510140ce61a2b59d77afbb2759a0627c7cb7
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 5e14a20..0000000
--- 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/files/1.6.12-libressl.patch b/net-dns/ldns-utils/files/1.6.12-libressl.patch
deleted file mode 100644
index 8ccf4b9..0000000
--- a/net-dns/ldns-utils/files/1.6.12-libressl.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -Naur ldns-1.6.12.orig/examples/ldns-signzone.c ldns-1.6.12/examples/ldns-signzone.c
---- ldns-1.6.12.orig/examples/ldns-signzone.c	2011-10-27 20:30:05.000000000 +0900
-+++ ldns-1.6.12/examples/ldns-signzone.c	2015-09-25 01:38:08.502773261 +0900
-@@ -481,6 +481,8 @@
- 		case 'A':
- 			signflags |= LDNS_SIGN_DNSKEY_WITH_ZSK;
- 			break;
-+
-+#ifdef HAVE_ENGINE_LOAD_CRYPTODEV
- 		case 'E':
- 			ENGINE_load_builtin_engines();
- 			ENGINE_load_dynamic();
-@@ -505,6 +507,7 @@
- 				ENGINE_set_default(engine, 0);
- 			}
- 			break;
-+#endif
- 		case 'k':
- 			eng_key_l = strchr(optarg, ',');
- 			if (eng_key_l && strlen(eng_key_l) > 1) {
diff --git a/net-dns/ldns-utils/ldns-utils-1.6.12-r1.ebuild b/net-dns/ldns-utils/ldns-utils-1.6.12-r1.ebuild
deleted file mode 100644
index de16825..0000000
--- a/net-dns/ldns-utils/ldns-utils-1.6.12-r1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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"
-
-	# Fix issues with LibreSSL
-	epatch "${FILESDIR}/1.6.12-libressl.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.6.17-r1.ebuild b/net-dns/ldns-utils/ldns-utils-1.6.17-r1.ebuild
index cdb240d..283b48a 100644
--- a/net-dns/ldns-utils/ldns-utils-1.6.17-r1.ebuild
+++ b/net-dns/ldns-utils/ldns-utils-1.6.17-r1.ebuild
@@ -1,6 +1,5 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 EAPI=5
 inherit eutils
@@ -13,7 +12,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"
 
 DEPEND=">=net-libs/ldns-${PV}[dane?,ecdsa?,gost?,ssl?]