[gentoo-commits] repo/gentoo:master commit in: profiles/base/, media-libs/libcaca/

[gentoo-commits] repo/gentoo:master commit in: profiles/base/, media-libs/libcaca/

[Michał Górny]

commit:     c27f598c27fd694117987403d7c771aebd5691f1
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat May 13 11:55:57 2017 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon May 15 13:28:05 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c27f598c

media-libs/libcaca: Disable removed ruby20

 media-libs/libcaca/libcaca-0.99_beta19.ebuild | 6 +++---
 profiles/base/package.use.mask                | 4 ++++
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/media-libs/libcaca/libcaca-0.99_beta19.ebuild b/media-libs/libcaca/libcaca-0.99_beta19.ebuild
index b80b1f07cf9..589d14316c6 100644
--- a/media-libs/libcaca/libcaca-0.99_beta19.ebuild
+++ b/media-libs/libcaca/libcaca-0.99_beta19.ebuild
@@ -4,7 +4,7 @@
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
 RUBY_OPTIONAL=yes
-USE_RUBY=ruby20
+#USE_RUBY=ruby20
 
 inherit autotools ruby-ng eutils flag-o-matic mono-env multilib java-pkg-opt-2 python-single-r1 multilib-minimal
 
@@ -19,8 +19,8 @@ KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x
 IUSE="cxx doc imlib java mono ncurses opengl python ruby slang static-libs test truetype X"
 REQUIRED_USE="
 	python? ( ${PYTHON_REQUIRED_USE} )
-	ruby? ( ruby_targets_${USE_RUBY} )
 "
+#	ruby? ( ruby_targets_${USE_RUBY} )
 
 COMMON_DEPEND="imlib? ( >=media-libs/imlib2-1.4.6-r2[${MULTILIB_USEDEP}] )
 	mono? ( dev-lang/mono )
@@ -32,9 +32,9 @@ COMMON_DEPEND="imlib? ( >=media-libs/imlib2-1.4.6-r2[${MULTILIB_USEDEP}] )
 		truetype? ( >=media-libs/ftgl-2.1.3_rc5 )
 	)
 	python? ( ${PYTHON_DEPS} )
-	ruby? (  $(ruby_implementations_depend) )
 	slang? ( >=sys-libs/slang-2.2.4-r1[${MULTILIB_USEDEP}] )
 	X? ( >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] >=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}] )"
+#	ruby? (  $(ruby_implementations_depend) )
 RDEPEND="${COMMON_DEPEND}
 	java? ( >=virtual/jre-1.5 )"
 DEPEND="${COMMON_DEPEND}

diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 2fc848964b4..b0525ad0ba0 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -7,6 +7,10 @@
 # This file is only for generic masks. For arch-specific masks (i.e.
 # mask everywhere, unmask on arch/*) use arch/base.
 
+# Michał Górny <mgorny@gentoo.org> (15 May 2017)
+# Mask ruby20-only compatible packages
+=media-libs/libcaca-0.99_beta19 ruby
+
 # Michael Orlitzky <mjo@gentoo.org> (14 May 2017)
 # This version experiences random build failures with USE=jit.
 # Since USE=futures needs USE=jit, we have to mask that too.