version bump

7 files changed, 42 insertions, 100 deletions

diff --git a/app-office/gnumeric/ChangeLog b/app-office/gnumeric/ChangeLog
index f361ffa8c5f3..9af01b02aa06 100644
--- a/app-office/gnumeric/ChangeLog
+++ b/app-office/gnumeric/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-office/gnumeric
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/gnumeric/ChangeLog,v 1.55 2004/01/25 21:25:16 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/gnumeric/ChangeLog,v 1.56 2004/02/14 14:50:58 liquidx Exp $
+
+*gnumeric-1.2.6 (14 Feb 2004)
+
+  14 Feb 2004; Alastair Tse <liquidx@gentoo.org> gnumeric-1.2.0.ebuild,
+  gnumeric-1.2.1.ebuild, gnumeric-1.2.6.ebuild:
+  version bump
 
   25 Jan 2004; <gustavoz@gentoo.org> gnumeric-1.2.2.ebuild:
   marked stable on sparc
diff --git a/app-office/gnumeric/Manifest b/app-office/gnumeric/Manifest
index c1cbc6b663ea..49bee8ff9bbe 100644
--- a/app-office/gnumeric/Manifest
+++ b/app-office/gnumeric/Manifest
@@ -1,16 +1,14 @@
-MD5 7627a70868aa8ada95f131fa4585296f gnumeric-1.2.4.ebuild 1919
-MD5 c285a524a908a29fa3e7c2cff726e7ca gnumeric-1.2.1.ebuild 1675
-MD5 c0e43fb90bbb9454cf01c1104a1993fa gnumeric-1.2.0.ebuild 1748
-MD5 d84f2af099a8ae425e99d176ecd6d704 gnumeric-1.2.2.ebuild 1683
 MD5 2bd8b368f5e34e5b5f32e35a1ddf552a ChangeLog 8156
-MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 MD5 485d0c516e6398aafc71bf68e9cd482f gnumeric-1.0.13-r1.ebuild 2956
-MD5 3b0b9ef38a3445a52df579b1aff3e7b1 files/gnumeric-1.2.1-fix_doc_destdir_install.patch 532
-MD5 e3240d8a40c24a464b95631ef8c41727 files/gnumeric-1.2.0-fix_doc_destdir_install.patch 563
-MD5 9e7ac50a8f6681cf92cdacfbbaa3a4ee files/digest-gnumeric-1.2.0 69
-MD5 f66fd82407a57e7a8a6b7f91ab22ead7 files/digest-gnumeric-1.2.1 69
+MD5 d84f2af099a8ae425e99d176ecd6d704 gnumeric-1.2.2.ebuild 1683
+MD5 7627a70868aa8ada95f131fa4585296f gnumeric-1.2.4.ebuild 1919
+MD5 cc12a9ccf0dcad960611eb92fbb887b6 gnumeric-1.2.6.ebuild 1916
+MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
+MD5 7843727e1fcde50a4a2283ba34da3c1d files/digest-gnumeric-1.0.13-r1 69
 MD5 e6e85c25e0f6c2ba3b3c5af4597f706e files/digest-gnumeric-1.2.2 69
 MD5 8ceb515f3d94d8a405ea2d48e87aeabf files/digest-gnumeric-1.2.4 69
