security fix

15 files changed, 508 insertions, 77 deletions

diff --git a/kde-base/kdebase/ChangeLog b/kde-base/kdebase/ChangeLog
index ff7663f44e2d..7bcb66f141bf 100644
--- a/kde-base/kdebase/ChangeLog
+++ b/kde-base/kdebase/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kdebase
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/ChangeLog,v 1.70 2003/04/08 19:58:08 hannes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/ChangeLog,v 1.71 2003/04/11 00:31:56 hannes Exp $
+
+*kdebase-2.2.2-r5 (11 Apr 2003)
+
+  11 Apr 2003; Hannes Mehnert <hannes@gentoo.org> kdebase-2.2.2-r5.ebuild,
+  files/2.2.2-r5/startkde-2.2.2-r5-gentoo:
+  security fix
 
 *kdebase-3.0.5b (08 Apr 2003)
 
diff --git a/kde-base/kdebase/Manifest b/kde-base/kdebase/Manifest
new file mode 100644
index 000000000000..a5ffabf76bc4
--- /dev/null
+++ b/kde-base/kdebase/Manifest
@@ -0,0 +1,63 @@
+MD5 d86cf66c5b1ca9de93d2cdc98875c980 kdebase-3.1.1a.ebuild 3316
+MD5 6c4679fc125b4c86c3c513f8fd65e76d .#ChangeLog.1.29 6213
+MD5 97c3ee75d6a4fde7ac863fd664d4eb5f kdebase-3.1-r1.ebuild 3805
+MD5 8abae83002b281ed8245261bfafe8763 kdebase-3.0.5b.ebuild 8115
+MD5 a934d20eb160a4cb8a8edd4ebd387a64 kdebase-3.1.1-r1.ebuild 3418
+MD5 e5df5ef4b2369f3349fb61c6f567b230 kdebase-3.0.4-r3.ebuild 4489
+MD5 378cf74d42ba6d30ccd0b61c420b1b96 kdebase-3.1.1.ebuild 3315
+MD5 875689ec3da4657a1d152c30788871c8 kdebase-2.2.2-r5.ebuild 2943
+MD5 4616c3a5dac71294a65bd62b42550cc6 kdebase-3.1.ebuild 3320
+MD5 abbe2ac5e9c940d44fa2a15503f10e66 kdebase-3.0.5a.ebuild 4189
+MD5 8f91aa0f1542945024f378b4432a8e33 ChangeLog 13050
+MD5 34e832659ad20dad4378fe1dbd192f17 kdebase-3.0.5a-r2.ebuild 8502
+MD5 875689ec3da4657a1d152c30788871c8 kdebase-2.2.2-r4.ebuild 2943
+MD5 d06aabcc5fd1c39bc732b7571318d5d2 files/digest-kdebase-3.0.5a 69
+MD5 c07ead342cf5e19907a9ba978d713d80 files/digest-kdebase-3.0.5b 69
+MD5 1c511caae066d700eabea2058d8caae3 files/digest-kdebase-3.1.1a 136
+MD5 94f7c5a331319b84b9a54094c2e6641e files/digest-kdebase-3.1-r1 66
+MD5 b048371a651391ef2bb4166e40e6adff files/kde.pam 405
+MD5 d06aabcc5fd1c39bc732b7571318d5d2 files/digest-kdebase-3.0.5a-r2 69
+MD5 6eb40b28a36f889d0f1919cdbf160ef7 files/kscreensaver.pam 79
+MD5 4b4d530bf8e05f89991d2161242da3f2 files/digest-kdebase-3.0.4-r3 68
+MD5 7a40dbe0a3460fa95aa08d1a6df1af8a files/digest-kdebase-3.1.1-r1 68
+MD5 79fc6f0cd8a9dfcaf9acec89c1e53685 files/digest-kdebase-2.2.2-r4 135
+MD5 63e277899292d5e8e765367ab6f4234c files/digest-kdebase-2.2.2-r5 210
+MD5 7a40dbe0a3460fa95aa08d1a6df1af8a files/digest-kdebase-3.1.1 68
+MD5 94f7c5a331319b84b9a54094c2e6641e files/digest-kdebase-3.1 66
+MD5 7db6d7353b1bfbb47d44e9df63be1410 files/3.1/kdmrc 17661
+MD5 a500709e4a41d613bd4a59bcc7d9a11c files/3.1/startkde-3.1-gentoo.diff 1848
+MD5 2f1f31f38b93136baeb537500c8cfabc files/3.1/backgroundrc 342
+MD5 7db6d7353b1bfbb47d44e9df63be1410 files/3.1.1/kdmrc 17661
+MD5 2f1f31f38b93136baeb537500c8cfabc files/3.1.1/backgroundrc 342
+MD5 f12f03b607574596c17507007591b61b files/3.1.1/startkde-3.1.1-gentoo.diff 1879
+MD5 41d954f907dd2ba220ebca498e7f1735 files/3.0.4-r3/kdebase-3.0.4-konsole-qt31.diff 611
+MD5 5a8c948b28b4558217ee06a9ea0c0305 files/3.0.4-r3/startkde-3.0.4-r3-gentoo.diff 1605
+MD5 b0dd1d862909571ddd17ea58bf3925d4 files/3.0.4-r3/kdebase-3.0.4-nspluginviewer-qt31.diff.gz 13733
+MD5 54c424a5920645360378aa5f494d35b2 files/3.0.4-r3/kdebase-3.0.4-xft1.1-fix.diff 3129
+MD5 867ead4d7b68109c1437e1b96eb26342 files/3.0.4-r3/kdebase-3.0.4-xft_h-fix.diff 214
+MD5 a4c64296993987d930fb938a3902b51b files/3.1.1-r1/kdebase-3.1.1-kdm.diff 5975
+MD5 f12f03b607574596c17507007591b61b files/3.1.1-r1/startkde-3.1.1-r1-gentoo.diff 1879
+MD5 7db6d7353b1bfbb47d44e9df63be1410 files/3.1.1-r1/kdmrc 17661
+MD5 2f1f31f38b93136baeb537500c8cfabc files/3.1.1-r1/backgroundrc 342
+MD5 7814212b71b6d5ef8a1fb4042d9d9edc files/3.1.1-r1/kdebase-3.1.1-minicli.diff 772
+MD5 4653ca8833aa10adb3a4d2fe0afa1863 files/2.2.2-r4/startkde-2.2.2-r4-gentoo 4010
+MD5 4653ca8833aa10adb3a4d2fe0afa1863 files/2.2.2-r5/startkde-2.2.2-r5-gentoo 4010
+MD5 91f01b28ae245f6af19ea53cb5586101 files/3.0.5a-r2/kdebase-3.0.5a-nspluginviewer-qt31.diff.gz 36346
+MD5 290aae1d211e55fcc2e6aa54859eb342 files/3.0.5a-r2/kdebase-3.0.5a-xft2.0-fix.diff 4745
+MD5 836a4045534a443437eea7506a7fa3f7 files/3.0.5a-r2/startkde-3.0.5a-r2-gentoo.diff 1641
+MD5 867ead4d7b68109c1437e1b96eb26342 files/3.0.5a-r2/kdebase-3.0.5a-xft_h-fix.diff 214
+MD5 91f01b28ae245f6af19ea53cb5586101 files/3.0.5a/kdebase-3.0.5a-nspluginviewer-qt31.diff.gz 36346
+MD5 54c424a5920645360378aa5f494d35b2 files/3.0.5a/kdebase-3.0.5a-xft1.1-fix.diff 3129
+MD5 867ead4d7b68109c1437e1b96eb26342 files/3.0.5a/kdebase-3.0.5a-xft_h-fix.diff 214
+MD5 32feb8257a8724e235935b111fa98a94 files/3.0.5a/startkde-3.0.5a-gentoo.diff 1608
+MD5 91f01b28ae245f6af19ea53cb5586101 files/3.0.5b/kdebase-3.0.5b-nspluginviewer-qt31.diff.gz 36346
+MD5 836a4045534a443437eea7506a7fa3f7 files/3.0.5b/startkde-3.0.5b-gentoo.diff 1641
+MD5 867ead4d7b68109c1437e1b96eb26342 files/3.0.5b/kdebase-3.0.5b-xft_h-fix.diff 214
+MD5 290aae1d211e55fcc2e6aa54859eb342 files/3.0.5b/kdebase-3.0.5b-xft2.0-fix.diff 4745
+MD5 7db6d7353b1bfbb47d44e9df63be1410 files/3.1.1a/kdmrc 17661
+MD5 2f1f31f38b93136baeb537500c8cfabc files/3.1.1a/backgroundrc 342
+MD5 f12f03b607574596c17507007591b61b files/3.1.1a/startkde-3.1.1a-gentoo.diff 1879
+MD5 7db6d7353b1bfbb47d44e9df63be1410 files/3.1-r1/kdmrc 17661
+MD5 2f1f31f38b93136baeb537500c8cfabc files/3.1-r1/backgroundrc 342
+MD5 4c83f4f577a2cbcf7021fef0f2482fcc files/3.1-r1/startkde-3.1-r1-gentoo.diff 1901
+MD5 e5929c2c92c147f160b824c6fed8b573 files/3.1-r1/kdebase-3.1-kpager.diff 521
diff --git a/kde-base/kdebase/files/2.2.2-r5/startkde-2.2.2-r5-gentoo b/kde-base/kdebase/files/2.2.2-r5/startkde-2.2.2-r5-gentoo
new file mode 100644
index 000000000000..3028aebbd49f
--- /dev/null
+++ b/kde-base/kdebase/files/2.2.2-r5/startkde-2.2.2-r5-gentoo
@@ -0,0 +1,126 @@
+#!/bin/bash --login
+export KDEDIR="_KDEDIR_"
+export KDEDIRS="_KDEDIR_:${KDEDIRS}"
+export PATH="_KDEDIR_/bin:${PATH}"
+rm -rf ~/.kde
+ln -fs ~/.kde2 ~/.kde
+[ -e "~/.kde2" ] || mkdir ~/.kde2
+####################################################
+# DEFAULT GENTOO KDE STARTUP SCRIPT ( KDE-2.2.2 ) ##
+####################################################
+
+#################################
+#Initial cleanup of old sessions#
+#################################
+real_display=`echo $DISPLAY | sed "s/://" | sed "s/\..*//"`
+rm -f ~/.DCOPserver-`/bin/hostname`_$DISPLAY
+
+#####################################
+#Check for space on /tmp and "$HOME"#
+#If not, abort startup		    #
+#####################################
+space_tmp=`df /tmp | xargs | cut -d" " -f11`
+space_home=`df "$HOME" | xargs | cut -d" " -f11`
+
+if [ $space_tmp -lt 50 ]; then
+    echo $"Not enough free disk space on /tmp"
+    exit 1
+fi
+
+if [ $space_home -lt 25 ]; then
+    echo $"Not enough free disk space on "$HOME""
+    exit 1
+fi
+
+############################################
+#Check for write access on /tmp and "$HOME"#
+#If not, abort startup              	   #
+############################################
+testfile_tmp=`mktemp /tmp/KDE.startkde.XXXXXX`
+testfile_home=`mktemp "$HOME"/KDE.startkde.XXXXXX`
+
+if ! echo TEST_TEXT >$testfile_tmp 2>/dev/null ; then
+    echo $"You don't have write permissions for /tmp"
+    exit 1
+fi
+rm -f $testfile_tmp
+
+if ! echo TEST_TEXT >$testfile_home 2>/dev/null ; then
+     echo $"You don't have write permissions for "$HOME""
+     exit 1
+fi
+rm -f $testfile_home
+
+##########################
+#Set Background and stuff#
+##########################
+xsetroot -cursor_name left_ptr -solid '#5477A0'
+
+#####################
+#Set the KDE Home...#
+####################
+kdehome=$HOME/.kde
+test -n "$KDEHOME" && kdehome=$KDEHOME
+
+###########################
+#Activate Font Directories#
+###########################
+usr_odir=$kdehome/share/fonts/override
+usr_fdir=$kdehome/share/fonts
+if test -n "$KDEDIRS"; then
+  kdedirs_first=`echo $KDEDIRS|sed -e 's/:.*//'`
+  sys_odir=$kdedirs_first/share/fonts/override
+  sys_fdir=$kdedirs_first/share/fonts
+else
+  sys_odir=$KDEDIR/share/fonts/override
+  sys_fdir=$KDEDIR/share/fonts
+fi
+
+########################################################
+#Check for newly installed fonts, if we have permission#
+########################################################
+
+test -d $usr_odir && (mkfontdir $usr_odir ; xset +fp $usr_odir)
+test -d $sys_odir && xset +fp $sys_odir
+test -d $usr_fdir && (mkfontdir $usr_fdir ; xset fp+ $usr_fdir)
+test -d $sys_fdir && xset fp+ $sys_fdir
+
+####################################
+# Ask X11 to rebuild its font list.#
+####################################
+xset fp rehash
+
+##################################################################
+#Link "tmp" resource to directory in /tmp                        #
+#Create a dir /tmp/kde-$USER, links $KDEHOME/tmp-$HOSTNAME to it.#
+##################################################################
+lnusertemp tmp >/dev/null
+
+########################################################################
+#Link "socket" resource to directory in /tmp                           #
+#Create a dir /tmp/ksocket-$USER, links $KDEHOME/socket-$HOSTNAME to it#
+########################################################################
+lnusertemp socket >/dev/null
+
+########################
+#Start the splashscreen#
+########################
+ksplash
+
+###########################################################
+#Set LD_BIND_NOW to increase the efficiency of kdeinit.   #
+#kdeinit unsets this variable before loading applications.#
+###########################################################
+# turn it off, it creates aa trouble
+#LD_BIND_NOW=true kdeinit +kcminit +knotify
+kdeinit +kcminit +knotify
+
+###########################################################
+# finally, give the session control to the session manager#
+###########################################################
+ksmserver --restore
+
+##########
+#Clean up#
+##########
+kdeinit_shutdown
diff --git a/kde-base/kdebase/files/digest-kdebase-2.2.2-r5 b/kde-base/kdebase/files/digest-kdebase-2.2.2-r5
new file mode 100644
index 000000000000..e2c51e5f5a71
--- /dev/null
+++ b/kde-base/kdebase/files/digest-kdebase-2.2.2-r5
@@ -0,0 +1,3 @@
+MD5 39635e42056ab2afb8e6f2ff761eea38 kdebase-2.2.2.tar.bz2 12888455
+MD5 522331e2b47f84956eb2df1fcf89ba17 post-2.2.2-kdebase.diff 18908
+MD5 002e297cb41705f9b744f6cc64e9d79e post-2.2.2-kdebase-thumbnail.diff 485
diff --git a/kde-base/kdebase/files/digest-kdebase-3.0.5b b/kde-base/kdebase/files/digest-kdebase-3.0.5b
index c16e78e26298..e33d9c3a88a0 100644
--- a/kde-base/kdebase/files/digest-kdebase-3.0.5b
+++ b/kde-base/kdebase/files/digest-kdebase-3.0.5b
@@ -1,40 +1 @@
-MD5 b048371a651391ef2bb4166e40e6adff /files/kde.pam 405
-MD5 6eb40b28a36f889d0f1919cdbf160ef7 /files/kscreensaver.pam 79
-MD5 7db6d7353b1bfbb47d44e9df63be1410 /files/3.1/kdmrc 17661
-MD5 a500709e4a41d613bd4a59bcc7d9a11c /files/3.1/startkde-3.1-gentoo.diff 1848
-MD5 2f1f31f38b93136baeb537500c8cfabc /files/3.1/backgroundrc 342
-MD5 7db6d7353b1bfbb47d44e9df63be1410 /files/3.1.1/kdmrc 17661
-MD5 2f1f31f38b93136baeb537500c8cfabc /files/3.1.1/backgroundrc 342
-MD5 f12f03b607574596c17507007591b61b /files/3.1.1/startkde-3.1.1-gentoo.diff 1879
-MD5 41d954f907dd2ba220ebca498e7f1735 /files/3.0.4-r3/kdebase-3.0.4-konsole-qt31.diff 611
-MD5 5a8c948b28b4558217ee06a9ea0c0305 /files/3.0.4-r3/startkde-3.0.4-r3-gentoo.diff 1605
-MD5 b0dd1d862909571ddd17ea58bf3925d4 /files/3.0.4-r3/kdebase-3.0.4-nspluginviewer-qt31.diff.gz 13733
-MD5 54c424a5920645360378aa5f494d35b2 /files/3.0.4-r3/kdebase-3.0.4-xft1.1-fix.diff 3129
-MD5 867ead4d7b68109c1437e1b96eb26342 /files/3.0.4-r3/kdebase-3.0.4-xft_h-fix.diff 214
-MD5 a4c64296993987d930fb938a3902b51b /files/3.1.1-r1/kdebase-3.1.1-kdm.diff 5975
-MD5 f12f03b607574596c17507007591b61b /files/3.1.1-r1/startkde-3.1.1-r1-gentoo.diff 1879
-MD5 7db6d7353b1bfbb47d44e9df63be1410 /files/3.1.1-r1/kdmrc 17661
-MD5 2f1f31f38b93136baeb537500c8cfabc /files/3.1.1-r1/backgroundrc 342
-MD5 7814212b71b6d5ef8a1fb4042d9d9edc /files/3.1.1-r1/kdebase-3.1.1-minicli.diff 772
-MD5 4653ca8833aa10adb3a4d2fe0afa1863 /files/2.2.2-r4/startkde-2.2.2-r4-gentoo 4010
-MD5 91f01b28ae245f6af19ea53cb5586101 /files/3.0.5a-r2/kdebase-3.0.5a-nspluginviewer-qt31.diff.gz 36346
-MD5 290aae1d211e55fcc2e6aa54859eb342 /files/3.0.5a-r2/kdebase-3.0.5a-xft2.0-fix.diff 4745
-MD5 836a4045534a443437eea7506a7fa3f7 /files/3.0.5a-r2/startkde-3.0.5a-r2-gentoo.diff 1641
-MD5 867ead4d7b68109c1437e1b96eb26342 /files/3.0.5a-r2/kdebase-3.0.5a-xft_h-fix.diff 214
-MD5 91f01b28ae245f6af19ea53cb5586101 /files/3.0.5a/kdebase-3.0.5a-nspluginviewer-qt31.diff.gz 36346
-MD5 54c424a5920645360378aa5f494d35b2 /files/3.0.5a/kdebase-3.0.5a-xft1.1-fix.diff 3129
-MD5 867ead4d7b68109c1437e1b96eb26342 /files/3.0.5a/kdebase-3.0.5a-xft_h-fix.diff 214
-MD5 32feb8257a8724e235935b111fa98a94 /files/3.0.5a/startkde-3.0.5a-gentoo.diff 1608
-MD5 91f01b28ae245f6af19ea53cb5586101 /files/3.0.5b/kdebase-3.0.5b-nspluginviewer-qt31.diff.gz 36346
-MD5 836a4045534a443437eea7506a7fa3f7 /files/3.0.5b/startkde-3.0.5b-gentoo.diff 1641
-MD5 867ead4d7b68109c1437e1b96eb26342 /files/3.0.5b/kdebase-3.0.5b-xft_h-fix.diff 214
-MD5 290aae1d211e55fcc2e6aa54859eb342 /files/3.0.5b/kdebase-3.0.5b-xft2.0-fix.diff 4745
-MD5 7db6d7353b1bfbb47d44e9df63be1410 /files/3.1.1a/kdmrc 17661
-MD5 2f1f31f38b93136baeb537500c8cfabc /files/3.1.1a/backgroundrc 342
-MD5 f12f03b607574596c17507007591b61b /files/3.1.1a/startkde-3.1.1a-gentoo.diff 1879
-MD5 7db6d7353b1bfbb47d44e9df63be1410 /files/3.1-r1/kdmrc 17661
-MD5 2f1f31f38b93136baeb537500c8cfabc /files/3.1-r1/backgroundrc 342
-MD5 4c83f4f577a2cbcf7021fef0f2482fcc /files/3.1-r1/startkde-3.1-r1-gentoo.diff 1901
-MD5 e5929c2c92c147f160b824c6fed8b573 /files/3.1-r1/kdebase-3.1-kpager.diff 521
-MD5 1d04f688f8cd72ea053ddc1754d88362 /kdebase-3.0.5b.ebuild 8116
 MD5 608f457dd8157c69bf855092e516afa2 kdebase-3.0.5b.tar.bz2 13116446
