Bump to 0.3.4.2. Fix bug #263001.

(Portage version: 2.2_rc25/cvs/Linux x86_64)

3 files changed, 155 insertions, 2 deletions

diff --git a/app-misc/gnomecatalog/ChangeLog b/app-misc/gnomecatalog/ChangeLog
index b64bad8990c2..f2935b9ee9f9 100644
--- a/app-misc/gnomecatalog/ChangeLog
+++ b/app-misc/gnomecatalog/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-misc/gnomecatalog
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/gnomecatalog/ChangeLog,v 1.1 2008/01/19 17:15:05 bass Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/gnomecatalog/ChangeLog,v 1.2 2009/03/22 14:27:47 eva Exp $
+
+*gnomecatalog-0.3.4.2 (22 Mar 2009)
+
+  22 Mar 2009; Gilles Dartiguelongue <eva@gentoo.org>
+  +files/gnomecatalog-0.3.4.2-dbus.patch, +gnomecatalog-0.3.4.2.ebuild:
+  Bump to 0.3.4.2. Fix bug #263001.
 
 *gnomecatalog-0.3.3 (19 Jan 2008)
 
diff --git a/app-misc/gnomecatalog/files/gnomecatalog-0.3.4.2-dbus.patch b/app-misc/gnomecatalog/files/gnomecatalog-0.3.4.2-dbus.patch
new file mode 100644
index 000000000000..705c148963a2
--- /dev/null
+++ b/app-misc/gnomecatalog/files/gnomecatalog-0.3.4.2-dbus.patch
@@ -0,0 +1,109 @@
+# https://sourceforge.net/tracker2/?func=detail&aid=2622610&group_id=118573&atid=681722
+--- a/gnomecatalog/data.py	(revision 1)
++++ b/gnomecatalog/data.py	(working copy)
+@@ -33,32 +33,34 @@
+ 
+ 	""" Leemos el disco y lo insertamos en la base de datos """
+ 	def import_disk(self):
+-		path = self.config.get("source")
++		
++		for path in utils.get_path():
++			#~ path = self.config.get("source")
+ 
+-		database = storage.Sqlite(self.opened_database, self.app, True)
++			database = storage.Sqlite(self.opened_database, self.app, True)
+ 
+-		if self.config.get("thumbnails") == "True":
+-			if not os.path.exists(database.database + "_thumbs"):
+-				os.mkdir(database.database + "_thumbs")
++			if self.config.get("thumbnails") == "True":
++				if not os.path.exists(database.database + "_thumbs"):
++					os.mkdir(database.database + "_thumbs")
+ 
+-		"""Importamos un nuevo disco"""
+-		if not utils.is_mounted(path):
+-			self.__path = path
+-			self.__progress = self.app.progress_bar
+-			utils.mount(path, self._mount_callback)
++			"""Importamos un nuevo disco"""
++			if not utils.is_mounted(path):
++				self.__path = path
++				self.__progress = self.app.progress_bar
++				utils.mount(path, self._mount_callback)
+ 
+-		disk = self.reader.read(path, self.app.progress_bar)
++			disk = self.reader.read(path, self.app.progress_bar)
+ 
+-		if disk:
+-			""" ahora insertamos los datos en la base de datos. """
+-			disk = database.insert_disk(disk)
+-			if self.config.get("eject") == "True": utils.eject(path)
+-			self.app.set_guardar_state(True)
+-#			self.load_data()
+-#			self.treeDisk.select(disk)
+-	#		self.show_files_from_selected()
+-			database.close()
+-			return disk
++			if disk:
++				""" ahora insertamos los datos en la base de datos. """
++				disk = database.insert_disk(disk)
++				if self.config.get("eject") == "True": utils.eject(path)
++				self.app.set_guardar_state(True)
++	#			self.load_data()
++	#			self.treeDisk.select(disk)
++		#		self.show_files_from_selected()
++				database.close()
++				return disk
+ 
+ 
+ 	""" Carga los discos de a base de datos en el treeview tree """
+--- a/gnomecatalog/utils.py	(revision 1)
++++ b/gnomecatalog/utils.py	(working copy)
+@@ -1,6 +1,28 @@
+ import os, commands, time
+ import gnomevfs, gtk
++import dbus, dbus.glib, sys, urllib
+ 
++
++def get_path():
++	path = []
++	bus = dbus.SystemBus()
++	hal_obj = bus.get_object ('org.freedesktop.Hal', '/org/freedesktop/Hal/Manager')
++	hal = dbus.Interface (hal_obj, 'org.freedesktop.Hal.Manager')
++	udis = hal.FindDeviceByCapability ('storage')
++	for udi in udis:
++		dev_obj = bus.get_object ('org.freedesktop.Hal', udi)
++		dev = dbus.Interface (dev_obj, 'org.freedesktop.Hal.Device')
++		if (dev.GetProperty ('storage.removable')):
++			block = dev.GetProperty ('block.device')
++			f = open ('/etc/mtab')
++			for line in f.readlines():
++				if (line.find (block) == 0):
++					mount = line.split()
++					path.append(mount[1].replace('\\040',' '))
++			f.close()
++	return path
++
++
+ def locate_file(path, type = "icons"):
+ 	prefixes = ['', 'usr/', 'usr/local/']
+ 	if type == "glade":
+--- a/gnomecatalog/ui/app.py	(revision 1)
++++ b/gnomecatalog/ui/app.py	(working copy)
+@@ -162,14 +162,6 @@
+ 		self.import_thread.start()
+ 		gobject.timeout_add(1000, self.wait_import_cb)
+ 
+-#		t2 = threading.Thread(target=self.wait_import_cb)
+-#		t2.setDaemon(True)
+-#		t2.start()
+-
+-#		gobject.idle_add(self.wait_import_cb, t)
+-
+-		#dialogs.addDisk(self.data).loadDisk()
+-
+ 	def wait_import_cb(self):
+ 		if not self.import_thread.isAlive():
+ 			self.hbox_import.hide()
+
+ 	  	 
diff --git a/app-misc/gnomecatalog/gnomecatalog-0.3.4.2.ebuild b/app-misc/gnomecatalog/gnomecatalog-0.3.4.2.ebuild
new file mode 100644
index 000000000000..c572f86e4f1e
--- /dev/null
+++ b/app-misc/gnomecatalog/gnomecatalog-0.3.4.2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/gnomecatalog/gnomecatalog-0.3.4.2.ebuild,v 1.1 2009/03/22 14:27:47 eva Exp $
+
+EAPI="2"
+
+inherit eutils python distutils
+
+DESCRIPTION="Cataloging software for CDs and DVDs."
+HOMEPAGE="http://gnomecatalog.sf.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=x11-libs/gtk+-2.4
+	>=gnome-base/libglade-2
+	dev-python/pyvorbis
+	>=dev-lang/python-2.5
+	dev-python/pysqlite:2
+	|| (
+		>=dev-lang/python-2.5[xml]
+		dev-python/pyxml )
+	dev-python/kaa-metadata
+
+	dev-python/gconf-python
+	dev-python/libgnome-python
+	dev-python/gnome-vfs-python
+	dev-python/pygobject
+	>=dev-python/pygtk-2.4"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	# Fix importing from a single folder in /media
+	epatch "${FILESDIR}/${P}-dbus.patch"
+}