From c32cd77cecde0a4bea9fd9978a36c98a3db56353 Mon Sep 17 00:00:00 2001 From: François Bissey Date: Thu, 15 Mar 2012 12:19:44 +1300 Subject: Remove old polybori ebuild from the tree. Get new stuff from sage-on-gentoo --- sci-mathematics/polybori/ChangeLog | 21 ----- sci-mathematics/polybori/Manifest | 1 - sci-mathematics/polybori/files/PyPolyBoRi.py | 22 ----- .../polybori/files/polybori-0.6.4-save-flags.patch | 14 --- .../files/polybori-0.6.5-fix-another-SIGSEGV.patch | 35 ------- .../polybori-0.6.5-fix-double-free-error.patch | 66 -------------- sci-mathematics/polybori/metadata.xml | 9 -- sci-mathematics/polybori/polybori-0.6.5-r2.ebuild | 101 --------------------- 8 files changed, 269 deletions(-) delete mode 100644 sci-mathematics/polybori/ChangeLog delete mode 100644 sci-mathematics/polybori/Manifest delete mode 100644 sci-mathematics/polybori/files/PyPolyBoRi.py delete mode 100644 sci-mathematics/polybori/files/polybori-0.6.4-save-flags.patch delete mode 100644 sci-mathematics/polybori/files/polybori-0.6.5-fix-another-SIGSEGV.patch delete mode 100644 sci-mathematics/polybori/files/polybori-0.6.5-fix-double-free-error.patch delete mode 100644 sci-mathematics/polybori/metadata.xml delete mode 100644 sci-mathematics/polybori/polybori-0.6.5-r2.ebuild (limited to 'sci-mathematics') diff --git a/sci-mathematics/polybori/ChangeLog b/sci-mathematics/polybori/ChangeLog deleted file mode 100644 index 323118561..000000000 --- a/sci-mathematics/polybori/ChangeLog +++ /dev/null @@ -1,21 +0,0 @@ -# ChangeLog for sci-mathematics/polybori -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: $ - -*polybori-0.6.5-r2 (11 Jan 2011) - - 11 Jan 2011; François Bissey - -polybori-0.6.3.ebuild, +files/polybori-0.6.4-save-flags.patch, - +polybori-0.6.5-r2.ebuild, +files/polybori-0.6.5-fix-another-SIGSEGV.patch, - +files/polybori-0.6.5-fix-double-free-error.patch: - bump to 0.6.5-r2 from s-o-g - - 29 Jun 2010; Justin Lecher polybori-0.6.3.ebuild: - Python ABI fixes - -*polybori-0.6.3 (22 Nov 2009) - - 22 Nov 2009; François Bissey - +polybori-0.6.3.ebuild, +files/PyPolyBoRi.py, +metadata.xml: - Initial import in the overlay - diff --git a/sci-mathematics/polybori/Manifest b/sci-mathematics/polybori/Manifest deleted file mode 100644 index f48524c07..000000000 --- a/sci-mathematics/polybori/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST polybori-0.6.5.tar.gz 2329636 RMD160 a244e022d0f21fb50e0478311a698c913b516350 SHA1 1ac8b77838944c9c3508f4611633783c5391ef29 SHA256 88546d765c0fc93db87326f7d0daba82651f2f5bfcc7dd002d425ab1d66ff5fd diff --git a/sci-mathematics/polybori/files/PyPolyBoRi.py b/sci-mathematics/polybori/files/PyPolyBoRi.py deleted file mode 100644 index d1008cb5d..000000000 --- a/sci-mathematics/polybori/files/PyPolyBoRi.py +++ /dev/null @@ -1,22 +0,0 @@ -from sage import all -from sage.rings.polynomial.pbori import * - -def global_ring(): - return get_cring() - -Polynomial = PolynomialFactory() - -Monomial = MonomialFactory() - -class OrderCode: - pass - -OrderCode.__dict__ = order_dict - -Variable = VariableFactory() - -def Ring(n, order='lp'): - return BooleanPolynomialRing(n, 'x', order=order) - -BoolePolynomialVector = BooleanPolynomialVector - diff --git a/sci-mathematics/polybori/files/polybori-0.6.4-save-flags.patch b/sci-mathematics/polybori/files/polybori-0.6.4-save-flags.patch deleted file mode 100644 index 92474dc1e..000000000 --- a/sci-mathematics/polybori/files/polybori-0.6.4-save-flags.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- src/polybori-0.6/SConstruct.orig 2009-10-28 10:47:24.000000000 +0000 -+++ src/polybori-0.6/SConstruct 2010-01-23 09:25:21.106548437 +0000 -@@ -1232,6 +1232,11 @@ - env.AlwaysBuild(ipboribin) - env.Alias('install', ipboribin) - -+ # we dump the flags for reuse by Sage -+ if not path.exists(InstPath()): -+ Execute(Mkdir(InstPath())) -+ opts.Save(InstPath("flags.conf"), env) -+ - env.Alias('prepare-devel', devellibs + readabledevellibs) - env.Alias('prepare-install', [pyroot, DocPath()]) - diff --git a/sci-mathematics/polybori/files/polybori-0.6.5-fix-another-SIGSEGV.patch b/sci-mathematics/polybori/files/polybori-0.6.5-fix-another-SIGSEGV.patch deleted file mode 100644 index 39209cdf5..000000000 --- a/sci-mathematics/polybori/files/polybori-0.6.5-fix-another-SIGSEGV.patch +++ /dev/null @@ -1,35 +0,0 @@ ---- groebner/src/nf.cc.orig 2010-01-29 09:02:02.000000000 +0000 -+++ groebner/src/nf.cc 2010-09-10 07:06:40.136564234 +0000 -@@ -1890,6 +1890,15 @@ - - } - }; -+ -+class PolyMonomialPairComparerLess{ -+public: -+ bool operator() (const pair& a,const pair& b){ -+ return a.second < b.second; -+ -+ } -+}; -+ - //typedef std::map to_term_map_type; - typedef Exponent::idx_map_type from_term_map_type; - void setup_order_tables(vector& terms_as_exp,vector& terms_as_exp_lex,std::vector& ring_order2lex,vector& lex_order2ring,from_term_map_type& from_term_map, const MonomialSet& terms){ -@@ -2093,7 +2102,7 @@ - if LIKELY(!(polys[i].isZero())) - polys_lm.push_back(pair < Polynomial, Monomial > (polys[i], polys[i].lead())); - } --std:: sort(polys_lm.begin(), polys_lm.end(), PolyMonomialPairComparerLexLess()); -+std:: sort(polys_lm.begin(), polys_lm.end(), PolyMonomialPairComparerLess()); - polys.clear(); - if UNLIKELY(polys_lm.size() == 0) - return; -@@ -2126,6 +2135,7 @@ - } - } - polys.clear(); -+ std::reverse(polys_triangular.begin(), polys_triangular.end()); - terms_unique = add_up_generic(terms_unique_vec, terms.ring().zero()); - assert(terms_step1.diff(terms).emptiness()); - assert(polys_triangular.size()!=0); diff --git a/sci-mathematics/polybori/files/polybori-0.6.5-fix-double-free-error.patch b/sci-mathematics/polybori/files/polybori-0.6.5-fix-double-free-error.patch deleted file mode 100644 index be18ca7fa..000000000 --- a/sci-mathematics/polybori/files/polybori-0.6.5-fix-double-free-error.patch +++ /dev/null @@ -1,66 +0,0 @@ ---- polybori/include/BooleEnv.h.orig 2010-01-29 09:02:02.000000000 +0000 -+++ polybori/include/BooleEnv.h 2010-08-21 07:54:32.094170620 +0000 -@@ -37,7 +37,7 @@ - - // Obey stricter dependence of Sun Studio compiler - // todo: resolve dependency --#if defined(__SUNPRO_C) || defined(__SUNPRO_CC) -+#if 1 // defined(__SUNPRO_C) || defined(__SUNPRO_CC) - # define PBORI_ENV_RING_NOTINLINED - #endif - -@@ -45,7 +45,6 @@ - - - class BoolePolyRing; --extern BoolePolyRing active_ring; - class CDynamicOrderBase; - - /** @class BooleEnv -@@ -122,6 +121,7 @@ - static ring_type& ring(); - #else - static ring_type& ring() { -+ static BooleEnv::ring_type active_ring(1000, CTypes::lp, false); - return active_ring; - } - #endif ---- polybori/src/BooleEnv.cc.orig 2010-01-29 09:02:02.000000000 +0000 -+++ polybori/src/BooleEnv.cc 2010-08-21 07:58:34.678170342 +0000 -@@ -42,13 +42,16 @@ - BEGIN_NAMESPACE_PBORI - - --BooleEnv::ring_type active_ring; -+//BooleEnv::ring_type active_ring; - // Note, direct access via friends, to active_ring.pOrder and pMgt, because - // inline doesn't work up to now, because os the undefined type issue. - - /// @todo needs inlining!!! - #ifdef PBORI_ENV_RING_NOTINLINED --BooleEnv::ring_type& BooleEnv::ring() { return active_ring; } -+BooleEnv::ring_type& BooleEnv::ring() { -+ static BooleEnv::ring_type active_ring(1000, CTypes::lp, false); -+ return active_ring; -+} - #endif - - BooleEnv::block_iterator -@@ -77,7 +80,7 @@ - - BooleEnv::idx_type - BooleEnv::lastBlockStart() { -- return active_ring.lastBlockStart(); -+ return ring().lastBlockStart(); - } - - -@@ -160,7 +163,7 @@ - } - - --void BooleEnv::set(ring_type& theRing) { active_ring = theRing; } -+void BooleEnv::set(ring_type& theRing) { ring() = theRing; } - - - diff --git a/sci-mathematics/polybori/metadata.xml b/sci-mathematics/polybori/metadata.xml deleted file mode 100644 index e8192740d..000000000 --- a/sci-mathematics/polybori/metadata.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - sci-mathematics - PolyBoRi is a C++ library, which provides high-level data types for Boolean polynomials and monomials, exponent vectors, as well as for the underlying polynomial rings and subsets of the powerset of the Boolean variables. It also include a python interface on top of it. - - Replace the standard python interface by sage's python interface for easy integration in sage. - - diff --git a/sci-mathematics/polybori/polybori-0.6.5-r2.ebuild b/sci-mathematics/polybori/polybori-0.6.5-r2.ebuild deleted file mode 100644 index d7f506b14..000000000 --- a/sci-mathematics/polybori/polybori-0.6.5-r2.ebuild +++ /dev/null @@ -1,101 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI="3" - -PYTHON_DEPEND="2:2.6" - -inherit eutils flag-o-matic multilib python scons-utils versionator - -DESCRIPTION="Polynomials over Boolean Rings" -HOMEPAGE="http://polybori.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${PN}/${PV}/${PN}-$(replace_version_separator 2 '-').tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="doc gd sage" - -# polybori does not have a working set of tests -RESTRICT="mirror test" - -CDEPEND=">=dev-libs/boost-1.34.1[python] - dev-python/ipython - gd? ( media-libs/gd )" -DEPEND="${CDEPEND} - >=sci-libs/m4ri-20090512 - doc? ( - dev-tex/tex4ht - app-doc/doxygen - )" -RDEPEND="${CDEPEND}" - -S="${WORKDIR}"/${PN}-$(get_version_component_range 1-2) - -USE_SCONS_TRUE="True" -USE_SCONS_FALSE="False" - -src_prepare() { - if use sage ; then - # TODO: This should not be done; find a better solution - cp "${FILESDIR}"/PyPolyBoRi.py pyroot/polybori/PyPolyBoRi.py \ - || die "cp failed" - - # TODO: Sage needs this file but we should find a better solution, - # maybe dev-util/pkgconfig ? - epatch "${FILESDIR}"/${PN}-0.6.4-save-flags.patch - fi - - # make sure external m4ri is used - rm -r M4RI || die "failed to remove internal copy of m4ri" - - # make polybori conform to multilib-strict - sed -i "s:DevelInstPath('lib'):DevelInstPath('$(get_libdir)'):g" \ - SConstruct || die "failed patch library path" - - # Ticket #9768 in Sage's bug tracker - make shared object work - epatch "${FILESDIR}"/${PN}-0.6.5-fix-double-free-error.patch - - # Ticket #9717 in Sage's bug tracker - fix SIGSEGV errors - epatch "${FILESDIR}"/${PN}-0.6.5-fix-another-SIGSEGV.patch -} - -src_compile(){ - # needed to make polybori linkable - append-flags -fPIC - - # TODO: handle singular ? - - # store all parameters for scons in a bash array - myesconsargs=( - CFLAGS=${CFLAGS} - CXXFLAGS=${CXXFLAGS} - LINKFLAGS=${LDFLAGS} - HAVE_HEVEA=False - HAVE_L2H=False - $(use_scons doc HAVE_TEX4HT) - $(use_scons doc HAVE_DOXYGEN) - $(use_scons doc HAVE_PYDOC) - MANDIR="${ED}"/usr/share/man - PREFIX="${ED}"/usr - PYINSTALLPREFIX="${ED}"$(python_get_sitedir) - INSTALLDIR="${ED}"/usr/share/polybori - ) - - escons "${myesconsargs[@]}" prepare-install prepare-devel || die -} - -src_install() { - escons "${myesconsargs[@]}" install devel-install || die - - # remove incomplete documentation - if ! use doc ; then - rm -rf "${ED}"/usr/share/polybori/doc \ - || die "failed to remove useless documentation" - fi - - # we only need shared objects - rm "${ED}"/usr/$(get_libdir)/lib*.a \ - || die "failed to remove static libraries" -} -- cgit v1.2.3-65-gdbad