Version bump and removed old versions.

Package-Manager: portage-2.1.5_rc3

6 files changed, 203 insertions, 234 deletions

diff --git a/sci-mathematics/singular/ChangeLog b/sci-mathematics/singular/ChangeLog
index 83af77bd4157..41e2c8c56201 100644
--- a/sci-mathematics/singular/ChangeLog
+++ b/sci-mathematics/singular/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sci-mathematics/singular
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/singular/ChangeLog,v 1.19 2007/09/25 12:26:50 markusle Exp $
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/singular/ChangeLog,v 1.20 2008/04/21 14:39:28 markusle Exp $
+
+*singular-3.0.4.2 (21 Apr 2008)
+
+  21 Apr 2008; Markus Dittrich <markusle@gentoo.org>
+  -files/singular-2.0.5-r3-gentoo.diff, -singular-2.0.5-r4.ebuild,
+  +files/singular-3.0.4.2-gentoo.diff,
+  singular-3.0.1.2.ebuild, +singular-3.0.4.2.ebuild:
+  Version bump and removed old versions.
 
   24 Sep 2007; Markus Dittrich <markusle@gentoo.org>
   +files/60singular-gentoo.el, singular-3.0.3.ebuild:
diff --git a/sci-mathematics/singular/Manifest b/sci-mathematics/singular/Manifest
index 41d1345ae552..18aef364fc9f 100644
--- a/sci-mathematics/singular/Manifest
+++ b/sci-mathematics/singular/Manifest
@@ -1,31 +1,21 @@
 AUX 60singular-gentoo.el 298 RMD160 6bd931435ad813a3a63c02ea68d90e768a685d88 SHA1 ffd1cb26719d6745f2e9463952f125769b8ca5a1 SHA256 b05a83af5a80fc1240e77d1cd036f4c9ca00907d11fb90d7f0ffb0c92ff7d235
 AUX fake_ssh 150 RMD160 2dad828186e9d00663b87b38ebacc7bbbdd81057 SHA1 6a43ea25d66d89cbc906086f796eeff61fce7341 SHA256 b8983f7d6e1ffeb7fa402f737f18ac61225ea8eae86272b9961859614d0737a3
-AUX singular-2.0.5-r3-gentoo.diff 4399 RMD160 b569422dd5c26663c7a83b22b09c631fd910bb11 SHA1 4ee05a33bcebb1904df230fed2bf634dd8752be0 SHA256 7a9d3f16386705e761d359c251b5028964fcded71eef4f5576559b7c547badb3
 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.2-gentoo.diff 4550 RMD160 cd095f131c22e0ab9df308333e730a5551883753 SHA1 1e0a043371559eb00e61784ecbc3b45ac5ee1654 SHA256 1236a16e83448f58b70ef94abd8810b3de4a93d6ad807b5cc8db33932d57f7f3
 AUX singular-3.0.3-gentoo.diff 4550 RMD160 bdcb935dffbeab7e73db9f734671c9624c299ce6 SHA1 0de70395ffc94ba817dbcbd081c7d551915123a0 SHA256 c849159fad372f37e441075b601a4eb8abcfc29b360e200b69f148521176b965
+AUX singular-3.0.4.2-gentoo.diff 4550 RMD160 ecd3da54adedfab7a32d63ffe2bc7076b4f2ae95 SHA1 698fbdeefd376c9cb597405ebd27c7a004ac56b3 SHA256 bd02fd30d70f07d7017c5fe4cc57842fbd030ad19a0976c263dc95096c126df6
 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-2-1.tar.gz 11033718 RMD160 49bb622e42cb579c39dbdab5ff484ffdd88a9d1a SHA1 52d75dc9ed794c1547f523cd83fe5e3322a03068 SHA256 a9a4e8fa075e25e3ccb993007e4ce45f4ba41276531404984bbb4152e11ff491
 DIST Singular-3-0-2-share.tar.gz 4152789 RMD160 464cb5352b372298cc598899beeff425b36172c2 SHA1 b4190a6952341f0ecfab0caa8c1d37cee47ac762 SHA256 a91debca0cddb4c67e922500998d061a20898429535dd633b02b613b96b1cf62
 DIST Singular-3-0-3-share.tar.gz 6656532 RMD160 5cc28c8a13383ac51e143da227159bcd17c40d2b SHA1 682f97b4a387c3422abf4492b460458bb3135fa2 SHA256 fbd1d4522237ced5589c37d26ac83cfc9b000a869af6e1e84a355a846d234116
 DIST Singular-3-0-3.tar.gz 13757114 RMD160 dfc2263237c86995963a7f3a46d65f57bf95d843 SHA1 fccc146d3bc4f5f06eb38f7113f8dd53fa6f17e0 SHA256 0b2afd008969068c984444f57297c2ccfabf792a83b726fda73e31e424014a6e
