Respect CFLAGS/LDFLAGS.

Package-Manager: portage-2.2.0_alpha168/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

5 files changed, 37 insertions, 54 deletions

diff --git a/net-analyzer/httping/ChangeLog b/net-analyzer/httping/ChangeLog
index 2f21df33c3c3..0150fe7b3d79 100644
--- a/net-analyzer/httping/ChangeLog
+++ b/net-analyzer/httping/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/httping
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/httping/ChangeLog,v 1.94 2013/03/20 18:11:23 vincent Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/httping/ChangeLog,v 1.95 2013/03/20 18:13:35 jer Exp $
+
+  20 Mar 2013; Jeroen Roovers <jer@gentoo.org> +files/httping-2.0-flags.patch,
+  -httping-1.6.ebuild, httping-2.0.ebuild:
+  Respect CFLAGS/LDFLAGS.
 
   20 Mar 2013; Vicente Olivert Riera <vincent@gentoo.org> httping-1.5.8.ebuild:
   amd64, ppc64, x86 stable, wrt bug #462512
diff --git a/net-analyzer/httping/Manifest b/net-analyzer/httping/Manifest
index 73183d2560a4..14441c53947e 100644
--- a/net-analyzer/httping/Manifest
+++ b/net-analyzer/httping/Manifest
@@ -3,12 +3,12 @@ Hash: SHA256
 
 AUX httping-1.5.5-help.patch 473 SHA256 44c810fb3fdd1cfa62ef9975fa5fb20d7599c8256727e7e4203adba03f13c776 SHA512 85f431c6f856efeaac559aa415de2d7b135c2701e95ea0076663b793b7e77ea5c1800331ea864d4f234a9995654402a3aee07524fe2db37b87257f78e7b171c8 WHIRLPOOL 12955e90fa063216fd203e530bea675e66aefcccfe3c8e28cb721d2273369e2b29d9617719300683d359e1e1f789b1b583f706d82d69aee0f45f0d3719d06b67
 AUX httping-1.5.6-help.patch 269 SHA256 e5c54049e818ceabb80157bdb96bdef9ad13c5ea8f5981aba9acd3bde0c8d4ba SHA512 a91dcd0dc4e1cdee147344bc9e0a7ccf0683574f9404aa0d4922b87ebd8a8f9a8280be58f855b93e2794898c1a68bd9ce46f6419566bacb21095db6215aba101 WHIRLPOOL 4b87cd1cff46789b282ab988394a26e76e61811e4d94af42bedc0154272bfe1ae67ddd824c2012f24fb3827719c88954c4aeaeac764517bbdb16b8113912c37e
+AUX httping-2.0-flags.patch 347 SHA256 a4d029432583cfc9ba2a1c1ee9c69907ff610c3b755c5899214ce31254188bdf SHA512 fa92643a460b7ec51a86bf38bd111f50a2f8f9069695a7a68a2fa944bb08ba37b68fc7203b309dc883f07a33e81b70db3d5ce4ba7131bb5fc69dcd4fef157a9d WHIRLPOOL d53ea00e09358f04ec7ebc7f6bfd6c9e25aa97e7f8f7801f5927bb3ce0db3113d28807c71835a4edeef47aa6932d15b706147bc1a14b9a4137638362b3cf636d
 DIST httping-1.5.3.tgz 15363 SHA256 b03f7ae129c09e646cb9c7e46eaebf3ce12f28514614637c26b06b34c5d61a93 SHA512 4d6fb5624d41f792358b8ed015a64ee956e7d34aa909589e8eccccdc108e41feccb9276f823aa6ee5793fe9735652adba400000c5c3625122d5812b110fff96b WHIRLPOOL 3e32abec0aa3e2841967ee77d1fe876eb59a20bdae9b74138bc79173514eec4e7027131aa27b936834d3267ef1c282dc424c38cd17fb22aabec3acb0f1e3a31a
 DIST httping-1.5.5.tgz 15828 SHA256 113aa78fb2398d2be2e09fc8bf19fbaff1c0f854d5858a67fcdce6dccdb4dbb8 SHA512 028d7e07ab3efe82e48325595820158f55639da8358dad5fc8ffec75b365d1b520f069055fc0aa0e75177778c445769edf10cf8de011355a1a0086502f522e38 WHIRLPOOL b6d7518bacd3469abddf4425a1f17f2db300195373e7b0f5ff264f1eb3a2dc4b19fb4b79d3278f79a4d9128099915ab4e3b39f9d1fcc8e5277113b7472d5c208
 DIST httping-1.5.6.tgz 16335 SHA256 97932df03b942e2edbaad747a7df1517a5f25434cceb563a8055e713f09a36d7 SHA512 4c407a70e84d22a077d01109fcc480c931d3f30113539b21f9db8816aa0a7f587d73bf60d808f238b04099b0571165313f4b40eb34597ce247bbb1a4a01ab8a7 WHIRLPOOL 7777cfad461d4d418eb03798351f6f8f5d10809c252ecab95d32eb4eb44d117ca4be76e24148e50d92283d755b0986ea166dd8fe922921b7d1d43a0b1cd1417a
 DIST httping-1.5.7.tgz 16295 SHA256 b0d3d3e9708b7395b0c47c1c1cfdd17613e631360eaffd1c43edc599911e7411 SHA512 5e91c5fa1a8a7d90b32867ee545a64e3da45b19e37f6c53f26412571614206e48e75306e24961e69071d733dce9c9b80dd3addc2da768ef337af9a34b3f1999b WHIRLPOOL a305d3bd8579075388695c07ecfd49a0fd84e17ce816ddd9d46729e8a17db9fc963213ff6e74439aebcfa9c5d099165f067f86c10ecac1d92fa047be82f3c279
 DIST httping-1.5.8.tgz 16971 SHA256 f4c1d216349d308f5d5cfe2840ee4fe75b767bf76b49ba3dc140be55db5947bf SHA512 80a4e75f1c0bfba5a7584c09a5aeae339b8ae5c25f1165938ba3b1fabb675be0b4d8c064554253ba5eb7e140267beb31271dc521381f399aa29ce52f15e4b208 WHIRLPOOL f415b31252a10704a6ff6ff3d23ba76e7bf35df9f08ec82b30857b6d67042e3bee169190f5a9733561bfab937969144eb222327d3300a155bfdd7ff0501af6d2
