[gentoo-commits] repo/gentoo:master commit in: dev-libs/beignet/

[gentoo-commits] repo/gentoo:master commit in: dev-libs/beignet/

[Marek Szuba]

commit:     14d0fb0e972847b6ca1059a73e0ef59a33756b4a
Author:     Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 19 17:45:04 2017 +0000
Commit:     Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Sun Feb 19 17:45:37 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=14d0fb0e

dev-libs/beignet: require slot 0 of sys-devel/llvm and sys-devel/clang

QA issues aside, at present Beignet doesn't support any version of LLVM newer
than 3.9.x.

Package-Manager: portage-2.3.3

 dev-libs/beignet/beignet-1.2.1-r1.ebuild | 6 +++---
 dev-libs/beignet/beignet-1.3.0.ebuild    | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/dev-libs/beignet/beignet-1.2.1-r1.ebuild b/dev-libs/beignet/beignet-1.2.1-r1.ebuild
index 3501b108d6..c528ba6579 100644
--- a/dev-libs/beignet/beignet-1.2.1-r1.ebuild
+++ b/dev-libs/beignet/beignet-1.2.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -28,8 +28,8 @@ fi
 
 COMMON="${PYTHON_DEPS}
 	media-libs/mesa
-	sys-devel/clang
-	>=sys-devel/llvm-3.5
+	sys-devel/clang:0
+	>=sys-devel/llvm-3.5:0
 	>=x11-libs/libdrm-2.4.70[video_cards_intel]
 	x11-libs/libXext
 	x11-libs/libXfixes"

diff --git a/dev-libs/beignet/beignet-1.3.0.ebuild b/dev-libs/beignet/beignet-1.3.0.ebuild
index e06da218c7..bee2854310 100644
--- a/dev-libs/beignet/beignet-1.3.0.ebuild
+++ b/dev-libs/beignet/beignet-1.3.0.ebuild
@@ -28,8 +28,8 @@ fi
 
 COMMON="${PYTHON_DEPS}
 	media-libs/mesa
-	sys-devel/clang
-	ocl20? ( >=sys-devel/llvm-3.9  >=sys-devel/llvm-3.6 )
+	sys-devel/clang:0
+	ocl20? ( >=sys-devel/llvm-3.9:0  >=sys-devel/llvm-3.6:0 )
 	>=x11-libs/libdrm-2.4.70[video_cards_intel]
 	x11-libs/libXext
 	x11-libs/libXfixes"

[gentoo-commits] repo/gentoo:master commit in: dev-libs/beignet/

[Marek Szuba]

commit:     e0a1cd1844cfe63968e68442a42d460967ac4426
Author:     Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Wed Jul  3 11:21:07 2019 +0000
Commit:     Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Wed Jul  3 11:21:07 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e0a1cd18

dev-libs/beignet: depend on sys-devel/clang[static-analyzer]

Turns out that the absence of static-analyzer among sys-devel/clang USE
flags causes a configure-time error. The flag in question is enabled by
default so only a subset of users has been affected.

Many thanks to Conrad Kostecki for having finally identified the source
of this problem!

Closes: https://bugs.gentoo.org/664342
Closes: https://bugs.gentoo.org/689088
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>
Package-Manager: Portage-2.3.66, Repoman-2.3.11

 dev-libs/beignet/beignet-1.3.2-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/beignet/beignet-1.3.2-r3.ebuild b/dev-libs/beignet/beignet-1.3.2-r3.ebuild
index 0d0b8a6bae7..132de5924f5 100644
--- a/dev-libs/beignet/beignet-1.3.2-r3.ebuild
+++ b/dev-libs/beignet/beignet-1.3.2-r3.ebuild
@@ -21,7 +21,7 @@ BDEPEND="${PYTHON_DEPS}
 	virtual/pkgconfig"
 COMMON="app-eselect/eselect-opencl
 	media-libs/mesa[${MULTILIB_USEDEP}]
-	<sys-devel/clang-8.0.0:=[${MULTILIB_USEDEP}]
+	<sys-devel/clang-8.0.0:=[static-analyzer,${MULTILIB_USEDEP}]
 	>=x11-libs/libdrm-2.4.70[video_cards_intel,${MULTILIB_USEDEP}]
 	x11-libs/libXext[${MULTILIB_USEDEP}]
 	x11-libs/libXfixes[${MULTILIB_USEDEP}]

[gentoo-commits] repo/gentoo:master commit in: dev-libs/beignet/

[Marek Szuba]

commit:     dc041c0d199c04e212f0080ff433faa91a6de4ff
Author:     Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 20 11:19:25 2019 +0000
Commit:     Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Thu Jun 20 11:19:44 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc041c0d

dev-libs/beignet: remove old unstable ebuild

Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>
Package-Manager: Portage-2.3.66, Repoman-2.3.11

 dev-libs/beignet/beignet-1.3.2-r2.ebuild | 115 -------------------------------
 1 file changed, 115 deletions(-)

diff --git a/dev-libs/beignet/beignet-1.3.2-r2.ebuild b/dev-libs/beignet/beignet-1.3.2-r2.ebuild
deleted file mode 100644
index 661cc49ff2a..00000000000
--- a/dev-libs/beignet/beignet-1.3.2-r2.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-CMAKE_BUILD_TYPE="Release"
-
-inherit python-any-r1 cmake-multilib flag-o-matic llvm toolchain-funcs
-
-DESCRIPTION="OpenCL implementation for Intel GPUs"
-HOMEPAGE="https://01.org/beignet https://gitlab.freedesktop.org/beignet/beignet"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-IUSE="ocl-icd ocl20"
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/beignet/beignet.git"
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64"
-	SRC_URI="https://01.org/sites/default/files/${P}-source.tar.gz"
-	S=${WORKDIR}/Beignet-${PV}-Source
-fi
-
-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}]
-	ocl-icd? ( dev-libs/ocl-icd )"
-RDEPEND="${COMMON}"
-DEPEND="${COMMON}
-	${PYTHON_DEPS}
-	virtual/pkgconfig"
-
-LLVM_MAX_SLOT=6
-
-PATCHES=(
-	"${FILESDIR}"/no-debian-multiarch.patch
-	"${FILESDIR}"/${PN}-1.3.2_disable-doNegAddOptimization.patch
-	"${FILESDIR}"/${PN}-1.3.2_cmake-llvm-config-multilib.patch
-	"${FILESDIR}"/${PN}-1.3.2_llvm6.patch
-	"${FILESDIR}"/${PN}-1.3.1-oclicd_no_upstream_icdfile.patch
-	"${FILESDIR}"/${PN}-1.2.0_no-hardcoded-cflags.patch
-	"${FILESDIR}"/llvm-terminfo.patch
-)
-
-DOCS=(
-	docs/.
-)
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != "binary" ]]; then
-		if tc-is-gcc; then
-			if [[ $(gcc-major-version) -eq 4 ]] && [[ $(gcc-minor-version) -lt 6 ]]; then
-				eerror "Compilation with gcc older than 4.6 is not supported"
-				die "Too old gcc found."
-			fi
-		fi
-	fi
-}
-
-pkg_setup() {
-	llvm_pkg_setup
-	python_setup
-}
-
-src_prepare() {
-	# See Bug #593968
-	append-flags -fPIC
-
-	cmake-utils_src_prepare
-	# We cannot run tests because they require permissions to access
-	# the hardware, and building them is very time-consuming.
-	cmake_comment_add_subdirectory utests
-}
-
-multilib_src_configure() {
-	VENDOR_DIR="/usr/$(get_libdir)/OpenCL/vendors/${PN}"
-
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}${VENDOR_DIR}"
-		-DOCLICD_COMPAT=$(usex ocl-icd)
-		$(usex ocl20 "" "-DENABLE_OPENCL_20=OFF")
-	)
-
-	cmake-utils_src_configure
-}
-
-multilib_src_install() {
-	VENDOR_DIR="/usr/$(get_libdir)/OpenCL/vendors/${PN}"
-
-	cmake-utils_src_install
-
-	insinto /etc/OpenCL/vendors/
-	echo "${EPREFIX}${VENDOR_DIR}/lib/${PN}/libcl.so" > "${PN}-${ABI}.icd" || die "Failed to generate ICD file"
-	doins "${PN}-${ABI}.icd"
-
-	dosym "lib/${PN}/libcl.so" "${VENDOR_DIR}"/libOpenCL.so.1
-	dosym "lib/${PN}/libcl.so" "${VENDOR_DIR}"/libOpenCL.so
-	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
-}

[gentoo-commits] repo/gentoo:master commit in: dev-libs/beignet/

[Marek Szuba]

commit:     697eef4c002af3916a929823c4f4473f9d7854e3
Author:     Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 20 11:17:44 2019 +0000
Commit:     Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Thu Jun 20 11:19:40 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=697eef4c

dev-libs/beignet: remove version depending on llvm5

Closes: https://bugs.gentoo.org/687210
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>
Package-Manager: Portage-2.3.66, Repoman-2.3.11

 dev-libs/beignet/beignet-1.3.2.ebuild | 105 ----------------------------------
 1 file changed, 105 deletions(-)

diff --git a/dev-libs/beignet/beignet-1.3.2.ebuild b/dev-libs/beignet/beignet-1.3.2.ebuild
deleted file mode 100644
index da0b9d27ffe..00000000000
--- a/dev-libs/beignet/beignet-1.3.2.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-CMAKE_BUILD_TYPE="Release"
-
-inherit python-any-r1 cmake-multilib flag-o-matic llvm toolchain-funcs
-
-DESCRIPTION="OpenCL implementation for Intel GPUs"
-HOMEPAGE="https://01.org/beignet https://gitlab.freedesktop.org/beignet/beignet"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-IUSE="ocl-icd ocl20"
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/beignet/beignet.git"
-	KEYWORDS="amd64"
-else
-	KEYWORDS="amd64"
-	SRC_URI="https://01.org/sites/default/files/${P}-source.tar.gz"
-	S=${WORKDIR}/Beignet-${PV}-Source
-fi
-
-COMMON="media-libs/mesa[${MULTILIB_USEDEP}]
-	<sys-devel/clang-6.0.0:=[${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"
-DEPEND="${COMMON}
-	${PYTHON_DEPS}
-	ocl-icd? ( dev-libs/ocl-icd )
-	virtual/pkgconfig"
-
-LLVM_MAX_SLOT=5
-
-PATCHES=(
-	"${FILESDIR}"/no-debian-multiarch.patch
-	"${FILESDIR}"/${PN}-1.3.2_cmake-llvm-config-multilib.patch
-	"${FILESDIR}"/${PN}-1.3.1-oclicd_no_upstream_icdfile.patch
-	"${FILESDIR}"/${PN}-1.2.0_no-hardcoded-cflags.patch
-	"${FILESDIR}"/llvm-terminfo.patch
-)
-
-DOCS=(
-	docs/.
-)
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != "binary" ]]; then
-		if tc-is-gcc; then
-			if [[ $(gcc-major-version) -eq 4 ]] && [[ $(gcc-minor-version) -lt 6 ]]; then
-				eerror "Compilation with gcc older than 4.6 is not supported"
-				die "Too old gcc found."
-			fi
-		fi
-	fi
-}
-
-pkg_setup() {
-	llvm_pkg_setup
-	python_setup
-}
-
-src_prepare() {
-	# See Bug #593968
-	append-flags -fPIC
-
-	cmake-utils_src_prepare
-	# We cannot run tests because they require permissions to access
-	# the hardware, and building them is very time-consuming.
-	cmake_comment_add_subdirectory utests
-}
-
-multilib_src_configure() {
-	VENDOR_DIR="/usr/$(get_libdir)/OpenCL/vendors/${PN}"
-
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_PREFIX="${VENDOR_DIR}"
-		-DOCLICD_COMPAT=$(usex ocl-icd)
-		$(usex ocl20 "" "-DENABLE_OPENCL_20=OFF")
-	)
-
-	cmake-utils_src_configure
-}
-
-multilib_src_install() {
-	VENDOR_DIR="/usr/$(get_libdir)/OpenCL/vendors/${PN}"
-
-	cmake-utils_src_install
-
-	insinto /etc/OpenCL/vendors/
-	echo "${VENDOR_DIR}/lib/${PN}/libcl.so" > "${PN}-${ABI}.icd" || die "Failed to generate ICD file"
-	doins "${PN}-${ABI}.icd"
-
-	dosym "lib/${PN}/libcl.so" "${VENDOR_DIR}"/libOpenCL.so.1
-	dosym "lib/${PN}/libcl.so" "${VENDOR_DIR}"/libOpenCL.so
-	dosym "lib/${PN}/libcl.so" "${VENDOR_DIR}"/libcl.so.1
-	dosym "lib/${PN}/libcl.so" "${VENDOR_DIR}"/libcl.so
-}

[gentoo-commits] repo/gentoo:master commit in: dev-libs/beignet/

[Mikle Kolyada]

commit:     0a88f3179ac484af4c26e6bac22b82654d42794b
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 20 09:32:56 2019 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Thu Jun 20 09:32:56 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a88f317

dev-libs/beignet: amd64 stable wrt bug #688344

Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
Package-Manager: Portage-2.3.66, Repoman-2.3.11
RepoMan-Options: --include-arches="amd64"

 dev-libs/beignet/beignet-1.3.2-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/beignet/beignet-1.3.2-r3.ebuild b/dev-libs/beignet/beignet-1.3.2-r3.ebuild
index babcfaac9b4..0d0b8a6bae7 100644
--- a/dev-libs/beignet/beignet-1.3.2-r3.ebuild
+++ b/dev-libs/beignet/beignet-1.3.2-r3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://01.org/sites/default/files/${P}-source.tar.gz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="ocl-icd ocl20"
 
 BDEPEND="${PYTHON_DEPS}

[gentoo-commits] repo/gentoo:master commit in: dev-libs/beignet/

[Marek Szuba]

commit:     2c8c4dcf930aed130d7ddb20e8a7ac7d43b03165
Author:     Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Wed Jun  5 23:12:01 2019 +0000
Commit:     Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Wed Jun  5 23:12:01 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c8c4dcf

dev-libs/beignet: adjust clang version restrictions

Unlike seemingly all versions until this point, llvm-7 has actually
increased the minor version number - meaning that the usual beignet
restriction of <clang-x.0.9999 no longer covered the whole SLOT=7. On
the plus side, there is no 7.x.9999 ebuild in the tree any more so we
can simply make this "less than 8.0.0".

Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>
Package-Manager: Portage-2.3.66, Repoman-2.3.11

 dev-libs/beignet/beignet-1.3.2-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/beignet/beignet-1.3.2-r3.ebuild b/dev-libs/beignet/beignet-1.3.2-r3.ebuild
index 820fc50e9a7..babcfaac9b4 100644
--- a/dev-libs/beignet/beignet-1.3.2-r3.ebuild
+++ b/dev-libs/beignet/beignet-1.3.2-r3.ebuild
@@ -21,7 +21,7 @@ BDEPEND="${PYTHON_DEPS}
 	virtual/pkgconfig"
 COMMON="app-eselect/eselect-opencl
 	media-libs/mesa[${MULTILIB_USEDEP}]
-	<sys-devel/clang-7.0.9999:=[${MULTILIB_USEDEP}]
+	<sys-devel/clang-8.0.0:=[${MULTILIB_USEDEP}]
 	>=x11-libs/libdrm-2.4.70[video_cards_intel,${MULTILIB_USEDEP}]
 	x11-libs/libXext[${MULTILIB_USEDEP}]
 	x11-libs/libXfixes[${MULTILIB_USEDEP}]

[gentoo-commits] repo/gentoo:master commit in: dev-libs/beignet/

[Marek Szuba]

commit:     9492a6b0d3197ff80015e08142bdb813b89f7265
Author:     Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Fri May 24 14:35:04 2019 +0000
Commit:     Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Fri May 24 14:35:24 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9492a6b0

dev-libs/beignet: s/Skylake/Broadwell/ in the deprecation note

Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11

 dev-libs/beignet/beignet-1.3.2-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/beignet/beignet-1.3.2-r3.ebuild b/dev-libs/beignet/beignet-1.3.2-r3.ebuild
index 15e6c37a560..820fc50e9a7 100644
--- a/dev-libs/beignet/beignet-1.3.2-r3.ebuild
+++ b/dev-libs/beignet/beignet-1.3.2-r3.ebuild
@@ -92,7 +92,7 @@ multilib_src_install() {
 
 pkg_postinst() {
 	elog ""
-	elog "Please note that for Skylake and newer architectures, Beignet has been deprecated upstream in favour of dev-libs/intel-neo."
+	elog "Please note that for Broadwell and newer architectures, Beignet has been deprecated upstream in favour of dev-libs/intel-neo."
 	elog "It remains the recommended solution for Sandy Bridge, Ivy Bridge and Haswell."
 	elog ""
 

[gentoo-commits] repo/gentoo:master commit in: dev-libs/beignet/

[Marek Szuba]

commit:     eea9efcfa429c1964096473f5cbc33ed40f0707f
Author:     Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Fri May 24 14:19:40 2019 +0000
Commit:     Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Fri May 24 14:20:33 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eea9efcf

dev-libs/beignet: remove old

Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11

 dev-libs/beignet/beignet-1.3.2-r1.ebuild | 106 -------------------------------
 1 file changed, 106 deletions(-)

diff --git a/dev-libs/beignet/beignet-1.3.2-r1.ebuild b/dev-libs/beignet/beignet-1.3.2-r1.ebuild
deleted file mode 100644
index c7cc20e5302..00000000000
--- a/dev-libs/beignet/beignet-1.3.2-r1.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-CMAKE_BUILD_TYPE="Release"
-
-inherit python-any-r1 cmake-multilib flag-o-matic llvm toolchain-funcs
-
-DESCRIPTION="OpenCL implementation for Intel GPUs"
-HOMEPAGE="https://01.org/beignet https://gitlab.freedesktop.org/beignet/beignet"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-IUSE="ocl-icd ocl20"
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/beignet/beignet.git"
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64"
-	SRC_URI="https://01.org/sites/default/files/${P}-source.tar.gz"
-	S=${WORKDIR}/Beignet-${PV}-Source
-fi
-
-COMMON="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"
-DEPEND="${COMMON}
-	${PYTHON_DEPS}
-	ocl-icd? ( dev-libs/ocl-icd )
-	virtual/pkgconfig"
-
-LLVM_MAX_SLOT=6
-
-PATCHES=(
-	"${FILESDIR}"/no-debian-multiarch.patch
-	"${FILESDIR}"/${PN}-1.3.2_cmake-llvm-config-multilib.patch
-	"${FILESDIR}"/${PN}-1.3.2_llvm6.patch
-	"${FILESDIR}"/${PN}-1.3.1-oclicd_no_upstream_icdfile.patch
-	"${FILESDIR}"/${PN}-1.2.0_no-hardcoded-cflags.patch
-	"${FILESDIR}"/llvm-terminfo.patch
-)
-
-DOCS=(
-	docs/.
-)
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != "binary" ]]; then
-		if tc-is-gcc; then
-			if [[ $(gcc-major-version) -eq 4 ]] && [[ $(gcc-minor-version) -lt 6 ]]; then
-				eerror "Compilation with gcc older than 4.6 is not supported"
-				die "Too old gcc found."
-			fi
-		fi
-	fi
-}
-
-pkg_setup() {
-	llvm_pkg_setup
-	python_setup
-}
-
-src_prepare() {
-	# See Bug #593968
-	append-flags -fPIC
-
-	cmake-utils_src_prepare
-	# We cannot run tests because they require permissions to access
-	# the hardware, and building them is very time-consuming.
-	cmake_comment_add_subdirectory utests
-}
-
-multilib_src_configure() {
-	VENDOR_DIR="/usr/$(get_libdir)/OpenCL/vendors/${PN}"
-
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}${VENDOR_DIR}"
-		-DOCLICD_COMPAT=$(usex ocl-icd)
-		$(usex ocl20 "" "-DENABLE_OPENCL_20=OFF")
-	)
-
-	cmake-utils_src_configure
-}
-
-multilib_src_install() {
-	VENDOR_DIR="/usr/$(get_libdir)/OpenCL/vendors/${PN}"
-
-	cmake-utils_src_install
-
-	insinto /etc/OpenCL/vendors/
-	echo "${EPREFIX}${VENDOR_DIR}/lib/${PN}/libcl.so" > "${PN}-${ABI}.icd" || die "Failed to generate ICD file"
-	doins "${PN}-${ABI}.icd"
-
-	dosym "lib/${PN}/libcl.so" "${VENDOR_DIR}"/libOpenCL.so.1
-	dosym "lib/${PN}/libcl.so" "${VENDOR_DIR}"/libOpenCL.so
-	dosym "lib/${PN}/libcl.so" "${VENDOR_DIR}"/libcl.so.1
-	dosym "lib/${PN}/libcl.so" "${VENDOR_DIR}"/libcl.so
-}

[gentoo-commits] repo/gentoo:master commit in: dev-libs/beignet/

[Marek Szuba]

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
+}

[gentoo-commits] repo/gentoo:master commit in: dev-libs/beignet/

[Marek Szuba]

commit:     ac97e59f85ca6a8b87ac7ebbe50b53630731402e
Author:     Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 31 13:07:36 2018 +0000
Commit:     Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Fri Aug 31 13:07:55 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac97e59f

dev-libs/beignet: fix broken prefix support

With VENDOR_DIR as set in the ebuild beginning with a slash,
${EPREFIX%/}/${VENDOR_DIR} ends up containing // regardless of the
value of EPREFIX. On a less serious note, it isn't necessary to strip
the trailing slash from EPREFIX because according to specifications
there shouldn't be one; it seems the author of the patch confused it
with e.g. ED.

