Add a patch I put in kde upstream that fixes a parallel make error (#122059)

Package-Manager: portage-2.1_pre10-r5

8 files changed, 94 insertions, 12 deletions

diff --git a/kde-base/kwin/ChangeLog b/kde-base/kwin/ChangeLog
index 7bae1da0ef0c..df4e02f86769 100644
--- a/kde-base/kwin/ChangeLog
+++ b/kde-base/kwin/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for kde-base/kwin
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kwin/ChangeLog,v 1.52 2006/05/06 10:45:54 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kwin/ChangeLog,v 1.53 2006/05/10 13:18:37 caleb Exp $
+
+  10 May 2006; Caleb Tennis <caleb@gentoo.org>
+  +files/kwin-3.5.2-parallel-make.diff, kwin-3.5.2-r2.ebuild:
+  Add a patch I put in kde upstream that fixes a parallel make error (#122059)
+
+  10 May 2006; Caleb Tennis <caleb@gentoo.org>
+  +files/kwin-3.5.2-parallel-make.diff, kwin-3.5.2-r2.ebuild:
+  Add a patch I put in kde upstream that fixes a parallel make error (#122059)
 
   06 May 2006; Carsten Lohrke <carlo@gentoo.org> kwin-3.5.2-r2.ebuild:
   Correct Xorg dependency.
diff --git a/kde-base/kwin/Manifest b/kde-base/kwin/Manifest
index a2873aaa7b55..278b9dba1e97 100644
--- a/kde-base/kwin/Manifest
+++ b/kde-base/kwin/Manifest
@@ -1,14 +1,62 @@
-MD5 16c1c56860fbf79b0b171ed6ed5d4988 ChangeLog 6470
-MD5 b22a687fe2e8cf06cd5147f1ec68efb7 files/digest-kwin-3.4.1 212
-MD5 7deca5e51240260b2976fbbe9326ed6d files/digest-kwin-3.4.2 287
-MD5 b334b621242eaf5a23035e870f09dea6 files/digest-kwin-3.4.3 68
-MD5 5efe75301bc0d47d1f2af0ce2feb2603 files/digest-kwin-3.5.2-r1 68
-MD5 5efe75301bc0d47d1f2af0ce2feb2603 files/digest-kwin-3.5.2-r2 68
+AUX kwin-3.5.2-alt_tab_and_focus_chain_fix.diff 15189 RMD160 374756a6406ad15ae5cbdb08fe3bbcc80258b32a SHA1 f820dae4d541b2806987ebd8565d43c96c88c6ad SHA256 a003ccb6be0bbc4835edf001106ac2749549402399df936e10d8f632548d3d01 size 15189
 MD5 37dffebcd3f6d1641ccc80e50852fa46 files/kwin-3.5.2-alt_tab_and_focus_chain_fix.diff 15189
+RMD160 374756a6406ad15ae5cbdb08fe3bbcc80258b32a files/kwin-3.5.2-alt_tab_and_focus_chain_fix.diff 15189
+SHA256 a003ccb6be0bbc4835edf001106ac2749549402399df936e10d8f632548d3d01 files/kwin-3.5.2-alt_tab_and_focus_chain_fix.diff 15189
+AUX kwin-3.5.2-alt_tab_crash.diff 642 RMD160 1872cd6d0b0c8fa3e54ff0abad7d2a17ae0dcef8 SHA1 8a441870eb83a641112ed36eba574e0c84211d2b SHA256 f9af5896d7c16739882eeb330d821f8b0a292fd46c2772949537bb8cc20fb21f size 642
 MD5 1ea48b1904f323b5937b4168048a5561 files/kwin-3.5.2-alt_tab_crash.diff 642
+RMD160 1872cd6d0b0c8fa3e54ff0abad7d2a17ae0dcef8 files/kwin-3.5.2-alt_tab_crash.diff 642
+SHA256 f9af5896d7c16739882eeb330d821f8b0a292fd46c2772949537bb8cc20fb21f files/kwin-3.5.2-alt_tab_crash.diff 642
+AUX kwin-3.5.2-parallel-make.diff 920 RMD160 2a1a02fa56e2b7c79601d38abd08388c54b2f3d0 SHA1 b1fce48dabf3e0cff38f5606e2d932454ee5caba SHA256 5160b4419c302cb01a71dd8a28f804bcd8c1eabad5b345d62765d64cee3f0660 size 920
+MD5 acbb4de9f0ed620e73cf727388f64315 files/kwin-3.5.2-parallel-make.diff 920
+RMD160 2a1a02fa56e2b7c79601d38abd08388c54b2f3d0 files/kwin-3.5.2-parallel-make.diff 920
+SHA256 5160b4419c302cb01a71dd8a28f804bcd8c1eabad5b345d62765d64cee3f0660 files/kwin-3.5.2-parallel-make.diff 920
+DIST kdebase-3.4.0-3.4.1.tar.xdelta 1089415 size 1089415
+DIST kdebase-3.4.0.tar.bz2 22670772 RMD160 49b70391564ef757dc5195314e6ebeba656f18bc SHA256 47683bf39996475662280e67cf9a4487c40ea2df8276b8e9f366ac4b9b402484 size 22670772
+DIST kdebase-3.4.1-3.4.2.tar.xdelta 928157 size 928157
+DIST kdebase-3.4.1.tar.bz2 22433034 size 22433034
+DIST kdebase-3.4.2.tar.bz2 22466433 size 22466433
+DIST kdebase-3.4.3.tar.bz2 22425835 size 22425835
+DIST kdebase-3.5.2.tar.bz2 23590820 RMD160 216ff59c49bb4fee2aa3b7d976ec40a8cccff107 SHA256 21150b7e553e83487e70e70e3d13ce107c6c5d57133b40f413807887a9e431f7 size 23590820
+EBUILD kwin-3.4.1.ebuild 384 RMD160 9a05f5adc449a45161e31c56572035a16fbe3242 SHA1 7bb3608aa476bd3e5e19cf3f8410d39743cf732c SHA256 2df5424cc7c9de3f78cf0970a1ec4a5d7ae9a4b0101c8227d60aa542bc014f3d size 384
 MD5 2809511699650a8a076be8791e4d1567 kwin-3.4.1.ebuild 384
+RMD160 9a05f5adc449a45161e31c56572035a16fbe3242 kwin-3.4.1.ebuild 384
+SHA256 2df5424cc7c9de3f78cf0970a1ec4a5d7ae9a4b0101c8227d60aa542bc014f3d kwin-3.4.1.ebuild 384
+EBUILD kwin-3.4.2.ebuild 388 RMD160 7ce7c0b74db6fa7a3c76018c309cd3398da9d9f5 SHA1 b4ffd6706faf8064312c27f938dc29d9fef49669 SHA256 aafcc1381c3fe9bf479f3f01ecabd448c97e42cd7dac30009826c0edb44a25a7 size 388
 MD5 83701c6ee016cca9476c28a71b8b6f8d kwin-3.4.2.ebuild 388
+RMD160 7ce7c0b74db6fa7a3c76018c309cd3398da9d9f5 kwin-3.4.2.ebuild 388
+SHA256 aafcc1381c3fe9bf479f3f01ecabd448c97e42cd7dac30009826c0edb44a25a7 kwin-3.4.2.ebuild 388
+EBUILD kwin-3.4.3.ebuild 389 RMD160 7928293c7f4ff1d108deb42785c31ccb4f0b2952 SHA1 b7057ac77a2eb946704283f3e29c6c24df94adb8 SHA256 ec86ae544ffc1b7330b1fb5de0331fe2a7620df50e9beeb9c4087f805d49c9f3 size 389
 MD5 695a5f6ea3a7c5784b476831098018d8 kwin-3.4.3.ebuild 389
+RMD160 7928293c7f4ff1d108deb42785c31ccb4f0b2952 kwin-3.4.3.ebuild 389
+SHA256 ec86ae544ffc1b7330b1fb5de0331fe2a7620df50e9beeb9c4087f805d49c9f3 kwin-3.4.3.ebuild 389
+EBUILD kwin-3.5.2-r1.ebuild 809 RMD160 e0dbbc008dc89abcdf81fe5071db1eaf06ee4c49 SHA1 20448cc32121060eb9e4521f1b5e54e1645734b9 SHA256 9ad09b416ec14f60335d670d6aebaf1bb10f56ac197cfb4e4dfd0fbb02bb62c2 size 809
 MD5 aae40c7a7e69745391f451e8f1adf61c kwin-3.5.2-r1.ebuild 809
-MD5 997487220c83b5eb7667554281fae7e8 kwin-3.5.2-r2.ebuild 813
+RMD160 e0dbbc008dc89abcdf81fe5071db1eaf06ee4c49 kwin-3.5.2-r1.ebuild 809
+SHA256 9ad09b416ec14f60335d670d6aebaf1bb10f56ac197cfb4e4dfd0fbb02bb62c2 kwin-3.5.2-r1.ebuild 809
+EBUILD kwin-3.5.2-r2.ebuild 856 RMD160 c4c3359bbefc00ab2e54f84d49963f0b233b8bf4 SHA1 99afa85328598d43dece6dd52728c829b1ca4980 SHA256 f5dafd5690cc243a8d3630245e85c0959b03543e0aa859b4b0cfb0a7a7fd024f size 856
+MD5 bfcf100e9eb9cd3741c2bdb1f5832fe6 kwin-3.5.2-r2.ebuild 856
+RMD160 c4c3359bbefc00ab2e54f84d49963f0b233b8bf4 kwin-3.5.2-r2.ebuild 856
+SHA256 f5dafd5690cc243a8d3630245e85c0959b03543e0aa859b4b0cfb0a7a7fd024f kwin-3.5.2-r2.ebuild 856
+MISC ChangeLog 6848 RMD160 47e9fa54e9f47035319f6369ad474667c32e17ef SHA1 d456c51feb4187ea26f50fac2abac9ea5f3c1ffb SHA256 0d3ca271fa066178f6058280c412c0a510569362e5a6c1d22727db09a0c3564c size 6848
+MD5 1a818b38153e948dd33624ea46e14624 ChangeLog 6848
+RMD160 47e9fa54e9f47035319f6369ad474667c32e17ef ChangeLog 6848
+SHA256 0d3ca271fa066178f6058280c412c0a510569362e5a6c1d22727db09a0c3564c ChangeLog 6848
+MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a size 156
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156
+SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a metadata.xml 156
+MD5 f79786259e67109a41b914b09c01758d files/digest-kwin-3.4.1 394
+RMD160 108d333b71ba11a7fcf40409aa540db311705459 files/digest-kwin-3.4.1 394
+SHA256 10bd2b04b51bf0c0067499304e5d880263ae7ced78d9d03c58ee7ee4f856546d files/digest-kwin-3.4.1 394
+MD5 3b01b55b513e19da4e09d2634f1f2818 files/digest-kwin-3.4.2 469
+RMD160 59a53580007617a117cfeef8bbf2966e7a29a8ef files/digest-kwin-3.4.2 469
+SHA256 5e9583f14ad7eb30d87f10f2cca2aa4d5fd1cc7170c484aed5a2426ca487dd90 files/digest-kwin-3.4.2 469
+MD5 b334b621242eaf5a23035e870f09dea6 files/digest-kwin-3.4.3 68
+RMD160 fe4b253b0a7c2e30a2aa1d0d796dfcb11e30590a files/digest-kwin-3.4.3 68
+SHA256 2c163305cf238b4283a2263d089f3a5cdacfe053018c1fa5d8a5879593baf1a8 files/digest-kwin-3.4.3 68
+MD5 612323f8728d639ddab8f055f88070ff files/digest-kwin-3.5.2-r1 250
+RMD160 b6e5ff095263b6bdb0f28016a100b78ce0d038ae files/digest-kwin-3.5.2-r1 250
+SHA256 e5c44a3cade03e986c8babd8c9302549943c3d0da8bcd264d957ef079c4d68d0 files/digest-kwin-3.5.2-r1 250
+MD5 612323f8728d639ddab8f055f88070ff files/digest-kwin-3.5.2-r2 250
+RMD160 b6e5ff095263b6bdb0f28016a100b78ce0d038ae files/digest-kwin-3.5.2-r2 250
+SHA256 e5c44a3cade03e986c8babd8c9302549943c3d0da8bcd264d957ef079c4d68d0 files/digest-kwin-3.5.2-r2 250
diff --git a/kde-base/kwin/files/digest-kwin-3.4.1 b/kde-base/kwin/files/digest-kwin-3.4.1
index 518952ccb74d..5621b647d3c3 100644
--- a/kde-base/kwin/files/digest-kwin-3.4.1
+++ b/kde-base/kwin/files/digest-kwin-3.4.1
@@ -1,3 +1,5 @@
-MD5 c88659e558ca98dc45377bf8ddfc26c9 kdebase-3.4.0.tar.bz2 22670772
 MD5 3b99262a66edd3c9ad86220ad6cf6579 kdebase-3.4.0-3.4.1.tar.xdelta 1089415
+MD5 c88659e558ca98dc45377bf8ddfc26c9 kdebase-3.4.0.tar.bz2 22670772
+RMD160 49b70391564ef757dc5195314e6ebeba656f18bc kdebase-3.4.0.tar.bz2 22670772
+SHA256 47683bf39996475662280e67cf9a4487c40ea2df8276b8e9f366ac4b9b402484 kdebase-3.4.0.tar.bz2 22670772
 MD5 8fbe0b943721b79f2549064b580acdde kdebase-3.4.1.tar.bz2 22433034
diff --git a/kde-base/kwin/files/digest-kwin-3.4.2 b/kde-base/kwin/files/digest-kwin-3.4.2
index a5f92d1d76f9..21fe2ba4f278 100644
--- a/kde-base/kwin/files/digest-kwin-3.4.2
+++ b/kde-base/kwin/files/digest-kwin-3.4.2
@@ -1,4 +1,6 @@
-MD5 c88659e558ca98dc45377bf8ddfc26c9 kdebase-3.4.0.tar.bz2 22670772
 MD5 3b99262a66edd3c9ad86220ad6cf6579 kdebase-3.4.0-3.4.1.tar.xdelta 1089415
+MD5 c88659e558ca98dc45377bf8ddfc26c9 kdebase-3.4.0.tar.bz2 22670772
+RMD160 49b70391564ef757dc5195314e6ebeba656f18bc kdebase-3.4.0.tar.bz2 22670772
+SHA256 47683bf39996475662280e67cf9a4487c40ea2df8276b8e9f366ac4b9b402484 kdebase-3.4.0.tar.bz2 22670772
 MD5 7fc67dd6be199ef3208bfc0200a900aa kdebase-3.4.1-3.4.2.tar.xdelta 928157
 MD5 0ea16eb7185ef014d8bd4da4f4530272 kdebase-3.4.2.tar.bz2 22466433
diff --git a/kde-base/kwin/files/digest-kwin-3.5.2-r1 b/kde-base/kwin/files/digest-kwin-3.5.2-r1
index 9c5d5e23a110..7d6b04c82c0e 100644
--- a/kde-base/kwin/files/digest-kwin-3.5.2-r1
+++ b/kde-base/kwin/files/digest-kwin-3.5.2-r1
@@ -1 +1,3 @@
 MD5 c5685e1be34e033286aa1f37002a0552 kdebase-3.5.2.tar.bz2 23590820
+RMD160 216ff59c49bb4fee2aa3b7d976ec40a8cccff107 kdebase-3.5.2.tar.bz2 23590820
+SHA256 21150b7e553e83487e70e70e3d13ce107c6c5d57133b40f413807887a9e431f7 kdebase-3.5.2.tar.bz2 23590820
diff --git a/kde-base/kwin/files/digest-kwin-3.5.2-r2 b/kde-base/kwin/files/digest-kwin-3.5.2-r2
index 9c5d5e23a110..7d6b04c82c0e 100644
--- a/kde-base/kwin/files/digest-kwin-3.5.2-r2
+++ b/kde-base/kwin/files/digest-kwin-3.5.2-r2
@@ -1 +1,3 @@
 MD5 c5685e1be34e033286aa1f37002a0552 kdebase-3.5.2.tar.bz2 23590820
+RMD160 216ff59c49bb4fee2aa3b7d976ec40a8cccff107 kdebase-3.5.2.tar.bz2 23590820
+SHA256 21150b7e553e83487e70e70e3d13ce107c6c5d57133b40f413807887a9e431f7 kdebase-3.5.2.tar.bz2 23590820
diff --git a/kde-base/kwin/files/kwin-3.5.2-parallel-make.diff b/kde-base/kwin/files/kwin-3.5.2-parallel-make.diff
new file mode 100644
index 000000000000..c98f1eaf3237
--- /dev/null
+++ b/kde-base/kwin/files/kwin-3.5.2-parallel-make.diff
@@ -0,0 +1,17 @@
+--- kdebase/kwin/kcmkwin/kwinrules/Makefile.am.orig	2006-05-10 09:14:29.000000000 -0400
++++ kdebase/kwin/kcmkwin/kwinrules/Makefile.am	2006-05-10 09:14:55.000000000 -0400
+@@ -16,12 +16,12 @@
+ 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 ruleswidgetbase.h 
++kcm_kwinrules_la_COMPILE_FIRST = ruleslistbase.h ruleswidgetbase.h editshortcutbase.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 ruleswidgetbase.h
++kwin_rules_dialog_la_COMPILE_FIRST = ruleslistbase.h ruleswidgetbase.h editshortcutbase.h
+ 
+ messages: rc.cpp
+ 	$(XGETTEXT) *.cpp -o $(podir)/kcmkwinrules.pot
diff --git a/kde-base/kwin/kwin-3.5.2-r2.ebuild b/kde-base/kwin/kwin-3.5.2-r2.ebuild
index 27f09634bb12..0133477796f4 100644
--- a/kde-base/kwin/kwin-3.5.2-r2.ebuild
+++ b/kde-base/kwin/kwin-3.5.2-r2.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/kde-base/kwin/kwin-3.5.2-r2.ebuild,v 1.3 2006/05/06 10:45:54 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kwin/kwin-3.5.2-r2.ebuild,v 1.4 2006/05/10 13:18:37 caleb Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
@@ -22,7 +22,8 @@ DEPEND="${RDEPEND}
 			) <x11-base/xorg-x11-7 )
 		)"
 
-PATCHES="${FILESDIR}/kwin-3.5.2-alt_tab_and_focus_chain_fix.diff"
+PATCHES="${FILESDIR}/kwin-3.5.2-alt_tab_and_focus_chain_fix.diff
+	${FILESDIR}/kwin-3.5.2-parallel-make.diff"
 
 src_compile() {
 	myconf="$myconf $(use_with xcomposite composite)"