framework: switch tree to using vala.mk

PR:		249940

20 files changed, 24 insertions, 38 deletions

diff --git a/x11/appmenu-registrar/Makefile b/x11/appmenu-registrar/Makefile
index c65fb130f8fb..814d429a4fc4 100644
--- a/x11/appmenu-registrar/Makefile
+++ b/x11/appmenu-registrar/Makefile
@@ -12,9 +12,8 @@ LICENSE=	LGPL3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libbamf3.so:sysutils/bamf
-BUILD_DEPENDS=	valac:lang/vala
 
-USES=	meson gnome pkgconfig gettext
+USES=	meson gnome pkgconfig gettext vala:build
 
 MESON_ARGS=	-Dvalapanel=disabled \
 		-Dxfce=disabled \
diff --git a/x11/babl/Makefile b/x11/babl/Makefile
index 3f51bf05b013..b471f4fcdf3c 100644
--- a/x11/babl/Makefile
+++ b/x11/babl/Makefile
@@ -9,10 +9,9 @@ COMMENT=	Dynamic pixel format conversion library
 LICENSE=	LGPL3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	vapigen:lang/vala
 LIB_DEPENDS=	liblcms2.so:graphics/lcms2
 
-USES=		compiler:c11 gnome libtool localbase meson pathfix pkgconfig tar:xz
+USES=		compiler:c11 gnome libtool localbase meson pathfix pkgconfig tar:xz vala:build
 
 USE_LDCONFIG=	yes
 USE_GNOME=	introspection:build
diff --git a/x11/elementary-terminal/Makefile b/x11/elementary-terminal/Makefile
index 2bd632937abb..6d6f37fed8a3 100644
--- a/x11/elementary-terminal/Makefile
+++ b/x11/elementary-terminal/Makefile
@@ -9,13 +9,12 @@ COMMENT=	Terminal emulator designed for elementary OS
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	valac:lang/vala
 LIB_DEPENDS=	libgee-0.8.so:devel/libgee \
 		libgranite.so:x11-toolkits/granite \
 		libhandy-1.so:x11-toolkits/libhandy \
 		libpcre2-posix.so:devel/pcre2
 
-USES=		desktop-file-utils gettext gnome meson pkgconfig
+USES=		desktop-file-utils gettext gnome meson pkgconfig vala:build
 USE_GITHUB=	yes
 GH_ACCOUNT=	elementary
 USE_GNOME=	cairo gdkpixbuf2 glib20 gtk30 vte3
diff --git a/x11/gnome-pie/Makefile b/x11/gnome-pie/Makefile
index 753159cfb019..eb4b18b14112 100644
--- a/x11/gnome-pie/Makefile
+++ b/x11/gnome-pie/Makefile
@@ -10,13 +10,12 @@ COMMENT=	Circular application launcher
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	valac:lang/vala
 RUN_DEPENDS=	gnome-settings-daemon>=2.32.1_4:sysutils/gnome-settings-daemon
 LIB_DEPENDS=	libbamf3.so:sysutils/bamf \
 		libgee-0.8.so:devel/libgee \
 		libunique-1.0.so:x11-toolkits/unique
 
-USES=		cmake gnome pkgconfig xorg
+USES=		cmake gnome pkgconfig vala:build xorg
 USE_GITHUB=	yes
 USE_GNOME=	cairo gnomemenus3 gtk30 librsvg2 libwnck3
 USE_XORG=	xtst
diff --git a/x11/gnome-terminal/Makefile b/x11/gnome-terminal/Makefile
index 57b7a2628860..e6c184b5f6f1 100644
--- a/x11/gnome-terminal/Makefile
+++ b/x11/gnome-terminal/Makefile
@@ -13,7 +13,6 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 BUILD_DEPENDS=	docbook-xsl>0:textproc/docbook-xsl \
 		gsettings-desktop-schemas>=0:devel/gsettings-desktop-schemas \
 		itstool:textproc/itstool \
-		vala:lang/vala \
 		xsltproc:textproc/libxslt
 LIB_DEPENDS=	libfribidi.so:converters/fribidi \
 		libgnutls.so:security/gnutls \
@@ -24,7 +23,7 @@ RUN_DEPENDS=	gsettings-desktop-schemas>=0:devel/gsettings-desktop-schemas
 PORTSCOUT=	limitw:1,even
 
 USES=		cpe gettext gnome localbase meson pathfix pkgconfig python:3.7+ \
-		tar:xz xorg
+		tar:xz vala:build xorg
 USE_GNOME=	cairo dconf gdkpixbuf2 gtk30 intltool vte3
 USE_XORG=	x11
 CPE_VENDOR=	gnome
