Version bump including license change, adding attachwarner to plugin list.

Package-Manager: portage-2.1.3.2

5 files changed, 211 insertions, 15 deletions

diff --git a/mail-client/claws-mail/ChangeLog b/mail-client/claws-mail/ChangeLog
index edaab049d986..296787973cf9 100644
--- a/mail-client/claws-mail/ChangeLog
+++ b/mail-client/claws-mail/ChangeLog
@@ -1,6 +1,12 @@
 # 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.36 2007/07/07 13:51:48 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/claws-mail/ChangeLog,v 1.37 2007/08/03 20:19:45 genone Exp $
+
+*claws-mail-3.0.0_rc1 (03 Aug 2007)
+
+  03 Aug 2007; Marius Mauch <genone@gentoo.org> claws-mail-2.10.0.ebuild,
+  +claws-mail-3.0.0_rc1.ebuild:
+  Version bump including license change, adding attachwarner to plugin list.
 
 *claws-mail-2.10.0 (07 Jul 2007)
 
diff --git a/mail-client/claws-mail/Manifest b/mail-client/claws-mail/Manifest
index 171326276fd6..68c05ec77b3a 100644
--- a/mail-client/claws-mail/Manifest
+++ b/mail-client/claws-mail/Manifest
@@ -8,10 +8,11 @@ SHA256 9f6e8f639a6261f442a0209f619c1d212a4867d2829b82fbc2c442898780677d files/pl
 DIST claws-mail-2.10.0.tar.bz2 5520512 RMD160 e10eed2c3461a8c85d6313f0c57581a3b0ea654f SHA1 0ee38ec2dd0c37941b0bcc4af7ab441ec432c63c SHA256 59034fae8ed1e7373f4369b12ee96b884241cf5f86aefe37e4f4926ebf712ccf
 DIST claws-mail-2.9.1.tar.bz2 5451118 RMD160 19dc5b94e09a5d1f3c6812239daab78b64a651af SHA1 938291cb4e526df157be552a9a175d8623709b6d SHA256 056500e4f61f28791390270636ef279c326b090c8634c15faa59497fb3086c8b
 DIST claws-mail-2.9.2.tar.bz2 5448901 RMD160 f7330545776603d175acde980b15ca48c17b87b2 SHA1 3b15730065ca1e0c318592b39b02c2d0497e6ebc SHA256 57ba8f98a6b6965539ee1d038377216f276e319b1a14e40f2b033e156190a8a4
-EBUILD claws-mail-2.10.0.ebuild 5424 RMD160 a6ccafc6cbb657ce8e7b4f74266f72cf0f889976 SHA1 d3d23004d24ce955f1ab2f18ade5d447f15a420b SHA256 c907fc4b3fe21a6aadc4d422d09471e5192fb064b1c43c0627badd0164bc5abc
-MD5 39fd8b0f65f40466e58998ff3dbec1ec claws-mail-2.10.0.ebuild 5424
-RMD160 a6ccafc6cbb657ce8e7b4f74266f72cf0f889976 claws-mail-2.10.0.ebuild 5424
-SHA256 c907fc4b3fe21a6aadc4d422d09471e5192fb064b1c43c0627badd0164bc5abc claws-mail-2.10.0.ebuild 5424
+DIST claws-mail-3.0.0-rc1.tar.bz2 5383239 RMD160 ccb7a32fdde5a41b196e5e3853cd192037b4e7ac SHA1 401d89993d48200b5c898599ac81970648e37a2a SHA256 b119add830eb12dcfadcb85eddc6bbd7ee6f319676a24716e8bfb4c5458a3c22
+EBUILD claws-mail-2.10.0.ebuild 5438 RMD160 b5a3e5446fff5cee6aeebac47698aadb667018cf SHA1 a9f44d71514ba1088c819fe9433a225e0d2c4a91 SHA256 585283a73781fa31dc91dd0a2b8221b4614dc87a32d69d07165670977960f3a7
+MD5 0d47ff21709f84a69c8e61881c2eef37 claws-mail-2.10.0.ebuild 5438
+RMD160 b5a3e5446fff5cee6aeebac47698aadb667018cf claws-mail-2.10.0.ebuild 5438
+SHA256 585283a73781fa31dc91dd0a2b8221b4614dc87a32d69d07165670977960f3a7 claws-mail-2.10.0.ebuild 5438
 EBUILD claws-mail-2.9.1.ebuild 5987 RMD160 1411e890c52b0f290ef5bd7461fe21fda3e0b6ef SHA1 3aaa3ee044fa7138abe5a66acdbb2e067026a299 SHA256 cb279e601c5c4dff9f8444354d57f1ad032260d1dc142ed1a49b500ecf2fa936
 MD5 4be2217453cc531147a9aa5af5524aec claws-mail-2.9.1.ebuild 5987
 RMD160 1411e890c52b0f290ef5bd7461fe21fda3e0b6ef claws-mail-2.9.1.ebuild 5987
