Make sure to install the gemspec, but fix it so that it works correctly with JRuby.

Package-Manager: portage-2.2.0_alpha120/cvs/Linux x86_64

4 files changed, 74 insertions, 48 deletions

diff --git a/dev-ruby/unf/ChangeLog b/dev-ruby/unf/ChangeLog
index f31501fba924..f07448ee77e0 100644
--- a/dev-ruby/unf/ChangeLog
+++ b/dev-ruby/unf/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-ruby/unf
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/unf/ChangeLog,v 1.2 2012/08/14 16:58:13 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/unf/ChangeLog,v 1.3 2012/08/14 17:36:27 flameeyes Exp $
+
+*unf-0.0.5-r1 (14 Aug 2012)
+
+  14 Aug 2012; Diego E. Pettenò <flameeyes@gentoo.org> +unf-0.0.5-r1.ebuild,
+  -unf-0.0.5.ebuild:
+  Make sure to install the gemspec, but fix it so that it works correctly with
+  JRuby.
 
   14 Aug 2012; Diego E. Pettenò <flameeyes@gentoo.org> unf-0.0.5.ebuild:
   Disable test task (drops rake dependency for USE=test); use Test::Unit 2 and
diff --git a/dev-ruby/unf/Manifest b/dev-ruby/unf/Manifest
index 3f9e7b2655e3..43534ef87e7e 100644
--- a/dev-ruby/unf/Manifest
+++ b/dev-ruby/unf/Manifest
@@ -2,17 +2,17 @@
 Hash: SHA256
 
 DIST unf-0.0.5.gem 118272 SHA256 27be496f67bbb460d581ce2ad113c6766a609b2781c170c232d8f074ef79e37c SHA512 f3f7b0ba3401f1b2563612b72d6d7628b7895b4b19d00feec72594a70e14198792e6faa2de2b3d4fa9096e531a83b6485d0493d18c5190ad98cb2bca494cdb73 WHIRLPOOL 8460b050950577849d264e6e591819a660e3b281ca7aaa0f55312b3f30506535111b03ca96ec931fa96d2dd578dd2d2f22ddf4bec409a369497690bb1c541932
-EBUILD unf-0.0.5.ebuild 922 SHA256 99024bcd812eb2a9024b640f5fe5ef7bb2e0fed3ec6972eb19dd5000f4fc0996 SHA512 0088452ff2ddfbc0912c007d57652bb51a1472d916034323619b7af854b313e738e9475e6dfc9efbc140205ec512603e8312be36385fe837cd87ab2584b22c78 WHIRLPOOL 550ef8dbf7c32e7957f4685542c0475b1cd0811c6e60833ed6cc627182aa1467acbac603445d88164b2e4db1d2e80709cb9f52afe3305a8c6b0febe15ca66513
-MISC ChangeLog 589 SHA256 159c4ac0e9d5342b7e8032472f392a5729fcbe7f13dd6dcddbebf9500e32ef2d SHA512 482525db6dc75c44b9b9eb9021e4d664559998a7aa6454d9a877f744cf26a6a98ca9963e7af678f46ca567f293b19c01b25a1067c6eabebfa2f1a20b4ab0ecb5 WHIRLPOOL 384daa04766a0f5f4386a232a9b8a65e18844c8df1a0b6dc1fc3b6c860d9053c85ce6faf9affbc0f455cfffaee2cb611e84baf4d5ee9a8b36193faa5cf1ac582
+EBUILD unf-0.0.5-r1.ebuild 1541 SHA256 ad26929624afe2af3380e9c68a25daab44a978a93dccc7fb86bae83191873675 SHA512 72f7efea6f0cb09232c8ac41ccfdbaaba40b1f3c5785eefb1fe82558aeb1eac213b619b3604e61f986f1096f04839781245fa5d6afe43879639ce4447a140ba7 WHIRLPOOL ec792eb849d0c2c69db333f7bd4d144830ccaadcb5c7bf929d5f8518957ed784cdb53ecbda3e069b672aede6179c1392017667332f0bac4d4d7b2b47ecfdb0b2
+MISC ChangeLog 806 SHA256 7bd0338780d68fab5d56d3f24552d96a5d53bb6f685995ad28decab729e1729b SHA512 ab97e04a32b990ac2a67b99c512b88071f9a5b54fb4104c711635ded9f0f7b8ae832a4b786477179b4e4c20d9e69353539a872dda846661d24d4ab8dcea931cc WHIRLPOOL 5994ee91015b90fee285ab25eb91a68c87428f51dd528b900bf52bc514a551a7e0cb0ca8449c5e43b6891d5c29ccf9072eff5db4c733e5f3d442eb4a61c8a5f9
 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQKoOxAAoJEBzRPIrUMBNCtBIH/RpNYWPxvigMDSgnLmxeGOLB
