gentoo resync : 13.11.2021

11 files changed, 420 insertions, 22 deletions

diff --git a/dev-embedded/Manifest.gz b/dev-embedded/Manifest.gz
index 2b7701d80ef5..b26ab6bba121 100644
--- a/dev-embedded/Manifest.gz
+++ b/dev-embedded/Manifest.gz
diff --git a/dev-embedded/avrdude/Manifest b/dev-embedded/avrdude/Manifest
index 3e3b68b74ce3..15142b50c762 100644
--- a/dev-embedded/avrdude/Manifest
+++ b/dev-embedded/avrdude/Manifest
@@ -1,6 +1,7 @@
 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-r1.ebuild 1353 BLAKE2B 655516a277ebba8fbaebc6d128590e65d2cf6902c500e662967c3b80c8f45a3873c1bda2af660b1cc23a9ad2a2b7768a40b420f53ba9b4df883793dad25e2650 SHA512 e08cbb6bfe256816826045a361f5ef85cb2b8628a5645697c5893505c72aab73eb2c27fc8f189a811f5e3c31946f87725a14da8b4eceb6524f4af9230b451568
+EBUILD avrdude-6.3-r1.ebuild 1609 BLAKE2B 155fc4a9215f1e17f2ce9543a039a551caa918137b318d0f2d5ffd10ff86563df51b2bb729b0a49b28bf4fd425baaaf8b5f5f73e6762286ca2cd4df6d44dd02d SHA512 cb02fd8b464d8a2bf4f2e2696c2aed1e4e334a668a53db79d268a13d193041929b00c09bfbcfd839b16c89a1f155df7fd98d062cc29be0afdddb84cf5e1d71f4
 EBUILD avrdude-6.3.ebuild 1502 BLAKE2B 514c81ae042089508addc0799707b8c42b3ed042d94a5d301b2d80a8f390a653dce24f770dae0d13a0837a7df37ad237ac8d8625429019537e5038cfd78e8c0e SHA512 9b4e51be693bb57def7829575bf828c8932c7d957152fd3e624a608d0aee2a632026d376fbbe73ef7c1fc4cd8d79fe529b9804693654791719670588a28597d3
+EBUILD avrdude-9999.ebuild 1609 BLAKE2B 155fc4a9215f1e17f2ce9543a039a551caa918137b318d0f2d5ffd10ff86563df51b2bb729b0a49b28bf4fd425baaaf8b5f5f73e6762286ca2cd4df6d44dd02d SHA512 cb02fd8b464d8a2bf4f2e2696c2aed1e4e334a668a53db79d268a13d193041929b00c09bfbcfd839b16c89a1f155df7fd98d062cc29be0afdddb84cf5e1d71f4
 MISC metadata.xml 364 BLAKE2B de7d28e39ecb3d05075b85fd66181ffe3a874623efd4cb9a99f9a16b467ca0c1a3d8fa7895b7e33c75162428b08774f5f89474e5b6f167817f5a384b8d9ceb88 SHA512 d15e0de55e3b8e8878ffdcde4fd7a6ae06a8fcd2e30ed0aa7fc5480a8b987edadafa6fc20e4b683c4c8d121192284c7daba4ace47f39c0713f4f0e6fe728924c
diff --git a/dev-embedded/avrdude/avrdude-6.3-r1.ebuild b/dev-embedded/avrdude/avrdude-6.3-r1.ebuild
index eedc4b7b5069..701d5da2a71a 100644
--- a/dev-embedded/avrdude/avrdude-6.3-r1.ebuild
+++ b/dev-embedded/avrdude/avrdude-6.3-r1.ebuild
@@ -1,21 +1,30 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=8
+EAPI=7
 
 inherit toolchain-funcs
 
+MY_DOC_PV=6.3
 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
-	)"
+
+if [[ ${PV} == *9999* ]] ; then
+	ESVN_REPO_URI="svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude"
+	inherit autotools subversion
+else
+	SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
+
+	KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+fi
+
+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="~amd64 ~arm ~ppc ~ppc64 ~x86"
 IUSE="doc ftdi ncurses readline"
 
 RDEPEND="
