[gentoo-commits] proj/sci:master commit in: sci-physics/qcl/files/, sci-physics/qcl/

2019-01-29 Thread Andrew Savchenko 
commit: f7e784db2ef31b9df95670407c28cd6d740a597a
Author: Andrew Savchenko  gentoo  org>
AuthorDate: Wed Jan 30 05:41:12 2019 +
Commit: Andrew Savchenko  gentoo  org>
CommitDate: Wed Jan 30 05:41:12 2019 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=f7e784db

sci-physics/qcl: multiple improvements

- Update to EAPI 7
- Fix dependencies (RDEPEND were wrong)
- Install additional documentation
- Respect CFLAGS for qc lib as well
- Fix install paths so that qcl can find its lib

Package-Manager: Portage-2.3.58, Repoman-2.3.12
Signed-off-by: Andrew Savchenko  gentoo.org>

 sci-physics/qcl/files/qcl-0.6.4-Makefile.patch | 69 ++
 sci-physics/qcl/qcl-0.6.4-r2.ebuild| 55 
 2 files changed, 124 insertions(+)

diff --git a/sci-physics/qcl/files/qcl-0.6.4-Makefile.patch 
b/sci-physics/qcl/files/qcl-0.6.4-Makefile.patch
new file mode 100644
index 0..bbc3f0abd
--- /dev/null
+++ b/sci-physics/qcl/files/qcl-0.6.4-Makefile.patch
@@ -0,0 +1,69 @@
+diff --git a/Makefile b/Makefile
+index 2735f71..80f9b30 100644
+--- a/Makefile
 b/Makefile
+@@ -14,11 +14,11 @@ VERSION=0.6.4
+ 
+ # Directory for Standard .qcl files
+ 
+-QCLDIR = /usr/local/lib/qcl
++QCLDIR = /usr/lib/qcl
+ 
+ # Path for qcl binaries
+ 
+-QCLBIN = /usr/local/bin
++QCLBIN = /usr/bin
+ 
+ ARCH = `g++ -dumpmachine || echo bin`
+ 
+@@ -32,7 +32,7 @@ ARCH = `g++ -dumpmachine || echo bin`
+ 
+ #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 @@ QCLINC = lib
+ 
+ #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 @@ $(QCLIB):
+ 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/qc/Makefile b/qc/Makefile
+index 191ffe5..79724a9 100644
+--- a/qc/Makefile
 b/qc/Makefile
+@@ -16,7 +16,7 @@
+ 
+ # Debugging options
+ 
+-DEBUG = -g -O2 -DQC_DEBUG
++#DEBUG = -g -O2 -DQC_DEBUG
+ #DEBUG = -g -pg -DQC_DEBUG
+ #DEBUG = -O2
+ 
+@@ -25,7 +25,7 @@ DEBUG = -g -O2 -DQC_DEBUG
+ 
+ #PRGOPT = -DQC_USE_RAND48
+ 
+-CXXFLAGS = $(ARCHOPT) -c -pedantic -Wall $(DEBUG) $(PRGOPT)
++CXXFLAGS += $(ARCHOPT) -c -pedantic -Wall $(DEBUG) $(PRGOPT)
+ 
+ LDFLAGS = $(ARCHOPT) -L. -lm -lqc
+ 

diff --git a/sci-physics/qcl/qcl-0.6.4-r2.ebuild 
b/sci-physics/qcl/qcl-0.6.4-r2.ebuild
new file mode 100644
index 0..b7eb2536b
--- /dev/null
+++ b/sci-physics/qcl/qcl-0.6.4-r2.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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
+   https://dev.gentoo.org/~bircoph/distfiles/0211100.pdf -> 
ccquprog.pdf
+   )"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc plotutils readline"
+
+BDEPEND="
+   sys-devel/bison
+   sys-devel/flex"
+DEPEND="
+   plotutils? ( media-libs/plotutils[X,png] )
+   readline? (
+   sys-libs/ncurses:0=
+   sys-libs/readline:0=
+   )"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+   "${FILESDIR}/${PN}"-0.6.3-gcc43.patch
+   "${FILESDIR}/${P}"-Makefile.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/lib/${PN}" \
+   QCLBIN="${D}/usr/bin" \
+   install
+   dodoc CHANGES README
+   use doc && dodoc "${DISTDIR}/"{ccquprog,structquprog,qcldoc,quprog}.pdf
+}

