Version bump and cleanup

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

5 files changed, 25 insertions, 171 deletions

diff --git a/net-proxy/haproxy/ChangeLog b/net-proxy/haproxy/ChangeLog
index 55a2633f255f..9d2ee609e414 100644
--- a/net-proxy/haproxy/ChangeLog
+++ b/net-proxy/haproxy/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-proxy/haproxy
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/haproxy/ChangeLog,v 1.59 2011/12/04 15:01:26 hwoarang Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/haproxy/ChangeLog,v 1.60 2012/02/27 22:40:14 idl0r Exp $
+
+*haproxy-1.4.19 (27 Feb 2012)
+
+  27 Feb 2012; Christian Ruppert <idl0r@gentoo.org> -haproxy-1.3.25.ebuild,
+  -haproxy-1.3.26.ebuild, -haproxy-1.3.26-r1.ebuild, +haproxy-1.4.19.ebuild:
+  Version bump and cleanup
 
   04 Dec 2011; Markos Chandras <hwoarang@gentoo.org> haproxy-1.4.18-r1.ebuild:
   Stable on amd64 wrt bug #375111
diff --git a/net-proxy/haproxy/Manifest b/net-proxy/haproxy/Manifest
index 7b7d134b6ac4..f83b4be5adba 100644
--- a/net-proxy/haproxy/Manifest
+++ b/net-proxy/haproxy/Manifest
@@ -1,34 +1,25 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX haproxy.initd 960 RMD160 6d3459f0977f424224efc5457afd22f0097a2dc3 SHA1 caa768e5efb706f66993d5de4a6c3c99f998ff13 SHA256 7812d95b55e133db49ea5e42b6604471400d70529ff6c2c4e78ffc15925f27c5
 AUX haproxy.initd-r1 1157 RMD160 6703f6fa38f2fcabff9f3f68893ac8e17f007bbe SHA1 45f8015720ace59d6fa0c2a0e35c8255789238b0 SHA256 5412580888ae334974d6af99a137adb9abbbc8ecd807c45c906058160b570de1
-DIST haproxy-1.3.25.tar.gz 662198 RMD160 54fac52224e5e1a32d19c4e8b5da92e1ee6ed6ff SHA1 08fcc1f881514cb8ded801890743af29b93d5d30 SHA256 50dbe7b515c32a643b7caaac32ec3152ba536e589242e4d50ff42618a85f5a78
-DIST haproxy-1.3.26.tar.gz 668337 RMD160 f11286cef16eb3c9e29d09da3293316957226843 SHA1 4a93bcf6bcd48969fa44ac8081ce7a8baf518e17 SHA256 ab97d7f524b8c816c2b42b99d63691c819a32fe593c22242dad3108c7f85f274
 DIST haproxy-1.4.15.tar.gz 812293 RMD160 1a5e3e5c4ea71e4d439ffc4b221e31ae90d04f88 SHA1 8c42bc8c7d3714061b6fb74b0e3565d1e672556f SHA256 4baebfe0a5a9220f77d9175b2e711dc8985bbb696d11c38033cc0e94e3cca93a
 DIST haproxy-1.4.18.tar.gz 820427 RMD160 16729f0519a47123d88e849ae95d600c590c8583 SHA1 191dbcb5880c711580693bd081ca5fdd8dde3012 SHA256 ec2b6222a34d11f97cf7cf5cc696080dac34e94deb8e6cf3822b27442e0793fa
