From 36ebb28d80cd430ce3c92464927dac22956e98bc Mon Sep 17 00:00:00 2001
From: PulkoMandy <pulkomandy@pulkomandy.tk>
Date: Sun, 28 May 2023 17:29:14 +0200
Subject: [PATCH] avr_libc: fix REQUIRES, remove old recipe

The binutils and compiler are built with the secondary compiler on x86,
but the commands are still in the main bin directory so we should't
use the secondaryArchSuffix in the REQUIRES.
---
 dev-embedded/avr_libc/avr_libc-2.0.0.recipe | 60 ---------------------
 dev-embedded/avr_libc/avr_libc-2.1.0.recipe |  4 +-
 2 files changed, 2 insertions(+), 62 deletions(-)
 delete mode 100644 dev-embedded/avr_libc/avr_libc-2.0.0.recipe

diff --git a/dev-embedded/avr_libc/avr_libc-2.0.0.recipe b/dev-embedded/avr_libc/avr_libc-2.0.0.recipe
deleted file mode 100644
index 73dbc1db9..000000000
--- a/dev-embedded/avr_libc/avr_libc-2.0.0.recipe
+++ /dev/null
@@ -1,60 +0,0 @@
-SUMMARY="C library for Atmel AVR microcontrollers"
-DESCRIPTION="
-AVR Libc is a Free Software project whose goal is to provide a high quality C
-library for use with GCC on Atmel AVR microcontrollers.
-
-Together, avr-binutils, avr-gcc, and avr-libc form the heart of the Free
-Software toolchain for the Atmel AVR microcontrollers.
-"
-HOMEPAGE="https://www.nongnu.org/avr-libc/"
-LICENSE="BSD (3-clause)"
-COPYRIGHT="1999-2016 Keith Gudger, Bjoern Haase, Steinar Haugen, Peter Jansen,
-	Reinhard Jessich, Magnus Johansson, Artur Lipowski, Marek Michalkiewicz,
-	Colin O'Flynn, Bob Paddock, Reiner Patommel, Michael Rickman,
-	Theodore A. Roth, Juergen Schilling, Philip Soeberg, Anatoly Sokolov,
-	Nils Kristian Strom, Michael Stumpf, Stefan Swanepoel, Eric B. Weddington,
-	Joerg Wunsch, Dmitry Xmelkov, The Regents of the University of California."
-SOURCE_URI="http://download.savannah.gnu.org/releases/avr-libc/avr-libc-$portVersion.tar.bz2"
-CHECKSUM_SHA256="b2dd7fd2eefd8d8646ef6a325f6f0665537e2f604ed02828ced748d49dc85b97"
-REVISION="3"
-ARCHITECTURES="any"
-SECONDARY_ARCHITECTURES="x86"
-
-PROVIDES="
-	avr_libc$secondaryArchSuffix = $portVersion
-	"
-
-REQUIRES="
-	haiku$secondaryArchSuffix
-	"
-BUILD_REQUIRES="
-	"
-BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel	
-	cmd:autoconf
-	cmd:automake
-	cmd:autoreconf
-	cmd:avr_as$secondaryArchSuffix
-	cmd:avr_gcc$secondaryArchSuffix
-	cmd:libtoolize$secondaryArchSuffix
-	cmd:make
-	"
-
-SOURCE_DIR="avr-libc-$portVersion"
-
-relativeInstallDir="develop/tools/avr"
-installDir="$prefix/$relativeInstallDir"
-
-BUILD()
-{	
-	autoreconf -fi
-	runConfigure ./configure --host=avr --build=$effectiveTargetMachineTriple \
-		--prefix=$installDir --libexecdir=$installDir/lib --mandir=$manDir \
-		--docdir=$docDir --target=avr
-	make $jobArgs
-}
-
-INSTALL()
-{
-	make install
-}
diff --git a/dev-embedded/avr_libc/avr_libc-2.1.0.recipe b/dev-embedded/avr_libc/avr_libc-2.1.0.recipe
index 0eb17c31f..c2e10ba1f 100644
--- a/dev-embedded/avr_libc/avr_libc-2.1.0.recipe
+++ b/dev-embedded/avr_libc/avr_libc-2.1.0.recipe
@@ -34,8 +34,8 @@ BUILD_PREREQUIRES="
 	cmd:autoconf
 	cmd:automake
 	cmd:autoreconf
-	cmd:avr_as$secondaryArchSuffix >= 2.40
-	cmd:avr_gcc$secondaryArchSuffix >= 13.1
+	cmd:avr_as >= 2.40
+	cmd:avr_gcc >= 13.1
 	cmd:libtoolize$secondaryArchSuffix
 	cmd:make
 	"