Add session USE flag to make libSM and libICE dependency optional. Bug #192570 by Sascha Geschwandtner <s.geschwandtner at gmx.de>.

Package-Manager: portage-2.1.3.7

4 files changed, 207 insertions, 9 deletions

diff --git a/mail-client/claws-mail/ChangeLog b/mail-client/claws-mail/ChangeLog
index 70d6e67136ab..dead4d64aca5 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.45 2007/09/16 16:27:05 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/claws-mail/ChangeLog,v 1.46 2007/09/16 20:11:56 ticho Exp $
+
+*claws-mail-3.0.0-r1 (16 Sep 2007)
+
+  16 Sep 2007; Andrej Kacian <ticho@gentoo.org> +claws-mail-3.0.0-r1.ebuild:
+  Add session USE flag to make libSM and libICE dependency optional. Bug
+  #192570 by Sascha Geschwandtner <s.geschwandtner at gmx.de>.
 
   16 Sep 2007; Christoph Mende <angelos@gentoo.org> claws-mail-3.0.0.ebuild:
   Stable on amd64 wrt security bug #190104
diff --git a/mail-client/claws-mail/Manifest b/mail-client/claws-mail/Manifest
index 10a60b3c3d3f..09bc3e7bc474 100644
--- a/mail-client/claws-mail/Manifest
+++ b/mail-client/claws-mail/Manifest
@@ -21,14 +21,18 @@ 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
+EBUILD claws-mail-3.0.0-r1.ebuild 5529 RMD160 6fec9f40637c29830d9e24c4698e918c309ddd84 SHA1 9cd0478a9ec21c224ddd572ae07ea904d98ca501 SHA256 a8cbcf74cc38a533de3ccddd02856bf6d0f7c543f8055768f97036546e4f47c7
+MD5 de1cf28eed1edbf50acb7c0b55095909 claws-mail-3.0.0-r1.ebuild 5529
+RMD160 6fec9f40637c29830d9e24c4698e918c309ddd84 claws-mail-3.0.0-r1.ebuild 5529
+SHA256 a8cbcf74cc38a533de3ccddd02856bf6d0f7c543f8055768f97036546e4f47c7 claws-mail-3.0.0-r1.ebuild 5529
 EBUILD claws-mail-3.0.0.ebuild 5431 RMD160 fa91532e21daf84c75260fa6452774f9886cb309 SHA1 294ae9360dba07a5eb35bd6c2ab014efb6b0580c SHA256 87b773c46efd0674cfbd5153611d79d7ff9751b3c39a67f22d0b065ed2c9cf4b
 MD5 2ee85c7292fdb8e7f1c7dec608b5fc36 claws-mail-3.0.0.ebuild 5431
 RMD160 fa91532e21daf84c75260fa6452774f9886cb309 claws-mail-3.0.0.ebuild 5431
 SHA256 87b773c46efd0674cfbd5153611d79d7ff9751b3c39a67f22d0b065ed2c9cf4b claws-mail-3.0.0.ebuild 5431
-MISC ChangeLog 6633 RMD160 ff191c723a31266087825c41193345bab427fbd8 SHA1 059efb6d4da54d7271d568a8f0d6c14f60697bf0 SHA256 38718c9e25a1997d731f658d1df771194ee48177085eba8324e96859ffd40797
-MD5 4346e0cc9ef9b7920a120ef0dfa43040 ChangeLog 6633
-RMD160 ff191c723a31266087825c41193345bab427fbd8 ChangeLog 6633
-SHA256 38718c9e25a1997d731f658d1df771194ee48177085eba8324e96859ffd40797 ChangeLog 6633
+MISC ChangeLog 6881 RMD160 5288354c527f0f3666481b32ad948b7a142057b5 SHA1 a458bde1f3800c8ca74d335c6257b949af5ae3f6 SHA256 353ff2abf8179d2687c51d030bb8b60554fd1daa5f1072f66567f135ba3a44f3
+MD5 41bb0a14c5535a86af89ef560b1e0bb8 ChangeLog 6881
+RMD160 5288354c527f0f3666481b32ad948b7a142057b5 ChangeLog 6881
+SHA256 353ff2abf8179d2687c51d030bb8b60554fd1daa5f1072f66567f135ba3a44f3 ChangeLog 6881
 MISC metadata.xml 375 RMD160 aef134f2148c1c49355908facfa629a8e7af157c SHA1 517cdd70d1f329b174b7eb68bfd55c954981bdd5 SHA256 24017fb3bfa040e177963d586916169cac027bb8703ac7cef4f79ffd8fff0424
 MD5 b9517b3a2f57bb06971ac9770ee8da4b metadata.xml 375
 RMD160 aef134f2148c1c49355908facfa629a8e7af157c metadata.xml 375
