Version bump, bug 554048, bug 554162

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

4 files changed, 18 insertions, 149 deletions

diff --git a/net-proxy/haproxy/ChangeLog b/net-proxy/haproxy/ChangeLog
index 5d3275ecdbcc..25a537f7e3b0 100644
--- a/net-proxy/haproxy/ChangeLog
+++ b/net-proxy/haproxy/ChangeLog
@@ -1,6 +1,12 @@
 # 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.116 2015/06/29 19:33:50 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/haproxy/ChangeLog,v 1.117 2015/07/07 20:22:00 idl0r Exp $
+
+*haproxy-1.5.14 (07 Jul 2015)
+
+  07 Jul 2015; Christian Ruppert <idl0r@gentoo.org> -haproxy-1.5.12.ebuild,
+  -haproxy-1.5.13.ebuild, +haproxy-1.5.14.ebuild:
+  Version bump, bug 554048, bug 554162
 
 *haproxy-1.5.13 (29 Jun 2015)
 
diff --git a/net-proxy/haproxy/Manifest b/net-proxy/haproxy/Manifest
index bc89603d8b0f..bdc7122bc462 100644
--- a/net-proxy/haproxy/Manifest
+++ b/net-proxy/haproxy/Manifest
@@ -4,25 +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.4.26.tar.gz 837280 SHA256 a8787dae723c045eebd0ed9e0213514f909a67325d64e963eaf50c35b147d3d3 SHA512 f21901069f651f3320c2b7cb6aee96fced5d4d5d4a73eec0d94dd8bd109a391d8da85026389e7209f85026cdefc1b879afcfd0a9bc0970e41aedd59e35935454 WHIRLPOOL 406b7f8bb4b9b3f6b8080f58431a804abea1d834ef9b8d86ede328b27e4f3fe944fbdae5bad8c3f7da75c81c92ff0e030950e09feac28eac4f763e511b5e7dce
-DIST haproxy-1.5.12.tar.gz 1344813 SHA256 6648dd7d6b958d83dd7101eab5792178212a66c884bec0ebcd8abc39df83bb78 SHA512 57a09686d6dd7a9451b283a1ef8ffdf478ea58dc7c04d8433a495fa5054204552c682a4c470abf92f5c603302a29288527318ce360092738894245c29f73642f WHIRLPOOL fbf51837fd24c948c16d8123836920f423a61efde617ca081f3f70acab7708955e210241fbf2970ec5e3cb87e8c934db05ef40584207f37a11d4d9c99095d8c2
-DIST haproxy-1.5.13.tar.gz 1345323 SHA256 de901c23d976cb21b816dc671924176918b691a430fb5a52e0f1afbc6faeb5f9 SHA512 edd888e1622b2bc1950f16b0ceca751a498634f62c48776d16cad64ff398ab93f450fd7660b498cc82220527f41b93eb58763a3b1c1616e6d4fbe9c5dfb5da0f WHIRLPOOL ef1c85bdd6e9cc3a3e68a6d0b75265ce0f0c69f7f6d738c9213fbda19f3dd1f9facf2808406fe0408ea3ff9c649c4a95c1d1ce8bcaa58fd097ec7bd472f11003
+DIST haproxy-1.5.14.tar.gz 1345345 SHA256 9565dd38649064d0350a2883fa81ccfe92eb17dcda457ebdc01535e1ab0c8f99 SHA512 83d6101fd402f37845ab3febc914335e4c6d9bdebbb0ff81c8e048d5252ffa5a1b77c4250a434fed5dd541ef1f1f2c47d969b59f7a51d6ab9aea38a8646a9798 WHIRLPOOL 7d2c580589b9b31e1eba169e4bf930ac42d2564e21eb1c25adbdd39b701abd221fd671ebc227167ab956a48b2c30eeb740a6394355a8fa748c408ee42fdff6fc
 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.4.26.ebuild 2314 SHA256 e56a0ac1f48c3dc4a3b07c31ee1e2b58e431d157fb5d573f8515ad0ef4e5d9ed SHA512 b5a4f22be3c297876b345df90de63958fcafa3efd1a933f59ed10b169054a74aa5d9bb9b7fd93b6367442abe2931124e0ba0c165d62ef287da3700f089937c86 WHIRLPOOL 5b6478ef8863ec1f003968955978f6aeb0e76670201131393041aa38994832d14698c5f507cdb099e837383f856ba4c229aae552897d6364bc011c4b899f2c64
