Marking 1.2.2 stable (x86). Removing old ebuilds/patches.

(Portage version: 2.0.51.22-r2)

8 files changed, 7 insertions, 182 deletions

diff --git a/gnome-base/gnome-volume-manager/ChangeLog b/gnome-base/gnome-volume-manager/ChangeLog
index 9a7e05b55ee0..313273905f06 100644
--- a/gnome-base/gnome-volume-manager/ChangeLog
+++ b/gnome-base/gnome-volume-manager/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-base/gnome-volume-manager
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-volume-manager/ChangeLog,v 1.27 2005/08/23 01:31:53 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-volume-manager/ChangeLog,v 1.28 2005/08/25 03:02:30 leonardop Exp $
+
+  25 Aug 2005; Leonardo Boshell <leonardop@gentoo.org>
+  gnome-volume-manager-1.2.2.ebuild:
+  Stable on x86.
 
   23 Aug 2005; Aron Griffis <agriffis@gentoo.org>
   gnome-volume-manager-1.2.1.ebuild:
diff --git a/gnome-base/gnome-volume-manager/files/digest-gnome-volume-manager-1.0.3 b/gnome-base/gnome-volume-manager/files/digest-gnome-volume-manager-1.0.3
deleted file mode 100644
index 821079cedfdd..000000000000
--- a/gnome-base/gnome-volume-manager/files/digest-gnome-volume-manager-1.0.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a6987039afb1b22c981239913ed80d36 gnome-volume-manager-1.0.3.tar.bz2 194020
diff --git a/gnome-base/gnome-volume-manager/files/digest-gnome-volume-manager-1.2.0 b/gnome-base/gnome-volume-manager/files/digest-gnome-volume-manager-1.2.0
deleted file mode 100644
index 14db388df713..000000000000
--- a/gnome-base/gnome-volume-manager/files/digest-gnome-volume-manager-1.2.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 115433f785e854c36988dda31c8af8ee gnome-volume-manager-1.2.0.tar.bz2 240870
diff --git a/gnome-base/gnome-volume-manager/files/gnome-volume-manager-1.0.2-hal_updates.patch b/gnome-base/gnome-volume-manager/files/gnome-volume-manager-1.0.2-hal_updates.patch
deleted file mode 100644
index be6603ac63be..000000000000
--- a/gnome-base/gnome-volume-manager/files/gnome-volume-manager-1.0.2-hal_updates.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-===================================================================
-RCS file: /cvs/gnome/gnome-volume-manager/src/manager.c,v
-retrieving revision 1.31
-retrieving revision 1.32
-diff -u -r1.31 -r1.32
---- manager.c	2004/09/01 19:17:41	1.31
-+++ manager.c	2004/09/20 16:12:22	1.32
-@@ -38,7 +38,7 @@
- # define N_(String) (String)
- #endif
- 
--/*#define GVM_DEBUG*/
-+#define GVM_DEBUG
- #ifdef GVM_DEBUG
- # define dbg(fmt,arg...) fprintf(stderr, "%s/%d: " fmt,__FILE__,__LINE__,##arg)
- #else
-@@ -664,6 +664,16 @@
- {
- 	char *media_type;
- 
-+	/* Refuse to enforce policy on removable media if drive is locked */
-+	if (hal_device_property_exists (
-+		    hal_ctx, storage_device, "info.locked") &&
-+	    hal_device_get_property_bool (
-+		    hal_ctx, storage_device, "info.locked")) {
-+		dbg ("Drive with udi %s is locked through hal; "
-+		     "skipping policy\n", storage_device);
-+		return;
-+	}
-+
- 	/*
- 	 * Get HAL's interpretation of our media type.  Note that we must check
- 	 * the storage device and not this UDI
diff --git a/gnome-base/gnome-volume-manager/files/gnome-volume-manager-1.0.2-hal_updates2.patch b/gnome-base/gnome-volume-manager/files/gnome-volume-manager-1.0.2-hal_updates2.patch
deleted file mode 100644
index 0c19cfe1b4fa..000000000000
--- a/gnome-base/gnome-volume-manager/files/gnome-volume-manager-1.0.2-hal_updates2.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-===================================================================
-RCS file: /cvs/gnome/gnome-volume-manager/src/manager.c,v
-retrieving revision 1.30
-retrieving revision 1.31
-diff -u -r1.30 -r1.31
---- manager.c	2004/08/30 14:53:09	1.30
-+++ manager.c	2004/09/01 19:17:41	1.31
-@@ -659,7 +659,8 @@
-  * At the moment, we only handle CD-ROM and DVD drives.
-  */
- static void
--gvm_media_changed (const char *udi, const char *storage_device)
-+gvm_media_changed (const char *udi, const char *storage_device, 
-+		   const char *device)
- {
- 	char *media_type;
- 
-@@ -674,10 +675,14 @@
- 		return;
- 	}
- 
--	if (!g_strcasecmp (media_type, "cdrom"))
-+	if (!g_strcasecmp (media_type, "cdrom")) {
- 		gvm_cdrom_policy (udi);
--
--	/* other media_types go here */
-+	} else {
-+		dbg ("Added: %s\n", device);
-+		
-+		if (config.automount_drives)
-+			gvm_device_mount (device);
-+	}
- 
- 	hal_free_string (media_type);
- }
-@@ -730,7 +735,7 @@
- 					  "storage.removable")) {
- 		/* we handle media change events separately */
- 		dbg ("Changed: %s\n", device);
--		gvm_media_changed (udi, storage_device);
-+		gvm_media_changed (udi, storage_device, device);
- 		goto out;
- 	}
- 	
-@@ -952,9 +957,10 @@
- 
- 		/* only mount if the block device got a sensible filesystem */
- 		if (!hal_device_property_exists (ctx, udi, 
--						"volume.is_filesystem") ||
--		    !hal_device_get_property_bool (ctx, udi, 
--						   "volume.is_filesystem"))
-+						"volume.fsusage") ||
-+		    strcmp (hal_device_get_property_string (ctx, udi, 
-+							    "volume.fsusage"), 
-+			    "filesystem") != 0)
- 			continue;
- 
- 		device_file = hal_device_get_property_string (ctx, udi,
diff --git a/gnome-base/gnome-volume-manager/gnome-volume-manager-1.0.3.ebuild b/gnome-base/gnome-volume-manager/gnome-volume-manager-1.0.3.ebuild
deleted file mode 100644
index 842f137e92b1..000000000000
--- a/gnome-base/gnome-volume-manager/gnome-volume-manager-1.0.3.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-volume-manager/gnome-volume-manager-1.0.3.ebuild,v 1.4 2005/05/08 15:33:01 agriffis Exp $
-
-inherit gnome2 eutils
-
-DESCRIPTION="Daemon that enforces volume-related policies"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ia64 ppc x86"
-IUSE=""
-
-# we just require the latest of the utopia stack to be on the safe side
-RDEPEND=">=sys-apps/dbus-0.22
-	>=sys-apps/hal-0.2.98
-	>=gnome-base/libglade-2
-	>=gnome-base/libgnomeui-2.2"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	>=dev-util/intltool-0.29"
-
-DOCS="AUTHORS ChangeLog README HACKING NEWS TODO"
-
-src_unpack() {
-
-	unpack ${A}
-
-	# makes gvm work with fam 0.2.98
-	cd ${S}/src
-	epatch ${FILESDIR}/${PN}-1.0.2-hal_updates.patch
-	epatch ${FILESDIR}/${PN}-1.0.2-hal_updates2.patch
-
-}
-
-pkg_postinst() {
-
-	gnome2_pkg_postinst
-
-	einfo "To start the gnome-volume-manager daemon you need to configure"
-	einfo "it through it's preferences capplet. Also the HAL daemon (hald)"
-	einfo "needs to be running or it will shut down."
-
-}
-
-USE_DESTDIR="1"
diff --git a/gnome-base/gnome-volume-manager/gnome-volume-manager-1.2.0.ebuild b/gnome-base/gnome-volume-manager/gnome-volume-manager-1.2.0.ebuild
deleted file mode 100644
index 7c95f738df3b..000000000000
--- a/gnome-base/gnome-volume-manager/gnome-volume-manager-1.2.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-volume-manager/gnome-volume-manager-1.2.0.ebuild,v 1.6 2005/06/12 19:11:40 tester Exp $
-
-inherit gnome2 eutils
-
-DESCRIPTION="Daemon that enforces volume-related policies"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ia64 ppc ppc64 x86"
-IUSE=""
-
-# we just require the latest of the utopia stack to be on the safe side
-RDEPEND=">=x11-libs/gtk+-2.4
-	>=sys-apps/dbus-0.22
-	>=sys-apps/hal-0.2.98
-	>=gnome-base/libglade-2
-	>=gnome-base/libgnomeui-2.2"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	>=dev-util/intltool-0.29"
-
-DOCS="AUTHORS ChangeLog README HACKING NEWS TODO"
-
-pkg_postinst() {
-
-	gnome2_pkg_postinst
-
-	einfo "To start the gnome-volume-manager daemon you need to configure"
-	einfo "it through it's preferences capplet. Also the HAL daemon (hald)"
-	einfo "needs to be running or it will shut down."
-
-}
-
-USE_DESTDIR="1"
diff --git a/gnome-base/gnome-volume-manager/gnome-volume-manager-1.2.2.ebuild b/gnome-base/gnome-volume-manager/gnome-volume-manager-1.2.2.ebuild
index c3f1e94c70b8..9b51639e3358 100644
--- a/gnome-base/gnome-volume-manager/gnome-volume-manager-1.2.2.ebuild
+++ b/gnome-base/gnome-volume-manager/gnome-volume-manager-1.2.2.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/gnome-base/gnome-volume-manager/gnome-volume-manager-1.2.2.ebuild,v 1.1 2005/07/22 19:47:25 leonardop Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-volume-manager/gnome-volume-manager-1.2.2.ebuild,v 1.2 2005/08/25 03:02:30 leonardop Exp $
 
 inherit gnome2
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.gnome.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64 ~ia64 ~ppc ~ppc64"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 x86"
 IUSE=""
 
 # we just require the latest of the utopia stack to be on the safe side