monsieurp    15/06/24 19:04:38

  Modified:             ChangeLog
  Added:                httpcomponents-client-4.5.ebuild
  Log:
  Version bump. Fix bug 552566.
  
  Signed-off-by: Patrice Clement <[email protected]>
  (Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 
93491BB8)

Revision  Changes    Path
1.3                  dev-java/httpcomponents-client/ChangeLog

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/httpcomponents-client/ChangeLog?rev=1.3&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/httpcomponents-client/ChangeLog?rev=1.3&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/httpcomponents-client/ChangeLog?r1=1.2&r2=1.3

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/httpcomponents-client/ChangeLog,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ChangeLog   1 Dec 2013 16:08:26 -0000       1.2
+++ ChangeLog   24 Jun 2015 19:04:38 -0000      1.3
@@ -1,6 +1,17 @@
 # ChangeLog for dev-java/httpcomponents-client
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/httpcomponents-client/ChangeLog,v 
1.2 2013/12/01 16:08:26 ercpe Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/httpcomponents-client/ChangeLog,v 
1.3 2015/06/24 19:04:38 monsieurp Exp $
+
+*httpcomponents-client-4.5 (24 Jun 2015)
+
+  24 Jun 2015; Patrice Clement <[email protected]>
+  +files/httpcomponents-client-fluent-hc-4.5-build.xml,
+  +files/httpcomponents-client-httpclient-4.5-build.xml,
+  +files/httpcomponents-client-httpclient-cache-4.5-build.xml,
+  +files/httpcomponents-client-httpclient-osgi-4.5-build.xml,
+  +files/httpcomponents-client-httpmime-4.5-build.xml,
+  +httpcomponents-client-4.5.ebuild:
+  Version bump. Fix bug 552566.
 
 *httpcomponents-client-4.3.1-r1 (01 Dec 2013)
 



1.1                  
dev-java/httpcomponents-client/httpcomponents-client-4.5.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/httpcomponents-client/httpcomponents-client-4.5.ebuild?rev=1.1&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/httpcomponents-client/httpcomponents-client-4.5.ebuild?rev=1.1&content-type=text/plain

Index: httpcomponents-client-4.5.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-client/httpcomponents-client-4.5.ebuild,v
 1.1 2015/06/24 19:04:38 monsieurp Exp $

EAPI="5"

JAVA_PKG_IUSE="source examples doc test"

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/${PN/-//http}/source/${P}-src.tar.gz"

LICENSE="Apache-2.0"
SLOT="4.5"
KEYWORDS="~amd64 ~x86"

CDEPEND="
        dev-java/ant-junit:0
        dev-java/easymock:3.2
        dev-java/spymemcached:0
        dev-java/osgi-core-api:0
        dev-java/osgi-enterprise-api:0
        dev-java/commons-codec:0
        dev-java/commons-logging:0
        dev-java/httpcomponents-core:4.4
        dev-java/easymock-classextension:3.2
"

RDEPEND=">=virtual/jre-1.6
        ${CDEPEND}"

DEPEND=">=virtual/jdk-1.6
        test? (
                dev-java/junit:4
                dev-java/mockito:0
        )
        ${CDEPEND}"

JAVA_ANT_REWRITE_CLASSPATH="true"
EANT_GENTOO_CLASSPATH="
        commons-codec
        commons-logging
        spymemcached
        osgi-core-api
        osgi-enterprise-api
        httpcomponents-core-4.4
"

# List of modules to compile and test.
MODULES=(
        httpclient
        httpclient-cache
        httpmime
        fluent-hc
        httpclient-osgi
)

EANT_BUILD_TARGET="package"
EANT_GENTOO_CLASSPATH_EXTRA="${S}/${MODULES[0]}/target/${MODULES[0]}-${PV}.jar"

java_prepare() {
        # copy build.xml files to their location.
        for module in ${MODULES[@]}; do
                cd "${S}"/"${module}" || die
                cp "${FILESDIR}"/"${PN}-${module}-${PV}"-build.xml build.xml
        done

        cd "${S}" || die

        # httpclient:
        # - copy deprecated sources for compilation
        cp -r "${S}"/${MODULES[0]}/src/main/java-deprecated/* \
                "${S}"/${MODULES[0]}/src/main/java/* || die

        # - remove broken tests
        rm -v 
${MODULES[0]}/src/test/java/org/apache/http/client/config/TestRequestConfig.java

        # httpclient-cache:
        # - copy deprecated sources into main repository
        cp -r "${S}"/${MODULES[1]}/src/main/java-deprecated/* \
                "${S}"/${MODULES[1]}/src/main/java || die

        # - remove broken tests
        rm -v \
                
${MODULES[1]}/src/test/java/org/apache/http/impl/client/cache/TestCachingExec*

        # - disable ehcache support altogether
        # the version in Portage is very old and compilation chokes on missing 
imports
        rm -rf \
                
"${S}"/${MODULES[1]}/src/main/java/org/apache/http/impl/client/cache/ehcache \
                
"${S}"/${MODULES[1]}/src/test/java/org/apache/http/impl/client/cache/ehcache

        # httpmime:
        # - copy deprecated sources into main repository
        cp -r "${S}"/${MODULES[2]}/src/main/java-deprecated/* \
                "${S}"/${MODULES[2]}/src/main/java

        # fluent-hc:
        # remove broken tests.
        rm -v 
${MODULES[3]}/src/test/java/org/apache/http/client/fluent/TestFluent.java
}

EANT_TEST_GENTOO_CLASSPATH="
        ${EANT_GENTOO_CLASSPATH}
        junit-4
        mockito
        easymock-3.2
        easymock-classextension-3.2
"

src_compile() {
        for module in ${MODULES[@]}; do
                EANT_BUILD_XML="${module}/build.xml" \
                        java-pkg-2_src_compile
        done
}

src_test() {
        for module in ${MODULES[@]}; do
                ANT_TASKS= \
                        EANT_BUILD_XML="${module}/build.xml" \
                        java-pkg-2_src_test
        done
}

src_install() {
        for module in ${MODULES[@]}; do
                java-pkg_newjar ${module}/target/${module}-${PV}.jar 
${module}.jar
        done

        if use source; then

                java-pkg_dosrc 
{httpclient,httpclient-cache,httpmime,fluent-hc}/src/main/java/org
        fi

        if use examples; then
                for dir in $(find "${S}" -mindepth 3 -maxdepth 4 -name 
"examples" -type d -print); do
                        java-pkg_doexamples ${dir}/*
                done
        fi

        if use doc; then
                java-pkg_dojavadoc 
{httpclient,httpclient-cache,httpmime,fluent-hc}/target/site/apidocs/
        fi
}




Reply via email to