gentoo resync : 25.08.2020

5 files changed, 166 insertions, 0 deletions

diff --git a/dev-util/kbuild/Manifest b/dev-util/kbuild/Manifest
index 4affac887947..2340a006c52e 100644
--- a/dev-util/kbuild/Manifest
+++ b/dev-util/kbuild/Manifest
@@ -1,9 +1,14 @@
 AUX kbuild-0.1.5-gentoo-docdir.patch 358 BLAKE2B 978d4081821098a4e035fdd41b801c72f297e24187d2681ff7aaa2b09fa0fed35ce780884bf1cf0b0ea4428a16402c20b14fcc0e918d7175b98f04e94ba74449 SHA512 468dd844de34867c7ccafabafab4d5870fcb63f38fcb8d53580787cf9600027db91cb5ad962862d6a654dcec2b58654cc62fd6146fb0903c1b2d2079a7016020
+AUX kbuild-0.1.9998.3407-glibc-2.32+.patch 1402 BLAKE2B 4dabbf9ccb5cd60aa7998d36a3766edc5a89992ae10606375774d4cf648478187ffa88aac9016b65acb77353b25d445c1f8b3f2cf17bc60106a9fcf83d2df7fe SHA512 fae4058b85da11fe8934323501193d2947e17e6b36baf83487c7543b0c6b7a4382682159d789a0f661f5cb346ed6e4b4609573255f3b5f244733049353497528
+AUX kbuild-0.1.9998.3407-gold.patch 590 BLAKE2B 654459b94017d4bacae37151c71d4b43b3d9a76d934a2a220bada87e0b96e2a8a13a6f446199eb5475faf604129966bcca6e3e34691e588df6b40fe65e4e4ded SHA512 3cf6827b482661704a8cdcdcf3152fa07d18c80a6e9cbe8979b732173f0127a5bc5009590c5cc155cdd11bed1e95d918835e697b6fecc1a1bc51127d2f13845f
+AUX kbuild-0.1.9998.3407-unknown_configure_opt.patch 697 BLAKE2B 5f974bc451a12f4b4c02656b501d07515c14499c53ee1fca00aec00cf28d6dd5faf690f262b79f34861a3bfd317a5bd37eb78cbeb61ce833d8117c2cd74e7813 SHA512 63435effcf109b40390574da09453314ffac109ffee79419cef81705b4f7ceb145f692c9a81b54dd0d58f69a1a6f80b9dc412baa5d416066f05300cc9eccc11e
 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
 AUX kbuild-0.1.9998_pre20171020-gold.patch 619 BLAKE2B e4bab6276b521752a60b94ae71f02b0963625eee06fddde79a4449a14fa235fc2dd5c7d8a450ce214dbabce9180c384f31cb2380e3fd49e8d987f56f7036a1fb SHA512 a9d084b34d8bcb431748c6c87679db764557fa2f141f4b942cfe44ca05040dc6eb7f923be89db87d6f35f8d141f3725240dff7502fc919716aa081cdb145d521
 AUX kbuild-unknown-configure-opt.patch 355 BLAKE2B 78c170c4d34d76a07925c08580245afef9859281c3d59cec1e675f19a2c3a86e9936773c62c78197d4d150ba8afd70ed7f100bcfa9fab950462224088d7aa2fa SHA512 26ae63facf7133be4fba606ad0b9488ea4c2ad2290a1e33a0f0c3283e0c8267eaae41bde6efaa52895b444178ec101a800ad580d2d85d0e69c56dc7db32b1105
 DIST kbuild-0.1.9998.3149-src.tar.xz 2314792 BLAKE2B 84aa1dbbaefc64a3ecc954c383d0516d88efd1a1791180164dd7bc3b26cd82a4a8c35c4b308e9fc960f114c40e77ea4a27acd94b62883c379acefb324a7c3f72 SHA512 74808e6279c01739170535655edbbffb73809f60b18c7ee63a110af7af651628789b9e5d253821f5685f8e8c072890c4669493e64886f53587b810ea0f67826c
+DIST kbuild-0.1.9998.3407-src.tar.xz 2351596 BLAKE2B ed562a739831c465ba66b2c357b1ab52cb072e61fa597d96d9e66e1b57a7f790c7e37fc82ef7ff49114b0cb4cb623e558d96864e98ca36bd42fe16e58e863dc7 SHA512 0a1fddff595f7ccfdb65a1a660c82860f132796b42149b8b40808d0df489312dcd96402236150c8ec5ec32c1cc142ce7af1150e10fdb83bf798e4d690dd64314
 EBUILD kbuild-0.1.9998.3149.ebuild 1866 BLAKE2B ae4ec9b87e0d988980b8e387e42cc8b13b2530de64090e8d2ab5817af68d6d7e752486a7158f69c4e99b2c322b48cd15398093e54b6a89b94e61f50f7e212167 SHA512 f5d669c42ceaba1e409eb5b94d8c95162afcc764b4b4a9b2b7fda835d11f80ebcc28e59359deb9b5d4fa8e035c2413c5fac2e698e43efe400d6b945cbd0f97ca
+EBUILD kbuild-0.1.9998.3407.ebuild 1735 BLAKE2B 9a88d0071cb3b1e58176cc217f8d775790d059ed621c0ac96335a78c8a6d4652a2257ab30123a2aa1a84361776971adc4c9319b0db4a9c5f1e0ed54c48dda1f8 SHA512 8e517e14e3a924432dc2a70845ac06067d520231a29ff77c3ec0cc7da38e8504b874f2101fb978fbcbbf4de1b4f3c81611ea220352fe15686a274ba82512b267
 EBUILD kbuild-9999.ebuild 1062 BLAKE2B 458a2dfe2a3b753783c49aeb819672e5c0d59858f5b67817b0544c56805d03cb3c75178c582981456e82909792f2fbf8e1873817cb94101076145c7388b2cbae SHA512 492ad0ab9e132b6379ce58eae3670114e1009cc32cf191869e153f4e72d52be17cf58347eaf4e39520909c463632d90d879860b6b361d0dd56568496e369f304
 MISC metadata.xml 251 BLAKE2B 2e2f0363feb3f8ad15ed8d2ef5130493f501acf64faf4fe567079d18a6066c0a1136f6c0cf53ba4ec854a38b5d4211e48e0a2ddac6677ca02266a3f993e36965 SHA512 0ccc4891c6c5de39cbe83d8391b0345611be252a2b1fedea6644ba1cfb283140a8250f32cd26b701db9c60d42782b214d03574592ef3b585bb15d2ffcb5f016e
