Checking for selected emacs version, bumped share-tarball, removed old.

Package-Manager: portage-2.1.9.24/cvs/Linux i686

5 files changed, 32 insertions, 173 deletions

diff --git a/sci-mathematics/singular/ChangeLog b/sci-mathematics/singular/ChangeLog
index dec54e0bb71d..3d4b243df90f 100644
--- a/sci-mathematics/singular/ChangeLog
+++ b/sci-mathematics/singular/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for sci-mathematics/singular
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/singular/ChangeLog,v 1.35 2010/11/08 23:33:11 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/singular/ChangeLog,v 1.36 2010/11/26 09:47:24 tomka Exp $
+
+*singular-3.1.2-r2 (26 Nov 2010)
+
+  26 Nov 2010; Thomas Kahle <tomka@gentoo.org>
+  -files/singular-3.1.0-glibc-2.10.patch, -singular-3.1.1-r1.ebuild,
+  -singular-3.1.2-r1.ebuild, +singular-3.1.2-r2.ebuild:
+  Upstream updated share-tarball.
+  Use latest emacs.eclass gadgets
+  Removed old.
 
 *singular-3.1.2-r1 (08 Nov 2010)
 
diff --git a/sci-mathematics/singular/Manifest b/sci-mathematics/singular/Manifest
index f5d2ea0ba3de..1a44f4392dfd 100644
--- a/sci-mathematics/singular/Manifest
+++ b/sci-mathematics/singular/Manifest
@@ -1,18 +1,24 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 60singular-gentoo.el 298 RMD160 6bd931435ad813a3a63c02ea68d90e768a685d88 SHA1 ffd1cb26719d6745f2e9463952f125769b8ca5a1 SHA256 b05a83af5a80fc1240e77d1cd036f4c9ca00907d11fb90d7f0ffb0c92ff7d235
 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.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-1-1-4a-share.tar.gz 8313448 RMD160 9abdd10ee46655147500b84f6a5d0dddc0c0206c SHA1 f8940c1bcb5b39f47a4fce30d758bdf02f2dda9c SHA256 d3705064205d17ea5ccf72acd26e5060be8ad84378969cf02bce49969c54b540
-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
+DIST Singular-3-1-2-share.tar.gz 9341118 RMD160 585f8d77ec3624eea298b85bdd4f8d6383d63fd2 SHA1 eb98e7c63c2f73ecdee83ce45274127b8246008f SHA256 03ca31608684a02f645c3ab75fe06402fc076f05e1ed7154427855affbfab45e
 DIST Singular-3-1-2.tar.gz 19564373 RMD160 53f407f62af36a8570b027c30b73c54dc106b290 SHA1 19ede02ed4cd513efd20f5a54568bc096e1d2c35 SHA256 4fbe46cca2aef42fdf73ef8556350278f9f3b3d5d0d1b8e21c1a182e59f2b88a
 EBUILD singular-3.0.1.2.ebuild 3130 RMD160 4671045a9d23f1e14419d6e075b44ddb4ceb11a5 SHA1 77cd6c69b3da929d6c55516d50574fe4bf09cba5 SHA256 e88cf1f5a012518d6f5c6c4bde1215b8f7928a192c053b8c2965f03b4697c5ce
