From c514488aab05a9a7c9a3c6748f0965d3872fbb8b Mon Sep 17 00:00:00 2001 From: Marinus Schraal Date: Mon, 13 Dec 2004 00:13:37 +0000 Subject: [PATCH] New release --- app-office/gnumeric/ChangeLog | 7 +- app-office/gnumeric/Manifest | 15 +-- .../gnumeric/files/digest-gnumeric-1.4.1 | 1 + .../files/gnumeric-1.4.1-bugfix.patch | 11 +++ app-office/gnumeric/gnumeric-1.4.1.ebuild | 94 +++++++++++++++++++ 5 files changed, 121 insertions(+), 7 deletions(-) create mode 100644 app-office/gnumeric/files/digest-gnumeric-1.4.1 create mode 100644 app-office/gnumeric/files/gnumeric-1.4.1-bugfix.patch create mode 100644 app-office/gnumeric/gnumeric-1.4.1.ebuild diff --git a/app-office/gnumeric/ChangeLog b/app-office/gnumeric/ChangeLog index 782f6c701268..7dea3278f7c4 100644 --- a/app-office/gnumeric/ChangeLog +++ b/app-office/gnumeric/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-office/gnumeric # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/gnumeric/ChangeLog,v 1.72 2004/12/10 00:24:37 gmsoft Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/gnumeric/ChangeLog,v 1.73 2004/12/13 00:13:37 foser Exp $ + +*gnumeric-1.4.1 (13 Dec 2004) + + 13 Dec 2004; foser gnumeric-1.4.1.ebuild : + New release, dep & USE flag fixes 09 Dec 2004; Guy Martin gnumeric-1.2.13.ebuild: Stable on hppa. diff --git a/app-office/gnumeric/Manifest b/app-office/gnumeric/Manifest index 95e468a1ce45..930821ef2af2 100644 --- a/app-office/gnumeric/Manifest +++ b/app-office/gnumeric/Manifest @@ -1,14 +1,17 @@ -MD5 64721ee5ff34c560d8b04ab934348e83 ChangeLog 10480 -MD5 f8459d46bf2c4e9d6cba7194b184146d gnumeric-1.0.13-r1.ebuild 2819 MD5 ed31b8c7a6237f0ac57798b377390679 gnumeric-1.2.12.ebuild 1959 -MD5 a7cd08ee9af0da37307f8bf337eb8e33 gnumeric-1.2.13.ebuild 1961 MD5 5159958a88d136c042a6c414d9996b93 gnumeric-1.2.6.ebuild 1995 +MD5 a7cd08ee9af0da37307f8bf337eb8e33 gnumeric-1.2.13.ebuild 1961 +MD5 852bb5926690ab7a7808b3470f00e159 gnumeric-1.4.1.ebuild 2231 +MD5 ced099ef2af8af1f5d52b9faf74042d6 ChangeLog 10611 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158 -MD5 7843727e1fcde50a4a2283ba34da3c1d files/digest-gnumeric-1.0.13-r1 69 +MD5 f8459d46bf2c4e9d6cba7194b184146d gnumeric-1.0.13-r1.ebuild 2819 +MD5 3b0b9ef38a3445a52df579b1aff3e7b1 files/gnumeric-1.2.1-fix_doc_destdir_install.patch 532 MD5 48c7f38d541d59ac1a888121072bc6df files/digest-gnumeric-1.2.12 70 MD5 34982e496dcc5110bba611652645d400 files/digest-gnumeric-1.2.13 70 +MD5 15d1e767e35f08fc2a897857ee07d5f4 files/gnumeric-1.4.1-bugfix.patch 506 +MD5 e3240d8a40c24a464b95631ef8c41727 files/gnumeric-1.2.0-fix_doc_destdir_install.patch 563 MD5 2513c8977def1ef6ce7489be0d52afed files/digest-gnumeric-1.2.6 69 +MD5 cc051e76b561e1c53302f80df04885f5 files/digest-gnumeric-1.4.1 69 +MD5 7843727e1fcde50a4a2283ba34da3c1d files/digest-gnumeric-1.0.13-r1 69 MD5 b4f77780f0a0a1a29df8c8b184b2c110 files/gnumeric-1.1.16-scrollkeeper.patch 493 -MD5 e3240d8a40c24a464b95631ef8c41727 files/gnumeric-1.2.0-fix_doc_destdir_install.patch 563 MD5 4ea524a5bc0155e6fb624670d57075f7 files/gnumeric-1.2.0-gcc2_fix.patch 693 -MD5 3b0b9ef38a3445a52df579b1aff3e7b1 files/gnumeric-1.2.1-fix_doc_destdir_install.patch 532 diff --git a/app-office/gnumeric/files/digest-gnumeric-1.4.1 b/app-office/gnumeric/files/digest-gnumeric-1.4.1 new file mode 100644 index 000000000000..81b6bfd794cd --- /dev/null +++ b/app-office/gnumeric/files/digest-gnumeric-1.4.1 @@ -0,0 +1 @@ +MD5 bc60b5c342908e969b320ab833e6b151 gnumeric-1.4.1.tar.bz2 16827174 diff --git a/app-office/gnumeric/files/gnumeric-1.4.1-bugfix.patch b/app-office/gnumeric/files/gnumeric-1.4.1-bugfix.patch new file mode 100644 index 000000000000..9aa61406a4de --- /dev/null +++ b/app-office/gnumeric/files/gnumeric-1.4.1-bugfix.patch @@ -0,0 +1,11 @@ +--- gnumeric-1.4.1/src/cut-n-paste-code/goffice/utils/go-file.c 2004-12-09 18:47:37.000000000 +0100 ++++ gnumeric-1.4.1/src/cut-n-paste-code/goffice/utils/go-file.c.patched 2004-12-12 22:35:44.309910984 +0100 +@@ -493,7 +493,7 @@ + for (i = 1 ; i < argc ; i++) + if (NULL != (tmp = strstr (argv[i], "%1"))) { + *tmp = '\0'; +- tmp = g_strconcat = (argv[i], ++ tmp = g_strconcat (argv[i], + (clean_url != NULL) ? (char const *)clean_url : url, + tmp+2, NULL); + g_free (argv[i]); diff --git a/app-office/gnumeric/gnumeric-1.4.1.ebuild b/app-office/gnumeric/gnumeric-1.4.1.ebuild new file mode 100644 index 000000000000..4b9a832c225b --- /dev/null +++ b/app-office/gnumeric/gnumeric-1.4.1.ebuild @@ -0,0 +1,94 @@ +# Copyright 1999-2004 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-office/gnumeric/gnumeric-1.4.1.ebuild,v 1.1 2004/12/13 00:13:37 foser Exp $ + +inherit virtualx gnome2 eutils + +DESCRIPTION="Gnumeric, the GNOME Spreadsheet" +HOMEPAGE="http://www.gnome.org/projects/gnumeric/" +LICENSE="GPL-2" + +SLOT="0" +KEYWORDS="~x86 ~ppc ~sparc ~hppa ~amd64 ~alpha ~ia64" + +#IUSE="libgda gnomedb python bonobo" +IUSE="libgda python gnome" + +RDEPEND=">=dev-libs/glib-2.4 + >=gnome-extra/libgsf-1.10 + >=dev-libs/libxml2-2.4.12 + >=x11-libs/pango-1.4 + + >=x11-libs/gtk+-2.4 + >=gnome-base/libglade-2.4 + >=gnome-base/libgnomecanvas-2 + >=gnome-base/libgnomeprint-2.6 + >=gnome-base/libgnomeprintui-2.6 + >=media-libs/libart_lgpl-2.3.11 + + gnome? ( >=x11-libs/gtk+-2.4 + >=gnome-base/libglade-2.4 + >=gnome-base/libgnomecanvas-2 + >=gnome-base/libgnomeprint-2.6 + >=gnome-base/libgnomeprintui-2.6 + >=media-libs/libart_lgpl-2.3.11 + >=gnome-base/gconf-2 + >=gnome-base/libgnome-2 + >=gnome-base/libgnomeui-2 + >=gnome-base/libbonobo-2.2 + >=gnome-base/libbonoboui-2.2 + dev-util/pkgconfig ) + python? ( >=dev-lang/python-2 + >=dev-python/pygtk-2 ) + libgda? ( >=gnome-extra/libgda-1.0.1 )" +# gnomedb? ( >=gnome-extra/libgnomedb-0.90.2 ) + +DEPEND="${RDEPEND} + >=dev-util/intltool-0.30 + dev-util/pkgconfig + app-text/scrollkeeper" + +pkg_setup() { + + if use gnome; then + if ! pkg-config --exists libgsf-gnome-1; then + einfo "libgsf needs to be compiled with gnome in USE" + einfo "for this version of gnumeric to work. Rebuild" + einfo "libgsf first like this :" + einfo "USE=gnome emerge libgsf -vp" + die "libgsf was built without gnome support..." + fi + fi +} + +src_unpack() { + + unpack ${A} + gnome2_omf_fix + + cd ${S} + # simple code typo + epatch ${FILESDIR}/${P}-bugfix.patch + +} + +src_compile() { + + # gcc bug (http://bugs.gnome.org/show_bug.cgi?id=128834) + replace-flags "-Os" "-O2" + + econf \ + `use_with python` \ + `use_with libgda gda` \ + `use_with gnome` \ + || die +# building nogui is still too problematic +# `use_with gtk` \ + # `use_with gnomedb gda` + + # the build process has to be able to connect to X + Xemake || die + +} + +DOCS="AUTHORS COPYING* ChangeLog HACKING NEWS README TODO" -- 2.26.2