Update x11-base/xorg-server blockers.

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0x2324E7B566DF2611!

5 files changed, 30 insertions, 107 deletions

diff --git a/app-eselect/eselect-opengl/ChangeLog b/app-eselect/eselect-opengl/ChangeLog
index fe6b81187f98..13a87c3ecc88 100644
--- a/app-eselect/eselect-opengl/ChangeLog
+++ b/app-eselect/eselect-opengl/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-eselect/eselect-opengl
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-eselect/eselect-opengl/ChangeLog,v 1.1 2015/03/31 16:53:09 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-eselect/eselect-opengl/ChangeLog,v 1.2 2015/06/17 12:28:01 chithanh Exp $
+
+  17 Jun 2015; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  -eselect-opengl-1.3.1-r2.ebuild, eselect-opengl-1.2.7.ebuild,
+  eselect-opengl-1.3.1-r4.ebuild:
+  Update x11-base/xorg-server blockers.
 
   31 Mar 2015; Ulrich Müller <ulm@gentoo.org> +eselect-opengl-1.2.7.ebuild,
   +eselect-opengl-1.3.1-r2.ebuild, +eselect-opengl-1.3.1-r4.ebuild,
diff --git a/app-eselect/eselect-opengl/Manifest b/app-eselect/eselect-opengl/Manifest
index 0df305bd0347..ec8d50d97866 100644
--- a/app-eselect/eselect-opengl/Manifest
+++ b/app-eselect/eselect-opengl/Manifest
@@ -5,22 +5,26 @@ DIST eselect-opengl-1.2.7.tar.xz 8292 SHA256 1f0d3e293c25cf9359421a7a0595278f5fc
 DIST glext.h.85.xz 66344 SHA256 f9db24b274581782726b7ece26825bc6dacc10871f24e712cedc5608720f40e0 SHA512 55fbee9cacde8a059ab1c25fbd5652d2879ac57423d2be7a1e947c5f4e82c2e1ff957441a39545958859435b88e69783e4f116dc3364f03378519df7476f121d WHIRLPOOL 493c86294f7bcade1e8ca427eea0f01cbd7a8e4f21a2f678f896af7fac06f8b6d04ceb8e93f2aacfaae6457a0368aa0c911dea90b31076cf77ae72fb492b3676
 DIST glxext.h.34.xz 7368 SHA256 cb22353fbd8f87ffea19b4758194af3a38796c41f93058eeb0fa237cce9a77b7 SHA512 525fe3e7d654ddc38dbbcf1b26c2e84099b502d993a176352386b10229fabf1a9ee60686c41d1486f77bcf08424119658b26ebd90d2260a66bc21bdc55340279 WHIRLPOOL 92901129f724e90a53ee602c3a7fb633ba190ad48bd098f5784eb1069e79c8fec4227fae1c59afee728e5e11776c6ff33fee6b5c5eb97b819b082de0713140d8
 DIST opengl.eselect-1.3.1.xz 2588 SHA256 40d805b89a07b85c60a3f7f3461c699f728a83246344950356ce2840bc34bf9e SHA512 052a804e96d8e8afe8b588fdc8996aad21675ea05e3e668c33293df4b9523dde8be083e4a7909a22ec83260c9735694fe4e8aa7e5d8a3736a8e243f29368e532 WHIRLPOOL 3989715d15b4da9ef8162c605a015571bf88dc4526c2fd309222706de0ce918574192263b1a68c4a1ffea9803b3bd0ea43aa3c75d344d0b3a32015f28e5ce533
