From b10b08bc98169e5462fcdb82ab41640e5715f202 Mon Sep 17 00:00:00 2001 From: Michael Orlitzky Date: Mon, 11 Dec 2017 08:20:14 -0500 Subject: app-eselect/eselect-php: drop the "PHP5" backwards-compatibility shim. A backwards-compatibility shim was added on 2016-01-05, in commit 1ae81f5, to prevent (unmodified) configurations from breaking when upgrading eselect-php. A "you should upgrade your configuration" warning was added three days later in commit 470b42d. I think two years is a long enough time to maintain the shim/warning, so this commit removes them from the live ebuild and latest revision. Package-Manager: Portage-2.3.13, Repoman-2.3.3 --- .../eselect-php/eselect-php-0.9.4-r4.ebuild | 66 ---------------------- .../eselect-php/eselect-php-0.9.4-r5.ebuild | 44 +++++++++++++++ app-eselect/eselect-php/eselect-php-9999.ebuild | 22 -------- 3 files changed, 44 insertions(+), 88 deletions(-) delete mode 100644 app-eselect/eselect-php/eselect-php-0.9.4-r4.ebuild create mode 100644 app-eselect/eselect-php/eselect-php-0.9.4-r5.ebuild (limited to 'app-eselect/eselect-php') diff --git a/app-eselect/eselect-php/eselect-php-0.9.4-r4.ebuild b/app-eselect/eselect-php/eselect-php-0.9.4-r4.ebuild deleted file mode 100644 index 646840771165..000000000000 --- a/app-eselect/eselect-php/eselect-php-0.9.4-r4.ebuild +++ /dev/null @@ -1,66 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# 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 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~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 - - # This can be removed after a while... - if use apache2 ; then - insinto /etc/apache2/modules.d - newins "${FILESDIR}/70_mod_php5.backcompat.conf" 70_mod_php5.conf - fi - - 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 -} - -pkg_postinst() { - if use apache2 ; then - elog - elog "If you are upgrading, be warned that our mod_php configuration" - elog "file has changed! You should now define -DPHP for the apache2" - elog "daemon, and inspect the new 70_mod_php.conf which has been" - elog "installed. Module loading involves eselect as of this version." - elog - elog "You must run eselect at least once to choose your apache2 target" - elog "before the new configuration will work. Afterwards, and after you" - elog "have reviewed your new configuration, you are advised to remove" - elog "the obsolete 70_mod_php5.conf file." - elog - fi -} 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 new file mode 100644 index 000000000000..c99ebdbb421a --- /dev/null +++ b/app-eselect/eselect-php/eselect-php-0.9.4-r5.ebuild @@ -0,0 +1,44 @@ +# Copyright 1999-2017 Gentoo Foundation +# 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 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~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-9999.ebuild b/app-eselect/eselect-php/eselect-php-9999.ebuild index 58c55ea19470..e6b5ef3d8804 100644 --- a/app-eselect/eselect-php/eselect-php-9999.ebuild +++ b/app-eselect/eselect-php/eselect-php-9999.ebuild @@ -40,12 +40,6 @@ src_configure(){ src_install() { default - # This can be removed after a while... - if use apache2 ; then - insinto /etc/apache2/modules.d - newins "${FILESDIR}/70_mod_php5.backcompat.conf" 70_mod_php5.conf - fi - 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 @@ -53,19 +47,3 @@ src_install() { doexe "${T}"/php-fpm-launcher fi } - -pkg_postinst() { - if use apache2 ; then - elog - elog "If you are upgrading, be warned that our mod_php configuration" - elog "file has changed! You should now define -DPHP for the apache2" - elog "daemon, and inspect the new 70_mod_php.conf which has been" - elog "installed. Module loading involves eselect as of this version." - elog - elog "You must run eselect at least once to choose your apache2 target" - elog "before the new configuration will work. Afterwards, and after you" - elog "have reviewed your new configuration, you are advised to remove" - elog "the obsolete 70_mod_php5.conf file." - elog - fi -} -- cgit v1.2.3-65-gdbad