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/guice/
Date: Thu, 31 Aug 2017 19:56:02
Message-Id: 1504209339.8d9df599d7e638c6ac5f9ecdf849373250f53e4a.chewi@gentoo
1 commit: 8d9df599d7e638c6ac5f9ecdf849373250f53e4a
2 Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
3 AuthorDate: Thu Aug 31 19:54:12 2017 +0000
4 Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
5 CommitDate: Thu Aug 31 19:55:39 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d9df599
7
8 dev-java/guice: Remove old 4.0
9
10 Package-Manager: Portage-2.3.8, Repoman-2.3.2
11
12 dev-java/guice/Manifest | 1 -
13 dev-java/guice/guice-4.0.ebuild | 75 -----------------------------------------
14 2 files changed, 76 deletions(-)
15
16 diff --git a/dev-java/guice/Manifest b/dev-java/guice/Manifest
17 index b2625456c16..85b87a53e96 100644
18 --- a/dev-java/guice/Manifest
19 +++ b/dev-java/guice/Manifest
20 @@ -1,2 +1 @@
21 -DIST guice-4.0.tar.gz 23103592 SHA256 353cd5130d6e7f5bdb702af2e6b4f8aedd6e152c276275a6adcf5bbefade4ddb SHA512 45bdc00ebbad051f1f31b7cb5c134e42c841a06513563abc184739a514f39bc76dcb220af77ec60f46a0d887df93e0177ce071110b41ef6e5e69bad1a30f0e40 WHIRLPOOL 7b9b1d41b5256592ae5ccbd550b008d4cd10a50e7007a3c2b3d9b5cfaaa144f43be2d398386a762d9ca4afa76b30d4ec40aed2a9c9fd1c731f359de23c3be0df
22 DIST guice-4.1.tar.gz 23212767 SHA256 77650231a0b12c0f0551202ae4dcfc1a4364e090f461cc3d21616d45bfc49537 SHA512 b42c6475a1d17c111a2ca278ac007bee541806685c0938c66f638808bd81d58aa99ba5aef2e4d8320dd5014df4307c5d2dd192111f4610c73a1eeef328771c00 WHIRLPOOL 9566d12d7cc001f7ddc0b3b972d06664f246a44d0dc0c2c02435f544417781c2f3cb7cce0fc21846297736f79ed59011aaaf2d2b65b08220c3d45acfdba8c76b
23
24 diff --git a/dev-java/guice/guice-4.0.ebuild b/dev-java/guice/guice-4.0.ebuild
25 deleted file mode 100644
26 index 432869d3327..00000000000
27 --- a/dev-java/guice/guice-4.0.ebuild
28 +++ /dev/null
29 @@ -1,75 +0,0 @@
30 -# Copyright 1999-2016 Gentoo Foundation
31 -# Distributed under the terms of the GNU General Public License v2
32 -
33 -EAPI="5"
34 -
35 -JAVA_PKG_IUSE="source"
36 -
37 -inherit java-pkg-2 java-ant-2
38 -
39 -DESCRIPTION="Guice is a lightweight dependency injection framework for Java 5 and above"
40 -HOMEPAGE="https://github.com/google/guice/"
41 -SRC_URI="https://github.com/google/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
42 -
43 -LICENSE="Apache-2.0"
44 -SLOT="4"
45 -KEYWORDS="amd64 x86"
46 -
47 -IUSE=""
48 -
49 -CDEPEND="dev-java/aopalliance:1
50 - dev-java/asm:4
51 - dev-java/guava:18
52 - >=dev-java/cglib-3.1:3
53 - >=dev-java/jarjar-1.4:1
54 - dev-java/javax-inject:0"
55 -
56 -RDEPEND=">=virtual/jre-1.6
57 - ${CDEPEND}"
58 -
59 -DEPEND=">=virtual/jdk-1.6
60 - ${CDEPEND}"
61 -
62 -RESTRICT="test"
63 -
64 -JAVA_PKG_BSFIX_NAME="build.xml common.xml servlet/build.xml"
65 -JAVA_ANT_REWRITE_CLASSPATH="yes"
66 -
67 -EANT_GENTOO_CLASSPATH="
68 - asm-4
69 - cglib-3
70 - guava-18
71 - javax-inject
72 - aopalliance-1
73 -"
74 -
75 -java_prepare() {
76 - # Where could we get this FREAKIN jar?
77 - cp ./lib/build/bnd-0.0.384.jar "${T}" || die
78 -
79 - find . -name '*.jar' -exec rm -v {} + || die
80 - find . -name '*.class' -exec rm -v {} + || die
81 -
82 - cp "${T}"/*.jar ./lib/build/ || die
83 -
84 - java-pkg_jar-from --into lib cglib-3 cglib.jar cglib-3.1.jar
85 - java-pkg_jar-from --into lib/build cglib-3 cglib.jar cglib-3.1.jar
86 -
87 - java-pkg_jar-from --into lib asm-4
88 - java-pkg_jar-from --into lib/build asm-4
89 - java-pkg_jar-from --into lib/build asm-4 asm.jar asm-5.0.3.jar
90 -
91 - java-pkg_jar-from --into lib guava-18
92 - java-pkg_jar-from --into lib javax-inject
93 - java-pkg_jar-from --into lib aopalliance-1
94 -}
95 -
96 -src_compile() {
97 - ANT_TASKS="jarjar-1" \
98 - java-pkg-2_src_compile
99 -}
100 -
101 -src_install() {
102 - java-pkg_newjar build/dist/"${PN}"-snapshot.jar "${PN}".jar
103 - use source && java-pkg_dosrc core/src/com
104 -}