From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-778135-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 6DD7E138A1C
	for <garchives@archives.gentoo.org>; Sat, 28 Feb 2015 20:58:54 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 7F909E0874;
	Sat, 28 Feb 2015 20:58:44 +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 C7A9AE086A
	for <gentoo-commits@lists.gentoo.org>; Sat, 28 Feb 2015 20:58:42 +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 E4C10340DB1
	for <gentoo-commits@lists.gentoo.org>; Sat, 28 Feb 2015 20:58:41 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id 45FD912C25
	for <gentoo-commits@lists.gentoo.org>; Sat, 28 Feb 2015 20:58:40 +0000 (UTC)
From: "Justin Lecher" <jlec@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Justin Lecher" <jlec@gentoo.org>
Message-ID: <1418147927.5ffbbf248348e4f0cc25a9e1be8e76e823c3599d.jlec@gentoo>
Subject: [gentoo-commits] proj/sci:jlec commit in: /
X-VCS-Repository: proj/sci
X-VCS-Committer: jlec
X-VCS-Committer-Name: Justin Lecher
X-VCS-Revision: 5ffbbf248348e4f0cc25a9e1be8e76e823c3599d
X-VCS-Branch: jlec
Date: Sat, 28 Feb 2015 20:58:40 +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: 4b2ed346-7fbd-412f-9aac-ccfa708e7e84
X-Archives-Hash: 6cf34d13f10481753f2b1a582e25d5e4

commit:     5ffbbf248348e4f0cc25a9e1be8e76e823c3599d
Author:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
AuthorDate: Tue Dec  9 17:58:47 2014 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Tue Dec  9 17:58:47 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=5ffbbf24

Merge branch 'master' of ssh://github.com/gentoo-science/sci


 sci-libs/trilinos/ChangeLog                        |  6 +++
 sci-libs/trilinos/Manifest                         |  1 +
 ...ch => trilinos-11.12.1-fix-install-paths.patch} | 57 +++++++++++-----------
 ...linos-11.4.2.ebuild => trilinos-11.12.1.ebuild} |  0
 4 files changed, 36 insertions(+), 28 deletions(-)