* [gentoo-commits] proj/sci:master commit in: dev-java/jlatexmath-fop/, dev-java/jlatexmath-fop/files/
@ 2013-04-24 4:41 Guillaume Horel
0 siblings, 0 replies; 3+ messages in thread
From: Guillaume Horel @ 2013-04-24 4:41 UTC (permalink / raw
To: gentoo-commits
commit: d2b8cb46fef6f1eb8b35229f599c2173d5f27b00
Author: Guillaume Horel <guillaume.horel <AT> gmail <DOT> com>
AuthorDate: Wed Apr 24 02:45:09 2013 +0000
Commit: Guillaume Horel <guillaume.horel <AT> gmail <DOT> com>
CommitDate: Wed Apr 24 03:20:19 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=d2b8cb46
dev-java/jlatexmath-fop version bump
---
.../files/jlatexmath-fop-1.0.2-fixpaths.patch | 13 +++++
dev-java/jlatexmath-fop/files/version.xml | 5 ++
.../jlatexmath-fop/jlatexmath-fop-0.9.7.ebuild | 52 --------------------
.../jlatexmath-fop/jlatexmath-fop-1.0.0.ebuild | 52 --------------------
.../jlatexmath-fop/jlatexmath-fop-1.0.2.ebuild | 45 +++++++++++++++++
5 files changed, 63 insertions(+), 104 deletions(-)
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 0000000..a03051c
--- /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 0000000..7f1d9c2
--- /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 0641c21..0000000
--- 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 465f6f5..0000000
--- 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 0000000..759e037
--- /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
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] proj/sci:master commit in: dev-java/jlatexmath-fop/, dev-java/jlatexmath-fop/files/
@ 2014-04-22 23:48 Guillaume Horel
0 siblings, 0 replies; 3+ messages in thread
From: Guillaume Horel @ 2014-04-22 23:48 UTC (permalink / raw
To: gentoo-commits
commit: f4a45f2e7042cfbe62d7dfcb9f3588640affee09
Author: Guillaume Horel <guillaume.horel <AT> gmail <DOT> com>
AuthorDate: Tue Apr 22 23:39:00 2014 +0000
Commit: Guillaume Horel <guillaume.horel <AT> gmail <DOT> com>
CommitDate: Tue Apr 22 23:46:37 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=f4a45f2e
dev-java/jlatexmath-fop: version bump
Package-Manager: portage-2.2.10
---
dev-java/jlatexmath-fop/ChangeLog | 9 ++++++++-
...-1.0.2-fixpaths.patch => jlatexmath-fop-1.0.3-fixpaths.patch} | 0
.../{jlatexmath-fop-1.0.2.ebuild => jlatexmath-fop-1.0.3.ebuild} | 0
3 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/dev-java/jlatexmath-fop/ChangeLog b/dev-java/jlatexmath-fop/ChangeLog
index 64edc60..0cfe7c2 100644
--- a/dev-java/jlatexmath-fop/ChangeLog
+++ b/dev-java/jlatexmath-fop/ChangeLog
@@ -1,7 +1,14 @@
# ChangeLog for dev-java/jlatexmath-fop
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*jlatexmath-fop-1.0.3 (22 Apr 2014)
+
+ 22 Apr 2014; Guillaume Horel <guillaume.horel@gmail.com>
+ +files/jlatexmath-fop-1.0.3-fixpaths.patch, +jlatexmath-fop-1.0.3.ebuild,
+ -files/jlatexmath-fop-1.0.2-fixpaths.patch, -jlatexmath-fop-1.0.2.ebuild:
+ dev-java/jlatexmath-fop: version bump
+
*jlatexmath-fop-1.0.0 (25 Sep 2012)
25 Sep 2012; Guillaume Horel <guillaume.horel@gmail.com>
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.3-fixpaths.patch
similarity index 100%
rename from dev-java/jlatexmath-fop/files/jlatexmath-fop-1.0.2-fixpaths.patch
rename to dev-java/jlatexmath-fop/files/jlatexmath-fop-1.0.3-fixpaths.patch
diff --git a/dev-java/jlatexmath-fop/jlatexmath-fop-1.0.2.ebuild b/dev-java/jlatexmath-fop/jlatexmath-fop-1.0.3.ebuild
similarity index 100%
rename from dev-java/jlatexmath-fop/jlatexmath-fop-1.0.2.ebuild
rename to dev-java/jlatexmath-fop/jlatexmath-fop-1.0.3.ebuild
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] proj/sci:master commit in: dev-java/jlatexmath-fop/, dev-java/jlatexmath-fop/files/
@ 2014-05-05 22:44 Guillaume Horel
0 siblings, 0 replies; 3+ messages in thread
From: Guillaume Horel @ 2014-05-05 22:44 UTC (permalink / raw
To: gentoo-commits
commit: 6f169c3d2908fa1e42c0e83c2021a5c024d2ed34
Author: Quentin Minster <quentin <AT> minster <DOT> io>
AuthorDate: Mon May 5 16:06:11 2014 +0000
Commit: Guillaume Horel <guillaume.horel <AT> gmail <DOT> com>
CommitDate: Mon May 5 16:07:59 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=6f169c3d
dev-java/jlatexmath-fop-1.0.3: fix wrong version number in version.xml
Package-Manager: portage-2.2.8-r1
---
dev-java/jlatexmath-fop/ChangeLog | 3 +++
dev-java/jlatexmath-fop/files/version.xml | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/dev-java/jlatexmath-fop/ChangeLog b/dev-java/jlatexmath-fop/ChangeLog
index 0cfe7c2..fb9bf4a 100644
--- a/dev-java/jlatexmath-fop/ChangeLog
+++ b/dev-java/jlatexmath-fop/ChangeLog
@@ -2,6 +2,9 @@
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 05 May 2014; Quentin Minster <quentin@minster.io> files/version.xml:
+ dev-java/jlatexmath-fop-1.0.3: fix wrong version number in version.xml
+
*jlatexmath-fop-1.0.3 (22 Apr 2014)
22 Apr 2014; Guillaume Horel <guillaume.horel@gmail.com>
diff --git a/dev-java/jlatexmath-fop/files/version.xml b/dev-java/jlatexmath-fop/files/version.xml
index 7f1d9c2..b538b79 100644
--- a/dev-java/jlatexmath-fop/files/version.xml
+++ b/dev-java/jlatexmath-fop/files/version.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="version_jlm">
- <property name="version" value="1.0.2" />
+ <property name="version" value="1.0.3" />
<property name="java_version" value="5" />
</project>
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2014-05-05 22:45 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-05-05 22:44 [gentoo-commits] proj/sci:master commit in: dev-java/jlatexmath-fop/, dev-java/jlatexmath-fop/files/ Guillaume Horel
-- strict thread matches above, loose matches on Subject: below --
2014-04-22 23:48 Guillaume Horel
2013-04-24 4:41 Guillaume Horel
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox