[gentoo-commits] gentoo-x86 commit in dev-java/fop: ChangeLog fop-0.94.ebuild fop-0.20.5-r7.ebuild

[Vlastimil Babka (caster)]

caster      07/11/10 00:39:01

  Modified:             ChangeLog
  Added:                fop-0.94.ebuild
  Removed:              fop-0.20.5-r7.ebuild
  Log:
  Version bump, bug #194687. No more ecj forcing, javac seems fine even on amd64. Javadoc generation still masked on amd64 though. Also dropped od 0.20.5 version.
  (Portage version: 2.1.3.19)

Revision  Changes    Path
1.55                 dev-java/fop/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/fop/ChangeLog?rev=1.55&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/fop/ChangeLog?rev=1.55&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/fop/ChangeLog?r1=1.54&r2=1.55

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/fop/ChangeLog,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- ChangeLog	18 Sep 2007 22:18:32 -0000	1.54
+++ ChangeLog	10 Nov 2007 00:39:01 -0000	1.55
@@ -1,6 +1,16 @@
 # ChangeLog for dev-java/fop
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/fop/ChangeLog,v 1.54 2007/09/18 22:18:32 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/fop/ChangeLog,v 1.55 2007/11/10 00:39:01 caster Exp $
+
+*fop-0.94 (10 Nov 2007)
+
+  10 Nov 2007; Vlastimil Babka <caster@g.o>
+  -files/0.20.5-buildxml.patch, -files/0.20.5-startscript.patch,
+  -files/0.20.5-no-autodetection.patch, -fop-0.20.5-r7.ebuild,
+  +fop-0.94.ebuild:
+  Version bump, bug #194687. No more ecj forcing, javac seems fine even on
+  amd64. Javadoc generation still masked on amd64 though. Also dropped od
+  0.20.5 version.
 
   18 Sep 2007; Petteri Räty <betelgeuse@g.o> fop-0.93-r1.ebuild:
   Add a built_with_use check for dev-java/xmlgraphics-commons and the jpeg use



1.1                  dev-java/fop/fop-0.94.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/fop/fop-0.94.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/fop/fop-0.94.ebuild?rev=1.1&content-type=text/plain

Index: fop-0.94.ebuild
===================================================================
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-java/fop/fop-0.94.ebuild,v 1.1 2007/11/10 00:39:01 caster Exp $

# TODO: if 'doc' use flag is used then should build also extra docs ('docs' ant target), currently it cannot
#       be built as it needs forrest which we do not have
# TODO: package and use optional dependency jeuclid

JAVA_PKG_IUSE="doc examples source"
WANT_ANT_TASKS="ant-trax"
inherit eutils java-pkg-2 java-ant-2

DESCRIPTION="Formatting Objects Processor is a print formatter driven by XSL"
HOMEPAGE="http://xmlgraphics.apache.org/fop/"
SRC_URI="mirror://apache/xmlgraphics/${PN}/${P}-src.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
# doesn't work with java.awt.headless
RESTRICT="test"
KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
IUSE="hyphenation jai jimi"

COMMON_DEPEND="
	>=dev-java/avalon-framework-4.2
	>=dev-java/batik-1.6
	dev-java/commons-io
	dev-java/commons-logging
	=dev-java/servletapi-2.2*
	>=dev-java/xmlgraphics-commons-1.1
	dev-java/xalan
	jai? ( dev-java/sun-jai-bin )
	jimi? ( dev-java/sun-jimi )"

RDEPEND=">=virtual/jre-1.4
	dev-java/ant-core
	${COMMON_DEPEND}"

DEPEND=">=virtual/jdk-1.4
	hyphenation? ( dev-java/offo-hyphenation )
	${COMMON_DEPEND}"
#	test? (
#		=dev-java/junit-3.8*
#		dev-java/xmlunit
#	)"

pkg_setup() {
	if ! built_with_use dev-java/xmlgraphics-commons jpeg; then
		msg="${CATEGORY}/${P} needs dev-java/xmlgraphics-commons built with"
		msg="${msg} the jpeg use flag"
		eerror ${msg}
		die "Recompile dev-java/xmlgraphics-commons with the jpeg use flag"
	fi
	java-pkg-2_pkg_setup
}

src_unpack() {
	unpack "${A}"
	cd "${S}"

	# automagic is bad
	java-ant_ignore-system-classes || die

	cd "${S}/lib"
	rm -v *.jar || die

	java-pkg_jarfrom ant-core ant.jar
	java-pkg_jarfrom avalon-framework-4.2 avalon-framework.jar \
		avalon-framework-4.2.0.jar
	java-pkg_jarfrom batik-1.6 batik-all.jar batik-all-1.6.jar
	java-pkg_jarfrom commons-io-1 commons-io.jar commons-io-1.3.1.jar
	java-pkg_jarfrom commons-logging commons-logging.jar \
		commons-logging-1.0.4.jar
	java-pkg_jarfrom servletapi-2.2 servlet.jar servlet-2.2.jar
	java-pkg_jarfrom xmlgraphics-commons-1 xmlgraphics-commons.jar \
		xmlgraphics-commons-1.2.jar
	java-pkg_jarfrom xalan xalan.jar xalan-2.7.0.jar

	use jai && java-pkg_jar-from sun-jai-bin
	use jimi && java-pkg_jar-from sun-jimi
}

src_compile() {
	# because I killed the automagic tests; all our JDK's have JCE
	local af="-Djdk14.present=true -Djce.present=true"
	use hyphenation && af="${af} -Duser.hyph.dir=/usr/share/offo-hyphenation/hyph/"
	use jai && af="${af} -Djai.present=true"
	use jimi && af="${af} -Djimi.present=true"

	export ANT_OPTS="-Xmx256m"
	eant ${af} -Djavahome.jdk14="${JAVA_HOME}" package $(use_doc javadocs)
}

src_test() {
	if use test ; then
		cd "${S}/lib"
		java-pkg_jar-from xmlunit-1
		java-pkg_jar-from junit
		cd "${S}"
	fi

	ANT_OPTS="-Xmx1g -Djava.awt.headless=true" eant -Djunit.fork=off junit
}

src_install() {
	java-pkg_dojar build/fop.jar build/fop-sandbox.jar
	if use hyphenation; then
		java-pkg_dojar build/fop-hyph.jar
		insinto /usr/share/${PN}/
		doins -r hyph || die
	fi

	# doesn't support everything upstream launcher does...
	java-pkg_dolauncher ${PN} --main org.apache.fop.cli.Main

	dodoc NOTICE README

	use doc && java-pkg_dojavadoc build/javadocs
	use examples && java-pkg_doexamples examples/* conf
	use source && java-pkg_dosrc src/java/org src/java-1.4/* src/sandbox/org
}



-- 
gentoo-commits@g.o mailing list