gentoo resync : 03.11.2018

4 files changed, 2 insertions, 93 deletions

diff --git a/x11-drivers/xf86-video-ati/Manifest b/x11-drivers/xf86-video-ati/Manifest
index 603fb14a0df7..7ca3b316492f 100644
--- a/x11-drivers/xf86-video-ati/Manifest
+++ b/x11-drivers/xf86-video-ati/Manifest
@@ -1,7 +1,4 @@
-DIST xf86-video-ati-18.0.1.tar.bz2 881457 BLAKE2B d45ae191239d008261230804161545e971d5ba9b76642341dad5dfb03b52aa3580e2e41fb7f0484af8da5024da46ada2bca182c15ec13053d674e456fb6f0f4a SHA512 b468a78503a596bbf71a1b91b231ce1fa32908f619ff2dfe249352d046696a3641f2a9ff065e32545fff77100134b4b237591215e78ef885b6509d6b16112d14
 DIST xf86-video-ati-18.1.0.tar.bz2 891953 BLAKE2B 9092554c708b583f9b99a6788104a1e9420537fbbeaaaa6ae7e82be2a2299ad834365d00f8b146ce845afb5e2a08d3de3da591143eff63d4fb34c7040251f443 SHA512 7a58c9a6cb4876bd2ff37d837372b4e360e81fec7de6a6c7a48d70a5338d62745f734f5d4207f30aa368ff2d9ef44f5f1ef36afd73802a618998c16fe395ed53
-EBUILD xf86-video-ati-18.0.1-r1.ebuild 882 BLAKE2B 0c93dba335511fa8ee7ac33339b9f6edfb2efc620fe36869f3b155dd62389e534e752672fcecd39ce62a3e1fe14d125e995e9974d4fad56301c55db38c49a5cd SHA512 b6747348e5c01154999a9e3da2807abffb0cb9632bacee4bf3390e3e0df3ce2debfe8d3b0839b8ac615d282724aad2a13644e05e84b3db163f304fa172749bc0
-EBUILD xf86-video-ati-18.0.1.ebuild 877 BLAKE2B 603b0e38c741bdd7716bd6f5cde3bae5863b4b8ab4866a377b9f9f6a836b1a1bd8572a517136f72020e5613113cc7e6d8eb6686db2d64510ca55ba2f1b51d2c1 SHA512 7e685d2adfe1ab320e6d241a46b6063713d5ad3b6635c4fd0316bf9d1635188a6f6f80d844ef033cd0b49e6e9622d93fc40d0ff187af3eda85768780dfd8c293
-EBUILD xf86-video-ati-18.1.0.ebuild 881 BLAKE2B 42270a0d803a878363f9ea9fe166a4226777b343785a563583216402a36e2dcef5ec1d6c6e72bc0366797c25826d3fe8202c6999baa663452f4fbb1987909335 SHA512 44f21864951796130a08fdf27efc85b1e2504baa45d73d7d54fe8651bba176bbb9015e60f4b796b227db299e9246fe8dd024ff70323e827373b908af1b2edfe8
+EBUILD xf86-video-ati-18.1.0.ebuild 879 BLAKE2B 2d0d32199112f945a1b10256c43ecdbdf564bf536afdc7741b781740c7c8effcc2a41632136156fe3222ac6915c0ce740997ffb489d0d02d0fa8793c0023c792 SHA512 444ee2636f6d3feb3c825e6f33ff25ecee2cf1469642dad2123cdd77395704f8327c85efab9d558dd027cf5f2088ac209db2f255ddc22f4f924885f1e7a7fa1a
 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-r1.ebuild b/x11-drivers/xf86-video-ati/xf86-video-ati-18.0.1-r1.ebuild
deleted file mode 100644
index 10c93ae64018..000000000000
--- a/x11-drivers/xf86-video-ati/xf86-video-ati-18.0.1-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-XORG_DRI=always
-inherit linux-info xorg-2
-
-if [[ ${PV} == 9999* ]]; then
-	SRC_URI=""
-else
-	KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~amd64-fbsd"
-fi
-
-DESCRIPTION="ATI video driver"
-HOMEPAGE="https://www.x.org/wiki/ati/"
-
-IUSE="+glamor udev"
-
-RDEPEND=">=x11-libs/libdrm-2.4.78[video_cards_radeon]
-	>=x11-libs/libpciaccess-0.8.0
-	glamor? ( x11-base/xorg-server[glamor] )
-	udev? ( virtual/libudev:= )"
-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_configure() {
-	XORG_CONFIGURE_OPTIONS=(
-		$(use_enable glamor)
-		$(use_enable udev)
-	)
-	xorg-2_src_configure
-}
diff --git a/x11-drivers/xf86-video-ati/xf86-video-ati-18.0.1.ebuild b/x11-drivers/xf86-video-ati/xf86-video-ati-18.0.1.ebuild
deleted file mode 100644
index c1bc5c73512b..000000000000
--- a/x11-drivers/xf86-video-ati/xf86-video-ati-18.0.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-XORG_DRI=always
-inherit linux-info xorg-2
-
-if [[ ${PV} == 9999* ]]; then
-	SRC_URI=""
-else
-	KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~amd64-fbsd"
-fi
-
-DESCRIPTION="ATI video driver"
-HOMEPAGE="https://www.x.org/wiki/ati/"
-
-IUSE="+glamor udev"
-
-RDEPEND=">=x11-libs/libdrm-2.4.78[video_cards_radeon]
-	>=x11-libs/libpciaccess-0.8.0
-	glamor? ( x11-base/xorg-server[glamor] )
-	udev? ( virtual/udev )"
-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_configure() {
-	XORG_CONFIGURE_OPTIONS=(
-		$(use_enable glamor)
-		$(use_enable udev)
-	)
-	xorg-2_src_configure
-}
diff --git a/x11-drivers/xf86-video-ati/xf86-video-ati-18.1.0.ebuild b/x11-drivers/xf86-video-ati/xf86-video-ati-18.1.0.ebuild
index a18f3cd17146..145972dac689 100644
--- a/x11-drivers/xf86-video-ati/xf86-video-ati-18.1.0.ebuild
+++ b/x11-drivers/xf86-video-ati/xf86-video-ati-18.1.0.ebuild
@@ -9,7 +9,7 @@ inherit linux-info xorg-2
 if [[ ${PV} == 9999* ]]; then
 	SRC_URI=""
 else
-	KEYWORDS="~alpha amd64 ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd"
+	KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~amd64-fbsd"
 fi
 
 DESCRIPTION="ATI video driver"