Version bump. Rewrote the ebuild.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

8 files changed, 158 insertions, 321 deletions

diff --git a/sci-mathematics/singular/ChangeLog b/sci-mathematics/singular/ChangeLog
index 7fda4e792607..7de96bbe10af 100644
--- a/sci-mathematics/singular/ChangeLog
+++ b/sci-mathematics/singular/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for sci-mathematics/singular
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/singular/ChangeLog,v 1.31 2009/12/04 02:12:41 markusle Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/singular/ChangeLog,v 1.32 2010/04/28 04:53:21 bicatali Exp $
+
+*singular-3.1.1 (28 Apr 2010)
+
+  28 Apr 2010; Sébastien Fabbro <bicatali@gentoo.org>
+  -files/singular-3.0.4.2-gentoo.diff, -singular-3.0.4.4.ebuild,
+  -files/singular-3.0.4.4-emacs-22.patch,
+  -files/singular-3.0.4.4-glibc-2.10.patch, +singular-3.1.1.ebuild,
+  -files/fake_ssh:
+  Version bump. Rewrote the ebuild.
 
   04 Dec 2009; Markus Dittrich <markusle@gentoo.org>
   singular-3.1.0.7.ebuild:
diff --git a/sci-mathematics/singular/Manifest b/sci-mathematics/singular/Manifest
index 80ecb76df776..507f25dfffa0 100644
--- a/sci-mathematics/singular/Manifest
+++ b/sci-mathematics/singular/Manifest
@@ -1,22 +1,28 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 60singular-gentoo.el 298 RMD160 6bd931435ad813a3a63c02ea68d90e768a685d88 SHA1 ffd1cb26719d6745f2e9463952f125769b8ca5a1 SHA256 b05a83af5a80fc1240e77d1cd036f4c9ca00907d11fb90d7f0ffb0c92ff7d235
-AUX fake_ssh 150 RMD160 2dad828186e9d00663b87b38ebacc7bbbdd81057 SHA1 6a43ea25d66d89cbc906086f796eeff61fce7341 SHA256 b8983f7d6e1ffeb7fa402f737f18ac61225ea8eae86272b9961859614d0737a3
 AUX singular-3.0.1-gentoo.diff 4566 RMD160 cbfcd5c402b753c9a09b6e2961f2eaecf56b573e SHA1 0ed6038f3dbfc9fe8ff03e7107e95693eaf92346 SHA256 212be39ee18d42a20bdb57f4036746d6a8551456e89f168816ce557e054beac3
 AUX singular-3.0.1.2-gcc4.1-gentoo.patch 2603 RMD160 2b8ba6154bdd6e1a57f1093d966cb11874c05390 SHA1 45c479d1424993c8dc5a040dcaf58b91fc45d073 SHA256 748752eaddcbbcd181f50e497c8bdcb714f7a2f4434ddeacac679c6c0bc842e3
-AUX singular-3.0.4.2-gentoo.diff 4581 RMD160 9e775a3993730d88d1302679cfb38ca6c2121024 SHA1 b234a5047999dc6622965b13f8e25b1316ed4ceb SHA256 eb994b2a78c13e1a98c04d66b9a4ed980bcdfec828e6d1cc249d94b3a6bb5e9e
-AUX singular-3.0.4.4-emacs-22.patch 1482 RMD160 6f417ab3461219127358140c51d1352c34dabe99 SHA1 e9bad40cf79154870527498a1e2059a138aa6674 SHA256 0e17723d39a7b1ba395361dff2dc132b2b8463c4f41f7d7836539c99c64c8684
-AUX singular-3.0.4.4-glibc-2.10.patch 1358 RMD160 28237b86e691f1380ecd500ba7abbc9de0b1c3eb SHA1 c6d5586f26a2e2f56735814ef7285e3260782ed0 SHA256 0821e8901d8e208a22c396244fa0ba0c4cc4a2e276efc12948ea8139d50f5c13
 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-0-1-2.tar.gz 10741252 RMD160 bcfb83fe7a57658865aa69fc526e01413fb3da81 SHA1 a95aa909bfa20145df0eb1a345ae1476116af5fd SHA256 3d50427b17cef0a2ac36d302bf7421a4cb06df24139d5386c64d14a07e7cd399
 DIST Singular-3-0-1-share.tar.gz 3909236 RMD160 f1a1792cbb0688e1353285f898a2e40bc88fd4f6 SHA1 d7c07192707dbc6f916b3c5d704bae216f0834ff SHA256 5b8647886e15ca0a296a7d08a4161ecdc6fe5ef558cd9b36acda95a21a0883a2
