Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Tomas Chvatal (scarabeus)" <scarabeus@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in app-office/libreoffice: libreoffice-9999-r2.ebuild libreoffice-3.6.9999.ebuild ChangeLog
Date: Fri, 23 Nov 2012 18:46:19
Message-Id: 20121123184609.A5F6F20C65@flycatcher.gentoo.org
1 scarabeus 12/11/23 18:46:09
2
3 Modified: libreoffice-9999-r2.ebuild
4 libreoffice-3.6.9999.ebuild ChangeLog
5 Log:
6 Just disable junit completely, it is just acting weird all the time.
7
8 (Portage version: 2.2.0_alpha142/cvs/Linux x86_64, RepoMan options: --force, signed Manifest commit with key 8EEE3BE8)
9
10 Revision Changes Path
11 1.132 app-office/libreoffice/libreoffice-9999-r2.ebuild
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild?rev=1.132&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild?rev=1.132&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild?r1=1.131&r2=1.132
16
17 Index: libreoffice-9999-r2.ebuild
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v
20 retrieving revision 1.131
21 retrieving revision 1.132
22 diff -u -r1.131 -r1.132
23 --- libreoffice-9999-r2.ebuild 21 Nov 2012 15:45:10 -0000 1.131
24 +++ libreoffice-9999-r2.ebuild 23 Nov 2012 18:46:09 -0000 1.132
25 @@ -1,6 +1,6 @@
26 # Copyright 1999-2012 Gentoo Foundation
27 # Distributed under the terms of the GNU General Public License v2
28 -# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.131 2012/11/21 15:45:10 scarabeus Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.132 2012/11/23 18:46:09 scarabeus Exp $
30
31 EAPI=4
32
33 @@ -210,7 +210,6 @@
34 java? (
35 >=virtual/jdk-1.6
36 >=dev-java/ant-core-1.7
37 - test? ( dev-java/junit:4 )
38 )
39 odk? ( app-doc/doxygen )
40 test? ( dev-util/cppunit )
41 @@ -376,6 +375,7 @@
42 if use java; then
43 # hsqldb: system one is too new
44 java_opts="
45 + --without-junit
46 --without-system-hsqldb
47 --with-ant-home="${ANT_HOME}"
48 --with-jdk-home=$(java-config --jdk-home 2>/dev/null)
49 @@ -398,12 +398,6 @@
50 --with-servlet-api-jar=$(java-pkg_getjar tomcat-servlet-api-3.0 servlet-api.jar)
51 "
52 fi
53 -
54 - if use test; then
55 - java_opts+=" --with-junit=$(java-pkg_getjar junit-4 junit.jar)"
56 - else
57 - java_opts+=" --without-junit"
58 - fi
59 fi
60
61 if use branding; then
62
63
64
65 1.33 app-office/libreoffice/libreoffice-3.6.9999.ebuild
66
67 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.6.9999.ebuild?rev=1.33&view=markup
68 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.6.9999.ebuild?rev=1.33&content-type=text/plain
69 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.6.9999.ebuild?r1=1.32&r2=1.33
70
71 Index: libreoffice-3.6.9999.ebuild
72 ===================================================================
73 RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.6.9999.ebuild,v
74 retrieving revision 1.32
75 retrieving revision 1.33
76 diff -u -r1.32 -r1.33
77 --- libreoffice-3.6.9999.ebuild 16 Nov 2012 18:30:28 -0000 1.32
78 +++ libreoffice-3.6.9999.ebuild 23 Nov 2012 18:46:09 -0000 1.33
79 @@ -1,6 +1,6 @@
80 # Copyright 1999-2012 Gentoo Foundation
81 # Distributed under the terms of the GNU General Public License v2
82 -# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.6.9999.ebuild,v 1.32 2012/11/16 18:30:28 ago Exp $
83 +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.6.9999.ebuild,v 1.33 2012/11/23 18:46:09 scarabeus Exp $
84
85 EAPI=4
86
87 @@ -206,7 +206,6 @@
88 java? (
89 >=virtual/jdk-1.6
90 >=dev-java/ant-core-1.7
91 - test? ( dev-java/junit:4 )
92 )
93 odk? ( app-doc/doxygen )
94 test? ( dev-util/cppunit )
95 @@ -378,6 +377,7 @@
96 # hsqldb: system one is too new
97 # saxon: system one does not work properly
98 java_opts="
99 + --without-junit
100 --without-system-hsqldb
101 --without-system-saxon
102 --with-ant-home="${ANT_HOME}"
103 @@ -401,12 +401,6 @@
104 --with-servlet-api-jar=$(java-pkg_getjar tomcat-servlet-api-3.0 servlet-api.jar)
105 "
106 fi
107 -
108 - if use test; then
109 - java_opts+=" --with-junit=$(java-pkg_getjar junit-4 junit.jar)"
110 - else
111 - java_opts+=" --without-junit"
112 - fi
113 fi
114
115 if use branding; then
116
117
118
119 1.403 app-office/libreoffice/ChangeLog
120
121 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?rev=1.403&view=markup
122 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?rev=1.403&content-type=text/plain
123 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?r1=1.402&r2=1.403
124
125 Index: ChangeLog
126 ===================================================================
127 RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v
128 retrieving revision 1.402
129 retrieving revision 1.403
130 diff -u -r1.402 -r1.403
131 --- ChangeLog 21 Nov 2012 15:45:10 -0000 1.402
132 +++ ChangeLog 23 Nov 2012 18:46:09 -0000 1.403
133 @@ -1,6 +1,10 @@
134 # ChangeLog for app-office/libreoffice
135 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
136 -# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.402 2012/11/21 15:45:10 scarabeus Exp $
137 +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.403 2012/11/23 18:46:09 scarabeus Exp $
138 +
139 + 23 Nov 2012; Tomáš Chvátal <scarabeus@g.o> libreoffice-3.6.9999.ebuild,
140 + libreoffice-9999-r2.ebuild:
141 + Just disable junit completely, it is just acting weird all the time.
142
143 21 Nov 2012; Tomáš Chvátal <scarabeus@g.o> libreoffice-9999-r2.ebuild:
144 Berkdb is gone from master.
Report Message
Find on MARC Find on Google Groups