gentoo resync : 03.11.2018

9 files changed, 244 insertions, 94 deletions

diff --git a/dev-embedded/Manifest.gz b/dev-embedded/Manifest.gz
index 54551f8b513e..a12f8603093b 100644
--- a/dev-embedded/Manifest.gz
+++ b/dev-embedded/Manifest.gz
diff --git a/dev-embedded/platformio/Manifest b/dev-embedded/platformio/Manifest
index edd35730858b..5cfc4058a7f2 100644
--- a/dev-embedded/platformio/Manifest
+++ b/dev-embedded/platformio/Manifest
@@ -1,5 +1,3 @@
-DIST platformio-3.5.4.tar.gz 97742 BLAKE2B 5fcc652358ea5788977836a6ee0fe204633e2748afc5cbb6924e8200c0115c92a778c0c919178f05a9656f21eb2b17f4e15b0de5ea06fbade936d8b59bb12431 SHA512 2d2af5133648a9b2070abb5d39d27a7292865b99cf690c587f4c80d5e97d429eaa3b037b07a1afcf199df730fe96a0dfecb4ff45ffd21d286f80d5d265e9a85e
-DIST platformio-3.6.0.tar.gz 99386 BLAKE2B 7cc9e687733cf6cb95d928555dc391330c257c0e6878e1c4bd7395130f7bd79bc66bd0d480e1867cbc26f028b0f3bd9588ca0d1ce8e0dbd23f9eefa9fb812c38 SHA512 b4f59593e0fe37c19857280235900a450c55ea9b8719113ceac78c48b5d30aea378c863e7644725f7092e8aca643e1657f94c3010691c57e0228f44ac00937a3
-EBUILD platformio-3.5.4.ebuild 983 BLAKE2B 914ec00f360676c67cb37673c5a3ff2c4075de9b4056eedb9471dd964574881ba6df8ddd1b1edb04356781be366f7ec76bd8b82262745a3a33ac43198243e028 SHA512 72d8261e807850c4709dab0cde6aae59b08d7e5ad3b81969232a098b741bbc863e7196c5bd54e6e7be389be42f595a4c8d3a9ca5a99cd45bd488b942c0126a38
-EBUILD platformio-3.6.0.ebuild 983 BLAKE2B 914ec00f360676c67cb37673c5a3ff2c4075de9b4056eedb9471dd964574881ba6df8ddd1b1edb04356781be366f7ec76bd8b82262745a3a33ac43198243e028 SHA512 72d8261e807850c4709dab0cde6aae59b08d7e5ad3b81969232a098b741bbc863e7196c5bd54e6e7be389be42f595a4c8d3a9ca5a99cd45bd488b942c0126a38
+DIST platformio-3.6.1.tar.gz 111097 BLAKE2B b7df856239a50afca089985fa56903c4b3adec4a461e147d84b4270ac2488f6d8cac9a9a338a243f561f3235cffb60a971b22ed1f2b77daec685f3248ae707b2 SHA512 27adab3578b9ab369e76fce98439eb7705e0e660a3d5652d0945bcdddbca820a365b18ca896de505401fb8cf57e74c6fde3db6e409b2ec1c7cef842ebdd7743a
+EBUILD platformio-3.6.1.ebuild 980 BLAKE2B 766bdb952c361ea9ff264daf77331ff3b359a942b0f123a8258d114d3bd9ae209fca393dbf8929042358e8af79a3b7b8f1ef7579c0cccfe4e67ea42c885cb100 SHA512 e13d8dc46afd296f7f8465f59176b04879c4cb9a5b091403789b91aa523fcd37cd0a80e703dfdee515204e792979b0b59fbf0c6154b3ff60f209d511fe9c9ebd
 MISC metadata.xml 248 BLAKE2B 946598a9bc9f658d98c3282fd6affeb3834a4b6071beca852a2f2381d5c17799b6ed17ed427a8f6e10fb3f715cdf2aad9e4fed2886f0dd67dacfdffcd5137f80 SHA512 89d637e180ed3a2c2096be2210633dc5df0760a7d6acd7b2d2ad8a06d473943ee86bad7e74c7df238a50168d1da8044471713e9b044007b9c2f4eb604fb710d5
