Version bump. Serious ebuild cleaning and added tests.

Package-Manager: portage-2.2_rc38/cvs/Linux x86_64

6 files changed, 196 insertions, 66 deletions

diff --git a/sci-libs/libcore/ChangeLog b/sci-libs/libcore/ChangeLog
index e6961b57030c..0b45c3c934a1 100644
--- a/sci-libs/libcore/ChangeLog
+++ b/sci-libs/libcore/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-libs/libcore
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/libcore/ChangeLog,v 1.5 2009/02/02 23:01:37 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/libcore/ChangeLog,v 1.6 2009/08/13 00:28:42 bicatali Exp $
+
+*libcore-2.0.8 (13 Aug 2009)
+
+  13 Aug 2009; Sébastien Fabbro <bicatali@gentoo.org> -libcore-1.7.ebuild,
+  +libcore-2.0.8.ebuild, +files/libcore-2.0.8-makefiles.patch, metadata.xml:
+  Version bump. Serious ebuild cleaning and added tests.
 
 *libcore-1.8 (02 Feb 2009)
 
diff --git a/sci-libs/libcore/Manifest b/sci-libs/libcore/Manifest
index 21828d8bcf83..c0bdf3ed82bc 100644
--- a/sci-libs/libcore/Manifest
+++ b/sci-libs/libcore/Manifest
@@ -2,17 +2,19 @@
 Hash: SHA1
 
 AUX libcore-1.7.patch 3369 RMD160 df1e195c7a46c4e9143b53a73b57a52222915d3f SHA1 b2fcb273784490b5c15b4259506ebff89942384b SHA256 984d6d306efe09e3d9131b79d7ee6d369052313ba20385fbad73c8398eda0724
-DIST core_v1.7x_std.tgz 2956734 RMD160 f7dd163f6c35e80a46deb2ec59870c644a139899 SHA1 c569fe706926ba337abe4c3b60a18c6fe03f6f02 SHA256 248723fdf85a6050b59509099942d6adf170d604dd6570d4c7afdcaa725bfbeb
+AUX libcore-2.0.8-makefiles.patch 3360 RMD160 5b953b1abaf8cc9bd9ad1eafc708e43315a89411 SHA1 72fb354cffce0e034ced2fbdde77f679722a54b5 SHA256 4abea3817fcecdcae6e7abe51726b90f11243fe76672b59fb8775395fdb96ffb
+DIST core-2.0.8.tgz 2639062 RMD160 1eb83be281e514905eb6e3db01fddad2a16508ab SHA1 42c826e4437dd6786d4ca7e052e2b842ecb792d1 SHA256 2b6a01a151f82650dcc64df1db95609c2def042092811f1d16ad338413882229
+DIST core-2.0.doc.tgz 658166 RMD160 4dce17eb0a406ec6db92756cdbd67b61ca21f486 SHA1 02582365c65890c97d2aeb8e2ab946b2182c9e0c SHA256 bc5497bded262deb1f3f947be6bdfeda172ec0e58aa8cc6959dc5fda003a552f
 DIST core_v1.8.tgz 2043406 RMD160 f22127ca512a73be565adfbaa1eb22fe8320961b SHA1 017b044a10d67827b199122e82586383b1260b73 SHA256 ff1ddd3240e1ad078e59ecdd9f96f8d698bc4f07b5a5cd09a96002de87c33788
 DIST core_v1.8_doc.tgz 657539 RMD160 240f5a6321a3e02c2bdbaf9f5fc7f491be13cf00 SHA1 17220cf15746ba0a0b98949fe16fd33fd379d323 SHA256 72f7d7857368225c4af5620082a497a40767645abd63af718e4237c851cfc3e8