@@ -28,12 +37,20 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 
+src_prepare() {
+	default
+
+	[[ ${PV} == *9999* ]] && 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)
+
 	econf --disable-static
 }
 
@@ -48,7 +65,7 @@ src_install() {
 	default
 
 	if use doc ; then
-		newdoc "${DISTDIR}/${PN}-doc-${PV}.pdf" avrdude.pdf
+		newdoc "${DISTDIR}/${PN}-doc-${MY_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
new file mode 100644
index 000000000000..701d5da2a71a
--- /dev/null
+++ b/dev-embedded/avrdude/avrdude-9999.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+MY_DOC_PV=6.3
+DESCRIPTION="AVR Downloader/UploaDEr"
+HOMEPAGE="https://savannah.nongnu.org/projects/avrdude"
+
+if [[ ${PV} == *9999* ]] ; then
+	ESVN_REPO_URI="svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude"
+	inherit autotools subversion
+else
+	SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
+
+	KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+fi
+
+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"
+IUSE="doc ftdi ncurses readline"
+
+RDEPEND="
+	virtual/libelf
+	virtual/libusb:1
+	virtual/libusb:0
+	ftdi? ( dev-embedded/libftdi:= )
+	ncurses? ( sys-libs/ncurses:0= )
+	readline? ( sys-libs/readline:0= )
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+
+	[[ ${PV} == *9999* ]] && 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)
+
+	econf --disable-static
+}
+
+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/"
+	fi
+
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/dev-embedded/gputils/Manifest b/dev-embedded/gputils/Manifest
index baf5169b77e1..79b6993afa5c 100644
--- a/dev-embedded/gputils/Manifest
+++ b/dev-embedded/gputils/Manifest
@@ -1,3 +1,4 @@
+AUX gputils-1.5.0-respect-flags.patch 4608 BLAKE2B 064b50907a9e403e5dedf1bdba947f235d2b66b62104494de2b1b3badcb02bd15f5df3c66dddec6580cacee46ed52bd12292bef8e98fa1da4f27cab25314a271 SHA512 ee63f6ec3a4f44bd10edc35cdb0c2c9f63d63cacd21a3dc5eb531776d0688f2865d1466fe143950fc8f3a878a7e7eb8f40eec343bfd6f77b7baa0eed90a8c7da
 DIST gputils-1.5.0.tar.gz 13155377 BLAKE2B 68f6ed2ba93f83eaae0573dde5fe8d3a67ec6cf4349832e5edcab70ec35db7d8210f28d46bf3272a7b7f9b52299b1289792b1ca2a75b952e7ea2fc263448c8b9 SHA512 fc74e92ddfe2c9c7ee272a712a411bf01790358c310afc9a802f503902675fa4717410354bf8791f64da45b63f0b1f562b55fdd7127d3989f4295ebe5f80b645
-EBUILD gputils-1.5.0.ebuild 627 BLAKE2B 4eff6895ea80d6797e8bf6488b3f2428f521218fa29dd6085c4c9bf2f095815fa8d9485e3cfc50b89e2350e1abadec0b2c80ae0ee2bd93059b2e7c6e2df22545 SHA512 cdf4695daf85d2b6f4c9c2286ac37a45025394a2c40e525a42678bdf2f360afba2e5ba8139a81792cb3ea86eeb5a33246b13926b917cc07d9e137e6b4b5701cb
+EBUILD gputils-1.5.0.ebuild 809 BLAKE2B 55f69b85e0ad845bd1f2ab6bf16d9267e09a66bc7b258b137a541aa0f2096445a528275eb2e2f8eef5a73813f84756ec295209f5baaccd04b313acbd7860d787 SHA512 cc30ee6fe9c71e6a8e2a42f5faf91e385c6713e6833abc25115ab347bff09f64a2729516aa1a56f59d1a265bbfa89c27b7e75c5b88189d01b829f0fe3735ac90
 MISC metadata.xml 329 BLAKE2B 34b2d2759758806cc11494ac1ff80f04d307c4f825a7d4fac2c49cdc313f6cef2a73975c110a2ec2b5950d289812f14b3e7af29fb210c6362896054669813f95 SHA512 aa1a82ff6a8fc75841cce40006d7cb8a0a7e6b65b4135b31b69781820b437ac033f2fd32aa056557cf19bf107892fda0dc4e39f2bcaa95a96673c194f4dac776
