[gentoo-commits] proj/sci:master commit in: sci-mathematics/apron/

["Justin Lecher" <jlec@gentoo.org>]

commit:     6dfa52397fdce7ace780fe1e03e9db334c2427a9
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 21 18:38:45 2015 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Mon Sep 21 18:38:54 2015 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=6dfa5239

sci-mathematics/apron: Add subslot operators

Package-Manager: portage-2.2.20.1
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>

 sci-mathematics/apron/apron-0.9.10-r1.ebuild | 33 +++++-----
 sci-mathematics/apron/apron-0.9.10.ebuild    | 92 ----------------------------
 sci-mathematics/apron/metadata.xml           |  7 +--
 3 files changed, 21 insertions(+), 111 deletions(-)

diff --git a/sci-mathematics/apron/apron-0.9.10-r1.ebuild b/sci-mathematics/apron/apron-0.9.10-r1.ebuild
index eb6a7f6..622c06b 100644
--- a/sci-mathematics/apron/apron-0.9.10-r1.ebuild
+++ b/sci-mathematics/apron/apron-0.9.10-r1.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
 # $Id$
 
@@ -6,7 +6,7 @@ EAPI="5"
 
 inherit eutils toolchain-funcs
 
-DESCRIPTION="Library for static analysis of the numerical variables of a program by Abstract Interpretation"
+DESCRIPTION="Static analysis of the numerical variables of a program by Abstract Interpretation"
 HOMEPAGE="http://apron.cri.ensmp.fr/library/"
 SRC_URI="http://apron.cri.ensmp.fr/library/${P}.tgz"
 
@@ -15,24 +15,30 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="doc ocaml"
 
-RDEPEND="ocaml? ( >=dev-lang/ocaml-3.09
-				dev-ml/camlidl
-				dev-ml/mlgmpidl )
-		dev-libs/gmp
-		dev-libs/mpfr"
+RDEPEND="
+	ocaml? (
+		>=dev-lang/ocaml-3.09
+		dev-ml/camlidl
+		dev-ml/mlgmpidl
+	)
+		dev-libs/gmp:0=
+		dev-libs/mpfr:0="
 DEPEND="${RDEPEND}
-		doc? ( app-text/texlive
-				app-text/ghostscript-gpl )"
+	doc? (
+		app-text/texlive
+		app-text/ghostscript-gpl
+	)"
 
 src_prepare() {
-	mv Makefile.config.model Makefile.config
+	mv Makefile.config.model Makefile.config || die
 
 	#fix compile process
 	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/MLGMPIDL_PREFIX =.*/MLGMPIDL_PREFIX = \$(DESTDIR)\/usr/g" \
+		|| die
 
 	#fix doc building process
 	sed -i Makefile -e "s/; make html/; make/g"
@@ -51,12 +57,11 @@ src_prepare() {
 }
 
 src_compile() {
-	emake -j1 || die "emake failed"
+	emake -j1
 }
 
 src_install(){
-	emake install DESTDIR="${D}" || die "emake install failed"
-	dodoc AUTHORS Changes README
+	default
 
 	if use doc; then
 		dodoc apron/apron.pdf

diff --git a/sci-mathematics/apron/apron-0.9.10.ebuild b/sci-mathematics/apron/apron-0.9.10.ebuild
deleted file mode 100644
index b2b9148..0000000
--- a/sci-mathematics/apron/apron-0.9.10.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Library for static analysis of the numerical variables of a program by Abstract Interpretation"
-HOMEPAGE="http://apron.cri.ensmp.fr/library/"
-SRC_URI="http://apron.cri.ensmp.fr/library/${P}.tgz"
-
-LICENSE="LGPL-2 GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="cxx doc ocaml ppl"
-
-RDEPEND="ocaml? ( >=dev-lang/ocaml-3.09
-				dev-ml/camlidl
-				dev-ml/mlgmpidl )
-		dev-libs/gmp
-		dev-libs/mpfr
-		ppl? ( dev-libs/ppl )"
-DEPEND="${RDEPEND}
-		doc? ( app-text/texlive
-				app-text/ghostscript-gpl
-				cxx? ( app-doc/doxygen
-						dev-tex/rubber ) )"
-
-src_prepare() {
-	mv Makefile.config.model Makefile.config
-
-	#fix compile process
-	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"
-
-	#fix doc building process
-	sed -i Makefile -e "s/; make html/; make/g"
-	sed -i apronxx/Makefile \
-		-e "s:cd doc/latex && make:cd doc/latex; rubber refman.tex; dvipdf refman.dvi:g"
-	sed -i apronxx/doc/Doxyfile \
-		-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
-	if use !ocaml; then
-		sed -i -e "s/HAS_OCAML = 1/#HAS_OCAML = 0/g" Makefile.config
-	fi
-	if use ppl; then
-		sed -i -e "s/# HAS_PPL = 1/HAS_PPL = 1/g" Makefile.config
-	fi
-	if use cxx; then
-		if use ppl; then
-			sed -i -e "s/# HAS_CPP = 1/HAS_CPP = 1/g" Makefile.config
-		else
-			die "USE flag 'cxx' needs USE flag 'ppl' set"
-		fi
-	fi
-}
-
-src_compile() {
-	#damn crappy Makefile
-	emake || emake || die "emake failed"
-
-	if use doc && use cxx; then
-		emake -C apronxx doc || "emake doc failed"
-	fi
-}
-
-src_install(){
-	emake install DESTDIR="${D}" || die "emake install failed"
-	dodoc AUTHORS Changes README
-
-	if use doc; then
-		dodoc apron/apron.pdf
-		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
-}

diff --git a/sci-mathematics/apron/metadata.xml b/sci-mathematics/apron/metadata.xml
index 73bd7f1..0eeeaf3 100644
--- a/sci-mathematics/apron/metadata.xml
+++ b/sci-mathematics/apron/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci-mathematics</herd>
-<longdescription>
+  <herd>sci-mathematics</herd>
+  <longdescription>
   The APRON library is dedicated to the static analysis of the numerical
   variables of a program by Abstract Interpretation. The aim of such an
   analysis is to infer invariants about these variables. The APRON library
@@ -12,7 +12,4 @@
   domain, as shown by the poster on the right (presented at the SAS 2007
   conference.
 </longdescription>
-<use>
-  <flag name='ppl'>Add support for <pkg>dev-libs/ppl</pkg></flag>
-</use>
 </pkgmetadata>