1 |
commit: 521ad220accf56a5dfea6f7dfaaa6242cc7d85e8 |
2 |
Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Apr 25 09:13:28 2021 +0000 |
4 |
Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Apr 25 09:13:51 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=521ad220 |
7 |
|
8 |
x11-misc/dmenu: drop old |
9 |
|
10 |
Bug: https://bugs.gentoo.org/722894 |
11 |
Package-Manager: Portage-3.0.18, Repoman-3.0.3 |
12 |
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org> |
13 |
|
14 |
x11-misc/dmenu/Manifest | 2 - |
15 |
x11-misc/dmenu/dmenu-4.8.ebuild | 60 ---------------------------- |
16 |
x11-misc/dmenu/dmenu-4.9.ebuild | 61 ----------------------------- |
17 |
x11-misc/dmenu/files/dmenu-4.7-gentoo.patch | 38 ------------------ |
18 |
4 files changed, 161 deletions(-) |
19 |
|
20 |
diff --git a/x11-misc/dmenu/Manifest b/x11-misc/dmenu/Manifest |
21 |
index b5b7b6135f9..849feaa2712 100644 |
22 |
--- a/x11-misc/dmenu/Manifest |
23 |
+++ b/x11-misc/dmenu/Manifest |
24 |
@@ -1,3 +1 @@ |
25 |
-DIST dmenu-4.8.tar.gz 15658 BLAKE2B 8e027905a3c32d0db20f22ac911bcd69c39d00b2c426c1fa79a9b6253c13223ddc79413b9f8ecf38f3258aada3d7c4a91535fb930a5d2a9fb239f398a6b6af07 SHA512 fa2700018cfb912a21f867ef3ca771a58a25c2cb8e1fb37acef046bb15d8d8b92dcc5bfce486befae0f143495d0283910988e181a9eb143be3bb1b5be9738d77 |
26 |
-DIST dmenu-4.9.tar.gz 15972 BLAKE2B 56ba03a3dfd24e2fb0f45feaaaac53e441b63a0d72adbc36499a97e2eab7c524da2088e3a15c6599c513bb35a6a049663b97220e671e03bd577baaaf711f228a SHA512 c2779209fe012de8ca1cdd72923da6d594f4a8368c85c3c0e0afd4ae489a95fe0e6f05a947d115b6b389aa7170ab14c2c645a2031353b0a08f38327ab461fe65 |
27 |
DIST dmenu-5.0.tar.gz 16028 BLAKE2B 9f161e3d44d5cb80e3996db81e28cdf7f143d310ec2660c837df167d8426645dde09d4f5a0c71d4be73f80f76615a32c20dd3d7f30a23506993215c89fe40844 SHA512 2b6a7cdf5aefc5e7ca7a4944883c3c16ee6f5005d2a96b61482d4899ad395f9cb8926907681d88b9df3e1188cf421dad4cc17e343b752f6cb8b161d33384b3f3 |
28 |
|
29 |
diff --git a/x11-misc/dmenu/dmenu-4.8.ebuild b/x11-misc/dmenu/dmenu-4.8.ebuild |
30 |
deleted file mode 100644 |
31 |
index 976b6840c2e..00000000000 |
32 |
--- a/x11-misc/dmenu/dmenu-4.8.ebuild |
33 |
+++ /dev/null |
34 |
@@ -1,60 +0,0 @@ |
35 |
-# Copyright 1999-2021 Gentoo Authors |
36 |
-# Distributed under the terms of the GNU General Public License v2 |
37 |
- |
38 |
-EAPI=6 |
39 |
-inherit savedconfig toolchain-funcs |
40 |
- |
41 |
-DESCRIPTION="a generic, highly customizable, and efficient menu for the X Window System" |
42 |
-HOMEPAGE="https://tools.suckless.org/dmenu/" |
43 |
-SRC_URI="https://dl.suckless.org/tools/${P}.tar.gz" |
44 |
- |
45 |
-LICENSE="MIT" |
46 |
-SLOT="0" |
47 |
-KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 x86" |
48 |
-IUSE="xinerama" |
49 |
- |
50 |
-RDEPEND=" |
51 |
- media-libs/fontconfig |
52 |
- x11-libs/libX11 |
53 |
- x11-libs/libXft |
54 |
- xinerama? ( x11-libs/libXinerama ) |
55 |
-" |
56 |
-DEPEND="${RDEPEND} |
57 |
- virtual/pkgconfig |
58 |
- x11-base/xorg-proto |
59 |
-" |
60 |
-PATCHES=( |
61 |
- "${FILESDIR}"/${PN}-4.7-gentoo.patch |
62 |
-) |
63 |
- |
64 |
-src_prepare() { |
65 |
- default |
66 |
- |
67 |
- sed -i \ |
68 |
- -e 's|^ @| |g' \ |
69 |
- -e 's|${CC} -o|$(CC) $(CFLAGS) -o|g' \ |
70 |
- -e '/^ echo/d' \ |
71 |
- Makefile || die |
72 |
- |
73 |
- restore_config config.h |
74 |
-} |
75 |
- |
76 |
-src_compile() { |
77 |
- emake CC=$(tc-getCC) \ |
78 |
- "FREETYPEINC=$( $(tc-getPKG_CONFIG) --cflags x11 fontconfig xft 2>/dev/null )" \ |
79 |
- "FREETYPELIBS=$( $(tc-getPKG_CONFIG) --libs x11 fontconfig xft 2>/dev/null )" \ |
80 |
- "XINERAMAFLAGS=$( |
81 |
- usex xinerama "-DXINERAMA $( |
82 |
- $(tc-getPKG_CONFIG) --cflags xinerama 2>/dev/null |
83 |
- )" '' |
84 |
- )" \ |
85 |
- "XINERAMALIBS=$( |
86 |
- usex xinerama "$( $(tc-getPKG_CONFIG) --libs xinerama 2>/dev/null)" '' |
87 |
- )" |
88 |
-} |
89 |
- |
90 |
-src_install() { |
91 |
- emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install |
92 |
- |
93 |
- save_config config.h |
94 |
-} |
95 |
|
96 |
diff --git a/x11-misc/dmenu/dmenu-4.9.ebuild b/x11-misc/dmenu/dmenu-4.9.ebuild |
97 |
deleted file mode 100644 |
98 |
index 29be48084ef..00000000000 |
99 |
--- a/x11-misc/dmenu/dmenu-4.9.ebuild |
100 |
+++ /dev/null |
101 |
@@ -1,61 +0,0 @@ |
102 |
-# Copyright 1999-2019 Gentoo Authors |
103 |
-# Distributed under the terms of the GNU General Public License v2 |
104 |
- |
105 |
-EAPI=7 |
106 |
-inherit savedconfig toolchain-funcs |
107 |
- |
108 |
-DESCRIPTION="a generic, highly customizable, and efficient menu for the X Window System" |
109 |
-HOMEPAGE="https://tools.suckless.org/dmenu/" |
110 |
-SRC_URI="https://dl.suckless.org/tools/${P}.tar.gz" |
111 |
- |
112 |
-LICENSE="MIT" |
113 |
-SLOT="0" |
114 |
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86" |
115 |
-IUSE="xinerama" |
116 |
- |
117 |
-RDEPEND=" |
118 |
- media-libs/fontconfig |
119 |
- x11-libs/libX11 |
120 |
- x11-libs/libXft |
121 |
- xinerama? ( x11-libs/libXinerama ) |
122 |
-" |
123 |
-DEPEND="${RDEPEND} |
124 |
- virtual/pkgconfig |
125 |
- x11-base/xorg-proto |
126 |
-" |
127 |
-PATCHES=( |
128 |
- "${FILESDIR}"/${PN}-4.9-gentoo.patch |
129 |
-) |
130 |
- |
131 |
-src_prepare() { |
132 |
- default |
133 |
- |
134 |
- sed -i \ |
135 |
- -e 's|^ @| |g' \ |
136 |
- -e '/^ echo/d' \ |
137 |
- Makefile || die |
138 |
- |
139 |
- restore_config config.h |
140 |
-} |
141 |
- |
142 |
-src_compile() { |
143 |
- emake CC=$(tc-getCC) \ |
144 |
- "FREETYPEINC=$( $(tc-getPKG_CONFIG) --cflags x11 fontconfig xft 2>/dev/null )" \ |
145 |
- "FREETYPELIBS=$( $(tc-getPKG_CONFIG) --libs x11 fontconfig xft 2>/dev/null )" \ |
146 |
- "X11INC=$( $(tc-getPKG_CONFIG) --cflags x11 2>/dev/null )" \ |
147 |
- "X11LIB=$( $(tc-getPKG_CONFIG) --libs x11 2>/dev/null )" \ |
148 |
- "XINERAMAFLAGS=$( |
149 |
- usex xinerama "-DXINERAMA $( |
150 |
- $(tc-getPKG_CONFIG) --cflags xinerama 2>/dev/null |
151 |
- )" '' |
152 |
- )" \ |
153 |
- "XINERAMALIBS=$( |
154 |
- usex xinerama "$( $(tc-getPKG_CONFIG) --libs xinerama 2>/dev/null)" '' |
155 |
- )" |
156 |
-} |
157 |
- |
158 |
-src_install() { |
159 |
- emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install |
160 |
- |
161 |
- save_config config.h |
162 |
-} |
163 |
|
164 |
diff --git a/x11-misc/dmenu/files/dmenu-4.7-gentoo.patch b/x11-misc/dmenu/files/dmenu-4.7-gentoo.patch |
165 |
deleted file mode 100644 |
166 |
index 77f59415588..00000000000 |
167 |
--- a/x11-misc/dmenu/files/dmenu-4.7-gentoo.patch |
168 |
+++ /dev/null |
169 |
@@ -1,38 +0,0 @@ |
170 |
---- a/config.mk |
171 |
-+++ b/config.mk |
172 |
-@@ -5,8 +5,8 @@ |
173 |
- PREFIX = /usr/local |
174 |
- MANPREFIX = ${PREFIX}/share/man |
175 |
- |
176 |
--X11INC = /usr/X11R6/include |
177 |
--X11LIB = /usr/X11R6/lib |
178 |
-+X11INC = -I/usr/X11R6/include |
179 |
-+X11LIB = -L/usr/X11R6/lib |
180 |
- |
181 |
- # Xinerama, comment if you don't want it |
182 |
- XINERAMALIBS = -lXinerama |
183 |
-@@ -14,18 +14,18 @@ |
184 |
- |
185 |
- # freetype |
186 |
- FREETYPELIBS = -lfontconfig -lXft |
187 |
--FREETYPEINC = /usr/include/freetype2 |
188 |
-+FREETYPEINC = -I/usr/include/freetype2 |
189 |
- # OpenBSD (uncomment) |
190 |
- #FREETYPEINC = ${X11INC}/freetype2 |
191 |
- |
192 |
- # includes and libs |
193 |
--INCS = -I${X11INC} -I${FREETYPEINC} |
194 |
--LIBS = -L${X11LIB} -lX11 ${XINERAMALIBS} ${FREETYPELIBS} |
195 |
-+INCS = ${X11INC} ${FREETYPEINC} |
196 |
-+LIBS = ${X11LIB} -lX11 ${XINERAMALIBS} ${FREETYPELIBS} |
197 |
- |
198 |
- # flags |
199 |
--CPPFLAGS = -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_XOPEN_SOURCE=700 -D_POSIX_C_SOURCE=200809L -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS} |
200 |
--CFLAGS = -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS} |
201 |
--LDFLAGS = -s ${LIBS} |
202 |
-+CPPFLAGS += -D_BSD_SOURCE -D_XOPEN_SOURCE=700 -D_POSIX_C_SOURCE=200809L -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS} |
203 |
-+CFLAGS += -ansi -pedantic -Wall $(INCS) $(CPPFLAGS) |
204 |
-+LDFLAGS += ${LIBS} |
205 |
- |
206 |
- # compiler and linker |
207 |
- CC = cc |