Revert "-conflicts=('psp-gcc-base')"

This reverts commit 55a73161f4e95b9638f7f79daee43d5d88b6f69b.

2 files changed, 2 insertions, 0 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c40790fd78fc..4d3744e2cb81 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -14,6 +14,7 @@ pkgbase = psp-gcc
 	depends = psp-newlib
 	depends = mpfr
 	provides = psp-gcc-base
+	conflicts = psp-gcc-base
 	options = !buildflags
 	options = !strip
 	options = staticlibs
diff --git a/PKGBUILD b/PKGBUILD
index 37d7406af0aa..46856a7a7dc1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,6 +7,7 @@ url="http://gcc.gnu.org"
 license=('GPL' 'LGPL' 'FDL' 'custom')
 groups=('psp')
 depends=('psp-binutils' 'psp-newlib' 'mpfr')
+conflicts=('psp-gcc-base')
 provides=('psp-gcc-base')
 options=('!buildflags' '!strip' 'staticlibs')
 source=("http://ftp.gnu.org/pub/gnu/gcc/gcc-$pkgver/gcc-$pkgver.tar.bz2"