Version bump. Project moved to gnome.org. Fix some UI bugs.

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

5 files changed, 16 insertions, 230 deletions

diff --git a/dev-util/d-feet/ChangeLog b/dev-util/d-feet/ChangeLog
index cbad5b3e716c..ec7945623b11 100644
--- a/dev-util/d-feet/ChangeLog
+++ b/dev-util/d-feet/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-util/d-feet
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/d-feet/ChangeLog,v 1.8 2010/02/08 08:55:38 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/d-feet/ChangeLog,v 1.9 2010/10/06 19:54:31 eva Exp $
+
+*d-feet-0.1.12 (06 Oct 2010)
+
+  06 Oct 2010; Gilles Dartiguelongue <eva@gentoo.org> -d-feet-0.1.4.ebuild,
+  -files/d-feet-0.1.4-show-properties.patch, -d-feet-0.1.6.ebuild,
+  -d-feet-0.1.8.ebuild, +d-feet-0.1.12.ebuild:
+  Version bump. Project moved to gnome.org. Fix some UI bugs.
 
   08 Feb 2010; Peter Volkov <pva@gentoo.org> d-feet-0.1.4.ebuild:
   Add inherit eutils for epatch.
diff --git a/dev-util/d-feet/d-feet-0.1.6.ebuild b/dev-util/d-feet/d-feet-0.1.12.ebuild
index 99e359ff87aa..e1e87bbd7e67 100644
--- a/dev-util/d-feet/d-feet-0.1.6.ebuild
+++ b/dev-util/d-feet/d-feet-0.1.12.ebuild
@@ -1,22 +1,24 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/d-feet/d-feet-0.1.6.ebuild,v 1.3 2009/03/10 13:57:09 steev Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/d-feet/d-feet-0.1.12.ebuild,v 1.1 2010/10/06 19:54:31 eva Exp $
+
+GCONF_DEBUG="no"
 
 inherit gnome2 distutils
 
 DESCRIPTION="D-Feet is a powerful D-Bus debugger"
-HOMEPAGE="http://hosted.fedoraproject.org/projects/d-feet/"
-SRC_URI="http://johnp.fedorapeople.org/${P}.tar.gz"
+HOMEPAGE="http://live.gnome.org/d-feet/"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
+IUSE="gnome"
 
 RDEPEND=">=sys-apps/dbus-1.0
 	>=dev-python/dbus-python-0.82.3
 	dev-python/pygtk
