bump to 2.10, fixes bug 364961, remove old

(Portage version: 2.1.10.11/cvs/Linux i686)

6 files changed, 128 insertions, 63 deletions

diff --git a/sci-mathematics/polymake/ChangeLog b/sci-mathematics/polymake/ChangeLog
index 5e441583e690..6134c2372457 100644
--- a/sci-mathematics/polymake/ChangeLog
+++ b/sci-mathematics/polymake/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-mathematics/polymake
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/polymake/ChangeLog,v 1.5 2011/03/02 21:08:21 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/polymake/ChangeLog,v 1.6 2011/08/20 22:57:21 tomka Exp $
+
+*polymake-2.10 (20 Aug 2011)
+
+  20 Aug 2011; Thomas Kahle <tomka@gentoo.org> +files/2.10-drop-jreality.patch,
+  +files/2.10-soname.patch, -polymake-2.9.9.ebuild, +polymake-2.10.ebuild:
+  bump to 2.10, fixes bug 364961
 
   02 Mar 2011; Justin Lecher <jlec@gentoo.org> polymake-2.9.9.ebuild,
   polymake-2.9.9-r1.ebuild:
diff --git a/sci-mathematics/polymake/files/2.10-drop-jreality.patch b/sci-mathematics/polymake/files/2.10-drop-jreality.patch
new file mode 100644
index 000000000000..1358647c6368
--- /dev/null
+++ b/sci-mathematics/polymake/files/2.10-drop-jreality.patch
@@ -0,0 +1,25 @@
+diff -U 3 -dHrN polymake-2.10/Makefile polymake-2.10.fixed/Makefile
+--- polymake-2.10/Makefile	2011-06-06 18:02:18.000000000 +0100
++++ polymake-2.10.fixed/Makefile	2011-08-13 13:58:59.000000000 +0100
+@@ -134,11 +134,11 @@
+ 	@case "$$(uname -s)" in \
+ 	 *linux*|*Linux*) \
+ 	   for d in linux32 linux64; do \
+-	     ${PERL} ${INSTALL_PL} -m ${DirMask} -U external/jreality/jni/$$d ${InstallArch}/lib/jreality/jni/$$d; \
++		true; \
+ 	   done; \
+ 	   ;; \
+          Darwin*|darwin*) \
+-	   ${PERL} ${INSTALL_PL} -m ${DirMask} -U external/jreality/jni/macosx ${InstallArch}/lib/jreality/jni/macosx; \
++		true; \
+ 	   ;; \
+ 	 esac
+ 	[ -d ${InstallBin} ] || $(call _CreateDir,${InstallBin})
+@@ -166,7 +166,6 @@
+ 	@+$(call _MakeApps, install-src)
+ 	$(if ${.svn},${CallPolymake} --no-config --script filter_rules -m ${InstallTop} ${Apps})
+ 	[ ! -d java_build ] || $(call _InstallSubdir,java_build,-X de)
+-	[ ! -d java_build ] || $(call _InstallSubdirRenamed,external/jreality/lib,java_build/jreality/lib)
+ 	$(call _InstallSubdir,povray)
+ 	$(call _InstallSubdir,scripts)
+ 	$(call _InstallSubdir,xml)
diff --git a/sci-mathematics/polymake/files/2.10-soname.patch b/sci-mathematics/polymake/files/2.10-soname.patch
new file mode 100644
index 000000000000..14e66eaeb81c
--- /dev/null
+++ b/sci-mathematics/polymake/files/2.10-soname.patch
@@ -0,0 +1,11 @@
+--- polymake-2.10.fixed/support/corelib.make	2011-06-20 08:30:06.000000000 +0100
++++ polymake-2.10/support/corelib.make	2011-08-20 23:42:29.000000000 +0100
+@@ -89,7 +89,7 @@
+ ifneq (${LDcallableFlags},none)
+   # no explicit dependence on XSObjects here because they are built in compile-xs using the Makefile generated by xsubpp
+   ${CallableLib} : ${SharedObjects} ${CallableSharedObjects} ${GlueObjects} ${CallableGlueObjects} ${XXSObjects} $(patsubst %,${SourceDir}/perl/%.xs,${XSModules})
+-	${CXX} ${LDcallableFlags} -o $@ ${SharedObjects} ${CallableSharedObjects} ${GlueObjects} ${CallableGlueObjects} ${XXSObjects} ${XSObjects} ${LDFLAGS} ${PERLccdlflags} -lmpfr -lgmp ${LIBS} -L${PERLarchlib}/CORE -lperl
++	${CXX} ${LDcallableFlags} -Wl,-soname,libpolymake.so.0 -o $@ ${SharedObjects} ${CallableSharedObjects} ${GlueObjects} ${CallableGlueObjects} ${XXSObjects} ${XSObjects} ${LDFLAGS} ${PERLccdlflags} -lmpfr -lgmp ${LIBS} -L${PERLarchlib}/CORE -lperl
+ else
+   ${CallableLib} : ${XXSObjects} $(patsubst %,${SourceDir}/perl/%.xs,${XSModules})
+ endif
diff --git a/sci-mathematics/polymake/metadata.xml b/sci-mathematics/polymake/metadata.xml
index dd2a5cb0ecda..b4c2856553f3 100644
--- a/sci-mathematics/polymake/metadata.xml
+++ b/sci-mathematics/polymake/metadata.xml
@@ -6,6 +6,9 @@
 <name>Thomas Kahle</name>
 </maintainer>
 <herd>sci-mathematics</herd>