-DIST Singular-IntProg-2-0-4a.tar.gz 85619 RMD160 d6547290b3f55944168fb73202dbba0121924a6e SHA1 503b4834e3359ea5912bd553ec556578185b0575 SHA256 3b010dfee0182448486078f3b6f277a5686d0f3fb04bf9e454cd63aba0fc262c
-DIST Singular-MP-2-0-5.tar.gz 365390 RMD160 aa70c34c433522093eeabf75664e836a1077d4a4 SHA1 1cce96cc1b83155a8a865c79e5c35289aae3c489 SHA256 7e7bcfae9ce2e3c6e7e94eb76abafcefc921e029e9df5a0835ecb2ace7aa1dd8
-DIST Singular-NTL-5.3.1.tar.gz 655942 RMD160 4be6fb9acbb4d9a2c5ef300af0e781b76e2f79a5 SHA1 ac83f7e1dce8219dfb432629bd6ee74a34ab9f18 SHA256 ea4ec467f160f27b51a97af09d2879b0b66b04520a7d8c1723fdb6165721c22a
-DIST Singular-NTL-generic.tar.gz 7429 RMD160 f475026edb0a5c2c0dafe356a8617a0362cc0cd8 SHA1 f7f6eca835dec230de1497073cbe06a17da76aa3 SHA256 f6770ecf9dd8c752a1114ee84469409ca78a233584875161a491e2a1673ec3f1
-DIST Singular-Tst-2-0-5.tar.gz 4181732 RMD160 3991f06b051376aa608817d2380314e1b3b24efc SHA1 febabf6c80e31d3bf4e5529afaaa376b6b2c0287 SHA256 397f8cbf31eac511f52557713dcaf33c92cb98a83aa48e9c8bde9dc1e2889231
-DIST Singular-doc-2-0-5.tar.gz 658275 RMD160 87797a2f409c40a7ddeb5dd730f95785e4e8a48e SHA1 e9dc6cf63a87f0b6c2b93868bc9eb6543948d14a SHA256 2d2b0b889abf7acc38c492b4050657fd1046f34848be5e6f53128e358c4db6da
-DIST Singular-emacs-2-0-5.tar.gz 62596 RMD160 cd907eb37f4ea5166f3ec9ba88ebb8deb821be29 SHA1 283a51a1e8f02f698ae68d510ffcdeaeb559eb1c SHA256 5e65f61ae6363e28001100f4b206a6a6aafd88a5f9940e0783f3085ce6a789cd
-DIST Singular-factory-2-0-5.tar.gz 479277 RMD160 6b4aded527d9d828a7453630b65e08f8a49321aa SHA1 97de70903919dc1fbdad8c6eab1759e5d4472145 SHA256 2e6c57f9bbc19c4eb9388e627e478944f62663127d9ec08cdf3fcb6588488c94
-DIST Singular-kernel-2-0-5.tar.gz 2688358 RMD160 e1ed74936a0af5ce31f02fa4cd2e2ceb3045f404 SHA1 37c3a6d7a7a22c85855a851657bb06b35618b4e5 SHA256 723664c43560cddb54ddc45b8dc9abd90c4b51fff65de762b44491dfb609c183
-DIST Singular-libfac-2-0-5.tar.gz 86640 RMD160 cc078d781073c8f921a395d65a50e6344049ca79 SHA1 24222552dd5b1ae9b8f00205e9f33a7fc3f22d86 SHA256 66a340d0df1e32818b14c229aa0565f2ade9f402ef195ed3243f55a0dbcd92af
-DIST Singular-main-2-0-5.tar.gz 54627 RMD160 3bf86461bc86b13a19e376c43bd7d5e670f0fdef SHA1 4225172261c24bb57cd64e021614bedd6b173733 SHA256 64fcd3b6d63c095f98ace362ec7a635445afab832db3288b04a00922cb60d98c
-DIST Singular-omalloc-2-0-5.tar.gz 237140 RMD160 7e69a8183707be12c9a25d49237eaa01fbe85345 SHA1 67e132501dab7f36c99788d9c82c5d4f550dbac8 SHA256 b44cb99c81305d78f7a2bc1194402a435195004c1ef23ee0a0f5ab29c8d2e6d9
-EBUILD singular-2.0.5-r4.ebuild 4269 RMD160 a098dd4ac3aa38ea27112005c56d04584eb5081e SHA1 af0ed9f31ed5cec209671509086416f31e8efd7e SHA256 e351dc22778a69b056693e7cbabce5087f5eb823ae57c84c18e076162b52436d
-EBUILD singular-3.0.1.2.ebuild 3125 RMD160 a041f17e9314f3454ad9279175fb374767da23ca SHA1 d986b456ce86704df52fb2f67d867c713552572a SHA256 3182b3688d9f96a4842738ff592470ec68c10b9b1533dbe7a3fcceb9bf48da40
+DIST Singular-3-0-4-2-share.tar.gz 8291673 RMD160 ad10c76f84edbfb466a68c0bef0a7595405cd4c4 SHA1 e6186c22b792c823f86c885510f5a7eeacba41a7 SHA256 1e37ece3931a401728f75f9cc308412db90599994dc37f1561076e89183f2300
+DIST Singular-3-0-4-2.tar.gz 15379506 RMD160 090733d6e48838070a8af63dd00c633852e57878 SHA1 f8586a9d9c72785a65be461220640605b969ae70 SHA256 1c88a78ae9e1056496a992432370666af33375fef94b194861b3c7c08f70a536
+EBUILD singular-3.0.1.2.ebuild 3128 RMD160 4ebd0c64c63d0d57acd09baa88cf0ced8313744e SHA1 c27755d3098c4f0a66f1f429cfdbdee0327d51c5 SHA256 609495d0f8407cd5908cbbdc4ae28f03fced50d9b7411f4d4bc3a6ebf1ca9204
 EBUILD singular-3.0.2.1.ebuild 3235 RMD160 daad978eb71b2905212b250dd2fe015bf030989a SHA1 ed535b79cae8805995fbe9ccd5ea2e14747acd41 SHA256 b0ca1f35cf005b5f4c9c81011f99bcec89f7ad597b9341f6eeaa971966fa9d2b
 EBUILD singular-3.0.3.ebuild 3721 RMD160 b123f1d00b0dfab732a5dba1424d70e0440d51e8 SHA1 3a4958cad2889fa5de5ff51716ab89a79434b2d8 SHA256 39456c4b3bda1ab441fe8fbce9ddee9c3b1120bbee48dc3cefdf83ebd0f0f097
