Version bump + cleanup

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

5 files changed, 29 insertions, 129 deletions

diff --git a/net-proxy/haproxy/ChangeLog b/net-proxy/haproxy/ChangeLog
index cc76a244adff..76bfa11b39c3 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.61 2012/02/28 22:41:06 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/haproxy/ChangeLog,v 1.62 2012/05/09 19:19:57 idl0r Exp $
+
+*haproxy-1.4.20 (09 May 2012)
+
+  09 May 2012; Christian Ruppert <idl0r@gentoo.org> -haproxy-1.4.15.ebuild,
+  -haproxy-1.4.18.ebuild, +haproxy-1.4.20.ebuild, -files/haproxy.initd:
+  Version bump + cleanup
 
   28 Feb 2012; Brent Baude <ranger@gentoo.org> haproxy-1.4.18-r1.ebuild:
   Marking haproxy-1.4.18-r1 ppc for bug 375111
diff --git a/net-proxy/haproxy/Manifest b/net-proxy/haproxy/Manifest
index 1c2687185d3a..353810cfd817 100644
--- a/net-proxy/haproxy/Manifest
+++ b/net-proxy/haproxy/Manifest
@@ -1,11 +1,23 @@
-AUX haproxy.initd 960 RMD160 6d3459f0977f424224efc5457afd22f0097a2dc3 SHA1 caa768e5efb706f66993d5de4a6c3c99f998ff13 SHA256 7812d95b55e133db49ea5e42b6604471400d70529ff6c2c4e78ffc15925f27c5
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX haproxy.initd-r1 1157 RMD160 6703f6fa38f2fcabff9f3f68893ac8e17f007bbe SHA1 45f8015720ace59d6fa0c2a0e35c8255789238b0 SHA256 5412580888ae334974d6af99a137adb9abbbc8ecd807c45c906058160b570de1
-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
 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
+DIST haproxy-1.4.20.tar.gz 825871 RMD160 33b8e52e22debeb7074960685720b12e2176f2b6 SHA1 4bf7a4b32caab450bb7c247cea7ec92c8cac1055 SHA256 f00949545fdc616ff9952e902d9d5a36f3eceebe77b978b4a4d78f895e0b283e
 EBUILD haproxy-1.4.18-r1.ebuild 2131 RMD160 d217ebccafd8567083e93a892338f4896f8781c8 SHA1 a37393bd2adbfe3f695db4f6ecef011b25984e92 SHA256 d555a5375df704234438742ae19d5f1b1ca148ea61755c505a7b15a39d985fa3
-EBUILD haproxy-1.4.18.ebuild 2127 RMD160 1847e9cde0979b4cc3d3217db77cc610c95cceea SHA1 0f7f1988a44a00a0ca21f26adc7c9c96fd045c79 SHA256 99741767f4276f699dcc7c89354fe7b36650afc944626988e28f7fbd6a325d12
 EBUILD haproxy-1.4.19.ebuild 2131 RMD160 07a12e4b37209959713929ea7da4f126f3498341 SHA1 6d3b976d3d7ddba9a086eddabbe4138c486ae9d7 SHA256 731a690480f24cf5c4af241b51aa544c22bffaa67fdcebb2ab449800bda0ce15
-MISC ChangeLog 11272 RMD160 92564178c9106f26ba335a9c83e468e58cba7aca SHA1 96718d8ee0c048bd18e8f317a48ca95b6942b52b SHA256 db8c0e43929b7d3bc3bb3d0beb1b606631baffcf2ded3f8fa4c0fc9b0a1ae90b
+EBUILD haproxy-1.4.20.ebuild 2131 RMD160 4644fb58f5158180fbdd4274d73228bbac4cc872 SHA1 98eb163824eb351fc228eed86300b1065111f905 SHA256 854e62e394bb844b43291468c7930bc6c3ea8067405f834b3e26373b67631776
+MISC ChangeLog 11476 RMD160 f5a5cfce7f14ce50a1246e2c3fc5f44cb1dd59c8 SHA1 8b89e66006612456763a314d0ff5a9d179ea785f SHA256 e26c4805e75ca68e45b44b72f701b24e7bef8ea8ca19884883e9529bece5a44f
 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
+-----END PGP SIGNATURE-----
diff --git a/net-proxy/haproxy/files/haproxy.initd b/net-proxy/haproxy/files/haproxy.initd
deleted file mode 100644
index 412fcbd9362e..000000000000
--- a/net-proxy/haproxy/files/haproxy.initd
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/haproxy/files/haproxy.initd,v 1.4 2011/12/04 10:32:32 swegener Exp $
-
-extra_started_commands="reload"
-
-CONFFILE=/etc/${SVCNAME}.cfg
-PIDFILE=/var/run/${SVCNAME}.pid
-
-checkconfig() {
-	if [ ! -f "${CONFFILE}" ]; then
-		eerror "${CONFFILE} does not exist!"
-		return 1
-	fi
-	/usr/bin/haproxy -c -f "${CONFFILE}" >/dev/null 
-}
-
-depend() {
-	need net
-	use dns logger
-}
-
-start() {
-	checkconfig || return 1
-
-	ebegin "Starting ${SVCNAME}"
-	start-stop-daemon --start --quiet \
-		--exec /usr/bin/haproxy \
-		-- -D -p "${PIDFILE}" -f "${CONFFILE}"
-	eend ${?}
-}
-
-stop() {
-	ebegin "Stopping ${SVCNAME}"
-	start-stop-daemon --stop --quiet --pidfile "${PIDFILE}"
-	eend ${?}
-}
-
-reload() {
-	ebegin "Reloading ${SVCNAME}"
-	/usr/bin/haproxy -D -p "${PIDFILE}" -f "${CONFFILE}" -sf $(cat "${PIDFILE}")
-	eend ${?}
-}
diff --git a/net-proxy/haproxy/haproxy-1.4.15.ebuild b/net-proxy/haproxy/haproxy-1.4.15.ebuild
deleted file mode 100644
index f861c9b1da6d..000000000000
--- a/net-proxy/haproxy/haproxy-1.4.15.ebuild
+++ /dev/null
@@ -1,75 +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.4.15.ebuild,v 1.5 2011/09/21 13:44:51 idl0r Exp $
-
-EAPI="3"
-
-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.4.18.ebuild b/net-proxy/haproxy/haproxy-1.4.20.ebuild
index ab1388d5694c..a4b28d9dee81 100644
--- a/net-proxy/haproxy/haproxy-1.4.18.ebuild
+++ b/net-proxy/haproxy/haproxy-1.4.20.ebuild
@@ -1,8 +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.4.18.ebuild,v 1.2 2011/09/21 13:44:51 idl0r Exp $
+# $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="3"
+EAPI="4"
 
 inherit eutils versionator toolchain-funcs flag-o-matic
 
@@ -39,7 +39,8 @@ src_compile() {
 
 src_install() {
 	dobin haproxy || die
-	newinitd "${FILESDIR}/haproxy.initd" haproxy || die
+
+	newinitd "${FILESDIR}/haproxy.initd-r1" haproxy || die
 
 	# Don't install useless files
 	rm examples/build.cfg doc/*gpl.txt