gentoo resync : 20.02.2019

13 files changed, 310 insertions, 39 deletions

diff --git a/dev-embedded/Manifest.gz b/dev-embedded/Manifest.gz
index 4fa787cfb68e..9c1954a87448 100644
--- a/dev-embedded/Manifest.gz
+++ b/dev-embedded/Manifest.gz
diff --git a/dev-embedded/arduino/Manifest b/dev-embedded/arduino/Manifest
index c90d21ba415a..0c9c6a93113f 100644
--- a/dev-embedded/arduino/Manifest
+++ b/dev-embedded/arduino/Manifest
@@ -28,5 +28,5 @@ DIST arduino-WiFi101-Updater-ArduinoIDE-Plugin-0.9.2.zip 945515 BLAKE2B a2ab32b4
 DIST arduino-avr-1.6.23.tar.bz2 5001988 BLAKE2B 8b6ddc2d66e651a3a2b6bd6992cd1311aad223a6cefa1a1a4bc1fa05de449116511137f8cf13c50ca42b83477c66cf4aa3a7984f49905eb7a295eff7f2c3623e SHA512 70ff70446bfc0f036f7a2927e8e53861e60225a0a6c1eb993557278ec79b8337f3a5ee6fd6f6d200744d80104efb1783332eb8d6d53c9f1b6ea6dc3054d78fd4
 DIST arduino-reference-1.6.6-3.zip 7004842 BLAKE2B 49d0d41fb499c15f06c8cb8d8211e5039ee9843a6629f305762b262a5bf199e4bbe7fea4716b7734403dc7e83ce35a963035b3a2c0d6a198a4218e7472b18d74 SHA512 65962322b6dcb15da6c119d47c382052d1183772c855b8e8fcdd108b54e730e2374d93741737f3b51e57288a0e8842a6a7f79dce4377ea3630293e6c3e7e8b73
 EBUILD arduino-1.8.5-r2.ebuild 5052 BLAKE2B 1a5030bbbf97a84b23895770cb26dfd1aeaca126ff87d295cd96664955f15704a52585de0cfb09e35741e8a21ddef1cf9fa33ed2fe112f435fcecc001562dfb6 SHA512 43d670b61383637d7da05b3619a941823c3b786c348c8290e55649e390bdb12a664770588267e8cb55a8d96b8de272c6694295ba1fab0e8eda7db4aa1ac1e5bc
-EBUILD arduino-1.8.7.ebuild 4685 BLAKE2B 1468fe1960e87f4fe6e7ae40416662bf872de5434dc1165cb92f3161561a27a14337dd217efe8a02e5d19a7c828d1279d533d32b5bcc29e6bccb6d437e1808fc SHA512 1d279214fba31f7bef7062beeec26d4ad0c48aa3d2c320ca21c4cc2e171e2a2c9541a067c3e24d3329fc35203d85c81febd92a0c1dd13ba2fba5883ce524b797
+EBUILD arduino-1.8.7.ebuild 4683 BLAKE2B 6aa4b4fc81b29d5dcfaa4b97682bb1704bbde4b95a3138bd2223d1dddd6c87dba180af00ae79afd7d0e15e1c16aaf2ae35c8395f54ceee2e9e3567488a1b2672 SHA512 aecb1545db27ea0362f02c5fe9308d3f9d619b6ba6f1243cf0a52965ebcd44ef69c79d39ef9ef8c859bd57456f70726346c43b6341dda8605c8d9be22e3ba8f6
 MISC metadata.xml 331 BLAKE2B 5449a181e8d470cb80c1a32d50e79c9f912117df14673adc2d1d989f037b1fd89c8bb4a263b4a883e30ab034e0e1ef1e82f54fa9134511755f9ccd62acff9af9 SHA512 6966c4f97ca07b9ef925691abe06e3110d9901cf15fbc7ed07c5ac65dbe583d346186961f64fba71ff796b5d6ff187870b8db41b3f1836b3fefbcc3e54c7ba4e
diff --git a/dev-embedded/arduino/arduino-1.8.7.ebuild b/dev-embedded/arduino/arduino-1.8.7.ebuild
index 60451878c0aa..6a1c9a5f0555 100644
--- a/dev-embedded/arduino/arduino-1.8.7.ebuild
+++ b/dev-embedded/arduino/arduino-1.8.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -27,7 +27,7 @@ SRC_URI="https://github.com/arduino/Arduino/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="GPL-2 LGPL-2.1 CC-BY-SA-3.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc"
 
 CDEPEND="dev-embedded/arduino-builder"
