Prll build fix, sanbox violation fix, #326185, LDFLAGS respected, thanks to Xarthisius providing again an exelent patch set to fix science stuff!

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

6 files changed, 481 insertions, 24 deletions

diff --git a/sci-chemistry/psi/ChangeLog b/sci-chemistry/psi/ChangeLog
index e470b737ad35..23732f018d8b 100644
--- a/sci-chemistry/psi/ChangeLog
+++ b/sci-chemistry/psi/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sci-chemistry/psi
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/psi/ChangeLog,v 1.12 2010/06/24 21:08:01 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/psi/ChangeLog,v 1.13 2010/07/06 11:36:22 jlec Exp $
+
+*psi-3.4.0-r1 (06 Jul 2010)
+
+  06 Jul 2010; Justin Lecher <jlec@gentoo.org> +files/3.4.0-ldflags.patch,
+  -psi-3.4.0.ebuild, +files/3.4.0-man_paths.patch,
+  +files/3.4.0-parallel_fix.patch, +psi-3.4.0-r1.ebuild:
+  Prll build fix, sanbox violation fix, #326185, LDFLAGS respected, thanks
+  to Xarthisius providing the patches
 
 *psi-3.4.0 (24 Jun 2010)
 
diff --git a/sci-chemistry/psi/Manifest b/sci-chemistry/psi/Manifest
index 3fb643d16a9d..b1296e46ce91 100644
--- a/sci-chemistry/psi/Manifest
+++ b/sci-chemistry/psi/Manifest
@@ -5,6 +5,9 @@ AUX 3.3.0-gcc-4.3.patch 506 RMD160 40661bfb73577988ab160bd00e64a9590d47ccab SHA1
 AUX 3.4.0-destdir.patch 1320 RMD160 4f33ac3c171797bc0cab9ac492ab6ee1f32d12aa SHA1 54b524e161d5dcffc6817eb559aa4aff3ee44802 SHA256 17909af7b5dff643ef8ea134bf4468cd361457ba9192a1f9155a5870470af7a6
 AUX 3.4.0-dont-build-libint.patch 432 RMD160 d9e68e68c54e0cd237c9f1793f8b4ff905c0163a SHA1 8781f9e507817a00b1179cb21140e6cc7733ef01 SHA256 2bceacc5e924b033b2ef774df789cb5cd11278452da7ea2aad5d51d3b7a8d43c
 AUX 3.4.0-gcc-4.3.patch 8000 RMD160 794a4b67832238f7d58344816b44977952e11798 SHA1 37a0127809d786af4b24025351f77df8dc4095bc SHA256 f0b354c3ce8c65956f4ace3ed19afd9ff9b6ab43b3cf21aa33a94c8af44989da
+AUX 3.4.0-ldflags.patch 403 RMD160 cf860a1bccfc3c556859f5613903b552f2974b6a SHA1 f886611b58304ba599d36cf2a24892d42ecd4e63 SHA256 edd2030d2d1f4f62d5297d7eab453fbe4d81d1b9ab8fe5f88b7ca8ca8ac70077
+AUX 3.4.0-man_paths.patch 603 RMD160 4e120383a47f66dc32387660fcf47e2d4888b43b SHA1 4ee49e7610860d5103ebd4b6ddadb9717ef110c3 SHA256 a8307a45d0af403e88299ea474f8af9cf26eafc3207cd991e53af1796ff8357b
+AUX 3.4.0-parallel_fix.patch 10682 RMD160 b9d9fe63a51b0b2830eaf53fe45f0efbc8b9cabc SHA1 d70172358619f098d5fd738c4ff6f5fdba5eeb43 SHA256 4853f395db93db2777fcda7427f4f75cc27ec03ac7ca5e238a56137c596f79c2
 AUX add-libint-error-message.patch 722 RMD160 526e57d715b65fedc763069be30f7e49e52dcbb8 SHA1 862de3880c5ccebb4689440eaf7eaae9921cf0b7 SHA256 63715cab509893817c7cfb22422c3724fd02a4d0fa5065bbb5a477d8d8a23390
 AUX dont-build-libint.patch 355 RMD160 c3b00a7edb9af349f2321fcbbdc286168d5d6db3 SHA1 346cada59b9daea1166fda9fe0b5b34303b0bd6e SHA256 57513d9f897776055dfbe14e717761de314e79409def91ccc27563a613a66e18
 AUX psi-3.3.0-parallel-make.patch 378 RMD160 393f19923e25b8506e09e6eb79e764a535bc1466 SHA1 a0f4e7e0f6201d4f24d402829e72de96d31f415f SHA256 1f18e9473b5d7ba8372f6bb36eb35034dedfd4bad19a80ef1867f99e5aa2e3a3
