new gtk2 version

6 files changed, 234 insertions, 186 deletions

diff --git a/mail-client/sylpheed-claws/ChangeLog b/mail-client/sylpheed-claws/ChangeLog
index 681c8c18b094..3fbe7ba81417 100644
--- a/mail-client/sylpheed-claws/ChangeLog
+++ b/mail-client/sylpheed-claws/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for mail-client/sylpheed-claws
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/sylpheed-claws/ChangeLog,v 1.14 2004/08/25 07:57:05 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/sylpheed-claws/ChangeLog,v 1.15 2004/08/25 17:50:54 genone Exp $
+
+*sylpheed-claws-0.9.12a-r1 (25 Aug 2004)
+
+  25 Aug 2004; <genone@gentoo.org> +sylpheed-claws-0.9.12a-r1.ebuild,
+  -sylpheed-claws-0.9.5-r1.ebuild:
+  updating the masked gtk2 version.
 
 *sylpheed-claws-0.9.12a (25 Aug 2004)
 
diff --git a/mail-client/sylpheed-claws/Manifest b/mail-client/sylpheed-claws/Manifest
index bd7a205488ac..86eadf1f15d0 100644
--- a/mail-client/sylpheed-claws/Manifest
+++ b/mail-client/sylpheed-claws/Manifest
@@ -3,22 +3,22 @@ Hash: SHA1
 
 MD5 5d0a878a0318c6d261424c0f55af1345 metadata.xml 392
 MD5 658a9d46f96119d1d6bed25dfa7147fd sylpheed-claws-0.9.10.ebuild 3755
-MD5 553944c891ab53c40326b7c20adf5ffd sylpheed-claws-0.9.5-r1.ebuild 4624
 MD5 e2fbaf474d88efb6b9f39a805abb80fe sylpheed-claws-0.9.7.ebuild 4664
 MD5 629047acc47cd15a42e01cddaa25e9c1 sylpheed-claws-0.9.11.ebuild 3755
-MD5 22b0515de99049249e4a1ab4b91368cc ChangeLog 15757
+MD5 d9766ef8a00cfb3bf78d19a4c66d55e3 ChangeLog 15941
+MD5 86da52ff9c034e1d4e597fdba07babb1 sylpheed-claws-0.9.12a-r1.ebuild 6383
 MD5 b069e484f8a50b4b494eb55aca483dc1 sylpheed-claws-0.9.12a.ebuild 4301
 MD5 e5a1953a555e8060722cada98b9d55fb files/digest-sylpheed-claws-0.9.10 149
 MD5 8ca534b232f6988e9df8e9fd48563e43 files/digest-sylpheed-claws-0.9.11 149
-MD5 1e7e11ae4e8aba685f25aa113e70e1b5 files/digest-sylpheed-claws-0.9.5-r1 234
 MD5 a44580928f3fa901eb944e739c070d44 files/digest-sylpheed-claws-0.9.7 148
 MD5 82d3d3968bf15e87b2fc7b5b53c42277 files/gv-procmime-Makefile.in.patch 930
 MD5 bf4c9cd9cb7cdc6ece7d4d327910f0cf files/procmime.patch 977
 MD5 db15d20129837459a3b58fc654301b7c files/digest-sylpheed-claws-0.9.12a 279
+MD5 127bc1fa7e9c9f3d46b0df6f05446360 files/digest-sylpheed-claws-0.9.12a-r1 442
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.5 (GNU/Linux)
 
-iD8DBQFBLEZd6J2i8a8J4okRAvcNAJ40WZVieU/sZaJTvhGQ1e6xsbCJ0wCfVqNJ
-o7A6sqaQ2IVROTGC9ent8Vg=
-=Pczp
+iD8DBQFBLNGQ6J2i8a8J4okRAlp/AKCKIPIjFKKpPpKtF/wsq+7UP4iEngCgijdK
+rkCRHbWHMxJHbbO4b+CV5YY=
+=bEL0
 -----END PGP SIGNATURE-----
