Version bump. Resolving bug 323783, 389805 and 412913

Package-Manager: portage-2.1.11.52/cvs/Linux x86_64
Manifest-Sign-Key: 0xC4A92BF5

7 files changed, 183 insertions, 11 deletions

diff --git a/app-admin/eselect-php/ChangeLog b/app-admin/eselect-php/ChangeLog
index 4476a08b5894..fcac1d4f11a4 100644
--- a/app-admin/eselect-php/ChangeLog
+++ b/app-admin/eselect-php/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-admin/eselect-php
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-php/ChangeLog,v 1.38 2012/09/12 03:04:01 ottxor Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-php/ChangeLog,v 1.39 2013/03/23 19:42:13 olemarkus Exp $
+
+*eselect-php-0.7.0 (23 Mar 2013)
+
+  23 Mar 2013; Ole Markus With <olemarkus@gentoo.org> +eselect-php-0.7.0.ebuild,
+  +files/70_mod_php5.conf-apache2, +files/php-fpm, +files/php-fpm.init,
+  metadata.xml:
+  Version bump. Resolving bug 323783, 389805 and 412913
 
   12 Sep 2012; Christoph Junghans <ottxor@gentoo.org> eselect-php-0.6.7.ebuild:
   added prefix keywords
diff --git a/app-admin/eselect-php/Manifest b/app-admin/eselect-php/Manifest
index c7ab08f0a8a7..a81930363180 100644
--- a/app-admin/eselect-php/Manifest
+++ b/app-admin/eselect-php/Manifest
@@ -1,24 +1,31 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX 70_mod_php5.conf-apache2 348 SHA256 5bb8a45570582b4389a7d3feea0398e1c13ed4ced96e559b9406ed8c965dea8c SHA512 c74ec09c3c4124a15e14ece4bb769bb889466160cc0878ca3d55d5afc30fd4c05673c40428b75be669f72e82ba29f60ed19767caca77bba8adc12aae1c83f6f3 WHIRLPOOL fd503ec904a3853b90f8f4cc2042cf9014fdb1383a508d22e680559009b5b1e0beb5a09909a393e53868a64712c63e35642915787fa4176af07cb594adedb441
+AUX php-fpm 1224 SHA256 855bbc57e1f47f932809e96b59905b8494f4360d0fe3fdb30c26b01cb1e291ae SHA512 aebf32c6230f321975da6e894d88611838cc73e0768e9c8d83c06349275779c2de739a303c546ca881d3f55bedbc1039ce9a0c89ce545eb72a12b99b964d0569 WHIRLPOOL b38ffceef6bf283409578c4d9e33898181f51028f20d8b2dc7b5515b5122f8e7618a303338a1cdf08acb972401d089e054c673784206037d7c9a31527d6140b6
+AUX php-fpm.init 1157 SHA256 37e34461babfb5881169f9729fbdde7d4aba533f123e2c480fe25ac3b863d3e7 SHA512 3555a2210104185b93b3805400995ed987076429c47b0950f58396c535d7ea99a5d2e7eedde071e2de06f4e248e0cb9bd27ccbf01b5606152a2f559fe874afbe WHIRLPOOL 6f5f0e45004275c7c984e68c293282db23461a64965b7d7c4a0ded682140177989ed50217aea6253178cc18fa9f9d202a69383400dc1a53271f00e85884849a1
 DIST eselect-php-0.6.2.bz2 1454 SHA256 c4eecb73aaf50538a8eaf8afb0d52b3666b45ef19e5f26f7998682bac56566c4 SHA512 cb2639ddf97c77336195db57a9a5021200693ee4f1382d7ed6cda22a27f5b0f76be88abf376e13245a72223c12065d019e0537494f934f9cbe40e0fdcbfe2b22 WHIRLPOOL 523f3a0c30705599ee91c5ce0a691c140226a18c0a1ba73df4a0f9835a92644748a0f0ed73f1ea101de65cf270947f054a8feeb3c36609f644f8682d611aaa11
 DIST eselect-php-0.6.4.bz2 1533 SHA256 6481f82c89ffe15ede967ffa8b895496ad23ac638931ee58108e91a4badbeef1 SHA512 aaea307e3e3f8e85a92847b2ef4ce2f7ccacd18219d34c6b3c3af974741e72174134db4debce334bd44f342b56dc443a4692273881afb228af0b75b13b34f712 WHIRLPOOL 25da6ba132f0ed6cccc5c24371ba4a8949ea607b30b5e965353884474a1b0e1550601469af3411794d33dd99c443e0918905f86593d9d60ceded73583be46286
 DIST eselect-php-0.6.6.bz2 1837 SHA256 7324d92086dad38942dfc053f2775af6f41f3e2f9d19472a7569e4f58aae0f86 SHA512 ba7cc1fc4183a401e2d344348f6a624f0fe947200c0ff69f9ac948b6ff56fa476a3beb9b4cc19f70ec15c4856897a9cf69c7b69d1909321287c071171c59009f WHIRLPOOL dde3be270f42775feec923c5094da68d897c961498a4c94de825954809eeb390ef2766e0e8c910560c9db4289a0144830c6ba401608b2d9536e8bd0b30418243
 DIST eselect-php-0.6.7.bz2 1840 SHA256 59cd22ee84c7754bcb416d841302e13d0367bc4d282bd3174590165070c473fa SHA512 4a37f031a20967c2d32972647b3594ec8239e55909cb2e131d63b6421665b003d6d6a512b0ed33c36a51e431cf6bc40061bb003fc8a79801799396835816b511 WHIRLPOOL efa64529bd24a3f565c084c3108a7093fa973f974a66697ff71acf7e3f97915d0918ead7e4ea5f071d845c3784edc1f97ed3225c0ad94486393b6abe24c4532a
