Version bump.

Package-Manager: portage-14510-svn/cvs/Linux x86_64

6 files changed, 64 insertions, 141 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/Manifest b/dev-python/m2crypto/Manifest
index 7994823da4a6..ea6acc0a2f5e 100644
--- a/dev-python/m2crypto/Manifest
+++ b/dev-python/m2crypto/Manifest
@@ -1,12 +1,9 @@
 AUX m2crypto-0.18.2-resume_session.patch 1312 RMD160 46ba3f8ad950fef257cc588e1b3f56267bb68532 SHA1 64fcaa0299b0fc744682452f87d252d9f2467be9 SHA256 9b5fa3cb04150385b50de3118fe543822f5d9553428813eaa309b0ac3706eb21
-AUX m2crypto-0.18.2-timeval_struct_size.patch 1018 RMD160 06c9cbdb48b30f03c404acf6f9a2e2b7414962d9 SHA1 52f7d84618994e37421de1a233cb7dae0e4a0e7e SHA256 f89bcdecbf575b9a216721209ba5fa2ceb1f8171fef07b2993aefa327e4b2f99
 DIST M2Crypto-0.19.1.tar.gz 390933 RMD160 b28c2082a55e7dfcf242ed19f68052114dea5aec SHA1 e1c0bc6c006c95a52c60c1ecd8f2e6a1af5fb967 SHA256 a9cfce4ffc2690d35adf31e655fd89ee67590e222c84f75f2a62672e9c37aa27
 DIST M2Crypto-0.20.1.tar.gz 412931 RMD160 943b0839557adfe36836aecc472b0b00dc0cb4b0 SHA1 a4ec19dfa160050737301667b5a14a71f4e7dc1e SHA256 0f83cf8216642a4a263b5c111a399c4170f9c2f51c2166945906bdbf8feaf300
-DIST m2crypto-0.16.tar.gz 347250 RMD160 164f1f7b729048b5e42282a734ecb7d6e1fcde2d SHA1 21a0e4ba920a2c40256da63ccd050ada420e9f15 SHA256 9734e7b73eb538c9078fd180e9c9e386d6336bd934e53904f27fe1905746b5f9
-DIST m2crypto-0.18.2.tar.gz 386148 RMD160 9ba9b84a11eef454fb2483fdaf753b8eb39736b7 SHA1 89e1a252e69e1cf054d434793e21783e5ddc56b9 SHA256 62ed44c8b2d392bdc757981ac37f05d808a0d917e4f9d95de2fbf3c2bdad41a7
-EBUILD m2crypto-0.16.ebuild 1424 RMD160 d8b384a573f553660aa00a90d0bcc6ee04b2c796 SHA1 e4a2794fe75b195edd8954fa721c63c116beddd2 SHA256 1fda869d384d418e9a62d1dade289b47d8919758159253daec4df3ba21d36928
-EBUILD m2crypto-0.18.2.ebuild 1422 RMD160 c335b7f1bba6d09f7d5682d65e94405031e30b8b SHA1 bca7ee5aca9683d1157fdd9ba85be95fce2cf949 SHA256 35f6621308a12d7ee55b72ff6241f4247786fc51b725257237fe473775354f86
+DIST M2Crypto-0.20.2.tar.gz 412987 RMD160 7376195fd586e7834d41229a4798f8810b86eed2 SHA1 6e85d7035971c353db74a497fca0ec2eaea4dea0 SHA256 fc66b96ad2a14de1a502358286d3490677eda30385645fca995fffff22b73e6e
 EBUILD m2crypto-0.19.1.ebuild 1391 RMD160 7f5f291e6195035bec86a06265c2776843421078 SHA1 033962ff97404d62edb3ea26cad2e59bfb9081e7 SHA256 791ff9bd732371de8089ed1d0e097009705675f1d4c4a929b7327d46555e2663
 EBUILD m2crypto-0.20.1.ebuild 1382 RMD160 7b866f24d3bca1f6f95d89cfc90ce8da2046ec09 SHA1 faa524987a79de5bfdec2809384a492fc821c205 SHA256 fb6cf080b63365c256b77fe09137024cd3614c588263eed27b384ee43d1acd14
-MISC ChangeLog 6222 RMD160 39aed5055b7477bb6c842b8b5a01191b3a318102 SHA1 b231a50fd4b74f8a6e57dfd4831acea0c6fa2ee4 SHA256 984ecfe9e64612a0f6f52a120c9ad11aa01773caa4936bca5878be0bc084a846
+EBUILD m2crypto-0.20.2.ebuild 1382 RMD160 b57cad50f380c20b5f8a890917baa5d32fa9929e SHA1 6fef6aa1e3ab5d2d6e52415845d890cd76c77e06 SHA256 c9480d258aec7599c0f5e49e02ee33788c0ca5e0d4cec0c8b2b472865e24fa85
+MISC ChangeLog 6471 RMD160 10ce8013fb90115512c5ec78aa487419dc922b86 SHA1 ea025f9d0456838257c38889752103590671a19d SHA256 27666b6621a3fed5dc464460c8d6bf5aca2719931da99fa25a9f6bb370aca47d
 MISC metadata.xml 159 RMD160 900a8c55d7a7d2f6312594769aaf941bf9e99c7f SHA1 c8e604d56dae898258b5254d78cfeac0b981e288 SHA256 9f01104d3484792496faff4805eed0ecea2352a897151f3397d49a13800037b4
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 *
+}