Version bump. Restrict gnumeric-1.8 to goffice:0.6 slot.
authorGilles Dartiguelongue <eva@gentoo.org>
Thu, 4 Mar 2010 22:57:05 +0000 (22:57 +0000)
committerGilles Dartiguelongue <eva@gentoo.org>
Thu, 4 Mar 2010 22:57:05 +0000 (22:57 +0000)
Package-Manager: portage-2.2_rc63/cvs/Linux x86_64

app-office/gnumeric/ChangeLog
app-office/gnumeric/Manifest
app-office/gnumeric/gnumeric-1.10.0.ebuild [moved from app-office/gnumeric/gnumeric-1.8.4-r1.ebuild with 52% similarity]
app-office/gnumeric/gnumeric-1.8.4-r2.ebuild

index 6250b53a7a21a7778e0c3705acf1c82ee87e9091..79da919f38828b438ebca5eadfea845cc799d8c5 100644 (file)
@@ -1,6 +1,13 @@
 # ChangeLog for app-office/gnumeric
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/gnumeric/ChangeLog,v 1.196 2010/01/17 23:29:10 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/gnumeric/ChangeLog,v 1.197 2010/03/04 22:57:05 eva Exp $
+
+*gnumeric-1.10.0 (04 Mar 2010)
+
+  04 Mar 2010; Gilles Dartiguelongue <eva@gentoo.org>
+  -gnumeric-1.8.4-r1.ebuild, gnumeric-1.8.4-r2.ebuild,
+  +gnumeric-1.10.0.ebuild:
+  Version bump. Restrict gnumeric-1.8 to goffice:0.6 slot.
 
   17 Jan 2010; Jeroen Roovers <jer@gentoo.org> gnumeric-1.8.4-r2.ebuild:
   Stable for HPPA (bug #281427).
index b6a50c188307721e40d645ba155d149b358f9d92..830ebf896b26d696b24ee5cc6528460c3aebc850 100644 (file)
@@ -1,8 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX gnumeric-1.8.4-CVE-2009-0318.patch 626 RMD160 ec133b7ec03d9ea2b14a9d2bcb2798f624173744 SHA1 8a4237843309e1bf5b47dd1fbb3e69ecaccd4aa8 SHA256 fab335e4db5f17f74b110d473ad50b14510d56d43168fc3b84f115d907bba964
 AUX gnumeric-1.8.4-gtk216-abi-spinbuttons.patch 14242 RMD160 5fb5cff75cbaba6b6f8e3dd0ceb48454c16eea38 SHA1 d69b15735fc870d9dc8e246f4c0cb7ff7a89b799 SHA256 e29eadcb5e92c904001fd4af7d23916208e6563ed49da0028c4cf113fc0a9de5
 AUX gnumeric-1.8.4-gtk216-im-block.patch 8431 RMD160 d7d0ecf0104f7670bc8d9a7bcf36913150ed653a SHA1 ac6f2dc7d0a480dd6197597d1e16197635e081a5 SHA256 2029b766687c3d59ef5c9e6e8c8606451e15f1962a7257af30fd29bb27e4e59a
+DIST gnumeric-1.10.0.tar.bz2 17350730 RMD160 19d1c98c8d09e47e5ea241e828d441915040e702 SHA1 3645087e4dde66f7b124a323d72487d943383aac SHA256 c351440573e20e4e9de3c7534ab5226510efb9fb984936ed31a6960b1bb72515
 DIST gnumeric-1.8.4.tar.bz2 14087780 RMD160 461ea59b2ce30d2ce7dd5bca2cea2c50b955dc57 SHA1 2d765b0d06509e0695c4d3ec96b94f8acba88735 SHA256 a3c7fdbbafa6c9cfee7f16c067b043c3041cd0240292aa92b653a2221ae04503
-EBUILD gnumeric-1.8.4-r1.ebuild 2102 RMD160 13a599d55f7cc23620209eed2bac56b81fc805c8 SHA1 b932ec7cd86ed2f76e4383e84457cd69b6ad8ce7 SHA256 72e7c08a2f705d909b2d89c22bf7bd5267afbd51a94ee2b6b2a8ff4ac1db15b0
-EBUILD gnumeric-1.8.4-r2.ebuild 2350 RMD160 bfe2175ace25380e07f6a4767b1c629be015efce SHA1 4297ff2486b08410bd5a662f13cdac22916a009f SHA256 11790dd55099c87d429da7547e497095bbbd8e42a16ea646bee601c0f7428fc3
-MISC ChangeLog 26457 RMD160 68c5c6435c9e94d847307641c482f80079da86fd SHA1 ad7807ced30087ec10472191ee590c1409692000 SHA256 3458344a107509f9188061cdefb1a905a4bb08746eb7ae413a1958966a23d4c1
+EBUILD gnumeric-1.10.0.ebuild 1686 RMD160 e735003ff85539ec9fe4dbebe94fbbb30120ae2c SHA1 0943c3f05116cd09542b3a6ecc6c1149f10c864e SHA256 b3909d134d6cb8057b2f65ae9a094213a5e831026e384d8c174c8f6640953f30
+EBUILD gnumeric-1.8.4-r2.ebuild 2354 RMD160 b03d15dc5eca62b292142b7483a7e8affe920c95 SHA1 ca80a8001702fe1a57624f015a7a890c5f673402 SHA256 ab0a1cefec2e37491c6890ea9df7edc6ca5e5b2865a31234d93ede7ceede4705
+MISC ChangeLog 26685 RMD160 46c5e9810c440bd0258d5f2d112579f972bb067c SHA1 2aaff77f9333636b7a4da4dcf38d85a6b23beefa SHA256 d094cc3789a886de19967c7b66178015b87a8a2b2038980b0dcb2814688eafba
 MISC metadata.xml 364 RMD160 864c3698f6ae825aa9badd409f07ff4499cbf0f1 SHA1 39dbd02b506842082781dd6d08dceb3abaf20046 SHA256 d230daad082bc155b5f1dd6cfdfd4e1aa2584227b385e9c57a17db57e9bc940f
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iEYEARECAAYFAkuQOscACgkQ1fmVwcYIWAaFxQCgpW2oF2tdrWpti+lvnrrOZcNi
+6h8AnRJCnIWzp3Zvjd6/qSTzaTu3MqXt
+=SvjH
+-----END PGP SIGNATURE-----
similarity index 52%
rename from app-office/gnumeric/gnumeric-1.8.4-r1.ebuild
rename to app-office/gnumeric/gnumeric-1.10.0.ebuild
index d12dc48b1c86fa3b0b2b85b6e16dbafe661e3cf8..9e6f7bded4313791b4aca8534f77720d4ea7a7bc 100644 (file)
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/gnumeric/gnumeric-1.8.4-r1.ebuild,v 1.12 2009/06/28 19:09:20 mrpouet Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/gnumeric/gnumeric-1.10.0.ebuild,v 1.1 2010/03/04 22:57:05 eva Exp $
 
 EAPI="2"
 
@@ -11,26 +11,26 @@ HOMEPAGE="http://www.gnome.org/projects/gnumeric/"
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 
 IUSE="gnome perl python"
-# bonobo guile libgda mono (experimental)
+# libgda
 
 # lots of missing files, wait for next release
+# also fails tests due to 80-bit long story
 RESTRICT="test"
 
 RDEPEND="sys-libs/zlib
        app-arch/bzip2
-       >=dev-libs/glib-2.6
-       >=gnome-extra/libgsf-1.14.6[gnome?]
-       >=x11-libs/goffice-0.6.3
+       >=dev-libs/glib-2.12
+       >=gnome-extra/libgsf-1.14.15[gnome?]
+       >=x11-libs/goffice-0.8:0.8
        >=dev-libs/libxml2-2.4.12
-       >=x11-libs/pango-1.8.1
+       >=x11-libs/pango-1.12
 
-       >=x11-libs/gtk+-2.10
+       >=x11-libs/gtk+-2.16
        x11-libs/cairo[svg]
        >=gnome-base/libglade-2.3.6
-       >=media-libs/libart_lgpl-2.3.11
 
        gnome? (
                >=gnome-base/gconf-2
@@ -41,51 +41,34 @@ RDEPEND="sys-libs/zlib
        perl? ( dev-lang/perl )
        python? (
                >=dev-lang/python-2
-               >=dev-python/pygtk-2 )"
-       # libgda? (
-       #       >=gnome-extra/libgda-3.1.1
-       #       >=gnome-extra/libgnomedb-3.0.1 )
-
+               >=dev-python/pygtk-2 )
+"
+#      libgda? (
+#              >=gnome-extra/libgda-4.1.1:4.0
+#              >=gnome-extra/libgnomedb-3.99.6:4.0 )
 DEPEND="${RDEPEND}
-       >=dev-util/intltool-0.29
+       >=dev-util/intltool-0.25
        >=dev-util/pkgconfig-0.18
        app-text/scrollkeeper"
 
 DOCS="AUTHORS BEVERAGES BUGS ChangeLog HACKING MAINTAINERS NEWS README"
 
 pkg_setup() {
-       local will_die=false
-
        G2CONF="${G2CONF}
                --enable-ssindex
-               --enable-static
+               --disable-static
                --without-gda
-               --without-guile
-               --without-mono
+               --with-zlib
                $(use_with perl)
                $(use_with python)
                $(use_with gnome)"
-
-       # gcc bug (http://bugs.gnome.org/show_bug.cgi?id=128834)
-       replace-flags "-Os" "-O2"
-}
-
-src_prepare() {
-       # Fix for CVE-2009-0318, bug #257012
-       epatch "${FILESDIR}/${P}-CVE-2009-0318.patch"
-
-       # Fix #275352 (the sed expression didn't work !)
-       intltoolize --automake --copy --force || die "intltoolize failed"
-       eautoreconf
 }
 
 src_install() {
        gnome2_src_install
 
-       # make gnumeric find its help
-       dosym \
-               /usr/share/gnome/help/gnumeric \
-               /usr/share/${PN}/${PV}/doc
+       # Remove useless .la files
+       find "${D}" -name "*.la" -delete
 }
 
 pkg_postinst() {
index 473a12ff6399f744d431a40e412a1b8de6e86f76..00b1131f2a951f0d519c8922032981e8f0e49c6a 100644 (file)
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/gnumeric/gnumeric-1.8.4-r2.ebuild,v 1.7 2010/01/17 23:29:10 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/gnumeric/gnumeric-1.8.4-r2.ebuild,v 1.8 2010/03/04 22:57:05 eva Exp $
 
 EAPI="2"
 
@@ -23,7 +23,7 @@ RDEPEND="sys-libs/zlib
        app-arch/bzip2
        >=dev-libs/glib-2.6
        >=gnome-extra/libgsf-1.14.6[gnome?]
-       >=x11-libs/goffice-0.6.3
+       >=x11-libs/goffice-0.6.3:0.6
        >=dev-libs/libxml2-2.4.12
        >=x11-libs/pango-1.8.1