gentoo resync : 14.07.2018

429 files changed, 1393 insertions, 9106 deletions

diff --git a/dev-embedded/Manifest.gz b/dev-embedded/Manifest.gz
index 95784bfa6905..541ccc2fade7 100644
--- a/dev-embedded/Manifest.gz
+++ b/dev-embedded/Manifest.gz
diff --git a/dev-embedded/arduino-1.0.5-r1 b/dev-embedded/arduino-1.0.5-r1
new file mode 100644
index 000000000000..fc6425b268cd
--- /dev/null
+++ b/dev-embedded/arduino-1.0.5-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup
+DEPEND=dev-java/jna:0 >dev-java/rxtx-2.1:2 >=virtual/jdk-1.5 >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
+DESCRIPTION=An open-source AVR electronics prototyping platform
+EAPI=4
+HOMEPAGE=https://arduino.cc/ https://github.com/arduino/
+IUSE=elibc_FreeBSD doc examples elibc_FreeBSD
+KEYWORDS=amd64 x86
+LICENSE=GPL-2 GPL-2+ LGPL-2 CC-BY-SA-3.0
+RDEPEND=dev-java/jna:0 >dev-java/rxtx-2.1:2 dev-embedded/avrdude dev-embedded/uisp sys-devel/crossdev >=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3
+RESTRICT=strip binchecks
+SLOT=0
+SRC_URI=https://arduino.googlecode.com/files/arduino-1.0.5-src.tar.gz mirror://gentoo/arduino-icons.tar.bz2
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=a4a86309434f48a90eaef7e92003d885
diff --git a/dev-embedded/arduino-1.0.5-r2 b/dev-embedded/arduino-1.0.5-r2
new file mode 100644
index 000000000000..c884de8c7eb3
--- /dev/null
+++ b/dev-embedded/arduino-1.0.5-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup
+DEPEND=dev-java/jna:0 >dev-java/rxtx-2.1:2 >=virtual/jdk-1.6 >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
+DESCRIPTION=An open-source AVR electronics prototyping platform
+EAPI=6
+HOMEPAGE=https://arduino.cc/ https://github.com/arduino/
+IUSE=elibc_FreeBSD doc examples elibc_FreeBSD
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 GPL-2+ LGPL-2 CC-BY-SA-3.0
+RDEPEND=dev-java/jna:0 >dev-java/rxtx-2.1:2 dev-embedded/avrdude dev-embedded/uisp sys-devel/crossdev >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3
+RESTRICT=strip binchecks
+SLOT=0
+SRC_URI=https://github.com/arduino/Arduino/archive/1.0.5.tar.gz -> arduino-src-1.0.5.tar.gz mirror://gentoo/arduino-icons.tar.bz2
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=e59a5fe1dd0b2954ae647b288c168980
diff --git a/dev-embedded/arduino-1.8.5-r2 b/dev-embedded/arduino-1.8.5-r2
new file mode 100644
index 000000000000..9a4afde873d2
--- /dev/null
+++ b/dev-embedded/arduino-1.8.5-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DEPEND=dev-embedded/arduino-builder app-arch/unzip >=virtual/jdk-1.8 >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2 >=sys-apps/sed-4
+DESCRIPTION=An open-source AVR electronics prototyping platform
+EAPI=6
+HOMEPAGE=https://arduino.cc/ https://github.com/arduino/
+IUSE=doc elibc_FreeBSD elibc_FreeBSD
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 LGPL-2.1 CC-BY-SA-3.0
+RDEPEND=dev-embedded/arduino-builder >=dev-util/astyle-3.1[java] dev-embedded/arduino-listserialportsc >=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3
+RESTRICT=strip binchecks
+SLOT=0
+SRC_URI=https://github.com/arduino/Arduino/archive/1.8.5.tar.gz -> arduino-1.8.5.tar.gz https://github.com/arduino-libraries/Firmata/archive/2.5.6.zip -> arduino-1.8.5-Firmata-2.5.6.zip https://github.com/arduino-libraries/Bridge/archive/1.6.3.zip -> arduino-1.8.5-Bridge-1.6.3.zip https://github.com/arduino-libraries/Robot_Control/archive/1.0.4.zip -> arduino-1.8.5-Robot_Control-1.0.4.zip https://github.com/arduino-libraries/Robot_Motor/archive/1.0.3.zip -> arduino-1.8.5-Robot_Motor-1.0.3.zip https://github.com/arduino-libraries/RobotIRremote/archive/2.0.0.zip -> arduino-1.8.5-RobotIRremote-2.0.0.zip https://github.com/arduino-libraries/SpacebrewYun/archive/1.0.1.zip -> arduino-1.8.5-SpacebrewYun-1.0.1.zip https://github.com/arduino-libraries/Temboo/archive/1.2.1.zip -> arduino-1.8.5-Temboo-1.2.1.zip https://github.com/arduino-libraries/Esplora/archive/1.0.4.zip -> arduino-1.8.5-Esplora-1.0.4.zip https://github.com/arduino-libraries/Mouse/archive/1.0.1.zip -> arduino-1.8.5-Mouse-1.0.1.zip https://github.com/arduino-libraries/Keyboard/archive/1.0.1.zip -> arduino-1.8.5-Keyboard-1.0.1.zip https://github.com/arduino-libraries/SD/archive/1.1.1.zip -> arduino-1.8.5-SD-1.1.1.zip https://github.com/arduino-libraries/Servo/archive/1.1.2.zip -> arduino-1.8.5-Servo-1.1.2.zip https://github.com/arduino-libraries/LiquidCrystal/archive/1.0.7.zip -> arduino-1.8.5-LiquidCrystal-1.0.7.zip https://github.com/Adafruit/Adafruit_CircuitPlayground/archive/1.6.8.zip -> arduino-1.8.5-Adafruit_CircuitPlayground-1.6.8.zip https://github.com/arduino-libraries/WiFi101-FirmwareUpdater-Plugin/releases/download/v0.9.1/WiFi101-Updater-ArduinoIDE-Plugin-0.9.1.zip -> arduino-1.8.5-WiFi101-Updater-ArduinoIDE-Plugin-0.9.1.zip doc? ( https://downloads.arduino.cc/reference-1.6.6-3.zip -> arduino-1.8.5-reference-1.6.6-3.zip https://downloads.arduino.cc/Galileo_help_files-1.6.2.zip -> arduino-1.8.5-Galileo_help_files-1.6.2.zip https://downloads.arduino.cc/Edison_help_files-1.6.2.zip -> arduino-1.8.5-Edison_help_files-1.6.2.zip )
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=410701364da58158e5c8b231714583b8
diff --git a/dev-embedded/arduino-builder-1.3.25 b/dev-embedded/arduino-builder-1.3.25
new file mode 100644
index 000000000000..eb254bb35547
--- /dev/null
+++ b/dev-embedded/arduino-builder-1.3.25
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare test unpack
+DEPEND=>=dev-lang/go-1.9.2 >=dev-lang/go-1.9
+DESCRIPTION=A command line tool for compiling Arduino sketches
+EAPI=6
+HOMEPAGE=https://github.com/arduino/arduino-builder
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=sys-devel/crossdev dev-embedded/avrdude dev-embedded/arduino-ctags
+SLOT=0
+SRC_URI=https://github.com/arduino/arduino-builder/archive/1.3.25.tar.gz -> arduino-builder-1.3.25.tar.gz https://github.com/go-errors/errors/archive/a41850380601eeb43f4350f7d17c6bbd8944aaf8.tar.gz -> github.com-go-errors-errors-a41850380601eeb43f4350f7d17c6bbd8944aaf8.tar.gz https://github.com/jstemmer/go-junit-report/archive/833f8ea2b99d36d5f018698333834f3df200a0c2.tar.gz -> github.com-jstemmer-go-junit-report-833f8ea2b99d36d5f018698333834f3df200a0c2.tar.gz https://github.com/stretchr/testify/archive/1661650f989674e3e5bcdcb805536e5d31481526.tar.gz -> github.com-stretchr-testify-1661650f989674e3e5bcdcb805536e5d31481526.tar.gz
+_eclasses_=golang-base	d4e3a3f895016e5c9d7afb1a33e7cf3c	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
+_md5_=3118c3cec4fa668f6a82354803185d84
diff --git a/dev-embedded/arduino-builder/Manifest b/dev-embedded/arduino-builder/Manifest
deleted file mode 100644
index d275e2c9bb50..000000000000
--- a/dev-embedded/arduino-builder/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX arduino-builder-1.3.25-platform-paths.patch 982 BLAKE2B 9bc9d1d7cb12fe4f1e0539a2a548bbeb9ecc596e03fd9e7757d2d011e15b72a176095311063f0c58db2572db5912f6fbf8da493a83395f16f806ccd8a1c8de7a SHA512 8a2055cb6fdc0141701db908ca26c390d1f5992234eae5410b828a84972fcb0c2645b4062242064e37118ed20bad75b08fe044110a65a7b10c9662f62c3f44e7
-DIST arduino-builder-1.3.25.tar.gz 206905 BLAKE2B 6770b89607c1563b68a79d34e6e214586106c63a4b3c854b4f85a4b9eb2fc24ce5d4a97c29b0c05c19b6834e103f3c3c574bd8cefed0eb684d8aab7e4c71ee7f SHA512 3740530800f8a3cfe1fe20a91579e6b632b76c2c4ace68c7b178a2d234032d5887abee3d0360c3039f2fec912a0d5cabe948bf930a7d9ea23221625456ad5357
-DIST github.com-go-errors-errors-a41850380601eeb43f4350f7d17c6bbd8944aaf8.tar.gz 7835 BLAKE2B f4092b4ef5ebf996cb3c20183868dbdd154ea7cf02a4fd5a3375a3193e9ccacad08f0b6681b456786524b729ffb8c0b5c8af6ceec630eec22326d0fe1e00eb22 SHA512 b1d5e7c6f30f94f8a41b10d32b7f4ce7de8394f74ede6c14fb1f267a0514b24bc3bc7659c3baf6eacf424cea8451e7e57f5f72acc568342e90a447bd02f3e262
-DIST github.com-jstemmer-go-junit-report-833f8ea2b99d36d5f018698333834f3df200a0c2.tar.gz 6901 BLAKE2B 6138ac40810ad000a4336ffbca3bc5c1d0e96854c7918fb2aad9f7b2596ac66f285ac8c519e30b6e97cdb0009b31ab73b83ff2e1db2f464c2d88f2c1045a6bd9 SHA512 00f38f51c5f761b5a3e60a6e6b602f1246a746f081f2d8946d01387234270544692c6af54d0e69919c1af8aa753f848eeecc4421f2ddf881f21522ccf5545d75
-DIST github.com-stretchr-testify-1661650f989674e3e5bcdcb805536e5d31481526.tar.gz 81099 BLAKE2B 592a7c114b01bc5b1982135f310aa8619c2888ac36ccb5d876a38655a13f7dc4d468a7a42a44cf9cf69fc7bd6769a9ba010b48089d5ce866dcd564e20487e04a SHA512 f10255b0f47237c7583626a3bb213ca67d0db92c2a1531cc31dac089cdb13139b01647809503313a26f3e53a64a98cebc3bf9c4e1bd1ed975d9b81aa516ab5af
-EBUILD arduino-builder-1.3.25.ebuild 2767 BLAKE2B c8ac8f94cffe79ff009aee2dbcefba7a5e282bde90c58f4254fe9dec7564e8e41fa56c61071f475ae5db660f090134cf7f55a0810b940952c78d9a6402820e0b SHA512 adda2529e4cf3fd8be368d3c026ca52970d5e30be7ec0233108a943715c014dadb4e37be79109b7cfdb6ab5746d83aa353afcddc6f1349475c83a48614f7eebe
-MISC metadata.xml 339 BLAKE2B 8353146b638f77f9846c37e1717f19e9d3eff24a88a8299bb43d6118e47c5159a53ed8612681f5f849269a8d250d99b9dc57030452d96ed81975196b3faedfb1 SHA512 3a107172d306efee35994af117181d4a08388883d4efeb48dd270f8a711deae39d68e1bd38423e0a71d91f708d4c1877d300ed4823e43fda8a924bd98b8f37c7
diff --git a/dev-embedded/arduino-builder/arduino-builder-1.3.25.ebuild b/dev-embedded/arduino-builder/arduino-builder-1.3.25.ebuild
deleted file mode 100644
index 0930e5240c01..000000000000
--- a/dev-embedded/arduino-builder/arduino-builder-1.3.25.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGO_PN="arduino.cc/arduino-builder/..."
-
-EGO_VENDOR=(
-	"github.com/go-errors/errors a41850380601eeb43f4350f7d17c6bbd8944aaf8"
-	"github.com/jstemmer/go-junit-report 833f8ea2b99d36d5f018698333834f3df200a0c2"
-	"github.com/stretchr/testify 1661650f989674e3e5bcdcb805536e5d31481526"
-)
-
-inherit golang-build golang-vcs-snapshot
-
-DESCRIPTION="A command line tool for compiling Arduino sketches"
-HOMEPAGE="https://github.com/arduino/arduino-builder"
-SRC_URI="https://github.com/arduino/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
-	${EGO_VENDOR_URI}"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="sys-devel/crossdev
-	dev-embedded/avrdude
-	dev-embedded/arduino-ctags"
-
-DEPEND=">=dev-lang/go-1.9.2"
-
-src_unpack() {
-	golang-vcs-snapshot_src_unpack
-}
-
-src_prepare() {
-	# As we know, golang packages have to be compiled from namespace-aware paths which is the whole
-	# point of the EGO_PN dance. arduino-builder goes a step further by re-creating its own
-	# namespace inside its source package, messing up with our build process which can't find
-	# packages. Also, our source package contains multiple namespaces which further messes with
-	# messes with our vendoring process (each namespace needs its own vendor directory).
-	# We do the following to try to work around this mess. It looks like upstream reworked this
-	# in its master branch so we should be able to remove this in the upcoming major release.
-
-	local deeppath="${S}/src/${EGO_PN%/...}"
-	for pkgname in builder properties timeutils; do
-		ln -s "${deeppath}/src/arduino.cc/${pkgname}" "${S}/src/arduino.cc/${pkgname}"
-	done
-	ln -s "${deeppath}/vendor/github.com" "${S}/src/github.com"
-
-	# path paths so that they point to system ctags and avrdude
-	eapply "${FILESDIR}/arduino-builder-1.3.25-platform-paths.patch"
-
-	default
-}
-
-src_install() {
-	# we unfortunately have to copy/paste the contents of golang-build_src_install() here because
-	# we *don't* want to call golang_install_pkgs() which installs all static libraries we've
-	# built. All we want is to install the final executable.
-
-	set -- env GOPATH="${WORKDIR}/${P}:$(get_golibdir_gopath)" \
-		go install -v -work -x ${EGO_BUILD_FLAGS} "${EGO_PN}"
-	echo "$@"
-	"$@" || die
-
-	# END OF COPY/PASTE
-
-	dobin bin/arduino-builder
-
-	# In addition to the binary, we also want to install these two files below. They are needed by
-	# the dev-embedded/arduino which copies those files in its "hardware" folder.
-	insinto "/usr/share/${PN}"
-	cd "src/arduino.cc/builder/hardware" || die
-	doins "platform.txt"
-	doins "platform.keys.rewrite.txt"
-}
-
-pkg_postinst() {
-	[ ! -x /usr/bin/avr-gcc ] && ewarn "Missing avr-gcc; you need to crossdev -s4 avr"
-}
diff --git a/dev-embedded/arduino-builder/files/arduino-builder-1.3.25-platform-paths.patch b/dev-embedded/arduino-builder/files/arduino-builder-1.3.25-platform-paths.patch
deleted file mode 100644
index 854dc886af01..000000000000
--- a/dev-embedded/arduino-builder/files/arduino-builder-1.3.25-platform-paths.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff --git a/src/arduino.cc/builder/hardware/platform.txt b/src/arduino.cc/builder/hardware/platform.txt
-index ca8df1f..17ce03f 100644
---- a/src/arduino.cc/arduino-builder/src/arduino.cc/builder/hardware/platform.txt
-+++ b/src/arduino.cc/arduino-builder/src/arduino.cc/builder/hardware/platform.txt
-@@ -1,11 +1,11 @@
- # ctags
- # ------------------------------
--tools.ctags.path={runtime.tools.ctags.path}
--tools.ctags.cmd.path={path}/ctags
-+tools.ctags.path=/usr/bin
-+tools.ctags.cmd.path={path}/arduino-ctags
- tools.ctags.pattern="{cmd.path}" -u --language-force=c++ -f - --c++-kinds=svpf --fields=KSTtzns --line-directives "{source_file}"
- 
- # additional entries
--tools.avrdude.path={runtime.tools.avrdude.path}
-+tools.avrdude.path=/usr/bin
- 
- preproc.macros.flags=-w -x c++ -E -CC
- #preproc.macros.compatibility_flags={build.mbed_api_include} {build.nRF51822_api_include} {build.ble_api_include} {compiler.libsam.c.flags} {compiler.arm.cmsis.path} {build.variant_system_include}
diff --git a/dev-embedded/arduino-builder/metadata.xml b/dev-embedded/arduino-builder/metadata.xml
deleted file mode 100644
index c6ee565672f5..000000000000
--- a/dev-embedded/arduino-builder/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>embedded@gentoo.org</email>
-		<name>Embedded Gentoo</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">arduino/arduino-builder</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-embedded/arduino-ctags-20161123 b/dev-embedded/arduino-ctags-20161123
new file mode 100644
index 000000000000..14471c1fba1e
--- /dev/null
+++ b/dev-embedded/arduino-ctags-20161123
@@ -0,0 +1,9 @@
+DEFINED_PHASES=configure install
+DESCRIPTION=Arduino private fork of dev-util/ctags
+EAPI=6
+HOMEPAGE=https://github.com/arduino/ctags
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=https://github.com/arduino/ctags/archive/abc8fca7499f44c725122881cd380a88c37abe0e.tar.gz -> arduino-ctags-20161123.tar.gz
+_md5_=25a5d810c60674bc5ee00adc36783f59
diff --git a/dev-embedded/arduino-ctags/Manifest b/dev-embedded/arduino-ctags/Manifest
deleted file mode 100644
index 7d78925654ef..000000000000
--- a/dev-embedded/arduino-ctags/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST arduino-ctags-20161123.tar.gz 490200 BLAKE2B f51b18a0db420124c5fed2b320c16d9eeb96fce6d0f118cf43a8177f88400daaeb83437c3993353c16b73781961c7476e782e66891582f4b3dc5301c73da64dc SHA512 ae5bde92c3dd0b9a179bc1df998f20312c4ab8b2c9c1840dbe543d23fb4531b9e5524f1399d9922ed9b2de4582bdb74635f7ec576a42c808d152c3fbb84f9687
-EBUILD arduino-ctags-20161123.ebuild 738 BLAKE2B d1819283886e1c211496388632a5573c0f55db9d89b047314acdb4a77eee379e5a488a3a374598dd57a53f246a4753d2cb3bebadcdc619e0105cb078cd324aeb SHA512 5b1e043f0ce8b3472be0f05b1e2601c7822db932d1e5c02fecf5f4cb4b4b3adb3b0d7e3cbb99c8d06123df4c1cabc7538ab5844fcb3102e7573991f2186380a9
-MISC metadata.xml 626 BLAKE2B 723945b93e97337df1fc85a27c7fb937d624372a1732ef026d0541ab6179806aaa8416e3e973873d7b2b2d5c39a32391158a1d0e172b02aa35b9c20aa1619ee7 SHA512 e129f6dec30edb56b3a85f26c171d314445c8bbe44cfb7e5fdd7f4d18a763fa13a79a6af95b7d0195bbc33b51d67fe84e33f402d30bf5672a7e7262738fba72f
diff --git a/dev-embedded/arduino-ctags/arduino-ctags-20161123.ebuild b/dev-embedded/arduino-ctags/arduino-ctags-20161123.ebuild
deleted file mode 100644
index e2bcd0810ab1..000000000000
--- a/dev-embedded/arduino-ctags/arduino-ctags-20161123.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-COMMITHASH="abc8fca7499f44c725122881cd380a88c37abe0e"
-
-DESCRIPTION="Arduino private fork of dev-util/ctags"
-HOMEPAGE="https://github.com/arduino/ctags"
-SRC_URI="https://github.com/arduino/ctags/archive/${COMMITHASH}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-S="${WORKDIR}/ctags-${COMMITHASH}"
-
-src_configure() {
-	econf \
-		--disable-readlib \
-		--disable-etags \
-		--enable-tmpdir="${EPREFIX}"/tmp
-}
-
-src_install() {
-	# This package compiles into a "ctags" executable, but don't want to clash into
-	# actually legitimate ctags implementations.
-	mv ctags arduino-ctags
-	dobin arduino-ctags
-}
diff --git a/dev-embedded/arduino-ctags/metadata.xml b/dev-embedded/arduino-ctags/metadata.xml
deleted file mode 100644
index 6e4776276159..000000000000
--- a/dev-embedded/arduino-ctags/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>embedded@gentoo.org</email>
-		<name>Embedded Gentoo</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">arduino/ctags</remote-id>
-	</upstream>
-	<longdescription>
-		Arduino's build process includes a preprocessing phase that involves ctags,
-		but not any version of ctags, *Arduino's* ctags, a private fork that
-		Arduino maintains. We can't use dev-util/ctags because it causes Arduino
-		to produce corrupt executables.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-embedded/arduino-listserialportsc-1.4.0 b/dev-embedded/arduino-listserialportsc-1.4.0
new file mode 100644
index 000000000000..19d86696b54f
--- /dev/null
+++ b/dev-embedded/arduino-listserialportsc-1.4.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install preinst prepare setup
+DEPEND=>=dev-libs/libserialport-0.1.1 >=dev-java/java-config-2.2.0-r3
+DESCRIPTION=Arduino helper library to list serial ports
+EAPI=6
+HOMEPAGE=https://github.com/arduino/listSerialPortsC
+IUSE=elibc_FreeBSD
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-3
+RDEPEND=>=dev-libs/libserialport-0.1.1 >=dev-java/java-config-2.2.0-r3
+SLOT=0
+SRC_URI=https://github.com/arduino/listSerialPortsC/archive/1.4.0.tar.gz -> arduino-listserialportsc-1.4.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=4c4c8d0f577c92b789ca9023af38f943
diff --git a/dev-embedded/arduino-listserialportsc/Manifest b/dev-embedded/arduino-listserialportsc/Manifest
deleted file mode 100644
index f6e45a962543..000000000000
--- a/dev-embedded/arduino-listserialportsc/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST arduino-listserialportsc-1.4.0.tar.gz 5448 BLAKE2B a1b5256c9e9ece7ec4de8b1481b6e20769fe07fd94b73d099922074ff20d251896d992aba1e3680dc7e667ff2897fec05812a07273efe097cf5387a5f0207554 SHA512 0e8bbf1e49fa8705a6d3c28b44043f8d13589b7ebdac245db79ed3826bf56028778fdf721af3cf756cc8ea19e7a2f7e5f19421a105211cf0cd35041ec718c2bb
-EBUILD arduino-listserialportsc-1.4.0.ebuild 1084 BLAKE2B ef42c72dafe3856e1b0c011ec826d086bd8be2ccf840f75c9d87fa84b2db3cdb3cf10169a3991f3976db9b382d0bc76c419905a104515a0d40b0ff37b907017f SHA512 62a756ce74d693b8a656d0c6af8914a3416e7598646e972ff5b722afb182a37ae7058de485c93477e1015142720ec866847b650a8330667a1494e38b20464f1a
-MISC metadata.xml 340 BLAKE2B 2cd9ba0239d059246ccb17feca24dc51e3ea6a03ffddc316e7ba596decd2cd52337f54ecb3746b04d1ebe6fbc1b4a8488e3080b5274283837fa43f5a75bead76 SHA512 67948320e986bc94e6ca659c06e6a914b824c54bddfbd507d1bdfc6773c673540bd07555eac945ab72e4ff85d93de97455abf3481d0ae3d99691e48efebb9cde
diff --git a/dev-embedded/arduino-listserialportsc/arduino-listserialportsc-1.4.0.ebuild b/dev-embedded/arduino-listserialportsc/arduino-listserialportsc-1.4.0.ebuild
deleted file mode 100644
index 940f11233120..000000000000
--- a/dev-embedded/arduino-listserialportsc/arduino-listserialportsc-1.4.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit java-pkg-2 toolchain-funcs
-
-DESCRIPTION="Arduino helper library to list serial ports"
-HOMEPAGE="https://github.com/arduino/listSerialPortsC"
-SRC_URI="https://github.com/arduino/listSerialPortsC/archive/${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND=">=dev-libs/libserialport-0.1.1"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/listSerialPortsC-${PV}"
-
-src_compile() {
-	CC=$(tc-getCC)
-	${CC} -Wall -O2 ${CPPFLAGS} ${CFLAGS} -c -o main.o main.c
-	${CC} ${CFLAGS} ${LDFLAGS} main.o -lserialport -o listSerialC
-
-	${CC} \
-		-Wall -O2 ${CPPFLAGS} ${CFLAGS} -fPIC \
-		-I$(java-config-2 -o)/include \
-		-I$(java-config-2 -o)/include/linux \
-		-o jnilib.o -c jnilib.c
-
-	${CC} \
-		${CFLAGS} ${LDFLAGS} \
-		-shared -Wl,-soname,liblistSerialsj.so \
-		jnilib.o -lserialport -o liblistSerialsj.so.${PV}
-}
-
-src_install() {
-	dobin listSerialC
-	dolib liblistSerialsj.so.${PV}
-	dosym liblistSerialsj.so.${PV} /usr/$(get_libdir)/liblistSerialsj.so
-}
diff --git a/dev-embedded/arduino-listserialportsc/metadata.xml b/dev-embedded/arduino-listserialportsc/metadata.xml
deleted file mode 100644
index f94c4150ebc1..000000000000
--- a/dev-embedded/arduino-listserialportsc/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>embedded@gentoo.org</email>
-		<name>Embedded Gentoo</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">arduino/listSerialPortsC</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-embedded/arduino/Manifest b/dev-embedded/arduino/Manifest
deleted file mode 100644
index 2b53ef41cde5..000000000000
--- a/dev-embedded/arduino/Manifest
+++ /dev/null
@@ -1,32 +0,0 @@
-AUX arduino-1.0.1-build.xml.patch 1732 BLAKE2B 9defdbb63aa921458f4d76f9f76e173937594b52a92906b13a2322695a0866702fccc8c7d90bff503f7675c900d322199188bce3df428e05358205b76d4b20b3 SHA512 a5317a131449f08fa272cd7d3bf477eedc69f354b771297bc20623277e79a2c1349299c14fba52689f015c71d6a19733fb8ee24de820e59c1aa2b3e2d7f2af42
-AUX arduino-1.0.3-script.patch 608 BLAKE2B 93f555a54ac9ff47feb2c6d51b4f1fc58cd09dc2e7af1dacf7fa3bb704929fb1feea65f5852a1a0da9c8cd0965cdaaf252c0dd96b9e49b9e85ffc10bb826d0fa SHA512 073f2adfc9066879a409a064599d9972ecf0110990a20d778d631fa24c35854831872a0ee220d80cfe996b9e6fa91ef00281a40c466b510a5ce635c59c84103a
-AUX arduino-1.8.5-avr-platform.txt.patch 1215 BLAKE2B e4995a86865959d136cbbfcbdccdc1440c53344d9c90717a6d51dc7df2e5c22029de3af94d9f1a3b63243862c457f8ad1e7239359366afacb4a47b94dc5e44c5 SHA512 2032dda5e9c318550539f8d9c9ef1e0668bf60a11e6d6ae9c86e28c19518db999401538fc5b0af6ee606e2509ffc06d69d3e43b5bd63925ad92457cfc2d39d27
-AUX arduino-1.8.5-build.xml.patch 1402 BLAKE2B 84a9961cb21522a1bf3a485e8c758621632eda7bc15fb69c445197314a124042f19bc4619cea394a669659fb17f23c7240504cc01d31475d57234f1d28a962d9 SHA512 c279b5fabf6231deeb77b532d7bf0093ece2aad48c31d6bb5a524e32fde5dc58c9c102b3afee4e8e999021049101fae7e00dc4f1bf1ad8dad3ddf451a61835aa
-AUX arduino-1.8.5-lib-loading.patch 1164 BLAKE2B c1e0168f04727ab39340db3594d418eb1f6a25cbf728fb4c75c4db79b9b7b67daeaac35bcbc111f9e7eb76ba5539a5a57bcb5a3f274f3b92cf4b5bf6e51e513a SHA512 c2487e57e654872b8c4a4e046431b43385654ebdc8c9e8bbf5f9593f91a40f0d3288d0f13b6237dea351284cb5e4044013a406af1e9606b9111df3cf7f0ed760
-AUX arduino.desktop 196 BLAKE2B c3b8c380e005911b6a7473a5c9fa5248923655afad1e7029aaa3de6dc95e3d7c8e5d9f7dc3c4f1afba516e0f330bed788d68b5d8eb2fd899d47ebf333d1e7d1d SHA512 d5c19162e7863ef3d1e4182caafafd090e2df98cb65b92aad01a3c68d793fe7f056939b920ab11666ab67fba4faa880ad4da599cad25206b8f22612c675cb3f1
-DIST arduino-1.0.5-src.tar.gz 40526292 BLAKE2B 3844d5f644af94adbb8fb6fa2f80640ae823d2455d0c2e175bc614a281ce5ece0bd111ecd3661d8ab2f2017781b8b1753b215b705090e449be0525b5ec009a4b SHA512 0401bf6051a48d343f9e4e822446a846b2c6446c68949efe5daf5f5445114312eecb9c99a4565ab2e2f80831aaa32122ecc21f81c8a97136704482cd0f1f1c00
-DIST arduino-1.8.5-Adafruit_CircuitPlayground-1.6.8.zip 404619 BLAKE2B 993ec1282cc711b814db99fe1e4b50a2a6e6559722872e8fbcbb42e022c0e3611e10a4a0285468f82241eb5e15c0f91ff49ae9f2e0190d80a674cba51c93eae6 SHA512 0f0d32841bb6987edfc0e9aa0af8d0f7cf68dd33bf07ff0ec4cdd0d9733bb092b97a4810d7a0828e1d38fb25ec58e8fd3c023f70dffa3b1397386a902c932491
-DIST arduino-1.8.5-Bridge-1.6.3.zip 64717 BLAKE2B cb20da7b1db33ad89bd5fcadd01035592b664a7aaa98c27463fad643deba0b1d7e48b341f75f2564716f5b32e800b96934202c683b9a68c628d5af01662c9b7e SHA512 6836580af17b9fbc1ce39821c2e3891bb2f240904a30e66110a03837a24979093ad88819dc333fa5b47ceff6f6ef17552004356bc71200a2e7b09d2182e91fc5
-DIST arduino-1.8.5-Edison_help_files-1.6.2.zip 3321743 BLAKE2B 5d760ba329741cac27253fb439cf98381c0c0d7327f0c22f61cffc23c48d655278280185e5a7f6c85f3d182cacad4626eb9fe6cc2aaf7d2965bb377e2f39bbaa SHA512 63d4005036b43f09347814433578e8c75a7af5caa0923516deab146ef0867af4e60aad0c9d5d47870dcec0ddb4e5396363e4312425f95a8d8da8725f77da8f3a
-DIST arduino-1.8.5-Esplora-1.0.4.zip 22985 BLAKE2B 799936d5d57b2f054e0f7daf421e9e8657b0867c8b417f28afbd3630d2a5ec08b844b855a3b003d649856713372b32861e36dc97c9bbe865c6a1ff05eac4a7ab SHA512 10665b20d907d586bbe22345799e989b835aaa188040b269ed2925a7b4990c6fb368f0e5afd6c4bed265f2baafc815839ff7c53b5da4940e5338090f39e9c13b
-DIST arduino-1.8.5-Firmata-2.5.6.zip 194883 BLAKE2B b4df63b0417fddf8e71d55373d387650afe47de59d526a0cf546b159c83f8bdeb6fc10f62cec9e7e2755e77b357708d96550071045166b7d5ac1e29ecad34506 SHA512 95ec24ebc6033d4c54ab47f306df8d6d9ab0a666ab0f0123edf8e48cbd66e8c78ccbbd4ff1a4acc0ab16f83dd04957727386ed6d8034284ceec70a0462894526
-DIST arduino-1.8.5-Galileo_help_files-1.6.2.zip 4352077 BLAKE2B 16b99a57535ed77cdd69bb60dbb17085edfb2454b81a1b55b46310aa75e797bf784e39fb4642daf281ff92d9ade6f002cf359f98b95fc5225f66e63d189305fa SHA512 411fcfad9e9877078de62c02accd66ed5e44daf2979cad38c12962c22d73412d084670db77d5b50b3a32f35977961943e90d85ac80484f926468aa994f8b107b
-DIST arduino-1.8.5-Keyboard-1.0.1.zip 5802 BLAKE2B 2fc6d86d54c28d5c1ec5656188ddc159bd0725a966d782e908f9d9bc18a4fb8aadbc09e182e47e80bd08978537bf92b94acd7f5b68c4eb524f6ec71f5a1a0feb SHA512 583328acb8e771b59f3e5bed02892740bcd840baafe63f12850e2c43ae7d05ad31bcc19c5e591e73ab29165952d2a7669bbd07b234dd3abd4c38ea54baf22eec
-DIST arduino-1.8.5-LiquidCrystal-1.0.7.zip 19035 BLAKE2B 051048c871adc34697a12b95dc178e759895fd118a1a341d123155c2807434c6c5b5327e8e9c040b2916a0f06a81e7b27879692bd5813dfe0b2040497aa5002c SHA512 352cbffeaced5e52d1e2b8f118681ce435425bf87c0d1b6c384d11127f371ebcf4a026a0d0320fc324285f959d76b6a28cadba8e038e337d020beca847fcd985
-DIST arduino-1.8.5-Mouse-1.0.1.zip 4093 BLAKE2B 6c071c0bbbea6233ddb0a8573d0c8fbf45e0e83454522eb3040006da2db6baab86bfc3003e833a10807f25b81dfa1aac091256c5e55b882f7633c15bc9122b9a SHA512 be0edd798cafa327752c2d2906193be81bcd214a0f406aca646c043ee527e1c398bde8636b35710b4d02074f01c398147fe2bab7108626d80b4181c0c40aa313
-DIST arduino-1.8.5-RobotIRremote-2.0.0.zip 22611 BLAKE2B 8e2c0bd5356116ad6773f85ec364704f4c6cfd13dce89ded762b2603d68abf0854c66e32a2f0fad470ee433b7431f7c0a878f5f1fd763a770d936264d212b248 SHA512 ad38f813825137f60610d168d6352c871da6d8a39b4378764d82a997719c07c5c314816d8384e205599fc5da198465ed334a8794e7d477d55685eb8f7672acd4
-DIST arduino-1.8.5-Robot_Control-1.0.4.zip 119715 BLAKE2B dd73fc1608b96fbc52f484ffdb7a0a40659f5b7b24546a922b742d9d9c5ff9b82fed58f352485a5b988a7ceaf3259e5aa387d198eacb17d987a3ea6b1d7449ac SHA512 45f710dfc8084f9fcf1608a67978f72885aff06e2bbbcb2613f4e337df8621b0f952383a71a55198618b145df378a94321bd5be83929be897fdd95b6bb69cfe0
-DIST arduino-1.8.5-Robot_Motor-1.0.3.zip 15106 BLAKE2B 0ece114be5c11c1e77c6a2ee524e8cac957852948cba253edec5a0d471341e059ab111310aa21715527e19de800d309fe15b98d1fa326d538cfafe585f280304 SHA512 92d108cc2ddb64e2580fab2cb3a157efb76c5204256332527c3fff67ebb8e520621cdc178738132d4e9ee9e2bcde99968b8f9d3c97c10f7d153792e57cfad111
-DIST arduino-1.8.5-SD-1.1.1.zip 60981 BLAKE2B ef6f3a7d06d76ff203fd238c91aecfa3135b3e6777d982342b11126e118ca7934228b1bd06bcbd7215bef823658c13f9d361e874c5c2ecee811457abb74c15e7 SHA512 b24c2ac276cb531043665b835a1d372294a34ddc2dda12c117b26e4ff33e31975b880e878b17d5798dc18f106091c3b60b6546a672267cf8937c4b0245a85342
-DIST arduino-1.8.5-Servo-1.1.2.zip 27659 BLAKE2B f8eb68547078fe0ba6da88cb3eacdd25440b7c48a52499951111309b5ca331f4608130a74300a063b24c5e8870a1d003c5179b0e0468bde2791326ba141a1d7d SHA512 ade1d725c071e97dc027bc654a1c4b79d3cd6c75bf45bac9c3dfed394451b1661c2488217562515fbb8e29698c7df66e30f8178cea40c7f82056546aa857e348
-DIST arduino-1.8.5-SpacebrewYun-1.0.1.zip 12100 BLAKE2B 1dd4a244cb22f2d03804694db0c7d8dbbeedac58263e80a127060eecf9980146ffca8776123b71b16068f95fb42a16940226eb4239f8a1147ec9e0a76a195e3a SHA512 ec9f499db57d3f86e8615b1a56ae61781add99e9fe4c38ba9faa85d2f7d61090e345a63e8ba4a189c62650631ea5be5cbf22dfb39920a63873408a55c40ac133
-DIST arduino-1.8.5-Temboo-1.2.1.zip 187499 BLAKE2B 4f26317b21492697fa3bbce1fe2cdb34793bd5a1b1ca139dde286185f6403bfd5807e47ac8cd4fd3a6d33791e4bd00dcfb40d430ea2791c233940d489ebbee04 SHA512 4ce89b50cb93f85416b35dc218ad4d5fe0768032d146780d82f1d5d834a24dd831ecc4f1bcfa26d740643a3a7f297cdcec4d19bbf1216482d592d44dcbe2f27c
-DIST arduino-1.8.5-WiFi101-Updater-ArduinoIDE-Plugin-0.9.1.zip 703748 BLAKE2B be9a0e2ac5a890121a0ef59700ee9a001711d7357d1c9aedfac7ca8593ed6bdef32219a88003846d4a793a532a3ebb47cde28dbe4c93dbeef8567ad6fb36bf00 SHA512 f107e5ee544450cc7cabfc7eb43462d374a59446418b5ce3a9f3eb545b03fe6383f42e79eb6919fb4b6e621902cbb84f4fa7119f23b51aa770ebd020ffffdee9
-DIST arduino-1.8.5-reference-1.6.6-3.zip 7004842 BLAKE2B 49d0d41fb499c15f06c8cb8d8211e5039ee9843a6629f305762b262a5bf199e4bbe7fea4716b7734403dc7e83ce35a963035b3a2c0d6a198a4218e7472b18d74 SHA512 65962322b6dcb15da6c119d47c382052d1183772c855b8e8fcdd108b54e730e2374d93741737f3b51e57288a0e8842a6a7f79dce4377ea3630293e6c3e7e8b73
-DIST arduino-1.8.5.tar.gz 48219839 BLAKE2B b031ccd601c42adce0ef06b69bd6103996d7a2a29a4640ab2518bb607e17d90524e1f7dc9861c096df90b0f0a439c5ee8867912b53cb925309dd7e0f6ddf3b54 SHA512 f01b0401edc7ea5d58cb475776b816d05f289060613dd452ca71ecaf4a3a95c5e9ddb5f2cf06d3c165e9e0540c895f9eaea896a7974c88834de569944c4adbd2
-DIST arduino-icons.tar.bz2 58775 BLAKE2B 20f230394a8d725eaf7300f66105b09b31eb96aad8798f325d9e5eec6a1aec8319deb561d1b76d47d08dc6663ec11b6b991e057b88d6619c16a80cf0e10959e1 SHA512 b750e79d6117f5df619f2b765dad6e64f0ba4aa3314b0b6e00801577e3ea1f15951ba15efe7a00f5317285a19ac29ac41c78b71342f45cd164c794a42bafcdd9
-DIST arduino-src-1.0.5.tar.gz 235284641 BLAKE2B 7e7ed1305be468dff5ee32238e51b56c214bb993531c67a5ed178a267b5ff8b0f5303aa2a539b64ac40b20278d0206513c3b26f74dd9120058d97fabbbafef27 SHA512 0a40203b8a31c4d9288500962ada7f5083c280a84d8c56ab7da2d1326e1c02a908a96db589ab10bafc115abefe010bf23f6994c08e43c86a4ac10c2d4ab93ec2
-EBUILD arduino-1.0.5-r1.ebuild 2583 BLAKE2B 78d8ff706d0bdeb6bcede5a70b8eabf862a91f38bb994218924ad01f6174bd181891e8d9e0237b3d2b8564ef519956f32393c6b61a161714ebf22b4f0181e1ea SHA512 40d26584bb9ac446fd29831774e476d984a900004128618883e161c1d2d39c185c2a4e8e34a66c961b2d8905186d67806a844d792f42d1b52c34eb840ea0badb
-EBUILD arduino-1.0.5-r2.ebuild 2602 BLAKE2B 1d32d6ad9581d02f2ba8d8844a19360d855a2ff1d1487898e77ad1b76e87679b8879cc928e0c30e362b22564fc9312b7c55e774f69f92d3bc0a22e18046336ae SHA512 c4a1a0d4ceafc9693c105995a0fae9696e9ed23c677588d9eee9ed25ecd43a011bfab27945201c89685dd3586607a33680ef938a37cc20bf0653c9d373f5b2d7
-EBUILD arduino-1.8.5-r2.ebuild 4959 BLAKE2B 612480dd6acdd8e985dbba219c1b51ed0ae7f0a79c0c1195666e3a15f6fd844ac6598377ceee2355222ac26aa6c342cc4243e2b47629c03d4505d6a769ec7245 SHA512 c0a5ba2de06e57bb7eed1bcda444548386aa9d69abd6996fb0c622063b0a703f70a6c97111af3129d036b78352117e48e1ba294c54b0a4ee2434e3335db76191
-MISC metadata.xml 331 BLAKE2B 5449a181e8d470cb80c1a32d50e79c9f912117df14673adc2d1d989f037b1fd89c8bb4a263b4a883e30ab034e0e1ef1e82f54fa9134511755f9ccd62acff9af9 SHA512 6966c4f97ca07b9ef925691abe06e3110d9901cf15fbc7ed07c5ac65dbe583d346186961f64fba71ff796b5d6ff187870b8db41b3f1836b3fefbcc3e54c7ba4e
diff --git a/dev-embedded/arduino/arduino-1.0.5-r1.ebuild b/dev-embedded/arduino/arduino-1.0.5-r1.ebuild
deleted file mode 100644
index 6dde62efe0a9..000000000000
--- a/dev-embedded/arduino/arduino-1.0.5-r1.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-JAVA_PKG_IUSE="doc examples"
-
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="An open-source AVR electronics prototyping platform"
-HOMEPAGE="https://arduino.cc/ https://github.com/arduino/"
-SRC_URI="https://${PN}.googlecode.com/files/${P}-src.tar.gz
-mirror://gentoo/arduino-icons.tar.bz2"
-LICENSE="GPL-2 GPL-2+ LGPL-2 CC-BY-SA-3.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-RESTRICT="strip binchecks"
-IUSE=""
-
-COMMONDEP="
-dev-java/jna:0
->dev-java/rxtx-2.1:2"
-
-RDEPEND="${COMMONDEP}
-dev-embedded/avrdude
-dev-embedded/uisp
-sys-devel/crossdev
->=virtual/jre-1.5"
-
-DEPEND="${COMMONDEP}
->=virtual/jdk-1.5"
-
-EANT_GENTOO_CLASSPATH="jna,rxtx-2"
-EANT_EXTRA_ARGS="-Dversion=${PV}"
-EANT_BUILD_TARGET="build"
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-
-java_prepare() {
-	# Remove the libraries to ensure the system
-	# libraries are used
-	rm build/linux/dist/tools/avrdude* || die
-	rm build/linux/dist/lib/* || die
-	rm app/lib/* || die
-	rm -rf app/src/processing/app/macosx || die
-	# Patch build/build.xml - remove local jar files
-	# for rxtx and ecj (use system wide versions)
-	epatch "${FILESDIR}"/${PN}-1.0.1-build.xml.patch
-
-	# Patch launcher script to include rxtx class/ld paths
-	epatch "${FILESDIR}"/${PN}-1.0.3-script.patch
-}
-
-src_compile() {
-	eant -f core/build.xml
-	EANT_GENTOO_CLASSPATH_EXTRA="../core/core.jar"
-	eant -f app/build.xml
-	eant "${EANT_EXTRA_ARGS}" -f build/build.xml
-}
-
-src_install() {
-	cd "${S}"/build/linux/work || die
-	java-pkg_dojar lib/core.jar lib/pde.jar
-	java-pkg_dolauncher ${PN} --pwd /usr/share/${PN} --main processing.app.Base
-
-	if use examples; then
-		java-pkg_doexamples examples
-		docompress -x /usr/share/doc/${PF}/examples/
-	fi
-
-	if use doc; then
-		dodoc revisions.txt "${S}"/readme.txt
-		dohtml -r reference
-		java-pkg_dojavadoc "${S}"/build/javadoc/everything
-	fi
-
-	insinto "/usr/share/${PN}/"
-	doins -r hardware libraries
-	fowners -R root:uucp "/usr/share/${PN}/hardware"
-
-	insinto "/usr/share/${PN}/lib"
-	doins -r lib/*.txt lib/theme lib/*.jpg
-
-	# use system avrdude
-	# patching class files is too hard
-	dosym /usr/bin/avrdude "/usr/share/${PN}/hardware/tools/avrdude"
-	dosym /etc/avrdude.conf "/usr/share/${PN}/hardware/tools/avrdude.conf"
-
-	# install menu and icons
-	domenu "${FILESDIR}/${PN}.desktop"
-	for sz in 16 24 32 48 128 256; do
-		newicon -s $sz \
-			"${WORKDIR}/${PN}-icons/debian_icons_${sz}x${sz}_apps_${PN}.png" \
-			"${PN}.png"
-	done
-}
-
-pkg_postinst() {
-	[ ! -x /usr/bin/avr-g++ ] && ewarn "Missing avr-g++; you need to crossdev -s4 avr"
-}
diff --git a/dev-embedded/arduino/arduino-1.0.5-r2.ebuild b/dev-embedded/arduino/arduino-1.0.5-r2.ebuild
deleted file mode 100644
index 7ca3ff607939..000000000000
--- a/dev-embedded/arduino/arduino-1.0.5-r2.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-JAVA_PKG_IUSE="doc examples"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="An open-source AVR electronics prototyping platform"
-HOMEPAGE="https://arduino.cc/ https://github.com/arduino/"
-SRC_URI="
-	https://github.com/arduino/Arduino/archive/${PV}.tar.gz -> arduino-src-${PV}.tar.gz
-	mirror://gentoo/arduino-icons.tar.bz2
-"
-
-LICENSE="GPL-2 GPL-2+ LGPL-2 CC-BY-SA-3.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-RESTRICT="strip binchecks"
-
-S="${WORKDIR}/Arduino-${PV}"
-
-CDEPEND="
-	dev-java/jna:0
-	>dev-java/rxtx-2.1:2"
-
-RDEPEND="
-	${CDEPEND}
-	dev-embedded/avrdude
-	dev-embedded/uisp
-	sys-devel/crossdev
-	>=virtual/jre-1.6"
-
-DEPEND="
-	${CDEPEND}
-	>=virtual/jdk-1.6"
-
-EANT_GENTOO_CLASSPATH="jna,rxtx-2"
-EANT_EXTRA_ARGS="-Dversion=${PV}"
-EANT_BUILD_TARGET="build"
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-
-src_prepare() {
-	# Remove the libraries to ensure the system
-	# libraries are used
-	rm -rv \
-		build/linux/dist/tools/avrdude* \
-		build/linux/dist/lib/* \
-		app/lib/* \
-		app/src/processing/app/macosx || die
-	# Patch build/build.xml - remove local jar files
-	# for rxtx and ecj (use system wide versions)
-	epatch \
-		"${FILESDIR}"/${PN}-1.0.1-build.xml.patch \
-		"${FILESDIR}"/${PN}-1.0.3-script.patch
-
-	default
-}
-
-src_compile() {
-	eant -f core/build.xml
-	EANT_GENTOO_CLASSPATH_EXTRA="../core/core.jar"
-	eant -f app/build.xml
-	eant "${EANT_EXTRA_ARGS}" -f build/build.xml
-}
-
-src_install() {
-	cd "${S}"/build/linux/work || die
-	java-pkg_dojar lib/core.jar lib/pde.jar
-	java-pkg_dolauncher ${PN} --pwd /usr/share/${PN} --main processing.app.Base
-
-	if use examples; then
-		java-pkg_doexamples examples
-		docompress -x /usr/share/doc/${PF}/examples/
-	fi
-
-	if use doc; then
-		DOCS=( revisions.txt "${S}"/readme.txt )
-		HTML_DOCS=( reference )
-		einstalldocs
-		java-pkg_dojavadoc "${S}"/build/javadoc/everything
-	fi
-
-	insinto "/usr/share/${PN}/"
-	doins -r hardware libraries
-	fowners -R root:uucp "/usr/share/${PN}/hardware"
-
-	insinto "/usr/share/${PN}/lib"
-	doins -r lib/*.txt lib/theme lib/*.jpg
-
-	# use system avrdude
-	# patching class files is too hard
-	dosym /usr/bin/avrdude "/usr/share/${PN}/hardware/tools/avrdude"
-	dosym /etc/avrdude.conf "/usr/share/${PN}/hardware/tools/avrdude.conf"
-
-	# install menu and icons
-	domenu "${FILESDIR}/${PN}.desktop"
-	for sz in 16 24 32 48 128 256; do
-		newicon -s $sz \
-			"${WORKDIR}/${PN}-icons/debian_icons_${sz}x${sz}_apps_${PN}.png" \
-			"${PN}.png"
-	done
-}
-
-pkg_postinst() {
-	[[ ! -x /usr/bin/avr-g++ ]] && ewarn "Missing avr-g++; you need to crossdev -s4 avr"
-}
diff --git a/dev-embedded/arduino/arduino-1.8.5-r2.ebuild b/dev-embedded/arduino/arduino-1.8.5-r2.ebuild
deleted file mode 100644
index 50b52632bde4..000000000000
--- a/dev-embedded/arduino/arduino-1.8.5-r2.ebuild
+++ /dev/null
@@ -1,167 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit java-pkg-2 java-ant-2 gnome2-utils
-
-DESCRIPTION="An open-source AVR electronics prototyping platform"
-HOMEPAGE="https://arduino.cc/ https://github.com/arduino/"
-
-ARDUINO_LIBRARIES=(
-	"Firmata 2.5.6"
-	"Bridge 1.6.3"
-	"Robot_Control 1.0.4"
-	"Robot_Motor 1.0.3"
-	"RobotIRremote 2.0.0"
-	"SpacebrewYun 1.0.1"
-	"Temboo 1.2.1"
-	"Esplora 1.0.4"
-	"Mouse 1.0.1"
-	"Keyboard 1.0.1"
-	"SD 1.1.1"
-	"Servo 1.1.2"
-	"LiquidCrystal 1.0.7"
-	"Adafruit_CircuitPlayground 1.6.8 https://github.com/Adafruit/Adafruit_CircuitPlayground/archive/1.6.8.zip"
-	"WiFi101-Updater-ArduinoIDE-Plugin 0.9.1 https://github.com/arduino-libraries/WiFi101-FirmwareUpdater-Plugin/releases/download/v0.9.1/WiFi101-Updater-ArduinoIDE-Plugin-0.9.1.zip build/shared/"
-)
-
-for lib in "${ARDUINO_LIBRARIES[@]}"; do
-	lib=( $lib )
-	default_url="https://github.com/arduino-libraries/${lib[0]}/archive/${lib[1]}.zip"
-	url=${lib[2]:-$default_url}
-	ARDUINO_LIBRARIES_URI+=" ${url} -> ${P}-${lib[0]}-${lib[1]}.zip"
-done
-
-ARDUINO_DOCS=(
-	"reference-1.6.6-3"
-	"Galileo_help_files-1.6.2"
-	"Edison_help_files-1.6.2"
-)
-
-for docname in "${ARDUINO_DOCS[@]}"; do
-	ARDUINO_DOCS_URI+=" https://downloads.arduino.cc/${docname}.zip -> ${P}-${docname}.zip"
-done
-
-SRC_URI="https://github.com/arduino/Arduino/archive/${PV}.tar.gz -> ${P}.tar.gz
-	${ARDUINO_LIBRARIES_URI}
-	doc? (
-		${ARDUINO_DOCS_URI}
-	)"
-
-LICENSE="GPL-2 LGPL-2.1 CC-BY-SA-3.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-# bincheck RESTRICT is needed because firmware that ships with arduino contains code that makes
-# scanelf bark. It's also why we need a separate package for arduino-listserialportsc because if
-# we install it in the context of this package, we will get QA notices telling us we're doing a
-# bad thing.
-RESTRICT="strip binchecks"
-IUSE="doc"
-
-CDEPEND="dev-embedded/arduino-builder"
-
-RDEPEND="${CDEPEND}
-	>=dev-util/astyle-3.1[java]
-	dev-embedded/arduino-listserialportsc
-	>=virtual/jre-1.8"
-
-DEPEND="${CDEPEND}
-	app-arch/unzip
-	>=virtual/jdk-1.8"
-
-EANT_BUILD_TARGET="build"
-# don't run the default "javadoc" target, we don't have one.
-EANT_DOC_TARGET=""
-EANT_BUILD_XML="build/build.xml"
-EANT_EXTRA_ARGS="-Dno_arduino_builder=1 -Dlocal_sources=1"
-
-S="${WORKDIR}/Arduino-${PV}"
-SHARE="/usr/share/${PN}"
-
-src_unpack() {
-	# We don't want to unpack libraries, just move zip files into the work dir
-	unpack `echo ${A} | cut -d ' ' -f1`
-	local lib
-	for lib in "${ARDUINO_LIBRARIES[@]}"; do
-		lib=( $lib )
-		local destfolder=${lib[3]:-build/}
-		cp "${DISTDIR}/${P}-${lib[0]}-${lib[1]}.zip" "${S}/${destfolder}/${lib[0]}-${lib[1]}.zip" || die
-	done
-	if use doc; then
-		local docname
-		for docname in "${ARDUINO_DOCS[@]}"; do
-			cp "${DISTDIR}/${P}-${docname}.zip" "${S}/build/shared/${docname}.zip" || die
-		done
-	fi
-}
-
-src_prepare() {
-	# We need to disable astyle/listserialportsc and toolchain (avr-gcc, avrdude) bundling.
-	eapply "${FILESDIR}/${PN}-1.8.5-build.xml.patch"
-
-	# We need to replace relative paths for toolchain executable by paths to system ones.
-	eapply "${FILESDIR}/${PN}-1.8.5-avr-platform.txt.patch"
-
-	# We need to load system astyle/listserialportsc instead of bundled ones.
-	eapply "${FILESDIR}/${PN}-1.8.5-lib-loading.patch"
-	default
-}
-
-src_compile() {
-	if ! use doc; then
-		EANT_EXTRA_ARGS+=" -Dno_docs=1"
-	fi
-	java-pkg-2_src_compile
-}
-
-src_install() {
-	cd "${S}"/build/linux/work || die
-
-	java-pkg_dojar lib/*.jar
-	java-pkg_dolauncher ${PN} \
-		--pwd "${SHARE}" \
-		--main "processing.app.Base" \
-		--java_args "-DAPP_DIR=${SHARE} -Djava.library.path=${EPREFIX}/usr/$(get_libdir)"
-
-	# Install libraries
-	insinto "${SHARE}"
-
-	doins -r examples hardware lib libraries tools
-
-	# In upstream's build process, we copy these fiels below from the bundled arduino-builder.
-	# Here we do the same thing, but from the system arduino-builder.
-	dosym "${EPREFIX}/usr/share/arduino-builder/platform.txt" "${SHARE}/hardware/platform.txt"
-	dosym "${EPREFIX}/usr/share/arduino-builder/platform.keys.rewrite.txt" "${SHARE}/hardware/platform.keys.rewrite.txt"
-	dosym "${EPREFIX}/usr/bin/arduino-builder" "${SHARE}/arduino-builder"
-
-	# hardware/tools/avr needs to exist or arduino-builder will
-	# complain about missing required -tools arg
-	dodir "${SHARE}/hardware/tools/avr"
-
-	if use doc; then
-		HTML_DOCS=( reference )
-		einstalldocs
-
-		# arduino expects its doc in its "main" directory. symlink it.
-		dosym "${EPREFIX}/usr/share/doc/${PF}/html/reference" "${SHARE}/reference"
-	fi
-
-	# Install menu and icons
-	domenu "${FILESDIR}/${PN}.desktop"
-	cd lib/icons || die
-	local icondir
-	for icondir in *; do
-		# icondir name is something like "24x24" we want the "24" part
-		local iconsize=`cut -dx -f1 <<< "${icondir}"`
-		newicon -s $iconsize \
-			"${icondir}/apps/arduino.png" \
-			"${PN}.png"
-	done
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	[[ ! -x /usr/bin/avr-g++ ]] && ewarn "Missing avr-g++; you need to crossdev -s4 avr"
-}
diff --git a/dev-embedded/arduino/files/arduino-1.0.1-build.xml.patch b/dev-embedded/arduino/files/arduino-1.0.1-build.xml.patch
deleted file mode 100644
index afde2e05b661..000000000000
--- a/dev-embedded/arduino/files/arduino-1.0.1-build.xml.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- arduino-1.0.1/build/build.xml	2012-04-09 00:16:12.000000000 +0100
-+++ arduino-1.0.1/build/build.xml	2012-06-25 06:12:09.000000000 +0100
-@@ -24,9 +24,9 @@
-   <fileset dir=".." id="runtime.jars">
-     <include name="core/core.jar" />
-     <include name="app/pde.jar" />
--    <include name="app/lib/ecj.jar" />
-+<!--    <include name="app/lib/ecj.jar" /> -->
-     <include name="app/lib/jna.jar" />
--    <include name="app/lib/RXTXcomm.jar" />
-+<!--    <include name="app/lib/RXTXcomm.jar" /> -->
-     <include name="app/lib/ant.jar" />
-     <include name="app/lib/ant-launcher.jar" />
-   </fileset>
-@@ -361,16 +361,18 @@
-   </target>
- 
-   <target name="linux64-build" depends="linux-build" description="Build linux (64-bit) version">
--    <copy tofile="linux/work/hardware/tools/avrdude" file="linux/dist/tools/avrdude64" overwrite="true" />
--    <copy tofile="linux/work/lib/librxtxSerial.so" file="linux/dist/lib/librxtxSerial64.so" overwrite="true" />
-+<!--    <copy tofile="linux/work/hardware/tools/avrdude" file="linux/dist/tools/avrdude64" overwrite="true" />      -->
-+<!--    <copy tofile="linux/work/lib/librxtxSerial.so" file="linux/dist/lib/librxtxSerial64.so" overwrite="true" /> -->
- 
--    <chmod perm="755" file="linux/work/hardware/tools/avrdude" />
-+<!--    <chmod perm="755" file="linux/work/hardware/tools/avrdude" /> -->
- 
-     <!-- Unzip AVR tools -->
--    <exec executable="tar" dir="linux/work/hardware">
-+<!-- Removed by Paulj - use system installed instead -->
-+<!--    <exec executable="tar" dir="linux/work/hardware">
-       <arg value="-xjf"/>
-       <arg value="../../avr_tools_linux64.tar.bz2"/>
--    </exec>
-+    </exec> 
-+-->
-   </target>
-   
-   <target name="linux32-run" depends="linux32-build" 
diff --git a/dev-embedded/arduino/files/arduino-1.0.3-script.patch b/dev-embedded/arduino/files/arduino-1.0.3-script.patch
deleted file mode 100644
index b4accc8959a1..000000000000
--- a/dev-embedded/arduino/files/arduino-1.0.3-script.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/build/linux/dist/arduino b/build/linux/dist/arduino
-index b5eb9db..3f3b4aa 100644
---- a/build/linux/dist/arduino
-+++ b/build/linux/dist/arduino
-@@ -10,11 +10,13 @@ for LIB in \
-     lib/*.jar \
-     ;
- do
--    CLASSPATH="${CLASSPATH}:${LIB}"
-+    CLASSPATH="${CLASSPATH+$CLASSPATH:}${LIB}"
-+
- done
-+CLASSPATH="${CLASSPATH+$CLASSPATH:}:$(java-config -dp rxtx-2)"
- export CLASSPATH
- 
--LD_LIBRARY_PATH=`pwd`/lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
-+LD_LIBRARY_PATH="$(java-config -di rxtx-2)${LD_LIBRARY_PATH+:$LD_LIBRARY_PATH}"
- export LD_LIBRARY_PATH
- 
- export PATH="${APPDIR}/java/bin:${PATH}"
diff --git a/dev-embedded/arduino/files/arduino-1.8.5-avr-platform.txt.patch b/dev-embedded/arduino/files/arduino-1.8.5-avr-platform.txt.patch
deleted file mode 100644
index 9903da46dc4a..000000000000
--- a/dev-embedded/arduino/files/arduino-1.8.5-avr-platform.txt.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/hardware/arduino/avr/platform.txt b/hardware/arduino/avr/platform.txt
-index f7fb447c1..8ae8b73d9 100644
---- a/hardware/arduino/avr/platform.txt
-+++ b/hardware/arduino/avr/platform.txt
-@@ -18,7 +18,7 @@ compiler.warning_flags.more=-Wall
- compiler.warning_flags.all=-Wall -Wextra
- 
- # Default "compiler.path" is correct, change only if you want to override the initial value
--compiler.path={runtime.tools.avr-gcc.path}/bin/
-+compiler.path=/usr/bin/
- compiler.c.cmd=avr-gcc
- compiler.c.flags=-c -g -Os {compiler.warning_flags} -std=gnu11 -ffunction-sections -fdata-sections -MMD -flto -fno-fat-lto-objects
- compiler.c.elf.flags={compiler.warning_flags} -Os -g -flto -fuse-linker-plugin -Wl,--gc-sections
-@@ -91,9 +91,9 @@ recipe.preproc.macros="{compiler.path}{compiler.cpp.cmd}" {compiler.cpp.flags} {
- # AVR Uploader/Programmers tools
- # ------------------------------
- 
--tools.avrdude.path={runtime.tools.avrdude.path}
--tools.avrdude.cmd.path={path}/bin/avrdude
--tools.avrdude.config.path={path}/etc/avrdude.conf
-+tools.avrdude.path=/usr
-+tools.avrdude.cmd.path=/usr/bin/avrdude
-+tools.avrdude.config.path=/etc/avrdude.conf
- 
- tools.avrdude.network_cmd={runtime.tools.arduinoOTA.path}/bin/arduinoOTA
- 
diff --git a/dev-embedded/arduino/files/arduino-1.8.5-build.xml.patch b/dev-embedded/arduino/files/arduino-1.8.5-build.xml.patch
deleted file mode 100644
index 59d796ca5a7a..000000000000
--- a/dev-embedded/arduino/files/arduino-1.8.5-build.xml.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff --git a/build/build.xml b/build/build.xml
-index d95f8def6..13ba60286 100644
---- a/build/build.xml
-+++ b/build/build.xml
-@@ -641,7 +641,7 @@
-     </chmod>
-   </target>
- 
--  <target name="linux-libastyle-x86" depends="linux-build" description="Download libastyle.so for x86/x64 arch">
-+  <target name="linux-libastyle-x86" depends="linux-build" description="Download libastyle.so for x86/x64 arch" if="never">
-     <antcall target="unzip">
-       <param name="archive_file" value="./libastylej-2.05.1-3.zip" />
-       <param name="archive_url" value="https://downloads.arduino.cc/libastylej-2.05.1-3.zip" />
-@@ -666,7 +666,7 @@
- 
-   </target>
- 
--  <target name="linux-libastyle-arm" depends="linux-build" description="Download libastyle.so for ARM">
-+  <target name="linux-libastyle-arm" depends="linux-build" description="Download libastyle.so for ARM" if="never">
-     <antcall target="unzip">
-       <param name="archive_file" value="./libastylej-2.05.1-3.zip" />
-       <param name="archive_url" value="https://downloads.arduino.cc/libastylej-2.05.1-3.zip" />
-@@ -1186,7 +1186,7 @@
- 	  depends="linux-clean, windows-clean, macosx-clean, subprojects-clean">
-   </target>
- 
--  <target name="avr-toolchain-bundle" unless="light_bundle">
-+  <target name="avr-toolchain-bundle" if="never">
-     <!-- Unzip AVR tools -->
-     <mkdir dir="${staging_folder}/work/${staging_hardware_folder}/tmp/gcc"/>
- 
diff --git a/dev-embedded/arduino/files/arduino-1.8.5-lib-loading.patch b/dev-embedded/arduino/files/arduino-1.8.5-lib-loading.patch
deleted file mode 100644
index d2516aeb7357..000000000000
--- a/dev-embedded/arduino/files/arduino-1.8.5-lib-loading.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/app/src/cc/arduino/packages/formatter/AStyleInterface.java b/app/src/cc/arduino/packages/formatter/AStyleInterface.java
-index 4224bf164..fa92506ba 100644
---- a/app/src/cc/arduino/packages/formatter/AStyleInterface.java
-+++ b/app/src/cc/arduino/packages/formatter/AStyleInterface.java
-@@ -41,7 +41,7 @@ public class AStyleInterface {
-       loadLib(Base.getContentFile(System.mapLibraryName("msvcp100")));
-       loadLib(Base.getContentFile(System.mapLibraryName("msvcr100")));
-     }
--    loadLib(new File(Base.getContentFile("lib"), System.mapLibraryName("astylej")));
-+    System.loadLibrary("astylej");
-   }
- 
-   private static void loadLib(File lib) {
-diff --git a/arduino-core/src/processing/app/Platform.java b/arduino-core/src/processing/app/Platform.java
-index 28a7ba0f5..8a943a8ac 100644
---- a/arduino-core/src/processing/app/Platform.java
-+++ b/arduino-core/src/processing/app/Platform.java
-@@ -154,7 +154,7 @@ public class Platform {
-   }
- 
-   static {
--    loadLib(new File(BaseNoGui.getContentFile("lib"), System.mapLibraryName("listSerialsj")));
-+    System.loadLibrary("listSerialsj");
-   }
- 
-   private static void loadLib(File lib) {
diff --git a/dev-embedded/arduino/files/arduino.desktop b/dev-embedded/arduino/files/arduino.desktop
deleted file mode 100644
index b75dea564b5d..000000000000
--- a/dev-embedded/arduino/files/arduino.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Name=arduino
-Comment=Open-source electronics prototyping platform
-Exec=arduino
-Icon=arduino
-Terminal=false
-Type=Application
-Categories=Development;
-StartupNotify=false
diff --git a/dev-embedded/arduino/metadata.xml b/dev-embedded/arduino/metadata.xml
deleted file mode 100644
index 02101dbf5664..000000000000
--- a/dev-embedded/arduino/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>embedded@gentoo.org</email>
-		<name>Embedded Gentoo</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">arduino/Arduino</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-embedded/avarice-2.13 b/dev-embedded/avarice-2.13
new file mode 100644
index 000000000000..af88f2e09048
--- /dev/null
+++ b/dev-embedded/avarice-2.13
@@ -0,0 +1,9 @@
+DEFINED_PHASES=-
+DESCRIPTION=Interface for GDB to Atmel AVR JTAGICE in circuit emulator
+EAPI=4
+HOMEPAGE=http://avarice.sourceforge.net/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=mirror://sourceforge/avarice/avarice-2.13.tar.bz2
+_md5_=3a4376642a1c880c471b8f4142a11e9f
diff --git a/dev-embedded/avarice/Manifest b/dev-embedded/avarice/Manifest
deleted file mode 100644
index 0988cad57ae3..000000000000
--- a/dev-embedded/avarice/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST avarice-2.13.tar.bz2 196063 BLAKE2B 4380478684d360708310b46cf46b3eca359dc4145a33f6330d5cb18e13c57c18229eeee6fe72b8740baf585d19c4efb21b685afb0317c830d89bb550d245192d SHA512 fa67e46061e32ec9db10bed961484ee050b219e92c2e9900ad35861b3c45161cc6ea6f2a9e63b0303242ef9992193cd963ac5871583db434409c10995b420b5f
-EBUILD avarice-2.13.ebuild 375 BLAKE2B 44b7fe42e0768212b43c2bbb59b95a1d64e39d0de061e319c6747149229f05be1b66aa5c72dded5ad7140d379a905bf92e821547c2c12207a2ed96be24c7f830 SHA512 1d34610b0a0c489b23e5e6d7cceffa00ddde86d923a9ec0260032e3e677c156c7027441aee920d987e8b2c62f5cb3ab4633cd75fddd3e1099997738377d67f3f
-MISC metadata.xml 328 BLAKE2B 62af0d18423f51f57fa27f945bb08d9db6d230fcb0f07210f3ee1fdc5bc0e21c4c59e152643f106db54e94087bba1b647e49e58abafef02e41963d8083da868b SHA512 1ee78acf39c10cd871e5ce41abd17adc3e3d5f8ee2443ad5f6798079ea7233010d65be08ed9e80df13b4d0326828702989a5b983ada32bf8029052bd996e2616
diff --git a/dev-embedded/avarice/avarice-2.13.ebuild b/dev-embedded/avarice/avarice-2.13.ebuild
deleted file mode 100644
index 84ac54bd2051..000000000000
--- a/dev-embedded/avarice/avarice-2.13.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-DESCRIPTION="Interface for GDB to Atmel AVR JTAGICE in circuit emulator"
-HOMEPAGE="http://avarice.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DOCS="AUTHORS ChangeLog doc/*.txt"
diff --git a/dev-embedded/avarice/metadata.xml b/dev-embedded/avarice/metadata.xml
deleted file mode 100644
index c87d0b83ecd8..000000000000
--- a/dev-embedded/avarice/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>embedded@gentoo.org</email>
-		<name>Embedded Gentoo</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">avarice</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-embedded/avr-libc-2.0.0 b/dev-embedded/avr-libc-2.0.0
new file mode 100644
index 000000000000..6e0b10950ed9
--- /dev/null
+++ b/dev-embedded/avr-libc-2.0.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install prepare setup
+DEPEND=>=sys-devel/crossdev-0.9.1
+DESCRIPTION=C library for Atmel AVR microcontrollers
+EAPI=5
+HOMEPAGE=http://www.nongnu.org/avr-libc/
+IUSE=doc headers-only
+KEYWORDS=amd64
+LICENSE=BSD
+SLOT=0
+SRC_URI=https://savannah.nongnu.org/download/avr-libc/avr-libc-2.0.0.tar.bz2 https://savannah.nongnu.org/download/avr-libc/avr-libc-manpages-2.0.0.tar.bz2 doc? ( https://savannah.nongnu.org/download/avr-libc/avr-libc-user-manual-2.0.0.tar.bz2 )
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=cf6fd0dec05c02218211365bf0f51325
diff --git a/dev-embedded/avr-libc/Manifest b/dev-embedded/avr-libc/Manifest
deleted file mode 100644
index e5113a37ea26..000000000000
--- a/dev-embedded/avr-libc/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST avr-libc-2.0.0.tar.bz2 3590893 BLAKE2B cc628f5f55d12c78ca9215e3e37b4a0061feae3c7c19653384b5d789fb6e1c70efe420631bf987379ae5524ec0f65c6df459eaad0fcfb80833cc4732ed5e796b SHA512 fc8d062043d633350dbe05978935dcb8028257a4f1013f246af9658aef0671def19ac11577d1ee9302df68df1b8cf030b22441d96852e185db212263aacabea6
-DIST avr-libc-manpages-2.0.0.tar.bz2 151137 BLAKE2B 7fbaa9c1014e8cf9b4caac723b57f9c24272da458b987ba302730116437bb3a5b49296c6804d857b421e6f71f2c4efda959d278ebcc14aba35fdd44a958dfca8 SHA512 8b4aaa6ae176076171e90e629e0e6142c4c56f9cc4f1640432384276df2f7b457f5137739535b07b9cede9b5b2e564db7fe200203faa4e2d0cd9874432507823
-DIST avr-libc-user-manual-2.0.0.tar.bz2 932920 BLAKE2B d3190af26dbe38719bc78e73de31af1ce69d885b928f48a4fb9ccd145a33f19f71c017253ad16eadc641fc88495c642dd5fd1668c6bebddf7d813f70db01a3f6 SHA512 246180be1f793b46335a49f33028ff59bd7cc06ca3d8627309521801e405e0e1305663a2c0760521467e75732ad513749bf707732b59fb17744e51acda9bb2c6
-EBUILD avr-libc-2.0.0.ebuild 2017 BLAKE2B d04d957bfe9ffe04f95184d7628c84e52772c57790e4a7f903edd7e415cce2bba007f79b9e0a6fa0367bc29484541f59bb3f8e9aac23ba8609563574b2cb940f SHA512 12e157b71ac9eafe9bd9add60ecdf999f5af83ae24657265751f1b5e0b8e9e4270c4e806e8bbc8da800645de25b8ebf62d6dedbed7e1e45944b20e60a23db26c
-MISC metadata.xml 470 BLAKE2B 8855ba12ec2147f31efb154d314b9e2e625076453bc4ddf43022b08a597a1f1ea5bb401768e38b000718b200b8e60d16214a89c1642b66d31386152e242a4e03 SHA512 0a09da72e78c945fa53ee056913bc563897dcb65c33e8cba04dfd15d57a1578a502f18071b0a3cd5feecdbc7e570bfddfde05deda12746e70962b841d90d566a
diff --git a/dev-embedded/avr-libc/avr-libc-2.0.0.ebuild b/dev-embedded/avr-libc/avr-libc-2.0.0.ebuild
deleted file mode 100644
index 79b7f1163fc2..000000000000
--- a/dev-embedded/avr-libc/avr-libc-2.0.0.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-CHOST="avr"
-CTARGET="avr"
-
-inherit flag-o-matic eutils
-
-DESCRIPTION="C library for Atmel AVR microcontrollers"
-HOMEPAGE="http://www.nongnu.org/avr-libc/"
-SRC_URI="https://savannah.nongnu.org/download/avr-libc/${P}.tar.bz2
-	https://savannah.nongnu.org/download/avr-libc/${PN}-manpages-${PV}.tar.bz2
-	doc? ( https://savannah.nongnu.org/download/avr-libc/${PN}-user-manual-${PV}.tar.bz2 )"
-
-LICENSE="BSD"
-SLOT="0"
-# 'amd64' is a blessed placeholder for crossdev. It could
-# be any other arch. See bug #620316#c5
-# Don't add more arches to KEYWORDS.
-KEYWORDS="amd64"
-IUSE="doc headers-only"
-
-DEPEND=">=sys-devel/crossdev-0.9.1"
-[[ ${CATEGORY/cross-} != ${CATEGORY} ]] \
-	&& RDEPEND="!dev-embedded/avr-libc" \
-	|| RDEPEND=""
-
-DOCS="AUTHORS ChangeLog* NEWS README"
-
-pkg_setup() {
-	# check for avr-gcc, bug #134738
-	ebegin "Checking for avr-gcc"
-	if type -p avr-gcc > /dev/null ; then
-		eend 0
-	else
-		eend 1
-
-		eerror
-		eerror "Failed to locate 'avr-gcc' in \$PATH. You can install an AVR toolchain using:"
-		eerror "  $ crossdev -t avr"
-		eerror
-		die "AVR toolchain not found"
-	fi
-}
-
-src_prepare() {
-	epatch_user #455828
-
-	# work around broken gcc versions PR45261
-	local mcu
-	for mcu in $(sed -r -n '/CHECK_AVR_DEVICE/{s:.*[(](.*)[)]:\1:;p}' configure.ac) ; do
-		if avr-gcc -E - -mmcu=${mcu} <<<"" |& grep -q 'unknown MCU' ; then
-			sed -i "/HAS_${mcu}=yes/s:yes:no:" configure
-		fi
-	done
-
-	# Install docs in correct directory
-	sed -i -e "/DOC_INST_DIR/s:\$(VERSION):${PVR}:" configure || die
-
-	strip-flags
-	strip-unsupported-flags
-}
-
-src_install() {
-	default
-
-	# man pages can not go into standard locations
-	# as they would then overwrite libc man pages
-	insinto /usr/share/doc/${PF}/man/man3
-	doins "${WORKDIR}"/man/man3/*
-
-	use doc	&& dohtml "${WORKDIR}"/${PN}-user-manual-${PV}/*
-
-	# Make sure diff cross-compilers don't collide #414075
-	mv "${ED}"/usr/share/doc/{${PF},${CTARGET}-${PF}} || die
-}
diff --git a/dev-embedded/avr-libc/metadata.xml b/dev-embedded/avr-libc/metadata.xml
deleted file mode 100644
index 2f1e470713ee..000000000000
--- a/dev-embedded/avr-libc/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>embedded@gentoo.org</email>
-		<name>Embedded Gentoo</name>
-	</maintainer>
-	<longdescription>
-		This package is part of the avr- binutils, -gcc, -lib toolchain for the Atmel microcontrollers.
-		These ebuilds have been created and submitted by Scott L. Price (dflytech.com).
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-embedded/avra-1.3.0 b/dev-embedded/avra-1.3.0
new file mode 100644
index 000000000000..040c7ec2cd00
--- /dev/null
+++ b/dev-embedded/avra-1.3.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install prepare
+DEPEND=>=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=Atmel AVR Assembler
+EAPI=4
+HOMEPAGE=http://avra.sourceforge.net
+IUSE=doc examples
+KEYWORDS=amd64 ~ppc x86
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=mirror://sourceforge/avra/avra-1.3.0.tar.bz2
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=7c159fb33cd469f4ca6ad662534a1b35
diff --git a/dev-embedded/avra/Manifest b/dev-embedded/avra/Manifest
deleted file mode 100644
index 9db7023d2fd8..000000000000
--- a/dev-embedded/avra/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST avra-1.3.0.tar.bz2 314903 BLAKE2B f5eb831bf997ab22b8e40cc90eb7b769d008461550ecce2fc139f99cf9b76511e2f5ca078d82bb9d6526ad7b9e1497dac369a29a4d0eae3a01e19af177857ed9 SHA512 4215b87379a6c2a9b81048dfd717a05881e2dc38359e49812be44bb64ac3e45911367fdf73f0c9f753e67e9ea23d19f33365dc4140ec94d13f1d8077b978fb93
-EBUILD avra-1.3.0.ebuild 718 BLAKE2B 37ef92fc5da29bc4cac84d27140d1e679b919d521916d2b8c67db8accc54a10e8271d2ab7f68081bc080e6f3128c0d58c0e55e362d129cf7670ed572d5710e2b SHA512 54e7179d890f41b682083900790d48c12ba1fae29745d0725b2f15c7457e91ab5df78fe019aa51e1f6bb3758b498fa93483db43985ae785f247e139d4da6a2d8
-MISC metadata.xml 331 BLAKE2B 58b638d3601ab9f89b2c0b144be53740cc88258f49a54e1390db9d5572b2a6a1c8c5d14f6075ab78f705aa7000a3560af5ec3c0c2b17bbd8de26b9d267130c69 SHA512 d90543ce4a88b8753f5e69da6d3bd3f92e9410fb9ca5a69091c4629ede6672ab4e8c1948b449d46aac55661e28eed97210f98ff74ae1e376189f385d06ffde83
diff --git a/dev-embedded/avra/avra-1.3.0.ebuild b/dev-embedded/avra/avra-1.3.0.ebuild
deleted file mode 100644
index 5d7142e984e6..000000000000
--- a/dev-embedded/avra/avra-1.3.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit autotools
-
-DESCRIPTION="Atmel AVR Assembler"
-HOMEPAGE="http://avra.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="doc examples"
-
-S="${WORKDIR}/${P}/src/"
-
-src_prepare() {
-	eautoreconf
-}
-
-src_install() {
-	local datadir="${WORKDIR}/${P}"
-
-	default
-
-	dodoc ${datadir}/{AUTHORS,INSTALL,README,TODO}
-
-	# install headers
-	insinto /usr/include/avr
-	doins "${datadir}/includes/"*
-
-	use doc && dohtml -r "${datadir}/doc/"*
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins "${datadir}/examples/"*
-	fi
-}
diff --git a/dev-embedded/avra/metadata.xml b/dev-embedded/avra/metadata.xml
deleted file mode 100644
index 111658bb65be..000000000000
--- a/dev-embedded/avra/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-	<longdescription lang="en">
-		Assembler for Atmel AVR microprocessors
-	</longdescription>
-	<upstream>
-		<remote-id type="sourceforge">avra</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-embedded/avrdude-6.3 b/dev-embedded/avrdude-6.3
new file mode 100644
index 000000000000..ab92e8a93695
--- /dev/null
+++ b/dev-embedded/avrdude-6.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare
+DEPEND=virtual/libusb:1 virtual/libusb:0 ftdi? ( dev-embedded/libftdi:= ) ncurses? ( sys-libs/ncurses:0= ) readline? ( sys-libs/readline:0= )
+DESCRIPTION=AVR Downloader/UploaDEr
+EAPI=6
+HOMEPAGE=https://savannah.nongnu.org/projects/avrdude
+IUSE=doc ftdi ncurses readline
+KEYWORDS=amd64 arm ppc ppc64 x86
+LICENSE=GPL-2
+RDEPEND=virtual/libusb:1 virtual/libusb:0 ftdi? ( dev-embedded/libftdi:= ) ncurses? ( sys-libs/ncurses:0= ) readline? ( sys-libs/readline:0= )
+SLOT=0
+SRC_URI=mirror://nongnu/avrdude/avrdude-6.3.tar.gz doc? ( mirror://nongnu/avrdude/avrdude-doc-6.3.tar.gz mirror://nongnu/avrdude/avrdude-doc-6.3.pdf )
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=541541cd5b7ad2c007dc883e864041bf
diff --git a/dev-embedded/avrdude-9999 b/dev-embedded/avrdude-9999
new file mode 100644
index 000000000000..0b370dfb8366
--- /dev/null
+++ b/dev-embedded/avrdude-9999
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install preinst prepare unpack
+DEPEND=virtual/libusb:1 virtual/libusb:0 ftdi? ( dev-embedded/libftdi:= ) ncurses? ( sys-libs/ncurses:0= ) readline? ( sys-libs/readline:0= ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 || ( dev-vcs/subversion[http] dev-vcs/subversion[webdav-neon] dev-vcs/subversion[webdav-serf] ) net-misc/rsync
+DESCRIPTION=AVR Downloader/UploaDEr
+EAPI=6
+HOMEPAGE=https://savannah.nongnu.org/projects/avrdude
+IUSE=doc ftdi ncurses readline
+LICENSE=GPL-2
+RDEPEND=virtual/libusb:1 virtual/libusb:0 ftdi? ( dev-embedded/libftdi:= ) ncurses? ( sys-libs/ncurses:0= ) readline? ( sys-libs/readline:0= )
+SLOT=0
+SRC_URI=doc? ( mirror://nongnu/avrdude/avrdude-doc-6.3.tar.gz mirror://nongnu/avrdude/avrdude-doc-6.3.pdf )
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	subversion	a5d5826a85609611f098c0553eb24cc1	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=376af261a23990d0355c967d009dc171
diff --git a/dev-embedded/avrdude/Manifest b/dev-embedded/avrdude/Manifest
deleted file mode 100644
index 0ab501357962..000000000000
--- a/dev-embedded/avrdude/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-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.ebuild 1447 BLAKE2B 295afaa6a6650266c424a9652d13dd6eb1c8e460ce46d89bf79ff1fb78ee09f8340761d7f4373dfb84548d1b1144cc5509c101716a37c06b69fb996e4e611319 SHA512 8fd1981079062fa9957824c0e0febda16b10f5bb3bd17c9201481166d868e3c7ac5350f0311564f121a8dc4b2b71f45bc664562c2fed6e190730b08c0dd4d3f8
-EBUILD avrdude-9999.ebuild 1602 BLAKE2B 9f3edd94e606006a93fd5786337f267e51b421cba2cba402a8236710dd60a8ad1359e0fc1e6940236180f01132cf95798df1eeac7262d1776b1b7b3fc58c5a65 SHA512 955868059d4ff1ceaa8fdf57b6128e48928f75cf6af869fdabd5d0b6bb67cb86282b4a42953fbea16cb073074011459bdaa067eeca96340b2e79ba446ecf8dcf
-MISC metadata.xml 363 BLAKE2B 8dcaa301200627a2ca9309e8dc1422ace35ba98257564f017a44b82ea7ada42a6d00b21f98b4e414236022b89c58246b702b92164a18ae552655e63c8c803a64 SHA512 db0dcf46afc6e800dfff22c7d25489a4e34e92589229c4246f843b6369a81d10aba4d206a2325547ba5821d0a0ee732a8c6f3ae0c61e6818f1c23315676322fc
diff --git a/dev-embedded/avrdude/avrdude-6.3.ebuild b/dev-embedded/avrdude/avrdude-6.3.ebuild
deleted file mode 100644
index 8038f454685b..000000000000
--- a/dev-embedded/avrdude/avrdude-6.3.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="AVR Downloader/UploaDEr"
-HOMEPAGE="https://savannah.nongnu.org/projects/avrdude"
-SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz
-	doc? (
-		mirror://nongnu/${PN}/${PN}-doc-${PV}.tar.gz
-		mirror://nongnu/${PN}/${PN}-doc-${PV}.pdf
-	)"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm ppc ppc64 x86"
-IUSE="doc ftdi ncurses readline"
-
-RDEPEND="virtual/libusb:1
-	virtual/libusb:0
-	ftdi? ( dev-embedded/libftdi:= )
-	ncurses? ( sys-libs/ncurses:0= )
-	readline? ( sys-libs/readline:0= )"
-DEPEND="${RDEPEND}"
-
-DOCS="AUTHORS ChangeLog* NEWS README"
-
-src_prepare() {
-	default
-
-	# let the build system re-generate these, bug #120194
-	rm -f lexer.c config_gram.c config_gram.h || die
-}
-
-src_configure() {
-	# somehow this doesnt get set when cross-compiling and breaks build
-	tc-export AR
-	export ac_cv_lib_ftdi_ftdi_usb_get_strings=$(usex ftdi)
-	export ac_cv_lib_ncurses_tputs=$(usex ncurses)
-	export ac_cv_lib_readline_readline=$(usex readline)
-	default
-}
-
-src_compile() {
-	# The automake target for these files does not use tempfiles or create
-	# these atomically, confusing a parallel build. So we force them first.
-	emake lexer.c config_gram.c config_gram.h
-	emake
-}
-
-src_install() {
-	default
-
-	if use doc ; then
-		newdoc "${DISTDIR}/${PN}-doc-${PV}.pdf" avrdude.pdf
-		dodoc -r "${WORKDIR}/avrdude-html/"
-	fi
-}
diff --git a/dev-embedded/avrdude/avrdude-9999.ebuild b/dev-embedded/avrdude/avrdude-9999.ebuild
deleted file mode 100644
index f483079be8f7..000000000000
--- a/dev-embedded/avrdude/avrdude-9999.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools subversion 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="
-	doc? (
-		mirror://nongnu/${PN}/${PN}-doc-${MY_DOC_PV}.tar.gz
-		mirror://nongnu/${PN}/${PN}-doc-${MY_DOC_PV}.pdf
-	)"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS=""
-IUSE="doc ftdi ncurses readline"
-
-RDEPEND="virtual/libusb:1
-	virtual/libusb:0
-	ftdi? ( dev-embedded/libftdi:= )
-	ncurses? ( sys-libs/ncurses: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
-	export ac_cv_lib_ftdi_ftdi_usb_get_strings=$(usex ftdi)
-	export ac_cv_lib_ncurses_tputs=$(usex ncurses)
-	export ac_cv_lib_readline_readline=$(usex readline)
-	default
-}
-
-src_compile() {
-	# The automake target for these files does not use tempfiles or create
-	# these atomically, confusing a parallel build. So we force them first.
-	emake lexer.c config_gram.c config_gram.h
-	emake
-}
-
-src_install() {
-	default
-
-	if use doc ; then
-		newdoc "${DISTDIR}/${PN}-doc-${MY_DOC_PV}.pdf" avrdude.pdf
-		dodoc -r "${WORKDIR}/avrdude-html/"
-
-		dodoc -r atmel-docs
-	fi
-}
diff --git a/dev-embedded/avrdude/metadata.xml b/dev-embedded/avrdude/metadata.xml
deleted file mode 100644
index 499cad808fd7..000000000000
--- a/dev-embedded/avrdude/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>embedded@gentoo.org</email>
-		<name>Embedded Gentoo</name>
-	</maintainer>
-	<use>
-		<flag name="ftdi">Enable support for USB FTDI chips via <pkg>dev-embedded/libftdi</pkg></flag>
-	</use>
-</pkgmetadata>
diff --git a/dev-embedded/bitbake-1.17.0 b/dev-embedded/bitbake-1.17.0
new file mode 100644
index 000000000000..bf1c3c6fb181
--- /dev/null
+++ b/dev-embedded/bitbake-1.17.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=doc? ( dev-libs/libxslt ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=package management tool for OpenEmbedded
+EAPI=5
+HOMEPAGE=http://git.openembedded.org/bitbake/
+IUSE=doc python_targets_python2_7
+KEYWORDS=amd64 ppc x86
+LICENSE=GPL-2
+RDEPEND=dev-python/ply[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/progressbar[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/openembedded/bitbake/archive/1.17.0.tar.gz -> bitbake-1.17.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	3be1ab44131e8c0bbdaa75823008444b	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=cdbf53f912c60aac1ebb8ee867f83609
diff --git a/dev-embedded/bitbake-9999 b/dev-embedded/bitbake-9999
new file mode 100644
index 000000000000..a5fdba6e5709
--- /dev/null
+++ b/dev-embedded/bitbake-9999
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=doc? ( dev-libs/libxslt ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-vcs/git-1.8.2.1[curl]
+DESCRIPTION=package management tool for OpenEmbedded
+EAPI=5
+HOMEPAGE=http://git.openembedded.org/bitbake/
+IUSE=doc python_targets_python2_7
+LICENSE=GPL-2
+RDEPEND=dev-python/ply[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/progressbar[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	git-r3	8f6de46b0aa318aea0e8cac62ece098b	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	3be1ab44131e8c0bbdaa75823008444b	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=f93b67c297b5fdcd3b15792b6fe768e1
diff --git a/dev-embedded/bitbake/Manifest b/dev-embedded/bitbake/Manifest
deleted file mode 100644
index 7c395291a63a..000000000000
--- a/dev-embedded/bitbake/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST bitbake-1.17.0.tar.gz 455029 BLAKE2B 163add03b8839ff06e3e8ead3709cf0651c1128bcc488b246ddf06f7c95aeaf1c5cc20fa1410bf0b8d0e5ce15a350666c8543d979d870f8bd2f50111a0cff01c SHA512 2e01c6c48179ad09c0bd62e393c22bbfe9e35df4f3c014f279ee82bc38d61f1c0c7dc7442bad556d00cf1a46c33121d415ffa1ef522d42451a6752ba414580ea
-EBUILD bitbake-1.17.0.ebuild 990 BLAKE2B e6eb992035223f6c1f9f7a4cd52fe15a4ca5c57c72dde2f5447035c40d4be66d2d354ac6c25bb21a3a44cab740ccfaaef2071a10a8ad94dea1344b1d7d77705a SHA512 50e991e0489b4dbc1af71dbffdab72ccb9b3bb0fcfdc063a55efb7c2c4863a74cf626f21aa1f80216a449a1f1bc77d86fd396d2701310eac1691686f70598d5a
-EBUILD bitbake-9999.ebuild 993 BLAKE2B b1a7b36cb80774bb7d4aea4f3441c0aee5a10474bcdbeedb9a8b1ee14a0e678541c391a2029027ce3a097cdc803f78a08f3e90c5a747c0f129c3faeba3bc6463 SHA512 05ac98f75c769a1dbb833572431002dbc48019d8924f25ef289849b6b4d3f630ffa933eb0f1c000efa1191d10746ec3f5c3a05a10f31ce3d783642e18d5f599d
-MISC metadata.xml 346 BLAKE2B 6150d2efd7b6d27898b4e17bf96c136c6aa4f2595097497d09d6e4b23039277b4e36a3f6e018767b4c51763153e3c68b8a75cb419a4857661fb7a331ab7ec492 SHA512 d0d6b8755bf6debd4c02e5589919c8d2d0b61bc800675df0b5be5559b839783be84a7edf3df4ab8ed7ae1e0cde4090695d22add6db861c10dd03ff48dd74841e
diff --git a/dev-embedded/bitbake/bitbake-1.17.0.ebuild b/dev-embedded/bitbake/bitbake-1.17.0.ebuild
deleted file mode 100644
index fb6119bd4aff..000000000000
--- a/dev-embedded/bitbake/bitbake-1.17.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite"
-
-inherit distutils-r1 vcs-snapshot
-
-if [[ ${PV} == *9999 ]]; then
-	EGIT_REPO_URI="git://git.openembedded.org/bitbake.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/openembedded/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ppc x86"
-fi
-
-DESCRIPTION="package management tool for OpenEmbedded"
-HOMEPAGE="http://git.openembedded.org/bitbake/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="doc"
-
-RDEPEND="
-	dev-python/ply[${PYTHON_USEDEP}]
-	dev-python/progressbar[${PYTHON_USEDEP}]"
-DEPEND="doc? ( dev-libs/libxslt )"
-
-src_prepare() {
-	if ! use doc ; then
-		sed -i -e 's:doctype = "html":doctype = "none":' \
-			-e 's:("share/doc/bitbake-%s/manual.*))::' setup.py || die
-		echo "none:" >> doc/manual/Makefile || die
-	else
-	    sed -i -e "s:\(share/doc/bitbake-%s.* %\) __version__:\1 \"${PV}\":" setup.py || die
-	fi
-}
diff --git a/dev-embedded/bitbake/bitbake-9999.ebuild b/dev-embedded/bitbake/bitbake-9999.ebuild
deleted file mode 100644
index d71043e57f37..000000000000
--- a/dev-embedded/bitbake/bitbake-9999.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite"
-
-inherit distutils-r1 vcs-snapshot
-
-if [[ ${PV} == *9999 ]]; then
-	EGIT_REPO_URI="git://git.openembedded.org/bitbake.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/openembedded/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc ~x86"
-fi
-
-DESCRIPTION="package management tool for OpenEmbedded"
-HOMEPAGE="http://git.openembedded.org/bitbake/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="doc"
-
-RDEPEND="
-	dev-python/ply[${PYTHON_USEDEP}]
-	dev-python/progressbar[${PYTHON_USEDEP}]"
-DEPEND="doc? ( dev-libs/libxslt )"
-
-src_prepare() {
-	if ! use doc ; then
-		sed -i -e 's:doctype = "html":doctype = "none":' \
-			-e 's:("share/doc/bitbake-%s/manual.*))::' setup.py || die
-		echo "none:" >> doc/manual/Makefile || die
-	else
-	    sed -i -e "s:\(share/doc/bitbake-%s.* %\) __version__:\1 \"${PV}\":" setup.py || die
-	fi
-}
diff --git a/dev-embedded/bitbake/metadata.xml b/dev-embedded/bitbake/metadata.xml
deleted file mode 100644
index 131b187bec76..000000000000
--- a/dev-embedded/bitbake/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>embedded@gentoo.org</email>
-    <name>Embedded Gentoo</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">openembedded/bitbake</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-embedded/cpik-0.7.4_p4 b/dev-embedded/cpik-0.7.4_p4
new file mode 100644
index 000000000000..32a9db4a7566
--- /dev/null
+++ b/dev-embedded/cpik-0.7.4_p4
@@ -0,0 +1,11 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=dev-qt/qtcore:5
+DESCRIPTION=C compiler for PIC18 devices
+EAPI=6
+HOMEPAGE=http://pikdev.free.fr/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=http://pikdev.free.fr/cpik-0.7.4-4.tar.gz
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=6ad87995f2e9951562ae2eaf182d7903
diff --git a/dev-embedded/cpik/Manifest b/dev-embedded/cpik/Manifest
deleted file mode 100644
index 691bf6a74747..000000000000
--- a/dev-embedded/cpik/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX cpik-0.7.4_p4-gcc6.patch 441 BLAKE2B d4d9b9688f343d167059080f669bc0b28fde8047df2138394a819165ec4cb2d81142bf6de9ef01a9e194504017f28925d2968b0baa8fdce58ca4b56ab21fdd49 SHA512 77413a7934676781d85475f44a65078fbe63c3736562f23ef190ac905c1231aba63b84d3a5d3786f02afb48f1e544517d6f5a0b6fa6a2fdae3649c221b3a57d5
-DIST cpik-0.7.4-4.tar.gz 8322003 BLAKE2B e88f04a92f44800139089b3115da42c5bbe88128300db28660b9300ae4260cba08432de0865d0426ce179743388483c9a3310c417bfaa3c7e4ef93217c38574b SHA512 d376af949bd2fbc80bd3c13e02d44c5a9ef82c409ac20e4c750fa77b654b89e77289b5a022988e05261cdbfe15563f837ec0e6382bb8bf27be673d0e55bbfa2c
-EBUILD cpik-0.7.4_p4.ebuild 849 BLAKE2B 0364da4bfc672403ef1f90dcd3dcca289b527092cc2f8827305065d14bb0d6d64dc9e113eca7b4f4dcc84c36a49ce954fca4842e85da66576ffebe97cc6c9b61 SHA512 75c8ed591db7b4b09b655cbb128446dce9a53a54040dcae95f8380abcb85d44bb271dd9601c4982dae1af3dff67a153f2276303dabc9807bad2f210055b4081a
-MISC metadata.xml 628 BLAKE2B 5c70cb2f1b0aa48950e961c9a6d26ce9b945da8631a237cadf8ae7702ab1c4f3d14c3ef72add54d42b412a330735d9994c6fdc73f0445c1813650f76f634fa2a SHA512 3fd531f77a31c0258a5d5ca2da9e6cd44fb84e05b2a8ffb91dfe86cb9274b9df20212b8a021ae873b32b92db410f6bd94684477080a3dcfd11a9e03f5b99bf71
diff --git a/dev-embedded/cpik/cpik-0.7.4_p4.ebuild b/dev-embedded/cpik/cpik-0.7.4_p4.ebuild
deleted file mode 100644
index 376bf94a41fb..000000000000
--- a/dev-embedded/cpik/cpik-0.7.4_p4.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit qmake-utils
-
-MY_PV="${PV/_p/-}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="C compiler for PIC18 devices"
-HOMEPAGE="http://pikdev.free.fr/"
-SRC_URI="http://pikdev.free.fr/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-qt/qtcore:5"
-RDEPEND=""
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=( ${MY_PV/-*/}/doc/cpik-{0.5.2-tutorial,0.7.4-4-doc}.pdf )
-HTML_DOCS=( ${MY_PV/-*/}/doc/html/. )
-
-PATCHES=( "${FILESDIR}/${P}-gcc6.patch" )
-
-src_prepare() {
-	default
-
-	# does not install docs in wrong path
-	sed -e '/INSTALLS += docs/d' \
-		-i "${PN}"*.pro || die 'sed failed.'
-}
-
-src_configure() {
-	eqmake5
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-	einstalldocs
-	dosym "${PN}-${MY_PV/-*/}" "/usr/bin/${PN}"
-}
diff --git a/dev-embedded/cpik/files/cpik-0.7.4_p4-gcc6.patch b/dev-embedded/cpik/files/cpik-0.7.4_p4-gcc6.patch
deleted file mode 100644
index c1f41cd7e6e0..000000000000
--- a/dev-embedded/cpik/files/cpik-0.7.4_p4-gcc6.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur cpik-0.7.2-4-orig/utility.h cpik-0.7.2-4/utility.h
---- cpik-0.7.2-4-orig/utility.h	2017-12-03 03:47:35.302504007 +0100
-+++ cpik-0.7.2-4/utility.h	2017-12-03 03:47:59.537116442 +0100
-@@ -75,7 +75,7 @@
-     static bool stringTo ( const string& s, T& result )
-     {
-       istringstream is ( s ) ;
--      return is >> result ;
-+      return static_cast<bool>(is >> result);
-     }
- 
-     /** generic conversion from T to string  */
diff --git a/dev-embedded/cpik/metadata.xml b/dev-embedded/cpik/metadata.xml
deleted file mode 100644
index b8d0988614f8..000000000000
--- a/dev-embedded/cpik/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?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>
-	<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
-		PikDev. This project is still in progress but near to be finished and the
-		current version is perfectly usable. (from Pikdev or from a command-line
-		interpreter).
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-embedded/dc-tool-ip-1.0.4 b/dev-embedded/dc-tool-ip-1.0.4
new file mode 100644
index 000000000000..4118c08ff377
--- /dev/null
+++ b/dev-embedded/dc-tool-ip-1.0.4
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install prepare
+DESCRIPTION=ethernet program loader for the Dreamcast
+EAPI=4
+HOMEPAGE=http://cadcdev.sourceforge.net/
+IUSE=doc
+KEYWORDS=amd64 x86
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=mirror://sourceforge/cadcdev/dcload-ip-1.0.4-src.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=e1d08c6f760c2733549d0600987059b1
diff --git a/dev-embedded/dc-tool-ip/Manifest b/dev-embedded/dc-tool-ip/Manifest
deleted file mode 100644
index 28989cecfc58..000000000000
--- a/dev-embedded/dc-tool-ip/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX 1.0.4-bfd-update.patch 909 BLAKE2B 02a5b3be9db1c98e01cbda6e75de14bcefa4c8abb4400855be4effa046adfd6382612a1c4c33d2999b8eca45aec40256dcf3c7d864947c3174fe6688a7a092d7 SHA512 a1a24436104012ec5c56028dd4f7b16d9bcf23923d64d3ba14fd9a6b413770d1ccaaa91d56f62e49afbe77bfb0fdc3bb4eeba12d24b547f0f8598a4f3f6ceb8c
-AUX dc-tool-ip-1.0.4-headers.patch 487 BLAKE2B bfe1eee99d73a0a37428fa8015f3b073762b3f295f83066de09e3cf7efd00aa904d16c9f1cd111be7c8eaa41c755a93024fa8e0210f87d7f4be09c0181a1eb31 SHA512 a83b3d0f214de12fc25ef250f106e325d39e78afacb56db31a7f4c6033e8c848b934260c589967cb6fe1751ca401584b1b66f3593b4cbc2d7c2bcc108d8ab4c2
-DIST dcload-ip-1.0.4-src.tar.gz 104758 BLAKE2B 4c8c52077b047da81341a133272a5569de9e6b304942c181da01a617a00243ace2847bbd380ac723710d91dc43d6de134d3a34e083ef9fa61471ba49ce5021f3 SHA512 c58f574bf13dd44a00395060af4c718593471242366d09dddb234490d20a6e0322a2c3853613aa1c8a5269802cf6434407d3f6c62c934e8b66f8fc1e86a12536
-EBUILD dc-tool-ip-1.0.4.ebuild 970 BLAKE2B 58708d998ae1c0eb9cdb8d839d457dba421d6df4f43d5c01e4e2bf14910445db7530db58afff29bb5bda61491657646e7fd6d7c2fa849c755d86960a9d993539 SHA512 3d1960b451f08bb823f5755c2c1d3298579bb1edcc0d9a3f3e2f7df7264fa02b3fbce3a4265d33f2e8ed27a1760086ca6247f1b2ab0bd77bddc1d49d9480bd53
-MISC metadata.xml 403 BLAKE2B 22b3c6edfd0bb8b5b254247b738dd9ceeb30dbd0aeeed3f27ea0c9d0fd375c04c809a042510ebc69f84d668bcbb4e753ab1d518c288b433d9a1e5283da1903b8 SHA512 eeac6ac902c1f8f2ca47e218722772725f9d4f1ad13c2e8807a3262e802b2b3bbcfb184d3ccb0827be26be2b453960e1fcc8b0b9d32936b12aa11c8fd4c67127
diff --git a/dev-embedded/dc-tool-ip/dc-tool-ip-1.0.4.ebuild b/dev-embedded/dc-tool-ip/dc-tool-ip-1.0.4.ebuild
deleted file mode 100644
index fc9a8492d5ea..000000000000
--- a/dev-embedded/dc-tool-ip/dc-tool-ip-1.0.4.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit eutils flag-o-matic toolchain-funcs
-
-DESCRIPTION="ethernet program loader for the Dreamcast"
-HOMEPAGE="http://cadcdev.sourceforge.net/"
-SRC_URI="mirror://sourceforge/cadcdev/dcload-ip-${PV}-src.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc"
-
-S=${WORKDIR}/dcload-ip-${PV}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PV}-bfd-update.patch
-	epatch "${FILESDIR}"/${P}-headers.patch
-	append-cppflags -DPACKAGE -DPACKAGE_VERSION #465952
-	sed -i \
-		-e "/^HOSTCC/s:gcc:$(tc-getCC):" \
-		-e "/^HOSTCFLAGS/s:-O2:${CFLAGS} ${CPPFLAGS}:" \
-		-e 's:-L/usr/local/dcdev/lib:$(LDFLAGS):' \
-		-e 's:/usr/local/dcdev/include:.:' \
-		Makefile.cfg || die "sed"
-}
-
-src_compile() {
-	emake -C host-src/tool
-}
-
-src_install() {
-	dobin host-src/tool/dc-tool
-	dodoc README NETWORK CHANGES
-	dodoc -r make-cd
-	if use doc ; then
-		dodoc -r example-src
-	fi
-}
diff --git a/dev-embedded/dc-tool-ip/files/1.0.4-bfd-update.patch b/dev-embedded/dc-tool-ip/files/1.0.4-bfd-update.patch
deleted file mode 100644
index 62da02f12e98..000000000000
--- a/dev-embedded/dc-tool-ip/files/1.0.4-bfd-update.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- host-src/tool/dc-tool.c.orig	2004-11-13 19:38:50.007151024 -0500
-+++ host-src/tool/dc-tool.c	2004-11-13 19:38:58.320887144 -0500
-@@ -431,13 +431,13 @@
- 		if ((section->flags & SEC_HAS_CONTENTS) && (section->flags & SEC_LOAD)) {
- 		    printf("Section %s, ",section->name);
- 		    printf("lma 0x%x, ",section->lma);
--		    printf("size %d\n",section->_raw_size);
--		    if (section->_raw_size) {
--			size += section->_raw_size;
--			inbuf = malloc(section->_raw_size);
--			bfd_get_section_contents(somebfd, section, inbuf, 0, section->_raw_size);
-+		    printf("size %d\n",section->rawsize);
-+		    if (section->rawsize) {
-+			size += section->rawsize;
-+			inbuf = malloc(section->rawsize);
-+			bfd_get_section_contents(somebfd, section, inbuf, 0, section->rawsize);
- 
--			send_data(inbuf, section->lma, section->_raw_size);
-+			send_data(inbuf, section->lma, section->rawsize);
- 
- 			free(inbuf);
- 		    }
diff --git a/dev-embedded/dc-tool-ip/files/dc-tool-ip-1.0.4-headers.patch b/dev-embedded/dc-tool-ip/files/dc-tool-ip-1.0.4-headers.patch
deleted file mode 100644
index 678278262900..000000000000
--- a/dev-embedded/dc-tool-ip/files/dc-tool-ip-1.0.4-headers.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/host-src/tool/dc-tool.c
-+++ b/host-src/tool/dc-tool.c
-@@ -24,6 +24,7 @@
- #include <fcntl.h>
- #include <stdio.h>
- #include <stdlib.h>
-+#include <string.h>
- #ifdef _WIN32
- #include <string.h>
- #include <windows.h>
---- a/host-src/tool/syscalls.c
-+++ b/host-src/tool/syscalls.c
-@@ -24,6 +24,9 @@
- #include <fcntl.h>
- #include <stdio.h>
- #include <stdlib.h>
-+#include <string.h>
-+#include <arpa/inet.h>
-+#include <time.h>
- #include <sys/time.h>
- #include <unistd.h>
- #include <utime.h>
diff --git a/dev-embedded/dc-tool-ip/metadata.xml b/dev-embedded/dc-tool-ip/metadata.xml
deleted file mode 100644
index 2244c2885a88..000000000000
--- a/dev-embedded/dc-tool-ip/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>sh@gentoo.org</email>
-	</maintainer>
-	<maintainer type="project">
-		<email>embedded@gentoo.org</email>
-		<name>Embedded Gentoo</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">cadcdev</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-embedded/dfu-programmer-0.7.2-r1 b/dev-embedded/dfu-programmer-0.7.2-r1
new file mode 100644
index 000000000000..48203fffe479
--- /dev/null
+++ b/dev-embedded/dfu-programmer-0.7.2-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst prepare setup
+DEPEND=virtual/libusb:1 virtual/udev virtual/pkgconfig virtual/pkgconfig
+DESCRIPTION=A Device Firmware Update based USB programmer for Atmel chips
+EAPI=6
+HOMEPAGE=http://dfu-programmer.sourceforge.net
+KEYWORDS=amd64 arm
+LICENSE=GPL-2
+RDEPEND=virtual/libusb:1 virtual/udev
+SLOT=0
+SRC_URI=mirror://sourceforge/dfu-programmer/dfu-programmer-0.7.2.tar.gz
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=57f597ddbbbc1ebce59476187c48a590
diff --git a/dev-embedded/dfu-programmer/Manifest b/dev-embedded/dfu-programmer/Manifest
deleted file mode 100644
index e68d21a381d8..000000000000
--- a/dev-embedded/dfu-programmer/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST dfu-programmer-0.7.2.tar.gz 146613 BLAKE2B 85222185bdbfdb90c06ece2a284f6f6e15fe5118a1934948a0bca6364902743a86429ea13d5aabc2a948f6f2ce41177b6021ae85a8ad22b75a026507253380d8 SHA512 429b89192bb5a9653ad8678dfc182bfc30eb057d0d1f72fe88efdf85005d3ad557e0f572f4fad3346f1f1078cd273a289f4bba2663bb1f840e6bf724d5293db4
-EBUILD dfu-programmer-0.7.2-r1.ebuild 1271 BLAKE2B 9fe3fc243d5cb4ccb4cab584439049983c04935f0a70dcbf5a66c938b428523acb6b82e4df315ab59c780d962b3d84f64369ccdbe93b3c1a84720557fbee9eb1 SHA512 906960d349bda4a531b229e7e4583d7721f28cf02cd900b8b19314545e3fbadef9fb37571804a0e80bf72496e09e712442e7108ef03667d81e4a1b115f068f80
-MISC metadata.xml 441 BLAKE2B fb5651aaeac357109390fd1b83fe5259369ca3613eec202f3c263db19e111bab5ac28d43312dbb5f7751f0258318c2845fc65100cfdf1c35b1a31dc1c2446df7 SHA512 97cf04d36796543c7fde8bcff89a8a5e3f19a665e4a20f84dc9493a46a0543038ca262ab26b149a3c514771f21963247dbf8f751f3dd26b6d505c3bc43cb4fe0
diff --git a/dev-embedded/dfu-programmer/dfu-programmer-0.7.2-r1.ebuild b/dev-embedded/dfu-programmer/dfu-programmer-0.7.2-r1.ebuild
deleted file mode 100644
index 08ab0f766244..000000000000
--- a/dev-embedded/dfu-programmer/dfu-programmer-0.7.2-r1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit udev user
-
-DESCRIPTION="A Device Firmware Update based USB programmer for Atmel chips"
-HOMEPAGE="http://dfu-programmer.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm"
-IUSE=""
-
-RDEPEND="virtual/libusb:1
-	virtual/udev"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-pkg_setup() {
-	enewgroup plugdev
-}
-
-src_prepare() {
-	default
-
-	# Upstream has fixed this in their configure already.
-	tc-export CPP PKG_CONFIG
-	sed -i \
-		-e "/LIBUSB_1_0_CFLAGS=/s:=.*:='$(${PKG_CONFIG} --cflags libusb-1.0)':" \
-		-e "/LIBUSB_1_0_LIBS=/s:=.*:='$(${PKG_CONFIG} --libs libusb-1.0)':" \
-		configure || die
-}
-
-src_install() {
-	default
-
-	cat <<-EOF > 70-dfu-programmer.rules
-	#
-	# do not edit this file, it will be overwritten on update
-	#
-	EOF
-	printf 'SUBSYSTEM=="usb", ACTION=="add", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="%s", MODE="660", GROUP="plugdev", SYMLINK+="dfu-%%n"\n' \
-		2ff{a,b,9,7,4,3} >> 70-dfu-programmer.rules
-
-	udev_dorules 70-dfu-programmer.rules
-}
-
-pkg_postinst() {
-	elog "To update device firmware as user you must be in the plugdev group:"
-	elog
-	elog "usermod -aG plugdev <user>"
-}
diff --git a/dev-embedded/dfu-programmer/metadata.xml b/dev-embedded/dfu-programmer/metadata.xml
deleted file mode 100644
index d2acbe955521..000000000000
--- a/dev-embedded/dfu-programmer/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://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>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">dfu-programmer</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-embedded/esptool-2.1 b/dev-embedded/esptool-2.1
new file mode 100644
index 000000000000..5f8894fefee6
--- /dev/null
+++ b/dev-embedded/esptool-2.1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=Utility to communicate with the ROM bootloader in Espressif ESP8266 and ESP32
+EAPI=6
+HOMEPAGE=https://github.com/espressif/esptool
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=amd64 ~arm ~x86
+LICENSE=GPL-2+
+RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/ecdsa[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyaes[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyserial-2.5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://pypi/e/esptool/esptool-2.1.tar.gz
+_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=d6258afcaa17999f922c7af60a48cd35
diff --git a/dev-embedded/esptool-2.2 b/dev-embedded/esptool-2.2
new file mode 100644
index 000000000000..1f88f17db8c4
--- /dev/null
+++ b/dev-embedded/esptool-2.2
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=Utility to communicate with the ROM bootloader in Espressif ESP8266 and ESP32
+EAPI=6
+HOMEPAGE=https://github.com/espressif/esptool
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64
+LICENSE=GPL-2+
+RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/ecdsa[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyaes[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyserial-2.5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://pypi/e/esptool/esptool-2.2.tar.gz
+_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=9d4a24e8f2e8bb78a611a1c543b2195d
diff --git a/dev-embedded/esptool-2.3.1 b/dev-embedded/esptool-2.3.1
new file mode 100644
index 000000000000..450f63667297
--- /dev/null
+++ b/dev-embedded/esptool-2.3.1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=Utility to communicate with the ROM bootloader in Espressif ESP8266 and ESP32
+EAPI=6
+HOMEPAGE=https://github.com/espressif/esptool
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2+
+RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/ecdsa[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyaes[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyserial-2.5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://pypi/e/esptool/esptool-2.3.1.tar.gz
+_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=8b219ad5f85fc7aaa9ed72152bea307a
diff --git a/dev-embedded/esptool/Manifest b/dev-embedded/esptool/Manifest
deleted file mode 100644
index aa898be9bd02..000000000000
--- a/dev-embedded/esptool/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-DIST esptool-2.1.tar.gz 68974 BLAKE2B 4aaddc9bf22a624de18e7d58b35a42f6fa27cf8bdfff119a270b9531f1e19ecb3f4d7eebad319a799068a19941bf0c843fc464fd5ae891d8e03e1a2bad54dd68 SHA512 be657df04a345d2c91bbe3a9cbb93cd7bb0bc68e61388ff4d134c88d514c74fe3f2c5e7c64f4100264bc5973b1d3e66251cdb16a77894fb9e116d9c6a54a8dc3
-DIST esptool-2.2.tar.gz 70585 BLAKE2B ea4553d7857987233d1488e6db1993ec687ce10c9c810c7a5327043283fab19b10863106ecf8bfac6d7585a8bbf2823b90d7e225dd4a27bfb784f183e86c796a SHA512 a84b61875a8f227b8103fcc546eb1323547159fbdc962d0577eb6498126589c9fa3b23ca840d33ab2636d7c05de3eb048bdfbdbd86d895c8e37f9bbc169a4caa
-DIST esptool-2.3.1.tar.gz 72312 BLAKE2B 4e44a2be2a72ab25e85af9b380f5f80896a84490f30180a98ed20822ac087d24511613d205bed04c8c92d1effc6b2074c2208d4ba5f72b6b661aff7c1b4e02b5 SHA512 8025e1e7a378c0fce27c5ea2d3290cd12e7f657039f0fed6b4bd938a10d971739b678714c2f19f0d2edab3d2215e7975ba685604f870d45a18d60f3147c643b8
-EBUILD esptool-2.1.ebuild 743 BLAKE2B 7a25f559a58b7100f7153d0c44fef79d4c43de5d28369b6d273e3cb6a422813ffb25c41e2ec20f67d6d641f214c80ad5ea3c57a6b9cfe864accf082ce46dd9c2 SHA512 c02e79f351f591ea7f8f9b01c1d13aa92a6fd99c86c317bb2f4dcf9569b222085a4e51ad99a728ebbf313fa1a70dda4a2b498f9d2a8104b7a924d1a9267c821d
-EBUILD esptool-2.2.ebuild 734 BLAKE2B eebef873f847a95e2a3ca0847f73b4ad0634b669b1c72b57476b74f2678ba8df043b07019cea905622487b432881979df13a6c709463935d1eaf8c5108df55d3 SHA512 547cce87574fe5bb093d5847462d705e748a3fafb71398c781e97a6537dad30b8fc5885410119ff216a9dc21b30a3d895df9be0fa269fa232bb6624ef1daf86d
-EBUILD esptool-2.3.1.ebuild 744 BLAKE2B 8f929ebe72e21cae80efa8a0831bc97142866c749fdb301f7c6ec651f49557787d3e1cc7b4fd0bcac9a2ab637e9057ba5ec46d7e51b2fe8d9e4ea9f2eaa25647 SHA512 03936f871a0d94b7e0d2d7f0e083df2660d4495ce270d716f884b9a7ee83da848d3c8cc4448f8dced07bd4ce966885dd3edabccb3d1294397b574ce0ed637aa4
-MISC metadata.xml 449 BLAKE2B 517225c4d9d06734745bf749ec6cf81f325146bab22eff7a0577fdf16d005d82f12dc3f426c71f902558c9725506a13e0b60fe1f7ec00818ec5e3a902a15e8c8 SHA512 67e5139fe841bd608087ee72ab5e25e688abe48892a8cf9e18ebcd61223ff16de03840510fe2e4eac852ad8e0c0da32df2edc797cb1b77a7a48639c2a3d16e10
diff --git a/dev-embedded/esptool/esptool-2.1.ebuild b/dev-embedded/esptool/esptool-2.1.ebuild
deleted file mode 100644
index 21ddbca54e20..000000000000
--- a/dev-embedded/esptool/esptool-2.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Utility to communicate with the ROM bootloader in Espressif ESP8266 and ESP32"
-HOMEPAGE="https://github.com/espressif/esptool"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}
-	dev-python/ecdsa[${PYTHON_USEDEP}]
-	dev-python/pyaes[${PYTHON_USEDEP}]
-	>=dev-python/pyserial-2.5[${PYTHON_USEDEP}]"
-
-RESTRICT="test" # Uses a device connected to the serial port
-
-python_test() {
-	${EPYTHON} test/test_esptool.py || die
-}
diff --git a/dev-embedded/esptool/esptool-2.2.ebuild b/dev-embedded/esptool/esptool-2.2.ebuild
deleted file mode 100644
index 066db389f9aa..000000000000
--- a/dev-embedded/esptool/esptool-2.2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Utility to communicate with the ROM bootloader in Espressif ESP8266 and ESP32"
-HOMEPAGE="https://github.com/espressif/esptool"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}
-	dev-python/ecdsa[${PYTHON_USEDEP}]
-	dev-python/pyaes[${PYTHON_USEDEP}]
-	>=dev-python/pyserial-2.5[${PYTHON_USEDEP}]"
-
-RESTRICT="test" # Uses a device connected to the serial port
-
-python_test() {
-	${EPYTHON} test/test_esptool.py || die
-}
diff --git a/dev-embedded/esptool/esptool-2.3.1.ebuild b/dev-embedded/esptool/esptool-2.3.1.ebuild
deleted file mode 100644
index d97627828f28..000000000000
--- a/dev-embedded/esptool/esptool-2.3.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Utility to communicate with the ROM bootloader in Espressif ESP8266 and ESP32"
-HOMEPAGE="https://github.com/espressif/esptool"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}
-	dev-python/ecdsa[${PYTHON_USEDEP}]
-	dev-python/pyaes[${PYTHON_USEDEP}]
-	>=dev-python/pyserial-2.5[${PYTHON_USEDEP}]"
-
-RESTRICT="test" # Uses a device connected to the serial port
-
-python_test() {
-	${EPYTHON} test/test_esptool.py || die
-}
diff --git a/dev-embedded/esptool/metadata.xml b/dev-embedded/esptool/metadata.xml
deleted file mode 100644
index 4f9e54266a0b..000000000000
--- a/dev-embedded/esptool/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>m.j.everitt@iee.org</email>
-		<name>Michael Everitt</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">espressif/esptool</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-embedded/ftdi_eeprom-0.3-r1 b/dev-embedded/ftdi_eeprom-0.3-r1
new file mode 100644
index 000000000000..dc41ad722409
--- /dev/null
+++ b/dev-embedded/ftdi_eeprom-0.3-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install prepare
+DEPEND=dev-embedded/libftdi:0 dev-libs/confuse
+DESCRIPTION=Utility to program external EEPROM for FTDI USB chips
+EAPI=4
+HOMEPAGE=http://www.intra2net.com/en/developer/libftdi/
+KEYWORDS=amd64 x86
+LICENSE=LGPL-2
+RDEPEND=dev-embedded/libftdi:0 dev-libs/confuse
+SLOT=0
+SRC_URI=http://www.intra2net.com/en/developer/libftdi/download/ftdi_eeprom-0.3.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=8b095a98e9ff3570e8215d90a8958efe
diff --git a/dev-embedded/ftdi_eeprom-1.0 b/dev-embedded/ftdi_eeprom-1.0
new file mode 100644
index 000000000000..d853d44c65bc
--- /dev/null
+++ b/dev-embedded/ftdi_eeprom-1.0
@@ -0,0 +1,9 @@
+DEFINED_PHASES=setup
+DESCRIPTION=Utility to program external EEPROM for FTDI USB chips
+EAPI=4
+HOMEPAGE=http://www.intra2net.com/en/developer/libftdi/
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2
+RDEPEND=dev-embedded/libftdi:1[tools]
+SLOT=0
+_md5_=04f8594e4e20e3917e8ccd69273c0ba2
diff --git a/dev-embedded/ftdi_eeprom/Manifest b/dev-embedded/ftdi_eeprom/Manifest
deleted file mode 100644
index 4ba78f816939..000000000000
--- a/dev-embedded/ftdi_eeprom/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX ftdi_eeprom-0.3-chip-type.patch 542 BLAKE2B 396716821e5ee6980159df7e655d9df355028c7576d8e174ca9611166cd56bca1e44c70a4fde97b62a037ac911fe5dbb405aa909b7cfe957e6840e568c77c979 SHA512 6dbe2e0cef9ee1772a5c99280432050bc2fe037ffb7861c9e7c70ce91d7d4cda23669abc0e108d3de90345041ba33887bb0c2b93099fab9b7952540a02fffb31
-AUX ftdi_eeprom-0.3-newer-chips.patch 726 BLAKE2B d6b94a04b4498b62f0dcbd848bf7b2aadb5242635fcbf26fef7266ce7a1de70033c2a7634dabddbfa29191f8d1482a2938cdc330d8ca3348bfad58649e908da8 SHA512 fb3d7f77820fa7847315e6b366a0fb43cea174530603b860ddbeed37fcc893f15597781e82f1bf561fde6fadf707eb2be8099f18ca873f420d6b2e1d20710a35
-DIST ftdi_eeprom-0.3.tar.gz 103723 BLAKE2B a378b82f3e2239a62b9002933ac5b5bbfab326f33b893712a78489115348fce6401d80ea454355fac8349354437eb852489e2bd2474182c303fa03ba57dfbd2d SHA512 292617434d618c1f47fd94922cff1c32da271a9262b70ee56a8931b7a07ec1ae2cfe92a0ddfe14d9516d295188dc0a750c0cf7f5a26bb4c3fd384f252aeda18d
-EBUILD ftdi_eeprom-0.3-r1.ebuild 642 BLAKE2B 2c541ffb4b7d2058dd7202b75d06e5467ec938189775ab70c5a509ee4942db824d45848c68f808e3c1939866a45eca6f0b14bdd90e58332020ec940c4218ad77 SHA512 d9ce5905c1545a77a2e034653f405151318fc406153d8750b11423e2b6f1f91846d9e167fa248c0c43abf46d92b0a3a5ab2088f168f48aa2670c090c7ade03e3
-EBUILD ftdi_eeprom-1.0.ebuild 478 BLAKE2B ef1e8f42fe1ce3f01339ffa970f9ad9729595a1cd50c03a32781e1861fa5aaef9c6ff3845bee7039127a6b2f9c66c475156ab42d3974d09f1294b533965e42ab SHA512 c699a58882511c3fcf348346053afbf563d36a98915d8950a6e27316432482480b17fae92019068c7c8419e20ce8e2c09f2af3103152f42380f95e6392cacc37
-MISC metadata.xml 247 BLAKE2B e46b8f2d053251af5cb591bb2ee5e35089c4e8174ee2e7a3c504db23f844b65083d4a3e5198da3977ad3e98b67cab2e0de686a3c62009b487c1e64785a8ff65d SHA512 15df289e0f962f564551f61ada3cfef0311f6af639887def780bf5ad3be105515c8d24c950ff340ed35d89b9cd994af3540322b684c5dec3b43ec6bb0041aa4e
diff --git a/dev-embedded/ftdi_eeprom/files/ftdi_eeprom-0.3-chip-type.patch b/dev-embedded/ftdi_eeprom/files/ftdi_eeprom-0.3-chip-type.patch
deleted file mode 100644
index 1492194045ab..000000000000
--- a/dev-embedded/ftdi_eeprom/files/ftdi_eeprom-0.3-chip-type.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-https://bugs.gentoo.org/390805
-
-fix by Egor Y. Egorov for building with newer libftdi versions
-
---- a/src/main.c
-+++ b/src/main.c
-@@ -106,7 +106,7 @@ int main(int argc, char *argv[]) {
- 
-     eeprom.vendor_id = cfg_getint(cfg, "vendor_id");
-     eeprom.product_id = cfg_getint(cfg, "product_id");
--    eeprom.BM_type_chip = cfg_getbool(cfg, "BM_type_chip");
-+    eeprom.chip_type = cfg_getbool(cfg, "BM_type_chip");
- 
-     eeprom.self_powered = cfg_getbool(cfg, "self_powered");
-     eeprom.remote_wakeup = cfg_getbool(cfg, "remote_wakeup");
diff --git a/dev-embedded/ftdi_eeprom/files/ftdi_eeprom-0.3-newer-chips.patch b/dev-embedded/ftdi_eeprom/files/ftdi_eeprom-0.3-newer-chips.patch
deleted file mode 100644
index 7a678cd4bce2..000000000000
--- a/dev-embedded/ftdi_eeprom/files/ftdi_eeprom-0.3-newer-chips.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-latest upstream vcs tree supports this stuff in a diff way
-
-https://bugs.gentoo.org/376117
-
-patch by Robert Pearce
-
---- ftdi_eeprom-0.2/src/main.c
-+++ ftdi_eeprom-0.2/src/main.c
-@@ -131,9 +131,13 @@
- 	
- 	if (i != 0) {
- 	    printf("Unable to find FTDI devices under given vendor/product id: 0x%X/0x%X\n", eeprom.vendor_id, eeprom.product_id);
--	    printf("Retrying with default FTDI id.\n");
-+	    printf("Retrying with default FTDI ids.\n");
- 
-     	    i = ftdi_usb_open(&ftdi, 0x0403, 0x6001);
-+	    if (i != 0)
-+    	    	i = ftdi_usb_open(&ftdi, 0x0403, 0x6010);
-+	    if (i != 0)
-+    	    	i = ftdi_usb_open(&ftdi, 0x0403, 0x6011);
- 	    if (i != 0) {
- 		printf("Sorry, unable to find FTDI USB chip\n");
- 		exit (-1);
diff --git a/dev-embedded/ftdi_eeprom/ftdi_eeprom-0.3-r1.ebuild b/dev-embedded/ftdi_eeprom/ftdi_eeprom-0.3-r1.ebuild
deleted file mode 100644
index eae2c28788c4..000000000000
--- a/dev-embedded/ftdi_eeprom/ftdi_eeprom-0.3-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit eutils
-
-DESCRIPTION="Utility to program external EEPROM for FTDI USB chips"
-HOMEPAGE="http://www.intra2net.com/en/developer/libftdi/"
-SRC_URI="http://www.intra2net.com/en/developer/libftdi/download/${P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="dev-embedded/libftdi:0
-	dev-libs/confuse"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-newer-chips.patch #376117
-	epatch "${FILESDIR}"/${PN}-0.3-chip-type.patch #390805
-}
-
-src_install() {
-	default
-	dodoc src/example.conf
-}
diff --git a/dev-embedded/ftdi_eeprom/ftdi_eeprom-1.0.ebuild b/dev-embedded/ftdi_eeprom/ftdi_eeprom-1.0.ebuild
deleted file mode 100644
index a7f81c039f8a..000000000000
--- a/dev-embedded/ftdi_eeprom/ftdi_eeprom-1.0.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-DESCRIPTION="Utility to program external EEPROM for FTDI USB chips"
-HOMEPAGE="http://www.intra2net.com/en/developer/libftdi/"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-embedded/libftdi:1[tools]"
-
-pkg_setup() {
-	elog "This tool has moved to libftdi itself (via USE=tools)."
-	elog "Please install that package and remove this one."
-}
diff --git a/dev-embedded/ftdi_eeprom/metadata.xml b/dev-embedded/ftdi_eeprom/metadata.xml
deleted file mode 100644
index 71b1461e1146..000000000000
--- a/dev-embedded/ftdi_eeprom/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>embedded@gentoo.org</email>
-	<name>Embedded Gentoo</name>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-embedded/gnap-2.0 b/dev-embedded/gnap-2.0
new file mode 100644
index 000000000000..d08c19db00f1
--- /dev/null
+++ b/dev-embedded/gnap-2.0
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install unpack
+DESCRIPTION=Gentoo-based Network Appliance building system
+EAPI=0
+HOMEPAGE=https://embedded.gentoo.org/gnap.xml
+IUSE=minimal
+KEYWORDS=~x86 ~amd64
+LICENSE=GPL-2
+RDEPEND=app-cdr/cdrtools sys-fs/dosfstools <sys-boot/syslinux-5
+SLOT=0
+SRC_URI=mirror://gentoo/gnap-tools-2.0.tar.bz2 !minimal? ( mirror://gentoo/gnap-core-2.0.tar )
+_md5_=1324a7b155fcf7f44cee09d346b1f0ef
diff --git a/dev-embedded/gnap-dev-2.0 b/dev-embedded/gnap-dev-2.0
new file mode 100644
index 000000000000..e584c63e3b5e
--- /dev/null
+++ b/dev-embedded/gnap-dev-2.0
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install unpack
+DESCRIPTION=Gentoo-based Network Appliance building system development tools
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
+IUSE=minimal
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-util/catalyst-2.0_rc40 sys-fs/squashfs-tools:0 app-cdr/cdrtools
+SLOT=0
+SRC_URI=mirror://gentoo/gnap-sources-2.0.tar.bz2 !minimal? ( mirror://gentoo/gnap-stageseed-2.0.tar.bz2 mirror://gentoo/gnap-portagesnapshot-2.0.tar.bz2 )
+_md5_=6c170c319d1db993a28c119dc124bd11
diff --git a/dev-embedded/gnap-dev/Manifest b/dev-embedded/gnap-dev/Manifest
deleted file mode 100644
index e129ffc9eaf5..000000000000
--- a/dev-embedded/gnap-dev/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST gnap-portagesnapshot-2.0.tar.bz2 1528216 BLAKE2B 8fd71065f5dc2aef3e7d370b833e3c7699f753b311cf2d11d39008c842adc13fee6ad1e837f16b84992ab42adee5d74780b34a390ee9073aab59b6486e6ce7da SHA512 0cfba05ccf8f4137b56bda6aa309f0b209c6818faca446db037c03373fdcd7b02c456c0a0ca0e88b0bf379d5f3fe3df688fb1b6b58cd3ab40b2bd8b6af403b5a
-DIST gnap-sources-2.0.tar.bz2 18924 BLAKE2B 61de11213d1f2f3ce68a3df3430fb9b90587e94e043148115840e5d38541e731690780bab12f6e8fd09726a02e9ea0147f4d1fb1333875a13107f4d68ee24233 SHA512 b8890a952bedaaaea2231c3da92a1512a4a738d877f4247e1e2bb8d6d7e97f3327240fa465ff2294541a05553fba4ca104bdf3fa54deef98ed7d0a436a86fb93
-DIST gnap-stageseed-2.0.tar.bz2 55210922 BLAKE2B c98b77534516e9840517b1e0025e9517788303cebe9ab69b90cce407e593d6b427eefb6b57df696bbe4e698ebb980274e60131c0c7c135fc8eb88a09dc7bdd09 SHA512 d0368388fb52c5297679b7136d0b4d25f3b1ddcfa114005921a3172e15bcef2f39336735f746c94a78b633bcb08dcc66f25ffbb691bb4b5a780b7cbe8d789578
-EBUILD gnap-dev-2.0.ebuild 1000 BLAKE2B e68dcac5cb589009c545bd73fa27b146d83891e9596acb4d191025a26bc8c6b6a3de5d271faf81d3b221a15b8223892c2207de7c4e1db9d508f84e51118bf062 SHA512 02650bd857d252558f6c698cd6e1e587b811430478b1d9fc106848c3c0df6bb9a3a0aa05b42accd3f1a184ab96f33b59ccdac916ba1cbcca96a044e31cfd70d6
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-embedded/gnap-dev/gnap-dev-2.0.ebuild b/dev-embedded/gnap-dev/gnap-dev-2.0.ebuild
deleted file mode 100644
index 61f96ef93e7b..000000000000
--- a/dev-embedded/gnap-dev/gnap-dev-2.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_P=${P/gnap-dev/gnap-sources}
-S="${WORKDIR}/gnap-${PV}"
-DESCRIPTION="Gentoo-based Network Appliance building system development tools"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-SRC_URI="
-	mirror://gentoo/${MY_P}.tar.bz2
-	!minimal? ( mirror://gentoo/gnap-stageseed-${PV}.tar.bz2
-		mirror://gentoo/gnap-portagesnapshot-${PV}.tar.bz2 )
-"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="minimal"
-
-RDEPEND="
-	>=dev-util/catalyst-2.0_rc40
-	sys-fs/squashfs-tools:0
-	app-cdr/cdrtools
-"
-
-src_unpack() {
-	unpack ${MY_P}.tar.bz2
-}
-
-src_install() {
-	dobin gnap_make
-	doman gnap_make.1
-
-	dodir /usr/lib/gnap
-	tar jc -f ${D}/usr/lib/gnap/gnap-specs.tar.bz2 -C specs .
-	if ! use minimal; then
-		insinto /usr/lib/gnap
-		newins ${DISTDIR}/gnap-stageseed-${PV}.tar.bz2 gnap-stage3seed.tar.bz2
-		newins ${DISTDIR}/gnap-portagesnapshot-${PV}.tar.bz2 gnap-portagesnapshot.tar.bz2
-	fi
-}
diff --git a/dev-embedded/gnap-dev/metadata.xml b/dev-embedded/gnap-dev/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/dev-embedded/gnap-dev/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/dev-embedded/gnap-ext-2.0 b/dev-embedded/gnap-ext-2.0
new file mode 100644
index 000000000000..732bb75bbdb1
--- /dev/null
+++ b/dev-embedded/gnap-ext-2.0
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install unpack
+DESCRIPTION=Gentoo-based Network Appliance extensions and remastering tool
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
+IUSE=minimal
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=sys-fs/squashfs-tools:0
+SLOT=0
+SRC_URI=mirror://gentoo/gnap-tools-2.0.tar.bz2 !minimal? ( mirror://gentoo/gnap-basefs-2.0.tar.bz2 mirror://gentoo/gnap-extensions-2.0.tar )
+_md5_=6623d3dd0ef80e41c4a01501394788ef
diff --git a/dev-embedded/gnap-ext/Manifest b/dev-embedded/gnap-ext/Manifest
deleted file mode 100644
index aa4cecff7797..000000000000
--- a/dev-embedded/gnap-ext/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST gnap-basefs-2.0.tar.bz2 8689764 BLAKE2B 374fcdeff3393af32018095b9ab1d9980fea7fa0a649692bd7055527c090bed5f2d2c55441fce434a8350930aa5328a9f1a04f6155edd5ad490d146df5562e98 SHA512 84a208197d6f5bee42f07eb1f4a02d3d64a4e938e51c7aaa503729ef40f8d7847de2563676e7a14c35fc381905b9da45e89357283060c75c997f3ff52049abeb
-DIST gnap-extensions-2.0.tar 1198080 BLAKE2B 6ace6bd75dc353bbe3243e61e5ae3e8eef07cc3b002f3f33286df995bb6daea99369aca4d3802f2a3898ce78f1d32a9f7e347ff3b14c4babc2d41fd55833e66e SHA512 08266d2b71fd1f170e9ae01fa9c0b3fa898dde7220b1b1d9828fa4bc51b08bcb5af4c7eab75eabc3b3c110ff3e24b2fd193ab36b5579b2507da1a09a90bd4044
-DIST gnap-tools-2.0.tar.bz2 26874 BLAKE2B 016dccbce6b467d37bce71803c2bde3b3274035b9727ab7f004ef7ed5de97bc9ce0f1d5c666d0dc5c9115f1312864221a5b8316da5cae87fd281dfa7e19d7ed0 SHA512 cd8de371aaeee9b5dac5bebb4961855e78cd173a1de99056671e0071be2376c3fd45fb7d635786ad22f3ff413fbcd6d2b710b7c8ca4e99bdfbb09b31e7bf4b52
-EBUILD gnap-ext-2.0.ebuild 970 BLAKE2B 52954acd8541ca3547e78477969eb300a6e1a5b957247f06869a7cb93c83a4db10c4d68ca09d92546e6220db9a5c424721072133c473b01a49edaf6bf89573c2 SHA512 42fd07dbf758caed27db0838c5b4b8ba724ab5231e3b8a5f6ddcd9297a88675b53d81b7bafc1d842c43671942a484f816a21916d1998a3eeffdabe6519416fb0
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-embedded/gnap-ext/gnap-ext-2.0.ebuild b/dev-embedded/gnap-ext/gnap-ext-2.0.ebuild
deleted file mode 100644
index aa84f0527df1..000000000000
--- a/dev-embedded/gnap-ext/gnap-ext-2.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_P="${P/gnap-ext/gnap-tools}"
-S="${WORKDIR}/${MY_P}"
-DESCRIPTION="Gentoo-based Network Appliance extensions and remastering tool"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-SRC_URI="
-	mirror://gentoo/${MY_P}.tar.bz2
-	!minimal? ( mirror://gentoo/gnap-basefs-${PV}.tar.bz2
-		mirror://gentoo/gnap-extensions-${PV}.tar )
-"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="minimal"
-
-RDEPEND="sys-fs/squashfs-tools:0"
-DEPEND=""
-
-src_unpack() {
-	unpack ${MY_P}.tar.bz2
-	if ! use minimal; then
-		unpack gnap-extensions-${PV}.tar
-	fi
-}
-
-src_install() {
-	dobin gnap_remaster
-	doman gnap_remaster.1
-
-	if ! use minimal; then
-		dodir /usr/lib/gnap
-		insinto /usr/lib/gnap
-		newins "${DISTDIR}/gnap-basefs-${PV}.tar.bz2" gnap-basefs.tar.bz2
-		dodir /usr/lib/gnap/extensions
-		insinto /usr/lib/gnap/extensions
-		doins "${WORKDIR}"/gnapext_*.tbz2
-	fi
-}
diff --git a/dev-embedded/gnap-ext/metadata.xml b/dev-embedded/gnap-ext/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/dev-embedded/gnap-ext/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/dev-embedded/gnap/Manifest b/dev-embedded/gnap/Manifest
deleted file mode 100644
index 431f93b5be5d..000000000000
--- a/dev-embedded/gnap/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST gnap-core-2.0.tar 12257280 BLAKE2B 709a1a98527d765de9a70e059432ca1a0a53a681d694b989c49809787e2fb0239cf7e52503ce0ae5d91093747519872e71e7f26631b05cec5d95ad9bbde6050d SHA512 3da9ea5a1a64ff9b1dc58b1efca33079bc48823a96c2e47c878d3651276943be7ec03be2d9ad402818263faaf2415dad0b45f479f60b2fd37f8a7d8a4433ffeb
-DIST gnap-tools-2.0.tar.bz2 26874 BLAKE2B 016dccbce6b467d37bce71803c2bde3b3274035b9727ab7f004ef7ed5de97bc9ce0f1d5c666d0dc5c9115f1312864221a5b8316da5cae87fd281dfa7e19d7ed0 SHA512 cd8de371aaeee9b5dac5bebb4961855e78cd173a1de99056671e0071be2376c3fd45fb7d635786ad22f3ff413fbcd6d2b710b7c8ca4e99bdfbb09b31e7bf4b52
-EBUILD gnap-2.0.ebuild 798 BLAKE2B c9e93c24d30519e1771a2d5d7cf78558e09b69a2daec2e4acc00ab6f867698f3b0f521bab361b7563abc6fead43692ea2f1e97e42124157d80dea59b1b0fd4da SHA512 dd51ae69f0aecca0c25ce3146ea7fe843619ab229b8a8efb48aca7c76b358d797275ec7bb368b143694d656b9603aa3acf8fce279c8d1cb398533c39facc46a9
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-embedded/gnap/gnap-2.0.ebuild b/dev-embedded/gnap/gnap-2.0.ebuild
deleted file mode 100644
index 2eb49746334c..000000000000
--- a/dev-embedded/gnap/gnap-2.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-MY_P="${P/gnap/gnap-tools}"
-S="${WORKDIR}/${MY_P}"
-DESCRIPTION="Gentoo-based Network Appliance building system"
-HOMEPAGE="https://embedded.gentoo.org/gnap.xml"
-
-SRC_URI="mirror://gentoo/${MY_P}.tar.bz2
-	!minimal? ( mirror://gentoo/${PN}-core-${PV}.tar )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="minimal"
-
-RDEPEND="app-cdr/cdrtools
-	sys-fs/dosfstools
-	<sys-boot/syslinux-5"
-
-src_unpack() {
-	unpack ${MY_P}.tar.bz2
-}
-
-src_install() {
-	dobin gnap_overlay
-	doman gnap_overlay.1
-
-	dodoc README.upgrading
-
-	dodir /usr/lib/gnap
-	insinto /usr/lib/gnap
-	if ! use minimal; then
-		newins "${DISTDIR}"/${PN}-core-${PV}.tar ${PN}-core.tar
-		doins -r mbr
-		doins -r examples
-	fi
-}
diff --git a/dev-embedded/gnap/metadata.xml b/dev-embedded/gnap/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/dev-embedded/gnap/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/dev-embedded/gnome-avrdude-0.1 b/dev-embedded/gnome-avrdude-0.1
new file mode 100644
index 000000000000..ebb7a749c5af
--- /dev/null
+++ b/dev-embedded/gnome-avrdude-0.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
+DEPEND=>=dev-libs/glib-2 x11-libs/gtk+:2 gnome-base/gconf gnome-base/libgnome gnome-base/libgnomeui gnome-base/libglade x11-libs/pango virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=GNOME GUI for avrdude
+EAPI=5
+HOMEPAGE=https://www.sourceforge.net/projects/gnome-avrdude/
+IUSE=debug
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-libs/glib-2 x11-libs/gtk+:2 gnome-base/gconf gnome-base/libgnome gnome-base/libgnomeui gnome-base/libglade x11-libs/pango dev-embedded/avrdude
+SLOT=0
+SRC_URI=mirror://sourceforge/gnome-avrdude/gnome-avrdude-0.1.tar.gz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=061a4105d6c1b7a58b899b2be5d14543
diff --git a/dev-embedded/gnome-avrdude/Manifest b/dev-embedded/gnome-avrdude/Manifest
deleted file mode 100644
index 3a5fafd563a6..000000000000
--- a/dev-embedded/gnome-avrdude/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST gnome-avrdude-0.1.tar.gz 105608 BLAKE2B 0deb705604666659abc3813e31436ccb79b9cb058e66d791128cb275952169d99a660c7c114d637a32e528e96e94645eb0dee3ea6a45bda1039e0124d60dd938 SHA512 9b9bbb5fe8247ea33482d7d40089a23b1c2aa9f3709d96e0f008e6cc60a7313468fb22829391b175cd51916b5335811dae0263de553f7c8f3c447acdb39f8198
-EBUILD gnome-avrdude-0.1.ebuild 979 BLAKE2B 0e4ca34e3ee15a9f6a8bb6d42b69e25a1bc705f75be5f7b0f80819e338a4e2b1ba81d73056116de5e1577bd11a5ff47f0267e12b7401fc9e496a0d903272b3f0 SHA512 ae8341d783adeb7adb8da7afaa13b829831ebd08dc2cb808c8eeeb0936d2ea3b392f18c0dacc2376db6a30afbc31e0f1a62d93010a2d15d3122aced57ea11001
-MISC metadata.xml 510 BLAKE2B 5c5291af29e3dadf44e3549674e833533f21637c765c0070f13749ff8854932d87fb63157c6ebd603309aefd2d3faa93dcd1ac4d390fc42e658c98470d198587 SHA512 cdaa140f64a77102b44dd097d55f416ad1d80e51b05b6c0bdd42edc8703d66d8c7f595b036207d517d2d7ca89089f5568dc52867cc8b9a81716223d6abf46785
diff --git a/dev-embedded/gnome-avrdude/gnome-avrdude-0.1.ebuild b/dev-embedded/gnome-avrdude/gnome-avrdude-0.1.ebuild
deleted file mode 100644
index 3ba5502018e0..000000000000
--- a/dev-embedded/gnome-avrdude/gnome-avrdude-0.1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit gnome2 autotools
-
-DESCRIPTION="GNOME GUI for avrdude"
-HOMEPAGE="https://www.sourceforge.net/projects/gnome-avrdude/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-libs/glib-2
-	x11-libs/gtk+:2
-	gnome-base/gconf
-	gnome-base/libgnome
-	gnome-base/libgnomeui
-	gnome-base/libglade
-	x11-libs/pango"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-RDEPEND="${RDEPEND}
-	dev-embedded/avrdude"
-
-DOCS="AUTHORS NEWS README"
-
-src_prepare() {
-	sed -i \
-		-e :a -e '/\\$/N; s/\\\n//; ta' \
-		-e 's/^gnome_avrdude/#gnome_avrdude/' \
-		"${S}"/Makefile.am \
-		|| die "sed failed"
-	sed -i \
-		-e 's/Wall\\/Wall/' \
-		-e 's/^[\t ]*-g//' \
-		"${S}"/src/Makefile.am \
-		|| die "sed failed"
-
-	# Remove Application category from .desktop file.
-	sed -i 's/;Application;/;/' gnome-avrdude.desktop
-
-	eautoreconf
-}
diff --git a/dev-embedded/gnome-avrdude/metadata.xml b/dev-embedded/gnome-avrdude/metadata.xml
deleted file mode 100644
index 13dbe7261495..000000000000
--- a/dev-embedded/gnome-avrdude/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>embedded@gentoo.org</email>
-		<name>Embedded Gentoo</name>
-	</maintainer>
-	<longdescription>
-		gnome-avrdude is a GNOME graphical user interface (GUI) for the command-line 
-		Atmel AVR microcontroller programming software avrdude
-	</longdescription>
-	<upstream>
-		<remote-id type="sourceforge">gnome-avrdude</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-embedded/gnusim8085-1.3.7 b/dev-embedded/gnusim8085-1.3.7
new file mode 100644
index 000000000000..e4e5d82b6959
--- /dev/null
+++ b/dev-embedded/gnusim8085-1.3.7
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=>=x11-libs/gtk+-2.12:2 x11-libs/gdk-pixbuf:2 dev-libs/glib:2 x11-libs/gtksourceview:2.0 x11-libs/pango virtual/pkgconfig nls? ( sys-devel/gettext ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=A GTK2 8085 Simulator
+EAPI=4
+HOMEPAGE=http://gnusim8085.org
+IUSE=nls examples
+KEYWORDS=amd64 x86
+LICENSE=GPL-2
+RDEPEND=>=x11-libs/gtk+-2.12:2 x11-libs/gdk-pixbuf:2 dev-libs/glib:2 x11-libs/gtksourceview:2.0 x11-libs/pango
+SLOT=0
+SRC_URI=https://launchpad.net/gnusim8085/trunk/1.3.7/+download/gnusim8085-1.3.7.tar.gz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=24a41fbb2cb34331095ce836fb2b13da
diff --git a/dev-embedded/gnusim8085/Manifest b/dev-embedded/gnusim8085/Manifest
deleted file mode 100644
index 4c4ba87b4b35..000000000000
--- a/dev-embedded/gnusim8085/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX gnusim8085-1.3.7-cflags.patch 226 BLAKE2B 035291e340d2381fb3076972c5acc55d8ac8b897666f8598bad669c062af30de8a6ac9a59b194112722ced9f2f42f903fcdd701829598f4242cc5ad4b085b6d4 SHA512 62f5ee1e7adcbe9abe20f9e8c8e07f74f7563b8afe666975e579a2f20fb404cbdd314c0ba7dc01a56d818292d264f03ef07ee7fb37b4ace53ee5e934079b7310
-AUX gnusim8085-1.3.7-docs.patch 502 BLAKE2B 7cf60bba055d6e291ae624b502bef2602b21e81db7eda61ca47af773147164ce14fc66dc761b6b61f00b5405b88a8f9fb8b9c2fa57258cf8122ef590d1a62fb7 SHA512 c7051c237e05723571262d3b0ee5b207848c03972ce80c9620fcdb81809a492e59d0d54f0ace2305fd58a5ebbf3c035f150d1dbbed187703a2c71930488b96df
-DIST gnusim8085-1.3.7.tar.gz 365127 BLAKE2B 55637e4ade4be6145f3fbe95a29d01565caafd54a45c90d693a940e645153da3eac52e685d648b3be18cc05ba080133a26978a99a841f37f09eebfeaf5de89b8 SHA512 b1b701ef3292c2b3ea7a599f450ee495fdec730fa53e2ad9ea27c716a7de61d503f32345ed3cf6eeef3ef698ed4f0b957cb7ae207df0bee46363e76b5176b822
-EBUILD gnusim8085-1.3.7.ebuild 903 BLAKE2B 6a5be123689b639a10d6f7c77c83b1ec0ed2936e6112be91a4a471815418b18c8f804ae2b1ba1c1f6c2bcc470805737f2fed0eff2c3b54b7b8f352c0a6d50f55 SHA512 456a439e4822f7ff5fcfb29a5c426386157cf0a467dc1f9196fc71e9180d81c7b915cd0e4396415b73088adf907edf98b6894943ab543a85461e141e5098463b
-MISC metadata.xml 329 BLAKE2B cd8484c759dd16c6d4222f47a75d3483cfc6095112fa0a6c38fa3bbb35a47c3c4033d94fb2bde3627e5a957419c3aae75cb049e9ef67034ae9e3a6272d8e9fbd SHA512 7959e94cb6da565f3a4ebe9a4e9cc5ec6d484b2b3a43df144afd37d0b4dcdbebc875a76e355d2d1061f92a2bed29192d27b240db4704d6f95e87612d572fa882
diff --git a/dev-embedded/gnusim8085/files/gnusim8085-1.3.7-cflags.patch b/dev-embedded/gnusim8085/files/gnusim8085-1.3.7-cflags.patch
deleted file mode 100644
index ce118779ce01..000000000000
--- a/dev-embedded/gnusim8085/files/gnusim8085-1.3.7-cflags.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- gnusim8085-1.3.7/src/Makefile.am.orig
-+++ gnusim8085-1.3.7/src/Makefile.am
-@@ -11,9 +11,7 @@
- 
- gnusim8085_CFLAGS =\
- 	 -DPACKAGE_DOC_DIR=\"$(docdir)\"\
--	 -Wall\
--	 -O1\
--	 -g
-+	 -Wall
- 
- if WIN32
- gnusim8085_CFLAGS += \
diff --git a/dev-embedded/gnusim8085/files/gnusim8085-1.3.7-docs.patch b/dev-embedded/gnusim8085/files/gnusim8085-1.3.7-docs.patch
deleted file mode 100644
index 6ae26b892db4..000000000000
--- a/dev-embedded/gnusim8085/files/gnusim8085-1.3.7-docs.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- gnusim8085-1.3.7/Makefile.am.orig
-+++ gnusim8085-1.3.7/Makefile.am
-@@ -3,17 +3,9 @@
- ## If you don't want it to overwrite it,
- ## 	Please disable it in the Anjuta project configuration
- 
--SUBDIRS = po src pixmaps doc data
-+SUBDIRS = po src pixmaps data
- 
--gnusim8085_docdir = $(docdir)
--gnusim8085_doc_DATA = \
--	README\
--	AUTHORS\
--	NEWS\
--	TODO\
--	ABOUT-NLS
--
--EXTRA_DIST = config.rpath m4/ChangeLog  $(gnusim8085doc_DATA)
-+EXTRA_DIST = config.rpath m4/ChangeLog
- 
- DISTCLEANFILES = *.exe *.gz
- 
diff --git a/dev-embedded/gnusim8085/gnusim8085-1.3.7.ebuild b/dev-embedded/gnusim8085/gnusim8085-1.3.7.ebuild
deleted file mode 100644
index ba7da67ac506..000000000000
--- a/dev-embedded/gnusim8085/gnusim8085-1.3.7.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils autotools
-
-DESCRIPTION="A GTK2 8085 Simulator"
-HOMEPAGE="http://gnusim8085.org"
-SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="nls examples"
-
-RDEPEND=">=x11-libs/gtk+-2.12:2
-	x11-libs/gdk-pixbuf:2
-	dev-libs/glib:2
-	x11-libs/gtksourceview:2.0
-	x11-libs/pango"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-docs.patch
-	epatch "${FILESDIR}"/${P}-cflags.patch
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_enable nls)
-}
-
-src_install() {
-	default
-	doman doc/gnusim8085.1
-
-	if use examples ; then
-		docompress -x /usr/share/doc/${PF}/examples
-		insinto /usr/share/doc/${PF}/examples
-		doins doc/examples/*.asm doc/asm-guide.txt
-	fi
-}
diff --git a/dev-embedded/gnusim8085/metadata.xml b/dev-embedded/gnusim8085/metadata.xml
deleted file mode 100644
index 620d085bf521..000000000000
--- a/dev-embedded/gnusim8085/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>embedded@gentoo.org</email>
-		<name>Embedded Gentoo</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="launchpad">gnusim8085</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-embedded/gpsim-0.29.0 b/dev-embedded/gpsim-0.29.0
new file mode 100644
index 000000000000..324c68a63603
--- /dev/null
+++ b/dev-embedded/gpsim-0.29.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install
+DEPEND=>=dev-embedded/gputils-0.12 !dev-embedded/gpsim-lcd dev-libs/glib:2 dev-libs/popt sys-libs/readline:0= gtk? ( >=x11-libs/gtk+extra-2 ) sys-devel/flex virtual/pkgconfig virtual/yacc
+DESCRIPTION=A simulator for the Microchip PIC microcontrollers
+EAPI=6
+HOMEPAGE=http://gpsim.sourceforge.net
+IUSE=doc gtk static-libs
+KEYWORDS=amd64 ~ppc ~ppc64 x86
+LICENSE=GPL-2
+RDEPEND=>=dev-embedded/gputils-0.12 !dev-embedded/gpsim-lcd dev-libs/glib:2 dev-libs/popt sys-libs/readline:0= gtk? ( >=x11-libs/gtk+extra-2 )
+SLOT=0
+SRC_URI=mirror://sourceforge/gpsim/gpsim-0.29.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=7dc9747753f7c9cb8b4cf6223279a627
diff --git a/dev-embedded/gpsim-0.30.0 b/dev-embedded/gpsim-0.30.0
new file mode 100644
index 000000000000..0c49e0748f1c
--- /dev/null
+++ b/dev-embedded/gpsim-0.30.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install
+DEPEND=>=dev-embedded/gputils-0.12 dev-libs/glib:2 dev-libs/popt sys-libs/readline:0= gtk? ( >=x11-libs/gtk+extra-2 ) sys-devel/flex virtual/pkgconfig virtual/yacc
+DESCRIPTION=A simulator for the Microchip PIC microcontrollers
+EAPI=6
+HOMEPAGE=http://gpsim.sourceforge.net
+IUSE=doc gtk static-libs
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-embedded/gputils-0.12 dev-libs/glib:2 dev-libs/popt sys-libs/readline:0= gtk? ( >=x11-libs/gtk+extra-2 )
+SLOT=0
+SRC_URI=mirror://sourceforge/gpsim/gpsim-0.30.0.tar.gz
+_eclasses_=ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=de2d1f2760423b9ca162d803b23e5b63
diff --git a/dev-embedded/gpsim/Manifest b/dev-embedded/gpsim/Manifest
deleted file mode 100644
index e8c935baacc4..000000000000
--- a/dev-embedded/gpsim/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX gpsim-0.29.0-gui.patch 259 BLAKE2B c22bdbd705d2607caa4330431a64918126dfe4411d56e51de6a00d6839c1b28e9ec6f3addf05cf10e31b339fa9d7927da6c6473a5d5c5ea7f447f893fc16d148 SHA512 983d83627a9ec4ebe350e22890fafc55bea72dbb3f59f75f17abe72760c4ac1df57b29ae01603187d458964399606fcef5bd3b79f0dc6b489ed8890d62a8ec1a
-DIST gpsim-0.29.0.tar.gz 3301050 BLAKE2B e71aec8d3ed5c421a050a2b1c6de4a1ee561c3fdc91abe896aa02de08523e7e0d7e917d1a313cbb6a590a7590748edc9b48f8e04eaeffa86541e0bd4f7b57d06 SHA512 f24997e7bc360afbc87f9cc1e36cf5fa25aecf23c21ba043eabb333b5de9ddfa24b1373fdaa48ba8043a7fcda72558d54691db2579345255dd453e94b3752920
-DIST gpsim-0.30.0.tar.gz 3385728 BLAKE2B 05be3672cb31253ef132dd600a39710cb952cef356ebb69d0b09119e578faa05e6f25613a83e076ddca568f0560da25df6361331364e70ff8db8f4f47b8f5de5 SHA512 8681f06e73569b801d2961858c8676490d93f7ef40e99f07e7a5eff16955850b66bcd8182aa22ba0edca0b10723cb3a5b7b8bf52fdb0cc94955c3072352292df
-EBUILD gpsim-0.29.0.ebuild 889 BLAKE2B 99ace4efd1e3ca25d3b7dafc81a7d5cd65868b20e13dde810f617d53306e6c59984c7067c4977099c4d4ba2468e43257280de3663aa277d3f3fb1ae10f151b75 SHA512 d11427f7230c62f0ae8939ef159555117ddf8ea443d6b5a3d7e79d45bb558093989bb4b555072c77f62ca7ef721f38d6c144cc661bbec6dec37c454780531ae7
-EBUILD gpsim-0.30.0.ebuild 824 BLAKE2B 7ea1f570855df419d59ee15f8d9ebd3f11005bfa71a2d939dc066565a3c9fbb52434a889f648e8f56dfcf0f2a9532783f5add574c49a68c7da2ab7161e82a0a3 SHA512 593cab1b15eeb52b5f89f1f4975850e945b7c90b5c5bc5f27c508355ffce335a89193e73b060899ea8cce6ce716d25063f4fb5cfbef76b86e6893f6792d1d07a
-MISC metadata.xml 326 BLAKE2B 894c44eb2da989117a768b9e03fb039b61b4246023c99a43c218fee73d3d6ef98d6e993ac8149266a6ba5fdf5288186e2cee9d4514d6919d66f463e393f78b14 SHA512 73998eee3ecc03e0b524a6cf1f4e4dc4fb670c75fc1c559dc3a1ed327f53ea282a5aca2516af93d1cbf2cc2871970f3b5377a6837204fca07c4ec17080077636
diff --git a/dev-embedded/gpsim/files/gpsim-0.29.0-gui.patch b/dev-embedded/gpsim/files/gpsim-0.29.0-gui.patch
deleted file mode 100644
index b055e01b0d8c..000000000000
--- a/dev-embedded/gpsim/files/gpsim-0.29.0-gui.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- gpsim-0.29.0/modules/logic.cc
-+++ gpsim-0.29.0/modules/logic.cc
-@@ -269,8 +269,10 @@
- 
- LogicGate::~LogicGate()
- {
-+#ifdef HAVE_GUI
-   if (pixbuf)
-     g_object_unref(pixbuf);
-+#endif
- }
- 
- //--------------------------------------------------------------
diff --git a/dev-embedded/gpsim/gpsim-0.29.0.ebuild b/dev-embedded/gpsim/gpsim-0.29.0.ebuild
deleted file mode 100644
index d888bc2db9fe..000000000000
--- a/dev-embedded/gpsim/gpsim-0.29.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils
-
-DESCRIPTION="A simulator for the Microchip PIC microcontrollers"
-HOMEPAGE="http://gpsim.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
-IUSE="doc gtk static-libs"
-
-RDEPEND=">=dev-embedded/gputils-0.12
-	!dev-embedded/gpsim-lcd
-	dev-libs/glib:2
-	dev-libs/popt
-	sys-libs/readline:0=
-	gtk? ( >=x11-libs/gtk+extra-2 )"
-DEPEND="${RDEPEND}
-	sys-devel/flex
-	virtual/pkgconfig
-	virtual/yacc"
-
-DOCS=( ANNOUNCE AUTHORS ChangeLog HISTORY PROCESSORS README README.MODULES TODO )
-
-PATCHES=( "${FILESDIR}"/${P}-gui.patch )
-
-src_configure() {
-	econf \
-		$(use_enable gtk gui) \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	default
-	use doc && dodoc doc/gpsim.pdf
-
-	prune_libtool_files
-}
diff --git a/dev-embedded/gpsim/gpsim-0.30.0.ebuild b/dev-embedded/gpsim/gpsim-0.30.0.ebuild
deleted file mode 100644
index 7c6e310bd228..000000000000
--- a/dev-embedded/gpsim/gpsim-0.30.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit ltprune
-
-DESCRIPTION="A simulator for the Microchip PIC microcontrollers"
-HOMEPAGE="http://gpsim.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="doc gtk static-libs"
-
-RDEPEND=">=dev-embedded/gputils-0.12
-	dev-libs/glib:2
-	dev-libs/popt
-	sys-libs/readline:0=
-	gtk? ( >=x11-libs/gtk+extra-2 )"
-DEPEND="${RDEPEND}
-	sys-devel/flex
-	virtual/pkgconfig
-	virtual/yacc"
-
-DOCS=( ANNOUNCE AUTHORS ChangeLog HISTORY PROCESSORS README README.MODULES TODO )
-
-src_configure() {
-	econf \
-		$(use_enable gtk gui) \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	default
-	use doc && dodoc doc/gpsim.pdf
-	prune_libtool_files
-}
diff --git a/dev-embedded/gpsim/metadata.xml b/dev-embedded/gpsim/metadata.xml
deleted file mode 100644
index 96afab317239..000000000000
--- a/dev-embedded/gpsim/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>embedded@gentoo.org</email>
-		<name>Embedded Gentoo</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">gpsim</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-embedded/gputils-1.5.0 b/dev-embedded/gputils-1.5.0
new file mode 100644
index 000000000000..982c823f77cc
--- /dev/null
+++ b/dev-embedded/gputils-1.5.0
@@ -0,0 +1,10 @@
+DEFINED_PHASES=configure install
+DESCRIPTION=Tools including assembler, linker and librarian for PIC microcontrollers
+EAPI=6
+HOMEPAGE=https://gputils.sourceforge.io
+KEYWORDS=amd64 ppc ppc64 x86
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=mirror://sourceforge/gputils/gputils-1.5.0.tar.gz
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=e8b47d83bc5a7971e0e84f52a230d0c4
diff --git a/dev-embedded/gputils/Manifest b/dev-embedded/gputils/Manifest
deleted file mode 100644
index a131b2806e59..000000000000
--- a/dev-embedded/gputils/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST gputils-1.5.0.tar.gz 13155377 BLAKE2B 68f6ed2ba93f83eaae0573dde5fe8d3a67ec6cf4349832e5edcab70ec35db7d8210f28d46bf3272a7b7f9b52299b1289792b1ca2a75b952e7ea2fc263448c8b9 SHA512 fc74e92ddfe2c9c7ee272a712a411bf01790358c310afc9a802f503902675fa4717410354bf8791f64da45b63f0b1f562b55fdd7127d3989f4295ebe5f80b645
-EBUILD gputils-1.5.0.ebuild 627 BLAKE2B 4eff6895ea80d6797e8bf6488b3f2428f521218fa29dd6085c4c9bf2f095815fa8d9485e3cfc50b89e2350e1abadec0b2c80ae0ee2bd93059b2e7c6e2df22545 SHA512 cdf4695daf85d2b6f4c9c2286ac37a45025394a2c40e525a42678bdf2f360afba2e5ba8139a81792cb3ea86eeb5a33246b13926b917cc07d9e137e6b4b5701cb
-MISC metadata.xml 328 BLAKE2B 4fe3d4a646d412fecab3343797849e90864c6fda41400da3a71e430f0bd1f8d3a8ce552ba0f0127049bf70985f9b7ebc8005c8dd124fa5c5fc113cbdf7cbcd62 SHA512 7883c33a023766278a8d827d6c3435848dc4647e2218c5d7552d14d14a49a6534d75df8b27b6231dcf940b62ed8ac86b0a0bf898233726297d2af4083ab98fd4
diff --git a/dev-embedded/gputils/gputils-1.5.0.ebuild b/dev-embedded/gputils/gputils-1.5.0.ebuild
deleted file mode 100644
index bd1e4fc9e3aa..000000000000
--- a/dev-embedded/gputils/gputils-1.5.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="Tools including assembler, linker and librarian for PIC microcontrollers"
-HOMEPAGE="https://gputils.sourceforge.io"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE=""
-
-src_configure() {
-	tc-ld-disable-gold #369291
-	# Their configure script tries to do funky things with default
-	# compiler selection.  Force our own defaults instead.
-	tc-export CC
-	default
-}
-
-src_install() {
-	default
-	dodoc doc/gputils.pdf
-}
diff --git a/dev-embedded/gputils/metadata.xml b/dev-embedded/gputils/metadata.xml
deleted file mode 100644
index 41b0d86e7534..000000000000
--- a/dev-embedded/gputils/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>embedded@gentoo.org</email>
-		<name>Embedded Gentoo</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">gputils</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-embedded/icdprog-0.5 b/dev-embedded/icdprog-0.5
new file mode 100644
index 000000000000..dbc08f1abcc2
--- /dev/null
+++ b/dev-embedded/icdprog-0.5
@@ -0,0 +1,10 @@
+DEFINED_PHASES=compile install postinst
+DESCRIPTION=Microchip PIC Programmer using ICD hardware
+EAPI=4
+HOMEPAGE=http://icdprog.sf.net/
+KEYWORDS=~amd64 x86
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=mirror://sourceforge/icdprog/icdprog-0.5.tar.gz
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=7e75f5f1d0ee2015d77ae821d80a50e5
diff --git a/dev-embedded/icdprog/Manifest b/dev-embedded/icdprog/Manifest
deleted file mode 100644
index 397e610004af..000000000000
--- a/dev-embedded/icdprog/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST icdprog-0.5.tar.gz 47195 BLAKE2B 66ba011f1809bce21db64074da1fb52c1373caa20d6843abbad023da466f32888b8b4e906512975d29bc9bfb73bb9726b49040e52a70f187f1fea5eab3122b91 SHA512 3e238cbbbcfc034a5100c78c1e8ffea669deeec26cdf2a2ad1d27577acff1a114badfb67453d4241b9a239326d0d624616fc8383affc3d34380edfdc0fcf7989
-EBUILD icdprog-0.5.ebuild 657 BLAKE2B bd766e0e9c490618254d69094b87ec7fb4f008451c74e9ad51f859cf11b427fde441b0727ebaeee0d85b5d6733972dad564a2ece840276a5fee6959c92bb0f28 SHA512 1786d708deb8c35ed2cbeefebafe0e326b29f98668ae2b6efd1f4e672788a524e5951c06702091041b954dd527d320881652abea94021e2c8bfdb5074bb7845a
-MISC metadata.xml 504 BLAKE2B 33d002d44acc57a9d550653fc4fe0946ae480bbb921f4ce6b67fbec840d19db7311b605875f5967ce5ef00e7c8b81274a6ef947f0b03c7ce672bd9c3b4c8b148 SHA512 6fd63603b4dfd1bcc7cbd6e9706f23e60d80392d5608b6b5bf86a2f0cbcd4ec0282017763f205944f1ad5392abcd65b5d5e5af9de7507c753c4e17af7bdad291
diff --git a/dev-embedded/icdprog/icdprog-0.5.ebuild b/dev-embedded/icdprog/icdprog-0.5.ebuild
deleted file mode 100644
index 5b1a9e09b0d9..000000000000
--- a/dev-embedded/icdprog/icdprog-0.5.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit toolchain-funcs
-
-DESCRIPTION="Microchip PIC Programmer using ICD hardware"
-HOMEPAGE="http://icdprog.sf.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 x86"
-IUSE=""
-
-src_compile() {
-	tc-export CC
-
-	cd "${S}"/src
-	emake CFLAGS="${CFLAGS}"
-	cd "${S}"/src/icddump
-	emake CFLAGS="${CFLAGS}"
-}
-
-src_install() {
-	dobin src/icdprog
-	dobin src/icddump/icddump
-	dohtml readme.html
-	dodoc src/README.coders
-}
-
-pkg_postinst() {
-	elog "Please see readme.html if the ICD seems to be very slow."
-}
diff --git a/dev-embedded/icdprog/metadata.xml b/dev-embedded/icdprog/metadata.xml
deleted file mode 100644
index 131ceff58518..000000000000
--- a/dev-embedded/icdprog/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>embedded@gentoo.org</email>
-		<name>Embedded Gentoo</name>
-	</maintainer>
-	<longdescription>
-		ICDPROG is a simple command line programmer for Microchip PIC
-		controllers, using the Microchip ICD (in circuit debugger)
-		hardware.
-	</longdescription>
-	<upstream>
-		<remote-id type="sourceforge">icdprog</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-embedded/include-0.4.2 b/dev-embedded/include-0.4.2
new file mode 100644
index 000000000000..59728d03daf5
--- /dev/null
+++ b/dev-embedded/include-0.4.2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=-
+DESCRIPTION=A collection of useful, independent include files for C/Assembler developers
+EAPI=4
+HOMEPAGE=http://openwince.sourceforge.net/include/
+KEYWORDS=amd64 ppc sparc x86
+LICENSE=BSD
+SLOT=0
+SRC_URI=mirror://sourceforge/openwince/include-0.4.2.tar.bz2
+_md5_=9493fe7f53fdab1363812fbebd3d1e18
diff --git a/dev-embedded/include/Manifest b/dev-embedded/include/Manifest
deleted file mode 100644
index 636485cac546..000000000000
--- a/dev-embedded/include/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST include-0.4.2.tar.bz2 110312 BLAKE2B d6104fce3dd95d003b5704449300e1d70bfc225b25e24ab717e0249197eebeb0063c9c5d73e5f65050f11e0920950959ce3a525801e436bef8cdcffa4e8052c0 SHA512 5c8f6eab27bfbc7628107162cae71d2e88ce6d96b655427468b81de052abf02ef48b7fe05435fc1468855e21665e4e973ef63d94265351f09e078119180dc07b
-EBUILD include-0.4.2.ebuild 379 BLAKE2B 354fab4154fff0e2cf2a2eff9d17fb625b13f2992449c94fd17412a926b23684b30402d8ad9a20fcdbf361c714f5e051b421b5d287c4acf76f5b7cfd94b6a8e0 SHA512 8c1a9593298eef88f9ef3d9479978fd3351efcca347f6c0bf21f6ba60067ef45161007aab70fc66bda4cb469faf91e2d7b8941e98f469ac386cb250e5a9efa7a
-MISC metadata.xml 330 BLAKE2B ebbc7d714b79e3ac894b34044d3ddaa7e224963547a76443734cf63dbc479c82c261c6bcafcd81a55a464cfb4362186de6b368d75006181b60af97745fed4dcd SHA512 778e63c367986779da9a1fce3c07983721e8c3cc961ef6bbfdd717b61487ab8d7e4e135a8b58103c1b5f5b3b10f9b506bf8b45e0b9504da29714fe6601f7a65b
diff --git a/dev-embedded/include/include-0.4.2.ebuild b/dev-embedded/include/include-0.4.2.ebuild
deleted file mode 100644
index 98e9687d0b98..000000000000
--- a/dev-embedded/include/include-0.4.2.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-DESCRIPTION="A collection of useful, independent include files for C/Assembler developers"
-HOMEPAGE="http://openwince.sourceforge.net/include/"
-SRC_URI="mirror://sourceforge/openwince/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ppc sparc x86"
-IUSE=""
diff --git a/dev-embedded/include/metadata.xml b/dev-embedded/include/metadata.xml
deleted file mode 100644
index 57324191fdc5..000000000000
--- a/dev-embedded/include/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>embedded@gentoo.org</email>
-		<name>Embedded Gentoo</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">openwince</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-embedded/jal-0.4.60 b/dev-embedded/jal-0.4.60
new file mode 100644
index 000000000000..9c0227920219
--- /dev/null
+++ b/dev-embedded/jal-0.4.60
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install
+DESCRIPTION=A high-level language for Microchip PIC and Ubicom SX microcontrollers
+EAPI=0
+HOMEPAGE=http://jal.sourceforge.net/
+KEYWORDS=x86
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=mirror://sourceforge/jal/jal-0.4.60.tar.gz
+_md5_=19592e3557faa6d67831f9f44434f8a3
diff --git a/dev-embedded/jal-0.4.62 b/dev-embedded/jal-0.4.62
new file mode 100644
index 000000000000..10415a6bb9f8
--- /dev/null
+++ b/dev-embedded/jal-0.4.62
@@ -0,0 +1,9 @@
+DEFINED_PHASES=-
+DESCRIPTION=A high-level language for Microchip PIC and Ubicom SX microcontrollers
+EAPI=4
+HOMEPAGE=http://jal.sourceforge.net/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=mirror://sourceforge/jal/jal-0.4.62.tar.gz
+_md5_=b679b2a92d60e11fad148450a5148a07
diff --git a/dev-embedded/jal/Manifest b/dev-embedded/jal/Manifest
deleted file mode 100644
index 26fa5fc422c2..000000000000
--- a/dev-embedded/jal/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST jal-0.4.60.tar.gz 383874 BLAKE2B 3e122d352d83f6753c5451225aeb39e9d1eb33fa733b5414a3643f9eee259eef6dbbb8897d8fdd2636af2c32c06fc75f5bb9afafd9909235cec196dafc08d597 SHA512 caa3c33bca680ea01e69962212e3ab72c56362907a9ae67597fbe6fec2393d6a81f01f0d02bec3f434888a825d1d20e526d4c62a175fcca16ab02af3c59fa0c1
-DIST jal-0.4.62.tar.gz 429020 BLAKE2B 65e04feb0379050b535c0dcb513e0955a6f20bd0f8cd8a50179bbf20ee6d114cf301a85dfa9553533db81c9db819a014409aa44e54287ff69a663df8bae2e0a3 SHA512 2354359507c2d33d8eeb7a5b9d40471a2d8cff245eb59d64484a89e4aff14d7d3c6021f0b26f1e48adb986fc221e4dade1037cef50167cbe249da445c77dbcb1
-EBUILD jal-0.4.60.ebuild 398 BLAKE2B ab9dc92352cdafb8e8fe2a8073e741c9d95dbf068432af89421f71ee190ebc0769c8eec7a06c93b9407c02003b7bca108d0371cc37546476210354a13d749ab1 SHA512 9e886187823b339a67a4bdecee2599182c07adc5fa004aa5ff16c8bd582d761b83982c1ffa1f01d108bf92db23dde025bbec8473d27b8fa5f2bbe1ec83b731b4
-EBUILD jal-0.4.62.ebuild 386 BLAKE2B 93e5e8632c4f7b60f97532b72ce4503b784b9d6cb17b1a733f786e66084651a48cb2c3b123c0d28cf3c27d4a2e7e97dab1764412a4644d03bf21680cc7825e05 SHA512 cfb3fe280b959bc2af28469f6ff6df3816a784d4b6562b3f201b6c5fcf51fa1baffbef1a8c4b64da34e1937642f92cb6715ec8b1cc74b08f6a6e89be107284f5
-MISC metadata.xml 530 BLAKE2B 25ff84b957537922bda377fc7c700ef86aae5a2bfd7fa0546986631348b2601bdb15199071ff68def9389518eef0858e287d4ac63e12a6dc05793e6e1b355afc SHA512 fa41a9576afb80be565ef5d2d34d4786b93f954b6865b167eaa5eafd257b438fb86f1be42261dae3f6b3a1cc94970119baf12d028e4b1a4a9287a301f69a19da
diff --git a/dev-embedded/jal/jal-0.4.60.ebuild b/dev-embedded/jal/jal-0.4.60.ebuild
deleted file mode 100644
index d0f96099dcb0..000000000000
--- a/dev-embedded/jal/jal-0.4.60.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-DESCRIPTION="A high-level language for Microchip PIC and Ubicom SX microcontrollers"
-HOMEPAGE="http://jal.sourceforge.net/"
-SRC_URI="mirror://sourceforge/jal/${P}.tar.gz"
-LICENSE="GPL-2"
-KEYWORDS="x86"
-SLOT="0"
-IUSE=""
-DEPEND=""
-
-src_install() {
-	make DESTDIR=${D} install || die
-}
diff --git a/dev-embedded/jal/jal-0.4.62.ebuild b/dev-embedded/jal/jal-0.4.62.ebuild
deleted file mode 100644
index e13541879b99..000000000000
--- a/dev-embedded/jal/jal-0.4.62.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-DESCRIPTION="A high-level language for Microchip PIC and Ubicom SX microcontrollers"
-HOMEPAGE="http://jal.sourceforge.net/"
-SRC_URI="mirror://sourceforge/jal/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-S=${WORKDIR}/${PN}
diff --git a/dev-embedded/jal/metadata.xml b/dev-embedded/jal/metadata.xml
deleted file mode 100644
index 5545bc5734eb..000000000000
--- a/dev-embedded/jal/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>embedded@gentoo.org</email>
-		<name>Embedded Gentoo</name>
-	</maintainer>
-	<longdescription>
-Jal is a high-level language for a number of Microchip (TM) PIC microcontrollers (16c84, 16f84, 12c508, 
-12c509, 16F877) and Ubicom SX (SX18 and SX28) microcontrollers
-</longdescription>
-	<upstream>
-		<remote-id type="sourceforge">jal</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-embedded/jtag-0.5.1-r1 b/dev-embedded/jtag-0.5.1-r1
new file mode 100644
index 000000000000..2cd61659bfad
--- /dev/null
+++ b/dev-embedded/jtag-0.5.1-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=prepare
+DEPEND=dev-embedded/include
+DESCRIPTION=Tool for working with JTAG-aware devices and boards through JTAG adapter
+EAPI=4
+HOMEPAGE=http://openwince.sourceforge.net/jtag/
+KEYWORDS=x86 sparc ~ppc
+LICENSE=GPL-2
+RDEPEND=dev-embedded/include !dev-embedded/urjtag
+SLOT=0
+SRC_URI=mirror://sourceforge/openwince/jtag-0.5.1.tar.bz2
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=f4cff1d47b6c59fddbed3a28a3c6eba0
diff --git a/dev-embedded/jtag/Manifest b/dev-embedded/jtag/Manifest
deleted file mode 100644
index f6a90cf45851..000000000000
--- a/dev-embedded/jtag/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX jtag-0.5.1-no-erase-overshoot.diff 1132 BLAKE2B 57c61be2101eec9ff2e67fb0155637fc62a83f631b9daf569ea0b4c094fa7e0fd1c5a38abda50742c335603a75a87eb82ceb805c5b9abeb707c2bf7428638a98 SHA512 f687df422df837f484f31ddd85c43969ae68c274e87db2ad3184f81aaf53c4ae4c1826f6fe83cc2cd657385270106e432288262d50454cb4fbe68db1dae3cee2
-DIST jtag-0.5.1.tar.bz2 314857 BLAKE2B 233daafbe7dbfd5948d0877fce6797f2e14c24edd363c42fe5f2bcba7133f12f9d83d82b27a2067b3deaf0f46e26bb7deb32e179709551468bcbe84810625151 SHA512 f8c6000595929f9b3e20dd08a7c665b3c960dfa8b1c4d7f1c591692621ffaffceb5e844b3eb75a60dcfa870a38411604fe07564dc2ec48d6a5df0dbba6e960b6
-EBUILD jtag-0.5.1-r1.ebuild 528 BLAKE2B 01609a113676a82bb14532e49417535d5786978ae4a03269d2850910e4293668708ad4a316bd1e5af7b294731f9f36eaf60821e15b2bdf6c19f188f16f6f988e SHA512 52aeca49fddff6de0733189b61e4434708cc18fbf3835cb9f08e1c4d373d784bb8a189846755f89ec8185afd35a7e0a4424a1af90b04858eb77a33e90ab7e41c
-MISC metadata.xml 330 BLAKE2B ebbc7d714b79e3ac894b34044d3ddaa7e224963547a76443734cf63dbc479c82c261c6bcafcd81a55a464cfb4362186de6b368d75006181b60af97745fed4dcd SHA512 778e63c367986779da9a1fce3c07983721e8c3cc961ef6bbfdd717b61487ab8d7e4e135a8b58103c1b5f5b3b10f9b506bf8b45e0b9504da29714fe6601f7a65b
diff --git a/dev-embedded/jtag/files/jtag-0.5.1-no-erase-overshoot.diff b/dev-embedded/jtag/files/jtag-0.5.1-no-erase-overshoot.diff
deleted file mode 100644
index a79450d2bf58..000000000000
--- a/dev-embedded/jtag/files/jtag-0.5.1-no-erase-overshoot.diff
+++ /dev/null
@@ -1,34 +0,0 @@
-*** jtag-0.5.1/src/flash.c.orig	Wed Jun 23 14:02:44 2004
---- jtag-0.5.1/src/flash.c	Wed Jun 23 14:03:39 2004
-***************
-*** 293,306 ****
-  		int bc = 0, bn = 0;
-  		int block_no = find_block( cfi, adr );
-  
-! 		if (!erased[block_no]) {
-  			flash_driver->unlock_block( cfi_array, adr );
-  			printf( _("\nblock %d unlocked\n"), block_no );
-  			printf( _("erasing block %d: %d\n"), block_no, flash_driver->erase_block( cfi_array, adr ) );
-  			erased[block_no] = 1;
-  		}
-  
-- 		bn = fread( b, 1, BSIZE, f );
-  		for (bc = 0; bc < bn; bc += flash_driver->bus_width) {
-  			int j;
-  			printf( _("addr: 0x%08X"), adr );
---- 293,307 ----
-  		int bc = 0, bn = 0;
-  		int block_no = find_block( cfi, adr );
-  
-! 		bn = fread( b, 1, BSIZE, f );
-! 
-! 		if (bn && !erased[block_no]) {
-  			flash_driver->unlock_block( cfi_array, adr );
-  			printf( _("\nblock %d unlocked\n"), block_no );
-  			printf( _("erasing block %d: %d\n"), block_no, flash_driver->erase_block( cfi_array, adr ) );
-  			erased[block_no] = 1;
-  		}
-  
-  		for (bc = 0; bc < bn; bc += flash_driver->bus_width) {
-  			int j;
-  			printf( _("addr: 0x%08X"), adr );
diff --git a/dev-embedded/jtag/jtag-0.5.1-r1.ebuild b/dev-embedded/jtag/jtag-0.5.1-r1.ebuild
deleted file mode 100644
index d6ffcb47a471..000000000000
--- a/dev-embedded/jtag/jtag-0.5.1-r1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit eutils
-
-DESCRIPTION="Tool for working with JTAG-aware devices and boards through JTAG adapter"
-HOMEPAGE="http://openwince.sourceforge.net/jtag/"
-SRC_URI="mirror://sourceforge/openwince/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 sparc ~ppc"
-IUSE=""
-
-DEPEND="dev-embedded/include"
-RDEPEND="${DEPEND}
-	!dev-embedded/urjtag"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-no-erase-overshoot.diff
-}
diff --git a/dev-embedded/jtag/metadata.xml b/dev-embedded/jtag/metadata.xml
deleted file mode 100644
index 57324191fdc5..000000000000
--- a/dev-embedded/jtag/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>embedded@gentoo.org</email>
-		<name>Embedded Gentoo</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">openwince</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-embedded/kobs-ng-3.0.35.4.1.0 b/dev-embedded/kobs-ng-3.0.35.4.1.0
new file mode 100644
index 000000000000..689b30f5800d
--- /dev/null
+++ b/dev-embedded/kobs-ng-3.0.35.4.1.0
@@ -0,0 +1,10 @@
+DEFINED_PHASES=prepare
+DESCRIPTION=utility to write u-boot images to NAND on Freescale iMX devices
+EAPI=4
+HOMEPAGE=http://www.freescale.com/webapp/sps/site/prod_summary.jsp?code=IMX6_SW
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=http://storage.googleapis.com/chromeos-localmirror/distfiles/kobs-ng-3.0.35-4.1.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=21db0af39567c88960f19d1aa0a62d50
diff --git a/dev-embedded/kobs-ng/Manifest b/dev-embedded/kobs-ng/Manifest
deleted file mode 100644
index c3e24a8b0538..000000000000
--- a/dev-embedded/kobs-ng/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX kobs-ng-fix-array-violation.patch 338 BLAKE2B f8eeb81566e16d67b9d8d2df4c40a950cfbd0c8d29dd754f5ebffc68889366a142c84078428172693e096904fb913305dc6dbdb020ed22028e57ff5bc8f64e35 SHA512 311fac99b85264a25dc3984096e7467894a286be2ff6ee1fb8a11681ba5833e61b5938ef01312a35bb3a4e7cf90c0fbec163a54e9cc6c844e49da3bb856d2937
-AUX kobs-ng-fix-mtd-defines.patch 2170 BLAKE2B 97a067399e534d7c1d468aa1657e3a6212f37f99a470a9f789752388b7d1fb428c3704dc045e2f41fca4b489ba2db0f46768e0befb2bed150162af67105d58d8 SHA512 5d192d1b6f36ccd1500f33c8a89bbd8bdd7b8f489fe04be56142101b93dd1f7c5b00ca5dffb681aeec15ed58927530dcd487e80b9a02e4af1c3ff46b732d6697
-AUX kobs-ng-fix-open-without-mode.patch 390 BLAKE2B bacf3a3a0c40ff0663f398eeb75648db3ed6cdda8b18accfbd7fa9192446bc2f66c6c81f0e46fda205312e5fde7eb393de13a53e4841e5a618997a652fa3f0c4 SHA512 6574ab1e96833a8fa90fcaa81d71258b28069177fd66d69d0b5b4f7c4988faceac86c6655dfccea192c930bc0c08adb01ff33c68e48447f53bb482ea40dd708b
-DIST kobs-ng-3.0.35-4.1.0.tar.gz 145817 BLAKE2B eed8a20be261c5ee03f0cff0d0381079353a7f0887202201eabe1377bc14387b7e5b2240bdf4e5d908aaa38dd58ec3299e8a1ea264122970a872cc29aadaf23b SHA512 b2bb27202ecbf31bebec8eadcf04362178ec74337400416259237880b94ac2e5fcffae59b48857e9fcfa1b1aae584b181901d4dafea63eb1e0972ed3bc3b9e6e
-EBUILD kobs-ng-3.0.35.4.1.0.ebuild 763 BLAKE2B 5eb5e2d5f24191157c89fc5d06751b6e3d15740de24e6c42d485a608010005092536328a69e3afec3088f411fd832941991ec9da2be13fb0d4001cb0482ceb63 SHA512 16ccc0739c6145526374e0adc2121c57a2968b9b8bf9c2c0c846ba5b44587d0fc3f764903a99d5e5da1c8097950f40521c4eafb741a89c9dee46190ee5bc4437
-MISC metadata.xml 247 BLAKE2B e46b8f2d053251af5cb591bb2ee5e35089c4e8174ee2e7a3c504db23f844b65083d4a3e5198da3977ad3e98b67cab2e0de686a3c62009b487c1e64785a8ff65d SHA512 15df289e0f962f564551f61ada3cfef0311f6af639887def780bf5ad3be105515c8d24c950ff340ed35d89b9cd994af3540322b684c5dec3b43ec6bb0041aa4e
diff --git a/dev-embedded/kobs-ng/files/kobs-ng-fix-array-violation.patch b/dev-embedded/kobs-ng/files/kobs-ng-fix-array-violation.patch
deleted file mode 100644
index 28b1ef97c7f0..000000000000
--- a/dev-embedded/kobs-ng/files/kobs-ng-fix-array-violation.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-the part array is declared as part[2], so trying to index [2] isn't going to work
-
---- a/src/mtd.c
-+++ b/src/mtd.c
-@@ -786,7 +786,7 @@
- 		mp->ecc = 1;
- 	}
- 
--	if (md->part[1].fd >= 0 && md->part[2].fd >=0)
-+	if (md->part[1].fd >= 0)
- 		md->flags |= F_MULTICHIP;
- 
- 	/* if a second partition has been opened, verify that are compatible */
diff --git a/dev-embedded/kobs-ng/files/kobs-ng-fix-mtd-defines.patch b/dev-embedded/kobs-ng/files/kobs-ng-fix-mtd-defines.patch
deleted file mode 100644
index b7dfbe3e2e39..000000000000
--- a/dev-embedded/kobs-ng/files/kobs-ng-fix-mtd-defines.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-# Source: http://git.buildroot.net/buildroot/plain/package/kobs-ng/kobs-ng-fix-mtd-defines.patch?id=b6fb2f5018fe0ae9bba275991efc502236422924
-
-Newer kernel headers renamed mtd mode defines and no longer support
-MEMSETOOBSEL. Allow code to work with both older and newer kernel
-versions.
-
-Signed-off-by: Paul B. Henson <henson@acm.org>
-
-diff -u -r kobs-ng-3.0.35-4.0.0-orig/src/mtd.c kobs-ng-3.0.35-4.0.0/src/mtd.c
---- kobs-ng-3.0.35-4.0.0-orig/src/mtd.c	2012-12-17 22:37:40.000000000 -0800
-+++ kobs-ng-3.0.35-4.0.0/src/mtd.c	2013-07-28 19:39:59.000000000 -0700
-@@ -852,8 +852,11 @@
- 		mp = &md->part[i];
- 
- 		if (mp->fd != -1) {
-+/* Newer kernels dropped MEMSETOOBSEL */
-+#ifdef MEMSETOOBSEL
- 			(void)ioctl(mp->fd, MEMSETOOBSEL,
- 					&mp->old_oobinfo);
-+#endif
- 			close(mp->fd);
- 		}
- 
-@@ -896,6 +899,8 @@
- 				continue;
- 			}
- 
-+/* Newer kernels dropped MEMSETOOBSEL */
-+#ifdef MEMSETOOBSEL
- 			if (r == -ENOTTY) {
- 				r = ioctl(mp->fd, MEMSETOOBSEL, &mp->old_oobinfo);
- 				if (r != 0) {
-@@ -904,6 +909,7 @@
- 				}
- 				mp->oobinfochanged = 0;
- 			}
-+#endif
- 		} else {
- 			r = ioctl(mp->fd, MTDFILEMODE, (void *)MTD_MODE_RAW);
- 			if (r != 0 && r != -ENOTTY) {
-@@ -911,6 +917,8 @@
- 				continue;
- 			}
- 
-+/* Newer kernels dropped MEMSETOOBSEL */
-+#ifdef MEMSETOOBSEL
- 			if (r == -ENOTTY) {
- 				r = ioctl(mp->fd, MEMSETOOBSEL, &none_oobinfo);
- 				if (r != 0) {
-@@ -920,6 +928,7 @@
- 				mp->oobinfochanged = 1;
- 			} else
- 				mp->oobinfochanged = 2;
-+#endif
- 		}
- 
- 		mp->ecc = ecc;
-diff -u -r kobs-ng-3.0.35-4.0.0-orig/src/mtd.h kobs-ng-3.0.35-4.0.0/src/mtd.h
---- kobs-ng-3.0.35-4.0.0-orig/src/mtd.h	2012-12-17 22:37:40.000000000 -0800
-+++ kobs-ng-3.0.35-4.0.0/src/mtd.h	2013-07-28 19:33:57.000000000 -0700
-@@ -31,6 +31,14 @@
- #include "BootControlBlocks.h"
- #include "rom_nand_hamming_code_ecc.h"
- 
-+// Newer kernel headers renamed define
-+#ifndef MTD_MODE_NORMAL
-+#define MTD_MODE_NORMAL MTD_FILE_MODE_NORMAL
-+#endif
-+#ifndef MTD_MODE_RAW
-+#define MTD_MODE_RAW MTD_FILE_MODE_RAW
-+#endif
-+
- //------------------------------------------------------------------------------
- // Re-definitions of true and false, because the standard ones aren't good
- // enough?
diff --git a/dev-embedded/kobs-ng/files/kobs-ng-fix-open-without-mode.patch b/dev-embedded/kobs-ng/files/kobs-ng-fix-open-without-mode.patch
deleted file mode 100644
index 47fd33170b2e..000000000000
--- a/dev-embedded/kobs-ng/files/kobs-ng-fix-open-without-mode.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-add missing mode to open() when using O_CREAT
-
---- kobs-ng-3.0.35-4.1.0/src/main.c
-+++ kobs-ng-3.0.35-4.1.0/src/main.c
-@@ -563,7 +563,7 @@
- 	int sz = getpagesize();
- 
- 	from = open(file_name, O_RDONLY);
--	to = open(tmp_file, O_CREAT | O_RDWR);
-+	to = open(tmp_file, O_CREAT | O_RDWR, 0644);
- 	if (from < 0 || to < 0) {
- 		fprintf(stderr, "unable to create a temporary file\n");
- 		exit(5);
diff --git a/dev-embedded/kobs-ng/kobs-ng-3.0.35.4.1.0.ebuild b/dev-embedded/kobs-ng/kobs-ng-3.0.35.4.1.0.ebuild
deleted file mode 100644
index fa662e6a10ef..000000000000
--- a/dev-embedded/kobs-ng/kobs-ng-3.0.35.4.1.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit eutils versionator
-
-MY_PV="$(get_version_component_range 1-3)-$(get_version_component_range 4-)"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="utility to write u-boot images to NAND on Freescale iMX devices"
-HOMEPAGE="http://www.freescale.com/webapp/sps/site/prod_summary.jsp?code=IMX6_SW"
-SRC_URI="http://storage.googleapis.com/chromeos-localmirror/distfiles/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/kobs-ng-fix-mtd-defines.patch
-	epatch "${FILESDIR}"/kobs-ng-fix-open-without-mode.patch
-	epatch "${FILESDIR}"/kobs-ng-fix-array-violation.patch
-}
diff --git a/dev-embedded/kobs-ng/metadata.xml b/dev-embedded/kobs-ng/metadata.xml
deleted file mode 100644
index 71b1461e1146..000000000000
--- a/dev-embedded/kobs-ng/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>embedded@gentoo.org</email>
-	<name>Embedded Gentoo</name>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-embedded/libdisasm-0.23 b/dev-embedded/libdisasm-0.23
new file mode 100644
index 000000000000..c9f8eaa08182
--- /dev/null
+++ b/dev-embedded/libdisasm-0.23
@@ -0,0 +1,9 @@
+DEFINED_PHASES=-
+DESCRIPTION=Provides basic disassembly of Intel x86 instructions from a binary stream
+EAPI=4
+HOMEPAGE=http://bastard.sourceforge.net/libdisasm.html
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=Clarified-Artistic
+SLOT=0
+SRC_URI=mirror://sourceforge/project/bastard/libdisasm/0.23/libdisasm-0.23.tar.gz
+_md5_=e94144f038e213b4822b569258fe2194
diff --git a/dev-embedded/libdisasm/Manifest b/dev-embedded/libdisasm/Manifest
deleted file mode 100644
index 93b01d776e5f..000000000000
--- a/dev-embedded/libdisasm/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST libdisasm-0.23.tar.gz 454721 BLAKE2B d695b9e102e361c0f005fa8f04163d54fbdcc5254f6e203eee967c58733a2bfdb4ffd9ebfedac3d6e2f06364df03a5c961514f3db6897707402e342c4777e806 SHA512 29eecfbfd8168188242278a1a38f0c90770d0581a52d4600ae6343829dd0d6607b98329f12a3d7409d43dd56dca6a7d1eb25d58a001c2bfd3eb8474c0e7879e7
-EBUILD libdisasm-0.23.ebuild 405 BLAKE2B b2182f5f014f02db429154ba20f8bab43aa262bbb31ed69ad15cee0b1c3c19f20f39987293d9b50db15a4760e21dce4102c2e469c0230a16694d4e27e59c1091 SHA512 7c0283fce40e2aa3e6dd3196481485910f043dc472af3da8ba39168105c64b79550d3f079cb799c1e4d13d846549556179ef20749c9a92addb953fd03e891834
-MISC metadata.xml 439 BLAKE2B 23f28164f9b5c939fe6fd31f308dee986a5a79f9f27872c69db09030ffce3e04d1c6862e89aa6bd26e07aa681a34385d520206abd039833a7af3a85e03519c07 SHA512 094f93ea42fec578e8db449da82266f783d68770a2bf8b23dde04f58b1de6dd6e1cc36f5e5c8edfe2c0408e122e20b00027b345adb9920a3ef87e987c9fd4d30
diff --git a/dev-embedded/libdisasm/libdisasm-0.23.ebuild b/dev-embedded/libdisasm/libdisasm-0.23.ebuild
deleted file mode 100644
index 311207917f62..000000000000
--- a/dev-embedded/libdisasm/libdisasm-0.23.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-DESCRIPTION="Provides basic disassembly of Intel x86 instructions from a binary stream"
-HOMEPAGE="http://bastard.sourceforge.net/libdisasm.html"
-SRC_URI="mirror://sourceforge/project/bastard/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="Clarified-Artistic"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE=""
diff --git a/dev-embedded/libdisasm/metadata.xml b/dev-embedded/libdisasm/metadata.xml
deleted file mode 100644
index 19ada69e3ac1..000000000000
--- a/dev-embedded/libdisasm/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>hwoarang@gentoo.org</email>
-		<name>Markos Chandras</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>embedded@gentoo.org</email>
-		<name>Embedded Gentoo</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">bastard</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-embedded/libftd2xx-0.4.16-r1 b/dev-embedded/libftd2xx-0.4.16-r1
new file mode 100644
index 000000000000..19f16c0b2af0
--- /dev/null
+++ b/dev-embedded/libftd2xx-0.4.16-r1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install
+DESCRIPTION=Library that allows a direct access to a USB device
+EAPI=5
+HOMEPAGE=http://www.ftdichip.com/Drivers/D2XX.htm
+IUSE=examples
+KEYWORDS=~amd64 ~x86
+LICENSE=FTDI LGPL-2.1+
+SLOT=0
+SRC_URI=amd64? ( http://www.ftdichip.com/Drivers/D2XX/Linux/libftd2xx0.4.16_x86_64.tar.gz ) x86? ( http://www.ftdichip.com/Drivers/D2XX/Linux/libftd2xx0.4.16.tar.gz )
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=ee73e2bf4bf02b08f54457734adc6ab4
diff --git a/dev-embedded/libftd2xx-1.1.12-r1 b/dev-embedded/libftd2xx-1.1.12-r1
new file mode 100644
index 000000000000..22cc346fb65e
--- /dev/null
+++ b/dev-embedded/libftd2xx-1.1.12-r1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install
+DESCRIPTION=Library that allows a direct access to a USB device
+EAPI=5
+HOMEPAGE=http://www.ftdichip.com/Drivers/D2XX.htm
+IUSE=examples
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=FTDI LGPL-2.1+
+SLOT=0
+SRC_URI=http://www.ftdichip.com/Drivers/D2XX/Linux/libftd2xx1.1.12.tar.gz
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=296c7b1f2df982598b578fe67687c24b
diff --git a/dev-embedded/libftd2xx/Manifest b/dev-embedded/libftd2xx/Manifest
deleted file mode 100644
index cae7566628c8..000000000000
--- a/dev-embedded/libftd2xx/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-DIST libftd2xx0.4.16.tar.gz 2124501 BLAKE2B 700308bff3c8091a38ba32344943d13603b043d2e680b2511c78f944a0a7dd1779a8f46aed28872798cb73aba225bfcb382f209bc3263ac1a301f9e49100d5fe SHA512 3a945bd31750dafd08cb86e875263e4fdb7a641676e91caf12420769ff12b505e34ec3a88d80dd43590d039c2ace280f166d1ebda2dcc399fb696d9f6c298f20
-DIST libftd2xx0.4.16_x86_64.tar.gz 2099109 BLAKE2B 526d3b058fa789b913c15e067faec7767fc4a071a463f6ec9929717d811775dd5323a43e397b568ef753a655bc3d35d2f0f02add989d51da5d5d498fc476c566 SHA512 e11ffa917560b6fb974092bcd89ef95f21651a3ce84d0bc7cc7647c4fe031368209db3b4ab52f8d6240ee89c2e6335e89135d4f358c4271284f8a830655608a9
-DIST libftd2xx1.1.12.tar.gz 950540 BLAKE2B 6d55e8ff9b17a6b0220f5f4f3022c3495262b0ac47687ad9f28023c9f7b822f3956f2e42787edbdafe44ceea9b65b5ae687e2acb840f3e5546e5b2ac8a7ccec8 SHA512 afe0a8a7ccc47eb8888346dabdbfb41e182f7dadee7a57a1c4ffce544aebe5cab45c3e64de4ebeebdc0f31961617a79cbcf11dadfebde65ee79ca38e6234995a
-EBUILD libftd2xx-0.4.16-r1.ebuild 1207 BLAKE2B 2d934fe600dd9340eb9e013281a54bca7703f7145f414809174c5c14918a4908b11d47ff37e54362106ff32770b3a516d35e3c01cf9963660b7c05d95d6259c2 SHA512 bbe02a433d2e21a025137fa6bf35bb53c0c255078620c14e8bdd973ca29730f56ac4ac2d0ee3240f2587f7b497398b578cc83ccabec5b245f19869bca4f3a2f8
-EBUILD libftd2xx-1.1.12-r1.ebuild 1055 BLAKE2B 89740f43be1692559b24924b0012765fc564b714eb5a0d656cd1f56191d442b5dd3fb61235799d2655d102882bba77e1c969abd5ced2b333b3362e620b3f6dc6 SHA512 81422f5732455b1bac7803707904fbb72297c7756d488af0f0ec20ca807065e8a8565ad02bbcfcdb8c714b2ca5e465b35ac35f4eeaeb90151b156cc406489b49
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-embedded/libftd2xx/libftd2xx-0.4.16-r1.ebuild b/dev-embedded/libftd2xx/libftd2xx-0.4.16-r1.ebuild
deleted file mode 100644
index cb661db60ed4..000000000000
--- a/dev-embedded/libftd2xx/libftd2xx-0.4.16-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit multilib
-
-MY_P="${PN}${PV}"
-
-DESCRIPTION="Library that allows a direct access to a USB device"
-HOMEPAGE="http://www.ftdichip.com/Drivers/D2XX.htm"
-SRC_URI="amd64? ( http://www.ftdichip.com/Drivers/D2XX/Linux/${MY_P}_x86_64.tar.gz )
-	x86? ( http://www.ftdichip.com/Drivers/D2XX/Linux/${MY_P}.tar.gz )"
-
-LICENSE="FTDI LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples"
-
-QA_PREBUILT="*"
-
-S=${WORKDIR}
-
-src_install() {
-	use x86 && cd ${MY_P}
-	use amd64 && cd ${MY_P}_x86_64
-
-	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 ftd2xx.h WinTypes.h
-
-	dodir /etc/env.d
-	echo "LDPATH=\"/opt/$(get_libdir)\"" > ${D}/etc/env.d/50libftd2xx || die
-	if use examples ; then
-		find sample lib_table '(' -name '*.so' -o -name '*.[oa]' ')' -exec rm -f {} +
-		insinto /usr/share/doc/${PF}
-		doins -r sample
-		insinto /usr/share/doc/${PF}/sample
-		doins -r lib_table
-	fi
-
-	dodoc Config.txt
-	use x86 && dodoc faq.txt readme.dat
-	use amd64 && dodoc FAQ.txt README.dat
-}
diff --git a/dev-embedded/libftd2xx/libftd2xx-1.1.12-r1.ebuild b/dev-embedded/libftd2xx/libftd2xx-1.1.12-r1.ebuild
deleted file mode 100644
index 906b66ad597c..000000000000
--- a/dev-embedded/libftd2xx/libftd2xx-1.1.12-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit multilib
-
-MY_P="${PN}${PV}"
-
-DESCRIPTION="Library that allows a direct access to a USB device"
-HOMEPAGE="http://www.ftdichip.com/Drivers/D2XX.htm"
-SRC_URI="http://www.ftdichip.com/Drivers/D2XX/Linux/${MY_P}.tar.gz"
-
-LICENSE="FTDI LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="examples"
-
-QA_PREBUILT="*"
-
-S=${WORKDIR}
-
-src_install() {
-
-	use arm && cd "${S}"/release/build/arm926
-	use amd64 && cd "${S}"/release/build/x86_64
-	use x86 && cd "${S}"/release/build/i386
-
-	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)\"" > ${D}/etc/env.d/50libftd2xx || die
-	if use examples ; then
-		insinto /usr/share/doc/${PF}/sample
-		doins -r "${S}"/release/examples
-	fi
-
-	dodoc "${S}"/release/ReadMe.txt
-}
diff --git a/dev-embedded/libftd2xx/metadata.xml b/dev-embedded/libftd2xx/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/dev-embedded/libftd2xx/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/dev-embedded/libftdi-0.19 b/dev-embedded/libftdi-0.19
new file mode 100644
index 000000000000..7eda9b71e758
--- /dev/null
+++ b/dev-embedded/libftdi-0.19
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=virtual/libusb:0 cxx? ( dev-libs/boost ) python? ( dev-lang/python ) python? ( dev-lang/swig ) doc? ( app-doc/doxygen )
+DESCRIPTION=Userspace access to FTDI USB interface chips
+EAPI=2
+HOMEPAGE=http://www.intra2net.com/en/developer/libftdi/
+IUSE=cxx doc examples python static-libs
+KEYWORDS=amd64 arm ppc ppc64 sparc x86
+LICENSE=LGPL-2
+RDEPEND=virtual/libusb:0 cxx? ( dev-libs/boost ) python? ( dev-lang/python )
+SLOT=0
+SRC_URI=http://www.intra2net.com/en/developer/libftdi/download/libftdi-0.19.tar.gz
+_md5_=58f148a45f3dfb08235cdb9dde6e34b1
diff --git a/dev-embedded/libftdi-0.20-r1 b/dev-embedded/libftdi-0.20-r1
new file mode 100644
index 000000000000..74a537d0a9b2
--- /dev/null
+++ b/dev-embedded/libftdi-0.20-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=virtual/libusb:0 cxx? ( dev-libs/boost ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) python? ( dev-lang/swig ) doc? ( app-doc/doxygen ) sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=Userspace access to FTDI USB interface chips
+EAPI=6
+HOMEPAGE=http://www.intra2net.com/en/developer/libftdi/
+IUSE=cxx doc examples python python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
+KEYWORDS=amd64 arm ~arm64 ~ppc ppc64 ~sparc x86
+LICENSE=LGPL-2
+RDEPEND=virtual/libusb:0 cxx? ( dev-libs/boost ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
+SLOT=0
+SRC_URI=http://www.intra2net.com/en/developer/libftdi/download/libftdi-0.20.tar.gz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=fbda40685dffa1775808216cb93fe96f
diff --git a/dev-embedded/libftdi-1.2-r1 b/dev-embedded/libftdi-1.2-r1
new file mode 100644
index 000000000000..09fe98e007ed
--- /dev/null
+++ b/dev-embedded/libftdi-1.2-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=virtual/libusb:1 cxx? ( dev-libs/boost ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) tools? ( !<dev-embedded/ftdi_eeprom-1.0 dev-libs/confuse ) python? ( dev-lang/swig ) doc? ( app-doc/doxygen ) sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=Userspace access to FTDI USB interface chips
+EAPI=6
+HOMEPAGE=http://www.intra2net.com/en/developer/libftdi/
+IUSE=cxx doc examples python static-libs test tools python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
+KEYWORDS=amd64 arm arm64 ~mips ppc ppc64 sparc x86
+LICENSE=LGPL-2
+RDEPEND=virtual/libusb:1 cxx? ( dev-libs/boost ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) tools? ( !<dev-embedded/ftdi_eeprom-1.0 dev-libs/confuse )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
+SLOT=1
+SRC_URI=http://www.intra2net.com/en/developer/libftdi/download/libftdi1-1.2.tar.bz2
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=04fa923bd2a0a86cd05562bcafad6561
diff --git a/dev-embedded/libftdi-1.2-r2 b/dev-embedded/libftdi-1.2-r2
new file mode 100644
index 000000000000..163613c61d57
--- /dev/null
+++ b/dev-embedded/libftdi-1.2-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=virtual/libusb:1 cxx? ( dev-libs/boost ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) tools? ( !<dev-embedded/ftdi_eeprom-1.0 dev-libs/confuse:= ) python? ( dev-lang/swig ) doc? ( app-doc/doxygen ) sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=Userspace access to FTDI USB interface chips
+EAPI=6
+HOMEPAGE=http://www.intra2net.com/en/developer/libftdi/
+IUSE=cxx doc examples python static-libs test tools python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
+KEYWORDS=~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86
+LICENSE=LGPL-2
+RDEPEND=virtual/libusb:1 cxx? ( dev-libs/boost ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) tools? ( !<dev-embedded/ftdi_eeprom-1.0 dev-libs/confuse:= )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
+SLOT=1
+SRC_URI=http://www.intra2net.com/en/developer/libftdi/download/libftdi1-1.2.tar.bz2
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=89093bc8f7abd5f2456a059e8acf552b
diff --git a/dev-embedded/libftdi-9999 b/dev-embedded/libftdi-9999
new file mode 100644
index 000000000000..cf9c7ad65c58
--- /dev/null
+++ b/dev-embedded/libftdi-9999
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=virtual/libusb:1 cxx? ( dev-libs/boost ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) tools? ( !<dev-embedded/ftdi_eeprom-1.0 dev-libs/confuse:= ) python? ( dev-lang/swig ) doc? ( app-doc/doxygen ) sys-devel/make >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
+DESCRIPTION=Userspace access to FTDI USB interface chips
+EAPI=6
+HOMEPAGE=http://www.intra2net.com/en/developer/libftdi/
+IUSE=cxx doc examples python static-libs test tools python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
+LICENSE=LGPL-2
+RDEPEND=virtual/libusb:1 cxx? ( dev-libs/boost ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) tools? ( !<dev-embedded/ftdi_eeprom-1.0 dev-libs/confuse:= )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
+SLOT=1
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	8f6de46b0aa318aea0e8cac62ece098b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=89093bc8f7abd5f2456a059e8acf552b
diff --git a/dev-embedded/libftdi/Manifest b/dev-embedded/libftdi/Manifest
deleted file mode 100644
index 6a1af9429186..000000000000
--- a/dev-embedded/libftdi/Manifest
+++ /dev/null
@@ -1,11 +0,0 @@
-AUX libftdi-0.20-cmake-include.patch 687 BLAKE2B 8817db6e200adcb3d76da91565fe25f694445a46325a6435d6d0545d6741b0d15b199f96aabf01ca664eeb3355008acc6ec309f5fa87f975584935ecd74558f7 SHA512 b7b2d3a8cd84f3bbc86aa43bc9d090359375c6ea6b52a32107cd46751d386768b3d196c0bca7235453c596ef19c5ee4e1a39739db90e3e0c06adc62609e7fb90
-AUX libftdi-0.20-cmake-version.patch 1010 BLAKE2B cd88bc50cebb22a5e982d8f7985014549bdae23e35fefb0d2f6cf14c4610d79ebfbbb11e94174b6c1ff260d83713c4c4db395c725bbe836142e0e80092324a3f SHA512 9ea6d07324c6cb89856f8a9411b0564fb344f2624162f5435b9cbaeddb97361d79dd9b71d0c64988106ec162cd5a93b43f2c5257f0f0207ce8151de37712cd91
-DIST libftdi-0.19.tar.gz 406671 BLAKE2B 47979967d8597584e46a5d9297ed24454d0583869110b52af7662a04a4b037ea57ec6ba133a61d355f0ccf1366b14195a8ccb13d7bb585264cdd1d528f2cf2d9 SHA512 c6deefe8c83063343321e8c2c6b6c1c2842a9f1caf4e54f47106c3c4aac638736f19fecf91582c6cc9f4917c4d140157440c360ce3a030dfb7fa027483bab972
-DIST libftdi-0.20.tar.gz 423570 BLAKE2B f0aa420a704e18c4257b99a4593dbaf46a15806d980b24909fe8678b36e74b568cd5915db1e14f8b904541334fbf3d18f069dc479a0bf66b2ea8e113611cb82b SHA512 540e5eb201a65936c3dbabff70c251deba1615874b11ff27c5ca16c39d71c150cf61758a68b541135a444fe32ab403b0fba0daf55c587647aaf9b3f400f1dee7
-DIST libftdi1-1.2.tar.bz2 100672 BLAKE2B 314ee2695324bc3f6adad56d7ff8fddabfb86714a689ee309afc6aa8498a19fc55d2ea8f4edf0c378d944494505def3faabf1d9c3bb98e6c228526c392d26f09 SHA512 d175e2b39dda880653a2e46db67e49a8921095e69eff6598159c3c31292d4ce76617c2f1617fd6727b08c930fcea335d8ef01857debbb60e7ac384b516d38a05
-EBUILD libftdi-0.19.ebuild 1235 BLAKE2B 2c76a4080ad380355b24c9f2fe1c40ece41e80f8fad57c5c93233c9c13feabe1370263bda92f1ab55124bf0881b4bdb85bc5dcf20d8f52abb8c8b854fbd17e96 SHA512 35b81492bacdcf1ddf9fd8d2aea8e9149a83264d9da2cd524e7ff90497fbfd5132e17c47a5105ca73c26dc7f5826d4b4d81413d65169194bea6d1a1ac38791f4
-EBUILD libftdi-0.20-r1.ebuild 1830 BLAKE2B e3e79613a23477c755ca45b3a6ba557bbdc47567636b37a5637de5cb680288d96322ebc93bf8e4ce785307d87aa5149b057543ac11c70424d9550334497d22d2 SHA512 8ad1551b909d7398f03a91644d5c39bd24b16902e4713c11b88b17b1cc7445d2a86a026f132ce27ef781f1104b436135398858ac0871b801ad0aeb51f8e0c685
-EBUILD libftdi-1.2-r1.ebuild 1717 BLAKE2B fa33c5993b734ae0eddbd87e3bf098d392ae8e808608ba435713b94bc77323aed77a26c8eed13a4578966a3723b780633bae9c40cc1d644a2c35f683a201421c SHA512 fd235ee3c492ca0a119ff616719f29776637e09362c0c14b64be3eb8dbabd6cd763b05ffc8bdce64d736e198d78cabd905987eb72c1bc492f029aae3f6ae3eb3
-EBUILD libftdi-1.2-r2.ebuild 1726 BLAKE2B 0e6e2388f983b5fccf8a3d41623af1a70d7e0d4277a3c5faf6094a5c88577a0448e37974e47d0a6cca5bd4a72db7ac9cabc9b10544d949d2bebc4c6a00e53cba SHA512 78cfe7cefbe23f4f43cfec20fc134a80e2ebaebcde99c7e7fe2612a2da245523dd7d63630ca022027addcf3144ac3f796be7d1af621ac70789d2d8856f16ee72
-EBUILD libftdi-9999.ebuild 1726 BLAKE2B 0e6e2388f983b5fccf8a3d41623af1a70d7e0d4277a3c5faf6094a5c88577a0448e37974e47d0a6cca5bd4a72db7ac9cabc9b10544d949d2bebc4c6a00e53cba SHA512 78cfe7cefbe23f4f43cfec20fc134a80e2ebaebcde99c7e7fe2612a2da245523dd7d63630ca022027addcf3144ac3f796be7d1af621ac70789d2d8856f16ee72
-MISC metadata.xml 317 BLAKE2B 4ff2cf3b9259460d23387c23356cbf63e43d31a1b6f78704c3f918b97c1ac7e5ca87ed027d4dccd063b8b60e00b8f080e73b2f40520da0552fd7302c68b1e6d6 SHA512 21fd21d84f507274617bf8c059517c75dbad08bbbb22b4655cfb7f31c824004881c1f8fc615215af05333e97770ce925f5ac0b580283901032f6c6145ffa1aba
diff --git a/dev-embedded/libftdi/files/libftdi-0.20-cmake-include.patch b/dev-embedded/libftdi/files/libftdi-0.20-cmake-include.patch
deleted file mode 100644
index 4faf7c620393..000000000000
--- a/dev-embedded/libftdi/files/libftdi-0.20-cmake-include.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From ccbd6cf1934056386772debba8583bc9b3721072 Mon Sep 17 00:00:00 2001
-From: Uffe Jakobsen <uffe@uffe.org>
-Date: Mon, 22 Oct 2012 12:03:22 +0200
-Subject: [PATCH] Fix build on FreeBSD (cmake file typo)
-
----
- examples/CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
-index 6793d89..1263c62 100644
---- a/examples/CMakeLists.txt
-+++ b/examples/CMakeLists.txt
-@@ -2,7 +2,7 @@ option(EXAMPLES "Build example programs" ON)
- 
- if (EXAMPLES)
-     # Includes
--    include( ${CMAKE_CURRENT_SOURCE_DIR}
-+    include_directories( ${CMAKE_CURRENT_SOURCE_DIR}
-             ${CMAKE_CURRENT_BINARY_DIR}
-             )
- 
diff --git a/dev-embedded/libftdi/files/libftdi-0.20-cmake-version.patch b/dev-embedded/libftdi/files/libftdi-0.20-cmake-version.patch
deleted file mode 100644
index 1be51da7c1d7..000000000000
--- a/dev-embedded/libftdi/files/libftdi-0.20-cmake-version.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From e18b700743217e8c505e97762e0f66a4f6a90425 Mon Sep 17 00:00:00 2001
-From: Maciej Grela <maciej.grela@gmail.com>
-Date: Wed, 20 Jun 2012 23:08:50 +0200
-Subject: [PATCH] Fix libftdi.pc file generation when building with
- -DDOCUMENTATION=OFF
-
----
- CMakeLists.txt | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 4c43a48..07f8bb9 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -2,7 +2,9 @@
- project(libftdi)
- set(MAJOR_VERSION 0)
- set(MINOR_VERSION 20)
-+set(PACKAGE libftdi)
- set(VERSION_STRING ${MAJOR_VERSION}.${MINOR_VERSION})
-+set(VERSION ${VERSION_STRING})
- SET(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}")
- 
- # CMake
-@@ -116,12 +118,11 @@ add_custom_target(dist
- 
- option(DOCUMENTATION "Generate API documentation with Doxygen" ON)
- 
-+
- find_package(Doxygen)
- if(DOCUMENTATION AND DOXYGEN_FOUND)
- 
-    # Set variables
--   set(PACKAGE libftdi)
--   set(VERSION ${VERSION_STRING})
-    set(top_srcdir ${CMAKE_SOURCE_DIR})
- 
-    # Find doxy config
diff --git a/dev-embedded/libftdi/libftdi-0.19.ebuild b/dev-embedded/libftdi/libftdi-0.19.ebuild
deleted file mode 100644
index 71475c707666..000000000000
--- a/dev-embedded/libftdi/libftdi-0.19.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-if [[ ${PV} == 9999* ]] ; then
-	inherit git-r3 autotools
-	EGIT_REPO_URI="git://developer.intra2net.com/${PN}"
-else
-	SRC_URI="http://www.intra2net.com/en/developer/${PN}/download/${P}.tar.gz"
-	KEYWORDS="amd64 arm ppc ppc64 sparc x86"
-fi
-
-DESCRIPTION="Userspace access to FTDI USB interface chips"
-HOMEPAGE="http://www.intra2net.com/en/developer/libftdi/"
-
-LICENSE="LGPL-2"
-SLOT="0"
-IUSE="cxx doc examples python static-libs"
-
-RDEPEND="virtual/libusb:0
-	cxx? ( dev-libs/boost )
-	python? ( dev-lang/python )"
-DEPEND="${RDEPEND}
-	python? ( dev-lang/swig )
-	doc? ( app-doc/doxygen )"
-
-src_prepare() {
-	if [[ ${PV} == 9999* ]] ; then
-		mkdir -p m4
-		eautoreconf
-	fi
-}
-
-src_configure() {
-	econf \
-		$(use_enable cxx libftdipp) \
-		$(use_with doc docs) \
-		$(use_with examples) \
-		$(use_enable python python-binding) \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	use static-libs || find "${D}" -name '*.la' -delete
-	dodoc ChangeLog README
-
-	if use doc ; then
-		doman doc/man/man3/*
-		dohtml doc/html/*
-	fi
-	if use examples ; then
-		docinto examples
-		dodoc examples/*.c
-	fi
-}
diff --git a/dev-embedded/libftdi/libftdi-0.20-r1.ebuild b/dev-embedded/libftdi/libftdi-0.20-r1.ebuild
deleted file mode 100644
index fb38545a38c6..000000000000
--- a/dev-embedded/libftdi/libftdi-0.20-r1.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_4 python3_5 python3_6 )
-inherit cmake-utils python-single-r1
-
-if [[ ${PV} == 9999* ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="git://developer.intra2net.com/${PN}"
-else
-	SRC_URI="http://www.intra2net.com/en/developer/${PN}/download/${P}.tar.gz"
-	KEYWORDS="amd64 arm ~arm64 ~ppc ppc64 ~sparc x86"
-fi
-
-DESCRIPTION="Userspace access to FTDI USB interface chips"
-HOMEPAGE="http://www.intra2net.com/en/developer/libftdi/"
-
-LICENSE="LGPL-2"
-SLOT="0"
-IUSE="cxx doc examples python"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="virtual/libusb:0
-	cxx? ( dev-libs/boost )
-	python? ( ${PYTHON_DEPS} )"
-DEPEND="${RDEPEND}
-	python? ( dev-lang/swig )
-	doc? ( app-doc/doxygen )"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-cmake-include.patch
-	"${FILESDIR}"/${P}-cmake-version.patch
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	if use python; then
-		sed -i \
-			-e "s:[$]{PYTHON_LIB_INSTALL}/../site-packages:$(python_get_sitedir):" \
-			bindings/CMakeLists.txt || die
-	fi
-	sed -i \
-		-e '/SET(LIB_SUFFIX /d' \
-		CMakeLists.txt || die
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DFTDIPP=$(usex cxx)
-		-DDOCUMENTATION=$(usex doc)
-		-DEXAMPLES=$(usex examples)
-		-DPYTHON_BINDINGS=$(usex python)
-		-DCMAKE_SKIP_BUILD_RPATH=ON
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_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}*
-
-		doman "${CMAKE_BUILD_DIR}"/doc/man/man3/*
-		dodoc -r "${CMAKE_BUILD_DIR}"/doc/html
-	fi
-	if use examples ; then
-		docinto examples
-		dodoc examples/*.c
-	fi
-}
diff --git a/dev-embedded/libftdi/libftdi-1.2-r1.ebuild b/dev-embedded/libftdi/libftdi-1.2-r1.ebuild
deleted file mode 100644
index 9ca55beeaad6..000000000000
--- a/dev-embedded/libftdi/libftdi-1.2-r1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_4 python3_5 python3_6 )
-inherit cmake-utils 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="http://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="http://www.intra2net.com/en/developer/libftdi/"
-
-LICENSE="LGPL-2"
-SLOT="1"
-IUSE="cxx doc examples python static-libs test tools"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-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 )"
-
-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
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_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
-
-		doman "${CMAKE_BUILD_DIR}"/doc/man/man3/*
-		dodoc -r "${CMAKE_BUILD_DIR}"/doc/html
-	fi
-	if use examples ; then
-		docinto examples
-		dodoc examples/*.c
-	fi
-}
diff --git a/dev-embedded/libftdi/libftdi-1.2-r2.ebuild b/dev-embedded/libftdi/libftdi-1.2-r2.ebuild
deleted file mode 100644
index e35ae39feab1..000000000000
--- a/dev-embedded/libftdi/libftdi-1.2-r2.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_4 python3_5 python3_6 )
-inherit cmake-utils 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="http://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="http://www.intra2net.com/en/developer/libftdi/"
-
-LICENSE="LGPL-2"
-SLOT="1"
-IUSE="cxx doc examples python static-libs test tools"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-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 )"
-
-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
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_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
-
-		doman "${CMAKE_BUILD_DIR}"/doc/man/man3/*
-		dodoc -r "${CMAKE_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
deleted file mode 100644
index e35ae39feab1..000000000000
--- a/dev-embedded/libftdi/libftdi-9999.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_4 python3_5 python3_6 )
-inherit cmake-utils 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="http://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="http://www.intra2net.com/en/developer/libftdi/"
-
-LICENSE="LGPL-2"
-SLOT="1"
-IUSE="cxx doc examples python static-libs test tools"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-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 )"
-
-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
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_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
-
-		doman "${CMAKE_BUILD_DIR}"/doc/man/man3/*
-		dodoc -r "${CMAKE_BUILD_DIR}"/doc/html
-	fi
-	if use examples ; then
-		docinto examples
-		dodoc examples/*.c
-	fi
-}
diff --git a/dev-embedded/libftdi/metadata.xml b/dev-embedded/libftdi/metadata.xml
deleted file mode 100644
index 0808eea69ba5..000000000000
--- a/dev-embedded/libftdi/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>embedded@gentoo.org</email>
- <name>Embedded Gentoo</name>
-</maintainer>
-<use>
- <flag name="tools">build ftdi_eeprom helper tool</flag>
-</use>
-</pkgmetadata>
diff --git a/dev-embedded/libjaylink-0.1.0 b/dev-embedded/libjaylink-0.1.0
new file mode 100644
index 000000000000..a272041428c2
--- /dev/null
+++ b/dev-embedded/libjaylink-0.1.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=virtual/libusb:1 >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=Library to access J-Link devices
+EAPI=6
+HOMEPAGE=http://git.zapb.de/libjaylink.git
+IUSE=static-libs
+KEYWORDS=amd64 ~arm x86
+LICENSE=GPL-2
+RDEPEND=virtual/libusb:1
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~zerochaos/distfiles/libjaylink-0.1.0.tar.xz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=a0c974a3c8ce91a0fa46a1b31166e3e7
diff --git a/dev-embedded/libjaylink-9999 b/dev-embedded/libjaylink-9999
new file mode 100644
index 000000000000..eb851bf80fa3
--- /dev/null
+++ b/dev-embedded/libjaylink-9999
@@ -0,0 +1,11 @@
+DEFINED_PHASES=configure install prepare unpack
+DEPEND=virtual/libusb:1 >=dev-vcs/git-1.8.2.1[curl] >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=Library to access J-Link devices
+EAPI=5
+HOMEPAGE=http://git.zapb.de/libjaylink.git
+IUSE=static-libs
+LICENSE=GPL-2
+RDEPEND=virtual/libusb:1
+SLOT=0
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	git-r3	8f6de46b0aa318aea0e8cac62ece098b	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=0146800d6de86c602e88bf1ca779754c
diff --git a/dev-embedded/libjaylink/Manifest b/dev-embedded/libjaylink/Manifest
deleted file mode 100644
index 57d3a5deb407..000000000000
--- a/dev-embedded/libjaylink/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST libjaylink-0.1.0.tar.xz 53820 BLAKE2B 6538f738481eecb0db8bec9c652d7169f210c1e0ee5dd6e1639a26e5e9dd1da43df887e50c4bab3e56e0d9d7bb858cf6c31015afee8b194729d0140b3fd911f8 SHA512 9031da29adb703b771cb049d76bec5033b6885321d8ac411984ac800224677f9b201c92553d150450c4a6898826c06189ee4fdc1048430edaef89704e31ec21a
-EBUILD libjaylink-0.1.0.ebuild 583 BLAKE2B 629a4117a472a025aefecdbcea6d89531cc9c062a8d68e645bac432688f8c7d0b935b03f47241bb266c7246e3c341ad5b7da68230e67d3f999ee4556aac079b9 SHA512 d48cc4af2f79a16fccd134155d1d9063a2c9985acecd52378ed50f0df96f76a8e41460e069e7ce750b27883c954ff07a90ab5d1c169b0bc2af3a7a85894f3be6
-EBUILD libjaylink-9999.ebuild 546 BLAKE2B 1016cf6a4b578b6a38cb747495a4cbc0ce3ca25e5cfd2d1b8efd0cbffd5eb2f091a2ba5d1ff0ed14c556103ba6c7e748b07c2c4b7efcf5087ccf42f1dfdcefec SHA512 e97798417f70d1079cbaffbfd1164a8857ac5d7b6e97a6b9a0939c007999fb0cba394be0cab4c3d0d6c8e8cf677fca472de8729b883e6e87a08f15c38f6774c8
-MISC metadata.xml 247 BLAKE2B e46b8f2d053251af5cb591bb2ee5e35089c4e8174ee2e7a3c504db23f844b65083d4a3e5198da3977ad3e98b67cab2e0de686a3c62009b487c1e64785a8ff65d SHA512 15df289e0f962f564551f61ada3cfef0311f6af639887def780bf5ad3be105515c8d24c950ff340ed35d89b9cd994af3540322b684c5dec3b43ec6bb0041aa4e
diff --git a/dev-embedded/libjaylink/libjaylink-0.1.0.ebuild b/dev-embedded/libjaylink/libjaylink-0.1.0.ebuild
deleted file mode 100644
index 0c4c432dba6f..000000000000
--- a/dev-embedded/libjaylink/libjaylink-0.1.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit autotools eutils
-
-DESCRIPTION="Library to access J-Link devices"
-HOMEPAGE="http://git.zapb.de/libjaylink.git"
-
-SRC_URI="https://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE="static-libs"
-
-DEPEND="virtual/libusb:1"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	eapply_user
-	eautoreconf || die
-}
-
-src_configure() {
-	econf $(use_enable static-libs static)
-}
-
-src_install() {
-	default
-	prune_libtool_files
-}
diff --git a/dev-embedded/libjaylink/libjaylink-9999.ebuild b/dev-embedded/libjaylink/libjaylink-9999.ebuild
deleted file mode 100644
index 769110a222f2..000000000000
--- a/dev-embedded/libjaylink/libjaylink-9999.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-EGIT_REPO_URI="git://git.zapb.de/libjaylink.git"
-
-inherit git-r3 autotools eutils
-
-DESCRIPTION="Library to access J-Link devices"
-HOMEPAGE="http://git.zapb.de/libjaylink.git"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS=""
-IUSE="static-libs"
-
-DEPEND="virtual/libusb:1"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	eautoreconf || die
-}
-
-src_configure() {
-	econf $(use_enable static-libs static)
-}
-
-src_install() {
-	default
-	prune_libtool_files
-}
diff --git a/dev-embedded/libjaylink/metadata.xml b/dev-embedded/libjaylink/metadata.xml
deleted file mode 100644
index 71b1461e1146..000000000000
--- a/dev-embedded/libjaylink/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>embedded@gentoo.org</email>
-	<name>Embedded Gentoo</name>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-embedded/lpc21isp-1.85 b/dev-embedded/lpc21isp-1.85
new file mode 100644
index 000000000000..814c46d112a3
--- /dev/null
+++ b/dev-embedded/lpc21isp-1.85
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install
+DESCRIPTION=In-circuit programming (ISP) tool for the NXP microcontrollers
+EAPI=5
+HOMEPAGE=https://sourceforge.net/projects/lpc21isp/
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-3
+SLOT=0
+SRC_URI=mirror://sourceforge/lpc21isp/lpc21isp_185.tar.gz
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=f2595c55beea73f714dd58b694f4aca2
diff --git a/dev-embedded/lpc21isp/Manifest b/dev-embedded/lpc21isp/Manifest
deleted file mode 100644
index c98e3b840db4..000000000000
--- a/dev-embedded/lpc21isp/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST lpc21isp_185.tar.gz 54735 BLAKE2B 0ba04fca994891ccd68a2d6b6c981bb6e2cf91a70eaa2ba576eccaad328591665b53ad551d349a59c7b86e2636504c09276a16f3f5a34953d643b4f1fa4628ff SHA512 585c8f02771fc68719c8a5e6cc4253854dce4f4e0047df8a1d57db273cb51c9d4fcbe1066b079aaec54d7ca189e90710647b95fdb320729753967c265b1ac954
-EBUILD lpc21isp-1.85.ebuild 498 BLAKE2B 34c312187a2fb9394c571ab349edea83f5d43e0731ced1b56e4a993521a1f5c8aecb1c87c53a16621a7b06e8917bae3ae509b53ed3804598c9451d49771d4e71 SHA512 83254c1be307b30ae41bf91c3271e26ffa940c59d0e0866be93cd5b68fb3f26c0033b90bf4acdaac1cd5309ea838cedbc1128eeae63877388969ab670b77f62b
-MISC metadata.xml 476 BLAKE2B 50826f0a90fc63974036175b78379a9e54ccebde28fec6ef8c9daa7f15728381158119b10367fcd89caccacf928dfa8d2354996a83d879b515cb3e642a6c1f3e SHA512 b53c2f39c80e044a807e41698a62fcef581a22a9e121a2e4f703fdb836a5af044606e29c254f60b029ffa59f0208c4e46ab08c8bf7a20b76099b2d185d5515ed
diff --git a/dev-embedded/lpc21isp/lpc21isp-1.85.ebuild b/dev-embedded/lpc21isp/lpc21isp-1.85.ebuild
deleted file mode 100644
index fd08a385c1e2..000000000000
--- a/dev-embedded/lpc21isp/lpc21isp-1.85.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit versionator
-
-MY_PN="${PN}_$(delete_all_version_separators)"
-
-DESCRIPTION="In-circuit programming (ISP) tool for the NXP microcontrollers"
-HOMEPAGE="https://sourceforge.net/projects/lpc21isp/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_PN}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-S=${WORKDIR}
-
-src_install() {
-	dobin lpc21isp
-}
diff --git a/dev-embedded/lpc21isp/metadata.xml b/dev-embedded/lpc21isp/metadata.xml
deleted file mode 100644
index 084b89280b6a..000000000000
--- a/dev-embedded/lpc21isp/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>slis@gentoo.org</email>
-	</maintainer>
-	<longdescription>In-circuit programming (ISP) tool for the NXP (Philips) LPC1100 / LPC1300 / LPC1700 / LPC2000 series ARM7 / Cortex-M0 / Cortex-M3 microcontrollers</longdescription>
-	<upstream>
-		<remote-id type="sourceforge">lpc21isp</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-embedded/mcu8051ide-1.4.10 b/dev-embedded/mcu8051ide-1.4.10
new file mode 100644
index 000000000000..6fc9b13871d1
--- /dev/null
+++ b/dev-embedded/mcu8051ide-1.4.10
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-embedded/sdcc-2.5[mcs51] >=app-doc/doxygen-1.7 >=dev-util/indent-2.2 >=app-text/hunspell-1.3 >=dev-tcltk/bwidget-1.8 >dev-tcltk/itcl-3.3 >=dev-lang/tcl-8.5.9:* >=dev-tcltk/tdom-0.8 >=dev-tcltk/tcllib-1.11 >=dev-lang/tk-8.5.9:* >=dev-tcltk/tkimg-1.4 >=dev-tcltk/tclx-8.4 sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=Graphical IDE for microcontrollers based on 8051.
+EAPI=6
+HOMEPAGE=http://www.moravia-microsystems.com/mcu-8051-ide/
+KEYWORDS=~amd64
+LICENSE=GPL-2+
+RDEPEND=>=dev-embedded/sdcc-2.5[mcs51] >=app-doc/doxygen-1.7 >=dev-util/indent-2.2 >=app-text/hunspell-1.3 >=dev-tcltk/bwidget-1.8 >dev-tcltk/itcl-3.3 >=dev-lang/tcl-8.5.9:* >=dev-tcltk/tdom-0.8 >=dev-tcltk/tcllib-1.11 >=dev-lang/tk-8.5.9:* >=dev-tcltk/tkimg-1.4 >=dev-tcltk/tclx-8.4
+SLOT=0
+SRC_URI=http://www.moravia-microsystems.com/download/mcu8051ide/mcu8051ide/1.4.10/mcu8051ide-1.4.10.tar.gz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=f9288bf0f528218cc7dc097e1f8eb596
diff --git a/dev-embedded/mcu8051ide/Manifest b/dev-embedded/mcu8051ide/Manifest
deleted file mode 100644
index 431e5c661402..000000000000
--- a/dev-embedded/mcu8051ide/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST mcu8051ide-1.4.10.tar.gz 5928583 BLAKE2B 4e8e119790d8130859034f2366ac3372373805dcb173328e61a9a18513cb6b9580e8f3912592888268bfdf694e835032fca3148d9fc00a7aa061660378674f0e SHA512 686c2b7054475aa38bbbe73ef745303141f038e2d6eca86d548317c130febb6b12d7c0e0737a9b15d2c3f4890bcd0238fffae030c689f8367f3b54821ab52866
-EBUILD mcu8051ide-1.4.10.ebuild 798 BLAKE2B 190eee97b8f0ee3648fcc56a465babdf2d8ca0e8d97ff0c591ae49e218d47ff8a95880c4194f9966906000d6540470d7879979cc343c4969baa202e464ede43e SHA512 6ef6d9e5d19b8669004dfbcc27ab71dac7c5259eba73e9407cffb074e0fe49910c70e745fa0fe76b2c935e1b4bdea5f0b4b1b1869dcc9606edaffb44bdc9d240
-MISC metadata.xml 304 BLAKE2B 290590d10851919866d1b0749c4f8101e267311ed98f1787cb4464d9408d37de3231159f2b8e9552e121a044752296f4e846a76c4cc2409c7e4358bd36fe138d SHA512 df2ca0cf75c510b030480139e1bc62faecc6c9a4538207434174fd404cf59437ed8c1f67dd76f44b66443db3ea71eb1952d13a45216aff3e48a5cf3e225bbda9
diff --git a/dev-embedded/mcu8051ide/mcu8051ide-1.4.10.ebuild b/dev-embedded/mcu8051ide/mcu8051ide-1.4.10.ebuild
deleted file mode 100644
index 73b38e60146a..000000000000
--- a/dev-embedded/mcu8051ide/mcu8051ide-1.4.10.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit cmake-utils
-
-DESCRIPTION="Graphical IDE for microcontrollers based on 8051."
-HOMEPAGE="http://www.moravia-microsystems.com/mcu-8051-ide/"
-SRC_URI="http://www.moravia-microsystems.com/download/${PN}/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64"
-
-# The doxygen dependency is suspect, but it appears to be used at runtime.
-RDEPEND=">=dev-embedded/sdcc-2.5[mcs51]
-		>=app-doc/doxygen-1.7
-		>=dev-util/indent-2.2
-		>=app-text/hunspell-1.3
-		>=dev-tcltk/bwidget-1.8
-		>dev-tcltk/itcl-3.3
-		>=dev-lang/tcl-8.5.9:*
-		>=dev-tcltk/tdom-0.8
-		>=dev-tcltk/tcllib-1.11
-		>=dev-lang/tk-8.5.9:*
-		>=dev-tcltk/tkimg-1.4
-		>=dev-tcltk/tclx-8.4"
-DEPEND="${RDEPEND}"
diff --git a/dev-embedded/mcu8051ide/metadata.xml b/dev-embedded/mcu8051ide/metadata.xml
deleted file mode 100644
index a2ecec893c61..000000000000
--- a/dev-embedded/mcu8051ide/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<upstream>
-		<maintainer>
-			<!-- Valid on Gentoo Bugzilla -->
-			<email>martin.osmera@gmail.com</email>
-			<name>Martin Osmera</name>
-		</maintainer>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-embedded/metadata.xml b/dev-embedded/metadata.xml
deleted file mode 100644
index e2e461a48134..000000000000
--- a/dev-embedded/metadata.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE catmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<catmetadata>
-	<longdescription lang="en">
-		The dev-embedded category contains libraries and utilities relevant to
-		embedded programming.
-	</longdescription>
-	<longdescription lang="de">
-		Die Kategorie dev-embedded enhält Bibliotheken und Werkzeuge für die
-		Embedded-Programmierung.
-	</longdescription>
-	<longdescription lang="es">
-		La categoría dev-embedded contiene librerias y utilidades referentes a
-		embedded-programming.
-	</longdescription>
-	<longdescription lang="ja">
-		dev-embeddedカテゴリーには組み込みプログラミングに関連したライブラリーと
-		ユーティリティが含まれます。
-	</longdescription>
-	<longdescription lang="nl">
-		De dev-embedded categorie bevat bibliotheken en hulpmiddelen voor het
-		programmeren in een "embedded" omgeving.
-	</longdescription>
-	<longdescription lang="vi">
-		Nhóm dev-embedded chứa các thư viện và tiện ích liên quan
-		đến lập trình nhúng.
-	</longdescription>
-	<longdescription lang="it">
-		La categoria dev-embedded contiene librerie ed utilità per la programmazione di sistemi embedded.
-	</longdescription>
-	<longdescription lang="pt">
-		A categoria dev-embedded contém bibliotecas e utilitários
-		referentes a programação de dispositivos embedded.
-	</longdescription>
-	<longdescription lang="pl">
-		Kategoria dev-embedded zawiera biblioteki i narzędzia związane z
-		programowaniem dla urządzeń osadzonych.
-	</longdescription>
-</catmetadata>
-
diff --git a/dev-embedded/mspdebug-0.24 b/dev-embedded/mspdebug-0.24
new file mode 100644
index 000000000000..350c56b0c24d
--- /dev/null
+++ b/dev-embedded/mspdebug-0.24
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=readline? ( sys-libs/readline:0= ) virtual/libusb:0
+DESCRIPTION=A free debugger for use with MSP430 MCUs
+EAPI=6
+HOMEPAGE=https://dlbeer.co.nz/mspdebug/ https://github.com/dlbeer/mspdebug
+IUSE=readline
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2
+RDEPEND=readline? ( sys-libs/readline:0= ) virtual/libusb:0
+SLOT=0
+SRC_URI=https://github.com/dlbeer/mspdebug/archive/v0.24.tar.gz -> mspdebug-0.24.tar.gz
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=1d0a80edf5f7861d29014bedad0d8492
diff --git a/dev-embedded/mspdebug-0.25 b/dev-embedded/mspdebug-0.25
new file mode 100644
index 000000000000..8b7464ef416d
--- /dev/null
+++ b/dev-embedded/mspdebug-0.25
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=readline? ( sys-libs/readline:0= ) virtual/libusb:0
+DESCRIPTION=A free debugger for use with MSP430 MCUs
+EAPI=6
+HOMEPAGE=https://dlbeer.co.nz/mspdebug/ https://github.com/dlbeer/mspdebug
+IUSE=readline
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2
+RDEPEND=readline? ( sys-libs/readline:0= ) virtual/libusb:0
+SLOT=0
+SRC_URI=https://github.com/dlbeer/mspdebug/archive/v0.25.tar.gz -> mspdebug-0.25.tar.gz
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=1d0a80edf5f7861d29014bedad0d8492
diff --git a/dev-embedded/mspdebug/Manifest b/dev-embedded/mspdebug/Manifest
deleted file mode 100644
index a0607a439c1e..000000000000
--- a/dev-embedded/mspdebug/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST mspdebug-0.24.tar.gz 329321 BLAKE2B 398fad64be73ab60d3dbfb37ee1eaaaaf478521c3fb4fd8bdf90918ea7d4d4be3d5426f803900032372eddcb2342d0002996436e62eca3cdba3dcd82a5ad2cd4 SHA512 443731defe48de0c5c16faa42855c31583c125edcd4c35fca7234556e7d5f8f1b12e0fabe2d07442671426d6e2a03058f615a0f1dc5b016c32b961b34c35973c
-DIST mspdebug-0.25.tar.gz 333878 BLAKE2B d2104e49d904a057858bd7c3b48977b57f9e315c2a188428af4d492560d0c479ae77302ec313da1a264ef47cdaf108dae13ac75e952b6fb23bbafb024c19283c SHA512 5eba1d4fa6773daa89cccd8eb1964a5dfd5fb5e6719769ab6241c71010aca05c43217a8fcb6bebe1c2d9f58824f1dda5787f27b2e119f0d086eb9ae40e7fca90
-EBUILD mspdebug-0.24.ebuild 792 BLAKE2B 156ab503c8f46769c8b69433ff5454e1c761042395f4fb849de71ef0e71047d770f0f11c177a19f295645286f9f0f0775911207436aee460232dfb1cc4fb18ff SHA512 c4391c50d629055abad3831ccacc1fe15ff574007eb0793b20f8409d7155c63b9415ab4e826e542211b991dfe073c74a7b0cd37d1fe90f4c75481f35aa843910
-EBUILD mspdebug-0.25.ebuild 792 BLAKE2B 156ab503c8f46769c8b69433ff5454e1c761042395f4fb849de71ef0e71047d770f0f11c177a19f295645286f9f0f0775911207436aee460232dfb1cc4fb18ff SHA512 c4391c50d629055abad3831ccacc1fe15ff574007eb0793b20f8409d7155c63b9415ab4e826e542211b991dfe073c74a7b0cd37d1fe90f4c75481f35aa843910
-MISC metadata.xml 693 BLAKE2B 931afca679ec2d1969213361c47e91823e7a406252263a41452c2367e8270014de2dde9d8e6f9f667427baf8c3831e0ce28c3250b5f51e43ad93c055a8571baf SHA512 f4eda70a367350a5b180534287e63fd7a5bc1e95a217d17ae9d08aed009dbabf2ccf44216f6616242c8e08dce3d38922dd18b3bcf55544406926cd5399729fd6
diff --git a/dev-embedded/mspdebug/metadata.xml b/dev-embedded/mspdebug/metadata.xml
deleted file mode 100644
index 67d08aa1e43b..000000000000
--- a/dev-embedded/mspdebug/metadata.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>embedded@gentoo.org</email>
-		<name>Embedded Gentoo</name>
-	</maintainer>
-	<longdescription>
-		MSPDebug is a free debugger for use with MSP430 MCUs. It supports
-		FET430UIF, eZ430, RF2500, and Olimex MSP-JTAG-TINY programmers. It can be
-		used as a proxy for gdb or as an independent debugger with support for
-		programming, disassembly, and reverse engineering.
-	</longdescription>
-	<upstream>
-		<remote-id type="sourceforge">mspdebug</remote-id>
-		<remote-id type="github">dlbeer/mspdebug</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-embedded/mspdebug/mspdebug-0.24.ebuild b/dev-embedded/mspdebug/mspdebug-0.24.ebuild
deleted file mode 100644
index a4ff1ba9081b..000000000000
--- a/dev-embedded/mspdebug/mspdebug-0.24.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="A free debugger for use with MSP430 MCUs"
-HOMEPAGE="https://dlbeer.co.nz/mspdebug/ https://github.com/dlbeer/mspdebug"
-SRC_URI="https://github.com/dlbeer/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="readline"
-
-DEPEND="readline? ( sys-libs/readline:0= )
-	virtual/libusb:0"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	default
-	sed -i "s:-O1 \(.*\) -ggdb:\1:" Makefile || die
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" LIBDIR=/usr/lib $(usex readline "" "WITHOUT_READLINE=1")
-}
-
-src_install() {
-	emake DESTDIR="${ED}" LIBDIR=/usr/lib PREFIX=/usr install
-	dodoc AUTHORS ChangeLog README
-}
diff --git a/dev-embedded/mspdebug/mspdebug-0.25.ebuild b/dev-embedded/mspdebug/mspdebug-0.25.ebuild
deleted file mode 100644
index a4ff1ba9081b..000000000000
--- a/dev-embedded/mspdebug/mspdebug-0.25.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="A free debugger for use with MSP430 MCUs"
-HOMEPAGE="https://dlbeer.co.nz/mspdebug/ https://github.com/dlbeer/mspdebug"
-SRC_URI="https://github.com/dlbeer/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="readline"
-
-DEPEND="readline? ( sys-libs/readline:0= )
-	virtual/libusb:0"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	default
-	sed -i "s:-O1 \(.*\) -ggdb:\1:" Makefile || die
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" LIBDIR=/usr/lib $(usex readline "" "WITHOUT_READLINE=1")
-}
-
-src_install() {
-	emake DESTDIR="${ED}" LIBDIR=/usr/lib PREFIX=/usr install
-	dodoc AUTHORS ChangeLog README
-}
diff --git a/dev-embedded/openocd-0.10.0 b/dev-embedded/openocd-0.10.0
new file mode 100644
index 000000000000..b0c59f912e2c
--- /dev/null
+++ b/dev-embedded/openocd-0.10.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install postinst prepare setup
+DEPEND=>=dev-lang/jimtcl-0.76 cmsis-dap? ( dev-libs/hidapi ) jlink? ( dev-embedded/libjaylink ) usb? ( virtual/libusb:0 virtual/libusb:1 ) ftdi? ( dev-embedded/libftdi:= ) virtual/pkgconfig virtual/pkgconfig
+DESCRIPTION=OpenOCD - Open On-Chip Debugger
+EAPI=5
+HOMEPAGE=http://openocd.sourceforge.net
+IUSE=+cmsis-dap dummy +ftdi +jlink parport +usb verbose-io
+KEYWORDS=amd64 ~arm x86
+LICENSE=GPL-2+
+RDEPEND=>=dev-lang/jimtcl-0.76 cmsis-dap? ( dev-libs/hidapi ) jlink? ( dev-embedded/libjaylink ) usb? ( virtual/libusb:0 virtual/libusb:1 ) ftdi? ( dev-embedded/libftdi:= )
+RESTRICT=strip
+SLOT=0
+SRC_URI=mirror://sourceforge/project/openocd/openocd/0.10.0/openocd-0.10.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=8e845d5286029cadaac987dad63e45f9
diff --git a/dev-embedded/openocd-0.9.0 b/dev-embedded/openocd-0.9.0
new file mode 100644
index 000000000000..53f4cae45d69
--- /dev/null
+++ b/dev-embedded/openocd-0.9.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install postinst prepare setup
+DEPEND=>=dev-lang/jimtcl-0.76 cmsis-dap? ( dev-libs/hidapi ) usb? ( virtual/libusb:0 virtual/libusb:1 ) ftdi? ( dev-embedded/libftdi:= ) virtual/pkgconfig virtual/pkgconfig
+DESCRIPTION=OpenOCD - Open On-Chip Debugger
+EAPI=5
+HOMEPAGE=http://openocd.sourceforge.net
+IUSE=cmsis-dap dummy ftdi parport +usb verbose-io
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2+
+RDEPEND=>=dev-lang/jimtcl-0.76 cmsis-dap? ( dev-libs/hidapi ) usb? ( virtual/libusb:0 virtual/libusb:1 ) ftdi? ( dev-embedded/libftdi:= )
+RESTRICT=strip
+SLOT=0
+SRC_URI=mirror://sourceforge/project/openocd/openocd/0.9.0/openocd-0.9.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=f8a9fabcc8243fc76a1d77f8f138287a
diff --git a/dev-embedded/openocd-9999 b/dev-embedded/openocd-9999
new file mode 100644
index 000000000000..afba3be17d51
--- /dev/null
+++ b/dev-embedded/openocd-9999
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install postinst prepare setup unpack
+DEPEND=>=dev-lang/jimtcl-0.76 cmsis-dap? ( dev-libs/hidapi ) jlink? ( dev-embedded/libjaylink ) usb? ( virtual/libusb:0 virtual/libusb:1 ) ftdi? ( dev-embedded/libftdi:= ) virtual/pkgconfig >=sys-apps/texinfo-5 virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
+DESCRIPTION=OpenOCD - Open On-Chip Debugger
+EAPI=5
+HOMEPAGE=http://openocd.sourceforge.net
+IUSE=+cmsis-dap dummy +ftdi +jlink parport +usb verbose-io
+LICENSE=GPL-2+
+RDEPEND=>=dev-lang/jimtcl-0.76 cmsis-dap? ( dev-libs/hidapi ) jlink? ( dev-embedded/libjaylink ) usb? ( virtual/libusb:0 virtual/libusb:1 ) ftdi? ( dev-embedded/libftdi:= )
+RESTRICT=strip
+SLOT=0
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	8f6de46b0aa318aea0e8cac62ece098b	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=05249801af3e0f8129b970c4394c62c7
diff --git a/dev-embedded/openocd/Manifest b/dev-embedded/openocd/Manifest
deleted file mode 100644
index d6567ecbb1e8..000000000000
--- a/dev-embedded/openocd/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-DIST openocd-0.10.0.tar.gz 6124274 BLAKE2B 3b455fce6c62626b507e8609789e95e6a542038605423400d08ad2d14d6db0953194bb22d893e3919c79ef02a1b43ccb6396d3370273e375d340c41b587bdfbf SHA512 44b303b0df1d7c13bc18b8995493de64fed7a853704455d484dfc4a74a1ba4b0d42b4679a7009ec015dc71c47152e5556a1a02665cfafe7af80c608b68d8310a
-DIST openocd-0.9.0.tar.gz 4970346 BLAKE2B 96421b32a3e64fc1ed362288f5a444cc1249f3d6daab6307f920c86fff11cb74a0bbb9f021788b848a8755139ee1c43c54793ac57a429f4e39df47f0775c2538 SHA512 698b43867f8134da43a50f5d2ff2ae33b71df8ccffc45fb5c3d0bd7a6289fcd9e7bb3d89287ad4dbdb02e1871db69f3913db950965335eaf8559247f2e58c227
-EBUILD openocd-0.10.0.ebuild 2851 BLAKE2B b93a667ad7b8a4f785882425e86c5dca9d0265b3cf38f833102a90b0b4994195c816f997da90dc262e559ec58d627b74710ad1b09ab9dc97f2218ca7043744a2 SHA512 c70b8f2fa0158426218e359a6a20c696c7da50f49e2bab6dda9358cfcf536999922fa89f54e1973624eabcdc1231c5a80054c3c0dd414c8ef75a32e76daab905
-EBUILD openocd-0.9.0.ebuild 2712 BLAKE2B b3e38d7e98d3ee97e532a1ce04698469eb5dc3d1cfd9b83c040f1a2b4d8d327ed5b8777f0e8ffbef184bf5a91397c05242e170c76c1434fcd413af15ace7af0a SHA512 f3d3cf97d72977fd9eeebe13c8b99bceaafdf757a5ba94d316e49b9e9d216c92d057b707d6f46c750bc6204fb87b71bcf0c6d07979a3b8763f16c12b0f23bb06
-EBUILD openocd-9999.ebuild 2853 BLAKE2B bf48cba6416441f406287d9e477cdb6f10bd4f94f953a589a2dfbbebb1fb9e18180e658bc1dbe308aab62fac2aa9b4fdbfdba76e188d282e3a4ee70d7fa1f0c0 SHA512 6029e1706dd4d5e9ca742d036f8ad56f7b3b0c84f157eaa8f2ae5032ebb61f26bd294cb5ca131cc0d985ab5aff254259dc66a98ce24ff0c83fa51ab284e9887f
-MISC metadata.xml 882 BLAKE2B f7ec7fcd46485cf4f0c9039718cda564607f6f048646b326781cf09b2383c8665b8d624a19070a659df718673f4639bc918808ae950d6013016a0349a9fa6cb3 SHA512 bd6d73764a65fb4df85ce70552f0db5d18d876a54f1f1b4f75cba7865bdc425de78797f747b77f96b1c1e5b342106dd883d02f9c638875914d91987604ea8b76
diff --git a/dev-embedded/openocd/metadata.xml b/dev-embedded/openocd/metadata.xml
deleted file mode 100644
index 13ad31053b9b..000000000000
--- a/dev-embedded/openocd/metadata.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>embedded@gentoo.org</email>
-		<name>Embedded Gentoo</name>
-	</maintainer>
-	<maintainer type="person">
-		<email>fercerpav@gmail.com</email>
-		<name>Paul Fertser</name>
-	</maintainer>
-	<use>
-		<flag name="cmsis-dap">Support for CMSIS-DAP compliant adapters</flag>
-		<flag name="dummy">Build the dummy port driver</flag>
-		<flag name="jlink"> Build the SEGGER J-Link driver</flag>
-		<flag name="ftdi">Enable support for USB FTDI chips via <pkg>dev-embedded/libftdi</pkg></flag>
-		<flag name="parport">Enable support for parport JTAG devices</flag>
-		<flag name="verbose-io">Verbose IO and comm JTAG and USB messages</flag>
-	</use>
-	<upstream>
-		<remote-id type="sourceforge">openocd</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-embedded/openocd/openocd-0.10.0.ebuild b/dev-embedded/openocd/openocd-0.10.0.ebuild
deleted file mode 100644
index 44c2c20d5379..000000000000
--- a/dev-embedded/openocd/openocd-0.10.0.ebuild
+++ /dev/null
@@ -1,145 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils multilib flag-o-matic toolchain-funcs udev user
-
-# 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="http://openocd.sourceforge.net"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="+cmsis-dap dummy +ftdi +jlink parport +usb verbose-io"
-RESTRICT="strip" # includes non-native binaries
-
-RDEPEND=">=dev-lang/jimtcl-0.76
-	cmsis-dap? ( dev-libs/hidapi )
-	jlink? ( dev-embedded/libjaylink )
-	usb? (
-		virtual/libusb:0
-		virtual/libusb:1
-	)
-	ftdi? ( dev-embedded/libftdi:= )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-[[ ${PV} == "9999" ]] && DEPEND+=" >=sys-apps/texinfo-5" #549946
-
-pkg_setup() {
-	enewgroup plugdev
-}
-
-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
-		--disable-internal-libjaylink
-		--enable-amtjtagaccel
-		--enable-ep93xx
-		--enable-at91rm9200
-		--enable-gw16012
-		--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-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[@]}"
-}
-
-src_install() {
-	default
-	env -uRESTRICT prepstrip "${ED}"/usr/bin
-	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-0.9.0.ebuild b/dev-embedded/openocd/openocd-0.9.0.ebuild
deleted file mode 100644
index 7a694fd3a84d..000000000000
--- a/dev-embedded/openocd/openocd-0.9.0.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils multilib flag-o-matic toolchain-funcs udev user
-
-# 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="http://openocd.sourceforge.net"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="cmsis-dap dummy ftdi parport +usb verbose-io"
-RESTRICT="strip" # includes non-native binaries
-
-RDEPEND=">=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"
-
-pkg_setup() {
-	enewgroup plugdev
-}
-
-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
-	env -uRESTRICT prepstrip "${ED}"/usr/bin
-	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
deleted file mode 100644
index 57ba7a8c69e9..000000000000
--- a/dev-embedded/openocd/openocd-9999.ebuild
+++ /dev/null
@@ -1,145 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils multilib flag-o-matic toolchain-funcs udev user
-
-# 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="http://openocd.sourceforge.net"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="+cmsis-dap dummy +ftdi +jlink parport +usb verbose-io"
-RESTRICT="strip" # includes non-native binaries
-
-RDEPEND=">=dev-lang/jimtcl-0.76
-	cmsis-dap? ( dev-libs/hidapi )
-	jlink? ( dev-embedded/libjaylink )
-	usb? (
-		virtual/libusb:0
-		virtual/libusb:1
-	)
-	ftdi? ( dev-embedded/libftdi:= )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-[[ ${PV} == "9999" ]] && DEPEND+=" >=sys-apps/texinfo-5" #549946
-
-pkg_setup() {
-	enewgroup plugdev
-}
-
-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
-		--disable-internal-libjaylink
-		--enable-amtjtagaccel
-		--enable-ep93xx
-		--enable-at91rm9200
-		--enable-gw16012
-		--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-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[@]}"
-}
-
-src_install() {
-	default
-	env -uRESTRICT prepstrip "${ED}"/usr/bin
-	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/parapin-1.0.0 b/dev-embedded/parapin-1.0.0
new file mode 100644
index 000000000000..97a21dced489
--- /dev/null
+++ b/dev-embedded/parapin-1.0.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install
+DEPEND=doc? ( dev-tex/latex2html )
+DESCRIPTION=A parallel port pin programming library
+EAPI=0
+HOMEPAGE=http://parapin.sourceforge.net/
+IUSE=doc
+KEYWORDS=x86 ~amd64
+LICENSE=LGPL-2.1
+SLOT=0
+SRC_URI=mirror://sourceforge/parapin/parapin-1.0.0.tar.gz
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=996274ddbf04b4fcd434d1e53c3fefdf
diff --git a/dev-embedded/parapin/Manifest b/dev-embedded/parapin/Manifest
deleted file mode 100644
index 0e47ae6972c3..000000000000
--- a/dev-embedded/parapin/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST parapin-1.0.0.tar.gz 240771 BLAKE2B 3c211d43028f1ee4b09568eae2408b96c9b3c1ecce5b81f3fd520ea3f480bb06044e99e04e7776b8a2b6cf7f99e57f2dcf186aea2ba9afbe4c31b9e0be3bc894 SHA512 43e4066b649bec8519c98052451ab1beb720c9c8086bbd045bb013e3c12c7e83bf0411ac4b8e7006c3acbc6d1487b918d26df65b246469e6c7e008a0e26874d9
-EBUILD parapin-1.0.0.ebuild 775 BLAKE2B 4cf48813609462289869def43d3a4e9d3e347d401299281e10ca89db1cb6c811e294ba38041c5354b2901969aa451bdf7d4a4fd964d94955d94aa3363cdec294 SHA512 e3df0592adf1bb8d7a00c5c07a7ecfaa45df9384c7f8f29260e69a425421f1d10ce9de8d3360542ddc3516c9b13be4564857e7505cfb8010906e4a046dc51640
-MISC metadata.xml 987 BLAKE2B bc9d93c4a6baa98b6ee8631a33a9ccc4fec6bcd9a60adff8cca4f2376cf12145571bc23ad1dab299eda69cfffa77f0ea5a1e3cb72a26b6c25f9d7253b4048af4 SHA512 80c14ff7464a986fb91620df2c239c04be1098b38046d0516b9e38e85eeda520c06437ddaccbcca322f99fec8161645f15c83c042165a9a83a24cc14aee60db0
diff --git a/dev-embedded/parapin/metadata.xml b/dev-embedded/parapin/metadata.xml
deleted file mode 100644
index 434e29779329..000000000000
--- a/dev-embedded/parapin/metadata.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>embedded@gentoo.org</email>
-		<name>Embedded Gentoo</name>
-	</maintainer>
-	<longdescription>
-Parapin makes it easy to write C code under Linux that controls individual pins on a PC parallel port. This kind of control is very useful for 
-electronics projects that use the PC's parallel port as a generic digital I/O interface. Parapin goes to great lengths to insulate the programmer 
-from the somewhat complex parallel port programming interface provided by the PC hardware, making it easy to use the parallel port for digital 
-I/O. By the same token, this abstraction also makes Parapin less useful in applications that need to actually use the parallel port as a parallel 
-port (e.g., for talking to a printer).
-</longdescription>
-	<upstream>
-		<remote-id type="sourceforge">parapin</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-embedded/parapin/parapin-1.0.0.ebuild b/dev-embedded/parapin/parapin-1.0.0.ebuild
deleted file mode 100644
index d2bc30ea19ae..000000000000
--- a/dev-embedded/parapin/parapin-1.0.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit toolchain-funcs
-
-DESCRIPTION="A parallel port pin programming library"
-HOMEPAGE="http://parapin.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-IUSE="doc"
-KEYWORDS="x86 ~amd64"
-
-SLOT="0"
-
-DEPEND="doc? ( dev-tex/latex2html )"
-RDEPEND=""
-
-src_compile() {
-	# Note 2.4 and 2.6 makefiles are identical for the targets used
-	emake -f Makefile-2.4 CC=$(tc-getCC) || die
-}
-
-src_install() {
-	dolib.a libparapin.a
-	insopts -m0444;	insinto /usr/include; doins parapin.h
-
-	dodoc README
-	if use doc; then
-		cd doc
-		emake html
-		cd parapin
-		dohtml *.html *.css *.png
-
-		cd ${S}
-		docinto examples
-		dodoc examples/*.c
-	fi
-}
diff --git a/dev-embedded/picasm-1.14 b/dev-embedded/picasm-1.14
new file mode 100644
index 000000000000..af8b794699f9
--- /dev/null
+++ b/dev-embedded/picasm-1.14
@@ -0,0 +1,10 @@
+DEFINED_PHASES=compile install prepare
+DESCRIPTION=An assembler and disassembler for 12 and 14-bit PIC chips
+EAPI=4
+HOMEPAGE=http://www.iki.fi/trossi/pic/
+KEYWORDS=~amd64 x86
+LICENSE=MIT
+SLOT=0
+SRC_URI=http://www.iki.fi/trossi/pic/picasm114.tar.bz2
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=2abb969f96972ba5710f92d14af4295f
diff --git a/dev-embedded/picasm/Manifest b/dev-embedded/picasm/Manifest
deleted file mode 100644
index bd7bb6c1640c..000000000000
--- a/dev-embedded/picasm/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST picasm114.tar.bz2 35429 BLAKE2B 6d6e1093904c3cbcaf6fd40c46890257e35e7b197bec92e3728f06595b98ad6be5e2b4c4b19fe67103b871ed9f8e002edd1fae6ab59a85480789bac5a661002a SHA512 a6a8490156afe8af1fc85700890570c745c076396890491f4efe004d7dd701a324f9c7e764fcc710c8954c761f3abb4ed8e97c72ce098100192ead334b335fb7
-EBUILD picasm-1.14.ebuild 871 BLAKE2B a94d983a4dca2e91db54b687b7511660c85ebc15f6e06a181ec3502d556651b1b697692df01e9e89c64dad1c736806f5b3737907928a472b3eada358d526bb78 SHA512 c6fc4f2fbce3ed02ff81cc6fe088fc4e43078cc7d19927cb8ee5492a54601ee17e35179f6644761da604ce34dd213d647b03e09be2f43bacf4591f7aea1b6fa0
-MISC metadata.xml 247 BLAKE2B e46b8f2d053251af5cb591bb2ee5e35089c4e8174ee2e7a3c504db23f844b65083d4a3e5198da3977ad3e98b67cab2e0de686a3c62009b487c1e64785a8ff65d SHA512 15df289e0f962f564551f61ada3cfef0311f6af639887def780bf5ad3be105515c8d24c950ff340ed35d89b9cd994af3540322b684c5dec3b43ec6bb0041aa4e
diff --git a/dev-embedded/picasm/metadata.xml b/dev-embedded/picasm/metadata.xml
deleted file mode 100644
index 71b1461e1146..000000000000
--- a/dev-embedded/picasm/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>embedded@gentoo.org</email>
-	<name>Embedded Gentoo</name>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-embedded/picasm/picasm-1.14.ebuild b/dev-embedded/picasm/picasm-1.14.ebuild
deleted file mode 100644
index c8fa9d90d9a6..000000000000
--- a/dev-embedded/picasm/picasm-1.14.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit toolchain-funcs flag-o-matic
-
-MY_PV="${PV//.}"
-MY_P="${PN}${MY_PV}"
-DESCRIPTION="An assembler and disassembler for 12 and 14-bit PIC chips"
-HOMEPAGE="http://www.iki.fi/trossi/pic/"
-SRC_URI="http://www.iki.fi/trossi/pic/${MY_P}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 x86"
-IUSE=""
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	sed -i -e 's:$(CC):\0 $(LDFLAGS):' Makefile || die
-}
-
-src_compile() {
-	append-cflags -DBUILTIN_INCLUDE1=\\\"/usr/share/picasm/include\\\"
-	emake CFLAGS="${CFLAGS}" CC="$(tc-getCC)"
-}
-
-src_install() {
-	dobin picasm
-	dodoc picasm.txt HISTORY TODO
-
-	insinto /usr/share/picasm/include
-	doins device_definitions/*.i
-
-	dohtml picasm.html
-	docinto examples
-	dodoc examples/*.*
-	docompress -x /usr/share/doc/${PF}/examples
-}
diff --git a/dev-embedded/picp-0.6.8 b/dev-embedded/picp-0.6.8
new file mode 100644
index 000000000000..df4eecbb4e1c
--- /dev/null
+++ b/dev-embedded/picp-0.6.8
@@ -0,0 +1,10 @@
+DEFINED_PHASES=compile install prepare
+DESCRIPTION=A commandline interface to Microchip's PICSTART+ programmer
+EAPI=4
+HOMEPAGE=http://home.pacbell.net/theposts/picmicro/
+KEYWORDS=~amd64 x86
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=http://home.pacbell.net/theposts/picmicro/picp-0.6.8.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=db05b28534b51b51340fdbeb6a5c5ed0
diff --git a/dev-embedded/picp/Manifest b/dev-embedded/picp/Manifest
deleted file mode 100644
index 3acc59ad9ba5..000000000000
--- a/dev-embedded/picp/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX picp-0.6.8-errno.patch 212 BLAKE2B 9c72090aeb3d774dbc70925d7f2e18dfa8ed633cc878bc1ea9e8313ba214bddf808688938ace0325d19471a8fe7b26cee172390b71160fa2747c9d827e92fd8b SHA512 b45e714ef750f2bab2feebfedbe9e07be2b53b5400e25d4af5d4cf415055cef54639689555a85e21e38c6c28feab2042574b1fc702075632aae3c3cccad94a28
-DIST picp-0.6.8.tar.gz 125303 BLAKE2B f445499fa86bc683ba253a5f9a218da6fdc72a3851557225fc91d1542c26a87ddc1926c10500c382288d71fc41beccc88a3c7c863ac7bba7251d3245c7a784ea SHA512 03b8f55f3ae69d87dc02a2df6cad718c3d9fec725eae469b9e28e411620c95e7c1f2d241110cb6a5561e8d9727da3319e2b7caaeefa7a68239009317c8df9471
-EBUILD picp-0.6.8.ebuild 1043 BLAKE2B 011e46d9df776c51b8b3f0b0c0569547afff0794265c4903a61e6818b2bacedf4da12085aefa6a99a3f20f4e635a7ac7841def34d997d84e31f374b4662536ec SHA512 224dc3cf194a3be86579663e662a0dc5c7d89fd21ea19f1fdf0e0877d99c7a02cbd3fcbbce48adee44155dd79ab5bc912a9715add2e1bdd75174e181c622074c
-MISC metadata.xml 247 BLAKE2B e46b8f2d053251af5cb591bb2ee5e35089c4e8174ee2e7a3c504db23f844b65083d4a3e5198da3977ad3e98b67cab2e0de686a3c62009b487c1e64785a8ff65d SHA512 15df289e0f962f564551f61ada3cfef0311f6af639887def780bf5ad3be105515c8d24c950ff340ed35d89b9cd994af3540322b684c5dec3b43ec6bb0041aa4e
diff --git a/dev-embedded/picp/files/picp-0.6.8-errno.patch b/dev-embedded/picp/files/picp-0.6.8-errno.patch
deleted file mode 100644
index 89d5d063576d..000000000000
--- a/dev-embedded/picp/files/picp-0.6.8-errno.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- picp-0.6.8/picsnoop/picsnoop.c.orig
-+++ picp-0.6.8/picsnoop/picsnoop.c
-@@ -40,6 +40,7 @@
- #include <string.h>
- #include <unistd.h>
- #include <signal.h>
-+#include <errno.h>
- #include	<ctype.h>
- 
- #ifdef WIN32
diff --git a/dev-embedded/picp/metadata.xml b/dev-embedded/picp/metadata.xml
deleted file mode 100644
index 71b1461e1146..000000000000
--- a/dev-embedded/picp/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>embedded@gentoo.org</email>
-	<name>Embedded Gentoo</name>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-embedded/picp/picp-0.6.8.ebuild b/dev-embedded/picp/picp-0.6.8.ebuild
deleted file mode 100644
index 9957ee011e31..000000000000
--- a/dev-embedded/picp/picp-0.6.8.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit toolchain-funcs eutils
-
-DESCRIPTION="A commandline interface to Microchip's PICSTART+ programmer"
-HOMEPAGE="http://home.pacbell.net/theposts/picmicro/"
-SRC_URI="http://home.pacbell.net/theposts/picmicro/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 x86"
-IUSE=""
-
-src_prepare() {
-	sed -i -e '/strip/d' \
-		-e 's:$(CC):\0 $(LDFLAGS):' \
-		{.,fixchksum,picsnoop}/Makefile || die "sed failed"
-
-	rm -f picsnoop/{picsnoop,*.o}
-
-	epatch "${FILESDIR}"/${P}-errno.patch
-}
-
-src_compile() {
-	emake CC=$(tc-getCC) OPTIONS="${CFLAGS} -x c++"
-	emake -C picsnoop CC=$(tc-getCC) OPTIONS="${CFLAGS} -x c++"
-	emake -C fixchksum CC=$(tc-getCC) OPTIONS="${CFLAGS}"
-}
-
-src_install() {
-	dobin picp
-	dobin picsnoop/picsnoop
-	dobin fixchksum/fixchksum
-	dodoc README HISTORY LICENSE.TXT NOTES PSCOMMANDS.TXT BugReports.txt TODO
-	newdoc picsnoop/README.TXT PICSNOOP.txt
-	newdoc fixchksum/README fixchksum.txt
-	dohtml PICPmanual.html
-}
diff --git a/dev-embedded/picprog-1.9.1 b/dev-embedded/picprog-1.9.1
new file mode 100644
index 000000000000..d56d3c0058b0
--- /dev/null
+++ b/dev-embedded/picprog-1.9.1
@@ -0,0 +1,10 @@
+DEFINED_PHASES=compile install
+DESCRIPTION=A PIC16, PIC18 and dsPIC microcontroller programmer software for the serial port
+EAPI=4
+HOMEPAGE=http://www.iki.fi/hyvatti/pic/picprog.html
+KEYWORDS=amd64 ~ppc x86
+LICENSE=GPL-3
+SLOT=0
+SRC_URI=http://www.iki.fi/hyvatti/pic/picprog-1.9.1.tar.gz
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=b6e0e334613617b590a266453e06a5af
diff --git a/dev-embedded/picprog/Manifest b/dev-embedded/picprog/Manifest
deleted file mode 100644
index 40c741ba5878..000000000000
--- a/dev-embedded/picprog/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST picprog-1.9.1.tar.gz 76452 BLAKE2B 7c6c5d1eda83c9bdc2c9a3c32c97d06b983cb335d2d37e291fabce3955603adcad293934f2cf1964af1e062b800a6e392f97f80ae1dfd94c03bbc269fafb0785 SHA512 1f24c372aa149d86dd4778904f0abb782510168ce36676b820a5b675f53a7207f62cdcb374c8ec2c60fc51fdfd5780ad9f8f464365403d3d2232187dade91887
-EBUILD picprog-1.9.1.ebuild 583 BLAKE2B 2ff6166553f9d301b609b24fffb0b8219ac2c0b14fd3f8658343954917bd3f72c6e34448371abc59e7ac6a441cb18d1760e8f5adf3013490aa61bd63884341e2 SHA512 6c2e46d4b48f098aff8ae492960cbfda541ddc76e70d8a9baa4263b46c61eadbf77decaedb886f4a5316520f7221ae89480b5aecdb24ff0891710b8f123fac0c
-MISC metadata.xml 371 BLAKE2B e37a60ab0913a850ed1f3ba60aab5aa6600640494237ce073f87a3a1be70c286ea3bd7e65a712683cf70779506987fdae4f05b6b2622d271675fa61c8a2dbb6b SHA512 e2b29fba984eabfe9ae7ea52a6b1d36d04995da9dcab86485ec5dbcd4de0c4db9c092ed495cea68664c961c7108570a94daa5864d04952da50081bd38a7e083b
diff --git a/dev-embedded/picprog/metadata.xml b/dev-embedded/picprog/metadata.xml
deleted file mode 100644
index cd87bb253533..000000000000
--- a/dev-embedded/picprog/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>embedded@gentoo.org</email>
-	<name>Embedded Gentoo</name>
-</maintainer>
-<longdescription>a pic16xxx series microcontroller programmer software for the simple serial port 
-device</longdescription>
-</pkgmetadata>
diff --git a/dev-embedded/picprog/picprog-1.9.1.ebuild b/dev-embedded/picprog/picprog-1.9.1.ebuild
deleted file mode 100644
index 49908460f478..000000000000
--- a/dev-embedded/picprog/picprog-1.9.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit toolchain-funcs
-
-DESCRIPTION="A PIC16, PIC18 and dsPIC microcontroller programmer software for the serial port"
-HOMEPAGE="http://www.iki.fi/hyvatti/pic/picprog.html"
-SRC_URI="http://www.iki.fi/hyvatti/pic/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE=""
-
-src_compile() {
-	emake CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS}"
-}
-
-src_install() {
-	dobin picprog
-	dodoc README
-	dohtml picprog.html *.png
-	doman picprog.1
-}
diff --git a/dev-embedded/pista-0.70 b/dev-embedded/pista-0.70
new file mode 100644
index 000000000000..04b8bf95d0d1
--- /dev/null
+++ b/dev-embedded/pista-0.70
@@ -0,0 +1,10 @@
+DEFINED_PHASES=compile install
+DESCRIPTION=Commandline-driven interface to PICSTART+ PIC programmer
+EAPI=0
+HOMEPAGE=http://gatling.ikk.sztaki.hu/~kissg/pd/pista/pista.html
+KEYWORDS=~amd64 ~ppc x86
+LICENSE=GPL-2
+RDEPEND=dev-lang/perl dev-perl/TermReadKey
+SLOT=0
+SRC_URI=ftp://gatling.ikk.sztaki.hu/pub/pic/pista/pista-0.70.tar.gz http://pista.choup.net/pub/pic/pista/pista-0.70.tar.gz
+_md5_=e187b6d277ae3a2d5ae6fd50124e0233
diff --git a/dev-embedded/pista/Manifest b/dev-embedded/pista/Manifest
deleted file mode 100644
index 31df628b27e8..000000000000
--- a/dev-embedded/pista/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST pista-0.70.tar.gz 50454 BLAKE2B 515038a133d3c3dcbe5959020c88d6e4bc4e5a8b2bed7c6b0b226064ebde6f5fa91f0af102fe544cb4fba0d0b7e9439bdbecc4516354c6d6daeb5735c2fa72fc SHA512 23125ffff317d7c0de16de76cc572bb4a0aba125dd3b9cd7adb5adb7efe09f7c694c81046fd9ced77e595e25d417044ab3b8a7371a28f7d04c9be794d0436a7c
-EBUILD pista-0.70.ebuild 690 BLAKE2B b4c24789c0430df870d0095630269f34b17aaf60d6874898e92db8608201d1fd2925f1956ba04acd6bd7bc95656e0d92d4c0bfde394604a54bb699ca86bae4ee SHA512 ae43883627c97b42a89d315978668c93bdcdb0650cacee050d80807e14b241f4284e6a91c4675ad33cc41fc10cd1a1c1aa1708c46d8fc46901e26f238755926d
-MISC metadata.xml 247 BLAKE2B e46b8f2d053251af5cb591bb2ee5e35089c4e8174ee2e7a3c504db23f844b65083d4a3e5198da3977ad3e98b67cab2e0de686a3c62009b487c1e64785a8ff65d SHA512 15df289e0f962f564551f61ada3cfef0311f6af639887def780bf5ad3be105515c8d24c950ff340ed35d89b9cd994af3540322b684c5dec3b43ec6bb0041aa4e
diff --git a/dev-embedded/pista/metadata.xml b/dev-embedded/pista/metadata.xml
deleted file mode 100644
index 71b1461e1146..000000000000
--- a/dev-embedded/pista/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>embedded@gentoo.org</email>
-	<name>Embedded Gentoo</name>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-embedded/pista/pista-0.70.ebuild b/dev-embedded/pista/pista-0.70.ebuild
deleted file mode 100644
index f9431fbdcf31..000000000000
--- a/dev-embedded/pista/pista-0.70.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-DESCRIPTION="Commandline-driven interface to PICSTART+ PIC programmer"
-HOMEPAGE="http://gatling.ikk.sztaki.hu/~kissg/pd/pista/pista.html"
-SRC_URI="ftp://gatling.ikk.sztaki.hu/pub/pic/pista/${P}.tar.gz
-	http://pista.choup.net/pub/pic/pista/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
-IUSE=""
-
-RDEPEND="dev-lang/perl
-	dev-perl/TermReadKey"
-
-src_compile() {
-	perl Makefile.PL PREFIX=/usr || die "Running Makefile.PL failed"
-	emake || die "make failed"
-}
-
-src_install() {
-	emake install DESTDIR=${D} || die
-	dodoc README Changes Copyright doc/pista.html
-}
diff --git a/dev-embedded/pk2-la-1.1-r2 b/dev-embedded/pk2-la-1.1-r2
new file mode 100644
index 000000000000..1c29b4a258e1
--- /dev/null
+++ b/dev-embedded/pk2-la-1.1-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Logic Analyzer and I/O Probe for the Microchip PICkit2
+EAPI=5
+HOMEPAGE=https://sourceforge.net/projects/pk2-la
+IUSE=python_targets_python2_7
+KEYWORDS=~ppc
+LICENSE=GPL-2
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pygtk[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyusb:0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=mirror://sourceforge/pk2-la/pk2-la-1.1.tar.bz2
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=3928c3b878665c70f496963e52c3b6c3
diff --git a/dev-embedded/pk2-la/Manifest b/dev-embedded/pk2-la/Manifest
deleted file mode 100644
index 7c7da810c2fe..000000000000
--- a/dev-embedded/pk2-la/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST pk2-la-1.1.tar.bz2 19222 BLAKE2B 876ce030aeeab9b710e68052931210d9250dc2587b31bafde41a338b96315fbb2d8c2ba6d7285221c0a0136389e02714766b3ecbd82fb9a37ca0516c5a1ce9df SHA512 50e5b16149437afe92e1e987d3020099b1278f8ad207192e9b197f72ec1ab26c77307efd99976a1c6334bcea1899f38997fce27bd1e4caf70a04f851a8136f0d
-EBUILD pk2-la-1.1-r2.ebuild 672 BLAKE2B 671253db3066a017fab2b0a85d25595a87185c4bb7d1972294469893a459e6b2d894d0fb6c45a6c26796c631787de2ffd00094af93eb627b95ea5f6091173844 SHA512 ac2e42f14e3316bb71151738f3e978804efcd91ab29f5d5a5d428fee521190a7bd131ead8ea4ee16107e884bb1c70716c036e30a39924d497c607085c52b5c28
-MISC metadata.xml 463 BLAKE2B 0aaad3a1803ecdb3f4719b6db8d04965e251b8c8cdd8882df808868d3a80879db87496f73427716135a68ada595862a70a051af244193f6074b96063c8b8f3ca SHA512 0788bb2dd1c607c09791df36a9a7d97b62c18be189033fb9a85d2a3cd9865ce2880aebda0f66ee22d542f48e8e7467b847a3e4f1176c44ff93b98252bbbc00ec
diff --git a/dev-embedded/pk2-la/metadata.xml b/dev-embedded/pk2-la/metadata.xml
deleted file mode 100644
index 6c695c66ddf2..000000000000
--- a/dev-embedded/pk2-la/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<longdescription>
-		pk2-la allows the Microchip PICkit2 programmer to be used as a
-		Logic Analyzer and I/O Probe.
-	</longdescription>
-	<maintainer type="project">
-		<email>embedded@gentoo.org</email>
-		<name>Embedded Gentoo</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">pk2-la</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-embedded/pk2-la/pk2-la-1.1-r2.ebuild b/dev-embedded/pk2-la/pk2-la-1.1-r2.ebuild
deleted file mode 100644
index 342d462055c4..000000000000
--- a/dev-embedded/pk2-la/pk2-la-1.1-r2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-r1
-
-DESCRIPTION="Logic Analyzer and I/O Probe for the Microchip PICkit2"
-HOMEPAGE="https://sourceforge.net/projects/pk2-la"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~ppc"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}"
-RDEPEND="${DEPEND}
-	dev-python/pygtk[${PYTHON_USEDEP}]
-	dev-python/pyusb:0[${PYTHON_USEDEP}]
-	"
-
-src_compile() { :; }
-
-src_install() {
-	python_foreach_impl python_doscript ${PN}
-
-	dodoc README LA-Format IO-Format CHANGELOG
-}
diff --git a/dev-embedded/pk2cmd-1.20 b/dev-embedded/pk2cmd-1.20
new file mode 100644
index 000000000000..43443c2cc5be
--- /dev/null
+++ b/dev-embedded/pk2cmd-1.20
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=virtual/libusb:0
+DESCRIPTION=An application for working with the Microchip PicKit2 PIC programmer
+EAPI=5
+HOMEPAGE=http://www.microchip.com/pickit2
+KEYWORDS=~amd64 ppc ppc64 ~x86
+LICENSE=MicroChip-PK2
+RDEPEND=virtual/libusb:0
+SLOT=0
+SRC_URI=http://ww1.microchip.com/downloads/en/DeviceDoc/pk2cmdv1.20LinuxMacSource.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=93e9079a35e1837adea4608fa26309a8
diff --git a/dev-embedded/pk2cmd/Manifest b/dev-embedded/pk2cmd/Manifest
deleted file mode 100644
index 0405b16ad838..000000000000
--- a/dev-embedded/pk2cmd/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX pk2cmd-add-share-dir-for-dev-file-1.20.patch 668 BLAKE2B e8d8f7283231ae231d7a5372b16cfdc28fe493eccf4ed85eafc995583c7a1ee7e8db4d1a0c58df0cb8e87f5bb1c82aed46eb05c275e51cf337f67a7e6ea9b1fe SHA512 f586c7eed0eac0d68e495d582c85c802c98ac8c84f7f21b00616edbbace74b877d21fd43334e5accfd02413d4a6d9d9811241feec1eaeae3a7647c745206d638
-DIST pk2cmdv1.20LinuxMacSource.tar.gz 223175 BLAKE2B b2d53763d5030341f13cb1bee534cfbed160ee4e4a839d5f900bb334f50a0ca52968fd8dc3f27e0fa8ecb47ad2b1d251881ed4646be41b5862e4fd0c452102a9 SHA512 72675eb287c1410c82ff49b4922afd28a8017b4e8517d10e77e0f0b111630f90881f778d754a47c97453f45412e965e281435d495fc70a047bd7357dd64f7b24
-EBUILD pk2cmd-1.20.ebuild 1212 BLAKE2B d1d5de21151d63f4fc0f17c59336631e93080b44ffef1e3b1e01e8e3ad1bbb5f2c010094b9c5f42db17de4fdc0ad8cbd6a542101ca5c96c64adfbd3700280227 SHA512 16960cfdb7887768008d8dc61d04b66cdf402852bee35542c93dab6d7b43c41dae4d4c8b80549d26b9801bb8df430bf982106219072efda4c20fb08919386358
-MISC metadata.xml 367 BLAKE2B 1974b2870529989c471ffe544d721871f0f8bbdd1572cff4a44cb8d3bab949d005a5d2bcf2bc33d539d3ca51c8e0995a0eff15d02f8bd11ccc4c06e1a727bf86 SHA512 09c3d20eb53c9927bb7489b3522f4daa0809a379760d950a33eed0b9ddfccfe1eae4324e5c674c4731779ccb45a95627575941f2d22387efcda406947256cb22
diff --git a/dev-embedded/pk2cmd/files/pk2cmd-add-share-dir-for-dev-file-1.20.patch b/dev-embedded/pk2cmd/files/pk2cmd-add-share-dir-for-dev-file-1.20.patch
deleted file mode 100644
index 30d6b1e71a3e..000000000000
--- a/dev-embedded/pk2cmd/files/pk2cmd-add-share-dir-for-dev-file-1.20.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- cmd_app.cpp.old	2009-01-31 21:23:30.000000000 +0100
-+++ cmd_app.cpp	2009-01-31 21:25:48.000000000 +0100
-@@ -88,7 +88,12 @@
- 		_tsearchenv_s("PK2DeviceFile.dat", "PATH", tempString);

- 		if (_tcslen(tempString) < 17)

- 		{

--			_tcsncpy_s(tempString, "PK2DeviceFile.dat", 17);

-+               // Try /usr/share/pk2 first

-+               _tcsncpy_s(tempString, "/usr/share/pk2/PK2DeviceFile.dat", 32);

-+

-+               if(access(tempString, 0))

-+                       // Well, that didn't work, default to the current directory

-+                       _tcsncpy_s(tempString, "PK2DeviceFile.dat", 17);

- 		}

- 	}

- 	if (!PicFuncs.ReadDeviceFile(tempString))

diff --git a/dev-embedded/pk2cmd/metadata.xml b/dev-embedded/pk2cmd/metadata.xml
deleted file mode 100644
index 3435e2a089ff..000000000000
--- a/dev-embedded/pk2cmd/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-  <email>embedded@gentoo.org</email>
-  <name>Embedded Gentoo</name>
-</maintainer>
-<longdescription lang="en">
-This application allows the use of the PICKit2 PIC programming device.
-</longdescription>
-</pkgmetadata>
diff --git a/dev-embedded/pk2cmd/pk2cmd-1.20.ebuild b/dev-embedded/pk2cmd/pk2cmd-1.20.ebuild
deleted file mode 100644
index 24cfe4769c1b..000000000000
--- a/dev-embedded/pk2cmd/pk2cmd-1.20.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="An application for working with the Microchip PicKit2 PIC programmer"
-HOMEPAGE="http://www.microchip.com/pickit2"
-SRC_URI="http://ww1.microchip.com/downloads/en/DeviceDoc/${PN}v${PV}LinuxMacSource.tar.gz"
-
-LICENSE="MicroChip-PK2"
-SLOT="0"
-KEYWORDS="~amd64 ppc ppc64 ~x86"
-IUSE=""
-
-DEPEND="virtual/libusb:0"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${PN}v${PV}LinuxMacSource
-
-src_prepare() {
-	# Patch adds /usr/share/pk2 to the default search for the device file
-	epatch "${FILESDIR}/${PN}-add-share-dir-for-dev-file-${PV}.patch"
-
-	# Fix up the Makefile
-	sed \
-		-e 's:#TARGET=linux:TARGET=linux:' \
-		-e 's:DBG=-O2:DBG=:' \
-		-e 's:^CFLAGS=:CFLAGS+=:' \
-		-e 's:^LDFLAGS=:LDFLAGS+=:' \
-		-e 's:^LIBUSB=/usr/local:LIBUSB=/usr:' \
-		-e "s:^CC=g++::" \
-		-i Makefile || die
-}
-
-src_compile() {
-	emake CC="$(tc-getCXX)"
-}
-
-src_install() {
-	# Copy the device files and PicKit2 OS
-	insinto "/usr/share/pk2"
-	doins PK2DeviceFile.dat PK2V023200.hex
-	# Install the program
-	dobin pk2cmd
-	# Install the documentation
-	dodoc ReadmeForPK2CMDLinux2-6.txt usbhotplug.txt
-}
diff --git a/dev-embedded/platformio-3.5.3 b/dev-embedded/platformio-3.5.3
new file mode 100644
index 000000000000..a58824de51e7
--- /dev/null
+++ b/dev-embedded/platformio-3.5.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)]
+DESCRIPTION=An open source ecosystem for IoT development
+EAPI=6
+HOMEPAGE=https://platformio.org/
+IUSE=python_targets_python2_7
+KEYWORDS=~x86 ~amd64
+LICENSE=BSD
+RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] <dev-python/arrow-1[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] <dev-python/bottle-0.13[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/click-5[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] <dev-python/click-6[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/colorama[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] <dev-python/lockfile-0.13[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/lockfile-0.9.1[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/pyserial-3[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] <dev-python/pyserial-4[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/requests-2.4[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] <dev-python/requests-3[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/semantic_version-2.5.0[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)]
+REQUIRED_USE=python_targets_python2_7
+SLOT=0
+SRC_URI=mirror://pypi/p/platformio/platformio-3.5.3.tar.gz
+_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=141779745d2e371615608e0b1409b959
diff --git a/dev-embedded/platformio-3.5.4 b/dev-embedded/platformio-3.5.4
new file mode 100644
index 000000000000..de39b305ca2c
--- /dev/null
+++ b/dev-embedded/platformio-3.5.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)]
+DESCRIPTION=An open source ecosystem for IoT development
+EAPI=6
+HOMEPAGE=https://platformio.org/
+IUSE=python_targets_python2_7
+KEYWORDS=~x86 ~amd64
+LICENSE=BSD
+RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] <dev-python/arrow-1[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] <dev-python/bottle-0.13[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/click-5[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] <dev-python/click-6[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/colorama[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] <dev-python/lockfile-0.13[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/lockfile-0.9.1[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/pyserial-3[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] <dev-python/pyserial-4[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/requests-2.4[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] <dev-python/requests-3[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/semantic_version-2.5.0[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)]
+REQUIRED_USE=python_targets_python2_7
+SLOT=0
+SRC_URI=mirror://pypi/p/platformio/platformio-3.5.4.tar.gz
+_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=141779745d2e371615608e0b1409b959
diff --git a/dev-embedded/platformio/Manifest b/dev-embedded/platformio/Manifest
deleted file mode 100644
index f37abc6d59e2..000000000000
--- a/dev-embedded/platformio/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST platformio-3.5.3.tar.gz 96791 BLAKE2B 4b17ccec4a192704cbd185ed42eb6214cfa54a072f6d089f96c608eec7815bd3046b12f7e84355055b5026600b22c4f1c720b12caea4e281479d4c381fe8ec4f SHA512 4c5b5b0a0c4d6942f91ffcb4317149cdbdba857f17b07ad3f47db9abd97615eafbd310d0f1a2c389b485922af1df6f3a6d7831bce1f92a53540b00998c859247
-DIST platformio-3.5.4.tar.gz 97742 BLAKE2B 5fcc652358ea5788977836a6ee0fe204633e2748afc5cbb6924e8200c0115c92a778c0c919178f05a9656f21eb2b17f4e15b0de5ea06fbade936d8b59bb12431 SHA512 2d2af5133648a9b2070abb5d39d27a7292865b99cf690c587f4c80d5e97d429eaa3b037b07a1afcf199df730fe96a0dfecb4ff45ffd21d286f80d5d265e9a85e
-EBUILD platformio-3.5.3.ebuild 983 BLAKE2B 914ec00f360676c67cb37673c5a3ff2c4075de9b4056eedb9471dd964574881ba6df8ddd1b1edb04356781be366f7ec76bd8b82262745a3a33ac43198243e028 SHA512 72d8261e807850c4709dab0cde6aae59b08d7e5ad3b81969232a098b741bbc863e7196c5bd54e6e7be389be42f595a4c8d3a9ca5a99cd45bd488b942c0126a38
-EBUILD platformio-3.5.4.ebuild 983 BLAKE2B 914ec00f360676c67cb37673c5a3ff2c4075de9b4056eedb9471dd964574881ba6df8ddd1b1edb04356781be366f7ec76bd8b82262745a3a33ac43198243e028 SHA512 72d8261e807850c4709dab0cde6aae59b08d7e5ad3b81969232a098b741bbc863e7196c5bd54e6e7be389be42f595a4c8d3a9ca5a99cd45bd488b942c0126a38
-MISC metadata.xml 248 BLAKE2B 946598a9bc9f658d98c3282fd6affeb3834a4b6071beca852a2f2381d5c17799b6ed17ed427a8f6e10fb3f715cdf2aad9e4fed2886f0dd67dacfdffcd5137f80 SHA512 89d637e180ed3a2c2096be2210633dc5df0760a7d6acd7b2d2ad8a06d473943ee86bad7e74c7df238a50168d1da8044471713e9b044007b9c2f4eb604fb710d5
diff --git a/dev-embedded/platformio/metadata.xml b/dev-embedded/platformio/metadata.xml
deleted file mode 100644
index 086586c08a88..000000000000
--- a/dev-embedded/platformio/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>alexxy@gentoo.org</email>
-		<name>Alexey Shvetsov</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/dev-embedded/platformio/platformio-3.5.3.ebuild b/dev-embedded/platformio/platformio-3.5.3.ebuild
deleted file mode 100644
index a4d3b719d1c2..000000000000
--- a/dev-embedded/platformio/platformio-3.5.3.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_SINGLE_IMPL=1
-
-inherit distutils-r1
-
-DESCRIPTION="An open source ecosystem for IoT development"
-HOMEPAGE="https://platformio.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE=""
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}
-	<dev-python/arrow-1[${PYTHON_USEDEP}]
-	<dev-python/bottle-0.13[${PYTHON_USEDEP}]
-	>=dev-python/click-5[${PYTHON_USEDEP}]
-	<dev-python/click-6[${PYTHON_USEDEP}]
-	dev-python/colorama[${PYTHON_USEDEP}]
-	<dev-python/lockfile-0.13[${PYTHON_USEDEP}]
-	>=dev-python/lockfile-0.9.1[${PYTHON_USEDEP}]
-	>=dev-python/pyserial-3[${PYTHON_USEDEP}]
-	<dev-python/pyserial-4[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.4[${PYTHON_USEDEP}]
-	<dev-python/requests-3[${PYTHON_USEDEP}]
-	>=dev-python/semantic_version-2.5.0[${PYTHON_USEDEP}]"
diff --git a/dev-embedded/platformio/platformio-3.5.4.ebuild b/dev-embedded/platformio/platformio-3.5.4.ebuild
deleted file mode 100644
index a4d3b719d1c2..000000000000
--- a/dev-embedded/platformio/platformio-3.5.4.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_SINGLE_IMPL=1
-
-inherit distutils-r1
-
-DESCRIPTION="An open source ecosystem for IoT development"
-HOMEPAGE="https://platformio.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE=""
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}
-	<dev-python/arrow-1[${PYTHON_USEDEP}]
-	<dev-python/bottle-0.13[${PYTHON_USEDEP}]
-	>=dev-python/click-5[${PYTHON_USEDEP}]
-	<dev-python/click-6[${PYTHON_USEDEP}]
-	dev-python/colorama[${PYTHON_USEDEP}]
-	<dev-python/lockfile-0.13[${PYTHON_USEDEP}]
-	>=dev-python/lockfile-0.9.1[${PYTHON_USEDEP}]
-	>=dev-python/pyserial-3[${PYTHON_USEDEP}]
-	<dev-python/pyserial-4[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.4[${PYTHON_USEDEP}]
-	<dev-python/requests-3[${PYTHON_USEDEP}]
-	>=dev-python/semantic_version-2.5.0[${PYTHON_USEDEP}]"
diff --git a/dev-embedded/ponyprog-2.07c-r2 b/dev-embedded/ponyprog-2.07c-r2
new file mode 100644
index 000000000000..4cf193f8d6ce
--- /dev/null
+++ b/dev-embedded/ponyprog-2.07c-r2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare
+DEPEND=x11-libs/libXaw x11-libs/libXmu x11-libs/libXt x11-libs/libXext x11-libs/libX11 x11-misc/xdg-utils virtual/imagemagick-tools
+DESCRIPTION=Serial device programmer
+EAPI=5
+HOMEPAGE=http://www.lancos.com/ppwin95.html
+KEYWORDS=amd64 x86
+LICENSE=LGPL-2
+RDEPEND=x11-libs/libXaw x11-libs/libXmu x11-libs/libXt x11-libs/libXext x11-libs/libX11 x11-misc/xdg-utils
+SLOT=0
+SRC_URI=mirror://sourceforge/ponyprog/Pony_Prog2000-2.07c.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=cb5288f8c43b953a072f98c14169d410
diff --git a/dev-embedded/ponyprog-3.0.0 b/dev-embedded/ponyprog-3.0.0
new file mode 100644
index 000000000000..82c11c274760
--- /dev/null
+++ b/dev-embedded/ponyprog-3.0.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=>=app-editors/qhexedit2-0.8.4_p20170719 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtprintsupport:5 sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=EEPROM and microcontroller programmer/flasher
+EAPI=6
+HOMEPAGE=https://github.com/lancos/ponyprog/
+IUSE=doc
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2
+RDEPEND=>=app-editors/qhexedit2-0.8.4_p20170719 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtprintsupport:5
+SLOT=0
+SRC_URI=https://github.com/lancos/ponyprog/archive/v3.0.0.tar.gz -> ponyprog-3.0.0.tar.gz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=3a8b30747e74bfcec0c5c7caf1226dc4
diff --git a/dev-embedded/ponyprog/Manifest b/dev-embedded/ponyprog/Manifest
deleted file mode 100644
index a231d25e9103..000000000000
--- a/dev-embedded/ponyprog/Manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-AUX ponyprog-2.07a-gcc43.patch 1428 BLAKE2B f650dba7b48c04bdd04b2fd6e39b75b081e4536c2bc21a22a41bd206a8dccb81ec10935df8fc9c7c7ec8ffc61c1258ab946f54bf507ba09d02484e9b21ade11c SHA512 8b14e521a333b22e52d55002b8c951a244d6c7703a05a98b02eebd11960937dd23c7a2084d067338c7b5def568d087ade8c49dffa52e1eaf1e692af910e875b3
-AUX ponyprog-2.07c-build.patch 1156 BLAKE2B 0ca295511ad34fa90f10a5a652d0c298b2d53909d8aa9759a0e419f0d98339864518704d1162f68567a74eb40744fcd2b6dcf5b52add36ebf31b529e665163c4 SHA512 4ecc4d2f96c43f76cebb8cad748e22188f27a47d3e7e91cbe0be5b704b3af0d2feba881c0c155538662de611a8f84bd9a3e10fae2d470c95b14e34d885b0d827
-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
-DIST Pony_Prog2000-2.07c.tar.gz 653300 BLAKE2B 7b20450dfefb4370fb813b5532e6ba504b6ac8e598a2e46615ba522537e91b7798f6f86fbf93320fc71be5fe756ceef3351304196da191f7e68670f75ab5f865 SHA512 33cd14fa8283ce8af8265a48df7d960c7c2779551d0f204f6728a9e1e54204f52ea608c4e6090dc56f7634a02abd9bb960230f75a3a9716b1639708a57c31809
-DIST ponyprog-3.0.0.tar.gz 933166 BLAKE2B 46eb0a720c91ed187ef06907b28d8b84ecbe4c62a92cabf2b9ff58c553e3f8afc949e523d6b97af0cbf168c545b71e0395e02e5c182714a76bbacce645a1d890 SHA512 a1779b28e03f824fb242d6eb063f0e038af26602c26d5392884f69cbbccac8a934660dffa9bec7489aeb2656e35f21e2b097fc6fe011f278046894e180023881
-EBUILD ponyprog-2.07c-r2.ebuild 1524 BLAKE2B a24728569c6f90893d93402e699f80f268aa6f8e7d600de54abcb8cd9d46d3c0bf35117d6a82ea68410fc44487b6e6af5e015f72ba8d32ce9a562d094c989165 SHA512 c58116fa5bacc879f7c824bcdd7f80fc5e7b65ba17a8b45073019ef1f31665bb5b2c6536e4408b7f4570fd4c976c2d5dc7fff31ddf11407ee809ec42ff00759d
-EBUILD ponyprog-3.0.0.ebuild 1073 BLAKE2B bfc27e35898d2053bebdd10c4f09c8df61086865c5f2ea412f25b67ae79b292f84164c86892b004a836b74220b7c2a8c133640b06d2e7aefafeb2a6f34587da0 SHA512 5503142132170aa275bd01aab58c35ef892fa6273cd17efe10c903822d449b5b4f3bc77b469b9fd9b1dbd8e0f8a7000a6b6898737d8253fafce36d8506395f58
-MISC metadata.xml 604 BLAKE2B 070a4a2a0b589466a3530019907d21977d8a423e282ea5785adcc2e98df8a299abea389b76bea198aa7fce6529a31525c4737ce4a081f1d184b5c1fb75aa6c5c SHA512 7fe6468938afd15aa29928099c3d5170af70ed0d9531d420bf55d15406d9e9eedf32a5b0afb6486e10caa6cc338683efee2cbfd29a4f97c22ae9ea687beedb20
diff --git a/dev-embedded/ponyprog/files/ponyprog-2.07a-gcc43.patch b/dev-embedded/ponyprog/files/ponyprog-2.07a-gcc43.patch
deleted file mode 100644
index f93da01d646c..000000000000
--- a/dev-embedded/ponyprog/files/ponyprog-2.07a-gcc43.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-http://bugs.gentoo.org/227503
-
---- a/v/includex/v/vpsdc.h
-+++ b/v/includex/v/vpsdc.h
-@@ -14,7 +14,9 @@
- 
- #include <v/vdc.h>
- #include <v/vprinter.h>
--#include <fstream.h>
-+#include <fstream>
-+
-+using namespace std;
- 
-     class vPostScriptDC : public vDC
-       {
---- a/v/includex/v/vpsprntr.h
-+++ b/v/includex/v/vpsprntr.h
-@@ -14,7 +14,7 @@
- 
- #include <v/v_defs.h>
- #include <v/vmodald.h>
--#include <fstream.h>
-+#include <fstream>
- 
- #define vPaperLetter 0
- #define vPaperLegal 1
-@@ -31,6 +31,8 @@
- #define vPaperQuarto 12
- #define vPaper10x14 13
- 
-+using namespace std;
-+
- #define vPaperDefault vPaperLetter		// Index to default paper
- 
-     class vPSPrinter : public vModalDialog
---- a/v/srcx/vpsprntr.cxx
-+++ b/v/srcx/vpsprntr.cxx
-@@ -103,7 +103,7 @@ static unsigned char prompt_bits[] = {
-     _height = PaperHeights[_paperType];
-     _portrait = 1;
-     _useColor = 0;
--    _pstream = 0;
-+    vPSPrinter::_pstream = 0;
- 
-     ++_instances;		// bump reference counter
-   }
---- a/rs232int.cpp
-+++ b/rs232int.cpp
-@@ -145,7 +145,7 @@ int RS232Interface::OpenSerial(int no)
- 		snprintf(lockname, MAXPATH, LOCK_DIR "/LCK..ttyS%d", no);
- 		UserDebug1(UserApp2, "RS232Interface::OpenSerial() now lock the device %s\n", lockname);
- 
--		fd = open ((const char *)lockname,O_RDWR|O_EXCL|O_CREAT);
-+		fd = open ((const char *)lockname,O_RDWR|O_EXCL|O_CREAT,0664);
- 		if (fd < 0)
- 		{
- 			fd = open ((const char *)lockname,O_RDONLY);
diff --git a/dev-embedded/ponyprog/files/ponyprog-2.07c-build.patch b/dev-embedded/ponyprog/files/ponyprog-2.07c-build.patch
deleted file mode 100644
index cc29d2f1060e..000000000000
--- a/dev-embedded/ponyprog/files/ponyprog-2.07c-build.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-Fix parallel make and respect CC, CXX and LDFLAGS
-
-http://bugs.gentoo.org/282244
-http://bugs.gentoo.org/317767
-
---- Makefile
-+++ Makefile
-@@ -331,8 +331,8 @@
- 
- prps:	$(PRPS)
- 
--$(PROG):	$(OBJS)
--	$(CXX) -o $@ $(OBJS) $(LDFLAGS)
-+$(PROG):	$(OBJS) vlib
-+	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(LIBDIR) $(LIBS)
- 
- %.o: %.cpp
- 	$(CXX) $(CFLAGS) -c $< -o $@
---- v/Config.mk
-+++ v/Config.mk
-@@ -40,8 +40,6 @@
- #---------------------------------------------------------------------
- #CC	=	gcc
- #CXX	=	g++
--CC	=	gcc-3.4
--CXX	=	g++-3.4
- 
- #---------------------------------------------------------------------
- # VPATH for dependencies on header files
-@@ -302,5 +300,3 @@
- #---------------------------------------------------------------------
- # LINK/LOAD options
- #---------------------------------------------------------------------
--LDFLAGS	=	$(LIBDIR) $(LIBS)
--
---- v/srcx/Makefile
-+++ v/srcx/Makefile
-@@ -142,7 +142,6 @@
- 	vprogrsc.h vsliderc.h vtextinc.h vlistc.h vcomboc.h vtextc.h \
- 	vcolor.h vpen.h vclabelc.h vspinc.h
- 
--	cd iconed ; $(MAKE) ARCH=$@ ; cd ..
- 
- 
- #xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
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/metadata.xml b/dev-embedded/ponyprog/metadata.xml
deleted file mode 100644
index 844c5157aa11..000000000000
--- a/dev-embedded/ponyprog/metadata.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>embedded@gentoo.org</email>
-		<name>Embedded Gentoo</name>
-	</maintainer>
-	<maintainer type="person">
-		<email>coyote@bks.tv</email>
-		<name>Victor Kustov</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">lancos/ponyprog</remote-id>
-		<remote-id type="sourceforge">ponyprog</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-embedded/ponyprog/ponyprog-2.07c-r2.ebuild b/dev-embedded/ponyprog/ponyprog-2.07c-r2.ebuild
deleted file mode 100644
index f24977b23f45..000000000000
--- a/dev-embedded/ponyprog/ponyprog-2.07c-r2.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Serial device programmer"
-HOMEPAGE="http://www.lancos.com/ppwin95.html"
-SRC_URI="mirror://sourceforge/${PN}/Pony_Prog2000-${PV}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="x11-libs/libXaw
-	x11-libs/libXmu
-	x11-libs/libXt
-	x11-libs/libXext
-	x11-libs/libX11
-	x11-misc/xdg-utils"
-DEPEND="${RDEPEND}
-	virtual/imagemagick-tools"
-
-S="${WORKDIR}/PonyProg2000-${PV}"
-
-src_prepare() {
-	sed -i -e '/CFLAGS/s:-O2::' v/Config.mk || die
-	sed -i -e '/include.*<asm\/io.h>/s:asm:sys:' *.cpp || die
-	sed -i -e 's/netscape/xdg-open/' e2cmdw.cpp || die
-
-	convert ponyprog.ico ponyprog.png
-
-	epatch \
-		"${FILESDIR}/${PN}-2.07a-gcc43.patch" \
-		"${FILESDIR}/${PN}-2.07c-build.patch"
-	epatch_user
-}
-
-src_compile() {
-	tc-export CC CXX
-	# most of build is C++, but it uses CFLAGS
-	CFLAGS="${CXXFLAGS}" emake HOMEV="${S}/v"
-}
-
-src_install() {
-	dobin bin/ponyprog2000
-	keepdir /var/lock/uucp
-	fowners uucp:uucp /var/lock/uucp
-	fperms 755 /var/lock/uucp
-	doicon ponyprog.png
-	make_desktop_entry ponyprog2000 PonyProg2000 ponyprog
-}
-
-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.0.0.ebuild b/dev-embedded/ponyprog/ponyprog-3.0.0.ebuild
deleted file mode 100644
index 4c7bfaeb8f8c..000000000000
--- a/dev-embedded/ponyprog/ponyprog-3.0.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# 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/powersoftplus-libftdi-0.1.8-r1 b/dev-embedded/powersoftplus-libftdi-0.1.8-r1
new file mode 100644
index 000000000000..8cc532f1017b
--- /dev/null
+++ b/dev-embedded/powersoftplus-libftdi-0.1.8-r1
@@ -0,0 +1,10 @@
+DEFINED_PHASES=compile install
+DESCRIPTION=Library which includes a table of VIDs and PIDs of Ever UPS devices
+EAPI=4
+HOMEPAGE=http://www.ever.com.pl
+KEYWORDS=~x86
+LICENSE=LGPL-2
+SLOT=0
+SRC_URI=http://www.ever.com.pl/pl/pliki/powersoftplus-0.1.8-x86.tar.gz
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=8dee68454a15cff2aeb90078c01afea0
diff --git a/dev-embedded/powersoftplus-libftdi/Manifest b/dev-embedded/powersoftplus-libftdi/Manifest
deleted file mode 100644
index 268187abd6fa..000000000000
--- a/dev-embedded/powersoftplus-libftdi/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST powersoftplus-0.1.8-x86.tar.gz 4746235 BLAKE2B 3ae26bbb1dc924bf88ef9cf65953ce16ee3db1d4b4e4c15ec7c352dfedd37485402a201f0e6bea8909344f1f87a8aca728d8d62827ce2578c8b158157acd7c72 SHA512 13d499bcad3044ec50502026f5d61b11693c9ff5996978ff3101a705b71569749961f82855b9179d9da89a8e51c745ca5cf308ae6dbbd21242dd1d480323ba0b
-EBUILD powersoftplus-libftdi-0.1.8-r1.ebuild 749 BLAKE2B e5291443abd4e26e2238286151702124caa47d9a26ced05f62b05b45389c8c6f5700b9ee895a9e44dff4c00870181b9b881a4a79493e32efe34944a631253834 SHA512 c243682187eed94fa541cc2cebcc2b42d10cbc8d0fbc405f604a3435ab778c84d14af69b6c47e44c3cc14a72dba3de40bfa37c76ea12e74ac04a82c64a85a99d
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-embedded/powersoftplus-libftdi/metadata.xml b/dev-embedded/powersoftplus-libftdi/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/dev-embedded/powersoftplus-libftdi/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/dev-embedded/powersoftplus-libftdi/powersoftplus-libftdi-0.1.8-r1.ebuild b/dev-embedded/powersoftplus-libftdi/powersoftplus-libftdi-0.1.8-r1.ebuild
deleted file mode 100644
index 13da6435290b..000000000000
--- a/dev-embedded/powersoftplus-libftdi/powersoftplus-libftdi-0.1.8-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit multilib toolchain-funcs
-
-MY_PN="${PN/-libftdi/}"
-MY_P="${MY_PN}-${PV}"
-
-TABFILE="libd2xx_table.so"
-TABFILEDIR="libftdi/lib_table"
-
-DESCRIPTION="Library which includes a table of VIDs and PIDs of Ever UPS devices"
-HOMEPAGE="http://www.ever.com.pl"
-SRC_URI="http://www.ever.com.pl/pl/pliki/${MY_P}-x86.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_compile() {
-	cd "${TABFILEDIR}"
-
-	# Wipe out precompiled binary
-	emake clean
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
-}
-
-src_install() {
-	ftditabfile="${TABFILEDIR}/${TABFILE}"
-	dolib.so ${ftditabfile}
-}
diff --git a/dev-embedded/scratchbox-1.0.19 b/dev-embedded/scratchbox-1.0.19
new file mode 100644
index 000000000000..926d781a2c61
--- /dev/null
+++ b/dev-embedded/scratchbox-1.0.19
@@ -0,0 +1,11 @@
+DEFINED_PHASES=config install postinst postrm preinst
+DESCRIPTION=A cross-compilation toolkit for embedded Linux application development
+EAPI=0
+HOMEPAGE=http://www.scratchbox.org/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RESTRICT=strip
+SLOT=0
+SRC_URI=http://scratchbox.org/download/files/sbox-releases/hathor/tarball/scratchbox-core-1.0.19-i386.tar.gz http://scratchbox.org/download/files/sbox-releases/hathor/tarball/scratchbox-libs-1.0.19-i386.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=6ed615360526507efd45cb7f1f8c6728
diff --git a/dev-embedded/scratchbox-1.0.20 b/dev-embedded/scratchbox-1.0.20
new file mode 100644
index 000000000000..92975ea29ef4
--- /dev/null
+++ b/dev-embedded/scratchbox-1.0.20
@@ -0,0 +1,11 @@
+DEFINED_PHASES=config install postinst postrm preinst
+DESCRIPTION=A cross-compilation toolkit for embedded Linux application development
+EAPI=0
+HOMEPAGE=http://www.scratchbox.org/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RESTRICT=strip
+SLOT=0
+SRC_URI=http://scratchbox.org/download/files/sbox-releases/hathor/tarball/scratchbox-core-1.0.20-i386.tar.gz http://scratchbox.org/download/files/sbox-releases/hathor/tarball/scratchbox-libs-1.0.20-i386.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=6ed615360526507efd45cb7f1f8c6728
diff --git a/dev-embedded/scratchbox-devkit-apt-https-1.0.10 b/dev-embedded/scratchbox-devkit-apt-https-1.0.10
new file mode 100644
index 000000000000..cc66cd8e513b
--- /dev/null
+++ b/dev-embedded/scratchbox-devkit-apt-https-1.0.10
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install
+DESCRIPTION=A cross-compilation toolkit for embedded Linux application development
+EAPI=0
+HOMEPAGE=http://www.scratchbox.org/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND==dev-embedded/scratchbox-1.0*
+RESTRICT=strip
+SLOT=0
+SRC_URI=http://scratchbox.org/download/files/sbox-releases/stable/tarball/scratchbox-devkit-apt-https-1.0.10-i386.tar.gz
+_md5_=b7c5a6cf8314d382933d0b1b358ed23a
diff --git a/dev-embedded/scratchbox-devkit-apt-https-1.0.11 b/dev-embedded/scratchbox-devkit-apt-https-1.0.11
new file mode 100644
index 000000000000..aa08a1347337
--- /dev/null
+++ b/dev-embedded/scratchbox-devkit-apt-https-1.0.11
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install
+DESCRIPTION=A cross-compilation toolkit for embedded Linux application development
+EAPI=0
+HOMEPAGE=http://www.scratchbox.org/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND==dev-embedded/scratchbox-1.0*
+RESTRICT=strip
+SLOT=0
+SRC_URI=http://scratchbox.org/download/files/sbox-releases/hathor/tarball/scratchbox-devkit-apt-https-1.0.11-i386.tar.gz
+_md5_=e67274bc1d921edaae4d31ad922063c6
diff --git a/dev-embedded/scratchbox-devkit-apt-https/Manifest b/dev-embedded/scratchbox-devkit-apt-https/Manifest
deleted file mode 100644
index 7717a6bcbb65..000000000000
--- a/dev-embedded/scratchbox-devkit-apt-https/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST scratchbox-devkit-apt-https-1.0.10-i386.tar.gz 2991367 BLAKE2B 88a9e24f2bdef094ef97d8f7e5b309eb10752c8660a6195a20356f3b78233c24017f180cd2bd5a666d1dd995ea929d89e4941cf0a486e95bf972a6bae5f98e97 SHA512 fc5a499e34828136ce72f806540708c6de25ea11ab64c245609785117eabb7df5f845e5371cc5f0c480b3396a15382519aef88663e218120e7e0f924b841de53
-DIST scratchbox-devkit-apt-https-1.0.11-i386.tar.gz 2991247 BLAKE2B 9fef4f9290f32c8c228ef126a6cd3340e8abae75970255a53b72cc07d7fa5f4fa8eb691f2b31b70bd920927947c7d6e194c2de11863d43dda301a64f78f90644 SHA512 d60b530a74a68798160bef4fbbc76f747c68f5cc8b0ba9244c847f9f3d93c816de6ce4ec8892353659bdf4fbe8d53d271a096b5884fd1b69ef68d2dc24fb4374
-EBUILD scratchbox-devkit-apt-https-1.0.10.ebuild 700 BLAKE2B 40730a91dcd5c5d2a4c651d6d4c197c55bf700740beba02f38ef0f1bbfac2fdc5097791707eb9054b2c0c6feae90417d3ded1c42a205ec00bffa4d1c5f191097 SHA512 c8a2d3fdd6d309711088919bd95e08b7b023219cd0cd926fa80215e14451c9ff36ad6bcecb7ac16b3200d18e77fb2878e0ce96640138a3ad540c49dce2e3c1f6
-EBUILD scratchbox-devkit-apt-https-1.0.11.ebuild 700 BLAKE2B 20c68115e3fa13b9e83a42622b1af97f8a2d6cb871a574b78731198bbbef08b7845e129fcb9e6a1b5cf7d55c0f6eb18ecd16f3d71eb00653d7d7f8cbfcb37ff2 SHA512 5e1a7b14fd271eb6ba41ce6cbbde87feced214b041b77d31a6783030139ab382af2bb60ca462a1f1fa351dc0c80affe0a148adfbae3c30426319f0dc9a346753
-MISC metadata.xml 247 BLAKE2B e46b8f2d053251af5cb591bb2ee5e35089c4e8174ee2e7a3c504db23f844b65083d4a3e5198da3977ad3e98b67cab2e0de686a3c62009b487c1e64785a8ff65d SHA512 15df289e0f962f564551f61ada3cfef0311f6af639887def780bf5ad3be105515c8d24c950ff340ed35d89b9cd994af3540322b684c5dec3b43ec6bb0041aa4e
diff --git a/dev-embedded/scratchbox-devkit-apt-https/metadata.xml b/dev-embedded/scratchbox-devkit-apt-https/metadata.xml
deleted file mode 100644
index 71b1461e1146..000000000000
--- a/dev-embedded/scratchbox-devkit-apt-https/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>embedded@gentoo.org</email>
-	<name>Embedded Gentoo</name>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-embedded/scratchbox-devkit-apt-https/scratchbox-devkit-apt-https-1.0.10.ebuild b/dev-embedded/scratchbox-devkit-apt-https/scratchbox-devkit-apt-https-1.0.10.ebuild
deleted file mode 100644
index e6e8abc0847b..000000000000
--- a/dev-embedded/scratchbox-devkit-apt-https/scratchbox-devkit-apt-https-1.0.10.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-SBOX_GROUP="sbox"
-
-DESCRIPTION="A cross-compilation toolkit for embedded Linux application development"
-HOMEPAGE="http://www.scratchbox.org/"
-SRC_URI="http://scratchbox.org/download/files/sbox-releases/stable/tarball/${P}-i386.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-# Stripping BREAKS scratchbox, it runs in a chroot and is pre-stripped when needed (bug #296294)
-RESTRICT="strip"
-
-RDEPEND="=dev-embedded/scratchbox-1.0*"
-DEPEND=""
-
-TARGET_DIR="/opt/scratchbox"
-
-S=${WORKDIR}/scratchbox
-
-src_install() {
-	dodir ${TARGET_DIR}
-	cp -pRP * "${D}/${TARGET_DIR}"
-}
diff --git a/dev-embedded/scratchbox-devkit-apt-https/scratchbox-devkit-apt-https-1.0.11.ebuild b/dev-embedded/scratchbox-devkit-apt-https/scratchbox-devkit-apt-https-1.0.11.ebuild
deleted file mode 100644
index 33d2d0caa82f..000000000000
--- a/dev-embedded/scratchbox-devkit-apt-https/scratchbox-devkit-apt-https-1.0.11.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-SBOX_GROUP="sbox"
-
-DESCRIPTION="A cross-compilation toolkit for embedded Linux application development"
-HOMEPAGE="http://www.scratchbox.org/"
-SRC_URI="http://scratchbox.org/download/files/sbox-releases/hathor/tarball/${P}-i386.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-# Stripping BREAKS scratchbox, it runs in a chroot and is pre-stripped when needed (bug #296294)
-RESTRICT="strip"
-
-RDEPEND="=dev-embedded/scratchbox-1.0*"
-DEPEND=""
-
-TARGET_DIR="/opt/scratchbox"
-
-S=${WORKDIR}/scratchbox
-
-src_install() {
-	dodir ${TARGET_DIR}
-	cp -pRP * "${D}/${TARGET_DIR}"
-}
diff --git a/dev-embedded/scratchbox-devkit-cputransp-1.0.7 b/dev-embedded/scratchbox-devkit-cputransp-1.0.7
new file mode 100644
index 000000000000..59756f75c65d
--- /dev/null
+++ b/dev-embedded/scratchbox-devkit-cputransp-1.0.7
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install
+DESCRIPTION=A cross-compilation toolkit for embedded Linux application development
+EAPI=0
+HOMEPAGE=http://www.scratchbox.org/
+KEYWORDS=~x86
+LICENSE=GPL-2
+RESTRICT=strip
+SLOT=0
+SRC_URI=http://scratchbox.org/download/files/sbox-releases/stable/tarball/scratchbox-devkit-cputransp-1.0.7-i386.tar.gz
+_md5_=5683ea40d73a77ed3b9341f91bdcf320
diff --git a/dev-embedded/scratchbox-devkit-cputransp-1.0.9 b/dev-embedded/scratchbox-devkit-cputransp-1.0.9
new file mode 100644
index 000000000000..4df3caad9774
--- /dev/null
+++ b/dev-embedded/scratchbox-devkit-cputransp-1.0.9
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install
+DESCRIPTION=A cross-compilation toolkit for embedded Linux application development
+EAPI=0
+HOMEPAGE=http://www.scratchbox.org/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RESTRICT=strip
+SLOT=0
+SRC_URI=http://scratchbox.org/download/files/sbox-releases/stable/tarball/scratchbox-devkit-cputransp-1.0.9-i386.tar.gz
+_md5_=b13d1abaf2db3d2d8989ea74aac6f463
diff --git a/dev-embedded/scratchbox-devkit-cputransp/Manifest b/dev-embedded/scratchbox-devkit-cputransp/Manifest
deleted file mode 100644
index 0ac7f39c40d7..000000000000
--- a/dev-embedded/scratchbox-devkit-cputransp/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST scratchbox-devkit-cputransp-1.0.7-i386.tar.gz 23559307 BLAKE2B 47d0092ab07b7a66c05fbfa523691a1fd0f0fa19a765a866c5e93330e154e850e2cd8b57b74839c062861b2e5878ecadd242af5917ae511ab19e32fe550f9a9b SHA512 555d088d0f0fff1e272b8111931c345d99ae233b8ac5cb7e7f4b5e99b68c69cb983f1a926a36f017c434b311621b84c5a6dcba58e95c190fc5e403ea930eddb4
-DIST scratchbox-devkit-cputransp-1.0.9-i386.tar.gz 23595294 BLAKE2B 0734bc7007cb31c7c029102bfb975e4e374ffaf6dc4827bfe3595c1ca9a48fbdcdc5bba242b84fdfe52cabe7c7d4fa591bb385b0272bd6bcae8cd902ce17452a SHA512 b3c17a62c57fefd63e402c460965f71525c3319d8cf2da93e44db9bac1ca276b9e95b2424955825933665e3f67e7ffd2cb03ee809e836a410fb401582febada0
-EBUILD scratchbox-devkit-cputransp-1.0.7.ebuild 694 BLAKE2B bdbb897763e63f3975233160debab47dbd093567ec7f1c6704c36dc2e810d2f3a64e13143cf209f63493e47950a727eb39663548d249cdbd3cb02ad23f9afa0e SHA512 b50c9d8eb2ca1435025fa38fda7b72704f91d2693b2d1fd57e9be3c52bdfcf9fa196eaafee4107f638a40f3904b6e5be07b1e9350c9072aa3bfc7aee4f7df3d6
-EBUILD scratchbox-devkit-cputransp-1.0.9.ebuild 701 BLAKE2B 713436a1b25fde8e24e0df98e841d542e153547551dde0b1c392fc8c239adfe56b9f310e81a79f02649db7e80b0010a56aff35aeabb81dde8000cc672e080d7c SHA512 d8b3f2e8d43bb73710828ce70a5b50710fe610e63a12a3189eae922bcff3663a82e04f01c612d8d708390ebaa1f04f7b3ccb88b190f094c3b7fa6cebe8091499
-MISC metadata.xml 247 BLAKE2B e46b8f2d053251af5cb591bb2ee5e35089c4e8174ee2e7a3c504db23f844b65083d4a3e5198da3977ad3e98b67cab2e0de686a3c62009b487c1e64785a8ff65d SHA512 15df289e0f962f564551f61ada3cfef0311f6af639887def780bf5ad3be105515c8d24c950ff340ed35d89b9cd994af3540322b684c5dec3b43ec6bb0041aa4e
diff --git a/dev-embedded/scratchbox-devkit-cputransp/metadata.xml b/dev-embedded/scratchbox-devkit-cputransp/metadata.xml
deleted file mode 100644
index 71b1461e1146..000000000000
--- a/dev-embedded/scratchbox-devkit-cputransp/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>embedded@gentoo.org</email>
-	<name>Embedded Gentoo</name>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-embedded/scratchbox-devkit-cputransp/scratchbox-devkit-cputransp-1.0.7.ebuild b/dev-embedded/scratchbox-devkit-cputransp/scratchbox-devkit-cputransp-1.0.7.ebuild
deleted file mode 100644
index 4dbb60e32247..000000000000
--- a/dev-embedded/scratchbox-devkit-cputransp/scratchbox-devkit-cputransp-1.0.7.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-SBOX_GROUP="sbox"
-
-DESCRIPTION="A cross-compilation toolkit for embedded Linux application development"
-HOMEPAGE="http://www.scratchbox.org/"
-SRC_URI="http://scratchbox.org/download/files/sbox-releases/stable/tarball/${P}-i386.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-
-# Stripping BREAKS scratchbox, it runs in a chroot and is pre-stripped when needed (bug #296294)
-RESTRICT="strip"
-
-RDEPEND="=dev-embedded/scratchbox-1.0*"
-RDEPEND=""
-
-TARGET_DIR="/opt/scratchbox"
-
-S=${WORKDIR}/scratchbox
-
-src_install() {
-	dodir ${TARGET_DIR}
-	cp -pRP * "${D}/${TARGET_DIR}"
-}
diff --git a/dev-embedded/scratchbox-devkit-cputransp/scratchbox-devkit-cputransp-1.0.9.ebuild b/dev-embedded/scratchbox-devkit-cputransp/scratchbox-devkit-cputransp-1.0.9.ebuild
deleted file mode 100644
index f42edff2fe89..000000000000
--- a/dev-embedded/scratchbox-devkit-cputransp/scratchbox-devkit-cputransp-1.0.9.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-SBOX_GROUP="sbox"
-
-DESCRIPTION="A cross-compilation toolkit for embedded Linux application development"
-HOMEPAGE="http://www.scratchbox.org/"
-SRC_URI="http://scratchbox.org/download/files/sbox-releases/stable/tarball/${P}-i386.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-# Stripping BREAKS scratchbox, it runs in a chroot and is pre-stripped when needed (bug #296294)
-RESTRICT="strip"
-
-RDEPEND="=dev-embedded/scratchbox-1.0*"
-RDEPEND=""
-
-TARGET_DIR="/opt/scratchbox"
-
-S=${WORKDIR}/scratchbox
-
-src_install() {
-	dodir ${TARGET_DIR}
-	cp -pRP * "${D}/${TARGET_DIR}"
-}
diff --git a/dev-embedded/scratchbox-devkit-debian-1.0.10 b/dev-embedded/scratchbox-devkit-debian-1.0.10
new file mode 100644
index 000000000000..dbd64f2c2fce
--- /dev/null
+++ b/dev-embedded/scratchbox-devkit-debian-1.0.10
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install
+DESCRIPTION=A cross-compilation toolkit for embedded Linux application development
+EAPI=0
+HOMEPAGE=http://www.scratchbox.org/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND==dev-embedded/scratchbox-1.0*
+RESTRICT=strip
+SLOT=0
+SRC_URI=http://scratchbox.org/download/files/sbox-releases/stable/tarball/scratchbox-devkit-debian-1.0.10-i386.tar.gz
+_md5_=c2ef0662f12685ca996fc7cb22a4ad85
diff --git a/dev-embedded/scratchbox-devkit-debian-1.0.11 b/dev-embedded/scratchbox-devkit-debian-1.0.11
new file mode 100644
index 000000000000..b4bd82969a8b
--- /dev/null
+++ b/dev-embedded/scratchbox-devkit-debian-1.0.11
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install
+DESCRIPTION=A cross-compilation toolkit for embedded Linux application development
+EAPI=0
+HOMEPAGE=http://www.scratchbox.org/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND==dev-embedded/scratchbox-1.0*
+RESTRICT=strip
+SLOT=0
+SRC_URI=http://scratchbox.org/download/files/sbox-releases/hathor/tarball/scratchbox-devkit-debian-1.0.11-i386.tar.gz
+_md5_=d77fb8c80d849e43828f3c22749be240
diff --git a/dev-embedded/scratchbox-devkit-debian-squeeze-1.0.4 b/dev-embedded/scratchbox-devkit-debian-squeeze-1.0.4
new file mode 100644
index 000000000000..dd23dc100b7e
--- /dev/null
+++ b/dev-embedded/scratchbox-devkit-debian-squeeze-1.0.4
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install
+DESCRIPTION=A cross-compilation toolkit for embedded Linux application development
+EAPI=0
+HOMEPAGE=http://www.scratchbox.org/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND==dev-embedded/scratchbox-1.0*
+RESTRICT=strip
+SLOT=0
+SRC_URI=http://scratchbox.org/download/files/sbox-releases/hathor/tarball/scratchbox-devkit-debian-squeeze-1.0.4-i386.tar.gz
+_md5_=6519e267c33dcb615e0fa97485f1ed09
diff --git a/dev-embedded/scratchbox-devkit-debian-squeeze-1.0.5 b/dev-embedded/scratchbox-devkit-debian-squeeze-1.0.5
new file mode 100644
index 000000000000..6dd5578c727c
--- /dev/null
+++ b/dev-embedded/scratchbox-devkit-debian-squeeze-1.0.5
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install
+DESCRIPTION=A cross-compilation toolkit for embedded Linux application development
+EAPI=0
+HOMEPAGE=http://www.scratchbox.org/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND==dev-embedded/scratchbox-1.0*
+RESTRICT=strip
+SLOT=0
+SRC_URI=http://scratchbox.org/download/files/sbox-releases/hathor/tarball/scratchbox-devkit-debian-squeeze-1.0.5-i386.tar.gz
+_md5_=6519e267c33dcb615e0fa97485f1ed09
diff --git a/dev-embedded/scratchbox-devkit-debian-squeeze/Manifest b/dev-embedded/scratchbox-devkit-debian-squeeze/Manifest
deleted file mode 100644
index 9e378c7fa895..000000000000
--- a/dev-embedded/scratchbox-devkit-debian-squeeze/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST scratchbox-devkit-debian-squeeze-1.0.4-i386.tar.gz 7806679 BLAKE2B 295fcd9c475574379dcdadd185b7e2ca04f5f7cdf32923765f469fd88b122e01778be9332611ec4985fea23b11677d10b096e6cebadaef10baaa47ec72befde3 SHA512 7a196f7978afb06af01253db7bb6804b3651fe5293c595424bd316988ca205e692cdec2caaafb2cdcffc6822c87eee4365d8074037068925ac1b4ac44803cacd
-DIST scratchbox-devkit-debian-squeeze-1.0.5-i386.tar.gz 7894742 BLAKE2B 84317cffa1718ef58636de1124faf73c0c212fd5c6f50005e632d67f293830b88427dd472e3fd7329801b33604ed299ba4fb679d69607d21ece6e3484f2a9890 SHA512 0fd461a6db791cf48e549db102f4725f9312bbb680c7ae2ba03e1bd1a5780c619681922b18f5e81d17fc32d66aba9ef4e45c1018d91e218262f4b9618f27f90a
-EBUILD scratchbox-devkit-debian-squeeze-1.0.4.ebuild 681 BLAKE2B 2990a95e7b90f476873db47279ca1ae3b135b1e194c8504d9b742c7cabad16222cd579ea6158a5f4edd7a9970890c950b4118fbc5fd00a862ec7bff70d47bca3 SHA512 62520145fbc8daa3361e3b8f630c50aa527fc1f4e6327f52a7594e5ef494058e8c7657965d3c0719e070a0b42d908a525e5e89f4012f30de0e1e101802be6d1a
-EBUILD scratchbox-devkit-debian-squeeze-1.0.5.ebuild 681 BLAKE2B 2990a95e7b90f476873db47279ca1ae3b135b1e194c8504d9b742c7cabad16222cd579ea6158a5f4edd7a9970890c950b4118fbc5fd00a862ec7bff70d47bca3 SHA512 62520145fbc8daa3361e3b8f630c50aa527fc1f4e6327f52a7594e5ef494058e8c7657965d3c0719e070a0b42d908a525e5e89f4012f30de0e1e101802be6d1a
-MISC metadata.xml 251 BLAKE2B 118fce129507949f74491c6959c5b8c07a9ba6f1d6a813984cb222435023426d9581131651816ad72f759e87f2bbf70e63ead86330d73ffef3bd60aca060e055 SHA512 b3e4656ceb318c1dc3f8150664734711c9af7b589d5afa1aafe4ef063fb73157e8946a0d845ba02c54d759057597f5c1543b2fdaa93457c91a83b3ea31aec372
diff --git a/dev-embedded/scratchbox-devkit-debian-squeeze/metadata.xml b/dev-embedded/scratchbox-devkit-debian-squeeze/metadata.xml
deleted file mode 100644
index e248196b07c4..000000000000
--- a/dev-embedded/scratchbox-devkit-debian-squeeze/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>embedded@gentoo.org</email>
-		<name>Embedded Gentoo</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/dev-embedded/scratchbox-devkit-debian-squeeze/scratchbox-devkit-debian-squeeze-1.0.4.ebuild b/dev-embedded/scratchbox-devkit-debian-squeeze/scratchbox-devkit-debian-squeeze-1.0.4.ebuild
deleted file mode 100644
index 92bea32a0535..000000000000
--- a/dev-embedded/scratchbox-devkit-debian-squeeze/scratchbox-devkit-debian-squeeze-1.0.4.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-DESCRIPTION="A cross-compilation toolkit for embedded Linux application development"
-HOMEPAGE="http://www.scratchbox.org/"
-SRC_URI="http://scratchbox.org/download/files/sbox-releases/hathor/tarball/${P}-i386.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-# Stripping BREAKS scratchbox, it runs in a chroot and is pre-stripped when needed (bug #296294)
-RESTRICT="strip"
-
-DEPEND=""
-RDEPEND="=dev-embedded/scratchbox-1.0*"
-
-TARGET_DIR="/opt/scratchbox"
-
-S=${WORKDIR}/scratchbox
-
-src_install() {
-	dodir ${TARGET_DIR}
-	cp -pRP * "${D}/${TARGET_DIR}"
-}
diff --git a/dev-embedded/scratchbox-devkit-debian-squeeze/scratchbox-devkit-debian-squeeze-1.0.5.ebuild b/dev-embedded/scratchbox-devkit-debian-squeeze/scratchbox-devkit-debian-squeeze-1.0.5.ebuild
deleted file mode 100644
index 92bea32a0535..000000000000
--- a/dev-embedded/scratchbox-devkit-debian-squeeze/scratchbox-devkit-debian-squeeze-1.0.5.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-DESCRIPTION="A cross-compilation toolkit for embedded Linux application development"
-HOMEPAGE="http://www.scratchbox.org/"
-SRC_URI="http://scratchbox.org/download/files/sbox-releases/hathor/tarball/${P}-i386.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-# Stripping BREAKS scratchbox, it runs in a chroot and is pre-stripped when needed (bug #296294)
-RESTRICT="strip"
-
-DEPEND=""
-RDEPEND="=dev-embedded/scratchbox-1.0*"
-
-TARGET_DIR="/opt/scratchbox"
-
-S=${WORKDIR}/scratchbox
-
-src_install() {
-	dodir ${TARGET_DIR}
-	cp -pRP * "${D}/${TARGET_DIR}"
-}
diff --git a/dev-embedded/scratchbox-devkit-debian/Manifest b/dev-embedded/scratchbox-devkit-debian/Manifest
deleted file mode 100644
index eba72bac0945..000000000000
--- a/dev-embedded/scratchbox-devkit-debian/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST scratchbox-devkit-debian-1.0.10-i386.tar.gz 9786244 BLAKE2B 9bdac44392d0aec3386a7b7161215fbcd1be5822de5fa7fe5aa1a14a2778f9f874ecac7618fb11a1df6d5866abf197c352c8fb08ed085db2395c7f1868cea8eb SHA512 bcfaec7c9dc21acf20b4d2da675aec3d68c7b7761ae93d4b9f3af7fe96374da54073645c18157d714811e8492427c5a63e5905479fcb84a6d849edce18b8ef06
-DIST scratchbox-devkit-debian-1.0.11-i386.tar.gz 7415809 BLAKE2B 162df2c6867cfa6c87098773232cb74062369d5427a43f55a52709fac64a100df529a3d0980fdc044088ffb9f9f468ade8d416ab2778655c2fae841e7de5d534 SHA512 39c724f115097ce42db0fcd6366f97cc1c0ea4a853345444398980c1a9963332df4782b384382a7e003003563adfad7f1c8dd18eecec0da6f6532ab0901eb46f
-EBUILD scratchbox-devkit-debian-1.0.10.ebuild 730 BLAKE2B 59e1e4c2c2a972905d39ace285cbb57bb22775a417f35a5905bc6a0e259a254e4bd1d37f048a8c1e876fb035b0342c70c1cbe3ce50a9b311b65a69bcee9da77d SHA512 899252fe422bb17b31856de4fcd4bfc05695f530ed9fb4ecc04256be4bf774d2695cc126464e8a8adf950cd4e3d878f078b032d0eb7399e9e09ef8f291b6ccfd
-EBUILD scratchbox-devkit-debian-1.0.11.ebuild 730 BLAKE2B 711e8a098261b71c6ddad323df0eacffd88eb03e06a5bba7c542d95feedaf8457472371173753fc31e32552a5ef6fa2d48e125fd01ac1445f1b5eef459d39082 SHA512 914e43280c00e097ee1f7a360594ff80f5628e3e92b4722ce5653d06c27f6261806ed98324f5b29f765cc429c3e0cbdd5e7b1d96337108e7a98b3f5e8ee3f27e
-MISC metadata.xml 247 BLAKE2B e46b8f2d053251af5cb591bb2ee5e35089c4e8174ee2e7a3c504db23f844b65083d4a3e5198da3977ad3e98b67cab2e0de686a3c62009b487c1e64785a8ff65d SHA512 15df289e0f962f564551f61ada3cfef0311f6af639887def780bf5ad3be105515c8d24c950ff340ed35d89b9cd994af3540322b684c5dec3b43ec6bb0041aa4e
diff --git a/dev-embedded/scratchbox-devkit-debian/metadata.xml b/dev-embedded/scratchbox-devkit-debian/metadata.xml
deleted file mode 100644
index 71b1461e1146..000000000000
--- a/dev-embedded/scratchbox-devkit-debian/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>embedded@gentoo.org</email>
-	<name>Embedded Gentoo</name>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-embedded/scratchbox-devkit-debian/scratchbox-devkit-debian-1.0.10.ebuild b/dev-embedded/scratchbox-devkit-debian/scratchbox-devkit-debian-1.0.10.ebuild
deleted file mode 100644
index df77e74be0d4..000000000000
--- a/dev-embedded/scratchbox-devkit-debian/scratchbox-devkit-debian-1.0.10.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-SBOX_GROUP="sbox"
-
-DESCRIPTION="A cross-compilation toolkit for embedded Linux application development"
-HOMEPAGE="http://www.scratchbox.org/"
-SRC_URI="http://scratchbox.org/download/files/sbox-releases/stable/tarball/${P}-i386.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-# Stripping BREAKS scratchbox, it runs in a chroot and is pre-stripped when needed (bug #296294)
-RESTRICT="strip"
-
-RDEPEND="=dev-embedded/scratchbox-1.0*"
-DEPEND=""
-
-TARGET_DIR="/opt/scratchbox"
-
-QA_TEXTRELS="opt/scratchbox"
-
-S=${WORKDIR}/scratchbox
-
-src_install() {
-	dodir ${TARGET_DIR}
-	cp -pRP * "${D}/${TARGET_DIR}"
-}
diff --git a/dev-embedded/scratchbox-devkit-debian/scratchbox-devkit-debian-1.0.11.ebuild b/dev-embedded/scratchbox-devkit-debian/scratchbox-devkit-debian-1.0.11.ebuild
deleted file mode 100644
index 3f2ca6264db4..000000000000
--- a/dev-embedded/scratchbox-devkit-debian/scratchbox-devkit-debian-1.0.11.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-SBOX_GROUP="sbox"
-
-DESCRIPTION="A cross-compilation toolkit for embedded Linux application development"
-HOMEPAGE="http://www.scratchbox.org/"
-SRC_URI="http://scratchbox.org/download/files/sbox-releases/hathor/tarball/${P}-i386.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-# Stripping BREAKS scratchbox, it runs in a chroot and is pre-stripped when needed (bug #296294)
-RESTRICT="strip"
-
-RDEPEND="=dev-embedded/scratchbox-1.0*"
-DEPEND=""
-
-TARGET_DIR="/opt/scratchbox"
-
-QA_TEXTRELS="opt/scratchbox"
-
-S=${WORKDIR}/scratchbox
-
-src_install() {
-	dodir ${TARGET_DIR}
-	cp -pRP * "${D}/${TARGET_DIR}"
-}
diff --git a/dev-embedded/scratchbox-devkit-doctools-1.0.13 b/dev-embedded/scratchbox-devkit-doctools-1.0.13
new file mode 100644
index 000000000000..55f9aec85b5d
--- /dev/null
+++ b/dev-embedded/scratchbox-devkit-doctools-1.0.13
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install
+DESCRIPTION=A cross-compilation toolkit for embedded Linux application development
+EAPI=0
+HOMEPAGE=http://www.scratchbox.org/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND==dev-embedded/scratchbox-1.0*
+RESTRICT=strip
+SLOT=0
+SRC_URI=http://scratchbox.org/download/files/sbox-releases/stable/tarball/scratchbox-devkit-doctools-1.0.13-i386.tar.gz
+_md5_=b7c5a6cf8314d382933d0b1b358ed23a
diff --git a/dev-embedded/scratchbox-devkit-doctools-1.0.14 b/dev-embedded/scratchbox-devkit-doctools-1.0.14
new file mode 100644
index 000000000000..db755649a75e
--- /dev/null
+++ b/dev-embedded/scratchbox-devkit-doctools-1.0.14
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install
+DESCRIPTION=A cross-compilation toolkit for embedded Linux application development
+EAPI=0
+HOMEPAGE=http://www.scratchbox.org/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND==dev-embedded/scratchbox-1.0*
+RESTRICT=strip
+SLOT=0
+SRC_URI=http://scratchbox.org/download/files/sbox-releases/hathor/tarball/scratchbox-devkit-doctools-1.0.14-i386.tar.gz
+_md5_=e67274bc1d921edaae4d31ad922063c6
diff --git a/dev-embedded/scratchbox-devkit-doctools-1.0.9 b/dev-embedded/scratchbox-devkit-doctools-1.0.9
new file mode 100644
index 000000000000..431c80c5a809
--- /dev/null
+++ b/dev-embedded/scratchbox-devkit-doctools-1.0.9
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install
+DESCRIPTION=A cross-compilation toolkit for embedded Linux application development
+EAPI=0
+HOMEPAGE=http://www.scratchbox.org/
+KEYWORDS=~x86
+LICENSE=GPL-2
+RDEPEND==dev-embedded/scratchbox-1.0*
+RESTRICT=strip
+SLOT=0
+SRC_URI=http://scratchbox.org/download/files/sbox-releases/stable/tarball/scratchbox-devkit-doctools-1.0.9-i386.tar.gz
+_md5_=8262c749fb5ebe181072e1def6bbd219
diff --git a/dev-embedded/scratchbox-devkit-doctools/Manifest b/dev-embedded/scratchbox-devkit-doctools/Manifest
deleted file mode 100644
index 87af0f7b0d94..000000000000
--- a/dev-embedded/scratchbox-devkit-doctools/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-DIST scratchbox-devkit-doctools-1.0.13-i386.tar.gz 138053226 BLAKE2B 1c4a611f02036fef1588535e774b53c4b155c9408ae1c6c8835b3051fe209a41511c688de21331e103fa2dcf956009cbe60fdb3c6991b04fde03d99a06c0ddfc SHA512 1f57c52f47a0e01b0866a5c3860e665d0de4c3e407d5e3d8f8dc0fd8c34bae69f432f8da2b7c9acc917af0b41e957c87a0e1d42a413e256e45c02c533089d1c6
-DIST scratchbox-devkit-doctools-1.0.14-i386.tar.gz 138045143 BLAKE2B ebc67930f91800a64c2b3859d5b5ca3faa86e64e6f636add2ea16278bcc05f45cdc1e99cd2a976592825d42b28c4c7cae7f2b1b1e9de96416c75a8e6bd465084 SHA512 95a4a5ae12d2044f928ff21fd2bc58320cb860e7762f22e47cbe4ed67fe4a183b08319459fb3c975b62bd1da3cd683580e474d514c1f3132db7bd6224249405a
-DIST scratchbox-devkit-doctools-1.0.9-i386.tar.gz 139460608 BLAKE2B 3ff27dc46e72f6659f98b2c09132dc0d289b34286fe1a278a719decdd17ffd06cd233cb987b866702dcb6c89cf01667b3032527cf4360176d82d6320e32bc4c3 SHA512 7b6d7dc2defd6541f9a4677bda4776b591ec53e59b143c6f695ef29c685047581d9bdf46eb61ee453207b276f3626ea46d2e4851b956068156f472d8ff3d45f2
-EBUILD scratchbox-devkit-doctools-1.0.13.ebuild 700 BLAKE2B 40730a91dcd5c5d2a4c651d6d4c197c55bf700740beba02f38ef0f1bbfac2fdc5097791707eb9054b2c0c6feae90417d3ded1c42a205ec00bffa4d1c5f191097 SHA512 c8a2d3fdd6d309711088919bd95e08b7b023219cd0cd926fa80215e14451c9ff36ad6bcecb7ac16b3200d18e77fb2878e0ce96640138a3ad540c49dce2e3c1f6
-EBUILD scratchbox-devkit-doctools-1.0.14.ebuild 700 BLAKE2B 20c68115e3fa13b9e83a42622b1af97f8a2d6cb871a574b78731198bbbef08b7845e129fcb9e6a1b5cf7d55c0f6eb18ecd16f3d71eb00653d7d7f8cbfcb37ff2 SHA512 5e1a7b14fd271eb6ba41ce6cbbde87feced214b041b77d31a6783030139ab382af2bb60ca462a1f1fa351dc0c80affe0a148adfbae3c30426319f0dc9a346753
-EBUILD scratchbox-devkit-doctools-1.0.9.ebuild 693 BLAKE2B 72e37aead322be91f9d01e5d855aa4b3a62edba571f7b7881fd1bb24b28eb81e7665ad323d0e0164d92b7f0d3829f2da0708af378eab67ea913e9167e9704b38 SHA512 7aeb369aab8a9a39fe7d5ebeb643d4f735cd4006e64198f3be20ae1b7e61159289e9363cf6d95161d5e344080c9d395e8cb6110ba3194cf06cdb8ae9b90d9608
-MISC metadata.xml 247 BLAKE2B e46b8f2d053251af5cb591bb2ee5e35089c4e8174ee2e7a3c504db23f844b65083d4a3e5198da3977ad3e98b67cab2e0de686a3c62009b487c1e64785a8ff65d SHA512 15df289e0f962f564551f61ada3cfef0311f6af639887def780bf5ad3be105515c8d24c950ff340ed35d89b9cd994af3540322b684c5dec3b43ec6bb0041aa4e
diff --git a/dev-embedded/scratchbox-devkit-doctools/metadata.xml b/dev-embedded/scratchbox-devkit-doctools/metadata.xml
deleted file mode 100644
index 71b1461e1146..000000000000
--- a/dev-embedded/scratchbox-devkit-doctools/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>embedded@gentoo.org</email>
-	<name>Embedded Gentoo</name>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-embedded/scratchbox-devkit-doctools/scratchbox-devkit-doctools-1.0.13.ebuild b/dev-embedded/scratchbox-devkit-doctools/scratchbox-devkit-doctools-1.0.13.ebuild
deleted file mode 100644
index e6e8abc0847b..000000000000
--- a/dev-embedded/scratchbox-devkit-doctools/scratchbox-devkit-doctools-1.0.13.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-SBOX_GROUP="sbox"
-
-DESCRIPTION="A cross-compilation toolkit for embedded Linux application development"
-HOMEPAGE="http://www.scratchbox.org/"
-SRC_URI="http://scratchbox.org/download/files/sbox-releases/stable/tarball/${P}-i386.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-# Stripping BREAKS scratchbox, it runs in a chroot and is pre-stripped when needed (bug #296294)
-RESTRICT="strip"
-
-RDEPEND="=dev-embedded/scratchbox-1.0*"
-DEPEND=""
-
-TARGET_DIR="/opt/scratchbox"
-
-S=${WORKDIR}/scratchbox
-
-src_install() {
-	dodir ${TARGET_DIR}
-	cp -pRP * "${D}/${TARGET_DIR}"
-}
diff --git a/dev-embedded/scratchbox-devkit-doctools/scratchbox-devkit-doctools-1.0.14.ebuild b/dev-embedded/scratchbox-devkit-doctools/scratchbox-devkit-doctools-1.0.14.ebuild
deleted file mode 100644
index 33d2d0caa82f..000000000000
--- a/dev-embedded/scratchbox-devkit-doctools/scratchbox-devkit-doctools-1.0.14.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-SBOX_GROUP="sbox"
-
-DESCRIPTION="A cross-compilation toolkit for embedded Linux application development"
-HOMEPAGE="http://www.scratchbox.org/"
-SRC_URI="http://scratchbox.org/download/files/sbox-releases/hathor/tarball/${P}-i386.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-# Stripping BREAKS scratchbox, it runs in a chroot and is pre-stripped when needed (bug #296294)
-RESTRICT="strip"
-
-RDEPEND="=dev-embedded/scratchbox-1.0*"
-DEPEND=""
-
-TARGET_DIR="/opt/scratchbox"
-
-S=${WORKDIR}/scratchbox
-
-src_install() {
-	dodir ${TARGET_DIR}
-	cp -pRP * "${D}/${TARGET_DIR}"
-}
diff --git a/dev-embedded/scratchbox-devkit-doctools/scratchbox-devkit-doctools-1.0.9.ebuild b/dev-embedded/scratchbox-devkit-doctools/scratchbox-devkit-doctools-1.0.9.ebuild
deleted file mode 100644
index 337ae5168bd0..000000000000
--- a/dev-embedded/scratchbox-devkit-doctools/scratchbox-devkit-doctools-1.0.9.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-SBOX_GROUP="sbox"
-
-DESCRIPTION="A cross-compilation toolkit for embedded Linux application development"
-HOMEPAGE="http://www.scratchbox.org/"
-SRC_URI="http://scratchbox.org/download/files/sbox-releases/stable/tarball/${P}-i386.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-
-# Stripping BREAKS scratchbox, it runs in a chroot and is pre-stripped when needed (bug #296294)
-RESTRICT="strip"
-
-RDEPEND="=dev-embedded/scratchbox-1.0*"
-DEPEND=""
-
-TARGET_DIR="/opt/scratchbox"
-
-S=${WORKDIR}/scratchbox
-
-src_install() {
-	dodir ${TARGET_DIR}
-	cp -pRP * "${D}/${TARGET_DIR}"
-}
diff --git a/dev-embedded/scratchbox-devkit-git-1.0.1 b/dev-embedded/scratchbox-devkit-git-1.0.1
new file mode 100644
index 000000000000..493add3408ed
--- /dev/null
+++ b/dev-embedded/scratchbox-devkit-git-1.0.1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install
+DESCRIPTION=A cross-compilation toolkit for embedded Linux application development
+EAPI=0
+HOMEPAGE=http://www.scratchbox.org/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND==dev-embedded/scratchbox-1.0*
+RESTRICT=strip
+SLOT=0
+SRC_URI=http://scratchbox.org/download/files/sbox-releases/stable/tarball/scratchbox-devkit-git-1.0.1-i386.tar.gz
+_md5_=c2ef0662f12685ca996fc7cb22a4ad85
diff --git a/dev-embedded/scratchbox-devkit-git-1.0.2 b/dev-embedded/scratchbox-devkit-git-1.0.2
new file mode 100644
index 000000000000..a653eaf06110
--- /dev/null
+++ b/dev-embedded/scratchbox-devkit-git-1.0.2
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install
+DESCRIPTION=A cross-compilation toolkit for embedded Linux application development
+EAPI=0
+HOMEPAGE=http://www.scratchbox.org/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND==dev-embedded/scratchbox-1.0*
+RESTRICT=strip
+SLOT=0
+SRC_URI=http://scratchbox.org/download/files/sbox-releases/hathor/tarball/scratchbox-devkit-git-1.0.2-i386.tar.gz
+_md5_=d77fb8c80d849e43828f3c22749be240
diff --git a/dev-embedded/scratchbox-devkit-git/Manifest b/dev-embedded/scratchbox-devkit-git/Manifest
deleted file mode 100644
index 0a25544c3a41..000000000000
--- a/dev-embedded/scratchbox-devkit-git/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST scratchbox-devkit-git-1.0.1-i386.tar.gz 5640785 BLAKE2B 801825804f1aa1a8498d6f507b5c68c1314e366dbdf892eadf0be2ffc7ebf24620dba503ce45b24c001665fa200a1d8715c60b0245dd0a0452be9b639f6652b5 SHA512 d48c2870c1757b0501b3223ae9d3fd52dc585767ae16c8d8857c3a7f3e5794c3203050dbd84969fe424bab38d347afe9b6f6ce759a18c8152558b29ca71e6ec1
-DIST scratchbox-devkit-git-1.0.2-i386.tar.gz 18337539 BLAKE2B 119e90a5ecae374dab5fc1b76c8169aaf274d61bafd8b3106feedd555c9a5eeabe920a341745b6af113f86cc7e80feec9ed26b1ac8ad17635d068d1e140aeb99 SHA512 1ffe21ffd5d4ecf46f148ee607c9cf51d309c6a6f6179d7b83e5c0260b1f137d2180abb0794ce4596510ef353cf7668a3d9b236bff101e1448873b21e12a8956
-EBUILD scratchbox-devkit-git-1.0.1.ebuild 730 BLAKE2B 59e1e4c2c2a972905d39ace285cbb57bb22775a417f35a5905bc6a0e259a254e4bd1d37f048a8c1e876fb035b0342c70c1cbe3ce50a9b311b65a69bcee9da77d SHA512 899252fe422bb17b31856de4fcd4bfc05695f530ed9fb4ecc04256be4bf774d2695cc126464e8a8adf950cd4e3d878f078b032d0eb7399e9e09ef8f291b6ccfd
-EBUILD scratchbox-devkit-git-1.0.2.ebuild 730 BLAKE2B 711e8a098261b71c6ddad323df0eacffd88eb03e06a5bba7c542d95feedaf8457472371173753fc31e32552a5ef6fa2d48e125fd01ac1445f1b5eef459d39082 SHA512 914e43280c00e097ee1f7a360594ff80f5628e3e92b4722ce5653d06c27f6261806ed98324f5b29f765cc429c3e0cbdd5e7b1d96337108e7a98b3f5e8ee3f27e
-MISC metadata.xml 247 BLAKE2B e46b8f2d053251af5cb591bb2ee5e35089c4e8174ee2e7a3c504db23f844b65083d4a3e5198da3977ad3e98b67cab2e0de686a3c62009b487c1e64785a8ff65d SHA512 15df289e0f962f564551f61ada3cfef0311f6af639887def780bf5ad3be105515c8d24c950ff340ed35d89b9cd994af3540322b684c5dec3b43ec6bb0041aa4e
diff --git a/dev-embedded/scratchbox-devkit-git/metadata.xml b/dev-embedded/scratchbox-devkit-git/metadata.xml
deleted file mode 100644
index 71b1461e1146..000000000000
--- a/dev-embedded/scratchbox-devkit-git/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>embedded@gentoo.org</email>
-	<name>Embedded Gentoo</name>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-embedded/scratchbox-devkit-git/scratchbox-devkit-git-1.0.1.ebuild b/dev-embedded/scratchbox-devkit-git/scratchbox-devkit-git-1.0.1.ebuild
deleted file mode 100644
index df77e74be0d4..000000000000
--- a/dev-embedded/scratchbox-devkit-git/scratchbox-devkit-git-1.0.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-SBOX_GROUP="sbox"
-
-DESCRIPTION="A cross-compilation toolkit for embedded Linux application development"
-HOMEPAGE="http://www.scratchbox.org/"
-SRC_URI="http://scratchbox.org/download/files/sbox-releases/stable/tarball/${P}-i386.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-# Stripping BREAKS scratchbox, it runs in a chroot and is pre-stripped when needed (bug #296294)
-RESTRICT="strip"
-
-RDEPEND="=dev-embedded/scratchbox-1.0*"
-DEPEND=""
-
-TARGET_DIR="/opt/scratchbox"
-
-QA_TEXTRELS="opt/scratchbox"
-
-S=${WORKDIR}/scratchbox
-
-src_install() {
-	dodir ${TARGET_DIR}
-	cp -pRP * "${D}/${TARGET_DIR}"
-}
diff --git a/dev-embedded/scratchbox-devkit-git/scratchbox-devkit-git-1.0.2.ebuild b/dev-embedded/scratchbox-devkit-git/scratchbox-devkit-git-1.0.2.ebuild
deleted file mode 100644
index 3f2ca6264db4..000000000000
--- a/dev-embedded/scratchbox-devkit-git/scratchbox-devkit-git-1.0.2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-SBOX_GROUP="sbox"
-
-DESCRIPTION="A cross-compilation toolkit for embedded Linux application development"
-HOMEPAGE="http://www.scratchbox.org/"
-SRC_URI="http://scratchbox.org/download/files/sbox-releases/hathor/tarball/${P}-i386.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-# Stripping BREAKS scratchbox, it runs in a chroot and is pre-stripped when needed (bug #296294)
-RESTRICT="strip"
-
-RDEPEND="=dev-embedded/scratchbox-1.0*"
-DEPEND=""
-
-TARGET_DIR="/opt/scratchbox"
-
-QA_TEXTRELS="opt/scratchbox"
-
-S=${WORKDIR}/scratchbox
-
-src_install() {
-	dodir ${TARGET_DIR}
-	cp -pRP * "${D}/${TARGET_DIR}"
-}
diff --git a/dev-embedded/scratchbox-devkit-maemo3-1.0.3 b/dev-embedded/scratchbox-devkit-maemo3-1.0.3
new file mode 100644
index 000000000000..3e25202fd81e
--- /dev/null
+++ b/dev-embedded/scratchbox-devkit-maemo3-1.0.3
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install
+DESCRIPTION=A cross-compilation toolkit for embedded Linux application development
+EAPI=0
+HOMEPAGE=http://www.scratchbox.org/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND==dev-embedded/scratchbox-1.0*
+RESTRICT=strip
+SLOT=0
+SRC_URI=http://scratchbox.org/download/files/sbox-releases/stable/tarball/scratchbox-devkit-maemo3-1.0.3-i386.tar.gz
+_md5_=a88d1f79c77a89870fc4ffcb8d8e80f4
diff --git a/dev-embedded/scratchbox-devkit-maemo3/Manifest b/dev-embedded/scratchbox-devkit-maemo3/Manifest
deleted file mode 100644
index b46a89d17fb1..000000000000
--- a/dev-embedded/scratchbox-devkit-maemo3/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST scratchbox-devkit-maemo3-1.0.3-i386.tar.gz 22558160 BLAKE2B e91a2cddb89d7b46c2b62240e87268e49b58803f3419ef4e8204899deafc74082fcc583b8fcb5dd3887cf871ef5be14ba98fa6b8b6d7c596045918a6698d64da SHA512 561cffc47a44b575e25114450aa7d596b2df2988ed9ec7f4a37f09227025550f3fd0cc12d009cf85635027a79d616a422a8a846b8ecc82c677f0bc27c8fbd839
-EBUILD scratchbox-devkit-maemo3-1.0.3.ebuild 760 BLAKE2B 0f2f5be7da2a1c9bdcdc180fb28ed7e8fd02271d718e3c3b75dc776839bacc99760907f1c4c174cd24c96f93f81e37d8dfeeec8f133ff4751ef4ba6ab8b900ba SHA512 b7d0337db73be63e8bedcff508b24372577d2a0b0e1948cf01abab1255334bc48fd17d0ab2bb472601f475e27cfbaa11d6bc416c9f108d8177358ab57eaae6db
-MISC metadata.xml 247 BLAKE2B e46b8f2d053251af5cb591bb2ee5e35089c4e8174ee2e7a3c504db23f844b65083d4a3e5198da3977ad3e98b67cab2e0de686a3c62009b487c1e64785a8ff65d SHA512 15df289e0f962f564551f61ada3cfef0311f6af639887def780bf5ad3be105515c8d24c950ff340ed35d89b9cd994af3540322b684c5dec3b43ec6bb0041aa4e
diff --git a/dev-embedded/scratchbox-devkit-maemo3/metadata.xml b/dev-embedded/scratchbox-devkit-maemo3/metadata.xml
deleted file mode 100644
index 71b1461e1146..000000000000
--- a/dev-embedded/scratchbox-devkit-maemo3/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>embedded@gentoo.org</email>
-	<name>Embedded Gentoo</name>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-embedded/scratchbox-devkit-maemo3/scratchbox-devkit-maemo3-1.0.3.ebuild b/dev-embedded/scratchbox-devkit-maemo3/scratchbox-devkit-maemo3-1.0.3.ebuild
deleted file mode 100644
index a14316553aaf..000000000000
--- a/dev-embedded/scratchbox-devkit-maemo3/scratchbox-devkit-maemo3-1.0.3.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-SBOX_GROUP="sbox"
-
-DESCRIPTION="A cross-compilation toolkit for embedded Linux application development"
-HOMEPAGE="http://www.scratchbox.org/"
-SRC_URI="http://scratchbox.org/download/files/sbox-releases/stable/tarball/${P}-i386.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-# Stripping BREAKS scratchbox, it runs in a chroot and is pre-stripped when needed (bug #296294)
-RESTRICT="strip"
-
-RDEPEND="=dev-embedded/scratchbox-1.0*"
-DEPEND=""
-
-QA_TEXTRELS="opt/scratchbox"
-QA_EXECSTACK="opt/scratchbox"
-
-TARGET_DIR="/opt/scratchbox"
-
-S=${WORKDIR}/scratchbox
-
-src_install() {
-	dodir ${TARGET_DIR}
-	cp -pRP * "${D}/${TARGET_DIR}"
-}
diff --git a/dev-embedded/scratchbox-devkit-perl-1.0.4 b/dev-embedded/scratchbox-devkit-perl-1.0.4
new file mode 100644
index 000000000000..fd5e9b8ed09e
--- /dev/null
+++ b/dev-embedded/scratchbox-devkit-perl-1.0.4
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install
+DESCRIPTION=A cross-compilation toolkit for embedded Linux application development
+EAPI=0
+HOMEPAGE=http://www.scratchbox.org/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND==dev-embedded/scratchbox-1.0*
+RESTRICT=strip
+SLOT=0
+SRC_URI=http://scratchbox.org/download/files/sbox-releases/stable/tarball/scratchbox-devkit-perl-1.0.4-i386.tar.gz
+_md5_=b7c5a6cf8314d382933d0b1b358ed23a
diff --git a/dev-embedded/scratchbox-devkit-perl-1.0.5 b/dev-embedded/scratchbox-devkit-perl-1.0.5
new file mode 100644
index 000000000000..66ad6caf0015
--- /dev/null
+++ b/dev-embedded/scratchbox-devkit-perl-1.0.5
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install
+DESCRIPTION=A cross-compilation toolkit for embedded Linux application development
+EAPI=0
+HOMEPAGE=http://www.scratchbox.org/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND==dev-embedded/scratchbox-1.0*
+RESTRICT=strip
+SLOT=0
+SRC_URI=http://scratchbox.org/download/files/sbox-releases/hathor/tarball/scratchbox-devkit-perl-1.0.5-i386.tar.gz
+_md5_=e67274bc1d921edaae4d31ad922063c6
diff --git a/dev-embedded/scratchbox-devkit-perl/Manifest b/dev-embedded/scratchbox-devkit-perl/Manifest
deleted file mode 100644
index 062d565c7615..000000000000
--- a/dev-embedded/scratchbox-devkit-perl/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST scratchbox-devkit-perl-1.0.4-i386.tar.gz 970158 BLAKE2B 49b99116198b406d5be6ab87f44494c5114f4207a53d483e963423bcae29f986982fc051a54eb1cdbb95a437046aa37501de66c2833ce4004858b5a8c59f1ab3 SHA512 ce57b6fddc725cdcbb10d5ec89667b04cd1f5d0b9593143b88ba2821faa121689e103b26414000349fa764240cc44fdea995e08fe62386925823fa70c808e530
-DIST scratchbox-devkit-perl-1.0.5-i386.tar.gz 955873 BLAKE2B 01fdf91164ff0afd54b1e357a2479167e6ec1825e286920655959a77f636fbf98a974e0be8593e4ee776489dc93d29a24fe0a11f5a769ef7b317240b4b209b8d SHA512 9da627c76192133a8f49c181cbe149b8031920812d9d65622ff3bdb829dbe9d47a9385cfc39a17cf04499de2d35ecbfa88cc6379ede166f42c765124323888de
-EBUILD scratchbox-devkit-perl-1.0.4.ebuild 700 BLAKE2B 40730a91dcd5c5d2a4c651d6d4c197c55bf700740beba02f38ef0f1bbfac2fdc5097791707eb9054b2c0c6feae90417d3ded1c42a205ec00bffa4d1c5f191097 SHA512 c8a2d3fdd6d309711088919bd95e08b7b023219cd0cd926fa80215e14451c9ff36ad6bcecb7ac16b3200d18e77fb2878e0ce96640138a3ad540c49dce2e3c1f6
-EBUILD scratchbox-devkit-perl-1.0.5.ebuild 700 BLAKE2B 20c68115e3fa13b9e83a42622b1af97f8a2d6cb871a574b78731198bbbef08b7845e129fcb9e6a1b5cf7d55c0f6eb18ecd16f3d71eb00653d7d7f8cbfcb37ff2 SHA512 5e1a7b14fd271eb6ba41ce6cbbde87feced214b041b77d31a6783030139ab382af2bb60ca462a1f1fa351dc0c80affe0a148adfbae3c30426319f0dc9a346753
-MISC metadata.xml 247 BLAKE2B e46b8f2d053251af5cb591bb2ee5e35089c4e8174ee2e7a3c504db23f844b65083d4a3e5198da3977ad3e98b67cab2e0de686a3c62009b487c1e64785a8ff65d SHA512 15df289e0f962f564551f61ada3cfef0311f6af639887def780bf5ad3be105515c8d24c950ff340ed35d89b9cd994af3540322b684c5dec3b43ec6bb0041aa4e
diff --git a/dev-embedded/scratchbox-devkit-perl/metadata.xml b/dev-embedded/scratchbox-devkit-perl/metadata.xml
deleted file mode 100644
index 71b1461e1146..000000000000
--- a/dev-embedded/scratchbox-devkit-perl/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>embedded@gentoo.org</email>
-	<name>Embedded Gentoo</name>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-embedded/scratchbox-devkit-perl/scratchbox-devkit-perl-1.0.4.ebuild b/dev-embedded/scratchbox-devkit-perl/scratchbox-devkit-perl-1.0.4.ebuild
deleted file mode 100644
index e6e8abc0847b..000000000000
--- a/dev-embedded/scratchbox-devkit-perl/scratchbox-devkit-perl-1.0.4.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-SBOX_GROUP="sbox"
-
-DESCRIPTION="A cross-compilation toolkit for embedded Linux application development"
-HOMEPAGE="http://www.scratchbox.org/"
-SRC_URI="http://scratchbox.org/download/files/sbox-releases/stable/tarball/${P}-i386.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-# Stripping BREAKS scratchbox, it runs in a chroot and is pre-stripped when needed (bug #296294)
-RESTRICT="strip"
-
-RDEPEND="=dev-embedded/scratchbox-1.0*"
-DEPEND=""
-
-TARGET_DIR="/opt/scratchbox"
-
-S=${WORKDIR}/scratchbox
-
-src_install() {
-	dodir ${TARGET_DIR}
-	cp -pRP * "${D}/${TARGET_DIR}"
-}
diff --git a/dev-embedded/scratchbox-devkit-perl/scratchbox-devkit-perl-1.0.5.ebuild b/dev-embedded/scratchbox-devkit-perl/scratchbox-devkit-perl-1.0.5.ebuild
deleted file mode 100644
index 33d2d0caa82f..000000000000
--- a/dev-embedded/scratchbox-devkit-perl/scratchbox-devkit-perl-1.0.5.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-SBOX_GROUP="sbox"
-
-DESCRIPTION="A cross-compilation toolkit for embedded Linux application development"
-HOMEPAGE="http://www.scratchbox.org/"
-SRC_URI="http://scratchbox.org/download/files/sbox-releases/hathor/tarball/${P}-i386.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-# Stripping BREAKS scratchbox, it runs in a chroot and is pre-stripped when needed (bug #296294)
-RESTRICT="strip"
-
-RDEPEND="=dev-embedded/scratchbox-1.0*"
-DEPEND=""
-
-TARGET_DIR="/opt/scratchbox"
-
-S=${WORKDIR}/scratchbox
-
-src_install() {
-	dodir ${TARGET_DIR}
-	cp -pRP * "${D}/${TARGET_DIR}"
-}
diff --git a/dev-embedded/scratchbox-devkit-qemu-0.10.0.0.10 b/dev-embedded/scratchbox-devkit-qemu-0.10.0.0.10
new file mode 100644
index 000000000000..d6af66edaa6b
--- /dev/null
+++ b/dev-embedded/scratchbox-devkit-qemu-0.10.0.0.10
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install
+DESCRIPTION=A cross-compilation toolkit for embedded Linux application development
+EAPI=0
+HOMEPAGE=http://www.scratchbox.org/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RESTRICT=strip
+SLOT=0
+SRC_URI=http://scratchbox.org/download/files/sbox-releases/stable/tarball/scratchbox-devkit-qemu-0.10.0-0sb10-i386.tar.gz
+_md5_=3af96ae11c346e8281617fd86494ba78
diff --git a/dev-embedded/scratchbox-devkit-qemu-0.11.50.0.5 b/dev-embedded/scratchbox-devkit-qemu-0.11.50.0.5
new file mode 100644
index 000000000000..577913e76fc2
--- /dev/null
+++ b/dev-embedded/scratchbox-devkit-qemu-0.11.50.0.5
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install
+DESCRIPTION=A cross-compilation toolkit for embedded Linux application development
+EAPI=0
+HOMEPAGE=http://www.scratchbox.org/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RESTRICT=strip
+SLOT=0
+SRC_URI=http://scratchbox.org/download/files/sbox-releases/stable/tarball/scratchbox-devkit-qemu-0.11.50-0sb5-i386.tar.gz
+_md5_=992ff93e266792e03e8f832f95a11ecf
diff --git a/dev-embedded/scratchbox-devkit-qemu-0.12.50.0.3 b/dev-embedded/scratchbox-devkit-qemu-0.12.50.0.3
new file mode 100644
index 000000000000..c92913b2acc3
--- /dev/null
+++ b/dev-embedded/scratchbox-devkit-qemu-0.12.50.0.3
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install
+DESCRIPTION=A cross-compilation toolkit for embedded Linux application development
+EAPI=0
+HOMEPAGE=http://www.scratchbox.org/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RESTRICT=strip
+SLOT=0
+SRC_URI=http://scratchbox.org/download/files/sbox-releases/stable/tarball/scratchbox-devkit-qemu-0.12.50-0sb3-i386.tar.gz
+_md5_=5150259bbafcaa8b09bdd5b25115b11b
diff --git a/dev-embedded/scratchbox-devkit-qemu/Manifest b/dev-embedded/scratchbox-devkit-qemu/Manifest
deleted file mode 100644
index 7925004bed9e..000000000000
--- a/dev-embedded/scratchbox-devkit-qemu/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-DIST scratchbox-devkit-qemu-0.10.0-0sb10-i386.tar.gz 3312204 BLAKE2B 7bf9ef163121cbcaf64233f109f0d0ef21f43872da17933e54fe378ccfa16848131a2556305c1df96998bca5a836bfb7fba4036f31dda78c0c25e31482c99140 SHA512 029658efe3b47cb6a96b2ec2f730948c469c9dffb0eea43197cb5d5a1ae767294a6bf7ffe5a26d6fbf3efe01fb55c042aa52134f64e5e6e4b32e6baec7278661
-DIST scratchbox-devkit-qemu-0.11.50-0sb5-i386.tar.gz 3351017 BLAKE2B e36459364a527fae7c107aff33faaeabb79a41a4340fae17ed5d27d3c43ae713d0bbe6443da408a5a5ef78c3447a2aa4400157e0621a991d19b955e4159a27b4 SHA512 d191122c46de6947ed0b64bfacaa5d4e3f092e353c11e584d7d4cc43d1f4fc2b048d2100ca92c7568c287daa7816359637c3e6b0d9384c0858ca32a26f0c192a
-DIST scratchbox-devkit-qemu-0.12.50-0sb3-i386.tar.gz 3473391 BLAKE2B a58c50c8834bca1d7f11a29c066bc246e88f5dafc11ded00ebc4b89e64ec2fc2f4653ff3e51784a23641d244952ad128c78068e60d5a08ae4c8d6eb92b02a6a0 SHA512 03808c3d52ce62bd8ab728dc6120d126136294aca10a91781583eec33d99dc686dd24a6a0d58b37d70f38a78049313c30d556e195c949afa1a89c7544cd013f2
-EBUILD scratchbox-devkit-qemu-0.10.0.0.10.ebuild 740 BLAKE2B 8e16b1347d5118890888101bb998fe4d0a35d81b9fa8d5a797d9b6b834478bab305e0eb981a2e7c48c7d71a69f2ceee59172c14521316d6cc21454aa078d1d32 SHA512 1f8bb421c5159694751477241f779de524cdb3e6c8222a01a0f92f131c9eded34fc6835d829f801f9e26a93402cdf27e5d82647abb8fb2169601f36874db5b6a
-EBUILD scratchbox-devkit-qemu-0.11.50.0.5.ebuild 740 BLAKE2B c96e583089f21c402fa3384d427dba1153a3b493517d1d431627d41b2f74436457109247d5e4ee423be5319afdd9f2b648a2089c8def5edb7f2fb05f55d6f34e SHA512 1d91f9433b9eac62423592971ea8fd90a1501fd7e87b7f318e5a7f285f045caf4a18bce2a52a76a4c4cfc80a2059fcc9526e02aade1bfb437e7368477b99b8ab
-EBUILD scratchbox-devkit-qemu-0.12.50.0.3.ebuild 740 BLAKE2B 0caca7d8c07ad3fca0d89a2837c13b71e9c7bff26076378ba7d80987fc7f5cfa41397f43eeb9aa6f614ca9410c8fe4a7f48e8c5adc91e541a3cf3bbab788d21c SHA512 7b5f98769f754389b9d076305a508646037556e13f0e554ed1e72aa120192c8dba862d1ad20a147d6b2bea19e9a9c81e78f480eec0b7df4a745c9d2d9aba03f5
-MISC metadata.xml 247 BLAKE2B e46b8f2d053251af5cb591bb2ee5e35089c4e8174ee2e7a3c504db23f844b65083d4a3e5198da3977ad3e98b67cab2e0de686a3c62009b487c1e64785a8ff65d SHA512 15df289e0f962f564551f61ada3cfef0311f6af639887def780bf5ad3be105515c8d24c950ff340ed35d89b9cd994af3540322b684c5dec3b43ec6bb0041aa4e
diff --git a/dev-embedded/scratchbox-devkit-qemu/metadata.xml b/dev-embedded/scratchbox-devkit-qemu/metadata.xml
deleted file mode 100644
index 71b1461e1146..000000000000
--- a/dev-embedded/scratchbox-devkit-qemu/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>embedded@gentoo.org</email>
-	<name>Embedded Gentoo</name>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-embedded/scratchbox-devkit-qemu/scratchbox-devkit-qemu-0.10.0.0.10.ebuild b/dev-embedded/scratchbox-devkit-qemu/scratchbox-devkit-qemu-0.10.0.0.10.ebuild
deleted file mode 100644
index 2654bbd67451..000000000000
--- a/dev-embedded/scratchbox-devkit-qemu/scratchbox-devkit-qemu-0.10.0.0.10.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-SBOX_GROUP="sbox"
-
-MYPV=0.10.0-0sb10
-MYP=${PN}-${MYPV}
-
-DESCRIPTION="A cross-compilation toolkit for embedded Linux application development"
-HOMEPAGE="http://www.scratchbox.org/"
-SRC_URI="http://scratchbox.org/download/files/sbox-releases/stable/tarball/${MYP}-i386.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-# Stripping BREAKS scratchbox, it runs in a chroot and is pre-stripped when needed (bug #296294)
-RESTRICT="strip"
-
-RDEPEND="=dev-embedded/scratchbox-1.0*"
-RDEPEND=""
-
-TARGET_DIR="/opt/scratchbox"
-
-S=${WORKDIR}/scratchbox
-
-src_install() {
-	dodir ${TARGET_DIR}
-	cp -pRP * "${D}/${TARGET_DIR}"
-}
diff --git a/dev-embedded/scratchbox-devkit-qemu/scratchbox-devkit-qemu-0.11.50.0.5.ebuild b/dev-embedded/scratchbox-devkit-qemu/scratchbox-devkit-qemu-0.11.50.0.5.ebuild
deleted file mode 100644
index 0c9ce42f6348..000000000000
--- a/dev-embedded/scratchbox-devkit-qemu/scratchbox-devkit-qemu-0.11.50.0.5.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-SBOX_GROUP="sbox"
-
-MYPV=0.11.50-0sb5
-MYP=${PN}-${MYPV}
-
-DESCRIPTION="A cross-compilation toolkit for embedded Linux application development"
-HOMEPAGE="http://www.scratchbox.org/"
-SRC_URI="http://scratchbox.org/download/files/sbox-releases/stable/tarball/${MYP}-i386.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-# Stripping BREAKS scratchbox, it runs in a chroot and is pre-stripped when needed (bug #296294)
-RESTRICT="strip"
-
-RDEPEND="=dev-embedded/scratchbox-1.0*"
-RDEPEND=""
-
-TARGET_DIR="/opt/scratchbox"
-
-S=${WORKDIR}/scratchbox
-
-src_install() {
-	dodir ${TARGET_DIR}
-	cp -pRP * "${D}/${TARGET_DIR}"
-}
diff --git a/dev-embedded/scratchbox-devkit-qemu/scratchbox-devkit-qemu-0.12.50.0.3.ebuild b/dev-embedded/scratchbox-devkit-qemu/scratchbox-devkit-qemu-0.12.50.0.3.ebuild
deleted file mode 100644
index dceac710be43..000000000000
--- a/dev-embedded/scratchbox-devkit-qemu/scratchbox-devkit-qemu-0.12.50.0.3.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-SBOX_GROUP="sbox"
-
-MYPV=0.12.50-0sb3
-MYP=${PN}-${MYPV}
-
-DESCRIPTION="A cross-compilation toolkit for embedded Linux application development"
-HOMEPAGE="http://www.scratchbox.org/"
-SRC_URI="http://scratchbox.org/download/files/sbox-releases/stable/tarball/${MYP}-i386.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-# Stripping BREAKS scratchbox, it runs in a chroot and is pre-stripped when needed (bug #296294)
-RESTRICT="strip"
-
-RDEPEND="=dev-embedded/scratchbox-1.0*"
-RDEPEND=""
-
-TARGET_DIR="/opt/scratchbox"
-
-S=${WORKDIR}/scratchbox
-
-src_install() {
-	dodir ${TARGET_DIR}
-	cp -pRP * "${D}/${TARGET_DIR}"
-}
diff --git a/dev-embedded/scratchbox-devkit-svn-1.0 b/dev-embedded/scratchbox-devkit-svn-1.0
new file mode 100644
index 000000000000..6e39e22d79a6
--- /dev/null
+++ b/dev-embedded/scratchbox-devkit-svn-1.0
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install
+DESCRIPTION=A cross-compilation toolkit for embedded Linux application development
+EAPI=0
+HOMEPAGE=http://www.scratchbox.org/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND==dev-embedded/scratchbox-1.0*
+RESTRICT=strip
+SLOT=0
+SRC_URI=http://scratchbox.org/download/files/sbox-releases/stable/tarball/scratchbox-devkit-svn-1.0-i386.tar.gz
+_md5_=c2ef0662f12685ca996fc7cb22a4ad85
diff --git a/dev-embedded/scratchbox-devkit-svn/Manifest b/dev-embedded/scratchbox-devkit-svn/Manifest
deleted file mode 100644
index 3b245cc6b9b0..000000000000
--- a/dev-embedded/scratchbox-devkit-svn/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST scratchbox-devkit-svn-1.0-i386.tar.gz 15363785 BLAKE2B 7f448c3dc2a7ea00e9618ab1c6ead2f38c4d3b60ffae2d26f6270cd9c82208036f618477ebd569dd6a88529e0d06e8517949a075f45a91e126a31538bb2987c7 SHA512 e9f6349a0bb0ab0fc2a726eb053314b8035ce485109a0835f132f31f342c36297d7edaeff60329b5da8e9203c23216dd6868d8fc41355f18caf78d1a4ba2e484
-EBUILD scratchbox-devkit-svn-1.0.ebuild 730 BLAKE2B 59e1e4c2c2a972905d39ace285cbb57bb22775a417f35a5905bc6a0e259a254e4bd1d37f048a8c1e876fb035b0342c70c1cbe3ce50a9b311b65a69bcee9da77d SHA512 899252fe422bb17b31856de4fcd4bfc05695f530ed9fb4ecc04256be4bf774d2695cc126464e8a8adf950cd4e3d878f078b032d0eb7399e9e09ef8f291b6ccfd
-MISC metadata.xml 251 BLAKE2B 118fce129507949f74491c6959c5b8c07a9ba6f1d6a813984cb222435023426d9581131651816ad72f759e87f2bbf70e63ead86330d73ffef3bd60aca060e055 SHA512 b3e4656ceb318c1dc3f8150664734711c9af7b589d5afa1aafe4ef063fb73157e8946a0d845ba02c54d759057597f5c1543b2fdaa93457c91a83b3ea31aec372
diff --git a/dev-embedded/scratchbox-devkit-svn/metadata.xml b/dev-embedded/scratchbox-devkit-svn/metadata.xml
deleted file mode 100644
index e248196b07c4..000000000000
--- a/dev-embedded/scratchbox-devkit-svn/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>embedded@gentoo.org</email>
-		<name>Embedded Gentoo</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/dev-embedded/scratchbox-devkit-svn/scratchbox-devkit-svn-1.0.ebuild b/dev-embedded/scratchbox-devkit-svn/scratchbox-devkit-svn-1.0.ebuild
deleted file mode 100644
index df77e74be0d4..000000000000
--- a/dev-embedded/scratchbox-devkit-svn/scratchbox-devkit-svn-1.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-SBOX_GROUP="sbox"
-
-DESCRIPTION="A cross-compilation toolkit for embedded Linux application development"
-HOMEPAGE="http://www.scratchbox.org/"
-SRC_URI="http://scratchbox.org/download/files/sbox-releases/stable/tarball/${P}-i386.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-# Stripping BREAKS scratchbox, it runs in a chroot and is pre-stripped when needed (bug #296294)
-RESTRICT="strip"
-
-RDEPEND="=dev-embedded/scratchbox-1.0*"
-DEPEND=""
-
-TARGET_DIR="/opt/scratchbox"
-
-QA_TEXTRELS="opt/scratchbox"
-
-S=${WORKDIR}/scratchbox
-
-src_install() {
-	dodir ${TARGET_DIR}
-	cp -pRP * "${D}/${TARGET_DIR}"
-}
diff --git a/dev-embedded/scratchbox/Manifest b/dev-embedded/scratchbox/Manifest
deleted file mode 100644
index 4fe5956fa2ac..000000000000
--- a/dev-embedded/scratchbox/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-AUX scratchbox.rc 410 BLAKE2B 2a927eda81204c933906dd5916fbc7928b9254f8a6f86fe78f8df7c23d37eb252a00548e35ccbfdf130c5675a316450ba158248128c43d072220f4c6b75f2e66 SHA512 51d776fe7b1ba27232b1c26e22eb807d77baad6ae9b8fd3d5a328c087f1b8c60e3891b748eb8b2f812b22d99b1e6a446b4c0cd8a8eb5ce1167eef0ab6faaaf2c
-DIST scratchbox-core-1.0.19-i386.tar.gz 51524069 BLAKE2B 0e50c204a104b2f860481170c6236664f8654c45ac256bdfa919fa88d2c49e44e45f3b5835cee6726f4b0192f3a951ea258f8bd90b20bb93a2b7e366f58d88a1 SHA512 870fa53d569fae238e4c9680ce7b61ee3f35a264ba03bb2e57e5501312826883a75c55c989f554afab24c7fa3362139f7ad9ad109019afaaa6968d88e4d4b3c0
-DIST scratchbox-core-1.0.20-i386.tar.gz 51829189 BLAKE2B d077c32c2af1f90d4d49205a89ce3eb6d8bb8bb7de55c690c36fefbffd9354296bd47740b4a289212dbe35a9fabe7a1f0f8f8293170a260d2593a319d59d9442 SHA512 a5c99d426458d38458978082db58efd74755e54294ef41dbbd811daf758573e568a84360641d61bd8d30f368e50a088b976369a1c2af543f00026f388366587d
-DIST scratchbox-libs-1.0.19-i386.tar.gz 14368380 BLAKE2B cd81dfc13b1f8ad57b8ebcc078a7d8233d593fa1ca35ce6692a01cec10c726131be49ce7bd7bea0fc09d0c4f9f774a5078a4de9e850108ce72dedcecdb3fc146 SHA512 d246c4c2c502c93ad0a73b91b3db177bfb4f6952aa85068bc0561a25567cce0e355539446af51d4aaf27c8cc168050a1ca27e5c937ce9d2e14b9db3fad0977bb
-DIST scratchbox-libs-1.0.20-i386.tar.gz 14369499 BLAKE2B 48bb560dc4f0b06c1e51eed2f48a8037213fa3eaae310110821cc03094cda83f7998fde89ee138ccb743218c87ff1bccfa072eecbd4781cf247a9fb14b93e341 SHA512 2be9d23e80827d80bbaaf3da940d50b8f09e24ee9e7e12accd33c8b95aca927e66a6d3bc69e47a7c49efa3f9c7cdfa37aed45303eeee46958f1ae85aed02fc2b
-EBUILD scratchbox-1.0.19.ebuild 2673 BLAKE2B fb13a2faebe769e1f656d5bcd4aa457bf54ae162f5a70e5dde6a39c0d4804330ecaae00691a17ff50e4d42aeecbb306ea7a9ac4ead969ef9f9901cfd558c841c SHA512 e719e44ebf18268136f9ac449e5a7b57a8adeb9b4260e7cb485d579fa21f8e843663efe542b4cb909425ffda81d041c1594df710c620bd50b67f72a2c945b79d
-EBUILD scratchbox-1.0.20.ebuild 2673 BLAKE2B fb13a2faebe769e1f656d5bcd4aa457bf54ae162f5a70e5dde6a39c0d4804330ecaae00691a17ff50e4d42aeecbb306ea7a9ac4ead969ef9f9901cfd558c841c SHA512 e719e44ebf18268136f9ac449e5a7b57a8adeb9b4260e7cb485d579fa21f8e843663efe542b4cb909425ffda81d041c1594df710c620bd50b67f72a2c945b79d
-MISC metadata.xml 247 BLAKE2B e46b8f2d053251af5cb591bb2ee5e35089c4e8174ee2e7a3c504db23f844b65083d4a3e5198da3977ad3e98b67cab2e0de686a3c62009b487c1e64785a8ff65d SHA512 15df289e0f962f564551f61ada3cfef0311f6af639887def780bf5ad3be105515c8d24c950ff340ed35d89b9cd994af3540322b684c5dec3b43ec6bb0041aa4e
diff --git a/dev-embedded/scratchbox/files/scratchbox.rc b/dev-embedded/scratchbox/files/scratchbox.rc
deleted file mode 100644
index 4e69793ccb64..000000000000
--- a/dev-embedded/scratchbox/files/scratchbox.rc
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/sbin/openrc-run
-
-depend() {
-	need localmount
-	use logger net
-}
-
-start() {
-	test -x /opt/scratchbox/sbin/sbox_ctl || \
-		eend 1 "scratchbox init script not found. Aborting" || return 1
-
-	/opt/scratchbox/sbin/sbox_ctl start
-	return $?
-}
-
-stop() {
-	test -x /opt/scratchbox/sbin/sbox_ctl || \
-		eend 1 "scratchbox init script not found. Aborting" || return 1
-	
-	/opt/scratchbox/sbin/sbox_ctl stop
-	return $?
-}
-
diff --git a/dev-embedded/scratchbox/metadata.xml b/dev-embedded/scratchbox/metadata.xml
deleted file mode 100644
index 71b1461e1146..000000000000
--- a/dev-embedded/scratchbox/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>embedded@gentoo.org</email>
-	<name>Embedded Gentoo</name>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-embedded/scratchbox/scratchbox-1.0.19.ebuild b/dev-embedded/scratchbox/scratchbox-1.0.19.ebuild
deleted file mode 100644
index d763fc05189d..000000000000
--- a/dev-embedded/scratchbox/scratchbox-1.0.19.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils user
-
-SBOX_GROUP="sbox"
-
-DESCRIPTION="A cross-compilation toolkit for embedded Linux application development"
-HOMEPAGE="http://www.scratchbox.org/"
-SRC_URI="http://scratchbox.org/download/files/sbox-releases/hathor/tarball/scratchbox-core-${PV}-i386.tar.gz
-	http://scratchbox.org/download/files/sbox-releases/hathor/tarball/scratchbox-libs-${PV}-i386.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-# Stripping BREAKS scratchbox, it runs in a chroot and is pre-stripped when needed (bug #296294)
-RESTRICT="strip"
-
-DEPEND=""
-RDEPEND=""
-
-TARGET_DIR="/opt/scratchbox"
-
-S=${WORKDIR}/${PN}
-
-src_install() {
-	dodir ${TARGET_DIR}
-	# doins doesn't work with symlinks, getting "file not found" with doins
-	cp -pRP ./* "${D}/${TARGET_DIR}"
-	ln -s opt/scratchbox "${D}/scratchbox"
-
-	# scratchbox service loader
-	newinitd "${FILESDIR}/scratchbox.rc" scratchbox || die "newinitd failed"
-
-	# group already created
-	echo ${SBOX_GROUP} > "${D}/${TARGET_DIR}/.run_me_first_done"
-}
-
-pkg_preinst() {
-	einfo "Creating group sbox"
-	enewgroup "${SBOX_GROUP}"
-}
-
-pkg_postinst() {
-	"${TARGET_DIR}/sbin/sbox_configure" "no" ${SBOX_GROUP}
-
-	elog
-	elog "You can run:"
-	elog "\"emerge --config =${CATEGORY}/${PF}\""
-	elog "to setup scratchbox users"
-	elog
-	elog "For further documentation about how to setup"
-	elog "scratchbox for your development needs have a look at"
-	elog "http://scratchbox.org/documentation/user/scratchbox-1.0/"
-	elog
-	elog "Also note that when you reboot you should run:"
-	elog "/etc/init.d/scratchbox start"
-	elog "before trying to run scratchbox."
-	elog "You can also add it to the default runlevel:"
-	elog "rc-update add scratchbox default"
-	elog
-	elog "Type /opt/scratchbox/login to start scratchbox."
-	elog
-}
-
-pkg_postrm() {
-	elog
-	elog "To remove all traces of scratchbox you will need to remove the file"
-	elog "/etc/init.d/scratchbox. Don't forget to delete the sbox group."
-	elog
-}
-
-pkg_config() {
-	if [ `id -u` != "0" ]; then
-		ewarn "Must be root to run this"
-		die "not root"
-	fi
-
-	mkdir -p "${TARGET_DIR}/users"
-
-	while true; do
-		einfo "Existing users:"
-		einfo $(ls "${TARGET_DIR}/users")
-		echo
-
-		einfo "Create new user (leaf empty to skip): "
-		read newuser
-		case "$newuser" in
-			"")
-				break;
-				;;
-			*)
-				einfo "Note: users have to be in the '${SBOX_GROUP}' to be able to login into the scratchbox"
-				"${TARGET_DIR}/sbin/sbox_adduser" ${newuser} || die "sbox_adduser failed"
-				;;
-		esac
-	done
-
-	einfo "Configuration finished. Make sure you run '/etc/init.d/scratchbox start' before logging in."
-}
diff --git a/dev-embedded/scratchbox/scratchbox-1.0.20.ebuild b/dev-embedded/scratchbox/scratchbox-1.0.20.ebuild
deleted file mode 100644
index d763fc05189d..000000000000
--- a/dev-embedded/scratchbox/scratchbox-1.0.20.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils user
-
-SBOX_GROUP="sbox"
-
-DESCRIPTION="A cross-compilation toolkit for embedded Linux application development"
-HOMEPAGE="http://www.scratchbox.org/"
-SRC_URI="http://scratchbox.org/download/files/sbox-releases/hathor/tarball/scratchbox-core-${PV}-i386.tar.gz
-	http://scratchbox.org/download/files/sbox-releases/hathor/tarball/scratchbox-libs-${PV}-i386.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-# Stripping BREAKS scratchbox, it runs in a chroot and is pre-stripped when needed (bug #296294)
-RESTRICT="strip"
-
-DEPEND=""
-RDEPEND=""
-
-TARGET_DIR="/opt/scratchbox"
-
-S=${WORKDIR}/${PN}
-
-src_install() {
-	dodir ${TARGET_DIR}
-	# doins doesn't work with symlinks, getting "file not found" with doins
-	cp -pRP ./* "${D}/${TARGET_DIR}"
-	ln -s opt/scratchbox "${D}/scratchbox"
-
-	# scratchbox service loader
-	newinitd "${FILESDIR}/scratchbox.rc" scratchbox || die "newinitd failed"
-
-	# group already created
-	echo ${SBOX_GROUP} > "${D}/${TARGET_DIR}/.run_me_first_done"
-}
-
-pkg_preinst() {
-	einfo "Creating group sbox"
-	enewgroup "${SBOX_GROUP}"
-}
-
-pkg_postinst() {
-	"${TARGET_DIR}/sbin/sbox_configure" "no" ${SBOX_GROUP}
-
-	elog
-	elog "You can run:"
-	elog "\"emerge --config =${CATEGORY}/${PF}\""
-	elog "to setup scratchbox users"
-	elog
-	elog "For further documentation about how to setup"
-	elog "scratchbox for your development needs have a look at"
-	elog "http://scratchbox.org/documentation/user/scratchbox-1.0/"
-	elog
-	elog "Also note that when you reboot you should run:"
-	elog "/etc/init.d/scratchbox start"
-	elog "before trying to run scratchbox."
-	elog "You can also add it to the default runlevel:"
-	elog "rc-update add scratchbox default"
-	elog
-	elog "Type /opt/scratchbox/login to start scratchbox."
-	elog
-}
-
-pkg_postrm() {
-	elog
-	elog "To remove all traces of scratchbox you will need to remove the file"
-	elog "/etc/init.d/scratchbox. Don't forget to delete the sbox group."
-	elog
-}
-
-pkg_config() {
-	if [ `id -u` != "0" ]; then
-		ewarn "Must be root to run this"
-		die "not root"
-	fi
-
-	mkdir -p "${TARGET_DIR}/users"
-
-	while true; do
-		einfo "Existing users:"
-		einfo $(ls "${TARGET_DIR}/users")
-		echo
-
-		einfo "Create new user (leaf empty to skip): "
-		read newuser
-		case "$newuser" in
-			"")
-				break;
-				;;
-			*)
-				einfo "Note: users have to be in the '${SBOX_GROUP}' to be able to login into the scratchbox"
-				"${TARGET_DIR}/sbin/sbox_adduser" ${newuser} || die "sbox_adduser failed"
-				;;
-		esac
-	done
-
-	einfo "Configuration finished. Make sure you run '/etc/init.d/scratchbox start' before logging in."
-}
diff --git a/dev-embedded/scratchbox2-2.0-r1 b/dev-embedded/scratchbox2-2.0-r1
new file mode 100644
index 000000000000..385b24faa2ef
--- /dev/null
+++ b/dev-embedded/scratchbox2-2.0-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=>=dev-lang/lua-5.1.4 >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=A cross-compilation toolkit for embedded Linux application development
+EAPI=2
+HOMEPAGE=https://www.freedesktop.org/wiki/Software/sbox2
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=>=dev-lang/lua-5.1.4
+SLOT=0
+SRC_URI=https://cgit.freedesktop.org/sbox2/snapshot/sbox2-2.0.tar.bz2
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=bb85aa924f449106dcb460d3715e5195
diff --git a/dev-embedded/scratchbox2/Manifest b/dev-embedded/scratchbox2/Manifest
deleted file mode 100644
index 8188fcbed4ad..000000000000
--- a/dev-embedded/scratchbox2/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX scratchbox2-2.0-as-needed.patch 830 BLAKE2B 25f1f45ac7f8dec2d953de9bbe22dfffce5fd2d77cdd312fb84fb5e0bf88c54e27f771f25798ec8025a63585c25c154a98137f17701043ac911ec6cee0ef14c1 SHA512 b7fd201e856fd8c34416f7c25bbf2f9c5df4c2b0b666603c4726e9c2bcd40d5f12b67efcc923a42c14c9c3f6a1737c1e6cc42abd92b2f6e8d263d83edd0e9192
-AUX scratchbox2-2.0-gentoo.patch 3371 BLAKE2B c1652126c7f49ccfef0f8e1cd8d05d7aa6d1bffc456ee02c701716126bdcf7f0723120ea0afccaf5d11365c46637840bee19b83abe0ee0ceb87ca89ebdb81eb1 SHA512 44d6c7fc9333e9f2fd4c7b0594339f1d9d66e307ef1b9213ee08aa7dca4b8354ec2aa4eefe5e2a7831e6d58855a8d304812da0fcdd4f06c9091b8f273466da3a
-AUX scratchbox2-2.0-glibc-2.10.patch 1452 BLAKE2B 416e07847e80968e7724db8d9bb41b349c250bef2fe931ae073b13f8b64362b86505e37c717d4fd47e73e704179bf470d7512e3d3dfb681dd94814250343fb68 SHA512 082f1819a00b93d8f6777ec8fde3fb1e8defed46dbc9b22b30439dfbfa0f0cc7fb6e6a5da8642f43de98da7058e2784396e6013aaf710cf20bc69d500484ae25
-AUX scratchbox2-2.0-use-system-lua.patch 2935 BLAKE2B 4486eef454a7c92df0413577180b6fd3d4a76b976e572e4c8ef57a9c1f0a3e84732d77de302c323bcb503b60d5106f14510bfae1f0d5c5727d8056a6b786d90b SHA512 bad26a70fbf6faee4f97634f341e7c2cad98288a2ffc63cad2c72b5f65ba6c97dd846f84f4d6be36c1f83fbce5acfd745d42597fbbd2d93779af8945cc71acb6
-DIST sbox2-2.0.tar.bz2 371402 BLAKE2B bbcf4c88e963275a387eac23480e8aaacc2ad41f3af7cb90ebb61cb0e9f37a0a871c4ee16db7945271fc008db97af288ae9e88fd65d4239c1255abe1e5d2fa5f SHA512 f440c848fc08e825d6dbd978987941a71c087902de152238c31f7d529f5b2256c94aaf1085b5775aa7d66022e5bc83ff8f09bd90a55b32632d60342cd258d209
-EBUILD scratchbox2-2.0-r1.ebuild 1419 BLAKE2B d2e395514bfaf22af3121e0beddcb9f54c19837d98c2d5fd2d7affb96325e7e0caf76cafc9335f8abedb0aa6e8ed913892394f9090e73b39f0f51578658d2513 SHA512 50376cb3a893664f2bdb3a6e03e304074787f017dbed9dee8e74edab3a43f5524869553f51cd1a100e204f5efda4955cf54abb5cbe509260c9c40c630d190af9
-MISC metadata.xml 251 BLAKE2B 118fce129507949f74491c6959c5b8c07a9ba6f1d6a813984cb222435023426d9581131651816ad72f759e87f2bbf70e63ead86330d73ffef3bd60aca060e055 SHA512 b3e4656ceb318c1dc3f8150664734711c9af7b589d5afa1aafe4ef063fb73157e8946a0d845ba02c54d759057597f5c1543b2fdaa93457c91a83b3ea31aec372
diff --git a/dev-embedded/scratchbox2/files/scratchbox2-2.0-as-needed.patch b/dev-embedded/scratchbox2/files/scratchbox2-2.0-as-needed.patch
deleted file mode 100644
index eaffc158f9f2..000000000000
--- a/dev-embedded/scratchbox2/files/scratchbox2-2.0-as-needed.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/utils/Makefile b/utils/Makefile
-index cf9b6c4..6f715d3 100644
---- a/utils/Makefile
-+++ b/utils/Makefile
-@@ -6,7 +6,7 @@ $(D)/sb2-show: CFLAGS := $(CFLAGS) -Wall -W -Werror \
- 		-I$(SRCDIR)/include
- 
- $(D)/sb2-show.o: preload/exported.h
--$(D)/sb2-show: preload/libsb2.$(SHLIBEXT) $(D)/sb2-show.o
-+$(D)/sb2-show: $(D)/sb2-show.o preload/libsb2.$(SHLIBEXT)
- 	$(MKOUTPUTDIR)
- 	$(P)LD
- 	$(Q)$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^
-@@ -25,7 +25,7 @@ $(D)/sb2-interp-wrapper: CFLAGS := $(CFLAGS) -Wall -W -Werror \
- 		-I$(SRCDIR)/preload -Ipreload/ $(PROTOTYPEWARNINGS) \
- 		-I$(SRCDIR)/include
- 
--$(D)/sb2-interp-wrapper: preload/libsb2.$(SHLIBEXT) $(D)/sb2-interp-wrapper.o
-+$(D)/sb2-interp-wrapper: $(D)/sb2-interp-wrapper.o preload/libsb2.$(SHLIBEXT)
- 	$(MKOUTPUTDIR)
- 	$(P)LD
- 	$(Q)$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ -ldl
diff --git a/dev-embedded/scratchbox2/files/scratchbox2-2.0-gentoo.patch b/dev-embedded/scratchbox2/files/scratchbox2-2.0-gentoo.patch
deleted file mode 100644
index 32dcdd1e2e36..000000000000
--- a/dev-embedded/scratchbox2/files/scratchbox2-2.0-gentoo.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-diff --git a/Makefile b/Makefile
-index 23a13b3..c5b26cc 100644
---- a/Makefile
-+++ b/Makefile
-@@ -59,7 +59,6 @@ subdirs = luaif preload utils
- 
- -include config.mak
- 
--CFLAGS += -O2 -g -Wall -W
- CFLAGS += -I$(OBJDIR)/include -I$(SRCDIR)/include
- CFLAGS += -I$(SRCDIR)/luaif/lua-5.1.4/src
- CFLAGS += -D_GNU_SOURCE=1 -D_LARGEFILE_SOURCE=1 -D_LARGEFILE64_SOURCE=1
-@@ -145,6 +144,9 @@ install-noarch: regular
- 	else install -d -m 755 $(prefix)/share/man/man1 ; \
- 	fi
- 	$(Q)echo "$(PACKAGE_VERSION)" > $(prefix)/share/scratchbox2/version
-+	$(Q)install -c -m 755 $(OBJDIR)/utils/sb2-show $(prefix)/bin/sb2-show
-+	$(Q)install -c -m 755 $(OBJDIR)/utils/sb2-monitor $(prefix)/bin/sb2-monitor
-+	$(Q)install -c -m 755 $(OBJDIR)/utils/sb2-interp-wrapper $(prefix)/bin/sb2-interp-wrapper
- 	$(Q)install -c -m 755 $(SRCDIR)/utils/sb2 $(prefix)/bin/sb2
- 	$(Q)install -c -m 755 $(SRCDIR)/utils/sb2-init $(prefix)/bin/sb2-init
- 	$(Q)install -c -m 755 $(SRCDIR)/utils/sb2-config $(prefix)/bin/sb2-config
-@@ -210,10 +212,10 @@ install-noarch: regular
- ifeq ($(MACH),x86_64)
- install: install-multilib
- else
--install: do-install
-+install: install-singlelib
- endif
- 
--do-install: install-noarch
-+install-singlelib: install-noarch
- 	$(P)INSTALL
- 	@if [ -d $(prefix)/lib ] ; \
- 	then echo "$(prefix)/lib present" ; \
-@@ -221,9 +223,6 @@ do-install: install-noarch
- 	fi
- 	$(Q)install -d -m 755 $(prefix)/lib/libsb2
- 	$(Q)install -c -m 755 $(OBJDIR)/preload/libsb2.$(SHLIBEXT) $(prefix)/lib/libsb2/libsb2.so.$(PACKAGE_VERSION)
--	$(Q)install -c -m 755 $(OBJDIR)/utils/sb2-show $(prefix)/bin/sb2-show
--	$(Q)install -c -m 755 $(OBJDIR)/utils/sb2-monitor $(prefix)/bin/sb2-monitor
--	$(Q)install -c -m 755 $(OBJDIR)/utils/sb2-interp-wrapper $(prefix)/bin/sb2-interp-wrapper
- ifeq ($(OS),Linux)
- 	$(Q)/sbin/ldconfig -n $(prefix)/lib/libsb2
- endif
-@@ -232,9 +231,9 @@ multilib_prefix=$(prefix)
- 
- install-multilib: multilib
- 	@$(MAKE) -C obj-32 --include-dir=.. -f ../Makefile SRCDIR=.. do-install-multilib bitness=32
--	@$(MAKE) -C obj-64 --include-dir=.. -f ../Makefile SRCDIR=.. do-install
-+	@$(MAKE) -C obj-64 --include-dir=.. -f ../Makefile SRCDIR=.. do-install-multilib bitness=64
- 
--do-install-multilib:
-+do-install-multilib: install-noarch
- 	$(P)INSTALL
- 	@if [ -d $(multilib_prefix)/lib$(bitness) ] ; \
- 	then echo "$(prefix)/lib$(bitness) present" ; \
-diff --git a/utils/Makefile b/utils/Makefile
-index cf9b6c4..79304fc 100644
---- a/utils/Makefile
-+++ b/utils/Makefile
-@@ -1,7 +1,7 @@
- # beware of namespace collisions, all subdir makefiles are included
- # into the top-level Makefile
- 
--$(D)/sb2-show: CFLAGS := $(CFLAGS) -Wall -W -Werror \
-+$(D)/sb2-show: CFLAGS := $(CFLAGS) -Wall -W \
- 		-I$(SRCDIR)/preload -Ipreload/ $(PROTOTYPEWARNINGS) \
- 		-I$(SRCDIR)/include
- 
-@@ -12,7 +12,7 @@ $(D)/sb2-show: preload/libsb2.$(SHLIBEXT) $(D)/sb2-show.o
- 	$(Q)$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^
- 
- 
--$(D)/sb2-monitor: CFLAGS := $(CFLAGS) -Wall -W -Werror \
-+$(D)/sb2-monitor: CFLAGS := $(CFLAGS) -Wall -W \
- 		-I$(SRCDIR)/preload -Ipreload/ $(PROTOTYPEWARNINGS) \
- 		-I$(SRCDIR)/include
- 
-@@ -21,7 +21,7 @@ $(D)/sb2-monitor: $(D)/sb2-monitor.o
- 	$(P)LD
- 	$(Q)$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^
- 
--$(D)/sb2-interp-wrapper: CFLAGS := $(CFLAGS) -Wall -W -Werror \
-+$(D)/sb2-interp-wrapper: CFLAGS := $(CFLAGS) -Wall -W \
- 		-I$(SRCDIR)/preload -Ipreload/ $(PROTOTYPEWARNINGS) \
- 		-I$(SRCDIR)/include
- 
diff --git a/dev-embedded/scratchbox2/files/scratchbox2-2.0-glibc-2.10.patch b/dev-embedded/scratchbox2/files/scratchbox2-2.0-glibc-2.10.patch
deleted file mode 100644
index c5ec6aea4341..000000000000
--- a/dev-embedded/scratchbox2/files/scratchbox2-2.0-glibc-2.10.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff --git a/preload/interface.master b/preload/interface.master
-index 55a9481..4ba22b2 100644
---- a/preload/interface.master
-+++ b/preload/interface.master
-@@ -406,20 +406,34 @@ WRAP: int rmdir(const char *pathname) : \
- 
- #ifdef HAVE_SCANDIR
- #ifdef HAVE_LINUX_SCANDIR
-+#if _POSIX_C_SOURCE == 200809L
-+WRAP: int scandir(const char *dir, struct dirent ***namelist, \
-+	SCANDIR_TYPE_ARG3, \
-+	int(*compar)(const struct dirent **, const struct dirent **)) : \
-+	map(dir) hardcode_param(3,filter)
-+#else
- WRAP: int scandir(const char *dir, struct dirent ***namelist, \
- 	SCANDIR_TYPE_ARG3, int(*compar)(const void *, const void *)) : \
- 	map(dir) hardcode_param(3,filter)
- #endif
-+#endif
- #ifdef HAVE_OSX_SCANDIR
- WRAP: int scandir(const char *dirname, struct dirent ***namelist, int (*select)(struct dirent *), int (*compar)(const void *, const void *)): map(dirname)
- #endif
- #endif
- #ifdef HAVE_SCANDIR64
-+#if _POSIX_C_SOURCE == 200809L
-+WRAP: int scandir64(const char *dir, struct dirent64 ***namelist, \
-+	int(*filter)(const struct dirent64 *), \
-+	int(*compar)(const struct dirent64 **, const struct dirent64 **)) : \
-+	map(dir)
-+#else
- WRAP: int scandir64(const char *dir, struct dirent64 ***namelist, \
- 	int(*filter)(const struct dirent64 *), \
- 	int(*compar)(const void *, const void *)) : \
- 	map(dir)
- #endif
-+#endif
- #ifdef HAVE_SETXATTR
- #ifdef HAVE_LINUX_XATTRS
- WRAP: int setxattr(const char *path, const char *name, const void *value, \
diff --git a/dev-embedded/scratchbox2/files/scratchbox2-2.0-use-system-lua.patch b/dev-embedded/scratchbox2/files/scratchbox2-2.0-use-system-lua.patch
deleted file mode 100644
index d4c231c74db2..000000000000
--- a/dev-embedded/scratchbox2/files/scratchbox2-2.0-use-system-lua.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-diff --git a/Makefile b/Makefile
-index c5b26cc..da48ea0 100644
---- a/Makefile
-+++ b/Makefile
-@@ -60,7 +60,7 @@ subdirs = luaif preload utils
- -include config.mak
- 
- CFLAGS += -I$(OBJDIR)/include -I$(SRCDIR)/include
--CFLAGS += -I$(SRCDIR)/luaif/lua-5.1.4/src
-+# CFLAGS += -I$(SRCDIR)/luaif/lua-5.1.4/src
- CFLAGS += -D_GNU_SOURCE=1 -D_LARGEFILE_SOURCE=1 -D_LARGEFILE64_SOURCE=1
- CFLAGS += -DSCRATCHBOX_ROOT="$(prefix)"
- CFLAGS += $(MACH_CFLAG)
-@@ -103,10 +103,7 @@ regular: .configure .version
- 	@$(MAKE) -f $(SRCDIR)/Makefile --include-dir=$(SRCDIR) SRCDIR=$(SRCDIR) do-all
- 
- multilib:
--	@mkdir -p obj-32
--	@mkdir -p obj-64
--	@$(MAKE) MACH_CFLAG=-m32 -C obj-32 --include-dir=.. -f ../Makefile SRCDIR=.. regular
--	@$(MAKE) MACH_CFLAG=-m64 -C obj-64 --include-dir=.. -f ../Makefile SRCDIR=.. regular
-+	@$(MAKE) MACH_CFLAG=-m64 regular
- 
- 
- gcc_bins = addr2line ar as cc c++ c++filt cpp g++ gcc gcov gdb gdbtui gprof ld nm objcopy objdump ranlib rdi-stub readelf run size strings strip
-@@ -230,8 +227,7 @@ endif
- multilib_prefix=$(prefix)
- 
- install-multilib: multilib
--	@$(MAKE) -C obj-32 --include-dir=.. -f ../Makefile SRCDIR=.. do-install-multilib bitness=32
--	@$(MAKE) -C obj-64 --include-dir=.. -f ../Makefile SRCDIR=.. do-install-multilib bitness=64
-+	@$(MAKE) do-install-multilib bitness=64
- 
- do-install-multilib: install-noarch
- 	$(P)INSTALL
-diff --git a/luaif/Makefile b/luaif/Makefile
-index 28e8885..5e1af6f 100644
---- a/luaif/Makefile
-+++ b/luaif/Makefile
-@@ -5,7 +5,7 @@ objs := $(D)/luaif.o $(D)/sb_log.o $(D)/paths.o $(D)/argvenvp.o
- $(D)/sb_log.o: preload/exported.h
- 
- luaif/libluaif.a: $(objs)
--luaif/libluaif.a: override CFLAGS := $(CFLAGS) -O2 -g -fPIC -Wall -W -I$(SRCDIR)/$(LUASRC) -I$(OBJDIR)/preload -I$(SRCDIR)/preload
-+luaif/libluaif.a: override CFLAGS := $(CFLAGS) -O2 -g -fPIC -Wall -W -I$(OBJDIR)/preload -I$(SRCDIR)/preload
- luaif/libluaif.a: override LDFLAGS := $(LDFLAGS)
- luaif/libluaif.a: override LIBS := 
- 
-@@ -24,5 +24,5 @@ luaif/liblua.a: override CFLAGS := -O2 -g -fPIC -Wall -W $(CFLAGS)
- luaif/liblua.a: override LDFLAGS := $(LDFLAGS)
- luaif/liblua.a: override LIBS :=
- 
--targets := $(targets) $(D)/libluaif.a $(D)/liblua.a
-+targets := $(targets) $(D)/libluaif.a
- 
-diff --git a/preload/Makefile b/preload/Makefile
-index 9f785ba..5094dbc 100644
---- a/preload/Makefile
-+++ b/preload/Makefile
-@@ -8,7 +8,7 @@ LIBSB2_LDFLAGS = -Wl,-soname=$(LIBSB2_SONAME) \
- # DO NOT add any libraries that depend on libpthread to
- # LIBSB2_LIBS or LIBS!! see the comments in luaif.c.
- 
--LIBSB2_LIBS =
-+LIBSB2_LIBS = -llua
- SHLIBEXT = so
- else
- LIBSB2_LIBS =
-@@ -17,7 +17,7 @@ endif
- 
- 
- $(D)/libsb2.$(SHLIBEXT): $(call O,$(objs))
--$(D)/libsb2.$(SHLIBEXT): luaif/libluaif.a luaif/liblua.a
-+$(D)/libsb2.$(SHLIBEXT): luaif/libluaif.a
- $(D)/libsb2.$(SHLIBEXT): CFLAGS := $(CFLAGS) -fPIC -Wall -W \
- 		-I$(SRCDIR)/preload -Ipreload/ $(PROTOTYPEWARNINGS)
- $(D)/libsb2.$(SHLIBEXT): LDFLAGS := $(LDFLAGS) $(LIBSB2_LDFLAGS)
diff --git a/dev-embedded/scratchbox2/metadata.xml b/dev-embedded/scratchbox2/metadata.xml
deleted file mode 100644
index e248196b07c4..000000000000
--- a/dev-embedded/scratchbox2/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>embedded@gentoo.org</email>
-		<name>Embedded Gentoo</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/dev-embedded/scratchbox2/scratchbox2-2.0-r1.ebuild b/dev-embedded/scratchbox2/scratchbox2-2.0-r1.ebuild
deleted file mode 100644
index 9fd9257fb6ca..000000000000
--- a/dev-embedded/scratchbox2/scratchbox2-2.0-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-inherit autotools eutils multilib toolchain-funcs
-
-MY_PN="${PN/cratch}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A cross-compilation toolkit for embedded Linux application development"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/sbox2"
-SRC_URI="https://cgit.freedesktop.org/${MY_PN}/snapshot/${MY_P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=">=dev-lang/lua-5.1.4"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-glibc-2.10.patch"
-	epatch "${FILESDIR}/${P}-gentoo.patch"
-	# bug 296552
-	epatch "${FILESDIR}/${P}-use-system-lua.patch"
-	# bug 296550
-	epatch "${FILESDIR}/${P}-as-needed.patch"
-
-	sed -e "s/^\(CC = \).*/\1$(tc-getCC)/" \
-		-e "s/^\(CXX = \).*/\1$(tc-getCXX)/" \
-		-e "s/^\(LD = \).*/\1$(tc-getLD)/" \
-		-i Makefile || die "sed Makefile failed"
-
-	eautoreconf
-}
-
-src_compile() {
-	emake prefix="${D}/usr" || die "emake failed"
-}
-
-src_install() {
-	emake prefix="${D}/usr" install || die "emake install failed"
-
-	# List all the multilib libdirs
-	local libdirs=
-	for libdir in $(get_all_libdirs); do
-			libdirs="${libdirs}:/usr/${libdir}/libsb2"
-	done
-
-	cat <<-EOF > "${T}/55scratchbox2"
-	LDPATH=${libdirs:1}
-	EOF
-	doenvd "${T}/55scratchbox2" || die "doenvd failed"
-
-	dodoc AUTHORS README TODO || die "dodoc failed"
-}
diff --git a/dev-embedded/sdcc-3.5.0 b/dev-embedded/sdcc-3.5.0
new file mode 100644
index 000000000000..6ca31e374e74
--- /dev/null
+++ b/dev-embedded/sdcc-3.5.0
@@ -0,0 +1,15 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=dev-libs/boost:= sys-libs/ncurses:= sys-libs/readline:0= >=dev-embedded/gputils-0.13.7 boehm-gc? ( dev-libs/boehm-gc:= ) !dev-embedded/sdcc-svn dev-util/gperf
+DESCRIPTION=Small device C compiler (for various microprocessors)
+EAPI=5
+HOMEPAGE=http://sdcc.sourceforge.net/
+IUSE=mcs51 z80 z180 r2k r3ka gbz80 tlcs90 ds390 ds400 pic14 pic16 hc08 s08 stm8 ucsim device-lib packihx +sdcpp sdcdb sdbinutils non-free +boehm-gc doc
+KEYWORDS=amd64 x86
+LICENSE=GPL-2 ZLIB non-free? ( MicroChip-SDCC ) packihx? ( public-domain )
+RDEPEND=dev-libs/boost:= sys-libs/ncurses:= sys-libs/readline:0= >=dev-embedded/gputils-0.13.7 boehm-gc? ( dev-libs/boehm-gc:= ) !dev-embedded/sdcc-svn
+REQUIRED_USE=mcs51? ( sdbinutils ) ds390? ( sdbinutils ) ds400? ( sdbinutils ) hc08? ( sdbinutils ) s08? ( sdbinutils )
+RESTRICT=strip
+SLOT=0
+SRC_URI=mirror://sourceforge/sdcc/sdcc-src-3.5.0.tar.bz2 doc? ( mirror://sourceforge/sdcc/sdcc-doc-3.5.0.tar.bz2 )
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=c394113a8671436400a2b2fa82e454bc
diff --git a/dev-embedded/sdcc-9999 b/dev-embedded/sdcc-9999
new file mode 100644
index 000000000000..d92d3306990e
--- /dev/null
+++ b/dev-embedded/sdcc-9999
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install preinst prepare unpack
+DEPEND=dev-libs/boost:= sys-libs/ncurses:= sys-libs/readline:0= >=dev-embedded/gputils-0.13.7 boehm-gc? ( dev-libs/boehm-gc:= ) !dev-embedded/sdcc-svn dev-util/gperf doc? ( >=app-office/lyx-1.3.4 dev-tex/latex2html ) || ( dev-vcs/subversion[http] dev-vcs/subversion[webdav-neon] dev-vcs/subversion[webdav-serf] ) net-misc/rsync
+DESCRIPTION=Small device C compiler (for various microprocessors)
+EAPI=5
+HOMEPAGE=http://sdcc.sourceforge.net/
+IUSE=mcs51 z80 z180 r2k r3ka gbz80 tlcs90 ds390 ds400 pic14 pic16 hc08 s08 stm8 ucsim device-lib packihx +sdcpp sdcdb sdbinutils non-free +boehm-gc doc
+LICENSE=GPL-2 ZLIB non-free? ( MicroChip-SDCC ) packihx? ( public-domain )
+RDEPEND=dev-libs/boost:= sys-libs/ncurses:= sys-libs/readline:0= >=dev-embedded/gputils-0.13.7 boehm-gc? ( dev-libs/boehm-gc:= ) !dev-embedded/sdcc-svn
+REQUIRED_USE=mcs51? ( sdbinutils ) ds390? ( sdbinutils ) ds400? ( sdbinutils ) hc08? ( sdbinutils ) s08? ( sdbinutils )
+RESTRICT=strip
+SLOT=0
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	subversion	a5d5826a85609611f098c0553eb24cc1	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=526c6f7a5f932d582ab9142647140625
diff --git a/dev-embedded/sdcc/Manifest b/dev-embedded/sdcc/Manifest
deleted file mode 100644
index ee166bdc38db..000000000000
--- a/dev-embedded/sdcc/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST sdcc-doc-3.5.0.tar.bz2 1000775 BLAKE2B 30cd31990788060ebc792d98b072d4d72ce72176bf09374084246bfe02a8164ab083fb9cfe7fb6ee246b523dce7163d494f2161eb7537f972408f03bc9541426 SHA512 43de0c19ad538b4495218b04e5ab6a886fd9945c8a82c400e9a53314547f5d6ab0529989274faecc2d954f35f8fe60f338f09f93536b62a305203d2119df597e
-DIST sdcc-src-3.5.0.tar.bz2 10504517 BLAKE2B 16102ebd55026826100b453db20e00fa599ce6ad72f1466c32deb7211f09188048f35ac8ddd5987b7a3ad5fad79f2e2ee833da60e22a26b107c5e9e0e7c9be09 SHA512 a5842945da065ab566b7e073782e92f851da48c160990d49b76ab4773fe1c14286cab399fb7f2456432e4043ee7ce07c3b149aeb103c51f85a33fdc5f8798f4e
-EBUILD sdcc-3.5.0.ebuild 3263 BLAKE2B e52602faa59a8fd9ca9303725dbc5e05f37d90278810eb8aaa8f3c50cf1812d0ecb82ed539a387271a882679a2e3e2632d6162a7a2d69b270d21a1b718665603 SHA512 9a0674bbaf3b347a81862dcdc88c418077f4fbab509b616c31973605a9941096646378ba84c23a7853d067c2b1d3dca27ee6f644de5e3fdcbc6e3c0fce4dfbf1
-EBUILD sdcc-9999.ebuild 3265 BLAKE2B dc989a0a9e967c92726eaddda5b485b4611be831e06b638f4d7f9b918ceb6ac505186ede1b6dbf13b8715842e6b6b57f9505f1961223760d35b187896dd99e37 SHA512 c0cb7a7361d6de1796beec9db92285aab07748ffb80b003811f3d29694a2cf084e3f1fcd7980cefeaf1d719e199ae64a6b364221bf05a8adf48c955090e4d409
-MISC metadata.xml 2212 BLAKE2B 23e83037b2a6e932760e7f0eafdd34230c035dd5a5833335db0ea9c4c1e04e62e69a920e2c2f3492d45ddc014c76450ad05b4d7794d66cca261e294ac20555a0 SHA512 4af2667ae3006548904e9e13894a49c277744d6876e0a99c99e8ea2e89c9e3fc277cf851ae0856b3c3b64f41ef7fd7c255f1bb4f9f42de8917aad7c59e25a0f0
diff --git a/dev-embedded/sdcc/metadata.xml b/dev-embedded/sdcc/metadata.xml
deleted file mode 100644
index c0f3e2174edd..000000000000
--- a/dev-embedded/sdcc/metadata.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>embedded@gentoo.org</email>
-		<name>Embedded Gentoo</name>
-	</maintainer>
-	<longdescription>
-SDCC is a retargettable, optimizing ANSI - C compiler suite that targets the Intel MCS51 based microprocessors (8031, 8032, 8051, 8052, etc.), Maxim (formerly Dallas) DS80C390 variants, Freescale (formerly Motorola) HC08 based (hc08, s08), Zilog Z80 based MCUs (z80, z180, gbz80, Rabbit 2000/3000, Rabbit 3000A, TLCS-90) and STMicroelectronics STM8. It can be retargeted for other microprocessors.
-	</longdescription>
-	<upstream>
-		<remote-id type="sourceforge">sdcc</remote-id>
-	</upstream>
-	<use>
-		<flag name="boehm-gc">Enable Hans Boehm's garbage collector <pkg>dev-libs/boehm-gc</pkg></flag>
-		<flag name="device-lib">Enable built of devices libraries</flag>
-		<flag name="ds390">Add support for Dallas DS390</flag>
-		<flag name="ds400">Add support for Dallas DS400</flag>
-		<flag name="gbz80">Add support for Gameboy gbz80</flag>
-		<flag name="hc08">Add support for Freescale/Motorola HC08 based</flag>
-		<flag name="mcs51">Add support for Intel mcs51</flag>
-		<flag name="non-free">Enable non-free runtime library parts</flag>
-		<flag name="packihx">Enable Intel HEX files pack utility</flag>
-		<flag name="pic14">Add support for Microchip 14 bits PICs</flag>
-		<flag name="pic16">Add support for Microchip 16 bits PICs</flag>
-		<flag name="r2k">Add support for Rabbit 2000</flag>
-		<flag name="r3ka">Add support for Rabbit 3000A</flag>
-		<flag name="s08">Add support for Freescale/Motorola S08</flag>
-		<flag name="sdbinutils">Enable SDCC library archive utilities sdar, sdranlib, sdnm</flag>
-		<flag name="sdcdb">Enable SDCC source level debugger</flag>
-		<flag name="sdcpp">Enable SDCC preprocessor based on GCC cpp</flag>
-		<flag name="stm8">Add support for STMicroelectronics STM8</flag>
-		<flag name="tlcs90">Add support for TLCS-90</flag>
-		<flag name="ucsim">Enable software simulator for microcontrollers</flag>
-		<flag name="z180">Add support for Zilog Z180</flag>
-		<flag name="z80">Add support for Zilog Z80</flag>
-	</use>
-</pkgmetadata>
diff --git a/dev-embedded/sdcc/sdcc-3.5.0.ebuild b/dev-embedded/sdcc/sdcc-3.5.0.ebuild
deleted file mode 100644
index 3379d7019c12..000000000000
--- a/dev-embedded/sdcc/sdcc-3.5.0.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils toolchain-funcs
-
-if [[ ${PV} == "9999" ]] ; then
-	ESVN_REPO_URI="https://svn.code.sf.net/p/sdcc/code/trunk/sdcc"
-	inherit subversion
-	docs_compile() { return 0; }
-else
-	SRC_URI="mirror://sourceforge/sdcc/${PN}-src-${PV}.tar.bz2
-		doc? ( mirror://sourceforge/sdcc/${PN}-doc-${PV}.tar.bz2 )"
-	KEYWORDS="amd64 x86"
-	docs_compile() { return 1; }
-fi
-
-DESCRIPTION="Small device C compiler (for various microprocessors)"
-HOMEPAGE="http://sdcc.sourceforge.net/"
-
-LICENSE="GPL-2 ZLIB
-	non-free? ( MicroChip-SDCC )
-	packihx? ( public-domain )"
-SLOT="0"
-IUSE="mcs51 z80 z180 r2k r3ka gbz80 tlcs90 ds390 ds400 pic14 pic16 hc08 s08 stm8
-ucsim device-lib packihx +sdcpp sdcdb sdbinutils non-free +boehm-gc doc"
-
-REQUIRED_USE="
-	mcs51? ( sdbinutils )
-	ds390? ( sdbinutils )
-	ds400? ( sdbinutils )
-	hc08?  ( sdbinutils )
-	s08?   ( sdbinutils )"
-
-RESTRICT="strip"
-
-RDEPEND="dev-libs/boost:=
-	sys-libs/ncurses:=
-	sys-libs/readline:0=
-	>=dev-embedded/gputils-0.13.7
-	boehm-gc? ( dev-libs/boehm-gc:= )
-	!dev-embedded/sdcc-svn"
-DEPEND="${RDEPEND}
-	dev-util/gperf"
-if docs_compile ; then
-	DEPEND+="
-		doc? (
-			>=app-office/lyx-1.3.4
-			dev-tex/latex2html
-		)"
-fi
-
-src_prepare() {
-	# Fix conflicting variable names between Gentoo and sdcc
-	find \
-		'(' -name 'Makefile*.in' -o -name 'configure' ')' \
-		-exec sed -r -i \
-			-e 's:\<(PORTDIR|ARCH)\>:SDCC\1:g' \
-			{} + || die
-
-	# https://sourceforge.net/p/sdcc/bugs/2398/
-	sed -i '1iAR = @AR@' Makefile.common.in || die
-	sed -i \
-		-e "/^AR =/s:=.*:=$(tc-getAR):" \
-		support/cpp/Makefile.in || die
-
-	# Make sure timestamps don't get messed up.
-	[[ ${PV} == "9999" ]] && find "${S}" -type f -exec touch -r . {} +
-}
-
-src_configure() {
-	# sdbinutils subdir doesn't pass down --docdir properly, so need to
-	# expand $(datarootdir) ourselves.
-	econf \
-		ac_cv_prog_STRIP=true \
-		ac_cv_prog_AS="$(tc-getAS)" \
-		ac_cv_prog_AR="$(tc-getAR)" \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		--without-ccache \
-		$(use_enable mcs51 mcs51-port) \
-		$(use_enable z80 z80-port) \
-		$(use_enable z180 z180-port) \
-		$(use_enable r2k r2k-port) \
-		$(use_enable r3ka r3ka-port) \
-		$(use_enable gbz80 gbz80-port) \
-		$(use_enable tlcs90 tlcs90-port) \
-		$(use_enable ds390 ds390-port) \
-		$(use_enable ds400 ds400-port) \
-		$(use_enable pic14 pic14-port) \
-		$(use_enable pic16 pic16-port) \
-		$(use_enable hc08 hc08-port) \
-		$(use_enable s08 s08-port) \
-		$(use_enable stm8 stm8-port) \
-		$(use_enable ucsim ucsim) \
-		$(use_enable device-lib device-lib) \
-		$(use_enable packihx packihx) \
-		$(use_enable sdcpp sdcpp) \
-		$(use_enable sdcdb sdcdb) \
-		$(use_enable sdbinutils sdbinutils) \
-		$(use_enable non-free non-free) \
-		$(use_enable boehm-gc libgc) \
-		$(docs_compile && use_enable doc || echo --disable-doc)
-}
-
-src_install() {
-	default
-	dodoc doc/*.txt
-	find "${D}" -name .deps -exec rm -rf {} + || die
-
-	if use doc ; then
-		docs_compile || cd "${WORKDIR}"/doc
-		dohtml -r *
-	fi
-
-	# a bunch of archives (*.a) are built & installed by gputils
-	# for PIC processors, but they do not work with standard `ar`
-	# & `scanelf` utils and they're not for the host.
-	env RESTRICT="" prepstrip "${D%/}"/usr/bin
-}
diff --git a/dev-embedded/sdcc/sdcc-9999.ebuild b/dev-embedded/sdcc/sdcc-9999.ebuild
deleted file mode 100644
index e0d3b94b8ec6..000000000000
--- a/dev-embedded/sdcc/sdcc-9999.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils toolchain-funcs
-
-if [[ ${PV} == "9999" ]] ; then
-	ESVN_REPO_URI="https://svn.code.sf.net/p/sdcc/code/trunk/sdcc"
-	inherit subversion
-	docs_compile() { return 0; }
-else
-	SRC_URI="mirror://sourceforge/sdcc/${PN}-src-${PV}.tar.bz2
-		doc? ( mirror://sourceforge/sdcc/${PN}-doc-${PV}.tar.bz2 )"
-	KEYWORDS="~amd64 ~x86"
-	docs_compile() { return 1; }
-fi
-
-DESCRIPTION="Small device C compiler (for various microprocessors)"
-HOMEPAGE="http://sdcc.sourceforge.net/"
-
-LICENSE="GPL-2 ZLIB
-	non-free? ( MicroChip-SDCC )
-	packihx? ( public-domain )"
-SLOT="0"
-IUSE="mcs51 z80 z180 r2k r3ka gbz80 tlcs90 ds390 ds400 pic14 pic16 hc08 s08 stm8
-ucsim device-lib packihx +sdcpp sdcdb sdbinutils non-free +boehm-gc doc"
-
-REQUIRED_USE="
-	mcs51? ( sdbinutils )
-	ds390? ( sdbinutils )
-	ds400? ( sdbinutils )
-	hc08?  ( sdbinutils )
-	s08?   ( sdbinutils )"
-
-RESTRICT="strip"
-
-RDEPEND="dev-libs/boost:=
-	sys-libs/ncurses:=
-	sys-libs/readline:0=
-	>=dev-embedded/gputils-0.13.7
-	boehm-gc? ( dev-libs/boehm-gc:= )
-	!dev-embedded/sdcc-svn"
-DEPEND="${RDEPEND}
-	dev-util/gperf"
-if docs_compile ; then
-	DEPEND+="
-		doc? (
-			>=app-office/lyx-1.3.4
-			dev-tex/latex2html
-		)"
-fi
-
-src_prepare() {
-	# Fix conflicting variable names between Gentoo and sdcc
-	find \
-		'(' -name 'Makefile*.in' -o -name 'configure' ')' \
-		-exec sed -r -i \
-			-e 's:\<(PORTDIR|ARCH)\>:SDCC\1:g' \
-			{} + || die
-
-	# https://sourceforge.net/p/sdcc/bugs/2398/
-	sed -i '1iAR = @AR@' Makefile.common.in || die
-	sed -i \
-		-e "/^AR =/s:=.*:=$(tc-getAR):" \
-		support/cpp/Makefile.in || die
-
-	# Make sure timestamps don't get messed up.
-	[[ ${PV} == "9999" ]] && find "${S}" -type f -exec touch -r . {} +
-}
-
-src_configure() {
-	# sdbinutils subdir doesn't pass down --docdir properly, so need to
-	# expand $(datarootdir) ourselves.
-	econf \
-		ac_cv_prog_STRIP=true \
-		ac_cv_prog_AS="$(tc-getAS)" \
-		ac_cv_prog_AR="$(tc-getAR)" \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		--without-ccache \
-		$(use_enable mcs51 mcs51-port) \
-		$(use_enable z80 z80-port) \
-		$(use_enable z180 z180-port) \
-		$(use_enable r2k r2k-port) \
-		$(use_enable r3ka r3ka-port) \
-		$(use_enable gbz80 gbz80-port) \
-		$(use_enable tlcs90 tlcs90-port) \
-		$(use_enable ds390 ds390-port) \
-		$(use_enable ds400 ds400-port) \
-		$(use_enable pic14 pic14-port) \
-		$(use_enable pic16 pic16-port) \
-		$(use_enable hc08 hc08-port) \
-		$(use_enable s08 s08-port) \
-		$(use_enable stm8 stm8-port) \
-		$(use_enable ucsim ucsim) \
-		$(use_enable device-lib device-lib) \
-		$(use_enable packihx packihx) \
-		$(use_enable sdcpp sdcpp) \
-		$(use_enable sdcdb sdcdb) \
-		$(use_enable sdbinutils sdbinutils) \
-		$(use_enable non-free non-free) \
-		$(use_enable boehm-gc libgc) \
-		$(docs_compile && use_enable doc || echo --disable-doc)
-}
-
-src_install() {
-	default
-	dodoc doc/*.txt
-	find "${D}" -name .deps -exec rm -rf {} + || die
-
-	if use doc ; then
-		docs_compile || cd "${WORKDIR}"/doc
-		dohtml -r *
-	fi
-
-	# a bunch of archives (*.a) are built & installed by gputils
-	# for PIC processors, but they do not work with standard `ar`
-	# & `scanelf` utils and they're not for the host.
-	env RESTRICT="" prepstrip "${D%/}"/usr/bin
-}
diff --git a/dev-embedded/sgpp-lite-arm-eabi-bin-2010.09.51 b/dev-embedded/sgpp-lite-arm-eabi-bin-2010.09.51
new file mode 100644
index 000000000000..f25f4d7acf96
--- /dev/null
+++ b/dev-embedded/sgpp-lite-arm-eabi-bin-2010.09.51
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DESCRIPTION=Regular, validated releases of the GNU Toolchain for arm processors
+EAPI=0
+HOMEPAGE=http://www.codesourcery.com/sgpp/lite/arm
+IUSE=doc
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=sys-libs/glibc
+RESTRICT=strip
+SLOT=2010.09.51
+SRC_URI=http://www.codesourcery.com/public/gnu_toolchain/arm-none-eabi/arm-2010.09-51-arm-none-eabi-i686-pc-linux-gnu.tar.bz2
+_md5_=5bf4dc2e505100a9e338c55bcf8fd44e
diff --git a/dev-embedded/sgpp-lite-arm-eabi-bin-2014.05.28 b/dev-embedded/sgpp-lite-arm-eabi-bin-2014.05.28
new file mode 100644
index 000000000000..2346a84276e8
--- /dev/null
+++ b/dev-embedded/sgpp-lite-arm-eabi-bin-2014.05.28
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DESCRIPTION=Regular, validated releases of the GNU Toolchain for arm processors
+EAPI=6
+HOMEPAGE=http://www.codesourcery.com/sgpp/lite/arm
+IUSE=doc
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=sys-libs/glibc
+RESTRICT=strip
+SLOT=2014.05.28
+SRC_URI=https://sourcery.mentor.com/public/gnu_toolchain/arm-none-eabi/arm-2014.05-28-arm-none-eabi-i686-pc-linux-gnu.tar.bz2
+_md5_=7851e0c3412ffd0107cd83220acde821
diff --git a/dev-embedded/sgpp-lite-arm-eabi-bin/Manifest b/dev-embedded/sgpp-lite-arm-eabi-bin/Manifest
deleted file mode 100644
index cbbffccbde89..000000000000
--- a/dev-embedded/sgpp-lite-arm-eabi-bin/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST arm-2010.09-51-arm-none-eabi-i686-pc-linux-gnu.tar.bz2 36851462 BLAKE2B 8f44b1e64365fb88bd924862e8a98383dec81680dc7d4c6019132d6cb84e701345d247594037951e7da8bf6c1e46dba528bbd3b8901bd4e172487bb1d562e403 SHA512 0de319596f83e62be9a786ebf02fb2830d0ea97acb1f01ba4f7f99f4aadfa12731bd1121bc885a4d97a948bc8131b66c91c62614b4ea8223553bf9a60a551002
-DIST arm-2014.05-28-arm-none-eabi-i686-pc-linux-gnu.tar.bz2 46454460 BLAKE2B be5e9170eaeb0a6bb140cd505507f7dc43431001d5d94a2851d57c0009fc0535e9779713f9eb35c840698909d1c006ffc300fce372856d032c8b40b9b9bcc4e2 SHA512 16104dd05f26ad3d8ab7c09c55409bbd9507ebc4b023344049b343fafb1ecafb3625bc33937ad5498abeaefd5745b5123b669a2d500eeaaafdc5e8c50ee15570
-EBUILD sgpp-lite-arm-eabi-bin-2010.09.51.ebuild 1173 BLAKE2B 0721aef6a00380d2b6b1796441fcb223d80d38df9328e8d557c6b9339baf58c3b19e7ca439b10863f16745323fb671ccf65ca5621f3a99a581300a88dfb3c831 SHA512 6273d67911e78018f9796f6572d76310fc59f8d402c86e6c46d8cf12414ec2b99a49b295d889b6dc2bd7e0b83f91e5dc19b4f9150d9402d67a1ad874be96464d
-EBUILD sgpp-lite-arm-eabi-bin-2014.05.28.ebuild 1173 BLAKE2B d5abe048c17d7cccb1422e90419d5b5095f7f0caf1133b7e20b886e3f1d46ddaf559dc6567e0f1346c690e8aafe0fbec69834b67334592517c7a91727ff4ee9f SHA512 9971b11ec845cfd04c651b9dad9271ddb64cf2aea9cdb8e16c8019438d8c8c43fe101e256d71e445b984e4e3ba7ac7df9fdc87fa10bfeddbc9ae11ff2e1d8bcc
-MISC metadata.xml 247 BLAKE2B e46b8f2d053251af5cb591bb2ee5e35089c4e8174ee2e7a3c504db23f844b65083d4a3e5198da3977ad3e98b67cab2e0de686a3c62009b487c1e64785a8ff65d SHA512 15df289e0f962f564551f61ada3cfef0311f6af639887def780bf5ad3be105515c8d24c950ff340ed35d89b9cd994af3540322b684c5dec3b43ec6bb0041aa4e
diff --git a/dev-embedded/sgpp-lite-arm-eabi-bin/metadata.xml b/dev-embedded/sgpp-lite-arm-eabi-bin/metadata.xml
deleted file mode 100644
index 71b1461e1146..000000000000
--- a/dev-embedded/sgpp-lite-arm-eabi-bin/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>embedded@gentoo.org</email>
-	<name>Embedded Gentoo</name>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-embedded/sgpp-lite-arm-eabi-bin/sgpp-lite-arm-eabi-bin-2010.09.51.ebuild b/dev-embedded/sgpp-lite-arm-eabi-bin/sgpp-lite-arm-eabi-bin-2010.09.51.ebuild
deleted file mode 100644
index 0bfc753eedb7..000000000000
--- a/dev-embedded/sgpp-lite-arm-eabi-bin/sgpp-lite-arm-eabi-bin-2010.09.51.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-CPU="arm"
-TARGET="arm-none-eabi"
-HOST="i686-pc-linux-gnu"
-MY_P="${CPU}-${PV%.*}-${PV##*.}-${TARGET}-${HOST}"
-
-DESCRIPTION="Regular, validated releases of the GNU Toolchain for ${CPU} processors"
-HOMEPAGE="http://www.codesourcery.com/sgpp/lite/${CPU}"
-SRC_URI="http://www.codesourcery.com/public/gnu_toolchain/${TARGET}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-RESTRICT="strip" # package is already stripped, and contains target bins
-QA_EXECSTACK="opt/${P}/*"
-
-RDEPEND="sys-libs/glibc"
-DEPEND=""
-
-S=${WORKDIR}/${CPU}-${PV%.*}
-
-src_install() {
-	local d="/opt/${P}"
-	dodir ${d}
-	cp -pPR * "${D}"/${d}/ || die
-
-	pushd "${D}"/${d}/share/doc/${CPU}-${TARGET} >/dev/null
-	if use doc ; then
-		dohtml -r html/* || die
-		dodoc pdf/* || die
-	fi
-	rm -rf html pdf
-	rm LICENSE.txt man/man7/{fsf-funding,gpl,gfdl}.7 || die
-	mv man info ../..
-	popd >/dev/null
-	find "${D}" -depth -type d -empty -delete
-
-	cat <<-EOF > "${T}"/15${P}
-	PATH=${d}/bin
-	MANPATH=${d}/share/man
-	INFOPATH=${d}/share/info
-	EOF
-	doenvd "${T}"/15${P} || die
-}
diff --git a/dev-embedded/sgpp-lite-arm-eabi-bin/sgpp-lite-arm-eabi-bin-2014.05.28.ebuild b/dev-embedded/sgpp-lite-arm-eabi-bin/sgpp-lite-arm-eabi-bin-2014.05.28.ebuild
deleted file mode 100644
index 9918951ab607..000000000000
--- a/dev-embedded/sgpp-lite-arm-eabi-bin/sgpp-lite-arm-eabi-bin-2014.05.28.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-CPU="arm"
-TARGET="arm-none-eabi"
-HOST="i686-pc-linux-gnu"
-MY_P="${CPU}-${PV%.*}-${PV##*.}-${TARGET}-${HOST}"
-
-DESCRIPTION="Regular, validated releases of the GNU Toolchain for ${CPU} processors"
-HOMEPAGE="http://www.codesourcery.com/sgpp/lite/${CPU}"
-SRC_URI="https://sourcery.mentor.com/public/gnu_toolchain/${TARGET}/${MY_P}.tar.bz2"
-LICENSE="GPL-2"
-
-SLOT="${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-RESTRICT="strip" # package is already stripped, and contains target bins
-QA_EXECSTACK="opt/${P}/*"
-
-RDEPEND="sys-libs/glibc"
-DEPEND=""
-
-S=${WORKDIR}/${CPU}-${PV%.*}
-
-src_install() {
-	local d="/opt/${P}"
-	dodir ${d}
-	cp -pPR * "${D}"/${d}/ || die
-
-	pushd "${D}"/${d}/share/doc/${CPU}-${TARGET} >/dev/null
-	if use doc ; then
-		dohtml -r html/* || die
-		dodoc pdf/* || die
-	fi
-	rm -rf html pdf
-	rm LICENSE.txt man/man7/{fsf-funding,gpl,gfdl}.7 || die
-	mv man info ../..
-	popd >/dev/null
-	find "${D}" -depth -type d -empty -delete
-
-	cat <<-EOF > "${T}"/15${P}
-	PATH=${d}/bin
-	MANPATH=${d}/share/man
-	INFOPATH=${d}/share/info
-	EOF
-	doenvd "${T}"/15${P} || die
-}
diff --git a/dev-embedded/sgpp-lite-arm-linux-bin-2010.09.50 b/dev-embedded/sgpp-lite-arm-linux-bin-2010.09.50
new file mode 100644
index 000000000000..e8dfc39bd821
--- /dev/null
+++ b/dev-embedded/sgpp-lite-arm-linux-bin-2010.09.50
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DESCRIPTION=Regular, validated releases of the GNU Toolchain for arm processors
+EAPI=0
+HOMEPAGE=http://www.codesourcery.com/sgpp/lite/arm
+IUSE=doc
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=sys-libs/glibc
+RESTRICT=strip
+SLOT=2010.09.50
+SRC_URI=http://www.codesourcery.com/public/gnu_toolchain/arm-none-linux-gnueabi/arm-2010.09-50-arm-none-linux-gnueabi-i686-pc-linux-gnu.tar.bz2
+_md5_=f3689285638718647699543b456787fd
diff --git a/dev-embedded/sgpp-lite-arm-linux-bin/Manifest b/dev-embedded/sgpp-lite-arm-linux-bin/Manifest
deleted file mode 100644
index 24016dbac642..000000000000
--- a/dev-embedded/sgpp-lite-arm-linux-bin/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST arm-2010.09-50-arm-none-linux-gnueabi-i686-pc-linux-gnu.tar.bz2 88213477 BLAKE2B 0ece9b631cea548673aef74136898f793128345526aa248e07d3f949e0b12ca5579b7ae8ee70173721bbc6258825727de7e02b7425e12e6e079402eb33b5abed SHA512 1c85b321c79e424d4f2687ec96dbde6b3f3e62cc15ff9f4d81f01391e39821356542bde244c623a40c449ea1198fefacf844574d6df9342f08fc1d4bd1ff834c
-EBUILD sgpp-lite-arm-linux-bin-2010.09.50.ebuild 1182 BLAKE2B 2f5cb1dd213ab205ab6bb8a72baef85e698a17dc64a43438a14414b08e6aa98108a3f61da0c2d2786fe7171bde03f000512b0134cbbe94bdcb21279dd0f64149 SHA512 c1857b1588568e31c902087bd60d4fd6774fab725c3f3c03de19813c76034e8c0681349e59a02b9ac482e3503ffc2745e68785bf4d305bd2f4fc8c3fa325167d
-MISC metadata.xml 247 BLAKE2B e46b8f2d053251af5cb591bb2ee5e35089c4e8174ee2e7a3c504db23f844b65083d4a3e5198da3977ad3e98b67cab2e0de686a3c62009b487c1e64785a8ff65d SHA512 15df289e0f962f564551f61ada3cfef0311f6af639887def780bf5ad3be105515c8d24c950ff340ed35d89b9cd994af3540322b684c5dec3b43ec6bb0041aa4e
diff --git a/dev-embedded/sgpp-lite-arm-linux-bin/metadata.xml b/dev-embedded/sgpp-lite-arm-linux-bin/metadata.xml
deleted file mode 100644
index 71b1461e1146..000000000000
--- a/dev-embedded/sgpp-lite-arm-linux-bin/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>embedded@gentoo.org</email>
-	<name>Embedded Gentoo</name>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-embedded/sgpp-lite-arm-linux-bin/sgpp-lite-arm-linux-bin-2010.09.50.ebuild b/dev-embedded/sgpp-lite-arm-linux-bin/sgpp-lite-arm-linux-bin-2010.09.50.ebuild
deleted file mode 100644
index 9c36d75724ea..000000000000
--- a/dev-embedded/sgpp-lite-arm-linux-bin/sgpp-lite-arm-linux-bin-2010.09.50.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-CPU="arm"
-TARGET="arm-none-linux-gnueabi"
-HOST="i686-pc-linux-gnu"
-MY_P="${CPU}-${PV%.*}-${PV##*.}-${TARGET}-${HOST}"
-
-DESCRIPTION="Regular, validated releases of the GNU Toolchain for ${CPU} processors"
-HOMEPAGE="http://www.codesourcery.com/sgpp/lite/${CPU}"
-SRC_URI="http://www.codesourcery.com/public/gnu_toolchain/${TARGET}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-RESTRICT="strip" # package is already stripped, and contains target bins
-QA_EXECSTACK="opt/${P}/*"
-
-RDEPEND="sys-libs/glibc"
-DEPEND=""
-
-S=${WORKDIR}/${CPU}-${PV%.*}
-
-src_install() {
-	local d="/opt/${P}"
-	dodir ${d}
-	cp -pPR * "${D}"/${d}/ || die
-
-	pushd "${D}"/${d}/share/doc/${CPU}-${TARGET} >/dev/null
-	if use doc ; then
-		dohtml -r html/* || die
-		dodoc pdf/* || die
-	fi
-	rm -rf html pdf
-	rm LICENSE.txt man/man7/{fsf-funding,gpl,gfdl}.7 || die
-	mv man info ../..
-	popd >/dev/null
-	find "${D}" -depth -type d -empty -delete
-
-	cat <<-EOF > "${T}"/15${P}
-	PATH=${d}/bin
-	MANPATH=${d}/share/man
-	INFOPATH=${d}/share/info
-	EOF
-	doenvd "${T}"/15${P} || die
-}
diff --git a/dev-embedded/sgpp-lite-arm-uclinux-bin-2010.09.58 b/dev-embedded/sgpp-lite-arm-uclinux-bin-2010.09.58
new file mode 100644
index 000000000000..2f70439aef92
--- /dev/null
+++ b/dev-embedded/sgpp-lite-arm-uclinux-bin-2010.09.58
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DESCRIPTION=Regular, validated releases of the GNU Toolchain for arm processors
+EAPI=0
+HOMEPAGE=http://www.codesourcery.com/sgpp/lite/arm
+IUSE=doc
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=sys-libs/glibc
+RESTRICT=strip
+SLOT=2010.09.58
+SRC_URI=http://www.codesourcery.com/public/gnu_toolchain/arm-uclinuxeabi/arm-2010.09-58-arm-uclinuxeabi-i686-pc-linux-gnu.tar.bz2
+_md5_=68e84d302df18a2f477d34754f1e9897
diff --git a/dev-embedded/sgpp-lite-arm-uclinux-bin/Manifest b/dev-embedded/sgpp-lite-arm-uclinux-bin/Manifest
deleted file mode 100644
index 221a3ddfb7d3..000000000000
--- a/dev-embedded/sgpp-lite-arm-uclinux-bin/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST arm-2010.09-58-arm-uclinuxeabi-i686-pc-linux-gnu.tar.bz2 37524234 BLAKE2B 0568c37fff49b997b3c086968ca15d21d1c9de61fd985c68ac1ca03698bc4d02b141db063b45131c50e35b10359da05719d42a013f2ae5e3ddea6dcd8dea92cf SHA512 57e8465b2d8f8da903982e5efe4bf7d356b505663a479830955e7f6bc4e2e69fdd841e4bc29f5b96b8d5854d34dbf694d80da7820e7f10935244f5d231d81345
-EBUILD sgpp-lite-arm-uclinux-bin-2010.09.58.ebuild 1175 BLAKE2B 74ab0e7720fa62ebd91a53d60dc068ea0d0847ca6d6d33d00380758fe89386281fef8cec589e5f92db8913c68b09f2cbfb42a239c4f50981183de9d58409444a SHA512 aad5b57836db0a0f2656b1aff3a7277a8d5d7da0282bf96baeb963791245c2e6744168b58edfbff1b54d77baecb56ca5d3ec249559fac22fe863c80e570d2e7f
-MISC metadata.xml 247 BLAKE2B e46b8f2d053251af5cb591bb2ee5e35089c4e8174ee2e7a3c504db23f844b65083d4a3e5198da3977ad3e98b67cab2e0de686a3c62009b487c1e64785a8ff65d SHA512 15df289e0f962f564551f61ada3cfef0311f6af639887def780bf5ad3be105515c8d24c950ff340ed35d89b9cd994af3540322b684c5dec3b43ec6bb0041aa4e
diff --git a/dev-embedded/sgpp-lite-arm-uclinux-bin/metadata.xml b/dev-embedded/sgpp-lite-arm-uclinux-bin/metadata.xml
deleted file mode 100644
index 71b1461e1146..000000000000
--- a/dev-embedded/sgpp-lite-arm-uclinux-bin/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>embedded@gentoo.org</email>
-	<name>Embedded Gentoo</name>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-embedded/sgpp-lite-arm-uclinux-bin/sgpp-lite-arm-uclinux-bin-2010.09.58.ebuild b/dev-embedded/sgpp-lite-arm-uclinux-bin/sgpp-lite-arm-uclinux-bin-2010.09.58.ebuild
deleted file mode 100644
index 51a34f799b7c..000000000000
--- a/dev-embedded/sgpp-lite-arm-uclinux-bin/sgpp-lite-arm-uclinux-bin-2010.09.58.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-CPU="arm"
-TARGET="arm-uclinuxeabi"
-HOST="i686-pc-linux-gnu"
-MY_P="${CPU}-${PV%.*}-${PV##*.}-${TARGET}-${HOST}"
-
-DESCRIPTION="Regular, validated releases of the GNU Toolchain for ${CPU} processors"
-HOMEPAGE="http://www.codesourcery.com/sgpp/lite/${CPU}"
-SRC_URI="http://www.codesourcery.com/public/gnu_toolchain/${TARGET}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-RESTRICT="strip" # package is already stripped, and contains target bins
-QA_EXECSTACK="opt/${P}/*"
-
-RDEPEND="sys-libs/glibc"
-DEPEND=""
-
-S=${WORKDIR}/${CPU}-${PV%.*}
-
-src_install() {
-	local d="/opt/${P}"
-	dodir ${d}
-	cp -pPR * "${D}"/${d}/ || die
-
-	pushd "${D}"/${d}/share/doc/${CPU}-${TARGET} >/dev/null
-	if use doc ; then
-		dohtml -r html/* || die
-		dodoc pdf/* || die
-	fi
-	rm -rf html pdf
-	rm LICENSE.txt man/man7/{fsf-funding,gpl,gfdl}.7 || die
-	mv man info ../..
-	popd >/dev/null
-	find "${D}" -depth -type d -empty -delete
-
-	cat <<-EOF > "${T}"/15${P}
-	PATH=${d}/bin
-	MANPATH=${d}/share/man
-	INFOPATH=${d}/share/info
-	EOF
-	doenvd "${T}"/15${P} || die
-}
diff --git a/dev-embedded/smdk-dltool-0.20-r3 b/dev-embedded/smdk-dltool-0.20-r3
new file mode 100644
index 000000000000..a20043a3357a
--- /dev/null
+++ b/dev-embedded/smdk-dltool-0.20-r3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install prepare
+DEPEND=virtual/libusb:1
+DESCRIPTION=Tool to communicate with Samsung SMDK boards
+EAPI=4
+HOMEPAGE=http://www.fluff.org/ben/smdk/tools/
+KEYWORDS=~amd64 ~x86
+LICENSE=all-rights-reserved
+RDEPEND=virtual/libusb:1
+RESTRICT=mirror bindist
+SLOT=0
+SRC_URI=http://www.fluff.org/ben/smdk/tools/downloads/smdk-tools-v0.20.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=114f5c609df03a1e90e86112ce85dcb0
diff --git a/dev-embedded/smdk-dltool-0.20-r4 b/dev-embedded/smdk-dltool-0.20-r4
new file mode 100644
index 000000000000..d235a08959aa
--- /dev/null
+++ b/dev-embedded/smdk-dltool-0.20-r4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install prepare
+DEPEND=virtual/libusb:1
+DESCRIPTION=Tool to communicate with Samsung SMDK boards
+EAPI=4
+HOMEPAGE=http://www.fluff.org/ben/smdk/tools/
+KEYWORDS=~amd64 ~x86
+LICENSE=all-rights-reserved
+RDEPEND=virtual/libusb:1
+RESTRICT=mirror bindist
+SLOT=0
+SRC_URI=http://www.fluff.org/ben/smdk/tools/downloads/smdk-tools-v0.20.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=5545f6eae59bd86d218e4e999ca05c60
diff --git a/dev-embedded/smdk-dltool/Manifest b/dev-embedded/smdk-dltool/Manifest
deleted file mode 100644
index 469efaadeff0..000000000000
--- a/dev-embedded/smdk-dltool/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-AUX smdk-dltool-0.20-add-S3C64xx-support.patch 2057 BLAKE2B fec0c1684e5b94231fe5eafbbf53f82d0f1a77a21b7a59c0fe56564841e341fbb806ed5aea15aaef41ef2b9fcc9a552b57326058c7ac275d1c37e93e910fa1f8 SHA512 7ae02b298390ab3bbdfe27c3f5cea55c8f2b75f60853227f37adee7a547ef2d1069286a633e2017a79440f257c25d4f26fe1eaad0ef51c04a067af8d1b815d64
-AUX smdk-dltool-0.20-build.patch 430 BLAKE2B 8a4bbe4170780554f7171f0fd5bc548367688240bfebab40f51c4efbad44df7f6b6fe2c1c700e908275fd9f38ee17ab39ba23843a176daf45a407c7e432ac6b6 SHA512 8bd0918ebe2f7f583dd076ed9b4cc01e6d9dc397fe52981e97029727872552d4d01838c1602d170d2c1bb92e9a4759fef7eecc31336bcad22adb2c0e84e5d297
-AUX smdk-dltool-0.20-libusb-1.0-r1.patch 8859 BLAKE2B 333b774375e8ea48e811cd54fe6e6bbfa0c8c5ece0fa2cda806a6d60022b4f791ed06131930e829cab5ca5600bb1948ab8f852542048f9fcb2967e4682c51457 SHA512 7c1a39c7b6da1e2aecd651be6d78ec30383cd9a7858c40477e84bddd2cb80b8138a6cae55e3f6be71bd8aad03ff31dc3250f1579c63c106953fef2fb62e3e3bf
-AUX smdk-dltool-0.20-libusb-1.0.patch 8207 BLAKE2B 499e1abf30b30960cbf998a9c06ca22062b8231938fb1ff87e9877fe4613e94c79c0561a67b885a21a11fb56dc670917f82737ca8597c37f723f5e63df3b9c9a SHA512 2c3f47ac0fbf573b8be17721639123607ec4aaf69e1eef602089d75ef614ba761b6f6d0182cbaa0abc57ef0bd5a2c61120b3369c9c73c29cd466fda3f5a99ab4
-DIST smdk-tools-v0.20.tar.gz 5170 BLAKE2B c414938ff98155dd16f64378a5c3524bb2fd7e21b074cb6e656ffc2aa5b7b8cc8cbe27600472a8ef20570818e253f63f1b1460784200aaf0a4fb321f79b0cfdc SHA512 2b0fd113bc9e6e6c07ad4163d404bffa8044150a2da55a8903192b9dcbead5e31d97a9315b561526f0cb2a65e415f34941bea0db3ac40e73048901fe95ff3a17
-EBUILD smdk-dltool-0.20-r3.ebuild 834 BLAKE2B 1146b2cadeb55606412fa197fc3dd33ef48dbefb0c758c5cbcb17b439790e9354535d6c61307dab6a18bf1b2a087fbee9fb301ae53128d61e618c0938d8b2293 SHA512 e9286ccb956faeceffd459c523442a2dd09f329c4d3514e5d55f57f2256bceb6ff73f0acdc83ebcb54f37855f007a6d8f7c6a92876b269e7e44f6be212013843
-EBUILD smdk-dltool-0.20-r4.ebuild 837 BLAKE2B 244d5dfd17acc0fd6763b25bc1c4e4dc2616ab8e49f094584a0d9b99168e308c9804e5d6d0341d3dfc9b30e07f1cc9543056d2882329a5d6a97f789c00ba6340 SHA512 0b9edf675277de1100212371edbdbf0a2a35cf10ad6801b5d88b52b9d4c22b09c9c07e6e436c31ad188c664adc43e5334df6d9589eb842aa97b08446ddb9ba30
-MISC metadata.xml 247 BLAKE2B e46b8f2d053251af5cb591bb2ee5e35089c4e8174ee2e7a3c504db23f844b65083d4a3e5198da3977ad3e98b67cab2e0de686a3c62009b487c1e64785a8ff65d SHA512 15df289e0f962f564551f61ada3cfef0311f6af639887def780bf5ad3be105515c8d24c950ff340ed35d89b9cd994af3540322b684c5dec3b43ec6bb0041aa4e
diff --git a/dev-embedded/smdk-dltool/files/smdk-dltool-0.20-add-S3C64xx-support.patch b/dev-embedded/smdk-dltool/files/smdk-dltool-0.20-add-S3C64xx-support.patch
deleted file mode 100644
index 5b615aeb119b..000000000000
--- a/dev-embedded/smdk-dltool/files/smdk-dltool-0.20-add-S3C64xx-support.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From ed9e5da97fdb40082aca7acbdce5286b530fb2ba Mon Sep 17 00:00:00 2001
-From: Maurus Cuelenaere <mcuelenaere@gmail.com>
-Date: Mon, 11 Jan 2010 01:55:34 +0100
-Subject: [PATCH] Add S3C64xx support
-
-Author: unknown
-URL: http://dev.odroid.com/frs/download.php/22/Linux-dltool.tar.gz
----
- dltool/dltool.c |   19 ++++++++++++++-----
- 1 files changed, 14 insertions(+), 5 deletions(-)
-
-diff --git a/dltool/dltool.c b/dltool/dltool.c
-index 4e2d238..e76e607 100644
---- a/dltool/dltool.c
-+++ b/dltool/dltool.c
-@@ -26,6 +26,8 @@ char *dl_file = "download.dat";
- char *dl_udev = NULL;
- char *dl_ubus = NULL;
- 
-+int ep_out = 0;
-+
- #define DBG(x) if (debug) { printf x; }
- 
- void write_u32(unsigned char *dp, unsigned long val)
-@@ -120,9 +122,15 @@ int verify_device(struct usb_device *dev)
- 	DBG(("\t=> idVendor %x\n", dev->descriptor.idVendor));
- 	DBG(("\t=> idProduct %x\n", dev->descriptor.idProduct));
- 
--	if (dev->descriptor.idVendor == 0x5345 &&
--	    dev->descriptor.idProduct == 0x1234)
-+	if (dev->descriptor.idVendor == 0x5345 && dev->descriptor.idProduct == 0x1234) {
-+		ep_out = 3;
-+		return 1;
-+	}
-+	else if(dev->descriptor.idVendor == 0x4e8 && dev->descriptor.idProduct == 0x1234){
-+		printf("S3C64XX Detected!\n");
-+		ep_out = 2;
- 		return 1;
-+	}
- 
- 	return 0;
- }
-@@ -180,9 +188,9 @@ int main(int argc, char **argv)
- 	usb_dev_handle *devh;
- 	int ret;
- 
--	printf("SMDK42XX USB Download Tool\n");
-+	printf("SMDK42XX,S3C64XX USB Download Tool\n");
- 	printf("Version 0.20 (c) 2004,2005,2006"
--	       "Ben Dooks <ben-linux@fluff.org>\n");
-+	       " Ben Dooks <ben-linux@fluff.org>\n");
- 	printf("\n");
- 
- 	while (1) {
-@@ -309,7 +317,8 @@ int main(int argc, char **argv)
- 	write_header(dl_data, dl_addr, dl_size);
- 	calc_cksum(dl_data, dl_size);
- 
--	ret = usb_bulk_write(devh, 3, (void *)dl_data, dl_size, 5*1000*1000);
-+	//ret = usb_bulk_write(devh, 3, (void *)dl_data, dl_size, 5*1000*1000);
-+	ret = usb_bulk_write(devh, ep_out, (void *)dl_data, dl_size, 5*1000*1000);
- 	printf("=> usb_bulk_write() returned %d\n", ret);
- 
- 	if (ret != dl_size) {
--- 
-1.7.0.4
diff --git a/dev-embedded/smdk-dltool/files/smdk-dltool-0.20-build.patch b/dev-embedded/smdk-dltool/files/smdk-dltool-0.20-build.patch
deleted file mode 100644
index c6e3b767394b..000000000000
--- a/dev-embedded/smdk-dltool/files/smdk-dltool-0.20-build.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-respect env build settings
-
---- a/releases/smdk-tools-v0.20/dltool/Makefile
-+++ b/releases/smdk-tools-v0.20/dltool/Makefile
-@@ -7,8 +7,13 @@
- 
- .PHONY:	clean
- 
--dltool:	dltool.c
--	$(CC) -O2 -Wall -g -lusb -o smdk-usbdl dltool.c
-+CFLAGS ?= -O2 -g
-+CFLAGS += -Wall
-+PKG_CONFIG ?= pkg-config
-+CPPFLAGS += $(shell $(PKG_CONFIG) --cflags libusb)
-+LDLIBS = $(shell $(PKG_CONFIG) --libs libusb)
-+
-+all: dltool
- 
- clean:
- 	-rm smdk-usbdl
diff --git a/dev-embedded/smdk-dltool/files/smdk-dltool-0.20-libusb-1.0-r1.patch b/dev-embedded/smdk-dltool/files/smdk-dltool-0.20-libusb-1.0-r1.patch
deleted file mode 100644
index 15afd1380984..000000000000
--- a/dev-embedded/smdk-dltool/files/smdk-dltool-0.20-libusb-1.0-r1.patch
+++ /dev/null
@@ -1,359 +0,0 @@
-migrate to libusb-1 by me (Mike Frysinger)
-
-workaround kernel/libusb transfer sizes by Julius Werner
-
---- a/Makefile
-+++ b/Makefile
-@@ -10,8 +10,8 @@
- CFLAGS ?= -O2 -g
- CFLAGS += -Wall
- PKG_CONFIG ?= pkg-config
--CPPFLAGS += $(shell $(PKG_CONFIG) --cflags libusb)
--LDLIBS = $(shell $(PKG_CONFIG) --libs libusb)
-+CPPFLAGS += $(shell $(PKG_CONFIG) --cflags libusb-1.0)
-+LDLIBS = $(shell $(PKG_CONFIG) --libs libusb-1.0)
- 
- all: dltool
- 
---- a/dltool.c
-+++ b/dltool.c
-@@ -7,15 +7,25 @@
- 
- #include <sys/types.h>
- #include <sys/stat.h>
-+#include <sys/param.h>
- 
- #include <stdlib.h>
- #include <string.h>
- #include <stdio.h>
- #include <getopt.h>
- #include <fcntl.h>
-+#include <errno.h>
-+#include <unistd.h>
- 
- 
--#include <usb.h>
-+#include <libusb.h>
-+
-+/* The kernel USB layer is restrictive in the max size in a single URB.
-+ * When we exceed that, the kernel throws ENOMEM, but the libusb layer
-+ * doesn't handle things gracefully.  So manually split up into chunks
-+ * ourselves so we can avoid that failure case.
-+ */
-+#define CHUNKSIZE (1 << 18)
- 
- unsigned int   debug   = 0;
- unsigned long  dl_addr = 0x30000000L;
-@@ -23,12 +33,22 @@ unsigned long  dl_size = 0L;
- unsigned char *dl_data = NULL;
- 
- char *dl_file = "download.dat";
--char *dl_udev = NULL;
--char *dl_ubus = NULL;
-+libusb_context *ctx = NULL;
-+libusb_device_handle *devh = NULL;
- 
- int ep_out = 0;
- 
- #define DBG(x) if (debug) { printf x; }
-+#define err(fmt, args...) \
-+	do { \
-+		if (devh) \
-+			libusb_close(devh); \
-+		if (ctx) \
-+			libusb_exit(ctx); \
-+		fprintf(stderr, "dltool: " fmt "\n", ## args); \
-+		exit(1); \
-+	} while (0)
-+#define errp(fmt, args...) err(fmt ": %s", ## args, strerror(errno))
- 
- void write_u32(unsigned char *dp, unsigned long val)
- {
-@@ -108,25 +128,30 @@ void calc_cksum(unsigned char *data, ssize_t len)
- 	cp[1] = cksum >> 8;
- }
- 
--int verify_device(struct usb_device *dev)
-+int verify_device(libusb_device *dev)
- {
-+	struct libusb_device_descriptor desc;
-+
-+	if (libusb_get_device_descriptor(dev, &desc))
-+		return 0;
-+
- 	DBG(("dev %p: configurations %d\n",
--	     dev, dev->descriptor.bNumConfigurations));
-+	     dev, desc.bNumConfigurations));
- 	
--	if (dev->descriptor.bNumConfigurations != 1)
-+	if (desc.bNumConfigurations != 1)
- 		return 0;
- 
--	DBG(("\t=> bLength %d\n", dev->descriptor.bLength));
--	DBG(("\t=> bType   %d\n", dev->descriptor.bDescriptorType));
--	DBG(("\t=> bcdUSB  %x\n", dev->descriptor.bcdUSB));
--	DBG(("\t=> idVendor %x\n", dev->descriptor.idVendor));
--	DBG(("\t=> idProduct %x\n", dev->descriptor.idProduct));
-+	DBG(("\t=> bLength %d\n", desc.bLength));
-+	DBG(("\t=> bType   %d\n", desc.bDescriptorType));
-+	DBG(("\t=> bcdUSB  %x\n", desc.bcdUSB));
-+	DBG(("\t=> idVendor %x\n", desc.idVendor));
-+	DBG(("\t=> idProduct %x\n", desc.idProduct));
- 
--	if (dev->descriptor.idVendor == 0x5345 && dev->descriptor.idProduct == 0x1234) {
-+	if (desc.idVendor == 0x5345 && desc.idProduct == 0x1234) {
- 		ep_out = 3;
- 		return 1;
- 	}
--	else if(dev->descriptor.idVendor == 0x4e8 && dev->descriptor.idProduct == 0x1234){
-+	else if(desc.idVendor == 0x4e8 && desc.idProduct == 0x1234){
- 		printf("S3C64XX Detected!\n");
- 		ep_out = 2;
- 		return 1;
-@@ -173,6 +198,12 @@ struct option long_opts[] =  {
- 		.val		= 'x',
- 	},
- 	{
-+		.name		= "help",
-+		.has_arg	= 0,
-+		.flag		= NULL,
-+		.val		= 'h',
-+	},
-+	{
- 		.name		= NULL
- 	}
- };
-@@ -181,12 +212,14 @@ int flg_show = 0;
- 
- int main(int argc, char **argv)
- {
--	struct usb_bus *bus, *busp;
--	struct usb_device *result = NULL;
--	struct usb_device *found  = NULL;
-+	ssize_t num_devs, i;
-+	libusb_device **list;
-+	libusb_device *found;
-+	int dl_ubus = -1;
-+	int dl_udev = -1;
-+	uint8_t bus_num, dev_num;
- 	unsigned long fsize;
--	usb_dev_handle *devh;
--	int ret;
-+	int ret, transferred;
- 
- 	printf("SMDK42XX,S3C64XX USB Download Tool\n");
- 	printf("Version 0.20 (c) 2004,2005,2006"
-@@ -197,7 +230,7 @@ int main(int argc, char **argv)
- 		int index = 0;
- 		int c;
- 
--		c = getopt_long(argc, argv, "a:b:d:f:s", long_opts, &index);
-+		c = getopt_long(argc, argv, "a:b:d:f:shx", long_opts, &index);
- 
- 		DBG(("option index %d\n",c ));
- 
-@@ -218,117 +251,134 @@ int main(int argc, char **argv)
- 			break;
- 
- 		case 'b':
--			dl_ubus = optarg;
-+			dl_ubus = atoi(optarg);
- 			break;
- 
- 		case 'd':
--			dl_udev = optarg;
-+			dl_udev = atoi(optarg);
- 			break;
- 
- 		case 'x':
- 			debug = 1;
-+			break;
-+
-+		case 'h':
-+			puts(
-+				"Usage: dltool [options]\n"
-+				"\n"
-+				"-a <download addr>\n"
-+				"-b <bus #>\n"
-+				"-d <dev #>\n"
-+				"-f <file>\n"
-+				"-s               Show found devices\n"
-+				"-x               Enable debug\n"
-+			);
-+			return 0;
- 		}
- 	}
- 	
--	usb_init();
--	usb_find_busses();
--	usb_find_devices();
--	
--	bus = usb_get_busses();
--
--	DBG(("usb_get_busses: %p\n", bus));
--       
--	for (busp = bus; busp != NULL; busp = busp->next) {	  
--		struct usb_device *dev;
--
--		DBG(("bus %p: dirname %s\n", busp, busp->dirname));
--
--		if (dl_ubus) {
--			if (strcmp(busp->dirname, dl_ubus) != 0)
--				continue;
--		}
-+	ret = libusb_init(&ctx);
-+	if (ret)
-+		errp("could not initialize usb stack");
- 
--		for (dev = busp->devices; dev != NULL; dev = dev->next) {
--			DBG(("dev %p filename %s\n", dev, dev->filename));
-+	bus_num = dev_num = 0;
-+	found = NULL;
-+	num_devs = libusb_get_device_list(ctx, &list);
-+	for (i = 0; i < num_devs; ++i) {
-+		libusb_device *dev = list[i];
-+		bus_num = libusb_get_bus_number(dev);
-+		dev_num = libusb_get_device_address(dev);
- 
--			if (!verify_device(dev))
--				continue;
-+		DBG(("bus %u; dev %u (%p)\n", bus_num, dev_num, dev));
- 
--			if (flg_show) {
--				printf("bus %s: device %s\n", 
--				       busp->dirname, dev->filename);
--				continue;
--			}
-+		if (dl_ubus >= 0 && bus_num != dl_ubus)
-+			continue;
- 
--			found = dev;
-+		if (!verify_device(dev))
-+			continue;
- 
--			if (dl_udev) {
--				if (strcmp(dev->filename, dl_udev) == 0) {
--					result = dev;
--					break;
--				}
--			}
-+		if (flg_show) {
-+			printf("bus %u: device %u\n", bus_num, dev_num);
-+			continue;
- 		}
- 
--		if (result != NULL)
--			break;
-+		if (dl_udev >= 0 && dev_num != dl_udev)
-+			continue;
-+
-+		found = dev;
-+		break;
- 	}
- 
- 	if (flg_show)
- 		return 0;
- 
--	DBG(("device %p, found %p\n", result, found));
-+	DBG(("found %p\n", found));
- 
--	if (result == NULL && found != NULL)
--		result = found;
--
--	if (result == NULL) {
--		fprintf(stderr, "failed to find device\n");
--		return 1;
--	}
-+	if (found == NULL)
-+		err("failed to find device\n");
- 
--	printf("=> found device: bus %s, dev %s\n",
--	       result->bus->dirname, result->filename);
-+	printf("=> found device: bus %u, dev %u\n",
-+	       bus_num, dev_num);
- 
- 	dl_data = load_file(dl_file, &dl_size, &fsize);
--	if (dl_data == NULL) {
--		printf("failed to load %s\n", dl_file);
--		return 1;
--	}
-+	if (dl_data == NULL)
-+		errp("failed to load %s", dl_file);
- 
- 	printf("=> loaded %ld bytes from %s\n", fsize, dl_file);
- 
--	devh = usb_open(result);
--	if (devh == NULL) {
--		perror("usb_open");
--		return 1;
--	}
-+	ret = libusb_open(found, &devh);
-+	if (ret == 0) {
-+		/*
-+		 * Seems to break some recovery modes :(
-+		 * http://crosbug.com/26083
-+		 * These fail:
-+		 * smdk-dltool -a 0x02021400 -f bl1.bin
-+		 * smdk-dltool -a 0x02023400 -f bl2.bin
-+		 */
-+#if 0
-+		uint8_t configuration;
-+		struct libusb_config_descriptor *config;
-+		libusb_get_active_config_descriptor(found, &config);
-+		configuration = config->bConfigurationValue;
-+		libusb_free_config_descriptor(config);
-+		libusb_set_configuration(devh, configuration);
-+#endif
-+	} else
-+		errp("libusb_open");
- 
- 	DBG(("claim interface\n"));
- 
--	if (usb_claim_interface(devh, 0) < 0) {
--		perror("usb_claim_interface");
--		usb_close(devh);
--		return 1;
--	}
-+	ret = libusb_claim_interface(devh, 0);
-+	if (ret)
-+		errp("libusb_claim_interface");
- 
- 	printf("=> Downloading %ld bytes to 0x%08lx\n", dl_size, dl_addr);
- 
- 	write_header(dl_data, dl_addr, dl_size);
- 	calc_cksum(dl_data, dl_size);
- 
--	//ret = usb_bulk_write(devh, 3, (void *)dl_data, dl_size, 5*1000*1000);
--	ret = usb_bulk_write(devh, ep_out, (void *)dl_data, dl_size, 5*1000*1000);
--	printf("=> usb_bulk_write() returned %d\n", ret);
--
--	if (ret != dl_size) {
--		printf("failed to write %ld bytes\n", dl_size);
-+	transferred = 0;
-+	while (transferred < dl_size) {
-+		int actual, expected = MIN(dl_size - transferred, CHUNKSIZE);
-+		ret = libusb_bulk_transfer(devh, ep_out, dl_data + transferred,
-+			expected, &actual, 5 * 1000 * 1000);
-+		printf("=> usb_bulk_write(%d) returned %d, wrote %d\n",
-+			expected, ret, actual);
-+		transferred += actual;
-+
-+		if (ret || (expected != actual)) {
-+			printf("failed to write %ld bytes (wrote %d): %s\n",
-+				dl_size, transferred, strerror(errno));
-+			ret = 1;
-+			break;
-+		}
- 	}
- 
- 	free(dl_data);
- 	
--	usb_release_interface(devh, 0);
--	usb_close(devh);
-+	libusb_release_interface(devh, 0);
-+	libusb_close(devh);
-+	libusb_exit(ctx);
- 
--	return 0;
-+	return ret;
- }
diff --git a/dev-embedded/smdk-dltool/files/smdk-dltool-0.20-libusb-1.0.patch b/dev-embedded/smdk-dltool/files/smdk-dltool-0.20-libusb-1.0.patch
deleted file mode 100644
index 889a439c7fb0..000000000000
--- a/dev-embedded/smdk-dltool/files/smdk-dltool-0.20-libusb-1.0.patch
+++ /dev/null
@@ -1,338 +0,0 @@
-migrate to libusb-1 by me (Mike Frysinger)
-
---- a/Makefile
-+++ b/Makefile
-@@ -10,8 +10,8 @@
- CFLAGS ?= -O2 -g
- CFLAGS += -Wall
- PKG_CONFIG ?= pkg-config
--CPPFLAGS += $(shell $(PKG_CONFIG) --cflags libusb)
--LDLIBS = $(shell $(PKG_CONFIG) --libs libusb)
-+CPPFLAGS += $(shell $(PKG_CONFIG) --cflags libusb-1.0)
-+LDLIBS = $(shell $(PKG_CONFIG) --libs libusb-1.0)
- 
- all: dltool
- 
---- a/dltool.c
-+++ b/dltool.c
-@@ -13,9 +13,11 @@
- #include <stdio.h>
- #include <getopt.h>
- #include <fcntl.h>
-+#include <errno.h>
-+#include <unistd.h>
- 
- 
--#include <usb.h>
-+#include <libusb.h>
- 
- unsigned int   debug   = 0;
- unsigned long  dl_addr = 0x30000000L;
-@@ -23,12 +25,22 @@ unsigned long  dl_size = 0L;
- unsigned char *dl_data = NULL;
- 
- char *dl_file = "download.dat";
--char *dl_udev = NULL;
--char *dl_ubus = NULL;
-+libusb_context *ctx = NULL;
-+libusb_device_handle *devh = NULL;
- 
- int ep_out = 0;
- 
- #define DBG(x) if (debug) { printf x; }
-+#define err(fmt, args...) \
-+	do { \
-+		if (devh) \
-+			libusb_close(devh); \
-+		if (ctx) \
-+			libusb_exit(ctx); \
-+		fprintf(stderr, "dltool: " fmt "\n", ## args); \
-+		exit(1); \
-+	} while (0)
-+#define errp(fmt, args...) err(fmt ": %s", ## args, strerror(errno))
- 
- void write_u32(unsigned char *dp, unsigned long val)
- {
-@@ -108,25 +120,30 @@ void calc_cksum(unsigned char *data, ssize_t len)
- 	cp[1] = cksum >> 8;
- }
- 
--int verify_device(struct usb_device *dev)
-+int verify_device(libusb_device *dev)
- {
-+	struct libusb_device_descriptor desc;
-+
-+	if (libusb_get_device_descriptor(dev, &desc))
-+		return 0;
-+
- 	DBG(("dev %p: configurations %d\n",
--	     dev, dev->descriptor.bNumConfigurations));
-+	     dev, desc.bNumConfigurations));
- 	
--	if (dev->descriptor.bNumConfigurations != 1)
-+	if (desc.bNumConfigurations != 1)
- 		return 0;
- 
--	DBG(("\t=> bLength %d\n", dev->descriptor.bLength));
--	DBG(("\t=> bType   %d\n", dev->descriptor.bDescriptorType));
--	DBG(("\t=> bcdUSB  %x\n", dev->descriptor.bcdUSB));
--	DBG(("\t=> idVendor %x\n", dev->descriptor.idVendor));
--	DBG(("\t=> idProduct %x\n", dev->descriptor.idProduct));
-+	DBG(("\t=> bLength %d\n", desc.bLength));
-+	DBG(("\t=> bType   %d\n", desc.bDescriptorType));
-+	DBG(("\t=> bcdUSB  %x\n", desc.bcdUSB));
-+	DBG(("\t=> idVendor %x\n", desc.idVendor));
-+	DBG(("\t=> idProduct %x\n", desc.idProduct));
- 
--	if (dev->descriptor.idVendor == 0x5345 && dev->descriptor.idProduct == 0x1234) {
-+	if (desc.idVendor == 0x5345 && desc.idProduct == 0x1234) {
- 		ep_out = 3;
- 		return 1;
- 	}
--	else if(dev->descriptor.idVendor == 0x4e8 && dev->descriptor.idProduct == 0x1234){
-+	else if(desc.idVendor == 0x4e8 && desc.idProduct == 0x1234){
- 		printf("S3C64XX Detected!\n");
- 		ep_out = 2;
- 		return 1;
-@@ -173,6 +190,12 @@ struct option long_opts[] =  {
- 		.val		= 'x',
- 	},
- 	{
-+		.name		= "help",
-+		.has_arg	= 0,
-+		.flag		= NULL,
-+		.val		= 'h',
-+	},
-+	{
- 		.name		= NULL
- 	}
- };
-@@ -181,12 +204,14 @@ int flg_show = 0;
- 
- int main(int argc, char **argv)
- {
--	struct usb_bus *bus, *busp;
--	struct usb_device *result = NULL;
--	struct usb_device *found  = NULL;
-+	ssize_t num_devs, i;
-+	libusb_device **list;
-+	libusb_device *found;
-+	int dl_ubus = -1;
-+	int dl_udev = -1;
-+	uint8_t bus_num, dev_num;
- 	unsigned long fsize;
--	usb_dev_handle *devh;
--	int ret;
-+	int ret, transferred;
- 
- 	printf("SMDK42XX,S3C64XX USB Download Tool\n");
- 	printf("Version 0.20 (c) 2004,2005,2006"
-@@ -197,7 +222,7 @@ int main(int argc, char **argv)
- 		int index = 0;
- 		int c;
- 
--		c = getopt_long(argc, argv, "a:b:d:f:s", long_opts, &index);
-+		c = getopt_long(argc, argv, "a:b:d:f:shx", long_opts, &index);
- 
- 		DBG(("option index %d\n",c ));
- 
-@@ -218,117 +243,127 @@ int main(int argc, char **argv)
- 			break;
- 
- 		case 'b':
--			dl_ubus = optarg;
-+			dl_ubus = atoi(optarg);
- 			break;
- 
- 		case 'd':
--			dl_udev = optarg;
-+			dl_udev = atoi(optarg);
- 			break;
- 
- 		case 'x':
- 			debug = 1;
-+			break;
-+
-+		case 'h':
-+			puts(
-+				"Usage: dltool [options]\n"
-+				"\n"
-+				"-a <download addr>\n"
-+				"-b <bus #>\n"
-+				"-d <dev #>\n"
-+				"-f <file>\n"
-+				"-s               Show found devices\n"
-+				"-x               Enable debug\n"
-+			);
-+			return 0;
- 		}
- 	}
- 	
--	usb_init();
--	usb_find_busses();
--	usb_find_devices();
--	
--	bus = usb_get_busses();
--
--	DBG(("usb_get_busses: %p\n", bus));
--       
--	for (busp = bus; busp != NULL; busp = busp->next) {	  
--		struct usb_device *dev;
--
--		DBG(("bus %p: dirname %s\n", busp, busp->dirname));
--
--		if (dl_ubus) {
--			if (strcmp(busp->dirname, dl_ubus) != 0)
--				continue;
-+	ret = libusb_init(&ctx);
-+	if (ret)
-+		errp("could not initialize usb stack");
-+
-+	bus_num = dev_num = 0;
-+	found = NULL;
-+	num_devs = libusb_get_device_list(ctx, &list);
-+	for (i = 0; i < num_devs; ++i) {
-+		libusb_device *dev = list[i];
-+		bus_num = libusb_get_bus_number(dev);
-+		dev_num = libusb_get_device_address(dev);
-+
-+		DBG(("bus %u; dev %u (%p)\n", bus_num, dev_num, dev));
-+
-+		if (dl_ubus >= 0 && bus_num != dl_ubus)
-+			continue;
-+
-+		if (!verify_device(dev))
-+			continue;
-+
-+		if (flg_show) {
-+			printf("bus %u: device %u\n", bus_num, dev_num);
-+			continue;
- 		}
- 
--		for (dev = busp->devices; dev != NULL; dev = dev->next) {
--			DBG(("dev %p filename %s\n", dev, dev->filename));
-+		if (dl_udev >= 0 && dev_num != dl_udev)
-+			continue;
- 
--			if (!verify_device(dev))
--				continue;
--
--			if (flg_show) {
--				printf("bus %s: device %s\n", 
--				       busp->dirname, dev->filename);
--				continue;
--			}
--
--			found = dev;
--
--			if (dl_udev) {
--				if (strcmp(dev->filename, dl_udev) == 0) {
--					result = dev;
--					break;
--				}
--			}
--		}
--
--		if (result != NULL)
--			break;
-+		found = dev;
-+		break;
- 	}
- 
- 	if (flg_show)
- 		return 0;
- 
--	DBG(("device %p, found %p\n", result, found));
-+	DBG(("found %p\n", found));
- 
--	if (result == NULL && found != NULL)
--		result = found;
--
--	if (result == NULL) {
--		fprintf(stderr, "failed to find device\n");
--		return 1;
--	}
-+	if (found == NULL)
-+		err("failed to find device\n");
- 
--	printf("=> found device: bus %s, dev %s\n",
--	       result->bus->dirname, result->filename);
-+	printf("=> found device: bus %u, dev %u\n",
-+	       bus_num, dev_num);
- 
- 	dl_data = load_file(dl_file, &dl_size, &fsize);
--	if (dl_data == NULL) {
--		printf("failed to load %s\n", dl_file);
--		return 1;
--	}
-+	if (dl_data == NULL)
-+		errp("failed to load %s", dl_file);
- 
- 	printf("=> loaded %ld bytes from %s\n", fsize, dl_file);
- 
--	devh = usb_open(result);
--	if (devh == NULL) {
--		perror("usb_open");
--		return 1;
--	}
-+	ret = libusb_open(found, &devh);
-+	if (ret == 0) {
-+		/*
-+		 * Seems to break some recovery modes :(
-+		 * http://crosbug.com/26083
-+		 * These fail:
-+		 * smdk-dltool -a 0x02021400 -f bl1.bin
-+		 * smdk-dltool -a 0x02023400 -f bl2.bin
-+		 */
-+#if 0
-+		uint8_t configuration;
-+		struct libusb_config_descriptor *config;
-+		libusb_get_active_config_descriptor(found, &config);
-+		configuration = config->bConfigurationValue;
-+		libusb_free_config_descriptor(config);
-+		libusb_set_configuration(devh, configuration);
-+#endif
-+	} else
-+		errp("libusb_open");
- 
- 	DBG(("claim interface\n"));
- 
--	if (usb_claim_interface(devh, 0) < 0) {
--		perror("usb_claim_interface");
--		usb_close(devh);
--		return 1;
--	}
-+	ret = libusb_claim_interface(devh, 0);
-+	if (ret)
-+		errp("libusb_claim_interface");
- 
- 	printf("=> Downloading %ld bytes to 0x%08lx\n", dl_size, dl_addr);
- 
- 	write_header(dl_data, dl_addr, dl_size);
- 	calc_cksum(dl_data, dl_size);
- 
--	//ret = usb_bulk_write(devh, 3, (void *)dl_data, dl_size, 5*1000*1000);
--	ret = usb_bulk_write(devh, ep_out, (void *)dl_data, dl_size, 5*1000*1000);
-+	//ret = libusb_bulk_transfer(devh, 3, dl_data, dl_size, &transferred, 5*1000*1000);
-+	ret = libusb_bulk_transfer(devh, ep_out, dl_data, dl_size, &transferred, 5*1000*1000);
- 	printf("=> usb_bulk_write() returned %d\n", ret);
- 
--	if (ret != dl_size) {
--		printf("failed to write %ld bytes\n", dl_size);
-+	if (ret || transferred != dl_size) {
-+		printf("failed to write %ld bytes (wrote %d): %s\n",
-+			dl_size, transferred, strerror(errno));
-+		ret = 1;
- 	}
- 
- 	free(dl_data);
- 	
--	usb_release_interface(devh, 0);
--	usb_close(devh);
-+	libusb_release_interface(devh, 0);
-+	libusb_close(devh);
-+	libusb_exit(ctx);
- 
--	return 0;
-+	return ret;
- }
diff --git a/dev-embedded/smdk-dltool/metadata.xml b/dev-embedded/smdk-dltool/metadata.xml
deleted file mode 100644
index 71b1461e1146..000000000000
--- a/dev-embedded/smdk-dltool/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>embedded@gentoo.org</email>
-	<name>Embedded Gentoo</name>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-embedded/smdk-dltool/smdk-dltool-0.20-r3.ebuild b/dev-embedded/smdk-dltool/smdk-dltool-0.20-r3.ebuild
deleted file mode 100644
index d15dedcb728c..000000000000
--- a/dev-embedded/smdk-dltool/smdk-dltool-0.20-r3.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit toolchain-funcs eutils
-
-DESCRIPTION="Tool to communicate with Samsung SMDK boards"
-HOMEPAGE="http://www.fluff.org/ben/smdk/tools/"
-SRC_URI="http://www.fluff.org/ben/smdk/tools/downloads/smdk-tools-v${PV}.tar.gz"
-
-# Email sent to author on 2012-01-18 querying about license
-LICENSE="all-rights-reserved"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-RESTRICT="mirror bindist"
-
-RDEPEND="virtual/libusb:1"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/releases/smdk-tools-v${PV}/dltool
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-add-S3C64xx-support.patch
-	epatch "${FILESDIR}"/${P}-build.patch
-	epatch "${FILESDIR}"/${P}-libusb-1.0.patch
-	tc-export CC PKG_CONFIG
-}
-
-src_install() {
-	newbin dltool smdk-usbdl
-	dodoc readme.txt
-}
diff --git a/dev-embedded/smdk-dltool/smdk-dltool-0.20-r4.ebuild b/dev-embedded/smdk-dltool/smdk-dltool-0.20-r4.ebuild
deleted file mode 100644
index a0fec4846a4f..000000000000
--- a/dev-embedded/smdk-dltool/smdk-dltool-0.20-r4.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit toolchain-funcs eutils
-
-DESCRIPTION="Tool to communicate with Samsung SMDK boards"
-HOMEPAGE="http://www.fluff.org/ben/smdk/tools/"
-SRC_URI="http://www.fluff.org/ben/smdk/tools/downloads/smdk-tools-v${PV}.tar.gz"
-
-# Email sent to author on 2012-01-18 querying about license
-LICENSE="all-rights-reserved"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-RESTRICT="mirror bindist"
-
-RDEPEND="virtual/libusb:1"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/releases/smdk-tools-v${PV}/dltool
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-add-S3C64xx-support.patch
-	epatch "${FILESDIR}"/${P}-build.patch
-	epatch "${FILESDIR}"/${P}-libusb-1.0-r1.patch
-	tc-export CC PKG_CONFIG
-}
-
-src_install() {
-	newbin dltool smdk-usbdl
-	dodoc readme.txt
-}
diff --git a/dev-embedded/srecord-1.64 b/dev-embedded/srecord-1.64
new file mode 100644
index 000000000000..fe2ff8521901
--- /dev/null
+++ b/dev-embedded/srecord-1.64
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=dev-libs/libgcrypt:0 dev-libs/boost sys-apps/groff test? ( app-arch/sharutils ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=A collection of powerful tools for manipulating EPROM load files
+EAPI=6
+HOMEPAGE=http://srecord.sourceforge.net/
+IUSE=static-libs test
+KEYWORDS=~amd64 ~sparc ~x86
+LICENSE=GPL-3
+RDEPEND=dev-libs/libgcrypt:0
+SLOT=0
+SRC_URI=mirror://sourceforge/srecord/srecord-1.64.tar.gz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=feef0cde5d4340381cf05fe02b379473
diff --git a/dev-embedded/srecord/Manifest b/dev-embedded/srecord/Manifest
deleted file mode 100644
index a35a790d8209..000000000000
--- a/dev-embedded/srecord/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX srecord-1.57-libtool.patch 1733 BLAKE2B bf3e3758ba00e01a7a2325a3d23f500055c9e4f01299e9e21e42d6516fce3055c49f28bb8384fe186ac6111d75d6f6e689b6425368182576d13f68ad624ea0c5 SHA512 f4b9d701ac7b364f5f43dab835c0249d9d2f54903a371cdd9a03a63f082e4c93f15adc4cc9a39ccf5dd8feb56f579c2f96697c0c7b8d2730cf845ac477b20a83
-DIST srecord-1.64.tar.gz 942513 BLAKE2B 5bd4e8706f2499968930883e624b3dc7f8f061e8d697584b63a8792d111fd51e37b198fd81a81d8ede6f7eeb42860e83e86a0abeb0856e4cb5847d3db2d30382 SHA512 f96f2d9cd2c475d040c0474a35a17ebca2f0fb737856cdafe1227758a3e52176e4ab3e8577520c21e75e468d74fa98695128c02120734b6e92d8573e76af50b3
-EBUILD srecord-1.64.ebuild 739 BLAKE2B 824cec0e4409b59a584d2894ecf0934cc3de55e99bc3dfbffa0dfe3112f72c2fd252feee6d0a58b1888b76a0fcc355b084afb10643e1dbb363d0b667c357b80b SHA512 84b65cfd579dca4b631c04060143047710df83a38bc781ffcbb2eea17cfe0c9e3c278634cde0e9d0c6d7bdb37e8069e709ba5e088660e251d44e94d0a5453a53
-MISC metadata.xml 455 BLAKE2B e79fff328a0032376b811c49e9e5db7fc8c3f2e539e5d475a91f976e475256dd16ed5e8166f8fe5aa7ba86034884d2bf2633fae8a466db2bdf07e0ab75b92fd5 SHA512 221d3f902bf77fb71de6db4fb99874fd37183124b5858b112240ab1469b1f92f3142876b039498fdff03a46445b83cb1ffc71d37305bed7ec5fa79924df92403
diff --git a/dev-embedded/srecord/files/srecord-1.57-libtool.patch b/dev-embedded/srecord/files/srecord-1.57-libtool.patch
deleted file mode 100644
index d1195726a3d2..000000000000
--- a/dev-embedded/srecord/files/srecord-1.57-libtool.patch
+++ /dev/null
@@ -1,70 +0,0 @@
---- srecord-1.57.orig/etc/configure.ac
-+++ srecord-1.57/etc/configure.ac
-@@ -29,6 +29,10 @@
- AC_CHECK_FUNCS(snprintf vsnprintf)
- AC_CHECK_LIB(gcrypt, gcry_md_open)
- 
-+top_builddir=`pwd`
-+AC_SUBST(top_builddir)
-+LT_INIT
-+
- dnl
- dnl Make sure Boost is installed.
- dnl
-@@ -119,46 +123,6 @@
- operating system has a libgcrypt that supports WHIRLPOOL.])
- AC_MSG_RESULT(yes),AC_MSG_RESULT(no))dnl
- 
--dnl!
--dnl!  Now look for libtool.
--dnl!
--AC_CHECK_PROGS(LIBTOOL, libtool)
--if test -z "$LIBTOOL"
--then
--  AC_MSG_RESULT([
--        You must have GNU Libtool installed to build srecord.
--        Homepage: http://www.gnu.org/software/libtool/])
--  OK=no
--  if apt-get --version > /dev/null 2> /dev/null; then
--    AC_MSG_RESULT([
--        The following command may be used to install it:
--        sudo apt-get install libtool
--    ])
--    OK=yes
--  fi
--  if yum --version > /dev/null 2> /dev/null; then
--    AC_MSG_RESULT([
--        The following command may be used to install it:
--        sudo yum install libtool
--    ])
--    OK=yes
--  fi
--  if pkg_info -a > /dev/null 2> /dev/null; then
--    AC_MSG_RESULT([
--        The following command may be used to install it:
--        sudo pkg_add -r libtool
--    ])
--    OK=yes
--  fi
--  if test "$OK" != "yes"; then
--    AC_MSG_RESULT([
--        If you are using a package based install, you will need the
--        libtool package.
--    ])
--  fi
--  exit 1
--fi
--
- dnl
- dnl     If the soelim program exists, and understands the -I option,
- dnl     arrange for the Makefile to install the .ps files from the
---- srecord-1.57.orig/Makefile.in
-+++ srecord-1.57/Makefile.in
-@@ -35,6 +35,7 @@
- #
- # directory containing the source
- #
-+top_builddir = @top_builddir@
- srcdir = @srcdir@
- VPATH = @srcdir@
- 
diff --git a/dev-embedded/srecord/metadata.xml b/dev-embedded/srecord/metadata.xml
deleted file mode 100644
index 17dbb943a18e..000000000000
--- a/dev-embedded/srecord/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>embedded@gentoo.org</email>
-		<name>Embedded Gentoo</name>
-	</maintainer>
-	<longdescription>
-The SRecord package is a collection of powerful tools for manipulating EPROM load files.
-</longdescription>
-	<upstream>
-		<remote-id type="sourceforge">srecord</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-embedded/srecord/srecord-1.64.ebuild b/dev-embedded/srecord/srecord-1.64.ebuild
deleted file mode 100644
index beccea452409..000000000000
--- a/dev-embedded/srecord/srecord-1.64.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils autotools
-
-DESCRIPTION="A collection of powerful tools for manipulating EPROM load files"
-HOMEPAGE="http://srecord.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~sparc ~x86"
-IUSE="static-libs test"
-
-RDEPEND="dev-libs/libgcrypt:0"
-DEPEND="${RDEPEND}
-	dev-libs/boost
-	sys-apps/groff
-	test? ( app-arch/sharutils )"
-
-PATCHES=( "${FILESDIR}"/${PN}-1.57-libtool.patch )
-
-src_prepare() {
-	default
-
-	cp etc/configure.ac "${S}"
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_enable static-libs static)
-}
-
-src_install() {
-	default
-	prune_libtool_files
-}
diff --git a/dev-embedded/stlink-1.4.0 b/dev-embedded/stlink-1.4.0
new file mode 100644
index 000000000000..d7bb108c589d
--- /dev/null
+++ b/dev-embedded/stlink-1.4.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=virtual/libusb:1 >=dev-libs/glib-2.32.0:2 x11-libs/gtk+:3 virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 virtual/pkgconfig
+DESCRIPTION=stm32 discovery line linux programmer
+EAPI=6
+HOMEPAGE=https://github.com/texane/stlink
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=virtual/libusb:1 >=dev-libs/glib-2.32.0:2 x11-libs/gtk+:3
+SLOT=0
+SRC_URI=https://github.com/texane/stlink/archive/1.4.0/stlink-1.4.0.tar.gz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=2d50c7976847da80ba8561a3fcf83ee2
diff --git a/dev-embedded/stlink-1.5.0 b/dev-embedded/stlink-1.5.0
new file mode 100644
index 000000000000..84cea7ceeabd
--- /dev/null
+++ b/dev-embedded/stlink-1.5.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=virtual/libusb:1 >=dev-libs/glib-2.32.0:2 x11-libs/gtk+:3 virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 virtual/pkgconfig
+DESCRIPTION=stm32 discovery line linux programmer
+EAPI=6
+HOMEPAGE=https://github.com/texane/stlink
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=virtual/libusb:1 >=dev-libs/glib-2.32.0:2 x11-libs/gtk+:3
+SLOT=0
+SRC_URI=https://github.com/texane/stlink/archive/1.5.0/stlink-1.5.0.tar.gz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=7b8604b148d5297c50478f44cd696ced
diff --git a/dev-embedded/stlink-9999 b/dev-embedded/stlink-9999
new file mode 100644
index 000000000000..ebfe872e9460
--- /dev/null
+++ b/dev-embedded/stlink-9999
@@ -0,0 +1,10 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=virtual/libusb:1 >=dev-libs/glib-2.32.0:2 x11-libs/gtk+:3 virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
+DESCRIPTION=stm32 discovery line linux programmer
+EAPI=6
+HOMEPAGE=https://github.com/texane/stlink
+LICENSE=BSD
+RDEPEND=virtual/libusb:1 >=dev-libs/glib-2.32.0:2 x11-libs/gtk+:3
+SLOT=0
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	8f6de46b0aa318aea0e8cac62ece098b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=75fe97e13f6219c742448206d9d6c87e
diff --git a/dev-embedded/stlink/Manifest b/dev-embedded/stlink/Manifest
deleted file mode 100644
index edd1c95d8595..000000000000
--- a/dev-embedded/stlink/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX stlink-1.4.0-add-LIB_INSTALL_DIR-flag-630932.patch 1760 BLAKE2B b6f195ec18c1886dc561a85bea9792eedada56e9744f51af92f6dfb9f3303f3b6f038afcd60456462ffdc689d283e38f73a5058c8b4774257048f67976fc3407 SHA512 604a0c6e18dbd5a7645a2edc17754d8e6fce4f4d7fa595da1fa52c8e0c8178fcabe163195575e35c07933b04a5804d154b74fed19caec9c92427374905ddf0d0
-DIST stlink-1.4.0.tar.gz 138765 BLAKE2B e7dddd51e4ff0c0342b3df62a10b33736acf6380afc449e3ac7d67b607bc217df05b02ddcfed73d83190b9a5cb02f5f1d01beaab5de5f3cd92214fd916793b9e SHA512 cb7617068a6dcaf7e8d0ccfb8b918f0373f6120398dab40a8b8d6567705871226684fd19aad92e4bab623310a5da13ea9fd70153b619f58d3534f0a4ff3a9886
-DIST stlink-1.5.0.tar.gz 140484 BLAKE2B fa6f0a770ccc77629e4edcbd1a6112f8917ac84c00693756d4905b92c5ba83f445193e65c37cda5e5942605bb3da0fa6a6833af52d9572c73b0796ece754ffad SHA512 0e93c0fdcd377c6f2d452b9b6fa00b741dc0dd906673773ef09185aca4f63930db61e137bb28c47e34218edca9f7a80cd05352fb8f9d8e50b000c779cc36580a
-EBUILD stlink-1.4.0.ebuild 929 BLAKE2B 86439a1906feff17d6e0e3d89b33fa3c1824d8e0394b3a02d8fa3f66f03bfc75a9af3f7c1c9a24e9e1bec0666af27ded2e7d020d24ecfe226b686775aaed3743 SHA512 7d9b220d6dd5729b5b5756946d7f53b7595ceabad627cd8b03cbd782d42569c565b0d554cd970e11363ba2018e13f361bf9f465ee9d43304125f997d31550c20
-EBUILD stlink-1.5.0.ebuild 798 BLAKE2B 10185c4888c117b2d65cd6ec4e7456e35c253ba6dcd2976140323bb20a65df4bbd675d2d1bcc2baf1b4860eea1fc4ca72cb935dfe36f957065d25814fe54e43e SHA512 2443b473bcc0c32570cc98cd2a1046e77d6fd9684a056c756aea5c53fc29280f14d6784bb49deba9037bc3e07c3b2eeefccee1398b45a9175ab47a342878e696
-EBUILD stlink-9999.ebuild 798 BLAKE2B d9f16816c4e8e9eef92b8645520b5b69761d15c4519196fc2bd773d55022236f4baf61b1b32f4ba302b90120639bb46ac29d9087e7a86e5ee8bcc15b3b535c8c SHA512 5cf360edbf4d74654389bd14c3ce1ffd30f70a19ec79b43bb8e4ba433a024e5deb96e6ca62c6052c6e2cfeb7566ed16f801e9b66330394d92373132718c76dcc
-MISC metadata.xml 248 BLAKE2B 946598a9bc9f658d98c3282fd6affeb3834a4b6071beca852a2f2381d5c17799b6ed17ed427a8f6e10fb3f715cdf2aad9e4fed2886f0dd67dacfdffcd5137f80 SHA512 89d637e180ed3a2c2096be2210633dc5df0760a7d6acd7b2d2ad8a06d473943ee86bad7e74c7df238a50168d1da8044471713e9b044007b9c2f4eb604fb710d5
diff --git a/dev-embedded/stlink/files/stlink-1.4.0-add-LIB_INSTALL_DIR-flag-630932.patch b/dev-embedded/stlink/files/stlink-1.4.0-add-LIB_INSTALL_DIR-flag-630932.patch
deleted file mode 100644
index aa077c0823bd..000000000000
--- a/dev-embedded/stlink/files/stlink-1.4.0-add-LIB_INSTALL_DIR-flag-630932.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From cbba564f60bacd30344f9bb5c7bebaf8283b6794 Mon Sep 17 00:00:00 2001
-From: Vasiliy Glazov <vascom2@gmail.com>
-Date: Fri, 8 Sep 2017 15:00:45 +0300
-Subject: [PATCH] Added LIB_INSTALL_DIR to correct libs install on 64-bit
- systems (#636)
-
-* Added LIB_INSTALL_DIR to correct libs install on 64-bit systems
-* Add description for using LIB_INSTALL_DIR parameter.
----
- CMakeLists.txt   | 3 ++-
- doc/compiling.md | 9 +++++++++
- 2 files changed, 11 insertions(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 46790de..da99b6e 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -4,7 +4,8 @@ project(stlink C)
- set(PROJECT_DESCRIPTION "Open source version of the STMicroelectronics Stlink Tools")
- set(STLINK_UDEV_RULES_DIR "/etc/udev/rules.d" CACHE PATH "Udev rules directory")
- set(STLINK_MODPROBED_DIR "/etc/modprobe.d" CACHE PATH "modprobe.d directory")
--set(STLINK_LIBRARY_PATH "lib/${CMAKE_LIBRARY_PATH}" CACHE PATH "Target lib directory")
-+set(LIB_INSTALL_DIR "lib" CACHE PATH "Main library directory")
-+set(STLINK_LIBRARY_PATH "${LIB_INSTALL_DIR}/${CMAKE_LIBRARY_PATH}" CACHE PATH "Target lib directory")
- 
- option(STLINK_GENERATE_MANPAGES "Generate manpages with pandoc" OFF)
- 
-diff --git a/doc/compiling.md b/doc/compiling.md
-index 3518d10..41d1fb7 100644
---- a/doc/compiling.md
-+++ b/doc/compiling.md
-@@ -118,6 +118,15 @@ $ cmake -DSTLINK_UDEV_RULES_DIR="/usr/lib/udev/rules.d" \
-         -DSTLINK_MODPROBED_DIR="/usr/lib/modprobe.d" ..
- ```
- 
-+## Build using different directory for shared libs
-+
-+To put the compiled shared libs into a different directory during installation
-+you can use the following cmake option:
-+
-+```
-+$ cmake -DLIB_INSTALL_DIR:PATH="/usr/lib64"  ..
-+```
-+
- ## Windows (MinGW64) 
- 
- ### Prequistes
--- 
-2.13.6
-
diff --git a/dev-embedded/stlink/metadata.xml b/dev-embedded/stlink/metadata.xml
deleted file mode 100644
index 086586c08a88..000000000000
--- a/dev-embedded/stlink/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>alexxy@gentoo.org</email>
-		<name>Alexey Shvetsov</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/dev-embedded/stlink/stlink-1.4.0.ebuild b/dev-embedded/stlink/stlink-1.4.0.ebuild
deleted file mode 100644
index c349f40b793c..000000000000
--- a/dev-embedded/stlink/stlink-1.4.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit cmake-utils udev
-
-DESCRIPTION="stm32 discovery line linux programmer"
-HOMEPAGE="https://github.com/texane/stlink"
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/texane/stlink.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/texane/stlink/archive/${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="virtual/libusb:1
-	>=dev-libs/glib-2.32.0:2
-	x11-libs/gtk+:3"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-# Fix bug #630932; >1.4.0 should render this obsolete
-PATCHES=( "${FILESDIR}/${PN}-1.4.0-add-LIB_INSTALL_DIR-flag-630932.patch" )
-
-src_configure() {
-	local mycmakeargs=(
-		-DSTLINK_UDEV_RULES_DIR="$(get_udevdir)"/rules.d
-		-DSTLINK_MODPROBED_DIR="${EPREFIX}/etc/modprobe.d"
-		-DLIB_INSTALL_DIR:PATH="$(get_libdir)"
-	)
-
-	cmake-utils_src_configure
-}
diff --git a/dev-embedded/stlink/stlink-1.5.0.ebuild b/dev-embedded/stlink/stlink-1.5.0.ebuild
deleted file mode 100644
index b733c93f5a36..000000000000
--- a/dev-embedded/stlink/stlink-1.5.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit cmake-utils udev
-
-DESCRIPTION="stm32 discovery line linux programmer"
-HOMEPAGE="https://github.com/texane/stlink"
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/texane/stlink.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/texane/stlink/archive/${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="virtual/libusb:1
-	>=dev-libs/glib-2.32.0:2
-	x11-libs/gtk+:3"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_configure() {
-	local mycmakeargs=(
-		-DSTLINK_UDEV_RULES_DIR="$(get_udevdir)"/rules.d
-		-DSTLINK_MODPROBED_DIR="${EPREFIX}/etc/modprobe.d"
-		-DLIB_INSTALL_DIR:PATH="$(get_libdir)"
-	)
-
-	cmake-utils_src_configure
-}
diff --git a/dev-embedded/stlink/stlink-9999.ebuild b/dev-embedded/stlink/stlink-9999.ebuild
deleted file mode 100644
index 479ca67cd591..000000000000
--- a/dev-embedded/stlink/stlink-9999.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit cmake-utils udev
-
-DESCRIPTION="stm32 discovery line linux programmer"
-HOMEPAGE="https://github.com/texane/stlink"
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/texane/stlink.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/texane/stlink/archive/${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="virtual/libusb:1
-	>=dev-libs/glib-2.32.0:2
-	x11-libs/gtk+:3"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_configure() {
-	local mycmakeargs=(
-		-DSTLINK_UDEV_RULES_DIR="$(get_udevdir)"/rules.d
-		-DSTLINK_MODPROBED_DIR="${EPREFIX}/etc/modprobe.d"
-		-DLIB_INSTALL_DIR:PATH="$(get_libdir)"
-	)
-
-	cmake-utils_src_configure
-}
diff --git a/dev-embedded/stm32flash-0.5 b/dev-embedded/stm32flash-0.5
new file mode 100644
index 000000000000..02073ac02d2c
--- /dev/null
+++ b/dev-embedded/stm32flash-0.5
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install prepare
+DESCRIPTION=Open source flash program for STM32 using the ST serial bootloader
+EAPI=6
+HOMEPAGE=https://sourceforge.net/projects/stm32flash/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+SLOT=0
+SRC_URI=mirror://sourceforge/project/stm32flash/stm32flash-0.5.tar.gz
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=0962d41d8f5491dca02e485d88c091bf
diff --git a/dev-embedded/stm32flash/Manifest b/dev-embedded/stm32flash/Manifest
deleted file mode 100644
index 30cfd8330241..000000000000
--- a/dev-embedded/stm32flash/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST stm32flash-0.5.tar.gz 41087 BLAKE2B 581ef883537783fafcff8a7471a697f50929b572d847791d692799040fd54845a67a7b6b608401df24f05810ae81b7e19df646f2835bc3d7cd35888d8649be6a SHA512 a01875a315d92d5e347372b736f2afa2f633851bf13af1326341c0c91e17cef54b6730ed1279280e86d3797033c856dfc25e8c595e010772b9287aaf965273f9
-EBUILD stm32flash-0.5.ebuild 493 BLAKE2B 005d32677b1960a3cf928df51c938063fb0cf80433eb6023853cdc3715d69c7d63294d61e9548589b52fdbc1fd1d8596cd1c049f6e736dd8c7f92c3dc4d0dc0c SHA512 b06eb6106ea672cccb75c4d75f4ef77ea1cafecb8d30d72376a77971d0c806e5005549e01cba9e9359d6632e5e1d0b58bd040b3225e145a235a867cad963e8a6
-MISC metadata.xml 238 BLAKE2B 72d4053d28bbf82c9a08a88b354321a782501542b5d506fc6d9f4034839f302761124d59445c0414a0fd38b6401cd5fbe06670802abdb1f25c7cb60919ea5d2e SHA512 b0b981ef72f4d295f427f92dc9931553b4fb7a91c8ed63fa1f28bdbe8bc61d6f0943e1217eb7b61b8d85d9685cbe759db49f094a18a1461cb48429affe76d993
diff --git a/dev-embedded/stm32flash/metadata.xml b/dev-embedded/stm32flash/metadata.xml
deleted file mode 100644
index a8fb43312942..000000000000
--- a/dev-embedded/stm32flash/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="person">
-<email>jer@gentoo.org</email>
-<name>Jeroen Roovers</name>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-embedded/stm32flash/stm32flash-0.5.ebuild b/dev-embedded/stm32flash/stm32flash-0.5.ebuild
deleted file mode 100644
index c1e17f12ab38..000000000000
--- a/dev-embedded/stm32flash/stm32flash-0.5.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit toolchain-funcs
-
-DESCRIPTION="Open source flash program for STM32 using the ST serial bootloader"
-HOMEPAGE="https://sourceforge.net/projects/stm32flash/"
-SRC_URI="mirror://sourceforge/project/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-S=${WORKDIR}/${PN}
-
-src_prepare() {
-	default
-	tc-export CC
-}
-
-src_install() {
-	dobin ${PN}
-	doman ${PN}.1
-}
diff --git a/dev-embedded/sunxi-tools-1.2 b/dev-embedded/sunxi-tools-1.2
new file mode 100644
index 000000000000..ccd16285759e
--- /dev/null
+++ b/dev-embedded/sunxi-tools-1.2
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install
+DEPEND=virtual/libusb
+DESCRIPTION=Tools for Allwinner A10 devices.
+EAPI=5
+HOMEPAGE=http://linux-sunxi.org/
+KEYWORDS=~amd64
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=https://github.com/linux-sunxi/sunxi-tools/archive/v1.2.tar.gz -> sunxi-tools-1.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=35593c1b42d43737beadf1376be94676
diff --git a/dev-embedded/sunxi-tools-1.3 b/dev-embedded/sunxi-tools-1.3
new file mode 100644
index 000000000000..25b01ad3cc66
--- /dev/null
+++ b/dev-embedded/sunxi-tools-1.3
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install
+DEPEND=virtual/libusb
+DESCRIPTION=Tools for Allwinner A10 devices.
+EAPI=6
+HOMEPAGE=http://linux-sunxi.org/
+KEYWORDS=~amd64
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=https://github.com/linux-sunxi/sunxi-tools/archive/v1.3.tar.gz -> sunxi-tools-1.3.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=9496e90c1f834d55d2e0efb2fecdf6fa
diff --git a/dev-embedded/sunxi-tools/Manifest b/dev-embedded/sunxi-tools/Manifest
deleted file mode 100644
index a70e9ad4936c..000000000000
--- a/dev-embedded/sunxi-tools/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST sunxi-tools-1.2.tar.gz 35378 BLAKE2B b5acc24e2951ab1960f153023e47da650db90507f742ae0607a6b693b063e4e531212f06f9c92798c59745938cde4df46540abb1ed16bf1690b9facfa205522b SHA512 bf050e4c9a338ad0b128f455a415904107efe54878e831074373b20f727a4cf9700a7b4ad73a5b21c91a1f41b588ec35070b54671c01c8ab81e0c340c299a2b1
-DIST sunxi-tools-1.3.tar.gz 52608 BLAKE2B e8c3ed7276f705273598e38a0cc469225de1ee4eb8177b78be63b78ebc584c4fdf2362e21b895f61b4c5e84df98bfd5ccf6d3965ffa9338c98027c9ce4635626 SHA512 954c95963013aee8a38b3583ba1b7ec7e7049c7e09c5fa9ec564dfc33f304d3669fdf68c2fa5e4b5a6265640a3d1ee8bc13bcd71d804c714884b6a780d193615
-EBUILD sunxi-tools-1.2.ebuild 621 BLAKE2B 4661e894651a4c5ff072dc65b1c2a914eea92b68a29a427fd20e63ff79eb56be75923df7989bf0ae8f66908ed65ff48380344e01139764d441e10d4909c729fa SHA512 5b66c660a11b090d1b59be6a15ebbe90a3295066da4a3826d7ade9e191950352371181fe528fec4f8aa08d2e1502d4eb4016e6c3817060650b2470ff022eeeaf
-EBUILD sunxi-tools-1.3.ebuild 723 BLAKE2B 42a831a3e66be96cd0bed7b92b304d8cecd70ee242a85c5cc2f4a5d3fe67f38c1f6d13215e7d61398d4f79eb0c71dc75154e30ba3af5aa613473e6f399deb06d SHA512 df9debd93ef5acc28c44b59768b15d0a30c10debad644521b35d338bfa84b8ed56b7a4e7ab6294399da20d8a3364c03098d77e774bc773d6472eb7e7565be8ed
-MISC metadata.xml 445 BLAKE2B 7f48b3211e92049eed919e01c66b1426af951ac66112e24d93a0966aaeae8f5fec6c5cea6f158f555783007d0bbf59527bab559bab6ec499f8feef0308f032a0 SHA512 9b27e2b262f1401c49d75e0ea2fa03f91259da53a3a9ee2af54e5963471b3ef605d12ec3486752e89dd77c7721f49ab0fa0ac9705ff0a65b9875b6552dae50b3
diff --git a/dev-embedded/sunxi-tools/metadata.xml b/dev-embedded/sunxi-tools/metadata.xml
deleted file mode 100644
index e0d1d6ad9792..000000000000
--- a/dev-embedded/sunxi-tools/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://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>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">linux-sunxi/sunxi-tools</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-embedded/sunxi-tools/sunxi-tools-1.2.ebuild b/dev-embedded/sunxi-tools/sunxi-tools-1.2.ebuild
deleted file mode 100644
index c332d4dea74b..000000000000
--- a/dev-embedded/sunxi-tools/sunxi-tools-1.2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils toolchain-funcs
-
-MY_PV="v${PV}"
-SRC_URI="https://github.com/linux-sunxi/sunxi-tools/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-DESCRIPTION="Tools for Allwinner A10 devices."
-HOMEPAGE="http://linux-sunxi.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-KEYWORDS="~amd64"
-
-DEPEND="virtual/libusb"
-
-src_compile() {
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS} -std=c99 -D_POSIX_C_SOURCE=200112L -Iinclude/" all misc
-}
-
-src_install() {
-	dobin bin2fex bootinfo fel fex2bin fexc nand-part phoenix_info pio
-}
diff --git a/dev-embedded/sunxi-tools/sunxi-tools-1.3.ebuild b/dev-embedded/sunxi-tools/sunxi-tools-1.3.ebuild
deleted file mode 100644
index aa263865c0de..000000000000
--- a/dev-embedded/sunxi-tools/sunxi-tools-1.3.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit eutils toolchain-funcs
-
-MY_PV="v${PV}"
-SRC_URI="https://github.com/linux-sunxi/sunxi-tools/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-DESCRIPTION="Tools for Allwinner A10 devices."
-HOMEPAGE="http://linux-sunxi.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-KEYWORDS="~amd64"
-
-DEPEND="virtual/libusb"
-
-src_compile() {
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS} -std=c99 -D_POSIX_C_SOURCE=200112L -Iinclude/" all misc
-}
-
-src_install() {
-	dobin bin2fex fex2bin phoenix_info
-	newbin sunxi-bootinfo bootinfo
-	newbin sunxi-fel fel
-	newbin sunxi-fexc fexc
-	newbin sunxi-nand-part nand-part
-	newbin sunxi-pio pio
-}
diff --git a/dev-embedded/tavrasm-1.22-r1 b/dev-embedded/tavrasm-1.22-r1
new file mode 100644
index 000000000000..3f22ba367210
--- /dev/null
+++ b/dev-embedded/tavrasm-1.22-r1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=sys-devel/bison sys-devel/flex
+DESCRIPTION=Compiles code written for Atmels AVR DOS assembler
+EAPI=2
+HOMEPAGE=http://www.tavrasm.org/
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=mirror://gentoo/tavrasm-1.22.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=da407d49157a584931ab95ac953dc53d
diff --git a/dev-embedded/tavrasm/Manifest b/dev-embedded/tavrasm/Manifest
deleted file mode 100644
index 4476b110626b..000000000000
--- a/dev-embedded/tavrasm/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX tavrasm-1.22-gentoo.patch 803 BLAKE2B a71d2476a6b8960d9482e9bf1eb72ceeb5aa312894d1a19b24bec918128a70678b75ecd6fdeb27b55f3be16c75686528a67cf10fe29292ece6204f17a283383e SHA512 5ea7cd66773844f79f427b1442babd8b191082f8212d1ea3332a07ac6844ec08bbe8ea146f9a06dae8363aa2e06e1aa3d6335fe195b866e7fe52a24691eac471
-DIST tavrasm-1.22.tar.gz 65685 BLAKE2B 5073b6de2f4d9124dea269561367d43b3fe93470d722c76e9816da0d243d26d793f484f4fecbdf6e45ece2d581218d43fa412d96c9843a4756425c6b02436588 SHA512 0f33607e2ffbe8c56268b15dc62fe6c2b565bf898c68e198846f11fb30da4da3f398d07ef7ac16050dbc92ffcb04612459027a2c27cf48fc7d74392c5f6a38dc
-EBUILD tavrasm-1.22-r1.ebuild 759 BLAKE2B d27d867dae8cf8c37cf0d4c54a8aa3f3ad83fbaa9200c6a986f57600ea20396d92e52144a956a1f90cd92bc5c88d863c1a4dbaa87c86995c5175c35fef04855f SHA512 ee80e1dd82321c31b335b67b7b5a5048419cc52931cdf2ffc1fb2d2ff5889eb5630c0f6b956a54b10feaf239bd95a9cadd44898b2eba29e7c3cdfca103e786e9
-MISC metadata.xml 251 BLAKE2B 118fce129507949f74491c6959c5b8c07a9ba6f1d6a813984cb222435023426d9581131651816ad72f759e87f2bbf70e63ead86330d73ffef3bd60aca060e055 SHA512 b3e4656ceb318c1dc3f8150664734711c9af7b589d5afa1aafe4ef063fb73157e8946a0d845ba02c54d759057597f5c1543b2fdaa93457c91a83b3ea31aec372
diff --git a/dev-embedded/tavrasm/files/tavrasm-1.22-gentoo.patch b/dev-embedded/tavrasm/files/tavrasm-1.22-gentoo.patch
deleted file mode 100644
index f752c715d32d..000000000000
--- a/dev-embedded/tavrasm/files/tavrasm-1.22-gentoo.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-* Do not set CC
-* Adhere to CFLAGS and LDFLAGS, do not set optimisation flags
-
-
---- a/src/makefile	2004-12-12 00:51:29.000000000 +0100
-+++ b/src/makefile	2010-05-07 03:26:38.000000000 +0200
-@@ -24,8 +24,7 @@
- 
- ### Compiler options #########################################################
- 
--CC		= gcc
--CFLAGS          = -O2 -Wall -DAVRLANG=LANGUAGE_$(LANGUAGE)
-+CFLAGS          += -Wall -DAVRLANG=LANGUAGE_$(LANGUAGE)
- CPPFLAGS	=
- CCFLAGS         = $(CFLAGS) $(CPPFLAGS)
- LINK            = -lm -lstdc++
-@@ -39,7 +38,7 @@
- ### Executable ##############################################################
- 
- $(EXENAME):	$(OBJS)
--		$(CC) $(CCFLAGS) $(OBJS) $(LINK) -o $@
-+		$(CC) $(CCFLAGS) $(LDFLAGS) $(OBJS) $(LINK) -o $@
- 
- ### Parser file #############################################################
- 
diff --git a/dev-embedded/tavrasm/metadata.xml b/dev-embedded/tavrasm/metadata.xml
deleted file mode 100644
index e248196b07c4..000000000000
--- a/dev-embedded/tavrasm/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>embedded@gentoo.org</email>
-		<name>Embedded Gentoo</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/dev-embedded/tavrasm/tavrasm-1.22-r1.ebuild b/dev-embedded/tavrasm/tavrasm-1.22-r1.ebuild
deleted file mode 100644
index 725865d5c139..000000000000
--- a/dev-embedded/tavrasm/tavrasm-1.22-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-inherit eutils toolchain-funcs versionator
-
-DESCRIPTION="Compiles code written for Atmels AVR DOS assembler"
-HOMEPAGE="http://www.tavrasm.org/"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-DEPEND="
-	sys-devel/bison
-	sys-devel/flex"
-RDEPEND=""
-
-S="${WORKDIR}/${PN}.$(delete_all_version_separators ${PV})"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-gentoo.patch
-}
-
-src_compile() {
-	tc-export CC
-	cd src
-
-	# The Makefile of tavrasm is stupid, hence the -j1
-	emake -j1 || die "Compilation failed"
-}
-
-src_install() {
-	dobin src/tavrasm || die "dobin failed"
-	doman tavrasm.1
-	dodoc README
-}
diff --git a/dev-embedded/tigcc-0.96_beta7 b/dev-embedded/tigcc-0.96_beta7
new file mode 100644
index 000000000000..cfd7601acc72
--- /dev/null
+++ b/dev-embedded/tigcc-0.96_beta7
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install unpack
+DEPEND=>=sys-devel/binutils-2.14.90.0.6-r1 app-arch/unzip >=sys-devel/bison-1.875
+DESCRIPTION=Cross compiler for Texas Instruments TI-89, TI-92(+) and V200 calculators
+EAPI=0
+HOMEPAGE=http://tigcc.ticalc.org
+IUSE=doc
+KEYWORDS=amd64 ppc ~sparc x86
+LICENSE=GPL-2
+RDEPEND=>=sys-devel/binutils-2.14.90.0.6-r1
+RESTRICT=strip
+SLOT=0
+SRC_URI=mirror://gentoo/tigcc-0.96_beta7.tar.bz2 ftp://gcc.gnu.org/pub/gcc/snapshots/4.1-20060728/gcc-4.1-20060728.tar.bz2 mirror://kernel/linux/devel/binutils/binutils-2.16.1.tar.bz2 http://members.chello.at/gerhard.kofler/kevin/ti89prog/libfargo.zip http://members.chello.at/gerhard.kofler/kevin/ti89prog/flashosa.zip
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=d40ae11bd5290f0a9879fd78da8d3f99
diff --git a/dev-embedded/tigcc-0.96_beta8-r1 b/dev-embedded/tigcc-0.96_beta8-r1
new file mode 100644
index 000000000000..eb06ec84453f
--- /dev/null
+++ b/dev-embedded/tigcc-0.96_beta8-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install unpack
+DEPEND=>=sys-devel/binutils-2.14.90.0.6-r1 app-arch/unzip >=sys-devel/bison-1.875
+DESCRIPTION=Cross compiler for Texas Instruments TI-89, TI-92(+) and V200 calculators
+EAPI=0
+HOMEPAGE=http://tigcc.ticalc.org/
+IUSE=doc
+KEYWORDS=~amd64 ~ppc ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-devel/binutils-2.14.90.0.6-r1
+RESTRICT=strip
+SLOT=0
+SRC_URI=mirror://gentoo/tigcc-0.96_beta8.tar.bz2 ftp://gcc.gnu.org/pub/gcc/snapshots/4.1-20060728/gcc-4.1-20060728.tar.bz2 mirror://kernel/linux/devel/binutils/binutils-2.16.1.tar.bz2 http://members.chello.at/gerhard.kofler/kevin/ti89prog/libfargo.zip http://members.chello.at/gerhard.kofler/kevin/ti89prog/flashosa.zip
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=67e9fa16dfd0062a45017020a01d89e3
diff --git a/dev-embedded/tigcc/Manifest b/dev-embedded/tigcc/Manifest
deleted file mode 100644
index d09ee86a049b..000000000000
--- a/dev-embedded/tigcc/Manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-DIST binutils-2.16.1.tar.bz2 12549917 BLAKE2B be555383e322fc2683b3d14caacd27c6953bdbd777090585eb680b5accded4d788ab00cabd6cdee6c0ed7f5ccffc6bea32c38ec7acc5edbfd5a3c72f026dd274 SHA512 dbfccab518abc3352c4d09039da0f3b946ddc5557d7c193286adb0a39ced41f30246c41370b2b63db53eb5577bc0f1f61b789960443121274fd8f254a1b739bd
-DIST flashosa.zip 2437 BLAKE2B 393a1ad1285f1333ba33c6cfe95768c103dad928515007a04aafad738bc4c97aa61d204b5d3d10f276b2b7ae23bfc144d5245fe511f169a4347b3d81b3a15c62 SHA512 f81edcf7d1b8ec6dab0d44053a967dca5243ee0825f6c1a2b476e02904ead6f575b948ae0da6fbf854eb0e059fb49a9be6e5708fb8c9e50e51b16b406f6b9efa
-DIST gcc-4.1-20060728.tar.bz2 37038705 BLAKE2B 4cd072de19f8d73ca38b9ec4981bbf50508ba415cc119e156d658343d80da91735797042af147d61648c637e0b66abf93c12434eb611cd4e282bc60996797faf SHA512 c54d236d0e7a5b92acc81030067af00dd3ecc0f27a6b81c82fe6535592470f4c6a30e3a386df397fb4dd5bca6455cf473f103f484dc89ed2efba9ae55dda413f
-DIST libfargo.zip 14766 BLAKE2B b235cfdf56ab5c3b0e3d0ea1edcb9a20354db99b18e9773f8e9365fed50a6568f05339ffee1cb41bce1a516d2aff3e919b538f796786c28a5bee4f1eb7c89226 SHA512 a3a48de66f32f5a363465b99bd0be932a585a92b5e914ccc7360586ba9da83f1620cef9b102d69816754ec3437b2de8d76c3504182106baf8eb8cdf2bd823f1a
-DIST tigcc-0.96_beta7.tar.bz2 2828952 BLAKE2B ecbe86da71fa7d8385bbafdb1faddc0bd2c6120ccb804f95a702a699407ced10b3845ecc7f1ccec49755e1f0af98f1ee2e2e37d263619623c28e0857eca2a8ed SHA512 e2b16502ded365561a4c5ca26dc261fb08c3adc717d96effb27b6ea58c2f16a072c36eb114929756cbd4ce0349ba1c47a12f90cccd0587eb7fb2835623bdd966
-DIST tigcc-0.96_beta8.tar.bz2 2829870 BLAKE2B 2ecd16789e8b9df919d74c389b7b243af31e120f3e967f9562ed3b40f446d8cf28700b36b75beb4e479d18b2086f0958ebf4fb229d945577bcb6951cd685348b SHA512 e28415b309b73fa949fe9f0224239f07e62136e93c4d8fe98ad2fe32a99475620092c9317bfdd098d37a2a1dfb826c2f6fd23ab26fdcc444650dc66643cfb0e7
-EBUILD tigcc-0.96_beta7.ebuild 6730 BLAKE2B e5d38fc18ef42fb452af313d6e36bd5f8798d28a5d5299db445da53ea5e8b6d31019cc19a2522013e54694eaec88a3229847d0c3da8f4a44dbcf27df1506ca11 SHA512 1aff5cbdd845596d34aa873bb56e3288b795569606af23ea7c34d5eab6f80a5fb2d83822970e6027f129a1867dbe3e5ec0a658aaee85c61e0953a1a730b70d7c
-EBUILD tigcc-0.96_beta8-r1.ebuild 6547 BLAKE2B 8d7dac51e7bb0148aa89e72a0c5ff3bfa385c8f8ec1a949f46c63bec152142f1fea9e127b94c76997004e9c6f413b452a8f3f2e861ce8e652abbdfbe9ca55204 SHA512 c29782f76b561005cba5cfae319a35650a3bf7f2792fe7e05085c99c11f8796fd743dfe077ef5be84f7ef72e375c027a3105941fbefbdf774acd23e062c6c647
-MISC metadata.xml 247 BLAKE2B e46b8f2d053251af5cb591bb2ee5e35089c4e8174ee2e7a3c504db23f844b65083d4a3e5198da3977ad3e98b67cab2e0de686a3c62009b487c1e64785a8ff65d SHA512 15df289e0f962f564551f61ada3cfef0311f6af639887def780bf5ad3be105515c8d24c950ff340ed35d89b9cd994af3540322b684c5dec3b43ec6bb0041aa4e
diff --git a/dev-embedded/tigcc/metadata.xml b/dev-embedded/tigcc/metadata.xml
deleted file mode 100644
index 71b1461e1146..000000000000
--- a/dev-embedded/tigcc/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>embedded@gentoo.org</email>
-	<name>Embedded Gentoo</name>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-embedded/tigcc/tigcc-0.96_beta7.ebuild b/dev-embedded/tigcc/tigcc-0.96_beta7.ebuild
deleted file mode 100644
index 0a21d3e0b67f..000000000000
--- a/dev-embedded/tigcc/tigcc-0.96_beta7.ebuild
+++ /dev/null
@@ -1,245 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils
-
-BASE_BINUTILS="2.16.1"
-GCC_VER="4.1.2"
-GCC_SNAPSHOT="20060728"
-BIN_VER=${BASE_BINUTILS:0:4}
-ENV_FILE=${D}/etc/env.d/99tigcc
-S="${WORKDIR}"
-DESCRIPTION="Cross compiler for Texas Instruments TI-89, TI-92(+) and V200 calculators"
-HOMEPAGE="http://tigcc.ticalc.org"
-
-#original source can be found at:
-#SRC_URI="http://tigcc.ticalc.org/linux/tigcc_src.tar.bz2"
-#but in fact this file changes as soon as there comes a new beta
-
-#when it hits portage of course it should be mirrored on a gentoo mirror:
-#SRC_URI="mirror://gentoo/${PF}.tar.bz2"
-
-SRC_URI="mirror://gentoo/tigcc-0.96_beta7.tar.bz2
-	ftp://gcc.gnu.org/pub/gcc/snapshots/4.1-${GCC_SNAPSHOT}/gcc-4.1-${GCC_SNAPSHOT}.tar.bz2
-	mirror://kernel/linux/devel/binutils/binutils-${BASE_BINUTILS}.tar.bz2
-	http://members.chello.at/gerhard.kofler/kevin/ti89prog/libfargo.zip
-	http://members.chello.at/gerhard.kofler/kevin/ti89prog/flashosa.zip"
-
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="amd64 ppc ~sparc x86"
-IUSE="doc"
-
-RDEPEND=">=sys-devel/binutils-2.14.90.0.6-r1"
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	>=sys-devel/bison-1.875"
-
-RESTRICT="strip"
-
-src_unpack() {
-	unpack ${A}
-
-	# start by patching and cleaning out binutils and gcc directories.
-	cd "${WORKDIR}"/binutils-${BASE_BINUTILS}
-	epatch "${S}"/sources/gcc/gas-${BIN_VER}-tigcc-*.diff
-
-	rm -f .brik
-	rm -f md5.sum
-	rm -f -r INSTALL
-	rm -f -r maintainer-scripts
-	rm -f -r binutils
-	rm -f -r cpu
-	rm -f -r etc
-	rm -f -r gas/doc
-	rm -f -r gas/po
-	rm -f -r gprof
-	rm -f -r include/nlm
-	rm -f -r include/regs
-	rm -f -r ld
-	rm -f -r texinfo
-
-	cd "${WORKDIR}"/gcc-4.1-${GCC_SNAPSHOT}
-	epatch "${S}"/sources/gcc/gcc-4.1-tigcc-patch.diff
-
-	rm -f .brik
-	rm -f md5.sum
-	rm -f -r INSTALL
-	rm -f -r fixincludes
-	rm -f -r gcc/ginclude
-	rm -f -r gcc/po
-	rm -f -r gcc/doc
-	rm -f -r gcc/treelang
-	rm -f -r libcpp/po
-	rm -f -r maintainer-scripts
-	rm -f -r etc
-	rm -f -r gprof
-	rm -f -r include/nlm
-	rm -f -r include/regs
-	rm -f -r texinfo
-
-	# create build directories for binutils and gcc
-	mkdir -p "${WORKDIR}"/build/binutils
-	mkdir "${WORKDIR}"/build/gcc
-
-	# Workaround for non-existing directories
-	sed -ie '/SUBDIRS =/d' "${WORKDIR}"/binutils-${BASE_BINUTILS}/gas/Makefile.in
-}
-
-src_compile() {
-	# build binutils
-	cd "${WORKDIR}"/build/binutils
-	CFLAGS="${CFLAGS}" "${WORKDIR}"/binutils-${BASE_BINUTILS}/configure \
-		--disable-serial-configure --target=m68k-coff --disable-shared \
-		--enable-static --disable-multilib --disable-nls \
-		|| die
-	emake || die "gas"
-
-	# build gcc
-	cd "${WORKDIR}"/build/gcc
-	CFLAGS="${CFLAGS}" "${WORKDIR}"/gcc-4.1-${GCC_SNAPSHOT}/configure --target=m68k-coff \
-				--with-gnu-as --with-as="${WORKDIR}"/build/binutils/gas/as-new --with-gnu-ld \
-				--disable-nls --disable-multilib --disable-shared --enable-static \
-				--disable-threads --enable-languages=c --disable-win32-registry \
-				--disable-checking --disable-werror --disable-pch --disable-mudflap \
-		|| die
-
-	# GCC compilations _is intended_ to fail on a certain point,
-	# don't worry about that.
-	emake -j1
-
-	# Check if gcc has been built, die otherwise
-	( [ -e "${WORKDIR}"/build/gcc/gcc/xgcc ] && [ -e "${WORKDIR}"/build/gcc/gcc/cc1  ] ) || die "gcc"
-
-	# build a68k assembler
-	cd "${S}"/sources/a68k
-	emake -e || die "a68k"
-
-	# build ld-tigcc linker
-	cd "${S}"/sources/ld-tigcc
-	emake -e || die "ld-tigcc"
-
-	# build tigcc front-end
-	cd "${S}"/sources/tigcc/src
-	emake -e || die "tigcc"
-
-	# build tprbuilder (TIGCC project builder)
-	cd "${S}"/sources/tprbuilder/src
-	emake -e || die "tprbuilder"
-
-	# build patcher (object file patcher)
-	cd "${S}"/sources/patcher/src
-	emake -e || die "patcher"
-
-}
-
-src_install() {
-	# install documentation
-	dodir /usr/bin
-
-	if use doc ; then
-		# patch the script that launches the documentation
-		# browser to point to the correct location
-		sed "s:\${TIGCC}/doc:/usr/share/doc/${P}:g" \
-			"${S}"/tigcclib/doc/converter/tigccdoc \
-		> "${S}"/tigcclib/doc/converter/tigccdoc.new
-
-		cd "${S}"/tigcclib/doc/converter
-		newbin tigccdoc.new tigccdoc
-		cd "${S}"/tigcclib/doc
-		dohtml -r html/*
-		cp html/qt-assistant.adp "${D}"/usr/share/doc/${PF}/html
-
-		cd "${S}"/sources/a68k
-	fi
-
-	dodir /usr/share/doc/${PF}
-	cd "${S}"
-	dodoc AUTHORS BUGS CHANGELOG DIRECTORIES HOWTO \
-		INSTALL README README.linux README.osX
-
-	cd "${S}"/sources/tigcc
-	docinto tigcc
-	dodoc AUTHORS ChangeLog README
-
-	cd "${S}"/sources/tprbuilder
-	docinto tprbuilder
-	dodoc AUTHORS ChangeLog README
-
-	cd "${S}"/sources/patcher
-	docinto patcher
-	dodoc AUTHORS ChangeLog README
-
-	exeinto /usr/ti-linux-gnu/tigcc-bin/${GCC_VER}
-	# install gcc
-	cd "${WORKDIR}"/build/gcc
-	doexe gcc/cc1
-	newexe gcc/xgcc gcc
-	dosym /usr/ti-linux-gnu/tigcc-bin/${GCC_VER}/gcc \
-		/usr/ti-linux-gnu/tigcc-bin/${GCC_VER}/ti-linux-gnu-gcc
-
-	# install gas
-	# exeinto /usr/ti-linux-gnu/bin <-- a symlink will be
-	# created so that gas resides in /usr/ti-linux-gnu/bin too
-	cd "${WORKDIR}"/build/binutils
-	newexe gas/as-new as
-
-	# install a68k
-	cd "${S}"/sources/a68k
-	newexe A68k a68k
-
-	# install ld-tigcc
-	cd "${S}"/sources/ld-tigcc
-	doexe ld-tigcc
-	doexe ar-tigcc
-
-	# install tigcc
-	cd "${S}"/sources/tigcc/src
-	doexe tigcc
-	dosym /usr/ti-linux-gnu/tigcc-bin/${GCC_VER}/tigcc \
-		/usr/ti-linux-gnu/tigcc-bin/${GCC_VER}/ti-linux-gnu-tigcc
-
-	# install tprbuilder
-	cd "${S}"/sources/tprbuilder/src
-	doexe tprbuilder
-
-	# install patcher
-	cd "${S}"/sources/patcher/src
-	doexe patcher
-
-	# install header files
-	dodir /usr/include/tigcc
-	cp -R "${S}"/tigcclib/include/* "${D}"/usr/include/tigcc
-	dosym /usr/include/tigcc/asm/os.h /usr/include/tigcc/asm/OS.h
-
-	insinto /usr/lib/gcc-lib/ti-linux-gnu/${GCC_VER}
-	# install library
-	cd "${S}"/tigcclib
-	doins lib/*
-	cd "${WORKDIR}"
-	doins flashos.a
-	doins fargo.a
-
-	dodir /usr/share/tigcc
-	# copy example programs
-	# cp -r "${S}"/examples ${D}/usr/share/tigcc
-
-	# create TIGCC env variable
-	dodir /etc/env.d/gcc
-	# echo -e "TIGCC=\"/usr/ti-linux-gnu/tigcc-bin/${GCC_VER}\"" >> ${ENV_FILE}
-	# echo -e "CC=\"tigcc\"" >> ${ENV_FILE}
-	echo -e "TIGCC=\"/usr/ti-linux-gnu\"" >> ${ENV_FILE}
-	echo -e "PATH=\"/usr/ti-linux-gnu/tigcc-bin/${GCC_VER}:/usr/ti-linux-gnu/bin\"" >> ${ENV_FILE}
-	echo -e "ROOTPATH=\"/usr/ti-linux-gnu/tigcc-bin/${GCC_VER}:/usr/ti-linux-gnu/bin\"" >> ${ENV_FILE}
-	echo -e "LDPATH=\"/usr/lib/gcc-lib/ti-linux-gnu/${GCC_VER}\"" >> ${ENV_FILE}
-
-	# a cross-compiling gcc with hard-coded names has been built.
-	# therefore, we must place some symlinks.
-	dosym /usr/include/tigcc /usr/ti-linux-gnu/include
-	dosym /usr/lib/gcc-lib/ti-linux-gnu/${GCC_VER} /usr/ti-linux-gnu/lib
-	dosym /usr/share/doc/${PF} /usr/ti-linux-gnu/doc
-	dosym /usr/ti-linux-gnu/tigcc-bin/${GCC_VER} /usr/ti-linux-gnu/bin
-}
diff --git a/dev-embedded/tigcc/tigcc-0.96_beta8-r1.ebuild b/dev-embedded/tigcc/tigcc-0.96_beta8-r1.ebuild
deleted file mode 100644
index 40b3602ca1e0..000000000000
--- a/dev-embedded/tigcc/tigcc-0.96_beta8-r1.ebuild
+++ /dev/null
@@ -1,246 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils
-
-BASE_BINUTILS="2.16.1"
-GCC_VER="4.1.2"
-GCC_SNAPSHOT="20060728"
-BIN_VER=${BASE_BINUTILS:0:4}
-
-DESCRIPTION="Cross compiler for Texas Instruments TI-89, TI-92(+) and V200 calculators"
-HOMEPAGE="http://tigcc.ticalc.org/"
-
-#original source can be found at:
-#SRC_URI="http://tigcc.ticalc.org/linux/tigcc_src.tar.bz2"
-#but in fact this file changes as soon as there comes a new beta
-
-#when it hits portage of course it should be mirrored on a gentoo mirror:
-#SRC_URI="mirror://gentoo/${PF}.tar.bz2"
-
-SRC_URI="mirror://gentoo/${P}.tar.bz2
-	ftp://gcc.gnu.org/pub/gcc/snapshots/4.1-${GCC_SNAPSHOT}/gcc-4.1-${GCC_SNAPSHOT}.tar.bz2
-	mirror://kernel/linux/devel/binutils/binutils-${BASE_BINUTILS}.tar.bz2
-	http://members.chello.at/gerhard.kofler/kevin/ti89prog/libfargo.zip
-	http://members.chello.at/gerhard.kofler/kevin/ti89prog/flashosa.zip"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="doc"
-RESTRICT="strip"
-
-RDEPEND=">=sys-devel/binutils-2.14.90.0.6-r1"
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	>=sys-devel/bison-1.875"
-
-S=${WORKDIR}
-
-src_unpack() {
-	unpack ${A}
-
-	# start by patching and cleaning out binutils and gcc directories.
-	cd "${WORKDIR}"/binutils-${BASE_BINUTILS}
-	epatch "${S}"/sources/gcc/gas-${BIN_VER}-tigcc-*.diff
-
-	rm -f .brik
-	rm -f md5.sum
-	rm -f -r INSTALL
-	rm -f -r maintainer-scripts
-	rm -f -r binutils
-	rm -f -r cpu
-	rm -f -r etc
-	rm -f -r gas/doc
-	rm -f -r gas/po
-	rm -f -r gprof
-	rm -f -r include/nlm
-	rm -f -r include/regs
-	rm -f -r ld
-	rm -f -r texinfo
-
-	cd "${WORKDIR}"/gcc-4.1-${GCC_SNAPSHOT}
-	epatch "${S}"/sources/gcc/gcc-4.1-tigcc-patch.diff
-
-	rm -f .brik
-	rm -f md5.sum
-	rm -f -r INSTALL
-	rm -f -r fixincludes
-	rm -f -r gcc/ginclude
-	rm -f -r gcc/po
-	rm -f -r gcc/doc
-	rm -f -r gcc/treelang
-	rm -f -r libcpp/po
-	rm -f -r maintainer-scripts
-	rm -f -r etc
-	rm -f -r gprof
-	rm -f -r include/nlm
-	rm -f -r include/regs
-	rm -f -r texinfo
-
-	# create build directories for binutils and gcc
-	mkdir -p "${WORKDIR}"/build/binutils
-	mkdir "${WORKDIR}"/build/gcc
-
-	# Workaround for non-existing directories
-	sed -ie '/SUBDIRS =/d' "${WORKDIR}"/binutils-${BASE_BINUTILS}/gas/Makefile.in
-}
-
-src_compile() {
-	# build binutils
-	cd "${WORKDIR}"/build/binutils
-	CFLAGS="${CFLAGS}" "${WORKDIR}"/binutils-${BASE_BINUTILS}/configure \
-		--disable-serial-configure --target=m68k-coff --disable-shared \
-		--enable-static --disable-multilib --disable-nls \
-		|| die
-	emake || die "gas"
-
-	# build gcc
-	cd "${WORKDIR}"/build/gcc
-	CFLAGS="${CFLAGS}" "${WORKDIR}"/gcc-4.1-${GCC_SNAPSHOT}/configure --target=m68k-coff \
-				--with-gnu-as --with-as="${WORKDIR}"/build/binutils/gas/as-new --with-gnu-ld \
-				--disable-nls --disable-multilib --disable-shared --enable-static \
-				--disable-threads --enable-languages=c --disable-win32-registry \
-				--disable-checking --disable-werror --disable-pch --disable-mudflap \
-		|| die
-
-	# GCC compilations _is intended_ to fail on a certain point,
-	# don't worry about that.
-	emake -j1
-
-	# Check if gcc has been built, die otherwise
-	( [ -e "${WORKDIR}"/build/gcc/gcc/xgcc ] && [ -e "${WORKDIR}"/build/gcc/gcc/cc1  ] ) || die "gcc"
-
-	# build a68k assembler
-	cd "${S}"/sources/a68k
-	emake -e || die "a68k"
-
-	# build ld-tigcc linker
-	cd "${S}"/sources/ld-tigcc
-	emake -e || die "ld-tigcc"
-
-	# build tigcc front-end
-	cd "${S}"/sources/tigcc/src
-	emake -e || die "tigcc"
-
-	# build tprbuilder (TIGCC project builder)
-	cd "${S}"/sources/tprbuilder/src
-	emake -e || die "tprbuilder"
-
-	# build patcher (object file patcher)
-	cd "${S}"/sources/patcher/src
-	emake -e || die "patcher"
-
-}
-
-src_install() {
-	# install documentation
-	dodir /usr/bin
-
-	if use doc ; then
-		# patch the script that launches the documentation
-		# browser to point to the correct location
-		sed "s:\${TIGCC}/doc:/usr/share/doc/${P}:g" \
-			"${S}"/tigcclib/doc/converter/tigccdoc \
-		> "${S}"/tigcclib/doc/converter/tigccdoc.new
-
-		cd "${S}"/tigcclib/doc/converter
-		newbin tigccdoc.new tigccdoc
-		cd "${S}"/tigcclib/doc
-		dohtml -r html/*
-		cp html/qt-assistant.adp "${D}"/usr/share/doc/${PF}/html
-
-		cd "${S}"/sources/a68k
-	fi
-
-	dodir /usr/share/doc/${PF}
-	cd "${S}"
-	dodoc AUTHORS BUGS CHANGELOG DIRECTORIES HOWTO \
-		INSTALL README README.linux README.osX
-
-	cd "${S}"/sources/tigcc
-	docinto tigcc
-	dodoc AUTHORS ChangeLog README
-
-	cd "${S}"/sources/tprbuilder
-	docinto tprbuilder
-	dodoc AUTHORS ChangeLog README
-
-	cd "${S}"/sources/patcher
-	docinto patcher
-	dodoc AUTHORS ChangeLog README
-
-	exeinto /usr/ti-linux-gnu/tigcc-bin/${GCC_VER}
-	# install gcc
-	cd "${WORKDIR}"/build/gcc
-	doexe gcc/cc1
-	newexe gcc/xgcc gcc
-	dosym /usr/ti-linux-gnu/tigcc-bin/${GCC_VER}/gcc \
-		/usr/ti-linux-gnu/tigcc-bin/${GCC_VER}/ti-linux-gnu-gcc
-
-	# install gas
-	# exeinto /usr/ti-linux-gnu/bin <-- a symlink will be
-	# created so that gas resides in /usr/ti-linux-gnu/bin too
-	cd "${WORKDIR}"/build/binutils
-	newexe gas/as-new as
-
-	# install a68k
-	cd "${S}"/sources/a68k
-	newexe A68k a68k
-
-	# install ld-tigcc
-	cd "${S}"/sources/ld-tigcc
-	doexe ld-tigcc
-	doexe ar-tigcc
-
-	# install tigcc
-	cd "${S}"/sources/tigcc/src
-	doexe tigcc
-	dosym /usr/ti-linux-gnu/tigcc-bin/${GCC_VER}/tigcc \
-		/usr/ti-linux-gnu/tigcc-bin/${GCC_VER}/ti-linux-gnu-tigcc
-
-	# install tprbuilder
-	cd "${S}"/sources/tprbuilder/src
-	doexe tprbuilder
-
-	# install patcher
-	cd "${S}"/sources/patcher/src
-	doexe patcher
-
-	# install header files
-	dodir /usr/include/tigcc
-	cp -R "${S}"/tigcclib/include/* "${D}"/usr/include/tigcc
-	dosym /usr/include/tigcc/asm/os.h /usr/include/tigcc/asm/OS.h
-
-	insinto /usr/lib/gcc-lib/ti-linux-gnu/${GCC_VER}
-	# install library
-	cd "${S}"/tigcclib
-	doins lib/*
-	cd "${WORKDIR}"
-	doins flashos.a
-	doins fargo.a
-
-	dodir /usr/share/tigcc
-	# copy example programs
-	# cp -r "${S}"/examples ${D}/usr/share/tigcc
-
-	# create TIGCC env variable
-	# TIGCC="/usr/ti-linux-gnu/tigcc-bin/${GCC_VER}"
-	# CC="tigcc"
-	cat <<-EOF > 99tigcc
-	TIGCC="/usr/ti-linux-gnu"
-	PATH="/usr/ti-linux-gnu/tigcc-bin/${GCC_VER}:/usr/ti-linux-gnu/bin"
-	ROOTPATH="/usr/ti-linux-gnu/tigcc-bin/${GCC_VER}:/usr/ti-linux-gnu/bin"
-	LDPATH="/usr/lib/gcc-lib/ti-linux-gnu/${GCC_VER}"
-	EOF
-	doenvd 99tigcc
-
-	# a cross-compiling gcc with hard-coded names has been built.
-	# therefore, we must place some symlinks.
-	dosym /usr/include/tigcc /usr/ti-linux-gnu/include
-	dosym /usr/lib/gcc-lib/ti-linux-gnu/${GCC_VER} /usr/ti-linux-gnu/lib
-	dosym /usr/share/doc/${PF} /usr/ti-linux-gnu/doc
-	dosym /usr/ti-linux-gnu/tigcc-bin/${GCC_VER} /usr/ti-linux-gnu/bin
-}
diff --git a/dev-embedded/u-boot-tools-2016.03 b/dev-embedded/u-boot-tools-2016.03
new file mode 100644
index 000000000000..3db314309b42
--- /dev/null
+++ b/dev-embedded/u-boot-tools-2016.03
@@ -0,0 +1,10 @@
+DEFINED_PHASES=compile install
+DESCRIPTION=utilities for working with Das U-Boot
+EAPI=5
+HOMEPAGE=http://www.denx.de/wiki/U-Boot/WebHome
+KEYWORDS=amd64 arm ~arm64 x86
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=ftp://ftp.denx.de/pub/u-boot/u-boot-2016.03.tar.bz2
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=9030d59c5fc6aeba188698d28ed36bd0
diff --git a/dev-embedded/u-boot-tools-2016.07 b/dev-embedded/u-boot-tools-2016.07
new file mode 100644
index 000000000000..a597afb84432
--- /dev/null
+++ b/dev-embedded/u-boot-tools-2016.07
@@ -0,0 +1,10 @@
+DEFINED_PHASES=compile install
+DESCRIPTION=utilities for working with Das U-Boot
+EAPI=6
+HOMEPAGE=http://www.denx.de/wiki/U-Boot/WebHome
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=ftp://ftp.denx.de/pub/u-boot/u-boot-2016.07.tar.bz2
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=f88273d9e42a4cc23906db22070bc560
diff --git a/dev-embedded/u-boot-tools-2016.09.01 b/dev-embedded/u-boot-tools-2016.09.01
new file mode 100644
index 000000000000..7a341a5b7ff9
--- /dev/null
+++ b/dev-embedded/u-boot-tools-2016.09.01
@@ -0,0 +1,10 @@
+DEFINED_PHASES=compile install
+DESCRIPTION=utilities for working with Das U-Boot
+EAPI=6
+HOMEPAGE=http://www.denx.de/wiki/U-Boot/WebHome
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=ftp://ftp.denx.de/pub/u-boot/u-boot-2016.09.01.tar.bz2
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=81b328f312eca7645ab5e0fc4431684b
diff --git a/dev-embedded/u-boot-tools-2016.09.01-r1 b/dev-embedded/u-boot-tools-2016.09.01-r1
new file mode 100644
index 000000000000..d206f38000ad
--- /dev/null
+++ b/dev-embedded/u-boot-tools-2016.09.01-r1
@@ -0,0 +1,10 @@
+DEFINED_PHASES=compile install
+DESCRIPTION=utilities for working with Das U-Boot
+EAPI=6
+HOMEPAGE=http://www.denx.de/wiki/U-Boot/WebHome
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=ftp://ftp.denx.de/pub/u-boot/u-boot-2016.09.01.tar.bz2
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=9b60aa2b737803e494490099e7282a2c
diff --git a/dev-embedded/u-boot-tools-2016.11 b/dev-embedded/u-boot-tools-2016.11
new file mode 100644
index 000000000000..a21b46aace77
--- /dev/null
+++ b/dev-embedded/u-boot-tools-2016.11
@@ -0,0 +1,10 @@
+DEFINED_PHASES=compile install
+DESCRIPTION=utilities for working with Das U-Boot
+EAPI=6
+HOMEPAGE=http://www.denx.de/wiki/U-Boot/WebHome
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=ftp://ftp.denx.de/pub/u-boot/u-boot-2016.11.tar.bz2
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=9b60aa2b737803e494490099e7282a2c
diff --git a/dev-embedded/u-boot-tools-2017.05 b/dev-embedded/u-boot-tools-2017.05
new file mode 100644
index 000000000000..60c65d9336e9
--- /dev/null
+++ b/dev-embedded/u-boot-tools-2017.05
@@ -0,0 +1,10 @@
+DEFINED_PHASES=compile install
+DESCRIPTION=utilities for working with Das U-Boot
+EAPI=6
+HOMEPAGE=http://www.denx.de/wiki/U-Boot/WebHome
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=ftp://ftp.denx.de/pub/u-boot/u-boot-2017.05.tar.bz2
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=205e21f0e3cc771c9092b87485774ffd
diff --git a/dev-embedded/u-boot-tools-2017.09 b/dev-embedded/u-boot-tools-2017.09
new file mode 100644
index 000000000000..6c9bd80d5c87
--- /dev/null
+++ b/dev-embedded/u-boot-tools-2017.09
@@ -0,0 +1,10 @@
+DEFINED_PHASES=compile install
+DESCRIPTION=utilities for working with Das U-Boot
+EAPI=6
+HOMEPAGE=http://www.denx.de/wiki/U-Boot/WebHome
+KEYWORDS=amd64 arm ~arm64 x86
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=ftp://ftp.denx.de/pub/u-boot/u-boot-2017.09.tar.bz2
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=c5322f039c8c8f298e3686009df17234
diff --git a/dev-embedded/u-boot-tools-2018.05 b/dev-embedded/u-boot-tools-2018.05
new file mode 100644
index 000000000000..67af09835ab5
--- /dev/null
+++ b/dev-embedded/u-boot-tools-2018.05
@@ -0,0 +1,10 @@
+DEFINED_PHASES=compile install
+DESCRIPTION=utilities for working with Das U-Boot
+EAPI=6
+HOMEPAGE=http://www.denx.de/wiki/U-Boot/WebHome
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=ftp://ftp.denx.de/pub/u-boot/u-boot-2018.05.tar.bz2
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=205e21f0e3cc771c9092b87485774ffd
diff --git a/dev-embedded/u-boot-tools/Manifest b/dev-embedded/u-boot-tools/Manifest
deleted file mode 100644
index 0b050e1cb132..000000000000
--- a/dev-embedded/u-boot-tools/Manifest
+++ /dev/null
@@ -1,16 +0,0 @@
-DIST u-boot-2016.03.tar.bz2 11076762 BLAKE2B c36922c8400c8cb11b02ec3f3dfa2a06fabaac143149c7b46c73e0b4c4b09aeecc792736bcc66d5cecbdd51d2ae0454f65d677b24ad698dd9e3d28374c048d1d SHA512 d3a8d5f334a1a1a33756d9ac33d14eca689cafe1ada478e61b51dcbff1781266d4f0ea121e25d0232b292475721c04be63e5a153715b91a14dfc82656a54de6f
-DIST u-boot-2016.07.tar.bz2 11506848 BLAKE2B c35a294b9a5171609bf4ff199ddcb58e000417ffcc04f53c35fe4934c9b29872af477260889fbef614feb3933739155d78ece47c0f7bded4f6a0186329ca25a1 SHA512 fa76dbd7e654ff9e4b3166162be6c0a77ecf2eb2a952b4865df3c818ebcdca7e2bb75e5ba19bf0346000c3d185888552193bb74510b115426cfe444b78efd3ef
-DIST u-boot-2016.09.01.tar.bz2 11783287 BLAKE2B e378f42de04de6dcbd10d9b841c00a23056f9aca9a2633d101f5bf33d2c92b1aa2a52afa69eda858611d89b9811264aa1ae770acecea6fb6fab8d4e5bd8c2790 SHA512 aa503acb1ce4f64a936fbc1292e80c54fe334fcfb1a0da412a755f9a56a24993178ad1a5b8a51f777388d8ce5a62b0626bb5fead503f9b118f7d9f3f1a7c07b7
-DIST u-boot-2016.11.tar.bz2 12019669 BLAKE2B 3a6e4e2daf7ddb790d8a21647d9b0d4190b569fe40ae60340c8a8547f90700d7e9c380a30ccd2d48c004912fd5841a80138de1a8de15c7ec0b4ecab19011e506 SHA512 d393b2aa4114a6de7f990efe370891376c934a1cfac9530c3bc44f988e7f2c9f0ec26653e3275c72a0a1c2f4b44fcd0afe8394c9ae3ca93fee1c689d870c063d
-DIST u-boot-2017.05.tar.bz2 11938152 BLAKE2B 7e94284ecca4cb1314b43e222d1c944f74c5a98d9958da41adb574e5354145cad9cd6506d3dc866f7e63c1866d00db8c37e9f1d92a2299f2f8beedbc80cc30a1 SHA512 be270f9242a72b05463092a022bbabd54996762de1ff23bf7575124ac02e62f49572a4e2f6f571a5019047d40027e56e35593b5cc373c4a5a39b100c3377ba93
-DIST u-boot-2017.09.tar.bz2 11434323 BLAKE2B 9dbadeccb5c4432e997a5da76091aec714e2fad6922a80173e96b1ff930e69df510f6e090b073c8b2c3aeb4872f5e9b40ec879398e0c839df09f5edd1e52e951 SHA512 dff6e793f135e7d6cb9d85d6ef8e4aa7ed5c1e20eece4f434e8c0a6039eb75c3f2cb7bc550121b1f5a5709e943c7cc5d6d8590e05a47a6b0d0d8f05185fe7ec6
-DIST u-boot-2018.05.tar.bz2 12469276 BLAKE2B b09189d9bf8554c21630d42024d64894270c02e3efa8046bc2bef0efd68b9e0a02c3290228ffb71a4bab524d46111e32adb492c3ce9a3ef1be32287a3bbdb36a SHA512 218f71282c9d027b0faf210ce2d4d713779e0c61ea4a23f03d5dec0ca8836a3c26b46c5e258d583834f5b5a2f4663f98729ca4b0101a60f85457eb892f8370d2
-EBUILD u-boot-tools-2016.03.ebuild 947 BLAKE2B 981587540d22ce98d845c7bf9db53aa72021c13b0e7e80990498344f6e050f7b89f70aed0314a771fab280f8826f29cafbef4c97fdf05ab105a45a521c652472 SHA512 d1f6ec3a8a150faf2a5b9e9c5ad902a94d59da34632472c91c0c37eef927bd62f12ab40eff654ed41b64950a28baff1e904beb93d5d5bb103fc6b4bb47ffc893
-EBUILD u-boot-tools-2016.07.ebuild 955 BLAKE2B 1cfbc982291815f7ca514487cd02ccf6724e9820d69a36f4b9530a4bce239abcc52cf5ede6776e9b3cc9bbfe7be75776974127e7921c346c47b156ac58442a58 SHA512 114839f5cee60d08a8ec807d626b19c060b9fe7a2f71573eea346f2c28a2be02392334f3921ff9cc69110eae26291d156fe47ccc788da6b3abdac68343b15313
-EBUILD u-boot-tools-2016.09.01-r1.ebuild 977 BLAKE2B f84e7ad7d5de2a5c80a396e5ca3dfc74b4fb669f018dc06c2d72ccea4fb31e448480821a31f79f1b3a224a97aed7d8548e24b41443f2a0d18a436049d145efe6 SHA512 4ffcd4db167822aba087d4948b1e76def20f8fc505f3264e437c6b541828fc66579125f6220a3262fdf06570ed10fe7fbae9332de98636a9977a8a3cedad102d
-EBUILD u-boot-tools-2016.09.01.ebuild 948 BLAKE2B 3153c2bceaed2d2e503c1179a907880805f78ee08bb3f33d8f3b941664667118e163e2e9576dbe5b499329182ce1c779b09dbb13c3d0435af39f36f74babc4e0 SHA512 e59450e10f349f637d86767c423133798f44efa5d779e3efd03a56a35712c9e241b288957a88969a50af12990c29e21b7be9327957efd4c4ed01ad9eb0f0e7b7
-EBUILD u-boot-tools-2016.11.ebuild 977 BLAKE2B f84e7ad7d5de2a5c80a396e5ca3dfc74b4fb669f018dc06c2d72ccea4fb31e448480821a31f79f1b3a224a97aed7d8548e24b41443f2a0d18a436049d145efe6 SHA512 4ffcd4db167822aba087d4948b1e76def20f8fc505f3264e437c6b541828fc66579125f6220a3262fdf06570ed10fe7fbae9332de98636a9977a8a3cedad102d
-EBUILD u-boot-tools-2017.05.ebuild 977 BLAKE2B a0e0b30185e4d2fda81c8ece58d7755dc5f8c15a206307beadb3dedb84946b90c80da6b73448cba9a9bfb3891a1af4846cbc96e82dac2692aed3140dc46159ad SHA512 aad2f06cecf621b567727c1e72525a2145410337caedd849abc878dfa69741ee6c73587a728a178e48a6de6bf5db51cbef8f3c859391fadc6e36291b5a71156e
-EBUILD u-boot-tools-2017.09.ebuild 974 BLAKE2B ffd7532ae3a54be2ea17e0aaf14e75b0e04a689189836f0aa9ac2c29bbaa4e941754139d6a24df0357b0b7af86b25992b9ed8bfc9682f50e8943be6f83341c9b SHA512 5c0e013d89eb70a6d88caf827a3ca1976a308c2f7ad5ac79a9e6a449327a9ad2f971c253f7ed955a57f713166a4528e31bec318da7db6279f357c98529750ee0
-EBUILD u-boot-tools-2018.05.ebuild 977 BLAKE2B a0e0b30185e4d2fda81c8ece58d7755dc5f8c15a206307beadb3dedb84946b90c80da6b73448cba9a9bfb3891a1af4846cbc96e82dac2692aed3140dc46159ad SHA512 aad2f06cecf621b567727c1e72525a2145410337caedd849abc878dfa69741ee6c73587a728a178e48a6de6bf5db51cbef8f3c859391fadc6e36291b5a71156e
-MISC metadata.xml 247 BLAKE2B e46b8f2d053251af5cb591bb2ee5e35089c4e8174ee2e7a3c504db23f844b65083d4a3e5198da3977ad3e98b67cab2e0de686a3c62009b487c1e64785a8ff65d SHA512 15df289e0f962f564551f61ada3cfef0311f6af639887def780bf5ad3be105515c8d24c950ff340ed35d89b9cd994af3540322b684c5dec3b43ec6bb0041aa4e
diff --git a/dev-embedded/u-boot-tools/metadata.xml b/dev-embedded/u-boot-tools/metadata.xml
deleted file mode 100644
index 71b1461e1146..000000000000
--- a/dev-embedded/u-boot-tools/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>embedded@gentoo.org</email>
-	<name>Embedded Gentoo</name>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-embedded/u-boot-tools/u-boot-tools-2016.03.ebuild b/dev-embedded/u-boot-tools/u-boot-tools-2016.03.ebuild
deleted file mode 100644
index 9da0a9081184..000000000000
--- a/dev-embedded/u-boot-tools/u-boot-tools-2016.03.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils toolchain-funcs
-
-MY_P="u-boot-${PV/_/-}"
-DESCRIPTION="utilities for working with Das U-Boot"
-HOMEPAGE="http://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 x86"
-IUSE=""
-
-S=${WORKDIR}/${MY_P}
-
-src_compile() {
-	# Unset a few KBUILD variables. Bug #540476
-	unset KBUILD_OUTPUT KBUILD_SRC
-	emake defconfig
-	emake \
-		HOSTSTRIP=: \
-		STRIP=: \
-		HOSTCC="$(tc-getCC)" \
-		HOSTCFLAGS="${CFLAGS} ${CPPFLAGS}"' $(HOSTCPPFLAGS)' \
-		HOSTLDFLAGS="${LDFLAGS}" \
-		CONFIG_ENV_OVERWRITE=y \
-		tools-all
-}
-
-src_install() {
-	cd tools
-	dobin bmp_logo gen_eth_addr img2srec mkimage
-	dobin easylogo/easylogo
-	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-2016.07.ebuild b/dev-embedded/u-boot-tools/u-boot-tools-2016.07.ebuild
deleted file mode 100644
index efa1a1a8cf9a..000000000000
--- a/dev-embedded/u-boot-tools/u-boot-tools-2016.07.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils toolchain-funcs
-
-MY_P="u-boot-${PV/_/-}"
-DESCRIPTION="utilities for working with Das U-Boot"
-HOMEPAGE="http://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 ~x86"
-IUSE=""
-
-S=${WORKDIR}/${MY_P}
-
-src_compile() {
-	# Unset a few KBUILD variables. Bug #540476
-	unset KBUILD_OUTPUT KBUILD_SRC
-	emake defconfig
-	emake \
-		HOSTSTRIP=: \
-		STRIP=: \
-		HOSTCC="$(tc-getCC)" \
-		HOSTCFLAGS="${CFLAGS} ${CPPFLAGS}"' $(HOSTCPPFLAGS)' \
-		HOSTLDFLAGS="${LDFLAGS}" \
-		CONFIG_ENV_OVERWRITE=y \
-		tools-all
-}
-
-src_install() {
-	cd tools || die
-	dobin bmp_logo gen_eth_addr img2srec mkimage
-	dobin easylogo/easylogo
-	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-2016.09.01-r1.ebuild b/dev-embedded/u-boot-tools/u-boot-tools-2016.09.01-r1.ebuild
deleted file mode 100644
index 1896c254bce2..000000000000
--- a/dev-embedded/u-boot-tools/u-boot-tools-2016.09.01-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-MY_P="u-boot-${PV/_/-}"
-DESCRIPTION="utilities for working with Das U-Boot"
-HOMEPAGE="http://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 ~x86"
-IUSE=""
-
-S=${WORKDIR}/${MY_P}
-
-src_compile() {
-	# Unset a few KBUILD variables. Bug #540476
-	unset KBUILD_OUTPUT KBUILD_SRC
-	emake defconfig
-	emake \
-		HOSTSTRIP=: \
-		STRIP=: \
-		HOSTCC="$(tc-getCC)" \
-		HOSTCFLAGS="${CFLAGS} ${CPPFLAGS}"' $(HOSTCPPFLAGS)' \
-		HOSTLDFLAGS="${LDFLAGS}" \
-		CONFIG_ENV_OVERWRITE=y \
-		tools-all
-}
-
-src_install() {
-	cd tools || die
-	dobin bmp_logo dumpimage fdtgrep gen_eth_addr img2srec mkenvimage mkimage
-	dobin easylogo/easylogo
-	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-2016.09.01.ebuild b/dev-embedded/u-boot-tools/u-boot-tools-2016.09.01.ebuild
deleted file mode 100644
index ce433d530032..000000000000
--- a/dev-embedded/u-boot-tools/u-boot-tools-2016.09.01.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-MY_P="u-boot-${PV/_/-}"
-DESCRIPTION="utilities for working with Das U-Boot"
-HOMEPAGE="http://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 ~x86"
-IUSE=""
-
-S=${WORKDIR}/${MY_P}
-
-src_compile() {
-	# Unset a few KBUILD variables. Bug #540476
-	unset KBUILD_OUTPUT KBUILD_SRC
-	emake defconfig
-	emake \
-		HOSTSTRIP=: \
-		STRIP=: \
-		HOSTCC="$(tc-getCC)" \
-		HOSTCFLAGS="${CFLAGS} ${CPPFLAGS}"' $(HOSTCPPFLAGS)' \
-		HOSTLDFLAGS="${LDFLAGS}" \
-		CONFIG_ENV_OVERWRITE=y \
-		tools-all
-}
-
-src_install() {
-	cd tools || die
-	dobin bmp_logo gen_eth_addr img2srec mkimage
-	dobin easylogo/easylogo
-	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-2016.11.ebuild b/dev-embedded/u-boot-tools/u-boot-tools-2016.11.ebuild
deleted file mode 100644
index 1896c254bce2..000000000000
--- a/dev-embedded/u-boot-tools/u-boot-tools-2016.11.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-MY_P="u-boot-${PV/_/-}"
-DESCRIPTION="utilities for working with Das U-Boot"
-HOMEPAGE="http://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 ~x86"
-IUSE=""
-
-S=${WORKDIR}/${MY_P}
-
-src_compile() {
-	# Unset a few KBUILD variables. Bug #540476
-	unset KBUILD_OUTPUT KBUILD_SRC
-	emake defconfig
-	emake \
-		HOSTSTRIP=: \
-		STRIP=: \
-		HOSTCC="$(tc-getCC)" \
-		HOSTCFLAGS="${CFLAGS} ${CPPFLAGS}"' $(HOSTCPPFLAGS)' \
-		HOSTLDFLAGS="${LDFLAGS}" \
-		CONFIG_ENV_OVERWRITE=y \
-		tools-all
-}
-
-src_install() {
-	cd tools || die
-	dobin bmp_logo dumpimage fdtgrep gen_eth_addr img2srec mkenvimage mkimage
-	dobin easylogo/easylogo
-	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-2017.05.ebuild b/dev-embedded/u-boot-tools/u-boot-tools-2017.05.ebuild
deleted file mode 100644
index 1a32e2433fa0..000000000000
--- a/dev-embedded/u-boot-tools/u-boot-tools-2017.05.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-MY_P="u-boot-${PV/_/-}"
-DESCRIPTION="utilities for working with Das U-Boot"
-HOMEPAGE="http://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 ~x86"
-IUSE=""
-
-S=${WORKDIR}/${MY_P}
-
-src_compile() {
-	# Unset a few KBUILD variables. Bug #540476
-	unset KBUILD_OUTPUT KBUILD_SRC
-	emake defconfig
-	emake \
-		HOSTSTRIP=: \
-		STRIP=: \
-		HOSTCC="$(tc-getCC)" \
-		HOSTCFLAGS="${CFLAGS} ${CPPFLAGS}"' $(HOSTCPPFLAGS)' \
-		HOSTLDFLAGS="${LDFLAGS}" \
-		CONFIG_ENV_OVERWRITE=y \
-		tools-all
-}
-
-src_install() {
-	cd tools || die
-	dobin bmp_logo dumpimage fdtgrep gen_eth_addr img2srec mkenvimage mkimage
-	dobin easylogo/easylogo
-	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-2017.09.ebuild b/dev-embedded/u-boot-tools/u-boot-tools-2017.09.ebuild
deleted file mode 100644
index 76939bc8bba5..000000000000
--- a/dev-embedded/u-boot-tools/u-boot-tools-2017.09.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-MY_P="u-boot-${PV/_/-}"
-DESCRIPTION="utilities for working with Das U-Boot"
-HOMEPAGE="http://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 x86"
-IUSE=""
-
-S=${WORKDIR}/${MY_P}
-
-src_compile() {
-	# Unset a few KBUILD variables. Bug #540476
-	unset KBUILD_OUTPUT KBUILD_SRC
-	emake defconfig
-	emake \
-		HOSTSTRIP=: \
-		STRIP=: \
-		HOSTCC="$(tc-getCC)" \
-		HOSTCFLAGS="${CFLAGS} ${CPPFLAGS}"' $(HOSTCPPFLAGS)' \
-		HOSTLDFLAGS="${LDFLAGS}" \
-		CONFIG_ENV_OVERWRITE=y \
-		tools-all
-}
-
-src_install() {
-	cd tools || die
-	dobin bmp_logo dumpimage fdtgrep gen_eth_addr img2srec mkenvimage mkimage
-	dobin easylogo/easylogo
-	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-2018.05.ebuild b/dev-embedded/u-boot-tools/u-boot-tools-2018.05.ebuild
deleted file mode 100644
index 1a32e2433fa0..000000000000
--- a/dev-embedded/u-boot-tools/u-boot-tools-2018.05.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-MY_P="u-boot-${PV/_/-}"
-DESCRIPTION="utilities for working with Das U-Boot"
-HOMEPAGE="http://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 ~x86"
-IUSE=""
-
-S=${WORKDIR}/${MY_P}
-
-src_compile() {
-	# Unset a few KBUILD variables. Bug #540476
-	unset KBUILD_OUTPUT KBUILD_SRC
-	emake defconfig
-	emake \
-		HOSTSTRIP=: \
-		STRIP=: \
-		HOSTCC="$(tc-getCC)" \
-		HOSTCFLAGS="${CFLAGS} ${CPPFLAGS}"' $(HOSTCPPFLAGS)' \
-		HOSTLDFLAGS="${LDFLAGS}" \
-		CONFIG_ENV_OVERWRITE=y \
-		tools-all
-}
-
-src_install() {
-	cd tools || die
-	dobin bmp_logo dumpimage fdtgrep gen_eth_addr img2srec mkenvimage mkimage
-	dobin easylogo/easylogo
-	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/uisp-20050207-r1 b/dev-embedded/uisp-20050207-r1
new file mode 100644
index 000000000000..954ebb3fff02
--- /dev/null
+++ b/dev-embedded/uisp-20050207-r1
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install prepare
+DESCRIPTION=Tool for programming AVR microcontroller through the parallel port
+EAPI=4
+HOMEPAGE=https://savannah.nongnu.org/projects/uisp
+KEYWORDS=amd64 ~ppc x86
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=https://savannah.nongnu.org/download/uisp/uisp-20050207.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=5895a022b325bb540de0af6be2578c74
diff --git a/dev-embedded/uisp/Manifest b/dev-embedded/uisp/Manifest
deleted file mode 100644
index 1b710b42dad9..000000000000
--- a/dev-embedded/uisp/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX mega-48-88-168.patch 1723 BLAKE2B 7b52560d9a516b9d04efc5b3bc6b59759437217bf1632b3d3de952e3975f58762af3733f63ff35dde687e1c3591ef5805f25c00d164ac48b8aee1b12cacfa087 SHA512 5c850c08320bc5888b8d6556e05c06f5e201a6cc311a89c394d6ad76a9a1332bfe2296731d952cf0b911c8ab94ea34520535fa8011976829abc9cd4b48303fa5
-DIST uisp-20050207.tar.gz 166745 BLAKE2B a99bd0d39a053797d3dee0a4390d0ffcca014bed465ba2aea3e99022fff8c3f5f4dbe96a0e33422ffcfa33621d94f42d37dac17862fd25e7902b3bf79aa90692 SHA512 1dd62d97c2a459abaed4ce60302e7153564d0fd87689c40d175757549fe8e797749fd2f76c6c02bcb85e56600d7e4c790c396dc2b56e152ead486df8e1bc2fe7
-EBUILD uisp-20050207-r1.ebuild 661 BLAKE2B a33ead36606bba4dbaf31dd0ac88fe50b4aba3c2847a7c0901ed747eca65c8ada004c8df4d88272b0621d17bb4f29a1e4cef0993d449b3b220d12161dde2ccca SHA512 1906e79c1bcd096ea85c7de8c7d52e002bdc386aa5fd1531f0327ec89c8f4ec1514bb55078d00cd333fd47f97623885ef6bbccb1c03af6b65db35f858e74ed3b
-MISC metadata.xml 247 BLAKE2B e46b8f2d053251af5cb591bb2ee5e35089c4e8174ee2e7a3c504db23f844b65083d4a3e5198da3977ad3e98b67cab2e0de686a3c62009b487c1e64785a8ff65d SHA512 15df289e0f962f564551f61ada3cfef0311f6af639887def780bf5ad3be105515c8d24c950ff340ed35d89b9cd994af3540322b684c5dec3b43ec6bb0041aa4e
diff --git a/dev-embedded/uisp/files/mega-48-88-168.patch b/dev-embedded/uisp/files/mega-48-88-168.patch
deleted file mode 100644
index dad337b740a7..000000000000
--- a/dev-embedded/uisp/files/mega-48-88-168.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff -Nura uisp-20050207/src/Avr.C uisp-20050207+mega-48-88-168/src/Avr.C
---- uisp-20050207/src/Avr.C	2005-02-07 19:55:08.000000000 -0300
-+++ uisp-20050207+mega-48-88-168/src/Avr.C	2005-06-28 17:11:15.000000000 -0300
-@@ -77,7 +77,7 @@
-   /* no longer in production? -> use 8515, 8535 instead */
-   { "AT90S4414",    0x92, 0x01,   4096,   0,  256,  4000, 4000, AVR_2313 },
-   { "AT90S4434",    0x92, 0x02,   4096,   0,  256,  4000, 4000, AVR_8535 },
--  { "ATmega48",     0x92, 0x05,   4096,   0,  256,  4000, 4000, AVR_M163 },
-+  { "ATmega48",     0x92, 0x05,   4096,   32,  256,  2000, 1500, AVR_M163 },
- 
-   { "AT90S8515",    0x93, 0x01,   8192,   0,  512,  4000, 4000, AVR_2313 },
-   { "AT90S8535",    0x93, 0x03,   8192,   0,  512,  4000, 4000, AVR_8535 },
-@@ -90,7 +90,7 @@
-   { "ATmega8515",   0x93, 0x06,   8192,  64,  512,  4500, 9000, AVR_M163 },
-   { "ATmega8",      0x93, 0x07,   8192,  64,  512,  4500, 9000, AVR_M163 },
-   { "ATmega8535",   0x93, 0x08,   8192,  64,  512,  4500, 9000, AVR_M163 },
--  { "ATmega88",     0x93, 0x0a,   8192,  64,  512,  4000, 4000, AVR_M163 },
-+  { "ATmega88",     0x93, 0x0a,   8192,  64,  512,  2000, 1500, AVR_M163 },
- 
- #if 0
-   /* 12V parallel programming only; here just for the evidence */
-@@ -101,6 +101,7 @@
-   { "ATmega163",    0x94, 0x02,  16384, 128,  512, 15000, 3800, AVR_M163 },
-   { "ATmega16",     0x94, 0x03,  16384, 128,  512,  4500, 9000, AVR_M163 },
-   { "ATmega162",    0x94, 0x04,  16384, 128,  512,  4500, 9000, AVR_M128 },
-+  { "ATmega168",    0x94, 0x06,  16384, 128,  512,  2000, 1500, AVR_M163 },
-   { "ATmega169",    0x94, 0x05,  16384, 128,  512,  4500, 9000, AVR_M128 },
- 
-   { "ATmega323",    0x95, 0x01,  32768, 128, 1024, 15000, 3800, AVR_M163 },
diff --git a/dev-embedded/uisp/metadata.xml b/dev-embedded/uisp/metadata.xml
deleted file mode 100644
index 71b1461e1146..000000000000
--- a/dev-embedded/uisp/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>embedded@gentoo.org</email>
-	<name>Embedded Gentoo</name>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-embedded/uisp/uisp-20050207-r1.ebuild b/dev-embedded/uisp/uisp-20050207-r1.ebuild
deleted file mode 100644
index 2a92a428cdd4..000000000000
--- a/dev-embedded/uisp/uisp-20050207-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit eutils
-
-DESCRIPTION="Tool for programming AVR microcontroller through the parallel port"
-HOMEPAGE="https://savannah.nongnu.org/projects/uisp"
-SRC_URI="https://savannah.nongnu.org/download/uisp/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE=""
-
-src_prepare() {
-	sed -i -e "/^DOC_INST_DIR/s:/[^/]*$:/${PF}:" Makefile.in || die
-	cd src
-	epatch "${FILESDIR}"/mega-48-88-168.patch
-	sed -i -e 's: -Werror::' Makefile.in || die
-}
-
-src_install() {
-	default
-	dodoc doc/*
-	rm "${ED}"/usr/share/doc/${PF}/COPYING* || die
-}
diff --git a/dev-embedded/upslug2-11 b/dev-embedded/upslug2-11
new file mode 100644
index 000000000000..59d8491ea2ff
--- /dev/null
+++ b/dev-embedded/upslug2-11
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install
+DESCRIPTION=util for flashing NSLU2 machines remotely
+EAPI=0
+HOMEPAGE=http://www.nslu2-linux.org/wiki/Main/UpSlug2
+KEYWORDS=amd64 ~arm x86
+LICENSE=MIT
+SLOT=0
+SRC_URI=mirror://sourceforge/nslu/upslug2-11.tar.gz
+_md5_=7c80d5e98127e6657bd895c28adf8dec
diff --git a/dev-embedded/upslug2/Manifest b/dev-embedded/upslug2/Manifest
deleted file mode 100644
index db3e7c58648a..000000000000
--- a/dev-embedded/upslug2/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST upslug2-11.tar.gz 129619 BLAKE2B fd29b7d238f559be8469b4a5f818d9488ee89aef21303981020b5a8526c0537b707beae9b7ccef11c2a6398507dfefd98880d2f5e9ca5e8394b621b5e2d0f207 SHA512 6814a237387b60aa20cc26bbd7ff9e886510d627849b13097e7473aa38501810b1d1871cfdc4f5a44eea2b375c3b58b1e59dcfd5b39178de33600b2a0aa94117
-EBUILD upslug2-11.ebuild 491 BLAKE2B 64a7c05a1c0f701f6c8f21cce62c0df139d57effa39616050fa69ec1b9317f3edf0f1fa3d87b78d80b0c9f14955f69d218d4f1b5a740b1b241905cfbc30a6a8b SHA512 4aaac765d689df311364b937e22c5e2cb4f4496c7b81e9a8a04559229c0a0d2858aa266af426bed3c1ff864b6f63dc92a1f2b995991d83b3aa950e1aa289dbc8
-MISC metadata.xml 445 BLAKE2B 51f5cc6c80257050ece46625131291783693c95a69f31b1058ec67f9fc5595ad61187ecb95dca057feb887a26a4fd282ec270cce147c012d643f630f2185bb96 SHA512 4bae116a7c4838fe156c634911d3880d6ca198b2e3904b32643ea29063e45c75e63c1efe93f490e4aef1b96cfea1cba08d88797a0e335a4af765003cdf0f74bd
diff --git a/dev-embedded/upslug2/metadata.xml b/dev-embedded/upslug2/metadata.xml
deleted file mode 100644
index 1b008890adad..000000000000
--- a/dev-embedded/upslug2/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>embedded@gentoo.org</email>
-		<name>Embedded Gentoo</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>arm@gentoo.org</email>
-		<name>Gentoo Linux ARM Development</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">nslu</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-embedded/upslug2/upslug2-11.ebuild b/dev-embedded/upslug2/upslug2-11.ebuild
deleted file mode 100644
index 9aa13e4e8de1..000000000000
--- a/dev-embedded/upslug2/upslug2-11.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-DESCRIPTION="util for flashing NSLU2 machines remotely"
-HOMEPAGE="http://www.nslu2-linux.org/wiki/Main/UpSlug2"
-SRC_URI="mirror://sourceforge/nslu/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE=""
-
-src_install() {
-	emake install DESTDIR="${D}" || die
-	mv "${D}"/usr/{sbin,bin} || die
-	fperms 4711 /usr/bin/upslug2
-	dodoc AUTHORS ChangeLog NEWS README*
-}
diff --git a/dev-embedded/urjtag-0.10 b/dev-embedded/urjtag-0.10
new file mode 100644
index 000000000000..8f1539719e24
--- /dev/null
+++ b/dev-embedded/urjtag-0.10
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install
+DEPEND=!dev-embedded/jtag ftdi? ( =dev-embedded/libftdi-0* ) readline? ( sys-libs/readline )
+DESCRIPTION=Tool for communicating over JTAG with flash chips, CPUs, and many more
+EAPI=0
+HOMEPAGE=http://urjtag.sourceforge.net/
+IUSE=ftdi readline
+KEYWORDS=amd64 ppc sparc x86
+LICENSE=GPL-2
+RDEPEND=!dev-embedded/jtag ftdi? ( =dev-embedded/libftdi-0* ) readline? ( sys-libs/readline )
+SLOT=0
+SRC_URI=mirror://sourceforge/urjtag/urjtag-0.10.tar.bz2
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=052adfc72f167f823cacbba235a436b7
diff --git a/dev-embedded/urjtag-0.10-r1 b/dev-embedded/urjtag-0.10-r1
new file mode 100644
index 000000000000..000fce8c2c1a
--- /dev/null
+++ b/dev-embedded/urjtag-0.10-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=ftdi? ( dev-embedded/libftdi:0 ) readline? ( sys-libs/readline:= ) usb? ( virtual/libusb:0 )
+DESCRIPTION=Tool for communicating over JTAG with flash chips, CPUs, and many more
+EAPI=5
+HOMEPAGE=http://urjtag.sourceforge.net/
+IUSE=ftdi readline usb
+KEYWORDS=~amd64 ~ppc ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=ftdi? ( dev-embedded/libftdi:0 ) readline? ( sys-libs/readline:= ) usb? ( virtual/libusb:0 ) !dev-embedded/jtag
+SLOT=0
+SRC_URI=mirror://sourceforge/urjtag/urjtag-0.10.tar.bz2
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=a10ce30a103088ea11c7f0533a2d8733
diff --git a/dev-embedded/urjtag-9999 b/dev-embedded/urjtag-9999
new file mode 100644
index 000000000000..1ed9eab4bb79
--- /dev/null
+++ b/dev-embedded/urjtag-9999
@@ -0,0 +1,11 @@
+DEFINED_PHASES=configure install prepare unpack
+DEPEND=ftdi? ( dev-embedded/libftdi:= ) ftd2xx? ( dev-embedded/libftd2xx ) readline? ( sys-libs/readline:= ) usb? ( virtual/libusb:1 ) >=dev-vcs/git-1.8.2.1[curl] >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=Tool for communicating over JTAG with flash chips, CPUs, and many more
+EAPI=5
+HOMEPAGE=http://urjtag.sourceforge.net/
+IUSE=ftd2xx ftdi readline static-libs usb
+LICENSE=GPL-2
+RDEPEND=ftdi? ( dev-embedded/libftdi:= ) ftd2xx? ( dev-embedded/libftd2xx ) readline? ( sys-libs/readline:= ) usb? ( virtual/libusb:1 ) !dev-embedded/jtag
+SLOT=0
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	git-r3	8f6de46b0aa318aea0e8cac62ece098b	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=da5f692b46d8889d6f5d54a90d6aaa85
diff --git a/dev-embedded/urjtag/Manifest b/dev-embedded/urjtag/Manifest
deleted file mode 100644
index 1f0c174f4ed8..000000000000
--- a/dev-embedded/urjtag/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST urjtag-0.10.tar.bz2 959834 BLAKE2B 9901156fb32372de77b3145cdef3f224b95d79d8f981435a41baf8bf1d7cd4353fcb52c60e3b936b59c3347dc485060ada58e87d7e1d4f6137ae12cd07124226 SHA512 245fc276793dbc7791be0989b75beba7f16e8543f35403d645aadcee8d8d613261509392da7e5dd97e5a2de6e87b18276c394cc6353f01e5d1d4907ffb5811ff
-EBUILD urjtag-0.10-r1.ebuild 1067 BLAKE2B 93875e618cf7c3a0273a9d1c2fcb22011da67619e6dea1d4e3425d9ecb6207ce113f08804276055e4a08692ca00397f4a0de2949056d55b9162ee6b526fd8d20 SHA512 a3924b2fd4c12134b57524d8a5d88302ff2bb5433633cb9c97e2d2957748ad7b2b772492a3ebc376de7c6f7aab3239319b28c4fa8bdff48db9ed59cc00a8eaef
-EBUILD urjtag-0.10.ebuild 726 BLAKE2B d1b99baddbd8192fa9fb90d99061d625e9f1a0c6614e334e63cbbdb15fed711adfccc0a2bc8b67e625dac3b718a0b97ae616109fc52c40068144db1f363733ce SHA512 290bbbbb8f0e6184928e6c5a89141be2d62e125878937cb8eac93c8dc508f2aff2373e04a3c93a6d33d6a3500b49d3740eace9df5a955dc61081e625fdda6769
-EBUILD urjtag-9999.ebuild 1218 BLAKE2B baad3748b081a9b9798cdbb61f88a4358124e74698027b0daf8101dc64bf74bdddaa9598e27c0e743f7e19127b4b0aa782cbdedbe10f16246afd255c6a4e3869 SHA512 71a99d16d867945df0572a6a8d40dd8e9e7dc772695be16c4557f7a4dd684deb096bc88ddcb12ef95deb3c2a22121859a5f2317dd367ae1112786c40e093273d
-MISC metadata.xml 540 BLAKE2B 5cace8526e0edb053bb7b56bed518d237eb0c16c1eb94a6ab136166a09631a9f005a7f60404fb6dcf6cedb8b69e367da028b51738f5a06e7a836cb0d22a2a066 SHA512 cb3523611ffcd7e007e06a630b1299aa610511ef20073c5e8a8efada52ba58ff34fcf2ccc4c04f51676e224b3d2b388a871995499fda480c0d51dc063a0777ce
diff --git a/dev-embedded/urjtag/metadata.xml b/dev-embedded/urjtag/metadata.xml
deleted file mode 100644
index 6b1fef9c502d..000000000000
--- a/dev-embedded/urjtag/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>embedded@gentoo.org</email>
-		<name>Embedded Gentoo</name>
-	</maintainer>
-	<use>
-		<flag name="ftd2xx">Enable support for USB FTDI chips via <pkg>dev-embedded/libftd2xx</pkg></flag>
-		<flag name="ftdi">Enable support for USB FTDI chips via <pkg>dev-embedded/libftdi</pkg></flag>
-	</use>
-	<upstream>
-		<remote-id type="sourceforge">urjtag</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-embedded/urjtag/urjtag-0.10-r1.ebuild b/dev-embedded/urjtag/urjtag-0.10-r1.ebuild
deleted file mode 100644
index bd2122f3ac81..000000000000
--- a/dev-embedded/urjtag/urjtag-0.10-r1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# TODO: figure out htf to make python.eclass work
-
-EAPI="5"
-
-inherit eutils multilib
-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.bz2"
-	KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-fi
-
-DESCRIPTION="Tool for communicating over JTAG with flash chips, CPUs, and many more"
-HOMEPAGE="http://urjtag.sourceforge.net/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="ftdi readline usb"
-
-DEPEND="ftdi? ( dev-embedded/libftdi:0 )
-	readline? ( sys-libs/readline:= )
-	usb? ( virtual/libusb:0 )"
-RDEPEND="${DEPEND}
-	!dev-embedded/jtag"
-
-src_prepare() {
-	if [[ ${PV} == "9999" ]] ; then
-		mkdir -p m4
-		eautopoint
-		eautoreconf
-	fi
-}
-
-src_configure() {
-	use readline || export vl_cv_lib_readline=no
-
-	econf \
-		--disable-werror \
-		--disable-python \
-		$(use_with ftdi libftdi) \
-		$(use_with usb libusb)
-}
-
-src_install() {
-	default
-	prune_libtool_files
-}
diff --git a/dev-embedded/urjtag/urjtag-0.10.ebuild b/dev-embedded/urjtag/urjtag-0.10.ebuild
deleted file mode 100644
index 0b3916e481c2..000000000000
--- a/dev-embedded/urjtag/urjtag-0.10.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils
-
-DESCRIPTION="Tool for communicating over JTAG with flash chips, CPUs, and many more"
-HOMEPAGE="http://urjtag.sourceforge.net/"
-SRC_URI="mirror://sourceforge/urjtag/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc sparc x86"
-IUSE="ftdi readline"
-
-DEPEND="!dev-embedded/jtag
-	ftdi? ( =dev-embedded/libftdi-0* )
-	readline? ( sys-libs/readline )"
-
-src_compile() {
-	use readline || export vl_cv_lib_readline=no
-	econf $(use_enable ftdi libftdi) || die
-	emake || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "failed to install"
-	dodoc AUTHORS ChangeLog NEWS README THANKS
-}
diff --git a/dev-embedded/urjtag/urjtag-9999.ebuild b/dev-embedded/urjtag/urjtag-9999.ebuild
deleted file mode 100644
index c78422b44a17..000000000000
--- a/dev-embedded/urjtag/urjtag-9999.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# TODO: figure out htf to make python.eclass work
-
-EAPI="5"
-
-inherit eutils multilib
-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.bz2"
-	KEYWORDS="amd64 ppc sparc x86"
-fi
-
-DESCRIPTION="Tool for communicating over JTAG with flash chips, CPUs, and many more"
-HOMEPAGE="http://urjtag.sourceforge.net/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="ftd2xx ftdi readline static-libs usb"
-
-DEPEND="ftdi? ( dev-embedded/libftdi:= )
-	ftd2xx? ( dev-embedded/libftd2xx )
-	readline? ( sys-libs/readline:= )
-	usb? ( virtual/libusb:1 )"
-RDEPEND="${DEPEND}
-	!dev-embedded/jtag"
-
-src_prepare() {
-	if [[ ${PV} == "9999" ]] ; then
-		mkdir -p m4
-		eautopoint
-		eautoreconf
-	fi
-}
-
-src_configure() {
-	use ftd2xx && LDFLAGS="${LDFLAGS} -L/opt/$(get_libdir)"
-
-	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)
-}
-
-src_install() {
-	default
-	prune_libtool_files
-}
diff --git a/dev-embedded/usbprog-0.2.0-r1 b/dev-embedded/usbprog-0.2.0-r1
new file mode 100644
index 000000000000..a1710abcd377
--- /dev/null
+++ b/dev-embedded/usbprog-0.2.0-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=X? ( x11-libs/wxGTK:3.0 ) >=dev-libs/libxml2-2.0.0 net-misc/curl virtual/libusb:0 sys-libs/readline:0 virtual/pkgconfig
+DESCRIPTION=flashtool for the multi purpose programming adapter usbprog
+EAPI=5
+HOMEPAGE=http://www.embedded-projects.net/index.php?page_id=215
+IUSE=static-libs X
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=X? ( x11-libs/wxGTK:3.0 ) >=dev-libs/libxml2-2.0.0 net-misc/curl virtual/libusb:0 sys-libs/readline:0
+SLOT=0
+SRC_URI=mirror://gentoo/usbprog-0.2.0.tar.bz2
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	04e063b0eff26daaea83d859dd9d6e05
+_md5_=b705eb23450ae67942470d161154c327
diff --git a/dev-embedded/usbprog/Manifest b/dev-embedded/usbprog/Manifest
deleted file mode 100644
index d0dc5c06878b..000000000000
--- a/dev-embedded/usbprog/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX usbprog-0.2.0-wx3.0.patch 919 BLAKE2B 7cf2d5fb2caa18268df5e09264e5263763777e4d671bc47f42cb067de987639d62c25e09cd7a2a697f4fe1bfe5513c1ffa669aaf8d6b6d1c5ae8293563c26321 SHA512 30aed7a7ef1ef04133ef8555131604782f50875c307884781314d3448e57ee1eb8e027a27f72f3fa5cda830a0f422437534968d0189c115927593865ab325164
-DIST usbprog-0.2.0.tar.bz2 4388629 BLAKE2B 39f9408523757d3627d727b45f15dc23176619f5aa17d4f8640282d56f6d3e02b729617d5c31de573afb0518706f752d33a6458efdbe1f589d2734a9c95016a2 SHA512 b670da8c578b5afc5e0909e4e961468f6e2f54fe00c2061a21e8c88018c5fb40679c728b03dfeaf1a18f1b3fd527af4e1ceb563b922adb1f38fbb3a07a4b2216
-EBUILD usbprog-0.2.0-r1.ebuild 889 BLAKE2B d27571ea2729343b8284f326da257f00333e5a131ccc6b39a10891c9370a3e012f9918f24ec76c14406dc09e7fba8fa3a5de6ae24e8dbfc884d1b6a4fb04e502 SHA512 d3592d8eb15869e34bbb35ac9ae2eb9389bcf3745f7feb210fbcb36b0773791bc7c8b0126efd5c1ed0530dc434c1026a361ca74b4b49847c0722a3ba4f56b1df
-MISC metadata.xml 247 BLAKE2B e46b8f2d053251af5cb591bb2ee5e35089c4e8174ee2e7a3c504db23f844b65083d4a3e5198da3977ad3e98b67cab2e0de686a3c62009b487c1e64785a8ff65d SHA512 15df289e0f962f564551f61ada3cfef0311f6af639887def780bf5ad3be105515c8d24c950ff340ed35d89b9cd994af3540322b684c5dec3b43ec6bb0041aa4e
diff --git a/dev-embedded/usbprog/files/usbprog-0.2.0-wx3.0.patch b/dev-embedded/usbprog/files/usbprog-0.2.0-wx3.0.patch
deleted file mode 100644
index bfd47ad89c74..000000000000
--- a/dev-embedded/usbprog/files/usbprog-0.2.0-wx3.0.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Description: Fix to build with wxWidgets 3.0
- This patch should also work with wxWidgets 2.8.
-Author: Olly Betts <olly@survex.com>
-Last-Update: 2014-03-12
-
---- usbprog-0.2.0.orig/gui/usbprogFrm.cc
-+++ usbprog-0.2.0/gui/usbprogFrm.cc
-@@ -296,7 +296,7 @@ void usbprogFrm::CreateGUIControls()
- 
-     // file dialog
- 	m_fileDialog = new wxFileDialog(m_panel, wxT("Choose a file"),
--            wxT(""), wxT(""), wxT("*.bin"), wxOPEN);
-+            wxT(""), wxT(""), wxT("*.bin"), wxFD_OPEN);
- 
-     m_topBox->Add(topSizer, wxEXPAND, wxALL, 10);
- 
-@@ -670,7 +670,7 @@ void usbprogFrm::enableDisableDebug(wxCo
-         dbg->setFileHandle(NULL);
-     } else {
-         wxFileDialog fdg(m_panel, wxT("Choose a file"),
--            wxT(""), wxT(""), wxT("*.log"), wxSAVE);
-+            wxT(""), wxT(""), wxT("*.log"), wxFD_SAVE);
-         if (fdg.ShowModal() != wxID_OK)
-             dbg->setFileHandle(stderr);
-         else {
diff --git a/dev-embedded/usbprog/metadata.xml b/dev-embedded/usbprog/metadata.xml
deleted file mode 100644
index 71b1461e1146..000000000000
--- a/dev-embedded/usbprog/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>embedded@gentoo.org</email>
-	<name>Embedded Gentoo</name>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-embedded/usbprog/usbprog-0.2.0-r1.ebuild b/dev-embedded/usbprog/usbprog-0.2.0-r1.ebuild
deleted file mode 100644
index 6af020d73390..000000000000
--- a/dev-embedded/usbprog/usbprog-0.2.0-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-WX_GTK_VER="3.0"
-
-inherit eutils wxwidgets
-
-DESCRIPTION="flashtool for the multi purpose programming adapter usbprog"
-HOMEPAGE="http://www.embedded-projects.net/index.php?page_id=215"
-#SRC_URI="mirror://berlios/${PN}/${P}.tar.bz2"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="static-libs X"
-
-RDEPEND="
-	X? ( x11-libs/wxGTK:${WX_GTK_VER} )
-	>=dev-libs/libxml2-2.0.0
-	net-misc/curl
-	virtual/libusb:0
-	sys-libs/readline:0
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-wx3.0.patch
-}
-
-src_configure() {
-	use X && need-wxwidgets unicode
-	econf \
-		$(use_enable X gui) \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	default
-	use static-libs || find "${ED}" -name '*.la' -delete
-}
diff --git a/dev-embedded/zmac-1.3 b/dev-embedded/zmac-1.3
new file mode 100644
index 000000000000..d657ecd07b71
--- /dev/null
+++ b/dev-embedded/zmac-1.3
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install
+DEPEND=app-arch/unzip
+DESCRIPTION=Z80 macro cross-assembler
+EAPI=0
+HOMEPAGE=http://www.tim-mann.org/trs80resources.html
+KEYWORDS=amd64 x86
+LICENSE=public-domain
+SLOT=0
+SRC_URI=http://www.tim-mann.org/trs80/zmac13.zip
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=104b3e4ecc2bd32929e6a445fd8d65ed
diff --git a/dev-embedded/zmac/Manifest b/dev-embedded/zmac/Manifest
deleted file mode 100644
index b869b19fcef9..000000000000
--- a/dev-embedded/zmac/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST zmac13.zip 82067 BLAKE2B 8f15cc17d92ed8bdfc16504c2c958db1f158cf8cceda6aba01e626342961975c68e41321349c95721053b1d10f07373b76385ebf9c1b74dd70f69c5d6fd82b70 SHA512 84c1206e3abf19809ab4358c0b5d46771cdcfdeb4ded14aa39d81ca7f9d3780ca1917823bd06f49ee9fafaaa079bdbe8b614ce842d44181f55d4287515a187a2
-EBUILD zmac-1.3.ebuild 590 BLAKE2B dc7fbcf2db2205c91374c147468fd8a943dc38b7d5c050b9faaf46a53ff435a63b37637a3ad0cc738d2e1e5c82950ca525cd3d1c513f3af114e79af8b1e4215e SHA512 9cca780d0b13649081505c902c110d0457718ec69df796ed8a994a53e465f8c161a4c672134085f64e35e6aa3aa6c7d13db1e409b02dc5f3c85c1cf95d72e68a
-MISC metadata.xml 635 BLAKE2B bb2ec2e726bb24ab5f0010979b01368ce0644a46ad589433377609863d3da769c5660f6613d2b775a9359aae44eee3fee7e7a578e320d840f5ade31a78b14fa0 SHA512 ce5a690df0362dfd32802e9e3d64bec1a00ca4a15c9dbbde2d3383baed657f701c516ff24dfc42f459f0fc7796386ce23ba249af7a6d88e98f9b9f3f345a43f0
diff --git a/dev-embedded/zmac/metadata.xml b/dev-embedded/zmac/metadata.xml
deleted file mode 100644
index 346710925585..000000000000
--- a/dev-embedded/zmac/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="person">
-  <email>ulm@gentoo.org</email>
-</maintainer>
-<longdescription>
-  zmac is a Z80 macro cross-assembler. It has all the features you'd expect.
-  It assembles the specified input file and produces raw binary output.
-  (It can optionally produce CP/M-style Intel hex format.) By default it
-  also produces a nicely-formatted listing of the m/c alongside the source.
-
-  As well as normal Z80 programs, zmac lets you write 8080 programs in Z80
-  assembly.
-</longdescription>
-</pkgmetadata>
diff --git a/dev-embedded/zmac/zmac-1.3.ebuild b/dev-embedded/zmac/zmac-1.3.ebuild
deleted file mode 100644
index 7ae9a9a0270e..000000000000
--- a/dev-embedded/zmac/zmac-1.3.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit toolchain-funcs
-
-DESCRIPTION="Z80 macro cross-assembler"
-HOMEPAGE="http://www.tim-mann.org/trs80resources.html"
-SRC_URI="http://www.tim-mann.org/trs80/${PN}${PV//.}.zip"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="app-arch/unzip"
-RDEPEND=""
-
-S="${WORKDIR}"
-
-src_compile() {
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS} ${LDFLAGS}" || die
-}
-
-src_install() {
-	dobin zmac || die
-	doman zmac.1 || die
-	dodoc ChangeLog MAXAM NEWS README || die
-}