version bump, bug 304877

Package-Manager: portage-2.1.7.17/cvs/Linux i686

4 files changed, 66 insertions, 9 deletions

diff --git a/dev-util/bzr/ChangeLog b/dev-util/bzr/ChangeLog
index d30385e05934..a5e82544ad95 100644
--- a/dev-util/bzr/ChangeLog
+++ b/dev-util/bzr/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/bzr
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/bzr/ChangeLog,v 1.127 2010/02/23 21:50:18 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/bzr/ChangeLog,v 1.128 2010/03/02 15:59:57 fauli Exp $
+
+*bzr-2.1.0 (02 Mar 2010)
+
+  02 Mar 2010; Christian Faulhammer <fauli@gentoo.org>
+  -bzr-2.1.0_beta4.ebuild, +bzr-2.1.0.ebuild:
+  version bump, bug 304877
 
   23 Feb 2010; Christian Faulhammer <fauli@gentoo.org>
   bzr-2.1.0_beta4.ebuild:
diff --git a/dev-util/bzr/bzr-2.1.0_beta4.ebuild b/dev-util/bzr/bzr-2.1.0.ebuild
index 2987c076f11f..c7cf3a980754 100644
--- a/dev-util/bzr/bzr-2.1.0_beta4.ebuild
+++ b/dev-util/bzr/bzr-2.1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/bzr/bzr-2.1.0_beta4.ebuild,v 1.6 2010/02/26 19:09:26 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/bzr/bzr-2.1.0.ebuild,v 1.1 2010/03/02 15:59:57 fauli Exp $
 
 EAPI=3
 
@@ -8,9 +8,7 @@ PYTHON_DEPEND=2
 
 inherit bash-completion distutils elisp-common eutils versionator
 
-MY_PV=${PV/_rc/rc}
-MY_PV=${PV/_beta/b}
-MY_P=${PN}-${MY_PV}
+MY_P=${PN}-${PV}
 SERIES=$(get_version_component_range 1-2)
 
 DESCRIPTION="Bazaar is a next generation distributed version control system."
@@ -23,6 +21,9 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris"
 IUSE="curl doc emacs +sftp test"
 
+# Disable until https://bugs.launchpad.net/bzr/+bug/392127 is fixed
+RESTRICT=test
+
 RDEPEND="|| ( >=dev-lang/python-2.5 dev-python/celementtree )
 	curl? ( dev-python/pycurl )
 	sftp? ( dev-python/paramiko )"
@@ -115,9 +116,9 @@ src_test() {
 	python_enable_pyc
 	if [[ -n ${skip_tests} ]]; then
 		einfo "Skipping tests known to fail: ${skip_tests}"
-		"${python}" bzr --no-plugins selftest -x ${skip_tests} || die
+		"$(PYTHON -A)" bzr --no-plugins selftest -x ${skip_tests} || die
 	else
-		"${python}" bzr --no-plugins selftest || die
+		"$(PYTHON -A)" bzr --no-plugins selftest || die
 	fi
 	# Just to make sure we don't hit any errors on later stages.
 	python_disable_pyc
diff --git a/dev-util/bzrtools/ChangeLog b/dev-util/bzrtools/ChangeLog
index 1d582dda60c8..ba59e5e2a55e 100644
--- a/dev-util/bzrtools/ChangeLog
+++ b/dev-util/bzrtools/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/bzrtools
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/bzrtools/ChangeLog,v 1.75 2009/12/27 14:47:14 fauli Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/bzrtools/ChangeLog,v 1.76 2010/03/02 16:02:27 fauli Exp $
+
+*bzrtools-2.1.0 (02 Mar 2010)
+
+  02 Mar 2010; Christian Faulhammer <fauli@gentoo.org>
+  +bzrtools-2.1.0.ebuild:
+  version bump, bug 304877
 
   27 Dec 2009; Christian Faulhammer <fauli@gentoo.org>
   -bzrtools-1.15.0.ebuild, -bzrtools-1.18.0.ebuild, -bzrtools-2.0.0.ebuild:
diff --git a/dev-util/bzrtools/bzrtools-2.1.0.ebuild b/dev-util/bzrtools/bzrtools-2.1.0.ebuild
new file mode 100644
index 000000000000..fad6778498ce
--- /dev/null
+++ b/dev-util/bzrtools/bzrtools-2.1.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/bzrtools/bzrtools-2.1.0.ebuild,v 1.1 2010/03/02 16:02:27 fauli Exp $
+
+EAPI="2"
+
+NEED_PYTHON=2.4
+inherit eutils distutils versionator
+
+DESCRIPTION="bzrtools is a useful collection of utilities for bzr."
+HOMEPAGE="http://bazaar-vcs.org/BzrTools"
+SRC_URI=""https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz""
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~ppc ~sparc ~x86 ~x86-interix ~amd64-linux ~x86-linux ~x86-macos"
+IUSE=""
+
+DEPEND="=dev-util/bzr-$(get_version_component_range 1-2)*"
+RDEPEND="${DEPEND}"
+
+#RESTRICT="test"
+
+DOCS="AUTHORS CREDITS NEWS NEWS.Shelf README README.Shelf TODO TODO.heads TODO.Shelf"
+
+S=${WORKDIR}/${PN}
+
+PYTHON_MODNAME=bzrlib
+
+src_test() {
+	python_version
+	einfo "Running testsuite..."
+	# put a linked copy of the bzr core into the build directory to properly
+	# test the "built" version of bzrtools
+	find "$(python_get_libdir)/site-packages/bzrlib/" \
+		-mindepth 1 -maxdepth 1 \
+		\( \( -type d -and -not -name "plugins" \) -or -name "*.py" \) \
+		-exec ln -s '{}' "${S}/build/lib/bzrlib/" \;
+	touch "${S}/build/lib/bzrlib/plugins/__init__.py"
+	"${S}/test.py" "${S}/build/lib" || die
+	# remove the "shadow" copy so it doesn't get installed
+	rm "${S}/build/lib/bzrlib/plugins/__init__.py"
+	find "${S}/build/lib/bzrlib/" -mindepth 1 -maxdepth 1 -type l -exec rm '{}' \;
+}