gentoo resync : 08.10.2021

17 files changed, 67 insertions, 332 deletions

diff --git a/dev-embedded/Manifest.gz b/dev-embedded/Manifest.gz
index 4733f93435c8..f3979c1d08b5 100644
--- a/dev-embedded/Manifest.gz
+++ b/dev-embedded/Manifest.gz
diff --git a/dev-embedded/avrdude/Manifest b/dev-embedded/avrdude/Manifest
index 42d4bbc4b14a..3e3b68b74ce3 100644
--- a/dev-embedded/avrdude/Manifest
+++ b/dev-embedded/avrdude/Manifest
@@ -1,6 +1,6 @@
 DIST avrdude-6.3.tar.gz 909744 BLAKE2B 3c253571a50c423989fc3fd9c5d6fe11b67fad9ca0d94f4bee0de7309fc22ccfe64102fff74fad47ffcb1874870c0aafd0c003df63285bd05c30efd384f5ef9e SHA512 b671008388d6a552e71066fec46429bc7f6639e8eac41113bcbba5a56212b78be31fcf04956b31e11c6b14888b0f6e825f7458395b9ff4fc28406074c7ded2b2
 DIST avrdude-doc-6.3.pdf 255521 BLAKE2B 3b6a3485b996f0923c00c54970e86c3ab9f40e8a5bd962f5d3e4f87c23c90b61f002b46af9766cc0f117583a54d519c5d8739cb5f8bca0776320243679989716 SHA512 f33b15f6a9247f6646ba8a861f1e86f5d43b1b44438fb95bd53764a73f0c450f669dcb43b6b587390ddbc22dafa02758ddc330a7aab1651ccca7c8da8e00b755
 DIST avrdude-doc-6.3.tar.gz 39823 BLAKE2B 170ad1eab743435eb414a2d6547be6c86e4d75aed83836eb29285a8d11a43f7eb878104b3b7a70b528522a415a96a841686d07e82b151fc6f726c1f56d54e801 SHA512 b7abd9d0068d2933a1907655832930c455093b4ffbdc2b6fb2405a821cad0ba1c4de3aa5fa0ea7c9b53d06cfa6d5b5658d30a18a4f5c3884d0e15c171a097b29
+EBUILD avrdude-6.3-r1.ebuild 1353 BLAKE2B 655516a277ebba8fbaebc6d128590e65d2cf6902c500e662967c3b80c8f45a3873c1bda2af660b1cc23a9ad2a2b7768a40b420f53ba9b4df883793dad25e2650 SHA512 e08cbb6bfe256816826045a361f5ef85cb2b8628a5645697c5893505c72aab73eb2c27fc8f189a811f5e3c31946f87725a14da8b4eceb6524f4af9230b451568
 EBUILD avrdude-6.3.ebuild 1502 BLAKE2B 514c81ae042089508addc0799707b8c42b3ed042d94a5d301b2d80a8f390a653dce24f770dae0d13a0837a7df37ad237ac8d8625429019537e5038cfd78e8c0e SHA512 9b4e51be693bb57def7829575bf828c8932c7d957152fd3e624a608d0aee2a632026d376fbbe73ef7c1fc4cd8d79fe529b9804693654791719670588a28597d3
-EBUILD avrdude-9999.ebuild 1657 BLAKE2B 469afb25a0e29d0c7175975b009b0325a6f8deb7a3dfd7e02b692547c948a82396b89fdd615ee676f8b232fd8249292844eb1bfc548f2f1f25ce564ef35acd89 SHA512 753c1608a0af54645c7675d2527d19e3880fc6c26a8ca057893c7985860860bc2d59c294cb5ed8e8c049b2bacec45e8e5a7069da00d3d75c5b6730fad84ffe8c
 MISC metadata.xml 364 BLAKE2B de7d28e39ecb3d05075b85fd66181ffe3a874623efd4cb9a99f9a16b467ca0c1a3d8fa7895b7e33c75162428b08774f5f89474e5b6f167817f5a384b8d9ceb88 SHA512 d15e0de55e3b8e8878ffdcde4fd7a6ae06a8fcd2e30ed0aa7fc5480a8b987edadafa6fc20e4b683c4c8d121192284c7daba4ace47f39c0713f4f0e6fe728924c
diff --git a/dev-embedded/avrdude/avrdude-9999.ebuild b/dev-embedded/avrdude/avrdude-6.3-r1.ebuild
index 22e68dc39daf..eedc4b7b5069 100644
--- a/dev-embedded/avrdude/avrdude-9999.ebuild
+++ b/dev-embedded/avrdude/avrdude-6.3-r1.ebuild
@@ -1,48 +1,33 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
-inherit autotools subversion toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="AVR Downloader/UploaDEr"
 HOMEPAGE="https://savannah.nongnu.org/projects/avrdude"
