Update to 21.0.0

3 files changed, 21 insertions, 76 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 659e17f8a4fd..46a03576bc4c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,8 @@
 pkgbase = xmlada
 	pkgdesc = An XML parser for Ada95
-	pkgver = 2020
-	pkgrel = 2
+	pkgver = 21.0.0
+	pkgrel = 1
+	epoch = 1
 	url = https://github.com/AdaCore/xmlada/
 	arch = i686
 	arch = x86_64
@@ -10,12 +11,10 @@ pkgbase = xmlada
 	makedepends = gprbuild-bootstrap
 	depends = gcc-ada
 	conflicts = xmlada-git
-	source = xmlada-2020-20200429-19A99-src.tar.gz::https://community.download.adacore.com/v1/c799502295baf074ad17b48c50f621879c392c57?filename=xmlada-2020-20200429-19A99-src.tar.gz
+	source = xmlada-21.0.0.tar.gz::https://github.com/AdaCore/xmlada//archive/v21.0.0.tar.gz
 	source = expose-cargs-and-largs-makefile.patch
-	source = COPYING.RUNTIME
-	sha1sums = c799502295baf074ad17b48c50f621879c392c57
-	sha1sums = 9b65cc99453fd15bdb7c49a32e6f76922ec904bd
-	sha1sums = 44a4a599d98b4ec6d63051103de2fd177f43f67a
+	sha256sums = 923024931f0c57451aa52cb9a3333874646102cb75957f27e3689670f90edc1e
+	sha256sums = 8cf1c7a650a698ec9b7b1c71659be82f7f31a37dbdd8d24636c17ebfb0e7b989
 
 pkgname = xmlada
 
diff --git a/COPYING.RUNTIME b/COPYING.RUNTIME
deleted file mode 100644
index 637f433521d5..000000000000
--- a/COPYING.RUNTIME
+++ /dev/null
@@ -1,53 +0,0 @@
-GCC RUNTIME LIBRARY EXCEPTION
-
-Version 3.1, 31 March 2009
-
-Copyright (c) 2009 Free Software Foundation, Inc. <http://fsf.org/>
-
-Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed.
-
-This GCC Runtime Library Exception ("Exception") is an additional permission under section 7 of the GNU General Public License,
-version 3 ("GPLv3"). It applies to a given file (the "Runtime Library") that bears a notice placed by the copyright holder of
-the file stating that the file is governed by GPLv3 along with this Exception.
-
-When you use GCC to compile a program, GCC may combine portions of certain GCC header files and runtime libraries with the
-compiled program. The purpose of this Exception is to allow compilation of non-GPL (including proprietary) programs to
-use, in this way, the header files and runtime libraries covered by this Exception.
-
-0. Definitions.
-
-A file is an "Independent Module" if it either requires the Runtime Library for execution after a Compilation
-Process, or makes use of an interface provided by the Runtime Library, but is not otherwise based on the Runtime Library.
-
-"GCC" means a version of the GNU Compiler Collection, with or without modifications, governed by version 3
-(or a specified later version) of the GNU General Public License (GPL) with the option of using any subsequent
-versions published by the FSF.
-
-"GPL-compatible Software" is software whose conditions of propagation, modification and use would permit combination
-with GCC in accord with the license of GCC.
-
-"Target Code" refers to output from any compiler for a real or virtual target processor architecture, in executable
-form or suitable for input to an assembler, loader, linker and/or execution phase. Notwithstanding that, Target Code
-does not include data in any format that is used as a compiler intermediate representation, or used for producing a
-compiler intermediate representation.
-
-The "Compilation Process" transforms code entirely represented in non-intermediate languages designed for human-written
-code, and/or in Java Virtual Machine byte code, into Target Code. Thus, for example, use of source code generators and
-preprocessors need not be considered part of the Compilation Process, since the Compilation Process can be understood as
-starting with the output of the generators or preprocessors.
-
-A Compilation Process is "Eligible" if it is done using GCC, alone or with other GPL-compatible software, or if it is
-done without using any work based on GCC. For example, using non-GPL-compatible Software to optimize any GCC
-intermediate representations would not qualify as an Eligible Compilation Process.
-
-1. Grant of Additional Permission.
-
-You have permission to propagate a work of Target Code formed by combining the Runtime Library with Independent Modules,
-even if such propagation would otherwise violate the terms of GPLv3, provided that all Target Code was generated by
-Eligible Compilation Processes. You may then convey such a combination under terms of your choice, consistent with the
-licensing of the Independent Modules.
-
-2. No Weakening of GCC Copyleft.
-
-The availability of this Exception does not imply any general presumption that third-party software is unaffected by
-the copyleft requirements of the license of GCC.
diff --git a/PKGBUILD b/PKGBUILD
index b237912204d1..bf10843ef68d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,11 +1,12 @@
+# Maintainer: xiretza <xiretza+aur@gmail.com>
 # Maintainer: Rod Kay <charlie5 on #ada at freenode.net>
 # Contributor: Pierre-Marie de Rodat <pmderodat on #ada at freenode.net>
 # Contributor: Earnestly <zibeon AT googlemail.com>
 
 pkgname=xmlada
-pkgver=2020
-_upstream_ver=2020-20200429-19A99
-pkgrel=2
+epoch=1
+pkgver=21.0.0
+pkgrel=1
 pkgdesc="An XML parser for Ada95"
 arch=('i686' 'x86_64')
 url="https://github.com/AdaCore/xmlada/"
@@ -15,20 +16,21 @@ makedepends=('gprbuild-bootstrap')
 conflicts=("$pkgname-git")
 
 _checksum=c799502295baf074ad17b48c50f621879c392c57
-source=("$pkgname-$_upstream_ver-src.tar.gz::https://community.download.adacore.com/v1/${_checksum}?filename=$pkgname-$_upstream_ver-src.tar.gz"
-        'expose-cargs-and-largs-makefile.patch'
-        'COPYING.RUNTIME')
-sha1sums=("$_checksum"
-          '9b65cc99453fd15bdb7c49a32e6f76922ec904bd'
-          '44a4a599d98b4ec6d63051103de2fd177f43f67a')
+source=(
+	"$pkgname-$pkgver.tar.gz::$url/archive/v$pkgver.tar.gz"
+	'expose-cargs-and-largs-makefile.patch'
+)
+sha256sums=('923024931f0c57451aa52cb9a3333874646102cb75957f27e3689670f90edc1e'
+            '8cf1c7a650a698ec9b7b1c71659be82f7f31a37dbdd8d24636c17ebfb0e7b989')
 
 prepare() {
-    cd "$srcdir/$pkgname-$_upstream_ver-src"
+    cd "$srcdir/$pkgname-$pkgver"
+
     patch -Np1 -i "$srcdir/expose-cargs-and-largs-makefile.patch"
 }
 
 build() {
-    cd "$srcdir/$pkgname-$_upstream_ver-src"
+    cd "$srcdir/$pkgname-$pkgver"
     ./configure --prefix=/usr --libexecdir=/lib --enable-shared
 
     # Make using a single job (-j1) to avoid the same file being compiled at the same time.
@@ -36,14 +38,11 @@ build() {
 }
 
 package() {
-    cd "$srcdir/$pkgname-$_upstream_ver-src"
+    cd "$srcdir/$pkgname-$pkgver"
 
     # Make one install at a time to avoid GPRinstall reading/writing to
     # the same installed project files at the same time.
     make -j1 prefix="$pkgdir/usr" install
 
-    # Install the custom license.
-    install -D -m644 \
-        "$srcdir/COPYING.RUNTIME" \
-        "$pkgdir/usr/share/licenses/${pkgname}/COPYING.RUNTIME"
+    install -Dm644 -t "$pkgdir/usr/share/licenses/$pkgname/" COPYING.RUNTIME
 }