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 1ccdc6efeb50..30f1f7ac3157 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 f311f8fd00c8..ed49b6726619 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
index d02673f40e58..d02673f40e58 100644
--- a/gnome-extra/gnome-tweak-tool/Manifest
+++ b/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
index b65a713277b0..b65a713277b0 100644
--- 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
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
index e7eafc8be8ab..e7eafc8be8ab 100644
--- 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
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
index 9270081eb2b7..de6f01743e04 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
index 96daee83ad01..341e615c405c 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
index 2a9d3352ab49..2a9d3352ab49 100644
--- a/gnome-extra/gnome-tweak-tool/metadata.xml
+++ b/gnome-extra/gnome-tweaks/metadata.xml
diff --git a/profiles/features/selinux/package.mask b/profiles/features/selinux/package.mask
index 0cd856701fd5..e4b9e4edf8fb 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 790b4592927f..fe1bf9e5ef5a 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