Gentoo Archives: gentoo-commits

From: Mart Raudsepp <leio@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/folks/, dev-libs/folks/files/
Date: Sun, 22 Dec 2019 20:47:29
Message-Id: 1577047610.2da4596d8383d9222cc494f0ff966c3e1b21ac1f.leio@gentoo
1 commit: 2da4596d8383d9222cc494f0ff966c3e1b21ac1f
2 Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
3 AuthorDate: Sun Dec 22 20:40:55 2019 +0000
4 Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
5 CommitDate: Sun Dec 22 20:46:50 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2da4596d
7
8 dev-libs/folks: remove old
9
10 Package-Manager: Portage-2.3.79, Repoman-2.3.12
11 Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>
12
13 dev-libs/folks/Manifest | 1 -
14 dev-libs/folks/files/0.11.4-vala-0.42-compat.patch | 32 --------
15 .../files/0.11.4-vala-0.42-tests-compat.patch | 39 ---------
16 dev-libs/folks/folks-0.11.4-r1.ebuild | 94 ----------------------
17 4 files changed, 166 deletions(-)
18
19 diff --git a/dev-libs/folks/Manifest b/dev-libs/folks/Manifest
20 index a14a94a5d96..499f5bcc9ef 100644
21 --- a/dev-libs/folks/Manifest
22 +++ b/dev-libs/folks/Manifest
23 @@ -1,2 +1 @@
24 -DIST folks-0.11.4.tar.xz 1972272 BLAKE2B 69fa21f9baf34a3597f8a7e3f789ab3d03ad508ec74e0e1dfaa8df09865cb99748483b4fa4aa9c219803c512a49a23e95d4c3ded5b285b0a0d2f7416a1d9bf7f SHA512 bd4088322c34b5d6e633d7d5d83dfb61eb3499014adf6fecad27231ec63509401b2867186d019a2f7c92cc3b3f2e6cfbc80e0d4700d84ce7a08d8153af3d2392
25 DIST folks-0.12.1.tar.xz 522688 BLAKE2B 584957b628e286b850ee45c3f79d942ae602124e0130eeddc8806ae6fc12accd26c140df5caa0a1a68c84bff707df785d863d2f69ee9a0b6b450b8159c21fb39 SHA512 f60e993508137b33602ccc814bde45ad780d61afb0566f8175fd01b3dcaa5f5771e11d98156c4ecfd85f920a7adc140a5b2582eaaa97568b8fb3b3761668decb
26
27 diff --git a/dev-libs/folks/files/0.11.4-vala-0.42-compat.patch b/dev-libs/folks/files/0.11.4-vala-0.42-compat.patch
28 deleted file mode 100644
29 index 21b0e44ab96..00000000000
30 --- a/dev-libs/folks/files/0.11.4-vala-0.42-compat.patch
31 +++ /dev/null
32 @@ -1,32 +0,0 @@
33 -From 6a5c9e7e8daf4e1361709a75719c17c8c28a6c4b Mon Sep 17 00:00:00 2001
34 -From: Rico Tzschichholz <ricotz@××××××.com>
35 -Date: Fri, 23 Mar 2018 17:55:11 +0100
36 -Subject: [PATCH] inspect: Adapt to binding change of
37 - Signal.add_emission_hook() in vala 0.41
38 -
39 -https://git.gnome.org/browse/vala/commit/?id=1d4db9f276c2593f072313864c743c6dd16acf35
40 -
41 -Reviewed-by: Philip Withnall <withnall@××××××××.com>
42 ----
43 - tools/inspect/signal-manager.vala | 4 ++++
44 - 1 file changed, 4 insertions(+)
45 -
46 -diff --git a/tools/inspect/signal-manager.vala b/tools/inspect/signal-manager.vala
47 -index 4d1b6480..7c5b17a0 100644
48 ---- a/tools/inspect/signal-manager.vala
49 -+++ b/tools/inspect/signal-manager.vala
50 -@@ -430,7 +430,11 @@ public class Folks.Inspect.SignalManager : Object
51 - return false;
52 -
53 - ulong hook_id = Signal.add_emission_hook (signal_id,
54 -+#if VALA_0_42
55 -+ detail_quark, this.emission_hook_cb);
56 -+#else
57 - detail_quark, this.emission_hook_cb, null);
58 -+#endif
59 -
60 - /* Store the hook ID so we can list or remove it later */
61 - HashMap<uint, ulong> hook_ids =
62 ---
63 -2.18.1
64 -
65
66 diff --git a/dev-libs/folks/files/0.11.4-vala-0.42-tests-compat.patch b/dev-libs/folks/files/0.11.4-vala-0.42-tests-compat.patch
67 deleted file mode 100644
68 index 7b453ebf1a9..00000000000
69 --- a/dev-libs/folks/files/0.11.4-vala-0.42-tests-compat.patch
70 +++ /dev/null
71 @@ -1,39 +0,0 @@
72 -From 600e2d42e6097502ec0c42ab257d08fc0ca7933a Mon Sep 17 00:00:00 2001
73 -From: Rico Tzschichholz <ricotz@××××××.com>
74 -Date: Wed, 30 May 2018 14:20:27 +0200
75 -Subject: [PATCH] tests: Use FileAttribute.* enumeration
76 -
77 ----
78 - tests/folks/avatar-cache.vala | 2 +-
79 - tests/folks/object-cache.vala | 2 +-
80 - 2 files changed, 2 insertions(+), 2 deletions(-)
81 -
82 -diff --git a/tests/folks/avatar-cache.vala b/tests/folks/avatar-cache.vala
83 -index d25245c0..ee32e9e4 100644
84 ---- a/tests/folks/avatar-cache.vala
85 -+++ b/tests/folks/avatar-cache.vala
86 -@@ -78,7 +78,7 @@ public class AvatarCacheTests : Folks.TestCase
87 - {
88 - // Delete the files in the directory
89 - var enumerator =
90 -- dir.enumerate_children (FILE_ATTRIBUTE_STANDARD_NAME,
91 -+ dir.enumerate_children (FileAttribute.STANDARD_NAME,
92 - FileQueryInfoFlags.NONE);
93 -
94 - FileInfo? file_info = enumerator.next_file ();
95 -diff --git a/tests/folks/object-cache.vala b/tests/folks/object-cache.vala
96 -index 62d208e6..f2a5188d 100644
97 ---- a/tests/folks/object-cache.vala
98 -+++ b/tests/folks/object-cache.vala
99 -@@ -108,7 +108,7 @@ public class ObjectCacheTests : Folks.TestCase
100 - {
101 - // Delete the files in the directory
102 - var enumerator =
103 -- dir.enumerate_children (FILE_ATTRIBUTE_STANDARD_NAME,
104 -+ dir.enumerate_children (FileAttribute.STANDARD_NAME,
105 - FileQueryInfoFlags.NONE);
106 -
107 - FileInfo? file_info = enumerator.next_file ();
108 ---
109 -2.21.0
110 -
111
112 diff --git a/dev-libs/folks/folks-0.11.4-r1.ebuild b/dev-libs/folks/folks-0.11.4-r1.ebuild
113 deleted file mode 100644
114 index 01e0bbbfc3f..00000000000
115 --- a/dev-libs/folks/folks-0.11.4-r1.ebuild
116 +++ /dev/null
117 @@ -1,94 +0,0 @@
118 -# Copyright 1999-2019 Gentoo Authors
119 -# Distributed under the terms of the GNU General Public License v2
120 -
121 -EAPI=6
122 -GNOME2_LA_PUNT="yes"
123 -VALA_USE_DEPEND="vapigen"
124 -VALA_MAX_API_VERSION="0.42"
125 -
126 -inherit gnome2 vala virtualx
127 -
128 -DESCRIPTION="Library for aggregating people from multiple sources"
129 -HOMEPAGE="https://wiki.gnome.org/Projects/Folks"
130 -
131 -LICENSE="LGPL-2.1+"
132 -SLOT="0/25" # subslot = libfolks soname version
133 -KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-linux"
134 -
135 -# TODO: --enable-profiling
136 -# Vala isn't really optional, https://bugzilla.gnome.org/show_bug.cgi?id=701099
137 -IUSE="bluetooth debug eds +telepathy test tracker utils"
138 -RESTRICT="!test? ( test )"
139 -REQUIRED_USE="bluetooth? ( eds )"
140 -
141 -COMMON_DEPEND="
142 - $(vala_depend)
143 - >=dev-libs/glib-2.40:2
144 - dev-libs/dbus-glib
145 - >=dev-libs/gobject-introspection-1.30:=
146 - >=dev-libs/libgee-0.10:0.8[introspection]
147 - dev-libs/libxml2
148 - sys-libs/ncurses:0=
149 - sys-libs/readline:0=
150 -
151 - bluetooth? ( >=net-wireless/bluez-5 )
152 - eds? ( >=gnome-extra/evolution-data-server-3.13.90:=[vala] )
153 - telepathy? ( >=net-libs/telepathy-glib-0.19.9[vala] )
154 - tracker? ( >=app-misc/tracker-1:0= )
155 -"
156 -# telepathy-mission-control needed at runtime; it is used by the telepathy
157 -# backend via telepathy-glib's AccountManager binding.
158 -RDEPEND="${COMMON_DEPEND}
159 - net-im/telepathy-mission-control
160 -"
161 -# folks socialweb backend requires that libsocialweb be built with USE=vala,
162 -# even when building folks with --disable-vala.
163 -#
164 -# FIXME:
165 -# test? ( bluetooth? ( dbusmock is missing in the tree ) )
166 -DEPEND="${COMMON_DEPEND}
167 - >=dev-util/intltool-0.50.0
168 - sys-devel/gettext
169 - virtual/pkgconfig
170 -
171 - test? (
172 - sys-apps/dbus
173 - bluetooth? (
174 - >=gnome-extra/evolution-data-server-3.9.1
175 - >=dev-libs/glib-2.40:2 ) )
176 -"
177 -
178 -PATCHES=(
179 - "${FILESDIR}"/${PV}-vala-0.42-compat.patch
180 - "${FILESDIR}"/${PV}-vala-0.42-tests-compat.patch
181 -)
182 -
183 -src_prepare() {
184 - # Force re-generation of introspection files, otherwise it does not match installed libs
185 - find -name "*.vala" -exec touch {} \; || die
186 -
187 - vala_src_prepare
188 - gnome2_src_prepare
189 -}
190 -
191 -src_configure() {
192 - # Rebuilding docs needs valadoc, which has no release
193 - gnome2_src_configure \
194 - $(use_enable bluetooth bluez-backend) \
195 - $(use_enable debug) \
196 - $(use_enable eds eds-backend) \
197 - $(use_enable eds ofono-backend) \
198 - $(use_enable telepathy telepathy-backend) \
199 - $(use_enable tracker tracker-backend) \
200 - $(use_enable utils inspect-tool) \
201 - $(use_enable test modular-tests) \
202 - --enable-vala \
203 - --enable-import-tool \
204 - --disable-docs \
205 - --disable-fatal-warnings \
206 - --disable-libsocialweb-backend
207 -}
208 -
209 -src_test() {
210 - dbus-launch virtx emake check
211 -}