[media-libs/phonon] Version bump to 4.5.1.

Synced 4.5.1 and 9999 ebuilds.

Package-Manager: portage-2.2.0_alpha69/cvs/Linux x86_64

4 files changed, 100 insertions, 23 deletions

diff --git a/media-libs/phonon/ChangeLog b/media-libs/phonon/ChangeLog
index 58f48fac369e..4527f1ea1be4 100644
--- a/media-libs/phonon/ChangeLog
+++ b/media-libs/phonon/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/phonon
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon/ChangeLog,v 1.19 2011/10/20 20:23:37 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon/ChangeLog,v 1.20 2011/10/28 13:36:15 jmbsvicetto Exp $
+
+*phonon-4.5.1 (28 Oct 2011)
+
+  28 Oct 2011; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  +phonon-4.5.1.ebuild, phonon-9999.ebuild:
+  [media-libs/phonon] Version bump to 4.5.1. Synced 4.5.1 and 9999 ebuilds.
 
   20 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> phonon-9999.ebuild:
   Move qt-phonon blocker to COMMONDEPEND, bug 374111
diff --git a/media-libs/phonon/Manifest b/media-libs/phonon/Manifest
index cc3ebf004feb..d81186e02226 100644
--- a/media-libs/phonon/Manifest
+++ b/media-libs/phonon/Manifest
@@ -1,32 +1,34 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
 
 AUX phonon-4.4-qt7.patch 15621 RMD160 dd46e1cac72aaffc714ef849c079eac1c9c03536 SHA1 f5902d8138fb550457d8acddebf24743cd5e5498 SHA256 8b236f3731434ec6fd591f7da6f1267943c819ebc523797b58d27facfafde68e
 AUX phonon-4.5.0-pow.patch 891 RMD160 65955a585928f4546f30a87b975305a88ae5b681 SHA1 78f9106b6fd1446aad3bb39ff64d5cad61afe835 SHA256 11fd07fef7a2d0b1dbab991f7e8527b8e145661174a11fdf8873ae645cf314d0
 DIST phonon-4.4.2.tar.bz2 629193 RMD160 aa37903f166904dd09401541df8fc268a2858606 SHA1 c329d924fb75a89a9de8a4d799ff4dcd7ee3302e SHA256 f1404c3f326201b382c26ba37f2d885d30bc71ba5fd8e1479afb632f92d93486
 DIST phonon-4.4.3.tar.bz2 648733 RMD160 d7f36bf490acc595dabfd1f7fb1f4433cf77ccf8 SHA1 50262d590beb648be9dcad6b913b920db19a84f8 SHA256 60d17a70732df32cebad099e76f970d6d1aeab5e1f68ec305431f8c86a30a1d8
 DIST phonon-4.5.0.tar.bz2 322043 RMD160 80098d330ce4167eed5b6b6004871614178b37ef SHA1 122f7c53939a2c40c3312c2f5e59f25ca2c9ee53 SHA256 66e8913a00dc5a59e4a30c9034757a2a0eb448a8cefcf677c73dc9387a8752dc
+DIST phonon-4.5.1.tar.xz 291088 RMD160 b5aa9313b62bac7d5233716db52c9275168ee191 SHA1 710a9ffffe7e558f4d0ce5ea5c118cb248fb8da8 SHA256 0180f01cb6cae907285adf76e4aece9be33af6a352dc057709e40b7838e2f4c8
 EBUILD phonon-4.4.2.ebuild 3203 RMD160 a0f49130f52e10cec11e1cceec4c65401cce4e7d SHA1 87543b810822b8fa7559245fc39656da33da1fdc SHA256 fb3e0e1061632acc710b8ff60829efaf24e4f3d86db32c739042f80fc1aadfd0
 EBUILD phonon-4.4.3.ebuild 3096 RMD160 c204f5d0e23ebf2c8308a5805effb756ac6d46fc SHA1 688a6d8714dfaeff908b67f1081d83cb4cf898d5 SHA256 21bc50fb7d05894498b57d7c338e19ec3dc7fb9a5cb5412c6a4e83067a8282a4
 EBUILD phonon-4.5.0-r1.ebuild 1502 RMD160 cb62731b8245a6360b5fb49d372f5a3d88e7a485 SHA1 f078e009fc3f348e13aab5f9e8df396f80aecfa4 SHA256 2df4be7ff768bc9e760d58fb11fb8928be11ef472f90caf5b1f6c589fe3f20f6
 EBUILD phonon-4.5.0.ebuild 1455 RMD160 8922026063da6d1af4507a6a25c2bb77d9b7532f SHA1 746916879212a687f7a832dd7bb305d78fa3cbfc SHA256 a7482183176afa8d39daca3a435e641d73a6207d4b9bbe87906d3f735d6b0f3b
