gentoo resync : 02.06.2019

6 files changed, 204 insertions, 152 deletions

diff --git a/dev-libs/amdgpu-pro-opencl/Manifest b/dev-libs/amdgpu-pro-opencl/Manifest
index 2ef680abefb2..e1c9f7a46839 100644
--- a/dev-libs/amdgpu-pro-opencl/Manifest
+++ b/dev-libs/amdgpu-pro-opencl/Manifest
@@ -1,7 +1,6 @@
-DIST amdgpu-pro-17.50-552542.tar.xz 549501204 BLAKE2B 37dcda126a3bda4e87b64ce260c7e4b65a1b864363c51f06e3152f152b83a60074331e6a0bf7b831c059a50192dea8add9b38ed16971c87293ce0e56ddf26bb2 SHA512 060e96609cf1a013fddf10db9bba4b512750e5188671a669e2582c28a03213b40d073031e35a617b982374d9d1cd4078f43b27053ee34be7c83873c0814ed196
-DIST amdgpu-pro-18.20-606296.tar.xz 230733856 BLAKE2B 21a498a894a9712d9f0277fae7f704413be0cd01cebbe427008fa3d181d03b58268e74bd3cdaf0dfb9aeca2871dad82b4aa640bbce690ca461e3f3e4acf01ffd SHA512 6575bf963e5714657914d9116de4d9b1835851fe0609b1f072b1fbdf73c068da77aba0eca1c9cce6e05e6cd8f2c1ed6b4bd6ab4ef334be5ff796ee6a3ad73831
 DIST amdgpu-pro-18.20-684755-ubuntu-16.04.tar.xz 229474380 BLAKE2B f589aad71f093b74e37de40ac7c45ebbbeff93609b2fff1baaba711347a4641ef17acdcbe69d371372510a48bd48262cf6269c1f4d05e264023d52a425a423f2 SHA512 240e701acfde4ebe665cf69c8bd3710d036f450822aeb7ee2a21caab289af44167afda1d3b8d0dbe2c46c4e63d9b6fb5e96778311f342c26f334dc7beb4a2d5b
-EBUILD amdgpu-pro-opencl-17.50.552542.ebuild 2306 BLAKE2B 60c131d8af09f855dee725590f6645bf6d77b10b80240bfff768ecca2713da7703264e156f04f1224ba19fc6d349d936c4a10cc98f9d029e9978b9e484cdc297 SHA512 38eae62aaf48c0f36e92d369f2621721c57d2757b68c0b6a4961c3eeb9a4d72b84b2a2be26eaaf359e450b56a9de36accdcab94b1a130754f92d8ae6979b6215
-EBUILD amdgpu-pro-opencl-18.20.606296.ebuild 1818 BLAKE2B ecbe7a9283eb9af7cd006064ec5d564689e507b8f648b0dd8b5932bf14a6bbae4305c14dd6b164904660615cd7bafc74a782b08075ac178be1ced1f44b3aec76 SHA512 b59a92167c53b8fcf2f3e4fa31337874ee085e18bb8cdb2f97ce8d33f393ef8096668e3b8d143d3eeedb765c7b98a3af3e450b65fd8ac7eee850fa8131454797
-EBUILD amdgpu-pro-opencl-18.20.684755.ebuild 2337 BLAKE2B fedd53526d3ce08f6a2d31a7a896dc4e5e7b381df91d4beaf87e3102ce79c0a860bd3e3129809865c10407046f48b22a8e84ccdcbe02b7ae42625539c139e4bd SHA512 a6f2d145343a6083fef02020d2ee6b61fc1be77935f9c9c091cb4a2ee75230db6d760f6450f70d7feb3d403b8bddd44e86d7b156600d8da8c720895fe198d71e
+DIST amdgpu-pro-19.10-785425-ubuntu-18.04.tar.xz 243520380 BLAKE2B 8c775feaff685b18b6df2f6f17667dbadb3da89f58c823f5470113342b585ecb436fbacef6ba26b35fe05bac53530cfe334d79d933afee303651e1375654da85 SHA512 d9c214134bf220c2ab4a306f5d83ce5718adc1f3e93165c724e70b99b4b5bcd8e703299ed70fe79f1d2db5f4f69cae2e1036b5a6238696346710c88f7fa6b3c6
+EBUILD amdgpu-pro-opencl-18.20.684755.ebuild 2332 BLAKE2B 20a692a7666997d60c1a2f4ad0f431d016a7a0a75f0f9c898603793d5c481fb662f002f5875e0435f75bbd94b5072f6a30b884eb4e797c64b29681dac35ae69c SHA512 acb6b04711b83787b394fc2ef6b6621ae7e45d67359d4ed6ae39826704660874170babedc15b6e4d69f3bbddb0ce4ba405e7b15ae633fbdf423dfc7358b65a40
+EBUILD amdgpu-pro-opencl-19.10.785425-r1.ebuild 2985 BLAKE2B 762a240cf6365c046367e982d901be8307160b71928077e81b07cd9ba153d5a20ee528f8293b47ee0c2f4306c52dc6ebdacfa65cec6ba9d94a30902838b42824 SHA512 7ceb9aed7b1a75dcbc9cff009035527312dd8318f323967766e6545972f2a4c2e174c9728fbf7c434d404272d9d2706d2339286cc7837bf30a9e8c54c42ad2f0
+EBUILD amdgpu-pro-opencl-19.10.785425.ebuild 2945 BLAKE2B e726f111998e748151e074f0b2810cf9bf1c67de2087f63c8c54d216ce3aa15aa600ef3bd0f892349bb4e801062b1da3a06573dbfc03b3f84f082863836c9392 SHA512 32589484e64b9083446768aadbb1d79694c53511a1bc6b2c7de2ea54e3c63005f25d20d4a338f2963604b80e35a66be5a6ce21d172884bdcf65b6af1954e2b7a
 MISC metadata.xml 536 BLAKE2B 788d99a058d77cc3992b953dd8761a224575480b29dd37bc6fc5a5f914fdc03a7c9a9eb70d9d9cebf79394f6e21d966e273ad27a02f93ca887ea48f491b797ad SHA512 912ff2f26e27d5c20219a26505f3a4545409773f1f761de4591cbd7086cd1ff241fca18d7ae5081ed12e04c1b5dc46deeb02b4a68e2a3787d1d20739a818325d