@@ -20,10 +21,14 @@ EBUILD claws-mail-2.9.2.ebuild 5993 RMD160 7e4056be36b4bb35cb577ce67430902b91b78
 MD5 47e5e72bce70111dbc62a56e1bd13ec1 claws-mail-2.9.2.ebuild 5993
 RMD160 7e4056be36b4bb35cb577ce67430902b91b78913 claws-mail-2.9.2.ebuild 5993
 SHA256 03a5b8305a521167fad8b1bad4d22e253a9e97d2f730151c988c3e963d235a48 claws-mail-2.9.2.ebuild 5993
-MISC ChangeLog 5459 RMD160 fed2577f5e9d855d4f3cfbf08a8b490e7f7f9e03 SHA1 6acd8016fc2d39d8527407422b27ea647a8405bb SHA256 e2acda8ea5638bec339ee1a003e07b8c4312cabee87aca1d3b50496b7f7470ff
-MD5 6dfb8358f35fd704e048e87f5ecdff76 ChangeLog 5459
-RMD160 fed2577f5e9d855d4f3cfbf08a8b490e7f7f9e03 ChangeLog 5459
-SHA256 e2acda8ea5638bec339ee1a003e07b8c4312cabee87aca1d3b50496b7f7470ff ChangeLog 5459
+EBUILD claws-mail-3.0.0_rc1.ebuild 5441 RMD160 aeea18b755b0132b6e2ccceedbeeec5c0218067a SHA1 87de373c1fe5fb30925f90ee79f9cee00d139515 SHA256 6fff44a9f5106ea87af932b81707e5eec53c37188fcb3f067b7de3c1c18c8e00
+MD5 b5d971ba767d9caa59e5c568a4911568 claws-mail-3.0.0_rc1.ebuild 5441
+RMD160 aeea18b755b0132b6e2ccceedbeeec5c0218067a claws-mail-3.0.0_rc1.ebuild 5441
+SHA256 6fff44a9f5106ea87af932b81707e5eec53c37188fcb3f067b7de3c1c18c8e00 claws-mail-3.0.0_rc1.ebuild 5441
+MISC ChangeLog 5681 RMD160 1d81a8efd6b6c6bdd1da3c1b2a45c3952ecfbecf SHA1 79408340f6834efb611ca238cf896d9062f85091 SHA256 2f1a47c3254d24150b3a441bbf665a9ccdde0726838b9dd51c514a1c8d102894
+MD5 9a32fc2bafc07dc8381c7a6e602653b7 ChangeLog 5681
+RMD160 1d81a8efd6b6c6bdd1da3c1b2a45c3952ecfbecf ChangeLog 5681
+SHA256 2f1a47c3254d24150b3a441bbf665a9ccdde0726838b9dd51c514a1c8d102894 ChangeLog 5681
 MISC metadata.xml 375 RMD160 aef134f2148c1c49355908facfa629a8e7af157c SHA1 517cdd70d1f329b174b7eb68bfd55c954981bdd5 SHA256 24017fb3bfa040e177963d586916169cac027bb8703ac7cef4f79ffd8fff0424
 MD5 b9517b3a2f57bb06971ac9770ee8da4b metadata.xml 375
 RMD160 aef134f2148c1c49355908facfa629a8e7af157c metadata.xml 375
