5 files changed, 4 insertions, 337 deletions
diff --git a/dev-java/swt/Manifest b/dev-java/swt/Manifest
index 4fda917b51ba..bcd54eb787ed 100644
--- a/dev-java/swt/Manifest
+++ b/dev-java/swt/Manifest
@@ -20,10 +20,8 @@ DIST swt-4.30-gtk-linux-x86_64.zip 3856990 BLAKE2B 0ea29a5f286fb4bb362758629226b
 DIST swt-4.31-gtk-linux-aarch64.zip 4019864 BLAKE2B 597f9c2ce1382aacd4667c7d1fc350b2318d8b1577dfc32a0139efb9d26e7c32703a0fb2507876ef441c47901d46ba522ea40714f9b88f1d517e3d9d24c2416a SHA512 636e3a4e7adc21ab8ee3ecdc3f85bbd0ad5786836492cf0096f99177716043150b41807cc456f4813ebb1797092761bb227809e8594bf64155b438973cc84bfc
 DIST swt-4.31-gtk-linux-ppc64le.zip 4036590 BLAKE2B da9ad8a7e0bf168b024c4e1fbdbcc01154ec0d7e8b38b2912ba7edf1bf8239f05a9ce1f08790174158ebb788c9cc3adf754d13942fc8aa0fe9d4a53177a814ff SHA512 bf8f3f45b4229db383839a64b7d08294340ab2f0c623be8e382609b5ff9a59683229bb308d49480ffb01596ab050d45f97894fec99c0d4eb710e60c40b864531
 DIST swt-4.31-gtk-linux-x86_64.zip 4039479 BLAKE2B 6f7e434acf57cd03dd5e938b1b1c578339b3d7817202681a15420ebdec3be10b95b1bf5eca6f1cf71de9a5a0c390d2d6ee903c2a71e8974e03987cc52322e44d SHA512 da61610ce00fc46893ec3ee6d5d7ed5cc59312002c6946a3748cff1a776af75bad0026512b412ef1622ca0bee124764ed8ee7f5f87364cff945b296feb86e74b
-EBUILD swt-3.7.2-r3.ebuild 4286 BLAKE2B 40e4b69caa7d503bbe4a832a7b3d685fc88c6469a10bad3321b33f97959e46f4af4677afaac824526c97f683a43644e4f0fd7c45b47ba360a3e9c5f18c01edc6 SHA512 517cd181329938b7bf6108713827c29825410e3053b38c3971cfbdeacc7012c3385717e130d244f7e02d96dc18d7349d52656df552c26a452d903d2be1bee995
-EBUILD swt-3.7.2-r4.ebuild 4443 BLAKE2B 921504395b7dfd0da507dd5fade43ab60d2c096e4f4dac0e3ac14fc5caab2b65a2005a08b450cf013b8360564cef2f55e5afedb331efcbe8babdce7218a91bf8 SHA512 db16feac982e4426f8804bab871feb18f2357f40d35643ac8c79daa5a17a6045137079f7db9a510cb6ae92cfa1ea7a441714b6424493a541115f48d7faf5112f
-EBUILD swt-4.10-r2.ebuild 4528 BLAKE2B 71b929a9ca02b5918314b5bf2631aa374c089d3a749e645c84865266f1cc5eebc2de5cea17471834fc329012276722c6a922c9d9266d9c9f24c45362af3b5b9b SHA512 5d7bf83a2c1b664e5e2b76336b35100eed8eef45986dc896ef5751b50431b34cfe99d9084ecae547e54dc5b250fc793fe7dd5f8c52294c442f193c2acabec480
-EBUILD swt-4.10-r3.ebuild 4254 BLAKE2B 8fe35ae45da1911ba177cabefdf60f485879c0d5100e4b269bff2a4c701a8a9ce08f84e367a615898bf588786afee9e061ba9e2877eabe85b3498a0008d06bca SHA512 3f7f4844d8794ba450f769de4ca53d427b45e77f6267b112c82ad2b5344163e59ba87b78e25c545dec1cb7821e8f0eaa9dc0e8f59ff6d8fb6120380c267f1214
+EBUILD swt-3.7.2-r4.ebuild 4440 BLAKE2B 6164e475706b71782671978cc34cf5cdf14b8668132fec49bbfaa03753a92794b0258d6ad09e3cf1582ca4207c824b787b62c958501a09afc17a2d3e69ad190d SHA512 a864f326933d855d6194035bc8582f7df201377af6b5bc4e2abdb16b711edf5d72f560f628ff89f5b426e7c2c63a3dbfef0bdf041dc9907ab6f71cc2b26671b6
+EBUILD swt-4.10-r3.ebuild 4252 BLAKE2B 3ffe9b50cc36d4f0be3300898039590459e9c093bb11fee761044018dc0e950331db461f7040fe6d5734303926d82eb7ef27f1d48832eff441d20226055bd3c7 SHA512 96a2993d48df58294737eba91aa7d2dac86a71c50947e07409debb38bc04028ef4dd4dab24cad7b0d4d067c090477f16e7ae7e686419582e4d799bd9cf3f1092
 EBUILD swt-4.29.ebuild 3440 BLAKE2B ac5dabbbcace7d28eb352a8851a0f1dd1ed72f3285215b639221c99db118c831524f563162876be9cca02ce21bd8b2d8a0b90f2983a68000cdbca562ce2c6d73 SHA512 7b1eacbda33353ab91d7deeb73889e9245664862c6c279def64a60a351f91b0b917223a4da9af2279416d1a2992383587a1427f15188b7ef6ecd1e62b7f465c5
 EBUILD swt-4.30-r1.ebuild 3510 BLAKE2B 74d7f75d69a3a6afeb61d0ff3f2a184093b94642a15507fb0291264925cb3238a238f901793c689475a4a6a2f33996932eb10ebabb27e785a0bf90bd92d02e19 SHA512 fd6a05e634a852b3400285afc951e8ee7a493d636e887cde369140b34795cc69c32e6f1ae7d06d689b271eb39120ee52e4e4c5d4f0792b847effb257fdb3bc8d
 EBUILD swt-4.31.ebuild 3580 BLAKE2B 1355d65a483725e44ee24508cc8168945f077e65704fb481b575459b6b1fc650c9df881515f8b47428ade7268db7b25424fb79d3ff9d6013a71fd534bb538992 SHA512 3e6fb7dd560ba838f56564bf5a7cb523bd4509e72665bc9394b1f9fe10ac6927f778a0766122dc1f166ec4b2d98bef79132683c3738b7a3242d6b06d5bb702ef
