gentoo resync : 19.03.2019

4 files changed, 2 insertions, 249 deletions

diff --git a/dev-embedded/sdcc/Manifest b/dev-embedded/sdcc/Manifest
index e09b95bf57b5..783f15c29a7f 100644
--- a/dev-embedded/sdcc/Manifest
+++ b/dev-embedded/sdcc/Manifest
@@ -1,10 +1,6 @@
 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 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-3.8.0-r1.ebuild 3180 BLAKE2B 5f84d00b7f4a1b736212145f832b33117c2a4330e6492906cf6c64a3ecb82beb00f00da3a8f9794a7e774888fa04faccb6c48dd00c9a3d2e472b1269de9db034 SHA512 4ff5aaf7070b8e5636a870b1dca64b7b535a7fb33cc1ba8bb54954f1d4ba20ddf67b3ba9b8a9d0bdc5f37c6615fc45553474be0066060df36235513d4ee9b90c
 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
deleted file mode 100644
index 5a4e83b451dd..000000000000
--- a/dev-embedded/sdcc/sdcc-3.5.0.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# 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
-}
diff --git a/dev-embedded/sdcc/sdcc-3.8.0-r1.ebuild b/dev-embedded/sdcc/sdcc-3.8.0-r1.ebuild
index abba11e8b886..79c2981dc3e6 100644
--- a/dev-embedded/sdcc/sdcc-3.8.0-r1.ebuild
+++ b/dev-embedded/sdcc/sdcc-3.8.0-r1.ebuild
@@ -12,7 +12,7 @@ else
 		mirror://sourceforge/sdcc/${PN}-src-${PV}.tar.bz2
 		doc? ( mirror://sourceforge/sdcc/${PN}-doc-${PV}.tar.bz2 )
 	"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 DESCRIPTION="Small device C compiler (for various microprocessors)"
diff --git a/dev-embedded/sdcc/sdcc-3.8.0.ebuild b/dev-embedded/sdcc/sdcc-3.8.0.ebuild
deleted file mode 100644
index 570c8091c708..000000000000
--- a/dev-embedded/sdcc/sdcc-3.8.0.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2019 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
-}