Added patch to fix python-2.5 & 64 bit issues (bug 188067)

Package-Manager: portage-2.1.3.3

5 files changed, 108 insertions, 6 deletions

diff --git a/dev-python/pyid3lib/ChangeLog b/dev-python/pyid3lib/ChangeLog
index 8646b400f2fb..07403f18ef9a 100644
--- a/dev-python/pyid3lib/ChangeLog
+++ b/dev-python/pyid3lib/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/pyid3lib
-# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyid3lib/ChangeLog,v 1.11 2006/07/12 15:56:57 agriffis Exp $
+# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyid3lib/ChangeLog,v 1.12 2007/08/08 21:42:20 hawking Exp $
+
+*pyid3lib-0.5.1-r1 (08 Aug 2007)
+
+  08 Aug 2007; Ali Polatel <hawking@gentoo.org>
+  +files/pyid3lib-0.5.1-py25.patch, +pyid3lib-0.5.1-r1.ebuild:
+  Added patch to fix python-2.5 & 64 bit issues (bug 188067, thanks to Brian)
 
   12 Jul 2006; Aron Griffis <agriffis@gentoo.org> pyid3lib-0.5.1.ebuild:
   Mark 0.5.1 stable on ia64
diff --git a/dev-python/pyid3lib/Manifest b/dev-python/pyid3lib/Manifest
index f2e6d795965f..6b1c79e7df7e 100644
--- a/dev-python/pyid3lib/Manifest
+++ b/dev-python/pyid3lib/Manifest
@@ -1,12 +1,20 @@
+AUX pyid3lib-0.5.1-py25.patch 1307 RMD160 3f3e76a288c8468e7ef1480c8779f49b4cf18d9a SHA1 295692516ed5c6eb5bd08b7ab33f9682a5056005 SHA256 07716da15662c5d266a3a184181d4825e391959306819f0eab89cd9993551342
+MD5 377b797acfae7411c3a70c244d3cf9b6 files/pyid3lib-0.5.1-py25.patch 1307
+RMD160 3f3e76a288c8468e7ef1480c8779f49b4cf18d9a files/pyid3lib-0.5.1-py25.patch 1307
+SHA256 07716da15662c5d266a3a184181d4825e391959306819f0eab89cd9993551342 files/pyid3lib-0.5.1-py25.patch 1307
 DIST pyid3lib-0.5.1.tar.bz2 21207 RMD160 cec0607aab0eeaaa953428a4d06c7b7a19232616 SHA1 5026f9aa7f868a081a7caecc54cbdbc0cdaea27b SHA256 2a7bdd52c24ed0e70e4a2d82c697214c4ab5a70f94ea9e7934df15ca202d1169
+EBUILD pyid3lib-0.5.1-r1.ebuild 669 RMD160 54482caf752d5189e3f3c12c731d48e12e582eb4 SHA1 039d99c22e8d1b88ef015d25fce4def040b58f22 SHA256 46b36c5106e1f7b6046c73e2e01880f3476df5b3dec7b48b78d20bdfc48198e2
+MD5 0e275390306f53d25497fe4290cc8b00 pyid3lib-0.5.1-r1.ebuild 669
+RMD160 54482caf752d5189e3f3c12c731d48e12e582eb4 pyid3lib-0.5.1-r1.ebuild 669
+SHA256 46b36c5106e1f7b6046c73e2e01880f3476df5b3dec7b48b78d20bdfc48198e2 pyid3lib-0.5.1-r1.ebuild 669
 EBUILD pyid3lib-0.5.1.ebuild 578 RMD160 5139e30c959d0aa199d3ab4ef16059dec8459b4d SHA1 e846fe6f84f98598f2b978d1d9ba2f885d6e61f4 SHA256 6983b4ca27f761b1334e999ba059be6c911dde4040c5474108dc06da3aa18e43
 MD5 a1282f2443e7a9e6993bbae81d719d78 pyid3lib-0.5.1.ebuild 578
 RMD160 5139e30c959d0aa199d3ab4ef16059dec8459b4d pyid3lib-0.5.1.ebuild 578
 SHA256 6983b4ca27f761b1334e999ba059be6c911dde4040c5474108dc06da3aa18e43 pyid3lib-0.5.1.ebuild 578
-MISC ChangeLog 1205 RMD160 7a8a7a93b505e92c3977f230e1251e5961f722e6 SHA1 73ec9b50e8cb4059ac403964ad5c82a50736b912 SHA256 4a3827bc194aefd8879daa9e83bebf267497890854d4b207564427673468d7ec
-MD5 9baced9e5885c7f8998b142066e216cd ChangeLog 1205
-RMD160 7a8a7a93b505e92c3977f230e1251e5961f722e6 ChangeLog 1205
-SHA256 4a3827bc194aefd8879daa9e83bebf267497890854d4b207564427673468d7ec ChangeLog 1205
+MISC ChangeLog 1428 RMD160 c98e93964a70d389940a77b7e8f638f9f2e7ad89 SHA1 dae38f08a74154f62a84ccab971e38e454d36f64 SHA256 470d2fdf9d179be6a137d2797905783963df2af0d817ec98db36c0ee3cb19081
+MD5 b183e49976455a007b9d691a32b1b3c5 ChangeLog 1428
+RMD160 c98e93964a70d389940a77b7e8f638f9f2e7ad89 ChangeLog 1428
+SHA256 470d2fdf9d179be6a137d2797905783963df2af0d817ec98db36c0ee3cb19081 ChangeLog 1428
 MISC metadata.xml 159 RMD160 900a8c55d7a7d2f6312594769aaf941bf9e99c7f SHA1 c8e604d56dae898258b5254d78cfeac0b981e288 SHA256 9f01104d3484792496faff4805eed0ecea2352a897151f3397d49a13800037b4
 MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
 RMD160 900a8c55d7a7d2f6312594769aaf941bf9e99c7f metadata.xml 159
