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

[Michael Orlitzky]

commit:     941b473afc3f5e96a83c12113454e9d1467e2203
Author:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 23 15:29:03 2020 +0000
Commit:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Thu Jan 23 15:34:01 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=941b473a

app-eselect/eselect-php: tweak the live ebuild for upstream changes.

Package-Manager: Portage-2.3.79, Repoman-2.3.16
Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org>

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

diff --git a/app-eselect/eselect-php/eselect-php-9999.ebuild b/app-eselect/eselect-php/eselect-php-9999.ebuild
index e6b5ef3d880..013fabe6fdd 100644
--- a/app-eselect/eselect-php/eselect-php-9999.ebuild
+++ b/app-eselect/eselect-php/eselect-php-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit systemd git-r3 autotools
+inherit git-r3 autotools
 
 DESCRIPTION="PHP eselect module"
 HOMEPAGE="https://gitweb.gentoo.org/proj/eselect-php.git/"
@@ -19,7 +19,7 @@ RDEPEND="app-admin/eselect
 	apache2? ( www-servers/apache[apache2_modules_dir] )"
 
 src_prepare() {
-	eapply_user
+	default
 	eautoreconf
 }
 
@@ -36,14 +36,3 @@ src_configure(){
 		  $(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
-}