Gentoo Archives: gentoo-commits

From: Patrice Clement <monsieurp@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-java/httpcomponents-core/
Date: Thu, 18 Feb 2016 19:39:27
Message-Id: 1455824222.4219665974cb833ab143033c4523dd4745326388.monsieurp@gentoo
1 commit: 4219665974cb833ab143033c4523dd4745326388
2 Author: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
3 AuthorDate: Thu Feb 18 14:23:10 2016 +0000
4 Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
5 CommitDate: Thu Feb 18 19:37:02 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42196659
7
8 dev-java/httpcomponents-core: Add missing dies.
9
10 Package-Manager: portage-2.2.26
11
12 .../httpcomponents-core/httpcomponents-core-4.4.1-r1.ebuild | 12 +++++++-----
13 1 file changed, 7 insertions(+), 5 deletions(-)
14
15 diff --git a/dev-java/httpcomponents-core/httpcomponents-core-4.4.1-r1.ebuild b/dev-java/httpcomponents-core/httpcomponents-core-4.4.1-r1.ebuild
16 index 7cb42e6..5d32293 100644
17 --- a/dev-java/httpcomponents-core/httpcomponents-core-4.4.1-r1.ebuild
18 +++ b/dev-java/httpcomponents-core/httpcomponents-core-4.4.1-r1.ebuild
19 @@ -28,21 +28,23 @@ LICENSE="Apache-2.0"
20 SLOT="4.4"
21 KEYWORDS="amd64 x86"
22
23 -DEPEND=">=virtual/jdk-1.6
24 +RDEPEND=">=virtual/jre-1.6"
25 +
26 +DEPEND="
27 test? (
28 dev-java/commons-logging:0
29 dev-java/ant-junit:0
30 dev-java/mockito:0
31 - )"
32 -RDEPEND=">=virtual/jre-1.6"
33 + )
34 + >=virtual/jdk-1.6"
35
36 JAVA_ANT_REWRITE_CLASSPATH="yes"
37 EANT_BUILD_TARGET="package"
38 EANT_GENTOO_CLASSPATH_EXTRA="${S}/${HTTPCORE}/target/${HTTPCORE}-${PV}.jar"
39
40 java_prepare() {
41 - cp "${FILESDIR}"/${P}-${HTTPCORE}-build.xml ${HTTPCORE}/build.xml
42 - cp "${FILESDIR}"/${P}-${HTTPNIO}-build.xml ${HTTPNIO}/build.xml
43 + cp "${FILESDIR}"/${P}-${HTTPCORE}-build.xml ${HTTPCORE}/build.xml || die
44 + cp "${FILESDIR}"/${P}-${HTTPNIO}-build.xml ${HTTPNIO}/build.xml || die
45
46 # Why have these classes been deprecated although other libraries are built
47 # on them (i.e. httpcomponents-client) is mindboggling. See bug 553234.