Version bump. Remove old.

(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 0x2324E7B566DF2611!)

8 files changed, 49 insertions, 245 deletions

diff --git a/media-libs/freeglut/ChangeLog b/media-libs/freeglut/ChangeLog
index 1e378fcf1c4b..dfb3a972e8e2 100644
--- a/media-libs/freeglut/ChangeLog
+++ b/media-libs/freeglut/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-libs/freeglut
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/freeglut/ChangeLog,v 1.118 2015/03/03 08:24:11 dlan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/freeglut/ChangeLog,v 1.119 2015/03/27 00:43:55 chithanh Exp $
+
+*freeglut-3.0.0 (27 Mar 2015)
+
+  27 Mar 2015; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  +freeglut-3.0.0.ebuild, -files/2.6.0-GFX_radeon.patch, -freeglut-2.6.0.ebuild,
+  -freeglut-2.8.0-r1.ebuild, -freeglut-2.8.0.ebuild, -freeglut-2.8.1.ebuild,
+  metadata.xml:
+  Version bump. Remove old.
 
   03 Mar 2015; Yixun Lan <dlan@gentoo.org> freeglut-2.8.1-r1.ebuild:
   add arm64 support, tested on A53 board
diff --git a/media-libs/freeglut/files/2.6.0-GFX_radeon.patch b/media-libs/freeglut/files/2.6.0-GFX_radeon.patch
deleted file mode 100644
index 8806fe849cb5..000000000000
--- a/media-libs/freeglut/files/2.6.0-GFX_radeon.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Index: src/freeglut_window.c
-===================================================================
---- src/freeglut_window.c	(Revision 832)
-+++ src/freeglut_window.c	(Arbeitskopie)
-@@ -594,10 +594,9 @@
- #if TARGET_HOST_POSIX_X11
-     if ( window )
-     {
--        glXMakeContextCurrent(
-+        glXMakeCurrent(
-             fgDisplay.Display,
-             window->Window.Handle,
--            window->Window.Handle,
-             window->Window.Context
-         );
- 
-@@ -932,10 +932,9 @@
-     XSetWMProtocols( fgDisplay.Display, window->Window.Handle,
-                      &fgDisplay.DeleteWindow, 1 );
- 
--    glXMakeContextCurrent(
-+    glXMakeCurrent(
-         fgDisplay.Display,
-         window->Window.Handle,
--        window->Window.Handle,
-         window->Window.Context
-     );
- 
diff --git a/media-libs/freeglut/freeglut-2.6.0.ebuild b/media-libs/freeglut/freeglut-2.6.0.ebuild
deleted file mode 100644
index bbaebe6cef5a..000000000000
--- a/media-libs/freeglut/freeglut-2.6.0.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/freeglut/freeglut-2.6.0.ebuild,v 1.14 2011/04/04 18:46:24 scarabeus Exp $
-
-EAPI=3
-
-inherit eutils flag-o-matic libtool autotools
-
-DESCRIPTION="A completely OpenSourced alternative to the OpenGL Utility Toolkit (GLUT) library"
-HOMEPAGE="http://freeglut.sourceforge.net/"
-SRC_URI="mirror://sourceforge/freeglut/${P/_/-}.tar.gz
-	mpx? ( http://tisch.sourceforge.net/freeglut-2.6.0-mpx-r6.patch )"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="debug mpx static-libs"
-
-RDEPEND="
-	virtual/opengl
-	virtual/glu
-	>=x11-libs/libXi-1.3
-	x11-libs/libXxf86vm
-"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${P/_*/}"
-
-src_prepare() {
-	epatch "${FILESDIR}/${PV}-GFX_radeon.patch"
-
-	use mpx && epatch "${DISTDIR}/${P}-mpx-r6.patch"
-
-	# Please read the comments in the patch before thinking about dropping it
-	# yet again...
-	epatch "${FILESDIR}/${PN}-2.4.0-bsd-usb-joystick.patch"
-
-	eautoreconf
-	# Needed for sane .so versionning on bsd, please don't drop
-	elibtoolize
-}
-
-src_configure() {
-	econf \
-		--disable-warnings \
-		--disable-warnings-as-errors \
-		--enable-replace-glut \
-		$(use_enable static-libs static) \
-		$(use_enable debug)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-	dodoc AUTHORS ChangeLog NEWS README TODO || die "dodoc failed"
-	dohtml -r doc/*.html doc/*.png || die "dohtml failed"
-	find "${ED}" -name '*.la' -delete
-}
diff --git a/media-libs/freeglut/freeglut-2.8.0-r1.ebuild b/media-libs/freeglut/freeglut-2.8.0-r1.ebuild
deleted file mode 100644
index cbd06a069fa3..000000000000
--- a/media-libs/freeglut/freeglut-2.8.0-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/freeglut/freeglut-2.8.0-r1.ebuild,v 1.8 2013/03/03 13:01:44 vapier Exp $
-
-EAPI=4
-inherit eutils libtool
-
-DESCRIPTION="A completely OpenSourced alternative to the OpenGL Utility Toolkit (GLUT) library"
-HOMEPAGE="http://freeglut.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="debug static-libs"
-
-RDEPEND="virtual/glu
-	virtual/opengl
-	x11-libs/libX11
-	x11-libs/libXext
-	>=x11-libs/libXi-1.3
-	x11-libs/libXrandr
-	x11-libs/libXxf86vm"
-DEPEND="${RDEPEND}
-	x11-proto/inputproto
-	x11-proto/xproto"
-
-DOCS="AUTHORS ChangeLog NEWS README TODO"
-
-src_prepare() {
-	# Please read the comments in the patch before thinking about dropping it
-	# yet again...
-	epatch "${FILESDIR}"/${PN}-2.4.0-bsd-usb-joystick.patch
-
-	# smooth_opengl3 demo doesn't build with recent mesa, bug #428382
-	sed -i "s/smooth_opengl3 //" progs/demos/Makefile.* || die
-
-	# Needed for sane .so versionning on bsd, please don't drop
-	elibtoolize
-}
-
-src_configure() {
-	econf \
-		$(use_enable static-libs static) \
-		--enable-replace-glut \
-		$(use_enable debug)
-}
-
-src_install() {
-	default
-	dohtml -r doc
-	find "${ED}" -name '*.la' -exec rm -f {} +
-}
diff --git a/media-libs/freeglut/freeglut-2.8.0.ebuild b/media-libs/freeglut/freeglut-2.8.0.ebuild
deleted file mode 100644
index 5a31895dc70f..000000000000
--- a/media-libs/freeglut/freeglut-2.8.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/freeglut/freeglut-2.8.0.ebuild,v 1.9 2012/05/10 18:28:01 aballier Exp $
-
-EAPI=4
-inherit eutils libtool
-
-DESCRIPTION="A completely OpenSourced alternative to the OpenGL Utility Toolkit (GLUT) library"
-HOMEPAGE="http://freeglut.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="debug static-libs"
-
-RDEPEND="virtual/glu
-	virtual/opengl
-	x11-libs/libX11
-	x11-libs/libXext
-	>=x11-libs/libXi-1.3
-	x11-libs/libXrandr
-	x11-libs/libXxf86vm"
-DEPEND="${RDEPEND}
-	x11-proto/inputproto
-	x11-proto/xproto"
-
-DOCS="AUTHORS ChangeLog NEWS README TODO"
-
-src_prepare() {
-	# Please read the comments in the patch before thinking about dropping it
-	# yet again...
-	epatch "${FILESDIR}"/${PN}-2.4.0-bsd-usb-joystick.patch
-
-	# Needed for sane .so versionning on bsd, please don't drop
-	elibtoolize
-}
-
-src_configure() {
-	econf \
-		$(use_enable static-libs static) \
-		--enable-replace-glut \
-		$(use_enable debug)
-}
-
-src_install() {
-	default
-	dohtml -r doc
-	find "${ED}" -name '*.la' -exec rm -f {} +
-}
diff --git a/media-libs/freeglut/freeglut-2.8.1.ebuild b/media-libs/freeglut/freeglut-2.8.1.ebuild
deleted file mode 100644
index 39fc4e850379..000000000000
--- a/media-libs/freeglut/freeglut-2.8.1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/freeglut/freeglut-2.8.1.ebuild,v 1.10 2013/10/08 05:02:03 ago Exp $
-
-EAPI=5
-inherit eutils libtool
-
-DESCRIPTION="A completely OpenSourced alternative to the OpenGL Utility Toolkit (GLUT) library"
-HOMEPAGE="http://freeglut.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="debug static-libs"
-
-RDEPEND="virtual/glu
-	virtual/opengl
-	x11-libs/libX11
-	x11-libs/libXext
-	>=x11-libs/libXi-1.3
-	x11-libs/libXrandr
-	x11-libs/libXxf86vm"
-DEPEND="${RDEPEND}
-	x11-proto/inputproto
-	x11-proto/xproto"
-
-DOCS="AUTHORS ChangeLog NEWS README TODO"
-
-src_prepare() {
-	# Please read the comments in the patch before thinking about dropping it
-	# yet again...
-	epatch "${FILESDIR}"/${PN}-2.4.0-bsd-usb-joystick.patch
-
-	# Needed for sane .so versionning on bsd, please don't drop
-	elibtoolize
-}
-
-src_configure() {
-	econf \
-		$(use_enable static-libs static) \
-		--enable-replace-glut \
-		$(use_enable debug)
-}
-
-src_install() {
-	default
-	dohtml -r doc
-	find "${ED}" -name '*.la' -exec rm -f {} +
-}
diff --git a/media-libs/freeglut/freeglut-3.0.0.ebuild b/media-libs/freeglut/freeglut-3.0.0.ebuild
new file mode 100644
index 000000000000..bafd0c8d9282
--- /dev/null
+++ b/media-libs/freeglut/freeglut-3.0.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/freeglut/freeglut-3.0.0.ebuild,v 1.1 2015/03/27 00:43:55 chithanh Exp $
+
+EAPI=5
+inherit cmake-multilib
+
+DESCRIPTION="A completely OpenSourced alternative to the OpenGL Utility Toolkit (GLUT) library"
+HOMEPAGE="http://freeglut.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="debug static-libs"
+
+# enabling GLES support seems to cause build failures
+RDEPEND=">=virtual/glu-9.0-r1[${MULTILIB_USEDEP}]
+	>=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]
+	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+	>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+	>=x11-libs/libXi-1.7.2[${MULTILIB_USEDEP}]
+	>=x11-libs/libXrandr-1.4.2[${MULTILIB_USEDEP}]
+	>=x11-libs/libXxf86vm-1.1.3[${MULTILIB_USEDEP}]
+	abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] )"
+# gles? ( media-libs/mesa[gles1,${MULTILIB_USEDEP}] )
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	>=x11-proto/inputproto-2.3[${MULTILIB_USEDEP}]
+	>=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]"
+
+HTML_DOCS=( doc/. )
+
+src_configure() {
+	local mycmakeargs=(
+		"-DFREEGLUT_GLES=OFF"
+	)
+#	$(cmake-utils_use gles FREEGLUT_GLES)
+	cmake-multilib_src_configure
+}
diff --git a/media-libs/freeglut/metadata.xml b/media-libs/freeglut/metadata.xml
index ac6ab69abc52..f5aefb9652d6 100644
--- a/media-libs/freeglut/metadata.xml
+++ b/media-libs/freeglut/metadata.xml
@@ -2,12 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>x11</herd>
-<use>
-	<flag name="mpx">
-		Enable support for multi-pointer-X. One pointer for each pointer
-		device.
-	</flag>
-</use>
 <longdescription>
 	Freeglut provides an open-source alternative to the OpenGL Utility Toolkit
 	(GLUT) library. It is actively developed and maintained, while not being