Gentoo Archives: gentoo-commits

From: "Jeroen Roovers (jer)" <jer@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in x11-misc/dmenu: dmenu-9999.ebuild ChangeLog
Date: Mon, 30 Jun 2014 13:54:08
Message-Id: 20140630135358.DCD712004E@flycatcher.gentoo.org
1 jer 14/06/30 13:53:58
2
3 Modified: dmenu-9999.ebuild ChangeLog
4 Log:
5 Remove USE=xft.
6
7 (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key A792A613)
8
9 Revision Changes Path
10 1.2 x11-misc/dmenu/dmenu-9999.ebuild
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/dmenu/dmenu-9999.ebuild?rev=1.2&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/dmenu/dmenu-9999.ebuild?rev=1.2&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/dmenu/dmenu-9999.ebuild?r1=1.1&r2=1.2
15
16 Index: dmenu-9999.ebuild
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/x11-misc/dmenu/dmenu-9999.ebuild,v
19 retrieving revision 1.1
20 retrieving revision 1.2
21 diff -u -r1.1 -r1.2
22 --- dmenu-9999.ebuild 30 Jun 2014 13:31:15 -0000 1.1
23 +++ dmenu-9999.ebuild 30 Jun 2014 13:53:58 -0000 1.2
24 @@ -1,6 +1,6 @@
25 # Copyright 1999-2014 Gentoo Foundation
26 # Distributed under the terms of the GNU General Public License v2
27 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/dmenu/dmenu-9999.ebuild,v 1.1 2014/06/30 13:31:15 jer Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/x11-misc/dmenu/dmenu-9999.ebuild,v 1.2 2014/06/30 13:53:58 jer Exp $
29
30 EAPI=5
31 inherit eutils git-r3 savedconfig toolchain-funcs
32 @@ -12,15 +12,13 @@
33 LICENSE="MIT"
34 SLOT="0"
35 KEYWORDS=""
36 -IUSE="xft xinerama"
37 +IUSE="xinerama"
38
39 RDEPEND="
40 x11-libs/libX11
41 - xft? ( x11-libs/libXft )
42 xinerama? ( x11-libs/libXinerama )
43 "
44 DEPEND="${RDEPEND}
45 - xft? ( virtual/pkgconfig )
46 xinerama? ( virtual/pkgconfig )
47 "
48
49 @@ -40,17 +38,22 @@
50 epatch_user
51 }
52
53 +src_configure() {
54 + tc-export PKG_CONFIG
55 +}
56 +
57 src_compile() {
58 - emake CC=$(tc-getCC) \
59 - "XFTINC=$( $(tc-getPKG_CONFIG) --cflags xft 2>/dev/null )" \
60 - "XFTLIBS=$( $(tc-getPKG_CONFIG) --libs xft 2>/dev/null )" \
61 + emake \
62 + CC=$(tc-getCC) \
63 "XINERAMAFLAGS=$(
64 usex xinerama "-DXINERAMA $(
65 - $(tc-getPKG_CONFIG) --cflags xinerama 2>/dev/null
66 + ${PKG_CONFIG} --cflags xinerama 2>/dev/null
67 )" ''
68 )" \
69 "XINERAMALIBS=$(
70 - usex xinerama "$( $(tc-getPKG_CONFIG) --libs xinerama 2>/dev/null)" ''
71 + usex xinerama "$(
72 + ${PKG_CONFIG} --libs xinerama 2>/dev/null
73 + )" ''
74 )"
75 }
76
77
78
79
80 1.113 x11-misc/dmenu/ChangeLog
81
82 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/dmenu/ChangeLog?rev=1.113&view=markup
83 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/dmenu/ChangeLog?rev=1.113&content-type=text/plain
84 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/dmenu/ChangeLog?r1=1.112&r2=1.113
85
86 Index: ChangeLog
87 ===================================================================
88 RCS file: /var/cvsroot/gentoo-x86/x11-misc/dmenu/ChangeLog,v
89 retrieving revision 1.112
90 retrieving revision 1.113
91 diff -u -r1.112 -r1.113
92 --- ChangeLog 30 Jun 2014 13:31:15 -0000 1.112
93 +++ ChangeLog 30 Jun 2014 13:53:58 -0000 1.113
94 @@ -1,6 +1,9 @@
95 # ChangeLog for x11-misc/dmenu
96 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
97 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/dmenu/ChangeLog,v 1.112 2014/06/30 13:31:15 jer Exp $
98 +# $Header: /var/cvsroot/gentoo-x86/x11-misc/dmenu/ChangeLog,v 1.113 2014/06/30 13:53:58 jer Exp $
99 +
100 + 30 Jun 2014; Jeroen Roovers <jer@g.o> dmenu-9999.ebuild:
101 + Remove USE=xft.
102
103 *dmenu-9999 (30 Jun 2014)