diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2020-04-12 03:41:30 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2020-04-12 03:41:30 +0100 |
| commit | 623ee73d661e5ed8475cb264511f683407d87365 (patch) | |
| tree | 993eb27c93ec7a2d2d19550300d888fc1fed9e69 /app-i18n/tomoe | |
| parent | ceeeb463cc1eef97fd62eaee8bf2196ba04bc384 (diff) | |
gentoo Easter resync : 12.04.2020
Diffstat (limited to 'app-i18n/tomoe')
| -rw-r--r-- | app-i18n/tomoe/Manifest | 2 | ||||
| -rw-r--r-- | app-i18n/tomoe/tomoe-0.6.0-r5.ebuild | 28 |
2 files changed, 12 insertions, 18 deletions
diff --git a/app-i18n/tomoe/Manifest b/app-i18n/tomoe/Manifest index 840d808f1126..29b442201eaf 100644 --- a/app-i18n/tomoe/Manifest +++ b/app-i18n/tomoe/Manifest @@ -3,5 +3,5 @@ AUX tomoe-gentoo.patch 599 BLAKE2B d297c41007f17ac07f6a80fb451c2d605ebf275b64af9 AUX tomoe-glib-2.32.patch 688 BLAKE2B 5aeb0fa73f54331e20d8a3cd360a4e7c06e770f988686bd3ddd055b49390abd1c064a9369d89c7a4f6cd6c9631a075ba56857b0db54befeace96c233cf9e7947 SHA512 ec0344ccb48ecc8f0df3a76424ed93c9e223a3b22733626a460c4729681d7f9f072ddb84311d22e161c04503dd845c7da774ea9832df32cb79199ca47589073c AUX tomoe-ruby19.patch 2646 BLAKE2B 7b2289af7e87946bb9c4cb197b493bc2b8625a3bc3f22ee42270a403bd36b1bee4efcbb46117f11d537e3c8a38dfbcfca6484c0a1db6ec2f0b7a5469dac35b47 SHA512 52f555412853c3485e8d3ab7b7739f030e2c3d2b5c4aac14ebb967c93427fe04cbcfec2f5997f09f0f7611dc268ee63437b256ef4cac1ea805f0ae84a522b836 DIST tomoe-0.6.0.tar.gz 4918949 BLAKE2B c9f4accc77fe7c6214c4d19dbbac7d0d39ed7947588ab1b8a1416f6cfeda33a6cfa84352f888d02848c8e2026bd5c36d2fe52d099bda6ca41a6d215733b11aa3 SHA512 eab618d7b28fc9613c175fab6f80fc7d6acc34af3a47f20c11b42a32acd87143ae10caca67fa1a5e2e75441d431799a5725a5d507604f8bd7447bbc1826f0bb8 -EBUILD tomoe-0.6.0-r5.ebuild 2199 BLAKE2B 240e9312cfd232c1afe7c2ee748a50cc3cf6e9d8b8fd52b67d3cb837285af8e134b7ff2af7e991dc4a6406de05bfb1bfab95184c058b244f0893a75e3d82ac6c SHA512 65df6d8a174907477efc18153b02cb35f32f82f606bd01b826a1f32482a134ce7121126bb4d37e18049f49413daec3573c4a75c93db292ae66f7dcd2b1a53cdf +EBUILD tomoe-0.6.0-r5.ebuild 2112 BLAKE2B c60b4ac44e9db3005059b9543c81a8b4932e9344cb5dfea9c234dba273d97ece424f53af97714b95c134f99ffc9f180790f09b127274924e7ce9f8d0b7013ea2 SHA512 d9232f2954d898247cbce92152ef2ca59771759658ff664707b56153075f81f07421ccb3263dce3b8f26603ffc3867a6352b643d8678dfa386dcf2f0b1b72198 MISC metadata.xml 482 BLAKE2B 454f6c496dda5f9ca738bb81c843a650be203b58bbaf4f0775204be463de6eccdd11023705295e89d1cc8513eead67dbe1fb26740bdc39216e8e2d4ee838e8ca SHA512 0898e0ba0bd42458870d268ee6bc881da1c88ab01969037d57f0d4abf5f140a7ce77bf87d918976bd763a33c8869e73d0fb2ec744be747d5bc30d594cc54efeb diff --git a/app-i18n/tomoe/tomoe-0.6.0-r5.ebuild b/app-i18n/tomoe/tomoe-0.6.0-r5.ebuild index 059d1e78dd7d..9f94b8adc0c2 100644 --- a/app-i18n/tomoe/tomoe-0.6.0-r5.ebuild +++ b/app-i18n/tomoe/tomoe-0.6.0-r5.ebuild @@ -3,9 +3,9 @@ EAPI="6" PYTHON_COMPAT=( python2_7 ) -USE_RUBY="ruby24" +USE_RUBY="ruby25 ruby26 ruby27" -inherit autotools python-single-r1 ruby-single +inherit autotools python-single-r1 ruby-utils DESCRIPTION="Japanese handwriting recognition engine" HOMEPAGE="http://tomoe.osdn.jp/" @@ -17,17 +17,7 @@ KEYWORDS="amd64 x86" IUSE="hyperestraier mysql python ruby ${USE_RUBY//ruby/ruby_targets_ruby} static-libs subversion" RESTRICT="test" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} ) - ruby? ( || ( ${USE_RUBY//ruby/ruby_targets_ruby} ) )" - -_ruby_set_globals() { - local ruby - for ruby in ${USE_RUBY}; do - RUBY_USEDEP="${RUBY_USEDEP}ruby_targets_${ruby}?," - done - RUBY_USEDEP="${RUBY_USEDEP%,}" -} -_ruby_set_globals -unset -f _ruby_set_globals + ruby? ( ^^ ( ${USE_RUBY//ruby/ruby_targets_ruby} ) )" RDEPEND="dev-libs/glib:2 hyperestraier? ( app-text/hyperestraier ) @@ -40,8 +30,12 @@ RDEPEND="dev-libs/glib:2 ') ) ruby? ( - ${RUBY_DEPS} - dev-ruby/ruby-glib2[${RUBY_USEDEP}] + $(for ruby in ${USE_RUBY}; do + echo "ruby_targets_${ruby}? ( + $(_ruby_implementation_depend "${ruby}") + dev-ruby/ruby-glib2[ruby_targets_${ruby}] + )" + done) ) subversion? ( dev-vcs/subversion )" DEPEND="${RDEPEND} @@ -75,7 +69,7 @@ src_prepare() { src_configure() { local ruby - for ruby in ${RUBY_TARGETS_PREFERENCE}; do + for ruby in ${USE_RUBY}; do if use ruby_targets_${ruby}; then break fi @@ -85,7 +79,7 @@ src_configure() { $(use_enable ruby dict-ruby) \ $(use_enable static-libs static) \ $(use_with python python "") \ - $(use_with ruby ruby "$(type -p ${ruby})") \ + $(use_with ruby ruby "$(type -P ${ruby})") \ --with-svn-include="${EPREFIX}"/usr/include \ --with-svn-lib="${EPREFIX}"/usr/$(get_libdir) } |