gentoo resync : 29.12.2022

8 files changed, 154 insertions, 324 deletions

diff --git a/dev-util/anjuta/Manifest b/dev-util/anjuta/Manifest
index 172f4c5ac851..55d468eea2c5 100644
--- a/dev-util/anjuta/Manifest
+++ b/dev-util/anjuta/Manifest
@@ -1,6 +1,4 @@
-AUX 3.34.0-Add-new-vala-support.patch 5592 BLAKE2B e1e2a86370e30ecbf8d165d151d77d743e83db068d22db412d31ab199908b79dce589c94e0f1f4772073b19a8b8359b5352a5758ba7910684a94521594f758c9 SHA512 587acb7698e501edacd66c31daa9b34b30316e33b19caeb781ae6f6f929051de138840e13c8688a6a28dc0b9789d0bbc5fa39767376d20f86ee2ec0f12ad93f2
-AUX 3.34.0-autoconf-2.70.patch 405 BLAKE2B 570dcc0a005ec3d00d51f93fa83e0111c973f9257035bfe272df2d06d1aefdb0994189f2dfabc1b8f47477d2e182093250320fe37518509f0197ad69611ecfda SHA512 7237dfb3ee179b7eb08986ae3dfcfc36cf3b19b6a9bf7a34f8c92541139dbe50efb4223422093daaa6d6dad8afd40b34898ffa47606eb3993890a050c302d697
-AUX 3.34.0-prefer-newer-vala.patch 575 BLAKE2B bc6ab14bd75ce3e78a25e9f10ce413c579394b1e21b2c4c0e7a650518ed4b33b5ebf1e8ece0900da59bb1d4c13802b75f648182f35c8e08a369e23db71b50102 SHA512 9d60140e1d45e5a19e63c17fd394ec3b0385d924c45096e949c3e97e091c4cf5941838ba7c93a29e0ea0415e30d7b500df507994a292b434bc113730d5f1b989
+AUX 3.34.0-minimal.patch 2138 BLAKE2B 41037795c47486efc9dbb12aabe0ca728434bdb2ea9356ae366d4264da99af89392c1ec2a7f96ca07ced508f387b2621e02d32dddf8338633bd8f23c41e26bde SHA512 b5891ed86135fa37d6c44d406cb27cdcfea4864d86c4b570e68784f85c704754671c7f24c8cc4b7c1e25ea076fd5d34ee25aa47a95492f3fc9718d942f878405
 DIST anjuta-3.34.0.tar.xz 6420472 BLAKE2B a5e10ea3bb60499e54def8d1b78603b0c809167ad03a3e11f9dbd031514f1a7cb566d9c7694be23fe3165e617fbfc3d1e6ce36f7dc8c0672044f26390aed6d5a SHA512 9d5a4c23751893ff7e21cd55c1f112f27b53fe2ea5ac645c63e2da627efce202b88696e3e5d860ad75a5c13c88a9082775d74f4482208161b5e63d56c4004d57
