version bump, moved utilities to new ebuild

svn path=/sunrise/; revision=7380

4 files changed, 32 insertions, 72 deletions

diff --git a/net-libs/ldns/Manifest b/net-libs/ldns/Manifest
index 36f6e8559..45446b482 100644
--- a/net-libs/ldns/Manifest
+++ b/net-libs/ldns/Manifest
@@ -1,4 +1,4 @@
-DIST ldns-1.3.0.tar.gz 786124 RMD160 5d603018f2c772108c3696c1e90398aea20a05bf SHA1 9b05ea3ae23f973345de89936c59ad79f77aeccf SHA256 85185cbcbdffee7cd38184fac3c3eb0ab4a1631f5d0f5097b8789f26a942b9e2
-EBUILD ldns-1.3.0.ebuild 1513 RMD160 7687236f4d574bed6b7b409a0756cb17f04db986 SHA1 5e4d3c5208dcb12ac08e14f342adc2c141ba48b4 SHA256 4fc1f13200c3b7747af3307e54c5690a7f998e2ada00e7c15e0f492637f7bcad
+DIST ldns-1.4.0.tar.gz 807484 RMD160 6de1be79a080ccd02652b2d3a17403c96d116c52 SHA1 2fb1b317ccb88f68a10d8b90ebd71f174fc5a065 SHA256 d260592bb1ddf814c0361b731cda59b19868d017f6b0900a7abf559a6c0e8789
+EBUILD ldns-1.4.0.ebuild 785 RMD160 e42a8426aa992fe79a4325332b872e1157f14d29 SHA1 487ecadf415866020cd1cf4ff214c31acefbe4fd SHA256 b4a54f2ae49cc0edfa17fe961f774a0ce3fa1c0f2b982432d8a316bf976c30ee
 MISC ChangeLog 260 RMD160 fa8a7c6ee9241118149dbd84a432a2cde1a2357c SHA1 e2451790843b48f7efcfc154020d94ed1a9c94bf SHA256 3952f6f3a584bd051bbd2323b7093e55030e7a2116ffc3705601f43880e3971d
-MISC metadata.xml 328 RMD160 bbef185842e1039caba6fd9116df355ce28fb18a SHA1 fc3578a06f493d02006121bd38fc44654dec560d SHA256 6ac10326cfe1f097fec33aaafc265c003d2e2488e1382a0cff76764f89ce5b6a
+MISC metadata.xml 186 RMD160 790ef987bc75afa86a9fc3f6ae421a7e567e4196 SHA1 35a3a41913911438fcbcee814f9a0c416167e731 SHA256 6ac7e74060d4e767e3d642291eb1a38630e188ce34456b48a70562cbd560f17c
diff --git a/net-libs/ldns/ldns-1.3.0.ebuild b/net-libs/ldns/ldns-1.3.0.ebuild
deleted file mode 100644
index bb6a3fbc4..000000000
--- a/net-libs/ldns/ldns-1.3.0.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header$
-
-DESCRIPTION="ldns is a library with the aim to simplify DNS programing in C"
-HOMEPAGE="http://www.nlnetlabs.nl/projects/ldns/"
-SRC_URI="http://www.nlnetlabs.nl/downloads/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="drill examples utils"
-
-DEPEND=">=dev-libs/openssl-0.9.7
-	utils? ( net-libs/libpcap )"
-
-src_compile() {
-	einfo "Buildig libldns"
-	econf
-	emake || die "libldns compilation failed"
-
-	if use drill; then
-		einfo "Building drill"
-		cd drill
-			econf
-			emake || die "drill compilation failed"
-		cd ..
-	fi
-
-	if use utils; then
-		einfo "Building example utilities"
-		cd examples
-			econf
-			emake || die "example utilities compilation failed"
-		cd ..
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "libldns installation failed"
-
-	if use drill; then
-		cd drill
-			emake DESTDIR="${D}" install || die "drill installation failed"
-		cd ..
-	fi
-
-	if use utils; then
-		cd examples
-			emake DESTDIR="${D}" install || die "example utilities installation failed"
-		cd ..
-	fi
-
-	dodoc Changelog README || die "Adding documentation failed"
-
-	if use examples; then
-		docinto examples
-		dodoc examples/* || die "Adding examples to documentation failed"
-	fi
-}
-
-pkg_postinst() {
-	if use utils; then
-		ewarn "You enabled the "utils" USE flag, which installs the example utilities."
-		ewarn "Most of them are quite useful, but not all of them are production-ready."
-	fi
-}
diff --git a/net-libs/ldns/ldns-1.4.0.ebuild b/net-libs/ldns/ldns-1.4.0.ebuild
new file mode 100644
index 000000000..b1ef76664
--- /dev/null
+++ b/net-libs/ldns/ldns-1.4.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header$
+
+DESCRIPTION="ldns is a library with the aim to simplify DNS programing in C"
+HOMEPAGE="http://www.nlnetlabs.nl/projects/ldns/"
+SRC_URI="http://www.nlnetlabs.nl/downloads/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples"
+
+DEPEND="dev-libs/openssl"
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	dodoc Changelog README || die "dodoc failed"
+
+	if use examples; then
+		docinto examples
+		dodoc examples/* || die "dodoc for examples failed"
+	fi
+}
+
+pkg_postinst() {
+	ewarn "The drill binary and the ldns-* utilities were moved into their own"
+	ewarn "package. If you need them, install net-dns/ldns-utils."
+}
diff --git a/net-libs/ldns/metadata.xml b/net-libs/ldns/metadata.xml
index 295da863d..e4979b9b0 100644
--- a/net-libs/ldns/metadata.xml
+++ b/net-libs/ldns/metadata.xml
@@ -3,7 +3,5 @@
 <pkgmetadata>
 	<herd>maintainer-wanted</herd>
 	<use>
-		<flag name='drill'>Enable installation of the drill utility</flag>
-		<flag name='utils'>Enable installation of the example utilities</flag>
 	</use>
 </pkgmetadata>