diff --git a/dev-embedded/openocd/Manifest b/dev-embedded/openocd/Manifest
index d6567ecbb1e8..9f40f475ed79 100644
--- a/dev-embedded/openocd/Manifest
+++ b/dev-embedded/openocd/Manifest
@@ -1,6 +1,7 @@
 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
+EBUILD openocd-0.10.0-r1.ebuild 2832 BLAKE2B 95431b3b1fe66566760772c5ff12b5036c708613a1c422b5a02dc8f8d51c87b273f84b5f776702209ab9e3a931257dc9f11992354cee24da16f2f22c3a843103 SHA512 6e9d5bb38eddf68aff7accef4dd837c0cb454c5b219dc7a59408bd5463e6476a8e14feb0e1dbaff0582d551fba0076f9a2de6fe1037a07967bc30b094e06500d
+EBUILD openocd-0.10.0.ebuild 2806 BLAKE2B d46464e208310d3ec2a615535b4e54e4f73aa1977b1c72b94cc5fb9a165b6d53c2b2042d85c60b49559e64631b109adfceb55dc083a0fcf5836a1e3368da658f SHA512 90ce1e9b75251e998c4bb7ab2570154ebfa401e7f5b5fcf4d669b3c30505431e224bba45c5f2b26255cd8fb84f89cdafb00a615029acee993413a39552eb30c8
+EBUILD openocd-0.9.0.ebuild 2667 BLAKE2B 31aabad3b6f6e5006c007a28f7e8a5af4e946b5fb41f269cca67711a10e4a6a7f679b04529422cd25d6db154ca16321fa06a43518a76cce49d7a342cc72fc1ff SHA512 8acf019ba88414e2984edf5398bc98bc8eec74a267a7862c715aad851c76e9f369b40d35793cbfef0c04da159ff5a87e495ef01b42aeb4aab025daff0f3ce0c4
+EBUILD openocd-9999.ebuild 2832 BLAKE2B 95431b3b1fe66566760772c5ff12b5036c708613a1c422b5a02dc8f8d51c87b273f84b5f776702209ab9e3a931257dc9f11992354cee24da16f2f22c3a843103 SHA512 6e9d5bb38eddf68aff7accef4dd837c0cb454c5b219dc7a59408bd5463e6476a8e14feb0e1dbaff0582d551fba0076f9a2de6fe1037a07967bc30b094e06500d
 MISC metadata.xml 882 BLAKE2B f7ec7fcd46485cf4f0c9039718cda564607f6f048646b326781cf09b2383c8665b8d624a19070a659df718673f4639bc918808ae950d6013016a0349a9fa6cb3 SHA512 bd6d73764a65fb4df85ce70552f0db5d18d876a54f1f1b4f75cba7865bdc425de78797f747b77f96b1c1e5b342106dd883d02f9c638875914d91987604ea8b76