diff --git a/dev-embedded/gputils/files/gputils-1.5.0-respect-flags.patch b/dev-embedded/gputils/files/gputils-1.5.0-respect-flags.patch
new file mode 100644
index 000000000000..01d13dedab0f
--- /dev/null
+++ b/dev-embedded/gputils/files/gputils-1.5.0-respect-flags.patch
@@ -0,0 +1,123 @@
+https://sourceforge.net/p/gputils/code/1288
+https://bugs.gentoo.org/722648
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -160,29 +160,41 @@
+ AC_CHECK_FUNCS(strndup, , [IBERTYOBJS="$IBERTYOBJS strndup.o"])
+ AC_CHECK_FUNCS(strverscmp, , [IBERTYOBJS="$IBERTYOBJS strverscmp.o"])
+ 
+-AM_CFLAGS=
++VERSION_MAJOR=`echo $PACKAGE_VERSION | $AWK 'BEGIN {FS="."} {print $1}'`
++VERSION_MINOR=`echo $PACKAGE_VERSION | $AWK 'BEGIN {FS="."} {print $2}'`
++VERSION_MICRO=`echo $PACKAGE_VERSION | $AWK 'BEGIN {FS="."} {print $3}'`
++
++AC_DEFINE_UNQUOTED(GPUTILS_VERSION_MAJOR, $VERSION_MAJOR, [gputils major version number])
++AC_DEFINE_UNQUOTED(GPUTILS_VERSION_MINOR, $VERSION_MINOR, [gputils minor version number])
++AC_DEFINE_UNQUOTED(GPUTILS_VERSION_MICRO, $VERSION_MICRO, [gputils micro version number])
++AC_DEFINE_UNQUOTED(GPUTILS_VERSION_STR, "$PACKAGE_VERSION", [gputils version string])
++
++AM_GPUTILS_SVN_VERSION="\$(shell \$(top_srcdir)/get_cl_revision.sh \$(top_srcdir)/ChangeLog)"
++AM_PACKAGE_SVN_VERSION=`./get_cl_revision.sh ChangeLog`
++
++AM_CFLAGS="-DGPUTILS_SVN_VERSION=\$(AM_GPUTILS_SVN_VERSION)"
+ AM_LDFLAGS=
+ 
+ # Options for the system on which the package will run.
+ case "${host}" in
+   *cygwin* )
+     if test "x$GCC" = "xyes"; then
+-      AM_CFLAGS="-Wall -pedantic"
++      AM_CFLAGS="$AM_CFLAGS -Wall -pedantic"
+       AM_LDFLAGS="-Wl,-warn-common -Wl,-warn-once"
+     fi
+     ;;
+   *darwin* )
+     if test "x$CC" = "xclang"; then
+-      AM_CFLAGS="-Wall -pedantic -Wformat -Wtautological-compare -Wimplicit-function-declaration -Wformat-security"
++      AM_CFLAGS="$AM_CFLAGS -Wall -pedantic -Wformat -Wtautological-compare -Wimplicit-function-declaration -Wformat-security"
+     fi
+     ;;
+   *linux* )
+     if test "x$CC" = "xclang"; then
+-      AM_CFLAGS="-Wall -pedantic -Wformat -Wtautological-compare -Wimplicit-function-declaration -Wformat-security"
++      AM_CFLAGS="$AM_CFLAGS -Wall -pedantic -Wformat -Wtautological-compare -Wimplicit-function-declaration -Wformat-security"
+       AM_LDFLAGS="-Wl,-warn-common -Wl,-warn-once"
+     else
+       if test "x$GCC" = "xyes"; then
+-        AM_CFLAGS="-Wall -pedantic -Wformat -Wimplicit-function-declaration -Wformat-security"
++        AM_CFLAGS="$AM_CFLAGS -Wall -pedantic -Wformat -Wimplicit-function-declaration -Wformat-security"
+         AM_LDFLAGS="-Wl,-warn-common -Wl,-warn-once"
+       fi
+     fi
+@@ -192,33 +204,20 @@
+   *-pc-os2_emx | *-pc-os2-emx )
+     EXEEXT=".exe"
+     if test "x$GCC" = "xyes"; then
+-      AM_CFLAGS="-Zcrtdll"
++      AM_CFLAGS="$AM_CFLAGS -Zcrtdll"
+     fi
+     ;;
+   *sun* )
+     # sunos cc needs the -xCC flag for // comments
+     if test "x$GCC" != "xyes"; then
+-      AM_CFLAGS="-xCC" 
++      AM_CFLAGS="$AM_CFLAGS -xCC" 
+     fi
+     ;;
+ esac
+-
+-VERSION_MAJOR=`echo $PACKAGE_VERSION | $AWK 'BEGIN {FS="."} {print $1}'`
+-VERSION_MINOR=`echo $PACKAGE_VERSION | $AWK 'BEGIN {FS="."} {print $2}'`
+-VERSION_MICRO=`echo $PACKAGE_VERSION | $AWK 'BEGIN {FS="."} {print $3}'`
+-
+-AC_DEFINE_UNQUOTED(GPUTILS_VERSION_MAJOR, $VERSION_MAJOR, [gputils major version number])
+-AC_DEFINE_UNQUOTED(GPUTILS_VERSION_MINOR, $VERSION_MINOR, [gputils minor version number])
+-AC_DEFINE_UNQUOTED(GPUTILS_VERSION_MICRO, $VERSION_MICRO, [gputils micro version number])
+-AC_DEFINE_UNQUOTED(GPUTILS_VERSION_STR, "$PACKAGE_VERSION", [gputils version string])
+-
+-AM_GPUTILS_SVN_VERSION="\$(shell \$(top_srcdir)/get_cl_revision.sh \$(top_srcdir)/ChangeLog)"
+-AM_PACKAGE_SVN_VERSION=`./get_cl_revision.sh ChangeLog`
+-CFLAGS="-DGPUTILS_SVN_VERSION=\$(AM_GPUTILS_SVN_VERSION)"
+ 
+ # Host filesystem options.
+ case "${host}" in
+-  *mingw* | *-pc-os2_emx | *-pc-os2-emx | *djgpp*)
++  *mingw* | *-pc-os2_emx | *-pc-os2-emx | *djgpp* )
+     AC_DEFINE(HAVE_DOS_BASED_FILE_SYSTEM, 1, 
+       [Define if your host uses a DOS based file system.])
+     ;;
+@@ -231,15 +230,13 @@
+ fi
+ 
+ if test x$enable_gdb_debuginfo = xyes; then
+-  CFLAGS="$CFLAGS -ggdb"
++  AM_CFLAGS="$AM_CFLAGS -ggdb"
+ fi
+ 
+ if test x$enable_gputils_path = xyes; then
+   AC_DEFINE(USE_DEFAULT_PATHS, 1,
+     [Define if you want to add default search paths.])
+ fi
+-
+-LDFLAGS=
+ 
+ # Substitute configuration variables.
+ AC_SUBST(ENABLE_HTML_DOC)
+@@ -248,8 +245,6 @@
+ AC_SUBST(AM_PACKAGE_SVN_VERSION)
+ AC_SUBST(AM_CFLAGS)
+ AC_SUBST(AM_LDFLAGS)
+-AC_SUBST(CFLAGS)
+-AC_SUBST(LDFLAGS)
+ AC_SUBST(GPUTILS_HEADER_PATH)
+ AC_SUBST(GPUTILS_LKR_PATH)
+ AC_SUBST(GPUTILS_LIB_PATH)
+@@ -301,6 +296,7 @@
+   Source directory:     $srcdir
+   Installation prefix:  $prefix
+   C compiler:           $CC $AM_CFLAGS $CFLAGS
++  C linker:             $CC $AM_LDFLAGS
+   Location of MPLAB-X:  $DEFAULT_MPLABX_PATH
+ 
+ ])
diff --git a/dev-embedded/gputils/gputils-1.5.0.ebuild b/dev-embedded/gputils/gputils-1.5.0.ebuild
index bd1e4fc9e3aa..508c9285573c 100644
--- a/dev-embedded/gputils/gputils-1.5.0.ebuild
+++ b/dev-embedded/gputils/gputils-1.5.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
-inherit toolchain-funcs
+inherit autotools toolchain-funcs
 
 DESCRIPTION="Tools including assembler, linker and librarian for PIC microcontrollers"
 HOMEPAGE="https://gputils.sourceforge.io"
