* [gentoo-commits] gentoo-x86 commit in dev-java/commons-jxpath: commons-jxpath-1.3-r1.ebuild ChangeLog
@ 2015-05-24 21:56 Patrice Clement (monsieurp)
0 siblings, 0 replies; 2+ messages in thread
From: Patrice Clement (monsieurp) @ 2015-05-24 21:56 UTC (permalink / raw
To: gentoo-commits
monsieurp 15/05/24 21:56:29
Modified: ChangeLog
Added: commons-jxpath-1.3-r1.ebuild
Log:
Replace dev-java/servletapi slot with java-virtuals/servlet-api. Fix bug 398689.
Signed-off-by: Patrice Clement <monsieurp@gentoo.org>
(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 93491BB8)
Revision Changes Path
1.35 dev-java/commons-jxpath/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/commons-jxpath/ChangeLog?rev=1.35&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/commons-jxpath/ChangeLog?rev=1.35&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/commons-jxpath/ChangeLog?r1=1.34&r2=1.35
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/commons-jxpath/ChangeLog,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- ChangeLog 10 Aug 2014 20:11:24 -0000 1.34
+++ ChangeLog 24 May 2015 21:56:29 -0000 1.35
@@ -1,6 +1,13 @@
# ChangeLog for dev-java/commons-jxpath
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-jxpath/ChangeLog,v 1.34 2014/08/10 20:11:24 slyfox Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-jxpath/ChangeLog,v 1.35 2015/05/24 21:56:29 monsieurp Exp $
+
+*commons-jxpath-1.3-r1 (24 May 2015)
+
+ 24 May 2015; Patrice Clement <monsieurp@gentoo.org>
+ +commons-jxpath-1.3-r1.ebuild:
+ Replace dev-java/servletapi slot with java-virtuals/servlet-api. Fix bug
+ 398689.
10 Aug 2014; Sergei Trofimovich <slyfox@gentoo.org> commons-jxpath-1.3.ebuild:
QA: drop trailing '.' from DESCRIPTION
1.1 dev-java/commons-jxpath/commons-jxpath-1.3-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/commons-jxpath/commons-jxpath-1.3-r1.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/commons-jxpath/commons-jxpath-1.3-r1.ebuild?rev=1.1&content-type=text/plain
Index: commons-jxpath-1.3-r1.ebuild
===================================================================
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-jxpath/commons-jxpath-1.3-r1.ebuild,v 1.1 2015/05/24 21:56:29 monsieurp Exp $
EAPI=1
JAVA_PKG_IUSE="doc source test"
inherit java-pkg-2 java-ant-2
DESCRIPTION="Applies XPath expressions to graphs of objects of all kinds"
HOMEPAGE="http://commons.apache.org/jxpath/"
SRC_URI="mirror://apache/commons/jxpath/source/${P}-src.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
IUSE=""
S="${WORKDIR}/${P}-src"
CDEPEND="dev-java/commons-beanutils:1.7
java-virtuals/servlet-api:2.5
dev-java/jdom:1.0"
RDEPEND=">=virtual/jre-1.6
${CDEPEND}"
DEPEND=">=virtual/jdk-1.6
test? (
dev-java/commons-collections:0
dev-java/commons-logging:0
)
${CDEPEND}"
src_unpack() {
unpack ${A}
cd "${S}"
# Don't automatically run tests
sed 's/depends="compile,test"/depends="compile"/' -i build.xml || die
mkdir -p "${S}/target/lib"
cd "${S}/target/lib"
java-pkg_jar-from commons-beanutils-1.7
java-pkg_jar-from servlet-api-2.5
java-pkg_jar-from jdom-1.0
}
src_test() {
# this one needs mockrunner #259027
rm src/test/org/apache/commons/jxpath/servlet/JXPathServletContextTest.java || die
java-pkg_jar-from --into target/lib \
commons-collections,commons-logging,junit
ANT_TASKS="ant-junit" eant test
}
src_install() {
java-pkg_dojar target/${PN}.jar
use doc && java-pkg_dojavadoc dist/docs/api
use source && java-pkg_dosrc src/java/*
}
^ permalink raw reply [flat|nested] 2+ messages in thread
* [gentoo-commits] gentoo-x86 commit in dev-java/commons-jxpath: commons-jxpath-1.3-r1.ebuild ChangeLog
@ 2015-05-26 7:52 Patrice Clement (monsieurp)
0 siblings, 0 replies; 2+ messages in thread
From: Patrice Clement (monsieurp) @ 2015-05-26 7:52 UTC (permalink / raw
To: gentoo-commits
monsieurp 15/05/26 07:52:55
Modified: commons-jxpath-1.3-r1.ebuild ChangeLog
Log:
EAPI 5 bump.
Signed-off-by: Patrice Clement <monsieurp@gentoo.org>
(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 93491BB8)
Revision Changes Path
1.2 dev-java/commons-jxpath/commons-jxpath-1.3-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/commons-jxpath/commons-jxpath-1.3-r1.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/commons-jxpath/commons-jxpath-1.3-r1.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/commons-jxpath/commons-jxpath-1.3-r1.ebuild?r1=1.1&r2=1.2
Index: commons-jxpath-1.3-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/commons-jxpath/commons-jxpath-1.3-r1.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- commons-jxpath-1.3-r1.ebuild 24 May 2015 21:56:29 -0000 1.1
+++ commons-jxpath-1.3-r1.ebuild 26 May 2015 07:52:55 -0000 1.2
@@ -1,8 +1,8 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-jxpath/commons-jxpath-1.3-r1.ebuild,v 1.1 2015/05/24 21:56:29 monsieurp Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-jxpath/commons-jxpath-1.3-r1.ebuild,v 1.2 2015/05/26 07:52:55 monsieurp Exp $
-EAPI=1
+EAPI=5
JAVA_PKG_IUSE="doc source test"
inherit java-pkg-2 java-ant-2
@@ -34,9 +34,6 @@
unpack ${A}
cd "${S}"
- # Don't automatically run tests
- sed 's/depends="compile,test"/depends="compile"/' -i build.xml || die
-
mkdir -p "${S}/target/lib"
cd "${S}/target/lib"
java-pkg_jar-from commons-beanutils-1.7
@@ -44,6 +41,11 @@
java-pkg_jar-from jdom-1.0
}
+src_prepare() {
+ # Don't automatically run tests
+ sed 's/depends="compile,test"/depends="compile"/' -i build.xml || die
+}
+
src_test() {
# this one needs mockrunner #259027
rm src/test/org/apache/commons/jxpath/servlet/JXPathServletContextTest.java || die
1.36 dev-java/commons-jxpath/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/commons-jxpath/ChangeLog?rev=1.36&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/commons-jxpath/ChangeLog?rev=1.36&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/commons-jxpath/ChangeLog?r1=1.35&r2=1.36
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/commons-jxpath/ChangeLog,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- ChangeLog 24 May 2015 21:56:29 -0000 1.35
+++ ChangeLog 26 May 2015 07:52:55 -0000 1.36
@@ -1,6 +1,10 @@
# ChangeLog for dev-java/commons-jxpath
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-jxpath/ChangeLog,v 1.35 2015/05/24 21:56:29 monsieurp Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-jxpath/ChangeLog,v 1.36 2015/05/26 07:52:55 monsieurp Exp $
+
+ 26 May 2015; Patrice Clement <monsieurp@gentoo.org>
+ commons-jxpath-1.3-r1.ebuild:
+ EAPI 5 bump.
*commons-jxpath-1.3-r1 (24 May 2015)
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2015-05-26 7:53 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-05-24 21:56 [gentoo-commits] gentoo-x86 commit in dev-java/commons-jxpath: commons-jxpath-1.3-r1.ebuild ChangeLog Patrice Clement (monsieurp)
-- strict thread matches above, loose matches on Subject: below --
2015-05-26 7:52 Patrice Clement (monsieurp)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox