fix scrollkeeper issue

3 files changed, 14 insertions, 30 deletions

diff --git a/net-mail/evolution/ChangeLog b/net-mail/evolution/ChangeLog
index 7768b02b0c06..25fcb12f7ce9 100644
--- a/net-mail/evolution/ChangeLog
+++ b/net-mail/evolution/ChangeLog
@@ -1,9 +1,12 @@
 # ChangeLog for net-mail/evolution
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/evolution/ChangeLog,v 1.54 2003/04/21 23:27:26 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/evolution/ChangeLog,v 1.55 2003/04/23 22:16:47 liquidx Exp $
 
 *evolution-1.3.2 (21 Apr 2003)
 
+  23 Apr 2003; Alastair Tse <liquidx@gentoo.org> evolution-1.3.2.ebuild:
+  use gnome2_src_install for things scrollkeeper
+
   21 Apr 2003; Alastair Tse <liquidx@gentoo.org> evolution-1.3.2.ebuild:
   Second preview release from Ximian. Please read the below page carefully
   before merging:
diff --git a/net-mail/evolution/Manifest b/net-mail/evolution/Manifest
index 3b7ac362c3ce..479e7aee340a 100644
--- a/net-mail/evolution/Manifest
+++ b/net-mail/evolution/Manifest
@@ -1,10 +1,10 @@
-MD5 298cfe1a63123dbf1b61c4dc106bff89 ChangeLog 8901
+MD5 e72009be0bb456ffa4e9c45635420ff3 ChangeLog 9024
 MD5 d91fe221d7054c762f1b0503aa91478b evolution-1.3.1.ebuild 6142
 MD5 e4848d1bd1df01abf97300b9f20a2f06 evolution-1.0.8-r2.ebuild 5852
 MD5 3fa04e001ba70680edeeae12b9485ea0 evolution-1.2.0-r1.ebuild 5905
 MD5 53545b68585c41995fb082d844d0d1ac evolution-1.2.2.ebuild 5845
 MD5 301349811a880f04ecbeb35b77b32717 evolution-1.2.1.ebuild 6095
-MD5 a2ad46f97ffb5c4a61eaea402c9d2e9b evolution-1.3.2.ebuild 6275
+MD5 6c313f8cab4d4ea7ec6413d261593985 evolution-1.3.2.ebuild 5751
 MD5 07835a446e687bc12728e01ac56dccb7 evolution-1.2.4.ebuild 6244
 MD5 87cb608d847dc2824bed92faf65ea2d6 evolution-1.2.3.ebuild 5897
 MD5 c5b001010a9f25ecb6f5826cf3800b05 files/digest-evolution-1.2.2 132
diff --git a/net-mail/evolution/evolution-1.3.2.ebuild b/net-mail/evolution/evolution-1.3.2.ebuild
index 7a66c2451601..7b4703d4688f 100644
--- a/net-mail/evolution/evolution-1.3.2.ebuild
+++ b/net-mail/evolution/evolution-1.3.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/evolution/evolution-1.3.2.ebuild,v 1.1 2003/04/21 15:04:14 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/evolution/evolution-1.3.2.ebuild,v 1.2 2003/04/23 22:16:47 liquidx Exp $
 
 IUSE="ssl mozilla ldap doc spell pda ipv6 kerberos kde"
 
@@ -168,12 +168,9 @@ src_compile() {
 
 src_install() {
 
-	# omf docs missing in evo-1.3.1
-	#cd omf-install
-	#cp Makefile Makefile.old
-	#sed -e "s:scrollkeeper-update.*::g" Makefile.old > Makefile
-	#rm Makefile.old
-    
+	# get ready for scrollkeeper
+	dodir /var/lib/scrollkeeper
+
     # fix kde shortcut otherwise make install fails (evo-1.3.1)
     cd ${S}/data
     cp Makefile Makefile.old
@@ -181,29 +178,13 @@ src_install() {
     rm Makefile.old
 
 	cd ${S}
-
-	# Install with $DESTDIR, as in some rare cases $D gets hardcoded
-	# into the binaries (seems like a ccache problem at present),
-	# because everything is recompiled with the "new" PREFIX, if
-	# $DESTDIR is _not_ used.
-	make DESTDIR=${D} \
-		prefix=/usr \
-		mandir=/usr/share/man \
-		infodir=/usr/share/info \
-		datadir=/usr/share \
-		sysconfdir=/etc \
-		localstatedir=/var/lib \
-		KDE_APPLNK_DIR=/usr/share/applnk \
-		install || die
+	export USE_DESTDIR="1"
+	export DOCS="AUTHORS COPYING* ChangeLog HACKING MAINTAINERS NEWS README"
+	gnome2_src_install "KDE_APPLNK_DIR=/usr/share/applnk"
 	
 	# remove kde applnk if -kde
 	if [ -z "`use kde`" ]; then
 		rm -rf ${D}/usr/share/applnk
 	fi
-	
-	dodoc AUTHORS COPYING* ChangeLog HACKING MAINTAINERS
-	dodoc NEWS README
-}
 
-# evo-1.3.1 doesn't seem to have any OMFs
-SCROLLKEEPER_UPDATE="0"
+}