updating libetpan dep, bug #111481 changes and general cleaning

Package-Manager: portage-2.0.53_rc7

9 files changed, 18 insertions, 502 deletions

diff --git a/mail-client/sylpheed-claws/ChangeLog b/mail-client/sylpheed-claws/ChangeLog
index 4a13ddb6bea0..1b049957f586 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-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/sylpheed-claws/ChangeLog,v 1.68 2005/11/11 13:52:49 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/sylpheed-claws/ChangeLog,v 1.69 2005/11/13 09:38:03 genone Exp $
+
+  13 Nov 2005; Marius Mauch <genone@gentoo.org>
+  -sylpheed-claws-1.9.13-r1.ebuild, -sylpheed-claws-1.9.99_rc2.ebuild,
+  -sylpheed-claws-1.9.99.ebuild, sylpheed-claws-1.9.100.ebuild:
+  Fixing libetpan dependency and adding more changes from bug #111481,
+  cleaning some 1.9* ebuilds out.
 
 *sylpheed-claws-1.9.100 (11 Nov 2005)
 *sylpheed-claws-1.0.5-r1 (11 Nov 2005)
diff --git a/mail-client/sylpheed-claws/Manifest b/mail-client/sylpheed-claws/Manifest
index b37285b368bf..4b2d4faa7d7c 100644
--- a/mail-client/sylpheed-claws/Manifest
+++ b/mail-client/sylpheed-claws/Manifest
@@ -1,28 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 732cdc3b41403a115970d497a9ec257e ChangeLog 25770
+MD5 80a226c1950484c9b2176a0c86c2e160 ChangeLog 26059
 MD5 743b9535636a8b39507545bc03a1a265 files/digest-sylpheed-claws-1.0.5 74
 MD5 743b9535636a8b39507545bc03a1a265 files/digest-sylpheed-claws-1.0.5-r1 74
 MD5 a72739cfabebb4db4cd7f05261380027 files/digest-sylpheed-claws-1.9.100 76
-MD5 df2671b8371f1e7e45c7add8ecb59604 files/digest-sylpheed-claws-1.9.13-r1 75
 MD5 5e3551b9ba068cb0188878c84d1c1c17 files/digest-sylpheed-claws-1.9.15 75
-MD5 16536ae3be72760f42325dc136fc1684 files/digest-sylpheed-claws-1.9.99 75
-MD5 8071e7aa71511bd13cd620b6fb84a163 files/digest-sylpheed-claws-1.9.99_rc2 79
 MD5 06d23c04b3d6ddfb1431c22ecc5b28f6 files/ldif-buffer-overflow-fix.diff 5007
 MD5 bf4c9cd9cb7cdc6ece7d4d327910f0cf files/procmime.patch 977
 MD5 82e806ed62f0596fb7bef493d225712f metadata.xml 269
 MD5 b9fe79135a475458ef1b2240ee302ebd sylpheed-claws-1.0.5-r1.ebuild 3906
 MD5 c2f43f3756d2d04b85377972c2d80223 sylpheed-claws-1.0.5.ebuild 3847
-MD5 a33ad10df61a4fb172c4189bcee2fa6a sylpheed-claws-1.9.100.ebuild 4421
-MD5 5cd279ff9a1732297aa19e63b9af17c0 sylpheed-claws-1.9.13-r1.ebuild 4825
+MD5 f2740d63321fd0751083ab0ac45ceb1d sylpheed-claws-1.9.100.ebuild 4444
 MD5 15b5c9348ba0b0a416892588256b4cbc sylpheed-claws-1.9.15.ebuild 4821
-MD5 d183694ee9f8f98700d28c9d77106b6a sylpheed-claws-1.9.99.ebuild 4420
-MD5 37cb377350bd646741915100c011b64f sylpheed-claws-1.9.99_rc2.ebuild 4826
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDdKJD6J2i8a8J4okRAmRbAKCt0U6P385YEeVHyX2N0gB5HCIsKwCdGVM+
-AWcFHuDYewO2fVheLNArvMo=
-=zsfe
+iD8DBQFDdwmL6J2i8a8J4okRAi4YAJ9jEecS4oD+wsIlEzuIZZXnv4fg9gCgiCgj
+bUGMRcsNfYE+wBlSY6AD1a4=
+=iARW
 -----END PGP SIGNATURE-----
