revision bump to make it 64bit safe. Patch by Thomas Cort <tom AT tomcort DOT com>, see bug 231986

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

4 files changed, 103 insertions, 3 deletions

diff --git a/app-office/gnotime/ChangeLog b/app-office/gnotime/ChangeLog
index 7f39d599fdf4..5796917426dd 100644
--- a/app-office/gnotime/ChangeLog
+++ b/app-office/gnotime/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-office/gnotime
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/gnotime/ChangeLog,v 1.45 2009/12/27 15:05:05 mrpouet Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/gnotime/ChangeLog,v 1.46 2010/01/04 13:47:41 fauli Exp $
+
+*gnotime-2.3.0-r3 (04 Jan 2010)
+
+  04 Jan 2010; Christian Faulhammer <fauli@gentoo.org>
+  +gnotime-2.3.0-r3.ebuild, +files/gnotime-2.3.0-missing-includes.patch:
+  revision bump to make it 64bit safe. Patch by Thomas Cort <tom AT tomcort
+  DOT com>, see bug 231986
 
   27 Dec 2009; Romain Perier <mrpouet@gentoo.org> gnotime-2.3.0-r2.ebuild,
   +files/gnotime-2.3.0-libgnomeui-typo.patch:
diff --git a/app-office/gnotime/Manifest b/app-office/gnotime/Manifest
index 156f09c62d69..704bfa5d78f8 100644
--- a/app-office/gnotime/Manifest
+++ b/app-office/gnotime/Manifest
@@ -1,7 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX gnotime-2.3.0-fix-columns.patch 681 RMD160 e50678d5e5f05db4d0eae16ba200fa24a962914d SHA1 fdf13a9f7517a9acccf949859fbd59e4dd36e7ee SHA256 a98cbeef1753edb6e07f1a3eee565c37761f439e306a8dc840d18952f1fb7880
 AUX gnotime-2.3.0-libgnomeui-typo.patch 623 RMD160 aa5bee00cb634a1a14588f0b3ea4b086fee792f7 SHA1 a4b9f146ea7f788a8e7624971f1d6c123f05a17c SHA256 a9ff7e9f0c80638ccb138c2e7bb4f5189dcd09897532ccf2b37d43a246f9aeb1
+AUX gnotime-2.3.0-missing-includes.patch 768 RMD160 b748c99c767ebf5d8f3c7a0a975f0d6daa647398 SHA1 8f85eb2d19213c5a9d4dcded0b5c8f25d6262469 SHA256 519f1293715403f35eaeb7fdaa0af83a7290be72583c35fcf163a9cad30fdc7f
 DIST gnotime-2.3.0.tar.gz 1987788 RMD160 361e45d82997cbac691751b830a2279e6ed74134 SHA1 1cd38b5a3d3548d19543f0aea421152367523a90 SHA256 556e9bdc7704fa6bebce51581046d6c68b2428cd83e5fffae3f53e5a22906f24
 EBUILD gnotime-2.3.0-r2.ebuild 1514 RMD160 323db11cdcbb907daced4b92eec6def67d4de319 SHA1 e7809e2f5ed49acc64e64814ca7a736d967066fd SHA256 f05e88b654e922f80f010cd61f4bf4c1aefee2483ea86a50294f4bbf5730a400
+EBUILD gnotime-2.3.0-r3.ebuild 1575 RMD160 1fd6ff1ea1863148d04b8dde1f28f69e036233ca SHA1 e757d5d80d2be7966ff80054388afdffea13e277 SHA256 5095b6d451b4f79789ac82faa5f4ab319cf5feaf53fbcaa1ed7fbf2be19438d2
 EBUILD gnotime-2.3.0.ebuild 1055 RMD160 c42ebf276b11e65395075578a3246a3431fda086 SHA1 d8d89facc7447968c551a703d94e9650da9a3f6e SHA256 cefd6ed04eda9127d3813f80b7c712b212d44099da00fe42af6dd1d95d337961
