From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-846165-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
	by finch.gentoo.org (Postfix) with ESMTP id DDAAA1388C1
	for <garchives@archives.gentoo.org>; Fri, 13 Nov 2015 10:02:40 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 88B4C21C15A;
	Fri, 13 Nov 2015 10:02:38 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by pigeon.gentoo.org (Postfix) with ESMTPS id 290B421C15A
	for <gentoo-commits@lists.gentoo.org>; Fri, 13 Nov 2015 10:02:37 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id 4F2DE340686
	for <gentoo-commits@lists.gentoo.org>; Fri, 13 Nov 2015 10:02:36 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id 82709209C
	for <gentoo-commits@lists.gentoo.org>; Fri, 13 Nov 2015 10:02:33 +0000 (UTC)
From: "Martin Mokrejs" <mmokrejs@fold.natur.cuni.cz>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Martin Mokrejs" <mmokrejs@fold.natur.cuni.cz>
Message-ID: <1447408883.94ccfefeae527bda63c1f0d368f4ccebf27ad761.mmokrejs@gentoo>
Subject: [gentoo-commits] proj/sci:master commit in: /
X-VCS-Repository: proj/sci
X-VCS-Committer: mmokrejs
X-VCS-Committer-Name: Martin Mokrejs
X-VCS-Revision: 94ccfefeae527bda63c1f0d368f4ccebf27ad761
X-VCS-Branch: master
Date: Fri, 13 Nov 2015 10:02:33 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: 3711e41d-ea9d-4ad7-a716-e88b8f5b1921
X-Archives-Hash: 2f7032ac7643e51b3c11acf2aa0349c1

commit:     94ccfefeae527bda63c1f0d368f4ccebf27ad761
Author:     Martin Mokrejš <mmokrejs <AT> fold <DOT> natur <DOT> cuni <DOT> cz>
AuthorDate: Fri Nov 13 10:01:23 2015 +0000
Commit:     Martin Mokrejs <mmokrejs <AT> fold <DOT> natur <DOT> cuni <DOT> cz>
CommitDate: Fri Nov 13 10:01:23 2015 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=94ccfefe

Merge branch 'master' of git+ssh://git.gentoo.org/proj/sci

 dev-python/arrayfire-python/ChangeLog              |   6 +
 dev-python/arrayfire-python/Manifest               |   1 +
 ...ebuild => arrayfire-python-3.1.20151111.ebuild} |   0
 profiles/use.local.desc                            |   1 -
 sci-chemistry/pymol-apbs-plugin/ChangeLog          |  27 -----
 sci-chemistry/pymol-apbs-plugin/metadata.xml       |   8 --
 .../pymol-apbs-plugin-9999.ebuild                  |  41 -------
 sci-chemistry/pymol/metadata.xml                   |   1 -
 sci-chemistry/pymol/pymol-9999.ebuild              |  11 +-
 sci-libs/armadillo/ChangeLog                       |   7 ++
 sci-libs/armadillo/Manifest                        |   3 +-
 sci-libs/armadillo/armadillo-5.500.2.ebuild        | 121 ---------------------
 ...llo-5.400.2.ebuild => armadillo-6.200.3.ebuild} |   2 +-
 sci-libs/nipype/ChangeLog                          |   3 +
 sci-libs/nipype/nipype-9999.ebuild                 |   1 +
 15 files changed, 24 insertions(+), 209 deletions(-)