sci-chemistry/gromacs: htmldoc was installed in the wrong path

(Portage version: 2.1.6.13/git/Linux i686)
 (Signed Manifest commit)

4 files changed, 85 insertions, 7 deletions

diff --git a/sci-chemistry/gromacs/ChangeLog b/sci-chemistry/gromacs/ChangeLog
index a7ff8edfa..57aefe5fd 100644
--- a/sci-chemistry/gromacs/ChangeLog
+++ b/sci-chemistry/gromacs/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  30 Nov 2009; Christoph Junghans <kleiner_otti@gmx.de>
+  gromacs-4.0.5-r1.ebuild, +files/gromacs-4.0.5-docdir.patch:
+  htmldoc was installed in the wrong path
+
   22 Nov 2009; Christoph Junghans <kleiner_otti@gmx.de>
   gromacs-4.0.5-r1.ebuild:
   build mpi and non-mpi libs, enable gsl by default
diff --git a/sci-chemistry/gromacs/Manifest b/sci-chemistry/gromacs/Manifest
index e6b49c3e6..ec4a4e2d1 100644
--- a/sci-chemistry/gromacs/Manifest
+++ b/sci-chemistry/gromacs/Manifest
@@ -3,6 +3,7 @@ Hash: SHA1
 
 AUX gromacs-4.0.4-configure-gfortran.patch 731 RMD160 1ccea4fafd6837461114fc36bc31db4f9390fc08 SHA1 0ec79e9ab691cbae5f116adaa3245ef0b123a598 SHA256 5b902eac127bc84e188224fbfe0182ab3fa3b03c200325ada9cd628bb913b479
 AUX gromacs-4.0.4-sparc-cyclecounter.patch 492 RMD160 0edd643a6dc11820e9785561f03047795044311f SHA1 66c0339c308b3d661def0e184311be510e804c3b SHA256 01565b45b73b32d8d6f83bf1fdf750de4215b24935d992c81191a52d01eb6bed
+AUX gromacs-4.0.5-docdir.patch 2901 RMD160 5fc68f62b731e7acca6a0bd3c3ddde199fef444f SHA1 717fbd779dc221d88e76f7f27cbd525c34294b04 SHA256 c2e2166d5828ad5c9bb8632da962cd39c4f29eeff4521e16ef794cb9d72e7f3f
 AUX gromacs-4.0.5-path-overflow.patch 3577 RMD160 3672abfd43760f02a111df492096f1c35443f07f SHA1 a0c9b74f9216fce870bc8559b71f2a68de26e128 SHA256 9a20e199ca3132c526f7e57939ee098ac7e508ae27e73d7cb3fad2514acdb383
 DIST gmxtest-4.0.4.tgz 14845017 RMD160 c7c583415438bdef4c9996da9064254e9460cf16 SHA1 998179aa2bfbc4f80514f10ed774762f85c854c3 SHA256 6a7f787f4bb7cbecb688115ff0854a5ffd2ef33487d7bce4b031e63848b6f361
 DIST gromacs-4.0.4.tar.gz 8443779 RMD160 f90327814170c26a43d99fe7587357a46989fdec SHA1 9466f3ab95d60c0aba8916b1fcc70129cb4e4d72 SHA256 8aefd03cd3269e85c84427f05ceea6d3e16874cd4a90bf3f6fec2b2be24c426f
@@ -10,15 +11,15 @@ DIST gromacs-4.0.5.tar.gz 8465397 RMD160 4c2344629307f3a3daa11b986153d65883a4478
 DIST manual-4.0.pdf 2135100 RMD160 b963642f8e1433f11328c3d0c4b1645c9de506da SHA1 8ae951ee15b2a7dc626331fce36511bc8766144c SHA256 646f810477eee2d710de6019c52056550413d0ba77baf9680195c835ddafe80a
 EBUILD gromacs-3.3.9999.ebuild 6640 RMD160 e0a39da394ae160584d394bcac9cae89d001d229 SHA1 4be6d054002faf7c4a853f1ee7aad09b2da86b1d SHA256 be6ff76414e9569fc0b160e2e591d749c2e46ae975535ec34332e2d6072b2a46
 EBUILD gromacs-4.0.4.ebuild 6899 RMD160 ea01958dddb6e8874410e01df9171c5e081d1856 SHA1 7e1f7e37a88ecea0840e58d3687d6b00d70b0e0f SHA256 ff452e5d24885bc5ec40fc3ca29fe1f5f6997c499667bf62ebfb6b6a23532a07
