x11-misc/compton: EAPI bump 5 -> 6, Switch to git-r3

Package-Manager: Portage-2.3.3, Repoman-2.3.1
Closes: gentoo#4033

x11-misc/compton/compton-9999.ebuild

@@ -1,11 +1,11 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 PYTHON_COMPAT=( python3_{4,5} )
-inherit toolchain-funcs python-r1 git-2
+inherit toolchain-funcs python-r1 git-r3
 
 DESCRIPTION="A compositor for X, and a fork of xcompmgr-dana"
 HOMEPAGE="https://github.com/chjj/compton"
@@ -43,13 +43,8 @@ DEPEND="${COMMON_DEPEND}
 
 nobuildit() { use $1 || echo yes ; }
 
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		tc-export CC
-	fi
-}
-
 src_compile() {
+	tc-export CC
 	emake docs
 
 	NO_DBUS=$(nobuildit dbus) \