1 |
commit: 0af594f7463019dea259d42d85d8b3c4c4d7bd70 |
2 |
Author: Hans de Graaff <graaff <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Apr 14 07:33:09 2018 +0000 |
4 |
Commit: Hans de Graaff <graaff <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Apr 27 07:08:13 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0af594f7 |
7 |
|
8 |
sys-libs/libselinux: drop explicit ruby22 dependencies |
9 |
|
10 |
Package-Manager: Portage-2.3.24, Repoman-2.3.6 |
11 |
|
12 |
sys-libs/libselinux/libselinux-2.6.ebuild | 7 +++---- |
13 |
sys-libs/libselinux/libselinux-2.7.ebuild | 7 +++---- |
14 |
sys-libs/libselinux/libselinux-2.8_rc1.ebuild | 3 +-- |
15 |
sys-libs/libselinux/libselinux-2.8_rc2.ebuild | 3 +-- |
16 |
sys-libs/libselinux/libselinux-9999.ebuild | 5 ++--- |
17 |
5 files changed, 10 insertions(+), 15 deletions(-) |
18 |
|
19 |
diff --git a/sys-libs/libselinux/libselinux-2.6.ebuild b/sys-libs/libselinux/libselinux-2.6.ebuild |
20 |
index c92bb50d395..e87f36e1844 100644 |
21 |
--- a/sys-libs/libselinux/libselinux-2.6.ebuild |
22 |
+++ b/sys-libs/libselinux/libselinux-2.6.ebuild |
23 |
@@ -1,9 +1,9 @@ |
24 |
-# Copyright 1999-2017 Gentoo Foundation |
25 |
+# Copyright 1999-2018 Gentoo Foundation |
26 |
# Distributed under the terms of the GNU General Public License v2 |
27 |
|
28 |
EAPI="6" |
29 |
PYTHON_COMPAT=( python2_7 python3_4 python3_5 python3_6 ) |
30 |
-USE_RUBY="ruby22 ruby23" |
31 |
+USE_RUBY="ruby23" |
32 |
|
33 |
# No, I am not calling ruby-ng |
34 |
inherit multilib python-r1 toolchain-funcs multilib-minimal |
35 |
@@ -27,7 +27,7 @@ fi |
36 |
|
37 |
LICENSE="public-domain" |
38 |
SLOT="0" |
39 |
-IUSE="pcre2 python ruby static-libs ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23" |
40 |
+IUSE="pcre2 python ruby static-libs ruby_targets_ruby23" |
41 |
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" |
42 |
|
43 |
RDEPEND=">=sys-libs/libsepol-${SEPOL_VER}:=[${MULTILIB_USEDEP}] |
44 |
@@ -35,7 +35,6 @@ RDEPEND=">=sys-libs/libsepol-${SEPOL_VER}:=[${MULTILIB_USEDEP}] |
45 |
pcre2? ( dev-libs/libpcre2:=[static-libs?,${MULTILIB_USEDEP}] ) |
46 |
python? ( ${PYTHON_DEPS} ) |
47 |
ruby? ( |
48 |
- ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) |
49 |
ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) |
50 |
)" |
51 |
DEPEND="${RDEPEND} |
52 |
|
53 |
diff --git a/sys-libs/libselinux/libselinux-2.7.ebuild b/sys-libs/libselinux/libselinux-2.7.ebuild |
54 |
index a8ed808fe47..569190768a0 100644 |
55 |
--- a/sys-libs/libselinux/libselinux-2.7.ebuild |
56 |
+++ b/sys-libs/libselinux/libselinux-2.7.ebuild |
57 |
@@ -1,9 +1,9 @@ |
58 |
-# Copyright 1999-2017 Gentoo Foundation |
59 |
+# Copyright 1999-2018 Gentoo Foundation |
60 |
# Distributed under the terms of the GNU General Public License v2 |
61 |
|
62 |
EAPI="6" |
63 |
PYTHON_COMPAT=( python2_7 python3_4 python3_5 python3_6 ) |
64 |
-USE_RUBY="ruby22 ruby23" |
65 |
+USE_RUBY="ruby23" |
66 |
|
67 |
# No, I am not calling ruby-ng |
68 |
inherit multilib python-r1 toolchain-funcs multilib-minimal |
69 |
@@ -27,7 +27,7 @@ fi |
70 |
|
71 |
LICENSE="public-domain" |
72 |
SLOT="0" |
73 |
-IUSE="pcre2 python ruby static-libs ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23" |
74 |
+IUSE="pcre2 python ruby static-libs ruby_targets_ruby23" |
75 |
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" |
76 |
|
77 |
RDEPEND=">=sys-libs/libsepol-${SEPOL_VER}:=[${MULTILIB_USEDEP}] |
78 |
@@ -35,7 +35,6 @@ RDEPEND=">=sys-libs/libsepol-${SEPOL_VER}:=[${MULTILIB_USEDEP}] |
79 |
pcre2? ( dev-libs/libpcre2:=[static-libs?,${MULTILIB_USEDEP}] ) |
80 |
python? ( ${PYTHON_DEPS} ) |
81 |
ruby? ( |
82 |
- ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) |
83 |
ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) |
84 |
)" |
85 |
DEPEND="${RDEPEND} |
86 |
|
87 |
diff --git a/sys-libs/libselinux/libselinux-2.8_rc1.ebuild b/sys-libs/libselinux/libselinux-2.8_rc1.ebuild |
88 |
index 7fb1b8e7e48..b4d9bf18912 100644 |
89 |
--- a/sys-libs/libselinux/libselinux-2.8_rc1.ebuild |
90 |
+++ b/sys-libs/libselinux/libselinux-2.8_rc1.ebuild |
91 |
@@ -3,7 +3,7 @@ |
92 |
|
93 |
EAPI="6" |
94 |
PYTHON_COMPAT=( python2_7 python3_4 python3_5 python3_6 ) |
95 |
-USE_RUBY="ruby22 ruby23" |
96 |
+USE_RUBY="ruby23" |
97 |
|
98 |
# No, I am not calling ruby-ng |
99 |
inherit multilib python-r1 toolchain-funcs multilib-minimal |
100 |
@@ -35,7 +35,6 @@ RDEPEND=">=sys-libs/libsepol-${SEPOL_VER}:=[${MULTILIB_USEDEP}] |
101 |
pcre2? ( dev-libs/libpcre2:=[static-libs?,${MULTILIB_USEDEP}] ) |
102 |
python? ( ${PYTHON_DEPS} ) |
103 |
ruby? ( |
104 |
- ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) |
105 |
ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) |
106 |
)" |
107 |
DEPEND="${RDEPEND} |
108 |
|
109 |
diff --git a/sys-libs/libselinux/libselinux-2.8_rc2.ebuild b/sys-libs/libselinux/libselinux-2.8_rc2.ebuild |
110 |
index 6c156d54a16..7388fc1ec31 100644 |
111 |
--- a/sys-libs/libselinux/libselinux-2.8_rc2.ebuild |
112 |
+++ b/sys-libs/libselinux/libselinux-2.8_rc2.ebuild |
113 |
@@ -3,7 +3,7 @@ |
114 |
|
115 |
EAPI="6" |
116 |
PYTHON_COMPAT=( python2_7 python3_4 python3_5 python3_6 ) |
117 |
-USE_RUBY="ruby22 ruby23" |
118 |
+USE_RUBY="ruby23" |
119 |
|
120 |
# No, I am not calling ruby-ng |
121 |
inherit multilib python-r1 toolchain-funcs multilib-minimal |
122 |
@@ -35,7 +35,6 @@ RDEPEND=">=sys-libs/libsepol-${SEPOL_VER}:=[${MULTILIB_USEDEP}] |
123 |
pcre2? ( dev-libs/libpcre2:=[static-libs?,${MULTILIB_USEDEP}] ) |
124 |
python? ( ${PYTHON_DEPS} ) |
125 |
ruby? ( |
126 |
- ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) |
127 |
ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) |
128 |
)" |
129 |
DEPEND="${RDEPEND} |
130 |
|
131 |
diff --git a/sys-libs/libselinux/libselinux-9999.ebuild b/sys-libs/libselinux/libselinux-9999.ebuild |
132 |
index 6c156d54a16..77ada71bdc5 100644 |
133 |
--- a/sys-libs/libselinux/libselinux-9999.ebuild |
134 |
+++ b/sys-libs/libselinux/libselinux-9999.ebuild |
135 |
@@ -3,7 +3,7 @@ |
136 |
|
137 |
EAPI="6" |
138 |
PYTHON_COMPAT=( python2_7 python3_4 python3_5 python3_6 ) |
139 |
-USE_RUBY="ruby22 ruby23" |
140 |
+USE_RUBY="ruby23" |
141 |
|
142 |
# No, I am not calling ruby-ng |
143 |
inherit multilib python-r1 toolchain-funcs multilib-minimal |
144 |
@@ -27,7 +27,7 @@ fi |
145 |
|
146 |
LICENSE="public-domain" |
147 |
SLOT="0" |
148 |
-IUSE="pcre2 python ruby static-libs ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23" |
149 |
+IUSE="pcre2 python ruby static-libs ruby_targets_ruby23" |
150 |
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" |
151 |
|
152 |
RDEPEND=">=sys-libs/libsepol-${SEPOL_VER}:=[${MULTILIB_USEDEP}] |
153 |
@@ -35,7 +35,6 @@ RDEPEND=">=sys-libs/libsepol-${SEPOL_VER}:=[${MULTILIB_USEDEP}] |
154 |
pcre2? ( dev-libs/libpcre2:=[static-libs?,${MULTILIB_USEDEP}] ) |
155 |
python? ( ${PYTHON_DEPS} ) |
156 |
ruby? ( |
157 |
- ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) |
158 |
ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) |
159 |
)" |
160 |
DEPEND="${RDEPEND} |