www-servers/gatling: Unbreak diet mode (bug #314115)

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

4 files changed, 51 insertions, 12 deletions

diff --git a/www-servers/gatling/ChangeLog b/www-servers/gatling/ChangeLog
index 3dd759f9b4fb..5554aac28081 100644
--- a/www-servers/gatling/ChangeLog
+++ b/www-servers/gatling/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-servers/gatling
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/gatling/ChangeLog,v 1.10 2012/03/22 00:39:53 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/gatling/ChangeLog,v 1.11 2012/04/10 02:58:04 sping Exp $
+
+  10 Apr 2012; Sebastian Pipping <sping@gentoo.org> gatling-0.12-r2.ebuild,
+  +files/gatling-0.12-compile.patch:
+  Unbreak diet mode (bug #314115)
 
 *gatling-0.12-r2 (22 Mar 2012)
 
diff --git a/www-servers/gatling/Manifest b/www-servers/gatling/Manifest
index 485ec718fea7..a8fe1f9f0f86 100644
--- a/www-servers/gatling/Manifest
+++ b/www-servers/gatling/Manifest
@@ -1,10 +1,21 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX gatling-0.12-FLAGS.patch 929 RMD160 18b3ad9c44433a28fb8995cf2e13abd866af7630 SHA1 b44ed6f5e46f10397b736aed27f9527fae532f69 SHA256 d5a2e6d2c0fb97dde0c00d9cc9df365a2481f75cef72da14f6e0eb5b6ca8d733
+AUX gatling-0.12-compile.patch 764 RMD160 b282c99501afc172a1fd83b0c0153d79b3024d44 SHA1 f53a61b306ed5988a4eab5dce27c5c2dee724324 SHA256 fa6918b662dfcb626b049a16298c0598692f81fac86083403d11341fb4f2a81f
 AUX gatling.confd 659 RMD160 b90b117fba954b2743fa43d813e2bf673c9e27b9 SHA1 0d3b68d58908ab55f113e63c31b29fcef8ab694a SHA256 278ee92229263cf7cff919795e099ec22e6696cf9790fc805601ca38929f1d8e
 AUX gatling.initd 2029 RMD160 0e201c41590bc716563f45be2e959272f2ca498c SHA1 12d0aaaf5b7d15286cea13310a8da54172d3c1e4 SHA256 9a7184a37c2dae7019814b05dc03ff36ca0327479b712d8f2d72d0894aab5923
 AUX gatling.initd-2 1969 RMD160 e3793c23a2cad3374ad001fdbf898179752efe25 SHA1 9949eb538f297baf24da2799eb5f83183c86eb4c SHA256 d6a712b6360628fa5262526743da9ae69f34ebb4af48061c3eb82bde43306a5c
 DIST gatling-0.12.tar.bz2 99540 RMD160 c4d0288fae752a4da86f5ad88f51c60a9086a3b1 SHA1 7397f3df9806f8cee3f92c7aa0d8f34a1593644d SHA256 ffe4dbff99404eb80e6aac215fdf6bf8174355edc33dd1848a51fc1093296a7c
 EBUILD gatling-0.12-r1.ebuild 1373 RMD160 9b24a1f14cf261d30621bcfeb488736df3f5e49c SHA1 d421e49e49202d15df09d3ee6b343f2ff356f098 SHA256 831e3058e58c53a238de97fa9a7b584328c22c8b9616daf75d74aa1c460df9ae
-EBUILD gatling-0.12-r2.ebuild 1377 RMD160 a0324c158dce8bc45c4df369bb639987c45e0094 SHA1 fc748167bcadddb630b61d5fef9d8639aa52610d SHA256 ac43577ae44e7b389579d20e90cb8b4f38e88db39ab520c8c43b351b566e8c62
+EBUILD gatling-0.12-r2.ebuild 1559 RMD160 4ec7f582ba094028dde792ebc5c7b4d175566b4d SHA1 519ba5dc4348f19ed78f8856d43b94d9e81eee17 SHA256 21594cf5f83dbd1a2feb1e57faa0a97569605ef07e2d4c593bdcd79fbac621ac
 EBUILD gatling-0.12.ebuild 1311 RMD160 47ed51824a7ea3eeafe336190a1f50f0728eca0e SHA1 412667deb08522bd21e4462d1de179759f5bc5d3 SHA256 881c3b4033e3be4ae1b77182bacdc845eb24c57e81885927ec45eccdc2d6539d
-MISC ChangeLog 2020 RMD160 bd4ca104af716cb6b6fa2a9f1fd7cbdd06f99c34 SHA1 29309f7b32d2c411f517c750bab1f71de85c1289 SHA256 9931151396d1ae55ad4903202ae388bee7d212f07e8d19b1fb42d937313c5eae
+MISC ChangeLog 2166 RMD160 ae7d9f6bad430e1fbaf4b9456a91c824b2cca226 SHA1 38a752c8c46f64d3da05db424a239c5abf52b206 SHA256 09af9533b7bfcccf3fc11424667218db7adfe131e247356f0abdafdef91b4410
 MISC metadata.xml 513 RMD160 da5842f5671b1123c522d510d52ced38f4911e5b SHA1 d24b9ac3ce5bddcb3b421a1287376bdfe2d4e5a0 SHA256 d931aff3d1d8c0a91b58530e0148e4ecd442172977f3c8c4888a7cf2ac978a64
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iEYEARECAAYFAk+DoaIACgkQsAvGakAaFgBBdACglRoQ4vKmiQxo3dTGtkNKVZmv
+uqgAn13lYGpsU5jurLDoPf27gr/7CNRr
+=ShWo
+-----END PGP SIGNATURE-----
diff --git a/www-servers/gatling/files/gatling-0.12-compile.patch b/www-servers/gatling/files/gatling-0.12-compile.patch
new file mode 100644
index 000000000000..db609836332b
--- /dev/null
+++ b/www-servers/gatling/files/gatling-0.12-compile.patch
@@ -0,0 +1,20 @@
+--- GNUmakefile	2012-04-10 04:31:14.505474482 +0200
++++ GNUmakefile	2012-04-10 04:31:53.821982958 +0200
+@@ -64,7 +64,7 @@
+ acc: acc.c
+ 	$(CC) -o $@ $< $(CFLAGS) $(LDFLAGS) -lowfat
+ 
+-CC:=$(DIET) $(CC)
++override CC:=$(DIET) $(CC)
+ 
+ pthreadbench: pthreadbench.o
+ 	$(CC) $< -o $@ -I. $(CFLAGS) $(LDFLAGS) $(LDLIBS) -lpthread
+@@ -80,7 +80,7 @@
+ $(OBJS) https.o gatling.o: gatling.h version.h gatling_features.h
+ 
+ tlsgatling: gatling.c ssl.o $(HTTPS_OBJS)
+-	-$(CC) -o $@ gatling.c ssl.o $(HTTPS_OBJS) $(CFLAGS) -DSUPPORT_HTTPS $(LDFLAGS) -lssl -lcrypto $(LDLIBS)
++	$(CC) -o $@ gatling.c ssl.o $(HTTPS_OBJS) $(CFLAGS) -DSUPPORT_HTTPS $(LDFLAGS) -lssl -lcrypto $(LDLIBS)
+ 
+ gatling: gatling.o $(OBJS) md5lib
+ 	$(CC) $(LDFLAGS) $@.o $(OBJS) -o $@ $(LDLIBS) `cat md5lib`
diff --git a/www-servers/gatling/gatling-0.12-r2.ebuild b/www-servers/gatling/gatling-0.12-r2.ebuild
index be08408c7466..a90e15ab15a9 100644
--- a/www-servers/gatling/gatling-0.12-r2.ebuild
+++ b/www-servers/gatling/gatling-0.12-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/gatling/gatling-0.12-r2.ebuild,v 1.1 2012/03/22 00:39:53 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/gatling/gatling-0.12-r2.ebuild,v 1.2 2012/04/10 02:58:04 sping Exp $
 
 EAPI="4"
 
@@ -15,26 +15,29 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
 IUSE="ssl diet"
+REQUIRED_USE="ssl? ( !diet )"
 
-DEPEND=">=dev-libs/libowfat-0.25
+DEPEND=">=dev-libs/libowfat-0.25[diet=]
 	diet? ( dev-libs/dietlibc )
 	ssl? ( dev-libs/openssl )"
 RDEPEND="${DEPEND}"
 
 src_prepare() {
-	rm Makefile  # leaves GNUmakefile
-	epatch "${FILESDIR}/${P}-FLAGS.patch"
+	rm Makefile  # leaves us with GNUmakefile
+	epatch "${FILESDIR}/${P}-compile.patch"
 }
 
 src_compile() {
-	local diet_conf='DIET=env'
-	use diet && diet_conf=
+	local DIET=
+	use diet && DIET='/usr/bin/diet'
 
-	local targets=gatling
+	local targets='gatling'
 	use ssl && targets+=' tlsgatling'
 
-	emake CC="$(tc-getCC)" ${diet_conf} ${targets} \
-		|| die "emake ${targets} failed"
+	emake DIET="${DIET}" CC="$(tc-getCC)" \
+			CFLAGS="${CFLAGS} -I/usr/include/libowfat" \
+			LDFLAGS="${LDFLAGS}" prefix=/usr ${targets} \
+			|| die "emake ${targets} failed"
 }
 
 src_install() {
@@ -46,6 +49,7 @@ src_install() {
 
 	dobin gatling || die "installing gatling binary failed"
 	use ssl && {
+		dodoc README.tls || die "installing docs failed"
 		dobin tlsgatling || die "installing tlsgatling binary failed"
 	}
 }