@@ -14,3 +22,6 @@ SHA256 9f01104d3484792496faff4805eed0ecea2352a897151f3397d49a13800037b4 metadata
 MD5 d5eef616ffdb1156074f3dd64d7691fa files/digest-pyid3lib-0.5.1 244
 RMD160 0f6f32f3111b0bcb12628d6a587a34f72249cf41 files/digest-pyid3lib-0.5.1 244
 SHA256 3e9f13f4abb62aec35643afdca52ebb77051b4d150b4624920ff29774d3fad96 files/digest-pyid3lib-0.5.1 244
+MD5 d5eef616ffdb1156074f3dd64d7691fa files/digest-pyid3lib-0.5.1-r1 244
+RMD160 0f6f32f3111b0bcb12628d6a587a34f72249cf41 files/digest-pyid3lib-0.5.1-r1 244
+SHA256 3e9f13f4abb62aec35643afdca52ebb77051b4d150b4624920ff29774d3fad96 files/digest-pyid3lib-0.5.1-r1 244
diff --git a/dev-python/pyid3lib/files/digest-pyid3lib-0.5.1-r1 b/dev-python/pyid3lib/files/digest-pyid3lib-0.5.1-r1
new file mode 100644
index 000000000000..cebab468350f
--- /dev/null
+++ b/dev-python/pyid3lib/files/digest-pyid3lib-0.5.1-r1
@@ -0,0 +1,3 @@
+MD5 49818a591430e08057c27a11e4c40aef pyid3lib-0.5.1.tar.bz2 21207
+RMD160 cec0607aab0eeaaa953428a4d06c7b7a19232616 pyid3lib-0.5.1.tar.bz2 21207
+SHA256 2a7bdd52c24ed0e70e4a2d82c697214c4ab5a70f94ea9e7934df15ca202d1169 pyid3lib-0.5.1.tar.bz2 21207
diff --git a/dev-python/pyid3lib/files/pyid3lib-0.5.1-py25.patch b/dev-python/pyid3lib/files/pyid3lib-0.5.1-py25.patch
new file mode 100644
index 000000000000..c24cfc97d5ac
--- /dev/null
+++ b/dev-python/pyid3lib/files/pyid3lib-0.5.1-py25.patch
@@ -0,0 +1,57 @@
+--- pyid3lib-0.5.1/pyid3lib.cc.orig	2007-08-08 23:53:08.000000000 +0300
++++ pyid3lib-0.5.1/pyid3lib.cc	2007-08-08 23:53:12.000000000 +0300
+@@ -10,13 +10,19 @@
+ #include <id3/id3lib_frame.h>
+ #include <id3/tag.h>
+ 
++#if PY_VERSION_HEX < 0x02050000 && !defined(PY_SSIZE_T_MIN)
++typedef int Py_ssize_t;
++#define PY_SSIZE_T_MAX INT_MAX
++#define PY_SSIZE_T_MIN INT_MIN
++#endif
++
+ typedef struct
+ {
+     PyObject_HEAD
+ 
+     ID3_Tag* tag;
+     ID3_Frame** frames;
+-    int size, alloc;
++    Py_ssize_t size, alloc;
+ } ID3Object;
+ 
+ typedef struct
+@@ -80,13 +86,24 @@
+ 
+ 
+ static PySequenceMethods tag_as_sequence = {
++#if PY_VERSION_HEX >= 0x02050000
++    (lenfunc)id3_length,
++#else
+     (inquiry)id3_length,
++#endif
+     NULL,
+     NULL,
++#if PY_VERSION_HEX >= 0x02050000
++    (ssizeargfunc)id3_item,
++    (ssizessizeargfunc)id3_slice,
++    (ssizeobjargproc)id3_ass_item,
++    (ssizessizeobjargproc)id3_ass_slice,
++#else
+     (intargfunc)id3_item,
+     (intintargfunc)id3_slice,
+     (intobjargproc)id3_ass_item,
+     (intintobjargproc)id3_ass_slice,
++#endif
+     (objobjproc)id3_contains,
+     NULL,
+     NULL,
+@@ -824,7 +841,7 @@
+ static ID3_Frame* frame_from_dict( ID3_FrameID fid, PyObject* dict )
+ {
+     char* data;
+-    int size;
++    Py_ssize_t size;
+     
+     ID3_Field* field;
+     ID3_FieldID flid;
diff --git a/dev-python/pyid3lib/pyid3lib-0.5.1-r1.ebuild b/dev-python/pyid3lib/pyid3lib-0.5.1-r1.ebuild
new file mode 100644
index 000000000000..0ef639fca4a2
--- /dev/null
+++ b/dev-python/pyid3lib/pyid3lib-0.5.1-r1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyid3lib/pyid3lib-0.5.1-r1.ebuild,v 1.1 2007/08/08 21:42:20 hawking Exp $
+
+inherit distutils eutils
+
+DESCRIPTION="Module for manipulating ID3 tags in Python"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+HOMEPAGE="http://pyid3lib.sourceforge.net/"
+IUSE=""
+SLOT="0"
+LICENSE="LGPL-2.1"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+DEPEND="virtual/python
+	media-libs/id3lib"
+
+src_unpack() {
+	distutils_src_unpack
+	epatch "${FILESDIR}/${P}-py25.patch"
+}
+
+src_install() {
+	distutils_src_install
+	dohtml doc.html
+}