Gentoo Archives: gentoo-commits

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