Packages should provide their non -git versions

2 files changed, 23 insertions, 18 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 097eb6936b5d..f6c3655410cf 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = gcc-git
 	pkgdesc = The GNU Compiler Collection
-	pkgver = 12.0.0_r187312.gfb85d6eb6c3
+	pkgver = 12.0.0_r187385.gb48d4e68186
 	pkgrel = 1
 	url = https://gcc.gnu.org
 	arch = x86_64
@@ -47,10 +47,11 @@ pkgbase = gcc-git
 pkgname = gcc-git
 	pkgdesc = The GNU Compiler Collection - C and C++ frontends
 	groups = base-devel-git
-	depends = gcc-libs-git=12.0.0_r187312.gfb85d6eb6c3-1
+	depends = gcc-libs-git=12.0.0_r187385.gb48d4e68186-1
 	depends = binutils>=2.28
 	depends = libmpc
 	optdepends = lib32-gcc-libs-git: for generating code for 32-bit ABI
+	provides = gcc
 	provides = gcc-git-multilib
 	provides = gcc-git-multilib-git
 	conflicts = gcc
@@ -61,7 +62,9 @@ pkgname = gcc-git
 pkgname = gcc-libs-git
 	pkgdesc = Runtime libraries shipped by GCC
 	depends = glibc
+	provides = gcc-libs
 	provides = gcc-git-multilib
+	provides = gcc-git-multilibgit
 	provides = libgo.so
 	provides = libgfortran.so
 	provides = libgphobos.so
@@ -69,14 +72,14 @@ pkgname = gcc-libs-git
 	provides = libasan.so
 	provides = libtsan.so
 	provides = liblsan.so
-	replaces = gcc-git-multilib
-	replaces = libgphobos
+	replaces = gcc-git-multilib-git
 	options = !emptydirs
 	options = !strip
 
 pkgname = gcc-fortran-git
 	pkgdesc = Fortran front-end for GCC
-	depends = gcc-git=12.0.0_r187312.gfb85d6eb6c3-1
+	depends = gcc-git=12.0.0_r187385.gb48d4e68186-1
+	provides = gcc-fortran
 	provides = gcc-git-multilib
 	provides = gcc-git-multilib-git
 	conflicts = gcc-fortran
@@ -84,7 +87,7 @@ pkgname = gcc-fortran-git
 
 pkgname = gcc-objc-git
 	pkgdesc = Objective-C front-end for GCC
-	depends = gcc-git=12.0.0_r187312.gfb85d6eb6c3-1
+	depends = gcc-git=12.0.0_r187385.gb48d4e68186-1
 	provides = gcc-git-multilib
 	provides = gcc-git-multilib-git
 	conflicts = gcc-objc
@@ -92,7 +95,8 @@ pkgname = gcc-objc-git
 
 pkgname = gcc-ada-git
 	pkgdesc = Ada front-end for GCC (GNAT)
-	depends = gcc-git=12.0.0_r187312.gfb85d6eb6c3-1
+	depends = gcc-git=12.0.0_r187385.gb48d4e68186-1
+	provides = gcc-ada
 	provides = gcc-git-multilib
 	provides = gcc-git-multilib-git
 	conflicts = gcc-ada
@@ -102,7 +106,7 @@ pkgname = gcc-ada-git
 
 pkgname = gcc-go-git
 	pkgdesc = Go front-end for GCC
-	depends = gcc-git=12.0.0_r187312.gfb85d6eb6c3-1
+	depends = gcc-git=12.0.0_r187385.gb48d4e68186-1
 	provides = go=1.12.2
 	provides = gcc-git-multilib
 	provides = gcc-git-multilib-git
@@ -113,7 +117,8 @@ pkgname = gcc-go-git
 
 pkgname = gcc-d-git
 	pkgdesc = D frontend for GCC
-	depends = gcc-git=12.0.0_r187312.gfb85d6eb6c3-1
+	depends = gcc-git=12.0.0_r187385.gb48d4e68186-1
+	provides = gcc-d
 	provides = gdc
 	provides = gdc-git
 	conflicts = gcc-d
