gentoo resync : 09.03.2018

3 files changed, 106 insertions, 6 deletions

diff --git a/x11-drivers/xf86-video-intel/Manifest b/x11-drivers/xf86-video-intel/Manifest
index d141c348c80f..facef0d17c85 100644
--- a/x11-drivers/xf86-video-intel/Manifest
+++ b/x11-drivers/xf86-video-intel/Manifest
@@ -5,5 +5,6 @@ DIST xf86-video-intel-2.99.917_p20180214.tar.xz 951544 BLAKE2B 57df523168c6bf650
 EBUILD xf86-video-intel-2.99.917_p20170216.ebuild 2026 BLAKE2B 05fd1e40a10b0e19b18daa1179b04f81c123a2ce2ddd2c29a50353b6567126d16f23041a74b45a9120a0c4cee6e40c5f6671b1e7ef7a54fa877797fd35912118 SHA512 abb8b5d657adec5fecfbe755653e6db8fad74326559167fef6be298ea180b16a7e3c67c6b318828a0be28d01eab22de5dda214549828edd07428cac6ca6f6b9e
 EBUILD xf86-video-intel-2.99.917_p20170313.ebuild 2026 BLAKE2B cf9f383a6b7235ae3789e5d6c0b509b34d4ed4bbe9697494c1e34f2dffc7fcc0bd85f4d639ff99ae40a9ba8b78cdf2c0abe6116c242c55532f67f295fb891669 SHA512 07bd71490a5a1a09d455e7d5016a06804a43f9c4fe8919a21c71853f20ba80069909db6b807682e2dcf20f6043df4c3dab3ab58ab8c84d06e177c2516abb80dc
 EBUILD xf86-video-intel-2.99.917_p20171018.ebuild 2028 BLAKE2B f2dc7438a200e02f219ee743ad9df3b5344e5825abd0564762b6c5e23444972dfb47b5e61428b000a9ab0592fd97de2731646dd595a842d2f38869b5a05300a3 SHA512 ff658165596783eff221a42a2eb7ced6afd085ad4787585c2ceb5e55d973299b9ddd19343ec61fbc093d134cbd2433889395c705779dde9d13cd2315fc93ca46
-EBUILD xf86-video-intel-2.99.917_p20180214.ebuild 2045 BLAKE2B 2063759a3f33d1633a5fa9bcff1b660a4d5cbd51bd7698fe6347bf3b5bcb04d4d9feb620f16bc00a106b35be4195fb1493f415fb139e15635400f8f9c8415d8f SHA512 8a3d50af03ec31dd6dce5444240abb1388a7a4880691563223189a8e5d14038ba933e6b8a1fdbdc9575c6d8bf93578e71adf0be7b6fbef974796a6f9a33da54b
+EBUILD xf86-video-intel-2.99.917_p20180214.ebuild 2099 BLAKE2B 8b0ea02e55d7bb8f2e11d140fef444cee00c329bb32268d216d342dc7c0af83baf244264008246faf4df59828da5403197b7969c174bff4bfb60a48e6ed791e9 SHA512 a8c0255b0a6e162c8893a28814aff5fbf7080ae6e158858240735123f1324a341080dc251fbc931cd5fc10cd0b9bfcf3ef0aa729ba9722fc61e258dded8939a3
+EBUILD xf86-video-intel-9999.ebuild 2059 BLAKE2B 860127fd5b3c20a1dfb2d2d48455f743b0756d8d899e8e6fe0afbc221f1f2c102a5cd32fa88021872a940e9966a66aacc6dc6dcac90336c44830d33e92071782 SHA512 cd8ff7b98351f062439a08a227d1ea5d849aa53535537087e4f47bc6903f9116a69aa2ebc8d7e280140e107a9880d4b7fee35a9828ef28dc1f97a90f538c269f
 MISC metadata.xml 716 BLAKE2B 9c0d0d8f69b50931cdc0cbb9de69722531918bec055e0bf460dd00dd1fc551054233a99f479856036b2ce129adda1dc4468879eb2903a97e8b1a682004e9265c SHA512 11c95d0fd78c1c38b8398fbeb1b8fd2c6e3e02b0aca2e771cabf6a935e3ef40ec344f0a906268e39094496782ba530a6004c5d7527e6ecce009ef384302c258d
diff --git a/x11-drivers/xf86-video-intel/xf86-video-intel-2.99.917_p20180214.ebuild b/x11-drivers/xf86-video-intel/xf86-video-intel-2.99.917_p20180214.ebuild
index 78b5b23c9cc6..7f39adc016a4 100644
--- a/x11-drivers/xf86-video-intel/xf86-video-intel-2.99.917_p20180214.ebuild
+++ b/x11-drivers/xf86-video-intel/xf86-video-intel-2.99.917_p20180214.ebuild
@@ -7,14 +7,18 @@ XORG_DRI=dri
 XORG_EAUTORECONF=yes
 inherit linux-info xorg-2 flag-o-matic
 
