gentoo resync : 17.12.2017

4 files changed, 12 insertions, 171 deletions

diff --git a/dev-libs/amdgpu-pro-opencl/Manifest b/dev-libs/amdgpu-pro-opencl/Manifest
index 9b0c2aa5ef8d..2949c2f447e0 100644
--- a/dev-libs/amdgpu-pro-opencl/Manifest
+++ b/dev-libs/amdgpu-pro-opencl/Manifest
@@ -1,9 +1,5 @@
-DIST amdgpu-pro-17.10-429170.tar.xz 121382128 SHA256 cb1ea7f9756f197a976138d2c00f239ae4ee43b839fbb1ea57f8770957d4afd6 SHA512 2d9d0a97478564e259dc8494083df8dc13e3bc664384978aff369070b1105703653d8dc4dca38e94dc8bdf3ddfb5c6f4de39cec5a9b263423de8fb91fd0117c6 WHIRLPOOL 1e07579d2c9d5d8a796973658cbb6627418b133a630ca5e977f93da0d27b900da2078d2ea8b35a13071b0b05e3d5e7f47e17d61042dcca60709f6599c18380a2
-DIST amdgpu-pro-17.30-458935.tar.xz 393634984 SHA256 3652a5c9476a650a3e3cd89bcd7ac119ed7d16a570501eeeea6a902cbc6f9488 SHA512 3f517ce13e102edb820f8f9538e0894c794d767816f99774fbfec342adb6912712664f069db2542412baabb24ee198204f38757407c29aff238ed1772dc3caab WHIRLPOOL 29a5b06657767255ace0529467ca56a904a021254f7dab854b1fd3ac843108ac346d3c4e97e10ef53844152de116581bff7c3aa8f4f066a08becb88e59918da3
-DIST amdgpu-pro-17.30-465504.tar.xz 394216628 SHA256 b74494d142542164b5582e8bed845315f788aa3d9eb0c1ed5f2a6c5f982beaf5 SHA512 fa515d5397488ebd4271988f7b9b538190c4277a3c4dcaeb4b05f5cd5bdec657f13546de644b1a6825c88bd3b73e6c1a6aaa6b6c74e3cf942783b2df530cf4c7 WHIRLPOOL 3a1617cd8b8fd096614cf04b7e716b607ec718d122b286533d8dabc862c82b644ba864eb661b1d5e5da45c8fe674192d3f8038dbd85311d9ffc5c6f793f7d32b
 DIST amdgpu-pro-17.40-492261.tar.xz 361491288 BLAKE2B 72093e803ad163724d9708dab0085d18a6dfd994588005b7a49da6e0e94a892ac479c87cafb7a9c848996d1db0860ae591d1cced2137ca71be4966705d5413b3 SHA512 b10d67f4fc7bfbf8f1de46e5202fabc3443e969759817d497449d911d4c591256cfdf73372013fdc67bd89c44ffe389c021c9f77ba27f55cbb5257af550bd148
-EBUILD amdgpu-pro-opencl-17.10.429170.ebuild 2211 BLAKE2B 425cb2c7e6244477ba970d18b2762fe5829afd3f18cd978cc734d2294e5d028eaa6ff6a470c674a7e147d593970e1637569e8ffd9bae2e831635875da732db15 SHA512 7a9200bbb6c1c18910d7b5df032f0ec6abbd9e0727668cdc11c3f14ff85bc3244b955e1cf58fc63db7dc44ad672f4306327c1d716b66d6360bcddb796f25f789
-EBUILD amdgpu-pro-opencl-17.30.458935-r1.ebuild 2355 BLAKE2B e7af1544698ab93dca4680d76dd9c6f5afee196fff97827c82053cc60ceced8d8d16acecfb150f5adab8517ae726c8ee53174f9319f12c77be54c0d8036bca13 SHA512 298c685f44f426443301d621b87d3dba3aa10b3e01e4f25ba84e17deffb1480730b093c218f45615a52ea72fbffcb3bc464d73d0cc7b872dc9e8452e9f2dfde1
-EBUILD amdgpu-pro-opencl-17.30.465504.ebuild 2355 BLAKE2B e7af1544698ab93dca4680d76dd9c6f5afee196fff97827c82053cc60ceced8d8d16acecfb150f5adab8517ae726c8ee53174f9319f12c77be54c0d8036bca13 SHA512 298c685f44f426443301d621b87d3dba3aa10b3e01e4f25ba84e17deffb1480730b093c218f45615a52ea72fbffcb3bc464d73d0cc7b872dc9e8452e9f2dfde1
+DIST amdgpu-pro-17.50-511655.tar.xz 547875548 BLAKE2B c3e396d9846ca15297ecbfd8ff1c9ca3aae6352080f280dc13f2ad4d32da7b84a6d069fd4b64c6e4d9814459cc5cca1ab838295a83ede953a9df6cdcd1387f91 SHA512 d4d995eb596f94656d2fb6e43a2db29bcbfe28e09f75e19e23d1d446de899dbb6e4597ef833955a8b1788055fa848bc14e45a32c820ed8e97c667a784cf816cc
 EBUILD amdgpu-pro-opencl-17.40.492261.ebuild 2355 BLAKE2B 55b988522b486e9fe049d15fc6af3c7346a052b337ed86c3f104e924d42dc69884a21c33fab145b7bfbc8fce4444880241f81fdf55e28988c1947677a46ddce5 SHA512 f3d5cd29520939d1127efd8a30bf2922092fba1b085416b61f8cd0c950db490c2074407dfab317a2facb72a89c4b4cb0a898eef3bc904c84813016b6184da8be
