Version bump

Package-Manager: portage-2.1.9.42/cvs/Linux x86_64

3 files changed, 35 insertions, 16 deletions

diff --git a/sci-mathematics/calc/ChangeLog b/sci-mathematics/calc/ChangeLog
index 168ea3ebcc84..ffbf825974b5 100644
--- a/sci-mathematics/calc/ChangeLog
+++ b/sci-mathematics/calc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-mathematics/calc
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/calc/ChangeLog,v 1.21 2010/06/15 15:43:48 jlec Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/calc/ChangeLog,v 1.22 2011/03/07 05:12:39 bicatali Exp $
+
+*calc-2.12.4.3 (07 Mar 2011)
+
+  07 Mar 2011; Sébastien Fabbro <bicatali@gentoo.org> -calc-2.12.4.0.ebuild,
+  +calc-2.12.4.3.ebuild:
+  Version bump
 
 *calc-2.12.4.0-r1 (15 Jun 2010)
 
diff --git a/sci-mathematics/calc/Manifest b/sci-mathematics/calc/Manifest
index 6ff97713e790..ed4a5c985405 100644
--- a/sci-mathematics/calc/Manifest
+++ b/sci-mathematics/calc/Manifest
@@ -7,16 +7,17 @@ AUX calc-2.12.4.0-prefix.patch 3598 RMD160 def27bf8e0c77e48a1c5bb9b717bdf7f60ee3
 DIST calc-2.12.1.5.tar.gz 1020389 RMD160 729de36922ede4212225833f926d82329673ffff SHA1 7a25ee74a6096413b36281e7ab120ae8103b75db SHA256 3a8b6daa60de0b5aa7c33dcfdf0aeec9d4523f51638235468de32f843ce79171
 DIST calc-2.12.2.2.tar.bz2 864687 RMD160 31f126009ceef5cfad71f51c9016d86dba925826 SHA1 6d6bf6b942d37ad6cb76dbb9a34cab18acc865ba SHA256 0a334cd331a4953a86365becce9b9f401b264a580a1f2130d5de700fa093772a
 DIST calc-2.12.4.0.tar.bz2 866402 RMD160 c27c033d82db56e9068d508533d10388e3d7b4fc SHA1 d9984dbffb606416e6cc1d85465d5d78fac7fed2 SHA256 b320d632e6a8dc9d0a2fe2603a8eed93ff9b50d42df0ea34838b53bfaaa00021
+DIST calc-2.12.4.3.tar.bz2 865956 RMD160 a0bd19a6e2c0432c65262a826e933a0ae9d664f3 SHA1 2d3f02a39563981f5378a450cd5802511dad7ef6 SHA256 a4e7d8a9313e7d28653e2c372fca9b0defdc02f965b833bb43479bbdfee51a92
 EBUILD calc-2.12.1.5.ebuild 987 RMD160 fe5919524465f1618383f1c85b7ec845ed73a138 SHA1 7ec383df54bbd0e5e37517bf43c0ed498258173a SHA256 6de5827a8a7b1d4e96d9205e75f1d27bb46d5cfb4bc0515640e97ff7a98c180e
 EBUILD calc-2.12.2.2.ebuild 1247 RMD160 08deaf84ef413450ab691373946edd91efc21f6d SHA1 341a129ff98d4945540d491e2aaaa1d8b3a52792 SHA256 b2f4f89395c02580e688ac5ab35b7c973cb6b58e6fc671727ae2cf8083d9fc44
 EBUILD calc-2.12.4.0-r1.ebuild 1423 RMD160 8ec0390b31e89ae753ca67071b38e5b5329b3ce8 SHA1 41c15d9a7e21ca355c6c839b7e7d017fce533752 SHA256 2e97b7ffb9f3f866fe90c74ffff4ee6cfbbe325837cf4935b464b482eefadc09
