Several fixes to openoffice-voikko, thanks to Riku Hintukainen for patches.

svn path=/; revision=19

3 files changed, 18 insertions, 19 deletions

diff --git a/trunk/app-office/openoffice-voikko/ChangeLog b/trunk/app-office/openoffice-voikko/ChangeLog
index 323f9a3..824ee97 100644
--- a/trunk/app-office/openoffice-voikko/ChangeLog
+++ b/trunk/app-office/openoffice-voikko/ChangeLog
@@ -4,6 +4,11 @@
 
 *openoffice-voikko-2.0.1 (15 May 2007)
 
+  22 May 2007; Flammie Pirinen <flammie@gentoo.org>
+  openoffice-2.0.1.ebuild:
+  Updated plugin’s and package docs’ filenames, fixed unopkg path, thanks to
+  Riku Hintukainen for the patch. Fixed wrong LICENCE.
+
   15 May 2007; Flammie Pirinen <flammie@gentoo.org>
   +openoffice-voikko-1.2.ebuild, +openoffice-voikko-9999.ebuild,
   +openoffice-voikko-2.0.ebuild, +metadata.xml,
diff --git a/trunk/app-office/openoffice-voikko/Manifest b/trunk/app-office/openoffice-voikko/Manifest
index cc52896..0715704 100644
--- a/trunk/app-office/openoffice-voikko/Manifest
+++ b/trunk/app-office/openoffice-voikko/Manifest
@@ -9,10 +9,10 @@ EBUILD openoffice-voikko-1.2.ebuild 4504 RMD160 fd940e2b82c87702d1f7cb35481b4751
 MD5 5479675fde4bbb3280c5db24500b8a46 openoffice-voikko-1.2.ebuild 4504
 RMD160 fd940e2b82c87702d1f7cb35481b475157c8cc4b openoffice-voikko-1.2.ebuild 4504
 SHA256 07df462c7f07052788cb35a6d5b7c258b08af6325f5d510879ad2f438d775b2b openoffice-voikko-1.2.ebuild 4504
-EBUILD openoffice-voikko-2.0.1.ebuild 4325 RMD160 9b2d3a073390d7118f9ec2f7c0bebfbd08a16f9a SHA1 6b8abc8c5cf2c375d24cfcbeeafd3e255a0d50db SHA256 4dd8089a0a7826ae38939516aba694702c9feacc57416aa1213572b289618d39
-MD5 95d3db8f800288a57244beba2a205c58 openoffice-voikko-2.0.1.ebuild 4325
-RMD160 9b2d3a073390d7118f9ec2f7c0bebfbd08a16f9a openoffice-voikko-2.0.1.ebuild 4325
-SHA256 4dd8089a0a7826ae38939516aba694702c9feacc57416aa1213572b289618d39 openoffice-voikko-2.0.1.ebuild 4325
+EBUILD openoffice-voikko-2.0.1.ebuild 4097 RMD160 6269fd1b198fc5a90502853c53c3b7755ec85bed SHA1 c52a23f0e94ff75cc19ac40a192e50ddfbb2aa0e SHA256 2a7433195b44dc1d0cac129737b99a13be1a8e09defe5dc739449702ca82084a
+MD5 091efd52a5139b763edd562b20dec0e9 openoffice-voikko-2.0.1.ebuild 4097
+RMD160 6269fd1b198fc5a90502853c53c3b7755ec85bed openoffice-voikko-2.0.1.ebuild 4097
+SHA256 2a7433195b44dc1d0cac129737b99a13be1a8e09defe5dc739449702ca82084a openoffice-voikko-2.0.1.ebuild 4097
 EBUILD openoffice-voikko-2.0.ebuild 4325 RMD160 9b2d3a073390d7118f9ec2f7c0bebfbd08a16f9a SHA1 6b8abc8c5cf2c375d24cfcbeeafd3e255a0d50db SHA256 4dd8089a0a7826ae38939516aba694702c9feacc57416aa1213572b289618d39
 MD5 95d3db8f800288a57244beba2a205c58 openoffice-voikko-2.0.ebuild 4325
 RMD160 9b2d3a073390d7118f9ec2f7c0bebfbd08a16f9a openoffice-voikko-2.0.ebuild 4325
@@ -21,10 +21,10 @@ EBUILD openoffice-voikko-9999.ebuild 4666 RMD160 25615225c2bb4d24f596f3014d965fb
 MD5 b3e2f74dfb8a9fc595318754c54a5b8d openoffice-voikko-9999.ebuild 4666
 RMD160 25615225c2bb4d24f596f3014d965fb204b0a76f openoffice-voikko-9999.ebuild 4666
 SHA256 720fb105aeaf80289d58884854e7b91eb77592a81c8910d875a1dd092e501ab6 openoffice-voikko-9999.ebuild 4666
