Version bump. Added src_test. Quoting.

(Portage version: 2.1.5_rc3)

5 files changed, 108 insertions, 16 deletions

diff --git a/dev-python/pyopenssl/ChangeLog b/dev-python/pyopenssl/ChangeLog
index fe6a3849590c..ed97cf6c232a 100644
--- a/dev-python/pyopenssl/ChangeLog
+++ b/dev-python/pyopenssl/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-python/pyopenssl
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyopenssl/ChangeLog,v 1.21 2007/11/23 01:06:29 hawking Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyopenssl/ChangeLog,v 1.22 2008/04/16 11:07:38 hawking Exp $
+
+*pyopenssl-0.7 (16 Apr 2008)
+
+  16 Apr 2008; Ali Polatel <hawking@gentoo.org>
+  +files/pyopenssl-0.7-test.patch, pyopenssl-0.5.1.ebuild,
+  pyopenssl-0.6.ebuild, +pyopenssl-0.7.ebuild:
+  Version bump. Added src_test. Quoting.
 
   23 Nov 2007; Ali Polatel <hawking@gentoo.org> pyopenssl-0.5.1.ebuild,
   pyopenssl-0.6.ebuild:
diff --git a/dev-python/pyopenssl/files/pyopenssl-0.7-test.patch b/dev-python/pyopenssl/files/pyopenssl-0.7-test.patch
new file mode 100644
index 000000000000..d062bfe961b3
--- /dev/null
+++ b/dev-python/pyopenssl/files/pyopenssl-0.7-test.patch
@@ -0,0 +1,20 @@
+--- pyOpenSSL-0.7/test/test_crypto.py	2008-04-11 18:45:54.000000000 +0300
++++ pyOpenSSL-0.7/test/test_crypto.py	2008-04-16 13:14:19.088659137 +0300
+@@ -534,3 +534,7 @@
+         self.assertEqual(
+             cert.digest("md5"),
+             "A8:EB:07:F8:53:25:0A:F2:56:05:C5:A5:C4:C4:C7:15")
++
++if __name__ == '__main__':
++    import unittest
++    unittest.main()
+--- pyOpenSSL-0.7/test/test_ssl.py	2008-03-22 00:34:42.000000000 +0200
++++ pyOpenSSL-0.7/test/test_ssl.py	2008-04-16 13:15:33.345659292 +0300
+@@ -35,3 +35,7 @@
+         ctx = Context(TLSv1_METHOD)
+         ctx.use_privatekey(key)
+         self.assertRaises(TypeError, ctx.use_privatekey, "")
++
++if __name__ == '__main__':
++    import unittest
++    unittest.main()
diff --git a/dev-python/pyopenssl/pyopenssl-0.5.1.ebuild b/dev-python/pyopenssl/pyopenssl-0.5.1.ebuild
index 08a356f5f0cb..820df4edfd6d 100644
--- a/dev-python/pyopenssl/pyopenssl-0.5.1.ebuild
+++ b/dev-python/pyopenssl/pyopenssl-0.5.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyopenssl/pyopenssl-0.5.1.ebuild,v 1.4 2007/11/23 01:06:29 hawking Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyopenssl/pyopenssl-0.5.1.ebuild,v 1.5 2008/04/16 11:07:38 hawking Exp $
 
 inherit distutils
 
@@ -25,7 +25,7 @@ src_compile() {
 	distutils_src_compile
 	if use doc ; then
 		addwrite /var/cache/fonts
-		cd ${S}/doc
+		cd "${S}"/doc
 		make html ps dvi
 	fi
 }
