diff --git a/x11-libs/wxGTK/wxGTK-3.2.6-r1.ebuild b/x11-libs/wxGTK/wxGTK-3.2.6-r2.ebuild
similarity index 97%
rename from x11-libs/wxGTK/wxGTK-3.2.6-r1.ebuild
rename to x11-libs/wxGTK/wxGTK-3.2.6-r2.ebuild
index 268a3fd5daf81..865c7e0ff1ba1 100644
--- a/x11-libs/wxGTK/wxGTK-3.2.6-r1.ebuild
+++ b/x11-libs/wxGTK/wxGTK-3.2.6-r2.ebuild
@@ -124,8 +124,11 @@ src_prepare() {
 
 multilib_src_configure() {
 	# defang automagic dependencies, bug #927952
-	use wayland || append-cflags -DGENTOO_GTK_HIDE_WAYLAND
-	use X || append-cflags -DGENTOO_GTK_HIDE_X11
+	use wayland || append-cppflags -DGENTOO_GTK_HIDE_WAYLAND
+	use X || append-cppflags -DGENTOO_GTK_HIDE_X11
+
+	# bug #952961
+	tc-is-lto && filter-flags -fno-semantic-interposition
 
 	# Workaround for bug #915154
 	append-ldflags $(test-flags-CCLD -Wl,--undefined-version)
diff --git a/x11-libs/wxGTK/wxGTK-3.2.7-r1.ebuild b/x11-libs/wxGTK/wxGTK-3.2.7-r2.ebuild
similarity index 97%
rename from x11-libs/wxGTK/wxGTK-3.2.7-r1.ebuild
rename to x11-libs/wxGTK/wxGTK-3.2.7-r2.ebuild
index bf0c05822f253..9e7175d3a1a22 100644
--- a/x11-libs/wxGTK/wxGTK-3.2.7-r1.ebuild
+++ b/x11-libs/wxGTK/wxGTK-3.2.7-r2.ebuild
@@ -124,8 +124,11 @@ src_prepare() {
 
 multilib_src_configure() {
 	# defang automagic dependencies, bug #927952
-	use wayland || append-cflags -DGENTOO_GTK_HIDE_WAYLAND
-	use X || append-cflags -DGENTOO_GTK_HIDE_X11
+	use wayland || append-cppflags -DGENTOO_GTK_HIDE_WAYLAND
+	use X || append-cppflags -DGENTOO_GTK_HIDE_X11
+
+	# bug #952961
+	tc-is-lto && filter-flags -fno-semantic-interposition
 
 	# Workaround for bug #915154
 	append-ldflags $(test-flags-CCLD -Wl,--undefined-version)
diff --git a/x11-libs/wxGTK/wxGTK-3.2.8.ebuild b/x11-libs/wxGTK/wxGTK-3.2.8-r1.ebuild
similarity index 98%
rename from x11-libs/wxGTK/wxGTK-3.2.8.ebuild
rename to x11-libs/wxGTK/wxGTK-3.2.8-r1.ebuild
index 9a231b453e327..aace411988249 100644
--- a/x11-libs/wxGTK/wxGTK-3.2.8.ebuild
+++ b/x11-libs/wxGTK/wxGTK-3.2.8-r1.ebuild
@@ -128,8 +128,8 @@ src_prepare() {
 
 multilib_src_configure() {
 	# defang automagic dependencies, bug #927952
-	use wayland || append-cflags -DGENTOO_GTK_HIDE_WAYLAND
-	use X || append-cflags -DGENTOO_GTK_HIDE_X11
+	use wayland || append-cppflags -DGENTOO_GTK_HIDE_WAYLAND
+	use X || append-cppflags -DGENTOO_GTK_HIDE_X11
 
 	# bug #952961
 	tc-is-lto && filter-flags -fno-semantic-interposition
diff --git a/x11-libs/wxGTK/wxGTK-3.2.8.1-r1.ebuild b/x11-libs/wxGTK/wxGTK-3.2.8.1-r2.ebuild
similarity index 98%
rename from x11-libs/wxGTK/wxGTK-3.2.8.1-r1.ebuild
rename to x11-libs/wxGTK/wxGTK-3.2.8.1-r2.ebuild
index f7a8db41eed4a..2fc5cd04a3da6 100644
--- a/x11-libs/wxGTK/wxGTK-3.2.8.1-r1.ebuild
+++ b/x11-libs/wxGTK/wxGTK-3.2.8.1-r2.ebuild
@@ -83,8 +83,8 @@ PATCHES=(
 
 multilib_src_configure() {
 	# defang automagic dependencies, bug #927952
-	use wayland || append-cflags -DGENTOO_GTK_HIDE_WAYLAND
-	use X || append-cflags -DGENTOO_GTK_HIDE_X11
+	use wayland || append-cppflags -DGENTOO_GTK_HIDE_WAYLAND
+	use X || append-cppflags -DGENTOO_GTK_HIDE_X11
 
 	# bug #952961
 	tc-is-lto && filter-flags -fno-semantic-interposition