| 1 |
commit: 9d600d583e4f5536750484b2f8a8d8cf7a734390 |
| 2 |
Author: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Jul 9 10:59:03 2021 +0000 |
| 4 |
Commit: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Jul 9 11:00:54 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d600d58 |
| 7 |
|
| 8 |
gnustep-*.eclass: support EAPI 8 |
| 9 |
|
| 10 |
Drop old comments on EAPI 0/2 |
| 11 |
|
| 12 |
Signed-off-by: Bernard Cafarelli <voyageur <AT> gentoo.org> |
| 13 |
|
| 14 |
eclass/gnustep-2.eclass | 9 ++++----- |
| 15 |
eclass/gnustep-base.eclass | 11 ++--------- |
| 16 |
2 files changed, 6 insertions(+), 14 deletions(-) |
| 17 |
|
| 18 |
diff --git a/eclass/gnustep-2.eclass b/eclass/gnustep-2.eclass |
| 19 |
index fc3d2d0fe3b..2d615db3a1f 100644 |
| 20 |
--- a/eclass/gnustep-2.eclass |
| 21 |
+++ b/eclass/gnustep-2.eclass |
| 22 |
@@ -4,14 +4,14 @@ |
| 23 |
# @ECLASS: gnustep-2.eclass |
| 24 |
# @MAINTAINER: |
| 25 |
# GNUstep Herd <gnustep@g.o> |
| 26 |
-# @SUPPORTED_EAPIS: 5 6 7 |
| 27 |
+# @SUPPORTED_EAPIS: 5 6 7 8 |
| 28 |
# @BLURB: eclass for GNUstep Apps, Frameworks, and Bundles build |
| 29 |
# @DESCRIPTION: |
| 30 |
# This eclass sets up GNUstep environment to properly install |
| 31 |
# GNUstep packages |
| 32 |
|
| 33 |
case ${EAPI:-0} in |
| 34 |
- [567]) ;; |
| 35 |
+ [5678]) ;; |
| 36 |
*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; |
| 37 |
esac |
| 38 |
|
| 39 |
@@ -34,9 +34,8 @@ RDEPEND="${DEPEND}" |
| 40 |
|
| 41 |
# The following gnustep-based EXPORT_FUNCTIONS are available: |
| 42 |
# * gnustep-base_pkg_setup |
| 43 |
-# * gnustep-base_src_unpack (EAPI 0|1 only) |
| 44 |
-# * gnustep-base_src_prepare (EAPI>=2 only) |
| 45 |
-# * gnustep-base_src_configure (EAPI>=2 only) |
| 46 |
+# * gnustep-base_src_prepare |
| 47 |
+# * gnustep-base_src_configure |
| 48 |
# * gnustep-base_src_compile |
| 49 |
# * gnustep-base_src_install |
| 50 |
# * gnustep-base_pkg_postinst |
| 51 |
|
| 52 |
diff --git a/eclass/gnustep-base.eclass b/eclass/gnustep-base.eclass |
| 53 |
index 2f836eb2830..fb4a48b734c 100644 |
| 54 |
--- a/eclass/gnustep-base.eclass |
| 55 |
+++ b/eclass/gnustep-base.eclass |
| 56 |
@@ -4,14 +4,14 @@ |
| 57 |
# @ECLASS: gnustep-base.eclass |
| 58 |
# @MAINTAINER: |
| 59 |
# GNUstep Herd <gnustep@g.o> |
| 60 |
-# @SUPPORTED_EAPIS: 5 6 7 |
| 61 |
+# @SUPPORTED_EAPIS: 5 6 7 8 |
| 62 |
# @BLURB: Internal handling of GNUstep pacakges |
| 63 |
# @DESCRIPTION: |
| 64 |
# Inner gnustep eclass, should only be inherited directly by gnustep-base |
| 65 |
# packages |
| 66 |
|
| 67 |
case ${EAPI:-0} in |
| 68 |
- [567]) inherit eutils ;; |
| 69 |
+ [5678]) inherit eutils ;; |
| 70 |
*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; |
| 71 |
esac |
| 72 |
|
| 73 |
@@ -50,13 +50,6 @@ gnustep-base_pkg_setup() { |
| 74 |
filter-flags -fomit-frame-pointer |
| 75 |
} |
| 76 |
|
| 77 |
-gnustep-base_src_unpack() { |
| 78 |
- unpack ${A} |
| 79 |
- cd "${S}" |
| 80 |
- |
| 81 |
- gnustep-base_src_prepare |
| 82 |
-} |
| 83 |
- |
| 84 |
gnustep-base_src_prepare() { |
| 85 |
if [[ -f ./GNUmakefile ]] ; then |
| 86 |
# Kill stupid includes that are simply overdone or useless on normal |
Archives