Version bump. Remove old.

(Portage version: 2.2.7/cvs/Linux x86_64, unsigned Manifest commit)

4 files changed, 15 insertions, 79 deletions

diff --git a/x11-proto/glproto/ChangeLog b/x11-proto/glproto/ChangeLog
index edcc611f4a08..22f2044d0478 100644
--- a/x11-proto/glproto/ChangeLog
+++ b/x11-proto/glproto/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-proto/glproto
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-proto/glproto/ChangeLog,v 1.113 2013/09/21 17:09:16 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-proto/glproto/ChangeLog,v 1.114 2013/12/10 19:18:03 chithanh Exp $
+
+*glproto-1.4.17 (10 Dec 2013)
+
+  10 Dec 2013; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  +glproto-1.4.17.ebuild, -glproto-1.4.14-r1.ebuild, -glproto-1.4.15-r1.ebuild,
+  -glproto-1.4.15.ebuild:
+  Version bump. Remove old.
 
 *glproto-1.4.16-r1 (21 Sep 2013)
 
diff --git a/x11-proto/glproto/glproto-1.4.14-r1.ebuild b/x11-proto/glproto/glproto-1.4.14-r1.ebuild
deleted file mode 100644
index 1abca5acc824..000000000000
--- a/x11-proto/glproto/glproto-1.4.14-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-proto/glproto/glproto-1.4.14-r1.ebuild,v 1.7 2011/10/03 18:08:39 josejx Exp $
-
-EAPI=4
-inherit xorg-2
-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-1.2.3"
-DEPEND=""
-
-src_install() {
-	xorg-2_src_install
-	dynamic_libgl_install
-}
-
-pkg_postinst() {
-	xorg-2_pkg_postinst
-	eselect opengl set --ignore-missing --use-old xorg-x11
-}
-
-dynamic_libgl_install() {
-	# next section is to setup the dynamic libGL stuff
-	ebegin "Moving GL files for dynamic switching"
-		dodir /usr/$(get_libdir)/opengl/xorg-x11/include
-		local x=""
-		# glext.h added for #54984
-		for x in "${ED}"/usr/include/GL/{glxtokens.h,glxmd.h,glxproto.h}; do
-			if [[ -f ${x} || -L ${x} ]]; then
-				mv -f "${x}" "${ED}"/usr/$(get_libdir)/opengl/xorg-x11/include
-			fi
-		done
-	eend 0
-}
diff --git a/x11-proto/glproto/glproto-1.4.15.ebuild b/x11-proto/glproto/glproto-1.4.15.ebuild
deleted file mode 100644
index 15d2d6e961d6..000000000000
--- a/x11-proto/glproto/glproto-1.4.15.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-proto/glproto/glproto-1.4.15.ebuild,v 1.9 2012/08/26 18:12:28 armin76 Exp $
-
-EAPI=4
-inherit xorg-2
-DESCRIPTION="X.Org GL protocol headers"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~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-1.2.3"
-DEPEND=""
-
-src_install() {
-	xorg-2_src_install
-	dynamic_libgl_install
-}
-
-pkg_postinst() {
-	xorg-2_pkg_postinst
-	eselect opengl set --ignore-missing --use-old xorg-x11
-}
-
-dynamic_libgl_install() {
-	# next section is to setup the dynamic libGL stuff
-	ebegin "Moving GL files for dynamic switching"
-		dodir /usr/$(get_libdir)/opengl/xorg-x11/include
-		local x=""
-		# glext.h added for #54984
-		for x in "${ED}"/usr/include/GL/{glxtokens.h,glxmd.h,glxproto.h}; do
-			if [[ -f ${x} || -L ${x} ]]; then
-				mv -f "${x}" "${ED}"/usr/$(get_libdir)/opengl/xorg-x11/include
-			fi
-		done
-	eend 0
-}
diff --git a/x11-proto/glproto/glproto-1.4.15-r1.ebuild b/x11-proto/glproto/glproto-1.4.17.ebuild
index 194d790ddc5c..5275beace564 100644
--- a/x11-proto/glproto/glproto-1.4.15-r1.ebuild
+++ b/x11-proto/glproto/glproto-1.4.17.ebuild
@@ -1,11 +1,14 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-proto/glproto/glproto-1.4.15-r1.ebuild,v 1.1 2012/06/05 11:48:30 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-proto/glproto/glproto-1.4.17.ebuild,v 1.1 2013/12/10 19:18:03 chithanh Exp $
 
-EAPI=4
+EAPI=5
+
+XORG_MULTILIB=yes
 inherit xorg-2
+
 DESCRIPTION="X.Org GL protocol headers"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 LICENSE="SGI-B-2.0"
 IUSE=""