diff options
-rw-r--r-- | app-office/gnumeric/ChangeLog | 8 | ||||
-rw-r--r-- | app-office/gnumeric/Manifest | 2 | ||||
-rw-r--r-- | app-office/gnumeric/files/digest-gnumeric-1.2.13 | 1 | ||||
-rw-r--r-- | app-office/gnumeric/files/digest-gnumeric-1.2.4 | 1 | ||||
-rw-r--r-- | app-office/gnumeric/gnumeric-1.2.12.ebuild | 17 | ||||
-rw-r--r-- | app-office/gnumeric/gnumeric-1.2.13.ebuild (renamed from app-office/gnumeric/gnumeric-1.2.4.ebuild) | 50 |
6 files changed, 49 insertions, 30 deletions
diff --git a/app-office/gnumeric/ChangeLog b/app-office/gnumeric/ChangeLog index 0c1a7289a5a3..524c435ec806 100644 --- a/app-office/gnumeric/ChangeLog +++ b/app-office/gnumeric/ChangeLog @@ -1,6 +1,12 @@ # 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.64 2004/06/24 22:40:22 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/gnumeric/ChangeLog,v 1.65 2004/08/09 17:51:09 foser Exp $ + +*gnumeric-1.2.13 (09 Aug 2004) + + 09 Aug 2004; foser <foser@gentoo.org> gnumeric-1.2.1{2,3}.ebuild : + New release (#57464) + Add ugly, ugly bad hack to check for libgsf-gnome (#53467), i'm a sinner 02 Jun 2004; Aron Griffis <agriffis@gentoo.org> gnumeric-1.0.13-r1.ebuild, gnumeric-1.2.12.ebuild, gnumeric-1.2.2.ebuild, gnumeric-1.2.4.ebuild, diff --git a/app-office/gnumeric/Manifest b/app-office/gnumeric/Manifest index e7149dab2811..275273690a77 100644 --- a/app-office/gnumeric/Manifest +++ b/app-office/gnumeric/Manifest @@ -1,12 +1,14 @@ MD5 6261eae56ba2691145466d3e73528124 gnumeric-1.2.12.ebuild 1669 MD5 b30fef80034a4bc060833fa0f5d0814c gnumeric-1.2.4.ebuild 1910 MD5 5648db04c662adde20c6ced552c24478 gnumeric-1.2.6.ebuild 2005 +MD5 6261eae56ba2691145466d3e73528124 gnumeric-1.2.13.ebuild 1669 MD5 f29b1fa81a5cb1c04cbf02e484569bd6 gnumeric-1.2.2.ebuild 1676 MD5 557a5d9922820688642c348a390ddfb6 ChangeLog 9142 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158 MD5 a7534e2d133adce0859c4174d8965532 gnumeric-1.0.13-r1.ebuild 2879 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 e3240d8a40c24a464b95631ef8c41727 files/gnumeric-1.2.0-fix_doc_destdir_install.patch 563 MD5 e6e85c25e0f6c2ba3b3c5af4597f706e files/digest-gnumeric-1.2.2 69 MD5 8ceb515f3d94d8a405ea2d48e87aeabf files/digest-gnumeric-1.2.4 69 diff --git a/app-office/gnumeric/files/digest-gnumeric-1.2.13 b/app-office/gnumeric/files/digest-gnumeric-1.2.13 new file mode 100644 index 000000000000..45c956e70327 --- /dev/null +++ b/app-office/gnumeric/files/digest-gnumeric-1.2.13 @@ -0,0 +1 @@ +MD5 367ec0d4a1a0b8898a03a70a05052698 gnumeric-1.2.13.tar.bz2 14319675 diff --git a/app-office/gnumeric/files/digest-gnumeric-1.2.4 b/app-office/gnumeric/files/digest-gnumeric-1.2.4 deleted file mode 100644 index d155bb9745c2..000000000000 --- a/app-office/gnumeric/files/digest-gnumeric-1.2.4 +++ /dev/null @@ -1 +0,0 @@ -MD5 9d6ca44d8f762b5e0d52437716a43816 gnumeric-1.2.4.tar.bz2 11062479 diff --git a/app-office/gnumeric/gnumeric-1.2.12.ebuild b/app-office/gnumeric/gnumeric-1.2.12.ebuild index b599e851fc1f..243bd4aa9b74 100644 --- a/app-office/gnumeric/gnumeric-1.2.12.ebuild +++ b/app-office/gnumeric/gnumeric-1.2.12.ebuild @@ -1,6 +1,6 @@ # 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.2.12.ebuild,v 1.3 2004/06/24 22:40:22 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/gnumeric/gnumeric-1.2.12.ebuild,v 1.4 2004/08/09 17:51:09 foser Exp $ #provide Xmake and Xemake inherit virtualx libtool gnome2 eutils flag-o-matic @@ -10,7 +10,7 @@ HOMEPAGE="http://www.gnome.org/gnome-office/gnumeric.shtml" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~x86 ~ppc ~sparc ~hppa ~amd64 ~alpha ~ia64" +KEYWORDS="x86 ~ppc ~sparc ~hppa ~amd64 ~alpha ~ia64" # evolution, perl, guile and gb support disabled currently (or to be removed) @@ -41,6 +41,19 @@ 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} diff --git a/app-office/gnumeric/gnumeric-1.2.4.ebuild b/app-office/gnumeric/gnumeric-1.2.13.ebuild index c9da78718148..5465580272bb 100644 --- a/app-office/gnumeric/gnumeric-1.2.4.ebuild +++ b/app-office/gnumeric/gnumeric-1.2.13.ebuild @@ -1,15 +1,16 @@ # 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.2.4.ebuild,v 1.6 2004/06/24 22:40:22 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/gnumeric/gnumeric-1.2.13.ebuild,v 1.1 2004/08/09 17:51:09 foser Exp $ #provide Xmake and Xemake -inherit virtualx libtool gnome2 eutils +inherit virtualx libtool gnome2 eutils flag-o-matic DESCRIPTION="Gnumeric, the GNOME Spreadsheet" HOMEPAGE="http://www.gnome.org/gnome-office/gnumeric.shtml" -SLOT="0" LICENSE="GPL-2" -KEYWORDS="~x86 ~ppc ~sparc ~hppa ~amd64" + +SLOT="0" +KEYWORDS="~x86 ~ppc ~sparc ~hppa ~amd64 ~alpha ~ia64" # evolution, perl, guile and gb support disabled currently (or to be removed) @@ -27,7 +28,7 @@ RDEPEND=">=x11-libs/gtk+-2 >=gnome-base/libgnomecanvas-2 >=gnome-base/libglade-2 >=dev-libs/libxml2-2.4.12 - >=gnome-extra/libgsf-1.8.2 + >=gnome-extra/libgsf-1.9 >=media-libs/libart_lgpl-2.3.11 python? ( >=dev-lang/python-2 >=dev-python/pygtk-2 ) @@ -37,29 +38,34 @@ RDEPEND=">=x11-libs/gtk+-2 # gnomedb? ( >=gnome-extra/libgnomedb-0.90.2 ) DEPEND="${RDEPEND} - >=dev-util/intltool-0.27.2 - dev-util/pkgconfig - >=sys-devel/autoconf-2.58" + >=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 - cd ${S} - # fix problems with libtool-0.28 generated stuff - intltoolize --force - - export WANT_AUTOMAKE=1.7 - export WANT_AUTOCONF=2.5 - aclocal || die - autoconf || die - automake -a || die - } src_compile() { + # gcc bug (http://bugs.gnome.org/show_bug.cgi?id=128834) + filter-flags "-Os" + econf \ `use_with bonobo` \ `use_with python` \ @@ -72,12 +78,4 @@ src_compile() { } -src_install() { - - gnome2_src_install - - dosym /usr/share/${PN}/${PV}/share/gnome/help/gnumeric /usr/share/gnome/help/gnumeric/ - -} - DOCS="AUTHORS COPYING* ChangeLog HACKING NEWS README TODO" |