From 71deace00d1a2b091313fe137ab7092418c6f87c Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 10 Feb 2020 21:05:55 +0000 Subject: gentoo resync : 10.02.2020 --- dev-libs/libgdata/Manifest | 4 -- .../files/libgdata-0.17.8-disable-demos.patch | 60 ------------------- .../files/libgdata-0.17.9-ax2019-compat.patch | 20 ------- dev-libs/libgdata/libgdata-0.17.9-r1.ebuild | 70 ---------------------- 4 files changed, 154 deletions(-) delete mode 100644 dev-libs/libgdata/files/libgdata-0.17.8-disable-demos.patch delete mode 100644 dev-libs/libgdata/files/libgdata-0.17.9-ax2019-compat.patch delete mode 100644 dev-libs/libgdata/libgdata-0.17.9-r1.ebuild (limited to 'dev-libs/libgdata') diff --git a/dev-libs/libgdata/Manifest b/dev-libs/libgdata/Manifest index 86a3fab707e9..d12ca61f0e45 100644 --- a/dev-libs/libgdata/Manifest +++ b/dev-libs/libgdata/Manifest @@ -1,7 +1,3 @@ -AUX libgdata-0.17.8-disable-demos.patch 1941 BLAKE2B e8c3b0b558d3c446f3e383268b75bc17a2149cefaa2fe1005ed695b1d0c4bd66cf4a89a4ea4e11e598d044b1b8bf469f3ddf96f3365a5542ae138d4262752d57 SHA512 4df919d8b09ef0b1af0b47c3262e08faa158b99e444a5d7d4d1b19a2987883fbb9e3f1a6dc2f858b8d343fbd5c2d266c3e02a47ad310aee92d1a5b14983d8f55 -AUX libgdata-0.17.9-ax2019-compat.patch 788 BLAKE2B f08605ae9ba096ed20b08c324727be214de5b1746280881f3017e066dfbda6eabd3a83908964c17e6932fafccf0021cc3eb775d2523c1f5bf828d97371527702 SHA512 35eacb0e1af5ae35e458a44563f830a4f19798bc3423e5bbe5fef9df048a20fabfead94a597343b7b342b510fc9e21cdf8bc2a69d7b930cbcb6ffc8ab7cbc66f DIST libgdata-0.17.11.tar.xz 843948 BLAKE2B 8be79ea5840a585c5bdd5b51aa99401aedce0562ceaa98c7e323cdb2354384db635288d05c740993da49fa9c60c2cafab4e7c43ab82de4295afc0ca6b690d4dd SHA512 5abb00e6ebee1010fb6d9eab675e03d94883cac88e42b403a7d750bff73d65d0b35aae5c9e8f17a182819193b4a049ac7e9fc644ad9fa79872924ed5704c8982 -DIST libgdata-0.17.9.tar.xz 1434700 BLAKE2B e0b10bdd962aa5d294d75c15c3aa9187342cd85b9a28816fe5628864bc2236e10ee2765ed8123c8b90422f0394b342a2a144dc7ef844486193c8eec2a46cb17f SHA512 90289309cbdc4ec6932bf385ddbfcc75c0c2f8b9ca356329298aaa37f6c3db7a16de20e5c947c16c595e43e729a664e4d6d3e2c5a60bb1e463a13d1306f374ce EBUILD libgdata-0.17.11.ebuild 1771 BLAKE2B b349a241ea4bea39ca54817be50fb6c42d458dda0a65659d785bf1c02cde0278f3cc09715a788a2f6e76ce349dcdece372b741e1e718190c73d81bb0da5f3478 SHA512 3a386c1052b2cafcb559b008f58bf8a7b5e86766f2dde5ab292618dbfde0d507a1b42bf8c9471de93449b4e089a4a149e5d6ad8a648cbf32ac987c974211e750 -EBUILD libgdata-0.17.9-r1.ebuild 1783 BLAKE2B 770295ef5ffd64f457d43e473243628bb69a6688e8a323bd1078d42e731baa84219059d91565e5fe3d09c8eb99fad1b4ec27665ef9a587d2fb699505547ff9bf SHA512 65529ed7f972655a787d8a8b2d623df26f837b105ba0b3a3683d87c1bac235fdc8161526778464270b3fc70c4013dda513fd20d3811468aed9f6eade91429ec4 MISC metadata.xml 496 BLAKE2B c1ea319b0bfe89f579895ad4422216a26b3b8709d75bf9680278c22e3fa4e3e771f4573b89eb3db2704a33196149883f0c7028b7e39cdde833df510e350f560b SHA512 e12832d53a97dcaba6d2f669ece3ff9dbd504951a7539f00cce52e88e28d4c28034b203b9f1def27c812f39e5ad21532789b62cd0ab2814facf90b7b789e82dd 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 deleted file mode 100644 index fe06cee34281..000000000000 --- a/dev-libs/libgdata/files/libgdata-0.17.8-disable-demos.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 12fb11f46a7eb4054b74679a6f5ad12dcc41132d Mon Sep 17 00:00:00 2001 -From: Gilles Dartiguelongue -Date: Sun, 23 Jul 2017 20:46:19 +0200 -Subject: [PATCH] Control build of demos - -Building demos is not necessary for distributions. Allow disabling it -but keep it enabled by default. ---- - Makefile.am | 2 ++ - configure.ac | 7 +++++++ - 2 files changed, 9 insertions(+) - -diff --git a/Makefile.am b/Makefile.am -index 0e4cf631..8c0c7143 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -635,6 +635,7 @@ endif - CODE_COVERAGE_DIRECTORY = $(top_builddir)/gdata - CODE_COVERAGE_LCOV_OPTIONS = --base-directory $(abs_top_srcdir) - -+if ENABLE_BUILD_DEMOS - # Demo programs - noinst_PROGRAMS = \ - demos/youtube/youtube-cli \ -@@ -650,6 +651,7 @@ if HAVE_GTK - noinst_PROGRAMS += \ - demos/scrapbook/scrapbook - endif -+endif - - demos_docs_list_docs_list_SOURCES = \ - demos/docs-list/docs-list.c \ -diff --git a/configure.ac b/configure.ac -index 3b0530c3..1e09f277 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -152,6 +152,10 @@ AC_SUBST([GNOME_PACKAGES_PRIVATE]) - AC_SUBST([GNOME_PACKAGES]) - AC_SUBST([GOA_ENABLED]) - -+AC_ARG_ENABLE([build_demos], -+ AS_HELP_STRING([--enable-build-demos], -+ [Enable building demos (default: yes)]),, -+ [enable_build_demos=yes]) - AC_ARG_ENABLE([always_build_tests], - AS_HELP_STRING([--enable-always-build-tests], - [Enable always building tests (default: yes)]),, -@@ -161,6 +165,9 @@ AC_ARG_ENABLE([installed_tests], - [Install test programs (default: no)]),, - [enable_installed_tests=no]) - -+AM_CONDITIONAL([ENABLE_BUILD_DEMOS], -+ [test "$enable_build_demos" = "yes"]) -+ - AM_CONDITIONAL([ENABLE_ALWAYS_BUILD_TESTS], - [test "$enable_always_build_tests" = "yes"]) - AC_SUBST([ENABLE_ALWAYS_BUILD_TESTS],[$enable_always_build_tests]) --- -2.13.2 - 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 deleted file mode 100644 index c73e3f9eaee2..000000000000 --- a/dev-libs/libgdata/files/libgdata-0.17.9-ax2019-compat.patch +++ /dev/null @@ -1,20 +0,0 @@ -autoconf-archive-2019.01.06 breaks AX_CODE_COVERAGE usage by requiring -a different integration inside Makefile.am. This would be fine if the -local m4/ax_code_coverage.m4 would get used, but eaclocal parses out -the install from ACLOCAL_AMFLAGS, and calls aclocal with that, which -overwrites ax_code_coverage.m4 with the newer version, obviously -breaking the usage of all that in Makefile.am. -Workaround it by patching out the --install argument, thus using the -tarball copy of it (older version), which works with Makefile.am -without further patching. - ---- a/Makefile.am -+++ b/Makefile.am -@@ -1,6 +1,6 @@ - SUBDIRS = . po docs gdata/tests - --ACLOCAL_AMFLAGS = --install -I m4 ${ACLOCAL_FLAGS} -+ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} - - DISTCHECK_CONFIGURE_FLAGS = - MAINTAINERCLEANFILES = diff --git a/dev-libs/libgdata/libgdata-0.17.9-r1.ebuild b/dev-libs/libgdata/libgdata-0.17.9-r1.ebuild deleted file mode 100644 index c00287ed11ab..000000000000 --- a/dev-libs/libgdata/libgdata-0.17.9-r1.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -VALA_USE_DEPEND="vapigen" -GNOME2_EAUTORECONF="yes" - -inherit gnome2 vala - -DESCRIPTION="GLib-based library for accessing online service APIs using the GData protocol" -HOMEPAGE="https://wiki.gnome.org/Projects/libgdata" - -LICENSE="LGPL-2.1+" -SLOT="0/22" # subslot = libgdata soname version - -IUSE="+crypt gnome-online-accounts +introspection static-libs test vala" -RESTRICT="!test? ( test )" -REQUIRED_USE=" - gnome-online-accounts? ( crypt ) - vala? ( introspection ) -" - -KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~ppc ~ppc64 ~sparc x86" - -RDEPEND=" - >=dev-libs/glib-2.44.0:2 - >=dev-libs/json-glib-0.15[introspection?] - >=dev-libs/libxml2-2:2 - >=net-libs/liboauth-0.9.4 - >=net-libs/libsoup-2.55.90:2.4[introspection?] - >=x11-libs/gdk-pixbuf-2.14:2 - crypt? ( app-crypt/gcr:= ) - gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.8:=[introspection?,vala?] ) - introspection? ( >=dev-libs/gobject-introspection-0.9.7:= ) -" -DEPEND="${RDEPEND} - dev-util/glib-utils - >=dev-util/gtk-doc-am-1.25 - >=dev-util/intltool-0.40 - virtual/pkgconfig - test? ( >=net-libs/uhttpmock-0.5 ) - vala? ( $(vala_depend) ) -" - -PATCHES=( - "${FILESDIR}"/${PN}-0.17.8-disable-demos.patch - # don't overwrite m4/ax_* with newer breaking versions - "${FILESDIR}"/${P}-ax2019-compat.patch -) - -src_prepare() { - use vala && vala_src_prepare - gnome2_src_prepare -} - -src_configure() { - gnome2_src_configure \ - --disable-build-demos \ - $(use_enable crypt gnome) \ - $(use_enable gnome-online-accounts goa) \ - $(use_enable introspection) \ - $(use_enable vala) \ - $(use_enable static-libs static) \ - $(use_enable test always-build-tests) -} - -src_test() { - unset ORBIT_SOCKETDIR - dbus-run-session emake check -} -- cgit v1.2.3