public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in dev-java/commons-collections: commons-collections-3.2.1-r1.ebuild ChangeLog
@ 2015-06-21 11:19 Patrice Clement (monsieurp)
  0 siblings, 0 replies; 2+ messages in thread
From: Patrice Clement (monsieurp) @ 2015-06-21 11:19 UTC (permalink / raw
  To: gentoo-commits

monsieurp    15/06/21 11:19:31

  Modified:             ChangeLog
  Added:                commons-collections-3.2.1-r1.ebuild
  Log:
  Add patch to allow commons-collections to compile nicely with JDK >= 1.8 courtesy of Constantine E. Kozlov <tempor.demonius@gmail.com>. Fix bug 508056.
  
  Signed-off-by: Patrice Clement <monsieurp@gentoo.org>
  (Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 93491BB8)

Revision  Changes    Path
1.60                 dev-java/commons-collections/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/commons-collections/ChangeLog,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- ChangeLog	31 Dec 2011 13:25:22 -0000	1.59
+++ ChangeLog	21 Jun 2015 11:19:31 -0000	1.60
@@ -1,6 +1,14 @@
 # ChangeLog for dev-java/commons-collections
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-collections/ChangeLog,v 1.59 2011/12/31 13:25:22 sera Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-collections/ChangeLog,v 1.60 2015/06/21 11:19:31 monsieurp Exp $
+
+*commons-collections-3.2.1-r1 (21 Jun 2015)
+
+  21 Jun 2015; Patrice Clement <monsieurp@gentoo.org>
+  +commons-collections-3.2.1-r1.ebuild,
+  +files/commons-collections-3.2.1-Java-8.patch:
+  Add patch to allow commons-collections to compile nicely with JDK >= 1.8
+  courtesy of Constantine E. Kozlov <tempor.demonius@gmail.com>. Fix bug 508056.
 
   31 Dec 2011; Ralph Sennhauser <sera@gentoo.org>
   commons-collections-3.2.1.ebuild:
@@ -236,4 +244,3 @@
   31 Oct 2002; Karl Trygve Kalleberg <karltk@gentoo.org> commons-collections-2.0.ebuild files/digest-commons-collections-2.0 :
   Initial import.  Ebuild submitted by Adrian Almenar
   <aalmenar@conectium.com>.
-



1.1                  dev-java/commons-collections/commons-collections-3.2.1-r1.ebuild

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

Index: commons-collections-3.2.1-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-collections/commons-collections-3.2.1-r1.ebuild,v 1.1 2015/06/21 11:19:31 monsieurp Exp $
EAPI=5

JAVA_PKG_IUSE="doc source test"

inherit java-pkg-2 java-ant-2 java-utils-2 eutils

DESCRIPTION="Jakarta-Commons Collections Component"
HOMEPAGE="http://commons.apache.org/collections/"
SRC_URI="mirror://apache/${PN/-//}/source/${P}-src.tar.gz"

LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
IUSE="test-framework"

CDEPEND="
	test-framework? (
		dev-java/junit:0
	)
	"
DEPEND=">=virtual/jdk-1.6
	${CDEPEND}"
RDEPEND=">=virtual/jre-1.6
	${CDEPEND}"

S="${WORKDIR}/${P}-src"

java_prepare() {
	# Check for VM version.
	java-pkg_is-vm-version-ge 1.8
	if [[ $? -eq 0 ]]; then
		einfo "You are running a JVM greater or equal than version 1.8."
		epatch "${FILESDIR}"/${P}-Java-8.patch
	fi
}

src_compile() {
	local antflags
	if use test-framework; then
		antflags="tf.jar -Djunit.jar=$(java-pkg_getjars junit)"
		#no support for installing two sets of javadocs via dojavadoc atm
		#use doc && antflags="${antflags} tf.javadoc"
	fi
	eant jar $(use_doc) ${antflags}
}

src_test() {
	if [[ "${ARCH}" = "ppc" ]]; then
		einfo "Tests are disabled on ppc"
	else
		ANT_TASKS="ant-junit" eant testjar -Djunit.jar="$(java-pkg_getjars junit)"
	fi
}

src_install() {
	java-pkg_newjar build/${P}.jar ${PN}.jar
	use test-framework && \
		java-pkg_newjar build/${PN}-testframework-${PV}.jar \
			${PN}-testframework.jar

	dodoc README.txt || die
	java-pkg_dohtml *.html || die
	if use doc; then
		java-pkg_dojavadoc build/docs/apidocs
		#use test-framework && java-pkg_dojavadoc build/docs/testframework
	fi
	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-collections: commons-collections-3.2.1-r1.ebuild ChangeLog
@ 2015-06-22 15:13 Patrice Clement (monsieurp)
  0 siblings, 0 replies; 2+ messages in thread
From: Patrice Clement (monsieurp) @ 2015-06-22 15:13 UTC (permalink / raw
  To: gentoo-commits

monsieurp    15/06/22 15:13:48

  Modified:             commons-collections-3.2.1-r1.ebuild ChangeLog
  Log:
  Add ant-junit to CDEPENDs to clear QA warning.
  
  Signed-off-by: Patrice Clement <monsieurp@gentoo.org>
  (Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 93491BB8)

Revision  Changes    Path
1.2                  dev-java/commons-collections/commons-collections-3.2.1-r1.ebuild

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

Index: commons-collections-3.2.1-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/commons-collections/commons-collections-3.2.1-r1.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- commons-collections-3.2.1-r1.ebuild	21 Jun 2015 11:19:31 -0000	1.1
+++ commons-collections-3.2.1-r1.ebuild	22 Jun 2015 15:13:48 -0000	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/commons-collections/commons-collections-3.2.1-r1.ebuild,v 1.1 2015/06/21 11:19:31 monsieurp Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-collections/commons-collections-3.2.1-r1.ebuild,v 1.2 2015/06/22 15:13:48 monsieurp Exp $
 EAPI=5
 
 JAVA_PKG_IUSE="doc source test"
@@ -19,6 +19,7 @@
 CDEPEND="
 	test-framework? (
 		dev-java/junit:0
+		dev-java/ant-junit:0
 	)
 	"
 DEPEND=">=virtual/jdk-1.6



1.61                 dev-java/commons-collections/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/commons-collections/ChangeLog,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- ChangeLog	21 Jun 2015 11:19:31 -0000	1.60
+++ ChangeLog	22 Jun 2015 15:13:48 -0000	1.61
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/commons-collections
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-collections/ChangeLog,v 1.60 2015/06/21 11:19:31 monsieurp Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-collections/ChangeLog,v 1.61 2015/06/22 15:13:48 monsieurp Exp $
+
+  22 Jun 2015; Patrice Clement <monsieurp@gentoo.org>
+  commons-collections-3.2.1-r1.ebuild:
+  Add ant-junit to CDEPENDs to clear QA warning.
 
 *commons-collections-3.2.1-r1 (21 Jun 2015)
 





^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2015-06-22 15:13 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-06-21 11:19 [gentoo-commits] gentoo-x86 commit in dev-java/commons-collections: commons-collections-3.2.1-r1.ebuild ChangeLog Patrice Clement (monsieurp)
  -- strict thread matches above, loose matches on Subject: below --
2015-06-22 15:13 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