Gentoo Archives: gentoo-commits

From: "Justin Lecher (jlec)" <jlec@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in app-editors/mp: ChangeLog mp-5.1.1.ebuild mp-5.1.3.ebuild
Date: Fri, 30 Jul 2010 09:12:38
Message-Id: 20100730091233.5268A2CAD8@corvid.gentoo.org
1 jlec 10/07/30 09:12:33
2
3 Modified: ChangeLog mp-5.1.1.ebuild mp-5.1.3.ebuild
4 Log:
5 Prll make fix, #326987
6 (Portage version: 2.2_rc67/cvs/Linux x86_64)
7
8 Revision Changes Path
9 1.75 app-editors/mp/ChangeLog
10
11 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/mp/ChangeLog?rev=1.75&view=markup
12 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/mp/ChangeLog?rev=1.75&content-type=text/plain
13 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/mp/ChangeLog?r1=1.74&r2=1.75
14
15 Index: ChangeLog
16 ===================================================================
17 RCS file: /var/cvsroot/gentoo-x86/app-editors/mp/ChangeLog,v
18 retrieving revision 1.74
19 retrieving revision 1.75
20 diff -u -r1.74 -r1.75
21 --- ChangeLog 29 Jul 2010 17:46:39 -0000 1.74
22 +++ ChangeLog 30 Jul 2010 09:12:32 -0000 1.75
23 @@ -1,6 +1,10 @@
24 # ChangeLog for app-editors/mp
25 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
26 -# $Header: /var/cvsroot/gentoo-x86/app-editors/mp/ChangeLog,v 1.74 2010/07/29 17:46:39 flameeyes Exp $
27 +# $Header: /var/cvsroot/gentoo-x86/app-editors/mp/ChangeLog,v 1.75 2010/07/30 09:12:32 jlec Exp $
28 +
29 + 30 Jul 2010; Justin Lecher <jlec@g.o> mp-5.1.1.ebuild,
30 + +files/mp-5.1.1-prll.patch, mp-5.1.3.ebuild:
31 + Prll make fix, #326987
32
33 29 Jul 2010; Diego E. Pettenò <flameeyes@g.o> mp-5.1.3.ebuild:
34 Use -j1 for build/install (bug #326987).
35
36
37
38 1.8 app-editors/mp/mp-5.1.1.ebuild
39
40 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/mp/mp-5.1.1.ebuild?rev=1.8&view=markup
41 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/mp/mp-5.1.1.ebuild?rev=1.8&content-type=text/plain
42 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/mp/mp-5.1.1.ebuild?r1=1.7&r2=1.8
43
44 Index: mp-5.1.1.ebuild
45 ===================================================================
46 RCS file: /var/cvsroot/gentoo-x86/app-editors/mp/mp-5.1.1.ebuild,v
47 retrieving revision 1.7
48 retrieving revision 1.8
49 diff -u -r1.7 -r1.8
50 --- mp-5.1.1.ebuild 5 Jul 2010 16:40:17 -0000 1.7
51 +++ mp-5.1.1.ebuild 30 Jul 2010 09:12:32 -0000 1.8
52 @@ -1,6 +1,6 @@
53 # Copyright 1999-2010 Gentoo Foundation
54 # Distributed under the terms of the GNU General Public License v2
55 -# $Header: /var/cvsroot/gentoo-x86/app-editors/mp/mp-5.1.1.ebuild,v 1.7 2010/07/05 16:40:17 jlec Exp $
56 +# $Header: /var/cvsroot/gentoo-x86/app-editors/mp/mp-5.1.1.ebuild,v 1.8 2010/07/30 09:12:32 jlec Exp $
57
58 EAPI="3"
59
60 @@ -15,7 +15,8 @@
61 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-interix ~ppc-macos ~sparc-solaris ~x86-solaris"
62 IUSE="gtk ncurses nls pcre iconv"
63
64 -RDEPEND="ncurses? ( sys-libs/ncurses )
65 +RDEPEND="
66 + ncurses? ( sys-libs/ncurses )
67 gtk? ( >=x11-libs/gtk+-2 >=x11-libs/pango-1.8.0 )
68 !gtk? ( sys-libs/ncurses )
69 nls? ( sys-devel/gettext )
70 @@ -28,8 +29,9 @@
71 dev-lang/perl"
72
73 src_prepare() {
74 - # fix force as-needed wrt bug #278086
75 - epatch "${FILESDIR}"/${P}-asneeded.patch
76 + epatch \
77 + "${FILESDIR}"/${P}-asneeded.patch \
78 + "${FILESDIR}"/${P}-prll.patch
79 }
80
81 src_configure() {
82 @@ -60,7 +62,7 @@
83 src_install() {
84 dodir /usr/bin
85 sh config.sh --prefix="${EPREFIX}/usr"
86 - make DESTDIR="${D}" install || die "Install Failed"
87 + emake DESTDIR="${D}" install || die "Install Failed"
88 use gtk && dosym mp-5 /usr/bin/gmp
89 }
90
91
92
93
94 1.3 app-editors/mp/mp-5.1.3.ebuild
95
96 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/mp/mp-5.1.3.ebuild?rev=1.3&view=markup
97 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/mp/mp-5.1.3.ebuild?rev=1.3&content-type=text/plain
98 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/mp/mp-5.1.3.ebuild?r1=1.2&r2=1.3
99
100 Index: mp-5.1.3.ebuild
101 ===================================================================
102 RCS file: /var/cvsroot/gentoo-x86/app-editors/mp/mp-5.1.3.ebuild,v
103 retrieving revision 1.2
104 retrieving revision 1.3
105 diff -u -r1.2 -r1.3
106 --- mp-5.1.3.ebuild 29 Jul 2010 17:46:39 -0000 1.2
107 +++ mp-5.1.3.ebuild 30 Jul 2010 09:12:32 -0000 1.3
108 @@ -1,6 +1,6 @@
109 # Copyright 1999-2010 Gentoo Foundation
110 # Distributed under the terms of the GNU General Public License v2
111 -# $Header: /var/cvsroot/gentoo-x86/app-editors/mp/mp-5.1.3.ebuild,v 1.2 2010/07/29 17:46:39 flameeyes Exp $
112 +# $Header: /var/cvsroot/gentoo-x86/app-editors/mp/mp-5.1.3.ebuild,v 1.3 2010/07/30 09:12:32 jlec Exp $
113
114 EAPI="3"
115
116 @@ -29,8 +29,9 @@
117 dev-lang/perl"
118
119 src_prepare() {
120 - # fix force as-needed wrt bug #278086
121 - epatch "${FILESDIR}"/${P}-asneeded.patch
122 + epatch \
123 + "${FILESDIR}"/${P}-asneeded.patch \
124 + "${FILESDIR}"/${PN}-5.1.1-prll.patch
125 }
126
127 src_configure() {
128 @@ -62,15 +63,10 @@
129 sh config.sh ${myconf} || die "Configure failed"
130 }
131
132 -src_compile() {
133 - # bug #326987
134 - emake -j1 || die "emake failed"
135 -}
136 -
137 src_install() {
138 dodir /usr/bin
139 sh config.sh --prefix="${EPREFIX}/usr"
140 - emake -j1 DESTDIR="${D}" install || die "Install Failed"
141 + emake DESTDIR="${D}" install || die "Install Failed"
142 # use gtk && dosym mp-5 /usr/bin/gmp
143 }