diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2021-03-12 21:55:15 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2021-03-12 21:55:15 +0000 |
| commit | 7218e1b46bceac05841e90472501742d905fb3fc (patch) | |
| tree | 56fae051db521b8fce8014cbc8b11484885b14b3 /dev-java/xpp2 | |
| parent | 6d691ad5b6239929063441bbd14c489e92e7396e (diff) | |
gentoo resync : 12.03.2021
Diffstat (limited to 'dev-java/xpp2')
| -rw-r--r-- | dev-java/xpp2/Manifest | 3 | ||||
| -rw-r--r-- | dev-java/xpp2/files/xpp2-2.1.10-fix-java5+.patch | 17 | ||||
| -rw-r--r-- | dev-java/xpp2/xpp2-2.1.10-r3.ebuild (renamed from dev-java/xpp2/xpp2-2.1.10-r2.ebuild) | 14 |
3 files changed, 29 insertions, 5 deletions
diff --git a/dev-java/xpp2/Manifest b/dev-java/xpp2/Manifest index df2393a6e352..0230a78c73b5 100644 --- a/dev-java/xpp2/Manifest +++ b/dev-java/xpp2/Manifest @@ -1,3 +1,4 @@ +AUX xpp2-2.1.10-fix-java5+.patch 872 BLAKE2B a8fa53326a2fefa40f726a4cd3e5e2828b3d2e50907736be1b2639489692ff2a0ff683d1538123163d5fe52d2935d97832d643d7365829ca1eaa7c7936623e75 SHA512 495dfb83a773d11fb1f9f423f1bfa532770710b4b16c1f6e64e517e8148958a5160ddbbc43dd4cdc7ecc51126fba1062a10277bc9234b58e46a044e81180b3a5 DIST PullParser2.1.10.tgz 2310288 BLAKE2B 0c1f3aedf88aae18e7cab40b04055fa7a20f6bfe05973e6cbe3b459b408dfa193834d22a6d77b3d1ba3802e115d89f73e3f423efc7571efc8f09bb73625950d6 SHA512 87a091e415a31cde27ca1193735743b60f516feb336a9a3577792636e54ab8d671a22e74eb8aa41268f6251c688c68fe92a28f735ec78b96b919909f80c59590 -EBUILD xpp2-2.1.10-r2.ebuild 1703 BLAKE2B e06143290e012eeda79ad750174ecf4003dd9c516ebc8c026a804d95c9d3dbc941a77283663397c1dabf7e41950896571b3439de09729b0f0e77861b6c3943ff SHA512 f0da8a4f57ff45c47185bfa7bf8dc825bf5ad73117c6658993efe747b3396d656536337ef228f8d847143c2d050209af0c7cf02104e0f297ef7bea3bc45eaa0b +EBUILD xpp2-2.1.10-r3.ebuild 1766 BLAKE2B d1c35f7eba0510c1a89781cc9dd2d6407eb070bef990786e485a71be119a730d6f8f9800afbb124caaaed2c1f5c619b680f2c916ccb78f84e2ca64dc37f18f35 SHA512 c37dd9b0c3fadb9b37567ece77598565eb70d75ef045925f99255c77c15e26b8b5dbe8e5d1c23ab1f32f14d555d3d3980bfaa4ddb6b50f628cb988ba3853039e MISC metadata.xml 458 BLAKE2B 5a23e3b43da0a680538428c1cbd29dc6555459408a7d9520410a5da0f904cd9bfc1864e27b7f3aae2a94afca4c0f276c5cdaf09612a77759a64b7fb0c2f345ed SHA512 9004485c7ad032ec1f11aa89e7bc286f52d45f3886cca36912d12891f409d6d70cff063cf3790b7e05f4e280e1a953987dab155feecea461d5a3ff5cea0a430a diff --git a/dev-java/xpp2/files/xpp2-2.1.10-fix-java5+.patch b/dev-java/xpp2/files/xpp2-2.1.10-fix-java5+.patch new file mode 100644 index 000000000000..883bf5fa2d9a --- /dev/null +++ b/dev-java/xpp2/files/xpp2-2.1.10-fix-java5+.patch @@ -0,0 +1,17 @@ +diff --git a/src/java/impl/node/org/gjt/xpp/impl/node/Node.java b/src/java/impl/node/org/gjt/xpp/impl/node/Node.java +index 7c66608..6c128e9 100644 +--- a/src/java/impl/node/org/gjt/xpp/impl/node/Node.java ++++ b/src/java/impl/node/org/gjt/xpp/impl/node/Node.java +@@ -273,9 +273,9 @@ public class Node extends StartTag implements XmlNode { + oneChild = null;
+
+ if(children != null && children.size() > 0) {
+- Enumeration enum = children.elements();
+- while (enum.hasMoreElements()) {
+- Object child = enum.nextElement();
++ Enumeration elements = children.elements();
++ while (elements.hasMoreElements()) {
++ Object child = elements.nextElement();
+ if(child instanceof XmlNode) {
+ ((XmlNode)child).setParentNode(null);
+ }
diff --git a/dev-java/xpp2/xpp2-2.1.10-r2.ebuild b/dev-java/xpp2/xpp2-2.1.10-r3.ebuild index bb124374b5c7..db77c7e64ae0 100644 --- a/dev-java/xpp2/xpp2-2.1.10-r2.ebuild +++ b/dev-java/xpp2/xpp2-2.1.10-r3.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 JAVA_PKG_IUSE="doc source" inherit java-pkg-2 java-ant-2 @@ -23,21 +23,27 @@ IUSE="test" RESTRICT="test" CDEPEND="dev-java/xerces:2" -DEPEND=">=virtual/jdk-1.3 +DEPEND=">=virtual/jdk-1.8:* test? ( dev-java/junit:4 ) ${CDEPEND}" -RDEPEND=">=virtual/jre-1.3 +RDEPEND=">=virtual/jre-1.8:* ${CDEPEND}" S="${WORKDIR}/${MY_P}" +PATCHES=( + "${FILESDIR}/${P}-fix-java5+.patch" +) + EANT_GENTOO_CLASSPATH="xerces-2" EANT_EXTRA_ARGS="-Dx2_present=true -Djunit.present=true" EANT_BUILD_TARGET="intf intf_jar impl x2impl" EANT_DOC_TARGET="api" EANT_TEST_TARGET="junit" -java_prepare() { +src_prepare() { + default + rm -r build/ lib/ || die # Our usual rewriting stomps over the existing classpath, which |