clean up

Package-Manager: portage-2.1.10.49/cvs/Linux i686

44 files changed, 96 insertions, 1041 deletions

diff --git a/mail-client/claws-mail-acpi-notifier/ChangeLog b/mail-client/claws-mail-acpi-notifier/ChangeLog
index 9454f8bc957e..6e43d637b5a8 100644
--- a/mail-client/claws-mail-acpi-notifier/ChangeLog
+++ b/mail-client/claws-mail-acpi-notifier/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for mail-client/claws-mail-acpi-notifier
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/claws-mail-acpi-notifier/ChangeLog,v 1.61 2012/04/07 11:25:49 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/claws-mail-acpi-notifier/ChangeLog,v 1.62 2012/04/11 21:07:31 fauli Exp $
+
+  11 Apr 2012; Christian Faulhammer <fauli@gentoo.org>
+  -claws-mail-acpi-notifier-1.0.25.ebuild:
+  clean up
 
   07 Apr 2012; Markus Meier <maekke@gentoo.org>
   claws-mail-acpi-notifier-1.0.26.ebuild:
diff --git a/mail-client/claws-mail-acpi-notifier/claws-mail-acpi-notifier-1.0.25.ebuild b/mail-client/claws-mail-acpi-notifier/claws-mail-acpi-notifier-1.0.25.ebuild
deleted file mode 100644
index 6891ef20cdd9..000000000000
--- a/mail-client/claws-mail-acpi-notifier/claws-mail-acpi-notifier-1.0.25.ebuild
+++ /dev/null
@@ -1,43 +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-acpi-notifier/claws-mail-acpi-notifier-1.0.25.ebuild,v 1.4 2011/07/16 18:16:29 hwoarang Exp $
-
-inherit eutils
-
-MY_P="${P#claws-mail-}"
-MY_P="${MY_P/-/_}"
-
-DESCRIPTION="This plugin enables mail notification via LEDs on some laptops."
-HOMEPAGE="http://www.claws-mail.org/"
-SRC_URI="http://www.claws-mail.org/downloads/plugins/${MY_P}.tar.gz"
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-RDEPEND=">=mail-client/claws-mail-3.7.9"
-DEPEND="${RDEPEND}
-		dev-util/pkgconfig"
-
-S="${WORKDIR}/${MY_P}"
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog NEWS README
-
-	# kill useless files
-	rm -f "${D}"/usr/lib*/claws-mail/plugins/*.{a,la}
-}
-
-pkg_postinst() {
-	PROC_IFACES="$(echo /proc/acpi/{asus/mled,ibm/led,acer/mailled}) /proc/driver/acerhk/led"
-
-	local procfile
-	local message_shown=false
-
-	for procfile in ${PROC_IFACES}; do
-		if [[ -f ${procfile} ]]; then
-			elog "Make sure ${procfile} is writable by users of this plugin."
-			message_shown=true
-		fi
-	done
-}
diff --git a/mail-client/claws-mail-address_keeper/ChangeLog b/mail-client/claws-mail-address_keeper/ChangeLog
index 62c6c78bc254..6beee69975b0 100644
--- a/mail-client/claws-mail-address_keeper/ChangeLog
+++ b/mail-client/claws-mail-address_keeper/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for mail-client/claws-mail-address_keeper
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/claws-mail-address_keeper/ChangeLog,v 1.18 2012/04/07 11:26:37 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/claws-mail-address_keeper/ChangeLog,v 1.19 2012/04/11 21:14:16 fauli Exp $
+
+  11 Apr 2012; Christian Faulhammer <fauli@gentoo.org>
+  -claws-mail-address_keeper-1.0.4.ebuild:
+  clean up
 
   07 Apr 2012; Markus Meier <maekke@gentoo.org>
   claws-mail-address_keeper-1.0.5.ebuild:
diff --git a/mail-client/claws-mail-address_keeper/claws-mail-address_keeper-1.0.4.ebuild b/mail-client/claws-mail-address_keeper/claws-mail-address_keeper-1.0.4.ebuild
deleted file mode 100644
index 7844e841d69c..000000000000
--- a/mail-client/claws-mail-address_keeper/claws-mail-address_keeper-1.0.4.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/claws-mail-address_keeper/claws-mail-address_keeper-1.0.4.ebuild,v 1.4 2012/03/31 14:15:20 klausman Exp $
-
-inherit eutils
-
-MY_P="${P#claws-mail-}"
-
-DESCRIPTION="Plugin for Claws to collect all recipients in an address book folder"
-HOMEPAGE="http://www.claws-mail.org/"
-SRC_URI="http://www.claws-mail.org/downloads/plugins/${MY_P}.tar.gz"
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="alpha amd64 x86"
-IUSE=""
-RDEPEND=">=mail-client/claws-mail-3.7.10"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-S="${WORKDIR}/${MY_P}"
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog README
-
-	# kill useless files
-	rm -f "${D}"/usr/lib*/claws-mail/plugins/*.{a,la}
-}
diff --git a/mail-client/claws-mail-archive/ChangeLog b/mail-client/claws-mail-archive/ChangeLog
index 8bdf86ad3a75..ece49bcc0a9c 100644
--- a/mail-client/claws-mail-archive/ChangeLog
+++ b/mail-client/claws-mail-archive/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for mail-client/claws-mail-archive
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/claws-mail-archive/ChangeLog,v 1.42 2012/04/07 11:27:28 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/claws-mail-archive/ChangeLog,v 1.43 2012/04/11 21:18:06 fauli Exp $
+
+  11 Apr 2012; Christian Faulhammer <fauli@gentoo.org>
+  -claws-mail-archive-0.6.10.ebuild:
+  clean up
 
   07 Apr 2012; Markus Meier <maekke@gentoo.org>
   claws-mail-archive-0.6.11.ebuild:
diff --git a/mail-client/claws-mail-archive/claws-mail-archive-0.6.10.ebuild b/mail-client/claws-mail-archive/claws-mail-archive-0.6.10.ebuild
deleted file mode 100644
index 68ba5e2d797d..000000000000
--- a/mail-client/claws-mail-archive/claws-mail-archive-0.6.10.ebuild
+++ /dev/null
@@ -1,30 +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-archive/claws-mail-archive-0.6.10.ebuild,v 1.3 2011/10/29 11:10:00 hwoarang Exp $
-
-inherit eutils
-
-MY_P="${P#claws-mail-}"
-
-DESCRIPTION="Plugin for Claws to add archiving features"
-HOMEPAGE="http://www.claws-mail.org/"
-SRC_URI="http://www.claws-mail.org/downloads/plugins/${MY_P}.tar.gz"
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE=""
-RDEPEND=">=mail-client/claws-mail-3.7.10
-	app-arch/libarchive
-	>=net-misc/curl-7.9.7"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-S="${WORKDIR}/${MY_P}"
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog README
-
-	# kill useless files
-	rm -f "${D}"/usr/lib*/claws-mail/plugins/*.{a,la}
-}
diff --git a/mail-client/claws-mail-att-remover/ChangeLog b/mail-client/claws-mail-att-remover/ChangeLog
index 7ff340500e38..51e96e79a66d 100644
--- a/mail-client/claws-mail-att-remover/ChangeLog
+++ b/mail-client/claws-mail-att-remover/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for mail-client/claws-mail-att-remover
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/claws-mail-att-remover/ChangeLog,v 1.46 2012/04/07 11:29:07 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/claws-mail-att-remover/ChangeLog,v 1.47 2012/04/11 21:09:11 fauli Exp $
+
+  11 Apr 2012; Christian Faulhammer <fauli@gentoo.org>
+  -claws-mail-att-remover-1.0.12.ebuild:
+  clean up
 
   07 Apr 2012; Markus Meier <maekke@gentoo.org>
   claws-mail-att-remover-1.0.13.ebuild:
diff --git a/mail-client/claws-mail-att-remover/claws-mail-att-remover-1.0.12.ebuild b/mail-client/claws-mail-att-remover/claws-mail-att-remover-1.0.12.ebuild
deleted file mode 100644
index 954a23d210a5..000000000000
--- a/mail-client/claws-mail-att-remover/claws-mail-att-remover-1.0.12.ebuild
+++ /dev/null
@@ -1,29 +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-att-remover/claws-mail-att-remover-1.0.12.ebuild,v 1.5 2010/12/28 13:12:34 ranger Exp $
-
-inherit eutils
-
-MY_P="${P#claws-mail-}"
-MY_P="${MY_P/-/_}"
-
-DESCRIPTION="This plugin lets you remove attachments from mails."
-HOMEPAGE="http://www.claws-mail.org/"
-SRC_URI="http://www.claws-mail.org/downloads/plugins/${MY_P}.tar.gz"
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ppc64 x86"
-IUSE=""
-RDEPEND=">=mail-client/claws-mail-3.7.6"
-DEPEND="${RDEPEND}
-		dev-util/pkgconfig"
-
-S="${WORKDIR}/${MY_P}"
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog README
-
-	# kill useless files
-	rm -f "${D}"usr/lib*/claws-mail/plugins/*.{a,la}
-}
diff --git a/mail-client/claws-mail-attachwarner/ChangeLog b/mail-client/claws-mail-attachwarner/ChangeLog
index 97b99b9e049f..93945b073862 100644
--- a/mail-client/claws-mail-attachwarner/ChangeLog
+++ b/mail-client/claws-mail-attachwarner/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for mail-client/claws-mail-attachwarner
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/claws-mail-attachwarner/ChangeLog,v 1.65 2012/04/07 11:28:15 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/claws-mail-attachwarner/ChangeLog,v 1.66 2012/04/11 21:24:05 fauli Exp $
+
+  11 Apr 2012; Christian Faulhammer <fauli@gentoo.org>
+  -claws-mail-attachwarner-0.2.22.ebuild:
+  clean up
 
   07 Apr 2012; Markus Meier <maekke@gentoo.org>
   claws-mail-attachwarner-0.2.23.ebuild:
diff --git a/mail-client/claws-mail-attachwarner/claws-mail-attachwarner-0.2.22.ebuild b/mail-client/claws-mail-attachwarner/claws-mail-attachwarner-0.2.22.ebuild
deleted file mode 100644
index 96e699bd276c..000000000000
--- a/mail-client/claws-mail-attachwarner/claws-mail-attachwarner-0.2.22.ebuild
+++ /dev/null
@@ -1,32 +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-attachwarner/claws-mail-attachwarner-0.2.22.ebuild,v 1.3 2011/10/29 11:06:58 hwoarang Exp $
-
-MY_P="${P#claws-mail-}"
-
-DESCRIPTION="Warn about missing attachment, if it's mentioned in message body."
-HOMEPAGE="http://www.claws-mail.org/"
-SRC_URI="http://www.claws-mail.org/downloads/plugins/${MY_P}.tar.gz"
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="nls"
-RDEPEND=">=mail-client/claws-mail-3.7.10
-		nls? ( >=sys-devel/gettext-0.12.1 )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-S="${WORKDIR}/${MY_P}"
-
-src_compile() {
-	econf $(use_enable nls) || die
-	emake || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc ChangeLog README
-
-	# kill useless files
-	rm -f "${D}"/usr/lib*/claws-mail/plugins/*.{a,la}
-}
diff --git a/mail-client/claws-mail-clamd/ChangeLog b/mail-client/claws-mail-clamd/ChangeLog
index e3a08840d6d8..f5634c92e100 100644
--- a/mail-client/claws-mail-clamd/ChangeLog
+++ b/mail-client/claws-mail-clamd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for mail-client/claws-mail-clamd
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/claws-mail-clamd/ChangeLog,v 1.17 2012/04/07 11:29:45 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/claws-mail-clamd/ChangeLog,v 1.18 2012/04/11 21:15:05 fauli Exp $
+
+  11 Apr 2012; Christian Faulhammer <fauli@gentoo.org>
+  -claws-mail-clamd-3.5.2.ebuild:
+  clean up
 
   07 Apr 2012; Markus Meier <maekke@gentoo.org> claws-mail-clamd-3.5.3.ebuild:
   x86 stable, bug #387547
diff --git a/mail-client/claws-mail-clamd/claws-mail-clamd-3.5.2.ebuild b/mail-client/claws-mail-clamd/claws-mail-clamd-3.5.2.ebuild
deleted file mode 100644
index 8afc3799af45..000000000000
--- a/mail-client/claws-mail-clamd/claws-mail-clamd-3.5.2.ebuild
+++ /dev/null
@@ -1,29 +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-clamd/claws-mail-clamd-3.5.2.ebuild,v 1.3 2011/10/29 11:10:38 hwoarang Exp $
-
-inherit eutils
-
-MY_P="${P#claws-mail-}"
-
-DESCRIPTION="Plugin for Claws to scan for viruses"
-HOMEPAGE="http://www.claws-mail.org/"
-SRC_URI="http://www.claws-mail.org/downloads/plugins/${MY_P}.tar.gz"
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-RDEPEND=">=mail-client/claws-mail-3.7.10"
-DEPEND="${RDEPEND}
-	app-antivirus/clamav
-	dev-util/pkgconfig"
-
-S="${WORKDIR}/${MY_P}"
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog README
-
-	# kill useless files
-	rm -f "${D}"/usr/lib*/claws-mail/plugins/*.{a,la}
-}
diff --git a/mail-client/claws-mail-fancy/ChangeLog b/mail-client/claws-mail-fancy/ChangeLog
index 2f3ab4d84799..f866d2d43824 100644
--- a/mail-client/claws-mail-fancy/ChangeLog
+++ b/mail-client/claws-mail-fancy/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for mail-client/claws-mail-fancy
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/claws-mail-fancy/ChangeLog,v 1.36 2012/04/07 11:30:25 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/claws-mail-fancy/ChangeLog,v 1.37 2012/04/11 21:19:06 fauli Exp $
+
+  11 Apr 2012; Christian Faulhammer <fauli@gentoo.org>
+  -claws-mail-fancy-0.9.14.ebuild:
+  clean up
 
   07 Apr 2012; Markus Meier <maekke@gentoo.org> claws-mail-fancy-0.9.15.ebuild:
   x86 stable, bug #387547
diff --git a/mail-client/claws-mail-fancy/claws-mail-fancy-0.9.14.ebuild b/mail-client/claws-mail-fancy/claws-mail-fancy-0.9.14.ebuild
deleted file mode 100644
index 5d29a55cc1b8..000000000000
--- a/mail-client/claws-mail-fancy/claws-mail-fancy-0.9.14.ebuild
+++ /dev/null
@@ -1,29 +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-fancy/claws-mail-fancy-0.9.14.ebuild,v 1.3 2011/10/29 11:07:34 hwoarang Exp $
-
-EAPI="3"
-
-MY_P="${PN#claws-mail-}-${PV}"
-
-DESCRIPTION="Plugin to display HTML with Webkit"
-HOMEPAGE="http://www.claws-mail.org/"
-SRC_URI="http://www.claws-mail.org/downloads/plugins/${MY_P}.tar.gz"
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-RDEPEND=">=mail-client/claws-mail-3.7.10
-	>=net-libs/webkit-gtk-1.0:2"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-S="${WORKDIR}/${MY_P}"
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc ChangeLog README
-
-	# kill useless files
-	rm -f "${D}"/usr/lib*/claws-mail/plugins/*.{a,la}
-}
diff --git a/mail-client/claws-mail-gdata/ChangeLog b/mail-client/claws-mail-gdata/ChangeLog
index 1130a903578e..4473c9f7054d 100644
--- a/mail-client/claws-mail-gdata/ChangeLog
+++ b/mail-client/claws-mail-gdata/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for mail-client/claws-mail-gdata
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/claws-mail-gdata/ChangeLog,v 1.9 2012/04/07 11:31:07 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/claws-mail-gdata/ChangeLog,v 1.10 2012/04/11 21:10:41 fauli Exp $
+
+  11 Apr 2012; Christian Faulhammer <fauli@gentoo.org>
+  -claws-mail-gdata-0.2.ebuild:
+  clean up
 
   07 Apr 2012; Markus Meier <maekke@gentoo.org> claws-mail-gdata-0.3.ebuild:
   x86 stable, bug #387547
diff --git a/mail-client/claws-mail-gdata/claws-mail-gdata-0.2.ebuild b/mail-client/claws-mail-gdata/claws-mail-gdata-0.2.ebuild
deleted file mode 100644
index 7234e0d5b084..000000000000
--- a/mail-client/claws-mail-gdata/claws-mail-gdata-0.2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/claws-mail-gdata/claws-mail-gdata-0.2.ebuild,v 1.5 2012/03/31 14:17:47 klausman Exp $
-
-EAPI=4
-
-inherit multilib
-
-MY_P="${PN#claws-mail-}_plugin-${PV}"
-
-DESCRIPTION="Plugin for Claws to use Google data providers"
-HOMEPAGE="http://www.claws-mail.org/"
-SRC_URI="http://www.claws-mail.org/downloads/plugins/${MY_P}.tar.gz"
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="alpha amd64 x86"
-IUSE=""
-RDEPEND=">=mail-client/claws-mail-3.7.10
-	>=dev-libs/libgdata-0.6.4"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-S="${WORKDIR}/${MY_P}"
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog README
-
-	# kill useless files
-	rm -f "${D}"/usr/$(get_libdir)/claws-mail/plugins/*.{a,la}
-
-	# going to conflict with libical
-	rm -f "${D}"/usr/include/ical.h
-}
diff --git a/mail-client/claws-mail-geolocation/ChangeLog b/mail-client/claws-mail-geolocation/ChangeLog
index adc357b9d3e4..fcf2e6a293bf 100644
--- a/mail-client/claws-mail-geolocation/ChangeLog
+++ b/mail-client/claws-mail-geolocation/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for mail-client/claws-mail-geolocation
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/claws-mail-geolocation/ChangeLog,v 1.18 2012/04/07 11:31:54 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/claws-mail-geolocation/ChangeLog,v 1.19 2012/04/11 21:16:00 fauli Exp $
+
+  11 Apr 2012; Christian Faulhammer <fauli@gentoo.org>
+  -claws-mail-geolocation-0.0.6.ebuild:
+  clean up
 
   07 Apr 2012; Markus Meier <maekke@gentoo.org>
   claws-mail-geolocation-0.0.7.ebuild:
diff --git a/mail-client/claws-mail-geolocation/claws-mail-geolocation-0.0.6.ebuild b/mail-client/claws-mail-geolocation/claws-mail-geolocation-0.0.6.ebuild
deleted file mode 100644
index 73fa840f2894..000000000000
--- a/mail-client/claws-mail-geolocation/claws-mail-geolocation-0.0.6.ebuild
+++ /dev/null
@@ -1,32 +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-geolocation/claws-mail-geolocation-0.0.6.ebuild,v 1.3 2011/10/29 11:08:46 hwoarang Exp $
-
-EAPI=3
-
-MY_P="geolocation_plugin-${PV}"
-
-DESCRIPTION="GeoLocation functionality for Claws Mail"
-HOMEPAGE="http://www.claws-mail.org/"
-SRC_URI="http://www.claws-mail.org/downloads/plugins/${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-# Check if other versions of libchamplain ship the same pc file
-RDEPEND=">=mail-client/claws-mail-3.7.10
-	media-libs/clutter-gtk:0.10
-	media-libs/libchamplain:0.8[gtk]
-	sys-devel/gettext"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-S="${WORKDIR}/${MY_P}"
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog README
-}
diff --git a/mail-client/claws-mail-gtkhtml/ChangeLog b/mail-client/claws-mail-gtkhtml/ChangeLog
index 22f1dd9c8e9a..dccc8160ce35 100644
--- a/mail-client/claws-mail-gtkhtml/ChangeLog
+++ b/mail-client/claws-mail-gtkhtml/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for mail-client/claws-mail-gtkhtml
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/claws-mail-gtkhtml/ChangeLog,v 1.87 2012/03/04 12:11:09 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/claws-mail-gtkhtml/ChangeLog,v 1.88 2012/04/11 21:20:41 fauli Exp $
+
+  11 Apr 2012; Christian Faulhammer <fauli@gentoo.org>
+  -claws-mail-gtkhtml-0.30.ebuild, -claws-mail-gtkhtml-0.31.ebuild:
+  clean up
 
   04 Mar 2012; Pacho Ramos <pacho@gentoo.org> metadata.xml:
   Drop maintainer due retirement, bug #206112
diff --git a/mail-client/claws-mail-gtkhtml/claws-mail-gtkhtml-0.30.ebuild b/mail-client/claws-mail-gtkhtml/claws-mail-gtkhtml-0.30.ebuild
deleted file mode 100644
index 6b6e0838f83b..000000000000
--- a/mail-client/claws-mail-gtkhtml/claws-mail-gtkhtml-0.30.ebuild
+++ /dev/null
@@ -1,34 +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-gtkhtml/claws-mail-gtkhtml-0.30.ebuild,v 1.1 2011/04/10 16:52:59 fauli Exp $
-
-inherit eutils
-
-MY_P="${PN#claws-mail-}2_viewer-${PV}"
-
-DESCRIPTION="Renders HTML mail using the gtkhtml2 rendering widget."
-HOMEPAGE="http://www.claws-mail.org/"
-SRC_URI="http://www.claws-mail.org/downloads/plugins/${MY_P}.tar.gz"
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-RDEPEND=">=mail-client/claws-mail-3.7.9
-		net-misc/curl"
-DEPEND="${RDEPEND}
-		dev-util/pkgconfig"
-
-S="${WORKDIR}/${MY_P}"
-
-src_compile() {
-	econf --disable-accessibility || die
-	emake || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog README
-
-	# kill useless files
-	rm -f "${D}"/usr/lib*/claws-mail/plugins/*.{a,la}
-}
diff --git a/mail-client/claws-mail-gtkhtml/claws-mail-gtkhtml-0.31.ebuild b/mail-client/claws-mail-gtkhtml/claws-mail-gtkhtml-0.31.ebuild
deleted file mode 100644
index 20e970e6e94e..000000000000
--- a/mail-client/claws-mail-gtkhtml/claws-mail-gtkhtml-0.31.ebuild
+++ /dev/null
@@ -1,34 +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-gtkhtml/claws-mail-gtkhtml-0.31.ebuild,v 1.1 2011/08/30 10:32:49 fauli Exp $
-
-inherit eutils
-
-MY_P="${PN#claws-mail-}2_viewer-${PV}"
-
-DESCRIPTION="Renders HTML mail using the gtkhtml2 rendering widget."
-HOMEPAGE="http://www.claws-mail.org/"
-SRC_URI="http://www.claws-mail.org/downloads/plugins/${MY_P}.tar.gz"
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-RDEPEND=">=mail-client/claws-mail-3.7.10
-		net-misc/curl"
-DEPEND="${RDEPEND}
-		dev-util/pkgconfig"
-
-S="${WORKDIR}/${MY_P}"
-
-src_compile() {
-	econf --disable-accessibility || die
-	emake || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog README
-
-	# kill useless files
-	rm -f "${D}"/usr/lib*/claws-mail/plugins/*.{a,la}
-}
diff --git a/mail-client/claws-mail-mailmbox/ChangeLog b/mail-client/claws-mail-mailmbox/ChangeLog
index c1d76ee8ca56..3ccd1d76dc3e 100644
--- a/mail-client/claws-mail-mailmbox/ChangeLog
+++ b/mail-client/claws-mail-mailmbox/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for mail-client/claws-mail-mailmbox
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/claws-mail-mailmbox/ChangeLog,v 1.67 2012/04/07 11:32:57 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/claws-mail-mailmbox/ChangeLog,v 1.68 2012/04/11 21:25:29 fauli Exp $
+
+  11 Apr 2012; Christian Faulhammer <fauli@gentoo.org>
+  -claws-mail-mailmbox-1.14.5.ebuild:
+  clean up
 
   07 Apr 2012; Markus Meier <maekke@gentoo.org>
   claws-mail-mailmbox-1.14.6.ebuild:
diff --git a/mail-client/claws-mail-mailmbox/claws-mail-mailmbox-1.14.5.ebuild b/mail-client/claws-mail-mailmbox/claws-mail-mailmbox-1.14.5.ebuild
deleted file mode 100644
index dd85f76cf2d3..000000000000
--- a/mail-client/claws-mail-mailmbox/claws-mail-mailmbox-1.14.5.ebuild
+++ /dev/null
@@ -1,26 +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-mailmbox/claws-mail-mailmbox-1.14.5.ebuild,v 1.7 2011/03/21 10:40:20 xarthisius Exp $
-
-MY_P="${P#claws-mail-}"
-
-DESCRIPTION="Plugin to operate on mbox type mailboxes"
-HOMEPAGE="http://www.claws-mail.org/"
-SRC_URI="http://www.claws-mail.org/downloads/plugins/${MY_P}.tar.gz"
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
-IUSE=""
-RDEPEND=">=mail-client/claws-mail-3.7.7"
-DEPEND="${RDEPEND}
-		dev-util/pkgconfig"
-
-S="${WORKDIR}/${MY_P}"
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog README
-
-	# kill useless files
-	rm -f "${D}"/usr/lib*/claws-mail/plugins/*.{a,la}
-}
diff --git a/mail-client/claws-mail-notification/ChangeLog b/mail-client/claws-mail-notification/ChangeLog
index 6473745903f2..09c11cf1c117 100644
--- a/mail-client/claws-mail-notification/ChangeLog
+++ b/mail-client/claws-mail-notification/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for mail-client/claws-mail-notification
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/claws-mail-notification/ChangeLog,v 1.72 2012/04/07 11:33:55 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/claws-mail-notification/ChangeLog,v 1.73 2012/04/11 21:16:20 fauli Exp $
+
+  11 Apr 2012; Christian Faulhammer <fauli@gentoo.org>
+  -claws-mail-notification-0.28.ebuild:
+  clean up
 
   07 Apr 2012; Markus Meier <maekke@gentoo.org>
   claws-mail-notification-0.29.ebuild:
diff --git a/mail-client/claws-mail-notification/claws-mail-notification-0.28.ebuild b/mail-client/claws-mail-notification/claws-mail-notification-0.28.ebuild
deleted file mode 100644
index cb2c18be0529..000000000000
--- a/mail-client/claws-mail-notification/claws-mail-notification-0.28.ebuild
+++ /dev/null
@@ -1,39 +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-notification/claws-mail-notification-0.28.ebuild,v 1.4 2011/11/06 16:27:40 ranger Exp $
-
-EAPI=4
-inherit multilib
-
-MY_P=${PN#claws-mail-}_plugin-${PV}
-
-DESCRIPTION="Plugin providing various ways to notify user of new and unread mail"
-HOMEPAGE="http://www.claws-mail.org/"
-SRC_URI="http://www.claws-mail.org/downloads/plugins/${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="libnotify"
-
-RDEPEND=">=mail-client/claws-mail-3.7.10
-	>=x11-libs/gtk+-2.10:2
-	libnotify? ( x11-libs/libnotify )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-src_configure() {
-	econf \
-		--disable-dependency-tracking \
-		--disable-static \
-		$(use_enable libnotify)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog README
-
-	rm -f "${D}"/usr/$(get_libdir)/claws-mail/plugins/*.la
-}
diff --git a/mail-client/claws-mail-perl/ChangeLog b/mail-client/claws-mail-perl/ChangeLog
index e94aabb6f29d..b354aaef2224 100644
--- a/mail-client/claws-mail-perl/ChangeLog
+++ b/mail-client/claws-mail-perl/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for mail-client/claws-mail-perl
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/claws-mail-perl/ChangeLog,v 1.54 2012/04/07 11:34:51 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/claws-mail-perl/ChangeLog,v 1.55 2012/04/11 21:21:23 fauli Exp $
+
+  11 Apr 2012; Christian Faulhammer <fauli@gentoo.org>
+  -claws-mail-perl-0.9.18.ebuild:
+  clean up
 
   07 Apr 2012; Markus Meier <maekke@gentoo.org> claws-mail-perl-0.9.19.ebuild:
   x86 stable, bug #387547
diff --git a/mail-client/claws-mail-perl/claws-mail-perl-0.9.18.ebuild b/mail-client/claws-mail-perl/claws-mail-perl-0.9.18.ebuild
deleted file mode 100644
index 24e5f47d9c89..000000000000
--- a/mail-client/claws-mail-perl/claws-mail-perl-0.9.18.ebuild
+++ /dev/null
@@ -1,48 +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-perl/claws-mail-perl-0.9.18.ebuild,v 1.5 2010/12/28 13:13:58 ranger Exp $
-
-MY_P="${PN#claws-mail-}_plugin-${PV}"
-
-DESCRIPTION="Plugin to use perl to write filtering rules"
-HOMEPAGE="http://www.claws-mail.org"
-SRC_URI="http://www.claws-mail.org/downloads/plugins/${MY_P}.tar.gz"
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ppc64 x86"
-IUSE=""
-RDEPEND=">=mail-client/claws-mail-3.7.6
-		dev-lang/perl"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-S="${WORKDIR}/${MY_P}"
-
-src_compile() {
-	econf || die
-	emake || die
-
-	pod2man --section=1 --release=${PV} --name=cm_perl cm_perl.pod > cm_perl.1
-
-	emake -C tools || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog NEWS README
-
-	doman cm_perl.1
-
-	cd tools
-	exeinto /usr/lib/claws-mail/tools
-	doexe *.pl
-
-	rm -f "${D}"/usr/lib*/claws-mail/plugins/*.{a,la}
-}
-
-pkg_postinst() {
-	echo
-	elog "The documentation for this plugin is contained in a manpage."
-	elog "You can access it with 'man cm_perl'"
-	echo
-}
diff --git a/mail-client/claws-mail-python/ChangeLog b/mail-client/claws-mail-python/ChangeLog
index db26c3831420..848827666f38 100644
--- a/mail-client/claws-mail-python/ChangeLog
+++ b/mail-client/claws-mail-python/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for mail-client/claws-mail-python
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/claws-mail-python/ChangeLog,v 1.28 2012/04/07 11:35:31 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/claws-mail-python/ChangeLog,v 1.29 2012/04/11 21:25:46 fauli Exp $
+
+  11 Apr 2012; Christian Faulhammer <fauli@gentoo.org>
+  -claws-mail-python-0.8.ebuild:
+  clean up
 
   07 Apr 2012; Markus Meier <maekke@gentoo.org> claws-mail-python-0.9.ebuild:
   x86 stable, bug #387547
diff --git a/mail-client/claws-mail-python/claws-mail-python-0.8.ebuild b/mail-client/claws-mail-python/claws-mail-python-0.8.ebuild
deleted file mode 100644
index 10b483462540..000000000000
--- a/mail-client/claws-mail-python/claws-mail-python-0.8.ebuild
+++ /dev/null
@@ -1,31 +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-python/claws-mail-python-0.8.ebuild,v 1.3 2011/10/29 11:08:10 hwoarang Exp $
-
-EAPI=4
-inherit multilib
-
-MY_P="${PN#claws-mail-}_plugin-${PV}"
-
-DESCRIPTION="Plugin to integrate with Python"
-HOMEPAGE="http://www.claws-mail.org/"
-SRC_URI="http://www.claws-mail.org/downloads/plugins/${MY_P}.tar.gz"
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-RDEPEND=">=mail-client/claws-mail-3.7.10
-	>=dev-lang/python-2.5
-	>=dev-python/pygtk-2.10.3"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-S="${WORKDIR}/${MY_P}"
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc ChangeLog README
-
-	# kill useless files
-	rm -f "${D}"/usr/$(get_libdir)/claws-mail/plugins/*.{a,la}
-}
diff --git a/mail-client/claws-mail-rssyl/ChangeLog b/mail-client/claws-mail-rssyl/ChangeLog
index 2af2caec6114..843fc9d2ff61 100644
--- a/mail-client/claws-mail-rssyl/ChangeLog
+++ b/mail-client/claws-mail-rssyl/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for mail-client/claws-mail-rssyl
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/claws-mail-rssyl/ChangeLog,v 1.104 2012/04/07 11:36:30 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/claws-mail-rssyl/ChangeLog,v 1.105 2012/04/11 21:12:43 fauli Exp $
+
+  11 Apr 2012; Christian Faulhammer <fauli@gentoo.org>
+  -claws-mail-rssyl-0.30.ebuild, -claws-mail-rssyl-0.31.ebuild:
+  clean up
 
   07 Apr 2012; Markus Meier <maekke@gentoo.org> claws-mail-rssyl-0.32.ebuild:
   x86 stable, bug #387547
diff --git a/mail-client/claws-mail-rssyl/claws-mail-rssyl-0.30.ebuild b/mail-client/claws-mail-rssyl/claws-mail-rssyl-0.30.ebuild
deleted file mode 100644
index 450f391f3b0a..000000000000
--- a/mail-client/claws-mail-rssyl/claws-mail-rssyl-0.30.ebuild
+++ /dev/null
@@ -1,37 +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-rssyl/claws-mail-rssyl-0.30.ebuild,v 1.6 2011/07/30 11:25:51 armin76 Exp $
-
-EAPI="3"
-
-inherit eutils
-
-MY_P="${P#claws-mail-}"
-
-DESCRIPTION="Read your favorite newsfeeds in Claws Mail. RSS 1.0, 2.0 and Atom feeds are currently supported"
-HOMEPAGE="http://www.claws-mail.org/"
-SRC_URI="http://www.claws-mail.org/downloads/plugins/${MY_P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ppc ppc64 x86"
-IUSE="nls"
-RDEPEND=">=mail-client/claws-mail-3.7.9
-	net-misc/curl
-	dev-libs/libxml2
-	nls? ( >=sys-devel/gettext-0.12.1 )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	econf $(use_enable nls) || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc ChangeLog README || die
-
-	# kill useless files
-	rm -f "${D}"/usr/lib*/claws-mail/plugins/*.{a,la}
-}
diff --git a/mail-client/claws-mail-rssyl/claws-mail-rssyl-0.31.ebuild b/mail-client/claws-mail-rssyl/claws-mail-rssyl-0.31.ebuild
deleted file mode 100644
index f6ad910918b7..000000000000
--- a/mail-client/claws-mail-rssyl/claws-mail-rssyl-0.31.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/claws-mail-rssyl/claws-mail-rssyl-0.31.ebuild,v 1.5 2012/01/23 13:32:45 klausman Exp $
-
-EAPI="4"
-
-inherit eutils multilib
-
-MY_P="${P#claws-mail-}"
-
-DESCRIPTION="Read your favorite newsfeeds in Claws Mail. RSS 1.0, 2.0 and Atom feeds are currently supported"
-HOMEPAGE="http://www.claws-mail.org/"
-SRC_URI="http://www.claws-mail.org/downloads/plugins/${MY_P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ppc ~ppc64 x86"
-IUSE="nls"
-RDEPEND=">=mail-client/claws-mail-3.7.10
-	net-misc/curl
-	dev-libs/libxml2
-	nls? ( >=sys-devel/gettext-0.12.1 )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	econf $(use_enable nls) || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc ChangeLog README || die
-
-	# kill useless files
-	rm -f "${D}"/usr/$(get_libdir)/claws-mail/plugins/*.{a,la}
-}
diff --git a/mail-client/claws-mail-spam_report/ChangeLog b/mail-client/claws-mail-spam_report/ChangeLog
index 8e7110f51e89..900ec1a0a5f5 100644
--- a/mail-client/claws-mail-spam_report/ChangeLog
+++ b/mail-client/claws-mail-spam_report/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for mail-client/claws-mail-spam_report
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/claws-mail-spam_report/ChangeLog,v 1.43 2012/04/07 11:37:23 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/claws-mail-spam_report/ChangeLog,v 1.44 2012/04/11 21:17:15 fauli Exp $
+
+  11 Apr 2012; Christian Faulhammer <fauli@gentoo.org>
+  -claws-mail-spam_report-0.3.14.ebuild:
+  clean up
 
   07 Apr 2012; Markus Meier <maekke@gentoo.org>
   claws-mail-spam_report-0.3.15.ebuild:
diff --git a/mail-client/claws-mail-spam_report/claws-mail-spam_report-0.3.14.ebuild b/mail-client/claws-mail-spam_report/claws-mail-spam_report-0.3.14.ebuild
deleted file mode 100644
index 0e47733cc970..000000000000
--- a/mail-client/claws-mail-spam_report/claws-mail-spam_report-0.3.14.ebuild
+++ /dev/null
@@ -1,31 +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-spam_report/claws-mail-spam_report-0.3.14.ebuild,v 1.3 2011/10/29 11:13:10 hwoarang Exp $
-
-EAPI=4
-
-inherit eutils multilib
-
-MY_P="${P#claws-mail-}"
-
-DESCRIPTION="Plugin for Claws to report spam to various places"
-HOMEPAGE="http://www.claws-mail.org/"
-SRC_URI="http://www.claws-mail.org/downloads/plugins/${MY_P}.tar.gz"
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE=""
-RDEPEND=">=mail-client/claws-mail-3.7.10
-		>=net-misc/curl-7.9.7"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-S="${WORKDIR}/${MY_P}"
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog README
-
-	# kill useless files
-	rm -f "${D}"/usr/$(get_libdir)/claws-mail/plugins/*.{a,la}
-}
diff --git a/mail-client/claws-mail-tnef_parse/ChangeLog b/mail-client/claws-mail-tnef_parse/ChangeLog
index 222eb7f10dbe..5052447a1f9c 100644
--- a/mail-client/claws-mail-tnef_parse/ChangeLog
+++ b/mail-client/claws-mail-tnef_parse/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for mail-client/claws-mail-tnef_parse
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/claws-mail-tnef_parse/ChangeLog,v 1.44 2012/04/07 11:38:12 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/claws-mail-tnef_parse/ChangeLog,v 1.45 2012/04/11 21:22:56 fauli Exp $
+
+  11 Apr 2012; Christian Faulhammer <fauli@gentoo.org>
+  -claws-mail-tnef_parse-0.3.11.ebuild:
+  clean up
 
   07 Apr 2012; Markus Meier <maekke@gentoo.org>
   claws-mail-tnef_parse-0.3.12.ebuild:
diff --git a/mail-client/claws-mail-tnef_parse/claws-mail-tnef_parse-0.3.11.ebuild b/mail-client/claws-mail-tnef_parse/claws-mail-tnef_parse-0.3.11.ebuild
deleted file mode 100644
index 7f2e8745b548..000000000000
--- a/mail-client/claws-mail-tnef_parse/claws-mail-tnef_parse-0.3.11.ebuild
+++ /dev/null
@@ -1,30 +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-tnef_parse/claws-mail-tnef_parse-0.3.11.ebuild,v 1.3 2011/10/29 11:13:48 hwoarang Exp $
-
-EAPI=4
-
-inherit multilib
-
-MY_P="${P#claws-mail-}"
-
-DESCRIPTION="Plugin for Claws to support application/ms-tnef attachments"
-HOMEPAGE="http://www.claws-mail.org/"
-SRC_URI="http://www.claws-mail.org/downloads/plugins/${MY_P}.tar.gz"
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE=""
-RDEPEND=">=mail-client/claws-mail-3.7.10"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-S="${WORKDIR}/${MY_P}"
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog README
-
-	# kill useless files
-	rm -f "${D}"/usr/$(get_libdir)/claws-mail/plugins/*.{a,la}
-}
diff --git a/mail-client/claws-mail-vcalendar/ChangeLog b/mail-client/claws-mail-vcalendar/ChangeLog
index 1756ac7c1c2e..9624b7557c22 100644
--- a/mail-client/claws-mail-vcalendar/ChangeLog
+++ b/mail-client/claws-mail-vcalendar/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for mail-client/claws-mail-vcalendar
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/claws-mail-vcalendar/ChangeLog,v 1.114 2012/04/07 11:39:11 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/claws-mail-vcalendar/ChangeLog,v 1.115 2012/04/11 21:27:24 fauli Exp $
+
+  11 Apr 2012; Christian Faulhammer <fauli@gentoo.org>
+  -claws-mail-vcalendar-2.0.10.ebuild, -claws-mail-vcalendar-2.0.11.ebuild:
+  clean up
 
   07 Apr 2012; Markus Meier <maekke@gentoo.org>
   claws-mail-vcalendar-2.0.12.ebuild:
diff --git a/mail-client/claws-mail-vcalendar/claws-mail-vcalendar-2.0.10.ebuild b/mail-client/claws-mail-vcalendar/claws-mail-vcalendar-2.0.10.ebuild
deleted file mode 100644
index 6160c13b03f6..000000000000
--- a/mail-client/claws-mail-vcalendar/claws-mail-vcalendar-2.0.10.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/claws-mail-vcalendar/claws-mail-vcalendar-2.0.10.ebuild,v 1.7 2012/03/31 14:20:20 klausman Exp $
-
-inherit eutils
-
-MY_P="${P#claws-mail-}"
-
-DESCRIPTION="Plugin for Claws to support the vCalendar meeting format"
-HOMEPAGE="http://www.claws-mail.org/"
-SRC_URI="http://www.claws-mail.org/downloads/plugins/${MY_P}.tar.gz"
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
-IUSE=""
-RDEPEND=">=mail-client/claws-mail-3.7.9
-		>=net-misc/curl-7.9.7"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-S="${WORKDIR}/${MY_P}"
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog README
-
-	# kill useless files
-	rm -f "${D}"/usr/lib*/claws-mail/plugins/*.{a,la}
-
-	# going to conflict with libical
-	rm -f "${D}"/usr/include/ical.h
-}
diff --git a/mail-client/claws-mail-vcalendar/claws-mail-vcalendar-2.0.11.ebuild b/mail-client/claws-mail-vcalendar/claws-mail-vcalendar-2.0.11.ebuild
deleted file mode 100644
index 1db11e274c9d..000000000000
--- a/mail-client/claws-mail-vcalendar/claws-mail-vcalendar-2.0.11.ebuild
+++ /dev/null
@@ -1,34 +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-vcalendar/claws-mail-vcalendar-2.0.11.ebuild,v 1.5 2011/12/18 18:09:44 armin76 Exp $
-
-EAPI=4
-
-inherit multilib
-
-MY_P="${P#claws-mail-}"
-
-DESCRIPTION="Plugin for Claws to support the vCalendar meeting format"
-HOMEPAGE="http://www.claws-mail.org/"
-SRC_URI="http://www.claws-mail.org/downloads/plugins/${MY_P}.tar.gz"
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 ppc ~ppc64 sparc x86"
-IUSE=""
-RDEPEND=">=mail-client/claws-mail-3.7.10
-		>=net-misc/curl-7.9.7"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-S="${WORKDIR}/${MY_P}"
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog README
-
-	# kill useless files
-	rm -f "${D}"/usr/$(get_libdir)/claws-mail/plugins/*.{a,la}
-
-	# going to conflict with libical
-	rm -f "${D}"/usr/include/ical.h
-}
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);