| 1 |
commit: ca013d6f36e73368a2a09aea33656bd166b5253f |
| 2 |
Author: Brian Evans <grknight <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Jul 26 14:27:22 2017 +0000 |
| 4 |
Commit: Brian Evans <grknight <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Jul 26 14:27:22 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca013d6f |
| 7 |
|
| 8 |
app-eselect/eselect-php: Update live ebuild to match changes in the repo |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.6, Repoman-2.3.3 |
| 11 |
|
| 12 |
app-eselect/eselect-php/eselect-php-9999.ebuild | 6 ++---- |
| 13 |
1 file changed, 2 insertions(+), 4 deletions(-) |
| 14 |
|
| 15 |
diff --git a/app-eselect/eselect-php/eselect-php-9999.ebuild b/app-eselect/eselect-php/eselect-php-9999.ebuild |
| 16 |
index bbb40ca5261..f32c4a68a2f 100644 |
| 17 |
--- a/app-eselect/eselect-php/eselect-php-9999.ebuild |
| 18 |
+++ b/app-eselect/eselect-php/eselect-php-9999.ebuild |
| 19 |
@@ -28,12 +28,12 @@ src_configure(){ |
| 20 |
# We expect localstatedir to be "var"ish, not "var/lib"ish, because |
| 21 |
# that's what PHP upstream expects. See for example the FPM |
| 22 |
# configuration where they put logs in @localstatedir@/log. |
| 23 |
- econf --localstatedir="${EPREFIX}"/var $(use_enable apache2) |
| 24 |
+ econf --localstatedir="${EPREFIX}"/var $(use_enable apache2) $(use_enable fpm) |
| 25 |
} |
| 26 |
|
| 27 |
src_install() { |
| 28 |
default |
| 29 |
- [[ -f "${D}/etc/init.d/php-fpm.example.init" ]] && rm "${D}/etc/init.d/php-fpm.example.init" || die |
| 30 |
+ |
| 31 |
# This can be removed after a while... |
| 32 |
if use apache2 ; then |
| 33 |
insinto /etc/apache2/modules.d |
| 34 |
@@ -41,8 +41,6 @@ src_install() { |
| 35 |
fi |
| 36 |
|
| 37 |
if use fpm ; then |
| 38 |
- newinitd "doc/php-fpm.example.init" "php-fpm" |
| 39 |
- newconfd "doc/php-fpm.example.conf" "php-fpm" |
| 40 |
systemd_dotmpfilesd "${FILESDIR}/php-fpm.conf" |
| 41 |
exeinto /usr/libexec |
| 42 |
newexe "${FILESDIR}/php-fpm-launcher-r1" php-fpm-launcher |
Archives