Revision bump. Add systemd service unit. Add tools USE flag that install halog and iprange. EAPI 5. Part of the changes are contributed by Bertrand Jacquin (beber), fixes bug #466404.

Package-Manager: portage-HEAD/cvs/Linux x86_64
Manifest-Sign-Key: 0x6D34E57D

5 files changed, 186 insertions, 35 deletions

diff --git a/net-proxy/haproxy/ChangeLog b/net-proxy/haproxy/ChangeLog
index e7b0f155e202..3b5fa5abff34 100644
--- a/net-proxy/haproxy/ChangeLog
+++ b/net-proxy/haproxy/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-proxy/haproxy
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/haproxy/ChangeLog,v 1.84 2013/06/30 21:14:11 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/haproxy/ChangeLog,v 1.85 2013/09/17 12:30:09 tomwij Exp $
+
+*haproxy-1.5_beta19-r1 (17 Sep 2013)
+
+  17 Sep 2013; Tom Wijsman <TomWij@gentoo.org> +haproxy-1.5_beta19-r1.ebuild,
+  haproxy-9999.ebuild, metadata.xml:
+  Revision bump. Add systemd service unit. Add tools USE flag that install halog
+  and iprange. EAPI 5. Part of the changes are contributed by Bertrand Jacquin
+  (beber), fixes bug #466404.
 
   30 Jun 2013; Agostino Sarubbo <ago@gentoo.org> haproxy-1.4.24.ebuild:
   Stable for ppc, wrt bug #473674
diff --git a/net-proxy/haproxy/Manifest b/net-proxy/haproxy/Manifest
index 11411d4af3b1..28131f205f16 100644
--- a/net-proxy/haproxy/Manifest
+++ b/net-proxy/haproxy/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX haproxy.initd-r2 1095 SHA256 0136fbcbb9e7c77dfade5a4b0f28522a11f15c84fb0bb79f5f486f6baf00a0c4 SHA512 32c5a78a6545c7357ae4b81d8b236ae7569a6ca55171c7560089d345a7a8ba7d2df2083fc7c43b72031a0f8ad1e5151990530ce7b4d2c967dd959bd0ee542ee5 WHIRLPOOL e5c251617d938f07c9dcdb3008f8ec050bedd9c2dccdd63b4c83d8367795e24be79a1f394808f530f908f0147f72b7a6794a75a240d26d9d23285265f496f1b4
 DIST haproxy-1.4.23.tar.gz 835907 SHA256 ea5ad4166b394b4acc5065a013c78d3002fe4569dec5f919c09f2a28fb4438f1 SHA512 bba4895715ec210e8c871c9c932516823ae4b9f6d07a6641b5cbd6aee97315253236c541624d64e63356f79ffed8aaf573397631676791f8bc16ca50b49b4ff9 WHIRLPOOL 2da66b583dd11de6bdd98b890b77a632249597d0df62b09f72c2520968abfa83b2ae03674b5cacc0b2b63ec004da31b778b1acb1ee5b6073a630faa2691d8f4f
@@ -7,24 +7,19 @@ DIST haproxy-1.4.24.tar.gz 836768 SHA256 680928f4d001be3b59b69d4501f41aeea69e7e5
 DIST haproxy-1.5-dev19.tar.gz 1143258 SHA256 cb411f3dae1309d2ad848681bc7af1c4c60f102993bb2c22d5d4fd9f5d53d30f SHA512 de8b78af95974c7477a7f250cf56035ffa7c34b7332f32152e5c6d98e116cccfc3bf005b2578d022e2525d9ffb45e8a497b3337766e0f82b2d813a67e0556435 WHIRLPOOL 89199ec57ed5acffaaea66a6829769ad152791da607f8c66ef07b9b10ee970c690629001211447c775fb89e47fd43e01c8ecfd69ca5895ab967695ac6c50f0ed
 EBUILD haproxy-1.4.23.ebuild 2314 SHA256 fe86986a85b44e803095dd77c4d883a119708b4132b6e3e66ee9f213548e5696 SHA512 4726fb753f57c27d829da57292111d33c2c5132222dff092ea28df434d2369bb119a5b22669245f0d45ed34399fc8a58ad09694544396c77332e8e162e6babff WHIRLPOOL c33abc783ebc00e7066b46fe11b5f2ad689b9995bb7e295dbe05891402eb61d2047edfcdf4fca44763bad210ba5f5610a1b7c5632f76bbb2362f15241f7eec8d
 EBUILD haproxy-1.4.24.ebuild 2314 SHA256 5cbc45c75a555fcc70cbfc0ac43a7016c8aee439f8c9f79b19bb35249b10f688 SHA512 10fe9e9c8bb3d01b39e795d4ea1635b1a99e39f16c362bcf2480cb9e61f28fe34008dcd9459fbc63a1b4aab984398e591ad872c3295a72f6768b4b5ac5ee18d3 WHIRLPOOL 6ff488778964194421177b56c4300922c14a6ebeac0041b8ae77f244aef55e32dcfbbc1993df02fb53282d816ee355141532c1771adad7daae572adba24d665f
