Migrate to distutils-r1.

Package-Manager: portage-2.2.0_alpha163/cvs/Linux x86_64
Manifest-Sign-Key: 0x42B9401D

3 files changed, 52 insertions, 54 deletions

diff --git a/dev-python/pyopenssl/ChangeLog b/dev-python/pyopenssl/ChangeLog
index f552d40fb698..ca07026cb3e1 100644
--- a/dev-python/pyopenssl/ChangeLog
+++ b/dev-python/pyopenssl/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/pyopenssl
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyopenssl/ChangeLog,v 1.89 2013/02/04 07:28:29 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyopenssl/ChangeLog,v 1.90 2013/02/16 11:44:16 mgorny Exp $
+
+  16 Feb 2013; Michał Górny <mgorny@gentoo.org> pyopenssl-0.13-r1.ebuild:
+  Migrate to distutils-r1.
 
 *pyopenssl-0.13-r1 (04 Feb 2013)
 
diff --git a/dev-python/pyopenssl/Manifest b/dev-python/pyopenssl/Manifest
index 12dc52506a8e..cb98eca13ce7 100644
--- a/dev-python/pyopenssl/Manifest
+++ b/dev-python/pyopenssl/Manifest
@@ -1,8 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX pyopenssl-0.11-openssl-1.patch 345 SHA256 3ddd3bf704a75d5cf673814efc051b70938f6f94093e70873f7c83828db52d08 SHA512 6400e22182cf705cccb355595b111dc96d15acc86cbb4bce882300c39e1bdf854808814fd9e08aada3c0ef19ad493da245d9fc12ad49758c240bf90b2ad923b7 WHIRLPOOL 53f74732c7b9abec2cc53da24b69ddf079095d357bfbb790a29afd9afd21c20fcc5d978f52542a72b2375daa1ddc74274b0727c9cadc83c146829197315eb81a
 DIST pyOpenSSL-0.12.tar.gz 236041 SHA256 4517e9630a90db09ab8fe77d4dad753d5514a5f76b65ac327a7cd5a1d1ddd8a8 SHA512 aa89859fc7440251515ba0e4b752b39635c575f31f16ae4589c1b5154995316d5e5be102738388f039c96f19cf828b8ac2a1812f8f24d85b6f15911905bea367 WHIRLPOOL 4a290c8ae6ec53449820f82138b49b7f594276b0a3ea3857d962db588dbadf35c6a4f01b863ac00a13d77d166b5bcf947554c5cb8e90e830d6f9ba5ec820cc04
 DIST pyOpenSSL-0.13.tar.gz 250489 SHA256 21e12b03abaa0e04ecc8cd9c251598f71bae11c9f385304234e4ea5618c6163b SHA512 23009b9c3d7e65d511edc4beebe2370e0dd2b21fa4e4fe61569e41f845261b02965aeb54e397ae5de0ec5db1e8ea21510aae387919a776ba820a97df40f7b75f WHIRLPOOL 3c25520b9f6e517d3f1193385f0bc54eca3d4a8ed387535aed2c281ea5d27712df23dc4606f93d730d91514978a84db4da12bcd706426081aa71a6cf9f38e67d
 EBUILD pyopenssl-0.12.ebuild 2668 SHA256 3ae5849826454496b83c0c2359c54e1f1fa70045a5542a8d84350a32fec70fcc SHA512 5911fcac83ab522543f963609d55dbb1668f6f574daa11f68c20354a38587281948f1cc95732a63de83cf9a8995882ec87162a44cd76bd474e7205735cd28fb3 WHIRLPOOL 737b3cb384bf1d6d1a80cc64bdda062d4a57cdee99bff582784abacc0905a87650cad5112f329d8840330f50ff9fcea42c079d97355c7379de39642b2069211f
