dev-util/u-config: add 0.34.0, drop 0.33.3

Signed-off-by: NRK <nrk@disroot.org>

dev-util/u-config/Manifest

@@ -1,2 +1,2 @@
-DIST u-config-0.33.3.tar.gz 31250 BLAKE2B c16a4ba31396e86bcfe0d7441d1cef76691e40184ad1f4c89954a7f0c577769d882f841ddca369b0fd466a45dcc7911ffbb8738563260e48a811733efaf89f54 SHA512 bdf6b11d97d926d193330507ee6be32137dbbe32f91582eed73b6a039d50d7093129b1b8ff686feefb30614afea0af6c3b3f8cc3af91bd4ac62c9340da80a7e9
+DIST u-config-0.34.0.tar.gz 36962 BLAKE2B 50a76511c4e5d9ea56e7765d4dd885712c86023ddeaf5c090efd9943510456f1f12803bd6c20b6463ecf3fa6fc984257b2b71c1558a4018275cdd2f8b8909453 SHA512 1ee3c60ba5fba1089a7b87d2fccd01e8c823e4169f554f8176853a0d664bf34a79dc8f16b7240696a1a26e5a0417bb4cd2ebdb22f8e55f97b1b406208271daff
 DIST u-config-1.9.5-pkg.m4 12735 BLAKE2B 461f0b29be93c1b5507892564033dfc9522cf759c0a041fc878a18a03f2b8a532e84cd6adf9783b7166ab3a4b41872fa8210534721217df81924d3e6247a7267 SHA512 cfb1cc89eff46f065952b845b1262534f4dd5b7029d78fc1f20059b7409d0a39998a88781f3086903d55aec7bc6c1ae899808bf07ba626d27d32668b99ff8000

dev-util/u-config/u-config-0.33.3.ebuild

@@ -1,40 +0,0 @@
-# Copyright 2023-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit edo toolchain-funcs
-
-DESCRIPTION="Lean and mean pkg-config replacement"
-HOMEPAGE="https://github.com/skeeto/u-config"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/skeeto/u-config.git"
-else
-	SRC_URI="https://github.com/skeeto/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="Unlicense"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-src_compile() {
-	edo $(tc-getCC) ${CFLAGS} -o u-config generic_main.c \
-		-D PKG_CONFIG_LIBDIR="\"${EPREFIX}/usr/$(get_libdir)/pkgconfig:${EPREFIX}/usr/share/pkgconfig\"" \
-		-D PKG_CONFIG_SYSTEM_INCLUDE_PATH="\"${EPREFIX}/usr/include\"" \
-		-D PKG_CONFIG_SYSTEM_LIBRARY_PATH="\"${EPREFIX}/$(get_libdir):${EPREFIX}/usr/$(get_libdir)\"" \
-		${LDFLAGS}
-	use test && edo $(tc-getCC) ${CFLAGS} -o tests test_main.c ${LDFLAGS}
-}
-
-src_install() {
-	dobin u-config
-	doman u-config.1
-}
-
-src_test() {
-	edo ./tests
-}

dev-util/u-config/u-config-0.34.0.ebuild

@@ -0,0 +1,67 @@
+# Copyright 2023-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit edo toolchain-funcs
+
+DESCRIPTION="Lean and mean pkg-config replacement"
+HOMEPAGE="https://github.com/skeeto/u-config"
+
+PKG_M4_VER="1.9.5"
+PKG_M4_URI="symlink? (
+	https://github.com/pkgconf/pkgconf/raw/refs/tags/pkgconf-${PKG_M4_VER}/pkg.m4 ->
+	${PN}-${PKG_M4_VER}-pkg.m4
+)"
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/skeeto/u-config.git"
+	SRC_URI="${PKG_M4_URI}"
+else
+	SRC_URI="
+		https://github.com/skeeto/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+		${PKG_M4_URI}
+	"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+# GPL-2+ coming from pkg.m4
+LICENSE="Unlicense symlink? ( GPL-2+ )"
+SLOT="0"
+IUSE="symlink test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	symlink? (
+		!dev-util/pkgconfig
+		!dev-util/pkgconf
+	)
+"
+
+src_compile() {
+	edo $(tc-getCC) ${CFLAGS} -o u-config main_posix.c \
+		-D PKG_CONFIG_LIBDIR="\"${EPREFIX}/usr/$(get_libdir)/pkgconfig:${EPREFIX}/usr/share/pkgconfig\"" \
+		-D PKG_CONFIG_SYSTEM_INCLUDE_PATH="\"${EPREFIX}/usr/include\"" \
+		-D PKG_CONFIG_SYSTEM_LIBRARY_PATH="\"${EPREFIX}/$(get_libdir):${EPREFIX}/usr/$(get_libdir)\"" \
+		${LDFLAGS}
+	use test && edo $(tc-getCC) ${CFLAGS} -o tests main_test.c ${LDFLAGS}
+}
+
+src_install() {
+	dobin u-config
+	doman u-config.1
+
+	if use symlink; then
+		dosym u-config /usr/bin/pkg-config
+		dosym u-config /usr/bin/pkgconf
+		dosym u-config /usr/bin/"${CHOST}-pkg-config"
+		dosym u-config /usr/bin/"${CHOST}-pkgconf"
+
+		insinto /usr/share/aclocal
+		newins "${DISTDIR}/${PN}-${PKG_M4_VER}-pkg.m4" pkg.m4
+	fi
+}
+
+src_test() {
+	edo ./tests
+}