+DIST eselect-php-0.7.0.bz2 2252 SHA256 386abbab747e617e18a39d359c816ccd94cdf8048ea51e6e185370be157f0194 SHA512 be36e23bb7940b013941da9d0e73e29184cc55a929c1c59b81ae265203dceed9b040950925eafa723adc041afe6cf841e54f3db0e3d76627e974f075f4528e9e WHIRLPOOL ca7f5507ce37ce8d9b9560797836e6a8610a8a9f61a125858b38a78e7418356a2b9787d92cf09ef13196f379b548710b2ea23b3333aba7e499dd685c0110ab86
 EBUILD eselect-php-0.6.2.ebuild 664 SHA256 b8e9902754598fa42074517a9b041016b4bbc825aee108de4ad3982c3e80215b SHA512 e8e6acace7ef501ddcede63e252f2637d49ec38020c8b79a408488468a5812030f86e8cf51a3486f56d11cd642abcbea98bfdddc0ad32a1eeff281f3da4ec7d4 WHIRLPOOL 002db3f1f4c983cc0213f62d30ff78614ed07dd9762b197c3c3935e257b221bef64ce06ebc980a442b86c77ff1241b7cab558f99e34f0f8f350472c0eb131568
 EBUILD eselect-php-0.6.4.ebuild 677 SHA256 4fefe15bc27d6df356477bf49f38d3a5cceb49b15d8e2f4769283ebae5ee9452 SHA512 7fcdbc69dc9f404c512f5477958fcc225ea6265fcb0f6a1c76093c27fe9320daebf03619cd22610200ddf731d36ba44e0b9bec8a3fb555524b97f72402959045 WHIRLPOOL 09c60f136fb213200970a8f2f6a4d42d9f9c9d85e16f503dbaea0f3ad4a49b5669b5c088af41fd782c1a9cbb8db66bd74552f95e9b0927d28fb0382b8013a544
 EBUILD eselect-php-0.6.6.ebuild 720 SHA256 2d1844a4003862bb3d28985d074f4454df6c713dffe81db2f05c7a3d839c365a SHA512 7a401408a1c74cefd8f575f25b174d9b317d657bc93ca4583052358def68b4840e405c9a35da1708fa1b8990656ee1f35527e499ab19dafcc11faf074c067c03 WHIRLPOOL f5e60d669cdfc389615cb51a7809dd412a2046255a119a51f5f994a8a21b77146b145a7ecef060ecb1d425c5553421d0404e7e41273d73a97d3243044b47b1d0
 EBUILD eselect-php-0.6.7.ebuild 781 SHA256 0cc178b0cca5b15c22c6376c7b3b75e27ac9bf14c85cc56856d9b944f7b7503c SHA512 1c1a7998d67ac1a98717cabc345cc081dfd6f6cd08bfac72d4579592c8e2f1a52145ca3ac8ff55bf8b31e6c8fbaaa14e2170e2221df001cc09c54c2084ec2cec WHIRLPOOL 44ead04a88edf032a9c91904899bf30f2c92d9730304e87de76ba8ff09d6b9f3ef9cc07dfd60d04a90575ca1e2c2f97c68befc430f4384492a1104422dcaf74c
