(Proxy-Commit) Port from dev overlay

(Portage version: 2.2_rc8/cvs/Linux 2.6.26-gentoo-r1 i686)

4 files changed, 90 insertions, 4 deletions

diff --git a/dev-util/kbuild/ChangeLog b/dev-util/kbuild/ChangeLog
index b3fbe7043371..d6333b9cdd67 100644
--- a/dev-util/kbuild/ChangeLog
+++ b/dev-util/kbuild/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for dev-util/kbuild
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/kbuild/ChangeLog,v 1.1 2008/09/06 19:18:40 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/kbuild/ChangeLog,v 1.2 2008/09/15 19:45:13 jokey Exp $
+
+*kbuild-0.1.4 (15 Sep 2008)
+
+  15 Sep 2008; Markus Ullmann <jokey@gentoo.org>
+  +files/kbuild-fix-acl-include.patch, kbuild-0.1.3.ebuild,
+  +kbuild-0.1.4.ebuild:
+  (Proxy-Commit) Port from dev overlay
+
+  13 Sep 2008; Alessio Cassibba (X-Drum) <swapon@gmail.com>
+  kbuild-0.1.3.ebuild, -files/kbuild-0.1.3-fix-acl-include.patch,
+  +kbuild-0.1.4.ebuild, +files/kbuild-fix-acl-include.patch:
+  Version bump: remove dev-util/yacc from DEPEND, see bug #236948; fix unused
+  sys/acl.h include, thanks to all people involved, see bug #236949
 
 *kbuild-0.1.3 (06 Sep 2008)
 
diff --git a/dev-util/kbuild/files/kbuild-fix-acl-include.patch b/dev-util/kbuild/files/kbuild-fix-acl-include.patch
new file mode 100644
index 000000000000..72a356b7bc40
--- /dev/null
+++ b/dev-util/kbuild/files/kbuild-fix-acl-include.patch
@@ -0,0 +1,24 @@
+--- src/kmk/kmkbuiltin/mv.c.orig	2008-09-07 23:35:35.000000000 +0200
++++ src/kmk/kmkbuiltin/mv.c	2008-09-07 23:37:50.000000000 +0200
+@@ -48,9 +48,6 @@
+ 
+ #include <sys/types.h>
+ #ifndef _MSC_VER
+-# ifndef __OS2__
+-#  include <sys/acl.h>
+-# endif
+ # include <sys/param.h>
+ # include <sys/time.h>
+ # include <sys/wait.h>
+@@ -91,6 +88,11 @@
+ 
+ static int	do_move(char *, char *);
+ #ifdef CROSS_DEVICE_MOVE
++#ifndef _MSC_VER
++# ifndef __OS2__
++#  include <sys/acl.h>
++# endif
++#endif
+ static int	fastcopy(char *, char *, struct stat *);
+ static int	copy(char *, char *);
+ #endif
diff --git a/dev-util/kbuild/kbuild-0.1.3.ebuild b/dev-util/kbuild/kbuild-0.1.3.ebuild
index 530b87361ff7..c31159162e61 100644
--- a/dev-util/kbuild/kbuild-0.1.3.ebuild
+++ b/dev-util/kbuild/kbuild-0.1.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/kbuild/kbuild-0.1.3.ebuild,v 1.2 2008/09/06 20:18:51 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/kbuild/kbuild-0.1.3.ebuild,v 1.3 2008/09/15 19:45:13 jokey Exp $
 
 EAPI=1
 
@@ -18,8 +18,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-DEPEND="dev-util/yacc
-		dev-util/cvs"
+DEPEND="dev-util/cvs"
 
 S=${WORKDIR}/${MY_P/-src}
 
@@ -27,6 +26,9 @@ src_unpack() {
 		unpack ${A}
 		cd "${S}"
 
+		# Fix the unneeded inclusion of sys/acl.h (bug #236949)
+		epatch "${FILESDIR}/${PN}-fix-acl-include.patch"
+
 		rm -rf "${S}/kBuild/bin"
 }
 
@@ -41,3 +43,4 @@ src_install() {
 		PATH_INS="${D}" \
 		install || die "install failed"
 }
+
diff --git a/dev-util/kbuild/kbuild-0.1.4.ebuild b/dev-util/kbuild/kbuild-0.1.4.ebuild
new file mode 100644
index 000000000000..e6d28a889d59
--- /dev/null
+++ b/dev-util/kbuild/kbuild-0.1.4.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/kbuild/kbuild-0.1.4.ebuild,v 1.1 2008/09/15 19:45:13 jokey Exp $
+
+EAPI=1
+
+WANT_AUTOMAKE=1.9
+
+inherit eutils autotools
+
+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/incoming/kBuild-${PV}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-util/cvs"
+
+S=${WORKDIR}/${MY_P/-src}
+
+src_unpack() {
+		unpack ${A}
+		cd "${S}"
+
+		# Fix the unneeded inclusion of sys/acl.h (bug #236949)
+		epatch "${FILESDIR}/${PN}-fix-acl-include.patch"
+
+		rm -rf "${S}/kBuild/bin"
+}
+
+src_compile() {
+		kBuild/env.sh --full \
+		make -f bootstrap.gmk || die "bootstrap failed"
+}
+
+src_install() {
+		kBuild/env.sh kmk \
+		NIX_INSTALL_DIR=/usr \
+		PATH_INS="${D}" \
+		install || die "install failed"
+}
+