gentoo resync : 20.10.2017

3 files changed, 35 insertions, 18 deletions

diff --git a/dev-util/kbuild/Manifest b/dev-util/kbuild/Manifest
index a76cf564151f..2fe24d78d498 100644
--- a/dev-util/kbuild/Manifest
+++ b/dev-util/kbuild/Manifest
@@ -3,12 +3,14 @@ AUX kbuild-0.1.9998_pre20110817-gcc-4.7.patch 315 SHA256 34a340193b7f6154ab8f5a6
 AUX kbuild-0.1.9998_pre20110817-gold.patch 795 SHA256 2c2de2d1abf4d9d71c8f14c60701a98223e83a86387dcbb3ce892022e2b67080 SHA512 6ea5d896fdd632355985bdaa69e36aa091fdddc925049dfcb7eab37472c88fde954c6b987a0e647e65832cec5c91ccad7ad8270376a112af95df90d4a60687f9 WHIRLPOOL d3f4413b0c6c493095a8d9344ee94fd02afd446421ad3b0713477846dc186da82c0602e232beacaae5ca97a17bf784f1f18cf172e42dc488a17a1977eb8fd973
 AUX kbuild-0.1.9998_pre20110817-kash-link-pthread.patch 296 SHA256 9370231d3ff856b8be43d352e2c6e29e66079467e99169ed234c3b0761666e90 SHA512 178da856a83631ca4d86a9b8c20e74b75b76426c177b87c26d4c4b3df86e72f3b6339e8f61948498ab9c4bf047119588f3df8ce78448160afa0840b2cf3aeabb WHIRLPOOL f1054aa09c6fcea126450441235fa32a3cce815ba7f54280d1a41793bca1572c3023d997d7d210e41f2511f15e0f059dbd4a99636fd3b11a5dd4593ffd6532aa
 AUX kbuild-0.1.9998_pre20120806-qa.patch 292 SHA256 ca14e0327ba1690ad12e37ea80d8fba04891ab0350e1fefcdb67ab64ce30cce7 SHA512 2a311e2e79c1e85c3c2c26b3d187355167c237c334687494a8e532b84232340df44b0d896fe6638bf1a9d4ba1c5f1efb29978de3bac0490fe04f2e57f7fb1874 WHIRLPOOL 50c63c97ac5e7784e4b1540459a1b3ffdfffecb590dd966f8d713a6e5e9f7250f37a8f234f845c326e578b43fd59b9a12f22975794138aba3784f20fdcee1bbc
+AUX kbuild-0.1.9998_pre20171020-gold.patch 619 SHA256 5f309584e339cbe417fe42a18e2cb48031eec10bd804390ffd50c170f36c2ef2 SHA512 a9d084b34d8bcb431748c6c87679db764557fa2f141f4b942cfe44ca05040dc6eb7f923be89db87d6f35f8d141f3725240dff7502fc919716aa081cdb145d521 WHIRLPOOL e296085447391b8ce08fa9a58db4dfa977d98c06d28de57c2a6dce57aad5de60907c3e626f24769421310ce2d36c4ce1c8bdad2727dca21d5b7cfdcfa5aa62cf
 AUX kbuild-glibc-2.10.patch 756 SHA256 d76d27fa7e4082d6a06434ff9006465d4c29a8ff2add8e3c25456c5bf412687d SHA512 dd8a9464c7014205bbed655a42325653618ad902493d7c73d714f7504a539159771d64b7e0d82aaaf76fadf3eb46dd663e62b5960c17077b8c80ac5f414555ce WHIRLPOOL dabea273f7b662195ec366bed94f2e6d06395ff17f4be856a7853857b32f0ff06a9a589877d63547b90b8c46b245c1c70d1cc755681c20a1bf41c820075e7256
 AUX kbuild-unknown-configure-opt.patch 355 SHA256 078c95e432c9774e81a2894096855b422a42f53650462cbdca16b72c78a05ef2 SHA512 26ae63facf7133be4fba606ad0b9488ea4c2ad2290a1e33a0f0c3283e0c8267eaae41bde6efaa52895b444178ec101a800ad580d2d85d0e69c56dc7db32b1105 WHIRLPOOL 700ffe9298bfd5c7f0259851214eb60cd9ce9152d64dbff4838fc9f1c1adbe14f66f4662d602cf6c0aba504a443af61562f0c118b066e00546762caa86ef6e87
 DIST kBuild-0.1.9998-pre20131130-src.tar.xz 1707632 SHA256 def0a44cc0a91b6aa8a80f73ace0cfc315f298ba3e0d3d81fe52834091b68586 SHA512 66f418c0e052389d2b5cfc4d46bc8598ceaeded369151047e455e921bef494ec42099cdc368d24b572eacd809bb7c124d07e0fab54788af01664b72f571fb047 WHIRLPOOL 95caf78eaa6ead0d9a009879a2ba9a01b138760345eb38a6786ceaf0262520e1827b5e4401884cd6d3849bfa5528f45a9a5cdac5ae61e6cbd1753dec0ba0da2f
 DIST kbuild-0.1.9998_pre20131130-tools_and_units_updates.patch.xz 7344 SHA256 0dcfb79274a96f1a67aa466ca468bebf00a39544517ad0d05c09595341d11e1a SHA512 91aac638e9f4cc321f7d06c89be1a4ce4e57aa88165c71a4f68a73ad51f049f631b2d7427178014408b551fac5678f0c0bf806a61f9d749daf5019f1b6a61bb0 WHIRLPOOL bb0a295e93870364ab176eaca3d07e18567148e5ba431a205085220b305b5cd78c210bea8896611bd4b9b47a71a527afc55a9a30a64b707993c576466609ee8a
