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

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0xB427ABC8

5 files changed, 51 insertions, 29 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/Manifest b/net-proxy/haproxy/Manifest
index 76071df590c9..2f74faaafb1c 100644
--- a/net-proxy/haproxy/Manifest
+++ b/net-proxy/haproxy/Manifest
@@ -7,18 +7,18 @@ DIST haproxy-1.5.4.tar.gz 1336140 SHA256 75056ca5b9121b193d383ba4ebc6e5a3782c537
 DIST haproxy-1.5.6.tar.gz 1337511 SHA256 214ab89dad7e0a43cc0f1c46367ca6803cd869e1717a4fa6b99451713f91f717 SHA512 b9b88f59a483ef1e30e80432edd868720ffeb46a920af35161de83c5c378ef7bc184c86571ed37494444b1d20fbc68eb7be68d74773315d025e4b613b1e27ac7 WHIRLPOOL 6a82223b01243994c6905050774d43a193e1974f144f6ad6e8b7c4cc604526fa95e42d8c7dafd09575fb0ca05750b1f8acf3732248f9f2961db0ef462a996165
 EBUILD haproxy-1.4.25.ebuild 2314 SHA256 b309ff385e44799c9aa5db4d173e2f54102f5f25c721bc3dfecb69db6e87bdff SHA512 6ba8c3255806e7c36ddbd6b1b3d77bcf13d4758d95b1f620ba04cbf25fd332f6cb75a0c138949cbb6c6e4f7d939bab125f50eafd831256bfd04a5c4821250bec WHIRLPOOL 572b1e600300ef94e8beefd537ecfbf9405c01cc6bde104d3b7ee8bcee85495a4ec06bee757f3cbfb6d8838cbaefee4f2e1ac38b58fd1ab3a438789cc46d9aec
 EBUILD haproxy-1.5.4.ebuild 3237 SHA256 cc3e810566a7dcc8b7faa5c8854c8c1a692273cad7419c45fb26b4488b50a9b9 SHA512 f9bacbf3e8e3f0028559681232d84f1d9cdd845fd6c7d084e3db4660a4308a5b65ae919c49ede7b7ceaa873c09efe663feb0a0f238bc980337dca3f1104fcd3d WHIRLPOOL b3187145ea761c6edfd656b4bdf2c33df007ea4c4b9aaabce3fdf4992c3e0d41ebb26cc1361e3a18b32e63cd9526913fca22b109f1520035063feb408ab91a2a
