Cleanup.

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x17A85C72

4 files changed, 21 insertions, 84 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/Manifest b/dev-qt/qtopengl/Manifest
index b2c9d09e8105..82bba1c44422 100644
--- a/dev-qt/qtopengl/Manifest
+++ b/dev-qt/qtopengl/Manifest
@@ -1,26 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST qt-everywhere-opensource-src-4.8.4.tar.gz 236593028 SHA256 33b0e38ba4c54a0cf8a4be8ca5a4584f1c2e0adfecb57b21d9d1d267b0093270 SHA512 472972b63b5cad83b4c4656b23e95b6d4923cc31a518138e25d5921982b14abc835883356c2b779a7972cb77cf73fe25b46630be7c6a86a917b364186aa17496 WHIRLPOOL 9d250ee9ddd0431eeabc22ea598eda2bc74ee7ee6c5329522c479143d6c38fa17ae545541b4e3220b05d493c1a5d407c70980d0d1ffa49d2f83dedc1774cfa79
 DIST qt-everywhere-opensource-src-4.8.5.tar.gz 241491467 SHA256 eb728f8268831dc4373be6403b7dd5d5dde03c169ad6882f9a8cb560df6aa138 SHA512 47118d1aa30c59a1eb74e805023cd060edcb35bb0944fe6651889254b75acbd4b83700ba92a9bc215663474d26330cb44f084098c380fac9270742659e5864eb WHIRLPOOL a18f47fd91b522d1543e415aff4f5056202e0cab03da9cfcae9fe2d4118cb1dd1d5fd6a5e2edb9c1e4a68563188d44440e234d268d9c0aef6e3ca3f0988dd357
-EBUILD qtopengl-4.8.4.ebuild 1435 SHA256 aecb13b6b598a93e3ddc42722b9ef470f23e37870b5244a52c9ae2c22e5d01a6 SHA512 95db1cc3f8b0cede3fda810a1f308b45b0a5836b78d6e310b8b485f5e0864997690aadf04928f3436e36504f739bfab5b8ee3cc2acc56fb24e94966279178583 WHIRLPOOL 3ca29cf71215519bc2c7c500d8f385fa6ce4675fdf3a12c5371a6d276e80c2cc741b70f4de0ef70f31e677447772e4e01bd1d9ee447acf8ec452c6a6f5c4cb43
 EBUILD qtopengl-4.8.5.ebuild 1433 SHA256 75d5b483dfe2fe09532a61ffe907760f9e7bdeb56750a852bded1135f88f185c SHA512 7e99694d0c783e70e9bbc001a6ce9703a6cc838c1960f7ec9eea0966347778061770db091556e7100326653062d1846fb9b31b3e352ada1bedee6814b6aa5fa2 WHIRLPOOL 71211727da94a51a8ce3a3c06b70ed23a1b92ee21d52c6a13f4368083dd052479f07c420a620b4e5d5e9e58f037438f720c8a6f55631b781cc82104c5560808c
