version bump, dont run tests by default, add a src_test, install mk files in /usr/share/mk/P to avoid collisions.

Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.26.3 x86_64

5 files changed, 119 insertions, 3 deletions

diff --git a/sys-devel/bmake/ChangeLog b/sys-devel/bmake/ChangeLog
index 636c5856b991..e94c991de773 100644
--- a/sys-devel/bmake/ChangeLog
+++ b/sys-devel/bmake/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-devel/bmake
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/bmake/ChangeLog,v 1.3 2006/10/23 13:33:40 exg Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/bmake/ChangeLog,v 1.4 2008/09/05 10:26:54 aballier Exp $
+
+*bmake-20080515 (05 Sep 2008)
+
+  05 Sep 2008; Alexis Ballier <aballier@gentoo.org>
+  +files/bmake-20080515-makefile.patch, +files/bmake-tests.patch,
+  +bmake-20080515.ebuild:
+  version bump, dont run tests by default, add a src_test, install mk files
+  in /usr/share/mk/P to avoid collisions.
 
   23 Oct 2006; Emanuele Giaquinta <exg@gentoo.org> bmake-20060728.ebuild:
   Add to ~ppc.
diff --git a/sys-devel/bmake/Manifest b/sys-devel/bmake/Manifest
index a75278ade8f9..142671bac627 100644
--- a/sys-devel/bmake/Manifest
+++ b/sys-devel/bmake/Manifest
@@ -1,6 +1,21 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX bmake-20080515-makefile.patch 942 RMD160 b2cd05b9ceea09d09cd821944881ba0bcf6306b1 SHA1 000fdce518422b8cd9d03b6bead6bc8c27a0456c SHA256 ed0ce6cac63bef4f113dac60850c2e0f616c6e81516a93e2ee372afd872d2389
 AUX bmake-makefile.patch 1178 RMD160 ce56cfaa08b86edf37f583334084ef7c9f925466 SHA1 4a6f63bc8545eed1486134d90cdc961c874965e9 SHA256 032de44ffd11de3335fb3fa5c110372f2b51b0c5b0e8383af9c3c5fc5ebf0fba
+AUX bmake-tests.patch 729 RMD160 c5cf586c337cfd36fc980389e8447f795153ac99 SHA1 4a8d72cbe9b1cbc0fa27e0253283a3cab7033837 SHA256 2296d70485c8dd7e20983f7c5f48e485dd0b7853232fc2effc1a29c187bc3753
 DIST bmake-20060728.tar.gz 346413 RMD160 6eadbf320093a77c8bfaf4d9d8c1930d56c0d255 SHA1 14776ce4b57415dc5d8b009c31171ef433632b7f SHA256 8763726990e79f3018e9cbfe1a9f76d465fa0ec25501389974609c8fa4e430c0
+DIST bmake-20080515.tar.gz 351618 RMD160 4ac23269e018a93c6a0b63f3247cdc55a4e7f739 SHA1 ae64044b9f383ff4bf16e39d9137d10c7b69ea59 SHA256 25584fdb1dec16d9daae720b1a974f0124e135d19fe71ab16cd03c8d9e90b762
 DIST mk-20060318.tar.gz 30616 RMD160 2fbe57b181faeaefec76f0e593a5536de708bdb7 SHA1 17c91d40e3f701c9ca8a038daab5310989a3f166 SHA256 cfe2fb6843213028200900e29fa12ea8a969ba0de4e824ef6d2eca65c6b0f7cd
+DIST mk-20080716.tar.gz 32566 RMD160 e529398a816da86178ef1c149ad147e1e6e317b6 SHA1 e91e6adc8f78d847ea0a386d68a8b29e84dbef4f SHA256 4464afd92511ff8f52a205a6ffae69ed67f2516a853f7529d9bf54f4e364b056
 EBUILD bmake-20060728.ebuild 975 RMD160 420339668ddcc3eb26a0fc4af40dc73dfeefa054 SHA1 5c13b0c6e10629258775ae9b7484b6409f6e16d2 SHA256 55cf835a0bab0810524f2f93c19076cf25dbb5d1e524e208382bfd35e66cb9fe
-MISC ChangeLog 560 RMD160 c9db8d22881f7b17277efe2641fa82e0a2ae1bb0 SHA1 59227445d6c6b1652a05455bb35191fdf58db80e SHA256 15b849b25d8ef91f336be53e3c1a35379ea761a777616ef1093a79279b176b92
+EBUILD bmake-20080515.ebuild 1211 RMD160 9f78530f92231ce95afb689362b0b037a409eafc SHA1 d5513828d6cf69ff4d66621702edb51c53fc64da SHA256 9f405f534f4735541a1dab7b496424af2a3d16c60491cde6e5b9e17028f1b9c2
+MISC ChangeLog 859 RMD160 5d24e5c57166729f2c21b1076164c2d226505334 SHA1 f7689bae9d5029df939ea287ed23de4d264f74b5 SHA256 4df77bba392d327b6ba8d6192a478f9a3d518592515dc3f99cba98a7fe37706c
 MISC metadata.xml 156 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 SHA1 d9d9d4f2b5afc58339ea3e562fca490156935f1f SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkjBCXQACgkQvFcC4BYPU0pDugCgrACcKeQ6czu9lWd0WLJEQ+Kr