@@ -45,10 +49,13 @@ SHA256 32cdd34221fca9924bd61f3f8647bf1cc31fbb0928c3cb92140cf4f36b758843 files/di
 MD5 a60eaf0ddbb51bf1047c9864e4e5ac36 files/digest-claws-mail-3.0.0 256
 RMD160 8723ac91806d0847e6d0a900ae7bc6650dbc2e1f files/digest-claws-mail-3.0.0 256
 SHA256 c18b05aa1b9c266099e7d478efcd07a011bb44c292489a8a76350ef8400601ef files/digest-claws-mail-3.0.0 256
+MD5 a60eaf0ddbb51bf1047c9864e4e5ac36 files/digest-claws-mail-3.0.0-r1 256
+RMD160 8723ac91806d0847e6d0a900ae7bc6650dbc2e1f files/digest-claws-mail-3.0.0-r1 256
+SHA256 c18b05aa1b9c266099e7d478efcd07a011bb44c292489a8a76350ef8400601ef files/digest-claws-mail-3.0.0-r1 256
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
+Version: GnuPG v1.4.7 (GNU/Linux)
 
-iD8DBQFG7VlfKhnDs22gwa8RAraUAKD0byStQZ+2b/WugDIGp6K5WzdU4gCggf/3
-Uu8wTmlEG9h1KDfoTDcCIH8=
-=+Auc
+iD8DBQFG7Y4UQlM6RnzZP+IRAqukAJ0TpxM9j2hlWdSNkCdAtTjxfbY+7QCfVqOq
+sgM9Ef93au61jmZS9GqcjjA=
+=tKFs
 -----END PGP SIGNATURE-----
diff --git a/mail-client/claws-mail/claws-mail-3.0.0-r1.ebuild b/mail-client/claws-mail/claws-mail-3.0.0-r1.ebuild
new file mode 100644
index 000000000000..f0e35e48a073
--- /dev/null
+++ b/mail-client/claws-mail/claws-mail-3.0.0-r1.ebuild
@@ -0,0 +1,182 @@
+# 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-r1.ebuild,v 1.1 2007/09/16 20:11:56 ticho Exp $
+
+IUSE="bogofilter clamav crypt dillo doc gnome imap ipv6 kde ldap pda session spell ssl startup-notification xface"
+
+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 )
+	session? ( x11-libs/libSM
+			x11-libs/libICE )
+	!<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`"
+	myconf="${myconf} `use_enable session libsm`"
+
+	# 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-r1 b/mail-client/claws-mail/files/digest-claws-mail-3.0.0-r1
new file mode 100644
index 000000000000..5a4ce529b14d
--- /dev/null
+++ b/mail-client/claws-mail/files/digest-claws-mail-3.0.0-r1
@@ -0,0 +1,3 @@
+MD5 9c6390d711b2c60840cc9138456a7cd5 claws-mail-3.0.0.tar.bz2 5647644
+RMD160 784a4faecb3ca1ca1103d97861cb6638b2341e46 claws-mail-3.0.0.tar.bz2 5647644
+SHA256 76f8512fd13063e8145c18f52932fb4ff5640d6652c3e835ddd64c1d32d94435 claws-mail-3.0.0.tar.bz2 5647644