Gentoo Archives: gentoo-commits

From: Jason Zaman <perfinion@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-libs/libselinux/
Date: Thu, 01 Sep 2016 16:39:06
Message-Id: 1472747925.0efb71f31d1a29170364988d7e9f1b777b3ee258.perfinion@gentoo
1 commit: 0efb71f31d1a29170364988d7e9f1b777b3ee258
2 Author: Jason Zaman <perfinion <AT> gentoo <DOT> org>
3 AuthorDate: Thu Sep 1 16:38:45 2016 +0000
4 Commit: Jason Zaman <perfinion <AT> gentoo <DOT> org>
5 CommitDate: Thu Sep 1 16:38:45 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0efb71f3
7
8 sys-libs/libselinux: Drop ruby20 bug 589422
9
10 Package-Manager: portage-2.2.28
11
12 sys-libs/libselinux/libselinux-2.5.ebuild | 7 +++----
13 sys-libs/libselinux/libselinux-9999.ebuild | 7 +++----
14 2 files changed, 6 insertions(+), 8 deletions(-)
15
16 diff --git a/sys-libs/libselinux/libselinux-2.5.ebuild b/sys-libs/libselinux/libselinux-2.5.ebuild
17 index 255361b..cd4b7c4 100644
18 --- a/sys-libs/libselinux/libselinux-2.5.ebuild
19 +++ b/sys-libs/libselinux/libselinux-2.5.ebuild
20 @@ -4,7 +4,7 @@
21
22 EAPI="5"
23 PYTHON_COMPAT=( python2_7 python3_3 python3_4 python3_5 )
24 -USE_RUBY="ruby20 ruby21 ruby22 ruby23"
25 +USE_RUBY="ruby21 ruby22 ruby23"
26
27 # No, I am not calling ruby-ng
28 inherit multilib python-r1 toolchain-funcs eutils multilib-minimal
29 @@ -20,13 +20,12 @@ LICENSE="public-domain"
30 SLOT="0"
31 KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
32
33 -IUSE="python ruby static-libs ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23"
34 +IUSE="python ruby static-libs ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23"
35
36 RDEPEND=">=sys-libs/libsepol-${SEPOL_VER}[${MULTILIB_USEDEP}]
37 - >=dev-libs/libpcre-8.33-r1[static-libs?,${MULTILIB_USEDEP}]
38 + >=dev-libs/libpcre-8.33-r1:=[static-libs?,${MULTILIB_USEDEP}]
39 python? ( ${PYTHON_DEPS} )
40 ruby? (
41 - ruby_targets_ruby20? ( dev-lang/ruby:2.0 )
42 ruby_targets_ruby21? ( dev-lang/ruby:2.1 )
43 ruby_targets_ruby22? ( dev-lang/ruby:2.2 )
44 ruby_targets_ruby23? ( dev-lang/ruby:2.3 )
45
46 diff --git a/sys-libs/libselinux/libselinux-9999.ebuild b/sys-libs/libselinux/libselinux-9999.ebuild
47 index 1ea4312..e686746 100644
48 --- a/sys-libs/libselinux/libselinux-9999.ebuild
49 +++ b/sys-libs/libselinux/libselinux-9999.ebuild
50 @@ -4,7 +4,7 @@
51
52 EAPI="6"
53 PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
54 -USE_RUBY="ruby20 ruby21 ruby22 ruby23"
55 +USE_RUBY="ruby21 ruby22 ruby23"
56
57 # No, I am not calling ruby-ng
58 inherit multilib python-r1 toolchain-funcs multilib-minimal
59 @@ -29,13 +29,12 @@ fi
60 LICENSE="public-domain"
61 SLOT="0"
62
63 -IUSE="python ruby static-libs ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23"
64 +IUSE="python ruby static-libs ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23"
65
66 RDEPEND=">=sys-libs/libsepol-${SEPOL_VER}[${MULTILIB_USEDEP}]
67 - >=dev-libs/libpcre-8.33-r1[static-libs?,${MULTILIB_USEDEP}]
68 + >=dev-libs/libpcre-8.33-r1:=[static-libs?,${MULTILIB_USEDEP}]
69 python? ( ${PYTHON_DEPS} )
70 ruby? (
71 - ruby_targets_ruby20? ( dev-lang/ruby:2.0 )
72 ruby_targets_ruby21? ( dev-lang/ruby:2.1 )
73 ruby_targets_ruby22? ( dev-lang/ruby:2.2 )
74 ruby_targets_ruby23? ( dev-lang/ruby:2.3 )