Restrict pypy, move to EAPI=4

Package-Manager: portage-2.2.0_alpha90/cvs/Linux x86_64

4 files changed, 57 insertions, 65 deletions

diff --git a/sci-chemistry/pdb2pqr/ChangeLog b/sci-chemistry/pdb2pqr/ChangeLog
index 2222f07c3754..5d2e86f7b0db 100644
--- a/sci-chemistry/pdb2pqr/ChangeLog
+++ b/sci-chemistry/pdb2pqr/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-chemistry/pdb2pqr
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/pdb2pqr/ChangeLog,v 1.34 2011/06/21 16:02:05 jlec Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/pdb2pqr/ChangeLog,v 1.35 2012/03/10 14:20:09 jlec Exp $
+
+  10 Mar 2012; Justin Lecher <jlec@gentoo.org> pdb2pqr-1.7.0-r1.ebuild,
+  metadata.xml:
+  Restrict pypy, move to EAPI=4
 
   21 Jun 2011; Justin Lecher <jlec@gentoo.org> pdb2pqr-1.5.0-r2.ebuild,
   pdb2pqr-1.7.0.ebuild, pdb2pqr-1.7.0-r1.ebuild:
diff --git a/sci-chemistry/pdb2pqr/Manifest b/sci-chemistry/pdb2pqr/Manifest
index d7919e94d19b..c28393b31cb9 100644
--- a/sci-chemistry/pdb2pqr/Manifest
+++ b/sci-chemistry/pdb2pqr/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 AUX 1.7.0-install.patch 5165 RMD160 6937f62cd4035c40d3575455f1faed6114b1bfd2 SHA1 304cdd46d76745e29a8bd00f4bdbd63dbe4b135c SHA256 965c0bf8077eebc733c60d4e80d05167ce31d7188b01ca43c0fb5c0b27ede22b
 AUX pdb2pqr-1.4.0-automagic.patch 3526 RMD160 c4d662e68352d93f913fdc83b5c733a555a9bc17 SHA1 64598bff69e627a27ffa550ad5f3b38898a3a9cf SHA256 f145bc6222d56410035240e2d8be9fbbb0d70dabccad5c5efc5d4dacd602670a
@@ -8,14 +8,14 @@ AUX pdb2pqr-1.4.0-ldflags.patch 1293 RMD160 47c2e4b484cf0936176683342afa6e89bb0b
 DIST pdb2pqr-1.5.tar.gz 5747178 RMD160 543545513811bae058e23cfe1f24e02eaa094b87 SHA1 5249064cf4ebfb2291a382121ecea4d457e65e6a SHA256 2a83433b50a57aa0a05102c425cd7b4bb6750487327195ab719992f4186281c5
 DIST pdb2pqr-1.7.tar.gz 6906538 RMD160 606fd8451c52e642a08d5f6c7cdcd51659ea57bc SHA1 23a0a0a5ed54b55269b60b4c4161d914cb30ecca SHA256 8d27f2df430c40b99cde7952d0e96e72e433871a289d39c970b5eefe34345757
 EBUILD pdb2pqr-1.5.0-r2.ebuild 3629 RMD160 494b644fbe6a829186438715a8b2e0bcfcac1c69 SHA1 2e77a76d193679ec0aefe2d9e8bf617c96de1787 SHA256 b64a8f88adc2239f1c13f311dbaae1da7b015dcbd5f1a4ea2b47b783f5f6b5df
-EBUILD pdb2pqr-1.7.0-r1.ebuild 4359 RMD160 ef2461488257f9ae086040e54f54ec69e7b81ce7 SHA1 8db44cfe5979a462fd93707b3f3649feb8e3667c SHA256 2aad3b3e048b0c49ed4237868fe56a2c5a0e7b01c1d5a72ed9e88f5934a98fb2
+EBUILD pdb2pqr-1.7.0-r1.ebuild 3858 RMD160 21521af03f9de89ad36653f1d78bba00644429a9 SHA1 f1818cb87fce2c1e596117b97420eb6f38410d5f SHA256 cfc4e6d7101e12dfcf7f6f014075835beb435e22405f1e7d3b781d5cb8957dac
 EBUILD pdb2pqr-1.7.0.ebuild 3622 RMD160 320195cc0488d4a41e4e4c3c96e92c17a12d239f SHA1 d8705cc367ddc706d21d934f8eb0bed9007e8f0b SHA256 22ebf71c720e38672c7e6019b6489b554fe989cbebcf3e651fed49940884f8a0