-ESVN_REPO_URI="svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude"
-MY_DOC_PV=6.3
-SRC_URI="
+SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz
 	doc? (
-		mirror://nongnu/${PN}/${PN}-doc-${MY_DOC_PV}.tar.gz
-		mirror://nongnu/${PN}/${PN}-doc-${MY_DOC_PV}.pdf
+		mirror://nongnu/${PN}/${PN}-doc-${PV}.tar.gz
+		mirror://nongnu/${PN}/${PN}-doc-${PV}.pdf
 	)"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS=""
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
 IUSE="doc ftdi ncurses readline"
 
-RDEPEND="virtual/libusb:1
+RDEPEND="
+	virtual/libelf
+	virtual/libusb:1
 	virtual/libusb:0
 	ftdi? ( dev-embedded/libftdi:= )
 	ncurses? ( sys-libs/ncurses:0= )
-	readline? ( sys-libs/readline:0= )"
+	readline? ( sys-libs/readline:0= )
+"
 DEPEND="${RDEPEND}"
 
-DOCS="AUTHORS ChangeLog* NEWS README"
-
-src_unpack() {
-	default
-	subversion_src_unpack
-}
-
-src_prepare() {
-	default
-
-	# let the build system re-generate these, bug #120194
-	rm -f lexer.c config_gram.c config_gram.h || die
-
-	eautoreconf
-}
-
 src_configure() {
 	# somehow this doesnt get set when cross-compiling and breaks build
 	tc-export AR
@@ -63,10 +48,8 @@ src_install() {
 	default
 
 	if use doc ; then
-		newdoc "${DISTDIR}/${PN}-doc-${MY_DOC_PV}.pdf" avrdude.pdf
+		newdoc "${DISTDIR}/${PN}-doc-${PV}.pdf" avrdude.pdf
 		dodoc -r "${WORKDIR}/avrdude-html/"
-
-		dodoc -r atmel-docs
 	fi
 
 	find "${ED}" -name '*.la' -delete || die
diff --git a/dev-embedded/parapin/Manifest b/dev-embedded/parapin/Manifest
index 2fa812f07f87..601095d1b6c3 100644
--- a/dev-embedded/parapin/Manifest
+++ b/dev-embedded/parapin/Manifest
@@ -1,5 +1,6 @@
+AUX parapin-1.5.0-tc-directly.patch 618 BLAKE2B b53d4a0d0a3f58be54bb1f25f2981c466265a410a99d82c18117d95bd3f2b83165e50459cab204302931673f236da48ca54dc7def1f89407357711c47823b0cd SHA512 83c53eb91b9dddc7912a8205df90c5f6c42dac68617733b088762cbd5be3a199641bf2283f7c2b8a321761e51c23126b62839a61ba26832a7656d3eb10406011
 DIST parapin-1.5.0.tgz 249552 BLAKE2B 2a6621ec21542c35dbcae48f1bb93cd36621878b3bdfcb75f3b22aaa861e730a0f9f80f0d83eb4335d7d3b4c6c471e83003da5daea6dddc87b6e3c86ef2c7229 SHA512 732a2e4145f9dc2b765ecd1fd52d56409e69f4e3dc885f10d37661ab551604b986c95466e7d45265a268f7e759f6aa65537d1a8efcdd57d2d8b0ddfd3484728d
 DIST parapin-1.5.1-beta1.tgz 279115 BLAKE2B cce949828fec7654917da54be30ac6ed07baad615180adebbd12caba0c994e62ae95cc10a00c3653d23fe75afbe0721d6da901829a99a89ab355ea059c99d0f5 SHA512 3bc1a0a9fef5fd5f8efd84220e7e257a100d618d168332fe09c1331c38fc48e339bfda3f216713f454f43487fd7227036d8f1025ccc851806ae69326bfae97e0
-EBUILD parapin-1.5.0.ebuild 783 BLAKE2B c9d7a92a0294ec8ae2d7b867f202467fd28837733e4da484ff95ea8e83162b21fa1d7ac2459f3acc04b072ceda7176c3bba9c88c1d71db4ab8d9ac83e72cafd0 SHA512 a7b8c5877c33ea020b009e14a1ffcea9fea5499e52bf401efdde362c946abcbaac9c6df604d4229614c1f000ed065d3a987c9f481f1ef2840855989d1b57c7d9
-EBUILD parapin-1.5.1_beta1.ebuild 810 BLAKE2B 99c362b3430175c174c899b1410afba351b364e6c6679e3fc6d979c9de423ca4bf0238d7e7e9aa1012934b45e78edf198cca1bdb12adce51178ea05e257096bc SHA512 c9282f2a69ec5c5d64a0b55a731588f711a72958fedcfe2d8f093b9c82ca70fce4f8564675ea3e423f624e58d32c61257b7ec3de11b869518394e6ecbe3aaced
+EBUILD parapin-1.5.0-r1.ebuild 704 BLAKE2B e17f8df72f13a2792a64dd47867be5a5f4e7fecba91ef366fd1bd4e1b0d54cac3dd991071469371d599b8ffdd3926c5b56bf82301293fe653f5732fb065cea91 SHA512 35deb22a229764adc700d4ce2a470352bf841c6cceb3ca5204b09122df9b937df1dc99f19f70d3c2d740404be2bf68646235c729328977074084113b259b30d3
+EBUILD parapin-1.5.1_beta1-r1.ebuild 739 BLAKE2B 4f3bfb768132c05b5ae83b36d5161219d9793014c1cb8d5edf2d5d4d94606847a5f0219ff935d9c38b7ac4fa475dec7e191ff7c60c8928d43f743be14eae8996 SHA512 2a48b8ff506b216843a9d306ed476baa4035488cbf2f7a9554c2669aed37654f70d338b2d8180dc6ec60c584c1f045f7d69c4eef06ac25ceb9ddac309133cce0
 MISC metadata.xml 988 BLAKE2B 1ff94dc4f00c09e8ef4224f0f3d5dc8c8314164bb3302a7c1778974e5062453b2f751c96ba8978c2935bba3e1ade26818d88bdf0965acd1d1cca215c2fa22357 SHA512 5df803ab0ec84a1d71d8887dc96b9a565875f3da839967205e5c0021ee3adf1fc027949298348a058aa6b9680ec9296ae14bdb75b55527c24b7989a820e45608
diff --git a/dev-embedded/parapin/files/parapin-1.5.0-tc-directly.patch b/dev-embedded/parapin/files/parapin-1.5.0-tc-directly.patch
new file mode 100644
index 000000000000..0289a070e2c3
--- /dev/null
+++ b/dev-embedded/parapin/files/parapin-1.5.0-tc-directly.patch
@@ -0,0 +1,23 @@
+diff --git a/Makefile-2.4 b/Makefile-2.4
+index b900268..9946cef 100644
+--- a/Makefile-2.4
++++ b/Makefile-2.4
+@@ -43,9 +43,6 @@
+ LINUX_HEADERS := /usr/src/linux-`uname -r`/include/
+ LINUX_MODULES := /lib/modules/`uname -r`/kernel/
+ 
+-CC := gcc
+-CFLAGS := -O2 -g -Wall
+-
+ LIBPARAPIN_OBJS := parapin.o
+ 
+ EXAMPLE_DIR := examples
+@@ -82,7 +79,7 @@ allinstall: install modulesinstall $(BINDINGS)-install
+ ##### libraries
+ 
+ libparapin.a: $(LIBPARAPIN_OBJS)
+-	ar -cr libparapin.a $(LIBPARAPIN_OBJS)
++	$(AR) -cr libparapin.a $(LIBPARAPIN_OBJS)
+ 
+ parapin.o: parapin.c parapin.h parapin-linux.h
+ 	$(CC) $(CFLAGS) -c parapin.c
diff --git a/dev-embedded/parapin/parapin-1.5.0.ebuild b/dev-embedded/parapin/parapin-1.5.0-r1.ebuild
index 0c172e5d1c89..eb1ca039789c 100644
--- a/dev-embedded/parapin/parapin-1.5.0.ebuild
+++ b/dev-embedded/parapin/parapin-1.5.0-r1.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
+
 inherit toolchain-funcs
 
 DESCRIPTION="A parallel port pin programming library"
@@ -13,25 +14,23 @@ IUSE="doc"
 KEYWORDS="~amd64 ~x86"
 SLOT="0"
 
-DEPEND="doc? ( dev-tex/latex2html )"
+PATCHES=(
+	"${FILESDIR}"/${P}-tc-directly.patch
+)
 
 src_compile() {
+	tc-export AR CC
 	# Note 2.4 and 2.6 makefiles are identical for the targets used
-	emake -f Makefile-2.4 CC=$(tc-getCC)
-	use doc && emake -C doc html
+	emake -f Makefile-2.4
 }
 
 src_install() {
+	einstalldocs
 	dolib.a libparapin.a
 	insopts -m0444;	insinto /usr/include; doins parapin.h
 
-	dodoc README
 	if use doc; then
-		cd "${S}"/doc/${PN}
-		docinto html
-		dodoc *.html *.css *.png
-
-		cd "${S}"/examples
+		cd examples || die
 		docinto examples
 		dodoc *.c
 	fi
diff --git a/dev-embedded/parapin/parapin-1.5.1_beta1.ebuild b/dev-embedded/parapin/parapin-1.5.1_beta1-r1.ebuild
index 51556291ee47..ec6e6a5c1db3 100644
--- a/dev-embedded/parapin/parapin-1.5.1_beta1.ebuild
+++ b/dev-embedded/parapin/parapin-1.5.1_beta1-r1.ebuild
@@ -1,39 +1,37 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
+
 inherit toolchain-funcs
 
 DESCRIPTION="A parallel port pin programming library"
 HOMEPAGE="http://parapin.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P/_/-}.tgz"
+S="${WORKDIR}/${P/_/-}"
 
 LICENSE="LGPL-2.1"
-IUSE="doc"
 KEYWORDS="~amd64 ~x86"
 SLOT="0"
+IUSE="doc"
 
-DEPEND="doc? ( dev-tex/latex2html )"
-
-S=${WORKDIR}/${P/_/-}
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.5.0-tc-directly.patch
+)
 
 src_compile() {
+	tc-export AR CC
 	# Note 2.4 and 2.6 makefiles are identical for the targets used
-	emake -f Makefile-2.4 CC=$(tc-getCC)
-	use doc && emake -C doc html
+	emake -f Makefile-2.4
 }
 
 src_install() {
+	einstalldocs
 	dolib.a libparapin.a
 	insopts -m0444;	insinto /usr/include; doins parapin.h
 
-	dodoc README
 	if use doc; then
-		cd "${S}"/doc/${PN}
-		docinto html
-		dodoc *.html *.css *.png
-
-		cd "${S}"/examples
+		cd examples || die
 		docinto examples
 		dodoc *.c
 	fi
diff --git a/dev-embedded/ponyprog/Manifest b/dev-embedded/ponyprog/Manifest
index 16383484d836..903169fc1c77 100644
--- a/dev-embedded/ponyprog/Manifest
+++ b/dev-embedded/ponyprog/Manifest
@@ -1,8 +1,4 @@
-AUX ponyprog-3.0.0-desktop-qa.patch 333 BLAKE2B ef21bb3f39a828317b1dddaccd36ec77b897250a54d4b07b2f7a40fbcaab0304937cc9e2170ee939f0214aef87ac09c1182d694a6d54ec59c52175d93e055152 SHA512 d5e04646720bf34b600dc90aa5013a0267fb4168d47860ef0bbbb12a465f59f784a0dd611e14d2a2884b814d385f24adcc65afeb99d58209677618c0d18c0dd7
-AUX ponyprog-3.0.0-fix-build-system.patch 4477 BLAKE2B 0c933f8b7e330f2c9a428d3cb0974550180b460fe1ebe2ac22cb98e4f7de579d2b5fb2e3d24ad227184396650b2ea6041ff36dd5e08db4c4d720e5ba5bb9e2a9 SHA512 5c8be7660d770bb7120b69e70f5a08ddec2568f2c930d780c6fa5bbcd09edf3e624d97497d3740c9d6c199db9878cccadc78e6da35d8a2b43d5d9a1a8e89851f
 AUX ponyprog-3.1.2-fix-build-system.patch 1434 BLAKE2B 081198cca88c1650be783e8f2507c1d97ebecc5e493e99ccfa2b462bb4ae0d51752b1b5b1a549f5ec1c350bd6b7f01b382ca6471ab1cf3f23fc019807290fcba SHA512 2b4529152ed3eb61ec453b32397a1751a788c7709d03a7df51331986b8ccfdea0907c8ddb8ee79cbbd96efa7b075e2b9ef528b3900f897a2ae5e21f40403d9c4
-DIST ponyprog-3.0.0.tar.gz 933166 BLAKE2B 46eb0a720c91ed187ef06907b28d8b84ecbe4c62a92cabf2b9ff58c553e3f8afc949e523d6b97af0cbf168c545b71e0395e02e5c182714a76bbacce645a1d890 SHA512 a1779b28e03f824fb242d6eb063f0e038af26602c26d5392884f69cbbccac8a934660dffa9bec7489aeb2656e35f21e2b097fc6fe011f278046894e180023881
 DIST ponyprog-3.1.2.tar.gz 1364636 BLAKE2B a913903278791d937266da50fcd5b5bda892dcc316011117816e37fc4ef03becce893b597fb34f2a6ef05b5692bb375e4ba10b04c079a63eb735aa0ddadb5ab9 SHA512 697c6fdc775629086a1c01ad94f291fda550a9ad6065e5fdff9db9fb035b8270ed9058894db7ca17d0daf2a26cc5e431415c160d61f65214677eae2109d87603
-EBUILD ponyprog-3.0.0.ebuild 1068 BLAKE2B 849d35644c72b705444062fec7e30cf4383f7fc230da62261e2358fdf20760fefa6e3250845e2d28c1eee35e036709c82fd55fd81b12124dc59f922f25182cda SHA512 2c671813476d272dd53f44f4bfa62b7c4579925a4ed4725d20f1ccac4667847c326c9ae0265c03fd852b5565f9e31c43c57fc13988e37b2c01b5d5ae39d0eee4
-EBUILD ponyprog-3.1.2.ebuild 1056 BLAKE2B f2c78c7816cea573a526b8e117923f32fcd3f5cc6659e8932e1fb49e2ac8367dff7c4a7066084ff735290d6650d67b6a36e96c258ec67bf0b8827419454d1025 SHA512 79ca86eb232a5e07c2900b06db503d56cc3345b71d449b7395e0f2f2650cf3a855999d7492addb38a6cdf283276e21e348196e73085f428bda846d3135ee4f72
+EBUILD ponyprog-3.1.2.ebuild 1054 BLAKE2B 3f2d835c365d8c104ff2a70e8474b016dbdb88cdaf3e82eeab55bf4c03c8309a92658c2e07ed1bc72be76fccc2e8d53cbfcee4eb8b44f8c6eba7858cd4f3b3cb SHA512 57edcfd0bfdcfb71f5e1edbdbd846a7de830adc0ad15d4cb77a09db7bc4d92eb699e3689581a8aea01077a72c6fbb591deec7151b71928d3263ef75e3d4a52e8
 MISC metadata.xml 638 BLAKE2B 80cc5f2cbb0168f73a647326a8fd26741112e9eed891fcb6f94b2a6b24f3bbceeacb234b12a174f1399dd296cda66c97b60138015fdfa6158b425b0b7f484b39 SHA512 45902feb788487c8d7d4570161b3adfabbed2ec797b9c2a525a3079fdebae84c59678fb7a2960124a653db34a1dc45a75a60de9926dd9b51a039c01f0c7d6775
diff --git a/dev-embedded/ponyprog/files/ponyprog-3.0.0-desktop-qa.patch b/dev-embedded/ponyprog/files/ponyprog-3.0.0-desktop-qa.patch
deleted file mode 100644
index 6883606592fd..000000000000
--- a/dev-embedded/ponyprog/files/ponyprog-3.0.0-desktop-qa.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- a/desktop/ponyprog.desktop
-+++ b/desktop/ponyprog.desktop
-@@ -1,12 +1,12 @@
- [Desktop Entry]
--Version=3.0.0
-+Version=1.1
- Name=Ponyprog
- Comment=EEPROM and microcontroller flasher
- GenericName=Ponyprog
- TryExec=ponyprog
- Exec=ponyprog
- Terminal=false
--Icon=ponyprog.png
-+Icon=ponyprog
- Type=Application
- Categories=Utility;Qt;
- 
diff --git a/dev-embedded/ponyprog/files/ponyprog-3.0.0-fix-build-system.patch b/dev-embedded/ponyprog/files/ponyprog-3.0.0-fix-build-system.patch
deleted file mode 100644
index c83b62a3a73b..000000000000
--- a/dev-embedded/ponyprog/files/ponyprog-3.0.0-fix-build-system.patch
+++ /dev/null
@@ -1,124 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1,9 +1,7 @@
- PROJECT(ponyprog)
- 
- # Configure CMake ...
--CMAKE_MINIMUM_REQUIRED(VERSION 2.8 FATAL_ERROR)
--CMAKE_POLICY(SET CMP0003 OLD)
--CMAKE_POLICY(SET CMP0015 OLD)
-+CMAKE_MINIMUM_REQUIRED(VERSION 2.8.12 FATAL_ERROR)
- 
- # set the Qt version to 4 or 5
- OPTION (USE_QT5 "Using of Qt5 version for compiling" ON)
-@@ -52,13 +50,7 @@
- OPTION (USE_PROFILER "Include in binary file profiling information" OFF)
- 
- 
--
--IF(${USE_DEBUGGER})
--  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS_DEBUG} -Wall")
--ELSE()
--  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS_RELEASE} -Wall")
--ENDIF()
--
-+ADD_COMPILE_OPTIONS("-Wall")
- MESSAGE(STATUS "CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS}")
- 
- INCLUDE(CheckIncludeFile)
-@@ -202,7 +194,6 @@
- SET ( UI_HEADERS_DIR temp )
- SET ( UI_SOURCES_DIR temp )
- 
--ADD_SUBDIRECTORY(qhexedit2/src)
- ADD_SUBDIRECTORY(SrcPony)
- 
- INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/qhexedit2/src/ ${CMAKE_CURRENT_SOURCE_DIR}/SrcPony/ )
-@@ -265,6 +256,8 @@
-   MESSAGE(STATUS "QT LIBRARIES: ${QT_LIBRARIES} ${Qt5Widgets_LIBRARIES} ${Qt5Multimedia_LIBRARIES} ${Qt5PrintSupport_LIBRARIES} ${Qt5Core_LIBRARIES}")
- ENDIF()
- 
-+TARGET_LINK_LIBRARIES(${CMAKE_PROJECT_NAME} qhexedit)
-+
- ADD_CUSTOM_TARGET (tags
-     COMMAND  ctags -R -f tags ${CMAKE_SOURCE_DIR}/SrcPony
-     WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
---- a/distribution/posix/CMakeLists.txt
-+++ b/distribution/posix/CMakeLists.txt
-@@ -5,6 +5,8 @@
- SET(CPACK_INSTALL_PREFIX "/usr") 
- SET(CPACK_PACKAGE_INSTALL_DIRECTORY "/usr")
- 
-+INCLUDE(GNUInstallDirs)
-+
- MESSAGE("CMAKE_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX}")
- 
- # SET( CPACK_PACKAGE_GROUP "${PONYPROG_CPACK_PACKAGE_GROUP}" )
-@@ -12,46 +14,40 @@
- SET( CPACK_PACKAGE_SHLIBDEPS "${PONYPROG_CPACK_PACKAGE_SHLIBDEPS}" )
- # SET( CPACK_PACKAGE_DEPENDS "${PONYPROG_CPACK_PACKAGE_DEPENDS}" )
- 
--INSTALL(PROGRAMS "${CURRENT_BUILD_DIR}/ponyprog" 
--        DESTINATION "bin/" 
--        COMPONENT "application" 
--        PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ
-+INSTALL(PROGRAMS "${CURRENT_BUILD_DIR}/ponyprog"
-+        DESTINATION "${CMAKE_INSTALL_BINDIR}"
-+        COMPONENT "application"
-         )
- 
--INSTALL(DIRECTORY "${PROJECT_SOURCE_DIR}/icons/"    
--        DESTINATION "share/icons/" 
--        COMPONENT "application" 
--        DIRECTORY_PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ 
-+INSTALL(DIRECTORY "${PROJECT_SOURCE_DIR}/icons/"
-+        DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/icons"
-+        COMPONENT "application"
-         FILES_MATCHING PATTERN "*.png"
-         )
- 
--INSTALL(DIRECTORY "${PROJECT_SOURCE_DIR}/lang/" 
--        DESTINATION "share/ponyprog/lang/" 
--        COMPONENT "lang files" 
--        DIRECTORY_PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ 
-+INSTALL(DIRECTORY "${PROJECT_SOURCE_DIR}/lang/"
-+        DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/ponyprog/lang"
-+        COMPONENT "lang files"
-         FILES_MATCHING PATTERN "*.utf"
--        ) 
-+        )
- 
--INSTALL(DIRECTORY "${PROJECT_SOURCE_DIR}/distribution/innosetup/" 
--        DESTINATION "share/doc/ponyprog/" 
--        COMPONENT "help files" 
--        DIRECTORY_PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ 
-+INSTALL(DIRECTORY "${PROJECT_SOURCE_DIR}/distribution/innosetup/"
-+        DESTINATION "${CMAKE_INSTALL_DOCDIR}"
-+        COMPONENT "help files"
-         FILES_MATCHING PATTERN "*.jpg" PATTERN "*.html"
--        ) 
-+        )
- 
--INSTALL(FILES "${PROJECT_SOURCE_DIR}/copyright" 
--        DESTINATION "share/doc/ponyprog/" 
--        COMPONENT "application" 
--        PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ
--        ) 
-+INSTALL(FILES "${PROJECT_SOURCE_DIR}/copyright"
-+        DESTINATION "${CMAKE_INSTALL_DOCDIR}"
-+        COMPONENT "application"
-+        )
- # MESSAGE("PROJECT_SOURCE_DIR ${PROJECT_SOURCE_DIR}")
- 
- INSTALL(FILES "${PROJECT_SOURCE_DIR}/desktop/ponyprog.desktop"
--        DESTINATION "share/applications/" 
--        COMPONENT "application" 
--        PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ
-+        DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/applications/"
-+        COMPONENT "application"
-         )
--        
-+
- SET(CPACK_INSTALL_CMAKE_PROJECTS "${PONYPROG_CPACK_INSTALL_CMAKE_PROJECTS}")
- 
- SET(PONYPROG_PACKAGE_DIRECTORY "${CURRENT_BUILD_DIR}")
diff --git a/dev-embedded/ponyprog/ponyprog-3.0.0.ebuild b/dev-embedded/ponyprog/ponyprog-3.0.0.ebuild
deleted file mode 100644
index b9a935a5c1a2..000000000000
--- a/dev-embedded/ponyprog/ponyprog-3.0.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="EEPROM and microcontroller programmer/flasher"
-HOMEPAGE="https://github.com/lancos/ponyprog/"
-SRC_URI="https://github.com/lancos/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc"
-
-RDEPEND=">=app-editors/qhexedit2-0.8.4_p20170719
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtmultimedia:5
-	dev-qt/qtprintsupport:5"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-fix-build-system.patch
-	"${FILESDIR}"/${P}-desktop-qa.patch
-)
-
-src_configure() {
-	local mycmakeargs=( -DCMAKE_INSTALL_DOCDIR="share/doc/${PF}" )
-	cmake-utils_src_configure
-}
-
-pkg_postinst() {
-	elog "To use the COM port in user mode (not as root), you need to"
-	elog "be in the 'uucp' group."
-	elog
-	elog "To use the LPT port in user mode (not as root) you need a kernel with"
-	elog "ppdev, parport and parport_pc compiled in or as modules. You need the"
-	elog "rights to write to /dev/parport? devices."
-}
diff --git a/dev-embedded/ponyprog/ponyprog-3.1.2.ebuild b/dev-embedded/ponyprog/ponyprog-3.1.2.ebuild
index fd87de76d806..33d6f998f1ff 100644
--- a/dev-embedded/ponyprog/ponyprog-3.1.2.ebuild
+++ b/dev-embedded/ponyprog/ponyprog-3.1.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/lancos/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc"
 
 DEPEND="
diff --git a/dev-embedded/sunxi-tools/Manifest b/dev-embedded/sunxi-tools/Manifest
index 515f0294012f..c8a1987b2677 100644
--- a/dev-embedded/sunxi-tools/Manifest
+++ b/dev-embedded/sunxi-tools/Manifest
@@ -1,3 +1,3 @@
 DIST sunxi-tools-1.3.tar.gz 52608 BLAKE2B e8c3ed7276f705273598e38a0cc469225de1ee4eb8177b78be63b78ebc584c4fdf2362e21b895f61b4c5e84df98bfd5ccf6d3965ffa9338c98027c9ce4635626 SHA512 954c95963013aee8a38b3583ba1b7ec7e7049c7e09c5fa9ec564dfc33f304d3669fdf68c2fa5e4b5a6265640a3d1ee8bc13bcd71d804c714884b6a780d193615
 EBUILD sunxi-tools-1.3-r1.ebuild 713 BLAKE2B dcaa09ca036ad434e1763ff3a80d463a986c8cc49c66b471b6e5eb4b665f18856d2bc0bfd8e390ec8dd3e1255605197aaba5b641b3e6a5431dd4339f51862236 SHA512 99ff493ba000a37d3e29151fe254cf2097104cd66cb7720493c5a2da4d9942b7cb6e726075859f376cab72f86ab8e1e342b3539d233bed6cf4b777feb825ce59
-MISC metadata.xml 446 BLAKE2B 1e6dd8f93c784efdff0ed61580e430ae395916e9874c2dbaca967dc006a6963a021800a57eb19d24a73882c519f7b80b012ed1db6f2bc68d92534e15a66d16d5 SHA512 8e1d31adc6a0ab9887357006561e4a57505e8e4fbddc807ff5b7627397358585e303d58432ceaca3a45fb6e7398a5251864141b99fc5cc6e7997d8583f54b474
+MISC metadata.xml 340 BLAKE2B 576247e37e7212908e8e04cdf8ded79a9270c130760add714f11d0b1018db8670f07a60adf20ab4e06896e47a8795a05d9ee25de363c329e1c1a259f4c85f4ec SHA512 ae5a0ae8ed5d1e5d2942604d9f2b2fe134e9f719ae1bda055761a0acfd316f6710d111f9639a37256636ff478ec0b01cc3af31e151b78c53626bccc03158c9af
diff --git a/dev-embedded/sunxi-tools/metadata.xml b/dev-embedded/sunxi-tools/metadata.xml
index 9bed1db1f0c2..b6a0100ff814 100644
--- a/dev-embedded/sunxi-tools/metadata.xml
+++ b/dev-embedded/sunxi-tools/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>chainsaw@gentoo.org</email>
-		<name>Tony Vroon</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>embedded@gentoo.org</email>
 		<name>Embedded Gentoo</name>
diff --git a/dev-embedded/u-boot-tools/Manifest b/dev-embedded/u-boot-tools/Manifest
index 519684b1af38..615f4a913b72 100644
--- a/dev-embedded/u-boot-tools/Manifest
+++ b/dev-embedded/u-boot-tools/Manifest
@@ -1,5 +1,3 @@
-DIST u-boot-2021.04-rc2.tar.bz2 16620315 BLAKE2B e16c167346ef3999443855b9a702bf28faacf51b7887c84096f7a372a0c820d6ed9f06c1dd209b4070adf8000853b58b7b9b81c5b32a973d37558acf1da2edfa SHA512 7bf07f15e0c5f5e63ef8cb9568278ea7c209e484bbb599c47b22a8d2e5c007cc204eec365e5328dea3e7b016cd6ba0cb4c917330cc76163b1016f7c7762ad1bf
 DIST u-boot-2021.07.tar.bz2 17275746 BLAKE2B 1a209a604e0f30264781a14ca855bbb777e8f1c031de60d28de397084fc9bfc4a3771ad00ec22f5cdcfa721f22707a533b9b59004ac0b107df927f23dc5ab0a6 SHA512 210b206a4626feb0985580d9448a97b499b09bf9b9313ca847a66624785e9e9b0fae8f2e329acd344f5f75cb722d2093dd0ee394311ddd1fde05e400ee71a24d
-EBUILD u-boot-tools-2021.04_rc2.ebuild 1523 BLAKE2B a79fce96dc4d4749b49b05dff7175e32441e77e47c99293d89f38ccbcd73b09bd39c4184b8bbea02842c1447adeb2d2d6771d68cf48b24cb7246b93a3b5aa6ab SHA512 1e0e465905e6d399cada39542003187ed06cdc6b3efefb1d3a0fb4c7b481fb24e5db6cbc4a90845874bf39240f92a1fa7d36f2dded0115841f8af6e738416c94
-EBUILD u-boot-tools-2021.07.ebuild 1512 BLAKE2B 82bad02e96a4b0418b160a869cc13527b12ef1ef1450e0854f67d13ea7c42826423ea46a8cbeb62a3e34462322ba039f24857186ac771ddf166fd29d1aac0410 SHA512 e07ac8937f6e2f2f7871597323278ea76b2cec541f647f3578b1ae1580ace851315a5e1668af801c7d95226eae29a578435c52af9ddcb177e874a5f6b2fb7315
+EBUILD u-boot-tools-2021.07.ebuild 1509 BLAKE2B 754f6673b7dcea23fbdba18c8023df57db54230e8a06571570f74ec2b2bd324167ba8c1249f01fc8e76402ae3c843028d7fc13d631d54abb31fd30bd58b5d3cf SHA512 40028a8715eae678f25816ade55bd523294395a959b8b76da7ffaaa99c11d7df5ff46dcbf50f8d6228a76170dc0e2603684e8441259be6886632e8020ea00109
 MISC metadata.xml 343 BLAKE2B 4115ff47d73727feb01367f4f6a419d46cfed433ac0f8e0b40366f61cefa9beef9c28511a0f8db727b22e04e38b0c741b415bf6edc3b8b4ef0867255beed1935 SHA512 1523312fc43fd850cf4d24b17d17a2607f5dd2786c4827c48014f750b97088ff95c97148cb8e9cbac2fc6b3e759dee32d04a9b5da62c130a7708b34db82e5196
diff --git a/dev-embedded/u-boot-tools/u-boot-tools-2021.04_rc2.ebuild b/dev-embedded/u-boot-tools/u-boot-tools-2021.04_rc2.ebuild
deleted file mode 100644
index f7a4a5f731a8..000000000000
--- a/dev-embedded/u-boot-tools/u-boot-tools-2021.04_rc2.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit toolchain-funcs
-
-MY_P="u-boot-${PV/_/-}"
-DESCRIPTION="utilities for working with Das U-Boot"
-HOMEPAGE="https://www.denx.de/wiki/U-Boot/WebHome"
-SRC_URI="ftp://ftp.denx.de/pub/u-boot/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~ppc ~ppc64 ~riscv x86"
-IUSE=""
-
-RDEPEND="dev-libs/openssl:0="
-DEPEND="${RDEPEND}"
-BDEPEND="
-	sys-devel/bison
-	sys-devel/flex
-	virtual/pkgconfig
-"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	default
-	sed -i 's:\bpkg-config\b:${PKG_CONFIG}:g' \
-		scripts/kconfig/{g,m,n,q}conf-cfg.sh \
-		scripts/kconfig/Makefile \
-		tools/Makefile || die
-}
-
-src_configure() {
-	tc-export AR CC PKG_CONFIG
-}
-
-src_compile() {
-	# Unset a few KBUILD variables. Bug #540476
-	unset KBUILD_OUTPUT KBUILD_SRC
-
-	emake \
-		V=1 \
-		AR="${AR}" \
-		CC="${CC}" \
-		HOSTCC="${CC}" \
-		HOSTCFLAGS="${CFLAGS} ${CPPFLAGS}"' $(HOSTCPPFLAGS)' \
-		HOSTLDFLAGS="${LDFLAGS}" \
-		tools-only_defconfig
-
-	emake \
-		V=1 \
-		NO_SDL=1 \
-		HOSTSTRIP=: \
-		STRIP=: \
-		AR="${AR}" \
-		CC="${CC}" \
-		HOSTCC="${CC}" \
-		HOSTCFLAGS="${CFLAGS} ${CPPFLAGS}"' $(HOSTCPPFLAGS)' \
-		HOSTLDFLAGS="${LDFLAGS}" \
-		CONFIG_ENV_OVERWRITE=y \
-		tools-all
-}
-
-src_test() { :; }
-
-src_install() {
-	cd tools || die
-	dobin bmp_logo dumpimage fdtgrep gen_eth_addr img2srec mkenvimage mkimage
-	dobin env/fw_printenv
-	dosym fw_printenv /usr/bin/fw_setenv
-	insinto /etc
-	doins env/fw_env.config
-	doman "${S}"/doc/mkimage.1
-}
diff --git a/dev-embedded/u-boot-tools/u-boot-tools-2021.07.ebuild b/dev-embedded/u-boot-tools/u-boot-tools-2021.07.ebuild
index 8511d1c55044..c917c6a346b0 100644
--- a/dev-embedded/u-boot-tools/u-boot-tools-2021.07.ebuild
+++ b/dev-embedded/u-boot-tools/u-boot-tools-2021.07.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm ~arm64 ~ppc ~ppc64 ~riscv x86"
 IUSE="envtools"
 
 RDEPEND="dev-libs/openssl:="