-EBUILD phonon-9999.ebuild 1389 RMD160 e2708282f237b31051a331ffaad58159d4251ec1 SHA1 85f733c00b825d8897b0b1f0aba0c40f8546d710 SHA256 032f18d57c93213e71a9a7d508e1bdad6e2236a0bc1ba6f9f0471d3e8adb17f4
-MISC ChangeLog 12265 RMD160 09072b1a6d399168e5efda1172a690bb8f7afd93 SHA1 b2d8acfc7c54b546f4d93355ff3ff888b0e05a13 SHA256 7b3e51377c1a78e81956036f15a1c5f3507ccc948f44f6706a405507aeee9a7e
+EBUILD phonon-4.5.1.ebuild 1592 RMD160 1c50827c1258d9a0e875771b9aad797e48e2f740 SHA1 eb7faa7600e2d1d6f2ddd29c86e3d55a7d9a1e6a SHA256 a20f496b18c5c574d76c4e759e57c0989e90d33306569550c8446a6863d5c528
+EBUILD phonon-9999.ebuild 1592 RMD160 142eea2bf45688d3ed28d51ac32a34f7192d49e2 SHA1 96417d56cc458ddbd39249d59ef7d20b414c8f3d SHA256 8f9ebbcc26f8811ceec7257819d47c02553ed99fc443d13f83fc108bf733cc00
+MISC ChangeLog 12484 RMD160 e0ec4ed9605ee65db9caece178968616eec140f5 SHA1 cca8166320632b6c396b416552fba3655ae33c64 SHA256 c62e2aba424768348508051d326a5b93084083649d6d990a45cff9b888574e70
 MISC metadata.xml 221 RMD160 3b7c1f5e46245a1df8a099065a5f5e623a9ab574 SHA1 229bab5d18be9bc9f0432a2303ae58bd99eebe09 SHA256 9f8c503e1bbb2d02ea53a17549bda7713c0337d9e94619156bc29f3a219f29d0
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBCgAGBQJOoINSAAoJENwGBM22xffexMwP/2xyHpUAAIC56VDpvP3DlSg5
-OEygCYjLECGi7Tm1w/RwXgN7KxbZk3GzmKzB9QGg2t1AimSL8IEyFNzzwK5cNJVn
-Qkg+DmjtVo/z3Qe7mRKNo5dKz/MbnTZae1TpiYv5J/TU/apWKDvQZW3MhI1nVU0j
-KHqEurspJfXGZhp4CaV462J0bBtOJluKr7Dn9ygu+7z4JleTkI9SStsH1apiypl9
-SrBQzz+WR8nr64+JK0JeZ42516XEfc1LxIdXTtqRBXQkDkp4zykE9vqM2IsyUgXV
-Wb7GtszfMI9cpdA039LgVSyDlUtQlStcHHVaoW/Vf4fwKfHv+7z4awM6o4nWafGJ
-rjYuq8q+2MuETsYCvY78xVXjBQz3cc5YcCa6MqZq+8kqIhJAAx0y/goVbKxITmYW
-+AdlEIqrTBc3m6Uc4421uNjxGddyuxPodTpty/LzN5gOUuMq6f+8O9XUEcg1lUWZ
-xVexg263SOtxsEVF+WOQrU7AyShhue0kcCU5ydLWMjh7M1Y6Bz5lqhUwzNfRrw/u
-PDvP5VU2ewjrZytz06qSEY34wED7D1Kyxyzh4sWrHjKRviIvgCiFDCPzQM09750e
-z5rJIgkuGlc84kPi0F+cWZTTxOVzbt+UGBybBV1jjaYRDyvt0/nTqTdwLUOQzzSz
-gpMW3WxbuQE/FOEU9kHI
-=wJwK
+iQIcBAEBAgAGBQJOqq+jAAoJEC8ZTXQF1qEPrx0QAMAUgnyPPq6xUceE0IlbI/Xp
+2N/w9tOFdWJUcDB1V/iSuANi0ac3r6Abv+UJiQPvBaSd9PVmFqqRODpe4cncIVUM
+P6kX42+IqyMMDGMZrrofd8yVZAQ5ncfT2x1XdazaAScl38kTmsBd+Cvj6e1JVAJ6
++tw7ushP2z1hAiUTzMBsJJ97heVJ0OSrbI68z0Ae4C96nsYq7rf5GnHT8jyuAeOF
+H+Q5izWwZwJ7M/CXqqAZzi2dbqbgCukaPgvq0zdcuCQxaVndNjtHE+bEoTcQj5J7
+DoIg8CgR6InMS7LEX1VWlqw1GvwnyQ2+n5quis6fkJZPyLZv3I3RFwX4jyVT+v+S
+Ta95B3agB3ROUScgTJiA3/dn/T2CrAZvjzmCksT3iHVAFzNxtGrPx2lmEESuDtLv
+4cbOdtvyjGmVAkQbENz+lm5jQZ9x3Ecnc/L+5bO6krd++JV3YMcYGyXnMpNYVN70
+UFtLCIHi8Sm9J3euJAY+lgONZPTqXN9Ydh0eHcXpReSYmAKPyCf+MlXj0yL4NqWz
+RacogNzrnTc4WZsxphGqLiTn4Trn5drFXpaYEWCTtZNVpWLeC/WSe93vCfIvxrSh
+LQUa2oIccYEVMXRG+vQ35wJo6Ai/K7v+PLQwm10GIMiZKDBAoYwhaqCtq3AzQCxl
++g7+ZoA0N7PbOYtLMSgX
+=HOpc
 -----END PGP SIGNATURE-----
