summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastien Fabbro <bicatali@gentoo.org>2012-01-20 23:53:28 +0000
committerSebastien Fabbro <bicatali@gentoo.org>2012-01-20 23:53:28 +0000
commit4022b3b5c030dc07fd969377e4741046bcda93b2 (patch)
treeacde4b13c363bd41b14a3d744c69e89921167565 /sci-mathematics/octave
parentVersion bump. (diff)
downloadhistorical-4022b3b5c030dc07fd969377e4741046bcda93b2.tar.gz
historical-4022b3b5c030dc07fd969377e4741046bcda93b2.tar.bz2
historical-4022b3b5c030dc07fd969377e4741046bcda93b2.zip
Move pkg_pretend -> pkg_setup for openmp check, bug #399557
Package-Manager: portage-2.1.10.41/cvs/Linux x86_64
Diffstat (limited to 'sci-mathematics/octave')
-rw-r--r--sci-mathematics/octave/ChangeLog5
-rw-r--r--sci-mathematics/octave/Manifest22
-rw-r--r--sci-mathematics/octave/octave-3.6.0.ebuild4
3 files changed, 12 insertions, 19 deletions
diff --git a/sci-mathematics/octave/ChangeLog b/sci-mathematics/octave/ChangeLog
index 21f15a04b2c9..c7060086fbb5 100644
--- a/sci-mathematics/octave/ChangeLog
+++ b/sci-mathematics/octave/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for sci-mathematics/octave
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/ChangeLog,v 1.112 2012/01/19 17:00:47 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/ChangeLog,v 1.113 2012/01/20 23:53:28 bicatali Exp $
+
+ 20 Jan 2012; SĂ©bastien Fabbro <bicatali@gentoo.org> octave-3.6.0.ebuild:
+ Move pkg_pretend -> pkg_setup for openmp check, bug #399557
19 Jan 2012; Kacper Kowalik <xarthisius@gentoo.org> Manifest:
Fix manifest
diff --git a/sci-mathematics/octave/Manifest b/sci-mathematics/octave/Manifest
index 8f8de6c9e8d1..bde339269eae 100644
--- a/sci-mathematics/octave/Manifest
+++ b/sci-mathematics/octave/Manifest
@@ -1,5 +1,5 @@
-----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
AUX octave-3.2.0_as_needed.patch 485 RMD160 6476d8af9ada03c4b169e87e65d674a3b4bb810b SHA1 f0af5b1435ae2ca9eee08e37de5f3dda0e662b26 SHA256 cd4e0d0299b487959396313a42fdc94b2f069dd99c3127789496cfa40da71e9e
AUX octave-3.2.0_parallel_make.patch 374 RMD160 0e597204583c44c6c67aa5c5360a73f0f6bae298 SHA1 85170197541aa797ff41f7c46e1e3594dbf32fe4 SHA256 d2864f9b0dbea021120be04d16f57759d881bff11bf2b90e34c7b68c770adb23
@@ -14,23 +14,13 @@ DIST octave-3.4.3.tar.bz2 15085117 RMD160 d6f43fca9097b40f163c140db853d8ac1383ab
DIST octave-3.6.0.tar.bz2 15290924 RMD160 4b19537670b7421942eb350320b4d3e6fda8fd1d SHA1 62116e090d257a601e9d605f969dd87b7de1ffce SHA256 e597737c7fe1a03d4c0ccbf27bbd821ec17aa2367d83e931abcbfdb6d62d92d7
EBUILD octave-3.2.4-r1.ebuild 2916 RMD160 45f8a2be227c116671e4b09184d7322392b9b71e SHA1 ca2f91e277d2fd6d8e05e0cdd24b7240b4822151 SHA256 84372c2a81e53ce66a74402becbf1a82dd6128a35473745f6a2504c45c164528
EBUILD octave-3.4.3-r1.ebuild 2748 RMD160 4e93dd750e73b23a60fcd0aaff5e7045d9a3fa3f SHA1 514296df219d1d33d6f83d4388c9698bf195d724 SHA256 f86ae68a82d13752e0d117d87541bb9b799871eec03b71ce357d79aa5c04b52e
-EBUILD octave-3.6.0.ebuild 2833 RMD160 29030e34f1602261343c08cdcc93fa80f20f46ea SHA1 350fab13f8017993c5f27823690f20fde81d4303 SHA256 4d647f9f94a431ab15b1db1881db35db18ece353676ac3b30d561b3b97a61ca6
-MISC ChangeLog 28244 RMD160 dcf21f44d599e1ee001bbfe3a1f7aa6f84620160 SHA1 99ce54efce6bcddcc4272f0f72265e1291942e3e SHA256 094fd6dcb66ea6f0c9709578653d48eb48d2f80a52759ee9c6e4b13b4864ba22
+EBUILD octave-3.6.0.ebuild 2831 RMD160 5cba4188a1c87097b6e990624c73b41eca7752e7 SHA1 2a3558cd3c40420c71775f2f9467c324ec45dba3 SHA256 0d27d61d2ba757305739ca20ca361768b21aff136ff326fed281d0635184366d
+MISC ChangeLog 28381 RMD160 456fde7bd31eaa5fb19897401d0ec1eaa3534003 SHA1 4c09fa0ebf5e52a1009f5aab7d211f40c67f98c9 SHA256 d654c58899a0d9019bdb339e6a206ec9d9b60c39615358d0387533b90368ca28
MISC metadata.xml 928 RMD160 28d79a8597076528a69c31aae3b7d208a3296e6e SHA1 bd294c06bdf3bb9753f0028d596008fb1b1126df SHA256 6314fe7f4dfc713b292c7ff071c186873989e3d8b08d0637e20f7c52bb4dc4ef
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.18 (GNU/Linux)
-iQIcBAEBCAAGBQJPGExIAAoJEF0huFKJUZL5A3QP/1zQzaHs4gWcjwgcjUW1hFvl
-Yyy/dPzigGWTkkaNVUGJf6lLDVTpt/ue6ydNr8DrMOFyj9739ixAiZeh/yX92Cmj
-5d8p2bdgpFWxWu5dOavizw3x7RdafmpFAxwiZMLGz7ht5f46h5zWaxIV7zrBcOHx
-6I48WeiCZB+nGfD02pDPO62AnTA2/Na2EWhc/sD43t4FzS5hI4nTFkpITaGtGZzn
-qnX0UL+Nmj9c1UUSzETC7uCFJ1azC/1HJb/bBotvqSgZZuHeQBEVVKOGPIwmEnAD
-TjkDXpMsgEcQpqABwwfCl/Z8bT92Qi1kA6MOiclz3TTPYID7H9hU5+izvBuPscpN
-Se7IYfeeBChRhmhPurdjt+Ze6nzBwNiF5zSg0qsXrEto48AqcHM5viuEllTFoMm2
-XERZbUMhbg+8A+VqqYJ2hkRB2vRoYsmJGxoMguel3pHKhD+BRKXbElK8uNzCI+TV
-9EzhovwsIW9tYTAKrerrXTho/voPXWF+34MwyxGBvlVGdFEHs1zIlnayPdaHS2KG
-CULHhdRjOrUlW9okEDuIVwLRjneULBIpj1Ba4L4oIoPGnOL4RcrRRNLsAV/pQlOc
-0lmPAFcGPqwrQCPojhkrT1P85LJ/stsGgn916nCPx/ISIhdrz1V796Zy+I6miq/0
-W2prloGQ9zVJW0BzSf/7
-=fiEU
+iEYEARECAAYFAk8Z/oEACgkQ1ycZbhPLE2AyVACeMoyoiv/rwRk5w3Q3hZTgvG0B
+HUkAnRGo/nMScRoKn3GR4iEWW4gCsJm7
+=T7KC
-----END PGP SIGNATURE-----
diff --git a/sci-mathematics/octave/octave-3.6.0.ebuild b/sci-mathematics/octave/octave-3.6.0.ebuild
index 767cbdf28dba..a485a0945d53 100644
--- a/sci-mathematics/octave/octave-3.6.0.ebuild
+++ b/sci-mathematics/octave/octave-3.6.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/octave-3.6.0.ebuild,v 1.1 2012/01/19 15:06:57 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/octave-3.6.0.ebuild,v 1.2 2012/01/20 23:53:28 bicatali Exp $
EAPI=4
@@ -54,7 +54,7 @@ DEPEND="${RDEPEND}
PATCHES=( "${FILESDIR}"/${PN}-3.4.3-{pkgbuilddir,help}.patch )
-pkg_pretend() {
+pkg_setup() {
use openmp && [[ $(tc-getCC)$ == *gcc* ]] && ! tc-has-openmp && \
die "You have openmp enabled but your current gcc does not support it"
}