-MISC ChangeLog 4272 SHA256 5f758cb73bcebcaca10b07b045857a6a723ef7e38834dd6fcc457c2e2cf0c6ac SHA512 5ba22e625cb03c1a123acd30065125a521b6fdd7b4c719b1a9b0803d030f0425bfec68325816c7a36a99e6dc5ae4543cf1f723b3d0b5327cd74009ec374dbbde WHIRLPOOL cdfd26a86328b9057b00cd425e2ebab49ef0a3505154fe3659d05d85c1b3fdce4343e5c8e073dc2024d5c08de0a35e965c17f1fffe1cf4f960299403186d193b
-MISC metadata.xml 225 SHA256 5e64117d8d9482bdc8c5e4fbebadd108ecfeeca5255b4987bef05a9d912aa464 SHA512 b1a3a31275a5a71726d07b16e10ccdf38554e2ffd54962371a0dadbc539b57862edd584cc8293d7601865e78e62dc6a1140d82c071b8c8e8f74f776c5eafad56 WHIRLPOOL 2352f721e863089a98037fd286fa67e1f98ac2c5e126f09a1cc0218c468749cdbb4c86ffe7e869cdfe848c61a9553313f4d04d76dc77c299e8395577626e630f
+EBUILD eselect-php-0.7.0.ebuild 1202 SHA256 d6ab7f7d4d1b927a34636249bcf68ab6859b2a0319f73a3a6c9136b0b8625f7d SHA512 0b429f933a98a97d58f26a4268fe653ebfba65639d6f6054b86c3140689570e32c0e8f6d0d5a48eebf3344cc8ce1c996ef8c3cfa5230b3fe2e52110c39e13833 WHIRLPOOL dad87e5db2017248af40a6a39c7e2a06687340cc9bea84599f39875dd089391ab4230e5c2b89dc9aa8a78ef8ee5deec304b6c427be23ac84f37d271da752d9e3
+MISC ChangeLog 4535 SHA256 056e2f7d30fb800bdcc2b3cc60fa79c59b98afc2bf2b3cbd435a288fdcd6d97f SHA512 eb3d66beb8ad12cf6daf20ab0cc65c15c24b7b004fda061d54f0414df65191a6d44dac2a510a46cafb9717963227b675fc74dbafbc67d9afc7704dfe36d76779 WHIRLPOOL 5dc0ec6cf3aeee3f7a59bb0716389d024462be5752431d076f9d3a64ecc729180541471f01604acf4b191e4e2210050b092afab51c6f0892270a74f91198550d
+MISC metadata.xml 306 SHA256 007582443454394a0817ca5100a5bf091e027ddcc8d2639b8666fd264166e201 SHA512 661dd3eaea921697e52084355592a93158c63ca15bbb43c35ea62df8f864c5edee04d521f63d4b9a831ee82ff616203096bc9e50834a0f2550895c3cfcc770a3 WHIRLPOOL 5111e517b0c290c2294858d5391ff775825a045242b582f732b80b7434f9ee56630a84e6e97e978810dca268b5a4a62ccef582003276db4f21181a269fc8f777
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQT/unAAoJEOeBhlrCAAWGK78IALeV05a37MTAk+ofpd98yj5L
-FyfWEHFrl1kgPZnoHZP1yt9hQp8l/JFRMeLE4I0lW95OFEUR46F3xlu7S6eLZCON
-TCdTnH89SuE0k7cPVCn+B1VIyWBtoOeVb6zMSFwij4DJjin6x9vVEwyt78uxvBAP
-SMSY11NXMrKpMRFYHA1II9JNIIjQvH64DYVYwhhqXkNIcl+HqhYHJBQ5qN+noziv
-UggtpOCN/VE7beeGVMvNlASG+Zw5rEeNhOsDDeoilJMRRPSFjh0bjenjc75Ke3UX
-i0B9owiniflNbGz/jgYsELYoPuZNlqyg3wzYI+RGRYg9asIkucmYyZNvQvrYJ4M=
-=m3de
+iQF8BAEBCABmBQJRTgWYXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyOEZEMjNGNzBENkE5N0Q2Q0ZFMkFDNDA2
+QkFCNEFFNUM0QTkyQkY1AAoJEGurSuXEqSv1DukH/2An9xI62ftiUBt1tF4cfGBd
+s8plu/agof5ONCInpS5HPojzvs7Gw6R8sYV3E7V5p5+/8EwnsmLa+e4rf8ZDx1mY
+/0RkCZyn0YvNLdZDQ6Mb5mTjIZAhH6jteHOlyfS2JRY8Rd1awQdW93wX1d9gTwy9
+W9FmuS9ZParSjhKSb2kQxYPvBEkWHmKRVqyHxfQssY2xZYNjQQrxwOm/DIPJ1SWo
+zCNPJ02eGzojbwP5IalT3y3HF07/hUnlroH6ufvXHS/Xui9szdrh94Q6Zy10H5Hd
+Q0XUo1YNCZZxjK8MgXkO5i/UyEJLZoXODQn86V6S7GTVcDTHEv29qW22DaArnaE=
+=5XOJ
 -----END PGP SIGNATURE-----
