1 |
betelgeuse 09/03/31 17:33:11 |
2 |
|
3 |
Modified: jsr311-api-1.0.ebuild ChangeLog |
4 |
Log: |
5 |
Migrate to EAPI 2. Fix javadoc installation and cleanup ebuild. Fixes bug #264396. |
6 |
(Portage version: 2.2_rc27/cvs/Linux i686) |
7 |
|
8 |
Revision Changes Path |
9 |
1.3 dev-java/jsr311-api/jsr311-api-1.0.ebuild |
10 |
|
11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/jsr311-api/jsr311-api-1.0.ebuild?rev=1.3&view=markup |
12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/jsr311-api/jsr311-api-1.0.ebuild?rev=1.3&content-type=text/plain |
13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/jsr311-api/jsr311-api-1.0.ebuild?r1=1.2&r2=1.3 |
14 |
|
15 |
Index: jsr311-api-1.0.ebuild |
16 |
=================================================================== |
17 |
RCS file: /var/cvsroot/gentoo-x86/dev-java/jsr311-api/jsr311-api-1.0.ebuild,v |
18 |
retrieving revision 1.2 |
19 |
retrieving revision 1.3 |
20 |
diff -u -r1.2 -r1.3 |
21 |
--- jsr311-api-1.0.ebuild 24 Feb 2009 17:45:49 -0000 1.2 |
22 |
+++ jsr311-api-1.0.ebuild 31 Mar 2009 17:33:10 -0000 1.3 |
23 |
@@ -1,11 +1,11 @@ |
24 |
# Copyright 1999-2009 Gentoo Foundation |
25 |
# Distributed under the terms of the GNU General Public License v2 |
26 |
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jsr311-api/jsr311-api-1.0.ebuild,v 1.2 2009/02/24 17:45:49 mr_bones_ Exp $ |
27 |
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jsr311-api/jsr311-api-1.0.ebuild,v 1.3 2009/03/31 17:33:10 betelgeuse Exp $ |
28 |
|
29 |
-JAVA_PKG_IUSE="doc source" |
30 |
-JAVA_PKG_STRICT=1 |
31 |
+EAPI="2" |
32 |
+JAVA_PKG_IUSE="doc source test" |
33 |
|
34 |
-inherit java-pkg-2 java-ant-2 eutils |
35 |
+inherit java-pkg-2 java-ant-2 |
36 |
|
37 |
DESCRIPTION="JAX-RS: Java API for RESTful Web Services" |
38 |
HOMEPAGE="https://jsr311.dev.java.net/" |
39 |
@@ -14,10 +14,10 @@ |
40 |
LICENSE="CDDL" |
41 |
SLOT="0" |
42 |
KEYWORDS="~amd64 ~ppc ~x86" |
43 |
-IUSE="test" |
44 |
+IUSE="" |
45 |
|
46 |
DEPEND=">=virtual/jdk-1.5 |
47 |
- test? ( dev-java/ant-junit =dev-java/junit-3* )" |
48 |
+ test? ( dev-java/ant-junit:0 dev-java/junit:0 )" |
49 |
RDEPEND=">=virtual/jre-1.5" |
50 |
|
51 |
# Helper to generate the tarball :-) |
52 |
@@ -32,25 +32,18 @@ |
53 |
echo "New tarball located at ${P}.tar.bz2" |
54 |
} |
55 |
|
56 |
-src_unpack() { |
57 |
- unpack ${A} |
58 |
- cd "${S}" |
59 |
+java_prepare() { |
60 |
for i in build.xml maven-build.xml manifest ; do |
61 |
cp -f "${FILESDIR}"/"${P}-${i}" "${i}" \ |
62 |
|| die "Unable to find ${P}-${i}" |
63 |
done |
64 |
- cd "${S}"/lib |
65 |
- java-pkg_jar-from --build-only junit |
66 |
} |
67 |
|
68 |
src_install() { |
69 |
- dodoc README.txt |
70 |
+ dodoc README.txt || die |
71 |
java-pkg_newjar target/${P}.jar jsr311-api.jar |
72 |
- use doc \ |
73 |
- && java-pkg_dojavadoc target/site/apidocs/ \ |
74 |
- || die "Failed javadoc" |
75 |
- use source \ |
76 |
- && java-pkg_dosrc src/javax/* |
77 |
+ use doc && java-pkg_dojavadoc target/site/apidocs |
78 |
+ use source && java-pkg_dosrc src/javax |
79 |
} |
80 |
|
81 |
src_test() { |
82 |
|
83 |
|
84 |
|
85 |
1.2 dev-java/jsr311-api/ChangeLog |
86 |
|
87 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/jsr311-api/ChangeLog?rev=1.2&view=markup |
88 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/jsr311-api/ChangeLog?rev=1.2&content-type=text/plain |
89 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/jsr311-api/ChangeLog?r1=1.1&r2=1.2 |
90 |
|
91 |
Index: ChangeLog |
92 |
=================================================================== |
93 |
RCS file: /var/cvsroot/gentoo-x86/dev-java/jsr311-api/ChangeLog,v |
94 |
retrieving revision 1.1 |
95 |
retrieving revision 1.2 |
96 |
diff -u -r1.1 -r1.2 |
97 |
--- ChangeLog 23 Feb 2009 10:37:45 -0000 1.1 |
98 |
+++ ChangeLog 31 Mar 2009 17:33:10 -0000 1.2 |
99 |
@@ -1,6 +1,10 @@ |
100 |
# ChangeLog for dev-java/jsr311-api |
101 |
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 |
102 |
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jsr311-api/ChangeLog,v 1.1 2009/02/23 10:37:45 robbat2 Exp $ |
103 |
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jsr311-api/ChangeLog,v 1.2 2009/03/31 17:33:10 betelgeuse Exp $ |
104 |
+ |
105 |
+ 31 Mar 2009; Petteri Räty <betelgeuse@g.o> jsr311-api-1.0.ebuild: |
106 |
+ Migrate to EAPI 2. Fix javadoc installation and cleanup ebuild. Fixes bug |
107 |
+ #264396. |
108 |
|
109 |
*jsr311-api-1.0 (23 Feb 2009) |