From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1048960-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 46112138334
for <garchives@archives.gentoo.org>; Thu, 27 Sep 2018 09:50:22 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 4840FE089E;
Thu, 27 Sep 2018 09:50:21 +0000 (UTC)
Received: from smtp.gentoo.org (unknown [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 1CC18E089E
for <gentoo-commits@lists.gentoo.org>; Thu, 27 Sep 2018 09:50:21 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 53574335C9F
for <gentoo-commits@lists.gentoo.org>; Thu, 27 Sep 2018 09:49:57 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 054293E1
for <gentoo-commits@lists.gentoo.org>; Thu, 27 Sep 2018 09:49:55 +0000 (UTC)
From: "Marek Szuba" <marecki@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, "Marek Szuba" <marecki@gentoo.org>
Message-ID: <1538041376.663eb4abfe7059e46994caee8ced73dd52f15c92.marecki@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/beignet/
X-VCS-Repository: repo/gentoo
X-VCS-Files: dev-libs/beignet/beignet-1.3.2-r2.ebuild
X-VCS-Directories: dev-libs/beignet/
X-VCS-Committer: marecki
X-VCS-Committer-Name: Marek Szuba
X-VCS-Revision: 663eb4abfe7059e46994caee8ced73dd52f15c92
X-VCS-Branch: master
Date: Thu, 27 Sep 2018 09:49:55 +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: 2b785b7f-4b47-4e57-b5cd-46505eba8457
X-Archives-Hash: 4b63ef8ed0f0c630062ccbce4832f5df
commit: 663eb4abfe7059e46994caee8ced73dd52f15c92
Author: Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 27 09:42:27 2018 +0000
Commit: Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Thu Sep 27 09:42:56 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=663eb4ab
dev-libs/beignet: run "eselect opencl" in pkg_postinst()
Select ocl-icd if the relevant USE flag was set, self otherwise. In both
cases use --use-old to honour possible earlier user-made choice.
Package-Manager: Portage-2.3.49, Repoman-2.3.10
dev-libs/beignet/beignet-1.3.2-r2.ebuild | 18 +++++++++++++-----
1 file changed, 13 insertions(+), 5 deletions(-)
diff --git a/dev-libs/beignet/beignet-1.3.2-r2.ebuild b/dev-libs/beignet/beignet-1.3.2-r2.ebuild
index bc69b887c3d..18916096142 100644
--- a/dev-libs/beignet/beignet-1.3.2-r2.ebuild
+++ b/dev-libs/beignet/beignet-1.3.2-r2.ebuild
@@ -25,16 +25,16 @@ else
S=${WORKDIR}/Beignet-${PV}-Source
fi
-COMMON="media-libs/mesa[${MULTILIB_USEDEP}]
+COMMON="app-eselect/eselect-opencl
+ media-libs/mesa[${MULTILIB_USEDEP}]
<sys-devel/clang-6.0.9999:=[${MULTILIB_USEDEP}]
>=x11-libs/libdrm-2.4.70[video_cards_intel,${MULTILIB_USEDEP}]
x11-libs/libXext[${MULTILIB_USEDEP}]
- x11-libs/libXfixes[${MULTILIB_USEDEP}]"
-RDEPEND="${COMMON}
- app-eselect/eselect-opencl"
+ x11-libs/libXfixes[${MULTILIB_USEDEP}]
+ ocl-icd? ( dev-libs/ocl-icd )"
+RDEPEND="${COMMON}"
DEPEND="${COMMON}
${PYTHON_DEPS}
- ocl-icd? ( dev-libs/ocl-icd )
virtual/pkgconfig"
LLVM_MAX_SLOT=6
@@ -105,3 +105,11 @@ multilib_src_install() {
dosym "lib/${PN}/libcl.so" "${VENDOR_DIR}"/libcl.so.1
dosym "lib/${PN}/libcl.so" "${VENDOR_DIR}"/libcl.so
}
+
+pkg_postinst() {
+ if use ocl-icd; then
+ "${ROOT}"/usr/bin/eselect opencl set --use-old ocl-icd
+ else
+ "${ROOT}"/usr/bin/eselect opencl set --use-old beignet
+ fi
+}