From: Michał Górny <mgorny@gentoo.org>
Date: Sun, 3 Sep 2017 19:53:52 +0000 (+0200)
Subject: profiles/updates: Replace multi-moves with direct moves to final
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=498427e8952466ef270a7d11b1ca1f0b1e0ae56f;p=gentoo.git

profiles/updates: Replace multi-moves with direct moves to final

Replace 'a -> b -> c' style package moves with direct moves to the final
name, i.e. 'a -> c', 'b -> c'.
---

diff --git a/profiles/updates/1Q-2012 b/profiles/updates/1Q-2012
index 9ac0bc1b2ab1..04edee4fa76f 100644
--- a/profiles/updates/1Q-2012
+++ b/profiles/updates/1Q-2012
@@ -9,7 +9,7 @@ move media-tv/linuxtv-dvb-headers virtual/linuxtv-dvb-headers
 move app-shells/prll sys-process/prll
 move net-wireless/wispy-tools net-wireless/spectools
 slotmove dev-ruby/syslogger 3 0
-move kde-misc/konq-plugins kde-base/konq-plugins
+move kde-misc/konq-plugins kde-apps/konq-plugins
 slotmove <gnome-extra/nautilus-actions-3.2.2 0 2
 move dev-php/php-tokenstream dev-php/PHP_TokenStream
 move dev-php/phpunit-selenium dev-php/PHPUnit_Selenium
diff --git a/profiles/updates/1Q-2013 b/profiles/updates/1Q-2013
index 7aca15781597..e03d26bb9107 100644
--- a/profiles/updates/1Q-2013
+++ b/profiles/updates/1Q-2013
@@ -56,7 +56,7 @@ move net-misc/leechcraft-blogique app-leechcraft/lc-blogique
 move net-misc/leechcraft-core app-leechcraft/lc-core
 move net-misc/leechcraft-cstp app-leechcraft/lc-cstp
 move net-misc/leechcraft-dbusmanager app-leechcraft/lc-dbusmanager
-move net-misc/leechcraft-full app-leechcraft/leechraft-meta
+move net-misc/leechcraft-full app-leechcraft/leechcraft-meta
 move net-misc/leechcraft-gacts app-leechcraft/lc-gacts
 move net-misc/leechcraft-glance app-leechcraft/lc-glance
 move net-misc/leechcraft-historyholder app-leechcraft/lc-historyholder
diff --git a/profiles/updates/1Q-2016 b/profiles/updates/1Q-2016
index 76f17c68e9e8..5876105e4a82 100644
--- a/profiles/updates/1Q-2016
+++ b/profiles/updates/1Q-2016
@@ -30,7 +30,7 @@ move dev-perl/net-ssh-perl dev-perl/Net-SSH-Perl
 move dev-perl/DateManip dev-perl/Date-Manip
 move dev-perl/wxperl dev-perl/Wx
 slotmove sys-devel/binutils 0 2.25.1
-move sys-fs/sshfs-fuse sys-fs/sshfs
+move sys-fs/sshfs-fuse net-fs/sshfs
 move dev-perl/perl-tk dev-perl/Tk
 move dev-perl/mogilefs-server dev-perl/MogileFS-Server
 move dev-perl/ogg-vorbis-header dev-perl/Ogg-Vorbis-Header
diff --git a/profiles/updates/2Q-2012 b/profiles/updates/2Q-2012
index 48b428d00262..258718bc4cb5 100644
--- a/profiles/updates/2Q-2012
+++ b/profiles/updates/2Q-2012
@@ -10,15 +10,15 @@ move app-mobilephone/jacksms-desktop app-mobilephone/freesmee
 move app-office/languagetool app-officeext/languagetool
 move dev-vcs/cola dev-vcs/git-cola
 move app-portage/eclean-kernel app-admin/eclean-kernel
