Fix for Python 2.5 thanls to Greg Ward. HOMEPAGE update. Outdated versions removed.

Package-Manager: portage-2.1.2.9

9 files changed, 89 insertions, 74 deletions

diff --git a/dev-python/pyvorbis/ChangeLog b/dev-python/pyvorbis/ChangeLog
index fb078b689770..13ecc671902a 100644
--- a/dev-python/pyvorbis/ChangeLog
+++ b/dev-python/pyvorbis/ChangeLog
@@ -1,6 +1,15 @@
 # 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.35 2007/02/22 00:49:09 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyvorbis/ChangeLog,v 1.36 2007/07/19 18:01:00 coldwind Exp $
+
+*pyvorbis-1.4-r2 (19 Jul 2007)
+
+  19 Jul 2007; Santiago M. Mola <coldwind@gentoo.org>
+  +files/pyvorbis-1.4-python25.patch, -pyvorbis-1.1.ebuild,
+  pyvorbis-1.3.ebuild, -pyvorbis-1.4.ebuild, pyvorbis-1.4-r1.ebuild,
+  +pyvorbis-1.4-r2.ebuild:
+  Fix for Python 2.5 thanls to Greg Ward. HOMEPAGE update. Outdated versions
+  removed.
 
   22 Feb 2007; Piotr Jaroszyński <peper@gentoo.org> ChangeLog:
   Transition to Manifest2.
diff --git a/dev-python/pyvorbis/Manifest b/dev-python/pyvorbis/Manifest
index b39dec2ff390..2432081341a3 100644
--- a/dev-python/pyvorbis/Manifest
+++ b/dev-python/pyvorbis/Manifest
@@ -1,43 +1,39 @@
+AUX pyvorbis-1.4-python25.patch 725 RMD160 b161ea8517a0ea9b41356e2bdb17961a85a8a5cc SHA1 bdfb08040b9ae790e0ff55bfa38bd060b1ae9463 SHA256 7da2677746c1fd08a31f90124e1010fe394df76a659690c3b0761d3be67c6d98
+MD5 94ab964d6033c1686f985868bca3aef9 files/pyvorbis-1.4-python25.patch 725
+RMD160 b161ea8517a0ea9b41356e2bdb17961a85a8a5cc files/pyvorbis-1.4-python25.patch 725
+SHA256 7da2677746c1fd08a31f90124e1010fe394df76a659690c3b0761d3be67c6d98 files/pyvorbis-1.4-python25.patch 725
 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
 SHA256 aa3bae161c934eff79d2ed1ee6d0cf4ee524039674744e0a8c6f608c0a6fcd3e files/pyvorbisfile.c-1.4.patch 564
-DIST pyvorbis-1.1.tar.gz 36943 RMD160 bdd842a26157de71b9a248c8cc4687a0962236a7 SHA1 3e91a41d86de88c9880e51821273d0f55a4a5729 SHA256 a3d3639802de0210e3f731a7d76ec39e085ea11e3baa5e4b65bbbb8acc2461bd
 DIST pyvorbis-1.3.tar.gz 38165 RMD160 fb6215138364147fa0f8c821737d6751fdf86966 SHA1 9d530a259486b8ad0e09a307e6657437aed6452c SHA256 c7816f5ad6e45634d88de80cff288b1e1a30bf0afb80f7ca3773e634779d64c0
 DIST pyvorbis-1.4.tar.gz 39045 RMD160 c2e921f5f6deb4ebe3ff3ac8017f0f44c733b5ab SHA1 df83fa823186d4a1b8586037c995c1d73eb91720 SHA256 a7154541cea58304feff30752243eab862131c7589d72c200c8ad722d3bf1647
