Version bumped. Respect CFLAGS=-O? again, bug #369339.

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

6 files changed, 53 insertions, 121 deletions

diff --git a/net-dns/ldns-utils/ChangeLog b/net-dns/ldns-utils/ChangeLog
index 2b684af3ae4d..01b95e384026 100644
--- a/net-dns/ldns-utils/ChangeLog
+++ b/net-dns/ldns-utils/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-dns/ldns-utils
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/ldns-utils/ChangeLog,v 1.12 2011/10/06 14:41:11 chainsaw Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-dns/ldns-utils/ChangeLog,v 1.13 2012/01/11 15:25:31 matsuu Exp $
+
+*ldns-utils-1.6.12 (11 Jan 2012)
+
+  11 Jan 2012; MATSUU Takuto <matsuu@gentoo.org> +files/1.6.12-cflags.patch,
+  -ldns-utils-1.6.4.ebuild, -ldns-utils-1.6.9.ebuild,
+  -ldns-utils-1.6.10.ebuild, +ldns-utils-1.6.12.ebuild:
+  Version bumped. Respect CFLAGS=-O? again, bug #369339. Removed old versions.
 
   06 Oct 2011; Tony Vroon <chainsaw@gentoo.org> ldns-utils-1.6.11.ebuild:
   Marked stable on AMD64 based on arch testing by Agostino "ago" Sarubbo & Ian
diff --git a/net-dns/ldns-utils/Manifest b/net-dns/ldns-utils/Manifest
index 33ff384902e8..b6dcf7ad66b2 100644
--- a/net-dns/ldns-utils/Manifest
+++ b/net-dns/ldns-utils/Manifest
@@ -2,20 +2,27 @@
 Hash: SHA1
 
 AUX 1.6.10-cflags.patch 1044 RMD160 105817256bc0c14be4e123df2ec3b61de7d8ca77 SHA1 084ee9ec380cce8814cbaba51e56ffd9e9dcd072 SHA256 21b2b4d1f960d51d93775424309987f14498ca8827281628400af82ed478e8b9
-DIST ldns-1.6.10.tar.gz 999717 RMD160 0401368c96c5b1ae9a781ee4c9441652a5e86af5 SHA1 7798a32c6f50a4fb7d56ddf772163dc1cb79c1a4 SHA256 a421aa71230045e0d22a97db8c4ffbc049ee06b064de141912da270db7217a8f
+AUX 1.6.12-cflags.patch 938 RMD160 dd4843c241a6f334dd4ab43eb24323013e3f748b SHA1 acde86b445e235b850718559938e6e7bd57234c3 SHA256 cf964d5abdd921acf539b6d8185e99def2f43aff47d2d1489b87cd2b342dc8e9
 DIST ldns-1.6.11.tar.gz 1018369 RMD160 7580869e4b8bdd2d31cb08cb690c2e3d0663f381 SHA1 2c4537eee39a1af63e8dde4f35498ce78c968c1f SHA256 6891b8ea8e9ded3e7d2caaaf494a8c2459bab729cdd1716f6db2ba375f628888
-DIST ldns-1.6.4.tar.gz 895432 RMD160 1c9d78c01bc8ba6825cdc56b0be81236015e9ebd SHA1 9015968ad3ddd015c750c15b60e60b9cccd393ec SHA256 ad4d0142a84463ea646571656254694b5325545bc12bbb238358a0506e6eeb05
-DIST ldns-1.6.9.tar.gz 984563 RMD160 525fc08801500681257342e8789f0afc813b2b28 SHA1 30d136792433bef44454dc1c70bf55449160c3ad SHA256 13a0b666ba391920e1e584b773ccb07f5f2227020763b4777689b9bb635b871e
-EBUILD ldns-utils-1.6.10.ebuild 1419 RMD160 3301245556d96ff8864912f993afad02bde641c0 SHA1 96c044dd374ecb5ec0a4851d2abca6ee7a010e4f SHA256 efcafb0da0d91b268e9ae732f2231a7abacc4c28676fcf1e08b23c5eed62f17c
+DIST ldns-1.6.12.tar.gz 1057607 RMD160 e6497be1abef97239726eef6872dba42f7f69d65 SHA1 1d61df0f666908551d5a62768f77d63e727810aa SHA256 b966787510a169ca0ed78f9a8a5de01fb309909575e721ead92095d4677aa51c
 EBUILD ldns-utils-1.6.11.ebuild 1420 RMD160 d0eddc53a3ea5bafddb4ebe4c765550f77bf4d97 SHA1 9630a01b0ad24bb169b7550abb8be5c17d7f5d48 SHA256 682e0456a5d2e2b6e00796845aae40490e8b37680d3e3f90157953743914def7
