commit: 9d600d583e4f5536750484b2f8a8d8cf7a734390
Author: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 9 10:59:03 2021 +0000
Commit: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
CommitDate: Fri Jul 9 11:00:54 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d600d58
gnustep-*.eclass: support EAPI 8
Drop old comments on EAPI 0/2
Signed-off-by: Bernard Cafarelli <voyageur <AT> gentoo.org>
eclass/gnustep-2.eclass | 9 ++++-----
eclass/gnustep-base.eclass | 11 ++---------
2 files changed, 6 insertions(+), 14 deletions(-)
diff --git a/eclass/gnustep-2.eclass b/eclass/gnustep-2.eclass
index fc3d2d0fe3b..2d615db3a1f 100644
--- a/eclass/gnustep-2.eclass
+++ b/eclass/gnustep-2.eclass
@@ -4,14 +4,14 @@
# @ECLASS: gnustep-2.eclass
# @MAINTAINER:
# GNUstep Herd <gnus...@gentoo.org>
-# @SUPPORTED_EAPIS: 5 6 7
+# @SUPPORTED_EAPIS: 5 6 7 8
# @BLURB: eclass for GNUstep Apps, Frameworks, and Bundles build
# @DESCRIPTION:
# This eclass sets up GNUstep environment to properly install
# GNUstep packages
case ${EAPI:-0} in
- [567]) ;;
+ [5678]) ;;
*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
esac
@@ -34,9 +34,8 @@ RDEPEND="${DEPEND}"
# The following gnustep-based EXPORT_FUNCTIONS are available:
# * gnustep-base_pkg_setup
-# * gnustep-base_src_unpack (EAPI 0|1 only)
-# * gnustep-base_src_prepare (EAPI>=2 only)
-# * gnustep-base_src_configure (EAPI>=2 only)
+# * gnustep-base_src_prepare
+# * gnustep-base_src_configure
# * gnustep-base_src_compile
# * gnustep-base_src_install
# * gnustep-base_pkg_postinst
diff --git a/eclass/gnustep-base.eclass b/eclass/gnustep-base.eclass
index 2f836eb2830..fb4a48b734c 100644
--- a/eclass/gnustep-base.eclass
+++ b/eclass/gnustep-base.eclass
@@ -4,14 +4,14 @@
# @ECLASS: gnustep-base.eclass
# @MAINTAINER:
# GNUstep Herd <gnus...@gentoo.org>
-# @SUPPORTED_EAPIS: 5 6 7
+# @SUPPORTED_EAPIS: 5 6 7 8
# @BLURB: Internal handling of GNUstep pacakges
# @DESCRIPTION:
# Inner gnustep eclass, should only be inherited directly by gnustep-base
# packages
case ${EAPI:-0} in
- [567]) inherit eutils ;;
+ [5678]) inherit eutils ;;
*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
esac
@@ -50,13 +50,6 @@ gnustep-base_pkg_setup() {
filter-flags -fomit-frame-pointer
}
-gnustep-base_src_unpack() {
- unpack ${A}
- cd "${S}"
-
- gnustep-base_src_prepare
-}
-
gnustep-base_src_prepare() {
if [[ -f ./GNUmakefile ]] ; then
# Kill stupid includes that are simply overdone or useless on
normal