diff --git a/dev-java/swt/swt-3.7.2-r3.ebuild b/dev-java/swt/swt-3.7.2-r3.ebuild
deleted file mode 100644
index eb993b82f314..000000000000
--- a/dev-java/swt/swt-3.7.2-r3.ebuild
+++ /dev/null
@@ -1,159 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit java-pkg-2 java-ant-2 java-osgi toolchain-funcs
-
-MY_PV="${PV/_rc/RC}"
-MY_DMF="https://archive.eclipse.org/eclipse/downloads/drops/R-${MY_PV}-201202080800"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="GTK based SWT Library"
-HOMEPAGE="https://www.eclipse.org/"
-SRC_URI="
-	amd64? ( ${MY_DMF}/${MY_P}-gtk-linux-x86_64.zip )
-	ppc? ( ${MY_DMF}/${MY_P}-gtk-linux-x86.zip )
-	ppc64? ( ${MY_DMF}/${MY_P}-gtk-linux-ppc64.zip )
-	x86? ( ${MY_DMF}/${MY_P}-gtk-linux-x86.zip )"
-
-LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1"
-SLOT="3.7"
-KEYWORDS="amd64 ppc64 x86"
-IUSE="cairo opengl"
-
-COMMON_DEPEND="
-	>=dev-libs/atk-1.10.2
-	>=dev-libs/glib-2.6
-	>=x11-libs/gtk+-2.6.8:2
-	x11-libs/libXtst
-	cairo? ( >=x11-libs/cairo-1.4.14 )
-	opengl? (
-		virtual/glu
-		virtual/opengl
-	)"
-BDEPEND="
-	app-arch/unzip
-	virtual/pkgconfig
-"
-DEPEND="${COMMON_DEPEND}
-	virtual/jdk:1.8
-	x11-base/xorg-proto
-	x11-libs/libX11
-	x11-libs/libXrender
-	x11-libs/libXt
-	>=x11-libs/libXtst-1.1.0"
-RDEPEND="${COMMON_DEPEND}
-	>=virtual/jre-1.4"
-
-S="${WORKDIR}"
-
-# JNI libraries don't need SONAME, bug #253756
-QA_SONAME="usr/lib.*/libswt-.*.so"
-
-PATCHES=(
-	# Fix Makefiles to respect flags and work with --as-needed
-	"${FILESDIR}"/as-needed-and-flag-fixes-3.6.patch
-)
-
-src_unpack() {
-	local DISTFILE=${A}
-	unzip -jq "${DISTDIR}"/${DISTFILE} "*src.zip" || die "Unable to extract distfile"
-	unpack "./src.zip"
-
-	# Cleanup the redirtied directory structure
-	rm -rf about_files/ || die
-}
-
-src_prepare() {
-	# Replace the build.xml to allow compilation without Eclipse tasks
-	cp "${FILESDIR}/build.xml" "${S}/build.xml" || die "Unable to update build.xml"
-	mkdir "${S}/src" && mv "${S}/org" "${S}/src" || die "Unable to restructure SWT sources"
-
-	case ${ARCH} in
-		ppc|x86) eapply "${FILESDIR}"/${P}-gio_launch-URI-x86.patch ;;
-		*)       eapply "${FILESDIR}"/${P}-gio_launch-URI.patch ;;
-	esac
-
-	default
-}
-
-src_compile() {
-	# Drop jikes support as it seems to be unfriendly with SWT
-	java-pkg_filter-compiler jikes
-
-	local AWT_ARCH
-	local JAWTSO="libjawt.so"
-	if [[ $(tc-arch) == 'x86' ]] ; then
-		AWT_ARCH="i386"
-	elif [[ $(tc-arch) == 'ppc' ]] ; then
-		AWT_ARCH="ppc"
-	elif [[ $(tc-arch) == 'ppc64' ]] ; then
-		AWT_ARCH="ppc64"
-	else
-		AWT_ARCH="amd64"
-	fi
-	if [[ -f "${JAVA_HOME}/jre/lib/${AWT_ARCH}/${JAWTSO}" ]]; then
-		export AWT_LIB_PATH="${JAVA_HOME}/jre/lib/${AWT_ARCH}"
-	elif [[ -f "${JAVA_HOME}/jre/bin/${JAWTSO}" ]]; then
-		export AWT_LIB_PATH="${JAVA_HOME}/jre/bin"
-	elif [[ -f "${JAVA_HOME}/$(get_libdir)/${JAWTSO}" ]] ; then
-		export AWT_LIB_PATH="${JAVA_HOME}/$(get_libdir)"
-	else
-		eerror "${JAWTSO} not found in the JDK being used for compilation!"
-		die "cannot build AWT library"
-	fi
-
-	# Fix the pointer size for AMD64
-	[[ ${ARCH} == "amd64" || ${ARCH} == "ppc64" ]] && export SWT_PTR_CFLAGS=-DJNI64
-
-	local make="emake -f make_linux.mak NO_STRIP=y CC=$(tc-getCC) CXX=$(tc-getCXX)"
-
-	einfo "Building AWT library"
-	${make} make_awt
-
-	einfo "Building SWT library"
-	${make} make_swt
-
-	einfo "Building JAVA-AT-SPI bridge"
-	${make} make_atk
-
-	if use cairo ; then
-		einfo "Building CAIRO support"
-		${make} make_cairo
-	fi
-
-	if use opengl ; then
-		einfo "Building OpenGL component"
-		${make} make_glx
-	fi
-
-	einfo "Building JNI libraries"
-	eant compile
-
-	einfo "Copying missing files"
-	cp -i "${S}/version.txt" "${S}/build/version.txt" || die
-	cp -i "${S}/src/org/eclipse/swt/internal/SWTMessages.properties" \
-		"${S}/build/org/eclipse/swt/internal/" || die
-
-	einfo "Packing JNI libraries"
-	eant jar
-}
-
-src_install() {
-	swtArch=${ARCH}
-	use amd64 && swtArch=x86_64
-
-	sed "s/SWT_ARCH/${swtArch}/" "${FILESDIR}/${PN}-${SLOT}-manifest" > "MANIFEST_TMP.MF" || die
-	use cairo || sed -i -e "/ org.eclipse.swt.internal.cairo; x-internal:=true,/d" "MANIFEST_TMP.MF"
-	sed -i -e "/ org.eclipse.swt.internal.gnome; x-internal:=true,/d" "MANIFEST_TMP.MF" || die
-	use opengl || sed -i -e "/ org.eclipse.swt.internal.opengl.glx; x-internal:=true,/d" "MANIFEST_TMP.MF"
-	sed -i -e "/ org.eclipse.swt.internal.webkit; x-internal:=true,/d" "MANIFEST_TMP.MF" || die
-	java-osgi_newjar-fromfile "swt.jar" "MANIFEST_TMP.MF" "Standard Widget Toolkit for GTK 2.0"
-
-	java-pkg_sointo /usr/$(get_libdir)
-	java-pkg_doso *.so
-
-	docinto html
-	dodoc about.html
-}
diff --git a/dev-java/swt/swt-3.7.2-r4.ebuild b/dev-java/swt/swt-3.7.2-r4.ebuild
index dc1cb9be2255..18bc97088217 100644
--- a/dev-java/swt/swt-3.7.2-r4.ebuild
+++ b/dev-java/swt/swt-3.7.2-r4.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1"
 SLOT="3.7"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ppc64 x86"
 IUSE="cairo opengl"
 
 BDEPEND="
