Revert -r1 change (inclusion of /usr/bin/drill). Add elog about it.

Package-Manager: portage-2.1.10.63/cvs/Linux x86_64

3 files changed, 93 insertions, 5 deletions

diff --git a/net-libs/ldns/ChangeLog b/net-libs/ldns/ChangeLog
index 3eae05f14ec4..6e1e271f140b 100644
--- a/net-libs/ldns/ChangeLog
+++ b/net-libs/ldns/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-libs/ldns
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/ldns/ChangeLog,v 1.26 2012/05/31 05:43:56 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/ldns/ChangeLog,v 1.27 2012/06/02 15:57:55 xmw Exp $
+
+*ldns-1.6.12-r2 (02 Jun 2012)
+
+  02 Jun 2012; Michael Weber <xmw@gentoo.org> +ldns-1.6.12-r2.ebuild:
+  Revert -r1 change (inclusion of /usr/bin/drill). Add elog about it.
 
 *ldns-1.6.12-r1 (31 May 2012)
 
diff --git a/net-libs/ldns/Manifest b/net-libs/ldns/Manifest
index d9e50d1e45fa..c8d3b37f730f 100644
--- a/net-libs/ldns/Manifest
+++ b/net-libs/ldns/Manifest
@@ -6,13 +6,14 @@ DIST ldns-1.6.11.tar.gz 1018369 RMD160 7580869e4b8bdd2d31cb08cb690c2e3d0663f381
 DIST ldns-1.6.12.tar.gz 1057607 RMD160 e6497be1abef97239726eef6872dba42f7f69d65 SHA1 1d61df0f666908551d5a62768f77d63e727810aa SHA256 b966787510a169ca0ed78f9a8a5de01fb309909575e721ead92095d4677aa51c
 EBUILD ldns-1.6.11.ebuild 1671 RMD160 063e852a37ec8898c0db9ac36eaf5952a07be86a SHA1 2d55aef93e91b15106f5d6b0db4224600d487e80 SHA256 f8270f95bcaeea21464fb055bfd3441edda1f5d977ea17985997091637c2585e
 EBUILD ldns-1.6.12-r1.ebuild 1682 RMD160 65148041becb650b71fdcc4ac04d82d7a25e08c3 SHA1 6385e5cd9c5ed19f4ac7434be3c8975cb85e5a57 SHA256 8db4f892029f95b00138ebfffc87819c80fdc2f25e8c3518a7d9382a043566fc
+EBUILD ldns-1.6.12-r2.ebuild 1754 RMD160 f6ceb5407d92e9387c96a283f50323135e6eb38e SHA1 c9d6dc6017ddd5028da847e6a913c31f85748aca SHA256 c2065ec0e0ed4609979ecbcbb608667e4bf2a36d4bfe8e9319f6b17cc84b000e
 EBUILD ldns-1.6.12.ebuild 1766 RMD160 55f365a0c95d0930a506bb8a07002bfab7ab9534 SHA1 c4b23ff6d45078b05a3f4842da87b70990099207 SHA256 6b6967732db1804624304200c44667fad57ce1d6e934f63345874f4f30578f01
-MISC ChangeLog 4028 RMD160 f9553d0f5c292308979a34f767f54d85ee6a4f22 SHA1 bc72173698657e1ca37bca7a9bcb7576a4cd5c0f SHA256 399ad6508a564167d4353ed7ec3019bc6d684ec05e21049f8784fd8dcea14d67
+MISC ChangeLog 4200 RMD160 2accb97b9f39337db3166e2404b224b9a581ad7a SHA1 ec286d4f4fbd44eba5221b4341d5a9deec7a748f SHA256 1eac3e1d1b9f2d388e0ef0708f618baa5da982434e371e759680f88575280a65
 MISC metadata.xml 522 RMD160 4f1173d7ac98d44d8f82029285ed669a5323823c SHA1 ea1b07b44f442429cff45dfbccfee89a5f644845 SHA256 624abeb470d3376958e49dce8675f024b4c56ec50171805fa212fee6a496a920
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk/HBQoACgkQknrdDGLu8JCGYgEAkE6DKbqA/7HNW92cw0buyUrw
-1SsK7H1EP1+UhWc3J1sA/iXADrhpu8dQSImrDcrHn4ZujOvf4ry5ljpdYtyS+OxZ
-=pAg7
+iF4EAREIAAYFAk/KN+wACgkQknrdDGLu8JAwvwD+LGaqzMObH9QUji0as7hTxhw9
+xpxPlWagryb8NWS7gQoBAIE8gSHPgJMTbOJQJKIa04NwPT9Y4/iPQQ4QuSnDCCOm
+=OE2B
 -----END PGP SIGNATURE-----
diff --git a/net-libs/ldns/ldns-1.6.12-r2.ebuild b/net-libs/ldns/ldns-1.6.12-r2.ebuild
new file mode 100644
index 000000000000..f63c283843f8
--- /dev/null
+++ b/net-libs/ldns/ldns-1.6.12-r2.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/ldns/ldns-1.6.12-r2.ebuild,v 1.1 2012/06/02 15:57:55 xmw Exp $
+
+EAPI="4"
+PYTHON_DEPEND="python? 2:2.5"
+
+inherit autotools eutils python
+
+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 ~ppc-macos ~x64-macos"
+IUSE="doc examples gost python ssl static-libs vim-syntax"
+
+RESTRICT="test" # 1.6.9 has no test directory
+
+RDEPEND="ssl? ( >=dev-libs/openssl-0.9.7 )
+	gost? ( >=dev-libs/openssl-1 )"
+DEPEND="${RDEPEND}
+	python? ( dev-lang/swig )
+	doc? ( app-doc/doxygen )"
+
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/1.6.12-cflags.patch"
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_with examples) \
+		$(use_enable gost) \
+		$(use_enable ssl sha2) \
+		$(use_enable static-libs static) \
+		$(use_with ssl) \
+		$(use_with python pyldns) \
+		$(use_with python pyldnsx) \
+		--without-drill \
+		--disable-rpath
+}
+
+src_compile() {
+	emake
+	if use doc ; then
+		emake doxygen
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc Changelog README*
+
+	if use python ; then
+		find "${ED}$(python_get_sitedir)" "(" -name "*.a" -o -name "*.la" ")" -type f -delete || die
+	fi
+
+	if ! use static-libs ; then
+		find "${ED}" -name "*.la" -type f -delete || die
+	fi
+
+	if use doc ; then
+		dohtml doc/html/*
+	fi
+
+	if use vim-syntax ; then
+		insinto /usr/share/vim/vimfiles/ftdetect
+		doins libdns.vim
+	fi
+	
+	einfo
+	elog "Install net-dns/ldns-utils if you want drill"
+	einfo
+}