disabling non-working options for gtk2

3 files changed, 29 insertions, 10 deletions

diff --git a/net-mail/sylpheed-claws/ChangeLog b/net-mail/sylpheed-claws/ChangeLog
index 192345f66472..47cc972ce8a3 100644
--- a/net-mail/sylpheed-claws/ChangeLog
+++ b/net-mail/sylpheed-claws/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-mail/sylpheed-claws
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/sylpheed-claws/ChangeLog,v 1.49 2003/09/06 17:50:52 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/sylpheed-claws/ChangeLog,v 1.50 2003/09/25 22:49:55 genone Exp $
+
+*sylpheed-claws-0.9.5-r1 (26 Sep 2003)
+
+  26 Sep 2003; Marius Mauch <genone@gentoo.org>
+  sylpheed-claws-0.9.5-r1.ebuild:
+  disabling some non-working options if USE=gtk2 is set
 
   06 Sep 2003; Jason Wever <weeve@gentoo.org> sylpheed-claws-0.9.0-r1.ebuild:
   Marked stable on sparc.
diff --git a/net-mail/sylpheed-claws/Manifest b/net-mail/sylpheed-claws/Manifest
index 65a0755a31f9..12a38d01f200 100644
--- a/net-mail/sylpheed-claws/Manifest
+++ b/net-mail/sylpheed-claws/Manifest
@@ -1,10 +1,10 @@
 MD5 0d0ce7a1256f5931b46ec5ae2843dabc sylpheed-claws-0.9.5.ebuild 3876
-MD5 4d418e48a38c515dd651d4b87a78066c sylpheed-claws-0.9.5-r1.ebuild 4130
+MD5 29186e37f49472a96f63b08ec23a2843 sylpheed-claws-0.9.5-r1.ebuild 4651
 MD5 245b65d30944dc96574a75ce92891656 sylpheed-claws-0.9.4.ebuild 3471
 MD5 60f0c479b2892ac83ba289ac2a3ee85f sylpheed-claws-0.9.4-r1.ebuild 3878
 MD5 17558d831dc20f8f89961af8bd50f80f sylpheed-claws-0.9.0-r1.ebuild 3334
 MD5 03f89b288f02fedd5fb19703bfabc9c7 sylpheed-claws-0.8.11.ebuild 2944
-MD5 cc03bc0626d9815f953fdc07dca5f8fd ChangeLog 9070
+MD5 972cab99053a82ff8d122495e267ef52 ChangeLog 9250
 MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
 MD5 bc2cbfb7afd5f4264ea57fbdc55874f8 files/digest-sylpheed-claws-0.9.4 73
 MD5 1d59fb5412cf0ddfa5c4e5e85ab6c37c files/digest-sylpheed-claws-0.9.5 148
diff --git a/net-mail/sylpheed-claws/sylpheed-claws-0.9.5-r1.ebuild b/net-mail/sylpheed-claws/sylpheed-claws-0.9.5-r1.ebuild
index 0f15f7f491d3..f51d97d7ced6 100644
--- a/net-mail/sylpheed-claws/sylpheed-claws-0.9.5-r1.ebuild
+++ b/net-mail/sylpheed-claws/sylpheed-claws-0.9.5-r1.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/sylpheed-claws/sylpheed-claws-0.9.5-r1.ebuild,v 1.1 2003/09/16 07:54:18 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/sylpheed-claws/sylpheed-claws-0.9.5-r1.ebuild,v 1.2 2003/09/25 22:49:55 genone Exp $
 
 IUSE="nls gnome gtk2 xface gtkhtml crypt spell imlib ssl ldap ipv6 pda clamav pdflib"
 
@@ -42,11 +42,24 @@ DEPEND=">=sys-apps/sed-4
 
 PROVIDE="virtual/sylpheed"
 
+pkg_setup() {
+	if use gtk2; then
+		ewarn "Sylpheed-claws gtk2 support is experimental and breaks some"
+		ewarn "plugins and USE flags. The following things will be disabled"
+		ewarn "if sylpheed-claws is emerged with USE=\"gtk2\":"
+		ewarn "    aspell support, ghostview plugin, trayicon plugin"
+		sleep 2
+	fi
+}
+
 src_unpack() {
 	unpack ${A}
 
 	# Patch for GTK+-2
-	use gtk2 && epatch ${WORKDIR}/${MY_P}-gtk2-${PATCHVER}.diff
+	if use gtk2; then
+		epatch ${WORKDIR}/${MY_P}-gtk2-${PATCHVER}.diff
+		sed -i "s/GTK_WINDOW_DIALOG/GTK_WINDOW_POPUP/" "${S}/src/ssl_manager.c"
+	fi
 
 	# Change package name to sylpheed-claws ...
 	for i in `find ${S}/ -name 'configure*'`
@@ -70,7 +83,7 @@ src_compile() {
 	    && myconf="${myconf} --enable-imlib" \
 	    || myconf="${myconf} --disable-imlib"
 
-	use spell \
+	[ use spell -a ! use gtk2 ] \
 	    && myconf="${myconf} --enable-aspell" \
 	    || myconf="${myconf} --disable-aspell"
 
@@ -86,6 +99,8 @@ src_compile() {
 
 	use nls || myconf="${myconf} --disable-nls"
 
+	use gtk2 && myconf="${myconf} --disable-trayicon-plugin"
+
 	#use gtkhtml \
 	#	&& myconf="${myconf} --enable-dillo-viewer-plugin" \
 	#	|| myconf="${myconf} --disable-dillo-viewer-plugin"
@@ -109,8 +124,7 @@ src_compile() {
 	emake || die
 
 	# build the ghostscript-viewer plugin
-	if use pdflib
-	then
+	if [ `use pdflib` -a -z `use gtk2` ]; then
 		cd ${S2}
 		econf \
 			--with-sylpheed-dir=${S} || die
@@ -146,8 +160,7 @@ src_install() {
 	doexe launch_firebird tb2sylpheed update-po uudec
 
 	# install the ghostscipt-viewer plugin
-	if use pdflib
-	then
+	if [ `use pdflib` -a -z `use gtk2` ]; then
 		cd ${S2}
 		make plugindir=${D}/usr/lib/${PN}/plugins install || die
 		docinto ${MY_GS}