* [gentoo-commits] repo/gentoo:master commit in: dev-libs/libgdata/files/, dev-libs/libgdata/
@ 2017-09-03 13:03 Gilles Dartiguelongue
0 siblings, 0 replies; 3+ messages in thread
From: Gilles Dartiguelongue @ 2017-09-03 13:03 UTC (permalink / raw
To: gentoo-commits
commit: dbea4c01baa8dbf5b479192fd3761214d3554022
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 3 12:51:40 2017 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sun Sep 3 13:03:29 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dbea4c01
dev-libs/libgdata: drop old revisions
The proper ones this time. Also fix email in patch.
Package-Manager: Portage-2.3.8, Repoman-2.3.3
.../files/libgdata-0.17.8-disable-demos.patch | 2 +-
dev-libs/libgdata/libgdata-0.17.8-r1.ebuild | 67 ----------------------
dev-libs/libgdata/libgdata-0.17.9.ebuild | 66 ---------------------
3 files changed, 1 insertion(+), 134 deletions(-)
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
index 5221b4e43f2..fe06cee3428 100644
--- a/dev-libs/libgdata/files/libgdata-0.17.8-disable-demos.patch
+++ b/dev-libs/libgdata/files/libgdata-0.17.8-disable-demos.patch
@@ -1,5 +1,5 @@
From 12fb11f46a7eb4054b74679a6f5ad12dcc41132d Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <g.dartiguelongue@lexfo.fr>
+From: Gilles Dartiguelongue <eva@gentoo.org>
Date: Sun, 23 Jul 2017 20:46:19 +0200
Subject: [PATCH] Control build of demos
diff --git a/dev-libs/libgdata/libgdata-0.17.8-r1.ebuild b/dev-libs/libgdata/libgdata-0.17.8-r1.ebuild
deleted file mode 100644
index 9a28a56d4cd..00000000000
--- a/dev-libs/libgdata/libgdata-0.17.8-r1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# 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"
-REQUIRED_USE="
- gnome-online-accounts? ( crypt )
- vala? ( introspection )
-"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-RDEPEND="
- >=dev-libs/glib-2.38.0:2
- >=dev-libs/json-glib-0.15
- >=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? ( >=dev-libs/gobject-introspection-0.9.7:= )
-"
-DEPEND="${RDEPEND}
- >=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}"/${P}-disable-demos.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
- export GSETTINGS_BACKEND="memory" #486412
- dbus-launch emake check
-}
diff --git a/dev-libs/libgdata/libgdata-0.17.9.ebuild b/dev-libs/libgdata/libgdata-0.17.9.ebuild
deleted file mode 100644
index 03f11210125..00000000000
--- a/dev-libs/libgdata/libgdata-0.17.9.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# 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"
-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
- >=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? ( >=dev-libs/gobject-introspection-0.9.7:= )
-"
-DEPEND="${RDEPEND}
- >=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
-)
-
-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
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/libgdata/files/, dev-libs/libgdata/
@ 2019-06-19 20:19 Mart Raudsepp
0 siblings, 0 replies; 3+ messages in thread
From: Mart Raudsepp @ 2019-06-19 20:19 UTC (permalink / raw
To: gentoo-commits
commit: eb482f5626e53bdee63ff4a45c982db493ccde21
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 19 20:14:33 2019 +0000
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Wed Jun 19 20:16:06 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb482f56
dev-libs/libgdata: fix build with newer autoconf-archive present
Workaround eaclocal overwriting the older ax_code_coverage.m4
provided by the tarball, stopping breakage when newer autoconf-archive
is present on the system.
Due to all necessary ax_*.m4 being present in the tarball, the
autoconf-archive build dep is also unnecessary (and now it doesn't
update the copies either anymore if it's present on the build system).
Closes: https://bugs.gentoo.org/686082
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>
.../files/libgdata-0.17.9-ax2019-compat.patch | 20 ++++++++++++++++++++
dev-libs/libgdata/libgdata-0.17.9-r1.ebuild | 4 ++--
2 files changed, 22 insertions(+), 2 deletions(-)
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
new file mode 100644
index 00000000000..c73e3f9eaee
--- /dev/null
+++ b/dev-libs/libgdata/files/libgdata-0.17.9-ax2019-compat.patch
@@ -0,0 +1,20 @@
+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
index 9ba51467475..f9f1ba47702 100644
--- a/dev-libs/libgdata/libgdata-0.17.9-r1.ebuild
+++ b/dev-libs/libgdata/libgdata-0.17.9-r1.ebuild
@@ -36,15 +36,15 @@ DEPEND="${RDEPEND}
dev-util/glib-utils
>=dev-util/gtk-doc-am-1.25
>=dev-util/intltool-0.40
- sys-devel/autoconf-archive
virtual/pkgconfig
test? ( >=net-libs/uhttpmock-0.5 )
vala? ( $(vala_depend) )
"
-# eautoreconf needs autoconf-archive
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() {
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/libgdata/files/, dev-libs/libgdata/
@ 2020-02-09 15:56 Mart Raudsepp
0 siblings, 0 replies; 3+ messages in thread
From: Mart Raudsepp @ 2020-02-09 15:56 UTC (permalink / raw
To: gentoo-commits
commit: fb85e21e95169ebdf01b427b9922c6e45c756a26
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 9 15:43:31 2020 +0000
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Sun Feb 9 15:56:00 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb85e21e
dev-libs/libgdata: remove old
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>
dev-libs/libgdata/Manifest | 1 -
.../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, 151 deletions(-)
diff --git a/dev-libs/libgdata/Manifest b/dev-libs/libgdata/Manifest
index 9d32ef866e9..09a94d47adf 100644
--- a/dev-libs/libgdata/Manifest
+++ b/dev-libs/libgdata/Manifest
@@ -1,2 +1 @@
DIST libgdata-0.17.11.tar.xz 843948 BLAKE2B 8be79ea5840a585c5bdd5b51aa99401aedce0562ceaa98c7e323cdb2354384db635288d05c740993da49fa9c60c2cafab4e7c43ab82de4295afc0ca6b690d4dd SHA512 5abb00e6ebee1010fb6d9eab675e03d94883cac88e42b403a7d750bff73d65d0b35aae5c9e8f17a182819193b4a049ac7e9fc644ad9fa79872924ed5704c8982
-DIST libgdata-0.17.9.tar.xz 1434700 BLAKE2B e0b10bdd962aa5d294d75c15c3aa9187342cd85b9a28816fe5628864bc2236e10ee2765ed8123c8b90422f0394b342a2a144dc7ef844486193c8eec2a46cb17f SHA512 90289309cbdc4ec6932bf385ddbfcc75c0c2f8b9ca356329298aaa37f6c3db7a16de20e5c947c16c595e43e729a664e4d6d3e2c5a60bb1e463a13d1306f374ce
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 fe06cee3428..00000000000
--- 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 <eva@gentoo.org>
-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 c73e3f9eaee..00000000000
--- 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 d6c15e99ff8..00000000000
--- a/dev-libs/libgdata/libgdata-0.17.9-r1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2020 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
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-02-09 15:56 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-06-19 20:19 [gentoo-commits] repo/gentoo:master commit in: dev-libs/libgdata/files/, dev-libs/libgdata/ Mart Raudsepp
-- strict thread matches above, loose matches on Subject: below --
2020-02-09 15:56 Mart Raudsepp
2017-09-03 13:03 Gilles Dartiguelongue
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox