use dobin instead of exeinto /usr/bin/ && doexe; fix new pyhton eclass usage

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

4 files changed, 36 insertions, 27 deletions

diff --git a/net-proxy/http-replicator/ChangeLog b/net-proxy/http-replicator/ChangeLog
index 645670f4b091..9c961c443a83 100644
--- a/net-proxy/http-replicator/ChangeLog
+++ b/net-proxy/http-replicator/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-proxy/http-replicator
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/http-replicator/ChangeLog,v 1.46 2015/01/07 13:58:21 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/http-replicator/ChangeLog,v 1.47 2015/03/21 20:09:06 jlec Exp $
+
+  21 Mar 2015; Justin Lecher <jlec@gentoo.org> http-replicator-3.0-r4.ebuild,
+  http-replicator-4.0_alpha2-r4.ebuild:
+  use dobin instead of exeinto /usr/bin/ && doexe; fix new pyhton eclass usage
 
   07 Jan 2015; Pacho Ramos <pacho@gentoo.org> -http-replicator-3.0-r2.ebuild,
   -http-replicator-3.0-r3.ebuild, -http-replicator-4.0_alpha2-r3.ebuild,
diff --git a/net-proxy/http-replicator/Manifest b/net-proxy/http-replicator/Manifest
index a7ef414d5546..ff9b7b454bca 100644
--- a/net-proxy/http-replicator/Manifest
+++ b/net-proxy/http-replicator/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX http-replicator-3.0-callrepcacheman-0.1 86 SHA256 9f7cff787b49eb8cb6ca4581c77167b305a766785a0897ee663ca94cf3aa97fd SHA512 144490fd854e22fce95e6a6891a3e65e8af001b5e421bec39b20ee4cf39709424a922f7852bf48ecf43b5b9755213e7149a2a3784bbc3a3e5542072d8d3bda3d WHIRLPOOL e458e78e85add1410ebb17900cadebff03fc5f641f628d070920bd4ecb6e361ec73964ea47ad71bbe017a2a4cea0324b63ec25f54d360250fab01b9b8c44f99c
 AUX http-replicator-3.0-repcacheman-0.44 5327 SHA256 28d45098bf29ce050aa94b47c9a5fee28f5f083a8bf213f90044881092125bbe SHA512 af0855b2a0631ce056ee728566be8c02a5808cf53025f6a49866ccf3268cfa8ee3847e5093471bb561aaf3279b2214e9f426745ad97fe2c61f9f933904706d6d WHIRLPOOL 334fe7f45fafb69be9ca16e076c823d40546c099499bbb5717afcca572c25b3705d98217d790ef5ae62920277f9199d5d64fb36b00445381a126ef3e325bff71
@@ -15,14 +15,26 @@ AUX http-replicator.service 258 SHA256 15727e6d3de285a5b02e508cc7cfe9295c9cb0830
 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-r4.ebuild 2141 SHA256 e624c2ed82624e06996454c4002c77bbc72619ca7e6dc162b3c944f90ed45663 SHA512 db15e8f136e4f75b040dbe0619da530a52aa9cf48e60c699081cb3e15de693f62d3a2c07782a347f6dea66d80c56fb73e1fec38df0825ce51d1f373c6dadde37 WHIRLPOOL dff5f3dbaeb1996db51bff11657250667b14f7e87d7f80ddf37570364cd32600520a07cec9fc1612cc2bdd7e12836f6306dbb882be77ba0712dfcb122fa947d0
