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/libgdata/files/, dev-libs/libgdata/
Date: Sun, 09 Feb 2020 15:56:35
Message-Id: 1581263760.fb85e21e95169ebdf01b427b9922c6e45c756a26.leio@gentoo
1 commit: fb85e21e95169ebdf01b427b9922c6e45c756a26
2 Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
3 AuthorDate: Sun Feb 9 15:43:31 2020 +0000
4 Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
5 CommitDate: Sun Feb 9 15:56:00 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb85e21e
7
8 dev-libs/libgdata: remove old
9
10 Package-Manager: Portage-2.3.84, Repoman-2.3.20
11 Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>
12
13 dev-libs/libgdata/Manifest | 1 -
14 .../files/libgdata-0.17.8-disable-demos.patch | 60 -------------------
15 .../files/libgdata-0.17.9-ax2019-compat.patch | 20 -------
16 dev-libs/libgdata/libgdata-0.17.9-r1.ebuild | 70 ----------------------
17 4 files changed, 151 deletions(-)
18
19 diff --git a/dev-libs/libgdata/Manifest b/dev-libs/libgdata/Manifest
20 index 9d32ef866e9..09a94d47adf 100644
21 --- a/dev-libs/libgdata/Manifest
22 +++ b/dev-libs/libgdata/Manifest
23 @@ -1,2 +1 @@
24 DIST libgdata-0.17.11.tar.xz 843948 BLAKE2B 8be79ea5840a585c5bdd5b51aa99401aedce0562ceaa98c7e323cdb2354384db635288d05c740993da49fa9c60c2cafab4e7c43ab82de4295afc0ca6b690d4dd SHA512 5abb00e6ebee1010fb6d9eab675e03d94883cac88e42b403a7d750bff73d65d0b35aae5c9e8f17a182819193b4a049ac7e9fc644ad9fa79872924ed5704c8982
25 -DIST libgdata-0.17.9.tar.xz 1434700 BLAKE2B e0b10bdd962aa5d294d75c15c3aa9187342cd85b9a28816fe5628864bc2236e10ee2765ed8123c8b90422f0394b342a2a144dc7ef844486193c8eec2a46cb17f SHA512 90289309cbdc4ec6932bf385ddbfcc75c0c2f8b9ca356329298aaa37f6c3db7a16de20e5c947c16c595e43e729a664e4d6d3e2c5a60bb1e463a13d1306f374ce
26
27 diff --git a/dev-libs/libgdata/files/libgdata-0.17.8-disable-demos.patch b/dev-libs/libgdata/files/libgdata-0.17.8-disable-demos.patch
28 deleted file mode 100644
29 index fe06cee3428..00000000000
30 --- a/dev-libs/libgdata/files/libgdata-0.17.8-disable-demos.patch
31 +++ /dev/null
32 @@ -1,60 +0,0 @@
33 -From 12fb11f46a7eb4054b74679a6f5ad12dcc41132d Mon Sep 17 00:00:00 2001
34 -From: Gilles Dartiguelongue <eva@g.o>
35 -Date: Sun, 23 Jul 2017 20:46:19 +0200
36 -Subject: [PATCH] Control build of demos
37 -
38 -Building demos is not necessary for distributions. Allow disabling it
39 -but keep it enabled by default.
40 ----
41 - Makefile.am | 2 ++
42 - configure.ac | 7 +++++++
43 - 2 files changed, 9 insertions(+)
44 -
45 -diff --git a/Makefile.am b/Makefile.am
46 -index 0e4cf631..8c0c7143 100644
47 ---- a/Makefile.am
48 -+++ b/Makefile.am
49 -@@ -635,6 +635,7 @@ endif
50 - CODE_COVERAGE_DIRECTORY = $(top_builddir)/gdata
51 - CODE_COVERAGE_LCOV_OPTIONS = --base-directory $(abs_top_srcdir)
52 -
53 -+if ENABLE_BUILD_DEMOS
54 - # Demo programs
55 - noinst_PROGRAMS = \
56 - demos/youtube/youtube-cli \
57 -@@ -650,6 +651,7 @@ if HAVE_GTK
58 - noinst_PROGRAMS += \
59 - demos/scrapbook/scrapbook
60 - endif
61 -+endif
62 -
63 - demos_docs_list_docs_list_SOURCES = \
64 - demos/docs-list/docs-list.c \
65 -diff --git a/configure.ac b/configure.ac
66 -index 3b0530c3..1e09f277 100644
67 ---- a/configure.ac
68 -+++ b/configure.ac
69 -@@ -152,6 +152,10 @@ AC_SUBST([GNOME_PACKAGES_PRIVATE])
70 - AC_SUBST([GNOME_PACKAGES])
71 - AC_SUBST([GOA_ENABLED])
72 -
73 -+AC_ARG_ENABLE([build_demos],
74 -+ AS_HELP_STRING([--enable-build-demos],
75 -+ [Enable building demos (default: yes)]),,
76 -+ [enable_build_demos=yes])
77 - AC_ARG_ENABLE([always_build_tests],
78 - AS_HELP_STRING([--enable-always-build-tests],
79 - [Enable always building tests (default: yes)]),,
80 -@@ -161,6 +165,9 @@ AC_ARG_ENABLE([installed_tests],
81 - [Install test programs (default: no)]),,
82 - [enable_installed_tests=no])
83 -
84 -+AM_CONDITIONAL([ENABLE_BUILD_DEMOS],
85 -+ [test "$enable_build_demos" = "yes"])
86 -+
87 - AM_CONDITIONAL([ENABLE_ALWAYS_BUILD_TESTS],
88 - [test "$enable_always_build_tests" = "yes"])
89 - AC_SUBST([ENABLE_ALWAYS_BUILD_TESTS],[$enable_always_build_tests])
90 ---
91 -2.13.2
92 -
93
94 diff --git a/dev-libs/libgdata/files/libgdata-0.17.9-ax2019-compat.patch b/dev-libs/libgdata/files/libgdata-0.17.9-ax2019-compat.patch
95 deleted file mode 100644
96 index c73e3f9eaee..00000000000
97 --- a/dev-libs/libgdata/files/libgdata-0.17.9-ax2019-compat.patch
98 +++ /dev/null
99 @@ -1,20 +0,0 @@
100 -autoconf-archive-2019.01.06 breaks AX_CODE_COVERAGE usage by requiring
101 -a different integration inside Makefile.am. This would be fine if the
102 -local m4/ax_code_coverage.m4 would get used, but eaclocal parses out
103 -the install from ACLOCAL_AMFLAGS, and calls aclocal with that, which
104 -overwrites ax_code_coverage.m4 with the newer version, obviously
105 -breaking the usage of all that in Makefile.am.
106 -Workaround it by patching out the --install argument, thus using the
107 -tarball copy of it (older version), which works with Makefile.am
108 -without further patching.
109 -
110 ---- a/Makefile.am
111 -+++ b/Makefile.am
112 -@@ -1,6 +1,6 @@
113 - SUBDIRS = . po docs gdata/tests
114 -
115 --ACLOCAL_AMFLAGS = --install -I m4 ${ACLOCAL_FLAGS}
116 -+ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
117 -
118 - DISTCHECK_CONFIGURE_FLAGS =
119 - MAINTAINERCLEANFILES =
120
121 diff --git a/dev-libs/libgdata/libgdata-0.17.9-r1.ebuild b/dev-libs/libgdata/libgdata-0.17.9-r1.ebuild
122 deleted file mode 100644
123 index d6c15e99ff8..00000000000
124 --- a/dev-libs/libgdata/libgdata-0.17.9-r1.ebuild
125 +++ /dev/null
126 @@ -1,70 +0,0 @@
127 -# Copyright 1999-2020 Gentoo Authors
128 -# Distributed under the terms of the GNU General Public License v2
129 -
130 -EAPI=6
131 -VALA_USE_DEPEND="vapigen"
132 -GNOME2_EAUTORECONF="yes"
133 -
134 -inherit gnome2 vala
135 -
136 -DESCRIPTION="GLib-based library for accessing online service APIs using the GData protocol"
137 -HOMEPAGE="https://wiki.gnome.org/Projects/libgdata"
138 -
139 -LICENSE="LGPL-2.1+"
140 -SLOT="0/22" # subslot = libgdata soname version
141 -
142 -IUSE="+crypt gnome-online-accounts +introspection static-libs test vala"
143 -RESTRICT="!test? ( test )"
144 -REQUIRED_USE="
145 - gnome-online-accounts? ( crypt )
146 - vala? ( introspection )
147 -"
148 -
149 -KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
150 -
151 -RDEPEND="
152 - >=dev-libs/glib-2.44.0:2
153 - >=dev-libs/json-glib-0.15[introspection?]
154 - >=dev-libs/libxml2-2:2
155 - >=net-libs/liboauth-0.9.4
156 - >=net-libs/libsoup-2.55.90:2.4[introspection?]
157 - >=x11-libs/gdk-pixbuf-2.14:2
158 - crypt? ( app-crypt/gcr:= )
159 - gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.8:=[introspection?,vala?] )
160 - introspection? ( >=dev-libs/gobject-introspection-0.9.7:= )
161 -"
162 -DEPEND="${RDEPEND}
163 - dev-util/glib-utils
164 - >=dev-util/gtk-doc-am-1.25
165 - >=dev-util/intltool-0.40
166 - virtual/pkgconfig
167 - test? ( >=net-libs/uhttpmock-0.5 )
168 - vala? ( $(vala_depend) )
169 -"
170 -
171 -PATCHES=(
172 - "${FILESDIR}"/${PN}-0.17.8-disable-demos.patch
173 - # don't overwrite m4/ax_* with newer breaking versions
174 - "${FILESDIR}"/${P}-ax2019-compat.patch
175 -)
176 -
177 -src_prepare() {
178 - use vala && vala_src_prepare
179 - gnome2_src_prepare
180 -}
181 -
182 -src_configure() {
183 - gnome2_src_configure \
184 - --disable-build-demos \
185 - $(use_enable crypt gnome) \
186 - $(use_enable gnome-online-accounts goa) \
187 - $(use_enable introspection) \
188 - $(use_enable vala) \
189 - $(use_enable static-libs static) \
190 - $(use_enable test always-build-tests)
191 -}
192 -
193 -src_test() {
194 - unset ORBIT_SOCKETDIR
195 - dbus-run-session emake check
196 -}