public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] proj/sci:master commit in: sci-mathematics/polymake/files/, sci-mathematics/polymake/
@ 2012-03-15  4:05 Christoph Junghans
  0 siblings, 0 replies; 2+ messages in thread
From: Christoph Junghans @ 2012-03-15  4:05 UTC (permalink / raw
  To: gentoo-commits

commit:     22bc8c836dda8afa828a9cb2d9efe0065bcb1fd7
Author:     Burcin Erocal <burcin <AT> erocal <DOT> org>
AuthorDate: Wed Mar 14 22:07:18 2012 +0000
Commit:     Christoph Junghans <kleiner_otti <AT> gmx <DOT> de>
CommitDate: Wed Mar 14 22:15:09 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=22bc8c83

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-mathematics/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.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/files/polymake-2.11-drop-jreality.patch 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 ${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.11-r1.ebuild b/sci-mathematics/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=2
+
+inherit eutils flag-o-matic
+
+MY_PV=${PV}
+
+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 ~amd64-linux ~x86-linux"
+
+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}/${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=\"-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
+	./configure --prefix="${EPREFIX}/usr" \
+		--without-java \
+		--without-prereq \
+		--libdir="${EPREFIX}/usr/$(get_libdir)" \
+		--libexecdir="${EPREFIX}/usr/$(get_libdir)/polymake" \
+		"${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."
+}



^ permalink raw reply related	[flat|nested] 2+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-mathematics/polymake/files/, sci-mathematics/polymake/
@ 2013-12-29  0:31 Justin Lecher
  0 siblings, 0 replies; 2+ messages in thread
From: Justin Lecher @ 2013-12-29  0:31 UTC (permalink / raw
  To: gentoo-commits

commit:     8254a134f7edcc84dc96f784f38566eff8678f2e
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 28 23:54:46 2013 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sat Dec 28 23:54:46 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=8254a134

More up to date version in tree

Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>

---
 sci-mathematics/polymake/ChangeLog                 |  8 ---
 sci-mathematics/polymake/files/2.10-soname.patch   | 11 ---
 .../files/polymake-2.11-drop-jreality.patch        | 25 -------
 sci-mathematics/polymake/metadata.xml              | 17 -----
 sci-mathematics/polymake/polymake-2.11-r1.ebuild   | 82 ----------------------
 5 files changed, 143 deletions(-)

diff --git a/sci-mathematics/polymake/ChangeLog b/sci-mathematics/polymake/ChangeLog
deleted file mode 100644
index 91e35b6..0000000
--- a/sci-mathematics/polymake/ChangeLog
+++ /dev/null
@@ -1,8 +0,0 @@
-# ChangeLog for sci-mathematics/polymake
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: $
-
-  03 Mar 2013; Justin Lecher <jlec@gentoo.org> polymake-2.11-r1.ebuild,
-  metadata.xml:
-  Add missing multilib.eclass
-

diff --git a/sci-mathematics/polymake/files/2.10-soname.patch b/sci-mathematics/polymake/files/2.10-soname.patch
deleted file mode 100644
index 14e66ea..0000000
--- a/sci-mathematics/polymake/files/2.10-soname.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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/files/polymake-2.11-drop-jreality.patch b/sci-mathematics/polymake/files/polymake-2.11-drop-jreality.patch
deleted file mode 100644
index 0eefe58..0000000
--- a/sci-mathematics/polymake/files/polymake-2.11-drop-jreality.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-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 ${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/metadata.xml b/sci-mathematics/polymake/metadata.xml
deleted file mode 100644
index 86e481e..0000000
--- a/sci-mathematics/polymake/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer>
-    <email>tomka@gentoo.org</email>
-    <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,
-tight spans of finite metric spaces, and other objects. 
-</longdescription>
-</pkgmetadata>

diff --git a/sci-mathematics/polymake/polymake-2.11-r1.ebuild b/sci-mathematics/polymake/polymake-2.11-r1.ebuild
deleted file mode 100644
index e75f91f..0000000
--- a/sci-mathematics/polymake/polymake-2.11-r1.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=2
-
-inherit eutils flag-o-matic multilib
-
-MY_PV=${PV}
-
-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 ~amd64-linux ~x86-linux"
-
-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}/${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=\"-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
-	./configure --prefix="${EPREFIX}/usr" \
-		--without-java \
-		--without-prereq \
-		--libdir="${EPREFIX}/usr/$(get_libdir)" \
-		--libexecdir="${EPREFIX}/usr/$(get_libdir)/polymake" \
-		"${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."
-}


^ permalink raw reply related	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2013-12-29  0:31 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-03-15  4:05 [gentoo-commits] proj/sci:master commit in: sci-mathematics/polymake/files/, sci-mathematics/polymake/ Christoph Junghans
  -- strict thread matches above, loose matches on Subject: below --
2013-12-29  0:31 Justin Lecher

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox