commit: 51e1d975d2e43d0e103f6f362e13beb26b79045c Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> AuthorDate: Wed Feb 20 04:36:29 2019 +0000 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> CommitDate: Thu Feb 21 04:57:31 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=51e1d975
xorg-2.eclass: Drop support for EAPI 3 No ebuilds inheriting xorg-2 are EAPI=3. Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> eclass/xorg-2.eclass | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/eclass/xorg-2.eclass b/eclass/xorg-2.eclass index 4ed65e676a0..7133aa365f1 100644 --- a/eclass/xorg-2.eclass +++ b/eclass/xorg-2.eclass @@ -7,7 +7,7 @@ # @AUTHOR: # Author: Tomáš Chvátal <[email protected]> # Author: Donnie Berkholz <[email protected]> -# @SUPPORTED_EAPIS: 3 4 5 +# @SUPPORTED_EAPIS: 4 5 # @BLURB: Reduces code duplication in the modularized X11 ebuilds. # @DESCRIPTION: # This eclass makes trivial X ebuilds possible for apps, fonts, drivers, @@ -53,7 +53,7 @@ fi EXPORTED_FUNCTIONS="src_unpack src_compile src_install pkg_postinst pkg_postrm" case "${EAPI:-0}" in - 3|4|5) EXPORTED_FUNCTIONS="${EXPORTED_FUNCTIONS} src_prepare src_configure" ;; + 4|5) EXPORTED_FUNCTIONS="${EXPORTED_FUNCTIONS} src_prepare src_configure" ;; *) die "EAPI=${EAPI} is not supported" ;; esac @@ -271,7 +271,7 @@ fi if [[ ${XORG_MODULE_REBUILD} == yes ]]; then case ${EAPI} in - 3|4) + 4) ;; *) RDEPEND+=" x11-base/xorg-server:=" @@ -530,7 +530,7 @@ xorg-2_pkg_postrm() { if [[ -n ${FONT} ]]; then # if we're doing an upgrade, postinst will do - if [[ ${EAPI} -lt 4 || -z ${REPLACED_BY_VERSION} ]]; then + if [[ -z ${REPLACED_BY_VERSION} ]]; then create_fonts_scale create_fonts_dir font_pkg_postrm "$@"