-MISC ChangeLog 5576 RMD160 76aa2686360fac8c0e6e78f8109b40517b7c14b7 SHA1 75af9dd520c66d1798b67b87f5243cb2b5dba83e SHA256 2f219643ec83e7ae3428ee8d41c6770d4f6376b7ba9f3754e33281b911fc9a54
-MISC metadata.xml 300 RMD160 63c92fffb0e59b807b40861a654820a834e96fd0 SHA1 b358bcdccec7ca1cb5f8e3c727cbd25ffe42a893 SHA256 9094f15d456890a95601f0770d7e7b6287dd0793252cb0d5dbe3584fde221e50
+MISC ChangeLog 5697 RMD160 fd1de1bfaccfccb7621187196393c6aaff2a6b9f SHA1 2f81c890bb4579bddcfc0bf6ff98c0ebfafc1551 SHA256 a65f3bc5e45506620479ebbd3f45f1979e387bb40a276ed5ea872fccceb2bb9c
+MISC metadata.xml 305 RMD160 acae1add34cc228a42d6594c19d9b054bea0c14a SHA1 327265beabbfc4937ba143c6958ea89c639c8148 SHA256 5239d437369038113c15797a9a6074c6ed5e5577154dc8e992ac9634c54ab44b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk4AwIMACgkQgAnW8HDreRaYKACgoijo+13YeJkemWHtjoNylHWa
-ERkAoLr40UrC7FV8zwDvhlvKBA80L97x
-=9b+2
+iEYEAREKAAYFAk9bYx4ACgkQgAnW8HDreRZEfACgtvazH08ltppqciVxcd27UmCS
+ResAn2s/0JQkPSgSqKtan5yhOWlhn08j
+=jbvj
 -----END PGP SIGNATURE-----
diff --git a/sci-chemistry/pdb2pqr/metadata.xml b/sci-chemistry/pdb2pqr/metadata.xml
index a99cdb01d6af..678d75f1cf5a 100644
--- a/sci-chemistry/pdb2pqr/metadata.xml
+++ b/sci-chemistry/pdb2pqr/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci-chemistry</herd>
-<use>
-	<flag name='opal'>Add web interface via opal</flag>
-	<flag name='pdb2pka'>Install experimental pdb2pka interface</flag>
-</use>
+	<herd>sci-chemistry</herd>
+	<use>
+		<flag name="opal">Add web interface via opal</flag>
+		<flag name="pdb2pka">Install experimental pdb2pka interface</flag>
+	</use>
 </pkgmetadata>
diff --git a/sci-chemistry/pdb2pqr/pdb2pqr-1.7.0-r1.ebuild b/sci-chemistry/pdb2pqr/pdb2pqr-1.7.0-r1.ebuild
index b39fa34a3545..59f2d4b033b3 100644
--- a/sci-chemistry/pdb2pqr/pdb2pqr-1.7.0-r1.ebuild
+++ b/sci-chemistry/pdb2pqr/pdb2pqr-1.7.0-r1.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/pdb2pqr/pdb2pqr-1.7.0-r1.ebuild,v 1.7 2011/06/21 16:02:05 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/pdb2pqr/pdb2pqr-1.7.0-r1.ebuild,v 1.8 2012/03/10 14:20:09 jlec Exp $
 
-EAPI="3"
+EAPI=4
 
 PYTHON_DEPEND="2:2.5"
 SUPPORT_PYTHON_ABIS="1"
 PYTHON_EXPORT_PHASE_FUNCTIONS="1"
-RESTRICT_PYTHON_ABIS="2.4 3.*"
+RESTRICT_PYTHON_ABIS="2.4 3.* 2.7-pypy-*"
 
 inherit autotools eutils fortran-2 flag-o-matic python toolchain-funcs versionator
 
@@ -44,16 +44,25 @@ pkg_setup() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.4.0-ldflags.patch
-	epatch "${FILESDIR}"/${PN}-1.4.0-automagic.patch
-	epatch "${FILESDIR}"/${PV}-install.patch
-	sed '50,200s:CWD:DESTDIR:g' -i Makefile.am \
-		|| die "Failed to fix Makefile.am"
+	epatch \
+		"${FILESDIR}"/${PN}-1.4.0-ldflags.patch \
+		"${FILESDIR}"/${PN}-1.4.0-automagic.patch \
+		"${FILESDIR}"/${PV}-install.patch
+	sed \
+		-e '50,200s:CWD:DESTDIR:g' \
+		-i Makefile.am || die
+
 	python_src_prepare
