Version bump (bug #166091): cleanup, added examples use-flag. Dropped old versions.

(Portage version: 2.1.2-r7)

8 files changed, 30 insertions, 141 deletions

diff --git a/dev-python/pyrex/ChangeLog b/dev-python/pyrex/ChangeLog
index 5fab91f094cd..524f3c27b1ce 100644
--- a/dev-python/pyrex/ChangeLog
+++ b/dev-python/pyrex/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-python/pyrex
-# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyrex/ChangeLog,v 1.56 2006/10/20 20:35:40 kloeri Exp $
+# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyrex/ChangeLog,v 1.57 2007/02/10 12:08:19 lucass Exp $
+
+*pyrex-0.9.5.1a (10 Feb 2007)
+
+  10 Feb 2007; Lukasz Strzygowski <lucass@gentoo.org>
+  -files/pyrex-0.9.2.1-gcc4.patch,
+  -files/pyrex-0.9.3-python24_distutils.patch, -pyrex-0.9.3-r2.ebuild,
+  -pyrex-0.9.3.1.ebuild, +pyrex-0.9.5.1a.ebuild:
+  Version bump (bug #166091): cleanup, added examples use-flag. Dropped old
+  versions.
 
   20 Oct 2006; Bryan Østergaard <kloeri@gentoo.org> pyrex-0.9.4.1.ebuild:
   Stable on Alpha.
diff --git a/dev-python/pyrex/files/digest-pyrex-0.9.3-r2 b/dev-python/pyrex/files/digest-pyrex-0.9.3-r2
deleted file mode 100644
index a105867c3bb0..000000000000
--- a/dev-python/pyrex/files/digest-pyrex-0.9.3-r2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 63c4cb884d6b777d3806f9669ba5feba Pyrex-0.9.3.tar.gz 176072
-RMD160 6322e5f8079daffeb1ed372972e88de79c59b4ae Pyrex-0.9.3.tar.gz 176072
-SHA256 64e475924df3d55b7d1f9b17b7c088713917ed611de0fc2ee02394aa5ba9ab9a Pyrex-0.9.3.tar.gz 176072
diff --git a/dev-python/pyrex/files/digest-pyrex-0.9.3.1 b/dev-python/pyrex/files/digest-pyrex-0.9.3.1
deleted file mode 100644
index 582c3b17164b..000000000000
--- a/dev-python/pyrex/files/digest-pyrex-0.9.3.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 0415b95a023061679021323d9ce56fe0 Pyrex-0.9.3.1.tar.gz 161760
-RMD160 29bf606ceaa01b4ca0fe51cd7771ab88040d695b Pyrex-0.9.3.1.tar.gz 161760
-SHA256 e93c6f74e425d4b9e65ecc7e7b7854c586a1448009ce873b30e7a2d6c8ca30ae Pyrex-0.9.3.1.tar.gz 161760
diff --git a/dev-python/pyrex/files/digest-pyrex-0.9.5.1a b/dev-python/pyrex/files/digest-pyrex-0.9.5.1a
new file mode 100644
index 000000000000..e23d3d1bf09d
--- /dev/null
+++ b/dev-python/pyrex/files/digest-pyrex-0.9.5.1a
@@ -0,0 +1,3 @@
+MD5 0132c5cd2f8685e4948fb14dcb65f637 Pyrex-0.9.5.1a.tar.gz 183135
+RMD160 a8b1a358986a641fd604f5487750f5f1e2633aaa Pyrex-0.9.5.1a.tar.gz 183135
+SHA256 7f34e865505bd467557220961b091fc54782114865e1c5b81e68395989ddbd53 Pyrex-0.9.5.1a.tar.gz 183135
diff --git a/dev-python/pyrex/files/pyrex-0.9.2.1-gcc4.patch b/dev-python/pyrex/files/pyrex-0.9.2.1-gcc4.patch
deleted file mode 100644
index 9370081e8c62..000000000000
--- a/dev-python/pyrex/files/pyrex-0.9.2.1-gcc4.patch
+++ /dev/null
@@ -1,66 +0,0 @@
---- Pyrex-0.9.2.1/Pyrex/Compiler/Code.py.orig	2005-03-22 13:41:29.000000000 -0500
-+++ Pyrex-0.9.2.1/Pyrex/Compiler/Code.py	2005-03-22 13:46:15.000000000 -0500
-@@ -218,14 +218,19 @@
-         for entry in entries:
-             self.put_var_xdecref_clear(entry)
-     
--    def put_init_to_py_none(self, cname):
--        self.putln("%s = Py_None; Py_INCREF(%s);" % (cname, cname))
-+    def put_init_to_py_none(self, cast, cname):
-+        if cast:
-+            self.putln("%s = Py_None; Py_INCREF(%s %s);" % (cname, cast, cname))
-+        else:
-+            self.putln("%s = Py_None; Py_INCREF(%s);" % (cname, cname))            
-     
-     def put_init_var_to_py_none(self, entry, template = "%s"):
-         code = template % entry.cname
-         if entry.type.is_extension_type:
--            code = "((PyObject*)%s)" % code
--        self.put_init_to_py_none(code)
-+            cast = "(PyObject *)"
-+        else:
-+            cast = None
-+        self.put_init_to_py_none(cast, code)
- 
-     def put_pymethoddef(self, entry, term):
-         if entry.doc:
---- Pyrex-0.9.2.1/Pyrex/Compiler/ExprNodes.py.orig	2005-03-22 13:41:35.000000000 -0500
-+++ Pyrex-0.9.2.1/Pyrex/Compiler/ExprNodes.py	2005-03-22 13:34:05.000000000 -0500
-@@ -806,7 +806,7 @@
-             if self.type.is_pyobject:
-                 rhs.make_owned_reference(code)
-                 code.put_decref(self.result, self.type)
--            code.putln('%s = %s;' % (self.result, rhs.result))
-+            code.putln('%s = %s;' % (self.entry.cname, rhs.result))
-             if debug_disposal_code:
-                 print "NameNode.generate_assignment_code:"
-                 print "...generating post-assignment code for", rhs
---- Pyrex-0.9.2.1/Pyrex/Compiler/Nodes.py.orig	2005-03-22 13:41:40.000000000 -0500
-+++ Pyrex-0.9.2.1/Pyrex/Compiler/Nodes.py	2005-03-22 13:43:36.000000000 -0500
-@@ -472,9 +472,9 @@
-         self.generate_self_cast(scope, code)
-         type = scope.parent_type
-         if type.vtabslot_cname:
--            code.putln("(struct %s *)p->%s = %s;" % (
--                type.vtabstruct_cname,
-+            code.putln("p->%s = (struct %s *)%s;" % (
-                 type.vtabslot_cname,
-+                type.vtabstruct_cname,
-                 type.vtabptr_cname))
-         for entry in scope.var_entries:
-             if entry.type.is_pyobject:
-@@ -1671,10 +1671,11 @@
-         code.putln("")
-         if self.return_type.is_pyobject:
-             if self.return_type.is_extension_type:
--                lhs = "(PyObject *)%s" % Naming.retval_cname
-+                cast = "(PyObject *)"
-             else:
--                lhs = Naming.retval_cname
--            code.put_init_to_py_none(lhs)
-+                cast = None
-+            lhs = Naming.retval_cname
-+            code.put_init_to_py_none(cast, lhs)
-         else:
-             val = self.return_type.default_value
-             if val:
diff --git a/dev-python/pyrex/files/pyrex-0.9.3-python24_distutils.patch b/dev-python/pyrex/files/pyrex-0.9.3-python24_distutils.patch
deleted file mode 100644
index d494a35029c2..000000000000
--- a/dev-python/pyrex/files/pyrex-0.9.3-python24_distutils.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -rc Pyrex-0.9.3/Pyrex/Distutils/build_ext.py Pyrex-0.9.3-patched/Pyrex/Distutils/build_ext.py
-*** Pyrex-0.9.3/Pyrex/Distutils/build_ext.py	Fri Apr 30 08:00:46 2004
---- Pyrex-0.9.3-patched/Pyrex/Distutils/build_ext.py	Fri Jan  7 12:24:17 2005
-***************
-*** 32,38 ****
-        if self.compiler == 'mingw32':
-          self.swig_cpp = 1
-  
-!   def swig_sources (self, sources):
-      if not self.extensions:
-        return
-  
---- 32,38 ----
-        if self.compiler == 'mingw32':
-          self.swig_cpp = 1
-  
-!   def swig_sources (self, sources, extensions=None):
-      if not self.extensions:
-        return
-  
diff --git a/dev-python/pyrex/pyrex-0.9.3-r2.ebuild b/dev-python/pyrex/pyrex-0.9.3-r2.ebuild
deleted file mode 100644
index 658a5b119d21..000000000000
--- a/dev-python/pyrex/pyrex-0.9.3-r2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyrex/pyrex-0.9.3-r2.ebuild,v 1.15 2006/03/14 03:33:18 vapier Exp $
-
-inherit distutils eutils
-
-MY_P="Pyrex-${PV}"
-S=${WORKDIR}/${MY_P}
-DESCRIPTION="a language for writing Python extension modules"
-HOMEPAGE="http://www.cosc.canterbury.ac.nz/~greg/python/Pyrex"
-SRC_URI="http://www.cosc.canterbury.ac.nz/~greg/python/Pyrex/${MY_P}.tar.gz"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86"
-IUSE=""
-
-DEPEND="virtual/python"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	# fix for pyrex distutils for python 2.4. bug# 77042
-	epatch ${FILESDIR}/${P}-python24_distutils.patch
-	# fix for gcc-4.0
-	epatch ${FILESDIR}/${PN}-0.9.2.1-gcc4.patch
-}
-
-src_install() {
-	mydoc="CHANGES.txt INSTALL.txt README.txt USAGE.txt"
-	distutils_src_install
-
-	dodir /usr/share/doc/${PF}/Demos
-	cp -r ${S}/Demos ${D}/usr/share/doc/${PF}
-	dohtml -r Doc/*
-	cp ${S}/Doc/primes.c ${D}usr/share/doc/${PF}/html/
-}
diff --git a/dev-python/pyrex/pyrex-0.9.3.1.ebuild b/dev-python/pyrex/pyrex-0.9.5.1a.ebuild
index a67e4eb5016c..ab37cd8d45b9 100644
--- a/dev-python/pyrex/pyrex-0.9.3.1.ebuild
+++ b/dev-python/pyrex/pyrex-0.9.5.1a.ebuild
@@ -1,19 +1,22 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyrex/pyrex-0.9.3.1.ebuild,v 1.7 2006/03/14 03:33:18 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyrex/pyrex-0.9.5.1a.ebuild,v 1.1 2007/02/10 12:08:19 lucass Exp $
 
-inherit distutils portability
+NEED_PYTHON=2.3
+
+inherit distutils
 
 MY_P="Pyrex-${PV}"
-S=${WORKDIR}/${MY_P}
-DESCRIPTION="a language for writing Python extension modules"
+DESCRIPTION="A language for writing Python extension modules"
 HOMEPAGE="http://www.cosc.canterbury.ac.nz/~greg/python/Pyrex"
 SRC_URI="http://www.cosc.canterbury.ac.nz/~greg/python/Pyrex/${MY_P}.tar.gz"
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE=""
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="examples"
+
+S="${WORKDIR}/${MY_P}"
 
 PYTHON_MODNAME="Pyrex"
 
@@ -21,7 +24,10 @@ src_install() {
 	DOCS="CHANGES.txt INSTALL.txt ToDo.txt USAGE.txt"
 	distutils_src_install
 
-	dohtml -r Doc/*
-	cp Doc/primes.c "${D}/usr/share/doc/${PF}/html/"
-	treecopy Demos "${D}/usr/share/doc/${PF}"
+	dohtml -A c -r Doc/*
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}
+		doins -r Demos
+	fi
 }