1 files changed, 67 insertions, 85 deletions

diff --git a/internal/rosa/package/x.az b/internal/rosa/package/x.az
index a36febd0..73b82981 100644
--- a/internal/rosa/package/x.az
+++ b/internal/rosa/package/x.az
@@ -12,6 +12,7 @@ package util-macros {
 	};
 
 	exec = make {};
+	unlikely = true;
 }
 
 package libxtrans {
@@ -31,13 +32,15 @@ package libxtrans {
 		generate = "NOCONFIGURE=1 ./autogen.sh";
 	};
 
-	inputs = [
+	tools = [
 		automake,
 		libtool,
 		pkgconf,
-
-		util-macros,
 	];
+
+	inputs = [ util-macros ];
+
+	unlikely = true;
 }
 
 package xorgproto {
@@ -57,12 +60,14 @@ package xorgproto {
 		generate = "NOCONFIGURE=1 ./autogen.sh";
 	};
 
-	inputs = [
+	tools = [
 		automake,
 		pkgconf,
-
-		util-macros,
 	];
+
+	inputs = [ util-macros ];
+
+	unlikely = true;
 }
 
 package libXau {
@@ -102,7 +107,7 @@ package xcb-proto {
 
 	exec = make {};
 
-	inputs = [ python ];
+	tools = [ python ];
 }
 
 package xcb {
@@ -119,15 +124,12 @@ package xcb {
 
 	exec = make {};
 
-	inputs = [
+	tools = [
 		python,
 		pkgconf,
-
-		xcb-proto,
-		libXau,
 	];
 
-	runtime = [
+	inputs = [
 		xcb-proto,
 		libXau,
 	];
@@ -146,14 +148,8 @@ package libxcb-keysyms {
 	};
 
 	exec = make {};
-
-	inputs = [
-		pkgconf,
-
-		xcb,
-	];
-
-	runtime = [ xcb ];
+	tools = [ pkgconf ];
+	inputs = [ xcb ];
 }
 
 package libxcb-wm {
@@ -170,14 +166,12 @@ package libxcb-wm {
 
 	exec = make {};
 
-	inputs = [
+	tools = [
 		m4,
 		pkgconf,
-
-		xcb,
 	];
 
-	runtime = [ xcb ];
+	inputs = [ xcb ];
 }
 
 package libxcb-util {
@@ -195,14 +189,12 @@ package libxcb-util {
 
 	exec = make {};
 
-	inputs = [
-		pkgconf,
+	tools = [ pkgconf ];
 
+	inputs = [
 		util-macros,
 		xcb,
 	];
-
-	runtime = [ xcb ];
 }
 
 package libxcb-image {
@@ -218,14 +210,8 @@ package libxcb-image {
 	};
 
 	exec = make {};
-
-	inputs = [
-		pkgconf,
-
-		libxcb-util,
-	];
-
-	runtime = [ libxcb-util ];
+	tools = [ pkgconf ];
+	inputs = [ libxcb-util ];
 }
 
 package libxcb-render-util {
@@ -243,14 +229,12 @@ package libxcb-render-util {
 
 	exec = make {};
 
-	inputs = [
-		pkgconf,
+	tools = [ pkgconf ];
 
+	inputs = [
 		util-macros,
 		xcb,
 	];
-
-	runtime = [ xcb ];
 }
 
 package libX11 {
@@ -275,18 +259,18 @@ package libX11 {
 		};
 	};
 
-	inputs = [
+	tools = [
 		automake,
 		libtool,
 		pkgconf,
+	];
 
+	inputs = [
 		util-macros,
 		libxtrans,
 		xorgproto,
 		xcb,
 	];
-
-	runtime = [ xcb ];
 }
 
 package libXext {
@@ -306,16 +290,16 @@ package libXext {
 		generate = "NOCONFIGURE=1 ./autogen.sh";
 	};
 
-	inputs = [
+	tools = [
 		automake,
 		libtool,
 		pkgconf,
+	];
 
+	inputs = [
 		util-macros,
 		libX11,
 	];
-
-	runtime = [ libX11 ];
 }
 
 package libXfixes {
@@ -335,17 +319,17 @@ package libXfixes {
 		generate = "NOCONFIGURE=1 ./autogen.sh";
 	};
 
-	inputs = [
+	tools = [
 		automake,
 		libtool,
 		pkgconf,
+	];
 
+	inputs = [
 		util-macros,
 		xorgproto,
 		libX11,
 	];
-
-	runtime = [ libX11 ];
 }
 
 package libXrender {
@@ -365,16 +349,16 @@ package libXrender {
 		generate = "NOCONFIGURE=1 ./autogen.sh";
 	};
 
-	inputs = [
+	tools = [
 		automake,
 		libtool,
 		pkgconf,
+	];
 
+	inputs = [
 		util-macros,
 		libX11,
 	];
-
-	runtime = [ libX11 ];
 }
 
 package libxshmfence {
@@ -394,11 +378,13 @@ package libxshmfence {
 		generate = "NOCONFIGURE=1 ./autogen.sh";
 	};
 
-	inputs = [
+	tools = [
 		automake,
 		libtool,
 		pkgconf,
+	];
 
+	inputs = [
 		util-macros,
 		xorgproto,
 	];
@@ -421,17 +407,17 @@ package libXxf86vm {
 		generate = "NOCONFIGURE=1 ./autogen.sh";
 	};
 
-	inputs = [
+	tools = [
 		automake,
 		libtool,
 		pkgconf,
+	];
 
+	inputs = [
 		util-macros,
 		libXext,
 		xorgproto,
 	];
-
-	runtime = [ libXext ];
 }
 
 package libXrandr {
@@ -451,21 +437,18 @@ package libXrandr {
 		generate = "NOCONFIGURE=1 ./autogen.sh";
 	};
 
-	inputs = [
+	tools = [
 		automake,
 		libtool,
 		pkgconf,
+	];
 
+	inputs = [
 		util-macros,
 		libXext,
 		libXrender,
 		xorgproto,
 	];
-
-	runtime = [
-		libXext,
-		libXrender,
-	];
 }
 
 package font-util {
@@ -485,13 +468,13 @@ package font-util {
 		generate = "NOCONFIGURE=1 ./autogen.sh";
 	};
 
-	inputs = [
+	tools = [
 		automake,
 		libtool,
 		pkgconf,
-
-		util-macros,
 	];
+
+	inputs = [ util-macros ];
 }
 
 package libfontenc {
@@ -511,13 +494,15 @@ package libfontenc {
 		generate = "NOCONFIGURE=1 ./autogen.sh";
 	};
 
-	inputs = [
+	tools = [
 		automake,
 		libtool,
 		pkgconf,
+		font-util,
+	];
 
+	inputs = [
 		util-macros,
-		font-util,
 		xorgproto,
 	];
 }
@@ -538,7 +523,6 @@ package libxkbfile {
 	exec = meson {};
 
 	inputs = [ libX11 ];
-	runtime = [ libX11 ];
 }
 
 package xkbcomp {
@@ -558,17 +542,17 @@ package xkbcomp {
 		generate = "NOCONFIGURE=1 ./autogen.sh";
 	};
 
-	inputs = [
+	tools = [
 		automake,
 		libtool,
 		pkgconf,
 		byacc,
+	];
 
+	inputs = [
 		util-macros,
 		libxkbfile,
 	];
-
-	runtime = [ libxkbfile ];
 }
 
 package libXfont2 {
@@ -588,22 +572,19 @@ package libXfont2 {
 		generate = "NOCONFIGURE=1 ./autogen.sh";
 	};
 
-	inputs = [
+	tools = [
 		automake,
 		libtool,
 		pkgconf,
+	];
 
+	inputs = [
 		util-macros,
 		freetype,
 		xorgproto,
 		libxtrans,
 		libfontenc,
 	];
-
-	runtime = [
-		freetype,
-		libfontenc,
-	];
 }
 
 package libxcvt {
@@ -639,11 +620,13 @@ package libXdmcp {
 		generate = "NOCONFIGURE=1 ./autogen.sh";
 	};
 
-	inputs = [
+	tools = [
 		automake,
 		libtool,
 		pkgconf,
+	];
 
+	inputs = [
 		util-macros,
 		xorgproto,
 	];
@@ -663,8 +646,7 @@ package xkeyboard-config {
 	};
 
 	exec = meson {};
-
-	inputs = [ perl ];
+	tools = [ perl ];
 }
 
 package libpciaccess {
@@ -687,7 +669,6 @@ package libpciaccess {
 	};
 
 	inputs = [ zlib ];
-	runtime = [ zlib ];
 }
 
 package xserver {
@@ -719,9 +700,9 @@ package xserver {
 		};
 	};
 
-	inputs = [
-		awk,
+	tools = [ awk ];
 
+	inputs = [
 		xorgproto,
 		libxtrans,
 		libxshmfence,
@@ -730,7 +711,6 @@ package xserver {
 		xkbcomp,
 		xkeyboard-config,
 		libXfont2,
-		dbus,
 		font-util,
 		libxcvt,
 		libXext,
@@ -789,10 +769,12 @@ package xwayland {
 		};
 	};
 
-	inputs = [
+	tools = [
 		bash,
 		awk,
+	];
 
+	inputs = [
 		mesa,
 		libglvnd,
 		libepoxy,