gentoo resync : 04.05.2021

2 files changed, 0 insertions, 396 deletions

diff --git a/dev-lang/vala/files/0.40-Allow-disabling-the-build-of-valadoc.patch b/dev-lang/vala/files/0.40-Allow-disabling-the-build-of-valadoc.patch
deleted file mode 100644
index 55bcb7d63b05..000000000000
--- a/dev-lang/vala/files/0.40-Allow-disabling-the-build-of-valadoc.patch
+++ /dev/null
@@ -1,184 +0,0 @@
-From 1dae711f17473e12c822a657ffca02abee27b3a2 Mon Sep 17 00:00:00 2001
-From: Rico Tzschichholz <ricotz@ubuntu.com>
-Date: Sun, 27 Aug 2017 16:03:03 +0200
-Subject: [PATCH] build: Allow disabling the build of valadoc
-
-Allow disabling build of valadoc with configure option --disable-valadoc
-
-Fixes https://gitlab.gnome.org/GNOME/vala/issues/596
----
- Makefile.am     | 10 +++++++++
- configure.ac    | 59 ++++++++++++++++++++++++++-----------------------
- doc/Makefile.am | 17 +++++++++++++-
- 3 files changed, 57 insertions(+), 29 deletions(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index 88bef90ed..e4d46741f 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -13,9 +13,19 @@ SUBDIRS = \
- 	doc \
- 	gobject-introspection \
- 	vapigen \
-+	$(NULL)
-+
-+if ENABLE_VALADOC
-+SUBDIRS += \
- 	libvaladoc \
- 	valadoc \
- 	$(NULL)
-+endif
-+
-+DISTCHECK_CONFIGURE_FLAGS = \
-+	--enable-valadoc \
-+	--enable-unversioned \
-+	$(NULL)
- 
- if ENABLE_UNVERSIONED
- aclocaldir = $(datadir)/aclocal
-diff --git a/configure.ac b/configure.ac
-index 88ca0f94b..9d1c97417 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -119,35 +119,38 @@ PKG_CHECK_MODULES(GMODULE, gmodule-2.0 >= $GLIB_REQUIRED)
- AC_SUBST(GMODULE_CFLAGS)
- AC_SUBST(GMODULE_LIBS)
- 
--PKG_CHECK_MODULES(LIBGVC, libgvc >= $LIBGVC_REQUIRED)
--AC_MSG_CHECKING([for CGRAPH])
--cgraph_tmp_LIBADD="$LIBADD"
--cgraph_tmp_CFLAGS="$CFLAGS"
--LIBADD="$LIBADD $LIBGVC_LIBS"
--CFLAGS="$CFLAGS $LIBGVC_CFLAGS"
--AC_RUN_IFELSE(
--	[AC_LANG_SOURCE([
--		#include <gvc.h>
--
--		int main(void) {
--			#ifdef WITH_CGRAPH
--				return 0;
--			#else
--				return -1;
--			#endif
--		}
--	])], [
--		AC_MSG_RESULT([yes])
--		VALAFLAGS="$VALAFLAGS -D WITH_CGRAPH"
--		have_cgraph=yes
--	], [
--		AC_MSG_RESULT([no])
--		have_cgraph=no
--	]
--)
--LIBADD="$cgraph_tmp_LIBADD"
--CFLAGS="$cgraph_tmp_CFLAGS"
-+AC_ARG_ENABLE(valadoc, AS_HELP_STRING([--disable-valadoc], [Disable valadoc]), enable_valadoc=$enableval, enable_valadoc=yes)
-+if test x$enable_valadoc = xyes; then
-+	PKG_CHECK_MODULES(LIBGVC, libgvc >= $LIBGVC_REQUIRED)
-+	AC_MSG_CHECKING([for CGRAPH])
-+	cgraph_tmp_LIBADD="$LIBADD"
-+	cgraph_tmp_CFLAGS="$CFLAGS"
-+	LIBADD="$LIBADD $LIBGVC_LIBS"
-+	CFLAGS="$CFLAGS $LIBGVC_CFLAGS"
-+	AC_RUN_IFELSE(
-+		[AC_LANG_SOURCE([
-+			#include <gvc.h>
-+			int main(void) {
-+				#ifdef WITH_CGRAPH
-+					return 0;
-+				#else
-+					return -1;
-+				#endif
-+			}
-+		])], [
-+			AC_MSG_RESULT([yes])
-+			VALAFLAGS="$VALAFLAGS -D WITH_CGRAPH"
-+			have_cgraph=yes
-+		], [
-+			AC_MSG_RESULT([no])
-+			have_cgraph=no
-+		]
-+	)
-+	LIBADD="$cgraph_tmp_LIBADD"
-+	CFLAGS="$cgraph_tmp_CFLAGS"
-+fi
- AM_CONDITIONAL(HAVE_CGRAPH, test "$have_cgraph" = "yes")
-+AM_CONDITIONAL(ENABLE_VALADOC, test x$enable_valadoc = xyes)
- 
- AC_PATH_PROG([XSLTPROC], [xsltproc], :)
- AM_CONDITIONAL(HAVE_XSLTPROC, test "$XSLTPROC" != :)
-diff --git a/doc/Makefile.am b/doc/Makefile.am
-index 758ad733a..b79f229c4 100644
---- a/doc/Makefile.am
-+++ b/doc/Makefile.am
-@@ -6,11 +6,16 @@ SUBDIRS = \
- 
- dist_man_MANS = \
- 	valac.1 \
--	valadoc.1 \
- 	vala-gen-introspect.1 \
- 	vapigen.1 \
- 	$(NULL)
- 
-+if ENABLE_VALADOC
-+dist_man_MANS += \
-+	valadoc.1 \
-+	$(NULL)
-+endif
-+
- EXTRA_DIST = \
- 	valac.h2m \
- 	valadoc.h2m \
-@@ -19,7 +24,11 @@ EXTRA_DIST = \
- 	$(NULL)
- 
- if HAVE_HELP2MAN
-+if ENABLE_VALADOC
- manpages: valac.1 valadoc.1 vala-gen-introspect.1 vapigen.1
-+else
-+manpages: valac.1 vala-gen-introspect.1 vapigen.1
-+endif
- 	@rm $^
- 	$(MAKE) $(AM_MAKEFLAGS) $^
- 
-@@ -28,11 +37,13 @@ valac.1:
- 		--include $(srcdir)/valac.h2m \
- 		--libtool --no-info \
- 		--output=$@
-+if ENABLE_VALADOC
- valadoc.1:
- 	$(HELP2MAN) $(top_builddir)/valadoc/valadoc \
- 		--include $(srcdir)/valadoc.h2m \
- 		--libtool --no-info \
- 		--output=$@
-+endif
- vala-gen-introspect.1:
- 	$(HELP2MAN) $(top_builddir)/gobject-introspection/gen-introspect \
- 		--include $(srcdir)/vala-gen-introspect.h2m \
-@@ -49,12 +60,15 @@ endif
- if ENABLE_UNVERSIONED
- install-data-hook:
- 	cd $(DESTDIR)$(man1dir) && $(LN_S) -f valac@PACKAGE_SUFFIX@.1 valac.1
-+if ENABLE_VALADOC
- 	cd $(DESTDIR)$(man1dir) && $(LN_S) -f valadoc@PACKAGE_SUFFIX@.1 valadoc.1
-+endif
- 	cd $(DESTDIR)$(man1dir) && $(LN_S) -f vala-gen-introspect@PACKAGE_SUFFIX@.1 vala-gen-introspect.1
- 	cd $(DESTDIR)$(man1dir) && $(LN_S) -f vapigen@PACKAGE_SUFFIX@.1 vapigen.1
- endif
- 
- 
-+if ENABLE_VALADOC
- COMMON_VALADOCFLAGS = \
- 	--force \
- 	--verbose \
-@@ -130,6 +144,7 @@ internal-apis/valadoc: $(valadoc_VALASOURCES) internal-apis/codegen
- 	@touch $@
- 
- internal-api-docs: internal-apis/gee internal-apis/vala internal-apis/ccode internal-apis/codegen internal-apis/valadoc
-+endif
- 
- clean-local:
- 	rm -rf $(builddir)/internal-apis
--- 
-2.20.1
-
diff --git a/dev-lang/vala/files/0.40-valadoc-doclets-data-parallel-installable.patch b/dev-lang/vala/files/0.40-valadoc-doclets-data-parallel-installable.patch
deleted file mode 100644
index 1c9b44677e1e..000000000000
--- a/dev-lang/vala/files/0.40-valadoc-doclets-data-parallel-installable.patch
+++ /dev/null
@@ -1,212 +0,0 @@
-From 3dc5768c045c400ff522b8a510b789001aa93df4 Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@gentoo.org>
-Date: Fri, 4 Jan 2019 11:31:14 +0100
-Subject: [PATCH 2/2] Make valadoc doclets & data parallel installable
-
----
- libvaladoc/Makefile.am              | 12 ++++++++++--
- valadoc/Makefile.am                 |  7 ++++++-
- valadoc/doclets/devhelp/Makefile.am | 11 ++++++++---
- valadoc/doclets/gtkdoc/Makefile.am  | 11 ++++++++---
- valadoc/doclets/html/Makefile.am    | 11 ++++++++---
- valadoc/icons/Makefile.am           |  4 ++++
- valadoc/tests/Makefile.am           |  7 ++++++-
- 7 files changed, 50 insertions(+), 13 deletions(-)
-
-diff --git a/libvaladoc/Makefile.am b/libvaladoc/Makefile.am
-index f3f790e76..86875631b 100644
---- a/libvaladoc/Makefile.am
-+++ b/libvaladoc/Makefile.am
-@@ -3,8 +3,6 @@ include $(top_srcdir)/Makefile.common
- NULL =
- 
- AM_CFLAGS = \
--	-DPACKAGE_ICONDIR=\"$(datadir)/valadoc/icons/\" \
--	-DPACKAGE_DATADIR=\"$(libdir)/valadoc\" \
- 	-DPACKAGE_VERSION=\"$(VERSION)\" \
- 	$(COVERAGE_CFLAGS) \
- 	$(LIBGVC_CFLAGS) \
-@@ -16,6 +14,16 @@ AM_CFLAGS = \
- 	-I$(top_srcdir)/codegen \
- 	$(NULL)
- 
-+if ENABLE_UNVERSIONED
-+AM_CFLAGS += \
-+	-DPACKAGE_ICONDIR=\"$(datadir)/valadoc/icons/\" \
-+	-DPACKAGE_DATADIR=\"$(libdir)/valadoc\"
-+else
-+AM_CFLAGS += \
-+	-DPACKAGE_ICONDIR=\"$(datadir)/valadoc@PACKAGE_SUFFIX@/icons/\" \
-+	-DPACKAGE_DATADIR=\"$(libdir)/valadoc@PACKAGE_SUFFIX@\"
-+endif
-+
- AM_VALAFLAGS = \
- 	$(NULL)
- 
-diff --git a/valadoc/Makefile.am b/valadoc/Makefile.am
-index 33f3a9375..2f3dec848 100644
---- a/valadoc/Makefile.am
-+++ b/valadoc/Makefile.am
-@@ -9,7 +9,6 @@ SUBDIRS = \
- 	$(NULL)
- 
- AM_CFLAGS = \
--	-DPACKAGE_DATADIR=\"$(libdir)/valadoc\" \
- 	-DPACKAGE_VERSION=\"$(VERSION)\" \
- 	-I$(top_srcdir)/libvaladoc/ \
- 	-I$(top_srcdir)/gee \
-@@ -22,6 +21,12 @@ AM_CFLAGS = \
- 	$(LIBGVC_CFLAGS) \
- 	$(NULL)
- 
-+if ENABLE_UNVERSIONED
-+AM_CFLAGS += -DPACKAGE_DATADIR=\"$(libdir)/valadoc\"
-+else
-+AM_CFLAGS += -DPACKAGE_DATADIR=\"$(libdir)/valadoc@PACKAGE_SUFFIX@\"
-+endif
-+
- BUILT_SOURCES = valadoc.vala.stamp
- 
- bin_PROGRAMS = valadoc
-diff --git a/valadoc/doclets/devhelp/Makefile.am b/valadoc/doclets/devhelp/Makefile.am
-index 5783c0b5a..afbb8f7f9 100644
---- a/valadoc/doclets/devhelp/Makefile.am
-+++ b/valadoc/doclets/devhelp/Makefile.am
-@@ -3,7 +3,6 @@ include $(top_srcdir)/Makefile.common
- NULL =
- 
- AM_CFLAGS = \
--	-DPACKAGE_ICONDIR=\"$(datadir)/valadoc/icons/\" \
- 	-I$(top_srcdir)/gee/ \
- 	-I$(top_srcdir)/vala/ \
- 	-I$(top_srcdir)/libvaladoc/ \
-@@ -12,12 +11,18 @@ AM_CFLAGS = \
- 	$(LIBGVC_CFLAGS) \
- 	$(NULL)
- 
-+if ENABLE_UNVERSIONED
-+AM_CFLAGS += -DPACKAGE_ICONDIR=\"$(datadir)/valadoc/icons/\"
-+docletdir = $(libdir)/valadoc/doclets/devhelp
-+else
-+AM_CFLAGS += -DPACKAGE_ICONDIR=\"$(datadir)/valadoc@PACKAGE_SUFFIX@/icons/\"
-+docletdir = $(libdir)/valadoc@PACKAGE_SUFFIX@/doclets/devhelp
-+endif
-+
- BUILT_SOURCES = libdoclet.vala.stamp
- 
- doclet_LTLIBRARIES = libdoclet.la
- 
--docletdir = $(libdir)/valadoc/doclets/devhelp
--
- libdoclet_la_LDFLAGS = -module -avoid-version -no-undefined
- 
- libdoclet_la_VALASOURCES = \
-diff --git a/valadoc/doclets/gtkdoc/Makefile.am b/valadoc/doclets/gtkdoc/Makefile.am
-index 763e46932..f689018ce 100644
---- a/valadoc/doclets/gtkdoc/Makefile.am
-+++ b/valadoc/doclets/gtkdoc/Makefile.am
-@@ -3,7 +3,6 @@ include $(top_srcdir)/Makefile.common
- NULL =
- 
- AM_CFLAGS = \
--	-DPACKAGE_ICONDIR=\"$(datadir)/valadoc/icons/\" \
- 	-I$(top_srcdir)/gee/ \
- 	-I$(top_srcdir)/vala/ \
- 	-I$(top_srcdir)/libvaladoc/ \
-@@ -12,12 +11,18 @@ AM_CFLAGS = \
- 	$(LIBGVC_CFLAGS) \
- 	$(NULL)
- 
-+if ENABLE_UNVERSIONED
-+AM_CFLAGS += -DPACKAGE_ICONDIR=\"$(datadir)/valadoc/icons/\"
-+docletdir = $(libdir)/valadoc/doclets/gtkdoc
-+else
-+AM_CFLAGS += -DPACKAGE_ICONDIR=\"$(datadir)/valadoc@PACKAGE_SUFFIX@/icons/\"
-+docletdir = $(libdir)/valadoc@PACKAGE_SUFFIX@/doclets/gtkdoc
-+endif
-+
- BUILT_SOURCES = libdoclet.vala.stamp
- 
- doclet_LTLIBRARIES = libdoclet.la
- 
--docletdir = $(libdir)/valadoc/doclets/gtkdoc
--
- libdoclet_la_LDFLAGS = -module -avoid-version -no-undefined
- 
- libdoclet_la_VALASOURCES = \
-diff --git a/valadoc/doclets/html/Makefile.am b/valadoc/doclets/html/Makefile.am
-index 885fbfbab..855184020 100644
---- a/valadoc/doclets/html/Makefile.am
-+++ b/valadoc/doclets/html/Makefile.am
-@@ -3,7 +3,6 @@ include $(top_srcdir)/Makefile.common
- NULL =
- 
- AM_CFLAGS = \
--	-DPACKAGE_ICONDIR=\"$(datadir)/valadoc/icons/\" \
- 	-I$(top_srcdir)/gee/ \
- 	-I$(top_srcdir)/vala/ \
- 	-I$(top_srcdir)/libvaladoc/ \
-@@ -12,12 +11,18 @@ AM_CFLAGS = \
- 	$(LIBGVC_CFLAGS) \
- 	$(NULL)
- 
-+if ENABLE_UNVERSIONED
-+AM_CFLAGS += -DPACKAGE_ICONDIR=\"$(datadir)/valadoc/icons/\"
-+docletdir = $(libdir)/valadoc/doclets/html
-+else
-+AM_CFLAGS += -DPACKAGE_ICONDIR=\"$(datadir)/valadoc@PACKAGE_SUFFIX@/icons/\"
-+docletdir = $(libdir)/valadoc@PACKAGE_SUFFIX@/doclets/html
-+endif
-+
- BUILT_SOURCES = libdoclet.vala.stamp
- 
- doclet_LTLIBRARIES = libdoclet.la
- 
--docletdir = $(libdir)/valadoc/doclets/html
--
- libdoclet_la_LDFLAGS = -module -avoid-version -no-undefined
- 
- libdoclet_la_VALASOURCES = \
-diff --git a/valadoc/icons/Makefile.am b/valadoc/icons/Makefile.am
-index 454bdba7c..668956f3b 100644
---- a/valadoc/icons/Makefile.am
-+++ b/valadoc/icons/Makefile.am
-@@ -1,6 +1,10 @@
- NULL =
- 
-+if ENABLE_UNVERSIONED
- iconsdir = $(datadir)/valadoc/icons
-+else
-+iconsdir = $(datadir)/valadoc@PACKAGE_SUFFIX@/icons
-+endif
- 
- dist_icons_DATA = \
- 	abstractclass.png \
-diff --git a/valadoc/tests/Makefile.am b/valadoc/tests/Makefile.am
-index e40cc1ca3..2bca58128 100644
---- a/valadoc/tests/Makefile.am
-+++ b/valadoc/tests/Makefile.am
-@@ -22,7 +22,6 @@ check-TESTS: $(TESTS)
- 	G_DEBUG=fatal_warnings $(builddir)/driver
- 
- AM_CFLAGS = \
--	-DPACKAGE_DATADIR=\"$(libdir)/valadoc\" \
- 	-DPACKAGE_VERSION=\"$(VERSION)\" \
- 	-DTOP_SRC_DIR=\"$(abs_top_srcdir)\" \
- 	-I$(top_srcdir)/libvaladoc/ \
-@@ -36,6 +35,12 @@ AM_CFLAGS = \
- 	$(LIBGVC_CFLAGS) \
- 	$(NULL)
- 
-+if ENABLE_UNVERSIONED
-+AM_CFLAGS += -DPACKAGE_DATADIR=\"$(libdir)/valadoc\"
-+else
-+AM_CFLAGS += -DPACKAGE_DATADIR=\"$(libdir)/valadoc@PACKAGE_SUFFIX@\"
-+endif
-+
- BUILT_SOURCES = driver.vala.stamp
- 
- check_PROGRAMS = driver
--- 
-2.20.1
-