Version bump and ebuild cleanups (bug #317329) docdir installation fix (bug #295784)

(Portage version: 2.2_rc67/cvs/Linux x86_64)

8 files changed, 91 insertions, 135 deletions

diff --git a/dev-util/kbuild/ChangeLog b/dev-util/kbuild/ChangeLog
index 48a876da2fd3..3662dc3788ac 100644
--- a/dev-util/kbuild/ChangeLog
+++ b/dev-util/kbuild/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for dev-util/kbuild
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/kbuild/ChangeLog,v 1.12 2009/11/09 13:06:05 maekke Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/kbuild/ChangeLog,v 1.13 2010/06/03 18:11:47 polynomial-c Exp $
+
+*kbuild-0.1.5_p2 (03 Jun 2010)
+
+  03 Jun 2010; Lars Wendler <polynomial-c@gentoo.org> -kbuild-0.1.4.ebuild,
+  -kbuild-0.1.5.ebuild, kbuild-0.1.5-r1.ebuild, +kbuild-0.1.5_p2.ebuild,
+  +files/kbuild-0.1.5-gentoo-docdir.patch,
+  -files/kbuild-fix-acl-include.patch, metadata.xml:
+  Version bump and ebuild cleanups suggested by Chris Beswick (bug #317329).
+  Fixed installation into wrong docdir reported by flameeyes (bug #295784).
+  Fix added to stable version as well without revbump.
+  Removed old versions.
+  Added myself as maintainer.
 
   09 Nov 2009; Markus Meier <maekke@gentoo.org> kbuild-0.1.5-r1.ebuild:
   amd64 stable, bug #285451
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
new file mode 100644
index 000000000000..4f1653973bfe
--- /dev/null
+++ b/dev-util/kbuild/files/kbuild-0.1.5-gentoo-docdir.patch
@@ -0,0 +1,11 @@
+--- Config.kmk
++++ Config.kmk
+@@ -147,7 +147,7 @@
+   MY_INST_DATA := $(MY_INST_ROOT)share/kBuild/
+  endif
+  ifndef MY_INST_DOC
+-  MY_INST_DOC := $(MY_INST_ROOT)share/doc/kBuild-$(KBUILD_VERSION)/
++  MY_INST_DOC := $(MY_INST_ROOT)share/doc/$(PF)/
+  endif
+  if !defined(MY_INST_BIN_MODE) && defined(MY_INST_MODE)
+   MY_INST_BIN_MODE := $(MY_INST_MODE),a+x
diff --git a/dev-util/kbuild/files/kbuild-fix-acl-include.patch b/dev-util/kbuild/files/kbuild-fix-acl-include.patch
deleted file mode 100644
index 72a356b7bc40..000000000000
--- a/dev-util/kbuild/files/kbuild-fix-acl-include.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- 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.4.ebuild b/dev-util/kbuild/kbuild-0.1.4.ebuild
deleted file mode 100644
index 75ed173e6c16..000000000000
--- a/dev-util/kbuild/kbuild-0.1.4.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2009 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.5 2009/10/12 07:58:02 ssuominen Exp $
-
-EAPI=1
-inherit eutils
-
-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
-	sys-devel/gettext"
-
-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"
-}
diff --git a/dev-util/kbuild/kbuild-0.1.5-r1.ebuild b/dev-util/kbuild/kbuild-0.1.5-r1.ebuild
index d53adbcd63e7..3485bafec967 100644
--- a/dev-util/kbuild/kbuild-0.1.5-r1.ebuild
+++ b/dev-util/kbuild/kbuild-0.1.5-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/kbuild/kbuild-0.1.5-r1.ebuild,v 1.5 2009/11/09 13:06:05 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/kbuild/kbuild-0.1.5-r1.ebuild,v 1.6 2010/06/03 18:11:47 polynomial-c Exp $
 
 EAPI=2
 
@@ -26,26 +26,24 @@ RDEPEND=""
 S=${WORKDIR}/${MY_P/-src-20090221}
 
 src_prepare() {
-		rm -rf "${S}/kBuild/bin"
-
-		cd "${S}/src/kmk"
-		eautoreconf
-		cd "${S}/src/sed"
-		eautoreconf
-		cd "${S}"
-		epatch "${FILESDIR}/${PN}-unknown-configure-opt.patch"
-		epatch "${FILESDIR}/${PN}-glibc-2.10.patch"
+	rm -rf "${S}/kBuild/bin"
+
+	epatch "${FILESDIR}/${PN}-unknown-configure-opt.patch"
+	epatch "${FILESDIR}/${PN}-glibc-2.10.patch"
+	epatch "${FILESDIR}/${PN}-0.1.5-gentoo-docdir.patch"
+
+	cd "${S}/src/kmk"
+	eautoreconf
+	cd "${S}/src/sed"
+	eautoreconf
 }
 
 src_compile() {
-		kBuild/env.sh --full \
-		make -f bootstrap.gmk AUTORECONF=true \
+	kBuild/env.sh --full make -f bootstrap.gmk AUTORECONF=true \
 		|| die "bootstrap failed"
 }
 
 src_install() {
-		kBuild/env.sh kmk \
-		NIX_INSTALL_DIR=/usr \
-		PATH_INS="${D}" \
-		install || die "install failed"
+	kBuild/env.sh kmk NIX_INSTALL_DIR=/usr PATH_INS="${D}" install \
+		|| die "install failed"
 }
diff --git a/dev-util/kbuild/kbuild-0.1.5.ebuild b/dev-util/kbuild/kbuild-0.1.5.ebuild
deleted file mode 100644
index fa733874cf58..000000000000
--- a/dev-util/kbuild/kbuild-0.1.5.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/kbuild/kbuild-0.1.5.ebuild,v 1.2 2009/03/11 09:42:58 jokey Exp $
-
-EAPI=2
-
-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/pub/kbuild/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-util/cvs
-	sys-devel/gettext"
-RDEPEND=""
-
-S=${WORKDIR}/${MY_P/-src}
-
-src_prepare() {
-		rm -rf "${S}/kBuild/bin"
-
-		cd "${S}/src/kmk"
-		eautoreconf
-		cd "${S}/src/sed"
-		eautoreconf
-		cd "${S}"
-		epatch "${FILESDIR}/${PN}-unknown-configure-opt.patch"
-}
-
-src_compile() {
-		kBuild/env.sh --full \
-		make -f bootstrap.gmk AUTORECONF=true \
-		|| die "bootstrap failed"
-}
-
-src_install() {
-		kBuild/env.sh kmk \
-		NIX_INSTALL_DIR=/usr \
-		PATH_INS="${D}" \
-		install || die "install failed"
-}
diff --git a/dev-util/kbuild/kbuild-0.1.5_p2.ebuild b/dev-util/kbuild/kbuild-0.1.5_p2.ebuild
new file mode 100644
index 000000000000..23db8f9b0436
--- /dev/null
+++ b/dev-util/kbuild/kbuild-0.1.5_p2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/kbuild/kbuild-0.1.5_p2.ebuild,v 1.1 2010/06/03 18:11:47 polynomial-c Exp $
+
+EAPI=2
+
+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/pub/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="sys-devel/gettext"
+RDEPEND=""
+
+S=${WORKDIR}/${MY_P/-src}
+
+src_prepare() {
+	rm -rf "${S}/kBuild/bin"
+
+	epatch "${FILESDIR}/${PN}-unknown-configure-opt.patch"
+	epatch "${FILESDIR}/${PN}-glibc-2.10.patch"
+	epatch "${FILESDIR}/${PN}-0.1.5-gentoo-docdir.patch"
+
+	cd "${S}/src/kmk"
+	eautoreconf
+	cd "${S}/src/sed"
+	eautoreconf
+}
+
+src_compile() {
+	kBuild/env.sh --full make -f bootstrap.gmk AUTORECONF=true \
+		|| die "bootstrap failed"
+}
+
+src_install() {
+	kBuild/env.sh kmk NIX_INSTALL_DIR=/usr PATH_INS="${D}" install \
+		|| die "install failed"
+}
diff --git a/dev-util/kbuild/metadata.xml b/dev-util/kbuild/metadata.xml
index 76eddd3fbb1b..4046f60dd7b3 100644
--- a/dev-util/kbuild/metadata.xml
+++ b/dev-util/kbuild/metadata.xml
@@ -10,4 +10,8 @@
   <email>swapon@gmail.com</email>
   <name>Alessio Cassibba</name>
 </maintainer>
+<maintainer>
+  <email>polynomial-c@gentoo.org</email>
+  <name>Lars Wendler</name>
+</maintainer>
 </pkgmetadata>