[gentoo-commits] proj/sci:master commit in: sci-physics/qcl/files/, sci-physics/qcl/

2019-01-29 Thread Andrew Savchenko 
commit: 58115cd218e93008bfb73cef6ade2e503be4af60
Author: Andrew Savchenko  gentoo  org>
AuthorDate: Wed Jan 30 05:44:11 2019 +
Commit: Andrew Savchenko  gentoo  org>
CommitDate: Wed Jan 30 05:44:11 2019 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=58115cd2

sci-physics/qcl: remove old versions

Package-Manager: Portage-2.3.58, Repoman-2.3.12
Signed-off-by: Andrew Savchenko  gentoo.org>

 sci-physics/qcl/files/qcl-0.6.4-makefile.patch| 22 --
 sci-physics/qcl/files/qcl-0.6.4-makefile_v2.patch | 31 -
 sci-physics/qcl/qcl-0.6.4-r1.ebuild   | 53 ---
 sci-physics/qcl/qcl-0.6.4.ebuild  | 44 ---
 4 files changed, 150 deletions(-)

diff --git a/sci-physics/qcl/files/qcl-0.6.4-makefile.patch 
b/sci-physics/qcl/files/qcl-0.6.4-makefile.patch
deleted file mode 100644
index e73cee420..0
--- a/sci-physics/qcl/files/qcl-0.6.4-makefile.patch
+++ /dev/null
@@ -1,22 +0,0 @@
 Makefile
-+++ 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)\""
-+LDFLAGS += -L$(QCDIR) $(PLLIB) -lm -lfl -lqc $(RLLIB) 
- 
- FILESCC = $(wildcard *.cc)
- FILESH = $(wildcard *.h)

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
deleted file mode 100644
index 74b05c5f5..0
--- a/sci-physics/qcl/files/qcl-0.6.4-makefile_v2.patch
+++ /dev/null
@@ -1,31 +0,0 @@
 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
deleted file mode 100644
index feb49f2a6..0
--- a/sci-physics/qcl/qcl-0.6.4-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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
-   dodoc CHANGES README
-   use doc && dodoc "${DISTDIR}/"{structquprog,qcldoc,quprog}.pdf
-}

diff --git a/sci-physics/qcl/qcl-0.6.4.ebuild b/sci-physics/qcl/qcl-0.6.4.ebuild
deleted file mode 100644
index c3788af50..0
--- a/sci-physics/qcl/qcl-0.6.4.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General

[gentoo-commits] proj/sci:master commit in: sci-physics/qcl/

2016-06-03 Thread Andrew Savchenko 
commit: eb760839626bdcc3989a3e6490d1e3379c06
Author: Andrew Savchenko  gmail  com>
AuthorDate: Fri Jun  3 06:50:50 2016 +
Commit: Andrew Savchenko  gentoo  org>
CommitDate: Fri Jun  3 06:50:50 2016 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=eb76

sci-physics/qcl: fix docs install

Package-Manager: portage-2.3.0_rc1
Signed-off-by: Andrew Savchenko  gentoo.org>

 sci-physics/qcl/qcl-0.6.4-r1.ebuild | 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/sci-physics/qcl/qcl-0.6.4-r1.ebuild 
