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

Package-Manager: portage-2.1.1_rc1-r2

5 files changed, 149 insertions, 7 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/Manifest b/gnome-extra/gdesklets-core/Manifest
index 17a8c5dfee19..e0f9c3fda775 100644
--- a/gnome-extra/gdesklets-core/Manifest
+++ b/gnome-extra/gdesklets-core/Manifest
@@ -10,6 +10,10 @@ AUX gdesklets-core-0.35.3-alpha.patch 2928 RMD160 8ab4ca3715f38805e00cd53c9d58b8
 MD5 90cd600248c5e104e941b032c7dc4d3f files/gdesklets-core-0.35.3-alpha.patch 2928
 RMD160 8ab4ca3715f38805e00cd53c9d58b8a02da732c0 files/gdesklets-core-0.35.3-alpha.patch 2928
 SHA256 525d0d4603aeec94767d731e4a42b9335be1eb37f610681313f286f6a837a6c0 files/gdesklets-core-0.35.3-alpha.patch 2928
+AUX gdesklets-core-0.35.3-pyorbit_fix.patch 553 RMD160 644bfa170b454d7fa46208695616d56132a06ffe SHA1 68506fa7e0b95236f761054f9d853dcdda2f0c53 SHA256 7e42798826e7434800b22499f16c21af496e54441c783751a6d759a8dacbaa37
+MD5 258a94670064c05139e1acc648bf7d45 files/gdesklets-core-0.35.3-pyorbit_fix.patch 553
+RMD160 644bfa170b454d7fa46208695616d56132a06ffe files/gdesklets-core-0.35.3-pyorbit_fix.patch 553
+SHA256 7e42798826e7434800b22499f16c21af496e54441c783751a6d759a8dacbaa37 files/gdesklets-core-0.35.3-pyorbit_fix.patch 553
 AUX gdesklets-displays.desktop 230 RMD160 379976fed75e7d22b97604476d949ad044c7a542 SHA1 dc3231bea820f7ba710eece67d03baa8bd1d4d5b SHA256 ede33a1ff77c38f4afb4e748de235e23722745f476e5065a4724cfb8afaf1e5a
 MD5 01751d3aa9192793a33c02d2126192c1 files/gdesklets-displays.desktop 230
 RMD160 379976fed75e7d22b97604476d949ad044c7a542 files/gdesklets-displays.desktop 230
@@ -22,10 +26,10 @@ DIST develbook.tar.bz2 445919
 DIST gDesklets-0.33.1.tar.bz2 690678
 DIST gDesklets-0.34.3.tar.bz2 679069
 DIST gDesklets-0.35.2.tar.bz2 745088 RMD160 23aeca219fbdb1c54b9ed5ba412c7fc93d428e53 SHA256 b70f959244751b8cf5694abcdc4baeae56d2bf53cd7bac1cef51a254dfe0e2dc
-DIST gDesklets-0.35.3.tar.bz2 718642 RMD160 b40a3d9251d8d67c8cee5369603499f8a8bc4f9d SHA256 7a8df729df1f29b7c37d29739e3188547334781435bf1f9f4fea16d0a29b0c55
+DIST gDesklets-0.35.3.tar.bz2 718642 RMD160 b40a3d9251d8d67c8cee5369603499f8a8bc4f9d SHA1 ca643579d25c96ce2412cb50ca76241b90dbf6f8 SHA256 7a8df729df1f29b7c37d29739e3188547334781435bf1f9f4fea16d0a29b0c55
 DIST gDesklets-0.35.tar.bz2 741056
 DIST gdesklets-develbook-0.35.2.tar.bz2 547039
-DIST gdesklets-develbook-0.35.3.tar.bz2 547031 RMD160 a8c3ebc37b62af154116eb6f6aaf9350271da822 SHA256 208b6f5f92b74ac8b26c2b56a054abec3691264ef2320a386d0cd49b1c63c78d
+DIST gdesklets-develbook-0.35.3.tar.bz2 547031 RMD160 a8c3ebc37b62af154116eb6f6aaf9350271da822 SHA1 d5261193acf433a737d29837096eb8cc68513a1e SHA256 208b6f5f92b74ac8b26c2b56a054abec3691264ef2320a386d0cd49b1c63c78d
 EBUILD gdesklets-core-0.33.1.ebuild 2426 RMD160 1864367dc2e2ed11ca34ddb42ea1d39346e50513 SHA1 13701550c91df0c41b199e646f9077e7f1a911b8 SHA256 5939acda48b3e8360382df9f6d5e521678ed2427e2796e7d2397aa65c8e74947
 MD5 de113ac26b6f1d0691a8d1e5d90df4a8 gdesklets-core-0.33.1.ebuild 2426
 RMD160 1864367dc2e2ed11ca34ddb42ea1d39346e50513 gdesklets-core-0.33.1.ebuild 2426