diff --git a/kde-base/kdebase/files/digest-kdebase-3.1.1a b/kde-base/kdebase/files/digest-kdebase-3.1.1a
index 7c5827ad68f1..c3a535ff038a 100644
--- a/kde-base/kdebase/files/digest-kdebase-3.1.1a
+++ b/kde-base/kdebase/files/digest-kdebase-3.1.1a
@@ -1,37 +1,2 @@
-MD5 b048371a651391ef2bb4166e40e6adff /files/kde.pam 405
-MD5 6eb40b28a36f889d0f1919cdbf160ef7 /files/kscreensaver.pam 79
-MD5 7db6d7353b1bfbb47d44e9df63be1410 /files/3.1/kdmrc 17661
-MD5 a500709e4a41d613bd4a59bcc7d9a11c /files/3.1/startkde-3.1-gentoo.diff 1848
-MD5 2f1f31f38b93136baeb537500c8cfabc /files/3.1/backgroundrc 342
-MD5 7db6d7353b1bfbb47d44e9df63be1410 /files/3.1.1/kdmrc 17661
-MD5 2f1f31f38b93136baeb537500c8cfabc /files/3.1.1/backgroundrc 342
-MD5 f12f03b607574596c17507007591b61b /files/3.1.1/startkde-3.1.1-gentoo.diff 1879
-MD5 41d954f907dd2ba220ebca498e7f1735 /files/3.0.4-r3/kdebase-3.0.4-konsole-qt31.diff 611
-MD5 5a8c948b28b4558217ee06a9ea0c0305 /files/3.0.4-r3/startkde-3.0.4-r3-gentoo.diff 1605
-MD5 b0dd1d862909571ddd17ea58bf3925d4 /files/3.0.4-r3/kdebase-3.0.4-nspluginviewer-qt31.diff.gz 13733
-MD5 54c424a5920645360378aa5f494d35b2 /files/3.0.4-r3/kdebase-3.0.4-xft1.1-fix.diff 3129
-MD5 867ead4d7b68109c1437e1b96eb26342 /files/3.0.4-r3/kdebase-3.0.4-xft_h-fix.diff 214
-MD5 a4c64296993987d930fb938a3902b51b /files/3.1.1-r1/kdebase-3.1.1-kdm.diff 5975
-MD5 f12f03b607574596c17507007591b61b /files/3.1.1-r1/startkde-3.1.1-r1-gentoo.diff 1879
-MD5 7db6d7353b1bfbb47d44e9df63be1410 /files/3.1.1-r1/kdmrc 17661
-MD5 2f1f31f38b93136baeb537500c8cfabc /files/3.1.1-r1/backgroundrc 342
-MD5 7814212b71b6d5ef8a1fb4042d9d9edc /files/3.1.1-r1/kdebase-3.1.1-minicli.diff 772
-MD5 4653ca8833aa10adb3a4d2fe0afa1863 /files/2.2.2-r4/startkde-2.2.2-r4-gentoo 4010
-MD5 91f01b28ae245f6af19ea53cb5586101 /files/3.0.5a-r2/kdebase-3.0.5a-nspluginviewer-qt31.diff.gz 36346
-MD5 290aae1d211e55fcc2e6aa54859eb342 /files/3.0.5a-r2/kdebase-3.0.5a-xft2.0-fix.diff 4745
-MD5 836a4045534a443437eea7506a7fa3f7 /files/3.0.5a-r2/startkde-3.0.5a-r2-gentoo.diff 1641
-MD5 867ead4d7b68109c1437e1b96eb26342 /files/3.0.5a-r2/kdebase-3.0.5a-xft_h-fix.diff 214
-MD5 91f01b28ae245f6af19ea53cb5586101 /files/3.0.5a/kdebase-3.0.5a-nspluginviewer-qt31.diff.gz 36346
-MD5 54c424a5920645360378aa5f494d35b2 /files/3.0.5a/kdebase-3.0.5a-xft1.1-fix.diff 3129
-MD5 867ead4d7b68109c1437e1b96eb26342 /files/3.0.5a/kdebase-3.0.5a-xft_h-fix.diff 214
-MD5 32feb8257a8724e235935b111fa98a94 /files/3.0.5a/startkde-3.0.5a-gentoo.diff 1608
-MD5 7db6d7353b1bfbb47d44e9df63be1410 /files/3.1.1a/kdmrc 17661
-MD5 2f1f31f38b93136baeb537500c8cfabc /files/3.1.1a/backgroundrc 342
-MD5 f12f03b607574596c17507007591b61b /files/3.1.1a/startkde-3.1.1a-gentoo.diff 1879
-MD5 7db6d7353b1bfbb47d44e9df63be1410 /files/3.1-r1/kdmrc 17661
-MD5 2f1f31f38b93136baeb537500c8cfabc /files/3.1-r1/backgroundrc 342
-MD5 4c83f4f577a2cbcf7021fef0f2482fcc /files/3.1-r1/startkde-3.1-r1-gentoo.diff 1901
-MD5 e5929c2c92c147f160b824c6fed8b573 /files/3.1-r1/kdebase-3.1-kpager.diff 521
-MD5 d86cf66c5b1ca9de93d2cdc98875c980 /kdebase-3.1.1a.ebuild 3316
 MD5 4d84dd6a0f00d84850f2765766c6b780 kdebase-3.1.1a.diff.bz2 383898
 MD5 f360add935d13be629b43a2a280b759f kdebase-3.1.1.tar.bz2 14917696
diff --git a/kde-base/kdebase/kdebase-2.2.2-r5.ebuild b/kde-base/kdebase/kdebase-2.2.2-r5.ebuild
new file mode 100644
index 000000000000..1b2c40816f1a
--- /dev/null
+++ b/kde-base/kdebase/kdebase-2.2.2-r5.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-2.2.2-r5.ebuild,v 1.1 2003/04/11 00:31:56 hannes Exp $
+
+IUSE="ssl motif ldap encode cups oggvorbis pam"
+inherit kde-dist eutils
+
+DESCRIPTION="KDE $PV - base packages: the desktop, panel, window manager, konqueror..."
+
+KEYWORDS="x86 sparc"
+
+SRC_URI="${SRC_URI}
+	mirror://kde/security_patches/post-${PV}-${PN}.diff
+	mirror://kde/security_patches/post-${PV}-${PN}-thumbnail.diff"
+
+export MAKEOPTS="${MAKEOPTS} -j1"
+
+newdepend ">=media-sound/cdparanoia-3.9.8
+	ldap? ( >=net-nds/openldap-1.2 )
+	pam? ( >=sys-libs/pam-0.73 )
+	motif? ( >=x11-libs/openmotif-2.1.30 )
+	encode? ( >=media-sound/lame-3.89b )
+	oggvorbis? ( >=media-libs/libvorbis-1.0_beta1 )
+	cups? ( net-print/cups )
+	ssl? ( >=dev-libs/openssl-0.9.6b )
+	media-libs/lcms"
+#	opengl? ( virtual/opengl )" #this last for opengl screensavers
+#	samba? ( net-fs/samba ) #use flag doesn't exist yet and we don't want such a heavy dep by deafult
+#	lm_sensors? ( ?/lm_sensors ) # ebuild doesn't exist yet
+
+src_unpack() {
+	unpack ${P}.tar.bz2
+	cd ${S}
+	epatch ${DISTDIR}/post-${PV}-${PN}.diff
+	cd ${S}/kioslave/thumbnail
+	epatch ${DISTDIR}/post-${PV}-${PN}-thumbnail.diff
+	kde_sandbox_patch ${S}/konsole/src
+}
+
+src_compile() {
+
+	kde_src_compile myconf
+
+	use ldap	&& myconf="$myconf --with-ldap" || myconf="$myconf --without-ldap"
+	use pam	&& myconf="$myconf --with-pam"	|| myconf="$myconf --with-shadow"
+	use motif					|| myconf="$myconf --without-motif"
+	use encode					|| myconf="$myconf --without-lame"
+	use cups					|| myconf="$myconf --disable-cups"
+	use oggvorbis				|| myconf="$myconf --without-vorbis"
+	#use opengl					||
+	myconf="$myconf --without-gl"
+	use ssl					|| myconf="$myconf --without-ssl"
+
+	kde_src_compile configure make
+}
+
+
+src_install() {
+
+	kde_src_install
+
+	insinto /etc/pam.d
+	newins ${FILESDIR}/kscreensaver.pam kscreensaver
+	newins kde.pamd kde
+
+	cd ${D}/${KDEDIR}/bin
+	rm -f ./startkde
+	sed -e "s:_KDEDIR_:${KDEDIR}:" ${FILESDIR}/${PVR}/startkde-${PVR}-gentoo > startkde
+	chmod a+x startkde
+
+	# x11 session script
+	cd ${T}
+	echo "#!/bin/sh
+${KDEDIR}/bin/startkde" > kde-${PV}
+	chmod a+x kde-${PV}
+	# old scheme - compatibility
+	exeinto /usr/X11R6/bin/wm
+	doexe kde-${PV}
+	# new scheme - for now >=xfree-4.2-r3 only
+	exeinto /etc/X11/Sessions
+	doexe kde-${PV}
+
+	cd ${D}/${KDEDIR}/share/config/kdm
+	mv kdmrc kdmrc.orig
+	sed -e 's/SessionTypes=/SessionTypes=kde-2.2.2,kde-3.0,xsession,/' kdmrc.orig | cat > kdmrc
+	rm kdmrc.orig
+
+	rm -rf ${D}/${KDEDIR}/share/templates/.source/emptydir
+}
+
+pkg_postinst() {
+	# an empty dir that would otherwise be unmerged with the previous instance
+	# dodir ${KDEDIR}/share/templates/.source/emptydir
+	# temorary fix (bug #846) until portage tracks merged dirs' mtimes
+	addwrite ${KDEDIR}/share/templates/.source
+	mkdir -p ${KDEDIR}/share/templates/.source/emptydir
+}
diff --git a/kde-base/kdegraphics/ChangeLog b/kde-base/kdegraphics/ChangeLog
index 111330277077..bd365198eb91 100644
--- a/kde-base/kdegraphics/ChangeLog
+++ b/kde-base/kdegraphics/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/kdegraphics
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegraphics/ChangeLog,v 1.38 2003/04/08 19:58:08 hannes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegraphics/ChangeLog,v 1.39 2003/04/11 00:35:01 hannes Exp $
+
+*kdegraphics-2.2.2-r2 (11 Apr 2003)
+
+  11 Apr 2003; Hannes Mehnert <hannes@gentoo.org> kdegraphics-2.2.2-r2.ebuild:
+  security fix
 
 *kdegraphics-3.0.5b (08 Apr 2003)
 
