Add upstream remote-id annotations using tools by Corentin Chary, bug #406287.

27 files changed, 159 insertions, 90 deletions

diff --git a/dev-util/App-SVN-Bisect/metadata.xml b/dev-util/App-SVN-Bisect/metadata.xml
index 09ddbff14dbf..028fc2d80854 100644
--- a/dev-util/App-SVN-Bisect/metadata.xml
+++ b/dev-util/App-SVN-Bisect/metadata.xml
@@ -5,4 +5,7 @@
 		<email>floppym@gentoo.org</email>
 		<name>Mike Gilbert</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="cpan">App-SVN-Bisect</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-util/a8/metadata.xml b/dev-util/a8/metadata.xml
index c2d865517c00..aa879c91c635 100644
--- a/dev-util/a8/metadata.xml
+++ b/dev-util/a8/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
-    <email>ssuominen@gentoo.org</email>
-    <name>Samuli Suominen</name>
-  </maintainer>
+	<maintainer>
+		<email>ssuominen@gentoo.org</email>
+		<name>Samuli Suominen</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">a8</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-util/autodia/metadata.xml b/dev-util/autodia/metadata.xml
index 801e9385a1e0..47eb7f5c89b9 100644
--- a/dev-util/autodia/metadata.xml
+++ b/dev-util/autodia/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>perl</herd>
+	<upstream>
+		<remote-id type="cpan">autodia</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-util/buildbot-slave/metadata.xml b/dev-util/buildbot-slave/metadata.xml
index 301d2207cc29..e396c07bc458 100644
--- a/dev-util/buildbot-slave/metadata.xml
+++ b/dev-util/buildbot-slave/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>python</herd>
+	<upstream>
+		<remote-id type="pypi">buildbot-slave</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-util/buildbot/metadata.xml b/dev-util/buildbot/metadata.xml
index 75006bad5c76..395b53504846 100644
--- a/dev-util/buildbot/metadata.xml
+++ b/dev-util/buildbot/metadata.xml
@@ -1,15 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
-  <maintainer>
-    <email>dustin@v.igoro.us</email>
-    <name>Dustin J. Mitchell</name>
-  </maintainer>
-  <longdescription lang="en">
-    The BuildBot is a system to automate the compile/test cycle required
+	<herd>python</herd>
+	<maintainer>
+		<email>dustin@v.igoro.us</email>
+		<name>Dustin J. Mitchell</name>
+	</maintainer>
+	<longdescription lang="en">The BuildBot is a system to automate the compile/test cycle required
     by most software projects to validate code changes.
-
     Features:
       * run builds on a variety of slave platforms
       * arbitrary build process: handles projects using C, Python, whatever
@@ -20,11 +18,13 @@
       * flexible configuration by subclassing generic build process classes
       * debug tools to force a new build, submit fake Changes, query slave
         status
-      * released under the GPL
-  </longdescription>
-  <use>
-    <flag name="irc">Add support for status delivery through an ircbot.</flag>
-    <flag name="mail">Add support for watching a maildir for commits.</flag>
-    <flag name="manhole">Add support for manhole (debug over ssh)</flag>
-  </use>
+      * released under the GPL</longdescription>
+	<use>
+		<flag name="irc">Add support for status delivery through an ircbot.</flag>
+		<flag name="mail">Add support for watching a maildir for commits.</flag>
+		<flag name="manhole">Add support for manhole (debug over ssh)</flag>
+	</use>
+	<upstream>
+		<remote-id type="pypi">buildbot</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-util/bunny/metadata.xml b/dev-util/bunny/metadata.xml
index 1470e032181b..511841d32339 100644
--- a/dev-util/bunny/metadata.xml
+++ b/dev-util/bunny/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
-    <email>maintainer-needed@gentoo.org</email>
-  </maintainer>
+	<maintainer>
+		<email>maintainer-needed@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="google-code">bunny-the-fuzzer</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-util/cmockery/metadata.xml b/dev-util/cmockery/metadata.xml
index 157326a7e891..8415e036958b 100644
--- a/dev-util/cmockery/metadata.xml
+++ b/dev-util/cmockery/metadata.xml
@@ -5,4 +5,7 @@
 		<email>radhermit@gentoo.org</email>
 		<name>Tim Harder</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="google-code">cmockery</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-util/crow-designer/metadata.xml b/dev-util/crow-designer/metadata.xml
