| 1 |
commit: cde3d26b770ff8626ca582a04f28fde23e88bb56 |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Apr 20 01:49:15 2021 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Apr 20 01:49:52 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cde3d26b |
| 7 |
|
| 8 |
x11-misc/dmenu: drop 4.6 (epatch) |
| 9 |
|
| 10 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 11 |
|
| 12 |
x11-misc/dmenu/Manifest | 1 - |
| 13 |
x11-misc/dmenu/dmenu-4.6.ebuild | 55 ----------------------------- |
| 14 |
x11-misc/dmenu/files/dmenu-4.6-gentoo.patch | 38 -------------------- |
| 15 |
3 files changed, 94 deletions(-) |
| 16 |
|
| 17 |
diff --git a/x11-misc/dmenu/Manifest b/x11-misc/dmenu/Manifest |
| 18 |
index 85b473475b8..b5b7b6135f9 100644 |
| 19 |
--- a/x11-misc/dmenu/Manifest |
| 20 |
+++ b/x11-misc/dmenu/Manifest |
| 21 |
@@ -1,4 +1,3 @@ |
| 22 |
-DIST dmenu-4.6.tar.gz 15057 BLAKE2B 87469e86400fc5d99c6c62666f6903c2dee6221739a52aab0facd4e417b1ddc88b138440b62e410d8230e7dec89ace1c684348eaab223fc7027eda0b6712e495 SHA512 e54fd10c0b1274eb90173aea442f0bfc496f4dda861a36d94f939e1fd835594f9aa12f3d0f90043d64e519d919b9a5273ab65012230ac022f727ee6bb64862e3 |
| 23 |
DIST dmenu-4.8.tar.gz 15658 BLAKE2B 8e027905a3c32d0db20f22ac911bcd69c39d00b2c426c1fa79a9b6253c13223ddc79413b9f8ecf38f3258aada3d7c4a91535fb930a5d2a9fb239f398a6b6af07 SHA512 fa2700018cfb912a21f867ef3ca771a58a25c2cb8e1fb37acef046bb15d8d8b92dcc5bfce486befae0f143495d0283910988e181a9eb143be3bb1b5be9738d77 |
| 24 |
DIST dmenu-4.9.tar.gz 15972 BLAKE2B 56ba03a3dfd24e2fb0f45feaaaac53e441b63a0d72adbc36499a97e2eab7c524da2088e3a15c6599c513bb35a6a049663b97220e671e03bd577baaaf711f228a SHA512 c2779209fe012de8ca1cdd72923da6d594f4a8368c85c3c0e0afd4ae489a95fe0e6f05a947d115b6b389aa7170ab14c2c645a2031353b0a08f38327ab461fe65 |
| 25 |
DIST dmenu-5.0.tar.gz 16028 BLAKE2B 9f161e3d44d5cb80e3996db81e28cdf7f143d310ec2660c837df167d8426645dde09d4f5a0c71d4be73f80f76615a32c20dd3d7f30a23506993215c89fe40844 SHA512 2b6a7cdf5aefc5e7ca7a4944883c3c16ee6f5005d2a96b61482d4899ad395f9cb8926907681d88b9df3e1188cf421dad4cc17e343b752f6cb8b161d33384b3f3 |
| 26 |
|
| 27 |
diff --git a/x11-misc/dmenu/dmenu-4.6.ebuild b/x11-misc/dmenu/dmenu-4.6.ebuild |
| 28 |
deleted file mode 100644 |
| 29 |
index 3105af4cd56..00000000000 |
| 30 |
--- a/x11-misc/dmenu/dmenu-4.6.ebuild |
| 31 |
+++ /dev/null |
| 32 |
@@ -1,55 +0,0 @@ |
| 33 |
-# Copyright 1999-2021 Gentoo Authors |
| 34 |
-# Distributed under the terms of the GNU General Public License v2 |
| 35 |
- |
| 36 |
-EAPI=5 |
| 37 |
-inherit epatch 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" |
| 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 |
- |
| 59 |
-src_prepare() { |
| 60 |
- sed -i \ |
| 61 |
- -e 's|^ @| |g' \ |
| 62 |
- -e 's|${CC} -o|$(CC) $(CFLAGS) -o|g' \ |
| 63 |
- -e '/^ echo/d' \ |
| 64 |
- Makefile || die |
| 65 |
- |
| 66 |
- epatch "${FILESDIR}"/${PN}-4.6-gentoo.patch |
| 67 |
- |
| 68 |
- epatch_user |
| 69 |
-} |
| 70 |
- |
| 71 |
-src_compile() { |
| 72 |
- emake CC=$(tc-getCC) \ |
| 73 |
- "FREETYPEINC=$( $(tc-getPKG_CONFIG) --cflags x11 fontconfig xft 2>/dev/null )" \ |
| 74 |
- "FREETYPELIBS=$( $(tc-getPKG_CONFIG) --libs x11 fontconfig xft 2>/dev/null )" \ |
| 75 |
- "XINERAMAFLAGS=$( |
| 76 |
- usex xinerama "-DXINERAMA $( |
| 77 |
- $(tc-getPKG_CONFIG) --cflags xinerama 2>/dev/null |
| 78 |
- )" '' |
| 79 |
- )" \ |
| 80 |
- "XINERAMALIBS=$( |
| 81 |
- usex xinerama "$( $(tc-getPKG_CONFIG) --libs xinerama 2>/dev/null)" '' |
| 82 |
- )" |
| 83 |
-} |
| 84 |
- |
| 85 |
-src_install() { |
| 86 |
- emake DESTDIR="${D}" PREFIX="/usr" install |
| 87 |
-} |
| 88 |
|
| 89 |
diff --git a/x11-misc/dmenu/files/dmenu-4.6-gentoo.patch b/x11-misc/dmenu/files/dmenu-4.6-gentoo.patch |
| 90 |
deleted file mode 100644 |
| 91 |
index 0d826e0d5a9..00000000000 |
| 92 |
--- a/x11-misc/dmenu/files/dmenu-4.6-gentoo.patch |
| 93 |
+++ /dev/null |
| 94 |
@@ -1,38 +0,0 @@ |
| 95 |
---- a/config.mk |
| 96 |
-+++ b/config.mk |
| 97 |
-@@ -5,8 +5,8 @@ |
| 98 |
- PREFIX = /usr/local |
| 99 |
- MANPREFIX = ${PREFIX}/share/man |
| 100 |
- |
| 101 |
--X11INC = /usr/X11R6/include |
| 102 |
--X11LIB = /usr/X11R6/lib |
| 103 |
-+X11INC = -I/usr/X11R6/include |
| 104 |
-+X11LIB = -L/usr/X11R6/lib |
| 105 |
- |
| 106 |
- # Xinerama, comment if you don't want it |
| 107 |
- XINERAMALIBS = -lXinerama |
| 108 |
-@@ -14,18 +14,18 @@ |
| 109 |
- |
| 110 |
- # freetype |
| 111 |
- FREETYPELIBS = -lfontconfig -lXft |
| 112 |
--FREETYPEINC = /usr/include/freetype2 |
| 113 |
-+FREETYPEINC = -I/usr/include/freetype2 |
| 114 |
- # OpenBSD (uncomment) |
| 115 |
- FREETYPEINC = ${X11INC}/freetype2 |
| 116 |
- |
| 117 |
- # includes and libs |
| 118 |
--INCS = -I${X11INC} -I${FREETYPEINC} |
| 119 |
--LIBS = -L${X11LIB} -lX11 ${XINERAMALIBS} ${FREETYPELIBS} |
| 120 |
-+INCS = ${X11INC} ${FREETYPEINC} |
| 121 |
-+LIBS = ${X11LIB} -lX11 ${XINERAMALIBS} ${FREETYPELIBS} |
| 122 |
- |
| 123 |
- # flags |
| 124 |
--CPPFLAGS = -D_BSD_SOURCE -D_XOPEN_SOURCE=700 -D_POSIX_C_SOURCE=200809L -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS} |
| 125 |
--CFLAGS = -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS} |
| 126 |
--LDFLAGS = -s ${LIBS} |
| 127 |
-+CPPFLAGS += -D_BSD_SOURCE -D_XOPEN_SOURCE=700 -D_POSIX_C_SOURCE=200809L -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS} |
| 128 |
-+CFLAGS += -ansi -pedantic -Wall $(INCS) $(CPPFLAGS) |
| 129 |
-+LDFLAGS += ${LIBS} |
| 130 |
- |
| 131 |
- # compiler and linker |
| 132 |
- CC = cc |
Archives