[gentoo-commits] repo/gentoo:master commit in: sci-chemistry/gsim/, sci-chemistry/gsim/files/, profiles/

2018-04-03 Thread Andreas Sturmlechner 
commit: 72f97028e511cf2d4331aeda84edca27bb186888
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Apr  3 16:31:07 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Apr  3 16:31:07 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=72f97028

sci-chemistry/gsim: Remove last-rited package

Closes: https://bugs.gentoo.org/514438
Closes: https://bugs.gentoo.org/644522

 profiles/package.mask  |  5 --
 sci-chemistry/gsim/Manifest|  1 -
 .../gsim/files/gsim-21.3-build.conf.patch  | 49 --
 sci-chemistry/gsim/gsim-21.3-r1.ebuild | 79 --
 sci-chemistry/gsim/gsim-21.3.ebuild| 66 --
 sci-chemistry/gsim/metadata.xml| 14 
 6 files changed, 214 deletions(-)

diff --git a/profiles/package.mask b/profiles/package.mask
index 0ce1e75d18b..84bad4535af 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -577,11 +577,6 @@ media-sound/qmpdclient
 # Masked for removal in 30 days. Bug 645436
 sci-chemistry/massxpert
 
-# Andreas Sturmlechner  (04 Mar 2018)
-# Dead upstream, depends on deprecated Qt4.
-# Masked for removal in 30 days. Bug 514438, 644522
-sci-chemistry/gsim
-
 # Andreas K. Hüttel  (03 Mar 2018)
 # Fails to build without rpc support in glibc (bug 631044);
 # no maintainer, requires obsolete hardware. Removal in

diff --git a/sci-chemistry/gsim/Manifest b/sci-chemistry/gsim/Manifest
deleted file mode 100644
index 934ae0db1a1..000
--- a/sci-chemistry/gsim/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST gsim-21.3.tar.gz 4100589 BLAKE2B 
5469ea2f06eb4d19efc767d5a1a45031e6ef257f27a32e62bda9c67b2c05b79b7b394efc402b68e708b87519e673c8785e0b3aaa9590f03a04c5df088190a578
 SHA512 
0a65ec416a11893fe9f249126ed8e7b9f7991dc8f02d6b62b01962de6dfabda805acdc3d7fc6939b609ff018f16cefff616f37ee906776712209460374bb225d

diff --git a/sci-chemistry/gsim/files/gsim-21.3-build.conf.patch 
b/sci-chemistry/gsim/files/gsim-21.3-build.conf.patch
deleted file mode 100644
index da7d7b7b445..000
--- a/sci-chemistry/gsim/files/gsim-21.3-build.conf.patch
+++ /dev/null
@@ -1,49 +0,0 @@
- gsim.pro | 23 ++-
- 1 file changed, 14 insertions(+), 9 deletions(-)
-
-diff --git a/gsim.pro b/gsim.pro
-index f88dc8a..579a91c 100755
 a/gsim.pro