Closes: https://bugs.gentoo.org/663818
Package-Manager: Portage-2.3.40, Repoman-2.3.9

 dev-libs/beignet/beignet-1.3.2-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-libs/beignet/beignet-1.3.2-r1.ebuild b/dev-libs/beignet/beignet-1.3.2-r1.ebuild
index 7975dc31d3c..aabc386a74b 100644
--- a/dev-libs/beignet/beignet-1.3.2-r1.ebuild
+++ b/dev-libs/beignet/beignet-1.3.2-r1.ebuild
@@ -82,7 +82,7 @@ multilib_src_configure() {
 	VENDOR_DIR="/usr/$(get_libdir)/OpenCL/vendors/${PN}"
 
 	local mycmakeargs=(
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX%/}/${VENDOR_DIR}"
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}${VENDOR_DIR}"
 		-DOCLICD_COMPAT=$(usex ocl-icd)
 		$(usex ocl20 "" "-DENABLE_OPENCL_20=OFF")
 	)
@@ -96,7 +96,7 @@ multilib_src_install() {
 	cmake-utils_src_install
 
 	insinto /etc/OpenCL/vendors/
-	echo "${EPREFIX%/}/${VENDOR_DIR}/lib/${PN}/libcl.so" > "${PN}-${ABI}.icd" || die "Failed to generate ICD file"
+	echo "${EPREFIX}${VENDOR_DIR}/lib/${PN}/libcl.so" > "${PN}-${ABI}.icd" || die "Failed to generate ICD file"
 	doins "${PN}-${ABI}.icd"
 
 	dosym "lib/${PN}/libcl.so" "${VENDOR_DIR}"/libOpenCL.so.1

[gentoo-commits] repo/gentoo:master commit in: dev-libs/beignet/

[Guilherme Amadio]

commit:     a48bd78754f68235376af0d11b25c0dade398eef
Author:     Guilherme Amadio <amadio <AT> gentoo <DOT> org>
AuthorDate: Fri Aug  3 08:23:48 2018 +0000
Commit:     Guilherme Amadio <amadio <AT> gentoo <DOT> org>
CommitDate: Wed Aug  8 10:04:22 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a48bd787

dev-libs/beignet: prefix support

Package-Manager: Portage-2.3.44, Repoman-2.3.10

 dev-libs/beignet/beignet-1.3.2-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-libs/beignet/beignet-1.3.2-r1.ebuild b/dev-libs/beignet/beignet-1.3.2-r1.ebuild
index c562b68c13b..7975dc31d3c 100644
--- a/dev-libs/beignet/beignet-1.3.2-r1.ebuild
+++ b/dev-libs/beignet/beignet-1.3.2-r1.ebuild
@@ -82,7 +82,7 @@ multilib_src_configure() {
 	VENDOR_DIR="/usr/$(get_libdir)/OpenCL/vendors/${PN}"
 
 	local mycmakeargs=(
-		-DCMAKE_INSTALL_PREFIX="${VENDOR_DIR}"
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX%/}/${VENDOR_DIR}"
 		-DOCLICD_COMPAT=$(usex ocl-icd)
 		$(usex ocl20 "" "-DENABLE_OPENCL_20=OFF")
 	)
@@ -96,7 +96,7 @@ multilib_src_install() {
 	cmake-utils_src_install
 
 	insinto /etc/OpenCL/vendors/
-	echo "${VENDOR_DIR}/lib/${PN}/libcl.so" > "${PN}-${ABI}.icd" || die "Failed to generate ICD file"
+	echo "${EPREFIX%/}/${VENDOR_DIR}/lib/${PN}/libcl.so" > "${PN}-${ABI}.icd" || die "Failed to generate ICD file"
 	doins "${PN}-${ABI}.icd"
 
 	dosym "lib/${PN}/libcl.so" "${VENDOR_DIR}"/libOpenCL.so.1

[gentoo-commits] repo/gentoo:master commit in: dev-libs/beignet/

[Michał Górny]

commit:     96e79c47df098f0561f5d654c9421bee616bb9ec
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 31 09:45:07 2018 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Apr 11 16:19:43 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=96e79c47

dev-libs/beignet: Drop old

 dev-libs/beignet/Manifest                |   1 -
 dev-libs/beignet/beignet-1.3.1-r1.ebuild | 103 -------------------------------
 dev-libs/beignet/beignet-1.3.1.ebuild    | 103 -------------------------------
 3 files changed, 207 deletions(-)

diff --git a/dev-libs/beignet/Manifest b/dev-libs/beignet/Manifest
index 133395211f5..bcfd62e2505 100644
--- a/dev-libs/beignet/Manifest
+++ b/dev-libs/beignet/Manifest
@@ -1,2 +1 @@
-DIST beignet-1.3.1-source.tar.gz 1136608 BLAKE2B 490b83b0d506c376b2ec38cb9d159c792c333d546feef2c205accbc648ae6d144a4dd829aebde1d5a5b9920d0a0c87ecf675b709543148d28b27b39be8d9c1fb SHA512 727c8ce68dc39672aa37370ebf2748955925a7cfd58c970c9a641706b45cc31d4a7d3eeebc366ed32ef69add5dd36189814454e5b31f12a6f09ea1a51c810338
 DIST beignet-1.3.2-source.tar.gz 1143573 BLAKE2B e95e9ad352e7e695a0c56a8cea7bff312d7e1e811e17da6c744f16833130ca5339c163504afff3ed61947e752b94dc0465f6702317feb7662fb9676939838f20 SHA512 ed09a895c2f7e9b6e18687a899f1303dfda95e505c3c2d54bf7598cc4eba6c2fb5926589b19dd294384a4ff3f832c43235b1f03f8b7fd295cd558e78bda1400a

diff --git a/dev-libs/beignet/beignet-1.3.1-r1.ebuild b/dev-libs/beignet/beignet-1.3.1-r1.ebuild
deleted file mode 100644
index 577d1fc4882..00000000000
--- a/dev-libs/beignet/beignet-1.3.1-r1.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-CMAKE_BUILD_TYPE="Release"
-
-inherit python-any-r1 cmake-multilib flag-o-matic toolchain-funcs
-
-DESCRIPTION="OpenCL implementation for Intel GPUs"
-HOMEPAGE="https://01.org/beignet"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-IUSE="ocl-icd ocl20"
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://anongit.freedesktop.org/git/beignet.git"
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64"
-	SRC_URI="https://01.org/sites/default/files/${P}-source.tar.gz"
-	S=${WORKDIR}/Beignet-${PV}-Source
-fi
-
-COMMON="media-libs/mesa
-	sys-devel/clang:0=
-	>=sys-devel/llvm-3.6:0=
-	ocl20? ( >=sys-devel/llvm-3.9:0= )
-	>=x11-libs/libdrm-2.4.70[video_cards_intel]
-	x11-libs/libXext
-	x11-libs/libXfixes"
-RDEPEND="${COMMON}
-	app-eselect/eselect-opencl"
-DEPEND="${COMMON}
-	${PYTHON_DEPS}
-	ocl-icd? ( dev-libs/ocl-icd )
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/no-debian-multiarch.patch
-	"${FILESDIR}"/${P}-oclicd_no_upstream_icdfile.patch
-	"${FILESDIR}"/${PN}-1.2.0_no-hardcoded-cflags.patch
-	"${FILESDIR}"/llvm-terminfo.patch
-)
-
-DOCS=(
-	docs/.
-)
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != "binary" ]]; then
-		if tc-is-gcc; then
-			if [[ $(gcc-major-version) -eq 4 ]] && [[ $(gcc-minor-version) -lt 6 ]]; then
-				eerror "Compilation with gcc older than 4.6 is not supported"
-				die "Too old gcc found."
-			fi
-		fi
-	fi
-}
-
-pkg_setup() {
-	python_setup
-}
-
-src_prepare() {
-	# See Bug #593968
-	append-flags -fPIC
-
-	cmake-utils_src_prepare
-	# We cannot run tests because they require permissions to access
-	# the hardware, and building them is very time-consuming.
-	cmake_comment_add_subdirectory utests
-}
-
-multilib_src_configure() {
-	VENDOR_DIR="/usr/$(get_libdir)/OpenCL/vendors/${PN}"
-
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_PREFIX="${VENDOR_DIR}"
-		-DOCLICD_COMPAT=$(usex ocl-icd)
-		$(usex ocl20 "" "-DENABLE_OPENCL_20=OFF")
-	)
-
-	cmake-utils_src_configure
-}
-
-multilib_src_install() {
-	VENDOR_DIR="/usr/$(get_libdir)/OpenCL/vendors/${PN}"
-
-	cmake-utils_src_install
-
-	insinto /etc/OpenCL/vendors/
-	echo "${VENDOR_DIR}/lib/${PN}/libcl.so" > "${PN}-${ABI}.icd" || die "Failed to generate ICD file"
-	doins "${PN}-${ABI}.icd"
-
-	dosym "lib/${PN}/libcl.so" "${VENDOR_DIR}"/libOpenCL.so.1
-	dosym "lib/${PN}/libcl.so" "${VENDOR_DIR}"/libOpenCL.so
-	dosym "lib/${PN}/libcl.so" "${VENDOR_DIR}"/libcl.so.1
-	dosym "lib/${PN}/libcl.so" "${VENDOR_DIR}"/libcl.so
-}

