From 5765e86780a7e72589af2055960fe23f76eec756 Mon Sep 17 00:00:00 2001
From: "Rick Farina (Zero_Chaos)" <zerochaos@gentoo.org>
Date: Thu, 7 Jun 2018 14:07:03 -0400
Subject: [PATCH] pentoo-livecd: maybe if I sucked less

---
 ...ler.initd-2018.1 => binary-driver-handler.initd-2018.1-r1} | 4 ++--
 ...livecd-2018.1-r2.ebuild => pentoo-livecd-2018.1-r3.ebuild} | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
 rename pentoo/pentoo-livecd/files/{binary-driver-handler.initd-2018.1 => binary-driver-handler.initd-2018.1-r1} (98%)
 rename pentoo/pentoo-livecd/{pentoo-livecd-2018.1-r2.ebuild => pentoo-livecd-2018.1-r3.ebuild} (93%)

diff --git a/pentoo/pentoo-livecd/files/binary-driver-handler.initd-2018.1 b/pentoo/pentoo-livecd/files/binary-driver-handler.initd-2018.1-r1
similarity index 98%
rename from pentoo/pentoo-livecd/files/binary-driver-handler.initd-2018.1
rename to pentoo/pentoo-livecd/files/binary-driver-handler.initd-2018.1-r1
index 19ac68162..e80ace60a 100644
--- a/pentoo/pentoo-livecd/files/binary-driver-handler.initd-2018.1
+++ b/pentoo/pentoo-livecd/files/binary-driver-handler.initd-2018.1-r1
@@ -266,10 +266,10 @@ start() {
     for mod in ${BROADCOM_DETECTED}; do
       einfo "Detected: ${mod} hardware, please stand by..."
       TEST_FILE=""
-      TEST_FILE="$(FETCHCOMMAND="false" RESUMECOMMAND="false" emerge --color=n -f ${mod} --nodeps 2> /dev/zero | \
+      TEST_FILE="$(FETCHCOMMAND="false" RESUMECOMMAND="false" emerge --color=n -f ${mod}-firmware --nodeps 2> /dev/zero | \
          grep "BLAKE2B SHA512 size ;-) ..." | awk '{print $2}' | head -n1)"
       if [ -n "${TEST_FILE}" ]; then
-        BROADCOM_READY="${BROADCOM_READY} ${mod}"
+        BROADCOM_READY="${BROADCOM_READY} ${mod}-firmware"
       else
         eerror "Missing distfile for ${mod}-firmware"
       fi
diff --git a/pentoo/pentoo-livecd/pentoo-livecd-2018.1-r2.ebuild b/pentoo/pentoo-livecd/pentoo-livecd-2018.1-r3.ebuild
similarity index 93%
rename from pentoo/pentoo-livecd/pentoo-livecd-2018.1-r2.ebuild
rename to pentoo/pentoo-livecd/pentoo-livecd-2018.1-r3.ebuild
index 843ef059b..34f89202a 100644
--- a/pentoo/pentoo-livecd/pentoo-livecd-2018.1-r2.ebuild
+++ b/pentoo/pentoo-livecd/pentoo-livecd-2018.1-r3.ebuild
@@ -37,7 +37,7 @@ src_install() {
 	newsbin "${FILESDIR}"/makemo-2018.0-r1 makemo
 	newsbin "${FILESDIR}"/livecd-setpass-r1 livecd-setpass
 
-	newinitd "${FILESDIR}"/binary-driver-handler.initd-2018.1 binary-driver-handler
+	newinitd "${FILESDIR}"/binary-driver-handler.initd-2018.1-r1 binary-driver-handler
 
 	exeinto /root/Desktop
 	doexe "${FILESDIR}"/networkmanager.desktop