diff --git a/mail-client/sylpheed-claws/files/digest-sylpheed-claws-0.9.12a-r1 b/mail-client/sylpheed-claws/files/digest-sylpheed-claws-0.9.12a-r1
new file mode 100644
index 000000000000..128b8552c36a
--- /dev/null
+++ b/mail-client/sylpheed-claws/files/digest-sylpheed-claws-0.9.12a-r1
@@ -0,0 +1,6 @@
+MD5 382caecd2b21cbcd9b8d07816025a87c sylpheed-claws-0.9.12a.tar.bz2 3078119
+MD5 6a3f25a91ce113595f25d43940b972e6 sylpheed-claws-0.9.12a-gtk2.patch.bz2 388439
+MD5 838ac4de05926efcdefb32a957669324 ghostscript-viewer-0.7.tar.bz2 286817
+MD5 3659d2249c201b729cf812885ef56e0c maildir-0.6.tar.bz2 216639
+MD5 520c2a2e1e45dda7ebb57e0e1e3ab9b3 mailmbox-0.9.tar.gz 366757
+MD5 9603019f0e0ddc4c3962bf6cf8844b62 sc-pgpinline-0.1_pre20040825.tar.bz2 219846
diff --git a/mail-client/sylpheed-claws/files/digest-sylpheed-claws-0.9.5-r1 b/mail-client/sylpheed-claws/files/digest-sylpheed-claws-0.9.5-r1
deleted file mode 100644
index c59414830083..000000000000
--- a/mail-client/sylpheed-claws/files/digest-sylpheed-claws-0.9.5-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 66d72383222e4deb47300889d24f1044 sylpheed-0.9.5claws.tar.bz2 2733738
-MD5 260f8e031f2b336e2554f58d70313cf2 sylpheed-0.9.5claws-gtk2-20030917.diff.gz 151042
-MD5 3cb2d0e1cf2cd49ac51e6223e5cf4f33 ghostscript-viewer-0.4.tar.bz2 184684
diff --git a/mail-client/sylpheed-claws/sylpheed-claws-0.9.12a-r1.ebuild b/mail-client/sylpheed-claws/sylpheed-claws-0.9.12a-r1.ebuild
new file mode 100644
index 000000000000..95ce829337da
--- /dev/null
+++ b/mail-client/sylpheed-claws/sylpheed-claws-0.9.12a-r1.ebuild
@@ -0,0 +1,215 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-client/sylpheed-claws/sylpheed-claws-0.9.12a-r1.ebuild,v 1.1 2004/08/25 17:50:54 genone Exp $
+
+IUSE="nls gnome dillo crypt spell imlib ssl ldap ipv6 pda clamav pdflib maildir mbox gtk2"
+
+inherit eutils
+
+# setting up plugin related variables
+GS_PN=ghostscript-viewer
+GS_PV=0.7
+
+PGP_PN=pgpinline
+PGP_PV=0.1_pre20040825
+
+MAILDIR_PN=maildir
+MAILDIR_PV=0.6
+
+MBOX_PN=mailmbox
+MBOX_PV=0.9
+
+MY_GS=${GS_PN}-${GS_PV}
+MY_PGP=${PGP_PN}-${PGP_PV}
+MY_MAILDIR=${MAILDIR_PN}-${MAILDIR_PV}
+MY_MBOX=${MBOX_PN}-${MBOX_PV}
+
+GTK2_PATCH="${P}-gtk2.patch.bz2"
+
+DESCRIPTION="Bleeding edge version of Sylpheed"
+HOMEPAGE="http://sylpheed-claws.sf.net"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2
+	gtk2? ( mirror://gentoo/${GTK2_PATCH} http://dev.gentoo.org/~genone/distfiles/${GTK2_PATCH} )
+	!gtk2? ( pdflib? ( mirror://sourceforge/${PN}/${MY_GS}.tar.bz2 )
+			 maildir? ( mirror://sourceforge/${PN}/${MY_MAILDIR}.tar.bz2 )
+			 mbox? ( http://${PN}.sourceforge.net/downloads/${MY_MBOX}.tar.gz )
+			 crypt? ( mirror://gentoo/sc-${MY_PGP}.tar.bz2 http://dev.gentoo.org/~genone/distfiles/sc-${MY_PGP}.tar.bz2 )
+			)"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64"
+
+COMMONDEPEND="
+	!gtk2? ( =x11-libs/gtk+-1.2*
+			 maildir? ( >=sys-libs/db-4.1 )
+			 pdflib? ( virtual/ghostscript )
+			)
+	gtk2? ( >=x11-libs/gtk+-2.4 )
+	pda? ( >=app-pda/jpilot-0.99 )
+	ssl? ( >=dev-libs/openssl-0.9.7 )
+	ldap? ( >=net-nds/openldap-2.0.7 )
+	crypt? ( =app-crypt/gpgme-0.3.14-r1 )
+	dillo? ( net-www/dillo )
+	gnome? ( >=media-libs/gdk-pixbuf-0.16 )
+	imlib? ( >=media-libs/imlib-1.9.10 )
+	spell? ( virtual/aspell-dict )
+	pdflib? ( virtual/ghostscript )
+	nls? ( >=sys-devel/gettext-0.12 )"
+
+DEPEND="${COMMONDEPEND}
+	>=media-libs/compface-1.4
+	>=sys-apps/sed-4"
+
+RDEPEND="${COMMONDEPEND}
+	app-misc/mime-types
+	net-mail/metamail
+	x11-misc/shared-mime-info"
+
+PROVIDE="virtual/sylpheed"
+
+pkg_setup() {
+	if use gtk2; then
+		einfo "Using the GTK2 branch"
+		echo
+		ewarn "This branch is still a testing version. Some USE flags might not"
+		ewarn "work when used together with gtk2 and could generate compile errors."
+		ewarn "It will most likely have bugs, so please note that it is"
+		ewarn "      COMPLETELY UNSUPPORTED BY GENTOO"
+		echo
+		ewarn "All external plugins are currently incompatible with the gtk2 version"
+		ewarn "and will be disabled for this build. This affects the ghostscript, "
+		ewarn "maildir, mbox and pgpinline plugins. If you need them you'll have"
+		ewarn "to disable gtk2."
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+
+	for plugin in ${MY_GS} ${MY_MAILDIR} ${MY_MBOX} ${MY_PGP}; do
+		[ -d ${WORKDIR}/${plugin} ] && mv ${WORKDIR}/${plugin} ${S}/src/plugins
+	done
+
+	# lets see how well this works
+	if use gtk2; then
+		cd ${S}
+		epatch ${WORKDIR}/${GTK2_PATCH%.bz2}
+	fi
+
+	# use shared-mime-info
+	cd ${S}/src
+	epatch ${FILESDIR}/procmime.patch
+}
+
+plugin_compile() {
+	if use gtk2; then
+		ewarn "Plugin ${1} disabled due to gtk2 incompability"
+		return
+	elif [ -z "${2}" ] || use ${2}; then
+		cd ${S}/src/plugins/${1}
+		einfo "Compiling plugin: ${1}"
+		local myPKG_CONFIG_PATH=${S}
+		local myCFLAGS="-I${S} -I${S}/src -I${S}/src/common -I${S}/src/gtk ${CFLAGS}"
+
+		CFLAGS="${myCFLAGS}" \
+		CXXFLAGS="${myCXXFLAGS}" \
+			econf --with-sylpheed-dir=../.. || die "plugin configure failed: ${1}"
+
+		einfo emake CFLAGS="${myCFLAGS}" CXXFLAGS="${myCFLAGS}" SYLPHEED_CLAWS_CFLAGS="${myCFLAGS}" || die "plugin compile failed: ${1}"
+		emake CFLAGS="${myCFLAGS}" CXXFLAGS="${myCFLAGS}" SYLPHEED_CLAWS_CFLAGS="${myCFLAGS}" || die "plugin compile failed: ${1}"
+	fi
+}
+
+plugin_install() {
+	if use gtk2; then
+		return
+	elif [ -z "${2}" ] || use ${2}; then
+		cd ${S}/src/plugins/${1}
+		make DESTDIR="${D}" plugindir="/usr/lib/${PN}/plugins" install || die "plugin install failed: ${1}"
+		docinto ${1}
+		dodoc AUTHORS ChangeLog INSTALL NEWS README
+	fi
+}
+
+src_compile() {
+	local myconf
+
+	myconf="${myconf} `use_enable gnome gdk-pixbuf`"
+	myconf="${myconf} `use_enable imlib`"
+	myconf="${myconf} `use_enable spell aspell`"
+	myconf="${myconf} `use_enable ldap`"
+	myconf="${myconf} `use_enable ssl openssl`"
+	myconf="${myconf} `use_enable crypt gpgme`"
+	myconf="${myconf} `use_enable ipv6`"
+	myconf="${myconf} `use_enable pda jpilot`"
+	myconf="${myconf} `use_enable nls`"
+	myconf="${myconf} `use_enable dillo dillo-viewer-plugin`"
+	myconf="${myconf} `use_enable clamav clamav-plugin`"
+	myconf="${myconf} `use_enable crypt pgpmime-plugin`"
+	use gtk2 && myconf="${myconf} --with-config-dir=.sylpheed-claws"
+
+	export GPGME_CONFIG=${ROOT}/usr/bin/gpgme3-config
+	econf \
+		--program-suffix=-claws \
+		--enable-spamassassin-plugin \
+		--enable-compface \
+		${myconf} || die "./configure failed"
+
+	emake || die
+
+	# build the extra tools
+	cd ${S}/tools
+	emake || die
+
+	# build external plugins
+	plugin_compile ${MY_GS} pdflib
+	plugin_compile ${MY_MAILDIR} maildir
+	plugin_compile ${MY_MBOX} mbox
+	plugin_compile ${MY_PGP} crypt
+
+	cd ${S}
+}
+
+src_install() {
+	make DESTDIR=${D} install || die
+
+	local menuentry="/usr/share/gnome/apps/Internet/sylpheed.desktop"
+	if use gnome; then
+		dosed "s/Sylpheed/Sylpheed Claws/" ${menuentry}
+		dosed "s/sylpheed/sylpheed-claws/" ${menuentry}
+		mv ${D}${menuentry} ${D}${menuentry/sylpheed/sylpheed-claws}
+	else
+		rm -rf ${D}/usr/share/gnome
+	fi
+
+	dodir /usr/share/pixmaps
+	mv ${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 *.sh gpg-sign-syl
+	doexe tb2sylpheed update-po uudec
+
+	# install external plugins
+	plugin_install ${MY_GS} pdflib
+	plugin_install ${MY_MAILDIR} maildir
+	plugin_install ${MY_MBOX} mbox
+	plugin_install ${MY_PGP} crypt
+}
+
+pkg_postinst() {
+		ewarn "The GTK2 branch is still a testing version. Some USE flags might not"
+		ewarn "work when used together with gtk2 and could generate compile errors."
+		ewarn "It will most likely have bugs, so please note that it is"
+		ewarn "      COMPLETELY UNSUPPORTED BY GENTOO"
+		echo
+		einfo "For safety reasons this version will use the alternate configuration"
+		einfo "directory ~/.sylpheed-claws instead of ~/.sylpheed, so you have to"
+		einfo "copy your configuration manually or create a new one."
+}
diff --git a/mail-client/sylpheed-claws/sylpheed-claws-0.9.5-r1.ebuild b/mail-client/sylpheed-claws/sylpheed-claws-0.9.5-r1.ebuild
deleted file mode 100644
index 2729162095de..000000000000
--- a/mail-client/sylpheed-claws/sylpheed-claws-0.9.5-r1.ebuild
+++ /dev/null
@@ -1,176 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/sylpheed-claws/sylpheed-claws-0.9.5-r1.ebuild,v 1.3 2004/06/24 22:18:53 agriffis Exp $
-
-IUSE="nls gnome gtk2 xface gtkhtml crypt spell imlib ssl ldap ipv6 pda clamav pdflib"
-
-inherit eutils
-
-GS_PN=ghostscript-viewer
-GS_PV=0.4
-MY_GS=${GS_PN}-${GS_PV}
-MY_P="sylpheed-${PV}claws"
-PATCHVER=20030917
-S=${WORKDIR}/${MY_P}
-S2=${WORKDIR}/${MY_GS}
-DESCRIPTION="Bleeding edge version of Sylpheed"
-HOMEPAGE="http://sylpheed-claws.sf.net"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2
-	gtk2? ( http://www.homa.ne.jp/~ashie/linux/files/${MY_P}-gtk2-${PATCHVER}.diff.gz )
-	pdflib? ( mirror://sourceforge/${PN}/${MY_GS}.tar.bz2 )"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha"
-
-DEPEND=">=sys-apps/sed-4
-	app-misc/mime-types
-	gtk2? ( =x11-libs/gtk+-2* )
-	!gtk2? ( =x11-libs/gtk+-1.2* )
-	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 )
-	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? ( app-antivirus/clamav )
-	gtkhtml? ( net-www/dillo )
-	pdflib? ( virtual/ghostscript )
-	nls? ( >=sys-devel/gettext-0.12 )
-	x11-misc/shared-mime-info"
-
-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
-	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*'`
-	do
-		sed -i "s/PACKAGE\=sylpheed/PACKAGE\=sylpheed-claws/" ${i}
-	done
-
-	# use shared-mime-info
-	cd ${S}/src
-	epatch ${FILESDIR}/procmime.patch
-}
-
-src_compile() {
-	local myconf
-
-	use gnome \
-	    && myconf="${myconf} --enable-gdk-pixbuf" \
-	    || myconf="${myconf} --disable-gdk-pixbuf"
-
-	use imlib \
-	    && myconf="${myconf} --enable-imlib" \
-	    || myconf="${myconf} --disable-imlib"
-
-	use spell && ! use gtk2 \
-	    && myconf="${myconf} --enable-aspell" \
-	    || myconf="${myconf} --disable-aspell"
-
-	use ldap && myconf="${myconf} --enable-ldap"
-
-	use ssl && myconf="${myconf} --enable-openssl"
-
-	use crypt && myconf="${myconf} --enable-gpgme"
-
-	use ipv6 && myconf="${myconf} --enable-ipv6"
-
-	use pda && myconf="${myconf} --enable-jpilot"
-
-	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"
-
-	#use clamav \
-	#	&& myconf="${myconf} --enable-clamav-plugin" \
-	#	|| myconf="${myconf} --disable-clamav-plugin"
-	echo ${myconf}
-
-	use gtk2 && ./autogen.sh
-
-	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 && ! use gtk2; then
-		cd ${S2}
-		econf \
-			--with-sylpheed-dir=${S} || 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 && ! use gtk2; 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."
-}