diff --git a/dev-libs/beignet/beignet-1.3.1.ebuild b/dev-libs/beignet/beignet-1.3.1.ebuild
deleted file mode 100644
index 75330cbd42b..00000000000
--- a/dev-libs/beignet/beignet-1.3.1.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-CMAKE_BUILD_TYPE="Release"
-
-inherit python-any-r1 cmake-multilib flag-o-matic toolchain-funcs
-
-DESCRIPTION="OpenCL implementation for Intel GPUs"
-HOMEPAGE="https://01.org/beignet"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-IUSE="ocl-icd ocl20"
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://anongit.freedesktop.org/git/beignet.git"
-	KEYWORDS="amd64"
-else
-	KEYWORDS="amd64"
-	SRC_URI="https://01.org/sites/default/files/${P}-source.tar.gz"
-	S=${WORKDIR}/Beignet-${PV}-Source
-fi
-
-COMMON="media-libs/mesa
-	sys-devel/clang:0=
-	>=sys-devel/llvm-3.6:0=
-	ocl20? ( >=sys-devel/llvm-3.9:0= )
-	>=x11-libs/libdrm-2.4.70[video_cards_intel]
-	x11-libs/libXext
-	x11-libs/libXfixes"
-RDEPEND="${COMMON}
-	app-eselect/eselect-opencl"
-DEPEND="${COMMON}
-	${PYTHON_DEPS}
-	ocl-icd? ( dev-libs/ocl-icd )
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/no-debian-multiarch.patch
-	"${FILESDIR}"/${P}-oclicd_no_upstream_icdfile.patch
-	"${FILESDIR}"/${PN}-1.2.0_no-hardcoded-cflags.patch
-	"${FILESDIR}"/llvm-terminfo.patch
-)
-
-DOCS=(
-	docs/.
-)
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != "binary" ]]; then
-		if tc-is-gcc; then
-			if [[ $(gcc-major-version) -eq 4 ]] && [[ $(gcc-minor-version) -lt 6 ]]; then
-				eerror "Compilation with gcc older than 4.6 is not supported"
-				die "Too old gcc found."
-			fi
-		fi
-	fi
-}
-
-pkg_setup() {
-	python_setup
-}
-
-src_prepare() {
-	# See Bug #593968
-	append-flags -fPIC
-
-	cmake-utils_src_prepare
-	# We cannot run tests because they require permissions to access
-	# the hardware, and building them is very time-consuming.
-	cmake_comment_add_subdirectory utests
-}
-
-multilib_src_configure() {
-	VENDOR_DIR="/usr/$(get_libdir)/OpenCL/vendors/${PN}"
-
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_PREFIX="${VENDOR_DIR}"
-		-DOCLICD_COMPAT=$(usex ocl-icd)
-		-DENABLE_OPENCL_20=$(usex ocl20)
-	)
-
-	cmake-utils_src_configure
-}
-
-multilib_src_install() {
-	VENDOR_DIR="/usr/$(get_libdir)/OpenCL/vendors/${PN}"
-
-	cmake-utils_src_install
-
-	insinto /etc/OpenCL/vendors/
-	echo "${VENDOR_DIR}/lib/${PN}/libcl.so" > "${PN}-${ABI}.icd" || die "Failed to generate ICD file"
-	doins "${PN}-${ABI}.icd"
-
-	dosym "lib/${PN}/libcl.so" "${VENDOR_DIR}"/libOpenCL.so.1
-	dosym "lib/${PN}/libcl.so" "${VENDOR_DIR}"/libOpenCL.so
-	dosym "lib/${PN}/libcl.so" "${VENDOR_DIR}"/libcl.so.1
-	dosym "lib/${PN}/libcl.so" "${VENDOR_DIR}"/libcl.so
-}

[gentoo-commits] repo/gentoo:master commit in: dev-libs/beignet/

[Agostino Sarubbo]

commit:     795f65f018636a8d20543344551adbb9a7322c0f
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 20 09:59:38 2018 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Tue Mar 20 09:59:38 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=795f65f0

dev-libs/beignet: amd64 stable wrt bug #650372

Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>
Package-Manager: Portage-2.3.19, Repoman-2.3.6
RepoMan-Options: --include-arches="amd64"

 dev-libs/beignet/beignet-1.3.2.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-libs/beignet/beignet-1.3.2.ebuild b/dev-libs/beignet/beignet-1.3.2.ebuild
index 6624d286bcc..b586f5b888a 100644
--- a/dev-libs/beignet/beignet-1.3.2.ebuild
+++ b/dev-libs/beignet/beignet-1.3.2.ebuild
@@ -18,9 +18,9 @@ IUSE="ocl-icd ocl20"
 if [[ "${PV}" == "9999" ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://anongit.freedesktop.org/git/beignet.git"
-	KEYWORDS=""
+	KEYWORDS="amd64"
 else
-	KEYWORDS="~amd64"
+	KEYWORDS="amd64"
 	SRC_URI="https://01.org/sites/default/files/${P}-source.tar.gz"
 	S=${WORKDIR}/Beignet-${PV}-Source
 fi

[gentoo-commits] repo/gentoo:master commit in: dev-libs/beignet/

[Marek Szuba]

commit:     7ad4da2b626af9208eb0398691f5e77fdb332455
Author:     Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 17 09:28:16 2018 +0000
Commit:     Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Sat Mar 17 09:29:05 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ad4da2b

dev-libs/beignet: play nicely with slotted LLVM

The version cap added by 2e80ee40ee74cc3005945355fd1a67ef4347ebbd was
not sufficient to solve Bug #650136 because although it did prevent
Beignet from pulling in slot 6 of sys-devel/llvm and sys-devel/clang
on fresh installations, it did nothing to avoid using these if already
installed. Thanks to the use of llvm.eclass this now no longer happens;
I have just tested this on a system with llvm6 installed and beignet
still ended up using llvm5.

Closes: https://bugs.gentoo.org/650136
Package-Manager: Portage-2.3.24, Repoman-2.3.6

 dev-libs/beignet/beignet-1.3.2.ebuild | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/dev-libs/beignet/beignet-1.3.2.ebuild b/dev-libs/beignet/beignet-1.3.2.ebuild
index c3f83128332..6624d286bcc 100644
--- a/dev-libs/beignet/beignet-1.3.2.ebuild
+++ b/dev-libs/beignet/beignet-1.3.2.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 CMAKE_BUILD_TYPE="Release"
 
-inherit python-any-r1 cmake-multilib flag-o-matic toolchain-funcs
+inherit python-any-r1 cmake-multilib flag-o-matic llvm toolchain-funcs
 
 DESCRIPTION="OpenCL implementation for Intel GPUs"
 HOMEPAGE="https://01.org/beignet"
@@ -27,7 +27,6 @@ fi
 
 COMMON="media-libs/mesa[${MULTILIB_USEDEP}]
 	<sys-devel/clang-6.0.0:=[${MULTILIB_USEDEP}]
-	<sys-devel/llvm-6.0.0:=[${MULTILIB_USEDEP}]
 	>=x11-libs/libdrm-2.4.70[video_cards_intel,${MULTILIB_USEDEP}]
 	x11-libs/libXext[${MULTILIB_USEDEP}]
 	x11-libs/libXfixes[${MULTILIB_USEDEP}]"
@@ -38,6 +37,8 @@ DEPEND="${COMMON}
 	ocl-icd? ( dev-libs/ocl-icd )
 	virtual/pkgconfig"
 
+LLVM_MAX_SLOT=5
+
 PATCHES=(
 	"${FILESDIR}"/no-debian-multiarch.patch
 	"${FILESDIR}"/${PN}-1.3.2_cmake-llvm-config-multilib.patch
@@ -62,6 +63,7 @@ pkg_pretend() {
 }
 
 pkg_setup() {
+	llvm_pkg_setup
 	python_setup
 }
 

[gentoo-commits] repo/gentoo:master commit in: dev-libs/beignet/

[Marek Szuba]

commit:     2e80ee40ee74cc3005945355fd1a67ef4347ebbd
Author:     Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 13 10:27:30 2018 +0000
Commit:     Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Tue Mar 13 10:29:02 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2e80ee40

dev-libs/beignet: 1.3.2 does not support LLVM6

Closes: https://bugs.gentoo.org/650136
Package-Manager: Portage-2.3.24, Repoman-2.3.6

 dev-libs/beignet/beignet-1.3.2.ebuild | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/dev-libs/beignet/beignet-1.3.2.ebuild b/dev-libs/beignet/beignet-1.3.2.ebuild
index 95092d080dc..c3f83128332 100644
--- a/dev-libs/beignet/beignet-1.3.2.ebuild
+++ b/dev-libs/beignet/beignet-1.3.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -26,8 +26,8 @@ else
 fi
 
 COMMON="media-libs/mesa[${MULTILIB_USEDEP}]
-	sys-devel/clang:=[${MULTILIB_USEDEP}]
-	sys-devel/llvm:=[${MULTILIB_USEDEP}]
+	<sys-devel/clang-6.0.0:=[${MULTILIB_USEDEP}]
+	<sys-devel/llvm-6.0.0:=[${MULTILIB_USEDEP}]
 	>=x11-libs/libdrm-2.4.70[video_cards_intel,${MULTILIB_USEDEP}]
 	x11-libs/libXext[${MULTILIB_USEDEP}]
 	x11-libs/libXfixes[${MULTILIB_USEDEP}]"

[gentoo-commits] repo/gentoo:master commit in: dev-libs/beignet/

[Pacho Ramos]

commit:     b66c0f85fa1a8f76d16974f4a60711880ad8d341
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sat Dec  9 19:45:12 2017 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sun Dec 10 10:14:55 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b66c0f85

dev-libs/beignet: Add support for newer python

Package-Manager: Portage-2.3.16, Repoman-2.3.6

 dev-libs/beignet/beignet-1.3.2.ebuild | 2 +-
 dev-libs/beignet/beignet-9999.ebuild  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-libs/beignet/beignet-1.3.2.ebuild b/dev-libs/beignet/beignet-1.3.2.ebuild
index e70e9d24d2a..16ff04d93f8 100644
--- a/dev-libs/beignet/beignet-1.3.2.ebuild
+++ b/dev-libs/beignet/beignet-1.3.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 CMAKE_BUILD_TYPE="Release"
 
 inherit python-any-r1 cmake-multilib flag-o-matic toolchain-funcs

diff --git a/dev-libs/beignet/beignet-9999.ebuild b/dev-libs/beignet/beignet-9999.ebuild
index d25a0abde8c..5c7dd730a34 100644
--- a/dev-libs/beignet/beignet-9999.ebuild
+++ b/dev-libs/beignet/beignet-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 CMAKE_BUILD_TYPE="Release"
 
 inherit python-any-r1 cmake-multilib flag-o-matic toolchain-funcs

[gentoo-commits] repo/gentoo:master commit in: dev-libs/beignet/

[Marek Szuba]

commit:     59296812b73e805261fa1243ebf8238d93119dff
Author:     Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Fri Dec  1 11:45:01 2017 +0000
Commit:     Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Fri Dec  1 11:45:23 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=59296812

dev-libs/beignet-1.3.2: fix propagation of multilib USE flags to deps

Gentoo-Bug: 638078
Package-Manager: Portage-2.3.13, Repoman-2.3.3

 dev-libs/beignet/beignet-1.3.2.ebuild | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/dev-libs/beignet/beignet-1.3.2.ebuild b/dev-libs/beignet/beignet-1.3.2.ebuild
index 9b6fbba591a..e70e9d24d2a 100644
--- a/dev-libs/beignet/beignet-1.3.2.ebuild
+++ b/dev-libs/beignet/beignet-1.3.2.ebuild
@@ -25,12 +25,12 @@ else
 	S=${WORKDIR}/Beignet-${PV}-Source
 fi
 
-COMMON="media-libs/mesa
-	sys-devel/clang:=
-	sys-devel/llvm:=
-	>=x11-libs/libdrm-2.4.70[video_cards_intel]
-	x11-libs/libXext
-	x11-libs/libXfixes"
+COMMON="media-libs/mesa[${MULTILIB_USEDEP}]
+	sys-devel/clang:=[${MULTILIB_USEDEP}]
+	sys-devel/llvm:=[${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"
 DEPEND="${COMMON}

[gentoo-commits] repo/gentoo:master commit in: dev-libs/beignet/

[Marek Szuba]

commit:     915759fbd6fa3a96435335a1e212c971ffa85d09
Author:     Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Mon Nov  6 11:40:44 2017 +0000
Commit:     Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Mon Nov  6 11:54:09 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=915759fb

dev-libs/beignet: bump to 1.3.2

Now with support for llvm-4 and llvm-5!

Package-Manager: Portage-2.3.8, Repoman-2.3.3

 dev-libs/beignet/Manifest             |   1 +
 dev-libs/beignet/beignet-1.3.2.ebuild | 102 ++++++++++++++++++++++++++++++++++
 2 files changed, 103 insertions(+)

diff --git a/dev-libs/beignet/Manifest b/dev-libs/beignet/Manifest
index 37d86d79568..efea9601469 100644
--- a/dev-libs/beignet/Manifest
+++ b/dev-libs/beignet/Manifest
@@ -1 +1,2 @@
 DIST beignet-1.3.1-source.tar.gz 1136608 SHA256 399b7bc64d674b3092683263f7c085c5592686b9d837817e77857248e5cb561f SHA512 727c8ce68dc39672aa37370ebf2748955925a7cfd58c970c9a641706b45cc31d4a7d3eeebc366ed32ef69add5dd36189814454e5b31f12a6f09ea1a51c810338 WHIRLPOOL 528667a58fbd446e7177edc578543b301205a05fae99d3b1d3782792cac564683e7318fe4e83d81c194ee29fa6cca613e86ce8064f26b551385c8b6c51f4b21e
+DIST beignet-1.3.2-source.tar.gz 1143573 SHA256 c555edba149de23243965a703f39f79fa06f15bcff5a3762b5544b0925010b43 SHA512 ed09a895c2f7e9b6e18687a899f1303dfda95e505c3c2d54bf7598cc4eba6c2fb5926589b19dd294384a4ff3f832c43235b1f03f8b7fd295cd558e78bda1400a WHIRLPOOL 5d1c48bce9e8ffb4928baebce80d5bc50cb6ffb5a6d5f144b7e7258b9d42bdb995a604f98d5d942ef6edea636ba7cd7308b7156b00c9234772d1c1fc597ece02

diff --git a/dev-libs/beignet/beignet-1.3.2.ebuild b/dev-libs/beignet/beignet-1.3.2.ebuild
new file mode 100644
index 00000000000..9b6fbba591a
--- /dev/null
+++ b/dev-libs/beignet/beignet-1.3.2.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+CMAKE_BUILD_TYPE="Release"
+
+inherit python-any-r1 cmake-multilib flag-o-matic toolchain-funcs
+
+DESCRIPTION="OpenCL implementation for Intel GPUs"
+HOMEPAGE="https://01.org/beignet"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+IUSE="ocl-icd ocl20"
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://anongit.freedesktop.org/git/beignet.git"
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+	SRC_URI="https://01.org/sites/default/files/${P}-source.tar.gz"
+	S=${WORKDIR}/Beignet-${PV}-Source
+fi
+
+COMMON="media-libs/mesa
+	sys-devel/clang:=
+	sys-devel/llvm:=
+	>=x11-libs/libdrm-2.4.70[video_cards_intel]
+	x11-libs/libXext
+	x11-libs/libXfixes"
+RDEPEND="${COMMON}
+	app-eselect/eselect-opencl"
+DEPEND="${COMMON}
+	${PYTHON_DEPS}
+	ocl-icd? ( dev-libs/ocl-icd )
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/no-debian-multiarch.patch
+	"${FILESDIR}"/${PN}-1.3.1-oclicd_no_upstream_icdfile.patch
+	"${FILESDIR}"/${PN}-1.2.0_no-hardcoded-cflags.patch
+	"${FILESDIR}"/llvm-terminfo.patch
+)
+
+DOCS=(
+	docs/.
+)
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != "binary" ]]; then
+		if tc-is-gcc; then
+			if [[ $(gcc-major-version) -eq 4 ]] && [[ $(gcc-minor-version) -lt 6 ]]; then
+				eerror "Compilation with gcc older than 4.6 is not supported"
+				die "Too old gcc found."
+			fi
+		fi
+	fi
+}
+
+pkg_setup() {
+	python_setup
+}
+
+src_prepare() {
+	# See Bug #593968
+	append-flags -fPIC
+
+	cmake-utils_src_prepare
+	# We cannot run tests because they require permissions to access
+	# the hardware, and building them is very time-consuming.
+	cmake_comment_add_subdirectory utests
+}
+
+multilib_src_configure() {
+	VENDOR_DIR="/usr/$(get_libdir)/OpenCL/vendors/${PN}"
+
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_PREFIX="${VENDOR_DIR}"
+		-DOCLICD_COMPAT=$(usex ocl-icd)
+		$(usex ocl20 "" "-DENABLE_OPENCL_20=OFF")
+	)
+
+	cmake-utils_src_configure
+}
+
+multilib_src_install() {
+	VENDOR_DIR="/usr/$(get_libdir)/OpenCL/vendors/${PN}"
+
+	cmake-utils_src_install
+
+	insinto /etc/OpenCL/vendors/
+	echo "${VENDOR_DIR}/lib/${PN}/libcl.so" > "${PN}-${ABI}.icd" || die "Failed to generate ICD file"
+	doins "${PN}-${ABI}.icd"
+
+	dosym "lib/${PN}/libcl.so" "${VENDOR_DIR}"/libOpenCL.so.1
+	dosym "lib/${PN}/libcl.so" "${VENDOR_DIR}"/libOpenCL.so
+	dosym "lib/${PN}/libcl.so" "${VENDOR_DIR}"/libcl.so.1
+	dosym "lib/${PN}/libcl.so" "${VENDOR_DIR}"/libcl.so
+}

