Revision bump. Updated configuration, the parameters have changed since 4.x; fixed init script and shebangs. Fixes bug #472422.

(Portage version: 2.1.12.3/cvs/Linux x86_64, signed Manifest commit with key 6D34E57D)

5 files changed, 96 insertions, 66 deletions

diff --git a/net-proxy/http-replicator/ChangeLog b/net-proxy/http-replicator/ChangeLog
index 1b9f207c128f..da8b726bb52a 100644
--- a/net-proxy/http-replicator/ChangeLog
+++ b/net-proxy/http-replicator/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for net-proxy/http-replicator
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/http-replicator/ChangeLog,v 1.38 2013/06/05 13:32:57 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/http-replicator/ChangeLog,v 1.39 2013/06/10 10:29:22 tomwij Exp $
+
+*http-replicator-4.0_alpha2-r2 (10 Jun 2013)
+
+  10 Jun 2013; Tom Wijsman <TomWij@gentoo.org>
+  +files/http-replicator-4.0_alpha2-r2.conf,
+  +files/http-replicator-4.0_alpha2-r2.init,
+  +http-replicator-4.0_alpha2-r2.ebuild, -http-replicator-4.0_alpha2-r1.ebuild,
+  -http-replicator-4.0_alpha2.ebuild:
+  Revision bump. Updated configuration, the parameters have changed since 4.x;
+  fixed init script and shebangs. Fixes bug #472422.
 
 *http-replicator-4.0_alpha2-r1 (05 Jun 2013)
 
diff --git a/net-proxy/http-replicator/files/http-replicator-4.0_alpha2-r2.conf b/net-proxy/http-replicator/files/http-replicator-4.0_alpha2-r2.conf
new file mode 100644
index 000000000000..cea7c9632a34
--- /dev/null
+++ b/net-proxy/http-replicator/files/http-replicator-4.0_alpha2-r2.conf
@@ -0,0 +1,46 @@
+## Configuration file for HTTP Replicator automatically sourced by init script.
+
+#################
+## REPCACHEMAN ##
+#################
+
+## Set the cache dir.
+GENERAL_OPTS="--dir /var/cache/http-replicator/"
+
+## Change UID/GID to user after opening the log and pid file.
+## 'user' must have read/write access to cache dir.
+GENERAL_OPTS="$GENERAL_OPTS --user portage"
+
+#####################
+## HTTP-REPLICATOR ##
+#####################
+
+## Specify which file to log too, use /dev/null to disable.
+LOG_FILE="/var/log/http-replicator.log"
+
+# Set cache root directory.
+DAEMON_OPTS="--root /var/cache/http-replicator/"
+
+## Try IPv6 addresses if available.
+# DAEMON_OPTS="$DAEMON_OPTS --ipv6"
+
+## The proxy port on which the server listens for http requests, default 8080.
+# DAEMON_OPTS="$DAEMON_OPTS --port 8080"
+
+## Break connection after so many seconds of inactivity, default 15.
+# DAEMON_OPTS="$DAEMON_OPTS --timeout 15"
+
+## Limit download rate at a fixed K/s.
+# DAEMON_OPTS="$DAEMON_OPTS --limit RATE"
+
+## Do you need the proxy to work offline, never connecting to a server?
+# DAEMON_OPTS="$DAEMON_OPTS --offline"
+
+## Show http headers and other info in log messages.
+# DAEMON_OPTS="$DAEMON_OPTS --verbose"
+
+## Switch from gather to debug output module.
+# DAEMON_OPTS="$DAEMON_OPTS --debug"
+
+## More options (eg --flat and --static) are listed in `http-replicator --help`,
+## the --daemon parameter is automatically passed by the init script.
\ No newline at end of file
diff --git a/net-proxy/http-replicator/files/http-replicator-4.0_alpha2-r2.init b/net-proxy/http-replicator/files/http-replicator-4.0_alpha2-r2.init
new file mode 100644
index 000000000000..ae5eb52eaa8d
--- /dev/null
+++ b/net-proxy/http-replicator/files/http-replicator-4.0_alpha2-r2.init
@@ -0,0 +1,21 @@
+#!/sbin/runscript
+# Copyright 1999-2013 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/http-replicator/files/http-replicator-4.0_alpha2-r2.init,v 1.1 2013/06/10 10:29:22 tomwij Exp $
+
+depend() {
+	need net
+}
+
+start() {
+	ebegin "Starting HTTP Replicator"
+	start-stop-daemon --start --pidfile /var/run/http-replicator.pid --name http-replicator \
+		--exec /usr/bin/http-replicator -- --static --flat --daemon $LOG_FILE $DAEMON_OPTS > /var/run/http-replicator.pid
+	eend $? "Failed to start HTTP Replicator"
+}
+
+stop() {
+	ebegin "Stopping HTTP Replicator"
+	start-stop-daemon --stop --pidfile /var/run/http-replicator.pid --name http-replicator --signal 2
+	eend $? "Failed to stop HTTP Replicator"
+}
diff --git a/net-proxy/http-replicator/http-replicator-4.0_alpha2-r1.ebuild b/net-proxy/http-replicator/http-replicator-4.0_alpha2-r2.ebuild
index a2e6e9fb29f2..49ba93f81ded 100644
--- a/net-proxy/http-replicator/http-replicator-4.0_alpha2-r1.ebuild
+++ b/net-proxy/http-replicator/http-replicator-4.0_alpha2-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/http-replicator/http-replicator-4.0_alpha2-r1.ebuild,v 1.1 2013/06/05 13:32:57 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/http-replicator/http-replicator-4.0_alpha2-r2.ebuild,v 1.1 2013/06/10 10:29:22 tomwij Exp $
 
 EAPI="5"
 
