gentoo resync : 02.08.2019

4 files changed, 253 insertions, 28 deletions

diff --git a/mail-client/claws-mail/Manifest b/mail-client/claws-mail/Manifest
index 4abdaa5be17e..df6376157858 100644
--- a/mail-client/claws-mail/Manifest
+++ b/mail-client/claws-mail/Manifest
@@ -1,4 +1,6 @@
 DIST claws-mail-3.17.3.tar.xz 6164392 BLAKE2B ac0781c4c7e4423f4a8b494a9bd007d62443e8c540feaeef089ca65f641da5ecabfa2c5c0662750d6f58c8913c1d95750a3dfb6b4628e573b0105f8f526bc066 SHA512 b562d785eaedbdec408c4a3db8f4d9326183266fe314509a189c9e1220f15b4f41ccd9d8c58c5194c0267842e8efe900e88eb17c0d17d6069e2543870efa5ef8
+DIST claws-mail-3.17.4.tar.xz 6280252 BLAKE2B 8ddce2e5dfb3ae0ddb646c4f5a81d7e4c3834d2fa7a7f7a7326bf6e160291db4ba5954737bb61a4ae86ebaaab72a695d2e351fe2cf89b187eba4341f5d9b0cd9 SHA512 4fc3b04d89c84b068654902d3d4f8ba66ec86c4ea9c4bd145fb3169dd26a2fcfc26adc8367b0ed90c69d095f6b1717ba3a9a52cc6d3e310a9dad1c3f733d8012
 EBUILD claws-mail-3.17.3-r1.ebuild 5892 BLAKE2B a9689bae73e1a659f434587aa0d48b62dc18f1204df3315bdfaab9993ee30445186d5627b9b55b6581293f1577796ffe2f65a03e0dbf7a75b5281e75b3288687 SHA512 6409b4b9a69b32aaa7ffe30ab35affa27331d9981673f119d000c2b6f46a5a865cea64c9daf9d2f024003b0720c4090ecf6184b57fd4ebecba14b7681f0119d6
