commit: 246c5497e5e9f03db875e915b28fa65f222e66e9
Author: Marek Behún <kabel <AT> kernel <DOT> org>
AuthorDate: Thu Dec 21 12:42:18 2023 +0000
Commit: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
CommitDate: Fri Dec 22 08:37:19 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=246c5497
mail-client/claws-mail-{4.2.0,9999}: add Python plugin back
Commit 5fe0543b09ae ("mail-client/claws-mail: Eradicate python2")
disabled the Python plugin because it was still dependent on Python 2.
The Python plugin is now supported with Python 3 in upstream.
Add the support for this plugin back, for the unstable versions (4.2.0,
9999).
Signed-off-by: Marek Behún <kabel <AT> kernel.org>
Closes: https://github.com/gentoo/gentoo/pull/34394
Signed-off-by: Bernard Cafarelli <voyageur <AT> gentoo.org>
mail-client/claws-mail/claws-mail-4.2.0.ebuild | 13 ++++++++++---
mail-client/claws-mail/claws-mail-9999.ebuild | 13 ++++++++++---
mail-client/claws-mail/metadata.xml | 1 +
3 files changed, 21 insertions(+), 6 deletions(-)
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>