diff --git a/mail-client/sylpheed-claws/files/digest-sylpheed-claws-1.9.13-r1 b/mail-client/sylpheed-claws/files/digest-sylpheed-claws-1.9.13-r1
deleted file mode 100644
index fb38af93ab91..000000000000
--- a/mail-client/sylpheed-claws/files/digest-sylpheed-claws-1.9.13-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 afd3b82ca210520f0ad241b77c5e673a sylpheed-claws-1.9.13.tar.bz2 3432284
diff --git a/mail-client/sylpheed-claws/files/digest-sylpheed-claws-1.9.99 b/mail-client/sylpheed-claws/files/digest-sylpheed-claws-1.9.99
deleted file mode 100644
index 3b7fb2fdb9c2..000000000000
--- a/mail-client/sylpheed-claws/files/digest-sylpheed-claws-1.9.99
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9ea5fe5173a2137ecbafb4bc3c5d2339 sylpheed-claws-1.9.99.tar.bz2 3463192
diff --git a/mail-client/sylpheed-claws/files/digest-sylpheed-claws-1.9.99_rc2 b/mail-client/sylpheed-claws/files/digest-sylpheed-claws-1.9.99_rc2
deleted file mode 100644
index 33fb75698358..000000000000
--- a/mail-client/sylpheed-claws/files/digest-sylpheed-claws-1.9.99_rc2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d1365b10e863aeb6c0d846723e9493de sylpheed-claws-1.9.99-rc2.tar.bz2 3506391
diff --git a/mail-client/sylpheed-claws/sylpheed-claws-1.9.100.ebuild b/mail-client/sylpheed-claws/sylpheed-claws-1.9.100.ebuild
index bd9ca84c3b94..9a4353bf204a 100644
--- a/mail-client/sylpheed-claws/sylpheed-claws-1.9.100.ebuild
+++ b/mail-client/sylpheed-claws/sylpheed-claws-1.9.100.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/sylpheed-claws/sylpheed-claws-1.9.100.ebuild,v 1.1 2005/11/11 13:52:49 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/sylpheed-claws/sylpheed-claws-1.9.100.ebuild,v 1.2 2005/11/13 09:38:03 genone Exp $
 
 IUSE="gnome dillo crypt spell ssl ldap ipv6 pda clamav xface kde imap spamassassin doc"
 
@@ -30,7 +30,7 @@ COMMONDEPEND=">=x11-libs/gtk+-2.4
 	spell? ( virtual/aspell-dict )
 	clamav? ( app-antivirus/clamav )
 	kde? ( kde-base/kdelibs )
-	imap? ( >=net-libs/libetpan-0.38 )
+	imap? ( >=net-libs/libetpan-0.40 )
 	gnome? ( >=gnome-base/libgnomeprintui-2.2 )
 	x11-libs/startup-notification
 	!mail-client/sylpheed-claws-pgpinline"	# included in the main package now
@@ -96,10 +96,6 @@ src_compile() {
 		${myconf} || die "./configure failed"
 
 	emake || die
-
-	# build the extra tools
-	cd ${S}/tools
-	emake || die
 }
 
 src_install() {
@@ -117,7 +113,7 @@ src_install() {
 	# => also install higher resolution icons in /usr/share/icons/hicolor/...
 	insinto /usr/share/pixmaps
 	doins sylpheed-claws.png
-	local resdir
+	local res resdir
 	for res in 64x64 128x128 ; do
 		resdir="/usr/share/icons/hicolor/${res}/apps"
 		insinto ${resdir}
@@ -145,6 +141,9 @@ src_install() {
 		insinto ${kdeprefix}/bin
 		doexe ${servicescript}
 	fi
+
+	# kill useless plugin files
+	rm -f ${D}/usr/lib*/${PN}/plugins/*.{la,a}
 }
 
 pkg_postinst() {
diff --git a/mail-client/sylpheed-claws/sylpheed-claws-1.9.13-r1.ebuild b/mail-client/sylpheed-claws/sylpheed-claws-1.9.13-r1.ebuild
deleted file mode 100644
index a80f1ee20134..000000000000
--- a/mail-client/sylpheed-claws/sylpheed-claws-1.9.13-r1.ebuild
+++ /dev/null
@@ -1,162 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/sylpheed-claws/sylpheed-claws-1.9.13-r1.ebuild,v 1.6 2005/10/22 13:27:00 genone Exp $
-
-IUSE="nls gnome dillo crypt spell ssl ldap ipv6 pda clamav xface kde imap spamassassin doc"
-
-inherit eutils
-
-DESCRIPTION="Bleeding edge version of Sylpheed"
-HOMEPAGE="http://claws.sylpheed.org"
-
-if [ -n "${P/*_rc*/}" ]; then
-	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-else
-	MY_P="${P/_/-}"
-	S="${WORKDIR}/${MY_P}"
-	SRC_URI="http://claws.sylpheed.org/snapshots/${MY_P}.tar.bz2"
-fi
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-
-COMMONDEPEND=">=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.4 )
-	dillo? ( www-client/dillo )
-	spell? ( virtual/aspell-dict )
-	clamav? ( app-antivirus/clamav )
-	nls? ( >=sys-devel/gettext-0.12 )
-	kde? ( kde-base/kdelibs )
-	imap? ( >=net-libs/libetpan-0.38 )
-	gnome? ( >=gnome-base/libgnomeprintui-2.2 )
-	x11-libs/startup-notification
-	!mail-client/sylpheed-claws-pgpinline"	# included in the main package now
-
-DEPEND="${COMMONDEPEND}
-	xface? ( >=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"
-
-src_unpack() {
-	unpack ${A}
-
-	# Only install local manual/FAQ if USE=doc, and honor $LINGUAS:
-	local docdir lang languages
-	for docdir in faq manual ; do
-		cd "${S}/doc/${docdir}"
-		languages=""
-		# filter languages that are in $LINGUAS
-		for lang in ${LINGUAS} ; do
-			if [[ -d "${lang}" ]] ; then
-				languages="${languages} ${lang}"
-			fi
-		done
-		# Fix SUBDIRS (will be empty if -doc)
-		if use doc && [ -n "${languages}" ]; then
-			sed -i -e "/^SUBDIRS =/s:= .*:= ${languages}:" Makefile.in
-		elif ! use doc; then
-			sed -i -e "/^SUBDIRS =/s:= .*:= :" Makefile.in
-		fi
-	done
-}
-
-src_compile() {
-	local myconf
-
-	# Optional features
-	myconf="${myconf} `use_enable gnome gnomeprint`"
-	myconf="${myconf} `use_enable imap libetpan`"
-	myconf="${myconf} `use_enable ipv6`"
-	myconf="${myconf} `use_enable ldap`"
-	myconf="${myconf} `use_enable nls`"
-	myconf="${myconf} `use_enable pda jpilot`"
-	myconf="${myconf} `use_enable spell aspell`"
-	myconf="${myconf} `use_enable ssl openssl`"
-	myconf="${myconf} `use_enable xface compface`"
-
-	# Optional plugins
-	myconf="${myconf} `use_enable clamav clamav-plugin`"
-	myconf="${myconf} `use_enable crypt pgpmime-plugin`"
-	myconf="${myconf} `use_enable crypt pgpinline-plugin`"
-	myconf="${myconf} `use_enable crypt pgpcore-plugin`"
-	myconf="${myconf} `use_enable dillo dillo-viewer-plugin`"
-	myconf="${myconf} `use_enable spamassassin spamassassin-plugin`"
-
-	econf \
-		--program-suffix=-claws \
-		--with-config-dir=.sylpheed-claws \
-		--enable-startup-notification \
-		--enable-trayicon-plugin \
-		${myconf} || die "./configure failed"
-
-	emake || die
-
-	# build the extra tools
-	cd ${S}/tools
-	emake || die
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-
-	dodir /usr/share/applications
-	sed -i -e 's:Exec=sylpheed:Exec=sylpheed-claws:' ${D}/usr/share/gnome/apps/Internet/sylpheed-claws.desktop
-	mv ${D}/usr/share/{gnome/apps/Internet,applications}/sylpheed-claws.desktop
-	rm -rf ${D}/usr/share/gnome
-
-	# Makefile install sylpheed-claws.png in /usr/share/icons/hicolor/48x48/apps
-	# => also install it in /usr/share/pixmaps for other desktop envs
-	# => also install higher resolution icons in /usr/share/icons/hicolor/...
-	insinto /usr/share/pixmaps
-	doins sylpheed-claws.png
-	local resdir
-	for res in 64x64 128x128 ; do
-		resdir="/usr/share/icons/hicolor/${res}/apps"
-		insinto ${resdir}
-		newins sylpheed-claws-${res}.png sylpheed-claws.png
-	done
-
-	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
-	doexe tb2sylpheed update-po uudec gpg-sign-syl
-
-	if use kde; then
-		local kdeprefix="$(kde-config --prefix)"
-		local servicescript="sylpheed-kdeservicemenu.pl"
-		cd ${S}/tools/kdeservicemenu
-		for f in sylpheed-attach-files.desktop sylpheed-compress-attach.desktop; do
-			sed -e "s:SCRIPT_PATH:${kdeprefix}/bin/${servicescript}:g" template_$f > $f
-			install -m 0644 $f ${D}/${kdeprefix}/share/apps/konqueror/servicemenus/$f
-		done
-		insinto ${kdeprefix}/bin
-		doexe ${servicescript}
-	fi
-}
-
-pkg_postinst() {
-	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."
-	ewarn
-	ewarn "You have to re-emerge or update all external plugins"
-	ewarn
-	epause 5
-	ebeep 3
-}
diff --git a/mail-client/sylpheed-claws/sylpheed-claws-1.9.99.ebuild b/mail-client/sylpheed-claws/sylpheed-claws-1.9.99.ebuild
deleted file mode 100644
index 7c8c30324e01..000000000000
--- a/mail-client/sylpheed-claws/sylpheed-claws-1.9.99.ebuild
+++ /dev/null
@@ -1,156 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/sylpheed-claws/sylpheed-claws-1.9.99.ebuild,v 1.1 2005/11/07 05:12:55 genone Exp $
-
-IUSE="gnome dillo crypt spell ssl ldap ipv6 pda clamav xface kde imap spamassassin doc"
-
-inherit eutils
-
-DESCRIPTION="Bleeding edge version of Sylpheed"
-HOMEPAGE="http://claws.sylpheed.org"
-
-if [ -n "${P/*_rc*/}" ]; then
-	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-else
-	MY_P="${P/_/-}"
-	S="${WORKDIR}/${MY_P}"
-	SRC_URI="http://claws.sylpheed.org/snapshots/${MY_P}.tar.bz2"
-fi
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-
-COMMONDEPEND=">=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.4 )
-	dillo? ( www-client/dillo )
-	spell? ( virtual/aspell-dict )
-	clamav? ( app-antivirus/clamav )
-	kde? ( kde-base/kdelibs )
-	imap? ( >=net-libs/libetpan-0.38 )
-	gnome? ( >=gnome-base/libgnomeprintui-2.2 )
-	x11-libs/startup-notification
-	!mail-client/sylpheed-claws-pgpinline"	# included in the main package now
-
-DEPEND="${COMMONDEPEND}
-	xface? ( >=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"
-
-src_unpack() {
-	unpack ${A}
-
-	# Only install local manual/FAQ if USE=doc, and honor $LINGUAS:
-	local docdir lang languages
-	for docdir in faq manual ; do
-		cd "${S}/doc/${docdir}"
-		languages=""
-		# filter languages that are in $LINGUAS
-		for lang in ${LINGUAS} ; do
-			if [[ -d "${lang}" ]] ; then
-				languages="${languages} ${lang}"
-			fi
-		done
-		# Fix SUBDIRS (will be empty if -doc)
-		if use doc && [ -n "${languages}" ]; then
-			sed -i -e "/^SUBDIRS =/s:= .*:= ${languages}:" Makefile.in
-		elif ! use doc; then
-			sed -i -e "/^SUBDIRS =/s:= .*:= :" Makefile.in
-		fi
-	done
-}
-
-src_compile() {
-	local myconf
-
-	# Optional features
-	myconf="${myconf} `use_enable gnome gnomeprint`"
-	myconf="${myconf} `use_enable imap libetpan`"
-	myconf="${myconf} `use_enable ipv6`"
-	myconf="${myconf} `use_enable ldap`"
-	myconf="${myconf} `use_enable pda jpilot`"
-	myconf="${myconf} `use_enable spell aspell`"
-	myconf="${myconf} `use_enable ssl openssl`"
-	myconf="${myconf} `use_enable xface compface`"
-
-	# Optional plugins
-	myconf="${myconf} `use_enable clamav clamav-plugin`"
-	myconf="${myconf} `use_enable crypt pgpmime-plugin`"
-	myconf="${myconf} `use_enable crypt pgpinline-plugin`"
-	myconf="${myconf} `use_enable crypt pgpcore-plugin`"
-	myconf="${myconf} `use_enable dillo dillo-viewer-plugin`"
-	myconf="${myconf} `use_enable spamassassin spamassassin-plugin`"
-
-	econf \
-		--enable-startup-notification \
-		--enable-trayicon-plugin \
-		${myconf} || die "./configure failed"
-
-	emake || die
-
-	# build the extra tools
-	cd ${S}/tools
-	emake || die
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-
-	# wait for upstream: move manpage
-	mv ${D}/usr/share/man/man1/sylpheed{,-claws}.1
-
-	dodir /usr/share/applications
-	mv ${D}/usr/share/{gnome/apps/Internet,applications}/sylpheed-claws.desktop
-	rm -rf ${D}/usr/share/gnome
-
-	# Makefile install sylpheed-claws.png in /usr/share/icons/hicolor/48x48/apps
-	# => also install it in /usr/share/pixmaps for other desktop envs
-	# => also install higher resolution icons in /usr/share/icons/hicolor/...
-	insinto /usr/share/pixmaps
-	doins sylpheed-claws.png
-	local resdir
-	for res in 64x64 128x128 ; do
-		resdir="/usr/share/icons/hicolor/${res}/apps"
-		insinto ${resdir}
-		newins sylpheed-claws-${res}.png sylpheed-claws.png
-	done
-
-	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
-	doexe tb2sylpheed update-po uudec
-
-	if use kde; then
-		local kdeprefix="$(kde-config --prefix)"
-		local servicescript="sylpheed-kdeservicemenu.pl"
-		cd ${S}/tools/kdeservicemenu
-		for f in sylpheed-attach-files.desktop sylpheed-compress-attach.desktop; do
-			sed -e "s:SCRIPT_PATH:${kdeprefix}/bin/${servicescript}:g" template_$f > $f
-			install -m 0644 $f ${D}/${kdeprefix}/share/apps/konqueror/servicemenus/$f
-		done
-		insinto ${kdeprefix}/bin
-		doexe ${servicescript}
-	fi
-}
-
-pkg_postinst() {
-	ewarn
-	ewarn "You have to re-emerge or update all external plugins"
-	ewarn
-	epause 5
-	ebeep 3
-}
diff --git a/mail-client/sylpheed-claws/sylpheed-claws-1.9.99_rc2.ebuild b/mail-client/sylpheed-claws/sylpheed-claws-1.9.99_rc2.ebuild
deleted file mode 100644
index cb1d4643ec10..000000000000
--- a/mail-client/sylpheed-claws/sylpheed-claws-1.9.99_rc2.ebuild
+++ /dev/null
@@ -1,162 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/sylpheed-claws/sylpheed-claws-1.9.99_rc2.ebuild,v 1.1 2005/10/22 13:27:00 genone Exp $
-
-IUSE="nls gnome dillo crypt spell ssl ldap ipv6 pda clamav xface kde imap spamassassin doc"
-
-inherit eutils
-
-DESCRIPTION="Bleeding edge version of Sylpheed"
-HOMEPAGE="http://claws.sylpheed.org"
-
-if [ -n "${P/*_rc*/}" ]; then
-	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-else
-	MY_P="${P/_/-}"
-	S="${WORKDIR}/${MY_P}"
-	SRC_URI="http://claws.sylpheed.org/snapshots/${MY_P}.tar.bz2"
-fi
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-
-COMMONDEPEND=">=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.4 )
-	dillo? ( www-client/dillo )
-	spell? ( virtual/aspell-dict )
-	clamav? ( app-antivirus/clamav )
-	nls? ( >=sys-devel/gettext-0.12 )
-	kde? ( kde-base/kdelibs )
-	imap? ( >=net-libs/libetpan-0.38 )
-	gnome? ( >=gnome-base/libgnomeprintui-2.2 )
-	x11-libs/startup-notification
-	!mail-client/sylpheed-claws-pgpinline"	# included in the main package now
-
-DEPEND="${COMMONDEPEND}
-	xface? ( >=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"
-
-src_unpack() {
-	unpack ${A}
-
-	# Only install local manual/FAQ if USE=doc, and honor $LINGUAS:
-	local docdir lang languages
-	for docdir in faq manual ; do
-		cd "${S}/doc/${docdir}"
-		languages=""
-		# filter languages that are in $LINGUAS
-		for lang in ${LINGUAS} ; do
-			if [[ -d "${lang}" ]] ; then
-				languages="${languages} ${lang}"
-			fi
-		done
-		# Fix SUBDIRS (will be empty if -doc)
-		if use doc && [ -n "${languages}" ]; then
-			sed -i -e "/^SUBDIRS =/s:= .*:= ${languages}:" Makefile.in
-		elif ! use doc; then
-			sed -i -e "/^SUBDIRS =/s:= .*:= :" Makefile.in
-		fi
-	done
-}
-
-src_compile() {
-	local myconf
-
-	# Optional features
-	myconf="${myconf} `use_enable gnome gnomeprint`"
-	myconf="${myconf} `use_enable imap libetpan`"
-	myconf="${myconf} `use_enable ipv6`"
-	myconf="${myconf} `use_enable ldap`"
-	myconf="${myconf} `use_enable nls`"
-	myconf="${myconf} `use_enable pda jpilot`"
-	myconf="${myconf} `use_enable spell aspell`"
-	myconf="${myconf} `use_enable ssl openssl`"
-	myconf="${myconf} `use_enable xface compface`"
-
-	# Optional plugins
-	myconf="${myconf} `use_enable clamav clamav-plugin`"
-	myconf="${myconf} `use_enable crypt pgpmime-plugin`"
-	myconf="${myconf} `use_enable crypt pgpinline-plugin`"
-	myconf="${myconf} `use_enable crypt pgpcore-plugin`"
-	myconf="${myconf} `use_enable dillo dillo-viewer-plugin`"
-	myconf="${myconf} `use_enable spamassassin spamassassin-plugin`"
-
-	econf \
-		--program-suffix=-claws \
-		--with-config-dir=.sylpheed-claws \
-		--enable-startup-notification \
-		--enable-trayicon-plugin \
-		${myconf} || die "./configure failed"
-
-	emake || die
-
-	# build the extra tools
-	cd ${S}/tools
-	emake || die
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-
-	dodir /usr/share/applications
-	sed -i -e 's:Exec=sylpheed:Exec=sylpheed-claws:' ${D}/usr/share/gnome/apps/Internet/sylpheed-claws.desktop
-	mv ${D}/usr/share/{gnome/apps/Internet,applications}/sylpheed-claws.desktop
-	rm -rf ${D}/usr/share/gnome
-
-	# Makefile install sylpheed-claws.png in /usr/share/icons/hicolor/48x48/apps
-	# => also install it in /usr/share/pixmaps for other desktop envs
-	# => also install higher resolution icons in /usr/share/icons/hicolor/...
-	insinto /usr/share/pixmaps
-	doins sylpheed-claws.png
-	local resdir
-	for res in 64x64 128x128 ; do
-		resdir="/usr/share/icons/hicolor/${res}/apps"
-		insinto ${resdir}
-		newins sylpheed-claws-${res}.png sylpheed-claws.png
-	done
-
-	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
-	doexe tb2sylpheed update-po uudec gpg-sign-syl
-
-	if use kde; then
-		local kdeprefix="$(kde-config --prefix)"
-		local servicescript="sylpheed-kdeservicemenu.pl"
-		cd ${S}/tools/kdeservicemenu
-		for f in sylpheed-attach-files.desktop sylpheed-compress-attach.desktop; do
-			sed -e "s:SCRIPT_PATH:${kdeprefix}/bin/${servicescript}:g" template_$f > $f
-			install -m 0644 $f ${D}/${kdeprefix}/share/apps/konqueror/servicemenus/$f
-		done
-		insinto ${kdeprefix}/bin
-		doexe ${servicescript}
-	fi
-}
-
-pkg_postinst() {
-	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."
-	ewarn
-	ewarn "You have to re-emerge or update all external plugins"
-	ewarn
-	epause 5
-	ebeep 3
-}