apbs: Ugly automagic removed

make --> emake

4 files changed, 51 insertions, 4 deletions

diff --git a/sci-chemistry/apbs/ChangeLog b/sci-chemistry/apbs/ChangeLog
index beaff58d3..85324b164 100644
--- a/sci-chemistry/apbs/ChangeLog
+++ b/sci-chemistry/apbs/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  20 Mar 2009; Justin Lecher (jlec) <jlec@j-schmitz.net>
+  +files/apbs-1.1.0-automagic.patch, apbs-1.1.0.ebuild:
+  Ugly automagic removed
+
   19 Mar 2009; Justin Lecher (jlec) <jlec@j-schmitz.net>
   files/apbs-1.1.0-install-fix.patch, metadata.xml, apbs-1.1.0.ebuild:
   fix of doc installation dir
diff --git a/sci-chemistry/apbs/Manifest b/sci-chemistry/apbs/Manifest
index ea550daa5..4641f62b8 100644
--- a/sci-chemistry/apbs/Manifest
+++ b/sci-chemistry/apbs/Manifest
@@ -1,7 +1,8 @@
 AUX apbs-1.1.0-LDFLAGS.patch 1179 RMD160 72192070b5ddd146bdb306bffd14b5dac51276a6 SHA1 1b91e43dd4406b7fbdb6ff4b80190e29ecc462e8 SHA256 efd393a00e2583d6b91c810c9cb79b7c05f2967541f28df7f4cb6e464a69dcac
+AUX apbs-1.1.0-automagic.patch 1040 RMD160 a00f3bebcfc7c0bb4754e5d06e3909c34394d977 SHA1 02695c5ce63bdfa37e009e2a35a3ed0b4259d22e SHA256 64b3b68c88bbfcc004fb45bad6905d111f92353f46d020beade342f893a62258
 AUX apbs-1.1.0-install-fix.patch 2199 RMD160 ef0fc4d71920dba2c9cc50e2b27f3113a20ece6c SHA1 408ef7832ea955e014ce181d688894e85f9b9aa8 SHA256 e09eb1b2f613a05bbaa50ab7777a7b06079e35faaac38055121fe2da3c448027
 AUX apbs-1.1.0-vgrid-maloc.patch 1299 RMD160 ca2f58f636d895e68da1590813974269c80446c5 SHA1 95c0b5a8ccd32d5923bf1bd97308dec97996a801 SHA256 d1b65dc3945df6de53125b98e7d36930bda41e490d0afda117d240cb82b038aa
 DIST apbs-1.1.0-source.tar.gz 10582216 RMD160 9f336fd4b041e21375af57781b96a3723c93e552 SHA1 30b9170b1f827ce4a9552b39ce48c33c790abf10 SHA256 90146e81a5b58ba1548a8facd9c75ce754d5cedaa2a52caee885c99c1aba8e9e
-EBUILD apbs-1.1.0.ebuild 2355 RMD160 b101055d9b3a872a24b05886e6b6b1c2ec941219 SHA1 f993ceb77716fceb89e5c69bb690ce6c04f73d91 SHA256 6b0324ef62dad4596b4a71d4b55f7a8000e4ffdc4fadc80bf7a946810b74f660
-MISC ChangeLog 918 RMD160 3465baccd3036eba2ba0f4ebc221322e6ec028ff SHA1 fef6ed3e180c38c22f292ec59f84a929643b8e28 SHA256 c638093dd914aa0c81834760dd97c80c9a097fbe55ca5699d8ed0e91bbc52893
+EBUILD apbs-1.1.0.ebuild 2522 RMD160 2a62caea29aa0cb1f4e808d84811194b958504f7 SHA1 d31554eacabeca656bead67ef8c16d2ed3b9fb03 SHA256 92e9c64fd7b4fd553312e28f4eaf14b899e068d2a6f5b165677487ba61851b3a
+MISC ChangeLog 1057 RMD160 bb5db26617e6da01c59216cf1f4b079f58643c92 SHA1 9a2cef1e2aa0c08eb2ef132f43413b2597ba4889 SHA256 84d463e7f5380e6f205ff58cd26fb9cc88e2505f342abfb0c6cb7a61432b023c
 MISC metadata.xml 458 RMD160 3f41064ca200d7f85d3f790de6711aada270ac43 SHA1 69d50a5bfb0ed66870727f24f50f828dbc4abedb SHA256 c49607c06b8f41e5b3268d27258ad33b7784e29564f49585f3996d8f03568e17
