Gentoo Archives: gentoo-dev

From: Naohiro Aota <naota@g.o>
To: gentoo-dev@l.g.o
Cc: ruby@g.o, Naohiro Aota <naota@g.o>
Subject: [gentoo-dev] [PATCH v2 02/10] ruby-ng-gnome2.eclass: drop support for <EAPI=6
Date: Mon, 04 May 2020 02:25:20
Message-Id: 20200504022243.2439148-2-naota@gentoo.org
In Reply to: [gentoo-dev] [PATCH v2 01/10] ruby-ng-gnome2.eclass: drop support for 0.19.x by Naohiro Aota
1 All users of ruby-ng-gnome2 in the official tree are on EAPI=6, so we
2 can drop old EAPI support to reduce "if" branches and make the feature
3 updates simple.
4
5 Signed-off-by: Naohiro Aota <naota@g.o>
6 ---
7 eclass/ruby-ng-gnome2.eclass | 15 ++++-----------
8 1 file changed, 4 insertions(+), 11 deletions(-)
9
10 diff --git a/eclass/ruby-ng-gnome2.eclass b/eclass/ruby-ng-gnome2.eclass
11 index a6e6fb089c8c..67a5d58fba58 100644
12 --- a/eclass/ruby-ng-gnome2.eclass
13 +++ b/eclass/ruby-ng-gnome2.eclass
14 @@ -6,14 +6,14 @@
15 # Ruby herd <ruby@g.o>
16 # @AUTHOR:
17 # Author: Hans de Graaff <graaff@g.o>
18 -# @SUPPORTED_EAPIS: 0 1 2 3 4 5 6
19 +# @SUPPORTED_EAPIS: 6 7
20 # @BLURB: An eclass to simplify handling of various ruby-gnome2 parts.
21 # @DESCRIPTION:
22 # This eclass simplifies installation of the various pieces of
23 # ruby-gnome2 since they share a very common installation procedure.
24
25 case "${EAPI:-0}" in
26 - 0|1|2|3|4|5|6)
27 + 6|7)
28 ;;
29 *)
30 die "Unsupported EAPI=${EAPI} (unknown) for ${ECLASS}"
31 @@ -24,22 +24,15 @@ RUBY_FAKEGEM_NAME="${RUBY_FAKEGEM_NAME:-${PN#ruby-}}"
32 RUBY_FAKEGEM_TASK_TEST=""
33 RUBY_FAKEGEM_TASK_DOC=""
34
35 -inherit ruby-fakegem multilib
36 +inherit ruby-fakegem
37
38 IUSE=""
39
40 -# Define EPREFIX if needed
41 -has "${EAPI:-0}" 0 1 2 && ! use prefix && EPREFIX=
42 -
43 subbinding=${PN#ruby-}
44 subbinding=${subbinding/-/_}
45 DEPEND="virtual/pkgconfig"
46 ruby_add_bdepend "dev-ruby/pkg-config"
47 -if has "${EAPI:-0}" 0 1 2 3 ; then
48 - S=${WORKDIR}/ruby-gnome2-all-${PV}/${subbinding}
49 -else
50 - RUBY_S=ruby-gnome2-all-${PV}/${subbinding}
51 -fi
52 +RUBY_S=ruby-gnome2-all-${PV}/${subbinding}
53 SRC_URI="mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-${PV}.tar.gz"
54 HOMEPAGE="https://ruby-gnome2.osdn.jp/"
55 LICENSE="Ruby"
56 --
57 2.26.2