1 |
commit: 6b0f35bed6e73ab5000b2102a13e3aef1a4b9798 |
2 |
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Feb 3 22:31:18 2018 +0000 |
4 |
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Feb 3 22:34:58 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b0f35be |
7 |
|
8 |
mail-client/geary: remove old |
9 |
|
10 |
Package-Manager: Portage-2.3.19, Repoman-2.3.6 |
11 |
|
12 |
mail-client/geary/Manifest | 1 - |
13 |
mail-client/geary/files/geary-0.5.3-vapigen.patch | 29 -------- |
14 |
.../geary/files/geary-0.6.0-desktopfile.patch | 12 ---- |
15 |
mail-client/geary/files/geary-0.7.2-cflags.patch | 27 ------- |
16 |
mail-client/geary/geary-0.11.3.ebuild | 83 ---------------------- |
17 |
5 files changed, 152 deletions(-) |
18 |
|
19 |
diff --git a/mail-client/geary/Manifest b/mail-client/geary/Manifest |
20 |
index d438ea5e588..aed6522e175 100644 |
21 |
--- a/mail-client/geary/Manifest |
22 |
+++ b/mail-client/geary/Manifest |
23 |
@@ -1,2 +1 @@ |
24 |
-DIST geary-0.11.3.tar.xz 964024 BLAKE2B daf30b11f045741b4f5ec00d245afdcc04763f25526f3c5d12b0408fec9b0ce96a5ef53f01b622b4aed4bb43e879903385a545430d1e0e1bca14a80bce159f8b SHA512 dee389384b6bab25f939f0f40525670c27e3687cdfdfbc0c5632ccb2e9e189be3902aedb4fb37affb67c8b149e40ff78e41efbf8a754d76dcd405c8295be0d4b |
25 |
DIST geary-0.12.0.tar.xz 1064064 BLAKE2B c4021a784f7704494dfcf9013e4b108d9f921d553e47f55878de30c9878852ac2c023e679c33660cfe2fb190fac56dea4976eccb15bc1a512914442564a24e48 SHA512 caaf49065181f84234bbdb3dc20808f68cb7339e7ef3e992bd83789d3a474b5f59a210d54db2b4fe5f44539a2d52ad7f328087580748c74a513cca7be31c2e52 |
26 |
|
27 |
diff --git a/mail-client/geary/files/geary-0.5.3-vapigen.patch b/mail-client/geary/files/geary-0.5.3-vapigen.patch |
28 |
deleted file mode 100644 |
29 |
index 18b3c8049b4..00000000000 |
30 |
--- a/mail-client/geary/files/geary-0.5.3-vapigen.patch |
31 |
+++ /dev/null |
32 |
@@ -1,29 +0,0 @@ |
33 |
-From: Julian Ospald <hasufell@g.o> |
34 |
-Date: Sun Feb 2 00:17:18 UTC 2014 |
35 |
-Subject: gentoo specific |
36 |
- |
37 |
---- geary-0.5.1.tar.xz/src/CMakeLists.txt |
38 |
-+++ geary-0.5.1.tar.xz/src/CMakeLists.txt |
39 |
-@@ -399,12 +399,7 @@ |
40 |
- include(ValaPrecompile) |
41 |
- |
42 |
- # Vapigen |
43 |
--find_program(VAPIGEN vapigen) |
44 |
--if (VAPIGEN STREQUAL "VAPIGEN-NOTFOUND") |
45 |
-- message(FATAL_ERROR "vapigen must be installed to build Geary.") |
46 |
--else () |
47 |
-- message(STATUS "Found vapigen: " ${VAPIGEN}) |
48 |
--endif () |
49 |
-+set(VAPIGEN $ENV{VAPIGEN}) |
50 |
- |
51 |
- # Packages |
52 |
- if (LIBMESSAGINGMENU_FOUND) |
53 |
-@@ -615,7 +610,7 @@ |
54 |
- WORKING_DIRECTORY |
55 |
- ${CMAKE_SOURCE_DIR}/bindings/metadata |
56 |
- COMMAND |
57 |
-- vapigen --pkg=gio-2.0 --pkg=gtk+-3.0 --pkg=libsoup-2.4 --metadatadir=. --metadatadir=${WEBKITGTK_METADATA_DIR} --library=webkitgtk-3.0 --directory=${CMAKE_BINARY_DIR}/src ${WEBKITGTK_CUSTOM_VALA} `pkg-config --variable=girdir gobject-introspection-1.0`/WebKit-3.0.gir |
58 |
-+ $ENV{VAPIGEN} --pkg=gio-2.0 --pkg=gtk+-3.0 --pkg=libsoup-2.4 --metadatadir=. --metadatadir=${WEBKITGTK_METADATA_DIR} --library=webkitgtk-3.0 --directory=${CMAKE_BINARY_DIR}/src ${WEBKITGTK_CUSTOM_VALA} `pkg-config --variable=girdir gobject-introspection-1.0`/WebKit-3.0.gir |
59 |
- ) |
60 |
- |
61 |
- # Geary client app |
62 |
|
63 |
diff --git a/mail-client/geary/files/geary-0.6.0-desktopfile.patch b/mail-client/geary/files/geary-0.6.0-desktopfile.patch |
64 |
deleted file mode 100644 |
65 |
index 3ba892f0bb3..00000000000 |
66 |
--- a/mail-client/geary/files/geary-0.6.0-desktopfile.patch |
67 |
+++ /dev/null |
68 |
@@ -1,12 +0,0 @@ |
69 |
-From: Julian Ospald <hasufell@g.o> |
70 |
-Date: Sun Mar 23 22:56:46 UTC 2014 |
71 |
-Subject: fix desktop file |
72 |
- |
73 |
---- a/desktop/geary.desktop.in |
74 |
-+++ b/desktop/geary.desktop.in |
75 |
-@@ -17,5 +17,3 @@ |
76 |
- [Desktop Action Compose] |
77 |
- _Name=Compose Message |
78 |
- Exec=geary mailto: |
79 |
--OnlyShowIn=X-Messaging Menu;Unity; |
80 |
-- |
81 |
|
82 |
diff --git a/mail-client/geary/files/geary-0.7.2-cflags.patch b/mail-client/geary/files/geary-0.7.2-cflags.patch |
83 |
deleted file mode 100644 |
84 |
index 959ae4b1f34..00000000000 |
85 |
--- a/mail-client/geary/files/geary-0.7.2-cflags.patch |
86 |
+++ /dev/null |
87 |
@@ -1,27 +0,0 @@ |
88 |
-commit e41cf68206eb16be678eeaa1dc998d94d2f93d57 |
89 |
-Author: hasufell <hasufell@g.o> |
90 |
-Date: Tue Aug 27 01:40:58 2013 +0200 |
91 |
- |
92 |
- respect system CFLAGS |
93 |
- |
94 |
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt |
95 |
-index 5202b99..949d494 100644 |
96 |
---- a/src/CMakeLists.txt |
97 |
-+++ b/src/CMakeLists.txt |
98 |
-@@ -471,16 +471,8 @@ set(CFLAGS |
99 |
- -DGETTEXT_PACKAGE=\"${GETTEXT_PACKAGE}\" |
100 |
- -DLANGUAGE_SUPPORT_DIRECTORY=\"${LANGUAGE_SUPPORT_DIRECTORY}\" |
101 |
- -DGCR_API_SUBJECT_TO_CHANGE |
102 |
-- -g |
103 |
- ) |
104 |
- |
105 |
--if (NOT DEBUG) |
106 |
-- set(CFLAGS |
107 |
-- ${CFLAGS} |
108 |
-- -O2 |
109 |
-- ) |
110 |
--endif () |
111 |
-- |
112 |
- if (REF_TRACKING) |
113 |
- message(STATUS "Reference tracking: ON") |
114 |
- set(EXTRA_VALA_OPTIONS |
115 |
|
116 |
diff --git a/mail-client/geary/geary-0.11.3.ebuild b/mail-client/geary/geary-0.11.3.ebuild |
117 |
deleted file mode 100644 |
118 |
index 3a15736c959..00000000000 |
119 |
--- a/mail-client/geary/geary-0.11.3.ebuild |
120 |
+++ /dev/null |
121 |
@@ -1,83 +0,0 @@ |
122 |
-# Copyright 1999-2017 Gentoo Foundation |
123 |
-# Distributed under the terms of the GNU General Public License v2 |
124 |
- |
125 |
-EAPI=6 |
126 |
-# Keep cmake-utils at the end |
127 |
-inherit gnome2 vala cmake-utils |
128 |
- |
129 |
-DESCRIPTION="A lightweight, easy-to-use, feature-rich email client" |
130 |
-HOMEPAGE="https://wiki.gnome.org/Apps/Geary" |
131 |
- |
132 |
-LICENSE="LGPL-2.1" |
133 |
-SLOT="0" |
134 |
-KEYWORDS="amd64 x86" |
135 |
-IUSE="nls" |
136 |
- |
137 |
-DEPEND=" |
138 |
- >=app-crypt/gcr-3.10.1:0=[gtk,introspection,vala] |
139 |
- app-crypt/libsecret |
140 |
- dev-db/sqlite:3 |
141 |
- dev-libs/glib:2[dbus] |
142 |
- >=dev-libs/libgee-0.8.5:0.8= |
143 |
- dev-libs/libxml2:2 |
144 |
- dev-libs/gmime:2.6 |
145 |
- media-libs/libcanberra |
146 |
- >=net-libs/webkit-gtk-1.10.0:3=[introspection] |
147 |
- >=x11-libs/gtk+-3.10.0:3[introspection] |
148 |
- x11-libs/libnotify |
149 |
-" |
150 |
-RDEPEND="${DEPEND} |
151 |
- gnome-base/gsettings-desktop-schemas |
152 |
- nls? ( virtual/libintl ) |
153 |
-" |
154 |
-DEPEND="${DEPEND} |
155 |
- app-text/gnome-doc-utils |
156 |
- dev-util/desktop-file-utils |
157 |
- nls? ( sys-devel/gettext ) |
158 |
- $(vala_depend) |
159 |
- virtual/pkgconfig |
160 |
-" |
161 |
- |
162 |
-src_prepare() { |
163 |
- # https://bugzilla.gnome.org/show_bug.cgi?id=751556 |
164 |
- # https://bugzilla.gnome.org/show_bug.cgi?id=772879 (recheck in |
165 |
- # 0.12) |
166 |
- eapply "${FILESDIR}"/${PN}-0.7.2-cflags.patch |
167 |
- |
168 |
- # https://bugzilla.gnome.org/show_bug.cgi?id=751557 |
169 |
- eapply "${FILESDIR}"/${PN}-0.5.3-vapigen.patch |
170 |
- |
171 |
- # https://bugzilla.gnome.org/show_bug.cgi?id=751558 |
172 |
- eapply "${FILESDIR}"/${PN}-0.6.0-desktopfile.patch |
173 |
- |
174 |
- local i |
175 |
- if use nls ; then |
176 |
- if [[ -n "${LINGUAS+x}" ]] ; then |
177 |
- for i in $(cd po ; echo *.po) ; do |
178 |
- if ! has ${i%.po} ${LINGUAS} ; then |
179 |
- sed -i -e "/^${i%.po}$/d" po/LINGUAS || die |
180 |
- fi |
181 |
- done |
182 |
- fi |
183 |
- else |
184 |
- sed -i -e 's#add_subdirectory(po)##' CMakeLists.txt || die |
185 |
- fi |
186 |
- |
187 |
- cmake-utils_src_prepare |
188 |
- gnome2_src_prepare |
189 |
- vala_src_prepare |
190 |
-} |
191 |
- |
192 |
-src_configure() { |
193 |
- local mycmakeargs=( |
194 |
- -DDESKTOP_UPDATE=OFF |
195 |
- -DNO_FATAL_WARNINGS=ON |
196 |
- -DGSETTINGS_COMPILE=OFF |
197 |
- -DICON_UPDATE=OFF |
198 |
- -DVALA_EXECUTABLE="${VALAC}" |
199 |
- -DWITH_UNITY=OFF |
200 |
- -DDESKTOP_VALIDATE=OFF |
201 |
- ) |
202 |
- |
203 |
- cmake-utils_src_configure |
204 |
-} |