23 files changed, 71 insertions, 128 deletions
diff --git a/app-benchmarks/btl/ChangeLog b/app-benchmarks/btl/ChangeLog
index ea8c75791..978091101 100644
--- a/app-benchmarks/btl/ChangeLog
+++ b/app-benchmarks/btl/ChangeLog
@@ -1,7 +1,10 @@
 # ChangeLog for app-benchmarks/btl
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  07 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  app-benchmarks/btl: Add bitbucket to remote-id in metadata.xml
+
   14 Jun 2013; Justin Lecher <jlec@gentoo.org> btl-9999.ebuild, metadata.xml:
   Bump to EAPI=5 and drop KEYWORDS of live ebuilds
 
diff --git a/app-benchmarks/btl/metadata.xml b/app-benchmarks/btl/metadata.xml
index 51688ab86..3a7222f06 100644
--- a/app-benchmarks/btl/metadata.xml
+++ b/app-benchmarks/btl/metadata.xml
@@ -8,4 +8,7 @@
     <description>Bench Template Library</description>
   </maintainer>
   <longdescription>This package contains a modified copy of the BTL.</longdescription>
+  <upstream>
+    <remote-id type="bitbucket">spiros/btl</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/app-misc/aa/ChangeLog b/app-misc/aa/ChangeLog
deleted file mode 100644
index e1e42cb39..000000000
--- a/app-misc/aa/ChangeLog
+++ /dev/null
@@ -1,11 +0,0 @@
-# ChangeLog for app-misc/aa
-# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: $
-
-  24 May 2015; Justin Lecher <jlec@gentoo.org> aa-0.ebuild:
-  app-misc/aa: Fix usage
-
-*aa-0 (24 May 2015)
-
-  24 May 2015; Justin Lecher <jlec@gentoo.org> +aa-0.ebuild, +metadata.xml:
-  app-misc/aa: Dummy package
diff --git a/app-misc/aa/aa-0.ebuild b/app-misc/aa/aa-0.ebuild
deleted file mode 100644
index 142e1c7a6..000000000
--- a/app-misc/aa/aa-0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-inherit alternatives-2
-
-DESCRIPTION="AA"
-HOMEPAGE="http://www.gentoo.org"
-SRC_URI=""
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-"
-
-S="${WORKDIR}"
-
-src_install() {
-	cat > aa <<- EOF
-	#!/bin/bash
-	echo "aa"
-	EOF
-
-	dobin aa
-
-	alternatives_for alternatives-2 aa 0 /usr/bin/alternatives aa
-}
diff --git a/app-misc/aa/metadata.xml b/app-misc/aa/metadata.xml
deleted file mode 100644
index 7bc6ee8ea..000000000
--- a/app-misc/aa/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer>
-    <email>jlec@gentoo.org</email>
-    <name>Justin Lecher</name>
-  </maintainer>
-</pkgmetadata>
diff --git a/app-misc/bb/ChangeLog b/app-misc/bb/ChangeLog
deleted file mode 100644
index 9b385c022..000000000
--- a/app-misc/bb/ChangeLog
+++ /dev/null
@@ -1,11 +0,0 @@
-# ChangeLog for app-misc/bb
-# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: $
-
-  24 May 2015; Justin Lecher <jlec@gentoo.org> bb-0.ebuild:
-  app-misc/bb: Fix usage
-
-*bb-0 (24 May 2015)
-
-  24 May 2015; Justin Lecher <jlec@gentoo.org> +bb-0.ebuild, +metadata.xml:
-  app-misc/bb: Dummy package
diff --git a/app-misc/bb/bb-0.ebuild b/app-misc/bb/bb-0.ebuild
deleted file mode 100644
index befb22737..000000000
--- a/app-misc/bb/bb-0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-inherit alternatives-2
-
-DESCRIPTION="BB"
-HOMEPAGE="http://www.gentoo.org"
-SRC_URI=""
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-"
-
-S="${WORKDIR}"
-
-src_install() {
-	cat > bb <<- EOF
-	#!/bin/bash
-	echo "bb"
-	EOF
-
-	dobin bb
-
-	alternatives_for alternatives-2 bb 0 /usr/bin/alternatives aa
-}
diff --git a/app-misc/bb/metadata.xml b/app-misc/bb/metadata.xml
deleted file mode 100644
index 7bc6ee8ea..000000000
--- a/app-misc/bb/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer>
-    <email>jlec@gentoo.org</email>
-    <name>Justin Lecher</name>
-  </maintainer>
-</pkgmetadata>
diff --git a/dev-ml/gsl-ocaml/ChangeLog b/dev-ml/gsl-ocaml/ChangeLog
index c724b6d0c..069753b13 100644
--- a/dev-ml/gsl-ocaml/ChangeLog
+++ b/dev-ml/gsl-ocaml/ChangeLog
@@ -1,10 +1,15 @@
 # ChangeLog for dev-ml/gsl-ocaml
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  07 Jun 2015; Justin Lecher <jlec@gentoo.org> gsl-ocaml-1.10.2.ebuild:
+  dev-ml/gsl-ocaml: Bump EAPI=5
+
+  07 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  dev-ml/gsl-ocaml: Add bitbucket to remote-id in metadata.xml
+
 *gsl-ocaml-1.10.2 (11 Aug 2012)
 
   11 Aug 2012; Guillaume Horel <guillaume.horel@gmail.com>
   +gsl-ocaml-1.10.2.ebuild, +metadata.xml:
   new package from #390583