@@ -31,19 +31,19 @@ src_test() {
 src_install(){
 	python_export python2_7 EPYTHON PYTHON PYTHON_SITEDIR
 
-	exeinto /usr/bin
-	doexe http-replicator
+	python_scriptinto /usr/bin
+	python_doscript http-replicator
 
+	exeinto /usr/bin
 	newexe "${FILESDIR}"/${PN}-3.0-callrepcacheman-0.1 repcacheman
-	newexe "${FILESDIR}"/${PN}-3.0-repcacheman-0.44-r2 repcacheman.py
 
 	python_domodule *.py
 
-	newinitd "${FILESDIR}"/${PN}-3.0.init http-replicator
-	newconfd "${FILESDIR}"/${PN}-3.0.conf http-replicator
+	cp "${FILESDIR}"/${PN}-3.0-repcacheman-0.44-r2 repcacheman.py || die
+	python_doscript repcacheman.py
 
-	# Not 2.6, see bug #33907; not 3.0, see bug #411083.
-	# python_convert_shebangs -r 2.7 "${ED}"
+	newinitd "${FILESDIR}"/${PN}-4.0_alpha2-r2.init http-replicator
+	newconfd "${FILESDIR}"/${PN}-4.0_alpha2-r2.conf http-replicator
 
 	dodoc README.user README.devel RELNOTES
 }
@@ -51,14 +51,18 @@ src_install(){
 pkg_postinst() {
 	einfo
 	einfo "Before starting ${PN}, please follow the next few steps:"
-	einfo "- modify /etc/conf.d/${PN} if required"
-	einfo "- run \`repcacheman\` to set up the cache"
-	einfo "- add http_proxy=\"http://serveraddress:8080\" to make.conf on"
-	einfo "  the server as well as on the client machines"
-	einfo "- make sure GENTOO_MIRRORS in /etc/portage/make.conf"
-	einfo "  starts with several good http mirrors"
+	einfo
+	einfo "- Modify /etc/conf.d/${PN} if required."
+	einfo "- Run \`repcacheman\` to set up the cache."
+	einfo "- Add HTTP_PROXY=\"http://serveraddress:8080\" to make.conf on"
+	einfo "  the server as well as on the client machines."
+	einfo "- Make sure GENTOO_MIRRORS in /etc/portage/make.conf"
+	einfo "  starts with several good HTTP mirrors."
 	einfo
 	einfo "For more information please refer to the following forum thread:"
+	einfo
 	einfo "  http://forums.gentoo.org/viewtopic-t-173226.html"
 	einfo
+	einfo "Starting with 4.x releases, the conf.d parameters have changed."
+	einfo
 }
diff --git a/net-proxy/http-replicator/http-replicator-4.0_alpha2.ebuild b/net-proxy/http-replicator/http-replicator-4.0_alpha2.ebuild
deleted file mode 100644
index 24d8c421ac33..000000000000
--- a/net-proxy/http-replicator/http-replicator-4.0_alpha2.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/http-replicator/http-replicator-4.0_alpha2.ebuild,v 1.1 2013/03/04 13:00:40 tomwij Exp $
-
-EAPI="5"
-PYTHON_DEPEND="2:2.7:2.7" # not 2.6 bug #33907, not 3.0 bug #411083
-inherit eutils python
-
-MY_P="${PN}_${PV/_/}"
-
-DESCRIPTION="Proxy cache for Gentoo packages"
-HOMEPAGE="http://sourceforge.net/projects/${PN}"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tgz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86"
-
-src_install(){
-	# Daemon and repcacheman into /usr/bin
-	exeinto /usr/bin
-	doexe http-replicator
-	newexe "${FILESDIR}/http-replicator-3.0-callrepcacheman-0.1" repcacheman
-	newexe "${FILESDIR}/http-replicator-3.0-repcacheman-0.44-r2" repcacheman.py
-
-	# init.d scripts
-	newinitd "${FILESDIR}/http-replicator-3.0.init" http-replicator
-	newconfd "${FILESDIR}/http-replicator-3.0.conf" http-replicator
-
-	# not 2.6 bug #33907, not 3.0 bug #411083
-	python_convert_shebangs -r 2.7 "${ED}"
-
-	# Docs
-	dodoc README.user README.devel RELNOTES
-}
-
-pkg_postinst() {
-	einfo
-	einfo "Before starting http-replicator, please follow the next few steps:"
-	einfo "- modify /etc/conf.d/http-replicator if required"
-	einfo "- run /usr/bin/repcacheman to set up the cache"
-	einfo "- add http_proxy=\"http://serveraddress:8080\" to make.conf on"
-	einfo "  the server as well as on the client machines"
-	einfo "- make sure GENTOO_MIRRORS in /etc/make.conf starts with several"
-	einfo "  good http mirrors"
-	einfo
-	einfo "For more information please refer to the following forum thread:"
-	einfo "  http://forums.gentoo.org/viewtopic-t-173226.html"
-	einfo
-}