[gentoo-commits] gentoo-x86 commit in dev-java/httpcomponents-client: metadata.xml httpcomponents-client-4.3.1-r1.ebuild ChangeLog httpcomponents-client-4.3.1.ebuild

[Johann Schmitz (ercpe)]

ercpe       13/12/01 16:08:26

  Modified:             metadata.xml ChangeLog
  Added:                httpcomponents-client-4.3.1-r1.ebuild
  Removed:              httpcomponents-client-4.3.1.ebuild
  Log:
  Added use flag to httpcomponents-client to build deprecated classes
  
  (Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 77C501ED)

Revision  Changes    Path
1.2                  dev-java/httpcomponents-client/metadata.xml

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

Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/httpcomponents-client/metadata.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- metadata.xml	1 Dec 2013 09:06:41 -0000	1.1
+++ metadata.xml	1 Dec 2013 16:08:26 -0000	1.2
@@ -2,5 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>java</herd>
+	<use>
+		<flag name="deprecated">Build deprecated classes</flag>
+	</use>
 </pkgmetadata>
-



1.2                  dev-java/httpcomponents-client/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/httpcomponents-client/ChangeLog,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ChangeLog	1 Dec 2013 09:06:41 -0000	1.1
+++ ChangeLog	1 Dec 2013 16:08:26 -0000	1.2
@@ -1,6 +1,13 @@
 # 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.1 2013/12/01 09:06:41 ercpe Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/httpcomponents-client/ChangeLog,v 1.2 2013/12/01 16:08:26 ercpe Exp $
+
+*httpcomponents-client-4.3.1-r1 (01 Dec 2013)
+
+  01 Dec 2013; Johann Schmitz <ercpe@g.o>
+  +httpcomponents-client-4.3.1-r1.ebuild, -httpcomponents-client-4.3.1.ebuild,
+  metadata.xml:
+  Added use flag to httpcomponents-client to build deprecated classes
 
 *httpcomponents-client-4.3.1 (01 Dec 2013)
 



1.1                  dev-java/httpcomponents-client/httpcomponents-client-4.3.1-r1.ebuild

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

Index: httpcomponents-client-4.3.1-r1.ebuild
===================================================================
# Copyright 1999-2013 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.3.1-r1.ebuild,v 1.1 2013/12/01 16:08:26 ercpe 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
		http://dev.gentoo.org/~ercpe/distfiles/${CATEGORY}/${PN}/${P}-build.tar.bz2"

LICENSE="Apache-2.0"
SLOT="4.3"
KEYWORDS="~amd64 ~x86"
IUSE="deprecated"

CDEPEND="
	dev-java/commons-codec:0
	dev-java/commons-logging:0
	dev-java/httpcomponents-core:${SLOT}[deprecated]
	dev-java/ehcache:1.2
	dev-java/spymemcached:0
	dev-java/easymock-classextension:3.2
"

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

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

JAVA_ANT_REWRITE_CLASSPATH="true"
EANT_GENTOO_CLASSPATH="commons-codec,commons-logging,httpcomponents-core-${SLOT},ehcache-1.2,spymemcached"
EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junit-4,mockito,easymock-classextension-3.2"
EANT_TEST_ANT_TASKS="ant-junit"

java_prepare() {
	# The Ehcache cache storage depends on a version of Ehcache
	# (with a .replace(Element, Element) method) >= 2.2.0 which can only be built
	# with the proprietary terracotta library 
	rm "${S}"/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/ehcache/EhcacheHttpCacheStorage.java \
		"${S}"/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/ehcache/TestEhcacheHttpCacheStorage.java \
		"${S}"/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/ehcache/TestEhcacheProtocolRequirements.java || die

	if use deprecated; then
		cp -r "${S}"/httpclient/src/main/java-deprecated/* \
				"${S}"/httpclient/src/main/java/* || die
		cp -r "${S}"/httpclient-cache/src/main/java-deprecated/* \
				"${S}"/httpclient-cache/src/main/java/* || die
		cp -r "${S}"/httpmime/src/main/java-deprecated/* \
				"${S}"/httpmime/src/main/java/* || die
	fi
}

src_install() {
	java-pkg_dojar httpclient/target/httpclient.jar \
					httpclient-cache/target/httpclient-cache.jar \
					httpmime/target/httpmime.jar \
					fluent-hc/target/fluent-hc.jar

	use source && java-pkg_dosrc {httpclient,httpclient-cache,httpmime,fluent-hc}/src/main/java/org
	use examples && java-pkg_doexamples $(find "${S}" -mindepth 3 -maxdepth 3 -name "examples" -type d -print)
	use doc && java-pkg_dojavadoc apidocs/
}

src_test() {
	java-pkg-2_src_test
}