summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Lecher <jlec@gentoo.org>2011-06-13 11:17:41 +0000
committerJustin Lecher <jlec@gentoo.org>2011-06-13 11:17:41 +0000
commit7ff90e906046299190d60410a12dbd6cb38a05c9 (patch)
treea1750da1ca49059cc489a216d4dbade5d131b627 /sci-biology
parentRemove mplayer useflag as it only adds a dependency (diff)
downloadhistorical-7ff90e906046299190d60410a12dbd6cb38a05c9.tar.gz
historical-7ff90e906046299190d60410a12dbd6cb38a05c9.tar.bz2
historical-7ff90e906046299190d60410a12dbd6cb38a05c9.zip
Make it gcc46 resistant, #370471
Package-Manager: portage-2.2.0_alpha40/cvs/Linux x86_64
Diffstat (limited to 'sci-biology')
-rw-r--r--sci-biology/probcons/ChangeLog8
-rw-r--r--sci-biology/probcons/Manifest5
-rw-r--r--sci-biology/probcons/files/probcons-1.12-gcc-4.6.patch15
-rw-r--r--sci-biology/probcons/probcons-1.12-r1.ebuild12
4 files changed, 31 insertions, 9 deletions
diff --git a/sci-biology/probcons/ChangeLog b/sci-biology/probcons/ChangeLog
index 213e53a0183e..88f28e5ade22 100644
--- a/sci-biology/probcons/ChangeLog
+++ b/sci-biology/probcons/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sci-biology/probcons
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/probcons/ChangeLog,v 1.13 2010/07/16 22:01:47 hwoarang Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/probcons/ChangeLog,v 1.14 2011/06/13 11:17:41 jlec Exp $
+
+ 13 Jun 2011; Justin Lecher <jlec@gentoo.org> probcons-1.12-r1.ebuild,
+ +files/probcons-1.12-gcc-4.6.patch:
+ Make it gcc46 resistant, #370471
16 Jul 2010; Markos Chandras <hwoarang@gentoo.org>
probcons-1.12-r1.ebuild:
diff --git a/sci-biology/probcons/Manifest b/sci-biology/probcons/Manifest
index 23d7ce01432c..06b33f37f04c 100644
--- a/sci-biology/probcons/Manifest
+++ b/sci-biology/probcons/Manifest
@@ -1,10 +1,11 @@
AUX 1.10-fix-cxxflags.patch 845 RMD160 1e04c84b35c245623619c6d5a7128a8ab1c880af SHA1 9d3ecd0da754d899cd4b4016bf2dbffe5e9d87b6 SHA256 73a298114996b5d879b9ec3253d104464cb456d19382668cdf75bfe9f93f11de
AUX gcc-4.3.patch 1300 RMD160 c0865d3158f7517154d0084edea3e9d50f11f79b SHA1 909160de3fee66ca4c1489f963aed78a870d0a9a SHA256 e9669d83770557834b54268f0b4e404981b91084587d69f6492c7160c1659d6b
AUX probcons-1.12-cxxflags.patch 1957 RMD160 5f9e849c7bdf97077325af9c9713d1de0f08376e SHA1 87e9143f948602e466526a2425c92887eb1ead21 SHA256 5342d2f86fc2d440db1649e0e1f4cf094d8e5a5861c145fb410d014bc9cd8a27
+AUX probcons-1.12-gcc-4.6.patch 306 RMD160 cc9a8000bc1529837d28524492bac22ce8c3cb45 SHA1 0a8abc5dd5428d18b3e9154a2ef0962eaa8484cf SHA256 75bff1b697a732e183f1d4e20153b7b37afb4d3242f43305651c044809a02761
DIST probcons_v1_10.tar.gz 43004 RMD160 ba7caa3cadd702c3dc00c20f01bfb22416435784 SHA1 773d82f6883202ec41e5dee39713b5db649ef5b0 SHA256 f7a775ac4ba3b3261c0bbe5d2c203c96fc2551e67448aefbac83b461c931b518
DIST probcons_v1_12.tar.gz 43200 RMD160 4d7d9a89c2c95f22056719c8349216ca1ba635c9 SHA1 ee6ce81777c9ce366f575ab4096ff07f39af9829 SHA256 ecf3f9ab9ad47e14787c76d1c64aeea5533d4038c4be0236c00cdd79104cf383
EBUILD probcons-1.10.ebuild 1255 RMD160 49e26aae7838e14072b99e658e0497fdf48e3305 SHA1 97ee5cb12c869ff4c5c0669bdb1f7a9c8e8b7c0c SHA256 4f0d18095845561c68d69a40de2a5b4433b2d0d61ad110b2c1d1b1c599bb53e1
-EBUILD probcons-1.12-r1.ebuild 1364 RMD160 6b6a1d6f40405c0c3ca03e27898caeca108bd20c SHA1 66176ec123562d1a471f8c75491f37bcf90038f6 SHA256 d41eb50e321f80bb00aeb6204300151b57aa7d425a4b9222016b87c9d127bcf2
+EBUILD probcons-1.12-r1.ebuild 1395 RMD160 dd6d372e43e4df8703262ca42396ad0d6f966995 SHA1 865c1b3e1fb9765fd30a344d86c77e7b30482f06 SHA256 363bcce12e3484b292a48c71c5df51a01e9a369dc7c10d81da1e8fe11cbdd565
EBUILD probcons-1.12.ebuild 1326 RMD160 5925f8df5fff2dc25f8112f2dda4f8877743267c SHA1 ac50b96c0203bcf0ad8c5a38a733fe59eaa73317 SHA256 c9cddf715df24fee17bf77d9ca7da71b1490664d651baf0f114d68626e1bc14b
-MISC ChangeLog 2116 RMD160 795a62fd6b949a2d71cb424931e3ec864eb0fbbc SHA1 3456481a52fe020ac6d643967e8753e2989d324e SHA256 c971fa8e40299e2989797b8832e262679751fcca7269f9721403fcb5674d35f0
+MISC ChangeLog 2258 RMD160 0311dc14add713148e5878500ad4ef8d14a38696 SHA1 a4a3d20325ce33f046ccfbb2d72d655d9413a555 SHA256 4dff3d237b115ad3d79fb142d6d15125e4b9c865e00f4e1182eb7d12a1536c2c
MISC metadata.xml 164 RMD160 2f441200f2672ab5f1efae7cbdb08b284603903c SHA1 61a50baedfd041e663d6c2a41a28b57e22dbb6de SHA256 f0897b09e661dc603041dab249d73253034659189becf1a34cca37a7d51ef72f
diff --git a/sci-biology/probcons/files/probcons-1.12-gcc-4.6.patch b/sci-biology/probcons/files/probcons-1.12-gcc-4.6.patch
new file mode 100644
index 000000000000..1596f3b31916
--- /dev/null
+++ b/sci-biology/probcons/files/probcons-1.12-gcc-4.6.patch
@@ -0,0 +1,15 @@
+ SafeVector.h | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/SafeVector.h b/SafeVector.h
+index abf4b64..9c3292e 100644
+--- a/SafeVector.h
++++ b/SafeVector.h
+@@ -8,6 +8,7 @@
+ #ifndef SAFEVECTOR_H
+ #define SAFEVECTOR_H
+
++#include <cstddef>
+ #include <cassert>
+ #include <vector>
+
diff --git a/sci-biology/probcons/probcons-1.12-r1.ebuild b/sci-biology/probcons/probcons-1.12-r1.ebuild
index 174d25d332cb..6acfffefbe43 100644
--- a/sci-biology/probcons/probcons-1.12-r1.ebuild
+++ b/sci-biology/probcons/probcons-1.12-r1.ebuild
@@ -1,8 +1,8 @@
-# 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-biology/probcons/probcons-1.12-r1.ebuild,v 1.4 2010/07/16 22:01:47 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/probcons/probcons-1.12-r1.ebuild,v 1.5 2011/06/13 11:17:41 jlec Exp $
-EAPI="3"
+EAPI=3
inherit eutils toolchain-funcs
@@ -26,8 +26,10 @@ DEPEND=""
S="${WORKDIR}/${PN}"
src_prepare() {
- epatch "${FILESDIR}"/${P}-cxxflags.patch
- epatch "${FILESDIR}"/gcc-4.3.patch
+ epatch \
+ "${FILESDIR}"/${P}-cxxflags.patch \
+ "${FILESDIR}"/gcc-4.3.patch \
+ "${FILESDIR}"/${P}-gcc-4.6.patch
}
src_compile() {