From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id E38A81382C5 for ; Tue, 3 Apr 2018 16:34:27 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0E8BCE0B40; Tue, 3 Apr 2018 16:34:26 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C7F92E0B40 for ; Tue, 3 Apr 2018 16:34:25 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0599C335D65 for ; Tue, 3 Apr 2018 16:34:24 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5CD4A275 for ; Tue, 3 Apr 2018 16:34:22 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1522773067.72f97028e511cf2d4331aeda84edca27bb186888.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-chemistry/gsim/, sci-chemistry/gsim/files/, profiles/ X-VCS-Repository: repo/gentoo X-VCS-Files: profiles/package.mask sci-chemistry/gsim/Manifest sci-chemistry/gsim/files/gsim-21.3-build.conf.patch sci-chemistry/gsim/gsim-21.3-r1.ebuild sci-chemistry/gsim/gsim-21.3.ebuild sci-chemistry/gsim/metadata.xml X-VCS-Directories: sci-chemistry/gsim/ profiles/ sci-chemistry/gsim/files/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 72f97028e511cf2d4331aeda84edca27bb186888 X-VCS-Branch: master Date: Tue, 3 Apr 2018 16:34:22 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 03178d6b-460b-4314-b2e4-5a5192135fc9 X-Archives-Hash: 95bdf84de88ab1989d3e8f654892bbaa commit: 72f97028e511cf2d4331aeda84edca27bb186888 Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Apr 3 16:31:07 2018 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Apr 3 16:31:07 2018 +0000 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..00000000000 --- 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..00000000000 --- 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..00000000000 --- 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=" - 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 -} diff --git a/sci-chemistry/gsim/gsim-21.3.ebuild b/sci-chemistry/gsim/gsim-21.3.ebuild deleted file mode 100644 index 4aa1830ac64..00000000000 --- a/sci-chemistry/gsim/gsim-21.3.ebuild +++ /dev/null @@ -1,66 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit eutils qt4-r2 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="emf opengl" - -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 - - qt4-r2_src_prepare - - 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_install() { - qt4-r2_src_install - dobin ${PN} - insinto /usr/share/${PN} - doins -r images ${PN}.ico - insinto /usr/share/${PN}/ui - doins *.ui -} diff --git a/sci-chemistry/gsim/metadata.xml b/sci-chemistry/gsim/metadata.xml deleted file mode 100644 index 43fbb821ad1..00000000000 --- a/sci-chemistry/gsim/metadata.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - sci-chemistry@gentoo.org - Gentoo Chemistry Project - - - Support for .emf export - - - gsim - -