-EBUILD pyvorbis-1.1.ebuild 691 RMD160 1842d8e26218475612eff4d51688038509d9f201 SHA1 1e9a680b935af0c23ef6d6cae0589bbce98fc317 SHA256 4eb3f27de7c4713c2acae515b6e75db1b2e45161664e431bec2476e3521afa6a
-MD5 0148abefe18be47faf59220524fe278a pyvorbis-1.1.ebuild 691
-RMD160 1842d8e26218475612eff4d51688038509d9f201 pyvorbis-1.1.ebuild 691
-SHA256 4eb3f27de7c4713c2acae515b6e75db1b2e45161664e431bec2476e3521afa6a pyvorbis-1.1.ebuild 691
-EBUILD pyvorbis-1.3.ebuild 759 RMD160 d2e109b8cef0638f2b60cb0ec3ffe5cbe74f1b3c SHA1 66d9217c72c7205d6268261856b63f0b5e041fbb SHA256 3b8884832d5a3143be271e24a5c03130a487938e0a1dcd5853519e2b3947d6e0
-MD5 aa89b3ded1582dca6380802aa4d75f6b pyvorbis-1.3.ebuild 759
-RMD160 d2e109b8cef0638f2b60cb0ec3ffe5cbe74f1b3c pyvorbis-1.3.ebuild 759
-SHA256 3b8884832d5a3143be271e24a5c03130a487938e0a1dcd5853519e2b3947d6e0 pyvorbis-1.3.ebuild 759
-EBUILD pyvorbis-1.4-r1.ebuild 925 RMD160 9444073d87792ccb263443e061d78b001a9c98e7 SHA1 8f60502034813acecbe2241d94fd8112adb4de02 SHA256 a6defda514d308f4a8fc01818835297e02d5b903f37bec36149129af3ea35fb8
-MD5 dcf07ac7d92f52643cccc5d5faa1d025 pyvorbis-1.4-r1.ebuild 925
-RMD160 9444073d87792ccb263443e061d78b001a9c98e7 pyvorbis-1.4-r1.ebuild 925
-SHA256 a6defda514d308f4a8fc01818835297e02d5b903f37bec36149129af3ea35fb8 pyvorbis-1.4-r1.ebuild 925
-EBUILD pyvorbis-1.4.ebuild 732 RMD160 5bfa8d51f0768abe17659ab6cf395cd078370bb1 SHA1 5588c26341ff1b22b76d7ac4a69306d343aef062 SHA256 29e01b4df8d7396ef87a04f1cd8d37fb060283c5ddac6f476cacbe3ff2936a9a
-MD5 baafd0a56bd5e79c2597ad199c2b4ae8 pyvorbis-1.4.ebuild 732
-RMD160 5bfa8d51f0768abe17659ab6cf395cd078370bb1 pyvorbis-1.4.ebuild 732
-SHA256 29e01b4df8d7396ef87a04f1cd8d37fb060283c5ddac6f476cacbe3ff2936a9a pyvorbis-1.4.ebuild 732
-MISC ChangeLog 4302 RMD160 41e41ee07238ead6b7f6e165e7c773a59c3573cc SHA1 2293be3fbd27d1829833ec49f4600be5fd2bc813 SHA256 6230d744f6e6cc4ee13e5a72976ac7d431d2d457aa7981388c5744bdcc8425ed
-MD5 a9ee729c2af905627d4d86a52ca03cc5 ChangeLog 4302
-RMD160 41e41ee07238ead6b7f6e165e7c773a59c3573cc ChangeLog 4302
-SHA256 6230d744f6e6cc4ee13e5a72976ac7d431d2d457aa7981388c5744bdcc8425ed ChangeLog 4302
+EBUILD pyvorbis-1.3.ebuild 703 RMD160 a7d5b0bfb8aa9a74dd7a68949dacdd5c008983d8 SHA1 7c6e5d2b66c0310d2798516caaa4ec1b0ba764c6 SHA256 91f253bf9fe74b67ddfaccb3f802c6fb0b2ae052298c0c891d17ffd1dcb80bdf
+MD5 141ae4c637127982eaacb970b906b421 pyvorbis-1.3.ebuild 703
+RMD160 a7d5b0bfb8aa9a74dd7a68949dacdd5c008983d8 pyvorbis-1.3.ebuild 703
+SHA256 91f253bf9fe74b67ddfaccb3f802c6fb0b2ae052298c0c891d17ffd1dcb80bdf pyvorbis-1.3.ebuild 703
+EBUILD pyvorbis-1.4-r1.ebuild 924 RMD160 8106ee19051a13f7018e20acf36032e30eaafe4a SHA1 55257df71bb09ea9b268e5d4ef14abaa751dd2fc SHA256 25a99f1bbd3a951347f71ac638ea314097eb34a7b39b9588582bd25a8ab2461b
+MD5 5c6894b12e375ba37c6c929936ee98b0 pyvorbis-1.4-r1.ebuild 924
+RMD160 8106ee19051a13f7018e20acf36032e30eaafe4a pyvorbis-1.4-r1.ebuild 924
+SHA256 25a99f1bbd3a951347f71ac638ea314097eb34a7b39b9588582bd25a8ab2461b pyvorbis-1.4-r1.ebuild 924
+EBUILD pyvorbis-1.4-r2.ebuild 930 RMD160 abc80b5dff7713c5480467f834f4be88588ccd42 SHA1 202e51ce66320d489b4fb12c2ca0da6aba704c03 SHA256 79f489cff7a0e29710c806ea9c0eab76a63bffa83a6979f2df690b55a1f11991
+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
 MISC metadata.xml 159 RMD160 900a8c55d7a7d2f6312594769aaf941bf9e99c7f SHA1 c8e604d56dae898258b5254d78cfeac0b981e288 SHA256 9f01104d3484792496faff4805eed0ecea2352a897151f3397d49a13800037b4
 MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
 RMD160 900a8c55d7a7d2f6312594769aaf941bf9e99c7f metadata.xml 159
 SHA256 9f01104d3484792496faff4805eed0ecea2352a897151f3397d49a13800037b4 metadata.xml 159
