Version bump to pull in updated patch fixing bad install location for docs (see bug #241316). Added patch for ignored LDFLAGS.

Package-Manager: portage-2.2_rc11/cvs/Linux 2.6.26-SENTINEL-2 i686

5 files changed, 58 insertions, 19 deletions

diff --git a/sci-chemistry/apbs/ChangeLog b/sci-chemistry/apbs/ChangeLog
index 71d140fdbafe..eb5edced8ded 100644
--- a/sci-chemistry/apbs/ChangeLog
+++ b/sci-chemistry/apbs/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for sci-chemistry/apbs
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/apbs/ChangeLog,v 1.18 2008/04/29 22:21:19 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/apbs/ChangeLog,v 1.19 2008/10/11 17:29:20 markusle Exp $
+
+*apbs-1.0.0-r1 (11 Oct 2008)
+
+  11 Oct 2008; Markus Dittrich <markusle@gentoo.org>
+  +files/apbs-1.0.0-LDFLAGS.patch,
+  files/apbs-1.0.0-install-fix.patch, -apbs-1.0.0.ebuild,
+  +apbs-1.0.0-r1.ebuild:
+  Version bump to pull in updated patch fixing bad install location 
+  for docs (see bug #241316). Added patch for ignored LDFLAGS.
 
 *apbs-1.0.0 (29 Apr 2008)
 
diff --git a/sci-chemistry/apbs/Manifest b/sci-chemistry/apbs/Manifest
index 84fcae19f078..de81ddabcf71 100644
--- a/sci-chemistry/apbs/Manifest
+++ b/sci-chemistry/apbs/Manifest
@@ -1,4 +1,5 @@
-AUX apbs-1.0.0-install-fix.patch 742 RMD160 a062de26fd9441b7f25402abec87b1efbbf78f9b SHA1 6491839f6ac825dd2e18c3847dc70073e5a4a89a SHA256 9e1517407b28c314b319431644347b8ee01bec15e0c5136a5b2e66af8c3300f5
+AUX apbs-1.0.0-LDFLAGS.patch 1423 RMD160 d802bbcfda969f86a799847ec323f786b25e9d75 SHA1 c4d4ce34fe72e9b54f553abf0fdec2ed979cdf8f SHA256 2dae2123d325b0bee45544fe681afb0b82616983d82fa1e9a16b4f9fbb4f2e33
+AUX apbs-1.0.0-install-fix.patch 890 RMD160 64e4d2247e23fd4d67b43ae91e1470d4cd2b8b02 SHA1 a5d618d37601bdafce0f7c3a58c399454955fdb0 SHA256 e30f2396261d7320aa0bbcc873689cc3368fe3bcc670806c6f2e399e66439b14
 AUX apbs-1.0.0-libmaloc-noinstall.patch 2230 RMD160 983d431fbe8af9aab163f3160521339fa0fc68d9 SHA1 9d5f2685d78c73f404899eca24cee4d1e5cb140d SHA256 729b836d5539a3c6328905c5e69403fd9386eb85199eb5702c90b5ec88bc5ef0
 AUX apbs-1.0.0-openmpi.patch 1458 RMD160 27e786dcb212348e14400442d11543038a1015b4 SHA1 40e45496d78c72a8b9169af623924ee74c5ff2a5 SHA256 ab2e1303c3bdcfc78c11b13ea2f99c4a8e81cb6d6f89c008815ecc20150863bf
 AUX apbs-examples-gentoo.patch 1446 RMD160 f0468219d3295cbaf90de7c0e3489d443f1ea144 SHA1 906197ecc9ee745cb0573ed2798a671cccd7b5a4 SHA256 1b12fdf855c4e80bb6e88d6b9c433a4c18eb406a5a6d1671146be897452863d4
@@ -8,6 +9,6 @@ DIST apbs-0.5.1-source.tgz 10952600 RMD160 d738f88252193dff64ca692d895d1359445d5
 DIST apbs-1.0.0-source.tar.gz 11541303 RMD160 1eeb79f93a591835281bf8395308cddc065dac93 SHA1 fbcfe664defb09165e0eae3ff913a9d5a17cb27e SHA256 bd3803183ffb2bede9fca242d5432acb60b3cb8668eeccdbbced69aaf7a57604
 EBUILD apbs-0.5.0.ebuild 1761 RMD160 d680a39910bbacb86dfd1829f244da763539f5b0 SHA1 d2622fafd3ae540f3bc3a8350e7e20dbbecf165b SHA256 2820f64797fb4955b632be053bda14aa78d837cc94dc9f239d8be0d4dd780e16
 EBUILD apbs-0.5.1.ebuild 1904 RMD160 52436392ef003b55abd8f1f29d763c87588f219b SHA1 57f0bd16b7f06f37bc52fd4b82a5412b80b30a1b SHA256 ebe9e800f22ab4ec0e81e481aa2d8753f2fbdfe9e05f2fa759c6c9925b90a864
-EBUILD apbs-1.0.0.ebuild 1934 RMD160 99f7e1bcc6372d46f770d20b11ffac73eec87557 SHA1 3db9af6d8a5750933292ff7b9f03dbc71aaec79c SHA256 23cf4dc5e5012231df964c78c28911a962bf9ac29b8aa96a7b3b0711da63b7ee
-MISC ChangeLog 2727 RMD160 8ccf4bdb4502a763280a85d3848eacb1a323a95c SHA1 aeab4abcd9afea8ca457c63bb9aab057d003eb12 SHA256 fe4dad9858776ec4898dbba0d7778d875b7df125971b2555a6a813d5b206e7a4
+EBUILD apbs-1.0.0-r1.ebuild 1999 RMD160 25d0e8d5eb1dc8dbc30312fb1591013702f31159 SHA1 93a0dfc0dd37aad8bb2a9826e1b07da5bb787c7d SHA256 33c808b17de5c90482fa5bdc45b2817abba829844677b480986572b8dbb3b2c5
+MISC ChangeLog 3061 RMD160 e09234fe8ff7475eab974cae1f8cf45a449cd53a SHA1 98b978e5ad3e46ba76147877dea3bcddb6fc9895 SHA256 63799fc31c8bf6c3c5f8a9e5c9d2696910192ca3bd0494f3e7100b3fb3770023
 MISC metadata.xml 282 RMD160 539a53475b01291eadb86c8c53a0fbc02b4a34d4 SHA1 7f42dcea44641b8a77ab9644791344ec6ed6c327 SHA256 3c1785eb4ab63774ed3a6b1bddd602ef24cd6795f690bb3289d5a980bca06349
diff --git a/sci-chemistry/apbs/apbs-1.0.0.ebuild b/sci-chemistry/apbs/apbs-1.0.0-r1.ebuild
index 03a1e0073e1e..61d74bfa4e7a 100644
--- a/sci-chemistry/apbs/apbs-1.0.0.ebuild
+++ b/sci-chemistry/apbs/apbs-1.0.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/apbs/apbs-1.0.0.ebuild,v 1.2 2008/04/30 01:18:01 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/apbs/apbs-1.0.0-r1.ebuild,v 1.1 2008/10/11 17:29:20 markusle Exp $
 
 inherit eutils fortran autotools
 
@@ -35,15 +35,12 @@ src_unpack() {
 	epatch "${FILESDIR}"/${P}-openmpi.patch
 	epatch "${FILESDIR}"/${P}-install-fix.patch
 	epatch "${FILESDIR}"/${P}-libmaloc-noinstall.patch
-
-	sed -e "s:GENTOO_PKG_NAME:${PN}:" -i Makefile.am \
-		|| die "Failed to fix Makefile.am"
-
+	epatch "${FILESDIR}"/${P}-LDFLAGS.patch
 	eautoreconf
 }
 
 src_compile() {
-	local myconf
+	local myconf="--docdir=/usr/share/doc/${PF}"
 	use blas && myconf="${myconf} --with-blas=-lblas"
 
 	# check which mpi version is installed and tell configure
@@ -72,4 +69,6 @@ src_test() {
 
 src_install() {
 	make 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.0.0-LDFLAGS.patch b/sci-chemistry/apbs/files/apbs-1.0.0-LDFLAGS.patch
new file mode 100644
index 000000000000..4fde1c4883b0
--- /dev/null
+++ b/sci-chemistry/apbs/files/apbs-1.0.0-LDFLAGS.patch
@@ -0,0 +1,21 @@
+diff -Naur apbs-1.0.0-source/tools/python/Makefile.am apbs-1.0.0-source.new/tools/python/Makefile.am
+--- apbs-1.0.0-source/tools/python/Makefile.am	2008-04-17 16:41:08.000000000 -0400
++++ apbs-1.0.0-source.new/tools/python/Makefile.am	2008-10-11 11:54:17.000000000 -0400
+@@ -15,5 +15,5 @@
+ 
+ noinst_PROGRAMS       = _apbslib.so
+ _apbslib_so_SOURCES   = apbslib.c
+-_apbslib_so_LINK      = $(PY_CC) $(PY_LINKFLAGS) -o $@ $(PY_SHARED)
++_apbslib_so_LINK      = $(PY_CC) $(PY_LINKFLAGS) $(LDFLAGS) -o $@ $(PY_SHARED)
+ _apbslib_so_LDADD     = ${top_builddir}/bin/.libs/libapbsmainroutines.a ${top_builddir}/src/aaa_lib/.libs/libapbs.a ${top_builddir}/contrib/lib/libmaloc.a $(PY_LDFLAGS)
+diff -Naur apbs-1.0.0-source/tools/python/vgrid/Makefile.am apbs-1.0.0-source.new/tools/python/vgrid/Makefile.am
+--- apbs-1.0.0-source/tools/python/vgrid/Makefile.am	2008-04-17 16:41:08.000000000 -0400
++++ apbs-1.0.0-source.new/tools/python/vgrid/Makefile.am	2008-10-11 12:02:02.000000000 -0400
+@@ -15,6 +15,6 @@
+ if PY_PRESENT
+    noinst_PROGRAMS     = _vgrid.so
+    _vgrid_so_SOURCES   = vgridlib.c
+-   _vgrid_so_LINK      = $(PY_CC) $(PY_LINKFLAGS) -o $@ $(PY_SHARED)
++   _vgrid_so_LINK      = $(PY_CC) $(PY_LINKFLAGS) $(LDFLAGS) -o $@ $(PY_SHARED)
+    _vgrid_so_LDADD     = ${top_builddir}/bin/.libs/libapbsmainroutines.a ${top_builddir}/src/aaa_lib/.libs/libapbs.a $(PY_LDFLAGS) ${top_builddir}/contrib/lib/libmaloc.a @lib_list@
+ endif
diff --git a/sci-chemistry/apbs/files/apbs-1.0.0-install-fix.patch b/sci-chemistry/apbs/files/apbs-1.0.0-install-fix.patch
index d9c5a808f0fe..6efd4e16a1f5 100644
--- a/sci-chemistry/apbs/files/apbs-1.0.0-install-fix.patch
+++ b/sci-chemistry/apbs/files/apbs-1.0.0-install-fix.patch
@@ -1,7 +1,16 @@
 diff -Naur apbs-1.0.0-source/Makefile.am apbs-1.0.0-source.new/Makefile.am
 --- apbs-1.0.0-source/Makefile.am	2008-04-17 16:44:51.000000000 -0400
-+++ apbs-1.0.0-source.new/Makefile.am	2008-04-28 18:51:14.000000000 -0400
-@@ -28,7 +28,10 @@
++++ apbs-1.0.0-source.new/Makefile.am	2008-10-11 13:02:42.000000000 -0400
+@@ -16,6 +16,8 @@
+ 
+ SUBDIRS = contrib src bin @apbs_do_tools@ 
+ 
++example_dir = $(datarootdir)/@PACKAGE@
++
+ distclean-local: clean-local
+ 
+ clean-local: clean-ac
+@@ -28,7 +30,10 @@
  	-rm -f ./bin/apbs
  
  install-data-local:
@@ -9,10 +18,10 @@ diff -Naur apbs-1.0.0-source/Makefile.am apbs-1.0.0-source.new/Makefile.am
 -	-cp -rf examples ${prefix}/share 
 -	-cp -rf doc ${prefix}/share 
 -	-cp -rf tools ${prefix}/share
-+	mkdir -p $(DESTDIR)${prefix}/share/GENTOO_PKG_NAME/examples 
-+	mkdir -p $(DESTDIR)${prefix}/share/GENTOO_PKG_NAME/tools
-+	-rm -f doc/LICENSE.txt
-+	-rm -f tools/manip/*.pyc
-+	-cp -rf doc $(DESTDIR)${prefix}/share
-+	-cp -rf examples $(DESTDIR)${prefix}/share/GENTOO_PKG_NAME/
-+	-cp -rf tools $(DESTDIR)${prefix}/share/GENTOO_PKG_NAME/
++	$(mkinstalldirs) $(DESTDIR)$(docdir)
++	$(mkinstalldirs) $(DESTDIR)$(example_dir)/examples
++	$(mkinstalldirs) $(DESTDIR)$(example_dir)/tools
++	rm -f doc/LICENSE.txt doc/README
++	-cp -rf doc $(DESTDIR)$(docdir)/html
++	-cp -rf examples/* $(DESTDIR)$(example_dir)/examples
++	-cp -rf tools/* $(DESTDIR)$(example_dir)/tools