+EBUILD haproxy-1.5_beta19-r1.ebuild 3157 SHA256 1ffb8cff419df69c329633c547425f821ca55557e49a99a7145012668214a56a SHA512 8283bd9ff2efd57ef10be771c0e3f3c8968a057326b946112d2717946d8c50466eae8d9ec486359650df8ac18e841be52270da827125288dc05daabe4822f771 WHIRLPOOL 4604c0336fb558f89b467ae84820888363136892c7c2eaa74b0831bfeac204c33f47f202aeb8801a0a609a7e6e0272edee0ec94441bb43565494e5f0e0811319
 EBUILD haproxy-1.5_beta19.ebuild 2679 SHA256 19bd3921e3171a5451cbcf91b051d934a783bad0d89ed798c69916da9c284b86 SHA512 adfb44709a7830d8f7f5f8ba3e0e7417d4213f6c5f23cfa735a739410c91f20540ba1ec3cf2a6565a59741441b0831a9c2b52bb162e8f3ebc8eda332414948fc WHIRLPOOL 51aa3d7c9b860759823810b00e05bc740a116a03d2369235b204a5e20a33d251392216b566dcccf6607f9ae571ff22b218a1c063cba447acab7c31aa558ba99f
-EBUILD haproxy-9999.ebuild 2634 SHA256 c6feea6266df635e8ba799e94a732921a45d388a29b8bc32fb1820c319a167f5 SHA512 b4ee52ccac5289458643f8f4f7507b1ca406092f18393f613365e15fecb730f7e84c1ef5b1cf5dbe6732d7fec3c3d1465c91216900c01a89a1eabdea283f648f WHIRLPOOL 58912727f34e47b1fe9e4cb0b12dc7e936c5fd68103b08bfbfa6f6a27533a8d1462c01175946852533c7b85118b963c1174b7de93006a49712da29d11041da8a
-MISC ChangeLog 14639 SHA256 fdfd11b8b7cd28b3f7f86e110e32dc57089a860c7103b2487e91eccaec924bca SHA512 c83a1bff7aad5a0670a98fce3f393414fc34b36df0a5f9b03bec335e6300b7482b8171b72dee09803e2bd35a9b3a3c68f0d123df2489c3dcce32992766f7a77b WHIRLPOOL fa19610149c462fa5fb1724a97e7e657545cb22c4914bb9f953c6bacc1afefc22eee41832e148b750462caef223e3161b8c99e39354cdad0c0c3f9633218d580
-MISC metadata.xml 1450 SHA256 0797818620feed90cb3481805f66448e3a32afa5f981a95e45e0b0535fbc1cf4 SHA512 9e97e0524ea16e789883c739951ea017f66502574e5e5340ab6bfd3765239fc7ccf660a0a0cfee8dc8884247b588b02c11f63961efa7a05f32152ac32a157eba WHIRLPOOL 8b23ebe3a8f2e3c8e2bade35f777241514675337c6b30f6507341452c809b94d4df2a3f5ffb496e4f30293319fde2dd90666e701ac57c0b2f7d3522ff00540c9
+EBUILD haproxy-9999.ebuild 3109 SHA256 f9652752d42bcd138953fe4cf393acea18a31e9b2283eb1fcf06bff80ecac140 SHA512 82aacdd08628ad385693f13ed08b5cfe571f89909bf871d3e7b9647307743d69c112bc582b4c98ca69e1c4dac0a5f0f34e7641e30c9c90a49315c4f884ffb7f6 WHIRLPOOL 5f6dfdb73df7410b3a9bed5d4615299a59fa8a4e2ab783f41ee5cc7c9b09c5d28f375c53e2b08c6cd65614a09dd53a0920dfcb9dd76d603ffef107ecd6ffdf67
+MISC ChangeLog 14986 SHA256 ee22bad632b2b7bdeeba4cc074c15aab20b5c28b8912d3a7f6267cfb741a140b SHA512 b7a5c41b68ebf3951bd305da9fe009e3c8301372cd697c283c6c7222f4218cc0a36f9eab809570989a22a4e8e30469f1ac8504f7e7ec1e0d5c4870aac5b980c0 WHIRLPOOL d642785d8d4d5c1ce25359eebe3b7403b0b1c98fbe088aa56f52b1388d242301a08e3ad29304c436d951b00f58500de6f8f402d412d4cc5879d5ee6436481b4f
+MISC metadata.xml 1536 SHA256 1b50a38097c93a5656621fd4ad5e75e886aa47d7f6b4cafbbf88c0078c89b8f6 SHA512 d492805f0d02fcb2c0c4f9a4be7186f416afbc1c924b7eeb07ef3e5e0319685a7ef3f48752fb67be2538237cd88146bacadb4b43cabbab4f1bc91a78aa7ebc4b WHIRLPOOL 505f69206dd51ad75dd8ffea64aafb068eb6289ab4f481093136a393d1e394cddac290f5b7bf437aeac2c404852654ddc16bc3019c8179f2634f19038541d982
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.21 (GNU/Linux)
 