-EBUILD pyopenssl-0.13-r1.ebuild 2275 SHA256 0415866c6abacd2c64bda2b92ed10d5c692e9c2697597333ffee0d4514591863 SHA512 4b12d997c42f41ba696d01248f2a16c190c6d6cd304a7a77994fb15e91ab727b96ed82f745ef362c19606c7f6c1b2e1db04bb65dcac565d421d7f7108add876e WHIRLPOOL 810f951fd2a334704d7a0a3c5a2c79cc06f30ee59cae4c4bcf6b53a735a232a83c8c28715060a06115d9473d9e5226a58890df5633a1916990ddd34ae7e432ec
+EBUILD pyopenssl-0.13-r1.ebuild 1929 SHA256 93703985c9df0756169a3a81bc53c36a1a9863413491586397374e922038ff6c SHA512 75ec09811cea54aca5db571c1056d34099c14b630995e068e57177c201281c3edbe050b719e84dc2d64567ce6a35b60e5283f95019e01a6b117f4b88a2cd98ed WHIRLPOOL a2f40a7bd461f697f6c91e326aecec8a40146a5367ac9d881c644047708ddae4087943afe7f2c28bdce2a8972f10187def128dc1d6d612f29a40223588e709bf
 EBUILD pyopenssl-0.13.ebuild 2264 SHA256 748be0587c8b80ead160b0432485826e37fa9042b5ec5f3d9a8a1220f3d74764 SHA512 9b0c8084cd656fa31248ccf749d9383085328d471c121fd466016c9d1e482625623e95fa961a0cecd38b526124ace61d93b3a04951a27b99659aaca7cef426cd WHIRLPOOL 6c28e2ab787a502992d35ff6664f0f651d394f1d791496b3010a0721a94662f5b0060edd6e550ed9cd6920c0e524403f5daf11e68caf00790a5561ef2cad0c1a
-MISC ChangeLog 11884 SHA256 8678db98c6bf24b9b047d898a4dba0329d0486c30d4157da0aa76ee1254f24d9 SHA512 2875e10f078d5c90dfbec02dd2a61daed60714aed5284c079f6e5f9d0300a6f072dd7375acf1b1c7ee64f3e6b6acd1481a1502e42df0073cb5134c36b266e4f2 WHIRLPOOL 65bca976d72423bf29c63ee2f7fe58d02460d6c092010357deece141c8a712392a9e450c1b8443da4ea3cf3a07d9f9a50336de5defa396c6c49d02a44561c89e
+MISC ChangeLog 11987 SHA256 db0c1b480a8332b4d83f2175b1d1e0d2f03709e9bcf34463766d9fcf1b603405 SHA512 9c8d11e8fa9677c2f214d8f93ad4f000ba9684ceb9baf68f3527d8dcf7743293e956b5454e9ec4c9345ef44ac0fea5468aaaa72cfea443bcc628ee236639602d WHIRLPOOL fd607538f350b23f06668d64d4e90839ec45ab9e2d37bef920424ae6582ae6411564d6f4fe544c991b92d2ebeb60e58b8022a628e0e06a2f2307039dbaa978ce
 MISC metadata.xml 232 SHA256 afa2acc77147c14514995e64d84232809616ed2eb4968d198df6b10f8382231c SHA512 bf827d28513ed903f432f2e214ada07987ce6ba7e6eadfd8262644a6b531e56187d7fddb2679af73144d3083657db376c8d891fe1e6820fcc1e399d1d56424c9 WHIRLPOOL 68f9559b83e18882f4b19ebc97f5b99ce220b5f089bf20c7ab754fdfcccaeb5cbb18fa0abe3bf0f9207640c8acd73836efb8fd8e7a470b4993d289de99e653c3
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iJwEAQEIAAYFAlEfcSUACgkQfXuS5UK5QB2lYgQApFQiZPVqTI+tSawVe5ArUuBj
+PGpupm5F4UhCEOoDpAMvJdTI7CvWNipN4oh7lGJHripdLCLc5cfGlF/eejHeONw+
+fFAH8Y1d3/moAazrMW5E9UPi2jPMyR1IM30Bac0EKVMV55bNqkCxMYm8C6b27xfL
+UZ8cLeDMiU41PjQsggc=
+=p34T
+-----END PGP SIGNATURE-----
diff --git a/dev-python/pyopenssl/pyopenssl-0.13-r1.ebuild b/dev-python/pyopenssl/pyopenssl-0.13-r1.ebuild
index 62cec1b6797f..50d7ac58befe 100644
--- a/dev-python/pyopenssl/pyopenssl-0.13-r1.ebuild
+++ b/dev-python/pyopenssl/pyopenssl-0.13-r1.ebuild
@@ -1,13 +1,12 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyopenssl/pyopenssl-0.13-r1.ebuild,v 1.1 2013/02/04 07:28:29 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyopenssl/pyopenssl-0.13-r1.ebuild,v 1.2 2013/02/16 11:44:16 mgorny Exp $
 
