version bump and clean up

(Portage version: 2.1.8.3/cvs/Linux i686)

3 files changed, 13 insertions, 39 deletions

diff --git a/dev-vcs/bzr/ChangeLog b/dev-vcs/bzr/ChangeLog
index 5a92b845a569..80b0034ecf58 100644
--- a/dev-vcs/bzr/ChangeLog
+++ b/dev-vcs/bzr/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-vcs/bzr
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/bzr/ChangeLog,v 1.4 2010/05/18 11:19:30 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/bzr/ChangeLog,v 1.5 2010/06/23 09:43:19 fauli Exp $
+
+*bzr-2.1.2 (23 Jun 2010)
+
+  23 Jun 2010; Christian Faulhammer <fauli@gentoo.org> -bzr-2.1.0.ebuild,
+  +bzr-2.1.2.ebuild, -files/bzr-2.1-no-pyrex-citon.patch:
+  version bump and clean up
 
   18 May 2010; Fabian Groffen <grobian@gentoo.org> bzr-2.1.1.ebuild:
   Marked ~ppc-macos
diff --git a/dev-vcs/bzr/bzr-2.1.0.ebuild b/dev-vcs/bzr/bzr-2.1.2.ebuild
index 9ac5d5b9b600..e45ac29dbcfb 100644
--- a/dev-vcs/bzr/bzr-2.1.0.ebuild
+++ b/dev-vcs/bzr/bzr-2.1.2.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-vcs/bzr/bzr-2.1.0.ebuild,v 1.1 2010/03/05 09:33:53 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/bzr/bzr-2.1.2.ebuild,v 1.1 2010/06/23 09:43:19 fauli Exp $
 
 EAPI=3
 
@@ -18,7 +18,7 @@ SRC_URI="http://launchpad.net/bzr/${SERIES}/${PV}/+download/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 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"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
 IUSE="curl doc emacs +sftp test"
 
 # Disable until https://bugs.launchpad.net/bzr/+bug/392127 is fixed
@@ -30,8 +30,10 @@ RDEPEND="|| ( >=dev-lang/python-2.5 dev-python/celementtree )
 
 DEPEND="emacs? ( virtual/emacs )
 	test? (
-		$RDEPEND
+		${RDEPEND}
 		dev-python/medusa
+		dev-python/subunit
+		dev-python/testtools
 	)"
 
 S="${WORKDIR}/${MY_P}"
@@ -43,7 +45,7 @@ src_prepare() {
 	distutils_src_prepare
 
 	# Don't regenerate .c files from .pyx when pyrex is found.
-	epatch "${FILESDIR}/${PN}-2.1-no-pyrex-citon.patch"
+	epatch "${FILESDIR}/${PN}-2.1.1-no-pyrex-citon.patch"
 	# Don't run lock permission tests when running as root
 	epatch "${FILESDIR}/${PN}-0.90-tests-fix_root.patch"
 	# Fix permission errors when run under directories with setgid set.
diff --git a/dev-vcs/bzr/files/bzr-2.1-no-pyrex-citon.patch b/dev-vcs/bzr/files/bzr-2.1-no-pyrex-citon.patch
deleted file mode 100644
index 3d394b84a4ea..000000000000
--- a/dev-vcs/bzr/files/bzr-2.1-no-pyrex-citon.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-=== modified file 'setup.py'
---- setup.py	2009-10-20 14:04:31 +0000
-+++ setup.py	2009-10-20 14:05:01 +0000
-@@ -166,26 +166,9 @@
- from distutils.errors import CCompilerError, DistutilsPlatformError
- from distutils.extension import Extension
- ext_modules = []
--try:
--    try:
--        from Pyrex.Distutils import build_ext
--        from Pyrex.Compiler.Version import version as pyrex_version
--    except ImportError:
--        print "No Pyrex, trying Cython..."
--        from Cython.Distutils import build_ext
--        from Cython.Compiler.Version import version as pyrex_version
--except ImportError:
--    have_pyrex = False
--    # try to build the extension from the prior generated source.
--    print
--    print ("The python package 'Pyrex' is not available."
--           " If the .c files are available,")
--    print ("they will be built,"
--           " but modifying the .pyx files will not rebuild them.")
--    print
--    from distutils.command.build_ext import build_ext
--else:
--    have_pyrex = True
-+
-+have_pyrex = False
-+from distutils.command.build_ext import build_ext
- 
- 
- class build_ext_if_possible(build_ext):
-