Version bump and update live ebuild. Migrate to distutils-r1 eclass.

(Portage version: 2.2.0_alpha144/cvs/Linux x86_64, signed Manifest commit with key 4AB3E85B4F064CA3)

3 files changed, 58 insertions, 13 deletions

diff --git a/dev-embedded/bitbake/ChangeLog b/dev-embedded/bitbake/ChangeLog
index a7cd60987010..08ec7e66c6bf 100644
--- a/dev-embedded/bitbake/ChangeLog
+++ b/dev-embedded/bitbake/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-embedded/bitbake
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/bitbake/ChangeLog,v 1.50 2012/08/02 02:50:03 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/bitbake/ChangeLog,v 1.51 2012/12/08 09:31:21 radhermit Exp $
+
+*bitbake-1.17.0 (08 Dec 2012)
+
+  08 Dec 2012; Tim Harder <radhermit@gentoo.org> +bitbake-1.17.0.ebuild,
+  bitbake-9999.ebuild:
+  Version bump and update live ebuild. Migrate to distutils-r1 eclass.
 
 *bitbake-1.15.3 (02 Aug 2012)
 
diff --git a/dev-embedded/bitbake/bitbake-1.17.0.ebuild b/dev-embedded/bitbake/bitbake-1.17.0.ebuild
new file mode 100644
index 000000000000..4538d85a2214
--- /dev/null
+++ b/dev-embedded/bitbake/bitbake-1.17.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/bitbake/bitbake-1.17.0.ebuild,v 1.1 2012/12/08 09:31:21 radhermit Exp $
+
+EAPI="5"
+PYTHON_COMPAT=( python2_5 python2_6 python2_7 )
+
+inherit distutils-r1 vcs-snapshot
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="git://git.openembedded.org/bitbake.git"
+	inherit git-2
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/openembedded/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~ppc ~x86"
+fi
+
+DESCRIPTION="package management tool for OpenEmbedded"
+HOMEPAGE="http://developer.berlios.de/projects/bitbake/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="doc"
+
+RDEPEND="
+	|| (
+		dev-lang/python:2.7[sqlite]
+		dev-lang/python:2.6[sqlite]
+		dev-lang/python:2.5[sqlite]
+		>=dev-python/pysqlite-2.3.2
+	)
+	dev-python/ply
+	dev-python/progressbar"
+DEPEND="${RDEPEND}
+	doc? ( dev-libs/libxslt )"
+
+src_prepare() {
+	if ! use doc ; then
+		sed -i -e 's:doctype = "html":doctype = "none":' \
+			-e 's:("share/doc/bitbake-%s/manual.*))::' setup.py || die
+		echo "none:" >> doc/manual/Makefile || die
+	else
+	    sed -i -e "s:\(share/doc/bitbake-%s.* %\) __version__:\1 \"${PV}\":" setup.py || die
+	fi
+}
diff --git a/dev-embedded/bitbake/bitbake-9999.ebuild b/dev-embedded/bitbake/bitbake-9999.ebuild
index b61f24e446a1..0de744294191 100644
--- a/dev-embedded/bitbake/bitbake-9999.ebuild
+++ b/dev-embedded/bitbake/bitbake-9999.ebuild
@@ -1,19 +1,18 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/bitbake/bitbake-9999.ebuild,v 1.10 2012/03/17 10:28:26 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/bitbake/bitbake-9999.ebuild,v 1.11 2012/12/08 09:31:21 radhermit Exp $
 
-EAPI="4"
-PYTHON_DEPEND="2:2.5"
+EAPI="5"
+PYTHON_COMPAT=( python2_5 python2_6 python2_7 )
 
-inherit distutils
+inherit distutils-r1 vcs-snapshot
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="git://git.openembedded.org/bitbake.git"
 	inherit git-2
-	SRC_URI=""
 	KEYWORDS=""
 else
-	SRC_URI="http://cgit.openembedded.org/cgit.cgi/${PN}/snapshot/${P}.tar.bz2"
+	SRC_URI="https://github.com/openembedded/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~ppc ~x86"
 fi
 
@@ -31,17 +30,11 @@ RDEPEND="
 		dev-lang/python:2.5[sqlite]
 		>=dev-python/pysqlite-2.3.2
 	)
-	dev-python/futures
 	dev-python/ply
 	dev-python/progressbar"
 DEPEND="${RDEPEND}
 	doc? ( dev-libs/libxslt )"
 
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
 src_prepare() {
 	if ! use doc ; then
 		sed -i -e 's:doctype = "html":doctype = "none":' \