[gentoo-commits] repo/gentoo:master commit in: app-eselect/eselect-php/

[Brian Evans]

commit:     ca013d6f36e73368a2a09aea33656bd166b5253f
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 26 14:27:22 2017 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Wed Jul 26 14:27:22 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca013d6f

app-eselect/eselect-php: Update live ebuild to match changes in the repo

Package-Manager: Portage-2.3.6, Repoman-2.3.3

 app-eselect/eselect-php/eselect-php-9999.ebuild | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/app-eselect/eselect-php/eselect-php-9999.ebuild 
b/app-eselect/eselect-php/eselect-php-9999.ebuild
index bbb40ca5261..f32c4a68a2f 100644
--- a/app-eselect/eselect-php/eselect-php-9999.ebuild
+++ b/app-eselect/eselect-php/eselect-php-9999.ebuild
@@ -28,12 +28,12 @@ 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.
-       econf --localstatedir="${EPREFIX}"/var $(use_enable apache2)
+       econf --localstatedir="${EPREFIX}"/var $(use_enable apache2) 
$(use_enable fpm)
 }
 
 src_install() {
        default
-       [[ -f "${D}/etc/init.d/php-fpm.example.init" ]] && rm 
"${D}/etc/init.d/php-fpm.example.init" || die
+
        # This can be removed after a while...
        if use apache2 ; then
                insinto /etc/apache2/modules.d
@@ -41,8 +41,6 @@ src_install() {
        fi
 
        if use fpm ; then
-               newinitd "doc/php-fpm.example.init" "php-fpm"
-               newconfd "doc/php-fpm.example.conf" "php-fpm"
                systemd_dotmpfilesd "${FILESDIR}/php-fpm.conf"
                exeinto /usr/libexec
                newexe "${FILESDIR}/php-fpm-launcher-r1" php-fpm-launcher