version bump, updating description

(Portage version: 2.1.1_pre4-r1)

7 files changed, 164 insertions, 9 deletions

diff --git a/mail-client/sylpheed-claws/ChangeLog b/mail-client/sylpheed-claws/ChangeLog
index 75fb57df14ba..60c4d1f4b509 100644
--- a/mail-client/sylpheed-claws/ChangeLog
+++ b/mail-client/sylpheed-claws/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for mail-client/sylpheed-claws
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/sylpheed-claws/ChangeLog,v 1.103 2006/07/06 06:25:59 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/sylpheed-claws/ChangeLog,v 1.104 2006/08/05 06:10:54 genone Exp $
+
+*sylpheed-claws-2.4.0 (05 Aug 2006)
+
+  05 Aug 2006; Marius Mauch <genone@gentoo.org> sylpheed-claws-2.0.0.ebuild,
+  -sylpheed-claws-2.1.1.ebuild, sylpheed-claws-2.2.3.ebuild,
+  sylpheed-claws-2.3.0.ebuild, sylpheed-claws-2.3.1.ebuild,
+  +sylpheed-claws-2.4.0.ebuild:
+  Version bump, updating description for bug #140916
 
   06 Jul 2006; Markus Rothe <corsair@gentoo.org>
   sylpheed-claws-2.3.0.ebuild:
diff --git a/mail-client/sylpheed-claws/files/digest-sylpheed-claws-2.4.0 b/mail-client/sylpheed-claws/files/digest-sylpheed-claws-2.4.0
new file mode 100644
index 000000000000..0bb8e3189c5a
--- /dev/null
+++ b/mail-client/sylpheed-claws/files/digest-sylpheed-claws-2.4.0
@@ -0,0 +1,3 @@
+MD5 8e8e2b847d6466b1384e3a5a15b9f2e7 sylpheed-claws-2.4.0.tar.bz2 4593307
+RMD160 4c22797f73e290cfc2ea1006d9a04b0cdf4783c1 sylpheed-claws-2.4.0.tar.bz2 4593307
+SHA256 7ea2a321e41e04c0f4b0fe70489b2967b8d54fb88eca808ed44c56669325291a sylpheed-claws-2.4.0.tar.bz2 4593307
diff --git a/mail-client/sylpheed-claws/sylpheed-claws-2.0.0.ebuild b/mail-client/sylpheed-claws/sylpheed-claws-2.0.0.ebuild
index 7b885a00c756..313fe1328fa3 100644
--- a/mail-client/sylpheed-claws/sylpheed-claws-2.0.0.ebuild
+++ b/mail-client/sylpheed-claws/sylpheed-claws-2.0.0.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/sylpheed-claws/sylpheed-claws-2.0.0.ebuild,v 1.11 2006/06/05 18:25:43 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/sylpheed-claws/sylpheed-claws-2.0.0.ebuild,v 1.12 2006/08/05 06:10:54 genone Exp $
 
 IUSE="gnome dillo crypt spell ssl ldap ipv6 pda clamav xface kde imap spamassassin doc"
 
 inherit eutils
 
-DESCRIPTION="Bleeding edge version of Sylpheed"
+DESCRIPTION="Sylpheed-Claws is an email client (and news reader) based on GTK+"
 HOMEPAGE="http://claws.sylpheed.org"
 
 if [ -n "${P/*_rc*/}" ]; then
diff --git a/mail-client/sylpheed-claws/sylpheed-claws-2.2.3.ebuild b/mail-client/sylpheed-claws/sylpheed-claws-2.2.3.ebuild
index dcf2a49a4a32..8e9c3f4d0cf0 100644
--- a/mail-client/sylpheed-claws/sylpheed-claws-2.2.3.ebuild
+++ b/mail-client/sylpheed-claws/sylpheed-claws-2.2.3.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/sylpheed-claws/sylpheed-claws-2.2.3.ebuild,v 1.2 2006/06/18 16:38:20 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/sylpheed-claws/sylpheed-claws-2.2.3.ebuild,v 1.3 2006/08/05 06:10:54 genone Exp $
 
 IUSE="gnome dillo crypt spell ssl ldap ipv6 pda clamav xface kde imap spamassassin doc startup-notification"
 
 inherit eutils
 
-DESCRIPTION="Bleeding edge version of Sylpheed"
+DESCRIPTION="Sylpheed-Claws is an email client (and news reader) based on GTK+"
 HOMEPAGE="http://claws.sylpheed.org"
 
 if [ -n "${P/*_rc*/}" ]; then
