From 67064ef687e8b3a61f5a4698ae1b029e2e70822c Mon Sep 17 00:00:00 2001
From: Justin Lecher <jlec@gentoo.org>
Date: Fri, 16 Oct 2015 15:31:39 +0200
Subject: Update remote-ids

Signed-off-by: Justin Lecher <jlec@gentoo.org>
---
 dev-ruby/actionpack/metadata.xml                 | 1 -
 dev-ruby/activerecord/metadata.xml               | 1 -
 dev-ruby/activeresource/metadata.xml             | 3 +--
 dev-ruby/activesupport/metadata.xml              | 1 -
 dev-ruby/archive-tar-minitar/metadata.xml        | 3 +--
 dev-ruby/aws-s3/metadata.xml                     | 3 ---
 dev-ruby/builder/metadata.xml                    | 5 +----
 dev-ruby/classifier/metadata.xml                 | 1 -
 dev-ruby/color/metadata.xml                      | 1 -
 dev-ruby/curb/metadata.xml                       | 1 -
 dev-ruby/deprecated/metadata.xml                 | 3 +--
 dev-ruby/diff-lcs/metadata.xml                   | 3 +--
 dev-ruby/dnsruby/metadata.xml                    | 3 ---
 dev-ruby/dust/metadata.xml                       | 3 ---
 dev-ruby/extlib/metadata.xml                     | 3 ---
 dev-ruby/fattr/metadata.xml                      | 3 ---
 dev-ruby/gnuplot/metadata.xml                    | 3 ---
 dev-ruby/gruff/metadata.xml                      | 3 +--
 dev-ruby/highline/metadata.xml                   | 1 -
 dev-ruby/hoe-seattlerb/metadata.xml              | 3 ---
 dev-ruby/hoe/metadata.xml                        | 3 ---
 dev-ruby/htmlentities/metadata.xml               | 1 -
 dev-ruby/imagesize/metadata.xml                  | 1 -
 dev-ruby/jruby-openssl/metadata.xml              | 3 ---
 dev-ruby/json/metadata.xml                       | 1 -
 dev-ruby/kramdown/metadata.xml                   | 3 ---
 dev-ruby/launchy/metadata.xml                    | 3 ---
 dev-ruby/mocha/metadata.xml                      | 3 ---
 dev-ruby/narray/metadata.xml                     | 3 +--
 dev-ruby/net-scp/metadata.xml                    | 1 -
 dev-ruby/net-sftp/metadata.xml                   | 1 -
 dev-ruby/net-ssh-gateway/metadata.xml            | 1 -
 dev-ruby/net-ssh-multi/metadata.xml              | 1 -
 dev-ruby/net-ssh/metadata.xml                    | 1 -
 dev-ruby/oauth/metadata.xml                      | 3 ---
 dev-ruby/open4/metadata.xml                      | 1 -
 dev-ruby/plist/metadata.xml                      | 3 ---
 dev-ruby/png/metadata.xml                        | 3 ---
 dev-ruby/podcast/metadata.xml                    | 3 ---
 dev-ruby/polyglot/metadata.xml                   | 3 ---
 dev-ruby/rack-cache/metadata.xml                 | 7 +++++--
 dev-ruby/rack/metadata.xml                       | 5 +----
 dev-ruby/radius/metadata.xml                     | 1 -
 dev-ruby/rake/metadata.xml                       | 3 +--
 dev-ruby/rdoc/metadata.xml                       | 3 +--
 dev-ruby/right_http_connection/metadata.xml      | 1 -
 dev-ruby/rjb/metadata.xml                        | 3 ---
 dev-ruby/rmagick/metadata.xml                    | 3 +--
 dev-ruby/rspec-core/metadata.xml                 | 1 -
 dev-ruby/rspec-expectations/metadata.xml         | 1 -
 dev-ruby/rspec-mocks/metadata.xml                | 1 -
 dev-ruby/rspec/metadata.xml                      | 1 -
 dev-ruby/ruby-atk/metadata.xml                   | 1 +
 dev-ruby/ruby-cairo-gobject/metadata.xml         | 1 +
 dev-ruby/ruby-clutter-gstreamer/metadata.xml     | 1 +
 dev-ruby/ruby-clutter-gtk/metadata.xml           | 1 +
 dev-ruby/ruby-clutter/metadata.xml               | 1 +
 dev-ruby/ruby-elf/metadata.xml                   | 3 +--
 dev-ruby/ruby-filemagic/metadata.xml             | 1 -
 dev-ruby/ruby-gdk3/metadata.xml                  | 1 +
 dev-ruby/ruby-gdkpixbuf2/metadata.xml            | 1 +
 dev-ruby/ruby-gio2/metadata.xml                  | 1 +
 dev-ruby/ruby-glib2/metadata.xml                 | 1 +
 dev-ruby/ruby-gobject-introspection/metadata.xml | 1 +
 dev-ruby/ruby-gstreamer/metadata.xml             | 1 +
 dev-ruby/ruby-gtk2/metadata.xml                  | 1 +
 dev-ruby/ruby-gtk3/metadata.xml                  | 1 +
 dev-ruby/ruby-gtksourceview/metadata.xml         | 1 +
 dev-ruby/ruby-gtksourceview3/metadata.xml        | 1 +
 dev-ruby/ruby-hmac/metadata.xml                  | 3 ---
 dev-ruby/ruby-mp3info/metadata.xml               | 1 -
 dev-ruby/ruby-oci8/metadata.xml                  | 1 -
 dev-ruby/ruby-opengl/metadata.xml                | 1 -
 dev-ruby/ruby-openid/metadata.xml                | 1 -
 dev-ruby/ruby-pango/metadata.xml                 | 1 +
 dev-ruby/ruby-poppler/metadata.xml               | 1 +
 dev-ruby/ruby-rsvg/metadata.xml                  | 1 +
 dev-ruby/ruby-vte/metadata.xml                   | 1 +
 dev-ruby/ruby-vte3/metadata.xml                  | 1 +
 dev-ruby/ruby-webkit-gtk/metadata.xml            | 1 +
 dev-ruby/ruby-webkit-gtk2/metadata.xml           | 1 +
 dev-ruby/ruby-yadis/metadata.xml                 | 3 ---
 dev-ruby/ruby2ruby/metadata.xml                  | 1 -
 dev-ruby/rubygems/metadata.xml                   | 5 +----
 dev-ruby/serialport/metadata.xml                 | 3 ---
 dev-ruby/shorturl/metadata.xml                   | 3 ---
 dev-ruby/simple-rss/metadata.xml                 | 3 ---
 dev-ruby/snmplib/metadata.xml                    | 3 ---
 dev-ruby/sparklines/metadata.xml                 | 3 ---
 dev-ruby/sqlite3/metadata.xml                    | 2 +-
 dev-ruby/syntax/metadata.xml                     | 1 -
 dev-ruby/term-ansicolor/metadata.xml             | 3 ---
 dev-ruby/termcolor/metadata.xml                  | 3 ---
 dev-ruby/test-unit-rr/metadata.xml               | 3 ---
 dev-ruby/test-unit/metadata.xml                  | 1 -
 dev-ruby/text-hyphen/metadata.xml                | 5 +----
 dev-ruby/textpow/metadata.xml                    | 1 -
 dev-ruby/treetop/metadata.xml                    | 1 -
 dev-ruby/trollop/metadata.xml                    | 3 ---
 dev-ruby/tzinfo/metadata.xml                     | 5 +----
 dev-ruby/uuidtools/metadata.xml                  | 3 +--
 101 files changed, 44 insertions(+), 164 deletions(-)