+EBUILD amdgpu-pro-opencl-17.50.511655.ebuild 2379 BLAKE2B cf51192119d1095c7fa84a9ba13e170be736376712d39150890f89075ea68a0d288382a6c200938f3164b086f327fa574388ce90dd31ec48d628cc2bb6de5eca SHA512 f4bddb55a6c8a285faa7fabf8599d0267202b89fd86f67fffc18deace742cb317c032f1f1549aac85ff3430a06c821ecb8b7b2948d3860d9e63bc436ec5bd246
 MISC metadata.xml 656 BLAKE2B 5af3c00c551e7fd2b0de6d8c24421a58986ef20c24b7f2799a428dc7e07e2da4841ce93ade51edae33c0ba79dc55ed6df3452c0b5a610499e7e79e09c31b22de SHA512 5f6933f6ff6dd222a54e4c3609b888182ffd136bb0b58c905624cc9b404091b4e46917cf20d4d24585fa3ed710fb9881f3b6437e015371743d23d07fab488fb0
diff --git a/dev-libs/amdgpu-pro-opencl/amdgpu-pro-opencl-17.10.429170.ebuild b/dev-libs/amdgpu-pro-opencl/amdgpu-pro-opencl-17.10.429170.ebuild
deleted file mode 100644
index 1b985ee16fa3..000000000000
--- a/dev-libs/amdgpu-pro-opencl/amdgpu-pro-opencl-17.10.429170.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit unpacker versionator
-
-SUPER_PN='amdgpu-pro'
-MY_PV=$(replace_version_separator 2 '-')
-
-DESCRIPTION="Proprietary OpenCL implementation for AMD GPUs"
-HOMEPAGE="https://support.amd.com/en-us/kb-articles/Pages/AMDGPU-PRO-Driver-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"
-
-DEPEND="dev-util/patchelf"
-RDEPEND="dev-libs/ocl-icd"
-
-QA_PREBUILT="/opt/${SUPER_PN}/lib*/*"
-
-S="${WORKDIR}/${SUPER_PN}-${MY_PV}"
-
-pkg_nofetch() {
-	local pkgver=$(get_version_component_range 1-2)
-	einfo "Please download the AMDGPU-Pro Driver ${pkgver} for Ubuntu from"
-	einfo "    ${HOMEPAGE}"
-	einfo "The archive should then be placed into ${DISTDIR}."
-}
-
-src_unpack() {
-	default
-
-	local libdrm_ver="2.4.70"
-	local patchlevel=$(get_version_component_range 3)
-	cd "${S}" || die
-	unpack_deb opencl-${SUPER_PN}-icd_${MY_PV}_amd64.deb
-	unpack_deb libdrm-${SUPER_PN}-amdgpu1_${libdrm_ver}-${patchlevel}_amd64.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/${SUPER_PN}"
-	dolib opt/${SUPER_PN}/lib/x86_64-linux-gnu/*
-
-	insinto /etc/OpenCL/vendors/
-	echo "/opt/${SUPER_PN}/$(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
-
-	elog "AMD OpenCL driver relies on dev-libs/ocl-icd to work. To enable it, please run"
-	elog ""
-	elog "    eselect opencl set ocl-icd"
-	elog ""
-}
diff --git a/dev-libs/amdgpu-pro-opencl/amdgpu-pro-opencl-17.30.465504.ebuild b/dev-libs/amdgpu-pro-opencl/amdgpu-pro-opencl-17.30.465504.ebuild
deleted file mode 100644
index 93c286d09744..000000000000
--- a/dev-libs/amdgpu-pro-opencl/amdgpu-pro-opencl-17.30.465504.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit unpacker versionator
-
-SUPER_PN='amdgpu-pro'
-MY_PV=$(replace_version_separator 2 '-')
-
-DESCRIPTION="Proprietary OpenCL implementation for AMD GPUs"
-HOMEPAGE="https://support.amd.com/en-us/kb-articles/Pages/AMDGPU-PRO-Driver-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"
-
-DEPEND="dev-util/patchelf"
-RDEPEND="dev-libs/ocl-icd"
-
-QA_PREBUILT="/opt/${SUPER_PN}/lib*/*"
-
-S="${WORKDIR}/${SUPER_PN}-${MY_PV}"
-
-pkg_nofetch() {
-	local pkgver=$(get_version_component_range 1-2)
-	einfo "Please download the AMDGPU-Pro Driver ${pkgver} for Ubuntu from"
-	einfo "    ${HOMEPAGE}"
-	einfo "The archive should then be placed into ${DISTDIR}."
-}
-
-src_unpack() {
-	default
-
-	local ids_ver="1.0.0"
-	local libdrm_ver="2.4.70"
-	local patchlevel=$(get_version_component_range 3)
-	cd "${S}" || die
-	unpack_deb opencl-${SUPER_PN}-icd_${MY_PV}_amd64.deb
-	unpack_deb libdrm-${SUPER_PN}-amdgpu1_${libdrm_ver}-${patchlevel}_amd64.deb
-	unpack_deb ids-${SUPER_PN}_${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/${SUPER_PN}"
-	dolib opt/${SUPER_PN}/lib/x86_64-linux-gnu/*
-	insinto "/opt/${SUPER_PN}"
-	doins -r opt/${SUPER_PN}/share
-
-	insinto /etc/OpenCL/vendors/
-	echo "/opt/${SUPER_PN}/$(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
-
-	elog "AMD OpenCL driver relies on dev-libs/ocl-icd to work. To enable it, please run"
-	elog ""
-	elog "    eselect opencl set ocl-icd"
-	elog ""
-}
diff --git a/dev-libs/amdgpu-pro-opencl/amdgpu-pro-opencl-17.30.458935-r1.ebuild b/dev-libs/amdgpu-pro-opencl/amdgpu-pro-opencl-17.50.511655.ebuild
index 93c286d09744..a8eb4c59e2aa 100644
--- a/dev-libs/amdgpu-pro-opencl/amdgpu-pro-opencl-17.30.458935-r1.ebuild
+++ b/dev-libs/amdgpu-pro-opencl/amdgpu-pro-opencl-17.50.511655.ebuild
@@ -9,7 +9,7 @@ SUPER_PN='amdgpu-pro'
 MY_PV=$(replace_version_separator 2 '-')
 
 DESCRIPTION="Proprietary OpenCL implementation for AMD GPUs"
-HOMEPAGE="https://support.amd.com/en-us/kb-articles/Pages/AMDGPU-PRO-Driver-for-Linux-Release-Notes.aspx"
+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"
@@ -27,7 +27,7 @@ S="${WORKDIR}/${SUPER_PN}-${MY_PV}"
 
 pkg_nofetch() {
 	local pkgver=$(get_version_component_range 1-2)
-	einfo "Please download the AMDGPU-Pro Driver ${pkgver} for Ubuntu from"
+	einfo "Please download the Radeon Software for Linux Driver ${pkgver} for Ubuntu from"
 	einfo "    ${HOMEPAGE}"
 	einfo "The archive should then be placed into ${DISTDIR}."
 }
@@ -36,12 +36,12 @@ src_unpack() {
 	default
 
 	local ids_ver="1.0.0"
-	local libdrm_ver="2.4.70"
+	local libdrm_ver="2.4.82"
 	local patchlevel=$(get_version_component_range 3)
 	cd "${S}" || die
 	unpack_deb opencl-${SUPER_PN}-icd_${MY_PV}_amd64.deb
-	unpack_deb libdrm-${SUPER_PN}-amdgpu1_${libdrm_ver}-${patchlevel}_amd64.deb
-	unpack_deb ids-${SUPER_PN}_${ids_ver}-${patchlevel}_all.deb
+	unpack_deb libdrm-amdgpu-amdgpu1_${libdrm_ver}-${patchlevel}_amd64.deb
+	unpack_deb ids-amdgpu_${ids_ver}-${patchlevel}_all.deb
 }
 
 src_prepare() {
@@ -52,13 +52,14 @@ src_prepare() {
 }
 
 src_install() {
-	into "/opt/${SUPER_PN}"
+	into "/opt/amdgpu"
 	dolib opt/${SUPER_PN}/lib/x86_64-linux-gnu/*
-	insinto "/opt/${SUPER_PN}"
-	doins -r opt/${SUPER_PN}/share
+	dolib opt/amdgpu/lib/x86_64-linux-gnu/*
+	insinto "/opt/amdgpu"
+	doins -r opt/amdgpu/share
 
 	insinto /etc/OpenCL/vendors/
-	echo "/opt/${SUPER_PN}/$(get_libdir)/libamdocl64.so" > "${SUPER_PN}.icd" || die "Failed to generate ICD file"
+	echo "/opt/amdgpu/$(get_libdir)/libamdocl64.so" > "${SUPER_PN}.icd" || die "Failed to generate ICD file"
 	doins "${SUPER_PN}.icd"
 }