-MISC ChangeLog 6088 RMD160 11d4d6daf71570e3a4cebe2271a26d06a91ab030 SHA1 8eb3f4a6021c8197399e2950ba0a6f51122a791b SHA256 b1a5d936c47694acd9ee3d1f25cac801af329d53367486eb842df9f947331aa8
+EBUILD singular-3.0.4.2.ebuild 3738 RMD160 8e397f983e7a33c5daf0cbae41c080be333539a4 SHA1 bf43c1a45a7ee8fdc1357c181dee79f82e56cf2d SHA256 92d62d81434c26869046d44e43f6cb06d9eba074215af847fc566d7da00ca23a
+MISC ChangeLog 6375 RMD160 163cb27565446b9c2d144830c1708aa4f58ee819 SHA1 eafee7be9a9985b50c16453f8f93984d64965a52 SHA256 479b3505dd633c2248faceb39c75fc54719d4943bde40f81e280c85e8df410ed
 MISC metadata.xml 168 RMD160 d98790cf055dc0f820c63d65f485b9dcfa8950f4 SHA1 95c9e4f7368f82053d631bbcd469612c92ca13cb SHA256 c0cc8d6ab9385750af753ddc504299ed90a70b5c4c655f6c77d865917a8829c9
diff --git a/sci-mathematics/singular/files/singular-2.0.5-r3-gentoo.diff b/sci-mathematics/singular/files/singular-3.0.4.2-gentoo.diff
index 2b98b38a1038..a9482a63b14f 100644
--- a/sci-mathematics/singular/files/singular-2.0.5-r3-gentoo.diff
+++ b/sci-mathematics/singular/files/singular-3.0.4.2-gentoo.diff
@@ -1,60 +1,7 @@
---- singuname.sh	2003-08-07 12:48:09.000000000 +0200
-+++ singuname.sh.new	2003-08-07 12:50:14.000000000 +0200
-@@ -168,6 +168,18 @@
-         echo ${prefix}-Unknown
-         exit 1
-     fi
-+# PowerPC Linux ########################################################
-+elif (echo $uname_a | $egrep " ppc " > $devnull)
-+then
-+    prefix=ppc
-+    if (echo $uname_a | $egrep "Linux" > $devnull)
-+    then
-+        echo ${prefix}-Linux
-+        exit 0
-+    else
-+        echo ${prefix}-Unknown
-+        exit 1
-+    fi
- else # Unknown ########################################################
-     echo Unknown
-     exit 2
---- Singular/mod_raw.cc	2003-08-22 12:53:30.000000000 +0200
-+++ Singular/mod_raw.cc.new	2004-03-12 10:07:14.000000000 +0100
-@@ -40,7 +40,7 @@
- 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];
-@@ -104,6 +104,10 @@
- #define HAVE_ELF_SYSTEM
- #endif
- 
-+#if defined(ppc_Linux)
-+#define HAVE_ELF_SYSTEM
-+#endif
-+
- #if defined(HAVE_ELF_SYSTEM)
- #include <dlfcn.h>
- 
---- Singular/mod_raw.cc.orig	2004-03-22 23:20:46.424288520 +0100
-+++ Singular/mod_raw.cc	2004-03-22 23:22:11.975282792 +0100
-@@ -44,7 +44,7 @@
-   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)
---- Singular/feResource.cc	2004-03-23 14:01:06.000000000 +0100
-+++ Singular/feResource.cc.new	2004-03-23 13:30:22.000000000 +0100
-@@ -45,7 +45,7 @@
+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)
@@ -62,23 +9,25 @@
 +#define SINGULAR_DEFAULT_DIR "/usr"
  #endif // defined(MAKE_DISTRIBUTION)
  
