New version for GNOME-2.22. Come back of the button UI (attached to the panel), use your favorite web browser, can open evolution contacts, ...

Package-Manager: portage-2.1.4.4

3 files changed, 40 insertions, 16 deletions

diff --git a/gnome-extra/deskbar-applet/ChangeLog b/gnome-extra/deskbar-applet/ChangeLog
index da64d65680c0..d9f3c02dee36 100644
--- a/gnome-extra/deskbar-applet/ChangeLog
+++ b/gnome-extra/deskbar-applet/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnome-extra/deskbar-applet
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/deskbar-applet/ChangeLog,v 1.81 2008/02/15 14:49:56 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/deskbar-applet/ChangeLog,v 1.82 2008/03/25 23:53:45 eva Exp $
+
+*deskbar-applet-2.22.0.1 (25 Mar 2008)
+
+  25 Mar 2008; Gilles Dartiguelongue <eva@gentoo.org>
+  -deskbar-applet-2.18.1.ebuild, +deskbar-applet-2.22.0.1.ebuild:
+  New version for GNOME-2.22. Come back of the button UI (attached to the
+  panel), use your favorite web browser, can open evolution contacts, ...
 
   15 Feb 2008; Daniel Gryniewicz <dang@gentoo.org>
   deskbar-applet-2.20.3.ebuild:
diff --git a/gnome-extra/deskbar-applet/Manifest b/gnome-extra/deskbar-applet/Manifest
index deec6e2ab681..3fab92567c2a 100644
--- a/gnome-extra/deskbar-applet/Manifest
+++ b/gnome-extra/deskbar-applet/Manifest
@@ -3,16 +3,16 @@ Hash: SHA1
 
 AUX deskbar-applet-2.15.3-multilib.patch 4033 RMD160 8b4ff5d0bfb27102334d22d36a6011787a736c96 SHA1 6e9e147fb12d6ce1d37fe4801e4d9b357097888a SHA256 e0c7a9d8dd4c85038498d29d6f5c16c36ca1c0e49da17435eeb880e7d79d5649
 AUX deskbar-applet-2.19.5-multilib.patch 4273 RMD160 d7463d7d9f1c49ad9d7cf2328b05b321aace8257 SHA1 80e1d11db28d3fb43fd996d40bcf43e8c2655c77 SHA256 64534097fdc608d5dff58a16ee6de62267928a55026aff0039c361255a6d2bbe
-DIST deskbar-applet-2.18.1.tar.bz2 646387 RMD160 c7c0015fd0cfcff0d893313e1b0fc658160646ad SHA1 37c3955e1aecf95b56bd727a1cee4222970e37da SHA256 1f1b4ed0d7cd2948aeca7cae33600397218be0b072f105ca0fb05c52e2f1e278
 DIST deskbar-applet-2.20.3.tar.bz2 753652 RMD160 c7245a88f881b86a9352b7c0a0e40ce91708e30a SHA1 8241bf20e9c847448cb9037910ce1045316d4047 SHA256 20c4af80682c1a9018f70d33bde4a27dc87c8b5d37ba558c8db4218017414d8c
-EBUILD deskbar-applet-2.18.1.ebuild 1510 RMD160 135c581982bc9e20414aef128e86da01b33d8135 SHA1 1f90b6c9d9d145f1ffee728393053353984e9583 SHA256 483137b278160b27c5d755079b804b52f89191250a94fd5401328cff9b65ae03
+DIST deskbar-applet-2.22.0.1.tar.bz2 836470 RMD160 7b75c645972328bc7ab3994e8bdc95fb94baf1cb SHA1 c68e0403aa2ecf20b3758b2273fcbd904e7b9b3b SHA256 6f17abbf17dc6206bb6041876a54590bf5180b90664b04d49a2c3111ff509c91
 EBUILD deskbar-applet-2.20.3.ebuild 1903 RMD160 69afe0dc4b8ddf66656122336b7c4d3901379e45 SHA1 9ee404b59a8f51735b29f281703e6f5b93a993bb SHA256 e5782ec8ef0c501812993c9c9df82b30e69bf0430ddd054c45b5e5504342416a
