gentoo resync : 20.02.2019

5 files changed, 151 insertions, 24 deletions

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
 }