Add a patch that fixes the previous broken syntax and allows rebuilding autoconf with version 2.63.

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

4 files changed, 29 insertions, 11 deletions

diff --git a/app-text/catdoc/ChangeLog b/app-text/catdoc/ChangeLog
index 5ed923e5e6ac..4901b7375703 100644
--- a/app-text/catdoc/ChangeLog
+++ b/app-text/catdoc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-text/catdoc
-# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/catdoc/ChangeLog,v 1.23 2008/10/05 21:33:25 aballier Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/catdoc/ChangeLog,v 1.24 2009/06/09 12:39:47 flameeyes Exp $
+
+  09 Jun 2009; Diego E. Pettenò <flameeyes@gentoo.org>
+  catdoc-0.94.2-r1.ebuild, +files/catdoc-0.94.2+autoconf-2.63.patch:
+  Add a patch that fixes the previous broken syntax and allows rebuilding
+  autoconf with version 2.63.
 
 *catdoc-0.94.2-r1 (05 Oct 2008)
 
diff --git a/app-text/catdoc/Manifest b/app-text/catdoc/Manifest
index d7bf0534383f..65b2caf9bab0 100644
--- a/app-text/catdoc/Manifest
+++ b/app-text/catdoc/Manifest
@@ -1,16 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX catdoc-0.94.2+autoconf-2.63.patch 479 RMD160 a3051c3c2272740ac780e1762a346a9ea4b8526c SHA1 12738333d62fea28fcab052a4b7e930cd416af23 SHA256 1b15644b2cf8ba2c09bdd5c463736c8a5dd22089a4fd1c3a9cbd230752441210
 AUX catdoc-0.94.2-flags.patch 1371 RMD160 a2238c01abb11378eb8156715506b8d8418dc7e7 SHA1 f572f3d0af29fdfdc9d4b87f40fbfcf18d337522 SHA256 bebe4055f8f26ccd33a1f26d5dced8ccbf6eed2a2be72e8649cec6372790b5d0
 DIST catdoc-0.94.2.tar.gz 146012 RMD160 59eb7a026fd3a2dae74a3e7f01a58266f7efaf72 SHA1 50ce9d7cb24ad6b10a856c9c24183e2b0a11ca04 SHA256 03c98b103664e5d1b63de110854e93c2453bc10be5634f86c280303eb843d362
-EBUILD catdoc-0.94.2-r1.ebuild 1035 RMD160 0d88762cd6ba1162d509918e21c39c97d41d7d1a SHA1 93ae1cc94a0279c17c7bd4ca57ed410a2e222cc0 SHA256 bcfdd9e482a874c6684c6a3efe14ebc27930c4d6b54cc3b46846bea4752bc4a1
+EBUILD catdoc-0.94.2-r1.ebuild 1065 RMD160 de7f46e7e37eda586f40f4f3694984f6c0be6345 SHA1 c49b1b0b330f45354a11ed96738ab837dd5b43e6 SHA256 a03d77f00a5666baf79e5f3a4259c208086fe8da3a18d4529d23c921bf267f70
 EBUILD catdoc-0.94.2.ebuild 872 RMD160 599e33573e10730b77e5736510a4299ebb6a4bd6 SHA1 cea5bca47199db45015f3dedf6a0c95210ed872f SHA256 d26ea0a27ab63b11f9b1b08de2000a03ff822892a0934f905d922fd74c36ecbf
-MISC ChangeLog 2812 RMD160 b4f27e1215d45c8243e7fa2f7fe8f414859472be SHA1 e97a67907e7b1e203775d40af4db4b11ca1d05eb SHA256 04b53c3a7a95e2f9ca8c6dbdb8b0425b9fc8eb55d96127edbdb553ff0324b5b4
+MISC ChangeLog 3043 RMD160 3f394429e1c9409242f6097b21b4cde79153c372 SHA1 67241da8e2ec9f488b646c802072cf223df53760 SHA256 f0dfbab357e8f7055fe2e003fe635d8362dcc39d5e64cf7844ba6eba40b96cb5
 MISC metadata.xml 156 RMD160 2bf6b2ed9ff0fcef1e902cf093ccf4ae2dcc70a0 SHA1 e9260cd53905d8569cf3327ded4c6d01653fc389 SHA256 b4971b8472ab3fe4fbfe41b331a79193ca19e86c08d055ad1c20eaf9e04b79b6
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
+Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkjpMqsACgkQvFcC4BYPU0qknwCdHGdxhIJVNCi6TiUzWpN5VfH9
-et8AnRQlABw7PKd0gR4m4zCgfCO8Izen
-=oOpX
+iEYEARECAAYFAkouWBkACgkQAiZjviIA2XjN6QCghWLxwf+nXGCcny3s76aDS5qm
+dRkAnAnPQBBog+FLJsvPsSCM2iZlp6Ev
+=1j4Z
 -----END PGP SIGNATURE-----
diff --git a/app-text/catdoc/catdoc-0.94.2-r1.ebuild b/app-text/catdoc/catdoc-0.94.2-r1.ebuild
index 524eb6e2a9a4..60e8ac94c16f 100644
--- a/app-text/catdoc/catdoc-0.94.2-r1.ebuild
+++ b/app-text/catdoc/catdoc-0.94.2-r1.ebuild
@@ -1,8 +1,7 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/catdoc/catdoc-0.94.2-r1.ebuild,v 1.1 2008/10/05 21:33:25 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/catdoc/catdoc-0.94.2-r1.ebuild,v 1.2 2009/06/09 12:39:47 flameeyes Exp $
 
-WANT_AUTOCONF=2.1
 WANT_AUTOMAKE=none
 
 inherit autotools eutils
@@ -24,6 +23,7 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	epatch "${FILESDIR}/${P}-flags.patch"
+	epatch "${FILESDIR}/${P}+autoconf-2.63.patch"
 	eautoconf
 }
 
diff --git a/app-text/catdoc/files/catdoc-0.94.2+autoconf-2.63.patch b/app-text/catdoc/files/catdoc-0.94.2+autoconf-2.63.patch
new file mode 100644
index 000000000000..7fc70d33fd9b
--- /dev/null
+++ b/app-text/catdoc/files/catdoc-0.94.2+autoconf-2.63.patch
@@ -0,0 +1,12 @@
+Index: catdoc-0.94.2/configure.in
+===================================================================
+--- catdoc-0.94.2.orig/configure.in
++++ catdoc-0.94.2/configure.in
+@@ -119,6 +119,6 @@ AC_SUBST(charsetcheck)
+ AC_SUBST(installroot)
+ AC_SUBST(catdoc_version)
+ AC_SUBST(CFLAGS)
+-AC_SUBST(WORDS_BIGENDIAN DEFS)
++AC_SUBST(DEFS)
+ AC_CONFIG_HEADER(src/config.h)
+ AC_OUTPUT(doc/Makefile charsets/Makefile src/Makefile Makefile doc/catdoc.1 doc/xls2csv.1 doc/wordview.1 doc/catppt.1)