added patch to fix int/py_ssize_t issues with python2.4 (bug 191742). drop old

Package-Manager: portage-2.1.3.9

6 files changed, 40 insertions, 68 deletions

diff --git a/dev-python/m2crypto/ChangeLog b/dev-python/m2crypto/ChangeLog
index 30d9f4379359..0037825d5c08 100644
--- a/dev-python/m2crypto/ChangeLog
+++ b/dev-python/m2crypto/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-python/m2crypto
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/m2crypto/ChangeLog,v 1.29 2007/09/05 17:19:02 hawking Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/m2crypto/ChangeLog,v 1.30 2007/09/20 01:18:51 hawking Exp $
+
+  20 Sep 2007; Ali Polatel <hawking@gentoo.org>
+  +files/m2crypto-0.18-ssize_t.patch, -m2crypto-0.17-r1.ebuild,
+  m2crypto-0.18.ebuild:
+  added patch to fix int/py_ssize_t issues with python2.4 (bug 191742). drop old
 
 *m2crypto-0.18 (05 Sep 2007)
 
diff --git a/dev-python/m2crypto/Manifest b/dev-python/m2crypto/Manifest
index 7db065bbbc68..342460f47d54 100644
--- a/dev-python/m2crypto/Manifest
+++ b/dev-python/m2crypto/Manifest
@@ -1,22 +1,21 @@
+AUX m2crypto-0.18-ssize_t.patch 488 RMD160 207c25f9e0a2b71bdca9b07a3081060777ac0a14 SHA1 696dbc9d08ee1525ed61176342f372b208d2eef6 SHA256 4bb6a5e7a460a0fb816439036edc9465dd36b0b8f0adc5d6eb1a1ecd8da24c65
+MD5 b403e951553e3017ee0111d7596b19aa files/m2crypto-0.18-ssize_t.patch 488
+RMD160 207c25f9e0a2b71bdca9b07a3081060777ac0a14 files/m2crypto-0.18-ssize_t.patch 488
+SHA256 4bb6a5e7a460a0fb816439036edc9465dd36b0b8f0adc5d6eb1a1ecd8da24c65 files/m2crypto-0.18-ssize_t.patch 488
 DIST m2crypto-0.16.tar.gz 347250 RMD160 164f1f7b729048b5e42282a734ecb7d6e1fcde2d SHA1 21a0e4ba920a2c40256da63ccd050ada420e9f15 SHA256 9734e7b73eb538c9078fd180e9c9e386d6336bd934e53904f27fe1905746b5f9
-DIST m2crypto-0.17.tar.gz 376219 RMD160 8ee4f92d9efd33341ea4021a35b0ba38de6aa043 SHA1 e99804e249ed855c7e899ba22f2ab3bb1f947ca1 SHA256 9a2b75e4b92ae0cfcb0da657d40d3eec0a3a7b705522f264dc838764d39a5716
 DIST m2crypto-0.18.tar.gz 385298 RMD160 b9eb15b0d93594e264ba412cf9dfa6dc38de439b SHA1 6946bf9082250021e209bd25737c2881198ef707 SHA256 020664f96ba268c21a15295aa2bb257487c9e092309b5c0d6b8a66305f18af1f
 EBUILD m2crypto-0.16.ebuild 1399 RMD160 587622f95eeb19957fde327bbe71f4484c5de16f SHA1 3c9d343eb60f52915817649b47a919932abaf924 SHA256 cf2c44c0c3673624fd8e9d2a937e1959c364fd0fea300dd809a0f31caab7b9f2
 MD5 1ff1570b581baf3f3a3e476697ae4a2b m2crypto-0.16.ebuild 1399
 RMD160 587622f95eeb19957fde327bbe71f4484c5de16f m2crypto-0.16.ebuild 1399
 SHA256 cf2c44c0c3673624fd8e9d2a937e1959c364fd0fea300dd809a0f31caab7b9f2 m2crypto-0.16.ebuild 1399
