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

Package-Manager: portage-2.1.3.9

6 files changed, 90 insertions, 39 deletions

diff --git a/dev-python/ipython/Manifest b/dev-python/ipython/Manifest
index c8e5c9680d5e..888291819e5b 100644
--- a/dev-python/ipython/Manifest
+++ b/dev-python/ipython/Manifest
@@ -4,18 +4,18 @@ RMD160 22e350a65841dd8bad82eeebb9da285dea203b60 files/62ipython-gentoo.el 94
 SHA256 e6386552ab04131245b98ba59abaad08050bba47005258da53e32bfb0bdd4743 files/62ipython-gentoo.el 94
 DIST ipython-0.6.15.tar.gz 888905 RMD160 cb9cb2fe3e4ae5fdc4017fc6b03ea719516611b2 SHA1 c15cfdf957d46f17d23af6cf53d5b08dca15d93d SHA256 99a3aad3d4e30aca1050343ff4410782ab47f94a33bff568fbc3a841981e2980
 DIST ipython-0.8.1.tar.gz 1127745 RMD160 974a7584471c3559a8c56d60bc85715f3fd3e079 SHA1 90320436c7c09f778c904553520327cbbfd2d8c6 SHA256 7d1cbcee101434d56dcc989fcb4e16f1eade060ededa982d0491031206dc6dbe
-EBUILD ipython-0.6.15.ebuild 558 RMD160 c8b0a1a7574430653f90f302ff55a9b881c39ffe SHA1 07eac9bd1759f8c5e8b73568f12cedb998b78a36 SHA256 22c1de9c956517959dbf066567705e7affd7b11a18e739ea94cf0713368cbf67
-MD5 cd23be430413a87bf5283164188f0c11 ipython-0.6.15.ebuild 558
-RMD160 c8b0a1a7574430653f90f302ff55a9b881c39ffe ipython-0.6.15.ebuild 558
-SHA256 22c1de9c956517959dbf066567705e7affd7b11a18e739ea94cf0713368cbf67 ipython-0.6.15.ebuild 558
+EBUILD ipython-0.6.15.ebuild 564 RMD160 5f6618c525a0ee3d5eea01679c4b0669fa36c06a SHA1 90a9fffd9668881174fb8bccb56a3346c12a0280 SHA256 dc4ad87b322484a575740e69cf1b28b6f11e4dc921f2ba6a368f6eb5dda24704
+MD5 b94d516ea09580556963d827b49b03ba ipython-0.6.15.ebuild 564
+RMD160 5f6618c525a0ee3d5eea01679c4b0669fa36c06a ipython-0.6.15.ebuild 564
+SHA256 dc4ad87b322484a575740e69cf1b28b6f11e4dc921f2ba6a368f6eb5dda24704 ipython-0.6.15.ebuild 564
 EBUILD ipython-0.8.1.ebuild 1499 RMD160 d0dca9d8b88dd00551846cdb4b68ef0e8f49de3c SHA1 45fb911b4310ab60ac46fe6194e87f6909219d6f SHA256 7a421b9dc66504150ba655adaea47de107eb43cbcba83cd94970fd2b0041521a
 MD5 d2ba88a4d6e1e812e131f6507f0ba8f4 ipython-0.8.1.ebuild 1499
 RMD160 d0dca9d8b88dd00551846cdb4b68ef0e8f49de3c ipython-0.8.1.ebuild 1499
 SHA256 7a421b9dc66504150ba655adaea47de107eb43cbcba83cd94970fd2b0041521a ipython-0.8.1.ebuild 1499
