diff options
Diffstat (limited to 'dev-java')
| -rw-r--r-- | dev-java/osgi-enterprise-api/osgi-enterprise-api-5.0.0-r1.ebuild (renamed from dev-java/osgi-enterprise-api/osgi-enterprise-api-5.0.0.ebuild) | 23 | ||||
| -rw-r--r-- | dev-java/swingx/swingx-1.6.4-r1.ebuild (renamed from dev-java/swingx/swingx-1.6.4.ebuild) | 17 |
2 files changed, 13 insertions, 27 deletions
diff --git a/dev-java/osgi-enterprise-api/osgi-enterprise-api-5.0.0.ebuild b/dev-java/osgi-enterprise-api/osgi-enterprise-api-5.0.0-r1.ebuild index 54d3162af6cd..6150e0d2c5f0 100644 --- a/dev-java/osgi-enterprise-api/osgi-enterprise-api-5.0.0.ebuild +++ b/dev-java/osgi-enterprise-api/osgi-enterprise-api-5.0.0-r1.ebuild @@ -1,45 +1,38 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="5" +EAPI=7 JAVA_PKG_IUSE="doc source" inherit java-pkg-2 java-pkg-simple DESCRIPTION="OSGi Enterprise Release 5 Companion Code" -SRC_URI="http://www.osgi.org/download/r5/osgi.enterprise-${PV}.jar" HOMEPAGE="http://www.osgi.org/Main/HomePage" +SRC_URI="https://docs.osgi.org/download/r5/osgi.enterprise-${PV}.jar" LICENSE="Apache-2.0 OSGi-Specification-2.0" SLOT="0" KEYWORDS="amd64 ~ppc64 x86" -RESTRICT="bindist fetch" +RESTRICT="bindist" CDEPEND="dev-java/glassfish-persistence:0 dev-java/osgi-core-api:0 java-virtuals/servlet-api:2.5" RDEPEND="${CDEPEND} - >=virtual/jre-1.5" + >=virtual/jre-1.8:*" DEPEND="${CDEPEND} - >=virtual/jdk-1.5 + >=virtual/jdk-1.8:* app-arch/unzip" JAVA_SRC_DIR="OSGI-OPT/src" JAVA_GENTOO_CLASSPATH="glassfish-persistence,osgi-core-api,servlet-api-2.5" -pkg_nofetch() { - einfo "Please download osgi.enterprise-${PV}.jar from" - einfo " http://www.osgi.org/Download/Release5" - einfo "which you can find listed as" - einfo " OSGi Enterprise Release 5 Companion Code" - einfo "after accepting the license." -} - -java_prepare() { +src_prepare() { + default rm -r org || die } diff --git a/dev-java/swingx/swingx-1.6.4.ebuild b/dev-java/swingx/swingx-1.6.4-r1.ebuild index 98db1f30a104..2e8043147f75 100644 --- a/dev-java/swingx/swingx-1.6.4.ebuild +++ b/dev-java/swingx/swingx-1.6.4-r1.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="5" +EAPI=7 JAVA_PKG_IUSE="doc source" @@ -9,7 +9,7 @@ inherit java-pkg-2 java-pkg-simple DESCRIPTION="A collection of powerful, useful, and just plain fun Swing components" HOMEPAGE="https://java.net/projects/swingx/" -SRC_URI="https://java.net/projects/${PN}/downloads/download/releases/${PN}-all-${PV}-sources.jar +SRC_URI="https://maven.java.net/service/local/repositories/releases/content/org/swinglabs/swingx/swingx-all/${PV}/swingx-all-${PV}-sources.jar https://java.net/projects/${PN}/downloads/download/releases/${PN}-mavensupport-${PV}-sources.jar" LICENSE="LGPL-2.1" @@ -18,17 +18,10 @@ KEYWORDS="~amd64 ~x86" CDEPEND="dev-java/metainf-services:0" -RDEPEND=">=virtual/jre-1.5 +RDEPEND="virtual/jre:1.8 ${CDEPEND}" -DEPEND=">=virtual/jdk-1.5 +DEPEND="virtual/jdk:1.8 ${CDEPEND}" JAVA_GENTOO_CLASSPATH="metainf-services" - -src_install() { - java-pkg_dojar ${PN}.jar - - use doc && java-pkg_dojavadoc target/api - use source && java-pkg_dosrc org -} |