gentoo resync : 25.11.2020

7 files changed, 9 insertions, 6 deletions

diff --git a/profiles/updates/1Q-2017 b/profiles/updates/1Q-2017
index eec7f2215773..cde2ff095b42 100644
--- a/profiles/updates/1Q-2017
+++ b/profiles/updates/1Q-2017
@@ -4,14 +4,12 @@ move net-libs/libkgapi kde-apps/libkgapi
 slotmove =dev-ruby/typhoeus-1.1.2 0 1
 move app-cdr/k3b kde-apps/k3b
 move net-misc/badvpn net-vpn/badvpn
-move net-misc/freelan net-vpn/freelan
 move net-firewall/ipsec-tools net-vpn/ipsec-tools
 move net-misc/libreswan net-vpn/libreswan
 move net-misc/logmein-hamachi net-vpn/logmein-hamachi
 move net-misc/openconnect net-vpn/openconnect
 move net-misc/openfortivpn net-vpn/openfortivpn
 move net-misc/openvpn net-vpn/openvpn
-move net-misc/peervpn net-vpn/peervpn
 move net-misc/strongswan net-vpn/strongswan
 move net-misc/tinc net-vpn/tinc
 move net-misc/vpnc net-vpn/vpnc
diff --git a/profiles/updates/2Q-2020 b/profiles/updates/2Q-2020
index 41f95c93bbee..2bbf947be5fa 100644
--- a/profiles/updates/2Q-2020
+++ b/profiles/updates/2Q-2020
@@ -1,5 +1,4 @@
 move dev-libs/yaml-cpp dev-cpp/yaml-cpp
-move dev-python/scikit-learn sci-libs/scikits_learn
 move dev-python/rnc2rng app-text/rnc2rng
 move games-puzzle/world-of-goo games-puzzle/world-of-goo-hb
 slotmove =dev-ruby/shoulda-matchers-4.3.0* 3 4
diff --git a/profiles/updates/3Q-2019 b/profiles/updates/3Q-2019
index bb0defe1e1ac..c7b908862734 100644
--- a/profiles/updates/3Q-2019
+++ b/profiles/updates/3Q-2019
@@ -1,4 +1,3 @@
-move dev-python/CoverageTestRunner dev-python/coverage-test-runner
 move media-plugins/kipi-plugins kde-apps/kipi-plugins
 move kde-misc/yakuake kde-apps/yakuake
 move kde-apps/kjots app-text/kjots
diff --git a/profiles/updates/3Q-2020 b/profiles/updates/3Q-2020
index a4cba9052a4d..9d7504fc580d 100644
--- a/profiles/updates/3Q-2020
+++ b/profiles/updates/3Q-2020
@@ -144,3 +144,5 @@ slotmove <media-sound/teamspeak-client-5 0 3
 slotmove dev-haskell/network 3 0
 move sci-libs/scipy dev-python/scipy
 move dev-perl/frontier-rpc dev-perl/Frontier-RPC
+move sci-libs/Rtree sci-libs/rtree
+move sci-libs/Shapely sci-libs/shapely
diff --git a/profiles/updates/4Q-2015 b/profiles/updates/4Q-2015
index 3a427b971b0f..0640fe75b8f7 100644
--- a/profiles/updates/4Q-2015
+++ b/profiles/updates/4Q-2015
@@ -3,7 +3,6 @@ move sys-apps/cv sys-apps/progress
 slotmove =dev-ruby/recog-2.0.6 2 2.0.6
 slotmove =dev-ruby/recog-2.0.12 2 2.0.12
 slotmove =dev-ruby/recog-2.0.14 2 2.0.14
-move media-libs/libkgeomap kde-apps/libkgeomap
 slotmove =dev-python/pyfltk-1.3.3 1 0
 move kde-apps/oxygen-icons kde-frameworks/oxygen-icons
 slotmove =dev-ruby/rack-cache-1.3.0 1.3 1.2
diff --git a/profiles/updates/4Q-2016 b/profiles/updates/4Q-2016
index ebf87b1be7cd..8731c54eb5b3 100644
--- a/profiles/updates/4Q-2016
+++ b/profiles/updates/4Q-2016
@@ -20,7 +20,6 @@ move kde-base/systemsettings kde-plasma/systemsettings
 move kde-base/kfilemetadata kde-frameworks/kfilemetadata
 move kde-base/baloo kde-frameworks/baloo
 move kde-base/kwin kde-plasma/kwin
-slotmove dev-python/pyinsane 0 1
 move media-sound/kwave kde-apps/kwave
 move app-misc/ddctool app-misc/ddcutil
 move media-libs/prison kde-frameworks/prison
diff --git a/profiles/updates/4Q-2020 b/profiles/updates/4Q-2020
new file mode 100644
index 000000000000..0c667f5c3224
--- /dev/null
+++ b/profiles/updates/4Q-2020
@@ -0,0 +1,7 @@
+move acct-group/openldap acct-group/ldap
+move acct-user/openldap acct-user/ldap
+move x11-apps/copyq x11-misc/copyq
+slotmove media-gfx/gimp 2 0
+move dev-python/scikit-learn sci-libs/scikit-learn
+move sci-libs/scikits_learn sci-libs/scikit-learn
+move sci-libs/scikits_image sci-libs/scikit-image