-EBUILD gromacs-4.0.5-r1.ebuild 6748 RMD160 7758c66cb2e5bf456dbac9e1d795e8683b01f972 SHA1 c577581566cc2f724200b159241da83a85829a2c SHA256 804fbfaa7fec96a38838089cbefeab8ca6a989023fccad56462fb22d13d00a12
+EBUILD gromacs-4.0.5-r1.ebuild 6777 RMD160 cd129e99f4b87c6593b3c1d857eaa2fce97f592e SHA1 2abe23fc342a47bc40945cf0e3c6416d80dbfa09 SHA256 de2f9b23829e5db5d3536cd3b3a5f6b6f117ecd495ef55a781dd930d1c974d73
 EBUILD gromacs-4.0.9999.ebuild 6640 RMD160 c48a23acd60c4943b466cbfe36cc1a10ca5d2327 SHA1 137f0801ffb4fe3a87e3881fa95d432eb3e1041b SHA256 a1a81ae8997d31d956b7aaacc00b8988d6d95c8267c82a5110656856d982441b
 EBUILD gromacs-9999.ebuild 6606 RMD160 c25d3da0f931cee5cd29b7b698025b024b8c33f5 SHA1 3ede827e2fcc2b73ce709af9ff9e5af496c754d8 SHA256 07b3051e743d20b94c2f0df4360d00abad900a1baaad9a76c2924c0a373878fa
-MISC ChangeLog 1657 RMD160 c639324511d7b43b10a1bdfa67150408163798a3 SHA1 44a56687e4d91070d356703bf2021bfb72e60349 SHA256 4b55b23d15d418aca3ec0aade459a9606a54368dcb2c880698abc736b75eba9f
+MISC ChangeLog 1818 RMD160 4b1f313caf2c2051633ab7060f6dd286759e875e SHA1 6044b3637ad8147232e4220c6df473de47fc3cee SHA256 f3d252ff7c3b97a9ea181dbd691e428e5a47e29dbf70ddc0f7547fb2cf714fa0
 MISC metadata.xml 642 RMD160 885e11bdae2d4e79b5fd7b48113f44d987c62b19 SHA1 ab77d33e2f7a8e8d6aa8a997e9247fd61bd17a74 SHA256 6e3242563fd78de425260bf28a07a017afb294898a80e02bacef59ec4a83064c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAksJa+4ACgkQy0OE/ans1/nuyQCfdTy/ZVTVCjr8wnKv7471ptCC
-NDkAnR8+MlYrCyX7uSF2MZeRZw6lT6DQ
-=epsI
+iEYEARECAAYFAksUKZwACgkQy0OE/ans1/mTLACfS/aP2Jbtw2hc+Ud71WCqJ645
+yZMAnA0bgP9rnOPfIBfkndmQyc15iGrO
+=xRb/
 -----END PGP SIGNATURE-----