-MISC ChangeLog 7064 RMD160 684a05096852a04215c00fc447b6535ae6f8e372 SHA1 b9cc40fc97f060ddf81cce54c694f08893a95b82 SHA256 48fcd6f3cc1e288c691e890f275bbabd46c4baa517644f2b9529797707ca5a20
-MD5 65aa21048a690102769518789e3d7171 ChangeLog 7064
-RMD160 684a05096852a04215c00fc447b6535ae6f8e372 ChangeLog 7064
-SHA256 48fcd6f3cc1e288c691e890f275bbabd46c4baa517644f2b9529797707ca5a20 ChangeLog 7064
+MISC ChangeLog 7166 RMD160 d77c53f62cc1edd61bf9f25c8daa0ebcf7dd1da8 SHA1 a22a862f52cc00fc5468e95fefa0168fba9cb7dd SHA256 87b0748d55af2816339f663d48705d83748d8767204b92b7ffad8a3c5ca50d56
+MD5 f6c35fe87fc88c043864faf1ee55b89e ChangeLog 7166
+RMD160 d77c53f62cc1edd61bf9f25c8daa0ebcf7dd1da8 ChangeLog 7166
+SHA256 87b0748d55af2816339f663d48705d83748d8767204b92b7ffad8a3c5ca50d56 ChangeLog 7166
 MISC metadata.xml 2253 RMD160 11b7d3c6141b2b4954c942f490e154fa377af775 SHA1 9fbb4853f4f52d1430fabe006a453e0d26dabbff SHA256 cad8d0fb7419d230ecc674fd8b855926903f2343bc1eaeb6f2e0fd4fe3713827
 MD5 06bf581552d6f6debd761e5135c4cc68 metadata.xml 2253
 RMD160 11b7d3c6141b2b4954c942f490e154fa377af775 metadata.xml 2253
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/Manifest b/dev-python/pyvorbis/Manifest
index a59599fa0193..d9b5e60250fe 100644
--- a/dev-python/pyvorbis/Manifest
+++ b/dev-python/pyvorbis/Manifest
@@ -1,7 +1,7 @@
-AUX pyvorbis-1.4-python25.patch 1762 RMD160 8f9ef046022470b40bfd0d466194c3de341fd5a1 SHA1 b2277f0895646d2bfaf2b1e60822d794ebb74abb SHA256 2301345c7e714cebc1db70228a7edb3cf8791e651582a81458c0b9a26c7572d3
-MD5 f4a2beef33aa2f61ecfc80a5c8f78aef files/pyvorbis-1.4-python25.patch 1762
-RMD160 8f9ef046022470b40bfd0d466194c3de341fd5a1 files/pyvorbis-1.4-python25.patch 1762
-SHA256 2301345c7e714cebc1db70228a7edb3cf8791e651582a81458c0b9a26c7572d3 files/pyvorbis-1.4-python25.patch 1762
+AUX pyvorbis-1.4-python25.patch 1562 RMD160 580a91cd7e1bc66c3f3ca43ea4d946f92fdaa2b9 SHA1 4d3094dd32f08f5b7749b83263d1e535c49071c5 SHA256 d6d3c2494b9965bb7ef06c1f6ea0a70ad527411fa6a0a6675c2a7f6f26d30710
+MD5 9e7c5b8a1511ad73ac8404517fca353a files/pyvorbis-1.4-python25.patch 1562
+RMD160 580a91cd7e1bc66c3f3ca43ea4d946f92fdaa2b9 files/pyvorbis-1.4-python25.patch 1562
+SHA256 d6d3c2494b9965bb7ef06c1f6ea0a70ad527411fa6a0a6675c2a7f6f26d30710 files/pyvorbis-1.4-python25.patch 1562
 AUX pyvorbisfile.c-1.4.patch 564 RMD160 ad2903a6a371519b3214487f97875fe0735b2126 SHA1 b977e0b3a508dff2273d5c8cfe5a8439eb6ecf3a SHA256 aa3bae161c934eff79d2ed1ee6d0cf4ee524039674744e0a8c6f608c0a6fcd3e
 MD5 dd05077a480799edc7a1912053b6cc6a files/pyvorbisfile.c-1.4.patch 564
 RMD160 ad2903a6a371519b3214487f97875fe0735b2126 files/pyvorbisfile.c-1.4.patch 564