index 1fb58e8482a4..e604e3026d41 100644
--- a/dev-util/crow-designer/metadata.xml
+++ b/dev-util/crow-designer/metadata.xml
@@ -5,15 +5,15 @@
 		<email>pva@gentoo.org</email>
 		<name>Peter Volkov</name>
 	</maintainer>
-	<longdescription lang="en">
-		Gideon is a modern GUI builder for GTK+ toolkit. It is an advanced
+	<longdescription lang="en">Gideon is a modern GUI builder for GTK+ toolkit. It is an advanced
 		IDE-embeddable RAD tool designed to fulfil l the needs of desktop
 		programmers who want to create multi-platform GTK+ based applications
 		with minimal GUI coding. Gideon is full-featured yet elegant: its
 		innovative Property Explorer solves many GUI constructing t asks in a
 		versatile manner without additional popup dialogs. The project is
 		targeted to develop a tool that i s coherent and highly productive for
-		experienced GTK+ users as well as simple and accessible for newcomers.
-	</longdescription>
+		experienced GTK+ users as well as simple and accessible for newcomers.</longdescription>
+	<upstream>
+		<remote-id type="google-code">nothing-personal</remote-id>
+	</upstream>
 </pkgmetadata>
-
diff --git a/dev-util/diffball/metadata.xml b/dev-util/diffball/metadata.xml
index 2cc0f121b531..01ca7a8214a8 100644
--- a/dev-util/diffball/metadata.xml
+++ b/dev-util/diffball/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-	<email>ferringb@gentoo.org</email>
-</maintainer>
+	<maintainer>
+		<email>ferringb@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="google-code">diffball</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-util/dissy/metadata.xml b/dev-util/dissy/metadata.xml
index ac0190544344..ca52a54a40ac 100644
--- a/dev-util/dissy/metadata.xml
+++ b/dev-util/dissy/metadata.xml
@@ -4,9 +4,9 @@
 	<maintainer>
 		<email>maintainer-needed@gentoo.org</email>
 	</maintainer>
-	<longdescription lang="en">
-		Dissy is a graphical frontend to the objdump disassembler. Dissy 
-		can be used for debugging and browsing compiler-generated code.
-	</longdescription>
+	<longdescription lang="en">Dissy is a graphical frontend to the objdump disassembler. Dissy 
+		can be used for debugging and browsing compiler-generated code.</longdescription>
+	<upstream>
+		<remote-id type="google-code">dissy</remote-id>
+	</upstream>
 </pkgmetadata>
-
diff --git a/dev-util/eggy/metadata.xml b/dev-util/eggy/metadata.xml
index 46f151f3da59..0331b9cec70b 100644
--- a/dev-util/eggy/metadata.xml
+++ b/dev-util/eggy/metadata.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>qt</herd>
+	<herd>qt</herd>
+	<upstream>
+		<remote-id type="google-code">eggy</remote-id>
+	</upstream>
 </pkgmetadata>
-
diff --git a/dev-util/gource/metadata.xml b/dev-util/gource/metadata.xml
index 8591f1164eaf..e5899c3cfa8d 100644
--- a/dev-util/gource/metadata.xml
+++ b/dev-util/gource/metadata.xml
@@ -1,12 +1,15 @@
 <?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>
