| 1 |
commit: f70cc29909da06b6d42ec3e3429de29fbdc93d87 |
| 2 |
Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org> |
| 3 |
AuthorDate: Mon Mar 9 17:39:59 2020 +0000 |
| 4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Mar 9 19:26:44 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f70cc299 |
| 7 |
|
| 8 |
app-i18n/tomoe: Fix Ruby usage. |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/703908 |
| 11 |
Signed-off-by: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache.Org> |
| 12 |
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> |
| 13 |
|
| 14 |
app-i18n/tomoe/tomoe-0.6.0-r5.ebuild | 28 +++++++++++----------------- |
| 15 |
1 file changed, 11 insertions(+), 17 deletions(-) |
| 16 |
|
| 17 |
diff --git a/app-i18n/tomoe/tomoe-0.6.0-r5.ebuild b/app-i18n/tomoe/tomoe-0.6.0-r5.ebuild |
| 18 |
index 059d1e78dd7..b988c4806ff 100644 |
| 19 |
--- a/app-i18n/tomoe/tomoe-0.6.0-r5.ebuild |
| 20 |
+++ b/app-i18n/tomoe/tomoe-0.6.0-r5.ebuild |
| 21 |
@@ -3,9 +3,9 @@ |
| 22 |
|
| 23 |
EAPI="6" |
| 24 |
PYTHON_COMPAT=( python2_7 ) |
| 25 |
-USE_RUBY="ruby24" |
| 26 |
+USE_RUBY="ruby24 ruby25 ruby26 ruby27" |
| 27 |
|
| 28 |
-inherit autotools python-single-r1 ruby-single |
| 29 |
+inherit autotools python-single-r1 ruby-utils |
| 30 |
|
| 31 |
DESCRIPTION="Japanese handwriting recognition engine" |
| 32 |
HOMEPAGE="http://tomoe.osdn.jp/" |
| 33 |
@@ -17,17 +17,7 @@ KEYWORDS="amd64 x86" |
| 34 |
IUSE="hyperestraier mysql python ruby ${USE_RUBY//ruby/ruby_targets_ruby} static-libs subversion" |
| 35 |
RESTRICT="test" |
| 36 |
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} ) |
| 37 |
- ruby? ( || ( ${USE_RUBY//ruby/ruby_targets_ruby} ) )" |
| 38 |
- |
| 39 |
-_ruby_set_globals() { |
| 40 |
- local ruby |
| 41 |
- for ruby in ${USE_RUBY}; do |
| 42 |
- RUBY_USEDEP="${RUBY_USEDEP}ruby_targets_${ruby}?," |
| 43 |
- done |
| 44 |
- RUBY_USEDEP="${RUBY_USEDEP%,}" |
| 45 |
-} |
| 46 |
-_ruby_set_globals |
| 47 |
-unset -f _ruby_set_globals |
| 48 |
+ ruby? ( ^^ ( ${USE_RUBY//ruby/ruby_targets_ruby} ) )" |
| 49 |
|
| 50 |
RDEPEND="dev-libs/glib:2 |
| 51 |
hyperestraier? ( app-text/hyperestraier ) |
| 52 |
@@ -40,8 +30,12 @@ RDEPEND="dev-libs/glib:2 |
| 53 |
') |
| 54 |
) |
| 55 |
ruby? ( |
| 56 |
- ${RUBY_DEPS} |
| 57 |
- dev-ruby/ruby-glib2[${RUBY_USEDEP}] |
| 58 |
+ $(for ruby in ${USE_RUBY}; do |
| 59 |
+ echo "ruby_targets_${ruby}? ( |
| 60 |
+ $(_ruby_implementation_depend "${ruby}") |
| 61 |
+ dev-ruby/ruby-glib2[ruby_targets_${ruby}] |
| 62 |
+ )" |
| 63 |
+ done) |
| 64 |
) |
| 65 |
subversion? ( dev-vcs/subversion )" |
| 66 |
DEPEND="${RDEPEND} |
| 67 |
@@ -75,7 +69,7 @@ src_prepare() { |
| 68 |
|
| 69 |
src_configure() { |
| 70 |
local ruby |
| 71 |
- for ruby in ${RUBY_TARGETS_PREFERENCE}; do |
| 72 |
+ for ruby in ${USE_RUBY}; do |
| 73 |
if use ruby_targets_${ruby}; then |
| 74 |
break |
| 75 |
fi |
| 76 |
@@ -85,7 +79,7 @@ src_configure() { |
| 77 |
$(use_enable ruby dict-ruby) \ |
| 78 |
$(use_enable static-libs static) \ |
| 79 |
$(use_with python python "") \ |
| 80 |
- $(use_with ruby ruby "$(type -p ${ruby})") \ |
| 81 |
+ $(use_with ruby ruby "$(type -P ${ruby})") \ |
| 82 |
--with-svn-include="${EPREFIX}"/usr/include \ |
| 83 |
--with-svn-lib="${EPREFIX}"/usr/$(get_libdir) |
| 84 |
} |
Archives