Version bump and reduction of the gdesklets-control-getid script

Package-Manager: portage-2.0.51.22-r1

5 files changed, 96 insertions, 12 deletions

diff --git a/gnome-extra/gdesklets-core/ChangeLog b/gnome-extra/gdesklets-core/ChangeLog
index 34a62001521a..ae64df944ee2 100644
--- a/gnome-extra/gdesklets-core/ChangeLog
+++ b/gnome-extra/gdesklets-core/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnome-extra/gdesklets-core
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gdesklets-core/ChangeLog,v 1.36 2005/05/27 00:36:59 nixphoeni Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gdesklets-core/ChangeLog,v 1.37 2005/06/18 03:35:33 nixphoeni Exp $
+
+*gdesklets-core-0.35.1 (18 Jun 2005)
+
+  18 Jun 2005; Joe Sapp <nixphoeni@gentoo.org>
+  files/gdesklets-control-getid, +gdesklets-core-0.35.1.ebuild:
+  Version bump and reduction of the gdesklets-control-getid script
 
 *gdesklets-core-0.35 (27 May 2005)
 
diff --git a/gnome-extra/gdesklets-core/Manifest b/gnome-extra/gdesklets-core/Manifest
index 8726c7897f01..f88cbe62d560 100644
--- a/gnome-extra/gdesklets-core/Manifest
+++ b/gnome-extra/gdesklets-core/Manifest
@@ -1,8 +1,9 @@
 MD5 9f6b8d849cbbf9cb6cfaf6a1a166e773 gdesklets-core-0.35_rc1.ebuild 2095
 MD5 7e51921ee4c07e4fa9fbc277cd1d3d6b gdesklets-core-0.34.3.ebuild 2142
+MD5 0b5ba6af0ac144cab9b644e582d3c577 gdesklets-core-0.35.1.ebuild 2112
 MD5 7d317df024bb6183640d3d333695ee18 gdesklets-core-0.26.2.ebuild 1876
 MD5 691edd1ab85f3afe8053de054a4aebce gdesklets-core-0.35.ebuild 2101
-MD5 2a4fa26df15c5041afbd27d830322bbf ChangeLog 6095
+MD5 e15508e1139f91ed90f2a727c1ce9ef1 ChangeLog 6312
 MD5 81bf4f817cbe8580ed9cfc1663b55ca8 gdesklets-core-0.33.1.ebuild 2423
 MD5 84678aa8329ed7cbd239468ab3f7ee1a gdesklets-core-0.26.1.ebuild 1875
 MD5 a175a96fb7e85b152ade748dbd2360e0 metadata.xml 213
@@ -11,9 +12,10 @@ MD5 c4920c1829bd34f15ee1b85539dd3d4a files/digest-gdesklets-core-0.26.1 69
 MD5 26c6bbd356a7de3f57ffe9036275a5e5 files/digest-gdesklets-core-0.26.2 69
 MD5 312fdc938b56dedf0fab04efe6266cb1 files/digest-gdesklets-core-0.33.1 131
 MD5 8293012469f5859ebfb450e81f87a165 files/digest-gdesklets-core-0.34.3 131
+MD5 ca60272587dbc0bfcdaa066753437811 files/digest-gdesklets-core-0.35.1 131
 MD5 ac3a171744ef9b36bed102088be244a9 files/digest-gdesklets-core-0.35_rc1 132
 MD5 ac425079423c7c93f931c3f4df0dc598 files/digest-gdesklets-core-0.32 67
 MD5 66ab1d1c9445bb382edafdb15eee161d files/digest-gdesklets-core-0.35 129
-MD5 653dab9b954037352e3fe6e7eec83bce files/gdesklets-control-getid 815
+MD5 b9861538d27ddcccf566148374dcd22a files/gdesklets-control-getid 745
 MD5 8e873c3bd94ee7756f3caf1c0f5b9398 files/dst-fix-0.34.3.patch 1269
 MD5 01751d3aa9192793a33c02d2126192c1 files/gdesklets-displays.desktop 230
diff --git a/gnome-extra/gdesklets-core/files/digest-gdesklets-core-0.35.1 b/gnome-extra/gdesklets-core/files/digest-gdesklets-core-0.35.1
new file mode 100644
index 000000000000..9088a4229464
--- /dev/null
+++ b/gnome-extra/gdesklets-core/files/digest-gdesklets-core-0.35.1
@@ -0,0 +1,2 @@
+MD5 2017ece8b60cf2065cd2cc5ea10a6219 gDesklets-0.35.1.tar.bz2 733865
+MD5 bba42e71aa3a0d310ad6ee763fcbac25 develbook.tar.bz2 445919
diff --git a/gnome-extra/gdesklets-core/files/gdesklets-control-getid b/gnome-extra/gdesklets-core/files/gdesklets-control-getid
index db9f6820a84d..88b4fccd53aa 100755
--- a/gnome-extra/gdesklets-core/files/gdesklets-control-getid
+++ b/gnome-extra/gdesklets-core/files/gdesklets-control-getid
@@ -3,27 +3,21 @@
 # Pretty much copied from test-control.py
 
 from plugin.Interface import Interface
