install kdeeject with kdialog, #89867

Package-Manager: portage-2.0.51.19

8 files changed, 112 insertions, 12 deletions

diff --git a/kde-base/kdebase-kioslaves/Manifest b/kde-base/kdebase-kioslaves/Manifest
index 724cc9d90857..69973d7d54b5 100644
--- a/kde-base/kdebase-kioslaves/Manifest
+++ b/kde-base/kdebase-kioslaves/Manifest
@@ -1,6 +1,6 @@
-MD5 a4cba17fc738072d313d5eb57de36676 kdebase-kioslaves-3.4.1.ebuild 949
-MD5 e3002fd51a32aa5a5e9c2925d5681fca kdebase-kioslaves-3.4.0.ebuild 946
-MD5 e464aa327cd95a510a2f7825ec1f52bf ChangeLog 2340
+MD5 3196f5d7edade715c6861def61990244 kdebase-kioslaves-3.4.1.ebuild 895
+MD5 64086fdff31b7bbb2cbe0222c3c0089d kdebase-kioslaves-3.4.0.ebuild 895
+MD5 5eb62d4dcd71304e3b127cb063d2d4b3 ChangeLog 2497
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
 MD5 54e17e8f38d377972c220f10357c9b2f files/digest-kdebase-kioslaves-3.4.0 68
 MD5 2ed3f0976007ee8a8406f3f6422d66bf files/digest-kdebase-kioslaves-3.4.1 136
diff --git a/kde-base/kdesktop/Manifest b/kde-base/kdesktop/Manifest
index e7d4a0a11fd0..bb7188c4853b 100644
--- a/kde-base/kdesktop/Manifest
+++ b/kde-base/kdesktop/Manifest
@@ -1,6 +1,6 @@
-MD5 f8183d0996d839b2d9d3b0508f0c7c6e kdesktop-3.4.1.ebuild 1216
-MD5 dd42391482f24580a4c1b935e412e5f9 kdesktop-3.4.0.ebuild 1215
-MD5 82c40ed8abccc681a1d1c30eb72f8d33 ChangeLog 1847
+MD5 ccda7b4efd994f8cebc0f03ea5ef662f kdesktop-3.4.1.ebuild 1360
+MD5 c89ea43c8d2b8ea34b402c3017027e73 kdesktop-3.4.0.ebuild 1360
+MD5 2c040e113ba3beb29d68a984e77c4759 ChangeLog 1999
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
 MD5 54e17e8f38d377972c220f10357c9b2f files/digest-kdesktop-3.4.0 68
 MD5 2ed3f0976007ee8a8406f3f6422d66bf files/digest-kdesktop-3.4.1 136
diff --git a/kde-base/kdialog/ChangeLog b/kde-base/kdialog/ChangeLog
index e842b94e5dc1..fef3b5fbd1e5 100644
--- a/kde-base/kdialog/ChangeLog
+++ b/kde-base/kdialog/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdialog
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdialog/ChangeLog,v 1.8 2005/05/25 21:23:05 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdialog/ChangeLog,v 1.9 2005/05/27 14:43:23 carlo Exp $
+
+  27 May 2005; Carsten Lohrke <carlo@gentoo.org> +files/kdeeject-3.4.0,
+  +files/kdeeject-3.4.1, kdialog-3.4.0.ebuild, kdialog-3.4.1.ebuild:
+  install kdeeject with kdialog, #89867
 
 *kdialog-3.4.1 (25 May 2005)
 
diff --git a/kde-base/kdialog/Manifest b/kde-base/kdialog/Manifest
index 34f1e82c7307..cb301ef6fc3b 100644
--- a/kde-base/kdialog/Manifest
+++ b/kde-base/kdialog/Manifest
@@ -1,6 +1,8 @@
-MD5 d13c0931a30764d44c6118ccb069bc36 kdialog-3.4.1.ebuild 449
-MD5 d73081cfc81c79f88299ac98094e3566 kdialog-3.4.0.ebuild 448
-MD5 1739910d5e0175b6121def3b37f1981b ChangeLog 1532
+MD5 0c88892be9e9a5fe598af55a78b85399 kdialog-3.4.1.ebuild 611
+MD5 9e9b3961ca7f6c59d5efde22deaa31a8 kdialog-3.4.0.ebuild 611
+MD5 e0b5d920be966128a3034b9c0fc2e93b ChangeLog 1711
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+MD5 6eadcc709c52bce0bf5eddfa4bf2f6cb files/kdeeject-3.4.0 983
+MD5 6eadcc709c52bce0bf5eddfa4bf2f6cb files/kdeeject-3.4.1 983
 MD5 54e17e8f38d377972c220f10357c9b2f files/digest-kdialog-3.4.0 68
 MD5 2ed3f0976007ee8a8406f3f6422d66bf files/digest-kdialog-3.4.1 136
diff --git a/kde-base/kdialog/files/kdeeject-3.4.0 b/kde-base/kdialog/files/kdeeject-3.4.0
new file mode 100755
index 000000000000..7c684c68d9f3
--- /dev/null
+++ b/kde-base/kdialog/files/kdeeject-3.4.0
@@ -0,0 +1,37 @@
+#!/bin/sh
+# Script used by kdesktop to eject a removable media (CDROM/Tape/SCSI/Floppy)
+# Relies on the 'eject' program, 'cdcontrol' on *BSD
+#
+# Copyright GPL v2 by David Faure <david@mandrakesoft.com>
+#
+if test $# -ge 1 -a "$1" != "--help"; then
+  quiet=0
+  if test "$1" = "-q"; then
+    quiet=1
+    shift
+  fi
+  # Checking for stuff in the PATH is ugly with sh.
+  # I guess this is the reason for making this a kde app...
+  OS=`uname -s`
+  case "$OS" in
+    OpenBSD)
+      cdio -f $1 eject >/dev/null 2>&1
+      ;;
+    *BSD)
+      dev=`echo $1 | sed -E -e 's#/dev/##' -e 's/([0-9])./\1/'`
+      cdcontrol -f $dev eject >/dev/null 2>&1
+      ;;
+    *)
+      eject $1 >/dev/null 2>&1
+      ;;
+  esac
+  if test $? -eq 0; then
+    dcop kdesktop default refreshIcons
+    exit 0
+  elif test $quiet -eq 0; then
+    kdialog --title "KDE Eject" --error "Eject $1 failed!"
+  fi
+else
+  kdialog --title "KDE Eject" --msgbox "Usage: $0 <name> where name is a device or a mountpoint."
+fi
+exit 1
diff --git a/kde-base/kdialog/files/kdeeject-3.4.1 b/kde-base/kdialog/files/kdeeject-3.4.1
new file mode 100755
index 000000000000..7c684c68d9f3
--- /dev/null
+++ b/kde-base/kdialog/files/kdeeject-3.4.1
@@ -0,0 +1,37 @@
+#!/bin/sh
+# Script used by kdesktop to eject a removable media (CDROM/Tape/SCSI/Floppy)
+# Relies on the 'eject' program, 'cdcontrol' on *BSD
+#
+# Copyright GPL v2 by David Faure <david@mandrakesoft.com>
+#
+if test $# -ge 1 -a "$1" != "--help"; then
+  quiet=0
+  if test "$1" = "-q"; then
+    quiet=1
+    shift
+  fi
+  # Checking for stuff in the PATH is ugly with sh.
+  # I guess this is the reason for making this a kde app...
+  OS=`uname -s`
+  case "$OS" in
+    OpenBSD)
+      cdio -f $1 eject >/dev/null 2>&1
+      ;;
+    *BSD)
+      dev=`echo $1 | sed -E -e 's#/dev/##' -e 's/([0-9])./\1/'`
+      cdcontrol -f $dev eject >/dev/null 2>&1
+      ;;
+    *)
+      eject $1 >/dev/null 2>&1
+      ;;
+  esac
+  if test $? -eq 0; then
+    dcop kdesktop default refreshIcons
+    exit 0
+  elif test $quiet -eq 0; then
+    kdialog --title "KDE Eject" --error "Eject $1 failed!"
+  fi
+else
+  kdialog --title "KDE Eject" --msgbox "Usage: $0 <name> where name is a device or a mountpoint."
+fi
+exit 1
diff --git a/kde-base/kdialog/kdialog-3.4.0.ebuild b/kde-base/kdialog/kdialog-3.4.0.ebuild
index 7ba7a93ee923..c520fdeb0c83 100644
--- a/kde-base/kdialog/kdialog-3.4.0.ebuild
+++ b/kde-base/kdialog/kdialog-3.4.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdialog/kdialog-3.4.0.ebuild,v 1.4 2005/04/27 19:12:15 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdialog/kdialog-3.4.0.ebuild,v 1.5 2005/05/27 14:43:23 carlo Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
@@ -11,4 +11,14 @@ DESCRIPTION="KDialog can be used to show nice dialog boxes from shell scripts"
 KEYWORDS="~x86 ~amd64 ~ppc ~sparc ~ppc64"
 IUSE=""
 
+RDEPEND="sys-apps/eject"
+
 KMNODOCS=true
+
+src_install() {
+	kde-meta_src_install
+	# see bug 89867
+	cp ${FILESDIR}/kdeeject-${PV} ${T}/kdeeject
+	into ${PREFIX}
+	dobin ${T}/kdeeject
+}
\ No newline at end of file
diff --git a/kde-base/kdialog/kdialog-3.4.1.ebuild b/kde-base/kdialog/kdialog-3.4.1.ebuild
index 6efc27dbaf55..197737ca02b7 100644
--- a/kde-base/kdialog/kdialog-3.4.1.ebuild
+++ b/kde-base/kdialog/kdialog-3.4.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdialog/kdialog-3.4.1.ebuild,v 1.2 2005/05/26 17:14:26 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdialog/kdialog-3.4.1.ebuild,v 1.3 2005/05/27 14:43:23 carlo Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
@@ -11,4 +11,14 @@ DESCRIPTION="KDialog can be used to show nice dialog boxes from shell scripts"
 KEYWORDS="~x86 ~amd64 ~ppc64 ~ppc ~sparc"
 IUSE=""
 
+RDEPEND="sys-apps/eject"
+
 KMNODOCS=true
+
+src_install() {
+	kde-meta_src_install
+	# see bug 89867
+	cp ${FILESDIR}/kdeeject-${PV} ${T}/kdeeject
+	into ${PREFIX}
+	dobin ${T}/kdeeject
+}
\ No newline at end of file