gentoo auto-resync : 22:07:2022 - 02:45:47

3 files changed, 2 insertions, 218 deletions

diff --git a/mail-client/claws-mail/Manifest b/mail-client/claws-mail/Manifest
index c012fff943e3..95c2eb98be8e 100644
--- a/mail-client/claws-mail/Manifest
+++ b/mail-client/claws-mail/Manifest
@@ -7,7 +7,6 @@ DIST claws-mail-4.1.0.tar.xz 6471604 BLAKE2B 30d1725c2679e8a0b44edd6c30b15f28633
 EBUILD claws-mail-3.18.0-r3.ebuild 5631 BLAKE2B 82456d518d3316d71923667da8743142d7df7d631544e516bbee05ae555eca221bc73f374ba8afaf57c87f2cd97bbd2fc22728ce36c905553672271f8fe21a89 SHA512 b256cb224632450a22bd3fb66ae75cbeeb3e0524e964d6cf48cdc92a50ae00c3c22b83047a1a639c00e0abb252970b8e7d888c0cd639cc8c3340062f2f82bea1
 EBUILD claws-mail-3.19.0-r1.ebuild 5628 BLAKE2B bdcc26e9b0c046dc1ecc260826ee1f67c2b23dd33c6f8fecd1dedfb545025ed02a0c1af14dedb9fae5b173551a3aad3d590cf66cddada6c562ef633626a9361d SHA512 43e89901736039d38138455cbaa60679781dafbec1f97e7028d7785b7188222cce3908a7330f74ff7c0d354b8a17c905c33f197f573410bac4ec0074f7b7eeef
 EBUILD claws-mail-3.19.0-r2.ebuild 5674 BLAKE2B 2e7d16867ff97f487479672a09cebd43e6867e922f51834e1111095d7da20fe733f871daa5ea90f4dfb633d14bc1a454a75cee11346e8ef0a610bed37b1748df SHA512 ef74c181adb25adb3c5bc1b672c6435a9293005db1513e5ab1de47b9d1e2164dcb3752cbadb05e4ad7873a04870704819db12d83dd289d559a684625f2473d7e
-EBUILD claws-mail-4.1.0-r1.ebuild 5724 BLAKE2B 9c753fb8ef5f61659af42cbf890fcc843627974d7c00d17ec38b34358bb9141f9e5bed58a9c73c2e40a3b5cfc4ed0373b9340546cd018e07089c15d0cd84727c SHA512 df6385039e8b915a5b5947e6dea883435d90986fe7296e7ec29fd970a657a49ff991d4ea2b1ab58900880ce8406aba59e1e96bd9fc6a599f9dbea38394f4bd4f
-EBUILD claws-mail-4.1.0.ebuild 5681 BLAKE2B ec9a34804414543b8b56f0b453d3b1720bc732491021a90199b8e569d548b79c392289e3ca4bfb30e4378743d43a558dffb44330b658acb13b538e8d9ccd18a6 SHA512 770233f6291ab78ea84cad826e7e99af9206e18044c959a83043d4c03e1d611f8e1d372b4b226168a7f45fd80763af839579ab2059b89b9a42ba9925916342e6
+EBUILD claws-mail-4.1.0-r1.ebuild 5755 BLAKE2B a9a2389e5a7cb9b06b92e991cc49d6b63776d70712b4ea21106df662e2de6e2084f2f79adf88b38b6f48b29b2c4ebf9e2cb74df34efc29d039030c6cef06944e SHA512 c108da72f328ac22a578d1a34926d8482053e6eb8a6385594305b1088a38962c97f21a9fe1ccffbdb01c84a3fc02c82ea018729cb5bb67d8887d5f9a8378a924
 EBUILD claws-mail-9999.ebuild 5998 BLAKE2B 4c9c1d9e74dd51a1dc4352f08284ffbc2db37b5107a91e9dd72bf417ee3a5b053dcc17a867db41f46236b99ddd3040b07947f7f8a260b01ac1a4c98efc1620af SHA512 d88dc00c953d137a6bc94887193aac83c3be8fdec211ccf59ccc101cea918ed90a13f0219563c2d2142e3cc49b45aa750d2ffb516e3bc0004f35e4a71bbafcd2
 MISC metadata.xml 1469 BLAKE2B 783f75970a9a6d0919903cc4b937f4584752e63d9d629e37e89bce5fcbe1bd309bd381d633c59ed2fb2c41786be9964a0d9fd4e7f0aeb92c41acde4fddf1583d SHA512 4015fdffd6751583cb815a9af0e1e0ec2efd052a0d448f3f24248dfc9a74fb5e98f204d4175042fd24aba900d175403b95d586efb8178c2d7fabc3c10abd1696
diff --git a/mail-client/claws-mail/claws-mail-4.1.0-r1.ebuild b/mail-client/claws-mail/claws-mail-4.1.0-r1.ebuild
index 82ecb77243b9..658ae84baa6a 100644
--- a/mail-client/claws-mail/claws-mail-4.1.0-r1.ebuild
+++ b/mail-client/claws-mail/claws-mail-4.1.0-r1.ebuild
@@ -19,6 +19,7 @@ else
 fi
 
 SLOT="0"
+QA_PKGCONFIG_VERSION="${PV}.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 webkit xface"
diff --git a/mail-client/claws-mail/claws-mail-4.1.0.ebuild b/mail-client/claws-mail/claws-mail-4.1.0.ebuild
deleted file mode 100644
index ddbd9714bbac..000000000000
--- a/mail-client/claws-mail/claws-mail-4.1.0.ebuild
+++ /dev/null
@@ -1,216 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit autotools desktop python-any-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="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 ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~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 webkit 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+:3
-	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[gtk3] )
-		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 )
-	webkit? ( net-libs/webkit-gtk:4 )
-"
-
-DEPEND="${COMMONDEPEND}
-	xface? ( >=media-libs/compface-1.4 )
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	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() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	# Don't use libsoup-gnome (bug #565924)
-	export HAVE_LIBSOUP_GNOME=no
-
-	local myeconfargs=(
-		--disable-bsfilter-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 webkit fancy-plugin)
-		$(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
-	find "${ED}"/usr/$(get_libdir)/${PN}/plugins/ \
-		\( -name "*.a" -o -name "*.la" \) -delete || die
-}
-
-pkg_postinst() {
-	ewarn "When upgrading from version 3.x please re-load any plugin you use"
-	xdg_pkg_postinst
-}