Fix automake error causing bug #141311.

Package-Manager: portage-2.1-r1

6 files changed, 43 insertions, 27 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/Manifest b/app-office/kexi/Manifest
index 3ba5c85e5cb2..3c837b20db91 100644
--- a/app-office/kexi/Manifest
+++ b/app-office/kexi/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX kexi-1.4.2-gcc41.patch 1094 RMD160 ffc028b187ec7437aab156f3e575b945b390845c SHA1 2c5944a2e705d05abcb65674639b1b85ec22f6c9 SHA256 7c0790dacdc090b8cb176a8289facc471d6ef4ea2c93bb6ac985e6497fac1eef
 MD5 5f3683b6817935e4f6269bd64398c479 files/kexi-1.4.2-gcc41.patch 1094
 RMD160 ffc028b187ec7437aab156f3e575b945b390845c files/kexi-1.4.2-gcc41.patch 1094
@@ -13,7 +10,11 @@ AUX kexi-1.5.1-kexi_checkbox_data_saving.patch 2488 RMD160 24664c62122b9cf9a7ba3
 MD5 4a60d6e8b86c1b332def656aff1542dc files/kexi-1.5.1-kexi_checkbox_data_saving.patch 2488
 RMD160 24664c62122b9cf9a7ba302da5274ea9f192c697 files/kexi-1.5.1-kexi_checkbox_data_saving.patch 2488
 SHA256 d0e9a183b010b357922bb02ef6d1e69fbeda2ca27378cd74861af01ef5c588f8 files/kexi-1.5.1-kexi_checkbox_data_saving.patch 2488
-DIST koffice-1.4.2.tar.bz2 19486852
+AUX kexi-1.5.2-automake-error.patch 505 RMD160 9bc498a0c9230bfc13142baf966afe7f278777b9 SHA1 d2368fc24c950b63d682ee7928d04bd2e2e1463e SHA256 97f6a3ff27dc0fb61df96129bf15579d73e57aeb9bffc1ad40ee12242b70fa03
+MD5 0b3b4e00b1d96483511aa00b04354d55 files/kexi-1.5.2-automake-error.patch 505
+RMD160 9bc498a0c9230bfc13142baf966afe7f278777b9 files/kexi-1.5.2-automake-error.patch 505
+SHA256 97f6a3ff27dc0fb61df96129bf15579d73e57aeb9bffc1ad40ee12242b70fa03 files/kexi-1.5.2-automake-error.patch 505
+DIST koffice-1.4.2.tar.bz2 19486852 RMD160 117d5c50aa81d669002005f39fc03bc3f999b62c SHA1 474ab6d289ff1330c200768b30a3dbe271cd26c5 SHA256 c9d5ba0bbd008ebfc40500b0d69335d94ad9657cb58c5f2d939179de8d23d361
 DIST koffice-1.5.1.tar.bz2 36010120 RMD160 3fb67d50554c081104080d3230ba10f022f4a990 SHA1 d97c4f8eae3e22b7c119454f763a6ce88713edff SHA256 4305018f71934d21a3f16cfc6195ebba8ab062260ae8c3ba1812f1d3658c7119
 DIST koffice-1.5.2.tar.bz2 35878218 RMD160 eb33d9e74adec0fc3409d38c2bfe84b5dfdd5546 SHA1 e35bd08adfb3bf6acf195dd176147de1d6cf215a SHA256 d57d8a7611337f2678a7e28b100b9ab64148bf5483c01dbd204529f07b148611
 EBUILD kexi-1.4.2-r1.ebuild 1130 RMD160 59b3cd63ff12a77348c83606ad8d0d360c604181 SHA1 d1d788731e051984bf5819ac381d2606bc588715 SHA256 8994cc85459f6ff12e5367cd0620cfed7332993edd74919fd9557720bfd0377e
@@ -28,34 +29,27 @@ EBUILD kexi-1.5.1.ebuild 1253 RMD160 fa97feb691e6585fa643e3f83cb62f41e4361662 SH
 MD5 1d03a5af3ef7cb882401ee45cf8c3e74 kexi-1.5.1.ebuild 1253
 RMD160 fa97feb691e6585fa643e3f83cb62f41e4361662 kexi-1.5.1.ebuild 1253
 SHA256 f6f912030b0a14997d7d5c0fbd19e3da8844704d1d76f6fcfc147fdbe5de1953 kexi-1.5.1.ebuild 1253
