[gentoo-commits] repo/gentoo:master commit in: dev-java/sun-jms/

[Michał Górny]

commit:     54eb6fc25d9fd54ca7b61671b43ad9776f107701
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Nov  9 21:17:50 2019 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Nov  9 21:33:12 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=54eb6fc2

dev-java/sun-jms: Bump to EAPI 7

Closes: https://bugs.gentoo.org/697358
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 dev-java/sun-jms/sun-jms-1.1-r2.ebuild | 30 +++++++++++++++++-------------
 1 file changed, 17 insertions(+), 13 deletions(-)

diff --git a/dev-java/sun-jms/sun-jms-1.1-r2.ebuild 
b/dev-java/sun-jms/sun-jms-1.1-r2.ebuild
index 3a8512d4b2d..8c1ffebbb3c 100644
--- a/dev-java/sun-jms/sun-jms-1.1-r2.ebuild
+++ b/dev-java/sun-jms/sun-jms-1.1-r2.ebuild
@@ -1,23 +1,27 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=7
 
 inherit java-pkg-2
 
 
DOWNLOAD_PAGE="http://download.oracle.com/otndocs/jcp/7542-jms-1.1-fr-doc-oth-JSpec/";
 At="jms-${PV/./_}-fr-apidocs.zip"
+
 DESCRIPTION="The Java Message Service (JMS) API"
 HOMEPAGE="http://java.sun.com/products/jms/";
 SRC_URI="${At}"
+
 LICENSE="sun-bcla-jms"
 SLOT=0
 KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos 
~sparc-solaris ~x86-solaris"
 IUSE="doc"
+
 RDEPEND=">=virtual/jre-1.3"
 DEPEND="app-arch/unzip
        >=virtual/jdk-1.3"
-RESTRICT="fetch"
+
+RESTRICT="bindist fetch"
 
 S="${WORKDIR}/${PN//sun-/}${PV}"
 
@@ -33,22 +37,22 @@ pkg_nofetch() {
        einfo
 }
 
-src_unpack() {
-       unpack ${A}
-       rm -v "${S}"/lib/*.jar
+src_prepare() {
+       default
+       rm -v lib/*.jar || die
 }
 
 src_compile() {
-       mkdir build
-       cd src/share
-       ejavac -nowarn -d "${S}"/build $(find . -name "*.java") || die "failed 
too build"
+       mkdir build || die
+       cd src/share || die
+       ejavac -nowarn -d "${S}"/build $(find . -name "*.java") || die
        if use doc ; then
-               mkdir "${S}"/api
-               javadoc -d "${S}"/api -quiet javax.jms
+               mkdir "${S}"/api || die
+               javadoc -d "${S}"/api -quiet javax.jms || die
        fi
 
-       cd "${S}"
-       jar cf jms.jar -C build . || die "failed too create jar"
+       cd "${S}" || die
+       jar cf jms.jar -C build . || die
 }
 
 src_install() {