-EBUILD haproxy-1.5.12.ebuild 3385 SHA256 97c05a9d2d2870863e19f6d9e63007bd379608ec878998a72294d378308ab970 SHA512 2e29dabd5a459cf37f4f1a20351af8a00bd5a4d2b697e07196458927034c0d9a2637bf6ff02c0ea0c986f43250580f0fc2bdb5d4da38b32b03c432b9734d9742 WHIRLPOOL f416d36ffbfa8f1959b5af4e5812a4e6f248b4c644a4e7515a90df1512451930312dfb182063755cfdd9234016035b71c32ed12e58c305daae0679852790555f
-EBUILD haproxy-1.5.13.ebuild 3385 SHA256 d711c578882d30d3007edad7d15191d4288a8c35d7e81b802aa6d31f112daa45 SHA512 32876b0fb70264f286f699ee463b03d24a87a8ef1f0d45a68d34c0b4f823e0007eeb9ff7b744a209da133ef50ff7b47a2ae4024ad961cbd5e37052abd31b6483 WHIRLPOOL ae3192fe59561968e7a689e41c1d6d5d1da2b6ea29243a4d876c41174dcd82e81b797e5071f91fa7af47fabc5a11ff23a965d919ef27b518df308c912559218e
+EBUILD haproxy-1.5.14.ebuild 3385 SHA256 4c6ff5ecc198359e377f52282af0b0cdab91f618ae45a9e0a41a5ea22fe83a4d SHA512 a62ed62a32d943dbc26dbb4ee7b2bd0f0e94c2e34b84ab9bee06f3f97971bd6b69fc3ff1de10453a52a0d4760eba74d474940e13aa1689d59082e1ad16f6b833 WHIRLPOOL 40f355fe7526aef7442e3a12ba3382ac1622ee9902478174a236688dd4596dd40ab7d8ef49fc766017a35e54b5e12ef5a9731fc1a62a01325b0c4e8bd4a48b6f
 EBUILD haproxy-1.5.4.ebuild 3237 SHA256 cc3e810566a7dcc8b7faa5c8854c8c1a692273cad7419c45fb26b4488b50a9b9 SHA512 f9bacbf3e8e3f0028559681232d84f1d9cdd845fd6c7d084e3db4660a4308a5b65ae919c49ede7b7ceaa873c09efe663feb0a0f238bc980337dca3f1104fcd3d WHIRLPOOL b3187145ea761c6edfd656b4bdf2c33df007ea4c4b9aaabce3fdf4992c3e0d41ebb26cc1361e3a18b32e63cd9526913fca22b109f1520035063feb408ab91a2a
 EBUILD haproxy-9999.ebuild 3350 SHA256 5888d4b06fb42006046e767d906b7042366c87731df8ccb6bbbe154cf6f78c90 SHA512 7e546a24e19cd0f669460c06f8baa41f6f817c30959d4fee741f06aff3294a833322b1bd821a6abfcf224c15f2c978fb982b9faf890dc686d75b43e1dc3fe7a2 WHIRLPOOL 39decbdc3a444729ba4550c7cff074c74265219483a98c57ae0db53c0f155408baa91e3808d0951d51eb4b50393925d626ac1c813125d449a3edd5bcbb8419d2