-EBUILD kexi-1.5.2.ebuild 1149 RMD160 d54408afee88a807c5427584520377061a16c316 SHA1 634931b18d6bc21e4563c68f264cd4c503f044b4 SHA256 13a950f7ddc5263c621864720c24eb33478c02109eab88f0ef9f06e95b2379aa
-MD5 c25e835c5e5ee1019d55cd3c30fb20b7 kexi-1.5.2.ebuild 1149
-RMD160 d54408afee88a807c5427584520377061a16c316 kexi-1.5.2.ebuild 1149
-SHA256 13a950f7ddc5263c621864720c24eb33478c02109eab88f0ef9f06e95b2379aa kexi-1.5.2.ebuild 1149
-MISC ChangeLog 4558 RMD160 0fce3551913d01644d06c33692416fab7f62bcea SHA1 9f0111617467c1d5266a6b778b2b4ca20ee2c94e SHA256 8fbc37b58b1285d0307fb6db5fa9878a8f2f86a8b2fa7ac88a5af03e21fde505
-MD5 977108f8ba6ba4b3a0cf534f268b13ff ChangeLog 4558
-RMD160 0fce3551913d01644d06c33692416fab7f62bcea ChangeLog 4558
-SHA256 8fbc37b58b1285d0307fb6db5fa9878a8f2f86a8b2fa7ac88a5af03e21fde505 ChangeLog 4558
+EBUILD kexi-1.5.2.ebuild 1246 RMD160 e83ee76abb54226e03ac5cd0253a0ac45db6d5b9 SHA1 f6f903133043a4a45e1e105b82effca940a3ae75 SHA256 6a90ebcf3fea13a0a16e8978cc7da2d08a5640837cb20e6d69168fe877d133a8
+MD5 01e5a3374d7dae7bdbe7f1a5ac284565 kexi-1.5.2.ebuild 1246
+RMD160 e83ee76abb54226e03ac5cd0253a0ac45db6d5b9 kexi-1.5.2.ebuild 1246
+SHA256 6a90ebcf3fea13a0a16e8978cc7da2d08a5640837cb20e6d69168fe877d133a8 kexi-1.5.2.ebuild 1246
+MISC ChangeLog 4709 RMD160 903a19b7089c38119e506ed7d9c97bc9f3689984 SHA1 f2cd037d5f42d1fdcf626478d1d80a96ace94f14 SHA256 053b2d17fed7edd5d69008cd0a034d5a73f2a109c535a349458928872e326228
+MD5 83edee9bd61c63153e9f071825006c7a ChangeLog 4709
+RMD160 903a19b7089c38119e506ed7d9c97bc9f3689984 ChangeLog 4709
+SHA256 053b2d17fed7edd5d69008cd0a034d5a73f2a109c535a349458928872e326228 ChangeLog 4709
 MISC metadata.xml 157 RMD160 9258d9691830e58ee00ca89f0a6df9ce077f2439 SHA1 b2ca0d856f38a09bf6d2e58ee77b344552585862 SHA256 e0e268ca18fef286617fcfe97773d5df5b8fbdb5fbcb9a29adc5e8b0baea4292
 MD5 02039d51ca4a42817775fd436dfaa956 metadata.xml 157
 RMD160 9258d9691830e58ee00ca89f0a6df9ce077f2439 metadata.xml 157
 SHA256 e0e268ca18fef286617fcfe97773d5df5b8fbdb5fbcb9a29adc5e8b0baea4292 metadata.xml 157
-MD5 cf5b314fdf4094ea845edfddf2cf39b5 files/digest-kexi-1.4.2 68
-RMD160 4fbdb279d7cdc49eeb424654474ff4b15dce2c5b files/digest-kexi-1.4.2 68
-SHA256 7791e992f4d48e943f3d513459c63a8e5280d4052a33f729f6ef1a8be3b9cc81 files/digest-kexi-1.4.2 68
-MD5 cf5b314fdf4094ea845edfddf2cf39b5 files/digest-kexi-1.4.2-r1 68
-RMD160 4fbdb279d7cdc49eeb424654474ff4b15dce2c5b files/digest-kexi-1.4.2-r1 68
-SHA256 7791e992f4d48e943f3d513459c63a8e5280d4052a33f729f6ef1a8be3b9cc81 files/digest-kexi-1.4.2-r1 68
+MD5 902823ac54984271d00a3e72454440b1 files/digest-kexi-1.4.2 250
+RMD160 c2b4361538cd32dbfd79218c5fef8e4d6818ac3f files/digest-kexi-1.4.2 250
+SHA256 40d4d888fb4050306c03d0ea47b3c6c6448301faea176ef95e616071a57aba1e files/digest-kexi-1.4.2 250
+MD5 902823ac54984271d00a3e72454440b1 files/digest-kexi-1.4.2-r1 250
+RMD160 c2b4361538cd32dbfd79218c5fef8e4d6818ac3f files/digest-kexi-1.4.2-r1 250
+SHA256 40d4d888fb4050306c03d0ea47b3c6c6448301faea176ef95e616071a57aba1e files/digest-kexi-1.4.2-r1 250
 MD5 c1278e570720330905fa70415bf059cc files/digest-kexi-1.5.1 250
 RMD160 5b7151313000b75d298f72d749ae33a6754596ac files/digest-kexi-1.5.1 250
 SHA256 86cf9a39992b08b505d0b19f69cd385dd34a3609ba82d583d46e5821a56d093c files/digest-kexi-1.5.1 250
 MD5 6353f4b1dea05aa025ec83436c25e6b8 files/digest-kexi-1.5.2 250
 RMD160 9141af51df3c51e43191e4193d1f5c61873599df files/digest-kexi-1.5.2 250
 SHA256 13c1606ac5036bfd64ce43667b31a5494b8ae894317b016b703201f53409cfb3 files/digest-kexi-1.5.2 250
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.4 (GNU/Linux)
-
-iD8DBQFEv7ZCAiZjviIA2XgRAhZ0AKCW/qlDqxlQJTvnr9cTLzUrC4OIcQCgkkPt
-BJQoj7El0OLGZ1z7pxXP8ww=
-=0XxH
------END PGP SIGNATURE-----
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"