From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-824352-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 3530C138BF5
	for <garchives@archives.gentoo.org>; Fri, 31 Jul 2015 10:10:09 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id B771114044;
	Fri, 31 Jul 2015 10:10:05 +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 E828714044
	for <gentoo-commits@lists.gentoo.org>; Fri, 31 Jul 2015 10:10:04 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id 3286F34099A
	for <gentoo-commits@lists.gentoo.org>; Fri, 31 Jul 2015 10:10:03 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id B496911B
	for <gentoo-commits@lists.gentoo.org>; Fri, 31 Jul 2015 10:09:59 +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: <1438337396.f8a141859b59dfc501ad5ff81c940b9f8e293a69.jlec@gentoo>
Subject: [gentoo-commits] proj/sci:master commit in: /
X-VCS-Repository: proj/sci
X-VCS-Committer: jlec
X-VCS-Committer-Name: Justin Lecher
X-VCS-Revision: f8a141859b59dfc501ad5ff81c940b9f8e293a69
X-VCS-Branch: master
Date: Fri, 31 Jul 2015 10:09:59 +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: d2926303-57ea-4128-a983-ed2730a2493d
X-Archives-Hash: 1ee31296730f0f4e0a4cab7bf6eee599

commit:     f8a141859b59dfc501ad5ff81c940b9f8e293a69
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 31 10:09:56 2015 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Fri Jul 31 10:09:56 2015 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=f8a14185

Merge remote-tracking branch 'github/master'

* github/master:
  sci-mathematics/scilab: Fix the conditions under which batik is a dependency.
  sci-mathematics/scilab: Patch to build with new versions of Java dependencies.
  dev-java/jlatexmath-fop: Fix the dependency on xmlgraphics-commons-2.