Implemented a fix in the check for pyORBit - bumped to 0.35.3-r1

(Portage version: 2.1.1_rc1-r2)

4 files changed, 132 insertions, 1 deletions

diff --git a/gnome-extra/gdesklets-core/ChangeLog b/gnome-extra/gdesklets-core/ChangeLog
index 4166f2cb1cef..319d29bb1a4d 100644
--- a/gnome-extra/gdesklets-core/ChangeLog
+++ b/gnome-extra/gdesklets-core/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnome-extra/gdesklets-core
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gdesklets-core/ChangeLog,v 1.62 2006/07/10 01:49:46 tcort Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gdesklets-core/ChangeLog,v 1.63 2006/09/06 01:43:55 nixphoeni Exp $
+
+*gdesklets-core-0.35.3-r1 (06 Sep 2006)
+
+  06 Sep 2006; Joe Sapp <nixphoeni@gentoo.org>
+  +files/gdesklets-core-0.35.3-pyorbit_fix.patch,
+  +gdesklets-core-0.35.3-r1.ebuild:
+  Implemented a fix in the check for pyORBit
 
   10 Jul 2006; Thomas Cort <tcort@gentoo.org> gdesklets-core-0.35.3.ebuild:
   Stable on alpha wrt Bug #103966.
diff --git a/gnome-extra/gdesklets-core/files/digest-gdesklets-core-0.35.3-r1 b/gnome-extra/gdesklets-core/files/digest-gdesklets-core-0.35.3-r1
new file mode 100644
index 000000000000..216eae09c2d5
--- /dev/null
+++ b/gnome-extra/gdesklets-core/files/digest-gdesklets-core-0.35.3-r1
@@ -0,0 +1,6 @@
+MD5 3f9ce7f2ca4522bc96cb9bc4a4b91774 gDesklets-0.35.3.tar.bz2 718642
+RMD160 b40a3d9251d8d67c8cee5369603499f8a8bc4f9d gDesklets-0.35.3.tar.bz2 718642
+SHA256 7a8df729df1f29b7c37d29739e3188547334781435bf1f9f4fea16d0a29b0c55 gDesklets-0.35.3.tar.bz2 718642
+MD5 ba9ab393ba2ea844525da669f3cfe59e gdesklets-develbook-0.35.3.tar.bz2 547031
+RMD160 a8c3ebc37b62af154116eb6f6aaf9350271da822 gdesklets-develbook-0.35.3.tar.bz2 547031
+SHA256 208b6f5f92b74ac8b26c2b56a054abec3691264ef2320a386d0cd49b1c63c78d gdesklets-develbook-0.35.3.tar.bz2 547031
diff --git a/gnome-extra/gdesklets-core/files/gdesklets-core-0.35.3-pyorbit_fix.patch b/gnome-extra/gdesklets-core/files/gdesklets-core-0.35.3-pyorbit_fix.patch
new file mode 100644
index 000000000000..3ae7c2a93461
--- /dev/null
+++ b/gnome-extra/gdesklets-core/files/gdesklets-core-0.35.3-pyorbit_fix.patch
@@ -0,0 +1,11 @@
+--- gdesklets-core-0.35.3.orig/gdesklets	2005-05-11 18:47:55.000000000 -0400
++++ gdesklets-core-0.35.3/gdesklets	2006-08-31 22:24:30.000000000 -0400
+@@ -58,7 +58,7 @@
+           _("GTK python bindings (pygtk2) version >= 2.4.0 and "
+             "GTK+ version >= 2.4.0 are required.")
+         ),
+-        ( ("ORBit",), lambda m : m.__version__ == (2, 0, 1),
++        ( ("ORBit",), lambda m : m.__version__ >= (2, 0, 1),
+           _("ORBit python bindings (pyorbit) version == 2.0.1 are required.")
+         ),
+         ( ("bonobo.ui",), lambda m : m,
diff --git a/gnome-extra/gdesklets-core/gdesklets-core-0.35.3-r1.ebuild b/gnome-extra/gdesklets-core/gdesklets-core-0.35.3-r1.ebuild
new file mode 100644
index 000000000000..396cb05c8791
--- /dev/null
+++ b/gnome-extra/gdesklets-core/gdesklets-core-0.35.3-r1.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2006 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.3-r1.ebuild,v 1.1 2006/09/06 01:43:55 nixphoeni Exp $
+
+inherit gnome2 eutils autotools multilib
+
+MY_PN="gDesklets"
+MY_P="${MY_PN}-${PV/_/}"
+S=${WORKDIR}/${MY_P}
+
+DESCRIPTION="GNOME Desktop Applets: Core library for desktop applets"
+SRC_URI="http://www.gdesklets.org/downloads/${MY_P}.tar.bz2 \
+		doc? ( mirror://gentoo/gdesklets-develbook-${PV}.tar.bz2 )"
+HOMEPAGE="http://www.gdesklets.org"
+LICENSE="GPL-2"
+
+SLOT="0"
+IUSE="doc"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
+
+RDEPEND=">=dev-lang/python-2.3
+	>=dev-libs/glib-2.4
+	>=gnome-base/librsvg-2.8
+	>=gnome-base/libgtop-2.8.2
+	>=dev-python/pygtk-2.4
+	>=dev-python/gnome-python-2.6
+	>=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_unpack() {
+
+	gnome2_src_unpack
+
+	if use alpha ; then
+
+		epatch ${FILESDIR}/${P}-alpha.patch
+
+		eautoreconf
+
+	fi
+
+	epatch ${FILESDIR}/${P}-pyorbit_fix.patch
+
+}
+
+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
+	use doc && \
+		einfo "Installing the Developer's Book into" && \
+		einfo "/usr/share/doc/${PF}/html" && \
+		dohtml -r ${WORKDIR}/gdesklets-develbook/*
+
+	# Install the man page
+	doman ${S}/doc/man/*.1
+
+	# Remove conflicts with x11-misc/shared-mime-info
+	rm -rf ${D}/usr/share/mime/aliases ${D}/usr/share/mime/magic ${D}/usr/share/mime/globs \
+		${D}/usr/share/mime/subclasses ${D}/usr/share/mime/XMLnamespaces
+
+}
+
+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
+	einfo "If you're updating from a version less than 0.35_rc1,"
+	einfo "you can migrate your desklet configurations by"
+	einfo "running"
+	einfo "           /usr/lib/gdesklets/gdesklets-migration-tool"
+	einfo "after the first time you run gdesklets"
+	echo
+
+	# This stuff is important, especially the migration-tool
+	# information which flies by on an update.
+	epause 9
+
+}