Rework systemd support (#439918)

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

3 files changed, 62 insertions, 18 deletions

diff --git a/app-admin/eselect-php/ChangeLog b/app-admin/eselect-php/ChangeLog
index ee303ba3709c..47c451349e0a 100644
--- a/app-admin/eselect-php/ChangeLog
+++ b/app-admin/eselect-php/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-admin/eselect-php
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-php/ChangeLog,v 1.57 2013/08/06 12:35:13 ago Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-php/ChangeLog,v 1.58 2014/02/02 21:04:24 pacho Exp $
+
+*eselect-php-0.7.1-r3 (02 Feb 2014)
+
+  02 Feb 2014; Pacho Ramos <pacho@gentoo.org> +eselect-php-0.7.1-r3.ebuild:
+  Rework systemd support (#439918)
 
   06 Aug 2013; Agostino Sarubbo <ago@gentoo.org> eselect-php-0.7.1.ebuild:
   Stable for s390, wrt bug #472558
diff --git a/app-admin/eselect-php/Manifest b/app-admin/eselect-php/Manifest
index 499e6f795dce..37ee00866b4e 100644
--- a/app-admin/eselect-php/Manifest
+++ b/app-admin/eselect-php/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX 70_mod_php5.conf-apache2 348 SHA256 5bb8a45570582b4389a7d3feea0398e1c13ed4ced96e559b9406ed8c965dea8c SHA512 c74ec09c3c4124a15e14ece4bb769bb889466160cc0878ca3d55d5afc30fd4c05673c40428b75be669f72e82ba29f60ed19767caca77bba8adc12aae1c83f6f3 WHIRLPOOL fd503ec904a3853b90f8f4cc2042cf9014fdb1383a508d22e680559009b5b1e0beb5a09909a393e53868a64712c63e35642915787fa4176af07cb594adedb441
 AUX php-fpm-launcher 134 SHA256 d7e944a016a8a282b9a684de1820c8e5c00791c27471a528b1ee8dc620eb83e8 SHA512 4304ea6df7093af06f1b7df5bf5d8ed7692403cc64a5c4c516e49d36fa866b33e4815876d28cc365f5ccb1e301ef7ce9b57e15ed959a41c91fb25af7236fed29 WHIRLPOOL f6123fb338a10e23f21616ab1bbfa385289748cff9523c2a1d39e82f53f104eacc0f3b088794a12b678551b7d8ef1b6262480882b62ce38067e923e7592b4629
@@ -12,23 +12,14 @@ DIST eselect-php-0.7.1.bz2 2251 SHA256 10aa400e2d08bc71989366993f12ddb546a0ea29f
 EBUILD eselect-php-0.6.2.ebuild 667 SHA256 72faed5e958e25f61ef1c082caf856a66588148641c1b268159e24f6ce425775 SHA512 0f69db4bfdd348c8fd98c6ca64549e0c0d07e673ba260daf9941fa058f2aa9d5038f87cefd9e1a282cf5f74ab2dfa15a9ff3d5ebf97c72c23790675e357f1bb0 WHIRLPOOL 0be89d938bd52b19b4ee1022c437f46d21e3fc8d429814fe2019ff160131ea239f3aec29a4b98ce5a5af2c3f8f0144f3604b7f3ecd16e681daf0226406c764bc
 EBUILD eselect-php-0.7.1-r1.ebuild 1391 SHA256 536bbf3c7b9cba046a831e04c8c283d15a6c47477018ed6f78cb1146990be2c7 SHA512 666c40700118862764dab19806b6b1814dd4ca5a0d36da900470b282e38afe33579fe34cac6447d2d4b8f405de7ee69da059dd20e6f591603d4a611fea35737c WHIRLPOOL 5901ab349cea93f697cc4bd9365ae9592f081fc5c192dffd8f31bfb2fd1dcb0fa252134512b6183555d3b278c6ea557a73baa372d39f2d2fdcf7e84c61fed862
 EBUILD eselect-php-0.7.1-r2.ebuild 1394 SHA256 7c4e4e6065cc8d8b3303f17712a403b92a5818b2ecae91109a5eaa0665b930d7 SHA512 1507a752d475149199ed10e0b0b0544f3d2e4d3ef0e033095bdf85a2aa4b3a864c320e5db29cd576f5a3f2d9ca40784cf2c4923fed9a1cd37bc7a1f83b7adf82 WHIRLPOOL e76dd9f1382322bfc35072e8dc82382d38b92658e0018bb2db0f63730782f7f05a98e506fb80bc08e63f430db0a1a863436d8f610a026c0c95e2fb095a9810ec
+EBUILD eselect-php-0.7.1-r3.ebuild 1320 SHA256 6e16c61cd9181a86bac9e0e0f01da01698532abdbddee63fc84167995cbf605b SHA512 3195f8378c28923ff76ac9e6528ec66053bf6ebd3b5ef403fa9de467d62d91900b4df61f35fcb2c002e7bc1b14312a4dddda09e067416c5ffa310514d43c2879 WHIRLPOOL ae00e8f73147b94ebd8f659e71547059c43b8dce0a468bc23c31d78b75e65bae6e6becd9a197298ea61cfe72b37a47f4c1bc7fcd26763687fa51201c8c0e3ff5
 EBUILD eselect-php-0.7.1.ebuild 1183 SHA256 29e25cce35f65ff2d46e31824a14c9c3557e0930d19750bfa5b7df412bab334f SHA512 a4ac1a6a718612404a14d98b4f3b8d31e8177e2906e5f2936f548559a4962254c0ef71e2407d307d47383fb94e33c2ab0b99d3f686d6f989f75101c9b21d049a WHIRLPOOL 801e25f0987e12f793553676cdc9a81026a670aad8c7e17a17006c91152b306ecf7e0e84eea47c3e7c3cac596f0637e46758459688c2deea872a159420d01fbe
-MISC ChangeLog 6657 SHA256 69f87398f84408f7dd6b25fe6ac63f1cc605c31137da5d9595615e84d60302a7 SHA512 c8d81be5e082e54eafe3fe012e59ac04e36ddd3c24f5e875a6d20c6b2825d7d603e0f8109dcf2238d6b208e72635933dd80933033e63eeef7d7ae6971e7c19e1 WHIRLPOOL ce0ed67e406bff5c3ae91dff4c54d88fc65c752b6bb69ea21614a13bcf86e482792f96cef6b743ecb144ddbc8a1661b533c430d0b9c5c779df7211ec3b60eedb
+MISC ChangeLog 6808 SHA256 f317becf361e7ee169f487be727d87f0df9cfb59e57285c7c5975b22796038be SHA512 47232db301eb49dfff1876c19763b8cc024f70c61b2779cca114fab21434c74342c54d94e3ece82e195acfcd7117f62e3ac83a7de3409062b7ed53574acf01a4 WHIRLPOOL 777f85bf7e1ba82037e58af8de58eb2cc492af181a655d617aebda634655afe99071d483f20fbf6e14b1de98e783edc9b5b1467072bd72d694d83f867488a82b
 MISC metadata.xml 306 SHA256 007582443454394a0817ca5100a5bf091e027ddcc8d2639b8666fd264166e201 SHA512 661dd3eaea921697e52084355592a93158c63ca15bbb43c35ea62df8f864c5edee04d521f63d4b9a831ee82ff616203096bc9e50834a0f2550895c3cfcc770a3 WHIRLPOOL 5111e517b0c290c2294858d5391ff775825a045242b582f732b80b7434f9ee56630a84e6e97e978810dca268b5a4a62ccef582003276db4f21181a269fc8f777
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCgAGBQJSAOzBAAoJELp701BxlEWffUAP/jCuSsu4uYcmEQNX61p65MJE
-rt/433AjpGfJTri5N7aWTR0eK/F3aD/YyOGF4M01Nl9LBQZavTcCnynV6PGMueGw
-97LRCKSp0ZdyucJrmqDNmFHmAmTKsSeKnTzt0N459yHsufqyQZDDDaL4xN3baIbt
-CrK9c3/V12Vft0vDsEK6d0I48jpedy623t+p2XZ7048I/7M5Ai+LTGdJKeRtXcLH
-lAFz2V0zrB5nNGar/RRc4ey0+n7C2XwEPhh1jjUT6qlTcXThZB1mBtA48LNjYl68
-pth1FP05x9JyPY4McqtQRxqgc8vU97Qh/Ed2iQsMxrc4+7vabd8mLXi1ps+9Kogn
-Ts/WUljhtTwA+/Ryl5fYr9KsOQphp1U4qFZYzQVfj4peQHC//Hzgf9Pn8ev7L3r7
-MKeOCplY0mtMxbj/0Wi7+o3fRkrEGqOJHLuIUGTciziAjNARD5/Me5G2aE16N3G2
-V2G/8OJVYjbTG/Iul2wi9ypaR+8oaEKVJPjjS2OXw9E7kgCODAzaM5vOj4U6uFUj
-L3/LmR4YzKAnAW/grRvrdMD4gAvLvRTR6SHnVs7t2QflXEPHPi+6/H7EiuyqP7D7
-XU6giHfSfaWxwFtOl/pb7tJtc4X4GMsi6M1f87GABPLFzzlrPYv2gR3pM654M0xQ
-5qhqvE/8oeUI72s3Z+Cg
-=cPeB
+iEYEAREIAAYFAlLustkACgkQCaWpQKGI+9QTmACcC3mwuQK81bY0REW4bPuDCqzu
+k8EAn0qIht91PR1ye6sMjJy3JJHo37ZI
+=CrP4
 -----END PGP SIGNATURE-----
diff --git a/app-admin/eselect-php/eselect-php-0.7.1-r3.ebuild b/app-admin/eselect-php/eselect-php-0.7.1-r3.ebuild
new file mode 100644
index 000000000000..ab41ebf87b08
--- /dev/null
+++ b/app-admin/eselect-php/eselect-php-0.7.1-r3.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-php/eselect-php-0.7.1-r3.ebuild,v 1.1 2014/02/02 21:04:24 pacho Exp $
+
+EAPI=5
+
+inherit depend.apache systemd
+
+DESCRIPTION="PHP eselect module"
+HOMEPAGE="http://www.gentoo.org"
+SRC_URI="http://dev.gentoo.org/~olemarkus/eselect-php/eselect-php-${PV}.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="fpm apache2"
+
+DEPEND=">=app-admin/eselect-1.2.4
+		!<dev-lang/php-5.3.23-r1:5.3
+		!<dev-lang/php-5.4.13-r1:5.4
+		!<dev-lang/php-5.5.0_beta1-r2:5.5
+		"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}"
+
+want_apache
+
+src_install() {
+	mv eselect-php-${PV} php.eselect
+	insinto /usr/share/eselect/modules/
+	doins php.eselect
+
+	if use apache2 ; then
+		insinto "${APACHE_MODULES_CONFDIR#${EPREFIX}}"
+		newins "${FILESDIR}/70_mod_php5.conf-apache2" \
+			"70_mod_php5.conf"
+	fi
+
+	if use fpm ; then
+		dodir "/etc/init.d"
+		insinto "/etc/init.d"
+		newinitd "${FILESDIR}/php-fpm-r1.init" "php-fpm"
+		systemd_dotmpfilesd "${FILESDIR}/php-fpm.conf"
+		exeinto /usr/libexec
+		doexe "${FILESDIR}/php-fpm-launcher"
+	fi
+}