5 files changed, 52 insertions, 133 deletions
diff --git a/net-proxy/haproxy/ChangeLog b/net-proxy/haproxy/ChangeLog
index 4a7cefd1bc35..5fe687aa6d46 100644
--- a/net-proxy/haproxy/ChangeLog
+++ b/net-proxy/haproxy/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-proxy/haproxy
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/haproxy/ChangeLog,v 1.42 2010/10/24 14:50:37 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/haproxy/ChangeLog,v 1.43 2010/11/13 19:14:21 idl0r Exp $
+
+*haproxy-1.4.9 (13 Nov 2010)
+
+  13 Nov 2010; Christian Ruppert <idl0r@gentoo.org> -haproxy-1.3.14.14.ebuild,
+  -haproxy-1.3.15.10.ebuild, -haproxy-1.3.22-r1.ebuild, +haproxy-1.4.9.ebuild:
+  Cleanup. Version bump to 1.4.9.
 
   24 Oct 2010; Brent Baude <ranger@gentoo.org> haproxy-1.3.25.ebuild,
   haproxy-1.4.8.ebuild:
diff --git a/net-proxy/haproxy/Manifest b/net-proxy/haproxy/Manifest
index 7c63c0448f9a..7a97fc4ce7b1 100644
--- a/net-proxy/haproxy/Manifest
+++ b/net-proxy/haproxy/Manifest
@@ -1,15 +1,25 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX haproxy.initd 948 RMD160 a2be74ba6c0672544e4f90ff28b3671e3493a7d3 SHA1 3d003a7f2d1bbb078ca6e51d2588605f0c4700a7 SHA256 4ffccbd0e635ba89235561669cab9e9d4cd8f13e1d8028213c08e9123f092628
-DIST haproxy-1.3.14.14.tar.gz 483645 RMD160 cb848fe08f240d4c5b15c093ff322e32892a981e SHA1 2e15337dbcd6e442cb3a0a0f96b90b136e52a262 SHA256 5fd44c5f3ea817a7d505e8cb0df46405a3204ca79b100dc9af6323e7cc55579e
-DIST haproxy-1.3.15.10.tar.gz 521883 RMD160 bd7aa526ba44223dc8dd67403974305d785688a4 SHA1 68f7fd13a75f8605d55fea62b4d42619fa9053ee SHA256 75cd6fce0a1e959a100ecce7de05f0bc797c49e66b26f142c0d36605751eab6b
 DIST haproxy-1.3.20.tar.gz 648912 RMD160 5f16cd2862bc02b61be44682d591f689a36c964d SHA1 c017c2853ca0f20669abfb24c7f3b30630d86438 SHA256 a1e99fa00d69aa8d9f800d381a6ef1daa8797893e49a147f2fb963cfef56bd77
-DIST haproxy-1.3.22.tar.gz 655125 RMD160 2a4149fecc9a2f08c8b1d5af3ea29b67016a050e SHA1 4f927d810d89bd258aa8a262cebb217e2df2932f SHA256 6c8d38c68156c4ebcbf72aa423f682cbb414fbe11922a7173f324b58c9eb98f7
 DIST haproxy-1.3.25.tar.gz 662198 RMD160 54fac52224e5e1a32d19c4e8b5da92e1ee6ed6ff SHA1 08fcc1f881514cb8ded801890743af29b93d5d30 SHA256 50dbe7b515c32a643b7caaac32ec3152ba536e589242e4d50ff42618a85f5a78
 DIST haproxy-1.4.8.tar.gz 778220 RMD160 617f5674c44dbf14b7ff8118c508e889f06c2afc SHA1 3b7a982ba7fb01d43826f5af5e95c86080ae0ca3 SHA256 707487ade815cbd37492d91a014f9a5b3ac313e5b4cb31e2d7c4d2a16f4a23f1
-EBUILD haproxy-1.3.14.14.ebuild 1679 RMD160 219aee748df5246c59d901d4d18989a57899d27d SHA1 801fe56562ffc992bbe0ef3e88e075a853038ea7 SHA256 5eb69e39b5b635f6fd4f83c07bdfce0e7663beee976d25eff8e0deb574e4cedb
-EBUILD haproxy-1.3.15.10.ebuild 1648 RMD160 8601d2565955a08e5bf1caec223b8ea7669d3b0d SHA1 980070ecd946dc7410867a2ee2436671877fee65 SHA256 272c02bdceb81f3e5ba02bf8ddd074501b55882161af00a5a38cd38e21bc67f8
+DIST haproxy-1.4.9.tar.gz 806102 RMD160 006fa1bf3c576d375be86cea2d3e11ee99c28d57 SHA1 4c422a8fa536de23920ac926dd6829125bd2597d SHA256 68565c216a39cf2e9b7dbe4775b4ede9696b324dd6d9fa962aec8fdfb6518826
 EBUILD haproxy-1.3.20-r1.ebuild 1703 RMD160 a3ca49d31d378f5eb7fa135062b87e6f2a454a8a SHA1 434557c5104bbd3fea819f01c4897edd92df0d8a SHA256 de00df0635a8594e47db66bc635852d301668198426b4c0d9847c65b37ffa631
