dev-java/jlatexmath-fop version bump

6 files changed, 64 insertions, 106 deletions

diff --git a/dev-java/jlatexmath-fop/Manifest b/dev-java/jlatexmath-fop/Manifest
index b3a18c0c6..9b17143a6 100644
--- a/dev-java/jlatexmath-fop/Manifest
+++ b/dev-java/jlatexmath-fop/Manifest
@@ -1,2 +1 @@
-DIST jlatexmath-src-all-0.9.7.zip 1177126 SHA256 f27772c54e438034ea5cd70fc53b5cef8775578b50b41597bf23e2960c98d4f6 SHA512 1d2f1e66ec55f90e81bf7c4ffe1719589de2527f40fb7872e6e653ca2deb31f5fe6da6f3a90a608e3df02be4b625485403cc1d1d4a2b4738ecf5f2f35604c816 WHIRLPOOL 408f19aca68d494a75b452efdec8d2be1a295e04dafff934715a7af934068edb176b101ef8bd56f07a89a8bf8bb6040a646f83429c8ce706991bb39271c70dd1
-DIST jlatexmath-src-all-1.0.0.zip 1177772 SHA256 0e21fa493d30e878ee533f372ffd4d51cc85084a83c7fc79bf4f89a9d9b7268e SHA512 0d5dcb3d2b02c98be6cf17fa9fe313c4694bc353755b958bdfd3e1da83a99d5447fcb742c7e7bd0cc97a0face0b89dc7f8668abb7f7eb8f7753868986cca1b0f WHIRLPOOL e723c2a86aafcb84e6dec4199ed5df58478e0800a3039f777b89c372c87229c429af936cf0b134fc8f43e8b3f23684606500fa6f81b308132296bdc74d18482a
+DIST jlatexmath-fop-src-1.0.2.zip 114459 SHA256 40becda795ee73a6a80805d614c5e30a763da333c2c568465234e7548f260fdf SHA512 4154c38e4c9a66a7e260d471710810331b04bf651df120d3e24f49335799bdf0f5000f0b0c01c4aea24d753a36a05c76c97405fa22c1059aa8944e8995757f81 WHIRLPOOL b98cdac4aab40a8ff147930b045e31756f639bdff5c0ce8628ca6620370c756f0e6eb47143fa1f403f2daffaa83b45aa41467571b59bade5cfbf1812f451eb67
diff --git a/dev-java/jlatexmath-fop/files/jlatexmath-fop-1.0.2-fixpaths.patch b/dev-java/jlatexmath-fop/files/jlatexmath-fop-1.0.2-fixpaths.patch
new file mode 100644
index 000000000..a03051c36
--- /dev/null
+++ b/dev-java/jlatexmath-fop/files/jlatexmath-fop-1.0.2-fixpaths.patch
@@ -0,0 +1,13 @@
+diff -urN work-orig/build.xml work/build.xml
+--- work-orig/build.xml	2013-04-23 20:42:19.776644942 -0400
++++ work/build.xml	2013-04-23 20:42:36.821646638 -0400
+@@ -1,7 +1,7 @@
+ <?xml version="1.0" encoding="ISO-8859-1"?>
+ <project name="jlatexmath-fop" basedir="." default="buildJar">
+-  <import file="${basedir}/../../version.xml"/>
+-  <property file="../../fop.properties"/>
++  <import file="${basedir}/version.xml"/>
++  <property file="fop.properties"/>
+ 
+   <path id="libs-build-classpath">
+     <pathelement location="${fop.jar}"/>
diff --git a/dev-java/jlatexmath-fop/files/version.xml b/dev-java/jlatexmath-fop/files/version.xml
new file mode 100644
index 000000000..7f1d9c225
--- /dev/null
+++ b/dev-java/jlatexmath-fop/files/version.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="version_jlm">
+  <property name="version" value="1.0.2" />
+  <property name="java_version" value="5" />
+</project>
diff --git a/dev-java/jlatexmath-fop/jlatexmath-fop-0.9.7.ebuild b/dev-java/jlatexmath-fop/jlatexmath-fop-0.9.7.ebuild
deleted file mode 100644
index 0641c214c..000000000
--- a/dev-java/jlatexmath-fop/jlatexmath-fop-0.9.7.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-JAVA_PKG_IUSE="examples source"
-
-inherit java-pkg-2 java-ant-2
-
-MY_PN="${PN/-fop/}"
-MY_P="${P/-fop/}"
-
-DESCRIPTION="jlatexmath plugin for dev-java/fop"
-SRC_URI="http://forge.scilab.org/upload/jlatexmath/files/${MY_PN}-src-all-${PV}.zip"
-HOMEPAGE="http://forge.scilab.org/index.php/p/jlatexmath"
-
-IUSE=""
-CDEPEND="dev-java/jlatexmath
-	dev-java/avalon-framework
-	dev-java/fop"
-REPEND=">=virtual/jdk-1.5
-	${CDEPEND}"
-RDEPEND=">=virtual/jre-1.5
-	${CDEPEND}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-EANT_BUILD_TARGET="buildJar"
-
-S="${WORKDIR}/${MY_P}/plugin/fop"
-
-src_prepare() {
-	cd "${WORKDIR}/${MY_P}"
-	sed -i \
-		-e "s:/usr/share/java/fop.jar:$(java-pkg_getjar fop fop.jar):g" \
-		-e "s:/usr/share/java/xmlgraphics-commons.jar:$(java-pkg_getjar xmlgraphics-commons-1.3 xmlgraphics-commons.jar):g" \
-		-e "s:/usr/share/java/batik.jar:$(java-pkg_getjar batik-1.7 batik-all.jar):g" \
-		-e "s:/usr/share/java/avalon-framework.jar:$(java-pkg_getjar avalon-framework-4.2 avalon-framework.jar):g" \
-		-e "s:/usr/share/java/commons-io.jar:$(java-pkg_getjar commons-io-1 commons-io.jar):g" \
-		-e "s:/usr/share/java/commons-logging.jar:$(java-pkg_getjar commons-logging commons-logging.jar):g" \
-		-e "s:/usr/share/java/xml-apis-ext.jar:$(java-pkg_getjar xml-commons-external-1.3 xml-apis-ext.jar):g" \
-		fop.properties || die
-}
-
-src_install() {
-	java-pkg_newjar dist/${P}.jar ${PN}.jar
-	use source && java-pkg_dosrc src/org
-	use examples && java-pkg_doexamples examples
-}
diff --git a/dev-java/jlatexmath-fop/jlatexmath-fop-1.0.0.ebuild b/dev-java/jlatexmath-fop/jlatexmath-fop-1.0.0.ebuild
deleted file mode 100644
index 465f6f5bf..000000000
--- a/dev-java/jlatexmath-fop/jlatexmath-fop-1.0.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-JAVA_PKG_IUSE="examples source"
-
-inherit java-pkg-2 java-ant-2
-
-MY_PN="${PN/-fop/}"
-MY_P="${P/-fop/}"
-
-DESCRIPTION="jlatexmath plugin for dev-java/fop"
-SRC_URI="http://forge.scilab.org/upload/jlatexmath/files/${MY_PN}-src-all-${PV}.zip"
-HOMEPAGE="http://forge.scilab.org/index.php/p/jlatexmath"
-
-IUSE=""
-CDEPEND="dev-java/jlatexmath:1
-	dev-java/avalon-framework
-	dev-java/fop"
-REPEND=">=virtual/jdk-1.5
-	${CDEPEND}"
-RDEPEND=">=virtual/jre-1.5
-	${CDEPEND}"
-
-LICENSE="GPL-2"
-SLOT="1"
-KEYWORDS="~amd64 ~x86"
-
-EANT_BUILD_TARGET="buildJar"
-
-S="${WORKDIR}/${MY_P}/plugin/fop"
-
-src_prepare() {
-	cd "${WORKDIR}/${MY_P}"
-	sed -i \
-		-e "s:/usr/share/java/fop.jar:$(java-pkg_getjar fop fop.jar):g" \
-		-e "s:/usr/share/java/xmlgraphics-commons.jar:$(java-pkg_getjar xmlgraphics-commons-1.3 xmlgraphics-commons.jar):g" \
-		-e "s:/usr/share/java/batik.jar:$(java-pkg_getjar batik-1.7 batik-all.jar):g" \
-		-e "s:/usr/share/java/avalon-framework.jar:$(java-pkg_getjar avalon-framework-4.2 avalon-framework.jar):g" \
-		-e "s:/usr/share/java/commons-io.jar:$(java-pkg_getjar commons-io-1 commons-io.jar):g" \
-		-e "s:/usr/share/java/commons-logging.jar:$(java-pkg_getjar commons-logging commons-logging.jar):g" \
-		-e "s:/usr/share/java/xml-apis-ext.jar:$(java-pkg_getjar xml-commons-external-1.3 xml-apis-ext.jar):g" \
-		fop.properties || die
-}
-
-src_install() {
-	java-pkg_newjar dist/${P}.jar ${PN}.jar
-	use source && java-pkg_dosrc src/org
-	use examples && java-pkg_doexamples examples
-}
diff --git a/dev-java/jlatexmath-fop/jlatexmath-fop-1.0.2.ebuild b/dev-java/jlatexmath-fop/jlatexmath-fop-1.0.2.ebuild
new file mode 100644
index 000000000..759e03791
--- /dev/null
+++ b/dev-java/jlatexmath-fop/jlatexmath-fop-1.0.2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+JAVA_PKG_IUSE="examples source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="jlatexmath plugin for dev-java/fop"
+HOMEPAGE="http://forge.scilab.org/index.php/p/jlatexmath"
+SRC_URI="http://forge.scilab.org/upload/jlatexmath/files/${PN}-src-${PV}.zip"
+
+LICENSE="GPL-2"
+SLOT="1"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+CDEPEND="dev-java/jlatexmath:1
+	dev-java/xmlgraphics-commons:1.5
+	>=dev-java/fop-0.9.5:0"
+DEPEND=">=virtual/jdk-1.5
+	${CDEPEND}"
+RDEPEND=">=virtual/jre-1.5
+	${CDEPEND}"
+
+EANT_BUILD_TARGET="buildJar"
+
+S="${WORKDIR}"
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-fixpaths.patch"
+	cp "${FILESDIR}/version.xml" "${S}" || die
+	echo "fop.jar=$(java-pkg_getjar fop fop.jar)
+xmlgraphics-commons.jar=$(java-pkg_getjar xmlgraphics-commons-1.5 xmlgraphics-commons.jar)
+jlatexmath.jar=$(java-pkg_getjar jlatexmath-1 jlatexmath.jar)" \
+		 >>fop.properties || die
+}
+
+src_install() {
+	java-pkg_newjar dist/${P}.jar ${PN}.jar
+	use source && java-pkg_dosrc src/org
+	use examples && java-pkg_doexamples examples
+}