[gentoo-commits] repo/proj/guru:master commit in: sci-chemistry/xcrysden/files/, sci-chemistry/xcrysden/

[Florian Schmaus]

commit:     ae3ffad2c35d356a7f5b05daf3eb1799e1000d56
Author:     Patrick J Taylor <patrick.joseph.taylor <AT> gmail <DOT> com>
AuthorDate: Sat Sep 10 20:17:37 2022 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Sat Sep 10 20:19:04 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=ae3ffad2

sci-chemistry/xcrysden: replace patch with flag-o-matic to set -fcommon

Signed-off-by: Patrick J Taylor <patrick.joseph.taylor <AT> gmail.com>

 .../xcrysden/files/xcrysden-1.6.2-gcc_flags.patch          | 14 --------------
 sci-chemistry/xcrysden/xcrysden-1.6.2.ebuild               |  4 ++--
 2 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/sci-chemistry/xcrysden/files/xcrysden-1.6.2-gcc_flags.patch 
b/sci-chemistry/xcrysden/files/xcrysden-1.6.2-gcc_flags.patch
deleted file mode 100644
index ef231827e..000000000
--- a/sci-chemistry/xcrysden/files/xcrysden-1.6.2-gcc_flags.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Adds -fcommon to CFLAGS to allow compilation on more recent GCC.
-diff --git a/system/Make.sys-shared b/system/Make.sys-shared
-index 51891e7..f89f876 100644
---- a/system/Make.sys-shared
-+++ b/system/Make.sys-shared
-@@ -19,7 +19,7 @@ MAKE = make
- # C-preprocessor flags
- CPPFLAGS ?=
- # C-compiler flags
--CFLAGS += -ffast-math -funroll-loops -fPIC -pedantic -Wall
-+CFLAGS += -ffast-math -funroll-loops -fPIC -pedantic -Wall -fcommon
- 
- CC     = gcc 
- #LDLIB  = -ldl

diff --git a/sci-chemistry/xcrysden/xcrysden-1.6.2.ebuild 
b/sci-chemistry/xcrysden/xcrysden-1.6.2.ebuild
index c6ecb73d0..b243f1a06 100644
--- a/sci-chemistry/xcrysden/xcrysden-1.6.2.ebuild
+++ b/sci-chemistry/xcrysden/xcrysden-1.6.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit desktop xdg
+inherit desktop flag-o-matic xdg
 
 DESCRIPTION="For the visualisation of molecular and crystal structures."
 
@@ -28,7 +28,6 @@ BDEPEND="${RDEPEND}"
 
 PATCHES=(
        "${FILESDIR}/${P}-ext-bwidget.patch"
-       "${FILESDIR}/${P}-gcc_flags.patch"
        "${FILESDIR}/${P}-Togl_lib.patch"
        "${FILESDIR}/${P}-wrapper_paths.patch"
 )
@@ -39,6 +38,7 @@ src_prepare() {
 }
 
 src_compile() {
+       append-cflags "-fcommon"
        emake xcrysden
 }