diff --git a/dev-embedded/platformio/platformio-3.6.0.ebuild b/dev-embedded/platformio/platformio-3.6.0.ebuild
deleted file mode 100644
index a4d3b719d1c2..000000000000
--- a/dev-embedded/platformio/platformio-3.6.0.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.6.1.ebuild
index a4d3b719d1c2..8a9dd48ab3f5 100644
--- a/dev-embedded/platformio/platformio-3.5.4.ebuild
+++ b/dev-embedded/platformio/platformio-3.6.1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 PYTHON_COMPAT=( python2_7 )
 DISTUTILS_SINGLE_IMPL=1
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/dev-embedded/sdcc/Manifest b/dev-embedded/sdcc/Manifest
index ee166bdc38db..f0686df3d197 100644
--- a/dev-embedded/sdcc/Manifest
+++ b/dev-embedded/sdcc/Manifest
@@ -1,5 +1,9 @@
+AUX sdcc-3.8.0-override-override.patch 1078 BLAKE2B f1e1e135b9ee972e8f7f6a08af736de227c8534d181f160b00f6eecef0e7f4366e39fc5a8f6034bfffa64531423d28377c778055d6be8671527971ce183ebab5 SHA512 fbc13832bea859409f2ae525a82927424dd474db9c6077d1311b9775d0a4a8728d79db7465c928271faa54221b53982ee539537e4fe8a70209c0f453b95105aa
 DIST sdcc-doc-3.5.0.tar.bz2 1000775 BLAKE2B 30cd31990788060ebc792d98b072d4d72ce72176bf09374084246bfe02a8164ab083fb9cfe7fb6ee246b523dce7163d494f2161eb7537f972408f03bc9541426 SHA512 43de0c19ad538b4495218b04e5ab6a886fd9945c8a82c400e9a53314547f5d6ab0529989274faecc2d954f35f8fe60f338f09f93536b62a305203d2119df597e
+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-9999.ebuild 3265 BLAKE2B dc989a0a9e967c92726eaddda5b485b4611be831e06b638f4d7f9b918ceb6ac505186ede1b6dbf13b8715842e6b6b57f9505f1961223760d35b187896dd99e37 SHA512 c0cb7a7361d6de1796beec9db92285aab07748ffb80b003811f3d29694a2cf084e3f1fcd7980cefeaf1d719e199ae64a6b364221bf05a8adf48c955090e4d409
-MISC metadata.xml 2212 BLAKE2B 23e83037b2a6e932760e7f0eafdd34230c035dd5a5833335db0ea9c4c1e04e62e69a920e2c2f3492d45ddc014c76450ad05b4d7794d66cca261e294ac20555a0 SHA512 4af2667ae3006548904e9e13894a49c277744d6876e0a99c99e8ea2e89c9e3fc277cf851ae0856b3c3b64f41ef7fd7c255f1bb4f9f42de8917aad7c59e25a0f0
+EBUILD sdcc-3.8.0.ebuild 3207 BLAKE2B d54745b88fdc3bae9f0feff8ae37b598b90d8f9f658a801e5fe89e50a6db632c63a77aaccecb20c8b3b1381b60b164d0fc90ab17df2cc655ff17faa2a11866ae SHA512 60110b9a870c7b0ea6b81677a3d0a5a4b258f984bcfa14003a2453912c65dba07d1a4f0e0551df2b934a008f2a761df85bc052329c68f78f42843dbe90c6d71d
+EBUILD sdcc-9999.ebuild 3207 BLAKE2B d54745b88fdc3bae9f0feff8ae37b598b90d8f9f658a801e5fe89e50a6db632c63a77aaccecb20c8b3b1381b60b164d0fc90ab17df2cc655ff17faa2a11866ae SHA512 60110b9a870c7b0ea6b81677a3d0a5a4b258f984bcfa14003a2453912c65dba07d1a4f0e0551df2b934a008f2a761df85bc052329c68f78f42843dbe90c6d71d
+MISC metadata.xml 2284 BLAKE2B e3fdd79032b8f663940903ed11a92c199048bcc485d24c3d7ab99757e3cdad1438c319cc7327f53921f7c853a59fe0a6bc4dfc5df84d4edfd92feae42459b858 SHA512 cd4b8ed438d294e239e67f0037d1f0f044215d2c6da8a13a661ebd56c3501df0ed7ecb41fb0c34f150345c5008dc3d37d9df127da60bb6c59bb630f1c695c118
diff --git a/dev-embedded/sdcc/files/sdcc-3.8.0-override-override.patch b/dev-embedded/sdcc/files/sdcc-3.8.0-override-override.patch
new file mode 100644
index 000000000000..f6bb4b8b972b
--- /dev/null
+++ b/dev-embedded/sdcc/files/sdcc-3.8.0-override-override.patch
@@ -0,0 +1,30 @@
+--- a/support/sdbinutils/config/override.m4
++++ b/support/sdbinutils/config/override.m4
+@@ -27,27 +27,6 @@
+ m4_copy_force([_AC_PREREQ], [AC_PREREQ])
+ 
+ 
+-dnl Ensure exactly this Autoconf version is used
+-m4_ifndef([_GCC_AUTOCONF_VERSION],
+-  [m4_define([_GCC_AUTOCONF_VERSION], [2.64])])
+-
+-dnl Test for the exact version when AC_INIT is expanded.
+-dnl This allows to update the tree in steps (for testing)
+-dnl by putting
+-dnl   m4_define([_GCC_AUTOCONF_VERSION], [X.Y])
+-dnl in configure.ac before AC_INIT,
+-dnl without rewriting this file.
+-dnl Or for updating the whole tree at once with the definition above.
+-AC_DEFUN([_GCC_AUTOCONF_VERSION_CHECK],
+-[m4_if(m4_defn([_GCC_AUTOCONF_VERSION]),
+-  m4_defn([m4_PACKAGE_VERSION]), [],
+-  [m4_fatal([Please use exactly Autoconf ]_GCC_AUTOCONF_VERSION[ instead of ]m4_defn([m4_PACKAGE_VERSION])[.])])
+-])
+-m4_define([AC_INIT], m4_defn([AC_INIT])[
+-_GCC_AUTOCONF_VERSION_CHECK
+-])
+-
+-
+ dnl Ensure we do not use a buggy M4.
+ m4_if(m4_index([..wi.d.], [.d.]), [-1],
+   [m4_fatal(m4_do([m4 with buggy strstr detected.  Please install
diff --git a/dev-embedded/sdcc/metadata.xml b/dev-embedded/sdcc/metadata.xml
index c0f3e2174edd..6d9caa8c84ad 100644
--- a/dev-embedded/sdcc/metadata.xml
+++ b/dev-embedded/sdcc/metadata.xml
@@ -6,12 +6,18 @@
 		<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.
+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="avr">Add support for AVR -- not supported upstream</flag>
 		<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>
diff --git a/dev-embedded/sdcc/sdcc-3.8.0.ebuild b/dev-embedded/sdcc/sdcc-3.8.0.ebuild
new file mode 100644
index 000000000000..b2e7a0f0e7b3
--- /dev/null
+++ b/dev-embedded/sdcc/sdcc-3.8.0.ebuild
@@ -0,0 +1,133 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+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
+"
+
+REQUIRED_USE="
+	ds390? ( sdbinutils )
+	ds400? ( sdbinutils )
+	hc08?  ( sdbinutils )
+	mcs51? ( sdbinutils )
+	s08?   ( sdbinutils )
+	|| ( ${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.
+	env RESTRICT="" prepstrip "${D%/}"/usr/bin
+}
diff --git a/dev-embedded/sdcc/sdcc-9999.ebuild b/dev-embedded/sdcc/sdcc-9999.ebuild
index e0d3b94b8ec6..b2e7a0f0e7b3 100644
--- a/dev-embedded/sdcc/sdcc-9999.ebuild
+++ b/dev-embedded/sdcc/sdcc-9999.ebuild
@@ -1,55 +1,64 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
-
-inherit eutils toolchain-funcs
+EAPI=6
+inherit autotools 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 )"
+	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
+LICENSE="
+	GPL-2 ZLIB
 	non-free? ( MicroChip-SDCC )
-	packihx? ( public-domain )"
+	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"
+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
+"
 
 REQUIRED_USE="
-	mcs51? ( sdbinutils )
 	ds390? ( sdbinutils )
 	ds400? ( sdbinutils )
 	hc08?  ( sdbinutils )
-	s08?   ( sdbinutils )"
+	mcs51? ( sdbinutils )
+	s08?   ( sdbinutils )
+	|| ( ${SDCC_PORTS} )
+"
 
 RESTRICT="strip"
 
-RDEPEND="dev-libs/boost:=
+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
+	!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
@@ -60,47 +69,51 @@ src_prepare() {
 			{} + || die
 
 	# https://sourceforge.net/p/sdcc/bugs/2398/
-	sed -i '1iAR = @AR@' Makefile.common.in || die
+	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_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) \
+		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 hc08 hc08-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 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)
+		$(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() {
@@ -108,9 +121,9 @@ src_install() {
 	dodoc doc/*.txt
 	find "${D}" -name .deps -exec rm -rf {} + || die
 
-	if use doc ; then
-		docs_compile || cd "${WORKDIR}"/doc
-		dohtml -r *
+	if use doc && [[ ${PV} != "9999" ]]; then
+		cd "${WORKDIR}"/doc
+		dodoc -r *
 	fi
 
 	# a bunch of archives (*.a) are built & installed by gputils