add missing files

21 files changed, 176 insertions, 17 deletions

diff --git a/kde-base/kcheckpass/Manifest b/kde-base/kcheckpass/Manifest
index fb1a1f5f4f9..3552ca8657d 100644
--- a/kde-base/kcheckpass/Manifest
+++ b/kde-base/kcheckpass/Manifest
@@ -1,3 +1,4 @@
+AUX kdebase-4.0.2-pam-optional.patch 979 RMD160 abdb7293c02507dfd0a032e72f3e449405b6d8a0 SHA1 33e2f936f0548f9b19fe541c0f71db06f9daaf63 SHA256 efa4e0132687dbaa68ab5c8a5911c4a08b5d4e9eb4d2a04879f765b8e44ba9ea
 DIST kdebase-workspace-4.1.71.tar.bz2 48459455 RMD160 04d6c23459f17f9d75ec8b4e2f379c1ce9d7701a SHA1 f8450f7ce28239e55d5cade51e39aefd55ad52c0 SHA256 0a5f25d903832054c2aa44b399272322bfb110c77db2bbc50074797af985b8a7
 EBUILD kcheckpass-4.1.71.ebuild 660 RMD160 7a9832c49aab7fa700954b02f5533867c1b7e4eb SHA1 d6008c868a820626e581f1c731950eb4ba5f9076 SHA256 e520ec8abb8012cf63aa9d28336471ef27f9ac11a075bbb1deb4c2165a00d27e
 MISC ChangeLog 1753 RMD160 df0884325593c0bde73edbf8c1399f1dd9e1dc4d SHA1 a343ff44fe76ea07a45e6d5fc6e1e9a9b4086aa0 SHA256 5e29997359e56f9f4886a52c415047b67c69f24b5591234b530c07ee55827f0e
diff --git a/kde-base/kcheckpass/files/kdebase-4.0.2-pam-optional.patch b/kde-base/kcheckpass/files/kdebase-4.0.2-pam-optional.patch
new file mode 100644
index 00000000000..6fb54f05c54
--- /dev/null
+++ b/kde-base/kcheckpass/files/kdebase-4.0.2-pam-optional.patch
@@ -0,0 +1,29 @@
+diff --git a/kdebase/workspace/cmake/modules/FindPAM.cmake b/kdebase/workspace/cmake/modules/FindPAM.cmake
+index 3499836..cd1c2bb 100644
+--- a/kdebase/workspace/cmake/modules/FindPAM.cmake
++++ b/kdebase/workspace/cmake/modules/FindPAM.cmake
+@@ -5,6 +5,8 @@
+ #  PAM_INCLUDE_DIR - the pam include directory
+ #  PAM_LIBRARIES - libpam library
+ 
++if (WITH_PAM)
++
+ if (PAM_INCLUDE_DIR AND PAM_LIBRARY)
+ 	# Already in cache, be silent
+ 	set(PAM_FIND_QUIETLY TRUE)
+@@ -72,3 +74,5 @@ else (PAM_FOUND)
+ endif (PAM_FOUND)
+ 
+ mark_as_advanced(PAM_INCLUDE_DIR PAM_LIBRARY DL_LIBRARY PAM_MESSAGE_CONST)
++
++endif (WITH_PAM)
+diff --git a/kdebase/workspace/cmake/modules/UnixAuth.cmake b/kdebase/workspace/cmake/modules/UnixAuth.cmake
+index ed8ab9e..ce3bcc2 100644
+--- a/kdebase/workspace/cmake/modules/UnixAuth.cmake
++++ b/kdebase/workspace/cmake/modules/UnixAuth.cmake
+@@ -1,4 +1,4 @@
+-find_package(PAM)
++macro_optional_find_package(PAM)
+ 
+ set(UNIXAUTH_LIBRARIES)
+ set(UNIXAUTH_INCLUDE_DIRS)
diff --git a/kde-base/kdeartwork-kscreensaver/Manifest b/kde-base/kdeartwork-kscreensaver/Manifest
index eacbaace677..016f903ed64 100644
--- a/kde-base/kdeartwork-kscreensaver/Manifest
+++ b/kde-base/kdeartwork-kscreensaver/Manifest
@@ -1,3 +1,4 @@
+AUX kdeartwork-kscreensaver-xscreensaver.patch 1116 RMD160 cee0b5a16df17318b0c674900fa5521ed2b5a58b SHA1 61ad2bda0b0db9fa8feebfea3449101f416afd38 SHA256 a4bcd61c09e467924a2651a97d1c57a756b44a3fad182f45328424cdac502e9d
 DIST kdeartwork-4.1.71.tar.bz2 42732781 RMD160 11a259ee682ca140807ffc0bf26ab84c0e4b18a8 SHA1 67d7266be4445468298dc631fa9bc01c02ddc48a SHA256 ca703426fc70a3727edbfac67c46bdfdfb1cdd8f5009bdd68c5368d17b3c9a3b
 EBUILD kdeartwork-kscreensaver-4.1.71.ebuild 721 RMD160 eeed3591bcc2580bb0214813b8d3da7bb1cd6e1f SHA1 c5cb1812c7c19cd55d3dd74b46fa5794b4b6e1cd SHA256 aa84e6d5405b9b0c4436ef65cd90993d32f066fa1201397ea35f26c8865aa6ec
 MISC ChangeLog 1766 RMD160 07af04dba55cd1cb75e409999395a3b0af633f57 SHA1 31ea1ec015cf700a10ffb4c1ffdbd92e7ba0bab8 SHA256 4ed390b1e6bd197bdda2ba72e278cc03f19e6b91c4ef75627a3af0fe52fa440e
