Install phonon widgets wrt bug #297593. Remove old ebuilds

Package-Manager: portage-2.2_rc62/cvs/Linux x86_64

4 files changed, 21 insertions, 65 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/Manifest b/x11-libs/qt-phonon/Manifest
index 90c26b599a81..81e8b95780e8 100644
--- a/x11-libs/qt-phonon/Manifest
+++ b/x11-libs/qt-phonon/Manifest
@@ -1,23 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
-
 DIST qt-everywhere-opensource-src-4.6.0.tar.gz 155679111 RMD160 7842b9f4a5364016677fc2162dfd31f1440bb05d SHA1 c2cbbde83f1ebac3b8dd13a112fcad757d395041 SHA256 55259c813324f6383cbd441aa2f23e01c320b6d63fbe3b5d52a7715055d28589
 DIST qt-everywhere-opensource-src-4.6.1.tar.gz 160197277 RMD160 7365dfe3c688df36002d2c9aaef6b79ba8175402 SHA1 d3b44ae6d9bc9c44fc57f32e545b92daf0b54775 SHA256 4c84b39b8a2546854ce9c0c9f761dd55da76dab2c33eeb876e3d17db1d2ea0c5
 DIST qt-x11-opensource-src-4.5.3.tar.gz 125384668 RMD160 93d765ecf89ed15668a4eedc7d77c2a2e41424a2 SHA1 78620ffd03c83c4d86f5039ccf7b09e5c709ed25 SHA256 0c87fc42825d3556970db4412257c6874e716ac3bc45e6f273924d5d6a089aa6
 EBUILD qt-phonon-4.5.3.ebuild 922 RMD160 81ece12f9103a2936355f61edcee5a2a0db39e79 SHA1 8da5a7074c1f59e6e055fc50d5c46ab293082352 SHA256 19a98037e8f518703e5d76b1e0c3e024b83a7fa8aeda413b38ab55796c9cfe55
 EBUILD qt-phonon-4.6.0-r1.ebuild 1086 RMD160 68cbbcca6a29f39046ad0df871544f8113333162 SHA1 63a5cb0c55e058c5a9feddf60713c6ac26a5837c SHA256 8d62caa8d283c5a66719b4fd2328a9656a24777f53a1cbd5539ea5d77ed96820
-EBUILD qt-phonon-4.6.1-r1.ebuild 1165 RMD160 09fe20cfd2c2a343772d037935d692ae079e26e9 SHA1 d6ef2c7176644c3557d1bcd81b913ab076ee6017 SHA256 8f5bea9a98fa1ccc0a842418d0f8ffd5e2081c417936af11ff86fc1074d1b779
-EBUILD qt-phonon-4.6.1.ebuild 1084 RMD160 6bfb8b0466b4f54714548c7f37fb7c9a59ddbace SHA1 7b6c5d358dda075bec168f7ea256a8ba09776642 SHA256 68972417b7ec875ff5773431826bba25fdad8a8cb3b584efe8b81b742587d582
-MISC ChangeLog 7701 RMD160 5598739cf9f6f26f9917275505a5bd7d1816205d SHA1 75b46c132161f03efb1d064fce287e22cdf94099 SHA256 6f9b4997fdb32e8216f97ecd50a34e70192f67d21b988cbc8fe609c1d05569b5
+EBUILD qt-phonon-4.6.1-r2.ebuild 1211 RMD160 632fe7b6f16f395617c5ac2b654377a3fbdbb680 SHA1 3b051087de1ee7f34f70291111dd6a5ed6448ba5 SHA256 52f9f1950f8da3dc7cfce712e72836e47e8ad060a41369510911ec360430b959
+MISC ChangeLog 8000 RMD160 91a5c4e48bec4de1b1a021d79913976d58c331ee SHA1 a6e00dc91721bc5123219b00c98c1768a1ec9b75 SHA256 3acb85cc9ffd05541ba8e946fad10fe9d32a34b87cdcba3c31b4d18d0bff12e9
 MISC metadata.xml 156 RMD160 d76590850d56864c8d99e6877ed15841b55ef1fc SHA1 e872bab086832a9db3f0fa9b1897c70577d3af21 SHA256 94c4f580c1a55f8a5e1a1dcdd6dedfea0b8bd78c1d7137c354938d73c49e4448
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iQEcBAEBCgAGBQJLXxg0AAoJEAWF714uGAc6PKMH/iso4GV/sUQT2QW/2ALZu5d2
-lmk1YTFkQP8JNHdv7SQacmyS8foLSTsgoBqMCfL7yypq2F3oe1ERt5d3hXL1kHX/
-ZgitdeYtMNr0CHRPBOtzFwlRKNwj/5zf4O2aA23Ds1J1Faiuo+5oeZwK42gTJDUn
-bAe4oadmDCLZQB5GIcAYXiQMROavOIt5duz+16delZeOUVVrk2N91tUx6XncW58Q
-nmrgOdv7hDk0Uv98j8SYwXOEkoY1ZXVuYaqNp5fzXDbQmM8BGxsek958QOaJRLfW
-054i9jXvFOvs3E2ki5xD/+fQHWlPOxFFuerU1aNy8BsHfU1tL9NJlZfh/44Icdk=
-=b7zv
------END PGP SIGNATURE-----
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
-}