gentoo resync : 12.08.2018

3 files changed, 14 insertions, 107 deletions

diff --git a/x11-drivers/xf86-video-ati/Manifest b/x11-drivers/xf86-video-ati/Manifest
index 18787fa48773..27755bde1e45 100644
--- a/x11-drivers/xf86-video-ati/Manifest
+++ b/x11-drivers/xf86-video-ati/Manifest
@@ -1,6 +1,5 @@
 DIST xf86-video-ati-18.0.1.tar.bz2 881457 BLAKE2B d45ae191239d008261230804161545e971d5ba9b76642341dad5dfb03b52aa3580e2e41fb7f0484af8da5024da46ada2bca182c15ec13053d674e456fb6f0f4a SHA512 b468a78503a596bbf71a1b91b231ce1fa32908f619ff2dfe249352d046696a3641f2a9ff065e32545fff77100134b4b237591215e78ef885b6509d6b16112d14
 EBUILD xf86-video-ati-18.0.1-r1.ebuild 882 BLAKE2B 0c93dba335511fa8ee7ac33339b9f6edfb2efc620fe36869f3b155dd62389e534e752672fcecd39ce62a3e1fe14d125e995e9974d4fad56301c55db38c49a5cd SHA512 b6747348e5c01154999a9e3da2807abffb0cb9632bacee4bf3390e3e0df3ce2debfe8d3b0839b8ac615d282724aad2a13644e05e84b3db163f304fa172749bc0
-EBUILD xf86-video-ati-18.0.1-r2.ebuild 1297 BLAKE2B 540ab98689b9e0c4864b3dc3dd877e49461c2fb9ccb636822c6a1249e92755ec74c0e99edc5759d7ab43f9955203651e28d06869d4418dba8d2956d14cff829d SHA512 be611b537d108bb659dec557ee834217b69393346a06e8a8aec896771143829e342b8b8bd65c0af4a9f704981b88ec6e64f144ee3653f139badd7934586bc626
 EBUILD xf86-video-ati-18.0.1.ebuild 877 BLAKE2B 603b0e38c741bdd7716bd6f5cde3bae5863b4b8ab4866a377b9f9f6a836b1a1bd8572a517136f72020e5613113cc7e6d8eb6686db2d64510ca55ba2f1b51d2c1 SHA512 7e685d2adfe1ab320e6d241a46b6063713d5ad3b6635c4fd0316bf9d1635188a6f6f80d844ef033cd0b49e6e9622d93fc40d0ff187af3eda85768780dfd8c293
-EBUILD xf86-video-ati-9999.ebuild 1297 BLAKE2B 540ab98689b9e0c4864b3dc3dd877e49461c2fb9ccb636822c6a1249e92755ec74c0e99edc5759d7ab43f9955203651e28d06869d4418dba8d2956d14cff829d SHA512 be611b537d108bb659dec557ee834217b69393346a06e8a8aec896771143829e342b8b8bd65c0af4a9f704981b88ec6e64f144ee3653f139badd7934586bc626
+EBUILD xf86-video-ati-9999.ebuild 889 BLAKE2B cb3053d3b4d9559610a574e422aa6056d66ec852c34f56796bbd60fc84f4f0bdb5fa4aba0f38d70c70bc2ad9dc648783990d35718f18df099ed4c7f192f83079 SHA512 b74c5488cf036794ddb05040782f9a082deb518a22655c6a9eecc53b50bed3167e5599cd2cef6f1cea380deb7e78636510b76b7e2df8f5b36691bd90e0b2465a
 MISC metadata.xml 308 BLAKE2B b9e4150ed35f39b333f5ba4de65f52d82c50e5a5d1b3ca46f14b8a9a5d0ae12ad461f0f376a93d7312a7e4b2ec7a7529e137b0eada1b85f1db643739083cf20c SHA512 2f2c9a682e7aa5c413561df59a02c5dc7f77da6eae4513e93196b7c76d0ca9d76dffc5c644e77396afaa86f922947ed1cccdd133d161f1c441a28554eec68708
