clean up

(Portage version: 2.1.9.42/cvs/Linux i686)

4 files changed, 6 insertions, 330 deletions

diff --git a/mail-client/claws-mail/ChangeLog b/mail-client/claws-mail/ChangeLog
index fda197d3345a..2273ddd39840 100644
--- a/mail-client/claws-mail/ChangeLog
+++ b/mail-client/claws-mail/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for mail-client/claws-mail
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/claws-mail/ChangeLog,v 1.168 2011/03/06 13:04:33 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/claws-mail/ChangeLog,v 1.169 2011/03/06 13:10:11 fauli Exp $
+
+  06 Mar 2011; Christian Faulhammer <fauli@gentoo.org>
+  -claws-mail-3.7.5.ebuild, -claws-mail-3.7.5-r1.ebuild,
+  -files/claws-mail-3.7.5-fix-libetpan-check.patch:
+  clean up
 
   06 Mar 2011; Christian Faulhammer <fauli@gentoo.org>
   claws-mail-3.7.5-r1.ebuild, claws-mail-3.7.6.ebuild,
diff --git a/mail-client/claws-mail/claws-mail-3.7.5-r1.ebuild b/mail-client/claws-mail/claws-mail-3.7.5-r1.ebuild
deleted file mode 100644
index a4fd1b8732a8..000000000000
--- a/mail-client/claws-mail/claws-mail-3.7.5-r1.ebuild
+++ /dev/null
@@ -1,163 +0,0 @@
-# Copyright 1999-2011 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.7.5-r1.ebuild,v 1.2 2011/03/06 13:04:33 fauli Exp $
-
-EAPI="2"
-
-inherit eutils multilib autotools
-
-DESCRIPTION="An email client (and news reader) based on GTK+"
-HOMEPAGE="http://www.claws-mail.org/"
-
-SRC_URI="mirror://sourceforge/sylpheed-claws/${P}.tar.bz2"
-
-SLOT="0"
-LICENSE="GPL-3"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="bogofilter crypt dbus dillo doc gnome +gnutls +imap ipv6 ldap nntp pda session smime spamassassin spell ssl startup-notification xface"
-
-COMMONDEPEND=">=x11-libs/gtk+-2.6:2
-	pda? ( >=app-pda/jpilot-0.99 )
-	ssl? ( >=net-libs/gnutls-2.0.3 )
-	ldap? ( >=net-nds/openldap-2.0.7 )
-	crypt? ( >=app-crypt/gpgme-0.4.5 )
-	dbus? ( >=dev-libs/dbus-glib-0.60 )
-	dillo? ( www-client/dillo )
-	spell? ( >=app-text/enchant-1.0.0 )
-	imap? ( >=net-libs/libetpan-0.57 )
-	nntp? ( >=net-libs/libetpan-0.57 )
-	gnome? ( >=gnome-base/libgnomeprintui-2.2 )
-	gnutls? ( >=net-libs/gnutls-2.0.3 )
-	startup-notification? ( x11-libs/startup-notification )
-	bogofilter? ( mail-filter/bogofilter )
-	session? ( x11-libs/libSM
-			x11-libs/libICE )
-	smime? ( >=app-crypt/gpgme-0.4.5 )"
-
-DEPEND="${COMMONDEPEND}
-	xface? ( >=media-libs/compface-1.4 )
-	dev-util/pkgconfig"
-
-RDEPEND="${COMMONDEPEND}
-	app-misc/mime-types
-	x11-misc/shared-mime-info"
-
-PLUGIN_NAMES="acpi-notifier archive att-remover attachwarner bsfilter cachesaver fancy fetchinfo gtkhtml mailmbox newmail notification perl rssyl spam_report tnef_parse vcalendar"
-
-src_prepare() {
-	# fix configure check for >libetpan-0.57 (bug #314181, fixed upstream)
-	epatch "${FILESDIR}"/${P}-fix-libetpan-check.patch
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-	# libetpan is needed if user wants nntp or imap functionality
-	if use imap || use nntp; then
-		myconf="--enable-libetpan"
-	else
-		myconf="--disable-libetpan"
-	fi
-
-	# The usage of openssl was discarded once and USE=ssl is mapped to
-	# USE=gnutls now.  Maybe USE=ssl can fade out sometime
-	if use ssl || use gnutls; then
-		myconf="${myconf} --enable-gnutls"
-	else
-		myconf="${myconf} --disable-gnutls"
-	fi
-
-	econf \
-		$(use_enable gnome gnomeprint) \
-		$(use_enable ipv6) \
-		$(use_enable ldap) \
-		$(use_enable dbus) \
-		$(use_enable pda jpilot) \
-		$(use_enable spell enchant) \
-		$(use_enable xface compface) \
-		$(use_enable doc manual) \
-		$(use_enable startup-notification) \
-		$(use_enable session libsm) \
-		$(use_enable crypt pgpmime-plugin) \
-		$(use_enable crypt pgpinline-plugin) \
-		$(use_enable crypt pgpcore-plugin) \
-		$(use_enable dillo dillo-viewer-plugin) \
-		$(use_enable spamassassin spamassassin-plugin) \
-		$(use_enable bogofilter bogofilter-plugin) \
-		$(use_enable smime smime-plugin) \
-		--docdir=/usr/share/doc/${PF} \
-		--enable-trayicon-plugin \
-		--disable-maemo ${myconf}
-}
-
-src_install() {
-	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
-	# => 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/$(get_libdir)/${PN}/tools
-	doexe *.pl *.py *.conf *.sh || die
-	doexe tb2claws-mail update-po uudec uuooffice || die
-
-	# 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
-}
-
-pkg_postrm() {
-	gtk-update-icon-cache -f -t "${ROOT}"/usr/share/icons/hicolor
-}
diff --git a/mail-client/claws-mail/claws-mail-3.7.5.ebuild b/mail-client/claws-mail/claws-mail-3.7.5.ebuild
deleted file mode 100644
index d9af66f87c95..000000000000
--- a/mail-client/claws-mail/claws-mail-3.7.5.ebuild
+++ /dev/null
@@ -1,151 +0,0 @@
-# Copyright 1999-2010 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.7.5.ebuild,v 1.7 2010/05/11 17:50:02 ranger Exp $
-
-inherit eutils multilib
-
-DESCRIPTION="An email client (and news reader) based on GTK+"
-HOMEPAGE="http://www.claws-mail.org/"
-
-SRC_URI="mirror://sourceforge/sylpheed-claws/${P}.tar.bz2"
-
-SLOT="0"
-LICENSE="GPL-3"
-KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="bogofilter crypt dbus dillo doc gnome gnutls imap ipv6 ldap nntp pda session smime spamassassin spell ssl startup-notification xface"
-
-COMMONDEPEND=">=x11-libs/gtk+-2.6
-	pda? ( >=app-pda/jpilot-0.99 )
-	ssl? ( >=net-libs/gnutls-2.0.3 )
-	ldap? ( >=net-nds/openldap-2.0.7 )
-	crypt? ( >=app-crypt/gpgme-0.4.5 )
-	dbus? ( >=dev-libs/dbus-glib-0.60 )
-	dillo? ( www-client/dillo )
-	spell? ( >=app-text/enchant-1.0.0 )
-	imap? ( >=net-libs/libetpan-0.57 )
-	nntp? ( >=net-libs/libetpan-0.57 )
-	gnome? ( >=gnome-base/libgnomeprintui-2.2 )
-	gnutls? ( >=net-libs/gnutls-2.0.3 )
-	startup-notification? ( x11-libs/startup-notification )
-	bogofilter? ( mail-filter/bogofilter )
-	session? ( x11-libs/libSM
-			x11-libs/libICE )
-	smime? ( >=app-crypt/gpgme-0.4.5 )"
-
-DEPEND="${COMMONDEPEND}
-	xface? ( >=media-libs/compface-1.4 )
-	dev-util/pkgconfig"
-
-RDEPEND="${COMMONDEPEND}
-	app-misc/mime-types
-	x11-misc/shared-mime-info"
-
-PLUGIN_NAMES="acpi-notifier archive att-remover attachwarner bsfilter cachesaver fancy fetchinfo gtkhtml mailmbox newmail notification perl rssyl spam_report tnef_parse vcalendar"
-
-src_compile() {
-	local myconf="--disable-libetpan --disable-gnutls"
-
-	# libetpan is needed if user wants nntp or imap functionality
-	use imap && myconf="${myconf} --enable-libetpan"
-	use nntp && myconf="${myconf} --enable-libetpan"
-	# The usage of openssl was discarded once and USE=ssl is mapped to
-	# USE=gnutls now.  Maybe USE=ssl can fade out sometime
-	use ssl && myconf="${myconf} --enable-gnutls"
-	use gnutls && myconf="${myconf} --enable-gnutls"
-
-	econf \
-		$(use_enable gnome gnomeprint) \
-		$(use_enable ipv6) \
-		$(use_enable ldap) \
-		$(use_enable dbus) \
-		$(use_enable pda jpilot) \
-		$(use_enable spell enchant) \
-		$(use_enable xface compface) \
-		$(use_enable doc manual) \
-		$(use_enable startup-notification) \
-		$(use_enable session libsm) \
-		$(use_enable crypt pgpmime-plugin) \
-		$(use_enable crypt pgpinline-plugin) \
-		$(use_enable crypt pgpcore-plugin) \
-		$(use_enable dillo dillo-viewer-plugin) \
-		$(use_enable spamassassin spamassassin-plugin) \
-		$(use_enable bogofilter bogofilter-plugin) \
-		$(use_enable smime smime-plugin) \
-		--docdir=/usr/share/doc/${PF} \
-		--enable-trayicon-plugin \
-		--disable-maemo ${myconf} || die
-
-	emake || die
-}
-
-src_install() {
-	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
-	# => 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/$(get_libdir)/${PN}/tools
-	doexe *.pl *.py *.conf *.sh || die
-	doexe tb2claws-mail update-po uudec uuooffice || die
-
-	# 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
-}
-
-pkg_postrm() {
-	gtk-update-icon-cache -f -t "${ROOT}"/usr/share/icons/hicolor
-}
diff --git a/mail-client/claws-mail/files/claws-mail-3.7.5-fix-libetpan-check.patch b/mail-client/claws-mail/files/claws-mail-3.7.5-fix-libetpan-check.patch
deleted file mode 100644
index 368522738a9f..000000000000
--- a/mail-client/claws-mail/files/claws-mail-3.7.5-fix-libetpan-check.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- configure.ac.orig	2010-04-20 20:55:13.775539738 +0200
-+++ configure.ac	2010-04-20 20:57:56.872533578 +0200
-@@ -973,7 +973,12 @@
- 	if test "x$libetpan_result" = "xyes"; then
- 	   LIBETPAN_CPPFLAGS="`$libetpanconfig --cflags`"
- 	   LIBETPAN_LIBS="`$libetpanconfig --libs`"
-+	   LIBETPAN_STABLE=`$libetpanconfig --version | grep -v ^0`
- 	   LIBETPAN_VERSION=`$libetpanconfig --version | sed "s/\.//g" | sed "s/-.*$//"`
-+	   if test x"$LIBETPAN_STABLE" != "x"; then
-+              LIBETPAN_VERSION="100"
-+           fi
-+
- 	   if test "$LIBETPAN_VERSION" -lt "057"; then
- 		AC_MSG_RESULT([*** Claws Mail requires libetpan 0.57 or newer. See http://www.etpan.org/])
- 		AC_MSG_RESULT([*** You can use --disable-libetpan if you don't need IMAP4 and/or NNTP support.])