@@ -17,13 +20,13 @@ DIST psi-3.3.0.tar.gz 4253039 RMD160 0f0e3b4a48a9128f1a79bcd6bf35b2133c7db535 SH
 DIST psi-3.4.0.tar.gz 7413072 RMD160 34f34d2fb1fcabc973992eff19bb7fa1e80ce6a6 SHA1 0d1ef8a2aa5b9ef27b7678fab47dd71e731548a6 SHA256 c87a7f63cb4e34bfd1a8b3731474eb417d9933338327143415a985bcedb619d4
 EBUILD psi-3.2.3.ebuild 1289 RMD160 ee73ce6652cfd35329d323dd8a891373640aab8e SHA1 70d3f63c27caea1dc84a2f288acf1c28000a5539 SHA256 9af788bd07c05c74b4bfa031e7b0f33b27519ef12aaef1ecb8da7b745861295a
 EBUILD psi-3.3.0.ebuild 1356 RMD160 7b1c2a45a5ef171dab649941091e662cc0f5ce34 SHA1 131841321424178b807322551ecea126cf1063eb SHA256 d4ad7a5deba5750a97b729734f54448df2d172ed7fedad3ce208d4ca85ec2330
-EBUILD psi-3.4.0.ebuild 1623 RMD160 fac4ab259c6bf6bda18583e6f18f00b70f05329f SHA1 5fda043a6068ae4c717aeeffe51d6c70bfba9056 SHA256 4370450f7bf3ff3677674a3f2c9341e7aaf2201a1d6ebced4394dbd6939998ed
-MISC ChangeLog 2259 RMD160 5beae7edb60e6a29a647a05c4d6ff26e50d09b95 SHA1 28cdee056a5a7cdeb7018aa5eca92cba0268f146 SHA256 eaa14d0a653a43348dc3fa1042f654205da83968b1c5709b3a16f7f9d0e26d92
+EBUILD psi-3.4.0-r1.ebuild 1711 RMD160 62cee6eec5280c5cf7e9bcf276a94a86ffdddbdf SHA1 050350c0f43a39bb15b2626e4ae03e76d798abcb SHA256 17fc7f4b4d0cdccde8c7e0f331e74001c16e69dd99bbf68a0f99fee75592288a
+MISC ChangeLog 2585 RMD160 c01e08bd480545632ced234d29db7cb3c216c02c SHA1 0dccdb1676d0327f91a3c32707137a893bb85b41 SHA256 9a42e06716ea745a4b806abdbfea4c4501820635213792579ac3ff028541922a
 MISC metadata.xml 166 RMD160 4452298fd03e7c9395d1182bfe69d60a14144af6 SHA1 cb0b513473c0348f4f6f6cd9a132e4884155fddb SHA256 84c92b49702daf95eace8d2765215cbd8650da4ef776f9f700b5ce3785dec852
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkwjyTYACgkQgAnW8HDreRY+CgCgvlOlIMABhybr8PSALuNbAhHa
-vFMAn1TbPZOJpl2jKFw8wpgX85WxPm/Z
-=4xJb
+iEYEARECAAYFAkwzFTwACgkQgAnW8HDreRaA3QCaAqEhAn2YwreoyDbP0Ad70TNv
+gkUAniR1D0OrA3pKuynROgQqxdBV0sp7
+=mxyQ
 -----END PGP SIGNATURE-----