-MISC ChangeLog 18449 SHA256 c27ab4d62e031a3641ba4c92714adde4734fdc2162db46345d994e6fb6835250 SHA512 61966a77f385869beaeb3db1e8b285f89a8a9f9fa6b7f28375466ae2ae40790be9f657c8610214fa415789b434f5538f1e0797b724131df41f37de08886a8a88 WHIRLPOOL 6085c2ed07b45694f4ed7fc7e6d75747f20466028c6a84427df6518c7a731eff4b8e5a60c1b7d8a9072cbcd115c24e82d79c5e5850c1f5290a7bc7dc7dce7370
-MISC metadata.xml 658 SHA256 7fdec67782aa5420b8fa978bceb6a109ef6e2f0cc0b466489536f8eb7ef329a7 SHA512 69d59057bb9873e6a7d99269346c2d3d4f1cccbe0f3b1dc08ff7abb1bb6196aebf9d2c763a4b0c07401cb0a8c8103784fa9c79254551c70a210a1df61b35069c WHIRLPOOL 81d2b4d2b324f87f25f1b4042efbe532900eccf5313f1fc5ab4649293a560e55660d2afbada1a5d066483b548b658edc2f8e86fbd1767c66e3aba7867173d62a
+MISC ChangeLog 18552 SHA256 352215ce4dc0445ec7688ffd8db84617b16e1f0e087eba889f2e34343ad06734 SHA512 e1bfaf16a83a8a12036d79e7e76c90dfc2450171e5ebc190fce9bdf59ca3d5bdcacd686cbd64334c76db42e0d2b1d1ec73466ba2ccfcd0a976d3b9383eab0572 WHIRLPOOL 69fb94b2917a3ce9bea18e0b0dca3ab3e687a5ac1a587cf2fbc42204658b79c29ac1863a05aa905e3b2552e708ddaba24339fef7cf5446b31128949e7c1079a3
+MISC metadata.xml 599 SHA256 b8e9d5329156d33cce6e184e6871ab588be27371c58411fdb9587dc538e6b403 SHA512 67ca388452933e1b87a6857c11be92dd1c29d1daf44a0e000bda38d31ac3f931c037fbc1e1dc6f822dce768a387b4e23c777e164dc4b39cc07cb3d62014ae17d WHIRLPOOL 661eb46c28d066b3479e6b6ac21dfd87e76c1cd217dd968145f5c709f08cc4d2f9179f7748ed52a11a2cd8d8c5b108605affd49f5331b1d32edf91c40b237da1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJS5PfRAAoJELp701BxlEWf1ucQAIbPG8g9NFjd8nHpS7LMTnbt
-Y8hD1YiTxjKx8LfUb41q1X1fbP3jFh+4X+xO+AQbSEIHx7PPNR/KshuWlXj0CXJi
-/+YGjZ+SNLZA63P+c85kv1Quj4xYFBLAuXHNz985DHdXCyFct1guMTPle6GWoopq
-bZxin4J7ml8GvI0m9RO90++CBiuS5sPVwol3j7ulTVTIScSu2DAf3cLs0g6k2tm7
-fTiIT9qRUD00I/rkf5n+T/is+V1olNQmejNBqwirP2/VzcfDqwDKow0EesofnlWy
-Va5JdXcQmWg8Hep8KRTpnIPf0AvjuZ6bwIKwPVo7pZpWCzqQrf8f+paSRT1O9KGh
-5653KFfD9yc8hH13icq+sNLix5DD3CWnqNddTTrvcdecQu3M17QgWXemaeCqZB91
-L1/1otRp3C9frVsEIlBinLLsMngFvfjXJNHaJpC75Oz5RNP6gANZC7ycqIA1a21u
-rzgYY58+uD8JBOINiaUYU2WipZFijddFQCE4ph859Jme3iQRrGJug4yUwnOi65QQ
-ftAAF5oI28iJmMsmD9vjukuJup8JkJHXYNyqZXPzJ36Rvfcq4ny9p92rX7Rh4IwP
-ZLbHoS8e0xybSehL9ZKolmD2ImCyXQw+59BpbLi/Aq7kfqDvmYmEHrS/0gDbX4H6
-XAOagxC4/igrHdKOCxTF
-=dZjt
+iQIcBAEBCAAGBQJS5U2yAAoJENXLsxwXqFxyeE8P/iemceIWY9pHSlEIwWAV7DQD
+TzncI94Sz/DQymng899LmRtCSI9s+fGHC0rbY56ACOkrTgTB19En0D6ofB07hue4
+ea3fDw06KIL3+dwe46J2X8opR/MTVk2j0eTpnZXeHSM/vSNSCb7xlcRjUzI1Ptjy
+u0KLvkPqoEnX6UpyTAcK0zaN15++bPgTautQFG6aU4q/O8ZbnhPqyyCKUE+NBayp
++WWPvxX9MBf8RpAsipLRIeT+HEO6lXfh+KKBLrP6nPNTYt8/VarAXMIOEzseLU+Y
+1pq1zpgdakABfzVrRWk42I77qgylP1Z8JFb0pAB/d5V4WzIokdM1YKBbdOFxE+eo
+XiaCYpYrIw/exkt/BXUNBc0yBzaBRQ18P788+WoZtAr86h19GrpcYG2IB/wDuide
+Uq20rQurfzgT/8+7fVHKckdBqHlE5EQz4t6bNO4gzoC8mzX4G47JPqkb60y121I1
++bP5HTro8GYT79t7KbE5eAqUu2fC/dgYdItofyJMvxejAeko9TxKkrtU7XV2O1De
+nMGZczt/a4CBfp401gRZFkLRvP9Qzcw81H726sxdqCtQCTRnowElItTGZornxYR8
+R7tWUiwAzI/6HdfOLSK+LYg8oM/Mh38fmoTeOw1eFbK4FRMSpHmifMo5BQM6xbTB
+YcloDMXOZAOWazlvUpqM
+=n1cL
 -----END PGP SIGNATURE-----
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
-}