[gentoo-commits] repo/gentoo:master commit in: xfce-extra/thunar-volman/, xfce-base/xfce4-meta/, profiles/updates/, ...

[gentoo-commits] repo/gentoo:master commit in: xfce-extra/thunar-volman/, xfce-base/xfce4-meta/, profiles/updates/, ...

[Michał Górny]

commit:     e69382f457945a4839acfc58416c38c76989957a
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Oct  8 14:00:25 2022 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Oct  8 14:00:25 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e69382f4

Move {xfce-extra ⇒ xfce-base}/thunar-volman

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

 profiles/updates/3Q-2022                                          | 1 +
 {xfce-extra => xfce-base}/thunar-volman/Manifest                  | 0
 {xfce-extra => xfce-base}/thunar-volman/metadata.xml              | 0
 .../thunar-volman/thunar-volman-4.16.0.ebuild                     | 0
 xfce-base/xfce4-meta/xfce4-meta-4.16-r2.ebuild                    | 8 +++++---
 5 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/profiles/updates/3Q-2022 b/profiles/updates/3Q-2022
index 6561c40ede22..c062d4193ccb 100644
--- a/profiles/updates/3Q-2022
+++ b/profiles/updates/3Q-2022
@@ -20,3 +20,4 @@ move mail-mta/protonmail-bridge mail-mta/proton-mail-bridge
 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

diff --git a/xfce-extra/thunar-volman/Manifest b/xfce-base/thunar-volman/Manifest
similarity index 100%
rename from xfce-extra/thunar-volman/Manifest
rename to xfce-base/thunar-volman/Manifest

diff --git a/xfce-extra/thunar-volman/metadata.xml b/xfce-base/thunar-volman/metadata.xml
similarity index 100%
rename from xfce-extra/thunar-volman/metadata.xml
rename to xfce-base/thunar-volman/metadata.xml

diff --git a/xfce-extra/thunar-volman/thunar-volman-4.16.0.ebuild b/xfce-base/thunar-volman/thunar-volman-4.16.0.ebuild
similarity index 100%
rename from xfce-extra/thunar-volman/thunar-volman-4.16.0.ebuild
rename to xfce-base/thunar-volman/thunar-volman-4.16.0.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 3b3a8056bb48..ade299f2923c 100644
--- a/xfce-base/xfce4-meta/xfce4-meta-4.16-r2.ebuild
+++ b/xfce-base/xfce4-meta/xfce4-meta-4.16-r2.ebuild
@@ -12,12 +12,14 @@ SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ppc ppc64 ~riscv x86"
 IUSE="minimal pulseaudio +svg upower"
 
-RDEPEND="x11-themes/hicolor-icon-theme
+RDEPEND="
+	x11-themes/hicolor-icon-theme
 	>=xfce-base/exo-4.16
 	>=xfce-base/garcon-0.8
 	>=xfce-base/libxfce4ui-4.16
 	>=xfce-base/libxfce4util-4.16
 	>=xfce-base/thunar-4.16
+	>=xfce-base/thunar-volman-4.16
 	>=xfce-base/xfce4-appfinder-4.16
 	>=xfce-base/xfce4-panel-4.16
 	>=xfce-base/xfce4-session-4.16
@@ -26,7 +28,6 @@ RDEPEND="x11-themes/hicolor-icon-theme
 	>=xfce-base/xfconf-4.16
 	>=xfce-base/xfdesktop-4.16
 	>=xfce-base/xfwm4-4.16
-	>=xfce-extra/thunar-volman-4.16
 	>=xfce-extra/tumbler-4.16
 	!minimal? (
 		media-fonts/dejavu
@@ -34,4 +35,5 @@ RDEPEND="x11-themes/hicolor-icon-theme
 		)
 	pulseaudio? ( xfce-extra/xfce4-pulseaudio-plugin )
 	svg? ( gnome-base/librsvg )
-	upower? ( >=xfce-extra/xfce4-power-manager-4.16 )"
+	upower? ( >=xfce-extra/xfce4-power-manager-4.16 )
+"