revision bump. change python-2.5 patch to work fine and apply it; bug 192858 thanks to Sean McLean

(Portage version: 2.1.3.9)

4 files changed, 67 insertions, 23 deletions

diff --git a/dev-python/pyvorbis/ChangeLog b/dev-python/pyvorbis/ChangeLog
index 13ecc671902a..a7e8c2ad01dc 100644
--- a/dev-python/pyvorbis/ChangeLog
+++ b/dev-python/pyvorbis/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-python/pyvorbis
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyvorbis/ChangeLog,v 1.36 2007/07/19 18:01:00 coldwind Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyvorbis/ChangeLog,v 1.37 2007/09/19 23:37:53 hawking Exp $
+
+*pyvorbis-1.4-r3 (19 Sep 2007)
+
+  19 Sep 2007; Ali Polatel <hawking@gentoo.org>
+  files/pyvorbis-1.4-python25.patch, +pyvorbis-1.4-r3.ebuild:
+  revision bump. change python-2.5 patch to work fine and apply it.
+  (bug 192858 thanks to Sean McLean)
 
 *pyvorbis-1.4-r2 (19 Jul 2007)
 
diff --git a/dev-python/pyvorbis/files/digest-pyvorbis-1.4-r3 b/dev-python/pyvorbis/files/digest-pyvorbis-1.4-r3
new file mode 100644
index 000000000000..277cca3a5c37
--- /dev/null
+++ b/dev-python/pyvorbis/files/digest-pyvorbis-1.4-r3
@@ -0,0 +1,3 @@
+MD5 b4921e792c0a74f75b9d3057df10ee7c pyvorbis-1.4.tar.gz 39045
+RMD160 c2e921f5f6deb4ebe3ff3ac8017f0f44c733b5ab pyvorbis-1.4.tar.gz 39045
+SHA256 a7154541cea58304feff30752243eab862131c7589d72c200c8ad722d3bf1647 pyvorbis-1.4.tar.gz 39045
diff --git a/dev-python/pyvorbis/files/pyvorbis-1.4-python25.patch b/dev-python/pyvorbis/files/pyvorbis-1.4-python25.patch
index 277a59c8d94e..18028dc7a8e7 100644
--- a/dev-python/pyvorbis/files/pyvorbis-1.4-python25.patch
+++ b/dev-python/pyvorbis/files/pyvorbis-1.4-python25.patch
@@ -1,12 +1,12 @@
-diff -ur pyvorbis-1.4.orig/src/pyvorbiscodec.c pyvorbis-1.4/src/pyvorbiscodec.c
---- pyvorbis-1.4.orig/src/pyvorbiscodec.c	2007-07-19 17:57:15.000000000 +0200
-+++ pyvorbis-1.4/src/pyvorbiscodec.c	2007-07-19 20:13:59.000000000 +0200
+diff -ur pyvorbis-1.4-old/src/pyvorbiscodec.c pyvorbis-1.4/src/pyvorbiscodec.c
+--- pyvorbis-1.4-old/src/pyvorbiscodec.c	2003-05-13 11:17:13.000000000 +0300
++++ pyvorbis-1.4/src/pyvorbiscodec.c	2007-09-20 01:57:54.000000000 +0300
 @@ -118,7 +118,7 @@
  {
    vorbis_dsp_clear(PY_DSP(self));
    Py_XDECREF(((py_dsp *)self)->parent);
 -  PyMem_DEL(self);
-+  PyObject_DEL(self);
++  PyObject_Del(self);
  }
  
  static PyObject*
@@ -15,13 +15,13 @@ diff -ur pyvorbis-1.4.orig/src/pyvorbiscodec.c pyvorbis-1.4/src/pyvorbiscodec.c
    vorbis_block_clear(PY_BLOCK(self));
    Py_XDECREF(((py_block *)self)->parent);
 -  PyMem_DEL(self);
-+  PyObject_DEL(self);
++  PyObject_Del(self);
  }
  
  static PyObject*
