dev-lang/php: Remove 70_mod_php5.conf

Package-Manager: portage-2.2.26

4 files changed, 3 insertions, 25 deletions

diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index ffa2678c..4799b8dd 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -3,14 +3,13 @@ AUX 5.2.17/bug-60986-replace-deprecated-pcre_info.diff 1983 SHA256 c4ca67e8abb58
 AUX 5.2.17/bug-60986-safer-pcre_fullinfo.diff 1239 SHA256 08f3bf9d79ed4ca9ab5f60062be1d83c9b6d441e99c59332956d465dcae6aed1 WHIRLPOOL 0b11784441c73066fe940aa901e608063339b4c36cf024599f97676702ea9feb2e0075f449711aac10b99fe01f3325db5838778851c3a45438cd49a91eefabc3
 AUX 5.2.17/freetype-include-path.diff 447 SHA256 4286f4695f5eabd35a6d5056546d9587e197d5ed156f44c4683133507bfbae06 WHIRLPOOL 14ef40a745228d7bc898a3c1cedb45d3170ece070028ec8fc6c0469107224092f018b5e38ff9b0200a403380beb43a3fb059c02cabc5dc7d32f16feae1abae4f
 AUX 5.2.17/libxml-2.9.patch 2251 SHA256 d1a54b5a0a52fb25fc6f37e6c11cf18828ac971855fcf6be5925d6276739acbf WHIRLPOOL 33ad90367c76f91fe61d407ae638112a1c671325331e85428c2d0325a4b8c3c18a0dd8b76cbed30b64448e80ea968489bfa7b1e79e7e46b22cb5f72ed4f5fc5a
-AUX 70_mod_php5.conf-apache2 348 SHA256 5bb8a45570582b4389a7d3feea0398e1c13ed4ced96e559b9406ed8c965dea8c WHIRLPOOL fd503ec904a3853b90f8f4cc2042cf9014fdb1383a508d22e680559009b5b1e0beb5a09909a393e53868a64712c63e35642915787fa4176af07cb594adedb441
 AUX eblits/common-v2.eblit 379 SHA256 8c15442b04b0216342ef6f2b8565cb3510f6850fe67745d5697861e2f7759194 WHIRLPOOL 1a4cd516d27034a99a4f4aff4334961556faa2c3f014070403faf27999060db4faae1fa7160ca94ab0465f9fc85b4b5eb9e2eb5e1880343e30daa0d3ff28fdae
 AUX eblits/src_compile-v1.eblit 1283 SHA256 5ec76ae24304c5f803a615a98394c219018da1b1ce2018f92f6ac8c5becf6c99 WHIRLPOOL 2971e61a6932a7c2c19bb40b26f67d529560d08116c37d7b645dc008710d7cc8cd75dcc8feca95eeb556687910968dbe90b20554ad0ca97a624cd7f9c9221482
 AUX eblits/src_configure-v521.eblit 10700 SHA256 2336e380b3bfd7d31c85c3e81029c71eed7ff28953dbe910aeaad24a8a11004c WHIRLPOOL 70b9bd3f58d2a4fc9a7bbbe5574381f4065d25cd9b835e3b83356f5723715b6ba19b9a5c96cd538c4caa6a7a98d226207797e3b89f7936ea1043f234b746ac18
-AUX eblits/src_install-v2.eblit 5237 SHA256 860bf8ada8a4900d6a4bdd29bab3e65aff29ba8ddbbba4bec50d9d29c6990ca4 WHIRLPOOL 100fe0d603ae2105ad5897390c774d93b015f81651369d94ea187aa7e2d37dbbe0a64094dd66e7aad2de0ff7f869c1481c688bde9a8156bb659141ae1681f073
+AUX eblits/src_install-v2.eblit 5063 SHA256 4e0e68d41c40cec4149b0df6110823dc8bc0d6e2843d328242e5ed85d02f974d WHIRLPOOL 0b0a78607f9225210198b5cc8697cb78776ff22e389c9299ac0057dd706ff91c505dee9fd08a093aa6bc77d1325e853a0510d9a2e0d0ad9adc7237ca69ed1079
 AUX eblits/src_prepare-v2.eblit 2569 SHA256 0645b886cc7f5ac0446da7732f347f39b5102982ae21722ef084ebbbda9f0bba WHIRLPOOL e4851940e62f6a01b76c5a1a0c8a6699e5098d471a039dc6825d537674f1cfcad5f39cda10e487fb0b0d9b1e8e1695347518252f2d22907b4892a06cedb5fefc
 DIST php-5.2.17.tar.bz2 9092312 SHA256 e81beb13ec242ab700e56f366e9da52fd6cf18961d155b23304ca870e53f116c WHIRLPOOL 94657976927ff8d45dc17c2db59ac86a4320d6d7b2b6d5b43c4862060495a4011ad9b73d9b57ea4eb46a38418683ac2ff16e93fa10bd4ad5842c50accbac3536
 DIST php-patchset-5.2.17-r0.tar.bz2 8369 SHA256 fb159a02faf5120dd9bc620bd3f3094735f181aa6893273bb7dd29771b8b23b2 WHIRLPOOL 77aada53720272656d82d1e9fdade8e25fa6d7e409de546e9c3ac0d274308734a1d254665de97c54a8c14da79e49acdfb2bfb960fbd97bc24bc9db0bd8a348ac
 DIST suhosin-patch-5.2.16-0.9.7.patch.gz 23069 SHA256 aae115a318d80b3f32cedf876e7a8e4b932febb1b0c743c0b398003ebe122f91 WHIRLPOOL b3282acb99b48ad9edb89b45f12bf60b40bc9fd8d9bcf42a5402b8331e8d2e4a8fa52bd423c7a5fae2b7c1c93f0245d13019e6c85e1379d1749abb6d7f1a0a0c
