www-servers/gatling: Fix compilation (bug #314115)

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

4 files changed, 80 insertions, 10 deletions

diff --git a/www-servers/gatling/ChangeLog b/www-servers/gatling/ChangeLog
index 80f0fb3da2c7..2c63c73c3223 100644
--- a/www-servers/gatling/ChangeLog
+++ b/www-servers/gatling/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for www-servers/gatling
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/gatling/ChangeLog,v 1.8 2010/08/13 11:20:01 patrick Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/gatling/ChangeLog,v 1.9 2012/03/10 00:30:22 sping Exp $
+
+*gatling-0.12-r1 (10 Mar 2012)
+
+  10 Mar 2012; Sebastian Pipping <sping@gentoo.org> +gatling-0.12-r1.ebuild,
+  metadata.xml:
+  Fix compilation on amd64, make dietlibc optional (bug #314115), allow
+  optional SSL
 
   13 Aug 2010; Patrick Lauer <patrick@gentoo.org> gatling-0.12.ebuild:
   Fixing init.d install quoting so it actually does something. Thanks to
diff --git a/www-servers/gatling/Manifest b/www-servers/gatling/Manifest
index 0bab40ae3a17..bc5a3b211bd1 100644
--- a/www-servers/gatling/Manifest
+++ b/www-servers/gatling/Manifest
@@ -1,20 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 AUX gatling-0.12-FLAGS.patch 929 RMD160 18b3ad9c44433a28fb8995cf2e13abd866af7630 SHA1 b44ed6f5e46f10397b736aed27f9527fae532f69 SHA256 d5a2e6d2c0fb97dde0c00d9cc9df365a2481f75cef72da14f6e0eb5b6ca8d733
 AUX gatling.confd 659 RMD160 b90b117fba954b2743fa43d813e2bf673c9e27b9 SHA1 0d3b68d58908ab55f113e63c31b29fcef8ab694a SHA256 278ee92229263cf7cff919795e099ec22e6696cf9790fc805601ca38929f1d8e
 AUX gatling.initd 2029 RMD160 0e201c41590bc716563f45be2e959272f2ca498c SHA1 12d0aaaf5b7d15286cea13310a8da54172d3c1e4 SHA256 9a7184a37c2dae7019814b05dc03ff36ca0327479b712d8f2d72d0894aab5923
 AUX gentoo-vars.patch 471 RMD160 5ab9be9b889e7b41b887f3844587fabeb3f3f2b2 SHA1 b9bad9e5840962be7adcc44b02239972e55edae3 SHA256 6825dd24fd78309a43309fe22b53e20a0da8d1bcdf2ec99465d9972809c4f0fb
 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.ebuild 1311 RMD160 47ed51824a7ea3eeafe336190a1f50f0728eca0e SHA1 412667deb08522bd21e4462d1de179759f5bc5d3 SHA256 881c3b4033e3be4ae1b77182bacdc845eb24c57e81885927ec45eccdc2d6539d
-MISC ChangeLog 1614 RMD160 e00a30f453a8908fa7f2c3cb69ef0327ccfc5317 SHA1 568c0f5d0e05af65559cc0877e1250690addea1c SHA256 466019f1f25a8f1115ec585a584210dd990e9637aa550299aad0abfa6993cd2a
-MISC metadata.xml 330 RMD160 31e9e6d86e46b003e0d7700a772fe284e96db4bc SHA1 b420cfa4d1334482c61ea609a27d67be5f96e435 SHA256 2f3ffd0126a6aced3a45a27ff7d37fdadade7c58af274b33917b36267526b0d7
+MISC ChangeLog 1825 RMD160 cd1029946c79563ced163ecb78aa7713a6964a3e SHA1 1bd6f7708a09139c95be333cc4a56a2184199d62 SHA256 91d2adcd81c4477d92e7ea43d7de38bc8f94f2d186c360eaeaa60dca717870f9
+MISC metadata.xml 513 RMD160 da5842f5671b1123c522d510d52ced38f4911e5b SHA1 d24b9ac3ce5bddcb3b421a1287376bdfe2d4e5a0 SHA256 d931aff3d1d8c0a91b58530e0148e4ecd442172977f3c8c4888a7cf2ac978a64
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iJwEAQEIAAYFAk59uAkACgkQfXuS5UK5QB3a6wP9Gnn3zx8Re6cUrVxnte0DC76y
-SzhRcTM2yejl68MBAK1EEHItbnVTxWVsBmbZZw4lEAmPFKvMFRuInmOiJcIZaTAw
-nk40LSXwJQVWWsSXRa4LipW1rw+XA5Svv9ftZuhmr0yzwX8nmbUgwQvQEvkTsnN/
-atbVq5ZVhTmaFAgsxB4=
-=nMqt
+iEYEARECAAYFAk9aoIUACgkQsAvGakAaFgARmwCggEc4NV9v4JrnENr4Efrqm5wX
+xtIAoMF4XIexXs0oGbJXNR6IfMtBwPdF
+=Zy6V
 -----END PGP SIGNATURE-----
diff --git a/www-servers/gatling/gatling-0.12-r1.ebuild b/www-servers/gatling/gatling-0.12-r1.ebuild
new file mode 100644
index 000000000000..6d2b085ec626
--- /dev/null
+++ b/www-servers/gatling/gatling-0.12-r1.ebuild
@@ -0,0 +1,57 @@
+# 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-r1.ebuild,v 1.1 2012/03/10 00:30:21 sping Exp $
+
+EAPI="4"
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="High performance web server"
+HOMEPAGE="http://www.fefe.de/gatling/"
+SRC_URI="http://dl.fefe.de/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="ssl diet"
+
+DEPEND=">=dev-libs/libowfat-0.25
+	diet? ( dev-libs/dietlibc )
+	ssl? ( dev-libs/openssl )"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	rm Makefile  # leaves GNUmakefile
+	epatch "${FILESDIR}/${P}-FLAGS.patch"
+}
+
+src_compile() {
+	local diet_conf='DIET=env'
+	use diet && diet_conf=
+
+	local targets=gatling
+	use ssl && targets+=' tlsgatling'
+
+	emake CC="$(tc-getCC)" ${diet_conf} ${targets} \
+		|| die "emake ${targets} failed"
+}
+
+src_install() {
+	doman gatling.1 || die "installing manpage failed"
+
+	newconfd "${FILESDIR}/gatling.confd" gatling || die
+	newinitd "${FILESDIR}/gatling.initd" gatling || die
+	dodoc README.{ftp,http} || die "installing docs failed"
+
+	dobin gatling || die "installing gatling binary failed"
+	use ssl && {
+		dobin tlsgatling || die "installing tlsgatling binary failed"
+	}
+}
+
+pkg_setup() {
+	ebegin "Creating gatling user and group"
+	enewgroup gatling
+	enewuser ${PN} -1 -1 /var/www/localhost ${PN}
+}
diff --git a/www-servers/gatling/metadata.xml b/www-servers/gatling/metadata.xml
index eb6e7802d36f..34daeb2fc29c 100644
--- a/www-servers/gatling/metadata.xml
+++ b/www-servers/gatling/metadata.xml
@@ -9,4 +9,11 @@
 		<email>vostorga@gentoo.org</email>
 		<name>Víctor Ostorga</name>
 	</maintainer>
+	<maintainer>
+		<email>sping@gentoo.org</email>
+		<name>Sebastian Pipping</name>
+	</maintainer>
+	<use>
+		<flag name="diet">Compile against <pkg>dev-libs/dietlibc</pkg></flag>
+	</use>
 </pkgmetadata>