diff --git a/kde-base/kdeartwork-kscreensaver/files/kdeartwork-kscreensaver-xscreensaver.patch b/kde-base/kdeartwork-kscreensaver/files/kdeartwork-kscreensaver-xscreensaver.patch
new file mode 100644
index 00000000000..3cc2bc65134
--- /dev/null
+++ b/kde-base/kdeartwork-kscreensaver/files/kdeartwork-kscreensaver-xscreensaver.patch
@@ -0,0 +1,48 @@
+--- cmake/modules/FindXscreensaver.cmake
++++ cmake/modules/FindXscreensaver.cmake
+@@ -113,6 +113,45 @@
+ endif(XSCREENSAVER_DIR)
+ endif(NOT XSCREENSAVER_DIR)
+
++if(NOT XSCREENSAVER_DIR)
++FIND_PATH(XSCREENSAVER_DIR lib${LIB_SUFFIX}/misc/xscreensaver/deco
++   ${KDE4_INCLUDE_DIR}
++   /usr/
++   /usr/local/
++   /opt/local/
++   /usr/X11R6/
++   /opt/kde/
++   /opt/kde3/
++   /usr/kde/
++   /usr/local/kde/
++   /usr/local/xscreensaver/
++   /usr/openwin/lib/xscreensaver/
++   /etc/
++)
++if( XSCREENSAVER_DIR)
++   set(XSCREENSAVER_DIR ${XSCREENSAVER_DIR}/lib${LIB_SUFFIX}/misc/xscreensaver/)
++endif(XSCREENSAVER_DIR)
++endif(NOT XSCREENSAVER_DIR)
++
++if(NOT XSCREENSAVER_DIR)
++FIND_PATH(XSCREENSAVER_DIR lib/misc/xscreensaver/deco
++   ${KDE4_INCLUDE_DIR}
++   /usr/
++   /usr/local/
++   /opt/local/
++   /usr/X11R6/
++   /opt/kde/
++   /opt/kde3/
++   /usr/kde/
++   /usr/local/kde/
++   /usr/local/xscreensaver/
++   /usr/openwin/lib/xscreensaver/
++   /etc/
++)
++if( XSCREENSAVER_DIR)
++   set(XSCREENSAVER_DIR ${XSCREENSAVER_DIR}/lib/misc/xscreensaver/)
++endif(XSCREENSAVER_DIR)
++endif(NOT XSCREENSAVER_DIR)
+
+
+ set(XSCREENSAVER_CONFIG_DIR)
diff --git a/kde-base/kdm/Manifest b/kde-base/kdm/Manifest
index 05a2d089949..45127d60e9e 100644
--- a/kde-base/kdm/Manifest
+++ b/kde-base/kdm/Manifest
@@ -1,3 +1,4 @@
+AUX kdebase-4.0.2-pam-optional.patch 979 RMD160 abdb7293c02507dfd0a032e72f3e449405b6d8a0 SHA1 33e2f936f0548f9b19fe541c0f71db06f9daaf63 SHA256 efa4e0132687dbaa68ab5c8a5911c4a08b5d4e9eb4d2a04879f765b8e44ba9ea
 DIST kdebase-workspace-4.1.71.tar.bz2 48459455 RMD160 04d6c23459f17f9d75ec8b4e2f379c1ce9d7701a SHA1 f8450f7ce28239e55d5cade51e39aefd55ad52c0 SHA256 0a5f25d903832054c2aa44b399272322bfb110c77db2bbc50074797af985b8a7
 EBUILD kdm-4.1.71.ebuild 1998 RMD160 e3e8940062967be551a93936ee0a9945dd6a9e8e SHA1 bead44558e017627ff4dd6430224399cc1678701 SHA256 074e2f0faeee0f2a2aa3cec6e6e3242724a9e9d4d44edf50e3ccc22b227193b6
 MISC ChangeLog 1570 RMD160 aac9a8e1b0874992c45a9311a6df6c9f32c48ed7 SHA1 5fa47a96a842f27cde6eff2c922b7540f9477bc5 SHA256 7a51aaa26c7bc42435e87adf0e368f6625d8675c5315a65412e80539edcdec7c
diff --git a/kde-base/kdm/files/kdebase-4.0.2-pam-optional.patch b/kde-base/kdm/files/kdebase-4.0.2-pam-optional.patch
new file mode 100644
index 00000000000..6fb54f05c54
--- /dev/null
+++ b/kde-base/kdm/files/kdebase-4.0.2-pam-optional.patch
@@ -0,0 +1,29 @@
+diff --git a/kdebase/workspace/cmake/modules/FindPAM.cmake b/kdebase/workspace/cmake/modules/FindPAM.cmake
+index 3499836..cd1c2bb 100644
+--- a/kdebase/workspace/cmake/modules/FindPAM.cmake
++++ b/kdebase/workspace/cmake/modules/FindPAM.cmake
+@@ -5,6 +5,8 @@
+ #  PAM_INCLUDE_DIR - the pam include directory
+ #  PAM_LIBRARIES - libpam library
+ 
++if (WITH_PAM)
++
+ if (PAM_INCLUDE_DIR AND PAM_LIBRARY)
+ 	# Already in cache, be silent
+ 	set(PAM_FIND_QUIETLY TRUE)
+@@ -72,3 +74,5 @@ else (PAM_FOUND)
+ endif (PAM_FOUND)
+ 
+ mark_as_advanced(PAM_INCLUDE_DIR PAM_LIBRARY DL_LIBRARY PAM_MESSAGE_CONST)
++
++endif (WITH_PAM)
+diff --git a/kdebase/workspace/cmake/modules/UnixAuth.cmake b/kdebase/workspace/cmake/modules/UnixAuth.cmake
+index ed8ab9e..ce3bcc2 100644
+--- a/kdebase/workspace/cmake/modules/UnixAuth.cmake
++++ b/kdebase/workspace/cmake/modules/UnixAuth.cmake
+@@ -1,4 +1,4 @@
+-find_package(PAM)
++macro_optional_find_package(PAM)
+ 
+ set(UNIXAUTH_LIBRARIES)
+ set(UNIXAUTH_INCLUDE_DIRS)
diff --git a/kde-base/kontactinterfaces/Manifest b/kde-base/kontactinterfaces/Manifest
index a925f1f15c6..db21dffe326 100644
--- a/kde-base/kontactinterfaces/Manifest
+++ b/kde-base/kontactinterfaces/Manifest
@@ -1,4 +1,4 @@
 DIST kdepim-4.1.71.tar.bz2 13414307 RMD160 db35ae346572017c1f7fa46be5adaad38d39dea9 SHA1 e6823a85d2b5bf2e36484c7041797e134171522d SHA256 426cdeebb9e58d4c8f9428183a4427edb29632c8d8052a9f1f87898155815197
