* [gentoo-commits] repo/gentoo:master commit in: dev-java/tomcat-jstl-impl/
@ 2015-09-05 14:58 Agostino Sarubbo
0 siblings, 0 replies; 6+ messages in thread
From: Agostino Sarubbo @ 2015-09-05 14:58 UTC (permalink / raw
To: gentoo-commits
commit: e79604077d02a6b12a448d5c66bfdd837e10d6b7
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 5 14:57:47 2015 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Sat Sep 5 14:57:47 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e7960407
dev-java/tomcat-jstl-impl: amd64 stable wrt bug #501280
Package-Manager: portage-2.2.20.1
RepoMan-Options: --include-arches="amd64"
dev-java/tomcat-jstl-impl/tomcat-jstl-impl-1.2.5.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/tomcat-jstl-impl/tomcat-jstl-impl-1.2.5.ebuild b/dev-java/tomcat-jstl-impl/tomcat-jstl-impl-1.2.5.ebuild
index 6ac3400..fc288a3 100644
--- a/dev-java/tomcat-jstl-impl/tomcat-jstl-impl-1.2.5.ebuild
+++ b/dev-java/tomcat-jstl-impl/tomcat-jstl-impl-1.2.5.ebuild
@@ -17,7 +17,7 @@ SRC_URI="http://apache.mirrors.ovh.net/ftp.apache.org/dist/tomcat/taglibs/${MY_P
LICENSE="Apache-2.0"
SLOT="1.2.5"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
IUSE="test"
CDEPEND="dev-java/xalan:0
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/tomcat-jstl-impl/
@ 2015-09-05 14:59 Agostino Sarubbo
0 siblings, 0 replies; 6+ messages in thread
From: Agostino Sarubbo @ 2015-09-05 14:59 UTC (permalink / raw
To: gentoo-commits
commit: f603cb9466ddf5bf086a860da3288bd7a306b9f9
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 5 14:58:48 2015 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Sat Sep 5 14:58:48 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f603cb94
dev-java/tomcat-jstl-impl: x86 stable wrt bug #501280
Package-Manager: portage-2.2.20.1
RepoMan-Options: --include-arches="x86"
dev-java/tomcat-jstl-impl/tomcat-jstl-impl-1.2.5.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/tomcat-jstl-impl/tomcat-jstl-impl-1.2.5.ebuild b/dev-java/tomcat-jstl-impl/tomcat-jstl-impl-1.2.5.ebuild
index fc288a3..695b680 100644
--- a/dev-java/tomcat-jstl-impl/tomcat-jstl-impl-1.2.5.ebuild
+++ b/dev-java/tomcat-jstl-impl/tomcat-jstl-impl-1.2.5.ebuild
@@ -17,7 +17,7 @@ SRC_URI="http://apache.mirrors.ovh.net/ftp.apache.org/dist/tomcat/taglibs/${MY_P
LICENSE="Apache-2.0"
SLOT="1.2.5"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="test"
CDEPEND="dev-java/xalan:0
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/tomcat-jstl-impl/
@ 2015-10-13 19:09 Patrice Clement
0 siblings, 0 replies; 6+ messages in thread
From: Patrice Clement @ 2015-10-13 19:09 UTC (permalink / raw
To: gentoo-commits
commit: b207151ba104795c5451c7f09446fd3898d08199
Author: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 13 14:01:01 2015 +0000
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Tue Oct 13 14:01:01 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b207151b
dev-java/tomcat-jstl-impl: Change SLOT to 0.
Package-Manager: portage-2.2.20.1
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>
.../tomcat-jstl-impl-1.2.5-r1.ebuild | 73 ++++++++++++++++++++++
1 file changed, 73 insertions(+)
diff --git a/dev-java/tomcat-jstl-impl/tomcat-jstl-impl-1.2.5-r1.ebuild b/dev-java/tomcat-jstl-impl/tomcat-jstl-impl-1.2.5-r1.ebuild
new file mode 100644
index 0000000..9da9e6d
--- /dev/null
+++ b/dev-java/tomcat-jstl-impl/tomcat-jstl-impl-1.2.5-r1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+MY_PN="taglibs-standard"
+MY_P="${MY_PN}-${PV}"
+MY_IMPL="${MY_PN}-impl"
+
+DESCRIPTION="JSP Standard Tag Library (JSTL) - Implementation jar"
+HOMEPAGE="https://tomcat.apache.org/taglibs/standard/"
+SRC_URI="http://apache.mirrors.ovh.net/ftp.apache.org/dist/tomcat/taglibs/${MY_P}/${MY_P}-source-release.zip"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+CDEPEND="dev-java/xalan:0
+ dev-java/tomcat-jstl-spec:0
+ dev-java/tomcat-servlet-api:3.1"
+RDEPEND=">=virtual/jre-1.6
+ ${CDEPEND}"
+DEPEND=">=virtual/jdk-1.6
+ test? (
+ dev-java/ant-junit:0
+ dev-java/easymock:3.2
+ )
+ ${CDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+EANT_GENTOO_CLASSPATH="tomcat-servlet-api-3.1,tomcat-jstl-spec,xalan"
+EANT_BUILD_TARGET="package"
+EANT_BUILD_XML="impl/build.xml"
+
+java_prepare() {
+ cp "${FILESDIR}"/${P}-build.xml "${S}"/impl/build.xml
+
+ # This patch overrides a couple of methods.
+ epatch "${FILESDIR}"/${P}-ImportSupport.patch
+
+ # This one disables one test case which doesn't work.
+ epatch "${FILESDIR}"/${P}-SetSupport.patch
+
+ # This test case doesn't pass.
+ rm -v \
+ impl/src/test/java/org/apache/taglibs/standard/tag/common/fmt/BundleSupportTest.java
+}
+
+EANT_TEST_TARGET="test"
+EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},easymock-3.2"
+
+src_test() {
+ java-pkg-2_src_test
+}
+
+src_install() {
+ java-pkg_newjar "${S}"/impl/target/${MY_IMPL}-${PV}.jar ${MY_IMPL}.jar
+
+ if use doc; then
+ java-pkg_dohtml -r "${S}"/impl/target/site/apidocs/
+ fi
+
+ if use source; then
+ java-pkg_dosrc "${S}"/impl/src/*
+ fi
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/tomcat-jstl-impl/
@ 2015-10-13 19:09 Patrice Clement
0 siblings, 0 replies; 6+ messages in thread
From: Patrice Clement @ 2015-10-13 19:09 UTC (permalink / raw
To: gentoo-commits
commit: 3a63fe1fb033bbbcc39921bc94bc486f55aa731a
Author: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 13 14:24:45 2015 +0000
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Tue Oct 13 14:24:45 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a63fe1f
dev-java/tomcat-jstl-impl: Stable for amd64. Stable for x86 using the ALLARCHES policy.
Package-Manager: portage-2.2.20.1
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>
dev-java/tomcat-jstl-impl/tomcat-jstl-impl-1.2.5-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/tomcat-jstl-impl/tomcat-jstl-impl-1.2.5-r1.ebuild b/dev-java/tomcat-jstl-impl/tomcat-jstl-impl-1.2.5-r1.ebuild
index 9da9e6d..065b69e 100644
--- a/dev-java/tomcat-jstl-impl/tomcat-jstl-impl-1.2.5-r1.ebuild
+++ b/dev-java/tomcat-jstl-impl/tomcat-jstl-impl-1.2.5-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="http://apache.mirrors.ovh.net/ftp.apache.org/dist/tomcat/taglibs/${MY_P
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="test"
CDEPEND="dev-java/xalan:0
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/tomcat-jstl-impl/
@ 2015-10-13 19:09 Patrice Clement
0 siblings, 0 replies; 6+ messages in thread
From: Patrice Clement @ 2015-10-13 19:09 UTC (permalink / raw
To: gentoo-commits
commit: b1967e9244b3ded3930d520b0b4c5506e45e7bac
Author: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 13 14:26:04 2015 +0000
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Tue Oct 13 14:26:04 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1967e92
dev-java/tomcat-jstl-impl: Clean up old.
Package-Manager: portage-2.2.20.1
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>
.../tomcat-jstl-impl/tomcat-jstl-impl-1.2.5.ebuild | 73 ----------------------
1 file changed, 73 deletions(-)
diff --git a/dev-java/tomcat-jstl-impl/tomcat-jstl-impl-1.2.5.ebuild b/dev-java/tomcat-jstl-impl/tomcat-jstl-impl-1.2.5.ebuild
deleted file mode 100644
index 695b680..0000000
--- a/dev-java/tomcat-jstl-impl/tomcat-jstl-impl-1.2.5.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2 eutils
-
-MY_PN="taglibs-standard"
-MY_P="${MY_PN}-${PV}"
-MY_IMPL="${MY_PN}-impl"
-
-DESCRIPTION="JSP Standard Tag Library (JSTL) - Implementation jar"
-HOMEPAGE="https://tomcat.apache.org/taglibs/standard/"
-SRC_URI="http://apache.mirrors.ovh.net/ftp.apache.org/dist/tomcat/taglibs/${MY_P}/${MY_P}-source-release.zip"
-
-LICENSE="Apache-2.0"
-SLOT="1.2.5"
-KEYWORDS="amd64 x86"
-IUSE="test"
-
-CDEPEND="dev-java/xalan:0
- dev-java/tomcat-jstl-spec:1.2.5
- dev-java/tomcat-servlet-api:3.1"
-RDEPEND=">=virtual/jre-1.6
- ${CDEPEND}"
-DEPEND=">=virtual/jdk-1.6
- test? (
- dev-java/ant-junit:0
- dev-java/easymock:3.2
- )
- ${CDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-EANT_GENTOO_CLASSPATH="tomcat-servlet-api-3.1,tomcat-jstl-spec-1.2.5,xalan"
-EANT_BUILD_TARGET="package"
-EANT_BUILD_XML="impl/build.xml"
-
-java_prepare() {
- cp "${FILESDIR}"/${P}-build.xml "${S}"/impl/build.xml
-
- # This patch overrides a couple of methods.
- epatch "${FILESDIR}"/${P}-ImportSupport.patch
-
- # This one disables one test case which doesn't work.
- epatch "${FILESDIR}"/${P}-SetSupport.patch
-
- # This test case doesn't pass.
- rm -v \
- impl/src/test/java/org/apache/taglibs/standard/tag/common/fmt/BundleSupportTest.java
-}
-
-EANT_TEST_TARGET="test"
-EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},easymock-3.2"
-
-src_test() {
- java-pkg-2_src_test
-}
-
-src_install() {
- java-pkg_newjar "${S}"/impl/target/${MY_IMPL}-${PV}.jar ${MY_IMPL}.jar
-
- if use doc; then
- java-pkg_dohtml -r "${S}"/impl/target/site/apidocs/
- fi
-
- if use source; then
- java-pkg_dosrc "${S}"/impl/src/*
- fi
-}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/tomcat-jstl-impl/
@ 2016-02-20 11:13 Patrice Clement
0 siblings, 0 replies; 6+ messages in thread
From: Patrice Clement @ 2016-02-20 11:13 UTC (permalink / raw
To: gentoo-commits
commit: a1ddf16a66660cd7946def0d9aac93c12f85cdf7
Author: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 20 11:02:47 2016 +0000
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Sat Feb 20 11:11:09 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1ddf16a
dev-java/tomcat-jstl-impl: Housekeeping. Add missing die.
Package-Manager: portage-2.2.26
dev-java/tomcat-jstl-impl/Manifest | 2 +-
.../tomcat-jstl-impl-1.2.5-r1.ebuild | 38 +++++++++++++---------
2 files changed, 24 insertions(+), 16 deletions(-)
diff --git a/dev-java/tomcat-jstl-impl/Manifest b/dev-java/tomcat-jstl-impl/Manifest
index 3d40f62..e67d6af 100644
--- a/dev-java/tomcat-jstl-impl/Manifest
+++ b/dev-java/tomcat-jstl-impl/Manifest
@@ -1 +1 @@
-DIST taglibs-standard-1.2.5-source-release.zip 615779 SHA256 09206f14ae3bbfc5442476414feee422d4371a6dbe0e3435eb84462b6f36cd84 SHA512 ad4122cd75c66df901034e333c2b38ac3d2d8f5b0299abd36d0fd1c8f5975eacc71d66a475fc05638dd562ab0670ea532fe6a3ccb5497dfbeb9d859b03b659d0 WHIRLPOOL 2cc5c667fbce1bda85b935b0081c99ce454dad666e5a1609ba0ff7c9363265427df48dbe86e549e608f9d977d726f7d6f3b1dea803ebc6b1c78eb139eb2464ff
+DIST tomcat-jstl-impl-1.2.5.zip 615779 SHA256 09206f14ae3bbfc5442476414feee422d4371a6dbe0e3435eb84462b6f36cd84 SHA512 ad4122cd75c66df901034e333c2b38ac3d2d8f5b0299abd36d0fd1c8f5975eacc71d66a475fc05638dd562ab0670ea532fe6a3ccb5497dfbeb9d859b03b659d0 WHIRLPOOL 2cc5c667fbce1bda85b935b0081c99ce454dad666e5a1609ba0ff7c9363265427df48dbe86e549e608f9d977d726f7d6f3b1dea803ebc6b1c78eb139eb2464ff
diff --git a/dev-java/tomcat-jstl-impl/tomcat-jstl-impl-1.2.5-r1.ebuild b/dev-java/tomcat-jstl-impl/tomcat-jstl-impl-1.2.5-r1.ebuild
index 065b69e..9ab517d 100644
--- a/dev-java/tomcat-jstl-impl/tomcat-jstl-impl-1.2.5-r1.ebuild
+++ b/dev-java/tomcat-jstl-impl/tomcat-jstl-impl-1.2.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -13,24 +13,29 @@ MY_IMPL="${MY_PN}-impl"
DESCRIPTION="JSP Standard Tag Library (JSTL) - Implementation jar"
HOMEPAGE="https://tomcat.apache.org/taglibs/standard/"
-SRC_URI="http://apache.mirrors.ovh.net/ftp.apache.org/dist/tomcat/taglibs/${MY_P}/${MY_P}-source-release.zip"
+SRC_URI="http://apache.mirrors.ovh.net/ftp.apache.org/dist/tomcat/taglibs/${MY_P}/${MY_P}-source-release.zip -> ${P}.zip"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="amd64 x86"
IUSE="test"
-CDEPEND="dev-java/xalan:0
+CDEPEND="
+ dev-java/xalan:0
dev-java/tomcat-jstl-spec:0
dev-java/tomcat-servlet-api:3.1"
-RDEPEND=">=virtual/jre-1.6
- ${CDEPEND}"
-DEPEND=">=virtual/jdk-1.6
+
+RDEPEND="
+ ${CDEPEND}
+ >=virtual/jre-1.6"
+
+DEPEND="
+ ${CDEPEND}
test? (
dev-java/ant-junit:0
dev-java/easymock:3.2
)
- ${CDEPEND}"
+ >=virtual/jdk-1.6"
S="${WORKDIR}/${MY_P}"
@@ -39,18 +44,21 @@ EANT_GENTOO_CLASSPATH="tomcat-servlet-api-3.1,tomcat-jstl-spec,xalan"
EANT_BUILD_TARGET="package"
EANT_BUILD_XML="impl/build.xml"
-java_prepare() {
- cp "${FILESDIR}"/${P}-build.xml "${S}"/impl/build.xml
+JAVA_RM_FILES=(
+ impl/src/test/java/org/apache/taglibs/standard/tag/common/fmt/BundleSupportTest.java
+)
+PATCHES=(
# This patch overrides a couple of methods.
- epatch "${FILESDIR}"/${P}-ImportSupport.patch
-
+ "${FILESDIR}"/${P}-ImportSupport.patch
# This one disables one test case which doesn't work.
- epatch "${FILESDIR}"/${P}-SetSupport.patch
+ "${FILESDIR}"/${P}-SetSupport.patch
+)
+
+java_prepare() {
+ cp "${FILESDIR}"/${P}-build.xml "${S}"/impl/build.xml || die
- # This test case doesn't pass.
- rm -v \
- impl/src/test/java/org/apache/taglibs/standard/tag/common/fmt/BundleSupportTest.java
+ epatch "${PATCHES[@]}"
}
EANT_TEST_TARGET="test"
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2016-02-20 11:13 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-09-05 14:59 [gentoo-commits] repo/gentoo:master commit in: dev-java/tomcat-jstl-impl/ Agostino Sarubbo
-- strict thread matches above, loose matches on Subject: below --
2016-02-20 11:13 Patrice Clement
2015-10-13 19:09 Patrice Clement
2015-10-13 19:09 Patrice Clement
2015-10-13 19:09 Patrice Clement
2015-09-05 14:58 Agostino Sarubbo
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox