Added patch for Python 2.6 (see bug #266151); removed old files and ebuilds

Package-Manager: portage-2.1.6.13/cvs/Linux x86_64

9 files changed, 44 insertions, 244 deletions

diff --git a/gnome-extra/gdesklets-core/ChangeLog b/gnome-extra/gdesklets-core/ChangeLog
index 4ba198692d1a..c6d4d611197d 100644
--- a/gnome-extra/gdesklets-core/ChangeLog
+++ b/gnome-extra/gdesklets-core/ChangeLog
@@ -1,6 +1,20 @@
 # ChangeLog for gnome-extra/gdesklets-core
-# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gdesklets-core/ChangeLog,v 1.102 2009/04/20 19:41:55 nixphoeni Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gdesklets-core/ChangeLog,v 1.103 2009/05/18 21:57:15 nixphoeni Exp $
+
+*gdesklets-core-0.36.1-r1 (15 May 2009)
+
+  18 May 2009; Joe Sapp <nixphoeni@gentoo.org>
+  -files/gdesklets-core-0.35.3-alpha.patch,
+  -files/gdesklets-core-0.35.3-pyorbit_fix.patch,
+  -gdesklets-core-0.35.4.ebuild,
+  -files/gdesklets-core-0.35.4-POTFILES.in.patch,
+  -gdesklets-core-0.36-r1.ebuild,
+  +files/gdesklets-core-0.36-python-2.6-fix.patch,
+  +gdesklets-core-0.36.1-r1.ebuild, -files/gdesklets-displays.desktop:
+  Added patch for Python 2.6 (see bug #266151 or
+  https://bugs.launchpad.net/gdesklets/+bug/344079); removed old files and
+  ebuilds
 
   20 Apr 2009; Joe Sapp <nixphoeni@gentoo.org> gdesklets-core-0.35.4.ebuild,
   gdesklets-core-0.36-r1.ebuild, gdesklets-core-0.36.1.ebuild:
diff --git a/gnome-extra/gdesklets-core/Manifest b/gnome-extra/gdesklets-core/Manifest
index adfcde5856c2..56c84ea0a6fc 100644
--- a/gnome-extra/gdesklets-core/Manifest
+++ b/gnome-extra/gdesklets-core/Manifest
@@ -1,17 +1,10 @@
 AUX gdesklets-control-getid 1146 RMD160 e2a770486e996067c1484f24d73692ce4c34582b SHA1 59ee72ae2eab9f91d2e53bcf6d2113b148844b8f SHA256 a3d793c625b5205fd07fdc61d665a6720a2714b403139f5de6cd18fee1c20899
-AUX gdesklets-core-0.35.3-alpha.patch 2928 RMD160 8ab4ca3715f38805e00cd53c9d58b8a02da732c0 SHA1 eca66be05a0e444e562c3470ec5fbe78e1bab6e3 SHA256 525d0d4603aeec94767d731e4a42b9335be1eb37f610681313f286f6a837a6c0
-AUX gdesklets-core-0.35.3-pyorbit_fix.patch 553 RMD160 644bfa170b454d7fa46208695616d56132a06ffe SHA1 68506fa7e0b95236f761054f9d853dcdda2f0c53 SHA256 7e42798826e7434800b22499f16c21af496e54441c783751a6d759a8dacbaa37
-AUX gdesklets-core-0.35.4-POTFILES.in.patch 223 RMD160 2d3c8705022afd84760bdc630bcf3632482b05cd SHA1 5af58cf60b2cfd257fb713096c8b527f0bb52088 SHA256 52a9b45bf68775edd98d832f0fe853be912057dd8fb241687d7a2c0154688038
+AUX gdesklets-core-0.36-python-2.6-fix.patch 531 RMD160 81940f4dfc1f8b21470eee369f0fdfe5187a7c9f SHA1 e1c801522b9039e9c57a09c824662093fa9cb776 SHA256 1281220ff4f599c1c0b513c4ef0d89670b0af04331cefed0d895b3dbd5a737a0
 AUX gdesklets-core-0.36.1-test-control.py-install-fix.patch 483 RMD160 a3a0b625c92738bb99d19f1332ded97fe717d387 SHA1 b088909f190a39479515b9501918fb7e31a03903 SHA256 2d3ef43385c3e2eb506a714ece81768abe6500f58392514a4b1e327bf098625d
 AUX gdesklets-core-0.36_beta-linguas.patch 1208 RMD160 5b691f445e73316232e394b8dca91601ac57d706 SHA1 d9fe4ed5775921c772b00399f3479afbb4a184d9 SHA256 760a79c3df6c6680ea6b76d787f666a603c919f7fac6b22869a4cb6ab7023b4b
-AUX gdesklets-displays.desktop 237 RMD160 670631d9e1a487c4137cff6db8f0e97bd477a4f0 SHA1 affbfed7e588d65a01df28994ca4575cddca3f38 SHA256 85c0e5f8b40217c4629566bfc45765c0b8a6cf448e02062ce0fffcce63548532
 AUX gdesklets-migration-tool 7343 RMD160 d8d3f992e8786534a184de00bbcd5d1eebf93d4e SHA1 f0e0bd96663a35e1f98b2ec3b377a2b4246cbd33 SHA256 6dd834d92f1a70280e8b3d7b7a005564e0daa5e2769758f47e151044d62cfa48
-DIST gDesklets-0.35.4.tar.bz2 738665 RMD160 aca07a578850a510beb5a3dd4383a33a79ddd139 SHA1 f225dcc6503e8aaec732c52fc2ee47f70c1fd87c SHA256 f2a1000d8785a479f2226486985d090a7d36284df8b91dd021f09e786bf8e990
 DIST gdesklets-0.36.1.tar.gz 3537820 RMD160 ff658aa32ee562ed0563f01e6c5c7267c0e1fa7c SHA1 a865fd5cd65f4e217fb2c16982961b7b1f6d54cc SHA256 5e0cfd4cd99437aba24dfca33a72b2b6aef33b4c1128064ce82a368280bc6d61
-DIST gdesklets-0.36.tar.bz2 3124773 RMD160 9e8913c2e50c970f02e265a3cb8b59f332e7f77f SHA1 debed7ae730796761ac829ba6cb7bafd566148d5 SHA256 e1a77c8cbb7bf5e51f74394ed54cfc559ca5d81548c0d2b0a858926baa61da4a
-DIST gdesklets-develbook-0.35.4.tar.bz2 547047 RMD160 d8655dab61b6e87895be2d3d25100ce99c75a4e7 SHA1 d2595c6d25bbac40c39c90e49fde3ace141e69d5 SHA256 5fcaafe272286bc63edc462b242d4f85827d8a668cdd0ba4a3c988ce949ea4e4
-EBUILD gdesklets-core-0.35.4.ebuild 3020 RMD160 cb7f67cba3e87cfe6a4c847b9c1ded7092dc84c4 SHA1 8e4cd33dc87a3fdb465882dd1689e529f8b3b01f SHA256 fb587b42b1598fea2297c7bce7f296bea22a8d2f5f4f95ac9dbaaaa1a50e076f
-EBUILD gdesklets-core-0.36-r1.ebuild 3134 RMD160 78599cb8703bd7492c9daa3e811da822d6eba95f SHA1 e62c3d96c48c97f3fd5dc9fb94922aeee850221e SHA256 8bdfe8bf010bc518c3f5b1c3d32c3d7cdc34a34b76ad23dff9f8855ceddb5cec
+EBUILD gdesklets-core-0.36.1-r1.ebuild 3398 RMD160 ec071b580ba9432314c15c0c28511da81c3ad482 SHA1 38753338c04cd60698417bf0fb1c8addca633cd3 SHA256 a472d25bc2ca37437e456e314dd77dd472bcba860cfc8e88f37772056fd9e260
 EBUILD gdesklets-core-0.36.1.ebuild 3295 RMD160 e3c4d556bd7c436a7a7b88da3717e5bb09c78e8c SHA1 5e9a1949ad3930ad0c31cfdadcb303aaa0e2d9b0 SHA256 52743f43b259e81b7200db532d284251d006f00bde0574cd14bb26315873edac
-MISC ChangeLog 19448 RMD160 ffea17105b36268e92e2d66f7c1a8d7c2d2cefa2 SHA1 1569b59a21e041fb50f84c63af94e3a1b65c294a SHA256 1619e28715b05b185a14b249e83ebecf7d26bbc9d94bd44523c2d214c36c1c97
+MISC ChangeLog 20004 RMD160 8c4c3cb642eb3ae4ae78a2b789aa4039198e2acc SHA1 1e78ac23e74e8a6dea88ea2365337c6672d92e1a SHA256 0bfbd94ec12632c407a3d44933a11de474f7a2ab0b6ceb0fe9e3cbb5f14cfe76
 MISC metadata.xml 225 RMD160 84ee2a2d6e82c97c9059ca7cfc17f222f18e4431 SHA1 54492f0c3ac21555e1a60882fa7b92103fc3d2c8 SHA256 49feb5b4f0a008e92acb1626adf763199e38ad92f465e41943a89941213ffeef
diff --git a/gnome-extra/gdesklets-core/files/gdesklets-core-0.35.3-alpha.patch b/gnome-extra/gdesklets-core/files/gdesklets-core-0.35.3-alpha.patch
deleted file mode 100644
index 89866ec46c36..000000000000
--- a/gnome-extra/gdesklets-core/files/gdesklets-core-0.35.3-alpha.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-diff -urN gDesklets-0.35.3.orig/libdesklets/system/ArchFactory.py gDesklets-0.35.3/libdesklets/system/ArchFactory.py
---- gDesklets-0.35.3.orig/libdesklets/system/ArchFactory.py	2005-01-22 15:33:31.000000000 +0000
-+++ gDesklets-0.35.3/libdesklets/system/ArchFactory.py	2006-04-30 12:58:04.000000000 +0000
-@@ -27,6 +27,9 @@
-         if (uname[-1] in ('ppc', 'ppc64')):
-             return Linux.PPC()
- 
-+        if (uname[-1] in ('alpha')):
-+            return Linux.Alpha()
-+
-         return Linux.Generic()
- 
- 
-diff -urN gDesklets-0.35.3.orig/libdesklets/system/Linux/Alpha.py gDesklets-0.35.3/libdesklets/system/Linux/Alpha.py
---- gDesklets-0.35.3.orig/libdesklets/system/Linux/Alpha.py	1970-01-01 00:00:00.000000000 +0000
-+++ gDesklets-0.35.3/libdesklets/system/Linux/Alpha.py	2006-04-30 16:06:54.000000000 +0000
-@@ -0,0 +1,52 @@
-+from Generic import Generic
-+
-+import re
-+
-+class Alpha(Generic):
-+
-+    def __init__(self):
-+
-+        Generic.__init__(self)
-+
-+        def _get_model():
-+            r = re.compile('^system type\s+:\s+(.+)$', re.M)
-+            m = r.search( self._read_cpuinfo() )
-+            return m.group(1)
-+
-+        def _get_speed():
-+            r = re.compile('^cycle frequency \[Hz\]\s+:\s+(\d+)\s+est\.$', re.M);
-+            m = r.search( self._read_cpuinfo() )
-+            return float(int(m.group(1))/1000000.0)
-+
-+        self.__model_name = _get_model()
-+        self.__speed      = _get_speed()
-+
-+        # set cache size to 0, since size is not present in /proc/cpuinfo
-+        self.__cache_size = int(0)
-+
-+
-+    def cpu_cache(self):
-+        """
-+        @return : 2nd level cache of installed processor
-+        @rtype  : int
-+        """
-+
-+        return self.__cache_size
-+
-+    def cpu_model(self):
-+        """
-+        @return : model/type of installed processor
-+        @rtype  : str
-+        """
-+
-+        return self.__model_name
-+
-+
-+
-+    def cpu_speed(self):
-+        """
-+        @return : current clock of installed processor
-+        @rtype  : float
-+        """
-+
-+        return self.__speed
-diff -urN gDesklets-0.35.3.orig/libdesklets/system/Linux/Makefile.am gDesklets-0.35.3/libdesklets/system/Linux/Makefile.am
---- gDesklets-0.35.3.orig/libdesklets/system/Linux/Makefile.am	2004-11-22 19:42:53.000000000 +0000
-+++ gDesklets-0.35.3/libdesklets/system/Linux/Makefile.am	2006-04-30 12:58:43.000000000 +0000
-@@ -2,6 +2,7 @@
- 
- install_DATA = \
- 	__init__.py	\
-+	Alpha.py	\
- 	Generic.py \
- 	PPC.py \
- 	Sparc.py \
-diff -urN gDesklets-0.35.3.orig/libdesklets/system/Linux/__init__.py gDesklets-0.35.3/libdesklets/system/Linux/__init__.py
---- gDesklets-0.35.3.orig/libdesklets/system/Linux/__init__.py	2004-04-19 18:24:26.000000000 +0000
-+++ gDesklets-0.35.3/libdesklets/system/Linux/__init__.py	2006-04-30 13:14:47.000000000 +0000
-@@ -1,4 +1,5 @@
- from X86 import X86
- from Sparc import Sparc
- from PPC import PPC
-+from Alpha import Alpha
- from Generic import Generic
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
deleted file mode 100644
index 3ae7c2a93461..000000000000
--- a/gnome-extra/gdesklets-core/files/gdesklets-core-0.35.3-pyorbit_fix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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/files/gdesklets-core-0.35.4-POTFILES.in.patch b/gnome-extra/gdesklets-core/files/gdesklets-core-0.35.4-POTFILES.in.patch
deleted file mode 100644
index c5d65f4c8969..000000000000
--- a/gnome-extra/gdesklets-core/files/gdesklets-core-0.35.4-POTFILES.in.patch
+++ /dev/null
@@ -1,7 +0,0 @@
---- po/POTFILES.in.orig	2005-08-11 15:10:42.000000000 -0400
-+++ po/POTFILES.in	2007-03-07 21:04:46.000000000 -0500
-@@ -1,3 +1,4 @@
-+[encoding: UTF-8]
- config/ConfigDialog.py
- config/ConfigUnit.py
- config/DaemonConfigger.py
diff --git a/gnome-extra/gdesklets-core/files/gdesklets-core-0.36-python-2.6-fix.patch b/gnome-extra/gdesklets-core/files/gdesklets-core-0.36-python-2.6-fix.patch
new file mode 100644
index 000000000000..9e15452ae681
--- /dev/null
+++ b/gnome-extra/gdesklets-core/files/gdesklets-core-0.36-python-2.6-fix.patch
@@ -0,0 +1,14 @@
+--- utils/ErrorFormatter.py	2009-03-25 11:53:35.000000000 -0400
++++ utils/ErrorFormatter.py	2009-05-12 13:38:39.000000000 -0400
+@@ -113,9 +113,9 @@
+ # give us an absolute path.
+ #
+ _old_imp = __import__
+-def _new_imp(name, globs = {}, locls = {}, fromlist = []):
++def _new_imp(*args, **kwargs):
+ 
+-    module = _old_imp(name, globs, locls, fromlist)
++    module = _old_imp(*args, **kwargs)
+     # builtin modules have no "__file__" attribute, so we have to check for it
+     if (module):
+         if (hasattr(module, "__file__")):
diff --git a/gnome-extra/gdesklets-core/files/gdesklets-displays.desktop b/gnome-extra/gdesklets-core/files/gdesklets-displays.desktop
deleted file mode 100644
index d7219e2a173e..000000000000
--- a/gnome-extra/gdesklets-core/files/gdesklets-displays.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=gDesklets Displays
-Comment=Navigate through the Displays available for gDesklets
-Exec=nautilus /usr/share/gdesklets/Displays
-Icon=/usr/share/pixmaps/gdesklets.png
-Terminal=false
-Type=Application
-Categories=Utility;
-
diff --git a/gnome-extra/gdesklets-core/gdesklets-core-0.35.4.ebuild b/gnome-extra/gdesklets-core/gdesklets-core-0.35.4.ebuild
deleted file mode 100644
index 36ce5667afd8..000000000000
--- a/gnome-extra/gdesklets-core/gdesklets-core-0.35.4.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2009 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.4.ebuild,v 1.17 2009/04/20 19:41:55 nixphoeni Exp $
-
-# desklets don't run with USE=debug
-GCONF_DEBUG="no"
-
-# We want the latest autoconf and automake (the default)
-inherit gnome2 eutils 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.de/files/${MY_P}.tar.bz2 \
-		doc? ( mirror://gentoo/gdesklets-develbook-${PV}.tar.bz2 )"
-HOMEPAGE="http://www.gdesklets.de"
-LICENSE="GPL-2"
-
-SLOT="0"
-IUSE="doc"
-KEYWORDS="alpha amd64 ia64 ppc ~sparc x86"
-
-# is libgsf needed for runtime or just compiling?
-RDEPEND="<dev-lang/python-2.6
-	>=dev-libs/glib-2.4
-	gnome-extra/libgsf
-	>=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"
-
-# Parallel makes sometimes break during install phase
-MAKEOPTS="${MAKEOPTS} -j1"
-# Force using MAKEOPTS with emake
-USE_EINSTALL="0"
-DOCS="AUTHORS ChangeLog NEWS README TODO"
-
-src_unpack() {
-
-	unpack ${A}
-
-	# Apply patch to correct POTFILES.in so testing will work
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-POTFILES.in.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 && \
-		elog "Installing the Developer's Book into" && \
-		elog "${ROOT}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 and auto-generated
-	# 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" \
-		"${D}/usr/share/mime/mime.cache"
-
-}
-
-pkg_postinst() {
-
-	gnome2_pkg_postinst
-
-	echo
-	elog "gDesklets Displays are required before the library"
-	elog "will be usable. The Displays are found in -"
-	elog "           x11-plugins/desklet-* ,"
-	elog "at http://www.gdesklets.de, or at http://archive.gdesklets.info"
-	elog
-	elog "Next you'll need to start gDesklets using"
-	elog "           ${ROOT}usr/bin/gdesklets start"
-	elog "If you're using GNOME this can be done conveniently"
-	elog "through Applications->Accessories->gDesklets"
-	elog
-	elog "If you're updating from a version less than 0.35_rc1,"
-	elog "you can migrate your desklet configurations by"
-	elog "running"
-	elog "           ${ROOT}usr/$(get_libdir)/gdesklets/gdesklets-migration-tool"
-	elog "after the first time you run gDesklets"
-	echo
-
-}
diff --git a/gnome-extra/gdesklets-core/gdesklets-core-0.36-r1.ebuild b/gnome-extra/gdesklets-core/gdesklets-core-0.36.1-r1.ebuild
index e7a9a5ee8fc2..990c9a6e2762 100644
--- a/gnome-extra/gdesklets-core/gdesklets-core-0.36-r1.ebuild
+++ b/gnome-extra/gdesklets-core/gdesklets-core-0.36.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 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.36-r1.ebuild,v 1.10 2009/04/20 19:41:55 nixphoeni Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gdesklets-core/gdesklets-core-0.36.1-r1.ebuild,v 1.1 2009/05/18 21:57:15 nixphoeni Exp $
 
 # desklets don't run with USE=debug
 GCONF_DEBUG="no"
@@ -8,21 +8,21 @@ GCONF_DEBUG="no"
 # We want the latest autoconf and automake (the default)
 inherit gnome2 python eutils autotools multilib
 
-MY_PN="gdesklets"
-MY_P="${MY_PN}-${PV/_/}"
-S="${WORKDIR}/${MY_P}"
+MY_PN="gDesklets"
+MY_P="${PN/-core/}-${PV/_/}"
+S="${WORKDIR}/${MY_PN}-${PV/_/}"
 
 DESCRIPTION="GNOME Desktop Applets: Core library for desktop applets"
-SRC_URI="http://gdesklets.de/files/${MY_P}.tar.bz2"
+SRC_URI="http://gdesklets.de/files/${MY_P}.tar.gz"
 HOMEPAGE="http://www.gdesklets.de"
 LICENSE="GPL-2"
 
 SLOT="0"
 IUSE=""
-KEYWORDS="alpha amd64 ia64 ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 # is libgsf needed for runtime or just compiling?
-RDEPEND="<dev-lang/python-2.6
+RDEPEND=">=dev-lang/python-2.3
 	>=dev-libs/glib-2.4
 	gnome-extra/libgsf
 	>=gnome-base/librsvg-2.8
@@ -55,6 +55,10 @@ src_unpack() {
 
 	# Use po/LINGUAS - see gnome bug #506828
 	epatch "${FILESDIR}/${PN}-0.36_beta-linguas.patch"
+	# Install test-control.py - see https://bugs.launchpad.net/gdesklets/+bug/310339
+	epatch "${FILESDIR}/${PN}-${PV}-test-control.py-install-fix.patch"
+	# Fix for Python 2.6 - see bug #266151
+	epatch "${FILESDIR}/${PN}-0.36-python-2.6-fix.patch"
 
 	eautoreconf
 	intltoolize --force || die