Update after Ruby packages move.

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

56 files changed, 188 insertions, 136 deletions

diff --git a/dev-ruby/actionwebservice/ChangeLog b/dev-ruby/actionwebservice/ChangeLog
index 1486c489eaed..3ca51adb28e2 100644
--- a/dev-ruby/actionwebservice/ChangeLog
+++ b/dev-ruby/actionwebservice/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-ruby/actionwebservice
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/actionwebservice/ChangeLog,v 1.79 2011/12/21 10:38:28 flameeyes Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/actionwebservice/ChangeLog,v 1.80 2012/08/16 03:49:45 flameeyes Exp $
+
+  16 Aug 2012; Diego E. Pettenò <flameeyes@gentoo.org>
+  actionwebservice-2.3.5-r1.ebuild:
+  Update after Ruby packages move.
 
 *actionwebservice-2.3.5-r1 (21 Dec 2011)
 
@@ -391,4 +395,3 @@
   28 Feb 2005; Caleb Tennis <caleb@gentoo.org> +metadata.xml,
   +actionwebservice-0.5.0.ebuild:
   Initial import for rails - see bug #83446
-
diff --git a/dev-ruby/actionwebservice/actionwebservice-2.3.5-r1.ebuild b/dev-ruby/actionwebservice/actionwebservice-2.3.5-r1.ebuild
index a57e1cec5006..98c00002eec4 100644
--- a/dev-ruby/actionwebservice/actionwebservice-2.3.5-r1.ebuild
+++ b/dev-ruby/actionwebservice/actionwebservice-2.3.5-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/actionwebservice/actionwebservice-2.3.5-r1.ebuild,v 1.1 2011/12/21 10:38:28 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/actionwebservice/actionwebservice-2.3.5-r1.ebuild,v 1.2 2012/08/16 03:49:45 flameeyes Exp $
 
 EAPI=4
 USE_RUBY="ruby18"
@@ -29,7 +29,7 @@ ruby_add_rdepend ">=dev-ruby/actionpack-2.3.5:2.3
 
 # it uses activerecord when running tests, but they don't work so
 # ignore them for now.
