version bump, mark 2.4 stable on amd64, drop old versions, update maintainer info

(Portage version: 2.1.2_pre2-r6)
 (Signed Manifest commit)

7 files changed, 24 insertions, 483 deletions

diff --git a/mail-client/sylpheed-claws/Manifest b/mail-client/sylpheed-claws/Manifest
index aa87d8c7cb74..df1293703e96 100644
--- a/mail-client/sylpheed-claws/Manifest
+++ b/mail-client/sylpheed-claws/Manifest
@@ -10,57 +10,41 @@ MD5 bf4c9cd9cb7cdc6ece7d4d327910f0cf files/procmime.patch 977
 RMD160 39a51a4d654759b15d1644a79fb6e8921130df3c files/procmime.patch 977
 SHA256 6b70df7ea239873c09cd26ce57b29f8990e6d66c8dbe65e97bf6d69fa9cd0a56 files/procmime.patch 977
 DIST sylpheed-claws-1.0.5.tar.bz2 3268626 RMD160 f2708b5d69bc9a5025812511fde04eca7782e367 SHA1 d351d7043eef7a875df18a8c4b9464be49e2164b SHA256 d596bd205f967f067a7edb244105d460106bc63df51cb52384d80aaabc125902
-DIST sylpheed-claws-2.3.0.tar.bz2 556485 RMD160 790889c3903513b35299870050d759edfc7011f9 SHA1 ed3ff6c87198dc7d7383b7ff11c14c0004875718 SHA256 87955608179410d7c8e4629c3b59fba57ac685d04332f0ce0f2f09c949ab63c6
 DIST sylpheed-claws-2.4.0.tar.bz2 4593307 RMD160 4c22797f73e290cfc2ea1006d9a04b0cdf4783c1 SHA1 f61acdf3e9851da3d1e2591321bf43426465955f SHA256 7ea2a321e41e04c0f4b0fe70489b2967b8d54fb88eca808ed44c56669325291a
-DIST sylpheed-claws-2.5.2.tar.bz2 5206368 RMD160 59ae05ae3683f1c63e5a5c1be5ce7345ee0ed5d9 SHA1 f4d3af14d00a9045779aa17a6bdfbf18d155e3e4 SHA256 02994dcc8c1eaed2303612d18945bd31c456fc8f329bba27f54faa8758762166
-DIST sylpheed-claws-2.5.3.tar.bz2 5043324 RMD160 1f527f3ddce4b4bcaa1626a14979812a981efa94 SHA1 63b114aaba4d653110f13ef96f784fcec7ca661e SHA256 ef8586102106cab99acbffe0a29814d9d83c9ae1b6eeb1a375acd8eeda821569
+DIST sylpheed-claws-2.5.5.tar.bz2 5038409 RMD160 3cad84790a50029fbe1f8d6b91383e01a10459eb SHA1 1908c485af6f0a3baee373e4734f71010a26d182 SHA256 732a0334e7abeabd965be9ca626c1b7ae83377c5efb56f8f7b5fb510cd35652e
 EBUILD sylpheed-claws-1.0.5-r1.ebuild 3894 RMD160 94d6e87bebd4c7199bb47260836a40f8cd016187 SHA1 5f8c5c96bdc6a95a2e3dc43ce8d867466e981366 SHA256 507c50c75a8ccc4f1eaf11f58407573f81786d56190394fdb6420af248e0c825
 MD5 74abb664d838528a042d54de2945ebdc sylpheed-claws-1.0.5-r1.ebuild 3894
 RMD160 94d6e87bebd4c7199bb47260836a40f8cd016187 sylpheed-claws-1.0.5-r1.ebuild 3894
 SHA256 507c50c75a8ccc4f1eaf11f58407573f81786d56190394fdb6420af248e0c825 sylpheed-claws-1.0.5-r1.ebuild 3894