-MD5 7843727e1fcde50a4a2283ba34da3c1d files/digest-gnumeric-1.0.13-r1 69
+MD5 2513c8977def1ef6ce7489be0d52afed files/digest-gnumeric-1.2.6 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
diff --git a/app-office/gnumeric/files/digest-gnumeric-1.2.0 b/app-office/gnumeric/files/digest-gnumeric-1.2.0
deleted file mode 100644
index 5eadfdd2643b..000000000000
--- a/app-office/gnumeric/files/digest-gnumeric-1.2.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 21f565b128b22246a7c2a51267e575df gnumeric-1.2.0.tar.bz2 10752770
diff --git a/app-office/gnumeric/files/digest-gnumeric-1.2.1 b/app-office/gnumeric/files/digest-gnumeric-1.2.1
deleted file mode 100644
index f42b8b2b9844..000000000000
--- a/app-office/gnumeric/files/digest-gnumeric-1.2.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 51f0bd5c69e6b6d321909e8bfe2e2c2b gnumeric-1.2.1.tar.bz2 10759107
diff --git a/app-office/gnumeric/files/digest-gnumeric-1.2.6 b/app-office/gnumeric/files/digest-gnumeric-1.2.6
new file mode 100644
index 000000000000..5964d3a70415
--- /dev/null
+++ b/app-office/gnumeric/files/digest-gnumeric-1.2.6
@@ -0,0 +1 @@
+MD5 5fd27da8feda72d78c7fac13458ec741 gnumeric-1.2.6.tar.bz2 11119538
diff --git a/app-office/gnumeric/gnumeric-1.2.0.ebuild b/app-office/gnumeric/gnumeric-1.2.0.ebuild
deleted file mode 100644
index e3ef9f5c40b5..000000000000
--- a/app-office/gnumeric/gnumeric-1.2.0.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/gnumeric/gnumeric-1.2.0.ebuild,v 1.6 2004/01/04 14:00:05 weeve Exp $
-
-#provide Xmake and Xemake
-inherit virtualx libtool gnome2 eutils debug
-
-DESCRIPTION="Gnumeric, the GNOME Spreadsheet"
-HOMEPAGE="http://www.gnome.org/gnome-office/gnumeric.shtml"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ~ppc sparc"
-
-# evolution, perl, guile and gb support disabled currently (or to be removed)
-
-# FIXME : should rethink gda/gnomedb USE stuff
-
-IUSE="libgda gnomedb python bonobo"
-
-RDEPEND=">=x11-libs/gtk+-2
-	>=dev-libs/glib-2
-	>=gnome-base/libgnome-2
-	>=gnome-base/libgnomeui-2
-	>=gnome-base/libgnomeprint-2.2
-	>=gnome-base/libgnomeprintui-2.2
-	>=gnome-base/libgnomecanvas-2
-	>=gnome-base/libglade-2
-	>=dev-libs/libxml2-2.4.12
-	>=gnome-extra/libgsf-1.8.2
-	>=media-libs/libart_lgpl-2.3.11
-	python? ( >=dev-lang/python-2
-		>=dev-python/pygtk-1.99.10 )
-	libgda? ( >=gnome-extra/libgda-0.90 )
-	bonobo? ( >=gnome-base/libbonobo-2.2
-		>=gnome-base/libbonoboui-2.2 )"
-#	gnomedb? ( >=gnome-extra/libgnomedb-0.90.2 )
-
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.27.2
-	dev-util/pkgconfig"
-
-src_unpack() {
-
-	unpack ${A}
-	gnome2_omf_fix
-
-	cd ${S}
-	# fixes a sandbox issue - foser <foser@gentoo.org>
-	epatch ${FILESDIR}/${P}-fix_doc_destdir_install.patch
-	# fixes gcc2 compile failure (#29181)
-	epatch ${FILESDIR}/${P}-gcc2_fix.patch
-
-}
-
-src_compile() {
-
-	econf \
-		`use_with bonobo` \
-		`use_with python` \
-		`use_with libgda gda` \
-		|| die
-	# `use_with gnomedb gda`
-
-	#the build process have to be able to connect to X
-	Xemake || die
-}
-
-DOCS="AUTHORS COPYING* ChangeLog HACKING NEWS README TODO"
-
-USE_DESTDIR="1"
-
diff --git a/app-office/gnumeric/gnumeric-1.2.1.ebuild b/app-office/gnumeric/gnumeric-1.2.6.ebuild
index 44e5fc7cd39d..4884a374c302 100644
--- a/app-office/gnumeric/gnumeric-1.2.1.ebuild
+++ b/app-office/gnumeric/gnumeric-1.2.6.ebuild
@@ -1,43 +1,45 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/gnumeric/gnumeric-1.2.1.ebuild,v 1.4 2004/01/04 14:00:05 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/gnumeric/gnumeric-1.2.6.ebuild,v 1.1 2004/02/14 14:50:59 liquidx Exp $
 
 #provide Xmake and Xemake
-inherit virtualx libtool gnome2 eutils debug
+inherit virtualx libtool gnome2 eutils
 
 DESCRIPTION="Gnumeric, the GNOME Spreadsheet"
 HOMEPAGE="http://www.gnome.org/gnome-office/gnumeric.shtml"
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 ~ppc sparc hppa"
+KEYWORDS="~x86 ~ppc ~sparc ~hppa ~amd64"
 
 # 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 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.2
-	>=gnome-base/libgnomeprintui-2.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.8.2
 	>=media-libs/libart_lgpl-2.3.11
 	python? ( >=dev-lang/python-2
-		>=dev-python/pygtk-1.99.10 )
-	libgda? ( >=gnome-extra/libgda-0.90 )
+		>=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.27.2
-	dev-util/pkgconfig"
+	>=dev-util/intltool-0.30
+	dev-util/pkgconfig
+	>=sys-devel/autoconf-2.58"
 
 src_unpack() {
 
@@ -45,8 +47,14 @@ src_unpack() {
 	gnome2_omf_fix
 
 	cd ${S}
-	# fixes a sandbox issue - foser <foser@gentoo.org>
-	epatch ${FILESDIR}/${P}-fix_doc_destdir_install.patch
+	# 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
 
 }
 
@@ -59,12 +67,14 @@ src_compile() {
 		|| die
 	# `use_with gnomedb gda`
 
-	#the build process have to be able to connect to X
+	# the build process has to be able to connect to X
 	Xemake || die
 
 }
 
-DOCS="AUTHORS COPYING* ChangeLog HACKING NEWS README TODO"
-
-USE_DESTDIR="1"
+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"