1 |
commit: 4c18063465cfeaf27012fec894a1739f7ebf2aac |
2 |
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Jun 30 07:17:26 2016 +0000 |
4 |
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Jun 30 07:18:43 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4c180634 |
7 |
|
8 |
x11-misc/xcb: Quote CPP (bug #587344 by Toralf Förster). |
9 |
|
10 |
Package-Manager: portage-2.3.0 |
11 |
|
12 |
x11-misc/xcb/xcb-2.4-r1.ebuild | 33 ++++++++++++++++++--------------- |
13 |
1 file changed, 18 insertions(+), 15 deletions(-) |
14 |
|
15 |
diff --git a/x11-misc/xcb/xcb-2.4-r1.ebuild b/x11-misc/xcb/xcb-2.4-r1.ebuild |
16 |
index 16165c6..dde2a07 100644 |
17 |
--- a/x11-misc/xcb/xcb-2.4-r1.ebuild |
18 |
+++ b/x11-misc/xcb/xcb-2.4-r1.ebuild |
19 |
@@ -1,9 +1,8 @@ |
20 |
-# Copyright 1999-2012 Gentoo Foundation |
21 |
+# Copyright 1999-2016 Gentoo Foundation |
22 |
# Distributed under the terms of the GNU General Public License v2 |
23 |
# $Id$ |
24 |
|
25 |
-EAPI=2 |
26 |
- |
27 |
+EAPI=6 |
28 |
inherit toolchain-funcs |
29 |
|
30 |
DESCRIPTION="Marc Lehmann's improved X Cut Buffers" |
31 |
@@ -15,13 +14,17 @@ SLOT="0" |
32 |
KEYWORDS="alpha amd64 ~ppc x86" |
33 |
IUSE="motif" |
34 |
|
35 |
-RDEPEND="x11-libs/libX11 |
36 |
- x11-libs/libXt |
37 |
+RDEPEND=" |
38 |
+ x11-libs/libX11 |
39 |
x11-libs/libXaw |
40 |
- x11-libs/libXext" |
41 |
-DEPEND="${RDEPEND} |
42 |
+ x11-libs/libXext |
43 |
+ x11-libs/libXt |
44 |
+" |
45 |
+DEPEND=" |
46 |
+ ${RDEPEND} |
47 |
x11-proto/xproto |
48 |
- motif? ( >=x11-libs/motif-2.3:0 )" |
49 |
+ motif? ( >=x11-libs/motif-2.3:0 ) |
50 |
+" |
51 |
|
52 |
src_compile() { |
53 |
local gui libs |
54 |
@@ -34,19 +37,19 @@ src_compile() { |
55 |
libs="-lXaw -lXt -lXext -lX11" |
56 |
fi |
57 |
|
58 |
- emake -f Makefile.std xcb Xcb.ad \ |
59 |
- CC=$(tc-getCC) \ |
60 |
- CPP=$(tc-getCPP) \ |
61 |
+ emake \ |
62 |
+ -f Makefile.std xcb Xcb.ad \ |
63 |
+ CC="$(tc-getCC)" \ |
64 |
+ CPP="$(tc-getCPP)" \ |
65 |
CFLAGS="${CFLAGS} ${gui}" \ |
66 |
GUI="${gui}" \ |
67 |
LIBS="${libs}" \ |
68 |
- LDFLAGS="${LDFLAGS}" \ |
69 |
- || die "emake failed" |
70 |
+ LDFLAGS="${LDFLAGS}" |
71 |
} |
72 |
|
73 |
src_install() { |
74 |
- dobin xcb || die "dobin failed" |
75 |
+ dobin xcb |
76 |
newman xcb.man xcb.1 |
77 |
insinto /usr/share/X11/app-defaults |
78 |
- newins Xcb.ad Xcb || die "newins failed" |
79 |
+ newins Xcb.ad Xcb |
80 |
} |