Install phonon widgets wrt bug #297593. Remove old ebuilds

(Portage version: 2.2_rc62/cvs/Linux x86_64)

3 files changed, 19 insertions, 48 deletions

diff --git a/x11-libs/qt-phonon/ChangeLog b/x11-libs/qt-phonon/ChangeLog
index a08b8137b8a5..699d38b14dbe 100644
--- a/x11-libs/qt-phonon/ChangeLog
+++ b/x11-libs/qt-phonon/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-libs/qt-phonon
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-phonon/ChangeLog,v 1.60 2010/01/26 16:28:27 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-phonon/ChangeLog,v 1.61 2010/02/06 11:49:20 hwoarang Exp $
+
+*qt-phonon-4.6.1-r2 (06 Feb 2010)
+
+  06 Feb 2010; Markos Chandras <hwoarang@gentoo.org>
+  -qt-phonon-4.6.1.ebuild, -qt-phonon-4.6.1-r1.ebuild,
+  +qt-phonon-4.6.1-r2.ebuild:
+  Install phonon widgets wrt bug #297593. Thanks to Coy Barnes 
+  <cybrenurd@lycos.com>. Remove old ebuilds
 
   26 Jan 2010; Dror Levin <spatz@gentoo.org> qt-phonon-4.6.1-r1.ebuild:
   Call correct eclass function, bug 302289.
@@ -27,7 +35,7 @@
   +qt-phonon-4.6.0-r1.ebuild:
   Add prefix support, revbump due to otherwise unresolvable USE deps
 
-  11 Dec 2009; Raúl Porcel <armin76@gentoo.org> qt-phonon-4.5.3.ebuild:
+  11 Dec 2009; RaΓΊl Porcel <armin76@gentoo.org> qt-phonon-4.5.3.ebuild:
   sparc stable
 
   01 Dec 2009; Theo Chatzimichos <tampakrap@gentoo.org>
@@ -46,7 +54,7 @@
   -qt-phonon-4.6.0_beta1.ebuild, +qt-phonon-4.6.0_rc1.ebuild:
   added 4.6.0_rc1, removed 4.6.0_beta1
 
-  17 Nov 2009; Raúl Porcel <armin76@gentoo.org> qt-phonon-4.5.3.ebuild,
+  17 Nov 2009; RaΓΊl Porcel <armin76@gentoo.org> qt-phonon-4.5.3.ebuild,
   qt-phonon-4.6.0_beta1.ebuild:
   Add ~sparc
 
@@ -60,7 +68,7 @@
   09 Nov 2009; Joseph Jezak <josejx@gentoo.org> qt-phonon-4.5.3.ebuild:
   Marked ppc/ppc64 stable for bug #290922.
 
-  09 Nov 2009; Raúl Porcel <armin76@gentoo.org> qt-phonon-4.5.3.ebuild:
+  09 Nov 2009; RaΓΊl Porcel <armin76@gentoo.org> qt-phonon-4.5.3.ebuild:
   alpha stable wrt #290922
 
   09 Nov 2009; Jonathan Callen <abcd@gentoo.org>
@@ -91,7 +99,7 @@
   +qt-phonon-4.6.0_beta1.ebuild:
   added version 4.6.0_beta1
 
-  11 Oct 2009; Raúl Porcel <armin76@gentoo.org> qt-phonon-4.5.2.ebuild:
+  11 Oct 2009; RaΓΊl Porcel <armin76@gentoo.org> qt-phonon-4.5.2.ebuild:
   alpha stable wrt #286653
 
   09 Oct 2009; Markus Meier <maekke@gentoo.org> qt-phonon-4.5.2.ebuild:
@@ -139,17 +147,17 @@
   +qt-phonon-4.5.1.ebuild:
   Version bump to 4.5.1
 
-  21 Mar 2009; Raúl Porcel <armin76@gentoo.org> qt-phonon-4.5.0.ebuild:
+  21 Mar 2009; RaΓΊl Porcel <armin76@gentoo.org> qt-phonon-4.5.0.ebuild:
   Re-add ~alpha/~ia64 since qt-webkit needs it
 
-  20 Mar 2009; Raúl Porcel <armin76@gentoo.org> qt-phonon-4.5.0.ebuild:
+  20 Mar 2009; RaΓΊl Porcel <armin76@gentoo.org> qt-phonon-4.5.0.ebuild:
   We don't want phonon on alpha/ia64
 
   18 Mar 2009; Markos Chandras <hwoarang@gentoo.org>
   -qt-phonon-4.5.0_rc1.ebuild:
   Dropping 4.5.0_rc1
 
-  18 Mar 2009; Raúl Porcel <armin76@gentoo.org> qt-phonon-4.5.0.ebuild:
+  18 Mar 2009; RaΓΊl Porcel <armin76@gentoo.org> qt-phonon-4.5.0.ebuild:
   Add ~alpha/~arm/~ia64
 
   16 Mar 2009; Alexis Ballier <aballier@gentoo.org> qt-phonon-4.5.0.ebuild:
diff --git a/x11-libs/qt-phonon/qt-phonon-4.6.1-r1.ebuild b/x11-libs/qt-phonon/qt-phonon-4.6.1-r2.ebuild
index 0998d54fe2af..21ab34f3c885 100644
--- a/x11-libs/qt-phonon/qt-phonon-4.6.1-r1.ebuild
+++ b/x11-libs/qt-phonon/qt-phonon-4.6.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-phonon/qt-phonon-4.6.1-r1.ebuild,v 1.2 2010/01/26 16:28:27 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-phonon/qt-phonon-4.6.1-r2.ebuild,v 1.1 2010/02/06 11:49:20 hwoarang Exp $
 
 EAPI="2"
 inherit qt4-build
@@ -23,7 +23,8 @@ RDEPEND="${DEPEND}"
 pkg_setup() {
 	QT4_TARGET_DIRECTORIES="
 		src/phonon
-		src/plugins/phonon"
+		src/plugins/phonon
+		tools/designer/src/plugins/phononwidgets"
 	QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
 		include/
 		src"
diff --git a/x11-libs/qt-phonon/qt-phonon-4.6.1.ebuild b/x11-libs/qt-phonon/qt-phonon-4.6.1.ebuild
deleted file mode 100644
index 03fdb75a855e..000000000000
--- a/x11-libs/qt-phonon/qt-phonon-4.6.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-phonon/qt-phonon-4.6.1.ebuild,v 1.1 2010/01/19 14:53:54 yngwin Exp $
-
-EAPI="2"
-inherit qt4-build
-
-DESCRIPTION="The Phonon module for the Qt toolkit"
-SLOT="4"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE="dbus"
-
-DEPEND="~x11-libs/qt-gui-${PV}[aqua=,debug=,glib,qt3support]
-	!kde-base/phonon-kde
-	!kde-base/phonon-xine
-	!media-sound/phonon
-	media-libs/gstreamer
-	media-libs/gst-plugins-base
-	aqua? ( ~x11-libs/qt-opengl-${PV}[aqua] )
-	dbus? ( ~x11-libs/qt-dbus-${PV}[aqua=,debug=] )"
-RDEPEND="${DEPEND}"
-
-QT4_TARGET_DIRECTORIES="
-src/phonon
-src/plugins/phonon"
-QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
-include/
-src"
-
-QCONFIG_ADD="phonon"
-QCONFIG_DEFINE="QT_GSTREAMER"
-
-src_configure() {
-	myconf="${myconf} -phonon -phonon-backend -no-opengl -no-svg
-		$(qt_use dbus qdbus)"
-
-	qt4-build_src_configure
-}