diff --git a/kde-base/kdegraphics/Manifest b/kde-base/kdegraphics/Manifest
new file mode 100644
index 000000000000..90eda2dbe561
--- /dev/null
+++ b/kde-base/kdegraphics/Manifest
@@ -0,0 +1,22 @@
+MD5 1fa50fd07cf69c0d792661275198272e kdegraphics-2.2.2-r2.ebuild 1277
+MD5 00374f28dd7cc19ffa46d0fed9a70a8d kdegraphics-3.1.1.ebuild 1198
+MD5 71a0d50a8e90630112f13687f0f4d1cb kdegraphics-3.1.ebuild 1196
+MD5 429c7f1d7a9e4cf91db6a633087eb160 kdegraphics-3.1.1a.ebuild 1200
+MD5 2f40b2ab1abb0358f49bdee8b1a0f4e1 kdegraphics-3.0.5b.ebuild 1505
+MD5 cfe322b5d0f420db651305ea3cc9cfc9 kdegraphics-2.2.2-r1.ebuild 1019
+MD5 001f7efb816a49f2e9651f8e3e1f2fb1 kdegraphics-3.0.4.ebuild 1490
+MD5 2dc3fc8a6af18d0524193c2fced55a95 ChangeLog 5581
+MD5 2d1fa12b97c9ec4a7d3000f598f95a75 .#kdegraphics-3.1.ebuild.1.3 1136
+MD5 b3f1fb8b67a5fdac84127f754bb42b12 kdegraphics-3.0.5a.ebuild 1504
+MD5 994f2eb077cf2e821a8477b918ee40b2 files/kdegraphics-3.0.4-kghostviewrc 335
+MD5 34693477929f801abd54b37a58efa7f0 files/digest-kdegraphics-3.0.4 71
+MD5 63149da878e9e69a3ddfbe1eb56ed03b files/digest-kdegraphics-3.1.1 71
+MD5 7529309378c3a5c51c9fa77374ecb9dc files/digest-kdegraphics-3.0.5a 72
+MD5 d87c27a43c42b5642c411eb8b55b9f31 files/digest-kdegraphics-3.0.5b 458
+MD5 ce0e61cda913cd6d68f8d806819279b8 files/digest-kdegraphics-3.1.1a 448
+MD5 d5bbeb3731063072794323e195a7a99d files/digest-kdegraphics-2.2.2-r1 141
+MD5 e7cc7d6e6591c7dfdc7c247d5a436549 files/digest-kdegraphics-2.2.2-r2 299
+MD5 4a423927953d09de2c598aac97f088e2 files/digest-kdegraphics-3.1 69
+MD5 8e79f1d4682e90f425f1280578625492 files/kdegraphics-2.2.2-gentoo.diff 472
+MD5 994f2eb077cf2e821a8477b918ee40b2 files/kdegraphics-3.0.5b-kghostviewrc 335
+MD5 994f2eb077cf2e821a8477b918ee40b2 files/kdegraphics-3.0.5a-kghostviewrc 335
diff --git a/kde-base/kdegraphics/files/digest-kdegraphics-2.2.2-r2 b/kde-base/kdegraphics/files/digest-kdegraphics-2.2.2-r2
new file mode 100644
index 000000000000..d1a9773808fa
--- /dev/null
+++ b/kde-base/kdegraphics/files/digest-kdegraphics-2.2.2-r2
@@ -0,0 +1,4 @@
+MD5 b9341505c6b9de8f018dd9d1896356e9 kdegraphics-2.2.2.tar.bz2 1648936
+MD5 4b9c93acd452d1de2f4f0bca5b05593f post-2.2.2-kdegraphics.diff 9397
+MD5 1e7520b590e6573446487efb3995d8a3 post-2.2.2-kdegraphics-kghostview-2.diff 4492
+MD5 a0a87a2f7617e83c831d1a9c2588830e post-2.2.2-kdegraphics-kdvi.diff 3786
diff --git a/kde-base/kdegraphics/kdegraphics-2.2.2-r2.ebuild b/kde-base/kdegraphics/kdegraphics-2.2.2-r2.ebuild
new file mode 100644
index 000000000000..1887d6bcfb9b
--- /dev/null
+++ b/kde-base/kdegraphics/kdegraphics-2.2.2-r2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegraphics/kdegraphics-2.2.2-r2.ebuild,v 1.1 2003/04/11 00:35:01 hannes Exp $
+inherit kde-dist eutils
+
+IUSE="tetex gphoto2"
+DESCRIPTION="KDE $PV - graphics-related apps"
+KEYWORDS="x86 sparc "
+DEPEND="$DEPEND dev-lang/perl
+	media-gfx/sane-backends
+	tetex? ( >=app-text/tetex-1.0.7 )"
+
+newdepend "gphoto2? ( >=media-gfx/gphoto2-2.0_beta1 )"
+
+SRC_URI="${SRC_URI}
+	mirror://kde/security_patches/post-${PV}-${PN}.diff
+	mirror://kde/security_patches/post-${PV}-${PN}-kghostview-2.diff
+	mirror://kde/security_patches/post-${PV}-${PN}-kdvi.diff"
+
+src_unpack() {
+	unpack ${P}.tar.bz2
+	cd ${S}
+	epatch ${DISTDIR}/post-${PV}-${PN}.diff
+	epatch ${FILESDIR}/${P}-gentoo.diff
+	cd ${S}/kghostview
+	epatch ${DISTDIR}/post-${PV}-${PN}-kghostview-2.diff
+	cd ${S}/kdvi
+	epatch ${DISTDIR}/post-${PV}-${PN}-kdvi.diff
+}
+
+src_compile() {
+	kde_src_compile myconf
+
+	use gphoto2 && myconf="$myconf --with-gphoto2-includes=/usr/include/gphoto2 --with-gphoto2-libraries=/usr/lib/gphoto2" || myconf="$myconf --without-kamera"
+	use tetex && myconf="$myconf --with-system-kpathsea --with-tex-datadir=/usr/share"
+	kde_src_compile configure make
+}
diff --git a/kde-base/kdelibs/ChangeLog b/kde-base/kdelibs/ChangeLog
index 836768b058ff..12f75f342046 100644
--- a/kde-base/kdelibs/ChangeLog
+++ b/kde-base/kdelibs/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/kdelibs
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.72 2003/04/08 19:58:08 hannes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.73 2003/04/11 00:30:17 hannes Exp $
+
+*kdelibs-2.2.2a-r2 (11 Apr 2003)
+
+  11 Apr 2003; Hannes Mehnert <hannes@gentoo.org> kdelibs-2.2.2a-r2.ebuild:
+  security fix
 
 *kdelibs-3.0.5b (08 Apr 2003)
 
