From: Michael Orlitzky <mjo@gentoo.org>
Date: Thu, 7 Jan 2016 14:40:04 +0000 (-0500)
Subject: dev-lang/php: update the apache2 post-install notification about mod_php.
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=0b734057b64204e5c1dc340ec0d33fb94279d857;p=gentoo.git

dev-lang/php: update the apache2 post-install notification about mod_php.

Newer versions of app-eselect/eselect-php require some apache
configuration changes. This configuration is mentioned in the
dev-lang/php pkg_postinst() phase, which isn't ideal, but is what it
is. Since php:7.0 requires the new eselect-php, the pkg_postinst() for
php:7.0 has been updated to reflect the configuration changes.

Thanks to Tomáš Mózes for pointing this out.

Gentoo-Bug: 552156

Package-Manager: portage-2.2.24
---

diff --git a/dev-lang/php/php-7.0.1.ebuild b/dev-lang/php/php-7.0.1.ebuild
index a085f970dcfd..76a0c13448f7 100644
--- a/dev-lang/php/php-7.0.1.ebuild
+++ b/dev-lang/php/php-7.0.1.ebuild
@@ -729,8 +729,8 @@ src_test() {
 pkg_postinst() {
 	# Output some general info to the user
 	if use apache2 ; then
-		APACHE2_MOD_DEFINE="PHP5"
-		APACHE2_MOD_CONF="70_mod_php5"  # Provided by app-eselect/eselect-php
+		APACHE2_MOD_DEFINE="PHP"
+		APACHE2_MOD_CONF="70_mod_php"  # Provided by app-eselect/eselect-php
 		apache-module_pkg_postinst
 	fi