Clean out old patches

Package-Manager: portage--svn/cvs/Linux i686

3 files changed, 6 insertions, 62 deletions

diff --git a/kde-base/kdialog/ChangeLog b/kde-base/kdialog/ChangeLog
index b4efd3786fcc..a5a4a0212588 100644
--- a/kde-base/kdialog/ChangeLog
+++ b/kde-base/kdialog/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdialog
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdialog/ChangeLog,v 1.121 2009/10/12 21:03:29 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdialog/ChangeLog,v 1.122 2009/10/13 00:35:03 abcd Exp $
+
+  13 Oct 2009; Jonathan Callen <abcd@gentoo.org>
+  -files/kdialog-3.5.9-kdeeject-186028.patch:
+  Clean out old patches
 
   12 Oct 2009; Jonathan Callen <abcd@gentoo.org> -kdialog-3.5.9.ebuild,
   -kdialog-3.5.9-r1.ebuild:
diff --git a/kde-base/kdialog/Manifest b/kde-base/kdialog/Manifest
index 9e4c6827b850..08924f7e9991 100644
--- a/kde-base/kdialog/Manifest
+++ b/kde-base/kdialog/Manifest
@@ -1,4 +1,3 @@
-AUX kdialog-3.5.9-kdeeject-186028.patch 2878 RMD160 8c3bb3ca2591f9f40a88085e65389860c15b7399 SHA1 cdeccd9f260601946785a58acae06a79a015291e SHA256 36c5a6cc749ad0ddf28ec3390ed17b1ff45168404ed7d8a7d39386bb56b382b9
 DIST kdebase-3.5-patchset-13.tar.bz2 26504 RMD160 b723ba39de234131c3081be714d2919c5e5e38b5 SHA1 77d04b90d92ada8078263f2720f5e30d5ffdaa6e SHA256 78dc069a6d007d1dbf97147c368e7a4fda0dee5d41b15c471fde0589f0c377e0
 DIST kdebase-3.5.10.tar.bz2 24339704 RMD160 5845e94fbb8b5b64934d62dc9bd3b580d26d07bc SHA1 1a72e4170a0a953ed70c0693a034947d87b6efbd SHA256 77aa9d8f28c532f2e7a5157a7f4ba8df1001f00fa1cb72cb70b388b3d0e16b61
 DIST kdebase-4.2.4.tar.bz2 4264094 RMD160 02b83b5e1a9b0d75d6922873db0f5beb5c64393f SHA1 c08188baa90a5075f18a75640c4dc3e6dc69daa0 SHA256 37e7a66d8aeaf3b3714c731104aa68b5b7ce045bd34259fe78179c8ab8c776d7
@@ -8,5 +7,5 @@ EBUILD kdialog-3.5.10.ebuild 659 RMD160 9bb573d8a5017decee31bf6e841c637d1a9cb17b
 EBUILD kdialog-4.2.4.ebuild 417 RMD160 35a29faec88a79d6b067172bb148e344c0aa6afe SHA1 5289b7d09ca54d1b2fa68a51beed6bfe668c4564 SHA256 6e848911b2df87668d304c0fab6914cfa957ca60153beded968c5be336c91d5e
 EBUILD kdialog-4.3.1.ebuild 419 RMD160 f927e2d8034ca57ec54edeab5622902438808850 SHA1 847234a35dca5d119b3f8734e128b60dcc28db5c SHA256 6e2fa6f6fb73106e37d86cb9755de8f3627213676cf92c83a4032e6d00e05674
 EBUILD kdialog-4.3.2.ebuild 417 RMD160 6d4b3ce9711aa6e7ee224172e5ca254a8191586f SHA1 3bb80885483531f1e2f404bc69440e6236d460e0 SHA256 e1aa2e8ccd3d27a3456e3f91e533591da59db9d3a19959a9884bb7adf75a9d8e
-MISC ChangeLog 14642 RMD160 936cba8a0ebea88d181ba673401d823036ed7449 SHA1 289776571a6eae914cb2735ae549c23656b42aad SHA256 c91e392f5ee479d2196bfd7de36047d1f76c96640820c9bb78a8bcb126b072ca
+MISC ChangeLog 14762 RMD160 b33008f5447bc5de392d8a1be16f5665f46c42c2 SHA1 023307bae22f4a9c1f5165380c206836e78827d8 SHA256 2a83119464a6b1f9f75cbefc0726f365286fb3041be068ebc6c2e426762bd8eb
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
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
deleted file mode 100644
index 4607adac3a6d..000000000000
--- a/kde-base/kdialog/files/kdialog-3.5.9-kdeeject-186028.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-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