[gentoo-commits] proj/sci:master commit in: dev-ml/zarith/
commit: 25ebbaaa45bdc4904c002de89a56c0d45f484720 Author: Jonathan-Christofer Demay jcdemay AT gmail DOT com AuthorDate: Sun Jul 20 09:49:27 2014 + Commit: Jonathan-Christofer Demay jcdemay AT gmail DOT com CommitDate: Sun Jul 20 09:49:27 2014 + URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=25ebbaaa dev-ml/zarith-1.2.1: fix doc building --- dev-ml/zarith/zarith-1.2.1.ebuild | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dev-ml/zarith/zarith-1.2.1.ebuild b/dev-ml/zarith/zarith-1.2.1.ebuild index 1603ad3..5657ff8 100644 --- a/dev-ml/zarith/zarith-1.2.1.ebuild +++ b/dev-ml/zarith/zarith-1.2.1.ebuild @@ -37,7 +37,9 @@ src_configure(){ src_compile(){ emake || die emake failed - use doc emake doc || die emake doc failed + if use doc; then + emake doc || die emake doc failed + fi } src_install(){
[gentoo-commits] proj/sci:master commit in: sci-mathematics/alt-ergo/
commit: b81928edd7bcb6749ff4c6ed6d5c7e5edf522606 Author: Jonathan-Christofer Demay jcdemay AT gmail DOT com AuthorDate: Sun Jul 20 11:36:17 2014 + Commit: Jonathan-Christofer Demay jcdemay AT gmail DOT com CommitDate: Sun Jul 20 11:36:17 2014 + URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=b81928ed alt-ergo/alt-ergo-0.95.2: fix gui building --- sci-mathematics/alt-ergo/alt-ergo-0.95.2.ebuild | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sci-mathematics/alt-ergo/alt-ergo-0.95.2.ebuild b/sci-mathematics/alt-ergo/alt-ergo-0.95.2.ebuild index 978b40b..cf30ef7 100644 --- a/sci-mathematics/alt-ergo/alt-ergo-0.95.2.ebuild +++ b/sci-mathematics/alt-ergo/alt-ergo-0.95.2.ebuild @@ -30,7 +30,9 @@ src_prepare(){ } src_compile(){ emake || die emake failed - use gtk emake gui || die emake gui failed + if use gtk; then + emake gui || die emake gui failed + fi } src_install(){
[gentoo-commits] proj/sci:master commit in: sci-mathematics/giac/, dev-ml/mlgmpidl/, sci-mathematics/flocq/, ...
commit: d73696e54434ec08a75603613fb1ece24718127f Author: Jonathan-Christofer Demay jcdemay AT gmail DOT com AuthorDate: Fri Jul 18 22:38:01 2014 + Commit: Jonathan-Christofer Demay jcdemay AT gmail DOT com CommitDate: Fri Jul 18 22:38:01 2014 + URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=d73696e5 Several DESTDIR fixes --- dev-ml/mlgmpidl/mlgmpidl-1.1.ebuild | 4 ++-- dev-ml/ocamlgraph/ocamlgraph-1.8.5.ebuild | 4 ++-- sci-mathematics/alt-ergo/alt-ergo-0.95.2.ebuild | 4 ++-- sci-mathematics/apron/apron-0.9.10-r1.ebuild| 9 +++-- sci-mathematics/apron/apron-0.9.10.ebuild | 6 +++--- sci-mathematics/flocq/flocq-2.3.0.ebuild| 4 ++-- sci-mathematics/frama-c/frama-c-20140301.ebuild | 4 ++-- sci-mathematics/giac/giac-1.1.0.ebuild | 2 +- sci-mathematics/why/why-2.34.ebuild | 9 + sci-mathematics/why3/why3-0.83.ebuild | 7 --- 10 files changed, 26 insertions(+), 27 deletions(-) diff --git a/dev-ml/mlgmpidl/mlgmpidl-1.1.ebuild b/dev-ml/mlgmpidl/mlgmpidl-1.1.ebuild index 3063fdf..10d51bd 100644 --- a/dev-ml/mlgmpidl/mlgmpidl-1.1.ebuild +++ b/dev-ml/mlgmpidl/mlgmpidl-1.1.ebuild @@ -31,7 +31,7 @@ src_prepare() { sed -i Makefile.config \ -e s/FLAGS = \\\/FLAGS += \\\/g \ -e s/-O3 -UNDEBUG/-DUDEBUG/g \ - -e s/MLGMPIDL_PREFIX = /MLGMPIDL_PREFIX = \${DESTDIR}\/usr/g + -e s/MLGMPIDL_PREFIX = /MLGMPIDL_PREFIX = \$(DESTDIR)\/usr/g if use !mpfr; then sed -i -e s/HAS_MPFR=1/#HAS_MPFR=0/g Makefile.config @@ -49,7 +49,7 @@ src_compile() { } src_install(){ - DESTDIR=${D} emake install || die emake install failed + emake install DESTDIR=${D} || die emake install failed dodoc README if use doc; then diff --git a/dev-ml/ocamlgraph/ocamlgraph-1.8.5.ebuild b/dev-ml/ocamlgraph/ocamlgraph-1.8.5.ebuild index 2a653f2..c28be86 100644 --- a/dev-ml/ocamlgraph/ocamlgraph-1.8.5.ebuild +++ b/dev-ml/ocamlgraph/ocamlgraph-1.8.5.ebuild @@ -29,7 +29,7 @@ src_prepare() { } src_compile() { - DESTDIR=/ emake -j1 || die emake failed + emake -j1 DESTDIR=/ || die emake failed if use doc; then emake doc || die emake doc failed @@ -37,7 +37,7 @@ src_compile() { } src_install() { - DESTDIR=${D} emake install || die emake install failed + emake install DESTDIR=${D} || die emake install failed dodoc CHANGES CREDITS FAQ README if use doc; then diff --git a/sci-mathematics/alt-ergo/alt-ergo-0.95.2.ebuild b/sci-mathematics/alt-ergo/alt-ergo-0.95.2.ebuild index 9fc811b..978b40b 100644 --- a/sci-mathematics/alt-ergo/alt-ergo-0.95.2.ebuild +++ b/sci-mathematics/alt-ergo/alt-ergo-0.95.2.ebuild @@ -25,7 +25,7 @@ RDEPEND=${DEPEND} src_prepare(){ sed \ -e s: /usr/share/: \$(DESTDIR)/usr/share/:g \ - -e s:cp -f altgr-ergo.opt:mkdir -p \$(DESTDIR)/usr/share/gtksourceview-2.0/language-specs/\n\tcp -f altgr-ergo.opt:g + -e s:cp -f altgr-ergo.opt:mkdir -p \$(DESTDIR)/usr/share/gtksourceview-2.0/language-specs/\n\tcp -f altgr-ergo.opt:g \ -i ${S}/Makefile.in || die } src_compile(){ @@ -34,6 +34,6 @@ src_compile(){ } src_install(){ - DESTDIR=${D} emake install || die emake install failed + emake install DESTDIR=${D} || die emake install failed dodoc README.md CHANGES } diff --git a/sci-mathematics/apron/apron-0.9.10-r1.ebuild b/sci-mathematics/apron/apron-0.9.10-r1.ebuild index 6cc4562..41e9acf 100644 --- a/sci-mathematics/apron/apron-0.9.10-r1.ebuild +++ b/sci-mathematics/apron/apron-0.9.10-r1.ebuild @@ -31,8 +31,8 @@ src_prepare() { sed -i Makefile.config \ -e s/FLAGS = \\\/FLAGS += \\\/g \ -e s/-O3 -DNDEBUG/-DNDEBUG/g \ - -e s/APRON_PREFIX =.*/APRON_PREFIX = \${DESTDIR}\/usr/g \ - -e s/MLGMPIDL_PREFIX =.*/MLGMPIDL_PREFIX = \${DESTDIR}\/usr/g + -e s/APRON_PREFIX =.*/APRON_PREFIX = \$(DESTDIR)\/usr/g \ + -e s/MLGMPIDL_PREFIX =.*/MLGMPIDL_PREFIX = \$(DESTDIR)\/usr/g #fix doc building process sed -i Makefile -e s/; make html/; make/g @@ -42,9 +42,6 @@ src_prepare() { -e s/OUTPUT_DIRECTORY = \/.*/OUTPUT_DIRECTORY = .\//g \ -e s/STRIP_FROM_PATH= \/.*/STRIP_FROM_PATH= .\//g - #fix ppl install for 32 platforms - sed -i ppl/Makefile -e s/libap_ppl_caml\*\./libap_ppl\*\./g - if [[ $(gcc-major-version) == 4 ]]; then sed -i -e s/# HAS_LONG_DOUBLE = 1/HAS_LONG_DOUBLE = 1/g Makefile.config fi @@ -58,7 +55,7 @@ src_compile() { } src_install(){ - DESTDIR=${D} emake install || die emake install failed + emake install DESTDIR=${D} || die emake install failed dodoc AUTHORS Changes README
[gentoo-commits] proj/sci:master commit in: sci-mathematics/apron/
commit: 955e21c32bdccda0fec750c5376bf4fa5f8d4360 Author: Jonathan-Christofer Demay jcdemay AT gmail DOT com AuthorDate: Thu Jul 17 15:20:38 2014 + Commit: Jonathan-Christofer Demay jcdemay AT gmail DOT com CommitDate: Thu Jul 17 15:20:38 2014 + URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=955e21c3 sci-mathematics/apron: force j1 for make --- sci-mathematics/apron/ChangeLog | 4 sci-mathematics/apron/apron-0.9.10-r1.ebuild | 11 +-- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/sci-mathematics/apron/ChangeLog b/sci-mathematics/apron/ChangeLog index ffe53b5..c47c91b 100644 --- a/sci-mathematics/apron/ChangeLog +++ b/sci-mathematics/apron/ChangeLog @@ -2,6 +2,10 @@ # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 17 Jul 2014; Jonathan-Christofer Demay jcde...@gmail.com + apron-0.9.10-r1.ebuild: + force j1 option for make + 21 Jun 2014; Jonathan-Christofer Demay jcde...@gmail.com +apron-0.9.10-r1.ebuild: dropping cxx and ppl support diff --git a/sci-mathematics/apron/apron-0.9.10-r1.ebuild b/sci-mathematics/apron/apron-0.9.10-r1.ebuild index 94180af..6cc4562 100644 --- a/sci-mathematics/apron/apron-0.9.10-r1.ebuild +++ b/sci-mathematics/apron/apron-0.9.10-r1.ebuild @@ -54,12 +54,7 @@ src_prepare() { } src_compile() { - #damn crappy Makefile - emake || emake || die emake failed - - if use doc use cxx; then - emake -C apronxx doc || emake doc failed - fi + emake -j1 || die emake failed } src_install(){ @@ -71,9 +66,5 @@ src_install(){ if use ocaml; then dodoc mlapronidl/mlapronidl.pdf fi - if use cxx; then - mv apronxx/doc/latex/refman.pdf apronxx/apronxx.pdf - dodoc ./apronxx/apronxx.pdf - fi fi }
[gentoo-commits] proj/sci:master commit in: dev-ml/zarith/
commit: 901dfcb7c29bb1b78e4667c7832411d8b12d0df5 Author: Jonathan-Christofer Demay jcdemay AT gmail DOT com AuthorDate: Sun Jun 22 18:49:27 2014 + Commit: Jonathan-Christofer Demay jcdemay AT gmail DOT com CommitDate: Sun Jun 22 18:49:27 2014 + URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=901dfcb7 zarith no longer asks ocamlc for libdir --- dev-ml/zarith/zarith-1.2.1.ebuild | 23 ++- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/dev-ml/zarith/zarith-1.2.1.ebuild b/dev-ml/zarith/zarith-1.2.1.ebuild index 2822592..90b5183 100644 --- a/dev-ml/zarith/zarith-1.2.1.ebuild +++ b/dev-ml/zarith/zarith-1.2.1.ebuild @@ -2,7 +2,9 @@ # Distributed under the terms of the GNU General Public License v2 # $Header: $ -EAPI=4 +EAPI=5 + +inherit eutils findlib multilib DESCRIPTION=The Zarith library implements arithmetic and logical operations over arbitrary-precision integers HOMEPAGE=http://forge.ocamlcore.org/projects/zarith; @@ -11,12 +13,11 @@ SRC_URI=http://forge.ocamlcore.org/frs/download.php/1199/${P}.tgz; LICENSE=GPL-2 SLOT=0 KEYWORDS=~amd64 ~x86 -IUSE=+ocamlopt - -OCAMLDIR=`ocamlc -where` +IUSE=+ocamlopt doc mpir DEPEND==dev-lang/ocaml-3.12.1[ocamlopt?] - dev-libs/gmp + !mpir? ( dev-libs/gmp ) + mpir? ( sci-libs/mpir ) RDEPEND=${DEPEND} src_prepare(){ @@ -24,17 +25,21 @@ src_prepare(){ } src_configure(){ -./configure -installdir ${D}${OCAMLDIR} || die configure failed + MY_OPTS=-ocamllibdir /usr/$(get_libdir) -installdir ${D}/usr/$(get_libdir)/ocaml + use mpir MY_OPTS=${MY_OPTS} -mpir + ./configure ${MY_OPTS}|| die || die configure failed } src_compile(){ emake || die emake failed + use doc emake doc || die emake doc failed } src_install(){ - mkdir -p ${D}${OCAMLDIR} - cp ${OCAMLDIR}/ld.conf ${D}${OCAMLDIR}/ld.conf + findlib_src_preinst + cp /usr/$(get_libdir)/ocaml/ld.conf ${D}/usr/$(get_libdir)/ocaml/ld.conf emake install || die emake install failed - rm ${D}${OCAMLDIR}/ld.conf + rm -f ${D}/usr/$(get_libdir)/ocaml/ld.conf dodoc Changes README + use doc dodoc -r html/ }
[gentoo-commits] proj/sci:master commit in: dev-ml/zarith/
commit: 2fc91a64c86849c2fdb775c6a9babb45b2d2b6d0 Author: Jonathan-Christofer Demay jcdemay AT gmail DOT com AuthorDate: Sun Jun 22 19:09:30 2014 + Commit: Jonathan-Christofer Demay jcdemay AT gmail DOT com CommitDate: Sun Jun 22 19:09:30 2014 + URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=2fc91a64 fix pkg_setup regression --- dev-ml/zarith/ChangeLog | 8 dev-ml/zarith/zarith-1.2.1.ebuild | 15 ++- 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/dev-ml/zarith/ChangeLog b/dev-ml/zarith/ChangeLog index a521a07..2868b84 100644 --- a/dev-ml/zarith/ChangeLog +++ b/dev-ml/zarith/ChangeLog @@ -2,10 +2,18 @@ # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 22 Jun 2014; Jonathan-Christofer Demay jcde...@gmail.com + zarith-1.2.1.ebuild: + fix regression of pkg_setup + 10 Jun 2014; Jonathan-Christofer Demay jcde...@gmail.com -zarith-1.1.ebuild, +zarith-1.2.1.ebuild: version bump + 03 Mar 2013; Justin Lecher j...@gentoo.org + zarith-1.1.ebuild, metadata.xml: + Clean wrong space and blank lines; move EAPI=5 + 14 Jan 2013; Jonathan-Christofer Demay jcde...@gmail.com +zarith-1.1.ebuild: initial commit diff --git a/dev-ml/zarith/zarith-1.2.1.ebuild b/dev-ml/zarith/zarith-1.2.1.ebuild index 90b5183..1603ad3 100644 --- a/dev-ml/zarith/zarith-1.2.1.ebuild +++ b/dev-ml/zarith/zarith-1.2.1.ebuild @@ -20,14 +20,19 @@ DEPEND==dev-lang/ocaml-3.12.1[ocamlopt?] mpir? ( sci-libs/mpir ) RDEPEND=${DEPEND} +pkg_setup() { + OCAMLDIR=$(ocamlc -where) +} + src_prepare(){ - sed -i ${S}/project.mak -e s:(OCAMLFIND) install:(OCAMLFIND) install -ldconf \$(INSTALLDIR)/ld.conf:g + sed -e s:(OCAMLFIND) install:(OCAMLFIND) install -ldconf \$(INSTALLDIR)/ld.conf:g \ + -i ${S}/project.mak } src_configure(){ - MY_OPTS=-ocamllibdir /usr/$(get_libdir) -installdir ${D}/usr/$(get_libdir)/ocaml + MY_OPTS=-ocamllibdir /usr/$(get_libdir) -installdir ${D}/${OCAMLDIR} use mpir MY_OPTS=${MY_OPTS} -mpir - ./configure ${MY_OPTS}|| die || die configure failed + ./configure ${MY_OPTS} || die configure failed } src_compile(){ @@ -37,9 +42,9 @@ src_compile(){ src_install(){ findlib_src_preinst - cp /usr/$(get_libdir)/ocaml/ld.conf ${D}/usr/$(get_libdir)/ocaml/ld.conf + cp ${OCAMLDIR}/ld.conf ${D}/${OCAMLDIR}/ld.conf emake install || die emake install failed - rm -f ${D}/usr/$(get_libdir)/ocaml/ld.conf + rm -f ${D}/${OCAMLDIR}/ld.conf dodoc Changes README use doc dodoc -r html/ }
[gentoo-commits] proj/sci:master commit in: sci-mathematics/giac/, dev-ml/zarith/, dev-ml/mlgmpidl/, sci-mathematics/pff/, ...
commit: 9d31fe0253025c7f7c08e0828889c1f012977bd5 Author: Jonathan-Christofer Demay jcdemay AT gmail DOT com AuthorDate: Sun Jun 22 20:20:18 2014 + Commit: Jonathan-Christofer Demay jcdemay AT gmail DOT com CommitDate: Sun Jun 22 20:20:18 2014 + URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=9d31fe02 multiple move to EAPI=5 and regression fixes --- dev-libs/simclist/metadata.xml | 17 dev-libs/simclist/simclist-1.6.ebuild | 4 +- dev-ml/mlgmpidl/metadata.xml | 23 +-- dev-ml/mlgmpidl/mlgmpidl-1.1.ebuild| 4 +- dev-ml/ocamlgraph/ChangeLog| 4 ++ dev-ml/ocamlgraph/metadata.xml | 47 +- dev-ml/ocamlgraph/ocamlgraph-1.8.5.ebuild | 2 +- dev-ml/zarith/ChangeLog| 15 +-- dev-ml/zarith/metadata.xml | 20 - sci-mathematics/alt-ergo/ChangeLog | 15 +-- sci-mathematics/alt-ergo/alt-ergo-0.95.2.ebuild| 12 +++--- sci-mathematics/alt-ergo/metadata.xml | 23 --- sci-mathematics/apron/apron-0.9.10-r1.ebuild | 4 +- sci-mathematics/apron/apron-0.9.10.ebuild | 4 +- sci-mathematics/apron/metadata.xml | 28 + sci-mathematics/flocq/ChangeLog| 4 ++ sci-mathematics/flocq/flocq-2.3.0.ebuild | 3 +- sci-mathematics/flocq/metadata.xml | 17 sci-mathematics/frama-c/ChangeLog | 8 ++-- sci-mathematics/frama-c/frama-c-20140301.ebuild| 4 +- sci-mathematics/frama-c/metadata.xml | 28 + sci-mathematics/gappa/ChangeLog| 6 ++- sci-mathematics/gappa/gappa-1.1.1.ebuild | 12 +++--- .../gappalib-coq/gappalib-coq-1.0.0.ebuild | 2 +- sci-mathematics/giac/ChangeLog | 3 ++ sci-mathematics/giac/metadata.xml | 26 +--- sci-mathematics/ltl2ba/ltl2ba-1.1.ebuild | 4 +- sci-mathematics/ltl2ba/metadata.xml| 3 -- sci-mathematics/pff/ChangeLog | 4 ++ sci-mathematics/pff/metadata.xml | 18 - sci-mathematics/pff/pff-8.4.ebuild | 4 +- sci-mathematics/why/ChangeLog | 4 ++ sci-mathematics/why/metadata.xml | 28 - sci-mathematics/why/why-2.34.ebuild| 4 +- sci-mathematics/why3/metadata.xml | 32 ++- sci-mathematics/why3/why3-0.83.ebuild | 2 +- 36 files changed, 201 insertions(+), 237 deletions(-) diff --git a/dev-libs/simclist/metadata.xml b/dev-libs/simclist/metadata.xml index 49fb6b8..1da3891 100644 --- a/dev-libs/simclist/metadata.xml +++ b/dev-libs/simclist/metadata.xml @@ -1,14 +1,11 @@ ?xml version=1.0 encoding=UTF-8? !DOCTYPE pkgmetadata SYSTEM http://www.gentoo.org/dtd/metadata.dtd; pkgmetadata - herdsci/herd - longdescription - SimCList is a high quality C (C++ embeddable) library for handling - lists. It exploits several advanced techniques for improving - performance, including freelists, sentinels, automatic sort algorithm - selection, sort randomization, mid pointer and optional multithreading. - /longdescription - maintainer - emails...@gentoo.org/email - /maintainer +herdsci/herd +longdescription + SimCList is a high quality C (C++ embeddable) library for handling + lists. It exploits several advanced techniques for improving + performance, including freelists, sentinels, automatic sort algorithm + selection, sort randomization, mid pointer and optional multithreading. +/longdescription /pkgmetadata diff --git a/dev-libs/simclist/simclist-1.6.ebuild b/dev-libs/simclist/simclist-1.6.ebuild index 0df95c3..c79091d 100644 --- a/dev-libs/simclist/simclist-1.6.ebuild +++ b/dev-libs/simclist/simclist-1.6.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: $ -EAPI=3 +EAPI=5 inherit cmake-utils diff --git a/dev-ml/mlgmpidl/metadata.xml b/dev-ml/mlgmpidl/metadata.xml index c6107f8..a3fac81 100644 --- a/dev-ml/mlgmpidl/metadata.xml +++ b/dev-ml/mlgmpidl/metadata.xml @@ -1,17 +1,14 @@ ?xml version=1.0 encoding=UTF-8? !DOCTYPE pkgmetadata SYSTEM http://www.gentoo.org/dtd/metadata.dtd; pkgmetadata - herdsci/herd - longdescription - MLGMPIDL is a package offering an interface to the GMP and MPFR - libraries for OCaml version 3.07 or higher. The interface offers access - to almost all the functions of the library, and is decomposed into 7 - submodules