gentoo resync : 02.02.2022

3 files changed, 2 insertions, 152 deletions

diff --git a/dev-java/swt/Manifest b/dev-java/swt/Manifest
index c88b52888380..01604f6c75d7 100644
--- a/dev-java/swt/Manifest
+++ b/dev-java/swt/Manifest
@@ -17,7 +17,6 @@ DIST swt-3.8.2-gtk-linux-x86_64.zip 5865160 BLAKE2B 45d60d334eb99f407cf9101a06f6
 DIST swt-4.10-gtk-linux-ppc64le.zip 3848264 BLAKE2B 214861fde6987906fb24f3187936f3bcb49aebed54fe242427c3737bf6761e8f77d049c376f30ca0fc33e74a1e8a48b6aff6d9863775ee9c33fea7cb2edd1309 SHA512 1b3ede58c2b41abae76f58a303bd3fbf1849ba8be3fd6518325bc22400e960c3ab542e7351b1bc08053e2746ea3e28812e04c2d1789cb1e19ea28745c8a5f39a
 DIST swt-4.10-gtk-linux-x86_64.zip 3844306 BLAKE2B 0e0ed21708acce347fd025920ee635f586c460f8a9c05a7067fd70eed9da999b4a62a5febd17f0c5546ab15198336038e4ab49a1bd588d49ffb39450353a1911 SHA512 9dd946cb7c11446f553f06b8af516167519bab00d4a89f626cd612be6d18e50023fc537aa3d844a8f7a56a767df00410efe4dd20e2bfd930639330a1e279a7a0
 EBUILD swt-3.7.2-r3.ebuild 4284 BLAKE2B 4f28f089ffd3e884f6c40c586bf49c7753498dc2f11d08cdbf5da5b30515365ea9f960f8d5ab9b43f7ac2465483d44c52c911a365d755dabb94d3a768b1d23ea SHA512 f22b5af349663407b65fe224dc0f3d993d31ca78de3a591fe506e85749d6442cfa47e46b9378f350b1e8fca64614fb9182211de364073d0bbd88576bfc5640dd
-EBUILD swt-3.8.2-r3.ebuild 4087 BLAKE2B 0407cc0b85e48c2aa97addb67d6b49b06b2d5a721a738cafe8846e69cb4bbed1718a6e398336574b7b37dcef3f33ce390fc12ffb86ea59320fd50ad3779bafa5 SHA512 fb0b2de757edc6e83368b191e0ad44379a9577d13a9e7f95666df91fe2ca2c3a6c46cfc76236ffe861fce7b3603a68ce215dc404496b95f3692f815b3d52cf4a
-EBUILD swt-3.8.2-r4.ebuild 4081 BLAKE2B d1d27cbe0ec2f322443349e570726e317b8aef89cc74cc8cae46d6284eabdf91713b96c3fe680ffa7cc514ccd0e06c8475f27d827103925b3ff7557e0e359552 SHA512 d05a019017a4bb774238833826003fc472685fc5838c515275233c18df1ef10fe18bd38ee542a347833893b3f03cfeac043a7342f00a74d5fe86d6ebf67c663f
+EBUILD swt-3.8.2-r4.ebuild 4078 BLAKE2B b286ec9203e40918a67a8790287392be6d61210c3d27a25ae19b01bbc1486ea0a2c9808c294f2f5019803aac60a6591d1484496c43e4a072e14ad29278982311 SHA512 cfee176de17b3a0ad851d9706db1ee9311453b8a82fe239163b801a66de9be3daf906902db907443d38b65e9c76a7dac38e87dea55bea810ad1bc5532d7f120f
 EBUILD swt-4.10-r2.ebuild 4527 BLAKE2B 9f2d0c3eb9bf1903c9f14376a31d4e7e9e7dd0122dc4f8938f4bc38bf8bec5aaeb9257d90c3259257f666f48257176f9a98dd5ea10201a793a6c36a4b305ac61 SHA512 1aa4bba24a5dabcc1173cea8bf930a380eabab23ac26b89a564e683d711287fd6811bdfa7b114480951c914f4a533b4c8c9fda4db6f7377ee2074b1764e3c06c
 MISC metadata.xml 519 BLAKE2B 5c132bb4b8d9fbacfae3262a550e34932088ecbd204c3a8c2c13d782b0b0fa37a3b255bc84c388ee13f874b427a87a4321e605d0c614308300c18715c9631ab5 SHA512 ef81d6d7cc9f8e2309dcb8bdd78ea942a7a300ba4ed8506a93f12150c9142a5f62a153c0d77e3000f78637d5523367b7fce1186bbac01cafae10d4d0af6c959d
diff --git a/dev-java/swt/swt-3.8.2-r3.ebuild b/dev-java/swt/swt-3.8.2-r3.ebuild
deleted file mode 100644
index 31af30f456c6..000000000000
--- a/dev-java/swt/swt-3.8.2-r3.ebuild
+++ /dev/null
@@ -1,149 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit epatch java-pkg-2 java-ant-2 toolchain-funcs java-osgi
-
-MY_PV="${PV/_rc/RC}"
-MY_DMF="http://archive.eclipse.org/eclipse/downloads/drops/R-${MY_PV}-201301310800"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="GTK based SWT Library"
-HOMEPAGE="http://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.8"
-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
-	)"
-DEPEND="${COMMON_DEPEND}
-	app-arch/unzip
-	virtual/jdk:1.8
-	virtual/pkgconfig
-	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/$(get_libdir)/libswt-.*.so"
-
-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
-}
-
-java_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 -p "${S}/src"
-	mv "${S}/org" "${S}/src" || die "Unable to restructure SWT sources"
-
-	epatch "${FILESDIR}"/${PN}-3.8-as-needed-and-flag-fixes.patch
-	epatch "${FILESDIR}"/${P}-gthread.patch
-}
-
-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"
-	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"
-	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
-
-	dohtml about.html
-}
diff --git a/dev-java/swt/swt-3.8.2-r4.ebuild b/dev-java/swt/swt-3.8.2-r4.ebuild
index 8bca8e212541..4078770338fb 100644
--- a/dev-java/swt/swt-3.8.2-r4.ebuild
+++ b/dev-java/swt/swt-3.8.2-r4.ebuild
@@ -19,7 +19,7 @@ SRC_URI="
 
 LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1"
 SLOT="3.8"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ppc64 x86"
 IUSE="cairo opengl"
 
 COMMON_DEPEND="