diff --git a/dev-embedded/openocd/openocd-0.10.0-r1.ebuild b/dev-embedded/openocd/openocd-0.10.0-r1.ebuild
new file mode 100644
index 000000000000..ce0f6e7381b5
--- /dev/null
+++ b/dev-embedded/openocd/openocd-0.10.0-r1.ebuild
@@ -0,0 +1,145 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+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:0=
+	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() {
+	default
+
+	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
+	dostrip "${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.10.0.ebuild b/dev-embedded/openocd/openocd-0.10.0.ebuild
index 44c2c20d5379..72a0bbe07a5c 100644
--- a/dev-embedded/openocd/openocd-0.10.0.ebuild
+++ b/dev-embedded/openocd/openocd-0.10.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -136,7 +136,6 @@ src_configure() {
 
 src_install() {
 	default
-	env -uRESTRICT prepstrip "${ED}"/usr/bin
 	udev_dorules "${D}"/usr/share/${PN}/contrib/*.rules
 }
 
diff --git a/dev-embedded/openocd/openocd-0.9.0.ebuild b/dev-embedded/openocd/openocd-0.9.0.ebuild
index 7a694fd3a84d..d6d36ec4b0a1 100644
--- a/dev-embedded/openocd/openocd-0.9.0.ebuild
+++ b/dev-embedded/openocd/openocd-0.9.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -126,7 +126,6 @@ src_configure() {
 
 src_install() {
 	default
-	env -uRESTRICT prepstrip "${ED}"/usr/bin
 	udev_dorules "${D}"/usr/share/${PN}/contrib/*.rules
 }
 
diff --git a/dev-embedded/openocd/openocd-9999.ebuild b/dev-embedded/openocd/openocd-9999.ebuild
index 57ba7a8c69e9..ce0f6e7381b5 100644
--- a/dev-embedded/openocd/openocd-9999.ebuild
+++ b/dev-embedded/openocd/openocd-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI="7"
 
 inherit eutils multilib flag-o-matic toolchain-funcs udev user
 
@@ -25,7 +25,7 @@ SLOT="0"
 IUSE="+cmsis-dap dummy +ftdi +jlink parport +usb verbose-io"
 RESTRICT="strip" # includes non-native binaries
 
-RDEPEND=">=dev-lang/jimtcl-0.76
+RDEPEND=">=dev-lang/jimtcl-0.76:0=
 	cmsis-dap? ( dev-libs/hidapi )
 	jlink? ( dev-embedded/libjaylink )
 	usb? (
@@ -43,7 +43,7 @@ pkg_setup() {
 }
 
 src_prepare() {
-	epatch_user
+	default
 
 	if [[ ${PV} == "9999" ]] ; then
 		AT_NO_RECURSIVE=yes eautoreconf
@@ -136,7 +136,7 @@ src_configure() {
 
 src_install() {
 	default
-	env -uRESTRICT prepstrip "${ED}"/usr/bin
+	dostrip "${ED}"/usr/bin
 	udev_dorules "${D}"/usr/share/${PN}/contrib/*.rules
 }
 
diff --git a/dev-embedded/sdcc/Manifest b/dev-embedded/sdcc/Manifest
index f0686df3d197..e09b95bf57b5 100644
--- a/dev-embedded/sdcc/Manifest
+++ b/dev-embedded/sdcc/Manifest
@@ -3,7 +3,8 @@ DIST sdcc-doc-3.5.0.tar.bz2 1000775 BLAKE2B 30cd31990788060ebc792d98b072d4d72ce7
 DIST sdcc-doc-3.8.0.tar.bz2 965465 BLAKE2B 541ed3ba4d3a23dd3fcea248de84d887fdcd8ddaf3ed0f9f810bf8cb9fcb5b10eb2cd96099d83c5a0fda240cdd3d11fd247e576a67a32047a4f7a705b8401637 SHA512 63319b7c344b320600e6a7c158d1a5e69abe595dfd6b8d32a95f15678c3bc2f6fe72c959516c4b1f812deb089854c6a51c31438ef6a6c7f9fcb4d419d8cce3cf
 DIST sdcc-src-3.5.0.tar.bz2 10504517 BLAKE2B 16102ebd55026826100b453db20e00fa599ce6ad72f1466c32deb7211f09188048f35ac8ddd5987b7a3ad5fad79f2e2ee833da60e22a26b107c5e9e0e7c9be09 SHA512 a5842945da065ab566b7e073782e92f851da48c160990d49b76ab4773fe1c14286cab399fb7f2456432e4043ee7ce07c3b149aeb103c51f85a33fdc5f8798f4e
 DIST sdcc-src-3.8.0.tar.bz2 18987862 BLAKE2B 7e8ddea41ae02842bb1376c53364c386a0fb47a1acdcc97cc72f002e78a2854fc43adfd0177f94dd1173dbd81052c390c5b2fef302c73f0b830ec83eea70869c SHA512 38145ea3e9560eb8894c54bd7213da67a20163739c944c3247fa8fa456dfedaaa469746169d3e114affcab48b73db4cd8c9a0a367e7368f2471de64761a3e04a
-EBUILD sdcc-3.5.0.ebuild 3263 BLAKE2B e52602faa59a8fd9ca9303725dbc5e05f37d90278810eb8aaa8f3c50cf1812d0ecb82ed539a387271a882679a2e3e2632d6162a7a2d69b270d21a1b718665603 SHA512 9a0674bbaf3b347a81862dcdc88c418077f4fbab509b616c31973605a9941096646378ba84c23a7853d067c2b1d3dca27ee6f644de5e3fdcbc6e3c0fce4dfbf1
-EBUILD sdcc-3.8.0.ebuild 3207 BLAKE2B d54745b88fdc3bae9f0feff8ae37b598b90d8f9f658a801e5fe89e50a6db632c63a77aaccecb20c8b3b1381b60b164d0fc90ab17df2cc655ff17faa2a11866ae SHA512 60110b9a870c7b0ea6b81677a3d0a5a4b258f984bcfa14003a2453912c65dba07d1a4f0e0551df2b934a008f2a761df85bc052329c68f78f42843dbe90c6d71d
-EBUILD sdcc-9999.ebuild 3207 BLAKE2B d54745b88fdc3bae9f0feff8ae37b598b90d8f9f658a801e5fe89e50a6db632c63a77aaccecb20c8b3b1381b60b164d0fc90ab17df2cc655ff17faa2a11866ae SHA512 60110b9a870c7b0ea6b81677a3d0a5a4b258f984bcfa14003a2453912c65dba07d1a4f0e0551df2b934a008f2a761df85bc052329c68f78f42843dbe90c6d71d
+EBUILD sdcc-3.5.0.ebuild 3039 BLAKE2B 514e8cfa9d07563590b0157adcfd70e4d30802ee6db7899565d2cf4838fc996adc73e5718e5d4d4266784bc1824badf3cd194d711d33c77034c69cb968c05fd5 SHA512 f8d068628aef01a1ed3189cab8a449deb9bd0755d5ba41332a2cc332faa3f5578b0f7892c1c1f3e0e2fac05ed78daa6e6cda8edec7b1e968ef57c2870d017403
+EBUILD sdcc-3.8.0-r1.ebuild 3182 BLAKE2B 3988dfd3ecf5ab4f09ccdcdd1182cdf127a47e6fde0ec6d814b9caf195b49b9b01073d68473343eba5963d95f3864c36de9780001dd0714be0d1edf3c72f845f SHA512 1e2e16aaf3ba2b15dd78d882fecac67a1dff36a65b991d6d0dd9abea09f52ad9da3aed453bc9d76266bb556c1fadd36ad5cb44c9dd82f7d55243594dad3d2545
+EBUILD sdcc-3.8.0.ebuild 2986 BLAKE2B 1a6957ca94ce31d3cb1ad7028bc596af2f7a92f123e0c959446a0dfe6e772f42a96b980b0e7bca7dcda50e1fc306922d091bd44339b8afbf610770014513d5fd SHA512 892f7e0a1c6b04184061efb9104f714e6579be9184058ef428211715ae38e86e89967c36d178e26b17ac14ce8a5303200b1854f7682ef130407a33fab6f40a6c
+EBUILD sdcc-9999.ebuild 3264 BLAKE2B 609d4a47ce42971463b114007b27b067673dcc35a6f0bc79d151900752e7b33ac2acf37a1f448ff130d7990f2924df0df9c914eab312b7cb8a2b8d2e7bce8fa4 SHA512 9114783f8f825bb0cd2ace897dbc857ff8ab3c15390818a2c1387fd3aad9d53218034a9464a94cfb1aa40d4cbff3cab8ebb7d59db318bbe105c2d31ad81a171e
 MISC metadata.xml 2284 BLAKE2B e3fdd79032b8f663940903ed11a92c199048bcc485d24c3d7ab99757e3cdad1438c319cc7327f53921f7c853a59fe0a6bc4dfc5df84d4edfd92feae42459b858 SHA512 cd4b8ed438d294e239e67f0037d1f0f044215d2c6da8a13a661ebd56c3501df0ed7ecb41fb0c34f150345c5008dc3d37d9df127da60bb6c59bb630f1c695c118
diff --git a/dev-embedded/sdcc/sdcc-3.5.0.ebuild b/dev-embedded/sdcc/sdcc-3.5.0.ebuild
index 3379d7019c12..5a4e83b451dd 100644
--- a/dev-embedded/sdcc/sdcc-3.5.0.ebuild
+++ b/dev-embedded/sdcc/sdcc-3.5.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -112,9 +112,4 @@ src_install() {
 		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-3.8.0-r1.ebuild b/dev-embedded/sdcc/sdcc-3.8.0-r1.ebuild
new file mode 100644
index 000000000000..abba11e8b886
--- /dev/null
+++ b/dev-embedded/sdcc/sdcc-3.8.0-r1.ebuild
@@ -0,0 +1,133 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools toolchain-funcs
+
+if [[ ${PV} == "9999" ]] ; then
+	ESVN_REPO_URI="https://svn.code.sf.net/p/sdcc/code/trunk/sdcc"
+	inherit subversion
+else
+	SRC_URI="
+		mirror://sourceforge/sdcc/${PN}-src-${PV}.tar.bz2
+		doc? ( mirror://sourceforge/sdcc/${PN}-doc-${PV}.tar.bz2 )
+	"
+	KEYWORDS="~amd64 ~x86"
+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"
+SDCC_PORTS="
+	avr ds390 ds400 gbz80 hc08 mcs51 pic14 pic16 r2k r3ka s08 stm8 tlcs90 z180
+	z80
+"
+IUSE="
+	${SDCC_PORTS}
+	+boehm-gc device-lib doc non-free packihx +sdbinutils sdcdb +sdcpp ucsim
+"
+
+for port in ${SDCC_PORTS}; do
+REQUIRED_USE="${REQUIRED_USE}
+	${port}? ( sdbinutils )
+"
+done
+REQUIRED_USE="${REQUIRED_USE}
+	|| ( ${SDCC_PORTS} )
+"
+
+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
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.8.0-override-override.patch
+)
+
+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 -e '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 . {} +
+
+	default
+	eautoreconf
+}
+
+src_configure() {
+	# sdbinutils subdir doesn't pass down --docdir properly, so need to
+	# expand $(datarootdir) ourselves.
+	econf \
+		ac_cv_prog_AR="$(tc-getAR)" \
+		ac_cv_prog_AS="$(tc-getAS)" \
+		ac_cv_prog_STRIP=true \
+		$(use_enable avr avr-port) \
+		$(use_enable boehm-gc libgc) \
+		$(use_enable device-lib) \
+		$(use_enable ds390 ds390-port) \
+		$(use_enable ds400 ds400-port) \
+		$(use_enable gbz80 gbz80-port) \
+		$(use_enable hc08 hc08-port) \
+		$(use_enable mcs51 mcs51-port) \
+		$(use_enable non-free) \
+		$(use_enable packihx) \
+		$(use_enable pic14 pic14-port) \
+		$(use_enable pic16 pic16-port) \
+		$(use_enable r2k r2k-port) \
+		$(use_enable r3ka r3ka-port) \
+		$(use_enable s08 s08-port) \
+		$(use_enable sdbinutils) \
+		$(use_enable sdcdb) \
+		$(use_enable sdcpp) \
+		$(use_enable stm8 stm8-port) \
+		$(use_enable tlcs90 tlcs90-port) \
+		$(use_enable ucsim) \
+		$(use_enable z180 z180-port) \
+		$(use_enable z80 z80-port) \
+		--disable-doc \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		--without-ccache
+}
+
+src_install() {
+	default
+	dodoc doc/*.txt
+	find "${D}" -name .deps -exec rm -rf {} + || die
+
+	if use doc && [[ ${PV} != "9999" ]]; then
+		cd "${WORKDIR}"/doc
+		dodoc -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.
+	dostrip "${D%/}"/usr/bin
+}
diff --git a/dev-embedded/sdcc/sdcc-3.8.0.ebuild b/dev-embedded/sdcc/sdcc-3.8.0.ebuild
index b2e7a0f0e7b3..570c8091c708 100644
--- a/dev-embedded/sdcc/sdcc-3.8.0.ebuild
+++ b/dev-embedded/sdcc/sdcc-3.8.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -125,9 +125,4 @@ src_install() {
 		cd "${WORKDIR}"/doc
 		dodoc -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
index b2e7a0f0e7b3..efab11532f4c 100644
--- a/dev-embedded/sdcc/sdcc-9999.ebuild
+++ b/dev-embedded/sdcc/sdcc-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -30,15 +30,15 @@ SDCC_PORTS="
 "
 IUSE="
 	${SDCC_PORTS}
-	+boehm-gc device-lib doc non-free packihx sdbinutils sdcdb +sdcpp ucsim
+	+boehm-gc device-lib doc non-free packihx +sdbinutils sdcdb +sdcpp ucsim
 "
 
-REQUIRED_USE="
-	ds390? ( sdbinutils )
-	ds400? ( sdbinutils )
-	hc08?  ( sdbinutils )
-	mcs51? ( sdbinutils )
-	s08?   ( sdbinutils )
+for port in ${SDCC_PORTS}; do
+REQUIRED_USE="${REQUIRED_USE}
+	${port}? ( sdbinutils )
+"
+done
+REQUIRED_USE="${REQUIRED_USE}
 	|| ( ${SDCC_PORTS} )
 "
 
@@ -129,5 +129,8 @@ src_install() {
 	# 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
+
+	# TODO: use dostrip from EAPI=7 when subversion gets EAPI=7
+	# in bug #678344:
+	#dostrip "${D%/}"/usr/bin
 }