(limited to 'dev-ruby')

diff --git a/dev-ruby/actionpack/metadata.xml b/dev-ruby/actionpack/metadata.xml
index 51451fbc5320..069495cf5def 100644
--- a/dev-ruby/actionpack/metadata.xml
+++ b/dev-ruby/actionpack/metadata.xml
@@ -4,6 +4,5 @@
   <herd>ruby</herd>
   <upstream>
     <remote-id type="github">rails/rails</remote-id>
-    <remote-id type="rubyforge">actionpack</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-ruby/activerecord/metadata.xml b/dev-ruby/activerecord/metadata.xml
index d4135e2394a1..069495cf5def 100644
--- a/dev-ruby/activerecord/metadata.xml
+++ b/dev-ruby/activerecord/metadata.xml
@@ -4,6 +4,5 @@
   <herd>ruby</herd>
   <upstream>
     <remote-id type="github">rails/rails</remote-id>
-    <remote-id type="rubyforge">activerecord</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-ruby/activeresource/metadata.xml b/dev-ruby/activeresource/metadata.xml
index d9d67beb4660..4c1d4a474ac7 100644
--- a/dev-ruby/activeresource/metadata.xml
+++ b/dev-ruby/activeresource/metadata.xml
@@ -3,7 +3,6 @@
 <pkgmetadata>
   <herd>ruby</herd>
   <upstream>
-    <remote-id type="github">rails/rails</remote-id>
-    <remote-id type="rubyforge">activeresource</remote-id>
+    <remote-id type="github">rails/activeresource</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-ruby/activesupport/metadata.xml b/dev-ruby/activesupport/metadata.xml
index 1b3fcc42d728..069495cf5def 100644
--- a/dev-ruby/activesupport/metadata.xml
+++ b/dev-ruby/activesupport/metadata.xml
@@ -4,6 +4,5 @@
   <herd>ruby</herd>
   <upstream>
     <remote-id type="github">rails/rails</remote-id>
-    <remote-id type="rubyforge">activesupport</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-ruby/archive-tar-minitar/metadata.xml b/dev-ruby/archive-tar-minitar/metadata.xml
index 344693a25b1a..75effc9ac24f 100644
--- a/dev-ruby/archive-tar-minitar/metadata.xml
+++ b/dev-ruby/archive-tar-minitar/metadata.xml
@@ -1,9 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>ruby</herd>
   <upstream>
-    <remote-id type="rubyforge">ruwiki</remote-id>
     <remote-id type="github">halostatue/minitar</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-ruby/aws-s3/metadata.xml b/dev-ruby/aws-s3/metadata.xml
index 6b75efc1b85d..9d6e8da2d7db 100644
--- a/dev-ruby/aws-s3/metadata.xml
+++ b/dev-ruby/aws-s3/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ruby</herd>
-	<upstream>
-		<remote-id type="rubyforge">amazon</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/dev-ruby/builder/metadata.xml b/dev-ruby/builder/metadata.xml
index 583958e7b054..9d6e8da2d7db 100644
--- a/dev-ruby/builder/metadata.xml
+++ b/dev-ruby/builder/metadata.xml
@@ -1,8 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ruby</herd>
-	<upstream>
-		<remote-id type="rubyforge">builder</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/dev-ruby/classifier/metadata.xml b/dev-ruby/classifier/metadata.xml
index 62a6fbf77be0..09996156c7e8 100644
--- a/dev-ruby/classifier/metadata.xml
+++ b/dev-ruby/classifier/metadata.xml
@@ -4,6 +4,5 @@
   <herd>ruby</herd>
   <upstream>
     <remote-id type="github">cardmagic/classifier</remote-id>
-    <remote-id type="rubyforge">classifier</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-ruby/color/metadata.xml b/dev-ruby/color/metadata.xml
index 0ab52d696658..373f091d0c0f 100644
--- a/dev-ruby/color/metadata.xml
+++ b/dev-ruby/color/metadata.xml
@@ -4,6 +4,5 @@
   <herd>ruby</herd>
   <upstream>
     <remote-id type="github">halostatue/color</remote-id>
-    <remote-id type="rubyforge">color</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-ruby/curb/metadata.xml b/dev-ruby/curb/metadata.xml
index 730d6f3bb4cc..794734426212 100644
--- a/dev-ruby/curb/metadata.xml
+++ b/dev-ruby/curb/metadata.xml
@@ -4,6 +4,5 @@
   <herd>ruby</herd>
   <upstream>
     <remote-id type="github">taf2/curb</remote-id>
-    <remote-id type="rubyforge">curb</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-ruby/deprecated/metadata.xml b/dev-ruby/deprecated/metadata.xml
index dbbea9b0bee5..d4c7ea642d72 100644
--- a/dev-ruby/deprecated/metadata.xml
+++ b/dev-ruby/deprecated/metadata.xml
@@ -1,9 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>ruby</herd>
   <upstream>
-    <remote-id type="rubyforge">deprecated</remote-id>
     <remote-id type="github">erikh/deprecated</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-ruby/diff-lcs/metadata.xml b/dev-ruby/diff-lcs/metadata.xml
index 1f94fcd9ba68..bbd67433ff51 100644
--- a/dev-ruby/diff-lcs/metadata.xml
+++ b/dev-ruby/diff-lcs/metadata.xml
@@ -1,9 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>ruby</herd>
   <upstream>
-    <remote-id type="rubyforge">ruwiki</remote-id>
     <remote-id type="github">halostatue/diff-lcs</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-ruby/dnsruby/metadata.xml b/dev-ruby/dnsruby/metadata.xml
index 4cb7af563db4..8d8dd58100fe 100644
--- a/dev-ruby/dnsruby/metadata.xml
+++ b/dev-ruby/dnsruby/metadata.xml
@@ -5,7 +5,4 @@
 	<maintainer>
 		<email>mschiff@gentoo.org</email>
 	</maintainer>
