From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1S81x0-0004G1-6S for garchives@archives.gentoo.org; Thu, 15 Mar 2012 04:06:06 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C1802E0870; Thu, 15 Mar 2012 04:05:56 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 79498E0870 for ; Thu, 15 Mar 2012 04:05:56 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 829C01EC044 for ; Thu, 15 Mar 2012 04:05:55 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 3B559E5402 for ; Thu, 15 Mar 2012 04:05:54 +0000 (UTC) From: "Christoph Junghans" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Christoph Junghans" Message-ID: <1331763309.22bc8c836dda8afa828a9cb2d9efe0065bcb1fd7.kleiner_otti@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sci-mathematics/polymake/files/, sci-mathematics/polymake/ X-VCS-Repository: proj/sci X-VCS-Files: sci-mathematics/polymake/files/2.10-soname.patch sci-mathematics/polymake/files/polymake-2.11-drop-jreality.patch sci-mathematics/polymake/polymake-2.11-r1.ebuild X-VCS-Directories: sci-mathematics/polymake/files/ sci-mathematics/polymake/ X-VCS-Committer: kleiner_otti X-VCS-Committer-Name: Christoph Junghans X-VCS-Revision: 22bc8c836dda8afa828a9cb2d9efe0065bcb1fd7 X-VCS-Branch: master Date: Thu, 15 Mar 2012 04:05:54 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 6d37dcf0-da19-404e-9c2d-e4785c8be14a X-Archives-Hash: cf353bc6574f8285b0d7b4af21ab7343 commit: 22bc8c836dda8afa828a9cb2d9efe0065bcb1fd7 Author: Burcin Erocal erocal org> AuthorDate: Wed Mar 14 22:07:18 2012 +0000 Commit: Christoph Junghans gmx de> CommitDate: Wed Mar 14 22:15:09 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/sci.git;a=3Dc= ommit;h=3D22bc8c83 Make sci-mathematics/polymake work with gentoo-prefix. --- sci-mathematics/polymake/files/2.10-soname.patch | 11 +++ .../files/polymake-2.11-drop-jreality.patch | 25 ++++++ sci-mathematics/polymake/polymake-2.11-r1.ebuild | 82 ++++++++++++++= ++++++ 3 files changed, 118 insertions(+), 0 deletions(-) diff --git a/sci-mathematics/polymake/files/2.10-soname.patch b/sci-mathe= matics/polymake/files/2.10-soname.patch new file mode 100644 index 0000000..14e66ea --- /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.0000000= 00 +0100 ++++ polymake-2.10/support/corelib.make 2011-08-20 23:42:29.000000000 +01= 00 +@@ -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} ${GlueObje= cts} ${CallableGlueObjects} ${XXSObjects} $(patsubst %,${SourceDir}/perl/= %.xs,${XSModules}) +- ${CXX} ${LDcallableFlags} -o $@ ${SharedObjects} ${CallableSharedObjec= ts} ${GlueObjects} ${CallableGlueObjects} ${XXSObjects} ${XSObjects} ${LD= FLAGS} ${PERLccdlflags} -lmpfr -lgmp ${LIBS} -L${PERLarchlib}/CORE -lperl ++ ${CXX} ${LDcallableFlags} -Wl,-soname,libpolymake.so.0 -o $@ ${SharedO= bjects} ${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/files/polymake-2.11-drop-jreality.p= atch b/sci-mathematics/polymake/files/polymake-2.11-drop-jreality.patch new file mode 100644 index 0000000..0eefe58 --- /dev/null +++ b/sci-mathematics/polymake/files/polymake-2.11-drop-jreality.patch @@ -0,0 +1,25 @@ +diff -U 3 -dHrN polymake-2.11.orig/Makefile polymake-2.11/Makefile +--- polymake-2.11.orig/Makefile 2011-12-23 15:51:41.762207359 +0100 ++++ polymake-2.11/Makefile 2011-12-23 15:52:13.889973019 +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 ${In= stallTop} ${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.11-r1.ebuild b/sci-mathe= matics/polymake/polymake-2.11-r1.ebuild new file mode 100644 index 0000000..1512501 --- /dev/null +++ b/sci-mathematics/polymake/polymake-2.11-r1.ebuild @@ -0,0 +1,82 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=3D2 + +inherit eutils flag-o-matic + +MY_PV=3D${PV} + +DESCRIPTION=3D"research tool for polyhedral geometry and combinatorics" +SRC_URI=3D"http://polymake.org/lib/exe/fetch.php/download/${PN}-${MY_PV}= .tar.bz2" +HOMEPAGE=3D"http://polymake.org" + +IUSE=3D"libpolymake" + +SLOT=3D"0" +LICENSE=3D"GPL-2" +KEYWORDS=3D"~amd64 ~x86 ~amd64-linux ~x86-linux" + +DEPEND=3D"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=3D"${DEPEND}" + +src_prepare() { + # embedded jreality is a precompiled desaster (bug #346073) + epatch "${FILESDIR}/${P}"-drop-jreality.patch + # Assign a soname + epatch "${FILESDIR}/2.10"-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=3D\"-j1\" if" + einfo "you run into trouble." +} + +src_configure () { + export CXXOPT=3D$(get-flag -O) + local myconf + if use libpolymake ; then + # WTF: If we leave myconf as the empty string here + # then configure will fail. + myconf=3D"--without-prereq" + else + # --with-callable is not supported :( + myconf=3D"--without-callable" + fi + echo ${myconf} + # Configure does not accept --host, therefore econf cannot be used + ./configure --prefix=3D"${EPREFIX}/usr" \ + --without-java \ + --without-prereq \ + --libdir=3D"${EPREFIX}/usr/$(get_libdir)" \ + --libexecdir=3D"${EPREFIX}/usr/$(get_libdir)/polymake" \ + "${myconf}" || die +} + +src_install(){ + emake -j1 DESTDIR=3D"${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-compile= d" + 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." +}