commit: 134b4b11a51e9d36f3b2d89dfe95dc908a81704d
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 15 20:06:48 2017 +0000
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Wed Feb 15 20:36:50 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=134b4b11
mail-client/geary: remove old
Package-Manager: Portage-2.3.3, Repoman-2.3.1
mail-client/geary/Manifest | 2 -
.../geary/files/geary-0.11.2-vala-0.34.patch | 72 ------------------
mail-client/geary/geary-0.11.1.ebuild | 81 --------------------
mail-client/geary/geary-0.11.2.ebuild | 87 ----------------------
4 files changed, 242 deletions(-)
diff --git a/mail-client/geary/Manifest b/mail-client/geary/Manifest
index d0a7244a38..04e6689767 100644
--- a/mail-client/geary/Manifest
+++ b/mail-client/geary/Manifest
@@ -1,3 +1 @@
-DIST geary-0.11.1.tar.xz 958616 SHA256
6efc5e1a944ca1c1a991d50d558fbe46ed58763b3f8b7bcd451b15078a9b2eb2 SHA512
5dc50c2c004a48d1df6c17ba492f24a27c51fa1ab2ea01c77d633611783781e9714aeec9bd6dad58856675c3d10d8223d5c75800a32676d7425e896d8479e4ad
WHIRLPOOL
3cf0efd34fb4a97a0fb99fe118d6b34d20489a3bae7cd967e833327650596bfa0d49464601dd9cc1ff7d43fd94ee21a4e28726ecdba5c42e9dded724d72e90ea
-DIST geary-0.11.2.tar.xz 961724 SHA256
5c9e20ecd53672a42e22a436b9d3b6b9e9bf81ddf77163414a1c55986f9b4631 SHA512
cbfb7461d3125c94e24a32c1cf6baad417d07ac274f1f1f1df4ef7f07b6c6b872a32a35e69bf33c6c6b8960ac4cf8135984ca33f4d4c8861e4c0a1f22525ba88
WHIRLPOOL
876611449868bd03ae26b4dde13c11c16ee8da7497016235a9e8cca10563bad793a5ae5c80147dfcb2e5c41be4f342d372172702de02880525ff3b797ca9a1bb
DIST geary-0.11.3.tar.xz 964024 SHA256
419e9875c81d00e990aab61d419e64ca925928f046af88362d9029a7ba8c82e4 SHA512
dee389384b6bab25f939f0f40525670c27e3687cdfdfbc0c5632ccb2e9e189be3902aedb4fb37affb67c8b149e40ff78e41efbf8a754d76dcd405c8295be0d4b
WHIRLPOOL
3314a7f4b87c5d9e52d9abaefb7b26f1b0713afaadb05f396da92f5dc842745e223f84f1aedad00eafe20e95def6836058175acdb1a5a96d3628f664a29be3ae
diff --git a/mail-client/geary/files/geary-0.11.2-vala-0.34.patch
b/mail-client/geary/files/geary-0.11.2-vala-0.34.patch
deleted file mode 100644
index b01f5772ad..0000000000
--- a/mail-client/geary/files/geary-0.11.2-vala-0.34.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From 8af85ac5a836d877428a6958fbae4b36e29279b0 Mon Sep 17 00:00:00 2001
-From: Rico Tzschichholz <ric...@ubuntu.com>
-Date: Fri, 8 Jul 2016 09:56:42 +0200
-Subject: Fix compile warnings with vala git
-
----
- src/client/application/geary-application.vala | 4 ++--
- src/client/components/conversation-find-bar.vala | 2 +-
- src/client/dialogs/attachment-dialog.vala | 4 ++--
- src/console/main.vala | 2 +-
- 4 files changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/src/client/application/geary-application.vala
b/src/client/application/geary-application.vala
-index 3d04f96..2480aab 100644
---- a/src/client/application/geary-application.vala
-+++ b/src/client/application/geary-application.vala
-@@ -36,9 +36,9 @@ public class GearyApplication : Gtk.Application {
- null
- };
-
-- private static const string ACTION_ENTRY_COMPOSE = "compose";
-+ private const string ACTION_ENTRY_COMPOSE = "compose";
-
-- public static const ActionEntry[] action_entries = {
-+ public const ActionEntry[] action_entries = {
- {ACTION_ENTRY_COMPOSE, activate_compose, "s"},
- };
-
-diff --git a/src/client/components/conversation-find-bar.vala
b/src/client/components/conversation-find-bar.vala
-index 008f4d3..a625896 100644
---- a/src/client/components/conversation-find-bar.vala
-+++ b/src/client/components/conversation-find-bar.vala
-@@ -5,7 +5,7 @@
- */
-
- public class ConversationFindBar : Gtk.Layout {
-- private static const string entry_not_found_style =
-+ private const string entry_not_found_style =
- """
- .geary-not-found {
- color: white;
-diff --git a/src/client/dialogs/attachment-dialog.vala
b/src/client/dialogs/attachment-dialog.vala
-index 79884fa..980e67f 100644
---- a/src/client/dialogs/attachment-dialog.vala
-+++ b/src/client/dialogs/attachment-dialog.vala
-@@ -5,8 +5,8 @@
- */
-
- public class AttachmentDialog : Gtk.FileChooserDialog {
-- private static const int PREVIEW_SIZE = 180;
-- private static const int PREVIEW_PADDING = 3;
-+ private const int PREVIEW_SIZE = 180;
-+ private const int PREVIEW_PADDING = 3;
-
- private static string? current_folder = null;
-
-diff --git a/src/console/main.vala b/src/console/main.vala
-index 6ae3fff..7d0ba12 100644
---- a/src/console/main.vala
-+++ b/src/console/main.vala
-@@ -15,7 +15,7 @@ errordomain CommandException {
- class ImapConsole : Gtk.Window {
- public const string VERSION = _VERSION;
-
-- private static const int KEEPALIVE_SEC = 60 * 10;
-+ private const int KEEPALIVE_SEC = 60 * 10;
-
- private Gtk.TextView console = new Gtk.TextView();
- private Gtk.Entry cmdline = new Gtk.Entry();
---
-cgit v0.12
-
diff --git a/mail-client/geary/geary-0.11.1.ebuild
b/mail-client/geary/geary-0.11.1.ebuild
deleted file mode 100644
index 4d2f6ecfee..0000000000
--- a/mail-client/geary/geary-0.11.1.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-# Keep cmake-utils at the end
-inherit eutils gnome2 vala cmake-utils
-
-DESCRIPTION="A lightweight, easy-to-use, feature-rich email client"
-HOMEPAGE="https://wiki.gnome.org/Apps/Geary";
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="nls"
-
-DEPEND="
- >=app-crypt/gcr-3.10.1[gtk,introspection,vala]
- app-crypt/libsecret
- dev-db/sqlite:3
- dev-libs/glib:2[dbus]
- >=dev-libs/libgee-0.8.5:0.8
- dev-libs/libxml2:2
- dev-libs/gmime:2.6
- media-libs/libcanberra
- >=net-libs/webkit-gtk-1.10.0:3[introspection]
- >=x11-libs/gtk+-3.10.0:3[introspection]
- x11-libs/libnotify
-"
-RDEPEND="${DEPEND}
- gnome-base/gsettings-desktop-schemas
- nls? ( virtual/libintl )
-"
-DEPEND="${DEPEND}
- app-text/gnome-doc-utils
- dev-util/desktop-file-utils
- nls? ( sys-devel/gettext )
- $(vala_depend)
- virtual/pkgconfig
-"
-
-src_prepare() {
- # https://bugzilla.gnome.org/show_bug.cgi?id=751556
- eapply "${FILESDIR}"/${PN}-0.7.2-cflags.patch
-
- # https://bugzilla.gnome.org/show_bug.cgi?id=751557
- eapply "${FILESDIR}"/${PN}-0.5.3-vapigen.patch
-
- # https://bugzilla.gnome.org/show_bug.cgi?id=751558
- eapply "${FILESDIR}"/${PN}-0.6.0-desktopfile.patch
-
- local i
- if use nls ; then
- if [[ -n "${LINGUAS+x}" ]] ; then
- for i in $(cd po ; echo *.po) ; do
- if ! has ${i%.po} ${LINGUAS} ; then
- sed -i -e "/^${i%.po}$/d" po/LINGUAS ||
die
- fi
- done
- fi
- else
- sed -i -e 's#add_subdirectory(po)##' CMakeLists.txt || die
- fi
-
- cmake-utils_src_prepare
- gnome2_src_prepare
- vala_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- -DDESKTOP_UPDATE=OFF
- -DGSETTINGS_COMPILE=OFF
- -DICON_UPDATE=OFF
- -DVALA_EXECUTABLE="${VALAC}"
- -DWITH_UNITY=OFF
- -DDESKTOP_VALIDATE=OFF
- )
-
- cmake-utils_src_configure
-}
diff --git a/mail-client/geary/geary-0.11.2.ebuild
b/mail-client/geary/geary-0.11.2.ebuild
deleted file mode 100644
index 0e54e825ea..0000000000
--- a/mail-client/geary/geary-0.11.2.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-# Keep cmake-utils at the end
-inherit eutils gnome2 vala cmake-utils
-
-DESCRIPTION="A lightweight, easy-to-use, feature-rich email client"
-HOMEPAGE="https://wiki.gnome.org/Apps/Geary";
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="nls"
-
-DEPEND="
- >=app-crypt/gcr-3.10.1:0=[gtk,introspection,vala]
- app-crypt/libsecret
- dev-db/sqlite:3
- dev-libs/glib:2[dbus]
- >=dev-libs/libgee-0.8.5:0.8=
- dev-libs/libxml2:2
- dev-libs/gmime:2.6
- media-libs/libcanberra
- >=net-libs/webkit-gtk-1.10.0:3=[introspection]
- >=x11-libs/gtk+-3.10.0:3[introspection]
- x11-libs/libnotify
-"
-RDEPEND="${DEPEND}
- gnome-base/gsettings-desktop-schemas
- nls? ( virtual/libintl )
-"
-DEPEND="${DEPEND}
- app-text/gnome-doc-utils
- dev-util/desktop-file-utils
- nls? ( sys-devel/gettext )
- $(vala_depend)
- virtual/pkgconfig
-"
-
-src_prepare() {
- # https://bugzilla.gnome.org/show_bug.cgi?id=751556
- # https://bugzilla.gnome.org/show_bug.cgi?id=772879 (recheck in
- # 0.12)
- eapply "${FILESDIR}"/${PN}-0.7.2-cflags.patch
-
- # https://bugzilla.gnome.org/show_bug.cgi?id=751557
- eapply "${FILESDIR}"/${PN}-0.5.3-vapigen.patch
-
- # https://bugzilla.gnome.org/show_bug.cgi?id=751558
- eapply "${FILESDIR}"/${PN}-0.6.0-desktopfile.patch
-
- # vala-0.34 compat, fixed in next version, bug #601778
- eapply "${FILESDIR}"/${P}-vala-0.34.patch
-
- local i
- if use nls ; then
- if [[ -n "${LINGUAS+x}" ]] ; then
- for i in $(cd po ; echo *.po) ; do
- if ! has ${i%.po} ${LINGUAS} ; then
- sed -i -e "/^${i%.po}$/d" po/LINGUAS ||
die
- fi
- done
- fi
- else
- sed -i -e 's#add_subdirectory(po)##' CMakeLists.txt || die
- fi
-
- cmake-utils_src_prepare
- gnome2_src_prepare
- vala_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- -DDESKTOP_UPDATE=OFF
- -DNO_FATAL_WARNINGS=ON
- -DGSETTINGS_COMPILE=OFF
- -DICON_UPDATE=OFF
- -DVALA_EXECUTABLE="${VALAC}"
- -DWITH_UNITY=OFF
- -DDESKTOP_VALIDATE=OFF
- )
-
- cmake-utils_src_configure
-}