diff --git a/PKGBUILD b/PKGBUILD
index 46ffeb5a54c8..2bc114001065 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,7 +8,7 @@
 
 pkgbase=gcc-git
 pkgname=(gcc-git gcc-libs-git gcc-fortran-git gcc-objc-git gcc-ada-git gcc-go-git gcc-d-git)
-pkgver=12.0.0_r187312.gfb85d6eb6c3
+pkgver=12.0.0_r187385.gb48d4e68186
 _majorver=${pkgver%%.*}
 _isl=$(curl -s "http://isl.gforge.inria.fr/?C=M;O=A" | grep tar.xz | tail -1 | sed -e 's/.*href="//' -e 's/">isl.*//')
 pkgrel=1
@@ -21,7 +21,7 @@ conflicts=(${pkgbase%-git})
 provides=(${pkgbase%-git})
 checkdepends=(dejagnu inetutils)
 options=(!emptydirs)
-_libdir=usr/lib/gcc/$CHOST/${pkgver%%_*}
+_libdir=usr/lib/gcc/$CHOST/${pkgver%_*}
 
 source=(git://gcc.gnu.org/git/gcc.git
         http://isl.gforge.inria.fr/$_isl
@@ -135,9 +135,9 @@ package_gcc-libs-git() {
   pkgdesc='Runtime libraries shipped by GCC'
   depends=(glibc)
   options+=(!strip)
-  provides=($pkgbase-multilib libgo.so libgfortran.so libgphobos.so
+  provides=(gcc-libs $pkgbase-multilib{,git} libgo.so libgfortran.so libgphobos.so
             libubsan.so libasan.so libtsan.so liblsan.so)
-  replaces=($pkgbase-multilib libgphobos)
+  replaces=($pkgbase-multilib-git)
 
   cd gcc-build
   make -C $CHOST/libgcc DESTDIR="$pkgdir" install-shared
@@ -181,7 +181,7 @@ package_gcc-git() {
   depends=("gcc-libs-git=$pkgver-$pkgrel" "binutils>=2.28" libmpc)
   groups=(base-devel-git)
   optdepends=('lib32-gcc-libs-git: for generating code for 32-bit ABI')
-  provides=($pkgbase-multilib{,-git})
+  provides=(gcc $pkgbase-multilib{,-git})
   conflicts=(gcc)
   replaces=($pkgbase-multilib-git)
   options+=(staticlibs)
@@ -268,7 +268,7 @@ package_gcc-git() {
 package_gcc-fortran-git() {
   pkgdesc='Fortran front-end for GCC'
   depends=("gcc-git=$pkgver-$pkgrel")
-  provides=($pkgbase-multilib{,-git})
+  provides=(gcc-fortran $pkgbase-multilib{,-git})
   conflicts=(gcc-fortran)
   replaces=($pkgbase-multilib-git)
 
@@ -310,7 +310,7 @@ package_gcc-objc-git() {
 package_gcc-ada-git() {
   pkgdesc='Ada front-end for GCC (GNAT)'
   depends=("gcc-git=$pkgver-$pkgrel")
-  provides=($pkgbase-multilib{,-git})
+  provides=(gcc-ada $pkgbase-multilib{,-git})
   conflicts=(gcc-ada)
   replaces=($pkgbase-multilib-git)
   options+=(staticlibs)
@@ -373,7 +373,7 @@ package_gcc-go-git() {
 # package_lib32-gcc-libs-git() {
 #   pkgdesc='32-bit runtime libraries shipped by GCC'
 #   depends=("lib32-glibc>=2.27")
-#   provides=(libgo.so libgfortran.so libubsan.so libasan.so)
+#   provides=(lib32-gcc-libs libgo.so libgfortran.so libubsan.so libasan.so)
 #   conflicts=(lib32-gcc-libs)
 #   groups=(multilib-devel-git)
 #   options=(!emptydirs !strip)
@@ -411,7 +411,7 @@ package_gcc-go-git() {
 package_gcc-d-git() {
   pkgdesc="D frontend for GCC"
   depends=("gcc-git=$pkgver-$pkgrel")
-  provides=(gdc{,-git})
+  provides=(gcc-d gdc{,-git})
   conflicts=(gcc-d)
   replaces=(gdc-git)
   options=(staticlibs)