[gentoo-commits] repo/gentoo:master commit in: sys-libs/libselinux/

[Jason Zaman]

commit:     0efb71f31d1a29170364988d7e9f1b777b3ee258
Author:     Jason Zaman <perfinion <AT> gentoo <DOT> org>
AuthorDate: Thu Sep  1 16:38:45 2016 +0000
Commit:     Jason Zaman <perfinion <AT> gentoo <DOT> org>
CommitDate: Thu Sep  1 16:38:45 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0efb71f3

sys-libs/libselinux: Drop ruby20 bug 589422

Package-Manager: portage-2.2.28

 sys-libs/libselinux/libselinux-2.5.ebuild  | 7 +++----
 sys-libs/libselinux/libselinux-9999.ebuild | 7 +++----
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/sys-libs/libselinux/libselinux-2.5.ebuild 
b/sys-libs/libselinux/libselinux-2.5.ebuild
index 255361b..cd4b7c4 100644
--- a/sys-libs/libselinux/libselinux-2.5.ebuild
+++ b/sys-libs/libselinux/libselinux-2.5.ebuild
@@ -4,7 +4,7 @@
 
 EAPI="5"
 PYTHON_COMPAT=( python2_7 python3_3 python3_4 python3_5 )
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
+USE_RUBY="ruby21 ruby22 ruby23"
 
 # No, I am not calling ruby-ng
 inherit multilib python-r1 toolchain-funcs eutils multilib-minimal
@@ -20,13 +20,12 @@ LICENSE="public-domain"
 SLOT="0"
 KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 
-IUSE="python ruby static-libs ruby_targets_ruby20 ruby_targets_ruby21 
ruby_targets_ruby22 ruby_targets_ruby23"
+IUSE="python ruby static-libs ruby_targets_ruby21 ruby_targets_ruby22 
ruby_targets_ruby23"
 
 RDEPEND=">=sys-libs/libsepol-${SEPOL_VER}[${MULTILIB_USEDEP}]
-       >=dev-libs/libpcre-8.33-r1[static-libs?,${MULTILIB_USEDEP}]
+       >=dev-libs/libpcre-8.33-r1:=[static-libs?,${MULTILIB_USEDEP}]
        python? ( ${PYTHON_DEPS} )
        ruby? (
-               ruby_targets_ruby20? ( dev-lang/ruby:2.0 )
                ruby_targets_ruby21? ( dev-lang/ruby:2.1 )
                ruby_targets_ruby22? ( dev-lang/ruby:2.2 )
                ruby_targets_ruby23? ( dev-lang/ruby:2.3 )

diff --git a/sys-libs/libselinux/libselinux-9999.ebuild 
b/sys-libs/libselinux/libselinux-9999.ebuild
index 1ea4312..e686746 100644
--- a/sys-libs/libselinux/libselinux-9999.ebuild
+++ b/sys-libs/libselinux/libselinux-9999.ebuild
@@ -4,7 +4,7 @@
 
 EAPI="6"
 PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
+USE_RUBY="ruby21 ruby22 ruby23"
 
 # No, I am not calling ruby-ng
 inherit multilib python-r1 toolchain-funcs multilib-minimal
@@ -29,13 +29,12 @@ fi
 LICENSE="public-domain"
 SLOT="0"
 
-IUSE="python ruby static-libs ruby_targets_ruby20 ruby_targets_ruby21 
ruby_targets_ruby22 ruby_targets_ruby23"
+IUSE="python ruby static-libs ruby_targets_ruby21 ruby_targets_ruby22 
ruby_targets_ruby23"
 
 RDEPEND=">=sys-libs/libsepol-${SEPOL_VER}[${MULTILIB_USEDEP}]
-       >=dev-libs/libpcre-8.33-r1[static-libs?,${MULTILIB_USEDEP}]
+       >=dev-libs/libpcre-8.33-r1:=[static-libs?,${MULTILIB_USEDEP}]
        python? ( ${PYTHON_DEPS} )
        ruby? (
-               ruby_targets_ruby20? ( dev-lang/ruby:2.0 )
                ruby_targets_ruby21? ( dev-lang/ruby:2.1 )
                ruby_targets_ruby22? ( dev-lang/ruby:2.2 )
                ruby_targets_ruby23? ( dev-lang/ruby:2.3 )