summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Seifert <soap@gentoo.org>2023-03-17 23:04:31 +0100
committerDavid Seifert <soap@gentoo.org>2023-03-17 23:04:31 +0100
commit2cba2db27919bc449ed2a7bf7ed3259c6b96e65f (patch)
treec89a0929ca3e7cc95c737085614214e89450c999 /eclass/xorg-3.eclass
parentxdg.eclass: remove EAPI 5 (diff)
downloadgentoo-2cba2db27919bc449ed2a7bf7ed3259c6b96e65f.tar.gz
gentoo-2cba2db27919bc449ed2a7bf7ed3259c6b96e65f.tar.bz2
gentoo-2cba2db27919bc449ed2a7bf7ed3259c6b96e65f.zip
eclass: standardize prologue/epilogue
Closes: https://github.com/gentoo/gentoo/pull/30061 Signed-off-by: David Seifert <soap@gentoo.org>
Diffstat (limited to 'eclass/xorg-3.eclass')
-rw-r--r--eclass/xorg-3.eclass28
1 files changed, 14 insertions, 14 deletions
diff --git a/eclass/xorg-3.eclass b/eclass/xorg-3.eclass
index a63655e10ece..a68341591edd 100644
--- a/eclass/xorg-3.eclass
+++ b/eclass/xorg-3.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# @ECLASS: xorg-3.eclass
@@ -22,6 +22,14 @@
# with the other X packages, you don't need to set SRC_URI. Pretty much
# everything else should be automatic.
+case ${EAPI} in
+ 7|8) ;;
+ *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
+esac
+
+if [[ -z ${_XORG_3_ECLASS} ]]; then
+_XORG_3_ECLASS=1
+
GIT_ECLASS=""
if [[ ${PV} == *9999* ]]; then
GIT_ECLASS="git-r3"
@@ -54,19 +62,7 @@ inherit autotools libtool multilib toolchain-funcs flag-o-matic \
${FONT_ECLASS} ${GIT_ECLASS}
unset FONT_ECLASS GIT_ECLASS
-if [[ ${XORG_MULTILIB} == yes ]]; then
- inherit multilib-minimal
-fi
-
-case "${EAPI:-0}" in
- [7-8]) ;;
- *) die "EAPI=${EAPI} is not supported" ;;
-esac
-
-# exports must be ALWAYS after inherit
-EXPORT_FUNCTIONS src_prepare src_configure src_unpack src_compile src_install pkg_postinst pkg_postrm
-
-IUSE=""
+[[ ${XORG_MULTILIB} == yes ]] && inherit multilib-minimal
# @ECLASS_VARIABLE: XORG_EAUTORECONF
# @PRE_INHERIT
@@ -546,3 +542,7 @@ create_fonts_dir() {
-- "${EROOT}/usr/share/fonts/${FONT_DIR}"
eend $?
}
+
+fi
+
+EXPORT_FUNCTIONS src_prepare src_configure src_unpack src_compile src_install pkg_postinst pkg_postrm