-EBUILD http-replicator-4.0_alpha2-r4.ebuild 2165 SHA256 3d6f9bf68dbadef72a4ce4f65f148733fc0aa6b13d7d929ba8a39b2c041eebe4 SHA512 240baeee96766bb2d0360133cd69aba333af6fdfe021b607556760cea16470d678a433a9f0a89dd47bcd3b80dbc93f66fc8449f06e5798b97d0c3da622e5042c WHIRLPOOL 3435e5467fa6f6c070ef12ad04134dd536aa3b275f627f8c54b817675af5fbe73ce32c60494be0768ce30fb942941edc5035453d362ff5debc120d20fc99ab53
-MISC ChangeLog 8763 SHA256 fcd68063ae009ff12fb08a08faf2e541c9d8a07aaec56d6b20ad3176622c4692 SHA512 3f43fad14df2d59078b7a8f3c3a3356cb5afb9432c58d574dd08ec5aa8bb48f23cb0f65c3be67fb9a9f9b934554cac3a53d3b1cb2efe4c6266a9d077d7379f44 WHIRLPOOL adc0c111cd021b917a7b74bd61e678de4c8d4d7067531de67feb40712e468dceb9f3c6280b7be994160ab780ae6cdfd87cd8483f90f6fe89b7dea817d6383712
+EBUILD http-replicator-3.0-r4.ebuild 2122 SHA256 8f378e4f20b52b54a4ee219518728814cae2b4b9accc93e6a6a087bd25a44bfd SHA512 27953665b3a60804287bf8fd05ed275824794718bfcc32ea2510e9d1ace52384f37ca32a621bb7d362cb47cad7f4e593b90e7e94fa6d316f2ef6dee54f594621 WHIRLPOOL 4f0c0854fee03a9ab38825d5f14dbec4f8bf5219a6c8a6f18442398b8e202e21cdd4b5e72699d75e58fb6b5577786e02996719e80cfaa3a705a23c7e70945626
+EBUILD http-replicator-4.0_alpha2-r4.ebuild 2042 SHA256 1517e0ab0a93cffc2c8454efa3330617bb88f2f20387d262e32db7e9216189da SHA512 2578f5b0e63cae149e52a45399305db90b75cf8d45e8ae7b33a755c49cad1407e3fa2997fe606ff69e196c56564c5d5d0200807212be7775346dae685817dea3 WHIRLPOOL fb2caa183ea7cad86a711d51c17702f00d73c4a67146fe6f12eb62c7961d0c96aa5a413f1637c5ae6e10a51007ca89cdf07ad82630fb2b6181492568036c2171
+MISC ChangeLog 8960 SHA256 41cc5036eaad8ca6dfaee2ca33d2f29b43a601e7bcda806abca3e9f5b9daa78c SHA512 873a92329da5dd7323f7ab3cf2bc99624b204b99c6e78dff782d085d46e54bab16ef774d3a5d6176f1145a89d8bec251138e1751b817b69ca691800fefcca323 WHIRLPOOL c3e087bc31fffafcd3fd70f2278f07eea5eb4e7e9c65dc4526b0f3b30b54cbe852632864da4f7f0205cef68ec6e947e8277971c47f270134d4abe805b9aa1acc
 MISC metadata.xml 208 SHA256 98f8aa3fb70533eeab6b09d5bc30bd8f649ec13d9b04363490082fb87bb6032e SHA512 d5a7f3cb2fe57f8d7783ba358068648b122d9f5de81a17bff61ce600e42b6487e6f7e2a62c8be95cc7021cb3ea88716824b1ad0565da922ea753bea2417b3d3d WHIRLPOOL e38a6cdef2acb3efdc182efde482593790f773ab3bb9b66cced3af47e4ab39368757e17c4352c6cacaefa338341db88c3bcc3ffcd32aabd7984c5b19051a7bb7
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlStO34ACgkQCaWpQKGI+9TWtwCeOObW4GrpHmcLYgiZoa+kbDuQ
-nLgAn0JDIobDzi3xbkpTuNHC8oNpLpTy
-=u23U
+iQJ8BAEBCgBmBQJVDc/jXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVir9e4P/1KkUcsjCWZWoyYhuHd0Skm9
+/7G/aRO+xrk0cJz/6/ikiqoFizwEeGUF8pGFKhqOo7i8R38QxU59DXyeN3RxcPIc
+pJiqVkbd5tcX4AaO0i6dJY3lp5z4QCKEW9LRtmTl0P3TRO/3KDgKXkifmSffaaOw
+dpno/CvanGXz1rSXp7SYb8wKcacEaMPqh4WEbpNwF4Ki3hFiodYUZtgtc2idrPs2
+9FZ6hLJH/0UVAu/Yi+D/tbvXXkY1w97jwMcFQMdzOI2TiCxLU+HVVVRqZC2+i6I2
+glwaW/QAACUYaRSfn9aFR4nOtOzTe80wObPJf1CljGcroEDxMv23BhKSCNX39/C8
+jAbHAbw24dDCVteXVAm8EYTPDXY0TYRq+BExtkldTF/Y1Ef3yZ0HHohdLcPo9Jrz
+haWFr03WC1COIVrTJ+FxMPQ5JYcz3rOizz83k7NX71KkpapC9NCW+4ISCcMbCZlW
+r/JjltwbCfy0x7p7jsQMRoGOrISF0Wnt0l31M6FwLmQ3GcqErYqjlBwWolcUOFNk
+iBnNaETxCjdkZJEPzVgLzGi9bisyiFNgU379OjR9/pIckAg17tDv3Xqx+RGbIcjM
+8o2P2OyA6hWXSWMGMdz8gep6e3CpzfRpkjH4yp6UXE097n9Qq5V6yBnWgOMZLUX+
+MGRriuYFAni54ZcTyWd1
+=ACvh
 -----END PGP SIGNATURE-----