diff --git a/media-libs/phonon/phonon-4.5.1.ebuild b/media-libs/phonon/phonon-4.5.1.ebuild
new file mode 100644
index 000000000000..81908f6a9a99
--- /dev/null
+++ b/media-libs/phonon/phonon-4.5.1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon/phonon-4.5.1.ebuild,v 1.1 2011/10/28 13:36:15 jmbsvicetto Exp $
+
+EAPI=4
+
+if [[ ${PV} != *9999* ]]; then
+	SRC_URI="mirror://kde/stable/phonon/${PV}/src/${P}.tar.xz"
+	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+	SCM_ECLASS="git-2"
+else
+	EGIT_REPO_URI="git://anongit.kde.org/${PN}"
+	KEYWORDS=""
+fi
+
+inherit cmake-utils ${SCM_ECLASS}
+
+DESCRIPTION="KDE multimedia API"
+HOMEPAGE="https://projects.kde.org/projects/kdesupport/phonon"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE="aqua debug +gstreamer pulseaudio vlc xine"
+
+COMMON_DEPEND="
+	!x11-libs/qt-phonon:4
+	>=x11-libs/qt-core-4.6.0:4
+	>=x11-libs/qt-dbus-4.6.0:4
+	>=x11-libs/qt-gui-4.6.0:4
+	>=x11-libs/qt-test-4.6.0:4
+	pulseaudio? (
+		dev-libs/glib:2
+		>=media-sound/pulseaudio-0.9.21[glib]
+	)
+"
+# directshow? ( media-sound/phonon-directshow )
+# mmf? ( media-sound/phonon-mmf )
+# mplayer? ( media-sound/phonon-mplayer )
+# waveout? ( media-sound/phonon-waveout )
+PDEPEND="
+	aqua? ( media-libs/phonon-qt7 )
+	gstreamer? ( media-libs/phonon-gstreamer )
+	vlc? ( >=media-libs/phonon-vlc-0.3.2 )
+	xine? ( >=media-libs/phonon-xine-0.4.4 )
+"
+RDEPEND="${COMMON_DEPEND}
+	!kde-base/phonon-xine
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/automoc-0.9.87
+	dev-util/pkgconfig
+"
+
+REQUIRED_USE="|| ( aqua gstreamer vlc xine )"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_with pulseaudio GLIB2)
+		$(cmake-utils_use_with pulseaudio PulseAudio)
+	)
+	cmake-utils_src_configure
+}
diff --git a/media-libs/phonon/phonon-9999.ebuild b/media-libs/phonon/phonon-9999.ebuild
index dd9d83feb7c7..1a3a07932ed0 100644
--- a/media-libs/phonon/phonon-9999.ebuild
+++ b/media-libs/phonon/phonon-9999.ebuild
@@ -1,21 +1,29 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon/phonon-9999.ebuild,v 1.10 2011/10/20 20:23:37 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon/phonon-9999.ebuild,v 1.11 2011/10/28 13:36:15 jmbsvicetto Exp $
 
 EAPI=4
 
-inherit cmake-utils git-2
+if [[ ${PV} != *9999* ]]; then
+	SRC_URI="mirror://kde/stable/phonon/${PV}/src/${P}.tar.xz"
+	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+	SCM_ECLASS="git-2"
+else
+	EGIT_REPO_URI="git://anongit.kde.org/${PN}"
+	KEYWORDS=""
+fi
+
+inherit cmake-utils ${SCM_ECLASS}
 
 DESCRIPTION="KDE multimedia API"
 HOMEPAGE="https://projects.kde.org/projects/kdesupport/phonon"
-EGIT_REPO_URI="git://anongit.kde.org/${PN}"
 
 LICENSE="LGPL-2.1"
-KEYWORDS=""
 SLOT="0"
 IUSE="aqua debug +gstreamer pulseaudio vlc xine"
 
 COMMON_DEPEND="
+	!x11-libs/qt-phonon:4
 	>=x11-libs/qt-core-4.6.0:4
 	>=x11-libs/qt-dbus-4.6.0:4
 	>=x11-libs/qt-gui-4.6.0:4
@@ -24,7 +32,6 @@ COMMON_DEPEND="
 		dev-libs/glib:2
 		>=media-sound/pulseaudio-0.9.21[glib]
 	)
-	!x11-libs/qt-phonon:4
 "
 # directshow? ( media-sound/phonon-directshow )
 # mmf? ( media-sound/phonon-mmf )