version bump, rewrote configure settings using `use_enable`,

re-enabled clamav, added configure option for compface

5 files changed, 215 insertions, 2 deletions

diff --git a/net-mail/sylpheed-claws/ChangeLog b/net-mail/sylpheed-claws/ChangeLog
index bc9de06752f8..805eda408e49 100644
--- a/net-mail/sylpheed-claws/ChangeLog
+++ b/net-mail/sylpheed-claws/ChangeLog
@@ -1,6 +1,18 @@
 # 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.55 2003/11/12 22:22:14 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/sylpheed-claws/ChangeLog,v 1.56 2003/11/26 23:24:03 genone Exp $
+
+*sylpheed-claws-0.9.7 (26 Nov 2003)
+
+  26 Nov 2003; Marius Mauch <genone@gentoo.org> sylpheed-claws-0.9.7.ebuild,
+  files/gv-procmime-0.9.7.diff:
+  - version bump 
+  - adding configure option for compface 
+  - re-enabling option for clamav plugin 
+  - replacing 
+  		use xxx && myconf="--enable-xxx" || myconf="--disable-xxx"
+	with 
+		myconf=`use_enable xxx`
 
   12 Nov 2003; Marius Mauch <genone@gentoo.org> metadata.xml,
   sylpheed-claws-0.9.5-r1.ebuild, sylpheed-claws-0.9.5.ebuild,
diff --git a/net-mail/sylpheed-claws/Manifest b/net-mail/sylpheed-claws/Manifest
index 51ca953f5fab..c0635ac49c37 100644
--- a/net-mail/sylpheed-claws/Manifest
+++ b/net-mail/sylpheed-claws/Manifest
@@ -1,16 +1,19 @@
 MD5 788dd51858fea8d38bd3725f69e29e02 sylpheed-claws-0.9.6-r1.ebuild 4131
 MD5 81ec34da41970dcea75968570caa151f sylpheed-claws-0.9.5.ebuild 3876
+MD5 4c9a00b99563b7127008bc33991ba020 sylpheed-claws-0.9.7.ebuild 4800
 MD5 b34ee89254b94b3357d61830bcc8c093 sylpheed-claws-0.9.5-r1.ebuild 4652
 MD5 17558d831dc20f8f89961af8bd50f80f sylpheed-claws-0.9.0-r1.ebuild 3334
 MD5 a88333bbb8ec37332c748ccfdae29249 sylpheed-claws-0.9.6.ebuild 3876
 MD5 03f89b288f02fedd5fb19703bfabc9c7 sylpheed-claws-0.8.11.ebuild 2944
-MD5 a88c910c251405a34e230cec95617919 ChangeLog 10448
+MD5 f94d8a0c72497ce6972625cb6730c505 ChangeLog 10808
 MD5 799733f5421ef60964d6df8062dfc7b3 metadata.xml 345
 MD5 1d59fb5412cf0ddfa5c4e5e85ab6c37c files/digest-sylpheed-claws-0.9.5 148
 MD5 706bd2a62e08094bb59b3c1710aa353b files/digest-sylpheed-claws-0.9.6 148
+MD5 bc2f795b5baf4f2a8209de7e47a2a1fb files/digest-sylpheed-claws-0.9.7 148
 MD5 8b029fc7176a8bad264d1676bd83984b files/digest-sylpheed-claws-0.8.11 74
 MD5 debd84fa61847ff672e179bcb7845e2b files/sylpheed-0.8.3claws32-dillo.patch 9123
 MD5 d9e778ef490a8e07e7b931d13052fca2 files/digest-sylpheed-claws-0.9.0-r1 73
 MD5 1e7e11ae4e8aba685f25aa113e70e1b5 files/digest-sylpheed-claws-0.9.5-r1 234
 MD5 c3ecddf9975c9491b9068172ed57bd4e files/digest-sylpheed-claws-0.9.6-r1 148
 MD5 bf4c9cd9cb7cdc6ece7d4d327910f0cf files/procmime.patch 977