@@ -42,14 +46,18 @@ EBUILD gdesklets-core-0.35.2-r1.ebuild 2514 RMD160 90734b8788a791172dda277c8da3c
 MD5 954f08423833fd244eedc966f77775c1 gdesklets-core-0.35.2-r1.ebuild 2514
 RMD160 90734b8788a791172dda277c8da3c7532a1f29d7 gdesklets-core-0.35.2-r1.ebuild 2514
 SHA256 8c62480b6a8d6e6a170a7d49d0d61583903acabfe19b716a697e3c50398eb615 gdesklets-core-0.35.2-r1.ebuild 2514
+EBUILD gdesklets-core-0.35.3-r1.ebuild 2745 RMD160 4fd5ffe92f6902df956a92442a8a26210724ce86 SHA1 86acfc50e0364d52d8a492dc8470f3709af4b92a SHA256 d053e35801f81304c7bb5678b90120777ea5ea5cc71fa4832287f82cfd1c7d54
+MD5 47079f7470f2d1d79d18f66ac086ea9a gdesklets-core-0.35.3-r1.ebuild 2745
+RMD160 4fd5ffe92f6902df956a92442a8a26210724ce86 gdesklets-core-0.35.3-r1.ebuild 2745
+SHA256 d053e35801f81304c7bb5678b90120777ea5ea5cc71fa4832287f82cfd1c7d54 gdesklets-core-0.35.3-r1.ebuild 2745
 EBUILD gdesklets-core-0.35.3.ebuild 2693 RMD160 7b95b7332bbe0c40202adf4ed8f705c67fd3343e SHA1 f993627398da4472c4dbf1557340bf5af896bc7a SHA256 c3f7776d78d0c4ac5db4ad7d7c848d92e1c2419fafc5ca3e31fb9d86dd9b1b5d
 MD5 2a1e563b97be99cf74041f099be7e1c3 gdesklets-core-0.35.3.ebuild 2693
 RMD160 7b95b7332bbe0c40202adf4ed8f705c67fd3343e gdesklets-core-0.35.3.ebuild 2693
 SHA256 c3f7776d78d0c4ac5db4ad7d7c848d92e1c2419fafc5ca3e31fb9d86dd9b1b5d gdesklets-core-0.35.3.ebuild 2693
-MISC ChangeLog 10868 RMD160 48f726dc4839f94196d295fc7887fc1a722871e3 SHA1 74974d61bc2ba496b3ad23ead8816b364cc813bc SHA256 16fc31f180896c1a9485be7c24b7ad3400645e0af66a0c6e0f2224a70c9dc9c7
-MD5 a75eeda251ebceb0a09960885e08cefe ChangeLog 10868
-RMD160 48f726dc4839f94196d295fc7887fc1a722871e3 ChangeLog 10868
-SHA256 16fc31f180896c1a9485be7c24b7ad3400645e0af66a0c6e0f2224a70c9dc9c7 ChangeLog 10868
+MISC ChangeLog 11092 RMD160 79248b343e36d16687a024e903c32a2bc979e654 SHA1 71d95c3ffb85b1da694d94e226351c5e408abdae SHA256 8a988d32a257a73085476daa407e4b411ca3c8a71138f506e5a4e033647ad0be
+MD5 73f569df4dbec8fefb35157ddd0cb0de ChangeLog 11092
+RMD160 79248b343e36d16687a024e903c32a2bc979e654 ChangeLog 11092
+SHA256 8a988d32a257a73085476daa407e4b411ca3c8a71138f506e5a4e033647ad0be ChangeLog 11092
 MISC metadata.xml 281 RMD160 c2bd0b9406d9647ead7e3bdfc11bfe887e355330 SHA1 7d9bd51c4b4df79ab0ad715395c86c42cbd72bb5 SHA256 9d4bf715ca56bbd8b396f14fdcf85cc266f4c3e64889f0737f8b70022541d458
 MD5 29674f36cd2d889e4e21fec9a2cee59b metadata.xml 281
 RMD160 c2bd0b9406d9647ead7e3bdfc11bfe887e355330 metadata.xml 281
@@ -69,3 +77,6 @@ SHA256 6f676376e93988d1ae53ea412b040164017b3c3e611038502ceb614d38ef09b8 files/di
 MD5 f9a77cb2833a8212f4e5fd5fcfd026d2 files/digest-gdesklets-core-0.35.3 536
 RMD160 d420a3d289cbb9c09dbbcf5fbc409d5f7c2f4429 files/digest-gdesklets-core-0.35.3 536
 SHA256 142927285469f8eda964e0c38e0fec24d472fe8cfcf31d31c7083c5733c8d0ba files/digest-gdesklets-core-0.35.3 536
+MD5 f9a77cb2833a8212f4e5fd5fcfd026d2 files/digest-gdesklets-core-0.35.3-r1 536
+RMD160 d420a3d289cbb9c09dbbcf5fbc409d5f7c2f4429 files/digest-gdesklets-core-0.35.3-r1 536
+SHA256 142927285469f8eda964e0c38e0fec24d472fe8cfcf31d31c7083c5733c8d0ba files/digest-gdesklets-core-0.35.3-r1 536
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
+
+}