Version bump to the latest release. Update live ebuild to use git (bug #348196). Improve python-related support (bug #312143) and add doc USE flag.

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

3 files changed, 82 insertions, 10 deletions

diff --git a/dev-embedded/bitbake/ChangeLog b/dev-embedded/bitbake/ChangeLog
index 67d2488656a2..1c4ca510f5ea 100644
--- a/dev-embedded/bitbake/ChangeLog
+++ b/dev-embedded/bitbake/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-embedded/bitbake
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/bitbake/ChangeLog,v 1.25 2010/08/15 02:12:52 vapier Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/bitbake/ChangeLog,v 1.26 2011/01/26 07:19:28 radhermit Exp $
+
+*bitbake-1.10.2 (26 Jan 2011)
+
+  26 Jan 2011; Tim Harder <radhermit@gentoo.org> +bitbake-1.10.2.ebuild,
+  bitbake-9999.ebuild:
+  Version bump to the latest release. Update live ebuild to use git (bug
+  #348196). Improve python-related support (bug #312143) and add doc USE flag.
 
   15 Aug 2010; Mike Frysinger <vapier@gentoo.org> bitbake-1.8.18-r1.ebuild:
   Stabilize for all #325261 by Evgeniy Dushistov.
diff --git a/dev-embedded/bitbake/bitbake-1.10.2.ebuild b/dev-embedded/bitbake/bitbake-1.10.2.ebuild
new file mode 100644
index 000000000000..15d1c4c43951
--- /dev/null
+++ b/dev-embedded/bitbake/bitbake-1.10.2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/bitbake/bitbake-1.10.2.ebuild,v 1.1 2011/01/26 07:19:28 radhermit Exp $
+
+EAPI="3"
+PYTHON_DEPEND="2:2.5"
+
+inherit distutils python
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="git://git.openembedded.org/bitbake.git"
+	inherit git
+	SRC_URI=""
+	KEYWORDS="~amd64 ~ppc ~x86"
+else
+	SRC_URI="mirror://berlios/${PN}/${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.5[sqlite]
+		>=dev-python/pysqlite-2.3.2
+	)"
+DEPEND="${RDEPEND}
+	doc? ( dev-libs/libxslt )"
+
+pkg_setup() {
+	python_set_active_version 2
+}
+
+src_prepare() {
+	if ! use doc ; then
+		sed -i -e 's:doctype = "html":doctype = "none":' \
+			-e 's:("share/doc/bitbake-%s/manual.*))::' setup.py
+		echo "none:" >> doc/manual/Makefile
+	else
+	    sed -i -e "s:\(share/doc/bitbake-%s.* %\) __version__:\1 \"${PV}\":" setup.py
+	fi
+}
diff --git a/dev-embedded/bitbake/bitbake-9999.ebuild b/dev-embedded/bitbake/bitbake-9999.ebuild
index afcfac47e5f9..f9adf760bb3e 100644
--- a/dev-embedded/bitbake/bitbake-9999.ebuild
+++ b/dev-embedded/bitbake/bitbake-9999.ebuild
@@ -1,13 +1,15 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 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.6 2010/06/23 05:16:59 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/bitbake/bitbake-9999.ebuild,v 1.7 2011/01/26 07:19:28 radhermit Exp $
 
-EAPI="2"
-inherit distutils
+EAPI="3"
+PYTHON_DEPEND="2:2.5"
+
+inherit distutils python
 
 if [[ ${PV} == "9999" ]] ; then
-	ESVN_REPO_URI="svn://svn.berlios.de/bitbake/trunk/bitbake"
-	inherit subversion
+	EGIT_REPO_URI="git://git.openembedded.org/bitbake.git"
+	inherit git
 	SRC_URI=""
 	KEYWORDS=""
 else
@@ -20,10 +22,26 @@ HOMEPAGE="http://developer.berlios.de/projects/bitbake/"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE=""
+IUSE="doc"
 
-DEPEND="
+RDEPEND="
 	|| (
 		>=dev-lang/python-2.5[sqlite]
 		>=dev-python/pysqlite-2.3.2
 	)"
+DEPEND="${RDEPEND}
+	doc? ( dev-libs/libxslt )"
+
+pkg_setup() {
+	python_set_active_version 2
+}
+
+src_prepare() {
+	if ! use doc ; then
+		sed -i -e 's:doctype = "html":doctype = "none":' \
+			-e 's:("share/doc/bitbake-%s/manual.*))::' setup.py
+		echo "none:" >> doc/manual/Makefile
+	else
+	    sed -i -e "s:\(share/doc/bitbake-%s.* %\) __version__:\1 \"${PV}\":" setup.py
+	fi
+}