commit: bf38f33960bd0341da5e0cb26ff56121da29c785 Author: Manuel Rüger <mrueg <AT> gentoo <DOT> org> AuthorDate: Fri Sep 11 14:49:17 2015 +0000 Commit: Manuel Rüger <mrueg <AT> gentoo <DOT> org> CommitDate: Fri Sep 11 14:49:35 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf38f339
app-eselect/eselect-php: Remove old Package-Manager: portage-2.2.20.1 app-eselect/eselect-php/Manifest | 1 - app-eselect/eselect-php/eselect-php-0.6.2.ebuild | 24 ----------- .../eselect-php/eselect-php-0.7.1-r1.ebuild | 49 ---------------------- .../eselect-php/eselect-php-0.7.1-r2.ebuild | 49 ---------------------- .../eselect-php/eselect-php-0.7.1-r3.ebuild | 48 --------------------- app-eselect/eselect-php/eselect-php-0.7.1.ebuild | 45 -------------------- .../eselect-php/files/70_mod_php5.conf-apache2 | 14 ------- app-eselect/eselect-php/files/php-fpm.init | 47 --------------------- 8 files changed, 277 deletions(-) diff --git a/app-eselect/eselect-php/Manifest b/app-eselect/eselect-php/Manifest index c6bba4c..27a9d1f 100644 --- a/app-eselect/eselect-php/Manifest +++ b/app-eselect/eselect-php/Manifest @@ -1,2 +1 @@ -DIST eselect-php-0.6.2.bz2 1454 SHA256 c4eecb73aaf50538a8eaf8afb0d52b3666b45ef19e5f26f7998682bac56566c4 SHA512 cb2639ddf97c77336195db57a9a5021200693ee4f1382d7ed6cda22a27f5b0f76be88abf376e13245a72223c12065d019e0537494f934f9cbe40e0fdcbfe2b22 WHIRLPOOL 523f3a0c30705599ee91c5ce0a691c140226a18c0a1ba73df4a0f9835a92644748a0f0ed73f1ea101de65cf270947f054a8feeb3c36609f644f8682d611aaa11 DIST eselect-php-0.7.1.bz2 2251 SHA256 10aa400e2d08bc71989366993f12ddb546a0ea29f191c40e37beba1d11d7abd7 SHA512 a6b4c1475dda9f368d799db7658c50cef7d6f71482a53a186fb1394e7ea1fff3c0ef123c82b7ca4d1e45aadb0a034d36f213fc9450766878a60d28639761cb3d WHIRLPOOL a4e45492068616ff30fd888b0cc64441a6eb6e6656e0107d00bd2cf15360dce15052d4d62089ab89d43e6bb36e126529aa101c70e8bd94a9fc916a5369463e3b diff --git a/app-eselect/eselect-php/eselect-php-0.6.2.ebuild b/app-eselect/eselect-php/eselect-php-0.6.2.ebuild deleted file mode 100644 index 3502548..0000000 --- a/app-eselect/eselect-php/eselect-php-0.6.2.ebuild +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=3 - -DESCRIPTION="PHP eselect module" -HOMEPAGE="https://www.gentoo.org" -SRC_URI="http://olemarkus.org/~olemarkus/gentoo/eselect-php-${PV}.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86" -IUSE="" - -DEPEND=">=app-admin/eselect-1.2.4 - !app-admin/php-toolkit" -RDEPEND="${DEPEND}" - -src_install() { - mv eselect-php-${PV} php.eselect - insinto /usr/share/eselect/modules/ - doins php.eselect -} diff --git a/app-eselect/eselect-php/eselect-php-0.7.1-r1.ebuild b/app-eselect/eselect-php/eselect-php-0.7.1-r1.ebuild deleted file mode 100644 index 30a8496..0000000 --- a/app-eselect/eselect-php/eselect-php-0.7.1-r1.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit depend.apache systemd - -DESCRIPTION="PHP eselect module" -HOMEPAGE="https://www.gentoo.org" -SRC_URI="https://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" - systemd_newunit "${FILESDIR}/php-fpm_at.service" "php-fpm@.service" - systemd_dotmpfilesd "${FILESDIR}/php-fpm.conf" - exeinto /usr/libexec - doexe "${FILESDIR}/php-fpm-launcher" - fi -} diff --git a/app-eselect/eselect-php/eselect-php-0.7.1-r2.ebuild b/app-eselect/eselect-php/eselect-php-0.7.1-r2.ebuild deleted file mode 100644 index bfe8be8..0000000 --- a/app-eselect/eselect-php/eselect-php-0.7.1-r2.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit depend.apache systemd - -DESCRIPTION="PHP eselect module" -HOMEPAGE="https://www.gentoo.org" -SRC_URI="https://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_newunit "${FILESDIR}/php-fpm_at.service" "php-fpm@.service" - systemd_dotmpfilesd "${FILESDIR}/php-fpm.conf" - exeinto /usr/libexec - doexe "${FILESDIR}/php-fpm-launcher" - fi -} diff --git a/app-eselect/eselect-php/eselect-php-0.7.1-r3.ebuild b/app-eselect/eselect-php/eselect-php-0.7.1-r3.ebuild deleted file mode 100644 index a57b3c5..0000000 --- a/app-eselect/eselect-php/eselect-php-0.7.1-r3.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit depend.apache systemd - -DESCRIPTION="PHP eselect module" -HOMEPAGE="https://www.gentoo.org" -SRC_URI="https://dev.gentoo.org/~olemarkus/eselect-php/eselect-php-${PV}.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 arm ~arm64 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 -} diff --git a/app-eselect/eselect-php/eselect-php-0.7.1.ebuild b/app-eselect/eselect-php/eselect-php-0.7.1.ebuild deleted file mode 100644 index eba6a7c..0000000 --- a/app-eselect/eselect-php/eselect-php-0.7.1.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit depend.apache - -DESCRIPTION="PHP eselect module" -HOMEPAGE="https://www.gentoo.org" -SRC_URI="https://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-eselect/eselect-php/files/70_mod_php5.conf-apache2 b/app-eselect/eselect-php/files/70_mod_php5.conf-apache2 deleted file mode 100644 index 7ec8739..0000000 --- a/app-eselect/eselect-php/files/70_mod_php5.conf-apache2 +++ /dev/null @@ -1,14 +0,0 @@ -<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-eselect/eselect-php/files/php-fpm.init b/app-eselect/eselect-php/files/php-fpm.init deleted file mode 100644 index a186d83..0000000 --- a/app-eselect/eselect-php/files/php-fpm.init +++ /dev/null @@ -1,47 +0,0 @@ -#!/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 $? -}