Version bump and removed old ebuilds. Also disabled striping of (see bug #241238).

Package-Manager: portage-2.2_rc12/cvs/Linux 2.6.26-SENTINEL-3 i686

7 files changed, 47 insertions, 313 deletions

diff --git a/sci-mathematics/singular/ChangeLog b/sci-mathematics/singular/ChangeLog
index 6355f041697e..1a618a395441 100644
--- a/sci-mathematics/singular/ChangeLog
+++ b/sci-mathematics/singular/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for sci-mathematics/singular
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/singular/ChangeLog,v 1.23 2008/08/06 20:49:42 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/singular/ChangeLog,v 1.24 2008/10/20 12:30:00 markusle Exp $
+
+*singular-3.0.4.4 (20 Oct 2008)
+
+  20 Oct 2008; Markus Dittrich <markusle@gentoo.org>
+  -files/singular-3.0.2-gentoo.diff, -files/singular-3.0.3-gentoo.diff,
+  +files/singular-3.0.4.4-nostrip.patch, -singular-3.0.2.1.ebuild,
+  -singular-3.0.3.ebuild, +singular-3.0.4.4.ebuild:
+  Version bump and removed old ebuilds. Also disabled striping of binaries
+  (see bug #241238).
 
   06 Aug 2008; Ulrich Mueller <ulm@gentoo.org> metadata.xml:
   Add USE flag description to metadata wrt GLEP 56.
diff --git a/sci-mathematics/singular/Manifest b/sci-mathematics/singular/Manifest
index a568aa0eccdb..0c4f19f6dc5e 100644
--- a/sci-mathematics/singular/Manifest
+++ b/sci-mathematics/singular/Manifest
@@ -1,31 +1,16 @@
------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.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 4581 RMD160 9e775a3993730d88d1302679cfb38ca6c2121024 SHA1 b234a5047999dc6622965b13f8e25b1316ed4ceb SHA256 eb994b2a78c13e1a98c04d66b9a4ed980bcdfec828e6d1cc249d94b3a6bb5e9e
+AUX singular-3.0.4.4-nostrip.patch 453 RMD160 396d1c318ee76767b9dff9de7db516f988950962 SHA1 c1e154ecadd31286a1c2c6dc4d51170b7ecc62e9 SHA256 70d6972d7bddd1d8d601f715465a46c92eba1edf2c5608bbd01ae65c6fd64553
 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-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
+DIST Singular-3-0-4-2.tar.gz 323584 RMD160 da24286756318dfdba9f968cb30543e1bf56e326 SHA1 f13f514f55d9a7c642d749870d976fa06d32fbdc SHA256 84439c226832be30c27c42cf117a17d527a2f441579810c08f3fee5dc1b8d62f
+DIST Singular-3-0-4-4.tar.gz 15388216 RMD160 2a1b8a78411c1fb4f884389143dff2fb52e6b92d SHA1 29fccaabc269e8e2816a397c22bd61c48cbcf651 SHA256 c579489f57a7f0838d475c2b6e63d3459089ddedd93d783168439cfaaf2c4cec
 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
 EBUILD singular-3.0.4.2.ebuild 3827 RMD160 e8ffe96a6de0f85a18dadc85ef9e79f07c08bebe SHA1 edb2429e84b5048d5f6dc361b5c89dfe62efd031 SHA256 c1cef308acd2e6dd44287115f0f4f1b273c5e21406e487ed0759d95fdab103d1
-MISC ChangeLog 6781 RMD160 1f1344e9e17f1e1207c34f52d7a0b308f4c0d701 SHA1 e78ff28879c27cf44cdc993b27e3e8d153babe2b SHA256 bb7a409e69e7652c1a5e0d0b210034c699380224b39ef56f82f978cd16548f61
+EBUILD singular-3.0.4.4.ebuild 4044 RMD160 7bf53759ba4f3075d50b679e5f0b45e330ff8f04 SHA1 ea30437cf0fc2b5ee08a9c0dcbb339a1ec21b0ab SHA256 653365f302c69b6e08a5533a80d455db09f401675726c35833bbfd1d201f7a0d
+MISC ChangeLog 7160 RMD160 7576bb71fffe10de21c80106c424dd6baf48e5b2 SHA1 46d2cdbcd8f9b0fee158829726d80a98c8ed5b0f SHA256 2ee3efabc1743246d55cadb05be78118268957975c99df0ba86815c23b2f0253
 MISC metadata.xml 280 RMD160 2d367099d0325ec0cc6c6bc330d90c0c9ca8aca6 SHA1 d97bcf8e217b23d35fad5c7d4d3fa6c3b6c3d5e7 SHA256 56cb53caa58cda2146b3292101a68724ee15efa78563b33fff3e7b0c1ba47718
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.9 (GNU/Linux)
-
-iEYEARECAAYFAkiaDncACgkQOeoy/oIi7uxL7QCgpkYdOWh7FuIyLHKUPTTd6C0U
-Ti8AoLY6gk4G23/KodbRkIJJ0UU+Ar6O
-=GkY8
------END PGP SIGNATURE-----
diff --git a/sci-mathematics/singular/files/singular-3.0.2-gentoo.diff b/sci-mathematics/singular/files/singular-3.0.2-gentoo.diff
deleted file mode 100644
index 165eadd28c7b..000000000000
--- a/sci-mathematics/singular/files/singular-3.0.2-gentoo.diff
+++ /dev/null
@@ -1,83 +0,0 @@
-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/files/singular-3.0.3-gentoo.diff b/sci-mathematics/singular/files/singular-3.0.3-gentoo.diff
deleted file mode 100644
index aeb556cb1fdf..000000000000
--- a/sci-mathematics/singular/files/singular-3.0.3-gentoo.diff
+++ /dev/null
@@ -1,83 +0,0 @@
-diff -Naur Singular-3-0-3/kernel/feResource.cc Singular-3-0-3.new/kernel/feResource.cc
---- Singular-3-0-3/kernel/feResource.cc	2005-07-27 05:46:19.000000000 -0400
-+++ Singular-3-0-3.new/kernel/feResource.cc	2007-08-04 07:52:22.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-3/kernel/mod_raw.cc Singular-3-0-3.new/kernel/mod_raw.cc
---- Singular-3-0-3/kernel/mod_raw.cc	2007-03-17 12:38:42.000000000 -0400
-+++ Singular-3-0-3.new/kernel/mod_raw.cc	2007-08-04 07:52:22.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-nostrip.patch b/sci-mathematics/singular/files/singular-3.0.4.4-nostrip.patch
new file mode 100644
index 000000000000..5884b6cd2d60
--- /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/singular-3.0.2.1.ebuild b/sci-mathematics/singular/singular-3.0.2.1.ebuild
deleted file mode 100644
index a4c1ed82001b..000000000000
--- a/sci-mathematics/singular/singular-3.0.2.1.ebuild
+++ /dev/null
@@ -1,116 +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-3.0.2.1.ebuild,v 1.4 2007/08/05 17:20:48 markusle Exp $
-
-inherit eutils 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/$MY_PV_MAJOR/${MY_PN}-${MY_PV}.tar.gz
-	http://www.mathematik.uni-kl.de/ftp/pub/Math/Singular/UNIX/${MY_PN}-${MY_PV_MAJOR}-share.tar.gz"
-
-LICENSE="singular"
-SLOT="0"
-KEYWORDS="~amd64 ~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/$(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
-	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."
-}
diff --git a/sci-mathematics/singular/singular-3.0.3.ebuild b/sci-mathematics/singular/singular-3.0.4.4.ebuild
index fe58e927565f..07a88c8ed509 100644
--- a/sci-mathematics/singular/singular-3.0.3.ebuild
+++ b/sci-mathematics/singular/singular-3.0.4.4.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.3.ebuild,v 1.3 2007/09/25 12:26:50 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/singular/singular-3.0.4.4.ebuild,v 1.1 2008/10/20 12:30:00 markusle Exp $
 
 inherit eutils elisp-common flag-o-matic autotools multilib
 
@@ -11,8 +11,8 @@ 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-3/${MY_PV}/${MY_PN}-${MY_PV}.tar.gz
-	http://www.mathematik.uni-kl.de/ftp/pub/Math/Singular/UNIX/${MY_PN}-${MY_PV}-share.tar.gz"
+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"
@@ -24,12 +24,19 @@ DEPEND=">=dev-lang/perl-5.6
 		emacs? ( virtual/emacs )
 		boost? ( dev-libs/boost )"
 
-S="${WORKDIR}"/${MY_PN}-${MY_PV}
+S="${WORKDIR}"/${MY_PN}-${MY_PV_MAJOR}
 SITEFILE=60${PN}-gentoo.el
 
 src_unpack () {
 	unpack ${A}
-	epatch "${FILESDIR}"/${P}-gentoo.diff
+	cd "${S}"
+	epatch "${FILESDIR}"/${PN}-3.0.4.2-gentoo.diff
+	epatch "${FILESDIR}"/${P}-nostrip.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 || \
@@ -50,13 +57,13 @@ src_unpack () {
 }
 
 src_compile() {
-	local myconf="${myconf} --disable-doc --without-MP --with-factory --with-libfac --with-gmp --prefix=${S}"
+	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}/emacs/
+		cd "${WORKDIR}"/${MY_PN}/${MY_PV_MAJOR}/emacs/
 		elisp-compile *.el || die "elisp-compile failed"
 	fi
 }
@@ -86,11 +93,11 @@ src_install () {
 	doins *.so || die "failed to install libraries"
 
 	# create symbolic link
-	dosym /usr/bin/${MY_PN}-${MY_PV} /usr/bin/${MY_PN} || \
+	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}
+	cd "${WORKDIR}"/${MY_PN}/${MY_PV_MAJOR}
 	insinto /usr/share/${PN}/examples
 	doins examples/* || die "failed to install examples"
 
@@ -98,6 +105,9 @@ src_install () {
 	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"