Added patch to fix missing CLK_TCK with glibc-2.4.

Package-Manager: portage-2.1_pre7-r1

4 files changed, 60 insertions, 8 deletions

diff --git a/sci-chemistry/gamess/ChangeLog b/sci-chemistry/gamess/ChangeLog
index 1e6c1467009f..2a84b296da0a 100644
--- a/sci-chemistry/gamess/ChangeLog
+++ b/sci-chemistry/gamess/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-chemistry/gamess
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/gamess/ChangeLog,v 1.9 2006/03/23 15:02:36 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/gamess/ChangeLog,v 1.10 2006/03/28 17:58:09 markusle Exp $
+
+  28 Mar 2006; Markus Dittrich <markusle@gentoo.org>
+  +files/gamess-glibc-2.4-gentoo.patch, gamess-20060222.2.ebuild:
+  Added patch to fix missing CLK_TCK with glibc-2.4. Thanks to
+  Jaroslaw Kalinowski <jak137@o2.pl> for pointing this out. This 
+  fixes bug #127784.
 
 *gamess-20060222.2 (22 Mar 2006)
 
diff --git a/sci-chemistry/gamess/Manifest b/sci-chemistry/gamess/Manifest
index fbcd5468036f..7056a35d9826 100644
--- a/sci-chemistry/gamess/Manifest
+++ b/sci-chemistry/gamess/Manifest
@@ -1,6 +1,6 @@
-MD5 16effbe2f0e7698be1e29be73b608d49 ChangeLog 2829
-RMD160 9343963b0c341ee4cd56f7dd48ddbe123b18c249 ChangeLog 2829
-SHA256 49ccfb10f5a4d7b48d3d8dd69fa27c3118bf9d4e7e338ba0bb6ce07f9c0c5531 ChangeLog 2829
+MD5 d8922a33ef88832971df41bb392f9c85 ChangeLog 3100
+RMD160 b85035af850b4c5198861b93802325ab4d93e4b6 ChangeLog 3100
+SHA256 9cf4a584e53c5acb47a06411459fbe35ec09212861d10fc170e224f0d2affab2 ChangeLog 3100
 MD5 cc629344d268783ea8be555bd06249af files/comp-gentoo.patch 1276
 RMD160 2c7017ceb0138dd192a1a72cf90dcff68f9a69b8 files/comp-gentoo.patch 1276
 SHA256 eb2cb647d2e48ed173cbebc24582d33743833a9345b1472ec2f6b6d28b592a0f files/comp-gentoo.patch 1276
@@ -22,6 +22,9 @@ SHA256 693e3546980d917b1fb02c9c17519d176c1df8ede1381e475272574b8b2835b1 files/di
 MD5 48cee4f6d91822b3ecd488c91faa8edc files/digest-gamess-20060222.2 256
 RMD160 fe5736ffd391b5bbb8c2b0fd0ca1cc8f16d6289f files/digest-gamess-20060222.2 256
 SHA256 d4dfab6eb88cc38fcf5528e937579905ab4d21ed7d8e6947871d53a12e0c8b21 files/digest-gamess-20060222.2 256
+MD5 a62216bb611be7630594636f2b170b39 files/gamess-glibc-2.4-gentoo.patch 1670
+RMD160 d358496e8ef31fd18019253e4dda358f0e101b87 files/gamess-glibc-2.4-gentoo.patch 1670
+SHA256 c8b3fda9a3916897e6d006ceb1545e8b56920566cf25942df61a14f8d85b99ad files/gamess-glibc-2.4-gentoo.patch 1670
 MD5 d2f6837d02ac960e7bed4addf9632eec files/lked-gentoo.patch 783
 RMD160 0dbf965aabc02e82bc818f2d0e55f76900ea2641 files/lked-gentoo.patch 783
 SHA256 7d2f513c6413fcd25a0e8566272db72e48e08c75edcf34f4e12fc0a98fddf71d files/lked-gentoo.patch 783
@@ -37,9 +40,9 @@ SHA256 6b995a78ca1b74e2936f553e8cc286303211d040c9f35a8c540f4b8ce88ae331 files/ru
 MD5 a3224ac9b7286b0112ec036a9af4d1b4 gamess-05272005.5.ebuild 7371
 RMD160 9c688c70e83dad7cd700e4f3f66eb5c00a0877ee gamess-05272005.5.ebuild 7371
 SHA256 473c823cef96e5ff595b266421637f546e07cd6ee4c1f7960fda62c47d4788ab gamess-05272005.5.ebuild 7371
-MD5 8163698e8d3583d0ebe97d12ce8996aa gamess-20060222.2.ebuild 7349
-RMD160 33c34acd0c8e6fd61b7f7170257649d8e38ec9f2 gamess-20060222.2.ebuild 7349
-SHA256 ea412c2526c4bc69914286eaed05f210bfa4342e84426ad993936b924fdc94b2 gamess-20060222.2.ebuild 7349
+MD5 2425348b2dec9ec52e23a44a77e6e4f4 gamess-20060222.2.ebuild 7401
+RMD160 d5fe2bdb40da0b59fdb2be1a96a130e77ce34aba gamess-20060222.2.ebuild 7401
+SHA256 763a320e08316b92e06c76b18271902ec8226cec17a6455618ae5503b8b4bd1c gamess-20060222.2.ebuild 7401
 MD5 041650a939ada57b9df1755a488ad1b7 metadata.xml 254
 RMD160 991c43f74018cbcaaa60b41290c912a8b61091c8 metadata.xml 254
 SHA256 80784c7acbd54102b4d3fc01c3fb2ae5862732093798671596c67a8350c25454 metadata.xml 254
diff --git a/sci-chemistry/gamess/files/gamess-glibc-2.4-gentoo.patch b/sci-chemistry/gamess/files/gamess-glibc-2.4-gentoo.patch
new file mode 100644
index 000000000000..5673eeaae729
--- /dev/null
+++ b/sci-chemistry/gamess/files/gamess-glibc-2.4-gentoo.patch
@@ -0,0 +1,42 @@
+diff -Naur gamess/source/zunix.c gamess-new/source/zunix.c
+--- gamess/source/zunix.c	2005-12-20 22:35:35.000000000 -0600
++++ gamess-new/source/zunix.c	2006-03-27 15:55:13.000000000 -0600
+@@ -244,9 +244,9 @@
+ double etime(float *a)
+    { double        elapsed;
+      struct tms    buf;
+-     elapsed= (float) times(&buf)/ (float) CLK_TCK;
+-     a[0]=(float)(buf.tms_utime + buf.tms_cutime)/CLK_TCK;
+-     a[1]=(float)(buf.tms_stime + buf.tms_cstime)/CLK_TCK;
++     elapsed= (float) times(&buf)/ (float) CLOCKS_PER_SEC;
++     a[0]=(float)(buf.tms_utime + buf.tms_cutime)/CLOCKS_PER_SEC;
++     a[1]=(float)(buf.tms_stime + buf.tms_cstime)/CLOCKS_PER_SEC;
+      return(elapsed); }
+ 
+ /*
+@@ -301,9 +301,9 @@
+ double etime(float *a)
+    { double        elapsed;
+      struct tms    buf;
+-     elapsed= (float) times(&buf)/ (float) CLK_TCK;
+-     a[0]=(float)(buf.tms_utime + buf.tms_cutime)/CLK_TCK;
+-     a[1]=(float)(buf.tms_stime + buf.tms_cstime)/CLK_TCK;
++     elapsed= (float) times(&buf)/ (float) CLOCKS_PER_SEC;
++     a[0]=(float)(buf.tms_utime + buf.tms_cutime)/CLOCKS_PER_SEC;
++     a[1]=(float)(buf.tms_stime + buf.tms_cstime)/CLOCKS_PER_SEC;
+      return(elapsed); }
+ 
+ #endif
+@@ -343,9 +343,9 @@
+ double etime_(float *a)
+    { double        elapsed;
+      struct tms    buf;
+-     elapsed= (float) times(&buf)/CLK_TCK;
+-     a[0]= (float) (buf.tms_utime + buf.tms_cutime)/CLK_TCK;
+-     a[1]= (float) (buf.tms_stime + buf.tms_cstime)/CLK_TCK;
++     elapsed= (float) times(&buf)/CLOCKS_PER_SEC;
++     a[0]= (float) (buf.tms_utime + buf.tms_cutime)/CLOCKS_PER_SEC;
++     a[1]= (float) (buf.tms_stime + buf.tms_cstime)/CLOCKS_PER_SEC;
+      return(elapsed); }
+ 
+ /*
diff --git a/sci-chemistry/gamess/gamess-20060222.2.ebuild b/sci-chemistry/gamess/gamess-20060222.2.ebuild
index 271940eb6ee9..b27aa223aad9 100644
--- a/sci-chemistry/gamess/gamess-20060222.2.ebuild
+++ b/sci-chemistry/gamess/gamess-20060222.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/gamess/gamess-20060222.2.ebuild,v 1.1 2006/03/23 15:02:36 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/gamess/gamess-20060222.2.ebuild,v 1.2 2006/03/28 17:58:09 markusle Exp $
 
 inherit eutils toolchain-funcs fortran flag-o-matic
 
@@ -62,6 +62,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/comp-lked-20060222.2.patch
 	epatch "${FILESDIR}"/ddi-use-ssh-gentoo.patch
 	epatch "${FILESDIR}"/rungms-runall-20060222.2.patch
+	epatch "${FILESDIR}"/gamess-glibc-2.4-gentoo.patch
 
 	# for hardened-gcc let't turn off ssp, since it breakes
 	# a few routines