-EBUILD kontactinterfaces-4.1.71.ebuild 489 RMD160 3fec0cf696c8cece99f479b67a361a0c65f6c227 SHA1 5b85a4da325379ac7781a2f27e4f1de3a1b60087 SHA256 2095b2f45007d2c90c31fc4ae31a98d67964fc087d8d7ca3114f26ba11314347
+EBUILD kontactinterfaces-4.1.71.ebuild 441 RMD160 8331403fd886b7a5d9c4a80901020b1fb34f37fc SHA1 98320bfefddcefbca6dae7ba33d1ddfdea54e6b1 SHA256 4a339cdf61e9b4969461ba483dd82e199a5db523398caa1ef201d989c1cfb998
 MISC ChangeLog 2001 RMD160 305550eb5315691735c79af5fafd413b4fa6d559 SHA1 9a123b97974c2af8c83b4e07bf2ba101ebb86aa6 SHA256 8631a508da8d8a82408a846d3846212fe6d5bad57daaeb1d0e428bc166131481
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
diff --git a/kde-base/kontactinterfaces/kontactinterfaces-4.1.71.ebuild b/kde-base/kontactinterfaces/kontactinterfaces-4.1.71.ebuild
index 06804f8084c..f9a35dd3da6 100644
--- a/kde-base/kontactinterfaces/kontactinterfaces-4.1.71.ebuild
+++ b/kde-base/kontactinterfaces/kontactinterfaces-4.1.71.ebuild
@@ -11,8 +11,6 @@ DESCRIPTION="Interfaces library for the KDE personal information manager"
 KEYWORDS="~amd64 ~x86"
 IUSE="debug htmlhandbook"
 
-#PATCHES=("${FILESDIR}/${PN}-as-needed.patch")
-
 KMSAVELIBS="true"
 
 KMEXTRACTONLY="kaddressbook/org.kde.KAddressbook.Core.xml
diff --git a/kde-base/kscreensaver/Manifest b/kde-base/kscreensaver/Manifest
index adf57688bc7..7b810f3e2d4 100644
--- a/kde-base/kscreensaver/Manifest
+++ b/kde-base/kscreensaver/Manifest
@@ -1,3 +1,4 @@
+AUX kdebase-4.0.2-pam-optional.patch 979 RMD160 abdb7293c02507dfd0a032e72f3e449405b6d8a0 SHA1 33e2f936f0548f9b19fe541c0f71db06f9daaf63 SHA256 efa4e0132687dbaa68ab5c8a5911c4a08b5d4e9eb4d2a04879f765b8e44ba9ea
 DIST kdebase-workspace-4.1.71.tar.bz2 48459455 RMD160 04d6c23459f17f9d75ec8b4e2f379c1ce9d7701a SHA1 f8450f7ce28239e55d5cade51e39aefd55ad52c0 SHA256 0a5f25d903832054c2aa44b399272322bfb110c77db2bbc50074797af985b8a7
 EBUILD kscreensaver-4.1.71.ebuild 866 RMD160 ab8b6b9a7d2e85ce301f13c5065d8bdf6210e40c SHA1 91705807a3f49ade3b650ec59296b69ff31f0304 SHA256 cb59ac12e6b8afd78b871879474f41c1ea5331496b411d8657872f1e3fdccef0
 MISC ChangeLog 1668 RMD160 851c1fee43b0b8721be2f2e72e9e2922de7db5ea SHA1 453331f2b401569e381b34f00688ae895f807d04 SHA256 64850cf066b97798d7fed9a844e919b27350e55aca334a17b118657f3a8ff232
