1 |
xarthisius 10/05/29 13:10:44 |
2 |
|
3 |
Modified: amiwm-0.20_p48.ebuild ChangeLog |
4 |
Log: |
5 |
Fix parallel build wrt bug 248680, don't strip files wrt bug 299918 + other QA fixes |
6 |
(Portage version: 2.1.8.3/cvs/Linux x86_64) |
7 |
|
8 |
Revision Changes Path |
9 |
1.11 x11-wm/amiwm/amiwm-0.20_p48.ebuild |
10 |
|
11 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/amiwm/amiwm-0.20_p48.ebuild?rev=1.11&view=markup |
12 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/amiwm/amiwm-0.20_p48.ebuild?rev=1.11&content-type=text/plain |
13 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/amiwm/amiwm-0.20_p48.ebuild?r1=1.10&r2=1.11 |
14 |
|
15 |
Index: amiwm-0.20_p48.ebuild |
16 |
=================================================================== |
17 |
RCS file: /var/cvsroot/gentoo-x86/x11-wm/amiwm/amiwm-0.20_p48.ebuild,v |
18 |
retrieving revision 1.10 |
19 |
retrieving revision 1.11 |
20 |
diff -u -r1.10 -r1.11 |
21 |
--- amiwm-0.20_p48.ebuild 27 Dec 2009 13:33:41 -0000 1.10 |
22 |
+++ amiwm-0.20_p48.ebuild 29 May 2010 13:10:44 -0000 1.11 |
23 |
@@ -1,8 +1,10 @@ |
24 |
-# Copyright 1999-2009 Gentoo Foundation |
25 |
+# Copyright 1999-2010 Gentoo Foundation |
26 |
# Distributed under the terms of the GNU General Public License v2 |
27 |
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/amiwm/amiwm-0.20_p48.ebuild,v 1.10 2009/12/27 13:33:41 flameeyes Exp $ |
28 |
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/amiwm/amiwm-0.20_p48.ebuild,v 1.11 2010/05/29 13:10:44 xarthisius Exp $ |
29 |
|
30 |
-inherit eutils |
31 |
+EAPI="2" |
32 |
+ |
33 |
+inherit eutils multilib toolchain-funcs |
34 |
|
35 |
MY_P="${PN}${PV/_p/pl}" |
36 |
DESCRIPTION="Windowmanager ala Amiga(R) Workbench(R)" |
37 |
@@ -14,39 +16,42 @@ |
38 |
KEYWORDS="~amd64 ~ppc ~x86" |
39 |
IUSE="" |
40 |
|
41 |
-RDEPEND="x11-libs/libX11 |
42 |
+COMMON_DEPEND="x11-libs/libX11 |
43 |
x11-libs/libXmu |
44 |
x11-libs/libXext" |
45 |
-DEPEND="${RDEPEND} |
46 |
+ |
47 |
+RDEPEND="${COMMON_DEPEND} |
48 |
+ media-gfx/xloadimage |
49 |
+ x11-apps/xrdb |
50 |
+ x11-apps/xsetroot |
51 |
+ x11-terms/xterm" |
52 |
+DEPEND="${COMMON_DEPEND} |
53 |
x11-proto/xproto |
54 |
x11-proto/xextproto" |
55 |
|
56 |
S=${WORKDIR}/${MY_P} |
57 |
|
58 |
-src_unpack() { |
59 |
- unpack ${A} |
60 |
- cd "${S}" |
61 |
- epatch "${FILESDIR}"/${P}-flex.patch #110169 |
62 |
+pkg_setup() { |
63 |
+ tc-export CC |
64 |
} |
65 |
|
66 |
-src_compile() { |
67 |
- econf |
68 |
- # bug #248680 |
69 |
- emake -j1 || die "build failed" |
70 |
+src_prepare() { |
71 |
+ epatch "${FILESDIR}"/${P}-flex.patch \ |
72 |
+ "${FILESDIR}"/${P}-gentoo.diff |
73 |
+ sed -i -e "s:\$(exec_prefix)/lib:\$(exec_prefix)/$(get_libdir):" \ |
74 |
+ Makefile.in || die |
75 |
+ sed -i -e "s:/bin/ksh:/bin/sh:g" Xsession{,2}.in || die |
76 |
} |
77 |
|
78 |
src_install() { |
79 |
- dodir /usr/bin |
80 |
- einstall || die |
81 |
- |
82 |
- rm "${D}"/usr/bin/requestchoice |
83 |
- dosym /usr/lib/amiwm/requestchoice /usr/bin/requestchoice |
84 |
- |
85 |
- dosed /usr/lib/amiwm/{Xinitrc,Xsession,Xsession2} |
86 |
+ emake DESTDIR="${D}" install || die |
87 |
|
88 |
- dodoc INSTALL README* |
89 |
+ dodoc README* || die |
90 |
|
91 |
exeinto /etc/X11/Sessions |
92 |
- echo "/usr/bin/amiwm" > "${T}"/amiwm |
93 |
+ cat <<- EOF > "${T}"/amiwm |
94 |
+ #!/bin/sh |
95 |
+ exec /usr/bin/amiwm |
96 |
+ EOF |
97 |
doexe "${T}"/amiwm |
98 |
} |
99 |
|
100 |
|
101 |
|
102 |
1.11 x11-wm/amiwm/ChangeLog |
103 |
|
104 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/amiwm/ChangeLog?rev=1.11&view=markup |
105 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/amiwm/ChangeLog?rev=1.11&content-type=text/plain |
106 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/amiwm/ChangeLog?r1=1.10&r2=1.11 |
107 |
|
108 |
Index: ChangeLog |
109 |
=================================================================== |
110 |
RCS file: /var/cvsroot/gentoo-x86/x11-wm/amiwm/ChangeLog,v |
111 |
retrieving revision 1.10 |
112 |
retrieving revision 1.11 |
113 |
diff -u -r1.10 -r1.11 |
114 |
--- ChangeLog 27 Dec 2009 13:33:41 -0000 1.10 |
115 |
+++ ChangeLog 29 May 2010 13:10:44 -0000 1.11 |
116 |
@@ -1,6 +1,15 @@ |
117 |
# ChangeLog for x11-wm/amiwm |
118 |
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 |
119 |
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/amiwm/ChangeLog,v 1.10 2009/12/27 13:33:41 flameeyes Exp $ |
120 |
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
121 |
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/amiwm/ChangeLog,v 1.11 2010/05/29 13:10:44 xarthisius Exp $ |
122 |
+ |
123 |
+ 29 May 2010; Kacper Kowalik <xarthisius@g.o> amiwm-0.20_p48.ebuild, |
124 |
+ +files/amiwm-0.20_p48-gentoo.diff: |
125 |
+ Fix parallel build wrt bug 248680, don't strip files wrt bug 299918. |
126 |
+ Thanks |
127 |
+ Diego for reporting. |
128 |
+ Fix install directories, respect CC and user flags, multilib-strict. |
129 |
+ Fix incompatible implicit declaration of built-in function. |
130 |
+ Update dependencies. |
131 |
|
132 |
27 Dec 2009; Diego E. Pettenò <flameeyes@g.o> |
133 |
amiwm-0.20_p48.ebuild: |