From b3a891bc57ef5f60223fe0579dc9230d1933f350 Mon Sep 17 00:00:00 2001 From: Gilles Dartiguelongue Date: Sun, 9 Mar 2008 20:00:44 +0000 Subject: [PATCH] bump to 1.8.2 (bug fix release) and remove old revisions Package-Manager: portage-2.1.4.4 --- app-office/gnumeric/ChangeLog | 9 +- app-office/gnumeric/Manifest | 17 ++-- .../gnumeric/files/gnumeric-1.8.0-omf.patch | 76 ----------------- app-office/gnumeric/gnumeric-1.6.3.ebuild | 84 ------------------- ...ric-1.8.0.ebuild => gnumeric-1.8.2.ebuild} | 16 ++-- 5 files changed, 21 insertions(+), 181 deletions(-) delete mode 100644 app-office/gnumeric/files/gnumeric-1.8.0-omf.patch delete mode 100644 app-office/gnumeric/gnumeric-1.6.3.ebuild rename app-office/gnumeric/{gnumeric-1.8.0.ebuild => gnumeric-1.8.2.ebuild} (89%) diff --git a/app-office/gnumeric/ChangeLog b/app-office/gnumeric/ChangeLog index daf64f792545..c14f40b2a86f 100644 --- a/app-office/gnumeric/ChangeLog +++ b/app-office/gnumeric/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for app-office/gnumeric # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/gnumeric/ChangeLog,v 1.160 2008/02/10 21:44:52 tester Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/gnumeric/ChangeLog,v 1.161 2008/03/09 20:00:43 eva Exp $ + +*gnumeric-1.8.2 (09 Mar 2008) + + 09 Mar 2008; Gilles Dartiguelongue + -files/gnumeric-1.8.0-omf.patch, -gnumeric-1.6.3.ebuild, + -gnumeric-1.8.0.ebuild, +gnumeric-1.8.2.ebuild: + bump to 1.8.2, bug fix release only, remove old revisions 10 Feb 2008; Olivier Crête gnumeric-1.8.1.ebuild: Stable for amd64, bug #208356 diff --git a/app-office/gnumeric/Manifest b/app-office/gnumeric/Manifest index 1145533bcabc..96cfb29f0490 100644 --- a/app-office/gnumeric/Manifest +++ b/app-office/gnumeric/Manifest @@ -1,19 +1,16 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -AUX gnumeric-1.8.0-omf.patch 2358 RMD160 9837f74140a4ab0c4a401d7e61de9835cf8021ac SHA1 dd2856bd92d9d9fe2387fdb738fd376c4bfe5fad SHA256 d27c59d381c12e2bc66763e3a2a659e2226a216de7ea226406693ba850f45a6c -DIST gnumeric-1.6.3.tar.bz2 12540950 RMD160 49be3b72070555ab6b58f1c59a0c22819b9b9096 SHA1 2261b3276ed5ead65047208a6ddb7f3436b7e544 SHA256 badaa6899f71ef112515ce81aee02e559e18b5fa87c7f2262390764aaf9b1dc0 -DIST gnumeric-1.8.0.tar.bz2 14080868 RMD160 bcf01028ffe5d9c003e00b9a2da1abfdf2b525f4 SHA1 de320d7593089ac2c291ce975963a1b6ae1b59a6 SHA256 356dc3207991fad7a6f36c4ca5b4fffc0c05e76f129d773489a470c18d3db4cf DIST gnumeric-1.8.1.tar.bz2 14061489 RMD160 dca5b88bb135ec37c8a06d48fbebe7fb6bf7deaf SHA1 58a5be559887fb00cd1641fa94879519dc4322e7 SHA256 966acc8b4b175abce4d0c3144daceb11f2f94371755a83db1e2cf4a4405c3486 -EBUILD gnumeric-1.6.3.ebuild 2000 RMD160 13d2f2cc25effea4e800658a23324b876399c6ec SHA1 3d730fa2ec15f1a37e9e54f6eaf7db498c07cf04 SHA256 06be361e240eec5734a316c386a63ac773716347fe8c0f942a4ccdda94b68db1 -EBUILD gnumeric-1.8.0.ebuild 2041 RMD160 e04a63aab36930d4d0e357c6f7101bb985ade4de SHA1 92367962f106beadf1531bce9105f38345639d4f SHA256 db535f94204e24c845b5878fe425dbb41c951bc2fb353676d383813dcc9e3e0b +DIST gnumeric-1.8.2.tar.bz2 14075967 RMD160 fae0899a2369c4c1565a51d30ae2ad32df1ed3fb SHA1 1708da12f206fea1dda5c5341dfdd3eb2d1913dd SHA256 8418ed3a2e8dad923a6626d22eaffe796aab9cbcf827a17ab95bf99956e22a6d EBUILD gnumeric-1.8.1.ebuild 1985 RMD160 59ae429f7bf2903f1c65b876fbbd086cc2c8422b SHA1 38a8b2bb6849374dd80db3db2fea1d4571e24879 SHA256 c0b27cb5c7fa584a97a9f62ac298a2239d486e0578529caecc06d2e715f8985f -MISC ChangeLog 21713 RMD160 97e820bd9116ba26879de967719b8780360bd9a2 SHA1 53ee80a568fef438eee64d4db7189e67f4b9e19d SHA256 fda4f2f82b05de5efe2673f492e7cf6684e8fa1e21aab5ce02b34f9a47ad0f7e +EBUILD gnumeric-1.8.2.ebuild 2030 RMD160 5d3cf47edf12b6484d4abf10dc58170b32fc90a3 SHA1 e66bd02ef32bff63162eda8f9c080a0b85a19bbe SHA256 50e439d2fa2f52034cd3e1e1cd0526e587245c6c40b694feeea754879d05e174 +MISC ChangeLog 21965 RMD160 0d486013d258c305596cb0531bb29a76f34eed81 SHA1 a66e7686e3f8c14f2b6040befc930b28af9b1127 SHA256 221ab159a884e3cc50cba84a7fd9989c77f5d94bbef200e09e073e49b0d1ae81 MISC metadata.xml 364 RMD160 864c3698f6ae825aa9badd409f07ff4499cbf0f1 SHA1 39dbd02b506842082781dd6d08dceb3abaf20046 SHA256 d230daad082bc155b5f1dd6cfdfd4e1aa2584227b385e9c57a17db57e9bc940f -----BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.7 (GNU/Linux) +Version: GnuPG v2.0.7 (GNU/Linux) -iD8DBQFHr3BamOfEJZHYOKcRAj/oAJ9rSPPrjEXTNnWo3x8eOQXNJC30OgCggOZZ -wxz+Gz6Pd29iHjE0c49Ijc0= -=f2qC +iD8DBQFH1EH01fmVwcYIWAYRAqRwAKC8oXTAGd6tSfuVwCkKjeKKYDEd+ACePtNs +1k1g9RpPKCFGSFRpiMxc1BQ= +=m7DO -----END PGP SIGNATURE----- diff --git a/app-office/gnumeric/files/gnumeric-1.8.0-omf.patch b/app-office/gnumeric/files/gnumeric-1.8.0-omf.patch deleted file mode 100644 index e47b55e09ced..000000000000 --- a/app-office/gnumeric/files/gnumeric-1.8.0-omf.patch +++ /dev/null @@ -1,76 +0,0 @@ -diff -Nua doc/C/gnumeric-C.omf doc/C/gnumeric-C.omf ---- doc/C/gnumeric-C.omf 1970-01-01 01:00:00.000000000 +0100 -+++ doc/C/gnumeric-C.omf 2007-12-30 23:05:42.000000000 +0100 -@@ -0,0 +1,72 @@ -+ -+ -+ -+ -+ -+ miguel@gnome.org (Miguel de Icaza) -+ -+ -+ jody@gnome.org (Jody Goldberg) -+ -+ -+ acuster@gmail.com (Adrian Custer) -+ -+ -+ mrproper@ximian.com (Kevin Breit) -+ -+ -+ aguelzow@taliesin.ca (Andreas Guelzow) -+ -+ -+ aaron@ximian.com (Aaron Weber) -+ -+ -+ tommydal@ihug.com.au (Thomas Canty) -+ -+ -+ kirillov@math.sunysb.edu (Alexander Kirillov) -+ -+ -+ k_wayne@linuxpower.org (Wayne Schuller) -+ -+ -+ jiivonen@hutcs.cs.hut.fi (Jukka-Pekka Iivonen) -+ -+ -+ adrian@gimp.or (Adrian Likins) -+ -+ -+ -+ The Gnumeric Manual, version 1.8. -+ -+ -+ -+ 2007-12-20 -+ -+ -+ -+ -+ -+ -+ -+ -+ This is the user's manual for Gnumeric, a GNOME spreadsheet. -+ -+ -+ -+ User's Guide -+ -+ -+ -+ -+ -+ -+ -+ -+ diff --git a/app-office/gnumeric/gnumeric-1.6.3.ebuild b/app-office/gnumeric/gnumeric-1.6.3.ebuild deleted file mode 100644 index d879a26096af..000000000000 --- a/app-office/gnumeric/gnumeric-1.6.3.ebuild +++ /dev/null @@ -1,84 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/gnumeric/gnumeric-1.6.3.ebuild,v 1.12 2007/12/31 01:15:19 eva Exp $ - -inherit eutils flag-o-matic gnome2 - -DESCRIPTION="Gnumeric, the GNOME Spreadsheet" -HOMEPAGE="http://www.gnome.org/projects/gnumeric/" -LICENSE="GPL-2" - -SLOT="0" -KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86" - -IUSE="gnome python static" -# bonobo libgda - -RDEPEND="sys-libs/zlib - app-arch/bzip2 - >=dev-libs/glib-2.6 - >=gnome-extra/libgsf-1.13.2 - =x11-libs/goffice-0.2* - >=dev-libs/libxml2-2.4.12 - >=x11-libs/pango-1.8.1 - - >=x11-libs/gtk+-2.6 - >=gnome-base/libglade-2.3.6 - >=gnome-base/libgnomeprint-2.8.2 - >=gnome-base/libgnomeprintui-2.8.2 - >=media-libs/libart_lgpl-2.3.11 - - gnome? ( - >=gnome-base/gconf-2 - >=gnome-base/libgnome-2 - >=gnome-base/libgnomeui-2 - >=gnome-base/libbonobo-2.2 - >=gnome-base/libbonoboui-2.2 ) - python? ( - >=dev-lang/python-2 - >=dev-python/pygtk-2 )" - # libgda? ( - # >=gnome-extra/libgda-1.3 - # >=gnome-extra/libgnomedb-1.3 ) - -DEPEND="${RDEPEND} - >=dev-util/intltool-0.29 - >=dev-util/pkgconfig-0.9 - app-text/scrollkeeper" - -DOCS="AUTHORS BEVERAGES BUGS ChangeLog HACKING MAINTAINERS NEWS README TODO" -USE_DESTDIR="1" - -pkg_setup() { - G2CONF="--enable-ssindex \ - $(use_with python) \ - $(use_with gnome) \ - $(use_enable static)" - - if use gnome && ! built_with_use gnome-extra/libgsf gnome; then - eerror "libgsf needs to be compiled with gnome in USE" - eerror "for this version of gnumeric to work. Rebuild" - eerror "libgsf first like this :" - eerror "USE=gnome emerge libgsf -vp" - die "libgsf was built without gnome support..." - fi - - #gcc bug (http://bugs.gnome.org/show_bug.cgi?id=128834) - replace-flags "-Os" "-O2" -} - -src_unpack() { - unpack "${A}" - gnome2_omf_fix "${S}/doc/C/Makefile.in" -} - -src_install() { - - gnome2_src_install - - # make gnumeric find its help - dosym \ - /usr/share/gnome/help/gnumeric \ - /usr/share/${PN}/${PV}/doc - -} diff --git a/app-office/gnumeric/gnumeric-1.8.0.ebuild b/app-office/gnumeric/gnumeric-1.8.2.ebuild similarity index 89% rename from app-office/gnumeric/gnumeric-1.8.0.ebuild rename to app-office/gnumeric/gnumeric-1.8.2.ebuild index 2309a50f9ca5..7326f7351809 100644 --- a/app-office/gnumeric/gnumeric-1.8.0.ebuild +++ b/app-office/gnumeric/gnumeric-1.8.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/gnumeric/gnumeric-1.8.0.ebuild,v 1.9 2008/01/16 22:48:19 eva Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/gnumeric/gnumeric-1.8.2.ebuild,v 1.1 2008/03/09 20:00:43 eva Exp $ inherit gnome2 flag-o-matic @@ -9,10 +9,10 @@ HOMEPAGE="http://www.gnome.org/projects/gnumeric/" LICENSE="GPL-2" SLOT="0" -KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86" +KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" IUSE="gnome perl python" -# bonobo libgda +# bonobo guile libgda mono (experimental) # lots of missing files, wait for next release RESTRICT="test" @@ -54,6 +54,9 @@ pkg_setup() { G2CONF="${G2CONF} --enable-ssindex --enable-static + --without-gda + --without-guile + --without-mono $(use_with perl) $(use_with python) $(use_with gnome)" @@ -70,13 +73,6 @@ pkg_setup() { replace-flags "-Os" "-O2" } -src_unpack() { - gnome2_src_unpack - - # Fix documentation - epatch "${FILESDIR}/${P}-omf.patch" -} - src_install() { gnome2_src_install -- 2.26.2