[gentoo-commits] repo/gentoo:master commit in: dev-libs/beignet/

[Michał Górny]

commit:     ea6fbb845311361e653e392075793c00ed0c4ad3
Author:     David Hicks <david <AT> hicks <DOT> id <DOT> au>
AuthorDate: Mon Jul 31 13:24:03 2017 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Aug 17 17:04:54 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea6fbb84

dev-libs/beignet: use HTTPS for freedesktop.org

Package-Manager: Portage-2.3.6, Repoman-2.3.3

 dev-libs/beignet/beignet-1.3.1-r1.ebuild | 2 +-
 dev-libs/beignet/beignet-1.3.1.ebuild    | 2 +-
 dev-libs/beignet/beignet-9999.ebuild     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dev-libs/beignet/beignet-1.3.1-r1.ebuild b/dev-libs/beignet/beignet-1.3.1-r1.ebuild
index 4d382a1cbc3..577d1fc4882 100644
--- a/dev-libs/beignet/beignet-1.3.1-r1.ebuild
+++ b/dev-libs/beignet/beignet-1.3.1-r1.ebuild
@@ -17,7 +17,7 @@ IUSE="ocl-icd ocl20"
 
 if [[ "${PV}" == "9999" ]]; then
 	inherit git-r3
-	EGIT_REPO_URI="git://anongit.freedesktop.org/beignet"
+	EGIT_REPO_URI="https://anongit.freedesktop.org/git/beignet.git"
 	KEYWORDS=""
 else
 	KEYWORDS="~amd64"

diff --git a/dev-libs/beignet/beignet-1.3.1.ebuild b/dev-libs/beignet/beignet-1.3.1.ebuild
index 7048114ae44..75330cbd42b 100644
--- a/dev-libs/beignet/beignet-1.3.1.ebuild
+++ b/dev-libs/beignet/beignet-1.3.1.ebuild
@@ -17,7 +17,7 @@ IUSE="ocl-icd ocl20"
 
 if [[ "${PV}" == "9999" ]]; then
 	inherit git-r3
-	EGIT_REPO_URI="git://anongit.freedesktop.org/beignet"
+	EGIT_REPO_URI="https://anongit.freedesktop.org/git/beignet.git"
 	KEYWORDS="amd64"
 else
 	KEYWORDS="amd64"

diff --git a/dev-libs/beignet/beignet-9999.ebuild b/dev-libs/beignet/beignet-9999.ebuild
index 2f099737274..89862c1fc51 100644
--- a/dev-libs/beignet/beignet-9999.ebuild
+++ b/dev-libs/beignet/beignet-9999.ebuild
@@ -17,7 +17,7 @@ IUSE="ocl-icd ocl20"
 
 if [[ "${PV}" == "9999" ]]; then
 	inherit git-r3
-	EGIT_REPO_URI="git://anongit.freedesktop.org/beignet"
+	EGIT_REPO_URI="https://anongit.freedesktop.org/git/beignet.git"
 	KEYWORDS=""
 else
 	KEYWORDS="~amd64"

[gentoo-commits] repo/gentoo:master commit in: dev-libs/beignet/

[Marek Szuba]

commit:     d2e3cc38743ad37afe320b3cc079f598163a2f8b
Author:     Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 30 13:16:49 2017 +0000
Commit:     Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Fri Jun 30 13:19:06 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2e3cc38

dev-libs/beignet: fix typo in 0eafd4cd77602ccc5a1b0a487be6a2b47c402706

Package-Manager: Portage-2.3.6, Repoman-2.3.1

 dev-libs/beignet/beignet-1.3.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/beignet/beignet-1.3.1-r1.ebuild b/dev-libs/beignet/beignet-1.3.1-r1.ebuild
index 44c6896db12..4d382a1cbc3 100644
--- a/dev-libs/beignet/beignet-1.3.1-r1.ebuild
+++ b/dev-libs/beignet/beignet-1.3.1-r1.ebuild
@@ -81,7 +81,7 @@ multilib_src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_INSTALL_PREFIX="${VENDOR_DIR}"
 		-DOCLICD_COMPAT=$(usex ocl-icd)
-		$(usex ocl2 "" "-DENABLE_OPENCL_20=OFF")
+		$(usex ocl20 "" "-DENABLE_OPENCL_20=OFF")
 	)
 
 	cmake-utils_src_configure

[gentoo-commits] repo/gentoo:master commit in: dev-libs/beignet/

[Alexis Ballier]

commit:     eb896694cbfc4165e0d6e3d7b732930e20300f2b
Author:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 30 13:09:02 2017 +0000
Commit:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Fri Jun 30 13:09:02 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb896694

dev-libs/beignet: fix typo in useflag name

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 dev-libs/beignet/beignet-9999.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/beignet/beignet-9999.ebuild b/dev-libs/beignet/beignet-9999.ebuild
index 9e1ae6ff87f..2f099737274 100644
--- a/dev-libs/beignet/beignet-9999.ebuild
+++ b/dev-libs/beignet/beignet-9999.ebuild
@@ -80,7 +80,7 @@ multilib_src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_INSTALL_PREFIX="${VENDOR_DIR}"
 		-DOCLICD_COMPAT=$(usex ocl-icd)
-		$(usex ocl2 "" "-DENABLE_OPENCL_20=OFF")
+		$(usex ocl20 "" "-DENABLE_OPENCL_20=OFF")
 	)
 
 	cmake-utils_src_configure

[gentoo-commits] repo/gentoo:master commit in: dev-libs/beignet/

[Marek Szuba]

commit:     0eafd4cd77602ccc5a1b0a487be6a2b47c402706
Author:     Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 30 12:51:24 2017 +0000
Commit:     Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Fri Jun 30 12:57:19 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0eafd4cd

