Remove v4l dependencies (v4l support removed from phonon). Bug 385243.

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

diff --git a/media-libs/phonon-vlc/ChangeLog b/media-libs/phonon-vlc/ChangeLog
index 857add80f1eba6712429dcdecdea62f784a9af1c..e11f60ad619b5626e7f2b778bc6e5f7e0d0da93b 100644 (file)
--- a/media-libs/phonon-vlc/ChangeLog
+++ b/media-libs/phonon-vlc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/phonon-vlc
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon-vlc/ChangeLog,v 1.11 2011/09/02 21:55:43 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon-vlc/ChangeLog,v 1.12 2011/10/02 19:57:38 reavertm Exp $
+
+  02 Oct 2011; Maciej Mrozowski <reavertm@gentoo.org> phonon-vlc-0.4.0.ebuild,
+  phonon-vlc-0.4.1.ebuild, phonon-vlc-9999.ebuild:
+  Remove v4l dependencies (support is optional and determined runtime). Bug
+  385243.
 
   02 Sep 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -phonon-vlc-0.3.2.ebuild:

diff --git a/media-libs/phonon-vlc/Manifest b/media-libs/phonon-vlc/Manifest
index a8480311b23beb317f3c0ec46f6f5ad25666ae2c..770cc9c7be2eb96c36b08ea577ce47e4f11c447c 100644 (file)
--- a/media-libs/phonon-vlc/Manifest
+++ b/media-libs/phonon-vlc/Manifest
@@ -1,27 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
 
 DIST phonon-backend-vlc-0.4.0.tar.bz2 54665 RMD160 05efa578b971c7fc7ba240c7afd09539c2d38e26 SHA1 3cbe63d76f7a65649c209019ece20ea018c65add SHA256 a6595a5ac4ac87a5494723312b68e8345488dd2fe2e1401d67f9c2a8925110f2
 DIST phonon-backend-vlc-0.4.1.tar.bz2 55020 RMD160 d2497fd30ae301758547e9873d8572a75b5fd212 SHA1 7d544e8894789b38cf1b0736e4b0ec300caecb21 SHA256 168da93f71ec00b35d006a501f434a50134c51d8f80a8338e340c835d24b2da4
-EBUILD phonon-vlc-0.4.0.ebuild 1349 RMD160 5026bf299ccec5fb7ff1ee5e7123a93bb76debd5 SHA1 2300af10d289c4745490b277c9e3de4ff7d68cd2 SHA256 b1a6b96fae7542099bc95eb75038287d56f1bcf3e5962518a79e164d9cdbd5ad
-EBUILD phonon-vlc-0.4.1.ebuild 1350 RMD160 898bc296bf87ff30b16f063bd9fe10ef4187eedd SHA1 e305ccfabd3abc2c1e039bf73eb1871be88fc278 SHA256 deb05e5573c7ab19d61bf119c19005ce46380c96bb32ded32fff37afa1ae5eb7
-EBUILD phonon-vlc-9999.ebuild 1364 RMD160 018a30eb96b323884d1c16202da716c373a0d240 SHA1 864ede48c92b75445874d00d74612722fa6adb76 SHA256 0eadec82fd501c497024d2e8671ba002397eeec82f651825e5df0170b79b6d6a
-MISC ChangeLog 2928 RMD160 01d11c2884b994e2b0ebaf34b17632150e63758f SHA1 358e821415e631cb036863e1155808cdd1526581 SHA256 7a3effdc9138a16c3d8b9eb9b068f5f5ea31ea0a32a84a18a9dbe53793754647
+EBUILD phonon-vlc-0.4.0.ebuild 1214 RMD160 f5a246c97c6995f0782d73ad621bb8f4e906d92b SHA1 f244226d1d64c71f4c7d714dc783f5330f798780 SHA256 f2e3c14de030c8183448169507dded0346dfcc40cca945c888dbae4ad33523b2
+EBUILD phonon-vlc-0.4.1.ebuild 1212 RMD160 09cc41f4e0d9b4d66aa7a4901384eb0df24a5c1a SHA1 ed5921bfd524b262ada9259e6a1ed8b0b960b1e2 SHA256 badf434e2cea3d89cd6cb7560ed80401558d909511c049b3219b1979a042a29b
+EBUILD phonon-vlc-9999.ebuild 1226 RMD160 9de26548ba82f9de65be1920319fecb35f4432cb SHA1 aae1dff732311bc50c3455684a4aaf32b06d549c SHA256 f44b7b08d5bb8fc62fb7f52887e95cf937604245601837dcb6756b66de2b60e1
+MISC ChangeLog 3144 RMD160 2e6271efd37263d4a29e6360a3e367f5b42bb56a SHA1 dc019493b155dd6a7e9aac318407f3bb074114e5 SHA256 bd8bfb409d13956fb4787820aafa0f36371fdc7dc42d3f744e594dcacdcb4bef
 MISC metadata.xml 158 RMD160 f15477b4ffb8ae0849cbae52329d1bdf99a407f4 SHA1 18cd6cdb98f781c3975c49f300d3f8b1e07333b8 SHA256 b5a2d16139d03b8af578bc87503b14b589dd7e3544d879297ccdb735d35a02e2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJOYVDzAAoJENwGBM22xfferOoP/iQq+JZDdCD2J6yRkqBlv9NJ