-  <maintainer>
-    <email>enrico.tagliavini@gmail.com</email>
-    <name>Enrico Tagliavini</name>
-    <description>Proxied co-maintainer</description>
-  </maintainer>
+	<maintainer>
+		<email>flameeyes@gentoo.org</email>
+	</maintainer>
+	<maintainer>
+		<email>enrico.tagliavini@gmail.com</email>
+		<name>Enrico Tagliavini</name>
+		<description>Proxied co-maintainer</description>
+	</maintainer>
+	<upstream>
+		<remote-id type="google-code">gource</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-util/mdds/metadata.xml b/dev-util/mdds/metadata.xml
index 5d46203011d6..4409d6128912 100644
--- a/dev-util/mdds/metadata.xml
+++ b/dev-util/mdds/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>openoffice</herd>
+	<upstream>
+		<remote-id type="google-code">multidimalgorithm</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-util/pida/metadata.xml b/dev-util/pida/metadata.xml
index 301d2207cc29..42c241eb0463 100644
--- a/dev-util/pida/metadata.xml
+++ b/dev-util/pida/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>python</herd>
+	<upstream>
+		<remote-id type="pypi">pida</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-util/pkgcore-checks/metadata.xml b/dev-util/pkgcore-checks/metadata.xml
index 301d2207cc29..9091fb7a436c 100644
--- a/dev-util/pkgcore-checks/metadata.xml
+++ b/dev-util/pkgcore-checks/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>python</herd>
+	<upstream>
+		<remote-id type="google-code">pkgcore-checks</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-util/shflags/metadata.xml b/dev-util/shflags/metadata.xml
index 0e35ff752835..b314e392fd19 100644
--- a/dev-util/shflags/metadata.xml
+++ b/dev-util/shflags/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>shell-tools</herd>
-<maintainer>
- <email>vapier@gentoo.org</email>
-</maintainer>
+	<herd>shell-tools</herd>
+	<maintainer>
+		<email>vapier@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="google-code">shflags</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-util/shunit2/metadata.xml b/dev-util/shunit2/metadata.xml
index be9d8cbf861d..800122e2b704 100644
--- a/dev-util/shunit2/metadata.xml
+++ b/dev-util/shunit2/metadata.xml
@@ -1,14 +1,15 @@
-<?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>dberkholz@gentoo.org</email>
-    <name>Donnie Berkholz</name>
-  </maintainer>
-  <longdescription>
-  	shUnit2 is a xUnit unit test framework for Bourne based shell scripts, and
+	<maintainer>
+		<email>dberkholz@gentoo.org</email>
+		<name>Donnie Berkholz</name>
+	</maintainer>
+	<longdescription>shUnit2 is a xUnit unit test framework for Bourne based shell scripts, and
   	it is designed to work in a similar manner to JUnit, PyUnit, etc. If you
   	have ever had the desire to write a unit test for a shell script, shUnit2
-  	can do the job.
-  </longdescription>
+  	can do the job.</longdescription>
+	<upstream>
+		<remote-id type="google-code">shunit2</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-util/skipfish/metadata.xml b/dev-util/skipfish/metadata.xml
index 1470e032181b..cf97bd0acb2a 100644
--- a/dev-util/skipfish/metadata.xml
+++ b/dev-util/skipfish/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
-    <email>maintainer-needed@gentoo.org</email>
-  </maintainer>
+	<maintainer>
+		<email>maintainer-needed@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="google-code">skipfish</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-util/xdelta/metadata.xml b/dev-util/xdelta/metadata.xml
index 91f4e72fb544..f45a296b7e1f 100644
--- a/dev-util/xdelta/metadata.xml
+++ b/dev-util/xdelta/metadata.xml
@@ -4,4 +4,7 @@
 	<maintainer>
 		<email>maintainer-needed@gentoo.org</email>
 	</maintainer>
