diff --git a/sys-cluster/clusteringsuite/files/respect-flags.patch b/sys-cluster/clusteringsuite/files/respect-flags.patch
deleted file mode 100644
index 9ff5bd3845..0000000000
--- a/sys-cluster/clusteringsuite/files/respect-flags.patch
+++ /dev/null
@@ -1,134 +0,0 @@
-diff '--color=auto' -ru a/config/determine-cc.sh b/config/determine-cc.sh
---- a/config/determine-cc.sh	2021-04-25 01:09:35.175990108 +0200
-+++ b/config/determine-cc.sh	2021-04-25 01:10:02.876433713 +0200
-@@ -1,7 +1,6 @@
- #!/bin/sh
- # determine what compiler is behind "cc" (and presumably "CC" and "ftn") wrapper
- 
--CC=`which cc 2>/dev/null`
- COMP=
- if [ -z "$CC" ]; then
-   echo "No 'cc' located!"
-diff '--color=auto' -ru a/config/select-compiler.sh b/config/select-compiler.sh
---- a/config/select-compiler.sh	2021-04-25 01:09:35.175990108 +0200
-+++ b/config/select-compiler.sh	2021-04-25 01:10:26.882817842 +0200
-@@ -9,7 +9,7 @@
- CPS=""
- COMP=""
- 
--GNU=`which gcc 2> /dev/null`
-+GNU="${CC}"
- if [ -n "${GNU}" ]
- then
-   NCPS=`expr ${NCPS} + 1`
-diff '--color=auto' -ru a/config/select-mpi.sh b/config/select-mpi.sh
---- a/config/select-mpi.sh	2021-04-25 01:09:35.175990108 +0200
-+++ b/config/select-mpi.sh	2021-04-25 01:12:41.269962840 +0200
-@@ -76,7 +76,6 @@
-   if [ -z "${MPIS}" ]; then MPIS="${MPI}"; else MPIS="${MPIS}|${MPI}"; fi
- fi
- 
--MPICC=`which mpicc 2> /dev/null`
- if [ -n "${MPICC}" ]
- then
-   FMPI=""
-@@ -86,7 +85,7 @@
-   MPIROOTDIR1=`dirname ${MBINDIR}`
- 
-   echo "#include <mpi.h>" > conftest.c
--  mpicc -E conftest.c | grep '/mpi.h"' | head -1 > mpiconf.txt
-+  "${MPICC}" -E conftest.c | grep '/mpi.h"' | head -1 > mpiconf.txt
-   MINCDIR=`cat mpiconf.txt | sed -e 's#^.* "##' -e 's#/mpi.h".*##'`
-   if [ -n "${MINCDIR}" ]
-   then
-diff '--color=auto' -ru a/mf/Makefile.defs.linux-gomp b/mf/Makefile.defs.linux-gomp
---- a/mf/Makefile.defs.linux-gomp	2021-04-25 01:09:35.119989211 +0200
-+++ b/mf/Makefile.defs.linux-gomp	2021-04-25 01:52:32.378951608 +0200
-@@ -23,24 +23,19 @@
- #------------------------------------------------------------------------------
- # SIONlib General Settings
- #------------------------------------------------------------------------------
--OPTFLAGS = -g -O0 -Wall
-+CFLAGS   += -std=c99 $(PFLAG) $(OPTFLAGS) -fPIC
- 
--CC       = gcc
--CFLAGS   = -std=c99 $(PFLAG) $(OPTFLAGS) -fPIC
-+CXXFLAGS += $(PFLAG) $(OPTFLAGS) -fPIC
- 
--CXX      = g++
--CXXFLAGS = $(PFLAG) $(OPTFLAGS) -O3
--
--F77      = gfortran
--FFLAGS   = $(PFLAG) $(OPTFLAGS)
-+FFLAGS   += $(PFLAG) $(OPTFLAGS) -fPIC
- 
- F90      = $(F77)
--F90FLAGS = $(PFLAG) $(OPTFLAGS) -ffree-form
-+F90FLAGS += $(PFLAG) $(OPTFLAGS) -ffree-form -fPIC $(FCFLAGS)
- 
- FPP      =
- FDOPT    = -D
- 
--LDFLAGS  = $(PFLAG) $(OPTFLAGS) $(HINTSLIB)
-+LDFLAGS  += $(PFLAG) $(OPTFLAGS) $(HINTSLIB)
- UTILLIB  =
- FOBASE   = pomp_fwrapper_base.o
- 
-@@ -101,10 +96,6 @@
- #------------------------------------------------------------------------------
- 
- MPIENABLE = 1
--MPICC     = mpicc
--MPICXX    = mpicxx
--MPIF77    = mpif77
--MPIF90    = mpif90
- MPILIB    = -lmpich
- PMPILIB   = -lpmpich
- #PMPILIB   = # MPICH2
-@@ -139,8 +130,7 @@
- #------------------------------------------------------------------------------
- 
- SZLIB          = szlib
--SZLIB_OPTFLAGS = -O3
--SZLIB_CFLAGS   = -I$(TOPDIR)/utils/szlib -DELG_COMPRESSED -DCUBE_COMPRESSED
-+SZLIB_CFLAGS   = -I$(TOPDIR)/utils/szlib -DELG_COMPRESSED -DCUBE_COMPRESSED $(CFLAGS)
- SZLIB_LIBPATH  = -L$(TOPDIR)/utils/szlib
- SZLIB_LIB      = -lsc.z
- 
-diff '--color=auto' -ru a/src/fortraninterface/Makefile b/src/fortraninterface/Makefile
---- a/src/fortraninterface/Makefile	2021-04-25 01:09:35.141989563 +0200
-+++ b/src/fortraninterface/Makefile	2021-04-25 01:23:48.055976593 +0200
-@@ -109,7 +110,7 @@
- 	$(CPP) $(F90FLAGS) $(F90FLAGS_CPP) -P -E -I ../lib sion_f90.F90 > sion_f90.f90
- sion_f90.mod : sion_f90.o
- sion_f90.o : sion_f90.f90 sion_f77.h $(SION_HDRS)
--	$(F90) -c sion_f90.f90
-+	$(F90) $(F90FLAGS) -c sion_f90.f90
- 
- sion_f90_omp.o: sion_f90.o
- sion_f90_mpi.o: sion_f90.o
-@@ -121,21 +122,21 @@
- 	$(CPP) $(F90FLAGS) $(F90FLAGS_CPP) $(F90MPIFLAGS) -P -E -I ../lib sion_f90_mpi.F90 > sion_f90_mpi.f90
- sion_f90_mpi.mod : sion_f90_mpi.o
- sion_f90_mpi.o : sion_f90_mpi.f90 sion_f90.mod $(SION_HDRS)
--	$(MPIF90) -c sion_f90_mpi.f90
-+	$(MPIF90) $(F90FLAGS) $(F90MPIFLAGS) -c sion_f90_mpi.f90
- 
- # F90 Interface (OMP)
- sion_f90_omp.f90: sion_f90_omp.F90
- 	$(CPP) $(F90OMPFLAGS) $(F90FLAGS) $(F90FLAGS_CPP) -P -E -I ../lib sion_f90_omp.F90 > sion_f90_omp.f90
- sion_f90_omp.mod : sion_f90_omp.o 
- sion_f90_omp.o : sion_f90_omp.f90 sion_f90.mod $(SION_HDRS)
--	$(OMPF90) -c sion_f90_omp.f90
-+	$(OMPF90) $(F90FLAGS) $(F90OMPFLAGS) -c sion_f90_omp.f90
- 
- # F90 Interface (OMPI)
- sion_f90_ompi.f90: sion_f90_ompi.F90 $(SION_HDRS)
- 	$(CPP) $(F90MPIFLAGS) $(F90OMPFLAGS) $(F90FLAGS) $(F90FLAGS_CPP) -P -E -I ../lib sion_f90_ompi.F90 > sion_f90_ompi.f90
- sion_f90_ompi.mod : sion_f90_ompi.o
- sion_f90_ompi.o : sion_f90_ompi.f90 $(SION_HDRS)
--	$(MPIF90) -c sion_f90_ompi.f90
-+	$(MPIF90) $(F90FLAGS) $(F90MPIFLAGS) -c sion_f90_ompi.f90
- 
- 
-