diff --git a/sci-biology/afni/ChangeLog b/sci-biology/afni/ChangeLog
deleted file mode 100644
index b003528..0000000
--- a/sci-biology/afni/ChangeLog
+++ /dev/null
@@ -1,7 +0,0 @@
-  11 Jan 2021;  <chymera@gentoo.org> afni-9999.ebuild:
-  sci-biology/afni: no keywords for live ebuild
-
-*afni-9999 (09 Jan 2021)
-
-  09 Jan 2021;  <chymera@gentoo.org> +afni-9999.ebuild, +metadata.xml:
-  sci-biology/afni: new ebuild for CMake install
diff --git a/sci-biology/afni/afni-9999.ebuild b/sci-biology/afni/afni-9999.ebuild
index 7299d7e..2090b7e 100644
--- a/sci-biology/afni/afni-9999.ebuild
+++ b/sci-biology/afni/afni-9999.ebuild
@@ -4,9 +4,9 @@
 EAPI=7
 
 #CMAKE_MAKEFILE_GENERATOR="emake"
-PYTHON_COMPAT=( python3_{6..8} )
+PYTHON_COMPAT=( python3_{8..10} )
 
-inherit cmake distutils-r1 git-r3 multilib
+inherit cmake distutils-r1 git-r3 multilib ninja-utils
 
 GTS_HASH="962155a01f5a1b87bd64e3e3d880b4dbc2347ac7"
 NIFTI_HASH="65f801b9c2f1f15f4de4a19d45e6595c25765632"
@@ -19,7 +19,8 @@ SRC_URI="
 	https://github.com/NIFTI-Imaging/nifti_clib/archive/${NIFTI_HASH}.tar.gz
 	https://github.com/NIFTI-Imaging/gifti_clib/archive/${GIFTI_HASH}.tar.gz
 	"
-EGIT_REPO_URI="https://github.com/afni/afni.git"
+EGIT_REPO_URI="https://github.com/leej3/afni.git"
+EGIT_BRANCH="make_some_build_fixes_for_gentoo_packaging"
 
 SLOT="0"
 LICENSE="GPL-3+"
@@ -70,11 +71,17 @@ src_prepare() {
 src_configure() {
 	#LDFLAGS="-L${S}/${LIBDIR} ${LDFLAGS}" econf --enable-progpath="${EPREFIX}/usr/bin"
 	export CFLAGS="-pthread ${CFLAGS}"
+	export GIT_REPO_VERSION=3.0.1.1
 	#export LDFLAGS="-lpthread ${LDFLAGS}"
 	#-CC="$(tc-getCC)"
 	local mycmakeargs=(
 		-GNinja
-		-DCOMP_BINARIES=ON
+		-DLIBDIR=/usr/$(get_libdir)
+		-DNIFTI_INSTALL_LIBRARY_DIR=/usr/$(get_libdir)
+		-DGIFTI_INSTALL_LIBRARY_DIR=/usr/$(get_libdir)
+		-DAFNI_INSTALL_LIBRARY_DIR=/usr/$(get_libdir)
+		-DCMAKE_INSTALL_LIBDIR=/usr/$(get_libdir)
+		-DCOMP_COREBINARIES=ON
 		-DUSE_SYSTEM_NIFTI=OFF
 		-DUSE_SYSTEM_GIFTI=OFF
 		-DUSE_SYSTEM_XMHTML=OFF
@@ -86,19 +93,31 @@ src_configure() {
 		-DCOMP_PLUGINS=ON
 		-DUSE_OMP=ON
 		-DCOMP_PYTHON=OFF
+		-DPython_FIND_VIRTUALENV=STANDARD
+		-DPython_FIND_STRATEGY=LOCATION
 	)
 	tc-export CC
 	cmake_src_configure
 }
+
+src_compile() {
+	cd ../afni-9999_build
+	pwd
+	ls -la
+	eninja || die
+}
+
 #/work/afni-9999/nifti_clib-65f801b9c2f1f15f4de4a19d45e6595c25765632
 
-#src_install() {
-#       BUILD_DIR="${WORKDIR}/${P}_build/ANTS-build"
-#       cmake_src_install
-#       cd "${S}/Scripts" || die "scripts dir not found"
-#       dobin *.sh
-#       dodir /usr/$(get_libdir)/ants
-#       insinto "/usr/$(get_libdir)/ants"
-#       doins *
-#       doenvd "${FILESDIR}"/99ants
-#}
+src_install() {
+	cd ../afni-9999_build
+	DESTDIR=${D} eninja install
+	#BUILD_DIR="${WORKDIR}/${P}_build/ANTS-build"
+	#cmake_src_install
+	#cd "${S}/Scripts" || die "scripts dir not found"
+	#dobin *.sh
+	#dodir /usr/$(get_libdir)/ants
+	#insinto "/usr/$(get_libdir)/ants"
+	#doins *
+	#doenvd "${FILESDIR}"/99ants
+}