diff --git a/sci-chemistry/gromacs/files/gromacs-4.0.5-docdir.patch b/sci-chemistry/gromacs/files/gromacs-4.0.5-docdir.patch
new file mode 100644
index 000000000..b753e56d5
--- /dev/null
+++ b/sci-chemistry/gromacs/files/gromacs-4.0.5-docdir.patch
@@ -0,0 +1,72 @@
+diff -Naur gromacs-4.0.5.orig/share/html/Makefile.am gromacs-4.0.5/share/html/Makefile.am
+--- gromacs-4.0.5.orig/share/html/Makefile.am	2006-03-06 10:52:20.000000000 +0100
++++ gromacs-4.0.5/share/html/Makefile.am	2009-11-29 22:27:24.000000000 +0100
+@@ -4,7 +4,7 @@
+ #
+ SUBDIRS = .  images  online
+ 
+-htmldir = ${pkgdatadir}/html
++htmldir = @docdir@/html
+ 
+ html_DATA = online.html gmxfaq.html
+ 
+diff -Naur gromacs-4.0.5.orig/share/html/Makefile.in gromacs-4.0.5/share/html/Makefile.in
+--- gromacs-4.0.5.orig/share/html/Makefile.in	2009-05-09 11:12:24.000000000 +0200
++++ gromacs-4.0.5/share/html/Makefile.in	2009-11-29 22:28:16.000000000 +0100
+@@ -172,7 +172,7 @@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
+-htmldir = ${pkgdatadir}/html
++htmldir = @docdir@/html
+ includedir = @includedir@
+ infodir = @infodir@
+ install_sh = @install_sh@
+diff -Naur gromacs-4.0.5.orig/share/html/images/Makefile.am gromacs-4.0.5/share/html/images/Makefile.am
+--- gromacs-4.0.5.orig/share/html/images/Makefile.am	2006-03-06 10:52:20.000000000 +0100
++++ gromacs-4.0.5/share/html/images/Makefile.am	2009-11-29 23:00:57.000000000 +0100
+@@ -2,7 +2,7 @@
+ #
+ # Don't edit - this file is generated automatically from Makefile.am
+ #
+-imagedir = ${pkgdatadir}/html/images
++imagedir = @docdir@/html/images
+ 
+ image_DATA = \
+ 	features.gif					\
+diff -Naur gromacs-4.0.5.orig/share/html/images/Makefile.in gromacs-4.0.5/share/html/images/Makefile.in
+--- gromacs-4.0.5.orig/share/html/images/Makefile.in	2009-05-09 11:12:24.000000000 +0200
++++ gromacs-4.0.5/share/html/images/Makefile.in	2009-11-29 23:01:20.000000000 +0100
+@@ -186,7 +186,7 @@
+ #
+ # Don't edit - this file is generated automatically from Makefile.am
+ #
+-imagedir = ${pkgdatadir}/html/images
++imagedir = @docdir@/html/images
+ image_DATA = \
+ 	features.gif					\
+ 	flow_leftrightup.gif	flow_vrule.gif 		\
+diff -Naur gromacs-4.0.5.orig/share/html/online/Makefile.am gromacs-4.0.5/share/html/online/Makefile.am
+--- gromacs-4.0.5.orig/share/html/online/Makefile.am	2008-08-11 11:46:17.000000000 +0200
++++ gromacs-4.0.5/share/html/online/Makefile.am	2009-11-29 23:01:47.000000000 +0100
+@@ -2,7 +2,7 @@
+ #
+ # Don't edit - this file is generated automatically from Makefile.am
+ #
+-onlinedir = ${pkgdatadir}/html/online
++onlinedir = @docdir@/html/online
+ 
+ online_DATA = \
+   cpt.html	\
+diff -Naur gromacs-4.0.5.orig/share/html/online/Makefile.in gromacs-4.0.5/share/html/online/Makefile.in
+--- gromacs-4.0.5.orig/share/html/online/Makefile.in	2009-05-09 11:12:24.000000000 +0200
++++ gromacs-4.0.5/share/html/online/Makefile.in	2009-11-29 23:02:15.000000000 +0100
+@@ -186,7 +186,7 @@
+ #
+ # Don't edit - this file is generated automatically from Makefile.am
+ #
+-onlinedir = ${pkgdatadir}/html/online
++onlinedir = @docdir@/html/online
+ online_DATA = \
+   cpt.html	\
+   dat.html           g_disre.html      g_sorient.html        ndx.html        \
diff --git a/sci-chemistry/gromacs/gromacs-4.0.5-r1.ebuild b/sci-chemistry/gromacs/gromacs-4.0.5-r1.ebuild
index 891c58457..21c2bd1b7 100644
--- a/sci-chemistry/gromacs/gromacs-4.0.5-r1.ebuild
+++ b/sci-chemistry/gromacs/gromacs-4.0.5-r1.ebuild
@@ -40,6 +40,7 @@ src_prepare() {
 
 	epatch "${FILESDIR}/${PN}-4.0.4-sparc-cyclecounter.patch"
 	epatch "${FILESDIR}/${P}-path-overflow.patch"
+	epatch "${FILESDIR}/${P}-docdir.patch"
 	# Fix typos in a couple of files.
 	sed -e "s:+0f:-f:" -i share/tutor/gmxdemo/demo \
 		|| die "Failed to fixup demo script."
@@ -158,8 +159,8 @@ src_configure() {
 	if use mpi ; then
 		elog "You have enabled mpi, only mdrun will make use of mpi, that is why"
 		elog "we configure/compile gromacs twice (with and without mpi) and only"
-		elog "install mdrun with mpi support. In addtion you will get libgmx,"
-		elog "libgmxana and libmd with and without mpi support."
+		elog "install mdrun with mpi support. In addtion you will get libgmx and"
+		elog "libmd with and without mpi support."
 	fi
 
 	myconfdouble="${myconf} --enable-double --program-suffix='${suffixdouble}'"