-#ruby_add_bdepend test 'dev-ruby/sqlite3-ruby'
+#ruby_add_bdepend test 'dev-ruby/sqlite3'
 RESTRICT=test
 
 all_ruby_prepare() {
diff --git a/dev-ruby/activerecord/ChangeLog b/dev-ruby/activerecord/ChangeLog
index 16ea7cf8fb24..c78965e4cc3f 100644
--- a/dev-ruby/activerecord/ChangeLog
+++ b/dev-ruby/activerecord/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-ruby/activerecord
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/activerecord/ChangeLog,v 1.195 2012/08/11 08:38:03 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/activerecord/ChangeLog,v 1.196 2012/08/16 03:50:41 flameeyes Exp $
+
+  16 Aug 2012; Diego E. Pettenò <flameeyes@gentoo.org>
+  activerecord-2.3.14.ebuild, activerecord-3.0.16.ebuild,
+  activerecord-3.0.17.ebuild, activerecord-3.1.3.ebuild,
+  activerecord-3.1.7.ebuild, activerecord-3.1.8.ebuild,
+  activerecord-3.2.7.ebuild, activerecord-3.2.8.ebuild:
+  Update after Ruby packages move.
 
 *activerecord-3.1.8 (11 Aug 2012)
 *activerecord-3.0.17 (11 Aug 2012)
@@ -831,4 +838,3 @@
   15 Feb 2005; Rob Cakebread <pythonhead@gentoo.org>
   +activerecord-1.6.0.ebuild:
   Initial commit.
-
diff --git a/dev-ruby/activerecord/activerecord-2.3.14.ebuild b/dev-ruby/activerecord/activerecord-2.3.14.ebuild
index 5e967042ef7c..7c42c3b8ebf9 100644
--- a/dev-ruby/activerecord/activerecord-2.3.14.ebuild
+++ b/dev-ruby/activerecord/activerecord-2.3.14.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/activerecord/activerecord-2.3.14.ebuild,v 1.7 2012/05/01 18:24:21 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/activerecord/activerecord-2.3.14.ebuild,v 1.8 2012/08/16 03:50:41 flameeyes Exp $
 
 EAPI=2
 USE_RUBY="ruby18 ree18 jruby"
@@ -26,7 +26,7 @@ ruby_add_rdepend "~dev-ruby/activesupport-${PV}"
 #ruby_add_rdepend sqlite ">=dev-ruby/sqlite-ruby-2.2.2"
 USE_RUBY=ruby18 \
 	ruby_add_rdepend "
-		sqlite3? ( dev-ruby/sqlite3-ruby )
+		sqlite3? ( dev-ruby/sqlite3 )
 		mysql? ( >=dev-ruby/mysql-ruby-2.7 )
 		postgres? ( dev-ruby/pg )"
 
diff --git a/dev-ruby/activerecord/activerecord-3.0.16.ebuild b/dev-ruby/activerecord/activerecord-3.0.16.ebuild
index 2f8912661d88..37d4af6115ff 100644
--- a/dev-ruby/activerecord/activerecord-3.0.16.ebuild
+++ b/dev-ruby/activerecord/activerecord-3.0.16.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/activerecord/activerecord-3.0.16.ebuild,v 1.1 2012/07/28 08:19:34 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/activerecord/activerecord-3.0.16.ebuild,v 1.2 2012/08/16 03:50:41 flameeyes Exp $
 
 EAPI=4
 USE_RUBY="ruby18 ree18"
@@ -30,7 +30,7 @@ ruby_add_rdepend "~dev-ruby/activesupport-${PV}
 	~dev-ruby/activemodel-${PV}
 	>=dev-ruby/arel-2.0.10-r1:2.0
 	>=dev-ruby/tzinfo-0.3.23
-	sqlite3? ( >=dev-ruby/sqlite3-ruby-1.3.3 )
+	sqlite3? ( >=dev-ruby/sqlite3-1.3.3 )
 	mysql? ( dev-ruby/mysql2:0.2 )
 	postgres? ( dev-ruby/pg )"
 
@@ -38,7 +38,7 @@ ruby_add_bdepend "
 	test? (
 		dev-ruby/bundler
 		~dev-ruby/actionpack-${PV}
-		>=dev-ruby/sqlite3-ruby-1.3.3
+		>=dev-ruby/sqlite3-1.3.3
 		>=dev-ruby/mocha-0.10.5
 	)"
 
diff --git a/dev-ruby/activerecord/activerecord-3.0.17.ebuild b/dev-ruby/activerecord/activerecord-3.0.17.ebuild
index 37731544abac..04c2939d2f58 100644
--- a/dev-ruby/activerecord/activerecord-3.0.17.ebuild
+++ b/dev-ruby/activerecord/activerecord-3.0.17.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/activerecord/activerecord-3.0.17.ebuild,v 1.1 2012/08/11 08:38:03 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/activerecord/activerecord-3.0.17.ebuild,v 1.2 2012/08/16 03:50:41 flameeyes Exp $
 
 EAPI=4
 USE_RUBY="ruby18 ree18"
@@ -30,7 +30,7 @@ ruby_add_rdepend "~dev-ruby/activesupport-${PV}
 	~dev-ruby/activemodel-${PV}
 	>=dev-ruby/arel-2.0.10-r1:2.0
 	>=dev-ruby/tzinfo-0.3.23
-	sqlite3? ( >=dev-ruby/sqlite3-ruby-1.3.3 )
+	sqlite3? ( >=dev-ruby/sqlite3-1.3.3 )
 	mysql? ( dev-ruby/mysql2:0.2 )
 	postgres? ( dev-ruby/pg )"
 
@@ -38,7 +38,7 @@ ruby_add_bdepend "
 	test? (
 		dev-ruby/bundler
 		~dev-ruby/actionpack-${PV}
-		>=dev-ruby/sqlite3-ruby-1.3.3
+		>=dev-ruby/sqlite3-1.3.3
 		>=dev-ruby/mocha-0.10.5
 	)"
 
diff --git a/dev-ruby/activerecord/activerecord-3.1.3.ebuild b/dev-ruby/activerecord/activerecord-3.1.3.ebuild
index c790c4f42dcb..87ff86c880d2 100644
--- a/dev-ruby/activerecord/activerecord-3.1.3.ebuild
+++ b/dev-ruby/activerecord/activerecord-3.1.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/activerecord/activerecord-3.1.3.ebuild,v 1.3 2012/03/11 14:09:53 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/activerecord/activerecord-3.1.3.ebuild,v 1.4 2012/08/16 03:50:41 flameeyes Exp $
 
 EAPI=4
 USE_RUBY="ruby18 ruby19 ree18"
@@ -30,7 +30,7 @@ ruby_add_rdepend "~dev-ruby/activesupport-${PV}
 	~dev-ruby/activemodel-${PV}
 	>=dev-ruby/arel-2.2.1:2.1
 	>=dev-ruby/tzinfo-0.3.29
-	sqlite3? ( >=dev-ruby/sqlite3-ruby-1.3.4 )
+	sqlite3? ( >=dev-ruby/sqlite3-1.3.4 )
 	mysql? ( >=dev-ruby/mysql2-0.3.6:0.3 )
 	postgres? ( >=dev-ruby/pg-0.11.0 )"
 
@@ -38,7 +38,7 @@ ruby_add_bdepend "
 	test? (
 		dev-ruby/bundler
 		~dev-ruby/actionpack-${PV}
-		>=dev-ruby/sqlite3-ruby-1.3.3
+		>=dev-ruby/sqlite3-1.3.3
 		>=dev-ruby/mocha-0.9.5
 		virtual/ruby-test-unit
 	)"
diff --git a/dev-ruby/activerecord/activerecord-3.1.7.ebuild b/dev-ruby/activerecord/activerecord-3.1.7.ebuild
index 6ffbcbb7a452..871119d4c522 100644
--- a/dev-ruby/activerecord/activerecord-3.1.7.ebuild
+++ b/dev-ruby/activerecord/activerecord-3.1.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/activerecord/activerecord-3.1.7.ebuild,v 1.1 2012/07/28 07:40:23 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/activerecord/activerecord-3.1.7.ebuild,v 1.2 2012/08/16 03:50:41 flameeyes Exp $
 
 EAPI=4
 USE_RUBY="ruby18 ruby19 ree18"
@@ -30,7 +30,7 @@ ruby_add_rdepend "~dev-ruby/activesupport-${PV}
 	~dev-ruby/activemodel-${PV}
 	>=dev-ruby/arel-2.2.3:2.1
 	>=dev-ruby/tzinfo-0.3.29
-	sqlite3? ( >=dev-ruby/sqlite3-ruby-1.3.4 )
+	sqlite3? ( >=dev-ruby/sqlite3-1.3.4 )
 	mysql? ( >=dev-ruby/mysql2-0.3.6:0.3 )
 	postgres? ( >=dev-ruby/pg-0.11.0 )"
 
@@ -38,7 +38,7 @@ ruby_add_bdepend "
 	test? (
 		dev-ruby/bundler
 		~dev-ruby/actionpack-${PV}
-		>=dev-ruby/sqlite3-ruby-1.3.3
+		>=dev-ruby/sqlite3-1.3.3
 		>=dev-ruby/mocha-0.9.5
 		virtual/ruby-test-unit
 	)"
diff --git a/dev-ruby/activerecord/activerecord-3.1.8.ebuild b/dev-ruby/activerecord/activerecord-3.1.8.ebuild
index 6d8f1de2bbd6..f5bdff8e9825 100644
--- a/dev-ruby/activerecord/activerecord-3.1.8.ebuild
+++ b/dev-ruby/activerecord/activerecord-3.1.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/activerecord/activerecord-3.1.8.ebuild,v 1.1 2012/08/11 08:38:03 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/activerecord/activerecord-3.1.8.ebuild,v 1.2 2012/08/16 03:50:41 flameeyes Exp $
 
 EAPI=4
 USE_RUBY="ruby18 ruby19 ree18"
@@ -30,7 +30,7 @@ ruby_add_rdepend "~dev-ruby/activesupport-${PV}
 	~dev-ruby/activemodel-${PV}
 	>=dev-ruby/arel-2.2.3:2.1
 	>=dev-ruby/tzinfo-0.3.29
-	sqlite3? ( >=dev-ruby/sqlite3-ruby-1.3.4 )
+	sqlite3? ( >=dev-ruby/sqlite3-1.3.4 )
 	mysql? ( >=dev-ruby/mysql2-0.3.6:0.3 )
 	postgres? ( >=dev-ruby/pg-0.11.0 )"
 
@@ -38,7 +38,7 @@ ruby_add_bdepend "
 	test? (
 		dev-ruby/bundler
 		~dev-ruby/actionpack-${PV}
-		>=dev-ruby/sqlite3-ruby-1.3.3
+		>=dev-ruby/sqlite3-1.3.3
 		>=dev-ruby/mocha-0.9.5
 		virtual/ruby-test-unit
 	)"
diff --git a/dev-ruby/activerecord/activerecord-3.2.7.ebuild b/dev-ruby/activerecord/activerecord-3.2.7.ebuild
index 32195674478c..8e43e86171b5 100644
--- a/dev-ruby/activerecord/activerecord-3.2.7.ebuild
+++ b/dev-ruby/activerecord/activerecord-3.2.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/activerecord/activerecord-3.2.7.ebuild,v 1.1 2012/07/27 06:15:20 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/activerecord/activerecord-3.2.7.ebuild,v 1.2 2012/08/16 03:50:41 flameeyes Exp $
 
 EAPI=4
 USE_RUBY="ruby18 ruby19 ree18"
@@ -30,7 +30,7 @@ ruby_add_rdepend "~dev-ruby/activesupport-${PV}
 	~dev-ruby/activemodel-${PV}
 	>=dev-ruby/arel-3.0.2:3.0
 	>=dev-ruby/tzinfo-0.3.29
-	sqlite3? ( >=dev-ruby/sqlite3-ruby-1.3.5 )
+	sqlite3? ( >=dev-ruby/sqlite3-1.3.5 )
 	mysql? ( >=dev-ruby/mysql2-0.3.10:0.3 )
 	postgres? ( >=dev-ruby/pg-0.11.0 )"
 
@@ -38,7 +38,7 @@ ruby_add_bdepend "
 	test? (
 		dev-ruby/bundler
 		~dev-ruby/actionpack-${PV}
-		>=dev-ruby/sqlite3-ruby-1.3.5
+		>=dev-ruby/sqlite3-1.3.5
 		>=dev-ruby/mocha-0.12.1
 	)"
 
diff --git a/dev-ruby/activerecord/activerecord-3.2.8.ebuild b/dev-ruby/activerecord/activerecord-3.2.8.ebuild
index 499e811d88bd..7746dc11da6d 100644
--- a/dev-ruby/activerecord/activerecord-3.2.8.ebuild
+++ b/dev-ruby/activerecord/activerecord-3.2.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/activerecord/activerecord-3.2.8.ebuild,v 1.1 2012/08/10 06:44:33 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/activerecord/activerecord-3.2.8.ebuild,v 1.2 2012/08/16 03:50:41 flameeyes Exp $
 
 EAPI=4
 USE_RUBY="ruby18 ruby19 ree18"
@@ -30,7 +30,7 @@ ruby_add_rdepend "~dev-ruby/activesupport-${PV}
 	~dev-ruby/activemodel-${PV}
 	>=dev-ruby/arel-3.0.2:3.0
 	>=dev-ruby/tzinfo-0.3.29
-	sqlite3? ( >=dev-ruby/sqlite3-ruby-1.3.5 )
+	sqlite3? ( >=dev-ruby/sqlite3-1.3.5 )
 	mysql? ( >=dev-ruby/mysql2-0.3.10:0.3 )
 	postgres? ( >=dev-ruby/pg-0.11.0 )"
 
@@ -38,7 +38,7 @@ ruby_add_bdepend "
 	test? (
 		dev-ruby/bundler
 		~dev-ruby/actionpack-${PV}
-		>=dev-ruby/sqlite3-ruby-1.3.5
+		>=dev-ruby/sqlite3-1.3.5
 		>=dev-ruby/mocha-0.12.1
 	)"
 
diff --git a/dev-ruby/ammeter/ChangeLog b/dev-ruby/ammeter/ChangeLog
index 40ecefbd3e96..54c9a2fdc089 100644
--- a/dev-ruby/ammeter/ChangeLog
+++ b/dev-ruby/ammeter/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-ruby/ammeter
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ammeter/ChangeLog,v 1.8 2012/07/28 17:28:15 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ammeter/ChangeLog,v 1.9 2012/08/16 03:51:20 flameeyes Exp $
+
+  16 Aug 2012; Diego E. Pettenò <flameeyes@gentoo.org> ammeter-0.2.5.ebuild,
+  ammeter-0.2.8.ebuild:
+  Update after Ruby packages move.
 
 *ammeter-0.2.8 (28 Jul 2012)
 
@@ -35,4 +39,3 @@
   16 Jan 2012; Diego E. Pettenò <flameeyes@gentoo.org> +ammeter-0.2.2.ebuild,
   +metadata.xml:
   Initial import of ammeter gem required by mongoid.
-
diff --git a/dev-ruby/ammeter/ammeter-0.2.5.ebuild b/dev-ruby/ammeter/ammeter-0.2.5.ebuild
index 468138c6c1e9..7991b01a52bc 100644
--- a/dev-ruby/ammeter/ammeter-0.2.5.ebuild
+++ b/dev-ruby/ammeter/ammeter-0.2.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ammeter/ammeter-0.2.5.ebuild,v 1.2 2012/07/23 20:04:21 nativemad Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ammeter/ammeter-0.2.5.ebuild,v 1.3 2012/08/16 03:51:20 flameeyes Exp $
 
 EAPI=4
 USE_RUBY="ruby18 ruby19 ree18"
@@ -39,7 +39,7 @@ ruby_add_bdepend "
 		dev-ruby/jquery-rails
 		dev-util/cucumber
 		dev-util/aruba
-		dev-ruby/sqlite3-ruby
+		dev-ruby/sqlite3
 	)"
 
 all_ruby_prepare() {
diff --git a/dev-ruby/ammeter/ammeter-0.2.8.ebuild b/dev-ruby/ammeter/ammeter-0.2.8.ebuild
index a2942eb8c5c5..701440e7a98f 100644
--- a/dev-ruby/ammeter/ammeter-0.2.8.ebuild
+++ b/dev-ruby/ammeter/ammeter-0.2.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ammeter/ammeter-0.2.8.ebuild,v 1.1 2012/07/28 17:28:15 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ammeter/ammeter-0.2.8.ebuild,v 1.2 2012/08/16 03:51:20 flameeyes Exp $
 
 EAPI=4
 USE_RUBY="ruby18 ruby19 ree18"
@@ -39,7 +39,7 @@ ruby_add_bdepend "
 		dev-ruby/jquery-rails
 		dev-util/cucumber
 		dev-util/aruba
-		dev-ruby/sqlite3-ruby
+		dev-ruby/sqlite3
 	)"
 
 all_ruby_prepare() {
diff --git a/dev-ruby/best_in_place/ChangeLog b/dev-ruby/best_in_place/ChangeLog
index 30482e5492ab..2999a1d5f094 100644
--- a/dev-ruby/best_in_place/ChangeLog
+++ b/dev-ruby/best_in_place/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-ruby/best_in_place
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/best_in_place/ChangeLog,v 1.8 2012/07/30 18:34:56 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/best_in_place/ChangeLog,v 1.9 2012/08/16 03:51:44 flameeyes Exp $
+
+  16 Aug 2012; Diego E. Pettenò <flameeyes@gentoo.org>
+  best_in_place-1.1.2.ebuild:
+  Update after Ruby packages move.
 
   30 Jul 2012; Hans de Graaff <graaff@gentoo.org> -best_in_place-1.0.6.ebuild,
   -best_in_place-1.1.0.ebuild:
@@ -51,4 +55,3 @@
   +best_in_place-1.0.4.ebuild,
   +files/best_in_place-1.0.4-disable-some-tests.patch, +metadata.xml:
   Import of best_in_place gem.
-
diff --git a/dev-ruby/best_in_place/best_in_place-1.1.2.ebuild b/dev-ruby/best_in_place/best_in_place-1.1.2.ebuild
index ab3b77dbfc6c..afa07d11ac56 100644
--- a/dev-ruby/best_in_place/best_in_place-1.1.2.ebuild
+++ b/dev-ruby/best_in_place/best_in_place-1.1.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/best_in_place/best_in_place-1.1.2.ebuild,v 1.1 2012/05/29 15:47:51 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/best_in_place/best_in_place-1.1.2.ebuild,v 1.2 2012/08/16 03:51:44 flameeyes Exp $
 
 EAPI=4
 USE_RUBY="ruby18 ree18 ruby19"
@@ -36,7 +36,7 @@ ruby_add_bdepend "
 		>=dev-ruby/nokogiri-1.5.0
 		>=dev-ruby/capybara-1.0.1
 		dev-ruby/rails:3.2
-		>=dev-ruby/sqlite3-ruby-1.3.4-r1
+		>=dev-ruby/sqlite3-1.3.4-r1
 		dev-ruby/kramdown
 	)"
 