-EBUILD haproxy-1.3.22-r1.ebuild 1761 RMD160 a0acc89b6959b9f91be840baf41d479b393408ce SHA1 1ff2748df9e7c1c19cda1f3391dec0ae8cfe4e4a SHA256 eacc6a77ba2bf88187d48ba9214f664bd0c21f73030b79422513e8523e43b6d2
 EBUILD haproxy-1.3.25.ebuild 1973 RMD160 2a1322e802d972b307c535c8709e2945ef5ebce2 SHA1 b4a35a1d7e488974a2178c766bd2f2922b7d196d SHA256 3b985ddc7d85990448d6a812f37eee88c1c9c0bc2ca685ff57e14a7c84fd8f4e
 EBUILD haproxy-1.4.8.ebuild 1972 RMD160 2021c2283cf339606695d819947d6e5756311a74 SHA1 d8f9f48620cb131e929e2424208d79c7f5c07e49 SHA256 5b5067907c18513b05039334b3676d22106428440d41d417005134d1918c3b60
-MISC ChangeLog 7882 RMD160 1903b942ffdc2f6c1efae2bfe31353ac5cc7966a SHA1 cae4ee6bd6b9bff38a56c2ab8ecde0d1ef79b4d1 SHA256 679869d7308e6625811515ab7df6f93b10c05a21b446aff98bd39535c5e4022b
+EBUILD haproxy-1.4.9.ebuild 1974 RMD160 220bcfc9b5b54b2181f07a7f63d7248354866444 SHA1 8d40608a591ed7333f8af1d7b5ff68b0f83dccab SHA256 8ef528cdd65304cd1b68d14fa39dfdf8493ed460be75a1e3de7b06e27d9dced2
+MISC ChangeLog 8104 RMD160 fd1a60a6befbdac94f89d215d7a98536424d511c SHA1 1c3029d2aed4f6981abbb0e7bf44ba2327e6bd2a SHA256 c917cb9507c27b9f9277af55f3fad8fdbba12659da72eead0434b4d20f383362
 MISC metadata.xml 1354 RMD160 ac6872987bd23662488dfc576325efc06812010d SHA1 346fee4729e8480a7b92fdcae35958bd25d0240b SHA256 d13717d25240c3aae5018d4735f22e421a3dba7b06e123efcb0bed2a4c023609
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iQEcBAEBCAAGBQJM3uOSAAoJEMOx0zmdw4Z1HMkIAJL6vcGmLu+/L3sYaom+Upyx
+5NbmB+47QQ9kz/ncYUknVi1HTD+UeVQrBUVtNupUzXmQ8/KfHJWB8Z9ZpVCcOggg
+X5zHlerUJkFCUTgF43+mYPGfpdpuPgHlkhOB4BagX0DY7NEF11xvD7sBrz36WX3G
+qw9zrOHEmqR8NmyMxqQOFUl1WxQ+tDbs0WQww+x/kuMgStFFQzml7r2zKnFcBKdj
+6Dd93E4sTfS+087MU6TzI0C9YN8TPZ92rogGBeSboNyn20GEjv9JlQzya+l/jn3Q
+4PE3i/257pkB7KROqgz8jqNfvh2p9fTXpU7zCG7MzeMEI4U56LW+1ubc8QX/3aA=
+=IUn0
+-----END PGP SIGNATURE-----
diff --git a/net-proxy/haproxy/haproxy-1.3.14.14.ebuild b/net-proxy/haproxy/haproxy-1.3.14.14.ebuild
deleted file mode 100644
index 77b685139509..000000000000
--- a/net-proxy/haproxy/haproxy-1.3.14.14.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.14.14.ebuild,v 1.3 2009/11/01 16:34:44 nixnut Exp $
-
-inherit linux-info 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=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
-		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.15.10.ebuild b/net-proxy/haproxy/haproxy-1.3.15.10.ebuild
deleted file mode 100644
index 291c45e8c0b9..000000000000
--- a/net-proxy/haproxy/haproxy-1.3.15.10.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.15.10.ebuild,v 1.3 2009/11/01 16:34:44 nixnut 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-r1.ebuild b/net-proxy/haproxy/haproxy-1.4.9.ebuild
index f31e248e2142..a9c8a77c7e6d 100644
--- a/net-proxy/haproxy/haproxy-1.3.22-r1.ebuild
+++ b/net-proxy/haproxy/haproxy-1.4.9.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 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-r1.ebuild,v 1.1 2009/12/05 09:04:28 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/haproxy/haproxy-1.4.9.ebuild,v 1.1 2010/11/13 19:14:21 idl0r Exp $
 
-inherit versionator eutils
+inherit eutils versionator
 
 DESCRIPTION="A TCP/HTTP reverse proxy for high availability environments"
 HOMEPAGE="http://haproxy.1wt.eu"
@@ -11,7 +11,7 @@ SRC_URI="http://haproxy.1wt.eu/download/$(get_version_component_range 1-2)/src/$
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="pcre"
+IUSE="examples pcre vim-syntax"
 
 DEPEND="pcre? ( dev-libs/libpcre )"
 RDEPEND="${DEPEND}"
@@ -22,24 +22,37 @@ pkg_setup() {
 }
 
 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"
-	emake ADDINC="${CFLAGS}" LDFLAGS="${LDFLAGS}" ${ARGS}
+	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"
+
+	emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" ${args} || die
 }
 
 src_install() {
-	exeinto /usr/bin
-	doexe haproxy
-	newinitd "${FILESDIR}/haproxy.initd" haproxy
+	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/*.txt
-	docinto examples
-	dodoc examples/*.cfg
+	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() {