-iQIcBAEBCgAGBQJR0J7vAAoJELp701BxlEWfiJEP/2lWlH2heSlLu7rAffDORvu0
-+b8eU/l54BiWazUIDn9HyBCZo/P70U34bzVgU3E/eAwXJwn03euoXycULAbL6sjK
-X4lfpRLIvhPd6f51hUmT5QMUE2zT0N94WDn5JeWCmc6vC9JHRtYEAmgAWHTD1DL6
-BeQnztjg7Isd4OUpbl8ysexatjaWzmlDh/7SyBiYn4dGeClNdki4liz2dsWMtVlw
-JxQWIzWX/RSVnPGxddiPPGHGKImnrA6tNVONhAyjDMWnmv2PDhqPVb9S9Byu4VyU
-2Mo3nBv0AStNyoibMI46hKltNdL3WHyv0gMn90+qjw+VsbPK2k0OkWuQOkj6r/Rp
-XKFaq+injszuAik5jNzrNOjD6paXCvvrzvey4hL9uVepp9segRDVXpRczxVi/dK7
-dSSUOtT0E/Jap5Oj3y4oF82JBuIdgYyYwXNHLwg9UK3+JVQzyATAfJLZPCBxkwkh
-xUN8Ye9TJZ4WTFiQVmhSIyKIVLEdu7XZkU6om7Oa3KboJJ1Kb1HqNQqXuKvz5ocY
-RxR8ZbMjaJxbgWOlTDz0vdMg/m8R6zzrk1DX4nXPRnY7FwH9KstcsDwaBTHoIpdm
-XOIWMbH1xxDAtMAMNjyS/Sh51+8Zh/NyVY4BxucapNTLUjrkFTd0DWGJSwymBlrP
-4cou9SJVyFhhCs8C4HOG
-=Qwuv
+iQEcBAEBCAAGBQJSOEonAAoJEJWyH81tNOV9cy4H/i3lu5lj944SOxJjZG5dbb3H
++myk/TNYnsB7+TRMCdeN7sW6bseNetkN5H4mjgn23G5boqJtSh9j/SXdwPt1F1F0
+U8KBA6unzeRjD4rX4RpIuJRV4L3ke5mqnKpsvRHuSt7I/bkmVAC4PZlRHh251L2s
+/jIUhHQ4wdsoKXYmw4LC4WzVb+umMMJK8q6hJpE6n/82w1WWqErZetNH3AfVAjwK
+HpIWiK+//WNT+gLSKmDMviuRnHJMkYHQZBvNPbEFVwr7b6Y/6KGiTMJ1Bnu5LrtZ
+7DOXEprXaA2Uz+RAlXgzGdYL1iTSClpqSP1AxT5GVxwjYREmvqY3hakL9hV1xiw=
+=mjmy
 -----END PGP SIGNATURE-----
diff --git a/net-proxy/haproxy/haproxy-1.5_beta19-r1.ebuild b/net-proxy/haproxy/haproxy-1.5_beta19-r1.ebuild
new file mode 100644
index 000000000000..3061a6bc0bd9
--- /dev/null
+++ b/net-proxy/haproxy/haproxy-1.5_beta19-r1.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/haproxy/haproxy-1.5_beta19-r1.ebuild,v 1.1 2013/09/17 12:30:09 tomwij Exp $
+
+EAPI="5"
+
+inherit user versionator toolchain-funcs flag-o-matic systemd
+
+MY_P="${PN}-${PV/_beta/-dev}"
+
+DESCRIPTION="A TCP/HTTP reverse proxy for high availability environments"
+HOMEPAGE="http://haproxy.1wt.eu"
+SRC_URI="http://haproxy.1wt.eu/download/$(get_version_component_range 1-2)/src/devel/${MY_P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="+crypt examples +pcre ssl tools vim-syntax +zlib"
+
+DEPEND="pcre? ( dev-libs/libpcre )
+	ssl? ( dev-libs/openssl[zlib?] )
+	zlib? ( sys-libs/zlib )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	enewgroup haproxy
+	enewuser haproxy -1 -1 -1 haproxy
+}
+
+src_prepare() {
+	sed -e 's:@SBINDIR@:'/usr/sbin':' contrib/systemd/haproxy.service.in \
+	> contrib/systemd/haproxy.service || die
+}
+
+src_compile() {
+	local args="TARGET=linux2628 USE_GETADDRINFO=1"
+
+	if use pcre ; then
+		args="${args} USE_PCRE=1 USE_PCRE_JIT=1"
+	else
+		args="${args} USE_PCRE= USE_PCRE_JIT="
+	fi
+
+#	if use kernel_linux; then
+#		args="${args} USE_LINUX_SPLICE=1 USE_LINUX_TPROXY=1"
+#	else
+#		args="${args} USE_LINUX_SPLICE= USE_LINUX_TPROXY="
+#	fi
+
+	if use crypt ; then
+		args="${args} USE_LIBCRYPT=1"
+	else
+		args="${args} USE_LIBCRYPT="
+	fi
+
+	if use ssl ; then
+		args="${args} USE_OPENSSL=1"
+	else
+		args="${args} USE_OPENSSL="
+	fi
+
+	if use zlib ; then
+		args="${args} USE_ZLIB=1"
+	else
+		args="${args} USE_ZLIB="
+	fi
+
+	# For now, until the strict-aliasing breakage will be fixed
+#	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}
+		done
+	fi
+}
+
+src_install() {
+	dobin haproxy
+
+	newinitd "${FILESDIR}/haproxy.initd-r2" haproxy
+
+	# Don't install useless files
+#	rm examples/build.cfg doc/*gpl.txt
+
+	dodoc CHANGELOG ROADMAP TODO doc/{configuration,haproxy-en}.txt
+	doman doc/haproxy.1
+
+	dosbin haproxy-systemd-wrapper
+	systemd_dounit contrib/systemd/haproxy.service
+
+	if use tools ; then
+		for contrib in halog iprange ; do
+			dobin contrib/${contrib}/${contrib}
+		done
+	fi
+
+	if use examples ; then
+		docinto examples
+		dodoc examples/*.cfg
+	fi
+
+	if use vim-syntax ; then
+		insinto /usr/share/vim/vimfiles/syntax
+		doins examples/haproxy.vim
+	fi
+}
+
+pkg_postinst() {
+	if [[ ! -f "${ROOT}/etc/haproxy.cfg" ]] ; then
+		ewarn "You need to create /etc/haproxy.cfg before you start the haproxy service."
+		ewarn "It's best practice to not run haproxy as root, user and group haproxy was therefore created."
+		ewarn "Make use of them with the \"user\" and \"group\" directives."
+
+		if [[ -d "${ROOT}/usr/share/doc/${PF}" ]]; then
+			einfo "Please consult the installed documentation for learning the configuration file's syntax."
+			einfo "The documentation and sample configuration files are installed here:"
+			einfo "   ${ROOT}usr/share/doc/${PF}"
+		fi
+	fi
+}
diff --git a/net-proxy/haproxy/haproxy-9999.ebuild b/net-proxy/haproxy/haproxy-9999.ebuild
index 473963bc9521..97490eee19ba 100644
--- a/net-proxy/haproxy/haproxy-9999.ebuild
+++ b/net-proxy/haproxy/haproxy-9999.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 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.1 2013/05/13 20:11:16 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/haproxy/haproxy-9999.ebuild,v 1.2 2013/09/17 12:30:09 tomwij Exp $
 
 EAPI="5"
 
-inherit user versionator toolchain-funcs flag-o-matic git-2
+inherit user versionator toolchain-funcs flag-o-matic git-2 systemd
 
 MY_P="${PN}-${PV/_beta/-dev}"
 
@@ -15,7 +15,7 @@ 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 vim-syntax +zlib"
+IUSE="+crypt examples +pcre ssl tools vim-syntax +zlib"
 
 DEPEND="pcre? ( dev-libs/libpcre )
 	ssl? ( dev-libs/openssl[zlib?] )
@@ -29,10 +29,15 @@ pkg_setup() {
 	enewuser haproxy -1 -1 -1 haproxy
 }
 
+src_prepare() {
+	sed -e 's:@SBINDIR@:'/usr/sbin':' contrib/systemd/haproxy.service.in \
+	> contrib/systemd/haproxy.service || die
+}
+
 src_compile() {
 	local args="TARGET=linux2628 USE_GETADDRINFO=1"
 
-	if use pcre; then
+	if use pcre ; then
 		args="${args} USE_PCRE=1 USE_PCRE_JIT=1"
 	else
 		args="${args} USE_PCRE= USE_PCRE_JIT="
@@ -44,19 +49,19 @@ src_compile() {
 #		args="${args} USE_LINUX_SPLICE= USE_LINUX_TPROXY="
 #	fi
 
-	if use crypt; then
+	if use crypt ; then
 		args="${args} USE_LIBCRYPT=1"
 	else
 		args="${args} USE_LIBCRYPT="
 	fi
 
-	if use ssl; then
+	if use ssl ; then
 		args="${args} USE_OPENSSL=1"
 	else
 		args="${args} USE_OPENSSL="
 	fi
 
-	if use zlib; then
+	if use zlib ; then
 		args="${args} USE_ZLIB=1"
 	else
 		args="${args} USE_ZLIB="
@@ -65,13 +70,20 @@ src_compile() {
 	# For now, until the strict-aliasing breakage will be fixed
 #	append-cflags -fno-strict-aliasing
 
-	emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args} || die
+	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}
+		done
+	fi
 }
 
 src_install() {
-	dobin haproxy || die
+	dobin haproxy
 
-	newinitd "${FILESDIR}/haproxy.initd-r2" haproxy || die
+	newinitd "${FILESDIR}/haproxy.initd-r2" haproxy
 
 	# Don't install useless files
 #	rm examples/build.cfg doc/*gpl.txt
@@ -79,16 +91,23 @@ src_install() {
 	dodoc CHANGELOG ROADMAP TODO doc/{configuration,haproxy-en}.txt
 	doman doc/haproxy.1
 
-	if use examples;
-	then
+	dosbin haproxy-systemd-wrapper
+	systemd_dounit contrib/systemd/haproxy.service
+
+	if use tools ; then
+		for contrib in halog iprange ; do
+			dobin contrib/${contrib}/${contrib}
+		done
+	fi
+
+	if use examples ; then
 		docinto examples
-		dodoc examples/*.cfg || die
+		dodoc examples/*.cfg
 	fi
 
-	if use vim-syntax;
-	then
+	if use vim-syntax ; then
 		insinto /usr/share/vim/vimfiles/syntax
-		doins examples/haproxy.vim || die
+		doins examples/haproxy.vim
 	fi
 }
 
diff --git a/net-proxy/haproxy/metadata.xml b/net-proxy/haproxy/metadata.xml
index d9588385b79a..c88fcd83f296 100644
--- a/net-proxy/haproxy/metadata.xml
+++ b/net-proxy/haproxy/metadata.xml
@@ -19,4 +19,7 @@ It can:
  - block requests matching a particular pattern
 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>
+	</use>
 </pkgmetadata>