Version bump, switch to EAPI4, updated makefile patch

Package-Manager: portage-2.1.10.10/cvs/Linux x86_64

4 files changed, 212 insertions, 3 deletions

diff --git a/sci-libs/libcore/ChangeLog b/sci-libs/libcore/ChangeLog
index 0b45c3c934a1..c05f4afded2e 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.6 2009/08/13 00:28:42 bicatali Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/libcore/ChangeLog,v 1.7 2011/08/07 00:03:25 bicatali Exp $
+
+*libcore-2.1.1 (07 Aug 2011)
+
+  07 Aug 2011; Sébastien Fabbro <bicatali@gentoo.org>
+  +files/2.1.1-makefiles.patch, +libcore-2.1.1.ebuild:
+  Version bump, switch to EAPI4, updated makefile patch
 
 *libcore-2.0.8 (13 Aug 2009)
 
diff --git a/sci-libs/libcore/Manifest b/sci-libs/libcore/Manifest
index e0d62ab79bd4..ca6e57b4337f 100644
--- a/sci-libs/libcore/Manifest
+++ b/sci-libs/libcore/Manifest
@@ -1,10 +1,24 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX 2.1.1-makefiles.patch 4387 RMD160 cfa9f6f93845c5436053a482fbd35498f6d181ab SHA1 40f6ec1fa1c5ff2f9e2e63d429c417ec3ec489a4 SHA256 a3070a003f584766d5214a9aadf9d25e06d79235cfc7388fc4f64508f8b661ce
 AUX libcore-1.7.patch 3369 RMD160 df1e195c7a46c4e9143b53a73b57a52222915d3f SHA1 b2fcb273784490b5c15b4259506ebff89942384b SHA256 984d6d306efe09e3d9131b79d7ee6d369052313ba20385fbad73c8398eda0724
 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-2.1.1.tgz 2759163 RMD160 47fb3ae687d66ba527e67cae9975c7bd9e8605c0 SHA1 a7f23af72ccfc7129a2317dd22ca6c5dc068479e SHA256 61b2086563d43f3546ec6de2ddd25ccc0c950c2f0c5f5f13448adf26e3143cbe
+DIST core-2.1.doc.tgz 657871 RMD160 e3110695b026cedf790815501d69e2f7da0f999d SHA1 01b555540ba1acc8f77e84ab0d280bf608c915f6 SHA256 e2297a2efd2b9b090aac51343a11c38d3b76bfd69784a5152504cea7068d0c9a
 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.8.ebuild 1716 RMD160 d1f842f4303c14470cb1ee3e8bbb78f2050d97cb SHA1 8b05215edd3c67b85ae220e38e79255ef42c69fa SHA256 457b37017355aeee7cbbb69becd6e13a0d630eefe75a18644ffbae3df5fb585f
 EBUILD libcore-2.0.8.ebuild 2148 RMD160 02ed099212ca1c24d6a1cbafb48e525646093404 SHA1 76edf3dbac8ac103ca5871b05805761f92dad73c SHA256 961432c6bc6acaa3003e5b117798491d308ca8df45ccac7e7d64ad7034f53852
