net-dns/ldns-utils: version bump, thanks to Tommy[D]

svn path=/sunrise/; revision=9043

5 files changed, 60 insertions, 45 deletions

diff --git a/net-dns/ldns-utils/ChangeLog b/net-dns/ldns-utils/ChangeLog
index 08ab28192..fdf9e9151 100644
--- a/net-dns/ldns-utils/ChangeLog
+++ b/net-dns/ldns-utils/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  17 Aug 2009; Tom Hendrikx (whyscream) <tom@whyscream.net>
+  -ldns-utils-1.6.0.ebuild, +ldns-utils-1.6.1.ebuild, metadata.xml:
+  version bump, thanks to Tommy[D]
+
   09 Jul 2009; Tom Hendrikx (whyscream) <tom@whyscream.net>
   -ldns-utils-1.5.1.ebuild, +ldns-utils-1.6.0.ebuild:
   version bump
diff --git a/net-dns/ldns-utils/Manifest b/net-dns/ldns-utils/Manifest
index 753d1246a..5576eb8fa 100644
--- a/net-dns/ldns-utils/Manifest
+++ b/net-dns/ldns-utils/Manifest
@@ -1,4 +1,4 @@
-DIST ldns-1.6.0.tar.gz 824644 RMD160 c97623cee576db21909728208dc952070912c7fa SHA1 e5fdbc5cd66f6afc4f816e9acd334bddc488e830 SHA256 ff14a5a52c61ec3212b3e35fdd9f0861705a66fceb1cef8bd4720b950b5694e7
-EBUILD ldns-utils-1.6.0.ebuild 852 RMD160 d3aaa3fd113805986888eb210df72ef67caa10d4 SHA1 d3981bbd5528d04921341ed5bad55394c387f0d4 SHA256 c67c790edb6861d0cd17d44d8f71f28b1a0d7a813bb39061740c1efcefc65009
-MISC ChangeLog 1132 RMD160 d70b0613bcda942bb12c54d2505d68ffe7eee8cd SHA1 4e43b9ca62b8ea29aca8843f3aefaec34671cbb2 SHA256 a55e7c6743191ed151f36c430441e9dc02153792d7d1053d1bfd9c0c263ffc67
-MISC metadata.xml 171 RMD160 ed284df01c230fc7990a6b5888b39166d23f29ba SHA1 f3d64a69044b710e23fb874b3ee4cd338858c8b4 SHA256 a7b30fbacd0e4c312c07a3efac112a3794c81d134442d8104325734d03425adf
+DIST ldns-1.6.1.tar.gz 830714 RMD160 c477c76308b56bd18920ea0deeac286857c93e22 SHA1 625ad56970ebf91ae91af2fbb92b048164717df1 SHA256 c30a4791dbfb0dc31c58e24a25c594f534cdef24013b1945b6713aedd17fe100
+EBUILD ldns-utils-1.6.1.ebuild 1162 RMD160 9af599e583335d0cc38c988865244fc22eb07a09 SHA1 5f3d70d92668057c754291881c5a70df7283226a SHA256 bbf8dd0277def9aed318bdae47ac31498602e44f0567ac9e1b4ec14734a90d69
+MISC ChangeLog 1296 RMD160 5227a19cadb3602b09c06e569ef78eed5eca7dee SHA1 01aec0d3888bd7db9ed18622b9ed94447a66a7af SHA256 18d23e732c518663c2fea96258a220431b0c59903aaf625177978ffe43d82e5d
+MISC metadata.xml 252 RMD160 f3d9b7ddbf87a3c8c4961893d7cf12bb42e46513 SHA1 43a32dbbafc20d555b881f731605d60d0cb0e1f4 SHA256 1592924ba2d4ecdcdbcc5c277cd0537e12c7f210dfc3ef9a323f9283d507fb04
diff --git a/net-dns/ldns-utils/ldns-utils-1.6.0.ebuild b/net-dns/ldns-utils/ldns-utils-1.6.0.ebuild
deleted file mode 100644
index ebfeb65ea..000000000
--- a/net-dns/ldns-utils/ldns-utils-1.6.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header$
-
-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/ldns-${PV}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-libs/openssl
-	>=net-libs/ldns-${PV}
-	net-libs/libpcap"
-RDEPEND=${DEPEND}
-
-S=${WORKDIR}/ldns-${PV}
-
-DIRS="drill examples"
-
-src_compile() {
-	for dir in ${DIRS}; do
-		einfo "Building in ${dir}"
-		cd "${dir}"
-		econf
-		emake || die "emake in ""${dir}"" failed"
-		cd ..
-	done
-}
-
-src_install() {
-	for dir in ${DIRS}; do
-		cd "${dir}"
-		emake DESTDIR="${D}" install || die "emake install in ""${dir}"" failed"
-		cd ..
-	done
-
-	dodoc Changelog README || die "Adding documentation failed"
-}
diff --git a/net-dns/ldns-utils/ldns-utils-1.6.1.ebuild b/net-dns/ldns-utils/ldns-utils-1.6.1.ebuild
new file mode 100644
index 000000000..b4b176f84
--- /dev/null
+++ b/net-dns/ldns-utils/ldns-utils-1.6.1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header$
+
+EAPI=2
+
+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/ldns-${PV}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="sha2 ssl"
+
+DEPEND=">=net-libs/ldns-${PV}[sha2?,ssl?]
+	net-libs/libpcap"
+RDEPEND=${DEPEND}
+
+S=${WORKDIR}/ldns-${PV}
+
+pkg_setup() {
+	if use sha2; then
+		if ! use ssl; then
+			die "For sha2 support, you have to enable ssl USE flag too"
+		fi
+		ewarn "You enabled sha2 USE flag, this is still experimental"
+	fi
+}
+
+src_configure() {
+	cd "${S}"/drill
+	econf $(use_with ssl)
+
+	cd "${S}"/examples
+	econf $(use_enable sha2) $(use_with ssl)
+}
+
+src_compile() {
+	emake -C drill || die "emake for drill failed"
+	emake -C examples || die "emake for examples failed"
+}
+
+src_install() {
+	emake -C drill DESTDIR="${D}" install || die "emake install for drill failed"
+	emake -C examples DESTDIR="${D}" install || die "emake install for examples failed"
+
+	dodoc Changelog README || die "Adding documentation failed"
+}
diff --git a/net-dns/ldns-utils/metadata.xml b/net-dns/ldns-utils/metadata.xml
index 6f1d493c5..3afda04ad 100644
--- a/net-dns/ldns-utils/metadata.xml
+++ b/net-dns/ldns-utils/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>maintainer-wanted</herd>
+	<use>
+		<flag name='sha2'>Enable SHA256 and SHA512 RRSIG support</flag>
+	</use>
 </pkgmetadata>