-MISC ChangeLog 6078 RMD160 243e01e5dfd1cd30303984453641dd8ffaeaf301 SHA1 1b37b0961496ae91e7ce3db3bc24924f0a039536 SHA256 7deae0dcc186f3eabf6ab74a88b201c273b600bcbb1bea140fc9c2c8b5b56ce4
+MISC ChangeLog 6341 RMD160 87a1874f9e42f6b6da9a7cc093f5923f99d9f9a2 SHA1 3cf81c898e626c0b8d4da9a4b72a49150032f38a SHA256 b1dc87d5688e4f6cd95859a70f77415924a3cce61667aae8e30a43cea8b54b8d
 MISC metadata.xml 169 RMD160 83b2991d740455e3f25a7384cac8b2e5f8755169 SHA1 17984c2b8f7f8ffebeb918c8a1c8ca356c2116c7 SHA256 d044e013dbcd3a2fdd01c970c1e3b9029467d452f6a794cba9700344300d8f3c
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAktB8YIACgkQNQqtfCuFnePAcACeN8sKS7SV56boK8X+ozYxGS6m
++QEAnj9J6NHtGY8uniWn6W8G8CSlr7qz
+=yK7J
+-----END PGP SIGNATURE-----
diff --git a/app-office/gnotime/files/gnotime-2.3.0-missing-includes.patch b/app-office/gnotime/files/gnotime-2.3.0-missing-includes.patch
new file mode 100644
index 000000000000..207c6cd1207d
--- /dev/null
+++ b/app-office/gnotime/files/gnotime-2.3.0-missing-includes.patch
@@ -0,0 +1,22 @@
+diff -urN gnotime-2.3.0-r2.orig/src/ghtml.c gnotime-2.3.0-r2/src/ghtml.c
+--- gnotime-2.3.0-r2.orig/src/ghtml.c	2009-06-01 20:50:50.206060968 -0400
++++ gnotime-2.3.0-r2/src/ghtml.c	2009-06-01 20:51:59.306074517 -0400
+@@ -24,6 +24,7 @@
+ #include <libguile.h>
+ #include <libguile/backtrace.h>
+ #include <limits.h>
++#include <math.h>
+ #include <stdio.h>
+ #include <string.h>
+ #include <libgnomevfs/gnome-vfs.h>
+diff -urN gnotime-2.3.0-r2.orig/src/notes-area.c gnotime-2.3.0-r2/src/notes-area.c
+--- gnotime-2.3.0-r2.orig/src/notes-area.c	2009-06-01 20:50:50.206060968 -0400
++++ gnotime-2.3.0-r2/src/notes-area.c	2009-06-01 20:52:40.076074295 -0400
+@@ -22,6 +22,7 @@
+ #include <gnome.h>
+ 
+ #include "proj.h"
++#include "menus.h"
+ #include "notes-area.h"
+ #include "util.h"
+ 
diff --git a/app-office/gnotime/gnotime-2.3.0-r3.ebuild b/app-office/gnotime/gnotime-2.3.0-r3.ebuild
new file mode 100644
index 000000000000..32c95ee652f8
--- /dev/null
+++ b/app-office/gnotime/gnotime-2.3.0-r3.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/gnotime/gnotime-2.3.0-r3.ebuild,v 1.1 2010/01/04 13:47:41 fauli Exp $
+
+EAPI=2
+
+inherit autotools eutils gnome2
+
+DESCRIPTION="Utility to track time spent on activities"
+HOMEPAGE="http://gttr.sourceforge.net/"
+SRC_URI="mirror://sourceforge/gttr/${P}.tar.gz"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc"
+
+RDEPEND=">=x11-libs/gtk+-2.10
+	>=dev-libs/glib-2.14
+	>=gnome-base/libgnome-2.0
+	>=gnome-base/libgnomeui-2.0.3
+	>=gnome-base/gnome-vfs-2
+	>=gnome-base/libglade-2.0
+	>=gnome-extra/gtkhtml-3.14.3:3.14
+	>=gnome-base/gconf-2.0
+	dev-libs/libxml2
+	>=dev-libs/dbus-glib-0.74
+	dev-scheme/guile
+	dev-libs/qof:0
+	x11-libs/libXScrnSaver
+	x11-libs/pango"
+
+DEPEND="${RDEPEND}
+	x11-proto/scrnsaverproto
+	dev-util/pkgconfig
+	dev-util/intltool
+	>=app-text/scrollkeeper-0.3.11
+	doc? ( ~app-text/docbook-xml-dtd-4.2 )"
+
+DOCS="AUTHORS ChangeLog NEWS README TODO"
+
+pkg_setup() {
+	G2CONF="${G2CONF} --disable-schemas-install"
+}
+
+src_prepare() {
+	# man generation needs docbook-xml-dtd
+	use doc || sed -i -e "s/SUBDIRS = man/SUBDIRS = /" doc/C/Makefile.{in,am}
+
+	# Fix column descriptions, bug #222325
+	epatch "${FILESDIR}/${P}-fix-columns.patch"
+	# Fix typo in PKG_CHECK_MODULES, bug #298193
+	epatch "${FILESDIR}/${P}-libgnomeui-typo.patch"
+	# Make it 64bit safe, bug 231986
+	epatch "${FILESDIR}"/${P}-missing-includes.patch
+
+	intltoolize --automake --copy --force || die "intltoolize failed"
+	eautoreconf
+}