(Proxy-Commit) Port from dev overlay

Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.26-gentoo-r1 i686

5 files changed, 105 insertions, 6 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/Manifest b/dev-util/kbuild/Manifest
index 2cb38b4e13dd..ef9f5544306a 100644
--- a/dev-util/kbuild/Manifest
+++ b/dev-util/kbuild/Manifest
@@ -1,4 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX kbuild-fix-acl-include.patch 575 RMD160 a2b5b23f94c7d23be95324b46237c8f83e12cfe6 SHA1 e17b6befeea6384d8a7d836fb07f571a4c1d8f6c SHA256 3f9bbdf5b16a9c0e22413d3ab068b586962bab8adbb370071ab82c444143e01e
 DIST kBuild-0.1.3-src.tar.gz 10070233 RMD160 c550952feb8173e2ea8e066b0e95c9d94caa9224 SHA1 482a6c13d8aeb55dc23f4bc610bb415c91b3c183 SHA256 79d085b395b87fdf06d24bbf4e03801b5c35d61c7f41d5b0df6fa0b275b6b1b1
-EBUILD kbuild-0.1.3.ebuild 891 RMD160 3ac88b258f8d39f508161f4c6cc6e4e355321052 SHA1 cc2e9b0475f639a39ed2e05d2f08602e56634145 SHA256 9b09692a689f897435aaf05a13f608c072ee9217dab209df5cc8d8d771a301a3
-MISC ChangeLog 476 RMD160 da746f7534b855f311d64424f21359f39f8a1204 SHA1 924355907cdda9883c24d30e69eb6a19bb414472 SHA256 699bb0a7d53d0694c6397062ad4a1032c39681cb2ea4aacae7066d237dd65e48
+DIST kBuild-0.1.4-src.tar.gz 2293916 RMD160 067a69e5f2877a6734bccfc2fcc9754eab9dbc1c SHA1 49f2cb097867c2c057013c8e9868ae7bd04826d0 SHA256 fe17d9e7603206c4ee4f93ab328f3fd79863928c933bbc42d2f5cf3c789c4c68
+EBUILD kbuild-0.1.3.ebuild 982 RMD160 a027d21334a2852885a09be2aa1eb9c6295e377a SHA1 4b7be46280f6be201cfc260a4c45515b4f0b0c63 SHA256 c0678cc495ac3ff26fe802807c29b4baa041efc83e4ea1383ddfcbad44fb6ab3
+EBUILD kbuild-0.1.4.ebuild 993 RMD160 cc6fcb146d6e5a2d930692d33832670a7cf2b9d9 SHA1 0b7a8453d2386c38579b80ac6f7c8449bd94b7f7 SHA256 4096c8f872e84266575d5f219688001b4fec1b3a291a4dd5f68b775cd82fdd54
+MISC ChangeLog 1012 RMD160 e87219582b1c8f2a0e8ef9cf99c428dba909b791 SHA1 4c69fb3b621db0c8204273d76bf9a63f34a7dd9c SHA256 98fd34666af72744ace4783ac2895c134f1ad3574907622acedc6ab100a4b751
 MISC metadata.xml 344 RMD160 12935d5b21be85bc4222fd06371c93dcbf6f534e SHA1 68b99919921f246738cce4350b77d895e7c78106 SHA256 fff5aeb6f453d2e137765ca5016e81344cb0cd0cecd51d81bbb889cb1d7a5ba9
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkjOu0IACgkQz974XjDVpbkWOwCgwaSxOK4wTjyD+GP2h+Q1ln3p
+kg8An1w98mfd8YMZF25wa4ImaFiSNxUB
+=soFA
+-----END PGP SIGNATURE-----
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"
+}
+