fix for partially broken language pack installation

Package-Manager: portage-2.0.51.19

5 files changed, 17 insertions, 191 deletions

diff --git a/app-office/openoffice-bin/ChangeLog b/app-office/openoffice-bin/ChangeLog
index 91c46b96e11d..580ac579b87b 100644
--- a/app-office/openoffice-bin/ChangeLog
+++ b/app-office/openoffice-bin/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-office/openoffice-bin
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/ChangeLog,v 1.75 2005/04/15 20:41:37 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/ChangeLog,v 1.76 2005/04/20 07:31:49 suka Exp $
+
+  20 Apr 2005; Andreas Proschofsky <suka@gentoo.org>
+  openoffice-bin-1.9.93.ebuild:
+  fixed certain language installations
 
 *openoffice-bin-1.9.93 (15 Apr 2005)
 
diff --git a/app-office/openoffice-bin/Manifest b/app-office/openoffice-bin/Manifest
index dc61fbc20940..af86ddbc4966 100644
--- a/app-office/openoffice-bin/Manifest
+++ b/app-office/openoffice-bin/Manifest
@@ -1,13 +1,11 @@
-MD5 b7723786de2593034e9ce1cc3e68dad4 openoffice-bin-1.9.91-r2.ebuild 5886
-MD5 cc6baf4b97f9dfa4f124ab5bb606d6d8 openoffice-bin-1.9.93.ebuild 5299
+MD5 7603ff143a3503e674ce492ef5a7507f openoffice-bin-1.9.93.ebuild 5354
 MD5 1a091dd047f09cc05d99f025c6a65fff openoffice-bin-1.1.1.ebuild 5855
 MD5 bb1e8ee689e1a90b8794c71ac421825e openoffice-bin-1.1.4-r1.ebuild 5004
-MD5 b7e53d130f00ff38584875a4340fb973 ChangeLog 13165
+MD5 8211062a6b917d6f357c962eec2a9374 ChangeLog 13290
 MD5 7134ec08f56019fc5db7f3e84acea4df metadata.xml 460
 MD5 442638fee36ff15f55cdb6cd2b5d6cc9 files/digest-openoffice-bin-1.9.93 2461
 MD5 753fd14ec632a7fe71ab9abef357f93f files/digest-openoffice-bin-1.1.4-r1 141
 MD5 2b70af485f57d1db6983b006f16a0587 files/digest-openoffice-bin-1.1.1 171
-MD5 74c5aa682f026476065b6a44b86d3a42 files/digest-openoffice-bin-1.9.91-r2 2469
 MD5 1a7afed026065dd18f0fc20030fb6496 files/1.9/ooffice-wrapper-1.9 2734
 MD5 4b2f3102e273ff72e281ed0d481b1526 files/1.1.1/ooffice-wrapper-1.3 9166
 MD5 4045e7a45d5209ff0ac93c5c5db0114b files/1.1.4/ooffice-wrapper-1.3 6659
