From a88a311fb2bc523167b6880a9815801ed8df5c52 Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Sat, 10 Aug 2019 09:44:49 +0200
Subject: [PATCH] avr_gcc: update to 8.3.0.

Bump texinfo for perl ABI change, otherwise gcc doesn't build.
---
 sys-apps/texinfo/texinfo-6.1.recipe           |   2 +-
 .../avr_gcc/avr_gcc-4.8.2_2014_03_20.recipe   | 115 ------------------
 ..._gcc-6.4.0.recipe => avr_gcc-8.3.0.recipe} |   6 +-
 3 files changed, 4 insertions(+), 119 deletions(-)
 delete mode 100644 sys-devel/avr_gcc/avr_gcc-4.8.2_2014_03_20.recipe
 rename sys-devel/avr_gcc/{avr_gcc-6.4.0.recipe => avr_gcc-8.3.0.recipe} (94%)

diff --git a/sys-apps/texinfo/texinfo-6.1.recipe b/sys-apps/texinfo/texinfo-6.1.recipe
index 95ca6229e..e926bd96b 100644
--- a/sys-apps/texinfo/texinfo-6.1.recipe
+++ b/sys-apps/texinfo/texinfo-6.1.recipe
@@ -4,7 +4,7 @@ Texinfo is the official documentation format of the GNU project."
 HOMEPAGE="http://www.gnu.org/software/texinfo/"
 COPYRIGHT="1992-2008 Free Software Foundation, Inc."
 LICENSE="GNU GPL v3"
-REVISION="4"
+REVISION="5"
 SOURCE_URI="http://ftp.gnu.org/gnu/texinfo/texinfo-$portVersion.tar.gz"
 CHECKSUM_SHA256="02582b6d9b0552f1cb1312be6bd7023e9799603c3b2320fa68a36029e4cbafbb"
 PATCHES="texinfo-$portVersion.patchset"
diff --git a/sys-devel/avr_gcc/avr_gcc-4.8.2_2014_03_20.recipe b/sys-devel/avr_gcc/avr_gcc-4.8.2_2014_03_20.recipe
deleted file mode 100644
index 887234167..000000000
--- a/sys-devel/avr_gcc/avr_gcc-4.8.2_2014_03_20.recipe
+++ /dev/null
@@ -1,115 +0,0 @@
-SUMMARY="C/C++ cross-compiler for Atmel AVR"
-DESCRIPTION="
-Compiler for Atmel AVR platform.
-"
-HOMEPAGE="https://gcc.gnu.org"
-
-srcGitRev="c20a732df8f8b6d0f32c872817f3a0498a5c4761"
-SOURCE_URI="https://github.com/haiku/buildtools/archive/$srcGitRev.tar.gz"
-CHECKSUM_SHA256="3becc409366bd5015605e98cccfa161d178017c8b8f50c725484b1acfb301e24"
-SOURCE_FILENAME="$portVersionedName.tar.gz"
-PATCHES="avr_gcc-$portVersion.patchset"
-
-REVISION="5"
-LICENSE="
-	GNU GPL v2
-	GNU LGPL v2
-	"
-COPYRIGHT="1988-2013 Free Software Foundation, Inc."
-
-
-ARCHITECTURES="!x86_gcc2 x86 x86_64 arm"
-SECONDARY_ARCHITECTURES="x86"
-
-PROVIDES="
-	avr_gcc$secondaryArchSuffix = $portVersion compat >= 4
-	cmd:avr_c++$secondaryArchSuffix = $portVersion compat >= 4
-	cmd:avr_cc$secondaryArchSuffix = $portVersion compat >= 4
-	cmd:avr_cpp$secondaryArchSuffix = $portVersion compat >= 4
-	cmd:avr_g++$secondaryArchSuffix = $portVersion compat >= 4
-	cmd:avr_gcc$secondaryArchSuffix = $portVersion compat >= 4
-	cmd:avr_gcc_4.8.2$secondaryArchSuffix = $portVersion compat >= 4
-	cmd:avr_gcov$secondaryArchSuffix = $portVersion compat >= 4
-	lib:avr_libstdc++$secondaryArchSuffix = $portVersion compat >= 4
-	"
-
-REQUIRES="
-	haiku$secondaryArchSuffix
-	cmd:avr_as$secondaryArchSuffix
-	"
-BUILD_REQUIRES="
-	cmd:avr_as$secondaryArchSuffix
-	"
-BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel
-	cmd:autoconf
-	cmd:awk
-	cmd:bison
-	cmd:find
-	cmd:flex
-	cmd:gcc$secondaryArchSuffix
-	cmd:ld$secondaryArchSuffix
-	cmd:make
-	cmd:makeinfo
-	cmd:sed
-	cmd:strip
-	cmd:tar
-	cmd:xargs
-	"
-
-SOURCE_DIR="buildtools-$srcGitRev/gcc"
-
-sourceDir=$(pwd)
-relativeInstallDir="develop/tools/avr"
-installDir="$prefix/$relativeInstallDir"
-objectsDir=$(pwd)/../${portVersionedName}-obj
-
-BUILD()
-{
-	rm -rf $objectsDir
-
-	# Touch some files generated by bison, so that bison won't run to update
-	# them. Fixes issues with newer bison versions.
-	# And while at it, touch gperf target, too (as gperf may not be installed).
-	(cd $sourceDir/gcc; touch c-parse.c c-parse.h cexp.c cp/parse.c \
-		cp/parse.h c-gperf.h)
-
-	mkdir -p $objectsDir
-	cd $objectsDir
-
-	# Setting a quoted string in an environment variable is ugly.
-	echo '#define LIBRARY_PATH_ENV "AVR_LIBRARY_PATH"' > haiku_host.h
-
-	CXXFLAGS="-O2 -include $objectsDir/haiku_host.h" \
-	CFLAGS="-O2 -U_FORTIFY_SOURCE" "$sourceDir/configure" \
-		--build=$effectiveTargetMachineTriple \
-		--prefix=$installDir --libexecdir=$installDir/lib --mandir=$manDir \
-		--docdir=$docDir --disable-nls --disable-libssp --with-gnu-ld \
-		--enable-languages=c,c++ --enable-lto --enable-frame-pointer \
-		--with-pkgversion=$(echo $portVersion | cut -c 7-) --target=avr
-
-	make $jobArgs
-}
-
-INSTALL()
-{
-	cd $objectsDir
-
-	make install-strip
-
-	### Symlinks ##############################################
-
-	echo "Creating required symlinks"
-
-	# make all tools available via default paths
-	mkdir -p $binDir
-	for f in c++ cc cpp g++ gcc gcov; do
-		symlinkRelative -sfn $installDir/bin/avr-$f $binDir
-	done
-
-	### Cleanup ###############################################
-
-	echo "Cleanup"
-	rm -rf $installDir/info
-	rm -rf $installDir/share
-}
diff --git a/sys-devel/avr_gcc/avr_gcc-6.4.0.recipe b/sys-devel/avr_gcc/avr_gcc-8.3.0.recipe
similarity index 94%
rename from sys-devel/avr_gcc/avr_gcc-6.4.0.recipe
rename to sys-devel/avr_gcc/avr_gcc-8.3.0.recipe
index f5e0a34e4..18817409a 100644
--- a/sys-devel/avr_gcc/avr_gcc-6.4.0.recipe
+++ b/sys-devel/avr_gcc/avr_gcc-8.3.0.recipe
@@ -4,15 +4,15 @@ Compiler for Atmel AVR platform.
 "
 HOMEPAGE="https://gcc.gnu.org"
 
-SOURCE_URI="http://ftpmirror.gnu.org/gcc/gcc-6.4.0/gcc-6.4.0.tar.xz"
-CHECKSUM_SHA256="850bf21eafdfe5cd5f6827148184c08c4a0852a37ccf36ce69855334d2c914d4"
+SOURCE_URI="http://ftpmirror.gnu.org/gcc/gcc-8.3.0/gcc-8.3.0.tar.xz"
 SOURCE_DIR="gcc-$portVersion"
+CHECKSUM_SHA256="64baadfe6cc0f4947a84cb12d7f0dfaf45bb58b7e92461639596c21e02d97d2c"
 REVISION="1"
 LICENSE="
 	GNU GPL v2
 	GNU LGPL v2
 	"
-COPYRIGHT="1988-2017 Free Software Foundation, Inc."
+COPYRIGHT="1988-2018 Free Software Foundation, Inc."
 
 
 ARCHITECTURES="!x86_gcc2 ?x86 x86_64 ?arm"