Fixed incorrect RDEPEND (see bug 196654) and bumped to most recent version.

(Portage version: 2.1.3.15)

7 files changed, 85 insertions, 14 deletions

diff --git a/sci-mathematics/calc/ChangeLog b/sci-mathematics/calc/ChangeLog
index 41939213b7ee..3b0b9528f163 100644
--- a/sci-mathematics/calc/ChangeLog
+++ b/sci-mathematics/calc/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-mathematics/calc
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/calc/ChangeLog,v 1.12 2007/08/02 14:04:25 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/calc/ChangeLog,v 1.13 2007/10/24 12:50:28 markusle Exp $
+
+*calc-2.12.2.2 (24 Oct 2007)
+
+  24 Oct 2007; Markus Dittrich <markusle@gentoo.org> calc-2.12.1.5.ebuild,
+  +files/calc-2.12.2.2-libdir-fix.patch, +calc-2.12.2.2.ebuild:
+  Fixed incorrect RDEPEND (see bug 196654) and bumped to most recent
+  version.
 
   02 Aug 2007; Raúl Porcel <armin76@gentoo.org> calc-2.12.1.5.ebuild:
   alpha stable
diff --git a/sci-mathematics/calc/calc-2.11.10.1.ebuild b/sci-mathematics/calc/calc-2.11.10.1.ebuild
index 0c969520472f..e52bfc1fd949 100644
--- a/sci-mathematics/calc/calc-2.11.10.1.ebuild
+++ b/sci-mathematics/calc/calc-2.11.10.1.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/calc/calc-2.11.10.1.ebuild,v 1.6 2006/06/28 02:19:02 metalgod Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/calc/calc-2.11.10.1.ebuild,v 1.7 2007/10/24 12:50:28 markusle Exp $
 
 DESCRIPTION="An arbitrary precision C-like arithmetic system"
 HOMEPAGE="http://www.isthe.com/chongo/tech/comp/calc/"