diff --git a/x11/gtk-app-menu/Makefile b/x11/gtk-app-menu/Makefile
index 89bb9dea0e03..9bddc7373631 100644
--- a/x11/gtk-app-menu/Makefile
+++ b/x11/gtk-app-menu/Makefile
@@ -12,10 +12,9 @@ COMMENT=	GTK module for putting application menubar in a global menubar
 LICENSE=	LGPL3
 LICENSE_FILE=	${WRKSRC}/subprojects/appmenu-gtk-module/LICENSE
 
-BUILD_DEPENDS=	valac:lang/vala
 LIB_DEPENDS=	libbamf3.so:sysutils/bamf
 
-USES=	meson gnome pkgconfig
+USES=	meson gnome pkgconfig vala:build
 
 MESON_ARGS=	-Dappmenu-gtk-module=enabled \
 		-Dbudgie=disabled \
diff --git a/x11/libfm/Makefile b/x11/libfm/Makefile
index 773130574781..c413ab0d27e3 100644
--- a/x11/libfm/Makefile
+++ b/x11/libfm/Makefile
@@ -12,8 +12,8 @@ LICENSE_COMB=	multi
 LICENSE_FILE_GPLv2+ =	${WRKSRC}/COPYING
 
 .if ! defined(EXTRA_ONLY)
-BUILD_DEPENDS=	p5-XML-Parser>=0:textproc/p5-XML-Parser \
-		valac:lang/vala
+USES+=		vala:build
+BUILD_DEPENDS=	p5-XML-Parser>=0:textproc/p5-XML-Parser
 LIB_DEPENDS=	libmenu-cache.so:x11/menu-cache \
 		libexif.so:graphics/libexif \
 		libfontconfig.so:x11-fonts/fontconfig \
@@ -31,7 +31,7 @@ gtk3_CONFLICTS_INSTALL=	libfm
 
 SLAVEDIRS=	${CATEGORIES}/${PORTNAME}-extra
 
-USES=		gettext-tools gmake gnome libtool localbase \
+USES+=		gettext-tools gmake gnome libtool localbase \
 		pkgconfig tar:xz
 USE_GNOME=	intltool
 USE_LDCONFIG=	yes
diff --git a/x11/libxfce4menu/Makefile b/x11/libxfce4menu/Makefile
index bab6ec82112d..8543fd61d63f 100644
--- a/x11/libxfce4menu/Makefile
+++ b/x11/libxfce4menu/Makefile
@@ -51,7 +51,7 @@ STARTUP_CONFIGURE_ENABLE=	startup-notification
 STARTUP_DESC=		Startup notification
 STARTUP_LIB_DEPENDS=	libstartup-notification-1.so:x11/startup-notification
 
-VAPI_BUILD_DEPENDS=	vapigen:lang/vala
+VAPI_USES=		vala:build
 VAPI_CONFIGURE_ENABLE=	vala
 VAPI_IMPLIES=		GIR
 
diff --git a/x11/libxfce4util/Makefile b/x11/libxfce4util/Makefile
index 9152eea91a1e..99c267d5bf09 100644
--- a/x11/libxfce4util/Makefile
+++ b/x11/libxfce4util/Makefile
@@ -33,7 +33,7 @@ GIR_CONFIGURE_OFF=	--enable-introspection=no
 NLS_CONFIGURE_ENABLE=	nls
 NLS_USES=		gettext-runtime
 
-VAPI_BUILD_DEPENDS=	vapigen:lang/vala
+VAPI_USES=		vala:build
 VAPI_CONFIGURE_ENABLE=	vala
 VAPI_IMPLIES=		GIR
 
diff --git a/x11/lightdm/Makefile b/x11/lightdm/Makefile
index 46ef01da27f6..676a05b253a4 100644
--- a/x11/lightdm/Makefile
+++ b/x11/lightdm/Makefile
@@ -45,7 +45,7 @@ OPTIONS_SUB=	yes
 DOCS_BUILD_DEPENDS=	gtkdoc-check:textproc/gtk-doc
 DOCS_CONFIGURE_ENABLE=	gtk-doc
 
-VAPI_BUILD_DEPENDS=	vapigen:lang/vala
+VAPI_USES=		vala:build
 VAPI_CONFIGURE_ENABLE=	vala
 VAPI_USE=		gnome=introspection:build
 
