Merge branch 'upstream-master' into gentoo-master

4 files changed, 72 insertions, 5 deletions

diff --git a/sci-physics/qcl/ChangeLog b/sci-physics/qcl/ChangeLog
index aa9b85bd5..587799cd7 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 <jauhien@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 <bicatali@gentoo.org>
diff --git a/sci-physics/qcl/Manifest b/sci-physics/qcl/Manifest
index 8f7597e7f..50320e1a8 100644
--- a/sci-physics/qcl/Manifest
+++ b/sci-physics/qcl/Manifest
@@ -1,4 +1,5 @@
-DIST qcl-0.6.3.tgz 133786 SHA256 c9f459b265ca181fdd4023cfb0d41a93a245eb5d47948a4002263384658d7cbb
-DIST qcldoc.pdf 435240 SHA256 a47f7e814b7848ba54d9e3749b66cc727376758dfdcb98c66531be01540f5886
-DIST quprog.pdf 529617 SHA256 d201296097d649b42da56fc713f7242b6786402ed936c28054eb530840d379ec
-DIST structquprog.pdf 662519 SHA256 0e5ea3f025c9c5eecb75ac1e408188ed1579aced1f4a45bbe7ff7b1b849d1c42
+DIST qcl-0.6.3.tgz 133786 SHA256 c9f459b265ca181fdd4023cfb0d41a93a245eb5d47948a4002263384658d7cbb SHA512 7583dd393ae7c4c76b89ebeee2447f79f7b11590da20561a2ee13dc78c4a7132adc8169fe326f77de3b8b8cf1853d959f7e3c7df1db1efc61edcae77cf8dfa18 WHIRLPOOL 323b100bf69f2cb274b3e9d1e6afaebdbefb4282e3b106e045662738d16f62b4937b6b477522a66f59206f6aff83d4883d0efbe6d1d2e8a51ecec20e01a9ea5c
+DIST qcl-0.6.4.tgz 137396 SHA256 ff4d4899c5995bd75601e8125312ce20059f065326c29467b7f5dfa3a87d45f4 SHA512 389b6eb14af40e7061b999cadd94e4d406e48ecd0c339f0460efb100de00d2f2e055b8e6066e5526778e3cd080fa3f3d14fd26cca7ee90ad40f71c250587eee4 WHIRLPOOL a946515dee9a07ad81dbb2ce30df636258f6fe3776db5d5256d7d144ec839d425ba48fefff9ac0321e5e7009d9cd72291798101586e93d6b1a1112bf4a092b5b
+DIST qcldoc.pdf 435240 SHA256 a47f7e814b7848ba54d9e3749b66cc727376758dfdcb98c66531be01540f5886 SHA512 077bc1069e108e97805e597c70f3f5283e99db4f0e4b54539ab10b8fa9ee10cc4f255a99803fb966b30e30a155ded3243423a5a8c5196d3642097c27c1b79fd6 WHIRLPOOL fdbed632853669c2f228113f0a3c96138cd539f02db7a47a55d3e7baf3e56750f9077ed75aa12e68f4a12993cc9fac8243b8c8ec3ec1d43e12d4b62d71f4aa36
+DIST quprog.pdf 528894 SHA256 071d1e6be857a378584e13d680c86de5a6f40606c769bcfc396f6fff5296ed80 SHA512 7cac2bd9344b39254dcd224a06ea3e35f0df0f9b8d58675f0734a085631578a3d96298bc2d9739f0b5388e71554813585c15ea3fd531170dff6a9aea5b6cf3ec WHIRLPOOL 13af398724e130551150d88367bcb59f2b4994b27507127044c4a00c3c004736872fe88e105316b0bacdbbd7a501ab36d4e3ea6e2209207ed2dda339068563ac
+DIST structquprog.pdf 662519 SHA256 0e5ea3f025c9c5eecb75ac1e408188ed1579aced1f4a45bbe7ff7b1b849d1c42 SHA512 05c094df1244098acdc3ce0e8ec98638f37351b58244dacd6b67d5e55fe4b516c95e823bed4af7127b95d729191a7a2150597f27d08a4d5bae7189ae3848e8b6 WHIRLPOOL 093de384efa2672136c4194c6bcc49f5e1acffb84acef40fa438ce3142d6bcf34f5b5375b3d2ee2a3827c7f9c93e06abd1fdb227a65594112c604582e80c4058
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 000000000..e73cee420
--- /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 000000000..9338be1cd
--- /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
+}