Add soft blocker to avoid collision with older pari versions, thanks Martin von Gagem...

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

diff --git a/sci-mathematics/pari-data/ChangeLog b/sci-mathematics/pari-data/ChangeLog
index d7a4e1da15a5fe8909c176e8d0db8b3a151cbb7d..ba6a1c73ac1cfd32128decfe67320a6c95869926 100644 (file)
--- a/sci-mathematics/pari-data/ChangeLog
+++ b/sci-mathematics/pari-data/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-mathematics/pari-data
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/pari-data/ChangeLog,v 1.1 2011/07/27 19:03:15 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/pari-data/ChangeLog,v 1.2 2011/07/30 13:49:47 bicatali Exp $
+
+  30 Jul 2011; Sébastien Fabbro <bicatali@gentoo.org>
+  pari-data-20110727.ebuild:
+  Add soft blocker to avoid collision with older pari versions, thanks Martin
+  von Gagem, bug #376997
 
 *pari-data-20110727 (27 Jul 2011)
 

diff --git a/sci-mathematics/pari-data/Manifest b/sci-mathematics/pari-data/Manifest
index f411a0641d67f61b3a061a05879a46cbdb4a4b95..7e439aa4c9dc77cae3dd2dbe476a8ba6c1144655 100644 (file)
--- a/sci-mathematics/pari-data/Manifest
+++ b/sci-mathematics/pari-data/Manifest
@@ -6,13 +6,13 @@ DIST galdata-20110727.tgz 53229 RMD160 488afbddf7026dd6d0c9ebbed72cb14c8c37173e
 DIST galpol-20110727.tgz 469851 RMD160 e7c9c4cc9f7785e44860f1125329d7e2fc096d72 SHA1 68e249e265bac49b843f9a9a543dc2cb119d8625 SHA256 385d537b3c085d7885a9f6f02d63c2c2ad101dece07c2a19e4fba7bc81f72990
 DIST nftables-20110727.tgz 8393731 RMD160 48a9c48246f91c1983712682937d666ba1ae6458 SHA1 90df66222346b0dbca68925671a374f5e286daeb SHA256 8dd3393ce6b3cfcf599f094f7b22bdffe17c3ba25deb912513d54676bd7cfe92
 DIST seadata-20110727.tgz 19214199 RMD160 e88637426f74c5223068fc2d916741c10d8279e4 SHA1 fa3deb36df0ce71a466eb0ff0d4a18d48d44e8b9 SHA256 c9282a525ea3f92c1f9c6c69e37ac5a87b48fb9ccd943cfd7c881a3851195833
-EBUILD pari-data-20110727.ebuild 739 RMD160 df678c021deaa4b5502db7384ca1dfcd74bb80e5 SHA1 ce2c55e0a05fe0d04ba92fb8eec840481a42c107 SHA256 a0a33d1189d80ee6c30209edffdefe9a7cf5c52e4404ee7ed03d36c732555440
-MISC ChangeLog 425 RMD160 5829fb26fce55a01994c194e83909c3a24a141f4 SHA1 547d3d3a1a231f6a80e35bfc208f3f39bbd82ffc SHA256 8199fcf71c243163f8285a432d3ffc7e6a9a7804ed0649018a5bb38a57067ee6
+EBUILD pari-data-20110727.ebuild 773 RMD160 6ddbe5c1285c34b9e2386beab7367afd0dfb178f SHA1 e56b896cfaef078c1c88674165652e3d8a091a78 SHA256 896438473ccab575fdbb125454d780d48f3438bfc345874c221d9e99f3f37934
+MISC ChangeLog 613 RMD160 5dfa4ae863de4aef1f231faf49ed8f8e8afb0974 SHA1 75b11865260075353234e9a29f22f687ed12e0cd SHA256 f5f486953e975afccfc0d07dd0b7422cf91b429e3fbad8ea54c924ea2097fb6c
 MISC metadata.xml 626 RMD160 dbbb9a69920a4442f4e1071d3cad159f921f95ec SHA1 7ddddb7dace2186a46c1dbe656db54839d263189 SHA256 77bc9da59b1e433f42bad3d5a8b8c5af9e521f508117a9ee4e1d5899552fcb37
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk4wYPwACgkQ1ycZbhPLE2CH6ACgrMdTE1ty3a1hWgmVZyAuAcYi
-BoAAoIXwTTddVRewLIHjCocPJZeRFjzD
-=oJFr
+iEYEARECAAYFAk40DBwACgkQ1ycZbhPLE2D8bQCcC4TaaZPZmZBAH8QL5c/tmFds
+4u8An0Ga2HzVol7nW6SC7W4cVfWIZ40H
+=l4Y+
 -----END PGP SIGNATURE-----

diff --git a/sci-mathematics/pari-data/pari-data-20110727.ebuild b/sci-mathematics/pari-data/pari-data-20110727.ebuild
index 5e13bc3028c7cbde1cae0652667efd36de123e73..8cc797b73827df5aaeaf7b7260ad5c3210725562 100644 (file)
--- a/sci-mathematics/pari-data/pari-data-20110727.ebuild
+++ b/sci-mathematics/pari-data/pari-data-20110727.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/pari-data/pari-data-20110727.ebuild,v 1.1 2011/07/27 19:03:15 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/pari-data/pari-data-20110727.ebuild,v 1.2 2011/07/30 13:49:47 bicatali Exp $
 
 EAPI="4"
 
@@ -16,8 +16,8 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
 IUSE=""
 
-RDEPEND=""
-DEPEND=""
+RDEPEND="!<sci-libs/pari-2.5.0-r1"
+DEPEND="${RDEPEND}"
 S="${WORKDIR}"
 
 src_install() {