diff --git a/dev-util/kbuild/files/kbuild-0.1.9998.3407-glibc-2.32+.patch b/dev-util/kbuild/files/kbuild-0.1.9998.3407-glibc-2.32+.patch
new file mode 100644
index 000000000000..68a39fc68deb
--- /dev/null
+++ b/dev-util/kbuild/files/kbuild-0.1.9998.3407-glibc-2.32+.patch
@@ -0,0 +1,59 @@
+http://trac.netlabs.org/kbuild/changeset?format=diff&new=3408&old=3407&new_path=%2Ftrunk&old_path=%2Ftrunk
+
+--- a/src/kash/jobs.c
++++ b/src/kash/jobs.c
+@@ -390,4 +390,5 @@
+ 				fmtstr(s + col, 16, "Done");
+ 		} else {
++			const char *pszSigNm;
+ #if JOBS
+ 			if (WIFSTOPPED(ps->status))
+@@ -397,6 +398,7 @@
+ 				st = WTERMSIG(ps->status);
+ 			st &= 0x7f;
+-			if (st < NSIG && sys_siglist[st])
+-				scopyn(sys_siglist[st], s + col, 32);
++			pszSigNm = st < NSIG ? strsignal(st) : NULL;
++			if (pszSigNm)
++				scopyn(pszSigNm, s + col, 32);
+ 			else
+ 				fmtstr(s + col, 16, "Signal %d", st);
+--- a/src/kash/shinstance.h
++++ b/src/kash/shinstance.h
+@@ -381,10 +381,6 @@
+ /*# define SIGBREAK         21 */
+ /*# define SIGABRT          22 */
+-
+-#   define sys_siglist      sys_signame
++const char *strsignal(int iSig);
+ #endif /* _MSC_VER */
+-#ifdef __sun__
+-#   define sys_siglist      _sys_siglist
+-#endif
+ #ifndef HAVE_SYS_SIGNAME
+ extern char sys_signame[NSIG][16];
+--- a/src/kash/sys_signame.c
++++ b/src/kash/sys_signame.c
+@@ -12,5 +12,5 @@
+ void init_sys_signame(void)
+ {
+-    unsigned i;
++	unsigned i;
+ 	if (sys_signame_initialized)
+ 		return;
+@@ -120,2 +120,14 @@
+ 	sys_signame_initialized = 1;
+ }
++
++#if defined(_MSC_VER)
++const char *strsignal(int iSig)
++{
++    if (!sys_signame_initialized)
++	init_sys_signame();
++    if (iSig < NSIG)
++	return sys_signame(iSig);
++    return NULL;
++}
++#endif
++
+ 
diff --git a/dev-util/kbuild/files/kbuild-0.1.9998.3407-gold.patch b/dev-util/kbuild/files/kbuild-0.1.9998.3407-gold.patch
new file mode 100644
index 000000000000..14d5ec7cc422
--- /dev/null
+++ b/dev-util/kbuild/files/kbuild-0.1.9998.3407-gold.patch
@@ -0,0 +1,11 @@
+--- kbuild-0.1.9998.3407/src/kmk/Makefile.kmk
++++ kbuild-0.1.9998.3407/src/kmk/Makefile.kmk
+@@ -60,7 +60,7 @@
+ ifneq ($(KBUILD_TARGET),os2)
+  TEMPLATE_BIN-KMK_INCS += glob
+ endif
+-TEMPLATE_BIN-KMK_LIBS = $(LIB_KUTIL) $(TEMPLATE_BIN-THREADED_LIBS) $(kmkmissing_1_TARGET) $(LIB_KUTIL)
++TEMPLATE_BIN-KMK_LIBS = $(LIB_KUTIL) $(TEMPLATE_BIN-THREADED_LIBS) $(kmkmissing_1_TARGET) $(LIB_KUTIL) pthread
+ ifdef ELECTRIC_HEAP # for electric heap (see electric.c).
+ ifeq ($(KBUILD_TARGET),win)
+  TEMPLATE_BIN-KMK_CFLAGS = $(TEMPLATE_BIN-THREADED_CFLAGS) /FI$(kmk_DEFPATH)/electric.h -DELECTRIC_HEAP=1
diff --git a/dev-util/kbuild/files/kbuild-0.1.9998.3407-unknown_configure_opt.patch b/dev-util/kbuild/files/kbuild-0.1.9998.3407-unknown_configure_opt.patch
new file mode 100644
index 000000000000..2714716b7806
--- /dev/null
+++ b/dev-util/kbuild/files/kbuild-0.1.9998.3407-unknown_configure_opt.patch
@@ -0,0 +1,20 @@
+--- kbuild-0.1.9998.3407/bootstrap.gmk
++++ kbuild-0.1.9998.3407/bootstrap.gmk
+@@ -151,7 +151,7 @@
+ $(OUTDIR)/kmk/ts-configured: \
+ 		$(OUTDIR)/kmk/ts-autoreconf \
+ 		$(OUTDIR)/kmk/fts.h
+-	cd $(OUTDIR)/kmk && $(SRCDIR)/src/kmk/configure --disable-load --without-guile
++	cd $(OUTDIR)/kmk && $(SRCDIR)/src/kmk/configure --disable-load
+ 	echo done > $@
+ 
+ ifeq ($(KBUILD_HOST),solaris)
+@@ -182,7 +182,7 @@
+ 	echo done > $@
+ 
+ $(OUTDIR)/sed/ts-configured: $(OUTDIR)/sed/ts-autoreconf
+-	cd $(OUTDIR)/sed && $(SRCDIR)/src/sed/configure --without-libintl --disable-nls
++	cd $(OUTDIR)/sed && $(SRCDIR)/src/sed/configure --disable-nls
+ 	echo done > $@
+ 
+ $(OUTDIR)/sed/config.h: $(OUTDIR)/sed/ts-configured
diff --git a/dev-util/kbuild/kbuild-0.1.9998.3407.ebuild b/dev-util/kbuild/kbuild-0.1.9998.3407.ebuild
new file mode 100644
index 000000000000..3c367b7ff0cd
--- /dev/null
+++ b/dev-util/kbuild/kbuild-0.1.9998.3407.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools toolchain-funcs
+
+MY_P="${P}-src"
+DESCRIPTION="A makefile framework for writing simple makefiles for complex tasks"
+HOMEPAGE="http://svn.netlabs.org/kbuild/wiki"
+#SRC_URI="ftp://ftp.netlabs.org/pub/${PN}/${MY_P}.tar.gz"
+SRC_URI="https://dev.gentoo.org/~polynomial-c/${MY_P}.tar.xz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# We cannot depend on virtual/yacc until bug #734354 has been fixed
+DEPEND="
+	sys-apps/texinfo
+	sys-devel/flex
+	sys-devel/gettext
+	|| (
+		dev-util/byacc
+		dev-util/yacc
+		<sys-devel/bison-3.7
+	)
+"
+RDEPEND=""
+
+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.3407-gold.patch"
+	"${FILESDIR}/${PN}-0.1.9998.3407-glibc-2.32+.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" \
+		-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"
+}