[gentoo-commits] repo/gentoo:master commit in: gnome-extra/gnome-tweaks/files/, gnome-extra/gnome-tweak-tool/files/, ...

[gentoo-commits] repo/gentoo:master commit in: gnome-extra/gnome-tweaks/files/, gnome-extra/gnome-tweak-tool/files/, ...

[Mart Raudsepp]

commit:     e4c28adaec8265254752075f6eec57f6a3f0a25a
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Wed Mar  6 10:11:13 2019 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Wed Mar  6 11:04:39 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4c28ada

gnome-extra/gnome-tweak-tool: pkgmove to gnome-extra/gnome-tweaks

Upstream rename in 3.28

Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>

 gnome-base/gnome-extra-apps/gnome-extra-apps-3.24.2.ebuild             | 2 +-
 gnome-base/gnome-extra-apps/gnome-extra-apps-3.26.2.ebuild             | 2 +-
 gnome-extra/{gnome-tweak-tool => gnome-tweaks}/Manifest                | 0
 .../files/3.10.1-gentoo-cursor-themes.patch}                           | 0
 .../files/3.26.4-gentoo-cursor-themes.patch                            | 0
 .../gnome-tweaks-3.24.1.ebuild}                                        | 3 ++-
 .../gnome-tweaks-3.26.4-r1.ebuild}                                     | 1 +
 gnome-extra/{gnome-tweak-tool => gnome-tweaks}/metadata.xml            | 0
 profiles/features/selinux/package.mask                                 | 2 +-
 profiles/updates/1Q-2019                                               | 1 +
 10 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/gnome-base/gnome-extra-apps/gnome-extra-apps-3.24.2.ebuild b/gnome-base/gnome-extra-apps/gnome-extra-apps-3.24.2.ebuild
index 1ccdc6efeb5..30f1f7ac315 100644
--- a/gnome-base/gnome-extra-apps/gnome-extra-apps-3.24.2.ebuild
+++ b/gnome-base/gnome-extra-apps/gnome-extra-apps-3.24.2.ebuild
@@ -40,7 +40,7 @@ RDEPEND="
 	>=app-dicts/gnome-dictionary-3.24.1
 	>=mail-client/evolution-${PV}
 	>=net-analyzer/gnome-nettool-3.8.1
-	>=gnome-extra/gnome-tweak-tool-3.24.1
+	>=gnome-extra/gnome-tweaks-3.24.1
 	>=gnome-extra/nautilus-sendto-3.8.4
 	>=net-misc/vinagre-3.22.0
 

diff --git a/gnome-base/gnome-extra-apps/gnome-extra-apps-3.26.2.ebuild b/gnome-base/gnome-extra-apps/gnome-extra-apps-3.26.2.ebuild
index f311f8fd00c..ed49b672661 100644
--- a/gnome-base/gnome-extra-apps/gnome-extra-apps-3.26.2.ebuild
+++ b/gnome-base/gnome-extra-apps/gnome-extra-apps-3.26.2.ebuild
@@ -41,7 +41,7 @@ RDEPEND="
 	>=app-dicts/gnome-dictionary-3.26.1
 	>=mail-client/evolution-${PV}
 	>=net-analyzer/gnome-nettool-3.8.1
-	>=gnome-extra/gnome-tweak-tool-3.26.3
+	>=gnome-extra/gnome-tweaks-3.26.3
 	>=gnome-extra/nautilus-sendto-3.8.6
 	>=net-misc/vinagre-3.22.0
 

diff --git a/gnome-extra/gnome-tweak-tool/Manifest b/gnome-extra/gnome-tweaks/Manifest
similarity index 100%
rename from gnome-extra/gnome-tweak-tool/Manifest
rename to gnome-extra/gnome-tweaks/Manifest

diff --git a/gnome-extra/gnome-tweak-tool/files/gnome-tweak-tool-3.10.1-gentoo-cursor-themes.patch b/gnome-extra/gnome-tweaks/files/3.10.1-gentoo-cursor-themes.patch
similarity index 100%
rename from gnome-extra/gnome-tweak-tool/files/gnome-tweak-tool-3.10.1-gentoo-cursor-themes.patch
rename to gnome-extra/gnome-tweaks/files/3.10.1-gentoo-cursor-themes.patch

