Fix automake error causing bug #141311.

(Portage version: 2.1-r1)

5 files changed, 24 insertions, 2 deletions

diff --git a/app-office/kexi/ChangeLog b/app-office/kexi/ChangeLog
index 68b8390343d4..d821613c2ae0 100644
--- a/app-office/kexi/ChangeLog
+++ b/app-office/kexi/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-office/kexi
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/kexi/ChangeLog,v 1.39 2006/07/20 16:58:26 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/kexi/ChangeLog,v 1.40 2006/07/23 12:10:01 greg_g Exp $
+
+  23 Jul 2006; Gregorio Guidi <greg_g@gentoo.org>
+  +files/kexi-1.5.2-automake-error.patch, kexi-1.5.2.ebuild:
+  Fix automake error causing bug #141311.
 
   20 Jul 2006; Diego Pettenò <flameeyes@gentoo.org> kexi-1.5.2.ebuild:
   Forgot to remove patches, bug #141128.
diff --git a/app-office/kexi/files/digest-kexi-1.4.2 b/app-office/kexi/files/digest-kexi-1.4.2
index a054824ae545..9a2dc2d67d8e 100644
--- a/app-office/kexi/files/digest-kexi-1.4.2
+++ b/app-office/kexi/files/digest-kexi-1.4.2
@@ -1 +1,3 @@
 MD5 6b456fb7d54c84b11396b27a96ae0cf8 koffice-1.4.2.tar.bz2 19486852
+RMD160 117d5c50aa81d669002005f39fc03bc3f999b62c koffice-1.4.2.tar.bz2 19486852
+SHA256 c9d5ba0bbd008ebfc40500b0d69335d94ad9657cb58c5f2d939179de8d23d361 koffice-1.4.2.tar.bz2 19486852
diff --git a/app-office/kexi/files/digest-kexi-1.4.2-r1 b/app-office/kexi/files/digest-kexi-1.4.2-r1
index a054824ae545..9a2dc2d67d8e 100644
--- a/app-office/kexi/files/digest-kexi-1.4.2-r1
+++ b/app-office/kexi/files/digest-kexi-1.4.2-r1
@@ -1 +1,3 @@
 MD5 6b456fb7d54c84b11396b27a96ae0cf8 koffice-1.4.2.tar.bz2 19486852
+RMD160 117d5c50aa81d669002005f39fc03bc3f999b62c koffice-1.4.2.tar.bz2 19486852
+SHA256 c9d5ba0bbd008ebfc40500b0d69335d94ad9657cb58c5f2d939179de8d23d361 koffice-1.4.2.tar.bz2 19486852
diff --git a/app-office/kexi/files/kexi-1.5.2-automake-error.patch b/app-office/kexi/files/kexi-1.5.2-automake-error.patch
new file mode 100644
index 000000000000..91a26ed0647e
--- /dev/null
+++ b/app-office/kexi/files/kexi-1.5.2-automake-error.patch
@@ -0,0 +1,11 @@
+diff -Nur koffice-1.5.2/kexi/plugins/Makefile.am koffice-1.5.2.new/kexi/plugins/Makefile.am
+--- koffice-1.5.2/kexi/plugins/Makefile.am	2006-07-09 04:09:43.000000000 +0200
++++ koffice-1.5.2.new/kexi/plugins/Makefile.am	2006-07-23 12:03:23.000000000 +0200
+@@ -7,6 +7,6 @@
+   SCRIPTINGDIR=scripting
+ endif
+ 
+-SUBDIRS = tables relations migration queries forms $(REPORTS) $(SCRIPTINGDIR) importexport
++SUBDIRS = tables relations migration queries forms $(SCRIPTINGDIR) importexport
+ 
+ #importwizard relations
diff --git a/app-office/kexi/kexi-1.5.2.ebuild b/app-office/kexi/kexi-1.5.2.ebuild
index 27793f1ec1ed..c74f2aca14b3 100644
--- a/app-office/kexi/kexi-1.5.2.ebuild
+++ b/app-office/kexi/kexi-1.5.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/app-office/kexi/kexi-1.5.2.ebuild,v 1.2 2006/07/20 16:58:26 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/kexi/kexi-1.5.2.ebuild,v 1.3 2006/07/23 12:10:01 greg_g Exp $
 
 MAXKOFFICEVER=${PV}
 KMNAME=koffice
@@ -40,6 +40,9 @@ KMEXTRACTONLY="lib/"
 
 need-kde 3.4
 
+# avoid an automake error that causes bug #141311.
+PATCHES="${FILESDIR}/${P}-automake-error.patch"
+
 src_compile() {
 	local myconf="$(use_enable mysql) $(use_enable postgres pgsql) --enable-kexi-reports"