diff --git a/dev-ruby/dbd-pg/ChangeLog b/dev-ruby/dbd-pg/ChangeLog
index 3f7ba21b04eb..7058c594fbb1 100644
--- a/dev-ruby/dbd-pg/ChangeLog
+++ b/dev-ruby/dbd-pg/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-ruby/dbd-pg
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/dbd-pg/ChangeLog,v 1.12 2012/08/06 17:47:55 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/dbd-pg/ChangeLog,v 1.13 2012/08/16 03:52:09 flameeyes Exp $
+
+  16 Aug 2012; Diego E. Pettenò <flameeyes@gentoo.org> dbd-pg-0.3.8.ebuild:
+  Update after Ruby packages move.
 
   06 Aug 2012; Agostino Sarubbo <ago@gentoo.org> dbd-pg-0.3.9.ebuild:
   Stable for amd64, wrt bug #429976
@@ -44,4 +47,3 @@
   26 Aug 2009; Alex Legler <a3li@gentoo.org> +dbd-pg-0.3.8.ebuild,
   +metadata.xml:
   Initial import, ebuild by /me.
-
diff --git a/dev-ruby/dbd-pg/dbd-pg-0.3.8.ebuild b/dev-ruby/dbd-pg/dbd-pg-0.3.8.ebuild
index 72243c081c32..42a1801469fd 100644
--- a/dev-ruby/dbd-pg/dbd-pg-0.3.8.ebuild
+++ b/dev-ruby/dbd-pg/dbd-pg-0.3.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/dbd-pg/dbd-pg-0.3.8.ebuild,v 1.9 2012/05/01 18:24:23 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/dbd-pg/dbd-pg-0.3.8.ebuild,v 1.10 2012/08/16 03:52:09 flameeyes Exp $
 
 inherit "ruby"
 
@@ -15,7 +15,7 @@ IUSE="test"
 
 RDEPEND="
 	>=dev-ruby/ruby-dbi-0.4.2
-	>=dev-ruby/ruby-postgres-0.7.9.20080128"
+	>=dev-ruby/postgres-0.7.9.20080128"
 
 # ruby-postgres is not yet ruby19
 USE_RUBY="ruby18"