-DIST httping-1.6.tgz 18429 SHA256 ac98e013a0b476804e2f6df8f8fb3d889646633d3b326d8355a5592d27477534 SHA512 913974cf143fa1cbf133bb519b1b5f33f29e65021b175e19a07c84ad270bfb2c6e86e470411e68069b0d6629dfe3c1d9b6b07bd170adc49ca1fe2441a3926a47 WHIRLPOOL b427033b199f42526d331a09b51bc544625ad0af45dfc77b9e1312c33943d1c9f11c790282fe7ecd2dd45ef243a8dec8bc830a3e24d564aa257e0bd357e089b4
 DIST httping-2.0.tgz 22375 SHA256 9fcb1fef706d12149ce88dec5a3e03888d1386a80017324104453130eaeffbe0 SHA512 255ce40fbbaebc840d490438d74b8e68a92938bd9ecc3d9671bf881f44352ffa84748ad244ff5f2a6b9fd702be5ba3d1ee7c8e4baa08ed3ef78749401a785477 WHIRLPOOL 09216799269deb87a52304b3594758e21be3e1d9c578c77e1c0e96561d4916e3fd70ab18bc139352381cd3e7875ccc93411a044391b1331c9b28867236dc0c16
 EBUILD httping-1.5.3.ebuild 798 SHA256 bf3278a6d82c8bee8dd373b38f50dfb82f0b0fa48decfdbdd6aca5fac05cc2ae SHA512 0f6df3fc3df8a031072cf3af5f31ecffe40399ddc2544b4b82def8ea4fe0b20704e21b129b1c31a483b082b453e4c7c85e0463b96a2743c00e2f2f9b8d271a20 WHIRLPOOL ccb8d6e97bb2223349c81f1bdf126e4143be1543c161a44647a6d0ec73424c257779bd555fc3b8a8b0b316df545bc32db5e4446a5136a8dfed529274a74f7060
 EBUILD httping-1.5.5-r1.ebuild 999 SHA256 62af2060d5ed46716bf9bfa5aeb0d16c5ba7cae74ee432aac6c18a3f53434b84 SHA512 87b356fce4ab0dc9acd619f63c6d72f75a23af95e99bd2811cd17ae16c4b11e146550f96f14f27b75e536b7c893f85b805b900e040c571e0d91ac9ff33b4a8aa WHIRLPOOL 6fe8d96da89615a3468207ef1a0bd218b0ded0753db6b4808dca4107899b30fd7cd3e6f02fd000452d0344b12eee57fb964e802eb581cd338b8fa6cee71e4c7a
