From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1121480-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id BBF2613997D
for <garchives@archives.gentoo.org>; Sun, 10 Nov 2019 13:12:10 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 05AA4E08F5;
Sun, 10 Nov 2019 13:12:10 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id DE897E08F5
for <gentoo-commits@lists.gentoo.org>; Sun, 10 Nov 2019 13:12:09 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 6902134CB3A
for <gentoo-commits@lists.gentoo.org>; Sun, 10 Nov 2019 13:12:08 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id E44D5890
for <gentoo-commits@lists.gentoo.org>; Sun, 10 Nov 2019 13:12:06 +0000 (UTC)
From: "Michał Górny" <mgorny@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" <mgorny@gentoo.org>
Message-ID: <1573391521.c95f6be6ebf954d6023a9b8676b4260b775b18b0.mgorny@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-java/resin-servlet-api/
X-VCS-Repository: repo/gentoo
X-VCS-Files: dev-java/resin-servlet-api/resin-servlet-api-3.0.25.ebuild
X-VCS-Directories: dev-java/resin-servlet-api/
X-VCS-Committer: mgorny
X-VCS-Committer-Name: Michał Górny
X-VCS-Revision: c95f6be6ebf954d6023a9b8676b4260b775b18b0
X-VCS-Branch: master
Date: Sun, 10 Nov 2019 13:12:06 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 213f2629-e7b1-4584-9de5-691ffda72cb6
X-Archives-Hash: a5a317118e66ac7d5fae4dce9da7810b
commit: c95f6be6ebf954d6023a9b8676b4260b775b18b0
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 10 13:09:28 2019 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Nov 10 13:12:01 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c95f6be6
dev-java/resin-servlet-api: Bump to EAPI 7
Closes: https://bugs.gentoo.org/697530
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
.../resin-servlet-api-3.0.25.ebuild | 35 ++++++++--------------
1 file changed, 12 insertions(+), 23 deletions(-)
diff --git a/dev-java/resin-servlet-api/resin-servlet-api-3.0.25.ebuild b/dev-java/resin-servlet-api/resin-servlet-api-3.0.25.ebuild
index e2a5a17df67..9f617611636 100644
--- a/dev-java/resin-servlet-api/resin-servlet-api-3.0.25.ebuild
+++ b/dev-java/resin-servlet-api/resin-servlet-api-3.0.25.ebuild
@@ -1,50 +1,39 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=0
+EAPI=7
JAVA_PKG_IUSE="source"
-inherit eutils java-pkg-2 java-ant-2
+inherit java-pkg-2 java-ant-2
DESCRIPTION="Resin Servlet API 2.4/JSP API 2.0 implementation"
HOMEPAGE="http://www.caucho.com/"
SRC_URI="http://www.caucho.com/download/resin-${PV}-src.zip
mirror://gentoo/resin-gentoo-patches-${PV}.tar.bz2"
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
SLOT="2.4"
KEYWORDS="amd64 ppc64 x86"
-
IUSE=""
-COMMON_DEP=""
-
-RDEPEND=">=virtual/jre-1.4
- ${COMMON_DEP}"
+RDEPEND=">=virtual/jre-1.4:*"
DEPEND=">=virtual/jdk-1.4
- app-arch/unzip
- ${COMMON_DEP}"
+ app-arch/unzip"
S="${WORKDIR}/resin-${PV}"
-src_unpack() {
-
- unpack ${A}
-
- mkdir "${S}/lib"
+EANT_BUILD_TARGET="jsdk"
+EANT_DOC_TARGET=""
- cd "${S}"
- epatch "${WORKDIR}/${PV}/resin-${PV}-build.xml.patch"
+src_prepare() {
+ default
+ mkdir lib || die
+ eapply "${WORKDIR}/${PV}/resin-${PV}-build.xml.patch"
}
-EANT_BUILD_TARGET="jsdk"
-EANT_DOC_TARGET=""
-
src_install() {
-
java-pkg_newjar "lib/jsdk-24.jar"
use source && java-pkg_dosrc "${S}"/modules/jsdk/src/*
-
}