| 1 |
commit: 35ff1eab9f67bdb714bd1de2f874540f59c3a376 |
| 2 |
Author: Michael Orlitzky <mjo <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Dec 11 13:09:25 2017 +0000 |
| 4 |
Commit: Michael Orlitzky <mjo <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Dec 11 13:22:45 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35ff1eab |
| 7 |
|
| 8 |
app-eselect/eselect-php: drop sys-apps/gentoo-functions dependency. |
| 9 |
|
| 10 |
Thanks to Craig Andrews in commit bbd39788, we no longer need to pull |
| 11 |
in sys-apps/gentoo-functions when USE=fpm is set. Drop it from the |
| 12 |
latest revision and the live ebuild. |
| 13 |
|
| 14 |
Bug: https://bugs.gentoo.org/640460 |
| 15 |
Package-Manager: Portage-2.3.13, Repoman-2.3.3 |
| 16 |
|
| 17 |
.../{eselect-php-0.9.4-r3.ebuild => eselect-php-0.9.4-r4.ebuild} | 3 +-- |
| 18 |
app-eselect/eselect-php/eselect-php-9999.ebuild | 3 +-- |
| 19 |
2 files changed, 2 insertions(+), 4 deletions(-) |
| 20 |
|
| 21 |
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 |
| 22 |
similarity index 95% |
| 23 |
rename from app-eselect/eselect-php/eselect-php-0.9.4-r3.ebuild |
| 24 |
rename to app-eselect/eselect-php/eselect-php-0.9.4-r4.ebuild |
| 25 |
index 9d383514ec4..64684077116 100644 |
| 26 |
--- a/app-eselect/eselect-php/eselect-php-0.9.4-r3.ebuild |
| 27 |
+++ b/app-eselect/eselect-php/eselect-php-0.9.4-r4.ebuild |
| 28 |
@@ -16,8 +16,7 @@ IUSE="fpm apache2" |
| 29 |
|
| 30 |
# The "DirectoryIndex" line in 70_mod_php.conf requires mod_dir. |
| 31 |
RDEPEND="app-admin/eselect |
| 32 |
- apache2? ( www-servers/apache[apache2_modules_dir] ) |
| 33 |
- fpm? ( sys-apps/gentoo-functions )" |
| 34 |
+ apache2? ( www-servers/apache[apache2_modules_dir] )" |
| 35 |
|
| 36 |
src_configure(){ |
| 37 |
# We expect localstatedir to be "var"ish, not "var/lib"ish, because |
| 38 |
|
| 39 |
diff --git a/app-eselect/eselect-php/eselect-php-9999.ebuild b/app-eselect/eselect-php/eselect-php-9999.ebuild |
| 40 |
index a8aa5bb8f4a..58c55ea1947 100644 |
| 41 |
--- a/app-eselect/eselect-php/eselect-php-9999.ebuild |
| 42 |
+++ b/app-eselect/eselect-php/eselect-php-9999.ebuild |
| 43 |
@@ -16,8 +16,7 @@ IUSE="fpm apache2" |
| 44 |
|
| 45 |
# The "DirectoryIndex" line in 70_mod_php.conf requires mod_dir. |
| 46 |
RDEPEND="app-admin/eselect |
| 47 |
- apache2? ( www-servers/apache[apache2_modules_dir] ) |
| 48 |
- fpm? ( sys-apps/gentoo-functions )" |
| 49 |
+ apache2? ( www-servers/apache[apache2_modules_dir] )" |
| 50 |
|
| 51 |
src_prepare() { |
| 52 |
eapply_user |
Archives