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

Package-Manager: portage-2.1.3.15

8 files changed, 113 insertions, 30 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/Manifest b/sci-mathematics/calc/Manifest
index b6abdf08e5a6..8c2d337b8110 100644
--- a/sci-mathematics/calc/Manifest
+++ b/sci-mathematics/calc/Manifest
@@ -1,22 +1,31 @@
+AUX calc-2.12.2.2-libdir-fix.patch 570 RMD160 d639ac5733ad93f8ab9de95ab3035445d098c897 SHA1 5c1e64036d10f84b44ab35056ce9d1d7f5f26d0e SHA256 e3728498caa9c65d01c43c40896b82849e6845b74613fbe0b1d03f3502fb33c7
+MD5 c42b4f6316b9a189f17e79b03fd79319 files/calc-2.12.2.2-libdir-fix.patch 570
+RMD160 d639ac5733ad93f8ab9de95ab3035445d098c897 files/calc-2.12.2.2-libdir-fix.patch 570
+SHA256 e3728498caa9c65d01c43c40896b82849e6845b74613fbe0b1d03f3502fb33c7 files/calc-2.12.2.2-libdir-fix.patch 570
 DIST calc-2.11.10.1.tar.gz 975250 RMD160 03da57108be8442eaae3a5638126ee70ec5b6926 SHA1 e3ea5e7f9375c88eedaabb1e4f530453cb0dc976 SHA256 4bc3ba8a68ee379ad54221259481b3de4df7a677d9737abc1fcef210bae3c2d0
 DIST calc-2.11.9.3.tar.gz 959014 RMD160 0ad3122b937e36034858f78b2645c368b468285b SHA1 ea02f7f3a4d23435c187732be621a482e05a9573 SHA256 9f6d5329a5fc04d9ab4fabd0d169a429190cf48f23dfa0fa236bebd5b8711319
 DIST calc-2.12.1.5.tar.gz 1020389 RMD160 729de36922ede4212225833f926d82329673ffff SHA1 7a25ee74a6096413b36281e7ab120ae8103b75db SHA256 3a8b6daa60de0b5aa7c33dcfdf0aeec9d4523f51638235468de32f843ce79171
