From 7953e010b724806915f3ed0044ab71e5a26228bd Mon Sep 17 00:00:00 2001
From: Cameron Nemo <camerontnorman@gmail.com>
Date: Tue, 2 Apr 2019 21:35:47 -0700
Subject: [PATCH] vala: remove valadoc subpackage

---
 common/shlibs                                |  1 -
 srcpkgs/vala/patches/fix-valadoc-cross.patch | 36 ----------------
 srcpkgs/vala/template                        | 45 +++-----------------
 srcpkgs/valadoc                              |  1 -
 srcpkgs/valadoc-devel                        |  1 -
 5 files changed, 5 insertions(+), 79 deletions(-)
 delete mode 100644 srcpkgs/vala/patches/fix-valadoc-cross.patch
 delete mode 120000 srcpkgs/valadoc
 delete mode 120000 srcpkgs/valadoc-devel

diff --git a/common/shlibs b/common/shlibs
index 6ae05c18c71..8861690afe8 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2924,7 +2924,6 @@ libsysprof-ui-2.so sysprof-3.24.1_1
 libmozjs-52.so mozjs52-52.3.0_1
 libmozjs-52.so.0 mozjs52-52.3.0_1
 libvala-0.44.so.0 libvala-0.44.0_1
-libvaladoc-0.44.so.0 libvala-0.44.0_1
 libvalaccodegen.so libvala-0.44.0_1
 libphodav-2.0.so.0 phodav-2.2_1
 libgfshare.so.2 libgfshare-2.0.0_1
diff --git a/srcpkgs/vala/patches/fix-valadoc-cross.patch b/srcpkgs/vala/patches/fix-valadoc-cross.patch
deleted file mode 100644
index 0ab1a1b0cf7..00000000000
--- a/srcpkgs/vala/patches/fix-valadoc-cross.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-This check is broken in cross, see https://gitlab.gnome.org/GNOME/vala/issues/775
-
-We are sure that we have cgraph, so just hack around this for now.
-
-diff --git configure.ac configure.ac
-index 16ebd1f..df789b9 100644
---- configure.ac
-+++ configure.ac
-@@ -164,25 +164,8 @@ if test x$enable_valadoc = xyes; then
- 	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
--		]
--	)
-+	VALAFLAGS="$VALAFLAGS -D WITH_CGRAPH"
-+	have_cgraph=yes
- 	LIBADD="$cgraph_tmp_LIBADD"
- 	CFLAGS="$cgraph_tmp_CFLAGS"
- fi
diff --git a/srcpkgs/vala/template b/srcpkgs/vala/template
index 132fb62a47e..a2ff7f76417 100644
--- a/srcpkgs/vala/template
+++ b/srcpkgs/vala/template
@@ -1,10 +1,12 @@
 # Template file for 'vala'
 pkgname=vala
+# Should be kept in sync with 'valadoc' (shared distfiles)
 version=0.44.2
-revision=1
+revision=2
 build_style=gnu-configure
-hostmakedepends="flex libxslt pkg-config automake libtool"
-makedepends="libfl-devel libglib-devel graphviz-devel"
+configure_args="--disable-valadoc"
+hostmakedepends="flex libxslt pkg-config"
+makedepends="libfl-devel libglib-devel"
 checkdepends="dbus libgirepository-devel"
 short_desc="Compiler for the GObject type system"
 maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -15,17 +17,6 @@ distfiles="${GNOME_SITE}/vala/${version%.*}/vala-${version}.tar.xz"
 checksum=67d9bb4656d8fe04bcfc1ed7ff35d191df425923de46c921ae3c3d996eee8040
 shlib_provides="libvalaccodegen.so"
 
-# for valadoc
-if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+=" vala"
-else
-	make_build_args="VALAC="${XBPS_BUILDDIR}/${pkgname}-${version}/compiler/valac""
-fi
-
-pre_configure() {
-	autoreconf -if
-}
-
 post_install() {
 	# remove the /usr/bin prefix from the vapigen variable
 	# so the package that use it fall into our wrapper.
@@ -42,32 +33,6 @@ libvala_package() {
 	}
 }
 
-valadoc_package() {
-	short_desc+=" - valadoc shared library"
-	pkg_install() {
-		vmove usr/bin/valadoc
-		vmove "usr/bin/valadoc-*"
-		vmove "usr/lib/libvaladoc-*.so.*"
-		vmove usr/lib/valadoc
-		vmove usr/share/valadoc
-		vmove usr/share/man/man1/valadoc.1
-		vmove "usr/share/man/man1/valadoc-*.1"
-	}
-}
-
-valadoc-devel_package() {
-	depends="valadoc-${version}_${revision}
-	 vala-devel-${version}_${revision}"
-	short_desc+=" - valadoc development files"
-	pkg_install() {
-		vmove "usr/include/valadoc-*"
-		vmove "usr/lib/libvaladoc-*.so"
-		vmove "usr/lib/pkgconfig/valadoc-*.pc"
-		vmove "usr/share/vala/vapi/valadoc-*.deps"
-		vmove "usr/share/vala/vapi/valadoc-*.vapi"
-	}
-}
-
 vala-devel_package() {
 	depends="libglib-devel vala-${version}_${revision}"
 	short_desc+=" - vala development files"
diff --git a/srcpkgs/valadoc b/srcpkgs/valadoc
deleted file mode 120000
index fbf62fb5b24..00000000000
--- a/srcpkgs/valadoc
+++ /dev/null
@@ -1 +0,0 @@
-vala
\ No newline at end of file
diff --git a/srcpkgs/valadoc-devel b/srcpkgs/valadoc-devel
deleted file mode 120000
index fbf62fb5b24..00000000000
--- a/srcpkgs/valadoc-devel
+++ /dev/null
@@ -1 +0,0 @@
-vala
\ No newline at end of file