5 files changed, 16 insertions, 101 deletions
diff --git a/net-proxy/haproxy/ChangeLog b/net-proxy/haproxy/ChangeLog
index 57ac321819cf..5342dac30ebb 100644
--- a/net-proxy/haproxy/ChangeLog
+++ b/net-proxy/haproxy/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-proxy/haproxy
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/haproxy/ChangeLog,v 1.18 2008/10/19 10:04:57 mrness Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/haproxy/ChangeLog,v 1.19 2009/01/10 11:36:33 mrness Exp $
+
+*haproxy-1.3.15.7 (10 Jan 2009)
+*haproxy-1.3.14.11 (10 Jan 2009)
+
+  10 Jan 2009; Alin Năstac <mrness@gentoo.org> -haproxy-1.3.14.6.ebuild,
+  -haproxy-1.3.14.8.ebuild, +haproxy-1.3.14.11.ebuild,
+  -haproxy-1.3.15.2.ebuild, -haproxy-1.3.15.4.ebuild,
+  +haproxy-1.3.15.7.ebuild:
+  Version bumps.
 
 *haproxy-1.3.15.5 (19 Oct 2008)
 *haproxy-1.3.14.9 (19 Oct 2008)
diff --git a/net-proxy/haproxy/haproxy-1.3.14.6.ebuild b/net-proxy/haproxy/haproxy-1.3.14.11.ebuild
index b74cdd47d66b..f4f442ab3b00 100644
--- a/net-proxy/haproxy/haproxy-1.3.14.6.ebuild
+++ b/net-proxy/haproxy/haproxy-1.3.14.11.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# 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.14.6.ebuild,v 1.1 2008/07/08 21:24:13 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/haproxy/haproxy-1.3.14.11.ebuild,v 1.1 2009/01/10 11:36:33 mrness Exp $
 
 inherit linux-info versionator
 
diff --git a/net-proxy/haproxy/haproxy-1.3.14.8.ebuild b/net-proxy/haproxy/haproxy-1.3.14.8.ebuild
deleted file mode 100644
index eda8894f1dd7..000000000000
--- a/net-proxy/haproxy/haproxy-1.3.14.8.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/haproxy/haproxy-1.3.14.8.ebuild,v 1.1 2008/10/12 08:17:10 mrness Exp $
-
-inherit linux-info versionator
-
-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}"
-
-src_compile() {
-	local ARGS="TARGET=linux${KV_MAJOR}${KV_MINOR}"
-	use pcre && ARGS="${ARGS} REGEX=pcre"
-	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
-		einfo "You need to create /etc/haproxy.cfg before you start haproxy service."
-		if [[ -d "${ROOT}/usr/share/doc/${P}" ]]; 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/${P}"
-		fi
-	fi
-}
diff --git a/net-proxy/haproxy/haproxy-1.3.15.4.ebuild b/net-proxy/haproxy/haproxy-1.3.15.4.ebuild
deleted file mode 100644
index c3ea52e2ecff..000000000000
--- a/net-proxy/haproxy/haproxy-1.3.15.4.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/haproxy/haproxy-1.3.15.4.ebuild,v 1.1 2008/10/12 08:17:10 mrness Exp $
-
-inherit versionator
-
-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}"
-
-src_compile() {
-	local ARGS="TARGET=linux26"
-	use pcre && ARGS="${ARGS} REGEX=pcre"
-	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
-		einfo "You need to create /etc/haproxy.cfg before you start haproxy service."
-		if [[ -d "${ROOT}/usr/share/doc/${P}" ]]; 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/${P}"
-		fi
-	fi
-}
diff --git a/net-proxy/haproxy/haproxy-1.3.15.2.ebuild b/net-proxy/haproxy/haproxy-1.3.15.7.ebuild
index 8a34e569257a..fd69be5d13eb 100644
--- a/net-proxy/haproxy/haproxy-1.3.15.2.ebuild
+++ b/net-proxy/haproxy/haproxy-1.3.15.7.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# 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.15.2.ebuild,v 1.1 2008/07/08 21:24:13 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/haproxy/haproxy-1.3.15.7.ebuild,v 1.1 2009/01/10 11:36:33 mrness Exp $
 
 inherit versionator
 
@@ -18,7 +18,7 @@ RDEPEND="${DEPEND}"
 
 src_compile() {
 	local ARGS="TARGET=linux26"
-	use pcre && ARGS="${ARGS} REGEX=pcre"
+	use pcre && ARGS="${ARGS} USE_PCRE=1"
 	emake ADDINC="${CFLAGS}" LDFLAGS="${LDFLAGS}" ${ARGS}
 }