Clean out old versions, version bump

Package-Manager: portage-2.1.2.9

9 files changed, 44 insertions, 404 deletions

diff --git a/mail-client/claws-mail/ChangeLog b/mail-client/claws-mail/ChangeLog
index 94a4679b22e1..f88c57f5532c 100644
--- a/mail-client/claws-mail/ChangeLog
+++ b/mail-client/claws-mail/ChangeLog
@@ -1,6 +1,13 @@
 # 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.32 2007/05/26 01:34:52 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/claws-mail/ChangeLog,v 1.33 2007/06/23 14:15:52 genone Exp $
+
+*claws-mail-2.10.0_rc1 (23 Jun 2007)
+
+  23 Jun 2007; Marius Mauch <genone@gentoo.org> -claws-mail-2.6.1.ebuild,
+  -claws-mail-2.7.2.ebuild, -claws-mail-2.8.1.ebuild,
+  +claws-mail-2.10.0_rc1.ebuild:
+  Clean out old version, version bump
 
   26 May 2007; Jeroen Roovers <jer@gentoo.org> claws-mail-2.9.1.ebuild:
   Stable for HPPA (bug #176805).
diff --git a/mail-client/claws-mail/Manifest b/mail-client/claws-mail/Manifest
index b7d7fddab5f1..dc4639828ed6 100644
--- a/mail-client/claws-mail/Manifest
+++ b/mail-client/claws-mail/Manifest
@@ -1,24 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX plugins-rebuild.sh 1359 RMD160 71fb3f6d087e4b82b1821d7ee8e2cb6aa4332269 SHA1 1b359c475735e9d3b6675250f65a7f20b3c7ff8d SHA256 9f6e8f639a6261f442a0209f619c1d212a4867d2829b82fbc2c442898780677d
 MD5 8a856a024132287c298aff0bf9aac806 files/plugins-rebuild.sh 1359
 RMD160 71fb3f6d087e4b82b1821d7ee8e2cb6aa4332269 files/plugins-rebuild.sh 1359
 SHA256 9f6e8f639a6261f442a0209f619c1d212a4867d2829b82fbc2c442898780677d files/plugins-rebuild.sh 1359
-DIST claws-mail-2.6.1.tar.bz2 5080311 RMD160 26eded6e9292fc43ab74692eec3cea1412779280 SHA1 09bddec7466390d7925701e5296f40865ccf45cd SHA256 7edb2d58dbd0a5842dde7cbb2be10f5f70888f3e6f3b4fcb052e909c7eebda88
-DIST claws-mail-2.7.2.tar.bz2 5204013 RMD160 bb9a3b056a9531d8f94556b800326c03a0f3b4f9 SHA1 088dde389cf4e337c613221b80a30ed57dbf1f49 SHA256 a47a079f583581c2d049195f12a26524390e272c820b2c7233a37582e887a5b5
-DIST claws-mail-2.8.1.tar.bz2 5354557 RMD160 aa84a6e7496cbfdf2b9cd2c28a2ee8b0de758a60 SHA1 10b9297361a892690af2da0e5297473537c1ff7f SHA256 8aa4f942ed95f53fe707c2b571c284c97e588a260f10042b2cc7c27174eb0552
+DIST claws-mail-2.10.0-rc1.tar.bz2 5479184 RMD160 9f91007bc9b7ca35cbc659afc94b6a06f329a34d SHA1 6f715dc149cb73422ffe7b4479c4f7e1edd226a5 SHA256 46b32ea0caaf56fcd2bdfb7cfeccbe7731e263375248ce061243080fc7d4d390
 DIST claws-mail-2.9.1.tar.bz2 5451118 RMD160 19dc5b94e09a5d1f3c6812239daab78b64a651af SHA1 938291cb4e526df157be552a9a175d8623709b6d SHA256 056500e4f61f28791390270636ef279c326b090c8634c15faa59497fb3086c8b
 DIST claws-mail-2.9.2.tar.bz2 5448901 RMD160 f7330545776603d175acde980b15ca48c17b87b2 SHA1 3b15730065ca1e0c318592b39b02c2d0497e6ebc SHA256 57ba8f98a6b6965539ee1d038377216f276e319b1a14e40f2b033e156190a8a4
-EBUILD claws-mail-2.6.1.ebuild 5384 RMD160 cef7f4cc62fec19067184c63157792819b03b7ee SHA1 4a951b7b54d05e1e62371dfde590fd993aec76fd SHA256 52ef7bfbe77c94658cca2e50c819721b4911e66fdc5834439f53b0082f6fc73c
-MD5 18d362d5141344675dc85117d4eb0ee8 claws-mail-2.6.1.ebuild 5384
-RMD160 cef7f4cc62fec19067184c63157792819b03b7ee claws-mail-2.6.1.ebuild 5384
-SHA256 52ef7bfbe77c94658cca2e50c819721b4911e66fdc5834439f53b0082f6fc73c claws-mail-2.6.1.ebuild 5384
-EBUILD claws-mail-2.7.2.ebuild 5400 RMD160 643abdd0cd87bdd41b2815c63c7f5f3080b1b039 SHA1 53afb05ba1923221dbb1d95ee12f25315a97321f SHA256 b67dedfcbf311a57485951f76bc43e6362c669f114e34106396e22785926d43f
-MD5 22216d91f9fe0f86505f227ed792a1cb claws-mail-2.7.2.ebuild 5400
-RMD160 643abdd0cd87bdd41b2815c63c7f5f3080b1b039 claws-mail-2.7.2.ebuild 5400
-SHA256 b67dedfcbf311a57485951f76bc43e6362c669f114e34106396e22785926d43f claws-mail-2.7.2.ebuild 5400
-EBUILD claws-mail-2.8.1.ebuild 5411 RMD160 3e2c4163b6cbe314a6d2d55509c4687088367a79 SHA1 0b3b9042b41c7f422b87d59ece8fd8d15a0f8c6e SHA256 18a1548419f01376d41958b7f12bcdb000e0ed9ee75dffa70816c23595bb7668
-MD5 5df3f0d430fc98b5548ef8b148426c58 claws-mail-2.8.1.ebuild 5411
-RMD160 3e2c4163b6cbe314a6d2d55509c4687088367a79 claws-mail-2.8.1.ebuild 5411
-SHA256 18a1548419f01376d41958b7f12bcdb000e0ed9ee75dffa70816c23595bb7668 claws-mail-2.8.1.ebuild 5411
+EBUILD claws-mail-2.10.0_rc1.ebuild 5429 RMD160 af7f4d9a71eb1d7bf9a57ae1c4f858356713f271 SHA1 d9fe88ac4bcaeaaf75c5d2252df921dc5cfc57dd SHA256 48837017d79db04a5c616360f6f275aca61b1ac7153537d2905bcce25f6b2d9c
+MD5 479fb39effdf443dd804f5733876a98a claws-mail-2.10.0_rc1.ebuild 5429
+RMD160 af7f4d9a71eb1d7bf9a57ae1c4f858356713f271 claws-mail-2.10.0_rc1.ebuild 5429
+SHA256 48837017d79db04a5c616360f6f275aca61b1ac7153537d2905bcce25f6b2d9c claws-mail-2.10.0_rc1.ebuild 5429
 EBUILD claws-mail-2.9.1.ebuild 5414 RMD160 a8fa31c11f003741d20cdbec66629ef54527be3e SHA1 a93261d12e517dd2a438ca4882e24e107564ee7d SHA256 022929f16b9bef0e43bbe0146d963123f4dd8885068b67cf37197b45c42f0449
 MD5 0695b1ade5a30cb520d2ba9b596f9aac claws-mail-2.9.1.ebuild 5414
 RMD160 a8fa31c11f003741d20cdbec66629ef54527be3e claws-mail-2.9.1.ebuild 5414
@@ -27,26 +20,27 @@ EBUILD claws-mail-2.9.2.ebuild 5423 RMD160 a7ae35e97a2f34949bdb63d815af1fa39372c
 MD5 9e28f126fff7e6c1bdfdb36904194798 claws-mail-2.9.2.ebuild 5423
 RMD160 a7ae35e97a2f34949bdb63d815af1fa39372cf92 claws-mail-2.9.2.ebuild 5423
 SHA256 d99b98be741b875d330690cd8543fd3dac162cddaa16dc0ae37d20994fed21a7 claws-mail-2.9.2.ebuild 5423
-MISC ChangeLog 4598 RMD160 b98aa6232a41a51e0615de733bea390384a59a63 SHA1 bc0bb357ee961a61c073977c9bc0ecde380a06f7 SHA256 48fe42db65fc64ac7dbfae6bb3b886c4ad57eba3dc9621310b17a422939efd91
-MD5 967c134b6fc75030e984344575224b7b ChangeLog 4598
-RMD160 b98aa6232a41a51e0615de733bea390384a59a63 ChangeLog 4598
-SHA256 48fe42db65fc64ac7dbfae6bb3b886c4ad57eba3dc9621310b17a422939efd91 ChangeLog 4598
+MISC ChangeLog 4839 RMD160 b3d74255045e7c6f87593be31a52971401384aec SHA1 69e314716614dd461b5994009ae10513688bae75 SHA256 1c05fc49d17f601bdf08094fa9f0225ae0c3a566345866a8be0f19225e5a62a1
+MD5 2af54f057231d73b5f8ee8ed61039157 ChangeLog 4839
+RMD160 b3d74255045e7c6f87593be31a52971401384aec ChangeLog 4839
+SHA256 1c05fc49d17f601bdf08094fa9f0225ae0c3a566345866a8be0f19225e5a62a1 ChangeLog 4839
 MISC metadata.xml 375 RMD160 aef134f2148c1c49355908facfa629a8e7af157c SHA1 517cdd70d1f329b174b7eb68bfd55c954981bdd5 SHA256 24017fb3bfa040e177963d586916169cac027bb8703ac7cef4f79ffd8fff0424
 MD5 b9517b3a2f57bb06971ac9770ee8da4b metadata.xml 375
 RMD160 aef134f2148c1c49355908facfa629a8e7af157c metadata.xml 375
 SHA256 24017fb3bfa040e177963d586916169cac027bb8703ac7cef4f79ffd8fff0424 metadata.xml 375
-MD5 d8d2bbc690fb3ce40e8f2c8a33819b05 files/digest-claws-mail-2.6.1 256
-RMD160 e1cefd36ccb68dec7146b0feee46992d20a7197c files/digest-claws-mail-2.6.1 256
-SHA256 6c69e248902c0cde16dae58751281e962627bf6ff1d2b2355d094ee9fed2782c files/digest-claws-mail-2.6.1 256
-MD5 055ca5e3e299dccf250b2c7f731a9b08 files/digest-claws-mail-2.7.2 256
-RMD160 df0524d83488bf6dadace48e474b95c36497c825 files/digest-claws-mail-2.7.2 256
-SHA256 f8edd13a14e5a1e60bbb76388affdd02398693571662043dc37f202ea88fca07 files/digest-claws-mail-2.7.2 256
-MD5 840cc3de19a2acbd889a9f354188d223 files/digest-claws-mail-2.8.1 256
-RMD160 e4c8a40cfc495bbb4aadce8ae02e0cb42d378ef6 files/digest-claws-mail-2.8.1 256
-SHA256 4eee6febcb7020ee2a78c672c9b5cfcba2158695f984c675f003830d754987ef files/digest-claws-mail-2.8.1 256
+MD5 d7dbcfb83d415f5865d8b864d015db2e files/digest-claws-mail-2.10.0_rc1 271
+RMD160 8462ded09dd8f8aab2470be2f2e160064b4f4227 files/digest-claws-mail-2.10.0_rc1 271
+SHA256 722f48bd470e297d8b844f0fe8b948400df8ebc6e38cbf2848f4e2756299c9cc files/digest-claws-mail-2.10.0_rc1 271
 MD5 e85511ac676d18931dc315eaf828bf30 files/digest-claws-mail-2.9.1 256
 RMD160 b16fd8a81618bc384022c6775d9b4c2cc4e877ad files/digest-claws-mail-2.9.1 256
 SHA256 281d6608e2dc0e8617de977d0d7571de04f3257e88328c8112488e53a942ab15 files/digest-claws-mail-2.9.1 256
 MD5 e1782d404672178c078a88953304781b files/digest-claws-mail-2.9.2 256
 RMD160 7bc53518c6db27fd52c68a8d5267e92b02c05fb1 files/digest-claws-mail-2.9.2 256
 SHA256 32cdd34221fca9924bd61f3f8647bf1cc31fbb0928c3cb92140cf4f36b758843 files/digest-claws-mail-2.9.2 256
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.4 (GNU/Linux)
+
+iD8DBQFGfSqd6J2i8a8J4okRAhnXAKCpZmrgayfIkQZRPgOaOPeels9q5gCfd+ej
+j4zsq/kkkZIGNcfpV27cn6s=
+=oVLo
+-----END PGP SIGNATURE-----
diff --git a/mail-client/claws-mail/claws-mail-2.8.1.ebuild b/mail-client/claws-mail/claws-mail-2.10.0_rc1.ebuild
index dd6de9b1df7b..d15aaf53f535 100644
--- a/mail-client/claws-mail/claws-mail-2.8.1.ebuild
+++ b/mail-client/claws-mail/claws-mail-2.10.0_rc1.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-2.8.1.ebuild,v 1.2 2007/04/16 11:33:59 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/claws-mail/claws-mail-2.10.0_rc1.ebuild,v 1.1 2007/06/23 14:15:52 genone Exp $
 
 IUSE="gnome dillo crypt spell ssl ldap ipv6 pda clamav xface kde imap spamassassin doc startup-notification bogofilter"
 
@@ -73,6 +73,7 @@ src_compile() {
 
 	econf \
 		--enable-trayicon-plugin \
+		--disable-maemo \
 		${myconf} || die "./configure failed"
 
 	emake || die
@@ -120,7 +121,7 @@ src_install() {
 		newins template_${desktopfile} ${desktopfile} || die
 		dodir ${kdeprefix}/bin
 		insopts -m 755
-		insinto ${kdeprefix}/bin
+		exeinto ${kdeprefix}/bin
 		doexe ${servicescript} || die
 	fi
 
@@ -138,29 +139,29 @@ pkg_postinst() {
 		has_version mail-client/sylpheed-claws-$x && RENAME_PLUGINS="${RENAME_PLUGINS} $x"
 	done
 	if [ -n "${RENAME_PLUGINS}" ]; then
-		ewarn
+		elog
 		elog "The following sylpheed-claws plugins were found on your system:"
-		ewarn
+		elog
 		for x in ${RENAME_PLUGINS}; do
 			elog "    mail-client/sylpheed-claws-$x"
 		done
-		ewarn
+		elog
 		elog "If you want to continue using those you need to merge their "
 		elog "renamed counterparts:"
-		ewarn
+		elog
 		for x in ${RENAME_PLUGINS}; do
 			elog "    mail-client/${PN}-$x"
 		done
-		ewarn
+		elog
 	fi
 	if [ -n "${UPDATE_PLUGINS}" ]; then
-		ewarn
+		elog
 		elog "You have to re-emerge or update the following plugins:"
-		ewarn
+		elog
 		for x in ${UPDATE_PLUGINS}; do
 			elog "    mail-client/${PN}-$x"
 		done
-		ewarn
+		elog
 	fi
 	if [ -n "${RENAME_PLUGINS}${UPDATE_PLUGINS}" ]; then
 		elog
diff --git a/mail-client/claws-mail/claws-mail-2.6.1.ebuild b/mail-client/claws-mail/claws-mail-2.6.1.ebuild
deleted file mode 100644
index bf0f9d482035..000000000000
--- a/mail-client/claws-mail/claws-mail-2.6.1.ebuild
+++ /dev/null
@@ -1,178 +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.6.1.ebuild,v 1.12 2007/04/16 11:33:59 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"
-
-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.48 )
-	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 cachesaver etpan-privacy fetchinfo gtkhtml maildir mailmbox newmail notification 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 \
-		${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
-		insinto ${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
-		ewarn
-		elog "The following sylpheed-claws plugins were found on your system:"
-		ewarn
-		for x in ${RENAME_PLUGINS}; do
-			elog "    mail-client/sylpheed-claws-$x"
-		done
-		ewarn
-		elog "If you want to continue using those you need to merge their "
-		elog "renamed counterparts:"
-		ewarn
-		for x in ${RENAME_PLUGINS}; do
-			elog "    mail-client/${PN}-$x"
-		done
-		ewarn
-	fi
-	if [ -n "${UPDATE_PLUGINS}" ]; then
-		ewarn
-		elog "You have to re-emerge or update the following plugins:"
-		ewarn
-		for x in ${UPDATE_PLUGINS}; do
-			elog "    mail-client/${PN}-$x"
-		done
-		ewarn
-	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.7.2.ebuild b/mail-client/claws-mail/claws-mail-2.7.2.ebuild
deleted file mode 100644
index 8ba8f2d72753..000000000000
--- a/mail-client/claws-mail/claws-mail-2.7.2.ebuild
+++ /dev/null
@@ -1,178 +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.7.2.ebuild,v 1.4 2007/04/16 11:33:59 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"
-
-PLUGIN_NAMES="acpi-notifier att-remover cachesaver etpan-privacy fetchinfo gtkhtml maildir mailmbox newmail notification 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 \
-		${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
-		insinto ${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
-		ewarn
-		elog "The following sylpheed-claws plugins were found on your system:"
-		ewarn
-		for x in ${RENAME_PLUGINS}; do
-			elog "    mail-client/sylpheed-claws-$x"
-		done
-		ewarn
-		elog "If you want to continue using those you need to merge their "
-		elog "renamed counterparts:"
-		ewarn
-		for x in ${RENAME_PLUGINS}; do
-			elog "    mail-client/${PN}-$x"
-		done
-		ewarn
-	fi
-	if [ -n "${UPDATE_PLUGINS}" ]; then
-		ewarn
-		elog "You have to re-emerge or update the following plugins:"
-		ewarn
-		for x in ${UPDATE_PLUGINS}; do
-			elog "    mail-client/${PN}-$x"
-		done
-		ewarn
-	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/files/digest-claws-mail-2.10.0_rc1 b/mail-client/claws-mail/files/digest-claws-mail-2.10.0_rc1
new file mode 100644
index 000000000000..8185501aa130
--- /dev/null
+++ b/mail-client/claws-mail/files/digest-claws-mail-2.10.0_rc1
@@ -0,0 +1,3 @@
+MD5 dd079f59f2c819e718445f9340b1373d claws-mail-2.10.0-rc1.tar.bz2 5479184
+RMD160 9f91007bc9b7ca35cbc659afc94b6a06f329a34d claws-mail-2.10.0-rc1.tar.bz2 5479184
+SHA256 46b32ea0caaf56fcd2bdfb7cfeccbe7731e263375248ce061243080fc7d4d390 claws-mail-2.10.0-rc1.tar.bz2 5479184
diff --git a/mail-client/claws-mail/files/digest-claws-mail-2.6.1 b/mail-client/claws-mail/files/digest-claws-mail-2.6.1
deleted file mode 100644
index b4473ee7037c..000000000000
--- a/mail-client/claws-mail/files/digest-claws-mail-2.6.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 98099550a68a08eca5354659f3ea465c claws-mail-2.6.1.tar.bz2 5080311
-RMD160 26eded6e9292fc43ab74692eec3cea1412779280 claws-mail-2.6.1.tar.bz2 5080311
-SHA256 7edb2d58dbd0a5842dde7cbb2be10f5f70888f3e6f3b4fcb052e909c7eebda88 claws-mail-2.6.1.tar.bz2 5080311
diff --git a/mail-client/claws-mail/files/digest-claws-mail-2.7.2 b/mail-client/claws-mail/files/digest-claws-mail-2.7.2
deleted file mode 100644
index 49d063957f5b..000000000000
--- a/mail-client/claws-mail/files/digest-claws-mail-2.7.2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 079f167fba6e17ae2c688a0dae858b0f claws-mail-2.7.2.tar.bz2 5204013
-RMD160 bb9a3b056a9531d8f94556b800326c03a0f3b4f9 claws-mail-2.7.2.tar.bz2 5204013
-SHA256 a47a079f583581c2d049195f12a26524390e272c820b2c7233a37582e887a5b5 claws-mail-2.7.2.tar.bz2 5204013
diff --git a/mail-client/claws-mail/files/digest-claws-mail-2.8.1 b/mail-client/claws-mail/files/digest-claws-mail-2.8.1
deleted file mode 100644
index 9741e397823e..000000000000
--- a/mail-client/claws-mail/files/digest-claws-mail-2.8.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 b68983f2edac97cc094c527536d49a09 claws-mail-2.8.1.tar.bz2 5354557
-RMD160 aa84a6e7496cbfdf2b9cd2c28a2ee8b0de758a60 claws-mail-2.8.1.tar.bz2 5354557
-SHA256 8aa4f942ed95f53fe707c2b571c284c97e588a260f10042b2cc7c27174eb0552 claws-mail-2.8.1.tar.bz2 5354557