From 64a13c7e0f722724499f51ae8d357ce076e8959e Mon Sep 17 00:00:00 2001
From: HougeLangley <hougelangley1987@gmail.com>
Date: Wed, 15 Dec 2021 23:56:19 +0800
Subject: [PATCH] Fixed cutefishos 9999 could not find build directory

---
 .../cutefish-calculator/cutefish-calculator-0.7.ebuild          | 2 +-
 .../cutefish-calculator/cutefish-calculator-9999.ebuild         | 2 +-
 cutefish-base/cutefish-dock/cutefish-dock-0.7.ebuild            | 2 +-
 cutefish-base/cutefish-dock/cutefish-dock-9999.ebuild           | 2 +-
 .../cutefish-filemanager/cutefish-filemanager-0.7.ebuild        | 2 +-
 .../cutefish-filemanager/cutefish-filemanager-9999.ebuild       | 2 +-
 cutefish-base/cutefish-icons/cutefish-icons-0.7.ebuild          | 2 +-
 cutefish-base/cutefish-icons/cutefish-icons-9999.ebuild         | 2 +-
 .../cutefish-kwin-plugins/cutefish-kwin-plugins-0.7.ebuild      | 2 +-
 .../cutefish-kwin-plugins/cutefish-kwin-plugins-9999.ebuild     | 2 +-
 cutefish-base/cutefish-launcher/cutefish-launcher-0.7.ebuild    | 2 +-
 cutefish-base/cutefish-launcher/cutefish-launcher-9999.ebuild   | 2 +-
 .../cutefish-qt-plugins/cutefish-qt-plugins-0.7.ebuild          | 2 +-
 .../cutefish-qt-plugins/cutefish-qt-plugins-9999.ebuild         | 2 +-
 .../cutefish-screenlocker/cutefish-screenlocker-0.7.ebuild      | 2 +-
 .../cutefish-screenlocker/cutefish-screenlocker-9999.ebuild     | 2 +-
 .../cutefish-screenshot/cutefish-screenshot-0.7.ebuild          | 2 +-
 .../cutefish-screenshot/cutefish-screenshot-9999.ebuild         | 2 +-
 cutefish-base/cutefish-settings/cutefish-settings-0.7.ebuild    | 2 +-
 cutefish-base/cutefish-settings/cutefish-settings-9999.ebuild   | 2 +-
 cutefish-base/cutefish-statusbar/cutefish-statusbar-0.7.ebuild  | 2 +-
 cutefish-base/cutefish-statusbar/cutefish-statusbar-9999.ebuild | 2 +-
 cutefish-base/cutefish-terminal/cutefish-terminal-0.7.ebuild    | 2 +-
 cutefish-base/cutefish-terminal/cutefish-terminal-9999.ebuild   | 2 +-
 .../cutefish-videoplayer/cutefish-videoplayer-0.7.ebuild        | 2 +-
 .../cutefish-videoplayer/cutefish-videoplayer-9999.ebuild       | 2 +-
 .../cutefish-wallpapers/cutefish-wallpapers-0.7.ebuild          | 2 +-
 .../cutefish-wallpapers/cutefish-wallpapers-9999.ebuild         | 2 +-
 sys-libs/cutefish-core/cutefish-core-0.7.ebuild                 | 2 +-
 sys-libs/cutefish-core/cutefish-core-9999.ebuild                | 2 +-
 30 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/cutefish-base/cutefish-calculator/cutefish-calculator-0.7.ebuild b/cutefish-base/cutefish-calculator/cutefish-calculator-0.7.ebuild
