gentoo resync : 17.07.2021

2 files changed, 175 insertions, 0 deletions

diff --git a/dev-java/swt/Manifest b/dev-java/swt/Manifest
index 5bfd11d592ae..4af4635d55c1 100644
--- a/dev-java/swt/Manifest
+++ b/dev-java/swt/Manifest
@@ -19,4 +19,5 @@ DIST swt-4.10-gtk-linux-x86_64.zip 3844306 BLAKE2B 0e0ed21708acce347fd025920ee63
 EBUILD swt-3.7.2-r3.ebuild 4437 BLAKE2B f488c4f50f7019580f29cbbc374d440444a699934193db8f6251d76c2342c5a26a5b65cc7c993ffb90155f771bc9039075b6a202c06d98abbdf7a2ff5959f63a SHA512 afdf8e0de244d457b4aa857bc1f045d0a3aa304158ece0a147c7b20308a27c79b5f614dd7ab0143c4372f7155679019cd972ab28a997cd9fe666f0d2985ea21b
 EBUILD swt-3.8.2-r3.ebuild 4240 BLAKE2B 3c08a0ee771d859e07af9d01c9796571ec9295bc0be4058abb330bd62194f20c77744795fcd27412a7397e7a341b7556080d3a7589faa9548ab1f1ac97433005 SHA512 f5c8f79cb9c801062d21d17f6ccdc30b28d5d1716e63ecae00872fce2c7c1b8a6152882ab90ddf6a39d4f525429462415cef6597a9425ec59060d6d0fdbe5099
 EBUILD swt-4.10-r1.ebuild 4628 BLAKE2B 91201a8ef41b011d1727120b2bcd32daf3c7dd3e042f88e391b982234932751150425ff2cc119a82e0c5d58e4b9544f1e6568ce36f3a8a7ea69b522bbb2cf7d9 SHA512 826f37b9d626e79f22011a3f2dd64701a1899a9dc3009cac3fdbce2cf4ba0159133ec9355205eece0cc0ae6a6e6c6c98acd873a54fbf4a3080f00d92cc117cd0
+EBUILD swt-4.10-r2.ebuild 4644 BLAKE2B 3128a781fe1517bee80087d58a5920b6394363dd592d69ddbf733d6331a4eac1b7ca2c2ca2df8ab978a7264269eff3d0dd8147bd169275ab5632077548312438 SHA512 9401c712c6230413da3f4ebcbadce7dd0411f16930cd6adbe79daa193197b83bcfd41ac8f465a5ea27a34264da74a1458a8e8b806975a63e4b1e6ae15be778fa
 MISC metadata.xml 518 BLAKE2B a325a8cd71c85886ffabde744769f9edfac99311d30be502937ff560e3cdced76c92a4a90979e0d46950fa2f345d2364d21902ee13fefa4d78477bb829e6298f SHA512 088a1c3b97e2496e801234ef5a99ce14bb259f8065545e4be1af65e6e5639c273a88a77ed50c414e35c20f62e7b5183c721321a0e463ffb990dba05ea271251e
diff --git a/dev-java/swt/swt-4.10-r2.ebuild b/dev-java/swt/swt-4.10-r2.ebuild
new file mode 100644
index 000000000000..8c3986977dbe
--- /dev/null
+++ b/dev-java/swt/swt-4.10-r2.ebuild
@@ -0,0 +1,174 @@
+# Copyright 1999-2021 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="http://download.eclipse.org/eclipse/downloads/drops4/R-${MY_PV}-201812060815"
+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 )
+	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 AWT_ARCH
+	local JAWTSO="libjawt.so"
+	if [[ $(tc-arch) == 'ppc64' ]] ; then
+		# no big-endian support
+		AWT_ARCH="ppc64le"
+	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)"
+	elif [[ -f "${JAVA_HOME}/lib/${JAWTSO}" ]] ; then
+		export AWT_LIB_PATH="${JAVA_HOME}/lib"
+	else
+		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
+}