-	<upstream>
-		<remote-id type="rubyforge">dnsruby</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/dev-ruby/dust/metadata.xml b/dev-ruby/dust/metadata.xml
index 58f8530e3afa..9d6e8da2d7db 100644
--- a/dev-ruby/dust/metadata.xml
+++ b/dev-ruby/dust/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ruby</herd>
-	<upstream>
-		<remote-id type="rubyforge">dust</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/dev-ruby/extlib/metadata.xml b/dev-ruby/extlib/metadata.xml
index 0a0c1c594a59..9d6e8da2d7db 100644
--- a/dev-ruby/extlib/metadata.xml
+++ b/dev-ruby/extlib/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ruby</herd>
-	<upstream>
-		<remote-id type="rubyforge">extlib</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/dev-ruby/fattr/metadata.xml b/dev-ruby/fattr/metadata.xml
index 5e66b0fa5ef1..9d6e8da2d7db 100644
--- a/dev-ruby/fattr/metadata.xml
+++ b/dev-ruby/fattr/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ruby</herd>
-	<upstream>
-		<remote-id type="rubyforge">codeforpeople</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/dev-ruby/gnuplot/metadata.xml b/dev-ruby/gnuplot/metadata.xml
index 6bba9c4b7502..9d6e8da2d7db 100644
--- a/dev-ruby/gnuplot/metadata.xml
+++ b/dev-ruby/gnuplot/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ruby</herd>
-	<upstream>
-		<remote-id type="rubyforge">rgplot</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/dev-ruby/gruff/metadata.xml b/dev-ruby/gruff/metadata.xml
index 9fce92c99647..728389012a71 100644
--- a/dev-ruby/gruff/metadata.xml
+++ b/dev-ruby/gruff/metadata.xml
@@ -1,9 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>ruby</herd>
   <upstream>
-    <remote-id type="rubyforge">gruff</remote-id>
     <remote-id type="github">topfunky/gruff</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-ruby/highline/metadata.xml b/dev-ruby/highline/metadata.xml
index c93aec22c5a3..2f8d5b779718 100644
--- a/dev-ruby/highline/metadata.xml
+++ b/dev-ruby/highline/metadata.xml
@@ -4,6 +4,5 @@
   <herd>ruby</herd>
   <upstream>
     <remote-id type="github">JEG2/highline</remote-id>
-    <remote-id type="rubyforge">highline</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-ruby/hoe-seattlerb/metadata.xml b/dev-ruby/hoe-seattlerb/metadata.xml
index d9dbac1280fb..9d6e8da2d7db 100644
--- a/dev-ruby/hoe-seattlerb/metadata.xml
+++ b/dev-ruby/hoe-seattlerb/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ruby</herd>
-	<upstream>
-		<remote-id type="rubyforge">seattlerb</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/dev-ruby/hoe/metadata.xml b/dev-ruby/hoe/metadata.xml
index d9dbac1280fb..9d6e8da2d7db 100644
--- a/dev-ruby/hoe/metadata.xml
+++ b/dev-ruby/hoe/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ruby</herd>
-	<upstream>
-		<remote-id type="rubyforge">seattlerb</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/dev-ruby/htmlentities/metadata.xml b/dev-ruby/htmlentities/metadata.xml
index e3eedb5c2d74..2e6df8fe770f 100644
--- a/dev-ruby/htmlentities/metadata.xml
+++ b/dev-ruby/htmlentities/metadata.xml
@@ -4,6 +4,5 @@
   <herd>ruby</herd>
   <upstream>
     <remote-id type="github">threedaymonk/htmlentities</remote-id>
-    <remote-id type="rubyforge">htmlentities</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-ruby/imagesize/metadata.xml b/dev-ruby/imagesize/metadata.xml
index 83be5602a48a..4827a9af3533 100644
--- a/dev-ruby/imagesize/metadata.xml
+++ b/dev-ruby/imagesize/metadata.xml
@@ -4,6 +4,5 @@
   <herd>ruby</herd>
   <upstream>
     <remote-id type="github">mattheworiordan/imagesize</remote-id>
-    <remote-id type="rubyforge">imagesize</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-ruby/jruby-openssl/metadata.xml b/dev-ruby/jruby-openssl/metadata.xml
index dd7e40ea1014..ac30777a093b 100644
--- a/dev-ruby/jruby-openssl/metadata.xml
+++ b/dev-ruby/jruby-openssl/metadata.xml
@@ -3,7 +3,4 @@
 <pkgmetadata>
 	<herd>ruby</herd>
 	<herd>java</herd>
-	<upstream>
-		<remote-id type="rubyforge">jruby-extras</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/dev-ruby/json/metadata.xml b/dev-ruby/json/metadata.xml
index fc5dfdcd4459..59e57238fc55 100644
--- a/dev-ruby/json/metadata.xml
+++ b/dev-ruby/json/metadata.xml
@@ -4,6 +4,5 @@
   <herd>ruby</herd>
   <upstream>
     <remote-id type="github">flori/json</remote-id>
-    <remote-id type="rubyforge">json</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-ruby/kramdown/metadata.xml b/dev-ruby/kramdown/metadata.xml
index a5ef7162a4b0..9d6e8da2d7db 100644
--- a/dev-ruby/kramdown/metadata.xml
+++ b/dev-ruby/kramdown/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ruby</herd>
-	<upstream>
-		<remote-id type="rubyforge">kramdown</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/dev-ruby/launchy/metadata.xml b/dev-ruby/launchy/metadata.xml
index 180939d02bc2..9d6e8da2d7db 100644
--- a/dev-ruby/launchy/metadata.xml
+++ b/dev-ruby/launchy/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ruby</herd>
-	<upstream>
-		<remote-id type="rubyforge">copiousfreetime</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/dev-ruby/mocha/metadata.xml b/dev-ruby/mocha/metadata.xml
index 843b95949d24..9d6e8da2d7db 100644
--- a/dev-ruby/mocha/metadata.xml
+++ b/dev-ruby/mocha/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ruby</herd>
-	<upstream>
-		<remote-id type="rubyforge">mocha</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/dev-ruby/narray/metadata.xml b/dev-ruby/narray/metadata.xml
index d8ddaada3468..25d79cd62e98 100644
--- a/dev-ruby/narray/metadata.xml
+++ b/dev-ruby/narray/metadata.xml
@@ -1,9 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>ruby</herd>
   <upstream>
-    <remote-id type="rubyforge">narray</remote-id>
     <remote-id type="github">masa16/narray</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-ruby/net-scp/metadata.xml b/dev-ruby/net-scp/metadata.xml
index d0875fce9737..c4ec636bd2b2 100644
--- a/dev-ruby/net-scp/metadata.xml
+++ b/dev-ruby/net-scp/metadata.xml
@@ -4,6 +4,5 @@
   <herd>ruby</herd>
   <upstream>
     <remote-id type="github">net-ssh/net-scp</remote-id>
