Fix parallel make compilation error

5 files changed, 62 insertions, 38 deletions

diff --git a/kde-base/kdebase/ChangeLog b/kde-base/kdebase/ChangeLog
index ec33f438cbc3..50fb73052ba4 100644
--- a/kde-base/kdebase/ChangeLog
+++ b/kde-base/kdebase/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdebase
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/ChangeLog,v 1.145 2004/08/23 16:08:35 psi29a Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/ChangeLog,v 1.146 2004/08/26 15:48:31 caleb Exp $
+
+  26 Aug 2004; Caleb Tennis <caleb@gentoo.org> kdebase-3.3.0.ebuild,
+  files/3.3.0-kwinrules-Makefile.am.diff:
+  Fix parallel make compilation error
 
   23 Aug 2004; psi29a <psi29a@gentoo.org> kdebase-3.3.0.ebuild:
   Added to ~mips
diff --git a/kde-base/kdebase/Manifest b/kde-base/kdebase/Manifest
index 070c264dedd7..8f1a151fa5f0 100644
--- a/kde-base/kdebase/Manifest
+++ b/kde-base/kdebase/Manifest
@@ -1,60 +1,61 @@
-MD5 d3f2a3e04d741a2f4be3fa4b4cc37c33 ChangeLog 25986
-MD5 b48e5f8d54a613ad906d06a21e8349a2 kdebase-3.1.5.ebuild 3623
+MD5 065218d3912f2995ec58f157df8f17a3 kdebase-3.2.3.ebuild 3281
+MD5 aaabcfdcc4e3968d7cfa579b84cfb928 kdebase-3.2.3-r1.ebuild 3373
+MD5 46513a5bdd0b3a04b9d1016246abe95d kdebase-3.3.0_rc2.ebuild 3282
 MD5 212bf2c2a704a5229147c98aa5fa49eb kdebase-3.2.0.ebuild 3344
-MD5 3a42711432882f7dfe32aeec2f454ed7 kdebase-3.2.1.ebuild 3653
 MD5 1346582446d8d61097aaed2115b05adf kdebase-3.2.2.ebuild 3346
-MD5 aaabcfdcc4e3968d7cfa579b84cfb928 kdebase-3.2.3-r1.ebuild 3373
-MD5 065218d3912f2995ec58f157df8f17a3 kdebase-3.2.3.ebuild 3281
-MD5 73baafd79c8f1661bfa32420e18a7bd3 kdebase-3.3.0.ebuild 3339
+MD5 6b7f8bc2280196127be2665120c1a759 kdebase-3.3.0.ebuild 3422
+MD5 3a42711432882f7dfe32aeec2f454ed7 kdebase-3.2.1.ebuild 3653
+MD5 c9a836d355c9f005c9815a97b90581ad ChangeLog 26135
 MD5 14889ab75f97d76e58b0c1154e7683a9 metadata.xml 161
-MD5 46513a5bdd0b3a04b9d1016246abe95d kdebase-3.3.0_rc2.ebuild 3282
+MD5 b48e5f8d54a613ad906d06a21e8349a2 kdebase-3.1.5.ebuild 3623
+MD5 ffad4f0170b80acc01e931ea21d3d4d4 files/utils.h.diff 343
+MD5 9b4df4afee8c5f857c91799f415a4ab2 files/kdebase-3.1.5-amd64-accessviol.patch 836
+MD5 b048371a651391ef2bb4166e40e6adff files/kde.pam 405
+MD5 160f44a51f4308c9c21052fd21c7d04d files/kdebase-3.2.0-kcontrol.patch 699
+MD5 6eb40b28a36f889d0f1919cdbf160ef7 files/kscreensaver.pam 79
+MD5 daa284d6a1f62c5c73deb8aeda9df57d files/digest-kdebase-3.2.3-r1 68
 MD5 ca0fc4bf60b72dd1b8d42cb7e2be5a75 files/agent-shutdown.sh 204
-MD5 510d05672fcad238e92db44fbfa65f89 files/agent-startup.sh 209
+MD5 80c60219f104a6931f11f693c707c724 files/digest-kdebase-3.3.0_rc2 72
 MD5 17b088965016d9c796e570741837a2b3 files/detectwidget.cpp.diff 422
