commit: c4165bd92e2045bd41ee0dfeecbc8a5f7505192e Author: Michael Orlitzky <mjo <AT> gentoo <DOT> org> AuthorDate: Fri Oct 16 14:40:08 2020 +0000 Commit: Michael Orlitzky <mjo <AT> gentoo <DOT> org> CommitDate: Fri Oct 16 14:42:47 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c4165bd9
app-eselect/eselect-php: remove obsolete versions. Bug: https://bugs.gentoo.org/740620 Package-Manager: Portage-3.0.8, Repoman-3.0.1 Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org> app-eselect/eselect-php/Manifest | 2 - .../eselect-php/eselect-php-0.9.4-r5.ebuild | 44 ---------------------- app-eselect/eselect-php/eselect-php-0.9.5.ebuild | 44 ---------------------- app-eselect/eselect-php/files/php-fpm-launcher | 7 ---- app-eselect/eselect-php/files/php-fpm-launcher-r3 | 11 ------ app-eselect/eselect-php/files/php-fpm.conf | 1 - 6 files changed, 109 deletions(-) diff --git a/app-eselect/eselect-php/Manifest b/app-eselect/eselect-php/Manifest index 9ede973795a..313fb404135 100644 --- a/app-eselect/eselect-php/Manifest +++ b/app-eselect/eselect-php/Manifest @@ -1,3 +1 @@ -DIST eselect-php-0.9.4.tar.xz 49576 BLAKE2B 417956b355ffec7d7cda03dffa94e4d749a2b33a64a216c2ed8492181a5385f5219078efe6cc4d0d2d81b0fac40901c0cf07914a826484b83833542a12b47359 SHA512 2ba1dd75d4bb9611c6687ed4449f715728263538f772652aa1ac013103cf9ddf328c854326cf6da4f9b3ff2279bf99d973325520fe8b4e3ba7a76a9c3264e78e -DIST eselect-php-0.9.5.tar.xz 49732 BLAKE2B 78c2010abcb1c9efd4d5f2f3f934365b338901a98bc8528131f2b9f564c1c3f740ab2dc2a28a0a58912e750062e61f75a7c6611c2f37019ca6525d729ffb5fd2 SHA512 55e401cb0c3ed19fed90485d62ba3deed3355503542898ff0d1b5404bd5fafb2f887df433609d4d4b28f32c0034100ea32c9e58547ef6417ea0b0f60d061d119 DIST eselect-php-0.9.6.tar.xz 53236 BLAKE2B 38478d4792f8a527e5f519abd7765211aff8c1d132ceeba5eec70ea3b8d1f254be52564334fed3840950c2461ff4a30784b92fbb8b21cc448083617797eab1d4 SHA512 d3f14288b3493cb48717c1f27430ae8b60881e9f6f48e4b7644a4596d9fc1b9823a6af8b7101a62b28a92e3bff164b1717617a2642a5bb02e8dd46de56d4f410 diff --git a/app-eselect/eselect-php/eselect-php-0.9.4-r5.ebuild b/app-eselect/eselect-php/eselect-php-0.9.4-r5.ebuild deleted file mode 100644 index 29450039264..00000000000 --- a/app-eselect/eselect-php/eselect-php-0.9.4-r5.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit systemd - -DESCRIPTION="PHP eselect module" -HOMEPAGE="https://gitweb.gentoo.org/proj/eselect-php.git/"; -SRC_URI="https://dev.gentoo.org/~mjo/distfiles/${P}.tar.xz"; - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" -IUSE="fpm apache2" - -# The "DirectoryIndex" line in 70_mod_php.conf requires mod_dir. -RDEPEND="app-admin/eselect - apache2? ( www-servers/apache[apache2_modules_dir] )" - -src_configure() { - # We expect localstatedir to be "var"ish, not "var/lib"ish, because - # that's what PHP upstream expects. See for example the FPM - # configuration where they put logs in @localstatedir@/log. - # - # The libdir is passed explicitly in case the /usr/lib symlink - # is not present (bug 624528). - econf --libdir="${EPREFIX}/usr/$(get_libdir)" \ - --localstatedir="${EPREFIX}/var" \ - --with-piddir="${EPREFIX}/run" \ - $(use_enable apache2) \ - $(use_enable fpm) -} - -src_install() { - default - - if use fpm ; then - systemd_dotmpfilesd "${FILESDIR}/php-fpm.conf" - sed -e "s,@libdir@,$(get_libdir),g" "${FILESDIR}/php-fpm-launcher-r3" > "${T}"/php-fpm-launcher || die - exeinto /usr/libexec - doexe "${T}"/php-fpm-launcher - fi -} diff --git a/app-eselect/eselect-php/eselect-php-0.9.5.ebuild b/app-eselect/eselect-php/eselect-php-0.9.5.ebuild deleted file mode 100644 index a38c7b0c3c1..00000000000 --- a/app-eselect/eselect-php/eselect-php-0.9.5.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit systemd - -DESCRIPTION="PHP eselect module" -HOMEPAGE="https://gitweb.gentoo.org/proj/eselect-php.git/"; -SRC_URI="https://dev.gentoo.org/~mjo/distfiles/${P}.tar.xz"; - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" -IUSE="fpm apache2" - -# The "DirectoryIndex" line in 70_mod_php.conf requires mod_dir. -RDEPEND="app-admin/eselect - apache2? ( www-servers/apache[apache2_modules_dir] )" - -src_configure() { - # We expect localstatedir to be "var"ish, not "var/lib"ish, because - # that's what PHP upstream expects. See for example the FPM - # configuration where they put logs in @localstatedir@/log. - # - # The libdir is passed explicitly in case the /usr/lib symlink - # is not present (bug 624528). - econf --libdir="${EPREFIX}/usr/$(get_libdir)" \ - --localstatedir="${EPREFIX}/var" \ - --with-piddir="${EPREFIX}/run" \ - $(use_enable apache2) \ - $(use_enable fpm) -} - -src_install() { - default - - if use fpm ; then - systemd_dotmpfilesd "${FILESDIR}/php-fpm.conf" - sed -e "s,@libdir@,$(get_libdir),g" "${FILESDIR}/php-fpm-launcher-r3" > "${T}"/php-fpm-launcher || die - exeinto /usr/libexec - doexe "${T}"/php-fpm-launcher - fi -} diff --git a/app-eselect/eselect-php/files/php-fpm-launcher b/app-eselect/eselect-php/files/php-fpm-launcher deleted file mode 100644 index 7a1c1c9f918..00000000000 --- a/app-eselect/eselect-php/files/php-fpm-launcher +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh - -PHPSLOT="${1}" -[ -z "${PHPSLOT}" ] && PHPSLOT="$(eselect php show fpm)" -shift - -exec /usr/lib/${PHPSLOT}/bin/php-fpm "${@}" diff --git a/app-eselect/eselect-php/files/php-fpm-launcher-r3 b/app-eselect/eselect-php/files/php-fpm-launcher-r3 deleted file mode 100644 index a2b6eabc4da..00000000000 --- a/app-eselect/eselect-php/files/php-fpm-launcher-r3 +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh - -# If there are no arguments, then "shift" will fail (bug 626496). -if [ $# -eq 0 ]; then - PHP_SLOT=$(eselect php show fpm) -else - PHP_SLOT=$1 - shift -fi - -exec "/usr/@libdir@/${PHP_SLOT}/bin/php-fpm" "${@}" diff --git a/app-eselect/eselect-php/files/php-fpm.conf b/app-eselect/eselect-php/files/php-fpm.conf deleted file mode 100644 index 801e74f1e62..00000000000 --- a/app-eselect/eselect-php/files/php-fpm.conf +++ /dev/null @@ -1 +0,0 @@ -d /run/php-fpm 755 root root