index d6e3ca5a5..d4584aad9 100644
--- a/cutefish-base/cutefish-calculator/cutefish-calculator-0.7.ebuild
+++ b/cutefish-base/cutefish-calculator/cutefish-calculator-0.7.ebuild
@@ -8,7 +8,7 @@ inherit cmake
 if [[ ${PV} == 9999* ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/cutefishos/calculator.git"
-	EGIT_CHECKOUT_DIR=calculator-${PV}
+	EGIT_CHECKOUT_DIR=cutefish-calculator-${PV}
 	KEYWORDS=""
 else
 	EGIT_COMMIT="6cce31e310ae68fa5aafa9b9e92f542c37db19ae"
diff --git a/cutefish-base/cutefish-calculator/cutefish-calculator-9999.ebuild b/cutefish-base/cutefish-calculator/cutefish-calculator-9999.ebuild
index d6e3ca5a5..d4584aad9 100644
--- a/cutefish-base/cutefish-calculator/cutefish-calculator-9999.ebuild
+++ b/cutefish-base/cutefish-calculator/cutefish-calculator-9999.ebuild
@@ -8,7 +8,7 @@ inherit cmake
 if [[ ${PV} == 9999* ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/cutefishos/calculator.git"
-	EGIT_CHECKOUT_DIR=calculator-${PV}
+	EGIT_CHECKOUT_DIR=cutefish-calculator-${PV}
 	KEYWORDS=""
 else
 	EGIT_COMMIT="6cce31e310ae68fa5aafa9b9e92f542c37db19ae"
diff --git a/cutefish-base/cutefish-dock/cutefish-dock-0.7.ebuild b/cutefish-base/cutefish-dock/cutefish-dock-0.7.ebuild
index a4a544cc9..097663374 100644
--- a/cutefish-base/cutefish-dock/cutefish-dock-0.7.ebuild
+++ b/cutefish-base/cutefish-dock/cutefish-dock-0.7.ebuild
@@ -9,7 +9,7 @@ inherit cmake
 if [[ ${PV} == 9999* ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/cutefishos/dock.git"
-	EGIT_CHECKOUT_DIR=dock-${PV}
+	EGIT_CHECKOUT_DIR=cutefish-dock-${PV}
 	KEYWORDS=""
 else
 	EGIT_COMMIT="ecd8ce48b635e14349fdf1bfa3afcd64510249eb"
diff --git a/cutefish-base/cutefish-dock/cutefish-dock-9999.ebuild b/cutefish-base/cutefish-dock/cutefish-dock-9999.ebuild
index a4a544cc9..097663374 100644
--- a/cutefish-base/cutefish-dock/cutefish-dock-9999.ebuild
+++ b/cutefish-base/cutefish-dock/cutefish-dock-9999.ebuild
@@ -9,7 +9,7 @@ inherit cmake
 if [[ ${PV} == 9999* ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/cutefishos/dock.git"
-	EGIT_CHECKOUT_DIR=dock-${PV}
+	EGIT_CHECKOUT_DIR=cutefish-dock-${PV}
 	KEYWORDS=""
 else
 	EGIT_COMMIT="ecd8ce48b635e14349fdf1bfa3afcd64510249eb"
diff --git a/cutefish-base/cutefish-filemanager/cutefish-filemanager-0.7.ebuild b/cutefish-base/cutefish-filemanager/cutefish-filemanager-0.7.ebuild
index 24849e7b9..90ddeaa46 100644
--- a/cutefish-base/cutefish-filemanager/cutefish-filemanager-0.7.ebuild
+++ b/cutefish-base/cutefish-filemanager/cutefish-filemanager-0.7.ebuild
@@ -9,7 +9,7 @@ inherit cmake
 if [[ ${PV} == 9999* ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/cutefishos/filemanager.git"
-	EGIT_CHECKOUT_DIR=filemanager-${PV}
+	EGIT_CHECKOUT_DIR=cutefish-filemanager-${PV}
 	KEYWORDS=""
 else
 	EGIT_COMMIT="94ecc5661736bf50440c150e06cb3266ddb10f48"
diff --git a/cutefish-base/cutefish-filemanager/cutefish-filemanager-9999.ebuild b/cutefish-base/cutefish-filemanager/cutefish-filemanager-9999.ebuild
index 24849e7b9..90ddeaa46 100644
--- a/cutefish-base/cutefish-filemanager/cutefish-filemanager-9999.ebuild
+++ b/cutefish-base/cutefish-filemanager/cutefish-filemanager-9999.ebuild
@@ -9,7 +9,7 @@ inherit cmake
 if [[ ${PV} == 9999* ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/cutefishos/filemanager.git"
-	EGIT_CHECKOUT_DIR=filemanager-${PV}
+	EGIT_CHECKOUT_DIR=cutefish-filemanager-${PV}
 	KEYWORDS=""
 else
 	EGIT_COMMIT="94ecc5661736bf50440c150e06cb3266ddb10f48"
diff --git a/cutefish-base/cutefish-icons/cutefish-icons-0.7.ebuild b/cutefish-base/cutefish-icons/cutefish-icons-0.7.ebuild
index 64f5e4ca0..077a5c56f 100644
--- a/cutefish-base/cutefish-icons/cutefish-icons-0.7.ebuild
+++ b/cutefish-base/cutefish-icons/cutefish-icons-0.7.ebuild
@@ -8,7 +8,7 @@ inherit cmake
 if [[ ${PV} == 9999* ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/cutefishos/icons.git"
-	EGIT_CHECKOUT_DIR=icons-${PV}
+	EGIT_CHECKOUT_DIR=cutefish-icons-${PV}
 	KEYWORDS=""
 else
 	EGIT_COMMIT="119feb59404f329eb2f1ebe14d63f3d53f8bd96c"
diff --git a/cutefish-base/cutefish-icons/cutefish-icons-9999.ebuild b/cutefish-base/cutefish-icons/cutefish-icons-9999.ebuild
index 64f5e4ca0..077a5c56f 100644
--- a/cutefish-base/cutefish-icons/cutefish-icons-9999.ebuild
+++ b/cutefish-base/cutefish-icons/cutefish-icons-9999.ebuild
@@ -8,7 +8,7 @@ inherit cmake
 if [[ ${PV} == 9999* ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/cutefishos/icons.git"
-	EGIT_CHECKOUT_DIR=icons-${PV}
+	EGIT_CHECKOUT_DIR=cutefish-icons-${PV}
 	KEYWORDS=""
 else
 	EGIT_COMMIT="119feb59404f329eb2f1ebe14d63f3d53f8bd96c"
diff --git a/cutefish-base/cutefish-kwin-plugins/cutefish-kwin-plugins-0.7.ebuild b/cutefish-base/cutefish-kwin-plugins/cutefish-kwin-plugins-0.7.ebuild
index 52577aee7..9e668cfc8 100644
--- a/cutefish-base/cutefish-kwin-plugins/cutefish-kwin-plugins-0.7.ebuild
+++ b/cutefish-base/cutefish-kwin-plugins/cutefish-kwin-plugins-0.7.ebuild
@@ -8,7 +8,7 @@ inherit cmake
 if [[ ${PV} == 9999* ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/cutefishos/kwin-plugins.git"
-	EGIT_CHECKOUT_DIR=kwin-plugins-${PV}
+	EGIT_CHECKOUT_DIR=cutefish-kwin-plugins-${PV}
 	KEYWORDS=""
 else
 	EGIT_COMMIT="b5198d15880b8df7ffd7f83100cb90d9bbbe9c79"
diff --git a/cutefish-base/cutefish-kwin-plugins/cutefish-kwin-plugins-9999.ebuild b/cutefish-base/cutefish-kwin-plugins/cutefish-kwin-plugins-9999.ebuild
index 52577aee7..9e668cfc8 100644
--- a/cutefish-base/cutefish-kwin-plugins/cutefish-kwin-plugins-9999.ebuild
+++ b/cutefish-base/cutefish-kwin-plugins/cutefish-kwin-plugins-9999.ebuild
@@ -8,7 +8,7 @@ inherit cmake
 if [[ ${PV} == 9999* ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/cutefishos/kwin-plugins.git"
-	EGIT_CHECKOUT_DIR=kwin-plugins-${PV}
+	EGIT_CHECKOUT_DIR=cutefish-kwin-plugins-${PV}
 	KEYWORDS=""
 else
 	EGIT_COMMIT="b5198d15880b8df7ffd7f83100cb90d9bbbe9c79"
diff --git a/cutefish-base/cutefish-launcher/cutefish-launcher-0.7.ebuild b/cutefish-base/cutefish-launcher/cutefish-launcher-0.7.ebuild
index c8e9f9201..d0985b684 100644
--- a/cutefish-base/cutefish-launcher/cutefish-launcher-0.7.ebuild
+++ b/cutefish-base/cutefish-launcher/cutefish-launcher-0.7.ebuild
@@ -9,7 +9,7 @@ inherit cmake
 if [[ ${PV} == 9999* ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/cutefishos/launcher.git"
-	EGIT_CHECKOUT_DIR=launcher-${PV}
+	EGIT_CHECKOUT_DIR=cutefish-launcher-${PV}
 	KEYWORDS=""
 else
 	EGIT_COMMIT="c12a23f0a5553138fddae8f8bcd9b1aa8c07df5b"
diff --git a/cutefish-base/cutefish-launcher/cutefish-launcher-9999.ebuild b/cutefish-base/cutefish-launcher/cutefish-launcher-9999.ebuild
index c8e9f9201..d0985b684 100644
--- a/cutefish-base/cutefish-launcher/cutefish-launcher-9999.ebuild
+++ b/cutefish-base/cutefish-launcher/cutefish-launcher-9999.ebuild
@@ -9,7 +9,7 @@ inherit cmake
 if [[ ${PV} == 9999* ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/cutefishos/launcher.git"
-	EGIT_CHECKOUT_DIR=launcher-${PV}
+	EGIT_CHECKOUT_DIR=cutefish-launcher-${PV}
 	KEYWORDS=""
 else
 	EGIT_COMMIT="c12a23f0a5553138fddae8f8bcd9b1aa8c07df5b"
diff --git a/cutefish-base/cutefish-qt-plugins/cutefish-qt-plugins-0.7.ebuild b/cutefish-base/cutefish-qt-plugins/cutefish-qt-plugins-0.7.ebuild
index b3d642132..fb9744246 100644
--- a/cutefish-base/cutefish-qt-plugins/cutefish-qt-plugins-0.7.ebuild
+++ b/cutefish-base/cutefish-qt-plugins/cutefish-qt-plugins-0.7.ebuild
@@ -8,7 +8,7 @@ inherit cmake
 if [[ ${PV} = 9999* ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/cutefishos/qt-plugins.git"
-	EGIT_CHECKOUT_DIR=qt-plugins-${PV}
+	EGIT_CHECKOUT_DIR=cutefish-qt-plugins-${PV}
 	KEYWORDS=""
 else
 	EGIT_COMMIT="b60cdd4c0cf185f538c9746ef321582cbab9568c"
diff --git a/cutefish-base/cutefish-qt-plugins/cutefish-qt-plugins-9999.ebuild b/cutefish-base/cutefish-qt-plugins/cutefish-qt-plugins-9999.ebuild
index b3d642132..fb9744246 100644
--- a/cutefish-base/cutefish-qt-plugins/cutefish-qt-plugins-9999.ebuild
+++ b/cutefish-base/cutefish-qt-plugins/cutefish-qt-plugins-9999.ebuild
@@ -8,7 +8,7 @@ inherit cmake
 if [[ ${PV} = 9999* ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/cutefishos/qt-plugins.git"
-	EGIT_CHECKOUT_DIR=qt-plugins-${PV}
+	EGIT_CHECKOUT_DIR=cutefish-qt-plugins-${PV}
 	KEYWORDS=""
 else
 	EGIT_COMMIT="b60cdd4c0cf185f538c9746ef321582cbab9568c"
diff --git a/cutefish-base/cutefish-screenlocker/cutefish-screenlocker-0.7.ebuild b/cutefish-base/cutefish-screenlocker/cutefish-screenlocker-0.7.ebuild
index b777110fc..92a038fa0 100644
--- a/cutefish-base/cutefish-screenlocker/cutefish-screenlocker-0.7.ebuild
+++ b/cutefish-base/cutefish-screenlocker/cutefish-screenlocker-0.7.ebuild
@@ -9,7 +9,7 @@ inherit cmake
 if [[ ${PV} = 9999* ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/cutefishos/screenlocker.git"
-	EGIT_CHECKOUT_DIR=screenlocker-${PV}
+	EGIT_CHECKOUT_DIR=cutefish-screenlocker-${PV}
 	KEYWORDS=""
 else
 	EGIT_COMMIT="90c70de51b61837dc9f52da58b5cce703cddab94"
diff --git a/cutefish-base/cutefish-screenlocker/cutefish-screenlocker-9999.ebuild b/cutefish-base/cutefish-screenlocker/cutefish-screenlocker-9999.ebuild
index b777110fc..92a038fa0 100644
--- a/cutefish-base/cutefish-screenlocker/cutefish-screenlocker-9999.ebuild
+++ b/cutefish-base/cutefish-screenlocker/cutefish-screenlocker-9999.ebuild
@@ -9,7 +9,7 @@ inherit cmake
 if [[ ${PV} = 9999* ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/cutefishos/screenlocker.git"
-	EGIT_CHECKOUT_DIR=screenlocker-${PV}
+	EGIT_CHECKOUT_DIR=cutefish-screenlocker-${PV}
 	KEYWORDS=""
 else
 	EGIT_COMMIT="90c70de51b61837dc9f52da58b5cce703cddab94"
diff --git a/cutefish-base/cutefish-screenshot/cutefish-screenshot-0.7.ebuild b/cutefish-base/cutefish-screenshot/cutefish-screenshot-0.7.ebuild
index 9a00ddffb..544ecf7cb 100644
--- a/cutefish-base/cutefish-screenshot/cutefish-screenshot-0.7.ebuild
+++ b/cutefish-base/cutefish-screenshot/cutefish-screenshot-0.7.ebuild
@@ -9,7 +9,7 @@ inherit cmake
 if [[ ${PV} = 9999* ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/cutefishos/screenshot.git"
-	EGIT_CHECKOUT_DIR=screenshot-${PV}
+	EGIT_CHECKOUT_DIR=cutefish-screenshot-${PV}
 	KEYWORDS=""
 else
 	EGIT_COMMIT="1ab2dd3e6e94a7ec722afd02bc63beae9cb28b97"
diff --git a/cutefish-base/cutefish-screenshot/cutefish-screenshot-9999.ebuild b/cutefish-base/cutefish-screenshot/cutefish-screenshot-9999.ebuild
index 9a00ddffb..544ecf7cb 100644
--- a/cutefish-base/cutefish-screenshot/cutefish-screenshot-9999.ebuild
+++ b/cutefish-base/cutefish-screenshot/cutefish-screenshot-9999.ebuild
@@ -9,7 +9,7 @@ inherit cmake
 if [[ ${PV} = 9999* ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/cutefishos/screenshot.git"
-	EGIT_CHECKOUT_DIR=screenshot-${PV}
+	EGIT_CHECKOUT_DIR=cutefish-screenshot-${PV}
 	KEYWORDS=""
 else
 	EGIT_COMMIT="1ab2dd3e6e94a7ec722afd02bc63beae9cb28b97"
diff --git a/cutefish-base/cutefish-settings/cutefish-settings-0.7.ebuild b/cutefish-base/cutefish-settings/cutefish-settings-0.7.ebuild
index bc9d25ed4..8f23c2150 100644
--- a/cutefish-base/cutefish-settings/cutefish-settings-0.7.ebuild
+++ b/cutefish-base/cutefish-settings/cutefish-settings-0.7.ebuild
@@ -9,7 +9,7 @@ inherit cmake
 if [[ ${PV} == 9999* ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/cutefishos/settings.git"
-	EGIT_CHECKOUT_DIR=settings-${PV}
+	EGIT_CHECKOUT_DIR=cutefish-settings-${PV}
 	KEYWORDS=""
 else
 	EGIT_COMMIT="abbaa8c7f0c5b267cd6d0478d6ebab97819e0078"
diff --git a/cutefish-base/cutefish-settings/cutefish-settings-9999.ebuild b/cutefish-base/cutefish-settings/cutefish-settings-9999.ebuild
index bc9d25ed4..8f23c2150 100644
--- a/cutefish-base/cutefish-settings/cutefish-settings-9999.ebuild
+++ b/cutefish-base/cutefish-settings/cutefish-settings-9999.ebuild
@@ -9,7 +9,7 @@ inherit cmake
 if [[ ${PV} == 9999* ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/cutefishos/settings.git"
-	EGIT_CHECKOUT_DIR=settings-${PV}
+	EGIT_CHECKOUT_DIR=cutefish-settings-${PV}
 	KEYWORDS=""
 else
 	EGIT_COMMIT="abbaa8c7f0c5b267cd6d0478d6ebab97819e0078"
diff --git a/cutefish-base/cutefish-statusbar/cutefish-statusbar-0.7.ebuild b/cutefish-base/cutefish-statusbar/cutefish-statusbar-0.7.ebuild
index 63b9e5675..1cca5e33a 100644
--- a/cutefish-base/cutefish-statusbar/cutefish-statusbar-0.7.ebuild
+++ b/cutefish-base/cutefish-statusbar/cutefish-statusbar-0.7.ebuild
@@ -9,7 +9,7 @@ inherit cmake
 if [[ ${PV} == 9999* ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/cutefishos/statusbar.git"
-	EGIT_CHECKOUT_DIR=statusbar-${PV}
+	EGIT_CHECKOUT_DIR=cutefish-statusbar-${PV}
 	KEYWORDS=""
 else
 	EGIT_COMMIT="460f94c00402bc1fab0b13d51ee4b82d108259d2"
diff --git a/cutefish-base/cutefish-statusbar/cutefish-statusbar-9999.ebuild b/cutefish-base/cutefish-statusbar/cutefish-statusbar-9999.ebuild
index 63b9e5675..1cca5e33a 100644
--- a/cutefish-base/cutefish-statusbar/cutefish-statusbar-9999.ebuild
+++ b/cutefish-base/cutefish-statusbar/cutefish-statusbar-9999.ebuild
@@ -9,7 +9,7 @@ inherit cmake
 if [[ ${PV} == 9999* ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/cutefishos/statusbar.git"
-	EGIT_CHECKOUT_DIR=statusbar-${PV}
+	EGIT_CHECKOUT_DIR=cutefish-statusbar-${PV}
 	KEYWORDS=""
 else
 	EGIT_COMMIT="460f94c00402bc1fab0b13d51ee4b82d108259d2"
diff --git a/cutefish-base/cutefish-terminal/cutefish-terminal-0.7.ebuild b/cutefish-base/cutefish-terminal/cutefish-terminal-0.7.ebuild
index b94404eb7..eee175c31 100644
--- a/cutefish-base/cutefish-terminal/cutefish-terminal-0.7.ebuild
+++ b/cutefish-base/cutefish-terminal/cutefish-terminal-0.7.ebuild
@@ -9,7 +9,7 @@ inherit cmake
 if [[ ${PV} == 9999* ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/cutefishos/terminal.git"
-	EGIT_CHECKOUT_DIR=terminal-${PV}
+	EGIT_CHECKOUT_DIR=cutefish-terminal-${PV}
 	KEYWORDS=""
 else
 	EGIT_COMMIT="5d061c545fc17c356b6b114364173c0c25ecde43"
diff --git a/cutefish-base/cutefish-terminal/cutefish-terminal-9999.ebuild b/cutefish-base/cutefish-terminal/cutefish-terminal-9999.ebuild
index b94404eb7..eee175c31 100644
--- a/cutefish-base/cutefish-terminal/cutefish-terminal-9999.ebuild
+++ b/cutefish-base/cutefish-terminal/cutefish-terminal-9999.ebuild
@@ -9,7 +9,7 @@ inherit cmake
 if [[ ${PV} == 9999* ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/cutefishos/terminal.git"
-	EGIT_CHECKOUT_DIR=terminal-${PV}
+	EGIT_CHECKOUT_DIR=cutefish-terminal-${PV}
 	KEYWORDS=""
 else
 	EGIT_COMMIT="5d061c545fc17c356b6b114364173c0c25ecde43"
diff --git a/cutefish-base/cutefish-videoplayer/cutefish-videoplayer-0.7.ebuild b/cutefish-base/cutefish-videoplayer/cutefish-videoplayer-0.7.ebuild
index caa5dd85f..093df0b22 100644
--- a/cutefish-base/cutefish-videoplayer/cutefish-videoplayer-0.7.ebuild
+++ b/cutefish-base/cutefish-videoplayer/cutefish-videoplayer-0.7.ebuild
@@ -9,7 +9,7 @@ inherit cmake
 if [[ ${PV} == 9999* ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/cutefishos/videoplayer.git"
-	EGIT_CHECKOUT_DIR=videoplayer-${PV}
+	EGIT_CHECKOUT_DIR=cutefish-videoplayer-${PV}
 	KEYWORDS=""
 else
 	EGIT_COMMIT="c1218016e4de425cae23c1ea715e57b68a5b24c2"
diff --git a/cutefish-base/cutefish-videoplayer/cutefish-videoplayer-9999.ebuild b/cutefish-base/cutefish-videoplayer/cutefish-videoplayer-9999.ebuild
index caa5dd85f..093df0b22 100644
--- a/cutefish-base/cutefish-videoplayer/cutefish-videoplayer-9999.ebuild
+++ b/cutefish-base/cutefish-videoplayer/cutefish-videoplayer-9999.ebuild
@@ -9,7 +9,7 @@ inherit cmake
 if [[ ${PV} == 9999* ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/cutefishos/videoplayer.git"
-	EGIT_CHECKOUT_DIR=videoplayer-${PV}
+	EGIT_CHECKOUT_DIR=cutefish-videoplayer-${PV}
 	KEYWORDS=""
 else
 	EGIT_COMMIT="c1218016e4de425cae23c1ea715e57b68a5b24c2"
diff --git a/cutefish-base/cutefish-wallpapers/cutefish-wallpapers-0.7.ebuild b/cutefish-base/cutefish-wallpapers/cutefish-wallpapers-0.7.ebuild
index 4cf64dec3..bf0460087 100644
--- a/cutefish-base/cutefish-wallpapers/cutefish-wallpapers-0.7.ebuild
+++ b/cutefish-base/cutefish-wallpapers/cutefish-wallpapers-0.7.ebuild
@@ -8,7 +8,7 @@ inherit cmake
 if [[ ${PV} == 9999* ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/cutefishos/wallpapers.git"
-	EGIT_CHECKOUT_DIR=wallpapers-${PV}
+	EGIT_CHECKOUT_DIR=cutefish-wallpapers-${PV}
 	KEYWORDS=""
 else
 	EGIT_COMMIT="9acd305776a88e2a6c497c8e9b719c0f39a65c97"
diff --git a/cutefish-base/cutefish-wallpapers/cutefish-wallpapers-9999.ebuild b/cutefish-base/cutefish-wallpapers/cutefish-wallpapers-9999.ebuild
index 4cf64dec3..bf0460087 100644
--- a/cutefish-base/cutefish-wallpapers/cutefish-wallpapers-9999.ebuild
+++ b/cutefish-base/cutefish-wallpapers/cutefish-wallpapers-9999.ebuild
@@ -8,7 +8,7 @@ inherit cmake
 if [[ ${PV} == 9999* ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/cutefishos/wallpapers.git"
-	EGIT_CHECKOUT_DIR=wallpapers-${PV}
+	EGIT_CHECKOUT_DIR=cutefish-wallpapers-${PV}
 	KEYWORDS=""
 else
 	EGIT_COMMIT="9acd305776a88e2a6c497c8e9b719c0f39a65c97"
diff --git a/sys-libs/cutefish-core/cutefish-core-0.7.ebuild b/sys-libs/cutefish-core/cutefish-core-0.7.ebuild
index 3df4efc3d..ee5cfd67d 100644
--- a/sys-libs/cutefish-core/cutefish-core-0.7.ebuild
+++ b/sys-libs/cutefish-core/cutefish-core-0.7.ebuild
@@ -9,7 +9,7 @@ inherit cmake
 if [[ ${PV} == 9999* ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/cutefishos/core.git"
-	EGIT_CHECKOUT_DIR=core-${PV}
+	EGIT_CHECKOUT_DIR=cutefish-core-${PV}
 	KEYWORDS=""
 else
 	EGIT_COMMIT="1f29e396414e90d455faa83407208aaa17760ab3"
diff --git a/sys-libs/cutefish-core/cutefish-core-9999.ebuild b/sys-libs/cutefish-core/cutefish-core-9999.ebuild
index 3df4efc3d..ee5cfd67d 100644
--- a/sys-libs/cutefish-core/cutefish-core-9999.ebuild
+++ b/sys-libs/cutefish-core/cutefish-core-9999.ebuild
@@ -9,7 +9,7 @@ inherit cmake
 if [[ ${PV} == 9999* ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/cutefishos/core.git"
-	EGIT_CHECKOUT_DIR=core-${PV}
+	EGIT_CHECKOUT_DIR=cutefish-core-${PV}
 	KEYWORDS=""
 else
 	EGIT_COMMIT="1f29e396414e90d455faa83407208aaa17760ab3"