Local bump of sci-math/singular

9 files changed, 331 insertions, 0 deletions

diff --git a/sci-mathematics/singular/ChangeLog b/sci-mathematics/singular/ChangeLog
new file mode 100644
index 000000000..715693716
--- /dev/null
+++ b/sci-mathematics/singular/ChangeLog
@@ -0,0 +1,14 @@
+# ChangeLog for sci-mathematics/singular
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+*singular-3.1.1.2 (04 Jul 2010)
+
+  04 Jul 2010; Thomas Kahle <tom111@gmx.de> +files/60singular-gentoo.el,
+  +files/singular-3.0.4.4-nostrip.patch,
+  +files/singular-3.1.0-emacs-22.patch, +files/singular-3.1.0-gentoo.patch,
+  +files/singular-3.1.0-glibc-2.10.patch, +singular-3.1.1.2.ebuild,
+  +metadata.xml:
+  Local bump of sci-mathematics/singular to fix bug 321195
+  and various QA things.
+
diff --git a/sci-mathematics/singular/Manifest b/sci-mathematics/singular/Manifest
new file mode 100644
index 000000000..fb4370807
--- /dev/null
+++ b/sci-mathematics/singular/Manifest
@@ -0,0 +1,10 @@
+AUX 60singular-gentoo.el 298 RMD160 6bd931435ad813a3a63c02ea68d90e768a685d88 SHA1 ffd1cb26719d6745f2e9463952f125769b8ca5a1 SHA256 b05a83af5a80fc1240e77d1cd036f4c9ca00907d11fb90d7f0ffb0c92ff7d235
+AUX singular-3.0.4.4-nostrip.patch 453 RMD160 396d1c318ee76767b9dff9de7db516f988950962 SHA1 c1e154ecadd31286a1c2c6dc4d51170b7ecc62e9 SHA256 70d6972d7bddd1d8d601f715465a46c92eba1edf2c5608bbd01ae65c6fd64553
+AUX singular-3.1.0-emacs-22.patch 637 RMD160 ad6648dd733a064aa8f801056ed8f9c3f84fad90 SHA1 a0f3bc3a866618798f30fdfb97ca8e30bffc4e7f SHA256 2ae842d9636bd132271a23aa03c6810e6bdfaf0bf31b4376d8488402a41dd5a3
+AUX singular-3.1.0-gentoo.patch 4765 RMD160 9ba5f369c473c58ed28019b85a95c27eb58f495d SHA1 385b3932e1d2257fe28ee0dc5cef5729726c1b41 SHA256 ae59a98268270ef68ecb2e7f34074fa5eee379d13565a0f359c48db4f6e02351
+AUX singular-3.1.0-glibc-2.10.patch 1407 RMD160 5cc0db1754b16397b7af3c044489bdb1efacaf6c SHA1 fc696943e0a10217f0839ef2b14128a709fb6bb3 SHA256 57461bf8bba6a44ef6f1c3bcf8a1121fb7ea95ce286118219c22f2bf366905f7
+DIST Singular-3-1-1-2-share.tar.gz 8172459 RMD160 7899cdfd54d131cc7ee6fb95dabe4cfbec696a78 SHA1 57287a74c6bcae5214055ce7d057f29e35f93e37 SHA256 e73db1557fd96d9b88d959ccbf78229771831954614fb7301d275493493e07ee
+DIST Singular-3-1-1-2.tar.gz 19397418 RMD160 205671f1ea2e2f22c025defc3d85c762362c7e3f SHA1 217af7a4e9b36b769a145bf81fb27c49d64333f6 SHA256 4e5929b324f952c69de1dedddbeca1c51a3733a0f63e026d3e7b61a7e469d5a7
+EBUILD singular-3.1.1.2.ebuild 4036 RMD160 813437ed8d31126a970323d6668da4c95bb4233e SHA1 9a29277bd7619f66b9d796950435c36ad0d6ba04 SHA256 d6957441382fb103d211e1c9526c226724ba4b0a28e5ebae5bc074cfd291163f
+MISC ChangeLog 518 RMD160 e9c610c941dc1a28c107f639f5d8d7789fb33de2 SHA1 e776906c9753927b5fde16611b963597769f0a19 SHA256 ea1508f4adf0ee6e077f0572a36462092afdc5cb173412061b97756a0417fd5a
+MISC metadata.xml 280 RMD160 2d367099d0325ec0cc6c6bc330d90c0c9ca8aca6 SHA1 d97bcf8e217b23d35fad5c7d4d3fa6c3b6c3d5e7 SHA256 56cb53caa58cda2146b3292101a68724ee15efa78563b33fff3e7b0c1ba47718
diff --git a/sci-mathematics/singular/files/60singular-gentoo.el b/sci-mathematics/singular/files/60singular-gentoo.el
new file mode 100644
index 000000000..7be8c08ef
--- /dev/null
+++ b/sci-mathematics/singular/files/60singular-gentoo.el
@@ -0,0 +1,10 @@
+
+;; site-file for sci-mathematics/singular
+
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'singular "singular"
+  "Start Singular using default values." t)
+(autoload 'singular-other "singular"
+  "Ask for arguments and start Singular." t)
+
+(add-to-list 'auto-mode-alist '("\\.sing\\'" . c++-mode))
diff --git a/sci-mathematics/singular/files/singular-3.0.4.4-nostrip.patch b/sci-mathematics/singular/files/singular-3.0.4.4-nostrip.patch
new file mode 100644
index 000000000..5884b6cd2
--- /dev/null
+++ b/sci-mathematics/singular/files/singular-3.0.4.4-nostrip.patch
@@ -0,0 +1,12 @@
+diff -Naur Singular-3-0-4/IntegerProgramming/Makefile.in Singular-3-0-4.new/IntegerProgramming/Makefile.in
+--- Singular-3-0-4/IntegerProgramming/Makefile.in	2008-07-09 07:55:13.000000000 -0400
++++ Singular-3-0-4.new/IntegerProgramming/Makefile.in	2008-10-19 22:40:41.000000000 -0400
+@@ -21,7 +21,7 @@
+ endif
+ 
+ INSTALL		= @INSTALL@
+-INSTALL_PROGRAM	= @INSTALL_PROGRAM@  -s
++INSTALL_PROGRAM	= @INSTALL_PROGRAM@ 
+ MKINSTALLDIRS   = ../mkinstalldirs
+ 
+ ##
diff --git a/sci-mathematics/singular/files/singular-3.1.0-emacs-22.patch b/sci-mathematics/singular/files/singular-3.1.0-emacs-22.patch
new file mode 100644
index 000000000..3f4f3c762
--- /dev/null
+++ b/sci-mathematics/singular/files/singular-3.1.0-emacs-22.patch
@@ -0,0 +1,13 @@
+diff -Naur Singular-3-1-0/emacs/singular.el Singular-3-1-0.new/emacs/singular.el
+--- Singular-3-1-0/emacs/singular.el	2008-11-03 09:16:38.000000000 -0500
++++ Singular-3-1-0.new/emacs/singular.el	2009-08-20 22:16:57.000000000 -0400
+@@ -865,7 +865,8 @@
+   (add-hook 'singular-post-output-filter-functions 'singular-prompt-remove-filter nil t)
+ 
+   ;; some relict from Comint mode
+-  (setq comint-prompt-regexp singular-comint-prompt-regexp))
++  (setq comint-prompt-regexp singular-comint-prompt-regexp)
++  (setq comint-use-prompt-regexp-instead-of-fields 1))
+   ;; required to use prompt-regexp
+   (setq comint-use-prompt-regexp t)
+ ;;}}}
diff --git a/sci-mathematics/singular/files/singular-3.1.0-gentoo.patch b/sci-mathematics/singular/files/singular-3.1.0-gentoo.patch
new file mode 100644
index 000000000..ecfba313e
--- /dev/null
+++ b/sci-mathematics/singular/files/singular-3.1.0-gentoo.patch
@@ -0,0 +1,83 @@
+diff -Naur Singular-3-1-0/kernel/feResource.cc Singular-3-1-0.new/kernel/feResource.cc
+--- Singular-3-1-0/kernel/feResource.cc	2009-06-04 04:11:42.000000000 -0400
++++ Singular-3-1-0.new/kernel/feResource.cc	2009-08-23 19:05:00.000000000 -0400
+@@ -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",(char *)""},
+-  {"BinDir",    'b',    feResDir,   "SINGULAR_BIN_DIR",     "%d/"S_UNAME,           (char *)""},
+-  {"RootDir",   'r',    feResDir,   "SINGULAR_ROOT_DIR",    "%b/..",                (char *)""},
++  {"Singular",  'S',    feResBinary,"SINGULAR_EXECUTABLE",  "%d/bin/Singular",(char *)""},
++  {"BinDir",    'b',    feResDir,   "SINGULAR_BIN_DIR",     "%d/bin",           (char *)""},
++  {"RootDir",   'r',    feResDir,   "SINGULAR_ROOT_DIR",    "%d",                (char *)""},
+   {"DefaultDir",'d',    feResDir,   "SINGULAR_DEFAULT_DIR",  SINGULAR_DEFAULT_DIR,  (char *)""},
+-  {"InfoFile",  'i',    feResFile,  "SINGULAR_INFO_FILE",   "%r/info/singular.hlp", (char *)""},
+-  {"IdxFile",   'x',    feResFile,  "SINGULAR_IDX_FILE",    "%r/doc/singular.idx",  (char *)""},
+-  {"HtmlDir",   'h',    feResDir,   "SINGULAR_HTML_DIR",    "%r/html",              (char *)""},
++  {"InfoFile",  'i',    feResFile,  "SINGULAR_INFO_FILE",   "%r/share/info/singular.info.bz2", (char *)""},
++  {"IdxFile",   'x',    feResFile,  "SINGULAR_IDX_FILE",    "%r/share/singular/singular.idx",  (char *)""},
++  {"HtmlDir",   'h',    feResDir,   "SINGULAR_HTML_DIR",    "%r/share/doc/PFSUBST/html",              (char *)""},
+ #ifdef ix86_Win
+   {"HtmlHelpFile",'C',  feResFile,  "SINGULAR_CHM_FILE",    "%r/doc/Manual.chm",    (char *)""},
+ #endif
+   {"ManualUrl", 'u',    feResUrl,   "SINGULAR_URL",         "http://www.singular.uni-kl.de/Manual/"S_VERSION1,    (char *)""},
+-  {"ExDir",     'm',    feResDir,   "SINGULAR_EXAMPLES_DIR","%r/examples",          (char *)""},
++  {"ExDir",     'm',    feResDir,   "SINGULAR_EXAMPLES_DIR","%r/share/doc/PFSUBST/examples",          (char *)""},
+   {"Path",      'p',    feResPath,  NULL,                   "%b;$PATH",             (char *)""},
+ 
+ #ifdef ESINGULAR
+   {"emacs",     'E',    feResBinary,"ESINGULAR_EMACS",      "%b/emacs",             (char *)""},
+   {"xemacs",    'A',    feResBinary,"ESINGULAR_EMACS",      "%b/xemacs",            (char *)""},
+   {"SingularEmacs",'M', feResBinary,"ESINGULAR_SINGULAR",   "%b/Singular",          (char *)""},
+-  {"EmacsLoad", 'l',    feResFile,  "ESINGULAR_EMACS_LOAD", "%e/.emacs-singular",   (char *)""},
+-  {"EmacsDir",  'e',    feResDir,   "ESINGULAR_EMACS_DIR",  "%r/emacs",             (char *)""},
++  {"EmacsLoad", 'l',    feResFile,  "ESINGULAR_EMACS_LOAD", "%r/share/emacs/site-lisp/singular/.emacs-singular",   (char *)""},
++  {"EmacsDir",  'e',    feResDir,   "ESINGULAR_EMACS_DIR",  "%r/share/emacs/site-lisp/singular",             (char *)""},
+ #elif defined(TSINGULAR)
+   {"SingularXterm",'M', feResBinary,"TSINGULAR_SINGULAR",   "%b/Singular",          (char *)""},
+ #ifdef ix86_Win
+@@ -108,7 +106,7 @@
+   {"xterm",     'X',    feResBinary,"XTERM",                "%b/xterm",             (char *)""},
+ #endif
+ #else
+-  {"EmacsDir",  'e',    feResDir,   "SINGULAR_EMACS_DIR",   "%r/emacs",             (char *)""},
++  {"EmacsDir",  'e',    feResDir,   "SINGULAR_EMACS_DIR",   "%r/share/emacs/site-lisp/singular",             (char *)""},
+ #endif
+   {NULL, 0, feResUndef, NULL, NULL, NULL}, // must be the last record
+ };
+diff -Naur Singular-3-1-0/kernel/mod_raw.cc Singular-3-1-0.new/kernel/mod_raw.cc
+--- Singular-3-1-0/kernel/mod_raw.cc	2009-06-04 06:18:12.000000000 -0400
++++ Singular-3-1-0.new/kernel/mod_raw.cc	2009-08-23 19:04:22.000000000 -0400
+@@ -109,11 +109,11 @@
+ void* dynl_open_binary_warn(const 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.1.0-glibc-2.10.patch b/sci-mathematics/singular/files/singular-3.1.0-glibc-2.10.patch
new file mode 100644
index 000000000..0593eded2
--- /dev/null
+++ b/sci-mathematics/singular/files/singular-3.1.0-glibc-2.10.patch
@@ -0,0 +1,34 @@
+diff -Naur Singular-3-1-0/kernel/febase.cc Singular-3-1-0.new/kernel/febase.cc
+--- Singular-3-1-0/kernel/febase.cc	2009-06-22 13:16:57.000000000 -0400
++++ Singular-3-1-0.new/kernel/febase.cc	2009-08-20 22:31:06.000000000 -0400
+@@ -739,13 +739,15 @@
+       char* dir_sep;
+       struct passwd *pw_entry;
+       strcpy (longpath, path);
+-      dir_sep = strchr(longpath, DIR_SEP);
++      // TODO: fix the ugly casting away of const
++      dir_sep = const_cast<char*> ( strchr(longpath, DIR_SEP) );  
+       *dir_sep = '\0';
+       pw_entry = getpwnam(&longpath[1]);
+       if (pw_entry != NULL)
+       {
+         strcpy(longpath, pw_entry->pw_dir);
+-        dir_sep = strchr((char *)path, DIR_SEP);
++        // TODO: fix the ugly casting away of const
++        dir_sep = const_cast<char*> ( strchr((char*)path, DIR_SEP) );  
+         strcat(longpath, dir_sep);
+         path = longpath;
+       }
+diff -Naur Singular-3-1-0/kernel/mpr_complex.cc Singular-3-1-0.new/kernel/mpr_complex.cc
+--- Singular-3-1-0/kernel/mpr_complex.cc	2009-06-22 13:16:57.000000000 -0400
++++ Singular-3-1-0.new/kernel/mpr_complex.cc	2009-08-20 22:28:58.000000000 -0400
+@@ -83,7 +83,8 @@
+   BOOLEAN neg=false;
+   if (*in == '-') { in++; neg=TRUE; }
+   char *s;
+-  if ((s=strchr((char *)in,'E')) !=NULL)
++  /* TODO: fix the ugly casting away of const */ 
++  if ((s = const_cast<char*> ( strchr(in,'E') )) !=NULL) 
+   {
+     *s='e';
+   }
diff --git a/sci-mathematics/singular/metadata.xml b/sci-mathematics/singular/metadata.xml
new file mode 100644
index 000000000..eee5b016e
--- /dev/null
+++ b/sci-mathematics/singular/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>sci-mathematics</herd>
+<use>
+  <flag name='boost'>Compile against external boost headers
+    (<pkg>dev-libs/boost</pkg>)</flag>
+</use>
+</pkgmetadata>
diff --git a/sci-mathematics/singular/singular-3.1.1.2.ebuild b/sci-mathematics/singular/singular-3.1.1.2.ebuild
new file mode 100644
index 000000000..a7a1ec2b2
--- /dev/null
+++ b/sci-mathematics/singular/singular-3.1.1.2.ebuild
@@ -0,0 +1,146 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/singular/singular-3.1.1.ebuild,v 1.2 2010/04/28 14:55:16 bicatali Exp $
+
+EAPI="2"
+
+inherit eutils elisp-common autotools multilib versionator
+
+MY_PN=Singular
+MY_PV=$(replace_all_version_separators -)
+MY_DIR=$(get_version_component_range 1-3 ${MY_PV})
+MY_PV_SHARE=${MY_PV}
+
+DESCRIPTION="Computer algebra system for polynomial computations"
+HOMEPAGE="http://www.singular.uni-kl.de/"
+SRC_COM="http://www.mathematik.uni-kl.de/ftp/pub/Math/${MY_PN}/SOURCES/${MY_DIR}/${MY_PN}"
+SRC_URI="${SRC_COM}-${MY_PV}.tar.gz ${SRC_COM}-${MY_PV_SHARE}-share.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="boost doc emacs examples"
+
+RDEPEND="dev-libs/gmp
+	>=dev-libs/ntl-5.5.1
+	emacs? ( >=virtual/emacs-22 )"
+
+DEPEND="${RDEPEND}
+	dev-lang/perl
+	boost? ( dev-libs/boost )"
+
+S="${WORKDIR}"/${MY_PN}-${MY_DIR}
+SITEFILE=60${PN}-gentoo.el
+
+src_prepare () {
+	epatch "${FILESDIR}"/${PN}-3.1.0-gentoo.patch
+	epatch "${FILESDIR}"/${PN}-3.1.0-emacs-22.patch
+	epatch "${FILESDIR}"/${PN}-3.1.0-glibc-2.10.patch
+	epatch "${FILESDIR}"/${PN}-3.0.4.4-nostrip.patch
+
+	sed -i \
+		-e "s:PFSUBST:${PF}:" \
+		kernel/feResource.cc || die "sed failed on feResource.cc"
+
+	sed -i \
+		-e '/CXXFLAGS/ s/--no-exceptions//g' \
+		"${S}"/Singular/configure.in || die
+
+	# Replace direct compiler calls
+	sed -i -e "s:c++:$(tc-getCXX):g" \
+		"${S}"/IntegerProgramming/Makefile.in
+
+	sed -i -e "s:gcc:$(tc-getCC):g" "${S}"/kernel/Makefile.in
+	sed -i -e "s:gcc:$(tc-getCC):g" "${S}"/omalloc/Makefile.in
+	sed -i -e "s:gcc:$(tc-getCC):g" "${S}"/Singular/Makefile.in
+
+	sed -i -e "s:g++:$(tc-getCXX):g" "${S}"/kernel/Makefile.in
+	sed -i -e "s:g++:$(tc-getCXX):g" "${S}"/omalloc/Makefile.in
+	sed -i -e "s:g++:$(tc-getCXX):g" "${S}"/Singular/Makefile.in
+
+	cd "${S}"/Singular || die "failed to cd into Singular/"
+	eautoconf
+}
+
+src_configure() {
+
+	# Taking care of ${CC} and friends.
+	tc-export CC CPP CXX
+
+	econf \
+		--prefix="${S}" \
+		--disable-debug \
+		--disable-doc \
+		--disable-NTL \
+		--disable-gmp \
+		--without-MP \
+		--enable-factory \
+		--enable-libfac \
+		--enable-IntegerProgramming \
+		--enable-Singular \
+		$(use_with boost Boost) \
+		$(use_enable emacs)
+}
+
+src_compile() {
+	emake -j1 || die "emake failed"
+	if use emacs; then
+		cd "${WORKDIR}"/${MY_PN}/${MY_DIR}/emacs/
+		elisp-compile *.el || die "elisp-compile failed"
+	fi
+}
+
+src_install () {
+	dodoc README
+	# execs and libraries
+	cd "${S}"/*-Linux
+	dobin ${MY_PN}* gen_test change_cost solve_IP toric_ideal LLL \
+		|| die "failed to install binaries"
+	insinto /usr/$(get_libdir)/${PN}
+	doins *.so || die "failed to install libraries"
+
+	dosym ${MY_PN}-${MY_DIR} /usr/bin/${MY_PN} \
+		|| die "failed to create symbolic link"
+
+	# stuff from the share tar ball
+	cd "${WORKDIR}"/${MY_PN}/${MY_DIR}
+	insinto /usr/share/${PN}
+	doins -r LIB  || die "failed to install lib files"
+	if use examples; then
+		insinto /usr/share/doc/${PF}
+		doins -r examples || die "failed to install examples"
+	fi
+	if use doc; then
+		dohtml -r html/* || die "failed to install html docs"
+		insinto /usr/share/${PN}
+		doins doc/singular.idx || die "failed to install idx file"
+		cp info/${PN}.hlp info/${PN}.info &&
+		doinfo info/${PN}.info \
+			|| die "failed to install info files"
+	fi
+	if use emacs; then
+		elisp-install ${PN} emacs/*.el emacs/*.elc emacs/.emacs* \
+			|| die "elisp-install failed"
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+}
+
+pkg_postinst() {
+	einfo "The authors ask you to register as a SINGULAR user."
+	einfo "Please check the license file for details."
+
+	if use emacs; then
+		echo
+		ewarn "Please note that the ESingular emacs wrapper has been"
+		ewarn "removed in favor of full fledged singular support within"
+		ewarn "Gentoo's emacs infrastructure; i.e. just fire up emacs"
+		ewarn "and you should be good to go! See bug #193411 for more info."
+		echo
+	fi
+
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}