Update EAPI. Fix dependencies. Restrict tests (bug #339409). Avoid breaking strict-aliasing rules. Use Python 2. Don't try to install nonexistent documentation.

Package-Manager: portage-2.2_rc88_p65/cvs/Linux x86_64

3 files changed, 22 insertions, 15 deletions

diff --git a/dev-python/pyme/ChangeLog b/dev-python/pyme/ChangeLog
index 2e00e51563b4..9b4b05e635bc 100644
--- a/dev-python/pyme/ChangeLog
+++ b/dev-python/pyme/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/pyme
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyme/ChangeLog,v 1.31 2010/10/02 13:31:02 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyme/ChangeLog,v 1.32 2010/10/02 15:10:33 arfrever Exp $
+
+  02 Oct 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  pyme-0.8.1.ebuild:
+  Update EAPI. Fix dependencies. Restrict tests (bug #339409). Avoid breaking
+  strict-aliasing rules. Use Python 2. Don't try to install nonexistent
+  documentation.
 
   02 Oct 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
   -pyme-0.6.0-r1.ebuild, -files/pyme-swig-compatibility.patch:
diff --git a/dev-python/pyme/Manifest b/dev-python/pyme/Manifest
index 369b6ffcb704..2c2d152b8443 100644
--- a/dev-python/pyme/Manifest
+++ b/dev-python/pyme/Manifest
@@ -1,4 +1,4 @@
 DIST pyme-0.8.1.tar.gz 78438 RMD160 4d915493251be652283901fd68eaa65af11bd9a4 SHA1 12c8d2845e90fbafbebd2174beb3ee58c19e1c34 SHA256 79b7cc111786c60a50bfd49216e418e045cbc8995d22f041785750577ae4a92d
-EBUILD pyme-0.8.1.ebuild 1427 RMD160 7ccae40c86e37ba23f5189796a8ea9e2cdc5a29b SHA1 a62938aed6b67ef470374515864d709a94bb7970 SHA256 5056a0634e6783babd2124e36c80643cc7788600fdf2adfb997279ec8acdddb2
-MISC ChangeLog 4167 RMD160 29c1dd01fe7a0c07eb68ea79b2ed8b9605fa08d4 SHA1 7945f935b532e5d4c1c5e760948e13080bf1849e SHA256 00242a2573a5e88be12772b24859a758f9cc471f99967af73e977963c42af21b
+EBUILD pyme-0.8.1.ebuild 1392 RMD160 6fa9068ade16dc73f2d91b08ee2b04301fb69bb8 SHA1 6397e90b0465424f7ee12c0d9ad68383cf5302b8 SHA256 cd8bbfa9eedcde322e1154f8280f6cdf0933bf787e556db62555fd1495dd2da3
+MISC ChangeLog 4429 RMD160 59180b502dec416a7814197e1915556f30a330a9 SHA1 c64e69338fff47d49e81e444c9b1c3a2bb0910ba SHA256 07a4ab18bc32a0a08ea6c23931a10b8e56ac68b48fc8aecb20de601c5603a4f6
 MISC metadata.xml 159 RMD160 900a8c55d7a7d2f6312594769aaf941bf9e99c7f SHA1 c8e604d56dae898258b5254d78cfeac0b981e288 SHA256 9f01104d3484792496faff4805eed0ecea2352a897151f3397d49a13800037b4
diff --git a/dev-python/pyme/pyme-0.8.1.ebuild b/dev-python/pyme/pyme-0.8.1.ebuild
index d92c1eb63097..63d1febed3c8 100644
--- a/dev-python/pyme/pyme-0.8.1.ebuild
+++ b/dev-python/pyme/pyme-0.8.1.ebuild
@@ -1,9 +1,11 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyme/pyme-0.8.1.ebuild,v 1.5 2009/09/27 18:50:59 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyme/pyme-0.8.1.ebuild,v 1.6 2010/10/02 15:10:33 arfrever Exp $
 
-EAPI="2"
+EAPI="3"
+PYTHON_DEPEND="2"
 SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.*"
 
 inherit distutils eutils
 
@@ -14,41 +16,40 @@ SRC_URI="mirror://sourceforge/pyme/${P}.tar.gz"
 LICENSE="|| ( GPL-2 LGPL-2.1 )"
 SLOT="0"
 KEYWORDS="~amd64 ~ia64 ppc ~sparc x86"
-IUSE="doc examples"
+IUSE="examples"
 
 RDEPEND=">=app-crypt/gpgme-0.9.0"
 DEPEND="${RDEPEND}
 	dev-lang/swig"
+RESTRICT="test"
 
-RESTRICT_PYTHON_ABIS="3*"
+PYTHON_CFLAGS=("2.* + -fno-strict-aliasing")
 
 src_prepare() {
 	distutils_src_prepare
 
-	sed -i \
+	sed \
 		-e 's:include/:include/gpgme/:' \
 		-e 's/SWIGOPT :=.*/& -D_FILE_OFFSET_BITS=64/' \
-		-e 's:$(PYTHON):/usr/bin/python:' \
-		-e '/-rm doc\/\*\.html$/d' \
-		Makefile || die "sed Makefile failed"
+		-e 's/shell python/shell $(PYTHON)/' \
+		-i Makefile || die "sed Makefile failed"
 	sed -e 's/^\(define_macros = \).*/\1[("_FILE_OFFSET_BITS=64", None)]/' -i setup.py || die "sed setup.py failed"
 }
 
 src_compile() {
-	emake -j1 PYTHON="/usr/bin/python" swig || die "emake swig failed"
+	emake -j1 PYTHON="$(PYTHON -f)" swig || die "emake swig failed"
 	distutils_src_compile
 }
 
 src_test() {
 	testing() {
-		PYTHONPATH=$(echo build-${PYTHON_ABI}/lib.*) "$(PYTHON)" examples/genkey.py || die "genkey test failed with Python ${PYTHON_ABI}"
+		PYTHONPATH=$(echo build-${PYTHON_ABI}/lib.*) "$(PYTHON)" examples/genkey.py
 	}
 	python_execute_function testing
 }
 
 src_install() {
 	distutils_src_install
-	use doc && dohtml -r doc/*
 
 	if use examples; then
 		insinto /usr/share/doc/${PF}/examples