-EBUILD m2crypto-0.17-r1.ebuild 1253 RMD160 5b65371f1fad050bf558a1bd12bcd494c87661ea SHA1 b91b37f917f3c30d5c934c7ddfef638232823f3d SHA256 802a953dc87ae9a7d3ba0d38abf0dec9dbba6db9d85da6b84d96cc339c96df05
-MD5 7c74080f9289aa5635cb17f707b0980f m2crypto-0.17-r1.ebuild 1253
-RMD160 5b65371f1fad050bf558a1bd12bcd494c87661ea m2crypto-0.17-r1.ebuild 1253
-SHA256 802a953dc87ae9a7d3ba0d38abf0dec9dbba6db9d85da6b84d96cc339c96df05 m2crypto-0.17-r1.ebuild 1253
-EBUILD m2crypto-0.18.ebuild 1250 RMD160 baa985bbb9274e067a84b6f770d2ca4855ef6af8 SHA1 3a775fc130744d32c23fb0c021630210ade40f54 SHA256 80d372b8ff8935ea64d0e5a0b65fb8b8281fda42f9bcc3eb8374fcfa7080b777
-MD5 76cdda8213980ea86dba3f38593912c6 m2crypto-0.18.ebuild 1250
-RMD160 baa985bbb9274e067a84b6f770d2ca4855ef6af8 m2crypto-0.18.ebuild 1250
-SHA256 80d372b8ff8935ea64d0e5a0b65fb8b8281fda42f9bcc3eb8374fcfa7080b777 m2crypto-0.18.ebuild 1250
-MISC ChangeLog 4031 RMD160 0e0565ccb74e94b559611e6737e9ed8cc2e66650 SHA1 1319899002786bab80a0b29cebf45390fa82c0ad SHA256 02d02bb8d4ba9c4a003ee27f102bd10a10cac8e25de3c67eebd1ca8442d1dcd7
-MD5 426cdda9bdc9e3e02b20ed28fd278083 ChangeLog 4031
-RMD160 0e0565ccb74e94b559611e6737e9ed8cc2e66650 ChangeLog 4031
-SHA256 02d02bb8d4ba9c4a003ee27f102bd10a10cac8e25de3c67eebd1ca8442d1dcd7 ChangeLog 4031
+EBUILD m2crypto-0.18.ebuild 1337 RMD160 8ca4293221c34a0695bdbf9a669c410646028bed SHA1 4cc0009640f5d11777254a3349ed45dae6684c8e SHA256 360551ca148bb31827d3cb993db15eb62bf2a48987ae498918becd045bd073e3
+MD5 6bc79dfc1d4b9f664134ec23fc1f1957 m2crypto-0.18.ebuild 1337
+RMD160 8ca4293221c34a0695bdbf9a669c410646028bed m2crypto-0.18.ebuild 1337
+SHA256 360551ca148bb31827d3cb993db15eb62bf2a48987ae498918becd045bd073e3 m2crypto-0.18.ebuild 1337
+MISC ChangeLog 4249 RMD160 22ddd6dce21f97a703ea0ca8c39451b909066311 SHA1 82ef356329bbe9276fa93b9c31e747de2bf847de SHA256 f289bdbd781eb6098168c34d937c6f992dcfa07adb9b6991709dda6e35625b8b
+MD5 a8440e41faf4dad5395e8acc4a886bf0 ChangeLog 4249
+RMD160 22ddd6dce21f97a703ea0ca8c39451b909066311 ChangeLog 4249
+SHA256 f289bdbd781eb6098168c34d937c6f992dcfa07adb9b6991709dda6e35625b8b ChangeLog 4249
 MISC metadata.xml 159 RMD160 900a8c55d7a7d2f6312594769aaf941bf9e99c7f SHA1 c8e604d56dae898258b5254d78cfeac0b981e288 SHA256 9f01104d3484792496faff4805eed0ecea2352a897151f3397d49a13800037b4
 MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
 RMD160 900a8c55d7a7d2f6312594769aaf941bf9e99c7f metadata.xml 159
@@ -24,9 +23,6 @@ SHA256 9f01104d3484792496faff4805eed0ecea2352a897151f3397d49a13800037b4 metadata
 MD5 9a6502c1cb53db8ffb03bd4339e57ac3 files/digest-m2crypto-0.16 241
 RMD160 2d543e671378719d78fc42d4ca2cc7537d0b1fa7 files/digest-m2crypto-0.16 241
 SHA256 2a283e192ea116ea1bb7cf10a9eb9f50738b6514c52902740cfb3b16a98b5bb2 files/digest-m2crypto-0.16 241
-MD5 3676bbad7466ff10c24c05f56a55a898 files/digest-m2crypto-0.17-r1 241
-RMD160 18d6a4bd57195a8560a4802d4608ebe4e06faf0d files/digest-m2crypto-0.17-r1 241
-SHA256 1c336ba27448c309b2d7ad872bc8f93258d4949f5a9c294e4308bb3fb0cbafc2 files/digest-m2crypto-0.17-r1 241
 MD5 ce818dc30ff5ecc16274b0ff5ed40aab files/digest-m2crypto-0.18 241
 RMD160 f945ceafd69a7dd7e25a2729dee8432ab4ded24d files/digest-m2crypto-0.18 241
 SHA256 87206d323c7b1671981d196b3d57e7aa58b37888dc66c5f66e92a7d5d5033f32 files/digest-m2crypto-0.18 241
