| 1 |
suka 08/05/29 12:24:40 |
| 2 |
|
| 3 |
Modified: openoffice-2.4.1_rc1.ebuild openoffice-2.4.0.ebuild |
| 4 |
ChangeLog |
| 5 |
Log: |
| 6 |
bison and flex are only build time dependencies (bugs #221317 and #221581), also remove javaldx hack |
| 7 |
(Portage version: 2.1.5.2) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.3 app-office/openoffice/openoffice-2.4.1_rc1.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/openoffice/openoffice-2.4.1_rc1.ebuild?rev=1.3&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/openoffice/openoffice-2.4.1_rc1.ebuild?rev=1.3&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/openoffice/openoffice-2.4.1_rc1.ebuild?r1=1.2&r2=1.3 |
| 15 |
|
| 16 |
Index: openoffice-2.4.1_rc1.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-2.4.1_rc1.ebuild,v |
| 19 |
retrieving revision 1.2 |
| 20 |
retrieving revision 1.3 |
| 21 |
diff -u -r1.2 -r1.3 |
| 22 |
--- openoffice-2.4.1_rc1.ebuild 29 May 2008 09:50:33 -0000 1.2 |
| 23 |
+++ openoffice-2.4.1_rc1.ebuild 29 May 2008 12:24:40 -0000 1.3 |
| 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/app-office/openoffice/openoffice-2.4.1_rc1.ebuild,v 1.2 2008/05/29 09:50:33 suka Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-2.4.1_rc1.ebuild,v 1.3 2008/05/29 12:24:40 suka Exp $ |
| 29 |
|
| 30 |
WANT_AUTOCONF="2.5" |
| 31 |
WANT_AUTOMAKE="1.9" |
| 32 |
@@ -90,8 +90,6 @@ |
| 33 |
cups? ( net-print/cups ) |
| 34 |
media-libs/jpeg |
| 35 |
media-libs/libpng |
| 36 |
- sys-devel/flex |
| 37 |
- sys-devel/bison |
| 38 |
app-arch/zip |
| 39 |
app-arch/unzip |
| 40 |
>=app-text/hunspell-1.1.4-r1 |
| 41 |
@@ -125,6 +123,8 @@ |
| 42 |
dev-util/pkgconfig |
| 43 |
dev-util/intltool |
| 44 |
>=dev-libs/boost-1.33.1 |
| 45 |
+ sys-devel/flex |
| 46 |
+ sys-devel/bison |
| 47 |
dev-libs/libxslt |
| 48 |
>=dev-libs/libxml2-2.0 |
| 49 |
!xulrunner? ( firefox? ( =www-client/mozilla-firefox-2* ) ) |
| 50 |
@@ -360,9 +360,6 @@ |
| 51 |
# record java libraries |
| 52 |
use java && java-pkg_regjar "${D}"/usr/$(get_libdir)/openoffice/program/classes/*.jar |
| 53 |
|
| 54 |
- # trying to work around javaldx problems on start |
| 55 |
- cp ${S}/build/${MST}/solver/*/*/lib/sunjavapluginrc ${D}/usr/$(get_libdir)/openoffice/program/ || die "Java config not found!" |
| 56 |
- |
| 57 |
} |
| 58 |
|
| 59 |
pkg_postinst() { |
| 60 |
|
| 61 |
|
| 62 |
|
| 63 |
1.19 app-office/openoffice/openoffice-2.4.0.ebuild |
| 64 |
|
| 65 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/openoffice/openoffice-2.4.0.ebuild?rev=1.19&view=markup |
| 66 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/openoffice/openoffice-2.4.0.ebuild?rev=1.19&content-type=text/plain |
| 67 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/openoffice/openoffice-2.4.0.ebuild?r1=1.18&r2=1.19 |
| 68 |
|
| 69 |
Index: openoffice-2.4.0.ebuild |
| 70 |
=================================================================== |
| 71 |
RCS file: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-2.4.0.ebuild,v |
| 72 |
retrieving revision 1.18 |
| 73 |
retrieving revision 1.19 |
| 74 |
diff -u -r1.18 -r1.19 |
| 75 |
--- openoffice-2.4.0.ebuild 23 May 2008 12:56:01 -0000 1.18 |
| 76 |
+++ openoffice-2.4.0.ebuild 29 May 2008 12:24:40 -0000 1.19 |
| 77 |
@@ -1,6 +1,6 @@ |
| 78 |
# Copyright 1999-2008 Gentoo Foundation |
| 79 |
# Distributed under the terms of the GNU General Public License v2 |
| 80 |
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-2.4.0.ebuild,v 1.18 2008/05/23 12:56:01 suka Exp $ |
| 81 |
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-2.4.0.ebuild,v 1.19 2008/05/29 12:24:40 suka Exp $ |
| 82 |
|
| 83 |
WANT_AUTOCONF="2.5" |
| 84 |
WANT_AUTOMAKE="1.9" |
| 85 |
@@ -89,8 +89,6 @@ |
| 86 |
cups? ( net-print/cups ) |
| 87 |
media-libs/jpeg |
| 88 |
media-libs/libpng |
| 89 |
- sys-devel/flex |
| 90 |
- sys-devel/bison |
| 91 |
app-arch/zip |
| 92 |
app-arch/unzip |
| 93 |
>=app-text/hunspell-1.1.4-r1 |
| 94 |
@@ -124,6 +122,8 @@ |
| 95 |
dev-util/pkgconfig |
| 96 |
dev-util/intltool |
| 97 |
>=dev-libs/boost-1.33.1 |
| 98 |
+ sys-devel/flex |
| 99 |
+ sys-devel/bison |
| 100 |
dev-libs/libxslt |
| 101 |
>=dev-libs/libxml2-2.0 |
| 102 |
!xulrunner? ( firefox? ( =www-client/mozilla-firefox-2* ) ) |
| 103 |
@@ -359,9 +359,6 @@ |
| 104 |
# record java libraries |
| 105 |
use java && java-pkg_regjar "${D}"/usr/$(get_libdir)/openoffice/program/classes/*.jar |
| 106 |
|
| 107 |
- # trying to work around javaldx problems on start |
| 108 |
- cp ${S}/build/${MST}/solver/*/*/lib/sunjavapluginrc ${D}/usr/$(get_libdir)/openoffice/program/ || die "Java config not found!" |
| 109 |
- |
| 110 |
} |
| 111 |
|
| 112 |
pkg_postinst() { |
| 113 |
|
| 114 |
|
| 115 |
|
| 116 |
1.399 app-office/openoffice/ChangeLog |
| 117 |
|
| 118 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/openoffice/ChangeLog?rev=1.399&view=markup |
| 119 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/openoffice/ChangeLog?rev=1.399&content-type=text/plain |
| 120 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/openoffice/ChangeLog?r1=1.398&r2=1.399 |
| 121 |
|
| 122 |
Index: ChangeLog |
| 123 |
=================================================================== |
| 124 |
RCS file: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v |
| 125 |
retrieving revision 1.398 |
| 126 |
retrieving revision 1.399 |
| 127 |
diff -u -r1.398 -r1.399 |
| 128 |
--- ChangeLog 29 May 2008 09:50:33 -0000 1.398 |
| 129 |
+++ ChangeLog 29 May 2008 12:24:40 -0000 1.399 |
| 130 |
@@ -1,6 +1,11 @@ |
| 131 |
# ChangeLog for app-office/openoffice |
| 132 |
# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 |
| 133 |
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.398 2008/05/29 09:50:33 suka Exp $ |
| 134 |
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.399 2008/05/29 12:24:40 suka Exp $ |
| 135 |
+ |
| 136 |
+ 29 May 2008; Andreas Proschofsky <suka@g.o> |
| 137 |
+ openoffice-2.4.0.ebuild, openoffice-2.4.1_rc1.ebuild: |
| 138 |
+ bison and flex are only build time dependencies (bugs #221317 and |
| 139 |
+ #221581), also remove javaldx hack, shouldn't be necessary anymore |
| 140 |
|
| 141 |
29 May 2008; Andreas Proschofsky <suka@g.o> |
| 142 |
openoffice-2.4.1_rc1.ebuild: |
| 143 |
|
| 144 |
|
| 145 |
|
| 146 |
-- |
| 147 |
gentoo-commits@l.g.o mailing list |
Archives