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

(Portage version: 2.1.3_rc9)

8 files changed, 142 insertions, 45 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/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