-MISC ChangeLog 11340 RMD160 f7c10b39bad810a8e8ee68ae1bbf7ff008f956fd SHA1 f418eaeda6f65895b7de2b11c6f307a1f2436aae SHA256 fb0eecb7dc423003ea0315a195a92443a677041c60c1d809f9c55c54f3c65238
+EBUILD deskbar-applet-2.22.0.1.ebuild 1972 RMD160 ca62bc63bf2bbcddbe737338902c4631ed0a12f6 SHA1 1e8c998226713e83ea8cb1ccc99368c93e8290c9 SHA256 280cd11fc66d1ce87f0a8a51ae840a93a3fae495633a3205ddb812c1af4cb765
+MISC ChangeLog 11648 RMD160 9928019b427266b733846afe16a6845cc5ffe7e1 SHA1 b7d3b33d40bdca078a09f4533c213fb44678cbbd SHA256 abf86524c02112f77b8e8f2c4eca237544efc69b3cf3bacbc37b1c95a0da1b3f
 MISC metadata.xml 413 RMD160 b43b823b1de922a86e22ab10f0f11954f51cebaa SHA1 278ad1cb047bfb613a7575d35875b01754776d8d SHA256 1388b8a4eeeec86628d3669c5fa22e9491e2ce21b8b76ad43a6b5b6b6c9fa6e2
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.8 (GNU/Linux)
+Version: GnuPG v2.0.7 (GNU/Linux)
 
-iEYEARECAAYFAkfVuPwACgkQkeYb6olFHJcRmACg5jlz1GR1YWvS1kUdxpmhfbmz
-LrQAoME2FSx0zGYgEffSVpx6WVRMPl5b
-=W3HP
+iD8DBQFH6ZCW1fmVwcYIWAYRAsehAJ9gNCZ2+DMvTVrHhXt2kGqJjD8ApACfWPIY
+Dh+7l25jNvlQ9A8FsiXNryc=
+=85yi
 -----END PGP SIGNATURE-----
diff --git a/gnome-extra/deskbar-applet/deskbar-applet-2.18.1.ebuild b/gnome-extra/deskbar-applet/deskbar-applet-2.22.0.1.ebuild
index 3a36ff16598c..fd172d992627 100644
--- a/gnome-extra/deskbar-applet/deskbar-applet-2.18.1.ebuild
+++ b/gnome-extra/deskbar-applet/deskbar-applet-2.22.0.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/deskbar-applet/deskbar-applet-2.18.1.ebuild,v 1.12 2007/10/13 13:24:27 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/deskbar-applet/deskbar-applet-2.22.0.1.ebuild,v 1.1 2008/03/25 23:53:45 eva Exp $
 
 inherit gnome2 eutils autotools python
 
@@ -9,15 +9,17 @@ HOMEPAGE="http://raphael.slinckx.net/deskbar/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="eds spell"
 
+# TODO: check if gnome-doc-utils doesn't imply scrollkeeper
+
 RDEPEND=">=dev-lang/python-2.4
-		 >=x11-libs/gtk+-2.6
-		 >=dev-python/pygtk-2.6
+		 >=x11-libs/gtk+-2.10
+		 >=dev-python/pygtk-2.10
 		 >=dev-python/gnome-python-2.10
 		 >=gnome-base/gnome-desktop-2.10
-		 >=dev-python/dbus-python-0.71
+		 >=dev-python/dbus-python-0.80.2
 		 >=dev-python/gnome-python-desktop-2.14.0
 		 >=dev-python/gnome-python-extras-2.14
 		 >=gnome-base/gconf-2
@@ -27,19 +29,24 @@ DEPEND="${RDEPEND}
 		sys-devel/gettext
 		>=dev-util/intltool-0.35
 		>=sys-devel/autoconf-2.60
+		 app-text/gnome-doc-utils
 		dev-util/pkgconfig"
 
 DOCS="AUTHORS ChangeLog NEWS README TODO"
 
 pkg_setup() {
-	G2CONF="${G2CONF} $(use_enable eds evolution) --exec-prefix=/usr"
+	G2CONF="${G2CONF} $(use_enable eds evolution) --exec-prefix=/usr --disable-scrollkeeper"
 }
 
 src_unpack() {
 	gnome2_src_unpack
 
 	# Fix installing libs into pythondir
-	epatch "${FILESDIR}"/${PN}-2.15.3-multilib.patch
+	epatch "${FILESDIR}"/${PN}-2.19.5-multilib.patch
+
+	# disable pyc compiling
+	mv py-compile py-compile.orig
+	ln -s $(type -P true) py-compile
 
 	AT_M4DIR="m4" eautoreconf
 }
@@ -47,9 +54,19 @@ src_unpack() {
 pkg_postinst() {
 	gnome2_pkg_postinst
 
+	python_version
+	python_mod_optimize /usr/$(get_libdir)/python${PYVER}/site-packages/deskbar
+	python_mod_optimize /usr/$(get_libdir)/deskbar-applet/modules-2.20-compatible
+
 	ebeep 5
 	ewarn "The dictionary plugin in deskbar-applet uses the dictionary from "
 	ewarn "gnome-utils.  If it is not present, the dictionary plugin will "
 	ewarn "fail silently."
 	epause 5
 }
+
+pkg_postrm() {
+	gnome2_pkg_postrm
+	python_version
+	python_mod_cleanup
+}