commit: 30f0f43174dc9d18c2f2fa9e345fd0a94707ad5b Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> AuthorDate: Mon Mar 9 14:30:52 2020 +0000 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> CommitDate: Mon Mar 9 14:31:39 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=30f0f431
mail-client/claws-mail: Revbump to depend on app-text/enchant:2 Bug: https://bugs.gentoo.org/708928 Package-Manager: Portage-2.3.93, Repoman-2.3.20 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> ...ail-9999.ebuild => claws-mail-3.17.5-r1.ebuild} | 13 +++--- mail-client/claws-mail/claws-mail-9999.ebuild | 6 ++- .../claws-mail-3.17.5-enchant-2_default.patch | 46 ++++++++++++++++++++++ 3 files changed, 59 insertions(+), 6 deletions(-) diff --git a/mail-client/claws-mail/claws-mail-9999.ebuild b/mail-client/claws-mail/claws-mail-3.17.5-r1.ebuild similarity index 94% copy from mail-client/claws-mail/claws-mail-9999.ebuild copy to mail-client/claws-mail/claws-mail-3.17.5-r1.ebuild index f54e1858e57..e00884c0c0f 100644 --- a/mail-client/claws-mail/claws-mail-9999.ebuild +++ b/mail-client/claws-mail/claws-mail-3.17.5-r1.ebuild @@ -20,7 +20,8 @@ fi SLOT="0" LICENSE="GPL-3" -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" +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 ) @@ -34,6 +35,7 @@ COMMONDEPEND=" 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? ( @@ -52,8 +54,6 @@ COMMONDEPEND=" gdata? ( >=dev-libs/libgdata-0.17.2 ) dillo? ( www-client/dillo ) gnutls? ( >=net-libs/gnutls-3.0 ) - gtk3? ( x11-libs/gtk+:3 ) - !gtk3? ( >=x11-libs/gtk+-2.24:2 ) imap? ( >=net-libs/libetpan-0.57 ) ldap? ( >=net-nds/openldap-2.0.7 ) litehtml? ( @@ -79,7 +79,7 @@ COMMONDEPEND=" ) smime? ( >=app-crypt/gpgme-1.0.0 ) spam-report? ( >=net-misc/curl-7.9.7 ) - spell? ( >=app-text/enchant-1.0.0:0= ) + 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 ) @@ -109,6 +109,10 @@ RDEPEND="${COMMONDEPEND} ) " +PATCHES=( + "${FILESDIR}/${PN}-3.17.5-enchant-2_default.patch" +) + pkg_setup() { use python && python-single-r1_pkg_setup } @@ -146,7 +150,6 @@ src_configure() { $(use_enable doc manual) $(use_enable gdata gdata-plugin) $(use_enable gnutls) - $(use_enable gtk3) $(use_enable ipv6) $(use_enable ldap) $(use_enable litehtml litehtml_viewer-plugin) diff --git a/mail-client/claws-mail/claws-mail-9999.ebuild b/mail-client/claws-mail/claws-mail-9999.ebuild index f54e1858e57..935280af79f 100644 --- a/mail-client/claws-mail/claws-mail-9999.ebuild +++ b/mail-client/claws-mail/claws-mail-9999.ebuild @@ -79,7 +79,7 @@ COMMONDEPEND=" ) smime? ( >=app-crypt/gpgme-1.0.0 ) spam-report? ( >=net-misc/curl-7.9.7 ) - spell? ( >=app-text/enchant-1.0.0:0= ) + 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 ) @@ -109,6 +109,10 @@ RDEPEND="${COMMONDEPEND} ) " +PATCHES=( + "${FILESDIR}/${PN}-3.17.5-enchant-2_default.patch" +) + pkg_setup() { use python && python-single-r1_pkg_setup } diff --git a/mail-client/claws-mail/files/claws-mail-3.17.5-enchant-2_default.patch b/mail-client/claws-mail/files/claws-mail-3.17.5-enchant-2_default.patch new file mode 100644 index 00000000000..c9c9bd444e0 --- /dev/null +++ b/mail-client/claws-mail/files/claws-mail-3.17.5-enchant-2_default.patch @@ -0,0 +1,46 @@ +From 826770e2dae8646a613dbe07685be68b4dc83b62 Mon Sep 17 00:00:00 2001 +From: Lars Wendler <[email protected]> +Date: Mon, 9 Mar 2020 15:21:55 +0100 +Subject: [PATCH] Only check for enchant-2 + +Signed-off-by: Lars Wendler <[email protected]> +--- + configure.ac | 18 +++++------------- + 1 file changed, 5 insertions(+), 13 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 8ab413657..e1159d45e 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -591,23 +591,15 @@ dnl enchant is used for spell checking + AC_MSG_CHECKING([whether to use enchant]) + AC_MSG_RESULT($enable_enchant) + if test $enable_enchant = yes; then +- PKG_CHECK_MODULES(ENCHANT, enchant >= 1.4.0, ++ PKG_CHECK_MODULES(ENCHANT, enchant-2 >= 2.0.0, + [ +- AC_DEFINE(USE_ENCHANT, 1, enchant) +- echo "Building with enchant" ++ AC_DEFINE(USE_ENCHANT, 1, enchant-2) ++ echo "Building with enchant-2" + enable_enchant=yes + ], + [ +- PKG_CHECK_MODULES(ENCHANT, enchant-2 >= 2.0.0, +- [ +- AC_DEFINE(USE_ENCHANT, 1, enchant-2) +- echo "Building with enchant-2" +- enable_enchant=yes +- ], +- [ +- echo "Building without enchant-notification" +- enable_enchant=no +- ]) ++ echo "Building without enchant-notification" ++ enable_enchant=no + ]) + AC_SUBST(ENCHANT_CFLAGS) + AC_SUBST(ENCHANT_LIBS) +-- +2.25.1 +