-    <remote-id type="rubyforge">net-ssh</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-ruby/net-sftp/metadata.xml b/dev-ruby/net-sftp/metadata.xml
index fc1a3bc01c23..2b6892683f8b 100644
--- a/dev-ruby/net-sftp/metadata.xml
+++ b/dev-ruby/net-sftp/metadata.xml
@@ -4,6 +4,5 @@
   <herd>ruby</herd>
   <upstream>
     <remote-id type="github">net-ssh/net-sftp</remote-id>
-    <remote-id type="rubyforge">net-ssh</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-ruby/net-ssh-gateway/metadata.xml b/dev-ruby/net-ssh-gateway/metadata.xml
index b22a074c8eb4..4df31c163642 100644
--- a/dev-ruby/net-ssh-gateway/metadata.xml
+++ b/dev-ruby/net-ssh-gateway/metadata.xml
@@ -4,6 +4,5 @@
 	<herd>ruby</herd>
 	<upstream>
 		<remote-id type="github">net-ssh/net-scp</remote-id>
-		<remote-id type="rubyforge">net-ssh</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-ruby/net-ssh-multi/metadata.xml b/dev-ruby/net-ssh-multi/metadata.xml
index 8fae3fbfcc70..1a9d505bda69 100644
--- a/dev-ruby/net-ssh-multi/metadata.xml
+++ b/dev-ruby/net-ssh-multi/metadata.xml
@@ -4,6 +4,5 @@
   <herd>ruby</herd>
   <upstream>
     <remote-id type="github">net-ssh/net-ssh-multi</remote-id>
-    <remote-id type="rubyforge">net-ssh</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-ruby/net-ssh/metadata.xml b/dev-ruby/net-ssh/metadata.xml
index 210d64ba885e..051e68173677 100644
--- a/dev-ruby/net-ssh/metadata.xml
+++ b/dev-ruby/net-ssh/metadata.xml
@@ -4,6 +4,5 @@
   <herd>ruby</herd>
   <upstream>
     <remote-id type="github">net-ssh/net-ssh</remote-id>
-    <remote-id type="rubyforge">net-ssh</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-ruby/oauth/metadata.xml b/dev-ruby/oauth/metadata.xml
index 55451e9611e5..9d6e8da2d7db 100644
--- a/dev-ruby/oauth/metadata.xml
+++ b/dev-ruby/oauth/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ruby</herd>
-	<upstream>
-		<remote-id type="rubyforge">oauth</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/dev-ruby/open4/metadata.xml b/dev-ruby/open4/metadata.xml
index 169e364db96d..6c1c5873edfd 100644
--- a/dev-ruby/open4/metadata.xml
+++ b/dev-ruby/open4/metadata.xml
@@ -4,6 +4,5 @@
   <herd>ruby</herd>
   <upstream>
     <remote-id type="github">ahoward/open4</remote-id>
-    <remote-id type="rubyforge">codeforpeople</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-ruby/plist/metadata.xml b/dev-ruby/plist/metadata.xml
index d2fa239aa8ab..9d6e8da2d7db 100644
--- a/dev-ruby/plist/metadata.xml
+++ b/dev-ruby/plist/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ruby</herd>
-	<upstream>
-		<remote-id type="rubyforge">plist</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/dev-ruby/png/metadata.xml b/dev-ruby/png/metadata.xml
index d9dbac1280fb..9d6e8da2d7db 100644
--- a/dev-ruby/png/metadata.xml
+++ b/dev-ruby/png/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ruby</herd>
-	<upstream>
-		<remote-id type="rubyforge">seattlerb</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/dev-ruby/podcast/metadata.xml b/dev-ruby/podcast/metadata.xml
index d48a826e6c6b..9d6e8da2d7db 100644
--- a/dev-ruby/podcast/metadata.xml
+++ b/dev-ruby/podcast/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ruby</herd>
-	<upstream>
-		<remote-id type="rubyforge">podcast</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/dev-ruby/polyglot/metadata.xml b/dev-ruby/polyglot/metadata.xml
index 2b40b25b5e96..e14a9aa86e09 100644
--- a/dev-ruby/polyglot/metadata.xml
+++ b/dev-ruby/polyglot/metadata.xml
@@ -7,7 +7,4 @@ Polyglot provides support for fully-custom DSLs by providing a
 registry of file types that can be loaded by its improved version of
 'require', using a custom loader for each file type.
 	</longdescription>
-	<upstream>
-		<remote-id type="rubyforge">polyglot</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/dev-ruby/rack-cache/metadata.xml b/dev-ruby/rack-cache/metadata.xml
index 852136183369..d49eb15eaa5c 100644
--- a/dev-ruby/rack-cache/metadata.xml
+++ b/dev-ruby/rack-cache/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ruby</herd>
+	<herd>ruby</herd>
+	<upstream>
+		<remote-id type="github">rtomayko/rack-cache</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ruby/rack/metadata.xml b/dev-ruby/rack/metadata.xml
index 3522a5c25652..d2c4f9beae6c 100644
--- a/dev-ruby/rack/metadata.xml
+++ b/dev-ruby/rack/metadata.xml
@@ -1,10 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ruby</herd>
 	<longdescription>Rack provides a common API for connecting web frameworks, web servers and layers
 of software inbetween.</longdescription>
-	<upstream>
-		<remote-id type="rubyforge">rack</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/dev-ruby/radius/metadata.xml b/dev-ruby/radius/metadata.xml
index 5dff5c309525..a9cecbebceef 100644
--- a/dev-ruby/radius/metadata.xml
+++ b/dev-ruby/radius/metadata.xml
@@ -4,6 +4,5 @@
   <herd>ruby</herd>
   <upstream>
     <remote-id type="github">jlong/radius</remote-id>
-    <remote-id type="rubyforge">radius</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-ruby/rake/metadata.xml b/dev-ruby/rake/metadata.xml
index 76282fc962ae..bac1a67b9db8 100644
--- a/dev-ruby/rake/metadata.xml
+++ b/dev-ruby/rake/metadata.xml
@@ -1,9 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>ruby</herd>
   <upstream>
-    <remote-id type="rubyforge">rake</remote-id>
     <remote-id type="github">jimweirich/rake</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-ruby/rdoc/metadata.xml b/dev-ruby/rdoc/metadata.xml
index b3c153f4cf60..d01a31620cf7 100644
--- a/dev-ruby/rdoc/metadata.xml
+++ b/dev-ruby/rdoc/metadata.xml
@@ -1,9 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>ruby</herd>
   <upstream>
-    <remote-id type="rubyforge">rdoc</remote-id>
     <remote-id type="github">rdoc/rdoc</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-ruby/right_http_connection/metadata.xml b/dev-ruby/right_http_connection/metadata.xml
index f537d5d30ee8..207ffe41f9cb 100644
--- a/dev-ruby/right_http_connection/metadata.xml
+++ b/dev-ruby/right_http_connection/metadata.xml
@@ -4,6 +4,5 @@
   <herd>ruby</herd>
   <upstream>
     <remote-id type="github">rightscale/right_http_connection</remote-id>