diff --git a/sci-chemistry/psi/files/3.4.0-ldflags.patch b/sci-chemistry/psi/files/3.4.0-ldflags.patch
new file mode 100644
index 000000000000..9d7f2767e8ec
--- /dev/null
+++ b/sci-chemistry/psi/files/3.4.0-ldflags.patch
@@ -0,0 +1,21 @@
+Respect LDFLAGS
+
+--- configure.ac
++++ configure.ac
+@@ -288,15 +288,13 @@
+ )
+ AC_SUBST(LDLIBS)
+ 
+-LDFLAGS=
+ LIBDIRS=
+ AC_ARG_WITH(libdirs,
+ [  --with-libdirs          Specifies library directories (-Ldir1 -Ldir2).],
+ LIBDIRS=$withval
+-LDFLAGS=$withval
+ AC_MSG_RESULT([Using extra library directories: $withval])
+ )
+-AC_SUBST(LDFLAGS)
++AC_SUBST(LIBDIRS)
+ 
+ AC_CHECK_PROGS(PERL,perl,perl) AC_SUBST(PERL)
+ 
diff --git a/sci-chemistry/psi/files/3.4.0-man_paths.patch b/sci-chemistry/psi/files/3.4.0-man_paths.patch
new file mode 100644
index 000000000000..02cced160847
--- /dev/null
+++ b/sci-chemistry/psi/files/3.4.0-man_paths.patch
@@ -0,0 +1,25 @@
+Fix man paths
+
+http://bugs.gentoo.org/show_bug.cgi?id=326185
+
+--- src/bin/nonbonded/Makefile.in
++++ src/bin/nonbonded/Makefile.in
+@@ -19,5 +19,5 @@
+ endif
+ 
+ install_man:: nonbonded.1
+-	$(MKDIRS) $(mandir)/man1
+-	$(INSTALL_INCLUDE) $^ $(mandir)/man1
++	$(MKDIRS) $(DESTDIR)$(mandir)/man1
++	$(INSTALL_INCLUDE) $^ $(DESTDIR)$(mandir)/man1
+--- src/bin/intder/Makefile.in
++++ src/bin/intder/Makefile.in
+@@ -21,6 +21,6 @@
+ endif
+ 
+ install_man:: intder.1
+-	$(MKDIRS) $(mandir)/man1
+-	$(INSTALL_INCLUDE) $^ $(mandir)/man1
++	$(MKDIRS) $(DESTDIR)$(mandir)/man1
++	$(INSTALL_INCLUDE) $^ $(DESTDIR)$(mandir)/man1
+ 
diff --git a/sci-chemistry/psi/files/3.4.0-parallel_fix.patch b/sci-chemistry/psi/files/3.4.0-parallel_fix.patch
new file mode 100644
index 000000000000..65234fb40dcb
--- /dev/null
+++ b/sci-chemistry/psi/files/3.4.0-parallel_fix.patch
@@ -0,0 +1,400 @@
+--- Makefile.in
++++ Makefile.in
+@@ -17,62 +17,19 @@
+ INSTALL = @INSTALL@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ 
+-all:
+-	for dir in $(subdirs); \
+-          do \
+-            (cd $${dir} && echo Making in $${dir} && $(MAKE) all) || exit 1; \
+-          done
+-
+-install: install_host
+-	for dir in $(subdirs); \
+-          do \
+-            (cd $${dir} && echo Making install in $${dir} && $(MAKE) install) || exit 1; \
+-          done
+-
+-install_inc:
+-	for dir in $(subdirs); \
+-          do \
+-            (cd $${dir} && echo Making install in $${dir} && $(MAKE) install_inc) || exit 1; \
+-          done
+-
+-install_man:
+-	for dir in $(subdirs); \
+-          do \
+-            (cd $${dir} && echo Making install in $${dir} && $(MAKE) install_man) || exit 1; \
+-          done
+-
+-depend:
+-	for dir in $(subdirs); \
+-          do \
+-            (cd $${dir} && echo Making depend in $${dir} && $(MAKE) depend) || exit 1; \
+-          done
+-
+-clean:
+-	for dir in $(subdirs); \
+-          do \
+-            (cd $${dir} && echo Making clean in $${dir} && $(MAKE) clean) || exit 1; \
+-          done
+-
+-dclean:
+-	for dir in $(subdirs); \
+-          do \
+-            (cd $${dir} && echo Making dclean in $${dir} && $(MAKE) dclean) || exit 1; \
+-          done
+-
+-targetclean:
+-	for dir in $(subdirs) tests doc; \
+-          do \
+-            (cd $${dir} && echo Making clean in $${dir} && $(MAKE) targetclean) || exit 1; \
+-          done
++all clean install install_inc install_man depend dclean targetclean:
++	for dir in $(subdirs); do \
++		$(MAKE) -C $$dir $@; \
++	done
+ 
+ tests:
+-	(cd tests && echo Running test suite... && $(MAKE)) || exit 1;
++	$(MAKE) -C tests
+ 
+ testsclean:
+-	(cd tests && echo Cleaning test suite... && $(MAKE) clean) || exit 1;
++	$(MAKE) -C tests clean
+ 
+ doc:
+-	(cd doc && echo Building documentation... && $(MAKE)) || exit 1;
++	$(MAKE) -C doc
+ 
+ $(top_srcdir)/configure: $(top_srcdir)/configure.ac $(top_srcdir)/aclocal.m4
+ 	cd $(top_srcdir) && autoconf
+--- lib/Makefile.in
++++ lib/Makefile.in
+@@ -31,7 +31,7 @@
+ 	$(INSTALL_DATA) $(srcdir)/psi.dat $(DESTDIR)$(pkgdatadir)
+ 	for dir in $(subdirs); \
+           do \
+-            (cd $${dir}; echo Making in $${dir}; $(MAKE) install) || exit 1; \
++            $(MAKE) -C $$dir install; \
+           done
+ 
+ install_man: macro.psi
+--- src/Makefile.in
++++ src/Makefile.in
+@@ -6,53 +6,10 @@
+ 
+ default: all
+ 
+-all:
+-	for dir in $(subdirs); \
+-          do \
+-            (cd $${dir} && echo Making in $${dir} && $(MAKE) all) || exit 1; \
+-          done
+-
+-install:
+-	for dir in $(subdirs); \
+-          do \
+-            (cd $${dir} && echo Making install in $${dir} && $(MAKE) install) || exit 1; \
+-          done
+-
+-install_inc:
+-	for dir in $(subdirs); \
+-          do \
+-            (cd $${dir} && echo Making install in $${dir} && $(MAKE) install_inc) || exit 1; \
+-          done
+-
+-install_man:
+-	for dir in $(subdirs); \
+-          do \
+-            (cd $${dir} && echo Making install in $${dir} && $(MAKE) install_man) || exit 1; \
+-          done
+-
+-depend:
+-	for dir in $(subdirs); \
+-          do \
+-            (cd $${dir} && echo Making depend in $${dir} && $(MAKE) depend) || exit 1; \
+-          done
+-
+-clean:
+-	for dir in $(subdirs); \
+-          do \
+-            (cd $${dir} && echo Making clean in $${dir} && $(MAKE) clean) || exit 1; \
+-          done
+-
+-dclean:
+-	for dir in $(subdirs); \
+-          do \
+-            (cd $${dir} && echo Making dclean in $${dir} && $(MAKE) dclean) || exit 1; \
+-          done
+-
+-targetclean:
+-	for dir in $(subdirs); \
+-          do \
+-            (cd $${dir} && echo Making clean in $${dir} && $(MAKE) targetclean) || exit 1; \
+-          done
++all clean install depend dclean targetclean:
++	for dir in $(subdirs); do \
++		$(MAKE) -C $$dir $@; \
++	done
+ 
+ top_srcdir = @top_srcdir@
+ srcdir = @srcdir@
+--- src/lib/Makefile.in
++++ src/lib/Makefile.in
+@@ -4,56 +4,10 @@
+ subdirs = libipv1 libciomr libchkpt libqt libpsio libiwl libdpd libutil \
+           liboptions libmoinfo libbasis libmints
+ 
+-all: default
+-
+-default:
+-	for dir in $(subdirs); \
+-          do \
+-            (cd $${dir} && echo ... Making in $${dir} ... && $(MAKE) default) || exit 1; \
+-          done
+-
+-install:
+-	for dir in $(subdirs); \
+-          do \
+-            (cd $${dir} && echo ... Making install in $${dir} ... && $(MAKE) install) || exit 1; \
+-          done
+-
+-install_inc:
+-	for dir in $(subdirs); \
+-          do \
+-            (cd $${dir} && echo ... Making install in $${dir} ... && $(MAKE) install_inc) || exit 1; \
+-          done
+-
+-install_man:
+-	for dir in $(subdirs); \
+-          do \
+-            (cd $${dir} && echo ... Making install in $${dir} ... && $(MAKE) install_man) || exit 1; \
+-          done
+-
+-depend:
+-	for dir in $(subdirs); \
+-          do \
+-            (cd $${dir} && echo ... Making depend in $${dir} ... && $(MAKE) depend) || exit 1; \
+-          done
+-
+-clean:
+-	for dir in $(subdirs); \
+-          do \
+-            (cd $${dir} && echo ... Making clean in $${dir} ... && $(MAKE) clean) || exit 1; \
+-          done
+-
+-dclean:
+-	for dir in $(subdirs); \
+-          do \
+-            (cd $${dir} && echo ... Making dclean in $${dir} ... && $(MAKE) dclean) || exit 1; \
+-          done
+-
+-targetclean:
+-	for dir in $(subdirs); \
+-          do \
+-            (cd $${dir} && echo ... Making clean in $${dir} ... && $(MAKE) targetclean) || exit 1; \
+-          done
+-
++all clean install install_inc install_man depend dclean targetclean:
++	for dir in $(subdirs); do \
++		$(MAKE) -C $$dir $@; \
++	done
+ 
+ #
+ # keep the configuration information and makefile up-to-date
+--- src/bin/Makefile.in
++++ src/bin/Makefile.in
+@@ -13,55 +13,10 @@
+ subdirs += psirb
+ endif
+ 
+-all: default
+-
+-default:
+-	for dir in $(subdirs); \
+-          do \
+-            (cd $${dir} && echo ... Making in $${dir} ... && $(MAKE) default) || exit 1; \
+-          done
+-
+-install:
+-	for dir in $(subdirs); \
+-          do \
+-            (cd $${dir} && echo ... Making install in $${dir} ... && $(MAKE) install) || exit 1; \
+-          done
+-
+-install_inc:
+-	for dir in $(subdirs); \
+-          do \
+-            (cd $${dir} && echo ... Making install in $${dir} ... && $(MAKE) install_inc) || exit 1; \
+-          done
+-
+-install_man:
+-	for dir in $(subdirs); \
+-          do \
+-            (cd $${dir} && echo ... Making install in $${dir} ... && $(MAKE) install_man) || exit 1; \
+-          done
+-
+-depend:
+-	for dir in $(subdirs); \
+-          do \
+-            (cd $${dir} && echo ... Making depend in $${dir} ... && $(MAKE) depend) || exit 1; \
+-          done
+-
+-clean:
+-	for dir in $(subdirs); \
+-          do \
+-            (cd $${dir} && echo ... Making clean in $${dir} ... && $(MAKE) clean) || exit 1; \
+-          done
+-
+-dclean:
+-	for dir in $(subdirs); \
+-          do \
+-            (cd $${dir} && echo ... Making dclean in $${dir} ... && $(MAKE) dclean) || exit 1; \
+-          done
+-
+-targetclean:
+-	for dir in $(subdirs); \
+-          do \
+-            (cd $${dir} && echo ... Making clean in $${dir} ... && $(MAKE) targetclean) || exit 1; \
+-          done
++all install depend clean dclean targetclean:
++	for dir in $(subdirs); do \
++		$(MAKE) -C $$dir $@; \
++	done
+ 
+ top_srcdir = @top_srcdir@
+ srcdir = @srcdir@
+--- src/samples/Makefile.in
++++ src/samples/Makefile.in
+@@ -5,55 +5,10 @@
+ 
+ subdirs = mints
+ 
+-all: default
+-
+-default:
+-	for dir in $(subdirs); \
+-          do \
+-            (cd $${dir} && echo ... Making in $${dir} ... && $(MAKE) default) || exit 1; \
+-          done
+-
+-install:
+-	for dir in $(subdirs); \
+-          do \
+-            (cd $${dir} && echo ... Making install in $${dir} ... && $(MAKE) install) || exit 1; \
+-          done
+-
+-install_inc:
+-	for dir in $(subdirs); \
+-          do \
+-            (cd $${dir} && echo ... Making install in $${dir} ... && $(MAKE) install_inc) || exit 1; \
+-          done
+-
+-install_man:
+-	for dir in $(subdirs); \
+-          do \
+-            (cd $${dir} && echo ... Making install in $${dir} ... && $(MAKE) install_man) || exit 1; \
+-          done
+-
+-depend:
+-	for dir in $(subdirs); \
+-          do \
+-            (cd $${dir} && echo ... Making depend in $${dir} ... && $(MAKE) depend) || exit 1; \
+-          done
+-
+-clean:
+-	for dir in $(subdirs); \
+-          do \
+-            (cd $${dir} && echo ... Making clean in $${dir} ... && $(MAKE) clean) || exit 1; \
+-          done
+-
+-dclean:
+-	for dir in $(subdirs); \
+-          do \
+-            (cd $${dir} && echo ... Making dclean in $${dir} ... && $(MAKE) dclean) || exit 1; \
+-          done
+-
+-targetclean:
+-	for dir in $(subdirs); \
+-          do \
+-            (cd $${dir} && echo ... Making clean in $${dir} ... && $(MAKE) targetclean) || exit 1; \
+-          done
++all install depend clean dclean targetclean:
++	for dir in $(subdirs); do \
++		$(MAKE) -C $$dir $@; \
++	done
+ 
+ top_srcdir = @top_srcdir@
+ srcdir = @srcdir@
+--- src/util/Makefile.in
++++ src/util/Makefile.in
+@@ -3,55 +3,10 @@
+ 
+ subdirs = tocprint psi2molden
+ 
+-all: default
+-
+-default:
+-	for dir in $(subdirs); \
+-          do \
+-            (cd $${dir} && echo ... Making in $${dir} ... && $(MAKE) default) || exit 1; \
+-          done
+-
+-install:
+-	for dir in $(subdirs); \
+-          do \
+-            (cd $${dir} && echo ... Making install in $${dir} ... && $(MAKE) install) || exit 1; \
+-          done
+-
+-install_inc:
+-	for dir in $(subdirs); \
+-          do \
+-            (cd $${dir} && echo ... Making install in $${dir} ... && $(MAKE) install_inc) || exit 1; \
+-          done
+-
+-install_man:
+-	for dir in $(subdirs); \
+-          do \
+-            (cd $${dir} && echo ... Making install in $${dir} ... && $(MAKE) install_man) || exit 1; \
+-          done
+-
+-depend:
+-	for dir in $(subdirs); \
+-          do \
+-            (cd $${dir} && echo ... Making depend in $${dir} ... && $(MAKE) depend) || exit 1; \
+-          done
+-
+-clean:
+-	for dir in $(subdirs); \
+-          do \
+-            (cd $${dir} && echo ... Making clean in $${dir} ... && $(MAKE) clean) || exit 1; \
+-          done
+-
+-dclean:
+-	for dir in $(subdirs); \
+-          do \
+-            (cd $${dir} && echo ... Making dclean in $${dir} ... && $(MAKE) dclean) || exit 1; \
+-          done
+-
+-targetclean:
+-	for dir in $(subdirs); \
+-          do \
+-            (cd $${dir} && echo ... Making clean in $${dir} ... && $(MAKE) targetclean) || exit 1; \
+-          done
++all install depend clean dclean targetclean:
++	for dir in $(subdirs); do \
++		$(MAKE) -C $$dir $@; \
++	done
+ 
+ top_srcdir = @top_srcdir@
+ srcdir = @srcdir@
+--- src/lib/libipv1/Makefile.in
++++ src/lib/libipv1/Makefile.in
+@@ -58,4 +58,4 @@
+ # in case DODEPEND is no
+ #
+ 
+-ip_read.o: y.tab.h
++ip_read.o: y.tab.c y.tab.h
diff --git a/sci-chemistry/psi/psi-3.4.0.ebuild b/sci-chemistry/psi/psi-3.4.0-r1.ebuild
index 1d80d075dc69..55785e8a3be9 100644
--- a/sci-chemistry/psi/psi-3.4.0.ebuild
+++ b/sci-chemistry/psi/psi-3.4.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/psi/psi-3.4.0.ebuild,v 1.1 2010/06/24 21:08:01 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/psi/psi-3.4.0-r1.ebuild,v 1.1 2010/07/06 11:36:22 jlec Exp $
 
 EAPI="3"
 
