| 1 |
suka 10/02/25 09:51:30 |
| 2 |
|
| 3 |
Modified: ChangeLog openoffice-3.2.0.ebuild |
| 4 |
Log: |
| 5 |
Properly fix linguas stuff, also brings back templates integration |
| 6 |
(Portage version: 2.2_rc63/cvs/Linux i686) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.517 app-office/openoffice/ChangeLog |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/openoffice/ChangeLog?rev=1.517&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/openoffice/ChangeLog?rev=1.517&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/openoffice/ChangeLog?r1=1.516&r2=1.517 |
| 14 |
|
| 15 |
Index: ChangeLog |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v |
| 18 |
retrieving revision 1.516 |
| 19 |
retrieving revision 1.517 |
| 20 |
diff -u -r1.516 -r1.517 |
| 21 |
--- ChangeLog 23 Feb 2010 16:25:50 -0000 1.516 |
| 22 |
+++ ChangeLog 25 Feb 2010 09:51:29 -0000 1.517 |
| 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.516 2010/02/23 16:25:50 suka Exp $ |
| 27 |
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.517 2010/02/25 09:51:29 suka Exp $ |
| 28 |
+ |
| 29 |
+ 25 Feb 2010; Andreas Proschofsky <suka@g.o> |
| 30 |
+ openoffice-3.2.0.ebuild, files/gentoo-3.2.0.diff: |
| 31 |
+ Properly fix linguas stuff, also brings back templates integration |
| 32 |
|
| 33 |
23 Feb 2010; Andreas Proschofsky <suka@g.o> |
| 34 |
openoffice-3.2.0.ebuild: |
| 35 |
|
| 36 |
|
| 37 |
|
| 38 |
1.11 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.11&view=markup |
| 41 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/openoffice/openoffice-3.2.0.ebuild?rev=1.11&content-type=text/plain |
| 42 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/openoffice/openoffice-3.2.0.ebuild?r1=1.10&r2=1.11 |
| 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.10 |
| 48 |
retrieving revision 1.11 |
| 49 |
diff -u -r1.10 -r1.11 |
| 50 |
--- openoffice-3.2.0.ebuild 23 Feb 2010 16:25:50 -0000 1.10 |
| 51 |
+++ openoffice-3.2.0.ebuild 25 Feb 2010 09:51:29 -0000 1.11 |
| 52 |
@@ -1,15 +1,15 @@ |
| 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.10 2010/02/23 16:25:50 suka Exp $ |
| 56 |
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-3.2.0.ebuild,v 1.11 2010/02/25 09:51:29 suka Exp $ |
| 57 |
|
| 58 |
WANT_AUTOMAKE="1.9" |
| 59 |
EAPI="2" |
| 60 |
KDE_REQUIRED="optional" |
| 61 |
CMAKE_REQUIRED="false" |
| 62 |
|
| 63 |
-inherit bash-completion check-reqs db-use eutils fdo-mime flag-o-matic java-pkg-opt-2 kde4-base mono multilib toolchain-funcs |
| 64 |
+inherit autotools bash-completion check-reqs db-use eutils fdo-mime flag-o-matic java-pkg-opt-2 kde4-base mono multilib toolchain-funcs |
| 65 |
|
| 66 |
-IUSE="binfilter cups dbus debug eds gnome gstreamer gtk kde ldap mono nsplugin odk opengl pam" |
| 67 |
+IUSE="binfilter cups dbus debug eds gnome gstreamer gtk kde ldap mono nsplugin odk opengl pam templates" |
| 68 |
|
| 69 |
MY_PV=3.2.0.6 |
| 70 |
PATCHLEVEL=OOO320 |
| 71 |
@@ -28,6 +28,12 @@ |
| 72 |
${DEVPATH}_system.tar.bz2 |
| 73 |
${DEVPATH}_testautomation.tar.bz2 |
| 74 |
binfilter? ( ${DEVPATH}_binfilter.tar.bz2 ) |
| 75 |
+ templates? ( http://extensions.services.openoffice.org/files/273/0/Sun_ODF_Template_Pack_en-US.oxt |
| 76 |
+ http://extensions.services.openoffice.org/files/295/1/Sun_ODF_Template_Pack_de.oxt |
| 77 |
+ http://extensions.services.openoffice.org/files/299/0/Sun_ODF_Template_Pack_it.oxt |
| 78 |
+ http://extensions.services.openoffice.org/files/297/0/Sun_ODF_Template_Pack_fr.oxt |
| 79 |
+ http://extensions.services.openoffice.org/files/301/1/Sun_ODF_Template_Pack_es.oxt |
| 80 |
+ ftp://ftp.devall.hu/kami/go-oo//Sun_ODF_Template_Pack_hu.oxt ) |
| 81 |
http://download.go-oo.org/${PATCHLEVEL}/ooo-build-${MY_PV}.tar.gz |
| 82 |
odk? ( java? ( http://tools.openoffice.org/unowinreg_prebuild/680/unowinreg.dll ) ) |
| 83 |
http://download.go-oo.org/SRC680/extras-3.tar.bz2 |
| 84 |
@@ -37,7 +43,7 @@ |
| 85 |
http://download.go-oo.org/DEV300/ooo_oxygen_images-2009-06-17.tar.gz |
| 86 |
http://download.go-oo.org/SRC680/libwps-0.1.2.tar.gz" |
| 87 |
|
| 88 |
-LANGS1="af ar as_IN be_BY bg bn br brx bs ca cs cy da de dgo dz el en en_GB en_ZA eo es et eu fa fi fr ga gl gu he hi_IN hr hu id it ja ka kk km kn_IN ko kok ks ku lt mai mk ml_IN mn mni mr_IN nb ne nl nn nr ns oc or_IN pa_IN pl pt pt_BR ru rw sa_IN sat sd sh sk sl sr ss st sv sw_TZ ta ta_IN te_IN tg th ti_ER tn tr ts uk ur_IN uz ve vi xh zh_CN zh_TW zu" |
| 89 |
+LANGS1="af ar as_IN be_BY bg bn br brx bs ca cs cy da de dgo dz el en_GB en_ZA eo es et eu fa fi fr ga gl gu he hi_IN hr hu id it ja ka kk km kn_IN ko kok ks ku lt mai mk ml_IN mn mni mr_IN nb ne nl nn nr ns oc or_IN pa_IN pl pt pt_BR ru rw sa_IN sat sd sh sk sl sr ss st sv sw_TZ ta ta_IN te_IN tg th ti_ER tn tr ts uk ur_IN uz ve vi xh zh_CN zh_TW zu" |
| 90 |
LANGS="${LANGS1} en en_US" |
| 91 |
|
| 92 |
for X in ${LANGS} ; do |
| 93 |
@@ -156,13 +162,14 @@ |
| 94 |
|
| 95 |
strip-linguas ${LANGS} |
| 96 |
|
| 97 |
- if [ -z "${LINGUAS}" ] || [[ "${LINGUAS}" == en ]] || [[ "${LINGUAS}" == en_US ]] || [[ "${LINGUAS}" == "en en_US" ]] || [[ "${LINGUAS}" == "en_US en" ]]; then |
| 98 |
+ # en_US is built by default, upstream needs us to use --with-lang="" in this case though, so strip it out |
| 99 |
+ export LINGUAS_TEMP=$(echo ${LINGUAS} | sed -e 's/\ben_US\b//g;s/en//g') |
| 100 |
+ |
| 101 |
+ if [[ -z "${LINGUAS_TEMP}" ]] || [[ ${LINGUAS_TEMP} == " " ]]; then |
| 102 |
export LINGUAS_OOO="" |
| 103 |
- elif [[ ${LINGUAS} =~ en([^_]|$) ]]; then |
| 104 |
- export LINGUAS_OOO="$(echo ${LINGUAS} | sed -e 's/\ben\b/en_US/;s/_/-/g')" |
| 105 |
- # case: en-US lingua not set, add |
| 106 |
else |
| 107 |
- export LINGUAS_OOO="en-US ${LINGUAS//_/-}" |
| 108 |
+ # always build en-US as a fallback (needed for broken code / translations) |
| 109 |
+ export LINGUAS_OOO="en-US ${LINGUAS_TEMP//_/-}" |
| 110 |
fi |
| 111 |
|
| 112 |
if use !java; then |
| 113 |
@@ -268,6 +275,9 @@ |
| 114 |
# Upstream this |
| 115 |
echo "--with-system-redland" >> ${CONFFILE} |
| 116 |
|
| 117 |
+ # needed for sun-templates patch |
| 118 |
+ eautoreconf |
| 119 |
+ |
| 120 |
} |
| 121 |
|
| 122 |
src_configure() { |
| 123 |
@@ -324,7 +334,7 @@ |
| 124 |
$(use_enable odk) \ |
| 125 |
$(use_enable pam) \ |
| 126 |
$(use_with java) \ |
| 127 |
- --without-sun-templates \ |
| 128 |
+ $(use_with templates sun-templates) \ |
| 129 |
--disable-access \ |
| 130 |
--disable-post-install-scripts \ |
| 131 |
--enable-extensions \ |
Archives