Added a patch to fix ejecting by using HAL (if the necessary tools are installed). Fixes bug 186028.

Package-Manager: portage-2.1.5_rc6

4 files changed, 89 insertions, 12 deletions

diff --git a/kde-base/kdialog/ChangeLog b/kde-base/kdialog/ChangeLog
index 3b37bb593277..5ff4a03a8294 100644
--- a/kde-base/kdialog/ChangeLog
+++ b/kde-base/kdialog/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/kdialog
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdialog/ChangeLog,v 1.75 2008/04/03 21:03:16 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdialog/ChangeLog,v 1.76 2008/04/26 17:22:08 philantrop Exp $
+
+*kdialog-3.5.9-r1 (26 Apr 2008)
+
+  26 Apr 2008; Wulf C. Krueger <philantrop@gentoo.org>
+  +files/kdialog-3.5.9-kdeeject-186028.patch, +kdialog-3.5.9-r1.ebuild:
+  Added a patch to fix ejecting by using HAL (if the necessary tools are
+  installed). Fixes bug 186028.
 
 *kdialog-4.0.3 (03 Apr 2008)
 
diff --git a/kde-base/kdialog/Manifest b/kde-base/kdialog/Manifest
index fb6f1332fdca..2e49d75f0cad 100644
--- a/kde-base/kdialog/Manifest
+++ b/kde-base/kdialog/Manifest
@@ -1,20 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX kdialog-3.5.9-kdeeject-186028.patch 2878 RMD160 8c3bb3ca2591f9f40a88085e65389860c15b7399 SHA1 cdeccd9f260601946785a58acae06a79a015291e SHA256 36c5a6cc749ad0ddf28ec3390ed17b1ff45168404ed7d8a7d39386bb56b382b9
 DIST kdebase-3.5.8.tar.bz2 24200172 RMD160 6441b5eaead5fff5c42c532fb11c0d37001cb6ea SHA1 07f2e33aef101e97237676719ef2bf8418d894b2 SHA256 0f1876d1c68f01ed8fee346c1bae4f53dd2c1dc56db94e309b3d1adfc6138493
 DIST kdebase-3.5.9.tar.bz2 24239563 RMD160 2552d850e62efd044c178e2eb04efdcce90e4a33 SHA1 a6a19e0b26ed7a2b138a4a7594c8486e26610de8 SHA256 6e958803055928cda73273996696e5f7aaad803a3854853f4ec44428c49c831e
 DIST kdebase-4.0.2.tar.bz2 4334205 RMD160 c5c4c49aeeedbe74018d8326f19ad75741963747 SHA1 83d0ac8c049fcf00f63c57001735a63eac634ecc SHA256 53bc54b6295492c5c12c1ebb5ce551555e50693c1fe11689d54b34807aa9aa9e
 DIST kdebase-4.0.3.tar.bz2 4334037 RMD160 bebf8daaf43f5c4ed0b74e2bfda7f53e8ef717c1 SHA1 afaf4213c227b5762e9c60f3ab0c8a043ba4902f SHA256 a9d32cc3f2fd4dc8ff7c2c18d3373c048efeb5d8ce84a67cc047fb2bd477c4dc
 EBUILD kdialog-3.5.8.ebuild 610 RMD160 f4a48c2a7f2d7d0877673248a192f06c8c8d1609 SHA1 f2cbdb1379693f1db751e945309a532dd1ef490b SHA256 6dcfb594e16ea9027949504bfe5a8c992265fcb2a26edc96a5beec82236c3ec5
+EBUILD kdialog-3.5.9-r1.ebuild 648 RMD160 9da114a664138b2b852bef83bf44f69e2da12c83 SHA1 f082e1b981aba6d257f53c5f0821d3c50f534334 SHA256 fcd62e4a7f59ef561068727a7390898bd7cdaa1d4f5d2d90fed708458c8a97d9
 EBUILD kdialog-3.5.9.ebuild 584 RMD160 c1e81d86290948f6d393e052ae589ae79da9260c SHA1 e5efa98dc419af80988a6724df0efb0c95856418 SHA256 8d3d434eeda5dd6c08aec73312f5e5701371a3e3a2b7e96c86550022864a6436
 EBUILD kdialog-4.0.2.ebuild 507 RMD160 7d53d9b1775668c8451b95daa1ef977b0353de50 SHA1 6867714cbca16975b69dd8e31485cef469f47b37 SHA256 422667c18ed863909f3795026aaafad60806e704651e4f94b32f2fe1d1d20472
 EBUILD kdialog-4.0.3.ebuild 507 RMD160 da2bf6884a00c1e29b34837cec8ac4c12c9637a0 SHA1 d72bf50ba9bab99450a48476c5a9afb71982e1d1 SHA256 1c79e6fe75a1a7f0d96399129fded2d23a52806113d25cd51cd7cfc6a5daf22e
-MISC ChangeLog 9093 RMD160 c65e712fded37fab8057b18accf30ddc237e8eff SHA1 9c1832adc0c0903e63be88b95a57ab5b97ca9f33 SHA256 560abd57d77363fb8937309baf3d0e84220a0f006f1ba3a027c8ef4d1e4950db
+MISC ChangeLog 9359 RMD160 88072f09cdb77ff49404e562e5c0a66534c07a4f SHA1 ac6d98820ed72c0cdbf49bf47f49bdd78df5b267 SHA256 a29e921d0b32a880bbc2d6ba10129542f28baf8e2a7ef107bb8b173f17ab5833
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkf1RhoACgkQCkvF58q80InIEACfQd1d0+2EVk7KMwwdDqhMbgaj
-BOoAoICn8ijPOVEHthSovvpgjCpKV7mc
-=N/OE
------END PGP SIGNATURE-----
diff --git a/kde-base/kdialog/files/kdialog-3.5.9-kdeeject-186028.patch b/kde-base/kdialog/files/kdialog-3.5.9-kdeeject-186028.patch
new file mode 100644
index 000000000000..4607adac3a6d
--- /dev/null
+++ b/kde-base/kdialog/files/kdialog-3.5.9-kdeeject-186028.patch
@@ -0,0 +1,59 @@
+diff -Naur kdialog-3.5.9.orig/kdeeject/kdeeject kdialog-3.5.9/kdeeject/kdeeject
+--- kdialog-3.5.9.orig/kdeeject/kdeeject	2006-10-01 19:31:56.000000000 +0200
++++ kdialog-3.5.9/kdeeject/kdeeject	2008-04-26 19:00:44.000000000 +0200
+@@ -4,6 +4,11 @@
+ #
+ # Copyright GPL v2 by David Faure <david@mandrakesoft.com>
+ #
++error() {
++    kdialog --title "KDE Eject" --error "$1"
++    exit 1
++}
++
+ if test $# -ge 1 -a "$1" != "--help"; then
+   quiet=0
+   if test "$1" = "-q"; then
+@@ -22,10 +27,39 @@
+       cdcontrol -f $dev eject >/dev/null 2>&1
+       ;;
+     *)
+-      # Warning, it has to be either eject 2.0.x or >=2.1.5
+-      # Otherwise it doesn't work as expected (it requires a
+-      # fstab entry for no reason).
+-      eject $1 >/dev/null 2>&1
++      # check if HAL userland tools are installed
++      if test -x `which hal-find-by-property`; then
++	  HAL_major=`hal-find-by-property --version | cut -d " " -f 2 | cut -d. -f1`
++          HAL_minor=`hal-find-by-property --version | cut -d " " -f 2 | cut -d. -f2`
++          # HAL umount and eject method exist only for HAL >= 0.5
++          if test $HAL_major -eq 0 -a  $HAL_minor -ge 5 -o $HAL_major -gt 0;  then
++              # Try to find the UDi from the device name
++              BLOCK_UDI=$(hal-find-by-property --key block.device --string "$1" | head -1)
++              [ -n "$BLOCK_UDI" ] || error "Can't find UDI for URL $1"
++              STORAGE_UDI=$(hal-get-property --udi $BLOCK_UDI --key block.storage_device)
++              [ -n "$STORAGE_UDI" ] || error "Can't find device for volume $BLOCK_UDI"
++	      
++              # Unmount each device volume
++              for VOLUME_UDI in $(hal-find-by-property --key block.storage_device --string $STORAGE_UDI); do
++                  [ $(hal-get-property --udi $VOLUME_UDI --key block.is_volume) = true ] || continue
++                  [ $(hal-get-property --udi $VOLUME_UDI --key volume.is_mounted) = true ] || continue
++                  ERROR=$(dcop kded mediamanager unmount $VOLUME_UDI)
++
++                  if test -n "$ERROR"; then
++                      # try to use directly DBUS method in case mediamanager failed
++                      ERROR=$(dbus-send --system --dest=org.freedesktop.Hal "$VOLUME_UDI" org.freedesktop.Hal.Device.Volume.Unmount array:string:"" >/dev/null 2>&1)
++                      [ -n "$ERROR" ] && error "$ERROR"
++                  fi
++              done
++              dbus-send --system --dest=org.freedesktop.Hal "$BLOCK_UDI" org.freedesktop.Hal.Device.Volume.Eject array:string:"" >/dev/null 2>&1
++          fi
++      else
++          # fallback to the old eject method
++          # Warning, it has to be either eject 2.0.x or >=2.1.5
++          # Otherwise it doesn't work as expected (it requires a
++          # fstab entry for no reason).
++	  eject $1 >/dev/null 2>&1
++      fi
+       ;;
+   esac
+   if test $? -eq 0; then
diff --git a/kde-base/kdialog/kdialog-3.5.9-r1.ebuild b/kde-base/kdialog/kdialog-3.5.9-r1.ebuild
new file mode 100644
index 000000000000..fb152502d2c8
--- /dev/null
+++ b/kde-base/kdialog/kdialog-3.5.9-r1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdialog/kdialog-3.5.9-r1.ebuild,v 1.1 2008/04/26 17:22:08 philantrop Exp $
+
+KMNAME=kdebase
+EAPI="1"
+inherit kde-meta eutils
+
+DESCRIPTION="KDialog can be used to show nice dialog boxes from shell scripts"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="kdehiddenvisibility"
+
+# Uses cdcontrol on FreeBSD
+RDEPEND="kernel_linux? ( || ( >=sys-apps/eject-2.1.5 sys-block/unieject ) ) "
+
+KMEXTRA="kdeeject"
+KMNODOCS=true
+
+PATCHES=( "${FILESDIR}/${P}-kdeeject-186028.patch" )