-    <remote-id type="rubyforge">rightscale</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-ruby/rjb/metadata.xml b/dev-ruby/rjb/metadata.xml
index 5c5b2a156760..3258f094e7d6 100644
--- a/dev-ruby/rjb/metadata.xml
+++ b/dev-ruby/rjb/metadata.xml
@@ -8,7 +8,4 @@
 	</maintainer>
 	<longdescription lang="en">
 	</longdescription>
-	<upstream>
-		<remote-id type="rubyforge">rjb</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/dev-ruby/rmagick/metadata.xml b/dev-ruby/rmagick/metadata.xml
index 7001688936fa..2a02d2b532da 100644
--- a/dev-ruby/rmagick/metadata.xml
+++ b/dev-ruby/rmagick/metadata.xml
@@ -1,9 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>ruby</herd>
   <upstream>
-    <remote-id type="rubyforge">rmagick</remote-id>
     <remote-id type="github">gemhome/rmagick</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-ruby/rspec-core/metadata.xml b/dev-ruby/rspec-core/metadata.xml
index 2e6e4076ff37..9a6e369178bb 100644
--- a/dev-ruby/rspec-core/metadata.xml
+++ b/dev-ruby/rspec-core/metadata.xml
@@ -9,6 +9,5 @@
   </use>
   <upstream>
     <remote-id type="github">rspec/rspec-core</remote-id>
-    <remote-id type="rubyforge">rspec</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-ruby/rspec-expectations/metadata.xml b/dev-ruby/rspec-expectations/metadata.xml
index f3bf51d2142d..5f0e700537c0 100644
--- a/dev-ruby/rspec-expectations/metadata.xml
+++ b/dev-ruby/rspec-expectations/metadata.xml
@@ -4,6 +4,5 @@
   <herd>ruby</herd>
   <upstream>
     <remote-id type="github">rspec/rspec-expectations</remote-id>
-    <remote-id type="rubyforge">rspec</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-ruby/rspec-mocks/metadata.xml b/dev-ruby/rspec-mocks/metadata.xml
index ef4bd6c82ae8..38e759d7d81f 100644
--- a/dev-ruby/rspec-mocks/metadata.xml
+++ b/dev-ruby/rspec-mocks/metadata.xml
@@ -4,6 +4,5 @@
   <herd>ruby</herd>
   <upstream>
     <remote-id type="github">rspec/rspec-mocks</remote-id>
-    <remote-id type="rubyforge">rspec</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-ruby/rspec/metadata.xml b/dev-ruby/rspec/metadata.xml
index 835164d53e0f..f420278262de 100644
--- a/dev-ruby/rspec/metadata.xml
+++ b/dev-ruby/rspec/metadata.xml
@@ -4,6 +4,5 @@
   <herd>ruby</herd>
   <upstream>
     <remote-id type="github">rspec/rspec</remote-id>
-    <remote-id type="rubyforge">rspec</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-ruby/ruby-atk/metadata.xml b/dev-ruby/ruby-atk/metadata.xml
index 988f164a9252..cb6c355eab54 100644
--- a/dev-ruby/ruby-atk/metadata.xml
+++ b/dev-ruby/ruby-atk/metadata.xml
@@ -4,5 +4,6 @@
 	<herd>ruby</herd>
 	<upstream>
 		<remote-id type="sourceforge-jp">ruby-gnome2</remote-id>
+		<remote-id type="sourceforge">ruby-gnome2</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-ruby/ruby-cairo-gobject/metadata.xml b/dev-ruby/ruby-cairo-gobject/metadata.xml
index 988f164a9252..cb6c355eab54 100644
--- a/dev-ruby/ruby-cairo-gobject/metadata.xml
+++ b/dev-ruby/ruby-cairo-gobject/metadata.xml
@@ -4,5 +4,6 @@
 	<herd>ruby</herd>
 	<upstream>
 		<remote-id type="sourceforge-jp">ruby-gnome2</remote-id>
+		<remote-id type="sourceforge">ruby-gnome2</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-ruby/ruby-clutter-gstreamer/metadata.xml b/dev-ruby/ruby-clutter-gstreamer/metadata.xml
index 988f164a9252..cb6c355eab54 100644
--- a/dev-ruby/ruby-clutter-gstreamer/metadata.xml
+++ b/dev-ruby/ruby-clutter-gstreamer/metadata.xml
@@ -4,5 +4,6 @@
 	<herd>ruby</herd>
 	<upstream>
 		<remote-id type="sourceforge-jp">ruby-gnome2</remote-id>
+		<remote-id type="sourceforge">ruby-gnome2</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-ruby/ruby-clutter-gtk/metadata.xml b/dev-ruby/ruby-clutter-gtk/metadata.xml
index 988f164a9252..cb6c355eab54 100644
--- a/dev-ruby/ruby-clutter-gtk/metadata.xml
+++ b/dev-ruby/ruby-clutter-gtk/metadata.xml
@@ -4,5 +4,6 @@
 	<herd>ruby</herd>
 	<upstream>
 		<remote-id type="sourceforge-jp">ruby-gnome2</remote-id>
+		<remote-id type="sourceforge">ruby-gnome2</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-ruby/ruby-clutter/metadata.xml b/dev-ruby/ruby-clutter/metadata.xml
index 988f164a9252..cb6c355eab54 100644
--- a/dev-ruby/ruby-clutter/metadata.xml
+++ b/dev-ruby/ruby-clutter/metadata.xml
@@ -4,5 +4,6 @@
 	<herd>ruby</herd>
 	<upstream>
 		<remote-id type="sourceforge-jp">ruby-gnome2</remote-id>
+		<remote-id type="sourceforge">ruby-gnome2</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-ruby/ruby-elf/metadata.xml b/dev-ruby/ruby-elf/metadata.xml
index c022b450a044..ea071df041e4 100644
--- a/dev-ruby/ruby-elf/metadata.xml
+++ b/dev-ruby/ruby-elf/metadata.xml
@@ -1,11 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>
 		<email>flameeyes@gentoo.org</email>
 	</maintainer>
 	<upstream>
-		<remote-id type="rubyforge">ruby-elf</remote-id>
 		<remote-id type="github">Flameeyes/ruby-elf</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-ruby/ruby-filemagic/metadata.xml b/dev-ruby/ruby-filemagic/metadata.xml
index cc9fcb2608d5..fbb82768b4d1 100644
--- a/dev-ruby/ruby-filemagic/metadata.xml
+++ b/dev-ruby/ruby-filemagic/metadata.xml
@@ -4,6 +4,5 @@
 	<herd>ruby</herd>
 	<upstream>
 		<remote-id type="github">blackwinter/ruby-filemagic</remote-id>
