Gentoo Archives: gentoo-commits

From: James Le Cuirot <chewi@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-java/commons-cli/
Date: Fri, 01 Sep 2017 20:13:19
Message-Id: 1504296785.5d902b8ee91ee0cfa2d7b8ee3f567676c9ab4f5f.chewi@gentoo
1 commit: 5d902b8ee91ee0cfa2d7b8ee3f567676c9ab4f5f
2 Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
3 AuthorDate: Fri Sep 1 20:07:06 2017 +0000
4 Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
5 CommitDate: Fri Sep 1 20:13:05 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d902b8e
7
8 dev-java/commons-cli: Remove old 1.2
9
10 Package-Manager: Portage-2.3.8, Repoman-2.3.2
11
12 dev-java/commons-cli/Manifest | 1 -
13 dev-java/commons-cli/commons-cli-1.2.ebuild | 52 -----------------------------
14 2 files changed, 53 deletions(-)
15
16 diff --git a/dev-java/commons-cli/Manifest b/dev-java/commons-cli/Manifest
17 index 02a26584a32..f6e0cc9d2a4 100644
18 --- a/dev-java/commons-cli/Manifest
19 +++ b/dev-java/commons-cli/Manifest
20 @@ -1,2 +1 @@
21 -DIST commons-cli-1.2-src.tar.gz 68594 SHA256 b589cd675866aec12a068e0717f2bd52ead6128c43ba1612a8815db1df7f6e67 SHA512 61759cf0c791c4308b4df6a6c163b4abbb5e07909ba4904ad6565f6453ecad2ecbdc2d2df3e113b469f0d621866dfd7de07b857949ca7607c02c8ec75740eb80 WHIRLPOOL f89a34ca0f66b83643f54a976793f08d8d77b90f886fdc991e091495186050fb6424d04da10affb072367bbffb96faaf763cebf782d7fd11366c84678e826019
22 DIST commons-cli-1.3.1-src.tar.gz 145886 SHA256 d4f7eedf6def7cd574ff9b0050a5a7203a702ed13c88d9fbb85b84284ab172ba SHA512 b5c569bea3c213a1959ae698894f2234477a7a5ed246f8e81142041173f668802959be018011bce6aa2a5631081378e67d69eeba9136fa19c96193dbdf2a7d15 WHIRLPOOL 2e589f5644c5d7cead5bb88364cd982a717b7eab33c50c9ff0dc14d562d5eb92e6f76f7e80c2b356d08cf1e80b6943d81d7f98f554b4de54fc394916c9e4c56e
23
24 diff --git a/dev-java/commons-cli/commons-cli-1.2.ebuild b/dev-java/commons-cli/commons-cli-1.2.ebuild
25 deleted file mode 100644
26 index f5d70a42d39..00000000000
27 --- a/dev-java/commons-cli/commons-cli-1.2.ebuild
28 +++ /dev/null
29 @@ -1,52 +0,0 @@
30 -# Copyright 1999-2017 Gentoo Foundation
31 -# Distributed under the terms of the GNU General Public License v2
32 -
33 -# Upstream switched to Maven as a build system. Current build.xml file was generated by running mvn ant:ant
34 -# A bit of tweaking was required unfortunately
35 -
36 -EAPI="2"
37 -JAVA_PKG_IUSE="doc source test"
38 -
39 -inherit java-pkg-2 java-ant-2 eutils
40 -
41 -DESCRIPTION="A Java library for working with the command line arguments and options"
42 -HOMEPAGE="http://commons.apache.org/cli/"
43 -MY_P="${P}-src"
44 -SRC_URI="mirror://apache/commons/cli/source/${MY_P}.tar.gz"
45 -
46 -LICENSE="Apache-2.0"
47 -SLOT="1"
48 -KEYWORDS="amd64 ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
49 -IUSE=""
50 -
51 -RESTRICT=""
52 -
53 -RDEPEND=">=virtual/jre-1.4"
54 -# Blocking junit for https://bugs.gentoo.org/show_bug.cgi?id=215659
55 -DEPEND=">=virtual/jdk-1.4
56 - !<dev-java/junit-3.8.2
57 - test? ( dev-java/ant-junit )"
58 -
59 -S="${WORKDIR}/${MY_P}"
60 -
61 -JAVA_ANT_REWRITE_CLASSPATH="true"
62 -
63 -src_unpack() {
64 - unpack ${A}
65 - cp "${FILESDIR}/build-${PV}.xml" "${S}/build.xml"
66 -}
67 -
68 -src_install() {
69 - java-pkg_newjar "target/${P}.jar"
70 -
71 - dodoc README.txt RELEASE-NOTES.txt || die
72 - use doc && java-pkg_dojavadoc target/site/apidocs
73 - use source && java-pkg_dosrc src/java/org
74 -}
75 -
76 -# org.apache.commons.cli.ParserTestCase should not be ran, so we removed this class in build.xml
77 -
78 -src_test() {
79 - ANT_TASKS="ant-junit"
80 - eant -Djunit.present="true" test
81 -}