+	<upstream>
+		<remote-id type="google-code">xdelta</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-vcs/hg-git/metadata.xml b/dev-vcs/hg-git/metadata.xml
index 0f76041caa31..6a46e8d449e3 100644
--- a/dev-vcs/hg-git/metadata.xml
+++ b/dev-vcs/hg-git/metadata.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
-    <email>djc@gentoo.org</email>
-    <name>Dirkjan Ochtman</name>
-  </maintainer>
-  <maintainer>
-    <email>grobian@gentoo.org</email>
-    <name>Fabian Groffen</name>
-  </maintainer>
+	<maintainer>
+		<email>djc@gentoo.org</email>
+		<name>Dirkjan Ochtman</name>
+	</maintainer>
+	<maintainer>
+		<email>grobian@gentoo.org</email>
+		<name>Fabian Groffen</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">hg-git</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-vcs/hgsubversion/metadata.xml b/dev-vcs/hgsubversion/metadata.xml
index 0b4a8d1ce384..8e37a166deca 100644
--- a/dev-vcs/hgsubversion/metadata.xml
+++ b/dev-vcs/hgsubversion/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>python</herd>
-  <maintainer>
-    <email>djc@gentoo.org</email>
-    <name>Dirkjan Ochtman</name>
-  </maintainer>
+	<herd>python</herd>
+	<maintainer>
+		<email>djc@gentoo.org</email>
+		<name>Dirkjan Ochtman</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">hgsubversion</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-vcs/hgsvn/metadata.xml b/dev-vcs/hgsvn/metadata.xml
index 625a8a255a59..76b3fd632d2a 100644
--- a/dev-vcs/hgsvn/metadata.xml
+++ b/dev-vcs/hgsvn/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-  <email>cedk@gentoo.org</email>
-</maintainer>
-<longdescription>A set of scripts to work locally on Subversion checkouts using Mercurial</longdescription>
+	<maintainer>
+		<email>cedk@gentoo.org</email>
+	</maintainer>
+	<longdescription>A set of scripts to work locally on Subversion checkouts using Mercurial</longdescription>
+	<upstream>
+		<remote-id type="pypi">hgsvn</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-vcs/svk/metadata.xml b/dev-vcs/svk/metadata.xml
index e1b15fee9842..8794899a491a 100644
--- a/dev-vcs/svk/metadata.xml
+++ b/dev-vcs/svk/metadata.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-  <email>maintainer-needed@gentoo.org</email>
-</maintainer>
-<use>
-  <flag name="log4p">Enable perl logger support</flag>
-  <flag name="pager">Enable perl pager selection support</flag>
-  <flag name="patch">Enable patch creation, import support</flag>
-</use>
+	<maintainer>
+		<email>maintainer-needed@gentoo.org</email>
+	</maintainer>
+	<use>
+		<flag name="log4p">Enable perl logger support</flag>
+		<flag name="pager">Enable perl pager selection support</flag>
+		<flag name="patch">Enable patch creation, import support</flag>
+	</use>
+	<upstream>
+		<remote-id type="cpan">svk</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/games-action/violetland/metadata.xml b/games-action/violetland/metadata.xml
index d3c2cc926f0b..039266550caf 100644
--- a/games-action/violetland/metadata.xml
+++ b/games-action/violetland/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+	<herd>games</herd>
+	<upstream>
+		<remote-id type="google-code">violetland</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/games-board/gmchess/metadata.xml b/games-board/gmchess/metadata.xml
index f72870c0c28d..d74c0a868c5b 100644
--- a/games-board/gmchess/metadata.xml
+++ b/games-board/gmchess/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>games</herd>
+	<herd>games</herd>
+	<upstream>
+		<remote-id type="google-code">gmchess</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/games-board/pychess/metadata.xml b/games-board/pychess/metadata.xml
index d3c2cc926f0b..19399130691b 100644
--- a/games-board/pychess/metadata.xml
+++ b/games-board/pychess/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+	<herd>games</herd>
+	<upstream>
+		<remote-id type="google-code">pychess</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/games-board/qcheckers/metadata.xml b/games-board/qcheckers/metadata.xml
index d3c2cc926f0b..3b41977892d3 100644
--- a/games-board/qcheckers/metadata.xml
+++ b/games-board/qcheckers/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>games</herd>
+	<herd>games</herd>
+	<upstream>
+		<remote-id type="google-code">qcheckers</remote-id>
+	</upstream>
 </pkgmetadata>