+MD5 2b5419b0b173138e22fe03f4157d5660 files/kde-np.pam 379
+MD5 510d05672fcad238e92db44fbfa65f89 files/agent-startup.sh 209
 MD5 78ebd13a55a30a97f9a65da56b015a34 files/digest-kdebase-3.1.5 68
 MD5 c0cb6e59bf4bbd19caa7b9435f253ff3 files/digest-kdebase-3.2.0 68
 MD5 7b4a3c4a318e02c24c0ebacb4264bcdd files/digest-kdebase-3.2.1 68
 MD5 7a15aed698aee6f910a32b6fb7a1e8dd files/digest-kdebase-3.2.2 68
 MD5 daa284d6a1f62c5c73deb8aeda9df57d files/digest-kdebase-3.2.3 68
-MD5 daa284d6a1f62c5c73deb8aeda9df57d files/digest-kdebase-3.2.3-r1 68
 MD5 2c1b42d8cf9bd8799c241c21d0ab93ef files/digest-kdebase-3.3.0 68
-MD5 2b5419b0b173138e22fe03f4157d5660 files/kde-np.pam 379
-MD5 b048371a651391ef2bb4166e40e6adff files/kde.pam 405
-MD5 6eb40b28a36f889d0f1919cdbf160ef7 files/kscreensaver.pam 79
-MD5 ffad4f0170b80acc01e931ea21d3d4d4 files/utils.h.diff 343
-MD5 80c60219f104a6931f11f693c707c724 files/digest-kdebase-3.3.0_rc2 72
-MD5 9b4df4afee8c5f857c91799f415a4ab2 files/kdebase-3.1.5-amd64-accessviol.patch 836
-MD5 160f44a51f4308c9c21052fd21c7d04d files/kdebase-3.2.0-kcontrol.patch 699
 MD5 2eb15d4b93c483b634ea34475d91e79b files/kdebase-3.2.2-genkdmconf.c.diff 1082
 MD5 a60fd1628607d4abdeb930662d126171 files/post-3.2.3-kdebase-htmlframes.patch 6728
-MD5 2f1f31f38b93136baeb537500c8cfabc files/3.1.5/backgroundrc 342
+MD5 e9930c666b8cf91e75350fdf4a5d6c58 files/3.3.0-kwinrules-Makefile.am.diff 839
+MD5 9adecda5cdf6951ea0bcb6515c21a38b files/3.3.0_rc2/kdmrc 18202
+MD5 2f1f31f38b93136baeb537500c8cfabc files/3.3.0_rc2/backgroundrc 342
+MD5 3403677f5c4e44815c5a97c507d4f117 files/3.3.0_rc2/Xsetup 758
+MD5 e0c938e08649001554fc8354fcd0e4e6 files/3.3.0_rc2/startkde-3.3.0_rc2-gentoo.diff 1504
 MD5 7db6d7353b1bfbb47d44e9df63be1410 files/3.1.5/kdmrc 17661
+MD5 2f1f31f38b93136baeb537500c8cfabc files/3.1.5/backgroundrc 342
 MD5 5074351f4d8a0b3870a60751f58aaa06 files/3.1.5/startkde-3.1.5-gentoo.diff 1878
-MD5 3403677f5c4e44815c5a97c507d4f117 files/3.2.0/Xsetup 758
-MD5 2f1f31f38b93136baeb537500c8cfabc files/3.2.0/backgroundrc 342
 MD5 9adecda5cdf6951ea0bcb6515c21a38b files/3.2.0/kdmrc 18202
+MD5 2f1f31f38b93136baeb537500c8cfabc files/3.2.0/backgroundrc 342
+MD5 3403677f5c4e44815c5a97c507d4f117 files/3.2.0/Xsetup 758
 MD5 0faaf9eacb170e30dae8818f927b2934 files/3.2.0/startkde-3.2.0-gentoo.diff 1923
