Gentoo Archives: gentoo-dev

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

Replies