-EBUILD calc-2.11.10.1.ebuild 1010 RMD160 b3f0eacb52b0781cef9eca0a93fd60a860abad3e SHA1 12acf7684f904b9cd4ac41a0136c34fa2a2f2704 SHA256 4ad9fef7a65b78aaa67fb239f6f71b04394b1691c35dbb0335f5a3679cfe8e2a
-MD5 f9e64db82aeb7733a538661ec2ea3d70 calc-2.11.10.1.ebuild 1010
-RMD160 b3f0eacb52b0781cef9eca0a93fd60a860abad3e calc-2.11.10.1.ebuild 1010
-SHA256 4ad9fef7a65b78aaa67fb239f6f71b04394b1691c35dbb0335f5a3679cfe8e2a calc-2.11.10.1.ebuild 1010
-EBUILD calc-2.11.9.3.ebuild 1004 RMD160 ca206d15ba8953911112eb77401c4a464295fa8f SHA1 beb3eadc6e67ee75250da4952ccf298943248f21 SHA256 edaca692df4ca65bd1a5e575c123401249dd334fcd94cf0e80f0ccd468dafb68
-MD5 4c44ad810290371eb0123023fa0c0605 calc-2.11.9.3.ebuild 1004
-RMD160 ca206d15ba8953911112eb77401c4a464295fa8f calc-2.11.9.3.ebuild 1004
-SHA256 edaca692df4ca65bd1a5e575c123401249dd334fcd94cf0e80f0ccd468dafb68 calc-2.11.9.3.ebuild 1004
-EBUILD calc-2.12.1.5.ebuild 1003 RMD160 449a055edf4f4322f95a7dae1dc2dc88c02ff80e SHA1 b31b761e5ebf3ad928ec9ca8c12ed2b585c6f549 SHA256 0faf55ba23167302c166201b37bd230b17b8a8a190895bf390fe3429c5a97f80
-MD5 059eb7cbe988c3ae07562889c009b29f calc-2.12.1.5.ebuild 1003
-RMD160 449a055edf4f4322f95a7dae1dc2dc88c02ff80e calc-2.12.1.5.ebuild 1003
-SHA256 0faf55ba23167302c166201b37bd230b17b8a8a190895bf390fe3429c5a97f80 calc-2.12.1.5.ebuild 1003
-MISC ChangeLog 2219 RMD160 76c4a541ad5bfcc58c8081a6091f6fdb715fa8aa SHA1 4bb4c79c0a51d0972c52bc53c3af982acb3be2d0 SHA256 b6159e3f2dd4097fc859e09efe61f0324c8f4d00f9f85cd32d3805683827001c
-MD5 bc93099a4be018d10636231e3d7a983f ChangeLog 2219
-RMD160 76c4a541ad5bfcc58c8081a6091f6fdb715fa8aa ChangeLog 2219
-SHA256 b6159e3f2dd4097fc859e09efe61f0324c8f4d00f9f85cd32d3805683827001c ChangeLog 2219
+DIST calc-2.12.2.2.tar.bz2 864687 RMD160 31f126009ceef5cfad71f51c9016d86dba925826 SHA1 6d6bf6b942d37ad6cb76dbb9a34cab18acc865ba SHA256 0a334cd331a4953a86365becce9b9f401b264a580a1f2130d5de700fa093772a
+EBUILD calc-2.11.10.1.ebuild 1014 RMD160 d4793ce2952472049925d7f1319a9110debee026 SHA1 f623ff6621587a5436630e42a762e1d65fb0c6c0 SHA256 da5b8570716cf2e57b126b34134713df4d5da7b922ba1d8a22da56e7d5141279
+MD5 857118884cffd4db8c61500590f71e53 calc-2.11.10.1.ebuild 1014
+RMD160 d4793ce2952472049925d7f1319a9110debee026 calc-2.11.10.1.ebuild 1014
+SHA256 da5b8570716cf2e57b126b34134713df4d5da7b922ba1d8a22da56e7d5141279 calc-2.11.10.1.ebuild 1014
+EBUILD calc-2.11.9.3.ebuild 1008 RMD160 0d55cc679dffd1ead4c54a4e98e40061d94186f2 SHA1 d853df6bb2d0bcbe04b9ba7ccec7462429f219b9 SHA256 0f7c1d3b23a54d33e8e3f48a1c7c576e9d00aae9785079a8f3b2c88a610e11da
+MD5 6f31189b4892db4f6d0058691178df6a calc-2.11.9.3.ebuild 1008
+RMD160 0d55cc679dffd1ead4c54a4e98e40061d94186f2 calc-2.11.9.3.ebuild 1008
+SHA256 0f7c1d3b23a54d33e8e3f48a1c7c576e9d00aae9785079a8f3b2c88a610e11da calc-2.11.9.3.ebuild 1008
+EBUILD calc-2.12.1.5.ebuild 999 RMD160 3996d8c42a79946efb65f8812ba40e23388ef5e7 SHA1 2f7435e3cf4a113617d23de4198d8f41fe6eb9f7 SHA256 09a811c30c195503888a17087ac31e8747800a1267a286f9a463de285e8959b0
+MD5 735f404667fe020f22e9ba78acc27b1c calc-2.12.1.5.ebuild 999
+RMD160 3996d8c42a79946efb65f8812ba40e23388ef5e7 calc-2.12.1.5.ebuild 999
+SHA256 09a811c30c195503888a17087ac31e8747800a1267a286f9a463de285e8959b0 calc-2.12.1.5.ebuild 999
+EBUILD calc-2.12.2.2.ebuild 1106 RMD160 b01dc765b503433adff8f9ee24e9ec657f31f316 SHA1 86c021b267c1ccfdbd800e0419bdf0b94b7e596b SHA256 6bba5d9f07efd95a936ea6f3b4294d3f1362647effe346acb7263fd70824fb1f
+MD5 bad766a5421637c384f1e56bb6bd57cf calc-2.12.2.2.ebuild 1106
+RMD160 b01dc765b503433adff8f9ee24e9ec657f31f316 calc-2.12.2.2.ebuild 1106
+SHA256 6bba5d9f07efd95a936ea6f3b4294d3f1362647effe346acb7263fd70824fb1f calc-2.12.2.2.ebuild 1106
+MISC ChangeLog 2470 RMD160 5929f838f519bd46f9560e9991d3294db5a8b460 SHA1 e47779d8252db940a72b9d7e2b3d8b1f723d39f6 SHA256 d4efc3d1f36d1877a9b82cfa6d6cc9fa462bfeb8e4b804ace4d2fbc207166272
+MD5 00ff4fbc0687963d5867b75dfe75fbbe ChangeLog 2470
+RMD160 5929f838f519bd46f9560e9991d3294db5a8b460 ChangeLog 2470
+SHA256 d4efc3d1f36d1877a9b82cfa6d6cc9fa462bfeb8e4b804ace4d2fbc207166272 ChangeLog 2470
 MISC metadata.xml 168 RMD160 d98790cf055dc0f820c63d65f485b9dcfa8950f4 SHA1 95c9e4f7368f82053d631bbcd469612c92ca13cb SHA256 c0cc8d6ab9385750af753ddc504299ed90a70b5c4c655f6c77d865917a8829c9
 MD5 30bc69a424d7634aae9c1e4203365d3d metadata.xml 168
 RMD160 d98790cf055dc0f820c63d65f485b9dcfa8950f4 metadata.xml 168
@@ -30,3 +39,6 @@ SHA256 0508337bbebed12f8856355c530008015c433bf88d70f1ad610129c17046c60a files/di
 MD5 b4ef9b89f0bcc4dd698fbfc4ca309c95 files/digest-calc-2.12.1.5 244
 RMD160 761f61fdbad0d1c326e26a20e4e4a6d50bf4d5fe files/digest-calc-2.12.1.5 244
 SHA256 104391cbd812b11eae31a95c7b0f8364afff92a05c1a97ced0cbc463c440e3f4 files/digest-calc-2.12.1.5 244
+MD5 407bf48195c877f03bde0d3f1e8d8b05 files/digest-calc-2.12.2.2 244
+RMD160 6b5a3a81ae8eb18988e7bdbb1264540e727e3e44 files/digest-calc-2.12.2.2 244
+SHA256 1a1a1a3fe41aca97e0b24e099e555d10e3c6666b3c79ab07c4ce346d7bfa86c7 files/digest-calc-2.12.2.2 244
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