-EBUILD php-5.2.17.ebuild 11112 SHA256 5b4ac25673c16ab5b057dfaaf141505f05fd9322255da22c8bb9d008ea7ca574 WHIRLPOOL 5ff4db1415d9de8243b3718ec6eb6ca0b488fe192c80f4429d437a827f0134d2ff157da932a172ce01c72d016d7b334682371f6058b037784517acc97686bc2d
+EBUILD php-5.2.17.ebuild 11078 SHA256 84ff5c3bafd485bafe59f7106c3f938d5e439a527c906c14638b2f2d1f197d92 WHIRLPOOL 5b9f71c20c4df9713ea829d92f83348976a65f575b83ade8f1129e6cd6cceb5249e3df43453fc4b79c2220905ca943bc7ea7231f36ff5230e1653cecf1560d3b
 MISC metadata.xml 2540 SHA256 2138b1cd3b18eabbaf2201cacddc46e1f8fb333645c1df3798680e18663b22ca WHIRLPOOL e017ed8d9400d3db5d374c6c3bcd174db8827984f4a582603620735f67b277ed7709c4fefca60280e38c5623d2fe6129d784f2b4065c7563c78830cda9f2941c
diff --git a/dev-lang/php/files/70_mod_php5.conf-apache2 b/dev-lang/php/files/70_mod_php5.conf-apache2
deleted file mode 100644
index 7ec8739c..00000000
--- a/dev-lang/php/files/70_mod_php5.conf-apache2
+++ /dev/null
@@ -1,14 +0,0 @@
-<IfDefine PHP5>
-	# Load the module first
-	<IfModule !mod_php5.c>
-		LoadModule php5_module    modules/libphp5.so
-	</IfModule>
-
-	# Set it to handle the files
-	<IfModule mod_mime.c>
-		AddHandler application/x-httpd-php .php .php5 .phtml
-		AddHandler application/x-httpd-php-source .phps
-	</IfModule>
-
-	DirectoryIndex index.php index.phtml
-</IfDefine>
diff --git a/dev-lang/php/files/eblits/src_install-v2.eblit b/dev-lang/php/files/eblits/src_install-v2.eblit
index b0dd1aea..a6054785 100644
--- a/dev-lang/php/files/eblits/src_install-v2.eblit
+++ b/dev-lang/php/files/eblits/src_install-v2.eblit
@@ -130,12 +130,6 @@ php_install_ini() {
 	fi
 
 	# SAPI-specific handling
-	if [[ "${sapi}" == "apache2" ]] ; then
-			insinto "${APACHE_MODULES_CONFDIR}"
-			newins "${FILESDIR}/70_mod_php${PHP_MV}.conf-apache2" \
-				"70_mod_php${PHP_MV}.conf"
-	fi
-
 	if [[ "${sapi}" == "fpm" ]] ; then
         [[ -z ${PHP_FPM_INIT_VER} ]] && PHP_FPM_INIT_VER=3
         [[ -z ${PHP_FPM_CONF_VER} ]] && PHP_FPM_CONF_VER=0
diff --git a/dev-lang/php/php-5.2.17.ebuild b/dev-lang/php/php-5.2.17.ebuild
index 8d5d3471..0c718a8c 100644
--- a/dev-lang/php/php-5.2.17.ebuild
+++ b/dev-lang/php/php-5.2.17.ebuild
@@ -332,8 +332,7 @@ src_test() { eblit-run src_test v1 ; }
 pkg_postinst() {
 	# Output some general info to the user
 	if use apache2 ; then
-		APACHE2_MOD_DEFINE="PHP5"
-		APACHE2_MOD_CONF="70_mod_php5"
+		APACHE2_MOD_DEFINE="PHP"
 		apache-module_pkg_postinst
 	fi