[gentoo-commits] proj/eselect-php:master commit in: src/

[Michael Orlitzky]

commit:     0a14910c4b819a4200e37ab0ffbc7dc126451be6
Author:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 10 22:15:08 2015 +0000
Commit:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Thu Dec 10 22:15:08 2015 +0000
URL:        https://gitweb.gentoo.org/proj/eselect-php.git/commit/?id=0a14910c

Rename our active DSO symlink to mod_php.so.

Our DSO symlink used to be called libphp5.so or libphp7.so. This was
very recently changed to an unversioned libphp.so, but at that point,
we might as well just call it mod_php.so for consistency. Note that
our 70_mod_php5.conf currently points directly to the libphp file and
doesn't use the symlink, no matter its name. That will need to be
changed.

An unused cleanup() function was removed in the process, because the
function that is actually used was updated to remove the obsolete
libphp* symlinks.

 src/php.eselect.in | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/php.eselect.in b/src/php.eselect.in
index d882095..e77b86a 100644
--- a/src/php.eselect.in
+++ b/src/php.eselect.in
@@ -34,6 +34,12 @@ cleanup_sapi() {
 			return
 		fi
 	fi
+
+	if [[ "${1}" == "apache2" ]]; then
+		rm -f "${EROOT}$(get_active_libdir)/apache2/modules/libphp[57].so" \
+		   || die "failed to remove old libphp.so symlink"
+	fi
+
 	return 1
 }
 
@@ -65,12 +71,6 @@ get_active_libdir() {
 	echo /usr/lib
 }
 
-cleanup() {
-	local target=$(find_targets_$1 | tail -n 1)
-	[[ -z $target ]] &&
-	set_$1 $target
-}
-
 find_targets() {
 	local dir dirs libdir
 	for libdir in $(get_libdirs); do
@@ -170,11 +170,11 @@ get_active_fpm() {
 #
 # OUTPUT:
 #
-# The path to our libphp.so symlink, which should (but is not
+# The path to our mod_php.so symlink, which should (but is not
 # guaranteed to) point to a real apache DSO.
 #
 get_apache2_active_symlink_path() {
-	echo "${EROOT}$(get_active_libdir)/apache2/modules/libphp.so"
+	echo "${EROOT}$(get_active_libdir)/apache2/modules/mod_php.so"
 }
 
 # Find the active (selected) version of the apache2 module. Used to