diff --git a/dev-python/m2crypto/files/digest-m2crypto-0.17-r1 b/dev-python/m2crypto/files/digest-m2crypto-0.17-r1
deleted file mode 100644
index 613a09f87ae4..000000000000
--- a/dev-python/m2crypto/files/digest-m2crypto-0.17-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 c67b45c752fd5e8115cd6b14831c5a38 m2crypto-0.17.tar.gz 376219
-RMD160 8ee4f92d9efd33341ea4021a35b0ba38de6aa043 m2crypto-0.17.tar.gz 376219
-SHA256 9a2b75e4b92ae0cfcb0da657d40d3eec0a3a7b705522f264dc838764d39a5716 m2crypto-0.17.tar.gz 376219
diff --git a/dev-python/m2crypto/files/m2crypto-0.18-ssize_t.patch b/dev-python/m2crypto/files/m2crypto-0.18-ssize_t.patch
new file mode 100644
index 000000000000..39c1e43eee7d
--- /dev/null
+++ b/dev-python/m2crypto/files/m2crypto-0.18-ssize_t.patch
@@ -0,0 +1,14 @@
+--- SWIG/_lib.h.orig	2007-05-09 01:21:51.000000000 +0300
++++ SWIG/_lib.h	2007-09-20 03:49:24.000000000 +0300
+@@ -1,8 +1,10 @@
+ /* Copyright (c) 1999 Ng Pheng Siong. All rights reserved. */
+ /* $Id: m2crypto-0.18-ssize_t.patch,v 1.1 2007/09/20 01:18:51 hawking Exp $ */
+ 
+-#if PY_VERSION_HEX < 0x02050000
++#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 _blob {
diff --git a/dev-python/m2crypto/m2crypto-0.17-r1.ebuild b/dev-python/m2crypto/m2crypto-0.17-r1.ebuild
deleted file mode 100644
index 8379a78d5aa4..000000000000
--- a/dev-python/m2crypto/m2crypto-0.17-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/m2crypto/m2crypto-0.17-r1.ebuild,v 1.4 2007/06/17 14:56:46 armin76 Exp $
-
-inherit distutils portability eutils multilib
-
-MY_P="${PN}-${PV%.*}"
-
-DESCRIPTION="A python wrapper for the OpenSSL crypto library"
-HOMEPAGE="http://wiki.osafoundation.org/bin/view/Projects/MeTooCrypto"
-SRC_URI="http://wiki.osafoundation.org/pub/Projects/MeTooCrypto/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="doc"
-
-RDEPEND=">=dev-libs/openssl-0.9.8"
-DEPEND="${RDEPEND}
-	>=dev-lang/swig-1.3.25
-	doc? ( dev-python/epydoc )
-	dev-python/setuptools"
-
-PYTHON_MODNAME="M2Crypto"
-
-src_install() {
-	DOCS="CHANGES INSTALL"
-	distutils_src_install
-
-	if use doc; then
-		cd "${S}/demo"
-		treecopy . "${D}/usr/share/doc/${PF}/example"
-
-		einfo "Generating API docs as requested..."
-		cd "${S}/doc"
-		distutils_python_version
-		export PYTHONPATH="${PYTHONPATH}:${D}/usr/$(get_libdir)/python${PYVER}/site-packages"
-		einfo "${PYTHONPATH}"
-		epydoc --html --output=api --name=M2Crypto M2Crypto
-	fi
-	dohtml -r *
-}
-
-src_test() {
-	python setup.py test || die "test failed"
-}
diff --git a/dev-python/m2crypto/m2crypto-0.18.ebuild b/dev-python/m2crypto/m2crypto-0.18.ebuild
index d70504fcf6bf..3af9f4c56c58 100644
--- a/dev-python/m2crypto/m2crypto-0.18.ebuild
+++ b/dev-python/m2crypto/m2crypto-0.18.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/m2crypto/m2crypto-0.18.ebuild,v 1.1 2007/09/05 17:19:02 hawking Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/m2crypto/m2crypto-0.18.ebuild,v 1.2 2007/09/20 01:18:51 hawking Exp $
 
 inherit distutils portability eutils multilib
 
@@ -23,6 +23,12 @@ DEPEND="${RDEPEND}
 
 PYTHON_MODNAME="M2Crypto"
 
+src_unpack() {
+	distutils_src_unpack
+
+	epatch "${FILESDIR}/${P}-ssize_t.patch"
+}
+
 src_install() {
 	DOCS="CHANGES INSTALL"
 	distutils_src_install
@@ -42,5 +48,5 @@ src_install() {
 }
 
 src_test() {
-	python setup.py test || die "test failed"
+	"${python}" setup.py test || die "test failed"
 }