[gentoo-commits] gentoo-x86 commit in dev-java/avalon-logkit: avalon-logkit-2.1-r6.ebuild avalon-logkit-2.1-r7.ebuild ChangeLog

[Patrice Clement (monsieurp)]

monsieurp    15/08/01 20:05:43

  Modified:             avalon-logkit-2.1-r6.ebuild ChangeLog
  Added:                avalon-logkit-2.1-r7.ebuild
  Log:
  EAPI 5 bump. Fix tests. Bump servlet-api SLOT.
  
  Signed-off-by: Patrice Clement <monsieurp@g.o>
  (Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 93491BB8)

Revision  Changes    Path
1.2                  dev-java/avalon-logkit/avalon-logkit-2.1-r6.ebuild

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

Index: avalon-logkit-2.1-r6.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/avalon-logkit/avalon-logkit-2.1-r6.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- avalon-logkit-2.1-r6.ebuild	29 Sep 2012 11:04:43 -0000	1.1
+++ avalon-logkit-2.1-r6.ebuild	1 Aug 2015 20:05:43 -0000	1.2
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/avalon-logkit/avalon-logkit-2.1-r6.ebuild,v 1.1 2012/09/29 11:04:43 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/avalon-logkit/avalon-logkit-2.1-r6.ebuild,v 1.2 2015/08/01 20:05:43 monsieurp Exp $
 
 EAPI=4
 
@@ -21,12 +21,14 @@
 	dev-java/log4j:0
 	java-virtuals/jms:0
 	java-virtuals/javamail:0
-	java-virtuals/servlet-api:2.5"
+	java-virtuals/servlet-api:3.0"
 RDEPEND="${COMMON_DEP}
 	>=virtual/jre-1.4"
 DEPEND="${COMMON_DEP}
 	>=virtual/jdk-1.4
-	test? ( dev-java/ant-junit )"
+	test? (
+		dev-java/ant-junit:0
+	)"
 
 java_prepare() {
 	# Doesn't like 1.6 / 1.7 changes to JDBC



1.100                dev-java/avalon-logkit/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/avalon-logkit/ChangeLog,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -r1.99 -r1.100
--- ChangeLog	10 Aug 2014 20:08:27 -0000	1.99
+++ ChangeLog	1 Aug 2015 20:05:43 -0000	1.100
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/avalon-logkit
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/avalon-logkit/ChangeLog,v 1.99 2014/08/10 20:08:27 slyfox Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/avalon-logkit/ChangeLog,v 1.100 2015/08/01 20:05:43 monsieurp Exp $
+
+*avalon-logkit-2.1-r7 (01 Aug 2015)
+
+  01 Aug 2015; Patrice Clement <monsieurp@g.o>
+  +avalon-logkit-2.1-r7.ebuild, avalon-logkit-2.1-r6.ebuild:
+  EAPI 5 bump. Fix tests. Bump servlet-api SLOT.
 
   10 Aug 2014; Sergei Trofimovich <slyfox@g.o>
   avalon-logkit-1.2.2-r1.ebuild:



1.1                  dev-java/avalon-logkit/avalon-logkit-2.1-r7.ebuild

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

Index: avalon-logkit-2.1-r7.ebuild
===================================================================
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-java/avalon-logkit/avalon-logkit-2.1-r7.ebuild,v 1.1 2015/08/01 20:05:43 monsieurp Exp $

EAPI=5

JAVA_PKG_IUSE="doc source test"

inherit java-pkg-2 java-ant-2

# NB: this project is dead and we should look into removing it from the tree.
# Take a look at the homepage.
DESCRIPTION="Easy-to-use Java logging toolkit"
HOMEPAGE="http://avalon.apache.org/"
SRC_URI="mirror://apache/excalibur/excalibur-logkit/source/${P}-src.tar.gz"

KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
LICENSE="Apache-2.0"
SLOT="2.0"
IUSE=""

CDEPEND="
	dev-java/log4j:0
	java-virtuals/jms:0
	java-virtuals/javamail:0
	java-virtuals/servlet-api:3.0"
RDEPEND="${CDEPEND}
	>=virtual/jre-1.6"
DEPEND="${CDEPEND}
	>=virtual/jdk-1.6
	test? (
		dev-java/ant-junit:0
	)"

java_prepare() {
	# Doesn't like 1.6 / 1.7 changes to JDBC
	epatch "${FILESDIR}/${P}-java7.patch"

	java-ant_ignore-system-classes

	java-ant_xml-rewrite \
		-f build.xml \
		-c -e available \
		-a classpathref \
		-v 'build.classpath' || die

	java-pkg_filter-compiler jikes
}

JAVA_ANT_REWRITE_CLASSPATH="yes"

EANT_GENTOO_CLASSPATH="javamail,jms,log4j,servlet-api-3.0"

src_test() {
	java-pkg-2_src_test
}

src_install() {
	java-pkg_newjar target/${P}.jar
	use doc && java-pkg_dojavadoc dist/docs/api
	use source && java-pkg_dosrc src/java/*
}