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

(Portage version: 2.1.10.44/cvs/Linux x86_64)

5 files changed, 36 insertions, 111 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/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
-}