From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-835659-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 CFC881387B1
	for <garchives@archives.gentoo.org>; Mon, 21 Sep 2015 14:05:13 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id F02F821C08B;
	Mon, 21 Sep 2015 14:04:58 +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 E125A21C098
	for <gentoo-commits@lists.gentoo.org>; Mon, 21 Sep 2015 14:04:56 +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 2E5BF34080E
	for <gentoo-commits@lists.gentoo.org>; Mon, 21 Sep 2015 14:04:56 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id 3320824B
	for <gentoo-commits@lists.gentoo.org>; Mon, 21 Sep 2015 14:04:53 +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: <1442844287.1fec6963fb6fb329ea9316a7d3a09a74be25e84b.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: 1fec6963fb6fb329ea9316a7d3a09a74be25e84b
X-VCS-Branch: master
Date: Mon, 21 Sep 2015 14:04:53 +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: 1443239e-c495-47b1-9120-d5beef2d25df
X-Archives-Hash: add331ca571b7b1bc03dad61ecab5125

commit:     1fec6963fb6fb329ea9316a7d3a09a74be25e84b
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 21 14:04:47 2015 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Mon Sep 21 14:04:47 2015 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=1fec6963

Merge remote-tracking branch 'github/master'

* github/master:
  dev-util/nvidia-cuda-gdk: Improve style
  dev-util/nvidia-cuda-gdk: Add dependency on drivers for nvvs use flag
  sci-libs/arrayfire: Add nonfree use flag
  profiles/license_groups: Add OpenSIFT to EULA group
  licenses: Add OpenSIFT license

 dev-util/nvidia-cuda-gdk/ChangeLog                 |  4 ++
 .../nvidia-cuda-gdk/nvidia-cuda-gdk-352.39.ebuild  |  4 ++
 licenses/OpenSIFT                                  | 57 ++++++++++++++++++++++
 profiles/license_groups                            |  2 +-
 sci-libs/arrayfire/ChangeLog                       |  6 +++
 ...e-3.1.1-r1.ebuild => arrayfire-3.1.1-r2.ebuild} | 11 +++--
 sci-libs/arrayfire/metadata.xml                    |  3 ++
 7 files changed, 82 insertions(+), 5 deletions(-)