diff --git a/mail-client/sylpheed-claws/sylpheed-claws-2.3.0.ebuild b/mail-client/sylpheed-claws/sylpheed-claws-2.3.0.ebuild
index e55468ace8dc..889136beaa6c 100644
--- a/mail-client/sylpheed-claws/sylpheed-claws-2.3.0.ebuild
+++ b/mail-client/sylpheed-claws/sylpheed-claws-2.3.0.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/sylpheed-claws/sylpheed-claws-2.3.0.ebuild,v 1.6 2006/07/06 06:25:59 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/sylpheed-claws/sylpheed-claws-2.3.0.ebuild,v 1.7 2006/08/05 06:10:54 genone Exp $
 
 IUSE="gnome dillo crypt spell ssl ldap ipv6 pda clamav xface kde imap spamassassin doc startup-notification"
 
 inherit eutils
 
-DESCRIPTION="Bleeding edge version of Sylpheed"
+DESCRIPTION="Sylpheed-Claws is an email client (and news reader) based on GTK+"
 HOMEPAGE="http://claws.sylpheed.org"
 
 if [ -n "${P/*_rc*/}" ]; then
diff --git a/mail-client/sylpheed-claws/sylpheed-claws-2.3.1.ebuild b/mail-client/sylpheed-claws/sylpheed-claws-2.3.1.ebuild
index 32100023912f..b25c6e402ac1 100644
--- a/mail-client/sylpheed-claws/sylpheed-claws-2.3.1.ebuild
+++ b/mail-client/sylpheed-claws/sylpheed-claws-2.3.1.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/sylpheed-claws/sylpheed-claws-2.3.1.ebuild,v 1.1 2006/06/25 04:36:49 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/sylpheed-claws/sylpheed-claws-2.3.1.ebuild,v 1.2 2006/08/05 06:10:54 genone Exp $
 
 IUSE="gnome dillo crypt spell ssl ldap ipv6 pda clamav xface kde imap spamassassin doc startup-notification"
 
 inherit eutils
 
-DESCRIPTION="Bleeding edge version of Sylpheed"
+DESCRIPTION="Sylpheed-Claws is an email client (and news reader) based on GTK+"
 HOMEPAGE="http://claws.sylpheed.org"
 
 if [ -n "${P/*_rc*/}" ]; then
