[gentoo-commits] repo/gentoo:master commit in: dev-python/python3-xapp/, x11-libs/xapp/, profiles/updates/, x11-libs/xapps/, ...

[gentoo-commits] repo/gentoo:master commit in: dev-python/python3-xapp/, x11-libs/xapp/, profiles/updates/, x11-libs/xapps/, ...

[Sam James]

commit:     7af5bbb055ee97972258ee319ac8a5997577cfda
Author:     Matthew S. Turnbull <sparky <AT> bluefang-logic <DOT> com>
AuthorDate: Tue Dec 28 06:17:26 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jan 21 17:14:07 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7af5bbb0

x11-libs/xapp: Rename x11-libs/xapps to x11-libs/xapp

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Matthew S. Turnbull <sparky <AT> bluefang-logic.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-python/python3-xapp/python3-xapp-2.2.1.ebuild             | 4 ++--
 gnome-extra/cinnamon-session/cinnamon-session-5.0.1.ebuild    | 2 +-
 gnome-extra/cinnamon/cinnamon-5.0.6.ebuild                    | 2 +-
 gnome-extra/nemo/nemo-5.0.4.ebuild                            | 2 +-
 profiles/updates/4Q-2021                                      | 1 +
 x11-libs/xapp/Manifest                                        | 1 +
 x11-libs/{xapps => xapp}/metadata.xml                         | 0
 x11-libs/{xapps/xapps-2.2.4.ebuild => xapp/xapp-2.2.4.ebuild} | 1 -
 x11-libs/xapps/Manifest                                       | 1 -
 9 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/dev-python/python3-xapp/python3-xapp-2.2.1.ebuild b/dev-python/python3-xapp/python3-xapp-2.2.1.ebuild
index 195258ac7af6..0f3392d3c0cc 100644
--- a/dev-python/python3-xapp/python3-xapp-2.2.1.ebuild
+++ b/dev-python/python3-xapp/python3-xapp-2.2.1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{7,8,9} )
 
 inherit distutils-r1
 
-DESCRIPTION="Python bindings for x11-libs/xapps"
+DESCRIPTION="Python bindings for x11-libs/xapp"
 HOMEPAGE="https://github.com/linuxmint/python3-xapp"
 SRC_URI="https://github.com/linuxmint/python3-xapp/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
@@ -17,7 +17,7 @@ KEYWORDS="amd64 ~arm64 ~riscv x86"
 IUSE=""
 
 DEPEND="
-	>=x11-libs/xapps-2.2.0[introspection]
+	>=x11-libs/xapp-2.2.0[introspection]
 "
 RDEPEND="
 	${DEPEND}

diff --git a/gnome-extra/cinnamon-session/cinnamon-session-5.0.1.ebuild b/gnome-extra/cinnamon-session/cinnamon-session-5.0.1.ebuild
index cf00039e5dd4..b35ae9b0339a 100644
--- a/gnome-extra/cinnamon-session/cinnamon-session-5.0.1.ebuild
+++ b/gnome-extra/cinnamon-session/cinnamon-session-5.0.1.ebuild
@@ -32,7 +32,7 @@ DEPEND="
 	x11-libs/libXrender
 	x11-libs/libXtst
 	x11-libs/pango[X]
-	>=x11-libs/xapps-2.2.0
+	>=x11-libs/xapp-2.2.0
 
 	systemd? ( >=sys-apps/systemd-183 )
 	!systemd? ( sys-auth/elogind[policykit] )

diff --git a/gnome-extra/cinnamon/cinnamon-5.0.6.ebuild b/gnome-extra/cinnamon/cinnamon-5.0.6.ebuild
index 064bd77d0a01..f07b7f6d2201 100644
--- a/gnome-extra/cinnamon/cinnamon-5.0.6.ebuild
+++ b/gnome-extra/cinnamon/cinnamon-5.0.6.ebuild
@@ -82,7 +82,7 @@ RDEPEND="
 	net-misc/wget
 	sys-apps/accountsservice[introspection]
 	sys-power/upower[introspection]