diff --git a/sci-chemistry/apbs/apbs-1.1.0.ebuild b/sci-chemistry/apbs/apbs-1.1.0.ebuild
index 8b43534ff..a1cbf7f63 100644
--- a/sci-chemistry/apbs/apbs-1.1.0.ebuild
+++ b/sci-chemistry/apbs/apbs-1.1.0.ebuild
@@ -4,7 +4,7 @@
 
 EAPI="2"
 
-inherit eutils fortran autotools
+inherit eutils fortran autotools python
 
 MY_P="${P}-source"
 S="${WORKDIR}"/"${MY_P}"
@@ -31,12 +31,18 @@ RDEPEND="${DEPEND}"
 FORTRAN="g77 gfortran ifc"
 
 src_prepare() {
+	python_version
+
 	epatch "${FILESDIR}"/${P}-install-fix.patch
+	epatch "${FILESDIR}"/${P}-automagic.patch
 	epatch "${FILESDIR}"/${P}-LDFLAGS.patch
 	epatch "${FILESDIR}"/${P}-vgrid-maloc.patch
 	sed "s:GENTOO_PKG_NAME:${P}:g" \
 	-i Makefile.am || die "Cannot correct package name"
 	eautoreconf
+
+	find "${S}" -type f -name "*.py" \
+		-exec sed -e "s|/usr/bin/env python|${python}|g" -i '{}' \;
 }
 
 src_configure() {
@@ -77,7 +83,7 @@ src_test() {
 }
 
 src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
+	emake DESTDIR="${D}" install || die "make install failed"
 	dodoc AUTHORS INSTALL README NEWS ChangeLog \
 		|| die "Failed to install docs"
 }
diff --git a/sci-chemistry/apbs/files/apbs-1.1.0-automagic.patch b/sci-chemistry/apbs/files/apbs-1.1.0-automagic.patch
new file mode 100644
index 000000000..01d6e8be7
--- /dev/null
+++ b/sci-chemistry/apbs/files/apbs-1.1.0-automagic.patch
@@ -0,0 +1,36 @@
+--- contrib/opal/ZSI/setup.py	2009-03-05 21:30:09.000000000 +0100
++++ contrib/opal/ZSI/setup.py.new	2009-03-20 14:11:36.000000000 +0100
+@@ -1,12 +1,7 @@
+ #! /usr/bin/env python
+ # $Header$
+ import sys
+-try:
+-    from setuptools import setup
+-    hasSetuptools = True
+-except ImportError:
+-    from distutils.core import setup
+-    hasSetuptools = False
++from distutils.core import setup
+ 
+ _url = "http://pywebsvcs.sf.net/"
+ 
+@@ -43,18 +38,7 @@
+ 
+ # setuptools specific logic
+ additional_params = {}
+-if hasSetuptools:
+-    additional_params['entry_points'] = {
+-        'console_scripts': [
+-            'wsdl2py = ZSI.generate.commands:wsdl2py',
+-        ],
+-    }
+-    additional_params['setup_requires'] = [ "setuptools >= 0.6c3", ]
+-    additional_params['dependency_links'] = [
+-        "http://sourceforge.net/project/showfiles.php?group_id=6473&package_id=6541&release_id=286213",
+-    ]
+-else:
+-    additional_params['scripts'] = ["scripts/wsdl2py",]
++additional_params['scripts'] = ["scripts/wsdl2py",]
+ 
+ setup(
+     name="ZSI",