-from main import HOME
-from plugin import Permission
-
 
 import sys
 import os
-import code
 import __builtin__
 
 if "." not in sys.path: sys.path.append(".")
-if HOME not in sys.path: sys.path.append(HOME)
-
 
 try:
     path = os.path.abspath(sys.argv[1])
     folder, base = os.path.split(path)
 except:
-    sys.exit("Usage: gdesklets-control-getid <control-directory>")
+    #sys.exit("Usage: gdesklets-control-getid <control-directory>")
+    print "ERROR_IN_CONTROL_INSTALLATION"
     
 
-cwd = os.getcwd()
 os.chdir(folder)
 try:
     module = __import__(base)
@@ -32,6 +26,7 @@ try:
     ctrl = clss()
     
 except IOError:
-    sys.exit("Could not load control %s." % (path))
+    #sys.exit("Could not load control %s." % (path))
+    print folder
 
 print Interface.get_id(Interface.get_interfaces(clss)[0]).replace(":", "_")
diff --git a/gnome-extra/gdesklets-core/gdesklets-core-0.35.1.ebuild b/gnome-extra/gdesklets-core/gdesklets-core-0.35.1.ebuild
new file mode 100644
index 000000000000..d612fa35956d
--- /dev/null
+++ b/gnome-extra/gdesklets-core/gdesklets-core-0.35.1.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gdesklets-core/gdesklets-core-0.35.1.ebuild,v 1.1 2005/06/18 03:35:33 nixphoeni Exp $
+
+inherit gnome2 eutils multilib
+
+MY_PN="gDesklets"
+MY_P="${MY_PN}-${PV/_/}"
+S=${WORKDIR}/${MY_P}
+
+DESCRIPTION="GNOME Desktop Applets: core library for the desktop applets"
+SRC_URI="http://www.gdesklets.org/releases/${MY_P}.tar.bz2 \
+		http://www.pycage.de/develbook/develbook.tar.bz2"
+HOMEPAGE="http://gdesklets.gnomedesktop.org"
+LICENSE="GPL-2"
+
+SLOT="0"
+IUSE="doc"
+KEYWORDS="~x86 ~ppc ~amd64 ~sparc"
+
+RDEPEND=">=dev-lang/python-2.3
+	>=dev-libs/glib-2
+	>=gnome-base/librsvg-2
+	>=gnome-base/libgtop-2.8.2
+	>=dev-python/pygtk-2.4
+	>=dev-python/gnome-python-2.6
+	>=x11-libs/gtk+-2.2
+	>=dev-libs/expat-1.95.8
+	>=dev-python/pyxml-0.8.3-r1"
+
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	dev-util/pkgconfig
+	dev-util/intltool"
+
+USE_DESTDIR="1"
+DOCS="AUTHORS ChangeLog NEWS README TODO"
+
+src_install() {
+
+	gnome2_src_install
+
+	# Install the gdesklets-control-getid script
+	insinto /usr/$(get_libdir)/gdesklets
+	insopts -m0555
+	doins ${FILESDIR}/gdesklets-control-getid
+
+	# Create a global directory for Displays
+	dodir /usr/$(get_libdir)/gdesklets/Displays
+
+	# Install the Developer's book documentation
+	use doc && dohtml -r ${WORKDIR}/develbook/*
+
+}
+
+pkg_postinst() {
+
+	gnome2_pkg_postinst
+
+	echo ""
+	einfo "gDesklets Displays are required before the library"
+	einfo "will be usable. The displays are found in - "
+	einfo "           x11-plugins/desklet-*"
+	einfo "or at http://gdesklets.gnomedesktop.org"
+	echo ""
+	einfo "Next you'll need to start gdesklets using"
+	einfo "           /usr/bin/gdesklets start"
+	einfo "If you're using GNOME this can be done conveniently"
+	einfo "through Applications->Accessories->gDesklets"
+	echo ""
+	ewarn "If you're updating from a version less than 0.35_rc1,"
+	ewarn "note that your desklet configurations will be lost."
+	echo ""
+
+	# This stuff is important, especially the migration-tool
+	# information which flies by on an update.
+	epause 9
+
+}