@@ -27,17 +27,24 @@ DEPEND="${RDEPEND}
 S="${WORKDIR}/${PN}${PV:0:1}"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PV}-dont-build-libint.patch
-	epatch "${FILESDIR}"/use-external-libint.patch
-	epatch "${FILESDIR}"/${PV}-gcc-4.3.patch
-	epatch "${FILESDIR}"/${PV}-destdir.patch
-	epatch "${FILESDIR}"/${P}-parallel-make.patch
-	sed "s:^LDFLAGS=:LDFLAGS=${LDFLAGS}:g" -i configure.ac || die
+	epatch "${FILESDIR}"/${PV}-dont-build-libint.patch \
+		"${FILESDIR}"/use-external-libint.patch \
+		"${FILESDIR}"/${PV}-gcc-4.3.patch \
+		"${FILESDIR}"/${PV}-destdir.patch \
+		"${FILESDIR}"/${P}-parallel-make.patch \
+		"${FILESDIR}"/${PV}-man_paths.patch \
+		"${FILESDIR}"/${PV}-ldflags.patch \
+		"${FILESDIR}"/${PV}-parallel_fix.patch
+
 	# Broken test
 	sed \
 		-e 's:scf-mvd-opt ::g' \
 		-e 's:scf-mvd-opt-puream ::g' \
 		-i tests/Makefile.in || die
+
+	sed \
+		-e "/LIBPATTERNS/d" \
+		-i src/{bin,util,samples}/MakeVars.in || die
 	eautoreconf
 }
 
@@ -46,26 +53,19 @@ src_configure() {
 	unset CLIBS
 
 	econf \
-		--with-opt="${CFLAGS}" \
+		--with-opt="${CXXFLAGS}" \
 		--datadir="${EPREFIX}"/usr/share/${PN} \
 		--with-blas="$(pkg-config blas --libs)"
 }
 
 src_compile() {
-	emake -j1 \
-		SCRATCH="${WORKDIR}/libint" \
-		|| die "make failed"
+	emake SCRATCH="${WORKDIR}/libint" DODEPEND="no" || die
 }
 
 src_test() {
-	emake \
-		EXECDIR="${S}"/bin \
-		TESTFLAGS="" \
-		-j1 tests || die
+	emake EXECDIR="${S}"/bin TESTFLAGS="" -j1 tests || die
 }
 
 src_install() {
-	emake -j1 \
-		DESTDIR="${D}" \
-		install || die "install failed"
+	emake DESTDIR="${D}" DODEPEND="no" install || die
 }