Backport the eselect-opengl/Files section fix to 1.16* branch.

Package-Manager: portage-2.2.17/cvs/Linux x86_64
Manifest-Sign-Key: 0xEFB4464E!

3 files changed, 255 insertions, 16 deletions

diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog
index 89b5ee685002..ef136ef64b1d 100644
--- a/x11-base/xorg-server/ChangeLog
+++ b/x11-base/xorg-server/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-base/xorg-server
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.834 2015/02/27 21:44:56 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.835 2015/02/28 19:03:29 mgorny Exp $
+
+*xorg-server-1.16.4-r2 (28 Feb 2015)
+
+  28 Feb 2015; Michał Górny <mgorny@gentoo.org> +xorg-server-1.16.4-r2.ebuild:
+  Backport the eselect-opengl/Files section fix to 1.16* branch.
 
 *xorg-server-1.17.1-r1 (27 Feb 2015)
 
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index 5b3e072326ec..350f7fe4603a 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -31,29 +31,30 @@ EBUILD xorg-server-1.15.2-r2.ebuild 7323 SHA256 c80253655a7b5c1025ed4e1665c41e0e
 EBUILD xorg-server-1.16.3-r1.ebuild 6761 SHA256 285ba4a6c9c8e40b1261fae8f606c350dfa03df96fb233f0de237a981bfb8b4c SHA512 457d08a77be36547c4f1802cf0e965449e713e7f930754a10b32d996bfec23fbe69f2e96870d88798d5fc468229552d25a09f18b17c1b591b788552b3e202f66 WHIRLPOOL 1039b0eee178cf6b0f862ee2b26579658e9dbe32ee9c9f278b7c9938f228384dee2aa42ead4375492f6cab191cd322fcd12e59b67cddbc26fb9d0ed341268565
 EBUILD xorg-server-1.16.3.ebuild 7662 SHA256 ed4a52760a60b2baf5162235a5ce6d3c6c0aa87c91f4d05de3c209fbe1f41a61 SHA512 6687e90d925bcd1af3d2e21c2dc8abaec9866ab4952f04d0c2edefa54e00cf246b299ab73c4f5fd7fbf9af3802e4be892ee6e5c8135a7eddb2c1fb3fdad7d1f7 WHIRLPOOL 950ea824fbd63110f11d99d1387031c85c3ecaea7f231e18ac609153cf2f5e981ed284ebcf78b8a36b276447e5f86bd6318c2a168207497bf83048e86e01ef02
 EBUILD xorg-server-1.16.4-r1.ebuild 6040 SHA256 d88cab66209d4d8caa9d4d95293fba1a613c7ce5ff88b0dc52f4c3f732ebc664 SHA512 beacfe3fb75f83f5743604f38e172d0636083a659c6089a22a7b2b6231b7df2bdd095335306b8051a5d21da050724bd6a7de8d2d861deae645d7853f1bbe43b2 WHIRLPOOL 8f2d51ae801e38dc5f3bd59b7a5cfe1b47ed58c808100bd2c97bfeb8b9f86374a9ee3a460454aea2655a324a7cf89d57f5c6700193d41cdd92b58d4dce9a1280