diff --git a/app-admin/eselect-php/eselect-php-0.7.0.ebuild b/app-admin/eselect-php/eselect-php-0.7.0.ebuild
new file mode 100644
index 000000000000..cd3b66f218e7
--- /dev/null
+++ b/app-admin/eselect-php/eselect-php-0.7.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2013 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.0.ebuild,v 1.1 2013/03/23 19:42:13 olemarkus Exp $
+
+EAPI=5
+
+inherit depend.apache
+
+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.init" "php-fpm"
+	fi
+}
diff --git a/app-admin/eselect-php/files/70_mod_php5.conf-apache2 b/app-admin/eselect-php/files/70_mod_php5.conf-apache2
new file mode 100644
index 000000000000..7ec8739cf837
--- /dev/null
+++ b/app-admin/eselect-php/files/70_mod_php5.conf-apache2
@@ -0,0 +1,14 @@
+<IfDefine PHP5>
+	# Load the module first
+	<IfModule !mod_php5.c>
+		LoadModule php5_module    modules/libphp5.so
+	</IfModule>
+
+	# Set it to handle the files
+	<IfModule mod_mime.c>
+		AddHandler application/x-httpd-php .php .php5 .phtml
+		AddHandler application/x-httpd-php-source .phps
+	</IfModule>
+
+	DirectoryIndex index.php index.phtml
+</IfDefine>
diff --git a/app-admin/eselect-php/files/php-fpm b/app-admin/eselect-php/files/php-fpm
new file mode 100755
index 000000000000..a7cd9bb80f39
--- /dev/null
+++ b/app-admin/eselect-php/files/php-fpm
@@ -0,0 +1,49 @@
+#!/sbin/runscript
+
+set_phpvars() {
+	PHPSLOT=${SVCNAME#php-fpm-}
+	[ ${PHPSLOT} = 'php-fpm' ] && PHPSLOT="$(eselect php show fpm)"
+
+	PHP_FPM_CONF="/etc/php/fpm-${PHPSLOT}/php-fpm.conf"
+	PHP_FPM_PID="/var/run/php-fpm-${PHPSLOT}.pid"
+
+	[ ${PHPSLOT} = 'php-fpm' ] && PHP_FPM_PID="/var/run/php-fpm.pid"
+}
+
+extra_commands="depend"
+extra_started_commands="reload"
+
+depend() {
+	need net
+	use apache2 lighttpd nginx
+}
+
+start() {
+        ebegin "Starting PHP FastCGI Process Manager"
+	set_phpvars
+        start-stop-daemon --start --pidfile ${PHP_FPM_PID} --exec \
+            /usr/lib/${PHPSLOT}/bin/php-fpm -- -y "${PHP_FPM_CONF}" -g "${PHP_FPM_PID}"
+        local i=0
+        local timeout=5
+        while [ ! -f ${PHP_FPM_PID} ] && [ $i -le $timeout ]; do
+            sleep 1
+            i=$(($i + 1))
+        done
+        
+        [ $timeout -gt $i ]
+        eend $?
+}
+
+stop() {
+        ebegin "Stopping PHP FastCGI Process Manager"
+	set_phpvars
+        start-stop-daemon --signal QUIT --stop --exec /usr/lib/${PHPSLOT}/bin/php-fpm --pidfile ${PHP_FPM_PID}
+        eend $?
+}
+
+reload() {
+    ebegin "Reloading PHP FastCGI Process Manager"
+    set_phpvars
+    [ -f ${PHP_FPM_PID} ] && kill -USR2 $(cat ${PHP_FPM_PID})
+    eend $?
+}
diff --git a/app-admin/eselect-php/files/php-fpm.init b/app-admin/eselect-php/files/php-fpm.init
new file mode 100755
index 000000000000..a186d83478c5
--- /dev/null
+++ b/app-admin/eselect-php/files/php-fpm.init
@@ -0,0 +1,47 @@
+#!/sbin/runscript
+
+set_phpvars() {
+	PHPSLOT=${SVCNAME#php-fpm-}
+	[ ${PHPSLOT} = 'php-fpm' ] && PHPSLOT="$(eselect php show fpm)"
+
+	PHP_FPM_CONF="/etc/php/fpm-${PHPSLOT}/php-fpm.conf"
+	PHP_FPM_PID="/var/run/php-fpm-${PHPSLOT}.pid"
+}
+
+extra_commands="depend"
+extra_started_commands="reload"
+
+depend() {
+	need net
+	use apache2 lighttpd nginx
+}
+
+start() {
+        ebegin "Starting PHP FastCGI Process Manager"
+	set_phpvars
+        start-stop-daemon --start --pidfile ${PHP_FPM_PID} --exec \
+            /usr/lib/${PHPSLOT}/bin/php-fpm -- -y "${PHP_FPM_CONF}" -g "${PHP_FPM_PID}"
+        local i=0
+        local timeout=5
+        while [ ! -f ${PHP_FPM_PID} ] && [ $i -le $timeout ]; do
+            sleep 1
+            i=$(($i + 1))
+        done
+        
+        [ $timeout -gt $i ]
+        eend $?
+}
+
+stop() {
+        ebegin "Stopping PHP FastCGI Process Manager"
+	set_phpvars
+        start-stop-daemon --signal QUIT --stop --exec /usr/lib/${PHPSLOT}/bin/php-fpm --pidfile ${PHP_FPM_PID}
+        eend $?
+}
+
+reload() {
+    ebegin "Reloading PHP FastCGI Process Manager"
+    set_phpvars
+    [ -f ${PHP_FPM_PID} ] && kill -USR2 $(cat ${PHP_FPM_PID})
+    eend $?
+}
diff --git a/app-admin/eselect-php/metadata.xml b/app-admin/eselect-php/metadata.xml
index fdc0d58d9226..b4348f2483fa 100644
--- a/app-admin/eselect-php/metadata.xml
+++ b/app-admin/eselect-php/metadata.xml
@@ -4,5 +4,8 @@
 	<herd>php</herd>
 	<longdescription lang="en">PHP eselect module
 	</longdescription>
+	<use>
+		<flag name='fpm'>Enable the FastCGI Process Manager SAPI</flag>
+	</use>
 </pkgmetadata>