[gentoo-commits] repo/gentoo:master commit in: dev-embedded/rpi-eeprom/

["Sam James" <sam@gentoo.org>]

commit:     1807ee7ddc7acf482dfc1151f0aac9ded53c848f
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 26 05:05:40 2020 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Nov 26 05:06:33 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1807ee7d

dev-embedded/rpi-eeprom: post-merge changes

Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-embedded/rpi-eeprom/rpi-eeprom-10.2_p1.ebuild | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/dev-embedded/rpi-eeprom/rpi-eeprom-10.2_p1.ebuild b/dev-embedded/rpi-eeprom/rpi-eeprom-10.2_p1.ebuild
index c2417ac6a24..c34a558630a 100644
--- a/dev-embedded/rpi-eeprom/rpi-eeprom-10.2_p1.ebuild
+++ b/dev-embedded/rpi-eeprom/rpi-eeprom-10.2_p1.ebuild
@@ -13,24 +13,22 @@ MY_P="${PN}-$(ver_cut 1-2)"
 MY_BASE_URL="https://archive.raspberrypi.org/debian/pool/main/r/${PN}/${PN}_$(ver_cut 1-2)"
 SRC_URI="${MY_BASE_URL}-$(ver_cut 4).debian.tar.xz
 	${MY_BASE_URL}.orig.tar.gz"
+S="${WORKDIR}"
+
 SLOT="0"
 LICENSE="BSD rpi-eeprom"
 KEYWORDS="~arm ~arm64"
-IUSE=""
-
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-DEPEND="sys-apps/help2man
-	${PYTHON_DEPS}"
-RDEPEND="sys-apps/flashrom
-	${PYTHON_DEPS}
+BDEPEND="sys-apps/help2man"
+DEPEND="${PYTHON_DEPS}"
+RDEPEND="${PYTHON_DEPS}
+	sys-apps/flashrom
 	|| (
 		>=media-libs/raspberrypi-userland-0_pre20201022
 		>=media-libs/raspberrypi-userland-bin-1.20201022
 	)"
 
-S="${WORKDIR}"
-
 src_prepare() {
 	default
 	sed -i \
@@ -72,14 +70,14 @@ src_install() {
 
 	newconfd rpi-eeprom-update-default rpi-eeprom-update
 
-	popd 1>/dev/null
+	popd 1>/dev/null || die
 
 	pushd debian 1>/dev/null || die "Cannot change into directory debian"
 
 	systemd_newunit rpi-eeprom.rpi-eeprom-update.service rpi-eeprom-update.service
 	newdoc changelog changelog.Debian
 
-	popd 1>/dev/null
+	popd 1>/dev/null || die
 
 	newinitd "${FILESDIR}/init.d_rpi-eeprom-update-1" "rpi-eeprom-update"
 }