From 80a841bd3909c9fbde31d59a7a02854b1c409dd4 Mon Sep 17 00:00:00 2001
From: Lorenzo Cappelletti <lorenzo.cappelletti@gmail.com>
Date: Thu, 7 Nov 2019 13:25:34 +0100
Subject: [PATCH] Install into /opt

---
 .SRCINFO | 12 ++++++------
 PKGBUILD | 28 ++++++++++++----------------
 2 files changed, 18 insertions(+), 22 deletions(-)

diff --git a/.SRCINFO b/.SRCINFO
index ba4ab9e..05f58d6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,4 +1,4 @@
-pkgbase = gcc-arm-none-eabi-bin
+pkgbase = gcc-arm-none-eabi-bin-92
 	pkgdesc = GNU Tools ARM Embedded Processors (binary distribution, includes newlib, does NOT include GDB)
 	pkgver = 9_2019_q4_major
 	pkgrel = 1
@@ -8,18 +8,18 @@ pkgbase = gcc-arm-none-eabi-bin
 	depends = glibc
 	optdepends = arm-none-eabi-gdb: GNU Debugger for ARM EABI
 	provides = gcc-arm-none-eabi
+	provides = gcc-arm-none-eabi-92
 	provides = arm-none-eabi-gcc
+	provides = arm-none-eabi-gcc-92
 	provides = arm-none-eabi-binutils
+	provides = arm-none-eabi-binutils-92
 	provides = arm-none-eabi-newlib
-	conflicts = gcc-arm-none-eabi
-	conflicts = arm-none-eabi-gcc
-	conflicts = arm-none-eabi-binutils
-	conflicts = arm-none-eabi-newlib
+	provides = arm-none-eabi-newlib-92
 	options = !strip
 	options = staticlibs
 	source = https://armkeil.blob.core.windows.net/developer/Files/downloads/gnu-rm/9-2019q4/RC2.1/gcc-arm-none-eabi-9-2019-q4-major-x86_64-linux.tar.bz2
 	md5sums = fe0029de4f4ec43cf7008944e34ff8cc
 	sha256sums = bcd840f839d5bf49279638e9f67890b2ef3a7c9c7a9b25271e83ec4ff41d177a
 
-pkgname = gcc-arm-none-eabi-bin
+pkgname = gcc-arm-none-eabi-bin-92
 
diff --git a/PKGBUILD b/PKGBUILD
index 0446dff..4fe6199 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,9 @@
 # Original Maintainer: James Duley <jagduley gmail>
 # Previous Maintainer: 2bluesc <2bluesc gmail.com>
-# Maintainer: Vadzim Dambrouski <pftbest gmail.com>
-pkgname=gcc-arm-none-eabi-bin
+# Previous Maintainer: Vadzim Dambrouski <pftbest gmail.com>
+# Maintainer: Lorenzo Cappelletti <lorenzo.cappelletti gmail.com>
+gccver=92
+pkgname=gcc-arm-none-eabi-bin-$gccver
 pkgver=9_2019_q4_major
 pkgrel=1
 pkgdesc="GNU Tools ARM Embedded Processors (binary distribution, includes newlib, does NOT include GDB)"
@@ -10,15 +12,10 @@ depends=('glibc')
 optdepends=(
 	  'arm-none-eabi-gdb: GNU Debugger for ARM EABI'
     )
-provides=('gcc-arm-none-eabi'
-	  'arm-none-eabi-gcc'
-	  'arm-none-eabi-binutils'
-	  'arm-none-eabi-newlib'
-    )
-conflicts=('gcc-arm-none-eabi'
-	  'arm-none-eabi-gcc'
-	  'arm-none-eabi-binutils'
-	  'arm-none-eabi-newlib'
+provides=("gcc-arm-none-eabi" "gcc-arm-none-eabi-$gccver"
+	  "arm-none-eabi-gcc" "arm-none-eabi-gcc-$gccver"
+	  "arm-none-eabi-binutils" "arm-none-eabi-binutils-$gccver"
+	  "arm-none-eabi-newlib" "arm-none-eabi-newlib-$gccver"
     )
 url="https://developer.arm.com/open-source/gnu-toolchain/gnu-rm"
 source=("https://armkeil.blob.core.windows.net/developer/Files/downloads/gnu-rm/9-2019q4/RC2.1/gcc-arm-none-eabi-9-2019-q4-major-x86_64-linux.tar.bz2")
@@ -28,9 +25,8 @@ sha256sums=('bcd840f839d5bf49279638e9f67890b2ef3a7c9c7a9b25271e83ec4ff41d177a')
 md5sums=('fe0029de4f4ec43cf7008944e34ff8cc')
 
 package() {
-  mkdir -p $pkgdir/usr
-  cd $srcdir/gcc-*/
-  cp -a * $pkgdir/usr
-  rm -f $pkgdir/usr/bin/arm-none-eabi-gdb*
-  rm -f $pkgdir/usr/lib/libcc1.so*
+  mkdir -p $pkgdir/opt
+  cd $srcdir/
+  cp -a gcc-*/ $pkgdir/opt
+  rm -f $pkgdir/opt/gcc-*/bin/arm-none-eabi-gdb*
 }