+MD5 41c88558b48cef70dc56d0402892543d files/gv-procmime-0.9.7.diff 471
diff --git a/net-mail/sylpheed-claws/files/digest-sylpheed-claws-0.9.7 b/net-mail/sylpheed-claws/files/digest-sylpheed-claws-0.9.7
new file mode 100644
index 000000000000..dc1b4b5dc06a
--- /dev/null
+++ b/net-mail/sylpheed-claws/files/digest-sylpheed-claws-0.9.7
@@ -0,0 +1,2 @@
+MD5 a46fdb6abb3faec84660e58ccf96e869 sylpheed-0.9.7claws.tar.bz2 2846105
+MD5 bf738bb8938638bb5c0ba443d83ca909 ghostscript-viewer-0.5.tar.bz2 241944
diff --git a/net-mail/sylpheed-claws/files/gv-procmime-0.9.7.diff b/net-mail/sylpheed-claws/files/gv-procmime-0.9.7.diff
new file mode 100644
index 000000000000..c787f69177c1
--- /dev/null
+++ b/net-mail/sylpheed-claws/files/gv-procmime-0.9.7.diff
@@ -0,0 +1,11 @@
+--- src/viewer.c.org	2003-11-26 22:49:55.000000000 +0100
++++ src/viewer.c	2003-11-26 22:50:28.000000000 +0100
+@@ -95,7 +95,7 @@
+ 
+ 	ghostscriptviewer->filename = procmime_get_tmp_file_name(mimeinfo);
+ 
+-	if (!(procmime_get_part(ghostscriptviewer->filename, file, mimeinfo) < 0)) {
++	if (!(procmime_get_part(ghostscriptviewer->filename, mimeinfo) < 0)) {
+ 		GtkGS *gs = GTK_GS(ghostscriptviewer->gs);
+ 
+ 		gtk_gs_set_antialiasing(gs, ghostscriptviewerprefs.antialiasing);
diff --git a/net-mail/sylpheed-claws/sylpheed-claws-0.9.7.ebuild b/net-mail/sylpheed-claws/sylpheed-claws-0.9.7.ebuild
new file mode 100644
index 000000000000..93605df7d0a1
--- /dev/null
+++ b/net-mail/sylpheed-claws/sylpheed-claws-0.9.7.ebuild
@@ -0,0 +1,185 @@
+# 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.7.ebuild,v 1.1 2003/11/26 23:24:03 genone Exp $
+
+IUSE="nls gnome xface dillo crypt spell imlib ssl ldap ipv6 pda clamav pdflib"
+
+inherit eutils flag-o-matic
+
+GS_PN=ghostscript-viewer
+GS_PV=0.5
+MY_GS=${GS_PN}-${GS_PV}
+MY_P="sylpheed-${PV}claws"
+S=${WORKDIR}/${MY_P}
+S2=${S}/src/plugins/${MY_GS}
+DESCRIPTION="Bleeding edge version of Sylpheed"
+HOMEPAGE="http://sylpheed-claws.sf.net"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2
+	pdflib? ( mirror://sourceforge/${PN}/${MY_GS}.tar.bz2 )"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~mips ~hppa"
+
+DEPEND=">=sys-apps/sed-4
+	=x11-libs/gtk+-1.2*
+	app-misc/mime-types
+	pda? ( >=app-pda/jpilot-0.99 )
+	ssl? ( >=dev-libs/openssl-0.9.6b )
+	ldap? ( >=net-nds/openldap-2.0.7 )
+	crypt? ( =app-crypt/gpgme-0.3.14 )
+	dillo? ( net-www/dillo )
+	gnome? ( >=media-libs/gdk-pixbuf-0.16 )
+	imlib? ( >=media-libs/imlib-1.9.10 )
+	spell? ( virtual/aspell-dict )
+	xface? ( >=media-libs/compface-1.4 )
+	clamav? ( net-mail/clamav )
+	pdflib? ( app-text/ghostscript )
+	nls? ( >=sys-devel/gettext-0.12 )
+	x11-misc/shared-mime-info"
+
+PROVIDE="virtual/sylpheed"
+
+src_unpack() {
+	unpack ${A}
+
+	mv ${WORKDIR}/${MY_GS} ${S}/src/plugins
+
+	einfo ${S}
+	einfo ${S2}
+
+	# Change package name to sylpheed-claws ...
+	for i in `find ${S}/ -name 'configure*'`
+	do
+		sed -i "s/PACKAGE\=sylpheed/PACKAGE\=sylpheed-claws/" ${i}
+	done
+
+	# use shared-mime-info
+	cd ${S}/src
+	epatch ${FILESDIR}/procmime.patch
+
+	# procmime API was changed
+	if use pdflib; then
+		cd ${S2}
+		epatch ${FILESDIR}/gv-procmime-0.9.7.diff
+	fi
+}
+
+src_compile() {
+	local myconf
+
+	#use gnome \
+	#    && myconf="${myconf} --enable-gdk-pixbuf" \
+	#    || myconf="${myconf} --disable-gdk-pixbuf"
+	myconf="${myconf} `use_enable gnome gdk-pixbuf`"
+
+	#use imlib \
+	#    && myconf="${myconf} --enable-imlib" \
+	#    || myconf="${myconf} --disable-imlib"
+	myconf="${myconf} `use_enable imlib`"
+
+	#use spell \
+	#    && myconf="${myconf} --enable-aspell" \
+	#    || myconf="${myconf} --disable-aspell"
+	myconf="${myconf} `use_enable spell aspell`"
+
+	#use ldap && myconf="${myconf} --enable-ldap"
+	myconf="${myconf} `use_enable ldap`"
+
+	#use ssl && myconf="${myconf} --enable-openssl"
+	myconf="${myconf} `use_enable ssl openssl`"
+
+	#use crypt && myconf="${myconf} --enable-gpgme"
+	myconf="${myconf} `use_enable crypt gpgme`"
+
+	#use ipv6 && myconf="${myconf} --enable-ipv6"
+	myconf="${myconf} `use_enable ipv6`"
+
+	#use pda && myconf="${myconf} --enable-jpilot"
+	myconf="${myconf} `use_enable pda jpilot`"
+
+	#use nls || myconf="${myconf} --disable-nls"
+	myconf="${myconf} `use_enable nls`"
+
+	#use dillo \
+	#	&& myconf="${myconf} --enable-dillo-viewer-plugin" \
+	#	|| myconf="${myconf} --disable-dillo-viewer-plugin"
+	myconf="${myconf} `use_enable dillo dillo-viewer-plugin`"
+
+	#use clamav \
+	#	&& myconf="${myconf} --enable-clamav-plugin" \
+	#	|| myconf="${myconf} --disable-clamav-plugin"
+	myconf="${myconf} `use_enable clamav clamav-plugin`"
+
+	myconf="${myconf} `use_enable xface compface`"
+
+	echo ${myconf}
+
+	econf \
+		--program-suffix=-claws \
+		--enable-spamassassin-plugin \
+		${myconf} || die "./configure failed"
+
+	make || die
+
+	# build the extra tools
+	cd ${S}/tools
+	emake || die
+
+	# build the ghostscript-viewer plugin
+	if use pdflib
+	then
+		cd ${S2}
+		einfo "Compiling ghostscript-viewer plugin"
+		PKG_CONFIG_PATH=${S} \
+		CFLAGS="-I${S} -I${S}/src -I${S}/src/common -I${S}/src/gtk ${CFLAGS}" \
+		CXXFLAGS="${CFLAGS}" \
+			econf \
+				--with-sylpheed-dir=../.. || die
+
+		emake || die
+	fi
+
+	cd ${S}
+}
+
+src_install() {
+	make DESTDIR=${D} install || die
+
+	local menuentry="/usr/share/gnome/apps/Internet/sylpheed.desktop"
+	use gnome \
+		&& {
+			dosed "s/Sylpheed/Sylpheed Claws/" ${menuentry}
+			dosed "s/sylpheed/sylpheed-claws/" ${menuentry}
+			mv ${D}${menuentry} ${D}${menuentry/sylpheed/sylpheed-claws}
+		} \
+		|| rm -rf ${D}/usr/share/gnome
+
+	dodir /usr/share/pixmaps
+	mv sylpheed.png ${D}/usr/share/pixmaps/sylpheed-claws.png
+
+	dodoc AUTHORS ChangeLog* INSTALL* NEWS README* TODO*
+	docinto tools
+	dodoc tools/README*
+
+	# install the extra tools
+	cd ${S}/tools
+	exeinto /usr/lib/${PN}/tools
+	doexe *.pl *.py *.rc *.conf gpg-sign-syl
+	doexe launch_firebird tb2sylpheed update-po uudec
+
+	# install the ghostscipt-viewer plugin
+	if use pdflib
+	then
+		cd ${S2}
+		make plugindir=${D}/usr/lib/${PN}/plugins install || die
+		docinto ${MY_GS}
+		dodoc AUTHORS ChangeLog INSTALL NEWS README
+	fi
+}
+
+pkg_postinst() {
+	einfo "A new plugin scheme has been implemented and many plugins"
+	einfo "now come with sylpheed-claws. The plugins are located in:"
+	einfo "/usr/lib/sylpheed-claws/plugins and are loaded thru the UI."
+}