--- /usr/portage/media-gfx/freecad/freecad-9999.ebuild	2017-02-28 12:50:50.000000000 -0700
+++ /usr/local/portage/media-gfx/freecad/freecad-9999.ebuild	2017-03-05 02:36:46.326130680 -0700
@@ -10,9 +10,12 @@
 DESCRIPTION="QT based Computer Aided Design application"
 HOMEPAGE="http://www.freecadweb.org/"
 
+S="${WORKDIR}/FreeCAD-${PV}"
+
 if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/FreeCAD/FreeCAD.git"
+	EGIT_CHECKOUT_DIR="${S}"
 else
 	SRC_URI="https://github.com/FreeCAD/FreeCAD/archive/${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
@@ -64,8 +67,6 @@
 #		salome-smesh - science overlay
 #		zipio++ - not in portage yet
 
-S="${WORKDIR}/FreeCAD-${PV}"
-
 DOCS=( README.md ChangeLog.txt )
 
 pkg_setup() {