From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id E88DD1381F3 for ; Thu, 5 Sep 2013 06:23:21 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7F20FE0D65; Thu, 5 Sep 2013 06:23:21 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id EDE09E0D64 for ; Thu, 5 Sep 2013 06:23:20 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C690733EA5A for ; Thu, 5 Sep 2013 06:23:14 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 7CCEAE545E for ; Thu, 5 Sep 2013 06:23:13 +0000 (UTC) From: "Kacper Kowalik" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Kacper Kowalik" Message-ID: <1378341112.8c59ec6819e350d668ef0858afa2239eb19c5806.xarthisius@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: / X-VCS-Repository: proj/sci X-VCS-Committer: xarthisius X-VCS-Committer-Name: Kacper Kowalik X-VCS-Revision: 8c59ec6819e350d668ef0858afa2239eb19c5806 X-VCS-Branch: master Date: Thu, 5 Sep 2013 06:23:13 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 505f240a-3e17-49c8-80cc-77f85b3ee82e X-Archives-Hash: 0a8cad6024a5ca2715ba127a00017659 commit: 8c59ec6819e350d668ef0858afa2239eb19c5806 Author: Horea Christian mail ru> AuthorDate: Thu Sep 5 00:31:52 2013 +0000 Commit: Kacper Kowalik gentoo org> CommitDate: Thu Sep 5 00:31:52 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=8c59ec68 Merge branch 'master' of git://github.com/gentoo-science/sci Conflicts: sci-biology/psychopy/Manifest app-admin/eselect/ChangeLog | 6 + app-admin/eselect/Manifest | 7 + ...1.3.7-r100.ebuild => eselect-1.3.8-r100.ebuild} | 2 +- ...ives.patch => eselect-1.3.8-alternatives.patch} | 8 +- app-doc/lapack-docs/ChangeLog | 6 +- app-doc/lapack-docs/Manifest | 4 +- app-doc/lapack-docs/lapack-docs-3.3-r1.ebuild | 6 +- dev-util/ccache/ChangeLog | 8 + ...ache-3.1.9-r1.ebuild => ccache-3.1.9-r2.ebuild} | 6 +- dev-util/ccache/files/ccache-config-2 | 7 +- licenses/{Artistic-IGS => Artistic-Manatee} | 0 media-gfx/librecad/ChangeLog | 3 + media-gfx/librecad/Manifest | 1 + ...-2.0.0_rc1.ebuild => librecad-2.0.0_rc2.ebuild} | 0 profiles/package.mask | 1 + sci-biology/BG7/BG7-9999.ebuild | 28 +++ sci-biology/BG7/ChangeLog | 9 + sci-biology/fastx_toolkit/ChangeLog | 10 ++ sci-biology/fastx_toolkit/Manifest | 1 + .../fastx_toolkit/fastx_toolkit-0.0.13.2.ebuild | 26 +++ sci-biology/libgtextutils/ChangeLog | 8 +- sci-biology/libgtextutils/Manifest | 2 +- ...utils-0.6.ebuild => libgtextutils-0.6.1.ebuild} | 4 +- sci-biology/manatee-igs/ChangeLog | 13 ++ sci-biology/manatee-igs/Manifest | 4 +- sci-biology/manatee-igs/manatee-igs-2.23.1.ebuild | 5 +- sci-biology/manatee-jcvi/ChangeLog | 11 ++ sci-biology/manatee-jcvi/Manifest | 1 + sci-biology/manatee-jcvi/manatee-jcvi-2.4.3.ebuild | 53 ++++++ .../manatee-jcvi}/metadata.xml | 0 sci-biology/psychopy/Manifest | 4 + sci-biology/psychopy/psychopy-1.75.01.ebuild | 12 +- ...hopy-1.75.01.ebuild => psychopy-1.77.02.ebuild} | 12 +- ...hopy-1.75.01.ebuild => psychopy-1.78.00.ebuild} | 14 +- sci-biology/psychopy/psychopy-9999.ebuild | 12 +- sci-biology/symap/ChangeLog | 9 + sci-biology/symap/Manifest | 1 + sci-biology/symap/symap-4.0.ebuild | 31 ++++ sci-chemistry/coot/ChangeLog | 6 + sci-chemistry/coot/coot-9999.ebuild | 6 + sci-chemistry/coot/files/9999-pc.patch | 51 +++--- sci-libs/fftw/ChangeLog | 14 ++ sci-libs/fftw/Manifest | 1 + sci-libs/fftw/fftw-3.3.3-r3.ebuild | 193 +++++++++++++++++++++ sci-libs/fftw/fftw-9999.ebuild | 193 +++++++++++++++++++++ .../fftw/files/fftw-3.3.3-install-header.patch | 35 ++++ sci-libs/fftw/metadata.xml | 23 +++ sci-libs/modglue/ChangeLog | 5 +- sci-libs/modglue/Manifest | 2 +- sci-libs/modglue/modglue-1.16.ebuild | 6 +- sci-mathematics/alt-ergo/ChangeLog | 7 + sci-mathematics/alt-ergo/Manifest | 2 +- ...alt-ergo-0.95.ebuild => alt-ergo-0.95.1.ebuild} | 2 +- sci-mathematics/alt-ergo/metadata.xml | 3 +- sci-misc/sfst/Manifest | 2 +- sci-physics/lammps/ChangeLog | 5 + sci-physics/lammps/Manifest | 1 + ...mmps-20130708.ebuild => lammps-20130830.ebuild} | 0 sci-visualization/yt/yt-9999.ebuild | 45 ++--- 59 files changed, 832 insertions(+), 105 deletions(-) diff --cc sci-biology/psychopy/Manifest index 96fc24a,c306e02..d93b8e1 --- a/sci-biology/psychopy/Manifest +++ b/sci-biology/psychopy/Manifest @@@ -1,2 -1,3 +1,6 @@@ DIST PsychoPy-1.75.01.zip 3512277 SHA256 c86c617bcd9a215f1fe3d1420563a9bc1c8c6707b477481f885437a68a56d211 SHA512 3a57dcff426d9bbeeababd7699d2fe99fc36025d45b4f52abb8ae4544454314dacb00b52b16f94168c86a255f9ac469fad297590b6e466931d5de12e7520f684 WHIRLPOOL a0f258c293937efbd6cbbc325663a1de93961de349e0113562c20d54a957c686590256d7c7a2e0ebea7a497090569ba0e2b777165e9cfe908af82a90991bb939 DIST PsychoPy-1.77.02.zip 6313389 SHA256 37313ca13e6062146979dbc79dde79306377a08958b47ea1477957373914f1a1 SHA512 11c305d69763c7eca236c53ccef56780637ad2d53801764dada52565a4e07949422722cf7d8691b615d515c6eeee1c29e2ec44fc312fb299fc2bea17b5a15b44 WHIRLPOOL 568cd06a9ad511ceeb0f0293296d4a98549855960be82e25de57b576bbf6614f37253358dcc44909570a73b298df0651920ab2378e0145eb8bd69186922a745c ++<<<<<<< HEAD ++======= + DIST PsychoPy-1.78.00.zip 6376071 SHA256 ac74ea948f400a4a962a6abde7e7360fce5738a0f44aec4a0ff636d00976cc25 SHA512 ec2cd1c2094488d2b02c94070c7bc3d50e12e597c0107d2f64d49522e43a12c81b060b7a8abc15e83d50736776ee9d3d7190b78d39c58ee8f8be88b32330c5e2 WHIRLPOOL 9395a55bb820d2d326f4d95e12fb7513fbc4038eea25d0fd182e7e909e86d153374ac14293e89162761f0655b14bb8ca2abfa7fdf3df3e1951bec11e469db1f7 ++>>>>>>> 21d8cdffa8697b00d3831a20b6a1c0335b7d8450