Clean out old versions, version bump

(Portage version: 2.1.2.9)

8 files changed, 22 insertions, 376 deletions

diff --git a/mail-client/claws-mail/ChangeLog b/mail-client/claws-mail/ChangeLog
index 94a4679b22e1..f88c57f5532c 100644
--- a/mail-client/claws-mail/ChangeLog
+++ b/mail-client/claws-mail/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for mail-client/claws-mail
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/claws-mail/ChangeLog,v 1.32 2007/05/26 01:34:52 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/claws-mail/ChangeLog,v 1.33 2007/06/23 14:15:52 genone Exp $
+
+*claws-mail-2.10.0_rc1 (23 Jun 2007)
+
+  23 Jun 2007; Marius Mauch <genone@gentoo.org> -claws-mail-2.6.1.ebuild,
+  -claws-mail-2.7.2.ebuild, -claws-mail-2.8.1.ebuild,
+  +claws-mail-2.10.0_rc1.ebuild:
+  Clean out old version, version bump
 
   26 May 2007; Jeroen Roovers <jer@gentoo.org> claws-mail-2.9.1.ebuild:
   Stable for HPPA (bug #176805).
diff --git a/mail-client/claws-mail/claws-mail-2.8.1.ebuild b/mail-client/claws-mail/claws-mail-2.10.0_rc1.ebuild
index dd6de9b1df7b..d15aaf53f535 100644
--- a/mail-client/claws-mail/claws-mail-2.8.1.ebuild
+++ b/mail-client/claws-mail/claws-mail-2.10.0_rc1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/claws-mail/claws-mail-2.8.1.ebuild,v 1.2 2007/04/16 11:33:59 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/claws-mail/claws-mail-2.10.0_rc1.ebuild,v 1.1 2007/06/23 14:15:52 genone Exp $
 
 IUSE="gnome dillo crypt spell ssl ldap ipv6 pda clamav xface kde imap spamassassin doc startup-notification bogofilter"
 
@@ -73,6 +73,7 @@ src_compile() {
 
 	econf \
 		--enable-trayicon-plugin \
+		--disable-maemo \
 		${myconf} || die "./configure failed"
 
 	emake || die
@@ -120,7 +121,7 @@ src_install() {
 		newins template_${desktopfile} ${desktopfile} || die
 		dodir ${kdeprefix}/bin
 		insopts -m 755
-		insinto ${kdeprefix}/bin
+		exeinto ${kdeprefix}/bin
 		doexe ${servicescript} || die
 	fi
 
@@ -138,29 +139,29 @@ pkg_postinst() {
 		has_version mail-client/sylpheed-claws-$x && RENAME_PLUGINS="${RENAME_PLUGINS} $x"
 	done
 	if [ -n "${RENAME_PLUGINS}" ]; then
-		ewarn
+		elog
 		elog "The following sylpheed-claws plugins were found on your system:"
-		ewarn
+		elog
 		for x in ${RENAME_PLUGINS}; do
 			elog "    mail-client/sylpheed-claws-$x"
 		done
-		ewarn
+		elog
 		elog "If you want to continue using those you need to merge their "
 		elog "renamed counterparts:"
-		ewarn
+		elog
 		for x in ${RENAME_PLUGINS}; do
 			elog "    mail-client/${PN}-$x"
 		done
-		ewarn
+		elog
 	fi
 	if [ -n "${UPDATE_PLUGINS}" ]; then
-		ewarn
+		elog
 		elog "You have to re-emerge or update the following plugins:"
-		ewarn
+		elog
 		for x in ${UPDATE_PLUGINS}; do
 			elog "    mail-client/${PN}-$x"
 		done
-		ewarn
+		elog
 	fi
 	if [ -n "${RENAME_PLUGINS}${UPDATE_PLUGINS}" ]; then
 		elog
diff --git a/mail-client/claws-mail/claws-mail-2.6.1.ebuild b/mail-client/claws-mail/claws-mail-2.6.1.ebuild
deleted file mode 100644
index bf0f9d482035..000000000000
--- a/mail-client/claws-mail/claws-mail-2.6.1.ebuild
+++ /dev/null
@@ -1,178 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/claws-mail/claws-mail-2.6.1.ebuild,v 1.12 2007/04/16 11:33:59 ticho Exp $
-
-IUSE="gnome dillo crypt spell ssl ldap ipv6 pda clamav xface kde imap spamassassin doc startup-notification bogofilter"
-
-inherit eutils
-
-DESCRIPTION="Claws-Mail is an email client (and news reader) based on GTK+"
-HOMEPAGE="http://www.claws-mail.org"
-
-if [ -n "${P/*_rc*/}" ]; then
-	SRC_URI="mirror://sourceforge/sylpheed-claws/${P}.tar.bz2"
-else
-	MY_P="${P/_/-}"
-	S="${WORKDIR}/${MY_P}"
-	SRC_URI="http://www.claws-mail.org/snapshots/${MY_P}.tar.bz2"
-fi
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86"
-
-COMMONDEPEND=">=x11-libs/gtk+-2.6
-	pda? ( >=app-pda/jpilot-0.99 )
-	ssl? ( >=dev-libs/openssl-0.9.7 )
-	ldap? ( >=net-nds/openldap-2.0.7 )
-	crypt? ( >=app-crypt/gpgme-1.1.1 )
-	dillo? ( www-client/dillo )
-	spell? ( virtual/aspell-dict )
-	clamav? ( app-antivirus/clamav )
-	kde? ( kde-base/kdelibs )
-	imap? ( >=net-libs/libetpan-0.48 )
-	gnome? ( >=gnome-base/libgnomeprintui-2.2 )
-	startup-notification? ( x11-libs/startup-notification )
-	bogofilter? ( mail-filter/bogofilter )
-	!<mail-client/sylpheed-claws-2.6.1"	# old name, block as user hint and due to some file collision
-
-DEPEND="${COMMONDEPEND}
-	xface? ( >=media-libs/compface-1.4 )
-	>=sys-apps/sed-4
-	dev-util/pkgconfig"
-
-RDEPEND="${COMMONDEPEND}
-	app-misc/mime-types
-	x11-misc/shared-mime-info"
-
-PLUGIN_NAMES="acpi-notifier att-remover cachesaver etpan-privacy fetchinfo gtkhtml maildir mailmbox newmail notification perl rssyl smime synce vcalendar"
-
-src_compile() {
-	local myconf
-
-	# Optional features
-	myconf="${myconf} `use_enable gnome gnomeprint`"
-	myconf="${myconf} `use_enable imap libetpan`"
-	myconf="${myconf} `use_enable ipv6`"
-	myconf="${myconf} `use_enable ldap`"
-	myconf="${myconf} `use_enable pda jpilot`"
-	myconf="${myconf} `use_enable spell aspell`"
-	myconf="${myconf} `use_enable ssl openssl`"
-	myconf="${myconf} `use_enable xface compface`"
-	myconf="${myconf} `use_enable doc manual`"
-	myconf="${myconf} `use_enable startup-notification`"
-
-	# Optional plugins
-	myconf="${myconf} `use_enable clamav clamav-plugin`"
-	myconf="${myconf} `use_enable crypt pgpmime-plugin`"
-	myconf="${myconf} `use_enable crypt pgpinline-plugin`"
-	myconf="${myconf} `use_enable crypt pgpcore-plugin`"
-	myconf="${myconf} `use_enable dillo dillo-viewer-plugin`"
-	myconf="${myconf} `use_enable spamassassin spamassassin-plugin`"
-	myconf="${myconf} `use_enable bogofilter bogofilter-plugin`"
-
-	econf \
-		--enable-trayicon-plugin \
-		${myconf} || die "./configure failed"
-
-	emake || die
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-
-	# 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/lib/${PN}/tools
-	doexe *.pl *.py *.rc *.conf *.sh || die
-	doexe tb2claws-mail update-po uudec uuooffice || die
-
-	if use kde; then
-		einfo "Installing kde service scripts"
-		local kdeprefix="$(kde-config --prefix)"
-		local servicescript="${PN}-kdeservicemenu.pl"
-		local desktopfile="${PN}-attach-files.desktop"
-		cd ${S}/tools/kdeservicemenu
-		sed -i -e "s:SCRIPT_PATH:${kdeprefix}/bin/${servicescript}:g" \
-			template_${desktopfile}
-		dodir /usr/share/apps/konqueror/servicemenus
-		insopts -m 0644
-		insinto /usr/share/apps/konqueror/servicemenus
-		newins template_${desktopfile} ${desktopfile} || die
-		dodir ${kdeprefix}/bin
-		insopts -m 755
-		insinto ${kdeprefix}/bin
-		doexe ${servicescript} || die
-	fi
-
-	# 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
-		ewarn
-		elog "The following sylpheed-claws plugins were found on your system:"
-		ewarn
-		for x in ${RENAME_PLUGINS}; do
-			elog "    mail-client/sylpheed-claws-$x"
-		done
-		ewarn
-		elog "If you want to continue using those you need to merge their "
-		elog "renamed counterparts:"
-		ewarn
-		for x in ${RENAME_PLUGINS}; do
-			elog "    mail-client/${PN}-$x"
-		done
-		ewarn
-	fi
-	if [ -n "${UPDATE_PLUGINS}" ]; then
-		ewarn
-		elog "You have to re-emerge or update the following plugins:"
-		ewarn
-		for x in ${UPDATE_PLUGINS}; do
-			elog "    mail-client/${PN}-$x"
-		done
-		ewarn
-	fi
-	if [ -n "${RENAME_PLUGINS}${UPDATE_PLUGINS}" ]; then
-		elog
-		elog "You can use"
-		elog "    /bin/bash ${FILESDIR}/plugins-rebuild.sh"
-		elog "to automatically handle this."
-		elog
-		epause 5
-		ebeep 3
-	fi
-}
-
-pkg_postrm() {
-	gtk-update-icon-cache -f -t /usr/share/icons/hicolor
-}
diff --git a/mail-client/claws-mail/claws-mail-2.7.2.ebuild b/mail-client/claws-mail/claws-mail-2.7.2.ebuild
deleted file mode 100644
index 8ba8f2d72753..000000000000
--- a/mail-client/claws-mail/claws-mail-2.7.2.ebuild
+++ /dev/null
@@ -1,178 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/claws-mail/claws-mail-2.7.2.ebuild,v 1.4 2007/04/16 11:33:59 ticho Exp $
-
-IUSE="gnome dillo crypt spell ssl ldap ipv6 pda clamav xface kde imap spamassassin doc startup-notification bogofilter"
-
-inherit eutils
-
-DESCRIPTION="Claws-Mail is an email client (and news reader) based on GTK+"
-HOMEPAGE="http://www.claws-mail.org"
-
-if [ -n "${P/*_rc*/}" ]; then
-	SRC_URI="mirror://sourceforge/sylpheed-claws/${P}.tar.bz2"
-else
-	MY_P="${P/_/-}"
-	S="${WORKDIR}/${MY_P}"
-	SRC_URI="http://www.claws-mail.org/snapshots/${MY_P}.tar.bz2"
-fi
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-
-COMMONDEPEND=">=x11-libs/gtk+-2.6
-	pda? ( >=app-pda/jpilot-0.99 )
-	ssl? ( >=dev-libs/openssl-0.9.7 )
-	ldap? ( >=net-nds/openldap-2.0.7 )
-	crypt? ( >=app-crypt/gpgme-1.1.1 )
-	dillo? ( www-client/dillo )
-	spell? ( virtual/aspell-dict )
-	clamav? ( app-antivirus/clamav )
-	kde? ( kde-base/kdelibs )
-	imap? ( >=net-libs/libetpan-0.49 )
-	gnome? ( >=gnome-base/libgnomeprintui-2.2 )
-	startup-notification? ( x11-libs/startup-notification )
-	bogofilter? ( mail-filter/bogofilter )
-	!<mail-client/sylpheed-claws-2.6.1"	# old name, block as user hint and due to some file collision
-
-DEPEND="${COMMONDEPEND}
-	xface? ( >=media-libs/compface-1.4 )
-	>=sys-apps/sed-4
-	dev-util/pkgconfig"
-
-RDEPEND="${COMMONDEPEND}
-	app-misc/mime-types
-	x11-misc/shared-mime-info"
-
-PLUGIN_NAMES="acpi-notifier att-remover cachesaver etpan-privacy fetchinfo gtkhtml maildir mailmbox newmail notification perl rssyl smime synce vcalendar"
-
-src_compile() {
-	local myconf
-
-	# Optional features
-	myconf="${myconf} `use_enable gnome gnomeprint`"
-	myconf="${myconf} `use_enable imap libetpan`"
-	myconf="${myconf} `use_enable ipv6`"
-	myconf="${myconf} `use_enable ldap`"
-	myconf="${myconf} `use_enable pda jpilot`"
-	myconf="${myconf} `use_enable spell aspell`"
-	myconf="${myconf} `use_enable ssl openssl`"
-	myconf="${myconf} `use_enable xface compface`"
-	myconf="${myconf} `use_enable doc manual`"
-	myconf="${myconf} `use_enable startup-notification`"
-
-	# Optional plugins
-	myconf="${myconf} `use_enable clamav clamav-plugin`"
-	myconf="${myconf} `use_enable crypt pgpmime-plugin`"
-	myconf="${myconf} `use_enable crypt pgpinline-plugin`"
-	myconf="${myconf} `use_enable crypt pgpcore-plugin`"
-	myconf="${myconf} `use_enable dillo dillo-viewer-plugin`"
-	myconf="${myconf} `use_enable spamassassin spamassassin-plugin`"
-	myconf="${myconf} `use_enable bogofilter bogofilter-plugin`"
-
-	econf \
-		--enable-trayicon-plugin \
-		${myconf} || die "./configure failed"
-
-	emake || die
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-
-	# 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/lib/${PN}/tools
-	doexe *.pl *.py *.rc *.conf *.sh || die
-	doexe tb2claws-mail update-po uudec uuooffice || die
-
-	if use kde; then
-		einfo "Installing kde service scripts"
-		local kdeprefix="$(kde-config --prefix)"
-		local servicescript="${PN}-kdeservicemenu.pl"
-		local desktopfile="${PN}-attach-files.desktop"
-		cd ${S}/tools/kdeservicemenu
-		sed -i -e "s:SCRIPT_PATH:${kdeprefix}/bin/${servicescript}:g" \
-			template_${desktopfile}
-		dodir /usr/share/apps/konqueror/servicemenus
-		insopts -m 0644
-		insinto /usr/share/apps/konqueror/servicemenus
-		newins template_${desktopfile} ${desktopfile} || die
-		dodir ${kdeprefix}/bin
-		insopts -m 755
-		insinto ${kdeprefix}/bin
-		doexe ${servicescript} || die
-	fi
-
-	# 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
-		ewarn
-		elog "The following sylpheed-claws plugins were found on your system:"
-		ewarn
-		for x in ${RENAME_PLUGINS}; do
-			elog "    mail-client/sylpheed-claws-$x"
-		done
-		ewarn
-		elog "If you want to continue using those you need to merge their "
-		elog "renamed counterparts:"
-		ewarn
-		for x in ${RENAME_PLUGINS}; do
-			elog "    mail-client/${PN}-$x"
-		done
-		ewarn
-	fi
-	if [ -n "${UPDATE_PLUGINS}" ]; then
-		ewarn
-		elog "You have to re-emerge or update the following plugins:"
-		ewarn
-		for x in ${UPDATE_PLUGINS}; do
-			elog "    mail-client/${PN}-$x"
-		done
-		ewarn
-	fi
-	if [ -n "${RENAME_PLUGINS}${UPDATE_PLUGINS}" ]; then
-		elog
-		elog "You can use"
-		elog "    /bin/bash ${FILESDIR}/plugins-rebuild.sh"
-		elog "to automatically handle this."
-		elog
-		epause 5
-		ebeep 3
-	fi
-}
-
-pkg_postrm() {
-	gtk-update-icon-cache -f -t /usr/share/icons/hicolor
-}
diff --git a/mail-client/claws-mail/files/digest-claws-mail-2.10.0_rc1 b/mail-client/claws-mail/files/digest-claws-mail-2.10.0_rc1
new file mode 100644
index 000000000000..8185501aa130
--- /dev/null
+++ b/mail-client/claws-mail/files/digest-claws-mail-2.10.0_rc1
@@ -0,0 +1,3 @@
+MD5 dd079f59f2c819e718445f9340b1373d claws-mail-2.10.0-rc1.tar.bz2 5479184
+RMD160 9f91007bc9b7ca35cbc659afc94b6a06f329a34d claws-mail-2.10.0-rc1.tar.bz2 5479184
+SHA256 46b32ea0caaf56fcd2bdfb7cfeccbe7731e263375248ce061243080fc7d4d390 claws-mail-2.10.0-rc1.tar.bz2 5479184
diff --git a/mail-client/claws-mail/files/digest-claws-mail-2.6.1 b/mail-client/claws-mail/files/digest-claws-mail-2.6.1
deleted file mode 100644
index b4473ee7037c..000000000000
--- a/mail-client/claws-mail/files/digest-claws-mail-2.6.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 98099550a68a08eca5354659f3ea465c claws-mail-2.6.1.tar.bz2 5080311
-RMD160 26eded6e9292fc43ab74692eec3cea1412779280 claws-mail-2.6.1.tar.bz2 5080311
-SHA256 7edb2d58dbd0a5842dde7cbb2be10f5f70888f3e6f3b4fcb052e909c7eebda88 claws-mail-2.6.1.tar.bz2 5080311
diff --git a/mail-client/claws-mail/files/digest-claws-mail-2.7.2 b/mail-client/claws-mail/files/digest-claws-mail-2.7.2
deleted file mode 100644
index 49d063957f5b..000000000000
--- a/mail-client/claws-mail/files/digest-claws-mail-2.7.2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 079f167fba6e17ae2c688a0dae858b0f claws-mail-2.7.2.tar.bz2 5204013
-RMD160 bb9a3b056a9531d8f94556b800326c03a0f3b4f9 claws-mail-2.7.2.tar.bz2 5204013
-SHA256 a47a079f583581c2d049195f12a26524390e272c820b2c7233a37582e887a5b5 claws-mail-2.7.2.tar.bz2 5204013
diff --git a/mail-client/claws-mail/files/digest-claws-mail-2.8.1 b/mail-client/claws-mail/files/digest-claws-mail-2.8.1
deleted file mode 100644
index 9741e397823e..000000000000
--- a/mail-client/claws-mail/files/digest-claws-mail-2.8.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 b68983f2edac97cc094c527536d49a09 claws-mail-2.8.1.tar.bz2 5354557
-RMD160 aa84a6e7496cbfdf2b9cd2c28a2ee8b0de758a60 claws-mail-2.8.1.tar.bz2 5354557
-SHA256 8aa4f942ed95f53fe707c2b571c284c97e588a260f10042b2cc7c27174eb0552 claws-mail-2.8.1.tar.bz2 5354557