bump to 2.10, fixes bug 364961, remove old
authorThomas Kahle <tomka@gentoo.org>
Sat, 20 Aug 2011 22:57:21 +0000 (22:57 +0000)
committerThomas Kahle <tomka@gentoo.org>
Sat, 20 Aug 2011 22:57:21 +0000 (22:57 +0000)
Package-Manager: portage-2.1.10.11/cvs/Linux i686

sci-mathematics/polymake/ChangeLog
sci-mathematics/polymake/Manifest
sci-mathematics/polymake/files/2.10-drop-jreality.patch [new file with mode: 0644]
sci-mathematics/polymake/files/2.10-soname.patch [new file with mode: 0644]
sci-mathematics/polymake/metadata.xml
sci-mathematics/polymake/polymake-2.10.ebuild [new file with mode: 0644]
sci-mathematics/polymake/polymake-2.9.9.ebuild [deleted file]

index 5e441583e69078273b50e5876da4e8b56b801b72..6134c237245783fc51487457e2f2e9eb4a3c7005 100644 (file)
@@ -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:
index 3b4f653440d06c6d99a2660f07ab85561a8c6b23..0011433c4aeb8c395b7ee61c6d960584806a827b 100644 (file)
@@ -1,17 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
+AUX 2.10-drop-jreality.patch 1091 RMD160 6b1e49f3ca55319413db31479d501904a846c7b8 SHA1 ad9917f637def387799f5dd090e2f48d684944bb SHA256 25790558e1ba2a5491805c9d3851569db73036d658ac749f05e1f5ce8a0f5c7d
+AUX 2.10-soname.patch 1057 RMD160 a9b2344dacdde91ec1d3fa5d57e54ddaf6e53050 SHA1 a3a4830253d24731eeeb31a852dcb3ad49298f0f SHA256 3f1a3f2cebb4d2bebd26bc7b906bb3787e05efdab49075d37c736b5bec5cf204
 AUX 2.9.9-drop-jreality.patch 1336 RMD160 ff15f3a2847ed808d9f6f52cbf4c108c1749e996 SHA1 62979df738095c922bd22f19250e97c28f9ee782 SHA256 254a346f610f199b391a53004cee8d6a9b7632fedd887879dbe02750ab73d01b
 AUX 2.9.9-gentoo-binutils.patch 1193 RMD160 956cebb0a2579a748926c2c334d97c55715d2664 SHA1 32265c66312cb13cb756c9117b9286b9a7674bec SHA256 7dc0029fafce553de9205fb9e0e1566c47b851f418bd2151dd164641e6b1f733
+DIST polymake-2.10-2.tar.bz2 22276991 RMD160 c32687b1361eddfc27aeef3cec7719ed3b35c0dd SHA1 2990537954725d7da763f1f1fdcf6c2e954d94dc SHA256 48ecf60bbb52cbb190bc7800e949793c68c322615d67a4f8a481e06059e45752
 DIST polymake-2.9.9.tar.bz2 12656699 RMD160 460364c8d0b897eeb0c3aa4d838dd15e16b3b4e0 SHA1 3aff2105ce2903a25afbd01418b80905a278b354 SHA256 f914dbb4283e3f11c94d2fa7e0da9383c506e15678fe7b05c52eeb939508215e
+EBUILD polymake-2.10.ebuild 2364 RMD160 4471d47328b9f7db8fc353c389aa51ac141605ab SHA1 b46ec59ef9a35a94231188d71a3b3c1d589ae4c6 SHA256 734906c5508680910d0f5c53ab4a7d7859f19d7ad733ead423242ed7456f414b
 EBUILD polymake-2.9.9-r1.ebuild 2056 RMD160 8eb87a31267e3bd03244b0ec1a9e9dabbe8513c2 SHA1 5e0cc081738a1b9e247e34ac79eb1cb66bba66ca SHA256 9dd920d4f5058471082f8c80913a92c0b2535245a3386827119334ae3c91c994
-EBUILD polymake-2.9.9.ebuild 1767 RMD160 c28ebf87aef3051dc35ac27faa7378005297e396 SHA1 2d998e2cb5c00d5da015d56a9e590da0b4f59d0e SHA256 a6a58fc51030d1e86901cefd510ea87eeb5c0535cad8d4bd7668ca024bf68887
-MISC ChangeLog 1077 RMD160 4f5435b387b0abb47857deed59972abb9e6783e5 SHA1 87339bac76425deb28898a1c013eb36a66b6ea76 SHA256 69ed584c949fb82a2ecb6afb5788623cbaafa070717c9728eb61f21c2a619a36
-MISC metadata.xml 494 RMD160 fde821a32a5c7a56b5b1f8a362601c44b3e5aec3 SHA1 214be3dc092fdc69a656bf9803cb48c5f63b2139 SHA256 07bcf391504a1c75b3a28ef234ec6923bbb10f53105b61f1cc849befe82d9455
+MISC ChangeLog 1297 RMD160 4612dbce51d017a4159339cc16ea8fa02c20ff97 SHA1 e7e54498468260a91dd8ca896cba071a7db2b797 SHA256 afdf07a86b19c82ff8184b937400e606e922ba3690f7bf09c22c0b0c6e6a03e4
+MISC metadata.xml 615 RMD160 1779fe920cb0ac998ddc9477b005ba5d4bce073d SHA1 4ae7194efb2d6f693d8f24658e0da7210e335bbf SHA256 05a17f47de10b29c32a8edd01ed12ad2584e6f2762c931605af0e1845bed6895
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk1usdEACgkQgAnW8HDreRZT9wCfbmckxShYFHMp1/4JMDPSoFFz
-szMAn12L+H8uBqYVVBn/3eoSS2M8BiBD
-=Ln3y
+iF4EAREIAAYFAk5QO9cACgkQodBTJSDyo67KrQD/W/mafbCtaMFo1EIFBG4fjM5W
+pqkpTjEQHeCaibL2LzsA/2SvpqN8I0afa15fAs3hzVxCRHcfyXYXkRtloc6IAGTH
+=X2hY
 -----END PGP SIGNATURE-----
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 (file)
index 0000000..1358647
--- /dev/null
@@ -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 (file)
index 0000000..14e66ea
--- /dev/null
@@ -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
index dd2a5cb0ecda083f6b4f94402b2795c08c763b8e..b4c2856553f3ac9be122a908e216a8a0b228dcab 100644 (file)
@@ -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 (file)
index 0000000..654a101
--- /dev/null
@@ -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 (file)
index 84bdd79..0000000
+++ /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."
-}