Sync to the live ebuild (URIs), drop old.

(Portage version: 2.2.0_alpha120_p33/cvs/Linux x86_64)

5 files changed, 9 insertions, 102 deletions

diff --git a/app-portage/gentoopm/ChangeLog b/app-portage/gentoopm/ChangeLog
index 18324be2a89c..71182c153762 100644
--- a/app-portage/gentoopm/ChangeLog
+++ b/app-portage/gentoopm/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-portage/gentoopm
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoopm/ChangeLog,v 1.22 2012/08/07 20:34:00 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoopm/ChangeLog,v 1.23 2012/08/31 09:11:17 mgorny Exp $
+
+  31 Aug 2012; Michał Górny <mgorny@gentoo.org> -gentoopm-0.2.1.ebuild,
+  -gentoopm-0.2.5.ebuild, gentoopm-0.2.5-r1.ebuild, metadata.xml:
+  Sync to the live ebuild (URIs), drop old.
 
   07 Aug 2012; Alexis Ballier <aballier@gentoo.org> gentoopm-0.2.5-r1.ebuild:
   keyword ~amd64-fbsd, bug #393183
@@ -110,4 +114,3 @@
   15 Jul 2011; Michał Górny <mgorny@gentoo.org> +gentoopm-0.1.ebuild,
   +metadata.xml:
   Introduce the first version of gentoopm, the common PM API.
-
diff --git a/app-portage/gentoopm/gentoopm-0.2.1.ebuild b/app-portage/gentoopm/gentoopm-0.2.1.ebuild
deleted file mode 100644
index ac6b8e1f38ca..000000000000
--- a/app-portage/gentoopm/gentoopm-0.2.1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoopm/gentoopm-0.2.1.ebuild,v 1.4 2011/11/02 14:52:48 phajdan.jr Exp $
-
-EAPI=3
-
-PYTHON_DEPEND='2:2.6'
-SUPPORT_PYTHON_ABIS=1
-RESTRICT_PYTHON_ABIS='2.4 2.5 3.*'
-DISTUTILS_SRC_TEST=setup.py
-
-inherit base distutils
-
-DESCRIPTION="A common interface to Gentoo package managers"
-HOMEPAGE="https://github.com/mgorny/gentoopm/"
-SRC_URI="mirror://github/mgorny/${PN}/${P}.tar.bz2"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc"
-
-RDEPEND="|| ( >=sys-apps/portage-2.1.10.3
-		sys-apps/pkgcore
-		>=sys-apps/paludis-0.64.2[python-bindings] )"
-DEPEND="doc? ( dev-python/epydoc )"
-PDEPEND="app-admin/eselect-package-manager"
-
-src_prepare() {
-	base_src_prepare
-	distutils_src_prepare
-}
-
-src_compile() {
-	distutils_src_compile
-
-	if use doc; then
-		"$(PYTHON -2)" setup.py doc || die
-	fi
-}
-
-src_install() {
-	distutils_src_install
-
-	if use doc; then
-		dohtml -r doc/* || die
-	fi
-}
diff --git a/app-portage/gentoopm/gentoopm-0.2.5-r1.ebuild b/app-portage/gentoopm/gentoopm-0.2.5-r1.ebuild
index d57899bd6f43..5d77f622912c 100644
--- a/app-portage/gentoopm/gentoopm-0.2.5-r1.ebuild
+++ b/app-portage/gentoopm/gentoopm-0.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/app-portage/gentoopm/gentoopm-0.2.5-r1.ebuild,v 1.4 2012/08/07 20:34:00 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoopm/gentoopm-0.2.5-r1.ebuild,v 1.5 2012/08/31 09:11:17 mgorny Exp $
 
 EAPI=4
 PYTHON_COMPAT='python2_6 python2_7 python3_1 python3_2'
@@ -8,8 +8,8 @@ PYTHON_COMPAT='python2_6 python2_7 python3_1 python3_2'
 inherit base python-distutils-ng
 
 DESCRIPTION="A common interface to Gentoo package managers"
-HOMEPAGE="https://github.com/mgorny/gentoopm/"
-SRC_URI="mirror://github/mgorny/${PN}/${P}.tar.bz2"
+HOMEPAGE="https://bitbucket.org/mgorny/gentoopm/"
+SRC_URI="mirror://bitbucket/mgorny/${PN}/downloads/${P}.tar.bz2"
 
 LICENSE="BSD-2"
 SLOT="0"
diff --git a/app-portage/gentoopm/gentoopm-0.2.5.ebuild b/app-portage/gentoopm/gentoopm-0.2.5.ebuild
deleted file mode 100644
index 3c76537aae0d..000000000000
--- a/app-portage/gentoopm/gentoopm-0.2.5.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoopm/gentoopm-0.2.5.ebuild,v 1.2 2012/02/09 23:29:11 mattst88 Exp $
-
-EAPI=4
-
-PYTHON_DEPEND='2:2.6'
-SUPPORT_PYTHON_ABIS=1
-RESTRICT_PYTHON_ABIS='2.4 2.5 3.*'
-DISTUTILS_SRC_TEST=setup.py
-
-inherit base distutils
-
-DESCRIPTION="A common interface to Gentoo package managers"
-HOMEPAGE="https://github.com/mgorny/gentoopm/"
-SRC_URI="mirror://github/mgorny/${PN}/${P}.tar.bz2"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~mips ~x86 ~x86-fbsd"
-IUSE="doc"
-
-RDEPEND="|| ( >=sys-apps/portage-2.1.10.3
-		sys-apps/pkgcore
-		>=sys-apps/paludis-0.64.2[python-bindings] )"
-DEPEND="doc? ( dev-python/epydoc )"
-PDEPEND="app-admin/eselect-package-manager"
-
-src_prepare() {
-	base_src_prepare
-	distutils_src_prepare
-}
-
-src_compile() {
-	distutils_src_compile
-
-	if use doc; then
-		"$(PYTHON -2)" setup.py doc || die
-	fi
-}
-
-src_install() {
-	distutils_src_install
-
-	if use doc; then
-		dohtml -r doc/*
-	fi
-}
diff --git a/app-portage/gentoopm/metadata.xml b/app-portage/gentoopm/metadata.xml
index af39b9b5b930..60fecf74141a 100644
--- a/app-portage/gentoopm/metadata.xml
+++ b/app-portage/gentoopm/metadata.xml
@@ -10,6 +10,6 @@
 			<email>mgorny@gentoo.org</email>
 			<name>Michał Górny</name>
 		</maintainer>
-		<bugs-to>https://github.com/mgorny/gentoopm/issues/</bugs-to>
+		<bugs-to>https://bitbucket.org/mgorny/gentoopm/issues/</bugs-to>
 	</upstream>
 </pkgmetadata>