until now S/MIME support was built automatically, now it is use selectable by USE=smime

Package-Manager: portage-2.1.4.5

4 files changed, 196 insertions, 3 deletions

diff --git a/mail-client/claws-mail/ChangeLog b/mail-client/claws-mail/ChangeLog
index 5360d988b95a..ed3fc5067c38 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-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/claws-mail/ChangeLog,v 1.94 2008/11/30 15:32:07 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/claws-mail/ChangeLog,v 1.95 2008/12/02 20:26:24 fauli Exp $
+
+*claws-mail-3.6.1-r1 (02 Dec 2008)
+
+  02 Dec 2008; Christian Faulhammer <fauli@gentoo.org> metadata.xml,
+  +claws-mail-3.6.1-r1.ebuild:
+  until now S/MIME support was built automatically, now it is selectable
+  by USE=smime
 
   30 Nov 2008; Raúl Porcel <armin76@gentoo.org> claws-mail-3.6.1.ebuild:
   alpha stable wrt #248760
diff --git a/mail-client/claws-mail/Manifest b/mail-client/claws-mail/Manifest
index 4493cc8a3a44..5d089cea11fb 100644
--- a/mail-client/claws-mail/Manifest
+++ b/mail-client/claws-mail/Manifest
@@ -1,7 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX plugins-rebuild.sh 1367 RMD160 af49058972a932a5e8dddbe30e24ead56f14ce97 SHA1 4ae22ca11b8b3c4200b5a4b997157611d50dac0b SHA256 bea620d685a40ceb68cd5316b4cf7ff684afb94c305a45549e814a16daa18da1
 DIST claws-mail-3.5.0.tar.bz2 4819732 RMD160 837220a2665c0a395d25bbdab64af8903e578d1d SHA1 1833106a3a365a16a8f1b83362da36ef32edd6fb SHA256 51ea44e171ffa009884ecdddb68d9fed086d9afbc546cc303e8462de89a8abfa
 DIST claws-mail-3.6.1.tar.bz2 5387916 RMD160 a36a92bbe9fe203f770bfea80ebe06362e59c666 SHA1 5894b6e533a151ce8e4be6445e117cd40a0f63b9 SHA256 67337a4a1a5a5ce09f2a38422b7a6fc481e4747f74d4ddedd130d4fb06fc3907
 EBUILD claws-mail-3.5.0.ebuild 5493 RMD160 50d48f9c2f6068cd74d77645fe3ce08e7b48006a SHA1 96acd9e5eebd49e7e21c84921d38dfddf1ffeac9 SHA256 e837f88e44d3d99e81a2138ef6ae5235e4cede7d01e27ec81ffc565d00be7ad9
+EBUILD claws-mail-3.6.1-r1.ebuild 5195 RMD160 d10dbfaf1391b54b1a144ec872373c45ac441855 SHA1 1f742d76f00d3c17db27c0243f9d62d2ab0fa79b SHA256 3b2a1b157e0e706728fb422766da61c74e63e26350006f3783231d39f754751a
 EBUILD claws-mail-3.6.1.ebuild 5428 RMD160 c000d06e831c460297cb7902bd08a92a405e86db SHA1 30ba23e0ee481d1121b8b55547429ad8f25a7faa SHA256 b6ca1aaf8bd56910f92a630b1e4e47688c9db14e0e60a712895a23f35fb854ec
