gentoo auto-resync : 09:03:2023 - 12:02:14

3 files changed, 89 insertions, 3 deletions

diff --git a/dev-util/kbuild/Manifest b/dev-util/kbuild/Manifest
index 1837330f424d..854d8d451019 100644
--- a/dev-util/kbuild/Manifest
+++ b/dev-util/kbuild/Manifest
@@ -10,9 +10,11 @@ AUX kbuild-0.1.9998.3572-fix-bison.patch 375 BLAKE2B ab316943b88fac929e747d0c106
 AUX kbuild-0.1.9998.3572-fix-lto.patch 314 BLAKE2B 42a7c1d3f735870b92c6ffdaf0400c1db63389b430890a892c9b48b90a126508729baeef2fc45bd747c089856a26ec3d10b8a9bfedd4e25a6d6ffd6606ef770b SHA512 7bb2526b4c59533dbfc8ad7c53fb38985fec4cab17740f4a3965fa3e982ba42faaabfe8d78d94c83bd74c771dde9088b1446a6937f96d37808fe9597d6a049f9
 AUX kbuild-0.1.9998_pre20110817-kash-link-pthread.patch 296 BLAKE2B ffa7b0167e4a65c59510e20089a63d5c1949b5f14ce167725ee057d9ab75369758e491727d939a111de5bd63719b53a7744b08efe84d34cc81b4d7bba80a3522 SHA512 178da856a83631ca4d86a9b8c20e74b75b76426c177b87c26d4c4b3df86e72f3b6339e8f61948498ab9c4bf047119588f3df8ce78448160afa0840b2cf3aeabb
 AUX kbuild-0.1.9998_pre20120806-qa.patch 292 BLAKE2B 628ee52d1c147864dba48e37ae25a2ff9e82e38bc907f2771ee3599e9401b26e5b5d4e53a3958a4f8edb2a7c35794677bae141561cf515fd3587b9ac095a7bdd SHA512 2a311e2e79c1e85c3c2c26b3d187355167c237c334687494a8e532b84232340df44b0d896fe6638bf1a9d4ba1c5f1efb29978de3bac0490fe04f2e57f7fb1874
+DIST kbuild-0.1.9998.3499-fix-clang.patch.bz2 10161 BLAKE2B a6f5a5c35553825682db92ab5ab0e1bd638e246fd1fa62dfaf97085e33940ca41c8ab29463ebb61d00c19c6775767ddb8fdfe9c28425741e1616cc43799631a5 SHA512 1a3a7509d899ba2d827329dd6658a67ee93520e89b51ea42f3268053c732785d0c7f808961bde5d5312cc604bedaf617df50eadf4efbb8c4216fe404d378473e
 DIST kbuild-0.1.9998.3499-src.tar.xz 2371580 BLAKE2B 847c5c67ded37ca87228ff7164d6c7f2f670a57f2fd94d6d0bf4f8896266e7fe5442666c03dbda016564a52dc91d10be83f0d4b0ef5093db0f5210ac8d5f3aaa SHA512 eebdcd1d2fa71313edd764d45a4aa3580078af22d7c5fed32d3d139a4f41c4e028282fdfdda0ee9b617ed0e8e63b8f5d065b3cf6647f08fe446560938b7577fc
 DIST kbuild-0.1.9998.3572-src.tar.xz 3973848 BLAKE2B 103e42d719fd77bc5c55aea48bdfd01c8ad136529cc76cc8c1297f87e21e5d4e2e7149f9321c5174808613a84331dbea8bb4c0a7662eb2de9e1045c8ad365047 SHA512 96bb5e1759990bf3acaca4b0ba7c02926c6607b0cd94f7fca222b13eee5c3364c64b35e3473c5cee45fa094cb2b851ac9f3a3a9fe60cff894baf46238ccb4006
 EBUILD kbuild-0.1.9998.3499-r2.ebuild 2091 BLAKE2B 77e7c34f6194c18d6e6f3399b56b6c78fe8f6af292cf28deecd0734960eba2f5b8840ddfd0066f3330918006d65534b7bdc18f6d66424c37197f793dec656124 SHA512 6710143070ac12c981733989739a34236ad647abadb69de90fd42ed1cc355522ef1f0957ca967f5801712dadfc0b83b729dd779136ed6c5e08f6448a5b932f7a
-EBUILD kbuild-0.1.9998.3572-r2.ebuild 1897 BLAKE2B 0664c2c592ee659eb485bc4aa864fe8f25cec27aa6119993b609b1a4eaabdc3e18e5593d7905a76839b56ed5b3df9ffdd69ff5d5242d9f6a63c97c94548db28a SHA512 e28e1ca046a2d206dedfe82fb4af39121eef9c2efd7220af83bfbfb3d35254d34bba04c90a577e96a9b2fb5829f9d3febdec718063d2c84d3880182e46666144
+EBUILD kbuild-0.1.9998.3499-r3.ebuild 2176 BLAKE2B 5a0e1c52c2c86f1b4d5cc263fd20107edf0472512cec35df6692a594a8f241638965a19b0033043b86dd7be3b8af0e9d4133db2203fc299c83e1302faf84f717 SHA512 4928fbd404c2681dab2b5ccac7598420b28396f7df0d47703663ae62ffe3afb08a15aa917db948cbf857a6ff828b09f5ad2dd09e19e9c7116e925109538137cd
+EBUILD kbuild-0.1.9998.3572-r3.ebuild 2041 BLAKE2B f58869cdfcc09aac1eac0aedf56a31118664d2d85629cbc59905ac27c4d21a0d6afbdcbb9c3928d5bdc2e47f51f6eca16ed633952359f5b50ea084bff702fab6 SHA512 1e538a89639077988a19644715bb52fee63eb00067f9a5f53b57e563284036959bf2c9f553d61f83c4658fd79fd09c70e08a0420227ef0a2c80c0e7a95e94119
 EBUILD kbuild-9999.ebuild 2125 BLAKE2B 14eb0ca8e3be71a9e82b61f974c59ae06fff52d182a94bd314c968f0e17da0af66b462efdcbdb9fb65f0f7ce29d3a3fa96a3035279f0a4e0691d29f29fe64568 SHA512 2d106f64a7f3307a6dfd85c97727c8083fe0267237be17a5f71502e9f18242afb64cad73ed07099ad41e6d841ffa2c4005afd66a45cf391e5ef2444d980dbda1
 MISC metadata.xml 249 BLAKE2B 3bc7510e014ef8df90da064f4ef969eab6cc3311951a6dd556ca7b6f4e2e74e229f12a16ceb641393d1ec1f89d1942718267ecc664a8136df194c40de94a58e4 SHA512 63f88d798d410e4fb6670d199a86a665ab61b09cb9508b4047f13fe73070c682231d35a27c9d2c1fd82a1b8a84676d857b534c96bd09f4562cf13d7fc8de36b2
