gentoo resync : 18.08.2019

4 files changed, 101 insertions, 8 deletions

diff --git a/dev-libs/amdgpu-pro-opencl/Manifest b/dev-libs/amdgpu-pro-opencl/Manifest
index 33addf149d86..8d660b9cc8a5 100644
--- a/dev-libs/amdgpu-pro-opencl/Manifest
+++ b/dev-libs/amdgpu-pro-opencl/Manifest
@@ -1,6 +1,8 @@
 DIST amdgpu-pro-18.20-684755-ubuntu-16.04.tar.xz 229474380 BLAKE2B f589aad71f093b74e37de40ac7c45ebbbeff93609b2fff1baaba711347a4641ef17acdcbe69d371372510a48bd48262cf6269c1f4d05e264023d52a425a423f2 SHA512 240e701acfde4ebe665cf69c8bd3710d036f450822aeb7ee2a21caab289af44167afda1d3b8d0dbe2c46c4e63d9b6fb5e96778311f342c26f334dc7beb4a2d5b
 DIST amdgpu-pro-19.10-785425-ubuntu-18.04.tar.xz 243520380 BLAKE2B 8c775feaff685b18b6df2f6f17667dbadb3da89f58c823f5470113342b585ecb436fbacef6ba26b35fe05bac53530cfe334d79d933afee303651e1375654da85 SHA512 d9c214134bf220c2ab4a306f5d83ce5718adc1f3e93165c724e70b99b4b5bcd8e703299ed70fe79f1d2db5f4f69cae2e1036b5a6238696346710c88f7fa6b3c6
+DIST amdgpu-pro-19.30-838629-ubuntu-18.04.tar.xz 301833044 BLAKE2B ffdd49be431906c5ba20e9b285b44e368b40a70678177412d2329489c987567612f5262b64a9a1aef137cef603f77f768127d674c13488e13dddbc8732cf729c SHA512 7e8091dd37ae176d1ff131e5e2b13961f5a33fc7243052dce074dffb1468476f267d50a920182358188e44f4a93d0cbf39c5d430d56a9a2e09a67409e3478904
 EBUILD amdgpu-pro-opencl-18.20.684755.ebuild 2332 BLAKE2B 20a692a7666997d60c1a2f4ad0f431d016a7a0a75f0f9c898603793d5c481fb662f002f5875e0435f75bbd94b5072f6a30b884eb4e797c64b29681dac35ae69c SHA512 acb6b04711b83787b394fc2ef6b6621ae7e45d67359d4ed6ae39826704660874170babedc15b6e4d69f3bbddb0ce4ba405e7b15ae633fbdf423dfc7358b65a40
