[gentoo-commits] repo/gentoo:master commit in: dev-util/kbuild/files/, dev-util/kbuild/

2022-11-20 Thread Viorel Munteanu 
commit: f45da0c9f37fb20e37a2a2b218dd154d4f805b48
Author: Viorel Munteanu  gentoo  org>
AuthorDate: Sun Nov 20 14:15:46 2022 +
Commit: Viorel Munteanu  gentoo  org>
CommitDate: Mon Nov 21 06:11:41 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f45da0c9

dev-util/kbuild: fix -Wimplicit-function-declaration

Closes: https://bugs.gentoo.org/882143
Closes: https://github.com/gentoo/gentoo/pull/28350
Signed-off-by: Viorel Munteanu  gentoo.org>

 ...1.9998.3499-implicit-function-declaration.patch | 74 ++
 dev-util/kbuild/kbuild-0.1.9998.3499.ebuild|  1 +
 dev-util/kbuild/kbuild-0.1.9998.3572.ebuild|  1 +
 dev-util/kbuild/kbuild-.ebuild |  1 +
 4 files changed, 77 insertions(+)

diff --git 
a/dev-util/kbuild/files/kbuild-0.1.9998.3499-implicit-function-declaration.patch
 
b/dev-util/kbuild/files/kbuild-0.1.9998.3499-implicit-function-declaration.patch
new file mode 100644
index ..2d25eacb9826
--- /dev/null
+++ 
b/dev-util/kbuild/files/kbuild-0.1.9998.3499-implicit-function-declaration.patch
@@ -0,0 +1,74 @@
+Add a few includes to fix this warning: -Wimplicit-function-declaration
+Bug: https://bugs.gentoo.org/882143
+
+--- a/src/sed/lib/utils.c
 b/src/sed/lib/utils.c
+@@ -27,7 +27,8 @@
+ 
+ #ifdef HAVE_STRINGS_H
+ # include 
+-#else
++#endif
++#ifdef HAVE_STRING_H
+ # include 
+ #endif /* HAVE_STRINGS_H */
+ 
+--- a/src/sed/sed/execute.c
 b/src/sed/sed/execute.c
+@@ -46,7 +46,8 @@
+ 
+ #ifdef HAVE_STRINGS_H
+ # include 
+-#else
++#endif
++#ifdef HAVE_STRING_H
+ # include 
+ #endif /*HAVE_STRINGS_H*/
+ #ifdef HAVE_MEMORY_H
+--- a/src/sed/sed/fmt.c
 b/src/sed/sed/fmt.c
+@@ -22,6 +22,7 @@
+ #include 
+ #include 
+ #include 
++#include 
+ 
+ #if HAVE_LIMITS_H
+ # include 
+--- a/src/sed/sed/mbcs.c
 b/src/sed/sed/mbcs.c
+@@ -17,6 +17,7 @@
+ 
+ #include "sed.h"
+ #include 
++#include 
+ 
+ int mb_cur_max;
+ 
+--- a/src/sed/sed/regexp.c
 b/src/sed/sed/regexp.c
+@@ -22,6 +22,9 @@
+ #ifdef HAVE_STDLIB_H
+ # include 
+ #endif
++#ifdef HAVE_STRING_H
++# include 
++#endif
+ 
+ #ifdef gettext_noop
+ # define N_(String) gettext_noop(String)
+--- a/src/sed/sed/sed.c
 b/src/sed/sed/sed.c
+@@ -26,9 +26,10 @@
+ #include 
+ #ifdef HAVE_STRINGS_H
+ # include 
+-#else
+-# include 
+ #endif /*HAVE_STRINGS_H*/
++#ifdef HAVE_STRING_H
++# include 
++#endif /*HAVE_STRING_H*/
+ #ifdef HAVE_MEMORY_H
+ # include 
+ #endif

