diff options
Diffstat (limited to 'dev-java')
| -rw-r--r-- | dev-java/htmlcleaner/Manifest | 2 | ||||
| -rw-r--r-- | dev-java/htmlcleaner/files/htmlcleaner-2.24-fix-tests.patch | 26 | ||||
| -rw-r--r-- | dev-java/htmlcleaner/htmlcleaner-2.24.ebuild (renamed from dev-java/htmlcleaner/htmlcleaner-2.13.ebuild) | 17 | ||||
| -rw-r--r-- | dev-java/libg/libg-2.1.0-r2.ebuild (renamed from dev-java/libg/libg-2.1.0-r1.ebuild) | 13 |
4 files changed, 46 insertions, 12 deletions
diff --git a/dev-java/htmlcleaner/Manifest b/dev-java/htmlcleaner/Manifest index b705663e15df..0e099073eb9c 100644 --- a/dev-java/htmlcleaner/Manifest +++ b/dev-java/htmlcleaner/Manifest @@ -1 +1 @@ -DIST htmlcleaner-2.13-src.zip 346998 BLAKE2B 883a2550b9ddc0f56d88b1a412b2d9f809e0bb53d56827104aad99f15b4fc5c7f6c88b37cd10dbea5d05e27bc650d93f038142c66ea97ab0bb1bcea810bb40c5 SHA512 bf9cc014688ebb20b0bafba82fc710f25c1db8c173dd3e9f742c31c64f127c3c89b29b151e64a3368b04d278733cce8828831f297834ca9b872a60951e0a2d47 +DIST htmlcleaner-2.24-src.zip 413806 BLAKE2B 26ac6d150607c3ee00a8afcf58fed313ac570178f84c52a0fe43b0d324e3b32bb60f63db9ae5f171e7a6a7517799c633f85abfeb64e3f7421d655842bb5a5610 SHA512 beb16e383b6d43d0dfd4697b919a30c1a74eea824976521475c458bdda6c5f0eb22f299eddae033cb190a2af4fafde7e7f2c8ab1378bd82f15842a3ca8ebaaff diff --git a/dev-java/htmlcleaner/files/htmlcleaner-2.24-fix-tests.patch b/dev-java/htmlcleaner/files/htmlcleaner-2.24-fix-tests.patch new file mode 100644 index 000000000000..0e10ccee4816 --- /dev/null +++ b/dev-java/htmlcleaner/files/htmlcleaner-2.24-fix-tests.patch @@ -0,0 +1,26 @@ +diff --git a/src/test/java/org/htmlcleaner/DomSerializerTest.java b/src/test/java/org/htmlcleaner/DomSerializerTest.java +index b09c6d6..f4e83f0 100644 +--- a/src/test/java/org/htmlcleaner/DomSerializerTest.java ++++ b/src/test/java/org/htmlcleaner/DomSerializerTest.java +@@ -132,7 +132,7 @@ public class DomSerializerTest extends AbstractHtmlCleanerTest { + + "</html>"; + + final String expectedOutput = +- "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n" ++ "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" + + "<html>\n" + + " <head/>\n" + + " <body>\n" + +diff --git a/src/test/java/org/htmlcleaner/TraversalDomSerializerTest.java b/src/test/java/org/htmlcleaner/TraversalDomSerializerTest.java +index 3e1d1e9..d406c40 100644 +--- a/src/test/java/org/htmlcleaner/TraversalDomSerializerTest.java ++++ b/src/test/java/org/htmlcleaner/TraversalDomSerializerTest.java +@@ -143,7 +143,7 @@ public class TraversalDomSerializerTest extends AbstractHtmlCleanerTest { + + "</html>"; + + final String expectedOutput = +- "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n" ++ "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" + + "<html>\n" + + " <head/>\n" + + " <body>\n" + diff --git a/dev-java/htmlcleaner/htmlcleaner-2.13.ebuild b/dev-java/htmlcleaner/htmlcleaner-2.24.ebuild index bb57b058d5d4..d24cbb5ab3f3 100644 --- a/dev-java/htmlcleaner/htmlcleaner-2.13.ebuild +++ b/dev-java/htmlcleaner/htmlcleaner-2.24.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2019 Gentoo Authors +# 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" @@ -21,19 +21,26 @@ CDEPEND="dev-java/jdom:2" RDEPEND=" ${CDEPEND} - >=virtual/jre-1.5" + >=virtual/jre-1.8:*" DEPEND=" ${CDEPEND} - app-arch/unzip dev-java/ant-core:0 test? ( dev-java/junit:4 ) - >=virtual/jdk-1.5" + >=virtual/jdk-1.8:*" + +BDEPEND=" + app-arch/unzip" JAVA_SRC_DIR="src/main/java" JAVA_GENTOO_CLASSPATH="jdom-2" +PATCHES=( + "${FILESDIR}/${P}-fix-tests.patch" +) + src_prepare() { + default # Don't require default.xml to be in the current directory. sed -i "s:\"default\.xml\":\"${JAVA_PKG_SHAREPATH}/default.xml\":g" \ src/main/java/org/htmlcleaner/ConfigFileTagProvider.java || die diff --git a/dev-java/libg/libg-2.1.0-r1.ebuild b/dev-java/libg/libg-2.1.0-r2.ebuild index 8b7b14cea8d2..4ac55d9243ba 100644 --- a/dev-java/libg/libg-2.1.0-r1.ebuild +++ b/dev-java/libg/libg-2.1.0-r2.ebuild @@ -1,14 +1,14 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="5" +EAPI=7 JAVA_PKG_IUSE="test" inherit java-pkg-2 java-ant-2 DESCRIPTION="Lots of small utilities for bndlib, a swiss army knife for OSGi" -HOMEPAGE="http://www.aqute.biz/Bnd/Bnd" +HOMEPAGE="https://bnd.bndtools.org/" SRC_URI="https://github.com/bndtools/bnd/archive/${PV}.REL.tar.gz -> bndlib-${PV}.tar.gz" LICENSE="Apache-2.0" @@ -22,14 +22,15 @@ KEYWORDS="amd64 ~ppc64 x86" # build biz.aquite.bndlib and biz.aqute.junit in this package. RESTRICT="test" -DEPEND=">=virtual/jdk-1.5" -RDEPEND=">=virtual/jre-1.5" +DEPEND=">=virtual/jdk-1.8:*" +RDEPEND=">=virtual/jre-1.8:*" S="${WORKDIR}/bnd-${PV}.REL/aQute.${PN}" EANT_BUILD_TARGET="build" -java_prepare() { +src_prepare() { + default # Move the correct build.xml into place, needed for testing. cp ../cnf/build.xml . || die "Failed to move build file into the right place." |