Pruned unneeded versions.

Package-Manager: portage-2.1.2_pre2-r3

7 files changed, 8 insertions, 477 deletions

diff --git a/mail-client/sylpheed-claws/Manifest b/mail-client/sylpheed-claws/Manifest
index b2463eda8dbe..aa87d8c7cb74 100644
--- a/mail-client/sylpheed-claws/Manifest
+++ b/mail-client/sylpheed-claws/Manifest
@@ -10,10 +10,7 @@ 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.0.0.tar.bz2 3764105 RMD160 a22db4c76a324dc166f10ff6f189c5927530526a SHA1 c561fbb5de2a3922ad0c8ee0cfe8891f563765f4 SHA256 6f7e7c2ec81d6fa608f0efc785a81928dbafad3eae8b3ac3c58d3b3413eb344d
-DIST sylpheed-claws-2.2.3.tar.bz2 4642651 RMD160 2d7717a5f4c53230dacec6208b6fc442d69e526d SHA1 da1dff8faa403001e2c508c2fd3276a7c1465bfc SHA256 a35a679bb9c5e072a65db42092742758c8f5da9cf7f00d45105c065599480f5c
 DIST sylpheed-claws-2.3.0.tar.bz2 556485 RMD160 790889c3903513b35299870050d759edfc7011f9 SHA1 ed3ff6c87198dc7d7383b7ff11c14c0004875718 SHA256 87955608179410d7c8e4629c3b59fba57ac685d04332f0ce0f2f09c949ab63c6
-DIST sylpheed-claws-2.3.1.tar.bz2 4432975 RMD160 14743be45a22578ad54dba65ffb16d4066278033 SHA1 9a9935dc4c7ed04b45daf6c75d01dbe2f4920e3e SHA256 8fc36593b7543083d51a2d30408ccd268b0e071784b69c472e31e7293676b4bf
 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
@@ -21,22 +18,10 @@ EBUILD sylpheed-claws-1.0.5-r1.ebuild 3894 RMD160 94d6e87bebd4c7199bb47260836a40
 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.0.0.ebuild 4347 RMD160 f6c198d154533ade8e9e7068178c6bdd6b1ed0ae SHA1 e43d22e1a1279becfb985181221e449cfa8d00d5 SHA256 f8aae4f407d0522ffeeb2d97ab52d8e9f47caed1a6b67f4992ed7be498adb8bd
-MD5 565d23f0e0be4b157d3e886da53aed74 sylpheed-claws-2.0.0.ebuild 4347
-RMD160 f6c198d154533ade8e9e7068178c6bdd6b1ed0ae sylpheed-claws-2.0.0.ebuild 4347
-SHA256 f8aae4f407d0522ffeeb2d97ab52d8e9f47caed1a6b67f4992ed7be498adb8bd sylpheed-claws-2.0.0.ebuild 4347
-EBUILD sylpheed-claws-2.2.3.ebuild 4504 RMD160 42a4db1acae2dbb65ab4734e5b34bdff0679e696 SHA1 b5ec0df30ac9722f48d3718e8401742b22140875 SHA256 185a26ce0a0b2ed8dac5bdefcab63bb05a68f770ee3af6b756437a472a47e4f4
-MD5 12d4252a9acc25e8daa6ab71f469796b sylpheed-claws-2.2.3.ebuild 4504
-RMD160 42a4db1acae2dbb65ab4734e5b34bdff0679e696 sylpheed-claws-2.2.3.ebuild 4504
-SHA256 185a26ce0a0b2ed8dac5bdefcab63bb05a68f770ee3af6b756437a472a47e4f4 sylpheed-claws-2.2.3.ebuild 4504
 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.3.1.ebuild 4421 RMD160 24dc064d0b150e9d637f14b2ddc64da3f5238345 SHA1 131fb8201175b54b0200bb81dcbab8741fc5838f SHA256 e3a52f4c41e578e2025342ac6920bddc2d08b438ea95fd226386bd3f43b075cd
-MD5 60d47cd5e87170dce9756ced97dd1139 sylpheed-claws-2.3.1.ebuild 4421
-RMD160 24dc064d0b150e9d637f14b2ddc64da3f5238345 sylpheed-claws-2.3.1.ebuild 4421
-SHA256 e3a52f4c41e578e2025342ac6920bddc2d08b438ea95fd226386bd3f43b075cd sylpheed-claws-2.3.1.ebuild 4421
 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
@@ -49,10 +34,10 @@ EBUILD sylpheed-claws-2.5.3.ebuild 4516 RMD160 14d94fe939dd58075c443fbae3adb92aa
 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 31754 RMD160 d526dbfb2d5445a826136f88a1c713652ad679a5 SHA1 29176ce57a8ef6cedf46aae979f62474e418501a SHA256 979140e8856e156390634099eb1aab50ddb83b937490d15d02f30ef7dc5b447b
-MD5 10354a594d3fc253f810b557cbfe8a19 ChangeLog 31754
-RMD160 d526dbfb2d5445a826136f88a1c713652ad679a5 ChangeLog 31754
-SHA256 979140e8856e156390634099eb1aab50ddb83b937490d15d02f30ef7dc5b447b ChangeLog 31754
+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
@@ -60,18 +45,9 @@ SHA256 3787959f4a775b1e787b35ff8380949d8f68bd67b81c2cf5a748733c9740cb94 metadata
 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 a1eac34c9f5178a960a23b5cb711365a files/digest-sylpheed-claws-2.0.0 268