-MISC ChangeLog 1227 RMD160 80a63291a11a066ec2ed812b5d4689c53cbb9fb3 SHA1 3e5fdc742e2befbdbdef1d5a61acd4e649ae87df SHA256 123c8d0f2c0b5927cc2d1eaebb96e306f6425cd4f24fcbf19a93823d06d3c6fd
+EBUILD libcore-2.1.1.ebuild 1908 RMD160 ceaf0368804edfea975dce5b44e208beedf7bd03 SHA1 f35673e13614118e65a330ce68b25a3cf85608f9 SHA256 84132cf6a8e64b4e7684477905c1e4934473f083620df18db45b6b9ee7aca5dd
+MISC ChangeLog 1424 RMD160 43e708f221528e54191db21dbaca5e54ecf55a79 SHA1 9a1ac979aadb4382e23d1cafc3faa063573189b6 SHA256 0f4966e6cc6d9fe702d5c687cae38027195b4250d4c25e1358b737799a4c16bf
 MISC metadata.xml 576 RMD160 d6a14a462cbf5b3e29fbc681d63485cd55fb2506 SHA1 a8508e2bd0ce0201af66f3a475437753432bd7ff SHA256 3665a5319789e142daa2d351d756f6cefc9535eefac9afecfe95d2848ba82aa0
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iEYEARECAAYFAk491loACgkQ1ycZbhPLE2At5gCfTvVVWGG9r0JCIwI13c2/UYPS
+ERYAn1qihmXqfaqPLv8eeSm8ZABgte0K
+=Kndu
+-----END PGP SIGNATURE-----
diff --git a/sci-libs/libcore/files/2.1.1-makefiles.patch b/sci-libs/libcore/files/2.1.1-makefiles.patch
new file mode 100644
index 000000000000..09a8f5be2f38
--- /dev/null
+++ b/sci-libs/libcore/files/2.1.1-makefiles.patch
@@ -0,0 +1,115 @@
+diff -Nur core-2.1.1.orig/ext/Makefile core-2.1.1/ext/Makefile
+--- core-2.1.1.orig/ext/Makefile	2011-08-06 22:53:29.000000000 +0100
++++ core-2.1.1/ext/Makefile	2011-08-07 00:40:58.000000000 +0100
+@@ -38,16 +38,18 @@
+   endif
+ endif
+ 
+-INCLUDE=-I${CORE_PATH}/inc -I${CORE_PATH}/gmp/include \
+-	-I${CORE_PATH}/mpfr/include
++INCLUDE=-I${CORE_PATH}/inc
+ 
+ 
+ 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.${CORE_DYLIB_EXTENSION}
+-COREX_SHARED_LIB_LEVEL2=${CORE_PATH}/lib/libcorex++$(VAR)_level2.${CORE_DYLIB_EXTENSION}
+-COREX_SHARED_LIB_LEVEL1=${CORE_PATH}/lib/libcorex++$(VAR)_level1.${CORE_DYLIB_EXTENSION}
++COREX_SHARED_LIB_LEVEL3_NAME=libcorex++$(VAR)_level3.${CORE_DYLIB_EXTENSION}.2
++COREX_SHARED_LIB_LEVEL2_NAME=libcorex++$(VAR)_level2.${CORE_DYLIB_EXTENSION}.2
++COREX_SHARED_LIB_LEVEL1_NAME=libcorex++$(VAR)_level1.${CORE_DYLIB_EXTENSION}.2
++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}
+ 
+@@ -74,11 +76,11 @@
+ 	-@rm -rf $@ 
+ 	$(AR) $@ $?
+ 
+-COREX_SHARED_DEPS=-L${GMP_PREFIX}/lib -lgmp -L${MPFR_PREFIX}/lib -lmpfr -L${CORE_PATH}/lib -lcore++${VAR}
++COREX_SHARED_DEPS= -lgmp -lmpfr -L${CORE_PATH}/lib -lcore++${VAR}
+ 
+ ${COREX_SHARED_LIB_LEVEL3}: ${L3_OBJS}
+ 	-@rm -rf $@ 
+-	$(CXX) $(COREX_SHARED_DEPS) $(CORE_LDFLAGS) -o $@ $?
++	$(CXX) $(LDFLAGS) $(COREX_SHARED_DEPS) $(CORE_LDFLAGS)  -Wl,-soname,$(COREX_SHARED_LIB_LEVEL3_NAME) -o $@ $?
+ 
+ ${COREX_LIB_LEVEL2}: ${L2_OBJS}
+ 	-@rm -rf $@ 
+@@ -86,7 +88,7 @@
+ 
+ ${COREX_SHARED_LIB_LEVEL2}: ${L2_OBJS}
+ 	-@rm -rf $@ 
+-	$(CXX) $(COREX_SHARED_DEPS) $(CORE_LDFLAGS) -o $@ $?
++	$(CXX) $(LDFLAGS) $(COREX_SHARED_DEPS) $(CORE_LDFLAGS) -Wl,-soname,$(COREX_SHARED_LIB_LEVEL2_NAME) -o $@ $?
+ 
+ ${COREX_LIB_LEVEL1}: ${L1_OBJS}
+ 	-@rm -rf $@ 
+@@ -94,7 +96,7 @@
+ 
+ ${COREX_SHARED_LIB_LEVEL1}: ${L1_OBJS}
+ 	-@rm -rf $@ 
+-	$(CXX) $(COREX_SHARED_DEPS) $(CORE_LDFLAGS) -o $@ $?
++	$(CXX) $(LDFLAGS) $(COREX_SHARED_DEPS) $(CORE_LDFLAGS)  -Wl,-soname,$(COREX_SHARED_LIB_LEVEL1_NAME) -o $@ $?
+ 
+ %_level3.o:	%.cpp
+ 	${CXX} $(CORE_CXXFLAGS) -DCORE_LEVEL=3 $(INCLUDE) -c $< -o $@
+diff -Nur core-2.1.1.orig/progs/Make.options core-2.1.1/progs/Make.options
+--- core-2.1.1.orig/progs/Make.options	2011-08-06 22:53:29.000000000 +0100
++++ core-2.1.1/progs/Make.options	2011-08-06 23:31:01.000000000 +0100
+@@ -11,10 +11,8 @@
+ 
+ include $(CORE_PATH)/Make.config
+ 
+-CORE_INC=-I. -I$(CORE_PATH)/inc -I$(CORE_PATH)/mpfr/include \
+-	 -I$(CORE_PATH)/gmp/include
+-CORE_LIB=-L$(CORE_PATH)/lib -L$(CORE_PATH)/mpfr/lib -L$(CORE_PATH)/gmp/lib \
+-	 -lcore++$(VAR) -lmpfr -lgmp
++CORE_INC=-I. -I$(CORE_PATH)/inc
++CORE_LIB=-L$(CORE_PATH)/lib -lcore++$(VAR) -lmpfr -lgmp
+ 
+ COREX_LIB_LEVEL=-lcoreex++$(VAR)_level
+ 
+diff -Nur core-2.1.1.orig/src/Makefile core-2.1.1/src/Makefile
+--- core-2.1.1.orig/src/Makefile	2011-08-06 22:53:29.000000000 +0100
++++ core-2.1.1/src/Makefile	2011-08-07 00:24:38.000000000 +0100
+@@ -23,7 +23,7 @@
+   endif
+ endif
+ 
+-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.
+@@ -44,7 +44,8 @@
+ 
+ # The following library will be built:
+ CORE_LIB=$(CORE_PATH)/lib/libcore++${VAR}.a
+-CORE_SHARED_LIB=$(CORE_PATH)/lib/libcore++${VAR}.${CORE_DYLIB_EXTENSION}
++CORE_SHARED_LIB_NAME=libcore++${VAR}.${CORE_DYLIB_EXTENSION}.2
++CORE_SHARED_LIB=$(CORE_PATH)/lib/$(CORE_SHARED_LIB_NAME)
+ 
+ TARGET=$(CORE_LIB)
+ 
+@@ -52,7 +53,7 @@
+   TARGET+=$(CORE_SHARED_LIB)
+ endif
+ 
+-DEPS=-L${GMP_PREFIX}/lib -L${MPFR_PREFIX}/lib -lgmp -lmpfr
++DEPS=-lgmp -lmpfr
+ 
+ # =============================================================
+ # RULES  ======================================================
+@@ -64,7 +65,7 @@
+ 	$(AR) $@ $^
+ 
+ ${CORE_SHARED_LIB}:	$(EXPROBJS)
+-	$(CXX) $(DEPS) $(CORE_LDFLAGS) -o $@ $^
++	$(CXX) $(LDFLAGS) $(CORE_LDFLAGS) -Wl,-soname,$(CORE_SHARED_LIB_NAME) $(DEPS) -o $@ $^ $(LIBS)
+ 
+ %${VAR}.o:	%.cpp
+ 	${CXX} $(CORE_CXXFLAGS) $(INCLUDE) -c $< -o $@
diff --git a/sci-libs/libcore/libcore-2.1.1.ebuild b/sci-libs/libcore/libcore-2.1.1.ebuild
new file mode 100644
index 000000000000..d75e9f43be13
--- /dev/null
+++ b/sci-libs/libcore/libcore-2.1.1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/libcore/libcore-2.1.1.ebuild,v 1.1 2011/08/07 00:03:25 bicatali Exp $
+
+EAPI=4
+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 static-libs"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-libs/mpfr
+	dev-libs/gmp
+	doc? ( app-doc/doxygen[latex] )"
+
+S="${WORKDIR}/${MYPN}-${PV}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PV}-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
+	rm -f src/*.o ext/*.o
+	use static-libs && emake VAR="" corelib corex USE_GMPXX=1
+	if use doc; then
+		cd "${S}/doc"
+		export VARTEXFONTS="${T}/fonts"
+		emake -j1 all
+		emake -j1 -C doxy/latex pdf
+	fi
+}
+
+src_test() {
+	LD_LIBRARY_PATH="${S}/lib" emake \
+		VAR= GMP_PREFIX= MPFR_PREFIX= test
+}
+
+src_install(){
+	dolib.so lib/*.so*
+	for i in $(find "${ED}/usr/$(get_libdir)" -name "*so" | sed "s:${ED}::g"); do
+		dosym $i.2 $i
+	done
+	use static-libs && dolib.a lib/*.a
+
+	insinto /usr/include
+	doins ./inc/*
+
+	dodoc FAQs README
+	if use doc; then
+		dodoc doc/*.txt
+		insinto /usr/share/doc/${PF}
+		doins doc/papers/* doc/tutorial/tutorial.pdf
+		doins -r doc/doxy/html doc/doxy/latex/*pdf
+	fi
+}