New version 0.33.1, and Removing old versions

(Portage version: 2.0.51-r14)

10 files changed, 53 insertions, 97 deletions

diff --git a/gnome-extra/gdesklets-core/ChangeLog b/gnome-extra/gdesklets-core/ChangeLog
index 1fbd4fad1252..a64111770dbd 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-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gdesklets-core/ChangeLog,v 1.27 2004/12/14 09:55:17 obz Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gdesklets-core/ChangeLog,v 1.28 2005/01/23 02:30:42 obz Exp $
+
+*gdesklets-core-0.33.1 (23 Jan 2005)
+
+  23 Jan 2005; Mike Gardiner <obz@gentoo.org> +gdesklets-core-0.33.1.ebuild:
+  New version, ebuild updates thanks to Joe Sapp <nixphoeni@yahoo.com>, see
+  bug #76468
 
 *gdesklets-core-0.32 (14 Dec 2004)
 
diff --git a/gnome-extra/gdesklets-core/Manifest b/gnome-extra/gdesklets-core/Manifest
index 474b187a220e..e91703fc4aa9 100644
--- a/gnome-extra/gdesklets-core/Manifest
+++ b/gnome-extra/gdesklets-core/Manifest
@@ -5,9 +5,11 @@ MD5 761ea37679e621d567bef0720de4c0b1 gdesklets-core-0.26.ebuild 1878
 MD5 a175a96fb7e85b152ade748dbd2360e0 metadata.xml 213
 MD5 8c27af183a10230d0092ec71fc66743e gdesklets-core-0.31.1.ebuild 2045
 MD5 66310578bb522169344485b0d0588d83 gdesklets-core-0.32.ebuild 2082
+MD5 d5b6f12cef0b59c8e9b16c26e91cee21 gdesklets-core-0.33.1.ebuild 2141
 MD5 4f7504d4ccdaf27867ce60b0870df37c files/digest-gdesklets-core-0.26 67
 MD5 c4920c1829bd34f15ee1b85539dd3d4a files/digest-gdesklets-core-0.26.1 69
 MD5 26c6bbd356a7de3f57ffe9036275a5e5 files/digest-gdesklets-core-0.26.2 69
 MD5 01751d3aa9192793a33c02d2126192c1 files/gdesklets-displays.desktop 230
 MD5 91327280cf4f8767b9347a82454adf08 files/digest-gdesklets-core-0.31.1 69
 MD5 ac425079423c7c93f931c3f4df0dc598 files/digest-gdesklets-core-0.32 67
+MD5 312fdc938b56dedf0fab04efe6266cb1 files/digest-gdesklets-core-0.33.1 131
diff --git a/gnome-extra/gdesklets-core/files/digest-gdesklets-core-0.26 b/gnome-extra/gdesklets-core/files/digest-gdesklets-core-0.26
deleted file mode 100644
index 18123cee262f..000000000000
--- a/gnome-extra/gdesklets-core/files/digest-gdesklets-core-0.26
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a13af8ab694fd7e1ef2ef21634aa3e39 gDesklets-0.26.tar.bz2 390440
diff --git a/gnome-extra/gdesklets-core/files/digest-gdesklets-core-0.31.1 b/gnome-extra/gdesklets-core/files/digest-gdesklets-core-0.31.1
deleted file mode 100644
index 66ea34125b1f..000000000000
--- a/gnome-extra/gdesklets-core/files/digest-gdesklets-core-0.31.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c7c0a5674a87378124b54cedc3e0f71d gDesklets-0.31.1.tar.bz2 637182
diff --git a/gnome-extra/gdesklets-core/files/digest-gdesklets-core-0.33.1 b/gnome-extra/gdesklets-core/files/digest-gdesklets-core-0.33.1
new file mode 100644
index 000000000000..70c73241c2f3
--- /dev/null
+++ b/gnome-extra/gdesklets-core/files/digest-gdesklets-core-0.33.1
@@ -0,0 +1,2 @@
+MD5 db252b31b56b1c2f49312d5837c311b8 gDesklets-0.33.1.tar.bz2 690678
+MD5 bba42e71aa3a0d310ad6ee763fcbac25 develbook.tar.bz2 445919
diff --git a/gnome-extra/gdesklets-core/gdesklets-core-0.26.1.ebuild b/gnome-extra/gdesklets-core/gdesklets-core-0.26.1.ebuild
index 3b9e79e3f18a..5da31bc371ec 100644
--- a/gnome-extra/gdesklets-core/gdesklets-core-0.26.1.ebuild
+++ b/gnome-extra/gdesklets-core/gdesklets-core-0.26.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# 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.26.1.ebuild,v 1.4 2004/09/02 17:52:36 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gdesklets-core/gdesklets-core-0.26.1.ebuild,v 1.5 2005/01/23 02:30:42 obz Exp $
 
 inherit gnome2
 
