From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id CC5F1138334 for ; Fri, 15 Mar 2019 13:26:42 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E698AE0937; Fri, 15 Mar 2019 13:26:41 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id BD5E2E0937 for ; Fri, 15 Mar 2019 13:26:41 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4FD86335CD2 for ; Fri, 15 Mar 2019 13:26:40 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B0A0D555 for ; Fri, 15 Mar 2019 13:26:38 +0000 (UTC) From: "Jeroen Roovers" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jeroen Roovers" Message-ID: <1552656395.524deaa55c22ed4c235d8027267a0a00469593da.jer@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-misc/dmenu/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-misc/dmenu/dmenu-4.9.ebuild x11-misc/dmenu/dmenu-9999.ebuild X-VCS-Directories: x11-misc/dmenu/ X-VCS-Committer: jer X-VCS-Committer-Name: Jeroen Roovers X-VCS-Revision: 524deaa55c22ed4c235d8027267a0a00469593da X-VCS-Branch: master Date: Fri, 15 Mar 2019 13:26:38 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: a2a75d43-072e-4f97-a9c5-e5b51442e282 X-Archives-Hash: 91a37e71434a5c2c726470992bc22dde commit: 524deaa55c22ed4c235d8027267a0a00469593da Author: Jeroen Roovers gentoo org> AuthorDate: Fri Mar 15 13:26:23 2019 +0000 Commit: Jeroen Roovers gentoo org> CommitDate: Fri Mar 15 13:26:35 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=524deaa5 x11-misc/dmenu: Update live ebuild Package-Manager: Portage-2.3.62, Repoman-2.3.12 Signed-off-by: Jeroen Roovers gentoo.org> x11-misc/dmenu/dmenu-4.9.ebuild | 1 - x11-misc/dmenu/dmenu-9999.ebuild | 24 +++++++++++++----------- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/x11-misc/dmenu/dmenu-4.9.ebuild b/x11-misc/dmenu/dmenu-4.9.ebuild index 9fe6efe1753..dafe23ddeda 100644 --- a/x11-misc/dmenu/dmenu-4.9.ebuild +++ b/x11-misc/dmenu/dmenu-4.9.ebuild @@ -32,7 +32,6 @@ src_prepare() { sed -i \ -e 's|^ @| |g' \ - -e 's|${CC} -o|$(CC) $(CFLAGS) -o|g' \ -e '/^ echo/d' \ Makefile || die diff --git a/x11-misc/dmenu/dmenu-9999.ebuild b/x11-misc/dmenu/dmenu-9999.ebuild index 8001b06f1d6..ac2f60df320 100644 --- a/x11-misc/dmenu/dmenu-9999.ebuild +++ b/x11-misc/dmenu/dmenu-9999.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit git-r3 savedconfig toolchain-funcs DESCRIPTION="a generic, highly customizable, and efficient menu for the X Window System" @@ -32,7 +32,6 @@ src_prepare() { sed -i \ -e 's|^ @| |g' \ - -e 's|${CC} -o|$(CC) $(CFLAGS) -o|g' \ -e '/^ echo/d' \ Makefile || die @@ -41,15 +40,18 @@ src_prepare() { src_compile() { emake CC=$(tc-getCC) \ - INCS=" \ - $(usex xinerama "-DXINERAMA" '') \ - $( - $(tc-getPKG_CONFIG) --cflags fontconfig freetype2 x11 xft $(usex xinerama xinerama '') - )" \ - LIBS=" \ - $( - $(tc-getPKG_CONFIG) --libs fontconfig x11 xft $(usex xinerama xinerama '') - )" + "FREETYPEINC=$( $(tc-getPKG_CONFIG) --cflags x11 fontconfig xft 2>/dev/null )" \ + "FREETYPELIBS=$( $(tc-getPKG_CONFIG) --libs x11 fontconfig xft 2>/dev/null )" \ + "X11INC=$( $(tc-getPKG_CONFIG) --cflags x11 2>/dev/null )" \ + "X11LIB=$( $(tc-getPKG_CONFIG) --libs x11 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() {