From 3cf1a6b55c5e5639af0b41c2de67ca982fed8c15 Mon Sep 17 00:00:00 2001 From: layman Date: Mon, 17 Jan 2022 10:29:33 +0100 Subject: [PATCH] Claws-Mail 4 dev --- mail-client/claws-mail/Manifest | 18 +---------- ....17.6-r1.ebuild => claws-mail-9999.ebuild} | 30 +++++++++---------- 2 files changed, 16 insertions(+), 32 deletions(-) rename mail-client/claws-mail/{claws-mail-3.17.6-r1.ebuild => claws-mail-9999.ebuild} (86%) diff --git a/mail-client/claws-mail/Manifest b/mail-client/claws-mail/Manifest index ac4969c..567a151 100644 --- a/mail-client/claws-mail/Manifest +++ b/mail-client/claws-mail/Manifest @@ -1,21 +1,5 @@ AUX claws-mail-3.15.0-old_profile_segfault.patch 2758 BLAKE2B 64b98598814de6ac03894a7750a1da40edda7b8468c32b87f74c83f1fd6027c51d1804a95570909525630b7aff6f1eac81c1d8ad55f87538f32f03bac85aad83 SHA512 3ef1a001b6817d42b626754160aeb971263cca066294d9683403079d08eadbe86a9661ff6dbc8f3034c10db12d6d8b99a74f22f315b03fcf6e8ee581ca44583b AUX claws-mail-3.17.4-libetpan_pkgconfig.patch 4483 BLAKE2B b28520c658214e9f6ad4bd0d48835e29f8b37aa7b3915add2d71b8ee7dc3366c38db1de9272dfe8e48588cebf748e6c844f04bc721fe577f66288b849e5c7054 SHA512 39e70ba2edfad857d4c042db0fa38ac806cf188d1cf7642b92d0115e162349919df7b98ade49da822fb1b299c5ef06d221b5c600e218ed33e0e8a48c3635d0a2 AUX claws-mail-3.17.5-enchant-2_default.patch 1284 BLAKE2B 076c2aa8c121e656a0b15f341b6a4b13a114348faba4bb0f298306379b26374c45719702949a5e64f35f718bd656366838ea6b867c7b18fef588f37d7d99cd9f SHA512 ac7ae41be0bc8303974c9f675ab9a0d3e6b5fbae8d569d0b87dfe2e2f72c22f3cefb64796107e393a392b8be1aa7c8d93319cd06cf57ac7517067091ff69da05 -DIST claws-mail-3.15.0.tar.xz 5665648 BLAKE2B f25356372b65f2df072eb2774fca87514c2da59811e78650e26ae58c1b518e229cba62cf1b0d0ad72107e292c9d87450f7d2508c02f34c5c9c70d944f9866823 SHA512 667cb0ea2f7c5d8e8b6046313ed7698c378f504caeeaa54348ba228317538dfc040e4ddf80f4aaa1491858a7803954e89599b1e479febe7cf1ab4bae5a638dc8 -DIST claws-mail-3.15.1.tar.xz 5665468 BLAKE2B c6d4c5875f82f836815193b330427bdd533be5445706fc437b1c30be8e52325a2b824e8a1d1332bb286ac9ea2bd4b872943709d9ff78b20a6a3ff5b781808d25 SHA512 11113ab2bc75571b9a71b11ee3f7fe4773ff7b17132f29e6637aa7b7b9a7f8ed125430ee7e5ab5c9842463d776a96be150d7c8e1e3d682b955dd582a6a6ce68c -DIST claws-mail-3.16.0.tar.xz 5913948 BLAKE2B 6744045de6bc3945221569a9ae1cdcd849ec11c4f5dbfe966ca70c7c2ab3f5d9ded1dbd5bcedffdc756809c1802d31d955b5c6c53f20a00be5abc861db340d0f SHA512 5c96e21b4c5117b67ccfe4178c68e2f1b1449f882d6ecf22041e41f08fd607c6ce7afe6c7fdbd039da7ffc5673d366551b15d3e4b7de8d758fc1554a8eadc55e -DIST claws-mail-3.17.1.tar.xz 4746940 BLAKE2B fdaa5ae36893a9089277f59a97d3026ab3331eea25944def7d9e26ae74d65798a8b8faa0e4ab8b9a7eb4f49aba5a6beb4a61dd26a3bdde9859b3518848ca869c SHA512 de20e6ffbeba771249a42b03fecdb3c29c4db3ae9a95cb504156431495550a7d61233e61d26239d8f71022bf789c0abba0c29255a9c954ae8eb8cdc4ebfef67b -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 -DIST claws-mail-3.17.5.tar.xz 6290944 BLAKE2B b060d4513ecd61ba8589d701970c733b683d93b03beb22e37669e9856797f6d0d404c09a49f0a1d9c8a576807806ec22959079c9ff79786d226ea6b6f3817904 SHA512 a1d3576eba70b83a6fe70aafead3d80681e6372d146b573f5d43fee63bdcf84b5350d4dc8a4290b11d11320381417253d893daee8169c110e294178d10ea542f -DIST claws-mail-3.17.6.tar.xz 6400692 BLAKE2B ce5fc914db89835a2a678e68da950d7487e8df919847f3d69baabc73012908f3853dcb274ae4c0e1a4f0f46fb38903b77fe7a2aa7e5b9169bd8eb597035d2ce5 SHA512 07fdf7fce722ee1e50aa155bca720323a58842b372d8295bed33c7245fce5790a1bd3ed7462130664a218a804ab6bd1ba3663ee3e53fbbac6a4a477dd676ede0 -EBUILD claws-mail-3.15.0-r1.ebuild 5792 BLAKE2B 3223768beeeaa4c2799942d007a43dee42137ae3025f3093674969175e4630bcd10eb735be510a2a561b1a1c3543144493ec410378cbc4e5603ad01f295bc75f SHA512 87f97b2209b5addd9b0ef2f168dc2bdfa139d6fc9741aab37eca5d25b0ee38bf9564160e4e4a5fd986d8904c08e67684d61b9b1da0785c6f3b17595a522515e9 -EBUILD claws-mail-3.15.0.ebuild 5660 BLAKE2B e2edb1f3e2bb6367ea8d49a07329ca5a67ca59913b3b397b02c93f6ffc8cac346eb2c0d9952128ad5225c5e42fe2e0950b44912d55ba873c3fd6c3f668465e88 SHA512 e67a28cdd5df9dc1578f90995ddc5a21db74aaab743d589fef6f2b19faff649afe2b271255d772aa4ca80d901fb5fa434d75c228e3e2e1851c676b37c6edf28b -EBUILD claws-mail-3.15.1.ebuild 5793 BLAKE2B 0c68b066725d265c045d637fd291a7b15cc4c9b1e7faabcc3dc738d48af4fd6af444b8e0b2cce505d7dae8e22c03b6ec6c5f799d66487059a4ba91def88c30f5 SHA512 56559d610f98d956b294456c1d174ab41ddb4445576a533d1578f5476a2c5ba217839a9dfb90dd4eaef81b83296aa494c049433a79fc9c9e5f4ff7a6143820bf -EBUILD claws-mail-3.16.0.ebuild 5793 BLAKE2B 0c68b066725d265c045d637fd291a7b15cc4c9b1e7faabcc3dc738d48af4fd6af444b8e0b2cce505d7dae8e22c03b6ec6c5f799d66487059a4ba91def88c30f5 SHA512 56559d610f98d956b294456c1d174ab41ddb4445576a533d1578f5476a2c5ba217839a9dfb90dd4eaef81b83296aa494c049433a79fc9c9e5f4ff7a6143820bf -EBUILD claws-mail-3.17.1.ebuild 6006 BLAKE2B c04db0772c72749ca305063517709c350baa59675d62f6f5db760a339e9b0bcc2d2141b8843365e2efa03397daffd4ddae287da519098b4b8791cfaf7eaed2b2 SHA512 28124f6fb48059b6c5ae326918718dfb28b50f0b796ae5a0fa2538b3fe055ce7bf19a11474df4a035803c7d4b91c6553052f0cc3f3ae8031970e26e2cea979ba -EBUILD claws-mail-3.17.3-r1.ebuild 5966 BLAKE2B a384281495ac0b4e856748aa61a3e1c54fa50ad86083af05f8a10f53fd41f31855ddfd139f9db0b80b5ae81573901d9222b6df744700306d3ff2b087b1e50fc6 SHA512 d67ea2ce9cfb326e402cd257e2368c09311ac5fc9c62c0dfbdf9f38e6063c3481e0047d192f672e421d225ae75d3e8d97ae54d16b9d6e6264700307282e06671 -EBUILD claws-mail-3.17.4.ebuild 6045 BLAKE2B b1c54bdc80845231e847837c2d308d9e18c2a51c268fc5b3324dfb9ab5ab328e2b9e04f3b682d14334e8cd57dd6b2a574fb364b9a810db471fce0797ea28a5f0 SHA512 f40cca227a879c94ec0c4c52ecd03f6545d3ff1d6cda9d99a41a39484dfe44e4a05e94f04407f94cd19c23a5c0628db6f465065be548e6d73498055f615eb1db -EBUILD claws-mail-3.17.5-r1.ebuild 6143 BLAKE2B 5d12733b241ea4b72267464945b521dc20a8c566719da4d5913d29a990b6fb9b0de4f536c62f9ed6d1b39886b7a4e5e84abfc1e6f56d2b4c75c87425fa17b25e SHA512 9e48c3ac36de8f9350712df60fe8791b872878aab50217fe1f6092d163df981c7ec4c551d08599356c375034cbb6273b7fc46daeb3ca4061132bb2000fdd53d6 -EBUILD claws-mail-3.17.6-r1.ebuild 5894 BLAKE2B 16b69d72739a5ef7ba82932840f9154dd0a884c1913dc827252c5bcd8a60dc9970c520a5db201d860a0b5d44fe5bdc931da76e7d159dffe40955f1f60905534f SHA512 98234278e37dbe6a72db8fe47fd5fa55f9104bbc87c79cef3fedc5493482a554d8ffdde4ff1708d38bb687458a4a7e2811605069d7951536736a573e710f10aa +EBUILD claws-mail-9999.ebuild 5701 BLAKE2B 25a10c5f08e58a1dd9820712fb39aa248f7113f01f6dcb690193b1011970cf3d499fb92a5eed4f3237e81fde4ab414b1f7a7f7df72b45641f65ee520dc07ca78 SHA512 c9139a63773023147c9f6243f68f46f73163ff9a34758a97f94b6c92595c83902669d60fda17cb83f61648e346eed69b1500275752c0b3d5bdd783f100594014 MISC metadata.xml 1661 BLAKE2B ce48032773773b29728b3a6a177c43572e4c6df0f50df4e17935df77a317f1107527a82fd576765fca018edd73bb31e165029258e49640ed84ff9061f6f1a53f SHA512 5e297601a56a53db9e2463da1e785b0d8e7a358b9df68689c1a3da4efc5d3ffccc92af7ee2202d67e4c6226b298bb562fa0f590fd36a425749e21b1c15516076 diff --git a/mail-client/claws-mail/claws-mail-3.17.6-r1.ebuild b/mail-client/claws-mail/claws-mail-9999.ebuild similarity index 86% rename from mail-client/claws-mail/claws-mail-3.17.6-r1.ebuild rename to mail-client/claws-mail/claws-mail-9999.ebuild index f058f0c..3af3600 100644 --- a/mail-client/claws-mail/claws-mail-3.17.6-r1.ebuild +++ b/mail-client/claws-mail/claws-mail-9999.ebuild @@ -1,26 +1,28 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit autotools desktop xdg +PYTHON_COMPAT=( python3_{8..9} ) + +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 +if [[ "${PV}" == *9999 ]] ; then inherit git-r3 - EGIT_REPO_URI="git://git.claws-mail.org/claws.git" + EGIT_REPO_URI="https://git.claws-mail.org/readonly/claws.git" + EGIT_BRANCH="gtk3tree" else SRC_URI="https://www.claws-mail.org/download.php?file=releases/${P}.tar.xz" - KEYWORDS="~alpha amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc x86" + 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 ) @@ -35,7 +37,7 @@ COMMONDEPEND=" sys-libs/zlib:= x11-libs/cairo x11-libs/gdk-pixbuf:2[jpeg] - >=x11-libs/gtk+-2.24:2 + x11-libs/gtk+:3 x11-libs/libX11 x11-libs/pango archive? ( @@ -67,7 +69,7 @@ COMMONDEPEND=" notification? ( dev-libs/glib:2 appindicator? ( dev-libs/libindicate:3[gtk] ) - libcanberra? ( media-libs/libcanberra[gtk] ) + libcanberra? ( media-libs/libcanberra[gtk3] ) libnotify? ( x11-libs/libnotify ) ) pdf? ( app-text/poppler[cairo] ) @@ -82,13 +84,14 @@ COMMONDEPEND=" startup-notification? ( x11-libs/startup-notification ) svg? ( >=gnome-base/librsvg-2.40.5 ) valgrind? ( dev-util/valgrind ) - webkit? ( net-libs/webkit-gtk:2 ) + webkit? ( net-libs/webkit-gtk:4 ) " DEPEND="${COMMONDEPEND} xface? ( >=media-libs/compface-1.4 ) " BDEPEND=" + ${PYTHON_DEPS} app-arch/xz-utils virtual/pkgconfig " @@ -120,7 +123,6 @@ src_configure() { local myeconfargs=( --disable-bsfilter-plugin - --disable-fancy-plugin --disable-generic-umpc --disable-jpilot #735118 --enable-acpi_notifier-plugin @@ -205,13 +207,11 @@ src_install() { doexe tb2claws-mail update-po uudec uuooffice # kill useless files - rm -f "${ED}"/usr/lib*/claws-mail/plugins/*.{a,la} + find "${ED}"/usr/lib*/claws-mail/plugins/ \ + \( -name "*.a" -o -name ".la" \) -delete || die } 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" - ewarn "- Plugins with no special dependencies are just built and can be loaded through the interface" - ewarn "- The gtkhtml2 and trayicon plugins have been dropped entirely" + ewarn "When upgrading from version 3.x please re-load any plugin you use" xdg_pkg_postinst }