commit: 60ec67a1bc5d7fdb664d1f3d2a1902ce08868a33
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Fri May 5 12:29:45 2017 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Fri May 5 12:29:45 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=60ec67a1
x11-misc/dmenu: Version bump.
Package-Manager: Portage-2.3.5, Repoman-2.3.2
x11-misc/dmenu/Manifest | 1 +
.../dmenu/{dmenu-9999.ebuild => dmenu-4.7.ebuild} | 21 +++++-------
x11-misc/dmenu/dmenu-9999.ebuild | 13 ++++----
x11-misc/dmenu/files/dmenu-4.7-gentoo.patch | 38 ++++++++++++++++++++++
4 files changed, 55 insertions(+), 18 deletions(-)
diff --git a/x11-misc/dmenu/Manifest b/x11-misc/dmenu/Manifest
index f6485f05c0a..adb43f91f2a 100644
--- 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-9999.ebuild b/x11-misc/dmenu/dmenu-4.7.ebuild
similarity index 80%
copy from x11-misc/dmenu/dmenu-9999.ebuild
copy to x11-misc/dmenu/dmenu-4.7.ebuild
index e94945351f0..619f585174c 100644
--- a/x11-misc/dmenu/dmenu-9999.ebuild
+++ b/x11-misc/dmenu/dmenu-4.7.ebuild
@@ -1,16 +1,16 @@
-# 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 toolchain-funcs
DESCRIPTION="a generic, highly customizable, and efficient menu for the X
Window System"
HOMEPAGE="http://tools.suckless.org/dmenu/";
-EGIT_REPO_URI="git://git.suckless.org/dmenu"
+SRC_URI="http://dl.suckless.org/tools/${P}.tar.gz";
LICENSE="MIT"
SLOT="0"
-KEYWORDS=""
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd"
IUSE="xinerama"
RDEPEND="
@@ -24,19 +24,18 @@ DEPEND="${RDEPEND}
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
-
- epatch "${FILESDIR}"/${P}-gentoo.patch
-
- eapply_user
-
- restore_config config.def.h
}
src_compile() {
@@ -55,6 +54,4 @@ src_compile() {
src_install() {
emake DESTDIR="${D}" PREFIX="/usr" install
-
- save_config config.def.h
}
diff --git a/x11-misc/dmenu/dmenu-9999.ebuild b/x11-misc/dmenu/dmenu-9999.ebuild
index e94945351f0..740dcacd311 100644
--- 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
index 00000000000..77f59415588
--- /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
