[gentoo-commits] gentoo-x86 commit in dev-java/rhino: rhino-1.7.7.ebuild ChangeLog

2015-08-06 Thread Patrice Clement (monsieurp) 
monsieurp15/08/06 20:52:28

  Modified: rhino-1.7.7.ebuild ChangeLog
  Log:
  Remove EANT_BUILD_XML and EANT_BUILD_TARGET: both variables are predefined 
with the same value during eclass sourcing. Thanks sping for the heads up.
  
  Signed-off-by: Patrice Clement 
  (Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 
93491BB8)

Revision  ChangesPath
1.2  dev-java/rhino/rhino-1.7.7.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/rhino/rhino-1.7.7.ebuild?rev=1.2&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/rhino/rhino-1.7.7.ebuild?rev=1.2&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/rhino/rhino-1.7.7.ebuild?r1=1.1&r2=1.2

Index: rhino-1.7.7.ebuild
===
RCS file: /var/cvsroot/gentoo-x86/dev-java/rhino/rhino-1.7.7.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- rhino-1.7.7.ebuild  6 Aug 2015 10:01:23 -   1.1
+++ rhino-1.7.7.ebuild  6 Aug 2015 20:52:28 -   1.2
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/rhino/rhino-1.7.7.ebuild,v 1.1 
2015/08/06 10:01:23 monsieurp Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/rhino/rhino-1.7.7.ebuild,v 1.2 
2015/08/06 20:52:28 monsieurp Exp $
 
 EAPI="5"
 JAVA_PKG_IUSE="doc examples source test"
@@ -43,8 +43,6 @@
${CDEPEND}"
 
 JAVA_ANT_REWRITE_CLASSPATH="yes"
