Version bump

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

3 files changed, 151 insertions, 9 deletions

diff --git a/net-proxy/haproxy/ChangeLog b/net-proxy/haproxy/ChangeLog
index 4b01c1a9ffd7..46f275082365 100644
--- a/net-proxy/haproxy/ChangeLog
+++ b/net-proxy/haproxy/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-proxy/haproxy
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/haproxy/ChangeLog,v 1.113 2015/01/12 22:12:09 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/haproxy/ChangeLog,v 1.114 2015/02/07 14:59:03 idl0r Exp $
+
+*haproxy-1.5.11 (07 Feb 2015)
+
+  07 Feb 2015; Christian Ruppert <idl0r@gentoo.org> +haproxy-1.5.11.ebuild:
+  Version bump
 
 *haproxy-1.5.10 (12 Jan 2015)
 
diff --git a/net-proxy/haproxy/Manifest b/net-proxy/haproxy/Manifest
index 6229b194199f..f3e194a27cf3 100644
--- a/net-proxy/haproxy/Manifest
+++ b/net-proxy/haproxy/Manifest
@@ -4,21 +4,23 @@ Hash: SHA256
 AUX haproxy.initd-r2 1095 SHA256 0136fbcbb9e7c77dfade5a4b0f28522a11f15c84fb0bb79f5f486f6baf00a0c4 SHA512 32c5a78a6545c7357ae4b81d8b236ae7569a6ca55171c7560089d345a7a8ba7d2df2083fc7c43b72031a0f8ad1e5151990530ce7b4d2c967dd959bd0ee542ee5 WHIRLPOOL e5c251617d938f07c9dcdb3008f8ec050bedd9c2dccdd63b4c83d8367795e24be79a1f394808f530f908f0147f72b7a6794a75a240d26d9d23285265f496f1b4
 DIST haproxy-1.4.25.tar.gz 838775 SHA256 84408ec1e37bf308c6b45ae3c7e66f2a9d2f762cb689ab6d322c67bba691db62 SHA512 c3424151309be5eea761ff02b29a0e54bd34f5fcb4087e8b99fb2f4cde17bbc3caf07b6cb41ae5a2606325f8a950a06c4683ceb04c05fd6ebf0177326030bca9 WHIRLPOOL 0b32acffc82d216325abd330073717d951aa8cff349d538fa42a9de76154e1f7be5b1718854d04be41f78834b914b83be804557eb20aa174db71769060c9f644
 DIST haproxy-1.5.10.tar.gz 1339873 SHA256 090264c834477c290f6ad6da558731d50aede0800996742d15e870b9947fe517 SHA512 d15aaca4be6d8b41a691509042728d6aaa177075f2c3ff783d91cc02150a0d7985863c2f0c19c5df20461fdf2c95eaca67031ed37992e75ac02fb887445308de WHIRLPOOL f11dca65ca671ccedc58ef0484c77d5e833867b4d9ea90a9338b7ace65e984ab178c773a8648971d8faed709254d39b40d960f71f6aba30f97d4ee0729b53488
+DIST haproxy-1.5.11.tar.gz 1340429 SHA256 8b5aa462988405f09c8a6169294b202d7f524a5450a02dd92e7c216680f793bf SHA512 10ac569fb06efe158e9ba9e9651f110d86f362d4e9fd032d50ff403b0382825764223dccdac1b5f6ee13e4f6ca63cf92c6d0f4408c1313ac9db07214646a9738 WHIRLPOOL 324f761c67b330672a38c53758786bd05a677a9fa81e41969d5d53757acf0058424f0f010e55fcd518831e1850fff3717e70eea7ffa4ecee0dae4c14d6a88f18
 DIST haproxy-1.5.4.tar.gz 1336140 SHA256 75056ca5b9121b193d383ba4ebc6e5a3782c537a7499db80fce8d6d5fd265e10 SHA512 9ba6a82207487a8e59117c21de0dd7a178cc4bf472cc99fbca21146883f8a2ffe1b3d0bab316999abc151e16ad363f80b593205f39fa2cb173ba37b086076323 WHIRLPOOL 19ef3cbe10aac30c80ac193e7728f5f5127ce690e4f4e314e3ea23743701adffb2f7248a37b2d3737461abf89f575612980208a8af8499dffc34e28b40817389
 EBUILD haproxy-1.4.25.ebuild 2314 SHA256 b309ff385e44799c9aa5db4d173e2f54102f5f25c721bc3dfecb69db6e87bdff SHA512 6ba8c3255806e7c36ddbd6b1b3d77bcf13d4758d95b1f620ba04cbf25fd332f6cb75a0c138949cbb6c6e4f7d939bab125f50eafd831256bfd04a5c4821250bec WHIRLPOOL 572b1e600300ef94e8beefd537ecfbf9405c01cc6bde104d3b7ee8bcee85495a4ec06bee757f3cbfb6d8838cbaefee4f2e1ac38b58fd1ab3a438789cc46d9aec
 EBUILD haproxy-1.5.10.ebuild 3383 SHA256 e23ade05732f2b870365a86cc1cd9c882476209b3605e4bd68ac650889943d1e SHA512 c74528e59c3ace5eb105f1b974b9221a6e8aecce3325130dccf43c7428e34f62359f0422b03109187da22330203927e8fd4176ffe1b5c8035b267998e7b89e32 WHIRLPOOL a069498b68a5572e711fd32fb385f507cbab720f71caec81c426c34f4a5d8f55a2319d390f238591e663c43eae3698ff42ce1da21159292ecb506f0ffbf5342f
+EBUILD haproxy-1.5.11.ebuild 3383 SHA256 dc385d0839f0c96a2d253ff2290706fea21a4fb66a73a529655b0c94226937a7 SHA512 954b7b7a3853351edb87eb58ddfc3fa93c4b5050d2fadb37bd2b107395ae21d5b713387d7a45dfa272afc05669b97ed4d87c705dedf60b3fb601c13ec4516344 WHIRLPOOL 3d419a11bdbdeda620a7b55e9833b79afe98de4d85df2cc5a64faea474ed76c2e203cc16d40279d12537f52fb6e54fbedc0d4d093ce244c226cda380e8588246
 EBUILD haproxy-1.5.4.ebuild 3237 SHA256 cc3e810566a7dcc8b7faa5c8854c8c1a692273cad7419c45fb26b4488b50a9b9 SHA512 f9bacbf3e8e3f0028559681232d84f1d9cdd845fd6c7d084e3db4660a4308a5b65ae919c49ede7b7ceaa873c09efe663feb0a0f238bc980337dca3f1104fcd3d WHIRLPOOL b3187145ea761c6edfd656b4bdf2c33df007ea4c4b9aaabce3fdf4992c3e0d41ebb26cc1361e3a18b32e63cd9526913fca22b109f1520035063feb408ab91a2a
 EBUILD haproxy-9999.ebuild 3348 SHA256 af05b51949f04e23ca1473f155645857420ddf5114dd283074d8e69c4005535a SHA512 a6457842d8b7f7c3cad2acfe5b63cf5613bf0dbc7c5da8d3e66f3809fd8e66103e4f6ddf58ed0412fd9a7715740fe12478af1f7e09549c0791c27c57e96f9bf7 WHIRLPOOL 4fe863b5e7c768f771f2c78a7d5c9d4660943713f4635d3164525e97c5c73308cbc60395d986e7a99f4f1df722c6d7b3cdeddb50c523faa2b0cad1e38ba3acad
-MISC ChangeLog 19162 SHA256 6eaa46fab76be130e4872dd8ec4ff67cbe730352af3d5f39888abf837423812d SHA512 ba1f38c1ad6b98da9626c871e668593191e05949698c4551fef1d8dac21280364931080e572fc6174c9d9cf9b428f3a02ed98a322f4bdef32d80bf1d842803ec WHIRLPOOL b2952ac0d558574a18be8fb2889f78064addd4ea534580fbfd83c0e7f84bfa138cc945620eaffb6e5b4c03fea0882deab5ad29430f114f6e4135ea88e39207d4
+MISC ChangeLog 19285 SHA256 59e2afd91cf126d32ff2a6af317cd30df746462443c769e1ba58d6ba67a90e15 SHA512 b8e4b14fbdc66b1dadbd972b527b83a9cf3f91d042b94674992536f90bc5ba44656382ec1cc9af06ea80287f808b1cef4afad483131dbf4685f3b1641e219977 WHIRLPOOL 40a78a116acac49d6d5f81b1c67c11f1d32fd38d9f1b9314821d46f80a8560bede616552808e288382696ede72f5097585ace15e92b7e1a78452240d0ce1c665
 MISC metadata.xml 1567 SHA256 176c75ad779ae47ba3ac46a19755acec0a83e54bc9f6b36b920a652bd1cb50f0 SHA512 7902358b192c919cc2e34782d937af0c26d65c9b90f3473916b12fad4009ef985f892325716c1e031dcb73a68a53ff94529004459cf28845ecd3e7de172266c2 WHIRLPOOL 42e15558e0b84ce90ac5a15f43c5fb604fd526cc4485bbe66b947f97abeb99020bddb90a917fe46c948189d6cd91d95b9bba576af696aff6cbfefa14b50dce4f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJUtEa/AAoJEMOx0zmdw4Z1W5EH/RpEjEDrUxgDrYN4khvselM0
-05t55ZJp12SGvk9/rNirqPspGgN8A2PuvO/M6FzVmhvU01T1Z1D0FJHb5lykOSxZ
-KEvx9oYb6SmxKouVypH/ds3vnZMLWEYSepRuK7soCQXpCxKfUEMwTjnEpKPuXzw4
-D+y6E3FTm0GvfCfwgEJ0oeQ7/+3q31YZ9Az8JDBEjgPtfEzmBTVB2vXv/Du/Uzh4
-NpzzgKAOFcraGqG/kncue9vFCgybMGutAUGt4uKPaIS72Yhv2/mkiJkKgtL8aOMW
-wobpqHqrQh7GOPTX+nRU/CMnEg5ibbf+431Pof65UNxe1Ludep/W5L9C+wkD6Nc=
-=+G8b
+iQEcBAEBCAAGBQJU1ig8AAoJEMOx0zmdw4Z1AMcH/RQ6/2LyYOAY3pI9FNHuuqqX
+PzEizST6izpojdd1k+C7VYQkRbBHekE4J3X5TbKgmp8ETHQpW0mFO/1nWyfBN3Xz
+dydxhoWmoldxZ2BPvENC46s2fVWusdxmzXqnVS6k5nQEZjzV7U03PNeXLzx0s/Fy
+r7iTHfFASV96LUYnQrbJnrHo+l/fI21+ZvAO4Fda3c1CT9gX9deTsKwZTmsJBMBJ
+H4ym5rvydt5UwLN3jgmVzI7A3OV5mEj/WdZ2RJl6PM+KB16zPNituIseqrAw9Afw
+Q+1g6duaLLcMCDcZ3HbXBz0NXVTcJGeZ1v2QqrC9QSHLi061sQSlY9y86NO8ve4=
+=sisg
 -----END PGP SIGNATURE-----
diff --git a/net-proxy/haproxy/haproxy-1.5.11.ebuild b/net-proxy/haproxy/haproxy-1.5.11.ebuild
new file mode 100644
index 000000000000..1d58a0f49184
--- /dev/null
+++ b/net-proxy/haproxy/haproxy-1.5.11.ebuild
@@ -0,0 +1,135 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/haproxy/haproxy-1.5.11.ebuild,v 1.1 2015/02/07 14:59:03 idl0r 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/${MY_P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="+crypt examples +pcre pcre-jit ssl tools vim-syntax +zlib"
+
+DEPEND="pcre? ( dev-libs/libpcre
+				pcre-jit? ( dev-libs/libpcre[jit] )
+				)
+	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/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"
+		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
+
+#	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}" OPTIMIZE="${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 doc/{configuration,haproxy-en}.txt
+	doman doc/haproxy.1
+
+	dobin 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
+}