b/sci-physics/qcl/qcl-0.6.4-r1.ebuild
index 0cf48e4..4463212 100644
--- a/sci-physics/qcl/qcl-0.6.4-r1.ebuild
+++ b/sci-physics/qcl/qcl-0.6.4-r1.ebuild
@@ -47,6 +47,8 @@ src_configure() {
 src_install() {
emake \
QCLDIR="${D}/usr/share/${PN}" \
-   QCLBIN="${D}/usr/bin" install
-   use doc && dodoc {structquprog,qcldoc,quprog}.pdf
+   QCLBIN="${D}/usr/bin" \
+   install
+   dodoc CHANGES README
+   use doc && dodoc "${DISTDIR}/"{structquprog,qcldoc,quprog}.pdf
 }

[gentoo-commits] proj/sci:master commit in: sci-physics/qcl/files/

2016-06-02 Thread Andrew Savchenko 
commit: 4f35e85781e85df112057837789541980ae1d170
Author: Andrew Savchenko  gmail  com>
AuthorDate: Thu Jun  2 12:04:15 2016 +
Commit: Andrew Savchenko  gentoo  org>
CommitDate: Thu Jun  2 12:04:15 2016 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=4f35e857

sci-physics/qcl: adjust patch level for eapply defaults

Package-Manager: portage-2.3.0_rc1
Signed-off-by: Andrew Savchenko  gentoo.org>

 sci-physics/qcl/files/qcl-0.6.3-gcc43.patch | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sci-physics/qcl/files/qcl-0.6.3-gcc43.patch 
b/sci-physics/qcl/files/qcl-0.6.3-gcc43.patch
index 1829635..8ec4e62 100644
--- a/sci-physics/qcl/files/qcl-0.6.3-gcc43.patch
+++ b/sci-physics/qcl/files/qcl-0.6.3-gcc43.patch
@@ -1,5 +1,5 @@
 options.cc.orig2010-05-26 18:06:46.0 +0100
-+++ options.cc 2010-05-26 18:14:33.0 +0100
+--- a/options.cc   2010-05-26 18:06:46.0 +0100
 b/options.cc   2010-05-26 18:14:33.0 +0100
 @@ -15,6 +15,7 @@
  
  #include

[gentoo-commits] proj/sci:master commit in: sci-physics/qcl/, sci-physics/qcl/files/

2016-06-02 Thread Andrew Savchenko 
commit: 5e68a3da81c6d9bf49e34befae47d3e497c214cb
Author: Andrew Savchenko  gmail  com>
AuthorDate: Thu Jun  2 17:46:26 2016 +
Commit: Andrew Savchenko  gentoo  org>
CommitDate: Thu Jun  2 17:46:26 2016 +
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  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 000..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 000..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
+}

[gentoo-commits] proj/sci:master commit in: sci-physics/qcl/files/

2016-06-02 Thread Andrew Savchenko 
commit: 1d3de387e513f81e86929868cc727e5e1fb53de2
Author: Andrew Savchenko  gmail  com>
AuthorDate: Thu Jun  2 10:26:45 2016 +
Commit: Andrew Savchenko  gentoo  org>
CommitDate: Thu Jun  2 10:26:45 2016 +
URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=1d3de387

sci-physics/qcl: remove unused patch

Package-Manager: portage-2.3.0_rc1
Signed-off-by: Andrew Savchenko  gentoo.org>

 sci-physics/qcl/files/qcl-0.6.3-makefile.patch | 22 --
 1 file changed, 22 deletions(-)

diff --git a/sci-physics/qcl/files/qcl-0.6.3-makefile.patch 
b/sci-physics/qcl/files/qcl-0.6.3-makefile.patch
deleted file mode 100644
index 4d13bb1..000
--- a/sci-physics/qcl/files/qcl-0.6.3-makefile.patch
+++ /dev/null
@@ -1,22 +0,0 @@
 Makefile.orig  2010-05-26 18:06:39.0 +0100
-+++ Makefile   2010-05-26 18:17:08.0 +0100
-@@ -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 
-@@ -73,8 +73,8 @@
- 
- #CXX = g++
- #CPP = $(CC) -E
--CXXFLAGS = -c $(ARCHOPT) -Wall $(DEBUG) $(PLOPT) $(RLOPT) $(IRQOPT) 
-I$(QCDIR) -DDEF_INCLUDE_PATH="\"$(QCLDIR)\""
--LDFLAGS = $(ARCHOPT) -L$(QCDIR) $(DEBUG) $(PLLIB) -lm -lfl -lqc $(RLLIB) 
-+CXXFLAGS += -c $(PLOPT) $(DEBUG) $(RLOPT) $(IRQOPT) -I$(QCDIR) 
-DDEF_INCLUDE_PATH="\"$(QCLDIR)\""
-+LDFLAGS += -L$(QCDIR) $(PLLIB) -lm -lfl -lqc $(RLLIB) 
- 
- FILESCC = $(wildcard *.cc)
- FILESH = $(wildcard *.h)

