Version bump and removed old ebuild (see bug #187562).

Package-Manager: portage-2.1.3_rc9

9 files changed, 171 insertions, 69 deletions

diff --git a/sci-mathematics/singular/ChangeLog b/sci-mathematics/singular/ChangeLog
index eaf074807271..687cd26a8f33 100644
--- a/sci-mathematics/singular/ChangeLog
+++ b/sci-mathematics/singular/ChangeLog
@@ -1,6 +1,13 @@
 # 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.16 2007/05/19 21:56:11 welp Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/singular/ChangeLog,v 1.17 2007/08/05 17:20:48 markusle Exp $
+
+*singular-3.0.3 (04 Aug 2007)
+
+  04 Aug 2007; Markus Dittrich <markusle@gentoo.org>
+  -singular-3.0.1.1.ebuild, singular-3.0.2.1.ebuild, 
+  +files/singular-3.0.3-gentoo.diff, +singular-3.0.3.ebuild:
+  Version bump and removed old ebuild (see bug #187562).
 
   19 May 2007; Peter Weller <welp@gentoo.org> singular-3.0.2.1.ebuild:
   Multilib-strict fix, keyworded ~amd64
diff --git a/sci-mathematics/singular/Manifest b/sci-mathematics/singular/Manifest
index fc23aa5c5d50..9b24135bc49b 100644
--- a/sci-mathematics/singular/Manifest
+++ b/sci-mathematics/singular/Manifest
@@ -18,11 +18,16 @@ AUX singular-3.0.2-gentoo.diff 4550 RMD160 cd095f131c22e0ab9df308333e730a5551883
 MD5 8f5cffaf8a0919ca811ca75a2164b28d files/singular-3.0.2-gentoo.diff 4550
 RMD160 cd095f131c22e0ab9df308333e730a5551883753 files/singular-3.0.2-gentoo.diff 4550
 SHA256 1236a16e83448f58b70ef94abd8810b3de4a93d6ad807b5cc8db33932d57f7f3 files/singular-3.0.2-gentoo.diff 4550
-DIST Singular-3-0-1-1.tar.gz 10612472 RMD160 46c0eda76c2b9ae7296b5ac346eb6daff0069b41 SHA1 fe9193a704d3fd32195ef37a82d94dd38700eb94 SHA256 3d0fa0d13503df20fff1101f6efbde172b7fc4910a55018e3b0df79808dcf883
+AUX singular-3.0.3-gentoo.diff 4550 RMD160 bdcb935dffbeab7e73db9f734671c9624c299ce6 SHA1 0de70395ffc94ba817dbcbd081c7d551915123a0 SHA256 c849159fad372f37e441075b601a4eb8abcfc29b360e200b69f148521176b965
+MD5 7898d60534e9da0fe5429d6164f0e271 files/singular-3.0.3-gentoo.diff 4550
+RMD160 bdcb935dffbeab7e73db9f734671c9624c299ce6 files/singular-3.0.3-gentoo.diff 4550
+SHA256 c849159fad372f37e441075b601a4eb8abcfc29b360e200b69f148521176b965 files/singular-3.0.3-gentoo.diff 4550
 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
@@ -35,26 +40,26 @@ DIST Singular-kernel-2-0-5.tar.gz 2688358 RMD160 e1ed74936a0af5ce31f02fa4cd2e2ce
 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 4270 RMD160 33fc8852f8fbe10e7f74c78ed7e1dc1482a6d7c9 SHA1 7b5c7213d18eddc53abcf369122525153182f667 SHA256 4fd0759bf8b2623f36469b65591d048fcf3ce4ad027f4057366a380b4f0fa7e9
-MD5 2fd8b8369aeee757a07d098d238e3eae singular-2.0.5-r4.ebuild 4270
-RMD160 33fc8852f8fbe10e7f74c78ed7e1dc1482a6d7c9 singular-2.0.5-r4.ebuild 4270
-SHA256 4fd0759bf8b2623f36469b65591d048fcf3ce4ad027f4057366a380b4f0fa7e9 singular-2.0.5-r4.ebuild 4270
-EBUILD singular-3.0.1.1.ebuild 2869 RMD160 f945dfec8a9fa5254baee157ec05b9f4bdde8320 SHA1 3347206fdd7d524bd16dab0fd35eb8ba9de8b2a5 SHA256 36a2e861040e1a6b2c51ebc19d12a801713c1168dca8abe42c48cfab1919f7ed
-MD5 16eca598269b78910eee1064ec4c8243 singular-3.0.1.1.ebuild 2869
-RMD160 f945dfec8a9fa5254baee157ec05b9f4bdde8320 singular-3.0.1.1.ebuild 2869
-SHA256 36a2e861040e1a6b2c51ebc19d12a801713c1168dca8abe42c48cfab1919f7ed singular-3.0.1.1.ebuild 2869
-EBUILD singular-3.0.1.2.ebuild 3126 RMD160 1f2801f34854e2f68e7b14ec6905cf1779064fb9 SHA1 b4306b4b29b14b2e7d5aed8059ea28514e5cf53a SHA256 e0b269c23cf80396c0e46804ab1e270bcc04591f67174e7f9eec4982315a1402
-MD5 5ce29947d91970d3f3bcaaee53745b14 singular-3.0.1.2.ebuild 3126
-RMD160 1f2801f34854e2f68e7b14ec6905cf1779064fb9 singular-3.0.1.2.ebuild 3126
-SHA256 e0b269c23cf80396c0e46804ab1e270bcc04591f67174e7f9eec4982315a1402 singular-3.0.1.2.ebuild 3126
-EBUILD singular-3.0.2.1.ebuild 3214 RMD160 effbe422a630db7c10c0d1c017a54f8d1b8d59fb SHA1 d467a8271161844fb380205ed524790b0ab74b29 SHA256 2e07c89dfef2ca601bcc6a282c6bd106a2100e4b1462b3f0231c87b533ea4204
-MD5 d0da511b2f85edac3a59a23f183747c8 singular-3.0.2.1.ebuild 3214
-RMD160 effbe422a630db7c10c0d1c017a54f8d1b8d59fb singular-3.0.2.1.ebuild 3214
-SHA256 2e07c89dfef2ca601bcc6a282c6bd106a2100e4b1462b3f0231c87b533ea4204 singular-3.0.2.1.ebuild 3214
-MISC ChangeLog 5397 RMD160 cb55b2a943d01ddf7b2360c6089f1659a0b6d492 SHA1 f458eb8eac790b0ab83584b87ebced9563228936 SHA256 27f91e41f5737e7a9d9503926e875595528035eacc49d60fd130226b69e0f16d
-MD5 c93106570a909c6ca1b3991693314973 ChangeLog 5397
-RMD160 cb55b2a943d01ddf7b2360c6089f1659a0b6d492 ChangeLog 5397
-SHA256 27f91e41f5737e7a9d9503926e875595528035eacc49d60fd130226b69e0f16d ChangeLog 5397
+EBUILD singular-2.0.5-r4.ebuild 4269 RMD160 a098dd4ac3aa38ea27112005c56d04584eb5081e SHA1 af0ed9f31ed5cec209671509086416f31e8efd7e SHA256 e351dc22778a69b056693e7cbabce5087f5eb823ae57c84c18e076162b52436d
+MD5 785dc18b2a8c2bf54a7aeda176a2a83e singular-2.0.5-r4.ebuild 4269
+RMD160 a098dd4ac3aa38ea27112005c56d04584eb5081e singular-2.0.5-r4.ebuild 4269
+SHA256 e351dc22778a69b056693e7cbabce5087f5eb823ae57c84c18e076162b52436d singular-2.0.5-r4.ebuild 4269
+EBUILD singular-3.0.1.2.ebuild 3125 RMD160 a041f17e9314f3454ad9279175fb374767da23ca SHA1 d986b456ce86704df52fb2f67d867c713552572a SHA256 3182b3688d9f96a4842738ff592470ec68c10b9b1533dbe7a3fcceb9bf48da40
+MD5 86d102d67acb4e2562e6ca70edf4d6c9 singular-3.0.1.2.ebuild 3125
+RMD160 a041f17e9314f3454ad9279175fb374767da23ca singular-3.0.1.2.ebuild 3125
+SHA256 3182b3688d9f96a4842738ff592470ec68c10b9b1533dbe7a3fcceb9bf48da40 singular-3.0.1.2.ebuild 3125
+EBUILD singular-3.0.2.1.ebuild 3235 RMD160 daad978eb71b2905212b250dd2fe015bf030989a SHA1 ed535b79cae8805995fbe9ccd5ea2e14747acd41 SHA256 b0ca1f35cf005b5f4c9c81011f99bcec89f7ad597b9341f6eeaa971966fa9d2b
+MD5 52b419eeeebc4c707b276fba350a0f23 singular-3.0.2.1.ebuild 3235
+RMD160 daad978eb71b2905212b250dd2fe015bf030989a singular-3.0.2.1.ebuild 3235
+SHA256 b0ca1f35cf005b5f4c9c81011f99bcec89f7ad597b9341f6eeaa971966fa9d2b singular-3.0.2.1.ebuild 3235
+EBUILD singular-3.0.3.ebuild 3192 RMD160 d464cb5a2629f139d61e681bc73bd6a2d42b2f78 SHA1 0308eef9896f79af8a9990f92123e7179e3f339a SHA256 5ee159227f16e72a5f2fd530ad091c10c2da8a818f11232d1348113d6305ed04
+MD5 7d350a13a32492b6a17a59dbbed1b532 singular-3.0.3.ebuild 3192
+RMD160 d464cb5a2629f139d61e681bc73bd6a2d42b2f78 singular-3.0.3.ebuild 3192
+SHA256 5ee159227f16e72a5f2fd530ad091c10c2da8a818f11232d1348113d6305ed04 singular-3.0.3.ebuild 3192
+MISC ChangeLog 5658 RMD160 d6c4301c185bf6eb43ea2ada59c5d854a6876080 SHA1 c27c16826a7bfe97e479594e845eeb90933fdc1b SHA256 0ee35214e7c75fdf334c89dd78191fa4e2d5cfd167861d18ba43139fac1d55e3
+MD5 5d510bc1a26c50e1f7ddb427b8b3cde6 ChangeLog 5658
+RMD160 d6c4301c185bf6eb43ea2ada59c5d854a6876080 ChangeLog 5658
+SHA256 0ee35214e7c75fdf334c89dd78191fa4e2d5cfd167861d18ba43139fac1d55e3 ChangeLog 5658
 MISC metadata.xml 168 RMD160 d98790cf055dc0f820c63d65f485b9dcfa8950f4 SHA1 95c9e4f7368f82053d631bbcd469612c92ca13cb SHA256 c0cc8d6ab9385750af753ddc504299ed90a70b5c4c655f6c77d865917a8829c9
 MD5 30bc69a424d7634aae9c1e4203365d3d metadata.xml 168
 RMD160 d98790cf055dc0f820c63d65f485b9dcfa8950f4 metadata.xml 168
@@ -62,12 +67,12 @@ SHA256 c0cc8d6ab9385750af753ddc504299ed90a70b5c4c655f6c77d865917a8829c9 metadata
 MD5 400ce9bf9a288606f03a9f43f5f0803e files/digest-singular-2.0.5-r4 3129
 RMD160 b793dbb2a66e9fd479f5ed5f7d62342fb5398fa8 files/digest-singular-2.0.5-r4 3129
 SHA256 e4dd0bfa1d9aa6c862c43ae5af8b8f792c368b9b38caefc9af626c16e79548b7 files/digest-singular-2.0.5-r4 3129
-MD5 b69f48638591b4656a37a65208fb78a7 files/digest-singular-3.0.1.1 521
-RMD160 82d806cb6badfe2c6aea52f2f6ac387e4135ad4f files/digest-singular-3.0.1.1 521
-SHA256 bfd2482ea9f2900c71f5840caa9e0cfaba9362d25d7896508cc3054dea261765 files/digest-singular-3.0.1.1 521
 MD5 e670be22aaab8d30f92775a29cf3181f files/digest-singular-3.0.1.2 521
 RMD160 426474889edd4e83d3a500eaa31168a442809763 files/digest-singular-3.0.1.2 521
 SHA256 94836cdbfb1cb355a3e4055100e15a0a6297eeaf2a74ba9bca2bdc50741a752d files/digest-singular-3.0.1.2 521
 MD5 788d935d40a45b596660ac4cbd27c17c files/digest-singular-3.0.2.1 521
 RMD160 db3980b2fe3cc6ec9604fa4612f6ce3fd80eec1e files/digest-singular-3.0.2.1 521
 SHA256 90462cae909b7d20eefc41ab36dd991770f3ac34219ce6d3ca6630a72dce7af1 files/digest-singular-3.0.2.1 521
+MD5 c626f3622f28a827372c75ce31355f58 files/digest-singular-3.0.3 515
+RMD160 128bb01db8e36613dcf1bd772e319c482d2a3484 files/digest-singular-3.0.3 515
+SHA256 56abb350037601a58bfe31391ee89cc5319c8905e6bb91d5d5979f46a30f091a files/digest-singular-3.0.3 515
diff --git a/sci-mathematics/singular/files/digest-singular-3.0.1.1 b/sci-mathematics/singular/files/digest-singular-3.0.1.1
deleted file mode 100644
index 11c37fa2495d..000000000000
--- a/sci-mathematics/singular/files/digest-singular-3.0.1.1
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 0534ea706c1eda4df706a341bafee947 Singular-3-0-1-1.tar.gz 10612472
-RMD160 46c0eda76c2b9ae7296b5ac346eb6daff0069b41 Singular-3-0-1-1.tar.gz 10612472
-SHA256 3d0fa0d13503df20fff1101f6efbde172b7fc4910a55018e3b0df79808dcf883 Singular-3-0-1-1.tar.gz 10612472
-MD5 e9ac8802f2c3bcfbecd1c34837f7c826 Singular-3-0-1-share.tar.gz 3909236
-RMD160 f1a1792cbb0688e1353285f898a2e40bc88fd4f6 Singular-3-0-1-share.tar.gz 3909236
-SHA256 5b8647886e15ca0a296a7d08a4161ecdc6fe5ef558cd9b36acda95a21a0883a2 Singular-3-0-1-share.tar.gz 3909236
diff --git a/sci-mathematics/singular/files/digest-singular-3.0.3 b/sci-mathematics/singular/files/digest-singular-3.0.3
new file mode 100644
index 000000000000..e8235088b910
--- /dev/null
+++ b/sci-mathematics/singular/files/digest-singular-3.0.3
@@ -0,0 +1,6 @@
+MD5 35f3d8d2dddeffdfcfa4b2fb0ac03201 Singular-3-0-3-share.tar.gz 6656532
+RMD160 5cc28c8a13383ac51e143da227159bcd17c40d2b Singular-3-0-3-share.tar.gz 6656532
+SHA256 fbd1d4522237ced5589c37d26ac83cfc9b000a869af6e1e84a355a846d234116 Singular-3-0-3-share.tar.gz 6656532
+MD5 df022b776506d36a9a671c8333eeac7e Singular-3-0-3.tar.gz 13757114
+RMD160 dfc2263237c86995963a7f3a46d65f57bf95d843 Singular-3-0-3.tar.gz 13757114
+SHA256 0b2afd008969068c984444f57297c2ccfabf792a83b726fda73e31e424014a6e Singular-3-0-3.tar.gz 13757114
diff --git a/sci-mathematics/singular/files/singular-3.0.3-gentoo.diff b/sci-mathematics/singular/files/singular-3.0.3-gentoo.diff
new file mode 100644
index 000000000000..aeb556cb1fdf
--- /dev/null
+++ b/sci-mathematics/singular/files/singular-3.0.3-gentoo.diff
@@ -0,0 +1,83 @@
+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/singular-2.0.5-r4.ebuild b/sci-mathematics/singular/singular-2.0.5-r4.ebuild
index 9e6fa25fae9f..26a5c162835d 100644
--- a/sci-mathematics/singular/singular-2.0.5-r4.ebuild
+++ b/sci-mathematics/singular/singular-2.0.5-r4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# 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.4 2007/07/13 05:28:09 mr_bones_ Exp $
+# $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
 
diff --git a/sci-mathematics/singular/singular-3.0.1.2.ebuild b/sci-mathematics/singular/singular-3.0.1.2.ebuild
index a491cef41d9d..cb698b9009b1 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-2006 Gentoo Foundation
+# 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.1.2.ebuild,v 1.8 2007/07/13 05:28:09 mr_bones_ Exp $
+# $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 $
 
 inherit eutils flag-o-matic
 
diff --git a/sci-mathematics/singular/singular-3.0.2.1.ebuild b/sci-mathematics/singular/singular-3.0.2.1.ebuild
index aa81b1b5f28d..a4c1ed82001b 100644
--- a/sci-mathematics/singular/singular-3.0.2.1.ebuild
+++ b/sci-mathematics/singular/singular-3.0.2.1.ebuild
@@ -1,6 +1,6 @@
 # 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.3 2007/07/13 05:28:09 mr_bones_ Exp $
+# $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
 
@@ -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="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"
+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"
diff --git a/sci-mathematics/singular/singular-3.0.1.1.ebuild b/sci-mathematics/singular/singular-3.0.3.ebuild
index 6c445e891386..e889fe341ee1 100644
--- a/sci-mathematics/singular/singular-3.0.1.1.ebuild
+++ b/sci-mathematics/singular/singular-3.0.3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2006 Gentoo Foundation
+# 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.1.1.ebuild,v 1.3 2007/07/13 05:28:09 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/singular/singular-3.0.3.ebuild,v 1.1 2007/08/05 17:20:48 markusle Exp $
 
-inherit eutils
+inherit eutils flag-o-matic autotools multilib
 
 PV_MAJOR=${PV%.*}
 MY_PV=${PV//./-}
@@ -11,45 +11,52 @@ 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-1-share.tar.gz"
+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"
 
-LICENSE="singular"
+LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc"
-IUSE="doc emacs"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="doc emacs boost"
 
 DEPEND=">=dev-lang/perl-5.6
 		>=dev-libs/gmp-4.1-r1
-		emacs? ( || ( app-editors/xemacs
-					app-editors/emacs ) )"
+		emacs? ( || ( virtual/xemacs
+					virtual/emacs ) )
+		boost? ( dev-libs/boost )"
 
-S="${WORKDIR}"/${MY_PN}-${MY_PV_MAJOR}
+S="${WORKDIR}"/${MY_PN}-${MY_PV}
 
 src_unpack () {
 	unpack ${A}
-	epatch  $FILESDIR/${PN}-${PV_MAJOR}-gentoo.diff
-	sed -e "s/PFSUBST/${PF}/" -i ${S}/kernel/feResource.cc || \
+	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 --prefix=${S}"
-	econf ${myconf} || die "econf failed"
-	emake || die "make failed"
+	local myconf="${myconf} --disable-doc --with-MP --with-factory --with-libfac --with-gmp --prefix=${S}"
+	econf $(use_enable emacs) \
+		${myconf} || die "econf failed"
+	emake -j1 || die "make failed"
 }
 
 src_install () {
-	local myarchprefix
-	case ${ARCH} in
-		x86)
-			myarchprefix=ix86
-			;;
-		*)
-			myarchprefix=${ARCH}
-			;;
-	esac
-
 	# install basic docs
 	cd "${S}" && dodoc BUGS ChangeLog || \
 		die "failed to install docs"
@@ -62,7 +69,7 @@ src_install () {
 	cd gftables && doins * \
 		|| die "failed to install files int LIB/gftables"
 
-	cd "${S}/${myarchprefix}"-Linux
+	cd "${S}"/*-Linux
 
 	# install binaries
 	rm ${MY_PN} || die "failed to remove ${MY_PN}"
@@ -74,15 +81,15 @@ src_install () {
 	fi
 
 	# install libraries
-	insinto /usr/lib/${PN}
+	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} || \
+	dosym /usr/bin/${MY_PN}-${MY_PV} /usr/bin/${MY_PN} || \
 		die "failed to create symbolic link"
 
 	# install examples
-	cd "${WORKDIR}"/${MY_PN}/${MY_PV_MAJOR}
+	cd "${WORKDIR}"/${MY_PN}/${MY_PV}
 	insinto /usr/share/${PN}/examples
 	doins examples/* || die "failed to install examples"
 
@@ -91,7 +98,7 @@ src_install () {
 		dohtml -r html/* || die "failed to install html docs"
 
 		cp info/${PN}.hlp info/${PN}.info &&
-		doinfo info/${PN}.help || \
+		doinfo info/${PN}.info || \
 		die "failed to install info files"
 	fi