x11-misc/dmenu: Update live ebuild.

Package-Manager: portage-2.2.24

diff --git a/x11-misc/dmenu/dmenu-9999.ebuild b/x11-misc/dmenu/dmenu-9999.ebuild
index fcb7bf49def93ed1cefb59f74519e0e215f4b98d..f5f8bf6cc90164c67f213cb0c331c567d431df97 100644 (file)
--- a/x11-misc/dmenu/dmenu-9999.ebuild
+++ b/x11-misc/dmenu/dmenu-9999.ebuild
@@ -3,7 +3,7 @@
 # $Id$
 
 EAPI=5
-inherit eutils git-r3 savedconfig toolchain-funcs
+inherit eutils git-r3 toolchain-funcs
 
 DESCRIPTION="a generic, highly customizable, and efficient menu for the X Window System"
 HOMEPAGE="http://tools.suckless.org/dmenu/"
@@ -15,50 +15,43 @@ KEYWORDS=""
 IUSE="xinerama"
 
 RDEPEND="
+       media-libs/fontconfig
        x11-libs/libX11
+       x11-libs/libXft
        xinerama? ( x11-libs/libXinerama )
 "
 DEPEND="${RDEPEND}
-       xinerama? ( virtual/pkgconfig )
+       virtual/pkgconfig
+       xinerama? ( x11-proto/xineramaproto )
+       x11-proto/xproto
 "
 
 src_prepare() {
-       # Respect our flags
-       sed -i \
-               -e '/^CFLAGS/{s|=.*|+= -ansi -pedantic -Wall $(INCS) $(CPPFLAGS)|}' \
-               -e '/^LDFLAGS/s|= -s|+=|' \
-               config.mk || die
-       # Make make verbose
        sed -i \
                -e 's|^ @|      |g' \
+               -e 's|${CC} -o|$(CC) $(CFLAGS) -o|g' \
                -e '/^  echo/d' \
                Makefile || die
 
-       restore_config config.def.h
-       epatch_user
-}
+       epatch "${FILESDIR}"/${P}-gentoo.patch
 
-src_configure() {
-       tc-export PKG_CONFIG
+       epatch_user
 }
 
 src_compile() {
-       emake \
-               CC=$(tc-getCC) \
+       emake CC=$(tc-getCC) \
+               "FREETYPEINC=$( $(tc-getPKG_CONFIG) --cflags x11 fontconfig xft 2>/dev/null )" \
+               "FREETYPELIBS=$( $(tc-getPKG_CONFIG) --libs x11 fontconfig xft 2>/dev/null )" \
                "XINERAMAFLAGS=$(
                        usex xinerama "-DXINERAMA $(
-                               ${PKG_CONFIG} --cflags xinerama 2>/dev/null
+                               $(tc-getPKG_CONFIG) --cflags xinerama 2>/dev/null
                        )" ''
                )" \
                "XINERAMALIBS=$(
-                       usex xinerama "$(
-                               ${PKG_CONFIG} --libs xinerama 2>/dev/null
-                       )" ''
+                       usex xinerama "$( $(tc-getPKG_CONFIG) --libs xinerama 2>/dev/null)" ''
                )"
 }
 
 src_install() {
        emake DESTDIR="${D}" PREFIX="/usr" install
-
-       save_config config.def.h
 }

diff --git a/x11-misc/dmenu/files/dmenu-9999-gentoo.patch b/x11-misc/dmenu/files/dmenu-9999-gentoo.patch
new file mode 100644 (file)
index 0000000..b6940d1
--- /dev/null
+++ b/x11-misc/dmenu/files/dmenu-9999-gentoo.patch
@@ -0,0 +1,37 @@
+--- a/config.mk
++++ b/config.mk
+@@ -5,8 +5,8 @@
+ PREFIX = /usr/local
+ MANPREFIX = ${PREFIX}/share/man
+ 
+-X11INC = /usr/X11R6/include
+-X11LIB = /usr/X11R6/lib
++X11INC = -I/usr/X11R6/include
++X11LIB = -L/usr/X11R6/lib
+ 
+ # Xinerama, comment if you don't want it
+ XINERAMALIBS  = -lXinerama
+@@ -14,18 +14,18 @@
+ 
+ # freetype
+ FREETYPELIBS = -lfontconfig -lXft
+-FREETYPEINC = /usr/include/freetype2
++FREETYPEINC = -I/usr/include/freetype2
+ # OpenBSD (uncomment)
+ #FREETYPEINC = ${X11INC}/freetype2
+ 
+ # includes and libs
+-INCS = -I${X11INC} -I${FREETYPEINC}
+-LIBS = -L${X11LIB} -lX11 ${XINERAMALIBS} ${FREETYPELIBS}
++INCS = ${X11INC} ${FREETYPEINC}
++LIBS = ${X11LIB} -lX11 ${XINERAMALIBS} ${FREETYPELIBS}
+ 
+ # flags
+ CPPFLAGS = -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}
++LDFLAGS  = ${LIBS}
+ 
+ # compiler and linker
+ CC = cc