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

[Michael Orlitzky]

commit:     5c56663ce61eba748ab0f6dce1588593d531fe5b
Author:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 12 22:28:28 2020 +0000
Commit:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Wed Feb 12 22:30:10 2020 +0000
URL:        https://gitweb.gentoo.org/proj/eselect-php.git/commit/?id=5c56663c

src/php.eselect.in.in: remove old pre-php-7.x compatibility code.

The comments told me to remove this code after a while. I trust myself.

Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org>

 src/php.eselect.in.in | 34 ----------------------------------
 1 file changed, 34 deletions(-)

diff --git a/src/php.eselect.in.in b/src/php.eselect.in.in
index 889f541..290d2ff 100644
--- a/src/php.eselect.in.in
+++ b/src/php.eselect.in.in
@@ -467,7 +467,6 @@ set_sapi() {
        # place here, in set_sapi(), since otherwise it can get skipped by
        # e.g. the update_sapi() function.
        if [[ "${sapi}" == "apache2" ]]; then
-               apache2_php5_config_check
                write_mod_php_conf "${target_name}"
                echo "Please restart apache for the changes to take effect."
        elif [[ "${sapi}" == "fpm" ]]; then
@@ -476,28 +475,6 @@ set_sapi() {
 }
 
 
-# Check to see if the user is still using the old-style apache
-# configuration with -DPHP5 and 70_mod_php5.conf. If he is, warn him
-# that it is outdated, and that his eselect choices will not have any
-# effect until the configuration is updated.
-#
-# This can be removed after around a year.
-#
-apache2_php5_config_check() {
-       if [ -f "${EROOT}/etc/apache2/modules.d/70_mod_php5.conf" ] ; then
-               local msg
-               write_warning_msg "The apache2 configuration has changed in 
this"
-               write_warning_msg "version of eselect-php. You should define 
\"-D PHP\""
-               write_warning_msg "and not \"-D PHP5\" for apache. The module 
is now"
-               write_warning_msg "loaded by 70_mod_php.conf (was 
70_mod_php5.conf)."
-               write_warning_msg "After you have changed \"-D PHP5\" to \"-D 
PHP\", "
-               write_warning_msg "you should remove 70_mod_php5.conf to 
eliminate"
-               write_warning_msg "this warning. Until you have done so, your 
eselect"
-               write_warning_msg "choices for apache2 will have no effect."
-               echo
-       fi
-}
-
 ## set action
 
 describe_set() {
@@ -608,17 +585,6 @@ do_cleanup() {
        for sapi in $MODULES ; do
                cleanup_sapi "${sapi}"
        done
-
-       # Remove older (and dead) apache2 symlinks. These days the symlink
-       # is called mod_php.so. This cleanup code can be removed after a
-       # while, after we think most people will have switched to the new
-       # symlink and removed the old one.
-       for link in "@LIBDIR@"/apache2/modules/libphp[57].so; do
-               if [[ -L "${link}" && ! -e "${link}" ]] ; then
-                       rm -f "${link}" || die "failed to remove old libphp.so 
symlink"
-                       echo "Removed broken symlink ${link}."
-               fi
-       done
 }
 
 ## list-modules action