Gentoo Archives: gentoo-commits

From: "Patrice Clement (monsieurp)" <monsieurp@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-java/annogen: annogen-0.1.0.ebuild ChangeLog
Date: Sat, 01 Aug 2015 19:10:52
Message-Id: 20150801191045.E67CE10F@oystercatcher.gentoo.org
1 monsieurp 15/08/01 19:10:45
2
3 Modified: annogen-0.1.0.ebuild ChangeLog
4 Log:
5 Remove two files causing compilation errors due to com.sun.mirror.* package import (removed from JDK 7 onwards).
6
7 Signed-off-by: Patrice Clement <monsieurp@g.o>
8 (Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 93491BB8)
9
10 Revision Changes Path
11 1.4 dev-java/annogen/annogen-0.1.0.ebuild
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/annogen/annogen-0.1.0.ebuild?rev=1.4&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/annogen/annogen-0.1.0.ebuild?rev=1.4&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/annogen/annogen-0.1.0.ebuild?r1=1.3&r2=1.4
16
17 Index: annogen-0.1.0.ebuild
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/dev-java/annogen/annogen-0.1.0.ebuild,v
20 retrieving revision 1.3
21 retrieving revision 1.4
22 diff -u -r1.3 -r1.4
23 --- annogen-0.1.0.ebuild 10 Aug 2014 20:06:45 -0000 1.3
24 +++ annogen-0.1.0.ebuild 1 Aug 2015 19:10:45 -0000 1.4
25 @@ -1,6 +1,6 @@
26 -# Copyright 1999-2014 Gentoo Foundation
27 +# Copyright 1999-2015 Gentoo Foundation
28 # Distributed under the terms of the GNU General Public License v2
29 -# $Header: /var/cvsroot/gentoo-x86/dev-java/annogen/annogen-0.1.0.ebuild,v 1.3 2014/08/10 20:06:45 slyfox Exp $
30 +# $Header: /var/cvsroot/gentoo-x86/dev-java/annogen/annogen-0.1.0.ebuild,v 1.4 2015/08/01 19:10:45 monsieurp Exp $
31
32 EAPI="5"
33
34 @@ -17,22 +17,28 @@
35 KEYWORDS="~amd64"
36
37 CDEPEND="java-virtuals/stax-api:0
38 - dev-java/ant-core:0
39 java-virtuals/jdk-with-com-sun:0
40 - >=dev-java/qdox-1.6:1.6"
41 + dev-java/ant-core:0
42 + dev-java/qdox:1.6"
43
44 -RDEPEND=">=virtual/jdk-1.5
45 +RDEPEND=">=virtual/jdk-1.6
46 ${CDEPEND}"
47
48 -DEPEND=">=virtual/jdk-1.5
49 +DEPEND=">=virtual/jdk-1.6
50 app-arch/unzip
51 ${CDEPEND}"
52
53 S="${WORKDIR}"
54
55 +# com.sun.mirror.declaration was removed from JDK 7 onwards.
56 +# These two files are just interfaces anyway.
57 +JAVA_RM_FILES=(
58 + org/codehaus/annogen/view/MirrorAnnoViewer.java
59 + org/codehaus/annogen/override/MirrorElementIdPool.java
60 +)
61 +
62 src_unpack() {
63 default
64 -
65 unzip -o -q "${S}/${PN}-src-${PV}.zip" || die
66 }
67
68
69
70
71 1.4 dev-java/annogen/ChangeLog
72
73 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/annogen/ChangeLog?rev=1.4&view=markup
74 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/annogen/ChangeLog?rev=1.4&content-type=text/plain
75 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/annogen/ChangeLog?r1=1.3&r2=1.4
76
77 Index: ChangeLog
78 ===================================================================
79 RCS file: /var/cvsroot/gentoo-x86/dev-java/annogen/ChangeLog,v
80 retrieving revision 1.3
81 retrieving revision 1.4
82 diff -u -r1.3 -r1.4
83 --- ChangeLog 10 Aug 2014 20:06:46 -0000 1.3
84 +++ ChangeLog 1 Aug 2015 19:10:45 -0000 1.4
85 @@ -1,6 +1,10 @@
86 # ChangeLog for dev-java/annogen
87 -# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
88 -# $Header: /var/cvsroot/gentoo-x86/dev-java/annogen/ChangeLog,v 1.3 2014/08/10 20:06:46 slyfox Exp $
89 +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
90 +# $Header: /var/cvsroot/gentoo-x86/dev-java/annogen/ChangeLog,v 1.4 2015/08/01 19:10:45 monsieurp Exp $
91 +
92 + 01 Aug 2015; Patrice Clement <monsieurp@g.o> annogen-0.1.0.ebuild:
93 + Remove two files causing compilation errors due to com.sun.mirror.* package
94 + import (removed from JDK 7 onwards).
95
96 10 Aug 2014; Sergei Trofimovich <slyfox@g.o> annogen-0.1.0.ebuild:
97 QA: drop trailing '.' from DESCRIPTION