dev-libs/beignet: do not try enabling OpenCL 2.0 support on unsupported ABIs

Beignet CMake scripts handle this the right way so let's work with them instead
of against them. Now if USE=ocl20 it will get enabled for abi_x86_64 and
gracefully fall back to 1.2 for the others, whereas USE=-ocl20 still explicitly
disables it for all ABIs.

With many thanks to aballier.

Gentoo-Bug: 622964

Package-Manager: Portage-2.3.6, Repoman-2.3.1

 .../beignet/{beignet-9999.ebuild => beignet-1.3.1-r1.ebuild}  | 11 ++++++-----
 dev-libs/beignet/beignet-9999.ebuild                          |  2 +-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/dev-libs/beignet/beignet-9999.ebuild b/dev-libs/beignet/beignet-1.3.1-r1.ebuild
similarity index 91%
copy from dev-libs/beignet/beignet-9999.ebuild
copy to dev-libs/beignet/beignet-1.3.1-r1.ebuild
index e842fbc1517..44c6896db12 100644
--- a/dev-libs/beignet/beignet-9999.ebuild
+++ b/dev-libs/beignet/beignet-1.3.1-r1.ebuild
@@ -26,8 +26,9 @@ else
 fi
 
 COMMON="media-libs/mesa
-	sys-devel/clang:=
-	sys-devel/llvm:=
+	sys-devel/clang:0=
+	>=sys-devel/llvm-3.6:0=
+	ocl20? ( >=sys-devel/llvm-3.9:0= )
 	>=x11-libs/libdrm-2.4.70[video_cards_intel]
 	x11-libs/libXext
 	x11-libs/libXfixes"
@@ -39,8 +40,8 @@ DEPEND="${COMMON}
 	virtual/pkgconfig"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-1.4.0_no-debian-multiarch.patch
-	"${FILESDIR}"/${PN}-1.3.1-oclicd_no_upstream_icdfile.patch
+	"${FILESDIR}"/no-debian-multiarch.patch
+	"${FILESDIR}"/${P}-oclicd_no_upstream_icdfile.patch
 	"${FILESDIR}"/${PN}-1.2.0_no-hardcoded-cflags.patch
 	"${FILESDIR}"/llvm-terminfo.patch
 )
@@ -80,7 +81,7 @@ multilib_src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_INSTALL_PREFIX="${VENDOR_DIR}"
 		-DOCLICD_COMPAT=$(usex ocl-icd)
-		-DENABLE_OPENCL_20=$(usex ocl20)
+		$(usex ocl2 "" "-DENABLE_OPENCL_20=OFF")
 	)
 
 	cmake-utils_src_configure

diff --git a/dev-libs/beignet/beignet-9999.ebuild b/dev-libs/beignet/beignet-9999.ebuild
index e842fbc1517..9e1ae6ff87f 100644
--- a/dev-libs/beignet/beignet-9999.ebuild
+++ b/dev-libs/beignet/beignet-9999.ebuild
@@ -80,7 +80,7 @@ multilib_src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_INSTALL_PREFIX="${VENDOR_DIR}"
 		-DOCLICD_COMPAT=$(usex ocl-icd)
-		-DENABLE_OPENCL_20=$(usex ocl20)
+		$(usex ocl2 "" "-DENABLE_OPENCL_20=OFF")
 	)
 
 	cmake-utils_src_configure

[gentoo-commits] repo/gentoo:master commit in: dev-libs/beignet/

[Marek Szuba]

commit:     af5b6983ba1fe7eb15230460a2f0e553355a86d4
Author:     Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 14 08:18:14 2017 +0000
Commit:     Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Wed Jun 14 08:18:57 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af5b6983

dev-libs/beignet-9999: relaxed clang and LLVM slot requirements

Suggested-by: Craig Andrews <candrews <AT> integralblue.com>

Package-Manager: Portage-2.3.5, Repoman-2.3.1

 dev-libs/beignet/beignet-9999.ebuild | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/dev-libs/beignet/beignet-9999.ebuild b/dev-libs/beignet/beignet-9999.ebuild
index fee1267ce37..e842fbc1517 100644
--- a/dev-libs/beignet/beignet-9999.ebuild
+++ b/dev-libs/beignet/beignet-9999.ebuild
@@ -26,9 +26,8 @@ else
 fi
 
 COMMON="media-libs/mesa
-	sys-devel/clang:0=
-	>=sys-devel/llvm-3.6:0=
-	ocl20? ( >=sys-devel/llvm-3.9:0= )
+	sys-devel/clang:=
+	sys-devel/llvm:=
 	>=x11-libs/libdrm-2.4.70[video_cards_intel]
 	x11-libs/libXext
 	x11-libs/libXfixes"

[gentoo-commits] repo/gentoo:master commit in: dev-libs/beignet/

[Agostino Sarubbo]

commit:     719e987cd44e0a76cb1c437a534e96ec62a60830
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 14 07:48:35 2017 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Wed Jun 14 07:49:09 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=719e987c

dev-libs/beignet: amd64 stable wrt bug #621586

