diff options
| author |   Patrice Clement <monsieurp@gentoo.org> | 2015-06-13 09:58:41 +0000 |
|---|---|---|
| committer | Patrice Clement <monsieurp@gentoo.org> | 2015-06-13 09:58:41 +0000 |
| commit | d130525af239f87c4c85fe71b63d2be52f4b3b1f (patch) | |
| tree | 83b69681a8605dec527f399f623712393b489b46 /dev-java | |
| parent | Add XSLoader to Perl 5.22 mask (diff) | |
| download | historical-d130525af239f87c4c85fe71b63d2be52f4b3b1f.tar.gz historical-d130525af239f87c4c85fe71b63d2be52f4b3b1f.tar.bz2 historical-d130525af239f87c4c85fe71b63d2be52f4b3b1f.zip | |
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>
Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0x93491BB8
Diffstat (limited to 'dev-java')
| -rw-r--r-- | dev-java/batik/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-java/batik/Manifest | 20 | ||||
| -rw-r--r-- | dev-java/batik/batik-1.8.ebuild | 16 |
3 files changed, 29 insertions, 13 deletions
diff --git a/dev-java/batik/ChangeLog b/dev-java/batik/ChangeLog index 83f8664d837b..fd3892493dd5 100644 --- a/dev-java/batik/ChangeLog +++ b/dev-java/batik/ChangeLog @@ -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) diff --git a/dev-java/batik/Manifest b/dev-java/batik/Manifest index 678f64999eb9..9decafba5f95 100644 --- a/dev-java/batik/Manifest +++ b/dev-java/batik/Manifest @@ -1,20 +1,20 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 -DIST batik-src-1.7.zip 741312 SHA256 fe0f385a6d94fe23953371fa00f63d1fec42c3698829bbc13877d0264f9ae623 SHA512 31abbd6250fc722f22b02004c4bb0d13b514164860cb867fd241cba33dbad363b203b641e471a227978098ac117028a10af66f414d8a4082e68098967dee965e WHIRLPOOL ba9da93099437ca42b2282eb29ce40c8954a8ef9c4552cc5215b1b5af3f06f5ecae3b481549f39ac24508f8b4d98e67bcb4a272786d215b5ed707188c1a9a87c +DIST batik-src-1.7.zip 15060504 SHA256 6bea593543a797561fa83651764e40b1b0ce01c1df21ab0359ade58e967379fd SHA512 7fee3e0d2c99e95517420c8170f68b4857fec87f69c7c55719b5e9914608900fca4c9d7d9b3e1166d678a6c844fe870a3c1051e2c1f35a2e6793a17b9087893e WHIRLPOOL 7e8f4e537d5c1d14778a8c151ff469edbc25e629c0cf99009c65a99c1dfac47d58c0bf0fa6b194bc51d8fe25ba7949f264b5d055cc22563ff50ecdd95d36daab DIST batik-src-1.8.tar.gz 14970684 SHA256 0f1175146d45445fc4940e214c3e1e5cfa0294ae6a9787859bda00964f97c2bd SHA512 352843fd0cec43c6d9d54426fe1c20a9bd2234798404b101f2e8d43f6089c0bf6bb5102cb5674de11d37a0d820a8bb79fe9dd854030b23fd8c68f3931eb12f1b WHIRLPOOL fa50d1f87257c6018f99076bf759066b2311f483d424ef743e45fe17c74c646a215c1211c5431b2a522913f23ff5f53934a1606d4d4a223e8298abd6ce94bb46 EBUILD batik-1.7-r3.ebuild 2610 SHA256 1b561e240e697f44be35b34bf4c0a27460a6035bd9c13cb9605151d9acea7dfa SHA512 17e9d144f009cc04595568c704bfa2d14f907dbb6ba6143d43bfd0cb6f32e5e35eddf27b73902fffbf08a50e6aef6e659052fcfb1e87f3143c38352ea4d78478 WHIRLPOOL 215bf1cdae087a6260803cf1fb0a481993eed63f037580a8b1975232316b583376c271b4d369ee87c72d82fc06636cf05082f2857b166e0df9945ee5d17d060a -EBUILD batik-1.8.ebuild 2598 SHA256 b4c4ea6457d7089fce8b820238badbb2b6063038f1cf1131af8d9fecf91e4098 SHA512 e39bb4bc545a80da2b3cb05e1ab53788bc60aab031d042df3904c1cdfd0f04d7ccfb6b60fdc6b5dad73b5e48401daa0936c4ec15c877a531b1ad6aa807706d60 WHIRLPOOL ff5487a5c3a1b77a56a9f14d0e27a1daa4555cdb0d0316fbf93b45bfac8a0d2850096b24f74c7bce3e2fe85f6890bcc70218ffdde4a0091e8bd41f4505de6ea4 -MISC ChangeLog 9729 SHA256 bad049c2fee5221c7ed3e6d640a33df0fbe415261b1dcb89a81d517f939e5a1f SHA512 51e5ca1d58ec1627423cbdd299af1a2473455dacdc376ca88481bfbf38ade69b282f00adb3a48cf05fa9fd75ec1a16d0678cb324c0304ca6d2b5d441217e225e WHIRLPOOL 107033564c6352ecb5af5727b2150701fb2403ee1f6fe47ed14c12b82b8a34ca75879eb9e53fe3b51f8122e66afacc02c26b06e4221f0547e1fc6b544e196524 +EBUILD batik-1.8.ebuild 3099 SHA256 6d8a04fd0b67e5a6c528c6847c912015df4c275690d49918c05b4f50d8910a9a SHA512 b6081daf5fae0250e492af5d7585ed54b2c06074fdce0f047bbdc667dc374de89957e4e1d4b3261e2cd8d6fa3389a0f02654f72b11f9a7ffed8433f45671a093 WHIRLPOOL fff8d4affac57d084405354c3d5a6f565fa469d9a50162c2bc0e2ef586f878a838fded0988510de62e6fce608f2142e1e5e89c4d8d429d96be2fcd39f522a84f +MISC ChangeLog 9930 SHA256 d4c553e7677b7cba589c497af907b8f49d00dac068c008a39fa5a87d8ead4a83 SHA512 55b0401d3efbc128c6cd13d1775d33047d84ee6fed6f40fcececccaace4b668dcc6c778cd29cad24af8f3225acdc1c046be151c6d75132ac1a6e86aa03a3d050 WHIRLPOOL dc073a176795a91e74c11b0dd6d4d5c6a259af88964a9bd77856e71eba4e5fb2d38a3c060276eab4f241b3f89b0b7572fac1fb9082bd2d57ecabfa4767521ab8 MISC metadata.xml 374 SHA256 f71a7581f22225196ad493f9f6c85e5379e3a62f482059827ae35ab66b834437 SHA512 57c2dbfe07d5395cadb81efbfcc2af61785d373e8b791f243895489af12945c3fb16e4f9fb229ebe2379868fec5d8224443e92b9389ddc9104224f6af8acd3b9 WHIRLPOOL a8475c29be2005c682b07ce66370d46bb562b49d38d62883005d7ed238f822043e95425c4644454dd0c1209c17c71362fe02bfadfea81fc6dae07de5dbd32cde -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iQEcBAEBCAAGBQJVdNYDAAoJEJGRpfGTSRu4DNAH/3qORuGkX98QJy/vZvCMbQSJ -K7+HgNf6dbjTGmGgUaqkQpD2ks/Ja2+IljpMPXZBS0Jw4MBTHJynvIGj37/FaEzP -lNDAH8lncDjjEZnJ7AF1nFLQ5DkVKXpVb83JWHYyqdqtIiscsvqkH2Am3MyzqDdE -wK8CnvtmqjUgB/ZZBhkAqpuS0WmHHWUocAb9fnRIIQnJxD93eFXMi92bsl3Xuw+4 -aDzBs3Dc92mjbtQoASZrupE4barCxYyqjQwu3uP0fBOtk/m5Mv47T1Pb6GRlRfMt -PsKdLmQa5EIYSno5ztZZgZE/C/Z3IO5uSS5FyGM0tqPQX+zppT8R8ucJEXGVb3A= -=eKvs +iQEcBAEBCAAGBQJVe/5CAAoJEJGRpfGTSRu48FMH/0Xac7X99Dl6s6De38FYbkTk +V/pZf+PDEko7ETIJGUvFd5p3xKc1IDGz7vb8+/Hox2Btw0kkZGMxPlt2PObgU0wf +tqkbigVj0rU7r3+Z1Ppe7SGlJcdwtJwhLU0zrCjIXRKlC0K+/19g9zzkHzzUrxEA +XM3Njue+A123nTfe9v3FLKOX0Z0tngEMh6Mk4Zwcn8Q7x3cVy971+he1QYV77uT/ +beiBKqfSlu/0fKGnvL9w9Xkor5TyFmaz6JvpVA4Xy3jxUCob0QzDDSOYJsb9H7NZ +TUiD3JrlyM39AzFXmJNjkxgmMppZAy30vx1J2RorR2WA9OY2negwpGy+OZhjGRA= +=33cC -----END PGP SIGNATURE----- diff --git a/dev-java/batik/batik-1.8.ebuild b/dev-java/batik/batik-1.8.ebuild index 64e44f4f0bb2..6ddda5a72f4c 100644 --- a/dev-java/batik/batik-1.8.ebuild +++ b/dev-java/batik/batik-1.8.ebuild @@ -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 @@ CDEPEND="dev-java/xalan:0 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_prepare() { 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 |