-EBUILD libcore-1.7.ebuild 1531 RMD160 ae805683ae0659cb8c95eafbb9871a0c343703a4 SHA1 1df8428ef599ee3ead2fbc1e46f334bc72362cd7 SHA256 84b38c247553e42d79039ccbbbe58b8be5f7fc3fe4205246c61c490dfa2c8b53
 EBUILD libcore-1.8.ebuild 1716 RMD160 d1f842f4303c14470cb1ee3e8bbb78f2050d97cb SHA1 8b05215edd3c67b85ae220e38e79255ef42c69fa SHA256 457b37017355aeee7cbbb69becd6e13a0d630eefe75a18644ffbae3df5fb585f
-MISC ChangeLog 986 RMD160 120969c96ad197e51ed7b2b48dd1d8b1ff02041a SHA1 e0a7c49dd8292cbff0c70cf76cfb34f1e5df164e SHA256 6629b4ef1c8534830f9803de513892a0289cb2372b2f528ab4e9f44121b53023
-MISC metadata.xml 169 RMD160 e1db75ae5d177dffc400468c7d76a7e1fe41876d SHA1 0c953712f9b97d5ab3f95ae71997ffbc96c4007d SHA256 36837b011d26f0b83477c7a8632cb0099aedbcba5a3e45c61f20292e079f6180
+EBUILD libcore-2.0.8.ebuild 2148 RMD160 02ed099212ca1c24d6a1cbafb48e525646093404 SHA1 76edf3dbac8ac103ca5871b05805761f92dad73c SHA256 961432c6bc6acaa3003e5b117798491d308ca8df45ccac7e7d64ad7034f53852
+MISC ChangeLog 1227 RMD160 80a63291a11a066ec2ed812b5d4689c53cbb9fb3 SHA1 3e5fdc742e2befbdbdef1d5a61acd4e649ae87df SHA256 123c8d0f2c0b5927cc2d1eaebb96e306f6425cd4f24fcbf19a93823d06d3c6fd
+MISC metadata.xml 576 RMD160 d6a14a462cbf5b3e29fbc681d63485cd55fb2506 SHA1 a8508e2bd0ce0201af66f3a475437753432bd7ff SHA256 3665a5319789e142daa2d351d756f6cefc9535eefac9afecfe95d2848ba82aa0
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
+Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkmHe2AACgkQ1ycZbhPLE2A6GgCeImrdWy2/Os3T5g9Bhh0Q24P4
-1qkAnj3Z/1+wZElUBHmEh3t79tSSyAdl
-=41xn
+iEYEARECAAYFAkqDXkMACgkQ1ycZbhPLE2DqUQCgs84l9/3/NkcaehG8vfJr3gqD
+L9AAnR5of6B50j+Rf7LH4JgQ7a/uEDxc
+=HPx3
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/libcore/files/libcore-2.0.8-makefiles.patch b/sci-libs/libcore/files/libcore-2.0.8-makefiles.patch
new file mode 100644
index 000000000000..6980332837f6
--- /dev/null
+++ b/sci-libs/libcore/files/libcore-2.0.8-makefiles.patch
@@ -0,0 +1,97 @@
+--- src/Makefile.orig	2009-08-12 22:52:51.000000000 +0100
++++ src/Makefile	2009-08-12 23:38:51.000000000 +0100
+@@ -7,7 +7,7 @@
+ 
+ CORE_PATH=..
+ 
+-INCLUDE=-I${CORE_PATH}/inc -I${CORE_PATH}/mpfr/include -I${CORE_PATH}/gmp/include
++INCLUDE=-I${CORE_PATH}/inc
+ 
+ # VAR indicates variants of the Core library
+ #	E.g., if VAR=(empty) then we compile the release version.
+@@ -37,12 +37,13 @@
+ 
+ # The following library will be built:
+ CORE_LIB=$(CORE_PATH)/lib/libcore++${VAR}.a
+-CORE_SHARED_LIB=$(CORE_PATH)/lib/libcore++${VAR}.so
++CORE_SHARED_LIB_NAME=libcore++${VAR}.so.2.0.0
++CORE_SHARED_LIB=$(CORE_PATH)/lib/$(CORE_SHARED_LIB_NAME)
+ 
+ TARGET=$(CORE_LIB)
+ 
+ ifeq (${LINKAGE}, shared)
+-  TARGET+=$(CORE_SHARED_LIB)
++  TARGET=$(CORE_SHARED_LIB)
+ endif
+ 
+ # =============================================================
+@@ -55,7 +56,7 @@
+ 	$(AR) $@ $^
+ 
+ ${CORE_SHARED_LIB}:	$(EXPROBJS)
+-	$(CXX) $(CORE_LDFLAGS) -o $@ $^
++	$(CXX) $(LDFLAGS) $(CORE_LDFLAGS)  -Wl,-soname,$(CORE_SHARED_LIB_NAME).2.0.0 -o $@ $^ $(LIBS)
+ 
+ %${VAR}.o:	%.cpp
+ 	${CXX} $(CORE_CXXFLAGS) $(INCLUDE) -c $< -o $@
+--- ext/Makefile.orig	2009-08-12 22:54:55.000000000 +0100
++++ ext/Makefile	2009-08-12 23:39:19.000000000 +0100
+@@ -13,8 +13,7 @@
+ # =============================================================
+ 
+ CORE_PATH=..
+-INCLUDE=-I${CORE_PATH}/inc -I${CORE_PATH}/gmp/include \
+-	-I${CORE_PATH}/mpfr/include
++INCLUDE=-I${CORE_PATH}/inc
+ 
+ MODULES := linearAlgebra geometry2d geometry3d
+ 
+@@ -30,14 +29,17 @@
+ COREX_LIB_LEVEL3=${CORE_PATH}/lib/libcorex++$(VAR)_level3.a
+ COREX_LIB_LEVEL2=${CORE_PATH}/lib/libcorex++$(VAR)_level2.a
+ COREX_LIB_LEVEL1=${CORE_PATH}/lib/libcorex++$(VAR)_level1.a
+-COREX_SHARED_LIB_LEVEL3=${CORE_PATH}/lib/libcorex++$(VAR)_level3.so
+-COREX_SHARED_LIB_LEVEL2=${CORE_PATH}/lib/libcorex++$(VAR)_level2.so
+-COREX_SHARED_LIB_LEVEL1=${CORE_PATH}/lib/libcorex++$(VAR)_level1.so
++COREX_SHARED_LIB_LEVEL3_NAME=libcorex++$(VAR)_level3.so.2.0.0
++COREX_SHARED_LIB_LEVEL2_NAME=libcorex++$(VAR)_level2.so.2.0.0
++COREX_SHARED_LIB_LEVEL1_NAME=libcorex++$(VAR)_level1.so.2.0.0
++COREX_SHARED_LIB_LEVEL3=${CORE_PATH}/lib/$(COREX_SHARED_LIB_LEVEL3_NAME)
++COREX_SHARED_LIB_LEVEL2=${CORE_PATH}/lib/$(COREX_SHARED_LIB_LEVEL2_NAME)
++COREX_SHARED_LIB_LEVEL1=${CORE_PATH}/lib/$(COREX_SHARED_LIB_LEVEL1_NAME)
+ 
+ TARGET=${COREX_LIB_LEVEL3} ${COREX_LIB_LEVEL2} ${COREX_LIB_LEVEL1}
+ 
+ ifeq (${LINKAGE}, shared)
+-  TARGET += $(COREX_SHARED_LIB_LEVEL3) $(COREX_SHARED_LIB_LEVEL2) \
++  TARGET = $(COREX_SHARED_LIB_LEVEL3) $(COREX_SHARED_LIB_LEVEL2) \
+             $(COREX_SHARED_LIB_LEVEL1)
+ endif
+ 
+@@ -60,7 +62,7 @@
+ 
+ ${COREX_SHARED_LIB_LEVEL3}: ${L3_OBJS}
+ 	-@rm -rf $@ 
+-	$(CXX) $(CORE_LDFLAGS) -o $@ $?
++	$(CXX) $(LDFLAGS) $(CORE_LDFLAGS) -Wl,-soname,$(COREX_SHARED_LIB_LEVEL3_NAME).2.0.0 -o $@ $?
+ 
+ ${COREX_LIB_LEVEL2}: ${L2_OBJS}
+ 	-@rm -rf $@ 
+@@ -68,7 +70,7 @@
+ 
+ ${COREX_SHARED_LIB_LEVEL2}: ${L2_OBJS}
+ 	-@rm -rf $@ 
+-	$(CXX) $(CORE_LDFLAGS) -o $@ $?
++	$(CXX) $(LDFLAGS) $(CORE_LDFLAGS) -Wl,-soname,$(COREX_SHARED_LIB_LEVEL2_NAME).2.0.0 -o $@ $?
+ 
+ ${COREX_LIB_LEVEL1}: ${L1_OBJS}
+ 	-@rm -rf $@ 
+@@ -76,7 +78,7 @@
+ 
+ ${COREX_SHARED_LIB_LEVEL1}: ${L1_OBJS}
+ 	-@rm -rf $@ 
+-	$(CXX) $(CORE_LDFLAGS) -o $@ $?
++	$(CXX) $(LDFLAGS) $(CORE_LDFLAGS) -Wl,-soname,$(COREX_SHARED_LIB_LEVEL1_NAME).2.0.0 -o $@ $?
+ 
+ %_level3.o:	%.cpp
+ 	${CXX} $(CORE_CXXFLAGS) -DCORE_LEVEL=3 $(INCLUDE) -c $< -o $@
diff --git a/sci-libs/libcore/libcore-1.7.ebuild b/sci-libs/libcore/libcore-1.7.ebuild
deleted file mode 100644
index 2a32fcc8fae8..000000000000
--- a/sci-libs/libcore/libcore-1.7.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/libcore/libcore-1.7.ebuild,v 1.5 2009/02/02 23:01:37 bicatali Exp $
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Robust numerical and geometric computation library"
-HOMEPAGE="http://www.cs.nyu.edu/exact/core_pages/"
-MYP="${PN/lib}"
-SRC_URI="http://cs.nyu.edu/exact/core/download/prerelease/${MYP}_v${PV}x_std.tgz"
-
-LICENSE="QPL-1.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-DEPEND="dev-libs/gmp
-	doc? ( virtual/latex-base ) "
-RDEPEND=""
-
-S="${WORKDIR}/${MYP}_v${PV}x"
-
-src_unpack(){
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}.patch
-	sed -i \
-		-e "s/-O2/${CXXFLAGS}/g" \
-		-e "s/-shared/-shared ${LDFLAGS}/g" \
-		Make.config || die
-}
-
-src_compile(){
-	emake CXX="$(tc-getCXX)" corelib || die "Unable to create corelib"
-	emake CXX="$(tc-getCXX)" corex || die "Unable to create corex"
-	if use doc; then
-		cd "${S}/doc"
-		emake all || die "Unable to create doc"
-	fi
-}
-
-src_install(){
-	dolib lib/*.a lib/*.so || die "Unable to find libraries"
-	for i in $(find "${D}/usr/lib/" -name "*so" | sed "s:${D}::g"); do
-		dosym $i $i.1 && dosym $i $i.1.0.0 || die "Unable to sym $i"
-	done
-
-	dodir /usr/include || die "Unable to create include dir"
-	cp -r ./inc/* "${D}/usr/include/" || die "Unable to copy headers"
-
-	dodoc FAQs README || die "Unable to install default doc"
-	if use doc; then
-		dodoc doc/ANNOUNCEMENT* doc/*pdf doc/papers/* || \
-			die "Unable to install doc"
-	fi
-}
diff --git a/sci-libs/libcore/libcore-2.0.8.ebuild b/sci-libs/libcore/libcore-2.0.8.ebuild
new file mode 100644
index 000000000000..f0b1fea85f91
--- /dev/null
+++ b/sci-libs/libcore/libcore-2.0.8.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/libcore/libcore-2.0.8.ebuild,v 1.1 2009/08/13 00:28:42 bicatali Exp $
+
+EAPI=2
+inherit eutils toolchain-funcs versionator
+
+MYPN=core
+DOCPV="$(get_version_component_range 1-2)"
+
+DESCRIPTION="Robust numerical and geometric computation library"
+HOMEPAGE="http://www.cs.nyu.edu/exact/core_pages/"
+SRC_URI="http://cs.nyu.edu/exact/core/download/${MYPN}/${MYPN}-${PV}.tgz
+	doc? ( http://cs.nyu.edu/exact/core/download/${MYPN}/${MYPN}-${DOCPV}.doc.tgz )"
+
+LICENSE="QPL-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-libs/mpfr
+	dev-libs/gmp
+	doc? ( app-doc/doxygen[latex] )"
+
+S="${WORKDIR}/${MYPN}-${PV}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-makefiles.patch
+	sed -i \
+		-e "s/-O2/${CXXFLAGS}/g" \
+		-e "s/-shared/-shared ${LDFLAGS}/g" \
+		Make.config || die
+	sed -i -e 's/-lgmp/-lgmp -lgmpxx/g' progs/Make.options || die
+	# missing input file in gaussian test and buggy test in tutorial
+	sed -i -e '/gaussian/d' -e '/tutorial/d' progs/Makefile || die
+}
+
+src_compile(){
+	emake VAR= LINKAGE=shared corelib corex USE_GMPXX=1 || die "emake shared failed"
+	rm -f src/*.o ext/*.o
+	emake VAR="" corelib corex USE_GMPXX=1 || die "emake static failed"
+	if use doc; then
+		cd "${S}/doc"
+		export VARTEXFONTS="${T}/fonts"
+		emake -j1 all || die "doc creation failed"
+		emake -j1 -C doxy/latex pdf || die "pdf doc creation failed"
+	fi
+}
+
+src_test() {
+	LD_LIBRARY_PATH="${S}/lib" emake VAR="" test || die "emake test failed"
+}
+
+src_install(){
+	dolib lib/*.a lib/*.so* || die "Unable to find libraries"
+	for i in $(find "${D}/usr/$(get_libdir)" -name "*so" | sed "s:${D}::g"); do
+		dosym $i.2.0.0 $i.2 && dosym $i.2 $i || die "Unable to sym $i"
+	done
+
+	dodir /usr/include || die "Unable to create include dir"
+	cp -r ./inc/* "${D}/usr/include/" || die "Unable to copy headers"
+
+	dodoc FAQs README
+	if use doc; then
+		dodoc doc/*.txt
+		insinto /usr/share/doc/${PF}
+		doins doc/papers/* doc/tutorial/tutorial.pdf || die
+		doins -r doc/doxy/html doc/doxy/latex/*pdf || die
+	fi
+}
diff --git a/sci-libs/libcore/metadata.xml b/sci-libs/libcore/metadata.xml
index 3190fbf9c377..316dc3d398c3 100644
--- a/sci-libs/libcore/metadata.xml
+++ b/sci-libs/libcore/metadata.xml
@@ -1,5 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci-geosciences</herd>
+<herd>sci-geosciences</herd>
+<longdescription lang='en'>  
+  The Core Library is a collection of C/C++ classes for exact
+  computation with real algebraic numbers.
+  It embodies our precision-driven approach and is 
+  useful for robust numerical (especially geometric) algorithms.
+  The library supports the Exact Geometric Computation (EGC)
+  philosophy through its novel and easy-to-use notion of accuracy
+  levels.
+</longdescription>
 </pkgmetadata>