-MISC ChangeLog 15344 RMD160 ef6ea269a6adda393563d94679fa86b07984b21c SHA1 8917249aa4b4101eddda2e000bd15ffae10a04c3 SHA256 91924ab499af134bb5a7421d32f4534f0e6d840f43cc0f071fdc414cd8803607
-MISC metadata.xml 688 RMD160 6a219c3f1efae3e178ff5144051e81f1c505b918 SHA1 943e81e612ff1d76657e59d7f43e7d5f253cb886 SHA256 cab03a29bdd9e69ee087e0ee38fb2e656041fbae582e01c316b74278ba8ecf71
+MISC ChangeLog 15567 RMD160 c68b890325dc78d36a8c70c2026dff27b7374df3 SHA1 b44785f88e61872d1aeab217005f1aacec749bf8 SHA256 a514ebfd7920dd6b835d4ceaebd23ac7748f31cf8aa91824b16bdbceb49f60d8
+MISC metadata.xml 748 RMD160 415197ea0159afe4e96bccf7df8552745636b8f7 SHA1 7ee982dc930ec4e30fa4438eaa4e84873da3425a SHA256 8e79dfff9b879544f441924c599816177080fe88797d9389887b736152d81f6b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkk1mfoACgkQNQqtfCuFnePbUACfY4Qf76IuMYAKtk9TR8nsTKIz
+4d8AnjrB+rA3ifsHToFJnnwpwa/cfUN9
+=oAHM
+-----END PGP SIGNATURE-----
diff --git a/mail-client/claws-mail/claws-mail-3.6.1-r1.ebuild b/mail-client/claws-mail/claws-mail-3.6.1-r1.ebuild
new file mode 100644
index 000000000000..6f83765b82c1
--- /dev/null
+++ b/mail-client/claws-mail/claws-mail-3.6.1-r1.ebuild
@@ -0,0 +1,174 @@
+# Copyright 1999-2008 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.6.1-r1.ebuild,v 1.1 2008/12/02 20:26:24 fauli Exp $
+
+inherit eutils multilib
+
+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 dillo doc gnome gnutls imap ipv6 kde ldap nntp pda session smime spamassassin spell ssl startup-notification xface"
+
+COMMONDEPEND=">=x11-libs/gtk+-2.6
+	pda? ( >=app-pda/jpilot-0.99 )
+	ssl? ( net-libs/gnutls )
+	ldap? ( >=net-nds/openldap-2.0.7 )
+	crypt? ( >=app-crypt/gpgme-1.1.1 )
+	dillo? ( www-client/dillo )
+	spell? ( >=app-text/enchant-1.0.0 )
+	kde? ( kde-base/kdelibs )
+	imap? ( >=net-libs/libetpan-0.57 )
+	nntp? ( >=net-libs/libetpan-0.57 )
+	gnome? ( >=gnome-base/libgnomeprintui-2.2 )
+	gnutls? ( net-libs/gnutls )
+	startup-notification? ( x11-libs/startup-notification )
+	bogofilter? ( mail-filter/bogofilter )
+	session? ( x11-libs/libSM
+			x11-libs/libICE )
+	smime? ( >=app-crypt/gpgme-1.1.1 )"
+
+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 att-remover attachwarner cachesaver etpan-privacy fetchinfo gtkhtml maildir mailmbox newmail notification pdf-viewer perl rssyl smime synce vcalendar"
+
+src_compile() {
+	local myconf="--disable-libetpan"
+
+	# libetpan is needed if user wants nntp or imap functionality
+	use imap && myconf="--enable-libetpan"
+	use nntp && myconf="--enable-libetpan"
+
+	econf \
+		$(use_enable gnome gnomeprint) \
+		$(use_enable ipv6) \
+		$(use_enable ldap) \
+		$(use_enable pda jpilot) \
+		$(use_enable spell enchant) \
+		$(use_enable gnutls) \
+		$(use_enable ssl gnutls) \
+		$(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) \
+		--enable-trayicon-plugin \
+		--disable-maemo ${myconf} || die
+
+	emake || die
+}
+
+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
+
+	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" \
+			${desktopfile}.template
+		dodir /usr/share/apps/konqueror/servicemenus
+		insopts -m 0644
+		insinto /usr/share/apps/konqueror/servicemenus
+		newins ${desktopfile}.template ${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 "${ROOT}"/usr/share/icons/hicolor
+}
diff --git a/mail-client/claws-mail/metadata.xml b/mail-client/claws-mail/metadata.xml
index edb867ed05e1..0f5bfaffa14b 100644
--- a/mail-client/claws-mail/metadata.xml
+++ b/mail-client/claws-mail/metadata.xml
@@ -16,6 +16,7 @@
 		<flag name='dillo'>Enables support for inline HTTP email viewing with a
 			plugin (which depends on the <pkg>www-client/dillo</pkg> 
 			browser)</flag>
+		<flag name='smime'>Build plugin for S/MIME support</flag>
 		<flag name='spamassassin'>Build <pkg>mail-filter/spamassassin</pkg>
 			plugin</flag>
 	</use>