Version bump.

(Portage version: 2.1.3.18)

14 files changed, 35 insertions, 782 deletions

diff --git a/mail-client/claws-mail/ChangeLog b/mail-client/claws-mail/ChangeLog
index c4932ae346f6..e671c5a90310 100644
--- a/mail-client/claws-mail/ChangeLog
+++ b/mail-client/claws-mail/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for mail-client/claws-mail
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/claws-mail/ChangeLog,v 1.48 2007/10/02 16:37:03 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/claws-mail/ChangeLog,v 1.49 2007/11/29 22:31:26 ticho Exp $
+
+*claws-mail-3.1.0 (29 Nov 2007)
+
+  29 Nov 2007; Andrej Kacian <ticho@gentoo.org> +claws-mail-3.1.0.ebuild:
+  Version bump.
 
 *claws-mail-3.0.2 (02 Oct 2007)
 
diff --git a/mail-client/claws-mail/claws-mail-2.10.0.ebuild b/mail-client/claws-mail/claws-mail-2.10.0.ebuild
deleted file mode 100644
index 849f4aedc54f..000000000000
--- a/mail-client/claws-mail/claws-mail-2.10.0.ebuild
+++ /dev/null
@@ -1,179 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/claws-mail/claws-mail-2.10.0.ebuild,v 1.2 2007/08/03 20:19:45 genone Exp $
-
-IUSE="gnome dillo crypt spell ssl ldap ipv6 pda clamav xface kde imap spamassassin doc startup-notification bogofilter"
-
-inherit eutils
-
-DESCRIPTION="Claws-Mail is an email client (and news reader) based on GTK+"
-HOMEPAGE="http://www.claws-mail.org"
-
-if [ -n "${P/*_rc*/}" ]; then
-	SRC_URI="mirror://sourceforge/sylpheed-claws/${P}.tar.bz2"
-else
-	MY_P="${P/_/-}"
-	S="${WORKDIR}/${MY_P}"
-	SRC_URI="http://www.claws-mail.org/snapshots/${MY_P}.tar.bz2"
-fi
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-
-COMMONDEPEND=">=x11-libs/gtk+-2.6
-	pda? ( >=app-pda/jpilot-0.99 )
-	ssl? ( >=dev-libs/openssl-0.9.7 )
-	ldap? ( >=net-nds/openldap-2.0.7 )
-	crypt? ( >=app-crypt/gpgme-1.1.1 )
-	dillo? ( www-client/dillo )
-	spell? ( virtual/aspell-dict )
-	clamav? ( app-antivirus/clamav )
-	kde? ( kde-base/kdelibs )
-	imap? ( >=net-libs/libetpan-0.49 )
-	gnome? ( >=gnome-base/libgnomeprintui-2.2 )
-	startup-notification? ( x11-libs/startup-notification )
-	bogofilter? ( mail-filter/bogofilter )
-	!<mail-client/sylpheed-claws-2.6.1"	# old name, block as user hint and due to some file collision
-
-DEPEND="${COMMONDEPEND}
-	xface? ( >=media-libs/compface-1.4 )
-	>=sys-apps/sed-4
-	dev-util/pkgconfig"
-
-RDEPEND="${COMMONDEPEND}
-	app-misc/mime-types
-	x11-misc/shared-mime-info"
-
-PLUGIN_NAMES="acpi-notifier att-remover attachwarner cachesaver etpan-privacy fetchinfo gtkhtml maildir mailmbox newmail notification pdf-viewer perl rssyl smime synce vcalendar"
-
-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`"
-	myconf="${myconf} `use_enable doc manual`"
-	myconf="${myconf} `use_enable startup-notification`"
-
-	# 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`"
-	myconf="${myconf} `use_enable bogofilter bogofilter-plugin`"
-
-	econf \
-		--enable-trayicon-plugin \
-		--disable-maemo \
-		${myconf} || die "./configure failed"
-
-	emake || die
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-
-	# Makefile install claws-mail.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 ${PN}.png || die
-	local res resdir
-	for res in 64x64 128x128 ; do
-		resdir="/usr/share/icons/hicolor/${res}/apps"
-		insinto ${resdir}
-		newins ${PN}-${res}.png ${PN}.png || die
-	done
-
-	dodoc AUTHORS ChangeLog* INSTALL* NEWS README* TODO*
-	docinto tools
-	dodoc tools/README*
-
-	insinto /usr/share/applications
-	doins ${PN}.desktop
-
-	einfo "Installing extra tools"
-	cd ${S}/tools
-	exeinto /usr/lib/${PN}/tools
-	doexe *.pl *.py *.rc *.conf *.sh || die
-	doexe tb2claws-mail update-po uudec uuooffice || die
-
-	if use kde; then
-		einfo "Installing kde service scripts"
-		local kdeprefix="$(kde-config --prefix)"
-		local servicescript="${PN}-kdeservicemenu.pl"
-		local desktopfile="${PN}-attach-files.desktop"
-		cd ${S}/tools/kdeservicemenu
-		sed -i -e "s:SCRIPT_PATH:${kdeprefix}/bin/${servicescript}:g" \
-			template_${desktopfile}
-		dodir /usr/share/apps/konqueror/servicemenus
-		insopts -m 0644
-		insinto /usr/share/apps/konqueror/servicemenus
-		newins template_${desktopfile} ${desktopfile} || die
-		dodir ${kdeprefix}/bin
-		insopts -m 755
-		exeinto ${kdeprefix}/bin
-		doexe ${servicescript} || die
-	fi
-
-	# kill useless plugin files
-	rm -f ${D}/usr/lib*/${PN}/plugins/*.{la,a}
-}
-
-pkg_postinst() {
-	gtk-update-icon-cache -f -t ${ROOT}/usr/share/icons/hicolor
-
-	UPDATE_PLUGINS=""
-	RENAME_PLUGINS=""
-	for x in ${PLUGIN_NAMES}; do
-		has_version mail-client/${PN}-$x && UPDATE_PLUGINS="${UPDATE_PLUGINS} $x"
-		has_version mail-client/sylpheed-claws-$x && RENAME_PLUGINS="${RENAME_PLUGINS} $x"
-	done
-	if [ -n "${RENAME_PLUGINS}" ]; then
-		elog
-		elog "The following sylpheed-claws plugins were found on your system:"
-		elog
-		for x in ${RENAME_PLUGINS}; do
-			elog "    mail-client/sylpheed-claws-$x"
-		done
-		elog
-		elog "If you want to continue using those you need to merge their "
-		elog "renamed counterparts:"
-		elog
-		for x in ${RENAME_PLUGINS}; do
-			elog "    mail-client/${PN}-$x"
-		done
-		elog
-	fi
-	if [ -n "${UPDATE_PLUGINS}" ]; then
-		elog
-		elog "You have to re-emerge or update the following plugins:"
-		elog
-		for x in ${UPDATE_PLUGINS}; do
-			elog "    mail-client/${PN}-$x"
-		done
-		elog
-	fi
-	if [ -n "${RENAME_PLUGINS}${UPDATE_PLUGINS}" ]; then
-		elog
-		elog "You can use"
-		elog "    /bin/bash ${FILESDIR}/plugins-rebuild.sh"
-		elog "to automatically handle this."
-		elog
-		epause 5
-		ebeep 3
-	fi
-}
-
-pkg_postrm() {
-	gtk-update-icon-cache -f -t /usr/share/icons/hicolor
-}
diff --git a/mail-client/claws-mail/claws-mail-2.9.1.ebuild b/mail-client/claws-mail/claws-mail-2.9.1.ebuild
deleted file mode 100644
index c8a770bc8071..000000000000
--- a/mail-client/claws-mail/claws-mail-2.9.1.ebuild
+++ /dev/null
@@ -1,192 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/claws-mail/claws-mail-2.9.1.ebuild,v 1.11 2007/06/24 20:19:51 ticho Exp $
-
-IUSE="gnome dillo crypt spell ssl ldap ipv6 pda clamav xface kde imap spamassassin doc startup-notification bogofilter"
-
-inherit eutils
-
-DESCRIPTION="Claws-Mail is an email client (and news reader) based on GTK+"
-HOMEPAGE="http://www.claws-mail.org"
-
-if [ -n "${P/*_rc*/}" ]; then
-	SRC_URI="mirror://sourceforge/sylpheed-claws/${P}.tar.bz2"
-else
-	MY_P="${P/_/-}"
-	S="${WORKDIR}/${MY_P}"
-	SRC_URI="http://www.claws-mail.org/snapshots/${MY_P}.tar.bz2"
-fi
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86 ~x86-fbsd"
-
-COMMONDEPEND=">=x11-libs/gtk+-2.6
-	pda? ( >=app-pda/jpilot-0.99 )
-	ssl? ( >=dev-libs/openssl-0.9.7 )
-	ldap? ( >=net-nds/openldap-2.0.7 )
-	crypt? ( >=app-crypt/gpgme-1.1.1 )
-	dillo? ( www-client/dillo )
-	spell? ( virtual/aspell-dict )
-	clamav? ( app-antivirus/clamav )
-	kde? ( kde-base/kdelibs )
-	imap? ( >=net-libs/libetpan-0.49 )
-	gnome? ( >=gnome-base/libgnomeprintui-2.2 )
-	startup-notification? ( x11-libs/startup-notification )
-	bogofilter? ( mail-filter/bogofilter )
-	!<mail-client/sylpheed-claws-2.6.1"	# old name, block as user hint and due to some file collision
-
-DEPEND="${COMMONDEPEND}
-	xface? ( >=media-libs/compface-1.4 )
-	>=sys-apps/sed-4
-	dev-util/pkgconfig"
-
-RDEPEND="${COMMONDEPEND}
-	app-misc/mime-types
-	x11-misc/shared-mime-info
-	app-crypt/pinentry"
-
-PLUGIN_NAMES="acpi-notifier att-remover cachesaver etpan-privacy fetchinfo gtkhtml maildir mailmbox newmail notification pdf-viewer perl rssyl smime synce vcalendar"
-
-pkg_setup() {
-	# we have to make sure that pinentry has gtk support for GPG support
-	if use crypt && ! built_with_use --missing true -o app-crypt/pinentry gtk qt3; then
-		eerror "You need to merge app-crypt/pinentry with USE=gtk or USE=qt3"
-		eerror "for working GPG support. You have the following options:"
-		eerror " - remerge app-crypt/pinentry with USE=gtk"
-		eerror " - remerge app-crypt/pinentry with USE=qt3"
-		eerror " - disable GPG support by setting USE=-crypt for this package"
-		die "missing gtk/qt support in app-crypt/pinentry"
-	fi
-}
-
-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`"
-	myconf="${myconf} `use_enable doc manual`"
-	myconf="${myconf} `use_enable startup-notification`"
-
-	# 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`"
-	myconf="${myconf} `use_enable bogofilter bogofilter-plugin`"
-
-	econf \
-		--enable-trayicon-plugin \
-		--disable-maemo \
-		${myconf} || die "./configure failed"
-
-	emake || die
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-
-	# Makefile install claws-mail.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 ${PN}.png || die
-	local res resdir
-	for res in 64x64 128x128 ; do
-		resdir="/usr/share/icons/hicolor/${res}/apps"
-		insinto ${resdir}
-		newins ${PN}-${res}.png ${PN}.png || die
-	done
-
-	dodoc AUTHORS ChangeLog* INSTALL* NEWS README* TODO*
-	docinto tools
-	dodoc tools/README*
-
-	insinto /usr/share/applications
-	doins ${PN}.desktop
-
-	einfo "Installing extra tools"
-	cd ${S}/tools
-	exeinto /usr/lib/${PN}/tools
-	doexe *.pl *.py *.rc *.conf *.sh || die
-	doexe tb2claws-mail update-po uudec uuooffice || die
-
-	if use kde; then
-		einfo "Installing kde service scripts"
-		local kdeprefix="$(kde-config --prefix)"
-		local servicescript="${PN}-kdeservicemenu.pl"
-		local desktopfile="${PN}-attach-files.desktop"
-		cd ${S}/tools/kdeservicemenu
-		sed -i -e "s:SCRIPT_PATH:${kdeprefix}/bin/${servicescript}:g" \
-			template_${desktopfile}
-		dodir /usr/share/apps/konqueror/servicemenus
-		insopts -m 0644
-		insinto /usr/share/apps/konqueror/servicemenus
-		newins template_${desktopfile} ${desktopfile} || die
-		dodir ${kdeprefix}/bin
-		insopts -m 755
-		exeinto ${kdeprefix}/bin
-		doexe ${servicescript} || die
-	fi
-
-	# kill useless plugin files
-	rm -f ${D}/usr/lib*/${PN}/plugins/*.{la,a}
-}
-
-pkg_postinst() {
-	gtk-update-icon-cache -f -t ${ROOT}/usr/share/icons/hicolor
-
-	UPDATE_PLUGINS=""
-	RENAME_PLUGINS=""
-	for x in ${PLUGIN_NAMES}; do
-		has_version mail-client/${PN}-$x && UPDATE_PLUGINS="${UPDATE_PLUGINS} $x"
-		has_version mail-client/sylpheed-claws-$x && RENAME_PLUGINS="${RENAME_PLUGINS} $x"
-	done
-	if [ -n "${RENAME_PLUGINS}" ]; then
-		elog
-		elog "The following sylpheed-claws plugins were found on your system:"
-		elog
-		for x in ${RENAME_PLUGINS}; do
-			elog "    mail-client/sylpheed-claws-$x"
-		done
-		elog
-		elog "If you want to continue using those you need to merge their "
-		elog "renamed counterparts:"
-		elog
-		for x in ${RENAME_PLUGINS}; do
-			elog "    mail-client/${PN}-$x"
-		done
-		elog
-	fi
-	if [ -n "${UPDATE_PLUGINS}" ]; then
-		elog
-		elog "You have to re-emerge or update the following plugins:"
-		elog
-		for x in ${UPDATE_PLUGINS}; do
-			elog "    mail-client/${PN}-$x"
-		done
-		elog
-	fi
-	if [ -n "${RENAME_PLUGINS}${UPDATE_PLUGINS}" ]; then
-		elog
-		elog "You can use"
-		elog "    /bin/bash ${FILESDIR}/plugins-rebuild.sh"
-		elog "to automatically handle this."
-		elog
-		epause 5
-		ebeep 3
-	fi
-}
-
-pkg_postrm() {
-	gtk-update-icon-cache -f -t /usr/share/icons/hicolor
-}
diff --git a/mail-client/claws-mail/claws-mail-2.9.2.ebuild b/mail-client/claws-mail/claws-mail-2.9.2.ebuild
deleted file mode 100644
index efebff6ba278..000000000000
--- a/mail-client/claws-mail/claws-mail-2.9.2.ebuild
+++ /dev/null
@@ -1,192 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/claws-mail/claws-mail-2.9.2.ebuild,v 1.3 2007/06/24 20:19:51 ticho Exp $
-
-IUSE="gnome dillo crypt spell ssl ldap ipv6 pda clamav xface kde imap spamassassin doc startup-notification bogofilter"
-
-inherit eutils
-
-DESCRIPTION="Claws-Mail is an email client (and news reader) based on GTK+"
-HOMEPAGE="http://www.claws-mail.org"
-
-if [ -n "${P/*_rc*/}" ]; then
-	SRC_URI="mirror://sourceforge/sylpheed-claws/${P}.tar.bz2"
-else
-	MY_P="${P/_/-}"
-	S="${WORKDIR}/${MY_P}"
-	SRC_URI="http://www.claws-mail.org/snapshots/${MY_P}.tar.bz2"
-fi
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-
-COMMONDEPEND=">=x11-libs/gtk+-2.6
-	pda? ( >=app-pda/jpilot-0.99 )
-	ssl? ( >=dev-libs/openssl-0.9.7 )
-	ldap? ( >=net-nds/openldap-2.0.7 )
-	crypt? ( >=app-crypt/gpgme-1.1.1 )
-	dillo? ( www-client/dillo )
-	spell? ( virtual/aspell-dict )
-	clamav? ( app-antivirus/clamav )
-	kde? ( kde-base/kdelibs )
-	imap? ( >=net-libs/libetpan-0.49 )
-	gnome? ( >=gnome-base/libgnomeprintui-2.2 )
-	startup-notification? ( x11-libs/startup-notification )
-	bogofilter? ( mail-filter/bogofilter )
-	!<mail-client/sylpheed-claws-2.6.1"	# old name, block as user hint and due to some file collision
-
-DEPEND="${COMMONDEPEND}
-	xface? ( >=media-libs/compface-1.4 )
-	>=sys-apps/sed-4
-	dev-util/pkgconfig
-	app-crypt/pinentry"
-
-RDEPEND="${COMMONDEPEND}
-	app-misc/mime-types
-	x11-misc/shared-mime-info"
-
-PLUGIN_NAMES="acpi-notifier att-remover cachesaver etpan-privacy fetchinfo gtkhtml maildir mailmbox newmail notification pdf-viewer perl rssyl smime synce vcalendar"
-
-pkg_setup() {
-	# we have to make sure that pinentry has gtk support for GPG support
-	if use crypt && ! built_with_use --missing true -o app-crypt/pinentry gtk qt3; then
-		eerror "You need to merge app-crypt/pinentry with USE=gtk or USE=qt3"
-		eerror "for working GPG support. You have the following options:"
-		eerror " - remerge app-crypt/pinentry with USE=gtk"
-		eerror " - remerge app-crypt/pinentry with USE=qt3"
-		eerror " - disable GPG support by setting USE=-crypt for this package"
-		die "missing gtk/qt support in app-crypt/pinentry"
-	fi
-}
-
-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`"
-	myconf="${myconf} `use_enable doc manual`"
-	myconf="${myconf} `use_enable startup-notification`"
-
-	# 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`"
-	myconf="${myconf} `use_enable bogofilter bogofilter-plugin`"
-
-	econf \
-		--enable-trayicon-plugin \
-		--disable-maemo \
-		${myconf} || die "./configure failed"
-
-	emake || die
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-
-	# Makefile install claws-mail.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 ${PN}.png || die
-	local res resdir
-	for res in 64x64 128x128 ; do
-		resdir="/usr/share/icons/hicolor/${res}/apps"
-		insinto ${resdir}
-		newins ${PN}-${res}.png ${PN}.png || die
-	done
-
-	dodoc AUTHORS ChangeLog* INSTALL* NEWS README* TODO*
-	docinto tools
-	dodoc tools/README*
-
-	insinto /usr/share/applications
-	doins ${PN}.desktop
-
-	einfo "Installing extra tools"
-	cd ${S}/tools
-	exeinto /usr/lib/${PN}/tools
-	doexe *.pl *.py *.rc *.conf *.sh || die
-	doexe tb2claws-mail update-po uudec uuooffice || die
-
-	if use kde; then
-		einfo "Installing kde service scripts"
-		local kdeprefix="$(kde-config --prefix)"
-		local servicescript="${PN}-kdeservicemenu.pl"
-		local desktopfile="${PN}-attach-files.desktop"
-		cd ${S}/tools/kdeservicemenu
-		sed -i -e "s:SCRIPT_PATH:${kdeprefix}/bin/${servicescript}:g" \
-			template_${desktopfile}
-		dodir /usr/share/apps/konqueror/servicemenus
-		insopts -m 0644
-		insinto /usr/share/apps/konqueror/servicemenus
-		newins template_${desktopfile} ${desktopfile} || die
-		dodir ${kdeprefix}/bin
-		insopts -m 755
-		exeinto ${kdeprefix}/bin
-		doexe ${servicescript} || die
-	fi
-
-	# kill useless plugin files
-	rm -f ${D}/usr/lib*/${PN}/plugins/*.{la,a}
-}
-
-pkg_postinst() {
-	gtk-update-icon-cache -f -t ${ROOT}/usr/share/icons/hicolor
-
-	UPDATE_PLUGINS=""
-	RENAME_PLUGINS=""
-	for x in ${PLUGIN_NAMES}; do
-		has_version mail-client/${PN}-$x && UPDATE_PLUGINS="${UPDATE_PLUGINS} $x"
-		has_version mail-client/sylpheed-claws-$x && RENAME_PLUGINS="${RENAME_PLUGINS} $x"
-	done
-	if [ -n "${RENAME_PLUGINS}" ]; then
-		elog
-		elog "The following sylpheed-claws plugins were found on your system:"
-		elog
-		for x in ${RENAME_PLUGINS}; do
-			elog "    mail-client/sylpheed-claws-$x"
-		done
-		elog
-		elog "If you want to continue using those you need to merge their "
-		elog "renamed counterparts:"
-		elog
-		for x in ${RENAME_PLUGINS}; do
-			elog "    mail-client/${PN}-$x"
-		done
-		elog
-	fi
-	if [ -n "${UPDATE_PLUGINS}" ]; then
-		elog
-		elog "You have to re-emerge or update the following plugins:"
-		elog
-		for x in ${UPDATE_PLUGINS}; do
-			elog "    mail-client/${PN}-$x"
-		done
-		elog
-	fi
-	if [ -n "${RENAME_PLUGINS}${UPDATE_PLUGINS}" ]; then
-		elog
-		elog "You can use"
-		elog "    /bin/bash ${FILESDIR}/plugins-rebuild.sh"
-		elog "to automatically handle this."
-		elog
-		epause 5
-		ebeep 3
-	fi
-}
-
-pkg_postrm() {
-	gtk-update-icon-cache -f -t /usr/share/icons/hicolor
-}
diff --git a/mail-client/claws-mail/claws-mail-3.0.0-r1.ebuild b/mail-client/claws-mail/claws-mail-3.0.0-r1.ebuild
deleted file mode 100644
index f0e35e48a073..000000000000
--- a/mail-client/claws-mail/claws-mail-3.0.0-r1.ebuild
+++ /dev/null
@@ -1,182 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/claws-mail/claws-mail-3.0.0-r1.ebuild,v 1.1 2007/09/16 20:11:56 ticho Exp $
-
-IUSE="bogofilter clamav crypt dillo doc gnome imap ipv6 kde ldap pda session spell ssl startup-notification xface"
-
-inherit eutils
-
-DESCRIPTION="Claws-Mail is an email client (and news reader) based on GTK+"
-HOMEPAGE="http://www.claws-mail.org"
-
-if [ -n "${P/*_rc*/}" ]; then
-	SRC_URI="mirror://sourceforge/sylpheed-claws/${P}.tar.bz2"
-else
-	MY_P="${P/_/-}"
-	S="${WORKDIR}/${MY_P}"
-	SRC_URI="http://www.claws-mail.org/snapshots/${MY_P}.tar.bz2"
-fi
-
-SLOT="0"
-LICENSE="GPL-3"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-
-COMMONDEPEND=">=x11-libs/gtk+-2.6
-	pda? ( >=app-pda/jpilot-0.99 )
-	ssl? ( >=dev-libs/openssl-0.9.7 )
-	ldap? ( >=net-nds/openldap-2.0.7 )
-	crypt? ( >=app-crypt/gpgme-1.1.1 )
-	dillo? ( www-client/dillo )
-	spell? ( virtual/aspell-dict )
-	clamav? ( app-antivirus/clamav )
-	kde? ( kde-base/kdelibs )
-	imap? ( >=net-libs/libetpan-0.49 )
-	gnome? ( >=gnome-base/libgnomeprintui-2.2 )
-	startup-notification? ( x11-libs/startup-notification )
-	bogofilter? ( mail-filter/bogofilter )
-	session? ( x11-libs/libSM
-			x11-libs/libICE )
-	!<mail-client/sylpheed-claws-2.6.1"	# old name, block as user hint and due to some file collision
-
-DEPEND="${COMMONDEPEND}
-	xface? ( >=media-libs/compface-1.4 )
-	>=sys-apps/sed-4
-	dev-util/pkgconfig"
-
-RDEPEND="${COMMONDEPEND}
-	app-misc/mime-types
-	x11-misc/shared-mime-info"
-
-PLUGIN_NAMES="acpi-notifier att-remover attachwarner cachesaver etpan-privacy fetchinfo gtkhtml maildir mailmbox newmail notification pdf-viewer perl rssyl smime synce vcalendar"
-
-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`"
-	myconf="${myconf} `use_enable doc manual`"
-	myconf="${myconf} `use_enable startup-notification`"
-	myconf="${myconf} `use_enable session libsm`"
-
-	# 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`"
-	myconf="${myconf} `use_enable bogofilter bogofilter-plugin`"
-
-	econf \
-		--enable-trayicon-plugin \
-		--disable-maemo \
-		${myconf} || die "./configure failed"
-
-	emake || die
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-
-	# Makefile install claws-mail.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 ${PN}.png || die
-	local res resdir
-	for res in 64x64 128x128 ; do
-		resdir="/usr/share/icons/hicolor/${res}/apps"
-		insinto ${resdir}
-		newins ${PN}-${res}.png ${PN}.png || die
-	done
-
-	dodoc AUTHORS ChangeLog* INSTALL* NEWS README* TODO*
-	docinto tools
-	dodoc tools/README*
-
-	insinto /usr/share/applications
-	doins ${PN}.desktop
-
-	einfo "Installing extra tools"
-	cd ${S}/tools
-	exeinto /usr/lib/${PN}/tools
-	doexe *.pl *.py *.rc *.conf *.sh || die
-	doexe tb2claws-mail update-po uudec uuooffice || die
-
-	if use kde; then
-		einfo "Installing kde service scripts"
-		local kdeprefix="$(kde-config --prefix)"
-		local servicescript="${PN}-kdeservicemenu.pl"
-		local desktopfile="${PN}-attach-files.desktop"
-		cd ${S}/tools/kdeservicemenu
-		sed -i -e "s:SCRIPT_PATH:${kdeprefix}/bin/${servicescript}:g" \
-			template_${desktopfile}
-		dodir /usr/share/apps/konqueror/servicemenus
-		insopts -m 0644
-		insinto /usr/share/apps/konqueror/servicemenus
-		newins template_${desktopfile} ${desktopfile} || die
-		dodir ${kdeprefix}/bin
-		insopts -m 755
-		exeinto ${kdeprefix}/bin
-		doexe ${servicescript} || die
-	fi
-
-	# kill useless plugin files
-	rm -f ${D}/usr/lib*/${PN}/plugins/*.{la,a}
-}
-
-pkg_postinst() {
-	gtk-update-icon-cache -f -t ${ROOT}/usr/share/icons/hicolor
-
-	UPDATE_PLUGINS=""
-	RENAME_PLUGINS=""
-	for x in ${PLUGIN_NAMES}; do
-		has_version mail-client/${PN}-$x && UPDATE_PLUGINS="${UPDATE_PLUGINS} $x"
-		has_version mail-client/sylpheed-claws-$x && RENAME_PLUGINS="${RENAME_PLUGINS} $x"
-	done
-	if [ -n "${RENAME_PLUGINS}" ]; then
-		elog
-		elog "The following sylpheed-claws plugins were found on your system:"
-		elog
-		for x in ${RENAME_PLUGINS}; do
-			elog "    mail-client/sylpheed-claws-$x"
-		done
-		elog
-		elog "If you want to continue using those you need to merge their "
-		elog "renamed counterparts:"
-		elog
-		for x in ${RENAME_PLUGINS}; do
-			elog "    mail-client/${PN}-$x"
-		done
-		elog
-	fi
-	if [ -n "${UPDATE_PLUGINS}" ]; then
-		elog
-		elog "You have to re-emerge or update the following plugins:"
-		elog
-		for x in ${UPDATE_PLUGINS}; do
-			elog "    mail-client/${PN}-$x"
-		done
-		elog
-	fi
-	if [ -n "${RENAME_PLUGINS}${UPDATE_PLUGINS}" ]; then
-		elog
-		elog "You can use"
-		elog "    /bin/bash ${FILESDIR}/plugins-rebuild.sh"
-		elog "to automatically handle this."
-		elog
-		epause 5
-		ebeep 3
-	fi
-}
-
-pkg_postrm() {
-	gtk-update-icon-cache -f -t /usr/share/icons/hicolor
-}
diff --git a/mail-client/claws-mail/claws-mail-3.0.0.ebuild b/mail-client/claws-mail/claws-mail-3.0.0.ebuild
index 13bd04d495b1..3158b12d6f73 100644
--- a/mail-client/claws-mail/claws-mail-3.0.0.ebuild
+++ b/mail-client/claws-mail/claws-mail-3.0.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/claws-mail/claws-mail-3.0.0.ebuild,v 1.8 2007/09/16 16:27:05 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/claws-mail/claws-mail-3.0.0.ebuild,v 1.9 2007/11/29 22:31:26 ticho Exp $
 
 IUSE="gnome dillo crypt spell ssl ldap ipv6 pda clamav xface kde imap spamassassin doc startup-notification bogofilter"
 
@@ -80,7 +80,7 @@ src_compile() {
 }
 
 src_install() {
-	make DESTDIR=${D} install || die
+	make DESTDIR="${D}" install || die
 
 	# Makefile install claws-mail.png in /usr/share/icons/hicolor/48x48/apps
 	# => also install it in /usr/share/pixmaps for other desktop envs
@@ -102,7 +102,7 @@ src_install() {
 	doins ${PN}.desktop
 
 	einfo "Installing extra tools"
-	cd ${S}/tools
+	cd "${S}"/tools
 	exeinto /usr/lib/${PN}/tools
 	doexe *.pl *.py *.rc *.conf *.sh || die
 	doexe tb2claws-mail update-po uudec uuooffice || die
@@ -112,7 +112,7 @@ src_install() {
 		local kdeprefix="$(kde-config --prefix)"
 		local servicescript="${PN}-kdeservicemenu.pl"
 		local desktopfile="${PN}-attach-files.desktop"
-		cd ${S}/tools/kdeservicemenu
+		cd "${S}"/tools/kdeservicemenu
 		sed -i -e "s:SCRIPT_PATH:${kdeprefix}/bin/${servicescript}:g" \
 			template_${desktopfile}
 		dodir /usr/share/apps/konqueror/servicemenus
@@ -126,11 +126,11 @@ src_install() {
 	fi
 
 	# kill useless plugin files
-	rm -f ${D}/usr/lib*/${PN}/plugins/*.{la,a}
+	rm -f "${D}"/usr/lib*/${PN}/plugins/*.{la,a}
 }
 
 pkg_postinst() {
-	gtk-update-icon-cache -f -t ${ROOT}/usr/share/icons/hicolor
+	gtk-update-icon-cache -f -t "${ROOT}"/usr/share/icons/hicolor
 
 	UPDATE_PLUGINS=""
 	RENAME_PLUGINS=""
diff --git a/mail-client/claws-mail/claws-mail-3.0.2.ebuild b/mail-client/claws-mail/claws-mail-3.0.2.ebuild
index 2fa4129ce4ca..b8acd9bf3c20 100644
--- a/mail-client/claws-mail/claws-mail-3.0.2.ebuild
+++ b/mail-client/claws-mail/claws-mail-3.0.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/claws-mail/claws-mail-3.0.2.ebuild,v 1.2 2007/10/03 13:49:23 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/claws-mail/claws-mail-3.0.2.ebuild,v 1.3 2007/11/29 22:31:26 ticho Exp $
 
 IUSE="bogofilter clamav crypt dillo doc gnome imap ipv6 kde ldap pda session spell ssl startup-notification xface"
 
@@ -133,7 +133,7 @@ src_install() {
 }
 
 pkg_postinst() {
-	gtk-update-icon-cache -f -t ${ROOT}/usr/share/icons/hicolor
+	gtk-update-icon-cache -f -t "${ROOT}"/usr/share/icons/hicolor
 
 	UPDATE_PLUGINS=""
 	RENAME_PLUGINS=""
@@ -178,5 +178,5 @@ pkg_postinst() {
 }
 
 pkg_postrm() {
-	gtk-update-icon-cache -f -t ${ROOT}/usr/share/icons/hicolor
+	gtk-update-icon-cache -f -t "${ROOT}"/usr/share/icons/hicolor
 }
diff --git a/mail-client/claws-mail/claws-mail-3.0.1.ebuild b/mail-client/claws-mail/claws-mail-3.1.0.ebuild
index 6ec78e247b7b..504e06fc7b16 100644
--- a/mail-client/claws-mail/claws-mail-3.0.1.ebuild
+++ b/mail-client/claws-mail/claws-mail-3.1.0.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/claws-mail/claws-mail-3.0.1.ebuild,v 1.1 2007/09/18 09:08:55 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/claws-mail/claws-mail-3.1.0.ebuild,v 1.1 2007/11/29 22:31:26 ticho Exp $
 
-IUSE="bogofilter clamav crypt dillo doc gnome imap ipv6 kde ldap pda session spell ssl startup-notification xface"
+IUSE="bogofilter clamav crypt dillo doc gnome imap ipv6 kde ldap nntp pda session spell ssl startup-notification xface"
 
-inherit eutils
+inherit eutils multilib
 
 DESCRIPTION="Claws-Mail is an email client (and news reader) based on GTK+"
 HOMEPAGE="http://www.claws-mail.org"
@@ -31,6 +31,7 @@ COMMONDEPEND=">=x11-libs/gtk+-2.6
 	clamav? ( app-antivirus/clamav )
 	kde? ( kde-base/kdelibs )
 	imap? ( >=net-libs/libetpan-0.49 )
+	nntp? ( >=net-libs/libetpan-0.49 )
 	gnome? ( >=gnome-base/libgnomeprintui-2.2 )
 	startup-notification? ( x11-libs/startup-notification )
 	bogofilter? ( mail-filter/bogofilter )
@@ -50,11 +51,15 @@ RDEPEND="${COMMONDEPEND}
 PLUGIN_NAMES="acpi-notifier att-remover attachwarner cachesaver etpan-privacy fetchinfo gtkhtml maildir mailmbox newmail notification pdf-viewer perl rssyl smime synce vcalendar"
 
 src_compile() {
-	local myconf
+	local myconf="--disable-libetpan"
+
+	# libetpan is needed if user wants nntp or imap functionality
+	# TODO: Perhaps change it into a single "libetpan" USE flag?
+	use imap && myconf="--enable-libetpan"
+	use nntp && myconf="--enable-libetpan"
 
 	# 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`"
@@ -83,7 +88,7 @@ src_compile() {
 }
 
 src_install() {
-	make DESTDIR=${D} install || die
+	emake DESTDIR="${D}" install || die
 
 	# Makefile install claws-mail.png in /usr/share/icons/hicolor/48x48/apps
 	# => also install it in /usr/share/pixmaps for other desktop envs
@@ -105,8 +110,8 @@ src_install() {
 	doins ${PN}.desktop
 
 	einfo "Installing extra tools"
-	cd ${S}/tools
-	exeinto /usr/lib/${PN}/tools
+	cd "${S}"/tools
+	exeinto /usr/$(get_libdir)/${PN}/tools
 	doexe *.pl *.py *.rc *.conf *.sh || die
 	doexe tb2claws-mail update-po uudec uuooffice || die
 
@@ -115,7 +120,7 @@ src_install() {
 		local kdeprefix="$(kde-config --prefix)"
 		local servicescript="${PN}-kdeservicemenu.pl"
 		local desktopfile="${PN}-attach-files.desktop"
-		cd ${S}/tools/kdeservicemenu
+		cd "${S}"/tools/kdeservicemenu
 		sed -i -e "s:SCRIPT_PATH:${kdeprefix}/bin/${servicescript}:g" \
 			template_${desktopfile}
 		dodir /usr/share/apps/konqueror/servicemenus
@@ -129,11 +134,11 @@ src_install() {
 	fi
 
 	# kill useless plugin files
-	rm -f ${D}/usr/lib*/${PN}/plugins/*.{la,a}
+	rm -f "${D}"/usr/lib*/${PN}/plugins/*.{la,a}
 }
 
 pkg_postinst() {
-	gtk-update-icon-cache -f -t ${ROOT}/usr/share/icons/hicolor
+	gtk-update-icon-cache -f -t "${ROOT}"/usr/share/icons/hicolor
 
 	UPDATE_PLUGINS=""
 	RENAME_PLUGINS=""
@@ -178,5 +183,5 @@ pkg_postinst() {
 }
 
 pkg_postrm() {
-	gtk-update-icon-cache -f -t /usr/share/icons/hicolor
+	gtk-update-icon-cache -f -t "${ROOT}"/usr/share/icons/hicolor
 }
diff --git a/mail-client/claws-mail/files/digest-claws-mail-2.10.0 b/mail-client/claws-mail/files/digest-claws-mail-2.10.0
deleted file mode 100644
index 2c474e53eca8..000000000000
--- a/mail-client/claws-mail/files/digest-claws-mail-2.10.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 ed409002b5e6b60b682ae3ee7f87a86d claws-mail-2.10.0.tar.bz2 5520512
-RMD160 e10eed2c3461a8c85d6313f0c57581a3b0ea654f claws-mail-2.10.0.tar.bz2 5520512
-SHA256 59034fae8ed1e7373f4369b12ee96b884241cf5f86aefe37e4f4926ebf712ccf claws-mail-2.10.0.tar.bz2 5520512
diff --git a/mail-client/claws-mail/files/digest-claws-mail-2.9.1 b/mail-client/claws-mail/files/digest-claws-mail-2.9.1
deleted file mode 100644
index eb1dfc960502..000000000000
--- a/mail-client/claws-mail/files/digest-claws-mail-2.9.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 c0e2718d4bcd932709a6e1bcc910c47a claws-mail-2.9.1.tar.bz2 5451118
-RMD160 19dc5b94e09a5d1f3c6812239daab78b64a651af claws-mail-2.9.1.tar.bz2 5451118
-SHA256 056500e4f61f28791390270636ef279c326b090c8634c15faa59497fb3086c8b claws-mail-2.9.1.tar.bz2 5451118
diff --git a/mail-client/claws-mail/files/digest-claws-mail-2.9.2 b/mail-client/claws-mail/files/digest-claws-mail-2.9.2
deleted file mode 100644
index a89f10b9bb01..000000000000
--- a/mail-client/claws-mail/files/digest-claws-mail-2.9.2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 5054149c6c0ece2f825494f1e3a89409 claws-mail-2.9.2.tar.bz2 5448901
-RMD160 f7330545776603d175acde980b15ca48c17b87b2 claws-mail-2.9.2.tar.bz2 5448901
-SHA256 57ba8f98a6b6965539ee1d038377216f276e319b1a14e40f2b033e156190a8a4 claws-mail-2.9.2.tar.bz2 5448901
diff --git a/mail-client/claws-mail/files/digest-claws-mail-3.0.0-r1 b/mail-client/claws-mail/files/digest-claws-mail-3.0.0-r1
deleted file mode 100644
index 5a4ce529b14d..000000000000
--- a/mail-client/claws-mail/files/digest-claws-mail-3.0.0-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 9c6390d711b2c60840cc9138456a7cd5 claws-mail-3.0.0.tar.bz2 5647644
-RMD160 784a4faecb3ca1ca1103d97861cb6638b2341e46 claws-mail-3.0.0.tar.bz2 5647644
-SHA256 76f8512fd13063e8145c18f52932fb4ff5640d6652c3e835ddd64c1d32d94435 claws-mail-3.0.0.tar.bz2 5647644
diff --git a/mail-client/claws-mail/files/digest-claws-mail-3.0.1 b/mail-client/claws-mail/files/digest-claws-mail-3.0.1
deleted file mode 100644
index fdf03b8657bd..000000000000
--- a/mail-client/claws-mail/files/digest-claws-mail-3.0.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 700c6b4efeb10cc33a43111c2a734db8 claws-mail-3.0.1.tar.bz2 5654189
-RMD160 431ab3ca051382db1e307ef1abafc5ce659f4aa3 claws-mail-3.0.1.tar.bz2 5654189
-SHA256 58259afd6f239829aeaf15a370978e10d8b98a08ad5eb4eb6b70fb7696efec30 claws-mail-3.0.1.tar.bz2 5654189
diff --git a/mail-client/claws-mail/files/digest-claws-mail-3.1.0 b/mail-client/claws-mail/files/digest-claws-mail-3.1.0
new file mode 100644
index 000000000000..1f54da103e2f
--- /dev/null
+++ b/mail-client/claws-mail/files/digest-claws-mail-3.1.0
@@ -0,0 +1,3 @@
+MD5 ef1184a0f1b41e44545dac9d880b9638 claws-mail-3.1.0.tar.bz2 5786535
+RMD160 8f22d98836aba29afdca378308b9181f725edb74 claws-mail-3.1.0.tar.bz2 5786535
+SHA256 07badeb5dd16c24fbdb719224122a1d27fbc34c122fd3e9ff39eadf4cc6207de claws-mail-3.1.0.tar.bz2 5786535