-EBUILD sylpheed-claws-2.3.0.ebuild 4416 RMD160 c989bb548808a0028926c78ea4f5643008c7f2b8 SHA1 b75108528d41568e9848c1f10bf05c47a416af13 SHA256 f43590f5768ed5a42880c3c952eee4615f66a9ec162be7af96ed000ef98b870f
-MD5 2bcf60cb5ca039962f2a11148c6b4a1d sylpheed-claws-2.3.0.ebuild 4416
-RMD160 c989bb548808a0028926c78ea4f5643008c7f2b8 sylpheed-claws-2.3.0.ebuild 4416
-SHA256 f43590f5768ed5a42880c3c952eee4615f66a9ec162be7af96ed000ef98b870f sylpheed-claws-2.3.0.ebuild 4416
-EBUILD sylpheed-claws-2.4.0.ebuild 4416 RMD160 c4bb25b6436b87b64cdbe16968fcef02d2fe710c SHA1 8c27fcac2530c9a32d5ed306eaa9ede1b87647a3 SHA256 2b98eade3742611805fae59b7e5f0009fdacd5d24325d59825153bc613e731fb
-MD5 9458d859c8f0b7b1f7ecf710fc0bd1e3 sylpheed-claws-2.4.0.ebuild 4416
-RMD160 c4bb25b6436b87b64cdbe16968fcef02d2fe710c sylpheed-claws-2.4.0.ebuild 4416
-SHA256 2b98eade3742611805fae59b7e5f0009fdacd5d24325d59825153bc613e731fb sylpheed-claws-2.4.0.ebuild 4416
-EBUILD sylpheed-claws-2.5.2.ebuild 4516 RMD160 f0f0353d8166c88324aaac7775ae6f3d33c232ae SHA1 ac83cbb7e1d7a3e074461610cd333d907291d7f0 SHA256 8bdb9dc05b70a2173e4e2f9053156e19f27193091407c3ebd6fd6a9fad75bf82
-MD5 ddc0381b380a468251a4ca3d4feda1b3 sylpheed-claws-2.5.2.ebuild 4516
-RMD160 f0f0353d8166c88324aaac7775ae6f3d33c232ae sylpheed-claws-2.5.2.ebuild 4516
-SHA256 8bdb9dc05b70a2173e4e2f9053156e19f27193091407c3ebd6fd6a9fad75bf82 sylpheed-claws-2.5.2.ebuild 4516
-EBUILD sylpheed-claws-2.5.3.ebuild 4516 RMD160 14d94fe939dd58075c443fbae3adb92aa2ab8a3b SHA1 c6056c44443e2cf2b110f3ff6fd015ee876b5308 SHA256 fdfaa7167a3e63dcf498d2b286488afea12a17b296c7e292f13985f6d5c8dce9
-MD5 040235aa56b55610bed02999a8683daf sylpheed-claws-2.5.3.ebuild 4516
-RMD160 14d94fe939dd58075c443fbae3adb92aa2ab8a3b sylpheed-claws-2.5.3.ebuild 4516
-SHA256 fdfaa7167a3e63dcf498d2b286488afea12a17b296c7e292f13985f6d5c8dce9 sylpheed-claws-2.5.3.ebuild 4516
-MISC ChangeLog 31925 RMD160 1faba2c3bf66d4fd7cc7e533b1121aba2eaf1be6 SHA1 ba1cb6d9aa4153f4c990cca654c868004c06af5b SHA256 9b20d439ff7f53f174c60b524871ad3a9441b22e811c42f43029f5ca1eaa687e
-MD5 088f71d86c799d62b2e8273533bc8135 ChangeLog 31925
-RMD160 1faba2c3bf66d4fd7cc7e533b1121aba2eaf1be6 ChangeLog 31925
-SHA256 9b20d439ff7f53f174c60b524871ad3a9441b22e811c42f43029f5ca1eaa687e ChangeLog 31925
-MISC metadata.xml 269 RMD160 39d775de55f9963f8946feaf088aa0324770bacb SHA1 4fd7b285049d0e587f89e86becf06c0fd77bae6d SHA256 3787959f4a775b1e787b35ff8380949d8f68bd67b81c2cf5a748733c9740cb94
-MD5 82e806ed62f0596fb7bef493d225712f metadata.xml 269
-RMD160 39d775de55f9963f8946feaf088aa0324770bacb metadata.xml 269
-SHA256 3787959f4a775b1e787b35ff8380949d8f68bd67b81c2cf5a748733c9740cb94 metadata.xml 269
+EBUILD sylpheed-claws-2.4.0.ebuild 4415 RMD160 7456c5ccca932d78ddfaaeae7e3e658bcff06dfe SHA1 60449399bf8a08ce0cb6157073e2eb7a6bbc97c3 SHA256 ba5416f658c80274fc7ca9512fd0b0baf2307f933a76e5e881c67a45a627b1ea
+MD5 9208e051e3f3bf462bba4d58c634c213 sylpheed-claws-2.4.0.ebuild 4415
+RMD160 7456c5ccca932d78ddfaaeae7e3e658bcff06dfe sylpheed-claws-2.4.0.ebuild 4415
+SHA256 ba5416f658c80274fc7ca9512fd0b0baf2307f933a76e5e881c67a45a627b1ea sylpheed-claws-2.4.0.ebuild 4415
+EBUILD sylpheed-claws-2.5.5.ebuild 4517 RMD160 fd67e83a3077e68e5c59784ee47f7da8fb6f4578 SHA1 7b7434983457e63c9e25afd113a4d700a40c44f4 SHA256 94163113ece9dde71f34c82bec960d607ffca6e286584b41152f6f1f2f8cae90
+MD5 16b5525f34e93965ea1bfc24a3fad755 sylpheed-claws-2.5.5.ebuild 4517
+RMD160 fd67e83a3077e68e5c59784ee47f7da8fb6f4578 sylpheed-claws-2.5.5.ebuild 4517
+SHA256 94163113ece9dde71f34c82bec960d607ffca6e286584b41152f6f1f2f8cae90 sylpheed-claws-2.5.5.ebuild 4517
+MISC ChangeLog 32244 RMD160 7169d20f5e28256699efdf35cef7afaa43fb6118 SHA1 3f5acea52e98882c0784018dcc0ab4ef366a1869 SHA256 5fb0ce505b1733f39b6730c48cc78bba683cfc4b56918d161f9fe947073ff1bd
+MD5 de6950c87eea5afd879ea0ecd8b7d632 ChangeLog 32244
+RMD160 7169d20f5e28256699efdf35cef7afaa43fb6118 ChangeLog 32244
+SHA256 5fb0ce505b1733f39b6730c48cc78bba683cfc4b56918d161f9fe947073ff1bd ChangeLog 32244
+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 2bb20c68dabefea0c093bba1ad227276 files/digest-sylpheed-claws-1.0.5-r1 268
 RMD160 97526fc884aaf050dbdeb08127d6542e1ff21afa files/digest-sylpheed-claws-1.0.5-r1 268
 SHA256 42b4fe0b254344b8161dffe8df51ec09aeebc19cffaa32fee7c0adcf9f677c04 files/digest-sylpheed-claws-1.0.5-r1 268
