diff options
Diffstat (limited to 'sci-mathematics')
4 files changed, 6 insertions, 267 deletions
diff --git a/sci-mathematics/singular/ChangeLog b/sci-mathematics/singular/ChangeLog index d480dcdc8f0c..a671a819fe9d 100644 --- a/sci-mathematics/singular/ChangeLog +++ b/sci-mathematics/singular/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for sci-mathematics/singular # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/singular/ChangeLog,v 1.45 2011/04/17 11:45:14 tomka Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/singular/ChangeLog,v 1.46 2011/04/17 11:48:29 tomka Exp $ + + 17 Apr 2011; Thomas Kahle <tomka@gentoo.org> -singular-3.0.1.2.ebuild, + -files/singular-3.0.1.2-gcc4.1-gentoo.patch, + -files/singular-3.0.1-gentoo.diff: + Remove stale 3.0 version. 17 Apr 2011; Thomas Kahle <tomka@gentoo.org> singular-3.1.2-r2.ebuild: Reverting latest changes to unbreak stable tree. See bug 362739. diff --git a/sci-mathematics/singular/files/singular-3.0.1-gentoo.diff b/sci-mathematics/singular/files/singular-3.0.1-gentoo.diff deleted file mode 100644 index 67119f4c6482..000000000000 --- a/sci-mathematics/singular/files/singular-3.0.1-gentoo.diff +++ /dev/null @@ -1,83 +0,0 @@ -diff -Naur Singular-3-0-1/kernel/feResource.cc Singular-3-0-1-patched/kernel/feResource.cc ---- Singular-3-0-1/kernel/feResource.cc 2005-07-27 09:46:19.000000000 +0000 -+++ Singular-3-0-1-patched/kernel/feResource.cc 2005-12-17 16:54:42.000000000 +0000 -@@ -41,7 +41,7 @@ - #define SINGULAR_DEFAULT_DIR "/usr/local/Singular/"S_VERSION1 - #endif - #else // ! defined(MAKE_DISTRIBUTION) --#define SINGULAR_DEFAULT_DIR S_ROOT_DIR -+#define SINGULAR_DEFAULT_DIR "/usr" - #endif // defined(MAKE_DISTRIBUTION) - - /***************************************************************** -@@ -73,33 +73,31 @@ - { - {"SearchPath", 's', feResPath, NULL, - "$SINGULARPATH;" -- "%b/LIB;" -- "%b/MOD;" -+ "%r/share/singular/MOD;" - "%r/LIB;" -- "%r/../LIB;" -+ "%r/share/singular/LIB;" - "%d/LIB;" -- "%d/../LIB" - ""}, -- {"Singular", 'S', feResBinary,"SINGULAR_EXECUTABLE", "%d/"S_UNAME"/Singular",""}, -- {"BinDir", 'b', feResDir, "SINGULAR_BIN_DIR", "%d/"S_UNAME ""}, -- {"RootDir", 'r', feResDir, "SINGULAR_ROOT_DIR", "%b/..", ""}, -+ {"Singular", 'S', feResBinary,"SINGULAR_EXECUTABLE", "%d/bin/Singular",""}, -+ {"BinDir", 'b', feResDir, "SINGULAR_BIN_DIR", "%d/bin" ""}, -+ {"RootDir", 'r', feResDir, "SINGULAR_ROOT_DIR", "%d", ""}, - {"DefaultDir",'d', feResDir, "SINGULAR_DEFAULT_DIR", SINGULAR_DEFAULT_DIR, ""}, -- {"InfoFile", 'i', feResFile, "SINGULAR_INFO_FILE", "%r/info/singular.hlp", ""}, -- {"IdxFile", 'x', feResFile, "SINGULAR_IDX_FILE", "%r/doc/singular.idx", ""}, -- {"HtmlDir", 'h', feResDir, "SINGULAR_HTML_DIR", "%r/html", ""}, -+ {"InfoFile", 'i', feResFile, "SINGULAR_INFO_FILE", "%r/share/singular/singular.hlp", ""}, -+ {"IdxFile", 'x', feResFile, "SINGULAR_IDX_FILE", "%r/share/singular/singular.idx", ""}, -+ {"HtmlDir", 'h', feResDir, "SINGULAR_HTML_DIR", "%r/share/doc/PFSUBST/html", ""}, - #ifdef ix86_Win - {"HtmlHelpFile", 'C', feResFile, "SINGULAR_CHM_FILE", "%r/doc/Manual.chm", ""}, - #endif - {"ManualUrl", 'u', feResUrl, "SINGULAR_URL", "http://www.singular.uni-kl.de/Manual/"S_VERSION1, ""}, -- {"ExDir", 'm', feResDir, "SINGULAR_EXAMPLES_DIR","%r/examples", ""}, -+ {"ExDir", 'm', feResDir, "SINGULAR_EXAMPLES_DIR","%r/share/doc/PFSUBST/examples", ""}, - {"Path", 'p', feResPath, NULL, "%b;$PATH", ""}, - - #ifdef ESINGULAR - {"emacs", 'E', feResBinary, "ESINGULAR_EMACS", "%b/emacs", ""}, - {"xemacs", 'A', feResBinary, "ESINGULAR_EMACS", "%b/xemacs", ""}, - {"SingularEmacs",'M',feResBinary, "ESINGULAR_SINGULAR", "%b/Singular", ""}, -- {"EmacsLoad",'l', feResFile, "ESINGULAR_EMACS_LOAD", "%e/.emacs-singular", ""}, -- {"EmacsDir", 'e', feResDir, "ESINGULAR_EMACS_DIR", "%r/emacs", ""}, -+ {"EmacsLoad",'l', feResFile, "ESINGULAR_EMACS_LOAD", "%r/share/singular/emacs/.emacs-singular", ""}, -+ {"EmacsDir", 'e', feResDir, "ESINGULAR_EMACS_DIR", "%r/share/singular/emacs", ""}, - #elif defined(TSINGULAR) - {"SingularXterm",'M',feResBinary, "TSINGULAR_SINGULAR", "%b/Singular", ""}, - #ifdef ix86_Win -@@ -108,7 +106,7 @@ - {"xterm", 'X', feResBinary,"XTERM", "%b/xterm", ""}, - #endif - #else -- {"EmacsDir", 'e', feResDir, "SINGULAR_EMACS_DIR", "%r/emacs", ""}, -+ {"EmacsDir", 'e', feResDir, "SINGULAR_EMACS_DIR", "%r/share/singular/emacs", ""}, - #endif - {NULL, 0, feResUndef, NULL, NULL, NULL}, // must be the last record - }; -diff -Naur Singular-3-0-1/kernel/mod_raw.cc Singular-3-0-1-patched/kernel/mod_raw.cc ---- Singular-3-0-1/kernel/mod_raw.cc 2005-09-13 19:15:23.000000000 +0000 -+++ Singular-3-0-1-patched/kernel/mod_raw.cc 2005-12-17 16:29:07.000000000 +0000 -@@ -111,11 +111,11 @@ - void* dynl_open_binary_warn(char* binary_name, const char* msg) - { - void* handle = NULL; -- const char* bin_dir = feGetResource('b'); -+ const char* bin_dir = feGetResource('r'); - if (bin_dir != NULL) - { - char path_name[MAXPATHLEN]; -- sprintf(path_name, "%s%s%s.%s", bin_dir, DIR_SEPP, binary_name, -+ sprintf(path_name, "%s%s%s%s.%s", bin_dir,"/lib/singular", DIR_SEPP, binary_name, - DL_TAIL); - handle = dynl_open(path_name); - if (handle == NULL && ! warn_handle) diff --git a/sci-mathematics/singular/files/singular-3.0.1.2-gcc4.1-gentoo.patch b/sci-mathematics/singular/files/singular-3.0.1.2-gcc4.1-gentoo.patch deleted file mode 100644 index cc9f4eff4817..000000000000 --- a/sci-mathematics/singular/files/singular-3.0.1.2-gcc4.1-gentoo.patch +++ /dev/null @@ -1,66 +0,0 @@ -diff -Naur Singular-3-0-1/factory/int_poly.cc Singular-3-0-1-new/factory/int_poly.cc ---- Singular-3-0-1/factory/int_poly.cc 2005-01-13 09:10:22.000000000 -0600 -+++ Singular-3-0-1-new/factory/int_poly.cc 2006-03-16 09:39:36.000000000 -0600 -@@ -559,6 +559,9 @@ - } - } - -+// forward declaration -+bool divremt ( const CanonicalForm&, const CanonicalForm&, CanonicalForm&, CanonicalForm& ); -+ - - bool - InternalPoly::divremsamet( InternalCF* acoeff, InternalCF*& quot, InternalCF*& rem ) -diff -Naur Singular-3-0-1/factory/sm_sparsemod.cc Singular-3-0-1-new/factory/sm_sparsemod.cc ---- Singular-3-0-1/factory/sm_sparsemod.cc 2000-04-05 05:03:09.000000000 -0500 -+++ Singular-3-0-1-new/factory/sm_sparsemod.cc 2006-03-16 09:40:03.000000000 -0600 -@@ -30,6 +30,10 @@ - #include "ftmpl_array.h" - #include "ftmpl_functions.h" - -+// forward declaration -+Variable rootOf( const CanonicalForm &, char name); -+ -+ - static CanonicalForm - smodgcd( const CanonicalForm & u, const CanonicalForm & v, const CanonicalForm & lcggt, const REvaluation & alpha, CFRandom & gen, int CHAR, const Variable & extension ) - { -diff -Naur Singular-3-0-1/kernel/clapsing.cc Singular-3-0-1-new/kernel/clapsing.cc ---- Singular-3-0-1/kernel/clapsing.cc 2005-11-04 02:44:25.000000000 -0600 -+++ Singular-3-0-1-new/kernel/clapsing.cc 2006-03-16 10:25:54.000000000 -0600 -@@ -24,6 +24,9 @@ - #endif - #include "ring.h" - -+// forward declaration -+Variable rootOf( const CanonicalForm &, char name); -+ - // - // FACTORY_GCD_TEST: use new gcd instead of old one. Does not work - // without new gcd-implementation which is not publicly available. -diff -Naur Singular-3-0-1/libfac/charset/alg_factor.cc Singular-3-0-1-new/libfac/charset/alg_factor.cc ---- Singular-3-0-1/libfac/charset/alg_factor.cc 2005-10-17 08:16:18.000000000 -0500 -+++ Singular-3-0-1-new/libfac/charset/alg_factor.cc 2006-03-16 10:08:11.000000000 -0600 -@@ -21,6 +21,9 @@ - - void out_cf(char *s1,const CanonicalForm &f,char *s2); - -+// forward declaration -+Variable rootOf( const CanonicalForm &, char name); -+ - #ifdef ALGFACTORDEBUG - # define DEBUGOUTPUT - #else -diff -Naur Singular-3-0-1/libfac/factor/Factor.cc Singular-3-0-1-new/libfac/factor/Factor.cc ---- Singular-3-0-1/libfac/factor/Factor.cc 2005-12-12 12:02:03.000000000 -0600 -+++ Singular-3-0-1-new/libfac/factor/Factor.cc 2006-03-16 10:07:37.000000000 -0600 -@@ -47,6 +47,9 @@ - - void out_cf(char *s1,const CanonicalForm &f,char *s2); - -+// forward declaration -+Variable rootOf( const CanonicalForm &, char name); -+ - /* - * a wrapper for factorize over algebraic extensions: - * does a sanity check and, if nec., a conversion diff --git a/sci-mathematics/singular/singular-3.0.1.2.ebuild b/sci-mathematics/singular/singular-3.0.1.2.ebuild deleted file mode 100644 index 1f4118255aed..000000000000 --- a/sci-mathematics/singular/singular-3.0.1.2.ebuild +++ /dev/null @@ -1,117 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/singular/singular-3.0.1.2.ebuild,v 1.11 2009/06/21 18:50:13 graaff Exp $ - -inherit eutils flag-o-matic - -PV_MAJOR=${PV%.*} -MY_PV=${PV//./-} -MY_PN=${PN/s/S} -MY_PV_MAJOR=${MY_PV%-*} - -DESCRIPTION="Computer algebra system for polynomial computations" -HOMEPAGE="http://www.singular.uni-kl.de/" -SRC_URI="ftp://www.mathematik.uni-kl.de/pub/Math/Singular/src/$MY_PV_MAJOR/${MY_PN}-${MY_PV}.tar.gz - ftp://www.mathematik.uni-kl.de/pub/Math/Singular/UNIX/${MY_PN}-3-0-1-share.tar.gz" - -LICENSE="singular" -SLOT="0" -KEYWORDS="ppc x86" -IUSE="doc emacs" - -DEPEND=">=dev-lang/perl-5.6 - >=dev-libs/gmp-4.1-r1 - emacs? ( || ( app-editors/xemacs - virtual/emacs ) )" - -S="${WORKDIR}"/${MY_PN}-${MY_PV_MAJOR} - -src_unpack () { - unpack ${A} - epatch "${FILESDIR}"/${PN}-${PV_MAJOR}-gentoo.diff - epatch "${FILESDIR}"/${P}-gcc4.1-gentoo.patch - sed -e "s/PFSUBST/${PF}/" -i "${S}"/kernel/feResource.cc || \ - die "sed failed on feResource.cc" -} - -src_compile() { - # need to filter this LDFLAGS, otherwise the configure - # script chokes (see bug #125180) - filter-flags -Wl,-hashvals - filter-ldflags -hashvals - filter-ldflags -Wl,-hashvals - - local myconf="${myconf} --disable-doc --without-MP --with-factory --with-libfac --prefix=${S}" - econf $(use_enable emacs) \ - ${myconf} || die "econf failed" - emake -j1 || die "make failed" -} - -src_install () { - local myarchprefix - case ${ARCH} in - x86) - myarchprefix=ix86 - ;; - *) - myarchprefix=${ARCH} - ;; - esac - - # install basic docs - cd "${S}" && dodoc BUGS ChangeLog || \ - die "failed to install docs" - - # install data files - insinto /usr/share/${PN}/LIB - cd "${S}"/${MY_PN}/LIB && doins *.lib COPYING help.cnf || \ - die "failed to install lib files" - insinto /usr/share/${PN}/LIB/gftables - cd gftables && doins * \ - || die "failed to install files int LIB/gftables" - - cd "${S}/${myarchprefix}"-Linux - - # install binaries - rm ${MY_PN} || die "failed to remove ${MY_PN}" - dobin ${MY_PN}* gen_test change_cost solve_IP \ - toric_ideal LLL || die "failed to install binaries" - - if use emacs; then - dobin E${MY_PN} || die "failed to install ESingular" - fi - - # install libraries - insinto /usr/lib/${PN} - doins *.so || die "failed to install libraries" - - # create symbolic link - dosym /usr/bin/${MY_PN}-${MY_PV_MAJOR} /usr/bin/${MY_PN} || \ - die "failed to create symbolic link" - - # install examples - cd "${WORKDIR}"/${MY_PN}/${MY_PV_MAJOR} - insinto /usr/share/${PN}/examples - doins examples/* || die "failed to install examples" - - # install extended docs - if use doc; then - dohtml -r html/* || die "failed to install html docs" - - cp info/${PN}.hlp info/${PN}.info && - doinfo info/${PN}.info || \ - die "failed to install info files" - fi - - # install emacs specific stuff - if use emacs; then - insinto /usr/share/${PN}/emacs - doins emacs/* && doins emacs/.emacs* || \ - die "failed to set up emacs files" - fi -} - -pkg_postinst() { - einfo "The authors ask you to register as a SINGULAR user." - einfo "Please check the license file for details." -} |