commit: 3901425436242cb38dee98c47e3d3f2d983dcb6d Author: Jeroen Roovers <jer <AT> gentoo <DOT> org> AuthorDate: Mon Nov 9 06:01:12 2015 +0000 Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org> CommitDate: Mon Nov 9 06:12:18 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=39014254
x11-misc/dmenu: Version bump. Package-Manager: portage-2.2.24 x11-misc/dmenu/Manifest | 1 + x11-misc/dmenu/dmenu-4.6.ebuild | 57 +++++++++++++++++++++++++++++ x11-misc/dmenu/files/dmenu-4.6-gentoo.patch | 38 +++++++++++++++++++ 3 files changed, 96 insertions(+) diff --git a/x11-misc/dmenu/Manifest b/x11-misc/dmenu/Manifest index a1177f5..37adb31 100644 --- a/x11-misc/dmenu/Manifest +++ b/x11-misc/dmenu/Manifest @@ -1 +1,2 @@ DIST dmenu-4.5.tar.gz 11543 SHA256 082cd698d82125ca0b3989006fb84ac4675c2a5585bf5bb8af0ea09cfb95a850 SHA512 872dee68c35a93c663eb0a941653eaaa4aa83d8379e05b4dbca089a2c9335036b496de85d8ddf7af1228a5625490a06a89031fb1aac726236b608b952962c248 WHIRLPOOL b91660f3028d314f1a10b994af73e6239c4aaabda6c9ab269bda7e37e0cd22c0eaf3b93998c4cb0fe1f9d8f2fd198afc2e70c237a46921ece9fd9a697f58c869 +DIST dmenu-4.6.tar.gz 15057 SHA256 4a7a24008a621c3cd656155ad91ab8136db8f0d3b9ec56dafeec518cabda96b3 SHA512 e54fd10c0b1274eb90173aea442f0bfc496f4dda861a36d94f939e1fd835594f9aa12f3d0f90043d64e519d919b9a5273ab65012230ac022f727ee6bb64862e3 WHIRLPOOL b4354552356ab5ab93b20c44a313f0d8e626c22c589cf4376f82f876dc742b961a07bad45d12b5fe749b03354dfa76acf36e4089a701754e341ec0383232fa5d diff --git a/x11-misc/dmenu/dmenu-4.6.ebuild b/x11-misc/dmenu/dmenu-4.6.ebuild new file mode 100644 index 0000000..29e7639 --- /dev/null +++ b/x11-misc/dmenu/dmenu-4.6.ebuild @@ -0,0 +1,57 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +inherit eutils 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 ~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 +" + +src_prepare() { + sed -i \ + -e 's|^ @| |g' \ + -e 's|${CC} -o|$(CC) $(CFLAGS) -o|g' \ + -e '/^ echo/d' \ + Makefile || die + + epatch "${FILESDIR}"/${PN}-4.6-gentoo.patch + + epatch_user +} + +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/files/dmenu-4.6-gentoo.patch b/x11-misc/dmenu/files/dmenu-4.6-gentoo.patch new file mode 100644 index 0000000..0d826e0 --- /dev/null +++ b/x11-misc/dmenu/files/dmenu-4.6-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_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
