monsieurp 15/06/25 15:50:22 Modified: ChangeLog Added: httpcomponents-core-4.4.1-r1.ebuild Log: Package so-called deprecated files in jar. Fix bug 553234. Signed-off-by: Patrice Clement <monsie...@gentoo.org> (Portage version: 2.2.18/cvs/Linux x86_64, RepoMan options: --force, signed Manifest commit with key 93491BB8)
Revision Changes Path 1.7 dev-java/httpcomponents-core/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/httpcomponents-core/ChangeLog?rev=1.7&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/httpcomponents-core/ChangeLog?rev=1.7&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/httpcomponents-core/ChangeLog?r1=1.6&r2=1.7 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-java/httpcomponents-core/ChangeLog,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- ChangeLog 23 Jun 2015 15:25:18 -0000 1.6 +++ ChangeLog 25 Jun 2015 15:50:22 -0000 1.7 @@ -1,6 +1,12 @@ # ChangeLog for dev-java/httpcomponents-core # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/httpcomponents-core/ChangeLog,v 1.6 2015/06/23 15:25:18 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/httpcomponents-core/ChangeLog,v 1.7 2015/06/25 15:50:22 monsieurp Exp $ + +*httpcomponents-core-4.4.1-r1 (25 Jun 2015) + + 25 Jun 2015; Patrice Clement <monsie...@gentoo.org> + +httpcomponents-core-4.4.1-r1.ebuild: + Package so-called deprecated files in jar. Fix bug 553234. 23 Jun 2015; Agostino Sarubbo <a...@gentoo.org> httpcomponents-core-4.4.1.ebuild: 1.1 dev-java/httpcomponents-core/httpcomponents-core-4.4.1-r1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/httpcomponents-core/httpcomponents-core-4.4.1-r1.ebuild?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/httpcomponents-core/httpcomponents-core-4.4.1-r1.ebuild?rev=1.1&content-type=text/plain Index: httpcomponents-core-4.4.1-r1.ebuild =================================================================== # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/dev-java/httpcomponents-core/httpcomponents-core-4.4.1-r1.ebuild,v 1.1 2015/06/25 15:50:22 monsieurp Exp $ EAPI="5" JAVA_PKG_IUSE="source examples test" # "components" CMPT=${PN%%-*} # "core" CORE=${PN##*-} # "httpcore" HTTPCORE="http${CORE}" # "httpcore-nio" HTTPNIO="${HTTPCORE}-nio" inherit java-pkg-2 java-ant-2 DESCRIPTION="A low level toolset of Java components focused on HTTP and associated protocols" HOMEPAGE="http://hc.apache.org/index.html"; SRC_URI="mirror://apache/httpcomponents/${HTTPCORE}/source/${P}-src.tar.gz" LICENSE="Apache-2.0" SLOT="4.4" KEYWORDS="amd64 x86" DEPEND=">=virtual/jdk-1.6 test? ( dev-java/commons-logging:0 dev-java/ant-junit:0 dev-java/mockito:0 )" RDEPEND=">=virtual/jre-1.6" JAVA_ANT_REWRITE_CLASSPATH="yes" EANT_BUILD_TARGET="package" EANT_GENTOO_CLASSPATH_EXTRA="${S}/${HTTPCORE}/target/${HTTPCORE}-${PV}.jar" java_prepare() { cp "${FILESDIR}"/${P}-${HTTPCORE}-build.xml ${HTTPCORE}/build.xml cp "${FILESDIR}"/${P}-${HTTPNIO}-build.xml ${HTTPNIO}/build.xml # Why have these classes been deprecated although other libraries are built # on them (i.e. httpcomponents-client) is mindboggling. See bug 553234. cp -r "${S}"/httpcore/src/main/java-deprecated/* \ "${S}"/httpcore/src/main/java/* || die cp -r "${S}"/httpcore-nio/src/main/java-deprecated/* \ "${S}"/httpcore-nio/src/main/java/* || die } src_compile() { # first, compile httpcore module EANT_BUILD_XML="${HTTPCORE}/build.xml" java-pkg-2_src_compile # then, httpnio module EANT_BUILD_XML="${HTTPNIO}/build.xml" java-pkg-2_src_compile } EANT_TEST_GENTOO_CLASSPATH=" commons-logging mockito " src_test() { # run junit tests for httpcore module EANT_BUILD_XML="${HTTPCORE}/build.xml" java-pkg-2_src_test # run junit tests for httpcore-nio module EANT_BUILD_XML="${HTTPNIO}/build.xml" java-pkg-2_src_test } src_install() { java-pkg_newjar ${HTTPCORE}/target/${HTTPCORE}-${PV}.jar ${HTTPCORE}.jar java-pkg_newjar ${HTTPNIO}/target/${HTTPNIO}-${PV}.jar ${HTTPNIO}.jar use source && java-pkg_dosrc httpcore{,-nio}/src/main/java use examples && java-pkg_doexamples httpcore{,-nio}/src/examples dodoc {README,RELEASE_NOTES,NOTICE}.txt }
