Enhance nofetch msg, fix compilation with USE=cuda and gcc != 4.4*, thanks xarthisius...

Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64

diff --git a/sci-chemistry/vmd/ChangeLog b/sci-chemistry/vmd/ChangeLog
index f144bb676105b0a30043a46c8b1fdbe71609ff70..eed67c818206facdb24dd755620c15845f391158 100644 (file)
--- a/sci-chemistry/vmd/ChangeLog
+++ b/sci-chemistry/vmd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-chemistry/vmd
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/vmd/ChangeLog,v 1.42 2011/07/20 16:58:14 pacho Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/vmd/ChangeLog,v 1.43 2012/01/10 13:49:48 jlec Exp $
+
+  10 Jan 2012; Justin Lecher <jlec@gentoo.org> vmd-1.9.ebuild, metadata.xml:
+  Enhance nofetch msg, fix compilation with USE=cuda and gcc != 4.4*, thanks
+  xarthisius for the help
 
   20 Jul 2011; Pacho Ramos <pacho@gentoo.org> metadata.xml:
   Drop maintainer due retirement, bug #105599

diff --git a/sci-chemistry/vmd/Manifest b/sci-chemistry/vmd/Manifest
index d06ce2db0c9b68574be9df86d05c2fbb51e656b0..ccce529937fd3c5325750f0b46cd125329c7e4e9 100644 (file)
--- a/sci-chemistry/vmd/Manifest
+++ b/sci-chemistry/vmd/Manifest
@@ -1,18 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 DIST vmd-1.8.7-gentoo-patches.tar.xz 15900 RMD160 1eed2bc6eebacf846a15973e3ec3378de2890551 SHA1 5d157f9288b9552f3bc69af7283f9f83d71b69be SHA256 0a991ccfda6ffc68de930919bd76b9dba208d4ca5c21ce19d283da1c1727fcda
 DIST vmd-1.8.7.src.tar.gz 23853864 RMD160 1c4751552d7b3f376f91a4b28ee9d4a028ded01a SHA1 409b6f8959d551f581991073f98885b47c21c25c SHA256 72fe2fb7eff4c805a886ea929c7e143a3a1be57cc817b5d1719d29e591d80316
 DIST vmd-1.9-gentoo-patches.tar.xz 14508 RMD160 e10a0f24d8b87240e2555a8e26a2bd679b6274b3 SHA1 1be91a24b4c8145e0efe61bc277ceebdbfc02eb4 SHA256 c18b16704c6c186e8ac753c96f38f85413258bce786635b2635a9aa18de5c28c
 DIST vmd-1.9.src.tar.gz 28639907 RMD160 96a6cf99d34bdd264550aec334f2cd8c5cfdaceb SHA1 b555a01815a2cf16be910ef6977793f1670a62f1 SHA256 4209b06faba3af324575570bd0533258471f6c782262c0727b52cdce9de89579
 EBUILD vmd-1.8.7-r2.ebuild 5703 RMD160 aaa3c60b5200490175defd4e8c529e4d90f2e345 SHA1 372dd77066b8dde828192b18a22c476b402d92c1 SHA256 f46a8c403ab5342301d263dde31ba1a7364a681edea9c9419f7df031b8203c40
-EBUILD vmd-1.9.ebuild 6343 RMD160 76194dce6e4b55daae01370ed519eae16b52aa4d SHA1 d5c5604e97a8134566ff8b20435093c03afa9157 SHA256 8a1f20fe7e9a08c1ee25795bacb261b43e791b0629d1d0084f2fe1294d45c7a3
-MISC ChangeLog 7955 RMD160 bfe7dcba8881f01bd341445c4970274367e4ffd4 SHA1 d6580745a9cafe6fad472786e43e8e25f3e806ca SHA256 f422b55e97d6711f5cdacbbf9da1dc8de9ec94fedd9d7e6945b65c0ff012bcce
-MISC metadata.xml 580 RMD160 0fba98a12f6e596e97e54950cdcea6add98b58e3 SHA1 0242874108cd1979034051c5b41dfd1ed15e41ef SHA256 ba148b606653a6107b3002e4c1abc40e8c075173ef49d43dc84d83f93e219aeb
+EBUILD vmd-1.9.ebuild 6571 RMD160 3eedcf5c0255925fa8762edf9d4a2d1a26c7a783 SHA1 96e9f65d769975d489bd5eae639625136215c4ee SHA256 1710056573ab389dd562c2a37c19c2148b6961ce9f2f763868598a6aaeb11d09
+MISC ChangeLog 8135 RMD160 ddef0527f230db67021d80f2759247b517fc4554 SHA1 584e55c7009cad016d69355d74bf2d64b25cb02b SHA256 d8b9d7aa10c4239cd304fb8b8e1bd4c4c1daa60a88a77bd60c213fde7d806d5c
+MISC metadata.xml 580 RMD160 779283c84d225352c819fba1527b5b91d2b4e09c SHA1 2f821c2fd5afc7b321efeaa827f0d459be937aea SHA256 ed78f23bbbbf847e14f5c62b82f2ddce852381ed344a5c09f2f1722ea60d6ebe
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk4nCSsACgkQCaWpQKGI+9Q/7ACgiHIOqX4rRT1mo6I63qlyyf6Q
-7GgAnivxQXGPGjaZU3ZBVgxRRbvIJJqz
-=3LQB
+iEYEAREKAAYFAk8MQgEACgkQgAnW8HDreRbdvgCgvIjiI0mox0wlqHR8QzGt7coI
+d7cAnRAjlKcJ8TgTkp8e/ofrq/mM7UPe
+=KWBo
 -----END PGP SIGNATURE-----

