gentoo resync : 21.07.2018

3 files changed, 92 insertions, 12 deletions

diff --git a/x11-drivers/xf86-video-amdgpu/Manifest b/x11-drivers/xf86-video-amdgpu/Manifest
index b1a7d71c3779..88aa25c29f47 100644
--- a/x11-drivers/xf86-video-amdgpu/Manifest
+++ b/x11-drivers/xf86-video-amdgpu/Manifest
@@ -1,4 +1,5 @@
 DIST xf86-video-amdgpu-18.0.1.tar.bz2 414683 BLAKE2B 767da468b6d2d41d49dbbc54093594163cbc42fa73d5859d4e210f25cac6822b7cb9fede4c73a15ac2221ef07a10df8b77f6f928b134382b373d5eedfde90225 SHA512 eb3b76240d4e5084d68b5063b5b19ad5f5bb1f93ea9929301d9e17a48ddc1cb713b76529cb93d133b3547fe78ae8a4455f6b15f6ddf88c29349f82bb1a0db1c4
+EBUILD xf86-video-amdgpu-18.0.1-r1.ebuild 952 BLAKE2B a695777452e4a9d5776963a54d4d6fe5a3451914f4e8129d1b53ad48a8c6e31acdcd6ebc54409cf5744289530a02c0c0d368a287eaee40437c9342854dfa252a SHA512 5f79aa44f5717d5ed00b395006cb410bca80c0ddd598a2ec0f496a22278aaf107c896bbfb0697bc4db5b1aaec4a88951c0f1f3e56bdd4aea55da53191e96fa7b
 EBUILD xf86-video-amdgpu-18.0.1.ebuild 478 BLAKE2B 6ecafe6d38bbb2cf22c5023d65ef02848c43da18eaa0229446f90c0779daa15127d75e70b12b3d106be4fbc2dbb581a35c31ae77cba09307b3c08447d228a926 SHA512 bf5b172b9a1acfd6d4dd3e5981671e394fce667ac0786149536df933afdff80f7aa6ec523e7fed764f80650ab876756b1441b413afbfe7be085655296265ab26
-EBUILD xf86-video-amdgpu-9999.ebuild 480 BLAKE2B a6269c9013f052ffac95225516bf7c2c537d24022597b380c2e76a191b5f5a498a9923589ee581d9c494795ee231c7d05f3c34b8820f5495593917fa50bc6355 SHA512 e0d351b013842529e7fc115d84a5e62684517f275a3ef4a0df5212001a85f2fe6769f224d3de476524b2fc53d4bc6ca4d15c3b772ed97c49319d485daba9145f
+EBUILD xf86-video-amdgpu-9999.ebuild 952 BLAKE2B a695777452e4a9d5776963a54d4d6fe5a3451914f4e8129d1b53ad48a8c6e31acdcd6ebc54409cf5744289530a02c0c0d368a287eaee40437c9342854dfa252a SHA512 5f79aa44f5717d5ed00b395006cb410bca80c0ddd598a2ec0f496a22278aaf107c896bbfb0697bc4db5b1aaec4a88951c0f1f3e56bdd4aea55da53191e96fa7b
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-drivers/xf86-video-amdgpu/xf86-video-amdgpu-18.0.1-r1.ebuild b/x11-drivers/xf86-video-amdgpu/xf86-video-amdgpu-18.0.1-r1.ebuild
new file mode 100644
index 000000000000..f3cb6236644a
--- /dev/null
+++ b/x11-drivers/xf86-video-amdgpu/xf86-video-amdgpu-18.0.1-r1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Accelerated Open Source driver for AMDGPU cards"
+HOMEPAGE="https://www.x.org/wiki/ https://cgit.freedesktop.org/"
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://anongit.freedesktop.org/git/xorg/driver/xf86-video-amdgpu.git"
+	inherit autotools git-r3
+	LIVE_DEPEND=">=x11-misc/util-macros-1.18"
+else
+	SRC_URI="mirror://xorg/driver/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE=""
+
+BDEPEND="
+	virtual/pkgconfig
+"
+RDEPEND="
+	>=x11-libs/libdrm-2.4.78[video_cards_amdgpu]
+	x11-libs/libpciaccess
+	x11-base/xorg-server[glamor(-),-minimal]
+"
+DEPEND="
+	${LIVE_DEPEND}
+	${RDEPEND}
+"
+
+src_prepare() {
+	default
+	[[ ${PV} == 9999 ]] && eautoreconf
+}
+
+src_configure() {
+	local econfargs=(
+		--enable-glamor
+	)
+
+	econf "${econfargs[@]}"
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/x11-drivers/xf86-video-amdgpu/xf86-video-amdgpu-9999.ebuild b/x11-drivers/xf86-video-amdgpu/xf86-video-amdgpu-9999.ebuild
index 90a061997083..f3cb6236644a 100644
--- a/x11-drivers/xf86-video-amdgpu/xf86-video-amdgpu-9999.ebuild
+++ b/x11-drivers/xf86-video-amdgpu/xf86-video-amdgpu-9999.ebuild
@@ -1,23 +1,51 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-XORG_DRI="always"
-inherit xorg-2
+EAPI=7
 
-if [[ ${PV} == 9999* ]]; then
-	SRC_URI=""
+DESCRIPTION="Accelerated Open Source driver for AMDGPU cards"
+HOMEPAGE="https://www.x.org/wiki/ https://cgit.freedesktop.org/"
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://anongit.freedesktop.org/git/xorg/driver/xf86-video-amdgpu.git"
+	inherit autotools git-r3
+	LIVE_DEPEND=">=x11-misc/util-macros-1.18"
 else
+	SRC_URI="mirror://xorg/driver/${P}.tar.bz2"
 	KEYWORDS="~amd64 ~x86"
 fi
 
-DESCRIPTION="Accelerated Open Source driver for AMDGPU cards"
+LICENSE="MIT"
+SLOT="0"
+IUSE=""
+
+BDEPEND="
+	virtual/pkgconfig
+"
+RDEPEND="
+	>=x11-libs/libdrm-2.4.78[video_cards_amdgpu]
+	x11-libs/libpciaccess
+	x11-base/xorg-server[glamor(-),-minimal]
+"
+DEPEND="
+	${LIVE_DEPEND}
+	${RDEPEND}
+"
 
-RDEPEND=">=x11-libs/libdrm-2.4.78[video_cards_amdgpu]
-	x11-base/xorg-server[glamor(-)]"
-DEPEND="${RDEPEND}"
+src_prepare() {
+	default
+	[[ ${PV} == 9999 ]] && eautoreconf
+}
 
 src_configure() {
-	XORG_CONFIGURE_OPTIONS="--enable-glamor"
-	xorg-2_src_configure
+	local econfargs=(
+		--enable-glamor
+	)
+
+	econf "${econfargs[@]}"
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
 }