-EBUILD anjuta-3.34.0-r1.ebuild 4063 BLAKE2B b44d24ddc03aba8786e6489e317ff7c85e4578aef2aeb60cbb5752f182d390ed1f2a98c43394760e4d48b2261e28520128d244b2e6d47c65ab46692947ee62f0 SHA512 a59512d5b2f4b30defb53b3aaabe02de79f344d07b2086db7e2db2d7c3b6b52059ce56b7e7397783c5913058ec2d197c6021a42db6d06ee4f82bcb4f13f07eca
-MISC metadata.xml 479 BLAKE2B 835d7f1bb344f60741f4c321f00945e5b6f9b218950ce306fecde0872cb6fffa74b0111ca574ab0d6682ecc5d7652d2eb7dd832aa99fa14a051be11cc7497815 SHA512 ee53cce21511e34a320573900d2b77364409249b7a14ecb84e6acdb8291e42edc3a9287b0789b1c6a3ee37edd8910b852ca14ddb64e51b8258d16fed90611ec2
+EBUILD anjuta-3.34.0-r2.ebuild 1160 BLAKE2B 7f9b0cfff137c554885b245bd30d38a85ed8f04b0f31ee88c59d8486eafd763b8776292d5e71cd23749b7b36a6ad232fdb7b5daf7a3f344c3737074bf58369ed SHA512 07566b116f955d7d076d86de997b9e387aa93510731a7eabe53c4483f05127ebc6fe8aa39b17e0e5bdffe81242b70b21c53e6334943652b57ed4ce2ff6e86b08
+MISC metadata.xml 530 BLAKE2B 184247b0d5cf4d07ca22f1a4fd2c9a25ae7972eb13ec6e8d216467e5334a1f1335f64a7eccb5d72d0a03843d9eb19e3c79971d75cb27f90e06cd5c4433e36a25 SHA512 c922564bdb867fd722886a8bc67967440e0c80d55e5fe59b4b735a6542d0d913c5f671f0d4876c1441fc83858d852b54193c8a5030389388b15d65f797255baf
diff --git a/dev-util/anjuta/anjuta-3.34.0-r1.ebuild b/dev-util/anjuta/anjuta-3.34.0-r1.ebuild
deleted file mode 100644
index 43ee21d824b3..000000000000
--- a/dev-util/anjuta/anjuta-3.34.0-r1.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{8..10} )
-# libanjuta-language-vala.so links to a specific slot of libvala; we want to
-# avoid automagic behavior.
-VALA_MIN_API_VERSION="0.56"
-VALA_MAX_API_VERSION="${VALA_MIN_API_VERSION}"
-
-GNOME2_EAUTORECONF="yes"
-inherit gnome2 flag-o-matic readme.gentoo-r1 python-single-r1 vala
-
-DESCRIPTION="A versatile IDE for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Anjuta https://gitlab.gnome.org/GNOME/anjuta/"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-
-IUSE="debug devhelp glade +introspection subversion terminal test vala"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# FIXME: automagically uses gnome-extra/libgda:6 if available
-# FIXME: make python dependency non-automagic
-COMMON_DEPEND="
-	>=dev-libs/glib-2.34:2[dbus]
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-3.10:3
-	>=dev-libs/libxml2-2.4.23
-	>=dev-libs/gdl-3.5.5:3=
-	>=x11-libs/gtksourceview-3:3.0
-
-	sys-devel/autogen
-
-	>=gnome-extra/libgda-5:5=
-	dev-util/ctags
-
-	x11-libs/libXext
-	x11-libs/libXrender
-
-	${PYTHON_DEPS}
-
-	devhelp? ( >=dev-util/devhelp-3.7.4:= )
-	glade? ( >=dev-util/glade-3.12:3.10= )
-	introspection? ( >=dev-libs/gobject-introspection-0.9.5:= )
-	subversion? (
-		>=dev-vcs/subversion-1.8:=
-		>=net-libs/serf-1.2:1=
-		>=dev-libs/apr-1:=
-		>=dev-libs/apr-util-1:= )
-	terminal? ( >=x11-libs/vte-0.27.6:2.91 )
-	vala? ( $(vala_depend) )
-"
-# python plugins need pygobject and introspection; we have introspection optional, so while this is all a bit of a mess,
-# restrict the pygobject dep to when python plugins can work in the build (the python loader explicitly imports gi.repository.Anjuta)
-RDEPEND="${COMMON_DEPEND}
-	introspection? (
-		$(python_gen_cond_dep '
-			>=dev-python/pygobject-3.2:3[${PYTHON_USEDEP}]
-		')
-	)
-	gnome-base/gsettings-desktop-schemas
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-lang/perl-5
-	>=dev-util/gtk-doc-am-1.4
-	>=dev-util/intltool-0.40.1
-	sys-devel/bison
-	sys-devel/flex
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-	test? (
-		app-text/docbook-xml-dtd:4.1.2
-		app-text/docbook-xml-dtd:4.5 )
-	app-text/yelp-tools
-	dev-libs/gobject-introspection-common
-	gnome-base/gnome-common
-"
-# yelp-tools, gi-common and gnome-common are required by eautoreconf
-
-PATCHES=(
-	"${FILESDIR}"/${PV}-Add-new-vala-support.patch
-	"${FILESDIR}"/${PV}-autoconf-2.70.patch
-	"${FILESDIR}"/${PV}-prefer-newer-vala.patch
-)
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	if use vala; then
-		DISABLE_AUTOFORMATTING="yes"
-		DOC_CONTENTS="To create a generic vala project you will need to specify
-desired valac versioned binary to be used, to do that you
-will need to:
-1. Go to 'Build' -> 'Configure project'
-2. Add 'VALAC=/usr/bin/valac-X.XX' (respecting quotes) to
-'Configure options'."
-	fi
-
-	# COPYING is used in Anjuta's help/about entry
-	DOCS="AUTHORS ChangeLog COPYING FUTURE MAINTAINERS NEWS README ROADMAP THANKS TODO"
-
-	# Conflicts with -pg in a plugin, bug #266777
-	filter-flags -fomit-frame-pointer
-
-	# Do not build benchmarks, they are not installed and for dev purpose only
-	sed -e '/SUBDIRS =/ s/benchmark//' \
-		-i plugins/symbol-db/Makefile.{am,in} || die
-
-	use vala && vala_setup
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-neon \
-		--disable-static \
-		$(use_enable debug) \
-		$(use_enable devhelp plugin-devhelp) \
-		$(use_enable glade plugin-glade) \
-		$(use_enable glade glade-catalog) \
-		$(use_enable introspection) \
-		--disable-packagekit \
-		$(use_enable subversion plugin-subversion) \
-		$(use_enable subversion serf) \
-		$(use_enable terminal plugin-terminal) \
-		$(use_enable vala)
-}
-
-src_install() {
-	# COPYING is used in Anjuta's help/about entry
-	docompress -x "/usr/share/doc/${PF}/COPYING"
-
-	# Anjuta uses a custom rule to install DOCS, get rid of it
-	gnome2_src_install
-	rm -rf "${ED}"/usr/share/doc/${PN} || die "rm failed"
-
-	use vala && readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	use vala && readme.gentoo_print_elog
-}
diff --git a/dev-util/anjuta/anjuta-3.34.0-r2.ebuild b/dev-util/anjuta/anjuta-3.34.0-r2.ebuild
new file mode 100644
index 000000000000..fad8dc7ade3c
--- /dev/null
+++ b/dev-util/anjuta/anjuta-3.34.0-r2.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome2
+
+DESCRIPTION="Base library of defunct IDE for GNOME to run applications"
+HOMEPAGE="https://wiki.gnome.org/Apps/Anjuta https://gitlab.gnome.org/Archive/anjuta"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+
+DEPEND="
+	>=dev-libs/gdl-3.5.5:3=
+	>=dev-libs/glib-2.34:2[dbus]
+	>=dev-libs/libxml2-2.4.23
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/gtk+-3.10:3
+	x11-libs/pango
+"
+RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PV}-minimal.patch
+)
+
+LA="libanjuta-${PV%%.*}.la"
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-debug \
+		--disable-introspection \
+		--disable-neon \
+		--disable-nls \
+		--disable-plugin-subversion \
+		--disable-serf \
+		--disable-static
+}
+
+src_compile() {
+	emake -C libanjuta/interfaces libanjuta-interfaces.la
+	emake -C libanjuta ${LA}
+}
+
+src_install() {
+	emake DESTDIR="${D}" -C libanjuta install-am
+	emake DESTDIR="${D}" -C libanjuta/interfaces install-am
+	emake DESTDIR="${D}" -C src install-dist_anjuta_pixmapsDATA
+	rm -v "${ED}"/usr/$(get_libdir)/${LA} || die
+}
diff --git a/dev-util/anjuta/files/3.34.0-Add-new-vala-support.patch b/dev-util/anjuta/files/3.34.0-Add-new-vala-support.patch
deleted file mode 100644
index 219a0308121b..000000000000
--- a/dev-util/anjuta/files/3.34.0-Add-new-vala-support.patch
+++ /dev/null
@@ -1,132 +0,0 @@
-This is a combination of 7 upstream commits:
-
-build: Allow building with vala 0.46 and drop support for 0.30 and earlier
-language-support-vala: Support for vala 0.48 API
-build: Allow building with vala 0.48
-build: Allow building with vala 0.50
-build: Allow building with vala 0.50 and 0.52
-build: Allow building with vala 0.54
-build: Allow building with vala 0.56
----
- configure.ac                              |  4 +--
- plugins/language-support-vala/plugin.vala | 37 ++++++++++++++++++-----
- 2 files changed, 31 insertions(+), 10 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 3b4c99504..4fbad5392 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -338,7 +338,7 @@ if test "$user_disabled_vala" = 1; then
- else
-         AC_MSG_RESULT(no)
- 	AC_MSG_CHECKING(if libvala is available)
--	m4_foreach([VERSION], [[0.44], [0.42], [0.40], [0.38], [0.36], [0.34], [0.32], [0.30], [0.28], [0.26], [0.24], [0.22], [0.20], [0.18]],
-+	m4_foreach_w([VERSION], [0.56 0.54 0.52 0.50 0.48 0.46 0.44 0.42 0.40 0.38 0.36 0.34 0.32],
- 		[PKG_CHECK_EXISTS([ libvala-VERSION ],
- 			 [ valaver="-VERSION" ])
- 			 ])
-@@ -350,7 +350,7 @@ else
- 	else
- 		AC_MSG_RESULT(no)
- 		enable_vala="no"
--		VALA_REQUIRED=0.18.0
-+		VALA_REQUIRED=0.32.0
- 	fi
- 	AC_SUBST(LIBVALA)
- fi
-diff --git a/plugins/language-support-vala/plugin.vala b/plugins/language-support-vala/plugin.vala
-index 13d35fec4..d94634c7f 100644
---- a/plugins/language-support-vala/plugin.vala
-+++ b/plugins/language-support-vala/plugin.vala
-@@ -78,7 +78,11 @@ public class ValaPlugin : Plugin, IAnjuta.Preferences {
- 
- 	void init_context () {
- 		context = new Vala.CodeContext();
-+#if VALA_0_50
-+		context.set_target_profile (Vala.Profile.GOBJECT);
-+#else
- 		context.profile = Vala.Profile.GOBJECT;
-+#endif
- 		context.report = report;
- 		report.clear_error_indicators ();
- 
-@@ -414,11 +418,19 @@ public class ValaPlugin : Plugin, IAnjuta.Preferences {
- 			builder.append_printf ("%s sender", widget.get_full_name ());
- 
- 			foreach (var param in sig.get_parameters ()) {
-+#if VALA_0_48
-+				builder.append_printf (", %s %s", param.variable_type.type_symbol.get_full_name (), param.name);
-+#else
- 				builder.append_printf (", %s %s", param.variable_type.data_type.get_full_name (), param.name);
-+#endif
- 			}
- 		} else {
- 			foreach (var param in sig.get_parameters ()) {
-+#if VALA_0_48
-+				builder.append_printf ("%s %s, ", param.variable_type.type_symbol.get_full_name (), param.name);
-+#else
- 				builder.append_printf ("%s %s, ", param.variable_type.data_type.get_full_name (), param.name);
-+#endif
- 			}
- 
- 			builder.append_printf ("%s sender", widget.get_full_name ());
-@@ -563,6 +575,15 @@ public class ValaPlugin : Plugin, IAnjuta.Preferences {
- 		}
- 		return matching_symbols;
- 	}
-+
-+	inline List<Vala.Symbol> symbol_lookup_inherited_for_type (Vala.DataType data_type, string name, bool prefix_match, bool invocation = false) {
-+#if VALA_0_48
-+		return symbol_lookup_inherited (data_type.type_symbol, name, prefix_match, invocation);
-+#else
-+		return symbol_lookup_inherited (data_type.data_type, name, prefix_match, invocation);
-+#endif
-+	}
-+
- 	List<Vala.Symbol> symbol_lookup_inherited (Vala.Symbol? sym, string name, bool prefix_match, bool invocation = false) {
- 		List<Vala.Symbol> result = null;
- 
-@@ -580,32 +601,32 @@ public class ValaPlugin : Plugin, IAnjuta.Preferences {
- 		}
- 		if (invocation && sym is Vala.Method) {
- 			var func = (Vala.Method) sym;
--			result.concat (symbol_lookup_inherited (func.return_type.data_type, name, prefix_match));
-+			result.concat (symbol_lookup_inherited_for_type (func.return_type, name, prefix_match));
- 		} else if (sym is Vala.Class) {
- 			var cl = (Vala.Class) sym;
- 			foreach (var base_type in cl.get_base_types ()) {
--				result.concat (symbol_lookup_inherited (base_type.data_type, name, prefix_match));
-+				result.concat (symbol_lookup_inherited_for_type (base_type, name, prefix_match));
- 			}
- 		} else if (sym is Vala.Struct) {
- 			var st = (Vala.Struct) sym;
--			result.concat (symbol_lookup_inherited (st.base_type.data_type, name, prefix_match));
-+			result.concat (symbol_lookup_inherited_for_type (st.base_type, name, prefix_match));
- 		} else if (sym is Vala.Interface) {
- 			var iface = (Vala.Interface) sym;
- 			foreach (var prerequisite in iface.get_prerequisites ()) {
--				result.concat (symbol_lookup_inherited (prerequisite.data_type, name, prefix_match));
-+				result.concat (symbol_lookup_inherited_for_type (prerequisite, name, prefix_match));
- 			}
- 		} else if (sym is Vala.LocalVariable) {
- 			var variable = (Vala.LocalVariable) sym;
--			result.concat (symbol_lookup_inherited (variable.variable_type.data_type, name, prefix_match));
-+			result.concat (symbol_lookup_inherited_for_type (variable.variable_type, name, prefix_match));
- 		} else if (sym is Vala.Field) {
- 			var field = (Vala.Field) sym;
--			result.concat (symbol_lookup_inherited (field.variable_type.data_type, name, prefix_match));
-+			result.concat (symbol_lookup_inherited_for_type (field.variable_type, name, prefix_match));
- 		} else if (sym is Vala.Property) {
- 			var prop = (Vala.Property) sym;
--			result.concat (symbol_lookup_inherited (prop.property_type.data_type, name, prefix_match));
-+			result.concat (symbol_lookup_inherited_for_type (prop.property_type, name, prefix_match));
- 		} else if (sym is Vala.Parameter) {
- 			var fp = (Vala.Parameter) sym;
--			result.concat (symbol_lookup_inherited (fp.variable_type.data_type, name, prefix_match));
-+			result.concat (symbol_lookup_inherited_for_type (fp.variable_type, name, prefix_match));
- 		}
- 
- 		return result;
--- 
-2.35.1
-
diff --git a/dev-util/anjuta/files/3.34.0-autoconf-2.70.patch b/dev-util/anjuta/files/3.34.0-autoconf-2.70.patch
deleted file mode 100644
index fdcc9e3158bf..000000000000
--- a/dev-util/anjuta/files/3.34.0-autoconf-2.70.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-https://gitlab.gnome.org/GNOME/anjuta/-/merge_requests/13
-
-diff --git a/configure.ac b/configure.ac
-index c637f9cf3..4b101c35e 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -85,8 +85,6 @@ case "$YACC" in
-     AC_MSG_ERROR(bison is required)
-     ;;
- esac
--AC_LANG([C])
--AC_LANG([C++])
- AC_PROG_CXX
- AC_LINK_IFELSE([AC_LANG_PROGRAM([], [])],,
-    AC_MSG_ERROR([C++ Compiler required to compile Anjuta]))
diff --git a/dev-util/anjuta/files/3.34.0-minimal.patch b/dev-util/anjuta/files/3.34.0-minimal.patch
new file mode 100644
index 000000000000..3acd4c486b44
--- /dev/null
+++ b/dev-util/anjuta/files/3.34.0-minimal.patch
@@ -0,0 +1,88 @@
+Stubs out parts of configure not needed for the base library to avoid
+additional build dependencies. Some can be avoided by setting environment
+variables, but not all.
+
+-- Chewi
+
+diff -Naur a/configure b/configure
+--- a/configure	2019-09-08 19:32:47.000000000 +0100
++++ b/configure	2022-05-21 09:43:26.396618735 +0100
+@@ -4894,6 +4894,7 @@
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ 
+ 
++: <<'END'
+ for ac_prog in flex lex
+ do
+   # Extract the first word of "$ac_prog", so it can be a program name with args.
+@@ -5106,6 +5107,7 @@
+     as_fn_error $? "bison is required" "$LINENO" 5
+     ;;
+ esac
++END
+ ac_ext=c
+ ac_cpp='$CPP $CPPFLAGS'
+ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+@@ -17726,6 +17728,7 @@
+ fi
+ 
+ 
++: <<'END'
+ pkg_failed=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GDA" >&5
+ $as_echo_n "checking for GDA... " >&6; }
+@@ -19533,6 +19536,7 @@
+ $as_echo "#define ENABLE_PACKAGEKIT 1" >>confdefs.h
+ 
+ fi
++END
+ 
+ LIBANJUTA_CFLAGS='$(ANJUTA_CFLAGS) $(GDL_CFLAGS) $(DEPRECATED_FLAGS) -I$(top_srcdir) -I$(top_builddir)/libanjuta -DPACKAGE_PIXMAPS_DIR=\""$(datadir)/pixmaps/$(PACKAGE)"\" -DPACKAGE_LIB_DIR=\""$(pkglibdir)"\" -DPACKAGE_DATA_DIR=\""$(datadir)/$(PACKAGE)"\"'
+ LIBANJUTA_LIBS='$(top_builddir)/libanjuta/libanjuta-3.la'
+@@ -19624,6 +19628,7 @@
+ 
+ 
+ 
++: <<'END'
+ case "$am__api_version" in
+     1.01234)
+ 	as_fn_error $? "Automake 1.5 or newer is required to use intltool" "$LINENO" 5
+@@ -20441,6 +20446,7 @@
+ 
+ 
+   ac_config_commands="$ac_config_commands po-directories"
++END
+ 
+ 
+ 
+@@ -22459,6 +22465,7 @@
+ 
+ 
+ 
++: <<'END'
+ YELP_LC_MEDIA_LINKS=true
+ YELP_LC_DIST=true
+ 
+@@ -22738,6 +22745,7 @@
+ 	  done; \
+ 	done;
+ '
++END
+ 
+ 
+ 
+@@ -24091,6 +24099,14 @@
+   am__EXEEXT_FALSE=
+ fi
+ 
++HAVE_PLUGIN_TERMINAL_TRUE='#'
++HAVE_PLUGIN_DEVHELP_TRUE='#'
++HAVE_PLUGIN_GLADE_TRUE='#'
++ENABLE_GLADE_CATALOG_TRUE='#'
++HAVE_SQLITE_TRUE='#'
++ENABLE_VALA_TRUE='#'
++HAVE_PYTHON_TRUE='#'
++
+ if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
+   as_fn_error $? "conditional \"MAINTAINER_MODE\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
diff --git a/dev-util/anjuta/files/3.34.0-prefer-newer-vala.patch b/dev-util/anjuta/files/3.34.0-prefer-newer-vala.patch
deleted file mode 100644
index 6ae0ead0f3d7..000000000000
--- a/dev-util/anjuta/files/3.34.0-prefer-newer-vala.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-https://gitlab.gnome.org/GNOME/anjuta/-/merge_requests/14
-
-diff --git a/configure.ac b/configure.ac
-index c637f9cf3..b34e103b2 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -338,7 +338,7 @@ if test "$user_disabled_vala" = 1; then
- else
-         AC_MSG_RESULT(no)
- 	AC_MSG_CHECKING(if libvala is available)
--	m4_foreach_w([VERSION], [0.56 0.54 0.52 0.50 0.48 0.46 0.44 0.42 0.40 0.38 0.36 0.34 0.32],
-+	m4_foreach_w([VERSION], [0.32 0.34 0.36 0.38 0.40 0.42 0.44 0.46 0.48 0.50 0.52 0.54 0.56],
- 		[PKG_CHECK_EXISTS([ libvala-VERSION ],
- 			 [ valaver="-VERSION" ])
- 			 ])
diff --git a/dev-util/anjuta/metadata.xml b/dev-util/anjuta/metadata.xml
index 1a2b49cac930..6f7bf4da694b 100644
--- a/dev-util/anjuta/metadata.xml
+++ b/dev-util/anjuta/metadata.xml
@@ -1,13 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>chewi@gentoo.org</email>
-    <name>James Le Cuirot</name>
-  </maintainer>
-  <use>
-    <flag name="devhelp">Enable devhelp integration</flag>
-    <flag name="glade">Build glade plugin for anjuta</flag>
-    <flag name="terminal">Enable terminal plugin based on <pkg>x11-libs/vte</pkg></flag>
-  </use>
+	<maintainer type="person">
+		<email>chewi@gentoo.org</email>
+		<name>James Le Cuirot</name>
+	</maintainer>
+	<longdescription lang="en">
+		This package used to build the entire Anjuta IDE for GNOME with all its
+		plugins. The project is now largely defunct, so the package has been
+		reduced to the base library, allowing applications built on Anjuta to
+		still be run.
+	</longdescription>
 </pkgmetadata>