Version bump. This fixes bug #151054.

(Portage version: 2.1.2_pre2-r6)

4 files changed, 214 insertions, 1 deletions

diff --git a/sci-mathematics/singular/ChangeLog b/sci-mathematics/singular/ChangeLog
index 31f74e51250c..8d3ec4a038d1 100644
--- a/sci-mathematics/singular/ChangeLog
+++ b/sci-mathematics/singular/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-mathematics/singular
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/singular/ChangeLog,v 1.13 2006/09/10 06:05:37 wormo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/singular/ChangeLog,v 1.14 2006/10/13 19:46:14 markusle Exp $
+
+*singular-3.0.2.1 (13 Oct 2006)
+
+  13 Oct 2006; Markus Dittrich <markusle@gentoo.org>
+  +files/singular-3.0.2-gentoo.diff, singular-3.0.2.1.ebuild:
+  Version bump. This fixes bug #151054.
 
   09 Sep 2006; Stephanie Lockwood-Childs <wormo@gentoo.org>
   singular-3.0.1.2.ebuild:
diff --git a/sci-mathematics/singular/files/digest-singular-3.0.2.1 b/sci-mathematics/singular/files/digest-singular-3.0.2.1
new file mode 100644
index 000000000000..5db1deb294d8
--- /dev/null
+++ b/sci-mathematics/singular/files/digest-singular-3.0.2.1
@@ -0,0 +1,6 @@
+MD5 9435390a16776d3cd8e3aeb756b6c610 Singular-3-0-2-1.tar.gz 11033718
+RMD160 49bb622e42cb579c39dbdab5ff484ffdd88a9d1a Singular-3-0-2-1.tar.gz 11033718
+SHA256 a9a4e8fa075e25e3ccb993007e4ce45f4ba41276531404984bbb4152e11ff491 Singular-3-0-2-1.tar.gz 11033718
+MD5 4f8ae87392b19e8cbca14df7ee844d97 Singular-3-0-2-share.tar.gz 4152789
+RMD160 464cb5352b372298cc598899beeff425b36172c2 Singular-3-0-2-share.tar.gz 4152789
+SHA256 a91debca0cddb4c67e922500998d061a20898429535dd633b02b613b96b1cf62 Singular-3-0-2-share.tar.gz 4152789
diff --git a/sci-mathematics/singular/files/singular-3.0.2-gentoo.diff b/sci-mathematics/singular/files/singular-3.0.2-gentoo.diff
new file mode 100644
index 000000000000..165eadd28c7b
--- /dev/null
+++ b/sci-mathematics/singular/files/singular-3.0.2-gentoo.diff
@@ -0,0 +1,83 @@
+diff -Naur Singular-3-0-2/kernel/feResource.cc Singular-3-0-2-new/kernel/feResource.cc
+--- Singular-3-0-2/kernel/feResource.cc	2005-11-21 06:05:26.000000000 -0500
++++ Singular-3-0-2-new/kernel/feResource.cc	2006-10-12 22:15:28.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",""},
+-  {"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-2/kernel/mod_raw.cc Singular-3-0-2-new/kernel/mod_raw.cc
+--- Singular-3-0-2/kernel/mod_raw.cc	2006-07-18 15:35:44.000000000 -0400
++++ Singular-3-0-2-new/kernel/mod_raw.cc	2006-10-12 22:15:28.000000000 -0400
+@@ -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/singular-3.0.2.1.ebuild b/sci-mathematics/singular/singular-3.0.2.1.ebuild
new file mode 100644
index 000000000000..b7322a36cc8b
--- /dev/null
+++ b/sci-mathematics/singular/singular-3.0.2.1.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/singular/singular-3.0.2.1.ebuild,v 1.1 2006/10/13 19:46:14 markusle Exp $
+
+inherit eutils flag-o-matic autotools
+
+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-2-share.tar.gz"
+
+LICENSE="singular"
+SLOT="0"
+KEYWORDS="~ppc ~x86"
+IUSE="doc emacs boost"
+
+DEPEND=">=dev-lang/perl-5.6
+		>=dev-libs/gmp-4.1-r1
+		emacs? ( || ( virtual/xemacs
+					virtual/emacs ) )
+		boost? ( dev-libs/boost )"
+
+
+
+S="${WORKDIR}"/${MY_PN}-${MY_PV_MAJOR}
+
+src_unpack () {
+	unpack ${A}
+	epatch "${FILESDIR}"/${PN}-${PV_MAJOR}-gentoo.diff
+
+	cd "${S}"/kernel
+	sed -e "s/PFSUBST/${PF}/" -i feResource.cc || \
+		die "sed failed on feResource.cc"
+
+	cd "${S}"/Singular
+	if ! use boost; then
+		sed -e "s/AC_CHECK_HEADERS(boost/#AC_CHECK_HEADERS(boost/" \
+			-i configure.in || \
+			die "failed to fix detection of boost headers"
+	else
+		# -no-exceptions and boost don't play well
+		sed -e "/CXXFLAGS/ s/--no-exceptions//g" \
+			-i configure.in || \
+			die "sed failed on configure"
+	fi
+	eautoconf
+}
+
+src_compile() {
+	local myconf="${myconf} --disable-doc --without-MP --with-factory --with-libfac --with-gmp --prefix=${S}"
+	econf $(use_enable emacs) \
+		${myconf} || die "econf failed"
+	emake -j1 || die "make failed"
+}
+
+src_install () {
+	# 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}"/*-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."
+}