@@ -16,14 +16,13 @@ EBUILD httping-1.5.5.ebuild 947 SHA256 e3163bf08a8f9a962084cb383b0b22a4ca9b1f404
 EBUILD httping-1.5.6.ebuild 996 SHA256 5bfdc18a868e0ecfada7a8ac5553e3186f3325462b719addcad28a51d3cdaba3 SHA512 33add81a2467f16509adecec2d9174de9fd4eb3f13a4f61cafdc97fa1ec8d49e9a50f8c7b101a45d15d936b317d96927f2251e00d03907fce9322c60e2682186 WHIRLPOOL d11d3ea13ff81826ed62206152c4cc6a9e613458bd85c54b00e5315d8ef5b7ee6a5fa950197d5a54e7b7fac8d11265fec0d5fc256e8ad1c21f5e90a3f287b716
 EBUILD httping-1.5.7.ebuild 950 SHA256 dbed73866d7c07538f0c39733209ec35459ea57db0bd40259666fcbbefc53d59 SHA512 e9a3ce44cae85bc659fed960727a1a79af4fd2dad5028e3a98d356d715b60f14845256afc6749aab4136a7b896f0a57574688f8507b6e931f97e06794be12239 WHIRLPOOL 26d67ab2fcd5bbe585ba5b4edb390f08bff1dcfefef9e177bd2a9a6b42fb0053d5f5c7245f3cc7b7a270ab2cc32cb4b3773aef8517edbf9471adae7a14657d8d
 EBUILD httping-1.5.8.ebuild 969 SHA256 e852739459b1b5b610381b97acbc729c1dae085f2749b07142e6ba528f9a4297 SHA512 b77d4f083355a620e5937c8cd30bbd371370525bd2cc5647b797201c51111a50823d80d2ac6d566f5e4920da349e6b535b3e554583449f430520bf444b290fc4 WHIRLPOOL 1f854abf6096966fbf44064cae0c9a0b0e62c1bc55b03fede157ea8c88e9f2f45243089268ba9e5328548a5c9220a214b0996af4b138f3f364a5e0ec9a165f36
