Remove useless deps, add missing conflicts

2 files changed, 12 insertions, 12 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4a04aec5b905..c6d40f1f0ebf 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = gcc-git
 	pkgdesc = The GNU Compiler Collection
-	pkgver = 12.0.0_r188792.gf874a13ca38
+	pkgver = 12.0.0_r189756.g2c2148d8c14
 	pkgrel = 1
 	url = https://gcc.gnu.org
 	arch = x86_64
@@ -15,8 +15,6 @@ pkgbase = gcc-git
 	makedepends = libmpc
 	makedepends = gcc-ada
 	makedepends = doxygen
-	makedepends = lib32-glibc
-	makedepends = lib32-gcc-libs
 	makedepends = python
 	makedepends = git
 	makedepends = libxcrypt
@@ -45,7 +43,7 @@ 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_r188792.gf874a13ca38-1
+	depends = gcc-libs-git=12.0.0_r189756.g2c2148d8c14-1
 	depends = binutils>=2.28
 	depends = libmpc
 	optdepends = lib32-gcc-libs-git: for generating code for 32-bit ABI
@@ -60,7 +58,7 @@ pkgname = gcc-git
 pkgname = gcc-libs-git
 	pkgdesc = Runtime libraries shipped by GCC
 	depends = glibc
-	provides = gcc-libs=12.0.0_r188792.gf874a13ca38-1
+	provides = gcc-libs=12.0.0_r189756.g2c2148d8c14-1
 	provides = gcc-multilib
 	provides = gcc-multilib-git
 	provides = libgo.so
@@ -70,6 +68,7 @@ pkgname = gcc-libs-git
 	provides = libasan.so
 	provides = libtsan.so
 	provides = liblsan.so
+	conflicts = gcc-libs
 	replaces = gcc-multilib-git
 	replaces = libgphobos-git
 	options = !emptydirs
@@ -77,7 +76,7 @@ pkgname = gcc-libs-git
 
 pkgname = gcc-fortran-git
 	pkgdesc = Fortran front-end for GCC
-	depends = gcc-git=12.0.0_r188792.gf874a13ca38-1
+	depends = gcc-git=12.0.0_r189756.g2c2148d8c14-1
 	provides = gcc-fortran
 	provides = gcc-multilib
 	provides = gcc-multilib-git
@@ -86,7 +85,7 @@ pkgname = gcc-fortran-git
 
 pkgname = gcc-objc-git
 	pkgdesc = Objective-C front-end for GCC
-	depends = gcc-git=12.0.0_r188792.gf874a13ca38-1
+	depends = gcc-git=12.0.0_r189756.g2c2148d8c14-1
 	provides = gcc-multilib
 	provides = gcc-multilib-git
 	conflicts = gcc-objc
@@ -94,7 +93,7 @@ pkgname = gcc-objc-git
 
 pkgname = gcc-ada-git
 	pkgdesc = Ada front-end for GCC (GNAT)
-	depends = gcc-git=12.0.0_r188792.gf874a13ca38-1
+	depends = gcc-git=12.0.0_r189756.g2c2148d8c14-1
 	provides = gcc-ada
 	provides = gcc-multilib
 	provides = gcc-multilib-git
@@ -105,7 +104,7 @@ pkgname = gcc-ada-git
 
 pkgname = gcc-go-git
 	pkgdesc = Go front-end for GCC
-	depends = gcc-git=12.0.0_r188792.gf874a13ca38-1
+	depends = gcc-git=12.0.0_r189756.g2c2148d8c14-1
 	provides = go=1.12.2
 	provides = gcc-multilib
 	provides = gcc-multilib-git
@@ -116,7 +115,7 @@ pkgname = gcc-go-git
 
 pkgname = gcc-d-git
 	pkgdesc = D frontend for GCC
-	depends = gcc-git=12.0.0_r188792.gf874a13ca38-1
+	depends = gcc-git=12.0.0_r189756.g2c2148d8c14-1
 	provides = gcc-d
 	provides = gdc
 	provides = gdc-git
diff --git a/PKGBUILD b/PKGBUILD
index ce7fc59bdfbd..2def4fa77c0a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,7 +8,7 @@
 
 pkgbase=gcc-git
 pkgname=({gcc,gcc-libs,gcc-fortran,gcc-objc,gcc-ada,gcc-go,gcc-d}-git)
-pkgver=12.0.0_r188792.gf874a13ca38
+pkgver=12.0.0_r189756.g2c2148d8c14
 _majorver=${pkgver%%.*}
 _isl_link=https://mirrors.slackware.com/slackware/slackware64-current/source/l/isl
 _isl=$(curl -s "$_isl_link/?C=M;O=A" | grep "isl-.*tar\.xz" | tail -1 | sed -e 's/.*href="//' -e 's/\.mirrorlist.*//')
@@ -17,7 +17,7 @@ pkgdesc='The GNU Compiler Collection'
 arch=($CARCH)
 license=(GPL LGPL FDL custom)
 url='https://gcc.gnu.org'
-makedepends=(git binutils libmpc gcc-ada doxygen lib32-glibc lib32-gcc-libs python git libxcrypt)
+makedepends=(git binutils libmpc gcc-ada doxygen python git libxcrypt)
 checkdepends=(dejagnu inetutils)
 options=(!emptydirs)
 _libdir=usr/lib/gcc/$CHOST/${pkgver%_*}
@@ -143,6 +143,7 @@ package_gcc-libs-git() {
   options+=(!strip)
   provides=("gcc-libs=$pkgver-$pkgrel" gcc-multilib{,-git} libgo.so libgfortran.so libgphobos.so
             libubsan.so libasan.so libtsan.so liblsan.so)
+  conflicts=(gcc-libs)
   replaces=(gcc-multilib-git libgphobos-git)
 
   cd gcc-build/$CHOST