diff --git a/dev-util/kbuild/kbuild-0.1.9998.3499-r3.ebuild b/dev-util/kbuild/kbuild-0.1.9998.3499-r3.ebuild
new file mode 100644
index 000000000000..b593d5a5406c
--- /dev/null
+++ b/dev-util/kbuild/kbuild-0.1.9998.3499-r3.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools toolchain-funcs
+
+DESCRIPTION="A makefile framework for writing simple makefiles for complex tasks"
+HOMEPAGE="https://trac.netlabs.org/kbuild/wiki"
+SRC_URI="
+	https://dev.gentoo.org/~ceamac/${CATEGORY}/${PN}/${P}-src.tar.xz
+	https://dev.gentoo.org/~ceamac/${CATEGORY}/${PN}/${PN}-0.1.9998.3499-fix-clang.patch.bz2
+"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+BDEPEND="
+	sys-apps/texinfo
+	sys-devel/flex
+	sys-devel/gettext
+	virtual/pkgconfig
+	app-alternatives/yacc
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.1.9998.3407-unknown_configure_opt.patch"
+	"${FILESDIR}/${PN}-0.1.5-gentoo-docdir.patch"
+	"${FILESDIR}/${PN}-0.1.9998_pre20120806-qa.patch"
+	"${FILESDIR}/${PN}-0.1.9998_pre20110817-kash-link-pthread.patch"
+	"${FILESDIR}/${PN}-0.1.9998.3499-gold.patch"
+
+	# Please check on version bumps if this can be removed
+	"${FILESDIR}/${PN}-0.1.9998.3499-kash-no_separate_parser_allocator.patch"
+
+	"${FILESDIR}/${PN}-0.1.9998.3572-fix-bison.patch"
+	"${FILESDIR}/${PN}-0.1.9998.3572-fix-lto.patch"
+	"${FILESDIR}/${PN}-0.1.9998.3499-implicit-function-declaration.patch"
+	"${FILESDIR}/${PN}-0.1.9998.3499-int-conversion.patch"
+	"${FILESDIR}/${PN}-0.1.9998.3499-fix-CC.patch"
+
+	"${WORKDIR}/${PN}-0.1.9998.3499-fix-clang.patch"
+)
+
+pkg_setup() {
+	# Package fails with distcc (bug #255371)
+	export DISTCC_DISABLE=1
+}
+
+src_prepare() {
+	default
+
+	# Add a file with the svn revision this package was pulled from
+	printf '%s\n' "KBUILD_SVN_REV := $(ver_cut 4)" \
+		> SvnInfo.kmk || die
+
+	cd "${S}/src/kmk" || die
+	eautoreconf
+	cd "${S}/src/sed" || die
+	eautoreconf
+
+	sed -e "s@_LDFLAGS\.$(tc-arch)*.*=@& ${LDFLAGS}@g" \
+		-e "s@_CFLAGS\.$(tc-arch)*.*=@& ${CFLAGS}@g" \
+		-e "s@_CXXFLAGS\.$(tc-arch)*.*=@& ${CXXFLAGS}@g" \
+		-i "${S}"/Config.kmk || die #332225
+	tc-export CC PKG_CONFIG RANLIB #AR does not work here
+}
+
+src_compile() {
+	kBuild/env.sh --full emake -f bootstrap.gmk AUTORECONF=true AR="$(tc-getAR)" \
+		|| die "bootstrap failed"
+}
+
+src_install() {
+	kBuild/env.sh kmk NIX_INSTALL_DIR=/usr PATH_INS="${D}" install \
+		|| die "install failed"
+}
diff --git a/dev-util/kbuild/kbuild-0.1.9998.3572-r2.ebuild b/dev-util/kbuild/kbuild-0.1.9998.3572-r3.ebuild
index 3b479cd2d78d..2b1532f82b37 100644
--- a/dev-util/kbuild/kbuild-0.1.9998.3572-r2.ebuild
+++ b/dev-util/kbuild/kbuild-0.1.9998.3572-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -7,7 +7,10 @@ inherit autotools toolchain-funcs
 
 DESCRIPTION="A makefile framework for writing simple makefiles for complex tasks"
 HOMEPAGE="https://trac.netlabs.org/kbuild/wiki"
-SRC_URI="https://dev.gentoo.org/~ceamac/${CATEGORY}/${PN}/${P}-src.tar.xz"
+SRC_URI="
+	https://dev.gentoo.org/~ceamac/${CATEGORY}/${PN}/${P}-src.tar.xz
+	https://dev.gentoo.org/~ceamac/${CATEGORY}/${PN}/${PN}-0.1.9998.3499-fix-clang.patch.bz2
+"
 
 LICENSE="GPL-3+"
 SLOT="0"
@@ -32,6 +35,8 @@ PATCHES=(
 	"${FILESDIR}/${PN}-0.1.9998.3499-implicit-function-declaration.patch"
 	"${FILESDIR}/${PN}-0.1.9998.3499-int-conversion.patch"
 	"${FILESDIR}/${PN}-0.1.9998.3499-fix-CC.patch"
+
+	"${WORKDIR}/${PN}-0.1.9998.3499-fix-clang.patch"
 )
 
 pkg_setup() {