x11-misc/dmenu: Version bump.

Package-Manager: Portage-2.3.5, Repoman-2.3.2

diff --git a/x11-misc/dmenu/Manifest b/x11-misc/dmenu/Manifest
index f6485f05c0a827c3c589a5e167d57d21a421db53..adb43f91f2ac3f68f5129823416927b9bdb9f5c9 100644 (file)
--- a/x11-misc/dmenu/Manifest
+++ b/x11-misc/dmenu/Manifest
@@ -1 +1,2 @@
 DIST dmenu-4.6.tar.gz 15057 SHA256 4a7a24008a621c3cd656155ad91ab8136db8f0d3b9ec56dafeec518cabda96b3 SHA512 e54fd10c0b1274eb90173aea442f0bfc496f4dda861a36d94f939e1fd835594f9aa12f3d0f90043d64e519d919b9a5273ab65012230ac022f727ee6bb64862e3 WHIRLPOOL b4354552356ab5ab93b20c44a313f0d8e626c22c589cf4376f82f876dc742b961a07bad45d12b5fe749b03354dfa76acf36e4089a701754e341ec0383232fa5d
+DIST dmenu-4.7.tar.gz 15597 SHA256 a75635f8dc2cbc280deecb906ad9b7594c5c31620e4a01ba30dc83984881f7b9 SHA512 67a184f3ddb018e7b372e049052662955403e3367639b9c2284939d6f105ae74c995fe38f126d8ff75886831c8add8b50e338a1bfb0d8620b7fb1457cf88a00c WHIRLPOOL 6acb632c06374c92bce2a2951bebbcd81c9f5529c6a44859e86d92d8aace52c847a542bb2a0c34d69cb0a8e4cdb525bbe9d82885c0ae8f79004c90094d21069b

diff --git a/x11-misc/dmenu/dmenu-4.7.ebuild b/x11-misc/dmenu/dmenu-4.7.ebuild
new file mode 100644 (file)
index 0000000..619f585
--- /dev/null
+++ b/x11-misc/dmenu/dmenu-4.7.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit toolchain-funcs
+
+DESCRIPTION="a generic, highly customizable, and efficient menu for the X Window System"
+HOMEPAGE="http://tools.suckless.org/dmenu/"
+SRC_URI="http://dl.suckless.org/tools/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE="xinerama"
+
+RDEPEND="
+       media-libs/fontconfig
+       x11-libs/libX11
+       x11-libs/libXft
+       xinerama? ( x11-libs/libXinerama )
+"
+DEPEND="${RDEPEND}
+       virtual/pkgconfig
+       xinerama? ( x11-proto/xineramaproto )
+       x11-proto/xproto
+"
+PATCHES=(
+       "${FILESDIR}"/${PN}-4.7-gentoo.patch
+)
+
+src_prepare() {
+       default
+
+       sed -i \
+               -e 's|^ @|      |g' \
+               -e 's|${CC} -o|$(CC) $(CFLAGS) -o|g' \
+               -e '/^  echo/d' \
+               Makefile || die
+}
+
+src_compile() {
+       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 $(
+                               $(tc-getPKG_CONFIG) --cflags xinerama 2>/dev/null
+                       )" ''
+               )" \
+               "XINERAMALIBS=$(
+                       usex xinerama "$( $(tc-getPKG_CONFIG) --libs xinerama 2>/dev/null)" ''
+               )"
+}
+
+src_install() {
+       emake DESTDIR="${D}" PREFIX="/usr" install
+}

diff --git a/x11-misc/dmenu/dmenu-9999.ebuild b/x11-misc/dmenu/dmenu-9999.ebuild
index e94945351f0d8f3ae547a689b780712c0151ecf0..740dcacd31164dac0b3858fe04bb6c4634754208 100644 (file)
--- a/x11-misc/dmenu/dmenu-9999.ebuild
+++ b/x11-misc/dmenu/dmenu-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit eutils git-r3 savedconfig toolchain-funcs
+inherit git-r3 savedconfig toolchain-funcs
 
 DESCRIPTION="a generic, highly customizable, and efficient menu for the X Window System"
 HOMEPAGE="http://tools.suckless.org/dmenu/"
@@ -24,18 +24,19 @@ DEPEND="${RDEPEND}
        xinerama? ( x11-proto/xineramaproto )
        x11-proto/xproto
 "
+PATCHES=(
+       "${FILESDIR}"/${P}-gentoo.patch
+)
 
 src_prepare() {
+       default
+
        sed -i \
                -e 's|^ @|      |g' \
                -e 's|${CC} -o|$(CC) $(CFLAGS) -o|g' \
                -e '/^  echo/d' \
                Makefile || die
 
-       epatch "${FILESDIR}"/${P}-gentoo.patch
-
-       eapply_user
-
        restore_config config.def.h
 }
 

diff --git a/x11-misc/dmenu/files/dmenu-4.7-gentoo.patch b/x11-misc/dmenu/files/dmenu-4.7-gentoo.patch
new file mode 100644 (file)
index 0000000..77f5941
--- /dev/null
+++ b/x11-misc/dmenu/files/dmenu-4.7-gentoo.patch
@@ -0,0 +1,38 @@
+--- 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_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}
++CPPFLAGS += -D_BSD_SOURCE -D_XOPEN_SOURCE=700 -D_POSIX_C_SOURCE=200809L -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS}
++CFLAGS   += -ansi -pedantic -Wall $(INCS) $(CPPFLAGS)
++LDFLAGS  += ${LIBS}
+ 
+ # compiler and linker
+ CC = cc