From 35ff1eab9f67bdb714bd1de2f874540f59c3a376 Mon Sep 17 00:00:00 2001 From: Michael Orlitzky Date: Mon, 11 Dec 2017 08:09:25 -0500 Subject: [PATCH] app-eselect/eselect-php: drop sys-apps/gentoo-functions dependency. Thanks to Craig Andrews in commit bbd39788, we no longer need to pull in sys-apps/gentoo-functions when USE=fpm is set. Drop it from the latest revision and the live ebuild. Bug: https://bugs.gentoo.org/640460 Package-Manager: Portage-2.3.13, Repoman-2.3.3 --- ...eselect-php-0.9.4-r3.ebuild => eselect-php-0.9.4-r4.ebuild} | 3 +-- app-eselect/eselect-php/eselect-php-9999.ebuild | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) rename app-eselect/eselect-php/{eselect-php-0.9.4-r3.ebuild => eselect-php-0.9.4-r4.ebuild} (95%) diff --git a/app-eselect/eselect-php/eselect-php-0.9.4-r3.ebuild b/app-eselect/eselect-php/eselect-php-0.9.4-r4.ebuild similarity index 95% rename from app-eselect/eselect-php/eselect-php-0.9.4-r3.ebuild rename to app-eselect/eselect-php/eselect-php-0.9.4-r4.ebuild index 9d383514ec4f..646840771165 100644 --- a/app-eselect/eselect-php/eselect-php-0.9.4-r3.ebuild +++ b/app-eselect/eselect-php/eselect-php-0.9.4-r4.ebuild @@ -16,8 +16,7 @@ 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] ) - fpm? ( sys-apps/gentoo-functions )" + apache2? ( www-servers/apache[apache2_modules_dir] )" src_configure(){ # We expect localstatedir to be "var"ish, not "var/lib"ish, because diff --git a/app-eselect/eselect-php/eselect-php-9999.ebuild b/app-eselect/eselect-php/eselect-php-9999.ebuild index a8aa5bb8f4a5..58c55ea19470 100644 --- a/app-eselect/eselect-php/eselect-php-9999.ebuild +++ b/app-eselect/eselect-php/eselect-php-9999.ebuild @@ -16,8 +16,7 @@ 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] ) - fpm? ( sys-apps/gentoo-functions )" + apache2? ( www-servers/apache[apache2_modules_dir] )" src_prepare() { eapply_user -- 2.26.2