Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-chemistry/gsim/, sci-chemistry/gsim/files/, profiles/
Date: Tue, 03 Apr 2018 16:34:27
Message-Id: 1522773067.72f97028e511cf2d4331aeda84edca27bb186888.asturm@gentoo
1 commit: 72f97028e511cf2d4331aeda84edca27bb186888
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Tue Apr 3 16:31:07 2018 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Tue Apr 3 16:31:07 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=72f97028
7
8 sci-chemistry/gsim: Remove last-rited package
9
10 Closes: https://bugs.gentoo.org/514438
11 Closes: https://bugs.gentoo.org/644522
12
13 profiles/package.mask | 5 --
14 sci-chemistry/gsim/Manifest | 1 -
15 .../gsim/files/gsim-21.3-build.conf.patch | 49 --------------
16 sci-chemistry/gsim/gsim-21.3-r1.ebuild | 79 ----------------------
17 sci-chemistry/gsim/gsim-21.3.ebuild | 66 ------------------
18 sci-chemistry/gsim/metadata.xml | 14 ----
19 6 files changed, 214 deletions(-)
20
21 diff --git a/profiles/package.mask b/profiles/package.mask
22 index 0ce1e75d18b..84bad4535af 100644
23 --- a/profiles/package.mask
24 +++ b/profiles/package.mask
25 @@ -577,11 +577,6 @@ media-sound/qmpdclient
26 # Masked for removal in 30 days. Bug 645436
27 sci-chemistry/massxpert
28
29 -# Andreas Sturmlechner <asturm@g.o> (04 Mar 2018)
30 -# Dead upstream, depends on deprecated Qt4.
31 -# Masked for removal in 30 days. Bug 514438, 644522
32 -sci-chemistry/gsim
33 -
34 # Andreas K. Hüttel <dilfridge@g.o> (03 Mar 2018)
35 # Fails to build without rpc support in glibc (bug 631044);
36 # no maintainer, requires obsolete hardware. Removal in
37
38 diff --git a/sci-chemistry/gsim/Manifest b/sci-chemistry/gsim/Manifest
39 deleted file mode 100644
40 index 934ae0db1a1..00000000000
41 --- a/sci-chemistry/gsim/Manifest
42 +++ /dev/null
43 @@ -1 +0,0 @@
44 -DIST gsim-21.3.tar.gz 4100589 BLAKE2B 5469ea2f06eb4d19efc767d5a1a45031e6ef257f27a32e62bda9c67b2c05b79b7b394efc402b68e708b87519e673c8785e0b3aaa9590f03a04c5df088190a578 SHA512 0a65ec416a11893fe9f249126ed8e7b9f7991dc8f02d6b62b01962de6dfabda805acdc3d7fc6939b609ff018f16cefff616f37ee906776712209460374bb225d
45
46 diff --git a/sci-chemistry/gsim/files/gsim-21.3-build.conf.patch b/sci-chemistry/gsim/files/gsim-21.3-build.conf.patch
47 deleted file mode 100644
48 index da7d7b7b445..00000000000
49 --- a/sci-chemistry/gsim/files/gsim-21.3-build.conf.patch
50 +++ /dev/null
51 @@ -1,49 +0,0 @@
52 - gsim.pro | 23 ++++++++++++++---------
53 - 1 file changed, 14 insertions(+), 9 deletions(-)
54 -
55 -diff --git a/gsim.pro b/gsim.pro
56 -index f88dc8a..579a91c 100755
57 ---- a/gsim.pro
58 -+++ b/gsim.pro
59 -@@ -10,27 +10,32 @@
60 -
61 - #Uncomment next line if you want to use EMF output
62 - #EMF output requires libEMF or Wine on X11 systems and MAC(?)
63 --CONFIG+=use_emf
64 -+#CONFIG+=use_emf
65 -
66 - #DO NOT UNCOMMENT NEXT LINE. The scripting possibilty won't work at the moment
67 - #CONFIG+=use_script
68 -
69 - # Change directories locations for libcmatrix, MinUIT and muParser libraries
70 --unix:INCLUDEPATH += /home/dch0ph/libcmatrixR3nosse/include \
71 -- /home/dch1vz/Minuit2/include \
72 -- /home/dch1vz/muparser/include
73 -+#unix:INCLUDEPATH += /home/dch0ph/libcmatrixR3nosse/include \
74 -+# /home/dch1vz/Minuit2/include \
75 -+# /home/dch1vz/muparser/include
76 -
77 - win32:INCLUDEPATH += "C:\gsim\libcmatrixR3_qt4\include" "C:\gsim\Minuit2_qt4\include" "C:\gsim\muparser_qt4\include"
78 -
79 --unix:LIBS += -lcmatrix -L/home/dch0ph/libcmatrixR3nosse/lib -lMinuit2Base -L/home/dch1vz/Minuit2/lib -L/home/dch1vz/muparser/lib -lmuparser
80 -+#unix:LIBS += -lcmatrix -L/home/dch0ph/libcmatrixR3nosse/lib -lMinuit2Base -L/home/dch1vz/Minuit2/lib -L/home/dch1vz/muparser/lib -lmuparser
81 -
82 - win32:LIBS += -lcmatrix -L"C:\gsim\libcmatrixR3_qt4\lib" -lMinuit2 -L"C:\gsim\Minuit2_qt4\lib" -L"C:\gsim\muparser_qt4\lib" -lmuparser
83 -
84 - #Change directories location for libEMF (if used)
85 --use_emf {
86 -- DEFINES+=USE_EMF_OUTPUT
87 -- unix:LIBS +=-lEMF -L/usr/include/libEmf
88 -- win32:LIBS +=-lgdi32
89 -+#use_emf {
90 -+# DEFINES+=USE_EMF_OUTPUT
91 -+# unix:LIBS +=-lEMF -L/usr/include/libEmf
92 -+# win32:LIBS +=-lgdi32
93 -+#}
94 -+
95 -+GSIM_ROOT = .
96 -+!include( $$GSIM_ROOT/build.conf ) {
97 -+ message( "You need a build.conf file with local settings!" )
98 - }
99 -
100 - #################################################################################################
101
102 diff --git a/sci-chemistry/gsim/gsim-21.3-r1.ebuild b/sci-chemistry/gsim/gsim-21.3-r1.ebuild
103 deleted file mode 100644
104 index ea74adc598c..00000000000
105 --- a/sci-chemistry/gsim/gsim-21.3-r1.ebuild
106 +++ /dev/null
107 @@ -1,79 +0,0 @@
108 -# Copyright 1999-2016 Gentoo Foundation
109 -# Distributed under the terms of the GNU General Public License v2
110 -
111 -EAPI=6
112 -
113 -inherit flag-o-matic qmake-utils toolchain-funcs
114 -
115 -DESCRIPTION="Visualisation and processing of experimental and simulated NMR spectra"
116 -HOMEPAGE="https://sourceforge.net/projects/gsim/"
117 -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
118 -
119 -LICENSE="GPL-2"
120 -SLOT="0"
121 -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
122 -IUSE="cpu_flags_x86_sse3 emf opengl"
123 -REQUIRED_USE="cpu_flags_x86_sse3"
124 -
125 -RDEPEND="
126 - dev-cpp/muParser
127 - media-libs/freetype
128 - sci-libs/libcmatrix
129 - sci-libs/minuit
130 - virtual/blas
131 - dev-qt/qtsvg:4
132 - emf? ( media-libs/libemf )
133 - opengl? ( dev-qt/qtopengl:4 )"
134 -DEPEND="${RDEPEND}
135 - virtual/pkgconfig"
136 -
137 -PATCHES=(
138 - "${FILESDIR}/${P}-build.conf.patch"
139 -)
140 -DOCS="release.txt README_GSIM.* quickstart.* changes.log programming.*"
141 -
142 -src_prepare() {
143 - edos2unix ${PN}.pro
144 -
145 - default
146 -
147 - # C{,XX}FLAGS need to explicitly enable SSE3 support
148 - # bug #555972
149 - filter-flags -mno-sse3
150 - append-cflags -msse3
151 - append-cxxflags -msse3
152 -
153 - cat >> build.conf <<- EOF
154 - INCLUDEPATH += "${EPREFIX}/usr/include/libcmatrixR3/" \
155 - "${EPREFIX}/usr/include/Minuit2" \
156 - "${EPREFIX}/usr/include"
157 - LIBS += -lcmatrix -lMinuit2 -lmuparser $($(tc-getPKG_CONFIG) --libs cblas)
158 - EOF
159 -
160 - use opengl && echo "CONFIG+=use_opengl" >> build.conf
161 -
162 - if use emf; then
163 - cat >> build.conf <<- EOF
164 - CONFIG+=use_emf
165 - DEFINES+=USE_EMF_OUTPUT
166 - LIBS += -L\"${EPREFIX}/usr/include/libEMF\" -lEMF
167 - EOF
168 - fi
169 - sed \
170 - -e "s:quickstart.pdf:../share/doc/${PF}/quickstart.pdf:g" \
171 - -e "s:README_GSIM.pdf:../share/doc/${PF}/README_GSIM.pdf:g" \
172 - -i mainform.h || die
173 -}
174 -
175 -src_configure() {
176 - eqmake4 ${PN}.pro
177 -}
178 -
179 -src_install() {
180 - default
181 - dobin ${PN}
182 - insinto /usr/share/${PN}
183 - doins -r images ${PN}.ico
184 - insinto /usr/share/${PN}/ui
185 - doins *.ui
186 -}
187
188 diff --git a/sci-chemistry/gsim/gsim-21.3.ebuild b/sci-chemistry/gsim/gsim-21.3.ebuild
189 deleted file mode 100644
190 index 4aa1830ac64..00000000000
191 --- a/sci-chemistry/gsim/gsim-21.3.ebuild
192 +++ /dev/null
193 @@ -1,66 +0,0 @@
194 -# Copyright 1999-2013 Gentoo Foundation
195 -# Distributed under the terms of the GNU General Public License v2
196 -
197 -EAPI=5
198 -
199 -inherit eutils qt4-r2 toolchain-funcs
200 -
201 -DESCRIPTION="Visualisation and processing of experimental and simulated NMR spectra"
202 -HOMEPAGE="https://sourceforge.net/projects/gsim/"
203 -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
204 -
205 -LICENSE="GPL-2"
206 -SLOT="0"
207 -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
208 -IUSE="emf opengl"
209 -
210 -RDEPEND="
211 - dev-cpp/muParser
212 - media-libs/freetype
213 - sci-libs/libcmatrix
214 - sci-libs/minuit
215 - virtual/blas
216 - dev-qt/qtsvg:4
217 - emf? ( media-libs/libemf )
218 - opengl? ( dev-qt/qtopengl:4 )"
219 -DEPEND="${RDEPEND}
220 - virtual/pkgconfig"
221 -
222 -PATCHES=( "${FILESDIR}"/${P}-build.conf.patch )
223 -DOCS="release.txt README_GSIM.* quickstart.* changes.log programming.*"
224 -
225 -src_prepare() {
226 - edos2unix ${PN}.pro
227 -
228 - qt4-r2_src_prepare
229 -
230 - cat >> build.conf <<- EOF
231 - INCLUDEPATH += "${EPREFIX}/usr/include/libcmatrixR3/" \
232 - "${EPREFIX}/usr/include/Minuit2" \
233 - "${EPREFIX}/usr/include"
234 - LIBS += -lcmatrix -lMinuit2 -lmuparser $($(tc-getPKG_CONFIG) --libs cblas)
235 - EOF
236 -
237 - use opengl && echo "CONFIG+=use_opengl" >> build.conf
238 -
239 - if use emf; then
240 - cat >> build.conf <<- EOF
241 - CONFIG+=use_emf
242 - DEFINES+=USE_EMF_OUTPUT
243 - LIBS += -L\"${EPREFIX}/usr/include/libEMF\" -lEMF
244 - EOF
245 - fi
246 - sed \
247 - -e "s:quickstart.pdf:../share/doc/${PF}/quickstart.pdf:g" \
248 - -e "s:README_GSIM.pdf:../share/doc/${PF}/README_GSIM.pdf:g" \
249 - -i mainform.h || die
250 -}
251 -
252 -src_install() {
253 - qt4-r2_src_install
254 - dobin ${PN}
255 - insinto /usr/share/${PN}
256 - doins -r images ${PN}.ico
257 - insinto /usr/share/${PN}/ui
258 - doins *.ui
259 -}
260
261 diff --git a/sci-chemistry/gsim/metadata.xml b/sci-chemistry/gsim/metadata.xml
262 deleted file mode 100644
263 index 43fbb821ad1..00000000000
264 --- a/sci-chemistry/gsim/metadata.xml
265 +++ /dev/null
266 @@ -1,14 +0,0 @@
267 -<?xml version="1.0" encoding="UTF-8"?>
268 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
269 -<pkgmetadata>
270 - <maintainer type="project">
271 - <email>sci-chemistry@g.o</email>
272 - <name>Gentoo Chemistry Project</name>
273 - </maintainer>
274 - <use>
275 - <flag name="emf">Support for .emf export</flag>
276 - </use>
277 - <upstream>
278 - <remote-id type="sourceforge">gsim</remote-id>
279 - </upstream>
280 -</pkgmetadata>