commit: 5e68a3da81c6d9bf49e34befae47d3e497c214cb Author: Andrew Savchenko <bircoph <AT> gmail <DOT> com> AuthorDate: Thu Jun 2 17:46:26 2016 +0000 Commit: Andrew Savchenko <bircoph <AT> gentoo <DOT> org> CommitDate: Thu Jun 2 17:46:26 2016 +0000 URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=5e68a3da
sci-physics/qcl: rectify ebuild - bump to EAPI 6; - add missing bison/flex deps; - plotutils and readline deps are now controlled by USE flags; - apply LDFLAGS properly (before list of object files). Package-Manager: portage-2.3.0_rc1 Signed-off-by: Andrew Savchenko <bircoph <AT> gentoo.org> sci-physics/qcl/files/qcl-0.6.4-makefile_v2.patch | 31 ++++++++++++++ sci-physics/qcl/qcl-0.6.4-r1.ebuild | 52 +++++++++++++++++++++++ 2 files changed, 83 insertions(+) diff --git a/sci-physics/qcl/files/qcl-0.6.4-makefile_v2.patch b/sci-physics/qcl/files/qcl-0.6.4-makefile_v2.patch new file mode 100644 index 0000000..74b05c5 --- /dev/null +++ b/sci-physics/qcl/files/qcl-0.6.4-makefile_v2.patch @@ -0,0 +1,31 @@ +--- a/Makefile ++++ b/Makefile +@@ -32,7 +32,7 @@ + + #DEBUG = -g -pg -DQCL_DEBUG -DQC_DEBUG + #DEBUG = -g -DQCL_DEBUG -DQC_DEBUG +-DEBUG = -O2 -g -DQCL_DEBUG -DQC_DEBUG ++DEBUG = -DQCL_DEBUG -DQC_DEBUG + #DEBUG = -O2 + + # Plotting support +@@ -81,8 +81,8 @@ + + #CXX = g++ + #CPP = $(CC) -E +-CXXFLAGS = -c $(ARCHOPT) $(DEBUG) $(PLOPT) $(RLOPT) $(IRQOPT) $(ENCOPT) -I$(QCDIR) -DDEF_INCLUDE_PATH="\"$(QCLDIR)\"" +-LDFLAGS = $(ARCHOPT) -L$(QCDIR) $(DEBUG) $(PLLIB) -lm -lfl -lqc $(RLLIB) ++CXXFLAGS += -c $(DEBUG) $(PLOPT) $(RLOPT) $(IRQOPT) $(ENCOPT) -I$(QCDIR) -DDEF_INCLUDE_PATH="\"$(QCLDIR)\"" ++LIBS = -L$(QCDIR) $(PLLIB) -lm -lfl -lqc $(RLLIB) + + FILESCC = $(wildcard *.cc) + FILESH = $(wildcard *.h) +@@ -127,7 +127,7 @@ + build: qcl $(QCLINC)/default.qcl + + qcl: $(OBJECTS) qcl.o $(QCLIB) +- $(CXX) $(OBJECTS) qcl.o $(LDFLAGS) -o qcl ++ $(CXX) $(LDFLAGS) $(OBJECTS) qcl.o $(LIBS) -o qcl + + $(QCLINC)/default.qcl: extern.cc + grep "^//!" extern.cc | cut -c5- > $(QCLINC)/default.qcl diff --git a/sci-physics/qcl/qcl-0.6.4-r1.ebuild b/sci-physics/qcl/qcl-0.6.4-r1.ebuild new file mode 100644 index 0000000..0cf48e4 --- /dev/null +++ b/sci-physics/qcl/qcl-0.6.4-r1.ebuild @@ -0,0 +1,52 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +DESCRIPTION="Quantum Computation Language with an emulator of a quantum computer" +HOMEPAGE="http://tph.tuwien.ac.at/~oemer/qcl.html" +SRC_URI=" + http://tph.tuwien.ac.at/~oemer/tgz/${P}.tgz + doc? ( + http://tph.tuwien.ac.at/~oemer/doc/structquprog.pdf + http://tph.tuwien.ac.at/~oemer/doc/qcldoc.pdf + http://tph.tuwien.ac.at/~oemer/doc/quprog.pdf + )" + +SLOT="0" +LICENSE="GPL-2" +KEYWORDS="~amd64 ~x86" +IUSE="doc plotutils readline" + +REPEND=" + plotutils? ( media-libs/plotutils[X,png] ) + readline? ( + sys-libs/ncurses:0= + sys-libs/readline:0= + )" +DEPEND="${DEPEND} + sys-devel/bison + sys-devel/flex" + +PATCHES=( + "${FILESDIR}/${PN}"-0.6.3-gcc43.patch + "${FILESDIR}/${P}"-makefile_v2.patch +) + +src_configure() { + # there is no configure, Makefile must be modified + if ! use plotutils; then + sed -i 's/^PL/#PL/' Makefile || die + fi + if ! use readline; then + sed -i 's/^RL/#RL/' Makefile || die + fi +} + +src_install() { + emake \ + QCLDIR="${D}/usr/share/${PN}" \ + QCLBIN="${D}/usr/bin" install + use doc && dodoc {structquprog,qcldoc,quprog}.pdf +}