| 1 |
monsieurp 15/06/25 15:50:22 |
| 2 |
|
| 3 |
Modified: ChangeLog |
| 4 |
Added: httpcomponents-core-4.4.1-r1.ebuild |
| 5 |
Log: |
| 6 |
Package so-called deprecated files in jar. Fix bug 553234. |
| 7 |
|
| 8 |
Signed-off-by: Patrice Clement <monsieurp@g.o> |
| 9 |
(Portage version: 2.2.18/cvs/Linux x86_64, RepoMan options: --force, signed Manifest commit with key 93491BB8) |
| 10 |
|
| 11 |
Revision Changes Path |
| 12 |
1.7 dev-java/httpcomponents-core/ChangeLog |
| 13 |
|
| 14 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/httpcomponents-core/ChangeLog?rev=1.7&view=markup |
| 15 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/httpcomponents-core/ChangeLog?rev=1.7&content-type=text/plain |
| 16 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/httpcomponents-core/ChangeLog?r1=1.6&r2=1.7 |
| 17 |
|
| 18 |
Index: ChangeLog |
| 19 |
=================================================================== |
| 20 |
RCS file: /var/cvsroot/gentoo-x86/dev-java/httpcomponents-core/ChangeLog,v |
| 21 |
retrieving revision 1.6 |
| 22 |
retrieving revision 1.7 |
| 23 |
diff -u -r1.6 -r1.7 |
| 24 |
--- ChangeLog 23 Jun 2015 15:25:18 -0000 1.6 |
| 25 |
+++ ChangeLog 25 Jun 2015 15:50:22 -0000 1.7 |
| 26 |
@@ -1,6 +1,12 @@ |
| 27 |
# ChangeLog for dev-java/httpcomponents-core |
| 28 |
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 |
| 29 |
-# $Header: /var/cvsroot/gentoo-x86/dev-java/httpcomponents-core/ChangeLog,v 1.6 2015/06/23 15:25:18 ago Exp $ |
| 30 |
+# $Header: /var/cvsroot/gentoo-x86/dev-java/httpcomponents-core/ChangeLog,v 1.7 2015/06/25 15:50:22 monsieurp Exp $ |
| 31 |
+ |
| 32 |
+*httpcomponents-core-4.4.1-r1 (25 Jun 2015) |
| 33 |
+ |
| 34 |
+ 25 Jun 2015; Patrice Clement <monsieurp@g.o> |
| 35 |
+ +httpcomponents-core-4.4.1-r1.ebuild: |
| 36 |
+ Package so-called deprecated files in jar. Fix bug 553234. |
| 37 |
|
| 38 |
23 Jun 2015; Agostino Sarubbo <ago@g.o> |
| 39 |
httpcomponents-core-4.4.1.ebuild: |
| 40 |
|
| 41 |
|
| 42 |
|
| 43 |
1.1 dev-java/httpcomponents-core/httpcomponents-core-4.4.1-r1.ebuild |
| 44 |
|
| 45 |
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 |
| 46 |
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 |
| 47 |
|
| 48 |
Index: httpcomponents-core-4.4.1-r1.ebuild |
| 49 |
=================================================================== |
| 50 |
# Copyright 1999-2015 Gentoo Foundation |
| 51 |
# Distributed under the terms of the GNU General Public License v2 |
| 52 |
# $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 $ |
| 53 |
|
| 54 |
EAPI="5" |
| 55 |
|
| 56 |
JAVA_PKG_IUSE="source examples test" |
| 57 |
|
| 58 |
# "components" |
| 59 |
CMPT=${PN%%-*} |
| 60 |
|
| 61 |
# "core" |
| 62 |
CORE=${PN##*-} |
| 63 |
|
| 64 |
# "httpcore" |
| 65 |
HTTPCORE="http${CORE}" |
| 66 |
|
| 67 |
# "httpcore-nio" |
| 68 |
HTTPNIO="${HTTPCORE}-nio" |
| 69 |
|
| 70 |
inherit java-pkg-2 java-ant-2 |
| 71 |
|
| 72 |
DESCRIPTION="A low level toolset of Java components focused on HTTP and associated protocols" |
| 73 |
HOMEPAGE="http://hc.apache.org/index.html" |
| 74 |
SRC_URI="mirror://apache/httpcomponents/${HTTPCORE}/source/${P}-src.tar.gz" |
| 75 |
|
| 76 |
LICENSE="Apache-2.0" |
| 77 |
SLOT="4.4" |
| 78 |
KEYWORDS="amd64 x86" |
| 79 |
|
| 80 |
DEPEND=">=virtual/jdk-1.6 |
| 81 |
test? ( |
| 82 |
dev-java/commons-logging:0 |
| 83 |
dev-java/ant-junit:0 |
| 84 |
dev-java/mockito:0 |
| 85 |
)" |
| 86 |
RDEPEND=">=virtual/jre-1.6" |
| 87 |
|
| 88 |
JAVA_ANT_REWRITE_CLASSPATH="yes" |
| 89 |
EANT_BUILD_TARGET="package" |
| 90 |
EANT_GENTOO_CLASSPATH_EXTRA="${S}/${HTTPCORE}/target/${HTTPCORE}-${PV}.jar" |
| 91 |
|
| 92 |
java_prepare() { |
| 93 |
cp "${FILESDIR}"/${P}-${HTTPCORE}-build.xml ${HTTPCORE}/build.xml |
| 94 |
cp "${FILESDIR}"/${P}-${HTTPNIO}-build.xml ${HTTPNIO}/build.xml |
| 95 |
|
| 96 |
# Why have these classes been deprecated although other libraries are built |
| 97 |
# on them (i.e. httpcomponents-client) is mindboggling. See bug 553234. |
| 98 |
cp -r "${S}"/httpcore/src/main/java-deprecated/* \ |
| 99 |
"${S}"/httpcore/src/main/java/* || die |
| 100 |
cp -r "${S}"/httpcore-nio/src/main/java-deprecated/* \ |
| 101 |
"${S}"/httpcore-nio/src/main/java/* || die |
| 102 |
} |
| 103 |
|
| 104 |
src_compile() { |
| 105 |
# first, compile httpcore module |
| 106 |
EANT_BUILD_XML="${HTTPCORE}/build.xml" java-pkg-2_src_compile |
| 107 |
|
| 108 |
# then, httpnio module |
| 109 |
EANT_BUILD_XML="${HTTPNIO}/build.xml" java-pkg-2_src_compile |
| 110 |
} |
| 111 |
|
| 112 |
EANT_TEST_GENTOO_CLASSPATH=" |
| 113 |
commons-logging |
| 114 |
mockito |
| 115 |
" |
| 116 |
|
| 117 |
src_test() { |
| 118 |
# run junit tests for httpcore module |
| 119 |
EANT_BUILD_XML="${HTTPCORE}/build.xml" java-pkg-2_src_test |
| 120 |
|
| 121 |
# run junit tests for httpcore-nio module |
| 122 |
EANT_BUILD_XML="${HTTPNIO}/build.xml" java-pkg-2_src_test |
| 123 |
} |
| 124 |
|
| 125 |
src_install() { |
| 126 |
java-pkg_newjar ${HTTPCORE}/target/${HTTPCORE}-${PV}.jar ${HTTPCORE}.jar |
| 127 |
java-pkg_newjar ${HTTPNIO}/target/${HTTPNIO}-${PV}.jar ${HTTPNIO}.jar |
| 128 |
|
| 129 |
use source && java-pkg_dosrc httpcore{,-nio}/src/main/java |
| 130 |
use examples && java-pkg_doexamples httpcore{,-nio}/src/examples |
| 131 |
|
| 132 |
dodoc {README,RELEASE_NOTES,NOTICE}.txt |
| 133 |
} |
Archives