diff --git a/gnome-extra/gnome-tweak-tool/files/3.26.4-gentoo-cursor-themes.patch b/gnome-extra/gnome-tweaks/files/3.26.4-gentoo-cursor-themes.patch
similarity index 100%
rename from gnome-extra/gnome-tweak-tool/files/3.26.4-gentoo-cursor-themes.patch
rename to gnome-extra/gnome-tweaks/files/3.26.4-gentoo-cursor-themes.patch

diff --git a/gnome-extra/gnome-tweak-tool/gnome-tweak-tool-3.24.1.ebuild b/gnome-extra/gnome-tweaks/gnome-tweaks-3.24.1.ebuild
similarity index 94%
rename from gnome-extra/gnome-tweak-tool/gnome-tweak-tool-3.24.1.ebuild
rename to gnome-extra/gnome-tweaks/gnome-tweaks-3.24.1.ebuild
index 9270081eb2b..de6f01743e0 100644
--- a/gnome-extra/gnome-tweak-tool/gnome-tweak-tool-3.24.1.ebuild
+++ b/gnome-extra/gnome-tweaks/gnome-tweaks-3.24.1.ebuild
@@ -4,6 +4,7 @@
 EAPI=6
 GNOME2_LA_PUNT="yes"
 PYTHON_COMPAT=( python2_7 )
+GNOME_ORG_MODULE="gnome-tweak-tool"
 
 inherit gnome2 python-r1
 
@@ -43,7 +44,7 @@ DEPEND="${COMMON_DEPEND}
 
 src_prepare() {
 	# Add contents of Gentoo's cursor theme directory to cursor theme list
-	eapply "${FILESDIR}/${PN}-3.10.1-gentoo-cursor-themes.patch"
+	eapply "${FILESDIR}/3.10.1-gentoo-cursor-themes.patch"
 
 	gnome2_src_prepare
 	python_copy_sources

diff --git a/gnome-extra/gnome-tweak-tool/gnome-tweak-tool-3.26.4-r1.ebuild b/gnome-extra/gnome-tweaks/gnome-tweaks-3.26.4-r1.ebuild
similarity index 97%
rename from gnome-extra/gnome-tweak-tool/gnome-tweak-tool-3.26.4-r1.ebuild
rename to gnome-extra/gnome-tweaks/gnome-tweaks-3.26.4-r1.ebuild
index 96daee83ad0..341e615c405 100644
--- a/gnome-extra/gnome-tweak-tool/gnome-tweak-tool-3.26.4-r1.ebuild
+++ b/gnome-extra/gnome-tweaks/gnome-tweaks-3.26.4-r1.ebuild
@@ -4,6 +4,7 @@
 EAPI=6
 GNOME2_LA_PUNT="yes"
 PYTHON_COMPAT=( python3_{4,5,6} )
+GNOME_ORG_MODULE="gnome-tweak-tool"
 
 inherit gnome.org meson gnome2-utils python-single-r1 xdg
 

diff --git a/gnome-extra/gnome-tweak-tool/metadata.xml b/gnome-extra/gnome-tweaks/metadata.xml
similarity index 100%
rename from gnome-extra/gnome-tweak-tool/metadata.xml
rename to gnome-extra/gnome-tweaks/metadata.xml

diff --git a/profiles/features/selinux/package.mask b/profiles/features/selinux/package.mask
index 0cd856701fd..e4b9e4edf8f 100644
--- a/profiles/features/selinux/package.mask
+++ b/profiles/features/selinux/package.mask
@@ -29,7 +29,7 @@ gnome-extra/gnome-shell-extensions
 gnome-extra/gnome-shell-frippery
 gnome-extra/gnome-shell-extensions-topicons-plus
 gnome-extra/gnome-shell-extension-gsconnect
-gnome-extra/gnome-tweak-tool
+gnome-extra/gnome-tweaks
 x11-themes/zukitwo-shell
 gnome-extra/office-runner
 kde-misc/systemd-kcm

diff --git a/profiles/updates/1Q-2019 b/profiles/updates/1Q-2019
index 790b4592927..fe1bf9e5ef5 100644
--- a/profiles/updates/1Q-2019
+++ b/profiles/updates/1Q-2019
@@ -11,3 +11,4 @@ move net-misc/networkmanager-pptp net-vpn/networkmanager-pptp
 move net-misc/networkmanager-strongswan net-vpn/networkmanager-strongswan
 move net-misc/networkmanager-vpnc net-vpn/networkmanager-vpnc
 move net-misc/networkmanager-sstp net-vpn/networkmanager-sstp
+move gnome-extra/gnome-tweak-tool gnome-extra/gnome-tweaks