-EBUILD claws-mail-9999.ebuild 5959 BLAKE2B 36ef3af4390e585f872bc74dc7ae05562cc50440d8e8f824743040a6c2b3466b1df5f21834bf72d6cecce0289ca7c8f298a478dcba887a525a2d570775b5f067 SHA512 9340bda2f6c120e3f2a026f896171d8ffcefe56c1c627ae95e792cf3b6f2297e199e3512c4728a3387d7855f822613ef85961e6a234ccc1cd9d030ed64c19dca
-MISC metadata.xml 1556 BLAKE2B 29e42ddae81e5278dba83a53ae5dfd56993647aa6b22a35cdcef1e69aafa66633472b2ef27894e3fce3aea7a38a4d49af1ac7f0e44aee492e3792c75bb71bafe SHA512 c454d30ee5161f482e97a30895620e01c3900c5bb89ac50b8468f1f3092b736802003b9867a1dfd9c8ce196cdfc689b650a3ac53980dce5a0b925712cb04a572
+EBUILD claws-mail-3.17.4.ebuild 6067 BLAKE2B c725d36b94c76535ee6817acaef270cd1ca0c9bae0a629244d847297e41c3a2db975a5c74d8388627ba3bfd0b932e536186ff7587b496e8484d0316f3f795a3a SHA512 65c4b4e1b1bb2cc2fe36b455db4a909faa480987a7f33561a3a06be574eb245506a1530f15ee77539f65b834decfc70db097570ce5f74d2ef7660b98f98820c3
+EBUILD claws-mail-9999.ebuild 6131 BLAKE2B e7d47004ae743442826746674ec43d2e980863681c22f9eec36df54d7d93049bb506d8393915962410b8e24d4ddead2204580a09b16318bf654509d9eccb2fda SHA512 2553fa3515b7d5a475f5e1260fe8e256adf00fa74e6fa0526abfa1ae82e77604fdb84a9bcba06efabc93f02814106f210c454dbc4f86d8ca363663300deb0777
+MISC metadata.xml 1532 BLAKE2B bf5ed5873952bd13c00e19cbb930026b6eae126caa18a14bde1f4ff7b219fe2f57fcfa3dd4b2dcd5d94acf30da2f8e7a4857bb78049567bf0fbed502977bbed7 SHA512 ea525e1341114ab82508a8423990c3ddde958f5501e0bd7355e25f4ec223ec3cd65b91a1261623bf98c0f06ed91333bb2726d2a6054a0ff49b2d59586507c051
diff --git a/mail-client/claws-mail/claws-mail-3.17.4.ebuild b/mail-client/claws-mail/claws-mail-3.17.4.ebuild
new file mode 100644
index 000000000000..0cec94b7a4bc
--- /dev/null
+++ b/mail-client/claws-mail/claws-mail-3.17.4.ebuild
@@ -0,0 +1,226 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+inherit autotools desktop python-single-r1 xdg
+
+DESCRIPTION="An email client (and news reader) based on GTK+"
+HOMEPAGE="https://www.claws-mail.org/"
+
+if [[ "${PV}" == 9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="git://git.claws-mail.org/claws.git"
+else
+	SRC_URI="https://www.claws-mail.org/download.php?file=releases/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+SLOT="0"
+LICENSE="GPL-3"
+
+IUSE="archive bogofilter calendar clamav dbus debug dillo doc gdata +gnutls +imap ipv6 ldap +libcanberra +libindicate +libnotify litehtml networkmanager nls nntp +notification pda pdf perl +pgp python rss session sieve smime spamassassin spam-report spell startup-notification svg valgrind xface"
+REQUIRED_USE="libcanberra? ( notification )
+	libindicate? ( notification )
+	libnotify? ( notification )
+	networkmanager? ( dbus )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	smime? ( pgp )"
+
+COMMONDEPEND="
+	dev-libs/nettle:=
+	net-mail/ytnef
+	sys-libs/zlib:=
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2[jpeg]
+	>=x11-libs/gtk+-2.24:2
+	x11-libs/libX11
+	x11-libs/pango
+	archive? (
+		app-arch/libarchive
+		>=net-misc/curl-7.9.7
+	)
+	bogofilter? ( mail-filter/bogofilter )
+	calendar? (
+		>=dev-libs/libical-2.0.0:=
+		>=net-misc/curl-7.9.7
+	)
+	dbus? (
+		>=dev-libs/dbus-glib-0.60
+		sys-apps/dbus
+	)
+	gdata? ( >=dev-libs/libgdata-0.17.2 )
+	dillo? ( www-client/dillo )
+	gnutls? ( >=net-libs/gnutls-3.0 )
+	imap? ( >=net-libs/libetpan-0.57 )
+	ldap? ( >=net-nds/openldap-2.0.7 )
+	litehtml? (
+		>=dev-libs/glib-2.36:2
+		>=dev-libs/gumbo-0.10
+		net-misc/curl
+		media-libs/fontconfig
+	)
+	nls? ( >=sys-devel/gettext-0.18 )
+	nntp? ( >=net-libs/libetpan-0.57 )
+	notification? (
+		dev-libs/glib:2
+		libcanberra? (  media-libs/libcanberra[gtk] )
+		libindicate? ( dev-libs/libindicate:3[gtk] )
+		libnotify? ( x11-libs/libnotify )
+	)
+	pda? ( >=app-pda/jpilot-0.99 )
+	pdf? ( app-text/poppler[cairo] )
+	pgp? ( >=app-crypt/gpgme-1.0.0 )
+	session? (
+		x11-libs/libICE
+		x11-libs/libSM
+	)
+	smime? ( >=app-crypt/gpgme-1.0.0 )
+	spam-report? ( >=net-misc/curl-7.9.7 )
+	spell? ( >=app-text/enchant-1.0.0:= )
+	startup-notification? ( x11-libs/startup-notification )
+	svg? ( >=gnome-base/librsvg-2.40.5 )
+	valgrind? ( dev-util/valgrind )
+"
+
+DEPEND="${COMMONDEPEND}
+	xface? ( >=media-libs/compface-1.4 )
+"
+BDEPEND="
+	app-arch/xz-utils
+	virtual/pkgconfig
+"
+RDEPEND="${COMMONDEPEND}
+	app-misc/mime-types
+	x11-misc/shared-mime-info
+	clamav? ( app-antivirus/clamav )
+	networkmanager? ( net-misc/networkmanager )
+	pdf? ( app-text/ghostscript-gpl )
+	perl? ( dev-lang/perl:= )
+	python? (
+		${PYTHON_DEPS}
+		>=dev-python/pygtk-2.10.3
+	)
+	rss? (
+		dev-libs/libxml2
+		net-misc/curl
+	)"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	xdg_src_prepare
+	eautoreconf
+}
+
+src_configure() {
+	# Don't use libsoup-gnome (bug #565924)
+	export HAVE_LIBSOUP_GNOME=no
+
+	local myeconfargs=(
+		--disable-bsfilter-plugin
+		--disable-fancy-plugin
+		--disable-generic-umpc
+		--enable-acpi_notifier-plugin
+		--enable-address_keeper-plugin
+		--enable-alternate-addressbook
+		--enable-att_remover-plugin
+		--enable-attachwarner-plugin
+		--enable-fetchinfo-plugin
+		--enable-mailmbox-plugin
+		--enable-newmail-plugin
+		--enable-tnef_parse-plugin
+		--with-password-encryption=$(usex gnutls gnutls old)
+		$(use_enable archive archive-plugin)
+		$(use_enable bogofilter bogofilter-plugin)
+		$(use_enable calendar vcalendar-plugin)
+		$(use_enable clamav clamd-plugin)
+		$(use_enable dbus)
+		$(use_enable debug crash-dialog)
+		$(use_enable dillo dillo-plugin)
+		$(use_enable doc manual)
+		$(use_enable gdata gdata-plugin)
+		$(use_enable gnutls)
+		$(use_enable ipv6)
+		$(use_enable ldap)
+		$(use_enable litehtml litehtml_viewer-plugin)
+		$(use_enable networkmanager)
+		$(use_enable nls)
+		$(use_enable notification notification-plugin)
+		$(use_enable pda jpilot)
+		$(use_enable pdf pdf_viewer-plugin)
+		$(use_enable perl perl-plugin)
+		$(use_enable pgp pgpcore-plugin)
+		$(use_enable pgp pgpinline-plugin)
+		$(use_enable pgp pgpmime-plugin)
+		$(use_enable python python-plugin)
+		$(use_enable rss rssyl-plugin)
+		$(use_enable session libsm)
+		$(use_enable sieve managesieve-plugin)
+		$(use_enable smime smime-plugin)
+		$(use_enable spam-report spam_report-plugin)
+		$(use_enable spamassassin spamassassin-plugin)
+		$(use_enable spell enchant)
+		$(use_enable startup-notification)
+		$(use_enable svg)
+		$(use_enable valgrind valgrind)
+		$(use_enable xface compface)
+	)
+
+	# libetpan is needed if user wants nntp or imap functionality
+	if use imap || use nntp ; then
+		myeconfargs+=( --enable-libetpan )
+	else
+		myeconfargs+=( --disable-libetpan )
+	fi
+
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	local DOCS=( AUTHORS ChangeLog* INSTALL* NEWS README* TODO* )
+	default
+
+	# 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
+	local size
+	for size in 64 128 ; do
+		newicon -s ${size} ${PN}-${size}x${size}.png ${PN}.png
+	done
+
+	docinto tools
+	dodoc tools/README*
+
+	domenu ${PN}.desktop
+
+	einfo "Installing extra tools"
+	cd "${S}"/tools || die
+	exeinto /usr/$(get_libdir)/${PN}/tools
+	doexe *.pl *.py *.conf *.sh
+	doexe tb2claws-mail update-po uudec uuooffice
+
+	# kill useless files
+	rm -f "${ED}"/usr/lib*/claws-mail/plugins/*.{a,la}
+}
+
+pkg_preinst() {
+	xdg_pkg_preinst
+}
+
+pkg_postinst() {
+	ewarn "When upgrading from version 3.9.0 or below some changes have happened:"
+	ewarn "- There are no individual plugins in mail-client/claws-mail-* anymore, but they are integrated mostly controlled through USE flags"
+	ewarn "- Plugins with no special dependencies are just built and can be loaded through the interface"
+	ewarn "- The gtkhtml2 and trayicon plugins have been dropped entirely"
+	xdg_pkg_postinst
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+}
diff --git a/mail-client/claws-mail/claws-mail-9999.ebuild b/mail-client/claws-mail/claws-mail-9999.ebuild
index e0747aeb75cb..f460e8d37fc5 100644
--- a/mail-client/claws-mail/claws-mail-9999.ebuild
+++ b/mail-client/claws-mail/claws-mail-9999.ebuild
@@ -20,7 +20,7 @@ fi
 SLOT="0"
 LICENSE="GPL-3"
 
-IUSE="archive bogofilter calendar clamav dbus debug dillo doc gdata +gnutls gtk3 +imap ipv6 ldap +libcanberra +libindicate +libnotify networkmanager nls nntp +notification pda pdf perl +pgp python rss session sieve smime spamassassin spam-report spell startup-notification svg valgrind xface"
+IUSE="archive bogofilter calendar clamav dbus debug dillo doc gdata +gnutls gtk3 +imap ipv6 ldap +libcanberra +libindicate +libnotify litehtml networkmanager nls nntp +notification pda pdf perl +pgp python rss session sieve smime spamassassin spam-report spell startup-notification svg valgrind xface"
 REQUIRED_USE="libcanberra? ( notification )
 	libindicate? ( notification )
 	libnotify? ( notification )
@@ -56,6 +56,12 @@ COMMONDEPEND="
 	!gtk3? ( >=x11-libs/gtk+-2.24:2 )
 	imap? ( >=net-libs/libetpan-0.57 )
 	ldap? ( >=net-nds/openldap-2.0.7 )
+	litehtml? (
+		>=dev-libs/glib-2.36:2
+		>=dev-libs/gumbo-0.10
+		net-misc/curl
+		media-libs/fontconfig
+	)
 	nls? ( >=sys-devel/gettext-0.18 )
 	nntp? ( >=net-libs/libetpan-0.57 )
 	notification? (
@@ -80,10 +86,12 @@ COMMONDEPEND="
 "
 
 DEPEND="${COMMONDEPEND}
+	xface? ( >=media-libs/compface-1.4 )
+"
+BDEPEND="
 	app-arch/xz-utils
 	virtual/pkgconfig
-	xface? ( >=media-libs/compface-1.4 )"
-
+"
 RDEPEND="${COMMONDEPEND}
 	app-misc/mime-types
 	x11-misc/shared-mime-info
@@ -140,6 +148,7 @@ src_configure() {
 		$(use_enable gtk3)
 		$(use_enable ipv6)
 		$(use_enable ldap)
+		$(use_enable litehtml litehtml_viewer-plugin)
 		$(use_enable networkmanager)
 		$(use_enable nls)
 		$(use_enable notification notification-plugin)
@@ -199,7 +208,7 @@ src_install() {
 	doexe tb2claws-mail update-po uudec uuooffice
 
 	# kill useless files
-	rm -f "${ED%/}"/usr/lib*/claws-mail/plugins/*.{a,la}
+	rm -f "${ED}"/usr/lib*/claws-mail/plugins/*.{a,la}
 }
 
 pkg_preinst() {
diff --git a/mail-client/claws-mail/metadata.xml b/mail-client/claws-mail/metadata.xml
index aa9acebdfde3..215b58ddd53d 100644
--- a/mail-client/claws-mail/metadata.xml
+++ b/mail-client/claws-mail/metadata.xml
@@ -7,32 +7,20 @@
 	</maintainer>
 	<use>
 		<flag name="archive">Enable archiving plugin</flag>
+		<flag name="bogofilter">Build <pkg>mail-filter/bogofilter</pkg> plugin</flag>
 		<flag name="dillo">Enable dillo html viewer plugin</flag>
-		<flag name="gdata">Enable plugin for access to Google
-		data providers</flag>
+		<flag name="gdata">Enable plugin for access to Google data providers</flag>
 		<flag name="gtk3">Build support for GTK+3</flag>
+		<flag name="libcanberra">Enable sound notification in connection with USE=notification</flag>
+		<flag name="libindicate">Enable notification through DBUS in connection with USE=notification</flag>
+		<flag name="libnotify">Enable notification on the desktop in connection with USE=notification</flag>
+		<flag name="litehtml">Enable <pkg>dev-libs/gumbo</pkg> html viewer plugin</flag>
+		<flag name="notification">Notification for new mail in different way, see also USE flags libcanberra, libindicate and libnotify</flag>
 		<flag name="pgp">Enable PGP support</flag>
-		<flag name="spam-report">Enable plugin for spam
-		reporting to various services</flag>
-		<flag name="bogofilter">Build <pkg>mail-filter/bogofilter</pkg>
-			plugin</flag>
-		<flag name="libcanberra">Enable sound notification in connection
-		with USE=notification</flag>
-		<flag name="libindicate">Enable notification through
-		DBUS in connection with USE=notification</flag>
-		<flag name="libnotify">Enable notification on the
-		desktop in connection with USE=notification</flag>
-		<flag name="notification">Notification for new mail in
-		different way, see also USE flags libcanberra,
-		libindicate and libnotify</flag>
 		<flag name="sieve">Build plugin for sieve filter support</flag>
 		<flag name="smime">Build plugin for S/MIME support</flag>
-		<flag name="spamassassin">Build <pkg>mail-filter/spamassassin</pkg>
-			plugin</flag>
-		<flag name="valgrind">Add support for memory debugging
-			using valgrind</flag>
+		<flag name="spam-report">Enable plugin for spam reporting to various services</flag>
+		<flag name="spamassassin">Build <pkg>mail-filter/spamassassin</pkg> plugin</flag>
+		<flag name="valgrind">Add support for memory debugging using valgrind</flag>
 	</use>
-	<upstream>
-		<remote-id type="sourceforge">sylpheed-claws</remote-id>
-	</upstream>
 </pkgmetadata>