-MISC ChangeLog 19679 SHA256 2e7a3a14d7aa7e75d195ef25c311826e1596ea32fd1b20751fac884c1072186d SHA512 68b59abc4cd09e0f639c21f4901bae9900f3beefbe0282da7777be12f2efb2c6a80d2bc27d29dec22645e7304c39f0501967bdb103f2fc6aeec2a785e7a4821d WHIRLPOOL ea1935aa743a60a18035d19e5e6b2469accf468b465e771ee61d6776fc1082ce07f85a722ba1457baf53f36967cffc6bddfff0fc5f6e3fe8b5197694441ad9f0
+MISC ChangeLog 19876 SHA256 d08b00fa93940ebbfe968730780fcece9976079cf07f6554e3477bdf36675c71 SHA512 737e8f779baae845bcd3720e1da70ac10baeff37bb8f19778436600ee6f593f63dae7d233a02e87d5c23509c96137f9652ce1a07e75d39c7cd7ed5af12c774a7 WHIRLPOOL f15dbd688d40418482e94433e13ff84d389292e8a36d238a0a964a97be7b0d004a6de79136889d6148ea79d8394d72aed82b5fb7530355d51212a5786ea42575
 MISC metadata.xml 1567 SHA256 176c75ad779ae47ba3ac46a19755acec0a83e54bc9f6b36b920a652bd1cb50f0 SHA512 7902358b192c919cc2e34782d937af0c26d65c9b90f3473916b12fad4009ef985f892325716c1e031dcb73a68a53ff94529004459cf28845ecd3e7de172266c2 WHIRLPOOL 42e15558e0b84ce90ac5a15f43c5fb604fd526cc4485bbe66b947f97abeb99020bddb90a917fe46c948189d6cd91d95b9bba576af696aff6cbfefa14b50dce4f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJVkZ2jAAoJEMOx0zmdw4Z1jXsIAJrt42iSN9wy/NwfMrky3fd+
-e8yqmMaPvoYkwOYI8Z1uleqCtP/JewMgnPiYs+qcPa8cfyrWI89YUxSo9CfQF7Hk
-SOm/wXC8bmyylXlcBpBRTbxFZ0d+0Rqj9n3NPJc1PEyUqQCJIlSllgZAQbI46Hc0
-ZBJItWTa8FCIV2fqvZUlurKImYf9JXIzbeEhJox7ztQize15/MVGYQA8mhp1qFlp
-ByJDCm1LfcHMSo1BrxMe81NuSdjp8HCH9G+bdU/3vMQ+qjI6h6RxUO9233iGY5xc
-KsKcBrcWTCo4IQd4PsmSYTF13p9m6uCu5HaiwxjblTCp/tjtHJjPGSl9GHrXvUI=
-=XGYr
+iQEcBAEBCAAGBQJVnDTsAAoJEMOx0zmdw4Z1PkIH/Rc6KD60gcnYrggtEzkPvll7
+zG6wsg9PGzUk5B+cdvyajQKP9hfwZflbgqCtthRDA9gHjV+cX8FvYguZFy6mfCGs
+wMAMviltnnHo68qtt4/Fie3gBE5maQP6chxKSvDUGZ9OyJhuOlYho28jAj/AcBJa
+j0oyCfZzFkOEcCdMfjp7x9MhrpliMRdAtXlvvwDgg3ptHn69o0Vll9ZBV5+Q90ZK
+ZH2usqozd/mYWNBAaPS7SEjynif94Lx6yLRAWN7f/2bG6+rMhaKE9NmMpPEFhKQG
+5Ng+wXH//7afbZzEiSQcbIgkoIev8pG1tFoEi9LPYy2d49IIOOZF8CBiWarjDms=
+=Pykt
 -----END PGP SIGNATURE-----
diff --git a/net-proxy/haproxy/haproxy-1.5.13.ebuild b/net-proxy/haproxy/haproxy-1.5.13.ebuild
deleted file mode 100644
index 0d19732aacd2..000000000000
--- a/net-proxy/haproxy/haproxy-1.5.13.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# 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.13.ebuild,v 1.1 2015/06/29 19:33:50 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:0[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
-}
diff --git a/net-proxy/haproxy/haproxy-1.5.12.ebuild b/net-proxy/haproxy/haproxy-1.5.14.ebuild
index e7340914048c..d83b41c5ee9d 100644
--- a/net-proxy/haproxy/haproxy-1.5.12.ebuild
+++ b/net-proxy/haproxy/haproxy-1.5.14.ebuild
@@ -1,6 +1,6 @@
 # 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.12.ebuild,v 1.1 2015/05/15 09:34:25 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/haproxy/haproxy-1.5.14.ebuild,v 1.1 2015/07/07 20:22:00 idl0r Exp $
 
 EAPI="5"