| 1 |
commit: 51e1d975d2e43d0e103f6f362e13beb26b79045c |
| 2 |
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Feb 20 04:36:29 2019 +0000 |
| 4 |
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Feb 21 04:57:31 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=51e1d975 |
| 7 |
|
| 8 |
xorg-2.eclass: Drop support for EAPI 3 |
| 9 |
|
| 10 |
No ebuilds inheriting xorg-2 are EAPI=3. |
| 11 |
|
| 12 |
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> |
| 13 |
|
| 14 |
eclass/xorg-2.eclass | 8 ++++---- |
| 15 |
1 file changed, 4 insertions(+), 4 deletions(-) |
| 16 |
|
| 17 |
diff --git a/eclass/xorg-2.eclass b/eclass/xorg-2.eclass |
| 18 |
index 4ed65e676a0..7133aa365f1 100644 |
| 19 |
--- a/eclass/xorg-2.eclass |
| 20 |
+++ b/eclass/xorg-2.eclass |
| 21 |
@@ -7,7 +7,7 @@ |
| 22 |
# @AUTHOR: |
| 23 |
# Author: Tomáš Chvátal <scarabeus@g.o> |
| 24 |
# Author: Donnie Berkholz <dberkholz@g.o> |
| 25 |
-# @SUPPORTED_EAPIS: 3 4 5 |
| 26 |
+# @SUPPORTED_EAPIS: 4 5 |
| 27 |
# @BLURB: Reduces code duplication in the modularized X11 ebuilds. |
| 28 |
# @DESCRIPTION: |
| 29 |
# This eclass makes trivial X ebuilds possible for apps, fonts, drivers, |
| 30 |
@@ -53,7 +53,7 @@ fi |
| 31 |
|
| 32 |
EXPORTED_FUNCTIONS="src_unpack src_compile src_install pkg_postinst pkg_postrm" |
| 33 |
case "${EAPI:-0}" in |
| 34 |
- 3|4|5) EXPORTED_FUNCTIONS="${EXPORTED_FUNCTIONS} src_prepare src_configure" ;; |
| 35 |
+ 4|5) EXPORTED_FUNCTIONS="${EXPORTED_FUNCTIONS} src_prepare src_configure" ;; |
| 36 |
*) die "EAPI=${EAPI} is not supported" ;; |
| 37 |
esac |
| 38 |
|
| 39 |
@@ -271,7 +271,7 @@ fi |
| 40 |
|
| 41 |
if [[ ${XORG_MODULE_REBUILD} == yes ]]; then |
| 42 |
case ${EAPI} in |
| 43 |
- 3|4) |
| 44 |
+ 4) |
| 45 |
;; |
| 46 |
*) |
| 47 |
RDEPEND+=" x11-base/xorg-server:=" |
| 48 |
@@ -530,7 +530,7 @@ xorg-2_pkg_postrm() { |
| 49 |
|
| 50 |
if [[ -n ${FONT} ]]; then |
| 51 |
# if we're doing an upgrade, postinst will do |
| 52 |
- if [[ ${EAPI} -lt 4 || -z ${REPLACED_BY_VERSION} ]]; then |
| 53 |
+ if [[ -z ${REPLACED_BY_VERSION} ]]; then |
| 54 |
create_fonts_scale |
| 55 |
create_fonts_dir |
| 56 |
font_pkg_postrm "$@" |
Archives