@@ -20,10 +20,14 @@ EBUILD pyvorbis-1.4-r2.ebuild 930 RMD160 abc80b5dff7713c5480467f834f4be88588ccd4
 MD5 5cd6cb603e9479ac46d1be7c1cd26aee pyvorbis-1.4-r2.ebuild 930
 RMD160 abc80b5dff7713c5480467f834f4be88588ccd42 pyvorbis-1.4-r2.ebuild 930
 SHA256 79f489cff7a0e29710c806ea9c0eab76a63bffa83a6979f2df690b55a1f11991 pyvorbis-1.4-r2.ebuild 930
-MISC ChangeLog 4636 RMD160 dd98f58364e45c18730b85d4a257de0fafb2da18 SHA1 f44962100ddb942283abe87c8ea35bfa51939dd8 SHA256 15c7e69244fa422fbfc3a3bfafb1835845a0a0f4bb86ecbe6035423869dbe0bb
-MD5 e53ace1e07a040f22592da3525a7b100 ChangeLog 4636
-RMD160 dd98f58364e45c18730b85d4a257de0fafb2da18 ChangeLog 4636
-SHA256 15c7e69244fa422fbfc3a3bfafb1835845a0a0f4bb86ecbe6035423869dbe0bb ChangeLog 4636
+EBUILD pyvorbis-1.4-r3.ebuild 970 RMD160 eea1e53e3a8c827fe553664b723743f25d6f5b7c SHA1 d287f7bd179923dd74d42c78a0a2bb550c1ab409 SHA256 be23e7f19ebf903eb505343c13012e63efa98006657532b3a1849e36759854bc
+MD5 a7006a312f5e6a09916b39183408079d pyvorbis-1.4-r3.ebuild 970
+RMD160 eea1e53e3a8c827fe553664b723743f25d6f5b7c pyvorbis-1.4-r3.ebuild 970
+SHA256 be23e7f19ebf903eb505343c13012e63efa98006657532b3a1849e36759854bc pyvorbis-1.4-r3.ebuild 970
+MISC ChangeLog 4883 RMD160 92f2dfa6a8b03b7a1ca361cf183ba9567943d8e5 SHA1 f6080dc2b6d6853c3fcd07a4b4b6f9ced0dd21b6 SHA256 83cc29d1d0afae52d77f8f838679747f43c9c889ac95d7239c57e698e01cae46
+MD5 8aba7f19efe2fbf7a87626405f25964f ChangeLog 4883
+RMD160 92f2dfa6a8b03b7a1ca361cf183ba9567943d8e5 ChangeLog 4883
+SHA256 83cc29d1d0afae52d77f8f838679747f43c9c889ac95d7239c57e698e01cae46 ChangeLog 4883
 MISC metadata.xml 159 RMD160 900a8c55d7a7d2f6312594769aaf941bf9e99c7f SHA1 c8e604d56dae898258b5254d78cfeac0b981e288 SHA256 9f01104d3484792496faff4805eed0ecea2352a897151f3397d49a13800037b4
 MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
 RMD160 900a8c55d7a7d2f6312594769aaf941bf9e99c7f metadata.xml 159
@@ -37,3 +41,6 @@ SHA256 9392e8b001084b411199fd85ef529019b5e4049b3a801ddd56a3ae484c2e9b07 files/di
 MD5 3fa5c5e0c99399a008954e75fb99e973 files/digest-pyvorbis-1.4-r2 235
 RMD160 e635fa03a26bde355fc4d33ad66ec443d89dd550 files/digest-pyvorbis-1.4-r2 235
 SHA256 9392e8b001084b411199fd85ef529019b5e4049b3a801ddd56a3ae484c2e9b07 files/digest-pyvorbis-1.4-r2 235
+MD5 3fa5c5e0c99399a008954e75fb99e973 files/digest-pyvorbis-1.4-r3 235
+RMD160 e635fa03a26bde355fc4d33ad66ec443d89dd550 files/digest-pyvorbis-1.4-r3 235
+SHA256 9392e8b001084b411199fd85ef529019b5e4049b3a801ddd56a3ae484c2e9b07 files/digest-pyvorbis-1.4-r3 235
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/*
+}