Respect CFLAGS (again, bug #369607).

Package-Manager: portage-2.2.0_alpha43/cvs/Linux x86_64

6 files changed, 21 insertions, 154 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/Manifest b/net-analyzer/argus-clients/Manifest
index 4e3551925f35..53e53b2b74ab 100644
--- a/net-analyzer/argus-clients/Manifest
+++ b/net-analyzer/argus-clients/Manifest
@@ -4,22 +4,17 @@ Hash: SHA1
 AUX argus-clients-3.0.4.1-disable-tcp-wrappers-automagic.patch 593 RMD160 c580427e8e96dd304a03a0f8dc10085ef4754f69 SHA1 7de3d0a3b694eecb974625d6003fe4385ab104a6 SHA256 660ffa757355cc450f646248bc324fa66038582466eb10985f4521e19bed0509
 DIST argus-clients-3.0.3.8.tar.gz 1845431 RMD160 905317357a7f34eb72a8a0cbf02cfca0db7b119f SHA1 832c3dfe53762bd7f26b50c7ed8ba1286bd782ed SHA256 6ed9d0cb00ae836bcc06e0aa70fd51704e644bfdc86b4edb7912e7e170bb4074
 DIST argus-clients-3.0.4.1.tar.gz 2116531 RMD160 0c2d86765d97221c1cdd07df4b7303ae2602c7f1 SHA1 346c7b5b77abd64c28300341cff14432aa729040 SHA256 c56cb81cc9a898f638cacd9973b43fd01e0dcca3b8c7fcaa8b8c5d0456b8b581
-DIST argus-clients-3.0.5.11.tar.gz 2165574 RMD160 a9421fcb5d7f6b46f811d291d4b9f3dcce63c14e SHA1 a056ac04e4482b8e1c708400c6a90a9b34e2136d SHA256 32917bf901c054a6ef4d325ff5a98f9f42c69d8def78e2f66c81c8c736cbb330
-DIST argus-clients-3.0.5.14.tar.gz 2290807 RMD160 30914dd75cbc64c5c9273d00313d2608fc8be793 SHA1 87ba43aa75bdfa1409454f482a1daf699b8bc7a6 SHA256 3898737e90ad9d875bd1e3902884a949359f305254bdf096738d793638165d9d
 DIST argus-clients-3.0.5.16.tar.gz 2167460 RMD160 2b3173824802f028cd0149df2cb895b721baf4e8 SHA1 a5a84bee339651bb70049aee5424d1593654ad02 SHA256 85c4a233def39ef95a5dec9610c1631d1d0b4744fe12921b53e01ec90f928bf6
-DIST argus-clients-3.0.5.6.tar.gz 2131579 RMD160 5d0506b90d789b733548e1dd148a772e16974547 SHA1 a8a15dcdcd3d5ec9bb85eb8c98df12ff86195225 SHA256 ae58a43bd5a0bb5ac9dd0a9ac111a91e206392da72ef9a39692ea459eecc3a0e
 EBUILD argus-clients-3.0.3.8.ebuild 1338 RMD160 34fe568ba34680866d2c366bd1c599f42e8e57e2 SHA1 ccd0ef868eaf32146a5d9cf76f4d14dcedef02f7 SHA256 5399c5f22b75bc5333bbd7aa0afbb0637dd99ec102c1c632ca75ef94b2c043c3
 EBUILD argus-clients-3.0.4.1-r1.ebuild 1505 RMD160 1fde0a7cd7bd270254b7c62316022c4c52fd2054 SHA1 a668a020e2254bd44ba6af0cb7db369431706d55 SHA256 cb8271333be2cd71d706ebc6480e409b46cd519f915b65bf30c26f02e99423da
-EBUILD argus-clients-3.0.5.11.ebuild 1495 RMD160 d7269f81336fea09920de346c70832122552fc64 SHA1 44664ea20263ee0ebd5de2ce2c2f24cdcbe0ad00 SHA256 478fb06f1439280fbd816c0b9c12190e8847e179d2bfdd1493100b38b9025884
-EBUILD argus-clients-3.0.5.14.ebuild 1495 RMD160 86a325ef29a3014734ab79a153875dd395411476 SHA1 9f81f784a25fa02e147e627cbfd7c612675610c0 SHA256 410d0906de722fc805323825d5a73f1bbe9949c6e07a4f5b9c78ff6f77f31a99
-EBUILD argus-clients-3.0.5.16.ebuild 1495 RMD160 808f4d3f7c1cdce1b70588a58f52970aa54578f7 SHA1 7e5308d51de0da977a0a04586831176281d27d0e SHA256 17847c66d266891afb9b101302598d2860fde7bc259c85e91e44122d45be37db
-EBUILD argus-clients-3.0.5.6.ebuild 1494 RMD160 405cc7fb7777fdc2c6309b9ef1926e55de1ec927 SHA1 475f1710c9fdb644842936e1d48442f1fdc2fa2b SHA256 d5d9a3acc54a81240feb52f324e29670b1f9cfd7c086f6305a87c03c14f8bb3f
-MISC ChangeLog 4035 RMD160 dc87bc20f237392eeea946117dfc9a0b12385ef4 SHA1 3f337f22941e26abb530298ec6e8d0b4cea36332 SHA256 9a028b719df7af89760f835eb1715bc110f95c24ad1f769759fd2c6ee85e68bf
+EBUILD argus-clients-3.0.4.1-r2.ebuild 1408 RMD160 3d7d6b5d98ae60b4aca4450dd973dce781c0acea SHA1 e0c6ff431ec1e9f64dbc8a306cba3f2a1ffd7dee SHA256 99ff058956d495fb37d3019fa37713255a7dd9784674384d25f545494ea66d22
+EBUILD argus-clients-3.0.5.16.ebuild 1401 RMD160 d8c8a30408072bddc5c01101b95ebed463ff8c00 SHA1 250f778d0313a74c460198b665879ace65283195 SHA256 de8882598ef534e3cf4bc3337161506644dbf46cdae0fcada8adc976c2e0c6ea
+MISC ChangeLog 4329 RMD160 ec96e2422b8da1be4cb6c927ef2455ba26e8336b SHA1 90e32dab26a113476d96861adce828021042d229 SHA256 f43f1d63478414e37c987cfcfe4a595fe108026bb327919ee2433786bf354f8e
 MISC metadata.xml 159 RMD160 28e799fe0fd02aaab9d4bbe5595f133101606f5b SHA1 9f5df3eabd621951a959cc8e0e2e0d352cd1fe1e SHA256 b75c711bd971e46f0ec957e833c60879b0c5023e0bb94409a6255781b69f6dc6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk4UeB0ACgkQVWmRsqeSphPwZwCeJNkypuom7cnbjE/1vdQuG7V7
-KVEAn2zH85CeF86ciWABK2JzGlMXFnvB
-=6ing
+iEYEARECAAYFAk4UfpUACgkQVWmRsqeSphOpKQCeOEkCeY6RQcqFTE73/OwwpzjX
+APwAn0eeapQ6bemtXzCc1AY3KA/cKqTn
+=2s5v
 -----END PGP SIGNATURE-----
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() {