From d7ad10f3553935c2ae50448fd618c032a4e85c7d Mon Sep 17 00:00:00 2001
From: Alessio Sergi <al3hex@gmail.com>
Date: Wed, 20 Dec 2017 20:52:53 +0100
Subject: [PATCH] gcc: replaces gone gcj packages

A bit late to the party, but better late than never.

No revbump to save a rebuild.
---
 srcpkgs/gcc/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gcc/template b/srcpkgs/gcc/template
index 707ebcf97a4..11cd1e45527 100644
--- a/srcpkgs/gcc/template
+++ b/srcpkgs/gcc/template
@@ -14,6 +14,7 @@ checksum=1cf7adf8ff4b5aa49041c8734bbcf1ad18cc4c94d0029aae0f4e48841088479a
 nopie=yes
 lib32disabled=yes
 bootstrap=yes
+replaces="gcc-gcj<7.2.0 gcc-gcj-jdk-compat<7.2.0"
 
 if [ "$CHROOT_READY" ]; then
 	hostmakedepends="perl flex"
@@ -75,9 +76,6 @@ case "$XBPS_TARGET_MACHINE" in
 	*) subpackages+=" libitm libitm-devel";;
 esac
 
-# gcc-c++ merged in main pkg
-replaces="gcc-c++>=0"
-
 pre_configure() {
 	# _FORTIFY_SOURCE needs an optimization level.
 	sed -i "/ac_cpp=/s/\$CPPFLAGS/\$CPPFLAGS -O2/" {gcc,libiberty}/configure
@@ -436,6 +434,7 @@ libatomic_package() {
 }
 libgcc_package() {
 	short_desc+=" - GCC library"
+	replaces="libgcj<7.2.0"
 	noverifyrdeps=yes
 	pkg_install() {
 		vmove "usr/lib/libgcc_s.so*"
@@ -445,6 +444,7 @@ libgcc_package() {
 libgcc-devel_package() {
 	depends="libgcc-${version}_${revision}"
 	short_desc+=" - GCC library - development files"
+	replaces="libgcj-devel<7.2.0"
 	pkg_install() {
 		vmove "usr/lib/gcc/${_triplet}/${_majorver}/*.o"
 		vmove "usr/lib/gcc/${_triplet}/${_majorver}/*.a"