-	>=x11-libs/xapps-2.2.0[introspection]
+	>=x11-libs/xapp-2.2.0[introspection]
 	x11-misc/xdg-utils
 	x11-themes/adwaita-icon-theme
 	x11-themes/gnome-themes-standard

diff --git a/gnome-extra/nemo/nemo-5.0.4.ebuild b/gnome-extra/nemo/nemo-5.0.4.ebuild
index 33b49024deed..49839c4d1aa3 100644
--- a/gnome-extra/nemo/nemo-5.0.4.ebuild
+++ b/gnome-extra/nemo/nemo-5.0.4.ebuild
@@ -32,7 +32,7 @@ COMMON_DEPEND="
 	>=x11-libs/libnotify-0.7:=
 	x11-libs/libX11
 	>=x11-libs/pango-1.40.0
-	>=x11-libs/xapps-2.2.0
+	>=x11-libs/xapp-2.2.0
 
 	exif? ( >=media-libs/libexif-0.6.20:= )
 	selinux? ( sys-libs/libselinux )

diff --git a/profiles/updates/4Q-2021 b/profiles/updates/4Q-2021
index 3d86f85c086f..3237cbfb4105 100644
--- a/profiles/updates/4Q-2021
+++ b/profiles/updates/4Q-2021
@@ -71,3 +71,4 @@ move app-shells/fzy app-text/fzy
 move dev-python/exdown dev-python/pytest-codeblocks
 slotmove sci-libs/opencascade 7.5 0
 move dev-python/xapp dev-python/python3-xapp
+move x11-libs/xapps x11-libs/xapp

diff --git a/x11-libs/xapp/Manifest b/x11-libs/xapp/Manifest
new file mode 100644
index 000000000000..7bdeab61e644
--- /dev/null
+++ b/x11-libs/xapp/Manifest
@@ -0,0 +1 @@
+DIST xapp-2.2.4.tar.gz 242171 BLAKE2B a2e53123776f3f0739778673d08f165d268f5d632ce57d722ac443a7201c22c14c1c88e08247f6c16dd708a01b2dd566d4bd9d55289d70eb50ba29b8f2a0987d SHA512 428fd4dc1911905d6f940c6e38fc8b572d55bcb2691d45ac807276ef554b781c9f6c57bbd6d0a95bf52ca1703a38d260f36a61b88a94bc2dc0812b575839a983

diff --git a/x11-libs/xapps/metadata.xml b/x11-libs/xapp/metadata.xml
similarity index 100%
rename from x11-libs/xapps/metadata.xml
rename to x11-libs/xapp/metadata.xml

diff --git a/x11-libs/xapps/xapps-2.2.4.ebuild b/x11-libs/xapp/xapp-2.2.4.ebuild
similarity index 98%
rename from x11-libs/xapps/xapps-2.2.4.ebuild
rename to x11-libs/xapp/xapp-2.2.4.ebuild
index 740d20883157..88caf5d65c94 100644
--- a/x11-libs/xapps/xapps-2.2.4.ebuild
+++ b/x11-libs/xapp/xapp-2.2.4.ebuild
@@ -13,7 +13,6 @@ HOMEPAGE="https://github.com/linuxmint/xapp/"
 LICENSE="GPL-3"
 
 SRC_URI="https://github.com/linuxmint/xapp/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/xapp-${PV}"
 KEYWORDS="amd64 ~arm64 ~riscv x86"
 
 SLOT="0"

diff --git a/x11-libs/xapps/Manifest b/x11-libs/xapps/Manifest
deleted file mode 100644
index 12a6a125b528..000000000000
--- a/x11-libs/xapps/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST xapps-2.2.4.tar.gz 242171 BLAKE2B a2e53123776f3f0739778673d08f165d268f5d632ce57d722ac443a7201c22c14c1c88e08247f6c16dd708a01b2dd566d4bd9d55289d70eb50ba29b8f2a0987d SHA512 428fd4dc1911905d6f940c6e38fc8b572d55bcb2691d45ac807276ef554b781c9f6c57bbd6d0a95bf52ca1703a38d260f36a61b88a94bc2dc0812b575839a983