Version bump, and work around parallel make issue, and respect LDFLAGS (bug #248408).

Package-Manager: portage-2.2_rc62/cvs/Linux i686

4 files changed, 102 insertions, 3 deletions

diff --git a/sys-boot/netboot/ChangeLog b/sys-boot/netboot/ChangeLog
index 31bf24e79fcb..538a9b324b3b 100644
--- a/sys-boot/netboot/ChangeLog
+++ b/sys-boot/netboot/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-boot/netboot
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/netboot/ChangeLog,v 1.6 2008/11/13 20:02:53 bangert Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/netboot/ChangeLog,v 1.7 2010/02/08 23:57:04 jer Exp $
+
+*netboot-0.10.2 (08 Feb 2010)
+
+  08 Feb 2010; Jeroen Roovers <jer@gentoo.org> +netboot-0.10.2.ebuild,
+  +files/netboot-0.10.2-ldflags.patch:
+  Version bump, and work around parallel make issue, and respect LDFLAGS
+  (bug #248408).
 
   13 Nov 2008; Thilo Bangert <bangert@gentoo.org> metadata.xml:
   remove superflous whitespace from maintainer
diff --git a/sys-boot/netboot/Manifest b/sys-boot/netboot/Manifest
index 772b60d4c532..93bb66fdca4f 100644
--- a/sys-boot/netboot/Manifest
+++ b/sys-boot/netboot/Manifest
@@ -1,8 +1,11 @@
 AUX netboot-0.10.1-destdir.patch 14424 RMD160 f6619df42c92be5be0a6fada7d5e499a86b16372 SHA1 0006c29c12279fe8bd102ee60baad8186d1eeb59 SHA256 36c96c16058397f7734f1c5c95a5d3ebfd9d82058006ce722b3bbdf55597b9a1
 AUX netboot-0.10.1-nossp.patch 1459 RMD160 fc80aaf68cadabcd197b0228584bbb35c111c9ef SHA1 de5cf558bbd684b5b0e2f0b2a8398dc04b499148 SHA256 4254d5daac8173663ebae11b529bf03e3800c713596481596fb4a17c2eebf926
+AUX netboot-0.10.2-ldflags.patch 1208 RMD160 fffc8939e755d0eb99b62a199246ec6aeec309c0 SHA1 67d7d9f8b337e1fd0c8e37c63520f2b28dc1baa9 SHA256 8868c285afe83d138736df4a8d6bd574abbe65e1ee2b5aa792ed3ada9f232790
 DIST netboot-0.10.1.tar.gz 1406533 RMD160 c36a3fa9ffb7dad90b6ef5ba62b022ca779f07dd SHA1 a2c1d7c480ce6b0b41a0bbcba5d77abb53795b2a SHA256 743d769ab0e20ce5363f07e711040bf2c9c43985fe05110df61eebbebdf9e565
+DIST netboot-0.10.2.tar.gz 1457791 RMD160 b36d1a58da6dd8c42c35778f4ff1e05c5939340d SHA1 68195571e0a263426a5c59e3cd577f9816ea865e SHA256 e07148b0c396fa8c2c542399b79a6adaafa84684b97c0991fd1dacc7f74a8027
 DIST netboot-0.9.8.tar.gz 966389 RMD160 32510a3b7070742ef2c40914a1c82317d978e095 SHA1 44bd8e2aa27fb52d7691a49efe6d3498825cce72 SHA256 d5e3be89d4e6eef457148e7a9a3061fe04459f719749f4b2bba45ccb496877ba
 EBUILD netboot-0.10.1.ebuild 1308 RMD160 f7cf62bba7e0272449af9ee079f71f01fab746da SHA1 96079f66e36d20b96465763ac158a29a3831db96 SHA256 df8013dce252cbc530cbf23453c57ea1574b9794281a7c589360ae6711c627df
+EBUILD netboot-0.10.2.ebuild 1227 RMD160 8e1dd702512f0b053ba4c01ee520b9b72c1d88bb SHA1 c4534657ca7260bb08797a4d3364b43df1d01e18 SHA256 ba7320cedec39134291400d0e4d947b97830f88951ce9fb786feffad8d3cde7e
 EBUILD netboot-0.9.8.ebuild 717 RMD160 721528f52908d74917090acf9acae850bc316f2b SHA1 cd6cfad01783da3a1b8a74574a1d1c09fa36102b SHA256 e043451a6f048f7f230a27961d407c44c82f4ddc6a59108f1e03eee26ffc68fd
-MISC ChangeLog 950 RMD160 742d9896fe269a7d3540c6546d0e1ba74643b2f9 SHA1 06361b17b05d6f66afb74a8bc07fd4d7889cd695 SHA256 97dcfeba1cc580cef8bf79be5dae1031bb5d425d10c4267eac7e4031b5aaa7d4
+MISC ChangeLog 1178 RMD160 6404afd3217a062155fe4562c33080b6ba715f5a SHA1 7871566a8acd9432447a9e4c2b25f4e32a1e6311 SHA256 fe36c45c6c9064937b815bf1c9884a6007680d0d82cf2bcefe40e46cf7f939fd
 MISC metadata.xml 232 RMD160 854b06094287201d0b98f2b21d36054db25d81cd SHA1 cc4f98e9ee0102aea687d71cf3af924cf156edbb SHA256 21382e863647add08888c924279a4b931b2b90ccd0cf5e526ee74a3d5e1fd0df
diff --git a/sys-boot/netboot/files/netboot-0.10.2-ldflags.patch b/sys-boot/netboot/files/netboot-0.10.2-ldflags.patch
new file mode 100644
index 000000000000..2cb245076d90
--- /dev/null
+++ b/sys-boot/netboot/files/netboot-0.10.2-ldflags.patch
@@ -0,0 +1,38 @@
+--- netboot-0.10.2/make.config.in.org	2007-02-01 13:09:18.000000000 +0100
++++ netboot-0.10.2/make.config.in	2010-02-09 00:34:15.000000000 +0100
+@@ -105,7 +105,7 @@
+ INCLUDE      = $(patsubst %,-I%,$(subst :, ,$(VPATH)))
+ CDEFS        = @DEFS@ -DNETBOOT
+ CFLAGS       = @CFLAGS@ $(CDEBUG) $(CDEFS) $(INCLUDE)
+-LDFLAGS      = -s
++LDFLAGS      = @LDFLAGS@
+ SYSLIBS      = @LIBS@
+ BDBLIB       = @BDBLIB@
+ ODBCLIB      = @ODBCLIB@
+--- netboot-0.10.2/misc/Makefile.org	2007-02-01 19:42:10.000000000 +0100
++++ netboot-0.10.2/misc/Makefile	2010-02-09 00:39:21.000000000 +0100
+@@ -76,7 +76,7 @@
+ 
+ gccrules:	$(LIBTOOL) gccrules.o $(LIBNBA)
+ 	@$(LIBTOOL) --mode=link \
+-	  $(CC) $(CFLAGS) -o gccrules gccrules.o $(LIBS) \
++	  $(CC) $(CFLAGS) $(LDFLAGS) -o gccrules gccrules.o $(LIBS) \
+ 	  -no-install
+ 
+ 
+@@ -89,13 +89,13 @@
+ 
+ gccopt:		$(LIBTOOL) gccopt.o $(LIBNBA)
+ 	@$(LIBTOOL) --mode=link \
+-	  $(CC) $(CFLAGS) -o gccopt gccopt.o $(LIBS) \
++	  $(CC) $(CFLAGS) $(LDFLAGS) -o gccopt gccopt.o $(LIBS) \
+ 	  -no-install
+ 
+ 
+ nbmd5:		$(LIBTOOL) nbmd5.o $(LIBNBA)
+ 	@$(LIBTOOL) --mode=link \
+-	  $(CC) $(CFLAGS) -o nbmd5 nbmd5.o $(LIBS)
++	  $(CC) $(CFLAGS) $(LDFLAGS) -o nbmd5 nbmd5.o $(LIBS)
+ 
+ 
+ instdrv:	instdrv.in
diff --git a/sys-boot/netboot/netboot-0.10.2.ebuild b/sys-boot/netboot/netboot-0.10.2.ebuild
new file mode 100644
index 000000000000..fb1a54ea7c36
--- /dev/null
+++ b/sys-boot/netboot/netboot-0.10.2.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/netboot/netboot-0.10.2.ebuild,v 1.1 2010/02/08 23:57:04 jer Exp $
+
+EAPI="2"
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="netbooting utility"
+HOMEPAGE="http://netboot.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE=""
+
+DEPEND=">=dev-libs/lzo-2
+		>=sys-libs/db-4"
+RDEPEND="${DEPEND}
+		!net-misc/mknbi"
+
+src_prepare() {
+	cp -av make.config.in{,.org}
+	epatch "${FILESDIR}"/${P}-ldflags.patch
+	find "${S}" -name \*.lo -exec rm {} \;
+}
+
+src_configure() {
+	econf --enable-bootrom --with-gnu-cc86="$(tc-getCC)" \
+		--with-gnu-as86="$(tc-getAS)" --with-gnu-ld86="$(tc-getCC)"|| die 'cannot configure'
+	# --enable-config-file
+}
+
+src_compile() {
+	emake -j1 || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc README doc/*
+	docinto FlashCard
+	dodoc FlashCard/README FlashCard/*.ps
+	mv "${D}"/usr/share/misc "${D}"/usr/share/${PN}
+	rm -rf "${D}"/usr/lib/netboot/utils
+
+	dodoc "${S}"/mknbi-dos/utils/mntnbi.pl
+
+	insinto /usr/share/vim/vimfiles/syntax
+	doins "${S}"/mknbi-mgl/misc/mgl.vim
+}