gentoo auto-resync : 22:12:2023 - 13:48:30

4 files changed, 24 insertions, 9 deletions

diff --git a/mail-client/claws-mail/Manifest b/mail-client/claws-mail/Manifest
index 7d36e8f4c00f..905458cb6307 100644
--- a/mail-client/claws-mail/Manifest
+++ b/mail-client/claws-mail/Manifest
@@ -15,6 +15,6 @@ EBUILD claws-mail-3.20.0.ebuild 5495 BLAKE2B e08cedf0a76d5e1eeedfa27d1d28a702428
 EBUILD claws-mail-4.1.0-r1.ebuild 5721 BLAKE2B 11c4dc7192d90d895c72a11b2e8a831eae68384e924d8f453e4538e1a8024f1419d93d7a9af2dbe96c667a8b95b3d458560ea4b5208cb4097f88ae27d6db8016 SHA512 cfdbfefdcc1988e186d7ddfb777def8c07cf8c1ac2149cb9e07c768d3c10683cdd66f6c7a8859a6a38667161da86e1b14aaabf933defc70036cd70084c9ff8c4
 EBUILD claws-mail-4.1.1-r1.ebuild 5626 BLAKE2B 4e5786ed77e5edc9e6dbad3bd12032a9578836520424f06dff50f80a65abc9ccb9f65bbb01315cab61a0d9cced90851dbd2fa8c892aad42731aa3753eff9cef6 SHA512 41e7c896adf81f8da073f16a695ab8e72f94ee9a4469214c249bcd27f5031141dcf6776328aca94e484d7f2e455aeb4ab5487b2cf702937f1b61b16cb0f24b9e
 EBUILD claws-mail-4.1.1-r2.ebuild 5633 BLAKE2B b7c4067c9aae189b6656139e3067a0250c4a0f773e77a299d8623be8e6ea01497dfd6a6a23476bfe662871f6a707fc224ac7efd17f4afc2e5c8041fb58e5b548 SHA512 12aba16fd0dacc8d66c8ad281f3c7cfd3af0a087dad31c656ee5bc1b0702fcee358a1b3140e2f9c617ac829af88c31a6818f09fc7461187da983a33fdbbb6785
-EBUILD claws-mail-4.2.0.ebuild 5477 BLAKE2B 771532110c0a6a2f64f74194862b03c7a026498932bce31bec6a2c4c00368ebe8dae68e8c3c3668261e27ddca1849444a73a553912f0cf97e858a9fbd77a9faa SHA512 6ec814aa42556074440ee634471fd43d51da93a6c5223bf07e1f5655ab8b87bdc78e25e17bb2881494efd358246b779463eed6263b651ae51c238931ee96afed
-EBUILD claws-mail-9999.ebuild 5586 BLAKE2B afcf514c0e663f19df50833aff54c0bf784d26c29cc1f01b497022caa9891347b68fb5c6a0f0b9188f08e91908766ed16945926a1241f40209157184fa151677 SHA512 59d0ed8959d1caf179c8c892f4d622e8d8a84859ecd4f0e7bbb1bb1476c19163a25bb2e3c1322d4d05dca53b526925cc2a24de04b8d731e2abc3118dbc9b1dfc
-MISC metadata.xml 1306 BLAKE2B 448f35ca6cd9d53a94a2f30fb9f55d701d8674c23cf08a7f4bb027707de472c15b5f74a1b81c1eeba472a1bad9dc56cbb8788cc35d3378e0f476553b361bbc8c SHA512 8147c3036f2de1204feae46f33f1dedd22d1042344e1164e8fe34ef0a3d59df282eb1532bd7b39a8418ddf7dda96988cb970131883d37d15ba8212d6ab185742
+EBUILD claws-mail-4.2.0.ebuild 5646 BLAKE2B 2069db84aedc803196b4c789982366284e27d4fb45bc7c8d22dff21efb8bd9c37ab338357c8accd02a6153ef629c2e27b398f67a3a540b28cb95cdbae029e252 SHA512 3f6f5264c5880cbfbfcd389aafd071fa5474ca176bb6ba6e8fbcb485384c9d17f996b1fe804ebcf3c7d857261d9e91a174b659002ab90bcb40ed9cd690b5daf9
+EBUILD claws-mail-9999.ebuild 5755 BLAKE2B da465df2241f7187fe7930ab835eb160253de2041f931927c9db21ef45ab2641660b34a9e0156b1faeabaa0d0d6c065984bc0aecd99bd5d2468170f542a51dab SHA512 5bdee28a8a68c1eb151043a696b6d1f21b6225c44da15fe4cfc7d59c5e7e54220dfe673f950e65df4eaf3cebc42ff36d4eca577b84e5e007e74bca7bbc9ca6b4
+MISC metadata.xml 1370 BLAKE2B d4e8a3be1636876f73dd0e789bbd1e62cc35e938b84623c4d177746bdd758bea5dd4bbb7d3c58077cac0554c1c6948f07fc4bf883eec70928f76c3fd495faf85 SHA512 e13f1ab08ddebc27da373923d20d4cfc292313a2f63438d55bd4843c90555ead1e4678345c2df6272ed784d52e305ccbaeda749b34e36f325e1de89a63b08e76
diff --git a/mail-client/claws-mail/claws-mail-4.2.0.ebuild b/mail-client/claws-mail/claws-mail-4.2.0.ebuild
index ba16295a1063..c12675b8dbdc 100644
--- a/mail-client/claws-mail/claws-mail-4.2.0.ebuild
+++ b/mail-client/claws-mail/claws-mail-4.2.0.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 PYTHON_COMPAT=( python3_{9..12} )
 
