diff --git a/mail-client/geary/Manifest b/mail-client/geary/Manifest index 8883f1fa5da88..f55f4210f46e4 100644 --- a/mail-client/geary/Manifest +++ b/mail-client/geary/Manifest @@ -1,4 +1 @@ -DIST geary-3.34.2.tar.xz 2411940 BLAKE2B 61c0f69b3327c487530180544bbe13d131e4236d6a205db90278b75e839294923176b41d423a52d18c5b36b6dda7865ddbaf4e929260c2c845a69a6527b4fae9 SHA512 d34886829e1330bfe7fe4891b5e368010f5742a5ac20ab057a902897df1f6c4145a882379d9dbe82e0c954a91db265b9758ddd2eb96b9c03c0efc0f6d8cc6ea0 -DIST geary-3.36.0.tar.xz 2393620 BLAKE2B 06b06a948c0932f24fd3cbb70727d9fa1746dc506c80b29f100524a6b8adbfccadee5c3d5b6524c98ed6f902e68bd3151d3c3246cce4c2a825d9e99efa7a9fed SHA512 aefc29e64acc8e4416eb213de8948b6d51dc12f1087b9376ddc8e4991efc171b36c35868043ab3159eef614916da82c046222c5ea6256b51cbc72bce9cfec7d6 -DIST geary-3.36.1.tar.xz 2400548 BLAKE2B 84240b7b5b80e6172e875d46554caca5d3a10f85965f65916603a4dcf3ada8ed8a23f6c1e2ceb64922e0eaa072122bd41b22bbc2f37b35b2205f703f49887a4b SHA512 7d5812ece5f5315245237a57de26475c4db58c4bdcce4399a3d304e25d60093dfbe1332764e056f94bf754b19be2279d0b4237b628746202b6f5dc5755b11ca8 DIST geary-3.36.2.tar.xz 2416928 BLAKE2B 983357ffe5e6be637d992a530d8bee3ff90257620a73df628b6e36f18dc021d97eba6f2ef59290d3ab8e7c781a39c50b67e42104d51f0ad51e65f2de00c95352 SHA512 a3cca301a3668eb2e70f8bfc147abef9088de4e822efab4ecc44830fbc394265d1fa37267a1f8fa97b6e8d1ac8a8adb76e5dd9e509490ac567e05bd243e8ea20 diff --git a/mail-client/geary/files/3.34.2-fix-ytnef-automagic.patch b/mail-client/geary/files/3.34.2-fix-ytnef-automagic.patch deleted file mode 100644 index dccc40aab8c1e..0000000000000 --- a/mail-client/geary/files/3.34.2-fix-ytnef-automagic.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 91f78fb411bc2bf1e2269ceab02740e9cb969c9b Mon Sep 17 00:00:00 2001 -From: Mart Raudsepp -Date: Thu, 26 Dec 2019 19:28:07 +0200 -Subject: [PATCH] build: Fix automagic dependency on ytnef library - -It would be best to use meson feature option type for ytnef and unwind, -but for now fix the automagic dependency on ytnef with the existing -meson_options.txt setup. -It was adding ytnef to list of dependencies unconditionally, and then -also if tnef-support was enabled. So if the option was disabled, but the -pkg-config file was present, it would still link to it surprisingly. -Just remove the unconditional addition to dep, and rely on the already -existing conditional addition to deps. ---- - src/engine/meson.build | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/src/engine/meson.build b/src/engine/meson.build -index cb61c2aa..23b5fa48 100644 ---- a/src/engine/meson.build -+++ b/src/engine/meson.build -@@ -325,7 +325,6 @@ geary_engine_dependencies = [ - gmime, - libmath, - libxml, -- libytnef, - posix, - sqlite - ] --- -2.20.1 - diff --git a/mail-client/geary/geary-3.34.2-r3.ebuild b/mail-client/geary/geary-3.34.2-r3.ebuild deleted file mode 100644 index 60b478449778b..0000000000000 --- a/mail-client/geary/geary-3.34.2-r3.ebuild +++ /dev/null @@ -1,102 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -VALA_MIN_API_VERSION="0.44" - -inherit gnome.org gnome2-utils meson vala virtualx xdg - -DESCRIPTION="A lightweight, easy-to-use, feature-rich email client" -HOMEPAGE="https://wiki.gnome.org/Apps/Geary" - -LICENSE="LGPL-2.1+ BSD-2 CC-BY-3.0 CC-BY-SA-3.0" # code is LGPL-2.1+, BSD-2 for bundled snowball-stemmer, CC licenses for some icons -SLOT="0" - -IUSE="ytnef" - -KEYWORDS="~amd64 ~x86" - -# for now both enchants work, but ensuring enchant:2 -# FIXME: add valadoc support - -# >=webkit-gtk-2.26.4-r1 and >=gspell-1.7 dep to ensure all libraries used use enchant:2 -# >=webkit-gtk-2.26 dep to ensure HAS_WEBKIT_SHARED_PROC is handled for it; -# If not, it could be compiled against 2.24 and then webkit-gtk upgraded and -# geary not rebuilt, ending up in geary issues #558 and #559 still. -DEPEND=" - >=dev-libs/glib-2.54:2 - >=x11-libs/gtk+-3.24.7:3 - >=net-libs/webkit-gtk-2.26.4-r1:4= - >=dev-libs/gmime-2.6.17:2.6 - >=dev-db/sqlite-3.12:3 - - app-text/enchant:2 - >=dev-libs/folks-0.11:0 - >=app-crypt/gcr-3.10.1:0= - >=dev-libs/libgee-0.8.5:0.8= - net-libs/gnome-online-accounts - >=app-text/gspell-1.7:= - app-text/iso-codes - >=dev-libs/json-glib-1.0 - >=media-libs/libcanberra-0.28 - >=gui-libs/libhandy-0.0.9:0.0= - >=app-crypt/libsecret-0.11 - >=net-libs/libsoup-2.48:2.4 - >=sys-libs/libunwind-1.1:0 - >=dev-libs/libxml2-2.7.8:2 - ytnef? ( >=net-mail/ytnef-1.9.3 ) -" -RDEPEND="${DEPEND} - gnome-base/gsettings-desktop-schemas -" -BDEPEND=" - >=dev-libs/appstream-glib-0.7.10 - dev-util/itstool - >=sys-devel/gettext-0.19.8 - virtual/pkgconfig - - $(vala_depend) - x11-libs/gtk+:3[introspection] - net-libs/webkit-gtk:4[introspection] - app-crypt/gcr:0[introspection,vala] - dev-libs/libgee:0.8[introspection] - app-text/gspell[vala] - app-crypt/libsecret[introspection,vala] - net-libs/libsoup:2.4[introspection,vala] -" - -PATCHES=( - "${FILESDIR}"/${PV}-fix-ytnef-automagic.patch # https://gitlab.gnome.org/GNOME/geary/merge_requests/390 -) - -src_prepare() { - vala_src_prepare - xdg_src_prepare -} - -src_configure() { - local emesonargs=( - -Dvaladoc=false - -Dcontractor=false - -Dpoodle=true - -Dlibunwind_optional=false # TODO: Automagical if optional=true - $(meson_use ytnef tnef-support) - -Dprofile=default - ) - - meson_src_configure -} - -src_test() { - virtx meson_src_test -} - -pkg_postinst() { - xdg_pkg_postinst - gnome2_schemas_update -} - -pkg_postrm() { - xdg_pkg_postrm - gnome2_schemas_update -} diff --git a/mail-client/geary/geary-3.36.0.ebuild b/mail-client/geary/geary-3.36.0.ebuild deleted file mode 100644 index 53757eb751656..0000000000000 --- a/mail-client/geary/geary-3.36.0.ebuild +++ /dev/null @@ -1,97 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -VALA_MIN_API_VERSION="0.44" - -inherit gnome.org gnome2-utils meson vala virtualx xdg - -DESCRIPTION="A lightweight, easy-to-use, feature-rich email client" -HOMEPAGE="https://wiki.gnome.org/Apps/Geary" - -LICENSE="LGPL-2.1+ BSD-2 CC-BY-3.0 CC-BY-SA-3.0" # code is LGPL-2.1+, BSD-2 for bundled snowball-stemmer, CC licenses for some icons -SLOT="0" - -IUSE="ytnef" - -KEYWORDS="~amd64 ~x86" - -# for now both enchants work, but ensuring enchant:2 - -# >=webkit-gtk-2.26.4-r1 and >=gspell-1.7 dep to ensure all libraries used use enchant:2 -DEPEND=" - >=dev-libs/glib-2.60.4:2 - >=x11-libs/gtk+-3.24.7:3 - >=net-libs/webkit-gtk-2.26.4-r1:4= - >=dev-libs/gmime-3.2.4:3.0 - >=dev-db/sqlite-3.24:3 - - app-text/enchant:2 - >=dev-libs/folks-0.11:0 - >=app-crypt/gcr-3.10.1:0= - >=dev-libs/libgee-0.8.5:0.8= - net-libs/gnome-online-accounts - >=app-text/gspell-1.7:= - app-text/iso-codes - >=dev-libs/json-glib-1.0 - >=gui-libs/libhandy-0.0.10:0.0= - >=dev-libs/libpeas-1.24.0 - >=app-crypt/libsecret-0.11 - >=net-libs/libsoup-2.48:2.4 - >=sys-libs/libunwind-1.1:0 - >=dev-libs/libxml2-2.7.8:2 - ytnef? ( >=net-mail/ytnef-1.9.3 ) -" -RDEPEND="${DEPEND} - gnome-base/gsettings-desktop-schemas -" -BDEPEND=" - >=dev-libs/appstream-glib-0.7.10 - dev-libs/libxml2 - dev-util/itstool - >=sys-devel/gettext-0.19.8 - virtual/pkgconfig - - $(vala_depend) - x11-libs/gtk+:3[introspection] - net-libs/webkit-gtk:4[introspection] - dev-libs/gmime:3.0[vala] - app-crypt/gcr:0[introspection,vala] - dev-libs/libgee:0.8[introspection] - app-text/gspell[vala] - gui-libs/libhandy:0.0[vala] - app-crypt/libsecret[introspection,vala] - net-libs/libsoup:2.4[introspection,vala] -" - -src_prepare() { - vala_src_prepare - xdg_src_prepare -} - -src_configure() { - local emesonargs=( - -Dcontractor=false - -Dlibunwind_optional=false # TODO: Automagical if optional=true - -Dpoodle=true - $(meson_use ytnef tnef-support) - -Dvaladoc=false - -Dprofile=default - ) - - meson_src_configure -} - -src_test() { - virtx meson_src_test -} - -pkg_postinst() { - xdg_pkg_postinst - gnome2_schemas_update -} - -pkg_postrm() { - xdg_pkg_postrm - gnome2_schemas_update -} diff --git a/mail-client/geary/geary-3.36.1.ebuild b/mail-client/geary/geary-3.36.1.ebuild deleted file mode 100644 index 53757eb751656..0000000000000 --- a/mail-client/geary/geary-3.36.1.ebuild +++ /dev/null @@ -1,97 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -VALA_MIN_API_VERSION="0.44" - -inherit gnome.org gnome2-utils meson vala virtualx xdg - -DESCRIPTION="A lightweight, easy-to-use, feature-rich email client" -HOMEPAGE="https://wiki.gnome.org/Apps/Geary" - -LICENSE="LGPL-2.1+ BSD-2 CC-BY-3.0 CC-BY-SA-3.0" # code is LGPL-2.1+, BSD-2 for bundled snowball-stemmer, CC licenses for some icons -SLOT="0" - -IUSE="ytnef" - -KEYWORDS="~amd64 ~x86" - -# for now both enchants work, but ensuring enchant:2 - -# >=webkit-gtk-2.26.4-r1 and >=gspell-1.7 dep to ensure all libraries used use enchant:2 -DEPEND=" - >=dev-libs/glib-2.60.4:2 - >=x11-libs/gtk+-3.24.7:3 - >=net-libs/webkit-gtk-2.26.4-r1:4= - >=dev-libs/gmime-3.2.4:3.0 - >=dev-db/sqlite-3.24:3 - - app-text/enchant:2 - >=dev-libs/folks-0.11:0 - >=app-crypt/gcr-3.10.1:0= - >=dev-libs/libgee-0.8.5:0.8= - net-libs/gnome-online-accounts - >=app-text/gspell-1.7:= - app-text/iso-codes - >=dev-libs/json-glib-1.0 - >=gui-libs/libhandy-0.0.10:0.0= - >=dev-libs/libpeas-1.24.0 - >=app-crypt/libsecret-0.11 - >=net-libs/libsoup-2.48:2.4 - >=sys-libs/libunwind-1.1:0 - >=dev-libs/libxml2-2.7.8:2 - ytnef? ( >=net-mail/ytnef-1.9.3 ) -" -RDEPEND="${DEPEND} - gnome-base/gsettings-desktop-schemas -" -BDEPEND=" - >=dev-libs/appstream-glib-0.7.10 - dev-libs/libxml2 - dev-util/itstool - >=sys-devel/gettext-0.19.8 - virtual/pkgconfig - - $(vala_depend) - x11-libs/gtk+:3[introspection] - net-libs/webkit-gtk:4[introspection] - dev-libs/gmime:3.0[vala] - app-crypt/gcr:0[introspection,vala] - dev-libs/libgee:0.8[introspection] - app-text/gspell[vala] - gui-libs/libhandy:0.0[vala] - app-crypt/libsecret[introspection,vala] - net-libs/libsoup:2.4[introspection,vala] -" - -src_prepare() { - vala_src_prepare - xdg_src_prepare -} - -src_configure() { - local emesonargs=( - -Dcontractor=false - -Dlibunwind_optional=false # TODO: Automagical if optional=true - -Dpoodle=true - $(meson_use ytnef tnef-support) - -Dvaladoc=false - -Dprofile=default - ) - - meson_src_configure -} - -src_test() { - virtx meson_src_test -} - -pkg_postinst() { - xdg_pkg_postinst - gnome2_schemas_update -} - -pkg_postrm() { - xdg_pkg_postrm - gnome2_schemas_update -}