Merge branch 'master' of git://git.overlays.gentoo.org/proj/sci

* 'master' of git://git.overlays.gentoo.org/proj/sci:
  Another prefix fix
  sci-mathematics/frama-c: fixes Manifest
  sci-mathematics/frama-c/frama-c-20100401.ebuild: EAPI3 typos
  [app-doc/gromacs-manual]: fixed install location (Portage version: 2.1.8.3/git/Linux i686)  (Signed Manifest commit)

6 files changed, 14 insertions, 23 deletions

diff --git a/app-doc/gromacs-manual/Manifest b/app-doc/gromacs-manual/Manifest
index 56e8a8f57..e8612653a 100644
--- a/app-doc/gromacs-manual/Manifest
+++ b/app-doc/gromacs-manual/Manifest
@@ -1,13 +1,13 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-EBUILD gromacs-manual-9999.ebuild 1372 RMD160 a2c15a849f25e0916ec9ff6106778eff3cee3495 SHA1 2d698d9ab625255a212d90dce1937e8dae9a79c1 SHA256 27df6c3abe02f7e13480fa532979059f88157ced6089d2e666d1a96f29923d0c
+EBUILD gromacs-manual-9999.ebuild 1372 RMD160 f78a5ed3e20821cd47da92e000feb680d4252f90 SHA1 a55874f2c0011bb095e4cae157f2dee61356df9b SHA256 b5ca55ac9c81f2a39e1ff10b1fa923da71859cfb4234588a4dbad1a7031a638d
 MISC ChangeLog 279 RMD160 b790db407a33641064eeac7d30894f3398f31ed2 SHA1 85ff23743c7ea190900db5bd44b585507664c6cf SHA256 f977bc1ead52fce5bdf1c76fdd1dc965051d4e32eb6999ee3ed514550bbed043
 MISC metadata.xml 166 RMD160 4452298fd03e7c9395d1182bfe69d60a14144af6 SHA1 cb0b513473c0348f4f6f6cd9a132e4884155fddb SHA256 84c92b49702daf95eace8d2765215cbd8650da4ef776f9f700b5ce3785dec852
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkx220EACgkQy0OE/ans1/lxCwCfQ9uE7aY8VYZnH8Pi+L+cEBIh
-cnoAn02LJJ5tMqu8bSvDreXzm0+V5edI
-=eTm8
+iEYEARECAAYFAkyuNJoACgkQy0OE/ans1/nZ9wCfWFtDV/V8IABWguyEcbjMFHIx
+FEwAn0trr4nqk4fGa51e3ae7AseG3qec
+=GSEh
 -----END PGP SIGNATURE-----
diff --git a/app-doc/gromacs-manual/gromacs-manual-9999.ebuild b/app-doc/gromacs-manual/gromacs-manual-9999.ebuild
index 4e5e067ab..9b46e7299 100644
--- a/app-doc/gromacs-manual/gromacs-manual-9999.ebuild
+++ b/app-doc/gromacs-manual/gromacs-manual-9999.ebuild
@@ -44,6 +44,6 @@ src_compile() {
 }
 
 src_install() {
-	docinto /usr/share/doc/gromacs-${PV}
-	newdoc gromacs.pdf manual-${PV}.pdf
+	insinto /usr/share/doc/gromacs-${PV}
+	newins gromacs.pdf manual-${PV}.pdf
 }
diff --git a/sci-chemistry/nmrpipe/Manifest b/sci-chemistry/nmrpipe/Manifest
index e3be1c255..59cb4b3d5 100644
--- a/sci-chemistry/nmrpipe/Manifest
+++ b/sci-chemistry/nmrpipe/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 5.5.2010.277.15.30-lib.patch 997 RMD160 09e9dbed8e1e2e4964bdf381a15b556d0ea9f3bb SHA1 881a3554f21fb23973e0b8a31b59cff495f5edbb SHA256 011aea3e38ef3eb650be7b5d6274913bbb4f5367838f4bb86f97556ad247b57f
 AUX env-nmrpipe-new 597 RMD160 6948506b9106af33ecd1d7aefce5bb1b9a1f3e1d SHA1 df74a34eab52ed3b4007cf2a33a8b2ccacf50938 SHA256 9cdf0ebfb771c04ff8e38b94ad29cd18e349f76ee6604e07d4b7567621c6be46
 DIST NMRPipeX.tZ 117222571 RMD160 89c7a35848faa99629208db1f06c82aadbd331fe SHA1 e7ee4a7430d969772ff25748cccd8dd0171e813d SHA256 7a4f49d054baee44cdb6ffb862ecc200030952c56a5d067ae803d6eb5baa057a