-EBUILD ldns-utils-1.6.4.ebuild 1255 RMD160 55427f62a9c94d6e161beeaab0b776752b1a76da SHA1 98c885bb329b45028229b3c7eb0acb37361006e4 SHA256 7b94d25e6a0485a88bf1bbed93a546f086501e42711d8ba1e11a81e153fc6970
-EBUILD ldns-utils-1.6.9.ebuild 1304 RMD160 d45e4d9e28fc30089903471c9938fc0acd6b2e41 SHA1 108a126bf3e5b54daf04be5cb4391e8dd7045793 SHA256 a52ca5d50f623fcc3f55ae959dac540c1d1d880d3f4d212f6a4e30b4598792bc
-MISC ChangeLog 2156 RMD160 403e77eb289de0256854836183d517999cd2483c SHA1 cdc2b5d0eff96d27655baa2ff0c3d33b37dc5325 SHA256 f5e38289e38d321eb09170d579d76ae738832928f4c5d3becc4c6134e5a687be
+EBUILD ldns-utils-1.6.12.ebuild 1468 RMD160 511d2c2fe10c9c236146a6be2fff9d7c96dd3e0a SHA1 caaa2fc6072f3bceefba77ce714e37e3c29d14d3 SHA256 d0e5df5a67ded5e6693231248c89fac2514d7404c59ded0590d7534a2edf04a7
+MISC ChangeLog 2455 RMD160 c58eea710ab8c8a13723cb83a721b1ffcd286704 SHA1 70a5fdc9f352f9bbd570cc4a3084eb760f0197d4 SHA256 d3b0c4323955ba449bdac8a1034d6156a5a72dc37823de7ce50795dbe3da60d4
 MISC metadata.xml 522 RMD160 4f1173d7ac98d44d8f82029285ed669a5323823c SHA1 ea1b07b44f442429cff45dfbccfee89a5f644845 SHA256 624abeb470d3376958e49dce8675f024b4c56ec50171805fa212fee6a496a920
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk6NvhQACgkQp5vW4rUFj5o0hgCfZulATIFiwkheoWZb/VwJdsJE
-JgEAoK4MiO+EGh2kZwzFYMCfuKhPfb/P
-=h3us
+iQIcBAEBAgAGBQJPDanwAAoJECaGw+YFKA1pUhAP/2txoh7kGX30Dlbj44KnI+wl
+lTdJ+DoUl2b7v1CDeKi8kn+O/sAfJkbyIUPZoYZlkA90ZpH2x155RJaDrBOOvY3l
+4FUgbh+3MMPVJHrlckw8WSTACyiJntkEqui7RsLCIgh/6A3PU+EWMK+m2fNj+aUt
+ryQ3f2fhJjWbL9+vgIa34vqNAyCuUcQg3QCv/fmoTeQh1FvXHt0JLpz+yl2Quj5x
+bej8CV3vLGg/+7czuVooqqMZKsDlkU+DCj+YD20eGWVpXRSaj9e8EXocw3tWmy3A
+l8KhTySH4pZDfBi+Dix2DTFIdw1O81QEdoITQ1Da3Pt/UF2RjuNHT8ZVNsqOQSZ0
+2P2djABUSnIZowWvRnVJHvBrcPBoaAoGYppVByBbSvC04jGDEDRCBxoUspvdt49Y
+Ry97WkO/W5OgugIB1ji/5pRCvHB/x6gfG2FqELruUBVGtIrR7s9ONMl8qVkzeusr
+/5y5JjWBCbTIg08QD9gVF7h5CF/Cdwu4D8gHYn2mjvVjxwGOJroFsPPOq78cpp6N
+VxkPxmKUiXVgeOCwIWQjcBzNEpz4hoxWTGHvn2+bP8IHYZ4WIlF0sn2OhU3iILPP
+PjF4bOaz42DKqs/nVnT1/z2rlGGcULHAjTtjY2Y7R3HrkIcC1EpSmq0i0sshI5FU
+a50hGvW1+dOmYP3kDfG+
+=8ZPb
 -----END PGP SIGNATURE-----
