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: ChangeLog dmenu-4.5-r4.ebuild
Date: Wed, 22 Jan 2014 17:15:10
Message-Id: 20140122144623.5E12D2004C@flycatcher.gentoo.org
1 jer 14/01/22 14:46:23
2
3 Modified: ChangeLog
4 Added: dmenu-4.5-r4.ebuild
5 Log:
6 Clean up patch. Revision bump for a slightly different patch by Hans-Peter Deifel (bug #498924).
7
8 (Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key A792A613)
9
10 Revision Changes Path
11 1.111 x11-misc/dmenu/ChangeLog
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/dmenu/ChangeLog?rev=1.111&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/dmenu/ChangeLog?rev=1.111&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/dmenu/ChangeLog?r1=1.110&r2=1.111
16
17 Index: ChangeLog
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/x11-misc/dmenu/ChangeLog,v
20 retrieving revision 1.110
21 retrieving revision 1.111
22 diff -u -r1.110 -r1.111
23 --- ChangeLog 23 Dec 2013 22:51:23 -0000 1.110
24 +++ ChangeLog 22 Jan 2014 14:46:23 -0000 1.111
25 @@ -1,6 +1,13 @@
26 # ChangeLog for x11-misc/dmenu
27 -# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
28 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/dmenu/ChangeLog,v 1.110 2013/12/23 22:51:23 jer Exp $
29 +# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
30 +# $Header: /var/cvsroot/gentoo-x86/x11-misc/dmenu/ChangeLog,v 1.111 2014/01/22 14:46:23 jer Exp $
31 +
32 +*dmenu-4.5-r4 (22 Jan 2014)
33 +
34 + 22 Jan 2014; Jeroen Roovers <jer@g.o> +dmenu-4.5-r4.ebuild,
35 + files/dmenu-4.5-xft-2.patch, +files/dmenu-4.5-xft-3.patch:
36 + Clean up patch. Revision bump for a slightly different patch by Hans-Peter
37 + Deifel (bug #498924).
38
39 23 Dec 2013; Jeroen Roovers <jer@g.o> dmenu-4.5-r3.ebuild:
40 Quote make command line variables (bug #495128).
41
42
43
44 1.1 x11-misc/dmenu/dmenu-4.5-r4.ebuild
45
46 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/dmenu/dmenu-4.5-r4.ebuild?rev=1.1&view=markup
47 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/dmenu/dmenu-4.5-r4.ebuild?rev=1.1&content-type=text/plain
48
49 Index: dmenu-4.5-r4.ebuild
50 ===================================================================
51 # Copyright 1999-2014 Gentoo Foundation
52 # Distributed under the terms of the GNU General Public License v2
53 # $Header: /var/cvsroot/gentoo-x86/x11-misc/dmenu/dmenu-4.5-r4.ebuild,v 1.1 2014/01/22 14:46:23 jer Exp $
54
55 EAPI=5
56 inherit eutils toolchain-funcs
57
58 DESCRIPTION="a generic, highly customizable, and efficient menu for the X Window System"
59 HOMEPAGE="http://tools.suckless.org/dmenu/"
60 SRC_URI="http://dl.suckless.org/tools/${P}.tar.gz"
61
62 LICENSE="MIT"
63 SLOT="0"
64 KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd"
65 IUSE="xft xinerama"
66
67 RDEPEND="
68 x11-libs/libX11
69 xft? ( x11-libs/libXft )
70 xinerama? ( x11-libs/libXinerama )
71 "
72 DEPEND="${RDEPEND}
73 xft? ( virtual/pkgconfig )
74 xinerama? ( virtual/pkgconfig )
75 "
76
77 src_prepare() {
78 # Respect our flags
79 sed -i \
80 -e '/^CFLAGS/{s|=.*|+= -ansi -pedantic -Wall $(INCS) $(CPPFLAGS)|}' \
81 -e '/^LDFLAGS/s|= -s|+=|' \
82 config.mk || die
83 # Make make verbose
84 sed -i \
85 -e 's|^ @| |g' \
86 -e '/^ echo/d' \
87 Makefile || die
88 use xft && epatch "${FILESDIR}"/${PN}-4.5-xft-3.patch
89
90 epatch_user
91 }
92
93 src_compile() {
94 emake CC=$(tc-getCC) \
95 "XFTINC=$( $(tc-getPKG_CONFIG) --cflags xft 2>/dev/null )" \
96 "XFTLIBS=$( $(tc-getPKG_CONFIG) --libs xft 2>/dev/null )" \
97 "XINERAMAFLAGS=$(
98 usex xinerama "-DXINERAMA $(
99 $(tc-getPKG_CONFIG) --cflags xinerama 2>/dev/null
100 )" ''
101 )" \
102 "XINERAMALIBS=$(
103 usex xinerama "$( $(tc-getPKG_CONFIG) --libs xinerama 2>/dev/null)" ''
104 )"
105 }
106
107 src_install() {
108 emake DESTDIR="${D}" PREFIX="/usr" install
109 }