Gentoo Archives: gentoo-commits

From: Jeroen Roovers <jer@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-misc/dmenu/files/, x11-misc/dmenu/
Date: Tue, 05 Feb 2019 15:16:11
Message-Id: 1549379762.424d347633450bf1c07d1043d96958b6ba2be458.jer@gentoo
1 commit: 424d347633450bf1c07d1043d96958b6ba2be458
2 Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
3 AuthorDate: Tue Feb 5 15:15:49 2019 +0000
4 Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
5 CommitDate: Tue Feb 5 15:16:02 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=424d3476
7
8 x11-misc/dmenu: Version 4.9
9
10 Package-Manager: Portage-2.3.59, Repoman-2.3.12
11 Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>
12
13 x11-misc/dmenu/Manifest | 1 +
14 x11-misc/dmenu/dmenu-4.9.ebuild | 60 +++++++++++++++++++++++++++++
15 x11-misc/dmenu/files/dmenu-4.9-gentoo.patch | 15 ++++++++
16 3 files changed, 76 insertions(+)
17
18 diff --git a/x11-misc/dmenu/Manifest b/x11-misc/dmenu/Manifest
19 index 3ab401367f4..99bfcb51fc2 100644
20 --- a/x11-misc/dmenu/Manifest
21 +++ b/x11-misc/dmenu/Manifest
22 @@ -1,2 +1,3 @@
23 DIST dmenu-4.6.tar.gz 15057 BLAKE2B 87469e86400fc5d99c6c62666f6903c2dee6221739a52aab0facd4e417b1ddc88b138440b62e410d8230e7dec89ace1c684348eaab223fc7027eda0b6712e495 SHA512 e54fd10c0b1274eb90173aea442f0bfc496f4dda861a36d94f939e1fd835594f9aa12f3d0f90043d64e519d919b9a5273ab65012230ac022f727ee6bb64862e3
24 DIST dmenu-4.8.tar.gz 15658 BLAKE2B 8e027905a3c32d0db20f22ac911bcd69c39d00b2c426c1fa79a9b6253c13223ddc79413b9f8ecf38f3258aada3d7c4a91535fb930a5d2a9fb239f398a6b6af07 SHA512 fa2700018cfb912a21f867ef3ca771a58a25c2cb8e1fb37acef046bb15d8d8b92dcc5bfce486befae0f143495d0283910988e181a9eb143be3bb1b5be9738d77
25 +DIST dmenu-4.9.tar.gz 15972 BLAKE2B 56ba03a3dfd24e2fb0f45feaaaac53e441b63a0d72adbc36499a97e2eab7c524da2088e3a15c6599c513bb35a6a049663b97220e671e03bd577baaaf711f228a SHA512 c2779209fe012de8ca1cdd72923da6d594f4a8368c85c3c0e0afd4ae489a95fe0e6f05a947d115b6b389aa7170ab14c2c645a2031353b0a08f38327ab461fe65
26
27 diff --git a/x11-misc/dmenu/dmenu-4.9.ebuild b/x11-misc/dmenu/dmenu-4.9.ebuild
28 new file mode 100644
29 index 00000000000..022c42ba3dc
30 --- /dev/null
31 +++ b/x11-misc/dmenu/dmenu-4.9.ebuild
32 @@ -0,0 +1,60 @@
33 +# Copyright 1999-2019 Gentoo Authors
34 +# Distributed under the terms of the GNU General Public License v2
35 +
36 +EAPI=7
37 +inherit savedconfig toolchain-funcs
38 +
39 +DESCRIPTION="a generic, highly customizable, and efficient menu for the X Window System"
40 +HOMEPAGE="https://tools.suckless.org/dmenu/"
41 +SRC_URI="https://dl.suckless.org/tools/${P}.tar.gz"
42 +
43 +LICENSE="MIT"
44 +SLOT="0"
45 +KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd"
46 +IUSE="xinerama"
47 +
48 +RDEPEND="
49 + media-libs/fontconfig
50 + x11-libs/libX11
51 + x11-libs/libXft
52 + xinerama? ( x11-libs/libXinerama )
53 +"
54 +DEPEND="${RDEPEND}
55 + virtual/pkgconfig
56 + x11-base/xorg-proto
57 +"
58 +PATCHES=(
59 + "${FILESDIR}"/${PN}-4.9-gentoo.patch
60 +)
61 +
62 +src_prepare() {
63 + default
64 +
65 + sed -i \
66 + -e 's|^ @| |g' \
67 + -e 's|${CC} -o|$(CC) $(CFLAGS) -o|g' \
68 + -e '/^ echo/d' \
69 + Makefile || die
70 +
71 + restore_config config.h
72 +}
73 +
74 +src_compile() {
75 + emake CC=$(tc-getCC) \
76 + "FREETYPEINC=$( $(tc-getPKG_CONFIG) --cflags x11 fontconfig xft 2>/dev/null )" \
77 + "FREETYPELIBS=$( $(tc-getPKG_CONFIG) --libs x11 fontconfig xft 2>/dev/null )" \
78 + "XINERAMAFLAGS=$(
79 + usex xinerama "-DXINERAMA $(
80 + $(tc-getPKG_CONFIG) --cflags xinerama 2>/dev/null
81 + )" ''
82 + )" \
83 + "XINERAMALIBS=$(
84 + usex xinerama "$( $(tc-getPKG_CONFIG) --libs xinerama 2>/dev/null)" ''
85 + )"
86 +}
87 +
88 +src_install() {
89 + emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
90 +
91 + save_config config.h
92 +}
93
94 diff --git a/x11-misc/dmenu/files/dmenu-4.9-gentoo.patch b/x11-misc/dmenu/files/dmenu-4.9-gentoo.patch
95 new file mode 100644
96 index 00000000000..ee2ce0b9c15
97 --- /dev/null
98 +++ b/x11-misc/dmenu/files/dmenu-4.9-gentoo.patch
99 @@ -0,0 +1,15 @@
100 +--- a/config.mk
101 ++++ b/config.mk
102 +@@ -23,9 +23,9 @@
103 + LIBS = -L$(X11LIB) -lX11 $(XINERAMALIBS) $(FREETYPELIBS)
104 +
105 + # flags
106 +-CPPFLAGS = -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_XOPEN_SOURCE=700 -D_POSIX_C_SOURCE=200809L -DVERSION=\"$(VERSION)\" $(XINERAMAFLAGS)
107 +-CFLAGS = -std=c99 -pedantic -Wall -Os $(INCS) $(CPPFLAGS)
108 +-LDFLAGS = $(LIBS)
109 ++CPPFLAGS += -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_XOPEN_SOURCE=700 -D_POSIX_C_SOURCE=200809L -DVERSION=\"$(VERSION)\" $(XINERAMAFLAGS)
110 ++CFLAGS += -std=c99 -pedantic -Wall $(INCS) $(CPPFLAGS)
111 ++LDFLAGS += $(LIBS)
112 +
113 + # compiler and linker
114 + CC = cc