Merge branch 'master' into kde-git

Conflicts:
	app-office/akonadi-server/Manifest
	app-office/kexi/Manifest
	app-office/koffice-libs/Manifest
	app-office/koffice-meta/Manifest
	app-office/kplato/Manifest
	app-office/kpresenter/Manifest
	app-office/kspread/Manifest
	kde-base/kdeartwork-kscreensaver/Manifest
	kde-base/kdm/Manifest
	kde-base/kscreensaver/Manifest
	kde-base/pykde4/Manifest
	kde-base/rocs/Manifest
	media-plugins/kipi-plugins/Manifest

26 files changed, 258 insertions, 35 deletions

diff --git a/kde-base/kdeartwork-kscreensaver/Manifest b/kde-base/kdeartwork-kscreensaver/Manifest
index 65ea027e6b1..33b631e3603 100644
--- a/kde-base/kdeartwork-kscreensaver/Manifest
+++ b/kde-base/kdeartwork-kscreensaver/Manifest
@@ -1,9 +1,10 @@
+AUX kdeartwork-kscreensaver-4.5.95-webcollage.patch 643 RMD160 7cba173fbb03a3eaf4a96a53a4089962a62f5356 SHA1 2fabea6215d2f84eb6a2d435e9df914554c52408 SHA256 cdc24e8cba2b27534efd6dc52aa92547580abc77571f791cf8d733cf8356d8c1
 AUX kdeartwork-kscreensaver-xscreensaver.patch 1116 RMD160 cee0b5a16df17318b0c674900fa5521ed2b5a58b SHA1 61ad2bda0b0db9fa8feebfea3449101f416afd38 SHA256 a4bcd61c09e467924a2651a97d1c57a756b44a3fad182f45328424cdac502e9d
 DIST kdeartwork-4.5.5.tar.bz2 110923978 RMD160 625cb7b9733c6b5a026a44a06f339c5b486f86ad SHA1 f584a11f188734380ee56950176f698426c29017 SHA256 cc37698029bab7acdf6ff7e8151d4daa008ea1ecd680e49d54460bc8307442cc
 DIST kdeartwork-4.5.95.tar.bz2 116893987 RMD160 f230522f403e99635d7870e8bf9538ff3a29bb92 SHA1 e1dc0c1fb1f1910c09f4878191d250b9105379ed SHA256 48c3e1fffee7a8b8d37a77456507a4b4f55bdbe86ef981988b67420594efa008
 EBUILD kdeartwork-kscreensaver-4.5.5.ebuild 1150 RMD160 8b4ad78943db647567bb7c1b02baf0bf68692522 SHA1 1b0e498b42429c816da6c8a4b750ee10c88726cb SHA256 876e486c51a52737d4430822d5302b501b298e15f19c5c9a7cee7f10b41fdc98
-EBUILD kdeartwork-kscreensaver-4.5.95.ebuild 1114 RMD160 5b2e05e0b6260d296e6049e440198c9218c60a53 SHA1 345dbfd3da3a86fa1e29ce7887ce74f519cd2068 SHA256 3349e83f102bf6f4c941770bf95ff8f4aa3e1d1345317630b83c5d074223bc6f
+EBUILD kdeartwork-kscreensaver-4.5.95.ebuild 1159 RMD160 6a4df2c899a9694d78199c157a79b5987768c4e8 SHA1 d7bb11cfb436e8ba3b24b3ee461483f2b96b13d4 SHA256 1a4e255dbbb011bf2cd2915250ab07862ef1caa1817f8e884152aae7120ad496
 EBUILD kdeartwork-kscreensaver-4.5.9999.ebuild 1103 RMD160 2296fd43fd3eda5e54ef42709201d5b9e074fe2e SHA1 ad3078eb9507ddfb80e66e04dd7683d5c3954419 SHA256 f044f6631595d33c0d67e8b6247eb8b631688d56abd9895f901d7cda5a3db876
-EBUILD kdeartwork-kscreensaver-4.6.9999.ebuild 1103 RMD160 2296fd43fd3eda5e54ef42709201d5b9e074fe2e SHA1 ad3078eb9507ddfb80e66e04dd7683d5c3954419 SHA256 f044f6631595d33c0d67e8b6247eb8b631688d56abd9895f901d7cda5a3db876
-EBUILD kdeartwork-kscreensaver-9999.ebuild 1103 RMD160 2296fd43fd3eda5e54ef42709201d5b9e074fe2e SHA1 ad3078eb9507ddfb80e66e04dd7683d5c3954419 SHA256 f044f6631595d33c0d67e8b6247eb8b631688d56abd9895f901d7cda5a3db876
+EBUILD kdeartwork-kscreensaver-4.6.9999.ebuild 1148 RMD160 a2d89e53d30108f28e3ad28933f9f9bfa650d4fb SHA1 f7051dae7ef4fface1eca5488dfb425a1d76d54b SHA256 0273d7c38832181612d05d1edd01d84dcc7c5ed820af92379db52b21dac12d2e
+EBUILD kdeartwork-kscreensaver-9999.ebuild 1148 RMD160 a2d89e53d30108f28e3ad28933f9f9bfa650d4fb SHA1 f7051dae7ef4fface1eca5488dfb425a1d76d54b SHA256 0273d7c38832181612d05d1edd01d84dcc7c5ed820af92379db52b21dac12d2e
 MISC metadata.xml 269 RMD160 9c144d948faed277611dc2272b4edc85ef31be01 SHA1 0ed80ff393e27262e5f604aaee3684f156002d02 SHA256 148973f666960ab1c4dbd5fe36136505dd013a053bb973755542ba187ba7fea3
