gentoo resync : 05.03.2021

3 files changed, 6 insertions, 222 deletions

diff --git a/mail-client/claws-mail/Manifest b/mail-client/claws-mail/Manifest
index 0a57f730dd79..eac816f053e3 100644
--- a/mail-client/claws-mail/Manifest
+++ b/mail-client/claws-mail/Manifest
@@ -1,7 +1,5 @@
 AUX claws-mail-3.17.5-enchant-2_default.patch 1284 BLAKE2B 076c2aa8c121e656a0b15f341b6a4b13a114348faba4bb0f298306379b26374c45719702949a5e64f35f718bd656366838ea6b867c7b18fef588f37d7d99cd9f SHA512 ac7ae41be0bc8303974c9f675ab9a0d3e6b5fbae8d569d0b87dfe2e2f72c22f3cefb64796107e393a392b8be1aa7c8d93319cd06cf57ac7517067091ff69da05
-DIST claws-mail-3.17.7.tar.xz 6447268 BLAKE2B 432e36e5a376622508eed2e4ba7fbc885df66b05b7f91386f8bb3cb1f96980b946362fad55848f1c0534bc079981d7e4d894ebf62d6ecaa9c60cfde709927a75 SHA512 b8089b0454c8e91a2e1fac8829e44ab01faa049f899252eb226e0b4998be4136334bba3d3efc5baff90e23e027ad928162950b4c986504d918dc628fcf9fa2ff
 DIST claws-mail-3.17.8.tar.xz 6435692 BLAKE2B 2fb981ea86294eba0918c4b9bd74b762e19b6658d1970e6ec8f41e97e37063d3823f4aaae3ffcd855bd2839b7feb3a4bca0c15595fce2968de2418758f4fc50c SHA512 dc29c968dc81a184af8f66c1afe5c9d17558ce6a4a8b196136a9fb5deec96aa67eec42148ed0f4d6d6ee94aec2791247b9034090dac81beec193bd7d366617d7
-EBUILD claws-mail-3.17.7.ebuild 5814 BLAKE2B da654a4c10befe2286306b6f84a70bd73c0002b8631c815ae78748966d69d3d4b3b33f014d635aa2005d1f290933a302e039327d25e939f1ee0aac4d88e6c5ea SHA512 4e966bdcca53a08f24cc7556ef2a00dcc0ff0dc4a7a8938a8731c7b0d6a748900d83f4d7d828dafd9aaf66a17a30133c8cc2ec2db76110aecf79b92d793c4609
 EBUILD claws-mail-3.17.8.ebuild 5821 BLAKE2B 2cefa2ab30c7b3a34f011b76db88492c6ab565f1bedfe71bc3f682c5372d19e7156e0513b355e064b8af3a3a850eac7b3628fee7c6b89507f9e816c3d7390aca SHA512 2f8ae828d37af2f2b042edd8811ac1c0c1451b46145e00025c08d593a10f3f8c88056b147c6be5877dbc21b14ea999ad09d1efda08e0ff6863a513bf6d1a909d
-EBUILD claws-mail-9999.ebuild 5962 BLAKE2B 770f6e6afd334f616bb46b04868d797bfeb45e1ffb6b5f82067959e31b2661c87e85cc0bce855a165f383975c5050e7539b256576bd72bb9dfbc11970bca96d5 SHA512 8792faf220af90d010715a9971d54b82c6b08c2a5c2d105f34aed9c14620965f684b4350ff975554611f0f505f03f313d08db20f67b17544448c8e1d4302fa53
+EBUILD claws-mail-9999.ebuild 6011 BLAKE2B 6ae0cd5309e1f715bdd9abee4675bba545a4bfeed04ae98d14dfae3c1232069d8738269593095c1d2c415ff5a632aed4f928579daad601942a38db7f4360a8cd SHA512 57aab86cd5b19892c4f2cdd0bdbc99bde5b756845f92a4f1737e75c6194ae9b4fa14b6316990e550e56b5f8208c64f60626c660eca00c4907468e9c5d6577a82
 MISC metadata.xml 1467 BLAKE2B 84d9e335170d8e84ac9da4a8e02222cab0b2454ce4044878c8f1bf7a390f7ed190633537469be424de5e2db58791636b86b7db325a971d684233919838cf97d3 SHA512 6c655572b3f4c5cfb38776118fbbe692385bc7dfa5211846a13cde6f2d2d5ab3dc05b12a9a93da1ad7c82c5963dff2773ab3dd8f32e8d1a44fa4d7834e77ded1
diff --git a/mail-client/claws-mail/claws-mail-3.17.7.ebuild b/mail-client/claws-mail/claws-mail-3.17.7.ebuild
deleted file mode 100644
index c8325c1ae988..000000000000
--- a/mail-client/claws-mail/claws-mail-3.17.7.ebuild
+++ /dev/null
@@ -1,215 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools desktop 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="+appindicator archive bogofilter calendar clamav dbus debug dillo doc gdata +gnutls +imap ipv6 ldap +libcanberra +libnotify litehtml networkmanager nls nntp +notification pdf perl +pgp rss session sieve smime spamassassin spam-report spell startup-notification svg valgrind xface"
-
-REQUIRED_USE="
-	appindicator? ( notification )
-	libcanberra? ( notification )
-	libnotify? ( notification )
-	networkmanager? ( dbus )
-	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
-		appindicator? ( dev-libs/libindicate:3[gtk] )
-		libcanberra? (  media-libs/libcanberra[gtk] )
-		libnotify? ( x11-libs/libnotify )
-	)
-	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-2.0.0:2= )
-	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:= )
-	rss? (
-		dev-libs/libxml2
-		net-misc/curl
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.17.5-enchant-2_default.patch"
-)
-
-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
-		--disable-jpilot #735118
-		--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 pdf pdf_viewer-plugin)
-		$(use_enable perl perl-plugin)
-		$(use_enable pgp pgpcore-plugin)
-		$(use_enable pgp pgpinline-plugin)
-		$(use_enable pgp pgpmime-plugin)
-		--disable-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_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
-}
diff --git a/mail-client/claws-mail/claws-mail-9999.ebuild b/mail-client/claws-mail/claws-mail-9999.ebuild
index c2818293f810..aca0fa2b8041 100644
--- a/mail-client/claws-mail/claws-mail-9999.ebuild
+++ b/mail-client/claws-mail/claws-mail-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ if [[ "${PV}" == *9999 ]] ; then
 	EGIT_REPO_URI="https://git.claws-mail.org/readonly/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"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
 fi
 
 SLOT="0"
@@ -109,7 +109,7 @@ PATCHES=(
 )
 
 pkg_setup() {
-	if [[ "${PV}" == *9999 ]] && ! use gtk2 ; then
+	if [[ "${PV}" == 9999 ]] && ! use gtk2 ; then
 		EGIT_BRANCH="gtk3"
 	fi
 }
@@ -209,7 +209,8 @@ src_install() {
 	doexe tb2claws-mail update-po uudec uuooffice
 
 	# kill useless files
-	rm -f "${ED}"/usr/lib*/claws-mail/plugins/*.{a,la}
+	find "${ED}"/usr/lib*/claws-mail/plugins/ \
+		\( -name "*.a" -o -name ".la" \) -delete || die
 }
 
 pkg_postinst() {