-MD5 df80926d8c3c84a120c63afb72793a9c files/digest-pyvorbis-1.1 235
-RMD160 0ef3179e1de6bd3dae70c46c591443997497799d files/digest-pyvorbis-1.1 235
-SHA256 f87eea82cf089c7d0e04d03674ce66d258aae6a9d7e40490388d40459d63fc79 files/digest-pyvorbis-1.1 235
 MD5 504b2cbbf035e3c4255dc9343f5561a4 files/digest-pyvorbis-1.3 235
 RMD160 2e151ab58e9ad6c01cdf4992b71e106c19cff620 files/digest-pyvorbis-1.3 235
 SHA256 70b05a2f5bad82c8453766b1694a29ba666a8bf43c88f88731f22ccf8e275428 files/digest-pyvorbis-1.3 235
-MD5 3fa5c5e0c99399a008954e75fb99e973 files/digest-pyvorbis-1.4 235
-RMD160 e635fa03a26bde355fc4d33ad66ec443d89dd550 files/digest-pyvorbis-1.4 235
-SHA256 9392e8b001084b411199fd85ef529019b5e4049b3a801ddd56a3ae484c2e9b07 files/digest-pyvorbis-1.4 235
 MD5 3fa5c5e0c99399a008954e75fb99e973 files/digest-pyvorbis-1.4-r1 235
 RMD160 e635fa03a26bde355fc4d33ad66ec443d89dd550 files/digest-pyvorbis-1.4-r1 235
 SHA256 9392e8b001084b411199fd85ef529019b5e4049b3a801ddd56a3ae484c2e9b07 files/digest-pyvorbis-1.4-r1 235
