diff options
Diffstat (limited to 'app-office')
| -rw-r--r-- | app-office/gnumeric/ChangeLog | 8 | ||||
| -rw-r--r-- | app-office/gnumeric/Manifest | 21 | ||||
| -rw-r--r-- | app-office/gnumeric/files/digest-gnumeric-1.2.13 | 1 | ||||
| -rw-r--r-- | app-office/gnumeric/files/digest-gnumeric-1.4.3 | 1 | ||||
| -rw-r--r-- | app-office/gnumeric/files/gnumeric-1.4.3-makejobs.patch | 52 | ||||
| -rw-r--r-- | app-office/gnumeric/gnumeric-1.2.13.ebuild | 81 | ||||
| -rw-r--r-- | app-office/gnumeric/gnumeric-1.4.2.ebuild | 4 | ||||
| -rw-r--r-- | app-office/gnumeric/gnumeric-1.4.3.ebuild | 112 |
8 files changed, 185 insertions, 95 deletions
diff --git a/app-office/gnumeric/ChangeLog b/app-office/gnumeric/ChangeLog index aa2b9ce95162..44a40c3a6286 100644 --- a/app-office/gnumeric/ChangeLog +++ b/app-office/gnumeric/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for app-office/gnumeric # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/gnumeric/ChangeLog,v 1.83 2005/04/06 18:11:08 corsair Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/gnumeric/ChangeLog,v 1.84 2005/04/17 16:17:30 foser Exp $ + +*gnumeric-1.4.3 (17 Apr 2005) + + 17 Apr 2005; foser <foser@gentoo.org> gnumeric-1.4.3.ebuild : + New release + Add makejobs fix (#78828) for multiplejobs compile 06 Apr 2005; Markus Rothe <corsair@gentoo.org> gnumeric-1.4.1.ebuild: Stable on ppc64 diff --git a/app-office/gnumeric/Manifest b/app-office/gnumeric/Manifest index c5b28680613d..5191c8edcec2 100644 --- a/app-office/gnumeric/Manifest +++ b/app-office/gnumeric/Manifest @@ -1,20 +1,21 @@ -MD5 c5ad45569dab191c10a44707a1985449 ChangeLog 11599 -MD5 1efce9ecf63cd654d80e288c8c06a87d gnumeric-1.0.13-r1.ebuild 2821 MD5 cda5089d74320c2a5f83e52b885a07a9 gnumeric-1.2.12.ebuild 1964 -MD5 bd25ef9a98943383c6b33581cd89432d gnumeric-1.2.13.ebuild 1964 MD5 545256ef2a15c35cbc38b6b927eddfb1 gnumeric-1.2.6.ebuild 1998 +MD5 5745fbe36fcec6843f50e4763b2237a4 gnumeric-1.4.2.ebuild 2534 MD5 4d1189a281192657b175968d73bd7a87 gnumeric-1.4.1.ebuild 2282 -MD5 5e412ce4bba01f726bfe7ba5f5d4c7c4 gnumeric-1.4.2.ebuild 2536 +MD5 64443dc0635ffb31cd74b390c1c57c83 ChangeLog 11760 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158 -MD5 7843727e1fcde50a4a2283ba34da3c1d files/digest-gnumeric-1.0.13-r1 69 +MD5 53dd4c73df6efb758d014efc17346f06 gnumeric-1.4.3.ebuild 2508 +MD5 1efce9ecf63cd654d80e288c8c06a87d gnumeric-1.0.13-r1.ebuild 2821 +MD5 3b0b9ef38a3445a52df579b1aff3e7b1 files/gnumeric-1.2.1-fix_doc_destdir_install.patch 532 +MD5 403a9f34b1159b636dec6156951e023d files/gnumeric-1.4.3-makejobs.patch 1591 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 f7eb652589a8e0103264b9d828cf4046 files/digest-gnumeric-1.4.2 69 +MD5 2bff8e6c3d41ceae3d04783899915363 files/digest-gnumeric-1.4.3 69 +MD5 b1c7dc9c30396b4fad208b985e9ade9d files/gnumeric-1.4.2-sheet_object_scroll.patch 3295 +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 -MD5 15d1e767e35f08fc2a897857ee07d5f4 files/gnumeric-1.4.1-bugfix.patch 506 -MD5 b1c7dc9c30396b4fad208b985e9ade9d files/gnumeric-1.4.2-sheet_object_scroll.patch 3295 diff --git a/app-office/gnumeric/files/digest-gnumeric-1.2.13 b/app-office/gnumeric/files/digest-gnumeric-1.2.13 deleted file mode 100644 index 45c956e70327..000000000000 --- a/app-office/gnumeric/files/digest-gnumeric-1.2.13 +++ /dev/null @@ -1 +0,0 @@ -MD5 367ec0d4a1a0b8898a03a70a05052698 gnumeric-1.2.13.tar.bz2 14319675 diff --git a/app-office/gnumeric/files/digest-gnumeric-1.4.3 b/app-office/gnumeric/files/digest-gnumeric-1.4.3 new file mode 100644 index 000000000000..b63fff8bda02 --- /dev/null +++ b/app-office/gnumeric/files/digest-gnumeric-1.4.3 @@ -0,0 +1 @@ +MD5 b684eec48b1696d7a8d7152d1e17741c gnumeric-1.4.3.tar.bz2 13756646 diff --git a/app-office/gnumeric/files/gnumeric-1.4.3-makejobs.patch b/app-office/gnumeric/files/gnumeric-1.4.3-makejobs.patch new file mode 100644 index 000000000000..552e57adffa8 --- /dev/null +++ b/app-office/gnumeric/files/gnumeric-1.4.3-makejobs.patch @@ -0,0 +1,52 @@ +Index: Makefile.am +=================================================================== +RCS file: /cvs/gnome/gnumeric/plugins/corba/Makefile.am,v +retrieving revision 1.5 +retrieving revision 1.6 +diff -u -r1.5 -r1.6 +--- Makefile.am 24 Sep 2004 01:33:18 -0000 1.5 ++++ Makefile.am 22 Feb 2005 17:07:22 -0000 1.6 +@@ -7,23 +7,26 @@ + xmldir = $(gnumeric_plugin_corbadir) + gnumeric_plugin_corba_LTLIBRARIES = corba.la + corba_la_LDFLAGS = -module $(GNUMERIC_PLUGIN_LDFLAGS) +-corba_la_SOURCES = $(GNUMERIC_GENERATED) \ ++corba_la_SOURCES = \ + corba-application.c \ + corba-workbook.c \ + corba-workbook.h \ + corba-sheet.c \ + corba-sheet.h + +-GNUMERIC_GENERATED = \ ++nodist_corba_la_SOURCES = \ + GNOME_Gnumeric-common.c \ + GNOME_Gnumeric-skels.c \ + GNOME_Gnumeric-stubs.c \ + GNOME_Gnumeric.h + +-stamp_Gnumeric_idl : $(srcdir)/GNOME_Gnumeric.idl ++# A hint is needed to build the header first: ++BUILT_SOURCES = GNOME_Gnumeric.h ++ ++stamp_Gnumeric_idl: $(srcdir)/GNOME_Gnumeric.idl + $(ORBIT_IDL) -I$(srcdir) $< && touch $@ + +-$(GNUMERIC_GENERATED): stamp_Gnumeric_idl ++$(nodist_corba_la_SOURCES): stamp_Gnumeric_idl + + idldir = $(gnumeric_datadir)/idl + idl_DATA = GNOME_Gnumeric.idl +@@ -33,11 +36,5 @@ + + @INTLTOOL_XML_RULE@ + +-# Do not use built sources BUILT_SOURCES +-# it attempts to build the source even if it is not used. +-DISTCLEANFILES = $(GNUMERIC_GENERATED) stamp_Gnumeric_idl $(xml_DATA) ++CLEANFILES = $(nodist_corba_la_SOURCES) stamp_Gnumeric_idl $(xml_DATA) + EXTRA_DIST = $(idl_DATA) $(xml_in_files) +- +-dist-hook : +- cd $(distdir) && rm -f $(DISTCLEANFILES) +- diff --git a/app-office/gnumeric/gnumeric-1.2.13.ebuild b/app-office/gnumeric/gnumeric-1.2.13.ebuild deleted file mode 100644 index e185f547ae5b..000000000000 --- a/app-office/gnumeric/gnumeric-1.2.13.ebuild +++ /dev/null @@ -1,81 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/gnumeric/gnumeric-1.2.13.ebuild,v 1.7 2005/01/01 15:33:56 eradicator Exp $ - -#provide Xmake and Xemake -inherit virtualx libtool gnome2 eutils flag-o-matic - -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" - -# evolution, perl, guile and gb support disabled currently (or to be removed) - -# FIXME : should rethink gda/gnomedb USE stuff - -#IUSE="libgda gnomedb python bonobo" -IUSE="libgda python bonobo" - -RDEPEND=">=x11-libs/gtk+-2 - >=dev-libs/glib-2 - >=gnome-base/libgnome-2 - >=gnome-base/libgnomeui-2 - >=gnome-base/libgnomeprint-2.4.2 - >=gnome-base/libgnomeprintui-2.4.2 - >=gnome-base/libgnomecanvas-2 - >=gnome-base/libglade-2 - >=dev-libs/libxml2-2.4.12 - >=gnome-extra/libgsf-1.9 - >=media-libs/libart_lgpl-2.3.11 - python? ( >=dev-lang/python-2 - >=dev-python/pygtk-2 ) - libgda? ( >=gnome-extra/libgda-1.0.1 ) - bonobo? ( >=gnome-base/libbonobo-2.2 - >=gnome-base/libbonoboui-2.2 )" -# gnomedb? ( >=gnome-extra/libgnomedb-0.90.2 ) - -DEPEND="${RDEPEND} - >=dev-util/intltool-0.30 - dev-util/pkgconfig" - -pkg_setup() { - - 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 - -} - -src_unpack() { - - unpack ${A} - gnome2_omf_fix - -} - -src_compile() { - - # gcc bug (http://bugs.gnome.org/show_bug.cgi?id=128834) - filter-flags "-Os" - - econf \ - `use_with bonobo` \ - `use_with python` \ - `use_with libgda gda` \ - || die - # `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" diff --git a/app-office/gnumeric/gnumeric-1.4.2.ebuild b/app-office/gnumeric/gnumeric-1.4.2.ebuild index 05fc7e070714..377476812bde 100644 --- a/app-office/gnumeric/gnumeric-1.4.2.ebuild +++ b/app-office/gnumeric/gnumeric-1.4.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/gnumeric/gnumeric-1.4.2.ebuild,v 1.2 2005/03/06 19:07:44 lanius Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/gnumeric/gnumeric-1.4.2.ebuild,v 1.3 2005/04/17 16:17:30 foser Exp $ inherit virtualx gnome2 eutils flag-o-matic @@ -9,7 +9,7 @@ HOMEPAGE="http://www.gnome.org/projects/gnumeric/" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~x86 ~ppc ~sparc ~hppa amd64 ~alpha ~ia64" +KEYWORDS="x86 ~ppc ~sparc ~hppa amd64 ~alpha ~ia64" #IUSE="libgda gnomedb python bonobo" IUSE="libgda python gnome" diff --git a/app-office/gnumeric/gnumeric-1.4.3.ebuild b/app-office/gnumeric/gnumeric-1.4.3.ebuild new file mode 100644 index 000000000000..cb1952bcea3c --- /dev/null +++ b/app-office/gnumeric/gnumeric-1.4.3.ebuild @@ -0,0 +1,112 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-office/gnumeric/gnumeric-1.4.3.ebuild,v 1.1 2005/04/17 16:17:30 foser Exp $ + +inherit virtualx gnome2 eutils flag-o-matic + +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 ) + dev-util/pkgconfig" # see #67107 +# 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}/plugins/corba + # makejobs proposed patch (#78828) + epatch ${FILESDIR}/${PN}-1.4.3-makejobs.patch + + cd ${S} + automake || die + +} + +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 + +} + +src_install() { + + gnome2_src_install + + # make gnumeric find it's help + dosym \ + /usr/share/gnome/help/gnumeric \ + /usr/share/${PN}/${PV}/doc + +} + +DOCS="AUTHORS COPYING* ChangeLog HACKING NEWS README TODO" + +USE_DESTDIR="1" |