@@ -12,17 +12,31 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc ppc64 x86"
-IUSE=""
+
+PATCHES=(
+	"${FILESDIR}"/${P}-respect-flags.patch
+)
+
+src_prepare() {
+	default
+
+	# Only needed for the flags patch, if a new release ever comes...
+	eautoreconf
+}
 
 src_configure() {
-	tc-ld-disable-gold #369291
+	# bug #369291, bug #818802
+	tc-ld-disable-gold
+
 	# Their configure script tries to do funky things with default
 	# compiler selection.  Force our own defaults instead.
 	tc-export CC
-	default
+
+	econf
 }
 
 src_install() {
 	default
+
 	dodoc doc/gputils.pdf
 }
diff --git a/dev-embedded/sdcc/Manifest b/dev-embedded/sdcc/Manifest
index 3f9b542f0fdd..fbab09d7eeff 100644
--- a/dev-embedded/sdcc/Manifest
+++ b/dev-embedded/sdcc/Manifest
@@ -1,9 +1,12 @@
 AUX sdcc-3.8.0-override-override.patch 1078 BLAKE2B f1e1e135b9ee972e8f7f6a08af736de227c8534d181f160b00f6eecef0e7f4366e39fc5a8f6034bfffa64531423d28377c778055d6be8671527971ce183ebab5 SHA512 fbc13832bea859409f2ae525a82927424dd474db9c6077d1311b9775d0a4a8728d79db7465c928271faa54221b53982ee539537e4fe8a70209c0f453b95105aa
 DIST sdcc-doc-3.8.0.tar.bz2 965465 BLAKE2B 541ed3ba4d3a23dd3fcea248de84d887fdcd8ddaf3ed0f9f810bf8cb9fcb5b10eb2cd96099d83c5a0fda240cdd3d11fd247e576a67a32047a4f7a705b8401637 SHA512 63319b7c344b320600e6a7c158d1a5e69abe595dfd6b8d32a95f15678c3bc2f6fe72c959516c4b1f812deb089854c6a51c31438ef6a6c7f9fcb4d419d8cce3cf
 DIST sdcc-doc-4.0.0.tar.bz2 980999 BLAKE2B 6f9478c095e6b4fec27c6ab7a10a8564ae46d754709848b3a7a26a7a2dfecd3833ce3cfe7a41f9033b5a34a1b6e962090d91c9688294dd347e1c98658761c019 SHA512 83bed77b46ad2f028725a3ffe6090d71185f73d4e99c241e7ebd1c509ba1be1911f4b9130c344fa4eb928f48122179b6b71e9d5a27d9f18ff74017c61fae77ff