diff --git a/net-proxy/http-replicator/http-replicator-3.0-r4.ebuild b/net-proxy/http-replicator/http-replicator-3.0-r4.ebuild
index 026c3e4a2d3c..b51e8a277604 100644
--- a/net-proxy/http-replicator/http-replicator-3.0-r4.ebuild
+++ b/net-proxy/http-replicator/http-replicator-3.0-r4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 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.5 2014/04/05 07:05:35 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/http-replicator/http-replicator-3.0-r4.ebuild,v 1.6 2015/03/21 20:09:06 jlec Exp $
 
 EAPI=4
 PYTHON_DEPEND="2:2.7:2.7" # not 2.6 bug #33907, not 3.0 bug #411083
@@ -28,8 +28,7 @@ src_compile() {
 
 src_install(){
 	# Daemon and repcacheman into /usr/bin
-	exeinto /usr/bin
-	doexe http-replicator
+	dobin http-replicator
 	newexe "${FILESDIR}/http-replicator-3.0-callrepcacheman-0.1" repcacheman
 	newexe "${FILESDIR}/http-replicator-3.0-repcacheman-0.44-r2" repcacheman.py
 
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
index d370b71af71e..3e49aaa39c47 100644
--- a/net-proxy/http-replicator/http-replicator-4.0_alpha2-r4.ebuild
+++ b/net-proxy/http-replicator/http-replicator-4.0_alpha2-r4.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 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 $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/http-replicator/http-replicator-4.0_alpha2-r4.ebuild,v 1.2 2015/03/21 20:09:06 jlec Exp $
 
 EAPI="5"
 
-# Not 2.6, see bug #33907; not 3.0, see bug #411083.
 PYTHON_COMPAT=( python2_7 )
 
 inherit eutils python-r1 systemd
@@ -33,18 +32,13 @@ src_test() {
 }
 
 src_install(){
-	python_export python2_7 EPYTHON PYTHON PYTHON_SITEDIR
+	python_foreach_impl python_doscript http-replicator
 
-	python_scriptinto /usr/bin
-	python_doscript http-replicator
+	newbin "${FILESDIR}"/${PN}-3.0-callrepcacheman-0.1 repcacheman
 
-	exeinto /usr/bin
-	newexe "${FILESDIR}"/${PN}-3.0-callrepcacheman-0.1 repcacheman
+	python_foreach_impl python_domodule *.py
 
-	python_domodule *.py
-
-	cp "${FILESDIR}"/${PN}-3.0-repcacheman-0.44-r2 repcacheman.py || die
-	python_doscript repcacheman.py
+	python_foreach_impl python_newscript "${FILESDIR}"/${PN}-3.0-repcacheman-0.44-r2 repcacheman.py
 
 	newinitd "${FILESDIR}"/${PN}-4.0_alpha2-r3.init http-replicator
 	newconfd "${FILESDIR}"/${PN}-4.0_alpha2-r2.conf http-replicator
@@ -56,7 +50,7 @@ src_install(){
 }
 
 pkg_postinst() {
-	einfo
+	echo
 	einfo "Before starting ${PN}, please follow the next few steps:"
 	einfo
 	einfo "- Modify /etc/conf.d/${PN} if required."
@@ -71,5 +65,5 @@ pkg_postinst() {
 	einfo "  http://forums.gentoo.org/viewtopic-t-173226.html"
 	einfo
 	einfo "Starting with 4.x releases, the conf.d parameters have changed."
-	einfo
+	echo
 }