-MISC ChangeLog 387 RMD160 3dcfcd957d84b1ff2ecec1b8de29a874bc1030e5 SHA1 5ba0e2ff3dd6c4358b3aae755541ecc6d3826ae9 SHA256 e413adecff7c9b9fda6d7f0a7b4fcb9c9ae544a07cc9a30cdba5c7679b3b6e01
-MD5 169c7a41050f1a8eda18d4fff82294c6 ChangeLog 387
-RMD160 3dcfcd957d84b1ff2ecec1b8de29a874bc1030e5 ChangeLog 387
-SHA256 e413adecff7c9b9fda6d7f0a7b4fcb9c9ae544a07cc9a30cdba5c7679b3b6e01 ChangeLog 387
+MISC ChangeLog 603 RMD160 cf3279d8c1d575c5d8cc0125ff06f316a20d9d45 SHA1 0be4e04f233eb9bd1c5e3634eaed2986c56d722b SHA256 07329742310fc71555d5936ff750b2a4498cf7d7bb07000fc4c42b63693bf67e
+MD5 94fbbea697614a3f97a520adc58c8d01 ChangeLog 603
+RMD160 cf3279d8c1d575c5d8cc0125ff06f316a20d9d45 ChangeLog 603
+SHA256 07329742310fc71555d5936ff750b2a4498cf7d7bb07000fc4c42b63693bf67e ChangeLog 603
 MISC metadata.xml 552 RMD160 a39aa046181a48e77ca9ae1f914a74d2bec768c9 SHA1 d5d46e1c182a3c731901e1e5a8601033e88d4429 SHA256 ab2a0ccd8470c822a5814172c1ce08c3e02fede695f1afe37a0f38c2f9981c0f
 MD5 33bf7682ef9f1953d1446fe391eb0cb7 metadata.xml 552
 RMD160 a39aa046181a48e77ca9ae1f914a74d2bec768c9 metadata.xml 552
diff --git a/trunk/app-office/openoffice-voikko/openoffice-voikko-2.0.1.ebuild b/trunk/app-office/openoffice-voikko/openoffice-voikko-2.0.1.ebuild
index e7ebaa8..78c21b7 100644
--- a/trunk/app-office/openoffice-voikko/openoffice-voikko-2.0.1.ebuild
+++ b/trunk/app-office/openoffice-voikko/openoffice-voikko-2.0.1.ebuild
@@ -10,7 +10,7 @@ MY_PN="${PN/office-voikko/office.org-voikko}"
 DESCRIPTION="Voikko—Free Finnish spell checking and hyphenation for OpenOffice"
 HOMEPAGE="http://voikko.sf.net/"
 SRC_URI="mirror://sourceforge/voikko/${MY_P}.tar.gz"
-LICENSE="LGPL-2"
+LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86"
 
@@ -46,7 +46,7 @@ pkg_setup() {
 	if [[ ! -x "${ROOT}/usr/$(get_libdir)/openoffice/program/unopkg"  ]] ; then
 		die "Couldn’t find unopkg binary"
 	else
-		export UNOPKG="${ROOT}/$(get_libdir)/openoffice/program/unopkg"
+		export UNOPKG="${ROOT}/usr/$(get_libdir)/openoffice/program/unopkg"
 	fi
 
 	# Open Office must be installed with SDK
@@ -66,12 +66,10 @@ src_compile() {
 }
 
 src_install() {
-	dodoc impl/doc/Linux_*/ASENNUS.txt
-	insinto /usr/lib/openoffice/share/
-	newins linux-installer ${PN}-installer
+	dodoc README ChangeLog
 	dodir /usr/lib/${P}
 	insinto /usr/lib/${P}
-	doins build/${MY_PN}-Linux*-${PV}.uno.pkg
+	doins build/voikko.oxt
 }
 
 # FIXME: installation of an unopkg is troublesome, move to src_install when
@@ -85,11 +83,7 @@ pkg_postinst() {
 	tar jxf "${FILESDIR}/ooo-2.0-home.tar.bz2"
 
 	# select component
-	if use amd64; then
-		COMPONENT="${ROOT}/usr/lib/${P}/${MY_PN}-Linux_x86_64-${PV}.uno.pkg"
-	else
-		COMPONENT="${ROOT}/usr/lib/${P}/${MY_PN}-Linux_x86-${PV}.uno.pkg"
-	fi
+	COMPONENT="${ROOT}/usr/lib/${P}/voikko.oxt"
 	PKG=$(basename "${COMPONENT}")
 
 	# Global scope in install-oo2-voikko