Fixed gettime test, bug#184484, thanks to Rickard Närström

Package-Manager: portage-2.1.3_rc6

4 files changed, 31 insertions, 10 deletions

diff --git a/app-crypt/gnupg/ChangeLog b/app-crypt/gnupg/ChangeLog
index 5449b6536406..cc88fd17f970 100644
--- a/app-crypt/gnupg/ChangeLog
+++ b/app-crypt/gnupg/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-crypt/gnupg
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/ChangeLog,v 1.298 2007/07/07 08:05:15 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/ChangeLog,v 1.299 2007/07/07 16:12:12 alonbl Exp $
+
+  07 Jul 2007; Alon Bar-Lev <alonbl@gentoo.org>
+  +files/gnupg-2.0.5-test.patch, gnupg-2.0.5.ebuild:
+  Fixed gettime test, bug#184484, thanks to Rickard Närström
 
   07 Jul 2007; Alon Bar-Lev <alonbl@gentoo.org> gnupg-2.0.5.ebuild:
   Fix dependencies, bug#184456
diff --git a/app-crypt/gnupg/Manifest b/app-crypt/gnupg/Manifest
index 409b28c83d3f..afd2b26d291f 100644
--- a/app-crypt/gnupg/Manifest
+++ b/app-crypt/gnupg/Manifest
@@ -30,6 +30,10 @@ AUX gnupg-2.0.4-idea.patch 906 RMD160 df2f628ee03880ff5b0916185cffe0b28316d08b S
 MD5 55421c980c3f87eb781b2a0d57e1b5b9 files/gnupg-2.0.4-idea.patch 906
 RMD160 df2f628ee03880ff5b0916185cffe0b28316d08b files/gnupg-2.0.4-idea.patch 906
 SHA256 89e5af25bf7ae5b1147acb3da41520e2dcad975cda93ab625107626c85651976 files/gnupg-2.0.4-idea.patch 906
+AUX gnupg-2.0.5-test.patch 397 RMD160 5243425ad2bbe29a5f8ad3847b804f9029a49ffb SHA1 07e19865fadb5a3a058c5892f3e44891853a564d SHA256 676eadd2e14643fda9a32419d52120f320298a251e335be549a3834557e13214
+MD5 739926dbfa9aaea2209d309fd73179fd files/gnupg-2.0.5-test.patch 397
+RMD160 5243425ad2bbe29a5f8ad3847b804f9029a49ffb files/gnupg-2.0.5-test.patch 397
+SHA256 676eadd2e14643fda9a32419d52120f320298a251e335be549a3834557e13214 files/gnupg-2.0.5-test.patch 397
 DIST gnupg-1.4.7-ecc0.1.6.diff.bz2 17083 RMD160 df89fc93d5a9836bb12311d66f0ebdab31799fd5 SHA1 ab9e902539a1be746d3c25d969a4ae044a74f44c SHA256 568c1eb297942157250dd11c9a8171566535c49361ade00ab1c95191821ae1fe
 DIST gnupg-1.4.7.tar.bz2 3200642 RMD160 630344c99834cf9adcf806d55e6f609a1e50bd8b SHA1 22149105845c79068771837c8deb7d5ba0854927 SHA256 69d18b7d193f62ca27ed4febcb4c9044aa0c95305d3258fe902e2fae5fc6468d
 DIST gnupg-1.9.21.tar.bz2 1901908 RMD160 f522125f30a29fd2bcacca5894958242946de430 SHA1 f7c9dea1049dfd3da6d66838005def26898d06e2 SHA256 7dfaa7867427dd44ac3277026dec3602626b657d95952b7a5bdeb9e567b5d34c
@@ -62,14 +66,14 @@ EBUILD gnupg-2.0.4-r1.ebuild 2117 RMD160 0e58f01f9a09e6a82178f40b158011eb60b52ba
 MD5 de02e171a90ded06469495ad4c29a3d3 gnupg-2.0.4-r1.ebuild 2117
 RMD160 0e58f01f9a09e6a82178f40b158011eb60b52baa gnupg-2.0.4-r1.ebuild 2117
 SHA256 d722bebea7fe2d7ed8f8efed84a0a0a00f1049b9e67a05fa8c4549aa4fb686f3 gnupg-2.0.4-r1.ebuild 2117
-EBUILD gnupg-2.0.5.ebuild 2210 RMD160 bb110c0e7beff135c687309cc9333460acc44faf SHA1 18987f4886556791fe6860dd1189c2f80b37e96d SHA256 52bafc1adcef2752fad1623139fb5a22a98ab6f64e82374eeb3eb7ec53592660
-MD5 0f25be7458eb0bdf155ff505cd87dd08 gnupg-2.0.5.ebuild 2210
-RMD160 bb110c0e7beff135c687309cc9333460acc44faf gnupg-2.0.5.ebuild 2210
-SHA256 52bafc1adcef2752fad1623139fb5a22a98ab6f64e82374eeb3eb7ec53592660 gnupg-2.0.5.ebuild 2210
-MISC ChangeLog 46054 RMD160 8535aec725c4b3bdc4571e8050d98b58c1ae39b9 SHA1 c9a0064b19d33ff338a840ed973e47a755b3a810 SHA256 1be0e8134c602647969c035d94b51c36e588eaac1fb45e65f0fe9a7d01f4629a
-MD5 91cb96051548a48f0ab84ec77232464a ChangeLog 46054
-RMD160 8535aec725c4b3bdc4571e8050d98b58c1ae39b9 ChangeLog 46054
-SHA256 1be0e8134c602647969c035d94b51c36e588eaac1fb45e65f0fe9a7d01f4629a ChangeLog 46054
+EBUILD gnupg-2.0.5.ebuild 2248 RMD160 c8197ef0100f9dfa05508805002429aaf737ac62 SHA1 7e8cd70627bfd81d17c2fbab0d492bdc8a6c01c8 SHA256 07e37d7f58a04bc808c91062d3cff3eb09b5a38ec80be2f80c9d465b81989e8a
+MD5 33e3e638c544801130f3c42b1f005a3c gnupg-2.0.5.ebuild 2248
+RMD160 c8197ef0100f9dfa05508805002429aaf737ac62 gnupg-2.0.5.ebuild 2248
+SHA256 07e37d7f58a04bc808c91062d3cff3eb09b5a38ec80be2f80c9d465b81989e8a gnupg-2.0.5.ebuild 2248
+MISC ChangeLog 46219 RMD160 25d52f18d2c42e8a30c33b34b7ee6bb673b51778 SHA1 6e31d4fb4c85757b1e718fa53d4036b6d1a06a41 SHA256 04b692d002660da46f83d16229bdf6fbfaafa16532be07dd55d5720120e5d101
+MD5 f128eb249fea6d107eaaacb28838f11b ChangeLog 46219
+RMD160 25d52f18d2c42e8a30c33b34b7ee6bb673b51778 ChangeLog 46219
+SHA256 04b692d002660da46f83d16229bdf6fbfaafa16532be07dd55d5720120e5d101 ChangeLog 46219
 MISC metadata.xml 481 RMD160 d5c4e2fc7b94966795cc4c039d850302d8552448 SHA1 13cb529b83ba9feaad91f1d033d6c33d1eafbd25 SHA256 d88eadc2c75a18f57dcd38f20aa72ee7c79504f62bcab3f7dea60651ccd4b672
 MD5 b507ee36c7487372de42cc9dab034370 metadata.xml 481
 RMD160 d5c4e2fc7b94966795cc4c039d850302d8552448 metadata.xml 481
diff --git a/app-crypt/gnupg/files/gnupg-2.0.5-test.patch b/app-crypt/gnupg/files/gnupg-2.0.5-test.patch
new file mode 100644
index 000000000000..6e4b8329faf2
--- /dev/null
+++ b/app-crypt/gnupg/files/gnupg-2.0.5-test.patch
@@ -0,0 +1,12 @@
+diff -urNp gnupg-2.0.5.org/common/t-gettime.c gnupg-2.0.5/common/t-gettime.c
+--- gnupg-2.0.5.org/common/t-gettime.c	2007-07-05 13:05:01.000000000 +0300
++++ gnupg-2.0.5/common/t-gettime.c	2007-07-07 19:04:55.000000000 +0300
+@@ -57,7 +57,7 @@ test_isotime2epoch (void)
+     { NULL, 0 }
+   };
+   int idx;
+-  u32 val;
++  time_t val;
+   gnupg_isotime_t tbuf;
+ 
+   for (idx=0; array[idx].string; idx++)
diff --git a/app-crypt/gnupg/gnupg-2.0.5.ebuild b/app-crypt/gnupg/gnupg-2.0.5.ebuild
index 1ace52e4cfd7..1cba99fff82f 100644
--- a/app-crypt/gnupg/gnupg-2.0.5.ebuild
+++ b/app-crypt/gnupg/gnupg-2.0.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-2.0.5.ebuild,v 1.2 2007/07/07 08:05:15 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-2.0.5.ebuild,v 1.3 2007/07/07 16:12:12 alonbl Exp $
 
 inherit flag-o-matic
 
@@ -42,6 +42,7 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	epatch "${FILESDIR}/${PN}-2.0.4-idea.patch"
+	epatch "${FILESDIR}/${P}-test.patch"
 
 	# parallel make issue
 	sed -i 's#\.\./common/libcommon#libcommon#g' common/Makefile.in