From 77398e424e45d9e98c1cef3c43bdadb9d56e81ef Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 10 Nov 2019 13:21:36 +0000 Subject: gentoo resync : 10.11.2019 --- mail-client/claws-mail/Manifest | 5 +- mail-client/claws-mail/claws-mail-3.17.4.ebuild | 8 +- mail-client/claws-mail/claws-mail-9999.ebuild | 11 +-- .../claws-mail-3.17.4-libetpan_pkgconfig.patch | 97 ++++++++++++++++++++++ 4 files changed, 109 insertions(+), 12 deletions(-) create mode 100644 mail-client/claws-mail/files/claws-mail-3.17.4-libetpan_pkgconfig.patch (limited to 'mail-client/claws-mail') diff --git a/mail-client/claws-mail/Manifest b/mail-client/claws-mail/Manifest index df6376157858..62152416668f 100644 --- a/mail-client/claws-mail/Manifest +++ b/mail-client/claws-mail/Manifest @@ -1,6 +1,7 @@ +AUX claws-mail-3.17.4-libetpan_pkgconfig.patch 4483 BLAKE2B b28520c658214e9f6ad4bd0d48835e29f8b37aa7b3915add2d71b8ee7dc3366c38db1de9272dfe8e48588cebf748e6c844f04bc721fe577f66288b849e5c7054 SHA512 39e70ba2edfad857d4c042db0fa38ac806cf188d1cf7642b92d0115e162349919df7b98ade49da822fb1b299c5ef06d221b5c600e218ed33e0e8a48c3635d0a2 DIST claws-mail-3.17.3.tar.xz 6164392 BLAKE2B ac0781c4c7e4423f4a8b494a9bd007d62443e8c540feaeef089ca65f641da5ecabfa2c5c0662750d6f58c8913c1d95750a3dfb6b4628e573b0105f8f526bc066 SHA512 b562d785eaedbdec408c4a3db8f4d9326183266fe314509a189c9e1220f15b4f41ccd9d8c58c5194c0267842e8efe900e88eb17c0d17d6069e2543870efa5ef8 DIST claws-mail-3.17.4.tar.xz 6280252 BLAKE2B 8ddce2e5dfb3ae0ddb646c4f5a81d7e4c3834d2fa7a7f7a7326bf6e160291db4ba5954737bb61a4ae86ebaaab72a695d2e351fe2cf89b187eba4341f5d9b0cd9 SHA512 4fc3b04d89c84b068654902d3d4f8ba66ec86c4ea9c4bd145fb3169dd26a2fcfc26adc8367b0ed90c69d095f6b1717ba3a9a52cc6d3e310a9dad1c3f733d8012 EBUILD claws-mail-3.17.3-r1.ebuild 5892 BLAKE2B a9689bae73e1a659f434587aa0d48b62dc18f1204df3315bdfaab9993ee30445186d5627b9b55b6581293f1577796ffe2f65a03e0dbf7a75b5281e75b3288687 SHA512 6409b4b9a69b32aaa7ffe30ab35affa27331d9981673f119d000c2b6f46a5a865cea64c9daf9d2f024003b0720c4090ecf6184b57fd4ebecba14b7681f0119d6 -EBUILD claws-mail-3.17.4.ebuild 6067 BLAKE2B c725d36b94c76535ee6817acaef270cd1ca0c9bae0a629244d847297e41c3a2db975a5c74d8388627ba3bfd0b932e536186ff7587b496e8484d0316f3f795a3a SHA512 65c4b4e1b1bb2cc2fe36b455db4a909faa480987a7f33561a3a06be574eb245506a1530f15ee77539f65b834decfc70db097570ce5f74d2ef7660b98f98820c3 -EBUILD claws-mail-9999.ebuild 6131 BLAKE2B e7d47004ae743442826746674ec43d2e980863681c22f9eec36df54d7d93049bb506d8393915962410b8e24d4ddead2204580a09b16318bf654509d9eccb2fda SHA512 2553fa3515b7d5a475f5e1260fe8e256adf00fa74e6fa0526abfa1ae82e77604fdb84a9bcba06efabc93f02814106f210c454dbc4f86d8ca363663300deb0777 +EBUILD claws-mail-3.17.4.ebuild 6127 BLAKE2B b33b8175dedba9349720b24c42b5be50a54b0669c0b6e1136de624f66c007390e215d01ef6e53dfc61696ebe5442fb9b1255af27068a0616982f12b4f1b6fb23 SHA512 f3b4cd871bcb28dd41f4cbb1af7c78c9f19ccb7d7299c5ffb4487beaa3fd5bbe562a14fce41991910d2471c346a58c325b39c702db4a5378fc49369c44fc3b4e +EBUILD claws-mail-9999.ebuild 6062 BLAKE2B f18d83a542cd21c3be36fc30096f26b065502f9a8e9ed789735076104527a65878125c7b00a5d604bdf51e82b59c83482dbe8b3054e0994234ff857925656f12 SHA512 5785f50095538796aa4e654afbe9969f9d4fd5ea4b629303ebc0448887c9f41b370ff5d42e8e575ef3f83164cf82fc2ccf0f460a894ba93ed6a49b5fd0daf861 MISC metadata.xml 1532 BLAKE2B bf5ed5873952bd13c00e19cbb930026b6eae126caa18a14bde1f4ff7b219fe2f57fcfa3dd4b2dcd5d94acf30da2f8e7a4857bb78049567bf0fbed502977bbed7 SHA512 ea525e1341114ab82508a8423990c3ddde958f5501e0bd7355e25f4ec223ec3cd65b91a1261623bf98c0f06ed91333bb2726d2a6054a0ff49b2d59586507c051 diff --git a/mail-client/claws-mail/claws-mail-3.17.4.ebuild b/mail-client/claws-mail/claws-mail-3.17.4.ebuild index 0cec94b7a4bc..0655468d001e 100644 --- a/mail-client/claws-mail/claws-mail-3.17.4.ebuild +++ b/mail-client/claws-mail/claws-mail-3.17.4.ebuild @@ -21,6 +21,7 @@ SLOT="0" LICENSE="GPL-3" 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 ) @@ -105,7 +106,12 @@ RDEPEND="${COMMONDEPEND} rss? ( dev-libs/libxml2 net-misc/curl - )" + ) +" + +PATCHES=( + "${FILESDIR}"/${P}-libetpan_pkgconfig.patch +) pkg_setup() { use python && python-single-r1_pkg_setup diff --git a/mail-client/claws-mail/claws-mail-9999.ebuild b/mail-client/claws-mail/claws-mail-9999.ebuild index f460e8d37fc5..6be995b177e1 100644 --- a/mail-client/claws-mail/claws-mail-9999.ebuild +++ b/mail-client/claws-mail/claws-mail-9999.ebuild @@ -106,7 +106,8 @@ RDEPEND="${COMMONDEPEND} rss? ( dev-libs/libxml2 net-misc/curl - )" + ) +" pkg_setup() { use python && python-single-r1_pkg_setup @@ -211,10 +212,6 @@ src_install() { rm -f "${ED}"/usr/lib*/claws-mail/plugins/*.{a,la} } -pkg_preinst() { - xdg_pkg_preinst -} - 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" @@ -222,7 +219,3 @@ pkg_postinst() { ewarn "- The gtkhtml2 and trayicon plugins have been dropped entirely" xdg_pkg_postinst } - -pkg_postrm() { - xdg_pkg_postrm -} diff --git a/mail-client/claws-mail/files/claws-mail-3.17.4-libetpan_pkgconfig.patch b/mail-client/claws-mail/files/claws-mail-3.17.4-libetpan_pkgconfig.patch new file mode 100644 index 000000000000..572380d2e053 --- /dev/null +++ b/mail-client/claws-mail/files/claws-mail-3.17.4-libetpan_pkgconfig.patch @@ -0,0 +1,97 @@ +diff --git a/configure.ac b/configure.ac +index 412a3f014..6a80c2a92 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -908,38 +908,62 @@ fi + dnl Libetpan + AC_MSG_CHECKING([whether to use libetpan]) + if test x"$enable_libetpan" = xyes; then +- AC_MSG_RESULT(yes) +- libetpan_result=no +- AC_PATH_PROG(libetpanconfig, [libetpan-config]) +- if test "x$libetpanconfig" != "x"; then +- CPPFLAGS="$CPPFLAGS `$libetpanconfig --cflags 2>/dev/null`" +- AC_CHECK_HEADER(libetpan/libetpan.h, [libetpan_result=yes]) +- if test "x$libetpan_result" = "xyes"; then +- AC_MSG_CHECKING([whether libetpan-config hints compiles and links fine]) +- LIBS="$LIBS `$libetpanconfig --libs 2>/dev/null`" +- AC_TRY_LINK([#include ], [db_mailstorage_init(NULL, NULL);], [libetpan_result=yes], [libetpan_result=no]) +- AC_MSG_RESULT([$libetpan_result]) +- fi +- fi +- if test "x$libetpan_result" = "xyes"; then +- LIBETPAN_CPPFLAGS="`$libetpanconfig --cflags`" +- LIBETPAN_LIBS="`$libetpanconfig --libs`" +- LIBETPAN_VERSION=`$libetpanconfig --version | $AWK -F. '{printf "%d", ($1 * 100) + $2}'` +- if test "$LIBETPAN_VERSION" -lt "57"; then +- AC_MSG_RESULT([*** Claws Mail requires libetpan 0.57 or newer. See http://www.etpan.org/]) +- AC_MSG_RESULT([*** You can use --disable-libetpan if you don't need IMAP4 and/or NNTP support.]) ++ AC_MSG_RESULT(yes) ++ ++ libetpan_config=no ++ libetpan_result=no ++ libetpan_versiontype=0 ++ ++ # since 1.9.4, libetpan uses pkg-config ++ PKG_CHECK_MODULES([LIBETPAN], [libetpan >= 1.9.4], ++ [ ++ LIBETPAN_VERSION=`pkg-config --modversion | $AWK -F. '{printf "%d", ($1 * 10000) + ($2 * 100) + $3}'` ++ libetpan_config=yes ++ ], ++ [ ++ # before 1.9.4, libetpan uses its own libetpan-config script ++ AC_PATH_PROG(libetpanconfig, [libetpan-config]) ++ if test "x$libetpanconfig" != "x"; then ++ LIBETPAN_CPPFLAGS="`$libetpanconfig --cflags`" ++ LIBETPAN_LIBS="`$libetpanconfig --libs`" ++ # support libetpan version like x.x and x.x.x ++ libetpan_versiontype=`$libetpanconfig --version | tr -dc . | wc -c` ++ if test $libetpan_versiontype -eq 1; then ++ LIBETPAN_VERSION=`$libetpanconfig --version | $AWK -F. '{printf "%d", ($1 * 100) + $2}'` ++ else ++ LIBETPAN_VERSION=`$libetpanconfig --version | $AWK -F. '{printf "%d", ($1 * 10000) + ($2 * 100) + $3}'` ++ fi ++ libetpan_config=yes ++ fi ++ ]) ++ if test "x$libetpan_config" = "xyes"; then ++ CPPFLAGS="$CPPFLAGS $LIBETPAN_FLAGS" ++ AC_CHECK_HEADER(libetpan/libetpan.h, [libetpan_result=yes]) ++ if test "x$libetpan_result" = "xyes"; then ++ AC_MSG_CHECKING([whether libetpan-config hints compiles and links fine]) ++ LIBS="$LIBS $LIBETPAN_LIBS" ++ AC_TRY_LINK([#include ], [db_mailstorage_init(NULL, NULL);], [libetpan_result=yes], [libetpan_result=no]) ++ AC_MSG_RESULT([$libetpan_result]) ++ fi ++ fi ++ if test "x$libetpan_result" = "xyes"; then ++ if test $libetpan_versiontype -eq 1; then ++ if test "$LIBETPAN_VERSION" -lt "57"; then ++ AC_MSG_RESULT([*** Claws Mail requires libetpan 0.57 or newer. See http://www.etpan.org/]) ++ AC_MSG_RESULT([*** You can use --disable-libetpan if you don't need IMAP4 and/or NNTP support.]) + AC_MSG_ERROR([libetpan 0.57 not found]) +- fi +- AC_SUBST(LIBETPAN_FLAGS) +- AC_SUBST(LIBETPAN_LIBS) +- AC_DEFINE(HAVE_LIBETPAN, 1, Define if you want IMAP and/or NNTP support.) +- else +- AC_MSG_RESULT([*** Claws Mail requires libetpan 0.57 or newer. See http://www.etpan.org/ ]) +- AC_MSG_RESULT([*** You can use --disable-libetpan if you don't need IMAP4 and/or NNTP support.]) +- AC_MSG_ERROR([libetpan 0.57 not found]) +- fi ++ fi ++ fi ++ AC_SUBST(LIBETPAN_FLAGS) ++ AC_SUBST(LIBETPAN_LIBS) ++ AC_DEFINE(HAVE_LIBETPAN, 1, Define if you want IMAP and/or NNit TP support.) ++ else ++ AC_MSG_RESULT([*** Claws Mail requires libetpan 0.57 or newer. See http://www.etpan.org/ ]) ++ AC_MSG_RESULT([*** You can use --disable-libetpan if you don't need IMAP4 and/or NNTP support.]) ++ AC_MSG_ERROR([libetpan 0.57 not found]) ++ fi + else +- AC_MSG_RESULT(no) ++ AC_MSG_RESULT(no) + fi + AM_CONDITIONAL(CLAWS_LIBETPAN, test "x$libetpan_result" = "xyes") + -- cgit v1.2.3