1 |
commit: b10b08bc98169e5462fcdb82ab41640e5715f202 |
2 |
Author: Michael Orlitzky <mjo <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Dec 11 13:20:14 2017 +0000 |
4 |
Commit: Michael Orlitzky <mjo <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Dec 11 13:22:45 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b10b08bc |
7 |
|
8 |
app-eselect/eselect-php: drop the "PHP5" backwards-compatibility shim. |
9 |
|
10 |
A backwards-compatibility shim was added on 2016-01-05, in commit |
11 |
1ae81f5, to prevent (unmodified) configurations from breaking when |
12 |
upgrading eselect-php. A "you should upgrade your configuration" |
13 |
warning was added three days later in commit 470b42d. I think two |
14 |
years is a long enough time to maintain the shim/warning, so this |
15 |
commit removes them from the live ebuild and latest revision. |
16 |
|
17 |
Package-Manager: Portage-2.3.13, Repoman-2.3.3 |
18 |
|
19 |
...0.9.4-r4.ebuild => eselect-php-0.9.4-r5.ebuild} | 22 ---------------------- |
20 |
app-eselect/eselect-php/eselect-php-9999.ebuild | 22 ---------------------- |
21 |
2 files changed, 44 deletions(-) |
22 |
|
23 |
diff --git a/app-eselect/eselect-php/eselect-php-0.9.4-r4.ebuild b/app-eselect/eselect-php/eselect-php-0.9.4-r5.ebuild |
24 |
similarity index 63% |
25 |
rename from app-eselect/eselect-php/eselect-php-0.9.4-r4.ebuild |
26 |
rename to app-eselect/eselect-php/eselect-php-0.9.4-r5.ebuild |
27 |
index 64684077116..c99ebdbb421 100644 |
28 |
--- a/app-eselect/eselect-php/eselect-php-0.9.4-r4.ebuild |
29 |
+++ b/app-eselect/eselect-php/eselect-php-0.9.4-r5.ebuild |
30 |
@@ -35,12 +35,6 @@ src_configure(){ |
31 |
src_install() { |
32 |
default |
33 |
|
34 |
- # This can be removed after a while... |
35 |
- if use apache2 ; then |
36 |
- insinto /etc/apache2/modules.d |
37 |
- newins "${FILESDIR}/70_mod_php5.backcompat.conf" 70_mod_php5.conf |
38 |
- fi |
39 |
- |
40 |
if use fpm ; then |
41 |
systemd_dotmpfilesd "${FILESDIR}/php-fpm.conf" |
42 |
sed -e "s,@libdir@,$(get_libdir),g" "${FILESDIR}/php-fpm-launcher-r3" > "${T}"/php-fpm-launcher || die |
43 |
@@ -48,19 +42,3 @@ src_install() { |
44 |
doexe "${T}"/php-fpm-launcher |
45 |
fi |
46 |
} |
47 |
- |
48 |
-pkg_postinst() { |
49 |
- if use apache2 ; then |
50 |
- elog |
51 |
- elog "If you are upgrading, be warned that our mod_php configuration" |
52 |
- elog "file has changed! You should now define -DPHP for the apache2" |
53 |
- elog "daemon, and inspect the new 70_mod_php.conf which has been" |
54 |
- elog "installed. Module loading involves eselect as of this version." |
55 |
- elog |
56 |
- elog "You must run eselect at least once to choose your apache2 target" |
57 |
- elog "before the new configuration will work. Afterwards, and after you" |
58 |
- elog "have reviewed your new configuration, you are advised to remove" |
59 |
- elog "the obsolete 70_mod_php5.conf file." |
60 |
- elog |
61 |
- fi |
62 |
-} |
63 |
|
64 |
diff --git a/app-eselect/eselect-php/eselect-php-9999.ebuild b/app-eselect/eselect-php/eselect-php-9999.ebuild |
65 |
index 58c55ea1947..e6b5ef3d880 100644 |
66 |
--- a/app-eselect/eselect-php/eselect-php-9999.ebuild |
67 |
+++ b/app-eselect/eselect-php/eselect-php-9999.ebuild |
68 |
@@ -40,12 +40,6 @@ src_configure(){ |
69 |
src_install() { |
70 |
default |
71 |
|
72 |
- # This can be removed after a while... |
73 |
- if use apache2 ; then |
74 |
- insinto /etc/apache2/modules.d |
75 |
- newins "${FILESDIR}/70_mod_php5.backcompat.conf" 70_mod_php5.conf |
76 |
- fi |
77 |
- |
78 |
if use fpm ; then |
79 |
systemd_dotmpfilesd "${FILESDIR}/php-fpm.conf" |
80 |
sed -e "s,@libdir@,$(get_libdir),g" "${FILESDIR}/php-fpm-launcher-r3" > "${T}"/php-fpm-launcher || die |
81 |
@@ -53,19 +47,3 @@ src_install() { |
82 |
doexe "${T}"/php-fpm-launcher |
83 |
fi |
84 |
} |
85 |
- |
86 |
-pkg_postinst() { |
87 |
- if use apache2 ; then |
88 |
- elog |
89 |
- elog "If you are upgrading, be warned that our mod_php configuration" |
90 |
- elog "file has changed! You should now define -DPHP for the apache2" |
91 |
- elog "daemon, and inspect the new 70_mod_php.conf which has been" |
92 |
- elog "installed. Module loading involves eselect as of this version." |
93 |
- elog |
94 |
- elog "You must run eselect at least once to choose your apache2 target" |
95 |
- elog "before the new configuration will work. Afterwards, and after you" |
96 |
- elog "have reviewed your new configuration, you are advised to remove" |
97 |
- elog "the obsolete 70_mod_php5.conf file." |
98 |
- elog |
99 |
- fi |
100 |
-} |