diff --git a/mail-client/sylpheed-claws/sylpheed-claws-2.4.0.ebuild b/mail-client/sylpheed-claws/sylpheed-claws-2.4.0.ebuild
new file mode 100644
index 000000000000..9f44cfef9964
--- /dev/null
+++ b/mail-client/sylpheed-claws/sylpheed-claws-2.4.0.ebuild
@@ -0,0 +1,144 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-client/sylpheed-claws/sylpheed-claws-2.4.0.ebuild,v 1.1 2006/08/05 06:10:54 genone Exp $
+
+IUSE="gnome dillo crypt spell ssl ldap ipv6 pda clamav xface kde imap spamassassin doc startup-notification"
+
+inherit eutils
+
+DESCRIPTION="Sylpheed-Claws is an email client (and news reader) based on GTK+"
+HOMEPAGE="http://claws.sylpheed.org"
+
+if [ -n "${P/*_rc*/}" ]; then
+	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+else
+	MY_P="${P/_/-}"
+	S="${WORKDIR}/${MY_P}"
+	SRC_URI="http://claws.sylpheed.org/snapshots/${MY_P}.tar.bz2"
+fi
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 sparc x86"
+
+COMMONDEPEND=">=x11-libs/gtk+-2.4
+	pda? ( >=app-pda/jpilot-0.99 )
+	ssl? ( >=dev-libs/openssl-0.9.7 )
+	ldap? ( >=net-nds/openldap-2.0.7 )
+	crypt? ( >=app-crypt/gpgme-0.4 )
+	dillo? ( www-client/dillo )
+	spell? ( virtual/aspell-dict )
+	clamav? ( app-antivirus/clamav )
+	kde? ( kde-base/kdelibs )
+	imap? ( >=net-libs/libetpan-0.45 )
+	gnome? ( >=gnome-base/libgnomeprintui-2.2 )
+	startup-notification? ( x11-libs/startup-notification )
+	!mail-client/sylpheed-claws-pgpinline"	# included in the main package now
+
+DEPEND="${COMMONDEPEND}
+	xface? ( >=media-libs/compface-1.4 )
+	>=sys-apps/sed-4"
+
+RDEPEND="${COMMONDEPEND}
+	app-misc/mime-types
+	net-mail/metamail
+	x11-misc/shared-mime-info"
+
+PROVIDE="virtual/sylpheed"
+
+PLUGIN_NAMES="acpi-notifier att-remover cachesaver etpan-privacy fetchinfo gtkhtml maildir mailmbox newmail notification perl rssyl smime synce vcalendar"
+
+src_compile() {
+	local myconf
+
+	# Optional features
+	myconf="${myconf} `use_enable gnome gnomeprint`"
+	myconf="${myconf} `use_enable imap libetpan`"
+	myconf="${myconf} `use_enable ipv6`"
+	myconf="${myconf} `use_enable ldap`"
+	myconf="${myconf} `use_enable pda jpilot`"
+	myconf="${myconf} `use_enable spell aspell`"
+	myconf="${myconf} `use_enable ssl openssl`"
+	myconf="${myconf} `use_enable xface compface`"
+	myconf="${myconf} `use_enable doc manual`"
+	myconf="${myconf} `use_enable startup-notification`"
+
+	# Optional plugins
+	myconf="${myconf} `use_enable clamav clamav-plugin`"
+	myconf="${myconf} `use_enable crypt pgpmime-plugin`"
+	myconf="${myconf} `use_enable crypt pgpinline-plugin`"
+	myconf="${myconf} `use_enable crypt pgpcore-plugin`"
+	myconf="${myconf} `use_enable dillo dillo-viewer-plugin`"
+	myconf="${myconf} `use_enable spamassassin spamassassin-plugin`"
+
+	econf \
+		--enable-trayicon-plugin \
+		${myconf} || die "./configure failed"
+
+	emake || die
+}
+
+src_install() {
+	make DESTDIR=${D} install || die
+
+	if [ -d ${D}/usr/share/gnome ]; then
+		dodir /usr/share/applications
+		mv ${D}/usr/share/{gnome/apps/Internet,applications}/sylpheed-claws.desktop
+		rm -rf ${D}/usr/share/gnome
+	fi
+
+	# Makefile install sylpheed-claws.png in /usr/share/icons/hicolor/48x48/apps
+	# => also install it in /usr/share/pixmaps for other desktop envs
+	# => also install higher resolution icons in /usr/share/icons/hicolor/...
+	insinto /usr/share/pixmaps
+	doins sylpheed-claws.png
+	local res resdir
+	for res in 64x64 128x128 ; do
+		resdir="/usr/share/icons/hicolor/${res}/apps"
+		insinto ${resdir}
+		newins sylpheed-claws-${res}.png sylpheed-claws.png
+	done
+
+	dodoc AUTHORS ChangeLog* INSTALL* NEWS README* TODO*
+	docinto tools
+	dodoc tools/README*
+
+	# install the extra tools
+	cd ${S}/tools
+	exeinto /usr/lib/${PN}/tools
+	doexe *.pl *.py *.rc *.conf *.sh
+	doexe tb2sylpheed update-po uudec
+
+	if use kde; then
+		local kdeprefix="$(kde-config --prefix)"
+		local servicescript="sylpheed-kdeservicemenu.pl"
+		cd ${S}/tools/kdeservicemenu
+		for f in sylpheed-attach-files.desktop sylpheed-compress-attach.desktop; do
+			sed -e "s:SCRIPT_PATH:${kdeprefix}/bin/${servicescript}:g" template_$f > $f
+			install -m 0644 $f ${D}/${kdeprefix}/share/apps/konqueror/servicemenus/$f
+		done
+		insinto ${kdeprefix}/bin
+		doexe ${servicescript}
+	fi
+
+	# kill useless plugin files
+	rm -f ${D}/usr/lib*/${PN}/plugins/*.{la,a}
+}
+
+pkg_postinst() {
+	UPDATE_PLUGINS=""
+	for x in ${PLUGIN_NAMES}; do
+		has_version mail-client/sylpheed-claws-$x && UPDATE_PLUGINS="${UPDATE_PLUGINS} $x"
+	done
+	if [ -n "${UPDATE_PLUGINS}" ]; then
+		ewarn
+		ewarn "You have to re-emerge or update the following plugins:"
+		ewarn
+		for x in ${UPDATE_PLUGINS}; do
+			ewarn "    mail-client/sylpheed-claws-$x"
+		done
+		ewarn
+		epause 5
+		ebeep 3
+	fi
+}