+<use>
+  <flag name="libpolymake">Build the polymake library to build applications using the C++ interface.</flag>
+</use>
 <longdescription lang="en">
 Polymake started out as a tool for the algorithmic treatment of convex
 polyhedra. By now it also deals with finite simplicial complexes,
diff --git a/sci-mathematics/polymake/polymake-2.10.ebuild b/sci-mathematics/polymake/polymake-2.10.ebuild
new file mode 100644
index 000000000000..654a101e1719
--- /dev/null
+++ b/sci-mathematics/polymake/polymake-2.10.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/polymake/polymake-2.10.ebuild,v 1.1 2011/08/20 22:57:21 tomka Exp $
+
+EAPI=2
+
+inherit eutils flag-o-matic
+
+MY_PV=${PV}-2
+
+DESCRIPTION="research tool for polyhedral geometry and combinatorics"
+SRC_URI="http://polymake.org/lib/exe/fetch.php/download/${PN}-${MY_PV}.tar.bz2"
+HOMEPAGE="http://polymake.org"
+
+IUSE="libpolymake"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="dev-libs/gmp
+	dev-libs/boost
+	dev-libs/libxml2:2
+	dev-perl/XML-LibXML
+	dev-libs/libxslt
+	dev-perl/XML-LibXSLT
+	dev-perl/XML-Writer
+	dev-perl/Term-ReadLine-Gnu"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	# embedded jreality is a precompiled desaster (bug #346073)
+	epatch "${FILESDIR}/${PV}"-drop-jreality.patch
+	# Assign a soname (reported upstream, no answer)
+	epatch "${FILESDIR}/${PV}"-soname.patch
+	rm -rf java_build/jreality
+
+	# Don't strip
+	sed -i '/system "strip $to"/d' support/install.pl || die
+
+	einfo "During compile this package uses up to"
+	einfo "750MB of RAM per process. Use MAKEOPTS=\"-j1\" if"
+	einfo "you run into trouble."
+}
+
+src_configure () {
+	export CXXOPT=$(get-flag -O)
+	local myconf
+	if use libpolymake ; then
+		# WTF: If we leave myconf as the empty string here
+		# then configure will fail.
+		myconf="--without-prereq"
+	else
+		# --with-callable is not supported :(
+		myconf="--without-callable"
+	fi
+	echo ${myconf}
+	# Configure does not accept --host, therefore econf cannot be used
+	# Note 'libdir' does not mean where to put .so files!
+	# --libdir=/usr/$(get_libdir) \
+	./configure --prefix=/usr \
+		--without-java \
+		--without-prereq \
+		"${myconf}" || die
+}
+
+src_install(){
+	emake -j1 DESTDIR="${D}" install || die "install failed"
+}
+
+pkg_postinst(){
+	elog "Polymake uses Perl Modules compiled during install."
+	elog "You have to reinstall polymake after an upgrade of Perl."
+	elog " "
+	elog "This version of polymake does not ship docs. Sorry."
+	elog "Help can be found on http://www.opt.tu-darmstadt.de/polymake_doku/ "
+	elog " "
+	elog "Visualization in polymake is via jreality which ships pre-compiled"
+	elog "binary libraries.  Until this situation is resolved, support for"
+	elog "jreality has been dropped.  Please contribute to Bug #346073 to "
+	elog "make jreality available in Gentoo."
+}
diff --git a/sci-mathematics/polymake/polymake-2.9.9.ebuild b/sci-mathematics/polymake/polymake-2.9.9.ebuild
deleted file mode 100644
index 84bdd79dab0b..000000000000
--- a/sci-mathematics/polymake/polymake-2.9.9.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/polymake/polymake-2.9.9.ebuild,v 1.3 2011/03/02 21:08:21 jlec Exp $
-
-EAPI=2
-
-inherit eutils flag-o-matic
-
-DESCRIPTION="research tool for polyhedral geometry and combinatorics"
-SRC_URI="http://www.opt.tu-darmstadt.de/polymake/lib/exe/fetch.php/download/${P}.tar.bz2"
-
-HOMEPAGE="http://www.opt.tu-darmstadt.de/polymake"
-
-IUSE=""
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-
-# TODO: Drop java.
-DEPEND="dev-libs/gmp
-	dev-libs/libxml2:2
-	dev-perl/XML-LibXML
-	dev-libs/libxslt
-	dev-perl/XML-LibXSLT
-	dev-perl/XML-Writer
-	dev-perl/Term-ReadLine-Gnu
-	>=virtual/jdk-1.5.0"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}/${PV}-gentoo-binutils.patch"
-	sed -i '/system "strip $to"/d' support/install.pl
-
-	einfo "During compile this package uses up to"
-	einfo "750MB of RAM per process. Use MAKEOPTS=\"-j1\" if"
-	einfo "you run into trouble."
-}
-
-src_configure () {
-	export CXXOPT=$(get-flag -O)
-	# Configure does not accept --host, therefore econf cannot be used
-	./configure --prefix=/usr \
-		--libdir=/usr/$(get_libdir) \
-		|| die "configure failed"
-}
-
-src_install(){
-	emake -j1 DESTDIR="${D}" install || die "install failed"
-}
-
-pkg_postinst(){
-	elog "Polymake uses Perl Modules compiled during install."
-	elog "You have to reinstall polymake after an upgrade of Perl."
-	elog " "
-	elog "This version of polymake does not ship docs. Sorry."
-	elog "Help can be found on http://www.opt.tu-darmstadt.de/polymake_doku/ "
-	elog " "
-	elog "On first start, polymake will ask you about the locations"
-	elog "of external programs it can use."
-	elog "If the initial run crashes, please report to the developers."
-}