Clean-ups in gnumeric-1.6.0.ebuild

Package-Manager: portage-2.0.53_rc7

diff --git a/app-office/gnumeric/ChangeLog b/app-office/gnumeric/ChangeLog
index 8bffbeb2f9f5027a3ad8f3ceb27825865b7fbe3f..53ccd1b7fdd0181ceee06f65f2056c075d34335d 100644 (file)
--- a/app-office/gnumeric/ChangeLog
+++ b/app-office/gnumeric/ChangeLog
@@ -1,6 +1,11 @@
 # 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.119 2005/11/01 13:37:39 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/gnumeric/ChangeLog,v 1.120 2005/11/01 14:35:09 leonardop Exp $
+
+  01 Nov 2005; Leonardo Boshell <leonardop@gentoo.org>
+  gnumeric-1.6.0.ebuild:
+  Moved G2CONF declaration to pkg_setup(). Added zlib dependency. Misc.
+  clean-ups.
 
   01 Nov 2005; Martin Schlemmer <azarah@gentoo.org> gnumeric-1.6.0.ebuild:
   Add ~amd64 keyword.

diff --git a/app-office/gnumeric/Manifest b/app-office/gnumeric/Manifest
index 702a7bad25c4505f3c3f78e97fd679c9c5bd6ade..522da904d20314a140080768c9030159159b7957 100644 (file)
--- a/app-office/gnumeric/Manifest
+++ b/app-office/gnumeric/Manifest
@@ -1,7 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 ae2837ea636de81e8a977815085745ff ChangeLog 15867
+MD5 8c09cda2146c3fdb03173f8cceaad49d ChangeLog 16036
 MD5 2bff8e6c3d41ceae3d04783899915363 files/digest-gnumeric-1.4.3-r2 69
 MD5 2bff8e6c3d41ceae3d04783899915363 files/digest-gnumeric-1.4.3-r3 69
 MD5 b76afee2920aebc8fd632925765c3c70 files/digest-gnumeric-1.6.0 69
@@ -10,12 +7,5 @@ MD5 3fab812a68d5849434ba8d7ee3ef2887 files/gnumeric-1.4.3-new_gsf_api.patch 3308
 MD5 00512bbcd353d056c02b62335dfd87d1 files/gnumeric-1.4.3-pcre_int_overflow.patch 3916
 MD5 05cab453a958d1d24692202747791548 gnumeric-1.4.3-r2.ebuild 2572
 MD5 2644f43aa2b70a69568b5fe657d03f03 gnumeric-1.4.3-r3.ebuild 2597
-MD5 1ef386538f3e4b15798173dd233bfcf0 gnumeric-1.6.0.ebuild 1976
+MD5 c39c5aab8d95c15faaabe44d51c1e0f6 gnumeric-1.6.0.ebuild 1976
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDZ3B41ZcsMnZjRyIRAktFAKCCH7kUY9A+rCt5GwtNxY6o7msJsACeOPrh
-f2DWqgyhDtMFiE30JYv4W/Y=
-=gL4S
------END PGP SIGNATURE-----

diff --git a/app-office/gnumeric/gnumeric-1.6.0.ebuild b/app-office/gnumeric/gnumeric-1.6.0.ebuild
index 413d560b324f02e78316b85ff6aa4cf4e3b1d2df..9ed8a7f458172b42b85c9d618f6926bf1f6c5a93 100644 (file)
--- a/app-office/gnumeric/gnumeric-1.6.0.ebuild
+++ b/app-office/gnumeric/gnumeric-1.6.0.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.6.0.ebuild,v 1.5 2005/11/01 13:37:39 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/gnumeric/gnumeric-1.6.0.ebuild,v 1.6 2005/11/01 14:35:09 leonardop Exp $
 
 inherit eutils flag-o-matic gnome2
 
@@ -12,9 +12,10 @@ SLOT="0"
 KEYWORDS="~ppc ~ppc64 ~sparc ~x86 ~amd64"
 
 IUSE="gnome python static"
-# bonobo gnomedb libgda
+# bonobo libgda
 
-RDEPEND=">=dev-libs/glib-2.6
+RDEPEND="sys-libs/zlib
+       >=dev-libs/glib-2.6
        >=gnome-extra/libgsf-1.13.2
        >=x11-libs/goffice-0.1.0
        >=dev-libs/libxml2-2.4.12
@@ -35,19 +36,25 @@ RDEPEND=">=dev-libs/glib-2.6
        python? (
                >=dev-lang/python-2
                >=dev-python/pygtk-2 )"
-       #libgda? ( >=gnome-extra/libgda-1.0.1 )
-#      gnomedb? ( >=gnome-extra/libgnomedb-0.90.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 COPYING* ChangeLog HACKING NEWS README TODO"
+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
                einfo "libgsf needs to be compiled with gnome in USE"
                einfo "for this version of gnumeric to work. Rebuild"
@@ -55,24 +62,22 @@ pkg_setup() {
                einfo "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
-       cd ${S}/doc/C
-       gnome2_omf_fix Makefile.in
+       gnome2_omf_fix ${S}/doc/C/Makefile.in
 }
 
-G2CONF="${G2CONF} $(use_with python) $(use_with gnome) $(use_enable static) --enable-ssindex"
 
 src_install() {
 
        gnome2_src_install
 
-       # make gnumeric find it's help
+       # make gnumeric find its help
        dosym \
                /usr/share/gnome/help/gnumeric \
                /usr/share/${PN}/${PV}/doc