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/commons-compress/
Date: Mon, 05 Oct 2015 20:43:48
Message-Id: 1444077699.5ced1fa814964a08283a62316c74d1edef4aefed.monsieurp@gentoo
1 commit: 5ced1fa814964a08283a62316c74d1edef4aefed
2 Author: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
3 AuthorDate: Mon Oct 5 20:14:41 2015 +0000
4 Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
5 CommitDate: Mon Oct 5 20:41:39 2015 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ced1fa8
7
8 dev-java/commons-compress: Clean up old.
9
10 Package-Manager: portage-2.2.18
11 Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>
12
13 dev-java/commons-compress/Manifest | 1 -
14 .../commons-compress/commons-compress-1.4.1.ebuild | 56 ----------------------
15 .../commons-compress/commons-compress-1.8.1.ebuild | 56 ----------------------
16 3 files changed, 113 deletions(-)
17
18 diff --git a/dev-java/commons-compress/Manifest b/dev-java/commons-compress/Manifest
19 index 9904526..3e5e508 100644
20 --- a/dev-java/commons-compress/Manifest
21 +++ b/dev-java/commons-compress/Manifest
22 @@ -1,2 +1 @@
23 -DIST commons-compress-1.4.1-src.tar.gz 3228776 SHA256 b4f34aa03df917b785479e147381eea86c5c17e9067ddf8c27301ff6cd0aa91c SHA512 e1d327f084a79924938698ae16fa6edaaa73072b083109bbd8ccaa636268c05c387e7c2117b5df8f6b91b143495add9cc7da17c1bd3c989f91c910a9d68f6bdb WHIRLPOOL 50565e7342fa363814ed2f347d1daa1ee59dd28cefcd9e494850edcf47899b8684312996dd60b90236a4f2aacce8a920ace37cca5d1d22ad9f63f6696c8e7452
24 DIST commons-compress-1.8.1-src.tar.gz 8476056 SHA256 aa1221643331d9de5c8155b032c7fde23fc8cf3d962155092de89c44d4978412 SHA512 4e4f9633cc3c470970a8da41344a819ff63430a46e219e93896dbe2374738349f78942cff93ad8d348599cfc2dd7d014ae4ff3b09d76a924bb11ca1c4a2c05ea WHIRLPOOL 2d7f3230f47186a72b4b31efd10c5dfd68488d263e26d97b6e715b2b2eab3e22ae3e5946d232ca014aa2a3d14f3abf87ce97bf2e70c7c06788c4093df4156aef
25
26 diff --git a/dev-java/commons-compress/commons-compress-1.4.1.ebuild b/dev-java/commons-compress/commons-compress-1.4.1.ebuild
27 deleted file mode 100644
28 index 12176cd..0000000
29 --- a/dev-java/commons-compress/commons-compress-1.4.1.ebuild
30 +++ /dev/null
31 @@ -1,56 +0,0 @@
32 -# Copyright 1999-2014 Gentoo Foundation
33 -# Distributed under the terms of the GNU General Public License v2
34 -# $Id$
35 -
36 -EAPI="4"
37 -
38 -JAVA_PKG_IUSE="doc source test"
39 -
40 -inherit java-pkg-2 java-ant-2
41 -
42 -DESCRIPTION="Commons Compress defines an API for working with ar, cpio, tar, zip, gzip and bzip2 files"
43 -
44 -LICENSE="Apache-2.0"
45 -SLOT="0"
46 -KEYWORDS="amd64 x86"
47 -IUSE=""
48 -
49 -COMMON_DEPEND="dev-java/xz-java"
50 -
51 -RDEPEND=">=virtual/jre-1.5
52 - ${COMMON_DEPEND}"
53 -DEPEND=">=virtual/jdk-1.5
54 - ${COMMON_DEPEND}
55 - test? ( dev-java/junit:4
56 - dev-java/hamcrest-core
57 - dev-java/ant-junit:0 )"
58 -
59 -S="${WORKDIR}/${P}-src"
60 -
61 -JAVA_ANT_BSFIX_EXTRA_ARGS="--maven-cleaning"
62 -EANT_GENTOO_CLASSPATH="xz-java"
63 -EANT_BUILD_TARGET="compile package"
64 -EANT_TEST_GENTOO_CLASSPATH="junit-4 hamcrest-core xz-java"
65 -
66 -java_prepare() {
67 - cp "${FILESDIR}"/build.xml . || die "Failed to copy build.xml"
68 -
69 - # osgi stuff mvn ant:ant doesn't handle
70 - mkdir -p target/osgi || die "Failed to create target dir"
71 - cp "${FILESDIR}"/MANIFEST.MF target/osgi/ || die "Failed to copy manifest"
72 -
73 - if ! use test; then
74 - find -name "*.jar" -delete || die "Failed to remove test resources"
75 - fi
76 -}
77 -
78 -src_test() {
79 - EANT_TEST_TARGET="compile-tests test"
80 - java-pkg-2_src_test
81 -}
82 -
83 -src_install() {
84 - java-pkg_newjar target/${PN}-1.1.jar
85 - use doc && java-pkg_dojavadoc target/site/apidocs
86 - use source && java-pkg_dosrc src/main/java/*
87 -}
88
89 diff --git a/dev-java/commons-compress/commons-compress-1.8.1.ebuild b/dev-java/commons-compress/commons-compress-1.8.1.ebuild
90 deleted file mode 100644
91 index d52a6db..0000000
92 --- a/dev-java/commons-compress/commons-compress-1.8.1.ebuild
93 +++ /dev/null
94 @@ -1,56 +0,0 @@
95 -# Copyright 1999-2014 Gentoo Foundation
96 -# Distributed under the terms of the GNU General Public License v2
97 -# $Id$
98 -
99 -EAPI="4"
100 -
101 -JAVA_PKG_IUSE="doc source test"
102 -
103 -inherit java-pkg-2 java-ant-2
104 -
105 -DESCRIPTION="Commons Compress defines an API for working with ar, cpio, tar, zip, gzip and bzip2 files"
106 -
107 -LICENSE="Apache-2.0"
108 -SLOT="0"
109 -KEYWORDS="~amd64 ~x86"
110 -IUSE=""
111 -
112 -COMMON_DEPEND="dev-java/xz-java"
113 -
114 -RDEPEND=">=virtual/jre-1.5
115 - ${COMMON_DEPEND}"
116 -DEPEND=">=virtual/jdk-1.5
117 - ${COMMON_DEPEND}
118 - test? ( dev-java/junit:4
119 - dev-java/hamcrest-core
120 - dev-java/ant-junit:0 )"
121 -
122 -S="${WORKDIR}/${P}-src"
123 -
124 -JAVA_ANT_BSFIX_EXTRA_ARGS="--maven-cleaning"
125 -EANT_GENTOO_CLASSPATH="xz-java"
126 -EANT_BUILD_TARGET="compile package"
127 -EANT_TEST_GENTOO_CLASSPATH="junit-4 hamcrest-core xz-java"
128 -
129 -java_prepare() {
130 - cp "${FILESDIR}"/build.xml . || die "Failed to copy build.xml"
131 -
132 - # osgi stuff mvn ant:ant doesn't handle
133 - mkdir -p target/osgi || die "Failed to create target dir"
134 - cp "${FILESDIR}"/MANIFEST.MF target/osgi/ || die "Failed to copy manifest"
135 -
136 - if ! use test; then
137 - find -name "*.jar" -delete || die "Failed to remove test resources"
138 - fi
139 -}
140 -
141 -src_test() {
142 - EANT_TEST_TARGET="compile-tests test"
143 - java-pkg-2_src_test
144 -}
145 -
146 -src_install() {
147 - java-pkg_newjar target/${PN}-1.1.jar
148 - use doc && java-pkg_dojavadoc target/site/apidocs
149 - use source && java-pkg_dosrc src/main/java/*
150 -}