-EBUILD haproxy-1.5.6.ebuild 3242 SHA256 8a95d257f3166055bfb0c46c30be91780459697decff60d41339ab22eb14a739 SHA512 eaa8303295a49fdf788516cc4a3bc874ab8d931ea7987f6031f70fc19afe56c922262f00715a1f2fcefdf54e09d37d14fa73816b3aa09941ed03ec7c08dc3231 WHIRLPOOL 6fc01ddc7f7bda379a8b587f14a74d768a304e8d63f51ca822fca5da66abde7d9b649ed540ee73bcaf4dd2b4bf0a561b051ee52a1dba2980a56072b74ed2195d
-EBUILD haproxy-9999.ebuild 3109 SHA256 f9652752d42bcd138953fe4cf393acea18a31e9b2283eb1fcf06bff80ecac140 SHA512 82aacdd08628ad385693f13ed08b5cfe571f89909bf871d3e7b9647307743d69c112bc582b4c98ca69e1c4dac0a5f0f34e7641e30c9c90a49315c4f884ffb7f6 WHIRLPOOL 5f6dfdb73df7410b3a9bed5d4615299a59fa8a4e2ab783f41ee5cc7c9b09c5d28f375c53e2b08c6cd65614a09dd53a0920dfcb9dd76d603ffef107ecd6ffdf67
-MISC ChangeLog 18341 SHA256 00c7284264f7c7c557d21bdb6914b453f71ca72e1333cdcbcdabc4fd61f9dc1d SHA512 79fc957788d6e960be208f26ff070c942f8121c0ba5ea100b2566b964e8e2baa9e70e714463a7e62a5dff1967326f05542783e151533632a3a7700d370e5cf6e WHIRLPOOL 4783b0193ecd1655cb140b051748eb96339121bdd1b27906b7a229dec908f973c5af211cd98bba84bd6e12d1de947587460b58bd0be3b4a0535142eea8e44129
-MISC metadata.xml 1536 SHA256 1b50a38097c93a5656621fd4ad5e75e886aa47d7f6b4cafbbf88c0078c89b8f6 SHA512 d492805f0d02fcb2c0c4f9a4be7186f416afbc1c924b7eeb07ef3e5e0319685a7ef3f48752fb67be2538237cd88146bacadb4b43cabbab4f1bc91a78aa7ebc4b WHIRLPOOL 505f69206dd51ad75dd8ffea64aafb068eb6289ab4f481093136a393d1e394cddac290f5b7bf437aeac2c404852654ddc16bc3019c8179f2634f19038541d982
+EBUILD haproxy-1.5.6.ebuild 3382 SHA256 907014a7acc02837b1828907746a052056e4914bf94f3e878158aa302afb51a1 SHA512 90e917a92333f0741f1a4df74205b9dc33a798917d889d6e95f236f7bb81bfb255f86aa6ce41839259847ce5c783bb8a6d06b9a1453afbc44ec7d35937cd8601 WHIRLPOOL 05b739caf8e3c1868a09ed1e9bdb171b2cd7fa8efc08a0dc0f72edded40aafc31cc2169557a2ff7b76c45bc32f5b09a5a79aaa6bb1e686e19539ba31d892c90e
+EBUILD haproxy-9999.ebuild 3348 SHA256 af05b51949f04e23ca1473f155645857420ddf5114dd283074d8e69c4005535a SHA512 a6457842d8b7f7c3cad2acfe5b63cf5613bf0dbc7c5da8d3e66f3809fd8e66103e4f6ddf58ed0412fd9a7715740fe12478af1f7e09549c0791c27c57e96f9bf7 WHIRLPOOL 4fe863b5e7c768f771f2c78a7d5c9d4660943713f4635d3164525e97c5c73308cbc60395d986e7a99f4f1df722c6d7b3cdeddb50c523faa2b0cad1e38ba3acad
+MISC ChangeLog 18536 SHA256 6eba6308ae3c19471e83d5c506f3f1d83709baa84069d640d9873de990a8c92e SHA512 1d988ab506b2ffc1fd3dc8651adb5a1d15613c8b8684563dde4e8fedbe9962fb596c982c4c82ff9772b0fb9a1375290093d78541e7b987bd5bd42b7b3c9100fa WHIRLPOOL 6ee13f257ccba2fe6476fde2b6f68270336dbc8d56b428cfce8fc6230f32ef2721445f9a47a9f4d585b3d7fd236852b8568a1a1e290172fe884e705a8479a869
+MISC metadata.xml 1591 SHA256 b6f1f7ccc8c0d3bb294c5e85dfaf0917c3ec77d84c96bef48c1ffca8c76f4d50 SHA512 917612d29a7eee2302c83f0dab0738eb50a741062bad35c3816195a53a95eba1072c2936f30a859e52f85e95328fced6bd211acc062b7c40ce19fe3d96e7c165 WHIRLPOOL 0744e4d9c3e94e7ac952f604892ba3bc958ae358fa4dbfe4766df0ab1aab4f25f7734cb50669232facccf612ea1c3128c046f6c1b4f522e01ded4075f1af9466
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJUQ4BVAAoJEMOx0zmdw4Z1BBEH/AtY2OlubWG1arXnZhf0t3L1
-yFqCu3VWVNEz1F/VRAmhQJpAG6vjHZMM7aH2ENjhIC13aQpZTM93rA88e6Dna+nD
-Zhfl0pLe1cCBP7W3R35CdqJURWiNxi17VN4c35zSXYOi9R2OfIweVTjvn5m2qDxn
-fjbZ7L1q65FKhpkxwOP1J76KDFPHi00LkuVtrvs0tyMF3NKHZO5tPT9xJHhkULCD
-H/a8XgywUGvnhMBtPFeRkTltix30hN/c8AbBY0TjehwAcmPAkzqeZNASsccZmItB
-I6fMequ6uyjYe905yd3Qz6JBtEQNBbbwHhf3GQsgRis3R5F5l/4oYUyMbsm8B2Q=
-=+TpJ
+iQEcBAEBCAAGBQJUUq+bAAoJEMOx0zmdw4Z1WhAH/RO3GIzTrWmKnFYKHRwfPs1t
+eEiN4rKt/uobPs1idXbQEN91+V3PfrbeDnCZUhJTjW1UP6hsVuf+DJy+P/hn0vbg
+istJ8IpbwzKDQDTqlUAKlUM9soNCizkBLqdcq9PTmPndGQEa7cKBzXstX/VtKqjq
+WuIKCyeoKzX46PsnX5IYP1NhQmazJoRYph7DvWt2mflXRnOr4g4dw1aubfz4Qkdq
+cuAZilkjahqWndEN6UC+JYmnivbZNE0cmb2p78ujO7Z9BG2GVITEUvqnwhJxMb/S
+S5IkQ8xOanGnZ9yWZuwHqccw2D8Gbdtivq8MdUb78/AVxbmNo6xLL2CLfYZ7USE=
+=b4Nf
 -----END PGP SIGNATURE-----
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>