diff options
author | Sébastien Fabbro <bicatali@gentoo.org> | 2010-05-26 18:28:40 +0100 |
---|---|---|
committer | Sébastien Fabbro <bicatali@gentoo.org> | 2010-05-26 18:28:40 +0100 |
commit | b550d9d22ef18ed36809c00990bb84e5fc8c0b0e (patch) | |
tree | 022c519316a8754ae7b97df3a43c252dd130b616 | |
parent | coot missing link lib patch (diff) | |
download | sci-b550d9d22ef18ed36809c00990bb84e5fc8c0b0e.tar.gz sci-b550d9d22ef18ed36809c00990bb84e5fc8c0b0e.tar.bz2 sci-b550d9d22ef18ed36809c00990bb84e5fc8c0b0e.zip |
qcl fixes for gcc and deps
-rw-r--r-- | sci-physics/qcl/ChangeLog | 11 | ||||
-rw-r--r-- | sci-physics/qcl/Manifest | 9 | ||||
-rw-r--r-- | sci-physics/qcl/files/qcl-0.6.2.patch | 32 | ||||
-rw-r--r-- | sci-physics/qcl/files/qcl-0.6.3-gcc43.patch | 10 | ||||
-rw-r--r-- | sci-physics/qcl/files/qcl-0.6.3-makefile.patch | 22 | ||||
-rw-r--r-- | sci-physics/qcl/qcl-0.6.3-r1.ebuild (renamed from sci-physics/qcl/qcl-0.6.3.ebuild) | 35 |
6 files changed, 63 insertions, 56 deletions
diff --git a/sci-physics/qcl/ChangeLog b/sci-physics/qcl/ChangeLog index b7b4b50f1..aa9b85bd5 100644 --- a/sci-physics/qcl/ChangeLog +++ b/sci-physics/qcl/ChangeLog @@ -1,7 +1,14 @@ -# ChangeLog for sci-mathematics/yorick -# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 +# ChangeLog for sci-physics/qcl +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ +*qcl-0.6.3-r1 (26 May 2010) + + 26 May 2010; Sébastien Fabbro <bicatali@gentoo.org> + -files/qcl-0.6.2.patch, -qcl-0.6.3.ebuild, +qcl-0.6.3-r1.ebuild, + +files/qcl-0.6.3-gcc43.patch, +files/qcl-0.6.3-makefile.patch: + Fixed for gcc > 4.3 and dependencies, thanks Andrey Korolyov. Cleaning. + 02 May 2007; Sébastien Fabbro <bicatali@gentoo.org> -qcl-0.6.2.ebuild, +qcl-0.6.3.ebuild: Version bump and added amd64 diff --git a/sci-physics/qcl/Manifest b/sci-physics/qcl/Manifest index 2e9e32369..e7c667e5b 100644 --- a/sci-physics/qcl/Manifest +++ b/sci-physics/qcl/Manifest @@ -1,8 +1,9 @@ -AUX qcl-0.6.2.patch 925 RMD160 48b1680a84fd45d9e6be70809eb1790efa9733f3 SHA1 1e4a07ea2984f566cd970d58b4d399dfa7c732f5 SHA256 866d0a4946c22c99eadd30736424e66ccfaeba30b4adeb578965f131ab573b75 +AUX qcl-0.6.3-gcc43.patch 231 RMD160 66080077bc6750739935ea999a98e3e5b419529b SHA1 1449b18d34638632619217f40d1990852e5c6682 SHA256 9cd24b2fbc7b2406849ce0c34d681b4396a74e39b79692a011acb3a2f0dc0cd1 +AUX qcl-0.6.3-makefile.patch 757 RMD160 203ea8135ab22652d103bf40a9ebc1428e2a55f7 SHA1 401b11ddc4aa173c53f5abcb77ec58b832e462a1 SHA256 1f5d221ffa3d4efbc5444407d5541998725c37b436509eb16486b4376e6d28b9 DIST qcl-0.6.3.tgz 133786 RMD160 949a6d02224676cbd3f879801e22902347dc8296 SHA1 16ca54239d5f742a49ba400eeb766f6267a4f13a SHA256 c9f459b265ca181fdd4023cfb0d41a93a245eb5d47948a4002263384658d7cbb DIST qcldoc.pdf 435240 RMD160 6bbad4ec0c90f3bdd744014149699230a23f2b76 SHA1 97ba7d7f963ada3ea305f52ad4c61c0cba3f6df8 SHA256 a47f7e814b7848ba54d9e3749b66cc727376758dfdcb98c66531be01540f5886 DIST quprog.pdf 529617 RMD160 94f98069519b7154fe6210487fd0844645d9c6b4 SHA1 dbb8c4181ca89014299073adbecabb979201475a SHA256 d201296097d649b42da56fc713f7242b6786402ed936c28054eb530840d379ec -DIST structquprog.pdf 671665 RMD160 5ac3f75809b9339306877bd2a2c2859f96ff869d SHA1 b21684e8a3f2fd91aec6337316b3c61654243f78 SHA256 8652df84461aeec6526ee72d0419baa963569e8d7a866e95176ab11da0c133bd -EBUILD qcl-0.6.3.ebuild 1045 RMD160 9be2cf62f5232a08529b255349f5fb9c6d8406e9 SHA1 26065f64a27e1d32d8b9ae85491452dac2e4cdde SHA256 4976a103e0481921713ac6e93362e94d4c78a71734f9df047222c6a6a52133c4 -MISC ChangeLog 388 RMD160 283160c629241beb05fb3382ffe137e32ec41f50 SHA1 4244ad10d97cc7eb8e76d0b34568f635f6312a5b SHA256 c4d572cca5bcd0f95c690fd733eae4ef97067add7ce383c2eee06ae1689c2bd3 +DIST structquprog.pdf 662519 RMD160 6b1a3db3bcbeebbc0fc5e307f1208448598bb685 SHA1 06fab1a73be823b55d4902b421787ed833f99521 SHA256 0e5ea3f025c9c5eecb75ac1e408188ed1579aced1f4a45bbe7ff7b1b849d1c42 +EBUILD qcl-0.6.3-r1.ebuild 1013 RMD160 51529b61a39af766baf8024b361438eae661036e SHA1 258d1018fd901e1e7b7c3755a3a04b8d132bc169 SHA256 7f1103aa3cf5daa92019d708afd9045bac6ea9df6692c8d628eefd20211feeff +MISC ChangeLog 672 RMD160 06f37fbb83360f818ef28f1bab03277301f622d2 SHA1 64fe9e2990b5e8eef52f8fbdbdefe361d77627bc SHA256 c23353ee0a53980cc16dfe06fcc29b2a0a284d6df11ab9247203085430860c5e MISC metadata.xml 255 RMD160 3888d84eebc61a6fbe9ea73869ff58e096ff9377 SHA1 dc17c251c75cf6522bb086979083876d2f8b1620 SHA256 cbe073c7ed8462cb5b809f71393d81734ab4dec4f754022431070f1d7b58b2aa diff --git a/sci-physics/qcl/files/qcl-0.6.2.patch b/sci-physics/qcl/files/qcl-0.6.2.patch deleted file mode 100644 index 706a20016..000000000 --- a/sci-physics/qcl/files/qcl-0.6.2.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff -r -U4 qcl-0.6.2/Makefile qcl-0.6.2.new/Makefile ---- qcl-0.6.2/Makefile 2006-05-18 15:20:15.000000000 +0200 -+++ qcl-0.6.2.new/Makefile 2006-09-21 02:42:51.000000000 +0200 -@@ -29,11 +29,12 @@ - #ARCHOPT = -m32 -march=i686 - - # Debugging and optimization options - -+OPT = -g -O2 - #DEBUG = -g -pg -DQCL_DEBUG -DQC_DEBUG - #DEBUG = -g -DQCL_DEBUG -DQC_DEBUG --DEBUG = -O2 -g -DQCL_DEBUG -DQC_DEBUG -+DEBUG = $(OPT) -DQCL_DEBUG -DQC_DEBUG - #DEBUG = -O2 - - # Plotting support - # -diff -r -U4 qcl-0.6.2/qc/Makefile qcl-0.6.2.new/qc/Makefile ---- qcl-0.6.2/qc/Makefile 2006-05-18 15:20:15.000000000 +0200 -+++ qcl-0.6.2.new/qc/Makefile 2006-09-21 02:41:51.000000000 +0200 -@@ -15,9 +15,10 @@ - #ARCHOPT = -m32 -march=i686 - - # Debugging options - --DEBUG = -g -O2 -DQC_DEBUG -+OPT = -g -O2 -+DEBUG = $(OPT) -DQC_DEBUG - #DEBUG = -g -pg -DQC_DEBUG - #DEBUG = -O2 - - # Comment out if you if you want to use SysV Xrand48() linear congruential diff --git a/sci-physics/qcl/files/qcl-0.6.3-gcc43.patch b/sci-physics/qcl/files/qcl-0.6.3-gcc43.patch new file mode 100644 index 000000000..1829635b3 --- /dev/null +++ b/sci-physics/qcl/files/qcl-0.6.3-gcc43.patch @@ -0,0 +1,10 @@ +--- options.cc.orig 2010-05-26 18:06:46.000000000 +0100 ++++ options.cc 2010-05-26 18:14:33.000000000 +0100 +@@ -15,6 +15,7 @@ + + #include <stdio.h> + #include <time.h> ++#include <string.h> + + #include "options.h" + #include "error.h" diff --git a/sci-physics/qcl/files/qcl-0.6.3-makefile.patch b/sci-physics/qcl/files/qcl-0.6.3-makefile.patch new file mode 100644 index 000000000..4d13bb16a --- /dev/null +++ b/sci-physics/qcl/files/qcl-0.6.3-makefile.patch @@ -0,0 +1,22 @@ +--- Makefile.orig 2010-05-26 18:06:39.000000000 +0100 ++++ Makefile 2010-05-26 18:17:08.000000000 +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) diff --git a/sci-physics/qcl/qcl-0.6.3.ebuild b/sci-physics/qcl/qcl-0.6.3-r1.ebuild index e4c9d5619..e101fae5a 100644 --- a/sci-physics/qcl/qcl-0.6.3.ebuild +++ b/sci-physics/qcl/qcl-0.6.3-r1.ebuild @@ -1,7 +1,8 @@ -# Copyright 1999-2007 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: $ +EAPI=2 inherit flag-o-matic eutils DESCRIPTION="Quantum Computation Language with an emulator of a quantum computer" @@ -10,31 +11,29 @@ SLOT="0" LICENSE="GPL-2" KEYWORDS="~x86 ~amd64" IUSE="doc" -RESTRICT="nomirror" + 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 )" -DEPENDS="media-libs/plotutils" - -src_unpack() { - unpack ${A} - cd ${S} - epatch "${FILESDIR}/qcl-0.6.2.patch" -} +DEPEND="media-libs/plotutils + sys-libs/ncurses + sys-libs/readline" +RDEPEND="${DEPEND}" -src_compile() { - strip-flags - emake QCLDIR="/usr/share/${PN}" OPT="${CXXFLAGS}" || die "emake failed" +src_prepare() { + epatch "${FILESDIR}"/${P}-gcc43.patch + epatch "${FILESDIR}"/${P}-makefile.patch } src_install() { - emake QCLDIR="${D}/usr/share/${PN}" QCLBIN="${D}/usr/bin" install \ - || die "install failed" + emake \ + QCLDIR="${D}/usr/share/${PN}" \ + QCLBIN="${D}/usr/bin" install \ + || die "emake install failed" dodoc README CHANGES - if use doc ; then - insinto "/usr/share/doc/${PF}" - cd "${DISTDIR}" - doins structquprog.pdf qcldoc.pdf quprog.pdf + if use doc; then + insinto /usr/share/doc/${PF} + doins "${DISTDIR}"/{structquprog,qcldoc,quprog}.pdf || die fi } |