Cleanup.

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

3 files changed, 6 insertions, 61 deletions

diff --git a/dev-qt/qtbearer/ChangeLog b/dev-qt/qtbearer/ChangeLog
index 338516865e29..3f8a5575d6f2 100644
--- a/dev-qt/qtbearer/ChangeLog
+++ b/dev-qt/qtbearer/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-qt/qtbearer
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtbearer/ChangeLog,v 1.14 2014/01/26 11:55:42 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtbearer/ChangeLog,v 1.15 2014/01/26 17:46:44 pesa Exp $
+
+  26 Jan 2014; Davide Pesavento <pesa@gentoo.org> -qtbearer-4.8.4.ebuild,
+  metadata.xml:
+  Cleanup.
 
   26 Jan 2014; Agostino Sarubbo <ago@gentoo.org> qtbearer-4.8.5.ebuild:
   Stable for ia64, wrt bug #494728
diff --git a/dev-qt/qtbearer/metadata.xml b/dev-qt/qtbearer/metadata.xml
index 782c1341ff99..14dca051b169 100644
--- a/dev-qt/qtbearer/metadata.xml
+++ b/dev-qt/qtbearer/metadata.xml
@@ -3,9 +3,8 @@
 <pkgmetadata>
 	<herd>qt</herd>
 	<use>
-		<flag name="c++0x">Build Qt using the C++11 standard</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>
 	</use>
 	<upstream>
 		<bugs-to>https://bugreports.qt-project.org/</bugs-to>
diff --git a/dev-qt/qtbearer/qtbearer-4.8.4.ebuild b/dev-qt/qtbearer/qtbearer-4.8.4.ebuild
deleted file mode 100644
index 3a8edbfd2a8a..000000000000
--- a/dev-qt/qtbearer/qtbearer-4.8.4.ebuild
+++ /dev/null
@@ -1,58 +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/qtbearer/qtbearer-4.8.4.ebuild,v 1.1 2013/03/02 15:25:37 yngwin Exp $
-
-EAPI=4
-
-inherit qt4-build
-
-DESCRIPTION="The network bearer plugins for the Qt toolkit"
-SLOT="4"
-if [[ ${QT4_BUILD_TYPE} == live ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="amd64 arm hppa ~ia64 ppc ~ppc64 x86 ~amd64-fbsd ~x86-fbsd"
-fi
-IUSE="connman networkmanager"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}[aqua=,debug=]
-	connman? ( ~dev-qt/qtdbus-${PV}[aqua=,debug=] )
-	networkmanager? ( ~dev-qt/qtdbus-${PV}[aqua=,debug=] )
-"
-RDEPEND="${DEPEND}
-	connman? ( net-misc/connman )
-	networkmanager? ( net-misc/networkmanager )
-"
-
-pkg_setup() {
-	QT4_EXTRACT_DIRECTORIES="
-		include/QtCore
-		include/QtDBus
-		include/QtNetwork
-		src/corelib
-		src/dbus
-		src/network
-		src/plugins/bearer
-		src/plugins/qpluginbase.pri"
-
-	QT4_TARGET_DIRECTORIES="
-		src/plugins/bearer/generic
-		$(use connman && echo src/plugins/bearer/connman)
-		$(use networkmanager && echo src/plugins/bearer/networkmanager)"
-
-	qt4-build_pkg_setup
-}
-
-src_configure() {
-	myconf+="
-		$(use connman || use networkmanager || echo -no-dbus)
-		-no-accessibility -no-xmlpatterns -no-multimedia -no-audio-backend -no-phonon
-		-no-phonon-backend -no-svg -no-webkit -no-script -no-scripttools -no-declarative
-		-system-zlib -no-gif -no-libtiff -no-libpng -no-libmng -no-libjpeg
-		-no-cups -no-gtkstyle -no-nas-sound -no-opengl
-		-no-sm -no-xshape -no-xvideo -no-xsync -no-xinerama -no-xcursor -no-xfixes
-		-no-xrandr -no-xrender -no-mitshm -no-fontconfig -no-freetype -no-xinput -no-xkb"
-
-	qt4-build_src_configure
-}