diff options
| author |   Michael Sterrett <mr_bones_@gentoo.org> | 2008-08-31 04:36:02 +0000 |
|---|---|---|
| committer | Michael Sterrett <mr_bones_@gentoo.org> | 2008-08-31 04:36:02 +0000 |
| commit | c9b40e851eb7b56c9b25d5dc58de76d5f7e240fd (patch) | |
| tree | b52a7e59e6ea4686717d8505ec5f716001bc7fff /net-misc/mknbi | |
| parent | whitespace (diff) | |
| download | gentoo-2-c9b40e851eb7b56c9b25d5dc58de76d5f7e240fd.tar.gz gentoo-2-c9b40e851eb7b56c9b25d5dc58de76d5f7e240fd.tar.bz2 gentoo-2-c9b40e851eb7b56c9b25d5dc58de76d5f7e240fd.zip | |
fix bug #221449 and tidy ebuild
(Portage version: 2.1.4.4)
Diffstat (limited to 'net-misc/mknbi')
| -rw-r--r-- | net-misc/mknbi/ChangeLog | 7 | ||||
| -rw-r--r-- | net-misc/mknbi/mknbi-1.4.4.ebuild | 34 |
2 files changed, 27 insertions, 14 deletions
diff --git a/net-misc/mknbi/ChangeLog b/net-misc/mknbi/ChangeLog index 91eae0cc38dc..120e1574cae7 100644 --- a/net-misc/mknbi/ChangeLog +++ b/net-misc/mknbi/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for net-misc/mknbi -# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/mknbi/ChangeLog,v 1.20 2007/07/31 02:18:58 mr_bones_ Exp $ +# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-misc/mknbi/ChangeLog,v 1.21 2008/08/31 04:36:02 mr_bones_ Exp $ + + 31 Aug 2008; Michael Sterrett <mr_bones_@gentoo.org> mknbi-1.4.4.ebuild: + fix bug #221449 and tidy ebuild 31 Jul 2007; Michael Sterrett <mr_bones_@gentoo.org> -mknbi-1.4.3.ebuild: clean older ebuild diff --git a/net-misc/mknbi/mknbi-1.4.4.ebuild b/net-misc/mknbi/mknbi-1.4.4.ebuild index 63c959df9f7b..f492fff4d873 100644 --- a/net-misc/mknbi/mknbi-1.4.4.ebuild +++ b/net-misc/mknbi/mknbi-1.4.4.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2007 Gentoo Foundation +# Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/mknbi/mknbi-1.4.4.ebuild,v 1.6 2007/07/02 15:02:07 peper Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/mknbi/mknbi-1.4.4.ebuild,v 1.7 2008/08/31 04:36:02 mr_bones_ Exp $ inherit toolchain-funcs eutils @@ -14,31 +14,41 @@ SLOT="0" KEYWORDS="x86" IUSE="" -DEPEND=">=dev-lang/perl-5.6.1 - dev-lang/nasm +RDEPEND=">=dev-lang/perl-5.6.1 !sys-boot/netboot" +DEPEND="${RDEPEND} + dev-lang/nasm" src_unpack() { unpack ${A} cd "${S}" - epatch "${FILESDIR}"/mknbi-1.4.3-nossp.patch - epatch "${FILESDIR}"/${P}-gcc4.patch + epatch \ + "${FILESDIR}"/mknbi-1.4.3-nossp.patch \ + "${FILESDIR}"/${P}-gcc4.patch - sed -i -e "s:\/usr\/local:\/usr:" Makefile - sed -i -e "s:\-mcpu:\-march:" Makefile + sed -i \ + -e "s:\/usr\/local:\/usr:" \ + -e "s:COPYING::" \ + -e "s:\-mcpu:\-march:" Makefile \ + || die "sed failed" #apply modifications to CFLAGS to fix for gcc 3.4: bug #64049 if [ "`gcc-major-version`" -ge "3" -a "`gcc-minor-version`" -ge "4" ] then - sed -i -e 's:\-mcpu:\-mtune:' Makefile - sed -i -e 's:CFLAGS=:CFLAGS= -minline-all-stringops:' Makefile + sed -i \ + -e 's:\-mcpu:\-mtune:' \ + -e 's:CFLAGS=:CFLAGS= -minline-all-stringops:' Makefile \ + || die "sed failed" fi if [ "`gcc-major-version`" = "4" ]; then - sed -i -e 's:\-fno-stack-protector-all::' Makefile + sed -i \ + -e 's:\-fno-stack-protector-all::' Makefile \ + || die "sed failed" fi } src_install() { export BUILD_ROOT="${D}" - make DESTDIR="${D}" install || die "Installation failed" + emake DESTDIR="${D}" install || die "emake failed" + prepalldocs } |