diff --git a/app-office/openoffice-bin/files/digest-openoffice-bin-1.9.91-r2 b/app-office/openoffice-bin/files/digest-openoffice-bin-1.9.91-r2
deleted file mode 100644
index 102845a7b047..000000000000
--- a/app-office/openoffice-bin/files/digest-openoffice-bin-1.9.91-r2
+++ /dev/null
@@ -1,30 +0,0 @@
-MD5 40c56bb02522f7e71761b5aafc851bfa OOo_1.9.91_LinuxIntel_install.tar.gz 104649340
-MD5 0a11915b673313858818233a97652916 openofficeorg-af-1.9.91-1.i586.rpm 16982998
-MD5 e3f821e07bee4e7c5f5f7617661bb5e5 openofficeorg-bg-1.9.91-1.i586.rpm 16852211
-MD5 813e6e7e17452a17c610104bf593dfe1 openofficeorg-cs-1.9.91-1.i586.rpm 17787385
-MD5 699768707f386713d436559946f8e64b openofficeorg-cy-1.9.91-1.i586.rpm 16890652
-MD5 1a79d9177a10ebe5d2fc6c9bb9b4e7b9 openofficeorg-da-1.9.91-1.i586.rpm 17485807
-MD5 7ba3787d55a6b9aa4cb13efe4898ed1f openofficeorg-de-1.9.91-1.i586.rpm 18464988
-MD5 919554355999e095c78f40e8ab849364 openofficeorg-en-GB-1.9.91-1.i586.rpm 16949013
-MD5 7484b0c5c11757131db2cd1a2799822a OOo_1.9.m91_LinuxIntel_langpack_es.sh 17518668
-MD5 49184c07e15de8157860ffd8d8d6d36c openofficeorg-et-1.9.91-1.i586.rpm 17648089
-MD5 18cc3d8858f000f2a39dc90acbdcf65a openofficeorg-fi-1.9.91-1.i586.rpm 16972459
-MD5 7e23bae42afbdc4c189a10c0de95ca91 openofficeorg-fr-1.9.91-1.i586.rpm 18078719
-MD5 575d4f3e5ec7a66472ea0c0ae28c7eb0 openofficeorg-hu-1.9.91-1.i586.rpm 17237790
-MD5 3599db34e02a3d8408b2d5078ca0ebd5 OOo_1.9.m91_LinuxIntel_langpack_it.sh 17509880
-MD5 c6e9bc14b7be0fe7b2d79ba81e71d8a0 OOo_1.9.m91_LinuxIntel_langpack_ja.sh 18213236
-MD5 07a184068ae0928c67285ecfbae89e25 openofficeorg-km-1.9.91-1.i586.rpm 17070773
-MD5 a243616d4939742695e68081e5c89601 OOo_1.9.m91_LinuxIntel_langpack_ko.sh 17478483
-MD5 3b62bd490894ae5c0f00f6edb7c76b8e openofficeorg-nb-1.9.91-1.i586.rpm 16946585
-MD5 9902ff1aed8e6e4429f43148e2fa9c0d openofficeorg-nl-1.9.91-1.i586.rpm 16752778
-MD5 96da7958b5fbc1dd5ea43eadc004ded0 openofficeorg-nn-1.9.91-1.i586.rpm 16929413
-MD5 6296c4b390ff1636ee4bd37cf239b3dc openofficeorg-ns-1.9.91-1.i586.rpm 16843454
-MD5 e6ee938a0081f98e9586d7b1dee12f7f OOo_1.9.m91_LinuxIntel_langpack_pt-BR.sh 17511393
-MD5 9a20787759c0df1dae55e6a0a3dd435e openofficeorg-sk-1.9.91-1.i586.rpm 17224974
-MD5 3d10b44fee7ed7b1c9f5e2dd8dafa78a openofficeorg-sl-1.9.91-1.i586.rpm 16805645
-MD5 172af4053586d3dbca27a5f519d0a5e1 OOo_1.9.m91_LinuxIntel_langpack_sv.sh 17330020
-MD5 848c219634581978ec9538d9d1f7658e openofficeorg-tn-1.9.91-1.i586.rpm 17154486
-MD5 0c47351700658a5674cbd1990787a94f openofficeorg-xh-1.9.91-1.i586.rpm 16949554
-MD5 d9b024202a8d797f92a51ee692c63ba5 OOo_1.9.m91_LinuxIntel_langpack_zh-CN.sh 17650641
-MD5 3066d69bfd6dea940279dd38df7779ac OOo_1.9.m91_LinuxIntel_langpack_zh-TW.sh 17699838
-MD5 85f1d312f16c15c65ff385c49670a272 openofficeorg-zu-1.9.91-1.i586.rpm 17252131
diff --git a/app-office/openoffice-bin/openoffice-bin-1.9.91-r2.ebuild b/app-office/openoffice-bin/openoffice-bin-1.9.91-r2.ebuild
deleted file mode 100644
index 9f4faa7c6677..000000000000
--- a/app-office/openoffice-bin/openoffice-bin-1.9.91-r2.ebuild
+++ /dev/null
@@ -1,147 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/openoffice-bin-1.9.91-r2.ebuild,v 1.1 2005/04/10 15:15:48 suka Exp $
-
-inherit eutils fdo-mime rpm versionator
-
-IUSE="gnome java kde"
-
-INSTDIR="/opt/OpenOffice.org"
-
-S="${WORKDIR}/RPMS"
-DESCRIPTION="OpenOffice productivity suite"
-
-SNV="$(get_version_component_range 3)"
-LANGPACK="OOo_1.9.m${SNV}_LinuxIntel_langpack"
-LANGLOC="http://ftp.linux.cz/pub/localization/OpenOffice.org/devel/680/SRC680_m${SNV}/Build-1/OOo_SRC680_m${SNV}_native_LinuxIntel_langpacks_rpm"
-LANGSUFFIX="1.9.${SNV}-1.i586.rpm"
-
-SRC_URI="mirror://openoffice/developer/680_m${SNV}/OOo_1.9.${SNV}_LinuxIntel_install.tar.gz
-	linguas_af? ( ${LANGLOC}/openofficeorg-af-${LANGSUFFIX} )
-	linguas_bg? ( ${LANGLOC}/openofficeorg-bg-${LANGSUFFIX} )
-	linguas_cs? ( ${LANGLOC}/openofficeorg-cs-${LANGSUFFIX} )
-	linguas_cy? ( ${LANGLOC}/openofficeorg-cy-${LANGSUFFIX} )
-	linguas_da? ( ${LANGLOC}/openofficeorg-da-${LANGSUFFIX} )
-	linguas_de? ( ${LANGLOC}/openofficeorg-de-${LANGSUFFIX} )
-	linguas_en_GB? ( ${LANGLOC}/openofficeorg-en-GB-${LANGSUFFIX} )
-	linguas_es? ( http://oootranslation.services.openoffice.org/pub/OpenOffice.org/680m${SNV}/${LANGPACK}_es.sh )
-	linguas_et? ( ${LANGLOC}/openofficeorg-et-${LANGSUFFIX} )
-	linguas_fi? ( ${LANGLOC}/openofficeorg-fi-${LANGSUFFIX} )
-	linguas_fr? ( ${LANGLOC}/openofficeorg-fr-${LANGSUFFIX} )
-	linguas_hu? ( ${LANGLOC}/openofficeorg-hu-${LANGSUFFIX} )
-	linguas_it? ( http://oootranslation.services.openoffice.org/pub/OpenOffice.org/680m${SNV}/${LANGPACK}_it.sh )
-	linguas_ja? ( http://oootranslation.services.openoffice.org/pub/OpenOffice.org/680m${SNV}/${LANGPACK}_ja.sh )
-	linguas_km? ( ${LANGLOC}/openofficeorg-km-${LANGSUFFIX} )
-	linguas_ko? ( http://oootranslation.services.openoffice.org/pub/OpenOffice.org/680m${SNV}/${LANGPACK}_ko.sh )
-	linguas_nb? ( ${LANGLOC}/openofficeorg-nb-${LANGSUFFIX} )
-	linguas_nl? ( ${LANGLOC}/openofficeorg-nl-${LANGSUFFIX} )
-	linguas_nn? ( ${LANGLOC}/openofficeorg-nn-${LANGSUFFIX} )
-	linguas_ns? ( ${LANGLOC}/openofficeorg-ns-${LANGSUFFIX} )
-	linguas_pt_BR? ( http://oootranslation.services.openoffice.org/pub/OpenOffice.org/680m${SNV}/${LANGPACK}_pt-BR.sh )
-	linguas_sk? ( ${LANGLOC}/openofficeorg-sk-${LANGSUFFIX} )
-	linguas_sl? ( ${LANGLOC}/openofficeorg-sl-${LANGSUFFIX} )
-	linguas_sv? ( http://oootranslation.services.openoffice.org/pub/OpenOffice.org/680m${SNV}/${LANGPACK}_sv.sh )
-	linguas_tn? ( ${LANGLOC}/openofficeorg-tn-${LANGSUFFIX} )
-	linguas_xh? ( ${LANGLOC}/openofficeorg-xh-${LANGSUFFIX} )
-	linguas_zh_CN? ( http://oootranslation.services.openoffice.org/pub/OpenOffice.org/680m${SNV}/${LANGPACK}_zh-CN.sh )
-	linguas_zh_TW? ( http://oootranslation.services.openoffice.org/pub/OpenOffice.org/680m${SNV}/${LANGPACK}_zh-TW.sh )
-	linguas_zu? ( ${LANGLOC}/openofficeorg-zu-${LANGSUFFIX} )"
-
-HOMEPAGE="http://www.openoffice.org/"
-
-LICENSE="|| ( LGPL-2  SISSL-1.1 )"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-
-RDEPEND="!app-office/openoffice
-	virtual/x11
-	virtual/libc
-	>=dev-lang/perl-5.0
-	app-arch/zip
-	app-arch/unzip
-	java? ( >=virtual/jre-1.4.1 )
-	amd64? ( >=app-emulation/emul-linux-x86-xlibs-1.0 )
-	linguas_ja? ( >=media-fonts/kochi-substitute-20030809-r3 )
-	linguas_zh_CN? ( >=media-fonts/arphicfonts-0.1-r2 )
-	linguas_zh_TW? ( >=media-fonts/arphicfonts-0.1-r2 )"
-
-DEPEND="${RDEPEND}
-	sys-apps/findutils"
-
-PROVIDE="virtual/ooo"
-
-src_unpack() {
-	unpack OOo_1.9.${SNV}_LinuxIntel_install.tar.gz
-
-	for i in core01 core02 core03 core04 core05 core06 core07 core08 calc draw impress math writer graphicfilter pyuno spellcheck testtool xsltfilter; do
-		rpm_unpack ${S}/openofficeorg-${i}-1.9.${SNV}-1.i586.rpm
-	done
-
-	rpm_unpack ${S}/openofficeorg-freedesktop-menus-1.9.${SNV}-1.noarch.rpm
-	use kde && rpm_unpack ${S}/openofficeorg-suse-menus-1.9.${SNV}-1.noarch.rpm
-
-	use gnome && rpm_unpack ${S}/openofficeorg-gnome-integration-1.9.${SNV}-1.i586.rpm
-	use java && rpm_unpack ${S}/openofficeorg-javafilter-1.9.${SNV}-1.i586.rpm
-
-	strip-linguas en af bg cs cy da de en_GB es et fi fr hu it ja km ko nb nl nn ns pt_BR sk sl sv tn xh zh_CN zh_TW zu
-
-	export LINGUAS_OOO="${LINGUAS/en}"
-
-	for i in ${LINGUAS_OOO}; do
-		i="${i/_/-}"
-		if [ -e ${DISTDIR}/${LANGPACK}_${i}.sh ] ; then
-			tail -n +146 ${DISTDIR}/${LANGPACK}_${i}.sh > ${S}/${LANGPACK}_${i}.rpm || die
-			rpm_unpack ${S}/${LANGPACK}_${i}.rpm
-		else
-			rpm_unpack ${DISTDIR}/openofficeorg-${i}-${LANGSUFFIX}
-		fi
-done
-}
-
-src_install () {
-
-	einfo "Installing OpenOffice.org into build root..."
-	dodir ${INSTDIR}
-	dodir /usr/share/icons
-	dodir /usr/share/mime
-	mv ${WORKDIR}/opt/openoffice.org1.9.${SNV}/* ${D}${INSTDIR}
-	mv ${WORKDIR}/usr/share/icons/* ${D}/usr/share/icons
-	mv ${WORKDIR}/usr/share/mime/* ${D}/usr/share/mime
-
-	use kde && dodir /usr/share/mimelnk/application && mv ${WORKDIR}/opt/kde3/share/mimelnk/application/* ${D}/usr/share/mimelnk/application
-
-	#Menu entries
-	cd ${D}${INSTDIR}/share/xdg/
-
-	sed -i -e s/'Exec=openoffice.org-1.9-printeradmin'/'Exec=oopadmin'/g printeradmin.desktop
-
-	for desk in base calc draw impress math writer printeradmin; do
-		mv ${desk}.desktop openoffice.org-1.9-${desk}.desktop
-		domenu openoffice.org-1.9-${desk}.desktop
-	done
-
-	einfo "Removing build root from registry..."
-	# Install wrapper script
-	newbin ${FILESDIR}/1.9/ooffice-wrapper-1.9 openoffice.org-1.9
-
-	# Component symlinks
-	for app in calc draw impress math writer web padmin; do
-		dosym openoffice.org-1.9 /usr/bin/oo${app}
-	done
-
-	dosym openoffice.org-1.9 /usr/bin/openoffice.org-1.9-printeradmin
-}
-
-pkg_postinst() {
-
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-
-	einfo " To start OpenOffice.org, run:"
-	einfo
-	einfo "   $ openoffice.org-1.9"
-	einfo
-	einfo " Also, for individual components, you can use any of:"
-	einfo
-	einfo "   oocalc, oodraw, ooimpress, oomath, ooweb or oowriter"
-}
diff --git a/app-office/openoffice-bin/openoffice-bin-1.9.93.ebuild b/app-office/openoffice-bin/openoffice-bin-1.9.93.ebuild
index d3be81b70924..a7f86233f57a 100644
--- a/app-office/openoffice-bin/openoffice-bin-1.9.93.ebuild
+++ b/app-office/openoffice-bin/openoffice-bin-1.9.93.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-bin/openoffice-bin-1.9.93.ebuild,v 1.1 2005/04/15 20:41:37 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/openoffice-bin-1.9.93.ebuild,v 1.2 2005/04/20 07:31:49 suka Exp $
 
 inherit eutils fdo-mime rpm versionator
 
@@ -12,7 +12,8 @@ S="${WORKDIR}/RPMS"
 DESCRIPTION="OpenOffice productivity suite"
 
 SNV="$(get_version_component_range 3)"
-LANGPACK="http://oootranslation.services.openoffice.org/pub/OpenOffice.org/680m${SNV}/OOo_1.9.${SNV}_LinuxIntel_langpack"
+LANGPACK="OOo_1.9.${SNV}_LinuxIntel_langpack"
+LANGPACKPATH="http://oootranslation.services.openoffice.org/pub/OpenOffice.org/680m${SNV}/${LANGPACK}"
 LANGLOC="http://ftp.linux.cz/pub/localization/OpenOffice.org/devel/680/SRC680_m${SNV}/Build-1/OOo_SRC680_m${SNV}_native_LinuxIntel_langpacks_rpm"
 LANGSUFFIX="1.9.${SNV}-1.i586.rpm"
 
@@ -29,22 +30,22 @@ SRC_URI="mirror://openoffice/developer/680_m${SNV}/OOo_1.9.${SNV}_LinuxIntel_ins
 	linguas_fi? ( ${LANGLOC}/openofficeorg-fi-${LANGSUFFIX} )
 	linguas_fr? ( ${LANGLOC}/openofficeorg-fr-${LANGSUFFIX} )
 	linguas_hu? ( ${LANGLOC}/openofficeorg-hu-${LANGSUFFIX} )
-	linguas_it? ( ${LANGPACK}_it.sh )
-	linguas_ja? ( ${LANGPACK}_ja.sh )
+	linguas_it? ( ${LANGPACKPATH}_it.sh )
+	linguas_ja? ( ${LANGPACKPATH}_ja.sh )
 	linguas_km? ( ${LANGLOC}/openofficeorg-km-${LANGSUFFIX} )
-	linguas_ko? ( ${LANGPACK}_ko.sh )
+	linguas_ko? ( ${LANGPACKPATH}_ko.sh )
 	linguas_nb? ( ${LANGLOC}/openofficeorg-nb-${LANGSUFFIX} )
 	linguas_nl? ( ${LANGLOC}/openofficeorg-nl-${LANGSUFFIX} )
 	linguas_nn? ( ${LANGLOC}/openofficeorg-nn-${LANGSUFFIX} )
 	linguas_ns? ( ${LANGLOC}/openofficeorg-ns-${LANGSUFFIX} )
-	linguas_pt_BR? ( ${LANGPACK}_pt-BR.sh )
+	linguas_pt_BR? ( ${LANGPACKPATH}_pt-BR.sh )
 	linguas_sk? ( ${LANGLOC}/openofficeorg-sk-${LANGSUFFIX} )
 	linguas_sl? ( ${LANGLOC}/openofficeorg-sl-${LANGSUFFIX} )
-	linguas_sv? ( ${LANGPACK}_sv.sh )
+	linguas_sv? ( ${LANGPACKPATH}_sv.sh )
 	linguas_tn? ( ${LANGLOC}/openofficeorg-tn-${LANGSUFFIX} )
 	linguas_xh? ( ${LANGLOC}/openofficeorg-xh-${LANGSUFFIX} )
-	linguas_zh_CN? ( ${LANGPACK}_zh-CN.sh )
-	linguas_zh_TW? ( ${LANGPACK}_zh-TW.sh )
+	linguas_zh_CN? ( ${LANGPACKPATH}_zh-CN.sh )
+	linguas_zh_TW? ( ${LANGPACKPATH}_zh-TW.sh )
 	linguas_zu? ( ${LANGLOC}/openofficeorg-zu-${LANGSUFFIX} )"
 
 HOMEPAGE="http://www.openoffice.org/"