From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 4CDD21381F3 for ; Wed, 24 Apr 2013 04:42:02 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CD1C6E09F5; Wed, 24 Apr 2013 04:42:01 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 4D023E09F5 for ; Wed, 24 Apr 2013 04:42:01 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 208B033D8CC for ; Wed, 24 Apr 2013 04:42:00 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 42F05E4406 for ; Wed, 24 Apr 2013 04:41:57 +0000 (UTC) From: "Guillaume Horel" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Guillaume Horel" Message-ID: <1366773619.d2b8cb46fef6f1eb8b35229f599c2173d5f27b00.guillaume_horel@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: dev-java/jlatexmath-fop/, dev-java/jlatexmath-fop/files/ X-VCS-Repository: proj/sci X-VCS-Files: dev-java/jlatexmath-fop/files/jlatexmath-fop-1.0.2-fixpaths.patch dev-java/jlatexmath-fop/files/version.xml dev-java/jlatexmath-fop/jlatexmath-fop-0.9.7.ebuild dev-java/jlatexmath-fop/jlatexmath-fop-1.0.0.ebuild dev-java/jlatexmath-fop/jlatexmath-fop-1.0.2.ebuild X-VCS-Directories: dev-java/jlatexmath-fop/ dev-java/jlatexmath-fop/files/ X-VCS-Committer: guillaume_horel X-VCS-Committer-Name: Guillaume Horel X-VCS-Revision: d2b8cb46fef6f1eb8b35229f599c2173d5f27b00 X-VCS-Branch: master Date: Wed, 24 Apr 2013 04:41:57 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 2480fab9-1f8a-425e-a0a7-57acb3184e21 X-Archives-Hash: 9a79121f8e2c43fa98dba41709011130 commit: d2b8cb46fef6f1eb8b35229f599c2173d5f27b00 Author: Guillaume Horel gmail com> AuthorDate: Wed Apr 24 02:45:09 2013 +0000 Commit: Guillaume Horel gmail 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 @@ + + +- +- ++ ++ + + + 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 @@ + + + + + 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 +}