-diff -ur pyvorbis-1.4.orig/src/pyvorbisfile.c pyvorbis-1.4/src/pyvorbisfile.c
---- pyvorbis-1.4.orig/src/pyvorbisfile.c	2007-07-19 17:57:15.000000000 +0200
-+++ pyvorbis-1.4/src/pyvorbisfile.c	2007-07-19 20:25:27.000000000 +0200
+diff -ur pyvorbis-1.4-old/src/pyvorbisfile.c pyvorbis-1.4/src/pyvorbisfile.c
+--- pyvorbis-1.4-old/src/pyvorbisfile.c	2003-12-19 09:11:02.000000000 +0200
++++ pyvorbis-1.4/src/pyvorbisfile.c	2007-09-20 01:59:41.000000000 +0300
 @@ -173,8 +173,7 @@
    if (ret == NULL) {
      PyMem_DEL(newobj);
@@ -32,30 +32,25 @@ diff -ur pyvorbis-1.4.orig/src/pyvorbisfile.c pyvorbis-1.4/src/pyvorbisfile.c
  
    return (PyObject *) newobj;
  }
-@@ -190,12 +189,9 @@
-     /* If file was opened from a file object, decref it, so it can
-        close */
-     Py_DECREF(py_self->py_file);
--  } else {
--    /* Otherwise, we opened the file and should close it. */
--    fclose(py_self->c_file);
+@@ -195,7 +194,8 @@
+     fclose(py_self->c_file);
    }
--
+ 
 -  PyMem_DEL(self);
 +  free(py_self->ovf);
-+  PyObject_DEL(self);
++  PyObject_Del(self);
  }
  
  static PyObject *
-diff -ur pyvorbis-1.4.orig/src/pyvorbisinfo.c pyvorbis-1.4/src/pyvorbisinfo.c
---- pyvorbis-1.4.orig/src/pyvorbisinfo.c	2007-07-19 17:57:15.000000000 +0200
-+++ pyvorbis-1.4/src/pyvorbisinfo.c	2007-07-19 20:36:25.000000000 +0200
+diff -ur pyvorbis-1.4-old/src/pyvorbisinfo.c pyvorbis-1.4/src/pyvorbisinfo.c
+--- pyvorbis-1.4-old/src/pyvorbisinfo.c	2003-12-19 09:51:36.000000000 +0200
++++ pyvorbis-1.4/src/pyvorbisinfo.c	2007-09-20 02:01:58.000000000 +0300
 @@ -134,7 +134,7 @@
  static void
  py_ov_info_dealloc(PyObject *self)
  {
 -  PyMem_DEL(self);
-+  PyObject_DEL(self);
++  PyObject_Del(self);
  }
  
  #define CMP_RET(x) \
@@ -64,7 +59,7 @@ diff -ur pyvorbis-1.4.orig/src/pyvorbisinfo.c pyvorbis-1.4/src/pyvorbisinfo.c
    }
  
 -  PyMem_DEL(self);
-+  PyObject_DEL(self);
++  PyObject_Del(self);
  }
  
  
diff --git a/dev-python/pyvorbis/pyvorbis-1.4-r3.ebuild b/dev-python/pyvorbis/pyvorbis-1.4-r3.ebuild
new file mode 100644
index 000000000000..865ddb10ccfb
--- /dev/null
+++ b/dev-python/pyvorbis/pyvorbis-1.4-r3.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyvorbis/pyvorbis-1.4-r3.ebuild,v 1.1 2007/09/19 23:37:53 hawking Exp $
+
+inherit distutils eutils
+
+DESCRIPTION="Python bindings for the ogg.vorbis library"
+HOMEPAGE="http://ekyo.nerim.net/software/pyogg/"
+SRC_URI="http://ekyo.nerim.net/software/pyogg/${P}.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND="dev-lang/python
+	>=media-libs/libogg-1.0
+	>=media-libs/libvorbis-1.0
+	>=dev-python/pyogg-1.1"
+
+DOCS="AUTHORS COPYING ChangeLog NEWS README"
+
+src_unpack() {
+	distutils_src_unpack
+
+	epatch "${FILESDIR}/pyvorbisfile.c-1.4.patch"
+	epatch "${FILESDIR}/${P}-python25.patch"
+}
+
+src_compile() {
+	./config_unix.py || die
+	distutils_src_compile
+}
+
+src_install() {
+	distutils_src_install
+	insinto /usr/share/doc/${PF}/examples
+	doins test/*
+}