diff --git a/kde-base/kscreensaver/files/kdebase-4.0.2-pam-optional.patch b/kde-base/kscreensaver/files/kdebase-4.0.2-pam-optional.patch
new file mode 100644
index 00000000000..6fb54f05c54
--- /dev/null
+++ b/kde-base/kscreensaver/files/kdebase-4.0.2-pam-optional.patch
@@ -0,0 +1,29 @@
+diff --git a/kdebase/workspace/cmake/modules/FindPAM.cmake b/kdebase/workspace/cmake/modules/FindPAM.cmake
+index 3499836..cd1c2bb 100644
+--- a/kdebase/workspace/cmake/modules/FindPAM.cmake
++++ b/kdebase/workspace/cmake/modules/FindPAM.cmake
+@@ -5,6 +5,8 @@
+ #  PAM_INCLUDE_DIR - the pam include directory
+ #  PAM_LIBRARIES - libpam library
+ 
++if (WITH_PAM)
++
+ if (PAM_INCLUDE_DIR AND PAM_LIBRARY)
+ 	# Already in cache, be silent
+ 	set(PAM_FIND_QUIETLY TRUE)
+@@ -72,3 +74,5 @@ else (PAM_FOUND)
+ endif (PAM_FOUND)
+ 
+ mark_as_advanced(PAM_INCLUDE_DIR PAM_LIBRARY DL_LIBRARY PAM_MESSAGE_CONST)
++
++endif (WITH_PAM)
+diff --git a/kdebase/workspace/cmake/modules/UnixAuth.cmake b/kdebase/workspace/cmake/modules/UnixAuth.cmake
+index ed8ab9e..ce3bcc2 100644
+--- a/kdebase/workspace/cmake/modules/UnixAuth.cmake
++++ b/kdebase/workspace/cmake/modules/UnixAuth.cmake
+@@ -1,4 +1,4 @@
+-find_package(PAM)
++macro_optional_find_package(PAM)
+ 
+ set(UNIXAUTH_LIBRARIES)
+ set(UNIXAUTH_INCLUDE_DIRS)
diff --git a/kde-base/libkmahjongg/Manifest b/kde-base/libkmahjongg/Manifest
index 895905aa6dc..582351fec64 100644
--- a/kde-base/libkmahjongg/Manifest
+++ b/kde-base/libkmahjongg/Manifest
@@ -1,4 +1,4 @@
 DIST kdegames-4.1.71.tar.bz2 35226467 RMD160 995f7211c7304745dbeac91e9697389a529026d9 SHA1 ec4e8c4ff4768f4c4c5bce22fa38e0b767253f4a SHA256 3adb43851278543f05571b02e5892d1749b1f87680ff60bc4f771225a84e832f
-EBUILD libkmahjongg-4.1.71.ebuild 285 RMD160 f3693a87991f8344f533575bbe7639b783bfdbf6 SHA1 877c48aa4565af7051d3e108931a811923221584 SHA256 974d54866df583c7b72b51dce66b8cac185a1ccc6da99d1fc19e64074de05ce6
+EBUILD libkmahjongg-4.1.71.ebuild 239 RMD160 78d4ab85a03a4117d356607a4d359283c75991c6 SHA1 3519216d5816426b4ad07fc765bcc4e9bc0c781c SHA256 60d9d4aaa48414c6ad71411699cc9d319564a300c4fbc469bbfd51d3f2ea730c
 MISC ChangeLog 1626 RMD160 a5f551d773687a54f59a3f879c0c0740feb10669 SHA1 331ced469afc46ed69e531a53983370cbdd2ec5a SHA256 5da08077fd85a933b2dd9cf41a4d3231951e3eb3dce3b90e1d1d89a3307bb681
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
diff --git a/kde-base/libkmahjongg/libkmahjongg-4.1.71.ebuild b/kde-base/libkmahjongg/libkmahjongg-4.1.71.ebuild
index 074490ac61e..90f8d395133 100644
--- a/kde-base/libkmahjongg/libkmahjongg-4.1.71.ebuild
+++ b/kde-base/libkmahjongg/libkmahjongg-4.1.71.ebuild
@@ -11,4 +11,3 @@ DESCRIPTION="LibKMahjongg for KDE"
 KEYWORDS="~amd64 ~x86"
 IUSE="debug "
 
