version bump, make startup-notification support optional (bug #123608)

Package-Manager: portage-2.1_pre9-r4

4 files changed, 202 insertions, 5 deletions

diff --git a/mail-client/sylpheed-claws/ChangeLog b/mail-client/sylpheed-claws/ChangeLog
index b0b69ce5decd..8753926fded2 100644
--- a/mail-client/sylpheed-claws/ChangeLog
+++ b/mail-client/sylpheed-claws/ChangeLog
@@ -1,6 +1,12 @@
 # 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.89 2006/04/17 18:29:36 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/sylpheed-claws/ChangeLog,v 1.90 2006/04/24 20:53:51 genone Exp $
+
+*sylpheed-claws-2.1.1 (24 Apr 2006)
+
+  24 Apr 2006; Marius Mauch <genone@gentoo.org>
+  +sylpheed-claws-2.1.1.ebuild:
+  version bump, make startup-notification support optional (bug #123608)
 
   17 Apr 2006; Markus Rothe <corsair@gentoo.org>
   sylpheed-claws-2.0.0.ebuild:
diff --git a/mail-client/sylpheed-claws/Manifest b/mail-client/sylpheed-claws/Manifest
index a0f6a70ca854..20392bbb6448 100644
--- a/mail-client/sylpheed-claws/Manifest
+++ b/mail-client/sylpheed-claws/Manifest
@@ -1,8 +1,50 @@
-MD5 b3d02f24c6db260f0339dc02a4949132 ChangeLog 28803
-MD5 743b9535636a8b39507545bc03a1a265 files/digest-sylpheed-claws-1.0.5-r1 74
-MD5 a1eac34c9f5178a960a23b5cb711365a files/digest-sylpheed-claws-2.0.0 268
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX ldif-buffer-overflow-fix.diff 5007 RMD160 1354a6bd2687430b628b78aaf43f5c793d2f0704 SHA1 424e1dfca06488f605b9611160020227ecdd03ac SHA256 f820856aac43571b048bf83607499a08e9a4792264c04178c9735e5c1a45fedd size 5007
 MD5 06d23c04b3d6ddfb1431c22ecc5b28f6 files/ldif-buffer-overflow-fix.diff 5007
+RMD160 1354a6bd2687430b628b78aaf43f5c793d2f0704 files/ldif-buffer-overflow-fix.diff 5007
+SHA256 f820856aac43571b048bf83607499a08e9a4792264c04178c9735e5c1a45fedd files/ldif-buffer-overflow-fix.diff 5007
+AUX procmime.patch 977 RMD160 39a51a4d654759b15d1644a79fb6e8921130df3c SHA1 d76929f6dfc2179281f7ccee5789aab4e970ba9e SHA256 6b70df7ea239873c09cd26ce57b29f8990e6d66c8dbe65e97bf6d69fa9cd0a56 size 977
 MD5 bf4c9cd9cb7cdc6ece7d4d327910f0cf files/procmime.patch 977
-MD5 82e806ed62f0596fb7bef493d225712f metadata.xml 269
+RMD160 39a51a4d654759b15d1644a79fb6e8921130df3c files/procmime.patch 977
+SHA256 6b70df7ea239873c09cd26ce57b29f8990e6d66c8dbe65e97bf6d69fa9cd0a56 files/procmime.patch 977
+DIST sylpheed-claws-1.0.5.tar.bz2 3268626 size 3268626
+DIST sylpheed-claws-2.0.0.tar.bz2 3764105 RMD160 a22db4c76a324dc166f10ff6f189c5927530526a SHA256 6f7e7c2ec81d6fa608f0efc785a81928dbafad3eae8b3ac3c58d3b3413eb344d size 3764105
+DIST sylpheed-claws-2.1.1.tar.bz2 3877632 RMD160 cbe8062d2b17566bc2691637e8b7afcb18e9912d SHA256 468f6e56e21076d4053a2b1ee6284c970055391d23f0429aeceefae60c3ca482 size 3877632
+EBUILD sylpheed-claws-1.0.5-r1.ebuild 3894 RMD160 94d6e87bebd4c7199bb47260836a40f8cd016187 SHA1 5f8c5c96bdc6a95a2e3dc43ce8d867466e981366 SHA256 507c50c75a8ccc4f1eaf11f58407573f81786d56190394fdb6420af248e0c825 size 3894
 MD5 74abb664d838528a042d54de2945ebdc sylpheed-claws-1.0.5-r1.ebuild 3894
+RMD160 94d6e87bebd4c7199bb47260836a40f8cd016187 sylpheed-claws-1.0.5-r1.ebuild 3894
+SHA256 507c50c75a8ccc4f1eaf11f58407573f81786d56190394fdb6420af248e0c825 sylpheed-claws-1.0.5-r1.ebuild 3894
+EBUILD sylpheed-claws-2.0.0.ebuild 4317 RMD160 fb9ca26eb681523b6dcc91d59245a20f91b07552 SHA1 caa0776a7d07024a76560cc43610aa88cfebf2d3 SHA256 f6fff81c494e813379ba253fe3b0c2e36e3ceacc9a0403d88fd60265501a6d28 size 4317
 MD5 e530b3c0a8373fbf8382cf62fe9216ac sylpheed-claws-2.0.0.ebuild 4317
+RMD160 fb9ca26eb681523b6dcc91d59245a20f91b07552 sylpheed-claws-2.0.0.ebuild 4317
+SHA256 f6fff81c494e813379ba253fe3b0c2e36e3ceacc9a0403d88fd60265501a6d28 sylpheed-claws-2.0.0.ebuild 4317
+EBUILD sylpheed-claws-2.1.1.ebuild 4417 RMD160 2bfe5e6162b750f424593dec28b263160c2af1cf SHA1 c030db815c644b334878e0a05421a7e433d524d2 SHA256 6631ff90914858b439c01ce8e0507c8ecffe124b993803f880bba38b40427bb5 size 4417
+MD5 694e382f84dea57c6b7038c2e43e082d sylpheed-claws-2.1.1.ebuild 4417
+RMD160 2bfe5e6162b750f424593dec28b263160c2af1cf sylpheed-claws-2.1.1.ebuild 4417
+SHA256 6631ff90914858b439c01ce8e0507c8ecffe124b993803f880bba38b40427bb5 sylpheed-claws-2.1.1.ebuild 4417
+MISC ChangeLog 28993 RMD160 17136ba41fafecadd02467a1347008a51d597959 SHA1 f4a9f3b648b8835176c0d629db4c9c291cdd75dc SHA256 60aae6d6be4000b8e56c572b75d36aabf37cdf1bed2de3115ff9de656cc84c2e size 28993
+MD5 71e9db6fe723c7226e3250417c98250c ChangeLog 28993
+RMD160 17136ba41fafecadd02467a1347008a51d597959 ChangeLog 28993
+SHA256 60aae6d6be4000b8e56c572b75d36aabf37cdf1bed2de3115ff9de656cc84c2e ChangeLog 28993
+MISC metadata.xml 269 RMD160 39d775de55f9963f8946feaf088aa0324770bacb SHA1 4fd7b285049d0e587f89e86becf06c0fd77bae6d SHA256 3787959f4a775b1e787b35ff8380949d8f68bd67b81c2cf5a748733c9740cb94 size 269
+MD5 82e806ed62f0596fb7bef493d225712f metadata.xml 269
+RMD160 39d775de55f9963f8946feaf088aa0324770bacb metadata.xml 269
+SHA256 3787959f4a775b1e787b35ff8380949d8f68bd67b81c2cf5a748733c9740cb94 metadata.xml 269
+MD5 743b9535636a8b39507545bc03a1a265 files/digest-sylpheed-claws-1.0.5-r1 74
+RMD160 aed84236d73b895518895054812bfd39bd86fff7 files/digest-sylpheed-claws-1.0.5-r1 74
+SHA256 e7ab28101efda1f2cbce138132a0ac72293d2db455405e595dae1167564b9045 files/digest-sylpheed-claws-1.0.5-r1 74
+MD5 a1eac34c9f5178a960a23b5cb711365a files/digest-sylpheed-claws-2.0.0 268
+RMD160 adcbd602816cd020626fa5ca6f56ed663b50bd48 files/digest-sylpheed-claws-2.0.0 268
+SHA256 05805ff28a06f60706cc6ca703f70e9edcd1768dc2b134b48e1d3d664d844fa7 files/digest-sylpheed-claws-2.0.0 268
+MD5 795c00217b60d952c251dc50023f0f20 files/digest-sylpheed-claws-2.1.1 268
+RMD160 df6931945b45193a720ec372eca9cdb4bba81492 files/digest-sylpheed-claws-2.1.1 268
+SHA256 021f7ea8bb9425349fde08f448737b4222d8fb486498459a14e0f19b66a0e04e files/digest-sylpheed-claws-2.1.1 268
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2.2 (GNU/Linux)
+
+iD8DBQFETTsp6J2i8a8J4okRAqZGAJ0aX+6VyurTO7qhayEhZu05c45AQwCgjdCp
+ykjnAdIL/iQZm3Y3E8pUAvo=
+=INSg
+-----END PGP SIGNATURE-----
diff --git a/mail-client/sylpheed-claws/files/digest-sylpheed-claws-2.1.1 b/mail-client/sylpheed-claws/files/digest-sylpheed-claws-2.1.1
new file mode 100644
index 000000000000..8040f29e2ddf
--- /dev/null
+++ b/mail-client/sylpheed-claws/files/digest-sylpheed-claws-2.1.1
@@ -0,0 +1,3 @@
+MD5 8d7b1d01c4f236a5e7d3e139bf43cd5a sylpheed-claws-2.1.1.tar.bz2 3877632
+RMD160 cbe8062d2b17566bc2691637e8b7afcb18e9912d sylpheed-claws-2.1.1.tar.bz2 3877632
+SHA256 468f6e56e21076d4053a2b1ee6284c970055391d23f0429aeceefae60c3ca482 sylpheed-claws-2.1.1.tar.bz2 3877632
diff --git a/mail-client/sylpheed-claws/sylpheed-claws-2.1.1.ebuild b/mail-client/sylpheed-claws/sylpheed-claws-2.1.1.ebuild
new file mode 100644
index 000000000000..3746e90e46d0
--- /dev/null
+++ b/mail-client/sylpheed-claws/sylpheed-claws-2.1.1.ebuild
@@ -0,0 +1,146 @@
+# 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.1.1.ebuild,v 1.1 2006/04/24 20:53:51 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"
+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.41 )
+	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 maildir mailmbox perl rssyl 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-startup-notification \
+		--enable-trayicon-plugin \
+		${myconf} || die "./configure failed"
+
+	emake || die
+}
+
+src_install() {
+	make DESTDIR=${D} install || die
+
+	# wait for upstream: move manpage
+	mv ${D}/usr/share/man/man1/sylpheed{,-claws}.1
+
+	dodir /usr/share/applications
+	mv ${D}/usr/share/{gnome/apps/Internet,applications}/sylpheed-claws.desktop
+	rm -rf ${D}/usr/share/gnome
+
+	# 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
+}