Updating liguros repo21.1.2

23 files changed, 523 insertions, 370 deletions

diff --git a/dev-embedded/avra/avra-1.4.2.ebuild b/dev-embedded/avra/avra-1.4.2.ebuild
index b0af0cf057ae..f39b49bd9b5d 100644
--- a/dev-embedded/avra/avra-1.4.2.ebuild
+++ b/dev-embedded/avra/avra-1.4.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/hsoft/avra/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
+KEYWORDS="amd64 ~ppc x86"
 
 src_compile() {
 	emake \
diff --git a/dev-embedded/cpik/metadata.xml b/dev-embedded/cpik/metadata.xml
index 21451275f32f..fd131b9c3a4f 100644
--- a/dev-embedded/cpik/metadata.xml
+++ b/dev-embedded/cpik/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>rafaelmartins@gentoo.org</email>
-		<name>Rafael G. Martins</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription lang="en">
 		CPIK (the C compiler for PIC18 devices) is released under the GPL licence.
 		CPIK is an easy to use, near ANSI C compiler which is fully integrated with
diff --git a/dev-embedded/libftd2xx/Manifest b/dev-embedded/libftd2xx/Manifest
index 6bcf74df55b3..f3f9cee31ad7 100644
--- a/dev-embedded/libftd2xx/Manifest
+++ b/dev-embedded/libftd2xx/Manifest
@@ -1 +1,4 @@
+DIST libftd2xx-arm-v6-hf-1.4.8.tar.gz 882724 BLAKE2B 4ffe647272467698cfe10a2ef201f8adb4bc991df517945ee8f057a07e55c4804bc4d541b6e2bd523fc4f6375b0a28ae7241fdafaed9eae61739d83d0327540a SHA512 bd07f57f9a75c2195aaf71ed1c229e04256a9c9a59f3d2e8f2111bef8a1c58c05457b5d04d7a8f77f9daf076ce3f0b77e317ff1cedce4e3cd4146422cd5cf634
+DIST libftd2xx-i386-1.4.8.tar.gz 891331 BLAKE2B 742be8418ac598b0c4b6b1e4be99a57c85e70310c2a15936dba3a765b0168eac37a080619ed92816a96f93106f96b812545d1cf212f5d6d32b03e5100870f6a7 SHA512 d66415b9ecdc2b38370c2c6b97e5d14c3891910ceaf5aee2740b2e893891c4f2ebf395960748d55508f4b63edd3d829d9c0020898c1b83b453496d18b4a85528
+DIST libftd2xx-x86_64-1.4.8.tar.gz 898269 BLAKE2B e491b58f66ec64014511469e7eb0a628e799ffa4cc52cb94ca66c082dbc56793e3435a80bde7433ce1bea96eea1a52461606ce78a9b2e447f3f9c5a7faef1f1b SHA512 b738b764bcebb5f93f5a968b266547b8775cbc72df8587bfcf67591ce95557b6a43dce2f5dbd9de451f8c9421ec41c25c8fb9bed37b76aec4cd5bac854d4af06
 DIST libftd2xx1.1.12.tar.gz 950540 BLAKE2B 6d55e8ff9b17a6b0220f5f4f3022c3495262b0ac47687ad9f28023c9f7b822f3956f2e42787edbdafe44ceea9b65b5ae687e2acb840f3e5546e5b2ac8a7ccec8 SHA512 afe0a8a7ccc47eb8888346dabdbfb41e182f7dadee7a57a1c4ffce544aebe5cab45c3e64de4ebeebdc0f31961617a79cbcf11dadfebde65ee79ca38e6234995a
diff --git a/dev-embedded/libftd2xx/libftd2xx-1.4.8.ebuild b/dev-embedded/libftd2xx/libftd2xx-1.4.8.ebuild
new file mode 100644
index 000000000000..95ceced5fe04
--- /dev/null
+++ b/dev-embedded/libftd2xx/libftd2xx-1.4.8.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Library that allows a direct access to a USB device"
+HOMEPAGE="https://www.ftdichip.com/Drivers/D2XX.htm"
+# NOTE: We could include other arm versions here too.
+SRC_URI="
+	amd64? ( http://www.ftdichip.com/Drivers/D2XX/Linux/${PN}-x86_64-${PV}.gz -> ${PN}-x86_64-${PV}.tar.gz )
+	arm? ( http://www.ftdichip.com/Drivers/D2XX/Linux/${PN}-arm-v6-hf-${PV}.gz -> ${PN}-arm-v6-hf-${PV}.tar.gz )
+	x86? ( http://www.ftdichip.com/Drivers/D2XX/Linux/${PN}-i386-${PV}.gz -> ${PN}-i386-${PV}.tar.gz )
+"
+S="${WORKDIR}"
+
+LICENSE="FTDI LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="examples"
+
+QA_PREBUILT="*"
+
+src_install() {
+	cd release/build || die
+
+	into /opt
+	dolib.so ${PN}.so.${PV}
+	dosym ${PN}.so.${PV} /opt/$(get_libdir)/${PN}.so.${PV:0:1}
+	dosym ${PN}.so.${PV:0:1} /opt/$(get_libdir)/${PN}.so
+	insinto /usr/include
+	doins "${S}"/release/ftd2xx.h "${S}"/release/WinTypes.h
+
+	dodir /etc/env.d
+	echo "LDPATH=\"/opt/$(get_libdir)\"" > ${ED}/etc/env.d/50libftd2xx || die
+
+	if use examples ; then
+		docinto sample
+		dodoc -r "${S}"/release/examples
+	fi
+
+	dodoc "${S}"/release/ReadMe.txt
+}
diff --git a/dev-embedded/libftdi/Manifest b/dev-embedded/libftdi/Manifest
index 4f82f27ba19b..d47dc505633a 100644
--- a/dev-embedded/libftdi/Manifest
+++ b/dev-embedded/libftdi/Manifest
@@ -1,2 +1,3 @@
 DIST libftdi-0.20.tar.gz 423570 BLAKE2B f0aa420a704e18c4257b99a4593dbaf46a15806d980b24909fe8678b36e74b568cd5915db1e14f8b904541334fbf3d18f069dc479a0bf66b2ea8e113611cb82b SHA512 540e5eb201a65936c3dbabff70c251deba1615874b11ff27c5ca16c39d71c150cf61758a68b541135a444fe32ab403b0fba0daf55c587647aaf9b3f400f1dee7
 DIST libftdi1-1.4.tar.bz2 109521 BLAKE2B 4186342afb2a0118c454230a925ccff2ed0aedd942cdd3afb1ac59519f1cd48db7f04421ecdb5aa6e53993666a903de00ce447fd81d00839806f8cc0d34c6e52 SHA512 dbab74f7bc35ca835b9c6dd5b70a64816948d65da1f73a9ece37a0f0f630bd0df1a676543acc517b02a718bc34ba4f7a30cbc48b6eed1c154c917f8ef0a358fc
+DIST libftdi1-1.5.tar.bz2 116297 BLAKE2B 460ab93026e14a452e31fcc6930d305638fdc0ed06cb44fb9d50ad8f80199b17057d2f48a27b8295b43b956934289c872a2ef1ddb7f93fa93c6816511ef7607d SHA512 c525b2ab6aff9ef9254971ae7d57f3549a36a36875765c48f947d52532814a2a004de1232389d4fe824a8c8ab84277b08427308573476e1da9b7db83db802f6f
diff --git a/dev-embedded/libftdi/files/libftdi-1.5-tests-no-cxx.patch b/dev-embedded/libftdi/files/libftdi-1.5-tests-no-cxx.patch
new file mode 100644
index 000000000000..6adba408f7f1
--- /dev/null
+++ b/dev-embedded/libftdi/files/libftdi-1.5-tests-no-cxx.patch
@@ -0,0 +1,35 @@
+Fixes failure to build tests with USE="-cxx" (default).
+http://developer.intra2net.com/git/?p=libftdi;a=patch;h=11a50ae5b80b3e03694a19e84513345d0794e563;hp=6dd18122a81e6030dd239391df6ffde8cb8c59c7
+From 11a50ae5b80b3e03694a19e84513345d0794e563 Mon Sep 17 00:00:00 2001
+From: Thomas Jarosch <thomas.jarosch@intra2net.com>
+Date: Mon, 24 Aug 2020 19:27:22 +0200
+Subject: [PATCH 1/1] Fix building unit tests without FTDIPP
+
+Needed to run the baudrate unit tests.
+
+Probably another fallout from:
+
+****************************
+commit 0209a3633dc877a577af07d883eb5059e22f6a91
+
+cmake: do not check for g++ when FTDIPP is disabled
+****************************
+---
+ CMakeLists.txt |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 3b0b87c..58f664a 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -150,6 +150,7 @@ if ( EXAMPLES )
+ endif ()
+ add_subdirectory(packages)
+ if ( BUILD_TESTS )
++  project(libftdi1 C CXX)
+   add_subdirectory(test)
+ endif ()
+ 
+-- 
+1.7.1
+
diff --git a/dev-embedded/libftdi/libftdi-0.20-r1.ebuild b/dev-embedded/libftdi/libftdi-0.20-r1.ebuild
index 08a2dfb65590..c71a110ab82e 100644
--- a/dev-embedded/libftdi/libftdi-0.20-r1.ebuild
+++ b/dev-embedded/libftdi/libftdi-0.20-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-inherit cmake-utils python-single-r1
+inherit cmake python-single-r1
 
 if [[ ${PV} == 9999* ]] ; then
 	inherit git-r3
@@ -19,15 +19,16 @@ HOMEPAGE="https://www.intra2net.com/en/developer/libftdi/"
 
 LICENSE="LGPL-2"
 SLOT="0"
-IUSE="cxx doc examples python"
+IUSE="cxx doc examples python static-libs"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
+BDEPEND="
+	doc? ( app-doc/doxygen )
+	python? ( dev-lang/swig )"
 RDEPEND="virtual/libusb:0
 	cxx? ( dev-libs/boost )
 	python? ( ${PYTHON_DEPS} )"
-DEPEND="${RDEPEND}
-	python? ( dev-lang/swig )
-	doc? ( app-doc/doxygen )"
+DEPEND="${RDEPEND}"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-cmake-include.patch
@@ -48,7 +49,7 @@ src_prepare() {
 		-e '/SET(LIB_SUFFIX /d' \
 		CMakeLists.txt || die
 
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
 
 src_configure() {
@@ -59,23 +60,27 @@ src_configure() {
 		-DPYTHON_BINDINGS=$(usex python)
 		-DCMAKE_SKIP_BUILD_RPATH=ON
 	)
-	cmake-utils_src_configure
+
+	cmake_src_configure
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 	use python && python_optimize
 	dodoc ChangeLog README
 
 	if use doc ; then
 		# Clean up crap man pages. #356369
-		rm -vf "${CMAKE_BUILD_DIR}"/doc/man/man3/{_,usb_,deprecated}*
+		rm -vf "${BUILD_DIR}"/doc/man/man3/{_,usb_,deprecated}* || die
 
-		doman "${CMAKE_BUILD_DIR}"/doc/man/man3/*
-		dodoc -r "${CMAKE_BUILD_DIR}"/doc/html
+		doman "${BUILD_DIR}"/doc/man/man3/*
+		dodoc -r "${BUILD_DIR}"/doc/html
 	fi
+
 	if use examples ; then
 		docinto examples
 		dodoc examples/*.c
 	fi
+
+	use static-libs || rm "${ED}"/usr/$(get_libdir)/${PN}.a || die
 }
diff --git a/dev-embedded/libftdi/libftdi-1.4.ebuild b/dev-embedded/libftdi/libftdi-1.4-r1.ebuild
index 5930ee9e9af8..2d8a18cefadd 100644
--- a/dev-embedded/libftdi/libftdi-1.4.ebuild
+++ b/dev-embedded/libftdi/libftdi-1.4-r1.ebuild
@@ -1,18 +1,19 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-inherit cmake-utils python-single-r1
+inherit cmake python-single-r1
 
-MY_P="${PN}1-${PV}"
 if [[ ${PV} == 9999* ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="git://developer.intra2net.com/${PN}"
 else
+	MY_P="${PN}1-${PV}"
 	SRC_URI="https://www.intra2net.com/en/developer/${PN}/download/${MY_P}.tar.bz2"
 	KEYWORDS="amd64 arm arm64 ~mips ppc ppc64 sparc x86"
+	S=${WORKDIR}/${MY_P}
 fi
 
 DESCRIPTION="Userspace access to FTDI USB interface chips"
@@ -20,52 +21,52 @@ HOMEPAGE="https://www.intra2net.com/en/developer/libftdi/"
 
 LICENSE="LGPL-2"
 SLOT="1"
-IUSE="cxx doc examples python static-libs test tools"
+IUSE="cxx doc examples python test tools"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
-RDEPEND="virtual/libusb:1
+RDEPEND="
+	virtual/libusb:1
 	cxx? ( dev-libs/boost )
 	python? ( ${PYTHON_DEPS} )
 	tools? (
 		!<dev-embedded/ftdi_eeprom-1.0
 		dev-libs/confuse:=
 	)"
-DEPEND="${RDEPEND}
-	python? ( dev-lang/swig )
-	doc? ( app-doc/doxygen )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	doc? ( app-doc/doxygen )
+	python? ( dev-lang/swig )"
 
 pkg_setup() {
 	use python && python-single-r1_pkg_setup
 }
 
-S=${WORKDIR}/${MY_P}
-
 src_configure() {
 	local mycmakeargs=(
 		-DFTDIPP=$(usex cxx)
 		-DDOCUMENTATION=$(usex doc)
 		-DEXAMPLES=$(usex examples)
 		-DPYTHON_BINDINGS=$(usex python)
-		-DSTATICLIBS=$(usex static-libs)
 		-DBUILD_TESTS=$(usex test)
 		-DFTDI_EEPROM=$(usex tools)
+		-DSTATICLIBS=OFF
 		-DCMAKE_SKIP_BUILD_RPATH=ON
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 	use python && python_optimize
 	dodoc AUTHORS ChangeLog README TODO
 
 	if use doc ; then
 		# Clean up crap man pages. #356369
-		rm -vf "${CMAKE_BUILD_DIR}"/doc/man/man3/_* || die
+		rm -vf "${BUILD_DIR}"/doc/man/man3/_* || die
 
-		doman "${CMAKE_BUILD_DIR}"/doc/man/man3/*
-		dodoc -r "${CMAKE_BUILD_DIR}"/doc/html
+		doman "${BUILD_DIR}"/doc/man/man3/*
+		dodoc -r "${BUILD_DIR}"/doc/html
 	fi
 	if use examples ; then
 		docinto examples
diff --git a/dev-embedded/libftdi/libftdi-1.5.ebuild b/dev-embedded/libftdi/libftdi-1.5.ebuild
new file mode 100644
index 000000000000..c54e005bf7ed
--- /dev/null
+++ b/dev-embedded/libftdi/libftdi-1.5.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+inherit cmake python-single-r1
+
+MY_P="${PN}1-${PV}"
+if [[ ${PV} == 9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="git://developer.intra2net.com/${PN}"
+else
+	SRC_URI="https://www.intra2net.com/en/developer/${PN}/download/${MY_P}.tar.bz2"
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+DESCRIPTION="Userspace access to FTDI USB interface chips"
+HOMEPAGE="https://www.intra2net.com/en/developer/libftdi/"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="LGPL-2"
+SLOT="1"
+IUSE="cxx doc examples python test tools"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+BDEPEND="
+	doc? ( app-doc/doxygen )
+	python? ( dev-lang/swig )"
+RDEPEND="
+	virtual/libusb:1
+	cxx? ( dev-libs/boost )
+	python? ( ${PYTHON_DEPS} )
+	tools? (
+		!<dev-embedded/ftdi_eeprom-1.0
+		dev-libs/confuse:=
+	)"
+DEPEND="${RDEPEND}
+	test? ( dev-libs/boost )
+"
+
+PATCHES=( "${FILESDIR}"/${P}-tests-no-cxx.patch )
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DFTDIPP=$(usex cxx)
+		-DDOCUMENTATION=$(usex doc)
+		-DEXAMPLES=$(usex examples)
+		-DPYTHON_BINDINGS=$(usex python)
+		-DBUILD_TESTS=$(usex test)
+		-DFTDI_EEPROM=$(usex tools)
+		-DCMAKE_SKIP_BUILD_RPATH=ON
+		-DSTATICLIBS=OFF
+	)
+	cmake_src_configure
+}
+
+src_test() {
+	cd "${BUILD_DIR}/test" || die
+	./test_libftdi1	-l all || die
+}
+
+src_install() {
+	cmake_src_install
+	use python && python_optimize
+	dodoc AUTHORS ChangeLog README TODO
+
+	if use doc ; then
+		# Clean up crap man pages. #356369
+		rm -vf "${BUILD_DIR}"/doc/man/man3/_* || die
+
+		doman "${BUILD_DIR}"/doc/man/man3/*
+		dodoc -r "${BUILD_DIR}"/doc/html
+	fi
+
+	if use examples ; then
+		docinto examples
+		dodoc examples/*.c
+	fi
+}
diff --git a/dev-embedded/libftdi/libftdi-9999.ebuild b/dev-embedded/libftdi/libftdi-9999.ebuild
index a761f3e9e721..9ab582baaa9d 100644
--- a/dev-embedded/libftdi/libftdi-9999.ebuild
+++ b/dev-embedded/libftdi/libftdi-9999.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-inherit cmake-utils python-single-r1
+inherit cmake python-single-r1
 
 MY_P="${PN}1-${PV}"
 if [[ ${PV} == 9999* ]] ; then
@@ -17,14 +17,19 @@ fi
 
 DESCRIPTION="Userspace access to FTDI USB interface chips"
 HOMEPAGE="https://www.intra2net.com/en/developer/libftdi/"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="LGPL-2"
 SLOT="1"
-IUSE="cxx doc examples python static-libs test tools"
+IUSE="cxx doc examples python test tools"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
-RDEPEND="virtual/libusb:1
+BDEPEND="
+	doc? ( app-doc/doxygen )
+	python? ( dev-lang/swig )"
+RDEPEND="
+	virtual/libusb:1
 	cxx? ( dev-libs/boost )
 	python? ( ${PYTHON_DEPS} )
 	tools? (
@@ -32,41 +37,45 @@ RDEPEND="virtual/libusb:1
 		dev-libs/confuse:=
 	)"
 DEPEND="${RDEPEND}
-	python? ( dev-lang/swig )
-	doc? ( app-doc/doxygen )"
+	test? ( dev-libs/boost )
+"
 
 pkg_setup() {
 	use python && python-single-r1_pkg_setup
 }
 
-S=${WORKDIR}/${MY_P}
-
 src_configure() {
 	local mycmakeargs=(
 		-DFTDIPP=$(usex cxx)
 		-DDOCUMENTATION=$(usex doc)
 		-DEXAMPLES=$(usex examples)
 		-DPYTHON_BINDINGS=$(usex python)
-		-DSTATICLIBS=$(usex static-libs)
 		-DBUILD_TESTS=$(usex test)
 		-DFTDI_EEPROM=$(usex tools)
 		-DCMAKE_SKIP_BUILD_RPATH=ON
+		-DSTATICLIBS=OFF
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
+}
+
+src_test() {
+	cd "${BUILD_DIR}/test" || die
+	./test_libftdi1	-l all || die
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 	use python && python_optimize
 	dodoc AUTHORS ChangeLog README TODO
 
 	if use doc ; then
 		# Clean up crap man pages. #356369
-		rm -vf "${CMAKE_BUILD_DIR}"/doc/man/man3/_* || die
+		rm -vf "${BUILD_DIR}"/doc/man/man3/_* || die
 
-		doman "${CMAKE_BUILD_DIR}"/doc/man/man3/*
-		dodoc -r "${CMAKE_BUILD_DIR}"/doc/html
+		doman "${BUILD_DIR}"/doc/man/man3/*
+		dodoc -r "${BUILD_DIR}"/doc/html
 	fi
+
 	if use examples ; then
 		docinto examples
 		dodoc examples/*.c
diff --git a/dev-embedded/nodemcu-uploader/metadata.xml b/dev-embedded/nodemcu-uploader/metadata.xml
index 53ea1e716a0d..964d0a8d4e40 100644
--- a/dev-embedded/nodemcu-uploader/metadata.xml
+++ b/dev-embedded/nodemcu-uploader/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>rafaelmartins@gentoo.org</email>
-		<name>Rafael G. Martins</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="pypi">nodemcu-uploader</remote-id>
 		<remote-id type="github">kmpm/nodemcu-uploader</remote-id>
diff --git a/dev-embedded/openocd/Manifest b/dev-embedded/openocd/Manifest
index d245d5b1033e..58dcefd97178 100644
--- a/dev-embedded/openocd/Manifest
+++ b/dev-embedded/openocd/Manifest
@@ -1,2 +1 @@
 DIST openocd-0.10.0.tar.gz 6124274 BLAKE2B 3b455fce6c62626b507e8609789e95e6a542038605423400d08ad2d14d6db0953194bb22d893e3919c79ef02a1b43ccb6396d3370273e375d340c41b587bdfbf SHA512 44b303b0df1d7c13bc18b8995493de64fed7a853704455d484dfc4a74a1ba4b0d42b4679a7009ec015dc71c47152e5556a1a02665cfafe7af80c608b68d8310a
-DIST openocd-0.9.0.tar.gz 4970346 BLAKE2B 96421b32a3e64fc1ed362288f5a444cc1249f3d6daab6307f920c86fff11cb74a0bbb9f021788b848a8755139ee1c43c54793ac57a429f4e39df47f0775c2538 SHA512 698b43867f8134da43a50f5d2ff2ae33b71df8ccffc45fb5c3d0bd7a6289fcd9e7bb3d89287ad4dbdb02e1871db69f3913db950965335eaf8559247f2e58c227
diff --git a/dev-embedded/openocd/files/openocd-0.10.0-fno-common.patch b/dev-embedded/openocd/files/openocd-0.10.0-fno-common.patch
new file mode 100644
index 000000000000..c924b2f8fec0
--- /dev/null
+++ b/dev-embedded/openocd/files/openocd-0.10.0-fno-common.patch
@@ -0,0 +1,11 @@
+--- a/src/jtag/drivers/bitbang.h
++++ b/src/jtag/drivers/bitbang.h
+@@ -35,7 +35,7 @@ struct bitbang_interface {
+ 	void (*swdio_drive)(bool on);
+ };
+ 
+-const struct swd_driver bitbang_swd;
++extern const struct swd_driver bitbang_swd;
+ 
+ extern bool swd_mode;
+ 
diff --git a/dev-embedded/openocd/files/openocd-0.10.0-gcc10.patch b/dev-embedded/openocd/files/openocd-0.10.0-gcc10.patch
new file mode 100644
index 000000000000..b7e3ea13bfb0
--- /dev/null
+++ b/dev-embedded/openocd/files/openocd-0.10.0-gcc10.patch
@@ -0,0 +1,36 @@
+https://bugs.gentoo.org/722640
+http://openocd.zylin.com/gitweb?p=openocd.git;a=commitdiff;h=c60252ac2b636c4d99b766a574b9df0966151696
+From c60252ac2b636c4d99b766a574b9df0966151696 Mon Sep 17 00:00:00 2001
+From: Andreas Fritiofson <andreas.fritiofson@gmail.com>
+Date: Fri, 17 Apr 2020 13:49:28 +0200
+Subject: [PATCH] bitbang: Fix FTBFS with GCC 10
+
+GCC 10 defaults to -fno-common which breaks the sharing of bitbang_swd
+struct between bitbang drivers due to a missing extern.
+
+Change-Id: I2b4122f7939cec91a72284006748f99a23548324
+Signed-off-by: Andreas Fritiofson <andreas.fritiofson@gmail.com>
+Reviewed-on: http://openocd.zylin.com/5592
+Tested-by: jenkins
+Reviewed-by: Antonio Borneo <borneo.antonio@gmail.com>
+Reviewed-by: Jonathan McDowell <noodles-openocd@earth.li>
+---
+ src/jtag/drivers/bitbang.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/jtag/drivers/bitbang.h b/src/jtag/drivers/bitbang.h
+index edb779c..bbbc693 100644
+--- a/src/jtag/drivers/bitbang.h
++++ b/src/jtag/drivers/bitbang.h
+@@ -56,7 +56,7 @@ struct bitbang_interface {
+ 	void (*swdio_drive)(bool on);
+ };
+ 
+-const struct swd_driver bitbang_swd;
++extern const struct swd_driver bitbang_swd;
+ 
+ extern bool swd_mode;
+ 
+-- 
+1.9.1
+
diff --git a/dev-embedded/openocd/openocd-0.10.0-r1.ebuild b/dev-embedded/openocd/openocd-0.10.0-r1.ebuild
index 3ff79b542bd2..3f1984002dbe 100644
--- a/dev-embedded/openocd/openocd-0.10.0-r1.ebuild
+++ b/dev-embedded/openocd/openocd-0.10.0-r1.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
+EAPI=7
 
-inherit eutils multilib flag-o-matic toolchain-funcs udev
+inherit udev
 
-# One ebuild to rule them all
 if [[ ${PV} == *9999 ]] ; then
 	inherit autotools git-r3
-	EGIT_REPO_URI="https://git.code.sf.net/p/${PN}/code"
+	EGIT_REPO_URI="	https://repo.or.cz/openocd.git"
 else
 	MY_PV="${PV/_/-}"
 	MY_P="${PN}-${MY_PV}"
@@ -36,106 +35,68 @@ RDEPEND="
 	)
 	ftdi? ( dev-embedded/libftdi:= )"
 
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-[[ ${PV} == "9999" ]] && DEPEND+=" >=sys-apps/texinfo-5" #549946
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}"/${P}-fno-common.patch )
+
+PATCHES=(
+	"${FILESDIR}/${P}-gcc10.patch"
+)
 
 src_prepare() {
 	default
 
-	if [[ ${PV} == "9999" ]] ; then
+	if [[ ${PV} == *9999 ]] ; then
 		AT_NO_RECURSIVE=yes eautoreconf
 	fi
 }
 
 src_configure() {
-	# Here are some defaults
 	local myconf=(
-		--enable-buspirate
-		--disable-werror
-		--disable-internal-jimtcl
-		--disable-internal-libjaylink
 		--enable-amtjtagaccel
-		--enable-ep93xx
+		--enable-arm-jtag-ew
 		--enable-at91rm9200
+		--enable-bcm2835gpio
+		--enable-buspirate
+		--enable-ep93xx
 		--enable-gw16012
-		--enable-arm-jtag-ew
 		--enable-sysfsgpio
-		--enable-bcm2835gpio
+		--disable-internal-jimtcl
+		--disable-internal-libjaylink
+		--disable-werror
+		$(use_enable cmsis-dap)
+		$(use_enable dummy)
+		$(use_enable ftdi openjtag)
+		$(use_enable ftdi presto)
+		$(use_enable ftdi usb-blaster)
+		$(use_enable jlink)
+		$(use_enable parport)
+		$(use_enable parport parport_ppdev)
+		$(use_enable usb aice)
+		$(use_enable usb armjtagew)
+		$(use_enable usb ftdi)
+		$(use_enable usb osbdm)
+		$(use_enable usb opendous)
+		$(use_enable usb rlink)
+		$(use_enable usb stlink)
+		$(use_enable usb ti-icdi)
+		$(use_enable usb usbprog)
+		$(use_enable usb usb-blaster-2)
+		$(use_enable usb ulink)
+		$(use_enable usb vsllink)
+		$(use_enable verbose-io verbose-jtag-io)
+		$(use_enable verbose-io verbose-usb-io)
+		$(use_enable verbose-io verbose_usb_comms)
 	)
 
-	# Adapters requiring usb/libusb-1.X support
-	if use usb; then
-		myconf+=(
-			--enable-aice
-			--enable-usb-blaster-2
-			--enable-ftdi
-			--enable-ti-icdi
-			--enable-ulink
-			--enable-osbdm
-			--enable-opendous
-			--enable-usbprog
-			--enable-rlink
-			--enable-stlink
-			--enable-vsllink
-			--enable-armjtagew
-			$(use_enable verbose-io verbose-usb-io)
-			$(use_enable verbose-io verbose_usb_comms)
-		)
-	else
-		myconf+=(
-			--disable-aice
-			--disable-usb-blaster-2
-			--disable-ftdi
-			--disable-ti-icdi
-			--disable-ulink
-			--disable-osbdm
-			--disable-opendous
-			--disable-usbprog
-			--disable-rlink
-			--disable-stlink
-			--disable-vsllink
-			--disable-armjtagew
-		)
-	fi
-
-	if use jlink; then
-		myconf+=(
-			--enable-jlink
-		)
-	else
-		myconf+=(
-			--disable-jlink
-		)
-	fi
-
-	if use ftdi; then
-		myconf+=(
-			--enable-usb-blaster
-			--enable-openjtag
-			--enable-presto
-		)
-	else
-		myconf+=(
-			--disable-openjtag
-			--disable-presto
-			--disable-usb-blaster
-		)
-	fi
-
-	econf \
-		$(use_enable dummy) \
-		$(use_enable cmsis-dap) \
-		$(use_enable parport) \
-		$(use_enable parport parport_ppdev) \
-		$(use_enable verbose-io verbose-jtag-io) \
-		"${myconf[@]}"
+	econf "${myconf[@]}"
 }
 
 src_install() {
 	default
 	dostrip /usr/bin
-	udev_dorules "${D}"/usr/share/${PN}/contrib/*.rules
+	udev_dorules "${ED}"/usr/share/${PN}/contrib/*.rules
 }
 
 pkg_postinst() {
diff --git a/dev-embedded/openocd/openocd-0.9.0.ebuild b/dev-embedded/openocd/openocd-0.9.0.ebuild
deleted file mode 100644
index c5b465544b1f..000000000000
--- a/dev-embedded/openocd/openocd-0.9.0.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils multilib flag-o-matic toolchain-funcs udev
-
-# One ebuild to rule them all
-if [[ ${PV} == *9999 ]] ; then
-	inherit autotools git-r3
-	EGIT_REPO_URI="https://git.code.sf.net/p/${PN}/code"
-else
-	MY_PV="${PV/_/-}"
-	MY_P="${PN}-${MY_PV}"
-	S="${WORKDIR}"/${MY_P}
-	KEYWORDS="~amd64 ~arm ~x86"
-	SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${MY_PV}/${MY_P}.tar.gz"
-fi
-
-DESCRIPTION="OpenOCD - Open On-Chip Debugger"
-HOMEPAGE="https://sourceforge.net/projects/openocd/"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="cmsis-dap dummy ftdi parport +usb verbose-io"
-RESTRICT="strip" # includes non-native binaries
-
-RDEPEND="
-	acct-group/plugdev
-	>=dev-lang/jimtcl-0.76
-	cmsis-dap? ( dev-libs/hidapi )
-	usb? (
-		virtual/libusb:0
-		virtual/libusb:1
-	)
-	ftdi? ( dev-embedded/libftdi:= )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	epatch_user
-
-	if [[ ${PV} == "9999" ]] ; then
-		AT_NO_RECURSIVE=yes eautoreconf
-	fi
-}
-
-src_configure() {
-	# Here are some defaults
-	local myconf=(
-		--enable-buspirate
-		--disable-werror
-		--disable-internal-jimtcl
-		--enable-amtjtagaccel
-		--enable-ep93xx
-		--enable-at91rm9200
-		--enable-gw16012
-		--enable-oocd_trace
-		--enable-arm-jtag-ew
-		--enable-sysfsgpio
-		--enable-bcm2835gpio
-	)
-
-	# Adapters requiring usb/libusb-1.X support
-	if use usb; then
-		myconf+=(
-			--enable-aice
-			--enable-usb-blaster-2
-			--enable-ftdi
-			--enable-ti-icdi
-			--enable-ulink
-			--enable-osbdm
-			--enable-opendous
-			--enable-usbprog
-			--enable-jlink
-			--enable-rlink
-			--enable-stlink
-			--enable-vsllink
-			--enable-armjtagew
-			$(use_enable verbose-io verbose-usb-io)
-			$(use_enable verbose-io verbose_usb_comms)
-		)
-	else
-		myconf+=(
-			--disable-aice
-			--disable-usb-blaster-2
-			--disable-ftdi
-			--disable-ti-icdi
-			--disable-ulink
-			--disable-osbdm
-			--disable-opendous
-			--disable-usbprog
-			--disable-jlink
-			--disable-rlink
-			--disable-stlink
-			--disable-vsllink
-			--disable-armjtagew
-		)
-	fi
-
-	if use ftdi; then
-		myconf+=(
-			--enable-usb_blaster_libftdi
-			--enable-openjtag_ftdi
-			--enable-presto_libftdi
-		)
-	else
-		myconf+=(
-			--disable-openjtag_ftdi
-			--disable-presto_libftdi
-			--disable-usb_blaster_libftdi
-		)
-	fi
-
-	econf \
-		$(use_enable dummy) \
-		$(use_enable cmsis-dap) \
-		$(use_enable parport) \
-		$(use_enable parport parport_ppdev) \
-		$(use_enable verbose-io verbose-jtag-io) \
-		"${myconf[@]}"
-}
-
-src_install() {
-	default
-	udev_dorules "${D}"/usr/share/${PN}/contrib/*.rules
-}
-
-pkg_postinst() {
-	elog "To access openocd devices as user you must be in the plugdev group"
-}
diff --git a/dev-embedded/openocd/openocd-9999.ebuild b/dev-embedded/openocd/openocd-9999.ebuild
index d098f2e20c50..6ea2fa49994f 100644
--- a/dev-embedded/openocd/openocd-9999.ebuild
+++ b/dev-embedded/openocd/openocd-9999.ebuild
@@ -1,14 +1,13 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
+EAPI=7
 
-inherit eutils multilib flag-o-matic toolchain-funcs udev
+inherit udev
 
-# One ebuild to rule them all
 if [[ ${PV} == *9999 ]] ; then
 	inherit autotools git-r3
-	EGIT_REPO_URI="https://git.code.sf.net/p/${PN}/code"
+	EGIT_REPO_URI="	https://repo.or.cz/openocd.git"
 else
 	MY_PV="${PV/_/-}"
 	MY_P="${PN}-${MY_PV}"
@@ -29,113 +28,71 @@ RDEPEND="
 	acct-group/plugdev
 	>=dev-lang/jimtcl-0.76:0=
 	cmsis-dap? ( dev-libs/hidapi )
-	jlink? ( >=dev-embedded/libjaylink-0.2 )
+	jlink? ( >=dev-embedded/libjaylink-0.2.0 )
 	usb? (
 		virtual/libusb:0
 		virtual/libusb:1
 	)
 	ftdi? ( dev-embedded/libftdi:= )"
 
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
+	sys-apps/texinfo
 	virtual/pkgconfig"
-[[ ${PV} == "9999" ]] && DEPEND+=" >=sys-apps/texinfo-5" #549946
 
 src_prepare() {
 	default
 
-	if [[ ${PV} == "9999" ]] ; then
+	if [[ ${PV} == *9999 ]] ; then
 		AT_NO_RECURSIVE=yes eautoreconf
 	fi
 }
 
 src_configure() {
-	# Here are some defaults
 	local myconf=(
-		--enable-buspirate
-		--disable-werror
-		--disable-internal-jimtcl
-		--disable-internal-libjaylink
 		--enable-amtjtagaccel
-		--enable-ep93xx
+		--enable-arm-jtag-ew
 		--enable-at91rm9200
+		--enable-bcm2835gpio
+		--enable-buspirate
+		--enable-ep93xx
 		--enable-gw16012
-		--enable-arm-jtag-ew
 		--enable-sysfsgpio
-		--enable-bcm2835gpio
+		--disable-internal-jimtcl
+		--disable-internal-libjaylink
+		--disable-werror
+		$(use_enable cmsis-dap)
+		$(use_enable dummy)
+		$(use_enable ftdi openjtag)
+		$(use_enable ftdi presto)
+		$(use_enable ftdi usb-blaster)
+		$(use_enable jlink)
+		$(use_enable parport)
+		$(use_enable parport parport_ppdev)
+		$(use_enable usb aice)
+		$(use_enable usb armjtagew)
+		$(use_enable usb ftdi)
+		$(use_enable usb osbdm)
+		$(use_enable usb opendous)
+		$(use_enable usb rlink)
+		$(use_enable usb stlink)
+		$(use_enable usb ti-icdi)
+		$(use_enable usb usbprog)
+		$(use_enable usb usb-blaster-2)
+		$(use_enable usb ulink)
+		$(use_enable usb vsllink)
+		$(use_enable verbose-io verbose-jtag-io)
+		$(use_enable verbose-io verbose-usb-io)
+		$(use_enable verbose-io verbose_usb_comms)
 	)
 
-	# Adapters requiring usb/libusb-1.X support
-	if use usb; then
-		myconf+=(
-			--enable-aice
-			--enable-usb-blaster-2
-			--enable-ftdi
-			--enable-ti-icdi
-			--enable-ulink
-			--enable-osbdm
-			--enable-opendous
-			--enable-usbprog
-			--enable-rlink
-			--enable-stlink
-			--enable-vsllink
-			--enable-armjtagew
-			$(use_enable verbose-io verbose-usb-io)
-			$(use_enable verbose-io verbose_usb_comms)
-		)
-	else
-		myconf+=(
-			--disable-aice
-			--disable-usb-blaster-2
-			--disable-ftdi
-			--disable-ti-icdi
-			--disable-ulink
-			--disable-osbdm
-			--disable-opendous
-			--disable-usbprog
-			--disable-rlink
-			--disable-stlink
-			--disable-vsllink
-			--disable-armjtagew
-		)
-	fi
-
-	if use jlink; then
-		myconf+=(
-			--enable-jlink
-		)
-	else
-		myconf+=(
-			--disable-jlink
-		)
-	fi
-
-	if use ftdi; then
-		myconf+=(
-			--enable-usb-blaster
-			--enable-openjtag
-			--enable-presto
-		)
-	else
-		myconf+=(
-			--disable-openjtag
-			--disable-presto
-			--disable-usb-blaster
-		)
-	fi
-
-	econf \
-		$(use_enable dummy) \
-		$(use_enable cmsis-dap) \
-		$(use_enable parport) \
-		$(use_enable parport parport_ppdev) \
-		$(use_enable verbose-io verbose-jtag-io) \
-		"${myconf[@]}"
+	econf "${myconf[@]}"
 }
 
 src_install() {
 	default
 	dostrip /usr/bin
-	udev_dorules "${D}"/usr/share/${PN}/contrib/*.rules
+	udev_dorules "${ED}"/usr/share/${PN}/contrib/*.rules
 }
 
 pkg_postinst() {
diff --git a/dev-embedded/rpi-eeprom/Manifest b/dev-embedded/rpi-eeprom/Manifest
index 781173b77940..557fe23fbd63 100644
--- a/dev-embedded/rpi-eeprom/Manifest
+++ b/dev-embedded/rpi-eeprom/Manifest
@@ -2,3 +2,5 @@ DIST rpi-eeprom_10.2-1.debian.tar.xz 7360 BLAKE2B e7959c4de4f3675632f0897b6f8abc
 DIST rpi-eeprom_10.2.orig.tar.gz 7415652 BLAKE2B b1f56263c0037b2ba3bac2aecd9b5736736cf599bc68a743c065c853a20f56f18984816fdfb402bb499c3aa911dbe72376cec4647d87406cce2f4328b04cc2b1 SHA512 ea76a157ed57984fb0667e9171e3fbf7dba180e014faa9352b0c1904531dca9528b0e3204645a4af2b550670a52354b6b1be6af27e190d4523d8044f3349aa73
 DIST rpi-eeprom_10.3-1.debian.tar.xz 10188 BLAKE2B 284a5465f2b5bc28c95135b8869218e83cbea9d0667b165de954f5c73549dfc190ddc838d956eec4c569c579e95ffc157054c6ed4bbd45e8ae88f786675cb164 SHA512 ead6b6c51d03493479c242e757edfc33bfdba4627f7501d90d0a181e8adc68f1503e0dac900b9b253a7286523f84d0e9afd8460d72f30b3ee8ee75b2f76811ab
 DIST rpi-eeprom_10.3.orig.tar.gz 7635402 BLAKE2B 3153eda08eada4c9e4f05d7a68ac4661413591314c4980e16ee876d49e756e2e13a101765b579adbe51e0e3b88cdfe419b71a58da858250781e0f292220dc397 SHA512 ea5a6ae47be5052b4793161d891a1e3a72dda951c95f15797d7baf68d475fcec1250638e4c43a32578ceef10563ebce052e746bc8fc60f8cf8d90780d5a7e8a7
+DIST rpi-eeprom_11.0-1.debian.tar.xz 10248 BLAKE2B a83230dc13ce296963ed206725d465a69536f5cd23f52076fda2601ceea06354f365e1f8b2d9a93a4396826b5e9d9ab5ad40fd6336116e693419fd3b4630b5e1 SHA512 939fa16fbd8c21340ca77cc74f3cee22772d25cd6dcb70c178d70c1762ae9b9acb9e7a070b2c3a7f114841712142284c1f2bdb23fb528a229507d8eae6477c84
+DIST rpi-eeprom_11.0.orig.tar.gz 8075596 BLAKE2B ccbd895de728566bfb0402c2378f6eb13f88948490e14f1e251f6440f3ef31879ea66c0fe94761e1abf40a23924742e8c2f33c49200e710542131091b223b292 SHA512 0ea2971b752a53a4529b2c3d3b814b9e743440397f8c4d21c9a06493561a37bc8cd8c0adaaab389f41b1697584d12641f49d7a93d6541f9dda3bba5d6dd1371c
diff --git a/dev-embedded/rpi-eeprom/rpi-eeprom-11.0_p1.ebuild b/dev-embedded/rpi-eeprom/rpi-eeprom-11.0_p1.ebuild
new file mode 100644
index 000000000000..9e541ab8e982
--- /dev/null
+++ b/dev-embedded/rpi-eeprom/rpi-eeprom-11.0_p1.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+
+inherit python-r1 systemd
+
+DESCRIPTION="Updater for Raspberry Pi 4 bootloader and the VL805 USB controller"
+HOMEPAGE="https://github.com/raspberrypi/rpi-eeprom/"
+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"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+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
+	)"
+
+src_prepare() {
+	default
+	sed -i \
+		-e 's:/etc/default/rpi-eeprom-update:/etc/conf.d/rpi-eeprom-update:' \
+		"${MY_P}/rpi-eeprom-update" || die "Failed sed on rpi-eeprom-update"
+	sed -i \
+		-e 's:/usr/bin/rpi-eeprom-update:/usr/sbin/rpi-eeprom-update:' \
+		"debian/rpi-eeprom.rpi-eeprom-update.service" || die "Failed sed on rpi-eeprom.rpi-eeprom-update.service"
+}
+
+src_install() {
+	pushd "${MY_P}" 1>/dev/null || die "Cannot change into directory ${MY_P}"
+
+	python_scriptinto /usr/sbin
+	python_foreach_impl python_newscript rpi-eeprom-config rpi-eeprom-config
+
+	dosbin rpi-eeprom-update
+	keepdir /var/lib/raspberrypi/bootloader/backup
+
+	for dir in critical stable beta; do
+		insinto /lib/firmware/raspberrypi/bootloader
+		doins -r firmware/${dir}
+	done
+
+	dodoc firmware/release-notes.md
+
+	help2man -N \
+		--version-string="${PV}" --help-option="-h" \
+		--name="Bootloader EEPROM configuration tool for the Raspberry Pi 4B" \
+		--output=rpi-eeprom-config.1 ./rpi-eeprom-config || die "Failed to create manpage for rpi-eeprom-config"
+
+	help2man -N \
+		--version-string="${PV}" --help-option="-h" \
+		--name="Checks whether the Raspberry Pi bootloader EEPROM is \
+			up-to-date and updates the EEPROM" \
+		 --output=rpi-eeprom-update.1 ./rpi-eeprom-update || die "Failed to create manpage for rpi-eeprom-update"
+
+	doman rpi-eeprom-update.1 rpi-eeprom-config.1
+
+	newconfd rpi-eeprom-update-default rpi-eeprom-update
+
+	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 || die
+
+	newinitd "${FILESDIR}/init.d_rpi-eeprom-update-1" "rpi-eeprom-update"
+}
+
+pkg_postinst() {
+	elog 'To have rpi-eeprom-update run at each startup, enable and start either'
+	elog '/etc/init.d/rpi-eeprom-update (for openrc users)'
+	elog 'or'
+	elog 'rpi-eeprom-update.service (for systemd users)'
+	elog '/etc/conf.d/rpi-eeprom-update contains the configuration.'
+	elog 'FIRMWARE_RELEASE_STATUS="critical|stable|beta" determines'
+	elog 'which release track you get. "critical" is recommended and the default.'
+}
diff --git a/dev-embedded/u-boot-tools/u-boot-tools-2020.04-r2.ebuild b/dev-embedded/u-boot-tools/u-boot-tools-2020.04-r2.ebuild
index adb1cbbb220a..d387a3bf6e79 100644
--- a/dev-embedded/u-boot-tools/u-boot-tools-2020.04-r2.ebuild
+++ b/dev-embedded/u-boot-tools/u-boot-tools-2020.04-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -12,7 +12,7 @@ SRC_URI="ftp://ftp.denx.de/pub/u-boot/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm ~arm64 ~ppc64 ~riscv x86"
 IUSE=""
 
 BDEPEND="
diff --git a/dev-embedded/urjtag/Manifest b/dev-embedded/urjtag/Manifest
index 99d2979b368e..571057fe5f91 100644
--- a/dev-embedded/urjtag/Manifest
+++ b/dev-embedded/urjtag/Manifest
@@ -1 +1,2 @@
 DIST urjtag-0.10.tar.bz2 959834 BLAKE2B 9901156fb32372de77b3145cdef3f224b95d79d8f981435a41baf8bf1d7cd4353fcb52c60e3b936b59c3347dc485060ada58e87d7e1d4f6137ae12cd07124226 SHA512 245fc276793dbc7791be0989b75beba7f16e8543f35403d645aadcee8d8d613261509392da7e5dd97e5a2de6e87b18276c394cc6353f01e5d1d4907ffb5811ff
+DIST urjtag-2019.12.tar.xz 1208432 BLAKE2B 69963cbd39dcbec1abd73778fc6e98d743e36f6d4a17ba673b8691598ac0d4cec97e8b9c79068ad8971e6e07de81553bfd3bf5f684515b4a19303dd95ed477a2 SHA512 e149e53410a6591bdadc2c0138c6f81dac0fd6e35601461e19d356decdb820ec8e6bd53d59a1fd9781dfa1fee88d23dcafbd8df9adc0f8e51256c626d2ee0f36
diff --git a/dev-embedded/urjtag/urjtag-2019.12.ebuild b/dev-embedded/urjtag/urjtag-2019.12.ebuild
new file mode 100644
index 000000000000..ffe16b68f7d7
--- /dev/null
+++ b/dev-embedded/urjtag/urjtag-2019.12.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="git://git.code.sf.net/p/urjtag/git"
+	inherit git-r3 autotools
+	S="${WORKDIR}/${P}/${PN}"
+else
+	SRC_URI="mirror://sourceforge/urjtag/${P}.tar.xz"
+	KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+fi
+
+DESCRIPTION="Tool for communicating over JTAG with flash chips, CPUs, and many more"
+HOMEPAGE="https://sourceforge.net/projects/urjtag/"
+
+LICENSE="GPL-2"
+SLOT="0"
+# TODO: Figure out if anyone wants the Python bindings
+IUSE="ftdi ftd2xx readline usb"
+
+DEPEND="ftdi? ( dev-embedded/libftdi:1= )
+	ftd2xx? ( dev-embedded/libftd2xx )
+	readline? ( sys-libs/readline:= )
+	usb? ( virtual/libusb:1 )"
+RDEPEND="${DEPEND}
+	!dev-embedded/jtag"
+
+src_prepare() {
+	default
+
+	if [[ ${PV} == "9999" ]] ; then
+		mkdir -p m4 || die
+		eautopoint
+		eautoreconf
+	fi
+}
+
+src_configure() {
+	econf \
+		--disable-werror \
+		--disable-python \
+		--disable-static \
+		$(use_with readline) \
+		$(use_with ftdi libftdi) \
+		$(use_with ftd2xx) \
+		$(use_with usb libusb 1.0)
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/dev-embedded/urjtag/urjtag-9999.ebuild b/dev-embedded/urjtag/urjtag-9999.ebuild
index 38d8080593c7..8232ff3c6ce5 100644
--- a/dev-embedded/urjtag/urjtag-9999.ebuild
+++ b/dev-embedded/urjtag/urjtag-9999.ebuild
@@ -1,18 +1,15 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# TODO: figure out htf to make python.eclass work
+EAPI=7
 
-EAPI="5"
-
-inherit eutils ltprune multilib
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="git://git.code.sf.net/p/urjtag/git"
 	inherit git-r3 autotools
-	S=${WORKDIR}/${P}/${PN}
+	S="${WORKDIR}/${P}/${PN}"
 else
-	SRC_URI="mirror://sourceforge/urjtag/${P}.tar.bz2"
-	KEYWORDS="amd64 ppc sparc x86"
+	SRC_URI="mirror://sourceforge/urjtag/${P}.tar.xz"
+	KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 fi
 
 DESCRIPTION="Tool for communicating over JTAG with flash chips, CPUs, and many more"
@@ -20,37 +17,36 @@ HOMEPAGE="https://sourceforge.net/projects/urjtag/"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="ftd2xx ftdi readline static-libs usb"
+# TODO: Figure out if anyone wants the Python bindings
+IUSE="ftdi readline usb"
 
-DEPEND="ftdi? ( dev-embedded/libftdi:= )
-	ftd2xx? ( dev-embedded/libftd2xx )
+DEPEND="ftdi? ( dev-embedded/libftdi:1 )
 	readline? ( sys-libs/readline:= )
 	usb? ( virtual/libusb:1 )"
 RDEPEND="${DEPEND}
 	!dev-embedded/jtag"
 
 src_prepare() {
+	default
+
 	if [[ ${PV} == "9999" ]] ; then
-		mkdir -p m4
+		mkdir -p m4 || die
 		eautopoint
 		eautoreconf
 	fi
 }
 
 src_configure() {
-	use ftd2xx && LDFLAGS="${LDFLAGS} -L/opt/$(get_libdir)"
+	use readline || export vl_cv_lib_readline=no
 
 	econf \
 		--disable-werror \
 		--disable-python \
-		$(use_with readline) \
 		$(use_with ftdi libftdi) \
-		$(use_with ftd2xx) \
-		$(use_enable static-libs static) \
-		$(use_with usb libusb 1.0)
+		$(use_with usb libusb)
 }
 
 src_install() {
 	default
-	prune_libtool_files
+	find "${ED}" -name '*.la' -delete || die
 }