Version bump; add reload init script option (#197202).

(Portage version: 2.1.3.9)

7 files changed, 32 insertions, 60 deletions

diff --git a/net-proxy/haproxy/ChangeLog b/net-proxy/haproxy/ChangeLog
index 0eb4fc63766b..4848a9ad035f 100644
--- a/net-proxy/haproxy/ChangeLog
+++ b/net-proxy/haproxy/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-proxy/haproxy
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/haproxy/ChangeLog,v 1.8 2007/08/18 14:43:07 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/haproxy/ChangeLog,v 1.9 2007/10/27 10:42:31 mrness Exp $
+
+*haproxy-1.3.13 (27 Oct 2007)
+
+  27 Oct 2007; Alin Năstac <mrness@gentoo.org> files/haproxy.initd,
+  -haproxy-1.2.16.ebuild, -haproxy-1.3.11.4.ebuild, +haproxy-1.3.13.ebuild:
+  Version bump; add reload init script option (#197202).
 
 *haproxy-1.3.12 (18 Aug 2007)
 
diff --git a/net-proxy/haproxy/files/digest-haproxy-1.2.16 b/net-proxy/haproxy/files/digest-haproxy-1.2.16
deleted file mode 100644
index 1262ca2339b3..000000000000
--- a/net-proxy/haproxy/files/digest-haproxy-1.2.16
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 f72c44bcddf868edf4000503be09a12d haproxy-1.2.16.tar.gz 197867
-RMD160 f9fde12bd4d9ef3397c5f56f6ba679d8d65699c2 haproxy-1.2.16.tar.gz 197867
-SHA256 c8635aaf761f3bb74676d6cbc1ebb415cdcebebcdb46261a737a7d69c4251f2f haproxy-1.2.16.tar.gz 197867
diff --git a/net-proxy/haproxy/files/digest-haproxy-1.3.11.4 b/net-proxy/haproxy/files/digest-haproxy-1.3.11.4
deleted file mode 100644
index 0c82d481d870..000000000000
--- a/net-proxy/haproxy/files/digest-haproxy-1.3.11.4
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 51dd99e4c9b4b40ff165ea4d689cacd6 haproxy-1.3.11.4.tar.gz 346397
-RMD160 deca2bef441147f68bc3392a0ede26cbe6b23fb6 haproxy-1.3.11.4.tar.gz 346397
-SHA256 2bb1b87f377080ee35f19cca952adf9d439446735bab683a167dacd229f05bbd haproxy-1.3.11.4.tar.gz 346397
diff --git a/net-proxy/haproxy/files/digest-haproxy-1.3.13 b/net-proxy/haproxy/files/digest-haproxy-1.3.13
new file mode 100644
index 000000000000..7b93cdae5d77
--- /dev/null
+++ b/net-proxy/haproxy/files/digest-haproxy-1.3.13
@@ -0,0 +1,3 @@
+MD5 a4c8eac779ff2f8716ba7afda826b9fc haproxy-1.3.13.tar.gz 387175
+RMD160 1b7b6dfc652352882c990b379953fba713759871 haproxy-1.3.13.tar.gz 387175
+SHA256 11ff8012a7a720f3c4eec39337f7449a1e22a25f3cf5f565b75733607b8c55e7 haproxy-1.3.13.tar.gz 387175
diff --git a/net-proxy/haproxy/files/haproxy.initd b/net-proxy/haproxy/files/haproxy.initd
index ac4c3de3eeb6..b86d93f236ee 100644
--- a/net-proxy/haproxy/files/haproxy.initd
+++ b/net-proxy/haproxy/files/haproxy.initd
@@ -1,14 +1,19 @@
 #!/sbin/runscript
 # Copyright 1999-2006 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.2 2007/03/30 08:47:21 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/haproxy/files/haproxy.initd,v 1.3 2007/10/27 10:42:32 mrness Exp $
+
+opts="${opts} reload"
+
+CONFFILE=/etc/${SVCNAME}.cfg
+PIDFILE=/var/run/${SVCNAME}.pid
 
 checkconfig() {
-	if [ ! -f /etc/haproxy.cfg ]; then
-		eerror "/etc/haproxy.cfg does not exist!"
+	if [ ! -f "${CONFFILE}" ]; then
+		eerror "${CONFFILE} does not exist!"
 		return 1
 	fi
-	/usr/bin/haproxy -c -f /etc/haproxy.cfg >/dev/null 
+	/usr/bin/haproxy -c -f "${CONFFILE}" >/dev/null 
 }
 
 depend() {
@@ -19,15 +24,21 @@ depend() {
 start() {
 	checkconfig || return 1
 
-	ebegin "Starting haproxy"
+	ebegin "Starting ${SVCNAME}"
 	start-stop-daemon --start --quiet \
 		--exec /usr/bin/haproxy \
-		-- -D -p /var/run/haproxy.pid -f /etc/haproxy.cfg
+		-- -D -p "${PIDFILE}" -f "${CONFFILE}"
 	eend ${?}
 }
 
 stop() {
-	ebegin "Stopping haproxy"
-	start-stop-daemon --stop --quiet --pidfile /var/run/haproxy.pid
+	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.2.16.ebuild b/net-proxy/haproxy/haproxy-1.2.16.ebuild
deleted file mode 100644
index b4f0639d3030..000000000000
--- a/net-proxy/haproxy/haproxy-1.2.16.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/haproxy/haproxy-1.2.16.ebuild,v 1.2 2007/01/09 22:11:23 robbat2 Exp $
-
-inherit linux-info
-
-DESCRIPTION="A TCP/HTTP reverse proxy for high availability environments"
-HOMEPAGE="http://haproxy.1wt.eu"
-SRC_URI="http://haproxy.1wt.eu/download/1.2/src/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~amd64"
-IUSE="pcre"
-
-DEPEND="pcre? ( >=dev-libs/libpcre-6.3 )"
-
-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
-
-	dodoc CHANGELOG ROADMAP TODO doc/*
-	docinto examples
-	dodoc examples/examples.cfg examples/haproxy.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.11.4.ebuild b/net-proxy/haproxy/haproxy-1.3.13.ebuild
index dd435e3c6324..764bdd52019a 100644
--- a/net-proxy/haproxy/haproxy-1.3.11.4.ebuild
+++ b/net-proxy/haproxy/haproxy-1.3.13.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/haproxy/haproxy-1.3.11.4.ebuild,v 1.1 2007/06/17 06:26:57 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/haproxy/haproxy-1.3.13.ebuild,v 1.1 2007/10/27 10:42:31 mrness Exp $
 
 inherit linux-info
 
 DESCRIPTION="A TCP/HTTP reverse proxy for high availability environments"
 HOMEPAGE="http://haproxy.1wt.eu"
-SRC_URI="http://haproxy.1wt.eu/download/${PV%.*.*}/src/${P}.tar.gz"
+SRC_URI="http://haproxy.1wt.eu/download/${PV%.*}/src/${P}.tar.gz"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
@@ -14,6 +14,7 @@ KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="pcre"
 
 DEPEND="pcre? ( >=dev-libs/libpcre-6.3 )"
+RDEPEND="${DEPEND}"
 
 src_compile() {
 	local ARGS="TARGET=linux${KV_MAJOR}${KV_MINOR}"