-MD5 f8886d9f273a7ccd55405843446d751b files/digest-sylpheed-claws-2.3.0 265
-RMD160 c059815ff7adc7b097c2a3a40f21a79ab6cf4944 files/digest-sylpheed-claws-2.3.0 265
-SHA256 f2b8904752530b9f470701867f91a7bac05b0afc83c7e0aeab7b45e8c26dc1f5 files/digest-sylpheed-claws-2.3.0 265
 MD5 cf333b0857cef7f1889c6de96b6f5b9c files/digest-sylpheed-claws-2.4.0 268
 RMD160 3e96dd77820ed358e6ea3f199fd81149c7b37210 files/digest-sylpheed-claws-2.4.0 268
 SHA256 862a170ef793c6b5a4c5419206b881bead1c18e55962280d4c2c04ed09c78cbb files/digest-sylpheed-claws-2.4.0 268
-MD5 632fa38fc8701b26d4a32e6cd2f58ac7 files/digest-sylpheed-claws-2.5.2 268
-RMD160 f2787162f8be91174ba4df077befed6f583629d9 files/digest-sylpheed-claws-2.5.2 268
-SHA256 5e1989a14bfe65cf8342167bbefe80b743a885d65be31f718a7fa29c3a3099e6 files/digest-sylpheed-claws-2.5.2 268
-MD5 947f9314ddb7221c0df2aa22c1749519 files/digest-sylpheed-claws-2.5.3 268
-RMD160 a6a2d3380afe86ea8522737487d5cb62d059ae1d files/digest-sylpheed-claws-2.5.3 268
-SHA256 eb319f5fe4930b0a32e4f5a264a551515229a3651a7a9dea542fbf8f74e4b2e3 files/digest-sylpheed-claws-2.5.3 268
+MD5 efc11cb94e713261278d68eb9053bbf4 files/digest-sylpheed-claws-2.5.5 268
+RMD160 a299a1debc362151fdd5139b0184b251b954da99 files/digest-sylpheed-claws-2.5.5 268
+SHA256 f2ab6471d9bea372be81e14884f98eaf5fb7f34a7bbe45e2f35ce12aa89767de files/digest-sylpheed-claws-2.5.5 268
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.4 (GNU/Linux)
+Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFJE/1QlM6RnzZP+IRAnU2AJ9+jTS4fq3T7ni7q+v2tBJEonXZBwCgmrxi
-gwXex48S5B3wMCuo069AZwQ=
-=QjcO
+iD8DBQFFMGH56J2i8a8J4okRAjtBAKDKgP7Jh7n7r/NBneLBjS0HgzszqACgnZyj
+Yqb10mE6+5Qo+QTT9RJuaUs=
+=ojFX
 -----END PGP SIGNATURE-----