-8nihd/Jn/d5js1yR9fxb89XVquH99guzIz78ro7eftstlwhOkTfa+DTtIqRlBPVt
-B9iCyQJN80plUE2Qt64dqY5iTPLT+kE4YRoR0NrYusJroUTJVObTgqmubq030sks
-fBOb4Lww2kGAIEW2faiSLeue5Jq+Mr6ZY7+L0KKzEbikJU1HCznnU7OA1uQ69Di1
-A+2jMsX0qlq30/Ta4IubuRxY8YwyUmUA/OOt6Zm2AcilNFrmSPojc2HXD2zrSUA6
-EUKjMAL7w0NMFNc6oUhiJ7PnvqZ605Cp06DKtflDAAnjeXgMLIiyTWHZoTYmWl4=
-=5f49
+iQEcBAEBCAAGBQJQKo0UAAoJEBzRPIrUMBNCcFMH/il/ndvS9oKO3u8i1ih8AK1+
+Q0mR9kX+/Rb3ZShjF0hSKKidUVXxY5KPddAmjOEqYZylZDHFpxzhp3qblCdsBosf
+HKsyxli8b+DBXbl9Mg5UQdHz4dEI+nOxhlXMGY+k+S2pu1iR7xI4ecY2fv8BNAaL
+dIzH6CvAiEAOTfOmv10jvxJVhJQmDPomkUGJaZSsf4cUAOFXcigNgO+YKjaZJUOk
+njhDuaTFPZIypOwXJP/e5BQFCg1aybGyc2KxaaRnoZ924gmdELOUSuJZz19I469n
+gL2gte45xaGcf3EWgj2b19kVXjQY97/IPXPoeizn/2HvodvfwRgjOZaK60Ojmlo=
+=lYoE
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/unf/unf-0.0.5-r1.ebuild b/dev-ruby/unf/unf-0.0.5-r1.ebuild
new file mode 100644
index 000000000000..09687f12ce36
--- /dev/null
+++ b/dev-ruby/unf/unf-0.0.5-r1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/unf/unf-0.0.5-r1.ebuild,v 1.1 2012/08/14 17:36:27 flameeyes Exp $
+
+EAPI=4
+
+USE_RUBY="ruby18 ruby19 ree18 jruby"
+
+RUBY_FAKEGEM_RECIPE_TEST="none"
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A wrapper library to bring Unicode Normalization Form support to Ruby/JRuby."
+HOMEPAGE="https://github.com/knu/ruby-unf"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+# jruby already has support for UNF so it does not need the extension.
+USE_RUBY=${USE_RUBY/jruby/} ruby_add_rdepend "dev-ruby/unf_ext"
+
+ruby_add_bdepend "
+	test? (
+		>=dev-ruby/test-unit-2.5.1-r1
+		dev-ruby/shoulda
+	)"
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/,/end/ d' test/helper.rb || die
+
+	# Remove development dependencies; also remove platform as we don't
+	# care about it as it is, they only use it to avoid the unf_ext dep
+	# that we tackle on our own; finally remove git ls-files usage.
+	sed -i -e '/dependency.*\(shoulda\|bundler\|jeweler\|rcov\)/d' \
+		-e '/platform/d' \
+		-e '/git ls/d' \
+		${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+each_ruby_prepare() {
+	if [[ ${RUBY} == *jruby ]]; then
+		# Remove dependency over unf_ext which does not exist for JRuby
+		# remove platform, we don't set it.
+		sed -i -e '/dependency.*unf_ext/d' \
+			${RUBY_FAKEGEM_GEMSPEC} || die
+	fi
+}
+
+each_ruby_test() {
+	ruby-ng_testrb-2 test/test_*.rb
+}
diff --git a/dev-ruby/unf/unf-0.0.5.ebuild b/dev-ruby/unf/unf-0.0.5.ebuild
deleted file mode 100644
index 01e5f5c04dce..000000000000
--- a/dev-ruby/unf/unf-0.0.5.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/unf/unf-0.0.5.ebuild,v 1.2 2012/08/14 16:58:13 flameeyes Exp $
-
-EAPI=4
-
-USE_RUBY="ruby18 ruby19 ree18 jruby"
-
-RUBY_FAKEGEM_RECIPE_TEST="none"
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A wrapper library to bring Unicode Normalization Form support to Ruby/JRuby."
-HOMEPAGE="https://github.com/knu/ruby-unf"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-
-# jruby already has support for UNF so it does not need the extension.
-USE_RUBY=${USE_RUBY/jruby/} ruby_add_rdepend "dev-ruby/unf_ext"
-
-ruby_add_bdepend "
-	test? (
-		>=dev-ruby/test-unit-2.5.1-r1
-		dev-ruby/shoulda
-	)"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/,/end/ s:^:#:' test/helper.rb || die
-}
-
-each_ruby_test() {
-	ruby-ng_testrb-2 test/test_*.rb
-}