4 files changed, 62 insertions, 15 deletions
diff --git a/x11-proto/glproto/ChangeLog b/x11-proto/glproto/ChangeLog
index 3ab6c6c22c74..ab268a10b03e 100644
--- a/x11-proto/glproto/ChangeLog
+++ b/x11-proto/glproto/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-proto/glproto
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-proto/glproto/ChangeLog,v 1.74 2010/05/27 08:57:03 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-proto/glproto/ChangeLog,v 1.75 2010/08/10 14:10:56 scarabeus Exp $
+
+*glproto-1.4.12 (10 Aug 2010)
+
+  10 Aug 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  +glproto-1.4.12.ebuild:
+  Version bump.
 
   27 May 2010; Tomáš Chvátal <scarabeus@gentoo.org>
   -glproto-1.4.10.ebuild:
diff --git a/x11-proto/glproto/Manifest b/x11-proto/glproto/Manifest
index 1c5d4fe08a78..a55ba6015c7f 100644
--- a/x11-proto/glproto/Manifest
+++ b/x11-proto/glproto/Manifest
@@ -1,14 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 DIST glproto-1.4.11.tar.bz2 108416 RMD160 718d99815c26d5b810ecf61bd6e67e8f49306ade SHA1 7c2a723d488dc0e09e7e0e28bde838502d774b16 SHA256 fe481d89d74f01db4f3a671ef1f29df29da74dff5b678517ee659a6f9d819451
+DIST glproto-1.4.12.tar.bz2 106968 RMD160 be4b6a8277681c5fd9be2bd87a0085de538ad721 SHA1 50f8bdae2c71b4bc4df421102f5f08a3fc417779 SHA256 48be7a9d190b600210e5ad08b4e8862a6b08e72dc52dbdf324716a888eb457de
 EBUILD glproto-1.4.11.ebuild 1421 RMD160 5e8178ab1fc52c69f3033feeaf666f72eab2c3c0 SHA1 abc76848bf8cddf862adc84ba097dff62d5978a2 SHA256 6eec1eacddaf196e9c6972a3c0422570694312fc4ec88b4ca624d95f6e86ea68
-MISC ChangeLog 8713 RMD160 17260d7e7920e192e8edc74dde44702358cc482d SHA1 4d2a4a9f9ac669d5f7b807e03247e5556a7336b7 SHA256 c2f08cba1734fa43b4ed26c4a20e9bdb678bf1f07160f96d3c570f95cbdc42c9
+EBUILD glproto-1.4.12.ebuild 1339 RMD160 cb6b6f242c75dc2337f5dc46854972add1c28976 SHA1 1419a8de612a834aa7a790e37d292d2b5e52838b SHA256 9c3caf01942a1cdce61ad04a12001f943166f37dd4ea20e0c65b69a0f64db0d1
+MISC ChangeLog 8842 RMD160 53162dfd2702762777d0d8930ecd48f70f310aa4 SHA1 89eb89d755984cc97edd4226f3d84f26ee533329 SHA256 5b958f22a49af12191225f0701c7a5bb154e4e15df6a4f3d59e68f5e1f71051c
 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iEYEARECAAYFAkv+M9UACgkQHB6c3gNBRYcSnwCfclDLsjzqKSzuMTC7eRhBwM8e
