4 files changed, 7 insertions, 24 deletions
diff --git a/dev-java/libreadline-java/libreadline-java-0.8.0-r5.ebuild b/dev-java/libreadline-java/libreadline-java-0.8.0-r5.ebuild
index 32411ad2c864..7df017e7b4cf 100644
--- a/dev-java/libreadline-java/libreadline-java-0.8.0-r5.ebuild
+++ b/dev-java/libreadline-java/libreadline-java-0.8.0-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,6 @@ SRC_URI="mirror://sourceforge/java-readline/${P}-src.tar.gz -> ${P}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="amd64 ppc64 x86"
-IUSE="elibc_FreeBSD"
 
 CDEPEND="sys-libs/ncurses:0="
 
@@ -43,10 +42,6 @@ src_prepare() {
 
 	# See bug #157390.
 	sed -i "s/^\(JC_FLAGS =\)/\1 $(java-pkg_javac-args)/" Makefile || die
-	if use elibc_FreeBSD; then
-		sed -i -e '/JAVANATINC/s:linux:freebsd:' Makefile || die "sed JAVANATINC failed"
-	fi
-
 }
 
 src_compile() {
diff --git a/dev-java/swt/swt-3.7.2-r3.ebuild b/dev-java/swt/swt-3.7.2-r3.ebuild
index 24e69a974015..12ccd36700f1 100644
--- a/dev-java/swt/swt-3.7.2-r3.ebuild
+++ b/dev-java/swt/swt-3.7.2-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -108,11 +108,7 @@ src_compile() {
 	# Fix the pointer size for AMD64
 	[[ ${ARCH} == "amd64" || ${ARCH} == "ppc64" ]] && export SWT_PTR_CFLAGS=-DJNI64
 
-	local platform="linux"
-
-	use elibc_FreeBSD && platform="freebsd"
-
-	local make="emake -f make_${platform}.mak NO_STRIP=y CC=$(tc-getCC) CXX=$(tc-getCXX)"
+	local make="emake -f make_linux.mak NO_STRIP=y CC=$(tc-getCC) CXX=$(tc-getCXX)"
 
 	einfo "Building AWT library"
 	${make} make_awt
diff --git a/dev-java/swt/swt-3.8.2-r3.ebuild b/dev-java/swt/swt-3.8.2-r3.ebuild
index d65297c3817c..604916b2de09 100644
--- a/dev-java/swt/swt-3.8.2-r3.ebuild
+++ b/dev-java/swt/swt-3.8.2-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -99,11 +99,7 @@ src_compile() {
 	# Fix the pointer size for AMD64
 	[[ ${ARCH} == "amd64" || ${ARCH} == "ppc64" ]] && export SWT_PTR_CFLAGS=-DJNI64
 
-	local platform="linux"
-
-	use elibc_FreeBSD && platform="freebsd"
-
-	local make="emake -f make_${platform}.mak NO_STRIP=y CC=$(tc-getCC) CXX=$(tc-getCXX)"
+	local make="emake -f make_linux.mak NO_STRIP=y CC=$(tc-getCC) CXX=$(tc-getCXX)"
 
 	einfo "Building AWT library"
 	${make} make_awt
diff --git a/dev-java/swt/swt-3.8.2-r4.ebuild b/dev-java/swt/swt-3.8.2-r4.ebuild
index 3b53140c037d..341e66a35938 100644
--- a/dev-java/swt/swt-3.8.2-r4.ebuild
+++ b/dev-java/swt/swt-3.8.2-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -102,11 +102,7 @@ src_compile() {
 	# Fix the pointer size for AMD64
 	[[ ${ARCH} == "amd64" || ${ARCH} == "ppc64" ]] && export SWT_PTR_CFLAGS=-DJNI64
 
-	local platform="linux"
-
-	use elibc_FreeBSD && platform="freebsd"
-
-	local make="emake -f make_${platform}.mak NO_STRIP=y CC=$(tc-getCC) CXX=$(tc-getCXX)"
+	local make="emake -f make_linux.mak NO_STRIP=y CC=$(tc-getCC) CXX=$(tc-getCXX)"
 
 	einfo "Building AWT library"
 	${make} make_awt