diff options
author | Diego Elio Pettenò <flameeyes@gentoo.org> | 2009-06-02 11:09:24 +0000 |
---|---|---|
committer | Diego Elio Pettenò <flameeyes@gentoo.org> | 2009-06-02 11:09:24 +0000 |
commit | 5a93cda057f4040687080ca1fb2d40e2a5d89e5d (patch) | |
tree | 055d55ad6700920e28189de5a5bb0f3965470174 /dev-util | |
parent | Version bump, make shadow just a runtime dependency (so that it shows that it... (diff) | |
download | gentoo-2-5a93cda057f4040687080ca1fb2d40e2a5d89e5d.tar.gz gentoo-2-5a93cda057f4040687080ca1fb2d40e2a5d89e5d.tar.bz2 gentoo-2-5a93cda057f4040687080ca1fb2d40e2a5d89e5d.zip |
Fix build by just not using the broken Makefile, instead build straight in src_compile. Also fix DEPEND/RDEPEND and die on failed install. Closes bug #247245.
(Portage version: 2.2_rc33/cvs/Linux x86_64)
Diffstat (limited to 'dev-util')
-rw-r--r-- | dev-util/sel/ChangeLog | 9 | ||||
-rw-r--r-- | dev-util/sel/sel-0.08.4.ebuild | 35 |
2 files changed, 28 insertions, 16 deletions
diff --git a/dev-util/sel/ChangeLog b/dev-util/sel/ChangeLog index add26b2b8dfe..fb33cf5aa831 100644 --- a/dev-util/sel/ChangeLog +++ b/dev-util/sel/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-util/sel -# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/sel/ChangeLog,v 1.12 2007/02/09 07:46:54 flameeyes Exp $ +# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-util/sel/ChangeLog,v 1.13 2009/06/02 11:09:24 flameeyes Exp $ + + 02 Jun 2009; Diego E. Pettenò <flameeyes@gentoo.org> sel-0.08.4.ebuild: + Fix build by just not using the broken Makefile, instead build straight in + src_compile. Also fix DEPEND/RDEPEND and die on failed install. Closes bug + #247245. 09 Feb 2007; Diego Pettenò <flameeyes@gentoo.org> ChangeLog: Regenerate digest in Manifest2 format. diff --git a/dev-util/sel/sel-0.08.4.ebuild b/dev-util/sel/sel-0.08.4.ebuild index f50cb3948fcb..997aa0da399f 100644 --- a/dev-util/sel/sel-0.08.4.ebuild +++ b/dev-util/sel/sel-0.08.4.ebuild @@ -1,6 +1,8 @@ -# Copyright 1999-2005 Gentoo Foundation +# Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/sel/sel-0.08.4.ebuild,v 1.8 2005/09/30 12:02:46 joker Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/sel/sel-0.08.4.ebuild,v 1.9 2009/06/02 11:09:24 flameeyes Exp $ + +inherit toolchain-funcs DESCRIPTION="A filemanager for shell scripts" SRC_URI="http://www.rninet.de/darkstar/files/${P}.tar.gz" @@ -11,28 +13,33 @@ LICENSE="GPL-2" KEYWORDS="ppc s390 sparc x86" IUSE="" -DEPEND=">=sys-libs/ncurses-5.1" +RDEPEND=">=sys-libs/ncurses-5.1" +DEPEND="${RDEPEND}" src_unpack () { unpack ${A} - cd ${S} + cd "${S}" - cp Makefile Makefile.orig - sed -e "s:-m486:${CFLAGS}:" -e "s:-O3::" Makefile.orig > Makefile + sed -i -e "s:/usr/local/share/sel/help\.txt:/usr/share/sel/help\.txt:" \ + sel.c +} - cp sel.c sel.c.orig - sed -e "s:/usr/local/share/sel/help\.txt:/usr/share/sel/help\.txt:" \ - sel.c.orig > sel.c +doecho() { + echo "$@" + "$@" } src_compile() { - make || die + doecho $(tc-getCC) -o ${PN} \ + ${CFLAGS} ${LDFLAGS} \ + ${PN}.c -lncurses \ + || die "build failed" } src_install () { - dobin sel - doman sel.1 + dobin sel || die + doman sel.1 || die insinto /usr/share/sel - doins help.txt - dodoc Changelog LICENSE + doins help.txt || die + dodoc Changelog LICENSE || die } |