Version bump.

(Portage version: 14510-svn/cvs/Linux x86_64)

5 files changed, 61 insertions, 135 deletions

diff --git a/dev-python/m2crypto/ChangeLog b/dev-python/m2crypto/ChangeLog
index cc84ed6ec83a..335d5c2896b5 100644
--- a/dev-python/m2crypto/ChangeLog
+++ b/dev-python/m2crypto/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-python/m2crypto
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/m2crypto/ChangeLog,v 1.45 2009/09/08 02:19:30 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/m2crypto/ChangeLog,v 1.46 2009/10/07 19:03:19 arfrever Exp $
+
+*m2crypto-0.20.2 (07 Oct 2009)
+
+  07 Oct 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  -m2crypto-0.16.ebuild, -m2crypto-0.18.2.ebuild,
+  -files/m2crypto-0.18.2-timeval_struct_size.patch, +m2crypto-0.20.2.ebuild:
+  Version bump.
 
   08 Sep 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
   m2crypto-0.20.1.ebuild:
diff --git a/dev-python/m2crypto/files/m2crypto-0.18.2-timeval_struct_size.patch b/dev-python/m2crypto/files/m2crypto-0.18.2-timeval_struct_size.patch
deleted file mode 100644
index 77a4b2993c0c..000000000000
--- a/dev-python/m2crypto/files/m2crypto-0.18.2-timeval_struct_size.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- M2Crypto/SSL/Connection.py.orig	2008-02-24 12:27:31.000000000 +0100
-+++ M2Crypto/SSL/Connection.py	2008-02-24 12:28:26.000000000 +0100
-@@ -4,6 +4,8 @@
- 
- # Python
- import socket
-+import struct
-+sizeof_timeval = struct.calcsize('ll')
- 
- # M2Crypto
- from Cipher import Cipher, Cipher_Stack
-@@ -325,10 +327,10 @@
-         return m2.ssl_get_default_session_timeout(self.ssl)
- 
-     def get_socket_read_timeout(self):
--        return timeout.struct_to_timeout(self.socket.getsockopt(socket.SOL_SOCKET, socket.SO_RCVTIMEO, 8))
-+        return timeout.struct_to_timeout(self.socket.getsockopt(socket.SOL_SOCKET, socket.SO_RCVTIMEO, sizeof_timeval))
- 
-     def get_socket_write_timeout(self):
--        return timeout.struct_to_timeout(self.socket.getsockopt(socket.SOL_SOCKET, socket.SO_SNDTIMEO, 8))
-+        return timeout.struct_to_timeout(self.socket.getsockopt(socket.SOL_SOCKET, socket.SO_SNDTIMEO, sizeof_timeval))
- 
-     def set_socket_read_timeout(self, timeo):
-         assert isinstance(timeo, timeout.timeout)
diff --git a/dev-python/m2crypto/m2crypto-0.16.ebuild b/dev-python/m2crypto/m2crypto-0.16.ebuild
deleted file mode 100644
index 8ea2ee53ab6a..000000000000
--- a/dev-python/m2crypto/m2crypto-0.16.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/m2crypto/m2crypto-0.16.ebuild,v 1.4 2008/06/21 15:04:19 nixnut Exp $
-
-inherit distutils portability eutils
-
-MY_PV="${PV%.*}"
-MY_P="${PN}-${MY_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="~amd64 ~ia64 ppc x86"
-IUSE="doc"
-
-#S="${WORKDIR}/${MY_P}"
-
-RDEPEND=">=dev-libs/openssl-0.9.7
-	app-arch/unzip
-	virtual/python
-	doc? ( dev-python/epydoc )"
-DEPEND="${RDEPEND}
-	>=dev-lang/swig-1.3.25"
-
-PYTHON_MODNAME="M2Crypto"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# apply patches
-	#epatch "${FILESDIR}/${MY_P}-gentoo.patch"
-
-	# convert swig %name syntax to %rename syntax
-	# FIXME: doesn't work right now as expected. commented out for now.
-	#sed -i -e "s:^%name(\([^ ]*\))[^/]* \*\?\([^ ]\+\)(.*);.*:%rename \2 \1;:g" SWIG/*.i
-
-	# removing obsolete CVS dirs
-	rm -rf $(find -name CVS -type d)
-}
-
-src_install() {
-	DOCS="CHANGES INSTALL"
-	distutils_src_install
-	dohtml -r doc/*
-
-	if use doc; then
-		cd "${S}"/doc/
-		epydoc --html --parse-only --output=api --name=M2Crypto M2Crypto
-		dohtml -r "${S}-doc"/*
-		cd "${S}"/demo && treecopy . "${D}/usr/share/doc/${PF}/example"
-	fi
-}
diff --git a/dev-python/m2crypto/m2crypto-0.18.2.ebuild b/dev-python/m2crypto/m2crypto-0.18.2.ebuild
deleted file mode 100644
index b969fb94e98c..000000000000
--- a/dev-python/m2crypto/m2crypto-0.18.2.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/m2crypto/m2crypto-0.18.2.ebuild,v 1.6 2009/03/15 13:52:27 ranger 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 ~arm ~hppa ~ia64 ~ppc ppc64 ~s390 ~sh ~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_unpack() {
-	distutils_src_unpack
-	cd "${S}"
-
-	epatch "${FILESDIR}/${P}-timeval_struct_size.patch"
-	epatch "${FILESDIR}/${P}-resume_session.patch"
-}
-
-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.20.2.ebuild b/dev-python/m2crypto/m2crypto-0.20.2.ebuild
new file mode 100644
index 000000000000..29c1b7162533
--- /dev/null
+++ b/dev-python/m2crypto/m2crypto-0.20.2.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/m2crypto/m2crypto-0.20.2.ebuild,v 1.1 2009/10/07 19:03:19 arfrever Exp $
+
+EAPI="2"
+SUPPORT_PYTHON_ABIS="1"
+
+inherit distutils eutils multilib portability
+
+MY_PN="M2Crypto"
+
+DESCRIPTION="A python wrapper for the OpenSSL crypto library"
+HOMEPAGE="http://chandlerproject.org/bin/view/Projects/MeTooCrypto"
+SRC_URI="http://pypi.python.org/packages/source/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~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"
+RESTRICT_PYTHON_ABIS="3.*"
+
+PYTHON_MODNAME="${MY_PN}"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+DOCS="CHANGES"
+
+src_test() {
+	testing() {
+		PYTHONPATH="$(ls -d build-${PYTHON_ABI}/lib*)" "$(PYTHON)" setup.py build -b "build-${PYTHON_ABI}" test
+	}
+	python_execute_function testing
+}
+
+src_install() {
+	distutils_src_install
+
+	if use doc; then
+		cd "${S}/demo"
+		treecopy . "${D}/usr/share/doc/${PF}/example"
+
+		einfo "Generating API documentation..."
+		cd "${S}/doc"
+		PYTHONPATH="${PYTHONPATH}:${D}$(python_get_sitedir)" epydoc --html --output=api --name=M2Crypto M2Crypto
+	fi
+	dohtml -r *
+}