- #ifdef ix86_Win
-@@ -83,21 +83,19 @@
+ /*****************************************************************
+@@ -73,33 +73,31 @@
  {
-   {"SearchPath",    's',     feResPath,  NULL,
+   {"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"EXT,""},
+-  {"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"EXT,""},
-+  {"BinDir",    'b',    feResDir,   "SINGULAR_BIN_DIR",     "%d/bin",""},
++  {"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", ""},
@@ -87,18 +36,48 @@
 +  {"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",              ""},
- #if !defined(macintosh)
-   {"netscape",  'N',    feResBinary,"NETSCAPE",             "%b/netscape",          ""},
-   {"info",      'I',    feResBinary,"INFO",                 "%b/info",              ""},
-@@ -105,7 +102,7 @@
+   {"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
-   {"rxvt",     'X',    feResBinary,"RXVT",                "%b/rxvt.exe",             ""},
+@@ -108,7 +106,7 @@
+   {"xterm",     'X',    feResBinary,"XTERM",                "%b/xterm",             ""},
+ #endif
  #else
--  {"xterm",     'X',    feResBinary,"XTERM",                "%b/xterm",             ""},
-+  {"xterm",     'X',    feResBinary,"XTERM",                "%d/X11R6/bin/xterm",             ""},
+-  {"EmacsDir",  'e',    feResDir,   "SINGULAR_EMACS_DIR",   "%r/emacs",             ""},
++  {"EmacsDir",  'e',    feResDir,   "SINGULAR_EMACS_DIR",   "%r/share/singular/emacs",             ""},
  #endif
-   {"Path",      'p',    feResPath,  NULL,                   "%b;$PATH",         ""},
- #endif // ! defined(macintosh)
+   {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/singular-2.0.5-r4.ebuild b/sci-mathematics/singular/singular-2.0.5-r4.ebuild
deleted file mode 100644
index 26a5c162835d..000000000000
--- a/sci-mathematics/singular/singular-2.0.5-r4.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/singular/singular-2.0.5-r4.ebuild,v 1.5 2007/08/05 17:20:48 markusle Exp $
-
-inherit eutils
-
-MINPV=${PV//./-}
-BPN=${PN/s/S}
-NTLVERSION="5.3.1"
-# attention: different versions are mixed. IntProg is older
-
-DESCRIPTION="Computer algebra system for polynomial computations"
-SRC_URI="ftp://www.mathematik.uni-kl.de/pub/Math/Singular/src/${BPN}-doc-${MINPV}.tar.gz
-		ftp://www.mathematik.uni-kl.de/pub/Math/Singular/src/${BPN}-emacs-${MINPV}.tar.gz
-		ftp://www.mathematik.uni-kl.de/pub/Math/Singular/src/${BPN}-factory-${MINPV}.tar.gz
-		ftp://www.mathematik.uni-kl.de/pub/Math/Singular/src/${BPN}-IntProg-2-0-4a.tar.gz
-		ftp://www.mathematik.uni-kl.de/pub/Math/Singular/src/${BPN}-kernel-${MINPV}.tar.gz
-		ftp://www.mathematik.uni-kl.de/pub/Math/Singular/src/${BPN}-libfac-${MINPV}.tar.gz
-	ftp://www.mathematik.uni-kl.de/pub/Math/Singular/src/${BPN}-main-${MINPV}.tar.gz
-	ftp://www.mathematik.uni-kl.de/pub/Math/Singular/src/${BPN}-MP-${MINPV}.tar.gz
-	ftp://www.mathematik.uni-kl.de/pub/Math/Singular/src/${BPN}-NTL-${NTLVERSION}.tar.gz
-	ftp://www.mathematik.uni-kl.de/pub/Math/Singular/src/${BPN}-NTL-generic.tar.gz
-	ftp://www.mathematik.uni-kl.de/pub/Math/Singular/src/${BPN}-omalloc-${MINPV}.tar.gz
-	ftp://www.mathematik.uni-kl.de/pub/Math/Singular/src/${BPN}-Tst-${MINPV}.tar.gz"
-HOMEPAGE="http://www.singular.uni-kl.de/"
-
-RDEPEND=">=dev-lang/perl-5.6
-		>=dev-libs/gmp-4.1-r1"
-
-IUSE="doc"
-
-DEPEND="${RDEPEND}
-		doc? ( sys-apps/texinfo
-				virtual/tetex
-				dev-lang/perl )"
-
-SLOT="0"
-LICENSE="singular"
-KEYWORDS="x86 ppc"
-
-S=${WORKDIR}
-
-src_unpack () {
-	unpack ${A}
-	epatch  $FILESDIR/${P}-r3-gentoo.diff
-	sed -e "s/PFSUBST/${PF}/" -i ${S}/Singular/feResource.cc || die "sed failed on feResource.cc"
-}
-
-src_compile() {
-	local myconf="${myconf} --with-NTL --prefix=${D}/usr"
-	econf ${myconf} || die "econf failed"
-	make CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" || die "make failed"
-}
-
-src_install () {
-	local myarchprefix
-	case ${ARCH} in
-		x86)
-			myarchprefix=ix86
-			;;
-		*)
-			myarchprefix=${ARCH}
-			;;
-	esac
-	cd ${WORKDIR}/omalloc
-	einstall || die
-	cd ${WORKDIR}/MP
-	einstall || die
-	cd ${WORKDIR}/ntl
-	einstall || die
-	cd ${WORKDIR}/factory
-	einstall || die
-	cd ${WORKDIR}/libfac
-	einstall || die
-	cd ${WORKDIR}/Singular
-	einstall || die
-	rm ${D}/usr/LIB
-	dodir /usr/share/singular/LIB
-	dodir /usr/share/singular/LIB/gftables
-	insinto /usr/share/singular/LIB
-	cd ${WORKDIR}/Singular/LIB
-	doins *.lib*
-	doins COPYING
-	doins help.cnf
-	insinto /usr/share/singular/LIB/gftables
-	cd gftables
-	doins *
-	dodir /usr/bin
-	dodir /usr/lib/singular
-
-	use doc && 	( 	cd ${WORKDIR}/doc
-					# fake ssh during doc creation
-					cp ${FILESDIR}/fake_ssh ${T}/ssh
-					chmod +x ${T}/ssh
-					export PATH="${T}:${PATH}"
-					export LC_ALL="C"
-					make dvi
-					dodoc *.dvi
-					make ps
-					dodoc *.ps
-					local strange_error="Inappropriate ioctl for device"
-					echo ${strange_error} > makeresult
-					while grep -q "${strange_error}" makeresult
-					do make 2>&1 info | tee makeresult
-					done
-					echo > singular.info "INFO-DIR-SECTION Math"
-					echo >> singular.info "START-INFO-DIR-ENTRY"
-					echo >> singular.info "* Singular: (singular).         A Computer Algebra System for Polynomial Computations"
-					echo >> singular.info "END-INFO-DIR-ENTRY"
-					cat singular.hlp >> singular.info
-					doinfo singular.info
-					make html
-					strange_error="Bad file descriptor"
-					echo ${strange_error} > makeresult
-					while grep -q "${strange_error}" makeresult
-					do make 2>&1 singular.idx | tee makeresult
-					done
-					insinto /usr/share/${PN}
-					doins singular.idx singular.hlp
-					dohtml -a htm,png,html,idx,css -r html/ html/*
-					cd ${D}/usr
-					dodir /usr/share/doc/${PF}
-					mv doc/NTL share/doc/${PF}/
-	)
-	cd ${D}
-	dosym /usr/bin/Singular-${MINPV} /usr/bin/Singular
-
-	insinto /usr/lib/singular
-	cd ${D}/usr/${myarchprefix}-Linux
-	# don't do this before the docs are installed
-	rm Singular
-	dobin *Singular*
-	doins *.so
-	cd ${D}/usr
-	rm -r ${myarchprefix}-Linux
-}
-
-pkg_postinst() {
-	einfo "The authors ask you to register as a SINGULAR user."
-	einfo "Please check the license file for details."
-}
diff --git a/sci-mathematics/singular/singular-3.0.1.2.ebuild b/sci-mathematics/singular/singular-3.0.1.2.ebuild
index cb698b9009b1..117c7b4f625b 100644
--- a/sci-mathematics/singular/singular-3.0.1.2.ebuild
+++ b/sci-mathematics/singular/singular-3.0.1.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 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.9 2007/08/05 17:20:48 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/singular/singular-3.0.1.2.ebuild,v 1.10 2008/04/21 14:39:28 markusle Exp $
 
 inherit eutils flag-o-matic
 
@@ -30,7 +30,7 @@ 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 || \
+	sed -e "s/PFSUBST/${PF}/" -i "${S}"/kernel/feResource.cc || \
 		die "sed failed on feResource.cc"
 }
 
diff --git a/sci-mathematics/singular/singular-3.0.4.2.ebuild b/sci-mathematics/singular/singular-3.0.4.2.ebuild
new file mode 100644
index 000000000000..ec43e0c38c28
--- /dev/null
+++ b/sci-mathematics/singular/singular-3.0.4.2.ebuild
@@ -0,0 +1,133 @@
+# Copyright 1999-2008 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.2.ebuild,v 1.1 2008/04/21 14:39:28 markusle Exp $
+
+inherit eutils elisp-common flag-o-matic autotools multilib
+
+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}-${MY_PV}-share.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="doc emacs boost"
+
+DEPEND=">=dev-lang/perl-5.6
+		>=dev-libs/gmp-4.1-r1
+		emacs? ( virtual/emacs )
+		boost? ( dev-libs/boost )"
+
+S="${WORKDIR}"/${MY_PN}-${MY_PV_MAJOR}
+SITEFILE=60${PN}-gentoo.el
+
+src_unpack () {
+	unpack ${A}
+	epatch "${FILESDIR}"/${P}-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"
+
+	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"
+
+		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
+}