+EBUILD xorg-server-1.16.4-r2.ebuild 6148 SHA256 35b4e32fd257e19560a7abbba838b1d0336b11a1702d4399290f33adfd20a235 SHA512 60626fd94e69afe66e6d443f56241aeff8e64f1ae2153319ff20a60f388f29fba9f70cd06d1ab6010a76121859d603ca04f5d009c5d4b24703aed0222be85bcd WHIRLPOOL 78f5e6594f1e2013c794a4a47458602eaa6c84b78af6ae69a4a3f0f35187115b53a1f38f01c2f08d006171f373ba209c7b8c47e307010324c2e1c9d7d19f0d3b
 EBUILD xorg-server-1.16.4.ebuild 6929 SHA256 8c9801a0e99ac890428fe271bdb60437077b887395adc5c7d830b27652210d3e SHA512 3a353b773a5e253eb73b508de9b5cf3be50e8cb5f38bbe385a30ca25081c784f364b8cc2b82d122080a121d8eaea0db13de5244f46e6e7868a7f8294f38111a0 WHIRLPOOL 61962a4f062b75017d25b3348df69c2025c85f5ccba0148fb934e943f2056a2f23a8c0e8a49c4811082f68250e846ed23d64cab2f0b2c1b3f02849acc9bd39f0
 EBUILD xorg-server-1.17.0.ebuild 6157 SHA256 ebac647c8a4db55555ddc23f463a4b466c54de56c4b6e7531925e065fb83385a SHA512 857a499fddfba5101647f30b353b0a8e95ee8d0229a975d386ec5ce0b6af346fbb322e43650b9cf2a76ebc0bfc267c55d7224ca9337462eb3aa446bb329f6ad8 WHIRLPOOL 8e281cdf98b16324ab4190eb8eb3d3e1eaa1569ff1f260bf8ad0526edb3b7ef95da209075cdf9bbef49d2d2734306138065c43ca19b46a52b39330cfcdb9f156
 EBUILD xorg-server-1.17.1-r1.ebuild 6399 SHA256 12e7f6a06837668a796cffa9a49b713c8f62ab0f44e0573f8f9dcf8bb70e2f7e SHA512 5d8ada54b4cefff3ea403e23171c794021838f3c3f2f46ddd6994bce1fedbcf0bc254e412fbd47499ee87192e4841a19e24f35f4d5e2e17c0455e948c81a4326 WHIRLPOOL de8c82471a47fa14faf292a08e4d99bcfa410d8984f0ff40deec3d41fb507b76d34f77c5f08ea5b8311af8b9936ce0f08d4662e5b26323ef5422e29dc48d259d
 EBUILD xorg-server-1.17.1.ebuild 6288 SHA256 bbe3af2bbd61edaa0e21cc9afd7b234bfac98c803df92a3b732dfcf2aeee6704 SHA512 91a8d561cd5ce0557eda5cf64c93a9a618bf7da03c52bd84d8363e75f49a0ce662b8a3f471c2645eac348c1b63aa80dcfd2820acf656afa9f01ef3bb4fbffdf9 WHIRLPOOL 1cef3716b64419f8a59149a40aa3830dbee6427661723c036c06f7d7494a5396590b02c3854ff50dce6a361fad11ba64ede9bc546b955c0c7cbf5ca44c5c3968
-MISC ChangeLog 64679 SHA256 24bdb847c11dd6640e512dae8ec8359ee6e36abe451e68adb9f2d9c58dfb8a40 SHA512 0cf2a54cfdf5b0495ab96b8663723d5c1095ea68b87e282c3d4cd3a7c9384d1ffe21eb15d4e9f2ce8071f970b948a02fbdf1227213b2b38200323e33ebd129fa WHIRLPOOL 2aa6b3478ec844198b184c4bb076e3ab08ed965984309b1123253d67c38a1b5374e1ac2182c6c09eef4841bb905516f1614d27fdf55d20be7d5c76a72fb9329e
+MISC ChangeLog 64864 SHA256 3b9a5521b10c31cbd8164b50d7b1e8a4269e667b8fd03a39f6c64f26b626af9a SHA512 c58b2edd16f34106e49f5b0aca5455bcb3295602152cbfffbbc9ad26439ff55c49ef7408361e3893fdb87154c093cb77248c3452a16f1d95961ab908c8a927c2 WHIRLPOOL b8d4a0a87058b47cfcc73a5d360a8b278a280d201fa32e46396b814b51d2161ba551dec7d97dfe6944a58ea8a91bfbefffaa7517e3f0fa96441434d19d1b5f41
 MISC ChangeLog-2009 109242 SHA256 76119bd85f64b74b4f8129911eef944e8f1baa3ae38bbfb65bcd6197a6f58c88 SHA512 200b2a1f8d66bc4461de84a5b675ae9bdc1fd38ffea339cdc69afdb613d7a6d6ffe29175fba62b10c4f9d95e050035933f59e21172bf9c545d7a70137c8d04f4 WHIRLPOOL 1c084a461e803c1a6627986cb2444cd7a23743f409df5bb1ca5f55d1e7c3106670cfc2cd4f875a479e0c75513b7937ee35b591b4016b715f7fa45209e098cece
 MISC metadata.xml 803 SHA256 11ce7d6b3d1a4b32ac268d791e3e9fc1a47e579fb0587f87caf4c064c1abc355 SHA512 73fee10d52b8012ee64bdb789d0ecc0368c418822ec823ad22c1eac3c7c4af37c561a58599db68a6638059624e6f37e7d3cb5f3fd363255a372a9614c1deaf75 WHIRLPOOL f26245d7f8c9bf8c653730e1e832781289e06e43dc6cbc1efc422b6e8e3f7342e5a94f8cb731b4c2193c40af6087048da0ca384e4f13e697f86098296936e2e2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQJ8BAEBCABmBQJU8OVZXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJU8hEGXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOImkQAKurgCYDHMQQ6Kew5EPxvZDi