-+++ b/gsim.pro
-@@ -10,27 +10,32 @@
- 
- #Uncomment next line if you want to use EMF output
- #EMF output requires libEMF or Wine on X11 systems and MAC(?)
--CONFIG+=use_emf
-+#CONFIG+=use_emf
- 
- #DO NOT UNCOMMENT NEXT LINE. The scripting possibilty won't work at the moment
- #CONFIG+=use_script
- 
- # Change directories locations for libcmatrix, MinUIT and muParser libraries
--unix:INCLUDEPATH += /home/dch0ph/libcmatrixR3nosse/include \
--  /home/dch1vz/Minuit2/include \
--  /home/dch1vz/muparser/include
-+#unix:INCLUDEPATH += /home/dch0ph/libcmatrixR3nosse/include \
-+# /home/dch1vz/Minuit2/include \
-+# /home/dch1vz/muparser/include
- 
- win32:INCLUDEPATH += "C:\gsim\libcmatrixR3_qt4\include" 
"C:\gsim\Minuit2_qt4\include" "C:\gsim\muparser_qt4\include"
- 
--unix:LIBS += -lcmatrix -L/home/dch0ph/libcmatrixR3nosse/lib  -lMinuit2Base 
-L/home/dch1vz/Minuit2/lib -L/home/dch1vz/muparser/lib -lmuparser
-+#unix:LIBS += -lcmatrix -L/home/dch0ph/libcmatrixR3nosse/lib  -lMinuit2Base 
-L/home/dch1vz/Minuit2/lib -L/home/dch1vz/muparser/lib -lmuparser
- 
- win32:LIBS += -lcmatrix -L"C:\gsim\libcmatrixR3_qt4\lib" -lMinuit2 
-L"C:\gsim\Minuit2_qt4\lib" -L"C:\gsim\muparser_qt4\lib" -lmuparser
- 
- #Change directories location for libEMF (if used)
--use_emf {
--  DEFINES+=USE_EMF_OUTPUT
--  unix:LIBS +=-lEMF -L/usr/include/libEmf
--  win32:LIBS +=-lgdi32
-+#use_emf {
-+# DEFINES+=USE_EMF_OUTPUT
-+# unix:LIBS +=-lEMF -L/usr/include/libEmf
-+# win32:LIBS +=-lgdi32
-+#}
-+
-+GSIM_ROOT = .
-+!include( $$GSIM_ROOT/build.conf ) {
-+  message( "You need a build.conf file with local settings!" )
- }
- 
- 
#

diff --git a/sci-chemistry/gsim/gsim-21.3-r1.ebuild 
b/sci-chemistry/gsim/gsim-21.3-r1.ebuild
deleted file mode 100644
index ea74adc598c..000
--- a/sci-chemistry/gsim/gsim-21.3-r1.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic qmake-utils toolchain-funcs
-
-DESCRIPTION="Visualisation and processing of experimental and simulated NMR 
spectra"
-HOMEPAGE="https://sourceforge.net/projects/gsim/;
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="cpu_flags_x86_sse3 emf opengl"
-REQUIRED_USE="cpu_flags_x86_sse3"
-
-RDEPEND="
-

[gentoo-commits] repo/gentoo:master commit in: sci-chemistry/gsim/

2017-12-01 Thread David Seifert 
commit: 616777009b98f885ffccddcb07941ba3554f42ec
Author: David Seifert  gentoo  org>
AuthorDate: Fri Dec  1 22:42:14 2017 +
Commit: David Seifert  gentoo  org>
CommitDate: Fri Dec  1 23:00:16 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=61677700

sci-chemistry/gsim: [QA] Fix DESCRIPTION.toolong

 sci-chemistry/gsim/gsim-21.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-chemistry/gsim/gsim-21.3.ebuild 
b/sci-chemistry/gsim/gsim-21.3.ebuild
index 332b51b655e..4aa1830ac64 100644
--- a/sci-chemistry/gsim/gsim-21.3.ebuild
+++ b/sci-chemistry/gsim/gsim-21.3.ebuild
@@ -5,7 +5,7 @@ EAPI=5
 
 inherit eutils qt4-r2 toolchain-funcs
 
-DESCRIPTION="Programm for visualisation and processing of experimental and 
simulated NMR spectra"
+DESCRIPTION="Visualisation and processing of experimental and simulated NMR 
spectra"
 HOMEPAGE="https://sourceforge.net/projects/gsim/;
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"

[gentoo-commits] repo/gentoo:master commit in: sci-chemistry/gsim/files/

2017-01-31 Thread David Seifert 
commit: afb2233ae6abaa3a9b384a53970569673967051c
Author: Michael Mair-Keimberger (asterix)  gmail 
 com>
AuthorDate: Mon Jan 30 17:01:55 2017 +
Commit: David Seifert  gentoo  org>
CommitDate: Tue Jan 31 08:41:16 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=afb2233a

sci-chemistry/gsim: remove unused patches

Closes: https://github.com/gentoo/gentoo/pull/3730

 sci-chemistry/gsim/files/0.20.1-build.conf.patch   | 44 --
 .../gsim/files/gsim-21.0-build.conf.patch  | 42 -
 2 files changed, 86 deletions(-)

diff --git a/sci-chemistry/gsim/files/0.20.1-build.conf.patch 
b/sci-chemistry/gsim/files/0.20.1-build.conf.patch
deleted file mode 100644
index e0c68d2..
--- a/sci-chemistry/gsim/files/0.20.1-build.conf.patch
+++ /dev/null
@@ -1,44 +0,0 @@
- gsim.pro |   25 +++--
- 1 files changed, 15 insertions(+), 10 deletions(-)
-
-diff --git a/gsim.pro b/gsim.pro
-index 7316aee..9278b6a 100755
 a/gsim.pro
-+++ b/gsim.pro
-@@ -16,21 +16,26 @@
- #CONFIG+=use_script
- 
- # Change directories locations for libcmatrix, MinUIT and muParser libraries
--unix:INCLUDEPATH += /home/vjuser/gsim/libcmatrixR3/include \
--/home/vjuser/gsim/Minuit2/include \
--/usr/include/muParser
-+#unix:INCLUDEPATH += /home/vjuser/gsim/libcmatrixR3/include \
-+#/home/vjuser/gsim/Minuit2/include \
-+#/usr/include/muParser
- 
--win32:INCLUDEPATH += "C:\gsim\libcmatrixR3\include" "C:\gsim\Minuit2\include" 
"C:\gsim\muparser\include"
-+#win32:INCLUDEPATH += "C:\gsim\libcmatrixR3\include" 
"C:\gsim\Minuit2\include" "C:\gsim\muparser\include"
- 
--unix:LIBS += -lcmatrix -L/home/vjuser/gsim/libcmatrixR3/lib  -lMinuit2 
-L/home/vjuser/gsim/Minuit2/lib -L/home/vjuser/gsim/muparser/lib -lmuparser
-+#unix:LIBS += -lcmatrix -L/home/vjuser/gsim/libcmatrixR3/lib  -lMinuit2 
-L/home/vjuser/gsim/Minuit2/lib -L/home/vjuser/gsim/muparser/lib -lmuparser
- 
--win32:LIBS += -lcmatrix -L"C:\gsim\libcmatrixR3\lib" -lMinuit2 
-L"C:\gsim\Minuit2\lib" -L"C:\gsim\muparser\lib" -lmuparser
-+#win32:LIBS += -lcmatrix -L"C:\gsim\libcmatrixR3\lib" -lMinuit2 
-L"C:\gsim\Minuit2\lib" -L"C:\gsim\muparser\lib" -lmuparser
- 
- #Change directories location for libEMF (if used)
--use_emf {
--  DEFINES+=USE_EMF_OUTPUT
--  unix:LIBS +=-lEMF -L/usr/include/libEmf
--  win32:LIBS +=-lgdi32
-+#use_emf {
-+# DEFINES+=USE_EMF_OUTPUT
-+# unix:LIBS +=-lEMF -L/usr/include/libEmf
-+# win32:LIBS +=-lgdi32
-+#}
-+
-+GSIM_ROOT = .
-+!include( $$GSIM_ROOT/build.conf ) {
-+  message( "You need a build.conf file with local settings!" )
- }
- 
- 
#

diff --git a/sci-chemistry/gsim/files/gsim-21.0-build.conf.patch 
b/sci-chemistry/gsim/files/gsim-21.0-build.conf.patch
deleted file mode 100644
index cbd529a..
--- a/sci-chemistry/gsim/files/gsim-21.0-build.conf.patch
+++ /dev/null
@@ -1,42 +0,0 @@
- gsim.pro | 23 ++-
- 1 file changed, 14 insertions(+), 9 deletions(-)
-
-diff --git a/gsim.pro b/gsim.pro
-index f06e5d2..6e28178 100755
 a/gsim.pro
-+++ b/gsim.pro
-@@ -16,20 +16,25 @@
- #CONFIG+=use_script
- 
- # Change directories locations for libcmatrix, MinUIT and muParser libraries
--unix:INCLUDEPATH += /home/dch1vz/libcmatrixR3/include \
--  /home/dch1vz/Minuit2/include \
-+#unix:INCLUDEPATH += /home/dch1vz/libcmatrixR3/include \
-+# /home/dch1vz/Minuit2/include \
- 
--win32:INCLUDEPATH += "C:\gsim\libcmatrixR3\include" "C:\gsim\Minuit2\include" 
"C:\gsim\muparser\include"
-+#win32:INCLUDEPATH += "C:\gsim\libcmatrixR3\include" 
"C:\gsim\Minuit2\include" "C:\gsim\muparser\include"
- 
--unix:LIBS += -lcmatrix -L/home/dch1vz/libcmatrixR3/lib  -lMinuit2Base 
-L/home/dch1vz/Minuit2/lib -lmuparser
-+#unix:LIBS += -lcmatrix -L/home/dch1vz/libcmatrixR3/lib  -lMinuit2Base 
-L/home/dch1vz/Minuit2/lib -lmuparser
- 
--win32:LIBS += -lcmatrix -L"C:\gsim\libcmatrixR3\lib" -lMinuit2 
-L"C:\gsim\Minuit2\lib" -L"C:\gsim\muparser\lib" -lmuparser
-+#win32:LIBS += -lcmatrix -L"C:\gsim\libcmatrixR3\lib" -lMinuit2 
-L"C:\gsim\Minuit2\lib" -L"C:\gsim\muparser\lib" -lmuparser
- 
- #Change directories location for libEMF (if used)
--use_emf {
--  DEFINES+=USE_EMF_OUTPUT
--  unix:LIBS +=-lEMF -L/usr/include/libEmf
--  win32:LIBS +=-lgdi32
-+#use_emf {
-+# DEFINES+=USE_EMF_OUTPUT
-+# unix:LIBS +=-lEMF -L/usr/include/libEmf
-+# win32:LIBS +=-lgdi32
-+#}
-+
-+GSIM_ROOT = .
-+!include( $$GSIM_ROOT/build.conf ) {
-+  message( "You need a build.conf file with local settings!" )
- }
- 
- 
#

[gentoo-commits] repo/gentoo:master commit in: sci-chemistry/gsim/

2016-01-24 Thread David Seifert 
commit: 5ab5074ee5eee909a9487ddf6507085a1eaa0d8d
Author: David Seifert  gentoo  org>
AuthorDate: Sun Jan 24 11:02:19 2016 +
Commit: David Seifert  gentoo  org>
CommitDate: Sun Jan 24 11:02:40 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ab5074e

sci-chemistry/gsim: Add CPU_FLAGS_X86=sse3 and depend on it

Gentoo-Bug: 555972
* Filter flags disabling SSE3 support. It is the user's
  responsibility to ensure they have SSE3 support and it to be
  enabled at compile time
* EAPI=6
* Port from 'qt4-r2' to 'qmake-utils'

Package-Manager: portage-2.2.27

 sci-chemistry/gsim/gsim-21.3-r1.ebuild | 80 ++
 1 file changed, 80 insertions(+)

diff --git a/sci-chemistry/gsim/gsim-21.3-r1.ebuild 
b/sci-chemistry/gsim/gsim-21.3-r1.ebuild
new file mode 100644
index 000..27a8e53
--- /dev/null
+++ b/sci-chemistry/gsim/gsim-21.3-r1.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit flag-o-matic qmake-utils toolchain-funcs
+
+DESCRIPTION="Visualisation and processing of experimental and simulated NMR 
spectra"
+HOMEPAGE="http://sourceforge.net/projects/gsim/;
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="cpu_flags_x86_sse3 emf opengl"
+REQUIRED_USE="cpu_flags_x86_sse3"
+
+RDEPEND="
+   dev-cpp/muParser
+   media-libs/freetype
+   sci-libs/libcmatrix
+   sci-libs/minuit
+   virtual/blas
+   dev-qt/qtsvg:4
+   emf? ( media-libs/libemf )
+   opengl? ( dev-qt/qtopengl:4 )"
+DEPEND="${RDEPEND}
+   virtual/pkgconfig"
+
+PATCHES=(
+   "${FILESDIR}/${P}-build.conf.patch"
+)
+DOCS="release.txt README_GSIM.* quickstart.* changes.log programming.*"
+
+src_prepare() {
+   edos2unix ${PN}.pro
+
+   default
+
+   # C{,XX}FLAGS need to explicitly enable SSE3 support
+   # bug #555972
+   filter-flags -mno-sse3
+   append-cflags -msse3
+   append-cxxflags -msse3
+
+   cat >> build.conf <<- EOF
+   INCLUDEPATH += "${EPREFIX}/usr/include/libcmatrixR3/" \
+   "${EPREFIX}/usr/include/Minuit2" \
+   "${EPREFIX}/usr/include"
+   LIBS += -lcmatrix  -lMinuit2 -lmuparser $($(tc-getPKG_CONFIG) --libs 
cblas)
+   EOF
+
+   use opengl && echo "CONFIG+=use_opengl" >> build.conf
+
+   if use emf; then
+   cat >> build.conf <<- EOF
+   CONFIG+=use_emf
+   DEFINES+=USE_EMF_OUTPUT
+   LIBS += -L\"${EPREFIX}/usr/include/libEMF\" -lEMF
+   EOF
+   fi
+   sed \
+   -e "s:quickstart.pdf:../share/doc/${PF}/quickstart.pdf:g" \
+   -e "s:README_GSIM.pdf:../share/doc/${PF}/README_GSIM.pdf:g" \
+   -i mainform.h || die
+}
+
+src_configure() {
+   eqmake4 ${PN}.pro
+}
+
+src_install() {
+   default
+   dobin ${PN}
+   insinto /usr/share/${PN}
+   doins -r images ${PN}.ico
+   insinto /usr/share/${PN}/ui
+   doins *.ui
+}