diff --git a/dev-util/kbuild/kbuild-0.1.9998.3499.ebuild 
b/dev-util/kbuild/kbuild-0.1.9998.3499.ebuild
index 2954327d377c..26cf9c604e83 100644
--- a/dev-util/kbuild/kbuild-0.1.9998.3499.ebuild
+++ b/dev-util/kbuild/kbuild-0.1.9998.3499.ebuild
@@ -36,6 +36,7 @@ PATCHES=(
 
"${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"
 )
 
 pkg_setup() {

diff --git a/dev-util/kbuild/kbuild-0.1.9998.3572.ebuild 
b/dev-util/kbuild/kbuild-0.1.9998.3572.ebuild
index 185af8e39997..37288f1c0a38 100644
--- a/dev-util/kbuild/kbuild-0.1.9998.3572.ebuild
+++ b/dev-util/kbuild/kbuild-0.1.9998.3572.ebuild
@@ -29,6 +29,7 @@ PATCHES=(
"${FILESDIR}/${PN}-0.1.9998_pre20110817-kash-link-pthread.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"
 )
 
 pkg_setup() {

diff --git a/dev-util/kbuild/kbuild-.ebuild 
b/dev-util/kbuild/kbuild-.ebuild
index 15625b4196bf..79e18d1b7a14 100644
--- a/dev-util/kbuild/kbuild-.ebuild
+++ b/dev-util/kbuild/kbuild-.ebuild
@@ -36,6 +36,7 @@ PATCHES=(
#"${FILESDIR}/${PN}-0.1.9998.3407-gold.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"
 )
 
 pkg_setup() {

[gentoo-commits] repo/gentoo:master commit in: dev-util/kbuild/files/, dev-util/kbuild/

2020-08-11 Thread Lars Wendler 
commit: d73a70b1e1ca620d9301361ebef944bbbffddeb5
Author: Lars Wendler  gentoo  org>
AuthorDate: Tue Aug 11 11:20:41 2020 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Tue Aug 11 11:20:54 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d73a70b1

dev-util/kbuild: Bump to version 0.1.9998.3407

Don't depend on virtual/yacc until bug #734354 has been fixed.

Bug: https://bugs.gentoo.org/734354
Package-Manager: Portage-3.0.2, Repoman-2.3.23
Signed-off-by: Lars Wendler  gentoo.org>

 dev-util/kbuild/Manifest   |  1 +
 .../kbuild/files/kbuild-0.1.9998.3407-gold.patch   | 11 
 ...build-0.1.9998.3407-unknown_configure_opt.patch | 20 +++
 dev-util/kbuild/kbuild-0.1.9998.3407.ebuild| 70 ++
 4 files changed, 102 insertions(+)

diff --git a/dev-util/kbuild/Manifest b/dev-util/kbuild/Manifest
index 60046a20306..266a61f5a37 100644
--- a/dev-util/kbuild/Manifest
+++ b/dev-util/kbuild/Manifest
@@ -1 +1,2 @@
 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

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 000..14d5ec7cc42
--- /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 000..2714716b780
--- /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 000..e6a93dc696e
--- /dev/null
+++ b/dev-util/kbuild/kbuild-0.1.9998.3407.ebuild
@@ -0,0 +1,70 @@
+# 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
+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

[gentoo-commits] repo/gentoo:master commit in: dev-util/kbuild/files/, dev-util/kbuild/

2018-11-03 Thread Lars Wendler 
commit: 25ea2ac3672e58ca5baa29252207e2f3b395225a
Author: Lars Wendler  gentoo  org>
AuthorDate: Sat Nov  3 20:46:04 2018 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Sat Nov  3 20:46:04 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=25ea2ac3

dev-util/kbuild: Removed old.

Signed-off-by: Lars Wendler  gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 dev-util/kbuild/Manifest   |  2 -
 .../kbuild-0.1.9998_pre20110817-gcc-4.7.patch  | 11 
 .../files/kbuild-0.1.9998_pre20110817-gold.patch   | 16 --
 dev-util/kbuild/files/kbuild-glibc-2.10.patch  | 31 --
 .../kbuild/kbuild-0.1.9998_pre20131130-r1.ebuild   | 66 --
 5 files changed, 126 deletions(-)

diff --git a/dev-util/kbuild/Manifest b/dev-util/kbuild/Manifest
index dab33c879b6..04c82e912dc 100644
--- a/dev-util/kbuild/Manifest
+++ b/dev-util/kbuild/Manifest
@@ -1,4 +1,2 @@
-DIST kBuild-0.1.9998-pre20131130-src.tar.xz 1707632 BLAKE2B 
51d68203d38a6cc86a32e6c66431739a87df738e920bfc9ff902433a46279fd62c704d9bcae02f0a1cb6a1f97cf68dab059c636ebd425d2b15c50c9c9cb4fcc6
 SHA512 
66f418c0e052389d2b5cfc4d46bc8598ceaeded369151047e455e921bef494ec42099cdc368d24b572eacd809bb7c124d07e0fab54788af01664b72f571fb047
 DIST kbuild-0.1.9998.3127-src.tar.xz 2221336 BLAKE2B 
12eb542553c2abe4419440d124ed9c6b3c485fc77ca20bc8b8d5265cf2d91003e3bee21ad7e247f1da43c88bd29fdc5d317e42bfca213cde1ac0c900cce03fcf
 SHA512 
b4cfca917efdb19b015a70efc15fdb0f2f08a4b6e493c7ac121dada97866b2f57cb9be9db9dd9b337eda4d5772ab850bf0586e5bfdc370e1332659363374f78d
 DIST kbuild-0.1.9998.3149-src.tar.xz 2314792 BLAKE2B 
84aa1dbbaefc64a3ecc954c383d0516d88efd1a1791180164dd7bc3b26cd82a4a8c35c4b308e9fc960f114c40e77ea4a27acd94b62883c379acefb324a7c3f72
 SHA512 
74808e6279c01739170535655edbbffb73809f60b18c7ee63a110af7af651628789b9e5d253821f5685f8e8c072890c4669493e64886f53587b810ea0f67826c
-DIST kbuild-0.1.9998_pre20131130-tools_and_units_updates.patch.xz 7344 BLAKE2B 
75d24ba49ee69a11b8e1d798ebee4470fa50ec4970299faaa67b0537d21729053fa24142d02e428cb56c429c6c17d581d147d659c3a3ad11693e2fa6ab4e6d72
 SHA512 
91aac638e9f4cc321f7d06c89be1a4ce4e57aa88165c71a4f68a73ad51f049f631b2d7427178014408b551fac5678f0c0bf806a61f9d749daf5019f1b6a61bb0

diff --git a/dev-util/kbuild/files/kbuild-0.1.9998_pre20110817-gcc-4.7.patch 
b/dev-util/kbuild/files/kbuild-0.1.9998_pre20110817-gcc-4.7.patch
deleted file mode 100644
index eb71fb02f4f..000
--- a/dev-util/kbuild/files/kbuild-0.1.9998_pre20110817-gcc-4.7.patch
+++ /dev/null
@@ -1,11 +0,0 @@
 kBuild-0.1.9998-pre20110817/src/sed/lib/regex_internal.c
-+++ kBuild-0.1.9998-pre20110817/src/sed/lib/regex_internal.c
-@@ -781,7 +781,7 @@
- }
- 
- static unsigned char
--internal_function __attribute ((pure))
-+internal_function
- re_string_fetch_byte_case (re_string_t *pstr)
- {
-   if (BE (!pstr->mbs_allocated, 1))

diff --git a/dev-util/kbuild/files/kbuild-0.1.9998_pre20110817-gold.patch 
b/dev-util/kbuild/files/kbuild-0.1.9998_pre20110817-gold.patch
deleted file mode 100644
index 8ad2ab3269c..000
--- a/dev-util/kbuild/files/kbuild-0.1.9998_pre20110817-gold.patch
+++ /dev/null
@@ -1,16 +0,0 @@
- src/kmk/Makefile.kmk |2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/src/kmk/Makefile.kmk b/src/kmk/Makefile.kmk
-index fe2cd43..135431e 100644
 a/src/kmk/Makefile.kmk
-+++ b/src/kmk/Makefile.kmk
-@@ -59,7 +59,7 @@ TEMPLATE_BIN-KMK_INCS.dragonfly = glob
- TEMPLATE_BIN-KMK_INCS.freebsd = glob
- TEMPLATE_BIN-KMK_INCS.openbsd = glob
- TEMPLATE_BIN-KMK_INCS.solaris = glob
--TEMPLATE_BIN-KMK_LIBS = $(TEMPLATE_BIN-THREADED_LIBS) $(kmkmissing_1_TARGET) 
$(LIB_KUTIL)
-+TEMPLATE_BIN-KMK_LIBS = $(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/files/kbuild-glibc-2.10.patch 
b/dev-util/kbuild/files/kbuild-glibc-2.10.patch
deleted file mode 100644
index d24a8f7439d..000
--- a/dev-util/kbuild/files/kbuild-glibc-2.10.patch
+++ /dev/null
@@ -1,31 +0,0 @@
 kBuild-0.1.5/src/ash/output.c
-+++ kBuild-0.1.5/src/ash/output.c
-@@ -230,6 +230,7 @@
-   va_end(ap);
- }
- 
-+#if 0
- void
- dprintf(const char *fmt, ...)
- {
-@@ -240,6 +241,7 @@
-   va_end(ap);
-   flushout(out2);
- }
-+#endif
- 
- void
- fmtstr(char *outbuf, size_t length, const char *fmt, ...)
 kBuild-0.1.5/src/ash/output.h
-+++ kBuild-0.1.5/src/ash/output.h
-@@ -65,8 +65,10 @@
- __attribute__((__format__(__printf__,2,3)));
- void out1fmt(const char *, ...)
- __attribute__((__format__(__printf__,1,2)));
-+#if 0
- void dprintf(const char *, ...)
- __attribute__((__format__(__printf__,1,2)));
-+#endif
- void fmtstr(char *, size_t, const char *, ...)
-

[gentoo-commits] repo/gentoo:master commit in: dev-util/kbuild/files/, dev-util/kbuild/

2016-07-12 Thread Lars Wendler 
commit: 84dc88c11d486eaf413ad57abe89160680c5b28c
Author: Lars Wendler  gentoo  org>
AuthorDate: Tue Jul 12 09:24:10 2016 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Tue Jul 12 09:45:21 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84dc88c1

dev-util/kbuild: Removed old.

Package-Manager: portage-2.3.0
Signed-off-by: Lars Wendler  gentoo.org>

 dev-util/kbuild/Manifest   |  1 -
 dev-util/kbuild/files/kbuild-0.1.5_p2-qa.patch | 26 --
 dev-util/kbuild/kbuild-0.1.9998_pre20120806.ebuild | 58 --
 3 files changed, 85 deletions(-)

diff --git a/dev-util/kbuild/Manifest b/dev-util/kbuild/Manifest
index 0f13a4a..dca309f 100644
--- a/dev-util/kbuild/Manifest
+++ b/dev-util/kbuild/Manifest
@@ -1,3 +1,2 @@
-DIST kBuild-0.1.9998-pre20120806-src.tar.xz 1665728 SHA256 
c8e1c78513b6a8c32cc9a4998f2645a17054b1740bc5f13f587bb8de23840d03 SHA512 
61e3fb2405dbfdd464eec580a9b2ed953533abdb07b4aad051029e46a1cccb1cef9037c2f9d0b1a06b3e505e8b484f060bec1d97f10ef7933de484429efa281e
 WHIRLPOOL 
c88b2e0996905137bbf773c219a53a025cadb1a5362236b891b2d38e0ad0a9264d330f1a258a4c6d6cc3ffde3475fe9d7ae794f8a9b6f017ea1f4fab000fe978
 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

diff --git a/dev-util/kbuild/files/kbuild-0.1.5_p2-qa.patch 
b/dev-util/kbuild/files/kbuild-0.1.5_p2-qa.patch
deleted file mode 100644
index 706c3a7..000
--- a/dev-util/kbuild/files/kbuild-0.1.5_p2-qa.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-* warning: implicit declaration of function ‘unlink’
-* warning: too few arguments for format
 a/src/sed/lib/utils.c
-+++ b/src/sed/lib/utils.c
-@@ -35,6 +35,10 @@
- # include 
- #endif /* HAVE_STDLIB_H */
- 
-+#ifdef HAVE_UNISTD_H
-+# include 
-+#endif /* HAVE_UNISTD_H */
-+
- #include "utils.h"
- 
- const char *myname;
 a/src/kmk/kmkbuiltin/printf.c
-+++ b/src/kmk/kmkbuiltin/printf.c
-@@ -206,7 +206,7 @@
- 
-   (void)funcname;
-   if (rc != 0)
--  fatal (NILF, _("$(%s): failure rc=%d\n"), rc);
-+  fatal (NILF, _("$(%s): failure rc=%d\n"), funcname, rc);
-   return o;
- }
- #endif

diff --git a/dev-util/kbuild/kbuild-0.1.9998_pre20120806.ebuild 
b/dev-util/kbuild/kbuild-0.1.9998_pre20120806.ebuild
deleted file mode 100644
index e4d0de8..000
--- a/dev-util/kbuild/kbuild-0.1.9998_pre20120806.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit eutils autotools toolchain-funcs
-
-MY_P=kBuild-${PV/_/-}-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=""
-
-DEPEND="sys-devel/flex
-   sys-devel/gettext
-   virtual/yacc"
-RDEPEND=""
-
-S=${WORKDIR}/${MY_P/-src}
-
-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"
-
-   cd "${S}/src/kmk" || die
-   eautoreconf
-   cd "${S}/src/sed" || die
-   # AM_CONFIG_HEADER is obsolete since automake-1.13 (bug #467104)
-   sed 's@AM_CONFIG_HEADER@AC_CONFIG_HEADERS@' -i configure.ac || die
-   eautoreconf
-
-   sed -e "s@_LDFLAGS\.${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)" \
-   || die "bootstrap failed"
-}
-
-src_install() {
-   kBuild/env.sh kmk NIX_INSTALL_DIR=/usr PATH_INS="${D}" install \

[gentoo-commits] repo/gentoo:master commit in: dev-util/kbuild/files/, dev-util/kbuild/

2016-07-12 Thread Lars Wendler 
commit: 7d03d554bdaa418a3478bee1ca5d5fdcdfc7c168
Author: Lars Wendler  gentoo  org>
AuthorDate: Tue Jul 12 09:23:09 2016 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Tue Jul 12 09:45:19 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d03d554

dev-util/kbuild: Revbump to add qt5 support. Bumped EAPI to 6.

Package-Manager: portage-2.3.0
Signed-off-by: Lars Wendler  gentoo.org>

 dev-util/kbuild/Manifest   |  1 +
 .../kbuild/files/kbuild-0.1.5-gentoo-docdir.patch  |  4 +-
 .../kbuild-0.1.9998_pre20110817-gcc-4.7.patch  |  5 +-
 dev-util/kbuild/files/kbuild-glibc-2.10.patch  | 10 ++--
 .../files/kbuild-unknown-configure-opt.patch   |  5 +-
 .../kbuild/kbuild-0.1.9998_pre20131130-r1.ebuild   | 66 ++
 6 files changed, 77 insertions(+), 14 deletions(-)

diff --git a/dev-util/kbuild/Manifest b/dev-util/kbuild/Manifest
index 52025f0..0f13a4a 100644
--- a/dev-util/kbuild/Manifest
+++ b/dev-util/kbuild/Manifest
@@ -1,2 +1,3 @@
 DIST kBuild-0.1.9998-pre20120806-src.tar.xz 1665728 SHA256 
c8e1c78513b6a8c32cc9a4998f2645a17054b1740bc5f13f587bb8de23840d03 SHA512 
61e3fb2405dbfdd464eec580a9b2ed953533abdb07b4aad051029e46a1cccb1cef9037c2f9d0b1a06b3e505e8b484f060bec1d97f10ef7933de484429efa281e
 WHIRLPOOL 
c88b2e0996905137bbf773c219a53a025cadb1a5362236b891b2d38e0ad0a9264d330f1a258a4c6d6cc3ffde3475fe9d7ae794f8a9b6f017ea1f4fab000fe978
 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

diff --git a/dev-util/kbuild/files/kbuild-0.1.5-gentoo-docdir.patch 
b/dev-util/kbuild/files/kbuild-0.1.5-gentoo-docdir.patch
index 4f16539..b074a98 100644
--- a/dev-util/kbuild/files/kbuild-0.1.5-gentoo-docdir.patch
+++ b/dev-util/kbuild/files/kbuild-0.1.5-gentoo-docdir.patch
@@ -1,5 +1,5 @@
 Config.kmk
-+++ Config.kmk
+--- a/Config.kmk
 b/Config.kmk
 @@ -147,7 +147,7 @@
MY_INST_DATA := $(MY_INST_ROOT)share/kBuild/
   endif

diff --git a/dev-util/kbuild/files/kbuild-0.1.9998_pre20110817-gcc-4.7.patch 
b/dev-util/kbuild/files/kbuild-0.1.9998_pre20110817-gcc-4.7.patch
index 435b3f5..eb71fb0 100644
--- a/dev-util/kbuild/files/kbuild-0.1.9998_pre20110817-gcc-4.7.patch
+++ b/dev-util/kbuild/files/kbuild-0.1.9998_pre20110817-gcc-4.7.patch
@@ -1,6 +1,5 @@
-diff -urN kBuild-0.1.9998-pre20110817-orig/src/sed/lib/regex_internal.c 
kBuild-0.1.9998-pre20110817/src/sed/lib/regex_internal.c
 kBuild-0.1.9998-pre20110817-orig/src/sed/lib/regex_internal.c  
2011-08-17 14:28:42.0 -0700
-+++ kBuild-0.1.9998-pre20110817/src/sed/lib/regex_internal.c   2012-06-16 
13:55:05.341176965 -0700
+--- kBuild-0.1.9998-pre20110817/src/sed/lib/regex_internal.c
 kBuild-0.1.9998-pre20110817/src/sed/lib/regex_internal.c
 @@ -781,7 +781,7 @@
  }
  

diff --git a/dev-util/kbuild/files/kbuild-glibc-2.10.patch 
b/dev-util/kbuild/files/kbuild-glibc-2.10.patch
index a1d17d7..d24a8f7 100644
--- a/dev-util/kbuild/files/kbuild-glibc-2.10.patch
+++ b/dev-util/kbuild/files/kbuild-glibc-2.10.patch
@@ -1,6 +1,5 @@
-diff -ruN kBuild-0.1.5-orig/src/ash/output.c kBuild-0.1.5/src/ash/output.c
 kBuild-0.1.5-orig/src/ash/output.c 2009-04-08 18:21:26.0 -0400
-+++ kBuild-0.1.5/src/ash/output.c  2009-05-22 20:11:49.0 -0400
+--- kBuild-0.1.5/src/ash/output.c
 kBuild-0.1.5/src/ash/output.c
 @@ -230,6 +230,7 @@
va_end(ap);
  }
@@ -17,9 +16,8 @@ diff -ruN kBuild-0.1.5-orig/src/ash/output.c 
kBuild-0.1.5/src/ash/output.c
  
  void
  fmtstr(char *outbuf, size_t length, const char *fmt, ...)
-diff -ruN kBuild-0.1.5-orig/src/ash/output.h kBuild-0.1.5/src/ash/output.h
 kBuild-0.1.5-orig/src/ash/output.h 2009-04-08 18:21:26.0 -0400
-+++ kBuild-0.1.5/src/ash/output.h  2009-05-22 20:12:28.0 -0400
+--- kBuild-0.1.5/src/ash/output.h
 kBuild-0.1.5/src/ash/output.h
 @@ -65,8 +65,10 @@
  __attribute__((__format__(__printf__,2,3)));
  void out1fmt(const char *, ...)

diff --git a/dev-util/kbuild/files/kbuild-unknown-configure-opt.patch 
b/dev-util/kbuild/files/kbuild-unknown-configure-opt.patch
index c9a8994..36cabae 100644
--- a/dev-util/kbuild/files/kbuild-unknown-configure-opt.patch
+++ b/dev-util/kbuild/files/kbuild-unknown-configure-opt.patch
@@ -1,6