-MD5 3403677f5c4e44815c5a97c507d4f117 files/3.2.1/Xsetup 758
-MD5 2f1f31f38b93136baeb537500c8cfabc files/3.2.1/backgroundrc 342
 MD5 9adecda5cdf6951ea0bcb6515c21a38b files/3.2.1/kdmrc 18202
+MD5 2f1f31f38b93136baeb537500c8cfabc files/3.2.1/backgroundrc 342
+MD5 3403677f5c4e44815c5a97c507d4f117 files/3.2.1/Xsetup 758
 MD5 0faaf9eacb170e30dae8818f927b2934 files/3.2.1/startkde-3.2.1-gentoo.diff 1923
-MD5 3403677f5c4e44815c5a97c507d4f117 files/3.2.2/Xsetup 758
-MD5 2f1f31f38b93136baeb537500c8cfabc files/3.2.2/backgroundrc 342
 MD5 9adecda5cdf6951ea0bcb6515c21a38b files/3.2.2/kdmrc 18202
 MD5 0faaf9eacb170e30dae8818f927b2934 files/3.2.2/startkde-3.2.2-gentoo.diff 1923
-MD5 3403677f5c4e44815c5a97c507d4f117 files/3.2.3/Xsetup 758
-MD5 2f1f31f38b93136baeb537500c8cfabc files/3.2.3/backgroundrc 342
+MD5 2f1f31f38b93136baeb537500c8cfabc files/3.2.2/backgroundrc 342
+MD5 3403677f5c4e44815c5a97c507d4f117 files/3.2.2/Xsetup 758
 MD5 9adecda5cdf6951ea0bcb6515c21a38b files/3.2.3/kdmrc 18202
+MD5 2f1f31f38b93136baeb537500c8cfabc files/3.2.3/backgroundrc 342
+MD5 3403677f5c4e44815c5a97c507d4f117 files/3.2.3/Xsetup 758
 MD5 0faaf9eacb170e30dae8818f927b2934 files/3.2.3/startkde-3.2.3-gentoo.diff 1923
-MD5 3403677f5c4e44815c5a97c507d4f117 files/3.2.3-r1/Xsetup 758
-MD5 2f1f31f38b93136baeb537500c8cfabc files/3.2.3-r1/backgroundrc 342
-MD5 9adecda5cdf6951ea0bcb6515c21a38b files/3.2.3-r1/kdmrc 18202
-MD5 0faaf9eacb170e30dae8818f927b2934 files/3.2.3-r1/startkde-3.2.3-r1-gentoo.diff 1923
-MD5 3403677f5c4e44815c5a97c507d4f117 files/3.3.0/Xsetup 758
-MD5 2f1f31f38b93136baeb537500c8cfabc files/3.3.0/backgroundrc 342
 MD5 9adecda5cdf6951ea0bcb6515c21a38b files/3.3.0/kdmrc 18202
+MD5 2f1f31f38b93136baeb537500c8cfabc files/3.3.0/backgroundrc 342
+MD5 3403677f5c4e44815c5a97c507d4f117 files/3.3.0/Xsetup 758
 MD5 e0c938e08649001554fc8354fcd0e4e6 files/3.3.0/startkde-3.3.0-gentoo.diff 1504
