fixed evolution-2 compability for #91899

Package-Manager: portage-2.0.51.22-r1

5 files changed, 98 insertions, 8 deletions

diff --git a/x11-misc/gdeskcal/ChangeLog b/x11-misc/gdeskcal/ChangeLog
index 7f849e8c574c..2bfa3d98ae37 100644
--- a/x11-misc/gdeskcal/ChangeLog
+++ b/x11-misc/gdeskcal/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-misc/gdeskcal
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/gdeskcal/ChangeLog,v 1.7 2004/10/01 12:25:24 pyrania Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/gdeskcal/ChangeLog,v 1.8 2005/06/17 03:44:18 smithj Exp $
+
+*gdeskcal-0.57.1-r1 (17 Jun 2005)
+
+  17 Jun 2005; Jonathan Smith <smithj@gentoo.org>
+  +files/gdeskcal-evo2.patch, +gdeskcal-0.57.1-r1.ebuild:
+  fixed evolution-2 compability for #91899
 
   01 Oct 2004; <pyrania@gentoo.org> gdeskcal-0.57.1.ebuild:
   Marked stable on x86.
diff --git a/x11-misc/gdeskcal/Manifest b/x11-misc/gdeskcal/Manifest
index ba83a8924545..b62893240cb9 100644
--- a/x11-misc/gdeskcal/Manifest
+++ b/x11-misc/gdeskcal/Manifest
@@ -1,15 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+MD5 a8dd428e6fd8458e615ccbafa8204437 ChangeLog 1290
 MD5 73ec14f18d76688c1f9cc6ddc48d5779 gdeskcal-0.57.1.ebuild 1600
-MD5 9c6de091d721d164d8993406190d0527 ChangeLog 1104
 MD5 e60ca3d672670524a6881084c5fd2476 metadata.xml 224
-MD5 bdfc06cfa0781e3a743bad41d80b788b files/gdeskcal-0.57.1-gnomeui.patch 785
+MD5 41850534a302ae88a8f0f4bf3fbe1b37 gdeskcal-0.57.1-r1.ebuild 1641
 MD5 25dec6cbbd74cd92e98dcd22c280d5b5 files/digest-gdeskcal-0.57.1 67
