kde icon cleanup

5 files changed, 37 insertions, 9 deletions

diff --git a/net-mail/evolution/ChangeLog b/net-mail/evolution/ChangeLog
index 8b97d288597e..f79026f57b88 100644
--- a/net-mail/evolution/ChangeLog
+++ b/net-mail/evolution/ChangeLog
@@ -1,9 +1,13 @@
 # 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.50 2003/04/05 20:01:45 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/evolution/ChangeLog,v 1.51 2003/04/07 22:04:28 liquidx Exp $
 
 *evolution-1.2.4 (05 Apr 2003)
 
+  07 Apr 2003; Alastair Tse <liquidx@gentoo.org> evolution-1.2.4.ebuild,
+  evolution-1.3.1.ebuild:
+  remove kde link for non-kde users
+
   05 Apr 2003; Alastair Tse <liquidx@gentoo.org> evolution-1.2.4.ebuild:
   version bump
 
diff --git a/net-mail/evolution/evolution-1.2.4.ebuild b/net-mail/evolution/evolution-1.2.4.ebuild
index e8045f1da22d..4f35cd4ea157 100644
--- a/net-mail/evolution/evolution-1.2.4.ebuild
+++ b/net-mail/evolution/evolution-1.2.4.ebuild
@@ -1,8 +1,8 @@
 # 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.2.4.ebuild,v 1.1 2003/04/05 20:01:45 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/evolution/evolution-1.2.4.ebuild,v 1.2 2003/04/07 22:04:28 liquidx Exp $
 
-IUSE="ssl nls mozilla ldap doc spell pda ipv6 kerberos"
+IUSE="ssl nls mozilla ldap doc spell pda ipv6 kerberos kde"
 
 #provide Xmake and Xemake
 
@@ -209,6 +209,11 @@ src_install() {
 		KDE_APPLNK_DIR=/usr/share/applnk \
 		install || die
 
+	# remove kde link if USE="-kde"
+	if [ -z "`use kde`" ]; then
+		rm -rf ${D}/usr/share/applnk
+	fi
+
 	dodoc AUTHORS COPYING* ChangeLog HACKING MAINTAINERS
 	dodoc NEWS README
 }
diff --git a/net-mail/evolution/evolution-1.3.1.ebuild b/net-mail/evolution/evolution-1.3.1.ebuild
index 9bda3474067f..4184c9122fe0 100644
--- a/net-mail/evolution/evolution-1.3.1.ebuild
+++ b/net-mail/evolution/evolution-1.3.1.ebuild
@@ -1,8 +1,8 @@
 # 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.1.ebuild,v 1.4 2003/03/21 16:22:46 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/evolution/evolution-1.3.1.ebuild,v 1.5 2003/04/07 22:04:28 liquidx Exp $
 
-IUSE="ssl mozilla ldap doc spell pda ipv6 kerberos"
+IUSE="ssl mozilla ldap doc spell pda ipv6 kerberos kde"
 
 inherit eutils flag-o-matic gnome.org libtool virtualx gnome2
 
@@ -172,12 +172,12 @@ src_install() {
 	#sed -e "s:scrollkeeper-update.*::g" Makefile.old > Makefile
 	#rm Makefile.old
     
-    # fix kde shortcut (evo-1.3.1)
+    # fix kde shortcut otherwise make install fails (evo-1.3.1)
     cd ${S}/data
     cp Makefile Makefile.old
 	sed -e 's,^install-kde-applnk:,install-kde-applnk:\n\t$(mkinstalldirs) $(DESTDIR)$(kdedesktopdir); \\,' Makefile.old > Makefile
     rm Makefile.old
-        
+
 	cd ${S}
 
 	# Install with $DESTDIR, as in some rare cases $D gets hardcoded
@@ -193,7 +193,12 @@ src_install() {
 		localstatedir=/var/lib \
 		KDE_APPLNK_DIR=/usr/share/applnk \
 		install || die
-
+	
+	# 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
 }
diff --git a/net-mail/evolution/files/digest-evolution-1.2.4 b/net-mail/evolution/files/digest-evolution-1.2.4
index c1c483661cc1..b3cec260c9c4 100644
--- a/net-mail/evolution/files/digest-evolution-1.2.4
+++ b/net-mail/evolution/files/digest-evolution-1.2.4
@@ -11,6 +11,6 @@ MD5 f44bc5e363c1f976a7a72676886b9d13 /files/evolution-1.1.90-subversion.patch 47
 MD5 63d02821e6de8e0129d954d406dc77ae /files/evolution-1.1.90-utf8.patch 726
 MD5 2526fb78fe27dc17b78566860285bff1 /files/evolution-1.2.0-settingscrash.patch 625
 MD5 980771bb5349699c8d8ecd6b6f035b50 /files/gnome-pilot.m4 6452
-MD5 5aa7fb6eecade933c8ff654583740ebc /evolution-1.2.4.ebuild 6137
+MD5 eb3c88124e9daf30ee0f70e4e10ea53d /evolution-1.2.4.ebuild 6239
 MD5 2c525e0d0e570c96e4fb1fd95e46354c evolution-1.2.4.tar.gz 16673251
 MD5 5baeb94fb934d0bf783ea42117c400be db-3.1.17.tar.gz 1954117
diff --git a/net-mail/evolution/files/digest-evolution-1.3.1 b/net-mail/evolution/files/digest-evolution-1.3.1
index 07ad557757cf..8942dbbfb93f 100644
--- a/net-mail/evolution/files/digest-evolution-1.3.1
+++ b/net-mail/evolution/files/digest-evolution-1.3.1
@@ -1,2 +1,16 @@
+MD5 dc3bc6e2c133bb380f48f50f4918052e /files/evolution-1.0.2-conduit.patch 308
+MD5 76b7ec4d297cc9e14fd0c348c8449b75 /files/evolution-1.0.2-imapfix.diff 2838
+MD5 53050cb008a2555b215f7401772cfede /files/evolution-1.0.2-kde.patch 656
+MD5 d6c7be2ddd045fb5d487416bd09f1c1b /files/evolution-1.0.3-filter-crash.patch 1202
+MD5 1a2892e6ac519f18f30f5e2aa6508174 /files/evolution-1.0.8-mark-read-crash.patch 2018
+MD5 ecec58337e9c9f9ffb1013c4860fd33c /files/evolution-1.0.8-scrollkeeper.patch 1492
+MD5 c837abd50d990dea46fcea32b8a1b001 /files/evolution-1.1.90-kde.patch 689
+MD5 d2dcad91e6ec97286468eb7d13ceac9b /files/evolution-1.1.90-scrollkeeper.patch 1365
+MD5 8909b7f2d3483d55036f21ca2780e4a3 /files/evolution-1.1.90-sharedldap.patch 370
+MD5 f44bc5e363c1f976a7a72676886b9d13 /files/evolution-1.1.90-subversion.patch 470
+MD5 63d02821e6de8e0129d954d406dc77ae /files/evolution-1.1.90-utf8.patch 726
+MD5 2526fb78fe27dc17b78566860285bff1 /files/evolution-1.2.0-settingscrash.patch 625
+MD5 980771bb5349699c8d8ecd6b6f035b50 /files/gnome-pilot.m4 6452
+MD5 d91fe221d7054c762f1b0503aa91478b /evolution-1.3.1.ebuild 6142
 MD5 1189b8bda003fcdd42bff37bceba6645 evolution-1.3.1.tar.bz2 11122481
 MD5 5baeb94fb934d0bf783ea42117c400be db-3.1.17.tar.gz 1954117