punt

10 files changed, 0 insertions, 618 deletions

diff --git a/gnome-base/gnome-mount/ChangeLog b/gnome-base/gnome-mount/ChangeLog
deleted file mode 100644
index faee8bac112c..000000000000
--- a/gnome-base/gnome-mount/ChangeLog
+++ /dev/null
@@ -1,314 +0,0 @@
-# ChangeLog for gnome-base/gnome-mount
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-mount/ChangeLog,v 1.77 2011/02/05 13:13:13 ssuominen Exp $
-
-  05 Feb 2011; Samuli Suominen <ssuominen@gentoo.org>
-  gnome-mount-0.8-r2.ebuild:
-  Disable x11-libs/libnotify support because it's unported to >= 0.7 API and
-  this package is obsolete.
-
-  26 Jan 2011; Samuli Suominen <ssuominen@gentoo.org>
-  gnome-mount-0.8-r2.ebuild:
-  Revert keywording to ~x86-fbsd for gnome-base/gvfs[hal] and unmask this
-  package from package.mask.
-
-*gnome-mount-0.8-r2 (21 Jul 2010)
-
-  21 Jul 2010; Pacho Ramos <pacho@gentoo.org> +gnome-mount-0.8-r2.ebuild,
-  +files/gnome-mount-0.8-ntfs3g-locale.patch:
-  Revision bump to stop passing locale mount option for ntfs3g since no
-  version in the tree recognizes it (bug #329225 by Fabio Erculiani).
-
-  20 Jul 2010; Jeroen Roovers <jer@gentoo.org> gnome-mount-0.8-r1.ebuild:
-  Drop HPPA keywording (bug #324511).
-
-  19 Jun 2010; Pacho Ramos <pacho@gentoo.org> gnome-mount-0.8-r1.ebuild:
-  Depend on gnome-base/libgnome-keyring when needed instead of recent
-  gnome-base/gnome-keyring versions per bug #324695 (by Arttu Valo)
-
-  22 Mar 2010; Gilles Dartiguelongue <eva@gentoo.org>
-  -gnome-mount-0.6.ebuild, -gnome-mount-0.7.ebuild, -gnome-mount-0.8.ebuild:
-  Clean up old revisions.
-
-  17 Jan 2010; Jeroen Roovers <jer@gentoo.org> gnome-mount-0.8-r1.ebuild:
-  Stable for HPPA (bug #281427).
-
-  16 Jan 2010; Raúl Porcel <armin76@gentoo.org> gnome-mount-0.8-r1.ebuild:
-  sh stable
-
-  03 Dec 2009; Brent Baude <ranger@gentoo.org> gnome-mount-0.8-r1.ebuild:
-  Marking gnome-mount-0.8-r1 ppc64 stable for bug 281427
-
-  28 Nov 2009; Raúl Porcel <armin76@gentoo.org> gnome-mount-0.8-r1.ebuild:
-  alpha/ia64/sparc stable wrt #281427
-
-  05 Nov 2009; Markus Meier <maekke@gentoo.org> gnome-mount-0.8-r1.ebuild:
-  arm stable, bug #281427
-
-  24 Oct 2009; nixnut <nixnut@gentoo.org> gnome-mount-0.8-r1.ebuild:
-  ppc stable #281427
-
-  16 Oct 2009; Markus Meier <maekke@gentoo.org> gnome-mount-0.8-r1.ebuild:
-  x86 stable, bug #281427
-
-  08 Oct 2009; Olivier Crête <tester@gentoo.org> gnome-mount-0.8-r1.ebuild:
-  Stable on amd64, bug #281427
-
-  15 May 2009; Alexis Ballier <aballier@gentoo.org>
-  gnome-mount-0.8-r1.ebuild:
-  dont apply the vfat schemas patch on bsd as it conflicts with our already
-  existing patch
-
-  28 Apr 2009; Raúl Porcel <armin76@gentoo.org> gnome-mount-0.8.ebuild:
-  sh stable
-
-  27 Apr 2009; Raúl Porcel <armin76@gentoo.org> gnome-mount-0.8.ebuild:
-  arm stable
-
-  05 Mar 2009; Brent Baude <ranger@gentoo.org> gnome-mount-0.8.ebuild:
-  stable ppc, bug 256163
-
-  27 Feb 2009; Jeroen Roovers <jer@gentoo.org> gnome-mount-0.8.ebuild:
-  Stable for HPPA (bug #256163).
-
-  24 Feb 2009; Raúl Porcel <armin76@gentoo.org> gnome-mount-0.8.ebuild:
-  ia64/sparc stable wrt #256163
-
-*gnome-mount-0.8-r1 (09 Feb 2009)
-
-  09 Feb 2009; Gilles Dartiguelongue <eva@gentoo.org>
-  -files/gnome-mount-0.4-ntfs3g.patch,
-  +files/gnome-mount-0.8-fstablock.patch,
-  +files/gnome-mount-0.8-libnotify-automagic.patch,
-  +files/gnome-mount-0.8-vfat-defaults.patch,
-  -files/gnome-mount-hal-no-media-fstab.patch, +gnome-mount-0.8-r1.ebuild:
-  Bump to 0.8-r1. Better defaults for vfat, bug #257745. Fix HAL locking for
-  devices in fstab, bug #257746. Fix automagic dependency, bug #257753. Many
-  thanks to Pacho Ramos.
-
-  02 Feb 2009; Brent Baude <ranger@gentoo.org> gnome-mount-0.8.ebuild:
-  stable ppc64, bug 256163
-
-  01 Feb 2009; Tobias Klausmann <klausman@gentoo.org>
-  gnome-mount-0.8.ebuild:
-  Stable on alpha, bug #256163
-
-  01 Feb 2009; Markus Meier <maekke@gentoo.org> gnome-mount-0.8.ebuild:
-  amd64/x86 stable, bug #256163
-
-  13 Jan 2009; Doug Goldstein <cardoe@gentoo.org> metadata.xml:
-  gentopia is becoming freedesktop
-
-  01 Dec 2008; Gilles Dartiguelongue <eva@gentoo.org>
-  -gnome-mount-0.4-r5.ebuild, gnome-mount-0.8.ebuild:
-  Update reference on the patch in 0.8, close bug #176035. remove old
-  revision.
-
-*gnome-mount-0.8 (27 Nov 2008)
-
-  27 Nov 2008; Gilles Dartiguelongue <eva@gentoo.org>
-  +gnome-mount-0.8.ebuild:
-  Bump to 0.8. No more libgnomeui dep, eject works on the main block device,
-  works with nautilus 2.22 and higher. Fixes bug #218077 and renders
-  bug #241590 obsolete.
-
-  13 Nov 2008; Brent Baude <ranger@gentoo.org> gnome-mount-0.6.ebuild:
-  Marking gnome-mount-0.6 ppc64 stable for bug 236971
-
-  28 Oct 2008; Brent Baude <ranger@gentoo.org> gnome-mount-0.6.ebuild:
-  Marking gnome-mount-0.6 ~ppc64 again b/c hal is now ppc64 stable
-
-  28 Jul 2008; Arun Raghavan <ford_prefect@gentoo.org> metadata.xml:
-  Add local USE flags to metadata.xml
-
-  26 Nov 2007; Markus Rothe <corsair@gentoo.org> gnome-mount-0.6.ebuild:
-  Remove ~ppc64 from gnome-mount-0.6, because it depends on
-  >=sys-apps/hal-0.5.8.1, which is not available on ppc64 currently
-
-*gnome-mount-0.7 (23 Nov 2007)
-
-  23 Nov 2007; Saleem Abdulrasool <compnerd@gentoo.org>
-  +gnome-mount-0.7.ebuild:
-  Version bump for all the new HAL-0.5.10 goodness
-
-  12 Oct 2007; Mart Raudsepp <leio@gentoo.org> metadata.xml:
-  Adding gentopia as co-maintainers to help with the HAL side of things
-
-  07 Sep 2007; Jeroen Roovers <jer@gentoo.org> gnome-mount-0.6.ebuild:
-  Stable for HPPA too.
-
-  08 Aug 2007; Raúl Porcel <armin76@gentoo.org> gnome-mount-0.6.ebuild:
-  alpha/ia64 stable wrt #185823
-
-  07 Aug 2007; Gustavo Zacarias <gustavoz@gentoo.org>
-  gnome-mount-0.6.ebuild:
-  Stable on sparc wrt #185823
-
-  04 Aug 2007; Tobias Scherbaum <dertobi123@gentoo.org>
-  gnome-mount-0.6.ebuild:
-  ppc stable, bug #183674
-
-  02 Aug 2007; Michael Sterrett <mr_bones_@gentoo.org>
-  gnome-mount-0.4-r5.ebuild:
-  correct dbus deps (bug #187369)
-
-  08 Jul 2007; Michael Sterrett <mr_bones_@gentoo.org>
-  gnome-mount-0.4-r5.ebuild:
-  remove reference to old, removed dbus (bug #183696)
-
-  02 Jul 2007; Christian Faulhammer <opfer@gentoo.org>
-  gnome-mount-0.6.ebuild:
-  stable x86, bug 183674
-
-  29 Jun 2007; Olivier Crête <tester@gentoo.org> gnome-mount-0.6.ebuild:
-  Stable on amd64 for bug #183674
-
-  29 May 2007; Remi Cardona <remi@gentoo.org>
-  +files/gnome-mount-0.6-include-locale-h.patch, gnome-mount-0.6.ebuild:
-  add #include <locale.h> to fix bug #176035
-
-  17 May 2007; Roy Marples <uberlord@gentoo.org>
-  +files/gnome-mount-0.6-freebsd-schemas.patch, gnome-mount-0.6.ebuild:
-  Patch the schemas so that automounting CD's works on FreeBSD.
-
-  18 Apr 2007; Roy Marples <uberlord@gentoo.org> gnome-mount-0.6.ebuild:
-  Blessed with the ~x86-fbsd keyword.
-
-*gnome-mount-0.6 (18 Apr 2007)
-
-  18 Apr 2007; Doug Goldstein <cardoe@gentoo.org> +gnome-mount-0.6.ebuild:
-  Rev bump
-
-*gnome-mount-0.5 (07 Apr 2007)
-
-  07 Apr 2007; Doug Goldstein <cardoe@gentoo.org> +gnome-mount-0.5.ebuild:
-  rev bump for HAL 0.5.9 testing and for the GNOME 2.18.0 release
-
-  02 Feb 2007; Mart Raudsepp <leio@gentoo.org>
-  -files/gnome-mount-0.4-fix-segv-on-no-media.patch,
-  -files/gnome-mount-0.4-hal-mountable.patch, -gnome-mount-0.4-r2.ebuild,
-  -gnome-mount-0.4-r3.ebuild, -gnome-mount-0.4-r4.ebuild:
-  Remove old
-
-  21 Jan 2007; Bryan Østergaard <kloeri@gentoo.org>
-  gnome-mount-0.4-r5.ebuild:
-  Stable on IA64, bug 156662.
-
-  20 Jan 2007; Jeroen Roovers <jer@gentoo.org> gnome-mount-0.4-r5.ebuild:
-  Stable for HPPA (bug #156662).
-
-  14 Jan 2007; Bryan Østergaard <kloeri@gentoo.org>
-  gnome-mount-0.4-r5.ebuild:
-  Stable on Alpha.
-
-  21 Dec 2006; Markus Rothe <corsair@gentoo.org> gnome-mount-0.4-r5.ebuild:
-  Stable on ppc64; bug #156662
-
-  18 Dec 2006; Gustavo Zacarias <gustavoz@gentoo.org>
-  gnome-mount-0.4-r5.ebuild:
-  Stable on sparc
-
-  16 Dec 2006; Tobias Scherbaum <dertobi123@gentoo.org>
-  gnome-mount-0.4-r5.ebuild:
-  Stable on ppc wrt bug #156662.
-
-  12 Dec 2006; Chris Gianelloni <wolf31o2@gentoo.org>
-  gnome-mount-0.4-r5.ebuild:
-  Stable on amd64 wrt bug #156662.
-
-  10 Dec 2006; Andrej Kacian <ticho@gentoo.org> gnome-mount-0.4-r5.ebuild:
-  Stable on x86, bug #156662.
-
-  18 Nov 2006; Saleem Abdulrasool <compnerd@gentoo.org>
-  gnome-mount-0.4-r5.ebuild:
-  Fix dbus dependency for dbus-1.0 (bug #155293)
-
-  21 Oct 2006; Bryan Østergaard <kloeri@gentoo.org>
-  gnome-mount-0.4-r5.ebuild:
-  Add ~alpha keyword.
-
-*gnome-mount-0.4-r5 (25 Aug 2006)
-
-  25 Aug 2006; Patrick McLean <chutzpah@gentoo.org>
-  +files/gnome-mount-0.4-ntfs3g.patch, +gnome-mount-0.4-r5.ebuild:
-  New revision, add patch to support mounting NTFS drives with ntfs-3g.
-
-  19 Aug 2006; Bryan Østergaard <kloeri@gentoo.org>
-  gnome-mount-0.4-r4.ebuild:
-  Stable on ia64.
-
-  16 Aug 2006; Markus Rothe <corsair@gentoo.org> gnome-mount-0.4-r4.ebuild:
-  Stable on ppc64
-
-  17 Jul 2006; Daniel Gryniewicz <dang@gentoo.org>
-  gnome-mount-0.4-r4.ebuild:
-  Marked stable on amd64 for bug #139612
-
-  16 Jul 2006; Tobias Scherbaum <dertobi123@gentoo.org>
-  gnome-mount-0.4-r4.ebuild:
-  hppa stable, bug #139612
-
-  14 Jul 2006; Tobias Scherbaum <dertobi123@gentoo.org>
-  gnome-mount-0.4-r4.ebuild:
-  ppc stable, bug #139612
-
-  12 Jul 2006; Chris Gianelloni <wolf31o2@gentoo.org>
-  gnome-mount-0.4-r4.ebuild:
-  Stable on x86 wrt bug #139612.
-
-  10 Jul 2006; Gustavo Zacarias <gustavoz@gentoo.org>
-  gnome-mount-0.4-r4.ebuild:
-  Stable on sparc wrt #139612
-
-*gnome-mount-0.4-r4 (18 Jun 2006)
-
-  18 Jun 2006; John N. Laliberte <allanonjl@gentoo.org>
-  +files/gnome-mount-hal-no-media-fstab.patch, +gnome-mount-0.4-r4.ebuild:
-  fix for mounting things that already have a line in fstab. fixes #137211.
-  combine all previous patches into 1 patch from upstream cvs.
-
-  21 May 2006; Daniel Gryniewicz <dang@gentoo.org>
-  -gnome-mount-0.4-r1.ebuild:
-  Clean up old versions
-
-*gnome-mount-0.4-r3 (21 May 2006)
-
-  21 May 2006; Daniel Gryniewicz <dang@gentoo.org>
-  +files/gnome-mount-0.4-fix-segv-on-no-media.patch,
-  +gnome-mount-0.4-r3.ebuild:
-  Add upstream patch to fix bug #133880
-
-*gnome-mount-0.4-r2 (17 May 2006)
-
-  17 May 2006; Daniel Gryniewicz <dang@gentoo.org>
-  +files/gnome-mount-0.4-hal-mountable.patch, +gnome-mount-0.4-r2.ebuild:
-  Pull in upstream fix for bug# 133549
-
-  14 May 2006; Tobias Scherbaum <dertobi123@gentoo.org>
-  gnome-mount-0.4-r1.ebuild:
-  Added ~hppa, bug #126765
-
-  05 May 2006; Marinus Schraal <foser@gentoo.org> gnome-mount-0.4-r1.ebuild :
-  Update hal dep to make sure /media gets created (#130795)
-
-  27 Apr 2006; Marien Zwart <marienz@gentoo.org> Manifest:
-  Fixing SHA256 digest, pass four
-
-  19 Mar 2006; John N. Laliberte <allanonjl@gentoo.org>
-  gnome-mount-0.4-r1.ebuild:
-  remove blocker on pmount. not necessary since its used by default as
-  the first choice. also fixes problem if you have both kde and gnome
-  installed on the same system. #126840
-
-*gnome-mount-0.4-r1 (19 Mar 2006)
-
-  19 Mar 2006; John N. Laliberte <allanonjl@gentoo.org>
-  +gnome-mount-0.4-r1.ebuild:
-  add blocker on pmount.
-
-*gnome-mount-0.4 (16 Mar 2006)
-
-  16 Mar 2006; John N. Laliberte <allanonjl@gentoo.org>
-  +gnome-mount-0.4.ebuild:
-  new package for 2.14.
-
diff --git a/gnome-base/gnome-mount/Manifest b/gnome-base/gnome-mount/Manifest
deleted file mode 100644
index 7059068ad09b..000000000000
--- a/gnome-base/gnome-mount/Manifest
+++ /dev/null
@@ -1,10 +0,0 @@
-AUX gnome-mount-0.6-freebsd-schemas.patch 2554 RMD160 73783e4a8dd6a753530b50b970777624c915ab0d SHA1 e24311a3aec500ec5218b2f5ea0ddf2ee08e90b5 SHA256 0b4911f49c1e9906022348d03f697dbe0b600ee99d62096eb429d43d1f233a87
-AUX gnome-mount-0.6-include-locale-h.patch 253 RMD160 3a45892d5117e42f5cda39fa3dbdfcde484e5609 SHA1 f071c5e6ec8ca4f2b26e5c8439937da9f3301091 SHA256 c848331ed247eb678c759a07bcc9cbbed443f6a38009d8d035ba2516b7552e2f
-AUX gnome-mount-0.8-fstablock.patch 3281 RMD160 7b0d5f5f4ba4bed2776488425a732708f6155080 SHA1 50f06c9dd1d903cca6b96d9cd20f42692b3be837 SHA256 1aa891d6c578458ee4b465b8a27172edb826fe8b589fabf5a8ff4418b10f8a5a
-AUX gnome-mount-0.8-libnotify-automagic.patch 2369 RMD160 41a76ca7bb97ad6117b2d8391d9fba29c04ca505 SHA1 9bb3dadb23c20c37331a39e56cfc7a469565a955 SHA256 add3dbfe0b7b4a7b3a80eb39feb6856a0ce468bfe12a7d99e8ddeecc2c31c4d5
-AUX gnome-mount-0.8-ntfs3g-locale.patch 502 RMD160 6813a15df784de0951c9a20546e6c6ffab551759 SHA1 08beb9964574a30cc383be017be2343fed62f69a SHA256 e57d854bd0b830b126c4093b9c994d28ad351af5a09cc0adc45db69df8491495
-AUX gnome-mount-0.8-vfat-defaults.patch 706 RMD160 cbbf337ea1598e11f43aebe8505b9ce5ec2b21fc SHA1 387dc0976b2f08db1376f0af63c840f72d332650 SHA256 37f80a8c37507e5ebd6b4f75610ef39c0e66c1363fe554ab0aeda8a526dd21c2
-DIST gnome-mount-0.8.tar.gz 505788 RMD160 003800eda3edb7747714b1002bd1a1b50ea44fe9 SHA1 846ba178cf9009f3e32c7f55f912b3ca6b9ecedb SHA256 44ca6b78b49a4181435e489c7b7d416c8f26442dcecdc01ec4b981274ed957e2
-EBUILD gnome-mount-0.8-r2.ebuild 1790 RMD160 9fa9884cf3fc050c50f0475ac4d3bb6127428faa SHA1 acef0deb9b328e6f78b6c5e05e560a0d036a2940 SHA256 0699d126859fc4d67d02cdd2a6793bf135531fd6471dfdef1dbc5c0088ce9de9
-MISC ChangeLog 10909 RMD160 b00b7032f382b1adaafa205cea145faf67f63f59 SHA1 c50fec35034565c989e1e01323080b06b0369784 SHA256 058e7889ef13453430530351281c95a63290ea5d663144c042d81f4c50a95dc2
-MISC metadata.xml 254 RMD160 6a737fb45f6f2fd20426f7b0bbaece103a1cf891 SHA1 5320b8e2ae1cdee69cc65091497d9e100c364e64 SHA256 f9d82c574f40e1436601a877ad0895aff511f02edd3656608279ccad35650a31
diff --git a/gnome-base/gnome-mount/files/gnome-mount-0.6-freebsd-schemas.patch b/gnome-base/gnome-mount/files/gnome-mount-0.6-freebsd-schemas.patch
deleted file mode 100644
index c46bf1609718..000000000000
--- a/gnome-base/gnome-mount/files/gnome-mount-0.6-freebsd-schemas.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- gnome-mount.schemas.in.orig	Tue Apr 10 18:50:12 2007
-+++ gnome-mount.schemas.in	Sat Apr 14 14:49:22 2007
-@@ -6,7 +6,7 @@
-         <applyto>/system/storage/default_options/vfat/mount_options</applyto>
-         <type>list</type>
-         <list_type>string</list_type>
--        <default>[shortname=lower,uid=]</default>
-+        <default>[longnames,-u=]</default>
-         <locale name="C">
-           <short>Default mount options for vfat fs</short>
-           <long>A list of default mount options for volumes formatted with the vfat file system.</long>
-@@ -18,7 +18,7 @@
-         <applyto>/system/storage/default_options/iso9660/mount_options</applyto>
-         <type>list</type>
-         <list_type>string</list_type>
--        <default>[uid=]</default>
-+        <default>[]</default>
-         <locale name="C">
-           <short>Default mount options for iso9660 fs</short>
-           <long>A list of default mount options for volumes formatted with the iso9660 file system.</long>
-@@ -30,7 +30,7 @@
-         <applyto>/system/storage/default_options/udf/mount_options</applyto>
-         <type>list</type>
-         <list_type>string</list_type>
--        <default>[uid=]</default>
-+        <default>[]</default>
-         <locale name="C">
-           <short>Default mount options for udf fs</short>
-           <long>A list of default mount options for volumes formatted with the udf file system.</long>
-@@ -42,7 +42,7 @@
-         <applyto>/system/storage/default_options/ntfs/mount_options</applyto>
-         <type>list</type>
-         <list_type>string</list_type>
--        <default>[umask=222]</default>
-+        <default>[-m=755]</default>
-         <locale name="C">
-           <short>Default mount options for ntfs fs</short>
-           <long>A list of default mount options for volumes formatted with the ntfs file system.</long>
-@@ -52,7 +52,7 @@
-         <key>/schemas/system/storage/default_options/ntfs/fstype_override</key>
-         <applyto>/system/storage/default_options/ntfs/fstype_override</applyto>
-         <type>string</type>
--        <default>ntfs-3g</default>
-+        <default></default>
-         <locale name="C">
-           <short>When 'ntfs' is detected, what file system driver to use by default</short>
-           <long>The name of the file system driver to use by default when 'ntfs' is detected. This is useful for configuring the system to use the 'ntfs-3g' driver for all 'ntfs' file systems by default. User can still choose to use the 'ntfs' file system driver by overriding it per-volume or on the command line.</long>
diff --git a/gnome-base/gnome-mount/files/gnome-mount-0.6-include-locale-h.patch b/gnome-base/gnome-mount/files/gnome-mount-0.6-include-locale-h.patch
deleted file mode 100644
index 25252ca5dfd8..000000000000
--- a/gnome-base/gnome-mount/files/gnome-mount-0.6-include-locale-h.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/gnome-mount.c	2007-05-29 22:28:51.000000000 +0200
-+++ src/gnome-mount.c	2007-05-29 21:15:55.000000000 +0200
-@@ -25,6 +25,7 @@
- #endif
- 
- #include <unistd.h>
-+#include <locale.h>
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <fcntl.h>
diff --git a/gnome-base/gnome-mount/files/gnome-mount-0.8-fstablock.patch b/gnome-base/gnome-mount/files/gnome-mount-0.8-fstablock.patch
deleted file mode 100644
index 4e01f55248a1..000000000000
--- a/gnome-base/gnome-mount/files/gnome-mount-0.8-fstablock.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-# Patch for fixing hal locking when device is in fstab
-# https://bugs.gentoo.org/show_bug.cgi?id=257746
-diff -p -up a/src/gnome-mount.c b/src/gnome-mount.c
---- a/src/gnome-mount.c	2008-09-15 14:39:28.000000000 +0200
-+++ b/src/gnome-mount.c	2008-09-15 14:42:54.000000000 +0200
-@@ -1166,6 +1166,18 @@ volume_mount (const char *udi, LibHalVol
- 			char *args[3] = {MOUNT, NULL, NULL};
- 			char **envp = {NULL};
- 
-+			/* don't mount if device is locked
-+                         */
-+                        if (libhal_device_is_locked_by_others (hal_ctx,
-+                                                               udi,
-+                                                               "org.freedesktop.Hal.Device.Storage",
-+                                                               NULL)) {
-+                                if (opt_verbose)
-+                                        g_message (_("Device %s is locked, aborting"),
-+                                                   udi);
-+                                goto out;
-+                        }
-+
-                         if (opt_verbose)
-                                 g_print (_("Device %s is in /etc/fstab with mount point \"%s\"\n"), 
-                                          device_file, mount_point_fstab);
-@@ -1738,6 +1750,17 @@ volume_unmount (const char *udi, LibHalV
- 			char *args[3] = {UMOUNT, NULL, NULL};
- 			char **envp = {NULL};
- 
-+			/* don't unmount if device is locked
-+                         */
-+                        if (libhal_device_is_locked_by_others (hal_ctx,
-+                                                               udi,
-+                                                               "org.freedesktop.Hal.Device.Storage",
-+                                                               NULL)) {
-+                                if (opt_verbose)
-+                                        g_message (_("Device %s is locked, aborting"),
-+                                                   udi);
-+                                goto out;
-+                        }
-                         if (opt_verbose)
-                                 g_print (_("Device %s is in /etc/fstab with mount point \"%s\"\n"),
-                                          device_file, mount_point);
-@@ -1958,6 +1981,18 @@ volume_eject (const char *udi, LibHalVol
- 			char *args[3] = {"eject", NULL, NULL};
- 			char **envp = {NULL};
- 
-+			/* don't mount if device is locked
-+                         */
-+                        if (libhal_device_is_locked_by_others (hal_ctx,
-+                                                               udi,
-+                                                               "org.freedesktop.Hal.Device.Storage",
-+                                                               NULL)) {
-+                                if (opt_verbose)
-+                                        g_message (_("Device %s is locked, aborting"),
-+                                                   udi);
-+                                goto out;
-+                        }
-+
-                         if (opt_verbose)
-                                 g_print (_("Device %s is in /etc/fstab with mount point \"%s\"\n"), 
-                                          device_file, mount_point);
diff --git a/gnome-base/gnome-mount/files/gnome-mount-0.8-libnotify-automagic.patch b/gnome-base/gnome-mount/files/gnome-mount-0.8-libnotify-automagic.patch
deleted file mode 100644
index 2521b05263ad..000000000000
--- a/gnome-base/gnome-mount/files/gnome-mount-0.8-libnotify-automagic.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-# fix libnotify automagic dep
-# https://bugs.gentoo.org/show_bug.cgi?id=257753
-diff -ur gnome-mount@181/ChangeLog gnome-mount@182/ChangeLog
---- gnome-mount@181/src/gnome-mount.c	2009-02-05 10:04:54.000000000 +0100
-+++ gnome-mount@182/src/gnome-mount.c	2009-02-05 10:08:36.000000000 +0100
-@@ -41,7 +41,11 @@
- #include <gdk/gdkx.h>
- #include "copy-paste/gnome-password-dialog.h"
- #include <gnome-keyring.h>
-+#include <gtk/gtk.h>
-+
-+#ifdef ENABLE_NOTIFY
- #include <libnotify/notify.h>
-+#endif
- 
- #if !defined(NOTIFY_EXPIRES_NEVER)
- #define NOTIFY_EXPIRES_NEVER 0
-@@ -1549,17 +1553,21 @@
- 
- static guint unmount_cache_timeout_id = -1;
- 
-+#ifdef ENABLE_NOTIFY
- static NotifyNotification *unmount_note = NULL;
-+#endif
- 
- static gboolean unmount_note_is_eject = FALSE;
- static char *unmount_note_drive_name = NULL;
- 
-+#ifdef ENABLE_NOTIFY
- static void
- unmount_note_close_func (NotifyNotification *note, gpointer user_data)
- {
-        g_debug ("in unmount_note_close_func()");
-        unmount_note = NULL;
- }
-+#endif
- 
- static gboolean
- unmount_cache_timeout_func (gpointer data)
-@@ -1602,13 +1610,16 @@
- 	g_strchug (unmount_note_drive_name);
- 	g_debug ("Setting up 750ms timer for Flushing Cache dialog");
- 	unmount_cache_timeout_id = g_timeout_add (750, unmount_cache_timeout_func, NULL);
-+#ifdef ENABLE_NOTIFY
- 	unmount_note = NULL;
-+#endif
- }
- 
- static void
- unmount_cache_timeout_cancel (gboolean was_success)
- {
- 	g_source_remove (unmount_cache_timeout_id);
-+#ifdef ENABLE_NOTIFY
- 	if (unmount_note != NULL) {
- 		if (was_success) {
- 			char *summary;
-@@ -1628,6 +1639,7 @@
- 			notify_notification_show (unmount_note, NULL);
- 		}
- 	}
-+#endif
- }
- 
- static gboolean unmount_still_in_progress = FALSE;
---- gnome-mount@181/configure.in	2008-02-25 22:54:20.000000000 +0100
-+++ gnome-mount@182/configure.in	2009-02-05 10:25:25.000000000 +0100
-@@ -100,8 +100,11 @@
-    AC_SUBST(NAUTILUS_LIBS)
- fi
- 
--PKG_CHECK_MODULES([NOTIFY], [libnotify >= 0.3.0], [enable_notify=yes], [enable_notify=yes])
--if test "x$enable_notify" != "xno"; then
-+AC_ARG_ENABLE(libnotify,
-+	AS_HELP_STRING([--enable-libnotify],[Use libnotify]),
-+	,[enable_libnotify=yes])
-+if test "x$enable_libnotify" != "xno"; then
-+   PKG_CHECK_MODULES([NOTIFY], [libnotify >= 0.3.0])
-    AC_DEFINE_UNQUOTED([ENABLE_NOTIFY], 1, [Enable notifications with libnotify])
-    AC_SUBST(NOTIFY_CFLAGS)
-    AC_SUBST(NOTIFY_LIBS)
diff --git a/gnome-base/gnome-mount/files/gnome-mount-0.8-ntfs3g-locale.patch b/gnome-base/gnome-mount/files/gnome-mount-0.8-ntfs3g-locale.patch
deleted file mode 100644
index 21f02a36ead4..000000000000
--- a/gnome-base/gnome-mount/files/gnome-mount-0.8-ntfs3g-locale.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/gnome-mount.schemas.in
-+++ b/gnome-mount.schemas.in
-@@ -64,7 +64,7 @@
-         <applyto>/system/storage/default_options/ntfs-3g/mount_options</applyto>
-         <type>list</type>
-         <list_type>string</list_type>
--        <default>[locale=]</default>
-+        <default>[]</default>
-         <locale name="C">
-           <short>Default mount options for ntfs-3g fs</short>
-           <long>A list of default mount options for volumes formatted with the ntfs file system using ntfs-3g.</long>
diff --git a/gnome-base/gnome-mount/files/gnome-mount-0.8-vfat-defaults.patch b/gnome-base/gnome-mount/files/gnome-mount-0.8-vfat-defaults.patch
deleted file mode 100644
index 017dbc200704..000000000000
--- a/gnome-base/gnome-mount/files/gnome-mount-0.8-vfat-defaults.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-# Patch for setting noatime and flush for vfat partitions
-# https://bugs.gentoo.org/show_bug.cgi?id=257745
---- a/gnome-mount.schemas.in	2009-02-05 09:32:52.000000000 +0100
-+++ b/gnome-mount.schemas.in	2009-02-05 09:40:30.000000000 +0100
-@@ -6,7 +6,7 @@
-         <applyto>/system/storage/default_options/vfat/mount_options</applyto>
-         <type>list</type>
-         <list_type>string</list_type>
--        <default>[shortname=lower,uid=]</default>
-+        <default>[shortname=lower,flush,noatime,uid=]</default>
-         <locale name="C">
-           <short>Default mount options for vfat fs</short>
-           <long>A list of default mount options for volumes formatted with the vfat file system.</long>
diff --git a/gnome-base/gnome-mount/gnome-mount-0.8-r2.ebuild b/gnome-base/gnome-mount/gnome-mount-0.8-r2.ebuild
deleted file mode 100644
index 77ed4f04417b..000000000000
--- a/gnome-base/gnome-mount/gnome-mount-0.8-r2.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-mount/gnome-mount-0.8-r2.ebuild,v 1.4 2011/02/05 13:13:13 ssuominen Exp $
-
-# This package is used by FreeBSD long as gnome-base/gvfs has USE hal. Linux has
-# gnome-base/gvfs with USE gdu and udev.
-
-EAPI=1
-inherit autotools eutils gnome2
-
-DESCRIPTION="Wrapper for (un)mounting and ejecting disks"
-HOMEPAGE="http://hal.freedesktop.org/"
-SRC_URI="http://hal.freedesktop.org/releases/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86-fbsd"
-IUSE="nautilus kernel_FreeBSD"
-
-RDEPEND=">=dev-libs/glib-2.15:2
-	>=x11-libs/gtk+-2.8:2
-	>=sys-apps/hal-0.5.8.1
-	|| ( gnome-base/libgnome-keyring <gnome-base/gnome-keyring-2.29.4 )
-	>=gnome-base/gconf-2
-	nautilus? (
-		>=gnome-base/libglade-2
-		>=gnome-base/nautilus-2.21.2 )
-	>=dev-libs/dbus-glib-0.88"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	>=dev-util/intltool-0.35.5"
-
-DOCS="AUTHORS ChangeLog HACKING NEWS README TODO"
-
-pkg_setup() {
-	G2CONF="${G2CONF} --disable-static
-		--disable-libnotify
-		$(use_enable nautilus nautilus-extension)"
-}
-
-src_unpack() {
-	gnome2_src_unpack
-
-	use kernel_FreeBSD && epatch "${FILESDIR}/${PN}-0.6-freebsd-schemas.patch"
-
-	# Include missing locale.h, bug #176035
-	epatch "${FILESDIR}/${PN}-0.6-include-locale-h.patch"
-
-	# Better defaults for vfat, bug #257745
-	use kernel_FreeBSD || epatch "${FILESDIR}/${P}-vfat-defaults.patch"
-
-	# Fix HAL locking for devices in fstab, bug #257746
-	epatch "${FILESDIR}/${P}-fstablock.patch"
-
-	# Fix automagic dependency, bug #257753
-	epatch "${FILESDIR}/${P}-libnotify-automagic.patch"
-
-	# locale option is no longer recognized by ntfs3g, upstream bug #624953
-	epatch "${FILESDIR}/${P}-ntfs3g-locale.patch"
-
-	eautoreconf
-}
diff --git a/gnome-base/gnome-mount/metadata.xml b/gnome-base/gnome-mount/metadata.xml
deleted file mode 100644
index bb16b87226dd..000000000000
--- a/gnome-base/gnome-mount/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>gnome</herd>
-<herd>freedesktop</herd>
-<use>
-	<flag name='nautilus'>Enables the Nautilus plugin</flag>
-</use>
-</pkgmetadata>