Gentoo Archives: gentoo-commits

From: David Seifert <soap@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-chemistry/gsim/files/
Date: Tue, 31 Jan 2017 08:42:17
Message-Id: 1485852076.afb2233ae6abaa3a9b384a53970569673967051c.soap@gentoo
1 commit: afb2233ae6abaa3a9b384a53970569673967051c
2 Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com>
3 AuthorDate: Mon Jan 30 17:01:55 2017 +0000
4 Commit: David Seifert <soap <AT> gentoo <DOT> org>
5 CommitDate: Tue Jan 31 08:41:16 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=afb2233a
7
8 sci-chemistry/gsim: remove unused patches
9
10 Closes: https://github.com/gentoo/gentoo/pull/3730
11
12 sci-chemistry/gsim/files/0.20.1-build.conf.patch | 44 ----------------------
13 .../gsim/files/gsim-21.0-build.conf.patch | 42 ---------------------
14 2 files changed, 86 deletions(-)
15
16 diff --git a/sci-chemistry/gsim/files/0.20.1-build.conf.patch b/sci-chemistry/gsim/files/0.20.1-build.conf.patch
17 deleted file mode 100644
18 index e0c68d2..00000000
19 --- a/sci-chemistry/gsim/files/0.20.1-build.conf.patch
20 +++ /dev/null
21 @@ -1,44 +0,0 @@
22 - gsim.pro | 25 +++++++++++++++----------
23 - 1 files changed, 15 insertions(+), 10 deletions(-)
24 -
25 -diff --git a/gsim.pro b/gsim.pro
26 -index 7316aee..9278b6a 100755
27 ---- a/gsim.pro
28 -+++ b/gsim.pro
29 -@@ -16,21 +16,26 @@
30 - #CONFIG+=use_script
31 -
32 - # Change directories locations for libcmatrix, MinUIT and muParser libraries
33 --unix:INCLUDEPATH += /home/vjuser/gsim/libcmatrixR3/include \
34 -- /home/vjuser/gsim/Minuit2/include \
35 -- /usr/include/muParser
36 -+#unix:INCLUDEPATH += /home/vjuser/gsim/libcmatrixR3/include \
37 -+# /home/vjuser/gsim/Minuit2/include \
38 -+# /usr/include/muParser
39 -
40 --win32:INCLUDEPATH += "C:\gsim\libcmatrixR3\include" "C:\gsim\Minuit2\include" "C:\gsim\muparser\include"
41 -+#win32:INCLUDEPATH += "C:\gsim\libcmatrixR3\include" "C:\gsim\Minuit2\include" "C:\gsim\muparser\include"
42 -
43 --unix:LIBS += -lcmatrix -L/home/vjuser/gsim/libcmatrixR3/lib -lMinuit2 -L/home/vjuser/gsim/Minuit2/lib -L/home/vjuser/gsim/muparser/lib -lmuparser
44 -+#unix:LIBS += -lcmatrix -L/home/vjuser/gsim/libcmatrixR3/lib -lMinuit2 -L/home/vjuser/gsim/Minuit2/lib -L/home/vjuser/gsim/muparser/lib -lmuparser
45 -
46 --win32:LIBS += -lcmatrix -L"C:\gsim\libcmatrixR3\lib" -lMinuit2 -L"C:\gsim\Minuit2\lib" -L"C:\gsim\muparser\lib" -lmuparser
47 -+#win32:LIBS += -lcmatrix -L"C:\gsim\libcmatrixR3\lib" -lMinuit2 -L"C:\gsim\Minuit2\lib" -L"C:\gsim\muparser\lib" -lmuparser
48 -
49 - #Change directories location for libEMF (if used)
50 --use_emf {
51 -- DEFINES+=USE_EMF_OUTPUT
52 -- unix:LIBS +=-lEMF -L/usr/include/libEmf
53 -- win32:LIBS +=-lgdi32
54 -+#use_emf {
55 -+# DEFINES+=USE_EMF_OUTPUT
56 -+# unix:LIBS +=-lEMF -L/usr/include/libEmf
57 -+# win32:LIBS +=-lgdi32
58 -+#}
59 -+
60 -+GSIM_ROOT = .
61 -+!include( $$GSIM_ROOT/build.conf ) {
62 -+ message( "You need a build.conf file with local settings!" )
63 - }
64 -
65 - #################################################################################################
66
67 diff --git a/sci-chemistry/gsim/files/gsim-21.0-build.conf.patch b/sci-chemistry/gsim/files/gsim-21.0-build.conf.patch
68 deleted file mode 100644
69 index cbd529a..00000000
70 --- a/sci-chemistry/gsim/files/gsim-21.0-build.conf.patch
71 +++ /dev/null
72 @@ -1,42 +0,0 @@
73 - gsim.pro | 23 ++++++++++++++---------
74 - 1 file changed, 14 insertions(+), 9 deletions(-)
75 -
76 -diff --git a/gsim.pro b/gsim.pro
77 -index f06e5d2..6e28178 100755
78 ---- a/gsim.pro
79 -+++ b/gsim.pro
80 -@@ -16,20 +16,25 @@
81 - #CONFIG+=use_script
82 -
83 - # Change directories locations for libcmatrix, MinUIT and muParser libraries
84 --unix:INCLUDEPATH += /home/dch1vz/libcmatrixR3/include \
85 -- /home/dch1vz/Minuit2/include \
86 -+#unix:INCLUDEPATH += /home/dch1vz/libcmatrixR3/include \
87 -+# /home/dch1vz/Minuit2/include \
88 -
89 --win32:INCLUDEPATH += "C:\gsim\libcmatrixR3\include" "C:\gsim\Minuit2\include" "C:\gsim\muparser\include"
90 -+#win32:INCLUDEPATH += "C:\gsim\libcmatrixR3\include" "C:\gsim\Minuit2\include" "C:\gsim\muparser\include"
91 -
92 --unix:LIBS += -lcmatrix -L/home/dch1vz/libcmatrixR3/lib -lMinuit2Base -L/home/dch1vz/Minuit2/lib -lmuparser
93 -+#unix:LIBS += -lcmatrix -L/home/dch1vz/libcmatrixR3/lib -lMinuit2Base -L/home/dch1vz/Minuit2/lib -lmuparser
94 -
95 --win32:LIBS += -lcmatrix -L"C:\gsim\libcmatrixR3\lib" -lMinuit2 -L"C:\gsim\Minuit2\lib" -L"C:\gsim\muparser\lib" -lmuparser
96 -+#win32:LIBS += -lcmatrix -L"C:\gsim\libcmatrixR3\lib" -lMinuit2 -L"C:\gsim\Minuit2\lib" -L"C:\gsim\muparser\lib" -lmuparser
97 -
98 - #Change directories location for libEMF (if used)
99 --use_emf {
100 -- DEFINES+=USE_EMF_OUTPUT
101 -- unix:LIBS +=-lEMF -L/usr/include/libEmf
102 -- win32:LIBS +=-lgdi32
103 -+#use_emf {
104 -+# DEFINES+=USE_EMF_OUTPUT
105 -+# unix:LIBS +=-lEMF -L/usr/include/libEmf
106 -+# win32:LIBS +=-lgdi32
107 -+#}
108 -+
109 -+GSIM_ROOT = .
110 -+!include( $$GSIM_ROOT/build.conf ) {
111 -+ message( "You need a build.conf file with local settings!" )
112 - }
113 -
114 - #################################################################################################