diff --git a/kde-base/kdelibs/Manifest b/kde-base/kdelibs/Manifest
new file mode 100644
index 000000000000..9260a87208ca
--- /dev/null
+++ b/kde-base/kdelibs/Manifest
@@ -0,0 +1,41 @@
+MD5 130147a46552f9f285746dce30a7ad1e kdelibs-3.1.ebuild 2227
+MD5 7db2b1da82acddc5d035b65b603a75d7 kdelibs-3.1-r2.ebuild 2893
+MD5 1ca83214282308c646fc459be393edb0 kdelibs-2.2.2a-r1.ebuild 2359
+MD5 3b0f0a331b55c353e8f081c08ada9557 kdelibs-3.0.4-r1.ebuild 2294
+MD5 ce7978a012d0358df342c9286b4ce08e .#kdelibs-3.1.ebuild.1.11 2049
+MD5 6d7ef21b5c69861561d1d3a418a4f931 kdelibs-3.1.1-r1.ebuild 2583
+MD5 08d7d42db0459201047dc9d05fd05642 kdelibs-3.1.1.ebuild 2452
+MD5 cbd5a6c42abdf4e1594288d8fc61f706 .kdelibs-2.2.2a-r2.ebuild.swp 12288
+MD5 0b73767b0a43bffe91801ea7fb959308 kdelibs-3.1.1a.ebuild 2572
+MD5 bc5823268f69692a5b041b3cc486e048 kdelibs-3.0.5b.ebuild 1895
+MD5 ef38008345821fcc6be40403b715713f .#kdelibs-3.1_rc6.ebuild.1.3 2100
+MD5 1982b8a373789563820363da234db618 .#kdelibs-3.1_rc6.ebuild.1.5 2269
+MD5 4ff73de0a5444a14c8e231da87bd8459 kdelibs-3.1-r3.ebuild 2653
+MD5 af03887e58b48a7d820e5fc60805fdd8 kdelibs-2.2.2a-r2.ebuild 2526
+MD5 76d59819eec552a98feadb81e991739b kdelibs-3.0.5a-r1.ebuild 2035
+MD5 33a2f1f3bddca088c3bec3f5ab98b1f6 ChangeLog 12609
+MD5 3c178889822836378fcf526195b86814 files/kdelibs-3.1.1-kio_http.diff 5257
+MD5 24190dc0508cd29ea5adecc4cefc0db2 files/kdelibs-2.2.2a-crosside.diff 1267
+MD5 980d79084b85a6f32099fc9c20667aba files/.#digest-kdelibs-3.1.1.4 66
+MD5 b9e995da45022f78aed48a79f02201e7 files/kdelibs-3.1-bookmark.diff 1320
+MD5 472719ee52ab4e62fd329431767c985d files/digest-kdelibs-3.0.5b 1194
+MD5 d76da7fd0b31b5491b33015d1c382df8 files/digest-kdelibs-3.1.1a 1180
+MD5 cc4a5df0791ae13159f71f47996a8b95 files/digest-kdelibs-3.1-r2 66
+MD5 cc4a5df0791ae13159f71f47996a8b95 files/digest-kdelibs-3.1-r3 66
+MD5 acd90863c0847e230aa37f3943d58176 files/kdelibs-3.0.5b-libxml2-2.5.2.diff 703
+MD5 a24c4fa284fa06452ffd4ea438270fd2 files/digest-kdelibs-3.0.5a-r1 68
+MD5 41d30ba8cf8d36ad3caebeedb1ddfd0e files/kdelibs-3.1.1-kjs-alphaev6-gcc3-workaround.patch 477
+MD5 7353213c0eaadb42e684fb98fe8f4ff0 files/kdelibs-3.1.1-zip.diff 2906
+MD5 7353213c0eaadb42e684fb98fe8f4ff0 files/kdelibs-3.1-zip.diff 2906
+MD5 41d30ba8cf8d36ad3caebeedb1ddfd0e files/kdelibs-3.1.1a-kjs-alphaev6-gcc3-workaround.patch 477
+MD5 185c0cca81183c5659b62f91fd240771 files/digest-kdelibs-3.1.1 68
+MD5 41d30ba8cf8d36ad3caebeedb1ddfd0e files/kdelibs-3.1-kjs-alphaev6-gcc3-workaround.patch 477
+MD5 bcd0e223c0be9cc4d1af5f2b5578a096 files/kdelibs-3.0.5a-dontcrash.diff 500
+MD5 cc4a5df0791ae13159f71f47996a8b95 files/digest-kdelibs-3.1 66
+MD5 067d29e66608e7461f28e94895a0f4a2 files/digest-kdelibs-3.0.4-r1 142
+MD5 ed6c2a4ca2dca736f3cbfe717b762fe6 files/kdelibs-2.2.2a-gentoo.diff 75788
+MD5 321a6376eccdfa7077aea0e578b560b5 files/digest-kdelibs-3.1.1-r1 1114
+MD5 6e7c2097ad93ecd9a011d1685cb8971f files/kdelibs-3.1-libxml2-2.5.2.diff 1404
+MD5 f458fafcd88e2ea5c4eb8a88424640c4 files/digest-kdelibs-2.2.2a-r1 67
+MD5 6541fd079b109e7a1d7050ed3d63cf86 files/digest-kdelibs-2.2.2a-r2 139
+MD5 acd90863c0847e230aa37f3943d58176 files/kdelibs-3.0.5a-libxml2-2.5.2.diff 703
diff --git a/kde-base/kdelibs/files/digest-kdelibs-2.2.2a-r2 b/kde-base/kdelibs/files/digest-kdelibs-2.2.2a-r2
new file mode 100644
index 000000000000..04b08eb13c7a
--- /dev/null
+++ b/kde-base/kdelibs/files/digest-kdelibs-2.2.2a-r2
@@ -0,0 +1,2 @@
+MD5 51ec17dce9c62b50a3c2e97e4511cdcf kdelibs-2.2.2.tar.bz2 5955592
+MD5 e2c50fb7c97e1fbc8939e30a30054e45 post-2.2.2-kdelibs-kimgio.diff 509
diff --git a/kde-base/kdelibs/kdelibs-2.2.2a-r2.ebuild b/kde-base/kdelibs/kdelibs-2.2.2a-r2.ebuild
new file mode 100644
index 000000000000..57404bf19ecc
--- /dev/null
+++ b/kde-base/kdelibs/kdelibs-2.2.2a-r2.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-2.2.2a-r2.ebuild,v 1.1 2003/04/11 00:30:17 hannes Exp $
+inherit kde kde.org eutils
+#don't inherit kde-dist! it calls need-kde which adds kdelibs to depend -> circular deps!
+
+IUSE="ssl cups ipv6 alsa"
+DESCRIPTION="KDE $PV - base libraries needed by all kde programs"
+KEYWORDS="x86 sparc "
+HOMEPAGE="http//www.kde.org/"
+
+SRC_URI="${SRC_URI}
+	mirror://kde/security_patches/post-${PV/a/}-${PN}-kimgio.diff"
+
+SLOT="2"
+LICENSE="GPL-2 LGPL-2"
+
+S=$WORKDIR/kdelibs-2.2.2
+
+# kde.eclass has kdelibs in DEPEND, and we can't have that in here. so we recreate the entire
+# DEPEND from scratch.
+DEPEND=""
+RDEPEND=""
+newdepend ">=sys-devel/gcc-2.95.2
+	virtual/glibc
+	dev-lang/perl
+	>=media-libs/audiofile-0.1.9
+	>=sys-apps/bzip2-1.0.1
+	>=dev-libs/libxslt-1.0.7
+	>=dev-libs/libpcre-3.5
+	>=dev-libs/libxml2-2.4.10
+	ssl? ( >=dev-libs/openssl-0.9.6 )
+	alsa? ( >=media-libs/alsa-lib-0.5.9 >=media-sound/alsa-driver-0.5.9 )
+	cups? ( net-print/cups )
+	>=media-libs/tiff-3.5.5
+	app-admin/fam-oss"
+
+DEPEND="$DEPEND
+	sys-devel/make
+	sys-devel/autoconf
+	sys-devel/automake"
+
+RDEPEND="$RDEPEND
+	app-text/sgml-common
+	cups? ( net-print/cups )
+	dev-lang/python"
+
+qtver-from-kdever $PV
+need-qt $selected_version
+
+set-kdedir $PV
+
+#this patch contains security issues backported from kde-3.0.5a.
+PATCHES="${FILESDIR}/${P}-gentoo.diff
+	${FILESDIR}/${P}-crosside.diff"
+
+#fix 11732 and friends
+MAKEOPTS="$MAKEOPTS -j1"
+
+src_unpack() {
+	unpack ${PN}-${PV/a/}.tar.bz2
+	cd ${S}/kimgio
+	epatch ${DISTDIR}/post-${PV/a/}-${PN}-kimgio.diff
+	kde_sandbox_patch ${S}/{arts/soundserver,kio/kpac}
+}
+
+src_compile() {
+	kde_src_compile myconf
+
+	use ipv6	|| myconf="$myconf --with-ipv6-lookup=no"
+	use ssl		&& myconf="$myconf --with-ssl-dir=/usr"		|| myconf="$myconf --without-ssl"
+	use alsa	&& myconf="$myconf --with-alsa"			|| myconf="$myconf --without-alsa"
+	use cups	&& myconf="$myconf --enable-cups"		|| myconf="$myconf --disable-cups"
+
+	kde_src_compile configure make
+}
+
+src_install() {
+	kde_src_install
+	dohtml *.html
+
+	dodir /etc/env.d
+	if [ "${PREFIX}" != "/usr/kde/2" ]; then
+echo "PATH=${PREFIX}/bin:/usr/kde/2/bin
+ROOTPATH=${PREFIX}/bin:/usr/kde/2/bin
+LDPATH=${PREFIX}/lib:/usr/kde/2/lib" > ${D}/etc/env.d/70kdelibs-${PV}
+	else
+echo "PATH=${PREFIX}/bin
+ROOTPATH=${PREFIX}/bin
+LDPATH=${PREFIX}/lib" > ${D}/etc/env.d/70kdelibs-${PV}
+	fi
+
+	echo "KDEDIR=/usr/kde/2" > ${D}/etc/env.d/40kdedir-${PV}
+}