gentoo resync : 15.01.2020

7 files changed, 5 insertions, 31 deletions

diff --git a/profiles/updates/1Q-2014 b/profiles/updates/1Q-2014
deleted file mode 100644
index 556dfb6b279c..000000000000
--- a/profiles/updates/1Q-2014
+++ /dev/null
@@ -1,5 +0,0 @@
-move net-misc/mirall net-misc/owncloud-client
-slotmove sys-block/kvpm 0 4
-move media-sound/audio-entropyd sys-apps/audio-entropyd
-move dev-libs/libusbx dev-libs/libusb
-slotmove =mate-base/mate-control-center-1.6.2 2 0
diff --git a/profiles/updates/1Q-2017 b/profiles/updates/1Q-2017
index cb54749de2e2..1bbc8fbbd656 100644
--- a/profiles/updates/1Q-2017
+++ b/profiles/updates/1Q-2017
@@ -16,7 +16,7 @@ move net-misc/strongswan net-vpn/strongswan
 move net-misc/tinc net-vpn/tinc
 move net-misc/vpnc net-vpn/vpnc
 move net-misc/vpncwatch net-vpn/vpncwatch
-move net-misc/wireguard net-vpn/wireguard
+move net-misc/wireguard virtual/wireguard
 move net-misc/vtun net-vpn/vtun
 move net-misc/isatapd net-vpn/isatapd
 move net-misc/iodine net-vpn/iodine
diff --git a/profiles/updates/2Q-2014 b/profiles/updates/2Q-2014
deleted file mode 100644
index bc569f985233..000000000000
--- a/profiles/updates/2Q-2014
+++ /dev/null
@@ -1,2 +0,0 @@
-slotmove =dev-ruby/listen-1.3.1-r1 0 1
-slotmove =dev-ruby/http-0.6* 5 0.6
diff --git a/profiles/updates/2Q-2016 b/profiles/updates/2Q-2016
index 00df6107ebfa..eb90fe530403 100644
--- a/profiles/updates/2Q-2016
+++ b/profiles/updates/2Q-2016
@@ -34,7 +34,6 @@ slotmove >=dev-php/pecl-rrd-2.0 0 7
 slotmove >=dev-php/pecl-oauth-2.0 0 7
 move sys-infiniband/dapl sys-fabric/dapl
 move sys-infiniband/ibacm sys-fabric/ibacm
-move sys-infiniband/ibutils sys-fabric/ibutils
 move sys-infiniband/infiniband-diags sys-fabric/infiniband-diags
 move sys-infiniband/infinipath-psm sys-fabric/infinipath-psm
 move sys-infiniband/libcxgb3 sys-fabric/libcxgb3
diff --git a/profiles/updates/3Q-2014 b/profiles/updates/3Q-2014
deleted file mode 100644
index 44425ed46750..000000000000
--- a/profiles/updates/3Q-2014
+++ /dev/null
@@ -1,12 +0,0 @@
-move perl-core/Class-ISA dev-perl/Class-ISA
-move perl-core/Filter dev-perl/Filter
-slotmove =net-misc/iperf-2* 0 2
-slotmove =net-misc/iperf-3* 0 3
-move virtual/perl-PodParser virtual/perl-Pod-Parser
-move perl-core/digest-base perl-core/Digest
-move virtual/perl-digest-base virtual/perl-Digest
-move virtual/perl-i18n-langtags virtual/perl-I18N-LangTags
-move virtual/perl-locale-maketext virtual/perl-Locale-Maketext
-move virtual/perl-net-ping virtual/perl-Net-Ping
-move perl-core/Switch dev-perl/Switch
-move dev-qt/qcustomplot dev-libs/qcustomplot
diff --git a/profiles/updates/4Q-2014 b/profiles/updates/4Q-2014
deleted file mode 100644
index ab0f4ef5d3cc..000000000000
--- a/profiles/updates/4Q-2014
+++ /dev/null
@@ -1,10 +0,0 @@
-move dev-perl/Template-Latex dev-perl/Template-Plugin-Latex
-move dev-ml/async_core dev-ml/async_kernel
-move razorqt-base/libqtxdg dev-libs/libqtxdg
-move app-shells/zsh-completion app-shells/gentoo-zsh-completions
-move www-servers/ocsigen www-servers/ocsigenserver
-slotmove =dev-cpp/gstreamermm-0.10* 0 0.10
-move net-zope/zc-buildout dev-python/zc-buildout
-move net-zope/zope-interface dev-python/zope-interface
-move media-gfx/photo media-gfx/photoqt
-move dev-db/postgresql-base dev-db/postgresql
diff --git a/profiles/updates/4Q-2019 b/profiles/updates/4Q-2019
index 7a98f920e248..5a0b3ea10df2 100644
--- a/profiles/updates/4Q-2019
+++ b/profiles/updates/4Q-2019
@@ -2,3 +2,7 @@ move dev-libs/rlottie media-libs/rlottie
 move dev-util/repo dev-vcs/repo
 move media-video/gnome-mpv media-video/celluloid
 move app-admin/graylog2 app-admin/graylog
+move media-libs/libclthreads dev-libs/libclthreads
+move media-libs/libclxclient x11-libs/libclxclient
+slotmove net-misc/teamviewer 15 0
+move net-vpn/wireguard virtual/wireguard