Updated ebuild without jReality (see bug 346073)

Package-Manager: portage-2.1.9.26/cvs/Linux i686

4 files changed, 116 insertions, 5 deletions

diff --git a/sci-mathematics/polymake/ChangeLog b/sci-mathematics/polymake/ChangeLog
index db71e6c4a5cd..850982c6a0b9 100644
--- a/sci-mathematics/polymake/ChangeLog
+++ b/sci-mathematics/polymake/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-mathematics/polymake
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/polymake/ChangeLog,v 1.3 2010/11/17 08:10:17 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/polymake/ChangeLog,v 1.4 2010/12/26 22:19:06 tomka Exp $
+
+*polymake-2.9.9-r1 (26 Dec 2010)
+
+  26 Dec 2010; Thomas Kahle <tomka@gentoo.org>
+  +files/2.9.9-drop-jreality.patch, +polymake-2.9.9-r1.ebuild:
+  Updated ebuild without jReality (see bug 346073)
 
   17 Nov 2010; Thomas Kahle <tomka@gentoo.org> polymake-2.9.9.ebuild:
   Missing || die on configure. Thx maekke.
diff --git a/sci-mathematics/polymake/Manifest b/sci-mathematics/polymake/Manifest
index 6f954893913e..869108b85bd5 100644
--- a/sci-mathematics/polymake/Manifest
+++ b/sci-mathematics/polymake/Manifest
@@ -1,15 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+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.9.9.tar.bz2 12656699 RMD160 460364c8d0b897eeb0c3aa4d838dd15e16b3b4e0 SHA1 3aff2105ce2903a25afbd01418b80905a278b354 SHA256 f914dbb4283e3f11c94d2fa7e0da9383c506e15678fe7b05c52eeb939508215e
+EBUILD polymake-2.9.9-r1.ebuild 2055 RMD160 06e1de240a3d25af6bc29670242e93ca3ae84c42 SHA1 982f9a9cc67286ba2419a158d80c2e3fb1679d1d SHA256 b58ba79338e1edf6cbf1dac0f23eab04c085ac9361960e27a403a0c836d764ee
 EBUILD polymake-2.9.9.ebuild 1766 RMD160 c50e795018d10a7bc1cee623f4addd6f6ececf0c SHA1 fa85d0c35b731cba7eea978ddfaec9d362a0654c SHA256 0dae5baa8a54274b64528f1f3ce66ddd3c34a638de1fc1a001f5af97f2b18d18
-MISC ChangeLog 736 RMD160 ed291fb6df71489653adefead1c24b3cb958c4cb SHA1 b086d09a30af56bf7703e76fabffdc2d0550d95b SHA256 f2e5102378c4f9abb34f56b6309edaeb0dd882d813821470c9979b18b0b3cffd
+MISC ChangeLog 932 RMD160 d8efd8cfab28991f06430cc0db7859a95ab296ea SHA1 ba9d12641f38d9c21f822cf58b4ac60a21ffa46c SHA256 240f25c169aeb1c4d8984d9c5ec757e4f247cd660caafbd6ee9d4f4976ee74a4
 MISC metadata.xml 494 RMD160 fde821a32a5c7a56b5b1f8a362601c44b3e5aec3 SHA1 214be3dc092fdc69a656bf9803cb48c5f63b2139 SHA256 07bcf391504a1c75b3a28ef234ec6923bbb10f53105b61f1cc849befe82d9455
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkzjje0ACgkQnZsgo/h8kNbleACeIByjL/u1pmd8rkVcFVHmF64K
-I/wAoKCvoyXabUUur4V4S/vM66rdJ05f
-=dIJ9
+iEYEARECAAYFAk0Xv68ACgkQnZsgo/h8kNbL0ACdHoZabDisaAgsVEaPLr4ZsLpD
+iDsAmQFm5i38SHkUffuYIxU9tPJ3AUqO
+=UnaQ
 -----END PGP SIGNATURE-----
diff --git a/sci-mathematics/polymake/files/2.9.9-drop-jreality.patch b/sci-mathematics/polymake/files/2.9.9-drop-jreality.patch
new file mode 100644
index 000000000000..2811b4fc93fc
--- /dev/null
+++ b/sci-mathematics/polymake/files/2.9.9-drop-jreality.patch
@@ -0,0 +1,33 @@
+--- Makefile	2010-11-19 14:34:32.000000000 +0100
++++ Makefile.new	2010-11-19 15:10:41.000000000 +0100
+@@ -89,7 +89,7 @@
+ 	@+$(call _MakeAppsBin,all-lib)
+ 
+ ifeq (${JavaBuild},n)
+-  all-java% clean-java :
++  all-java all-java-native all-java-jars clean-java :
+ 	@echo Build architecture ${Arch} was configured --without-java or ant utility was not found.
+ 	@echo Please repeat the configure step if you want to recompile the java modules.
+ 	false
+@@ -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})
+@@ -169,7 +169,6 @@
+ 	@+$(call _MakeAppsBin, install-src)
+ 	$(if ${.svn},${PERL} perl/polymake --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/polymake-2.9.9-r1.ebuild b/sci-mathematics/polymake/polymake-2.9.9-r1.ebuild
new file mode 100644
index 000000000000..857268078a6b
--- /dev/null
+++ b/sci-mathematics/polymake/polymake-2.9.9-r1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2010 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-r1.ebuild,v 1.1 2010/12/26 22:19:06 tomka 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"
+
+DEPEND="dev-libs/gmp
+	dev-libs/libxml2
+	dev-perl/XML-LibXML
+	dev-libs/libxslt
+	dev-perl/XML-LibXSLT
+	dev-perl/XML-Writer
+	dev-perl/Term-ReadLine-Gnu"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	# Upstream provided patch. Remove in version 3.0!
+	epatch "${FILESDIR}/${PV}-gentoo-binutils.patch"
+	epatch "${FILESDIR}/${PV}-drop-jreality.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)
+	# 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."
+}