Fix arts patch; bug 177445

Package-Manager: portage-2.1.2.2

4 files changed, 28 insertions, 16 deletions

diff --git a/kde-base/kscd/ChangeLog b/kde-base/kscd/ChangeLog
index 9c1ab2a0fb5e..40c7d39e2cdb 100644
--- a/kde-base/kscd/ChangeLog
+++ b/kde-base/kscd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kscd
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kscd/ChangeLog,v 1.66 2007/05/07 08:24:01 masterdriverz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kscd/ChangeLog,v 1.67 2007/05/07 13:58:55 masterdriverz Exp $
+
+  07 May 2007; Charlie Shepherd <masterdriverz@gentoo.org>
+  files/kscd-3.5.6-arts.patch:
+  Fix arts patch; bug 177445
 
 *kscd-3.5.6-r1 (07 May 2007)
 
diff --git a/kde-base/kscd/Manifest b/kde-base/kscd/Manifest
index 8093348cb89e..69e55dc2a5a3 100644
--- a/kde-base/kscd/Manifest
+++ b/kde-base/kscd/Manifest
@@ -2,10 +2,10 @@ AUX kscd-3.5.6-alsa-tests.patch 4877 RMD160 37e341216503392b99c45137b39644965d46
 MD5 48320492310bb5abb1846ac4a37db6ba files/kscd-3.5.6-alsa-tests.patch 4877
 RMD160 37e341216503392b99c45137b39644965d46ae14 files/kscd-3.5.6-alsa-tests.patch 4877
 SHA256 144508856c3bf54c9239378706d5391d49e75384b26392c27ca6d304c94b80b0 files/kscd-3.5.6-alsa-tests.patch 4877
-AUX kscd-3.5.6-arts.patch 239 RMD160 d668336dd1725a83673b26086a6dc5f221ea58cb SHA1 21628b670703793e5e7c990cfba30f906beffa09 SHA256 1fd4fcda48c2413da6a1906b898a9180c4e75db8f299ba9b97b01fcb29a3d726
-MD5 69e485b6f757359b02d3a4d5678fb5e6 files/kscd-3.5.6-arts.patch 239
-RMD160 d668336dd1725a83673b26086a6dc5f221ea58cb files/kscd-3.5.6-arts.patch 239
-SHA256 1fd4fcda48c2413da6a1906b898a9180c4e75db8f299ba9b97b01fcb29a3d726 files/kscd-3.5.6-arts.patch 239
+AUX kscd-3.5.6-arts.patch 484 RMD160 9544d821bc1f143519230c3b5755332099a284fb SHA1 a0a75fab8bf11106eedff105551378ac628ba3e7 SHA256 d9f9913df1afcfe4a7ca1a7edcd6955cc56fce62500a50e5383fe57066f3d235
+MD5 0ccb6026a2363284ac49b9f71d439553 files/kscd-3.5.6-arts.patch 484
+RMD160 9544d821bc1f143519230c3b5755332099a284fb files/kscd-3.5.6-arts.patch 484
+SHA256 d9f9913df1afcfe4a7ca1a7edcd6955cc56fce62500a50e5383fe57066f3d235 files/kscd-3.5.6-arts.patch 484
 DIST kdemultimedia-3.5-patchset-01.tar.bz2 1434 RMD160 021a379c8a11e0a463889b77e3b62d665683ce78 SHA1 97fcb3ba126633079e098b6bec1c866db70c0621 SHA256 edcbc4727d962368d64c809a969b024feeb0bbe0627912d1c95adc0dacf85d38
 DIST kdemultimedia-3.5.5.tar.bz2 6287234 RMD160 c31d81efeb02cea29048fbdefcb8c4f13726fded SHA1 8ddc3174d400827e58e2e5cf87a5bd279a6bfdc1 SHA256 1c15f9572bec29fbfac5224b7f7c88bd57375c827622a9017d3861475881fb4c
 DIST kdemultimedia-3.5.6.tar.bz2 6291692 RMD160 7411019e2765f740ad0f3fd592e74f62e04b8387 SHA1 030ca0b5e79f04c6baa99108f1c871f194effee7 SHA256 1a08f71c73cacb1da1d2269d0376193c23de727235a255866f869caeea300719
@@ -17,10 +17,10 @@ EBUILD kscd-3.5.6-r1.ebuild 855 RMD160 10956cc2d284edce60b06f12db5845b067591ea8
 MD5 551a4601b676e2227a0bfd0b5219ff18 kscd-3.5.6-r1.ebuild 855
 RMD160 10956cc2d284edce60b06f12db5845b067591ea8 kscd-3.5.6-r1.ebuild 855
 SHA256 8449ddf7a3a8e51c03b44e40f24c9e3d6fbe54c35f1c8ffcff9230251de21ca2 kscd-3.5.6-r1.ebuild 855