diff --git a/net-dns/ldns-utils/files/1.6.12-cflags.patch b/net-dns/ldns-utils/files/1.6.12-cflags.patch
new file mode 100644
index 000000000000..5e14a20ad37c
--- /dev/null
+++ b/net-dns/ldns-utils/files/1.6.12-cflags.patch
@@ -0,0 +1,22 @@
+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.10.ebuild b/net-dns/ldns-utils/ldns-utils-1.6.12.ebuild
index ea12affcd641..ea10ded60b03 100644
--- a/net-dns/ldns-utils/ldns-utils-1.6.10.ebuild
+++ b/net-dns/ldns-utils/ldns-utils-1.6.12.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/ldns-utils/ldns-utils-1.6.10.ebuild,v 1.1 2011/06/01 23:06:31 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/ldns-utils/ldns-utils-1.6.12.ebuild,v 1.1 2012/01/11 15:25:31 matsuu Exp $
 
 EAPI="3"
 inherit autotools eutils
@@ -23,9 +23,10 @@ S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
 	# bug #369339
-	epatch "${FILESDIR}/${PV}-cflags.patch"
+	epatch "${FILESDIR}/1.6.12-cflags.patch"
 
-	eautoreconf
+	( cd drill && eautoreconf )
+	( cd examples && eautoreconf )
 }
 
 src_configure() {
diff --git a/net-dns/ldns-utils/ldns-utils-1.6.4.ebuild b/net-dns/ldns-utils/ldns-utils-1.6.4.ebuild
deleted file mode 100644
index 290b4736ae7f..000000000000
--- a/net-dns/ldns-utils/ldns-utils-1.6.4.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/ldns-utils/ldns-utils-1.6.4.ebuild,v 1.3 2010/03/11 18:57:20 hwoarang Exp $
-
-EAPI="2"
-
-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 x86"
-IUSE="examples ssl"
-
-DEPEND=">=net-libs/ldns-${PV}[ssl?]
-	examples? ( net-libs/libpcap )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	cd "${S}"/drill
-	econf $(use_with ssl) || die
-
-	if use examples; then
-		cd "${S}"/examples
-		econf \
-			$(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
-
-	if use examples; then
-		cd "${S}"/examples
-		emake DESTDIR="${D}" install || die "emake install for examples failed"
-		newdoc README README.examples
-	fi
-}
diff --git a/net-dns/ldns-utils/ldns-utils-1.6.9.ebuild b/net-dns/ldns-utils/ldns-utils-1.6.9.ebuild
deleted file mode 100644
index e526ecb6f53f..000000000000
--- a/net-dns/ldns-utils/ldns-utils-1.6.9.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/ldns-utils/ldns-utils-1.6.9.ebuild,v 1.1 2011/03/26 03:03:28 matsuu Exp $
-
-EAPI="2"
-
-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 ~x86"
-IUSE="examples gost ssl"
-
-DEPEND=">=net-libs/ldns-${PV}[gost?,ssl?]
-	examples? ( net-libs/libpcap )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-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
-}