-inherit autotools desktop python-any-r1 xdg
+inherit autotools desktop python-single-r1 xdg
 
 DESCRIPTION="An email client (and news reader) based on GTK+"
 HOMEPAGE="https://www.claws-mail.org/"
@@ -21,12 +21,13 @@ fi
 SLOT="0"
 LICENSE="GPL-3"
 
-IUSE="archive bogofilter calendar clamav dbus debug doc +gnutls +imap ldap +libcanberra +libnotify litehtml networkmanager nls nntp +notification +oauth pdf perl +pgp rss session sieve smime spamassassin spam-report spell startup-notification svg valgrind webkit xface"
+IUSE="archive bogofilter calendar clamav dbus debug doc +gnutls +imap ldap +libcanberra +libnotify litehtml networkmanager nls nntp +notification +oauth pdf perl +pgp python rss session sieve smime spamassassin spam-report spell startup-notification svg valgrind webkit xface"
 REQUIRED_USE="
 	libcanberra? ( notification )
 	libnotify? ( notification )
 	networkmanager? ( dbus )
 	oauth? ( gnutls )
+	python? ( ${PYTHON_REQUIRED_USE} )
 	smime? ( pgp )
 "
 
@@ -71,6 +72,12 @@ COMMONDEPEND="
 	perl? ( dev-lang/perl:= )
 	pdf? ( app-text/poppler[cairo] )
 	pgp? ( >=app-crypt/gpgme-1.0.0:= )
+	python? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
+		')
+	)
 	rss? (
 		dev-libs/libxml2
 		net-misc/curl
@@ -120,7 +127,6 @@ src_configure() {
 		--disable-dillo-plugin
 		--disable-generic-umpc
 		--disable-jpilot #735118
-		--disable-python-plugin
 		--enable-acpi_notifier-plugin
 		--enable-address_keeper-plugin
 		--enable-alternate-addressbook
@@ -151,6 +157,7 @@ src_configure() {
 		$(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)
diff --git a/mail-client/claws-mail/claws-mail-9999.ebuild b/mail-client/claws-mail/claws-mail-9999.ebuild
index b10aeda0e70b..c9364900d898 100644
--- a/mail-client/claws-mail/claws-mail-9999.ebuild
+++ b/mail-client/claws-mail/claws-mail-9999.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 PYTHON_COMPAT=( python3_{9..12} )
 
-inherit autotools desktop python-any-r1 xdg
+inherit autotools desktop python-single-r1 xdg
 
 DESCRIPTION="An email client (and news reader) based on GTK+"
 HOMEPAGE="https://www.claws-mail.org/"
@@ -21,12 +21,13 @@ fi
 SLOT="0"
 LICENSE="GPL-3"
 
-IUSE="archive bogofilter calendar clamav dbus debug doc +gnutls +imap ldap +libcanberra +libnotify litehtml networkmanager nls nntp +notification +oauth pdf perl +pgp rss session sieve smime spamassassin spam-report spell startup-notification svg valgrind webkit xface"
+IUSE="archive bogofilter calendar clamav dbus debug doc +gnutls +imap ldap +libcanberra +libnotify litehtml networkmanager nls nntp +notification +oauth pdf perl +pgp python rss session sieve smime spamassassin spam-report spell startup-notification svg valgrind webkit xface"
 REQUIRED_USE="
 	libcanberra? ( notification )
 	libnotify? ( notification )
 	networkmanager? ( dbus )
 	oauth? ( gnutls )
+	python? ( ${PYTHON_REQUIRED_USE} )
 	smime? ( pgp )
 "
 
@@ -71,6 +72,12 @@ COMMONDEPEND="
 	perl? ( dev-lang/perl:= )
 	pdf? ( app-text/poppler[cairo] )
 	pgp? ( >=app-crypt/gpgme-1.0.0:= )
+	python? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
+		')
+	)
 	rss? (
 		dev-libs/libxml2
 		net-misc/curl
@@ -121,7 +128,6 @@ src_configure() {
 		--disable-dillo-plugin
 		--disable-generic-umpc
 		--disable-jpilot #735118
-		--disable-python-plugin
 		--enable-acpi_notifier-plugin
 		--enable-address_keeper-plugin
 		--enable-alternate-addressbook
@@ -154,6 +160,7 @@ src_configure() {
 		$(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)
diff --git a/mail-client/claws-mail/metadata.xml b/mail-client/claws-mail/metadata.xml
index db7340dd4473..6727b3320653 100644
--- a/mail-client/claws-mail/metadata.xml
+++ b/mail-client/claws-mail/metadata.xml
@@ -15,6 +15,7 @@
 		<flag name="notification">Notification for new mail in different way, see also USE flags libcanberra, libindicate and libnotify</flag>
 		<flag name="oauth">Enable OAuth2 authentication support</flag>
 		<flag name="pgp">Enable PGP support</flag>
+		<flag name="python">Enable plugin for Python scripting</flag>
 		<flag name="sieve">Build plugin for sieve filter support</flag>
 		<flag name="smime">Build plugin for S/MIME support</flag>
 		<flag name="spam-report">Enable plugin for spam reporting to various services</flag>