+if [[ ${PV} == 9999* ]]; then
+	SRC_URI=""
+else
+	KEYWORDS="~amd64 ~x86"
+	COMMIT_ID="75795523003798d789d417e82aaa81c7ea1ed616"
+	SRC_URI="https://cgit.freedesktop.org/xorg/driver/xf86-video-intel/snapshot/${COMMIT_ID}.tar.xz -> ${P}.tar.xz"
+	S=${WORKDIR}/${COMMIT_ID}
+fi
+
 DESCRIPTION="X.Org driver for Intel cards"
 
-KEYWORDS="~amd64 ~x86"
 IUSE="debug dri3 +sna tools +udev uxa xvmc"
-COMMIT_ID="75795523003798d789d417e82aaa81c7ea1ed616"
-SRC_URI="https://cgit.freedesktop.org/xorg/driver/xf86-video-intel/snapshot/${COMMIT_ID}.tar.xz -> ${P}.tar.xz"
-
-S=${WORKDIR}/${COMMIT_ID}
 
 REQUIRED_USE="
 	|| ( sna uxa )
diff --git a/x11-drivers/xf86-video-intel/xf86-video-intel-9999.ebuild b/x11-drivers/xf86-video-intel/xf86-video-intel-9999.ebuild
new file mode 100644
index 000000000000..b076e21d496c
--- /dev/null
+++ b/x11-drivers/xf86-video-intel/xf86-video-intel-9999.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+XORG_DRI=dri
+XORG_EAUTORECONF=yes
+inherit linux-info xorg-2 flag-o-matic
+
+if [[ ${PV} == 9999* ]]; then
+	SRC_URI=""
+else
+	KEYWORDS="~amd64 ~x86"
+	COMMIT_ID=""
+	SRC_URI="https://cgit.freedesktop.org/xorg/driver/xf86-video-intel/snapshot/${COMMIT_ID}.tar.xz -> ${P}.tar.xz"
+	S=${WORKDIR}/${COMMIT_ID}
+fi
+
+DESCRIPTION="X.Org driver for Intel cards"
+
+IUSE="debug dri3 +sna tools +udev uxa xvmc"
+
+REQUIRED_USE="
+	|| ( sna uxa )
+"
+RDEPEND="
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXScrnSaver
+	>=x11-libs/pixman-0.27.1
+	>=x11-libs/libdrm-2.4.52[video_cards_intel]
+	dri3? (
+		>=x11-base/xorg-server-1.18
+		!<=media-libs/mesa-12.0.4
+	)
+	sna? (
+		>=x11-base/xorg-server-1.10
+	)
+	tools? (
+		x11-libs/libX11
+		x11-libs/libxcb
+		x11-libs/libXcursor
+		x11-libs/libXdamage
+		x11-libs/libXinerama
+		x11-libs/libXrandr
+		x11-libs/libXrender
+		x11-libs/libxshmfence
+		x11-libs/libXtst
+	)
+	udev? (
+		virtual/udev
+	)
+	xvmc? (
+		x11-libs/libXvMC
+		>=x11-libs/libxcb-1.5
+		x11-libs/xcb-util
+	)
+"
+DEPEND="${RDEPEND}
+	>=x11-proto/dri2proto-2.6
+	x11-proto/dri3proto
+	x11-proto/presentproto
+	x11-proto/resourceproto"
+
+src_configure() {
+	replace-flags -Os -O2
+	XORG_CONFIGURE_OPTIONS=(
+		--disable-dri1
+		$(use_enable debug)
+		$(use_enable dri)
+		$(use_enable dri dri3)
+		$(usex dri3 "--with-default-dri=3")
+		$(use_enable sna)
+		$(use_enable tools)
+		$(use_enable udev)
+		$(use_enable uxa)
+		$(use_enable xvmc)
+	)
+	xorg-2_src_configure
+}
+
+pkg_postinst() {
+	if linux_config_exists && \
+		kernel_is -lt 4 3 && ! linux_chkconfig_present DRM_I915_KMS; then
+		echo
+		ewarn "This driver requires KMS support in your kernel"
+		ewarn "  Device Drivers --->"
+		ewarn "    Graphics support --->"
+		ewarn "      Direct Rendering Manager (XFree86 4.1.0 and higher DRI support)  --->"
+		ewarn "      <*>   Intel 830M, 845G, 852GM, 855GM, 865G (i915 driver)  --->"
+		ewarn "	      i915 driver"
+		ewarn "      [*]       Enable modesetting on intel by default"
+		echo
+	fi
+}