Pulled update phonon-kde from the kde-testing overlay - thanks to Maciej Mrozowski (reavertm) <reavertm@poczta.fm>.

Fixed automagic from bug 266968 + some other
Package-Manager: portage-2.2_rc30/cvs/Linux x86_64

3 files changed, 56 insertions, 12 deletions

diff --git a/kde-base/phonon-kde/ChangeLog b/kde-base/phonon-kde/ChangeLog
index 97274ecd4bb2..43a81fab46d4 100644
--- a/kde-base/phonon-kde/ChangeLog
+++ b/kde-base/phonon-kde/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for kde-base/phonon-kde
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/phonon-kde/ChangeLog,v 1.12 2009/04/17 06:40:41 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/phonon-kde/ChangeLog,v 1.13 2009/04/23 18:43:44 jmbsvicetto Exp $
+
+*phonon-kde-4.2.2-r1 (23 Apr 2009)
+
+  23 Apr 2009; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  +phonon-kde-4.2.2-r1.ebuild:
+  Pulled update phonon-kde from the kde-testing overlay. Original ChangeLog
+  entry: 21 Apr 2009; Maciej Mrozowski (reavertm) <reavertm@poczta.fm> Fixed
+  automagic from bug 266968 + some other
 
   17 Apr 2009; Alexey Shvetsov <alexxy@gentoo.org> -phonon-kde-4.2.1.ebuild,
   phonon-kde-4.2.2:
diff --git a/kde-base/phonon-kde/Manifest b/kde-base/phonon-kde/Manifest
index 42a705f12120..d5f56cd63527 100644
--- a/kde-base/phonon-kde/Manifest
+++ b/kde-base/phonon-kde/Manifest
@@ -1,14 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 DIST kdebase-runtime-4.2.2.tar.bz2 69327561 RMD160 773402d87c1cc179dfd33ffc7b5b91a1b657375b SHA1 0b100ceb77fa2e8cbe5303f7fea28b02117c7658 SHA256 2a119cbae51f4cb08ccde436be8d53e9005c46a011cd931fdd8306b34744fdf4
+EBUILD phonon-kde-4.2.2-r1.ebuild 1160 RMD160 20ef082a6514375ef6b155834c54c5148cc53db9 SHA1 47396206edeb0de4548abe0161a651fe90ea8928 SHA256 4377785aa0fa2f6b448800f8c9d32ee8a12ec0763585b8229a37e763bbc6406a
 EBUILD phonon-kde-4.2.2.ebuild 700 RMD160 b7167275fb31d82aa9579d28718597f0bb17bce6 SHA1 fcb1c5fbac65b26612a517b950cc3d4f4012d5e1 SHA256 488bb1d56cf855dc5b97de0a518f2515900290dd76f5beb136210fcfff900fb0
-MISC ChangeLog 1964 RMD160 f0fcf1038206d0aaef1629bf8b3204f3f3311e20 SHA1 70855f2778b28dc1ebd90416337dc5374630ec7e SHA256 04c167df10872d4420c8e8149ad516d607379ad9c8c79be12dc3fea484744aa8
+MISC ChangeLog 2298 RMD160 77ad36f1e7f4b34b344e0dfb37c6f29547c728c9 SHA1 c78b78e8ba7a1f997aa18eb514041cad84190e3c SHA256 653d9cf025a888e81a5d6e35d9e4725f8f7821f3f93e9d5644ae01b842c14185
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAknoJHMACgkQ5BmOA85PVLi10wCgrIQiXfe+OsAJB6nfKhE/bU9B
-AokAoIiBYAD2eZFaVHTGfA+mX0LHbsCS
-=e7lM
------END PGP SIGNATURE-----
diff --git a/kde-base/phonon-kde/phonon-kde-4.2.2-r1.ebuild b/kde-base/phonon-kde/phonon-kde-4.2.2-r1.ebuild
new file mode 100644
index 000000000000..0ce609a409bb
--- /dev/null
+++ b/kde-base/phonon-kde/phonon-kde-4.2.2-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/phonon-kde/phonon-kde-4.2.2-r1.ebuild,v 1.1 2009/04/23 18:43:44 jmbsvicetto Exp $
+
+EAPI="2"
+
+KMNAME="kdebase-runtime"
+KMMODULE="phonon"
+inherit kde4-meta
+
+DESCRIPTION="Phonon KDE Integration"
+HOMEPAGE="http://phonon.kde.org"
+
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+LICENSE="GPL-2"
+IUSE="debug pulseaudio +xine"
+
+DEPEND="
+	media-libs/alsa-lib
+	media-sound/phonon[xine?]
+	pulseaudio? ( media-sound/pulseaudio )
+"
+RDEPEND="${DEPEND}
+	!kdeprefix? ( !kde-base/phonon-xine[-kdeprefix] )
+"
+
+src_prepare() {
+	# Don't build tests - they require OpenGL
+	sed -e 's/add_subdirectory(tests)//' \
+		-i phonon/CMakeLists.txt || die "Failed to disable tests"
+
+	# Disable automagic
+	sed -e 's/find_package(Xine)/macro_optional_find_package(Xine)/' \
+		-i phonon/kcm/xine/CMakeLists.txt || die "Failed to make xine optional"
+
+	kde4-meta_src_prepare
+}
+
+src_configure() {
+	mycmakeargs="${mycmakeargs}
+		$(cmake-utils_use_with pulseaudio PulseAudio)
+		$(cmake-utils_use_with xine Xine)"
+
+	kde4-meta_src_configure
+}