1 |
ssuominen 10/06/17 18:29:43 |
2 |
|
3 |
Modified: ChangeLog ponyprog-2.07a-r1.ebuild |
4 |
Log: |
5 |
Respect CC, CXX and LDFLAGS wrt #317767 by Kacper Kowalik. Drop unnecessary || die from pkg_setup wrt #317769. |
6 |
(Portage version: 2.2_rc67/cvs/Linux x86_64) |
7 |
|
8 |
Revision Changes Path |
9 |
1.24 dev-embedded/ponyprog/ChangeLog |
10 |
|
11 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-embedded/ponyprog/ChangeLog?rev=1.24&view=markup |
12 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-embedded/ponyprog/ChangeLog?rev=1.24&content-type=text/plain |
13 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-embedded/ponyprog/ChangeLog?r1=1.23&r2=1.24 |
14 |
|
15 |
Index: ChangeLog |
16 |
=================================================================== |
17 |
RCS file: /var/cvsroot/gentoo-x86/dev-embedded/ponyprog/ChangeLog,v |
18 |
retrieving revision 1.23 |
19 |
retrieving revision 1.24 |
20 |
diff -u -r1.23 -r1.24 |
21 |
--- ChangeLog 29 Apr 2010 12:43:25 -0000 1.23 |
22 |
+++ ChangeLog 17 Jun 2010 18:29:43 -0000 1.24 |
23 |
@@ -1,6 +1,11 @@ |
24 |
# ChangeLog for dev-embedded/ponyprog |
25 |
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
26 |
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/ponyprog/ChangeLog,v 1.23 2010/04/29 12:43:25 ssuominen Exp $ |
27 |
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/ponyprog/ChangeLog,v 1.24 2010/06/17 18:29:43 ssuominen Exp $ |
28 |
+ |
29 |
+ 17 Jun 2010; Samuli Suominen <ssuominen@g.o> |
30 |
+ ponyprog-2.07a-r1.ebuild, +files/ponyprog-2.07a-build.patch: |
31 |
+ Respect CC, CXX and LDFLAGS wrt #317767 by Kacper Kowalik. Drop |
32 |
+ unnecessary || die from pkg_setup wrt #317769. |
33 |
|
34 |
29 Apr 2010; Samuli Suominen <ssuominen@g.o> |
35 |
ponyprog-2.07a-r1.ebuild: |
36 |
|
37 |
|
38 |
|
39 |
1.5 dev-embedded/ponyprog/ponyprog-2.07a-r1.ebuild |
40 |
|
41 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-embedded/ponyprog/ponyprog-2.07a-r1.ebuild?rev=1.5&view=markup |
42 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-embedded/ponyprog/ponyprog-2.07a-r1.ebuild?rev=1.5&content-type=text/plain |
43 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-embedded/ponyprog/ponyprog-2.07a-r1.ebuild?r1=1.4&r2=1.5 |
44 |
|
45 |
Index: ponyprog-2.07a-r1.ebuild |
46 |
=================================================================== |
47 |
RCS file: /var/cvsroot/gentoo-x86/dev-embedded/ponyprog/ponyprog-2.07a-r1.ebuild,v |
48 |
retrieving revision 1.4 |
49 |
retrieving revision 1.5 |
50 |
diff -u -r1.4 -r1.5 |
51 |
--- ponyprog-2.07a-r1.ebuild 29 Apr 2010 12:43:25 -0000 1.4 |
52 |
+++ ponyprog-2.07a-r1.ebuild 17 Jun 2010 18:29:43 -0000 1.5 |
53 |
@@ -1,6 +1,6 @@ |
54 |
# Copyright 1999-2010 Gentoo Foundation |
55 |
# Distributed under the terms of the GNU General Public License v2 |
56 |
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/ponyprog/ponyprog-2.07a-r1.ebuild,v 1.4 2010/04/29 12:43:25 ssuominen Exp $ |
57 |
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/ponyprog/ponyprog-2.07a-r1.ebuild,v 1.5 2010/06/17 18:29:43 ssuominen Exp $ |
58 |
|
59 |
EAPI="3" |
60 |
|
61 |
@@ -13,47 +13,41 @@ |
62 |
LICENSE="LGPL-2" |
63 |
SLOT="0" |
64 |
KEYWORDS="amd64 x86" |
65 |
-IUSE="epiphany firefox" |
66 |
+IUSE="epiphany" |
67 |
|
68 |
RDEPEND="x11-libs/libXaw |
69 |
x11-libs/libXmu |
70 |
x11-libs/libXt |
71 |
x11-libs/libXext |
72 |
x11-libs/libX11 |
73 |
- epiphany? ( www-client/epiphany ) |
74 |
- firefox? ( || ( www-client/mozilla-firefox www-client/firefox-bin ) )" |
75 |
+ epiphany? ( www-client/epiphany )" |
76 |
DEPEND="${RDEPEND} |
77 |
|| ( media-gfx/graphicsmagick[imagemagick] media-gfx/imagemagick )" |
78 |
|
79 |
S="${WORKDIR}/PonyProg2000-${PV}" |
80 |
|
81 |
-pkg_setup() { |
82 |
- if (use epiphany && use firefox) ; then |
83 |
- die "Only one of epiphany or firefox can be in USE." |
84 |
- fi |
85 |
-} |
86 |
- |
87 |
src_prepare() { |
88 |
sed -i \ |
89 |
-e "s:\$(HOME)/Progetti/PonyProg_Sourceforge/v:${S}/v:" \ |
90 |
-e 's/\-O2//' \ |
91 |
v/Config.mk || die "sed failed" |
92 |
|
93 |
- sed -i -e 's/<asm\/io.h>/<sys\/io.h>/' *.cpp || die "sed failed" |
94 |
+ sed -i -e 's/<asm\/io.h>/<sys\/io.h>/' *.cpp || die |
95 |
|
96 |
if use epiphany ; then |
97 |
- sed -i -e 's/netscape/epiphany/' e2cmdw.cpp |
98 |
- fi |
99 |
- if use firefox ; then |
100 |
- sed -i -e 's/netscape/firefox/' e2cmdw.cpp |
101 |
+ sed -i -e 's/netscape/epiphany/' e2cmdw.cpp || die |
102 |
+ else |
103 |
+ sed -i -e 's/netscape/firefox/' e2cmdw.cpp || die |
104 |
fi |
105 |
convert ponyprog.ico ponyprog.png |
106 |
|
107 |
- # Fix compilation with gcc-4.3, bug #227503 |
108 |
- epatch "${FILESDIR}/${P}-gcc43.patch" |
109 |
+ epatch "${FILESDIR}"/${P}-gcc43.patch \ |
110 |
+ "${FILESDIR}"/${P}-build.patch |
111 |
} |
112 |
|
113 |
src_compile() { |
114 |
+ tc-export CC CXX |
115 |
+ |
116 |
# bug #282244 |
117 |
emake -j1 || die "emake failed" |
118 |
} |