-MD5 3403677f5c4e44815c5a97c507d4f117 files/3.3.0_rc2/Xsetup 758
-MD5 2f1f31f38b93136baeb537500c8cfabc files/3.3.0_rc2/backgroundrc 342
-MD5 9adecda5cdf6951ea0bcb6515c21a38b files/3.3.0_rc2/kdmrc 18202
-MD5 e0c938e08649001554fc8354fcd0e4e6 files/3.3.0_rc2/startkde-3.3.0_rc2-gentoo.diff 1504
+MD5 0faaf9eacb170e30dae8818f927b2934 files/3.2.3-r1/startkde-3.2.3-r1-gentoo.diff 1923
+MD5 9adecda5cdf6951ea0bcb6515c21a38b files/3.2.3-r1/kdmrc 18202
+MD5 2f1f31f38b93136baeb537500c8cfabc files/3.2.3-r1/backgroundrc 342
+MD5 3403677f5c4e44815c5a97c507d4f117 files/3.2.3-r1/Xsetup 758
diff --git a/kde-base/kdebase/files/3.3.0-kwinrules-Makefile.am.diff b/kde-base/kdebase/files/3.3.0-kwinrules-Makefile.am.diff
new file mode 100644
index 000000000000..567d14fb4946
--- /dev/null
+++ b/kde-base/kdebase/files/3.3.0-kwinrules-Makefile.am.diff
@@ -0,0 +1,17 @@
+--- kwin/kcmkwin/kwinrules/Makefile.am	2004/08/03 09:17:35	1.8
++++ kwin/kcmkwin/kwinrules/Makefile.am	2004/08/25 21:25:58	1.9
+@@ -16,12 +16,12 @@ libkwinrules_la_LIBADD = $(LIB_KDEUI)
+ kcm_kwinrules_la_SOURCES = kcm.cpp 
+ kcm_kwinrules_la_LDFLAGS = -module -avoid-version $(all_libraries) -no-undefined
+ kcm_kwinrules_la_LIBADD = libkwinrules.la 
+-kcm_kwinrules_la_COMPILE_FIRST = ruleslistbase.h
++kcm_kwinrules_la_COMPILE_FIRST = ruleslistbase.h ruleswidgetbase.h 
+ 
+ kwin_rules_dialog_la_SOURCES = main.cpp 
+ kwin_rules_dialog_la_LDFLAGS = -module -avoid-version $(all_libraries) -no-undefined
+ kwin_rules_dialog_la_LIBADD = libkwinrules.la 
+-kwin_rules_dialog_la_COMPILE_FIRST = ruleslistbase.h
++kwin_rules_dialog_la_COMPILE_FIRST = ruleslistbase.h ruleswidgetbase.h
+ 
+ messages: rc.cpp
+ 	$(XGETTEXT) *.cpp -o $(podir)/kcmkwinrules.pot
diff --git a/kde-base/kdebase/kdebase-3.3.0.ebuild b/kde-base/kdebase/kdebase-3.3.0.ebuild
index 928b447bb8e2..0ac5e9659bfd 100644
--- a/kde-base/kdebase/kdebase-3.3.0.ebuild
+++ b/kde-base/kdebase/kdebase-3.3.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.3.0.ebuild,v 1.4 2004/08/23 16:08:35 psi29a Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.3.0.ebuild,v 1.5 2004/08/26 15:48:31 caleb Exp $
 
 inherit kde-dist eutils
 
@@ -23,6 +23,8 @@ RDEPEND="${DEPEND}
 src_unpack() {
 	kde_src_unpack
 	epatch ${FILESDIR}/${PVR}/startkde-${PVR}-gentoo.diff
+	epatch ${FILESDIR}/3.3.0-kwinrules-Makefile.am.diff
+	make -f admin/Makefile.common
 	sed -ie "s:sasl.h:sasl/sasl.h:" ${S}/configure
 }
 
diff --git a/kde-base/kdemultimedia/Manifest b/kde-base/kdemultimedia/Manifest
index f6047c0eb320..30af39c65c5e 100644
--- a/kde-base/kdemultimedia/Manifest
+++ b/kde-base/kdemultimedia/Manifest
@@ -1,6 +1,6 @@
 MD5 728a544c6c7320d96abb3c6ac20a9671 kdemultimedia-3.2.1.ebuild 2286
 MD5 6f17211987d69d64b045e7920d823648 kdemultimedia-3.1.5.ebuild 2690
-MD5 a4ec59467e7be3d245f35ff54acbd5b3 kdemultimedia-3.2.3.ebuild 1513
+MD5 f357275645a4a8346ee79dd77d66b222 kdemultimedia-3.2.3.ebuild 1544
 MD5 78a5d756b72f651a8038451801e9bee6 kdemultimedia-3.2.0.ebuild 2255
 MD5 6affdbc1c02d7034aecca744fb5128a4 kdemultimedia-3.2.2.ebuild 2290
 MD5 cb93ab2aa47f5cfa2918e4d596a3569a kdemultimedia-3.2.2-r1.ebuild 1460