diff --git a/gnome-extra/gdesklets-core/gdesklets-core-0.26.2.ebuild b/gnome-extra/gdesklets-core/gdesklets-core-0.26.2.ebuild
index 8941f66d3453..9640795d563c 100644
--- a/gnome-extra/gdesklets-core/gdesklets-core-0.26.2.ebuild
+++ b/gnome-extra/gdesklets-core/gdesklets-core-0.26.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# 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.26.2.ebuild,v 1.2 2004/09/02 17:52:36 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gdesklets-core/gdesklets-core-0.26.2.ebuild,v 1.3 2005/01/23 02:30:42 obz Exp $
 
 inherit gnome2
 
diff --git a/gnome-extra/gdesklets-core/gdesklets-core-0.26.ebuild b/gnome-extra/gdesklets-core/gdesklets-core-0.26.ebuild
deleted file mode 100644
index 24b1bfb1e4cf..000000000000
--- a/gnome-extra/gdesklets-core/gdesklets-core-0.26.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2004 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.26.ebuild,v 1.5 2004/09/02 17:52:36 pvdabeel Exp $
-
-inherit gnome2
-
-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.pycage.de/download/gdesklets/${MY_P}.tar.bz2"
-HOMEPAGE="http://www.pycage.de/software_gdesklets.html"
-LICENSE="GPL-2"
-
-SLOT="0"
-IUSE=""
-KEYWORDS="~x86 ppc ~sparc amd64 ~alpha"
-
-RDEPEND=">=dev-lang/python-2.2
-	>=gnome-base/gconf-2
-	>=gnome-base/libgtop-2
-	>=dev-python/pygtk-1.99.17
-	>=dev-python/gnome-python-1.99.17
-	>=x11-libs/gtk+-2.2
-	>=gnome-base/libgnomeui-2.2"
-
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	dev-util/pkgconfig
-	dev-util/intltool"
-
-USE_DESTDIR="1"
-DOCS="AUTHORS COPYING ChangeLog INSTALL NEWS README TODO"
-
-src_install() {
-
-	gnome2_src_install
-	# there are two links that end up pointing inside the
-	# image that we need to fix up here
-	dosym /usr/share/gdesklets/gdesklets /usr/bin/gdesklets
-	dosym /usr/share/pixmaps/gdesklets.png \
-		  /usr/share/gdesklets/data/gdesklets.png
-
-	# and install the display navigation desktop
-	insinto /usr/share/applications
-	doins ${FILESDIR}/gdesklets-displays.desktop
-
-}
-
-pkg_postinst() {
-
-	gnome2_pkg_postinst
-
-	echo ""
-	einfo "gDesklets Displays are required before the library"
-	einfo "will be usable for you. The displays are found in - "
-	einfo "           x11-plugins/desklet-*"
-	einfo "Please install at least one of these before using"
-	einfo "gDesklets. Next, you'll need to run 'gdesklets' "
-	einfo "and then add the Displays from - "
-	einfo "         /usr/share/gdesklets/Displays"
-	einfo "If you're using GNOME this can be done conveniently"
-	einfo "through Applications->Accessories menu"
-	echo ""
-
-}
-
diff --git a/gnome-extra/gdesklets-core/gdesklets-core-0.32.ebuild b/gnome-extra/gdesklets-core/gdesklets-core-0.32.ebuild
index a0dce1e9f100..7e189efbb8d7 100644
--- a/gnome-extra/gdesklets-core/gdesklets-core-0.32.ebuild
+++ b/gnome-extra/gdesklets-core/gdesklets-core-0.32.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# 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.32.ebuild,v 1.1 2004/12/14 09:55:17 obz Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gdesklets-core/gdesklets-core-0.32.ebuild,v 1.2 2005/01/23 02:30:42 obz Exp $
 
 inherit gnome2 eutils
 