+DIST kbuild-0.1.9998_pre20171020-src.tar.xz 2190856 SHA256 96b031b183ffb63cbbf77b1c68325868c1064d377c799ffcab0cdfb61d01aea7 SHA512 53c55a520f3711d1141b10eaeb3bec5dc57bb8476c6b658826e05dbb525eda43a0007dd94dcdde31ea39ad0bb29223ef8ad2a72da1404e53919e444039794043 WHIRLPOOL 86ce166505191eca0a83a238d61c6d2935fc43bd6d6a93c0b0dcec529a797d8a9589be4bf9498934bf7b6b80dcbfe5cf4193cd2969bf1fff5bc41209a51e5af0
 EBUILD kbuild-0.1.9998_pre20131130-r1.ebuild 1802 SHA256 f86e383bf28dfc9a4e0d0ff2579c19e60b2d658e5d527e2deec6743412ed9fc6 SHA512 39d21f6ac472c67c3f0aa9e1d160444f89bfdab05bef260eac07aeef9bd464a98f1fa8ce978a47ecd47af350c0484dffbc9c0b057f4d92a9bfdbbe95627fa92b WHIRLPOOL 2a80b07f6e5967f53192f4a7607fd1351841e69c956064703745b05b55a8b7ff36de791ddd8ff4e761d30d4126746b4f6b938abae8b2c6e0765a70cfa5db7c08
-EBUILD kbuild-0.1.9998_pre20131130.ebuild 1616 SHA256 b3402e34197a7a7ac33b2655861221a11404908795aaff1b560cb4607b6a7e26 SHA512 87d4115ee283744c2f6cf9a5f7d497024aea00d5d25c7f43861776ed49db9101dffc9a73e69ab811a7578db48ffd1543571d096dd4c2b2f7675d64095654f873 WHIRLPOOL 4975014c225224aeb2876a902f0bfa8a97294ddf40cfd64d45881955294de843816192e204e8d303efc38d3d99e7f6b102263ff1ad2f7053d5e87a12aa346038
+EBUILD kbuild-0.1.9998_pre20171020.ebuild 1552 SHA256 be1740bf17a0f31b0fc0c6dea10e7aaf10be5e7e265b06afe5fc9365677d49c2 SHA512 738255ee317a81d0d19b9613537381a10d624325291b356d7494748071f4a494f05f6fe0b075bd3cb39d0353110d00d1ea29df83560deaece8fa4d37f817e8bf WHIRLPOOL ea568606be2e25b912d41bb61a5b2dae0b191f7292c73a14aff65292ac0340726ac0953dcdfe606311c3f8614a639b8cebab54b5ba9837e403fcf94e6e1e9b77
 EBUILD kbuild-9999.ebuild 866 SHA256 774ea20b6cd9dd0ab75f1e96c15bc82c7c026ce7a4ed3cef8281f823dba32bd2 SHA512 eed52912df838735e25196dc2b836b7af459dcdd68338c8501c16dd534050c6650f9d973a41d694862d189d0a30ce12ebedf9793f3a5ddde3d9304d7bc78c999 WHIRLPOOL ab097ab4f5639950823b96bef757e7c52f2d34d253ab75b27a2d2bc33cd6d2fa4cfbbf0ed99afb080b311d626acf4bde30884af4fa5ab2991904f981b3a92bff
 MISC ChangeLog 4206 SHA256 3cdc60eb74d96e9c2f92f1d1dbfddd210671a7f620156f199563a358664c8668 SHA512 f0bf84948ff13dd44b9cd5a0a87d4be8d1127a8d92c115bfed38a7cb3e658760906c7321b51a2ad0f932922c408467e6953e8868babe260c27180b1484b754d1 WHIRLPOOL 44aeb415a41f98f4aa15b3fbbeadc8c8099afb5ebfc6aca1eef16b4c494ab60f70fdcb352cbcfcc01b1cf0caaf197c592b94a6dc9dd90e110bdf17df83608a21
 MISC ChangeLog-2015 7510 SHA256 fd408d7e21f962dd5fcfd3714842a8b02ace87d5268be25c84189674908f4d8d SHA512 2a2c57de330a59f60932d039492b22448c34c4c8770922aae0840c48235a8896d99b0e505ad83fa292cdee6d22ebe28c5bc067e07e457bd6aa28f6bc4e27d2ec WHIRLPOOL 06add0bf5d8b5c8fff6ba2ecea9a4a6228ad6f0ff90b95851cc212a4ca687d5fbf38ee5c2e8dcfce416fb1f6356071d2cebdc1d4923d99755ca107ae3b8d1941
