clean up

(Portage version: 2.1.10.49/cvs/Linux i686)

5 files changed, 6 insertions, 324 deletions

diff --git a/mail-client/claws-mail/ChangeLog b/mail-client/claws-mail/ChangeLog
index 954f1b75493d..cc7ba5d631e9 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-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/claws-mail/ChangeLog,v 1.201 2012/04/07 11:25:03 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/claws-mail/ChangeLog,v 1.202 2012/04/11 21:03:16 fauli Exp $
+
+  11 Apr 2012; Christian Faulhammer <fauli@gentoo.org>
+  -claws-mail-3.7.9-r1.ebuild, -files/claws-mail-3.7.9-fix-nossl.patch,
+  -files/claws-mail-3.7.9_notify_crash.patch, -claws-mail-3.7.10.ebuild:
+  clean up
 
   07 Apr 2012; Markus Meier <maekke@gentoo.org> claws-mail-3.8.0.ebuild:
   x86 stable, bug #387547
diff --git a/mail-client/claws-mail/claws-mail-3.7.10.ebuild b/mail-client/claws-mail/claws-mail-3.7.10.ebuild
deleted file mode 100644
index c5a8a8604732..000000000000
--- a/mail-client/claws-mail/claws-mail-3.7.10.ebuild
+++ /dev/null
@@ -1,141 +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.10.ebuild,v 1.7 2011/12/18 18:07:47 armin76 Exp $
-
-EAPI="4"
-
-inherit multilib gnome2-utils
-
-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 +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 )
-	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 address_keeper archive att-remover attachwarner clamd fancy fetchinfo gdata gtkhtml mailmbox newmail notification perl python rssyl spam_report tnef_parse vcalendar"
-
-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 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_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-
-	UPDATE_PLUGINS=""
-	for x in ${PLUGIN_NAMES}; do
-		has_version mail-client/${PN}-$x && UPDATE_PLUGINS="${UPDATE_PLUGINS} $x"
-	done
-	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() {
-	gnome2_icon_cache_update
-}
diff --git a/mail-client/claws-mail/claws-mail-3.7.9-r1.ebuild b/mail-client/claws-mail/claws-mail-3.7.9-r1.ebuild
deleted file mode 100644
index ff7ee7b060d1..000000000000
--- a/mail-client/claws-mail/claws-mail-3.7.9-r1.ebuild
+++ /dev/null
@@ -1,146 +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.9-r1.ebuild,v 1.8 2011/07/30 11:24:43 armin76 Exp $
-
-EAPI="2"
-
-inherit eutils multilib gnome2-utils
-
-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 +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 )
-	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 address_keeper archive att-remover attachwarner clamd fancy fetchinfo gtkhtml mailmbox newmail notification perl python rssyl spam_report tnef_parse vcalendar"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}_notify_crash.patch
-	epatch "${FILESDIR}"/${P}-fix-nossl.patch
-}
-
-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 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_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-
-	UPDATE_PLUGINS=""
-	for x in ${PLUGIN_NAMES}; do
-		has_version mail-client/${PN}-$x && UPDATE_PLUGINS="${UPDATE_PLUGINS} $x"
-	done
-	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() {
-	gnome2_icon_cache_update
-}
diff --git a/mail-client/claws-mail/files/claws-mail-3.7.9-fix-nossl.patch b/mail-client/claws-mail/files/claws-mail-3.7.9-fix-nossl.patch
deleted file mode 100644
index ee73474e638d..000000000000
--- a/mail-client/claws-mail/files/claws-mail-3.7.9-fix-nossl.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Building without SSL support (USE="-ssl -gnutls") leads to a build
-failure because of misplaced #ifdefs in code.  Fixed for versions
-greater than 3.7.9 in upstream repository.
-
-Gentoo bug: https://bugs.gentoo.org/show_bug.cgi?id=373611
-Upstream bug: http://www.thewildbeast.co.uk/claws-mail/bugzilla/show_bug.cgi?id=2462
-
---- src/wizard.c
-+++ src/wizard.c
-@@ -1253,8 +1253,8 @@
- 	GtkWidget *hbox;
- 	GtkWidget *hbox_spc;
- 	GtkWidget *smtp_auth_table;
--#ifdef USE_GNUTLS
- 	GtkWidget *label;
-+#ifdef USE_GNUTLS
- 	GtkWidget *button;
- 	GtkWidget *smtp_cert_table;
- #endif
diff --git a/mail-client/claws-mail/files/claws-mail-3.7.9_notify_crash.patch b/mail-client/claws-mail/files/claws-mail-3.7.9_notify_crash.patch
deleted file mode 100644
index 5e5cdc991cda..000000000000
--- a/mail-client/claws-mail/files/claws-mail-3.7.9_notify_crash.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Fixes crash with libnotify, fixed in versions after 3.7.9
-
-Gentoo bug: http://bugs.gentoo.org/show_bug.cgi?id=362297
-Upstream bug: http://www.thewildbeast.co.uk/claws-mail/bugzilla/show_bug.cgi?id=2414
-
-
---- src/main.c.orig
-+++ src/main.c
-@@ -331,7 +331,7 @@
- 		gtk_widget_show(hack);
- 	}
- 
--	xdisplay = gdk_display_get_default();
-+	xdisplay = GDK_DISPLAY_XDISPLAY(gdk_display_get_default());
- 	sn_display = sn_display_new(xdisplay,
- 				sn_error_trap_push,
- 				sn_error_trap_pop);