+arkAn0JtsoIGdl7uu06BtWGxyLrUk6Ay
+=M8e4
+-----END PGP SIGNATURE-----
diff --git a/sys-devel/bmake/bmake-20080515.ebuild b/sys-devel/bmake/bmake-20080515.ebuild
new file mode 100644
index 000000000000..ece5432aae8d
--- /dev/null
+++ b/sys-devel/bmake/bmake-20080515.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/bmake/bmake-20080515.ebuild,v 1.1 2008/09/05 10:26:54 aballier Exp $
+
+inherit eutils
+
+MK_VER=20080716
+DESCRIPTION="NetBSD's portable make"
+HOMEPAGE="http://www.crufty.net/help/sjg/bmake.html"
+SRC_URI="http://void.crufty.net/ftp/pub/sjg/${P}.tar.gz
+		http://void.crufty.net/ftp/pub/sjg/mk-${MK_VER}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+S="${WORKDIR}/${PN}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/${P}-makefile.patch
+	epatch "${FILESDIR}"/${PN}-tests.patch
+}
+
+src_compile() {
+	econf --with-mksrc=../mk --with-default-sys-path=/usr/share/mk/${PN} || die "Configure failed"
+	emake -f makefile.boot bootstrap || die "Compile failed"
+}
+
+src_test() {
+	# $A set by portage confuses the tests...
+	env -u A emake -f makefile.boot check || die "Tests failed"
+}
+
+src_install() {
+	emake -f makefile.boot -j1 DESTDIR="${D}" install-bin install-man || die "Install failed"
+	FORCE_BSD_MK=1 SYS_MK_DIR=. sh ../mk/install-mk -v -m 644 "${D}"/usr/share/mk/${PN} || die "failed to install mk files"
+}
diff --git a/sys-devel/bmake/files/bmake-20080515-makefile.patch b/sys-devel/bmake/files/bmake-20080515-makefile.patch
new file mode 100644
index 000000000000..19c2ab71e9fc
--- /dev/null
+++ b/sys-devel/bmake/files/bmake-20080515-makefile.patch
@@ -0,0 +1,27 @@
+--- makefile.boot.in.old	2006-10-07 12:49:12.000000000 +0200
++++ makefile.boot.in	2006-10-07 13:42:22.000000000 +0200
+@@ -6,6 +6,7 @@
+ #
+ prefix=@prefix@
+ srcdir=@srcdir@
++mandir=@mandir@
+ VPATH=.:$(srcdir)
+ CC=@CC@
+ INSTALL=$(srcdir)/install-sh
+@@ -48,12 +49,12 @@
+ install:	install-bin install-man install-mk
+ 
+ install-bin:
+-	test -d ${prefix}/bin || ${INSTALL} -m 755 -d ${prefix}/bin
+-	${INSTALL} -m 755 bmake ${prefix}/bin
++	test -d ${DESTDIR}${prefix}/bin || ${INSTALL} -m 755 -d ${DESTDIR}${prefix}/bin
++	${INSTALL} -m 755 ${srcdir}/bmake ${DESTDIR}${prefix}/bin
+ 
+ install-man:
+-	test -d ${prefix}/man/cat1 || ${INSTALL} -m 755 -d ${prefix}/man/cat1
+-	${INSTALL} -m 444 ${srcdir}/bmake.cat1 ${prefix}/man/cat1/bmake.1
++	test -d ${DESTDIR}${mandir}/man1 || ${INSTALL} -m 755 -d ${DESTDIR}${mandir}/man1
++	${INSTALL} -m 444 ${srcdir}/bmake.cat1 ${DESTDIR}${mandir}/man1/bmake.1
+ 
+ install-mk:
+ 	@if test -s ${MKSRC}/install-mk; then \
diff --git a/sys-devel/bmake/files/bmake-tests.patch b/sys-devel/bmake/files/bmake-tests.patch
new file mode 100644
index 000000000000..4c6ffe691da3
--- /dev/null
+++ b/sys-devel/bmake/files/bmake-tests.patch
@@ -0,0 +1,22 @@
+Index: bmake/makefile.boot.in
+===================================================================
+--- bmake.orig/makefile.boot.in
++++ bmake/makefile.boot.in
+@@ -31,13 +31,15 @@ BMAKE_ENV= CC="$(CC)" LIBC= MAKEFLAGS= M
+ bootstrap:	bmake.boot .mk.done
+ 	${BMAKE_ENV} ./bmake.boot -f Makefile 
+ 	${BMAKE_ENV} ./bmake.boot -f Makefile bmake.1
+-	${BMAKE_ENV} `pwd`/bmake -f Makefile test
+-	
++
+ bmake:	bmake.boot
+ 	@echo you might want to try: 
+ 	@echo ${MAKE} -f makefile.boot bootstrap
+ 	cp bmake.boot $@
+ 
++check:
++	${BMAKE_ENV} `pwd`/bmake -f Makefile test
++	
+ bmake.boot: ${OBJ}
+ 	(cd lst.lib; $(MAKE) -f makefile.boot CC="$(CC)" CFLAGS="-I.. -I../${srcdir} -I${srcdir} ${CFLAGS}" )
+ 	${CC} *.o lst.lib/*.o -o $@ @LDFLAGS@ @LIBS@