@@ -10,13 +7,6 @@ DIST dyn.tZ 137835647 RMD160 b22e2aac43c94f564e3c28ae6dd0aee3c0fb7825 SHA1 dc165
 DIST install.com 36561 RMD160 7a7cae57e470f5637106a895d1a2ace486bb33a9 SHA1 2c296e0aadb14735253891f2cf5a451b98638581 SHA256 af5977a3c165d5552f5fad43a9cd9e303adc72b85011e284e28cc2cdd04bd160
 DIST talos.tZ 37126169 RMD160 9e62d935728cb0b4fc49acf5bba0739697c796af SHA1 d306627bbc448aecec4b9c4cbbdc9f79ccd581b2 SHA256 6c3fb4f700aa6f115462374b2a2bc8e762687d61ac0a5f382c81f6265ad9683a
 DIST valpha_all.tar 699166720 RMD160 75ebf0a84524212cd25d62ba33f6a5edca05dd20 SHA1 a8be07ac97a826e44ed240946217a50fd3e8ba1e SHA256 3f2ff243e1d0e2508f20ec1ab6108eb986bcc1bc4c9ec79b4ff8ce6584805b0a
-EBUILD nmrpipe-5.5.2010.277.15.30.ebuild 5171 RMD160 7df0b5f78767113ffd63eb258e5604b52d671a9f SHA1 2b68961688e6e1f78b0cef4403191dc7b33f05e4 SHA256 30fd5b23353e1eba411f2756d73448de1ee7c37d95c54bc814c010d833faa2ff
+EBUILD nmrpipe-5.5.2010.277.15.30.ebuild 5208 RMD160 b808bf5196e46657595c7011d36e6f2949ccad48 SHA1 d5024c0f698b1068a5d542ac4cea7b9d2b857f79 SHA256 ec46f4063e4517795cde306c4bfaef3fd6f874d726d38358e2ed7911676fa851
 MISC ChangeLog 7484 RMD160 29997453d5c9662a4b190da53aa15f8d9fccc95d SHA1 57aef87010bcd599c5fa180999e301d6a1ca0793 SHA256 21caa4546746e7674b5f216e4ad735b7f70c7e3f71f5bad7a36eb963cc01ed57
 MISC metadata.xml 249 RMD160 789eca813b850a4619f671586826b824098ec47b SHA1 554c0cc8335f6d6410f6f504bf032a7c6de36c89 SHA256 c3f71fe107b700acc3c21923ed360604cfd47ac3181d9ed7605a0472250a8064
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
-
-iEYEARECAAYFAkythrEACgkQgAnW8HDreRaAvQCeKiGBBP8E45Y2kZ5GUc0dbTRF
-Q9IAoKQ7J8C3Qt9v58S7UAfMeMSyGKxZ
-=aM51
------END PGP SIGNATURE-----
diff --git a/sci-chemistry/nmrpipe/nmrpipe-5.5.2010.277.15.30.ebuild b/sci-chemistry/nmrpipe/nmrpipe-5.5.2010.277.15.30.ebuild
index aa8fd3eeb..1654289ec 100644
--- a/sci-chemistry/nmrpipe/nmrpipe-5.5.2010.277.15.30.ebuild
+++ b/sci-chemistry/nmrpipe/nmrpipe-5.5.2010.277.15.30.ebuild
@@ -149,7 +149,8 @@ src_install() {
 		-e "s: /bin: ${EPREFIX}/bin:g" \
 		-e "s: /usr/bin: ${EPREFIX}/usr/bin:g" \
 		-e "s: /usr/local/bin: ${EPREFIX}/usr/bin:g" \
-		-i {com/,nmrtxt/*.com,nmrtxt/nt/*.com,dynamo/tcl/,talos*/com/,dynamo/tcl/}* || die
+		-i {com/,nmrtxt/*.com,nmrtxt/nt/*.com,dynamo/tcl/,talos*/com/,dynamo/tcl/}* \
+			nmrbin.linux9/{nmrDraw,xNotify} || die
 
 	insinto ${NMRBASE}
 	doins -r * || die "Failed to install application."
diff --git a/sci-mathematics/frama-c/Manifest b/sci-mathematics/frama-c/Manifest
index 784e068e3..b2630f506 100644
--- a/sci-mathematics/frama-c/Manifest
+++ b/sci-mathematics/frama-c/Manifest
@@ -1,6 +1,6 @@
 AUX frama-c-20100401-always_init.patch 5161 RMD160 5d03ac3c2b16df3f84ebd481f5cec7ef15cfe38a SHA1 4549ec4921f41115899fa970efa0d31db264fc60 SHA256 dc72a42885d8125a0d5f84c72fa0763cae73a46c8e3ae26f3489fbddc2b4e58a
 AUX frama-c-20100401-plugin_install.patch 1442 RMD160 41ee9fc7b2e057497baf3af63a5d3325c8dc9826 SHA1 519a30d1988309606596411c38c40885dea26ee6 SHA256 2c496724bf528fa3e60cc660fcf9767a44bba070bf4538aa6407186ba718225a
 DIST frama-c-Boron-20100401.tar.gz 24143452 RMD160 ff2a7571cbc80cf2cb6896ab7b5d9250e3b8098c SHA1 77063ba16e2371310a70b950b5c28301db6b58a0 SHA256 78070b9899ba806740f583fb63e22f89bf5dd6508498a79567dec6bab16d5ac6
-EBUILD frama-c-20100401.ebuild 1580 RMD160 8bc74f98423802546c55ad53a06dee49fc2b7541 SHA1 49a40df453f3b2b15609de8923d884712e813474 SHA256 ea837438731e7ea4078e9c5afc234b126684e396e0a0a47db0ceae8b632916f0
-MISC ChangeLog 334 RMD160 07ee88ca2a6dbb47e66a3007f79087d75b5ffe7b SHA1 06264d1290c91133271341a876898841bf005927 SHA256 adc33307ba53b295725bd53fadca752c3139f22f0c2bcd7e78105308b517c78c
+EBUILD frama-c-20100401.ebuild 1580 RMD160 2a17f8b2aad2f3db954c89cba1e025c6264b7338 SHA1 258a24927ea615d970f776fdc50cee807f4a3137 SHA256 98e5f92ebd20b58df1c1ffd2410250f74a569b8843a0da65b55f5dd6e8cdb619
+MISC ChangeLog 485 RMD160 08603c18239092f51d80f65046927240d206c3f0 SHA1 f7524229d78c38feb2d714cd154d5383fed40c54 SHA256 8d15cf177f04eb7d9ea4db383e3f08ce88ed0ba5c0a7e5e6b723cbfe717270ce
 MISC metadata.xml 815 RMD160 464879bb226169c1b7e06f13c90f70639b25487e SHA1 abeb18a64d38099e51e2b6c0c1027cb9671f30e4 SHA256 e03ee0bab13f2fb45987440ec7498bf629aa5a8f7217ae7dbeab461c23e89ea8
diff --git a/sci-mathematics/frama-c/frama-c-20100401.ebuild b/sci-mathematics/frama-c/frama-c-20100401.ebuild
index 10acbad4b..f706eba2d 100644
--- a/sci-mathematics/frama-c/frama-c-20100401.ebuild
+++ b/sci-mathematics/frama-c/frama-c-20100401.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="2"
+EAPI="3"
 
 inherit autotools eutils
 
@@ -18,10 +18,10 @@ IUSE="apron doc gtk ocamlopt +why"
 RESTRICT="strip"
 
 DEPEND=">=dev-lang/ocaml-3.10.2[ocamlopt?]
-		>=dev-ml/ocamlgraph-1.4[gtk? ocamlopt?]
+		>=dev-ml/ocamlgraph-1.4[gtk?,ocamlopt?]
 		gtk? ( >=x11-libs/gtksourceview-2.8
 			>=gnome-base/libgnomecanvas-2.26
-			>=dev-ml/lablgtk-2.14[sourceview gnomecanvas ocamlopt?] )
+			>=dev-ml/lablgtk-2.14[sourceview,gnomecanvas,ocamlopt?] )
 		sci-mathematics/ltl2ba
 		apron? ( sci-mathematics/apron )"
 RDEPEND="${DEPEND}"