diff --git a/kde-base/kdeartwork-kscreensaver/files/kdeartwork-kscreensaver-4.5.95-webcollage.patch b/kde-base/kdeartwork-kscreensaver/files/kdeartwork-kscreensaver-4.5.95-webcollage.patch
new file mode 100644
index 00000000000..11ec11b5233
--- /dev/null
+++ b/kde-base/kdeartwork-kscreensaver/files/kdeartwork-kscreensaver-4.5.95-webcollage.patch
@@ -0,0 +1,11 @@
+diff -ruN kdeartwork-kscreensaver-4.5.95.orig/kscreensaver/kxsconfig/ScreenSavers/webcollage.desktop kdeartwork-kscreensaver-4.5.95/kscreensaver/kxsconfig/ScreenSavers/webcollage.desktop
+--- kdeartwork-kscreensaver-4.5.95.orig/kscreensaver/kxsconfig/ScreenSavers/webcollage.desktop	2010-09-27 21:52:40.000000000 +0200
++++ kdeartwork-kscreensaver-4.5.95/kscreensaver/kxsconfig/ScreenSavers/webcollage.desktop	2011-01-09 20:00:26.000000000 +0100
+@@ -6,6 +6,7 @@
+ TryExec=xscreensaver
+ Actions=InWindow;Root;Setup;
+ X-KDE-Category=Banners & Pictures
++X-KDE-Type=NotSafeForWork
+ Name=Web Collage
+ Name[ast]=Web Collage
+ Name[bg]=Уеб-колаж
diff --git a/kde-base/kdeartwork-kscreensaver/kdeartwork-kscreensaver-4.5.95.ebuild b/kde-base/kdeartwork-kscreensaver/kdeartwork-kscreensaver-4.5.95.ebuild
index 1852b3a1435..546645221a3 100644
--- a/kde-base/kdeartwork-kscreensaver/kdeartwork-kscreensaver-4.5.95.ebuild
+++ b/kde-base/kdeartwork-kscreensaver/kdeartwork-kscreensaver-4.5.95.ebuild
@@ -25,7 +25,8 @@ DEPEND="${RDEPEND}
 	eigen? ( dev-cpp/eigen:2 )
 "
 