-
diff --git a/dev-ml/gsl-ocaml/gsl-ocaml-1.10.2.ebuild b/dev-ml/gsl-ocaml/gsl-ocaml-1.10.2.ebuild
index 379d48fb7..c2568388d 100644
--- a/dev-ml/gsl-ocaml/gsl-ocaml-1.10.2.ebuild
+++ b/dev-ml/gsl-ocaml/gsl-ocaml-1.10.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 OASIS_BUILD_DOCS=1
 OASIS_BUILD_TESTS=1
@@ -21,7 +21,7 @@ IUSE="examples test"
 DEPEND=">=sci-libs/gsl-1.10"
 RDEPEND="${DEPEND}"
 
-DOCS=( "CHANGES.txt" "README.md" "NOTES.md" "TODO.md" )
+DOCS=( CHANGES.txt README.md NOTES.md TODO.md )
 
 src_prepare() {
 	oasis_configure_opts="$(use_enable examples)"
diff --git a/dev-ml/gsl-ocaml/metadata.xml b/dev-ml/gsl-ocaml/metadata.xml
index f7b1637ca..8a2bb7bd7 100644
--- a/dev-ml/gsl-ocaml/metadata.xml
+++ b/dev-ml/gsl-ocaml/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>sci</herd>
-<longdescription lang='en'>
+  <herd>sci</herd>
+  <longdescription lang="en">
 GSL interface for OCaml
 </longdescription>
+  <upstream>
+    <remote-id type="bitbucket">mmottl/gsl-ocaml</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-python/ffc/ChangeLog b/dev-python/ffc/ChangeLog
index 37662b34f..07f0f2629 100644
--- a/dev-python/ffc/ChangeLog
+++ b/dev-python/ffc/ChangeLog
@@ -1,7 +1,10 @@
 # ChangeLog for dev-python/ffc
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  07 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  dev-python/ffc: Add bitbucket to remote-id in metadata.xml
+
   16 Jul 2014; Andrew Reisner <andrew@reisner.co> ffc-1.3.0.ebuild:
   fixed dependency issue
 
diff --git a/dev-python/ffc/metadata.xml b/dev-python/ffc/metadata.xml
index 34821f2af..893659eac 100644
--- a/dev-python/ffc/metadata.xml
+++ b/dev-python/ffc/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
-  <longdescription lang="en">
+	<herd>sci</herd>
+	<longdescription lang="en">
 		FFC works as a compiler for multilinear forms by generating code (C or
 		C++) for the evaluation of a multilinear form given in mathematical
 		notation. This new approach to form evaluation makes it possible to
@@ -10,4 +10,7 @@
 		mathematical notation and the generated code is as efficient as
 		hand-optimized code.
    </longdescription>
+	<upstream>
+		<remote-id type="bitbucket">fenics-project/ffc</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/fiat/ChangeLog b/dev-python/fiat/ChangeLog
index 26d00d366..2c71ff6ce 100644
--- a/dev-python/fiat/ChangeLog
+++ b/dev-python/fiat/ChangeLog
@@ -1,7 +1,10 @@
 # ChangeLog for dev-python/fiat
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  07 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  dev-python/fiat: Add bitbucket to remote-id in metadata.xml
+
   16 Jul 2014; Andrew Reisner <andrew@reisner.co> fiat-1.3.0.ebuild,
   fiat-1.4.0.ebuild:
   Added keyword
diff --git a/dev-python/fiat/metadata.xml b/dev-python/fiat/metadata.xml
index a67ae626b..b9c29fa54 100644
--- a/dev-python/fiat/metadata.xml
+++ b/dev-python/fiat/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
-  <longdescription lang="en">
+	<herd>sci</herd>
+	<longdescription lang="en">
 		The FInite element Automatic Tabulator FIAT supports generation of
 		arbitrary order instances of the Lagrange elements on lines, triangles,
 		and tetrahedra. It is also capable of generating arbitrary order
@@ -12,4 +12,7 @@
 		supported on triangles and tetrahedra. Upcoming versions will also
 		support Hermite and nonconforming elements.
 	</longdescription>
+	<upstream>
+		<remote-id type="bitbucket">fenics-project/fiat</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/instant/ChangeLog b/dev-python/instant/ChangeLog
index af28b7f08..722f6f1b9 100644
--- a/dev-python/instant/ChangeLog
+++ b/dev-python/instant/ChangeLog
@@ -1,7 +1,10 @@
 # ChangeLog for dev-python/instant
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  07 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  dev-python/instant: Add bitbucket to remote-id in metadata.xml
+
 *instant-1.3.0 (16 Jul 2014)
 *instant-1.4.0 (16 Jul 2014)
 
diff --git a/dev-python/instant/metadata.xml b/dev-python/instant/metadata.xml
index c446ffa73..37fa71c43 100644
--- a/dev-python/instant/metadata.xml
+++ b/dev-python/instant/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
-  <longdescription lang="en">
+	<herd>sci</herd>
+	<longdescription lang="en">
 		Instant is a Python module that allows for instant inlining of C and C++
 		code in Python. It is a small Python module built on top of SWIG and
 		Distutils. It is part of the FEniCS Project (http://www.fenics.org)
 	</longdescription>
+	<upstream>
+		<remote-id type="bitbucket">fenics-project/instant</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/ufl/ChangeLog b/dev-python/ufl/ChangeLog
index 135766527..1685c46b3 100644
--- a/dev-python/ufl/ChangeLog
+++ b/dev-python/ufl/ChangeLog
@@ -1,7 +1,10 @@
 # ChangeLog for dev-python/ufl
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  07 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  dev-python/ufl: Add bitbucket to remote-id in metadata.xml
+
 *ufl-1.3.0 (16 Jul 2014)
 *ufl-1.4.0 (16 Jul 2014)
 
diff --git a/dev-python/ufl/metadata.xml b/dev-python/ufl/metadata.xml
index c1c80201a..ddf216c08 100644
--- a/dev-python/ufl/metadata.xml
+++ b/dev-python/ufl/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
-  <longdescription lang="en">
+	<herd>sci</herd>
+	<longdescription lang="en">
 		The Unified Form Language (UFL) is a domain specific language for
 		declaration of finite element discretizations of variational forms. More
 		precisely, it defines a flexible interface for choosing finite element
@@ -12,4 +12,7 @@
 	<use>
 		<flag name="scipy">Adds support for evaluating Bessel functions using <pkg>dev-python/scipy</pkg></flag>
 	</use>
+	<upstream>
+		<remote-id type="bitbucket">fenics-project/ufl</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sci-biology/bx-python/ChangeLog b/sci-biology/bx-python/ChangeLog
index 87a323962..6c3346626 100644
--- a/sci-biology/bx-python/ChangeLog
+++ b/sci-biology/bx-python/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  07 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  sci-biology/bx-python: Add bitbucket to remote-id in metadata.xml
+
   13 Apr 2015; Justin Lecher <jlec@gentoo.org> bx-python-0.7.2.ebuild,
   bx-python-9999.ebuild:
   sci-biology/bx-python: Streamline ebuild
diff --git a/sci-biology/bx-python/metadata.xml b/sci-biology/bx-python/metadata.xml
index 8c2353ee0..1e685c91f 100644
--- a/sci-biology/bx-python/metadata.xml
+++ b/sci-biology/bx-python/metadata.xml
@@ -8,5 +8,6 @@
   </maintainer>
   <upstream>
     <remote-id type="pypi">bx-python</remote-id>
+    <remote-id type="bitbucket">james_taylor/bx-python</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/sci-mathematics/ufc/ChangeLog b/sci-mathematics/ufc/ChangeLog
index 3e9549b60..fefc01844 100644
--- a/sci-mathematics/ufc/ChangeLog
+++ b/sci-mathematics/ufc/ChangeLog
@@ -1,7 +1,10 @@
 # ChangeLog for sci-mathematics/ufc
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  07 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  sci-mathematics/ufc: Add bitbucket to remote-id in metadata.xml
+
   16 Jul 2014; Andrew Reisner <andrew@reisner.co> ufc-2.3.0.ebuild:
   added keyword
 
diff --git a/sci-mathematics/ufc/metadata.xml b/sci-mathematics/ufc/metadata.xml
index 132ec13b6..497df0887 100644
--- a/sci-mathematics/ufc/metadata.xml
+++ b/sci-mathematics/ufc/metadata.xml
@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci-mathematics</herd>
-<longdescription lang="en">
+  <herd>sci-mathematics</herd>
+  <longdescription lang="en">
 UFC (Unified Form-assembly Code) is a unified framework for finite element assembly. More precisely, it defines a fixed interface for communicating low level routines (functions) for evaluating and assembling finite element variational forms. The UFC interface consists of a single header file ufc.h that specifies a C++ interface that must be implemented by code that complies with the UFC specification.
 </longdescription>
+  <upstream>
+    <remote-id type="bitbucket">fenics-project/ufc-deprecated</remote-id>
+  </upstream>
 </pkgmetadata>
-