| 1 |
suka 10/02/22 17:17:16 |
| 2 |
|
| 3 |
Modified: ChangeLog openoffice-3.2.0.ebuild |
| 4 |
Log: |
| 5 |
Simplify mozilla stuff, raises dep on xulrunner, fixes bug #306123 |
| 6 |
(Portage version: 2.2_rc63/cvs/Linux i686) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.513 app-office/openoffice/ChangeLog |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/openoffice/ChangeLog?rev=1.513&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/openoffice/ChangeLog?rev=1.513&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/openoffice/ChangeLog?r1=1.512&r2=1.513 |
| 14 |
|
| 15 |
Index: ChangeLog |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v |
| 18 |
retrieving revision 1.512 |
| 19 |
retrieving revision 1.513 |
| 20 |
diff -u -r1.512 -r1.513 |
| 21 |
--- ChangeLog 22 Feb 2010 16:45:29 -0000 1.512 |
| 22 |
+++ ChangeLog 22 Feb 2010 17:17:16 -0000 1.513 |
| 23 |
@@ -1,6 +1,10 @@ |
| 24 |
# ChangeLog for app-office/openoffice |
| 25 |
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
| 26 |
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.512 2010/02/22 16:45:29 suka Exp $ |
| 27 |
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.513 2010/02/22 17:17:16 suka Exp $ |
| 28 |
+ |
| 29 |
+ 22 Feb 2010; Andreas Proschofsky <suka@g.o> |
| 30 |
+ openoffice-3.2.0.ebuild: |
| 31 |
+ Simplify mozilla stuff, raises dep on xulrunner, fixes bug #306123 |
| 32 |
|
| 33 |
22 Feb 2010; Andreas Proschofsky <suka@g.o> |
| 34 |
openoffice-3.2.0.ebuild: |
| 35 |
|
| 36 |
|
| 37 |
|
| 38 |
1.7 app-office/openoffice/openoffice-3.2.0.ebuild |
| 39 |
|
| 40 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/openoffice/openoffice-3.2.0.ebuild?rev=1.7&view=markup |
| 41 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/openoffice/openoffice-3.2.0.ebuild?rev=1.7&content-type=text/plain |
| 42 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/openoffice/openoffice-3.2.0.ebuild?r1=1.6&r2=1.7 |
| 43 |
|
| 44 |
Index: openoffice-3.2.0.ebuild |
| 45 |
=================================================================== |
| 46 |
RCS file: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-3.2.0.ebuild,v |
| 47 |
retrieving revision 1.6 |
| 48 |
retrieving revision 1.7 |
| 49 |
diff -u -r1.6 -r1.7 |
| 50 |
--- openoffice-3.2.0.ebuild 22 Feb 2010 16:45:29 -0000 1.6 |
| 51 |
+++ openoffice-3.2.0.ebuild 22 Feb 2010 17:17:16 -0000 1.7 |
| 52 |
@@ -1,6 +1,6 @@ |
| 53 |
# Copyright 1999-2010 Gentoo Foundation |
| 54 |
# Distributed under the terms of the GNU General Public License v2 |
| 55 |
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-3.2.0.ebuild,v 1.6 2010/02/22 16:45:29 suka Exp $ |
| 56 |
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-3.2.0.ebuild,v 1.7 2010/02/22 17:17:16 suka Exp $ |
| 57 |
|
| 58 |
WANT_AUTOMAKE="1.9" |
| 59 |
EAPI="2" |
| 60 |
@@ -79,7 +79,7 @@ |
| 61 |
dev-java/lucene-analyzers:2.3 |
| 62 |
dev-java/rhino:1.5 ) |
| 63 |
mono? ( || ( >dev-lang/mono-2.4-r1 <dev-lang/mono-2.4 ) ) |
| 64 |
- nsplugin? ( || ( net-libs/xulrunner:1.9 net-libs/xulrunner:1.8 ) |
| 65 |
+ nsplugin? ( net-libs/xulrunner:1.9 |
| 66 |
>=dev-libs/nspr-4.6.6 |
| 67 |
>=dev-libs/nss-3.11-r1 ) |
| 68 |
opengl? ( virtual/opengl |
| 69 |
@@ -188,16 +188,6 @@ |
| 70 |
die |
| 71 |
fi |
| 72 |
|
| 73 |
- if use nsplugin; then |
| 74 |
- if pkg-config --exists libxul; then |
| 75 |
- BRWS="libxul" |
| 76 |
- elif pkg-config --exists xulrunner-xpcom; then |
| 77 |
- BRWS="xulrunner" |
| 78 |
- else |
| 79 |
- die "USE flag [nsplugin] set but no installed xulrunner found!" |
| 80 |
- fi |
| 81 |
- fi |
| 82 |
- |
| 83 |
java-pkg-opt-2_pkg_setup |
| 84 |
|
| 85 |
# sys-libs/db version used |
| 86 |
@@ -243,13 +233,8 @@ |
| 87 |
echo "--with-rhino-jar=$(java-pkg_getjar rhino-1.5 js.jar)" >> ${CONFFILE} |
| 88 |
fi |
| 89 |
|
| 90 |
- if use nsplugin ; then |
| 91 |
- echo "--enable-mozilla" >> ${CONFFILE} |
| 92 |
- echo "--with-system-mozilla=${BRWS}" >> ${CONFFILE} |
| 93 |
- else |
| 94 |
- echo "--disable-mozilla" >> ${CONFFILE} |
| 95 |
- echo "--without-system-mozilla" >> ${CONFFILE} |
| 96 |
- fi |
| 97 |
+ echo $(use_enable nsplugin mozilla) >> ${CONFFILE} |
| 98 |
+ echo $(use_with nsplugin system-mozilla libxul) >> ${CONFFILE} |
| 99 |
|
| 100 |
echo $(use_enable binfilter) >> ${CONFFILE} |
| 101 |
echo $(use_enable cups) >> ${CONFFILE} |
Archives