-PATCHES=( "${FILESDIR}/${PN}-xscreensaver.patch" )
+PATCHES=( "${FILESDIR}/${PN}-xscreensaver.patch"
+	"${FILESDIR}/${PN}-4.5.95-webcollage.patch" )
 
 src_prepare() {
 	sed -i -e 's/${KDE4WORKSPACE_KSCREENSAVER_LIBRARY}/kscreensaver/g' \
diff --git a/kde-base/kdeartwork-kscreensaver/kdeartwork-kscreensaver-4.6.9999.ebuild b/kde-base/kdeartwork-kscreensaver/kdeartwork-kscreensaver-4.6.9999.ebuild
index 14a90b69f00..72e85e90d63 100644
--- a/kde-base/kdeartwork-kscreensaver/kdeartwork-kscreensaver-4.6.9999.ebuild
+++ b/kde-base/kdeartwork-kscreensaver/kdeartwork-kscreensaver-4.6.9999.ebuild
@@ -25,7 +25,8 @@ DEPEND="${RDEPEND}
 	eigen? ( dev-cpp/eigen:2 )
 "
 
-PATCHES=( "${FILESDIR}/${PN}-xscreensaver.patch" )
+PATCHES=( "${FILESDIR}/${PN}-xscreensaver.patch"
+	"${FILESDIR}/${PN}-4.5.95-webcollage.patch" )
 
 src_prepare() {
 	sed -i -e 's/${KDE4WORKSPACE_KSCREENSAVER_LIBRARY}/kscreensaver/g' \
diff --git a/kde-base/kdeartwork-kscreensaver/kdeartwork-kscreensaver-9999.ebuild b/kde-base/kdeartwork-kscreensaver/kdeartwork-kscreensaver-9999.ebuild
index 14a90b69f00..72e85e90d63 100644
--- a/kde-base/kdeartwork-kscreensaver/kdeartwork-kscreensaver-9999.ebuild
+++ b/kde-base/kdeartwork-kscreensaver/kdeartwork-kscreensaver-9999.ebuild
@@ -25,7 +25,8 @@ DEPEND="${RDEPEND}
 	eigen? ( dev-cpp/eigen:2 )
 "
 
-PATCHES=( "${FILESDIR}/${PN}-xscreensaver.patch" )
+PATCHES=( "${FILESDIR}/${PN}-xscreensaver.patch"
+	"${FILESDIR}/${PN}-4.5.95-webcollage.patch" )
 
 src_prepare() {
 	sed -i -e 's/${KDE4WORKSPACE_KSCREENSAVER_LIBRARY}/kscreensaver/g' \
diff --git a/kde-base/kdelirc/Manifest b/kde-base/kdelirc/Manifest
deleted file mode 100644
index 2596974a5d4..00000000000
--- a/kde-base/kdelirc/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
diff --git a/kde-base/kdelirc/metadata.xml b/kde-base/kdelirc/metadata.xml
deleted file mode 100644
index 8d1e86a9cef..00000000000
--- a/kde-base/kdelirc/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>kde</herd>
-</pkgmetadata>
diff --git a/kde-base/kdm/Manifest b/kde-base/kdm/Manifest
index 4a446c3ff36..4938ad549d8 100644
--- a/kde-base/kdm/Manifest
+++ b/kde-base/kdm/Manifest
@@ -1,11 +1,12 @@
 AUX kdebase-4.0.2-pam-optional.patch 979 RMD160 abdb7293c02507dfd0a032e72f3e449405b6d8a0 SHA1 33e2f936f0548f9b19fe541c0f71db06f9daaf63 SHA256 efa4e0132687dbaa68ab5c8a5911c4a08b5d4e9eb4d2a04879f765b8e44ba9ea
 AUX kdm-4-gentoo-xinitrc.d.patch 793 RMD160 1e22f23d7cbd4764b4a7675968e0a387de2fc09a SHA1 226db506807a31b565da598458faed4a3ce3ddb7 SHA256 7ddeaa5b5446ed9e4f94cfc474032ee7d450df3748b378a4803c5b7b2bdce684
 AUX kdm-4.3.5-xdm-restart.patch 1593 RMD160 f6bf916ec09049ba7c7a3c65ec86b59302b8f3be SHA1 f70ae3f876f3840364c698d33d60b15395a457c4 SHA256 0f2f2d9dfba1c0a8a82c6b92cb55ff5afe77fc8b5cbe280fb7fbba19f8327866
+AUX kdm-logrotate 111 RMD160 dfdebb05a456a2a6a83faa86e47ff847618634dd SHA1 af020c65a8a27f49b178bb1cb42e9786cf6a578b SHA256 516523c6db0b85d33f0a90d284e707ed4d2ba426b154872af2e8e9389e4ef089
 DIST kdebase-workspace-4.5.5.tar.bz2 65688854 RMD160 351f05ae6a1b67b35de7460e1e4353ba3d16720e SHA1 38457b606bfc0b39842fb451566ddf49d145da82 SHA256 4d9090fe3b261debfce7b1db4799d7884097960464709866f6da840557d98091
 DIST kdebase-workspace-4.5.95.tar.bz2 69488726 RMD160 7396276c868b104dee92cb872a8b17298d6acc50 SHA1 8e7f7b9c74a72d7bf92d9d1d443a775d90fa780c SHA256 1e00eefd6771fcf7b65571fba268a6795f7d88a56a882b5a5316056e53e66056
 EBUILD kdm-4.5.5.ebuild 3187 RMD160 4eaea1c673e1e89d27a5210e241997e63fb18441 SHA1 ee43e86c1db43adb5d93f2e51a5e5b897980c971 SHA256 d5ef7b786eba0fb4b74eb66ca85b2df008cbd0787656a30805d9eb9db7353432
-EBUILD kdm-4.5.95.ebuild 3175 RMD160 ffaf225df90211271b1213c04e4a21fd3005ae8f SHA1 ce056299d3253a63cd6bd3c4fa5209201bcef220 SHA256 0440387b4a443c566a731dd4e2924ffbfd2fcd45b52b69076d2bd483c55f3f43
-EBUILD kdm-4.5.9999.ebuild 3159 RMD160 1ee217ec25a09aef97c952e841f5e7cd3d453206 SHA1 760c98c9165d15293c0d9882e82fa11d4781f137 SHA256 8822d53f628cd3fbd9e5730fd03fb575050a022b938cf65b7762d809bc578004
-EBUILD kdm-4.6.9999.ebuild 3164 RMD160 319f813299522e6342da48b0105435a2756c8d58 SHA1 c94e93e1668103f6adcba3652024f0985996d690 SHA256 5defda49da3607a93c78eac26d3877ade25d13700be4e48d3fc14b3c0f7b66ed
-EBUILD kdm-9999.ebuild 3164 RMD160 319f813299522e6342da48b0105435a2756c8d58 SHA1 c94e93e1668103f6adcba3652024f0985996d690 SHA256 5defda49da3607a93c78eac26d3877ade25d13700be4e48d3fc14b3c0f7b66ed
+EBUILD kdm-4.5.95.ebuild 3268 RMD160 fd326ecc16bbe9c6e168d02c9e671359807f89c0 SHA1 5476a7a9ca05bcedc9b2f0c903b4b9c09d11e182 SHA256 555c4565f0882ebaa537ee776d437181f5f99e19a9f9f0fea921ba82c99cabf7
+EBUILD kdm-4.5.9999.ebuild 3252 RMD160 1cf64ba79b43fc916029890a163dfadfa5f8724f SHA1 87e73da850b4fd889e13158cf443d36a6258d15c SHA256 604b782425752cea12e7e14507bdac2a58bcac08e5d651bfd6b79b6c4850ec47
+EBUILD kdm-4.6.9999.ebuild 3257 RMD160 dbcb4abe31ebd875b7cbd76107032b361de34c70 SHA1 23c84f02f8488a940839543d693ff1d119240c96 SHA256 329d208afff25ab8712acc2b30d0baa7a00e9a80d5209e4a4b1187754b999de2
+EBUILD kdm-9999.ebuild 3257 RMD160 dbcb4abe31ebd875b7cbd76107032b361de34c70 SHA1 23c84f02f8488a940839543d693ff1d119240c96 SHA256 329d208afff25ab8712acc2b30d0baa7a00e9a80d5209e4a4b1187754b999de2
 MISC metadata.xml 253 RMD160 dbe3d0cc1778dad287767c5dee6b46b42ccf20ec SHA1 b4723a2baaec997efee2cdc543248a2aad8f1a7e SHA256 955ffc185b3b01315be94542ea43ae1180d5f61ea539a317c45c5746b463eeba
diff --git a/kde-base/kdm/files/kdm-logrotate b/kde-base/kdm/files/kdm-logrotate
new file mode 100644
index 00000000000..4bce1a0392d
--- /dev/null
+++ b/kde-base/kdm/files/kdm-logrotate
@@ -0,0 +1,8 @@
+/var/log/kdm.log {
+    maxage 365
+    size=+1024k
+    notifempty
+    missingok
+    compress
+    copytruncate
+}
diff --git a/kde-base/kdm/kdm-4.5.95.ebuild b/kde-base/kdm/kdm-4.5.95.ebuild
index c01758273e0..37c424dc6e9 100644
--- a/kde-base/kdm/kdm-4.5.95.ebuild
+++ b/kde-base/kdm/kdm-4.5.95.ebuild
@@ -92,6 +92,10 @@ src_install() {
 	keepdir "${KDM_HOME}"
 	fowners root:kdm "${KDM_HOME}"
 	fperms 1770 "${KDM_HOME}"
+
+	# install logrotate file
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/kdm-logrotate kdm
 }
 
 pkg_postinst() {
diff --git a/kde-base/kdm/kdm-4.5.9999.ebuild b/kde-base/kdm/kdm-4.5.9999.ebuild
index 07be65fe601..e5688273443 100644
--- a/kde-base/kdm/kdm-4.5.9999.ebuild
+++ b/kde-base/kdm/kdm-4.5.9999.ebuild
@@ -93,6 +93,10 @@ src_install() {
 	keepdir "${KDM_HOME}"
 	fowners root:kdm "${KDM_HOME}"
 	fperms 1770 "${KDM_HOME}"
+
+	# install logrotate file
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/kdm-logrotate kdm
 }
 
 pkg_postinst() {
diff --git a/kde-base/kdm/kdm-4.6.9999.ebuild b/kde-base/kdm/kdm-4.6.9999.ebuild
index 35135d79c00..61a71334ce3 100644
--- a/kde-base/kdm/kdm-4.6.9999.ebuild
+++ b/kde-base/kdm/kdm-4.6.9999.ebuild
@@ -92,6 +92,10 @@ src_install() {
 	keepdir "${KDM_HOME}"
 	fowners root:kdm "${KDM_HOME}"
 	fperms 1770 "${KDM_HOME}"
+
+	# install logrotate file
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/kdm-logrotate kdm
 }
 
 pkg_postinst() {
diff --git a/kde-base/kdm/kdm-9999.ebuild b/kde-base/kdm/kdm-9999.ebuild
index 35135d79c00..61a71334ce3 100644
--- a/kde-base/kdm/kdm-9999.ebuild
+++ b/kde-base/kdm/kdm-9999.ebuild
@@ -92,6 +92,10 @@ src_install() {
 	keepdir "${KDM_HOME}"
 	fowners root:kdm "${KDM_HOME}"
 	fperms 1770 "${KDM_HOME}"
+
+	# install logrotate file
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/kdm-logrotate kdm
 }
 
 pkg_postinst() {
diff --git a/kde-base/kscreensaver/Manifest b/kde-base/kscreensaver/Manifest
index 4b5b88ebe25..830372c588a 100644
--- a/kde-base/kscreensaver/Manifest
+++ b/kde-base/kscreensaver/Manifest
@@ -1,9 +1,10 @@
 AUX kdebase-4.0.2-pam-optional.patch 979 RMD160 abdb7293c02507dfd0a032e72f3e449405b6d8a0 SHA1 33e2f936f0548f9b19fe541c0f71db06f9daaf63 SHA256 efa4e0132687dbaa68ab5c8a5911c4a08b5d4e9eb4d2a04879f765b8e44ba9ea
+AUX kscreensaver-4.5.95-nsfw.patch 1232 RMD160 3b74f5968006817b92ff7e19ca12434ae731ea14 SHA1 b6e7e4cd4e2566e5d2bf3f51eb6157d7946afbf2 SHA256 2741df667e564dec6834848b3e185efcc4f976b82c52755289fea1b87c6f86db
 DIST kdebase-workspace-4.5.5.tar.bz2 65688854 RMD160 351f05ae6a1b67b35de7460e1e4353ba3d16720e SHA1 38457b606bfc0b39842fb451566ddf49d145da82 SHA256 4d9090fe3b261debfce7b1db4799d7884097960464709866f6da840557d98091
 DIST kdebase-workspace-4.5.95.tar.bz2 69488726 RMD160 7396276c868b104dee92cb872a8b17298d6acc50 SHA1 8e7f7b9c74a72d7bf92d9d1d443a775d90fa780c SHA256 1e00eefd6771fcf7b65571fba268a6795f7d88a56a882b5a5316056e53e66056
 EBUILD kscreensaver-4.5.5.ebuild 761 RMD160 a7ad314443deda17f1f4b4c12a5eda6392537d4c SHA1 ec2e226c7d03c22549cd570de8f357e982dd42d8 SHA256 8529cd5b73d96d717920c4cc67d24be67d1e6c4e9ed6013bda1ad61ec8eea16f
-EBUILD kscreensaver-4.5.95.ebuild 720 RMD160 1b8c4d182d6368112772b3ea663cb22f3471f4f6 SHA1 768e0bc15aba50af07dc573495e941bed43dae86 SHA256 0cd2b15848cce162d459bfb974b06e35bd7676025cc8c375034923c941aad7d1
+EBUILD kscreensaver-4.5.95.ebuild 759 RMD160 614f53a3dd1d94451760aab0aa409edc851ae0cf SHA1 15198216e079b2bb792a69dce6075415c43cdab7 SHA256 89bb6b6ee19368fbd58c51e5958c511df5cc7184079d11439f66263677177c74
 EBUILD kscreensaver-4.5.9999.ebuild 709 RMD160 4860a6ccc73e9ee0cb8073c1edf776803cebc6ca SHA1 31b59b78a51d02cdd5bf2c9fc2f0cf006ab3e27a SHA256 7f13e9f8bb9fc3999232e6e735f92d2315d27fe75739aa8142d568df04cbecec
-EBUILD kscreensaver-4.6.9999.ebuild 709 RMD160 4860a6ccc73e9ee0cb8073c1edf776803cebc6ca SHA1 31b59b78a51d02cdd5bf2c9fc2f0cf006ab3e27a SHA256 7f13e9f8bb9fc3999232e6e735f92d2315d27fe75739aa8142d568df04cbecec
-EBUILD kscreensaver-9999.ebuild 709 RMD160 4860a6ccc73e9ee0cb8073c1edf776803cebc6ca SHA1 31b59b78a51d02cdd5bf2c9fc2f0cf006ab3e27a SHA256 7f13e9f8bb9fc3999232e6e735f92d2315d27fe75739aa8142d568df04cbecec
+EBUILD kscreensaver-4.6.9999.ebuild 748 RMD160 8282ff14c6ae9ae583c7108e8327637e09254424 SHA1 1ae0190cb0e500da59dadd2db473562fe95c24c2 SHA256 c5505f487169ab58ba39af33dae2764afa58594d344863b7d9eda4a577c67a79
+EBUILD kscreensaver-9999.ebuild 748 RMD160 8282ff14c6ae9ae583c7108e8327637e09254424 SHA1 1ae0190cb0e500da59dadd2db473562fe95c24c2 SHA256 c5505f487169ab58ba39af33dae2764afa58594d344863b7d9eda4a577c67a79
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
diff --git a/kde-base/kscreensaver/files/kscreensaver-4.5.95-nsfw.patch b/kde-base/kscreensaver/files/kscreensaver-4.5.95-nsfw.patch
new file mode 100644
index 00000000000..ff3aebf2e98
--- /dev/null
+++ b/kde-base/kscreensaver/files/kscreensaver-4.5.95-nsfw.patch
@@ -0,0 +1,21 @@
+diff -ruN kscreensaver-4.5.95.orig/kscreensaver/krandom_screensaver/random.cpp kscreensaver-4.5.95/kscreensaver/krandom_screensaver/random.cpp
+--- kscreensaver-4.5.95.orig/kscreensaver/krandom_screensaver/random.cpp	2010-10-27 21:54:59.000000000 +0200
++++ kscreensaver-4.5.95/kscreensaver/krandom_screensaver/random.cpp	2011-01-09 19:52:54.000000000 +0100
+@@ -110,6 +110,7 @@
+ 	const bool opengl = configGroup.readEntry("OpenGL", false);
+ 	const bool manipulatescreen = configGroup.readEntry("ManipulateScreen", false);
+         // TODO replace this with TryExec=fortune in the desktop files
++	const bool notsafeforwork = false;
+         const bool fortune = !KStandardDirs::findExe("fortune").isEmpty();
+         foreach( const KService::Ptr& service, lst ) {
+             //QString file = KStandardDirs::locate("services", service->entryPath());
+@@ -126,6 +127,9 @@
+                 } else if (type == QLatin1String("Fortune")) {
+                     if (!fortune)
+                         goto fail;
++                } else if (type == QLatin1String("NotSafeForWork")) {
++                    if (!notsafeforwork)
++                        goto fail;
+                 }
+             }
+             availableSavers.append(service);
diff --git a/kde-base/kscreensaver/kscreensaver-4.5.95.ebuild b/kde-base/kscreensaver/kscreensaver-4.5.95.ebuild
index 6a68c1a1df7..6cf23816404 100644
--- a/kde-base/kscreensaver/kscreensaver-4.5.95.ebuild
+++ b/kde-base/kscreensaver/kscreensaver-4.5.95.ebuild
@@ -25,7 +25,8 @@ DEPEND="${RDEPEND}
 	x11-proto/randrproto
 "
 
-PATCHES=( "${FILESDIR}/kdebase-4.0.2-pam-optional.patch" )
+PATCHES=( "${FILESDIR}/kdebase-4.0.2-pam-optional.patch"
+	"${FILESDIR}/${PN}-4.5.95-nsfw.patch" )
 
 src_configure() {
 	mycmakeargs=(
diff --git a/kde-base/kscreensaver/kscreensaver-4.6.9999.ebuild b/kde-base/kscreensaver/kscreensaver-4.6.9999.ebuild
index fac76476d08..dcbb44efc4c 100644
--- a/kde-base/kscreensaver/kscreensaver-4.6.9999.ebuild
+++ b/kde-base/kscreensaver/kscreensaver-4.6.9999.ebuild
@@ -25,7 +25,8 @@ DEPEND="${RDEPEND}
 	x11-proto/randrproto
 "
 
-PATCHES=( "${FILESDIR}/kdebase-4.0.2-pam-optional.patch" )
+PATCHES=( "${FILESDIR}/kdebase-4.0.2-pam-optional.patch"
+	"${FILESDIR}/${PN}-4.5.95-nsfw.patch" )
 
 src_configure() {
 	mycmakeargs=(
diff --git a/kde-base/kscreensaver/kscreensaver-9999.ebuild b/kde-base/kscreensaver/kscreensaver-9999.ebuild
index fac76476d08..dcbb44efc4c 100644
--- a/kde-base/kscreensaver/kscreensaver-9999.ebuild
+++ b/kde-base/kscreensaver/kscreensaver-9999.ebuild
@@ -25,7 +25,8 @@ DEPEND="${RDEPEND}
 	x11-proto/randrproto
 "
 
-PATCHES=( "${FILESDIR}/kdebase-4.0.2-pam-optional.patch" )
+PATCHES=( "${FILESDIR}/kdebase-4.0.2-pam-optional.patch"
+	"${FILESDIR}/${PN}-4.5.95-nsfw.patch" )
 
 src_configure() {
 	mycmakeargs=(
diff --git a/kde-base/pykde4/Manifest b/kde-base/pykde4/Manifest
index b803e77f998..5fc46d665d5 100644
--- a/kde-base/pykde4/Manifest
+++ b/kde-base/pykde4/Manifest
@@ -1,10 +1,11 @@
 AUX pykde4-4.4.4-arm-sip.patch 822 RMD160 60af91680e1e8388acd7f8401a32dbf894a4351f SHA1 20d37a8b127eebffc4556352168786036969ee78 SHA256 c2defa87628148fe77eb82f43f5904ace4bb66898424218423c79c7fa40613e2
+AUX pykde4-4.5.5-typedefs-fix.patch 3309 RMD160 c81c29abdd9adaa73ffbf899fd722b861ba95a10 SHA1 f0e0318e996ccd82eaa9304c184b8d4cda4d7a50 SHA256 5a94419ae8edc80b7231ed3d3afb23d497fc47adf798b6e18bca9060788f87d7
 AUX pykde4-4.5.90-typedefs-fix.patch 2110 RMD160 93a7e6b0a23fda700342ac4178a33fbe457c8244 SHA1 59b3992de8def0e415a055246d2d3d0a2934d8d9 SHA256 4b441ad05c553383a94e4856462c0c747b81acc5fe44782cdcb4371715b7ddf3
 DIST kdebindings-4.5.5.tar.bz2 7134992 RMD160 c69f387c8dd5e3205fa8a436cc63cecf9511f38e SHA1 5f754f0b6989df9557c5ccec18b4f96207fceb94 SHA256 7bfa2df7e8a01c7f1a9cfd2e79e544794b94490d3ca3576cbbedb2328ef257c5
 DIST kdebindings-4.5.95.tar.bz2 7079055 RMD160 67f41b2ae5a67e2d731cb3efc3094cde350116ef SHA1 55ce512006f53b31c41675fabe4565b6e4eb4483 SHA256 104b1d5fcd20078004146c65b35114015e9f4e8cc07f1c61aaac717eb4db7712
-EBUILD pykde4-4.5.5.ebuild 1885 RMD160 7f8818c08d166a016683a037eb293971d859fe5a SHA1 73e7eef7979147aec97ffae83811aea9e26914e0 SHA256 63eae625e8580fd06fb0db2d6fb1a0d303c455d1fde87012955e597a7a8801ed
-EBUILD pykde4-4.5.95.ebuild 1868 RMD160 f73b5f965479a72a6f68e9d9176fa22cbb074a53 SHA1 359c3a9eeff1be1ca6a2aff83aa5e8278d451ef7 SHA256 bd414ca89a4cc79f1527a9beb74114457da62df75be97db737c46b84a692f6cd
-EBUILD pykde4-4.5.9999.ebuild 1833 RMD160 95805f63f7f3527e3d9ba3f5c6c7dd27ab5611de SHA1 d1719603e0817bf47d4e58a8972acf11979f7a34 SHA256 9f787c349fdc0d8030d8f80959113bcad0a6c28cbab1094aa101eb62c1546fde
-EBUILD pykde4-4.6.9999.ebuild 1857 RMD160 745eb6e2d34101b6e0363b51a3ae34683b54830d SHA1 a06f29d39b43ab9f024ab7bfe69b2d1ea4ecf8a3 SHA256 4a3726567cdfd4ca9894e6ca42eabf73a102484699f0554bee00e0442b427141
+EBUILD pykde4-4.5.5.ebuild 1970 RMD160 5f05faa738611ef010de36b8bf9d2fe66636cfba SHA1 c13fb543d4f2dd09af6e350506775e10a6be7021 SHA256 155d98523debb9c215c70a2a0eb01c48bb8ef628a68635e265cc6397eb3b88c1
+EBUILD pykde4-4.5.95.ebuild 1895 RMD160 56b88171c1fb94dd1d9eafdbb5663e0f11ac5d52 SHA1 4bab8de802fbde6ba5d72ebea7eac53ee895f810 SHA256 27877dd219b32177fe88422dd24965db97de379b17fb44c9362ca28c10985b62
+EBUILD pykde4-4.5.9999.ebuild 1914 RMD160 6346bedb80355eda542adb022d796f828408d180 SHA1 7e8644ba4ac3a4e9cf2670c8fc7c2f60dff47922 SHA256 6363b3733294c81cfdd25c51b49f558158451b346e12ba2393b33ca81cfcaca8
+EBUILD pykde4-4.6.9999.ebuild 1884 RMD160 7a3f181670d6cca2ebfa2bf5c55e3e968c6d3aa9 SHA1 7b27ef664366c6a6e6bc050e6c182ef829a4c112 SHA256 211ceb16776e9ef380ae96b0a296f0c36269329c142c16268e45d1cb30b96d35
 EBUILD pykde4-9999.ebuild 1884 RMD160 7a3f181670d6cca2ebfa2bf5c55e3e968c6d3aa9 SHA1 7b27ef664366c6a6e6bc050e6c182ef829a4c112 SHA256 211ceb16776e9ef380ae96b0a296f0c36269329c142c16268e45d1cb30b96d35
 MISC metadata.xml 260 RMD160 a5b7b39214f909c85f4f5de6be8efefb36e5283d SHA1 1e2c113943a2677634a92324ea50f44ccf71b2ec SHA256 0ca2c4d395d5a18420e2afaa9701549afc4e584b5b9be90e4b6ff5db89d66369
diff --git a/kde-base/pykde4/files/pykde4-4.5.5-typedefs-fix.patch b/kde-base/pykde4/files/pykde4-4.5.5-typedefs-fix.patch
new file mode 100644
index 00000000000..6fb5714ad05
--- /dev/null
+++ b/kde-base/pykde4/files/pykde4-4.5.5-typedefs-fix.patch
@@ -0,0 +1,155 @@
+--- pykde4-4.5.5/python/pykde4/sip/kdecore/typedefs.sip~	2010-11-02 12:51:10.000000000 +0000
++++ pykde4-4.5.5/python/pykde4/sip/kdecore/typedefs.sip	2011-01-08 22:34:29.006096324 +0000
+@@ -582,90 +582,6 @@
+ %End
+ };
+ 
+-template <TYPE>
+-%MappedType QSet<TYPE>
+-{
+-%TypeHeaderCode
+-#include <qset.h>
+-%End
+-
+-%ConvertFromTypeCode
+-    // Create the list.
+-    PyObject *l;
+-
+-    if ((l = PyList_New(sipCpp->size())) == NULL)
+-        return NULL;
+-
+-    // Set the list elements.
+-    QSet<TYPE> set = *sipCpp;
+-    int i = 0;
+-    foreach (TYPE value, set)
+-    {
+-        PyObject *obj = sipConvertFromNewType(&value, sipType_TYPE, sipTransferObj);
+-        if (obj == NULL || PyList_SET_ITEM (l, i, obj) < 0)
+-        {
+-            Py_DECREF(l);
+-
+-            if (obj)
+-                Py_DECREF(obj);
+-
+-            return NULL;
+-        }
+-
+-        Py_DECREF(obj);
+-        i++;
+-    }
+-   
+-    return l;
+-%End
+-
+-%ConvertToTypeCode
+-    // Check the type if that is all that is required.
+-    if (sipIsErr == NULL)
+-    {
+-        if (!PyList_Check(sipPy))
+-            return 0;
+-    }
+-
+-    // Check the type if that is all that is required.
+-    if (sipIsErr == NULL)
+-    {
+-        if (!PyList_Check(sipPy))
+-            return 0;
+-
+-        for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i)
+-            if (!sipCanConvertToType(PyList_GET_ITEM (sipPy, i), sipType_TYPE, SIP_NOT_NONE))
+-                return 0;
+-    }
+-
+-    QSet<TYPE> *qs = new QSet<TYPE>;
+- 
+-    for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i)
+-    {
+-        int state;
+-
+-        TYPE *t = reinterpret_cast<TYPE *>(sipConvertToType(PyList_GET_ITEM (sipPy, i), sipType_TYPE, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr));
+- 
+-        if (*sipIsErr)
+-        {
+-            sipReleaseType(t, sipType_TYPE, state);
+-
+-            delete qs;
+-            return 0;
+-        }
+-
+-        *qs << *t;
+-
+-        sipReleaseType(t, sipType_TYPE, state);
+-    }
+- 
+-    *sipCppPtr = qs;
+- 
+-    return sipGetState(sipTransferObj);
+-%End
+-};
+-
+-
+ template <TYPE1,TYPE2>
+ %MappedType QPair<TYPE1,TYPE2>
+ {
+@@ -730,61 +646,6 @@
+  
+     return sipGetState(sipTransferObj);
+ %End
+-};
+-
+-
+-%MappedType QList<uint>
+-{
+-%TypeHeaderCode
+-#include <qlist.h>
+-%End
+-
+-%ConvertFromTypeCode
+-    // Create the list.
+-    PyObject *l;
+-
+-    if ((l = PyList_New(sipCpp->size())) == NULL)
+-        return NULL;
+-
+-    // Set the list elements.
+-    for (int i = 0; i < sipCpp->size(); ++i) {
+-        PyObject *pobj;
+-
+-#if PY_MAJOR_VERSION >= 3
+-        if ((pobj = PyLong_FromLong(sipCpp->value(i))) == NULL) {
+-#else
+-        if ((pobj = PyInt_FromLong(sipCpp->value(i))) == NULL) {
+-#endif
+-            Py_DECREF(l);
+-
+-            return NULL;
+-        }
+-
+-        PyList_SET_ITEM(l, i, pobj);
+-    }
+-
+-    return l;
+-%End
+-
+-%ConvertToTypeCode
+-    // Check the type if that is all that is required.
+-    if (sipIsErr == NULL)
+-        return PyList_Check(sipPy);
+-
+-    QList<uint> *ql = new QList<uint>;
+- 
+-    for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i) {
+-#if PY_MAJOR_VERSION >= 3
+-        ql->append(PyLong_AsLong(PyList_GET_ITEM(sipPy, i)));
+-#else
+-        ql->append(PyInt_AsLong(PyList_GET_ITEM(sipPy, i)));
+-#endif        
+-    }
+-    
+-    *sipCppPtr = ql;
+- 
+-    return sipGetState(sipTransferObj);
+-%End
+ };
+ 
+ 
diff --git a/kde-base/pykde4/pykde4-4.5.5.ebuild b/kde-base/pykde4/pykde4-4.5.5.ebuild
index f0a450fc5c0..d486dd79494 100644
--- a/kde-base/pykde4/pykde4-4.5.5.ebuild
+++ b/kde-base/pykde4/pykde4-4.5.5.ebuild
@@ -18,13 +18,16 @@ IUSE="debug doc examples semantic-desktop"
 # blocker added due to compatibility issues and error during compile time
 DEPEND="
 	!dev-python/pykde
+	>=dev-python/sip-4.12
 	$(add_kdebase_dep kdelibs 'opengl,semantic-desktop?')
 	semantic-desktop? ( $(add_kdebase_dep kdepimlibs 'semantic-desktop') )
-	aqua? ( >=dev-python/PyQt4-4.7[dbus,sql,svg,webkit,aqua] )
-	!aqua? ( >=dev-python/PyQt4-4.7[dbus,sql,svg,webkit,X] )
+	aqua? ( >=dev-python/PyQt4-4.8.2[dbus,sql,svg,webkit,aqua] )
+	!aqua? ( >=dev-python/PyQt4-4.8.2[dbus,sql,svg,webkit,X] )
 "
 RDEPEND="${DEPEND}"
 
+PATCHES=( "${FILESDIR}/${PN}-4.5.5-typedefs-fix.patch" )
+
 pkg_setup() {
 	python_pkg_setup
 	kde4-meta_pkg_setup
diff --git a/kde-base/pykde4/pykde4-4.5.95.ebuild b/kde-base/pykde4/pykde4-4.5.95.ebuild
index 466942b2140..17f79815b97 100644
--- a/kde-base/pykde4/pykde4-4.5.95.ebuild
+++ b/kde-base/pykde4/pykde4-4.5.95.ebuild
@@ -18,10 +18,11 @@ IUSE="debug doc examples semantic-desktop"
 # blocker added due to compatibility issues and error during compile time
 DEPEND="
 	!dev-python/pykde
+	>=dev-python/sip-4.12
 	$(add_kdebase_dep kdelibs 'opengl,semantic-desktop?')
 	semantic-desktop? ( $(add_kdebase_dep kdepimlibs 'semantic-desktop') )
-	aqua? ( >=dev-python/PyQt4-4.8[dbus,declarative,sql,svg,webkit,aqua] )
-	!aqua? ( >=dev-python/PyQt4-4.8[dbus,declarative,sql,svg,webkit,X] )
+	aqua? ( >=dev-python/PyQt4-4.8.2[dbus,declarative,sql,svg,webkit,aqua] )
+	!aqua? ( >=dev-python/PyQt4-4.8.2[dbus,declarative,sql,svg,webkit,X] )
 "
 RDEPEND="${DEPEND}"
 
diff --git a/kde-base/pykde4/pykde4-4.5.9999.ebuild b/kde-base/pykde4/pykde4-4.5.9999.ebuild
index bffeace6a65..079845b5f16 100644
--- a/kde-base/pykde4/pykde4-4.5.9999.ebuild
+++ b/kde-base/pykde4/pykde4-4.5.9999.ebuild
@@ -18,6 +18,7 @@ IUSE="debug doc examples semantic-desktop"
 # blocker added due to compatibility issues and error during compile time
 DEPEND="
 	!dev-python/pykde
+	>=dev-python/sip-4.12
 	$(add_kdebase_dep kdelibs 'opengl,semantic-desktop?')
 	semantic-desktop? ( $(add_kdebase_dep kdepimlibs 'semantic-desktop') )
 	aqua? ( >=dev-python/PyQt4-4.7[dbus,sql,svg,webkit,aqua] )
@@ -25,6 +26,8 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
+PATCHES=( "${FILESDIR}/${PN}-4.5.5-typedefs-fix.patch" )
+
 pkg_setup() {
 	python_pkg_setup
 	kde4-meta_pkg_setup
diff --git a/kde-base/pykde4/pykde4-4.6.9999.ebuild b/kde-base/pykde4/pykde4-4.6.9999.ebuild
index 6162be7caa7..04c6de414c0 100644
--- a/kde-base/pykde4/pykde4-4.6.9999.ebuild
+++ b/kde-base/pykde4/pykde4-4.6.9999.ebuild
@@ -18,10 +18,11 @@ IUSE="debug doc examples semantic-desktop"
 # blocker added due to compatibility issues and error during compile time
 DEPEND="
 	!dev-python/pykde
+	>=dev-python/sip-4.12
 	$(add_kdebase_dep kdelibs 'opengl,semantic-desktop?')
 	semantic-desktop? ( $(add_kdebase_dep kdepimlibs 'semantic-desktop') )
-	aqua? ( >=dev-python/PyQt4-4.8[dbus,declarative,sql,svg,webkit,aqua] )
-	!aqua? ( >=dev-python/PyQt4-4.8[dbus,declarative,sql,svg,webkit,X] )
+	aqua? ( >=dev-python/PyQt4-4.8.2[dbus,declarative,sql,svg,webkit,aqua] )
+	!aqua? ( >=dev-python/PyQt4-4.8.2[dbus,declarative,sql,svg,webkit,X] )
 "
 RDEPEND="${DEPEND}"
 
diff --git a/kde-base/rocs/Manifest b/kde-base/rocs/Manifest
index 6a796f9f9c2..6a53adb295c 100644
--- a/kde-base/rocs/Manifest
+++ b/kde-base/rocs/Manifest
@@ -4,7 +4,7 @@ AUX rocs-double-handbook.patch 667 RMD160 1ae333cb7862f5327b7a7ddbc9ac1fbdd9f376
 AUX rocs-double.patch 4851 RMD160 9197d9b07bcc3bad9ece9967e3de8d5481a5fece SHA1 170e1e7937564a591b794afb6d85d19cf586c0ff SHA256 4e96c399551964d72c24f41955afff3d3015d262807e8481e24218ebea6e97cb
 DIST kdeedu-4.5.5.tar.bz2 65714124 RMD160 98837a2944fe4f31f6b8c17dbe5a1b02b8a55bea SHA1 c43db1c4689b18b7eda12810f05d9d3ca12055c2 SHA256 a198ab25e6dcc432b35c0aeb71892f79c6975071bf9f098534953bd39fcbf129
 DIST kdeedu-4.5.95.tar.bz2 71533868 RMD160 57248b32444562774678f6e540353f6f67d0ba8f SHA1 0297672b936d2ad7b1e171ac4fbdcd75bca2f938 SHA256 2b8598f94ca2c00518c5e012a54fedcfed0c175604cd74b402e26ca8f0a03840
-EBUILD rocs-4.5.5.ebuild 524 RMD160 16cb2a667ca60fe45abd301c967fb8436d33adcb SHA1 7cc29e996f68d9ac0326e929e96c2b64f206fc75 SHA256 63623e3f3494113b859494b82104669ae5dc685bcf430aa4c8bba310d9b7117d
+EBUILD rocs-4.5.5.ebuild 519 RMD160 782bed495d531e59de62e031df8fbcd32f6f112c SHA1 b4e891eb41c579c3b6412187615f0bbf8cee7e91 SHA256 b4cae8d696e1f2ee74b7a438752575b403edfedfa59b67ba0cdfd127c8ae64aa
 EBUILD rocs-4.5.95.ebuild 329 RMD160 bdc9a9749de312ab7be95304b1a8370ea502cd40 SHA1 ef5363335510f8990dce94716ed7b8337d82c839 SHA256 08dd38fae2cf6d65b85ca14eccaa86cdc8634ffcc51f86e224a6111066eb8d95
 EBUILD rocs-4.5.9999.ebuild 477 RMD160 61ac8d4592d4be4b69ffceaf3897cfd640f79c13 SHA1 0300dadcad9e69a7ec95380532599db656c3c8a0 SHA256 1071f6691bf284c791a656ac823cb5b6b59dfd67a3f2758ef06ef929d86a33e1
 EBUILD rocs-4.6.9999.ebuild 318 RMD160 acc51253b020e4a0439fff5991248f493aeb509d SHA1 61742a685c75e2364729a22c0480147ccc01e0df SHA256 f69840039b61a1fdf27bc4962adfb53108ce24b517090f0a4a521602ce1d6139
diff --git a/kde-base/rocs/rocs-4.5.5.ebuild b/kde-base/rocs/rocs-4.5.5.ebuild
index 6673ceaa405..aaa1a282676 100644
--- a/kde-base/rocs/rocs-4.5.5.ebuild
+