[gentoo-commits] repo/gentoo:master commit in: x11-misc/dmenu/, x11-misc/dmenu/files/

[Jeroen Roovers]

commit:     4a7dab58101e17754ab76cbe6c8e1a399ca4ca75
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Tue Mar  1 04:15:08 2016 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Tue Mar  1 04:15:08 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a7dab58

x11-misc/dmenu: Tweak Gentoo patch.

Package-Manager: portage-2.2.27

 x11-misc/dmenu/dmenu-9999.ebuild             | 4 +++-
 x11-misc/dmenu/files/dmenu-9999-gentoo.patch | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/x11-misc/dmenu/dmenu-9999.ebuild b/x11-misc/dmenu/dmenu-9999.ebuild
index 65eabbb..79a2f8b 100644
--- a/x11-misc/dmenu/dmenu-9999.ebuild
+++ b/x11-misc/dmenu/dmenu-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 inherit eutils git-r3 savedconfig toolchain-funcs
 
 DESCRIPTION="a generic, highly customizable, and efficient menu for the X 
Window System"
@@ -35,6 +35,8 @@ src_prepare() {
 
        epatch "${FILESDIR}"/${P}-gentoo.patch
 
+       eapply_user
+
        restore_config config.def.h
 }
 

diff --git a/x11-misc/dmenu/files/dmenu-9999-gentoo.patch 
b/x11-misc/dmenu/files/dmenu-9999-gentoo.patch
index b6940d1..faeed31 100644
--- a/x11-misc/dmenu/files/dmenu-9999-gentoo.patch
+++ b/x11-misc/dmenu/files/dmenu-9999-gentoo.patch
@@ -27,7 +27,7 @@
 +LIBS = ${X11LIB} -lX11 ${XINERAMALIBS} ${FREETYPELIBS}
  
  # flags
- CPPFLAGS = -D_BSD_SOURCE -D_XOPEN_SOURCE=700 -D_POSIX_C_SOURCE=200809L 
-DVERSION=\"${VERSION}\" ${XINERAMAFLAGS}
+ CPPFLAGS = -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_XOPEN_SOURCE=700 
-D_POSIX_C_SOURCE=200809L -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS}
 -CFLAGS   = -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS}
 -LDFLAGS  = -s ${LIBS}
 +CFLAGS   = -std=c99 -pedantic -Wall ${INCS} ${CPPFLAGS}