-EBUILD haproxy-1.3.25.ebuild 2114 RMD160 a659cb1b4b5363587dcff5b0110d6e70de9fba6b SHA1 2459ba284afeb6e1b5fa7c9b48e1832dd7105aa4 SHA256 f1c490d64addccb658b225e4c8ff94d0537ef5411c96309d3fa820a5f14dc88b
-EBUILD haproxy-1.3.26-r1.ebuild 2123 RMD160 6c18aa1b1390c6cd4ff68535d829a658f9c12214 SHA1 53463d39424a2d8648f9423b554135cf889f5604 SHA256 a333a4ca4590fe954c7875335b38a326d15469cdb32c28bfc20937daa31c83c3
-EBUILD haproxy-1.3.26.ebuild 2117 RMD160 53403476cc28b297f6fdeaea0334175a2b743d96 SHA1 bfd80e37e59e2d8898722625d7928c58c2953c38 SHA256 b6f22a2176dcd70305e6a5e41d1f76ac7a70d611e10bd09fa6ce2bd40fdd081e
+DIST haproxy-1.4.19.tar.gz 824610 RMD160 b98799e6e83b0834432e010c9c9149820725bd23 SHA1 f40de2fee9f4c6ad35a1ee358499f860f042ad86 SHA256 dbee7d9afa6ca4aae884e4ab6aaf2a951c4f4f3cb91c2aca73b3317c7cebea25
 EBUILD haproxy-1.4.15.ebuild 2125 RMD160 46aae9d007aeb5f85073a158048fcb7041714fcb SHA1 ed62ad19e94f15cb72a4adcb50ebdbb122861c62 SHA256 e3d93b9bf710b0b354d2e8081a404aebbf64a31b573927949baec1f503fd1fef
 EBUILD haproxy-1.4.18-r1.ebuild 2134 RMD160 b5ef186ade7583ea0107f521dd8cd81d7a7c5551 SHA1 b01604300dfc58e8fc5d501d9c84d77f3df9f2ee SHA256 a8cab8a205208a53f6b4ab38810615687972865168087263b68253b8d8912bf3
 EBUILD haproxy-1.4.18.ebuild 2127 RMD160 1847e9cde0979b4cc3d3217db77cc610c95cceea SHA1 0f7f1988a44a00a0ca21f26adc7c9c96fd045c79 SHA256 99741767f4276f699dcc7c89354fe7b36650afc944626988e28f7fbd6a325d12