Package-Manager: Portage-2.3.5, Repoman-2.3.1
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 dev-libs/beignet/beignet-1.3.1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-libs/beignet/beignet-1.3.1.ebuild b/dev-libs/beignet/beignet-1.3.1.ebuild
index 3f619432cc6..7048114ae44 100644
--- a/dev-libs/beignet/beignet-1.3.1.ebuild
+++ b/dev-libs/beignet/beignet-1.3.1.ebuild
@@ -18,9 +18,9 @@ IUSE="ocl-icd ocl20"
 if [[ "${PV}" == "9999" ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="git://anongit.freedesktop.org/beignet"
-	KEYWORDS=""
+	KEYWORDS="amd64"
 else
-	KEYWORDS="~amd64"
+	KEYWORDS="amd64"
 	SRC_URI="https://01.org/sites/default/files/${P}-source.tar.gz"
 	S=${WORKDIR}/Beignet-${PV}-Source
 fi

[gentoo-commits] repo/gentoo:master commit in: dev-libs/beignet/

[Marek Szuba]

commit:     3199c3060b24c2f247fab8f2bf54affa3dd8aeed
Author:     Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 20 11:19:26 2017 +0000
Commit:     Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Thu Apr 20 11:24:33 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3199c306

dev-libs/beignet: do not enforce PYTHON_REQUIRED_USE

I was a bit overzealous, sorry. Should have been harmless though, seeing as at
a glance python-any-r1.eclass doesn't actually export PYTHON_REQUIRED_USE.

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 dev-libs/beignet/beignet-1.2.1-r1.ebuild | 1 -
 dev-libs/beignet/beignet-1.3.0.ebuild    | 1 -
 dev-libs/beignet/beignet-1.3.1.ebuild    | 1 -
 3 files changed, 3 deletions(-)

diff --git a/dev-libs/beignet/beignet-1.2.1-r1.ebuild b/dev-libs/beignet/beignet-1.2.1-r1.ebuild
index 032b14cc865..2bc05baf071 100644
--- a/dev-libs/beignet/beignet-1.2.1-r1.ebuild
+++ b/dev-libs/beignet/beignet-1.2.1-r1.ebuild
@@ -37,7 +37,6 @@ DEPEND="${COMMON}
 	${PYTHON_DEPS}
 	ocl-icd? ( dev-libs/ocl-icd )
 	virtual/pkgconfig"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 PATCHES=(
 	"${FILESDIR}"/no-debian-multiarch.patch

diff --git a/dev-libs/beignet/beignet-1.3.0.ebuild b/dev-libs/beignet/beignet-1.3.0.ebuild
index 271e1adfc92..1eb9bb857ca 100644
--- a/dev-libs/beignet/beignet-1.3.0.ebuild
+++ b/dev-libs/beignet/beignet-1.3.0.ebuild
@@ -38,7 +38,6 @@ DEPEND="${COMMON}
 	${PYTHON_DEPS}
 	ocl-icd? ( dev-libs/ocl-icd )
 	virtual/pkgconfig"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 PATCHES=(
 	"${FILESDIR}"/no-debian-multiarch.patch

diff --git a/dev-libs/beignet/beignet-1.3.1.ebuild b/dev-libs/beignet/beignet-1.3.1.ebuild
index e00395490f9..3f619432cc6 100644
--- a/dev-libs/beignet/beignet-1.3.1.ebuild
+++ b/dev-libs/beignet/beignet-1.3.1.ebuild
@@ -38,7 +38,6 @@ DEPEND="${COMMON}
 	${PYTHON_DEPS}
 	ocl-icd? ( dev-libs/ocl-icd )
 	virtual/pkgconfig"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 PATCHES=(
 	"${FILESDIR}"/no-debian-multiarch.patch

[gentoo-commits] repo/gentoo:master commit in: dev-libs/beignet/

[Marek Szuba]

commit:     9fbf5c84592d0e61d7418a13da451b446e787dbb
Author:     Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 20 10:29:55 2017 +0000
Commit:     Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Thu Apr 20 10:33:08 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9fbf5c84

dev-libs/beignet: fix Python dependencies

Remove PYTHON_DEPS from RDEPEND (it was a typo anyway, as attested to by the
fact it was mentioned in both COMMON and DEPEND), and enforce
PYTHON_REQUIRED_USE.

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 dev-libs/beignet/beignet-1.2.1-r1.ebuild | 4 ++--
 dev-libs/beignet/beignet-1.3.0.ebuild    | 4 ++--
 dev-libs/beignet/beignet-1.3.1.ebuild    | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/dev-libs/beignet/beignet-1.2.1-r1.ebuild b/dev-libs/beignet/beignet-1.2.1-r1.ebuild
index 4b6c319b75f..032b14cc865 100644
--- a/dev-libs/beignet/beignet-1.2.1-r1.ebuild
+++ b/dev-libs/beignet/beignet-1.2.1-r1.ebuild
@@ -25,8 +25,7 @@ else
 	S=${WORKDIR}/Beignet-${PV}-Source
 fi
 
-COMMON="${PYTHON_DEPS}
-	media-libs/mesa
+COMMON="media-libs/mesa
 	sys-devel/clang:0
 	>=sys-devel/llvm-3.5:0
 	>=x11-libs/libdrm-2.4.70[video_cards_intel]
@@ -38,6 +37,7 @@ DEPEND="${COMMON}
 	${PYTHON_DEPS}
 	ocl-icd? ( dev-libs/ocl-icd )
 	virtual/pkgconfig"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 PATCHES=(
 	"${FILESDIR}"/no-debian-multiarch.patch

diff --git a/dev-libs/beignet/beignet-1.3.0.ebuild b/dev-libs/beignet/beignet-1.3.0.ebuild
index ab41a5c6ca6..271e1adfc92 100644
--- a/dev-libs/beignet/beignet-1.3.0.ebuild
+++ b/dev-libs/beignet/beignet-1.3.0.ebuild
@@ -25,8 +25,7 @@ else
 	S=${WORKDIR}/Beignet-${PV}-Source
 fi
 
-COMMON="${PYTHON_DEPS}
-	media-libs/mesa
+COMMON="media-libs/mesa
 	sys-devel/clang:0=
 	>=sys-devel/llvm-3.6:0=
 	ocl20? ( >=sys-devel/llvm-3.9:0= )
@@ -39,6 +38,7 @@ DEPEND="${COMMON}
 	${PYTHON_DEPS}
 	ocl-icd? ( dev-libs/ocl-icd )
 	virtual/pkgconfig"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 PATCHES=(
 	"${FILESDIR}"/no-debian-multiarch.patch

diff --git a/dev-libs/beignet/beignet-1.3.1.ebuild b/dev-libs/beignet/beignet-1.3.1.ebuild
index c49c57c7136..e00395490f9 100644
--- a/dev-libs/beignet/beignet-1.3.1.ebuild
+++ b/dev-libs/beignet/beignet-1.3.1.ebuild
@@ -25,8 +25,7 @@ else
 	S=${WORKDIR}/Beignet-${PV}-Source
 fi
 
-COMMON="${PYTHON_DEPS}
-	media-libs/mesa
+COMMON="media-libs/mesa
 	sys-devel/clang:0=
 	>=sys-devel/llvm-3.6:0=
 	ocl20? ( >=sys-devel/llvm-3.9:0= )
@@ -39,6 +38,7 @@ DEPEND="${COMMON}
 	${PYTHON_DEPS}
 	ocl-icd? ( dev-libs/ocl-icd )
 	virtual/pkgconfig"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 PATCHES=(
 	"${FILESDIR}"/no-debian-multiarch.patch

[gentoo-commits] repo/gentoo:master commit in: dev-libs/beignet/

[Marek Szuba]

commit:     e73da7b608b08a6b8b1a39473783928668c3f612
Author:     Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 20 12:42:14 2017 +0000
Commit:     Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Mon Mar 20 12:43:54 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e73da7b6

dev-libs/beignet: more sys-devel/llvm dependency tweaks

Restore the ability for users not interested in OpenCL 2.0 support to link
against stable sys-devel/llvm. Hopefully now LLVM dependencies are what they
were supposed to be all along.

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 dev-libs/beignet/beignet-1.3.0.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dev-libs/beignet/beignet-1.3.0.ebuild b/dev-libs/beignet/beignet-1.3.0.ebuild
index 88d26286040..ab41a5c6ca6 100644
--- a/dev-libs/beignet/beignet-1.3.0.ebuild
+++ b/dev-libs/beignet/beignet-1.3.0.ebuild
@@ -28,7 +28,8 @@ fi
 COMMON="${PYTHON_DEPS}
 	media-libs/mesa
 	sys-devel/clang:0=
-	>=sys-devel/llvm-3.9:0=
+	>=sys-devel/llvm-3.6:0=
+	ocl20? ( >=sys-devel/llvm-3.9:0= )
 	>=x11-libs/libdrm-2.4.70[video_cards_intel]
 	x11-libs/libXext
 	x11-libs/libXfixes"

[gentoo-commits] repo/gentoo:master commit in: dev-libs/beignet/

[Justin Lecher]

commit:     f23998b0e137dbdf718c7d7d6164d808fb3cd374
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 19 10:35:57 2017 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sun Mar 19 10:36:02 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f23998b0

dev-libs/beignet: Always depend sys-devel/llvm:0

Package-Manager: Portage-2.3.5, Repoman-2.3.2
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>

 dev-libs/beignet/beignet-1.3.0.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-libs/beignet/beignet-1.3.0.ebuild b/dev-libs/beignet/beignet-1.3.0.ebuild
index 546020aab17..88d26286040 100644
--- a/dev-libs/beignet/beignet-1.3.0.ebuild
+++ b/dev-libs/beignet/beignet-1.3.0.ebuild
@@ -27,8 +27,8 @@ fi
 
 COMMON="${PYTHON_DEPS}
 	media-libs/mesa
-	sys-devel/clang:0
-	ocl20? ( >=sys-devel/llvm-3.9:0  >=sys-devel/llvm-3.6:0 )
+	sys-devel/clang:0=
+	>=sys-devel/llvm-3.9:0=
 	>=x11-libs/libdrm-2.4.70[video_cards_intel]
 	x11-libs/libXext
 	x11-libs/libXfixes"

[gentoo-commits] repo/gentoo:master commit in: dev-libs/beignet/

[Marek Szuba]

commit:     56aa01b1e4c0f1ee4c5ec7376fd9f986e8eaf5f4
Author:     Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 10 09:48:34 2016 +0000
Commit:     Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Thu Nov 10 14:27:53 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=56aa01b1

dev-libs/beignet: version bump to 1.2.1

Among other things, this version adds support for LLVM-3.9.

Provided-By: Russell Knighton <russell <AT> annunaki2k2.co.uk>
Gentoo-Bug: 598236

Package-Manager: portage-2.3.2

 dev-libs/beignet/Manifest             |  1 +
 dev-libs/beignet/beignet-1.2.1.ebuild | 99 +++++++++++++++++++++++++++++++++++
 2 files changed, 100 insertions(+)

diff --git a/dev-libs/beignet/Manifest b/dev-libs/beignet/Manifest
index 556d880..a004d8b 100644
--- a/dev-libs/beignet/Manifest
+++ b/dev-libs/beignet/Manifest
@@ -1,2 +1,3 @@
 DIST beignet-1.1.2-source.tar.gz 948241 SHA256 6a8d875afbb5e3c4fc57da1ea80f79abadd9136bfd87ab1f83c02784659f1d96 SHA512 25b7118976c385ad3b9db01afd3c9494ff9d050d44ee4266042abb4215747d8bb5086c06697f754956f562ea2b6e5ec51d51bbd651e8cd7cd0eb14eb8c83fbd4 WHIRLPOOL c3bfb7f4fa3c97bbd202ace868a08dce48753cac547b075e4c30cfff21cffcc5520ef4ef77b4e15fa8574a798f41a920e44503a160a1888e9ee4f2a737b37e82
 DIST beignet-1.2.0-source.tar.gz 1076674 SHA256 fc7af19efb7596b04510d26c558a576eba3e95e1ef86fd6951213c6a4bf58bff SHA512 f6c0de7d6a301352125d53c843d8c4a9728526b06b215093424720e7c17eb99f8cfc4b70c61e035d5cb36ca7666c6e772fe0d7818d91421104fa1ed350d637f1 WHIRLPOOL 9ac0195b16ff0ed186dbc5e0bfb6ee3027d0426d7e2401238b69b934a010d365eb6941cd80e3650e600cbcac8d31f819e2adb67452394b07a903aad72c1e11d7
+DIST beignet-1.2.1-source.tar.gz 1080590 SHA256 b74eb03534a12b86a896cdbd8209b072c8a38e7af456195793a498428a7ac81f SHA512 f0d0d0590be1624928d9ee1a0666f49d908eff1ee9c1a7a28c4e680523419e544f607899bcfdae7f4ce5d32d411739afb481c0c22383db4a7381ccc71326e7f2 WHIRLPOOL 74bb72220e865406100a232fd8755b37746acf3616adbc7c66389a7a7ef3d7ca959ea1234d167091161019c1c3fc0fb9b877fc70af695bd2d2bb232c83725322

diff --git a/dev-libs/beignet/beignet-1.2.1.ebuild b/dev-libs/beignet/beignet-1.2.1.ebuild
new file mode 100644
index 00000000..e675f6b
--- /dev/null
+++ b/dev-libs/beignet/beignet-1.2.1.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+CMAKE_BUILD_TYPE="Release"
+
+inherit python-any-r1 cmake-multilib flag-o-matic toolchain-funcs
+
+DESCRIPTION="OpenCL implementation for Intel GPUs"
+HOMEPAGE="https://01.org/beignet"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="git://anongit.freedesktop.org/beignet"
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+	SRC_URI="https://01.org/sites/default/files/${P}-source.tar.gz"
+	S=${WORKDIR}/Beignet-${PV}-Source
+fi
+
+COMMON="${PYTHON_DEPS}
+	media-libs/mesa
+	sys-devel/clang
+	>=sys-devel/llvm-3.5
+	>=x11-libs/libdrm-2.4.70[video_cards_intel]
+	x11-libs/libXext
+	x11-libs/libXfixes"
+RDEPEND="${COMMON}
+	app-eselect/eselect-opencl"
+DEPEND="${COMMON}
+	${PYTHON_DEPS}
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/no-debian-multiarch.patch
+	"${FILESDIR}"/${PN}-1.2.0_no-hardcoded-cflags.patch
+	"${FILESDIR}"/llvm-terminfo.patch
+)
+
+DOCS=(
+	docs/.
+)
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != "binary" ]]; then
+		if tc-is-gcc; then
+			if [[ $(gcc-major-version) -eq 4 ]] && [[ $(gcc-minor-version) -lt 6 ]]; then
+				eerror "Compilation with gcc older than 4.6 is not supported"
+				die "Too old gcc found."
+			fi
+		fi
+	fi
+}
+
+pkg_setup() {
+	python_setup
+}
+
+src_prepare() {
+	# See Bug #593968
+	append-flags -fPIC
+
+	cmake-utils_src_prepare
+	# We cannot run tests because they require permissions to access
+	# the hardware, and building them is very time-consuming.
+	cmake_comment_add_subdirectory utests
+}
+
+multilib_src_configure() {
+	VENDOR_DIR="/usr/$(get_libdir)/OpenCL/vendors/${PN}"
+
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_PREFIX="${VENDOR_DIR}"
+	)
+
+	cmake-utils_src_configure
+}
+
+multilib_src_install() {
+	VENDOR_DIR="/usr/$(get_libdir)/OpenCL/vendors/${PN}"
+
+	cmake-utils_src_install
+
+	insinto /etc/OpenCL/vendors/
+	echo "${VENDOR_DIR}/lib/${PN}/libcl.so" > "${PN}-${ABI}.icd" || die "Failed to generate ICD file"
+	doins "${PN}-${ABI}.icd"
+
+	dosym "lib/${PN}/libcl.so" "${VENDOR_DIR}"/libOpenCL.so.1
+	dosym "lib/${PN}/libcl.so" "${VENDOR_DIR}"/libOpenCL.so
+	dosym "lib/${PN}/libcl.so" "${VENDOR_DIR}"/libcl.so.1
+	dosym "lib/${PN}/libcl.so" "${VENDOR_DIR}"/libcl.so
+}

[gentoo-commits] repo/gentoo:master commit in: dev-libs/beignet/

[Marek Szuba]

commit:     8d39ee29f5508cab34621fd0b1667b7ab904f320
Author:     Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Fri Oct  7 07:23:51 2016 +0000
Commit:     Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Fri Oct  7 07:23:51 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d39ee29

dev-libs/beignet: require <x11-libs/libdrm-2.4.71

Beignet releases presently do not compile against newer libdrm versions, see
the upstream bug https://bugs.freedesktop.org/show_bug.cgi?id=98090 .

Gentoo-Bug: 596266