-EBUILD singular-3.1.1-r1.ebuild 3163 RMD160 83d4445bd94aec5999a58d0f12c9aa857bd47f2f SHA1 15a1407c45439ad9633b48e506531441fb9023b6 SHA256 461d6f110b0cd54cb40f81b82f5eb0162c4a0e4e6d8126ce799ce757bd4a9886
-EBUILD singular-3.1.2-r1.ebuild 4546 RMD160 de85570db532cfdfbbff8ccba3d023f7e667337d SHA1 2ff99abacc98a622ff188e3802d95cdcd44bbcff SHA256 f6cc33a1079984ea9dadf0b33c7e7e7370d43716dc2f32e6ed712dd35d5da39a
-MISC ChangeLog 9421 RMD160 5a79d8a38f7beedd289f81babbbc8e079b1ad334 SHA1 d3c365524ac04f148f2d7b656aa824944d375094 SHA256 f40defab7fe9e92fea223b574d3dc74915b22bcfcf9fc9c5d5f725b81f625a0d
+EBUILD singular-3.1.2-r2.ebuild 4677 RMD160 604574ef8565d97e4bcc12aaee00c6aacdc1403b SHA1 1aefa5fd4bc558c608e64e69005fd75782c9dce9 SHA256 2e22b8b88e5d665250176f59ecb1cd8955084a5b4e7b5e4437384d8753565832
+MISC ChangeLog 9711 RMD160 bf1b45473e54d8d3b31a4ac715ddef7e9b66471f SHA1 c494f2b5de01233004c3a5e59b5e15404933f05e SHA256 4672823b5510fa9f06bef3894c68890d564698ed1964d945d852fb1b1550f025
 MISC metadata.xml 369 RMD160 a0e979ca13cc60ced54af5d3c02cfb8b76bd6af1 SHA1 dcc261552e4483b66399c450482fc112e6a27994 SHA256 cff5f6b561efdc5121015bb0afc25656aa698d41b6c3c62019e13b5fa0980e20
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iEYEARECAAYFAkzvgasACgkQnZsgo/h8kNYC0ACff8VeOpf5Ltl0ajI9Koi2MXYk
+9s0An3/GXW6mAKzMXs70E+gOHLeTkI9a
+=pSKx
+-----END PGP SIGNATURE-----
diff --git a/sci-mathematics/singular/files/singular-3.1.0-glibc-2.10.patch b/sci-mathematics/singular/files/singular-3.1.0-glibc-2.10.patch
deleted file mode 100644
index 0593eded2a08..000000000000
--- a/sci-mathematics/singular/files/singular-3.1.0-glibc-2.10.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff -Naur Singular-3-1-0/kernel/febase.cc Singular-3-1-0.new/kernel/febase.cc
---- Singular-3-1-0/kernel/febase.cc	2009-06-22 13:16:57.000000000 -0400
-+++ Singular-3-1-0.new/kernel/febase.cc	2009-08-20 22:31:06.000000000 -0400
-@@ -739,13 +739,15 @@
-       char* dir_sep;
-       struct passwd *pw_entry;
-       strcpy (longpath, path);
--      dir_sep = strchr(longpath, DIR_SEP);
-+      // TODO: fix the ugly casting away of const
-+      dir_sep = const_cast<char*> ( strchr(longpath, DIR_SEP) );  
-       *dir_sep = '\0';
-       pw_entry = getpwnam(&longpath[1]);
-       if (pw_entry != NULL)
-       {
-         strcpy(longpath, pw_entry->pw_dir);
--        dir_sep = strchr((char *)path, DIR_SEP);
-+        // TODO: fix the ugly casting away of const
-+        dir_sep = const_cast<char*> ( strchr((char*)path, DIR_SEP) );  
-         strcat(longpath, dir_sep);
-         path = longpath;
-       }
-diff -Naur Singular-3-1-0/kernel/mpr_complex.cc Singular-3-1-0.new/kernel/mpr_complex.cc
---- Singular-3-1-0/kernel/mpr_complex.cc	2009-06-22 13:16:57.000000000 -0400
-+++ Singular-3-1-0.new/kernel/mpr_complex.cc	2009-08-20 22:28:58.000000000 -0400
-@@ -83,7 +83,8 @@
-   BOOLEAN neg=false;
-   if (*in == '-') { in++; neg=TRUE; }
-   char *s;
--  if ((s=strchr((char *)in,'E')) !=NULL)
-+  /* TODO: fix the ugly casting away of const */ 
-+  if ((s = const_cast<char*> ( strchr(in,'E') )) !=NULL) 
-   {
-     *s='e';
-   }
diff --git a/sci-mathematics/singular/singular-3.1.1-r1.ebuild b/sci-mathematics/singular/singular-3.1.1-r1.ebuild
deleted file mode 100644
index 2267d6b7f6bf..000000000000
--- a/sci-mathematics/singular/singular-3.1.1-r1.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# 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-r1.ebuild,v 1.1 2010/10/17 08:20:13 xarthisius Exp $
-
-EAPI="2"
-
-inherit autotools eutils elisp-common flag-o-matic 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 -i \
-		-e '/CXXFLAGS/ s/--no-exceptions//g' \
-		-e "s/SLDFLAGS=-shared/SLDFLAGS=\"$(raw-ldflags) -shared\"/" \
-		"${S}"/Singular/configure.in || die
-
-	cd "${S}"/Singular || die
-	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 -j1 || die
-	if use emacs; then
-		cd "${WORKDIR}"/${MY_PN}/${MY_PV}/emacs/
-		elisp-compile *.el || die
-	fi
-}
-
-src_install () {
-	dodoc README || die
-	# execs and libraries
-	cd "${S}"/*-Linux
-	dobin ${MY_PN}* gen_test change_cost solve_IP toric_ideal LLL \
-		|| die
-	insinto /usr/$(get_libdir)/${PN}
-	doins *.so || die
-
-	dosym ${MY_PN}-${MY_PV} /usr/bin/${MY_PN} || die
-
-	# stuff from the share tar ball
-	cd "${WORKDIR}"/${MY_PN}/${MY_PV}
-	insinto /usr/share/${PN}
-	doins -r LIB  || die
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples || die
-	fi
-	if use doc; then
-		dohtml -r html/* || die
-		insinto /usr/share/${PN}
-		doins doc/singular.idx || die
-		cp info/${PN}.hlp info/${PN}.info &&
-		doinfo info/${PN}.info || die
-	fi
-	if use emacs; then
-		elisp-install ${PN} emacs/*.el emacs/*.elc emacs/.emacs* \
-			|| die
-		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.2-r1.ebuild b/sci-mathematics/singular/singular-3.1.2-r2.ebuild
index 0d4c3aa3a46b..ce1fdaff4628 100644
--- a/sci-mathematics/singular/singular-3.1.2-r1.ebuild
+++ b/sci-mathematics/singular/singular-3.1.2-r2.ebuild
@@ -1,6 +1,6 @@
 # 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.2-r1.ebuild,v 1.2 2010/11/09 05:55:33 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/singular/singular-3.1.2-r2.ebuild,v 1.1 2010/11/26 09:47:24 tomka Exp $
 
 EAPI="3"
 WANT_AUTOCONF="2.1" # Upstream ticket 240 -> wontfix
@@ -10,8 +10,9 @@ inherit autotools eutils elisp-common flag-o-matic multilib prefix versionator
 MY_PN=Singular
 MY_PV=$(replace_all_version_separators -)
 MY_DIR=$(get_version_component_range 1-3 ${MY_PV})
-MY_SHARE_DIR="3-1-1"
-MY_PV_SHARE="${MY_SHARE_DIR}-4a"  # What an awesome filenaming scheme...
+# There 'share' tarball does not get updated on every release
+MY_SHARE_DIR="3-1-2"
+MY_PV_SHARE="${MY_SHARE_DIR}"
 
 DESCRIPTION="Computer algebra system for polynomial computations"
 HOMEPAGE="http://www.singular.uni-kl.de/"
@@ -43,6 +44,11 @@ pkg_setup() {
 	append-flags "-fPIC"
 	append-ldflags "-fPIC"
 	tc-export CC CPP CXX
+
+	# Ensure that >=emacs-22 is selected 
+	if use emacs; then
+		lisp-need-emacs 22 || die "Emacs version too low"
+	fi
 }
 
 src_prepare () {