x11-base/xorg-drivers : version bump

3 files changed, 47 insertions, 53 deletions

diff --git a/x11-base/xorg-drivers/xorg-drivers-1.19.ebuild b/x11-base/xorg-drivers/xorg-drivers-1.19.ebuild
deleted file mode 100644
index 6e579390..00000000
--- a/x11-base/xorg-drivers/xorg-drivers-1.19.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Meta package containing deps on all xorg drivers (dummy package)"
-HOMEPAGE="https://www.gentoo.org/"
-SRC_URI=""
-
-LICENSE="metapackage"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
-
-IUSE=""
-
-PDEPEND="!x11-drivers/xf86-input-citron
-	!x11-drivers/xf86-video-cyrix
-	!x11-drivers/xf86-video-impact
-	!x11-drivers/xf86-video-ivtv
-	!x11-drivers/xf86-video-nsc
-	!x11-drivers/xf86-video-sunbw2
-
-	!<=x11-drivers/xf86-video-ark-0.7.5
-	!<=x11-drivers/xf86-video-newport-0.2.4
-
-	!<x11-drivers/xf86-input-evdev-2.10.4
-	!<x11-drivers/xf86-input-joystick-1.6.3
-	!<x11-drivers/xf86-input-libinput-0.20.0
-	!<x11-drivers/xf86-input-wacom-0.34.0
-	!<x11-drivers/xf86-video-amdgpu-1.2.0
-	!<x11-drivers/xf86-video-ati-7.8.0
-	!<x11-drivers/xf86-video-chips-1.2.7
-	!<x11-drivers/xf86-video-glint-1.2.9
-	!<x11-drivers/xf86-video-i740-1.3.6
-	!<x11-drivers/xf86-video-intel-2.99.917_p20160122
-	!<x11-drivers/xf86-video-mga-1.6.5
-	!<x11-drivers/xf86-video-nouveau-1.0.13
-	!<x11-drivers/xf86-video-nv-2.1.21
-	!<x11-drivers/xf86-video-omap-0.4.5
-	!<x11-drivers/xf86-video-r128-6.10.2
-	!<x11-drivers/xf86-video-savage-2.3.9
-	!<x11-drivers/xf86-video-siliconmotion-1.7.9
-	!<x11-drivers/xf86-video-sis-0.10.9
-	!<x11-drivers/xf86-video-sisusb-0.9.7
-	!<x11-drivers/xf86-video-sunleo-1.2.2
-	!<x11-drivers/xf86-video-tdfx-1.4.7
-	!<x11-drivers/xf86-video-trident-1.3.8
-	!<x11-drivers/xf86-video-virtualbox-5.1.14
-	!<x11-drivers/xf86-video-vmware-13.2.1
-"
diff --git a/x11-base/xorg-drivers/xorg-drivers-1.20.ebuild b/x11-base/xorg-drivers/xorg-drivers-1.20.ebuild
new file mode 100644
index 00000000..18e58e5e
--- /dev/null
+++ b/x11-base/xorg-drivers/xorg-drivers-1.20.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Meta package containing deps on all xorg drivers (dummy package)"
+HOMEPAGE="https://www.gentoo.org/"
+SRC_URI=""
+
+LICENSE="metapackage"
+SLOT="0"
+KEYWORDS="amd64"
+
+
+PDEPEND="
+	!x11-drivers/xf86-input-citron
+	!x11-drivers/xf86-video-apm
+	!x11-drivers/xf86-video-ark
+	!x11-drivers/xf86-video-chips
+	!x11-drivers/xf86-video-cirrus
+	!x11-drivers/xf86-video-cyrix
+	!x11-drivers/xf86-video-i128
+	!x11-drivers/xf86-video-i740
+	!x11-drivers/xf86-video-impact
+	!x11-drivers/xf86-video-mach64
+	!x11-drivers/xf86-video-neomagic
+	!x11-drivers/xf86-video-newport
+	!x11-drivers/xf86-video-nsc
+	!x11-drivers/xf86-video-rendition
+	!x11-drivers/xf86-video-s3
+	!x11-drivers/xf86-video-s3virge
+	!x11-drivers/xf86-video-savage
+	!x11-drivers/xf86-video-sis
+	!x11-drivers/xf86-video-sisusb
+	!x11-drivers/xf86-video-sunbw2
+	!x11-drivers/xf86-video-suncg14
+	!x11-drivers/xf86-video-suncg3
+	!x11-drivers/xf86-video-suncg6
+	!x11-drivers/xf86-video-sunffb
+	!x11-drivers/xf86-video-sunleo
+	!x11-drivers/xf86-video-suntcx
+	!x11-drivers/xf86-video-tga
+	!x11-drivers/xf86-video-trident
+	!x11-drivers/xf86-video-tseng
+	!<x11-drivers/xf86-input-evdev-2.10.4
+"
diff --git a/x11-base/xorg-server/xorg-server-1.20.3-r1337.ebuild b/x11-base/xorg-server/xorg-server-1.20.3-r1337.ebuild
index f85b21d4..07aa4d48 100644
--- a/x11-base/xorg-server/xorg-server-1.20.3-r1337.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.20.3-r1337.ebuild
@@ -10,9 +10,7 @@ EGIT_REPO_URI="https://anongit.freedesktop.org/git/xorg/xserver.git"
 
 DESCRIPTION="X.Org X servers"
 SLOT="0/${PV}"
-if [[ ${PV} != 9999* ]]; then
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
-fi
+KEYWORDS="amd64"
 
 IUSE_SERVERS="dmx kdrive wayland xephyr xnest xorg xvfb"
 IUSE="${IUSE_SERVERS} debug +glamor ipv6 libressl minimal selinux systemd +udev unwind xcsecurity"