| 1 |
angelos 10/06/28 18:04:38 |
| 2 |
|
| 3 |
Modified: ng-1.5_beta1-r1.ebuild ChangeLog |
| 4 |
ng-1.5_beta1.ebuild |
| 5 |
Log: |
| 6 |
Blocked dev-java/nailgun due to file collision (bug #295840), quoted ${S}, changed ${MY_PV}.tar.gz to ${A} and respect CC |
| 7 |
(Portage version: 2.1.8.3/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.2 app-editors/ng/ng-1.5_beta1-r1.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/ng/ng-1.5_beta1-r1.ebuild?rev=1.2&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/ng/ng-1.5_beta1-r1.ebuild?rev=1.2&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/ng/ng-1.5_beta1-r1.ebuild?r1=1.1&r2=1.2 |
| 15 |
|
| 16 |
Index: ng-1.5_beta1-r1.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/app-editors/ng/ng-1.5_beta1-r1.ebuild,v |
| 19 |
retrieving revision 1.1 |
| 20 |
retrieving revision 1.2 |
| 21 |
diff -u -r1.1 -r1.2 |
| 22 |
--- ng-1.5_beta1-r1.ebuild 30 Oct 2008 15:40:32 -0000 1.1 |
| 23 |
+++ ng-1.5_beta1-r1.ebuild 28 Jun 2010 18:04:38 -0000 1.2 |
| 24 |
@@ -1,6 +1,6 @@ |
| 25 |
-# Copyright 1999-2008 Gentoo Foundation |
| 26 |
+# Copyright 1999-2010 Gentoo Foundation |
| 27 |
# Distributed under the terms of the GNU General Public License v2 |
| 28 |
-# $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 $ |
| 29 |
+# $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 $ |
| 30 |
|
| 31 |
inherit eutils |
| 32 |
|
| 33 |
@@ -16,6 +16,7 @@ |
| 34 |
IUSE="canna" |
| 35 |
|
| 36 |
RDEPEND=">=sys-libs/ncurses-5.0 |
| 37 |
+ !dev-java/nailgun |
| 38 |
canna? ( app-i18n/canna )" |
| 39 |
DEPEND="${RDEPEND} |
| 40 |
>=sys-apps/sed-4.0" |
| 41 |
|
| 42 |
|
| 43 |
|
| 44 |
1.12 app-editors/ng/ChangeLog |
| 45 |
|
| 46 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/ng/ChangeLog?rev=1.12&view=markup |
| 47 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/ng/ChangeLog?rev=1.12&content-type=text/plain |
| 48 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/ng/ChangeLog?r1=1.11&r2=1.12 |
| 49 |
|
| 50 |
Index: ChangeLog |
| 51 |
=================================================================== |
| 52 |
RCS file: /var/cvsroot/gentoo-x86/app-editors/ng/ChangeLog,v |
| 53 |
retrieving revision 1.11 |
| 54 |
retrieving revision 1.12 |
| 55 |
diff -u -r1.11 -r1.12 |
| 56 |
--- ChangeLog 23 Sep 2009 15:23:44 -0000 1.11 |
| 57 |
+++ ChangeLog 28 Jun 2010 18:04:38 -0000 1.12 |
| 58 |
@@ -1,6 +1,11 @@ |
| 59 |
# ChangeLog for app-editors/ng |
| 60 |
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 |
| 61 |
-# $Header: /var/cvsroot/gentoo-x86/app-editors/ng/ChangeLog,v 1.11 2009/09/23 15:23:44 patrick Exp $ |
| 62 |
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
| 63 |
+# $Header: /var/cvsroot/gentoo-x86/app-editors/ng/ChangeLog,v 1.12 2010/06/28 18:04:38 angelos Exp $ |
| 64 |
+ |
| 65 |
+ 28 Jun 2010; Christoph Mende <angelos@g.o> ng-1.5_beta1.ebuild, |
| 66 |
+ ng-1.5_beta1-r1.ebuild: |
| 67 |
+ Blocked dev-java/nailgun due to file collision (bug #295840), quoted ${S}, |
| 68 |
+ changed ${MY_PV}.tar.gz to ${A} and respect CC |
| 69 |
|
| 70 |
23 Sep 2009; Patrick Lauer <patrick@g.o> ng-1.5_beta1.ebuild: |
| 71 |
Remove virtual/libc |
| 72 |
|
| 73 |
|
| 74 |
|
| 75 |
1.13 app-editors/ng/ng-1.5_beta1.ebuild |
| 76 |
|
| 77 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/ng/ng-1.5_beta1.ebuild?rev=1.13&view=markup |
| 78 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/ng/ng-1.5_beta1.ebuild?rev=1.13&content-type=text/plain |
| 79 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/ng/ng-1.5_beta1.ebuild?r1=1.12&r2=1.13 |
| 80 |
|
| 81 |
Index: ng-1.5_beta1.ebuild |
| 82 |
=================================================================== |
| 83 |
RCS file: /var/cvsroot/gentoo-x86/app-editors/ng/ng-1.5_beta1.ebuild,v |
| 84 |
retrieving revision 1.12 |
| 85 |
retrieving revision 1.13 |
| 86 |
diff -u -r1.12 -r1.13 |
| 87 |
--- ng-1.5_beta1.ebuild 23 Sep 2009 15:23:44 -0000 1.12 |
| 88 |
+++ ng-1.5_beta1.ebuild 28 Jun 2010 18:04:38 -0000 1.13 |
| 89 |
@@ -1,8 +1,8 @@ |
| 90 |
-# Copyright 1999-2009 Gentoo Foundation |
| 91 |
+# Copyright 1999-2010 Gentoo Foundation |
| 92 |
# Distributed under the terms of the GNU General Public License v2 |
| 93 |
-# $Header: /var/cvsroot/gentoo-x86/app-editors/ng/ng-1.5_beta1.ebuild,v 1.12 2009/09/23 15:23:44 patrick Exp $ |
| 94 |
+# $Header: /var/cvsroot/gentoo-x86/app-editors/ng/ng-1.5_beta1.ebuild,v 1.13 2010/06/28 18:04:38 angelos Exp $ |
| 95 |
|
| 96 |
-inherit eutils |
| 97 |
+inherit eutils toolchain-funcs |
| 98 |
|
| 99 |
MY_P=${P/_beta/beta} |
| 100 |
|
| 101 |
@@ -16,6 +16,7 @@ |
| 102 |
IUSE="canna" |
| 103 |
|
| 104 |
RDEPEND=">=sys-libs/ncurses-5.0 |
| 105 |
+ !dev-java/nailgun |
| 106 |
canna? ( app-i18n/canna )" |
| 107 |
DEPEND="${RDEPEND} |
| 108 |
>=sys-apps/sed-4.0" |
| 109 |
@@ -23,8 +24,8 @@ |
| 110 |
S="${WORKDIR}/${MY_P}" |
| 111 |
|
| 112 |
src_unpack() { |
| 113 |
- unpack ${MY_P}.tar.gz |
| 114 |
- cd ${S} |
| 115 |
+ unpack ${A} |
| 116 |
+ cd "${S}" |
| 117 |
epatch "${FILESDIR}/${MY_P}-ncurses.patch" |
| 118 |
} |
| 119 |
|
| 120 |
@@ -38,7 +39,7 @@ |
| 121 |
sed -i -e "s/^#undef NO_BACKUP/#define NO_BACKUP/" config.h \ |
| 122 |
|| die "sed failed" |
| 123 |
|
| 124 |
- emake || die |
| 125 |
+ emake CC=$(tc-getCC) || die |
| 126 |
} |
| 127 |
|
| 128 |
src_install() { |
Archives