-DIST Singular-3-0-4-2-share.tar.gz 8291673 RMD160 ad10c76f84edbfb466a68c0bef0a7595405cd4c4 SHA1 e6186c22b792c823f86c885510f5a7eeacba41a7 SHA256 1e37ece3931a401728f75f9cc308412db90599994dc37f1561076e89183f2300
-DIST Singular-3-0-4-4.tar.gz 15388216 RMD160 2a1b8a78411c1fb4f884389143dff2fb52e6b92d SHA1 29fccaabc269e8e2816a397c22bd61c48cbcf651 SHA256 c579489f57a7f0838d475c2b6e63d3459089ddedd93d783168439cfaaf2c4cec
 DIST Singular-3-1-0-4-share.tar.gz 7640466 RMD160 d8a482dfebce6b9a5230dff8de76551e00e45d53 SHA1 a23e004a2a7aabda08b59c0f60c55c4fcb7ef91e SHA256 7fc069eb9125cd451f42a7dc76475e70793edfb1ea741b65a4f61b5d078d60b1
 DIST Singular-3-1-0-7.tar.gz 18637001 RMD160 6fc4ce0314cb224d23e654cf1273c1e7ea361e37 SHA1 8ffff0a83fd1efb1b4a2416aaa1698e2ec148914 SHA256 381e0ff888ffa849748a618be2070a84255a52785e0739d62bc43bd7c661b02d
+DIST Singular-3-1-1-share.tar.gz 8131651 RMD160 711c790a35c3a6aee11dd3fa5681c63423c58b57 SHA1 1c050e5bfe2d454f1bfa22acb238780afa210680 SHA256 0803152d4e95f6f5464c8b1a344473f2c70ae8dc63bbd71810e256060ba64fea
+DIST Singular-3-1-1.tar.gz 19254919 RMD160 4fe827201e229a7cce2253a80d922bf54a2944c4 SHA1 cfd03b7d4443367d85c6d9f873525ae247b4552f SHA256 70c908beafb4ed67b03a4ec69d12f8892da71022908e7c3322550fb53b223ca8
 EBUILD singular-3.0.1.2.ebuild 3130 RMD160 4671045a9d23f1e14419d6e075b44ddb4ceb11a5 SHA1 77cd6c69b3da929d6c55516d50574fe4bf09cba5 SHA256 e88cf1f5a012518d6f5c6c4bde1215b8f7928a192c053b8c2965f03b4697c5ce
-EBUILD singular-3.0.4.4.ebuild 4571 RMD160 bed564d4be8d0cf7f39bf8696cc88efa004f9641 SHA1 648563447d53647922b06b9084d12e84c63fb93e SHA256 0b072eb24837fb4628fdee76e31c00be563e08245fec5688a5294c98cce21133
 EBUILD singular-3.1.0.7.ebuild 4038 RMD160 cfde2106381aaec174d380018fb39d3c58f49f54 SHA1 4a468e0c06cfd26bbd2dcda33d36abfc25381658 SHA256 6532506f198fc04ca502ddd9b13e3f1a18d620eb5e0b6fab4503dd06f82219c6
