Fixed a GCC4 compilation issue (see bug #138833)

Package-Manager: portage-2.1.1

5 files changed, 36 insertions, 15 deletions

diff --git a/sci-biology/ariadne/ChangeLog b/sci-biology/ariadne/ChangeLog
index f4907b8c3a02..2c5bc73dc8ea 100644
--- a/sci-biology/ariadne/ChangeLog
+++ b/sci-biology/ariadne/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-biology/ariadne
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/ariadne/ChangeLog,v 1.5 2006/01/21 17:26:17 ribosome Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/ariadne/ChangeLog,v 1.6 2006/09/12 21:27:20 ribosome Exp $
+
+  12 Sep 2006; Olivier Fisette <ribosome@gentoo.org>
+  +files/ariadne-1.3-gcc4.patch, ariadne-1.3-r1.ebuild:
+  Fixed a GCC4 compilation issue (see bug #138833).
 
   21 Jan 2006; Olivier Fisette <ribosome@gentoo.org> ariadne-1.3-r1.ebuild:
   Ebuild clean-up.
diff --git a/sci-biology/ariadne/Manifest b/sci-biology/ariadne/Manifest
index 5d4305b97b72..8f4827a1fefc 100644
--- a/sci-biology/ariadne/Manifest
+++ b/sci-biology/ariadne/Manifest
@@ -1,16 +1,20 @@
-DIST ariadne-1.3.tar.Z 69427
-EBUILD ariadne-1.3-r1.ebuild 924 RMD160 3184f3f2b520801afbaccc3dc49fe4df18e79735 SHA1 654ed1b32b38da2992d97f7012480e9d50559fae SHA256 d946cc1c4de2e65e118652e801d59337d918e8842abbc97b730562ecc1886727
-MD5 66fafc5a8d34c2dacc0abbd71677c42d ariadne-1.3-r1.ebuild 924
-RMD160 3184f3f2b520801afbaccc3dc49fe4df18e79735 ariadne-1.3-r1.ebuild 924
-SHA256 d946cc1c4de2e65e118652e801d59337d918e8842abbc97b730562ecc1886727 ariadne-1.3-r1.ebuild 924
-MISC ChangeLog 967 RMD160 24ba5fed30ffef4e6fdce0b86aed0d5cd6bee252 SHA1 048aba438d578ae38819a6cc4de4305dcf6b2733 SHA256 508f68ba81627e7106b456ce333ba64624cf7a4dac8228234ed5e15d4f2b9b32
-MD5 1dc98a1d921066eb1687963e74736512 ChangeLog 967
-RMD160 24ba5fed30ffef4e6fdce0b86aed0d5cd6bee252 ChangeLog 967
-SHA256 508f68ba81627e7106b456ce333ba64624cf7a4dac8228234ed5e15d4f2b9b32 ChangeLog 967
+AUX ariadne-1.3-gcc4.patch 279 RMD160 c36395250c0791d9db6f6b05eb7fee976a3bb553 SHA1 3e383d49b7bbac276a4821e235cc79d396e06b1c SHA256 4d5d273beb35d28d8d15311c98f928c77ccb4ca78d537cecae8563cddb7d9fcd
+MD5 85fea40cfa602b59790ef65c90cd23b6 files/ariadne-1.3-gcc4.patch 279
+RMD160 c36395250c0791d9db6f6b05eb7fee976a3bb553 files/ariadne-1.3-gcc4.patch 279
+SHA256 4d5d273beb35d28d8d15311c98f928c77ccb4ca78d537cecae8563cddb7d9fcd files/ariadne-1.3-gcc4.patch 279
+DIST ariadne-1.3.tar.Z 69427 RMD160 084b40d38346f2cd5e99a9c49aeee303fe591805 SHA1 ff1886c0d7ac547cdece5cde50b531e878918afd SHA256 8b6b0acb6e8d02b1303d94b20906bf2bf1dee3de4eceeb1b927cfba7a96fd00d
+EBUILD ariadne-1.3-r1.ebuild 969 RMD160 84257430f8844d6d7a2f7f2116ac6e1554c46a40 SHA1 d584abfc521e1ac322e495ef8762a7f7d07c4dcc SHA256 d84f1af4f8ebc4483288a6f18cba4291d57380b2475a6bbf706454d2bd17beb5
+MD5 18c5b7bd3113a2f5c20a4657c2f4fbdb ariadne-1.3-r1.ebuild 969
+RMD160 84257430f8844d6d7a2f7f2116ac6e1554c46a40 ariadne-1.3-r1.ebuild 969
+SHA256 d84f1af4f8ebc4483288a6f18cba4291d57380b2475a6bbf706454d2bd17beb5 ariadne-1.3-r1.ebuild 969
+MISC ChangeLog 1129 RMD160 c94a6f56b8b5f847e69480627ec562af388c3e26 SHA1 325bf0d6f3b2e16cf63664e7bd036217d7d76470 SHA256 62338c71d4b4425f9309201933f02561a7c44b6903dad5319c29d3eb9b9f2d36
+MD5 bb9a383cdfa80d47743a93f010818fe2 ChangeLog 1129
+RMD160 c94a6f56b8b5f847e69480627ec562af388c3e26 ChangeLog 1129
+SHA256 62338c71d4b4425f9309201933f02561a7c44b6903dad5319c29d3eb9b9f2d36 ChangeLog 1129
 MISC metadata.xml 955 RMD160 0c5a764fffe3ee06b8b19def0cdbcea1baeb14e4 SHA1 acc71b98260e75475c0df9a764214c0ae066e7c4 SHA256 94b61683ea5272be14e1a1a75dad670ce6cdddc1aa47261b4113b3abe77420f4
 MD5 1b8e5b9a7428839df6a138ea00937b3f metadata.xml 955
 RMD160 0c5a764fffe3ee06b8b19def0cdbcea1baeb14e4 metadata.xml 955
 SHA256 94b61683ea5272be14e1a1a75dad670ce6cdddc1aa47261b4113b3abe77420f4 metadata.xml 955
-MD5 2c1e987db0cdcd91873d0e7a4476bbad files/digest-ariadne-1.3-r1 61
-RMD160 42b45f61585b7490e11b6ca9768c889a49ab5e51 files/digest-ariadne-1.3-r1 61
-SHA256 02f05f1d97a7226d2545db339abf82aaa6eeefb3191036af9e6f33e5b7c8e8e0 files/digest-ariadne-1.3-r1 61
+MD5 e4a2028b247fdd6ee5c3a079f17e7bd0 files/digest-ariadne-1.3-r1 229
+RMD160 08102c194fc7bf3f300b43eba4cf7aa20a5fda7b files/digest-ariadne-1.3-r1 229
+SHA256 dc5464498d8cf0691885ecfab0fa2789e2769cd22b4fabf5670859eaa8b61d02 files/digest-ariadne-1.3-r1 229
diff --git a/sci-biology/ariadne/ariadne-1.3-r1.ebuild b/sci-biology/ariadne/ariadne-1.3-r1.ebuild
index e5059aeb7cad..636231646eff 100644
--- a/sci-biology/ariadne/ariadne-1.3-r1.ebuild
+++ b/sci-biology/ariadne/ariadne-1.3-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/ariadne/ariadne-1.3-r1.ebuild,v 1.4 2006/01/21 17:26:17 ribosome Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/ariadne/ariadne-1.3-r1.ebuild,v 1.5 2006/09/12 21:27:20 ribosome Exp $
 
-inherit toolchain-funcs
+inherit toolchain-funcs eutils
 
 DESCRIPTION="Protein sequences and profiles comparison"
 LICENSE="as-is"
@@ -20,6 +20,7 @@ S="${WORKDIR}/SRC-${PV}"
 src_unpack(){
 	unpack ${A}
 	cd "${S}"
+	epatch "${FILESDIR}"/${P}-gcc4.patch
 	sed -e "s/CC = gcc/CC = $(tc-getCC)/" \
 		-e "s/OPTIMISE = -O2/OPTIMISE = ${CFLAGS}/" \
 		-i Makefile || die
diff --git a/sci-biology/ariadne/files/ariadne-1.3-gcc4.patch b/sci-biology/ariadne/files/ariadne-1.3-gcc4.patch
new file mode 100644
index 000000000000..0192efd4db5e
--- /dev/null
+++ b/sci-biology/ariadne/files/ariadne-1.3-gcc4.patch
@@ -0,0 +1,10 @@
+--- cl.c.old	2006-09-12 17:13:02.000000000 -0400
++++ cl.c	2006-09-12 17:13:34.000000000 -0400
+@@ -658,6 +658,7 @@
+       fclose(fp);
+       if ( ! stat( filename, &buf ) )
+ 	{
++	  char *ctime(), *t;
+ 	  sprintf( date, "%s", ctime(&buf.st_mtime) );
+ 	  t = date;
+ 	  while ( *t )
diff --git a/sci-biology/ariadne/files/digest-ariadne-1.3-r1 b/sci-biology/ariadne/files/digest-ariadne-1.3-r1
index a973c1ce1d54..a3d3b57a8e69 100644
--- a/sci-biology/ariadne/files/digest-ariadne-1.3-r1
+++ b/sci-biology/ariadne/files/digest-ariadne-1.3-r1
@@ -1 +1,3 @@
 MD5 240dc8b278a02b0fcdf56cd186d9b0ec ariadne-1.3.tar.Z 69427
+RMD160 084b40d38346f2cd5e99a9c49aeee303fe591805 ariadne-1.3.tar.Z 69427
+SHA256 8b6b0acb6e8d02b1303d94b20906bf2bf1dee3de4eceeb1b927cfba7a96fd00d ariadne-1.3.tar.Z 69427