Fix live ebuild. Add separate USE-flag for JIT and also fix the libpcre depend

(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key B427ABC8)

4 files changed, 40 insertions, 18 deletions

diff --git a/net-proxy/haproxy/ChangeLog b/net-proxy/haproxy/ChangeLog
index 7cdace7099b8..fbeec0f5a62d 100644
--- a/net-proxy/haproxy/ChangeLog
+++ b/net-proxy/haproxy/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-proxy/haproxy
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/haproxy/ChangeLog,v 1.108 2014/10/19 09:11:44 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/haproxy/ChangeLog,v 1.109 2014/10/30 21:37:30 idl0r Exp $
+
+  30 Oct 2014; Christian Ruppert <idl0r@gentoo.org> haproxy-1.5.6.ebuild,
+  haproxy-9999.ebuild, metadata.xml:
+  Fix live ebuild. Add separate USE-flag for JIT and also fix the libpcre
+  depend
 
 *haproxy-1.5.6 (19 Oct 2014)
 
diff --git a/net-proxy/haproxy/haproxy-1.5.6.ebuild b/net-proxy/haproxy/haproxy-1.5.6.ebuild
index b05542b766a1..b65b8e2f7264 100644
--- a/net-proxy/haproxy/haproxy-1.5.6.ebuild
+++ b/net-proxy/haproxy/haproxy-1.5.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/haproxy/haproxy-1.5.6.ebuild,v 1.1 2014/10/19 09:11:44 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/haproxy/haproxy-1.5.6.ebuild,v 1.2 2014/10/30 21:37:30 idl0r Exp $
 
 EAPI="5"
 
@@ -15,9 +15,11 @@ SRC_URI="http://haproxy.1wt.eu/download/$(get_version_component_range 1-2)/src/$
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="+crypt examples +pcre ssl tools vim-syntax +zlib"
+IUSE="+crypt examples +pcre pcre-jit ssl tools vim-syntax +zlib"
 
-DEPEND="pcre? ( dev-libs/libpcre )
+DEPEND="pcre? ( dev-libs/libpcre
+				pcre-jit? ( dev-libs/libpcre[jit] )
+				)
 	ssl? ( dev-libs/openssl[zlib?] )
 	zlib? ( sys-libs/zlib )"
 RDEPEND="${DEPEND}"
@@ -31,7 +33,7 @@ pkg_setup() {
 
 src_prepare() {
 	sed -e 's:@SBINDIR@:'/usr/bin':' contrib/systemd/haproxy.service.in \
-	> contrib/systemd/haproxy.service || die
+		> contrib/systemd/haproxy.service || die
 
 	sed -ie 's:/usr/sbin/haproxy:/usr/bin/haproxy:' src/haproxy-systemd-wrapper.c || die
 }
@@ -40,7 +42,12 @@ src_compile() {
 	local args="TARGET=linux2628 USE_GETADDRINFO=1"
 
 	if use pcre ; then
-		args="${args} USE_PCRE=1 USE_PCRE_JIT=1"
+		args="${args} USE_PCRE=1"
+		if use pcre-jit; then
+			args="${args} USE_PCRE_JIT=1"
+		else
+			args="${args} USE_PCRE_JIT="
+		fi
 	else
 		args="${args} USE_PCRE= USE_PCRE_JIT="
 	fi
diff --git a/net-proxy/haproxy/haproxy-9999.ebuild b/net-proxy/haproxy/haproxy-9999.ebuild
index 97490eee19ba..6b9b8540e8b1 100644
--- a/net-proxy/haproxy/haproxy-9999.ebuild
+++ b/net-proxy/haproxy/haproxy-9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/haproxy/haproxy-9999.ebuild,v 1.2 2013/09/17 12:30:09 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/haproxy/haproxy-9999.ebuild,v 1.3 2014/10/30 21:37:30 idl0r Exp $
 
 EAPI="5"
 
@@ -15,9 +15,11 @@ EGIT_REPO_URI="http://master.formilux.org/git/people/willy/haproxy.git"
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
 KEYWORDS=""
-IUSE="+crypt examples +pcre ssl tools vim-syntax +zlib"
+IUSE="+crypt examples +pcre pcre-jit ssl tools vim-syntax +zlib"
 
-DEPEND="pcre? ( dev-libs/libpcre )
+DEPEND="pcre? ( dev-libs/libpcre
+				pcre-jit? ( dev-libs/libpcre[jit] )
+				)
 	ssl? ( dev-libs/openssl[zlib?] )
 	zlib? ( sys-libs/zlib )"
 RDEPEND="${DEPEND}"
@@ -30,15 +32,22 @@ pkg_setup() {
 }
 
 src_prepare() {
-	sed -e 's:@SBINDIR@:'/usr/sbin':' contrib/systemd/haproxy.service.in \
-	> contrib/systemd/haproxy.service || die
+	sed -e 's:@SBINDIR@:'/usr/bin':' contrib/systemd/haproxy.service.in \
+		> contrib/systemd/haproxy.service || die
+
+	sed -ie 's:/usr/sbin/haproxy:/usr/bin/haproxy:' src/haproxy-systemd-wrapper.c || die
 }
 
 src_compile() {
 	local args="TARGET=linux2628 USE_GETADDRINFO=1"
 
 	if use pcre ; then
-		args="${args} USE_PCRE=1 USE_PCRE_JIT=1"
+		args="${args} USE_PCRE=1"
+		if use pcre-jit; then
+			args="${args} USE_PCRE_JIT=1"
+		else
+			args="${args} USE_PCRE_JIT="
+		fi
 	else
 		args="${args} USE_PCRE= USE_PCRE_JIT="
 	fi
@@ -68,14 +77,14 @@ src_compile() {
 	fi
 
 	# For now, until the strict-aliasing breakage will be fixed
-#	append-cflags -fno-strict-aliasing
+	append-cflags -fno-strict-aliasing
 
 	emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args}
 
 	if use tools ; then
 		for contrib in halog iprange ; do
 			emake -C contrib/${contrib} \
-				CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args}
+				CFLAGS="${CFLAGS}" OPTIMIZE="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args}
 		done
 	fi
 }
@@ -88,10 +97,10 @@ src_install() {
 	# Don't install useless files
 #	rm examples/build.cfg doc/*gpl.txt
 
-	dodoc CHANGELOG ROADMAP TODO doc/{configuration,haproxy-en}.txt
+	dodoc CHANGELOG ROADMAP doc/{configuration,haproxy-en}.txt
 	doman doc/haproxy.1
 
-	dosbin haproxy-systemd-wrapper
+	dobin haproxy-systemd-wrapper
 	systemd_dounit contrib/systemd/haproxy.service
 
 	if use tools ; then
diff --git a/net-proxy/haproxy/metadata.xml b/net-proxy/haproxy/metadata.xml
index c88fcd83f296..505fe329d079 100644
--- a/net-proxy/haproxy/metadata.xml
+++ b/net-proxy/haproxy/metadata.xml
@@ -20,6 +20,7 @@ It can:
 Its event-driven architecture allows it to easily handle thousands of simultaneous connections on hundreds of instances without risking the system's stability.
 	</longdescription>
 	<use>
-		<flag name='tools'>Install additional tools (halog, iprange).</flag>
+		<flag name="pcre-jit">Use JIT support for PCRE</flag>
+		<flag name="tools">Install additional tools (halog, iprange)</flag>
 	</use>
 </pkgmetadata>