diff options
Diffstat (limited to 'dev-ruby/rjb')
| -rw-r--r-- | dev-ruby/rjb/Manifest | 5 | ||||
| -rw-r--r-- | dev-ruby/rjb/rjb-1.6.1.ebuild | 82 | ||||
| -rw-r--r-- | dev-ruby/rjb/rjb-1.6.4-r1.ebuild (renamed from dev-ruby/rjb/rjb-1.6.2.ebuild) | 21 |
3 files changed, 7 insertions, 101 deletions
diff --git a/dev-ruby/rjb/Manifest b/dev-ruby/rjb/Manifest index 92075f96b3e4..8ce68f8b24fb 100644 --- a/dev-ruby/rjb/Manifest +++ b/dev-ruby/rjb/Manifest @@ -1,7 +1,4 @@ -DIST rjb-1.6.1.gem 74240 BLAKE2B 103e3885634be9c7dd842c2737c420511fea04e4e2d18f77dba7689c47da996fa37af5d08827de21ec38effd3fd99407e99491c8b99d134dded219ccf3880b79 SHA512 5b78fc4eabceddeb901145af39b1fc76e9a44801596ea4bacf9ce601cc109107cf042b1aa4c27049abd766ffca3206364079866ce7b88d25657fa75e7593adc3 -DIST rjb-1.6.2.gem 74752 BLAKE2B 5b5c61933da5603c805d68c6a2514d193efb87f8a1ffdd38193152463338d963de09848d6d3ea027338c045d24b9e884c7befbaed75b288bfba7573fa4b1f10d SHA512 3147d606698d5dd99798fec71d60e09cf964dd9649d4cba6c2bab40055ecb2b129d39beba67063745ad884bf3ad1eda9c1e91350f52f6767b20d612b5b279642 DIST rjb-1.6.4.gem 75264 BLAKE2B a678eb0b57e930bfcc7ea059da8ee6a9319b7e0e5bc632a5b97ec617e77d844491469ebc2366ba4290ee7648b4201f1d34be560e325c6099237d413c9ed8aa46 SHA512 49a0aaeb1a0e945ce373af74e01f33f531e27b205c33a382975125357ee1ceae0bea12d6fc32acb2dd66ce56c6034691520f355688cdaca5d01abff295d1a6c8 -EBUILD rjb-1.6.1.ebuild 2156 BLAKE2B 6be233ff05435ad3911ac10bc5a3e3296e46ce8a2a6f8e985d630f0a19736300fcbfaa88026d608e77e192700ce744c6031b5a1d8ebbcb4da392a69ba0fd8b5a SHA512 779a6addb448832a41a5a117f27fba090eab184ac59b0feae46b0377f97c50dfcd24ff4e39a9d5116f078c649256dd521411dfc67e4261f551009f8dd2baaac6 -EBUILD rjb-1.6.2.ebuild 2149 BLAKE2B 15ebee1a10095beb1b89f49e7d66ca3886f3066b3b57fef96511303d9bdea167095222d575951a13b33e818df73ef5f95be9138d0ab0a5a0a533eec43158feba SHA512 b31af1c817d730bcdf56336277815ef2f923ba8496f559004849968d02c403c8020779cc80fb6ca4ff4558440a232888d28ef814d01c200abf5fd4c5247a1f89 +EBUILD rjb-1.6.4-r1.ebuild 1914 BLAKE2B a77cec9382c95bdeb570292d487a28737e24b9f3a2053794ab7ce226cfa10f8c5e1445e3e52a8be57254fa7908468b02cced941998a7b4e7e0cdca81bf8d191f SHA512 e0f825ece719016ec9704eec7a95b35f3b0085b3cb94cbe60bc25201262c77eb25bf132af01885d5c911c15a9f56bccfee65dc194d14f737538edb74a29f6eac EBUILD rjb-1.6.4.ebuild 1906 BLAKE2B 3b996ac28efac9d1c22328b16e3a787566f2a2fac2caaedf97358c9778ad24e210e8d0d0fb959ddc33d53b658877db21325a8c61158b56a049ed1c6c6210883d SHA512 2872f03676a465f880dff18f8fe0bf869acdb714aca8e0f7da987064d3987e352a8cee0b7e60c358a9887bad44087b26502a3e695fa6969b7b776ad2cb0f654e MISC metadata.xml 433 BLAKE2B f23feff51bbe88032b365e2cd7989e91f0d09bc20a9d0f3a3084b593d5c94e220ab86f26cf8bb6ad37044130f17b4a2724d339f36805778a739fc3755b8b94b6 SHA512 9e71bf1595b1f96faf1a13f69c4a045ad498382a196a2ec6960c85909c699ae4d49c25b993130ad2328c565862186ce6343f64baba8c9c6fa83c1954960b7264 diff --git a/dev-ruby/rjb/rjb-1.6.1.ebuild b/dev-ruby/rjb/rjb-1.6.1.ebuild deleted file mode 100644 index 75650dc2ab9f..000000000000 --- a/dev-ruby/rjb/rjb-1.6.1.ebuild +++ /dev/null @@ -1,82 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -USE_RUBY="ruby24 ruby25 ruby26 ruby27" - -RUBY_FAKEGEM_EXTRADOC="readme.txt ChangeLog" -RUBY_FAKEGEM_TASK_TEST="" - -RUBY_FAKEGEM_EXTRAINSTALL="data" - -inherit java-pkg-2 ruby-ng ruby-fakegem - -DESCRIPTION="Rjb is a Ruby-Java software bridge" -HOMEPAGE="https://github.com/arton/rjb" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="examples hardened" - -DEPEND=">=virtual/jdk-1.5 - hardened? ( sys-apps/paxctl )" -RDEPEND="virtual/jre" - -pkg_setup() { - ruby-ng_pkg_setup - java-pkg-2_pkg_setup -} - -all_ruby_prepare() { - # The console is not available for testing. - sed -i -e '/test_noarg_sinvoke/,/end/ s:^:#:' test/test.rb || die - - # Avoid encoding tests since not all locales may be available. - sed -i -e '/test_kjconv/,/^ end/ s:^:#:' test/test.rb || die - - # Fix build on openjdk-11 - sed -i -e 's#javah -classpath ../data/rjb jp.co.infoseek.hp.arton.rjb.RBridge#javac -h . -classpath ../data/rjb RBridge.java#g' ext/extconf.rb || die -} - -each_ruby_prepare() { - #dev-lang/ruby might need the "hardened" flag to enforce the following: - if use hardened; then - paxctl -v /usr/bin/ruby 2>/dev/null | grep MPROTECT | grep disabled || ewarn '!!! rjb will only work if ruby is MPROTECT disabled\n please disable it if required using paxctl -m /usr/bin/ruby' - fi - # force compilation of class file for our JVM - rm -rf data -} - -each_ruby_configure() { - ${RUBY} -C ext extconf.rb || die "extconf.rb failed" -} - -each_ruby_compile() { - emake V=1 -C ext CFLAGS="${CFLAGS} -fPIC" archflags="${LDFLAGS}" -} - -each_ruby_install() { - each_fakegem_install - - # currently no elegant way to do this (bug #352765) - ruby_fakegem_newins ext/rjbcore.so lib/rjbcore.so - - if use examples; then - dodoc -r samples - fi -} - -each_ruby_test() { - if use hardened; then - paxctl -v ${RUBY} 2>/dev/null | grep MPROTECT | grep -q disabled - if [ $? = 0 ]; then - ${RUBY} -C test -I../lib:.:../ext test.rb || die - else - ewarn "${RUBY} has MPROTECT enabled, rjb will not work until it is disabled, skipping tests." - fi - else - ${RUBY} -C test -I../lib:.:../ext test.rb || die - fi -} diff --git a/dev-ruby/rjb/rjb-1.6.2.ebuild b/dev-ruby/rjb/rjb-1.6.4-r1.ebuild index 564fb048d402..3f2663da48e6 100644 --- a/dev-ruby/rjb/rjb-1.6.2.ebuild +++ b/dev-ruby/rjb/rjb-1.6.4-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -10,7 +10,9 @@ RUBY_FAKEGEM_TASK_TEST="" RUBY_FAKEGEM_EXTRAINSTALL="data" -inherit java-pkg-2 ruby-ng ruby-fakegem +RUBY_FAKEGEM_EXTENSIONS=(ext/extconf.rb) + +inherit java-pkg-2 ruby-fakegem DESCRIPTION="Rjb is a Ruby-Java software bridge" HOMEPAGE="https://github.com/arton/rjb" @@ -20,9 +22,9 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="examples hardened" -DEPEND=">=virtual/jdk-1.5 +DEPEND=">=virtual/jdk-1.8 hardened? ( sys-apps/paxctl )" -RDEPEND="virtual/jre" +RDEPEND=">=virtual/jre-1.8:*" pkg_setup() { ruby-ng_pkg_setup @@ -49,20 +51,9 @@ each_ruby_prepare() { rm -rf data } -each_ruby_configure() { - ${RUBY} -C ext extconf.rb || die "extconf.rb failed" -} - -each_ruby_compile() { - emake V=1 -C ext CFLAGS="${CFLAGS} -fPIC" archflags="${LDFLAGS}" -} - each_ruby_install() { each_fakegem_install - # currently no elegant way to do this (bug #352765) - ruby_fakegem_newins ext/rjbcore.so lib/rjbcore.so - if use examples; then dodoc -r samples fi |