public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in www-servers/gatling: gatling-0.12-r2.ebuild ChangeLog
@ 2012-03-22  0:39 Patrick Lauer (patrick)
  0 siblings, 0 replies; 2+ messages in thread
From: Patrick Lauer (patrick) @ 2012-03-22  0:39 UTC (permalink / raw
  To: gentoo-commits

patrick     12/03/22 00:39:53

  Modified:             ChangeLog
  Added:                gatling-0.12-r2.ebuild
  Log:
  Init script fixes for #409245
  
  (Portage version: 2.2.0_alpha93/cvs/Linux x86_64)

Revision  Changes    Path
1.10                 www-servers/gatling/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/gatling/ChangeLog?rev=1.10&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/gatling/ChangeLog?rev=1.10&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/gatling/ChangeLog?r1=1.9&r2=1.10

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-servers/gatling/ChangeLog,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ChangeLog	10 Mar 2012 00:30:22 -0000	1.9
+++ ChangeLog	22 Mar 2012 00:39:53 -0000	1.10
@@ -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.9 2012/03/10 00:30:22 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/gatling/ChangeLog,v 1.10 2012/03/22 00:39:53 patrick Exp $
+
+*gatling-0.12-r2 (22 Mar 2012)
+
+  22 Mar 2012; Patrick Lauer <patrick@gentoo.org> +files/gatling.initd-2,
+  +gatling-0.12-r2.ebuild, -files/gentoo-vars.patch:
+  Init script fixes for #409245
 
 *gatling-0.12-r1 (10 Mar 2012)
 



1.1                  www-servers/gatling/gatling-0.12-r2.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/gatling/gatling-0.12-r2.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/gatling/gatling-0.12-r2.ebuild?rev=1.1&content-type=text/plain

Index: gatling-0.12-r2.ebuild
===================================================================
# 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 $

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-2" 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}
}






^ permalink raw reply	[flat|nested] 2+ messages in thread

* [gentoo-commits] gentoo-x86 commit in www-servers/gatling: gatling-0.12-r2.ebuild ChangeLog
@ 2012-04-10  2:58 Sebastian Pipping (sping)
  0 siblings, 0 replies; 2+ messages in thread
From: Sebastian Pipping (sping) @ 2012-04-10  2:58 UTC (permalink / raw
  To: gentoo-commits

sping       12/04/10 02:58:04

  Modified:             gatling-0.12-r2.ebuild ChangeLog
  Log:
  www-servers/gatling: Unbreak diet mode (bug #314115)
  
  (Portage version: 2.1.10.56/cvs/Linux x86_64)

Revision  Changes    Path
1.2                  www-servers/gatling/gatling-0.12-r2.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/gatling/gatling-0.12-r2.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/gatling/gatling-0.12-r2.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/gatling/gatling-0.12-r2.ebuild?r1=1.1&r2=1.2

Index: gatling-0.12-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-servers/gatling/gatling-0.12-r2.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gatling-0.12-r2.ebuild	22 Mar 2012 00:39:53 -0000	1.1
+++ gatling-0.12-r2.ebuild	10 Apr 2012 02:58:04 -0000	1.2
@@ -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 @@
 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 @@
 
 	dobin gatling || die "installing gatling binary failed"
 	use ssl && {
+		dodoc README.tls || die "installing docs failed"
 		dobin tlsgatling || die "installing tlsgatling binary failed"
 	}
 }



1.11                 www-servers/gatling/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/gatling/ChangeLog?rev=1.11&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/gatling/ChangeLog?rev=1.11&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/gatling/ChangeLog?r1=1.10&r2=1.11

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-servers/gatling/ChangeLog,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ChangeLog	22 Mar 2012 00:39:53 -0000	1.10
+++ ChangeLog	10 Apr 2012 02:58:04 -0000	1.11
@@ -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)
 






^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2012-04-10  2:58 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-04-10  2:58 [gentoo-commits] gentoo-x86 commit in www-servers/gatling: gatling-0.12-r2.ebuild ChangeLog Sebastian Pipping (sping)
  -- strict thread matches above, loose matches on Subject: below --
2012-03-22  0:39 Patrick Lauer (patrick)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox