* [gentoo-commits] gentoo-x86 commit in dev-java/batik: batik-1.8.ebuild ChangeLog
@ 2015-06-07 23:38 Patrice Clement (monsieurp)
0 siblings, 0 replies; 7+ messages in thread
From: Patrice Clement (monsieurp) @ 2015-06-07 23:38 UTC (permalink / raw
To: gentoo-commits
monsieurp 15/06/07 23:38:40
Modified: ChangeLog
Added: batik-1.8.ebuild
Log:
Version bump. Fix security bug 543858.
Signed-off-by: Patrice Clement <monsieurp@gentoo.org>
(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 93491BB8)
Revision Changes Path
1.73 dev-java/batik/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/batik/ChangeLog?rev=1.73&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/batik/ChangeLog?rev=1.73&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/batik/ChangeLog?r1=1.72&r2=1.73
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/batik/ChangeLog,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- ChangeLog 17 Jun 2014 10:44:46 -0000 1.72
+++ ChangeLog 7 Jun 2015 23:38:39 -0000 1.73
@@ -1,6 +1,11 @@
# ChangeLog for dev-java/batik
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/batik/ChangeLog,v 1.72 2014/06/17 10:44:46 mrueg Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/batik/ChangeLog,v 1.73 2015/06/07 23:38:39 monsieurp Exp $
+
+*batik-1.8 (07 Jun 2015)
+
+ 07 Jun 2015; Patrice Clement <monsieurp@gentoo.org> +batik-1.8.ebuild:
+ Version bump. Fix security bug 543858.
17 Jun 2014; Manuel Rüger <mrueg@gentoo.org> -batik-1.7-r2.ebuild:
NM: Cleanup superseeded ebuilds.
1.1 dev-java/batik/batik-1.8.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/batik/batik-1.8.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/batik/batik-1.8.ebuild?rev=1.1&content-type=text/plain
Index: batik-1.8.ebuild
===================================================================
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-java/batik/batik-1.8.ebuild,v 1.1 2015/06/07 23:38:39 monsieurp Exp $
EAPI=5
JAVA_PKG_IUSE="doc"
inherit java-pkg-2 java-ant-2 eutils
DESCRIPTION="Java based SVG toolkit"
HOMEPAGE="https://xmlgraphics.apache.org/batik/"
SRC_URI="http://apache.mirrors.ovh.net/ftp.apache.org/dist/xmlgraphics/${PN}/source/${PN}-src-${PV}.tar.gz"
LICENSE="Apache-2.0"
SLOT="1.8"
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE="doc python tcl"
CDEPEND="dev-java/xalan:0
dev-java/rhino:1.6
dev-java/xml-commons-external:1.3
dev-java/xmlgraphics-commons:1.5
python? ( dev-java/jython:0 )
tcl? ( dev-java/jacl:0 )
dev-java/ant-core"
DEPEND=">=virtual/jdk-1.6
${CDEPEND}"
RDEPEND=">=virtual/jre-1.6
${CDEPEND}"
JAVA_ANT_REWRITE_CLASSPATH="true"
EANT_GENTOO_CLASSPATH="xml-commons-external-1.3,xmlgraphics-commons-1.5,xalan,rhino-1.6"
java_prepare() {
# bug #318323
for file in build.xml contrib/rasterizertask/build.xml; do
java-ant_xml-rewrite -f ${file} -c -e javadoc -a failonerror -v no -a maxmemory -v 512m
done
cd lib
rm -v *.jar build/*.jar || die
use python && java-pkg_jar-from jython
use tcl && java-pkg_jar-from jacl
}
src_compile() {
# Fails to build on amd64 without this
if use amd64 ; then
export ANT_OPTS="-Xmx1g"
else
export ANT_OPTS="-Xmx256m"
fi
eant jars all-jar $(use_doc)
cd contrib/rasterizertask || die
eant -Dgentoo.classpath="$(java-pkg_getjar ant-core ant.jar):../../classes" jar $(use_doc)
}
src_install() {
cd ${P}
# Unversion all jars in ${P}.
for jar in *.jar; do
newj="${jar%-*}.jar"
java-pkg_newjar ${jar} ${newj}
dosym ${newj} /usr/share/${PN}-${SLOT}/lib/lib/${jar}
done
# needed because batik expects this layout:
# batik.jar lib/*.jar
# there are hardcoded classpaths in the manifest :(
dodir /usr/share/${PN}-${SLOT}/lib/lib/
cd "${S}"
dodoc README CHANGES
use doc && java-pkg_dojavadoc ${P}/docs/javadoc
# pwd fixes bug #116976
java-pkg_dolauncher batik-${SLOT} --pwd "${EPREFIX}/usr/share/${PN}-${SLOT}/" \
--main org.apache.batik.apps.svgbrowser.Main
# To find these lsjar batik-${SLOT} | grep Main.class
for launcher in ttf2svg slideshow svgpp rasterizer; do
java-pkg_dolauncher batik-${launcher}-${SLOT} \
--main org.apache.batik.apps.${launcher}.Main
done
# Install and register the ant task.
java-pkg_dojar contrib/rasterizertask/build/lib/RasterizerTask.jar
java-pkg_register-ant-task
}
^ permalink raw reply [flat|nested] 7+ messages in thread
* [gentoo-commits] gentoo-x86 commit in dev-java/batik: batik-1.8.ebuild ChangeLog
@ 2015-06-13 9:58 Patrice Clement (monsieurp)
0 siblings, 0 replies; 7+ messages in thread
From: Patrice Clement (monsieurp) @ 2015-06-13 9:58 UTC (permalink / raw
To: gentoo-commits
monsieurp 15/06/13 09:58:36
Modified: batik-1.8.ebuild ChangeLog
Log:
Add some missing imports to avoid a compiling issue courtesy of Martin von Gagern <Martin.vGagern@gmx.net>. Fix bug 551952.
Signed-off-by: Patrice Clement <monsieurp@gentoo.org>
(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 93491BB8)
Revision Changes Path
1.2 dev-java/batik/batik-1.8.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/batik/batik-1.8.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/batik/batik-1.8.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/batik/batik-1.8.ebuild?r1=1.1&r2=1.2
Index: batik-1.8.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/batik/batik-1.8.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- batik-1.8.ebuild 7 Jun 2015 23:38:39 -0000 1.1
+++ batik-1.8.ebuild 13 Jun 2015 09:58:36 -0000 1.2
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/batik/batik-1.8.ebuild,v 1.1 2015/06/07 23:38:39 monsieurp Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/batik/batik-1.8.ebuild,v 1.2 2015/06/13 09:58:36 monsieurp Exp $
EAPI=5
JAVA_PKG_IUSE="doc"
@@ -22,7 +22,7 @@
dev-java/xmlgraphics-commons:1.5
python? ( dev-java/jython:0 )
tcl? ( dev-java/jacl:0 )
- dev-java/ant-core"
+ dev-java/ant-core:0"
DEPEND=">=virtual/jdk-1.6
${CDEPEND}"
RDEPEND=">=virtual/jre-1.6
@@ -37,6 +37,18 @@
java-ant_xml-rewrite -f ${file} -c -e javadoc -a failonerror -v no -a maxmemory -v 512m
done
+ # Add some missing imports to avoid a compiling issue.
+ # https://bugs.gentoo.org/show_bug.cgi?id=551952
+ # https://issues.apache.org/jira/browse/BATIK-1123
+ local imports=()
+ imports+=(sources/org/apache/batik/script/jpython/JPythonInterpreterFactory.java)
+ imports+=(sources/org/apache/batik/script/jacl/JaclInterpreterFactory.java)
+ for import in ${imports[@]}; do
+ einfo "Fixing missing import in ${import}"
+ sed -i '23i import org.apache.batik.script.ImportInfo;' ${import}
+ eend $?
+ done
+
cd lib
rm -v *.jar build/*.jar || die
use python && java-pkg_jar-from jython
1.74 dev-java/batik/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/batik/ChangeLog?rev=1.74&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/batik/ChangeLog?rev=1.74&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/batik/ChangeLog?r1=1.73&r2=1.74
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/batik/ChangeLog,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- ChangeLog 7 Jun 2015 23:38:39 -0000 1.73
+++ ChangeLog 13 Jun 2015 09:58:36 -0000 1.74
@@ -1,6 +1,10 @@
# ChangeLog for dev-java/batik
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/batik/ChangeLog,v 1.73 2015/06/07 23:38:39 monsieurp Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/batik/ChangeLog,v 1.74 2015/06/13 09:58:36 monsieurp Exp $
+
+ 13 Jun 2015; Patrice Clement <monsieurp@gentoo.org> batik-1.8.ebuild:
+ Add some missing imports to avoid a compiling issue courtesy of Martin von
+ Gagern <Martin.vGagern@gmx.net>. Fix bug 551952.
*batik-1.8 (07 Jun 2015)
^ permalink raw reply [flat|nested] 7+ messages in thread
* [gentoo-commits] gentoo-x86 commit in dev-java/batik: batik-1.8.ebuild ChangeLog
@ 2015-06-16 7:18 Agostino Sarubbo (ago)
0 siblings, 0 replies; 7+ messages in thread
From: Agostino Sarubbo (ago) @ 2015-06-16 7:18 UTC (permalink / raw
To: gentoo-commits
ago 15/06/16 07:18:29
Modified: batik-1.8.ebuild ChangeLog
Log:
Stable for amd64, wrt bug #543858
(Portage version: 2.2.18/cvs/Linux x86_64, RepoMan options: --include-arches="amd64", signed Manifest commit with key 7194459F)
Revision Changes Path
1.3 dev-java/batik/batik-1.8.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/batik/batik-1.8.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/batik/batik-1.8.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/batik/batik-1.8.ebuild?r1=1.2&r2=1.3
Index: batik-1.8.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/batik/batik-1.8.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- batik-1.8.ebuild 13 Jun 2015 09:58:36 -0000 1.2
+++ batik-1.8.ebuild 16 Jun 2015 07:18:29 -0000 1.3
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/batik/batik-1.8.ebuild,v 1.2 2015/06/13 09:58:36 monsieurp Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/batik/batik-1.8.ebuild,v 1.3 2015/06/16 07:18:29 ago Exp $
EAPI=5
JAVA_PKG_IUSE="doc"
@@ -13,7 +13,7 @@
LICENSE="Apache-2.0"
SLOT="1.8"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE="doc python tcl"
CDEPEND="dev-java/xalan:0
1.75 dev-java/batik/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/batik/ChangeLog?rev=1.75&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/batik/ChangeLog?rev=1.75&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/batik/ChangeLog?r1=1.74&r2=1.75
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/batik/ChangeLog,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- ChangeLog 13 Jun 2015 09:58:36 -0000 1.74
+++ ChangeLog 16 Jun 2015 07:18:29 -0000 1.75
@@ -1,6 +1,9 @@
# ChangeLog for dev-java/batik
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/batik/ChangeLog,v 1.74 2015/06/13 09:58:36 monsieurp Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/batik/ChangeLog,v 1.75 2015/06/16 07:18:29 ago Exp $
+
+ 16 Jun 2015; Agostino Sarubbo <ago@gentoo.org> batik-1.8.ebuild:
+ Stable for amd64, wrt bug #543858
13 Jun 2015; Patrice Clement <monsieurp@gentoo.org> batik-1.8.ebuild:
Add some missing imports to avoid a compiling issue courtesy of Martin von
^ permalink raw reply [flat|nested] 7+ messages in thread
* [gentoo-commits] gentoo-x86 commit in dev-java/batik: batik-1.8.ebuild ChangeLog
@ 2015-06-17 7:31 Agostino Sarubbo (ago)
0 siblings, 0 replies; 7+ messages in thread
From: Agostino Sarubbo (ago) @ 2015-06-17 7:31 UTC (permalink / raw
To: gentoo-commits
ago 15/06/17 07:31:34
Modified: batik-1.8.ebuild ChangeLog
Log:
Stable for x86, wrt bug #543858
(Portage version: 2.2.18/cvs/Linux x86_64, RepoMan options: --include-arches="x86", signed Manifest commit with key 7194459F)
Revision Changes Path
1.4 dev-java/batik/batik-1.8.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/batik/batik-1.8.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/batik/batik-1.8.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/batik/batik-1.8.ebuild?r1=1.3&r2=1.4
Index: batik-1.8.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/batik/batik-1.8.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- batik-1.8.ebuild 16 Jun 2015 07:18:29 -0000 1.3
+++ batik-1.8.ebuild 17 Jun 2015 07:31:34 -0000 1.4
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/batik/batik-1.8.ebuild,v 1.3 2015/06/16 07:18:29 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/batik/batik-1.8.ebuild,v 1.4 2015/06/17 07:31:34 ago Exp $
EAPI=5
JAVA_PKG_IUSE="doc"
@@ -13,7 +13,7 @@
LICENSE="Apache-2.0"
SLOT="1.8"
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE="doc python tcl"
CDEPEND="dev-java/xalan:0
1.76 dev-java/batik/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/batik/ChangeLog?rev=1.76&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/batik/ChangeLog?rev=1.76&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/batik/ChangeLog?r1=1.75&r2=1.76
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/batik/ChangeLog,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- ChangeLog 16 Jun 2015 07:18:29 -0000 1.75
+++ ChangeLog 17 Jun 2015 07:31:34 -0000 1.76
@@ -1,6 +1,9 @@
# ChangeLog for dev-java/batik
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/batik/ChangeLog,v 1.75 2015/06/16 07:18:29 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/batik/ChangeLog,v 1.76 2015/06/17 07:31:34 ago Exp $
+
+ 17 Jun 2015; Agostino Sarubbo <ago@gentoo.org> batik-1.8.ebuild:
+ Stable for x86, wrt bug #543858
16 Jun 2015; Agostino Sarubbo <ago@gentoo.org> batik-1.8.ebuild:
Stable for amd64, wrt bug #543858
^ permalink raw reply [flat|nested] 7+ messages in thread
* [gentoo-commits] gentoo-x86 commit in dev-java/batik: batik-1.8.ebuild ChangeLog
@ 2015-06-22 8:23 Agostino Sarubbo (ago)
0 siblings, 0 replies; 7+ messages in thread
From: Agostino Sarubbo (ago) @ 2015-06-22 8:23 UTC (permalink / raw
To: gentoo-commits
ago 15/06/22 08:23:38
Modified: batik-1.8.ebuild ChangeLog
Log:
Stable for ppc, wrt bug #543858
(Portage version: 2.2.18/cvs/Linux x86_64, RepoMan options: --include-arches="ppc", signed Manifest commit with key 7194459F)
Revision Changes Path
1.5 dev-java/batik/batik-1.8.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/batik/batik-1.8.ebuild?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/batik/batik-1.8.ebuild?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/batik/batik-1.8.ebuild?r1=1.4&r2=1.5
Index: batik-1.8.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/batik/batik-1.8.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- batik-1.8.ebuild 17 Jun 2015 07:31:34 -0000 1.4
+++ batik-1.8.ebuild 22 Jun 2015 08:23:38 -0000 1.5
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/batik/batik-1.8.ebuild,v 1.4 2015/06/17 07:31:34 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/batik/batik-1.8.ebuild,v 1.5 2015/06/22 08:23:38 ago Exp $
EAPI=5
JAVA_PKG_IUSE="doc"
@@ -13,7 +13,7 @@
LICENSE="Apache-2.0"
SLOT="1.8"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE="doc python tcl"
CDEPEND="dev-java/xalan:0
1.77 dev-java/batik/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/batik/ChangeLog?rev=1.77&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/batik/ChangeLog?rev=1.77&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/batik/ChangeLog?r1=1.76&r2=1.77
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/batik/ChangeLog,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- ChangeLog 17 Jun 2015 07:31:34 -0000 1.76
+++ ChangeLog 22 Jun 2015 08:23:38 -0000 1.77
@@ -1,6 +1,9 @@
# ChangeLog for dev-java/batik
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/batik/ChangeLog,v 1.76 2015/06/17 07:31:34 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/batik/ChangeLog,v 1.77 2015/06/22 08:23:38 ago Exp $
+
+ 22 Jun 2015; Agostino Sarubbo <ago@gentoo.org> batik-1.8.ebuild:
+ Stable for ppc, wrt bug #543858
17 Jun 2015; Agostino Sarubbo <ago@gentoo.org> batik-1.8.ebuild:
Stable for x86, wrt bug #543858
^ permalink raw reply [flat|nested] 7+ messages in thread
* [gentoo-commits] gentoo-x86 commit in dev-java/batik: batik-1.8.ebuild ChangeLog
@ 2015-06-22 8:23 Agostino Sarubbo (ago)
0 siblings, 0 replies; 7+ messages in thread
From: Agostino Sarubbo (ago) @ 2015-06-22 8:23 UTC (permalink / raw
To: gentoo-commits
ago 15/06/22 08:23:58
Modified: batik-1.8.ebuild ChangeLog
Log:
Stable for ppc64, wrt bug #543858
(Portage version: 2.2.18/cvs/Linux x86_64, RepoMan options: --include-arches="ppc64", signed Manifest commit with key 7194459F)
Revision Changes Path
1.6 dev-java/batik/batik-1.8.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/batik/batik-1.8.ebuild?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/batik/batik-1.8.ebuild?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/batik/batik-1.8.ebuild?r1=1.5&r2=1.6
Index: batik-1.8.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/batik/batik-1.8.ebuild,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- batik-1.8.ebuild 22 Jun 2015 08:23:38 -0000 1.5
+++ batik-1.8.ebuild 22 Jun 2015 08:23:58 -0000 1.6
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/batik/batik-1.8.ebuild,v 1.5 2015/06/22 08:23:38 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/batik/batik-1.8.ebuild,v 1.6 2015/06/22 08:23:58 ago Exp $
EAPI=5
JAVA_PKG_IUSE="doc"
@@ -13,7 +13,7 @@
LICENSE="Apache-2.0"
SLOT="1.8"
-KEYWORDS="amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE="doc python tcl"
CDEPEND="dev-java/xalan:0
1.78 dev-java/batik/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/batik/ChangeLog?rev=1.78&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/batik/ChangeLog?rev=1.78&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/batik/ChangeLog?r1=1.77&r2=1.78
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/batik/ChangeLog,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- ChangeLog 22 Jun 2015 08:23:38 -0000 1.77
+++ ChangeLog 22 Jun 2015 08:23:58 -0000 1.78
@@ -1,6 +1,9 @@
# ChangeLog for dev-java/batik
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/batik/ChangeLog,v 1.77 2015/06/22 08:23:38 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/batik/ChangeLog,v 1.78 2015/06/22 08:23:58 ago Exp $
+
+ 22 Jun 2015; Agostino Sarubbo <ago@gentoo.org> batik-1.8.ebuild:
+ Stable for ppc64, wrt bug #543858
22 Jun 2015; Agostino Sarubbo <ago@gentoo.org> batik-1.8.ebuild:
Stable for ppc, wrt bug #543858
^ permalink raw reply [flat|nested] 7+ messages in thread
* [gentoo-commits] gentoo-x86 commit in dev-java/batik: batik-1.8.ebuild ChangeLog
@ 2015-06-22 14:03 Patrice Clement (monsieurp)
0 siblings, 0 replies; 7+ messages in thread
From: Patrice Clement (monsieurp) @ 2015-06-22 14:03 UTC (permalink / raw
To: gentoo-commits
monsieurp 15/06/22 14:03:38
Modified: batik-1.8.ebuild ChangeLog
Log:
Rework jars installation logic. Symlinking to lib/lib isn't necessary in this version so let's do away with it. Fix bug 552830.
Signed-off-by: Patrice Clement <monsieurp@gentoo.org>
(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 93491BB8)
Revision Changes Path
1.7 dev-java/batik/batik-1.8.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/batik/batik-1.8.ebuild?rev=1.7&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/batik/batik-1.8.ebuild?rev=1.7&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/batik/batik-1.8.ebuild?r1=1.6&r2=1.7
Index: batik-1.8.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/batik/batik-1.8.ebuild,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- batik-1.8.ebuild 22 Jun 2015 08:23:58 -0000 1.6
+++ batik-1.8.ebuild 22 Jun 2015 14:03:37 -0000 1.7
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/batik/batik-1.8.ebuild,v 1.6 2015/06/22 08:23:58 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/batik/batik-1.8.ebuild,v 1.7 2015/06/22 14:03:37 monsieurp Exp $
EAPI=5
JAVA_PKG_IUSE="doc"
@@ -66,23 +66,32 @@
eant jars all-jar $(use_doc)
cd contrib/rasterizertask || die
eant -Dgentoo.classpath="$(java-pkg_getjar ant-core ant.jar):../../classes" jar $(use_doc)
+
+ cd "${S}"/"${P}/lib" || die
+
+ # batik-all-1.8.jar is a all-in-one jar that contains all other jars.
+ # We don't want to package it.
+ rm -v ${PN}-all-${PV}.jar
}
src_install() {
- cd ${P}
- # Unversion all jars in ${P}.
- for jar in *.jar; do
- newj="${jar%-*}.jar"
- java-pkg_newjar ${jar} ${newj}
- dosym ${newj} /usr/share/${PN}-${SLOT}/lib/lib/${jar}
- done
-
- # needed because batik expects this layout:
- # batik.jar lib/*.jar
- # there are hardcoded classpaths in the manifest :(
- dodir /usr/share/${PN}-${SLOT}/lib/lib/
+ batik_unversion_jars() {
+ for jar in batik-*.jar; do
+ newj="${jar%-*}.jar"
+ java-pkg_newjar ${jar} ${newj}
+ done
+ }
+
+ # First unversion jars in ${P}/lib
+ cd "${S}"/"${P}"/lib || die
+ batik_unversion_jars
+
+ # Then, only those in ${P}
+ cd "${S}"/"${P}" || die
+ batik_unversion_jars
- cd "${S}"
+ # Proceed with documentation installation
+ cd "${S}" || die
dodoc README CHANGES
use doc && java-pkg_dojavadoc ${P}/docs/javadoc
1.81 dev-java/batik/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/batik/ChangeLog?rev=1.81&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/batik/ChangeLog?rev=1.81&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/batik/ChangeLog?r1=1.80&r2=1.81
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/batik/ChangeLog,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- ChangeLog 22 Jun 2015 12:03:55 -0000 1.80
+++ ChangeLog 22 Jun 2015 14:03:37 -0000 1.81
@@ -1,6 +1,11 @@
# ChangeLog for dev-java/batik
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/batik/ChangeLog,v 1.80 2015/06/22 12:03:55 monsieurp Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/batik/ChangeLog,v 1.81 2015/06/22 14:03:37 monsieurp Exp $
+
+ 22 Jun 2015; Patrice Clement <monsieurp@gentoo.org> batik-1.7-r3.ebuild,
+ batik-1.8.ebuild:
+ Rework jars installation logic. Symlinking to lib/lib isn't necessary in this
+ version so let's do away with it. Fix bug 552830.
*batik-1.7-r3 (22 Jun 2015)
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2015-06-22 14:03 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-06-22 14:03 [gentoo-commits] gentoo-x86 commit in dev-java/batik: batik-1.8.ebuild ChangeLog Patrice Clement (monsieurp)
-- strict thread matches above, loose matches on Subject: below --
2015-06-22 8:23 Agostino Sarubbo (ago)
2015-06-22 8:23 Agostino Sarubbo (ago)
2015-06-17 7:31 Agostino Sarubbo (ago)
2015-06-16 7:18 Agostino Sarubbo (ago)
2015-06-13 9:58 Patrice Clement (monsieurp)
2015-06-07 23:38 Patrice Clement (monsieurp)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox