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

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

9 files changed, 97 insertions, 153 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/Manifest b/dev-util/kbuild/Manifest
index 5b9ea735cb2a..8a7935527f76 100644
--- a/dev-util/kbuild/Manifest
+++ b/dev-util/kbuild/Manifest
@@ -1,22 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX kbuild-fix-acl-include.patch 575 RMD160 a2b5b23f94c7d23be95324b46237c8f83e12cfe6 SHA1 e17b6befeea6384d8a7d836fb07f571a4c1d8f6c SHA256 3f9bbdf5b16a9c0e22413d3ab068b586962bab8adbb370071ab82c444143e01e
+AUX kbuild-0.1.5-gentoo-docdir.patch 354 RMD160 882f0bf45ab570f0bda4f86fe91b416cdba8713e SHA1 00104d51bf8b8900cae78f85eaaff9f792e165c2 SHA256 cc0d7e6915fae7b9230042549552ca0c9b59da4550a4cc601520a11509352ed0
 AUX kbuild-glibc-2.10.patch 1060 RMD160 98b443cdc2a104e4b72164cb56afc2747a4013f0 SHA1 f308ca7f94d2860afc367de6705cdc5f8e370eae SHA256 af376f236e287acec5fe383e26c6d614758b0ba6f0c569fb6dcd2b4b36d17ec1
 AUX kbuild-unknown-configure-opt.patch 500 RMD160 9bbc47e064010898a4084c42893c17feefd0b961 SHA1 3dcd540d1863346306e04bc9ce26430c8705dee9 SHA256 ccbac9ef80cd50668c9dd65a7e1ade5f86f3ca2def614e2d1cc5b3e2045f97b1
-DIST kBuild-0.1.4-src.tar.gz 2293916 RMD160 067a69e5f2877a6734bccfc2fcc9754eab9dbc1c SHA1 49f2cb097867c2c057013c8e9868ae7bd04826d0 SHA256 fe17d9e7603206c4ee4f93ab328f3fd79863928c933bbc42d2f5cf3c789c4c68
+DIST kBuild-0.1.5-p2-src.tar.gz 2433567 RMD160 58755ef4e53d0eb918055c7a0b0d80f9761195cf SHA1 4cd59e949f7306e0dfb5ac4a6d440adfcdfd6ce2 SHA256 8205db5e74d27ef6394bd48118a310e4f5caab455575f0ea975f62dcb8d642a6
 DIST kBuild-0.1.5-src-20090221.tar.bz2 21943772 RMD160 f174022edcb9dfd980ab90d036b649ca05460918 SHA1 b01571914a32d408c604d00aa75d0c6a10e45877 SHA256 8e0b95d6d7971e584ac4f1ddc2212940f7ccfd6a5bccc5bb9bf5853ed84bf592
-DIST kBuild-0.1.5-src.tar.gz 2431964 RMD160 9a6ad3344c0440a6fa8ab0e1acee41b9503ef2b7 SHA1 c9c3a8ec252a3f415b75450bfb5ddc00f23d3c01 SHA256 db3b672da8f579949e4d8c41d023d6d1ca1ab5626a2e552970ba75e7a3af84b5
-EBUILD kbuild-0.1.4.ebuild 983 RMD160 9efd10a674e7d0cf6df05cd71b4683e304ad204c SHA1 596ad8feac3dc8f478e277f008bcd09f9d95d264 SHA256 23faf8559f1dd906ad91b375bfc63161d2ae2299ef19d45cce8f5f56db4ee5fe
-EBUILD kbuild-0.1.5-r1.ebuild 1119 RMD160 da838ba135fe0359b237e0e666776f17794d90e8 SHA1 4e52c2febcb09b32dd389f0ae88c29a9517ce1ac SHA256 b0a5d1d86f943511f44ee62e9c0cf17ecaf85066a4b1ee8016d33791301f7902
-EBUILD kbuild-0.1.5.ebuild 1033 RMD160 afa9c1a7bd14c99e8d4343ad3a421711cdbd9cf6 SHA1 7fca5390374b92124e45a84cd1d7322bf12e78a3 SHA256 f924455f90087e75c1d9c1e2ba20129cff5e71ce4091fac95982e233a443b21f
+EBUILD kbuild-0.1.5-r1.ebuild 1147 RMD160 0c055109df21ba2dcf91bf91cac76aa597d2fb91 SHA1 5c36f1d86068ac10018dad2104e08aa9592189f0 SHA256 79c5863d2d968843d2c9a291c4396ecdc96c69264c8a8a4f86a37a803978d5d1
+EBUILD kbuild-0.1.5_p2.ebuild 1100 RMD160 d291df21480dbb126e0802f59303bd11daa66416 SHA1 00523665a58ddd0e7bec9e94e45dffba4f7db9a1 SHA256 cea4c37317f07911265f43f092d93bb0d70f778fd75983ff62dcc3e13168246d
 EBUILD kbuild-9999.ebuild 929 RMD160 f40c010a0f16f96f1e573e1ae6e934f7c2eb1618 SHA1 dc32faf6d5c9afb0b10109df027c16ac65956571 SHA256 84ae3ec8fb9c7a9d2d7697808fd2e57b27e5b377569f8c55c0ec8bf5c5382a3f
-MISC ChangeLog 2639 RMD160 6a6d87edb5f81a47cd0c6e65112c010614cee7c6 SHA1 8cdb8819f6ff3df06e882f1dc5f8c58f4ef16401 SHA256 0bf10f0531ed90c9b9d4071f868af87ba1a34513820824fc6e583df56d9e2a0b
-MISC metadata.xml 344 RMD160 12935d5b21be85bc4222fd06371c93dcbf6f534e SHA1 68b99919921f246738cce4350b77d895e7c78106 SHA256 fff5aeb6f453d2e137765ca5016e81344cb0cd0cecd51d81bbb889cb1d7a5ba9
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkr4E9QACgkQkKaRLQcq0GJQQgCff2nJbEXsccvtwynd8yitqKNG
-OS8AnjFRyjU697RcIoDB4tRsL5EipEHJ
-=inT0
------END PGP SIGNATURE-----
+MISC ChangeLog 3185 RMD160 fb618c441d92141819db4562fcc365e3f5c51b1c SHA1 0562b8268e493164ac61cc8deece35a847836924 SHA256 d2fce33579159179cb42168e8f79133f7c69646f86ef7848a3f5f21fdf87ee23
+MISC metadata.xml 440 RMD160 e17df324a907dc57e613009dc2c5ac9c24c2c8c7 SHA1 8848e0d9d23b9f40348f1fa46978ca231a524e7c SHA256 61e0bc766b9c9e813c3ab1868c23e73cd35fe38de6922dedf22aa5018a9791d8
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>