-EBUILD amdgpu-pro-opencl-19.10.785425-r1.ebuild 2990 BLAKE2B bee18c16420fd0f4dbed8578fc3330ba97a047bfed6e047c8b9ec44756bb759773efd3a51079bdb86b8cef867ba37a02febe83d8b2ed41fbea5bac3cfea3389e SHA512 12f0a9ab897fd5190d7d55f33e0ec85ea817fedcd339c1df9017bbc37a0e98a6002e9ae6bafe079f678bd81567dd229d8d2aa2f626063b2967186761dae3ac4f
-EBUILD amdgpu-pro-opencl-19.10.785425.ebuild 2945 BLAKE2B e726f111998e748151e074f0b2810cf9bf1c67de2087f63c8c54d216ce3aa15aa600ef3bd0f892349bb4e801062b1da3a06573dbfc03b3f84f082863836c9392 SHA512 32589484e64b9083446768aadbb1d79694c53511a1bc6b2c7de2ea54e3c63005f25d20d4a338f2963604b80e35a66be5a6ce21d172884bdcf65b6af1954e2b7a
+EBUILD amdgpu-pro-opencl-19.10.785425-r1.ebuild 2936 BLAKE2B ca7616f25c0b4ee2b132837bfc5b291338ab9201bfe2037d935821baf0841229ed962af3a5f014ee5d99bfbab1253e09bdc34ea76d25f3e34d9d2218eac0b554 SHA512 732074140878ccd2631182b2f1c5ae4b611d979cddbdc51d90088c775cbd4396c459f4c397354d8fed8730dcae4e6a739333cbf3790caf243bbc628d9fde02e3
+EBUILD amdgpu-pro-opencl-19.10.785425.ebuild 2891 BLAKE2B 7bb17e22e4e2522cab4c2469a785c93cbb947bb4906911db7a86f93aa8135f9d0e6a1a313359b4b1d40b8cb34c12f52612dbb4797ec1f10fe4215099d67a9268 SHA512 53a1f95a1d39541a5ebae9795c35b7e38bd1b15f74c0d9d29436c69b1a0084ab290a06ce702b239bc36bf370f3e49afb07df4dc4c38594e522356e74f368afda
+EBUILD amdgpu-pro-opencl-19.30.838629.ebuild 2940 BLAKE2B 77d5668ce9be3f4cf98d5a61f32a748fd1907b7f34e58e77721a124b5feafcebd092b4debd6b7b4bacb4076252ba592ba893f890b9dc04d8fa2914871abba44b SHA512 64c1d9010a379bb7bd58341ae27291f80d3677409053275ca445dddbd5e13344d1fbd1ed8b55689eef462843fd33d945842d072067676dc19bb4573eed27c61f
 MISC metadata.xml 536 BLAKE2B 788d99a058d77cc3992b953dd8761a224575480b29dd37bc6fc5a5f914fdc03a7c9a9eb70d9d9cebf79394f6e21d966e273ad27a02f93ca887ea48f491b797ad SHA512 912ff2f26e27d5c20219a26505f3a4545409773f1f761de4591cbd7086cd1ff241fca18d7ae5081ed12e04c1b5dc46deeb02b4a68e2a3787d1d20739a818325d
diff --git a/dev-libs/amdgpu-pro-opencl/amdgpu-pro-opencl-19.10.785425-r1.ebuild b/dev-libs/amdgpu-pro-opencl/amdgpu-pro-opencl-19.10.785425-r1.ebuild
index 9e9ca9dc6bed..17472bd93adc 100644
--- a/dev-libs/amdgpu-pro-opencl/amdgpu-pro-opencl-19.10.785425-r1.ebuild
+++ b/dev-libs/amdgpu-pro-opencl/amdgpu-pro-opencl-19.10.785425-r1.ebuild
@@ -77,10 +77,7 @@ multilib_src_install() {
 	doins "${T}/${SUPER_PN}-${ABI}.icd"
 }
 
-# FIXME: is this right?
 multilib_src_install_all() {
-	ewarn "FOO $PWD"
-	ewarn `ls`
 	insinto "/opt/amdgpu"
 	doins -r opt/amdgpu/share
 }
diff --git a/dev-libs/amdgpu-pro-opencl/amdgpu-pro-opencl-19.10.785425.ebuild b/dev-libs/amdgpu-pro-opencl/amdgpu-pro-opencl-19.10.785425.ebuild
index 21ba2fc29539..bf99e75ccc57 100644
--- a/dev-libs/amdgpu-pro-opencl/amdgpu-pro-opencl-19.10.785425.ebuild
+++ b/dev-libs/amdgpu-pro-opencl/amdgpu-pro-opencl-19.10.785425.ebuild
@@ -76,10 +76,7 @@ multilib_src_install() {
 	doins "${T}/${SUPER_PN}-${ABI}.icd"
 }
 
-# FIXME: is this right?
 multilib_src_install_all() {
-	ewarn "FOO $PWD"
-	ewarn `ls`
 	insinto "/opt/amdgpu"
 	doins -r opt/amdgpu/share
 }