-EANT_BUILD_XML="${S}/build.xml"
-EANT_BUILD_TARGET="jar"
 
 PATCHES=(
"${FILESDIR}"/${P}-testsrc-build.xml.patch



1.80 dev-java/rhino/ChangeLog

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/rhino/ChangeLog?rev=1.80&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/rhino/ChangeLog?rev=1.80&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/rhino/ChangeLog?r1=1.79&r2=1.80

Index: ChangeLog
===
RCS file: /var/cvsroot/gentoo-x86/dev-java/rhino/ChangeLog,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- ChangeLog   6 Aug 2015 10:01:23 -   1.79
+++ ChangeLog   6 Aug 2015 20:52:28 -   1.80
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/rhino
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/rhino/ChangeLog,v 1.79 2015/08/06 
10:01:23 monsieurp Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/rhino/ChangeLog,v 1.80 2015/08/06 
20:52:28 monsieurp Exp $
+
+  06 Aug 2015; Patrice Clement  rhino-1.7.7.ebuild:
+  Remove EANT_BUILD_XML and EANT_BUILD_TARGET: both variables are predefined
+  with the same value during eclass sourcing. Thanks sping for the heads up.
 
 *rhino-1.7.7 (06 Aug 2015)

[gentoo-commits] gentoo-x86 commit in dev-java/rhino: rhino-1.7.7.ebuild ChangeLog

2015-08-06 Thread Patrice Clement (monsieurp) 
monsieurp15/08/06 10:01:23

  Modified: ChangeLog
  Added:rhino-1.7.7.ebuild
  Log:
  Version bump. Fixes bug 524528.
  
  Signed-off-by: Patrice Clement 
  (Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 
93491BB8)

Revision  ChangesPath
1.79 dev-java/rhino/ChangeLog

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/rhino/ChangeLog?rev=1.79&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/rhino/ChangeLog?rev=1.79&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/rhino/ChangeLog?r1=1.78&r2=1.79

Index: ChangeLog
===
RCS file: /var/cvsroot/gentoo-x86/dev-java/rhino/ChangeLog,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- ChangeLog   13 Jun 2015 21:57:24 -  1.78
+++ ChangeLog   6 Aug 2015 10:01:23 -   1.79
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/rhino
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/rhino/ChangeLog,v 1.78 2015/06/13 
21:57:24 monsieurp Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/rhino/ChangeLog,v 1.79 2015/08/06 
10:01:23 monsieurp Exp $
+
+*rhino-1.7.7 (06 Aug 2015)
+
+  06 Aug 2015; Patrice Clement 
+  +files/rhino-1.7.7-testsrc-build.xml.patch, +rhino-1.7.7.ebuild:
+  Version bump. Fixes bug 524528.
 
   13 Jun 2015; Patrice Clement  -rhino-1.5.5-r4.ebuild,
   -rhino-1.5.5-r5.ebuild:



1.1  dev-java/rhino/rhino-1.7.7.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/rhino/rhino-1.7.7.ebuild?rev=1.1&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/rhino/rhino-1.7.7.ebuild?rev=1.1&content-type=text/plain

Index: rhino-1.7.7.ebuild
===
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-java/rhino/rhino-1.7.7.ebuild,v 1.1 
2015/08/06 10:01:23 monsieurp Exp $

EAPI="5"
JAVA_PKG_IUSE="doc examples source test"
inherit java-pkg-2 java-ant-2 versionator

# rhino -> Rhino
MY_PN="${PN^}"

# 1.7.7 -> 1_7_7
MY_PV="$(replace_all_version_separators _ ${PV})"

# rhino1.7.7
MY_P="${PN}${PV}"

# Rhino1_7_7_RELEASE
MY_RELEASE="${MY_PN}${MY_PV}_RELEASE"

DESCRIPTION="An open-source implementation of JavaScript written in Java"
SRC_URI="https://github.com/mozilla/${PN}/archive/${MY_RELEASE}.zip";
HOMEPAGE="http://www.mozilla.org/rhino/";

LICENSE="MPL-1.1 GPL-2"
SLOT="1.7"
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
IUSE=""

# ../rhino-Rhino1_7_7_RELEASE
S="${WORKDIR}/${PN}-${MY_RELEASE}"

CDEPEND=""
RDEPEND=">=virtual/jre-1.6
${CDEPEND}"
DEPEND=">=virtual/jdk-1.6
test? (
dev-java/emma:0
dev-java/junit:4
dev-java/ant-junit:0
dev-java/hamcrest-core:1.3
)
${CDEPEND}"

JAVA_ANT_REWRITE_CLASSPATH="yes"
EANT_BUILD_XML="${S}/build.xml"
EANT_BUILD_TARGET="jar"

PATCHES=(
"${FILESDIR}"/${P}-testsrc-build.xml.patch
)

EANT_TEST_TARGET="junit"

# StackOverFlow errors arise on some tests.
# Further, the test suite takes way too much time (> 5 min).
# Maybe reduce the numbers of tests?
RESTRICT="test"

java_prepare() {
find . \
-type f \
-name \*.jar \
-print \
-exec rm -v {} \; || die "Couldn't delete bundled jar files."

epatch ${PATCHES[@]}

if use test; then
mkdir lib || die
java-pkg_jar-from --build-only emma emma.jar lib/emma.jar
java-pkg_jar-from --build-only emma emma_ant.jar 
lib/emma_ant.jar
java-pkg_jar-from --build-only hamcrest-core-1.3 
hamcrest-core.jar lib/hamcrest.jar
java-pkg_jar-from --build-only junit-4 junit.jar lib/junit.jar
fi
}

src_compile() {
java-pkg-2_src_compile

if use source; then
EANT_BUILD_TARGET="source-zip" \
java-pkg-2_src_compile
fi
}

src_test() {
java-pkg-2_src_test
}

src_install() {
java-pkg_dojar build/${MY_P}/js.jar

java-pkg_dolauncher jsscript-${SLOT} \
--main org.mozilla.javascript.tools.shell.Main

use doc && java-pkg_dojavadoc "build/${MY_P}/javadoc"
use examples && java-pkg_doexamples examples
use source && java-pkg_dosrc {src,toolsrc,xmlimplsrc}/org
}