-MISC ChangeLog 7990 RMD160 e0c430f8b41ad3c05debe5afb2503a2bfbc82df9 SHA1 4a2d210da50d14d95dcc7b86cc50ffd844322ef8 SHA256 fb7bd70784e5bf48d913cf8d01ef5c7d4d298a58df20e581c137e9ca9dff806c
-MD5 88945ec1c7494999079b900144519cdd ChangeLog 7990
-RMD160 e0c430f8b41ad3c05debe5afb2503a2bfbc82df9 ChangeLog 7990
-SHA256 fb7bd70784e5bf48d913cf8d01ef5c7d4d298a58df20e581c137e9ca9dff806c ChangeLog 7990
+MISC ChangeLog 8110 RMD160 5ac9b2f9c85e5a95139eee273f6bbee212563a55 SHA1 b3323c0c8cb48d44b03632369ee2dc4fd748218d SHA256 d13d216d15563fa5b700415af7d4ba092d4874b56049ef5a1230d6cd5867e7c7
+MD5 f5e1eba24922cc89055317fcbf194f90 ChangeLog 8110
+RMD160 5ac9b2f9c85e5a95139eee273f6bbee212563a55 ChangeLog 8110
+SHA256 d13d216d15563fa5b700415af7d4ba092d4874b56049ef5a1230d6cd5867e7c7 ChangeLog 8110
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156
@@ -28,6 +28,6 @@ SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a metadata
 MD5 89adb03d54708e00ccbbdb1020fc117c files/digest-kscd-3.5.5 551
 RMD160 78f784ce5561a15af90cd937979158e38aa06be2 files/digest-kscd-3.5.5 551
 SHA256 01d5b8f1036775ebce9c594b46bb3897801e4fd42ecd218863a47ff241fb5209 files/digest-kscd-3.5.5 551
-MD5 ea984d04abd3787bfe8aefdabf6b1c24 files/digest-kscd-3.5.6-r1 192
-RMD160 fa3c4cea20fd3f57cf5703d1d14ce248369bab28 files/digest-kscd-3.5.6-r1 192
-SHA256 01148994c720de0158f259ad9f106e03f9aaaef0945a939559bfe1e2833215f8 files/digest-kscd-3.5.6-r1 192
+MD5 a7633ce4b94337a83bcb97d203366623 files/digest-kscd-3.5.6-r1 265
+RMD160 df099dd3f0f56e5dc2a7dc37a0ff582d10ffb076 files/digest-kscd-3.5.6-r1 265
+SHA256 8c8f0b56dd810d9202f532206814eed4c4ff4e6062a88e0bbee4523b8cf5f4d7 files/digest-kscd-3.5.6-r1 265
diff --git a/kde-base/kscd/files/digest-kscd-3.5.6-r1 b/kde-base/kscd/files/digest-kscd-3.5.6-r1
index d00517ec5784..189f4e8bd94c 100644
--- a/kde-base/kscd/files/digest-kscd-3.5.6-r1
+++ b/kde-base/kscd/files/digest-kscd-3.5.6-r1
@@ -1,2 +1,3 @@
+MD5 57c50bfcb0147324a1af02ebcc103376 kdemultimedia-3.5.6.tar.bz2 6291692
 RMD160 7411019e2765f740ad0f3fd592e74f62e04b8387 kdemultimedia-3.5.6.tar.bz2 6291692
 SHA256 1a08f71c73cacb1da1d2269d0376193c23de727235a255866f869caeea300719 kdemultimedia-3.5.6.tar.bz2 6291692
diff --git a/kde-base/kscd/files/kscd-3.5.6-arts.patch b/kde-base/kscd/files/kscd-3.5.6-arts.patch
index c3844e7d9fd2..fd9c0a5872e5 100644
--- a/kde-base/kscd/files/kscd-3.5.6-arts.patch
+++ b/kde-base/kscd/files/kscd-3.5.6-arts.patch
@@ -1,4 +1,11 @@
-# ChangeLog for app-games/quake3-ra3
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kscd/files/kscd-3.5.6-arts.patch,v 1.1 2007/05/07 08:24:01 masterdriverz Exp $
-
+--- kscd-3.5.6/configure.in.in.orig	2007-03-18 00:52:38.000000000 -0100
++++ kscd-3.5.6/configure.in.in	2007-03-18 01:02:16.000000000 -0100
+@@ -328,7 +328,7 @@
+   dnl but if we find arts we need the include
+   dnl path for it.
+ 
+-  if test x$kde_artsplug_compiles = xyes; then
++  if test "x$build_arts" = "xyes" && test x$kde_artsplug_compiles = xyes; then
+     ARTSC_INCLUDE=`${ARTSCCONFIG} --cflags`
+     AC_MSG_RESULT([arts includes... $ARTSC_INCLUDE])
+     AC_SUBST(ARTSC_INCLUDE)