3 files changed, 41 insertions, 19 deletions
diff --git a/dev-python/gnome-python-desktop/ChangeLog b/dev-python/gnome-python-desktop/ChangeLog
index 6152385f510a..b90f3395056f 100644
--- a/dev-python/gnome-python-desktop/ChangeLog
+++ b/dev-python/gnome-python-desktop/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/gnome-python-desktop
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/gnome-python-desktop/ChangeLog,v 1.48 2008/02/10 22:04:04 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/gnome-python-desktop/ChangeLog,v 1.49 2008/03/27 10:19:26 eva Exp $
+
+  27 Mar 2008; Gilles Dartiguelongue <eva@gentoo.org> ChangeLog:
+  New version for GNOME 2.22. Bug fixes and new evolution/eds component.
 
   10 Feb 2008; Gilles Dartiguelongue <eva@gentoo.org>
   gnome-python-desktop-2.20.0.ebuild:
diff --git a/dev-python/gnome-python-desktop/Manifest b/dev-python/gnome-python-desktop/Manifest
index 928464cd7bae..3097bf365d3b 100644
--- a/dev-python/gnome-python-desktop/Manifest
+++ b/dev-python/gnome-python-desktop/Manifest
@@ -1,16 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-DIST gnome-python-desktop-2.18.0.tar.bz2 432321 RMD160 e709be32734fa3662fe7c086c1ca3cefa192047d SHA1 b8ead4b600104b4c4df6d8e61d93c31f48434364 SHA256 1238ed484620cd29e65695376ebf8a38162b4a94706b956b647e43776820d787
 DIST gnome-python-desktop-2.20.0.tar.bz2 440199 RMD160 729d9af9107c799843d396708690d89fd821b474 SHA1 9de5c7fb6d08752fbea7cb5fca51f1b709616f75 SHA256 32e2f5f4d3e79157a83cb7a1c6c409bc2fef75178f9626b2d83a1fd1c2ee4a8d
-EBUILD gnome-python-desktop-2.18.0.ebuild 1577 RMD160 59d1869ee6cfbb4560d1aae00cbf81ac05694aa8 SHA1 e853a8c04ae792623ec835bbe7a4866b29fe865d SHA256 2517dea273786323fb0ce7ac2fcf3e1d96942a086394cdea164c028290e70779
+DIST gnome-python-desktop-2.22.0.tar.bz2 571816 RMD160 4a9bc36c379f5fbb6549506c8b8e8bdb63bf0d62 SHA1 6f1a93aacfc256ca878f8f3636a0270580d2354b SHA256 116213b0b0fc3f1fa6771589eab86ccdf5d5024c30a987f3b912da0902be9d37
 EBUILD gnome-python-desktop-2.20.0.ebuild 1712 RMD160 33548c291848e059e270943cdad5a4ee7266692c SHA1 2acbce523132674a09592bd92e2c8aa6d6ed8b0a SHA256 ffd2b4da1beffa71ecb643fdedcf323cb2d898c714140279ca1fcf9be46d344d
-MISC ChangeLog 6544 RMD160 47656ddebebc8b6eacbe0056f04427ad4538290d SHA1 b2fddaf0ee2b4502a9fd34bf95b9ad4f8b308f83 SHA256 4a121591705d40835b5055247ec475e257c7c430dea1852c7da41654de2175fb
+EBUILD gnome-python-desktop-2.22.0.ebuild 2007 RMD160 51d18ae767f8d29958ca74f88ea990787b4024d5 SHA1 68e8efc70a1ebd09dbd6c79b242e37790ac0a66a SHA256 2e458f1053f9b9a5b135e20acf4437777e065b4399b9f1434ca6549323cca1dc
+MISC ChangeLog 6683 RMD160 dbe57a7ced0ebb88b2921aea57f1dcb63b01ae69 SHA1 cfcb9d12f675ff1cae91c7bfad5c5c3e82b08cb9 SHA256 843813eaefe65d1e80dd21a4f8ec94fdca761ddbeb75e4a47582b006aca00409
 MISC metadata.xml 159 RMD160 4aba844314249b872aefa0ef14d652f127e6334f SHA1 210583dd46159c21ce4f3289960d5014ce57e01a SHA256 d6e10a30ac9423eb5a9ba4e7b2a76322683f40b2fb428d2f310dcdbd1cfde235
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHr3Tc1fmVwcYIWAYRArbjAKCC18tPlCt9k58MueQQSOY4NNTxPACgsLHs
-ycd+S5dJaf2fME5o0OgjYZw=
-=6rNE
+iD8DBQFH63S61fmVwcYIWAYRAjKEAKCEf86kL3mLNBh/n8NslDMlrM0yBQCg1V19
+pH+tJNhUkPJlriyMkGqdF68=
+=NGcU
 -----END PGP SIGNATURE-----