-o+ymV52klAaa2TVHZ8eSf9obGjauQe64zEzynNwwzn9RCpscjJH9qyREZwL8deWU
-r3FL/DE7n8suumPW3JEPk+cWLFeiQInKeQmHrxLc7LFSSsK7QfmMCpTF3EfzLWZZ
-30zBCTrnioJjcAfJFFdno9dS+sjn6++Fn2yaGFP6urAJ3AuSIsclAcjOMlq9P6v+
-rxxos1zPukQSkLtoYvkxhFc19QNF/eGAzuyJ9S8nlYqjecUUUgF/ncoR/Hmrkiae
-XS2wqHK43SXdiG+CmWlphI70G2/MDRihbViSNcuxGks9tUq7idA1Dhj6G0yKQwXu
-m334iawdBQVg4wM1DwdWQR68ERrLkFkDhCCAwcHQiMVO+DyzJMTtmemUrZyYJGL1
-bOVCbFmD0CYgjlGJJ/zNMBH8ZniO/U1Go2HK+42NXs6Rf0kb5aK9yd7ZkhFvG4qJ
-KQOBWlPloHmy8DCACPV2QllbPEpoim3QPvXb27Q87tsv35tfbsq70sw4CJM4ij16
-q1WxYRX6KxD+bqZIEDOQUNqFQNh72Vf4LPuAY7OLWaC5ZsW4Ql38JYT1XRECSe2H
-IrHB56ZC0J9ZHFVtZK8xIPQoMK6p3p9ApZCJuKgYkc/awhx+KVbucqLdKjfYPq9V
-Jsbbif5+1PkoTo+gzeQ/
-=tYGx
+iEYEARECAAYFAk6IwjcACgkQFuHa/bHpVdsmNwCeKTLk/LkcyYw+You8nO9iQqUc
+qMcAoJyPbuBrUSNDjBQVo9B9pr/Ti42C
+=U01+
 -----END PGP SIGNATURE-----

diff --git a/media-libs/phonon-vlc/phonon-vlc-0.4.0.ebuild b/media-libs/phonon-vlc/phonon-vlc-0.4.0.ebuild
index d8e728c8efbf3a707e763743e430d9903478a977..f8e7613e5e4328a82f023a8b7d82c83b09d7b9cf 100644 (file)
--- a/media-libs/phonon-vlc/phonon-vlc-0.4.0.ebuild
+++ b/media-libs/phonon-vlc/phonon-vlc-0.4.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon-vlc/phonon-vlc-0.4.0.ebuild,v 1.6 2011/08/07 15:25:12 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon-vlc/phonon-vlc-0.4.0.ebuild,v 1.7 2011/10/02 19:57:38 reavertm Exp $
 
 EAPI=4
 
@@ -18,14 +18,13 @@ SRC_URI="mirror://kde/stable/phonon/${MY_PN}/${PV}/src/${MY_P}.tar.bz2"
 LICENSE="LGPL-2.1"
 [[ ${PV} == 9999 ]] || KEYWORDS="amd64 ~ppc ~ppc64 x86"
 SLOT="0"
-IUSE="debug v4l2"
+IUSE="debug"
 
 RDEPEND="
        >=media-libs/phonon-4.5.0
        >=media-video/vlc-1.1.1[dbus,ogg,vorbis]
        >=x11-libs/qt-dbus-4.6.0:4
        >=x11-libs/qt-gui-4.6.0:4
-       v4l2? ( media-libs/libv4l )
 "
 DEPEND="${RDEPEND}
        >=dev-util/automoc-0.9.87
