Respect CFLAGS (again, bug #369607).

(Portage version: 2.2.0_alpha43/cvs/Linux x86_64)

5 files changed, 15 insertions, 143 deletions

diff --git a/net-analyzer/argus-clients/ChangeLog b/net-analyzer/argus-clients/ChangeLog
index 7bf78846855e..d389f1dba1ef 100644
--- a/net-analyzer/argus-clients/ChangeLog
+++ b/net-analyzer/argus-clients/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-analyzer/argus-clients
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/argus-clients/ChangeLog,v 1.24 2011/07/06 14:58:31 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/argus-clients/ChangeLog,v 1.25 2011/07/06 15:26:07 jer Exp $
+
+*argus-clients-3.0.4.1-r2 (06 Jul 2011)
+
+  06 Jul 2011; Jeroen Roovers <jer@gentoo.org>
+  +argus-clients-3.0.4.1-r2.ebuild, -argus-clients-3.0.5.6.ebuild,
+  -argus-clients-3.0.5.11.ebuild, -argus-clients-3.0.5.14.ebuild,
+  argus-clients-3.0.5.16.ebuild:
+  Respect CFLAGS (again, bug #369607).
 
 *argus-clients-3.0.5.16 (06 Jul 2011)
 
diff --git a/net-analyzer/argus-clients/argus-clients-3.0.5.6.ebuild b/net-analyzer/argus-clients/argus-clients-3.0.4.1-r2.ebuild
index 49580cae84b6..35a04db46ec8 100644
--- a/net-analyzer/argus-clients/argus-clients-3.0.5.6.ebuild
+++ b/net-analyzer/argus-clients/argus-clients-3.0.4.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/argus-clients/argus-clients-3.0.5.6.ebuild,v 1.2 2011/06/01 00:50:30 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/argus-clients/argus-clients-3.0.4.1-r2.ebuild,v 1.1 2011/07/06 15:26:07 jer Exp $
 
 EAPI="2"
 
@@ -37,10 +37,7 @@ DEPEND="
 "
 
 src_prepare() {
-	for x in $(find . -name "Makefile.in"); do
-		sed -i "s:\$(CFLAGS):& \$(LDFLAGS) :" $x
-	done
-	epatch "${FILESDIR}"/${PN}-3.0.4.1-disable-tcp-wrappers-automagic.patch
+	epatch "${FILESDIR}"/${P}-disable-tcp-wrappers-automagic.patch
 	eautoreconf
 }
 
@@ -54,12 +51,12 @@ src_configure() {
 }
 
 src_compile() {
-	emake  CCOPT="${CFLAGS} ${LDFLAGS}" || die "emake failed"
+	emake CCOPT="${CFLAGS} ${LDFLAGS}" || die "emake failed"
 }
 
 src_install() {
 	# argus_parse.a and argus_common.a are supplied by net-analyzer/argus
-	dobin bin/ra* || die "Failed to install ra*"
+	dobin bin/ra* radium/radium || die "Failed to install ra*"
 	dodoc ChangeLog CREDITS README doc/{CHANGES,FAQ,HOW-TO} || die
 	doman man/man{1,5}/*
 }
diff --git a/net-analyzer/argus-clients/argus-clients-3.0.5.11.ebuild b/net-analyzer/argus-clients/argus-clients-3.0.5.11.ebuild
deleted file mode 100644
index a3fa55289f10..000000000000
--- a/net-analyzer/argus-clients/argus-clients-3.0.5.11.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/argus-clients/argus-clients-3.0.5.11.ebuild,v 1.2 2011/06/01 00:50:30 jer Exp $
-
-EAPI="2"
-
-inherit autotools eutils
-
-DESCRIPTION="Clients for net-analyzer/argus"
-HOMEPAGE="http://www.qosient.com/argus/"
-SRC_URI="http://qosient.com/argus/dev/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="debug geoip mysql tcpd"
-
-#sasl? ( >=dev-libs/cyrus-sasl-1.5.24 )
-MY_CDEPEND="
-	net-libs/libpcap
-	net-analyzer/rrdtool[perl]
-	geoip? ( dev-libs/geoip )
-	mysql? ( virtual/mysql )
-	sys-libs/ncurses
-"
-
-#	>=net-analyzer/argus-2.0.6[sasl?]"
-RDEPEND="
-	${MY_CDEPEND}
-	>=net-analyzer/argus-3.0.2
-"
-
-DEPEND="
-	${MY_CDEPEND}
-	>=sys-devel/bison-1.28
-	>=sys-devel/flex-2.4.6
-"
-
-src_prepare() {
-	for x in $(find . -name "Makefile.in"); do
-		sed -i "s:\$(CFLAGS):& \$(LDFLAGS) :" $x
-	done
-	epatch "${FILESDIR}"/${PN}-3.0.4.1-disable-tcp-wrappers-automagic.patch
-	eautoreconf
-}
-
-src_configure() {
-	use debug && touch .debug
-	#	$(use_with sasl) \
-	econf \
-		$(use_with geoip GeoIP /usr/) \
-		$(use_with tcpd wrappers) \
-		$(use_with mysql)
-}
-
-src_compile() {
-	emake  CCOPT="${CFLAGS} ${LDFLAGS}" || die "emake failed"
-}
-
-src_install() {
-	# argus_parse.a and argus_common.a are supplied by net-analyzer/argus
-	dobin bin/ra* || die "Failed to install ra*"
-	dodoc ChangeLog CREDITS README doc/{CHANGES,FAQ,HOW-TO} || die
-	doman man/man{1,5}/*
-}
diff --git a/net-analyzer/argus-clients/argus-clients-3.0.5.14.ebuild b/net-analyzer/argus-clients/argus-clients-3.0.5.14.ebuild
deleted file mode 100644
index 770f8c1bc6da..000000000000
--- a/net-analyzer/argus-clients/argus-clients-3.0.5.14.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/argus-clients/argus-clients-3.0.5.14.ebuild,v 1.1 2011/06/17 04:06:28 jer Exp $
-
-EAPI="2"
-
-inherit autotools eutils
-
-DESCRIPTION="Clients for net-analyzer/argus"
-HOMEPAGE="http://www.qosient.com/argus/"
-SRC_URI="http://qosient.com/argus/dev/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="debug geoip mysql tcpd"
-
-#sasl? ( >=dev-libs/cyrus-sasl-1.5.24 )
-MY_CDEPEND="
-	net-libs/libpcap
-	net-analyzer/rrdtool[perl]
-	geoip? ( dev-libs/geoip )
-	mysql? ( virtual/mysql )
-	sys-libs/ncurses
-"
-
-#	>=net-analyzer/argus-2.0.6[sasl?]"
-RDEPEND="
-	${MY_CDEPEND}
-	>=net-analyzer/argus-3.0.2
-"
-
-DEPEND="
-	${MY_CDEPEND}
-	>=sys-devel/bison-1.28
-	>=sys-devel/flex-2.4.6
-"
-
-src_prepare() {
-	for x in $(find . -name "Makefile.in"); do
-		sed -i "s:\$(CFLAGS):& \$(LDFLAGS) :" $x
-	done
-	epatch "${FILESDIR}"/${PN}-3.0.4.1-disable-tcp-wrappers-automagic.patch
-	eautoreconf
-}
-
-src_configure() {
-	use debug && touch .debug
-	#	$(use_with sasl) \
-	econf \
-		$(use_with geoip GeoIP /usr/) \
-		$(use_with tcpd wrappers) \
-		$(use_with mysql)
-}
-
-src_compile() {
-	emake  CCOPT="${CFLAGS} ${LDFLAGS}" || die "emake failed"
-}
-
-src_install() {
-	# argus_parse.a and argus_common.a are supplied by net-analyzer/argus
-	dobin bin/ra* || die "Failed to install ra*"
-	dodoc ChangeLog CREDITS README doc/{CHANGES,FAQ,HOW-TO} || die
-	doman man/man{1,5}/*
-}
diff --git a/net-analyzer/argus-clients/argus-clients-3.0.5.16.ebuild b/net-analyzer/argus-clients/argus-clients-3.0.5.16.ebuild
index ef919d783f80..88ad80587dd5 100644
--- a/net-analyzer/argus-clients/argus-clients-3.0.5.16.ebuild
+++ b/net-analyzer/argus-clients/argus-clients-3.0.5.16.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/argus-clients/argus-clients-3.0.5.16.ebuild,v 1.1 2011/07/06 14:58:31 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/argus-clients/argus-clients-3.0.5.16.ebuild,v 1.2 2011/07/06 15:26:07 jer Exp $
 
 EAPI="2"
 
@@ -37,9 +37,6 @@ DEPEND="
 "
 
 src_prepare() {
-	for x in $(find . -name "Makefile.in"); do
-		sed -i "s:\$(CFLAGS):& \$(LDFLAGS) :" $x
-	done
 	epatch "${FILESDIR}"/${PN}-3.0.4.1-disable-tcp-wrappers-automagic.patch
 	eautoreconf
 }
@@ -54,7 +51,7 @@ src_configure() {
 }
 
 src_compile() {
-	emake  CCOPT="${CFLAGS} ${LDFLAGS}" || die "emake failed"
+	emake CCOPT="${CFLAGS} ${LDFLAGS}" || die "emake failed"
 }
 
 src_install() {