diff --git a/games-strategy/wesnoth/wesnoth-1.16.0-r1.ebuild b/games-strategy/wesnoth/wesnoth-1.16.0-r1.ebuild
index 12aaafe9867e4..f5718459c5550 100644
--- a/games-strategy/wesnoth/wesnoth-1.16.0-r1.ebuild
+++ b/games-strategy/wesnoth/wesnoth-1.16.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake flag-o-matic toolchain-funcs xdg
+inherit cmake flag-o-matic xdg
 
 DESCRIPTION="Battle for Wesnoth - A fantasy turn-based strategy game"
 HOMEPAGE="http://www.wesnoth.org
@@ -64,10 +64,6 @@ src_prepare() {
 
 src_configure() {
 	filter-flags -ftracer -fomit-frame-pointer
-	if [[ $(gcc-major-version) -eq 3 ]] ; then
-		filter-flags -fstack-protector
-		append-flags -fno-stack-protector
-	fi
 
 	if use dedicated || use server ; then
 		mycmakeargs=(
diff --git a/games-strategy/wesnoth/wesnoth-1.16.2.ebuild b/games-strategy/wesnoth/wesnoth-1.16.2.ebuild
index 9c2f089d69054..17cdd9a055f7b 100644
--- a/games-strategy/wesnoth/wesnoth-1.16.2.ebuild
+++ b/games-strategy/wesnoth/wesnoth-1.16.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit cmake flag-o-matic toolchain-funcs xdg
+inherit cmake flag-o-matic xdg
 
 DESCRIPTION="Battle for Wesnoth - A fantasy turn-based strategy game"
 HOMEPAGE="http://www.wesnoth.org
@@ -64,10 +64,6 @@ src_prepare() {
 
 src_configure() {
 	filter-flags -ftracer -fomit-frame-pointer
-	if [[ $(gcc-major-version) -eq 3 ]] ; then
-		filter-flags -fstack-protector
-		append-flags -fno-stack-protector
-	fi
 
 	if use dedicated || use server ; then
 		mycmakeargs=(