summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Documentation/package.keywords/.kde-4.6.9999/more-deps2
-rw-r--r--Documentation/package.keywords/.kde-4.6/more-deps2
-rw-r--r--Documentation/package.keywords/.kde-live/kdedeps-live2
-rw-r--r--Documentation/package.keywords/kde-4.6.9999.keywords2
-rw-r--r--Documentation/package.keywords/kde-4.6.keywords2
-rw-r--r--Documentation/package.keywords/kde-live.keywords2
-rw-r--r--Documentation/package.unmask/kde-live2
-rw-r--r--media-libs/phonon-vlc/Manifest (renamed from media-sound/phonon-vlc/Manifest)0
-rw-r--r--media-libs/phonon-vlc/phonon-vlc-9999.ebuild (renamed from media-sound/phonon-vlc/phonon-vlc-9999.ebuild)0
-rw-r--r--profiles/updates/1Q-20111
-rw-r--r--sets/kdedeps-live2
11 files changed, 9 insertions, 8 deletions
diff --git a/Documentation/package.keywords/.kde-4.6.9999/more-deps b/Documentation/package.keywords/.kde-4.6.9999/more-deps
index 224be9cca98..bec0295f97e 100644
--- a/Documentation/package.keywords/.kde-4.6.9999/more-deps
+++ b/Documentation/package.keywords/.kde-4.6.9999/more-deps
@@ -16,7 +16,7 @@ dev-python/pycups
~gnome-extra/polkit-gnome-0.99
~media-libs/phonon-4.4.4
~media-libs/phonon-gstreamer-4.4.4
-~media-sound/phonon-vlc-4.4.4
+~media-libs/phonon-vlc-4.4.4
~media-sound/phonon-xine-4.4.4
# Also unrelated
x11-misc/google-gadgets
diff --git a/Documentation/package.keywords/.kde-4.6/more-deps b/Documentation/package.keywords/.kde-4.6/more-deps
index 224be9cca98..bec0295f97e 100644
--- a/Documentation/package.keywords/.kde-4.6/more-deps
+++ b/Documentation/package.keywords/.kde-4.6/more-deps
@@ -16,7 +16,7 @@ dev-python/pycups
~gnome-extra/polkit-gnome-0.99
~media-libs/phonon-4.4.4
~media-libs/phonon-gstreamer-4.4.4
-~media-sound/phonon-vlc-4.4.4
+~media-libs/phonon-vlc-4.4.4
~media-sound/phonon-xine-4.4.4
# Also unrelated
x11-misc/google-gadgets
diff --git a/Documentation/package.keywords/.kde-live/kdedeps-live b/Documentation/package.keywords/.kde-live/kdedeps-live
index 358cc7741fc..3f7753adec8 100644
--- a/Documentation/package.keywords/.kde-live/kdedeps-live
+++ b/Documentation/package.keywords/.kde-live/kdedeps-live
@@ -6,7 +6,7 @@
~app-misc/strigi-9999 **
~media-libs/phonon-9999 **
~media-libs/phonon-gstreamer-9999 **
-~media-sound/phonon-vlc-9999 **
+~media-libs/phonon-vlc-9999 **
~media-sound/phonon-xine-9999 **
~sys-auth/polkit-qt-9999 **
~sys-auth/polkit-kde-agent-9999 **
diff --git a/Documentation/package.keywords/kde-4.6.9999.keywords b/Documentation/package.keywords/kde-4.6.9999.keywords
index 84ece567208..b6c9570ddb0 100644
--- a/Documentation/package.keywords/kde-4.6.9999.keywords
+++ b/Documentation/package.keywords/kde-4.6.9999.keywords
@@ -333,7 +333,7 @@ dev-python/pycups
~gnome-extra/polkit-gnome-0.99
~media-libs/phonon-4.4.4
~media-libs/phonon-gstreamer-4.4.4
-~media-sound/phonon-vlc-4.4.4
+~media-libs/phonon-vlc-4.4.4
~media-sound/phonon-xine-4.4.4
# Also unrelated
x11-misc/google-gadgets
diff --git a/Documentation/package.keywords/kde-4.6.keywords b/Documentation/package.keywords/kde-4.6.keywords
index a342396c95d..7a1febb357e 100644
--- a/Documentation/package.keywords/kde-4.6.keywords
+++ b/Documentation/package.keywords/kde-4.6.keywords
@@ -333,7 +333,7 @@ dev-python/pycups
~gnome-extra/polkit-gnome-0.99
~media-libs/phonon-4.4.4
~media-libs/phonon-gstreamer-4.4.4
-~media-sound/phonon-vlc-4.4.4
+~media-libs/phonon-vlc-4.4.4
~media-sound/phonon-xine-4.4.4
# Also unrelated
x11-misc/google-gadgets
diff --git a/Documentation/package.keywords/kde-live.keywords b/Documentation/package.keywords/kde-live.keywords
index 645f7cda115..6ba9b940434 100644
--- a/Documentation/package.keywords/kde-live.keywords
+++ b/Documentation/package.keywords/kde-live.keywords
@@ -125,7 +125,7 @@
~app-misc/strigi-9999 **
~media-libs/phonon-9999 **
~media-libs/phonon-gstreamer-9999 **
-~media-sound/phonon-vlc-9999 **
+~media-libs/phonon-vlc-9999 **
~media-sound/phonon-xine-9999 **
~sys-auth/polkit-qt-9999 **
~sys-auth/polkit-kde-agent-9999 **
diff --git a/Documentation/package.unmask/kde-live b/Documentation/package.unmask/kde-live
index b96bc0d8464..5ca2b0f9260 100644
--- a/Documentation/package.unmask/kde-live
+++ b/Documentation/package.unmask/kde-live
@@ -125,7 +125,7 @@ kde-base/smoke:live
~app-misc/strigi-9999
~media-libs/phonon-9999
~media-libs/phonon-gstreamer-9999
-~media-sound/phonon-vlc-9999
+~media-libs/phonon-vlc-9999
~media-sound/phonon-xine-9999
~sys-auth/polkit-qt-9999
~sys-auth/polkit-kde-agent-9999
diff --git a/media-sound/phonon-vlc/Manifest b/media-libs/phonon-vlc/Manifest
index 4c80b95f07a..4c80b95f07a 100644
--- a/media-sound/phonon-vlc/Manifest
+++ b/media-libs/phonon-vlc/Manifest
diff --git a/media-sound/phonon-vlc/phonon-vlc-9999.ebuild b/media-libs/phonon-vlc/phonon-vlc-9999.ebuild
index 58c0e46f8eb..58c0e46f8eb 100644
--- a/media-sound/phonon-vlc/phonon-vlc-9999.ebuild
+++ b/media-libs/phonon-vlc/phonon-vlc-9999.ebuild
diff --git a/profiles/updates/1Q-2011 b/profiles/updates/1Q-2011
index 704ad254262..8990f81c6a0 100644
--- a/profiles/updates/1Q-2011
+++ b/profiles/updates/1Q-2011
@@ -1,3 +1,4 @@
slotmove net-misc/ksshaskpass 0 4
move media-sound/phonon media-libs/phonon
move media-sound/phonon-gstreamer media-libs/phonon-gstreamer
+move media-sound/phonon-vlc media-libs/phonon-vlc
diff --git a/sets/kdedeps-live b/sets/kdedeps-live
index 83361a933aa..c79b488e397 100644
--- a/sets/kdedeps-live
+++ b/sets/kdedeps-live
@@ -6,7 +6,7 @@
~app-misc/strigi-9999
~media-libs/phonon-9999
~media-libs/phonon-gstreamer-9999
-~media-sound/phonon-vlc-9999
+~media-libs/phonon-vlc-9999
~media-sound/phonon-xine-9999
~sys-auth/polkit-qt-9999
~sys-auth/polkit-kde-agent-9999