diff --git a/dev-libs/amdgpu-pro-opencl/amdgpu-pro-opencl-17.50.552542.ebuild b/dev-libs/amdgpu-pro-opencl/amdgpu-pro-opencl-17.50.552542.ebuild
deleted file mode 100644
index b9f388b4b18e..000000000000
--- a/dev-libs/amdgpu-pro-opencl/amdgpu-pro-opencl-17.50.552542.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit unpacker
-
-SUPER_PN='amdgpu-pro'
-MY_PV=$(ver_rs 2 '-')
-
-DESCRIPTION="Proprietary OpenCL implementation for AMD GPUs"
-HOMEPAGE="https://support.amd.com/en-us/kb-articles/Pages/Radeon-Software-for-Linux-with-Vulkan-1.1-support.aspx"
-SRC_URI="${SUPER_PN}-${MY_PV}.tar.xz"
-
-LICENSE="AMD-GPU-PRO-EULA"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RESTRICT="mirror fetch strip"
-
-COMMON="app-eselect/eselect-opencl
-	dev-libs/ocl-icd"
-DEPEND="${COMMON}
-	dev-util/patchelf"
-RDEPEND="${COMMON}"
-
-QA_PREBUILT="/opt/${SUPER_PN}/lib*/*"
-
-S="${WORKDIR}/${SUPER_PN}-${MY_PV}"
-
-pkg_nofetch() {
-	local pkgver=$(ver_cut 1-2)
-	einfo "Please download the Radeon Software for Linux Driver ${pkgver} for Ubuntu from"
-	einfo "    ${HOMEPAGE}"
-	einfo "The archive should then be placed in your distfiles directory."
-}
-
-src_unpack() {
-	default
-
-	local ids_ver="1.0.0"
-	local libdrm_ver="2.4.82"
-	local patchlevel=$(ver_cut 3)
-	cd "${S}" || die
-	unpack_deb opencl-${SUPER_PN}-icd_${MY_PV}_amd64.deb
-	unpack_deb libdrm-amdgpu-amdgpu1_${libdrm_ver}-${patchlevel}_amd64.deb
-	unpack_deb ids-amdgpu_${ids_ver}-${patchlevel}_all.deb
-}
-
-src_prepare() {
-	default
-
-	cd "${S}/opt/${SUPER_PN}/lib/x86_64-linux-gnu" || die
-	patchelf --set-rpath '$ORIGIN' libamdocl64.so || die "Failed to fix library rpath"
-}
-
-src_install() {
-	into "/opt/amdgpu"
-	dolib.so opt/${SUPER_PN}/lib/x86_64-linux-gnu/*
-	dolib.so opt/amdgpu/lib/x86_64-linux-gnu/*
-	insinto "/opt/amdgpu"
-	doins -r opt/amdgpu/share
-
-	insinto /etc/OpenCL/vendors/
-	echo "/opt/amdgpu/$(get_libdir)/libamdocl64.so" > "${SUPER_PN}.icd" || die "Failed to generate ICD file"
-	doins "${SUPER_PN}.icd"
-}
-
-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
-}
diff --git a/dev-libs/amdgpu-pro-opencl/amdgpu-pro-opencl-18.20.606296.ebuild b/dev-libs/amdgpu-pro-opencl/amdgpu-pro-opencl-18.20.606296.ebuild
deleted file mode 100644
index 03574c8b01e7..000000000000
--- a/dev-libs/amdgpu-pro-opencl/amdgpu-pro-opencl-18.20.606296.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit unpacker
-
-SUPER_PN='amdgpu-pro'
-MY_PV=$(ver_rs 2 '-')
-
-DESCRIPTION="Proprietary OpenCL implementation for AMD GPUs"
-HOMEPAGE="https://support.amd.com/en-us/kb-articles/Pages/Radeon-Software-for-Linux-Release-Notes.aspx"
-SRC_URI="${SUPER_PN}-${MY_PV}.tar.xz"
-
-LICENSE="AMD-GPU-PRO-EULA"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RESTRICT="mirror fetch strip"
-
-COMMON="app-eselect/eselect-opencl
-	dev-libs/ocl-icd"
-DEPEND="${COMMON}"
-RDEPEND="${COMMON}"
-
-QA_PREBUILT="/opt/${SUPER_PN}/lib*/*"
-
-S="${WORKDIR}/${SUPER_PN}-${MY_PV}"
-
-pkg_nofetch() {
-	local pkgver=$(ver_cut 1-2)
-	einfo "Please download the Radeon Software for Linux Driver ${pkgver} for Ubuntu 16 from"
-	einfo "    ${HOMEPAGE}"
-	einfo "The archive should then be placed in your distfiles directory."
-}
-
-src_unpack() {
-	default
-
-	cd "${S}" || die
-	unpack_deb opencl-orca-amdgpu-pro-icd_${MY_PV}_amd64.deb
-}
-
-src_install() {
-	into "/opt/amdgpu"
-	dolib.so opt/${SUPER_PN}/lib/x86_64-linux-gnu/*
-
-	insinto /etc/OpenCL/vendors/
-	echo "/opt/amdgpu/$(get_libdir)/libamdocl-orca64.so" > "${SUPER_PN}.icd" || die "Failed to generate ICD file"
-	doins "${SUPER_PN}.icd"
-}
-
-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
-}
diff --git a/dev-libs/amdgpu-pro-opencl/amdgpu-pro-opencl-18.20.684755.ebuild b/dev-libs/amdgpu-pro-opencl/amdgpu-pro-opencl-18.20.684755.ebuild
index 739777fa05df..ffc46c93b615 100644
--- a/dev-libs/amdgpu-pro-opencl/amdgpu-pro-opencl-18.20.684755.ebuild
+++ b/dev-libs/amdgpu-pro-opencl/amdgpu-pro-opencl-18.20.684755.ebuild
@@ -16,7 +16,7 @@ SRC_URI="${SUPER_PN}-${MY_PV}-ubuntu-16.04.tar.xz"
 
 LICENSE="AMD-GPU-PRO-EULA"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64"
 
 RESTRICT="mirror fetch strip"
 
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
new file mode 100644
index 000000000000..12086b373c16
--- /dev/null
+++ b/dev-libs/amdgpu-pro-opencl/amdgpu-pro-opencl-19.10.785425-r1.ebuild
@@ -0,0 +1,100 @@
+# 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-rad-lin-19-10-unified"
+SRC_URI="${SUPER_PN}-${MY_PV}-ubuntu-18.04.tar.xz"
+
+LICENSE="AMD-GPU-PRO-EULA"
+SLOT="0"
+KEYWORDS="~amd64"
+
+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.97"
+	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"
+}
+
+# FIXME: is this right?
+multilib_src_install_all() {
+	ewarn "FOO $PWD"
+	ewarn `ls`
+	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
+}
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
new file mode 100644
index 000000000000..21ba2fc29539
--- /dev/null
+++ b/dev-libs/amdgpu-pro-opencl/amdgpu-pro-opencl-19.10.785425.ebuild
@@ -0,0 +1,99 @@
+# 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-rad-lin-19-10-unified"
+SRC_URI="${SUPER_PN}-${MY_PV}-ubuntu-18.04.tar.xz"
+
+LICENSE="AMD-GPU-PRO-EULA"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RESTRICT="mirror fetch strip"
+
+BDEPEND="dev-util/patchelf"
+COMMON="app-eselect/eselect-opencl
+	dev-libs/ocl-icd"
+DEPEND="${COMMON}"
+RDEPEND="${COMMON}"
+
+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.97"
+	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"
+}
+
+# FIXME: is this right?
+multilib_src_install_all() {
+	ewarn "FOO $PWD"
+	ewarn `ls`
+	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
+}