From 33b10633f36b0db3457ac7f671ae2553ba104a62 Mon Sep 17 00:00:00 2001 From: Justin Lecher Date: Sat, 23 Jun 2012 10:15:20 +0000 Subject: sci-biology/maq: Add patch for gcc-4.7, #422869 Package-Manager: portage-2.2.0_alpha110/cvs/Linux x86_64 --- sci-biology/maq/ChangeLog | 8 +++++-- sci-biology/maq/Manifest | 14 ++++++----- sci-biology/maq/files/maq-0.7.1-gcc-4.7.patch | 34 +++++++++++++++++++++++++++ sci-biology/maq/maq-0.7.1-r1.ebuild | 7 +++--- 4 files changed, 52 insertions(+), 11 deletions(-) create mode 100644 sci-biology/maq/files/maq-0.7.1-gcc-4.7.patch diff --git a/sci-biology/maq/ChangeLog b/sci-biology/maq/ChangeLog index f7fb93d863a4..dcf780d990e8 100644 --- a/sci-biology/maq/ChangeLog +++ b/sci-biology/maq/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sci-biology/maq -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-biology/maq/ChangeLog,v 1.9 2011/12/18 19:53:20 phajdan.jr Exp $ +# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sci-biology/maq/ChangeLog,v 1.10 2012/06/23 10:15:20 jlec Exp $ + + 23 Jun 2012; Justin Lecher maq-0.7.1-r1.ebuild, + +files/maq-0.7.1-gcc-4.7.patch: + Add patch for gcc-4.7, #422869 18 Dec 2011; Pawel Hajdan jr maq-0.7.1-r1.ebuild: x86 stable wrt bug #393759 diff --git a/sci-biology/maq/Manifest b/sci-biology/maq/Manifest index fab892905655..57318b19762e 100644 --- a/sci-biology/maq/Manifest +++ b/sci-biology/maq/Manifest @@ -3,16 +3,18 @@ Hash: SHA512 AUX maq-0.7.1-bfr-overfl.patch 527 RMD160 80f3917a4ead2f2b7c2e9907d7df2772e834e21e SHA1 42a3e32bc19827559344d343c4b15db047ed45c2 SHA256 ff7521f696d4deb311f3dec07997bd8cce068749369d6cd3d3e65fb6cce19e56 AUX maq-0.7.1-flags.patch 799 RMD160 2053550e04b27b1e53d60f4ac098f90c41106faf SHA1 16dd6cf8e295db16046c147d440e22c4936f29bb SHA256 f1949b063ed015182e403668dc19466d079eacc6d351d11cc5d099d2aeeb18f9 +AUX maq-0.7.1-gcc-4.7.patch 1429 RMD160 9e4ed517b1e53221119ae95dd4eb4da995706993 SHA1 20ebf2eec37d6ca2a4acad2082cab8ffe882bc7e SHA256 df958693a9eb428069ca09410f549b22444fbd1818fab6101aaa03e658f00250 DIST calib-36.dat.gz 196371 RMD160 34d6845c41388009970f478af14382334118ca9c SHA1 3af6e7b07c26a8d79f595412aed64d191614e8f0 SHA256 d4480e04446eb273f1908add709dd5a24262c08a59a1647b9a2d053f4d30181b DIST maq-0.7.1.tar.bz2 368645 RMD160 98b514dba887c63b567e8c6a2ed09f02812d8fb1 SHA1 3a455817fc6e98c2d06533d630e22c47649afa97 SHA256 e1671e0408b0895f5ab943839ee8f28747cf5f55dc64032c7469b133202b6de2 -EBUILD maq-0.7.1-r1.ebuild 905 RMD160 5a70efe33facb33491573ea3f054104045520206 SHA1 bed7a41bb9a31308788c3c9167c8ba2d182aee76 SHA256 a9945f5d148e4eec352fcd2f6e6c29fe6741b694a16e04db09d747c36a87b19f +EBUILD maq-0.7.1-r1.ebuild 936 RMD160 a67eb2400dd45df0d076e09aa341ed8c0ded7829 SHA1 225b9da0b30589b02307a226a941e6ae0afa5662 SHA256 dbe88df55ff80b3ea2359302eb3e1c6824ab5186a5d2d5d815c9d8a97b651414 EBUILD maq-0.7.1.ebuild 695 RMD160 2ffecbd9508ed2420dc2d61adfcb6d12c7935123 SHA1 d97cd72cfd5b246b86d82092e2a3d45282da3e06 SHA256 4ecb74414902b3522e3076e3dee11618a255f42ca485e0d47fdaeb0705c9a5e2 -MISC ChangeLog 1322 RMD160 7fc69a1be17cd9938f54e8ef0b7d1657a32d36ea SHA1 59b6d044aae4e142978848467d05e129a650f306 SHA256 97725e801b0a8b258d407e45d6c5fe5673eb4640f749eab614544a9939c96254 +MISC ChangeLog 1453 RMD160 99e43ff029d8f3a0d73e4c9c26133d1b0152f7f2 SHA1 a68911d0666c9cd317e18bbb0a9af4555087c85d SHA256 20f994c2864e4838416f79d6c8a570579e8523cd67c7fbe33de5e0ed139853ac MISC metadata.xml 259 RMD160 d9d81b67d635fabd81aef8ae0edf971211ae9072 SHA1 8e32f751c67ff891fa35405a2cf6fb33752d6eb1 SHA256 541c3fbcf299d9a8ccf4132ee61f9e53a5d737cefdaa6fdc77764d8d4c7f3110 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.17 (GNU/Linux) +Version: GnuPG v2.0.19 (GNU/Linux) +Comment: GPGTools - http://gpgtools.org -iEYEAREKAAYFAk7uRLcACgkQuUQtlDBCeQKJegCfVNFXupe0IgiAvM2CN4Xfp8jK -xM8An3FF/D1gKRnTFRdIKhWQOF/l0vD4 -=XJdr +iEUEAREKAAYFAk/ll0IACgkQgAnW8HDreRYGXgCdEAPExGu2LAse8Q1zc6ukBjXA +hzQAl36RWSpygAAac+Kxa4q7rgyKOaw= +=KYlb -----END PGP SIGNATURE----- diff --git a/sci-biology/maq/files/maq-0.7.1-gcc-4.7.patch b/sci-biology/maq/files/maq-0.7.1-gcc-4.7.patch new file mode 100644 index 000000000000..4b97da89be48 --- /dev/null +++ b/sci-biology/maq/files/maq-0.7.1-gcc-4.7.patch @@ -0,0 +1,34 @@ + stdhash.hh | 6 +++--- + 1 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/stdhash.hh b/stdhash.hh +index eaf98af..16cd1a3 100644 +--- a/stdhash.hh ++++ b/stdhash.hh +@@ -412,7 +412,7 @@ public: + inline bool insert(const keytype_t &key) { + __lh3_hash_base_class::rehash(); + hashint_t i; +- int ret = direct_insert_aux(key, this->n_capacity, this->keys, this->flags, &i); ++ int ret = this->direct_insert_aux(key, this->n_capacity, this->keys, this->flags, &i); + if (ret == 0) return true; + if (ret == 1) { ++(this->n_size); ++(this->n_occupied); } + else ++(this->n_size); // then ret == 2 +@@ -493,7 +493,7 @@ public: + inline bool insert(const keytype_t &key, const valtype_t &val) { + rehash(); + hashint_t i; +- int ret = direct_insert_aux(key, this->n_capacity, this->keys, this->flags, &i); ++ int ret = this->direct_insert_aux(key, this->n_capacity, this->keys, this->flags, &i); + vals[i] = val; + if (ret == 0) return true; + if (ret == 1) { ++(this->n_size); ++(this->n_occupied); } +@@ -503,7 +503,7 @@ public: + inline bool insert(const keytype_t &key, valtype_t **q) { + rehash(); + hashint_t i; +- int ret = direct_insert_aux(key, this->n_capacity, this->keys, this->flags, &i); ++ int ret = this->direct_insert_aux(key, this->n_capacity, this->keys, this->flags, &i); + *q = vals + i; + if (ret == 0) return true; + if (ret == 1) { ++(this->n_size); ++(this->n_occupied); } diff --git a/sci-biology/maq/maq-0.7.1-r1.ebuild b/sci-biology/maq/maq-0.7.1-r1.ebuild index 0b08ceb49e79..8d07e25f492a 100644 --- a/sci-biology/maq/maq-0.7.1-r1.ebuild +++ b/sci-biology/maq/maq-0.7.1-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-biology/maq/maq-0.7.1-r1.ebuild,v 1.5 2011/12/18 19:53:20 phajdan.jr Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-biology/maq/maq-0.7.1-r1.ebuild,v 1.6 2012/06/23 10:15:20 jlec Exp $ EAPI=4 @@ -23,7 +23,8 @@ DEPEND="${RDEPEND}" src_prepare() { epatch \ "${FILESDIR}"/${P}-flags.patch \ - "${FILESDIR}"/${P}-bfr-overfl.patch + "${FILESDIR}"/${P}-bfr-overfl.patch \ + "${FILESDIR}"/${P}-gcc-4.7.patch sed \ -e '/ext_CFLAGS/s:-m64::g' \ -i configure* || die -- cgit v1.2.3-65-gdbad