Bump

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

4 files changed, 93 insertions, 23 deletions

diff --git a/www-servers/gatling/ChangeLog b/www-servers/gatling/ChangeLog
index 5554aac28081..df6a19b96292 100644
--- a/www-servers/gatling/ChangeLog
+++ b/www-servers/gatling/ChangeLog
@@ -1,6 +1,12 @@
 # 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.11 2012/04/10 02:58:04 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/gatling/ChangeLog,v 1.12 2012/11/05 07:01:34 patrick Exp $
+
+*gatling-0.13 (05 Nov 2012)
+
+  05 Nov 2012; Patrick Lauer <patrick@gentoo.org>
+  +files/gatling-0.13-compile.patch, +gatling-0.13.ebuild:
+  Bump
 
   10 Apr 2012; Sebastian Pipping <sping@gentoo.org> gatling-0.12-r2.ebuild,
   +files/gatling-0.12-compile.patch:
@@ -59,4 +65,3 @@
   12 May 2008; Maximilian Gaß <mxey@cloudconnected.org +gatling-0.9.ebuild,
   +files/gentoo-vars.patch, +metadata.xml:
   New Ebuild for bug 221841
-
diff --git a/www-servers/gatling/Manifest b/www-servers/gatling/Manifest
index a8fe1f9f0f86..6b14f0ed52b8 100644
--- a/www-servers/gatling/Manifest
+++ b/www-servers/gatling/Manifest
@@ -1,21 +1,14 @@
------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 1559 RMD160 4ec7f582ba094028dde792ebc5c7b4d175566b4d SHA1 519ba5dc4348f19ed78f8856d43b94d9e81eee17 SHA256 21594cf5f83dbd1a2feb1e57faa0a97569605ef07e2d4c593bdcd79fbac621ac
-EBUILD gatling-0.12.ebuild 1311 RMD160 47ed51824a7ea3eeafe336190a1f50f0728eca0e SHA1 412667deb08522bd21e4462d1de179759f5bc5d3 SHA256 881c3b4033e3be4ae1b77182bacdc845eb24c57e81885927ec45eccdc2d6539d
-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-----
+AUX gatling-0.12-FLAGS.patch 929 SHA256 d5a2e6d2c0fb97dde0c00d9cc9df365a2481f75cef72da14f6e0eb5b6ca8d733 SHA512 16cacf1ed419cce70fd5e10a2c21c29bd42d0522aa446e3629930527e7fe6bd9ee5dfa98e238216c882d16d20f8bfc9693c2c8c2c7fefc124b7d863a4dc3b696 WHIRLPOOL 8272b036acd37717d88657dd71362fbddd54339e1455e2ea1269aa445f8d6caafe303f9617f360658e074b5ffe899c6ebc137e0d80b54d558806a14db2fbbdea
+AUX gatling-0.12-compile.patch 764 SHA256 fa6918b662dfcb626b049a16298c0598692f81fac86083403d11341fb4f2a81f SHA512 c734018a9c052ae3cb79e86be2229c222079d87665a32e5de679df9e12361ba2f023043b6ec73506788bbdb00e8a8f7a97a90f779ca12ff93abf96a91144e580 WHIRLPOOL 0b330a922308624e1a938f4c6d6d9600eb2312813b2b52c87471b1e128fc6d4560c0d4b9fc0d670c052af5e6c10489f871ed5fb5571af0e92efe6c7df24285c6
+AUX gatling-0.13-compile.patch 323 SHA256 5717ef91effb298a2b1733bd3ad79e61eaa9fab01838b9e862699b761e116850 SHA512 86cf97e2100ac3836a6ce9d2f35779aa0480adcd82fb25f60c27db103faeeaa835f89d90872c5a91b46a8946b93e3ecf67285089a9af6114af3a8ddde708b2b7 WHIRLPOOL 16c9ca81fee63e3cf39dba12ae5a6734c6069f61417f0bd7b551f60c2287cfb0011c607cfe3050430a6484bccedafb53126d5e20f33e30327d2dc5cdfc0d807d
+AUX gatling.confd 659 SHA256 278ee92229263cf7cff919795e099ec22e6696cf9790fc805601ca38929f1d8e SHA512 e903cd9afbb575226c6de0da8ad673d4650a53cac7442505422c98c32a00457f3d48f2853355cd76ea0f83671cb973ddf90df900d86a15172291317109481fb3 WHIRLPOOL 6b15188843076525d00512682e0125637d74b8cfa7ae7f05f05538bbbef496af7cd0c37b9f795a66ea9b49083669cc366b33bc30dd19582ee503c9d0fe076dd5
+AUX gatling.initd 2029 SHA256 9a7184a37c2dae7019814b05dc03ff36ca0327479b712d8f2d72d0894aab5923 SHA512 31a8764e696a2ea0a21aeebf35d12964c3bee717c2a93489929faa1c9f8619fea736c348b7de57e80e098aeadee90dd12bfbf8d66359a073cb1e07d868153729 WHIRLPOOL 62d04096ed28c61720ea3e35f10e9618cce600c6d0a92ed7e0940533042d2438dd6973900e8ca73b56b21b7c1879198940f1bbad84d589e716f00cbbddfb4acc
+AUX gatling.initd-2 1969 SHA256 d6a712b6360628fa5262526743da9ae69f34ebb4af48061c3eb82bde43306a5c SHA512 6df4d850172afcbbe10f7f50bf6f4108a0e6492271cf8df00dcb5944530ca5a89df1257176494b777f2230ebb6a5cd0cf14f01d692887b03c912d264d648cc03 WHIRLPOOL 162d69fdc7106a0a3095234f6a3d38c76e12e385590d7ed7c73c66f74167ee7c2d86bf55b034070aa4bd7920df998aebb6d0e35b2eb38ef24553cdd46eb3da26
+DIST gatling-0.12.tar.bz2 99540 SHA256 ffe4dbff99404eb80e6aac215fdf6bf8174355edc33dd1848a51fc1093296a7c
+DIST gatling-0.13.tar.bz2 108128 SHA256 b42145fdf7b66602fa8bc64661c2762172f6d33dbd9d53efebf821cd81e89245 SHA512 b9fa604aa8bb8c5d40d9c3eaaa536ed5e73d0ed93eccb41ca4744316ad893dc6fe92fe2c1f0247de82d4eda63b0ab7ab338355d9963fb58f23d39a2c678a1db8 WHIRLPOOL c9d90bec09cf07bc506bd84491d550834d48e0e3b19b2e7095ab43a4a3cd7a182fc1660d5a5cef878f1e1a7b3d367c5e76efc75df77269ab89d64c73c2af7a59
+EBUILD gatling-0.12-r1.ebuild 1373 SHA256 831e3058e58c53a238de97fa9a7b584328c22c8b9616daf75d74aa1c460df9ae SHA512 bf46e1ceae18f2ca5a72b26cb34e0caf7c8b8abd2147f3495bb7fa1346cd06c4d64de5770bd5de6aec1a171ac26075443a45f0e5d8457aa1d4232c445c9ec04b WHIRLPOOL 34b2ee920b16641a73e58173325fdc9978ca81fab2e11a595b7b4a111b44d2071149da30bbdafb81643bb45d2bc0ba822f8b4c8390a6e8d834476977764646f5
+EBUILD gatling-0.12-r2.ebuild 1559 SHA256 21594cf5f83dbd1a2feb1e57faa0a97569605ef07e2d4c593bdcd79fbac621ac SHA512 6d1239d3e57f9588b1c890c4a6387122692343758bde11c1276449d9178e6193ae2cf79483858c3d3ed195747d28d84de9a31f1ea5c2bcc7b8771d11cd108dae WHIRLPOOL 23dce5347957fa19bc297ba74fb8a10ea381fd9cfaa008fc301fc1708705f4c54789e69b66cc72b99c6b2c23baaab059e8989bff615a316804e409111f353bc2
+EBUILD gatling-0.12.ebuild 1311 SHA256 881c3b4033e3be4ae1b77182bacdc845eb24c57e81885927ec45eccdc2d6539d SHA512 c2f8f90b8077c86e3ba8f9ad50fc008d8855fcbbacf0201e8051cffbbc3b57307fdcb041ec953dd1bdc6148467983f3b0b02750dd81363864140b10491786fc2 WHIRLPOOL 9fc02b2ef03bddff997dfe1f0e233e7fdc58c9a92a3b565ddc4d554059546d1ea48f4fd1381edbd3ebb04952e08cb9967bae80fab7d7ec5d0f55d4fcdd56d1dc
+EBUILD gatling-0.13.ebuild 1558 SHA256 1e170946d835342b238fd316bbb53e7754171cbfea4c35b3f460ae53700810f3 SHA512 4cba04a41514a77e3793294c20fa58b6a4ca2b8741ba2d124421e51cb76be80b216f68940fe50c99bbfea79a15a00cb3cbe175871d11a2a216671aa9185db764 WHIRLPOOL d65e0818f19f23e39789ea75f24de0574e25e16588729c25a213123dc5637c67164513fd33e40fae1e9bea422cc7dee7808163d304d20d8838421019196e84c4
+MISC ChangeLog 2313 SHA256 eda06c7f77657e2a7ece4a2b0a60b19b4f3d73a3d41041ff1ebee35298e34b0c SHA512 806319e8853d255a5b60336ec7c707d5bec4f0ccd0d337bed7eb129c14eaed386d455c6644ba10481eb0e496b63bb5dd151c8d6ae837f0b8e4e9ab3d753ad76c WHIRLPOOL d8cc98258705b635103cf34c8c2f53ef3ae32524826aed80118c34121f1aaeb9c1c8633aa8b97d0b86d2e1e50706fb7abbfcd20f95ca165bbac570babfc16542
+MISC metadata.xml 513 SHA256 d931aff3d1d8c0a91b58530e0148e4ecd442172977f3c8c4888a7cf2ac978a64 SHA512 18cc00d3dfbbe51029863ad3c9305364a62757a905e7ccf5f59c303951adff9e09b3c094d238ceb2a765caa5f5165e2868c93f52353637aa397b1ecfac12ad44 WHIRLPOOL d78b19bb1da408f431a0fa4cc9910d4c87e387ed71aa625e7188dc45a6e985e5aa15012a4082c8301829b281d2cd512846376eb08e54becf9d9edcaeefbe288a
diff --git a/www-servers/gatling/files/gatling-0.13-compile.patch b/www-servers/gatling/files/gatling-0.13-compile.patch
new file mode 100644
index 000000000000..7b4d44af9c09
--- /dev/null
+++ b/www-servers/gatling/files/gatling-0.13-compile.patch
@@ -0,0 +1,11 @@
+--- 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
diff --git a/www-servers/gatling/gatling-0.13.ebuild b/www-servers/gatling/gatling-0.13.ebuild
new file mode 100644
index 000000000000..3d45b597d7a2
--- /dev/null
+++ b/www-servers/gatling/gatling-0.13.ebuild
@@ -0,0 +1,61 @@
+# 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.13.ebuild,v 1.1 2012/11/05 07:01:34 patrick 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"
+REQUIRED_USE="ssl? ( !diet )"
+
+DEPEND=">=dev-libs/libowfat-0.25[diet=]
+	diet? ( dev-libs/dietlibc )
+	ssl? ( dev-libs/openssl )"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	rm Makefile  # leaves us with GNUmakefile
+	epatch "${FILESDIR}/${P}-compile.patch"
+}
+
+src_compile() {
+	local DIET=
+	use diet && DIET='/usr/bin/diet'
+
+	local targets='gatling'
+	use ssl && targets+=' tlsgatling'
+
+	emake DIET="${DIET}" CC="$(tc-getCC)" \
+			CFLAGS="${CFLAGS} -I/usr/include/libowfat" \
+			LDFLAGS="${LDFLAGS}" prefix=/usr ${targets} \
+			|| die "emake ${targets} failed"
+}
+
+src_install() {
+	doman gatling.1 || die "installing manpage failed"
+
+	newconfd "${FILESDIR}/gatling.confd" gatling || die
+	newinitd "${FILESDIR}/gatling.initd-2" gatling || die
+	dodoc README.{ftp,http} || die "installing docs failed"
+
+	dobin gatling || die "installing gatling binary failed"
+	use ssl && {
+		dodoc README.tls || die "installing docs failed"
+		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}
+}