-WmkAoLhW6d5iT3bK+GVDSyQJcOLpXlNQ
-=psUL
------END PGP SIGNATURE-----
diff --git a/x11-proto/glproto/glproto-1.4.12.ebuild b/x11-proto/glproto/glproto-1.4.12.ebuild
new file mode 100644
index 000000000000..398414387ec7
--- /dev/null
+++ b/x11-proto/glproto/glproto-1.4.12.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-proto/glproto/glproto-1.4.12.ebuild,v 1.1 2010/08/10 14:10:56 scarabeus Exp $
+
+EAPI=3
+inherit xorg-2
+
+OPENGL_DIR="xorg-x11"
+
+DESCRIPTION="X.Org GL protocol headers"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x64-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+LICENSE="SGI-B-2.0"
+IUSE=""
+
+RDEPEND="app-admin/eselect-opengl"
+DEPEND=""
+
+src_install() {
+	xorg-2_src_install
+	dynamic_libgl_install
+}
+
+pkg_postinst() {
+	xorg-2_pkg_postinst
+	switch_opengl_implem
+}
+
+dynamic_libgl_install() {
+	# next section is to setup the dynamic libGL stuff
+	ebegin "Moving GL files for dynamic switching"
+		dodir /usr/$(get_libdir)/opengl/${OPENGL_DIR}/include
+		local x=""
+		# glext.h added for #54984
+		for x in "${D}"/usr/include/GL/{glxtokens.h,glxmd.h,glxproto.h}; do
+			if [[ -f ${x} || -L ${x} ]]; then
+				mv -f "${x}" "${D}"/usr/$(get_libdir)/opengl/${OPENGL_DIR}/include
+			fi
+		done
+	eend 0
+}
+
+switch_opengl_implem() {
+	# Switch to the xorg implementation.
+	# Use new opengl-update that will not reset user selected
+	# OpenGL interface ...
+	echo
+	eselect opengl set --use-old ${OPENGL_DIR}
+}
diff --git a/x11-proto/kbproto/Manifest b/x11-proto/kbproto/Manifest
index 73a26aaaa2c7..e1ca3f2baafb 100644
--- a/x11-proto/kbproto/Manifest
+++ b/x11-proto/kbproto/Manifest
@@ -1,6 +1,6 @@
-DIST kbproto-1.0.3.tar.bz2 57440 RMD160 6547c6482a30c2b7feac09d71e9cc60dd97bc8b4 SHA1 57d0987ce2cb81a9491b1bbf433142730de89181 SHA256 7000005ebbd07a28a71477d72bcb76c47064e043a4ead26fcf4d5af394ce19df
 DIST kbproto-1.0.4.tar.bz2 104959 RMD160 f72fc1477a2200cc90ee821a3942c5e3acd4294d SHA1 d300745389d3a80d90c9a3c989651f228db486e5 SHA256 1baa29931313d0c3eb81dffd42662768cc76ce49ce94024d5fe32ef5a4e8603c
-EBUILD kbproto-1.0.3.ebuild 468 RMD160 3b55b0dff38e0183fbc70d51fd91f365866b4863 SHA1 18f8508ec5b172d1296b584cc659494a54ea3452 SHA256 10034da6fa8c53b1c51ff9bcdef2e359c237a6139401001d3ac1979a8b3013d3
+DIST kbproto-1.0.5.tar.bz2 111270 RMD160 76f97a2a2e40328bd91a7a9de4030ceac788fb6e SHA1 d95fada09399568c434729b436e1a09503e15b7a SHA256 0eba4f525e1700798cc0585fe29556e4369fba6517c670866273ad104cf5f49d
 EBUILD kbproto-1.0.4.ebuild 589 RMD160 303dae838128eb065bb19c92d0e260b878828b52 SHA1 f21758864a90808bc5c3188f0172fe1818f7dc33 SHA256 cad533826e905f65dbf12c9e4f8c92fc2ebbadbf42e09da6de7311d355cf5098
-MISC ChangeLog 5460 RMD160 30d47a17071daee60901aba20b3241a5ab60fadc SHA1 4a68139fb5bfff256dddf37c96c2b2a29e24c70a SHA256 4fdbf5fc1af31ccbf3b4d21565aa805413eeda54b4ce2b1a214fb9e100489056
+EBUILD kbproto-1.0.5.ebuild 605 RMD160 608beae1b272f2fd6f058993789953e88e62e9d3 SHA1 ee3b8e30c0036f0c144c2736062b441a7762ed83 SHA256 82a93a81dded2f2ea8a1931570eee440d3a5e2c0e01f59ea662caeb83c734ca1
+MISC ChangeLog 5612 RMD160 df229d3043e3614ec31dc3e14f2a486c801d4262 SHA1 931f0f84143ab269d885de9ba96c56f24ee5e8fc SHA256 bb1c7c970d7b4ec9046a07a54b5671156608a029303d4f47a907f8bee35cf3be
 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055