diff options
| author |   Christoph Mende <angelos@gentoo.org> | 2010-06-28 18:04:38 +0000 |
|---|---|---|
| committer | Christoph Mende <angelos@gentoo.org> | 2010-06-28 18:04:38 +0000 |
| commit | 0cbd5fafb29e1416d98b3304da35f350d806e00b (patch) | |
| tree | 8c639e2c8ccec520466b0831fcc054e7db184235 /app-editors | |
| parent | Stable on amd64 wrt bug #326001 (diff) | |
| download | gentoo-2-0cbd5fafb29e1416d98b3304da35f350d806e00b.tar.gz gentoo-2-0cbd5fafb29e1416d98b3304da35f350d806e00b.tar.bz2 gentoo-2-0cbd5fafb29e1416d98b3304da35f350d806e00b.zip | |
Blocked dev-java/nailgun due to file collision (bug #295840), quoted ${S}, changed ${MY_PV}.tar.gz to ${A} and respect CC
(Portage version: 2.1.8.3/cvs/Linux x86_64)
Diffstat (limited to 'app-editors')
| -rw-r--r-- | app-editors/ng/ChangeLog | 9 | ||||
| -rw-r--r-- | app-editors/ng/ng-1.5_beta1-r1.ebuild | 5 | ||||
| -rw-r--r-- | app-editors/ng/ng-1.5_beta1.ebuild | 13 |
3 files changed, 17 insertions, 10 deletions
diff --git a/app-editors/ng/ChangeLog b/app-editors/ng/ChangeLog index 3eff607fc614..0b9a28ed9141 100644 --- a/app-editors/ng/ChangeLog +++ b/app-editors/ng/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-editors/ng -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/ng/ChangeLog,v 1.11 2009/09/23 15:23:44 patrick Exp $ +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-editors/ng/ChangeLog,v 1.12 2010/06/28 18:04:38 angelos Exp $ + + 28 Jun 2010; Christoph Mende <angelos@gentoo.org> ng-1.5_beta1.ebuild, + ng-1.5_beta1-r1.ebuild: + Blocked dev-java/nailgun due to file collision (bug #295840), quoted ${S}, + changed ${MY_PV}.tar.gz to ${A} and respect CC 23 Sep 2009; Patrick Lauer <patrick@gentoo.org> ng-1.5_beta1.ebuild: Remove virtual/libc diff --git a/app-editors/ng/ng-1.5_beta1-r1.ebuild b/app-editors/ng/ng-1.5_beta1-r1.ebuild index 832c38cc0167..a34baeda7e1c 100644 --- a/app-editors/ng/ng-1.5_beta1-r1.ebuild +++ b/app-editors/ng/ng-1.5_beta1-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2008 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/ng/ng-1.5_beta1-r1.ebuild,v 1.1 2008/10/30 15:40:32 matsuu Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/ng/ng-1.5_beta1-r1.ebuild,v 1.2 2010/06/28 18:04:38 angelos Exp $ inherit eutils @@ -16,6 +16,7 @@ KEYWORDS="~amd64 ~ppc ~x86" IUSE="canna" RDEPEND=">=sys-libs/ncurses-5.0 + !dev-java/nailgun canna? ( app-i18n/canna )" DEPEND="${RDEPEND} >=sys-apps/sed-4.0" diff --git a/app-editors/ng/ng-1.5_beta1.ebuild b/app-editors/ng/ng-1.5_beta1.ebuild index 7d9a64cec862..4eee5de50bbe 100644 --- a/app-editors/ng/ng-1.5_beta1.ebuild +++ b/app-editors/ng/ng-1.5_beta1.ebuild @@ -1,8 +1,8 @@ -# 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/app-editors/ng/ng-1.5_beta1.ebuild,v 1.12 2009/09/23 15:23:44 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/ng/ng-1.5_beta1.ebuild,v 1.13 2010/06/28 18:04:38 angelos Exp $ -inherit eutils +inherit eutils toolchain-funcs MY_P=${P/_beta/beta} @@ -16,6 +16,7 @@ KEYWORDS="~amd64 ~ppc x86" IUSE="canna" RDEPEND=">=sys-libs/ncurses-5.0 + !dev-java/nailgun canna? ( app-i18n/canna )" DEPEND="${RDEPEND} >=sys-apps/sed-4.0" @@ -23,8 +24,8 @@ DEPEND="${RDEPEND} S="${WORKDIR}/${MY_P}" src_unpack() { - unpack ${MY_P}.tar.gz - cd ${S} + unpack ${A} + cd "${S}" epatch "${FILESDIR}/${MY_P}-ncurses.patch" } @@ -38,7 +39,7 @@ src_compile() { sed -i -e "s/^#undef NO_BACKUP/#define NO_BACKUP/" config.h \ || die "sed failed" - emake || die + emake CC=$(tc-getCC) || die } src_install() { |