-#PATCHES="${FILESDIR}/${PN}-4.0.0-link.patch"
diff --git a/kde-base/libkonq/Manifest b/kde-base/libkonq/Manifest
index 82f82d8c5b8..63bc7de7dd6 100644
--- a/kde-base/libkonq/Manifest
+++ b/kde-base/libkonq/Manifest
@@ -1,3 +1,4 @@
+AUX fix_includes_install.patch 465 RMD160 94f2fa7ee7715bb59f5de40db05d2a2572e98313 SHA1 b94c82e7b50c3d600ec6359009d97dcb0df95e26 SHA256 308356ee9f9eacaf5bd75457498eae08fe895546b31275a06cd08ca59181ad2a
 DIST kdebase-4.1.71.tar.bz2 4429893 RMD160 b1d9833cd277619640cff271226b74e1a401aebe SHA1 6140720724154df765ec97999b77edb69e47e7b1 SHA256 15d2ec562972e1a323f50cfc51a2ff9296ffa4d21d5337f59f2a6a59b26e2b79
 EBUILD libkonq-4.1.71.ebuild 384 RMD160 ea17e5cc986e8e6acdf9e66fba83f0116dcfe685 SHA1 5287240457fe94580b92283d6c367a0aca5d66a5 SHA256 62d117553edd6c88ee3a0a15cc9a28068736cc330b70feeae49d1aba31b23c44
 MISC ChangeLog 1694 RMD160 4bcb8a009b4e325a1aaadc8c28c32f2e8832cecc SHA1 02e5dcf6aa9ac43041b8aeb790d541187efd7af8 SHA256 c60900ee1451c912f3b6690e83a03494b1eeb91717f424550705f7bfc4460038
diff --git a/kde-base/lskat/Manifest b/kde-base/lskat/Manifest
index fad1b52695e..a1df13e9425 100644
--- a/kde-base/lskat/Manifest
+++ b/kde-base/lskat/Manifest
@@ -1,3 +1,4 @@
+AUX lskat-4.0.0-link.patch 470 RMD160 dd82f8f182ea8aa2953d133dea3071b7f3245c66 SHA1 e903ac6631397c63cc71760e99ef5e6f6b70166e SHA256 b779e71b02ead509d54721c0b272eff5919bf00a158e7bf396dfe54587134b42
 DIST kdegames-4.1.71.tar.bz2 35226467 RMD160 995f7211c7304745dbeac91e9697389a529026d9 SHA1 ec4e8c4ff4768f4c4c5bce22fa38e0b767253f4a SHA256 3adb43851278543f05571b02e5892d1749b1f87680ff60bc4f771225a84e832f
 EBUILD lskat-4.1.71.ebuild 286 RMD160 f78b6852b8830bd87402637ca8af6e15bc26d931 SHA1 fbe85b294ca936aef118b427d0efbc2bc3e5501f SHA256 6d7a14c92fadbfba40095487538a9173f4d087c2b0bf6c0dbd8af78520bd5aa9
 MISC ChangeLog 1618 RMD160 4e52bbb1725d2efad6f3503aab6dad0ead76d7e3 SHA1 d8ce8782e1ea93d8b917e352104a33ca2bd3e52d SHA256 968de9a0f6417202562726a9116ac72681ec756715c93102de6c666a145110d8
