From d0f6873fb0c364c12473e4cf5fb0bfebfcd207e6 Mon Sep 17 00:00:00 2001
From: Alin Năstac <mrness@gentoo.org>
Date: Thu, 22 Oct 2009 21:12:38 +0000
Subject: Version bump (#289691). (Portage version: 2.1.6.13/cvs/Linux x86_64)

---
 net-proxy/haproxy/ChangeLog             |  8 ++++-
 net-proxy/haproxy/haproxy-1.3.20.ebuild | 55 --------------------------------
 net-proxy/haproxy/haproxy-1.3.22.ebuild | 56 +++++++++++++++++++++++++++++++++
 3 files changed, 63 insertions(+), 56 deletions(-)
 delete mode 100644 net-proxy/haproxy/haproxy-1.3.20.ebuild
 create mode 100644 net-proxy/haproxy/haproxy-1.3.22.ebuild

diff --git a/net-proxy/haproxy/ChangeLog b/net-proxy/haproxy/ChangeLog
index d3d2ce822a2e..33987ea1f1d2 100644
--- a/net-proxy/haproxy/ChangeLog
+++ b/net-proxy/haproxy/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-proxy/haproxy
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/haproxy/ChangeLog,v 1.31 2009/08/18 03:08:27 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/haproxy/ChangeLog,v 1.32 2009/10/22 21:12:38 mrness Exp $
+
+*haproxy-1.3.22 (22 Oct 2009)
+
+  22 Oct 2009; Alin Năstac <mrness@gentoo.org> -haproxy-1.3.20.ebuild,
+  +haproxy-1.3.22.ebuild:
+  Version bump (#289691).
 
 *haproxy-1.3.20-r1 (18 Aug 2009)
 
diff --git a/net-proxy/haproxy/haproxy-1.3.20.ebuild b/net-proxy/haproxy/haproxy-1.3.20.ebuild
deleted file mode 100644
index 2cd9c2c2fa44..000000000000
--- a/net-proxy/haproxy/haproxy-1.3.20.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/haproxy/haproxy-1.3.20.ebuild,v 1.1 2009/08/15 22:59:49 mrness Exp $
-
-inherit versionator eutils
-
-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="pcre"
-
-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"
-	emake ADDINC="${CFLAGS}" LDFLAGS="${LDFLAGS}" ${ARGS}
-}
-
-src_install() {
-	exeinto /usr/bin
-	doexe haproxy
-	newinitd "${FILESDIR}/haproxy.initd" haproxy
-
-	# Don't install useless files
-	rm examples/build.cfg doc/*gpl.txt
-
-	dodoc CHANGELOG ROADMAP TODO doc/*.txt
-	docinto examples
-	dodoc examples/*.cfg
-}
-
-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.22.ebuild b/net-proxy/haproxy/haproxy-1.3.22.ebuild
new file mode 100644
index 000000000000..b9ab7fb29911
--- /dev/null
+++ b/net-proxy/haproxy/haproxy-1.3.22.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/haproxy/haproxy-1.3.22.ebuild,v 1.1 2009/10/22 21:12:38 mrness Exp $
+
+inherit versionator eutils
+
+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="pcre"
+
+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"
+	emake ADDINC="${CFLAGS}" LDFLAGS="${LDFLAGS}" ${ARGS}
+}
+
+src_install() {
+	exeinto /usr/bin
+	doexe haproxy
+	newinitd "${FILESDIR}/haproxy.initd" haproxy
+
+	# Don't install useless files
+	rm examples/build.cfg doc/*gpl.txt
+
+	dodoc CHANGELOG ROADMAP TODO doc/*.txt
+	docinto examples
+	dodoc examples/*.cfg
+}
+
+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
+}
-- 
cgit v1.2.3-65-gdbad