From 248eb60af631c757e16d0fcc5a498ba42357f04a Mon Sep 17 00:00:00 2001 From: Miroslav Šulc Date: Fri, 12 Mar 2021 12:01:08 +0100 Subject: dev-java/commons-httpclient: eapi7, added maven id, min jdk/jre 1.8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Package-Manager: Portage-3.0.17, Repoman-3.0.2 Signed-off-by: Miroslav Šulc --- .../commons-httpclient-3.1-r1.ebuild | 63 -------------------- .../commons-httpclient-3.1-r2.ebuild | 68 ++++++++++++++++++++++ ...pclient-3.1-SSLProtocolSocketFactory.java.patch | 4 +- 3 files changed, 70 insertions(+), 65 deletions(-) delete mode 100644 dev-java/commons-httpclient/commons-httpclient-3.1-r1.ebuild create mode 100644 dev-java/commons-httpclient/commons-httpclient-3.1-r2.ebuild (limited to 'dev-java') diff --git a/dev-java/commons-httpclient/commons-httpclient-3.1-r1.ebuild b/dev-java/commons-httpclient/commons-httpclient-3.1-r1.ebuild deleted file mode 100644 index 0c9f3363633b..000000000000 --- a/dev-java/commons-httpclient/commons-httpclient-3.1-r1.ebuild +++ /dev/null @@ -1,63 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -JAVA_PKG_IUSE="doc examples source test" - -inherit eutils java-pkg-2 java-ant-2 - -DESCRIPTION="The Jakarta Commons HttpClient library" -HOMEPAGE="http://hc.apache.org/" -SRC_URI="mirror://apache/httpcomponents/${PN}/source/${P}-src.tar.gz" -LICENSE="Apache-2.0" -SLOT="3" -KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux" -IUSE="" - -# doesn't work with IBM JDK, bug #176133 -RESTRICT="test" - -CDEPEND="dev-java/commons-logging:0 - dev-java/commons-codec:0" -RDEPEND=">=virtual/jre-1.6 - ${CDEPEND}" -DEPEND=">=virtual/jdk-1.6 - test? ( dev-java/ant-junit:0 ) - ${CDEPEND}" - -JAVA_ANT_ENCODING="ISO-8859-1" -JAVA_ANT_REWRITE_CLASSPATH="true" -EANT_GENTOO_CLASSPATH="commons-logging,commons-codec" -EANT_BUILD_TARGET="dist" -EANT_DOC_TARGET="doc" - -java_prepare() { - # patch against CVE-2012-{5783,6153}. See bug 442292. - epatch "${FILESDIR}"/"${P}-SSLProtocolSocketFactory.java.patch" - - # generated docs go into docs/api - rm -rf docs/apidocs - - # remove javadoc task from compile task - sed -i -e 's/depends="compile,doc"/depends="compile"/' build.xml || die - sed -i -e '/link/ d' build.xml || die - - mkdir lib && cd lib - java-pkg_filter-compiler jikes -} - -EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junit" -EANT_TEST_TARGET="test" - -src_install() { - java-pkg_dojar dist/${PN}.jar - - # contains both html docs and javadoc in correct subdir - if use doc ; then - java-pkg_dojavadoc dist/docs/api - java-pkg_dohtml -r dist/docs/* - fi - use source && java-pkg_dosrc src/java/* - use examples && java-pkg_doexamples src/examples -} diff --git a/dev-java/commons-httpclient/commons-httpclient-3.1-r2.ebuild b/dev-java/commons-httpclient/commons-httpclient-3.1-r2.ebuild new file mode 100644 index 000000000000..5921250be5ee --- /dev/null +++ b/dev-java/commons-httpclient/commons-httpclient-3.1-r2.ebuild @@ -0,0 +1,68 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +JAVA_PKG_IUSE="doc examples source test" +MAVEN_ID="commons-httpclient:commons-httpclient:3.1" + +inherit java-pkg-2 java-ant-2 + +DESCRIPTION="The Jakarta Commons HttpClient library" +HOMEPAGE="https://hc.apache.org/" +SRC_URI="mirror://apache/httpcomponents/${PN}/source/${P}-src.tar.gz" +LICENSE="Apache-2.0" +SLOT="3" +KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux" +IUSE="" + +# doesn't work with IBM JDK, bug #176133 +RESTRICT="test" + +CDEPEND="dev-java/commons-logging:0 + dev-java/commons-codec:0" +RDEPEND=">=virtual/jre-1.8:* + ${CDEPEND}" +DEPEND=">=virtual/jdk-1.8:* + test? ( dev-java/ant-junit:0 ) + ${CDEPEND}" + +JAVA_ANT_ENCODING="ISO-8859-1" +JAVA_ANT_REWRITE_CLASSPATH="true" +EANT_GENTOO_CLASSPATH="commons-logging,commons-codec" +EANT_BUILD_TARGET="dist" +EANT_DOC_TARGET="doc" + +# patch against CVE-2012-{5783,6153}. See bug 442292. +PATCHES=( + "${FILESDIR}/${P}-SSLProtocolSocketFactory.java.patch" +) + +src_prepare() { + default + + # generated docs go into docs/api + rm -rf docs/apidocs + + # remove javadoc task from compile task + sed -i -e 's/depends="compile,doc"/depends="compile"/' build.xml || die + sed -i -e '/link/ d' build.xml || die + + mkdir lib && cd lib + java-pkg_filter-compiler jikes +} + +EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junit" +EANT_TEST_TARGET="test" + +src_install() { + java-pkg_dojar dist/${PN}.jar + + # contains both html docs and javadoc in correct subdir + if use doc ; then + java-pkg_dojavadoc dist/docs/api + java-pkg_dohtml -r dist/docs/* + fi + use source && java-pkg_dosrc src/java/* + use examples && java-pkg_doexamples src/examples +} diff --git a/dev-java/commons-httpclient/files/commons-httpclient-3.1-SSLProtocolSocketFactory.java.patch b/dev-java/commons-httpclient/files/commons-httpclient-3.1-SSLProtocolSocketFactory.java.patch index 45df330092ab..c059bf496a45 100644 --- a/dev-java/commons-httpclient/files/commons-httpclient-3.1-SSLProtocolSocketFactory.java.patch +++ b/dev-java/commons-httpclient/files/commons-httpclient-3.1-SSLProtocolSocketFactory.java.patch @@ -1,5 +1,5 @@ ---- src/java/org/apache/commons/httpclient/protocol/SSLProtocolSocketFactory.java -+++ src/java/org/apache/commons/httpclient/protocol/SSLProtocolSocketFactory.java +--- ./src/java/org/apache/commons/httpclient/protocol/SSLProtocolSocketFactory.java ++++ ./src/java/org/apache/commons/httpclient/protocol/SSLProtocolSocketFactory.java @@ -31,10 +31,25 @@ package org.apache.commons.httpclient.protocol; -- cgit v1.2.3-65-gdbad