+MD5 bdfc06cfa0781e3a743bad41d80b788b files/gdeskcal-0.57.1-gnomeui.patch 785
+MD5 60c5a8136428544fc2321955abd9c591 files/gdeskcal-evo2.patch 907
+MD5 25dec6cbbd74cd92e98dcd22c280d5b5 files/digest-gdeskcal-0.57.1-r1 67
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
+Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFB2ulOZ/iYVBmujdURAvQGAKCikm9PeleFVtN2lmamQ8ON4qJDqwCgqpZj
-7rN3dp4QJbhHHLRWWG0Y4mI=
-=bWKD
+iD8DBQFCskc8l5AvwDPiUowRAgxQAKDU2Xta8Qf8CSBnJm9sFW7Orbpg6wCgoOBG
+NQAFgJ6MI69IBPfV3YAuK30=
+=Md1s
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/gdeskcal/files/digest-gdeskcal-0.57.1-r1 b/x11-misc/gdeskcal/files/digest-gdeskcal-0.57.1-r1
new file mode 100644
index 000000000000..bead64b70f76
--- /dev/null
+++ b/x11-misc/gdeskcal/files/digest-gdeskcal-0.57.1-r1
@@ -0,0 +1 @@
+MD5 c2c1de1046e9026558c51e90fe6f8a9e gDeskCal-0_57_1.tar.gz 102826
diff --git a/x11-misc/gdeskcal/files/gdeskcal-evo2.patch b/x11-misc/gdeskcal/files/gdeskcal-evo2.patch
new file mode 100644
index 000000000000..8b05ca8ecc0e
--- /dev/null
+++ b/x11-misc/gdeskcal/files/gdeskcal-evo2.patch
@@ -0,0 +1,21 @@
+diff -ruN 111/gDeskCal-0.57.1/code/CalMediator.py gDeskCal-0.57.1/code/CalMediator.py
+--- 111/gDeskCal-0.57.1/code/CalMediator.py	2004-03-15 23:46:05.000000000 +0100
++++ gDeskCal-0.57.1/code/CalMediator.py	2005-05-07 00:34:45.000000000 +0200
+@@ -326,4 +326,4 @@
+     #
+     def __cmd_evolution(self):
+ 
+-        os.system("evolution evolution:/local/Calendar &")
++        os.system("evolution evolution -c calendar &")
+diff -ruN 111/gDeskCal-0.57.1/code/values.py gDeskCal-0.57.1/code/values.py
+--- 111/gDeskCal-0.57.1/code/values.py	2004-03-15 23:46:05.000000000 +0100
++++ gDeskCal-0.57.1/code/values.py	2005-05-07 00:26:48.000000000 +0200
+@@ -15,7 +15,7 @@
+ # files
+ SKINFILE = "skin.xml"
+ CONFIGFILE = "config.xml"
+-EVOLUTION_CALENDAR = "~/evolution/local/Calendar/calendar.ics"
++EVOLUTION_CALENDAR = "~/.evolution/calendar/local/system/calendar.ics"
+ MY_CALENDAR = "calendar.ics"
+ 
+ # config data files
diff --git a/x11-misc/gdeskcal/gdeskcal-0.57.1-r1.ebuild b/x11-misc/gdeskcal/gdeskcal-0.57.1-r1.ebuild
new file mode 100644
index 000000000000..dedb8e730b33
--- /dev/null
+++ b/x11-misc/gdeskcal/gdeskcal-0.57.1-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/gdeskcal/gdeskcal-0.57.1-r1.ebuild,v 1.1 2005/06/17 03:44:18 smithj Exp $
+
+inherit eutils
+
+DESCRIPTION="Cute little eye-candy calendar for the desktop"
+HOMEPAGE="http://www.pycage.de/software_gdeskcal.html"
+
+# The name of the source tarball differs slightly from the package
+# name and version:
+MY_PN=gDeskCal
+MY_P=${MY_PN}-${PV//./_}
+SRC_URI="http://www.pycage.de/download/${MY_P}.tar.gz"
+
+# The name of the unpacked tarball's sourcedir isn't the default $S
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~ppc ~ppc64 ~amd64"
+
+IUSE="gnome"
+
+DEPEND=">=dev-lang/python-2.0
+	>=x11-libs/gtk+-2.0
+	>=dev-libs/glib-2.0
+	>=dev-python/pygtk-2.0"
+
+src_unpack() {
+	unpack ${A}
+	# Session support for gDeskCal (requires pygtk[gnome])
+	use gnome && epatch ${FILESDIR}/${P}-gnomeui.patch
+
+	epatch ${FILESDIR}/${PN}-evo2.patch
+}
+
+src_install() {
+	# put documents in the right place
+	dodoc AUTHORS NEWS README README.i18n README.skins
+
+	# gdeskcal Python objects and i18n files
+	GDESKCAL_DIR=/usr/share/${PN}
+	dodir ${GDESKCAL_DIR}
+	cp -R code skins data locale po gdeskcal ${D}${GDESKCAL_DIR}
+	# make a symlink from /usr/share/gdeskcal/gdeskcal to /usr/bin/gdeskcal
+	dodir /usr/bin
+	dosym ${GDESKCAL_DIR}/gdeskcal /usr/bin/gdeskcal
+}
+
+pkg_postinst() {
+	# some useful information about where to get skins
+	einfo ""
+	einfo "Skins for gDeskCal can be found at:"
+	einfo "  ${HOMEPAGE}"
+	einfo ""
+	einfo "To install a new skin simply drag it onto the gDeskCal skinbrowser"
+	einfo ""
+}