diff --git a/dev-ruby/dbd-sqlite3/ChangeLog b/dev-ruby/dbd-sqlite3/ChangeLog
index 252c373f9954..0858e9b95b32 100644
--- a/dev-ruby/dbd-sqlite3/ChangeLog
+++ b/dev-ruby/dbd-sqlite3/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-ruby/dbd-sqlite3
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/dbd-sqlite3/ChangeLog,v 1.12 2012/08/06 17:48:29 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/dbd-sqlite3/ChangeLog,v 1.13 2012/08/16 03:52:35 flameeyes Exp $
+
+  16 Aug 2012; Diego E. Pettenò <flameeyes@gentoo.org>
+  dbd-sqlite3-1.2.5-r1.ebuild, dbd-sqlite3-1.2.5.ebuild:
+  Update after Ruby packages move.
 
   06 Aug 2012; Agostino Sarubbo <ago@gentoo.org> dbd-sqlite3-1.2.5-r1.ebuild:
   Stable for amd64, wrt bug #429976
@@ -47,4 +51,3 @@
   26 Aug 2009; Alex Legler <a3li@gentoo.org> +dbd-sqlite3-1.2.5.ebuild,
   +metadata.xml:
   Initial import, ebuild by /me.
-
diff --git a/dev-ruby/dbd-sqlite3/dbd-sqlite3-1.2.5-r1.ebuild b/dev-ruby/dbd-sqlite3/dbd-sqlite3-1.2.5-r1.ebuild
index ae81fef0cc8f..f206c831858c 100644
--- a/dev-ruby/dbd-sqlite3/dbd-sqlite3-1.2.5-r1.ebuild
+++ b/dev-ruby/dbd-sqlite3/dbd-sqlite3-1.2.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/dbd-sqlite3/dbd-sqlite3-1.2.5-r1.ebuild,v 1.4 2012/08/06 17:48:29 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/dbd-sqlite3/dbd-sqlite3-1.2.5-r1.ebuild,v 1.5 2012/08/16 03:52:35 flameeyes Exp $
 
 EAPI=2
 USE_RUBY="ruby18"
@@ -18,7 +18,7 @@ IUSE="test"
 
 ruby_add_rdepend "
 	>=dev-ruby/ruby-dbi-0.4.2
