Version bump. Added src_test. Quoting.

Package-Manager: portage-2.1.5_rc3

6 files changed, 124 insertions, 19 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/Manifest b/dev-python/pyopenssl/Manifest
index e239610939b0..d053bfb38b0f 100644
--- a/dev-python/pyopenssl/Manifest
+++ b/dev-python/pyopenssl/Manifest
@@ -1,7 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX pyopenssl-0.7-test.patch 728 RMD160 5ce55981a55e43dd061cca76945acb6eedf89c71 SHA1 d2fb8cc70acdae2e155aabdae04d5f22fcd0a4a1 SHA256 5125c3d71badf163683bf670794857cccff209a5a12dbee602dd72704be370fd
 DIST pyOpenSSL-0.5.1.tar.gz 176151 RMD160 f4453a88300c93724ffc889eb4de17635af17e01 SHA1 d65639255f9266b8ebeb86661a46567624b68b69 SHA256 4082c600f9f9dfa73422086dec4acb21c6e7c2f88610b3c315276292e009a5dc
 DIST pyOpenSSL-0.6.tar.gz 281910 RMD160 cea4f15671eeb721883a741dd01877550a4a4f5c SHA1 a9626095db201eeac979d0624101f5afa888f9b6 SHA256 5f8bee99cc78f1e6c01832582ed1ea5cf344d629d55100d6a0a430a1545dc0a1
-EBUILD pyopenssl-0.5.1.ebuild 995 RMD160 a4824b543f5212c667a8612f9c9faa11a0ea7c6f SHA1 d72ebb6665368a2ffcb6647a1f02bfd5f4c4ae88 SHA256 9a94e6f8e1773568a3dd152780a8a3c517fbda2c09676ab9cea948f8fb5e037a
+DIST pyOpenSSL-0.7.tar.gz 189022 RMD160 a3d208705bd9d495eb7c20f9306e568b71fe95fc SHA1 bd072fef8eb36241852d25a9161282a051f0a63e SHA256 7d53b7277771f21efb7775bedbaa6f72f5509423e16d08b62e3328b3991db255
+EBUILD pyopenssl-0.5.1.ebuild 1005 RMD160 59567a93697a740702061d7730d386c547c5b740 SHA1 b841b1f9affcd805bd15dd12d91591da7060cc46 SHA256 8da1575020cca5a3172f0b514dbf42d9d6dd176c9d6199eb062814761f3c7f2e
 EBUILD pyopenssl-0.6-r1.ebuild 1249 RMD160 c5c026f7d9447d83e96b04effd4d869309d3d13d SHA1 3acac785994804bac076e159359b5218a5f75e26 SHA256 1f149793f6449245e6ed20f61b6396ba2771f99901d7b529756e862cbafba6e4
-EBUILD pyopenssl-0.6.ebuild 1065 RMD160 7f6ab21665a1ca3b337e9b85ccf50f5f3e414f88 SHA1 f41b166d06e203ee5217a8c2f33578555eabcfa2 SHA256 40e50d47b55c7ab4af1f18c9c1b084eab6efb3623c9dca9601a20d1565ba645c
-MISC ChangeLog 3341 RMD160 814c5b45c7686b28058e9840f940c3106de61af0 SHA1 f32f5c367783d272217cf7c22447fc6318e22b63 SHA256 3a602bb07d592ae69a7407e705dd5546082e6fc5d5f03aca26835421611939dd
+EBUILD pyopenssl-0.6.ebuild 1075 RMD160 0b1bc7f04c3fbf21efa3daddc94580bbae01bc54 SHA1 0baa6f21ab3a6cb3ffc10d5459cdca501a9a259e SHA256 994c1af3147f1f9135980641280fcc7534ca8c3167e48f3aee34ddf68502d17a
+EBUILD pyopenssl-0.7.ebuild 1537 RMD160 4c9db518d3eaedd55cb4831cd30e129aa835be2a SHA1 64ffaabbf8a72c16f7d56bdf1b879586dc04a8bb SHA256 becc729538c93dfc671b5a4281e2960ac48398829c1904842511c4a622a4d3ec
+MISC ChangeLog 3567 RMD160 690a34dc055a559d206319ac1bc13164160e4759 SHA1 e16124584502c74aed1a7bcddf4c03bcfdbd6e0d SHA256 24f5afdcde07e2093155145a007963c2740405875f5f10fe0a3b9e34be2aef9f
 MISC metadata.xml 159 RMD160 900a8c55d7a7d2f6312594769aaf941bf9e99c7f SHA1 c8e604d56dae898258b5254d78cfeac0b981e288 SHA256 9f01104d3484792496faff4805eed0ecea2352a897151f3397d49a13800037b4
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkgF3fsACgkQQU4yORhF8iAHNQCfSp4dGyq61ELmlaiAYg8ELL2t
+UIQAn0CzP1HvG+5sjH+5WMJQVye2MaSt
+=bZD8
+-----END PGP SIGNATURE-----
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."
+}