app-office/gnotime: 2.3.0-r3 → 2.4.1

7 files changed, 67 insertions, 116 deletions

diff --git a/app-office/gnotime/Manifest b/app-office/gnotime/Manifest
index 1b223fe..1f0b2e0 100644
--- a/app-office/gnotime/Manifest
+++ b/app-office/gnotime/Manifest
@@ -1,11 +1,11 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-DIST gnotime-2.3.0.tar.gz 4231 SHA256 69e2e316024d40d2b781c58447056f2c6fe579231f449f84db64ec4449da2b5e SHA512 7e265ac7de66ab2a605fd035c1eb9774d18da89e274c3ba837d838f14c2375eeae29c83bd00994cbd56af0e4beb7d0b3d53b5f42b8c666da45c726e28c628372 WHIRLPOOL bbd48d7d3fe5f824b9d6f49876088748258db5175d2abf88dbb1300968a8f94d0caae10a75d1f9195942beec4741caf05a1c53333633a0f9017d48889860dcaa
+DIST gnotime-2.4.1.tar.gz 1767643 SHA256 b25a9d94cdb7e08c18f115eddddd32a6e23834416355fcaed852260b6b2f6410 SHA512 0bcbde30ab1e05931aab4ed3769da145b42eade8edcc926ade7b755b3cd88bad914a9e26fc3522904f5525dc5fab329acb1832db2f280904effc248eee500829 WHIRLPOOL 3930b9c15ed15100a66321182f1f94705f68ed62c395a25e09dc9c89955b9fb4127be1953e420a0b7ed2011530b4dce43c66f12c78dedc97b48f72a74119ae3f
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2
 
-iEYEAREKAAYFAlBzS30ACgkQ1fmVwcYIWAZHmQCcCt/kCKj46kgrA8FqXULYQHWp
-C9YAnia06xh6qYmJw8REfpIo61zdHrlE
-=ulzo
+iEYEAREKAAYFAlSEjjgACgkQ1fmVwcYIWAbOgQCfR4HmTACgW7/ICkJa4e287XeH
+SPYAoJZTYqf6+lQYuKpWxn9cnq8uhxpU
+=53Ui
 -----END PGP SIGNATURE-----