diff --git a/dev-java/swt/swt-4.10-r2.ebuild b/dev-java/swt/swt-4.10-r2.ebuild
deleted file mode 100644
index 4e117a49acf6..000000000000
--- a/dev-java/swt/swt-4.10-r2.ebuild
+++ /dev/null
@@ -1,172 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic java-pkg-2 java-ant-2 toolchain-funcs java-osgi
-
-MY_PV="${PV/_rc/RC}"
-MY_DMF="https://archive.eclipse.org/eclipse/downloads/drops4/R-${MY_PV}-201812060815"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="GTK based SWT Library"
-HOMEPAGE="https://www.eclipse.org/"
-SRC_URI="
-	amd64? ( ${MY_DMF}/${MY_P}-gtk-linux-x86_64.zip )
-	ppc64? ( ${MY_DMF}/${MY_P}-gtk-linux-ppc64le.zip )"
-
-LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1"
-SLOT="4.10"
-KEYWORDS="amd64 ppc64"
-IUSE="cairo opengl webkit"
-
-COMMON_DEP="
-	>=dev-libs/atk-1.10.2
-	>=dev-libs/glib-2.32
-	>=x11-libs/gtk+-2.6.8:2
-	x11-libs/libXtst
-	cairo? ( >=x11-libs/cairo-1.4.14 )
-	opengl?	(
-		virtual/glu
-		virtual/opengl
-	)
-	webkit? (
-		net-libs/webkit-gtk:4
-	)"
-DEPEND="${COMMON_DEP}
-	>=virtual/jdk-1.8:*[-headless-awt]
-	x11-base/xorg-proto
-	x11-libs/libX11
-	x11-libs/libXrender
-	x11-libs/libXt
-	>=x11-libs/libXtst-1.1.0"
-RDEPEND="${COMMON_DEP}
-	>=virtual/jre-1.8:*"
-BDEPEND="
-	app-arch/unzip
-	virtual/pkgconfig
-"
-
-S="${WORKDIR}"
-
-# JNI libraries don't need SONAME, bug #253756
-QA_SONAME='usr/lib[^/]*/libswt-[^/]+.so'
-
-PATCHES=(
-	"${FILESDIR}"/${P}-as-needed-and-flag-fixes.patch
-)
-
-src_unpack() {
-	local DISTFILE=${A}
-	unzip -jq "${DISTDIR}"/${DISTFILE} swt.jar src.zip || die "Unable to extract distfile"
-	unpack "./src.zip"
-
-	# Cleanup the redirtied directory structure
-	rm -rf about_files/ || die
-}
-
-src_prepare() {
-	# Replace the build.xml to allow compilation without Eclipse tasks
-	cp "${FILESDIR}/build.xml" "${S}/build.xml" || die "Unable to update build.xml"
-	mkdir "${S}/src" && mv "${S}/org" "${S}/src" || die "Unable to restructure SWT sources"
-
-	# Apply patches
-	default
-
-	# Define missing g_thread_supported() to be already started.
-	sed -i '1s/^/#define g_thread_supported() 1\n\n/' "${S}"/os_custom.h || die
-
-	# Webext is also in the library directory
-	sed -i 's|findResource([^,]\+|findResource("swt"|' \
-		"${S}"/src/org/eclipse/swt/browser/WebKit.java || die
-}
-
-src_compile() {
-	append-cflags -fcommon # https://bugs.gentoo.org/707838
-
-	# Drop jikes support as it seems to be unfriendly with SWT
-	java-pkg_filter-compiler jikes
-
-	local JAWTSO="libjawt.so"
-	IFS=":" read -r -a ldpaths <<< $(java-config -g LDPATH)
-
-	for libpath in "${ldpaths[@]}"; do
-		if [[ -f "${libpath}/${JAWTSO}" ]]; then
-			export AWT_LIB_PATH="${libpath}"
-			break
-		# this is a workaround for broken LDPATH in <=openjdk-8.292_p10 and <=dev-java/openjdk-bin-8.292_p10
-		elif [[ -f "${libpath}/$(tc-arch)/${JAWTSO}" ]]; then
-			export AWT_LIB_PATH="${libpath}/$(tc-arch)"
-			break
-		fi
-	done
-
-	if [[ -z "${AWT_LIB_PATH}" ]]; then
-		eerror "${JAWTSO} not found in the JDK being used for compilation!"
-		die "cannot build AWT library"
-	fi
-
-	# Fix the pointer size for AMD64
-	export SWT_PTR_CFLAGS=-DJNI64
-
-	# Bug #461784, g_thread_init is deprecated since glib-2.32.
-	append-cflags -DNO__1g_1thread_1init
-
-	local make="emake -f make_linux.mak NO_STRIP=y CC=$(tc-getCC) CXX=$(tc-getCXX)"
-
-	einfo "Building AWT library"
-	${make} make_awt AWT_LIBS="-L\$(AWT_LIB_PATH) -Wl,-rpath,\$(AWT_LIB_PATH) -ljawt \`pkg-config --libs x11\`"
-
-	einfo "Building SWT library"
-	${make} make_swt
-
-	einfo "Building JAVA-AT-SPI bridge"
-	${make} make_atk
-
-	if use cairo ; then
-		einfo "Building CAIRO support"
-		${make} make_cairo
-	fi
-
-	if use opengl ; then
-		einfo "Building OpenGL component"
-		${make} make_glx
-	fi
-
-	if use webkit ; then
-		einfo "Building WebKit component"
-		${make} make_webkit make_webkit2extension
-	fi
-
-	einfo "Building JNI libraries"
-	eant compile
-
-	einfo "Copying missing files"
-	cp -i "${S}/version.txt" "${S}/build/version.txt" || die
-	cp -i "${S}/src/org/eclipse/swt/internal/SWTMessages.properties" \
-		"${S}/build/org/eclipse/swt/internal/" || die
-	unzip swt.jar 'org/eclipse/swt/internal/gtk/*.css' -d build || die
-
-	einfo "Packing JNI libraries"
-	eant jar
-}
-
-src_install() {
-	local swtArch=${ARCH}
-	use amd64 && swtArch=x86_64
-
-	sed "s/SWT_ARCH/${swtArch}/" "${FILESDIR}/${PN}-${SLOT}-manifest" > "MANIFEST_TMP.MF" || die
-	remove_from_manifest() {
-		local subpkg=$1
-		sed -i -e "/ org.eclipse.swt.internal.$subpkg; x-internal:=true,/d" "MANIFEST_TMP.MF" || die
-	}
-	use cairo || remove_from_manifest cairo
-	use opengl || remove_from_manifest opengl.glx
-	use webkit || remove_from_manifest webkit
-	java-osgi_newjar-fromfile "swt.jar" "MANIFEST_TMP.MF" "Standard Widget Toolkit for GTK 2.0"
-
-	java-pkg_sointo "/usr/$(get_libdir)/swt"
-	java-pkg_doso *.so
-
-	dodoc about.html
-}
diff --git a/dev-java/swt/swt-4.10-r3.ebuild b/dev-java/swt/swt-4.10-r3.ebuild
index da97a0a165ab..5b0d33375cad 100644
--- a/dev-java/swt/swt-4.10-r3.ebuild
+++ b/dev-java/swt/swt-4.10-r3.ebuild
@@ -19,7 +19,7 @@ SRC_URI="
 
 LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1"
 SLOT="4.10"
-KEYWORDS="~amd64 ~ppc64"
+KEYWORDS="amd64 ppc64"
 IUSE="cairo opengl webkit"
 
 BDEPEND="