Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrice Clement <monsieurp@gentoo.org>2015-10-13 19:07:33 +0000
committerPatrice Clement <monsieurp@gentoo.org>2015-10-13 19:07:51 +0000
commit68f496254963afafc500d1bc46dc3781bc38529e (patch)
tree5a8639ce123ca6d1000481342ed61d733ce17884
parentsys-fs/duperemove: Bump to v0.10 (diff)
parentdev-java/mojarra: Stable for amd64. Stable for x86 using the ALLARCHES policy. (diff)
downloadgentoo-68f496254963afafc500d1bc46dc3781bc38529e.tar.gz
gentoo-68f496254963afafc500d1bc46dc3781bc38529e.tar.bz2
gentoo-68f496254963afafc500d1bc46dc3781bc38529e.zip
Merge remote-tracking branch 'remotes/github/pr/195'.
Diffstat
-rw-r--r--dev-java/commons-jelly/commons-jelly-1.0-r8.ebuild (renamed from dev-java/commons-jelly/commons-jelly-1.0-r7.ebuild)4
-rw-r--r--dev-java/mojarra/mojarra-2.2.12-r1.ebuild (renamed from dev-java/mojarra/mojarra-2.2.12.ebuild)15
-rw-r--r--dev-java/tomcat-jstl-compat/tomcat-jstl-compat-1.2.5-r1.ebuild (renamed from dev-java/tomcat-jstl-compat/tomcat-jstl-compat-1.2.5.ebuild)10
-rw-r--r--dev-java/tomcat-jstl-el/tomcat-jstl-el-1.2.5-r1.ebuild (renamed from dev-java/tomcat-jstl-el/tomcat-jstl-el-1.2.5.ebuild)12
-rw-r--r--dev-java/tomcat-jstl-impl/tomcat-jstl-impl-1.2.5-r1.ebuild (renamed from dev-java/tomcat-jstl-impl/tomcat-jstl-impl-1.2.5.ebuild)8
-rw-r--r--dev-java/tomcat-jstl-spec/tomcat-jstl-spec-1.2.5-r1.ebuild (renamed from dev-java/tomcat-jstl-spec/tomcat-jstl-spec-1.2.5.ebuild)4
6 files changed, 31 insertions, 22 deletions
diff --git a/dev-java/commons-jelly/commons-jelly-1.0-r7.ebuild b/dev-java/commons-jelly/commons-jelly-1.0-r8.ebuild
index 1442a6288470..b55dbf897f99 100644
--- a/dev-java/commons-jelly/commons-jelly-1.0-r7.ebuild
+++ b/dev-java/commons-jelly/commons-jelly-1.0-r8.ebuild
@@ -29,7 +29,7 @@ CDEPEND="
dev-java/commons-discovery:0
dev-java/commons-collections:0
dev-java/commons-beanutils:1.7
- dev-java/tomcat-jstl-spec:1.2.5
+ dev-java/tomcat-jstl-spec:0
java-virtuals/servlet-api:3.0"
RDEPEND="${CDEPEND}
>=virtual/jre-1.6"
@@ -49,7 +49,7 @@ JAVA_ANT_REWRITE_CLASSPATH="yes"
EANT_EXTRA_ARGS="-Dlibdir=."
EANT_GENTOO_CLASSPATH="
commons-beanutils-1.7,commons-cli-1,commons-collections,commons-discovery
- commons-jexl-1.0,commons-lang,commons-logging,dom4j-1,tomcat-jstl-spec-1.2.5
+ commons-jexl-1.0,commons-lang,commons-logging,dom4j-1,tomcat-jstl-spec
jaxen-1.1,junit,servlet-api-3.0"
src_test() {
diff --git a/dev-java/mojarra/mojarra-2.2.12.ebuild b/dev-java/mojarra/mojarra-2.2.12-r1.ebuild
index 455992f659ca..8b7899585f41 100644
--- a/dev-java/mojarra/mojarra-2.2.12.ebuild
+++ b/dev-java/mojarra/mojarra-2.2.12-r1.ebuild
@@ -19,8 +19,8 @@ IUSE=""
CDEPEND="dev-java/glassfish-persistence:0
dev-java/glassfish-ejb-api:0
java-virtuals/servlet-api:3.0
- dev-java/tomcat-jstl-spec:1.2.5
- dev-java/tomcat-jstl-impl:1.2.5
+ dev-java/tomcat-jstl-spec:0
+ dev-java/tomcat-jstl-impl:0
dev-java/validation-api:1.0
dev-java/javax-inject:0
dev-java/cdi-api:1.2"
@@ -33,7 +33,16 @@ DEPEND=">=virtual/jdk-1.6
JAVA_SRC_DIR="src"
-JAVA_GENTOO_CLASSPATH="glassfish-persistence,glassfish-ejb-api,tomcat-jstl-spec-1.2.5,tomcat-jstl-impl-1.2.5,validation-api-1.0,cdi-api-1.2,servlet-api-3.0,javax-inject"
+JAVA_GENTOO_CLASSPATH="
+ glassfish-persistence
+ glassfish-ejb-api
+ tomcat-jstl-spec
+ tomcat-jstl-impl
+ validation-api-1.0
+ cdi-api-1.2
+ servlet-api-3.0
+ javax-inject
+"
java_prepare() {
mkdir src || die
diff --git a/dev-java/tomcat-jstl-compat/tomcat-jstl-compat-1.2.5.ebuild b/dev-java/tomcat-jstl-compat/tomcat-jstl-compat-1.2.5-r1.ebuild
index 25cecf5a33fe..7e94860a0441 100644
--- a/dev-java/tomcat-jstl-compat/tomcat-jstl-compat-1.2.5.ebuild
+++ b/dev-java/tomcat-jstl-compat/tomcat-jstl-compat-1.2.5-r1.ebuild
@@ -16,13 +16,13 @@ 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"
+SLOT="0"
+KEYWORDS="amd64 x86"
IUSE="test"
CDEPEND="java-virtuals/servlet-api:3.0
- dev-java/tomcat-jstl-spec:1.2.5
- dev-java/tomcat-jstl-impl:1.2.5"
+ dev-java/tomcat-jstl-spec:0
+ dev-java/tomcat-jstl-impl:0"
RDEPEND=">=virtual/jre-1.6
${CDEPEND}"
DEPEND=">=virtual/jdk-1.6
@@ -35,7 +35,7 @@ DEPEND=">=virtual/jdk-1.6
S="${WORKDIR}/${MY_P}"
JAVA_ANT_REWRITE_CLASSPATH="yes"
-EANT_GENTOO_CLASSPATH="servlet-api-3.0,tomcat-jstl-spec-1.2.5,tomcat-jstl-impl-1.2.5"
+EANT_GENTOO_CLASSPATH="servlet-api-3.0,tomcat-jstl-spec,tomcat-jstl-impl"
EANT_BUILD_TARGET="package"
EANT_BUILD_XML="compat/build.xml"
diff --git a/dev-java/tomcat-jstl-el/tomcat-jstl-el-1.2.5.ebuild b/dev-java/tomcat-jstl-el/tomcat-jstl-el-1.2.5-r1.ebuild
index 1ca0ec8d8ea3..e8d693972af7 100644
--- a/dev-java/tomcat-jstl-el/tomcat-jstl-el-1.2.5.ebuild
+++ b/dev-java/tomcat-jstl-el/tomcat-jstl-el-1.2.5-r1.ebuild
@@ -5,7 +5,7 @@
EAPI=5
JAVA_PKG_IUSE="doc source"
-inherit java-pkg-2 java-ant-2 eutils
+inherit java-pkg-2 java-ant-2
MY_PN="taglibs-standard"
MY_P="${MY_PN}-${PV}"
@@ -16,13 +16,13 @@ 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"
+SLOT="0"
+KEYWORDS="amd64 x86"
IUSE="test"
CDEPEND="java-virtuals/servlet-api:3.0
- dev-java/tomcat-jstl-impl:1.2.5
- dev-java/tomcat-jstl-spec:1.2.5"
+ dev-java/tomcat-jstl-impl:0
+ dev-java/tomcat-jstl-spec:0"
RDEPEND=">=virtual/jre-1.6
${CDEPEND}"
DEPEND=">=virtual/jdk-1.6
@@ -35,7 +35,7 @@ DEPEND=">=virtual/jdk-1.6
S="${WORKDIR}/${MY_P}"
JAVA_ANT_REWRITE_CLASSPATH="yes"
-EANT_GENTOO_CLASSPATH="servlet-api-3.0,tomcat-jstl-spec-1.2.5,tomcat-jstl-impl-1.2.5"
+EANT_GENTOO_CLASSPATH="servlet-api-3.0,tomcat-jstl-spec,tomcat-jstl-impl"
EANT_BUILD_TARGET="package"
EANT_BUILD_XML="jstlel/build.xml"
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-r1.ebuild
index 695b680775fb..065b69e46f27 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-r1.ebuild
@@ -5,7 +5,7 @@
EAPI=5
JAVA_PKG_IUSE="doc source"
-inherit java-pkg-2 java-ant-2 eutils
+inherit java-pkg-2 java-ant-2
MY_PN="taglibs-standard"
MY_P="${MY_PN}-${PV}"
@@ -16,12 +16,12 @@ 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"
+SLOT="0"
KEYWORDS="amd64 x86"
IUSE="test"
CDEPEND="dev-java/xalan:0
- dev-java/tomcat-jstl-spec:1.2.5
+ dev-java/tomcat-jstl-spec:0
dev-java/tomcat-servlet-api:3.1"
RDEPEND=">=virtual/jre-1.6
${CDEPEND}"
@@ -35,7 +35,7 @@ DEPEND=">=virtual/jdk-1.6
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_GENTOO_CLASSPATH="tomcat-servlet-api-3.1,tomcat-jstl-spec,xalan"
EANT_BUILD_TARGET="package"
EANT_BUILD_XML="impl/build.xml"
diff --git a/dev-java/tomcat-jstl-spec/tomcat-jstl-spec-1.2.5.ebuild b/dev-java/tomcat-jstl-spec/tomcat-jstl-spec-1.2.5-r1.ebuild
index 62f34c4140c0..9479bfb453de 100644
--- a/dev-java/tomcat-jstl-spec/tomcat-jstl-spec-1.2.5.ebuild
+++ b/dev-java/tomcat-jstl-spec/tomcat-jstl-spec-1.2.5-r1.ebuild
@@ -5,7 +5,7 @@
EAPI=5
JAVA_PKG_IUSE="doc source"
-inherit java-pkg-2 java-ant-2 eutils
+inherit java-pkg-2 java-ant-2
MY_PN="taglibs-standard"
MY_P="${MY_PN}-${PV}"
@@ -16,7 +16,7 @@ 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"
+SLOT="0"
KEYWORDS="amd64 x86"
IUSE="test"