diff --git a/gnome-extra/gdesklets-core/gdesklets-core-0.31.1.ebuild b/gnome-extra/gdesklets-core/gdesklets-core-0.33.1.ebuild
index 0fdd610b9a16..645e2a888a1b 100644
--- a/gnome-extra/gdesklets-core/gdesklets-core-0.31.1.ebuild
+++ b/gnome-extra/gdesklets-core/gdesklets-core-0.33.1.ebuild
@@ -1,30 +1,32 @@
-# Copyright 1999-2004 Gentoo Foundation
+# 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.31.1.ebuild,v 1.1 2004/12/02 05:08:34 obz Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gdesklets-core/gdesklets-core-0.33.1.ebuild,v 1.1 2005/01/23 02:30:42 obz Exp $
 
 inherit gnome2 eutils
 
 MY_PN="gDesklets"
 MY_P="${MY_PN}-${PV}"
-S=${WORKDIR}/${MY_PN}-0.31
+S=${WORKDIR}/${MY_P}
 
 DESCRIPTION="GNOME Desktop Applets: core library for the desktop applets"
-SRC_URI="http://www.pycage.de/download/gdesklets/${MY_P}.tar.bz2"
-HOMEPAGE="http://www.pycage.de/software_gdesklets.html"
+SRC_URI="http://www.pycage.de/download/gdesklets/${MY_P}.tar.bz2 \
+		 http://www.pycage.de/develbook/develbook.tar.bz2 "
+HOMEPAGE="http://gdesklets.gnomedesktop.org"
 LICENSE="GPL-2"
 
 SLOT="0"
-IUSE=""
+IUSE="doc"
 KEYWORDS="~x86 ~ppc ~sparc ~amd64 ~alpha"
 
 RDEPEND=">=dev-lang/python-2.3
+	>=dev-libs/glib-2
+	>=gnome-base/librsvg-2
 	>=gnome-base/gconf-2
-	>=gnome-base/libgtop-2
+	>=gnome-base/libgtop-2.6
 	>=dev-python/pygtk-2.4
 	>=dev-python/gnome-python-2.6
 	>=x11-libs/gtk+-2.2
-	>=gnome-base/libgnomeui-2.2
-	>=dev-lang/swig-1.3"
+	>=gnome-base/libgnomeui-2.2"
 
 DEPEND="${RDEPEND}
 	sys-devel/gettext
@@ -34,17 +36,31 @@ DEPEND="${RDEPEND}
 USE_DESTDIR="1"
 DOCS="AUTHORS ChangeLog NEWS README TODO"
 
+src_unpack() {
+	unpack ${A}
+	# Fix the TilingImage.py bug
+	cd ${S}/utils
+	sed -i -e "s/gnomevfs.exists(uri)/gnomevfs.exists(gnomevfs.URI(uri))/" \
+		TilingImage.py
+
+}
+
 src_install() {
 
 	gnome2_src_install
-	# there are two links that end up pointing inside the
-	# image that we need to fix up here
-	dosym /usr/share/gdesklets/gdesklets /usr/bin/gdesklets
-	dosym /usr/share/pixmaps/gdesklets.png \
-		  /usr/share/gdesklets/data/gdesklets.png
-
-	# install the migration tool
-	newbin migration-tool gdesklets-migration-tool
+	# Symlink the binaries from /usr/lib/gdesklets
+	# to /usr/bin
+	dosym /usr/lib/gdesklets/gdesklets-migration-tool \
+		  /usr/bin/gdesklets-migration-tool
+	dosym /usr/lib/gdesklets/gdesklets-daemon \
+		  /usr/bin/gdesklets-daemon
+	dosym /usr/lib/gdesklets/gdesklets-logview \
+		  /usr/bin/gdesklets-logview
+	dosym /usr/lib/gdesklets/gdesklets-shell \
+		  /usr/bin/gdesklets-shell
+
+	# Install the Developer's book documentation
+	use doc && dohtml -r ${WORKDIR}/develbook/*
 
 }
 
@@ -60,10 +76,10 @@ pkg_postinst() {
 	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 menu item"
+	einfo "through Applications->Accessories->gDesklets"
 	echo ""
 	ewarn "If you are migrating from a previous version of "
-	ewarn "gDesklets, please convert your settings, using - "
+	ewarn "gDesklets, please convert your settings with - "
 	ewarn "         /usr/bin/gdesklets-migration-tool "
 	echo ""