diff --git a/x11/mate-applet-appmenu/Makefile b/x11/mate-applet-appmenu/Makefile
index 7a7b3aec7960..832213b1c1b5 100644
--- a/x11/mate-applet-appmenu/Makefile
+++ b/x11/mate-applet-appmenu/Makefile
@@ -12,11 +12,10 @@ LICENSE=	LGPL3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libbamf3.so:sysutils/bamf
-BUILD_DEPENDS=	valac:lang/vala
 RUN_DEPENDS=	appmenu-registrar>=0:x11/appmenu-registrar \
 		appmenu-gtk-module>=0:x11/gtk-app-menu
 
-USES=	meson gnome mate pkgconfig gettext
+USES=	meson gnome mate pkgconfig gettext vala:build
 
 MESON_ARGS=	-Dvalapanel=disabled \
 		-Dxfce=disabled \
diff --git a/x11/plank/Makefile b/x11/plank/Makefile
index f65976b76f1d..ffae9be005ba 100644
--- a/x11/plank/Makefile
+++ b/x11/plank/Makefile
@@ -10,12 +10,11 @@ COMMENT=	Elegant, simple, and clean dock
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	vapigen:lang/vala
 LIB_DEPENDS=	libbamf3.so:sysutils/bamf \
 		libgee-0.8.so:devel/libgee \
 		libgnome-menu-3.so:x11/gnome-menus
 
-USES=		gmake gnome libtool localbase pathfix pkgconfig tar:xz xorg
+USES=		gmake gnome libtool localbase pathfix pkgconfig tar:xz vala:build xorg
 USE_GNOME=	glib20 gtk30 gdkpixbuf2 cairo intlhack libxml2 libwnck3 dconf
 USE_XORG=	x11 xfixes xi
 
diff --git a/x11/remontoire/Makefile b/x11/remontoire/Makefile
index 86e5b96f4cc8..ca5576d3d631 100644
--- a/x11/remontoire/Makefile
+++ b/x11/remontoire/Makefile
@@ -7,11 +7,10 @@ COMMENT=	Keybinding viewer for i3 and other programs
 
 LICENSE=	GPLv3
 
-BUILD_DEPENDS=	valac:lang/vala
 LIB_DEPENDS=	libgee-0.8.so:devel/libgee \
 		libjson-glib-1.0.so:devel/json-glib
 
-USES=		gettext-tools gnome meson pkgconfig python:build shebangfix
+USES=		gettext-tools gnome meson pkgconfig python:build shebangfix vala:build
 USE_GITHUB=	yes
 USE_GNOME=	gtk30
 GH_ACCOUNT=	regolith-linux
diff --git a/x11/slick-greeter/Makefile b/x11/slick-greeter/Makefile
index d66711674442..7f30bae3cf67 100644
--- a/x11/slick-greeter/Makefile
+++ b/x11/slick-greeter/Makefile
@@ -14,10 +14,10 @@ LIB_DEPENDS=	libcanberra-gtk3.so:audio/libcanberra-gtk3 \
 		libfreetype.so:print/freetype2 \
 		libharfbuzz.so:print/harfbuzz \
 		liblightdm-gobject-1.so:x11/lightdm
-BUILD_DEPENDS=	valac:lang/vala
 RUN_DEPENDS=	numlockx>=0:x11/numlockx
 
-USES=		autoreconf gettext gmake gnome localbase pkgconfig python:run shebangfix xorg
+USES=		autoreconf gettext gmake gnome localbase pkgconfig python:run shebangfix \
+		vala:build xorg
 USE_GNOME=	cairo dconf gdkpixbuf2 gtk30 intltool pygobject3
 
 USE_XORG=	pixman x11 xext
diff --git a/x11/swayfloatingswitcher/Makefile b/x11/swayfloatingswitcher/Makefile
index e5845b2a198f..c6076e2f775d 100644
--- a/x11/swayfloatingswitcher/Makefile
+++ b/x11/swayfloatingswitcher/Makefile
@@ -8,13 +8,12 @@ COMMENT=	Simple Alt+Tab switcher for floating windows
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	valac:lang/vala \
-		granite>0:x11-toolkits/granite
+BUILD_DEPENDS=	granite>0:x11-toolkits/granite
 LIB_DEPENDS=	libjson-glib-1.0.so:devel/json-glib \
 		libgee-0.8.so:devel/libgee \
 		libgtk-layer-shell.so:x11-toolkits/gtk-layer-shell
 
-USES=		gnome localbase:ldflags meson pkgconfig
+USES=		gnome localbase:ldflags meson pkgconfig vala:build
 USE_GITHUB=	yes
 USE_GNOME=	gtk30
 GH_ACCOUNT=	ErikReider
