1 |
serkan 08/10/01 11:35:01 |
2 |
|
3 |
Modified: java-gnome-4.0.8-r1.ebuild ChangeLog |
4 |
java-gnome-4.0.7-r1.ebuild |
5 |
Log: |
6 |
Move configure to src_configure to avoid running it twice. Move epatch calls to src_prepare. |
7 |
(Portage version: 2.2_rc11/cvs/Linux 2.6.25-gentoo-r7 x86_64) |
8 |
|
9 |
Revision Changes Path |
10 |
1.2 dev-java/java-gnome/java-gnome-4.0.8-r1.ebuild |
11 |
|
12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/java-gnome/java-gnome-4.0.8-r1.ebuild?rev=1.2&view=markup |
13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/java-gnome/java-gnome-4.0.8-r1.ebuild?rev=1.2&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/java-gnome/java-gnome-4.0.8-r1.ebuild?r1=1.1&r2=1.2 |
15 |
|
16 |
Index: java-gnome-4.0.8-r1.ebuild |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/dev-java/java-gnome/java-gnome-4.0.8-r1.ebuild,v |
19 |
retrieving revision 1.1 |
20 |
retrieving revision 1.2 |
21 |
diff -u -r1.1 -r1.2 |
22 |
--- java-gnome-4.0.8-r1.ebuild 27 Sep 2008 13:59:06 -0000 1.1 |
23 |
+++ java-gnome-4.0.8-r1.ebuild 1 Oct 2008 11:35:00 -0000 1.2 |
24 |
@@ -1,6 +1,6 @@ |
25 |
# Copyright 1999-2008 Gentoo Foundation |
26 |
# Distributed under the terms of the GNU General Public License v2 |
27 |
-# $Header: /var/cvsroot/gentoo-x86/dev-java/java-gnome/java-gnome-4.0.8-r1.ebuild,v 1.1 2008/09/27 13:59:06 serkan Exp $ |
28 |
+# $Header: /var/cvsroot/gentoo-x86/dev-java/java-gnome/java-gnome-4.0.8-r1.ebuild,v 1.2 2008/10/01 11:35:00 serkan Exp $ |
29 |
|
30 |
EAPI=2 |
31 |
JAVA_PKG_IUSE="doc examples source" |
32 |
@@ -32,18 +32,17 @@ |
33 |
# Needs X11 |
34 |
RESTRICT="test" |
35 |
|
36 |
-src_unpack() { |
37 |
- unpack ${A} |
38 |
- cd "${S}" |
39 |
- |
40 |
+src_prepare() { |
41 |
epatch "${FILESDIR}/${P}-disable-doc-snapshots.patch" |
42 |
epatch "${FILESDIR}/${P}-deprecated.patch" |
43 |
} |
44 |
|
45 |
-src_compile() { |
46 |
+src_configure() { |
47 |
# Handwritten in perl so not using econf |
48 |
./configure --prefix=/usr || die |
49 |
+} |
50 |
|
51 |
+src_compile() { |
52 |
# Fails parallel build in case GCJ is detected |
53 |
# See https://bugs.gentoo.org/show_bug.cgi?id=200550 |
54 |
emake -j1 || die "Compilation of java-gnome failed" |
55 |
|
56 |
|
57 |
|
58 |
1.69 dev-java/java-gnome/ChangeLog |
59 |
|
60 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/java-gnome/ChangeLog?rev=1.69&view=markup |
61 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/java-gnome/ChangeLog?rev=1.69&content-type=text/plain |
62 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/java-gnome/ChangeLog?r1=1.68&r2=1.69 |
63 |
|
64 |
Index: ChangeLog |
65 |
=================================================================== |
66 |
RCS file: /var/cvsroot/gentoo-x86/dev-java/java-gnome/ChangeLog,v |
67 |
retrieving revision 1.68 |
68 |
retrieving revision 1.69 |
69 |
diff -u -r1.68 -r1.69 |
70 |
--- ChangeLog 27 Sep 2008 13:59:06 -0000 1.68 |
71 |
+++ ChangeLog 1 Oct 2008 11:35:00 -0000 1.69 |
72 |
@@ -1,6 +1,11 @@ |
73 |
# ChangeLog for dev-java/java-gnome |
74 |
# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 |
75 |
-# $Header: /var/cvsroot/gentoo-x86/dev-java/java-gnome/ChangeLog,v 1.68 2008/09/27 13:59:06 serkan Exp $ |
76 |
+# $Header: /var/cvsroot/gentoo-x86/dev-java/java-gnome/ChangeLog,v 1.69 2008/10/01 11:35:00 serkan Exp $ |
77 |
+ |
78 |
+ 01 Oct 2008; Serkan Kaba <serkan@g.o> java-gnome-4.0.7-r1.ebuild, |
79 |
+ java-gnome-4.0.8-r1.ebuild: |
80 |
+ Move configure to src_configure to avoid running it twice. Move epatch |
81 |
+ calls to src_prepare. |
82 |
|
83 |
*java-gnome-4.0.8-r1 (27 Sep 2008) |
84 |
*java-gnome-4.0.7-r1 (27 Sep 2008) |
85 |
|
86 |
|
87 |
|
88 |
1.2 dev-java/java-gnome/java-gnome-4.0.7-r1.ebuild |
89 |
|
90 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/java-gnome/java-gnome-4.0.7-r1.ebuild?rev=1.2&view=markup |
91 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/java-gnome/java-gnome-4.0.7-r1.ebuild?rev=1.2&content-type=text/plain |
92 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/java-gnome/java-gnome-4.0.7-r1.ebuild?r1=1.1&r2=1.2 |
93 |
|
94 |
Index: java-gnome-4.0.7-r1.ebuild |
95 |
=================================================================== |
96 |
RCS file: /var/cvsroot/gentoo-x86/dev-java/java-gnome/java-gnome-4.0.7-r1.ebuild,v |
97 |
retrieving revision 1.1 |
98 |
retrieving revision 1.2 |
99 |
diff -u -r1.1 -r1.2 |
100 |
--- java-gnome-4.0.7-r1.ebuild 27 Sep 2008 13:59:06 -0000 1.1 |
101 |
+++ java-gnome-4.0.7-r1.ebuild 1 Oct 2008 11:35:00 -0000 1.2 |
102 |
@@ -1,6 +1,6 @@ |
103 |
# Copyright 1999-2008 Gentoo Foundation |
104 |
# Distributed under the terms of the GNU General Public License v2 |
105 |
-# $Header: /var/cvsroot/gentoo-x86/dev-java/java-gnome/java-gnome-4.0.7-r1.ebuild,v 1.1 2008/09/27 13:59:06 serkan Exp $ |
106 |
+# $Header: /var/cvsroot/gentoo-x86/dev-java/java-gnome/java-gnome-4.0.7-r1.ebuild,v 1.2 2008/10/01 11:35:00 serkan Exp $ |
107 |
|
108 |
EAPI=2 |
109 |
JAVA_PKG_IUSE="doc examples source" |
110 |
@@ -32,10 +32,12 @@ |
111 |
# Needs X11 |
112 |
RESTRICT="test" |
113 |
|
114 |
-src_compile() { |
115 |
+src_configure() { |
116 |
# Handwritten in perl so not using econf |
117 |
./configure --prefix=/usr || die |
118 |
+} |
119 |
|
120 |
+src_compile() { |
121 |
# Fails parallel build in case GCJ is detected |
122 |
# See https://bugs.gentoo.org/show_bug.cgi?id=200550 |
123 |
emake -j1 || die "Compilation of java-gnome failed" |