-EBUILD eselect-opengl-1.2.7.ebuild 1769 SHA256 fbf8c51784d9daa0433dac1936036f5135cb569ee9e1e3b01adb64c4ceaa25c3 SHA512 d109fd1aba4014284f90808a8a35ea82fb24f7132001bb7ce758bfa87ad9c21e40ee78252634bf7746013090266ef485adfdf6e38f1644c5e59612a25bd23760 WHIRLPOOL 539841222751698a51f767f757ddb43375047eaa0a45618e5064485c88d14f19ea51294118a4e9ef82ec301bd6aa3b3410e782f7daed22b61737105b9f9b08a3
-EBUILD eselect-opengl-1.3.1-r2.ebuild 2657 SHA256 3b4057951bb7ae9d3d2269720e4a83f4c51d53ad482969b00c7cb1210eeb6e76 SHA512 9f6b3402d9869848c277c2265b42ad860bad7dc00e7b5a9b61d15b3fe6f67db20e9ca921b8275f82f3f43f3f68ae68971389a9475673a940cfe0478e738b76d2 WHIRLPOOL d5c2c50116894777d23e70986c7448858b5ef883373c0ac6d7acc1f053176743071dc2d457449c4f8ffa17dcd3f202bdcbe23e636ea31c97cd4071a39ba03214
-EBUILD eselect-opengl-1.3.1-r4.ebuild 2237 SHA256 b13a0f5640b91a2d3517225b7f42fb15ef266046a701a0e8c22002eb4e6ea072 SHA512 9986588a9cd0c5e19805353d46132224842e1bcac43b9f529dfa2ff02273ed95db51fd3de8d6dfed32b41db5270e3d26a5903cf72a372d1c267ec6143616efef WHIRLPOOL ee1c21ed5c58d9b2c32660f3626ffcdaaca5c45be743dabdf27ec20ec6e2c94e79495ed1ef00aea9b47ae7b42b17607cb2e3cff8cb6ad3bc9992213f91a3b212
-MISC ChangeLog 21537 SHA256 58feb4c16d8cde3bd0889961a4e2a99e09a803abee4493fe55510b17a3f02714 SHA512 747fd046e173de80ce7603cf618d87fc063335e5af5e4911f5b46d47f3c8cdcb5720acaaa2205ae270914f8905b7b084c4a0458db0fc72a057e685599c38d04d WHIRLPOOL a17293ba606816ae57387f841eae7c2e52855db7fc13afa668edb60a495b95f24f73fc9189f4a1f9c9589163d874f9a83b51304dac9f0ef5b7750440730efe95
+EBUILD eselect-opengl-1.2.7.ebuild 1811 SHA256 d972fd8e40304a868019b6456546d8cc856c708b3f736d5717056cd5b31b8e9a SHA512 0f2ba2bc2d2c2bf5dfd1adec64c1bafe72534438e91a25230e744580056ccfd1421604c9426b1b5886d092856016a17a5249659e6ee7cb7d6142d379accc5980 WHIRLPOOL d4156cadbc51095b1b581bd31487d569f4c2d9a680ded82abe687f40d899992d23e559abdb6a4ff9d4c2c794827107f02263aca5aee02a821b49336894e4ff7c
+EBUILD eselect-opengl-1.3.1-r4.ebuild 2278 SHA256 2ad0affccceb678714156d0707eeb659bd3b87e64b56ab7e3d0f61945565259c SHA512 d0ab9ff2553da182bfcb53d17514306d4d73132cd42c4716f1fe53e4b0d56d71cb6967ed14e53f9627b615f5029fb8260478769cfd4916120e211560f0328d74 WHIRLPOOL 3c82b20857bb88add87a5fb280409789e335544f102e94a6429c023930d9f77b3565a5a261638d2cbd03e9efd1c0fc7d9ad7db35244d69fe3a6c884d8412f3c9
+MISC ChangeLog 21750 SHA256 4c7c999375d327534fdd7f027070e3d9c6665bbbabad4ee39307f9912844f61d SHA512 b13febb4189a8d073cc39a13919ff46e862cfc3f9938bf9d8a161370eebb2a33a616686ba3f13f358c9d2cef8817ce20ed84e28090604142608f7d99670aac9b WHIRLPOOL b80c94a820f096186b7cbb221707d88ef04f64a5400327b6193fbfbda053483d15d2e15fc69e9c2331d1f0475d5dccb7a39e40d271fcf699f8cba5dccbcc6fe9
 MISC metadata.xml 259 SHA256 1f2cf0891ca37f4268a47e2eaa69108868aaef98f78c06d56f4ec9cdecad4dd5 SHA512 c7fe3f4a41209e3816dbe12206254ed37ade121f56e0385f4b3cb5d0b463f15b86e3e92ed09e41675b74200014a521d949c3e20c0046c7d6d357aea39235a229 WHIRLPOOL c4e8c2b7ae4e244b02891fac60eb137a84809578c76a1c05d25d8287bf8a2e7e5dfb6248e6b3b207cdcfc9744b4b460a6f8c7763c0a9da2fc8c8efdcb5530840
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQGcBAEBCAAGBQJVGtD4AAoJEJQzkH1pP7W4QUoMAKrR+PtnqKuPmkv/kMIVBVvU
-ffBBDS5mjcxfl/eUSlufwJTptNmXbLosn1LEo+K/NhJHcTz7s9028nvb5k1lqSTf
-ghEYdHKvYvjOQotRyQSgB8acs+NtHdvRWv0OvvPftoiAB9KSRE5twBujrG+sK5MS
-D1xadicwralKYa7f1N+7nW78Xw06Ruyg52ZMIGZpLa84ivN5qyLDBlI3qH5o/zgh
-m1Kk1LpWaGyshps0UFPmV6BxX4TLqqH6QHqGQH0QT+CztMSGc02OqmU4eZz9vVmr
-b7p3GWBtbR9hUhD+amaQVvqOwb3qpVUJd83wLCf5yuQorYTHNeC7T+w81+eVf5PD
-IiIRrTg8gyZWivgd2uiFS2LbBFREKz7+vUqeP/OWIZn45pt8OVmQ/QGh+QgPhJ0X
-ka4NYcpx3RGkcEd8+iK6EyTdpuvvDvc2vtLCKRRedvIuv78NwQXH6yPqmX1rUi3x
-OJcJnSnTlR3z9NZeZx20v2/HMFj7gR54LNNwf9g/PA==
-=Q/V0
+iQJ8BAEBCABmBQJVgWfcXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ1RDFCODdDQUUxMkUwNkJCNjUyMDMxOEIy
+MzI0RTdCNTY2REYyNjExAAoJECMk57Vm3yYR8hAQAJJtNBigjaZrUyx6fKdEuwwz
+/miNiM61j+ClZyuIcynZY/yFyQpYLNt7TTAZ0wBgfgxmgG6nXgksGFF9NM7CF3x3
+a1bIdipyFoRs3imgunfxqxT19y5BrSTnuWsC/eKcJquGt8eBP81gFL1Wse1ZB7ei
+Mtlcu+MqihpRlP0puoW4wEeBvC9Xml8pWdM1yZfiblfwDi6dVHo6ZmPp/zYd4IG/
+4c4/Q1uxL6EP/J0RU125snFcUhCiXk2i8bnrXOADwkXZkhGs2hrSTTV5YIZveJZh
+pgGz+VGdQRcn/PFZhTKsokNbIj8dwmuSTo802aW7ySlR7B51HdEJJtJPVcGV1wSI
+z1HShVR03wtxClrDqW+I5cPMmYTD6d757wSpYXuej5MiwsErisEcMKXOLu1ULS2f
+aPKEQfHsBr+wBRNy+4YikB6fjkRpa7p3OVeBo0SaH2d5hziH2quVqBLCUOCzDtfo
+PGSgVLzKBUU9+t6AUP/9KKxL52oKQgC1tYl/432Vg6mnpzuY5quJl4hyMYXrlUV7
+AUwbhX/lXB2BMsW7UmQVZSxHyfVauSozokASlwho0n7D1Jd8++HULMm30BAGAogg
+c5vylSF0GpLc7p3oBrtlF5USjbSsDEjwvM5Mu1f+PPV2pyGB3GPSM9sI9Fi+txs5
+UIlfLRy3LMQPLSa9mPgB
+=qcUP
 -----END PGP SIGNATURE-----