Package-Manager: portage-2.3.1

 dev-libs/beignet/beignet-1.1.2.ebuild | 2 +-
 dev-libs/beignet/beignet-1.2.0.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-libs/beignet/beignet-1.1.2.ebuild b/dev-libs/beignet/beignet-1.1.2.ebuild
index 2ec9a1f..6a46dba 100644
--- a/dev-libs/beignet/beignet-1.1.2.ebuild
+++ b/dev-libs/beignet/beignet-1.1.2.ebuild
@@ -30,7 +30,7 @@ COMMON="${PYTHON_DEPS}
 	sys-devel/clang
 	>=sys-devel/llvm-3.5
 	<sys-devel/llvm-3.8
-	x11-libs/libdrm[video_cards_intel]
+	<x11-libs/libdrm-2.4.71[video_cards_intel]
 	x11-libs/libXext
 	x11-libs/libXfixes"
 RDEPEND="${COMMON}

diff --git a/dev-libs/beignet/beignet-1.2.0.ebuild b/dev-libs/beignet/beignet-1.2.0.ebuild
index ac2bb7d..929b794 100644
--- a/dev-libs/beignet/beignet-1.2.0.ebuild
+++ b/dev-libs/beignet/beignet-1.2.0.ebuild
@@ -30,7 +30,7 @@ COMMON="${PYTHON_DEPS}
 	sys-devel/clang
 	>=sys-devel/llvm-3.5
 	<sys-devel/llvm-3.9
-	x11-libs/libdrm[video_cards_intel]
+	<x11-libs/libdrm-2.4.71[video_cards_intel]
 	x11-libs/libXext
 	x11-libs/libXfixes"
 RDEPEND="${COMMON}

[gentoo-commits] repo/gentoo:master commit in: dev-libs/beignet/

[Marek Szuba]

commit:     84edfbb360a37db0b0837896e5cb738c02e1f64f
Author:     Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 19 11:59:28 2016 +0000
Commit:     Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Mon Sep 19 12:00:19 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84edfbb3

dev-libs/beignet: fix linking of 1.2.0 against LLVM-3.8

Without adding -fPIC to compiler flags one the temporary executables invoked at
build time segfaults.

Gentoo-Bug: 593968

Package-Manager: portage-2.3.1

 dev-libs/beignet/beignet-1.2.0.ebuild | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/dev-libs/beignet/beignet-1.2.0.ebuild b/dev-libs/beignet/beignet-1.2.0.ebuild
index 0e6c87b..ac2bb7d 100644
--- a/dev-libs/beignet/beignet-1.2.0.ebuild
+++ b/dev-libs/beignet/beignet-1.2.0.ebuild
@@ -7,7 +7,7 @@ EAPI=6
 PYTHON_COMPAT=( python2_7 )
 CMAKE_BUILD_TYPE="Release"
 
-inherit python-any-r1 cmake-multilib toolchain-funcs
+inherit python-any-r1 cmake-multilib flag-o-matic toolchain-funcs
 
 DESCRIPTION="OpenCL implementation for Intel GPUs"
 HOMEPAGE="https://01.org/beignet"
@@ -25,12 +25,11 @@ else
 	S=${WORKDIR}/Beignet-${PV}-Source
 fi
 
-# Should support <sys-devel/llvm-3.9 but see Bug #593968
 COMMON="${PYTHON_DEPS}
 	media-libs/mesa
 	sys-devel/clang
 	>=sys-devel/llvm-3.5
-	<sys-devel/llvm-3.8
+	<sys-devel/llvm-3.9
 	x11-libs/libdrm[video_cards_intel]
 	x11-libs/libXext
 	x11-libs/libXfixes"
@@ -66,6 +65,9 @@ pkg_setup() {
 }
 
 src_prepare() {
+	# See Bug #593968
+	append-flags -fPIC
+
 	cmake-utils_src_prepare
 	# We cannot run tests because they require permissions to access
 	# the hardware, and building them is very time-consuming.

[gentoo-commits] repo/gentoo:master commit in: dev-libs/beignet/

[Marek Szuba]

commit:     2555420e8f768dc730b1bf0d2f3620484489f864
Author:     Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 19 10:33:19 2016 +0000
Commit:     Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Mon Sep 19 10:40:02 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2555420e

dev-libs/beignet: 1.1.2 requires <sys-devel/llvm-3.8

Newer versions are not supported by upstream.

Package-Manager: portage-2.3.1

 dev-libs/beignet/beignet-1.1.2.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dev-libs/beignet/beignet-1.1.2.ebuild b/dev-libs/beignet/beignet-1.1.2.ebuild
index 8d42db8..2ec9a1f 100644
--- a/dev-libs/beignet/beignet-1.1.2.ebuild
+++ b/dev-libs/beignet/beignet-1.1.2.ebuild
@@ -29,6 +29,7 @@ COMMON="${PYTHON_DEPS}
 	media-libs/mesa
 	sys-devel/clang
 	>=sys-devel/llvm-3.5
+	<sys-devel/llvm-3.8
 	x11-libs/libdrm[video_cards_intel]
 	x11-libs/libXext
 	x11-libs/libXfixes"

[gentoo-commits] repo/gentoo:master commit in: dev-libs/beignet/

[Marek Szuba]

commit:     0ce9ec9486aaea994fd4a069d9c928c61f05e0a0
Author:     Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 19 10:38:01 2016 +0000
Commit:     Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Mon Sep 19 10:40:02 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ce9ec94

dev-libs/beignet: 1.2.0 requires <sys-devel/llvm-3.8

According to upstream llvm-3.8 should be supported, however using that version
causes compile-time segmentation faults.

Gentoo-Bug: 593968

Package-Manager: portage-2.3.1

 dev-libs/beignet/beignet-1.2.0.ebuild | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/dev-libs/beignet/beignet-1.2.0.ebuild b/dev-libs/beignet/beignet-1.2.0.ebuild
index 0814fe1..0e6c87b 100644
--- a/dev-libs/beignet/beignet-1.2.0.ebuild
+++ b/dev-libs/beignet/beignet-1.2.0.ebuild
@@ -25,10 +25,12 @@ else
 	S=${WORKDIR}/Beignet-${PV}-Source
 fi
 
+# Should support <sys-devel/llvm-3.9 but see Bug #593968
 COMMON="${PYTHON_DEPS}
 	media-libs/mesa
 	sys-devel/clang
 	>=sys-devel/llvm-3.5
+	<sys-devel/llvm-3.8
 	x11-libs/libdrm[video_cards_intel]
 	x11-libs/libXext
 	x11-libs/libXfixes"

[gentoo-commits] repo/gentoo:master commit in: dev-libs/beignet/

[Marek Szuba]

commit:     329d9112649233d7fa6b61efc8af7c7ac023703f
Author:     Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Fri Sep  2 08:48:54 2016 +0000
Commit:     Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Fri Sep  2 08:49:23 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=329d9112

dev-libs/beignet: a few additional build-time tweaks

! add the die clause to ICD-file generation using echo
* use tc-is-gcc instead of parsing tc-getCC ourselves
* explicitly inherit toolchain-funcs
* no real need to rename the source tarball

Package-Manager: portage-2.3.0

 dev-libs/beignet/Manifest             | 2 +-
 dev-libs/beignet/beignet-1.1.2.ebuild | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/dev-libs/beignet/Manifest b/dev-libs/beignet/Manifest
index b8b6ac7..4590316 100644
--- a/dev-libs/beignet/Manifest
+++ b/dev-libs/beignet/Manifest
@@ -1 +1 @@
-DIST beignet-1.1.2.tar.gz 948241 SHA256 6a8d875afbb5e3c4fc57da1ea80f79abadd9136bfd87ab1f83c02784659f1d96 SHA512 25b7118976c385ad3b9db01afd3c9494ff9d050d44ee4266042abb4215747d8bb5086c06697f754956f562ea2b6e5ec51d51bbd651e8cd7cd0eb14eb8c83fbd4 WHIRLPOOL c3bfb7f4fa3c97bbd202ace868a08dce48753cac547b075e4c30cfff21cffcc5520ef4ef77b4e15fa8574a798f41a920e44503a160a1888e9ee4f2a737b37e82
+DIST beignet-1.1.2-source.tar.gz 948241 SHA256 6a8d875afbb5e3c4fc57da1ea80f79abadd9136bfd87ab1f83c02784659f1d96 SHA512 25b7118976c385ad3b9db01afd3c9494ff9d050d44ee4266042abb4215747d8bb5086c06697f754956f562ea2b6e5ec51d51bbd651e8cd7cd0eb14eb8c83fbd4 WHIRLPOOL c3bfb7f4fa3c97bbd202ace868a08dce48753cac547b075e4c30cfff21cffcc5520ef4ef77b4e15fa8574a798f41a920e44503a160a1888e9ee4f2a737b37e82

diff --git a/dev-libs/beignet/beignet-1.1.2.ebuild b/dev-libs/beignet/beignet-1.1.2.ebuild
index 2591bc8..8d42db8 100644
--- a/dev-libs/beignet/beignet-1.1.2.ebuild
+++ b/dev-libs/beignet/beignet-1.1.2.ebuild
@@ -7,7 +7,7 @@ EAPI=6
 PYTHON_COMPAT=( python2_7 )
 CMAKE_BUILD_TYPE="Release"
 
-inherit python-any-r1 cmake-multilib
+inherit python-any-r1 cmake-multilib toolchain-funcs
 
 DESCRIPTION="OpenCL implementation for Intel GPUs"
 HOMEPAGE="https://01.org/beignet"
@@ -21,7 +21,7 @@ if [[ "${PV}" == "9999" ]]; then
 	KEYWORDS=""
 else
 	KEYWORDS="~amd64"
-	SRC_URI="https://01.org/sites/default/files/${P}-source.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://01.org/sites/default/files/${P}-source.tar.gz"
 	S=${WORKDIR}/Beignet-${PV}-Source
 fi
 
@@ -50,7 +50,7 @@ DOCS=(
 
 pkg_pretend() {
 	if [[ ${MERGE_TYPE} != "binary" ]]; then
-		if [[ $(tc-getCC) == *gcc* ]] ; then
+		if tc-is-gcc; then
 			if [[ $(gcc-major-version) -eq 4 ]] && [[ $(gcc-minor-version) -lt 6 ]]; then
 				eerror "Compilation with gcc older than 4.6 is not supported"
 				die "Too old gcc found."
@@ -86,7 +86,7 @@ multilib_src_install() {
 	cmake-utils_src_install
 
 	insinto /etc/OpenCL/vendors/
-	echo "${VENDOR_DIR}/lib/${PN}/libcl.so" > "${PN}-${ABI}.icd"
+	echo "${VENDOR_DIR}/lib/${PN}/libcl.so" > "${PN}-${ABI}.icd" || die "Failed to generate ICD file"
 	doins "${PN}-${ABI}.icd"
 
 	dosym "lib/${PN}/libcl.so" "${VENDOR_DIR}"/libOpenCL.so.1