diff --git a/dev-python/gnome-python-desktop/gnome-python-desktop-2.18.0.ebuild b/dev-python/gnome-python-desktop/gnome-python-desktop-2.22.0.ebuild
index 146e26c13b02..aa24f3bab764 100644
--- a/dev-python/gnome-python-desktop/gnome-python-desktop-2.18.0.ebuild
+++ b/dev-python/gnome-python-desktop/gnome-python-desktop-2.22.0.ebuild
@@ -1,6 +1,8 @@
-# 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/dev-python/gnome-python-desktop/gnome-python-desktop-2.18.0.ebuild,v 1.13 2007/10/10 21:43:31 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/gnome-python-desktop/gnome-python-desktop-2.22.0.ebuild,v 1.1 2008/03/27 10:19:26 eva Exp $
+
+EAPI="1"
 
 inherit gnome2 python virtualx
 
@@ -9,8 +11,10 @@ HOMEPAGE="http://pygtk.org/"
 
 LICENSE="LGPL-2.1 GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 ~x86-fbsd"
-IUSE="doc"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="doc eds"
+
+# FIXME: upstream is intending to move to WAF build system
 
 RDEPEND="virtual/python
 	>=dev-python/pygtk-2.10.3
@@ -20,26 +24,41 @@ RDEPEND="virtual/python
 	>=gnome-base/gnome-panel-2.13.4
 	>=gnome-base/libgnomeprint-2.2.0
 	>=gnome-base/libgnomeprintui-2.2.0
-	=x11-libs/gtksourceview-1*
-	>=x11-libs/libwnck-2.15.5
+	x11-libs/gtksourceview:1.0
+	>=x11-libs/libwnck-2.19.3
 	>=gnome-base/libgtop-2.13.0
 	>=gnome-extra/nautilus-cd-burner-2.15.3
 	>=gnome-extra/gnome-media-2.10.0
 	>=gnome-base/gconf-2.10.0
-	>=x11-wm/metacity-2.17.8
+	>=x11-wm/metacity-2.21.5
 	dev-python/pycairo
 	>=gnome-base/librsvg-2.13.93
-	>=gnome-base/gnome-keyring-0.5.0
+	>=gnome-base/gnome-keyring-2.20.1
 	>=gnome-base/gnome-desktop-2.10.0
-	media-video/totem
+	eds? ( >=gnome-extra/evolution-data-server-1.8 )
+	>=media-video/totem-1.4.0
 	!<dev-python/gnome-python-extras-2.13"
 DEPEND="${RDEPEND}
 	>=dev-util/pkgconfig-0.7"
 
-DOCS="AUTHORS ChangeLog INSTALL MAINTAINERS NEWS README"
+DOCS="AUTHORS ChangeLog INSTALL* MAINTAINERS NEWS README"
+
+pkg_config() {
+	G2CONF="${G2CONF}
+		$(use_enable eds evolution)
+		$(use_enable eds evolution-ecal)"
+}
+
+src_unpack() {
+	gnome2_src_unpack
+
+	# disable pyc compiling
+	mv py-compile py-compile.orig
+	ln -s $(type -P true) py-compile
+}
 
 src_test() {
-	Xmake check || die "tests failed"
+	Xemake check || die "tests failed"
 }
 
 src_install() {
@@ -58,5 +77,5 @@ pkg_postinst() {
 
 pkg_postrm() {
 	python_version
-	python_mod_cleanup
+	python_mod_cleanup /usr/$(get_libdir)/python${PYVER}/site-packages/gtk-2.0
 }