Version bump. Depend on bouncy-castle-java to allow tests to run. Drop x86 keyword due to this, bug 365379.

Package-Manager: portage-2.1.9.42/cvs/Linux x86_64

3 files changed, 46 insertions, 7 deletions

diff --git a/dev-ruby/jruby-openssl/ChangeLog b/dev-ruby/jruby-openssl/ChangeLog
index 4da579d3525a..3c494e71d506 100644
--- a/dev-ruby/jruby-openssl/ChangeLog
+++ b/dev-ruby/jruby-openssl/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-ruby/jruby-openssl
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/jruby-openssl/ChangeLog,v 1.9 2010/11/26 12:22:09 graaff Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/jruby-openssl/ChangeLog,v 1.10 2011/04/30 06:32:14 graaff Exp $
+
+*jruby-openssl-0.7.4 (30 Apr 2011)
+
+  30 Apr 2011; Hans de Graaff <graaff@gentoo.org>
+  +jruby-openssl-0.7.4.ebuild:
+  Version bump. Depend on bouncy-castle-java to allow tests to run. Drop x86
+  keyword due to this, bug 365379.
 
 *jruby-openssl-0.7.2 (26 Nov 2010)
 
diff --git a/dev-ruby/jruby-openssl/Manifest b/dev-ruby/jruby-openssl/Manifest
index fc751d6baf6b..f1d1650509a6 100644
--- a/dev-ruby/jruby-openssl/Manifest
+++ b/dev-ruby/jruby-openssl/Manifest
@@ -3,16 +3,18 @@ Hash: SHA256
 
 DIST jruby-openssl-0.6.gem 1969152 RMD160 3d8d0774175c99befb5a7767cedfb28765a29f9c SHA1 6ef27d3c32cc02d7443482bfe800448dec446854 SHA256 bc1880e67383706bca325df612edc0db1727dad1d51c40f1e4b8bfcacae5bf7c
 DIST jruby-openssl-0.7.2.gem 562688 RMD160 e10039747b6acd0f4cb5e8e7ae327f2845d3ab93 SHA1 43a226a52da6b1fb1e3f6e3e89a8bedb2ac81987 SHA256 cf0b80c84d30a586ea288ee9385008cd7f24dbcea1b076a2956ce8b277af3e87
+DIST jruby-openssl-0.7.4.gem 623104 RMD160 7ef2c856539d4938e7001b7b04aedabfe38ab994 SHA1 68f0ce32f2e50608673b99450ddf96138b294210 SHA256 b0d67db29038e9e7ceefbff28a96f72bdb989e53808bc3b62ee167707179260d
 DIST jruby-openssl-0.7.gem 2174976 RMD160 76be1b10113e144b7a66153e750131892a7eb225 SHA1 5ce4004f15a546900f523b651082de02cf1f5565 SHA256 c5846c9d3e1d52e2a2a804522f07eae89334eb98fb449fbdd438d16083da2999
 EBUILD jruby-openssl-0.6-r1.ebuild 820 RMD160 629bee03f683d97fcdab311ef9a0f1d8c572f5a9 SHA1 f5cb0dcb1ad21c540cbabb53e1e845ca99fa024f SHA256 d13aa0f3460de02efa9890b106580df0aebf9a20339588b38d88e638ebce994a
 EBUILD jruby-openssl-0.7.2.ebuild 870 RMD160 0955985ecc29f4be999d10b13903d79d9d493a20 SHA1 0632daf730a82ee52b45306ffa82f06a43dc4a36 SHA256 17e54272357094621275e12ba702ccc090fb4e85e8cbd0a22573f36404e63c93
+EBUILD jruby-openssl-0.7.4.ebuild 869 RMD160 bdb7c413a4d8e70523e38aa549ade27d3e257777 SHA1 b695149cbf80618d8563b7f39a9ac1c378159264 SHA256 92c6e9b18db3eb589c807f7d26b05c7ebf582def3660da1d77ef802e99931b11
 EBUILD jruby-openssl-0.7.ebuild 868 RMD160 157c2cd7596fb116673a1898586e93e4566b786b SHA1 f275a063548a82fa8cbf1379bf9569970ecbca14 SHA256 630d72422a81e09ae83df7f5293a04cdba5e1e18716759b380d114c4811e8f79
-MISC ChangeLog 1735 RMD160 4d5fe11384f6505137624ca9706acfc3984cc620 SHA1 e47130bcf084d1e416ece834f17c6cfc0569aad9 SHA256 f15acdbdf80271a0712d8b16ed65c333144027769b5fb8f02eb94f242a6580f2
+MISC ChangeLog 1966 RMD160 76e0787ecea01d80d40ebd30a6c0bb2d9877dd49 SHA1 c104d08cc47bdc6607c02a9c4f8b12bb981cfb82 SHA256 c99514d863aaed278c33ff0398767edb05ec6ec566e50d632b8d9d46b9cca100
 MISC metadata.xml 159 RMD160 5259d4be0ca7b74c28e711d45a289def9aeadbd9 SHA1 c4ec40cd8f19e0d780a5133941bc50043be198cf SHA256 1c070a909e96d9d193f84ad9304d196febbe33b60a724cc4b0d20634bb82255b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAkzvpncACgkQZihJkut28StKkAD+NeFOCOLDM76qk9JHnp839AUb
-4Ls8uYgU6ibQQ3X3pPkA/1ZMgZEmHEVUM4S7GvoA46As7b/dID8DqlzqVCuDHg63
-=TEXR
+iF4EAREIAAYFAk27rPQACgkQrnu0mw69JkqcDwD/R7NIYNo33d3/OMCXnuEuXZEJ
+ghUgJETD5WJF13ikIr0A/093atxueDWqeQlCLUoe8vM0BO5uDFDPCjxsnLmZJ7Ta
+=04rm
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/jruby-openssl/jruby-openssl-0.7.4.ebuild b/dev-ruby/jruby-openssl/jruby-openssl-0.7.4.ebuild
new file mode 100644
index 000000000000..74dc259107fc
--- /dev/null
+++ b/dev-ruby/jruby-openssl/jruby-openssl-0.7.4.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/jruby-openssl/jruby-openssl-0.7.4.ebuild,v 1.1 2011/04/30 06:32:14 graaff Exp $
+
+EAPI=2
+
+USE_RUBY=jruby
+
+RUBY_FAKEGEM_TASK_DOC="redocs"
+RUBY_FAKEGEM_DOCDIR="doc"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A Ruby SSL library that works with JRuby"
+HOMEPAGE="http://rubyforge.org/projects/jruby-extras"
+
+LICENSE="MIT || ( CPL-1.0 GPL-2	LGPL-2.1 )"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc"
+IUSE=""
+
+ruby_add_bdepend "doc? ( dev-ruby/hoe )"
+ruby_add_bdepend "test? ( dev-ruby/hoe dev-ruby/mocha )"
+
+ruby_add_rdepend ">=dev-ruby/bouncy-castle-java-1.5.0146.1"
+
+all_ruby_prepare() {
+	# Remove a test that only works with JCE installed.
+	sed -i -e 's/OpenSSL::OPENSSL_VERSION_NUMBER > 0x00907000/false/' test/openssl/test_cipher.rb || die
+}