-EBUILD httping-1.6.ebuild 966 SHA256 bb15ebbbc4db2822951d64d6438aac2d0e55a7e126087011d714ddec923bc56b SHA512 5c2a453ef4da3308d792bc4d0caf56844032cccec7bbdfa2e1997811664141afd74c5243d8441e337220d391d6d09a74d8cf1ea563c8b6996cb9f7c9fc0dd9ec WHIRLPOOL ea087006c0bd81e47b1de9e9fc7b218677c3949e68c2751807c327b60d1f13708537cb81dfc7dd7cfe23d710ba4ba58a6f76c3a22d890adc3d4923c4dcf32857
-EBUILD httping-2.0.ebuild 966 SHA256 f0417ae9edd0be0fb6e65bb74e53fa1e301c57cb6598ad030a3e012892314ec1 SHA512 80bc88e03856acfa1ef619e2ea090000547e454dee30f565c3d2744651ae004de37456fbeecf441eb2dff95e2d5757d6decc68a6f22cae4117b436e98a208a8b WHIRLPOOL 8d9dd216c77fdab53086e55ef22c867469c1e1bf8b36f36c7e91cda1cf994b2815bc8666ad7a96b662a3c82eae054d7342fa27c19d70013c9a37ad768092006e
-MISC ChangeLog 11772 SHA256 9ca6f38d6446892f686486e5e05f7403a809d37f6da35cff9a42f82e58435f5d SHA512 d0a62685569dbcc9c848096bfb2d8f16c8b7204478e8c7244979fac5700951889fbadaffadecad8f7edf506ddc61f07f73213c80c47ece23e7280da894008108 WHIRLPOOL c214cb9f7914e13d1ebc2a9b28323264b61cffc120743236ce6a1f97e63a844047bf46db9fc923a8f027c8a4f869afc797bd6ddcace77e42c7bce1e2f8eddcc8
+EBUILD httping-2.0.ebuild 967 SHA256 6c9a85b4803f1a8f91f40f9fce311c19a4fa1384ebc787a3441c3298a2d46cbb SHA512 16db6e1974602a170202fc489f0264f3683bd41f68bd19bcb16594ebcc181e5a43b62f469af5a02a1982f2ba3b398f1ffed394194a2b0e5da1f8b298a04e5e91 WHIRLPOOL 8e3a4f7e3090fa282b7f9c91c6c17d375301fc0b5ec824806be4d20b5202249df8d5498ee50ab455b14e815a8757d24c7d0cedbad7aa44fe696d7b71d0a007f2
+MISC ChangeLog 11917 SHA256 d5bdd6851b9c86581c1b46311c0b0d70bd4bc84c5a4f3fce2e6f0961c1f51324 SHA512 ef340ff3e3005eec4dcf4694aed2b9b93d0bd859580d99d98de78093a2c1a3b18095bcfa7af9394ffc31456e3ed1e881ee069d11461917a8bb821bb489fdd7dc WHIRLPOOL dfb4f79a77ae620e1784ca59015c91ba6e8d61746ff491ff546af8f587d5e7b9807c69e18a9d613c74c6af0312bc6ccaf34c38a928b886b6df05aaeb9c82bdf5
 MISC metadata.xml 229 SHA256 bac702da2eadc933a602245b251cba8621cb903739245ef1de3ba32deac0ca20 SHA512 ba0c05c9884517f166325367e5ede29b29b770f006d4ef804008df0a4f6bb59ff73ee59a6b13a85fd2f3fb070c2c25b7ce896fdda2e978770640becb692442a4 WHIRLPOOL 0e37622329981203106c6379836d2846d4c1e757988d9fba5bfff414cff4df81e3c5bf32b3fe5933ac26c71e503e994d5393b3e6aaae4abde275fd9d19a3cafe
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlFJ+yQACgkQWunnsum7y6jLgACdH8OF/aF0NmTms36KArrQh0LY
-slgAn2U6qyLF7iCM60NM8XpRbk67AA/C
-=TDNK
+iEYEAREIAAYFAlFJ/FAACgkQVWmRsqeSphPFyQCdE18F+jTufLNy/TtgYrDI5VdY
+xtQAn1bUjyiMlcrA4MU8FamINuXHWkwC
+=dy+p
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/httping/files/httping-2.0-flags.patch b/net-analyzer/httping/files/httping-2.0-flags.patch
new file mode 100644
index 000000000000..43f553c69668
--- /dev/null
+++ b/net-analyzer/httping/files/httping-2.0-flags.patch
@@ -0,0 +1,23 @@
+--- a/Makefile
++++ b/Makefile
+@@ -18,9 +18,8 @@
+ 
+ DEBUG=yes
+ WFLAGS=-Wall -W
+-OFLAGS=-O3
+ CFLAGS+=$(WFLAGS) $(OFLAGS) -DVERSION=\"$(VERSION)\"
+-LDFLAGS=-lm
++LDFLAGS+=-lm
+ 
+ PACKAGE=$(TARGET)-$(VERSION)
+ PREFIX=/usr
+@@ -60,8 +59,7 @@
+ endif
+ 
+ ifeq ($(DEBUG),yes)
+-CFLAGS+=-D_DEBUG -ggdb
+-LDFLAGS+=-g
++CFLAGS+=-D_DEBUG
+ endif
+ 
+ ifeq ($(ARM),yes)
diff --git a/net-analyzer/httping/httping-1.6.ebuild b/net-analyzer/httping/httping-1.6.ebuild
deleted file mode 100644
index 61d7f6b10a5e..000000000000
--- a/net-analyzer/httping/httping-1.6.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/httping/httping-1.6.ebuild,v 1.1 2013/03/20 17:06:56 jer Exp $
-
-EAPI=5
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="http protocol ping-like program"
-HOMEPAGE="http://www.vanheusden.com/httping/"
-SRC_URI="http://www.vanheusden.com/${PN}/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="debug ssl tfo"
-
-RDEPEND="
-	>=sys-libs/ncurses-5
-	ssl? ( dev-libs/openssl )
-"
-DEPEND="${RDEPEND}"
-
-# This would bring in test? ( dev-util/cppcheck ) but unlike
-# upstream we should only care about compile/run time testing
-RESTRICT="test"
-
-src_prepare() {
-	sed -i "/^OFLAGS/d" Makefile || die
-}
-
-src_compile() {
-	emake \
-		CC="$(tc-getCC)" \
-		SSL=$(usex ssl) \
-		TFO=$(usex tfo) \
-		DEBUG=$(usex debug)
-}
-
-src_install() {
-	dobin httping
-	doman httping.1
-	dodoc readme.txt
-}
diff --git a/net-analyzer/httping/httping-2.0.ebuild b/net-analyzer/httping/httping-2.0.ebuild
index 8fd55e028f99..daebabc2dbc6 100644
--- a/net-analyzer/httping/httping-2.0.ebuild
+++ b/net-analyzer/httping/httping-2.0.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/httping/httping-2.0.ebuild,v 1.1 2013/03/20 17:06:56 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/httping/httping-2.0.ebuild,v 1.2 2013/03/20 18:13:35 jer Exp $
 
 EAPI=5
-inherit flag-o-matic toolchain-funcs
+inherit eutils toolchain-funcs
 
 DESCRIPTION="http protocol ping-like program"
 HOMEPAGE="http://www.vanheusden.com/httping/"
@@ -25,7 +25,7 @@ DEPEND="${RDEPEND}"
 RESTRICT="test"
 
 src_prepare() {
-	sed -i "/^OFLAGS/d" Makefile || die
+	epatch "${FILESDIR}"/${PN}-2.0-flags.patch
 }
 
 src_compile() {