[gentoo-commits] gentoo-x86 commit in dev-java/junit: junit-4.12.ebuild ChangeLog

2015-07-12 Thread Patrice Clement (monsieurp) 
monsieurp15/07/12 12:19:16

  Modified: junit-4.12.ebuild ChangeLog
  Log:
  Remove 'test' target dependency from 'package' target so that jar file gets 
created even with tests off. Fix bug 554584.
  
  Signed-off-by: Patrice Clement monsie...@gentoo.org
  (Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 
93491BB8)

Revision  ChangesPath
1.2  dev-java/junit/junit-4.12.ebuild

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

Index: junit-4.12.ebuild
===
RCS file: /var/cvsroot/gentoo-x86/dev-java/junit/junit-4.12.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- junit-4.12.ebuild   10 Jul 2015 12:48:21 -  1.1
+++ junit-4.12.ebuild   12 Jul 2015 12:19:16 -  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/junit/junit-4.12.ebuild,v 1.1 
2015/07/10 12:48:21 monsieurp Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/junit/junit-4.12.ebuild,v 1.2 
2015/07/12 12:19:16 monsieurp Exp $
 
 EAPI=5
 
@@ -40,20 +40,20 @@
java-pkg_jar-from --into lib hamcrest-core-1.3 hamcrest-core.jar
 }
 
-EANT_BUILD_TARGET=compile
+EANT_BUILD_TARGET=package
 
 src_compile() {
java-pkg-2_src_compile
 }
 
-EANT_TEST_TARGET=package
+EANT_TEST_TARGET=test
 
 src_test() {
java-pkg-2_src_test
 }
 
 src_install() {
-   java-pkg_newjar target/${P}.jar
+   java-pkg_newjar target/${P}.jar junit.jar
dodoc doc/ReleaseNotes${PV}.md
 
if use examples; then



1.88 dev-java/junit/ChangeLog

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/junit/ChangeLog?rev=1.88view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/junit/ChangeLog?rev=1.88content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/junit/ChangeLog?r1=1.87r2=1.88

Index: ChangeLog
===
RCS file: /var/cvsroot/gentoo-x86/dev-java/junit/ChangeLog,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- ChangeLog   11 Jul 2015 13:21:27 -  1.87
+++ ChangeLog   12 Jul 2015 12:19:16 -  1.88
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/junit
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/junit/ChangeLog,v 1.87 2015/07/11 
13:21:27 monsieurp Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/junit/ChangeLog,v 1.88 2015/07/12 
12:19:16 monsieurp Exp $
+
+  12 Jul 2015; Patrice Clement monsie...@gentoo.org
+  files/junit-4.12-build.xml, junit-4.12.ebuild:
+  Remove 'test' target dependency from 'package' target so that jar file gets
+  created even with tests off. Fix bug 554584.
 
   11 Jul 2015; Patrice Clement monsie...@gentoo.org
   files/junit-4.12-build.xml:

[gentoo-commits] gentoo-x86 commit in dev-java/junit: junit-4.12.ebuild ChangeLog

2015-07-10 Thread Patrice Clement (monsieurp) 
monsieurp15/07/10 12:48:21

  Modified: ChangeLog
  Added:junit-4.12.ebuild
  Log:
  Version bump. Fix bug 535878.
  
  Signed-off-by: Patrice Clement monsie...@gentoo.org
  (Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 
93491BB8)

Revision  ChangesPath
1.85 dev-java/junit/ChangeLog

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/junit/ChangeLog?rev=1.85view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/junit/ChangeLog?rev=1.85content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/junit/ChangeLog?r1=1.84r2=1.85

Index: ChangeLog
===
RCS file: /var/cvsroot/gentoo-x86/dev-java/junit/ChangeLog,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- ChangeLog   20 Oct 2013 16:32:37 -  1.84
+++ ChangeLog   10 Jul 2015 12:48:21 -  1.85
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/junit
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/junit/ChangeLog,v 1.84 2013/10/20 
16:32:37 ago Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/junit/ChangeLog,v 1.85 2015/07/10 
12:48:21 monsieurp Exp $
+
+*junit-4.12 (10 Jul 2015)
+
+  10 Jul 2015; Patrice Clement monsie...@gentoo.org
+  +files/junit-4.12-build.xml, +junit-4.12.ebuild:
+  Version bump. Fix bug 535878.
 
   20 Oct 2013; Agostino Sarubbo a...@gentoo.org junit-4.11.ebuild:
   Stable for ppc64, wrt bug #476958



1.1  dev-java/junit/junit-4.12.ebuild

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

Index: junit-4.12.ebuild
===
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-java/junit/junit-4.12.ebuild,v 1.1 
2015/07/10 12:48:21 monsieurp Exp $

EAPI=5

JAVA_PKG_IUSE=doc examples source test

inherit java-pkg-2 java-ant-2

DESCRIPTION=Simple framework to write repeatable tests
SRC_URI=https://github.com/${PN}-team/${PN}/archive/r${PV}.zip;
HOMEPAGE=http://www.junit.org/;

LICENSE=CPL-1.0
SLOT=4

KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd 
~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos 
~sparc-solaris ~x64-solaris ~x86-solaris

CDEPEND=dev-java/hamcrest-core:1.3

RDEPEND==virtual/jre-1.6
${CDEPEND}

DEPEND==virtual/jdk-1.6
userland_GNU? ( =sys-apps/findutils-4.3 )
${CDEPEND}

S=${WORKDIR}/${PN}-r${PV}

JAVA_ANT_REWRITE_CLASSPATH=yes
EANT_BUILD_XML=build.xml
EANT_DOC_TARGET=javadoc

java_prepare() {
cp ${FILESDIR}/${P}-build.xml build.xml

find . -type f \( -name \*.jar -o -name \*.class \) -print -delete

java-pkg_jar-from --into lib hamcrest-core-1.3 hamcrest-core.jar
}

EANT_BUILD_TARGET=compile

src_compile() {
java-pkg-2_src_compile
}

EANT_TEST_TARGET=package

src_test() {
java-pkg-2_src_test
}

src_install() {
java-pkg_newjar target/${P}.jar
dodoc doc/ReleaseNotes${PV}.md

if use examples; then
java-pkg_doexamples src/test/java/org/junit/samples
fi

if use source; then
java-pkg_dosrc src/main/java/{org,junit}
fi

if use doc; then
java-pkg_dojavadoc target/site/apidocs
fi
}