[gentoo-commits] proj/sci:master commit in: sci-physics/qcl/

2015-01-12 Thread Christoph Junghans 
commit: 73d5c6cedc0ca09111b3fa61df413fa1166dc9ef
Author: Marius Brehler marbre AT linux DOT sungazer DOT de
AuthorDate: Sun Jan 11 10:40:02 2015 +
Commit: Christoph Junghans ottxor AT gentoo DOT org
CommitDate: Sun Jan 11 10:40:02 2015 +
URL:http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=73d5c6ce

sci-physics/qcl: Move to EAPI=5, cleanup ebuilds

---
 sci-physics/qcl/ChangeLog   |  6 +-
 sci-physics/qcl/qcl-0.6.3-r1.ebuild | 18 +-
 sci-physics/qcl/qcl-0.6.4.ebuild| 11 ++-
 3 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/sci-physics/qcl/ChangeLog b/sci-physics/qcl/ChangeLog
index 587799c..d01d0e9 100644
--- a/sci-physics/qcl/ChangeLog
+++ b/sci-physics/qcl/ChangeLog
@@ -1,7 +1,11 @@
 # ChangeLog for sci-physics/qcl
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  11 Jan 2015; Marius Brehler mar...@linux.sungazer.de,
+  qcl-0.6.4.ebuild, qcl-0.6.3-r1.ebuild:
+  Move to EAPI=5, cleanup ebuilds
+
 *qcl-0.6.4 (02 Jun 2014)
 
   02 Jun 2014; Jauhien Piatlicki jauh...@gentoo.org +qcl-0.6.4.ebuild,

diff --git a/sci-physics/qcl/qcl-0.6.3-r1.ebuild 
b/sci-physics/qcl/qcl-0.6.3-r1.ebuild
index 6419134..22da81b 100644
--- a/sci-physics/qcl/qcl-0.6.3-r1.ebuild
+++ b/sci-physics/qcl/qcl-0.6.3-r1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=2
+EAPI=5
+
 inherit eutils flag-o-matic
 
 DESCRIPTION=Quantum Computation Language with an emulator of a quantum 
computer
@@ -21,19 +22,18 @@ DEPEND=media-libs/plotutils
sys-libs/readline
 RDEPEND=${DEPEND}
 
-src_prepare() {
-   epatch ${FILESDIR}/${P}-gcc43.patch
-   epatch ${FILESDIR}/${P}-makefile.patch
-}
+PATCHES=(
+   ${FILESDIR}/${P}-gcc43.patch
+   ${FILESDIR}/${P}-makefile.patch
+)
 
 src_install() {
emake \
QCLDIR=${D}/usr/share/${PN} \
-   QCLBIN=${D}/usr/bin install \
-   || die emake install failed
+   QCLBIN=${D}/usr/bin install
dodoc README CHANGES
if use doc; then
insinto /usr/share/doc/${PF}
-   doins ${DISTDIR}/{structquprog,qcldoc,quprog}.pdf || die
+   doins ${DISTDIR}/{structquprog,qcldoc,quprog}.pdf
fi
 }

diff --git a/sci-physics/qcl/qcl-0.6.4.ebuild b/sci-physics/qcl/qcl-0.6.4.ebuild
index 9338be1..cf23884 100644
--- a/sci-physics/qcl/qcl-0.6.4.ebuild
+++ b/sci-physics/qcl/qcl-0.6.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -22,9 +22,10 @@ DEPEND=media-libs/plotutils
sys-libs/readline
 RDEPEND=${DEPEND}
 