-		<remote-id type="rubyforge">ruby-filemagic</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-ruby/ruby-gdk3/metadata.xml b/dev-ruby/ruby-gdk3/metadata.xml
index 988f164a9252..cb6c355eab54 100644
--- a/dev-ruby/ruby-gdk3/metadata.xml
+++ b/dev-ruby/ruby-gdk3/metadata.xml
@@ -4,5 +4,6 @@
 	<herd>ruby</herd>
 	<upstream>
 		<remote-id type="sourceforge-jp">ruby-gnome2</remote-id>
+		<remote-id type="sourceforge">ruby-gnome2</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-ruby/ruby-gdkpixbuf2/metadata.xml b/dev-ruby/ruby-gdkpixbuf2/metadata.xml
index 988f164a9252..cb6c355eab54 100644
--- a/dev-ruby/ruby-gdkpixbuf2/metadata.xml
+++ b/dev-ruby/ruby-gdkpixbuf2/metadata.xml
@@ -4,5 +4,6 @@
 	<herd>ruby</herd>
 	<upstream>
 		<remote-id type="sourceforge-jp">ruby-gnome2</remote-id>
+		<remote-id type="sourceforge">ruby-gnome2</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-ruby/ruby-gio2/metadata.xml b/dev-ruby/ruby-gio2/metadata.xml
index a43ed6deba51..1fba4d730f46 100644
--- a/dev-ruby/ruby-gio2/metadata.xml
+++ b/dev-ruby/ruby-gio2/metadata.xml
@@ -7,5 +7,6 @@
   </maintainer>
   <upstream>
     <remote-id type="sourceforge-jp">ruby-gnome2</remote-id>
+    <remote-id type="sourceforge">ruby-gnome2</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-ruby/ruby-glib2/metadata.xml b/dev-ruby/ruby-glib2/metadata.xml
index 988f164a9252..cb6c355eab54 100644
--- a/dev-ruby/ruby-glib2/metadata.xml
+++ b/dev-ruby/ruby-glib2/metadata.xml
@@ -4,5 +4,6 @@
 	<herd>ruby</herd>
 	<upstream>
 		<remote-id type="sourceforge-jp">ruby-gnome2</remote-id>
+		<remote-id type="sourceforge">ruby-gnome2</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-ruby/ruby-gobject-introspection/metadata.xml b/dev-ruby/ruby-gobject-introspection/metadata.xml
index 988f164a9252..cb6c355eab54 100644
--- a/dev-ruby/ruby-gobject-introspection/metadata.xml
+++ b/dev-ruby/ruby-gobject-introspection/metadata.xml
@@ -4,5 +4,6 @@
 	<herd>ruby</herd>
 	<upstream>
 		<remote-id type="sourceforge-jp">ruby-gnome2</remote-id>
+		<remote-id type="sourceforge">ruby-gnome2</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-ruby/ruby-gstreamer/metadata.xml b/dev-ruby/ruby-gstreamer/metadata.xml
index 8e076071296d..c0e279a8075f 100644
--- a/dev-ruby/ruby-gstreamer/metadata.xml
+++ b/dev-ruby/ruby-gstreamer/metadata.xml
@@ -5,5 +5,6 @@
 	<herd>gstreamer</herd>
 	<upstream>
 		<remote-id type="sourceforge-jp">ruby-gnome2</remote-id>
+		<remote-id type="sourceforge">ruby-gnome2</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-ruby/ruby-gtk2/metadata.xml b/dev-ruby/ruby-gtk2/metadata.xml
index 988f164a9252..cb6c355eab54 100644
--- a/dev-ruby/ruby-gtk2/metadata.xml
+++ b/dev-ruby/ruby-gtk2/metadata.xml
@@ -4,5 +4,6 @@
 	<herd>ruby</herd>
 	<upstream>
 		<remote-id type="sourceforge-jp">ruby-gnome2</remote-id>
+		<remote-id type="sourceforge">ruby-gnome2</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-ruby/ruby-gtk3/metadata.xml b/dev-ruby/ruby-gtk3/metadata.xml
index 988f164a9252..cb6c355eab54 100644
--- a/dev-ruby/ruby-gtk3/metadata.xml
+++ b/dev-ruby/ruby-gtk3/metadata.xml
@@ -4,5 +4,6 @@
 	<herd>ruby</herd>
 	<upstream>
 		<remote-id type="sourceforge-jp">ruby-gnome2</remote-id>
+		<remote-id type="sourceforge">ruby-gnome2</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-ruby/ruby-gtksourceview/metadata.xml b/dev-ruby/ruby-gtksourceview/metadata.xml
index 988f164a9252..cb6c355eab54 100644
--- a/dev-ruby/ruby-gtksourceview/metadata.xml
+++ b/dev-ruby/ruby-gtksourceview/metadata.xml
@@ -4,5 +4,6 @@
 	<herd>ruby</herd>
 	<upstream>
 		<remote-id type="sourceforge-jp">ruby-gnome2</remote-id>
+		<remote-id type="sourceforge">ruby-gnome2</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-ruby/ruby-gtksourceview3/metadata.xml b/dev-ruby/ruby-gtksourceview3/metadata.xml
index 988f164a9252..cb6c355eab54 100644
--- a/dev-ruby/ruby-gtksourceview3/metadata.xml
+++ b/dev-ruby/ruby-gtksourceview3/metadata.xml
@@ -4,5 +4,6 @@
 	<herd>ruby</herd>
 	<upstream>
 		<remote-id type="sourceforge-jp">ruby-gnome2</remote-id>
+		<remote-id type="sourceforge">ruby-gnome2</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-ruby/ruby-hmac/metadata.xml b/dev-ruby/ruby-hmac/metadata.xml
index 4a97db684eb5..9d6e8da2d7db 100644
--- a/dev-ruby/ruby-hmac/metadata.xml
+++ b/dev-ruby/ruby-hmac/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ruby</herd>
-	<upstream>
-		<remote-id type="rubyforge">ruby-hmac</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/dev-ruby/ruby-mp3info/metadata.xml b/dev-ruby/ruby-mp3info/metadata.xml
index ee34f224952f..fd993e726bf3 100644
--- a/dev-ruby/ruby-mp3info/metadata.xml
+++ b/dev-ruby/ruby-mp3info/metadata.xml
@@ -4,6 +4,5 @@
   <herd>ruby</herd>
   <upstream>
     <remote-id type="github">moumar/ruby-mp3info</remote-id>
-    <remote-id type="rubyforge">ruby-mp3info</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-ruby/ruby-oci8/metadata.xml b/dev-ruby/ruby-oci8/metadata.xml
index 54219f5c30ef..cace519d1219 100644
--- a/dev-ruby/ruby-oci8/metadata.xml
+++ b/dev-ruby/ruby-oci8/metadata.xml
@@ -9,7 +9,6 @@
 	</maintainer>
 	<longdescription>Oracle Interface for Ruby, compatible with oracle 8, 9i, 10g and 11g.</longdescription>
 	<upstream>