-vjwj/98TK7kioAi0D0eWJYmMY+FFeSJYlYQgpFTq495kn5V+ylezaFobwZeHSnWs
-YMZ24N6CaqyLt8UM45qkzqadl0okNXlhFTvwR8SPBCXPyQyVIeoPh0FVCjrrqKBc
-N2O6kXudTooxaEvPI3dTx6pGQ6k+cgp5BqlRtSnQnOBmUkiURl2zkeT+sZz4C470
-dP1Qa9C7CDZPCYljZso8FFrb2zCwh94nbSrvr0L8kssOE1zlG1yWP0Fn6c4EErTs
-s0j4GA8j0cD2d+vPEyNc8TeG6VGf9XCxbJQVUOWxaC88CzcrFqfYnpV2pSGibF8C
-8+f4khpO3daK6mBBSpySeb91TmHA4leCH0ozlw2K7aPahwr47xrlZx1bOLAwrjXd
-e6wnNJ+DK8z3v124uFdt8YMtVvniJ3pmOGF2GCImg7nkqzEELb88vhOEkD18Kx9I
-zmpB8gbn32ytdsrTFQWsaRSArxua3hzgG6Sk+7stZNaodMVaeC4eS/1V6qbsriWL
-7TS9KuQ75oJ8QTpe+63LJnOToJpTShigeHYUO+gOqixNVoBLNmdP1F9yq3vHi6Hj
-rS+fJNODghUjLeCDkoj/7yPozQpe0cA9UmpL/SDSlG6DlJQ+f0NmYaWfTMY8Nudb
-GJqCsdXXtNgJJtkimbjd
-=vhez
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZO2bsP/2zNR+H0JzuAJp3o2xkWxerw
+57VWF0tntGoE496NUaBjh3ywjkWOqmXl+af0H4sAX/x+4Ce3cTiy1x74s4/Puc0h
+G2E72YvNCnpu5ikk4I4uCnUzChtQpuQiBqDDG3omca4ZGsxFW50DXwt2D5WctllG
+R2NaXU9zTTUbUbHW8pMbFqVfUzidvb0/ptisrBuFX93jCPxhaN/VZwGKlz3rT5V8
+73cj9hXxy4FzBbSF4r8wC9SySN6x1Q/zIVwf8dXEAw+xjrJQT4csbNoyXaeCeL8V
+1vftps2LhiH2ZCiupDsu3F4v/stT60VBAgnPXHCko7/OOQehhxFKS0J4g12SudI3
+DXpPHjrxqPkBiROLqXPfrerzvBRIrJRqV+zEPzh6Iyps60jYeBCiGLPTYkRPhIlk
+DIlDNxjcdw+SUGYvYba6qc5OrxY1fLFq68Moe9vXJKQ/1Sm2nT5E6NnUIo/vaAfa
+dpIxdGGMgpSPmefLmRTHeKLwCDUoKjuQ2hBjwdy4/sJ9EjHVTsh0EwgXLVDvZIKC
+lLqQu1z5GfQ5kbvMZ0KQanGk/zFlqL+E+VU9ZQ/w8Bv8+OXzxXzegHyctewnnuEN
+JZBtoezTJSZOQyjNVvFO2pAWS0TrwnWrDyGJiUtaNUqD8NFPZO6XRAIg34LtmLm6
+3KH+sps3kpX4tWve2KVn
+=qdWA
 -----END PGP SIGNATURE-----
diff --git a/x11-base/xorg-server/xorg-server-1.16.4-r2.ebuild b/x11-base/xorg-server/xorg-server-1.16.4-r2.ebuild
new file mode 100644
index 000000000000..7e36582c45ba
--- /dev/null
+++ b/x11-base/xorg-server/xorg-server-1.16.4-r2.ebuild
@@ -0,0 +1,233 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.16.4-r2.ebuild,v 1.1 2015/02/28 19:03:29 mgorny Exp $
+
+EAPI=5
+
+XORG_DOC=doc
+inherit xorg-2 multilib versionator flag-o-matic
+EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/xserver"
+
+DESCRIPTION="X.Org X servers"
+SLOT="0/1.16.1"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+
+IUSE_SERVERS="dmx kdrive xnest xorg xvfb"
+IUSE="${IUSE_SERVERS} glamor ipv6 minimal nptl selinux +suid systemd tslib +udev unwind wayland"
+
+CDEPEND=">=app-admin/eselect-opengl-1.3.0
+	dev-libs/openssl
+	media-libs/freetype
+	>=x11-apps/iceauth-1.0.2
+	>=x11-apps/rgb-1.0.3
+	>=x11-apps/xauth-1.0.3
+	x11-apps/xkbcomp
+	>=x11-libs/libdrm-2.4.20
+	>=x11-libs/libpciaccess-0.12.901
+	>=x11-libs/libXau-1.0.4
+	>=x11-libs/libXdmcp-1.0.2
+	>=x11-libs/libXfont-1.4.2
+	>=x11-libs/libxkbfile-1.0.4
+	>=x11-libs/libxshmfence-1.1
+	>=x11-libs/pixman-0.27.2
+	>=x11-libs/xtrans-1.3.3
+	>=x11-misc/xbitmaps-1.0.1
+	>=x11-misc/xkeyboard-config-2.4.1-r3
+	dmx? (
+		x11-libs/libXt
+		>=x11-libs/libdmx-1.0.99.1
+		>=x11-libs/libX11-1.1.5
+		>=x11-libs/libXaw-1.0.4
+		>=x11-libs/libXext-1.0.99.4
+		>=x11-libs/libXfixes-5.0
+		>=x11-libs/libXi-1.2.99.1
+		>=x11-libs/libXmu-1.0.3
+		x11-libs/libXrender
+		>=x11-libs/libXres-1.0.3
+		>=x11-libs/libXtst-1.0.99.2
+	)
+	glamor? (
+		media-libs/libepoxy
+		>=media-libs/mesa-10.3.4-r1[egl,gbm]
+		!x11-libs/glamor
+	)
+	kdrive? (
+		>=x11-libs/libXext-1.0.5
+		x11-libs/libXv
+	)
+	!minimal? (
+		>=x11-libs/libX11-1.1.5
+		>=x11-libs/libXext-1.0.5
+		>=media-libs/mesa-10.3.4-r1[nptl=]
+	)
+	tslib? ( >=x11-libs/tslib-1.0 )
+	udev? ( >=virtual/udev-150 )
+	unwind? ( sys-libs/libunwind )
+	wayland? (
+		>=dev-libs/wayland-1.3.0
+		media-libs/libepoxy
+	)
+	>=x11-apps/xinit-1.3
+	systemd? (
+		sys-apps/dbus
+		sys-apps/systemd
+	)"
+
+DEPEND="${CDEPEND}
+	sys-devel/flex
+	>=x11-proto/bigreqsproto-1.1.0
+	>=x11-proto/compositeproto-0.4
+	>=x11-proto/damageproto-1.1
+	>=x11-proto/fixesproto-5.0
+	>=x11-proto/fontsproto-2.1.3
+	>=x11-proto/glproto-1.4.17-r1
+	>=x11-proto/inputproto-2.2.99.1
+	>=x11-proto/kbproto-1.0.3
+	>=x11-proto/randrproto-1.4.0
+	>=x11-proto/recordproto-1.13.99.1
+	>=x11-proto/renderproto-0.11
+	>=x11-proto/resourceproto-1.2.0
+	>=x11-proto/scrnsaverproto-1.1
+	>=x11-proto/trapproto-3.4.3
+	>=x11-proto/videoproto-2.2.2
+	>=x11-proto/xcmiscproto-1.2.0
+	>=x11-proto/xextproto-7.2.99.901
+	>=x11-proto/xf86dgaproto-2.0.99.1
+	>=x11-proto/xf86rushproto-1.1.2
+	>=x11-proto/xf86vidmodeproto-2.2.99.1
+	>=x11-proto/xineramaproto-1.1.3
+	>=x11-proto/xproto-7.0.26
+	>=x11-proto/presentproto-1.0
+	>=x11-proto/dri3proto-1.0
+	dmx? (
+		>=x11-proto/dmxproto-2.2.99.1
+		doc? (
+			|| (
+				www-client/links
+				www-client/lynx
+				www-client/w3m
+			)
+		)
+	)
+	!minimal? (
+		>=x11-proto/xf86driproto-2.1.0
+		>=x11-proto/dri2proto-2.8
+	)"
+
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-xserver )
+"
+
+PDEPEND="
+	xorg? ( >=x11-base/xorg-drivers-$(get_version_component_range 1-2) )"
+
+REQUIRED_USE="!minimal? (
+		|| ( ${IUSE_SERVERS} )
+	)"
+
+#UPSTREAMED_PATCHES=(
+#	"${WORKDIR}/patches/"
+#)
+
+PATCHES=(
+	"${UPSTREAMED_PATCHES[@]}"
+	"${FILESDIR}"/${PN}-1.12-ia64-fix_inx_outx.patch
+	"${FILESDIR}"/${PN}-1.12-unloadsubmodule.patch
+	# needed for new eselect-opengl, bug #541232
+	"${FILESDIR}"/${PN}-1.17-support-multiple-Files-sections.patch
+)
+
+pkg_pretend() {
+	# older gcc is not supported
+	[[ "${MERGE_TYPE}" != "binary" && $(gcc-major-version) -lt 4 ]] && \
+		die "Sorry, but gcc earlier than 4.0 will not work for xorg-server."
+}
+
+src_configure() {
+	# localstatedir is used for the log location; we need to override the default
+	#	from ebuild.sh
+	# sysconfdir is used for the xorg.conf location; same applies
+	# NOTE: fop is used for doc generating ; and i have no idea if gentoo
+	#	package it somewhere
+	XORG_CONFIGURE_OPTIONS=(
+		$(use_enable ipv6)
+		$(use_enable dmx)
+		$(use_enable glamor)
+		$(use_enable kdrive)
+		$(use_enable kdrive kdrive-kbd)
+		$(use_enable kdrive kdrive-mouse)
+		$(use_enable kdrive kdrive-evdev)
+		$(use_enable suid install-setuid)
+		$(use_enable tslib)
+		$(use_enable unwind libunwind)
+		$(use_enable wayland xwayland)
+		$(use_enable !minimal record)
+		$(use_enable !minimal xfree86-utils)
+		$(use_enable !minimal install-libxf86config)
+		$(use_enable !minimal dri)
+		$(use_enable !minimal dri2)
+		$(use_enable !minimal glx)
+		$(use_enable xnest)
+		$(use_enable xorg)
+		$(use_enable xvfb)
+		$(use_enable nptl glx-tls)
+		$(use_enable udev config-udev)
+		$(use_with doc doxygen)
+		$(use_with doc xmlto)
+		$(use_with systemd systemd-daemon)
+		$(use_enable systemd systemd-logind)
+		--enable-libdrm
+		--sysconfdir="${EPREFIX}"/etc/X11
+		--localstatedir="${EPREFIX}"/var
+		--with-fontrootdir="${EPREFIX}"/usr/share/fonts
+		--with-xkb-output="${EPREFIX}"/var/lib/xkb
+		--disable-config-hal
+		--disable-linux-acpi
+		--without-dtrace
+		--without-fop
+		--with-os-vendor=Gentoo
+		--with-sha1=libcrypto
+	)
+
+	xorg-2_src_configure
+}
+
+src_install() {
+	xorg-2_src_install
+
+	server_based_install
+
+	if ! use minimal &&	use xorg; then
+		# Install xorg.conf.example into docs
+		dodoc "${AUTOTOOLS_BUILD_DIR}"/hw/xfree86/xorg.conf.example
+	fi
+
+	newinitd "${FILESDIR}"/xdm-setup.initd-1 xdm-setup
+	newinitd "${FILESDIR}"/xdm.initd-11 xdm
+	newconfd "${FILESDIR}"/xdm.confd-4 xdm
+
+	# install the @x11-module-rebuild set for Portage
+	insinto /usr/share/portage/config/sets
+	newins "${FILESDIR}"/xorg-sets.conf xorg.conf
+}
+
+pkg_postinst() {
+	# sets up libGL and DRI2 symlinks if needed (ie, on a fresh install)
+	eselect opengl set xorg-x11 --use-old
+}
+
+pkg_postrm() {
+	# Get rid of module dir to ensure opengl-update works properly
+	if [[ -z ${REPLACED_BY_VERSION} && -e ${EROOT}/usr/$(get_libdir)/xorg/modules ]]; then
+		rm -rf "${EROOT}"/usr/$(get_libdir)/xorg/modules
+	fi
+}
+
+server_based_install() {
+	if ! use xorg; then
+		rm "${ED}"/usr/share/man/man1/Xserver.1x \
+			"${ED}"/usr/$(get_libdir)/xserver/SecurityPolicy \
+			"${ED}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \
+			"${ED}"/usr/share/man/man1/Xserver.1x
+	fi
+}