-src_prepare() {
-   epatch ${FILESDIR}/${PN}-0.6.3-gcc43.patch 
${FILESDIR}/${P}-makefile.patch
-}
+PATCHES=(
+   ${FILESDIR}/${PN}-0.6.3-gcc43.patch
+   ${FILESDIR}/${P}-makefile.patch
+)
 
 src_install() {
emake \
@@ -33,6 +34,6 @@ src_install() {
dodoc README CHANGES
if use doc; then
insinto /usr/share/doc/${PF}
-   doins ${DISTDIR}/{structquprog,qcldoc,quprog}.pdf || die
+   doins ${DISTDIR}/{structquprog,qcldoc,quprog}.pdf
fi
 }

[gentoo-commits] proj/sci:master commit in: sci-physics/qcl/

2015-01-12 Thread Christoph Junghans 
commit: 81a30611845473eb013492cac85f2c85ce31a677
Author: Marius Brehler marbre AT linux DOT sungazer DOT de
AuthorDate: Sun Jan 11 11:10:07 2015 +
Commit: Christoph Junghans ottxor AT gentoo DOT org
CommitDate: Sun Jan 11 11:10:07 2015 +
URL:http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=81a30611

sci-physics/qcl: Fix applying of patches

---
 sci-physics/qcl/qcl-0.6.3-r1.ebuild | 4 
 sci-physics/qcl/qcl-0.6.4.ebuild| 4 
 2 files changed, 8 insertions(+)

diff --git a/sci-physics/qcl/qcl-0.6.3-r1.ebuild 
b/sci-physics/qcl/qcl-0.6.3-r1.ebuild
index 22da81b..eaca7e1 100644
--- a/sci-physics/qcl/qcl-0.6.3-r1.ebuild
+++ b/sci-physics/qcl/qcl-0.6.3-r1.ebuild
@@ -27,6 +27,10 @@ PATCHES=(
${FILESDIR}/${P}-makefile.patch
 )
 
+src_prepare() {
+   epatch ${PATCHES[@]}
+}
+
 src_install() {
emake \
QCLDIR=${D}/usr/share/${PN} \

diff --git a/sci-physics/qcl/qcl-0.6.4.ebuild b/sci-physics/qcl/qcl-0.6.4.ebuild
index cf23884..035923b 100644
--- a/sci-physics/qcl/qcl-0.6.4.ebuild
+++ b/sci-physics/qcl/qcl-0.6.4.ebuild
@@ -27,6 +27,10 @@ PATCHES=(
${FILESDIR}/${P}-makefile.patch
 )
 
+src_prepare() {
+   epatch ${PATCHES[@]}
+}
+
 src_install() {
emake \
QCLDIR=${D}/usr/share/${PN} \

[gentoo-commits] proj/sci:master commit in: sci-physics/qcl/

2015-01-12 Thread Christoph Junghans 
commit: 011bb014c56877ae0c921f2476352f62644f8590
Author: Marius Brehler marbre AT linux DOT sungazer DOT de
AuthorDate: Sun Jan 11 11:13:01 2015 +
Commit: Christoph Junghans ottxor AT gentoo DOT org
CommitDate: Sun Jan 11 11:13:01 2015 +
URL:http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=011bb014

sci-physics/qcl: Make use of dodoc

---
 sci-physics/qcl/qcl-0.6.3-r1.ebuild | 3 +--
 sci-physics/qcl/qcl-0.6.4.ebuild| 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/sci-physics/qcl/qcl-0.6.3-r1.ebuild 
b/sci-physics/qcl/qcl-0.6.3-r1.ebuild
index eaca7e1..c67baa6 100644
--- a/sci-physics/qcl/qcl-0.6.3-r1.ebuild
+++ b/sci-physics/qcl/qcl-0.6.3-r1.ebuild
@@ -37,7 +37,6 @@ src_install() {
QCLBIN=${D}/usr/bin install
dodoc README CHANGES
if use doc; then
-   insinto /usr/share/doc/${PF}
-   doins ${DISTDIR}/{structquprog,qcldoc,quprog}.pdf
+   dodoc {structquprog,qcldoc,quprog}.pdf
fi
 }

diff --git a/sci-physics/qcl/qcl-0.6.4.ebuild b/sci-physics/qcl/qcl-0.6.4.ebuild
index 035923b..a709a58 100644
--- a/sci-physics/qcl/qcl-0.6.4.ebuild
+++ b/sci-physics/qcl/qcl-0.6.4.ebuild
@@ -37,7 +37,6 @@ src_install() {
QCLBIN=${D}/usr/bin install
dodoc README CHANGES
if use doc; then
-   insinto /usr/share/doc/${PF}
-   doins ${DISTDIR}/{structquprog,qcldoc,quprog}.pdf
+   dodoc {structquprog,qcldoc,quprog}.pdf
fi
 }

[gentoo-commits] proj/sci:master commit in: sci-physics/qcl/files/, sci-physics/qcl/

2014-06-02 Thread Jauhien Piatlicki 
commit: 8e1c26dee1b315620a9b4623cf9431e4c8a5a019
Author: Jauhien Piatlicki jauhien AT gentoo DOT org
AuthorDate: Mon Jun  2 17:08:17 2014 +
Commit: Jauhien Piatlicki jauhien AT gentoo DOT org
CommitDate: Mon Jun  2 17:08:17 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=8e1c26de

sci-physics/qcl: version bump to 0.6.4

---
 sci-physics/qcl/ChangeLog  |  8 +-
 sci-physics/qcl/files/qcl-0.6.4-makefile.patch | 22 +++
 sci-physics/qcl/qcl-0.6.4.ebuild   | 38 ++
 3 files changed, 67 insertions(+), 1 deletion(-)

diff --git a/sci-physics/qcl/ChangeLog b/sci-physics/qcl/ChangeLog
index aa9b85b..587799c 100644
--- a/sci-physics/qcl/ChangeLog
+++ b/sci-physics/qcl/ChangeLog
@@ -1,7 +1,13 @@
 # ChangeLog for sci-physics/qcl
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*qcl-0.6.4 (02 Jun 2014)
+
+  02 Jun 2014; Jauhien Piatlicki jauh...@gentoo.org +qcl-0.6.4.ebuild,
+  +files/qcl-0.6.4-makefile.patch:
+  version bump
+
 *qcl-0.6.3-r1 (26 May 2010)
 
   26 May 2010; Sébastien Fabbro bicat...@gentoo.org

diff --git a/sci-physics/qcl/files/qcl-0.6.4-makefile.patch 
b/sci-physics/qcl/files/qcl-0.6.4-makefile.patch
new file mode 100644
index 000..e73cee4
--- /dev/null
+++ b/sci-physics/qcl/files/qcl-0.6.4-makefile.patch
@@ -0,0 +1,22 @@
+--- Makefile
 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)\
++LDFLAGS += -L$(QCDIR) $(PLLIB) -lm -lfl -lqc $(RLLIB) 
+ 
+ FILESCC = $(wildcard *.cc)
+ FILESH = $(wildcard *.h)

diff --git a/sci-physics/qcl/qcl-0.6.4.ebuild b/sci-physics/qcl/qcl-0.6.4.ebuild
new file mode 100644
index 000..9338be1
--- /dev/null
+++ b/sci-physics/qcl/qcl-0.6.4.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION=Quantum Computation Language with an emulator of a quantum 
computer
+HOMEPAGE=http://tph.tuwien.ac.at/~oemer/qcl.html;
+SLOT=0
+LICENSE=GPL-2
+KEYWORDS=~amd64 ~x86
+IUSE=doc
+
+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 )
+DEPEND=media-libs/plotutils
+   sys-libs/ncurses
+   sys-libs/readline
+RDEPEND=${DEPEND}
+
+src_prepare() {
+   epatch ${FILESDIR}/${PN}-0.6.3-gcc43.patch 
${FILESDIR}/${P}-makefile.patch
+}
+
+src_install() {
+   emake \
+   QCLDIR=${D}/usr/share/${PN} \
+   QCLBIN=${D}/usr/bin install
+   dodoc README CHANGES
+   if use doc; then
+   insinto /usr/share/doc/${PF}
+   doins ${DISTDIR}/{structquprog,qcldoc,quprog}.pdf || die
+   fi
+}