-		<remote-id type="rubyforge">ruby-oci8</remote-id>
 		<remote-id type="rubygems">ruby-oci8</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-ruby/ruby-opengl/metadata.xml b/dev-ruby/ruby-opengl/metadata.xml
index dbee9a6d43dc..bbd5d2d841f4 100644
--- a/dev-ruby/ruby-opengl/metadata.xml
+++ b/dev-ruby/ruby-opengl/metadata.xml
@@ -4,6 +4,5 @@
   <herd>ruby</herd>
   <upstream>
     <remote-id type="github">larskanis/opengl</remote-id>
-    <remote-id type="rubyforge">ruby-opengl</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-ruby/ruby-openid/metadata.xml b/dev-ruby/ruby-openid/metadata.xml
index f2d1da753dff..dc0e5b74a9b4 100644
--- a/dev-ruby/ruby-openid/metadata.xml
+++ b/dev-ruby/ruby-openid/metadata.xml
@@ -4,6 +4,5 @@
   <herd>ruby</herd>
   <upstream>
     <remote-id type="github">openid/ruby-openid</remote-id>
-    <remote-id type="rubyforge">ruby-openid</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-ruby/ruby-pango/metadata.xml b/dev-ruby/ruby-pango/metadata.xml
index 988f164a9252..cb6c355eab54 100644
--- a/dev-ruby/ruby-pango/metadata.xml
+++ b/dev-ruby/ruby-pango/metadata.xml
@@ -4,5 +4,6 @@
 	<herd>ruby</herd>
 	<upstream>
 		<remote-id type="sourceforge-jp">ruby-gnome2</remote-id>
+		<remote-id type="sourceforge">ruby-gnome2</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-ruby/ruby-poppler/metadata.xml b/dev-ruby/ruby-poppler/metadata.xml
index 988f164a9252..cb6c355eab54 100644
--- a/dev-ruby/ruby-poppler/metadata.xml
+++ b/dev-ruby/ruby-poppler/metadata.xml
@@ -4,5 +4,6 @@
 	<herd>ruby</herd>
 	<upstream>
 		<remote-id type="sourceforge-jp">ruby-gnome2</remote-id>
+		<remote-id type="sourceforge">ruby-gnome2</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-ruby/ruby-rsvg/metadata.xml b/dev-ruby/ruby-rsvg/metadata.xml
index 988f164a9252..cb6c355eab54 100644
--- a/dev-ruby/ruby-rsvg/metadata.xml
+++ b/dev-ruby/ruby-rsvg/metadata.xml
@@ -4,5 +4,6 @@
 	<herd>ruby</herd>
 	<upstream>
 		<remote-id type="sourceforge-jp">ruby-gnome2</remote-id>
+		<remote-id type="sourceforge">ruby-gnome2</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-ruby/ruby-vte/metadata.xml b/dev-ruby/ruby-vte/metadata.xml
index 988f164a9252..cb6c355eab54 100644
--- a/dev-ruby/ruby-vte/metadata.xml
+++ b/dev-ruby/ruby-vte/metadata.xml
@@ -4,5 +4,6 @@
 	<herd>ruby</herd>
 	<upstream>
 		<remote-id type="sourceforge-jp">ruby-gnome2</remote-id>
+		<remote-id type="sourceforge">ruby-gnome2</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-ruby/ruby-vte3/metadata.xml b/dev-ruby/ruby-vte3/metadata.xml
index 988f164a9252..cb6c355eab54 100644
--- a/dev-ruby/ruby-vte3/metadata.xml
+++ b/dev-ruby/ruby-vte3/metadata.xml
@@ -4,5 +4,6 @@
 	<herd>ruby</herd>
 	<upstream>
 		<remote-id type="sourceforge-jp">ruby-gnome2</remote-id>
+		<remote-id type="sourceforge">ruby-gnome2</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-ruby/ruby-webkit-gtk/metadata.xml b/dev-ruby/ruby-webkit-gtk/metadata.xml
index 988f164a9252..cb6c355eab54 100644
--- a/dev-ruby/ruby-webkit-gtk/metadata.xml
+++ b/dev-ruby/ruby-webkit-gtk/metadata.xml
@@ -4,5 +4,6 @@
 	<herd>ruby</herd>
 	<upstream>
 		<remote-id type="sourceforge-jp">ruby-gnome2</remote-id>
+		<remote-id type="sourceforge">ruby-gnome2</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-ruby/ruby-webkit-gtk2/metadata.xml b/dev-ruby/ruby-webkit-gtk2/metadata.xml
index 988f164a9252..cb6c355eab54 100644
--- a/dev-ruby/ruby-webkit-gtk2/metadata.xml
+++ b/dev-ruby/ruby-webkit-gtk2/metadata.xml
@@ -4,5 +4,6 @@
 	<herd>ruby</herd>
 	<upstream>
 		<remote-id type="sourceforge-jp">ruby-gnome2</remote-id>
+		<remote-id type="sourceforge">ruby-gnome2</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-ruby/ruby-yadis/metadata.xml b/dev-ruby/ruby-yadis/metadata.xml
index 878f69261344..9d6e8da2d7db 100644
--- a/dev-ruby/ruby-yadis/metadata.xml
+++ b/dev-ruby/ruby-yadis/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ruby</herd>
-	<upstream>
-		<remote-id type="rubyforge">yadis</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/dev-ruby/ruby2ruby/metadata.xml b/dev-ruby/ruby2ruby/metadata.xml
index db24fab3978e..d82e96cd9bf8 100644
--- a/dev-ruby/ruby2ruby/metadata.xml
+++ b/dev-ruby/ruby2ruby/metadata.xml
@@ -4,6 +4,5 @@
   <herd>ruby</herd>
   <upstream>
     <remote-id type="github">seattlerb/ruby2ruby</remote-id>
-    <remote-id type="rubyforge">seattlerb</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-ruby/rubygems/metadata.xml b/dev-ruby/rubygems/metadata.xml
index 90fadbcaa2f1..bc82c8b2ac89 100644
--- a/dev-ruby/rubygems/metadata.xml
+++ b/dev-ruby/rubygems/metadata.xml
@@ -1,11 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ruby</herd>
 	<use>
 		<flag name="server">Install support for the rubygems server</flag>
 	</use>