diff --git a/dev-libs/amdgpu-pro-opencl/amdgpu-pro-opencl-19.30.838629.ebuild b/dev-libs/amdgpu-pro-opencl/amdgpu-pro-opencl-19.30.838629.ebuild
new file mode 100644
index 000000000000..a7fc2f7c5bb1
--- /dev/null
+++ b/dev-libs/amdgpu-pro-opencl/amdgpu-pro-opencl-19.30.838629.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MULTILIB_COMPAT=( abi_x86_{32,64} )
+
+inherit unpacker multilib-minimal
+
+SUPER_PN='amdgpu-pro'
+MY_PV=$(ver_rs 2 '-')
+
+DESCRIPTION="Proprietary OpenCL implementation for AMD GPUs"
+HOMEPAGE="https://www.amd.com/en/support/kb/release-notes/rn-amdgpu-unified-navi-linux"
+SRC_URI="${SUPER_PN}-${MY_PV}-ubuntu-18.04.tar.xz"
+
+LICENSE="AMD-GPU-PRO-EULA"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RESTRICT="mirror fetch strip"
+
+BDEPEND="dev-util/patchelf"
+COMMON="app-eselect/eselect-opencl
+	dev-libs/ocl-icd"
+DEPEND="${COMMON}"
+RDEPEND="${COMMON}
+	!media-libs/mesa[opencl]" # Bug #686790
+
+QA_PREBUILT="/opt/amdgpu/lib*/*"
+
+S="${WORKDIR}/${SUPER_PN}-${MY_PV}-ubuntu-18.04"
+
+pkg_nofetch() {
+	local pkgver=$(ver_cut 1-2)
+	einfo "Please download Radeon Software for Linux version ${pkgver} for Ubuntu 18.04 from"
+	einfo "    ${HOMEPAGE}"
+	einfo "The archive should then be placed into your distfiles directory."
+}
+
+src_unpack() {
+	default
+
+	local ids_ver="1.0.0"
+	local patchlevel=$(ver_cut 3)
+	cd "${S}" || die
+	unpack_deb "${S}/libdrm-amdgpu-common_${ids_ver}-${patchlevel}_all.deb"
+	multilib_parallel_foreach_abi multilib_src_unpack
+}
+
+multilib_src_unpack() {
+	local libdrm_ver="2.4.98"
+	local patchlevel=$(ver_cut 3)
+	local deb_abi
+	[[ ${ABI} == x86 ]] && deb_abi=i386
+
+	mkdir -p "${BUILD_DIR}" || die
+	pushd "${BUILD_DIR}" >/dev/null || die
+	unpack_deb "${S}/opencl-orca-amdgpu-pro-icd_${MY_PV}_${deb_abi:-${ABI}}.deb"
+	unpack_deb "${S}/libdrm-amdgpu-amdgpu1_${libdrm_ver}-${patchlevel}_${deb_abi:-${ABI}}.deb"
+	popd >/dev/null || die
+}
+
+multilib_src_install() {
+	local dir_abi short_abi
+	[[ ${ABI} == x86 ]] && dir_abi=i386-linux-gnu && short_abi=32
+	[[ ${ABI} == amd64 ]] && dir_abi=x86_64-linux-gnu && short_abi=64
+
+	into "/opt/amdgpu"
+	patchelf --set-rpath '$ORIGIN' "opt/${SUPER_PN}/lib/${dir_abi}"/libamdocl-orca${short_abi}.so || die "Failed to fix library rpath"
+	dolib.so "opt/${SUPER_PN}/lib/${dir_abi}"/*
+	dolib.so "opt/amdgpu/lib/${dir_abi}"/*
+
+	insinto /etc/OpenCL/vendors
+	echo "/opt/amdgpu/$(get_libdir)/libamdocl-orca${short_abi}.so" \
+		> "${T}/${SUPER_PN}-${ABI}.icd" || die "Failed to generate ICD file for ABI ${ABI}"
+	doins "${T}/${SUPER_PN}-${ABI}.icd"
+}
+
+multilib_src_install_all() {
+	insinto "/opt/amdgpu"
+	doins -r opt/amdgpu/share
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		ewarn "Please note that using proprietary OpenCL libraries together with the"
+		ewarn "Open Source amdgpu stack is not officially supported by AMD. Do not ask them"
+		ewarn "for support in case of problems with this package."
+		ewarn ""
+		ewarn "Furthermore, if you have the whole AMDGPU-Pro stack installed this package"
+		ewarn "will almost certainly conflict with it. This might change once AMDGPU-Pro"
+		ewarn "has become officially supported by Gentoo."
+	fi
+
+	"${ROOT}"/usr/bin/eselect opencl set --use-old ocl-icd
+}