Cleanup.

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

3 files changed, 7 insertions, 118 deletions

diff --git a/dev-qt/qtdemo/ChangeLog b/dev-qt/qtdemo/ChangeLog
index 5e8957d17bd6..1b71a8420c20 100644
--- a/dev-qt/qtdemo/ChangeLog
+++ b/dev-qt/qtdemo/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-qt/qtdemo
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtdemo/ChangeLog,v 1.10 2013/12/28 02:06:13 pesa Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtdemo/ChangeLog,v 1.11 2014/01/26 17:55:58 pesa Exp $
+
+  26 Jan 2014; Davide Pesavento <pesa@gentoo.org> -qtdemo-4.8.4.ebuild,
+  metadata.xml:
+  Cleanup.
 
   28 Dec 2013; Davide Pesavento <pesa@gentoo.org> qtdemo-4.8.5-r1.ebuild:
   Don't fail if gstreamer is not installed, since other phonon backends may have
diff --git a/dev-qt/qtdemo/metadata.xml b/dev-qt/qtdemo/metadata.xml
index 2d20d629c78f..4bb5221e23ca 100644
--- a/dev-qt/qtdemo/metadata.xml
+++ b/dev-qt/qtdemo/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="dbus">Build QtDBus examples and demos</flag>
 		<flag name="declarative">Build QtDeclarative examples and demos</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="multimedia">Build QtMultimedia examples and demos</flag>
 		<flag name="opengl">Build QtOpenGL examples and demos</flag>
 		<flag name="openvg">Build QtOpenVG examples and demos</flag>
diff --git a/dev-qt/qtdemo/qtdemo-4.8.4.ebuild b/dev-qt/qtdemo/qtdemo-4.8.4.ebuild
deleted file mode 100644
index 2342fadb6c38..000000000000
--- a/dev-qt/qtdemo/qtdemo-4.8.4.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtdemo/qtdemo-4.8.4.ebuild,v 1.2 2013/04/08 16:56:00 pinkbyte Exp $
-
-EAPI=4
-
-inherit qt4-build
-
-DESCRIPTION="Demonstration module and examples for the Qt toolkit"
-SLOT="4"
-if [[ ${QT4_BUILD_TYPE} == live ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="amd64 ~arm ppc ppc64 x86 ~x64-macos"
-fi
-IUSE="dbus declarative kde multimedia opengl openvg qt3support webkit xmlpatterns"
-
-DEPEND="
-	~dev-qt/qthelp-${PV}:4[aqua=,debug=]
-	~dev-qt/qtcore-${PV}:4[aqua=,debug=,qt3support?]
-	~dev-qt/qtgui-${PV}:4[aqua=,debug=,qt3support?]
-	~dev-qt/qtscript-${PV}:4[aqua=,debug=]
-	~dev-qt/qtsql-${PV}:4[aqua=,debug=,qt3support?]
-	~dev-qt/qtsvg-${PV}:4[aqua=,debug=]
-	~dev-qt/qttest-${PV}:4[aqua=,debug=]
-	dbus? ( ~dev-qt/qtdbus-${PV}:4[aqua=,debug=] )
-	declarative? ( ~dev-qt/qtdeclarative-${PV}:4[aqua=,debug=,webkit?] )
-	kde? ( media-libs/phonon[aqua=] )
-	!kde? ( || (
-		~dev-qt/qtphonon-${PV}:4[aqua=,debug=]
-		media-libs/phonon[aqua=]
-	) )
-	multimedia? ( ~dev-qt/qtmultimedia-${PV}:4[aqua=,debug=] )
-	opengl? ( ~dev-qt/qtopengl-${PV}:4[aqua=,debug=,qt3support?] )
-	openvg? ( ~dev-qt/qtopenvg-${PV}:4[aqua=,debug=,qt3support?] )
-	qt3support? ( ~dev-qt/qt3support-${PV}:4[aqua=,debug=] )
-	webkit? ( ~dev-qt/qtwebkit-${PV}:4[aqua=,debug=] )
-	xmlpatterns? ( ~dev-qt/qtxmlpatterns-${PV}:4[aqua=,debug=] )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.6-plugandpaint.patch"
-)
-
-pkg_setup() {
-	QT4_TARGET_DIRECTORIES="
-		demos
-		examples"
-	QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
-		doc/src/images
-		src
-		include
-		tools"
-
-	qt4-build_pkg_setup
-}
-
-src_prepare() {
-	qt4-build_src_prepare
-
-	# Array mapping USE flags to subdirs
-	local flags_subdirs_map=(
-		'dbus'
-		'declarative:declarative'
-		'multimedia:spectrum'
-		'opengl:boxes|glhypnotizer'
-		'openvg'
-		'webkit:browser'
-		'xmlpatterns'
-	)
-
-	# Disable unwanted examples/demos
-	for flag in "${flags_subdirs_map[@]}"; do
-		if ! use ${flag%:*}; then
-			einfo "Disabling ${flag%:*} examples"
-			sed -i -e "/SUBDIRS += ${flag%:*}/d" \
-				examples/examples.pro || die
-
-			if [[ ${flag} == *:* ]]; then
-				einfo "Disabling ${flag%:*} demos"
-				sed -i -re "/SUBDIRS \+= demos_(${flag#*:})/d" \
-					demos/demos.pro || die
-			fi
-		fi
-	done
-
-	if ! use qt3support; then
-		einfo "Disabling qt3support examples"
-		sed -i -e '/QT_CONFIG, qt3support/d' \
-			examples/graphicsview/graphicsview.pro || die
-	fi
-}
-
-src_configure() {
-	myconf+="
-		$(qt_use dbus)
-		$(qt_use declarative)
-		$(qt_use multimedia)
-		$(qt_use opengl)
-		$(qt_use openvg)
-		$(qt_use qt3support)
-		$(qt_use webkit)
-		$(qt_use xmlpatterns)"
-
-	qt4-build_src_configure
-}
-
-src_install() {
-	insinto "${QTDOCDIR#${EPREFIX}}"/src
-	doins -r doc/src/images
-
-	qt4-build_src_install
-}