-RMD160 adcbd602816cd020626fa5ca6f56ed663b50bd48 files/digest-sylpheed-claws-2.0.0 268
-SHA256 05805ff28a06f60706cc6ca703f70e9edcd1768dc2b134b48e1d3d664d844fa7 files/digest-sylpheed-claws-2.0.0 268
-MD5 fb5a8abc743756dad5e6b6884677e122 files/digest-sylpheed-claws-2.2.3 268
-RMD160 e60d43f469381264ed67375314942f122b8439fb files/digest-sylpheed-claws-2.2.3 268
-SHA256 32523ea211ab9951ba44ca6c9958f772fad4efc66d0dfec535423edfb84388f0 files/digest-sylpheed-claws-2.2.3 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 9bd54c50c7a6d1561a68a7e2835f783f files/digest-sylpheed-claws-2.3.1 268
-RMD160 9127232dff98a1b1effd1534e9c55aaf15b83242 files/digest-sylpheed-claws-2.3.1 268
-SHA256 eb3810c8e07c59b0bd708ef7278b57299280d798683b6532a4dd6b63a2b1cb61 files/digest-sylpheed-claws-2.3.1 268
 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
@@ -82,9 +58,9 @@ 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
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
+Version: GnuPG v1.4.4 (GNU/Linux)
 
-iD8DBQFFI6bd10xuJSrg3/sRApTzAJ0bEGrpcC6HaRaQFo4cyUx/cN/2hwCeK9OP
-Pendh2h1vYno/fEkiJRGKQA=
-=02W2
+iD8DBQFFJE/1QlM6RnzZP+IRAnU2AJ9+jTS4fq3T7ni7q+v2tBJEonXZBwCgmrxi
+gwXex48S5B3wMCuo069AZwQ=
+=QjcO
 -----END PGP SIGNATURE-----
diff --git a/mail-client/sylpheed-claws/files/digest-sylpheed-claws-2.0.0 b/mail-client/sylpheed-claws/files/digest-sylpheed-claws-2.0.0
deleted file mode 100644
index 5546e529919b..000000000000
--- a/mail-client/sylpheed-claws/files/digest-sylpheed-claws-2.0.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 6e26f8e36772b71361d0c463b9a6c7a1 sylpheed-claws-2.0.0.tar.bz2 3764105
-RMD160 a22db4c76a324dc166f10ff6f189c5927530526a sylpheed-claws-2.0.0.tar.bz2 3764105
-SHA256 6f7e7c2ec81d6fa608f0efc785a81928dbafad3eae8b3ac3c58d3b3413eb344d sylpheed-claws-2.0.0.tar.bz2 3764105
diff --git a/mail-client/sylpheed-claws/files/digest-sylpheed-claws-2.2.3 b/mail-client/sylpheed-claws/files/digest-sylpheed-claws-2.2.3
deleted file mode 100644
index 44d1217a85b3..000000000000
--- a/mail-client/sylpheed-claws/files/digest-sylpheed-claws-2.2.3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 870eb4de8dc242f16171145d8af725b9 sylpheed-claws-2.2.3.tar.bz2 4642651
-RMD160 2d7717a5f4c53230dacec6208b6fc442d69e526d sylpheed-claws-2.2.3.tar.bz2 4642651
-SHA256 a35a679bb9c5e072a65db42092742758c8f5da9cf7f00d45105c065599480f5c sylpheed-claws-2.2.3.tar.bz2 4642651
diff --git a/mail-client/sylpheed-claws/files/digest-sylpheed-claws-2.3.1 b/mail-client/sylpheed-claws/files/digest-sylpheed-claws-2.3.1
deleted file mode 100644
index 74c7c9ff3d5e..000000000000
--- a/mail-client/sylpheed-claws/files/digest-sylpheed-claws-2.3.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 08e8fe1f3466d146b499d128f1445ba6 sylpheed-claws-2.3.1.tar.bz2 4432975
-RMD160 14743be45a22578ad54dba65ffb16d4066278033 sylpheed-claws-2.3.1.tar.bz2 4432975
-SHA256 8fc36593b7543083d51a2d30408ccd268b0e071784b69c472e31e7293676b4bf sylpheed-claws-2.3.1.tar.bz2 4432975
diff --git a/mail-client/sylpheed-claws/sylpheed-claws-2.0.0.ebuild b/mail-client/sylpheed-claws/sylpheed-claws-2.0.0.ebuild
deleted file mode 100644
index 313fe1328fa3..000000000000
--- a/mail-client/sylpheed-claws/sylpheed-claws-2.0.0.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.0.0.ebuild,v 1.12 2006/08/05 06:10:54 genone Exp $
-
-IUSE="gnome dillo crypt spell ssl ldap ipv6 pda clamav xface kde imap spamassassin doc"
-
-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.41 )
-	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"
-
-PLUGIN_NAMES="acpi-notifier att-remover cachesaver etpan-privacy fetchinfo maildir mailmbox perl rssyl 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`"
-
-	# 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
-}
-
-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 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.2.3.ebuild b/mail-client/sylpheed-claws/sylpheed-claws-2.2.3.ebuild
deleted file mode 100644
index 8e9c3f4d0cf0..000000000000
--- a/mail-client/sylpheed-claws/sylpheed-claws-2.2.3.ebuild
+++ /dev/null
@@ -1,147 +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.2.3.ebuild,v 1.3 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
-
-	# wait for upstream: move manpage
-	mv ${D}/usr/share/man/man1/sylpheed{,-claws}.1
-
-	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.3.1.ebuild b/mail-client/sylpheed-claws/sylpheed-claws-2.3.1.ebuild
deleted file mode 100644
index b25c6e402ac1..000000000000
--- a/mail-client/sylpheed-claws/sylpheed-claws-2.3.1.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.1.ebuild,v 1.2 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
-}