-MISC ChangeLog 10941 RMD160 fe37f3be11b83728ee6132b7b2b60d778ee2040a SHA1 d174d5458206057db8129eb926ba64abbd4fa64f SHA256 a875edea932e5e8b6688f3381b1bc9a88457c281bb737b4dd89ab4c95476caa0
+EBUILD haproxy-1.4.19.ebuild 2131 RMD160 07a12e4b37209959713929ea7da4f126f3498341 SHA1 6d3b976d3d7ddba9a086eddabbe4138c486ae9d7 SHA256 731a690480f24cf5c4af241b51aa544c22bffaa67fdcebb2ab449800bda0ce15
+MISC ChangeLog 11150 RMD160 26406ed1cd9a889bd88636c58f955b9bf1723d90 SHA1 e0cb0252d90fe98d3fa65db095466b9f3eedbeea SHA256 3fb34974b3e6eb3a97ca63577456e5cebbd0386beafb4fe86bbc1a3be4504e8d
 MISC metadata.xml 1450 RMD160 1e354be32e3ed9cbd5cd2b1aadbb9dd7772cd526 SHA1 035780ecce98f5856301af6e1633e11ce2bb5e8c SHA256 0797818620feed90cb3481805f66448e3a32afa5f981a95e45e0b0535fbc1cf4
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJO24tGAAoJEPqDWhW0r/LCnkEP/ihlfiOgSCOYxy2Sw/hmxtBO
-NzYIWokSkNuS+vwdFSxhRWUYclmGBk0xW5PxqiyYyfoLMho2cLvRvWW+32uVRRuZ
-IUTQy5RmkWbfluqWqrryS23zxQZwicU9pmpt6MBdiOCu6SprHZt5Xv1gsFKsESTA
-ujipdAzaMPCA73twxt1I6tF2aCiMDf645DiMseMqc7by59MCMEaArfvk/+YE1C2A
-4QEOpArsXsdADItn7v/G2GQxTJi8mcEvZFjtNpAq0Fap0O7EXKKNr+FhkQxVjiEY
-OpFKpzb7cHQzwu/5NBqjiHQs1Zrm6l4EppEdI2Uht5dYbm2cUgsYG/l+/QN8RYGf
-8wT9k89ht9gMo319xjZf5EV9SgYr7RpIem/lyL28ayt/eseu2RhEYju+LBRrroRa
-/CljqT22wQBeYYwp6x1p6/9PJYdJ/BeP5d751cyuaMqIhdS8vausumEInmulvsR6
-UxBmkuHxltpLW+tdLrRMu+wZCvo+23Unl/GTpRg7G/MzHnDWn0YBAzzOZp1GQi1N
-EhtHO+9L8AkPIvlyxaLGHJSJvTKQRXZyFBs37AGHRoHciiW/nullre8b4MKb39pw
-QtkN1HcutK4itj59QkqcxzLaubNWTzRG7rfhKYJQa/hGsJGfsPQyNNEDsWcp3G3h
-4jkZwopRwcgHWBiVuxQ/
-=9bKX
+iQEcBAEBCAAGBQJPTAZYAAoJEMOx0zmdw4Z133QIAKB2afOfZAVN/Pr2bbLh12Gt
+VCG4SjTI/kgLUiT90cxV6T+vOaA0tOvVvVwP2u0VNYYe9U0CspSs9Wp7w3qVD28h
+YA02NuP290qvSZFa0GQKIiatKmIYn5CUQdU3XmIIrEoldqmHQfgL5XYcjK1cDYBZ
+7l3LBiQcalZ8hGd9U/rCIWpO7lviWdJANDkut+eFQ9aVoksMBsMFQG7nF5tbGf7k
+i67k4V7CaiVmAh/7tVNA92Lu4dDRU3KW1PEiaGjqKbFBlajivloZQxwFufQdyQ5d
+/nqzREwBsxypqkxVjI3VywFwgd+xmkPDOD3TkZ1tp+KD35Q7iz5aSRkqawKBBP0=
+=vA08
 -----END PGP SIGNATURE-----
diff --git a/net-proxy/haproxy/haproxy-1.3.25.ebuild b/net-proxy/haproxy/haproxy-1.3.25.ebuild
deleted file mode 100644
index bd1a86e53a15..000000000000
--- a/net-proxy/haproxy/haproxy-1.3.25.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/haproxy/haproxy-1.3.25.ebuild,v 1.6 2011/09/21 13:44:51 idl0r Exp $
-
-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" 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.3.26.ebuild b/net-proxy/haproxy/haproxy-1.3.26.ebuild
deleted file mode 100644
index f9a8a7a215e1..000000000000
--- a/net-proxy/haproxy/haproxy-1.3.26.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/haproxy/haproxy-1.3.26.ebuild,v 1.2 2011/09/21 13:44:51 idl0r Exp $
-
-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" 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.3.26-r1.ebuild b/net-proxy/haproxy/haproxy-1.4.19.ebuild
index cd6d6a604def..0f438c869285 100644
--- a/net-proxy/haproxy/haproxy-1.3.26-r1.ebuild
+++ b/net-proxy/haproxy/haproxy-1.4.19.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2011 Gentoo Foundation
+# 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.3.26-r1.ebuild,v 1.1 2011/09/28 15:23:02 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/haproxy/haproxy-1.4.19.ebuild,v 1.1 2012/02/27 22:40:14 idl0r Exp $
+
+EAPI="4"
 
 inherit eutils versionator toolchain-funcs flag-o-matic
 
@@ -37,6 +39,7 @@ src_compile() {
 
 src_install() {
 	dobin haproxy || die
+
 	newinitd "${FILESDIR}/haproxy.initd-r1" haproxy || die
 
 	# Don't install useless files