+
 	preparation() {
+		sed \
+			-e "s:python\$PY_VERSION:$(PYTHON):g" \
+			-i configure.ac || die
+
 		eautoreconf
 	}
 	python_execute_function -s preparation
+
 	tc-export CC
 }
 
@@ -76,16 +85,12 @@ src_configure() {
 }
 
 src_compile() {
-	compilation() {
-		emake || die
-	}
-	python_execute_function -s compilation
+	python_execute_function -d -s
 }
 
 src_test() {
 	testing() {
-		emake -j1 test \
-			|| die "tests failed"
+		emake -j1 test
 	}
 	python_execute_function -s testing
 }
@@ -94,7 +99,7 @@ src_install() {
 	installation() {
 		dodir $(python_get_sitedir)/${PN}
 		emake -j1 DESTDIR="${ED}$(python_get_sitedir)/${PN}" \
-			PREFIX=""  install || die "install failed"
+			PREFIX="" install
 
 		INPATH="$(python_get_sitedir)/${PN}"
 
@@ -109,36 +114,23 @@ src_install() {
 			$(PYTHON) ${EPREFIX}${INPATH}/pdb2pka/pka.py \$*
 		EOF
 
-		dobin "${T}"/{${PN},pdb2pka}-$(python_get_version) || die "Failed to install pdb2pqr wrapper."
+		dobin "${T}"/{${PN},pdb2pka}-$(python_get_version)
 
-		insinto "${INPATH}"
-		doins __init__.py || \
-			die "Setting up the pdb2pqr site-package failed."
+		insinto "${INPATH}" && doins __init__.py
 
-		exeinto "${INPATH}"
-		doexe ${PN}.py || die "Installing pdb2pqr failed."
+		exeinto "${INPATH}" && doexe ${PN}.py
 
-		insinto "${INPATH}"/dat
-		doins dat/* || die "Installing data failed."
+		insinto "${INPATH}"/dat && doins dat/*
 
-		exeinto "${INPATH}"/extensions
-		doexe extensions/* || \
-			die "Failed to install extensions."
+		exeinto "${INPATH}"/extensions && doexe extensions/*
 
-		insinto "${INPATH}"/src
-		doins src/*.py || die "Installing of python scripts failed."
+		insinto "${INPATH}"/src && doins src/*.py
 
-		exeinto "${INPATH}"/propka
-		doexe propka/_propkalib.so || \
-			die "Failed to install propka."
+		exeinto "${INPATH}"/propka && doexe propka/_propkalib.so
 
-		insinto "${INPATH}"/propka
-		doins propka/propkalib.py propka/__init__.py || \
-			die "Failed to install propka."
+		insinto "${INPATH}"/propka && doins propka/propkalib.py propka/__init__.py
 
-		insinto "${INPATH}"/pdb2pka
-		doins pdb2pka/*.{py,so,DAT,h} || \
-			die "Failed to install pdb2pka."
+		insinto "${INPATH}"/pdb2pka && doins pdb2pka/*.{py,so,DAT,h}
 
 		dosym ../../apbs/_apbslib.so "${INPATH}"/pdb2pka/_apbslib.so
 		dosym ../../apbs/apbslib.py "${INPATH}"/pdb2pka/apbslib.py
@@ -151,21 +143,17 @@ src_install() {
 	dosym pdb2pka-$(python_get_version -f) /usr/bin/pdb2pka
 
 	if use doc; then
-		cd doc
-		sh genpydoc.sh \
-			|| die "genpydoc failed"
-		dohtml -r *.html images pydoc \
-			|| die "failed to install html docs"
-		cd -
+		pushd doc > /dev/null
+		sh genpydoc.sh || die "genpydoc failed"
+		dohtml -r *.html images pydoc
+		popd > /dev/null
 	fi
 
-	if use examples; then
-		insinto /usr/share/${PN}/
-		doins -r examples || die "Failed to install examples."
-	fi
+	use examples && \
+		insinto /usr/share/${PN}/ && \
+		doins -r examples
 
-	dodoc ChangeLog NEWS README AUTHORS || \
-		die "Failed to install docs"
+	dodoc ChangeLog NEWS README AUTHORS
 }
 
 pkg_postinst() {