diff --git a/sci-chemistry/vmd/metadata.xml b/sci-chemistry/vmd/metadata.xml
index 103ce95d489451678f54fda02fc15a5abcd33396..be76141a652b4c14115f0d9906d20554f61f795f 100644 (file)
--- a/sci-chemistry/vmd/metadata.xml
+++ b/sci-chemistry/vmd/metadata.xml
@@ -7,9 +7,9 @@
        </maintainer>
        <herd>sci-chemistry</herd>
        <use>
-               <flag name='msms'>Add support for MSMS SAS calcualtion tool</flag>
-               <flag name='povray'>Add support for povray raytracer for HQ     images</flag>
-               <flag name='tachyon'>Add support for tachyon raytracer for HQ images</flag>
-               <flag name='cuda'>Use nvidia cuda toolkit for speeding up computations</flag>
+               <flag name="msms">Add support for MSMS SAS calcualtion tool</flag>
+               <flag name="povray">Add support for povray raytracer for HQ     images</flag>
+               <flag name="tachyon">Add support for tachyon raytracer for HQ images</flag>
+               <flag name="cuda">Use nvidia cuda toolkit for speeding up computations</flag>
        </use>
 </pkgmetadata>

diff --git a/sci-chemistry/vmd/vmd-1.9.ebuild b/sci-chemistry/vmd/vmd-1.9.ebuild
index b6a71f49c95c933b9201d444b59a88db573fab73..9a03082dccd5b975eff57bb978c1a5f1ae6193d9 100644 (file)
--- a/sci-chemistry/vmd/vmd-1.9.ebuild
+++ b/sci-chemistry/vmd/vmd-1.9.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/vmd/vmd-1.9.ebuild,v 1.6 2011/06/15 08:29:15 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/vmd/vmd-1.9.ebuild,v 1.7 2012/01/10 13:49:48 jlec Exp $
 
 EAPI="3"
 
@@ -57,8 +57,9 @@ QA_DT_HASH_x86="usr/lib/vmd/plugins/LINUX/tcl/intersurf1.1/bin/intersurf.so"
 pkg_nofetch() {
        elog "Please download ${P}.src.tar.gz from"
        elog "${VMD_DOWNLOAD}"
-       elog "after agreeing to the license and then move it to "
-       elog "${DISTDIR}"
+       elog "after agreeing to the license and get"
+       elog "http://dev.gentoo.org/~jlec/distfiles/${P}-gentoo-patches.tar.xz"
+       elog "Place both in ${DISTDIR}"
 }
 
 src_prepare() {
@@ -117,8 +118,11 @@ src_prepare() {
 #              -e "s:gentoo-numpy-include:${EPREFIX}$(python_get_sitedir)/${NUMPY_INCLUDE}:" \
 #              -i configure || die "failed setting up python"
 
+       local gcc44_bindir="$(ls -d ${EPREFIX}/usr/*pc-linux-gnu/gcc-bin/4.4*)"
+
        sed \
                -e "s:gentoo-cuda-lib:${EPREFIX}/opt/cuda/$(get_libdir):g" \
+               -e "/^\$arch_nvccflags/s:=:= \"--compiler-bindir=${gcc44_bindir} \" . \n:1" \
                -i configure || die
 
        sed \