| 1 |
commit: 60ec67a1bc5d7fdb664d1f3d2a1902ce08868a33 |
| 2 |
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri May 5 12:29:45 2017 +0000 |
| 4 |
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri May 5 12:29:45 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=60ec67a1 |
| 7 |
|
| 8 |
x11-misc/dmenu: Version bump. |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.5, Repoman-2.3.2 |
| 11 |
|
| 12 |
x11-misc/dmenu/Manifest | 1 + |
| 13 |
.../dmenu/{dmenu-9999.ebuild => dmenu-4.7.ebuild} | 21 +++++------- |
| 14 |
x11-misc/dmenu/dmenu-9999.ebuild | 13 ++++---- |
| 15 |
x11-misc/dmenu/files/dmenu-4.7-gentoo.patch | 38 ++++++++++++++++++++++ |
| 16 |
4 files changed, 55 insertions(+), 18 deletions(-) |
| 17 |
|
| 18 |
diff --git a/x11-misc/dmenu/Manifest b/x11-misc/dmenu/Manifest |
| 19 |
index f6485f05c0a..adb43f91f2a 100644 |
| 20 |
--- a/x11-misc/dmenu/Manifest |
| 21 |
+++ b/x11-misc/dmenu/Manifest |
| 22 |
@@ -1 +1,2 @@ |
| 23 |
DIST dmenu-4.6.tar.gz 15057 SHA256 4a7a24008a621c3cd656155ad91ab8136db8f0d3b9ec56dafeec518cabda96b3 SHA512 e54fd10c0b1274eb90173aea442f0bfc496f4dda861a36d94f939e1fd835594f9aa12f3d0f90043d64e519d919b9a5273ab65012230ac022f727ee6bb64862e3 WHIRLPOOL b4354552356ab5ab93b20c44a313f0d8e626c22c589cf4376f82f876dc742b961a07bad45d12b5fe749b03354dfa76acf36e4089a701754e341ec0383232fa5d |
| 24 |
+DIST dmenu-4.7.tar.gz 15597 SHA256 a75635f8dc2cbc280deecb906ad9b7594c5c31620e4a01ba30dc83984881f7b9 SHA512 67a184f3ddb018e7b372e049052662955403e3367639b9c2284939d6f105ae74c995fe38f126d8ff75886831c8add8b50e338a1bfb0d8620b7fb1457cf88a00c WHIRLPOOL 6acb632c06374c92bce2a2951bebbcd81c9f5529c6a44859e86d92d8aace52c847a542bb2a0c34d69cb0a8e4cdb525bbe9d82885c0ae8f79004c90094d21069b |
| 25 |
|
| 26 |
diff --git a/x11-misc/dmenu/dmenu-9999.ebuild b/x11-misc/dmenu/dmenu-4.7.ebuild |
| 27 |
similarity index 80% |
| 28 |
copy from x11-misc/dmenu/dmenu-9999.ebuild |
| 29 |
copy to x11-misc/dmenu/dmenu-4.7.ebuild |
| 30 |
index e94945351f0..619f585174c 100644 |
| 31 |
--- a/x11-misc/dmenu/dmenu-9999.ebuild |
| 32 |
+++ b/x11-misc/dmenu/dmenu-4.7.ebuild |
| 33 |
@@ -1,16 +1,16 @@ |
| 34 |
-# Copyright 1999-2014 Gentoo Foundation |
| 35 |
+# Copyright 1999-2017 Gentoo Foundation |
| 36 |
# Distributed under the terms of the GNU General Public License v2 |
| 37 |
|
| 38 |
EAPI=6 |
| 39 |
-inherit eutils git-r3 savedconfig toolchain-funcs |
| 40 |
+inherit toolchain-funcs |
| 41 |
|
| 42 |
DESCRIPTION="a generic, highly customizable, and efficient menu for the X Window System" |
| 43 |
HOMEPAGE="http://tools.suckless.org/dmenu/" |
| 44 |
-EGIT_REPO_URI="git://git.suckless.org/dmenu" |
| 45 |
+SRC_URI="http://dl.suckless.org/tools/${P}.tar.gz" |
| 46 |
|
| 47 |
LICENSE="MIT" |
| 48 |
SLOT="0" |
| 49 |
-KEYWORDS="" |
| 50 |
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd" |
| 51 |
IUSE="xinerama" |
| 52 |
|
| 53 |
RDEPEND=" |
| 54 |
@@ -24,19 +24,18 @@ DEPEND="${RDEPEND} |
| 55 |
xinerama? ( x11-proto/xineramaproto ) |
| 56 |
x11-proto/xproto |
| 57 |
" |
| 58 |
+PATCHES=( |
| 59 |
+ "${FILESDIR}"/${PN}-4.7-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 |
- epatch "${FILESDIR}"/${P}-gentoo.patch |
| 72 |
- |
| 73 |
- eapply_user |
| 74 |
- |
| 75 |
- restore_config config.def.h |
| 76 |
} |
| 77 |
|
| 78 |
src_compile() { |
| 79 |
@@ -55,6 +54,4 @@ src_compile() { |
| 80 |
|
| 81 |
src_install() { |
| 82 |
emake DESTDIR="${D}" PREFIX="/usr" install |
| 83 |
- |
| 84 |
- save_config config.def.h |
| 85 |
} |
| 86 |
|
| 87 |
diff --git a/x11-misc/dmenu/dmenu-9999.ebuild b/x11-misc/dmenu/dmenu-9999.ebuild |
| 88 |
index e94945351f0..740dcacd311 100644 |
| 89 |
--- a/x11-misc/dmenu/dmenu-9999.ebuild |
| 90 |
+++ b/x11-misc/dmenu/dmenu-9999.ebuild |
| 91 |
@@ -1,8 +1,8 @@ |
| 92 |
-# Copyright 1999-2014 Gentoo Foundation |
| 93 |
+# Copyright 1999-2017 Gentoo Foundation |
| 94 |
# Distributed under the terms of the GNU General Public License v2 |
| 95 |
|
| 96 |
EAPI=6 |
| 97 |
-inherit eutils git-r3 savedconfig toolchain-funcs |
| 98 |
+inherit git-r3 savedconfig toolchain-funcs |
| 99 |
|
| 100 |
DESCRIPTION="a generic, highly customizable, and efficient menu for the X Window System" |
| 101 |
HOMEPAGE="http://tools.suckless.org/dmenu/" |
| 102 |
@@ -24,18 +24,19 @@ DEPEND="${RDEPEND} |
| 103 |
xinerama? ( x11-proto/xineramaproto ) |
| 104 |
x11-proto/xproto |
| 105 |
" |
| 106 |
+PATCHES=( |
| 107 |
+ "${FILESDIR}"/${P}-gentoo.patch |
| 108 |
+) |
| 109 |
|
| 110 |
src_prepare() { |
| 111 |
+ default |
| 112 |
+ |
| 113 |
sed -i \ |
| 114 |
-e 's|^ @| |g' \ |
| 115 |
-e 's|${CC} -o|$(CC) $(CFLAGS) -o|g' \ |
| 116 |
-e '/^ echo/d' \ |
| 117 |
Makefile || die |
| 118 |
|
| 119 |
- epatch "${FILESDIR}"/${P}-gentoo.patch |
| 120 |
- |
| 121 |
- eapply_user |
| 122 |
- |
| 123 |
restore_config config.def.h |
| 124 |
} |
| 125 |
|
| 126 |
|
| 127 |
diff --git a/x11-misc/dmenu/files/dmenu-4.7-gentoo.patch b/x11-misc/dmenu/files/dmenu-4.7-gentoo.patch |
| 128 |
new file mode 100644 |
| 129 |
index 00000000000..77f59415588 |
| 130 |
--- /dev/null |
| 131 |
+++ b/x11-misc/dmenu/files/dmenu-4.7-gentoo.patch |
| 132 |
@@ -0,0 +1,38 @@ |
| 133 |
+--- a/config.mk |
| 134 |
++++ b/config.mk |
| 135 |
+@@ -5,8 +5,8 @@ |
| 136 |
+ PREFIX = /usr/local |
| 137 |
+ MANPREFIX = ${PREFIX}/share/man |
| 138 |
+ |
| 139 |
+-X11INC = /usr/X11R6/include |
| 140 |
+-X11LIB = /usr/X11R6/lib |
| 141 |
++X11INC = -I/usr/X11R6/include |
| 142 |
++X11LIB = -L/usr/X11R6/lib |
| 143 |
+ |
| 144 |
+ # Xinerama, comment if you don't want it |
| 145 |
+ XINERAMALIBS = -lXinerama |
| 146 |
+@@ -14,18 +14,18 @@ |
| 147 |
+ |
| 148 |
+ # freetype |
| 149 |
+ FREETYPELIBS = -lfontconfig -lXft |
| 150 |
+-FREETYPEINC = /usr/include/freetype2 |
| 151 |
++FREETYPEINC = -I/usr/include/freetype2 |
| 152 |
+ # OpenBSD (uncomment) |
| 153 |
+ #FREETYPEINC = ${X11INC}/freetype2 |
| 154 |
+ |
| 155 |
+ # includes and libs |
| 156 |
+-INCS = -I${X11INC} -I${FREETYPEINC} |
| 157 |
+-LIBS = -L${X11LIB} -lX11 ${XINERAMALIBS} ${FREETYPELIBS} |
| 158 |
++INCS = ${X11INC} ${FREETYPEINC} |
| 159 |
++LIBS = ${X11LIB} -lX11 ${XINERAMALIBS} ${FREETYPELIBS} |
| 160 |
+ |
| 161 |
+ # flags |
| 162 |
+-CPPFLAGS = -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_XOPEN_SOURCE=700 -D_POSIX_C_SOURCE=200809L -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS} |
| 163 |
+-CFLAGS = -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS} |
| 164 |
+-LDFLAGS = -s ${LIBS} |
| 165 |
++CPPFLAGS += -D_BSD_SOURCE -D_XOPEN_SOURCE=700 -D_POSIX_C_SOURCE=200809L -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS} |
| 166 |
++CFLAGS += -ansi -pedantic -Wall $(INCS) $(CPPFLAGS) |
| 167 |
++LDFLAGS += ${LIBS} |
| 168 |
+ |
| 169 |
+ # compiler and linker |
| 170 |
+ CC = cc |
Archives