Version bump, bug 417079 - SA49261.

Package-Manager: portage-2.2.0_alpha107/cvs/Linux x86_64

4 files changed, 18 insertions, 90 deletions

diff --git a/net-proxy/haproxy/ChangeLog b/net-proxy/haproxy/ChangeLog
index 76bfa11b39c3..d37b13c1134b 100644
--- a/net-proxy/haproxy/ChangeLog
+++ b/net-proxy/haproxy/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-proxy/haproxy
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/haproxy/ChangeLog,v 1.62 2012/05/09 19:19:57 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/haproxy/ChangeLog,v 1.63 2012/05/22 13:50:57 idl0r Exp $
+
+*haproxy-1.4.21 (22 May 2012)
+
+  22 May 2012; Christian Ruppert <idl0r@gentoo.org> -haproxy-1.4.19.ebuild,
+  -haproxy-1.4.20.ebuild, +haproxy-1.4.21.ebuild:
+  Version bump, bug 417079 - SA49261.
 
 *haproxy-1.4.20 (09 May 2012)
 
diff --git a/net-proxy/haproxy/Manifest b/net-proxy/haproxy/Manifest
index 353810cfd817..811e46b4f56d 100644
--- a/net-proxy/haproxy/Manifest
+++ b/net-proxy/haproxy/Manifest
@@ -3,21 +3,19 @@ Hash: SHA256
 
 AUX haproxy.initd-r1 1157 RMD160 6703f6fa38f2fcabff9f3f68893ac8e17f007bbe SHA1 45f8015720ace59d6fa0c2a0e35c8255789238b0 SHA256 5412580888ae334974d6af99a137adb9abbbc8ecd807c45c906058160b570de1
 DIST haproxy-1.4.18.tar.gz 820427 RMD160 16729f0519a47123d88e849ae95d600c590c8583 SHA1 191dbcb5880c711580693bd081ca5fdd8dde3012 SHA256 ec2b6222a34d11f97cf7cf5cc696080dac34e94deb8e6cf3822b27442e0793fa
-DIST haproxy-1.4.19.tar.gz 824610 RMD160 b98799e6e83b0834432e010c9c9149820725bd23 SHA1 f40de2fee9f4c6ad35a1ee358499f860f042ad86 SHA256 dbee7d9afa6ca4aae884e4ab6aaf2a951c4f4f3cb91c2aca73b3317c7cebea25
-DIST haproxy-1.4.20.tar.gz 825871 RMD160 33b8e52e22debeb7074960685720b12e2176f2b6 SHA1 4bf7a4b32caab450bb7c247cea7ec92c8cac1055 SHA256 f00949545fdc616ff9952e902d9d5a36f3eceebe77b978b4a4d78f895e0b283e
+DIST haproxy-1.4.21.tar.gz 827392 RMD160 78d2d81f4ffa03e57fedaf090c42479ceb669438 SHA1 31df0e8bd18350457a5d3432f367c6218ecc9042 SHA256 6e28575f0492def31c331faf9ead08225dd62153334880688f8a7c477c8c31a4
 EBUILD haproxy-1.4.18-r1.ebuild 2131 RMD160 d217ebccafd8567083e93a892338f4896f8781c8 SHA1 a37393bd2adbfe3f695db4f6ecef011b25984e92 SHA256 d555a5375df704234438742ae19d5f1b1ca148ea61755c505a7b15a39d985fa3
-EBUILD haproxy-1.4.19.ebuild 2131 RMD160 07a12e4b37209959713929ea7da4f126f3498341 SHA1 6d3b976d3d7ddba9a086eddabbe4138c486ae9d7 SHA256 731a690480f24cf5c4af241b51aa544c22bffaa67fdcebb2ab449800bda0ce15
-EBUILD haproxy-1.4.20.ebuild 2131 RMD160 4644fb58f5158180fbdd4274d73228bbac4cc872 SHA1 98eb163824eb351fc228eed86300b1065111f905 SHA256 854e62e394bb844b43291468c7930bc6c3ea8067405f834b3e26373b67631776
-MISC ChangeLog 11476 RMD160 f5a5cfce7f14ce50a1246e2c3fc5f44cb1dd59c8 SHA1 8b89e66006612456763a314d0ff5a9d179ea785f SHA256 e26c4805e75ca68e45b44b72f701b24e7bef8ea8ca19884883e9529bece5a44f
+EBUILD haproxy-1.4.21.ebuild 2131 RMD160 b72f544e27e9fee22311ba7044bd8e1c58ca8f2c SHA1 81d11626c7ae8992b98098ccbc5b9e2c1ae9e95c SHA256 17e96891eab6936ddfb6495966eeeec24ce6ff616ef29fb9030d1cc4cfb4f14b
+MISC ChangeLog 11672 RMD160 9ed1096258b1117f76d646dced60dc67cd2bd7d9 SHA1 4bd30e4a5429ac75b2635b75b8f74be6be5a1952 SHA256 1d3df7ac796f80b3e2e65090bd3ae7b98026213182fc36c4506aa58c612c9b02
 MISC metadata.xml 1450 RMD160 1e354be32e3ed9cbd5cd2b1aadbb9dd7772cd526 SHA1 035780ecce98f5856301af6e1633e11ce2bb5e8c SHA256 0797818620feed90cb3481805f66448e3a32afa5f981a95e45e0b0535fbc1cf4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQEcBAEBCAAGBQJPqsNnAAoJEMOx0zmdw4Z1TdcH/isof4XxBqaG13jKry2wqgSo