@@ -19,7 +19,7 @@ RDEPEND=">=sys-apps/less-348"
 
 src_compile() {
 	make \
-		T=${D} \
+		T="${D}" \
 		DEBUG="${CFLAGS}" \
 		CALCPAGER=less \
 		USE_READLINE="-DUSE_READLINE" \
@@ -34,6 +34,6 @@ src_compile() {
 }
 
 src_install() {
-	make T=${D} install || die
+	make T="${D}" install || die
 	dodoc BUGS CHANGES COPYING COPYING-LGPL LIBRARY README
 }
diff --git a/sci-mathematics/calc/calc-2.11.9.3.ebuild b/sci-mathematics/calc/calc-2.11.9.3.ebuild
index ed9874469e14..918b53d8c15d 100644
--- a/sci-mathematics/calc/calc-2.11.9.3.ebuild
+++ b/sci-mathematics/calc/calc-2.11.9.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 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/calc/calc-2.11.9.3.ebuild,v 1.2 2005/09/16 07:43:52 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/calc/calc-2.11.9.3.ebuild,v 1.3 2007/10/24 12:50:28 markusle Exp $
 
 DESCRIPTION="An arbitrary precision C-like arithmetic system"
 HOMEPAGE="http://www.isthe.com/chongo/tech/comp/calc/"
@@ -19,7 +19,7 @@ RDEPEND=">=sys-apps/less-348"
 
 src_compile() {
 	make \
-		T=${D} \
+		T="${D}" \
 		DEBUG="${CFLAGS}" \
 		CALCPAGER=less \
 		USE_READLINE="-DUSE_READLINE" \
@@ -34,6 +34,6 @@ src_compile() {
 }
 
 src_install() {
-	make T=${D} install || die
+	make T="${D}" install || die
 	dodoc BUGS CHANGES COPYING COPYING-LGPL LIBRARY README
 }
diff --git a/sci-mathematics/calc/calc-2.12.1.5.ebuild b/sci-mathematics/calc/calc-2.12.1.5.ebuild
index efb521cb7d09..0c351d8270d6 100644
--- a/sci-mathematics/calc/calc-2.12.1.5.ebuild
+++ b/sci-mathematics/calc/calc-2.12.1.5.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/calc/calc-2.12.1.5.ebuild,v 1.3 2007/08/02 14:04:25 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/calc/calc-2.12.1.5.ebuild,v 1.4 2007/10/24 12:50:28 markusle Exp $
 
 DESCRIPTION="An arbitrary precision C-like arithmetic system"
 HOMEPAGE="http://www.isthe.com/chongo/tech/comp/calc/"
@@ -15,11 +15,12 @@ IUSE=""
 DEPEND=">=sys-libs/ncurses-5.2
 	>=sys-libs/readline-4.2"
 
-RDEPEND=">=sys-apps/less-348"
+RDEPEND="${DEPEND}
+		>=sys-apps/less-348"
 
 src_compile() {
 	make \
-		T=${D} \
+		T="${D}" \
 		DEBUG="${CFLAGS}" \
 		CALCPAGER=less \
 		USE_READLINE="-DUSE_READLINE" \
@@ -34,6 +35,6 @@ src_compile() {
 }
 
 src_install() {
-	make T=${D} install || die
-	dodoc BUGS CHANGES COPYING COPYING-LGPL LIBRARY README
+	make T="${D}" install || die
+	dodoc BUGS CHANGES LIBRARY README
 }
diff --git a/sci-mathematics/calc/calc-2.12.2.2.ebuild b/sci-mathematics/calc/calc-2.12.2.2.ebuild
new file mode 100644
index 000000000000..c5f2e4b65c30
--- /dev/null
+++ b/sci-mathematics/calc/calc-2.12.2.2.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/calc/calc-2.12.2.2.ebuild,v 1.1 2007/10/24 12:50:28 markusle Exp $
+
+inherit eutils
+
+DESCRIPTION="An arbitrary precision C-like arithmetic system"
+HOMEPAGE="http://www.isthe.com/chongo/tech/comp/calc/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+SLOT="0"
+LICENSE="LGPL-2"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc-macos ~x86"
+
+IUSE=""
+
+DEPEND=">=sys-libs/ncurses-5.2
+	>=sys-libs/readline-4.2"
+
+RDEPEND="${DEPEND}
+		>=sys-apps/less-348"
+
+src_unpack() {
+	unpack "${A}"
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-libdir-fix.patch
+}
+
+src_compile() {
+	make \
+		T="${D}" \
+		DEBUG="${CFLAGS}" \
+		CALCPAGER=less \
+		USE_READLINE="-DUSE_READLINE" \
+		READLINE_LIB="-lreadline -lhistory -lncurses" \
+		all \
+	|| die
+	if echo "${LD_PRELOAD}" | grep -q "sandbox"; then
+		ewarn "Can't run check when running in sandbox - see bug #59676"
+	else
+		make chk || die "Check failed"
+	fi
+}
+
+src_install() {
+	make T="${D}" install || die
+	dodoc BUGS CHANGES LIBRARY README
+}
diff --git a/sci-mathematics/calc/files/calc-2.12.2.2-libdir-fix.patch b/sci-mathematics/calc/files/calc-2.12.2.2-libdir-fix.patch
new file mode 100644
index 000000000000..f265793ab871
--- /dev/null
+++ b/sci-mathematics/calc/files/calc-2.12.2.2-libdir-fix.patch
@@ -0,0 +1,12 @@
+diff -Naur calc-2.12.2.2.old/Makefile calc-2.12.2.2/Makefile
+--- calc-2.12.2.2.old/Makefile	2007-09-29 12:58:19.000000000 -0400
++++ calc-2.12.2.2/Makefile	2007-10-24 06:40:10.000000000 -0400
+@@ -1131,7 +1131,7 @@
+ BLD_TYPE= calc-dynamic-only
+ #
+ CC_SHARE= -fPIC
+-DEFAULT_LIB_INSTALL_PATH= ${PWD}:/lib:/usr/lib:${LIBDIR}:/usr/local/lib
++DEFAULT_LIB_INSTALL_PATH= /lib:/usr/lib:${LIBDIR}:/usr/local/lib
+ LD_SHARE= "-Wl,-rpath,${DEFAULT_LIB_INSTALL_PATH}" \
+     "-Wl,-rpath-link,${DEFAULT_LIB_INSTALL_PATH}"
+ LIBCALC_SHLIB= -shared "-Wl,-soname,libcalc${LIB_EXT_VERSION}"
diff --git a/sci-mathematics/calc/files/digest-calc-2.12.2.2 b/sci-mathematics/calc/files/digest-calc-2.12.2.2
new file mode 100644
index 000000000000..b2faae0f5afa
--- /dev/null
+++ b/sci-mathematics/calc/files/digest-calc-2.12.2.2
@@ -0,0 +1,3 @@
+MD5 c977abbb95f91e9927fcd33fd683ab6f calc-2.12.2.2.tar.bz2 864687
+RMD160 31f126009ceef5cfad71f51c9016d86dba925826 calc-2.12.2.2.tar.bz2 864687
+SHA256 0a334cd331a4953a86365becce9b9f401b264a580a1f2130d5de700fa093772a calc-2.12.2.2.tar.bz2 864687