diff --git a/mail-client/sylpheed-claws/files/digest-sylpheed-claws-2.3.0 b/mail-client/sylpheed-claws/files/digest-sylpheed-claws-2.3.0
deleted file mode 100644
index b9cabf2a3066..000000000000
--- a/mail-client/sylpheed-claws/files/digest-sylpheed-claws-2.3.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 15f8bdf3c875dca6cfe9818580333e86 sylpheed-claws-2.3.0.tar.bz2 556485
-RMD160 790889c3903513b35299870050d759edfc7011f9 sylpheed-claws-2.3.0.tar.bz2 556485
-SHA256 87955608179410d7c8e4629c3b59fba57ac685d04332f0ce0f2f09c949ab63c6 sylpheed-claws-2.3.0.tar.bz2 556485
diff --git a/mail-client/sylpheed-claws/files/digest-sylpheed-claws-2.5.2 b/mail-client/sylpheed-claws/files/digest-sylpheed-claws-2.5.2
deleted file mode 100644
index 488b241f156a..000000000000
--- a/mail-client/sylpheed-claws/files/digest-sylpheed-claws-2.5.2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 a28001e212c0b536e7e8c4907243a3a2 sylpheed-claws-2.5.2.tar.bz2 5206368
-RMD160 59ae05ae3683f1c63e5a5c1be5ce7345ee0ed5d9 sylpheed-claws-2.5.2.tar.bz2 5206368
-SHA256 02994dcc8c1eaed2303612d18945bd31c456fc8f329bba27f54faa8758762166 sylpheed-claws-2.5.2.tar.bz2 5206368
diff --git a/mail-client/sylpheed-claws/files/digest-sylpheed-claws-2.5.3 b/mail-client/sylpheed-claws/files/digest-sylpheed-claws-2.5.3
deleted file mode 100644
index 6bf5c07c10c0..000000000000
--- a/mail-client/sylpheed-claws/files/digest-sylpheed-claws-2.5.3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 3e2f1d0d512943d42c3d884482612d79 sylpheed-claws-2.5.3.tar.bz2 5043324
-RMD160 1f527f3ddce4b4bcaa1626a14979812a981efa94 sylpheed-claws-2.5.3.tar.bz2 5043324
-SHA256 ef8586102106cab99acbffe0a29814d9d83c9ae1b6eeb1a375acd8eeda821569 sylpheed-claws-2.5.3.tar.bz2 5043324
diff --git a/mail-client/sylpheed-claws/sylpheed-claws-2.3.0.ebuild b/mail-client/sylpheed-claws/sylpheed-claws-2.3.0.ebuild
deleted file mode 100644
index 889136beaa6c..000000000000
--- a/mail-client/sylpheed-claws/sylpheed-claws-2.3.0.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/sylpheed-claws/sylpheed-claws-2.3.0.ebuild,v 1.7 2006/08/05 06:10:54 genone Exp $
-
-IUSE="gnome dillo crypt spell ssl ldap ipv6 pda clamav xface kde imap spamassassin doc startup-notification"
-
-inherit eutils
-
-DESCRIPTION="Sylpheed-Claws is an email client (and news reader) based on GTK+"
-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="~alpha amd64 ~hppa ppc ppc64 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.45 )
-	gnome? ( >=gnome-base/libgnomeprintui-2.2 )
-	startup-notification? ( 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"
-
-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`"
-
-	econf \
-		--enable-trayicon-plugin \
-		${myconf} || die "./configure failed"
-
-	emake || die
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-
-	if [ -d ${D}/usr/share/gnome ]; then
-		dodir /usr/share/applications
-		mv ${D}/usr/share/{gnome/apps/Internet,applications}/sylpheed-claws.desktop
-		rm -rf ${D}/usr/share/gnome
-	fi
-
-	# 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 res 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
-
-	# kill useless plugin files
-	rm -f ${D}/usr/lib*/${PN}/plugins/*.{la,a}
-}
-
-pkg_postinst() {
-	UPDATE_PLUGINS=""
-	for x in ${PLUGIN_NAMES}; do
-		has_version mail-client/sylpheed-claws-$x && UPDATE_PLUGINS="${UPDATE_PLUGINS} $x"
-	done
-	if [ -n "${UPDATE_PLUGINS}" ]; then
-		ewarn
-		ewarn "You have to re-emerge or update the following plugins:"
-		ewarn
-		for x in ${UPDATE_PLUGINS}; do
-			ewarn "    mail-client/sylpheed-claws-$x"
-		done
-		ewarn
-		epause 5
-		ebeep 3
-	fi
-}
diff --git a/mail-client/sylpheed-claws/sylpheed-claws-2.5.2.ebuild b/mail-client/sylpheed-claws/sylpheed-claws-2.5.2.ebuild
deleted file mode 100644
index 626a5a6c6699..000000000000
--- a/mail-client/sylpheed-claws/sylpheed-claws-2.5.2.ebuild
+++ /dev/null
@@ -1,145 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/sylpheed-claws/sylpheed-claws-2.5.2.ebuild,v 1.3 2006/10/04 12:19:22 ticho Exp $
-
-IUSE="gnome dillo crypt spell ssl ldap ipv6 pda clamav xface kde imap spamassassin doc startup-notification bogofilter"
-
-inherit eutils
-
-DESCRIPTION="Sylpheed-Claws is an email client (and news reader) based on GTK+"
-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="~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.46 )
-	gnome? ( >=gnome-base/libgnomeprintui-2.2 )
-	startup-notification? ( x11-libs/startup-notification )
-	bogofilter? ( mail-filter/bogofilter )
-	!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
-	x11-misc/shared-mime-info"
-
-PROVIDE="virtual/sylpheed"
-
-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
-
-	if [ -d ${D}/usr/share/gnome ]; then
-		dodir /usr/share/applications
-		mv ${D}/usr/share/{gnome/apps/Internet,applications}/sylpheed-claws.desktop
-		rm -rf ${D}/usr/share/gnome
-	fi
-
-	# 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 res 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
-
-	# kill useless plugin files
-	rm -f ${D}/usr/lib*/${PN}/plugins/*.{la,a}
-}
-
-pkg_postinst() {
-	UPDATE_PLUGINS=""
-	for x in ${PLUGIN_NAMES}; do
-		has_version mail-client/sylpheed-claws-$x && UPDATE_PLUGINS="${UPDATE_PLUGINS} $x"
-	done
-	if [ -n "${UPDATE_PLUGINS}" ]; then
-		ewarn
-		ewarn "You have to re-emerge or update the following plugins:"
-		ewarn
-		for x in ${UPDATE_PLUGINS}; do
-			ewarn "    mail-client/sylpheed-claws-$x"
-		done
-		ewarn
-		epause 5
-		ebeep 3
-	fi
-}
diff --git a/mail-client/sylpheed-claws/sylpheed-claws-2.5.3.ebuild b/mail-client/sylpheed-claws/sylpheed-claws-2.5.3.ebuild
deleted file mode 100644
index be1d04d4d110..000000000000
--- a/mail-client/sylpheed-claws/sylpheed-claws-2.5.3.ebuild
+++ /dev/null
@@ -1,145 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/sylpheed-claws/sylpheed-claws-2.5.3.ebuild,v 1.1 2006/10/04 12:19:22 ticho Exp $
-
-IUSE="gnome dillo crypt spell ssl ldap ipv6 pda clamav xface kde imap spamassassin doc startup-notification bogofilter"
-
-inherit eutils
-
-DESCRIPTION="Sylpheed-Claws is an email client (and news reader) based on GTK+"
-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="~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.46 )
-	gnome? ( >=gnome-base/libgnomeprintui-2.2 )
-	startup-notification? ( x11-libs/startup-notification )
-	bogofilter? ( mail-filter/bogofilter )
-	!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
-	x11-misc/shared-mime-info"
-
-PROVIDE="virtual/sylpheed"
-
-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
-
-	if [ -d ${D}/usr/share/gnome ]; then
-		dodir /usr/share/applications
-		mv ${D}/usr/share/{gnome/apps/Internet,applications}/sylpheed-claws.desktop
-		rm -rf ${D}/usr/share/gnome
-	fi
-
-	# 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 res 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
-
-	# kill useless plugin files
-	rm -f ${D}/usr/lib*/${PN}/plugins/*.{la,a}
-}
-
-pkg_postinst() {
-	UPDATE_PLUGINS=""
-	for x in ${PLUGIN_NAMES}; do
-		has_version mail-client/sylpheed-claws-$x && UPDATE_PLUGINS="${UPDATE_PLUGINS} $x"
-	done
-	if [ -n "${UPDATE_PLUGINS}" ]; then
-		ewarn
-		ewarn "You have to re-emerge or update the following plugins:"
-		ewarn
-		for x in ${UPDATE_PLUGINS}; do
-			ewarn "    mail-client/sylpheed-claws-$x"
-		done
-		ewarn
-		epause 5
-		ebeep 3
-	fi
-}