fix misplaced scrollkeeper dir

4 files changed, 43 insertions, 6 deletions

diff --git a/app-office/gnumeric/ChangeLog b/app-office/gnumeric/ChangeLog
index c509ea006888..082de62a5d81 100644
--- a/app-office/gnumeric/ChangeLog
+++ b/app-office/gnumeric/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for app-office/gnumeric
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/gnumeric/ChangeLog,v 1.30 2003/04/15 10:37:21 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/gnumeric/ChangeLog,v 1.31 2003/04/22 15:32:19 liquidx Exp $
 
 *gnumeric-1.1.16-r1 (15 Apr 2003)
 
@@ -11,6 +11,10 @@
 
 *gnumeric-1.0.13 (14 Apr 2003)
 
+  22 Apr 2003; Alastair Tse <liquidx@gentoo.org> gnumeric-1.0.12.ebuild,
+  gnumeric-1.0.13.ebuild:
+  fix runaway scrollkeeper dir placement
+
   14 Apr 2003; foser <foser@gentoo.org> gnumeric-1.0.13.ebuild :
   New stable release
   Fixed evolution dep, probably doesn't work with the gtk2 version
diff --git a/app-office/gnumeric/Manifest b/app-office/gnumeric/Manifest
index a08dfe8a1823..2b1e047f7fbc 100644
--- a/app-office/gnumeric/Manifest
+++ b/app-office/gnumeric/Manifest
@@ -1,7 +1,7 @@
-MD5 a3727326d6afe78e7523ff61d3c393f2 ChangeLog 4554
-MD5 92c92e4e88e0a27c175ffe2a839d8e04 gnumeric-1.0.12.ebuild 2900
+MD5 d5255c0f8ca2d5aee99972fd32d7142e ChangeLog 4695
+MD5 686883719d8d6d5ba6fbaead6ba8f4bb gnumeric-1.0.12.ebuild 3253
 MD5 e98f3966b2cdec5bd009d11a5b9e9634 gnumeric-1.0.8.ebuild 3310
-MD5 a7477520ce24f436b3c986a8d06ad6db gnumeric-1.0.13.ebuild 2898
+MD5 1276e24b241da8b936d05fd4cc9cd354 gnumeric-1.0.13.ebuild 3262
 MD5 0598b5c8d38e72bfc0cfbf726516c1ed gnumeric-1.1.16-r1.ebuild 2136
 MD5 e42f64604844ac07ee01528b21ade757 gnumeric-1.1.16.ebuild 2060
 MD5 d649b85924af69de4941cf0c624b16f3 files/digest-gnumeric-1.0.12 69
diff --git a/app-office/gnumeric/gnumeric-1.0.12.ebuild b/app-office/gnumeric/gnumeric-1.0.12.ebuild
index b0d9308de6f9..4996430f6f8f 100644
--- a/app-office/gnumeric/gnumeric-1.0.12.ebuild
+++ b/app-office/gnumeric/gnumeric-1.0.12.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
 # Maintainer: Martin Schlemmer <azarah@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/app-office/gnumeric/gnumeric-1.0.12.ebuild,v 1.7 2003/04/03 17:15:26 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/gnumeric/gnumeric-1.0.12.ebuild,v 1.8 2003/04/22 15:32:19 liquidx Exp $
 
 inherit virtualx libtool gnome.org
 
@@ -44,6 +44,12 @@ DEPEND="${RDEPEND}
 	sys-devel/gettext
 	>=dev-util/intltool-0.11"
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	patch -p1 < ${FILESDIR}/gnumeric-1.1.16-scrollkeeper.patch || die "scrollkeeper patch failed"
+}
+
 src_compile() {
 	# fix the relink bug, and invalid paths in .la files.
 	elibtoolize
@@ -100,10 +106,21 @@ src_compile() {
 }	
 
 src_install() {
+	# keep scrollkeeper happy
+	dodir /var/lib/scrollkeeper
+	
   	make prefix=${D}/usr \
 		sysconfdir=${D}/etc \
+		scrollkeeper_localstate_dir=${D}/var/lib/scrollkeeper \
 		install || die
 
+	# regenerate docs later
+	rm -f ${D}/var/lib/scrollkeeper
+
   	dodoc AUTHORS COPYING *ChangeLog HACKING NEWS README TODO
 }
 
+pkg_postinst() {
+	scrollkeeper-update
+}
+
diff --git a/app-office/gnumeric/gnumeric-1.0.13.ebuild b/app-office/gnumeric/gnumeric-1.0.13.ebuild
index e320bcc860a8..122298337c46 100644
--- a/app-office/gnumeric/gnumeric-1.0.13.ebuild
+++ b/app-office/gnumeric/gnumeric-1.0.13.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
 # Maintainer: Martin Schlemmer <azarah@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/app-office/gnumeric/gnumeric-1.0.13.ebuild,v 1.1 2003/04/14 12:23:02 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/gnumeric/gnumeric-1.0.13.ebuild,v 1.2 2003/04/22 15:32:19 liquidx Exp $
 
 inherit virtualx libtool gnome.org
 
@@ -43,6 +43,12 @@ DEPEND="${RDEPEND}
 	sys-devel/gettext
 	>=dev-util/intltool-0.11"
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	patch -p1 < ${FILESDIR}/gnumeric-1.1.16-scrollkeeper.patch || die "scrollkeeper patch failed"
+}
+
 src_compile() {
 	# fix the relink bug, and invalid paths in .la files.
 	elibtoolize
@@ -99,10 +105,20 @@ src_compile() {
 }	
 
 src_install() {
+	# keep scrollkeeper happy
+	dodir /var/lib/scrollkeeper
+
   	make prefix=${D}/usr \
 		sysconfdir=${D}/etc \
+		scrollkeeper_localstate_dir=${D}/var/lib/scrollkeeper \
 		install || die
 
+	# regenerate these outside sandbox
+	rm -rf ${D}/var/lib/scrollkeeper
+	
   	dodoc AUTHORS COPYING *ChangeLog HACKING NEWS README TODO
 }
 
+pkg_postinst() {
+	scrollkeeper-update
+}