Cleanup.

(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 17A85C72)

3 files changed, 6 insertions, 67 deletions

diff --git a/dev-qt/qtopengl/ChangeLog b/dev-qt/qtopengl/ChangeLog
index cc265419176d..eb3ae86ae090 100644
--- a/dev-qt/qtopengl/ChangeLog
+++ b/dev-qt/qtopengl/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-qt/qtopengl
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtopengl/ChangeLog,v 1.11 2014/01/26 11:56:00 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtopengl/ChangeLog,v 1.12 2014/01/26 18:02:25 pesa Exp $
+
+  26 Jan 2014; Davide Pesavento <pesa@gentoo.org> -qtopengl-4.8.4.ebuild,
+  metadata.xml:
+  Cleanup.
 
   26 Jan 2014; Agostino Sarubbo <ago@gentoo.org> qtopengl-4.8.5.ebuild:
   Stable for ia64, wrt bug #494728
diff --git a/dev-qt/qtopengl/metadata.xml b/dev-qt/qtopengl/metadata.xml
index 6fb8805f1644..d410c710cc60 100644
--- a/dev-qt/qtopengl/metadata.xml
+++ b/dev-qt/qtopengl/metadata.xml
@@ -3,11 +3,10 @@
 <pkgmetadata>
 	<herd>qt</herd> 
 	<use>
-		<flag name="c++0x">Build Qt using the C++11 standard</flag>
 		<flag name="egl">Use EGL instead of default GLX to manage OpenGL
 			contexts on the desktop</flag>
 		<flag name="exceptions">Add support for exceptions - like catching them
-			inside the event loop (recommended by Nokia)</flag>
+			inside the event loop (recommended by upstream)</flag>
 		<flag name="qt3support">Enable the Qt3Support libraries for Qt4</flag>
 	</use>
 	<upstream>
diff --git a/dev-qt/qtopengl/qtopengl-4.8.4.ebuild b/dev-qt/qtopengl/qtopengl-4.8.4.ebuild
deleted file mode 100644
index 9f9515f7b54e..000000000000
--- a/dev-qt/qtopengl/qtopengl-4.8.4.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtopengl/qtopengl-4.8.4.ebuild,v 1.1 2013/03/02 15:31:52 yngwin Exp $
-
-EAPI=4
-
-inherit qt4-build
-
-DESCRIPTION="The OpenGL module for the Qt toolkit"
-SLOT="4"
-if [[ ${QT4_BUILD_TYPE} == live ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-fi
-IUSE="egl qt3support"
-
-DEPEND="
-	virtual/opengl
-	~dev-qt/qtcore-${PV}[aqua=,debug=,qt3support=]
-	~dev-qt/qtgui-${PV}[aqua=,debug=,egl=,qt3support=]
-"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	QT4_TARGET_DIRECTORIES="
-		src/opengl
-		src/plugins/graphicssystems/opengl"
-
-	QT4_EXTRACT_DIRECTORIES="
-		include/QtCore
-		include/QtGui
-		include/QtOpenGL
-		src/corelib
-		src/gui
-		src/opengl
-		src/plugins
-		src/3rdparty"
-
-	QCONFIG_ADD="opengl"
-	QCONFIG_DEFINE="QT_OPENGL"
-
-	qt4-build_pkg_setup
-}
-
-src_configure() {
-	myconf+="
-		-opengl
-		$(qt_use qt3support)
-		$(qt_use egl)"
-
-	qt4-build_src_configure
-
-	# Not building tools/designer/src/plugins/tools/view3d as it's
-	# commented out of the build in the source
-}
-
-src_install() {
-	qt4-build_src_install
-
-	# touch the available graphics systems
-	dodir /usr/share/qt4/graphicssystems
-	echo "experimental" > "${ED}"/usr/share/qt4/graphicssystems/opengl || die
-}