gentoo resync : 10.11.2017

2 files changed, 104 insertions, 0 deletions

diff --git a/dev-libs/beignet/Manifest b/dev-libs/beignet/Manifest
index 3edcaaf92581..91b9b8492ecc 100644
--- a/dev-libs/beignet/Manifest
+++ b/dev-libs/beignet/Manifest
@@ -5,8 +5,10 @@ AUX beignet-1.4.0_no-debian-multiarch.patch 862 SHA256 6e30f41b74c24055e97c16683
 AUX llvm-terminfo.patch 788 SHA256 9d39944dc7f3735cb4fe8b4b53ee7c83ee3dbb3c07028ac3187208343a1483b7 SHA512 63706376f086b02be067ab54e818afab55cddb34668bc67c2c3f546142e4ca50f5536be4c15f359b3c1c6f62f36b90b3e76d67095d4bba452cf5b5a2c8891312 WHIRLPOOL 5d02ba52559f8fb996ade5268e213002cc879c03d9e7183f28a2baed360016b8004240d2402bf70fd1143260044c1efc4d76bb32d993b5e59c0a4143db635a48
 AUX no-debian-multiarch.patch 1652 SHA256 0a8d2ed67c3d1d5d56bcf4a5628dff59427f86d1eb9ff3d5fd964828178e7867 SHA512 c77dd485d22e61e558f002a18103bd8dd8091ac51e702335e8713fe7f8fef24e44607744165cf0997e10941b1044d96a4876f251e8e32ffd82781e5c303f0383 WHIRLPOOL fadcd4e0095228ac1c5771ec13f0208143438a9cebf3e7cd259dcee8cdfe6352238757bb9f20127343cf8bba35f4ce000fe00a3a8926e478b6601ed393a903b3
 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
 EBUILD beignet-1.3.1-r1.ebuild 2473 SHA256 1c0aed3aa482f78e7f8167384fe62edb113add2c6c6a5e8d9d461f6ee2e8e74e SHA512 f3449b8fd6a3b0df42cb22c7dcd97948d1f73710155ce1723e1db19a1f08853c8734b86a57b51c36e1d74713d026105f3d2c6974083de69acd971e589da19148 WHIRLPOOL 9e5e8355ed2fea0b96eb21b56e0a429dbb28a9afb71008d137a61c199b67f2906a01981cfe8cccbb65e6de76ccfb09505309f4a3e9f1229bcd46899d8f46fe0d
 EBUILD beignet-1.3.1.ebuild 2468 SHA256 8cb06cfe8df76d1d734b6548e5d6186ed360581087ed924d8220008bae66559d SHA512 b722fbda796b6776e263b1ed7b09db5e305fff4fa15a0257add357c5f03e8368ec7d3b4eae467a3282d33db71b4a4062e1081bf78779a3ee8ff21a62dbb6ca3c WHIRLPOOL d44e8205adedb09ff458f2b52fb224a9ccd16487e994c35527633727c7fda5c6935deb5719d5e0f5f0cd39984131598ca3e695ab5f8652b20d529fa3ab919053
+EBUILD beignet-1.3.2.ebuild 2436 SHA256 cf87de3f39663d66f48b7c3d6611285ed53d8e8eca627b9e2d2a750d50817426 SHA512 7a883e250b12a816795c74718e3cbf0866453022bfa4779da29475574f15ad730e394048c42825991140ceeb9e990cfffdab569ec9d6518cfcf2742b85aaf934 WHIRLPOOL 552da5bb53adb028abce411068564059582ee7fc01c136353e1d8e67addbc8fd5707bda2bce0213cb01b85aeea0bd50048bb410367f78e4f6963b98214cad335
 EBUILD beignet-9999.ebuild 2448 SHA256 5e2a108e22f7f04bb95e8c97395f70ee65b0953a8a8d06aa09402a5a0aa63aa3 SHA512 32dfb4b910f7bd7d7f1ccddd64b452850c8cd63f9e15f08a1ae2f747ae1c0986dbbfba0be8d6c4b2a08a3f3a24b6ee8fc04c0b02c45281674fe17114a1ef7b11 WHIRLPOOL 2c5faf380f6a5bfdc15b312880afc031fd02c00cd0d5ce942a6b50a99824eed7e588283889e0670be5383843ba5400ec9f89126203268755612ae3581d1afb23
 MISC ChangeLog 4183 SHA256 e29f1e3108d9f3e7570012e1021abbb5c4578b82dd518d03e047cb71c72b87e7 SHA512 1b1364b2021a9d487f30c2486aef075bb5017bb3253d5c5ce33465c912922780c7b63ab208047f54dab14a8181e6c23e44586ced43687bf7f816f745a89d0803 WHIRLPOOL 33297ecde33b42288d62b0fa1ef376b19acab8811c894248ad42134d1093c80f4eb6aabd0cc1107ca6d3a73a5c3f2a9698d8e5bb55e4831f05f950314a969b64
 MISC metadata.xml 473 SHA256 301acbf6b63c787197de626deb9f2c4a482351ed195cb95568abf6e330abe5d7 SHA512 79c6f3d28b6c15b05616af2b5224f7b6e79642ae6e6b3579ac510c0935f288940d015258b1c2d07820fcbdca117eca66f25a5a4dc7df3af92c771e9ff9243186 WHIRLPOOL d3c585f2651b84b47400eebd62d31e82f09d200815070d02c81e40cf21810d4e032c8373d0e60322a7191b5d865ad99096fd89f17c351222ce974da8122af50e
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 000000000000..9b6fbba591aa
--- /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
+}