+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
diff --git a/dev-python/pyvorbis/files/digest-pyvorbis-1.1 b/dev-python/pyvorbis/files/digest-pyvorbis-1.1
deleted file mode 100644
index 1c23a8e7a225..000000000000
--- a/dev-python/pyvorbis/files/digest-pyvorbis-1.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 ea45cec8eb78364c381039b82c47e610 pyvorbis-1.1.tar.gz 36943
-RMD160 bdd842a26157de71b9a248c8cc4687a0962236a7 pyvorbis-1.1.tar.gz 36943
-SHA256 a3d3639802de0210e3f731a7d76ec39e085ea11e3baa5e4b65bbbb8acc2461bd pyvorbis-1.1.tar.gz 36943
diff --git a/dev-python/pyvorbis/files/digest-pyvorbis-1.4 b/dev-python/pyvorbis/files/digest-pyvorbis-1.4-r2
index 277cca3a5c37..277cca3a5c37 100644
--- a/dev-python/pyvorbis/files/digest-pyvorbis-1.4
+++ b/dev-python/pyvorbis/files/digest-pyvorbis-1.4-r2
diff --git a/dev-python/pyvorbis/files/pyvorbis-1.4-python25.patch b/dev-python/pyvorbis/files/pyvorbis-1.4-python25.patch
new file mode 100644
index 000000000000..71641d324437
--- /dev/null
+++ b/dev-python/pyvorbis/files/pyvorbis-1.4-python25.patch
@@ -0,0 +1,28 @@
+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 17:59:49.000000000 +0200
+@@ -173,8 +173,7 @@
+   if (ret == NULL) {
+     PyMem_DEL(newobj);
+     return NULL;
+-  } else
+-    Py_DECREF(ret);
++  }
+ 
+   return (PyObject *) newobj;
+ }
+@@ -190,12 +189,10 @@
+     /* 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);
+   }
+ 
+-  PyMem_DEL(self);
++  free(py_self->ovf);
++  PyObject_DEL(self);
+ }
+ 
+ static PyObject *
diff --git a/dev-python/pyvorbis/pyvorbis-1.1.ebuild b/dev-python/pyvorbis/pyvorbis-1.1.ebuild
deleted file mode 100644
index 18433bb96380..000000000000
--- a/dev-python/pyvorbis/pyvorbis-1.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyvorbis/pyvorbis-1.1.ebuild,v 1.8 2007/07/11 06:19:47 mr_bones_ Exp $
-
-inherit distutils
-
-DESCRIPTION="Python bindings for the ogg.vorbis library"
-HOMEPAGE="http://www.andrewchatham.com/pyogg/"
-SRC_URI="http://www.andrewchatham.com/pyogg/download/${P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="x86 ppc ~sparc"
-IUSE=""
-
-DEPEND="dev-lang/python
-	>=media-libs/libogg-1.0
-	>=media-libs/libvorbis-1.0
-	>=dev-python/pyogg-1.1"
-
-src_compile() {
-	./config_unix.py || die
-	distutils_src_compile
-}
-
-DOCS="AUTHORS COPYING ChangeLog NEWS README"
diff --git a/dev-python/pyvorbis/pyvorbis-1.3.ebuild b/dev-python/pyvorbis/pyvorbis-1.3.ebuild
index 80e76c6a95e3..45e4293550cf 100644
--- a/dev-python/pyvorbis/pyvorbis-1.3.ebuild
+++ b/dev-python/pyvorbis/pyvorbis-1.3.ebuild
@@ -1,12 +1,11 @@
-# Copyright 1999-2005 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/pyvorbis/pyvorbis-1.3.ebuild,v 1.15 2007/07/11 06:19:47 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyvorbis/pyvorbis-1.3.ebuild,v 1.16 2007/07/19 18:01:00 coldwind Exp $
 
 inherit distutils
 
 DESCRIPTION="Python bindings for the ogg.vorbis library"
-HOMEPAGE="http://www.andrewchatham.com/pyogg/"
-#SRC_URI="http://www.andrewchatham.com/pyogg/download/${P}.tar.gz"
+HOMEPAGE="http://ekyo.nerim.net/software/pyogg/index.html"
 SRC_URI="mirror://gentoo/${P}.tar.gz"
 
 LICENSE="LGPL-2"
diff --git a/dev-python/pyvorbis/pyvorbis-1.4-r1.ebuild b/dev-python/pyvorbis/pyvorbis-1.4-r1.ebuild
index 1327ce556371..de3559e0fc86 100644
--- a/dev-python/pyvorbis/pyvorbis-1.4-r1.ebuild
+++ b/dev-python/pyvorbis/pyvorbis-1.4-r1.ebuild
@@ -1,12 +1,12 @@
-# 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/pyvorbis/pyvorbis-1.4-r1.ebuild,v 1.12 2006/10/30 02:51:23 the_paya Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyvorbis/pyvorbis-1.4-r1.ebuild,v 1.13 2007/07/19 18:01:00 coldwind Exp $
 
 inherit distutils eutils
 
 DESCRIPTION="Python bindings for the ogg.vorbis library"
-HOMEPAGE="http://www.andrewchatham.com/pyogg/"
-SRC_URI="http://www.andrewchatham.com/pyogg/download/${P}.tar.gz"
+HOMEPAGE="http://ekyo.nerim.net/software/pyogg/"
+SRC_URI="http://ekyo.nerim.net/software/pyogg/${P}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0"
@@ -22,8 +22,8 @@ DOCS="AUTHORS COPYING ChangeLog NEWS README"
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/pyvorbisfile.c-1.4.patch
+	cd "${S}"
+	epatch "${FILESDIR}/pyvorbisfile.c-1.4.patch"
 }
 
 src_compile() {
diff --git a/dev-python/pyvorbis/pyvorbis-1.4.ebuild b/dev-python/pyvorbis/pyvorbis-1.4-r2.ebuild
index c05fe8bf5921..e89ebf8af53d 100644
--- a/dev-python/pyvorbis/pyvorbis-1.4.ebuild
+++ b/dev-python/pyvorbis/pyvorbis-1.4-r2.ebuild
@@ -1,16 +1,16 @@
-# Copyright 1999-2005 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/pyvorbis/pyvorbis-1.4.ebuild,v 1.3 2007/07/11 06:19:47 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyvorbis/pyvorbis-1.4-r2.ebuild,v 1.1 2007/07/19 18:01:00 coldwind Exp $
 
-inherit distutils
+inherit distutils eutils
 
 DESCRIPTION="Python bindings for the ogg.vorbis library"
-HOMEPAGE="http://www.andrewchatham.com/pyogg/"
-SRC_URI="http://www.andrewchatham.com/pyogg/download/${P}.tar.gz"
+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"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE=""
 
 DEPEND="dev-lang/python
@@ -18,9 +18,21 @@ DEPEND="dev-lang/python
 	>=media-libs/libvorbis-1.0
 	>=dev-python/pyogg-1.1"
 
+DOCS="AUTHORS COPYING ChangeLog NEWS README"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/pyvorbisfile.c-1.4.patch"
+}
+
 src_compile() {
 	./config_unix.py || die
 	distutils_src_compile
 }
 
-DOCS="AUTHORS COPYING ChangeLog NEWS README"
+src_install() {
+	distutils_src_install
+	insinto /usr/share/doc/${PF}/examples
+	doins test/*
+}