Move {xfce-extra ⇒ xfce-base}/tumbler

Signed-off-by: Michał Górny <mgorny@gentoo.org>

10 files changed, 6 insertions, 5 deletions

diff --git a/profiles/arch/alpha/package.use.mask b/profiles/arch/alpha/package.use.mask
index 5e1dd355a774..f430ba409c29 100644
--- a/profiles/arch/alpha/package.use.mask
+++ b/profiles/arch/alpha/package.use.mask
@@ -180,7 +180,7 @@ gnome-base/nautilus previewer
 # needs libgdata[gnome-online-accounts], depends on net-libs/webkit-gtk
 gnome-base/gvfs google
 # needs app-text/libgepub which depends on webkit-gtk
-xfce-extra/tumbler epub
+xfce-base/tumbler epub
 
 # Michał Górny <mgorny@gentoo.org> (2020-06-14)
 # Requires dev-python/networkx.
diff --git a/profiles/arch/ia64/package.use.mask b/profiles/arch/ia64/package.use.mask
index d0252e32de15..db6b6881c340 100644
--- a/profiles/arch/ia64/package.use.mask
+++ b/profiles/arch/ia64/package.use.mask
@@ -181,7 +181,7 @@ gnome-base/nautilus previewer
 # - net-libs/gnome-online-accounts: depends on webkit-gtk
 gnome-base/gvfs google
 # app-text/libgepub depends on webkit-gtk.
-xfce-extra/tumbler epub
+xfce-base/tumbler epub
 
 # Thomas Deutschmann <whissi@gentoo.org> (2020-03-15)
 # Mask USE=libtesseract, app-text/tesseract is not keyworded
diff --git a/profiles/arch/sparc/package.use.mask b/profiles/arch/sparc/package.use.mask
index 26e504e5b907..226d7b004f97 100644
--- a/profiles/arch/sparc/package.use.mask
+++ b/profiles/arch/sparc/package.use.mask
@@ -147,7 +147,7 @@ net-libs/webkit-gtk gamepad
 
 # Joonas Niilola <juippis@gentoo.org> (2020-11-16)
 # app-text/libgepub not yet keyworded on this arch. #754762
-xfce-extra/tumbler epub
+xfce-base/tumbler epub
 
 # Arfrever Frehtes Taifersar Arahesis <arfrever.fta@gmail.com> (2020-10-14)
 # app-i18n/fcitx:4 not keyworded.
diff --git a/profiles/updates/3Q-2022 b/profiles/updates/3Q-2022
index c062d4193ccb..451d93583ab9 100644
--- a/profiles/updates/3Q-2022
+++ b/profiles/updates/3Q-2022
@@ -21,3 +21,4 @@ move app-emulation/distrobox app-containers/distrobox
 move www-servers/tornado dev-python/tornado
 move dev-python/path-py dev-python/path
 move xfce-extra/thunar-volman xfce-base/thunar-volman
+move xfce-extra/tumbler xfce-base/tumbler
diff --git a/xfce-extra/tumbler/Manifest b/xfce-base/tumbler/Manifest
index d8591316d9e7..d8591316d9e7 100644
--- a/xfce-extra/tumbler/Manifest
+++ b/xfce-base/tumbler/Manifest
diff --git a/xfce-extra/tumbler/metadata.xml b/xfce-base/tumbler/metadata.xml
index 64193de99fd7..64193de99fd7 100644
--- a/xfce-extra/tumbler/metadata.xml
+++ b/xfce-base/tumbler/metadata.xml
diff --git a/xfce-extra/tumbler/tumbler-4.16.0.ebuild b/xfce-base/tumbler/tumbler-4.16.0.ebuild
index c4edcf962c44..36a0baaa7b78 100644
--- a/xfce-extra/tumbler/tumbler-4.16.0.ebuild
+++ b/xfce-base/tumbler/tumbler-4.16.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/xfce-extra/tumbler/tumbler-4.16.1.ebuild b/xfce-base/tumbler/tumbler-4.16.1.ebuild
index 8e8adab9d1e2..8e8adab9d1e2 100644
--- a/xfce-extra/tumbler/tumbler-4.16.1.ebuild
+++ b/xfce-base/tumbler/tumbler-4.16.1.ebuild
diff --git a/xfce-extra/tumbler/tumbler-4.17.2.ebuild b/xfce-base/tumbler/tumbler-4.17.2.ebuild
index ca2022354863..ca2022354863 100644
--- a/xfce-extra/tumbler/tumbler-4.17.2.ebuild
+++ b/xfce-base/tumbler/tumbler-4.17.2.ebuild
diff --git a/xfce-base/xfce4-meta/xfce4-meta-4.16-r2.ebuild b/xfce-base/xfce4-meta/xfce4-meta-4.16-r2.ebuild
index ade299f2923c..005c4d53bb82 100644
--- a/xfce-base/xfce4-meta/xfce4-meta-4.16-r2.ebuild
+++ b/xfce-base/xfce4-meta/xfce4-meta-4.16-r2.ebuild
@@ -20,6 +20,7 @@ RDEPEND="
 	>=xfce-base/libxfce4util-4.16
 	>=xfce-base/thunar-4.16
 	>=xfce-base/thunar-volman-4.16
+	>=xfce-base/tumbler-4.16
 	>=xfce-base/xfce4-appfinder-4.16
 	>=xfce-base/xfce4-panel-4.16
 	>=xfce-base/xfce4-session-4.16
@@ -28,7 +29,6 @@ RDEPEND="
 	>=xfce-base/xfconf-4.16
 	>=xfce-base/xfdesktop-4.16
 	>=xfce-base/xfwm4-4.16
-	>=xfce-extra/tumbler-4.16
 	!minimal? (
 		media-fonts/dejavu
 		virtual/freedesktop-icon-theme