From 51d1ee238288a0e9d0da48f7bdb36d561160c977 Mon Sep 17 00:00:00 2001
From: "Rick Farina (Zero_Chaos)" <zerochaos@gentoo.org>
Date: Wed, 6 Feb 2019 10:34:34 -0500
Subject: [PATCH] pentoo-livecd: a few minor fixes found during bdh runs

---
 ...8.3-r1 => binary-driver-handler.initd-2019.0} | 16 +++++++++++-----
 .../files/{makemo-2018.0-r1 => makemo-2019.0}    |  4 ++++
 ...8.3-r2.ebuild => pentoo-livecd-2019.0.ebuild} |  4 ++--
 3 files changed, 17 insertions(+), 7 deletions(-)
 rename pentoo/pentoo-livecd/files/{binary-driver-handler.initd-2018.3-r1 => binary-driver-handler.initd-2019.0} (96%)
 rename pentoo/pentoo-livecd/files/{makemo-2018.0-r1 => makemo-2019.0} (94%)
 rename pentoo/pentoo-livecd/{pentoo-livecd-2018.3-r2.ebuild => pentoo-livecd-2019.0.ebuild} (89%)

diff --git a/pentoo/pentoo-livecd/files/binary-driver-handler.initd-2018.3-r1 b/pentoo/pentoo-livecd/files/binary-driver-handler.initd-2019.0
similarity index 96%
rename from pentoo/pentoo-livecd/files/binary-driver-handler.initd-2018.3-r1
rename to pentoo/pentoo-livecd/files/binary-driver-handler.initd-2019.0
index 01f476fe5..8706d12c7 100644
--- a/pentoo/pentoo-livecd/files/binary-driver-handler.initd-2018.3-r1
+++ b/pentoo/pentoo-livecd/files/binary-driver-handler.initd-2019.0
@@ -33,7 +33,10 @@ start() {
 
 		if [ ! -f /lib/modules/$(uname -r)/video/nvidia.ko ]; then
 			einfo "Building evil binary nvidia driver..."
-			eval ${run_merge} --nodeps nvidia-drivers
+			if ! eval ${run_merge} nvidia-drivers; then
+				eerror "Failed to build nvidia driver, very sad..."
+				return
+			fi
 		fi
 
 		modprobe nvidia || NVIDIA_FAILURE=yes
@@ -166,7 +169,10 @@ start() {
 
 		if [ ! -f /lib/modules/$(uname -r)/video/fglrx.ko ]; then
 			einfo "Building evil binary AMD driver..."
-			eval ${run_merge} --nodeps ati-drivers
+			if ! eval ${run_merge} ati-drivers; then
+				eerror "Failed to build AMD driver, very sad..."
+				return
+			fi
 		fi
 		modprobe fglrx || FGLRX_FAILURE=yes
 		if [ "${FGLRX_FAILURE}" = "yes" ]; then
@@ -280,7 +286,7 @@ start() {
         eerror "Missing distfile for ${mod}-firmware"
       fi
     done
-    if eval ${run_merge} --nodeps ${BROADCOM_READY}; then
+    if eval ${run_merge} ${BROADCOM_READY}; then
       return 0
     else
       return 1
@@ -298,7 +304,7 @@ start() {
 	if [ -w /mnt/cdrom/modules ] && [ -x /usr/sbin/makemo ]; then
 		run_merge="echo y | makemo"
 	else
-		run_merge="emerge"
+		run_merge="emerge --nodeps"
 	fi
 
   ebegin "Setting up broadcom firmware if needed..."
@@ -316,7 +322,7 @@ start() {
     if handle_broadcom; then
       eend 0
     else
-      eend "Something went wrong"
+      eend "Something went wrong installing broadcom drivers."
     fi
   fi
 
diff --git a/pentoo/pentoo-livecd/files/makemo-2018.0-r1 b/pentoo/pentoo-livecd/files/makemo-2019.0
similarity index 94%
rename from pentoo/pentoo-livecd/files/makemo-2018.0-r1
rename to pentoo/pentoo-livecd/files/makemo-2019.0
index e4bd65a15..e0b7b2a43 100644
--- a/pentoo/pentoo-livecd/files/makemo-2018.0-r1
+++ b/pentoo/pentoo-livecd/files/makemo-2019.0
@@ -15,6 +15,10 @@ fi
 einfo "Pentoo Overlay Module creator version 1.0 running..."
 
 PKGDIR="$(portageq envvar PKGDIR)"
+if [ ! -d "${PKGDIR}" ]; then
+  einfo "PKGDIR ${PKGDIR} missing, creating it"
+  mkdir "${PKGDIR}" || eerror "Failed to create ${PKGDIR}"
+fi
 if [ ! -w "${PKGDIR}" ]; then
 	eerror "ERROR: ${PKGDIR} is not writable or does not exist!"
 	exit 1
diff --git a/pentoo/pentoo-livecd/pentoo-livecd-2018.3-r2.ebuild b/pentoo/pentoo-livecd/pentoo-livecd-2019.0.ebuild
similarity index 89%
rename from pentoo/pentoo-livecd/pentoo-livecd-2018.3-r2.ebuild
rename to pentoo/pentoo-livecd/pentoo-livecd-2019.0.ebuild
index 94be238b6..657fc8e25 100644
--- a/pentoo/pentoo-livecd/pentoo-livecd-2018.3-r2.ebuild
+++ b/pentoo/pentoo-livecd/pentoo-livecd-2019.0.ebuild
@@ -36,10 +36,10 @@ pkg_setup() {
 src_install() {
 	#/usr/sbin
 	newsbin "${FILESDIR}"/flushchanges-2018.0 flushchanges
-	newsbin "${FILESDIR}"/makemo-2018.0-r1 makemo
+	newsbin "${FILESDIR}"/makemo-2019.0 makemo
 	newsbin "${FILESDIR}"/livecd-setpass-r1 livecd-setpass
 
-	newinitd "${FILESDIR}"/binary-driver-handler.initd-2018.3-r1 binary-driver-handler
+	newinitd "${FILESDIR}"/binary-driver-handler.initd-2019.0 binary-driver-handler
 
 	exeinto /root/Desktop
 	doexe "${FILESDIR}"/networkmanager.desktop