Add support for localized helpcontent. See ChangeLog for details, closes bug #30668

Package-Manager: portage-2.0.51-r13

diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog
index 65e16c4deff02b5f642d076f2e726bf3c80727ef..1aac0e8036017c1c95f81af6c3651013d3c582e8 100644 (file)
--- a/app-office/openoffice/ChangeLog
+++ b/app-office/openoffice/ChangeLog
@@ -1,10 +1,26 @@
 # ChangeLog for app-office/openoffice
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.102 2005/01/17 12:51:04 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.103 2005/01/17 15:05:25 suka Exp $
+
+  17 Jan 2005; Andreas Proschofsky <suka@gentoo.org>
+  openoffice-1.1.4.ebuild:
+  Add support for localized helpcontent. For it to work you will have to
+  download the correct helpcontent file from one of the OOo-mirrors (it's in
+  the contrib/helpcontent/ directory, for instance:
+  http://ftp.stardiv.de/pub/OpenOffice.org/contrib/helpcontent/) and put it in
+  you distfiles-directory. Closes bug #30668
 
   17 Jan 2005; Gustavo Zacarias <gustavoz@gentoo.org> openoffice-1.1.4.ebuild:
   Keyworded ~sparc
 
+  17 Jan 2005; Andreas Proschofsky <suka@gentoo.org>
+  openoffice-1.1.4.ebuild:
+  Add support for localized helpcontent. For it to work you will have to
+  download the correct helpcontent file from one of the OOo-mirrors (it's in
+  the contrib/helpcontent/ directory, for instance:
+  http://ftp.stardiv.de/pub/OpenOffice.org/contrib/helpcontent/) and put it in
+  you distfiles-directory. Closes bug #30668
+
   17 Jan 2005; Andreas Proschofsky <suka@gentoo.org>
   +files/1.1.4/hardened-link.patch, +files/1.1.4/pthreadlink-fix.patch:
   Try to fix build problems with hardened-gccs, patches provided by

diff --git a/app-office/openoffice/Manifest b/app-office/openoffice/Manifest
index f34fa8e29ad1b240dc517dc4e218a3ac8ca3101e..b14fc9ac159ec0fb30ba3a021d36e96adfcc6aa0 100644 (file)
--- a/app-office/openoffice/Manifest
+++ b/app-office/openoffice/Manifest
@@ -1,32 +1,22 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 c7b9e3a8eab7d7cf59168d48cb2bb0db ChangeLog 22299
-MD5 e3ec4a70395943b59adad7fc4f0538d7 metadata.xml 461
+MD5 2a9593e8bc0c80215ac647c5096eb254 openoffice-1.1.4.ebuild 16721
 MD5 db4fc1842f4f355e5c4c875ef6b61fdc openoffice-1.1.3.ebuild 15689
-MD5 38ec812eaedf8ba592e0f546a75eecb5 openoffice-1.1.4.ebuild 16442
-MD5 b2cb01ba0d5824f2892c150dce1d8771 files/digest-openoffice-1.1.4 325
+MD5 c5845dc5ce59246aba9e77058fd4f4f9 ChangeLog 23109
+MD5 e3ec4a70395943b59adad7fc4f0538d7 metadata.xml 461
 MD5 fd065af92828cda546d797e6c86d102b files/digest-openoffice-1.1.3 73
-MD5 cd0429c945d4f2e1fbbb9fd5322a6c2b files/1.1.4/freetype-217.patch 766
-MD5 ffcbf659ca6f54e8e15401cced99af77 files/1.1.4/gcc-instlib.patch 393
-MD5 a9cbc34e9462f6b64ca9e564c3b3a084 files/1.1.4/gcc34-nojava-fix.patch 329
-MD5 bf7df7ebe1373f6e2e5bd1e0425657bd files/1.1.4/gcc34-nptl-fix.patch 618
+MD5 b2cb01ba0d5824f2892c150dce1d8771 files/digest-openoffice-1.1.4 325
+MD5 43cbfca8df057d634675ef000fae82fc files/1.1.3/ooffice-wrapper-1.3 9471
+MD5 ffcbf659ca6f54e8e15401cced99af77 files/1.1.3/gcc-instlib.patch 393
+MD5 35601b7efe487b346f78d43c23e2f8f3 files/1.1.3/openoffice-java.patch 2092
+MD5 d08ea5bce1e9a925cbd712607f89f920 files/1.1.3/newstlportfix.patch 10032
 MD5 f0c4c412675085f96c20d0b5ac753694 files/1.1.4/gcc34.patch.bz2 34342
-MD5 a9233bc0091b925de38145108267b949 files/1.1.4/newstlportfix.patch 3638
 MD5 5b5b02ecb719c0a553b740edd3544bc7 files/1.1.4/ooffice-wrapper-1.3 9471
+MD5 ffcbf659ca6f54e8e15401cced99af77 files/1.1.4/gcc-instlib.patch 393
 MD5 35601b7efe487b346f78d43c23e2f8f3 files/1.1.4/openoffice-java.patch 2092
-MD5 6f7ff745a5659e605fb05206914ab344 files/1.1.4/STLport-vector.patch 1472
 MD5 24035033f41d743378e16582c2e51469 files/1.1.4/javafix.patch 1382
 MD5 ddb36dfd1d142b8a03850e3bee62a8c3 files/1.1.4/hardened-link.patch 576
+MD5 a9cbc34e9462f6b64ca9e564c3b3a084 files/1.1.4/gcc34-nojava-fix.patch 329
+MD5 bf7df7ebe1373f6e2e5bd1e0425657bd files/1.1.4/gcc34-nptl-fix.patch 618
 MD5 fd1c64677627b46e5528f72564bcc8fd files/1.1.4/pthreadlink-fix.patch 1133
-MD5 ffcbf659ca6f54e8e15401cced99af77 files/1.1.3/gcc-instlib.patch 393
-MD5 d08ea5bce1e9a925cbd712607f89f920 files/1.1.3/newstlportfix.patch 10032
-MD5 43cbfca8df057d634675ef000fae82fc files/1.1.3/ooffice-wrapper-1.3 9471
-MD5 35601b7efe487b346f78d43c23e2f8f3 files/1.1.3/openoffice-java.patch 2092
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFB67S9KRy60XGEcJIRAtHUAJ9xjVfujQz68ZBh1qhXPsD24/j/KgCeJp+x
-LjWriKLGmJAxGAE2Z/fPX5A=
-=5swj
------END PGP SIGNATURE-----
+MD5 cd0429c945d4f2e1fbbb9fd5322a6c2b files/1.1.4/freetype-217.patch 766
+MD5 6f7ff745a5659e605fb05206914ab344 files/1.1.4/STLport-vector.patch 1472
+MD5 a9233bc0091b925de38145108267b949 files/1.1.4/newstlportfix.patch 3638

diff --git a/app-office/openoffice/openoffice-1.1.4.ebuild b/app-office/openoffice/openoffice-1.1.4.ebuild
index c79f8ca7ca1e82154c8c0396701f37e8f42f46ad..18840aa956dbb2792dd1f619499549d8d5668fee 100644 (file)
--- a/app-office/openoffice/openoffice-1.1.4.ebuild
+++ b/app-office/openoffice/openoffice-1.1.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-1.1.4.ebuild,v 1.9 2005/01/17 12:51:04 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-1.1.4.ebuild,v 1.10 2005/01/17 15:05:25 suka Exp $
 
 # Notes:
 #
@@ -349,6 +349,13 @@ src_compile() {
        cd ${S}
        get_EnvSet
 
+       # unpack help files if present
+       if [ -f ${DISTDIR}/helpcontent_${LANGNO}_unix.tgz ]; then
+               einfo "Using helpcontent for ${LFULLNAME}"
+               mkdir -p ${S}/solver/${SOLVER}/${SOLPATH}/pck
+               tar -xzf ${DISTDIR}/helpcontent_${LANGNO}_unix.tgz -C ${S}/solver/${SOLVER}/${SOLPATH}/pck
+       fi
+
        # Set $ECPUS to amount of processes multiprocessing build should use.
        # NOTE:  Setting this too high might cause dmake to segfault!!
        #        Setting this to anything but "1" on my pentium4 causes things