diff --git a/dev-util/kbuild/files/kbuild-0.1.9998_pre20171020-gold.patch b/dev-util/kbuild/files/kbuild-0.1.9998_pre20171020-gold.patch
new file mode 100644
index 000000000000..4c98942c0f3a
--- /dev/null
+++ b/dev-util/kbuild/files/kbuild-0.1.9998_pre20171020-gold.patch
@@ -0,0 +1,11 @@
+--- kbuild-0.1.9998_pre20171020/src/kmk/Makefile.kmk
++++ kbuild-0.1.9998_pre20171020/src/kmk/Makefile.kmk
+@@ -57,7 +57,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) - windows only.
+ 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/kbuild-0.1.9998_pre20131130.ebuild b/dev-util/kbuild/kbuild-0.1.9998_pre20171020.ebuild
index b96e4f88d758..612e8ebbab1d 100644
--- a/dev-util/kbuild/kbuild-0.1.9998_pre20131130.ebuild
+++ b/dev-util/kbuild/kbuild-0.1.9998_pre20171020.ebuild
@@ -1,39 +1,43 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=6
 
 inherit eutils autotools toolchain-funcs
 
-MY_P=kBuild-${PV/_/-}-src
+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"
+LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
-DEPEND="sys-apps/texinfo
+DEPEND="
+	sys-apps/texinfo
 	sys-devel/flex
 	sys-devel/gettext
-	virtual/yacc"
+	virtual/yacc
+"
 RDEPEND=""
 
-S=${WORKDIR}/${MY_P/-src}
+PATCHES=(
+	"${FILESDIR}/${PN}-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_pre20171020-gold.patch"
+)
 
 src_prepare() {
 	rm -rf "${S}/kBuild/bin"
 
-	epatch "${FILESDIR}/${PN}-unknown-configure-opt.patch" \
-		"${FILESDIR}/${PN}-glibc-2.10.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_pre20110817-gold.patch" \
-		"${FILESDIR}/${PN}-0.1.9998_pre20110817-gcc-4.7.patch"
+	default
+
+	mv src/kmk/configure.{in,ac} || die
 
 	cd "${S}/src/kmk" || die
 	eautoreconf
@@ -42,13 +46,13 @@ src_prepare() {
 	sed 's@AM_CONFIG_HEADER@AC_CONFIG_HEADERS@' -i configure.ac || die
 	eautoreconf
 
-	sed -e "s@_LDFLAGS\.${ARCH}*.*=@& ${LDFLAGS}@g" \
+	sed -e "s@_LDFLAGS\.$(tc-arch)*.*=@& ${LDFLAGS}@g" \
 		-i "${S}"/Config.kmk || die #332225
 	tc-export CC RANLIB #AR does not work here
 }
 
 src_compile() {
-	kBuild/env.sh --full make -f bootstrap.gmk AUTORECONF=true AR="$(tc-getAR)" \
+	kBuild/env.sh --full emake -f bootstrap.gmk AUTORECONF=true AR="$(tc-getAR)" \
 		|| die "bootstrap failed"
 }