From dd8a67627f8a2753bd7935183e91264c23646c1f Mon Sep 17 00:00:00 2001 From: Christoph Mende Date: Mon, 28 Jun 2010 18:04:38 +0000 Subject: [PATCH] Blocked dev-java/nailgun due to file collision (bug #295840), quoted ${S}, changed ${MY_PV}.tar.gz to ${A} and respect CC Package-Manager: portage-2.1.8.3/cvs/Linux x86_64 --- app-editors/ng/ChangeLog | 9 +++++++-- app-editors/ng/Manifest | 16 +++++++++++++--- app-editors/ng/ng-1.5_beta1-r1.ebuild | 5 +++-- app-editors/ng/ng-1.5_beta1.ebuild | 13 +++++++------ 4 files changed, 30 insertions(+), 13 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 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 ng-1.5_beta1.ebuild: Remove virtual/libc diff --git a/app-editors/ng/Manifest b/app-editors/ng/Manifest index 9376084b1fb8..6cb9e5c1f507 100644 --- a/app-editors/ng/Manifest +++ b/app-editors/ng/Manifest @@ -1,6 +1,16 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + AUX ng-1.5beta1-ncurses.patch 553 RMD160 b4013180fce50c2f3babb02ee293e68b928dedb5 SHA1 ddd9767eeb7f8d4a1ce27f165d3b0ef2840495f7 SHA256 91aed88060398cab1e05117f1ede1660c467579794379d534366d3a61f7c00e3 DIST ng-1.5beta1.tar.gz 662557 RMD160 b5874d403075d5e3b44aa529d977918333818ed4 SHA1 1c812a4994bde77f908a1b08cd68eb3ba120515a SHA256 990b2ed34f2943da71af6771c0ac9a62c36857d6e6e6ad6e7dc8782860388d3c -EBUILD ng-1.5_beta1-r1.ebuild 1151 RMD160 80cf3026238d6617daec79adac4c272d59dacda2 SHA1 f786fe1924a20d1600fe04b60885e3d0fa929900 SHA256 eaa987f19f40b757e5bf16cc093132f92e8959c225530179577b3951c00f1c80 -EBUILD ng-1.5_beta1.ebuild 1210 RMD160 c6fc9a3a715087c6ed4e584829d75b776d0d0130 SHA1 342d85bcceb1deedbae1cf5edd03a46078a55e13 SHA256 1c4ac583f73a58d8a47dc626aeae3f81a9edbabfde8bc3ecbea47ca4d82e175e -MISC ChangeLog 1231 RMD160 bc23d148f4a56352a7c44190b6b008efcc230c63 SHA1 6e3c3c37ee34153613dde73e2d2b9f64883c258f SHA256 50ea77d55c8a6673059363f93b6ceef2987d353587ff90c594c9b31918a7da90 +EBUILD ng-1.5_beta1-r1.ebuild 1171 RMD160 7483c4d1f652a00d75480856f025a0ca3a3022cf SHA1 099552a370f06086d8a10c1c509ae66807d475ca SHA256 d627a6d8d5c7b0f7cce381f0acfbe3d3f7c0fce2fd0589c8ada08b7a61cd565c +EBUILD ng-1.5_beta1.ebuild 1252 RMD160 8438e85066113b02cfdd99f94d623d43e157b1cc SHA1 bb46949bd154cd06a4df58bfa7b14bff8a576342 SHA256 5b64bcac25bdac974f1d5d0ac72f21737152069cc45de604e85bda2f0ce4f966 +MISC ChangeLog 1457 RMD160 896e13374b765ac68334eb3b51062881864242bc SHA1 f6adebed1eda5c9bac0ba2206346db74a069c913 SHA256 268dac34ce7554721686191caefcb8ceea01e6a24868ec064d251ef2a20ad795 MISC metadata.xml 156 RMD160 8adcf0a760a605cd42501f53097ca3a1c4e8daad SHA1 8ccc2b0f20743002b783b1f7b5162c71f7f54c2e SHA256 815820f2e5866d973fafb29a8b8027d022ccea43023309b6dc294cf077598215 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.15 (GNU/Linux) + +iF4EAREIAAYFAkwo5FUACgkQmWq1bYTyC0NCYgD/UTUk2UzQ8poQ48sSQ+mFPKbd +1Don8zkBTSA6RHkqKKYBAJ1a2xdZjy9p7fU1+moQr8GCSIRH68sRwztAdVxLnsto +=0/jC +-----END PGP SIGNATURE----- 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() { -- 2.26.2