| 1 |
sping 12/04/10 02:58:04 |
| 2 |
|
| 3 |
Modified: gatling-0.12-r2.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
www-servers/gatling: Unbreak diet mode (bug #314115) |
| 6 |
|
| 7 |
(Portage version: 2.1.10.56/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.2 www-servers/gatling/gatling-0.12-r2.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/gatling/gatling-0.12-r2.ebuild?rev=1.2&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/gatling/gatling-0.12-r2.ebuild?rev=1.2&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/gatling/gatling-0.12-r2.ebuild?r1=1.1&r2=1.2 |
| 15 |
|
| 16 |
Index: gatling-0.12-r2.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/www-servers/gatling/gatling-0.12-r2.ebuild,v |
| 19 |
retrieving revision 1.1 |
| 20 |
retrieving revision 1.2 |
| 21 |
diff -u -r1.1 -r1.2 |
| 22 |
--- gatling-0.12-r2.ebuild 22 Mar 2012 00:39:53 -0000 1.1 |
| 23 |
+++ gatling-0.12-r2.ebuild 10 Apr 2012 02:58:04 -0000 1.2 |
| 24 |
@@ -1,6 +1,6 @@ |
| 25 |
# Copyright 1999-2012 Gentoo Foundation |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/www-servers/gatling/gatling-0.12-r2.ebuild,v 1.1 2012/03/22 00:39:53 patrick Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/www-servers/gatling/gatling-0.12-r2.ebuild,v 1.2 2012/04/10 02:58:04 sping Exp $ |
| 29 |
|
| 30 |
EAPI="4" |
| 31 |
|
| 32 |
@@ -15,26 +15,29 @@ |
| 33 |
KEYWORDS="~amd64 ~x86" |
| 34 |
|
| 35 |
IUSE="ssl diet" |
| 36 |
+REQUIRED_USE="ssl? ( !diet )" |
| 37 |
|
| 38 |
-DEPEND=">=dev-libs/libowfat-0.25 |
| 39 |
+DEPEND=">=dev-libs/libowfat-0.25[diet=] |
| 40 |
diet? ( dev-libs/dietlibc ) |
| 41 |
ssl? ( dev-libs/openssl )" |
| 42 |
RDEPEND="${DEPEND}" |
| 43 |
|
| 44 |
src_prepare() { |
| 45 |
- rm Makefile # leaves GNUmakefile |
| 46 |
- epatch "${FILESDIR}/${P}-FLAGS.patch" |
| 47 |
+ rm Makefile # leaves us with GNUmakefile |
| 48 |
+ epatch "${FILESDIR}/${P}-compile.patch" |
| 49 |
} |
| 50 |
|
| 51 |
src_compile() { |
| 52 |
- local diet_conf='DIET=env' |
| 53 |
- use diet && diet_conf= |
| 54 |
+ local DIET= |
| 55 |
+ use diet && DIET='/usr/bin/diet' |
| 56 |
|
| 57 |
- local targets=gatling |
| 58 |
+ local targets='gatling' |
| 59 |
use ssl && targets+=' tlsgatling' |
| 60 |
|
| 61 |
- emake CC="$(tc-getCC)" ${diet_conf} ${targets} \ |
| 62 |
- || die "emake ${targets} failed" |
| 63 |
+ emake DIET="${DIET}" CC="$(tc-getCC)" \ |
| 64 |
+ CFLAGS="${CFLAGS} -I/usr/include/libowfat" \ |
| 65 |
+ LDFLAGS="${LDFLAGS}" prefix=/usr ${targets} \ |
| 66 |
+ || die "emake ${targets} failed" |
| 67 |
} |
| 68 |
|
| 69 |
src_install() { |
| 70 |
@@ -46,6 +49,7 @@ |
| 71 |
|
| 72 |
dobin gatling || die "installing gatling binary failed" |
| 73 |
use ssl && { |
| 74 |
+ dodoc README.tls || die "installing docs failed" |
| 75 |
dobin tlsgatling || die "installing tlsgatling binary failed" |
| 76 |
} |
| 77 |
} |
| 78 |
|
| 79 |
|
| 80 |
|
| 81 |
1.11 www-servers/gatling/ChangeLog |
| 82 |
|
| 83 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/gatling/ChangeLog?rev=1.11&view=markup |
| 84 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/gatling/ChangeLog?rev=1.11&content-type=text/plain |
| 85 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/gatling/ChangeLog?r1=1.10&r2=1.11 |
| 86 |
|
| 87 |
Index: ChangeLog |
| 88 |
=================================================================== |
| 89 |
RCS file: /var/cvsroot/gentoo-x86/www-servers/gatling/ChangeLog,v |
| 90 |
retrieving revision 1.10 |
| 91 |
retrieving revision 1.11 |
| 92 |
diff -u -r1.10 -r1.11 |
| 93 |
--- ChangeLog 22 Mar 2012 00:39:53 -0000 1.10 |
| 94 |
+++ ChangeLog 10 Apr 2012 02:58:04 -0000 1.11 |
| 95 |
@@ -1,6 +1,10 @@ |
| 96 |
# ChangeLog for www-servers/gatling |
| 97 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
| 98 |
-# $Header: /var/cvsroot/gentoo-x86/www-servers/gatling/ChangeLog,v 1.10 2012/03/22 00:39:53 patrick Exp $ |
| 99 |
+# $Header: /var/cvsroot/gentoo-x86/www-servers/gatling/ChangeLog,v 1.11 2012/04/10 02:58:04 sping Exp $ |
| 100 |
+ |
| 101 |
+ 10 Apr 2012; Sebastian Pipping <sping@g.o> gatling-0.12-r2.ebuild, |
| 102 |
+ +files/gatling-0.12-compile.patch: |
| 103 |
+ Unbreak diet mode (bug #314115) |
| 104 |
|
| 105 |
*gatling-0.12-r2 (22 Mar 2012) |
Archives