-	>=dev-ruby/sqlite3-ruby-1.2.4"
+	>=dev-ruby/sqlite3-1.2.4"
 
 src_test() {
 	elog "The tests require additional configuration."
diff --git a/dev-ruby/dbd-sqlite3/dbd-sqlite3-1.2.5.ebuild b/dev-ruby/dbd-sqlite3/dbd-sqlite3-1.2.5.ebuild
index c0563850dec4..dd249b4cc3b8 100644
--- a/dev-ruby/dbd-sqlite3/dbd-sqlite3-1.2.5.ebuild
+++ b/dev-ruby/dbd-sqlite3/dbd-sqlite3-1.2.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/dbd-sqlite3/dbd-sqlite3-1.2.5.ebuild,v 1.9 2012/05/01 18:24:23 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/dbd-sqlite3/dbd-sqlite3-1.2.5.ebuild,v 1.10 2012/08/16 03:52:35 flameeyes Exp $
 
 inherit "ruby"
 
@@ -15,7 +15,7 @@ IUSE="test"
 
 RDEPEND="
 	>=dev-ruby/ruby-dbi-0.4.2
-	>=dev-ruby/sqlite3-ruby-1.2.4"
+	>=dev-ruby/sqlite3-1.2.4"
 
 USE_RUBY="ruby18"
 
diff --git a/dev-ruby/delocalize/ChangeLog b/dev-ruby/delocalize/ChangeLog
index 94a04e1c8e4a..350dbc32bf17 100644
--- a/dev-ruby/delocalize/ChangeLog
+++ b/dev-ruby/delocalize/ChangeLog
@@ -1,10 +1,12 @@
 # ChangeLog for dev-ruby/delocalize
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/delocalize/ChangeLog,v 1.1 2012/02/28 16:53:41 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/delocalize/ChangeLog,v 1.2 2012/08/16 03:52:53 flameeyes Exp $
+
+  16 Aug 2012; Diego E. Pettenò <flameeyes@gentoo.org> delocalize-0.3.1.ebuild:
+  Update after Ruby packages move.
 
 *delocalize-0.3.1 (28 Feb 2012)
 
   28 Feb 2012; Diego E. Pettenò <flameeyes@gentoo.org> +delocalize-0.3.1.ebuild,
   +metadata.xml:
   Initial import; dependency of radiant 1.0.0.
-
diff --git a/dev-ruby/delocalize/delocalize-0.3.1.ebuild b/dev-ruby/delocalize/delocalize-0.3.1.ebuild
index 842f890b4891..ca4f014c1a54 100644
--- a/dev-ruby/delocalize/delocalize-0.3.1.ebuild
+++ b/dev-ruby/delocalize/delocalize-0.3.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/delocalize/delocalize-0.3.1.ebuild,v 1.1 2012/02/28 16:53:41 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/delocalize/delocalize-0.3.1.ebuild,v 1.2 2012/08/16 03:52:53 flameeyes Exp $
 
 EAPI=4
 
@@ -32,6 +32,6 @@ ruby_add_rdepend ">=dev-ruby/rails-3"
 
 ruby_add_bdepend "
 	test? (
-		>=dev-ruby/sqlite3-ruby-1.3.4-r1
+		>=dev-ruby/sqlite3-1.3.4-r1
 		dev-ruby/timecop
 	)"
diff --git a/dev-ruby/flog/ChangeLog b/dev-ruby/flog/ChangeLog
index 0261af79d983..d435c4014810 100644
--- a/dev-ruby/flog/ChangeLog
+++ b/dev-ruby/flog/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-ruby/flog
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/flog/ChangeLog,v 1.4 2012/08/06 17:44:57 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/flog/ChangeLog,v 1.5 2012/08/16 03:53:14 flameeyes Exp $
+
+  16 Aug 2012; Diego E. Pettenò <flameeyes@gentoo.org> flog-2.5.3.ebuild:
+  Update after Ruby packages move.
 
   06 Aug 2012; Hans de Graaff <graaff@gentoo.org> -flog-2.5.2.ebuild:
   Cleanup.
@@ -21,4 +24,3 @@
   19 Mar 2011; Hans de Graaff <graaff@gentoo.org> +flog-2.5.1.ebuild,
   +metadata.xml:
   Initial import from graaff overlay. Closed bug 234770.
-
diff --git a/dev-ruby/flog/flog-2.5.3.ebuild b/dev-ruby/flog/flog-2.5.3.ebuild
index 7db4d40abd96..a5ba420993b3 100644
--- a/dev-ruby/flog/flog-2.5.3.ebuild
+++ b/dev-ruby/flog/flog-2.5.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/flog/flog-2.5.3.ebuild,v 1.1 2011/10/07 06:18:28 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/flog/flog-2.5.3.ebuild,v 1.2 2012/08/16 03:53:14 flameeyes Exp $
 
 EAPI="2"
 USE_RUBY="ruby18 ree18"
@@ -23,4 +23,4 @@ ruby_add_bdepend "doc? ( dev-ruby/hoe )"
 ruby_add_bdepend "test? ( dev-ruby/hoe dev-ruby/minitest )"
 
 ruby_add_rdepend "=dev-ruby/ruby_parser-2*
-	=dev-ruby/sexp-processor-3*"
+	=dev-ruby/sexp_processor-3*"
diff --git a/dev-ruby/i18n/ChangeLog b/dev-ruby/i18n/ChangeLog
index f1ea11554223..9ef72369ef28 100644
--- a/dev-ruby/i18n/ChangeLog
+++ b/dev-ruby/i18n/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-ruby/i18n
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/i18n/ChangeLog,v 1.47 2012/07/26 17:44:50 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/i18n/ChangeLog,v 1.48 2012/08/16 03:58:55 flameeyes Exp $
+
+  16 Aug 2012; Diego E. Pettenò <flameeyes@gentoo.org> i18n-0.3.7.ebuild,
+  i18n-0.4.2.ebuild, i18n-0.5.0-r1.ebuild, i18n-0.6.0-r1.ebuild:
+  Update after Ruby packages move.
 
   26 Jul 2012; Hans de Graaff <graaff@gentoo.org> -i18n-0.5.0.ebuild,
   -i18n-0.6.0.ebuild:
@@ -182,4 +186,3 @@
   +metadata.xml:
   Initial import of i18n support for Rails. USE=doc is missing because of
   missing jeweler.
-
diff --git a/dev-ruby/i18n/i18n-0.3.7.ebuild b/dev-ruby/i18n/i18n-0.3.7.ebuild
index 12e1c1b4fa23..1a2bb4dcb59e 100644
--- a/dev-ruby/i18n/i18n-0.3.7.ebuild
+++ b/dev-ruby/i18n/i18n-0.3.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/i18n/i18n-0.3.7.ebuild,v 1.7 2012/05/01 18:24:12 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/i18n/i18n-0.3.7.ebuild,v 1.8 2012/08/16 03:58:55 flameeyes Exp $
 
 EAPI=2
 
@@ -35,7 +35,7 @@ USE_RUBY="${USE_RUBY/jruby/}" \
 	ruby_add_bdepend "
 			test? (
 				dev-ruby/activerecord
-				dev-ruby/sqlite3-ruby
+				dev-ruby/sqlite3
 				dev-ruby/ruby2ruby
 			)"
 
diff --git a/dev-ruby/i18n/i18n-0.4.2.ebuild b/dev-ruby/i18n/i18n-0.4.2.ebuild
index 69fa5fe86866..c56875139d45 100644
--- a/dev-ruby/i18n/i18n-0.4.2.ebuild
+++ b/dev-ruby/i18n/i18n-0.4.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/i18n/i18n-0.4.2.ebuild,v 1.9 2012/05/01 18:24:12 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/i18n/i18n-0.4.2.ebuild,v 1.10 2012/08/16 03:58:55 flameeyes Exp $
 
 EAPI=2
 
@@ -34,7 +34,7 @@ USE_RUBY="${USE_RUBY/jruby/}" \
 	ruby_add_bdepend "
 			test? (
 				dev-ruby/activerecord
-				dev-ruby/sqlite3-ruby
+				dev-ruby/sqlite3
 				dev-ruby/ruby2ruby
 			)"
 
diff --git a/dev-ruby/i18n/i18n-0.5.0-r1.ebuild b/dev-ruby/i18n/i18n-0.5.0-r1.ebuild
index 7225fb68bccc..f6ed9e20bb67 100644
--- a/dev-ruby/i18n/i18n-0.5.0-r1.ebuild
+++ b/dev-ruby/i18n/i18n-0.5.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/i18n/i18n-0.5.0-r1.ebuild,v 1.5 2012/05/01 18:24:12 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/i18n/i18n-0.5.0-r1.ebuild,v 1.6 2012/08/16 03:58:55 flameeyes Exp $
 
 EAPI=2
 
@@ -34,7 +34,7 @@ RDEPEND="${DEPEND}"
 #	ruby_add_bdepend "
 #			test? (
 #				dev-ruby/activerecord
-#				dev-ruby/sqlite3-ruby
+#				dev-ruby/sqlite3
 #				dev-ruby/ruby2ruby
 #			)"
 
diff --git a/dev-ruby/i18n/i18n-0.6.0-r1.ebuild b/dev-ruby/i18n/i18n-0.6.0-r1.ebuild
index 80c6fe9286f6..efe1ddd0befa 100644
--- a/dev-ruby/i18n/i18n-0.6.0-r1.ebuild
+++ b/dev-ruby/i18n/i18n-0.6.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/i18n/i18n-0.6.0-r1.ebuild,v 1.5 2012/04/04 09:20:09 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/i18n/i18n-0.6.0-r1.ebuild,v 1.6 2012/08/16 03:58:55 flameeyes Exp $
 
 EAPI=4
 
@@ -34,7 +34,7 @@ RDEPEND="${DEPEND}"
 #	ruby_add_bdepend "
 #			test? (
 #				dev-ruby/activerecord
-#				dev-ruby/sqlite3-ruby
+#				dev-ruby/sqlite3
 #				dev-ruby/ruby2ruby
 #			)"
 
diff --git a/dev-ruby/parsetree/ChangeLog b/dev-ruby/parsetree/ChangeLog
index 2ff5f86ec637..a538aaf50b42 100644
--- a/dev-ruby/parsetree/ChangeLog
+++ b/dev-ruby/parsetree/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-ruby/parsetree
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/parsetree/ChangeLog,v 1.49 2012/08/14 18:44:39 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/parsetree/ChangeLog,v 1.50 2012/08/16 03:59:53 flameeyes Exp $
+
+  16 Aug 2012; Diego E. Pettenò <flameeyes@gentoo.org> parsetree-3.0.6.ebuild,
+  parsetree-3.0.7.ebuild, parsetree-3.0.8.ebuild, parsetree-3.0.9.ebuild:
+  Update after Ruby packages move.
 
   14 Aug 2012; Diego E. Pettenò <flameeyes@gentoo.org> metadata.xml:
   Update metadata.xml so that it's the same as most other packages.
diff --git a/dev-ruby/parsetree/parsetree-3.0.6.ebuild b/dev-ruby/parsetree/parsetree-3.0.6.ebuild
index 66951720607e..90eee70cce7d 100644
--- a/dev-ruby/parsetree/parsetree-3.0.6.ebuild
+++ b/dev-ruby/parsetree/parsetree-3.0.6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/parsetree/parsetree-3.0.6.ebuild,v 1.7 2011/07/10 23:03:03 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/parsetree/parsetree-3.0.6.ebuild,v 1.8 2012/08/16 03:59:53 flameeyes Exp $
 
 EAPI=2
 
@@ -23,8 +23,8 @@ KEYWORDS="amd64 ~hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-maco
 IUSE=""
 
 ruby_add_rdepend '
-	>=dev-ruby/ruby-inline-3.8.4-r1
-	>=dev-ruby/sexp-processor-3.0.0'
+	>=dev-ruby/RubyInline-3.8.4-r1
+	>=dev-ruby/sexp_processor-3.0.0'
 ruby_add_bdepend "
 	test? (
 		dev-ruby/hoe
diff --git a/dev-ruby/parsetree/parsetree-3.0.7.ebuild b/dev-ruby/parsetree/parsetree-3.0.7.ebuild
index 5f2b5df28e5c..d2b03c7cccd3 100644
--- a/dev-ruby/parsetree/parsetree-3.0.7.ebuild
+++ b/dev-ruby/parsetree/parsetree-3.0.7.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/parsetree/parsetree-3.0.7.ebuild,v 1.2 2011/09/15 04:49:49 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/parsetree/parsetree-3.0.7.ebuild,v 1.3 2012/08/16 03:59:53 flameeyes Exp $
 
 EAPI=2
 
@@ -23,8 +23,8 @@ KEYWORDS="~amd64 hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc
 IUSE=""
 
 ruby_add_rdepend '
-	>=dev-ruby/ruby-inline-3.7.0
-	>=dev-ruby/sexp-processor-3.0.0'
+	>=dev-ruby/RubyInline-3.7.0
+	>=dev-ruby/sexp_processor-3.0.0'
 ruby_add_bdepend "
 	test? (
 		dev-ruby/hoe
diff --git a/dev-ruby/parsetree/parsetree-3.0.8.ebuild b/dev-ruby/parsetree/parsetree-3.0.8.ebuild
index 4133cfc1b4ea..0644672c1c5c 100644
--- a/dev-ruby/parsetree/parsetree-3.0.8.ebuild
+++ b/dev-ruby/parsetree/parsetree-3.0.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/parsetree/parsetree-3.0.8.ebuild,v 1.3 2012/04/09 13:15:52 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/parsetree/parsetree-3.0.8.ebuild,v 1.4 2012/08/16 03:59:53 flameeyes Exp $
 
 EAPI=2
 
@@ -23,8 +23,8 @@ KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86
 IUSE=""
 
 ruby_add_rdepend '
-	>=dev-ruby/ruby-inline-3.10.0
-	>=dev-ruby/sexp-processor-3.0.0'
+	>=dev-ruby/RubyInline-3.10.0
+	>=dev-ruby/sexp_processor-3.0.0'
 ruby_add_bdepend "
 	test? (
 		dev-ruby/hoe
diff --git a/dev-ruby/parsetree/parsetree-3.0.9.ebuild b/dev-ruby/parsetree/parsetree-3.0.9.ebuild
index 074f0350eef0..8df3db36665f 100644
--- a/dev-ruby/parsetree/parsetree-3.0.9.ebuild
+++ b/dev-ruby/parsetree/parsetree-3.0.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/parsetree/parsetree-3.0.9.ebuild,v 1.1 2012/08/12 23:58:20 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/parsetree/parsetree-3.0.9.ebuild,v 1.2 2012/08/16 03:59:53 flameeyes Exp $
 
 EAPI=4
 
@@ -23,8 +23,8 @@ KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86
 IUSE=""
 
 ruby_add_rdepend '
-	>=dev-ruby/ruby-inline-3.10.0
-	>=dev-ruby/sexp-processor-3.0.0'
+	>=dev-ruby/RubyInline-3.10.0
+	>=dev-ruby/sexp_processor-3.0.0'
 ruby_add_bdepend "
 	test? (
 		dev-ruby/hoe
diff --git a/dev-ruby/png/ChangeLog b/dev-ruby/png/ChangeLog
index fef244d18609..a53f2baca3ec 100644
--- a/dev-ruby/png/ChangeLog
+++ b/dev-ruby/png/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-ruby/png
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/png/ChangeLog,v 1.9 2012/08/14 18:45:07 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/png/ChangeLog,v 1.10 2012/08/16 03:54:49 flameeyes Exp $
+
+  16 Aug 2012; Diego E. Pettenò <flameeyes@gentoo.org> png-1.2.0-r1.ebuild:
+  Update after Ruby packages move.
 
   14 Aug 2012; Diego E. Pettenò <flameeyes@gentoo.org> metadata.xml:
   Update metadata.xml so that it's the same as most other packages.
diff --git a/dev-ruby/png/png-1.2.0-r1.ebuild b/dev-ruby/png/png-1.2.0-r1.ebuild
index 72f937313013..45006b211181 100644
--- a/dev-ruby/png/png-1.2.0-r1.ebuild
+++ b/dev-ruby/png/png-1.2.0-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/png/png-1.2.0-r1.ebuild,v 1.2 2010/07/29 00:14:22 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/png/png-1.2.0-r1.ebuild,v 1.3 2012/08/16 03:54:49 flameeyes Exp $
 
 EAPI=2
 USE_RUBY="ruby18"
@@ -26,7 +26,7 @@ ruby_add_bdepend "
 		dev-ruby/minitest
 	)"
 
-ruby_add_rdepend ">=dev-ruby/ruby-inline-3.5.0"
+ruby_add_rdepend ">=dev-ruby/RubyInline-3.5.0"
 
 src_test() {
 	chmod 0755 "${HOME}" || die "Failed to fix permissions on home."
diff --git a/dev-ruby/rack/ChangeLog b/dev-ruby/rack/ChangeLog
index 3cfce07f57d8..c237e997fbce 100644
--- a/dev-ruby/rack/ChangeLog
+++ b/dev-ruby/rack/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-ruby/rack
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rack/ChangeLog,v 1.89 2012/08/13 18:27:12 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rack/ChangeLog,v 1.90 2012/08/16 03:55:23 flameeyes Exp $
+
+  16 Aug 2012; Diego E. Pettenò <flameeyes@gentoo.org> rack-1.2.5.ebuild,
+  rack-1.3.6-r1.ebuild, rack-1.4.1.ebuild:
+  Update after Ruby packages move.
 
   13 Aug 2012; Anthony G. Basile <blueness@gentoo.org> rack-1.2.5.ebuild:
   Stable ppc ppc64, bug #420711
@@ -348,4 +352,3 @@
   +rack-0.2.0.ebuild:
   Initial commit. Ebuild by Robin H. Johnson <robbat2@gentoo.org>.
   Dependancy of www-servers/thin.
-
diff --git a/dev-ruby/rack/rack-1.2.5.ebuild b/dev-ruby/rack/rack-1.2.5.ebuild
index 9a8749ecbcd4..fb20aa688cfc 100644
--- a/dev-ruby/rack/rack-1.2.5.ebuild
+++ b/dev-ruby/rack/rack-1.2.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rack/rack-1.2.5.ebuild,v 1.6 2012/08/13 18:27:12 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rack/rack-1.2.5.ebuild,v 1.7 2012/08/16 03:55:23 flameeyes Exp $
 
 EAPI="2"
 USE_RUBY="ruby18 ree18 ruby19 jruby"
@@ -27,7 +27,7 @@ ruby_add_rdepend "virtual/ruby-ssl"
 # memcache-client, thin, mongrel and camping; not sure if we should
 # make them dependencies at all. We do add the fcgi dependency because
 # that spec isn't optional.
-ruby_add_bdepend "test? ( dev-ruby/bacon dev-ruby/ruby-fcgi )"
+ruby_add_bdepend "test? ( dev-ruby/bacon dev-ruby/fcgi )"
 
 # Block against versions in older slots that also try to install a binary.
 RDEPEND="${RDEPEND} !<dev-ruby/rack-1.1.3-r1"
diff --git a/dev-ruby/rack/rack-1.3.6-r1.ebuild b/dev-ruby/rack/rack-1.3.6-r1.ebuild
index 027956ad630f..1aec4bffdf39 100644
--- a/dev-ruby/rack/rack-1.3.6-r1.ebuild
+++ b/dev-ruby/rack/rack-1.3.6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rack/rack-1.3.6-r1.ebuild,v 1.7 2012/08/10 10:34:09 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rack/rack-1.3.6-r1.ebuild,v 1.8 2012/08/16 03:55:23 flameeyes Exp $
 
 EAPI="2"
 USE_RUBY="ruby18 ree18 ruby19 jruby"
@@ -27,7 +27,7 @@ ruby_add_rdepend "virtual/ruby-ssl"
 # memcache-client, thin, mongrel and camping; not sure if we should
 # make them dependencies at all. We do add the fcgi dependency because
 # that spec isn't optional.
-ruby_add_bdepend "test? ( dev-ruby/bacon dev-ruby/ruby-fcgi )"
+ruby_add_bdepend "test? ( dev-ruby/bacon dev-ruby/fcgi )"
 
 # Block against versions in older slots that also try to install a binary.
 RDEPEND="${RDEPEND} !<dev-ruby/rack-1.1.3-r1:0 !<dev-ruby/rack-1.2.5:1.2"
diff --git a/dev-ruby/rack/rack-1.4.1.ebuild b/dev-ruby/rack/rack-1.4.1.ebuild
index 01db8b284662..02cf96673fed 100644
--- a/dev-ruby/rack/rack-1.4.1.ebuild
+++ b/dev-ruby/rack/rack-1.4.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rack/rack-1.4.1.ebuild,v 1.7 2012/08/10 10:35:25 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rack/rack-1.4.1.ebuild,v 1.8 2012/08/16 03:55:23 flameeyes Exp $
 
 EAPI="2"
 USE_RUBY="ruby18 ree18 ruby19 jruby"
@@ -25,7 +25,7 @@ ruby_add_rdepend "virtual/ruby-ssl"
 # memcache-client, thin, mongrel and camping; not sure if we should
 # make them dependencies at all. We do add the fcgi dependency because
 # that spec isn't optional.
-ruby_add_bdepend "test? ( dev-ruby/bacon dev-ruby/ruby-fcgi )"
+ruby_add_bdepend "test? ( dev-ruby/bacon dev-ruby/fcgi )"
 
 # Block against versions in older slots that also try to install a binary.
 RDEPEND="${RDEPEND} !<dev-ruby/rack-1.1.3-r1:0 !<dev-ruby/rack-1.2.5:1.2 !<dev-ruby/rack-1.3.6-r1:1.3"
diff --git a/dev-ruby/radiant/ChangeLog b/dev-ruby/radiant/ChangeLog
index 124d7bce9601..2af3df33f93f 100644
--- a/dev-ruby/radiant/ChangeLog
+++ b/dev-ruby/radiant/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-ruby/radiant
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/radiant/ChangeLog,v 1.24 2012/08/14 18:46:12 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/radiant/ChangeLog,v 1.25 2012/08/16 03:55:50 flameeyes Exp $
+
+  16 Aug 2012; Diego E. Pettenò <flameeyes@gentoo.org>
+  radiant-1.0.0_rc3-r1.ebuild:
+  Update after Ruby packages move.
 
   14 Aug 2012; Diego E. Pettenò <flameeyes@gentoo.org> metadata.xml:
   Update metadata.xml so that it's the same as most other packages.
diff --git a/dev-ruby/radiant/radiant-1.0.0_rc3-r1.ebuild b/dev-ruby/radiant/radiant-1.0.0_rc3-r1.ebuild
index 27580886ea12..5b87738727a5 100644
--- a/dev-ruby/radiant/radiant-1.0.0_rc3-r1.ebuild
+++ b/dev-ruby/radiant/radiant-1.0.0_rc3-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/radiant/radiant-1.0.0_rc3-r1.ebuild,v 1.1 2011/12/08 19:41:44 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/radiant/radiant-1.0.0_rc3-r1.ebuild,v 1.2 2012/08/16 03:55:50 flameeyes Exp $
 
 EAPI="2"
 USE_RUBY="ruby18"
@@ -37,7 +37,7 @@ ruby_add_rdepend ">=dev-ruby/redcloth-4.0.0
 	>=dev-ruby/radius-0.5.1
 	=dev-ruby/will_paginate-2.3*
 	dev-ruby/rack-cache
-	>=dev-ruby/sqlite3-ruby-1.3.4
+	>=dev-ruby/sqlite3-1.3.4
 	dev-ruby/bundler
 	>=dev-ruby/activesupport-2.3.14-r1:2.3"
 
diff --git a/dev-ruby/ruby2ruby/ChangeLog b/dev-ruby/ruby2ruby/ChangeLog
index 77be689f90c4..efe75fd4dec6 100644
--- a/dev-ruby/ruby2ruby/ChangeLog
+++ b/dev-ruby/ruby2ruby/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-ruby/ruby2ruby
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby2ruby/ChangeLog,v 1.41 2011/12/05 00:58:07 naota Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby2ruby/ChangeLog,v 1.42 2012/08/16 04:01:35 flameeyes Exp $
+
+  16 Aug 2012; Diego E. Pettenò <flameeyes@gentoo.org>
+  ruby2ruby-1.2.4-r2.ebuild, ruby2ruby-1.2.5.ebuild, ruby2ruby-1.3.0.ebuild,
+  ruby2ruby-1.3.1.ebuild:
+  Update after Ruby packages move.
 
   05 Dec 2011; Naohiro Aota <naota@gentoo.org> ruby2ruby-1.3.1.ebuild:
   Add ~x86-fbsd.
@@ -166,4 +171,3 @@
   14 Apr 2007; Robin H. Johnson <robbat2@gentoo.org> +metadata.xml,
   +ruby2ruby-1.1.5.ebuild:
   Initial commit. Ebuild by Robin H. Johnson <robbat2@gentoo.org>.
-
diff --git a/dev-ruby/ruby2ruby/ruby2ruby-1.2.4-r2.ebuild b/dev-ruby/ruby2ruby/ruby2ruby-1.2.4-r2.ebuild
index bc011dd4864f..a3616e389d70 100644
--- a/dev-ruby/ruby2ruby/ruby2ruby-1.2.4-r2.ebuild
+++ b/dev-ruby/ruby2ruby/ruby2ruby-1.2.4-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby2ruby/ruby2ruby-1.2.4-r2.ebuild,v 1.10 2011/09/15 04:49:09 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby2ruby/ruby2ruby-1.2.4-r2.ebuild,v 1.11 2012/08/16 04:01:35 flameeyes Exp $
 
 EAPI=2
 
@@ -25,6 +25,6 @@ KEYWORDS="amd64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
 IUSE=""
 
 ruby_add_rdepend "=dev-ruby/parsetree-3.0*
-	=dev-ruby/sexp-processor-3.0*
+	=dev-ruby/sexp_processor-3.0*
 	=dev-ruby/ruby_parser-2.0*"
 ruby_add_bdepend doc "dev-ruby/hoe dev-ruby/hoe-seattlerb"
diff --git a/dev-ruby/ruby2ruby/ruby2ruby-1.2.5.ebuild b/dev-ruby/ruby2ruby/ruby2ruby-1.2.5.ebuild
index 6e8e6a76f25d..890d7e61a8fd 100644
--- a/dev-ruby/ruby2ruby/ruby2ruby-1.2.5.ebuild
+++ b/dev-ruby/ruby2ruby/ruby2ruby-1.2.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby2ruby/ruby2ruby-1.2.5.ebuild,v 1.5 2010/12/28 08:14:16 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby2ruby/ruby2ruby-1.2.5.ebuild,v 1.6 2012/08/16 04:01:35 flameeyes Exp $
 
 EAPI=2
 
@@ -25,6 +25,6 @@ KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~pp
 IUSE=""
 
 ruby_add_rdepend "=dev-ruby/parsetree-3.0*
-	=dev-ruby/sexp-processor-3.0*
+	=dev-ruby/sexp_processor-3.0*
 	=dev-ruby/ruby_parser-2.0*"
 ruby_add_bdepend doc "dev-ruby/hoe dev-ruby/hoe-seattlerb"
diff --git a/dev-ruby/ruby2ruby/ruby2ruby-1.3.0.ebuild b/dev-ruby/ruby2ruby/ruby2ruby-1.3.0.ebuild
index 2ffa517352ce..e165db000280 100644
--- a/dev-ruby/ruby2ruby/ruby2ruby-1.3.0.ebuild
+++ b/dev-ruby/ruby2ruby/ruby2ruby-1.3.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby2ruby/ruby2ruby-1.3.0.ebuild,v 1.1 2011/09/16 05:57:18 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby2ruby/ruby2ruby-1.3.0.ebuild,v 1.2 2012/08/16 04:01:35 flameeyes Exp $
 
 EAPI=2
 
@@ -25,7 +25,7 @@ KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~pp
 IUSE=""
 
 ruby_add_rdepend "=dev-ruby/parsetree-3.0*
-	=dev-ruby/sexp-processor-3.0*
+	=dev-ruby/sexp_processor-3.0*
 	=dev-ruby/ruby_parser-2.0*"
 ruby_add_bdepend doc "dev-ruby/hoe dev-ruby/hoe-seattlerb"
 
diff --git a/dev-ruby/ruby2ruby/ruby2ruby-1.3.1.ebuild b/dev-ruby/ruby2ruby/ruby2ruby-1.3.1.ebuild
index cbb15520d233..26ffc9892ea9 100644
--- a/dev-ruby/ruby2ruby/ruby2ruby-1.3.1.ebuild
+++ b/dev-ruby/ruby2ruby/ruby2ruby-1.3.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby2ruby/ruby2ruby-1.3.1.ebuild,v 1.2 2011/12/05 00:58:07 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby2ruby/ruby2ruby-1.3.1.ebuild,v 1.3 2012/08/16 04:01:35 flameeyes Exp $
 
 EAPI=2
 
@@ -25,7 +25,7 @@ KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86
 IUSE=""
 
 ruby_add_rdepend "=dev-ruby/parsetree-3*
-	=dev-ruby/sexp-processor-3*
+	=dev-ruby/sexp_processor-3*
 	=dev-ruby/ruby_parser-2*"
 ruby_add_bdepend doc "dev-ruby/hoe dev-ruby/hoe-seattlerb"
 
diff --git a/dev-ruby/ruby_parser/ChangeLog b/dev-ruby/ruby_parser/ChangeLog
index dda11e0869e6..7a6997c24e59 100644
--- a/dev-ruby/ruby_parser/ChangeLog
+++ b/dev-ruby/ruby_parser/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-ruby/ruby_parser
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby_parser/ChangeLog,v 1.37 2012/08/14 18:55:04 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby_parser/ChangeLog,v 1.38 2012/08/16 03:57:01 flameeyes Exp $
+
+  16 Aug 2012; Diego E. Pettenò <flameeyes@gentoo.org> ruby_parser-2.0.5.ebuild,
+  ruby_parser-2.3.0.ebuild, ruby_parser-2.3.1.ebuild:
+  Update after Ruby packages move.
 
   14 Aug 2012; Diego E. Pettenò <flameeyes@gentoo.org> metadata.xml:
   Update metadata.xml so that it's the same as most other packages.
diff --git a/dev-ruby/ruby_parser/ruby_parser-2.0.5.ebuild b/dev-ruby/ruby_parser/ruby_parser-2.0.5.ebuild
index 2ddad462a004..da1fbd77b736 100644
--- a/dev-ruby/ruby_parser/ruby_parser-2.0.5.ebuild
+++ b/dev-ruby/ruby_parser/ruby_parser-2.0.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby_parser/ruby_parser-2.0.5.ebuild,v 1.11 2011/09/15 04:48:24 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby_parser/ruby_parser-2.0.5.ebuild,v 1.12 2012/08/16 03:57:01 flameeyes Exp $
 
 EAPI=2
 
@@ -24,4 +24,4 @@ SLOT="0"
 KEYWORDS="~alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE=""
 
-ruby_add_rdepend ">=dev-ruby/sexp-processor-3.0.1"
+ruby_add_rdepend ">=dev-ruby/sexp_processor-3.0.1"
diff --git a/dev-ruby/ruby_parser/ruby_parser-2.3.0.ebuild b/dev-ruby/ruby_parser/ruby_parser-2.3.0.ebuild
index 94635ab5faf3..b0601c2c9c32 100644
--- a/dev-ruby/ruby_parser/ruby_parser-2.3.0.ebuild
+++ b/dev-ruby/ruby_parser/ruby_parser-2.3.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby_parser/ruby_parser-2.3.0.ebuild,v 1.1 2011/09/12 05:25:27 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby_parser/ruby_parser-2.3.0.ebuild,v 1.2 2012/08/16 03:57:01 flameeyes Exp $
 
 EAPI=2
 
@@ -20,9 +20,9 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE=""
 
-ruby_add_rdepend ">=dev-ruby/sexp-processor-3.0.1"
+ruby_add_rdepend ">=dev-ruby/sexp_processor-3.0.1"
 ruby_add_bdepend "doc? ( >=dev-ruby/hoe-2.9.1 )"
-ruby_add_bdepend "test? ( virtual/ruby-test-unit >=dev-ruby/sexp-processor-3.0.6 )"
+ruby_add_bdepend "test? ( virtual/ruby-test-unit >=dev-ruby/sexp_processor-3.0.6 )"
 
 all_ruby_prepare() {
 	# Remove reference to perforce method that is not in a released
diff --git a/dev-ruby/ruby_parser/ruby_parser-2.3.1.ebuild b/dev-ruby/ruby_parser/ruby_parser-2.3.1.ebuild
index 35028cea6443..d371cc64028f 100644
--- a/dev-ruby/ruby_parser/ruby_parser-2.3.1.ebuild
+++ b/dev-ruby/ruby_parser/ruby_parser-2.3.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby_parser/ruby_parser-2.3.1.ebuild,v 1.4 2011/12/31 18:01:46 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby_parser/ruby_parser-2.3.1.ebuild,v 1.5 2012/08/16 03:57:01 flameeyes Exp $
 
 EAPI=2
 
@@ -21,9 +21,9 @@ KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-lin
 IUSE=""
 
 # The sexp-processor dependency is needed to make tests pass for ruby 1.9.
-ruby_add_rdepend ">=dev-ruby/sexp-processor-3.0.9"
+ruby_add_rdepend ">=dev-ruby/sexp_processor-3.0.9"
 ruby_add_bdepend "doc? ( >=dev-ruby/hoe-2.9.1 )"
-ruby_add_bdepend "test? ( virtual/ruby-test-unit >=dev-ruby/sexp-processor-3.0.6 )"
+ruby_add_bdepend "test? ( virtual/ruby-test-unit >=dev-ruby/sexp_processor-3.0.6 )"
 
 all_ruby_prepare() {
 	# Remove reference to perforce method that is not in a released
diff --git a/dev-ruby/stringex/ChangeLog b/dev-ruby/stringex/ChangeLog
index aafcb4653d4f..40962a3a6c8a 100644
--- a/dev-ruby/stringex/ChangeLog
+++ b/dev-ruby/stringex/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-ruby/stringex
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/stringex/ChangeLog,v 1.5 2012/06/09 07:09:47 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/stringex/ChangeLog,v 1.6 2012/08/16 03:57:21 flameeyes Exp $
+
+  16 Aug 2012; Diego E. Pettenò <flameeyes@gentoo.org> stringex-1.3.2.ebuild,
+  stringex-1.3.3.ebuild, stringex-1.4.0.ebuild:
+  Update after Ruby packages move.
 
 *stringex-1.4.0 (09 Jun 2012)
 
@@ -26,4 +30,3 @@
   25 Jan 2012; Diego E. Pettenò <flameeyes@gentoo.org> +metadata.xml,
   +stringex-1.3.0.ebuild:
   Initial import of stringex (needed for radiant rc4 and later).
-
diff --git a/dev-ruby/stringex/stringex-1.3.2.ebuild b/dev-ruby/stringex/stringex-1.3.2.ebuild
index f48deac82a2a..9a04d255ff8b 100644
--- a/dev-ruby/stringex/stringex-1.3.2.ebuild
+++ b/dev-ruby/stringex/stringex-1.3.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/stringex/stringex-1.3.2.ebuild,v 1.1 2012/02/17 22:15:21 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/stringex/stringex-1.3.2.ebuild,v 1.2 2012/08/16 03:57:21 flameeyes Exp $
 
 EAPI=4
 USE_RUBY="ruby18 ruby19 ree18"
@@ -25,7 +25,7 @@ IUSE="test"
 ruby_add_bdepend "
 	test? (
 		dev-ruby/activerecord
-		dev-ruby/sqlite3-ruby
+		dev-ruby/sqlite3
 		dev-ruby/redcloth
 	)"
 
diff --git a/dev-ruby/stringex/stringex-1.3.3.ebuild b/dev-ruby/stringex/stringex-1.3.3.ebuild
index 6d286e8743f5..bbe989bc7181 100644
--- a/dev-ruby/stringex/stringex-1.3.3.ebuild
+++ b/dev-ruby/stringex/stringex-1.3.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/stringex/stringex-1.3.3.ebuild,v 1.1 2012/04/28 22:11:07 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/stringex/stringex-1.3.3.ebuild,v 1.2 2012/08/16 03:57:21 flameeyes Exp $
 
 EAPI=4
 USE_RUBY="ruby18 ruby19 ree18"
@@ -25,7 +25,7 @@ IUSE="test"
 ruby_add_bdepend "
 	test? (
 		dev-ruby/activerecord
-		dev-ruby/sqlite3-ruby
+		dev-ruby/sqlite3
 		dev-ruby/redcloth
 	)"
 
diff --git a/dev-ruby/stringex/stringex-1.4.0.ebuild b/dev-ruby/stringex/stringex-1.4.0.ebuild
index 520418f0370d..ba07a7f3b3f0 100644
--- a/dev-ruby/stringex/stringex-1.4.0.ebuild
+++ b/dev-ruby/stringex/stringex-1.4.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/stringex/stringex-1.4.0.ebuild,v 1.1 2012/06/09 07:09:47 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/stringex/stringex-1.4.0.ebuild,v 1.2 2012/08/16 03:57:21 flameeyes Exp $
 
 EAPI=4
 USE_RUBY="ruby18 ruby19 ree18"
@@ -25,7 +25,7 @@ IUSE="test"
 ruby_add_bdepend "
 	test? (
 		dev-ruby/activerecord
-		dev-ruby/sqlite3-ruby
+		dev-ruby/sqlite3
 		dev-ruby/redcloth
 	)"