aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph Junghans <kleiner_otti@gmx.de>2010-03-19 09:33:28 +0100
committerChristoph Junghans <kleiner_otti@gmx.de>2010-03-19 09:33:28 +0100
commitee594098294a97e7dcc6098399e2e8930ef21119 (patch)
treea78924ca2d30b486eb0aa3a8ad71c192a795103a /sci-chemistry
parentsci-chemistry/votca-csg: added support for gromacs double-precision (diff)
downloadsci-ee594098294a97e7dcc6098399e2e8930ef21119.tar.gz
sci-ee594098294a97e7dcc6098399e2e8930ef21119.tar.bz2
sci-ee594098294a97e7dcc6098399e2e8930ef21119.zip
sci-chemistry/votca-csg: gcc-4.4 fix
(Portage version: 2.1.7.17/git/Linux i686) (Signed Manifest commit)
Diffstat (limited to 'sci-chemistry')
-rw-r--r--sci-chemistry/votca-csg/ChangeLog4
-rw-r--r--sci-chemistry/votca-csg/Manifest11
-rw-r--r--sci-chemistry/votca-csg/files/votca-csg-1.0_rc5-gcc-4.4.patch36
-rw-r--r--sci-chemistry/votca-csg/votca-csg-1.0_rc5.ebuild1
4 files changed, 47 insertions, 5 deletions
diff --git a/sci-chemistry/votca-csg/ChangeLog b/sci-chemistry/votca-csg/ChangeLog
index 17cc49dcc..fcf0fd7fb 100644
--- a/sci-chemistry/votca-csg/ChangeLog
+++ b/sci-chemistry/votca-csg/ChangeLog
@@ -2,6 +2,10 @@
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 19 Mar 2010; Christoph Junghans <kleiner_otti@gmx.de>
+ votca-csg-1.0_rc5.ebuild, +files/votca-csg-1.0_rc5-gcc-4.4.patch:
+ gcc-4.4 fix
+
18 Mar 2010; Christoph Junghans <kleiner_otti@gmx.de>
votca-csg-1.0_rc5.ebuild, +files/votca-csg-1.0_rc5-libgmx.patch,
metadata.xml:
diff --git a/sci-chemistry/votca-csg/Manifest b/sci-chemistry/votca-csg/Manifest
index 4abf1fb98..4cc9e204a 100644
--- a/sci-chemistry/votca-csg/Manifest
+++ b/sci-chemistry/votca-csg/Manifest
@@ -2,16 +2,17 @@
Hash: SHA1
AUX votca-csg-1.0_rc5-aclocal.patch 525 RMD160 d44acc92d7fbdaefc5c1b310f483bd2be1535ccd SHA1 523e01b33a2324dc6f2f534de579ff91fafacf12 SHA256 d23bc68bedbe830550a2c9e279636155b00a0394ddbf584b738f0dde8cc5fb8d
+AUX votca-csg-1.0_rc5-gcc-4.4.patch 1083 RMD160 c2970d55ab29c4a9cb024c7a87be4c7a5efdd973 SHA1 4ea316d997992fd6e2bb66fa0a8af11565dece3e SHA256 e28ae9a8f63726b4d49716f7230f9673723d1bb21bb60a7784990bb8d5071edd
AUX votca-csg-1.0_rc5-libgmx.patch 1709 RMD160 7a7e5ff369615abcc818e17747a6c5f53faf314f SHA1 53cfdf83e585d0cb86d9050cd424502475457c63 SHA256 efd58c9500bd2a4b397910554b046ebf2217091c525fedb01febe46103bdd889
DIST votca-csg-1.0_rc5.tar.gz 449302 RMD160 e3970571b3a7776319f8992795ae05e7435a2e7c SHA1 83abfc364c3055f13f0f9935e218f351bd8f36d4 SHA256 a297576bc7e53b1d02a47c13a09278212fafa265b6db8fdd408915834b86b189
-EBUILD votca-csg-1.0_rc5.ebuild 2392 RMD160 8b25b383fa37f356fb4ad1adda159a3fc42afc61 SHA1 94e0678881237eeb332b6f6e04a1c053dc32ac24 SHA256 77204e0e84bc844120e1304146fc1fd669e614f0f45f6c58c30487fb896e51b1
+EBUILD votca-csg-1.0_rc5.ebuild 2436 RMD160 bf207b8373f230f58102ff20113d7d14f3d7d496 SHA1 bb2c162e5a21adbce3996961cc30c5157262a1ea SHA256 06aa97f2cebdbc6b022c4e5bd110543fce2794ec65b0755d6b84f950ee80ad78
EBUILD votca-csg-9999.ebuild 1565 RMD160 5c350a8d2af4dbfcf5700d688f74364127e9a48e SHA1 64694ed9f678a8bbb5b2756505ae83f8ec891d91 SHA256 1245a99a058cec76ff542359da72a98797a56a84a737748eaf7bf8eb04a7d436
-MISC ChangeLog 1819 RMD160 be1663bb1eebb611191f172245b8d2d4533cbea7 SHA1 b96c7bdbd9dd183fa542b13e780202ee556ff269 SHA256 2cf85dc957e7e643f2cafc7fc94464126efd36e9ff1382ea6e119f86adf0a233
+MISC ChangeLog 1958 RMD160 f64cee821e9ecdc5446c46f929932de2af1c21b4 SHA1 8ac2340f210b2a1a5831af254852048ab23b7cbe SHA256 72d0bde4aae913b6a9507e9f9de0228289d2310a20b3f44784ea2e6cfe732ede
MISC metadata.xml 546 RMD160 e5816e43a053881feb0bbc26db802bb1e70fa7c3 SHA1 d125600ff598cb7b77c8c643c71a649317c5a9cb SHA256 458c98c044e8dcc1ad2bd4ee4dbceb75c6de83070991e349da12b9ab20c0ba7c
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.14 (GNU/Linux)
-iEYEARECAAYFAkuimm8ACgkQy0OE/ans1/mOLgCeLD2usv9TmiYw3w8nIzJw5DPF
-SV4An2UpqEwE/Wq4xH9RTxL6yHoyEHao
-=dL1M
+iEYEARECAAYFAkujNtcACgkQy0OE/ans1/lKkwCfReUgPGM1xCDCvDdUa1TtaDnN
+snoAn2otshjKmMm2FrE2UXSwYNC/QHEY
+=WRYF
-----END PGP SIGNATURE-----
diff --git a/sci-chemistry/votca-csg/files/votca-csg-1.0_rc5-gcc-4.4.patch b/sci-chemistry/votca-csg/files/votca-csg-1.0_rc5-gcc-4.4.patch
new file mode 100644
index 000000000..549230bbe
--- /dev/null
+++ b/sci-chemistry/votca-csg/files/votca-csg-1.0_rc5-gcc-4.4.patch
@@ -0,0 +1,36 @@
+# HG changeset patch
+# User Christoph Junghans <junghans@mpip-mainz.mpg.de>
+# Date 1268985769 -3600
+# Node ID cfaab08f9d5e1ca18544105c2fed3c5ae1e7cbd0
+# Parent e61993a20f0b102ddaec21343f6b14282f2a958f
+gcc-4.4 fix: gmx::GromacsVersion->GromacsVersion
+
+diff -r e61993a20f0b -r cfaab08f9d5e src/libcsg/version.cc
+--- a/src/libcsg/version.cc Thu Mar 18 17:53:43 2010 +0100
++++ b/src/libcsg/version.cc Fri Mar 19 09:02:49 2010 +0100
+@@ -20,7 +20,6 @@
+ #include "version.h"
+ #include "config.h"
+
+-namespace gmx {
+ #ifndef GMX4DEV
+ extern "C"
+ {
+@@ -31,7 +30,7 @@
+ #endif
+ // this one is needed because of bool is defined in one of the headers included by gmx
+ #undef bool
+-}
++
+ namespace votca { namespace csg {
+
+ #ifdef HGVERSION
+@@ -54,7 +53,7 @@
+ << "please submit bugs to " PACKAGE_BUGREPORT "\n\n"
+ << tool_name << ", version " << votca::csg::CsgVersionStr()
+ << "\nvotca_tools, version " << votca::tools::ToolsVersionStr()
+- << "\ngromacs, " << gmx::GromacsVersion()
++ << "\ngromacs, " << GromacsVersion()
+ << "\n\n";
+ }
+
diff --git a/sci-chemistry/votca-csg/votca-csg-1.0_rc5.ebuild b/sci-chemistry/votca-csg/votca-csg-1.0_rc5.ebuild
index a246080d6..ac7b60fa3 100644
--- a/sci-chemistry/votca-csg/votca-csg-1.0_rc5.ebuild
+++ b/sci-chemistry/votca-csg/votca-csg-1.0_rc5.ebuild
@@ -31,6 +31,7 @@ DEPEND="${RDEPEND}
src_prepare() {
epatch "${FILESDIR}"/"${PF}"-aclocal.patch
epatch "${FILESDIR}"/"${PF}"-libgmx.patch
+ epatch "${FILESDIR}"/"${PF}"-gcc-4.4.patch
eautoreconf || die "eautoreconf failed"
}