-	>=dev-lang/python-2.5"
+	>=dev-lang/python-2.5
+	gnome? ( dev-python/libwnck-python )"
 
 pkg_setup() {
 	PYTHON_MODNAME="dfeet"
diff --git a/dev-util/d-feet/d-feet-0.1.4.ebuild b/dev-util/d-feet/d-feet-0.1.4.ebuild
deleted file mode 100644
index 02e379ff031d..000000000000
--- a/dev-util/d-feet/d-feet-0.1.4.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/d-feet/d-feet-0.1.4.ebuild,v 1.3 2010/02/08 08:55:38 pva Exp $
-
-inherit eutils gnome2 distutils
-
-DESCRIPTION="D-Feet is a powerful D-Bus debugger"
-HOMEPAGE="http://hosted.fedoraproject.org/projects/d-feet/"
-SRC_URI="http://johnp.fedorapeople.org/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=sys-apps/dbus-1.0
-	>=dev-python/dbus-python-0.82.3
-	dev-python/pygtk
-	>=dev-lang/python-2.5"
-
-pkg_setup() {
-	PYTHON_MODNAME="dfeet"
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/${P}-show-properties.patch
-}
-
-pkg_postinst()
-{
-	distutils_pkg_postinst
-	gnome2_icon_cache_update
-}
diff --git a/dev-util/d-feet/d-feet-0.1.8.ebuild b/dev-util/d-feet/d-feet-0.1.8.ebuild
deleted file mode 100644
index 6e4acaf6ea84..000000000000
--- a/dev-util/d-feet/d-feet-0.1.8.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/d-feet/d-feet-0.1.8.ebuild,v 1.2 2009/03/10 13:57:09 steev Exp $
-
-inherit gnome2 distutils
-
-DESCRIPTION="D-Feet is a powerful D-Bus debugger"
-HOMEPAGE="http://hosted.fedoraproject.org/projects/d-feet/"
-SRC_URI="http://johnp.fedorapeople.org/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=sys-apps/dbus-1.0
-	>=dev-python/dbus-python-0.82.3
-	dev-python/pygtk
-	>=dev-lang/python-2.5"
-
-pkg_setup() {
-	PYTHON_MODNAME="dfeet"
-}
-
-pkg_postinst()
-{
-	distutils_pkg_postinst
-	gnome2_icon_cache_update
-}
diff --git a/dev-util/d-feet/files/d-feet-0.1.4-show-properties.patch b/dev-util/d-feet/files/d-feet-0.1.4-show-properties.patch
deleted file mode 100644
index 6c394c09a832..000000000000
--- a/dev-util/d-feet/files/d-feet-0.1.4-show-properties.patch
+++ /dev/null
@@ -1,158 +0,0 @@
-diff --git a/dfeet/_introspect_parser.py b/dfeet/_introspect_parser.py
-index 370d9e7..656f672 100644
---- a/dfeet/_introspect_parser.py
-+++ b/dfeet/_introspect_parser.py
-@@ -26,6 +26,8 @@ class _Parser(object):
-     __slots__ = ('map', 
-                  'in_iface', 
-                  'in_method', 
-+                 'in_signal',
-+                 'in_property',
-                  'in_sig',
-                  'out_sig', 
-                  'node_level',
-@@ -35,6 +37,7 @@ class _Parser(object):
-         self.in_iface = ''
-         self.in_method = ''
-         self.in_signal = ''
-+        self.in_property = ''
-         self.in_sig = ''
-         self.out_sig = ''
-         self.node_level = 0
-@@ -68,6 +71,10 @@ class _Parser(object):
-             elif (self.in_signal and name == 'arg'):
-                 if attributes.get('direction', 'in') == 'in':
-                     self.in_sig += attributes['type']
-+            elif (not self.in_property and name == 'property'):
-+                self.in_property = attributes['name']
-+                self.in_sig = attributes['type']
-+                self.out_sig = attributes['access']
- 
- 
-     def EndElementHandler(self, name):
-@@ -78,7 +85,7 @@ class _Parser(object):
-                 self.in_iface = ''
-             elif (self.in_method and name == 'method'):
-                 if not self.map['interfaces'].has_key(self.in_iface):
--                    self.map['interfaces'][self.in_iface]={'methods':{}, 'signals':{}}
-+                    self.map['interfaces'][self.in_iface]={'methods':{}, 'signals':{}, 'properties':{}}
- 
-                 if self.map['interfaces'][self.in_iface]['methods'].has_key(self.in_method):
-                     print "ERROR: Some clever service is trying to be cute and has the same method name in the same interface"
-@@ -90,16 +97,28 @@ class _Parser(object):
-                 self.out_sig = ''
-             elif (self.in_signal and name == 'signal'):
-                 if not self.map['interfaces'].has_key(self.in_iface):
--                    self.map['interfaces'][self.in_iface]={'methods':{}, 'signals':{}}
-+                    self.map['interfaces'][self.in_iface]={'methods':{}, 'signals':{}, 'properties':{}}
- 
-                 if self.map['interfaces'][self.in_iface]['signals'].has_key(self.in_signal):
-                     print "ERROR: Some clever service is trying to be cute and has the same signal name in the same interface"
-                 else:
-                     self.map['interfaces'][self.in_iface]['signals'][self.in_signal] = (self.in_sig, self.out_sig)
- 
--
-                 self.in_signal = ''
-                 self.in_sig = ''
-+                self.out_sig = ''
-+            elif (self.in_property and name == 'property'):
-+                if not self.map['interfaces'].has_key(self.in_iface):
-+                    self.map['interfaces'][self.in_iface]={'methods':{}, 'signals':{}, 'properties':{}}
-+
-+                if self.map['interfaces'][self.in_iface]['properties'].has_key(self.in_property):
-+                    print "ERROR: Some clever service is trying to be cute and has the same property name in the same interface"
-+                else:
-+                    self.map['interfaces'][self.in_iface]['properties'][self.in_property] = (self.in_sig, self.out_sig)
-+
-+                self.in_property = ''
-+                self.in_sig = ''
-+                self.out_sig = ''
- 
- 
- def process_introspection_data(data):
-diff --git a/dfeet/introspect_data.py b/dfeet/introspect_data.py
-index 5540b9a..e4dac89 100644
---- a/dfeet/introspect_data.py
-+++ b/dfeet/introspect_data.py
-@@ -234,6 +234,25 @@ class Signal(Node):
- 
-         return result
- 
-+class Property(Node):
-+    # tree path = (0,x,0,y,2,z)
-+    def __init__(self, model, parent, property, insig):
-+        self.property = property
-+        self.insig = insig
-+
-+        Node.__init__(self, model, parent)
-+
-+    def dbus_call(self, bus, name, *args):
-+        # for testing out properties
-+        # this is not implemented yet
-+        pass
-+
-+    def __str__(self):
-+        result = self.property + '('
-+        result += dbus_utils.sig_to_string(self.insig) + ')'
-+
-+        return result
-+
- class MethodLabel(Node):
-     # tree path = (0,x,0,y,0)
-     def __init__(self, model, parent):
-@@ -274,6 +293,26 @@ class SignalLabel(Node):
-     def __str__(self):
-         return self._label
- 
-+class PropertyLabel(Node):
-+    # tree path = (0,x,0,y,2)
-+    def __init__(self, model, parent):
-+        Node.__init__(self, model, parent)
-+        self.set_expanded(True)
-+        self._label = 'Properties'
-+
-+    def add(self, data):
-+        property_list = data.keys()
-+        property_list.sort()
-+        for property_name in property_list:
-+            property = Property(self.model, self, property_name, data[property_name])
-+            self._add_child(property, None)
-+
-+    def to_markup_str(self):
-+        return '<b>' + gobject.markup_escape_text(self._label) + '</b>'
-+
-+    def __str__(self):
-+        return self._label
-+
- class Interface(Node):
-     # tree path = (0,x,0,y)
-     def __init__(self, model, parent, interface):
-@@ -283,6 +322,7 @@ class Interface(Node):
-     def add(self, data):
-         method_data = data['methods']
-         signal_data = data['signals']
-+        property_data = data['properties']
- 
-         methods = MethodLabel(self.model, self)
-         self._add_child(methods, method_data)
-@@ -290,6 +330,9 @@ class Interface(Node):
-         signals = SignalLabel(self.model, self)
-         self._add_child(signals, signal_data)
- 
-+        properties = PropertyLabel(self.model, self)
-+        self._add_child(properties, property_data)
-+
-     def __str__(self):
-         return self.iface
- 
-@@ -367,8 +410,10 @@ class IntrospectData(gtk.GenericTreeModel):
-         (0,x,0,y)     - interface
-         (0,x,0,y,0)   - "Methods"
-         (0,x,0,y,1)   - "Signals"
-+        (0,x,0,y,2)   - "Properties"
-         (0,x,0,y,0,z) - method signature
-         (0,x,0,y,1,z) - signal signature
-+        (0,x,0,y,1,z) - property signature
-     
-     """ 
-