diff --git a/app-office/gnotime/files/gnotime-2.3.0-fix-columns.patch b/app-office/gnotime/files/gnotime-2.3.0-fix-columns.patch
deleted file mode 100644
index 2b4b3ce..0000000
--- a/app-office/gnotime/files/gnotime-2.3.0-fix-columns.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur work.old/gnotime-2.3.0/src/projects-tree.c work/gnotime-2.3.0/src/projects-tree.c
---- work.old/gnotime-2.3.0/src/projects-tree.c	2008-01-23 18:50:29.000000000 +0200
-+++ work/gnotime-2.3.0/src/projects-tree.c	2008-03-10 15:53:47.000000000 +0200
-@@ -266,7 +266,7 @@
- 	priv->column_definitions[8].default_width = 72;
- 
- 	priv->column_definitions[9].name = "description";
--	priv->column_definitions[9].model_column = TITLE_COLUMN;
-+	priv->column_definitions[9].model_column = DESCRIPTION_COLUMN;
- 	priv->column_definitions[9].renderer = priv->text_renderer;
- 	priv->column_definitions[9].value_property_name = "text";
- 	priv->column_definitions[9].label = _("Description");
diff --git a/app-office/gnotime/files/gnotime-2.3.0-libgnomeui-typo.patch b/app-office/gnotime/files/gnotime-2.3.0-libgnomeui-typo.patch
deleted file mode 100644
index 7eef965..0000000
--- a/app-office/gnotime/files/gnotime-2.3.0-libgnomeui-typo.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-From: Romain Perier <mrpouet@gentoo.org>
-Date: Sun, 27 Dec 2009 15:51:02 +0100
-Subject: Fix typo in PKG_CHECK_MODULES, which caused build failure
-
----
- configure.in |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
---- a/configure.in
-+++ b/configure.in
-@@ -90,7 +90,7 @@ AC_SUBST(LIBGNOME_LIBS)
- dnl *****************************************
- dnl Check for libgnomeui
- dnl *****************************************
--PKG_CHECK_MODULES(GNOMEUI, libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED)
-+PKG_CHECK_MODULES(LIBGNOMEUI, libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED)
- AC_SUBST(LIBGNOMEUI_CFLAGS)
- AC_SUBST(LIBGNOMEUI_LIBS)
- 
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
deleted file mode 100644
index 207c6cd..0000000
--- a/app-office/gnotime/files/gnotime-2.3.0-missing-includes.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-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/files/gnotime-2.4.1-link.patch b/app-office/gnotime/files/gnotime-2.4.1-link.patch
new file mode 100644
index 0000000..e7ba5f1
--- /dev/null
+++ b/app-office/gnotime/files/gnotime-2.4.1-link.patch
@@ -0,0 +1,11 @@
+Add missing link to math library.
+--- a/src/Makefile.am	2014-12-07 18:53:56.405483544 +0100
++++ b/src/Makefile.am	2014-12-07 18:53:50.653533853 +0100
+@@ -124,6 +124,7 @@
+ 	${GUILE_CFLAGS}
+ 
+ gnotime_LDADD =          \
++	-lm \
+ 	${GLIB_LIBS}     \
+ 	${GTK_LIBS}     \
+ 	${LIBGNOME_LIBS}     \
diff --git a/app-office/gnotime/gnotime-2.3.0-r3.ebuild b/app-office/gnotime/gnotime-2.3.0-r3.ebuild
deleted file mode 100644
index 6925621..0000000
--- a/app-office/gnotime/gnotime-2.3.0-r3.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/gnotime/Attic/gnotime-2.3.0-r3.ebuild,v 1.8 2012/06/16 12:02:23 pacho dead $
-
-EAPI="4"
-GCONF_DEBUG="yes"
-
-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:2
-	>=dev-libs/glib-2.14:2
-	>=gnome-base/libgnome-2
-	>=gnome-base/libgnomeui-2.3
-	>=gnome-base/gnome-vfs-2:2
-	>=gnome-base/libglade-2:2.0
-	>=gnome-extra/gtkhtml-3.14.3:3.14
-	>=gnome-base/gconf-2:2
-	dev-libs/libxml2:2
-	>=dev-libs/dbus-glib-0.74
-	dev-scheme/guile[deprecated]
-	dev-libs/qof:0
-	x11-libs/libXScrnSaver
-	x11-libs/pango
-"
-DEPEND="${RDEPEND}
-	x11-proto/scrnsaverproto
-	virtual/pkgconfig
-	dev-util/intltool
-	>=app-text/scrollkeeper-0.3.11
-	doc? ( ~app-text/docbook-xml-dtd-4.2 )"
-
-DOCS="AUTHORS ChangeLog NEWS README TODO"
-
-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"
-
-	eautoreconf
-	gnome2_src_prepare
-}
diff --git a/app-office/gnotime/gnotime-2.4.1.ebuild b/app-office/gnotime/gnotime-2.4.1.ebuild
new file mode 100644
index 0000000..30e6e75
--- /dev/null
+++ b/app-office/gnotime/gnotime-2.4.1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="5"
+GCONF_DEBUG="yes"
+
+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=""
+
+RDEPEND="
+	>=dev-libs/dbus-glib-0.74
+	>=dev-libs/glib-2.14:2
+	dev-libs/libxml2:2
+	dev-libs/qof:2
+	>=dev-scheme/guile-2.0:2
+	>=gnome-base/gconf-2:2
+	>=gnome-base/gnome-vfs-2:2
+	>=gnome-base/libglade-2:2.0
+	>=gnome-base/libgnome-2
+	>=gnome-base/libgnomeui-2.3
+	>=gnome-extra/gtkhtml-3.14.3:3.14
+	>=x11-libs/gtk+-2.12:2
+	x11-libs/libX11
+	x11-libs/libXScrnSaver
+	x11-libs/pango
+"
+DEPEND="${RDEPEND}
+	app-text/docbook-xml-dtd:4.2
+	>=app-text/scrollkeeper-0.3.11
+	>=dev-util/intltool-0.35.5
+	sys-devel/gettext
+	virtual/pkgconfig
+	x11-proto/scrnsaverproto
+"
+
+src_prepare() {
+	# Fix linking of gnotime binary
+	epatch "${FILESDIR}"/${P}-link.patch
+
+	eautoreconf
+	gnome2_src_prepare
+}