-	<upstream>
-		<remote-id type="rubyforge">rubygems</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/dev-ruby/serialport/metadata.xml b/dev-ruby/serialport/metadata.xml
index a1ec01262245..9d6e8da2d7db 100644
--- a/dev-ruby/serialport/metadata.xml
+++ b/dev-ruby/serialport/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ruby</herd>
-	<upstream>
-		<remote-id type="rubyforge">ruby-serialport</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/dev-ruby/shorturl/metadata.xml b/dev-ruby/shorturl/metadata.xml
index 4c3096df65f1..9d6e8da2d7db 100644
--- a/dev-ruby/shorturl/metadata.xml
+++ b/dev-ruby/shorturl/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ruby</herd>
-	<upstream>
-		<remote-id type="rubyforge">shorturl</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/dev-ruby/simple-rss/metadata.xml b/dev-ruby/simple-rss/metadata.xml
index 0ddfcce1be7b..9d6e8da2d7db 100644
--- a/dev-ruby/simple-rss/metadata.xml
+++ b/dev-ruby/simple-rss/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ruby</herd>
-	<upstream>
-		<remote-id type="rubyforge">simple-rss</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/dev-ruby/snmplib/metadata.xml b/dev-ruby/snmplib/metadata.xml
index 19f35fd0c93e..9d6e8da2d7db 100644
--- a/dev-ruby/snmplib/metadata.xml
+++ b/dev-ruby/snmplib/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ruby</herd>
-	<upstream>
-		<remote-id type="rubyforge">snmplib</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/dev-ruby/sparklines/metadata.xml b/dev-ruby/sparklines/metadata.xml
index 1d55234ded00..9d6e8da2d7db 100644
--- a/dev-ruby/sparklines/metadata.xml
+++ b/dev-ruby/sparklines/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ruby</herd>
-	<upstream>
-		<remote-id type="rubyforge">sparklines</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/dev-ruby/sqlite3/metadata.xml b/dev-ruby/sqlite3/metadata.xml
index 09d19031df9a..0b4c472d8b1a 100644
--- a/dev-ruby/sqlite3/metadata.xml
+++ b/dev-ruby/sqlite3/metadata.xml
@@ -3,6 +3,6 @@
 <pkgmetadata>
 	<herd>ruby</herd>
 	<upstream>
-		<remote-id type="rubyforge">sqlite-ruby</remote-id>
+		<remote-id type="github">sparklemotion/sqlite3-ruby</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-ruby/syntax/metadata.xml b/dev-ruby/syntax/metadata.xml
index 430138baf37d..689bf306c6aa 100644
--- a/dev-ruby/syntax/metadata.xml
+++ b/dev-ruby/syntax/metadata.xml
@@ -4,6 +4,5 @@
   <herd>ruby</herd>
   <upstream>
     <remote-id type="github">dblock/syntax</remote-id>
-    <remote-id type="rubyforge">syntax</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-ruby/term-ansicolor/metadata.xml b/dev-ruby/term-ansicolor/metadata.xml
index 4689c980f307..9d6e8da2d7db 100644
--- a/dev-ruby/term-ansicolor/metadata.xml
+++ b/dev-ruby/term-ansicolor/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ruby</herd>
-	<upstream>
-		<remote-id type="rubyforge">term-ansicolor</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/dev-ruby/termcolor/metadata.xml b/dev-ruby/termcolor/metadata.xml
index 967f31eea736..321af5d5d498 100644
--- a/dev-ruby/termcolor/metadata.xml
+++ b/dev-ruby/termcolor/metadata.xml
@@ -5,7 +5,4 @@
   <maintainer>
     <email>naota@gentoo.org</email>
   </maintainer>
-  <upstream>
-    <remote-id type="rubyforge">termcolor</remote-id>
-  </upstream>
 </pkgmetadata>
diff --git a/dev-ruby/test-unit-rr/metadata.xml b/dev-ruby/test-unit-rr/metadata.xml
index 21809b83e19e..9d6e8da2d7db 100644
--- a/dev-ruby/test-unit-rr/metadata.xml
+++ b/dev-ruby/test-unit-rr/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ruby</herd>
-	<upstream>
-		<remote-id type="rubyforge">test-unit</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/dev-ruby/test-unit/metadata.xml b/dev-ruby/test-unit/metadata.xml
index 43e8895e6854..82492cff50c1 100644
--- a/dev-ruby/test-unit/metadata.xml
+++ b/dev-ruby/test-unit/metadata.xml
@@ -7,7 +7,6 @@
     1.8, compatible with Ruby 1.9.
   </longdescription>
   <upstream>
-    <remote-id type="rubyforge">test-unit</remote-id>
     <remote-id type="rubygems">test-unit</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-ruby/text-hyphen/metadata.xml b/dev-ruby/text-hyphen/metadata.xml
index eefcbeb6941a..9d6e8da2d7db 100644
--- a/dev-ruby/text-hyphen/metadata.xml
+++ b/dev-ruby/text-hyphen/metadata.xml
@@ -1,8 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ruby</herd>
-	<upstream>
-		<remote-id type="rubyforge">text-format</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/dev-ruby/textpow/metadata.xml b/dev-ruby/textpow/metadata.xml
index 43286cbda1df..fb4d26d634ca 100644
--- a/dev-ruby/textpow/metadata.xml
+++ b/dev-ruby/textpow/metadata.xml
@@ -4,6 +4,5 @@
   <herd>ruby</herd>
   <upstream>
     <remote-id type="github">grosser/textpow</remote-id>
-    <remote-id type="rubyforge">textpow</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-ruby/treetop/metadata.xml b/dev-ruby/treetop/metadata.xml
index 02e83a731b0f..c236da70d497 100644
--- a/dev-ruby/treetop/metadata.xml
+++ b/dev-ruby/treetop/metadata.xml
@@ -4,6 +4,5 @@
   <herd>ruby</herd>
   <upstream>
     <remote-id type="github">cjheath/treetop</remote-id>
-    <remote-id type="rubyforge">treetop</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-ruby/trollop/metadata.xml b/dev-ruby/trollop/metadata.xml
index 55e039a46fb4..9d6e8da2d7db 100644
--- a/dev-ruby/trollop/metadata.xml
+++ b/dev-ruby/trollop/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ruby</herd>
-	<upstream>
-		<remote-id type="rubyforge">trollop</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/dev-ruby/tzinfo/metadata.xml b/dev-ruby/tzinfo/metadata.xml
index 8a04fea12f04..9d6e8da2d7db 100644
--- a/dev-ruby/tzinfo/metadata.xml
+++ b/dev-ruby/tzinfo/metadata.xml
@@ -1,8 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ruby</herd>
-	<upstream>
-		<remote-id type="rubyforge">tzinfo</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/dev-ruby/uuidtools/metadata.xml b/dev-ruby/uuidtools/metadata.xml
index 3bb0bd79ccf3..0dca07e222e9 100644
--- a/dev-ruby/uuidtools/metadata.xml
+++ b/dev-ruby/uuidtools/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>ruby</herd>
@@ -6,7 +6,6 @@
     time-based or random data. It conforms to RFC 4122 whenever
     possible.</longdescription>
   <upstream>
-    <remote-id type="rubyforge">uuidtools</remote-id>
     <remote-id type="github">sporkmonger/uuidtools</remote-id>
   </upstream>
 </pkgmetadata>
-- 
cgit v1.2.3-65-gdbad