-fhtReRh6r75S0svIcGrJhLrSjt/N61Xc3YzE/OTf8YjlUK+sITS4LlyCvTYp+N/F
-KwNfEhNPIP74h6NpMoccmiiokQaT6KBbj42hKT/JQZyOC1hEynyWC3+qXgKhOsxf
-rIsiRRaeaA9D+2J1JFBc8Tg3444B4StjyCHDwo07fZooleuBvi3LbT4/GZXqnZ2/
-375c4YsFhfZHkT98ubN5CJGlWaTta3xv5D+e1xTDjbUtAsO4WcEwBuqSCsHfG0Or
-k9f1TV2gZIZ1+O3NvPsX/s3Zahv/SMwkrxBaYQoW9H+Kk+kdzt1lfmUm/DzvU0Q=
-=eAgT
+iQEcBAEBCAAGBQJPu5nKAAoJEMOx0zmdw4Z1X8wIALtmUE8Y8XawHFDA/SCNw+wz
+1Dhc42s3KVnH9N8A5sULVP/cE4UnJWLxAQPcJobad4ktU0TWQnXtYHWEsA8GKHxs
+jjeozDTCkgWuzY5ycGZ5NMFBK6TXFgrF9C0buEwRhTHU3KDEFTQYKDcRgQYAw+fK
+ArtAyxVoEj+2+/C6zIxslNzKBkYrQrp5oshVKk7VpXRSPj88nBRokTPUehyKIJP+
+vODoEzSWbBbvbt3LFRrVWyITnEo9bq3g23v3lpu+EEK/YzgkBhFmwbY0SsOnhFRn
+Xv3PgTU0AIMOuiMdBXl695XKEaa6zM4Trz9q783toCEepmVBnv6KjzfWUXX57H0=
+=Xdei
 -----END PGP SIGNATURE-----
diff --git a/net-proxy/haproxy/haproxy-1.4.20.ebuild b/net-proxy/haproxy/haproxy-1.4.20.ebuild
deleted file mode 100644
index a4b28d9dee81..000000000000
--- a/net-proxy/haproxy/haproxy-1.4.20.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/haproxy/haproxy-1.4.20.ebuild,v 1.1 2012/05/09 19:19:57 idl0r Exp $
-
-EAPI="4"
-
-inherit eutils versionator toolchain-funcs flag-o-matic
-
-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/${P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="examples pcre vim-syntax"
-
-DEPEND="pcre? ( dev-libs/libpcre )"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	enewgroup haproxy
-	enewuser haproxy -1 -1 -1 haproxy
-}
-
-src_compile() {
-	local args="TARGET=linux26"
-
-	use pcre && args="${args} USE_PCRE=1"
-
-	use kernel_linux && args="${args} USE_LINUX_SPLICE=1"
-	use kernel_linux && args="${args} USE_LINUX_TPROXY=1"
-
-	# 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
-}
-
-src_install() {
-	dobin haproxy || die
-
-	newinitd "${FILESDIR}/haproxy.initd-r1" haproxy || die
-
-	# 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
-
-	if use examples;
-	then
-		docinto examples
-		dodoc examples/*.cfg || die
-	fi
-
-	if use vim-syntax;
-	then
-		insinto /usr/share/vim/vimfiles/syntax
-		doins examples/haproxy.vim || die
-	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.4.19.ebuild b/net-proxy/haproxy/haproxy-1.4.21.ebuild
index 0f438c869285..192f19b5e814 100644
--- a/net-proxy/haproxy/haproxy-1.4.19.ebuild
+++ b/net-proxy/haproxy/haproxy-1.4.21.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/haproxy/haproxy-1.4.19.ebuild,v 1.1 2012/02/27 22:40:14 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/haproxy/haproxy-1.4.21.ebuild,v 1.1 2012/05/22 13:50:57 idl0r Exp $
 
 EAPI="4"