Revert

Signed-off-by: Peter Jung <admin@ptr1337.dev>

2 files changed, 15 insertions, 26 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d1f1a31def1e..fa61575b2dd3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -77,6 +77,7 @@ pkgname = gcc-libs-git
 
 pkgname = lib32-gcc-libs-git
 	pkgdesc = 32-bit runtime libraries shipped by GCC (git version)
+	groups = multilib-devel-git
 	depends = lib32-glibc>=2.27
 	provides = lib32-gcc-libs
 	provides = libgo.so
@@ -84,7 +85,6 @@ pkgname = lib32-gcc-libs-git
 	provides = libubsan.so
 	provides = libasan.so
 	conflicts = lib32-gcc-libs
-	replaces = gcc-multilib-git
 	options = !emptydirs
 	options = !strip
 
@@ -104,8 +104,6 @@ pkgname = gcc-rust-git
 	depends = libisl.so
 	provides = gcc-rust
 	provides = gcc-rust-git
-	provides = gcc-multilib
-	provides = gcc-multilib-git
 	conflicts = gcc-rust
 	replaces = gcc-multilib-git
 
@@ -113,7 +111,6 @@ pkgname = gcc-objc-git
 	pkgdesc = Objective-C front-end for GCC (git version)
 	depends = gcc-git=13.0.0_r197401.g33be3ee36a7-1
 	depends = libisl.so
-	provides = gcc-objc
 	provides = gcc-multilib
 	provides = gcc-multilib-git
 	conflicts = gcc-objc
@@ -138,11 +135,9 @@ pkgname = gcc-d-git
 	provides = gdc
 	provides = gcc-d
 	provides = gcc-d-git
-	provides = gcc-multilib
-	provides = gcc-multilib-git
 	conflicts = gcc-d
-	replaces = gcc-multilib
-	replaces = gcc-multilib-git
+	replaces = gdc
+	replaces = gcc-d
 	options = staticlibs
 	options = !debug
 
@@ -151,8 +146,9 @@ pkgname = lto-dump-git
 	depends = gcc-git=13.0.0_r197401.g33be3ee36a7-1
 	depends = libisl.so
 	provides = lto-dump
-	conflicts = lto-dumb
-	replaces = gcc-multilib-git
+	provides = lto-dump-git
+	conflicts = lto-dump
+	replaces = lto-dump
 
 pkgname = gcc-go-git
 	pkgdesc = Go front-end for GCC (git version)
@@ -170,6 +166,3 @@ pkgname = libgccjit-git
 	pkgdesc = Just-In-Time Compilation with GCC backend (git version)
 	depends = gcc-git=13.0.0_r197401.g33be3ee36a7-1
 	depends = libisl.so
-	provides = libgccjit
-	conflicts = libgccjit
-	replaces = gcc-multilib-git
diff --git a/PKGBUILD b/PKGBUILD
index fd13cb80cc43..f88ea367b746 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -315,7 +315,7 @@ package_gcc-fortran-git() {
 package_gcc-rust-git() {
   pkgdesc="Rust frontend for GCC (git version)"
   depends=("gcc-git=$pkgver-$pkgrel" libisl.so)
-  provides=(gcc-rust{,-git} gcc-multilib{,-git})
+  provides=(gcc-rust{,-git})
   conflicts=(gcc-rust)
   replaces=(gcc-multilib-git)
 
@@ -334,7 +334,7 @@ package_gcc-rust-git() {
 package_gcc-objc-git() {
   pkgdesc='Objective-C front-end for GCC (git version)'
   depends=("gcc-git=$pkgver-$pkgrel" libisl.so)
-  provides=(gcc-objc gcc-multilib{,-git})
+  provides=(gcc-multilib{,-git})
   conflicts=(gcc-objc)
   replaces=(gcc-multilib-git)
 
@@ -416,7 +416,7 @@ package_lib32-gcc-libs-git() {
   depends=('lib32-glibc>=2.27')
   provides=(lib32-gcc-libs libgo.so libgfortran.so libubsan.so libasan.so)
   conflicts=(lib32-gcc-libs)
-  replaces=(gcc-multilib-git)
+  groups=(multilib-devel-git)
   options=(!emptydirs !strip)
 
   cd gcc-build
@@ -453,9 +453,8 @@ package_lib32-gcc-libs-git() {
 package_gcc-d-git() {
   pkgdesc="D frontend for GCC (git version)"
   depends=("gcc-git=$pkgver-$pkgrel" libisl.so)
-  provides=(gdc gcc-d{,-git} gcc-multilib{,-git})
-  replaces=(gcc-multilib{,-git})
-  conflicts=(gcc-d)
+  provides=(gdc)
+  replaces=(gdc)
   options=(staticlibs !debug)
 
   cd gcc-build
@@ -477,10 +476,10 @@ package_gcc-d-git() {
 package_lto-dump-git() {
   pkgdesc="Dump link time optimization object files (git version)"
   depends=("gcc-git=$pkgver-$pkgrel" libisl.so)
-  provides=(lto-dump)
-  conflicts=(lto-dumb)
-  replaces=(gcc-multilib-git)
-  
+  provides=(lto-dump lto-dump-git)
+  replaces=(lto-dump)
+  conflicts=(lto-dump)
+
   cd gcc-build
   make -C gcc DESTDIR="$pkgdir" lto.install-{common,man,info}
 
@@ -492,9 +491,6 @@ package_lto-dump-git() {
 package_libgccjit-git() {
   pkgdesc="Just-In-Time Compilation with GCC backend (git version)"
   depends=("gcc-git=$pkgver-$pkgrel" libisl.so)
-  provides=(libgccjit)
-  conflicts=(libgccjit)
-  replaces=(gcc-multilib-git)
 
   cd gcc-build
   make -C gcc DESTDIR="$pkgdir" jit.install-common jit.install-info