From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1225445-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 7EC3A13835A
for <garchives@archives.gentoo.org>; Thu, 26 Nov 2020 05:06:45 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id BE8AAE0921;
Thu, 26 Nov 2020 05:06:44 +0000 (UTC)
Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id A92A3E0921
for <gentoo-commits@lists.gentoo.org>; Thu, 26 Nov 2020 05:06:44 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 975E9340DDF
for <gentoo-commits@lists.gentoo.org>; Thu, 26 Nov 2020 05:06:43 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id D637246A
for <gentoo-commits@lists.gentoo.org>; Thu, 26 Nov 2020 05:06:41 +0000 (UTC)
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" <sam@gentoo.org>
Message-ID: <1606367193.1807ee7ddc7acf482dfc1151f0aac9ded53c848f.sam@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-embedded/rpi-eeprom/
X-VCS-Repository: repo/gentoo
X-VCS-Files: dev-embedded/rpi-eeprom/rpi-eeprom-10.2_p1.ebuild
X-VCS-Directories: dev-embedded/rpi-eeprom/
X-VCS-Committer: sam
X-VCS-Committer-Name: Sam James
X-VCS-Revision: 1807ee7ddc7acf482dfc1151f0aac9ded53c848f
X-VCS-Branch: master
Date: Thu, 26 Nov 2020 05:06:41 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: ac38c291-dc82-4c2d-9d0c-ae2b28b0a36a
X-Archives-Hash: b9a152052a73e4db1877b38a93d15035
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"
}