Fix metadata now that we use it to install the gemspec. Fix ChangeLog due to unwanted commit.

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

4 files changed, 17 insertions, 12 deletions

diff --git a/dev-ruby/rubyforge/ChangeLog b/dev-ruby/rubyforge/ChangeLog
index f5f6e27b813d..7d2954a2330a 100644
--- a/dev-ruby/rubyforge/ChangeLog
+++ b/dev-ruby/rubyforge/ChangeLog
@@ -1,9 +1,10 @@
 # ChangeLog for dev-ruby/rubyforge
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rubyforge/ChangeLog,v 1.74 2010/12/29 18:15:51 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rubyforge/ChangeLog,v 1.75 2010/12/29 18:21:42 graaff Exp $
 
-  29 Dec 2010; Hans de Graaff <graaff@gentoo.org> rubyforge-2.0.4-r1.ebuild:
-  Remove old version.
+  29 Dec 2010; Hans de Graaff <graaff@gentoo.org> rubyforge-2.0.4.ebuild,
+  rubyforge-2.0.4-r1.ebuild:
+  Fix metadata now that we use it to install the gemspec.
 
   29 Dec 2010; Hans de Graaff <graaff@gentoo.org> -rubyforge-1.0.3.ebuild:
   Remove old version.
diff --git a/dev-ruby/rubyforge/Manifest b/dev-ruby/rubyforge/Manifest
index 38b7de40cf1e..babec845efee 100644
--- a/dev-ruby/rubyforge/Manifest
+++ b/dev-ruby/rubyforge/Manifest
@@ -2,14 +2,14 @@
 Hash: SHA256
 
 DIST rubyforge-2.0.4.gem 15360 RMD160 7b4fcf19270928c57af753f87e4f5026badaff76 SHA1 e497a1e92500ff679c227bae6417e04e1c429420 SHA256 017207028a37a77e79523944b893f3148b1397cf41394490ff3e0dff2d51aaf1
-EBUILD rubyforge-2.0.4-r1.ebuild 1079 RMD160 c3fb8fb8f89d43e3dfd118a87dd358d3a59002ba SHA1 45a3201f0b0c8db5c58d2361e4ff4033d38877d2 SHA256 4b9a6522c87861af91a5633c4329ca4210fdfd2ed434c9d1740fdb006314ae33
-EBUILD rubyforge-2.0.4.ebuild 909 RMD160 f390d6d8b67d8958c489915f7888f76a392e0018 SHA1 99134d23ffdd176d2ae5182c33efddc6e30eebdb SHA256 0c25273e161fd6cb6440872c8c931be9c8046a713206e56bfe3837ae39ae25fa
-MISC ChangeLog 9541 RMD160 736297a23f87e4d75380212d68a71d7fd83eb9e8 SHA1 b34c7199bc18dc27a666da706aece1720a33d135 SHA256 e0be7d7fe71de9198c2077f2723c63dc92ed40776bd1351e5c2a8bfb8d7fc833
+EBUILD rubyforge-2.0.4-r1.ebuild 1079 RMD160 cc9bd4a0836ab4bfa9c1a40a0d803d2268bbb645 SHA1 849cc4a37ffeb9b2d5f8cd6bd68f3430cde273a3 SHA256 96f44dd103172034fc1f5d3590dc06f6fac6ee0d3bb94f1845ef92d225a96511
+EBUILD rubyforge-2.0.4.ebuild 1021 RMD160 97dbd34ca4fb4300e87c77108b9313e287045b0c SHA1 19e59ca46d81bf53cc1e57d50c4e3d357e607ca6 SHA256 9839bb54b8e938e11b510151cd36d0bd4fd024ab22995f948bf210dd5ea69a80
+MISC ChangeLog 9603 RMD160 f781cde4f0f15ef8198f1ea8259e81831b627683 SHA1 762e7a1c0da698a1d96f7266de61ab7413cd7e82 SHA256 8f4b89654b83c7db0f3feeb688da754dc3122a511226e09cf6af7ba44bac8d70
 MISC metadata.xml 157 RMD160 5d9e2c7ecba96ffebd936d38acedf859cdea84e1 SHA1 8ce15dcc608eeb5616aeec610dc695cbe6f93e02 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iF4EAREIAAYFAk0betwACgkQrnu0mw69Jkok+gD7B0GhbrT9NdIfzOtkfdUZQUYK
-BPDOcnB3PUpbLj7NV0AA/33W3PG8xy/SLo3ZWDC6Yoqs4GfGkTaA5S0Rd2Nh4D4+
-=GZ8u
+iF4EAREIAAYFAk0bfDwACgkQrnu0mw69Jkoi8AD/SlJ5iok5V7fW2KS/6UhTw+E5
+YTDT+oeirCHzChQAMSUA/2uSPSIH9aS9RC/LduTA4aFPLJnW3c5q4mfEVutP5XeH
+=Ied4
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/rubyforge/rubyforge-2.0.4-r1.ebuild b/dev-ruby/rubyforge/rubyforge-2.0.4-r1.ebuild
index 706e8b3f958a..5cd07fd1de42 100644
--- a/dev-ruby/rubyforge/rubyforge-2.0.4-r1.ebuild
+++ b/dev-ruby/rubyforge/rubyforge-2.0.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rubyforge/rubyforge-2.0.4-r1.ebuild,v 1.8 2010/12/29 18:15:51 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rubyforge/rubyforge-2.0.4-r1.ebuild,v 1.9 2010/12/29 18:21:42 graaff Exp $
 
 EAPI=2
 
@@ -33,5 +33,5 @@ ruby_add_bdepend "
 USE_RUBY="jruby" ruby_add_bdepend "test? ( dev-ruby/jruby-openssl )"
 
 all_ruby_prepare() {
-	sed -i 's/json-pure/json/' "${WORKDIR}"/all/metadata || die "Unable to fix metadata."
+	sed -i 's/json_pure/json/' "${WORKDIR}"/all/metadata || die "Unable to fix metadata."
 }
diff --git a/dev-ruby/rubyforge/rubyforge-2.0.4.ebuild b/dev-ruby/rubyforge/rubyforge-2.0.4.ebuild
index 60cec5ea66f8..7ea4a5731046 100644
--- a/dev-ruby/rubyforge/rubyforge-2.0.4.ebuild
+++ b/dev-ruby/rubyforge/rubyforge-2.0.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rubyforge/rubyforge-2.0.4.ebuild,v 1.9 2010/09/29 21:39:38 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rubyforge/rubyforge-2.0.4.ebuild,v 1.10 2010/12/29 18:21:42 graaff Exp $
 
 EAPI=2
 
@@ -31,3 +31,7 @@ ruby_add_bdepend "
 
 # JRuby-specific dependency
 USE_RUBY="jruby" ruby_add_bdepend "test? ( dev-ruby/jruby-openssl )"
+
+all_ruby_prepare() {
+	sed -i 's/json_pure/json/' "${WORKDIR}"/all/metadata || die "Unable to fix metadata."
+}