@@ -37,10 +42,13 @@ SHA256 281d6608e2dc0e8617de977d0d7571de04f3257e88328c8112488e53a942ab15 files/di
 MD5 e1782d404672178c078a88953304781b files/digest-claws-mail-2.9.2 256
 RMD160 7bc53518c6db27fd52c68a8d5267e92b02c05fb1 files/digest-claws-mail-2.9.2 256
 SHA256 32cdd34221fca9924bd61f3f8647bf1cc31fbb0928c3cb92140cf4f36b758843 files/digest-claws-mail-2.9.2 256
+MD5 f0f2b5a662c7124f90f5964523810934 files/digest-claws-mail-3.0.0_rc1 268
+RMD160 c4ce8abae7cea3aa9ae6af2d1d6b522944fbb2e9 files/digest-claws-mail-3.0.0_rc1 268
+SHA256 a470dba9dc0c732996efa19d805801974773ff3493df2f6ede5a007a9d3f6de6 files/digest-claws-mail-3.0.0_rc1 268
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.7 (GNU/Linux)
+Version: GnuPG v2.0.5 (GNU/Linux)
 
-iD8DBQFGj5p6QlM6RnzZP+IRAmRlAJ4/MwUMrhHv8kQsLbnYTSbAJsfiJQCgmD2s
-Y7seRO7wA6nXuoBv3ZQ5EJ4=
-=LJt7
+iD8DBQFGs4zt6J2i8a8J4okRApjlAKCaft5E77tpbiPbLzq9/z1a0q0pSQCfUqsA
+3NnKcvAO/BKcBz671IrZzxM=
+=5TRw
 -----END PGP SIGNATURE-----
diff --git a/mail-client/claws-mail/claws-mail-2.10.0.ebuild b/mail-client/claws-mail/claws-mail-2.10.0.ebuild
index 4bd7f2d663a7..849f4aedc54f 100644
--- a/mail-client/claws-mail/claws-mail-2.10.0.ebuild
+++ b/mail-client/claws-mail/claws-mail-2.10.0.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.10.0.ebuild,v 1.1 2007/07/07 13:51:48 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/claws-mail/claws-mail-2.10.0.ebuild,v 1.2 2007/08/03 20:19:45 genone Exp $
 
 IUSE="gnome dillo crypt spell ssl ldap ipv6 pda clamav xface kde imap spamassassin doc startup-notification bogofilter"
 
@@ -45,7 +45,7 @@ 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 pdf-viewer perl rssyl smime synce vcalendar"
+PLUGIN_NAMES="acpi-notifier att-remover attachwarner cachesaver etpan-privacy fetchinfo gtkhtml maildir mailmbox newmail notification pdf-viewer perl rssyl smime synce vcalendar"
 
 src_compile() {
 	local myconf
diff --git a/mail-client/claws-mail/claws-mail-3.0.0_rc1.ebuild b/mail-client/claws-mail/claws-mail-3.0.0_rc1.ebuild
new file mode 100644
index 000000000000..3a493e7fe672
--- /dev/null
+++ b/mail-client/claws-mail/claws-mail-3.0.0_rc1.ebuild
@@ -0,0 +1,179 @@
+# 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-3.0.0_rc1.ebuild,v 1.1 2007/08/03 20:19:45 genone 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-3"
+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 attachwarner cachesaver etpan-privacy fetchinfo gtkhtml maildir mailmbox newmail notification pdf-viewer 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 \
+		--disable-maemo \
+		${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
+		exeinto ${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
+		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
+	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-3.0.0_rc1 b/mail-client/claws-mail/files/digest-claws-mail-3.0.0_rc1
new file mode 100644
index 000000000000..b81ad2790be7
--- /dev/null
+++ b/mail-client/claws-mail/files/digest-claws-mail-3.0.0_rc1
@@ -0,0 +1,3 @@
+MD5 a55d4d2c8df2c8e6d9036eed02a2cd83 claws-mail-3.0.0-rc1.tar.bz2 5383239
+RMD160 ccb7a32fdde5a41b196e5e3853cd192037b4e7ac claws-mail-3.0.0-rc1.tar.bz2 5383239
+SHA256 b119add830eb12dcfadcb85eddc6bbd7ee6f319676a24716e8bfb4c5458a3c22 claws-mail-3.0.0-rc1.tar.bz2 5383239