Gentoo Archives: gentoo-commits

From: "Samuli Suominen (ssuominen)" <ssuominen@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in x11-misc/xcb: ChangeLog xcb-2.4.ebuild
Date: Sat, 02 May 2009 10:11:02
Message-Id: E1M0CBP-000676-3X@stork.gentoo.org
1 ssuominen 09/05/02 10:10:59
2
3 Modified: ChangeLog xcb-2.4.ebuild
4 Log:
5 Install app-defaults to /usr/share instead of /usr/X11R6/lib and tc-export CC.
6 (Portage version: 2.1.6.11/cvs/Linux x86_64)
7
8 Revision Changes Path
9 1.13 x11-misc/xcb/ChangeLog
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/xcb/ChangeLog?rev=1.13&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/xcb/ChangeLog?rev=1.13&content-type=text/plain
13 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/xcb/ChangeLog?r1=1.12&r2=1.13
14
15 Index: ChangeLog
16 ===================================================================
17 RCS file: /var/cvsroot/gentoo-x86/x11-misc/xcb/ChangeLog,v
18 retrieving revision 1.12
19 retrieving revision 1.13
20 diff -u -r1.12 -r1.13
21 --- ChangeLog 27 Oct 2006 06:39:11 -0000 1.12
22 +++ ChangeLog 2 May 2009 10:10:59 -0000 1.13
23 @@ -1,6 +1,10 @@
24 # ChangeLog for x11-misc/xcb
25 -# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
26 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/xcb/ChangeLog,v 1.12 2006/10/27 06:39:11 omp Exp $
27 +# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
28 +# $Header: /var/cvsroot/gentoo-x86/x11-misc/xcb/ChangeLog,v 1.13 2009/05/02 10:10:59 ssuominen Exp $
29 +
30 + 02 May 2009; Samuli Suominen <ssuominen@g.o> xcb-2.4.ebuild:
31 + Install app-defaults to /usr/share instead of /usr/X11R6/lib and tc-export
32 + CC.
33
34 27 Oct 2006; David Shakaryan <omp@g.o> xcb-2.4.ebuild:
35 Minor cleanup and remove monolithic X from dependencies.
36
37
38
39 1.12 x11-misc/xcb/xcb-2.4.ebuild
40
41 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/xcb/xcb-2.4.ebuild?rev=1.12&view=markup
42 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/xcb/xcb-2.4.ebuild?rev=1.12&content-type=text/plain
43 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/xcb/xcb-2.4.ebuild?r1=1.11&r2=1.12
44
45 Index: xcb-2.4.ebuild
46 ===================================================================
47 RCS file: /var/cvsroot/gentoo-x86/x11-misc/xcb/xcb-2.4.ebuild,v
48 retrieving revision 1.11
49 retrieving revision 1.12
50 diff -u -r1.11 -r1.12
51 --- xcb-2.4.ebuild 27 Oct 2006 06:39:11 -0000 1.11
52 +++ xcb-2.4.ebuild 2 May 2009 10:10:59 -0000 1.12
53 @@ -1,6 +1,9 @@
54 -# Copyright 1999-2006 Gentoo Foundation
55 +# Copyright 1999-2009 Gentoo Foundation
56 # Distributed under the terms of the GNU General Public License v2
57 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/xcb/xcb-2.4.ebuild,v 1.11 2006/10/27 06:39:11 omp Exp $
58 +# $Header: /var/cvsroot/gentoo-x86/x11-misc/xcb/xcb-2.4.ebuild,v 1.12 2009/05/02 10:10:59 ssuominen Exp $
59 +
60 +EAPI=2
61 +inherit toolchain-funcs
62
63 DESCRIPTION="Marc Lehmann's improved X Cut Buffers"
64 HOMEPAGE="http://www.goof.com/pcg/marc/xcb.html"
65 @@ -19,32 +22,28 @@
66 x11-proto/xproto
67 motif? ( x11-libs/openmotif )"
68
69 -src_unpack() {
70 - unpack ${A}
71 - cd "${S}"
72 - mv xcb.man xcb.1
73 -}
74 -
75 src_compile() {
76 local gui libs
77
78 if use motif; then
79 gui="-DMOTIF"
80 - libs="-L/usr/X11R6/lib -lXm -lXt -lX11"
81 + libs="-lXm -lXt -lX11"
82 else
83 gui="-DATHENA"
84 - libs="-L/usr/X11R6/lib -lXaw -lXt -lXext -lX11"
85 + libs="-lXaw -lXt -lXext -lX11"
86 fi
87
88 + tc-export CC
89 emake -f Makefile.std xcb Xcb.ad \
90 - CFLAGS="${CFLAGS} ${gui} -I/usr/X11R6/include" \
91 + CFLAGS="${CFLAGS} ${gui}" \
92 GUI="${gui}" \
93 LIBS="${libs}" \
94 - || die 'emake failed'
95 + || die "emake failed"
96 }
97
98 src_install() {
99 - dobin xcb
100 - doman xcb.1
101 - insinto /usr/X11R6/lib/X11/app-defaults ; newins Xcb.ad Xcb
102 + dobin xcb || die "dobin failed"
103 + newman xcb.man xcb.1
104 + insinto /usr/share/X11/app-defaults
105 + newins Xcb.ad Xcb || die "newins failed"
106 }