aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan-Christofer Demay <jcdemay@gmail.com>2010-07-04 11:08:41 +0000
committerJonathan-Christofer Demay <jcdemay@gmail.com>2010-07-04 11:08:41 +0000
commit16ab0299a022f4e92283e1dbd4daf7a55d085486 (patch)
tree4709ec8c3fbb0a70b9934e918741a421c6a5710b
parentAdded longdescription to metadata.xml (diff)
downloadsci-16ab0299a022f4e92283e1dbd4daf7a55d085486.tar.gz
sci-16ab0299a022f4e92283e1dbd4daf7a55d085486.tar.bz2
sci-16ab0299a022f4e92283e1dbd4daf7a55d085486.zip
sci-mathematics/apron: building process fixed for the latest sources
-rw-r--r--sci-mathematics/apron/ChangeLog4
-rw-r--r--sci-mathematics/apron/Manifest7
-rw-r--r--sci-mathematics/apron/apron-0.9.10.ebuild10
-rw-r--r--sci-mathematics/apron/files/apron-0.9.10-pkgrid_manager.patch12
4 files changed, 12 insertions, 21 deletions
diff --git a/sci-mathematics/apron/ChangeLog b/sci-mathematics/apron/ChangeLog
index c0a58b703..edd0ba4f0 100644
--- a/sci-mathematics/apron/ChangeLog
+++ b/sci-mathematics/apron/ChangeLog
@@ -2,6 +2,10 @@
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 04 Jul 2010; J.-C. Demay <jcdemay@gmail.com>
+ -files/apron-0.9.10-pkgrid_manager.patch, apron-0.9.10.ebuild:
+ building process fixed for the latest sources
+
03 Jul 2010; J.-C. Demay <jcdemay@gmail.com>
+metadata.xml, +ChangeLog:
QA fixes
diff --git a/sci-mathematics/apron/Manifest b/sci-mathematics/apron/Manifest
index b3ec690df..bc8c748c4 100644
--- a/sci-mathematics/apron/Manifest
+++ b/sci-mathematics/apron/Manifest
@@ -1,3 +1,4 @@
-AUX apron-0.9.10-pkgrid_manager.patch 543 RMD160 36b7ef40e2748781a21275af0e50bfbfd0a4253e SHA1 c636f4837643b3bfe6cc2f9ee7194d9b2a756fc6 SHA256 d62e05fac7f08d2b6ac62a8e8819ce00e55605155869a7d5ad814c399020d6bf
-DIST apron-0.9.10.tgz 845879 RMD160 ddd621617adfa158ecd1b8cc3371feca29a95538 SHA1 77ac01bad0d5a0dfc702c647e1290b4bd1ff6f11 SHA256 af1f113b455d16b41bba3c3e94274edacfa5a8d8ef12fde2adc26eaa01f900ef
-EBUILD apron-0.9.10.ebuild 2370 RMD160 37e852c26d18bf09d2c879c7f8fa186f535d44a3 SHA1 c7dd8bb188788583521e2a3c774b888be69ef329 SHA256 a2b8b0776c91c8521717bc5e612b482c4805c520d7cbdd5e45f94f377673f9b3
+DIST apron-0.9.10.tgz 1694989 RMD160 44dc11b4dea380bd0422fdbf541a9083737b6fc0 SHA1 0e0d857bd646de6a8b16e60d80b06f48a62c51df SHA256 b108de2f4a8c4ecac1ff76a6d282946fd3bf1466a126cf5344723955f305ec8e
+EBUILD apron-0.9.10.ebuild 2328 RMD160 60f515d6dcba9a3225badb40ac543217e7df27a7 SHA1 2d0e74fe2f315a708799fe0e22fca851e3424501 SHA256 a1eafa30886dcbc1b219918ece91f59854f58e887a270d6ded8251b7ad5cca8e
+MISC ChangeLog 365 RMD160 42477c95bca9dce05e1a24940077604c16e34b64 SHA1 da6973f5f6807fc72fcb5e2981858d97d03d62ce SHA256 df0de02945734bb13640990fe3bd7ee51d22903ebab6bc6ab0110f422c6f6b2b
+MISC metadata.xml 766 RMD160 7470972fcb9db3e33e7f7d33676b32056f2f9ef1 SHA1 a67b9fb9d642831cad59610f59c5ddb8c4edf44b SHA256 0c51986704c76ac714eefa40ba0cef38f6ae675f3705259c8b73238e2c6b4920
diff --git a/sci-mathematics/apron/apron-0.9.10.ebuild b/sci-mathematics/apron/apron-0.9.10.ebuild
index 284d2132b..ad2356bec 100644
--- a/sci-mathematics/apron/apron-0.9.10.ebuild
+++ b/sci-mathematics/apron/apron-0.9.10.ebuild
@@ -33,8 +33,8 @@ src_prepare() {
sed -i Makefile.config \
-e "s/FLAGS = \\\/FLAGS += \\\/g" \
-e "s/-O3 -DNDEBUG/-DNDEBUG/g" \
- -e "s/APRON_PREFIX = \/usr/APRON_PREFIX = \${DESTDIR}\/usr/g" \
- -e "s/MLGMPIDL_PREFIX = \/usr\/local/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"
@@ -59,16 +59,14 @@ src_prepare() {
else
die "USE flag 'cxx' needs USE flag 'ppl' set"
fi
-
- epatch "${FILESDIR}/${P}-pkgrid_manager.patch"
}
src_compile() {
#damn crappy Makefile
emake || emake || die "emake failed"
- if use doc; then
- emake doc || "emake doc failed"
+ if use doc && use cxx; then
+ emake -C apronxx doc || "emake doc failed"
fi
}
diff --git a/sci-mathematics/apron/files/apron-0.9.10-pkgrid_manager.patch b/sci-mathematics/apron/files/apron-0.9.10-pkgrid_manager.patch
deleted file mode 100644
index 6fa5d3cab..000000000
--- a/sci-mathematics/apron/files/apron-0.9.10-pkgrid_manager.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur apron-0.9.10-orig/apronxx/apxx_ppl_product_inline.hh apron-0.9.10-ptch/apronxx/apxx_ppl_product_inline.hh
---- apron-0.9.10-orig/apronxx/apxx_ppl_product_inline.hh 2007-10-10 12:42:07.000000000 +0000
-+++ apron-0.9.10-ptch/apronxx/apxx_ppl_product_inline.hh 2009-09-22 21:05:56.000000000 +0000
-@@ -14,7 +14,7 @@
- */
-
- inline pkgrid_manager::pkgrid_manager(bool strict)
-- : manager(ap_pkgrid_manager_alloc(strict))
-+ : manager(ap_pkgrid_manager_alloc(NULL, NULL))
- {}
-
- inline manager& pkgrid_manager::operator=(const manager& m)