-MISC ChangeLog 8509 RMD160 85136055ca5dac2d496c497a722317e4680cd0a6 SHA1 abeef760f257740e55698828aa07b59a7646a049 SHA256 0ea8c6de8f63abd244a730bb1785a79f7896d2ae825b3d6b25fe9b7f5b0e02f9
+EBUILD singular-3.1.1.ebuild 3672 RMD160 d022262b4d07381e315b18c0b92ce2412be9b29c SHA1 cee35cba17dcc50035015610a3dc495f767a28ed SHA256 9dec49940a9e010b2c0f21974c3bbd28334307ca892da9c09b4c7df283481526
+MISC ChangeLog 8826 RMD160 6fd4bdb0e5d7aa81e7e586b7803d0b317dea4908 SHA1 d32e49de110b77289c38854bdadb55c5fa2fcb65 SHA256 62da144117bd5f4dea8e7f4e336e24cc081681027104e345094c85cdda53fbb3
 MISC metadata.xml 280 RMD160 2d367099d0325ec0cc6c6bc330d90c0c9ca8aca6 SHA1 d97bcf8e217b23d35fad5c7d4d3fa6c3b6c3d5e7 SHA256 56cb53caa58cda2146b3292101a68724ee15efa78563b33fff3e7b0c1ba47718
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iEYEARECAAYFAkvXyfQACgkQ1ycZbhPLE2BDOgCghiEiXaGx0hQPGzjb4w3pAJ6r
+cckAmwYJg8ClSnCl3PhzWPvo9t2VQrzG
+=nmoq
+-----END PGP SIGNATURE-----
diff --git a/sci-mathematics/singular/files/fake_ssh b/sci-mathematics/singular/files/fake_ssh
deleted file mode 100644
index 127c177760e3..000000000000
--- a/sci-mathematics/singular/files/fake_ssh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-# strip hostname -n from command line
-runme="$(echo $@ | sed -e 's:.* -n \(.*\):\1:')"
-# do what -n should have done
-${runme} < /dev/null
diff --git a/sci-mathematics/singular/files/singular-3.0.4.2-gentoo.diff b/sci-mathematics/singular/files/singular-3.0.4.2-gentoo.diff
deleted file mode 100644
index 4500c2964e8e..000000000000
--- a/sci-mathematics/singular/files/singular-3.0.4.2-gentoo.diff
+++ /dev/null
@@ -1,83 +0,0 @@
-diff -Naur Singular-3-0-4/kernel/feResource.cc Singular-3-0-4.new/kernel/feResource.cc
---- Singular-3-0-4/kernel/feResource.cc	2008-03-19 13:44:08.000000000 -0400
-+++ Singular-3-0-4.new/kernel/feResource.cc	2008-04-21 09:10:53.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/info/singular.info.bz2", ""},
-+  {"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/emacs/site-lisp/singular/.emacs-singular",             ""},
-+  {"EmacsDir",  'e',    feResDir,   "ESINGULAR_EMACS_DIR",   "%r/share/emacs/site-lisp/singular",             ""},
- #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/emacs/site-lisp/singular",             ""},
- #endif
-   {NULL, 0, feResUndef, NULL, NULL, NULL}, // must be the last record
- };
-diff -Naur Singular-3-0-4/kernel/mod_raw.cc Singular-3-0-4.new/kernel/mod_raw.cc
---- Singular-3-0-4/kernel/mod_raw.cc	2008-03-19 13:44:10.000000000 -0400
-+++ Singular-3-0-4.new/kernel/mod_raw.cc	2008-04-21 09:10:53.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/files/singular-3.0.4.4-emacs-22.patch b/sci-mathematics/singular/files/singular-3.0.4.4-emacs-22.patch
deleted file mode 100644
index f05db402ea1b..000000000000
--- a/sci-mathematics/singular/files/singular-3.0.4.4-emacs-22.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff -Naur Singular-3-0-4/emacs/.emacs-singular Singular-3-0-4.new/emacs/.emacs-singular
---- Singular-3-0-4/emacs/.emacs-singular	2004-12-09 11:27:54.000000000 -0500
-+++ Singular-3-0-4.new/emacs/.emacs-singular	2008-11-07 18:06:50.000000000 -0500
-@@ -96,10 +96,10 @@
-        ;; unix stuff 
- 
-        ;; lazy-lock seems to be broken under mswindows:
--       ;; causes delay of input (only reacts after mouse click), or even total 
-+       ;; causes delay of input (only reacts after mouse click), or even total
-        ;; hang
--       (add-hook 'font-lock-mode-hook 'lazy-lock-mode)
--       (setq font-lock-support-mode 'lazy-lock-mode)
-+       ;(add-hook 'font-lock-mode-hook 'lazy-lock-mode)
-+       ;(setq font-lock-support-mode 'lazy-lock-mode)
-        
-        ;; somewhat nicer scrolling This causes a core dump with 21.1.9
-        ;; under cygwin, when a file is opened with a button 
-diff -Naur Singular-3-0-4/emacs/singular.el Singular-3-0-4.new/emacs/singular.el
---- Singular-3-0-4/emacs/singular.el	2000-12-18 10:44:32.000000000 -0500
-+++ Singular-3-0-4.new/emacs/singular.el	2008-11-07 18:06:02.000000000 -0500
-@@ -865,7 +865,9 @@
-   (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)
-+  )
- ;;}}}
- 
- ;;{{{ Miscellaneous
diff --git a/sci-mathematics/singular/files/singular-3.0.4.4-glibc-2.10.patch b/sci-mathematics/singular/files/singular-3.0.4.4-glibc-2.10.patch
deleted file mode 100644
index 64525f4b30b5..000000000000
--- a/sci-mathematics/singular/files/singular-3.0.4.4-glibc-2.10.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff -ur Singular-3-0-4.old/kernel/febase.cc Singular-3-0-4/kernel/febase.cc
---- Singular-3-0-4.old/kernel/febase.cc	2009-07-07 01:15:49.088761926 +0300
-+++ Singular-3-0-4/kernel/febase.cc	2009-07-07 01:16:51.157012952 +0300
-@@ -743,13 +743,13 @@
-       char* dir_sep;
-       struct passwd *pw_entry;
-       strcpy (longpath, path);
--      dir_sep = strchr(longpath, DIR_SEP);
-+      dir_sep = const_cast<char*> ( strchr(longpath, DIR_SEP) );  // TODO: fix the ugly casting away of const
-       *dir_sep = '\0';
-       pw_entry = getpwnam(&longpath[1]);
-       if (pw_entry != NULL)
-       {
-         strcpy(longpath, pw_entry->pw_dir);
--        dir_sep = strchr(path, DIR_SEP);
-+        dir_sep = const_cast<char*> ( strchr(path, DIR_SEP) );  // TODO: fix the ugly casting away of const
-         strcat(longpath, dir_sep);
-         path = longpath;
-       }
-diff -ur Singular-3-0-4.old/kernel/mpr_complex.cc Singular-3-0-4/kernel/mpr_complex.cc
---- Singular-3-0-4.old/kernel/mpr_complex.cc	2009-07-07 01:34:11.290760532 +0300
-+++ Singular-3-0-4/kernel/mpr_complex.cc	2009-07-07 01:55:24.209129950 +0300
-@@ -82,7 +82,7 @@
-   BOOLEAN neg=false;
-   if (*in == '-') { in++; neg=TRUE; }
-   char *s;
--  if ((s=strchr(in,'E')) !=NULL)
-+  if ((s = const_cast<char*> ( strchr(in,'E') )) !=NULL)  /* TODO: fix the ugly casting away of const */
-   {
-     *s='e';
-   }
diff --git a/sci-mathematics/singular/singular-3.0.4.4.ebuild b/sci-mathematics/singular/singular-3.0.4.4.ebuild
deleted file mode 100644
index 9f34c01d6b08..000000000000
--- a/sci-mathematics/singular/singular-3.0.4.4.ebuild
+++ /dev/null
@@ -1,161 +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.4.4.ebuild,v 1.5 2009/11/24 03:47:20 markusle Exp $
-
-inherit eutils elisp-common flag-o-matic autotools multilib versionator
-
-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="http://www.mathematik.uni-kl.de/ftp/pub/Math/Singular/SOURCES/3-0-4/${MY_PN}-${MY_PV}.tar.gz
-	http://www.mathematik.uni-kl.de/ftp/pub/Math/Singular/UNIX/${MY_PN}-3-0-4-2-share.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="doc emacs boost"
-
-RDEPEND=">=dev-libs/gmp-4.1-r1
-		emacs? ( >=virtual/emacs-22 )"
-
-DEPEND="${RDEPEND}
-		>=dev-lang/perl-5.6
-		boost? ( dev-libs/boost )"
-
-S="${WORKDIR}"/${MY_PN}-${MY_PV_MAJOR}
-SITEFILE=60${PN}-gentoo.el
-
-pkg_setup() {
-	if use emacs; then
-	# we need at least emacs-22 in order for our emacs patches
-	# to work
-		need_emacs=22
-		have_emacs=$(elisp-emacs-version)
-		if ! version_is_at_least "${need_emacs}" "${have_emacs}"; then
-			eerror "This package needs at least emacs version ${need_emacs}."
-			eerror "Use \"eselect emacs\" to select the active version."
-			die "Emacs version is too low."
-		fi
-	fi
-}
-
-src_unpack () {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${PN}-3.0.4.2-gentoo.diff
-	epatch "${FILESDIR}"/${P}-nostrip.patch
-	epatch "${FILESDIR}"/${P}-emacs-22.patch
-	epatch "${FILESDIR}"/${P}-glibc-2.10.patch
-
-	# for some unknown reason this ldflag causes the
-	# build system to choke
-	# NOTE: Look at the source and figure out why
-	filter-ldflags "*hash-style*"
-
-	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 --disable-gmp --prefix=${S}"
-	econf $(use_enable emacs) \
-		${myconf} || die "econf failed"
-	emake -j1 || die "make failed"
-
-	if use emacs; then
-		cd "${WORKDIR}"/${MY_PN}/${MY_PV_MAJOR}/emacs/
-		elisp-compile *.el || die "elisp-compile failed"
-	fi
-}
-
-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"
-
-	# install libraries
-	insinto /usr/$(get_libdir)/${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"
-
-		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
-
-	# install emacs specific stuff here, as we did a directory change
-	# some lines above!
-	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
-}
diff --git a/sci-mathematics/singular/singular-3.1.1.ebuild b/sci-mathematics/singular/singular-3.1.1.ebuild
new file mode 100644
index 000000000000..49de6ffab108
--- /dev/null
+++ b/sci-mathematics/singular/singular-3.1.1.ebuild
@@ -0,0 +1,133 @@
+# 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.1 2010/04/28 04:53:21 bicatali Exp $
+
+EAPI="2"
+
+inherit eutils elisp-common autotools multilib versionator
+
+MY_PN=Singular
+MY_PV=$(replace_all_version_separators -)
+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_PV}/${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_PV}
+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
+
+	cd "${S}"/Singular || die "failed to cd into Singular/"
+	eautoconf
+}
+
+src_configure() {
+	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 install -j1 -C omalloc || die "emake omalloc failed"
+	emake install -j1 -C factory || die "emake factory failed"
+	emake install -C libfac || die "emake libfac failed"
+	emake install -C kernel || die "emake libfac failed"
+	emake -j1 || die "emake failed"
+	if use emacs; then
+		cd "${WORKDIR}"/${MY_PN}/${MY_PV}/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_PV} /usr/bin/${MY_PN} \
+		|| die "failed to create symbolic link"
+
+	# stuff from the share tar ball
+	cd "${WORKDIR}"/${MY_PN}/${MY_PV}
+	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
+}