-EBUILD calc-2.12.4.0.ebuild 1124 RMD160 60db93ab4600f7d24ec468440a9b075e85cd3dd2 SHA1 02a0786e145feb37ad82d3b7ee4adf93bf80693e SHA256 cf6bb34e188971c8dab8060c7be1a44caf52bb556fd6b2e153753aaa3afbe1fa
-MISC ChangeLog 3649 RMD160 5a8bbf89a6be96264f0d339e3f114bbe2efb22ba SHA1 c22eebacfa437cd73d82a35cd959854a65b46e47 SHA256 f546a95ace03ba42be5ab82acfae1e247c4ef8b2c0988470396c8c85c7f17282
+EBUILD calc-2.12.4.3.ebuild 1437 RMD160 2b4fdcf3e97c0a5980c9f521c9df63a85f8110a7 SHA1 a2b60fba96ce7d50f31cc8e8d08f3f0ac6a23bbc SHA256 258185961c8ac0c6239cbf9d2f18dd61d8826652c3c354c9705bf8658bcf8415
+MISC ChangeLog 3802 RMD160 28ecd1c969e638724d3465a73716eb8d69f65c7b SHA1 b8b890dd2a3dfb56e4288db1b5428281812fbe1b SHA256 53d45b216fba7dcb23cb0889fd3ed85bb5534c523d5acb875857e85633c70931
 MISC metadata.xml 522 RMD160 3cd13006f62fbc2dc304d22ca3bf128db8423470 SHA1 d7aa3670ca1ef44902bb02e48aefe608c096bb78 SHA256 d8c263ba51486882358c7206c30fbc8677e84787a4a05f785e2736198949f4f2
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAkwXn7sACgkQgAnW8HDreRbHCQCgne30JFqHzC+9uGpqi89hcPtU
-ogMAnR6X9V8Ai3mo+neZudskQNJaZRpI
-=c9SG
+iEYEARECAAYFAk10aVQACgkQ1ycZbhPLE2DJUgCgjA5VjdlfLQOCWSr85CEf+HQL
+fl8AoJ8eUwIVsiZqKyNRjCAkr3fFZFXq
+=u2mb
 -----END PGP SIGNATURE-----
diff --git a/sci-mathematics/calc/calc-2.12.4.0.ebuild b/sci-mathematics/calc/calc-2.12.4.3.ebuild
index b41d4f719f3b..6fd76b3d3f76 100644
--- a/sci-mathematics/calc/calc-2.12.4.0.ebuild
+++ b/sci-mathematics/calc/calc-2.12.4.3.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/calc/calc-2.12.4.0.ebuild,v 1.2 2010/01/07 17:21:15 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/calc/calc-2.12.4.3.ebuild,v 1.1 2011/03/07 05:12:39 bicatali Exp $
 
-EAPI=2
-inherit eutils
+EAPI="3"
+
+inherit eutils multilib toolchain-funcs
 
 DESCRIPTION="An arbitrary precision C-like arithmetic system"
 HOMEPAGE="http://www.isthe.com/chongo/tech/comp/calc/"
@@ -11,23 +12,34 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 SLOT="0"
 LICENSE="LGPL-2"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 
 IUSE=""
 
-DEPEND=">=sys-libs/ncurses-5.2
+DEPEND="
+	>=sys-libs/ncurses-5.2
 	>=sys-libs/readline-4.2"
 RDEPEND="${DEPEND}"
 
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-2.12.4.0-prefix.patch
+	epatch "${FILESDIR}"/2.12.4.0-ldflags.patch
+	ln -sf libcustcalc.so.${PV} custom/libcustcalc.so
+}
+
 src_compile() {
 	# parallel compilation hard to fix. better to leave upstream.
 	emake -j1 \
+		CC=$(tc-getCC) \
 		DEBUG="${CFLAGS}" \
+		LDFLAGS="${LDFLAGS}" \
 		CALCPAGER="${PAGER}" \
 		USE_READLINE="-DUSE_READLINE" \
-		READLINE_LIB="-lreadline -lhistory -lncurses" \
+		READLINE_LIB="-lreadline -lhistory -lncurses -L${S}/custom -lcustcalc" \
 		all || die "emake failed"
+}
 
+src_test() {
 	if echo "${LD_PRELOAD}" | grep -q "sandbox"; then
 		ewarn "Can't run check when running in sandbox - see bug #59676"
 	else
@@ -36,6 +48,6 @@ src_compile() {
 }
 
 src_install() {
-	emake T="${D}" LIBDIR="/usr/$(get_libdir)" install || die "emake install failed"
+	emake T="${D}" LIBDIR="${EPREFIX}/usr/$(get_libdir)" install || die "emake install failed"
 	dodoc BUGS CHANGES LIBRARY README
 }