+DIST sdcc-doc-4.1.0.tar.bz2 991207 BLAKE2B fd1ab82c8cc65031a8231bc4aba1e0562ed4b3178612a4d915568cb5600ba9159d89f905e261e860da9e0f4aa5a24fbd7ab1364f2f9f7b3078bcf3aa01d71ba5 SHA512 01686e590d0168108099d3c6c9bdb0885a25abccc9b6c87739eafec7103054424da1a5960a8d4566462dca9bf00cdd8b103ab6026523833d9aaa4d4bcdc5b620
 DIST sdcc-src-3.8.0.tar.bz2 18987862 BLAKE2B 7e8ddea41ae02842bb1376c53364c386a0fb47a1acdcc97cc72f002e78a2854fc43adfd0177f94dd1173dbd81052c390c5b2fef302c73f0b830ec83eea70869c SHA512 38145ea3e9560eb8894c54bd7213da67a20163739c944c3247fa8fa456dfedaaa469746169d3e114affcab48b73db4cd8c9a0a367e7368f2471de64761a3e04a
 DIST sdcc-src-4.0.0.tar.bz2 19204540 BLAKE2B 2192a7dc7418826440209dd8c7a73fd5ced491b799975b953368daeabb429327a6c518a1212a2fd49c34c6e5ab7d84f240cbf6ff8b3779e2d38f5ad81499ee71 SHA512 41a92711a9278261879caec1a01425104b7c75346b3c6ad9617cab025309c9b38f79eea2d04122f5ae6ce273fcd61fbde8a0d23756313a4593394230b51a1d4c
+DIST sdcc-src-4.1.0.tar.bz2 19400609 BLAKE2B 9754d70026af595a5456f0d7c1b375df2716c6400ca59affcadbfd3588f4d51c45a3d52c235d6efc9b7512b5f94f023d8d2964cc0365cdff4586edf71fc51af1 SHA512 a9c3fee427cbc66b56a286c8d66b2922f79c9dfb42d2ed2843b2e192a6b314a04de4c82f1083d8625b49756b5f1d99f8fb706402b5f1284110760ec346303779
 EBUILD sdcc-3.8.0-r1.ebuild 3186 BLAKE2B 4a0842eb50c5f77947fef50a36482e47e76c25b4994833f5c14e42018c7b5ea3ab77768df15d49886c1e9250ac19e630a95d78a6241cd87e02bbbdafb4367292 SHA512 147127a0e997cb3ce1a53b0cd0990992d6837016dcde7368bf44a2fd35b6647b43224dbcd309660e454e6bcd26921d41d642530e616e5bc2fec4a0eeef8f8d28
 EBUILD sdcc-4.0.0.ebuild 3469 BLAKE2B 04dcac4dba5a07ad9cdddf14e7d313a27f4b28db7903364af17e1cfdf1ef704cb03ac0d2eba980fc97791f3c0b5ce355fa36cd60e0adae45be41d35f94de790d SHA512 65402da6ea8cbff4101109cb9ee53319f770b0603572488ff7c71e60812ca7a2c7868e19275217738fea161d0babb6c44ace3483276236671ff8d710ea580121
-EBUILD sdcc-9999.ebuild 3469 BLAKE2B 04dcac4dba5a07ad9cdddf14e7d313a27f4b28db7903364af17e1cfdf1ef704cb03ac0d2eba980fc97791f3c0b5ce355fa36cd60e0adae45be41d35f94de790d SHA512 65402da6ea8cbff4101109cb9ee53319f770b0603572488ff7c71e60812ca7a2c7868e19275217738fea161d0babb6c44ace3483276236671ff8d710ea580121
-MISC metadata.xml 2592 BLAKE2B 08506150b031a32216fedb945ebd03f6db0f217d7fa711d43681e2734cd3db0a5a4bd6a1e7da46b8c127ea2c95282878c44dce3c248304b6c280f546b1585c69 SHA512 0ff2172dfd8d2f971a0b856f3434f0fc700b68562a19493bc33e8f99c5a27abe2c72c022e5c93d13bd46863bf009c2fb77cb7275371712644e0d8af9f2bb9a85
+EBUILD sdcc-4.1.0.ebuild 3625 BLAKE2B 983887350f4251ecf1f6d327fc7630e027804439763ab94e765064356f6edf2274ac2f2de363b57fe3a1cb553bcdc55dfcb3f1c6ed49f6355a9c7bbaa4c00811 SHA512 6870daa87d27afa8f196d96e76e2a81eee2137c523389f1955b4b623750f3372c430cb24dc66adb76bf482b14219a373b9c43441230e45306e2a047243e8b2bd
+EBUILD sdcc-9999.ebuild 3625 BLAKE2B 983887350f4251ecf1f6d327fc7630e027804439763ab94e765064356f6edf2274ac2f2de363b57fe3a1cb553bcdc55dfcb3f1c6ed49f6355a9c7bbaa4c00811 SHA512 6870daa87d27afa8f196d96e76e2a81eee2137c523389f1955b4b623750f3372c430cb24dc66adb76bf482b14219a373b9c43441230e45306e2a047243e8b2bd
+MISC metadata.xml 2702 BLAKE2B 5d7eff47a0c5a01e9653d127679cfac908d07a95f720febd6ffece94e0877c43023737ab286dc5f1361a51b1c85eb4e0413757c3d76f28e70359e8469333321c SHA512 1e01dbeefb8ba8565b89807cf471e3fbc9f167d2411d87908b6813cd7aa6da39d2a6357a72fe69fb9c41f80e9c4cc37e8c42fa26ccdd02157184a82ab3d6be63
diff --git a/dev-embedded/sdcc/metadata.xml b/dev-embedded/sdcc/metadata.xml
index ecb0a6234b7b..573753d73430 100644
--- a/dev-embedded/sdcc/metadata.xml
+++ b/dev-embedded/sdcc/metadata.xml
@@ -32,10 +32,12 @@ microprocessors.
 		<flag name="z80">Add support for Zilog Z80</flag>
 		<flag name="z180">Add support for Zilog Z180</flag>
 		<flag name="r2k">Add support for Rabbit 2000</flag>
+		<flag name="r2ka">Add support for Rabbit 2000A</flag>
 		<flag name="r3ka">Add support for Rabbit 3000A</flag>
 		<flag name="gbz80">Add support for Gameboy gbz80</flag>
 		<flag name="tlcs90">Add support for TLCS-90</flag>
 		<flag name="ez80-z80">Add support for EZ80-Z80</flag>
+		<flag name="z80n">Add support for Zilog Z80N</flag>
 		<flag name="ds390">Add support for Dallas DS390</flag>
 		<flag name="ds400">Add support for Dallas DS400</flag>
 		<flag name="pic14">Add support for Microchip 14 bits PICs</flag>
diff --git a/dev-embedded/sdcc/sdcc-4.1.0.ebuild b/dev-embedded/sdcc/sdcc-4.1.0.ebuild
new file mode 100644
index 000000000000..9b5bf53b05db
--- /dev/null
+++ b/dev-embedded/sdcc/sdcc-4.1.0.ebuild
@@ -0,0 +1,157 @@
+# Copyright 1999-2021 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 )
+	"
+	S="${WORKDIR}/sdcc"
+
+	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"
+# in order of configure.ac's AC_DO_PORT stanzas
+SDCC_PORTS="
+	avr
+	mcs51
+	z80 z180
+	r2k r2ka r3ka
+	gbz80
+	tlcs90
+	ez80-z80
+	z80n
+	ds390 ds400
+	pic14 pic16
+	hc08
+	s08
+	stm8
+	pdk13 pdk14 pdk15 pdk16
+"
+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=
+	pic14? ( >=dev-embedded/gputils-0.13.7 )
+	pic16? ( >=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
+
+	# Make sure timestamps don't get messed up.
+	[[ ${PV} == "9999" ]] && find "${S}" -type f -exec touch -r . {} +
+
+	default
+	eautoreconf
+
+	# Avoid 'bfd.info' rebuild with 'makeinfo': bug #705424
+	# Build dependencies are: eautoreconf->Makefile.in->bfdver.texi->bfd.info
+	touch support/sdbinutils/bfd/doc/bfdver.texi || die
+	touch support/sdbinutils/bfd/doc/bfd.info || die
+}
+
+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 boehm-gc libgc) \
+		$(use_enable device-lib) \
+		$(use_enable non-free) \
+		$(use_enable packihx) \
+		$(use_enable sdbinutils) \
+		$(use_enable sdcdb) \
+		$(use_enable sdcpp) \
+		$(use_enable ucsim) \
+		\
+		$(use_enable avr avr-port) \
+		$(use_enable mcs51 mcs51-port) \
+		$(use_enable z80 z80-port) \
+		$(use_enable z180 z180-port) \
+		$(use_enable r2k r2k-port) \
+		$(use_enable r2ka r2ka-port) \
+		$(use_enable r3ka r3ka-port) \
+		$(use_enable gbz80 gbz80-port) \
+		$(use_enable tlcs90 tlcs90-port) \
+		$(use_enable ez80-z80 ez80_z80-port) \
+		$(use_enable z80n z80n-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 pdk13 pdk13-port) \
+		$(use_enable pdk14 pdk14-port) \
+		$(use_enable pdk15 pdk15-port) \
+		$(use_enable pdk16 pdk16-port) \
+		\
+		--disable-doc \
+		--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 -x /usr/bin
+}
diff --git a/dev-embedded/sdcc/sdcc-9999.ebuild b/dev-embedded/sdcc/sdcc-9999.ebuild
index 42f67b831e1a..9b5bf53b05db 100644
--- a/dev-embedded/sdcc/sdcc-9999.ebuild
+++ b/dev-embedded/sdcc/sdcc-9999.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 inherit autotools toolchain-funcs
 
 if [[ ${PV} == "9999" ]] ; then
@@ -12,6 +13,8 @@ else
 		mirror://sourceforge/sdcc/${PN}-src-${PV}.tar.bz2
 		doc? ( mirror://sourceforge/sdcc/${PN}-doc-${PV}.tar.bz2 )
 	"
+	S="${WORKDIR}/sdcc"
+
 	KEYWORDS="~amd64 ~x86"
 fi
 
@@ -29,10 +32,11 @@ SDCC_PORTS="
 	avr
 	mcs51
 	z80 z180
-	r2k r3ka
+	r2k r2ka r3ka
 	gbz80
 	tlcs90
 	ez80-z80
+	z80n
 	ds390 ds400
 	pic14 pic16
 	hc08
@@ -60,7 +64,8 @@ RDEPEND="
 	dev-libs/boost:=
 	sys-libs/ncurses:=
 	sys-libs/readline:0=
-	>=dev-embedded/gputils-0.13.7
+	pic14? ( >=dev-embedded/gputils-0.13.7 )
+	pic16? ( >=dev-embedded/gputils-0.13.7 )
 	boehm-gc? ( dev-libs/boehm-gc:= )
 	!dev-embedded/sdcc-svn
 "
@@ -113,10 +118,12 @@ src_configure() {
 		$(use_enable z80 z80-port) \
 		$(use_enable z180 z180-port) \
 		$(use_enable r2k r2k-port) \
+		$(use_enable r2ka r2ka-port) \
 		$(use_enable r3ka r3ka-port) \
 		$(use_enable gbz80 gbz80-port) \
 		$(use_enable tlcs90 tlcs90-port) \
 		$(use_enable ez80-z80 ez80_z80-port) \
+		$(use_enable z80n z80n-port) \
 		$(use_enable ds390 ds390-port) \
 		$(use_enable ds400 ds400-port) \
 		$(use_enable pic14 pic14-port) \
@@ -146,5 +153,5 @@ 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.
-	dostrip /usr/bin
+	dostrip -x /usr/bin
 }