Update to KDE 3.4

8 files changed, 34 insertions, 24 deletions

diff --git a/security/kgpg-kde4/Makefile b/security/kgpg-kde4/Makefile
index d287e6938ed..80226b15e7c 100644
--- a/security/kgpg-kde4/Makefile
+++ b/security/kgpg-kde4/Makefile
@@ -26,6 +26,7 @@ PREFIX=		${KDE_PREFIX}
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
+USE_GETOPT_LONG=yes
 GNU_CONFIGURE=	yes
 USE_REINPLACE=	yes
 DO_NOT_COMPILE+=klaptopdaemon kmilo
diff --git a/security/kgpg-kde4/distinfo b/security/kgpg-kde4/distinfo
index 5a771943477..70c9fd6912f 100644
--- a/security/kgpg-kde4/distinfo
+++ b/security/kgpg-kde4/distinfo
@@ -1,2 +1,2 @@
-MD5 (KDE/kdeutils-3.3.2.tar.bz2) = bf50db108408da11e2f2fcacd6b46b51
-SIZE (KDE/kdeutils-3.3.2.tar.bz2) = 2211668
+MD5 (KDE/kdeutils-3.4.0.tar.bz2) = cb7e5402eedaca816e210d460e22e53a
+SIZE (KDE/kdeutils-3.4.0.tar.bz2) = 2328791
diff --git a/security/kgpg-kde4/files/patch-smapidev.c b/security/kgpg-kde4/files/patch-smapidev.c
deleted file mode 100644
index ad2c801de53..00000000000
--- a/security/kgpg-kde4/files/patch-smapidev.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- klaptopdaemon/smapidev.c	Mon Apr 28 12:00:07 2003
-+++ klaptopdaemon/smapidev.c.new	Mon Jan 26 13:49:25 2004
-@@ -34,7 +34,6 @@
- #else
- #include <unistd.h>
- #endif
--#include <getopt.h>
- #include <sys/ioctl.h>
- #include <errno.h>
- #ifdef __linux__
diff --git a/security/kgpg-kde4/pkg-plist b/security/kgpg-kde4/pkg-plist
index cfe12f4360c..59ab7a45ad4 100644
--- a/security/kgpg-kde4/pkg-plist
+++ b/security/kgpg-kde4/pkg-plist
@@ -62,6 +62,8 @@ lib/kde3/libarkpart.la
 lib/kde3/libarkpart.so
 lib/kde3/libkbyteseditwidget.la
 lib/kde3/libkbyteseditwidget.so
+lib/kde3/libkhexedit2part.la
+lib/kde3/libkhexedit2part.so
 lib/kde3/libkregexpeditorgui.la
 lib/kde3/libkregexpeditorgui.so
 lib/libkdeinit_ark.la
@@ -72,6 +74,9 @@ lib/libkdeinit_kcalc.la
 lib/libkdeinit_kcalc.so
 lib/libkdeinit_kedit.la
 lib/libkdeinit_kedit.so
+lib/libkhexeditcommon.la
+lib/libkhexeditcommon.so
+lib/libkhexeditcommon.so.0
 lib/libkregexpeditorcommon.la
 lib/libkregexpeditorcommon.so
 lib/libkregexpeditorcommon.so.1
@@ -94,6 +99,7 @@ share/applications/kde/kregexpeditor.desktop
 share/applications/kde/ksim.desktop
 share/applications/kde/ktimer.desktop
 share/applications/kde/kwalletconfig.desktop
+share/applications/kde/kwalletmanager-kwalletd.desktop
 share/applications/kde/kwalletmanager.desktop
 share/applications/kde/kwikdisk.desktop
 share/apps/ark/ark_part.rc
@@ -134,6 +140,7 @@ share/apps/irkick/icons/hicolor/32x32/actions/ledpurple.png
 share/apps/irkick/icons/hicolor/32x32/actions/ledred.png
 share/apps/irkick/icons/hicolor/32x32/actions/ledyellow.png
 share/apps/kcalc/kcalcui.rc
+share/apps/kcharselect/kcharselectui.rc
 share/apps/kconf_update/kcalcrc.upd
 share/apps/kconf_update/kcharselect.upd
 share/apps/kdf/kdfui.rc
@@ -166,6 +173,7 @@ share/apps/khexedit/khexeditui.rc
 share/apps/khexedit/pics/hexdrag.png
 share/apps/khexedit/pics/hexmask.png
 share/apps/khexedit/pics/hexwrite.png
+share/apps/khexedit2part/khexedit2partui.rc
 share/apps/kicker/applets/kcharselectapplet.desktop
 share/apps/kicker/extensions/ksim.desktop
 share/apps/kjots/kjotsui.rc
@@ -359,6 +367,7 @@ share/icons/crystalsvg/16x16/apps/kwikdisk.png
 share/icons/crystalsvg/16x16/devices/ksim_cpu.png
 share/icons/crystalsvg/22x22/apps/kgpg.png
 share/icons/crystalsvg/22x22/apps/kwalletmanager.png
+share/icons/crystalsvg/22x22/apps/kwikdisk.png
 share/icons/crystalsvg/32x32/apps/ark.png
 share/icons/crystalsvg/32x32/apps/kcalc.png
 share/icons/crystalsvg/32x32/apps/kcmdf.png
@@ -396,6 +405,8 @@ share/icons/crystalsvg/64x64/apps/kjots.png
 share/icons/crystalsvg/64x64/apps/kregexpeditor.png
 share/icons/crystalsvg/64x64/apps/kwalletmanager.png
 share/icons/crystalsvg/64x64/apps/kwikdisk.png
+share/icons/crystalsvg/scalable/apps/ark.svgz
+share/icons/crystalsvg/scalable/apps/kcalc.svgz
 share/icons/hicolor/16x16/apps/irkick.png
 share/icons/hicolor/22x22/apps/irkick.png
 share/icons/hicolor/32x32/apps/irkick.png
@@ -403,6 +414,7 @@ share/icons/locolor/16x16/apps/irkick.png
 share/icons/locolor/32x32/apps/irkick.png
 share/services/ark_part.desktop
 share/services/kbyteseditwidget.desktop
+share/services/khexedit2part.desktop
 share/services/kregexpeditorgui.desktop
 share/services/kwallet_config.desktop
 share/services/kwalletmanager_show.desktop
@@ -447,6 +459,7 @@ share/services/kwalletmanager_show.desktop
 @dirrm share/apps/kregexpeditor
 @dirrm share/apps/kjots/pics
 @dirrm share/apps/kjots
+@dirrm share/apps/khexedit2part
 @dirrm share/apps/khexedit/pics
 @dirrm share/apps/khexedit
 @dirrm share/apps/kgpg/pics
@@ -460,6 +473,7 @@ share/services/kwalletmanager_show.desktop
 @dirrm share/apps/kedit
 @dirrm share/apps/kdf/pics
 @dirrm share/apps/kdf
+@dirrm share/apps/kcharselect
 @dirrm share/apps/kcalc
 @dirrm share/apps/irkick/icons/hicolor/32x32/actions
 @dirrm share/apps/irkick/icons/hicolor/32x32
diff --git a/security/kwallet/Makefile b/security/kwallet/Makefile
index d287e6938ed..80226b15e7c 100644
--- a/security/kwallet/Makefile
+++ b/security/kwallet/Makefile
@@ -26,6 +26,7 @@ PREFIX=		${KDE_PREFIX}
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
+USE_GETOPT_LONG=yes
 GNU_CONFIGURE=	yes
 USE_REINPLACE=	yes
 DO_NOT_COMPILE+=klaptopdaemon kmilo
diff --git a/security/kwallet/distinfo b/security/kwallet/distinfo
index 5a771943477..70c9fd6912f 100644
--- a/security/kwallet/distinfo
+++ b/security/kwallet/distinfo
@@ -1,2 +1,2 @@
-MD5 (KDE/kdeutils-3.3.2.tar.bz2) = bf50db108408da11e2f2fcacd6b46b51
-SIZE (KDE/kdeutils-3.3.2.tar.bz2) = 2211668
+MD5 (KDE/kdeutils-3.4.0.tar.bz2) = cb7e5402eedaca816e210d460e22e53a
+SIZE (KDE/kdeutils-3.4.0.tar.bz2) = 2328791
diff --git a/security/kwallet/files/patch-smapidev.c b/security/kwallet/files/patch-smapidev.c
deleted file mode 100644
index ad2c801de53..00000000000
--- a/security/kwallet/files/patch-smapidev.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- klaptopdaemon/smapidev.c	Mon Apr 28 12:00:07 2003
-+++ klaptopdaemon/smapidev.c.new	Mon Jan 26 13:49:25 2004
-@@ -34,7 +34,6 @@
- #else
- #include <unistd.h>
- #endif
--#include <getopt.h>
- #include <sys/ioctl.h>
- #include <errno.h>
- #ifdef __linux__
diff --git a/security/kwallet/pkg-plist b/security/kwallet/pkg-plist
index cfe12f4360c..59ab7a45ad4 100644
--- a/security/kwallet/pkg-plist
+++ b/security/kwallet/pkg-plist
@@ -62,6 +62,8 @@ lib/kde3/libarkpart.la
 lib/kde3/libarkpart.so
 lib/kde3/libkbyteseditwidget.la
 lib/kde3/libkbyteseditwidget.so
+lib/kde3/libkhexedit2part.la
+lib/kde3/libkhexedit2part.so
 lib/kde3/libkregexpeditorgui.la
 lib/kde3/libkregexpeditorgui.so
 lib/libkdeinit_ark.la
@@ -72,6 +74,9 @@ lib/libkdeinit_kcalc.la
 lib/libkdeinit_kcalc.so
 lib/libkdeinit_kedit.la
 lib/libkdeinit_kedit.so
+lib/libkhexeditcommon.la
+lib/libkhexeditcommon.so
+lib/libkhexeditcommon.so.0
 lib/libkregexpeditorcommon.la
 lib/libkregexpeditorcommon.so
 lib/libkregexpeditorcommon.so.1
@@ -94,6 +99,7 @@ share/applications/kde/kregexpeditor.desktop
 share/applications/kde/ksim.desktop
 share/applications/kde/ktimer.desktop
 share/applications/kde/kwalletconfig.desktop
+share/applications/kde/kwalletmanager-kwalletd.desktop
 share/applications/kde/kwalletmanager.desktop
 share/applications/kde/kwikdisk.desktop
 share/apps/ark/ark_part.rc
@@ -134,6 +140,7 @@ share/apps/irkick/icons/hicolor/32x32/actions/ledpurple.png
 share/apps/irkick/icons/hicolor/32x32/actions/ledred.png
 share/apps/irkick/icons/hicolor/32x32/actions/ledyellow.png
 share/apps/kcalc/kcalcui.rc
+share/apps/kcharselect/kcharselectui.rc
 share/apps/kconf_update/kcalcrc.upd
 share/apps/kconf_update/kcharselect.upd
 share/apps/kdf/kdfui.rc
@@ -166,6 +173,7 @@ share/apps/khexedit/khexeditui.rc
 share/apps/khexedit/pics/hexdrag.png
 share/apps/khexedit/pics/hexmask.png
 share/apps/khexedit/pics/hexwrite.png
+share/apps/khexedit2part/khexedit2partui.rc
 share/apps/kicker/applets/kcharselectapplet.desktop
 share/apps/kicker/extensions/ksim.desktop
 share/apps/kjots/kjotsui.rc
@@ -359,6 +367,7 @@ share/icons/crystalsvg/16x16/apps/kwikdisk.png
 share/icons/crystalsvg/16x16/devices/ksim_cpu.png
 share/icons/crystalsvg/22x22/apps/kgpg.png
 share/icons/crystalsvg/22x22/apps/kwalletmanager.png
+share/icons/crystalsvg/22x22/apps/kwikdisk.png
 share/icons/crystalsvg/32x32/apps/ark.png
 share/icons/crystalsvg/32x32/apps/kcalc.png
 share/icons/crystalsvg/32x32/apps/kcmdf.png
@@ -396,6 +405,8 @@ share/icons/crystalsvg/64x64/apps/kjots.png
 share/icons/crystalsvg/64x64/apps/kregexpeditor.png
 share/icons/crystalsvg/64x64/apps/kwalletmanager.png
 share/icons/crystalsvg/64x64/apps/kwikdisk.png
+share/icons/crystalsvg/scalable/apps/ark.svgz
+share/icons/crystalsvg/scalable/apps/kcalc.svgz
 share/icons/hicolor/16x16/apps/irkick.png
 share/icons/hicolor/22x22/apps/irkick.png
 share/icons/hicolor/32x32/apps/irkick.png
@@ -403,6 +414,7 @@ share/icons/locolor/16x16/apps/irkick.png
 share/icons/locolor/32x32/apps/irkick.png
 share/services/ark_part.desktop
 share/services/kbyteseditwidget.desktop
+share/services/khexedit2part.desktop
 share/services/kregexpeditorgui.desktop
 share/services/kwallet_config.desktop
 share/services/kwalletmanager_show.desktop
@@ -447,6 +459,7 @@ share/services/kwalletmanager_show.desktop
 @dirrm share/apps/kregexpeditor
 @dirrm share/apps/kjots/pics
 @dirrm share/apps/kjots
+@dirrm share/apps/khexedit2part
 @dirrm share/apps/khexedit/pics
 @dirrm share/apps/khexedit
 @dirrm share/apps/kgpg/pics
@@ -460,6 +473,7 @@ share/services/kwalletmanager_show.desktop
 @dirrm share/apps/kedit
 @dirrm share/apps/kdf/pics
 @dirrm share/apps/kdf
+@dirrm share/apps/kcharselect
 @dirrm share/apps/kcalc
 @dirrm share/apps/irkick/icons/hicolor/32x32/actions
 @dirrm share/apps/irkick/icons/hicolor/32x32