Add unit file (#492502 by Joerg Neikes)

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

6 files changed, 176 insertions, 10 deletions

diff --git a/net-proxy/http-replicator/ChangeLog b/net-proxy/http-replicator/ChangeLog
index a10c3f25111b..d2447f213233 100644
--- a/net-proxy/http-replicator/ChangeLog
+++ b/net-proxy/http-replicator/ChangeLog
@@ -1,6 +1,14 @@
 # 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.40 2013/06/10 14:01:46 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/http-replicator/ChangeLog,v 1.41 2013/12/22 11:07:28 pacho Exp $
+
+*http-replicator-4.0_alpha2-r4 (22 Dec 2013)
+*http-replicator-3.0-r4 (22 Dec 2013)
+
+  22 Dec 2013; Pacho Ramos <pacho@gentoo.org> +files/http-replicator.service,
+  +files/http-replicator.service.conf, +http-replicator-3.0-r4.ebuild,
+  +http-replicator-4.0_alpha2-r4.ebuild:
+  Add unit file (#492502 by Joerg Neikes)
 
 *http-replicator-4.0_alpha2-r3 (10 Jun 2013)
 
diff --git a/net-proxy/http-replicator/Manifest b/net-proxy/http-replicator/Manifest
index db6f0affa497..c4fac7db0bb7 100644
--- a/net-proxy/http-replicator/Manifest
+++ b/net-proxy/http-replicator/Manifest
@@ -11,21 +11,21 @@ AUX http-replicator-3.0.init 762 SHA256 63e64c4e55b3395619aab3fa3154255d36144af3
 AUX http-replicator-4.0_alpha2-r2.conf 1440 SHA256 ebe9c43263d805265759768b8aab6272c31be1756367115bccfc2760be15f165 SHA512 e6237c8b7eeb319615d45abdef4feaca6bbeb741bc75e80173e42328e4eb5f4192edfbf42c7e6e307c14d258e7ec67a0ae6451ff7daef631b2d1e39fe17a48fb WHIRLPOOL 82180cfecab96751a27b3166e58a858fb5fd49fa72e73de23709665504a99de9151c2d8a6cdf437270b49ea7e32499881b909aa901e8b09ba302c555ef1c121f
 AUX http-replicator-4.0_alpha2-r3-pid.patch 2681 SHA256 e2119798eda31b010067adfccd7aab5c415785b8b2ec79f28e5ca43d204a7ce6 SHA512 9ceb6ede3ec31fd7f702ac77a51897301fd7b16baee869a82180f388949ff7388f0917d667786b45643603c0e9d655cd8686948d5e34896c1fe5932fd76e42b5 WHIRLPOOL f0b7a0918190de2ced9e2d0880a837d696a44e79825175db13aef5b74dc5e9e26595e2de201797bf3d99c33645ff0a3012e6c3c13f28fa632589fbc66b973139
 AUX http-replicator-4.0_alpha2-r3.init 792 SHA256 c1efbc7cf81297b3262464d503318158f9893fdaf2a8833aa35e0b193edf233a SHA512 ea50785b385a9414f06312ecb92abc26ee24ffa053eb5e66cafcbd9410f798b27af4356a51329f582d8fa4a31141c29fe615d6e6139f54c177c5896318dca0b6 WHIRLPOOL c1a99aeac70521a533faef94b527ce930c3a8b523696a1178a9ce2dd5a27c5b671baec90eedfe319d0bd2c9825a638a2d3a23e3fcb77da1566da4d0457f18581
+AUX http-replicator.service 258 SHA256 15727e6d3de285a5b02e508cc7cfe9295c9cb0830f7ecd2dd33b594050e17b7c SHA512 0da767205c21c226563eb2210a12d92d7933431245fad9bf8766eda59b1f4a16905cadcfb796b3aef86978eb06b153eb976b12f4f7e19d468654c1722e266352 WHIRLPOOL 63184f4fd4f80ceb281524f19219543c2f26458f0e68845dcce6124cdabf344d5689b068d4ca7f8d2bcc363967d0e5c46838cc8ae8d54aa1a76666d32a95bfcd
+AUX http-replicator.service.conf 164 SHA256 a551cec799cb26f1ab3162feb3b09ea755390e8c80809981c0ff951bfd802e60 SHA512 0a1854ddb9f5b8631bdf6a837f1c91b895652803b3e1b6b98fba8f67dba0488a61f8864ddd4128d8072353a38349d9848e91a5109b317c37e1ca2598d0ac2333 WHIRLPOOL 04a2fd478bebb9dbec03b633e9812eadd945a05f65198e66a38cf6f686e0bb02d875a369bf29926c038448c784bac8c72c14467ac3a38c627ba066ab823df4e3
 DIST http-replicator_3.0.tar.gz 39291 SHA256 cd5b2c8b4b6da4fd5a9313cd5e7d4179805002f2de5fd25a42301df4f5bd161e SHA512 d98a608c38201db6f2d8ba809a4777ab5588f5ed395882bdf542c2788df1770c61a2de160604c09297d847f2c73463ba0530d7f2c2e482467f8e8f35be068d57 WHIRLPOOL 965524243895a6a00df3b4be3bae391bc532f3ccef87383a487c87efbcd858aa1a2d15598be752b7640e57aef47ab7cbaad8430033925935f16a527aa50db36a
 DIST http-replicator_4.0alpha2.tgz 27575 SHA256 43f466b691244104caba96fd16df75978731ea248ad1681beaf88342a708875a SHA512 437e0cc881af0cb8f84bfd1366bb6edeee4f76112c4b2ac2af4bcb8809462852b96e9c99e04c8f370492c9e1eb33ddc68a85c4f09b073694242cd6c05b4d3a6c WHIRLPOOL 599d2ee6bab4ffb4792913763b303da3a473dee2aa15510ceee32d042e54abdb49a902eee3346c4c735c97169e11fcd2340e7c741e160500c4a6bbd064a57561
 EBUILD http-replicator-3.0-r2.ebuild 2003 SHA256 2b16a9ce4b67310f0f66e189e66de08bdada28c9aafc84ad0c318da409687195 SHA512 038f3377e4f770d69e9f1e085a69424005a89ce5bbbea6d941b841ef9586314b1ea6c3835fd311bbb7c9ea946ad7d1dd8dc879123fd79a8b1d1b605500b42dd1 WHIRLPOOL 86c4b209c393cb9924486e3f788b3bdec51b9b5ed9b801c5e55cdc39399b4a7a10592319c1a29318bd5a1b180620f4dc57659c17bddce853b49ed385fa0ed931
 EBUILD http-replicator-3.0-r3.ebuild 2007 SHA256 42ffbb00df9fce28f2357944a1e1435a0563051d8631f85d3ab62ad309ae1f44 SHA512 504d0b880ad42b0024bc78d7961ffa9c8db81e54dc13a732c743e6a524f19afba0e3c53c489fb4599b9a7e6e1758a21a2bb09580cdf92aa6b4d56b8218a3ae5d WHIRLPOOL 2cf27433c773b7be44908c531cd36923096690015c723776a01b9038d3d4300ae60234d8f3d157c55a6fec1413fa9d570b48e7561e71a967ea0ebafeaa08b309
+EBUILD http-replicator-3.0-r4.ebuild 2145 SHA256 40df3172ddbf14dc0294baeac7d6ba4c6f6893a9679789352c16962d6f67a223 SHA512 b24652baf65fbf8f0899c84255ac643a9910ef34ed1f4e71e63848990ad31ab1327238523a8ea9182257afed67235b265d280bd09c8a0ac47ea51394210f6161 WHIRLPOOL 1b18e678d9e133d0f68fbc154fe47a3c6b4f517519338a79f3b1b809a0e95c41802b7a6e2d493952eaa82b9d19733f92b46e7dda313da5fd7933979b2d6a0341
 EBUILD http-replicator-4.0_alpha2-r3.ebuild 2034 SHA256 b3634975b23b435009f22b910bbbc2c6fdd2c3442f24b31de6571f12f4d911c9 SHA512 faff6124355d6bd78d33274ae172a709b3a6b7a200d8453769f1571f5dc51658185919fb954c616d053487c5b88d4d9eb1b6b2961b75bb87c9f3d1c23c99ecda WHIRLPOOL c2e6cc6f7ca7390d61ebd0e53b0a805e54d99d2e5f45a50690b639e3cfaff952693f0efc8edff8128c4ee8fc4f90e5307333c666e17ac461d960b0c007b8d78e
-MISC ChangeLog 7717 SHA256 1341400ea3278b4889f166183fd3d8ff3f3a80ca0e65ac2dd83919f3e9ad8bfc SHA512 6aab58b43750fa6de1b6e9559f3bf6a536803f806f6e8fe0d742d57056e40c99e19610dfd42ef4dce76db3c2efd405098342d49a6c80db797e1e5884c61e5144 WHIRLPOOL fa8bfbbefc5ab0f79194d4c0d2b5eee004a95575d6120a2da3e4d96cb5a13af5969e2ea5c56ce54024b46fe4029f23fad37291cf0b97e0e5a22ebef97db8cf18
+EBUILD http-replicator-4.0_alpha2-r4.ebuild 2165 SHA256 3d6f9bf68dbadef72a4ce4f65f148733fc0aa6b13d7d929ba8a39b2c041eebe4 SHA512 240baeee96766bb2d0360133cd69aba333af6fdfe021b607556760cea16470d678a433a9f0a89dd47bcd3b80dbc93f66fc8449f06e5798b97d0c3da622e5042c WHIRLPOOL 3435e5467fa6f6c070ef12ad04134dd536aa3b275f627f8c54b817675af5fbe73ce32c60494be0768ce30fb942941edc5035453d362ff5debc120d20fc99ab53
+MISC ChangeLog 8033 SHA256 10c2642d13a29cad87c396b0c56256871504261d20d9d4192d6034d48291411a SHA512 606caa06353032120734cf2448ad30fba6fe31ef67023a919df96e12b6c7d5a360663adbf13ea34eb39878700c6438b1906428f5d8e6b1528f0c5fb1ce0ea545 WHIRLPOOL afdbde33d4b7fb540a385d6ae51e25f6514be68407ee87c6dbb47b7ec9fcc7a2245d99ce7a7d00c66ea17d72ebc1f1b4130fbfdfa291c215ee38b9083423d34a
 MISC metadata.xml 162 SHA256 7452c4deeae23532b16b9030c3b32a9a09a5f82faed0fd23810a83db174dc60f SHA512 45a066ff67b0386b4f7dda2eb84ede5a8d83d0c20ccecce12c145f6358f42cf58de0688ad2a20fc4d4e0a1732dd6106a8d215c3f7b86ecaad333898c1dfcee9a WHIRLPOOL 8eb55a1c39e758e950d54bb48d6d814799f3f8e7a3fe14b82c6b163373a69edc9b60dd04686ff1b5a26fa92935c9092c60f8f16e4f82d4da7ea1655aebd34a45
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRtdu/AAoJEJWyH81tNOV9r0QH/08pbjG2nKSSl08FqOokgjIF
-X3p8FQjw4Obo39QN8A1/Tg6V7sg1zyS3RaPxRnbhyOZn/pjVOKTxymImZaiJhGfP
-c/CZV0q9gRBQmx1IftTqBKRwQO77e3c5NJ2F5LS5IU88+H8XmU1zGerzYawqYqU2
-vzmG9J0AoXnAHXubNu1iTogcZqgRgdCqxLQvIeqxerlX0wYlIJ1/rYEj+AMtOACn
-uKwymr9I1QyXmo8dV+g/XD1v3ziSW3BjjGJAOMWBybvjKDjeaZmk8AsZ8rdKZPHZ
-61fFaIBpz5w1oDJAOQA5BzIEHGoR0Czuor/OfNYGBe81h6SLROju8DyxK/UOKw4=
-=71+m
+iEYEAREIAAYFAlK2x/EACgkQCaWpQKGI+9T2YwCeL2VX9Tu9aUTFov4R0E9bZNS0
+Te4AnjJVE5qETW2XR5SryxAep8e0HVoJ
+=FJtF
 -----END PGP SIGNATURE-----
diff --git a/net-proxy/http-replicator/files/http-replicator.service b/net-proxy/http-replicator/files/http-replicator.service
new file mode 100644
index 000000000000..6a2a7e5f5dff
--- /dev/null
+++ b/net-proxy/http-replicator/files/http-replicator.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=http-replicator daemon
+After=network.target 
+
+[Service]
+ExecStart=/usr/bin/http-replicator -s -f \
+		--dir /var/cache/http-replicator --user portage --log /var/log/http-replicator.log \
+		$DAEMON_OPTS
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-proxy/http-replicator/files/http-replicator.service.conf b/net-proxy/http-replicator/files/http-replicator.service.conf
new file mode 100644
index 000000000000..da7445d080c4
--- /dev/null
+++ b/net-proxy/http-replicator/files/http-replicator.service.conf
@@ -0,0 +1,3 @@
+# Set various parameters for http-replicator
+[Service]
+Environment="DAEMON_OPTS= --alias /usr/portage/packages:packages --ip 192.168.*.* --ip 10.*.*.* --port 8080"
diff --git a/net-proxy/http-replicator/http-replicator-3.0-r4.ebuild b/net-proxy/http-replicator/http-replicator-3.0-r4.ebuild
new file mode 100644
index 000000000000..1c0ccfcb9c3b
--- /dev/null
+++ b/net-proxy/http-replicator/http-replicator-3.0-r4.ebuild
@@ -0,0 +1,69 @@
+# 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-3.0-r4.ebuild,v 1.1 2013/12/22 11:07:28 pacho Exp $
+
+EAPI=4
+PYTHON_DEPEND="2:2.7:2.7" # not 2.6 bug #33907, not 3.0 bug #411083
+inherit eutils python systemd
+
+MY_P="${PN}_${PV}"
+
+DESCRIPTION="Proxy cache for Gentoo packages"
+HOMEPAGE="http://sourceforge.net/projects/http-replicator"
+SRC_URI="mirror://sourceforge/http-replicator/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+src_compile() {
+	epatch "${FILESDIR}/http-replicator-3.0-sighup.patch"
+	einfo "No compilation necessary"
+}
+
+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
+
+	systemd_dounit "${FILESDIR}"/http-replicator.service
+	systemd_install_serviced "${FILESDIR}"/http-replicator.service.conf
+
+	# not 2.6 bug #33907, not 3.0 bug #411083
+	python_convert_shebangs -r 2.7 "${ED}"
+
+	# Docs
+	dodoc README debian/changelog
+
+	# Man Page - Not Gentooified yet
+	doman http-replicator.1
+
+	insinto /etc/logrotate.d
+	newins debian/logrotate http-replicator
+}
+
+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
+}
diff --git a/net-proxy/http-replicator/http-replicator-4.0_alpha2-r4.ebuild b/net-proxy/http-replicator/http-replicator-4.0_alpha2-r4.ebuild
new file mode 100644
index 000000000000..d370b71af71e
--- /dev/null
+++ b/net-proxy/http-replicator/http-replicator-4.0_alpha2-r4.ebuild
@@ -0,0 +1,75 @@
+# 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-r4.ebuild,v 1.1 2013/12/22 11:07:28 pacho Exp $
+
+EAPI="5"
+
+# Not 2.6, see bug #33907; not 3.0, see bug #411083.
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils python-r1 systemd
+
+MY_P="${PN}_${PV/_/}"
+
+DESCRIPTION="Proxy cache for Gentoo packages"
+HOMEPAGE="http://sourceforge.net/projects/http-replicator"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86"
+
+S="${WORKDIR}/${MY_P}"
+
+# Tests downloads files as well as breaks, should be turned into local tests.
+RESTRICT="test"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-4.0_alpha2-r3-pid.patch
+}
+
+src_test() {
+	./unit-test && die
+}
+
+src_install(){
+	python_export python2_7 EPYTHON PYTHON PYTHON_SITEDIR
+
+	python_scriptinto /usr/bin
+	python_doscript http-replicator
+
+	exeinto /usr/bin
+	newexe "${FILESDIR}"/${PN}-3.0-callrepcacheman-0.1 repcacheman
+
+	python_domodule *.py
+
+	cp "${FILESDIR}"/${PN}-3.0-repcacheman-0.44-r2 repcacheman.py || die
+	python_doscript repcacheman.py
+
+	newinitd "${FILESDIR}"/${PN}-4.0_alpha2-r3.init http-replicator
+	newconfd "${FILESDIR}"/${PN}-4.0_alpha2-r2.conf http-replicator
+
+	systemd_dounit "${FILESDIR}"/http-replicator.service
+	systemd_install_serviced "${FILESDIR}"/http-replicator.service.conf
+
+	dodoc README.user README.devel RELNOTES
+}
+
+pkg_postinst() {
+	einfo
+	einfo "Before starting ${PN}, please follow the next few steps:"
+	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
+}