@@ -36,13 +35,6 @@ S=${WORKDIR}/${MY_P}
 
 DOCS=( AUTHORS )
 
-src_configure() {
-       local mycmakeargs=(
-               $(cmake-utils_use_with v4l2)
-       )
-       cmake-utils_src_configure
-}
-
 pkg_postinst() {
        elog "For more verbose debug information, export the following variables:"
        use v4l2 && elog "PHONON_VLC_DEBUG=3"

diff --git a/media-libs/phonon-vlc/phonon-vlc-0.4.1.ebuild b/media-libs/phonon-vlc/phonon-vlc-0.4.1.ebuild
index 9181d8e2275f2a29f2e1971865bae6a8d8116a64..82cb7cd2c7e5e5511aa1c7f1422ab53a1d4c29ae 100644 (file)
--- a/media-libs/phonon-vlc/phonon-vlc-0.4.1.ebuild
+++ b/media-libs/phonon-vlc/phonon-vlc-0.4.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon-vlc/phonon-vlc-0.4.1.ebuild,v 1.1 2011/08/01 12:35:28 tampakrap Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon-vlc/phonon-vlc-0.4.1.ebuild,v 1.2 2011/10/02 19:57:38 reavertm Exp $
 
 EAPI=4
 
@@ -18,14 +18,13 @@ SRC_URI="mirror://kde/stable/phonon/${MY_PN}/${PV}/${MY_P}.tar.bz2"
 LICENSE="LGPL-2.1"
 [[ ${PV} == 9999 ]] || KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 SLOT="0"
-IUSE="debug v4l2"
+IUSE="debug"
 
 RDEPEND="
        >=media-libs/phonon-4.5.0
        >=media-video/vlc-1.1.1[dbus,ogg,vorbis]
        >=x11-libs/qt-dbus-4.6.0:4
        >=x11-libs/qt-gui-4.6.0:4
-       v4l2? ( media-libs/libv4l )
 "
 DEPEND="${RDEPEND}
        >=dev-util/automoc-0.9.87
@@ -36,13 +35,6 @@ S=${WORKDIR}/${MY_P}
 
 DOCS=( AUTHORS )
 
-src_configure() {
-       local mycmakeargs=(
-               $(cmake-utils_use_with v4l2)
-       )
-       cmake-utils_src_configure
-}
-
 pkg_postinst() {
        elog "For more verbose debug information, export the following variables:"
        use v4l2 && elog "PHONON_VLC_DEBUG=3"

diff --git a/media-libs/phonon-vlc/phonon-vlc-9999.ebuild b/media-libs/phonon-vlc/phonon-vlc-9999.ebuild
index 168d1a8003d2700886f91c35f165062db06609ac..7e6889b78e8b3fbbb2ec437c4c46cf6f662803da 100644 (file)
--- a/media-libs/phonon-vlc/phonon-vlc-9999.ebuild
+++ b/media-libs/phonon-vlc/phonon-vlc-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon-vlc/phonon-vlc-9999.ebuild,v 1.3 2011/07/14 10:57:02 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon-vlc/phonon-vlc-9999.ebuild,v 1.4 2011/10/02 19:57:38 reavertm Exp $
 
 EAPI=4
 
@@ -18,14 +18,13 @@ HOMEPAGE="https://projects.kde.org/projects/kdesupport/phonon/phonon-vlc"
 LICENSE="LGPL-2.1"
 [[ ${PV} == 9999 ]] || KEYWORDS="~amd64 ~x86"
 SLOT="0"
-IUSE="debug v4l2"
+IUSE="debug"
 
 RDEPEND="
        >=media-libs/phonon-4.5.0
        >=media-video/vlc-1.1.1[dbus,ogg,vorbis]
        >=x11-libs/qt-dbus-4.6.0:4
        >=x11-libs/qt-gui-4.6.0:4
-       v4l2? ( media-libs/libv4l )
 "
 DEPEND="${RDEPEND}
        >=dev-util/automoc-0.9.87
@@ -36,13 +35,6 @@ S=${WORKDIR}/${MY_P}
 
 DOCS=( AUTHORS )
 
-src_configure() {
-       local mycmakeargs=(
-               $(cmake-utils_use_with v4l2)
-       )
-       cmake-utils_src_configure
-}
-
 pkg_postinst() {
        elog "For more verbose debug information, export the following variables:"
        use v4l2 && elog "PHONON_VLC_DEBUG=3"