diff --git a/x11/swaync/Makefile b/x11/swaync/Makefile
index 1eb186e61f93..e5edb1b7e68f 100644
--- a/x11/swaync/Makefile
+++ b/x11/swaync/Makefile
@@ -9,12 +9,11 @@ COMMENT=	Simple Wayland notification daemon with GTK panel
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	valac:lang/vala
 LIB_DEPENDS=	libjson-glib-1.0.so:devel/json-glib \
 		libgtk-layer-shell.so:x11-toolkits/gtk-layer-shell \
 		libhandy-1.so:x11-toolkits/libhandy
 
-USES=		compiler:c11 gnome localbase:ldflags meson pkgconfig
+USES=		compiler:c11 gnome localbase:ldflags meson pkgconfig vala:build
 USE_GITHUB=	yes
 USE_GNOME=	cairo gdkpixbuf2 gtk30 introspection:build
 GH_ACCOUNT=	ErikReider
diff --git a/x11/swaysettings/Makefile b/x11/swaysettings/Makefile
index fb0836084f0c..1477bba17538 100644
--- a/x11/swaysettings/Makefile
+++ b/x11/swaysettings/Makefile
@@ -9,14 +9,13 @@ COMMENT=	GUI for setting Sway wallpaper, default apps, GTK themes, etc.
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	valac:lang/vala
 LIB_DEPENDS=	libjson-glib-1.0.so:devel/json-glib \
 		libgee-0.8.so:devel/libgee \
 		libaccountsservice.so:sysutils/accountsservice \
 		libgranite.so:x11-toolkits/granite \
 		libhandy-1.so:x11-toolkits/libhandy
 
-USES=		compiler:c11 gettext gnome meson pkgconfig python:build shebangfix
+USES=		compiler:c11 gettext gnome meson pkgconfig python:build shebangfix vala:build
 USE_GITHUB=	yes
 USE_GNOME=	cairo gdkpixbuf2 gtk30 libxml2
 GH_ACCOUNT=	ErikReider
diff --git a/x11/xapp/Makefile b/x11/xapp/Makefile
index e450beba91be..7a431f2725f3 100644
--- a/x11/xapp/Makefile
+++ b/x11/xapp/Makefile
@@ -9,11 +9,10 @@ COMMENT=	Cross-desktop libraries and common resources
 LICENSE=	LGPL3
 LICENSE_FILE?=	${WRKSRC}/COPYING.LESSER
 
-BUILD_DEPENDS=	vapigen:lang/vala
 LIB_DEPENDS=	libdbusmenu-gtk3.so:devel/libdbusmenu
 RUN_DEPENDS=	bash:shells/bash
 
-USES=		gettext-tools gnome meson pkgconfig python shebangfix xorg
+USES=		gettext-tools gnome meson pkgconfig python shebangfix vala:build xorg
 USE_GITHUB=	yes
 GH_ACCOUNT=	linuxmint
 USE_GNOME=	cairo gdkpixbuf2 glib20 gtk-update-icon-cache gtk30 \
diff --git a/x11/xfce4-appmenu-plugin/Makefile b/x11/xfce4-appmenu-plugin/Makefile
index 909e0abb4a1e..1e5a75cac3fb 100644
--- a/x11/xfce4-appmenu-plugin/Makefile
+++ b/x11/xfce4-appmenu-plugin/Makefile
@@ -12,11 +12,10 @@ LICENSE=	LGPL3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libbamf3.so:sysutils/bamf
-BUILD_DEPENDS=	valac:lang/vala
 RUN_DEPENDS=	appmenu-registrar>=0:x11/appmenu-registrar \
 		appmenu-gtk-module>=0:x11/gtk-app-menu
 
-USES=	meson gnome xfce pkgconfig gettext
+USES=	meson gnome xfce pkgconfig gettext vala:build
 
 MESON_ARGS=	-Dvalapanel=disabled \
 		-Dxfce=enabled \
diff --git a/x11/xfce4-conf/Makefile b/x11/xfce4-conf/Makefile
index 4e007b07be2a..c8e4c7373349 100644
--- a/x11/xfce4-conf/Makefile
+++ b/x11/xfce4-conf/Makefile
@@ -40,7 +40,7 @@ GIR_CONFIGURE_OFF=	--enable-introspection=no
 NLS_CONFIGURE_ENABLE=	nls
 NLS_USES=		gettext-runtime
 
-VAPI_BUILD_DEPENDS=	vapigen:lang/vala
+VAPI_USES=		vala:build
 VAPI_CONFIGURE_ENABLE=	vala
 VAPI_IMPLIES=		GIR