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 A962C1382DF for ; Thu, 30 Jun 2016 07:35:09 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7B2FCE0AD7; Thu, 30 Jun 2016 07:35:07 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 6EEF614002 for ; Thu, 30 Jun 2016 07:35:05 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C8C51340E6A for ; Thu, 30 Jun 2016 07:18:51 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 00DC6241B for ; Thu, 30 Jun 2016 07:18:45 +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: <1467271123.4c18063465cfeaf27012fec894a1739f7ebf2aac.jer@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-misc/xcb/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-misc/xcb/xcb-2.4-r1.ebuild X-VCS-Directories: x11-misc/xcb/ X-VCS-Committer: jer X-VCS-Committer-Name: Jeroen Roovers X-VCS-Revision: 4c18063465cfeaf27012fec894a1739f7ebf2aac X-VCS-Branch: master Date: Thu, 30 Jun 2016 07:18:45 +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-Archives-Salt: 21872d54-4ce6-415e-807b-2df16b9d4159 X-Archives-Hash: 49e48d527c22823ae14788e9415c95c1 commit: 4c18063465cfeaf27012fec894a1739f7ebf2aac Author: Jeroen Roovers gentoo org> AuthorDate: Thu Jun 30 07:17:26 2016 +0000 Commit: Jeroen Roovers gentoo org> CommitDate: Thu Jun 30 07:18:43 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4c180634 x11-misc/xcb: Quote CPP (bug #587344 by Toralf Förster). Package-Manager: portage-2.3.0 x11-misc/xcb/xcb-2.4-r1.ebuild | 33 ++++++++++++++++++--------------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/x11-misc/xcb/xcb-2.4-r1.ebuild b/x11-misc/xcb/xcb-2.4-r1.ebuild index 16165c6..dde2a07 100644 --- a/x11-misc/xcb/xcb-2.4-r1.ebuild +++ b/x11-misc/xcb/xcb-2.4-r1.ebuild @@ -1,9 +1,8 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=2 - +EAPI=6 inherit toolchain-funcs DESCRIPTION="Marc Lehmann's improved X Cut Buffers" @@ -15,13 +14,17 @@ SLOT="0" KEYWORDS="alpha amd64 ~ppc x86" IUSE="motif" -RDEPEND="x11-libs/libX11 - x11-libs/libXt +RDEPEND=" + x11-libs/libX11 x11-libs/libXaw - x11-libs/libXext" -DEPEND="${RDEPEND} + x11-libs/libXext + x11-libs/libXt +" +DEPEND=" + ${RDEPEND} x11-proto/xproto - motif? ( >=x11-libs/motif-2.3:0 )" + motif? ( >=x11-libs/motif-2.3:0 ) +" src_compile() { local gui libs @@ -34,19 +37,19 @@ src_compile() { libs="-lXaw -lXt -lXext -lX11" fi - emake -f Makefile.std xcb Xcb.ad \ - CC=$(tc-getCC) \ - CPP=$(tc-getCPP) \ + emake \ + -f Makefile.std xcb Xcb.ad \ + CC="$(tc-getCC)" \ + CPP="$(tc-getCPP)" \ CFLAGS="${CFLAGS} ${gui}" \ GUI="${gui}" \ LIBS="${libs}" \ - LDFLAGS="${LDFLAGS}" \ - || die "emake failed" + LDFLAGS="${LDFLAGS}" } src_install() { - dobin xcb || die "dobin failed" + dobin xcb newman xcb.man xcb.1 insinto /usr/share/X11/app-defaults - newins Xcb.ad Xcb || die "newins failed" + newins Xcb.ad Xcb }