-EAPI="3"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="*-jython"
-PYTHON_TESTS_FAILURES_TOLERANT_ABIS="3.1"
+EAPI=5
 
-inherit distutils
+PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} pypy{1_9,2_0} )
+
+inherit distutils-r1 flag-o-matic
 
 MY_PN="pyOpenSSL"
 MY_P="${MY_PN}-${PV}"
@@ -23,70 +22,54 @@ IUSE="doc"
 
 RDEPEND=">=dev-libs/openssl-0.9.6g"
 DEPEND="${RDEPEND}
-	doc? (
-		=dev-lang/python-2*
-		>=dev-tex/latex2html-2002.2[gif,png]
-	)"
-
-S="${WORKDIR}/${MY_P}"
+	doc? ( >=dev-tex/latex2html-2002.2[gif,png] )"
 
-PYTHON_CFLAGS=("2.* + -fno-strict-aliasing")
+# pypy* won't fit since CPython 3 is 'better' than it
+REQUIRED_USE="doc? ( || ( $(python_gen_useflags python2*) ) )"
 
-PYTHON_MODNAME="OpenSSL"
+S="${WORKDIR}/${MY_P}"
 
-src_prepare() {
-	distutils_src_prepare
+python_prepare_all() {
 	sed \
 		-e "s/test_set_tlsext_host_name_wrong_args/_&/" \
-		-i OpenSSL/test/test_ssl.py
-	sed -e "s/python/&2/" -i doc/Makefile
+		-i OpenSSL/test/test_ssl.py || die "test_ssl sed failed"
+
+	distutils-r1_python_prepare_all
 }
 
-src_compile() {
-	distutils_src_compile
+python_compile() {
+	local CFLAGS=${CFLAGS} CXXFLAGS=${CXXFLAGS}
+	[[ ${EPYTHON} != python3* ]] && append-flags -fno-strict-aliasing
 
+	distutils-r1_python_compile
+}
+
+python_compile_all() {
 	if use doc; then
 		addwrite /var/cache/fonts
 
-		pushd doc > /dev/null
-		emake -j1 html ps dvi || die "Generation of documentation failed"
-		popd > /dev/null
+		cd doc || die
+		emake -j1 html ps dvi
 	fi
 }
 
-src_test() {
-	test_package() {
-		pushd OpenSSL/test > /dev/null
-
-		local exit_status="0" test
-		for test in test_*.py; do
-			einfo "Running ${test}..."
-			if ! PYTHONPATH="$(ls -d ../../build-${PYTHON_ABI}/lib.*)" "$(PYTHON)" "${test}"; then
-				eerror "${test} failed with $(python_get_implementation_and_version)"
-				exit_status="1"
-			fi
-		done
+python_test() {
+	cd "${BUILD_DIR}"/lib/OpenSSL/test || die
 
-		popd > /dev/null
-
-		return "${exit_status}"
-	}
-	python_execute_function test_package
+	local t
+	for t in test_*.py; do
+		"${PYTHON}" "${t}" || ewarn "Test ${t} fails with ${EPYTHON}"
+	done
 }
 
-src_install() {
-	distutils_src_install
-
-	delete_tests() {
-		rm -fr "${ED}$(python_get_sitedir)/OpenSSL/test"
-	}
-	python_execute_function -q delete_tests
+python_install_all() {
+	distutils-r1_python_install_all
 
 	if use doc; then
-		dohtml doc/html/* || die "dohtml failed"
-		dodoc doc/pyOpenSSL.* || die "dodoc failed"
+		dohtml -r doc/html/.
+		dodoc doc/pyOpenSSL.*
 	fi
 
-	insinto /usr/share/doc/${PF}/examples
-	doins -r examples/* || die "doins failed"
+	dodoc -r examples
+	docompress -x /usr/share/doc/${PF}/examples
 }