Adding metadata

4 files changed, 5 insertions, 168 deletions

diff --git a/dev-java/commons-digester/commons-digester-2.1-r1.ebuild b/dev-java/commons-digester/commons-digester-2.1-r1.ebuild
index 242838b96140..0533f4f8b685 100644
--- a/dev-java/commons-digester/commons-digester-2.1-r1.ebuild
+++ b/dev-java/commons-digester/commons-digester-2.1-r1.ebuild
@@ -4,6 +4,7 @@
 EAPI="5"
 
 JAVA_PKG_IUSE="doc examples source test"
+MAVEN_ID="commons-digester:commons-digester:2.1"
 
 inherit java-pkg-2 java-ant-2
 
diff --git a/dev-java/swt/Manifest b/dev-java/swt/Manifest
index a7bdcfce8ab2..882aec4b4fd1 100644
--- a/dev-java/swt/Manifest
+++ b/dev-java/swt/Manifest
@@ -6,6 +6,3 @@ DIST swt-3.8.2-gtk-linux-x86.zip 5558694 BLAKE2B 8dd0ce9f2c6b8dc448c85a6c509f39e
 DIST swt-3.8.2-gtk-linux-x86_64.zip 5865160 BLAKE2B 45d60d334eb99f407cf9101a06f65e48543538a386103767700fb0af5ea0cf3da73eefe57b8cc6b3d78cb8f29345869f5474513648560395a69cbd4c9b8ee8a4 SHA512 43a27cb6fc891d7da35f5fcfc6ccb689d2b2c58de70b628b1e7cf07131f0641598b627eeedafb6a8dca715a336a7fb4fb6a03bb29fea3e115a4af571b1574cf8
 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
-DIST swt-4.2-gtk-linux-ppc64.zip 5935799 BLAKE2B 6b1ca0d25d81134239e56ead673303075b6d9c5f20e4ab07fb7b5b87d54582023d02c28a1d330fd40d647bdbc27823ca7b184837cb974706ee13809ebdfd2db4 SHA512 bedd64099380980a6dbe47b86f4719666366680f7580150f97282c6f6b6acc95822493469e950e8fcbc9c584f6fca9f35a59937551ae8b6e799b188dc3751e9d
-DIST swt-4.2-gtk-linux-x86.zip 5561088 BLAKE2B cf8bda6a48d5d8e389c387162bf2aafde5a95c43d76e444a4b79008e1154348d2c99850851b3d0e428890e6b2da1e4bec53a7f9050169ad4866a5a8352e9ed2b SHA512 e3d53bcd0521411c40f4c37719917f3570a17fb3ea5c617560986273fd155b99d9b0790ba27c57da26663d49ebec4c6a8387b41bd01b0ba934b21724ba98e133
-DIST swt-4.2-gtk-linux-x86_64.zip 5867140 BLAKE2B 994bf18799297529329637c1b9ebf15638187339b4f56bf8cc1dedfc97c25a1ea4a1664605cac1374fe3d79b321dc450c6129ebef00ddd6f9507f238b7836316 SHA512 56c5ec4ca2ddeed5256dd6ff350dc3911034ecbc414a06ba879f04ab53d6380ca9da9037097f76228ca8182f6076bcd9cc4cb9b01c10766c10048e6576fc5f50
diff --git a/dev-java/swt/swt-4.2-r4.ebuild b/dev-java/swt/swt-4.2-r4.ebuild
deleted file mode 100644
index 3b48a85ba055..000000000000
--- a/dev-java/swt/swt-4.2-r4.ebuild
+++ /dev/null
@@ -1,159 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit epatch flag-o-matic java-pkg-2 java-ant-2 toolchain-funcs java-osgi
-
-MY_PV="${PV/_rc/RC}"
-MY_DMF="http://archive.eclipse.org/eclipse/downloads/drops4/R-${MY_PV}-201206081400"
-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 )
-	x86-fbsd? ( ${MY_DMF}/${MY_P}-gtk-linux-x86.zip )"
-
-LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1"
-SLOT="4.2"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE="cairo opengl"
-
-COMMON_DEPEND="
-	>=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
-	)"
-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 "${S}/src" && mv "${S}/org" "${S}/src" || die "Unable to restructure SWT sources"
-
-	# Fix Makefiles to respect flags and work with --as-needed
-	epatch "${FILESDIR}"/${P}-as-needed-and-flag-fixes.patch
-
-	# Define missing g_thread_supported() to be 0.
-	sed -i '1s/^/#define g_thread_supported() 0\n\n/' "${S}"/os_custom.h || die
-}
-
-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 platform="linux"
-
-	use elibc_FreeBSD && platform="freebsd"
-
-	# Bug #461784, g_thread_init is deprecated since glib-2.32.
-	append-cflags -DNO__1g_1thread_1init
-
-	local make="emake -f make_${platform}.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"
-	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
-	use x86-fbsd && swtArch=x86
-
-	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/validation-api/validation-api-1.0.0.ebuild b/dev-java/validation-api/validation-api-1.0.0-r1.ebuild
index 4cb2cbe31147..d7887694dca4 100644
--- a/dev-java/validation-api/validation-api-1.0.0.ebuild
+++ b/dev-java/validation-api/validation-api-1.0.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,8 +15,6 @@ LICENSE="Apache-2.0"
 SLOT="1.0"
 KEYWORDS="~amd64 ~x86"
 
-IUSE=""
-
-RDEPEND=">=virtual/jre-1.5"
-DEPEND=">=virtual/jdk-1.5
-	app-arch/unzip"
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
+BDEPEND="app-arch/unzip"