diff --git a/app-eselect/eselect-opengl/eselect-opengl-1.2.7.ebuild b/app-eselect/eselect-opengl/eselect-opengl-1.2.7.ebuild
index 4d4b96ea191b..624a4c670f9b 100644
--- a/app-eselect/eselect-opengl/eselect-opengl-1.2.7.ebuild
+++ b/app-eselect/eselect-opengl/eselect-opengl-1.2.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-eselect/eselect-opengl/eselect-opengl-1.2.7.ebuild,v 1.1 2015/03/31 16:53:09 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-eselect/eselect-opengl/eselect-opengl-1.2.7.ebuild,v 1.2 2015/06/17 12:28:01 chithanh Exp $
 
 EAPI=4
 
@@ -33,7 +33,8 @@ RDEPEND=">=app-admin/eselect-1.2.4
 		 !=media-libs/mesa-10.3.5-r1
 		 !>=media-libs/mesa-10.3.7-r2
 		 !>=x11-proto/glproto-1.4.17-r1
-		 !=x11-base/xorg-server-1.16.2-r1"
+		 !=x11-base/xorg-server-1.16.4-r1
+		 !>=x11-base/xorg-server-1.16.4-r4"
 
 pkg_postinst() {
 	local impl="$(eselect opengl show)"
diff --git a/app-eselect/eselect-opengl/eselect-opengl-1.3.1-r2.ebuild b/app-eselect/eselect-opengl/eselect-opengl-1.3.1-r2.ebuild
deleted file mode 100644
index 5f760eafb86b..000000000000
--- a/app-eselect/eselect-opengl/eselect-opengl-1.3.1-r2.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-eselect/eselect-opengl/eselect-opengl-1.3.1-r2.ebuild,v 1.1 2015/03/31 16:53:09 ulm Exp $
-
-EAPI=5
-
-inherit eutils multilib
-
-DESCRIPTION="Utility to change the OpenGL interface being used"
-HOMEPAGE="http://www.gentoo.org/"
-
-# Source:
-# http://www.opengl.org/registry/api/glext.h
-# http://www.opengl.org/registry/api/glxext.h
-GLEXT="85"
-GLXEXT="34"
-
-MIRROR="http://dev.gentoo.org/~mattst88/distfiles"
-SRC_URI="http://dev.gentoo.org/~mgorny/dist/opengl.eselect-${PV}.xz"
-#	${MIRROR}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND="app-arch/xz-utils"
-RDEPEND=">=app-admin/eselect-1.2.4
-		 !<media-libs/mesa-10.3.4-r1
-		 !=media-libs/mesa-10.3.5
-		 !=media-libs/mesa-10.3.7-r1
-		 !<x11-proto/glproto-1.4.17-r1
-		 !<x11-base/xorg-server-1.16.2-r1
-		 !<x11-drivers/ati-drivers-14.9-r2
-		 !=x11-drivers/ati-drivers-14.12
-		 !<=app-emulation/emul-linux-x86-opengl-20140508"
-
-S=${WORKDIR}
-
-pkg_pretend() {
-	local f
-	for f in "${EROOT%/}"/etc/X11/xorg.conf{,.d/*}; do
-		if [[ ${f} != *20opengl.conf ]]; then
-			if grep -q -r -s "Section.*Files" "${f}"
-			then
-				ewarn "Your ${f} file seems to contain Section 'Files'. This is known to break"
-				ewarn 'eselect-opengl-1.3*. If you need a custom Files setup, please downgrade'
-				ewarn 'to <eselect-opengl-1.3. We are sorry for the issues, we are working'
-				ewarn 'on a more permanent solution.'
-			fi
-		fi
-	done
-}
-
-pkg_preinst() {
-	# we may be moving the config file, so get it early
-	OLD_IMPL=$(eselect opengl show)
-}
-
-pkg_postinst() {
-	if path_exists "${EROOT}"/usr/lib*/opengl; then
-		# delete broken symlinks
-		find "${EROOT}"/usr/lib*/opengl -xtype l -delete
-		# delete empty leftover directories (they confuse eselect)
-		find "${EROOT}"/usr/lib*/opengl -depth -type d -empty -exec rmdir -v {} +
-	fi
-
-	if [[ -n "${OLD_IMPL}" && "${OLD_IMPL}" != '(none)' ]] ; then
-		eselect opengl set "${OLD_IMPL}"
-	fi
-	if [[ -f ${EROOT}/etc/env.d/03opengl ]]; then
-		# remove the old file, moved now
-		rm -vf "${EROOT}"/etc/env.d/03opengl
-	fi
-}
-
-src_prepare() {
-	# don't die on Darwin users
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		sed -i -e 's/libGL\.so/libGL.dylib/' opengl.eselect || die
-	fi
-}
-
-src_install() {
-	insinto "/usr/share/eselect/modules"
-	newins opengl.eselect-${PV} opengl.eselect
-#	doman opengl.eselect.5
-}
diff --git a/app-eselect/eselect-opengl/eselect-opengl-1.3.1-r4.ebuild b/app-eselect/eselect-opengl/eselect-opengl-1.3.1-r4.ebuild
index d9f7696ce9bc..5d569c032aa1 100644
--- a/app-eselect/eselect-opengl/eselect-opengl-1.3.1-r4.ebuild
+++ b/app-eselect/eselect-opengl/eselect-opengl-1.3.1-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-eselect/eselect-opengl/eselect-opengl-1.3.1-r4.ebuild,v 1.1 2015/03/31 16:53:09 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-eselect/eselect-opengl/eselect-opengl-1.3.1-r4.ebuild,v 1.2 2015/06/17 12:28:01 chithanh Exp $
 
 EAPI=5
 
@@ -31,6 +31,7 @@ RDEPEND=">=app-admin/eselect-1.2.4
 		 !=media-libs/mesa-10.3.7-r1
 		 !<x11-proto/glproto-1.4.17-r1
 		 !<x11-base/xorg-server-1.16.4-r1
+		 !=x11-base/xorg-server-1.16.4-r3
 		 !~x11-base/xorg-server-1.17.0
 		 !=x11-base/xorg-server-1.17.1
 		 !<x11-drivers/ati-drivers-14.9-r2