-move kde-misc/kcm-gtk-config kde-misc/kde-gtk-config
+move kde-misc/kcm-gtk-config kde-plasma/kde-gtk-config
 move x11-misc/see x11-misc/seetxt
 move dev-python/Whoosh dev-python/whoosh
 move dev-texlive/texlive-latex3 dev-texlive/texlive-latexrecommended
 move net-libs/axTLS net-libs/axtls
 move x11-misc/tudor-volumed media-sound/tudor-volumed
-move media-video/leechcraft-lmp media-sound/leechcraft-lmp
+move media-video/leechcraft-lmp app-leechcraft/lc-lmp
 move x11-themes/gtk-engines-nimbus x11-themes/nimbus
 move media-gfx/iscan-plugin-gt-s80 media-gfx/esci-interpreter-gt-s80
 move x11-libs/libPropList x11-libs/libproplist
 move dev-perl/Text-ParseWords perl-core/Text-ParseWords
-move net-fs/leechcraft-vrooby sys-fs/leechcraft-vrooby
+move net-fs/leechcraft-vrooby app-leechcraft/lc-vrooby
diff --git a/profiles/updates/2Q-2013 b/profiles/updates/2Q-2013
index dbcb7472c0cd..5b87c2e1b252 100644
--- a/profiles/updates/2Q-2013
+++ b/profiles/updates/2Q-2013
@@ -1,4 +1,4 @@
-move kde-misc/print-manager kde-base/print-manager
+move kde-misc/print-manager kde-apps/print-manager
 slotmove =dev-haskell/glade-0.12* 0 2
 slotmove =dev-haskell/gtk-0.12* 0 2
 slotmove =media-sound/ardour-2.8* 0 2
diff --git a/profiles/updates/2Q-2015 b/profiles/updates/2Q-2015
index 3daca94436fe..1afb486709d4 100644
--- a/profiles/updates/2Q-2015
+++ b/profiles/updates/2Q-2015
@@ -106,7 +106,7 @@ move kde-base/kfind kde-apps/kfind
 move kde-base/kfloppy kde-apps/kfloppy
 move kde-base/kfmclient kde-apps/kfmclient
 move kde-base/kfourinline kde-apps/kfourinline
-move kde-base/kgamma kde-apps/kgamma
+move kde-base/kgamma kde-plasma/kgamma
 move kde-base/kgeography kde-apps/kgeography
 move kde-base/kget kde-apps/kget
 move kde-base/kglobalaccel kde-apps/kglobalaccel
@@ -208,7 +208,7 @@ move kde-base/nepomuk kde-apps/nepomuk
 move kde-base/nsplugins kde-apps/nsplugins
 move kde-base/okteta kde-apps/okteta
 move kde-base/okular kde-apps/okular
-move kde-base/oxygen-icons kde-apps/oxygen-icons
+move kde-base/oxygen-icons kde-frameworks/oxygen-icons
 move kde-base/pairs kde-apps/pairs
 move kde-base/palapeli kde-apps/palapeli
 move kde-base/parley kde-apps/parley
diff --git a/profiles/updates/4Q-2012 b/profiles/updates/4Q-2012
index a60f49213711..4c52462db7bf 100644
--- a/profiles/updates/4Q-2012
+++ b/profiles/updates/4Q-2012
@@ -54,7 +54,7 @@ move x11-libs/vdpau-video x11-libs/libva-vdpau-driver
 slotmove <net-libs/farstream-0.1.90 0 0.1
 move dev-ruby/ruby-bsearch dev-ruby/bsearch
 move net-misc/ptunnel net-proxy/pingtunnel
-move media-sound/leechcraft-lemon net-misc/leechcraft-lemon
+move media-sound/leechcraft-lemon app-leechcraft/lc-lemon
 move dev-haskell/hsql-sqlite dev-haskell/hsql-sqlite3
 slotmove dev-ruby/builder 3.1.4 3.1
 move x11-terms/terminal x11-terms/xfce4-terminal