@@ -34,13 +34,13 @@ src_install() {
 	distutils_src_install
 
 	if use doc ; then
-		dohtml ${S}/doc/html/*
-		dodoc ${S}/doc/pyOpenSSL.*
+		dohtml "${S}"/doc/html/*
+		dodoc "${S}"/doc/pyOpenSSL.*
 	fi
 
 	# install examples
 	docinto examples
-	dodoc ${S}/examples/*
+	dodoc "${S}"/examples/*
 	docinto examples/simple
-	dodoc ${S}/examples/simple/*
+	dodoc "${S}"/examples/simple/*
 }
diff --git a/dev-python/pyopenssl/pyopenssl-0.6.ebuild b/dev-python/pyopenssl/pyopenssl-0.6.ebuild
index e62f4e419e69..1f30ba099588 100644
--- a/dev-python/pyopenssl/pyopenssl-0.6.ebuild
+++ b/dev-python/pyopenssl/pyopenssl-0.6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyopenssl/pyopenssl-0.6.ebuild,v 1.18 2007/11/23 01:06:29 hawking Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyopenssl/pyopenssl-0.6.ebuild,v 1.19 2008/04/16 11:07:38 hawking Exp $
 
 inherit distutils
 
@@ -27,7 +27,7 @@ src_compile() {
 		addwrite /var/cache/fonts
 		addwrite /usr/share/texmf/fonts/pk
 
-		cd ${S}/doc
+		cd "${S}"/doc
 		make html ps dvi
 	fi
 }
@@ -36,13 +36,13 @@ src_install() {
 	distutils_src_install
 
 	if use doc ; then
-		dohtml ${S}/doc/html/*
-		dodoc ${S}/doc/pyOpenSSL.*
+		dohtml "${S}"/doc/html/*
+		dodoc "${S}"/doc/pyOpenSSL.*
 	fi
 
 	# install examples
 	docinto examples
-	dodoc ${S}/examples/*
+	dodoc "${S}"/examples/*
 	docinto examples/simple
-	dodoc ${S}/examples/simple/*
+	dodoc "${S}"/examples/simple/*
 }
diff --git a/dev-python/pyopenssl/pyopenssl-0.7.ebuild b/dev-python/pyopenssl/pyopenssl-0.7.ebuild
new file mode 100644
index 000000000000..aa477c987d4b
--- /dev/null
+++ b/dev-python/pyopenssl/pyopenssl-0.7.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyopenssl/pyopenssl-0.7.ebuild,v 1.1 2008/04/16 11:07:38 hawking Exp $
+
+inherit distutils eutils
+
+MY_P=${P/openssl/OpenSSL}
+S=${WORKDIR}/${MY_P}
+
+DESCRIPTION="Python interface to the OpenSSL library"
+HOMEPAGE="http://pyopenssl.sourceforge.net/"
+SRC_URI="mirror://sourceforge/pyopenssl/${MY_P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="doc"
+
+RDEPEND="dev-lang/python
+	>=dev-libs/openssl-0.9.6g"
+DEPEND="${RDEPEND}
+	doc? ( >=dev-tex/latex2html-2002.2 )"
+
+src_unpack() {
+	distutils_src_unpack
+
+	epatch "${FILESDIR}"/${P}-test.patch
+}
+
+src_compile() {
+	distutils_src_compile
+	if use doc; then
+		addwrite /var/cache/fonts
+		# This one seems to be unnecessary with a recent tetex, but
+		# according to bugs it was definitely necessary in the past,
+		# so leaving it in.
+		addwrite /usr/share/texmf/fonts/pk
+
+		cd "${S}"/doc
+		make html ps dvi
+	fi
+}
+
+src_install() {
+	distutils_src_install
+
+	if use doc; then
+		dohtml "${S}"/doc/html/*
+		dodoc "${S}"/doc/pyOpenSSL.*
+	fi
+
+	# install examples
+	docinto examples
+	dodoc "${S}"/examples/*
+	docinto examples/simple
+	dodoc "${S}"/examples/simple/*
+}
+
+src_test() {
+	cd test
+	PYTHONPATH="$(ls -d ../build/lib.*)" "${python}" test_crypto.py ||\
+		die "tests failed."
+	PYTHONPATH="$(ls -d ../build/lib.*)" "${python}" test_ssl.py ||\
+		die "tests failed."
+}