[gentoo-commits] repo/gentoo:master commit in: dev-java/resin-servlet-api/

2023-02-05 Thread Miroslav Šulc
commit: 7cc8ec4d1a3051e5328a19dadfdd9d1089c70edc
Author: Volkmar W. Pogatzki  pogatzki  net>
AuthorDate: Sun Jan 29 15:45:57 2023 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Sun Feb  5 09:53:06 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7cc8ec4d

dev-java/resin-servlet-api: drop 4.0.46-r1, unused slot

Signed-off-by: Volkmar W. Pogatzki  pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/29331
Signed-off-by: Miroslav Šulc  gentoo.org>

 dev-java/resin-servlet-api/Manifest|  1 -
 .../resin-servlet-api-4.0.46-r1.ebuild | 41 --
 2 files changed, 42 deletions(-)

diff --git a/dev-java/resin-servlet-api/Manifest 
b/dev-java/resin-servlet-api/Manifest
index cc37686ef358..9e5dc4e669f2 100644
--- a/dev-java/resin-servlet-api/Manifest
+++ b/dev-java/resin-servlet-api/Manifest
@@ -1,2 +1 @@
 DIST resin-4.0.27-src.tar.gz 10291608 BLAKE2B 
f28833923dbc49e255d5be04bd568705da953476fd10554db727f14667e3120b7278494cf8c59e6b58f825c4f50be8e766b648d7347f71dfda6743e26b157468
 SHA512 
498de18818f8c1e47919db2415292492ba4879765ad01a5c1a44c4b88bad02267aea245d3225197a62574091ef163910fb0c0924e06d9c9e03e8067dd7aacf08
-DIST resin-4.0.46-src.tar.gz 32564716 BLAKE2B 
6f600cb52ab6f56271a7f75832f300af56d1a2d3a868f5fda208271bd93838e31e49b5f843b668b36a237ced363dd551cf6e8d82fcd70e58c1857667b2b9646a
 SHA512 
649b7204c18e7d3a2144130f07590f2d5af29f3b0567acddd4a8d83caebc45a9dea10a671edebd1ff32df304d7a9f1ce44b0b86fdc0ba353fe01b26d900bd368