diff --git a/kde-base/lskat/files/lskat-4.0.0-link.patch b/kde-base/lskat/files/lskat-4.0.0-link.patch
new file mode 100644
index 00000000000..283dd68d87f
--- /dev/null
+++ b/kde-base/lskat/files/lskat-4.0.0-link.patch
@@ -0,0 +1,11 @@
+--- a/kdegames/lskat/src/CMakeLists.txt
++++ b/kdegames/lskat/src/CMakeLists.txt
+@@ -31,7 +31,8 @@ configure_file(config-src.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-src.h)
+ kde4_add_app_icon(lskat_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/../hi*-app-lskat.png")
+ kde4_add_executable( lskat ${lskat_SRCS} )
+ 
+-target_link_libraries( lskat kdegames )
++target_link_libraries( lskat ${KDE4_KNEWSTUFF2_LIBS}
++		kdegames )
+
+ install(TARGETS lskat  DESTINATION  ${BIN_INSTALL_DIR} )
diff --git a/kde-base/okular/Manifest b/kde-base/okular/Manifest
index 9c0cb7d6b21..79dc078ebe6 100644
--- a/kde-base/okular/Manifest
+++ b/kde-base/okular/Manifest
@@ -1,4 +1,4 @@
 DIST kdegraphics-4.1.71.tar.bz2 3508579 RMD160 fe0b67d08d80e85054fb4b11a5dd1ea4d1aa3235 SHA1 4f817f72c7333369bfed9f7ca7786b6740e8ec21 SHA256 b7bd780e5c23963fb5f4ef47d42f7f2c1830305ca3e14a246e509c48f0e0d926
-EBUILD okular-4.1.71.ebuild 1248 RMD160 8b9641da4c70005a3178105c99c8f282ec26891e SHA1 6921e8d447e2081f7aad3139ea7116d184656435 SHA256 e0268f02b0563523cdd48423a1f730ba5f0a29ec2a83b7350d1345bbb6a2ab6e
+EBUILD okular-4.1.71.ebuild 1032 RMD160 899daf2da11fbae66d086b82ef21db82afffabb5 SHA1 1bc7d6dcef170675812e6d579c63c164b1fe6f26 SHA256 9dddfae9b263ab273ffba298016bc188a4c1cf3d305076a0d8fec4e8f7c04f0d
 MISC ChangeLog 1473 RMD160 0598f80d26e1250085ce5d57b99614689fc6ab8a SHA1 8e05d3c7c525638db0a828ecf1d70d6d29e82b10 SHA256 49aa0f70ca3da6dc8cb35d1fb8caa1fe62a3231d196f1e96d3f93b777fad9036
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
diff --git a/kde-base/okular/okular-4.1.71.ebuild b/kde-base/okular/okular-4.1.71.ebuild
index d80bf965915..91ca9f321d3 100644
--- a/kde-base/okular/okular-4.1.71.ebuild
+++ b/kde-base/okular/okular-4.1.71.ebuild
@@ -23,13 +23,8 @@ RDEPEND=">=app-text/libspectre-0.2
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
-#PATCHES=("${FILESDIR}/${KMNAME}-4.0.2-system-libspectre.patch")
 
 src_configure() {
-	# remove internal copy of libspectre
-#	rm -r "${S}"/okular/generators/spectre/libspectre || \
-#		die "Failed to remove internal copy of libspectre."
-
 	mycmakeargs="${mycmakeargs}
 		$(cmake-utils_use_with chm CHM)
 		$(cmake-utils_use_with djvu DjVuLibre)
diff --git a/kde-base/plasma-workspace/Manifest b/kde-base/plasma-workspace/Manifest
index a98990ebf98..1ec2b80758d 100644
--- a/kde-base/plasma-workspace/Manifest
+++ b/kde-base/plasma-workspace/Manifest
@@ -1,4 +1,4 @@
 DIST kdebase-workspace-4.1.71.tar.bz2 48459455 RMD160 04d6c23459f17f9d75ec8b4e2f379c1ce9d7701a SHA1 f8450f7ce28239e55d5cade51e39aefd55ad52c0 SHA256 0a5f25d903832054c2aa44b399272322bfb110c77db2bbc50074797af985b8a7
-EBUILD plasma-workspace-4.1.71.ebuild 1686 RMD160 74d45d25df537d80f12f39422eaff4f772d2a78c SHA1 9cfe6370a86ecb5990ead7582a70ffe337ae21a2 SHA256 4e7ba8acdf388efd55384c1616dc1e042c38d9c8f62f477b4c6059848883a466
+EBUILD plasma-workspace-4.1.71.ebuild 1425 RMD160 870cacae05794cffbadaa0224edd9e4b85c50a81 SHA1 08c7c6ba4621d17a0e6a77633b764790e8bd954a SHA256 74568f47cbec1a9c0b3728f477a335238884dc8683dfa42caea59d52df501d03
 MISC ChangeLog 2074 RMD160 ac743dbe45787eed428af2798d541b85eb17c70d SHA1 130e12a8889862c53c412448db681bd0b8473a7e SHA256 fcdd6ef97018db3b968fc6264f3233758f817758b28337dce02f7a62e855a8c9
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
diff --git a/kde-base/plasma-workspace/plasma-workspace-4.1.71.ebuild b/kde-base/plasma-workspace/plasma-workspace-4.1.71.ebuild
index 0bbcd1b3cb1..5eea4a61b9d 100644
--- a/kde-base/plasma-workspace/plasma-workspace-4.1.71.ebuild
+++ b/kde-base/plasma-workspace/plasma-workspace-4.1.71.ebuild
@@ -38,15 +38,10 @@ KMEXTRACTONLY="	krunner/org.freedesktop.ScreenSaver.xml
 				krunner/org.kde.krunner.Interface.xml
 				krunner/org.kde.krunner.App.xml
 				ksmserver/org.kde.KSMServerInterface.xml"
-#				libs/taskmanager/ it's already in include/lib
-#				libs/plasma/"
 
 KMLOADLIBS="libplasma"
 
 src_configure() {
-	# Remove this if a patch has been applied upstream.
-	#sed -i -e 's/plasmapkg plasma/plasmapkg ${KDE4_KIO_LIBS} plasma/'\
-	#	"${S}"/plasma/tools/plasmapkg/CMakeLists.txt || die "sed failed."
 	mycmakeargs="${mycmakeargs}
 		$(cmake-utils_use_with xcomposite X11_Xcomposite)
 		$(cmake-utils_use_with xinerama X11_Xinerama)"
diff --git a/kde-base/superkaramba/Manifest b/kde-base/superkaramba/Manifest
index 1365b11cd3f..21a0fe6f08a 100644
--- a/kde-base/superkaramba/Manifest
+++ b/kde-base/superkaramba/Manifest
@@ -1,3 +1,4 @@
+AUX superkaramba-as-needed.patch 655 RMD160 35d6f3c8161d53cecd05bae528c958c2438549a4 SHA1 7e153cf43fca69e11ec6350b3c855837c5fd0a5b SHA256 8932195f9a30eb93d4a86286b7f9d06efe895848021cdc6c6ff6ef65998c0f64
 DIST kdeutils-4.1.71.tar.bz2 2118927 RMD160 75e093ce507f49292f997595884bd6efaa6badff SHA1 ef3eb5d3f9276ce7a9bc9e24beba545bc5096aa4 SHA256 34db92349aa5df8c22982df86db17793cb8d12735dd6c01500d250b1f8afb8c2
 EBUILD superkaramba-4.1.71.ebuild 613 RMD160 c5f73e723feb7fa1a9dcd939fdbac9683fedce6c SHA1 335c90e843d715a4795b2ba2d95e813223aea15c SHA256 fe8497a62f5c5e8bef7e052bc3402fce50d4cd9ddce8eb17097648324eea8edf
 MISC ChangeLog 1787 RMD160 6b2b9bba36d5f08fab47ffd44e1edb038ba2b86c SHA1 3535b997991b5e64f264674415bffe2922c3e02b SHA256 910e0fef2cfeacbba0f4de2567156d67c0998facb75b18678b81ba31e45b1c21
diff --git a/kde-base/superkaramba/files/superkaramba-as-needed.patch b/kde-base/superkaramba/files/superkaramba-as-needed.patch
new file mode 100644
index 00000000000..85d6956048c
--- /dev/null
+++ b/kde-base/superkaramba/files/superkaramba-as-needed.patch
@@ -0,0 +1,19 @@
+--- superkaramba-4.0.1/superkaramba/src/CMakeLists.txt	2008-02-07 18:45:04.000000000 +0100
++++ superkaramba-4.0.1.new/superkaramba/src/CMakeLists.txt	2008-02-07 18:46:52.000000000 +0100
+@@ -82,6 +82,16 @@
+ KDE4_ADD_LIBRARY(superkaramba SHARED ${superkaramba_LIB_SRCS})
+ set_target_properties(superkaramba PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
+ 
++FIND_LIBRARY(LIBDL dl)
++IF(LIBDL)
++  LIST(APPEND PYTHON_LIBRARIES ${LIBDL})
++ENDIF(LIBDL)
++
++FIND_LIBRARY(LIBUTIL util)
++IF(LIBUTIL)
++  LIST(APPEND PYTHON_LIBRARIES ${LIBUTIL})
++ENDIF(LIBUTIL)
++
+ TARGET_LINK_LIBRARIES(superkaramba
+ ${KDE4_KIO_LIBS}
+ ${KDE4_KPTY_LIBS}