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

@@ -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
 }