diff --git a/dev-java/resin-servlet-api/resin-servlet-api-4.0.46-r1.ebuild 
b/dev-java/resin-servlet-api/resin-servlet-api-4.0.46-r1.ebuild
deleted file mode 100644
index 3bab35a2b31c..
--- a/dev-java/resin-servlet-api/resin-servlet-api-4.0.46-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Resin Servlet API 3.0/JSP API 2.1 implementation"
-HOMEPAGE="https://caucho.com";
-SRC_URI="https://caucho.com/download/resin-${PV}-src.tar.gz";
-
-LICENSE="GPL-2"
-SLOT="3.1"
-KEYWORDS="amd64 ppc64 x86"
-
-DEPEND=">=virtual/jdk-1.8:*"
-RDEPEND=">=virtual/jre-1.8:*"
-
-S="${WORKDIR}/resin-${PV}"
-
-src_prepare() {
-   default
-   cd "${S}"
-   rm -f modules/ext/*.jar project-jars/*.jar webapp-jars/*.jar
-   java-ant_bsfix_files build-common.xml || die
-}
-
-EANT_BUILD_TARGET="servlet16"
-EANT_DOC_TARGET=""
-
-src_install() {
-   java-pkg_newjar "modules/servlet16/dist/servlet-16.jar"
-   use source && java-pkg_dosrc "${S}"/modules/servlet16/src/*
-
-   dosym "${PN}.jar" "/usr/share/${PN}-${SLOT}/lib/servlet-api.jar"
-   java-pkg_regjar "${D}/usr/share/${PN}-${SLOT}/lib/servlet-api.jar"
-   dosym "${PN}.jar" "/usr/share/${PN}-${SLOT}/lib/jsp-api.jar"
-   java-pkg_regjar "${D}/usr/share/${PN}-${SLOT}/lib/jsp-api.jar"
-}



[gentoo-commits] repo/gentoo:master commit in: dev-java/resin-servlet-api/

2023-02-05 Thread Miroslav Šulc
commit: 65cdf5273e7d92f5393b04088a6534c6efc65f2e
Author: Volkmar W. Pogatzki  pogatzki  net>
AuthorDate: Sun Jan 29 15:30:21 2023 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Sun Feb  5 09:53:00 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=65cdf527

dev-java/resin-servlet-api: drop 3.0.25-r1, unused slot

Signed-off-by: Volkmar W. Pogatzki  pogatzki.net>
Signed-off-by: Miroslav Šulc  gentoo.org>

 dev-java/resin-servlet-api/Manifest|  2 --
 .../resin-servlet-api-3.0.25-r1.ebuild | 40 --
 2 files changed, 42 deletions(-)

diff --git a/dev-java/resin-servlet-api/Manifest 
b/dev-java/resin-servlet-api/Manifest
index 2e5cc967f07e..cc37686ef358 100644
--- a/dev-java/resin-servlet-api/Manifest
+++ b/dev-java/resin-servlet-api/Manifest
@@ -1,4 +1,2 @@
-DIST resin-3.0.25-src.zip 10690692 BLAKE2B 
dde17819f958053bfe2e1ac0068db0a56c068185d676dce047769ffcd219036318e0f1adc0fee1757136aa4d5f8c75e112e286cb66d445bd30a283afe2c6ebba
 SHA512 
f80f109b120cfbb484614c733cd10e0e057b7a704a7a00d2a6b83d95876558e4800ecc6d9fe3a3b8ddc32f9d556a51145edc3d08a8625937b8c06f413a335057
 DIST resin-4.0.27-src.tar.gz 10291608 BLAKE2B 
f28833923dbc49e255d5be04bd568705da953476fd10554db727f14667e3120b7278494cf8c59e6b58f825c4f50be8e766b648d7347f71dfda6743e26b157468
 SHA512 
498de18818f8c1e47919db2415292492ba4879765ad01a5c1a44c4b88bad02267aea245d3225197a62574091ef163910fb0c0924e06d9c9e03e8067dd7aacf08
 DIST resin-4.0.46-src.tar.gz 32564716 BLAKE2B 
6f600cb52ab6f56271a7f75832f300af56d1a2d3a868f5fda208271bd93838e31e49b5f843b668b36a237ced363dd551cf6e8d82fcd70e58c1857667b2b9646a
 SHA512 
649b7204c18e7d3a2144130f07590f2d5af29f3b0567acddd4a8d83caebc45a9dea10a671edebd1ff32df304d7a9f1ce44b0b86fdc0ba353fe01b26d900bd368
-DIST resin-gentoo-patches-3.0.25.tar.bz2 4781 BLAKE2B 
df087e05a80442c44969ccd20099ad5ff5d1e6ab92886255cfa262bcce73043f07b01109e84e224dd991c43730d6c0795bf63bde3b8aaa5fa6dbf749dfbb78f5
 SHA512 
23ce290e97f18248e08e0b3b7ccf37f60a4b0bf2c3aa28d856384295a286b3eeb9636e299e0620c2c858f8e523806707fe1d4531070ee7ffb4037ad483e6d035

diff --git a/dev-java/resin-servlet-api/resin-servlet-api-3.0.25-r1.ebuild 
b/dev-java/resin-servlet-api/resin-servlet-api-3.0.25-r1.ebuild
deleted file mode 100644
index aacd27267893..
--- a/dev-java/resin-servlet-api/resin-servlet-api-3.0.25-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="source"
-
-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+"
-SLOT="2.4"
-KEYWORDS="amd64 ppc64 x86"
-
-DEPEND=">=virtual/jdk-1.8:*"
-RDEPEND=">=virtual/jre-1.8:*"
-BDEPEND="app-arch/unzip"
-
-S="${WORKDIR}/resin-${PV}"
-
-EANT_BUILD_TARGET="jsdk"
-EANT_DOC_TARGET=""
-
-PATCHES=(
-   "${WORKDIR}/${PV}/resin-${PV}-build.xml.patch"
-)
-
-src_prepare() {
-   default
-   mkdir lib || die
-}
-
-src_install() {
-   java-pkg_newjar "lib/jsdk-24.jar"
-   use source && java-pkg_dosrc "${S}"/modules/jsdk/src/*
-}



[gentoo-commits] repo/gentoo:master commit in: dev-java/resin-servlet-api/

2022-01-30 Thread Miroslav Šulc
commit: 258e64c7f56eb075c1999057384f41442ac1b603
Author: Volkmar W. Pogatzki  pogatzki  net>
AuthorDate: Sun Jan 30 08:17:13 2022 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Sun Jan 30 08:30:16 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=258e64c7

dev-java/resin-servlet-api: Drop 4.0.27

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Volkmar W. Pogatzki  pogatzki.net>
Signed-off-by: Miroslav Šulc  gentoo.org>

 dev-java/resin-servlet-api/Manifest|  1 -
 .../resin-servlet-api-4.0.27.ebuild| 47 --
 2 files changed, 48 deletions(-)

diff --git a/dev-java/resin-servlet-api/Manifest 
b/dev-java/resin-servlet-api/Manifest
index 650c63b7bbc7..2e5cc967f07e 100644
--- a/dev-java/resin-servlet-api/Manifest
+++ b/dev-java/resin-servlet-api/Manifest
@@ -1,5 +1,4 @@
 DIST resin-3.0.25-src.zip 10690692 BLAKE2B 
dde17819f958053bfe2e1ac0068db0a56c068185d676dce047769ffcd219036318e0f1adc0fee1757136aa4d5f8c75e112e286cb66d445bd30a283afe2c6ebba
 SHA512 
f80f109b120cfbb484614c733cd10e0e057b7a704a7a00d2a6b83d95876558e4800ecc6d9fe3a3b8ddc32f9d556a51145edc3d08a8625937b8c06f413a335057
 DIST resin-4.0.27-src.tar.gz 10291608 BLAKE2B 
f28833923dbc49e255d5be04bd568705da953476fd10554db727f14667e3120b7278494cf8c59e6b58f825c4f50be8e766b648d7347f71dfda6743e26b157468
 SHA512 
498de18818f8c1e47919db2415292492ba4879765ad01a5c1a44c4b88bad02267aea245d3225197a62574091ef163910fb0c0924e06d9c9e03e8067dd7aacf08
-DIST resin-4.0.27-src.zip 17990178 BLAKE2B 
2da8c4bae7328f0a39fc7cc84c2d7a25408a8242150a9b324cc34a15e0342ed709b9e1db8773873d804d59b47f0c62945433d211fe06ded03db1aad39c46a6d6
 SHA512 
ce1d7eb19ab722c2942d82b6ce80ddd193907d6062df361501d28adbbe57e6b7a2effc734e7820bc73d7743b2546799bc6badbcc2187c7da75cab0b9294b8a53
 DIST resin-4.0.46-src.tar.gz 32564716 BLAKE2B 
6f600cb52ab6f56271a7f75832f300af56d1a2d3a868f5fda208271bd93838e31e49b5f843b668b36a237ced363dd551cf6e8d82fcd70e58c1857667b2b9646a
 SHA512 
649b7204c18e7d3a2144130f07590f2d5af29f3b0567acddd4a8d83caebc45a9dea10a671edebd1ff32df304d7a9f1ce44b0b86fdc0ba353fe01b26d900bd368
 DIST resin-gentoo-patches-3.0.25.tar.bz2 4781 BLAKE2B 
df087e05a80442c44969ccd20099ad5ff5d1e6ab92886255cfa262bcce73043f07b01109e84e224dd991c43730d6c0795bf63bde3b8aaa5fa6dbf749dfbb78f5
 SHA512 
23ce290e97f18248e08e0b3b7ccf37f60a4b0bf2c3aa28d856384295a286b3eeb9636e299e0620c2c858f8e523806707fe1d4531070ee7ffb4037ad483e6d035

diff --git a/dev-java/resin-servlet-api/resin-servlet-api-4.0.27.ebuild 
b/dev-java/resin-servlet-api/resin-servlet-api-4.0.27.ebuild
deleted file mode 100644
index 62503ad641b1..
--- a/dev-java/resin-servlet-api/resin-servlet-api-4.0.27.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-JAVA_PKG_IUSE="source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Resin Servlet API 3.0/JSP API 2.1 implementation"
-HOMEPAGE="http://www.caucho.com/";
-SRC_URI="http://www.caucho.com/download/resin-${PV}-src.zip";
-
-LICENSE="GPL-2"
-SLOT="3.0"
-KEYWORDS="amd64 ppc64 x86"
-
-IUSE=""
-
-COMMON_DEP=""
-
-RDEPEND=">=virtual/jre-1.6
-   ${COMMON_DEP}"
-DEPEND=">=virtual/jdk-1.6
-   app-arch/unzip
-   ${COMMON_DEP}"
-
-S="${WORKDIR}/resin-${PV}"
-
-java_prepare() {
-   cd "${S}"
-   rm -f modules/ext/*.jar project-jars/*.jar webapp-jars/*.jar
-   java-ant_bsfix_files build-common.xml || die
-}
-
-EANT_BUILD_TARGET="servlet16"
-EANT_DOC_TARGET=""
-
-src_install() {
-   java-pkg_newjar "modules/servlet16/dist/servlet-16.jar"
-   use source && java-pkg_dosrc "${S}"/modules/servlet16/src/*
-
-   dosym "${PN}.jar" "/usr/share/${PN}-${SLOT}/lib/servlet-api.jar"
-   java-pkg_regjar "${D}/usr/share/${PN}-${SLOT}/lib/servlet-api.jar"
-   dosym "${PN}.jar" "/usr/share/${PN}-${SLOT}/lib/jsp-api.jar"
-   java-pkg_regjar "${D}/usr/share/${PN}-${SLOT}/lib/jsp-api.jar"
-}



[gentoo-commits] repo/gentoo:master commit in: dev-java/resin-servlet-api/

2022-01-30 Thread Agostino Sarubbo
commit: d0aed549d6c633f5aa3cd0bd563c786cdd891432
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Sun Jan 30 08:04:10 2022 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Sun Jan 30 08:04:10 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d0aed549

dev-java/resin-servlet-api: ppc64 stable wrt bug #832342

Package-Manager: Portage-3.0.28, Repoman-3.0.3
RepoMan-Options: --include-arches="ppc64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 dev-java/resin-servlet-api/resin-servlet-api-4.0.27-r2.ebuild | 2 +-
 dev-java/resin-servlet-api/resin-servlet-api-4.0.46-r1.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-java/resin-servlet-api/resin-servlet-api-4.0.27-r2.ebuild 
b/dev-java/resin-servlet-api/resin-servlet-api-4.0.27-r2.ebuild
index 76d36904b0a5..62ce67795aea 100644
--- a/dev-java/resin-servlet-api/resin-servlet-api-4.0.27-r2.ebuild
+++ b/dev-java/resin-servlet-api/resin-servlet-api-4.0.27-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://caucho.com/download/resin-${PV}-src.tar.gz";
 
 LICENSE="GPL-2"
 SLOT="3.0"
-KEYWORDS="amd64 ~ppc64 x86"
+KEYWORDS="amd64 ppc64 x86"
 
 DEPEND=">=virtual/jdk-1.8:*"
 RDEPEND=">=virtual/jre-1.8:*"

diff --git a/dev-java/resin-servlet-api/resin-servlet-api-4.0.46-r1.ebuild 
b/dev-java/resin-servlet-api/resin-servlet-api-4.0.46-r1.ebuild
index 0958f4d4bf4a..3bab35a2b31c 100644
--- a/dev-java/resin-servlet-api/resin-servlet-api-4.0.46-r1.ebuild
+++ b/dev-java/resin-servlet-api/resin-servlet-api-4.0.46-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://caucho.com/download/resin-${PV}-src.tar.gz";
 
 LICENSE="GPL-2"
 SLOT="3.1"
-KEYWORDS="amd64 ~ppc64 x86"
+KEYWORDS="amd64 ppc64 x86"
 
 DEPEND=">=virtual/jdk-1.8:*"
 RDEPEND=">=virtual/jre-1.8:*"



[gentoo-commits] repo/gentoo:master commit in: dev-java/resin-servlet-api/

2022-01-29 Thread Jakov Smolić
commit: 08d4d1dcbce375da974d198356af897cc1590375
Author: Jakov Smolić  gentoo  org>
AuthorDate: Sat Jan 29 22:27:44 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Sat Jan 29 22:27:44 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=08d4d1dc

dev-java/resin-servlet-api: Stabilize 4.0.27-r2 amd64, #832342

Signed-off-by: Jakov Smolić  gentoo.org>

 dev-java/resin-servlet-api/resin-servlet-api-4.0.27-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/resin-servlet-api/resin-servlet-api-4.0.27-r2.ebuild 
b/dev-java/resin-servlet-api/resin-servlet-api-4.0.27-r2.ebuild
index b56012fa2268..76d36904b0a5 100644
--- a/dev-java/resin-servlet-api/resin-servlet-api-4.0.27-r2.ebuild
+++ b/dev-java/resin-servlet-api/resin-servlet-api-4.0.27-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://caucho.com/download/resin-${PV}-src.tar.gz";
 
 LICENSE="GPL-2"
 SLOT="3.0"
-KEYWORDS="~amd64 ~ppc64 x86"
+KEYWORDS="amd64 ~ppc64 x86"
 
 DEPEND=">=virtual/jdk-1.8:*"
 RDEPEND=">=virtual/jre-1.8:*"



[gentoo-commits] repo/gentoo:master commit in: dev-java/resin-servlet-api/

2022-01-29 Thread Jakov Smolić
commit: 6d84f5874168a406940d6896716e65d459bd6c6b
Author: Jakov Smolić  gentoo  org>
AuthorDate: Sat Jan 29 22:27:45 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Sat Jan 29 22:27:45 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d84f587

dev-java/resin-servlet-api: Stabilize 4.0.46-r1 amd64, #832342

Signed-off-by: Jakov Smolić  gentoo.org>

 dev-java/resin-servlet-api/resin-servlet-api-4.0.46-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/resin-servlet-api/resin-servlet-api-4.0.46-r1.ebuild 
b/dev-java/resin-servlet-api/resin-servlet-api-4.0.46-r1.ebuild
index 8248194aa51d..0958f4d4bf4a 100644
--- a/dev-java/resin-servlet-api/resin-servlet-api-4.0.46-r1.ebuild
+++ b/dev-java/resin-servlet-api/resin-servlet-api-4.0.46-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://caucho.com/download/resin-${PV}-src.tar.gz";
 
 LICENSE="GPL-2"
 SLOT="3.1"
-KEYWORDS="~amd64 ~ppc64 x86"
+KEYWORDS="amd64 ~ppc64 x86"
 
 DEPEND=">=virtual/jdk-1.8:*"
 RDEPEND=">=virtual/jre-1.8:*"



[gentoo-commits] repo/gentoo:master commit in: dev-java/resin-servlet-api/

2022-01-29 Thread Jakov Smolić
commit: c31fbef1c4e90370d00f638d6f020afd3d7ea08d
Author: Jakov Smolić  gentoo  org>
AuthorDate: Sat Jan 29 21:54:37 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Sat Jan 29 21:54:37 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c31fbef1

dev-java/resin-servlet-api: Stabilize 4.0.27-r2 x86, #832342

Signed-off-by: Jakov Smolić  gentoo.org>

 dev-java/resin-servlet-api/resin-servlet-api-4.0.27-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/resin-servlet-api/resin-servlet-api-4.0.27-r2.ebuild 
b/dev-java/resin-servlet-api/resin-servlet-api-4.0.27-r2.ebuild
index e0bc4f832070..b56012fa2268 100644
--- a/dev-java/resin-servlet-api/resin-servlet-api-4.0.27-r2.ebuild
+++ b/dev-java/resin-servlet-api/resin-servlet-api-4.0.27-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://caucho.com/download/resin-${PV}-src.tar.gz";
 
 LICENSE="GPL-2"
 SLOT="3.0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~ppc64 x86"
 
 DEPEND=">=virtual/jdk-1.8:*"
 RDEPEND=">=virtual/jre-1.8:*"



[gentoo-commits] repo/gentoo:master commit in: dev-java/resin-servlet-api/

2022-01-29 Thread Jakov Smolić
commit: ede0bd92a04d1348c4e2102f09561e57fec2c17b
Author: Jakov Smolić  gentoo  org>
AuthorDate: Sat Jan 29 21:54:38 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Sat Jan 29 21:54:38 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ede0bd92

dev-java/resin-servlet-api: Stabilize 4.0.46-r1 x86, #832342

Signed-off-by: Jakov Smolić  gentoo.org>

 dev-java/resin-servlet-api/resin-servlet-api-4.0.46-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-java/resin-servlet-api/resin-servlet-api-4.0.46-r1.ebuild 
b/dev-java/resin-servlet-api/resin-servlet-api-4.0.46-r1.ebuild
index 4e73714c0d20..8248194aa51d 100644
--- a/dev-java/resin-servlet-api/resin-servlet-api-4.0.46-r1.ebuild
+++ b/dev-java/resin-servlet-api/resin-servlet-api-4.0.46-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -13,7 +13,7 @@ SRC_URI="https://caucho.com/download/resin-${PV}-src.tar.gz";
 
 LICENSE="GPL-2"
 SLOT="3.1"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~ppc64 x86"
 
 DEPEND=">=virtual/jdk-1.8:*"
 RDEPEND=">=virtual/jre-1.8:*"



[gentoo-commits] repo/gentoo:master commit in: dev-java/resin-servlet-api/

2022-01-07 Thread Miroslav Šulc
commit: 9efa962d1eebea911031d267d163a28ce1ebc0a2
Author: Volkmar W. Pogatzki  pogatzki  net>
AuthorDate: Sat Jan  1 12:37:03 2022 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Fri Jan  7 13:03:48 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9efa962d

dev-java/resin-servlet-api: Drop 4.0.27-r1 (wrong slot)

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Volkmar W. Pogatzki  pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/23617
Signed-off-by: Miroslav Šulc  gentoo.org>

 .../resin-servlet-api-4.0.27-r1.ebuild | 41 --
 1 file changed, 41 deletions(-)

diff --git a/dev-java/resin-servlet-api/resin-servlet-api-4.0.27-r1.ebuild 
b/dev-java/resin-servlet-api/resin-servlet-api-4.0.27-r1.ebuild
deleted file mode 100644
index 4e73714c0d20..
--- a/dev-java/resin-servlet-api/resin-servlet-api-4.0.27-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Resin Servlet API 3.0/JSP API 2.1 implementation"
-HOMEPAGE="https://caucho.com";
-SRC_URI="https://caucho.com/download/resin-${PV}-src.tar.gz";
-
-LICENSE="GPL-2"
-SLOT="3.1"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-
-DEPEND=">=virtual/jdk-1.8:*"
-RDEPEND=">=virtual/jre-1.8:*"
-
-S="${WORKDIR}/resin-${PV}"
-
-src_prepare() {
-   default
-   cd "${S}"
-   rm -f modules/ext/*.jar project-jars/*.jar webapp-jars/*.jar
-   java-ant_bsfix_files build-common.xml || die
-}
-
-EANT_BUILD_TARGET="servlet16"
-EANT_DOC_TARGET=""
-
-src_install() {
-   java-pkg_newjar "modules/servlet16/dist/servlet-16.jar"
-   use source && java-pkg_dosrc "${S}"/modules/servlet16/src/*
-
-   dosym "${PN}.jar" "/usr/share/${PN}-${SLOT}/lib/servlet-api.jar"
-   java-pkg_regjar "${D}/usr/share/${PN}-${SLOT}/lib/servlet-api.jar"
-   dosym "${PN}.jar" "/usr/share/${PN}-${SLOT}/lib/jsp-api.jar"
-   java-pkg_regjar "${D}/usr/share/${PN}-${SLOT}/lib/jsp-api.jar"
-}



[gentoo-commits] repo/gentoo:master commit in: dev-java/resin-servlet-api/

2022-01-07 Thread Miroslav Šulc
commit: f425950bd3d4af9ff4185f10ae6e3bd1b4b03863
Author: Volkmar W. Pogatzki  pogatzki  net>
AuthorDate: Sat Jan  1 12:35:36 2022 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Fri Jan  7 13:03:48 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f425950b

dev-java/resin-servlet-api: 4.0.27-r1 had wrong slot

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Volkmar W. Pogatzki  pogatzki.net>
Signed-off-by: Miroslav Šulc  gentoo.org>

 .../resin-servlet-api-4.0.27-r2.ebuild | 41 ++
 1 file changed, 41 insertions(+)

diff --git a/dev-java/resin-servlet-api/resin-servlet-api-4.0.27-r2.ebuild 
b/dev-java/resin-servlet-api/resin-servlet-api-4.0.27-r2.ebuild
new file mode 100644
index ..e0bc4f832070
--- /dev/null
+++ b/dev-java/resin-servlet-api/resin-servlet-api-4.0.27-r2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Resin Servlet API 3.0/JSP API 2.1 implementation"
+HOMEPAGE="https://caucho.com";
+SRC_URI="https://caucho.com/download/resin-${PV}-src.tar.gz";
+
+LICENSE="GPL-2"
+SLOT="3.0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
+
+S="${WORKDIR}/resin-${PV}"
+
+src_prepare() {
+   default
+   cd "${S}"
+   rm -f modules/ext/*.jar project-jars/*.jar webapp-jars/*.jar
+   java-ant_bsfix_files build-common.xml || die
+}
+
+EANT_BUILD_TARGET="servlet16"
+EANT_DOC_TARGET=""
+
+src_install() {
+   java-pkg_newjar "modules/servlet16/dist/servlet-16.jar"
+   use source && java-pkg_dosrc "${S}"/modules/servlet16/src/*
+
+   dosym "${PN}.jar" "/usr/share/${PN}-${SLOT}/lib/servlet-api.jar"
+   java-pkg_regjar "${D}/usr/share/${PN}-${SLOT}/lib/servlet-api.jar"
+   dosym "${PN}.jar" "/usr/share/${PN}-${SLOT}/lib/jsp-api.jar"
+   java-pkg_regjar "${D}/usr/share/${PN}-${SLOT}/lib/jsp-api.jar"
+}



[gentoo-commits] repo/gentoo:master commit in: dev-java/resin-servlet-api/

2021-12-31 Thread Miroslav Šulc
commit: 71edecfbe5111b37f3286715a78423cd8a6e3653
Author: Volkmar W. Pogatzki  pogatzki  net>
AuthorDate: Wed Dec 29 10:35:49 2021 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Fri Dec 31 09:29:18 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71edecfb

dev-java/resin-servlet-api: remove obsolete

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Volkmar W. Pogatzki  pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/23564
Signed-off-by: Miroslav Šulc  gentoo.org>

 dev-java/resin-servlet-api/Manifest|  1 -
 .../resin-servlet-api-4.0.46.ebuild| 47 --
 2 files changed, 48 deletions(-)

diff --git a/dev-java/resin-servlet-api/Manifest 
b/dev-java/resin-servlet-api/Manifest
index 95564c33b6ce..650c63b7bbc7 100644
--- a/dev-java/resin-servlet-api/Manifest
+++ b/dev-java/resin-servlet-api/Manifest
@@ -2,5 +2,4 @@ DIST resin-3.0.25-src.zip 10690692 BLAKE2B 
dde17819f958053bfe2e1ac0068db0a56c068
 DIST resin-4.0.27-src.tar.gz 10291608 BLAKE2B 
f28833923dbc49e255d5be04bd568705da953476fd10554db727f14667e3120b7278494cf8c59e6b58f825c4f50be8e766b648d7347f71dfda6743e26b157468
 SHA512 
498de18818f8c1e47919db2415292492ba4879765ad01a5c1a44c4b88bad02267aea245d3225197a62574091ef163910fb0c0924e06d9c9e03e8067dd7aacf08
 DIST resin-4.0.27-src.zip 17990178 BLAKE2B 
2da8c4bae7328f0a39fc7cc84c2d7a25408a8242150a9b324cc34a15e0342ed709b9e1db8773873d804d59b47f0c62945433d211fe06ded03db1aad39c46a6d6
 SHA512 
ce1d7eb19ab722c2942d82b6ce80ddd193907d6062df361501d28adbbe57e6b7a2effc734e7820bc73d7743b2546799bc6badbcc2187c7da75cab0b9294b8a53
 DIST resin-4.0.46-src.tar.gz 32564716 BLAKE2B 
6f600cb52ab6f56271a7f75832f300af56d1a2d3a868f5fda208271bd93838e31e49b5f843b668b36a237ced363dd551cf6e8d82fcd70e58c1857667b2b9646a
 SHA512 
649b7204c18e7d3a2144130f07590f2d5af29f3b0567acddd4a8d83caebc45a9dea10a671edebd1ff32df304d7a9f1ce44b0b86fdc0ba353fe01b26d900bd368
-DIST resin-4.0.46-src.zip 40400255 BLAKE2B 
e31505ba82a8e87ea0b28634b3055c3a01d6629483c2d5ab6af4b428c9cb5d7803b7ed7de58181222bae669412c239458c43be35f23922f3414ce7ac0173ee56
 SHA512 
49f468706a3269f851a6b359d6020b01dadb312890c97208b1a66353fb82b2d95625947a472d8d3e535d0c52ec6ad3e110eb4d227014fe7a89f313ae1df6970f
 DIST resin-gentoo-patches-3.0.25.tar.bz2 4781 BLAKE2B 
df087e05a80442c44969ccd20099ad5ff5d1e6ab92886255cfa262bcce73043f07b01109e84e224dd991c43730d6c0795bf63bde3b8aaa5fa6dbf749dfbb78f5
 SHA512 
23ce290e97f18248e08e0b3b7ccf37f60a4b0bf2c3aa28d856384295a286b3eeb9636e299e0620c2c858f8e523806707fe1d4531070ee7ffb4037ad483e6d035

diff --git a/dev-java/resin-servlet-api/resin-servlet-api-4.0.46.ebuild 
b/dev-java/resin-servlet-api/resin-servlet-api-4.0.46.ebuild
deleted file mode 100644
index 0263bbaf7018..
--- a/dev-java/resin-servlet-api/resin-servlet-api-4.0.46.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-JAVA_PKG_IUSE="source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Resin Servlet API 3.0/JSP API 2.1 implementation"
-HOMEPAGE="http://www.caucho.com/";
-SRC_URI="http://www.caucho.com/download/resin-${PV}-src.zip";
-
-LICENSE="GPL-2"
-SLOT="3.1"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-
-IUSE=""
-
-COMMON_DEP=""
-
-RDEPEND=">=virtual/jre-1.6
-   ${COMMON_DEP}"
-DEPEND=">=virtual/jdk-1.6
-   app-arch/unzip
-   ${COMMON_DEP}"
-
-S="${WORKDIR}/resin-${PV}"
-
-java_prepare() {
-   cd "${S}"
-   rm -f modules/ext/*.jar project-jars/*.jar webapp-jars/*.jar
-   java-ant_bsfix_files build-common.xml || die
-}
-
-EANT_BUILD_TARGET="servlet16"
-EANT_DOC_TARGET=""
-
-src_install() {
-   java-pkg_newjar "modules/servlet16/dist/servlet-16.jar"
-   use source && java-pkg_dosrc "${S}"/modules/servlet16/src/*
-
-   dosym "${PN}.jar" "/usr/share/${PN}-${SLOT}/lib/servlet-api.jar"
-   java-pkg_regjar "${D}/usr/share/${PN}-${SLOT}/lib/servlet-api.jar"
-   dosym "${PN}.jar" "/usr/share/${PN}-${SLOT}/lib/jsp-api.jar"
-   java-pkg_regjar "${D}/usr/share/${PN}-${SLOT}/lib/jsp-api.jar"
-}



[gentoo-commits] repo/gentoo:master commit in: dev-java/resin-servlet-api/

2021-12-31 Thread Miroslav Šulc
commit: a1c2e238424388c8ba656a26e3174f70b93d1a15
Author: Volkmar W. Pogatzki  pogatzki  net>
AuthorDate: Wed Dec 29 10:11:35 2021 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Fri Dec 31 09:29:14 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1c2e238

dev-java/resin-servlet-api: EAPI 8, min java 1.8:*

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Volkmar W. Pogatzki  pogatzki.net>
Signed-off-by: Miroslav Šulc  gentoo.org>

 dev-java/resin-servlet-api/Manifest|  2 ++
 .../resin-servlet-api-4.0.27-r1.ebuild | 41 ++
 .../resin-servlet-api-4.0.46-r1.ebuild | 41 ++
 3 files changed, 84 insertions(+)

diff --git a/dev-java/resin-servlet-api/Manifest 
b/dev-java/resin-servlet-api/Manifest
index b62391d74006..95564c33b6ce 100644
--- a/dev-java/resin-servlet-api/Manifest
+++ b/dev-java/resin-servlet-api/Manifest
@@ -1,4 +1,6 @@
 DIST resin-3.0.25-src.zip 10690692 BLAKE2B 
dde17819f958053bfe2e1ac0068db0a56c068185d676dce047769ffcd219036318e0f1adc0fee1757136aa4d5f8c75e112e286cb66d445bd30a283afe2c6ebba
 SHA512 
f80f109b120cfbb484614c733cd10e0e057b7a704a7a00d2a6b83d95876558e4800ecc6d9fe3a3b8ddc32f9d556a51145edc3d08a8625937b8c06f413a335057
+DIST resin-4.0.27-src.tar.gz 10291608 BLAKE2B 
f28833923dbc49e255d5be04bd568705da953476fd10554db727f14667e3120b7278494cf8c59e6b58f825c4f50be8e766b648d7347f71dfda6743e26b157468
 SHA512 
498de18818f8c1e47919db2415292492ba4879765ad01a5c1a44c4b88bad02267aea245d3225197a62574091ef163910fb0c0924e06d9c9e03e8067dd7aacf08
 DIST resin-4.0.27-src.zip 17990178 BLAKE2B 
2da8c4bae7328f0a39fc7cc84c2d7a25408a8242150a9b324cc34a15e0342ed709b9e1db8773873d804d59b47f0c62945433d211fe06ded03db1aad39c46a6d6
 SHA512 
ce1d7eb19ab722c2942d82b6ce80ddd193907d6062df361501d28adbbe57e6b7a2effc734e7820bc73d7743b2546799bc6badbcc2187c7da75cab0b9294b8a53
+DIST resin-4.0.46-src.tar.gz 32564716 BLAKE2B 
6f600cb52ab6f56271a7f75832f300af56d1a2d3a868f5fda208271bd93838e31e49b5f843b668b36a237ced363dd551cf6e8d82fcd70e58c1857667b2b9646a
 SHA512 
649b7204c18e7d3a2144130f07590f2d5af29f3b0567acddd4a8d83caebc45a9dea10a671edebd1ff32df304d7a9f1ce44b0b86fdc0ba353fe01b26d900bd368
 DIST resin-4.0.46-src.zip 40400255 BLAKE2B 
e31505ba82a8e87ea0b28634b3055c3a01d6629483c2d5ab6af4b428c9cb5d7803b7ed7de58181222bae669412c239458c43be35f23922f3414ce7ac0173ee56
 SHA512 
49f468706a3269f851a6b359d6020b01dadb312890c97208b1a66353fb82b2d95625947a472d8d3e535d0c52ec6ad3e110eb4d227014fe7a89f313ae1df6970f
 DIST resin-gentoo-patches-3.0.25.tar.bz2 4781 BLAKE2B 
df087e05a80442c44969ccd20099ad5ff5d1e6ab92886255cfa262bcce73043f07b01109e84e224dd991c43730d6c0795bf63bde3b8aaa5fa6dbf749dfbb78f5
 SHA512 
23ce290e97f18248e08e0b3b7ccf37f60a4b0bf2c3aa28d856384295a286b3eeb9636e299e0620c2c858f8e523806707fe1d4531070ee7ffb4037ad483e6d035

diff --git a/dev-java/resin-servlet-api/resin-servlet-api-4.0.27-r1.ebuild 
b/dev-java/resin-servlet-api/resin-servlet-api-4.0.27-r1.ebuild
new file mode 100644
index ..4e73714c0d20
--- /dev/null
+++ b/dev-java/resin-servlet-api/resin-servlet-api-4.0.27-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Resin Servlet API 3.0/JSP API 2.1 implementation"
+HOMEPAGE="https://caucho.com";
+SRC_URI="https://caucho.com/download/resin-${PV}-src.tar.gz";
+
+LICENSE="GPL-2"
+SLOT="3.1"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
+
+S="${WORKDIR}/resin-${PV}"
+
+src_prepare() {
+   default
+   cd "${S}"
+   rm -f modules/ext/*.jar project-jars/*.jar webapp-jars/*.jar
+   java-ant_bsfix_files build-common.xml || die
+}
+
+EANT_BUILD_TARGET="servlet16"
+EANT_DOC_TARGET=""
+
+src_install() {
+   java-pkg_newjar "modules/servlet16/dist/servlet-16.jar"
+   use source && java-pkg_dosrc "${S}"/modules/servlet16/src/*
+
+   dosym "${PN}.jar" "/usr/share/${PN}-${SLOT}/lib/servlet-api.jar"
+   java-pkg_regjar "${D}/usr/share/${PN}-${SLOT}/lib/servlet-api.jar"
+   dosym "${PN}.jar" "/usr/share/${PN}-${SLOT}/lib/jsp-api.jar"
+   java-pkg_regjar "${D}/usr/share/${PN}-${SLOT}/lib/jsp-api.jar"
+}

diff --git a/dev-java/resin-servlet-api/resin-servlet-api-4.0.46-r1.ebuild 
b/dev-java/resin-servlet-api/resin-servlet-api-4.0.46-r1.ebuild
new file mode 100644
index ..4e73714c0d20
--- /dev/null
+++ b/dev-java/resin-servlet-api/resin-servlet-api-4.0.46-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Resin Servlet API 3.0/JSP API 2.1 implementation"
+HOMEPAGE="https://caucho.com";
+SRC_URI="https://caucho.com/download/resin-${PV}-src.tar.gz";
+
+LICENSE="GPL-2"
+SLOT="3.1"
+KEYWORDS="

[gentoo-commits] repo/gentoo:master commit in: dev-java/resin-servlet-api/

2021-05-04 Thread Miroslav Šulc
commit: 9d9b298cd8d5eec809b8eb95ce0cb385b50d3a8c
Author: Volkmar W. Pogatzki  pogatzki  net>
AuthorDate: Mon May  3 17:25:06 2021 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Tue May  4 08:59:47 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d9b298c

dev-java/resin-servlet-api: slot 2.4 min java 1.8

Bug: https://bugs.gentoo.org/786777
Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Volkmar W. Pogatzki  pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/20673
Signed-off-by: Miroslav Šulc  gentoo.org>

 .../resin-servlet-api-3.0.25-r1.ebuild | 40 ++
 1 file changed, 40 insertions(+)

diff --git a/dev-java/resin-servlet-api/resin-servlet-api-3.0.25-r1.ebuild 
b/dev-java/resin-servlet-api/resin-servlet-api-3.0.25-r1.ebuild
new file mode 100644
index 000..aacd2726789
--- /dev/null
+++ b/dev-java/resin-servlet-api/resin-servlet-api-3.0.25-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+JAVA_PKG_IUSE="source"
+
+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+"
+SLOT="2.4"
+KEYWORDS="amd64 ppc64 x86"
+
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
+BDEPEND="app-arch/unzip"
+
+S="${WORKDIR}/resin-${PV}"
+
+EANT_BUILD_TARGET="jsdk"
+EANT_DOC_TARGET=""
+
+PATCHES=(
+   "${WORKDIR}/${PV}/resin-${PV}-build.xml.patch"
+)
+
+src_prepare() {
+   default
+   mkdir lib || die
+}
+
+src_install() {
+   java-pkg_newjar "lib/jsdk-24.jar"
+   use source && java-pkg_dosrc "${S}"/modules/jsdk/src/*
+}



[gentoo-commits] repo/gentoo:master commit in: dev-java/resin-servlet-api/

2021-05-04 Thread Miroslav Šulc
commit: e3ccbf9be9db937dce24820b48c6bb87cc22ae29
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Tue May  4 09:00:58 2021 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Tue May  4 09:00:58 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3ccbf9b

dev-java/resin-servlet-api: dropped obsolete 3.0.25

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Miroslav Šulc  gentoo.org>

 .../resin-servlet-api-3.0.25.ebuild| 39 --
 1 file changed, 39 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
deleted file mode 100644
index 9f617611636..000
--- a/dev-java/resin-servlet-api/resin-servlet-api-3.0.25.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="source"
-
-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+"
-SLOT="2.4"
-KEYWORDS="amd64 ppc64 x86"
-IUSE=""
-
-RDEPEND=">=virtual/jre-1.4:*"
-DEPEND=">=virtual/jdk-1.4
-   app-arch/unzip"
-
-S="${WORKDIR}/resin-${PV}"
-
-EANT_BUILD_TARGET="jsdk"
-EANT_DOC_TARGET=""
-
-src_prepare() {
-   default
-
-   mkdir lib || die
-   eapply "${WORKDIR}/${PV}/resin-${PV}-build.xml.patch"
-}
-
-src_install() {
-   java-pkg_newjar "lib/jsdk-24.jar"
-   use source && java-pkg_dosrc "${S}"/modules/jsdk/src/*
-}



[gentoo-commits] repo/gentoo:master commit in: dev-java/resin-servlet-api/

2019-11-10 Thread Michał Górny
commit: c95f6be6ebf954d6023a9b8676b4260b775b18b0
Author: Michał Górny  gentoo  org>
AuthorDate: Sun Nov 10 13:09:28 2019 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sun Nov 10 13:12:01 2019 +
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  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/*
-
 }



[gentoo-commits] repo/gentoo:master commit in: dev-java/resin-servlet-api/

2019-08-14 Thread Andreas K. Hüttel
commit: 5a17a4a572bb4b289c83b4f7af05cdfb85303e27
Author: Andreas K. Hüttel  gentoo  org>
AuthorDate: Wed Aug 14 19:40:34 2019 +
Commit: Andreas K. Hüttel  gentoo  org>
CommitDate: Wed Aug 14 19:40:41 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a17a4a5

dev-java/resin-servlet-api: Remove old, bug 688156

Closes: https://bugs.gentoo.org/688156
Package-Manager: Portage-2.3.70, Repoman-2.3.16
Signed-off-by: Andreas K. Hüttel  gentoo.org>

 dev-java/resin-servlet-api/Manifest|  2 -
 .../resin-servlet-api-3.1.12.ebuild| 47 --
 2 files changed, 49 deletions(-)

diff --git a/dev-java/resin-servlet-api/Manifest 
b/dev-java/resin-servlet-api/Manifest
index 61f97d90124..b62391d7400 100644
--- a/dev-java/resin-servlet-api/Manifest
+++ b/dev-java/resin-servlet-api/Manifest
@@ -1,6 +1,4 @@
 DIST resin-3.0.25-src.zip 10690692 BLAKE2B 
dde17819f958053bfe2e1ac0068db0a56c068185d676dce047769ffcd219036318e0f1adc0fee1757136aa4d5f8c75e112e286cb66d445bd30a283afe2c6ebba
 SHA512 
f80f109b120cfbb484614c733cd10e0e057b7a704a7a00d2a6b83d95876558e4800ecc6d9fe3a3b8ddc32f9d556a51145edc3d08a8625937b8c06f413a335057
-DIST resin-3.1.12-src.zip 13579367 BLAKE2B 
4c5205296f4fd35bbcfd2c0b9a665d83308def83d31df9e919d1823a2bf256f4668fd8b75c05681277e6f3d87a3a5a76c9761ebbd1aad9489b88245a3d0e39b5
 SHA512 
5d348482175962e4e0401437fa69ce3c7569e514ab7b02ef236937686cfb5185b5cef2deef831d510cf458a41d786457041f579d551c9f1f1aab49829015ff6f
 DIST resin-4.0.27-src.zip 17990178 BLAKE2B 
2da8c4bae7328f0a39fc7cc84c2d7a25408a8242150a9b324cc34a15e0342ed709b9e1db8773873d804d59b47f0c62945433d211fe06ded03db1aad39c46a6d6
 SHA512 
ce1d7eb19ab722c2942d82b6ce80ddd193907d6062df361501d28adbbe57e6b7a2effc734e7820bc73d7743b2546799bc6badbcc2187c7da75cab0b9294b8a53
 DIST resin-4.0.46-src.zip 40400255 BLAKE2B 
e31505ba82a8e87ea0b28634b3055c3a01d6629483c2d5ab6af4b428c9cb5d7803b7ed7de58181222bae669412c239458c43be35f23922f3414ce7ac0173ee56
 SHA512 
49f468706a3269f851a6b359d6020b01dadb312890c97208b1a66353fb82b2d95625947a472d8d3e535d0c52ec6ad3e110eb4d227014fe7a89f313ae1df6970f
 DIST resin-gentoo-patches-3.0.25.tar.bz2 4781 BLAKE2B 
df087e05a80442c44969ccd20099ad5ff5d1e6ab92886255cfa262bcce73043f07b01109e84e224dd991c43730d6c0795bf63bde3b8aaa5fa6dbf749dfbb78f5
 SHA512 
23ce290e97f18248e08e0b3b7ccf37f60a4b0bf2c3aa28d856384295a286b3eeb9636e299e0620c2c858f8e523806707fe1d4531070ee7ffb4037ad483e6d035
-DIST resin-gentoo-patches-3.1.12.tar.bz2 1618 BLAKE2B 
672ff977f307d0abe225bdc57bed8778d0855c175532a39f8984dae39aaecb4a708f569179e76d5dbdd47df25f9ca7ae75f7880c8adc85f74a3ab52dc3ecc8fb
 SHA512 
12dfd508765c46a9c9ca782e1b63def2989a3d2e025b3e8a7b15e5b389976aeba898e1659044a737156d953c0eaca9a4a461a9c71dc601aaaeddac8cd5da03ea

diff --git a/dev-java/resin-servlet-api/resin-servlet-api-3.1.12.ebuild 
b/dev-java/resin-servlet-api/resin-servlet-api-3.1.12.ebuild
deleted file mode 100644
index f0f872dfd98..000
--- a/dev-java/resin-servlet-api/resin-servlet-api-3.1.12.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-JAVA_PKG_IUSE="source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Resin Servlet API 2.5/JSP API 2.1 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"
-SLOT="2.5"
-KEYWORDS="amd64 ppc64 x86"
-
-IUSE=""
-
-COMMON_DEP=""
-
-RDEPEND=">=virtual/jre-1.5
-   ${COMMON_DEP}"
-DEPEND=">=virtual/jdk-1.5
-   app-arch/unzip
-   ${COMMON_DEP}"
-
-S="${WORKDIR}/resin-${PV}"
-
-src_prepare() {
-   mkdir -p "${S}/lib"
-   epatch "${WORKDIR}/${PV}/resin-${PV}-build.xml.patch"
-}
-
-EANT_BUILD_TARGET="jsdk"
-EANT_DOC_TARGET=""
-
-src_install() {
-   java-pkg_newjar "lib/jsdk-15.jar"
-   use source && java-pkg_dosrc "${S}"/modules/jsdk/src/*
-
-   dosym "${PN}.jar" "/usr/share/${PN}-${SLOT}/lib/servlet-api.jar"
-   java-pkg_regjar "${D}/usr/share/${PN}-${SLOT}/lib/servlet-api.jar"
-   dosym "${PN}.jar" "/usr/share/${PN}-${SLOT}/lib/jsp-api.jar"
-   java-pkg_regjar "${D}/usr/share/${PN}-${SLOT}/lib/jsp-api.jar"
-}



[gentoo-commits] repo/gentoo:master commit in: dev-java/resin-servlet-api/

2018-04-13 Thread Pacho Ramos
commit: eabb70b2c8d9ce0b65e0127ad529f75c85e7edf1
Author: Pacho Ramos  gentoo  org>
AuthorDate: Fri Apr 13 18:38:23 2018 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Fri Apr 13 19:32:02 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eabb70b2

dev-java/resin-servlet-api: Drop old

Package-Manager: Portage-2.3.28, Repoman-2.3.9

 dev-java/resin-servlet-api/Manifest|  2 -
 .../resin-servlet-api-4.0.26.ebuild| 49 --
 .../resin-servlet-api-4.0.44.ebuild| 47 -
 3 files changed, 98 deletions(-)

diff --git a/dev-java/resin-servlet-api/Manifest 
b/dev-java/resin-servlet-api/Manifest
index 3315739a32e..61f97d90124 100644
--- a/dev-java/resin-servlet-api/Manifest
+++ b/dev-java/resin-servlet-api/Manifest
@@ -1,8 +1,6 @@
 DIST resin-3.0.25-src.zip 10690692 BLAKE2B 
dde17819f958053bfe2e1ac0068db0a56c068185d676dce047769ffcd219036318e0f1adc0fee1757136aa4d5f8c75e112e286cb66d445bd30a283afe2c6ebba
 SHA512 
f80f109b120cfbb484614c733cd10e0e057b7a704a7a00d2a6b83d95876558e4800ecc6d9fe3a3b8ddc32f9d556a51145edc3d08a8625937b8c06f413a335057
 DIST resin-3.1.12-src.zip 13579367 BLAKE2B 
4c5205296f4fd35bbcfd2c0b9a665d83308def83d31df9e919d1823a2bf256f4668fd8b75c05681277e6f3d87a3a5a76c9761ebbd1aad9489b88245a3d0e39b5
 SHA512 
5d348482175962e4e0401437fa69ce3c7569e514ab7b02ef236937686cfb5185b5cef2deef831d510cf458a41d786457041f579d551c9f1f1aab49829015ff6f
-DIST resin-4.0.26-src.zip 17879008 BLAKE2B 
3c8a510fbcbeb1576033841a90ec3e1ffdcae63f4e5b64196e078ce8d1fa6a29aa436ff48f38bb030be8c6d8cd4ca2528b140b10d902d1b8513d6f55a059d63a
 SHA512 
aae0304664c67667b9abf304ccc3dbaf073be42fcd1dd6aa380d841a34a2a44f0187fa91abe6bf92bf66f394b4b2d4eda7c4c9a55b5cb8a76436446cca3d5512
 DIST resin-4.0.27-src.zip 17990178 BLAKE2B 
2da8c4bae7328f0a39fc7cc84c2d7a25408a8242150a9b324cc34a15e0342ed709b9e1db8773873d804d59b47f0c62945433d211fe06ded03db1aad39c46a6d6
 SHA512 
ce1d7eb19ab722c2942d82b6ce80ddd193907d6062df361501d28adbbe57e6b7a2effc734e7820bc73d7743b2546799bc6badbcc2187c7da75cab0b9294b8a53
-DIST resin-4.0.44-src.zip 40342346 BLAKE2B 
3ad80e84bcc18a44d6af3441f042b43d74a98318d4d906883ac6074f33420c7bb02dfd6b264e918865f10e48f36dfeb8e8d9ec18b995cedb6ea2010c13912fab
 SHA512 
bef7cc8e42522396b6041e6b38858f8f2ef92f0a753b7a86e191f62f6060810930765cb834eeb53404e08f8b9b3f2e4c4d3b632cb9b80edf929b4a41bbb3d5f8
 DIST resin-4.0.46-src.zip 40400255 BLAKE2B 
e31505ba82a8e87ea0b28634b3055c3a01d6629483c2d5ab6af4b428c9cb5d7803b7ed7de58181222bae669412c239458c43be35f23922f3414ce7ac0173ee56
 SHA512 
49f468706a3269f851a6b359d6020b01dadb312890c97208b1a66353fb82b2d95625947a472d8d3e535d0c52ec6ad3e110eb4d227014fe7a89f313ae1df6970f
 DIST resin-gentoo-patches-3.0.25.tar.bz2 4781 BLAKE2B 
df087e05a80442c44969ccd20099ad5ff5d1e6ab92886255cfa262bcce73043f07b01109e84e224dd991c43730d6c0795bf63bde3b8aaa5fa6dbf749dfbb78f5
 SHA512 
23ce290e97f18248e08e0b3b7ccf37f60a4b0bf2c3aa28d856384295a286b3eeb9636e299e0620c2c858f8e523806707fe1d4531070ee7ffb4037ad483e6d035
 DIST resin-gentoo-patches-3.1.12.tar.bz2 1618 BLAKE2B 
672ff977f307d0abe225bdc57bed8778d0855c175532a39f8984dae39aaecb4a708f569179e76d5dbdd47df25f9ca7ae75f7880c8adc85f74a3ab52dc3ecc8fb
 SHA512 
12dfd508765c46a9c9ca782e1b63def2989a3d2e025b3e8a7b15e5b389976aeba898e1659044a737156d953c0eaca9a4a461a9c71dc601aaaeddac8cd5da03ea

diff --git a/dev-java/resin-servlet-api/resin-servlet-api-4.0.26.ebuild 
b/dev-java/resin-servlet-api/resin-servlet-api-4.0.26.ebuild
deleted file mode 100644
index e73b7d1f7ec..000
--- a/dev-java/resin-servlet-api/resin-servlet-api-4.0.26.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-JAVA_PKG_IUSE="source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Resin Servlet API 3.0/JSP API 2.1 implementation"
-HOMEPAGE="http://www.caucho.com/";
-SRC_URI="http://www.caucho.com/download/resin-${PV}-src.zip";
-
-LICENSE="GPL-2"
-SLOT="3.0"
-KEYWORDS="amd64 ppc64 x86"
-
-IUSE=""
-
-COMMON_DEP=""
-
-RDEPEND=">=virtual/jre-1.6
-   ${COMMON_DEP}"
-DEPEND=">=virtual/jdk-1.6
-   app-arch/unzip
-   ${COMMON_DEP}"
-
-S="${WORKDIR}/resin-${PV}"
-
-src_unpack() {
-   unpack ${A}
-
-   cd "${S}"
-   rm -f modules/ext/*.jar project-jars/*.jar webapp-jars/*.jar
-   java-ant_bsfix_files build-common.xml || die
-}
-
-EANT_BUILD_TARGET="servlet16"
-EANT_DOC_TARGET=""
-
-src_install() {
-   java-pkg_newjar "modules/servlet16/dist/servlet-16.jar"
-   use source && java-pkg_dosrc "${S}"/modules/servlet16/src/*
-
-   dosym "${PN}.jar" "/usr/share/${PN}-${SLOT}/lib/servlet-api.jar"
-   java-pkg_regjar "${D}/usr/share/${PN}-${SLOT}/lib/servlet-api.jar"
-   dosym "${PN}.jar" "/usr/share/${PN}-${SLOT}/lib/jsp-api.jar"
-   java-pkg_regjar "${D}/usr/share/${PN}-${SLOT}/lib/jsp-api.jar"
-}

diff --git a/dev-java/resin-servlet-api/resin-servlet-api-4.0.44.ebuil

[gentoo-commits] repo/gentoo:master commit in: dev-java/resin-servlet-api/

2018-04-12 Thread Thomas Deutschmann
commit: 0ee647fc5ebd7909ceb14784517030eaa1a89685
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Thu Apr 12 20:47:50 2018 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Thu Apr 12 20:53:54 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ee647fc

dev-java/resin-servlet-api: x86 stable (bug #648222)

Package-Manager: Portage-2.3.28, Repoman-2.3.9

 dev-java/resin-servlet-api/resin-servlet-api-4.0.27.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/resin-servlet-api/resin-servlet-api-4.0.27.ebuild 
b/dev-java/resin-servlet-api/resin-servlet-api-4.0.27.ebuild
index 0f94a41e68c..62503ad641b 100644
--- a/dev-java/resin-servlet-api/resin-servlet-api-4.0.27.ebuild
+++ b/dev-java/resin-servlet-api/resin-servlet-api-4.0.27.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://www.caucho.com/download/resin-${PV}-src.zip";
 
 LICENSE="GPL-2"
 SLOT="3.0"
-KEYWORDS="amd64 ppc64 ~x86"
+KEYWORDS="amd64 ppc64 x86"
 
 IUSE=""
 



[gentoo-commits] repo/gentoo:master commit in: dev-java/resin-servlet-api/

2018-04-03 Thread Sergei Trofimovich
commit: af1c4ab68e2cb7935064bc079b5fcbe48d934f1b
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Wed Apr  4 06:36:17 2018 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Wed Apr  4 06:36:17 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af1c4ab6

dev-java/resin-servlet-api: stable 4.0.27 for ppc64, bug #648222

Package-Manager: Portage-2.3.28, Repoman-2.3.9
RepoMan-Options: --include-arches="ppc64"

 dev-java/resin-servlet-api/resin-servlet-api-4.0.27.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/resin-servlet-api/resin-servlet-api-4.0.27.ebuild 
b/dev-java/resin-servlet-api/resin-servlet-api-4.0.27.ebuild
index a7a03ce548d..0f94a41e68c 100644
--- a/dev-java/resin-servlet-api/resin-servlet-api-4.0.27.ebuild
+++ b/dev-java/resin-servlet-api/resin-servlet-api-4.0.27.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://www.caucho.com/download/resin-${PV}-src.zip";
 
 LICENSE="GPL-2"
 SLOT="3.0"
-KEYWORDS="amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ppc64 ~x86"
 
 IUSE=""
 



[gentoo-commits] repo/gentoo:master commit in: dev-java/resin-servlet-api/

2015-11-07 Thread Patrice Clement
commit: 66817f606f7f38f61c77f308773c6a8b77d08ad5
Author: Patrice Clement  gentoo  org>
AuthorDate: Sat Nov  7 20:50:38 2015 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Sat Nov  7 20:58:20 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66817f60

dev-java/resin-servlet-api: Version bump. Fixes bug 564528.

Package-Manager: portage-2.2.20.1
Signed-off-by: Patrice Clement  gentoo.org>

 dev-java/resin-servlet-api/Manifest|  1 +
 .../resin-servlet-api-4.0.46.ebuild| 48 ++
 2 files changed, 49 insertions(+)

diff --git a/dev-java/resin-servlet-api/Manifest 
b/dev-java/resin-servlet-api/Manifest
index 3dbbf64..cc3b916 100644
--- a/dev-java/resin-servlet-api/Manifest
+++ b/dev-java/resin-servlet-api/Manifest
@@ -3,5 +3,6 @@ DIST resin-3.1.12-src.zip 13579367 SHA256 
b2e5b3573a369944c243ebc1b6c6439a681d52
 DIST resin-4.0.26-src.zip 17879008 SHA256 
0f7bbea8bd4803d499e1d212a49ac8672500ede80194c4daa12c980ad405e34e SHA512 
aae0304664c67667b9abf304ccc3dbaf073be42fcd1dd6aa380d841a34a2a44f0187fa91abe6bf92bf66f394b4b2d4eda7c4c9a55b5cb8a76436446cca3d5512
 WHIRLPOOL 
a536b28cad14219ce5c8aaa791a859d21539176b6f729072483e6278fa9b45de2bb367d6696225c1bafe0148c86c3bb0e46ec81595222160aa742ffdf9d5674c
 DIST resin-4.0.27-src.zip 17990178 SHA256 
33f5bd76b88a1009de108cef40a522186b5a3f250de7e9856fe50a7715344665 SHA512 
ce1d7eb19ab722c2942d82b6ce80ddd193907d6062df361501d28adbbe57e6b7a2effc734e7820bc73d7743b2546799bc6badbcc2187c7da75cab0b9294b8a53
 WHIRLPOOL 
6ef3ea21bacf7409676d4114cebe0466aa613ca71d54612197573e899891762ada1fd14510458b3407d56ef6f61539ee99db5bf239e2b88e9a3ab033568942aa
 DIST resin-4.0.44-src.zip 40342346 SHA256 
dc2900e03d5a328ad4801df4ea2413f5d96bc1408301fa0f74545b3061c4ddfd SHA512 
bef7cc8e42522396b6041e6b38858f8f2ef92f0a753b7a86e191f62f6060810930765cb834eeb53404e08f8b9b3f2e4c4d3b632cb9b80edf929b4a41bbb3d5f8
 WHIRLPOOL 
bec0fa955dc2c6f1b04b18eb9f68424ba05814f25b690018fdb6fbe9c424730c9f19cfcec3f93f0ff1b6ce2e998d22a435788bcd52370b7c9653ef17a4cc75fa
+DIST resin-4.0.46-src.zip 40400255 SHA256 
e762506c432dc12f5100903993220b7ace6ff98ce1ed2c17a53737d04f47ebcf SHA512 
49f468706a3269f851a6b359d6020b01dadb312890c97208b1a66353fb82b2d95625947a472d8d3e535d0c52ec6ad3e110eb4d227014fe7a89f313ae1df6970f
 WHIRLPOOL 
a3d12e09e2596a1e705d4cd1b1870e411080ca6371411574e7830d48ec0058463944fded005e94fc929a0635403cba27d78fc379bf1f222b0e953828ae280238
 DIST resin-gentoo-patches-3.0.25.tar.bz2 4781 SHA256 
6f47dddc3c29ad1465efdb8c912d1625cf769f5f8dc45dd6b0782655ba5c97cd SHA512 
23ce290e97f18248e08e0b3b7ccf37f60a4b0bf2c3aa28d856384295a286b3eeb9636e299e0620c2c858f8e523806707fe1d4531070ee7ffb4037ad483e6d035
 WHIRLPOOL 
ea9eb10d1359d898021a781bdf947811d3500092a3489759202251713b776b5c2c20bfde112be5a108358cb470f0c3aa4cc2a4d54695c406fc2b3c3d18ad7a54
 DIST resin-gentoo-patches-3.1.12.tar.bz2 1618 SHA256 
de44915936848374adb975ca3f0dca3560d75c64b385b451e95e6813a3405ffd SHA512 
12dfd508765c46a9c9ca782e1b63def2989a3d2e025b3e8a7b15e5b389976aeba898e1659044a737156d953c0eaca9a4a461a9c71dc601aaaeddac8cd5da03ea
 WHIRLPOOL 
43785f6d225f74626c6a769e4eedf0873aa794f02780defbe0815d1934646d6f849302ab829a81cf4babad0acad2f7fc4458f1d80ba0c3fbdd9292a0f90b

diff --git a/dev-java/resin-servlet-api/resin-servlet-api-4.0.46.ebuild 
b/dev-java/resin-servlet-api/resin-servlet-api-4.0.46.ebuild
new file mode 100644
index 000..ad72b6b
--- /dev/null
+++ b/dev-java/resin-servlet-api/resin-servlet-api-4.0.46.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+JAVA_PKG_IUSE="source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Resin Servlet API 3.0/JSP API 2.1 implementation"
+HOMEPAGE="http://www.caucho.com/";
+SRC_URI="http://www.caucho.com/download/resin-${PV}-src.zip";
+
+LICENSE="GPL-2"
+SLOT="3.1"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+
+IUSE=""
+
+COMMON_DEP=""
+
+RDEPEND=">=virtual/jre-1.6
+   ${COMMON_DEP}"
+DEPEND=">=virtual/jdk-1.6
+   app-arch/unzip
+   ${COMMON_DEP}"
+
+S="${WORKDIR}/resin-${PV}"
+
+java_prepare() {
+   cd "${S}"
+   rm -f modules/ext/*.jar project-jars/*.jar webapp-jars/*.jar
+   java-ant_bsfix_files build-common.xml || die
+}
+
+EANT_BUILD_TARGET="servlet16"
+EANT_DOC_TARGET=""
+
+src_install() {
+   java-pkg_newjar "modules/servlet16/dist/servlet-16.jar"
+   use source && java-pkg_dosrc "${S}"/modules/servlet16/src/*
+
+   dosym "${PN}.jar" "/usr/share/${PN}-${SLOT}/lib/servlet-api.jar"
+   java-pkg_regjar "${D}/usr/share/${PN}-${SLOT}/lib/servlet-api.jar"
+   dosym "${PN}.jar" "/usr/share/${PN}-${SLOT}/lib/jsp-api.jar"
+   java-pkg_regjar "${D}/usr/share/${PN}-${SLOT}/lib/jsp-api.jar"
+}



[gentoo-commits] repo/gentoo:master commit in: dev-java/resin-servlet-api/

2015-09-26 Thread James Le Cuirot
commit: a67c57f16898c5e8dd14e40e4db52fb5346b70d4
Author: James Le Cuirot  gentoo  org>
AuthorDate: Sat Sep 26 15:02:39 2015 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sat Sep 26 15:02:39 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a67c57f1

dev-java/resin-servlet-api: Remove old

Package-Manager: portage-2.2.20.1

 dev-java/resin-servlet-api/Manifest|  9 
 .../resin-servlet-api-3.1.10.ebuild| 48 -
 .../resin-servlet-api-3.1.11.ebuild| 48 -
 .../resin-servlet-api-4.0.13.ebuild| 50 --
 .../resin-servlet-api-4.0.14.ebuild| 50 --
 .../resin-servlet-api-4.0.15.ebuild| 50 --
 .../resin-servlet-api-4.0.22.ebuild| 50 --
 .../resin-servlet-api-4.0.25.ebuild| 50 --
 8 files changed, 355 deletions(-)

diff --git a/dev-java/resin-servlet-api/Manifest 
b/dev-java/resin-servlet-api/Manifest
index c314434..3dbbf64 100644
--- a/dev-java/resin-servlet-api/Manifest
+++ b/dev-java/resin-servlet-api/Manifest
@@ -1,16 +1,7 @@
 DIST resin-3.0.25-src.zip 10690692 SHA256 
ed1e8ce03ea2c5454980bb5353f625d12bdd0713653dd845ac6b00cb239c1cdc SHA512 
f80f109b120cfbb484614c733cd10e0e057b7a704a7a00d2a6b83d95876558e4800ecc6d9fe3a3b8ddc32f9d556a51145edc3d08a8625937b8c06f413a335057
 WHIRLPOOL 
a05b431e3fc5c0cf2309681689e4a228b6234254898aec0927e7fd2ecb46ff149166b8097d3878877e08b2937f70e82d1aabc70143d2b4c45f2abc640a47a4ba
-DIST resin-3.1.10-src.zip 13518055 SHA256 
44113af9b9063459f6edf6892e57a35110f42b324dada24bac3c7d1b4a6dec0f SHA512 
2f4df6778f58b48fd366005425e9e67b4d2ff915a97c0ba58e00670bc630fe35ccdd219c740e4d6b25bedec1e9b9121d2eb71c459a8111238dd87965e3c11971
 WHIRLPOOL 
eb09b198d7e71894badf2d23d3be04b349271e82c25b560058e5240a1bffb13ceba3bf84c3f2d6513a9e5b4df0f44f026c744370c2b4e8f65d4ba09b256b99c3
-DIST resin-3.1.11-src.zip 13518605 SHA256 
e7a31468675e424016aa24efb5b80dc5be1d88129fae2390ac424c2ebd789515 SHA512 
ee7668a39f6caeaab0851a440289a97b69cbaba5f873a6fe837b869368455067d2cc36d6dc01c1fddfb31dca714cbef6800049e498a8479808df14b34003491f
 WHIRLPOOL 
6053a03ae3b0f33f46e8b98a5d15cc82924feaaa77c929520fd847d14d6418771239dae8e62dc6c09d72447013059d250a4b34d27d2f1c0556e201b5ba0fbc7e
 DIST resin-3.1.12-src.zip 13579367 SHA256 
b2e5b3573a369944c243ebc1b6c6439a681d52efb9416af1177a263234fbea95 SHA512 
5d348482175962e4e0401437fa69ce3c7569e514ab7b02ef236937686cfb5185b5cef2deef831d510cf458a41d786457041f579d551c9f1f1aab49829015ff6f
 WHIRLPOOL 
e8210528c025bfe7a75279cea4e346a3b948c121d763fe6ef0e6c5cd90b2b476957abe2616bb79687987c0afa4016178d3bcf5e2e910ffab4736399288fda13c
-DIST resin-4.0.13-src.zip 17439983 SHA256 
2dd13eab5a23383e180ff018aa7c6318c094369359ea313fcf698ba1fa412b6e SHA512 
011751ac332b5ef9bfd398d5c72f04978d6d1e97cdddcdad9b16dc664b98f5d8b68811edd1a6cd81cc432d040ddbf8415cd1290b7c9808f924305a1a4c31d797
 WHIRLPOOL 
0d0b7d7e94d0645e0303064858932cf747e77be19c94388332b135f419dcb99bc8b1184445ab182ce4979fec55e8b5be1072fda04dc1fb47cd0ca2c3d7410463
-DIST resin-4.0.14-src.zip 17542066 SHA256 
6a0b1bed5240609672041529a1b6b926f45356f47114ce4db0df1262a0b98fa5 SHA512 
a5eea8bcce202b137f8388e00953910e6de8c261106bbce298f7c9fe132f7854e0a01132dfa29e3ab5e2a0ee920471eaaecb7a456f9d9adf83aea4e883d1472b
 WHIRLPOOL 
3b36720e85d781c45530169778325f8f28c8c988226890138b341f969987f7f5ec1f59cbf25463eebf5ed910959e4753f4eb84a4ca7811efb09b82f802c77e9f
-DIST resin-4.0.15-src.zip 17560013 SHA256 
e9dcedcc4de44d738571d0bbb2cce747aaeff517ae571ab6e46f74fa969d4f39 SHA512 
9e44cda4d8192b38a6364d4e3e013b9de66947eff590d19ed9182b50efebc75222bf71aaec7d15bcc1efaaa6166161ca5a1101414845abf86862a28af7d019a0
 WHIRLPOOL 
6d578627d748e104a35e57666064652a21025d1059ea3f62891487b193be24315c7c57729ea850503fcf32de159199c48fa4f7d559d6169d00691f3d9d5c40b8
-DIST resin-4.0.22-src.zip 17540820 SHA256 
5b79a28e82849f97fc6bbf670306e29c19159b061b370f7eabc483f56a54053a SHA512 
f9ddffa0ab0151041881464edfe9579ed9391da87cf79b18122a28d2dc656d05aa6140430bc3c9a0d79e562ce7b324011d9c933541cc1430a291ec72e55ee799
 WHIRLPOOL 
458df4fb3463d291940b1282eb23141eb46b465009d9e3fa42b8af43a7c846552ddc3ff75b4ab99557e0c53a4937508f7f37f20f837d7f5684796776ad686d9d
-DIST resin-4.0.25-src.zip 17971688 SHA256 
e30ace9c2c9ececb1769402ea7a6cd2fe8ea73f9f38009da1b4d2ba23ab6972a SHA512 
c978148674e00101f24702f2ffe4b3220bfd82cad35b0263296efda0b001cdceaa5f18ae170a589aec763627d6cf39ff2ccdd5e195b65c90d04416939bb442d9
 WHIRLPOOL 
843dc74888f63f96b9ea8526afc88846d55c58a54b4233140984cfe7a0ba365a04b230ef8047caef7e27a413d8e775a15f6fa649c3d8e3a19cc0058abb50f58a
 DIST resin-4.0.26-src.zip 17879008 SHA256 
0f7bbea8bd4803d499e1d212a49ac8672500ede80194c4daa12c980ad405e34e SHA512 
aae0304664c67667b9abf304ccc3dbaf073be42fcd1dd6aa380d841a34a2a44f0187fa91abe6bf92bf66f394b4b2d4eda7c4c9a55b5cb8a76436446cca3d5512
 WHIRLPOOL 
a536b28cad

[gentoo-commits] repo/gentoo:master commit in: dev-java/resin-servlet-api/

2015-09-26 Thread Patrice Clement
commit: 944193a88e918af69e0c75fceff97415ecd47e12
Author: William L. Thomson Jr  o-sinc  com>
AuthorDate: Sat Sep 26 01:12:03 2015 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Sat Sep 26 01:12:03 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=944193a8

dev-java/resin-servlet-api: Bumped to latest version, just a copy of 4.0.27 
with slot change to 3.1, tested compile and installs

 dev-java/resin-servlet-api/Manifest|  1 +
 .../resin-servlet-api-4.0.44.ebuild| 48 ++
 2 files changed, 49 insertions(+)

diff --git a/dev-java/resin-servlet-api/Manifest 
b/dev-java/resin-servlet-api/Manifest
index c26d826..c314434 100644
--- a/dev-java/resin-servlet-api/Manifest
+++ b/dev-java/resin-servlet-api/Manifest
@@ -9,6 +9,7 @@ DIST resin-4.0.22-src.zip 17540820 SHA256 
5b79a28e82849f97fc6bbf670306e29c19159b
 DIST resin-4.0.25-src.zip 17971688 SHA256 
e30ace9c2c9ececb1769402ea7a6cd2fe8ea73f9f38009da1b4d2ba23ab6972a SHA512 
c978148674e00101f24702f2ffe4b3220bfd82cad35b0263296efda0b001cdceaa5f18ae170a589aec763627d6cf39ff2ccdd5e195b65c90d04416939bb442d9
 WHIRLPOOL 
843dc74888f63f96b9ea8526afc88846d55c58a54b4233140984cfe7a0ba365a04b230ef8047caef7e27a413d8e775a15f6fa649c3d8e3a19cc0058abb50f58a
 DIST resin-4.0.26-src.zip 17879008 SHA256 
0f7bbea8bd4803d499e1d212a49ac8672500ede80194c4daa12c980ad405e34e SHA512 
aae0304664c67667b9abf304ccc3dbaf073be42fcd1dd6aa380d841a34a2a44f0187fa91abe6bf92bf66f394b4b2d4eda7c4c9a55b5cb8a76436446cca3d5512
 WHIRLPOOL 
a536b28cad14219ce5c8aaa791a859d21539176b6f729072483e6278fa9b45de2bb367d6696225c1bafe0148c86c3bb0e46ec81595222160aa742ffdf9d5674c
 DIST resin-4.0.27-src.zip 17990178 SHA256 
33f5bd76b88a1009de108cef40a522186b5a3f250de7e9856fe50a7715344665 SHA512 
ce1d7eb19ab722c2942d82b6ce80ddd193907d6062df361501d28adbbe57e6b7a2effc734e7820bc73d7743b2546799bc6badbcc2187c7da75cab0b9294b8a53
 WHIRLPOOL 
6ef3ea21bacf7409676d4114cebe0466aa613ca71d54612197573e899891762ada1fd14510458b3407d56ef6f61539ee99db5bf239e2b88e9a3ab033568942aa
+DIST resin-4.0.44-src.zip 40342346 SHA256 
dc2900e03d5a328ad4801df4ea2413f5d96bc1408301fa0f74545b3061c4ddfd SHA512 
bef7cc8e42522396b6041e6b38858f8f2ef92f0a753b7a86e191f62f6060810930765cb834eeb53404e08f8b9b3f2e4c4d3b632cb9b80edf929b4a41bbb3d5f8
 WHIRLPOOL 
bec0fa955dc2c6f1b04b18eb9f68424ba05814f25b690018fdb6fbe9c424730c9f19cfcec3f93f0ff1b6ce2e998d22a435788bcd52370b7c9653ef17a4cc75fa
 DIST resin-gentoo-patches-3.0.25.tar.bz2 4781 SHA256 
6f47dddc3c29ad1465efdb8c912d1625cf769f5f8dc45dd6b0782655ba5c97cd SHA512 
23ce290e97f18248e08e0b3b7ccf37f60a4b0bf2c3aa28d856384295a286b3eeb9636e299e0620c2c858f8e523806707fe1d4531070ee7ffb4037ad483e6d035
 WHIRLPOOL 
ea9eb10d1359d898021a781bdf947811d3500092a3489759202251713b776b5c2c20bfde112be5a108358cb470f0c3aa4cc2a4d54695c406fc2b3c3d18ad7a54
 DIST resin-gentoo-patches-3.1.10.tar.bz2 1626 SHA256 
c1cd5b5631e534d670173c465436822980e9df6b9bcfd15f7a25efa09b8faedf SHA512 
edd1a115169c7fb2a1cf39a8c5f5dc2325a401ae8ac5a1788813b9ba13aff5e974d296120818310e23e5c0dc205ac2785050dd9c5d7961279b6ffc146342b6bf
 WHIRLPOOL 
ee321a16df5fdfc4eb5e4fe1afac660734da77796d6ea13f0d84a00171ca3579436d4f5aa84a6c6b9c242d4c245552b3ffd212cedeb264f518f575dcb517ae6d
 DIST resin-gentoo-patches-3.1.11.tar.bz2 1625 SHA256 
a071d2d1af5e9eae56c80035c4efef02d546e0d007c3a2d7cd6a529152df9484 SHA512 
5b7b4e1e4ff25bbda2a968d808cd868d8ec19f0d12344039d21a85c4e9b76538b22e998e1390cd83660e878b2e5a7bac8b879a9a540a8f4dc29a49b83ed8987b
 WHIRLPOOL 
728512044037d11ac5a7e3e3b86409fa61ca44c6936272df66de45ca4961ac475d8f97f4b4410c7318597f50748fac820961d9b5b29c3e19ffe6f5755f9a53bc

diff --git a/dev-java/resin-servlet-api/resin-servlet-api-4.0.44.ebuild 
b/dev-java/resin-servlet-api/resin-servlet-api-4.0.44.ebuild
new file mode 100644
index 000..ad72b6b
--- /dev/null
+++ b/dev-java/resin-servlet-api/resin-servlet-api-4.0.44.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+JAVA_PKG_IUSE="source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Resin Servlet API 3.0/JSP API 2.1 implementation"
+HOMEPAGE="http://www.caucho.com/";
+SRC_URI="http://www.caucho.com/download/resin-${PV}-src.zip";
+
+LICENSE="GPL-2"
+SLOT="3.1"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+
+IUSE=""
+
+COMMON_DEP=""
+
+RDEPEND=">=virtual/jre-1.6
+   ${COMMON_DEP}"
+DEPEND=">=virtual/jdk-1.6
+   app-arch/unzip
+   ${COMMON_DEP}"
+
+S="${WORKDIR}/resin-${PV}"
+
+java_prepare() {
+   cd "${S}"
+   rm -f modules/ext/*.jar project-jars/*.jar webapp-jars/*.jar
+   java-ant_bsfix_files build-common.xml || die
+}
+
+EANT_BUILD_TARGET="servlet16"
+EANT_DOC_TARGET=""
+
+src_install() {
+   java-pkg_newjar "modules/servlet16/dist/servlet-16.jar"
+   use source && java-pkg_dosrc "${S}"/modules/servlet16/src/*
+
+   dosym "${PN}.jar" "/usr/share/${PN}-${SLOT}/lib/servlet-api.jar"
+   java-pkg