diff --git a/x11-drivers/xf86-video-ati/xf86-video-ati-18.0.1-r2.ebuild b/x11-drivers/xf86-video-ati/xf86-video-ati-18.0.1-r2.ebuild
deleted file mode 100644
index 1ac62fccd4ec..000000000000
--- a/x11-drivers/xf86-video-ati/xf86-video-ati-18.0.1-r2.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit linux-info
-
-DESCRIPTION="ATI video driver"
-HOMEPAGE="https://www.x.org/wiki/ati/"
-
-if [[ ${PV} == 9999* ]]; then
-	EGIT_REPO_URI="https://anongit.freedesktop.org/git/xorg/driver/${PN}"
-	inherit autotools git-r3
-	LIVE_DEPEND=">=x11-misc/util-macros-1.18"
-else
-	SRC_URI="mirror://xorg/driver/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="+glamor udev"
-
-BDEPEND="
-	virtual/pkgconfig
-"
-RDEPEND="
-	>=x11-libs/libdrm-2.4.78[video_cards_radeon]
-	>=x11-libs/libpciaccess-0.8.0
-	x11-base/xorg-server:=
-	glamor? ( x11-base/xorg-server[glamor] )
-	udev? ( virtual/libudev:= )
-"
-DEPEND="
-	${LIVE_DEPEND}
-	${RDEPEND}
-	x11-base/xorg-proto
-"
-
-pkg_pretend() {
-	if use kernel_linux ; then
-		if kernel_is -ge 3 9; then
-			CONFIG_CHECK="~!DRM_RADEON_UMS ~!FB_RADEON"
-		else
-			CONFIG_CHECK="~DRM_RADEON_KMS ~!FB_RADEON"
-		fi
-	fi
-	check_extra_config
-}
-
-src_prepare() {
-	default
-	[[ ${PV} == 9999 ]] && eautoreconf
-}
-
-src_configure() {
-	local econfargs=(
-		--disable-selective-werror
-		$(use_enable glamor)
-		$(use_enable udev)
-	)
-	econf "${econfargs[@]}"
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/x11-drivers/xf86-video-ati/xf86-video-ati-9999.ebuild b/x11-drivers/xf86-video-ati/xf86-video-ati-9999.ebuild
index 1ac62fccd4ec..3f5390aec7a0 100644
--- a/x11-drivers/xf86-video-ati/xf86-video-ati-9999.ebuild
+++ b/x11-drivers/xf86-video-ati/xf86-video-ati-9999.ebuild
@@ -1,41 +1,28 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=5
 
-inherit linux-info
-
-DESCRIPTION="ATI video driver"
-HOMEPAGE="https://www.x.org/wiki/ati/"
+XORG_DRI=always
+inherit linux-info xorg-2
 
 if [[ ${PV} == 9999* ]]; then
-	EGIT_REPO_URI="https://anongit.freedesktop.org/git/xorg/driver/${PN}"
-	inherit autotools git-r3
-	LIVE_DEPEND=">=x11-misc/util-macros-1.18"
+	SRC_URI=""
 else
-	SRC_URI="mirror://xorg/driver/${P}.tar.bz2"
 	KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
 fi
 
-LICENSE="MIT"
-SLOT="0"
+DESCRIPTION="ATI video driver"
+HOMEPAGE="https://www.x.org/wiki/ati/"
+
 IUSE="+glamor udev"
 
-BDEPEND="
-	virtual/pkgconfig
-"
-RDEPEND="
-	>=x11-libs/libdrm-2.4.78[video_cards_radeon]
+RDEPEND=">=x11-libs/libdrm-2.4.78[video_cards_radeon]
 	>=x11-libs/libpciaccess-0.8.0
-	x11-base/xorg-server:=
 	glamor? ( x11-base/xorg-server[glamor] )
-	udev? ( virtual/libudev:= )
-"
-DEPEND="
-	${LIVE_DEPEND}
-	${RDEPEND}
-	x11-base/xorg-proto
-"
+	udev? ( virtual/libudev:= )"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
 
 pkg_pretend() {
 	if use kernel_linux ; then
@@ -48,21 +35,10 @@ pkg_pretend() {
 	check_extra_config
 }
 
-src_prepare() {
-	default
-	[[ ${PV} == 9999 ]] && eautoreconf
-}
-
 src_configure() {
-	local econfargs=(
-		--disable-selective-werror
+	XORG_CONFIGURE_OPTIONS=(
 		$(use_enable glamor)
 		$(use_enable udev)
 	)
-	econf "${econfargs[@]}"
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
+	xorg-2_src_configure
 }