From 3cf7c3ef441822c889356fd1812ebf2944a59851 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 25 Aug 2020 10:45:55 +0100 Subject: gentoo resync : 25.08.2020 --- mail-client/claws-mail/Manifest | 14 +- mail-client/claws-mail/claws-mail-3.17.3-r1.ebuild | 217 ------------------- mail-client/claws-mail/claws-mail-3.17.4.ebuild | 232 --------------------- mail-client/claws-mail/claws-mail-3.17.5-r1.ebuild | 224 -------------------- mail-client/claws-mail/claws-mail-3.17.5.ebuild | 220 ------------------- mail-client/claws-mail/claws-mail-3.17.6-r1.ebuild | 215 +++++++++++++++++++ mail-client/claws-mail/claws-mail-9999.ebuild | 38 ++-- .../claws-mail-3.17.4-libetpan_pkgconfig.patch | 97 --------- mail-client/claws-mail/metadata.xml | 3 +- 9 files changed, 237 insertions(+), 1023 deletions(-) delete mode 100644 mail-client/claws-mail/claws-mail-3.17.3-r1.ebuild delete mode 100644 mail-client/claws-mail/claws-mail-3.17.4.ebuild delete mode 100644 mail-client/claws-mail/claws-mail-3.17.5-r1.ebuild delete mode 100644 mail-client/claws-mail/claws-mail-3.17.5.ebuild create mode 100644 mail-client/claws-mail/claws-mail-3.17.6-r1.ebuild delete 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 dca695163dc0..fef1be54934b 100644 --- a/mail-client/claws-mail/Manifest +++ b/mail-client/claws-mail/Manifest @@ -1,11 +1,5 @@ -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.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 -EBUILD claws-mail-3.17.3-r1.ebuild 5892 BLAKE2B 6ace3c80c1465921a0718c2d9abec187608835249cab7fa2aed8e709a2e83d30fd933287aa8a0f515d4710933f58da41086668ba1054d19ff6cce9c55a945ff2 SHA512 fcc528b4380f9511841f9a024efdf1ce355095fca55cde70bcc3c477f5a9ff9c17a9d33c06e57ab3eeed11fe8d193438ec9146eddfd8034c4f74ced6c4de1afe -EBUILD claws-mail-3.17.4.ebuild 6128 BLAKE2B a8bbe77f764e1a252c2eac623e6124e1e49e05eadc644aa30220bd6adde0516c7b04d7e95b5ab6ca4c39fcb0519de7223ab256540b4a93f3ae2f4d059070066d SHA512 c2890076a8062647e612f1c4a1b0147cacab9a4e9a5be0454c880339f3df421a5c47631cd33368689fa0bd874617d20b57e8e6771b9e196dc9cdc1ba00990e93 -EBUILD claws-mail-3.17.5-r1.ebuild 6063 BLAKE2B 3c2c00f3ca52287c24d4a629573f6c1bb8d85090d4d3ba38f1975f3cd7492c071664d1b2a134bc20575e2d2a0b739931639f9e00fb26a136a5fd943899800d61 SHA512 35bf32085792bfc84ddd8edf3c88b98fda9ed92a32aa08c5d189c220cfe508de72d7b1772a22d7d280edb0d11ecd6a5e88e49dc1289f602e1c2011524471820a -EBUILD claws-mail-3.17.5.ebuild 6000 BLAKE2B f07895af3680a0af89facce448983b921c9ead3641e074e65e2ce78194e810ecc6be15b5cc02733b678d851665394780cbc71ce88bdfe2b6a9b1a201ab9d5889 SHA512 d26f5f55937a03653a42db6fd0061de95e59e5c756c53a1ead108b7ac04eff7ed489e64fa9e67eccfbd68adbb88da7663dfd68c296d9670cd1e3477c2e4d55f6 -EBUILD claws-mail-9999.ebuild 6128 BLAKE2B d6b064906515c19db383615700b95c5f8d59deb4b42d25b972341fcdf56667d92557a74a5f117dbae503f8217f1cbc7053f01b8662d6a6cd79449e72eac5fac7 SHA512 8173a34a2c184f53c791239921ef22b2fed83dd97617e348359410854aab9e43bbb4152ed6ec4e1023b48788edc331e6435888967dbea97477aed8e50ed73038 -MISC metadata.xml 1532 BLAKE2B bf5ed5873952bd13c00e19cbb930026b6eae126caa18a14bde1f4ff7b219fe2f57fcfa3dd4b2dcd5d94acf30da2f8e7a4857bb78049567bf0fbed502977bbed7 SHA512 ea525e1341114ab82508a8423990c3ddde958f5501e0bd7355e25f4ec223ec3cd65b91a1261623bf98c0f06ed91333bb2726d2a6054a0ff49b2d59586507c051 +DIST claws-mail-3.17.6.tar.xz 6400692 BLAKE2B ce5fc914db89835a2a678e68da950d7487e8df919847f3d69baabc73012908f3853dcb274ae4c0e1a4f0f46fb38903b77fe7a2aa7e5b9169bd8eb597035d2ce5 SHA512 07fdf7fce722ee1e50aa155bca720323a58842b372d8295bed33c7245fce5790a1bd3ed7462130664a218a804ab6bd1ba3663ee3e53fbbac6a4a477dd676ede0 +EBUILD claws-mail-3.17.6-r1.ebuild 5816 BLAKE2B 4b6f0cbc4bf08564857154b8aae80efd349227ff9c20da8ecc68c7ccc8759e677801b78fdd142b929a2ba8dcddebd6b52ca75a8f16bf080807bdbf6d5642e254 SHA512 10b9a5334ad4b6f2e6c52de60821138a3427bb99ff57fb4172b7e38ec2c1d5e0c321d1b32769a4c19452254b225380308302b52f4187c9afb36454d24c475d8f +EBUILD claws-mail-9999.ebuild 5962 BLAKE2B 770f6e6afd334f616bb46b04868d797bfeb45e1ffb6b5f82067959e31b2661c87e85cc0bce855a165f383975c5050e7539b256576bd72bb9dfbc11970bca96d5 SHA512 8792faf220af90d010715a9971d54b82c6b08c2a5c2d105f34aed9c14620965f684b4350ff975554611f0f505f03f313d08db20f67b17544448c8e1d4302fa53 +MISC metadata.xml 1467 BLAKE2B 84d9e335170d8e84ac9da4a8e02222cab0b2454ce4044878c8f1bf7a390f7ed190633537469be424de5e2db58791636b86b7db325a971d684233919838cf97d3 SHA512 6c655572b3f4c5cfb38776118fbbe692385bc7dfa5211846a13cde6f2d2d5ab3dc05b12a9a93da1ad7c82c5963dff2773ab3dd8f32e8d1a44fa4d7834e77ded1 diff --git a/mail-client/claws-mail/claws-mail-3.17.3-r1.ebuild b/mail-client/claws-mail/claws-mail-3.17.3-r1.ebuild deleted file mode 100644 index 624d90174a9f..000000000000 --- a/mail-client/claws-mail/claws-mail-3.17.3-r1.ebuild +++ /dev/null @@ -1,217 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python2_7 ) -inherit autotools desktop python-single-r1 xdg - -DESCRIPTION="An email client (and news reader) based on GTK+" -HOMEPAGE="https://www.claws-mail.org/" - -if [[ "${PV}" == 9999 ]] ; then - inherit git-r3 - EGIT_REPO_URI="git://git.claws-mail.org/claws.git" -else - SRC_URI="https://www.claws-mail.org/download.php?file=releases/${P}.tar.xz" - KEYWORDS="~alpha amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc x86" -fi - -SLOT="0" -LICENSE="GPL-3" - -IUSE="archive bogofilter calendar clamav dbus debug dillo doc gdata +gnutls +imap ipv6 ldap +libcanberra +libindicate +libnotify 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 ) - networkmanager? ( dbus ) - python? ( ${PYTHON_REQUIRED_USE} ) - smime? ( pgp )" - -COMMONDEPEND=" - dev-libs/nettle:= - net-mail/ytnef - 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? ( - app-arch/libarchive - >=net-misc/curl-7.9.7 - ) - bogofilter? ( mail-filter/bogofilter ) - calendar? ( - >=dev-libs/libical-2.0.0:= - >=net-misc/curl-7.9.7 - ) - dbus? ( - >=dev-libs/dbus-glib-0.60 - sys-apps/dbus - ) - gdata? ( >=dev-libs/libgdata-0.17.2 ) - dillo? ( www-client/dillo ) - gnutls? ( >=net-libs/gnutls-3.0 ) - imap? ( >=net-libs/libetpan-0.57 ) - ldap? ( >=net-nds/openldap-2.0.7 ) - nls? ( >=sys-devel/gettext-0.18 ) - nntp? ( >=net-libs/libetpan-0.57 ) - notification? ( - dev-libs/glib:2 - libcanberra? ( media-libs/libcanberra[gtk] ) - libindicate? ( dev-libs/libindicate:3[gtk] ) - libnotify? ( x11-libs/libnotify ) - ) - pda? ( >=app-pda/jpilot-0.99 ) - pdf? ( app-text/poppler[cairo] ) - pgp? ( >=app-crypt/gpgme-1.0.0 ) - session? ( - x11-libs/libICE - x11-libs/libSM - ) - smime? ( >=app-crypt/gpgme-1.0.0 ) - spam-report? ( >=net-misc/curl-7.9.7 ) - spell? ( >=app-text/enchant-1.0.0:0= ) - startup-notification? ( x11-libs/startup-notification ) - svg? ( >=gnome-base/librsvg-2.40.5 ) - valgrind? ( dev-util/valgrind ) -" - -DEPEND="${COMMONDEPEND} - app-arch/xz-utils - virtual/pkgconfig - xface? ( >=media-libs/compface-1.4 )" - -RDEPEND="${COMMONDEPEND} - app-misc/mime-types - x11-misc/shared-mime-info - clamav? ( app-antivirus/clamav ) - networkmanager? ( net-misc/networkmanager ) - pdf? ( app-text/ghostscript-gpl ) - perl? ( dev-lang/perl:= ) - python? ( - ${PYTHON_DEPS} - >=dev-python/pygtk-2.10.3 - ) - rss? ( - dev-libs/libxml2 - net-misc/curl - )" - -pkg_setup() { - use python && python-single-r1_pkg_setup -} - -src_prepare() { - xdg_src_prepare - eautoreconf -} - -src_configure() { - # Don't use libsoup-gnome (bug #565924) - export HAVE_LIBSOUP_GNOME=no - - local myeconfargs=( - --disable-bsfilter-plugin - --disable-fancy-plugin - --disable-generic-umpc - --enable-acpi_notifier-plugin - --enable-address_keeper-plugin - --enable-alternate-addressbook - --enable-att_remover-plugin - --enable-attachwarner-plugin - --enable-fetchinfo-plugin - --enable-mailmbox-plugin - --enable-newmail-plugin - --enable-tnef_parse-plugin - --with-password-encryption=$(usex gnutls gnutls old) - $(use_enable archive archive-plugin) - $(use_enable bogofilter bogofilter-plugin) - $(use_enable calendar vcalendar-plugin) - $(use_enable clamav clamd-plugin) - $(use_enable dbus) - $(use_enable debug crash-dialog) - $(use_enable dillo dillo-plugin) - $(use_enable doc manual) - $(use_enable gdata gdata-plugin) - $(use_enable gnutls) - $(use_enable ipv6) - $(use_enable ldap) - $(use_enable networkmanager) - $(use_enable nls) - $(use_enable notification notification-plugin) - $(use_enable pda jpilot) - $(use_enable pdf pdf_viewer-plugin) - $(use_enable perl perl-plugin) - $(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) - $(use_enable smime smime-plugin) - $(use_enable spam-report spam_report-plugin) - $(use_enable spamassassin spamassassin-plugin) - $(use_enable spell enchant) - $(use_enable startup-notification) - $(use_enable svg) - $(use_enable valgrind valgrind) - $(use_enable xface compface) - ) - - # libetpan is needed if user wants nntp or imap functionality - if use imap || use nntp ; then - myeconfargs+=( --enable-libetpan ) - else - myeconfargs+=( --disable-libetpan ) - fi - - ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" -} - -src_install() { - local DOCS=( AUTHORS ChangeLog* INSTALL* NEWS README* TODO* ) - default - - # Makefile install claws-mail.png in /usr/share/icons/hicolor/48x48/apps - # => also install it in /usr/share/pixmaps for other desktop envs - # => also install higher resolution icons in /usr/share/icons/hicolor/... - insinto /usr/share/pixmaps - doins ${PN}.png - local size - for size in 64 128 ; do - newicon -s ${size} ${PN}-${size}x${size}.png ${PN}.png - done - - docinto tools - dodoc tools/README* - - domenu ${PN}.desktop - - einfo "Installing extra tools" - cd "${S}"/tools || die - exeinto /usr/$(get_libdir)/${PN}/tools - doexe *.pl *.py *.conf *.sh - doexe tb2claws-mail update-po uudec uuooffice - - # kill useless files - 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" - 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" - xdg_pkg_postinst -} - -pkg_postrm() { - xdg_pkg_postrm -} diff --git a/mail-client/claws-mail/claws-mail-3.17.4.ebuild b/mail-client/claws-mail/claws-mail-3.17.4.ebuild deleted file mode 100644 index 7605fda66b2b..000000000000 --- a/mail-client/claws-mail/claws-mail-3.17.4.ebuild +++ /dev/null @@ -1,232 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python2_7 ) -inherit autotools desktop python-single-r1 xdg - -DESCRIPTION="An email client (and news reader) based on GTK+" -HOMEPAGE="https://www.claws-mail.org/" - -if [[ "${PV}" == 9999 ]] ; then - inherit git-r3 - EGIT_REPO_URI="git://git.claws-mail.org/claws.git" -else - SRC_URI="https://www.claws-mail.org/download.php?file=releases/${P}.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86" -fi - -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 ) - networkmanager? ( dbus ) - python? ( ${PYTHON_REQUIRED_USE} ) - smime? ( pgp )" - -COMMONDEPEND=" - dev-libs/nettle:= - net-mail/ytnef - 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? ( - app-arch/libarchive - >=net-misc/curl-7.9.7 - ) - bogofilter? ( mail-filter/bogofilter ) - calendar? ( - >=dev-libs/libical-2.0.0:= - >=net-misc/curl-7.9.7 - ) - dbus? ( - >=dev-libs/dbus-glib-0.60 - sys-apps/dbus - ) - gdata? ( >=dev-libs/libgdata-0.17.2 ) - dillo? ( www-client/dillo ) - gnutls? ( >=net-libs/gnutls-3.0 ) - imap? ( >=net-libs/libetpan-0.57 ) - ldap? ( >=net-nds/openldap-2.0.7 ) - litehtml? ( - >=dev-libs/glib-2.36:2 - >=dev-libs/gumbo-0.10 - net-misc/curl - media-libs/fontconfig - ) - nls? ( >=sys-devel/gettext-0.18 ) - nntp? ( >=net-libs/libetpan-0.57 ) - notification? ( - dev-libs/glib:2 - libcanberra? ( media-libs/libcanberra[gtk] ) - libindicate? ( dev-libs/libindicate:3[gtk] ) - libnotify? ( x11-libs/libnotify ) - ) - pda? ( >=app-pda/jpilot-0.99 ) - pdf? ( app-text/poppler[cairo] ) - pgp? ( >=app-crypt/gpgme-1.0.0 ) - session? ( - x11-libs/libICE - x11-libs/libSM - ) - smime? ( >=app-crypt/gpgme-1.0.0 ) - spam-report? ( >=net-misc/curl-7.9.7 ) - spell? ( >=app-text/enchant-1.0.0:0= ) - startup-notification? ( x11-libs/startup-notification ) - svg? ( >=gnome-base/librsvg-2.40.5 ) - valgrind? ( dev-util/valgrind ) -" - -DEPEND="${COMMONDEPEND} - xface? ( >=media-libs/compface-1.4 ) -" -BDEPEND=" - app-arch/xz-utils - virtual/pkgconfig -" -RDEPEND="${COMMONDEPEND} - app-misc/mime-types - x11-misc/shared-mime-info - clamav? ( app-antivirus/clamav ) - networkmanager? ( net-misc/networkmanager ) - pdf? ( app-text/ghostscript-gpl ) - perl? ( dev-lang/perl:= ) - python? ( - ${PYTHON_DEPS} - >=dev-python/pygtk-2.10.3 - ) - rss? ( - dev-libs/libxml2 - net-misc/curl - ) -" - -PATCHES=( - "${FILESDIR}"/${P}-libetpan_pkgconfig.patch -) - -pkg_setup() { - use python && python-single-r1_pkg_setup -} - -src_prepare() { - xdg_src_prepare - eautoreconf -} - -src_configure() { - # Don't use libsoup-gnome (bug #565924) - export HAVE_LIBSOUP_GNOME=no - - local myeconfargs=( - --disable-bsfilter-plugin - --disable-fancy-plugin - --disable-generic-umpc - --enable-acpi_notifier-plugin - --enable-address_keeper-plugin - --enable-alternate-addressbook - --enable-att_remover-plugin - --enable-attachwarner-plugin - --enable-fetchinfo-plugin - --enable-mailmbox-plugin - --enable-newmail-plugin - --enable-tnef_parse-plugin - --with-password-encryption=$(usex gnutls gnutls old) - $(use_enable archive archive-plugin) - $(use_enable bogofilter bogofilter-plugin) - $(use_enable calendar vcalendar-plugin) - $(use_enable clamav clamd-plugin) - $(use_enable dbus) - $(use_enable debug crash-dialog) - $(use_enable dillo dillo-plugin) - $(use_enable doc manual) - $(use_enable gdata gdata-plugin) - $(use_enable gnutls) - $(use_enable ipv6) - $(use_enable ldap) - $(use_enable litehtml litehtml_viewer-plugin) - $(use_enable networkmanager) - $(use_enable nls) - $(use_enable notification notification-plugin) - $(use_enable pda jpilot) - $(use_enable pdf pdf_viewer-plugin) - $(use_enable perl perl-plugin) - $(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) - $(use_enable smime smime-plugin) - $(use_enable spam-report spam_report-plugin) - $(use_enable spamassassin spamassassin-plugin) - $(use_enable spell enchant) - $(use_enable startup-notification) - $(use_enable svg) - $(use_enable valgrind valgrind) - $(use_enable xface compface) - ) - - # libetpan is needed if user wants nntp or imap functionality - if use imap || use nntp ; then - myeconfargs+=( --enable-libetpan ) - else - myeconfargs+=( --disable-libetpan ) - fi - - ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" -} - -src_install() { - local DOCS=( AUTHORS ChangeLog* INSTALL* NEWS README* TODO* ) - default - - # Makefile install claws-mail.png in /usr/share/icons/hicolor/48x48/apps - # => also install it in /usr/share/pixmaps for other desktop envs - # => also install higher resolution icons in /usr/share/icons/hicolor/... - insinto /usr/share/pixmaps - doins ${PN}.png - local size - for size in 64 128 ; do - newicon -s ${size} ${PN}-${size}x${size}.png ${PN}.png - done - - docinto tools - dodoc tools/README* - - domenu ${PN}.desktop - - einfo "Installing extra tools" - cd "${S}"/tools || die - exeinto /usr/$(get_libdir)/${PN}/tools - doexe *.pl *.py *.conf *.sh - doexe tb2claws-mail update-po uudec uuooffice - - # kill useless files - 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" - 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" - xdg_pkg_postinst -} - -pkg_postrm() { - xdg_pkg_postrm -} diff --git a/mail-client/claws-mail/claws-mail-3.17.5-r1.ebuild b/mail-client/claws-mail/claws-mail-3.17.5-r1.ebuild deleted file mode 100644 index f7c9b9aac7bc..000000000000 --- a/mail-client/claws-mail/claws-mail-3.17.5-r1.ebuild +++ /dev/null @@ -1,224 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python2_7 ) -inherit autotools desktop python-single-r1 xdg - -DESCRIPTION="An email client (and news reader) based on GTK+" -HOMEPAGE="https://www.claws-mail.org/" - -if [[ "${PV}" == 9999 ]] ; then - inherit git-r3 - EGIT_REPO_URI="git://git.claws-mail.org/claws.git" -else - SRC_URI="https://www.claws-mail.org/download.php?file=releases/${P}.tar.xz" - KEYWORDS="~alpha amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc x86" -fi - -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 ) - networkmanager? ( dbus ) - python? ( ${PYTHON_REQUIRED_USE} ) - smime? ( pgp )" - -COMMONDEPEND=" - dev-libs/nettle:= - net-mail/ytnef - 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? ( - app-arch/libarchive - >=net-misc/curl-7.9.7 - ) - bogofilter? ( mail-filter/bogofilter ) - calendar? ( - >=dev-libs/libical-2.0.0:= - >=net-misc/curl-7.9.7 - ) - dbus? ( - >=dev-libs/dbus-glib-0.60 - sys-apps/dbus - ) - gdata? ( >=dev-libs/libgdata-0.17.2 ) - dillo? ( www-client/dillo ) - gnutls? ( >=net-libs/gnutls-3.0 ) - imap? ( >=net-libs/libetpan-0.57 ) - ldap? ( >=net-nds/openldap-2.0.7 ) - litehtml? ( - >=dev-libs/glib-2.36:2 - >=dev-libs/gumbo-0.10 - net-misc/curl - media-libs/fontconfig - ) - nls? ( >=sys-devel/gettext-0.18 ) - nntp? ( >=net-libs/libetpan-0.57 ) - notification? ( - dev-libs/glib:2 - libcanberra? ( media-libs/libcanberra[gtk] ) - libindicate? ( dev-libs/libindicate:3[gtk] ) - libnotify? ( x11-libs/libnotify ) - ) - pda? ( >=app-pda/jpilot-0.99 ) - pdf? ( app-text/poppler[cairo] ) - pgp? ( >=app-crypt/gpgme-1.0.0 ) - session? ( - x11-libs/libICE - x11-libs/libSM - ) - smime? ( >=app-crypt/gpgme-1.0.0 ) - spam-report? ( >=net-misc/curl-7.9.7 ) - 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 ) -" - -DEPEND="${COMMONDEPEND} - xface? ( >=media-libs/compface-1.4 ) -" -BDEPEND=" - app-arch/xz-utils - virtual/pkgconfig -" -RDEPEND="${COMMONDEPEND} - app-misc/mime-types - x11-misc/shared-mime-info - clamav? ( app-antivirus/clamav ) - networkmanager? ( net-misc/networkmanager ) - pdf? ( app-text/ghostscript-gpl ) - perl? ( dev-lang/perl:= ) - python? ( - ${PYTHON_DEPS} - >=dev-python/pygtk-2.10.3 - ) - rss? ( - dev-libs/libxml2 - net-misc/curl - ) -" - -PATCHES=( - "${FILESDIR}/${PN}-3.17.5-enchant-2_default.patch" -) - -pkg_setup() { - use python && python-single-r1_pkg_setup -} - -src_prepare() { - xdg_src_prepare - eautoreconf -} - -src_configure() { - # Don't use libsoup-gnome (bug #565924) - export HAVE_LIBSOUP_GNOME=no - - local myeconfargs=( - --disable-bsfilter-plugin - --disable-fancy-plugin - --disable-generic-umpc - --enable-acpi_notifier-plugin - --enable-address_keeper-plugin - --enable-alternate-addressbook - --enable-att_remover-plugin - --enable-attachwarner-plugin - --enable-fetchinfo-plugin - --enable-mailmbox-plugin - --enable-newmail-plugin - --enable-tnef_parse-plugin - --with-password-encryption=$(usex gnutls gnutls old) - $(use_enable archive archive-plugin) - $(use_enable bogofilter bogofilter-plugin) - $(use_enable calendar vcalendar-plugin) - $(use_enable clamav clamd-plugin) - $(use_enable dbus) - $(use_enable debug crash-dialog) - $(use_enable dillo dillo-plugin) - $(use_enable doc manual) - $(use_enable gdata gdata-plugin) - $(use_enable gnutls) - $(use_enable ipv6) - $(use_enable ldap) - $(use_enable litehtml litehtml_viewer-plugin) - $(use_enable networkmanager) - $(use_enable nls) - $(use_enable notification notification-plugin) - $(use_enable pda jpilot) - $(use_enable pdf pdf_viewer-plugin) - $(use_enable perl perl-plugin) - $(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) - $(use_enable smime smime-plugin) - $(use_enable spam-report spam_report-plugin) - $(use_enable spamassassin spamassassin-plugin) - $(use_enable spell enchant) - $(use_enable startup-notification) - $(use_enable svg) - $(use_enable valgrind valgrind) - $(use_enable xface compface) - ) - - # libetpan is needed if user wants nntp or imap functionality - if use imap || use nntp ; then - myeconfargs+=( --enable-libetpan ) - else - myeconfargs+=( --disable-libetpan ) - fi - - ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" -} - -src_install() { - local DOCS=( AUTHORS ChangeLog* INSTALL* NEWS README* TODO* ) - default - - # Makefile install claws-mail.png in /usr/share/icons/hicolor/48x48/apps - # => also install it in /usr/share/pixmaps for other desktop envs - # => also install higher resolution icons in /usr/share/icons/hicolor/... - insinto /usr/share/pixmaps - doins ${PN}.png - local size - for size in 64 128 ; do - newicon -s ${size} ${PN}-${size}x${size}.png ${PN}.png - done - - docinto tools - dodoc tools/README* - - domenu ${PN}.desktop - - einfo "Installing extra tools" - cd "${S}"/tools || die - exeinto /usr/$(get_libdir)/${PN}/tools - doexe *.pl *.py *.conf *.sh - doexe tb2claws-mail update-po uudec uuooffice - - # kill useless files - rm -f "${ED}"/usr/lib*/claws-mail/plugins/*.{a,la} -} - -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" - xdg_pkg_postinst -} diff --git a/mail-client/claws-mail/claws-mail-3.17.5.ebuild b/mail-client/claws-mail/claws-mail-3.17.5.ebuild deleted file mode 100644 index ca84bca51731..000000000000 --- a/mail-client/claws-mail/claws-mail-3.17.5.ebuild +++ /dev/null @@ -1,220 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python2_7 ) -inherit autotools desktop python-single-r1 xdg - -DESCRIPTION="An email client (and news reader) based on GTK+" -HOMEPAGE="https://www.claws-mail.org/" - -if [[ "${PV}" == 9999 ]] ; then - inherit git-r3 - EGIT_REPO_URI="git://git.claws-mail.org/claws.git" -else - SRC_URI="https://www.claws-mail.org/download.php?file=releases/${P}.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86" -fi - -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 ) - networkmanager? ( dbus ) - python? ( ${PYTHON_REQUIRED_USE} ) - smime? ( pgp )" - -COMMONDEPEND=" - dev-libs/nettle:= - net-mail/ytnef - 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? ( - app-arch/libarchive - >=net-misc/curl-7.9.7 - ) - bogofilter? ( mail-filter/bogofilter ) - calendar? ( - >=dev-libs/libical-2.0.0:= - >=net-misc/curl-7.9.7 - ) - dbus? ( - >=dev-libs/dbus-glib-0.60 - sys-apps/dbus - ) - gdata? ( >=dev-libs/libgdata-0.17.2 ) - dillo? ( www-client/dillo ) - gnutls? ( >=net-libs/gnutls-3.0 ) - imap? ( >=net-libs/libetpan-0.57 ) - ldap? ( >=net-nds/openldap-2.0.7 ) - litehtml? ( - >=dev-libs/glib-2.36:2 - >=dev-libs/gumbo-0.10 - net-misc/curl - media-libs/fontconfig - ) - nls? ( >=sys-devel/gettext-0.18 ) - nntp? ( >=net-libs/libetpan-0.57 ) - notification? ( - dev-libs/glib:2 - libcanberra? ( media-libs/libcanberra[gtk] ) - libindicate? ( dev-libs/libindicate:3[gtk] ) - libnotify? ( x11-libs/libnotify ) - ) - pda? ( >=app-pda/jpilot-0.99 ) - pdf? ( app-text/poppler[cairo] ) - pgp? ( >=app-crypt/gpgme-1.0.0 ) - session? ( - x11-libs/libICE - x11-libs/libSM - ) - smime? ( >=app-crypt/gpgme-1.0.0 ) - spam-report? ( >=net-misc/curl-7.9.7 ) - spell? ( >=app-text/enchant-1.0.0:0= ) - startup-notification? ( x11-libs/startup-notification ) - svg? ( >=gnome-base/librsvg-2.40.5 ) - valgrind? ( dev-util/valgrind ) -" - -DEPEND="${COMMONDEPEND} - xface? ( >=media-libs/compface-1.4 ) -" -BDEPEND=" - app-arch/xz-utils - virtual/pkgconfig -" -RDEPEND="${COMMONDEPEND} - app-misc/mime-types - x11-misc/shared-mime-info - clamav? ( app-antivirus/clamav ) - networkmanager? ( net-misc/networkmanager ) - pdf? ( app-text/ghostscript-gpl ) - perl? ( dev-lang/perl:= ) - python? ( - ${PYTHON_DEPS} - >=dev-python/pygtk-2.10.3 - ) - rss? ( - dev-libs/libxml2 - net-misc/curl - ) -" - -pkg_setup() { - use python && python-single-r1_pkg_setup -} - -src_prepare() { - xdg_src_prepare - eautoreconf -} - -src_configure() { - # Don't use libsoup-gnome (bug #565924) - export HAVE_LIBSOUP_GNOME=no - - local myeconfargs=( - --disable-bsfilter-plugin - --disable-fancy-plugin - --disable-generic-umpc - --enable-acpi_notifier-plugin - --enable-address_keeper-plugin - --enable-alternate-addressbook - --enable-att_remover-plugin - --enable-attachwarner-plugin - --enable-fetchinfo-plugin - --enable-mailmbox-plugin - --enable-newmail-plugin - --enable-tnef_parse-plugin - --with-password-encryption=$(usex gnutls gnutls old) - $(use_enable archive archive-plugin) - $(use_enable bogofilter bogofilter-plugin) - $(use_enable calendar vcalendar-plugin) - $(use_enable clamav clamd-plugin) - $(use_enable dbus) - $(use_enable debug crash-dialog) - $(use_enable dillo dillo-plugin) - $(use_enable doc manual) - $(use_enable gdata gdata-plugin) - $(use_enable gnutls) - $(use_enable ipv6) - $(use_enable ldap) - $(use_enable litehtml litehtml_viewer-plugin) - $(use_enable networkmanager) - $(use_enable nls) - $(use_enable notification notification-plugin) - $(use_enable pda jpilot) - $(use_enable pdf pdf_viewer-plugin) - $(use_enable perl perl-plugin) - $(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) - $(use_enable smime smime-plugin) - $(use_enable spam-report spam_report-plugin) - $(use_enable spamassassin spamassassin-plugin) - $(use_enable spell enchant) - $(use_enable startup-notification) - $(use_enable svg) - $(use_enable valgrind valgrind) - $(use_enable xface compface) - ) - - # libetpan is needed if user wants nntp or imap functionality - if use imap || use nntp ; then - myeconfargs+=( --enable-libetpan ) - else - myeconfargs+=( --disable-libetpan ) - fi - - ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" -} - -src_install() { - local DOCS=( AUTHORS ChangeLog* INSTALL* NEWS README* TODO* ) - default - - # Makefile install claws-mail.png in /usr/share/icons/hicolor/48x48/apps - # => also install it in /usr/share/pixmaps for other desktop envs - # => also install higher resolution icons in /usr/share/icons/hicolor/... - insinto /usr/share/pixmaps - doins ${PN}.png - local size - for size in 64 128 ; do - newicon -s ${size} ${PN}-${size}x${size}.png ${PN}.png - done - - docinto tools - dodoc tools/README* - - domenu ${PN}.desktop - - einfo "Installing extra tools" - cd "${S}"/tools || die - exeinto /usr/$(get_libdir)/${PN}/tools - doexe *.pl *.py *.conf *.sh - doexe tb2claws-mail update-po uudec uuooffice - - # kill useless files - rm -f "${ED}"/usr/lib*/claws-mail/plugins/*.{a,la} -} - -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" - xdg_pkg_postinst -} diff --git a/mail-client/claws-mail/claws-mail-3.17.6-r1.ebuild b/mail-client/claws-mail/claws-mail-3.17.6-r1.ebuild new file mode 100644 index 000000000000..6274cc62b9fc --- /dev/null +++ b/mail-client/claws-mail/claws-mail-3.17.6-r1.ebuild @@ -0,0 +1,215 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools desktop xdg + +DESCRIPTION="An email client (and news reader) based on GTK+" +HOMEPAGE="https://www.claws-mail.org/" + +if [[ "${PV}" == 9999 ]] ; then + inherit git-r3 + EGIT_REPO_URI="git://git.claws-mail.org/claws.git" +else + SRC_URI="https://www.claws-mail.org/download.php?file=releases/${P}.tar.xz" + KEYWORDS="~alpha amd64 ~arm ~hppa ~ppc ~ppc64 ~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 xface" + +REQUIRED_USE=" + appindicator? ( notification ) + libcanberra? ( notification ) + libnotify? ( notification ) + networkmanager? ( dbus ) + smime? ( pgp ) +" + +COMMONDEPEND=" + dev-libs/nettle:= + net-mail/ytnef + 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? ( + app-arch/libarchive + >=net-misc/curl-7.9.7 + ) + bogofilter? ( mail-filter/bogofilter ) + calendar? ( + >=dev-libs/libical-2.0.0:= + >=net-misc/curl-7.9.7 + ) + dbus? ( + >=dev-libs/dbus-glib-0.60 + sys-apps/dbus + ) + gdata? ( >=dev-libs/libgdata-0.17.2 ) + dillo? ( www-client/dillo ) + gnutls? ( >=net-libs/gnutls-3.0 ) + imap? ( >=net-libs/libetpan-0.57 ) + ldap? ( >=net-nds/openldap-2.0.7 ) + litehtml? ( + >=dev-libs/glib-2.36:2 + >=dev-libs/gumbo-0.10 + net-misc/curl + media-libs/fontconfig + ) + nls? ( >=sys-devel/gettext-0.18 ) + nntp? ( >=net-libs/libetpan-0.57 ) + notification? ( + dev-libs/glib:2 + appindicator? ( dev-libs/libindicate:3[gtk] ) + libcanberra? ( media-libs/libcanberra[gtk] ) + libnotify? ( x11-libs/libnotify ) + ) + pdf? ( app-text/poppler[cairo] ) + pgp? ( >=app-crypt/gpgme-1.0.0 ) + session? ( + x11-libs/libICE + x11-libs/libSM + ) + smime? ( >=app-crypt/gpgme-1.0.0 ) + spam-report? ( >=net-misc/curl-7.9.7 ) + 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 ) +" + +DEPEND="${COMMONDEPEND} + xface? ( >=media-libs/compface-1.4 ) +" +BDEPEND=" + app-arch/xz-utils + virtual/pkgconfig +" +RDEPEND="${COMMONDEPEND} + app-misc/mime-types + x11-misc/shared-mime-info + clamav? ( app-antivirus/clamav ) + networkmanager? ( net-misc/networkmanager ) + pdf? ( app-text/ghostscript-gpl ) + perl? ( dev-lang/perl:= ) + rss? ( + dev-libs/libxml2 + net-misc/curl + ) +" + +PATCHES=( + "${FILESDIR}/${PN}-3.17.5-enchant-2_default.patch" +) + +src_prepare() { + xdg_src_prepare + eautoreconf +} + +src_configure() { + # Don't use libsoup-gnome (bug #565924) + export HAVE_LIBSOUP_GNOME=no + + local myeconfargs=( + --disable-bsfilter-plugin + --disable-fancy-plugin + --disable-generic-umpc + --disable-jpilot #735118 + --enable-acpi_notifier-plugin + --enable-address_keeper-plugin + --enable-alternate-addressbook + --enable-att_remover-plugin + --enable-attachwarner-plugin + --enable-fetchinfo-plugin + --enable-mailmbox-plugin + --enable-newmail-plugin + --enable-tnef_parse-plugin + --with-password-encryption=$(usex gnutls gnutls old) + $(use_enable archive archive-plugin) + $(use_enable bogofilter bogofilter-plugin) + $(use_enable calendar vcalendar-plugin) + $(use_enable clamav clamd-plugin) + $(use_enable dbus) + $(use_enable debug crash-dialog) + $(use_enable dillo dillo-plugin) + $(use_enable doc manual) + $(use_enable gdata gdata-plugin) + $(use_enable gnutls) + $(use_enable ipv6) + $(use_enable ldap) + $(use_enable litehtml litehtml_viewer-plugin) + $(use_enable networkmanager) + $(use_enable nls) + $(use_enable notification notification-plugin) + $(use_enable pdf pdf_viewer-plugin) + $(use_enable perl perl-plugin) + $(use_enable pgp pgpcore-plugin) + $(use_enable pgp pgpinline-plugin) + $(use_enable pgp pgpmime-plugin) + --disable-python-plugin + $(use_enable rss rssyl-plugin) + $(use_enable session libsm) + $(use_enable sieve managesieve-plugin) + $(use_enable smime smime-plugin) + $(use_enable spam-report spam_report-plugin) + $(use_enable spamassassin spamassassin-plugin) + $(use_enable spell enchant) + $(use_enable startup-notification) + $(use_enable svg) + $(use_enable valgrind valgrind) + $(use_enable xface compface) + ) + + # libetpan is needed if user wants nntp or imap functionality + if use imap || use nntp ; then + myeconfargs+=( --enable-libetpan ) + else + myeconfargs+=( --disable-libetpan ) + fi + + ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" +} + +src_install() { + local DOCS=( AUTHORS ChangeLog* INSTALL* NEWS README* TODO* ) + default + + # Makefile install claws-mail.png in /usr/share/icons/hicolor/48x48/apps + # => also install it in /usr/share/pixmaps for other desktop envs + # => also install higher resolution icons in /usr/share/icons/hicolor/... + insinto /usr/share/pixmaps + doins ${PN}.png + local size + for size in 64 128 ; do + newicon -s ${size} ${PN}-${size}x${size}.png ${PN}.png + done + + docinto tools + dodoc tools/README* + + domenu ${PN}.desktop + + einfo "Installing extra tools" + cd "${S}"/tools || die + exeinto /usr/$(get_libdir)/${PN}/tools + doexe *.pl *.py *.conf *.sh + doexe tb2claws-mail update-po uudec uuooffice + + # kill useless files + rm -f "${ED}"/usr/lib*/claws-mail/plugins/*.{a,la} +} + +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" + xdg_pkg_postinst +} diff --git a/mail-client/claws-mail/claws-mail-9999.ebuild b/mail-client/claws-mail/claws-mail-9999.ebuild index 935280af79fa..c2818293f810 100644 --- a/mail-client/claws-mail/claws-mail-9999.ebuild +++ b/mail-client/claws-mail/claws-mail-9999.ebuild @@ -3,15 +3,14 @@ EAPI=7 -PYTHON_COMPAT=( python2_7 ) -inherit autotools desktop python-single-r1 xdg +inherit autotools desktop 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" else SRC_URI="https://www.claws-mail.org/download.php?file=releases/${P}.tar.xz" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86" @@ -20,13 +19,14 @@ 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" -REQUIRED_USE="libcanberra? ( notification ) - libindicate? ( notification ) +IUSE="+appindicator archive bogofilter calendar clamav dbus debug dillo doc gdata +gnutls gtk2 +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 xface" +REQUIRED_USE=" + appindicator? ( notification ) + libcanberra? ( notification ) libnotify? ( notification ) networkmanager? ( dbus ) - python? ( ${PYTHON_REQUIRED_USE} ) - smime? ( pgp )" + smime? ( pgp ) +" COMMONDEPEND=" dev-libs/nettle:= @@ -52,8 +52,8 @@ 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 ) + !gtk2? ( x11-libs/gtk+:3 ) + gtk2? ( >=x11-libs/gtk+-2.24:2 ) imap? ( >=net-libs/libetpan-0.57 ) ldap? ( >=net-nds/openldap-2.0.7 ) litehtml? ( @@ -66,11 +66,10 @@ COMMONDEPEND=" nntp? ( >=net-libs/libetpan-0.57 ) notification? ( dev-libs/glib:2 + appindicator? ( dev-libs/libindicate:3[gtk] ) libcanberra? ( media-libs/libcanberra[gtk] ) - libindicate? ( dev-libs/libindicate:3[gtk] ) libnotify? ( x11-libs/libnotify ) ) - pda? ( >=app-pda/jpilot-0.99 ) pdf? ( app-text/poppler[cairo] ) pgp? ( >=app-crypt/gpgme-1.0.0 ) session? ( @@ -99,10 +98,6 @@ RDEPEND="${COMMONDEPEND} networkmanager? ( net-misc/networkmanager ) pdf? ( app-text/ghostscript-gpl ) perl? ( dev-lang/perl:= ) - python? ( - ${PYTHON_DEPS} - >=dev-python/pygtk-2.10.3 - ) rss? ( dev-libs/libxml2 net-misc/curl @@ -114,7 +109,9 @@ PATCHES=( ) pkg_setup() { - use python && python-single-r1_pkg_setup + if [[ "${PV}" == *9999 ]] && ! use gtk2 ; then + EGIT_BRANCH="gtk3" + fi } src_prepare() { @@ -130,6 +127,7 @@ src_configure() { --disable-bsfilter-plugin --disable-fancy-plugin --disable-generic-umpc + --disable-jpilot #735118 --enable-acpi_notifier-plugin --enable-address_keeper-plugin --enable-alternate-addressbook @@ -150,20 +148,18 @@ 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) $(use_enable networkmanager) $(use_enable nls) $(use_enable notification notification-plugin) - $(use_enable pda jpilot) $(use_enable pdf pdf_viewer-plugin) $(use_enable perl perl-plugin) $(use_enable pgp pgpcore-plugin) $(use_enable pgp pgpinline-plugin) $(use_enable pgp pgpmime-plugin) - $(use_enable python python-plugin) + --disable-python-plugin $(use_enable rss rssyl-plugin) $(use_enable session libsm) $(use_enable sieve managesieve-plugin) 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 deleted file mode 100644 index 572380d2e053..000000000000 --- a/mail-client/claws-mail/files/claws-mail-3.17.4-libetpan_pkgconfig.patch +++ /dev/null @@ -1,97 +0,0 @@ -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") - diff --git a/mail-client/claws-mail/metadata.xml b/mail-client/claws-mail/metadata.xml index 215b58ddd53d..37ba0db697cb 100644 --- a/mail-client/claws-mail/metadata.xml +++ b/mail-client/claws-mail/metadata.xml @@ -10,9 +10,8 @@ Build mail-filter/bogofilter plugin Enable dillo html viewer plugin Enable plugin for access to Google data providers - Build support for GTK+3 + Build support for GTK+-2 instead of GTK+-3 (live ebuild only) Enable sound notification in connection with USE=notification - Enable notification through DBUS in connection with USE=notification Enable notification on the desktop in connection with USE=notification Enable dev-libs/gumbo html viewer plugin Notification for new mail in different way, see also USE flags libcanberra, libindicate and libnotify -- cgit v1.2.3