Version bump.

Long standing gentoo bug #151798 resolution solves problems with external
SDK requirements.

svn path=/; revision=61

8 files changed, 110 insertions, 707 deletions

diff --git a/trunk/app-office/openoffice-voikko/ChangeLog b/trunk/app-office/openoffice-voikko/ChangeLog
index cfa3fec..e6b1513 100644
--- a/trunk/app-office/openoffice-voikko/ChangeLog
+++ b/trunk/app-office/openoffice-voikko/ChangeLog
@@ -1,7 +1,17 @@
 # ChangeLog for app-office/openoffice-voikko
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*openoffice-voikko-3.1 (15 Dec 2009)
+
+  15 Dec 2009; <flammie@gentoo.org> -openoffice-voikko-1.2.ebuild,
+  -openoffice-voikko-2.0.ebuild, -openoffice-voikko-2.0.1.ebuild,
+  -openoffice-voikko-2.1.ebuild, -openoffice-voikko-2.2.ebuild,
+  +openoffice-voikko-3.1.ebuild:
+  Version bump. 
+  Resolution of gentoo bug #157198 solves long standing requirement for
+  external SDK.
+
 *openoffice-voikko-2.2 (28 Mar 2008)
 
   28 Mar 2008; Flammie Pirinen <flammie@gentoo.org>
diff --git a/trunk/app-office/openoffice-voikko/Manifest b/trunk/app-office/openoffice-voikko/Manifest
index 3f314f9..c6e642c 100644
--- a/trunk/app-office/openoffice-voikko/Manifest
+++ b/trunk/app-office/openoffice-voikko/Manifest
@@ -1,14 +1,6 @@
 AUX ooo-2.0-home.tar.bz2 9966 RMD160 75e687e207d60291d32f6accaa526c74984b073c SHA1 d1495be0eaa1ce1394417d21f3b9db526d17b89e SHA256 f5c716bf2bd2b31be84dcdcd2f7d05ca4df560dbbe7f1a4f1ceab645d69600a7
-DIST openoffice.org-voikko-1.2.tar.gz 53091 RMD160 8b6043d1ef65a20da6a83afc107f42b805ebfeb5 SHA1 19c487031be89a702d9f6d47ca57ff3609defc2a SHA256 0b6d97e4ad3da2bd5c7388231365dbc71e9c6a8a8c71904ccde447de0aae07c1
-DIST openoffice.org-voikko-2.0.1.tar.gz 17255 RMD160 d5f8220e57078042dede0df5b3452a0ea8f6a1b9 SHA1 82cb165317fefcf15c4c8f1feac8f25924669efb SHA256 f7d5789aaa79c67a14060c28b663bfe004128c3b470fd9f7eb8d284c54f841b4
-DIST openoffice.org-voikko-2.0.tar.gz 17181 RMD160 25bc54b95caf8fbb8c087027d5a498331f451023 SHA1 462ce7159eaec33b48899df961e3988b1370db52 SHA256 f2cfc72bad3de02e1c7df0542cf7cfb139a75dd95c929e4ac0f5a69bea125951
-DIST openoffice.org-voikko-2.1.tar.gz 26459 RMD160 fe44ea41408e5270447fe5f8774c2dfc06b92765 SHA1 6ca5610ee9f268e93fd890c55c3e696deea04c51 SHA256 9d02639cc8f17626d7f7f4fd7d2d3bf95ec1d9919ab26fa5077428a0829b6352
-DIST openoffice.org-voikko-2.2.tar.gz 27877 RMD160 616ececb8a49504babde909fdc9df0f09a49ab41 SHA1 1ce3ca1b062e3444b814fc38d96bf80d99e46173 SHA256 13c1ae78acc9a080a4afd93cfbd5d8d75be48bfcb71df4517862df7899fb0d8f
-EBUILD openoffice-voikko-1.2.ebuild 4504 RMD160 fd940e2b82c87702d1f7cb35481b475157c8cc4b SHA1 5178c5c06d6614c3483b4bb6ef70a1e724965cd0 SHA256 07df462c7f07052788cb35a6d5b7c258b08af6325f5d510879ad2f438d775b2b
-EBUILD openoffice-voikko-2.0.1.ebuild 4097 RMD160 6269fd1b198fc5a90502853c53c3b7755ec85bed SHA1 c52a23f0e94ff75cc19ac40a192e50ddfbb2aa0e SHA256 2a7433195b44dc1d0cac129737b99a13be1a8e09defe5dc739449702ca82084a
-EBUILD openoffice-voikko-2.0.ebuild 4325 RMD160 9b2d3a073390d7118f9ec2f7c0bebfbd08a16f9a SHA1 6b8abc8c5cf2c375d24cfcbeeafd3e255a0d50db SHA256 4dd8089a0a7826ae38939516aba694702c9feacc57416aa1213572b289618d39
-EBUILD openoffice-voikko-2.1.ebuild 4252 RMD160 f2408cacf43048c4c7e5ac1cd690c819d9c028c7 SHA1 cc3e795762972d5b1d43041fb917b060ea408c8a SHA256 4cb9fec1b4a7ad2a03485b25ee3d2b5eef314f7a5073f903947ebdbf7419b6e6
-EBUILD openoffice-voikko-2.2.ebuild 4550 RMD160 7a79ae4a339d69f67b423be6c6f9ac03a5298c14 SHA1 5e1c45342af469107bd863567a99adeca277f54e SHA256 e721899ead21c8f66c5ff4d0475480bc3d59a64070fd1da588768995a7448305
+DIST openoffice.org-voikko-3.1.tar.gz 36406 RMD160 68f6b525dc5050147837ba35ffe35d7690c05739 SHA1 461119169e20fba8fc02ea60e1b459e116ac63b9 SHA256 526386e2295da5a269caad991cb5012475a4bb0e344760c0017919e1f53c0b25
+EBUILD openoffice-voikko-3.1.ebuild 2783 RMD160 b23af189cf6ce457b1055be557686d221ef93cd9 SHA1 fb13f54aa4cf054c41afd7382a49e5b07ba0434f SHA256 299e8ef784aa831a9548a33cc34fae310a4379aa1ff298b5e2333cb9a69d717e
 EBUILD openoffice-voikko-9999.ebuild 4666 RMD160 25615225c2bb4d24f596f3014d965fb204b0a76f SHA1 0faec1eef70651d28ad7c6ef57d7100ea7b5f216 SHA256 720fb105aeaf80289d58884854e7b91eb77592a81c8910d875a1dd092e501ab6
-MISC ChangeLog 1146 RMD160 e77ef336cf0d2619e25232816f9483bc6de0bdbd SHA1 521883727184bdd64924bcd4fdb7264ff76d2e30 SHA256 80a6bc509feec68bb88b6a12b31c87176b5fa71d3c59d6412bfa39898fd06f14
+MISC ChangeLog 1520 RMD160 9a2c47a9482cc8fe18e312aeb8b0a59744ff6cbd SHA1 96d52bdd5476c733457f5184989547eda246adac SHA256 add269f809e1d2fb26a49d9b92d26a8387c69ec790257f46d76d7ffb360d7f6e
 MISC metadata.xml 552 RMD160 a39aa046181a48e77ca9ae1f914a74d2bec768c9 SHA1 d5d46e1c182a3c731901e1e5a8601033e88d4429 SHA256 ab2a0ccd8470c822a5814172c1ce08c3e02fede695f1afe37a0f38c2f9981c0f
diff --git a/trunk/app-office/openoffice-voikko/openoffice-voikko-1.2.ebuild b/trunk/app-office/openoffice-voikko/openoffice-voikko-1.2.ebuild
deleted file mode 100644
index e635748..0000000
--- a/trunk/app-office/openoffice-voikko/openoffice-voikko-1.2.ebuild
+++ /dev/null
@@ -1,149 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit eutils versionator multilib
-
-MY_P="${P/office-voikko/office.org-voikko}"
-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.1"
-SLOT="0"
-KEYWORDS="~x86"
-
-#DEPEND="|| ( >=app-office/openoffice-2 >=app-office/openoffice-bin-2 )
-DEPEND=">=app-office/openoffice-2
-	app-text/voikko
-	sys-apps/grep
-	sys-apps/sed
-	app-office/openoffice-sdk
-	!app-office/oo2-voikko"
-#  ! app-office/oo2-soikko"
-#RDEPEND="|| ( >=app-office/openoffice-2 >=app-office/openoffice-bin-2 )
-RDEPEND=">=app-office/openoffice-2
-	app-text/voikko"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	# This check originates from soikko times I think...
-	# Also, pidof belongs to sysvinit, dep?
-	if pidof soffice.bin >/dev/null; then
-		die "${PN} can’t be installed while OpenOffice.org is running."
-		# Or use the force
-		#killall soffice.bin || killall -9 soffice.bin
-	fi
-	# We need OpenOffice SDK initialisation sh script executable
-	if [[ ! -x "${ROOT}/usr/lib/openoffice/program/setsdkenv_unix.sh" ]] ; then
-		die "Couldn’t find open office SDK settings from \
-			${ROOT}/usr/lib/openoffice/program/setsdkenv_unix.sh"
-	fi
-
-	# Open Office must be installed with SDK
-	if has_version app-office/openoffice ; then
-		if ! built_with_use app-office/openoffice odk ; then
-			ewarn "OpenOffice should be built with USE flag “odk”"
-			ewarn "for building uno package from source to work"
-		fi
-	fi
-}
-
-src_compile() {
-	einfo "Searching OpenOffice.org SDK environment..."
-	source ${ROOT}/usr/lib/openoffice/program/setsdkenv_unix.sh
-	einfo "SDK set to: OO_SDK_HOME=${OO_SDK_HOME}"
-	emake || die "make uno package failed"
-}
-
-src_install() {
-	dodoc impl/doc/Linux_*/ASENNUS.txt
-	insinto /usr/lib/openoffice/share/
-	newins linux-installer ${PN}-installer
-	dodir /usr/lib/${P}
-	insinto /usr/lib/${P}
-	doins build/${MY_PN}-Linux*-${PV}.uno.pkg
-}
-
-find_unopkg() {
-	UNOPKG="${ROOT}/usr/$(get_libdir)/openoffice/program/unopkg"
-#	if has_version '>=app-office/openoffice-bin'; then
-#		if use amd64 ; then
-#			UNOPKG="/usr/lib32/openoffice/program/unopkg"
-#		else
-#			UNOPKG="/usr/lib/openoffice/program/unopkg"
-#		fi
-#	else
-#		UNOPKG="/usr/lib/openoffice/program/unopkg" #verify!
-#	fi
-}
-
-# FIXME: installation of an unopkg is troublesome, move to src_install when
-# OO.o supports it somehow sanely
-pkg_postinst() {
-	# N.B.: uno packages meddle with $HOME, let's fool it
-	HOME="${S}"
-	cd "${S}"
-	# Yay, OO.o package installation requires .ooo-2.0 directory from once
-	# started instance of the program. How fun!
-	tar jxf "${FILESDIR}/ooo-2.0-home.tar.bz2"
-
-	find_unopkg
-
-	# 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
-	PKG=$(basename "${COMPONENT}")
-
-	# Global scope in install-oo2-voikko
-	if [[ -e "${HOME}/.openoffice.org2/.lock" ]] ;
-	then
-		die "lockfile from previous failed installation attempt found in \
-			${HOME}/.openoffice.org2/.lock, please clean and retry"
-	fi
-	# register()
-	if [[ "${COMPONENT}" == "" ]] ;
-	then
-		die "UNO component not found"
-	fi
-	einfo "Trying to register uno package ${COMPONENT}..."
-	HOME=${HOME} "${UNOPKG}" add --shared "${COMPONENT}"
-	if [[ $? == 0 ]] ;
-	then
-		einfo "Voikko package (${PKG}) registered succesfully"
-	else
-		die "Couldn’t register ${PN} package (${PKG})"
-	fi
-	elog "Please note that ${PN} is very dependent on ABI compatible "
-	elog "version of OpenOffice.org to exist on system when removing voikko!"
-	elog "Before incompatible update or removal of OpenOffice you must"
-	elog "unmerge ${PN}!"
-}
-
-pkg_prerm() {
-	find_unopkg
-	#unregister()
-	UNOPKG_LIST="$(${UNOPKG} list --shared 2> /dev/null)"
-	if [[ $? != 0 ]] ; then
-		ewarn "Couldn’t list existing packages..."
-	fi
-	PKG=$(echo "${UNOPKG_LIST}" | egrep -m1 "^Name: ${UNONAME}-Linux_x86(_64)?-${PV}" | sed -e "s/Name: //")
-	if [ "${PKG}" != "" ]; then
-		einfo "Removing uno package ${PKG}..."
-		if "${UNOPKG}" remove --shared ${PKG} &>/dev/null
-		then
-			einfo "${PN} package (${PKG}) unregistered succesfully"
-		else
-			die "Couldn’t uninstall existing ${PN} packages"
-		fi
-	else
-		ewarn "Couldn’t find existing ${PN} packages."
-		ewarn "You may need to \`unopkg remove\` them manually."
-	fi
-}
-
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
deleted file mode 100644
index 78c21b7..0000000
--- a/trunk/app-office/openoffice-voikko/openoffice-voikko-2.0.1.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit eutils versionator multilib
-
-MY_P="${P/office-voikko/office.org-voikko}"
-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="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-
-#DEPEND="|| ( >=app-office/openoffice-2 (
-#		>=app-office/openoffice-bin-2 app-office/openoffice-sdk
-#		)
-#	)
-DEPEND="|| ( >=app-office/openoffice-2 >=app-office/openoffice-bin-2 )
-	app-office/openoffice-sdk
-	app-text/voikko
-	sys-apps/grep
-	sys-apps/sed
-	sys-apps/sysvinit
-	!app-office/oo2-voikko"
-RDEPEND="|| ( >=app-office/openoffice-2 >=app-office/openoffice-bin-2 )
-	app-text/voikko"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	# This check originates from soikko times I think...
-	# Also, pidof belongs to sysvinit, dep?
-	if pidof soffice.bin >/dev/null; then
-		die "${PN} can’t be installed while OpenOffice.org is running."
-	fi
-	# We need OpenOffice SDK initialisation sh script executable
-	if [[ ! -x "${ROOT}/usr/lib/openoffice/program/setsdkenv_unix.sh" ]] ; then
-		die "Couldn’t find open office SDK settings from \
-			${ROOT}/usr/lib/openoffice/program/setsdkenv_unix.sh"
-	else
-		export SDKENV="${ROOT}/usr/lib/openoffice/program/setsdkenv_unix.sh"
-	fi
-	if [[ ! -x "${ROOT}/usr/$(get_libdir)/openoffice/program/unopkg"  ]] ; then
-		die "Couldn’t find unopkg binary"
-	else
-		export UNOPKG="${ROOT}/usr/$(get_libdir)/openoffice/program/unopkg"
-	fi
-
-	# Open Office must be installed with SDK
-	if has_version app-office/openoffice ; then
-		if ! built_with_use app-office/openoffice odk ; then
-			ewarn "OpenOffice should be built with USE flag “odk”"
-			ewarn "for building uno package from source to work"
-		fi
-	fi
-}
-
-src_compile() {
-	einfo "Searching OpenOffice.org SDK environment..."
-	source "${SDKENV}"
-	einfo "SDK set to: OO_SDK_HOME=${OO_SDK_HOME}"
-	emake || die "make uno package failed"
-}
-
-src_install() {
-	dodoc README ChangeLog
-	dodir /usr/lib/${P}
-	insinto /usr/lib/${P}
-	doins build/voikko.oxt
-}
-
-# FIXME: installation of an unopkg is troublesome, move to src_install when
-# OO.o supports it somehow sanely
-pkg_postinst() {
-	# N.B.: uno packages meddle with $HOME, let's fool it
-	HOME="${S}"
-	cd "${S}"
-	# Yay, OO.o package installation requires .ooo-2.0 directory from once
-	# started instance of the program. How fun!
-	tar jxf "${FILESDIR}/ooo-2.0-home.tar.bz2"
-
-	# select component
-	COMPONENT="${ROOT}/usr/lib/${P}/voikko.oxt"
-	PKG=$(basename "${COMPONENT}")
-
-	# Global scope in install-oo2-voikko
-	if [[ -e "${HOME}/.openoffice.org2/.lock" ]] ;
-	then
-		die "lockfile from previous failed installation attempt found in \
-			${HOME}/.openoffice.org2/.lock, please clean and retry"
-	fi
-	# register()
-	if [[ "${COMPONENT}" == "" ]] ;
-	then
-		die "UNO component not found"
-	fi
-	einfo "Trying to register uno package ${COMPONENT}..."
-	HOME=${HOME} "${UNOPKG}" add --shared "${COMPONENT}"
-	if [[ $? == 0 ]] ;
-	then
-		einfo "Voikko package (${PKG}) registered succesfully"
-	else
-		die "Couldn’t register ${PN} package (${PKG})"
-	fi
-	elog "Please note that ${PN} is very dependent on ABI compatible "
-	elog "version of OpenOffice.org to exist on system when removing voikko!"
-	elog "Before incompatible update or removal of OpenOffice you must"
-	elog "unmerge ${PN}!"
-}
-
-pkg_prerm() {
-	#unregister()
-	UNOPKG_LIST="$(${UNOPKG} list --shared 2> /dev/null)"
-	if [[ $? != 0 ]] ; then
-		ewarn "Couldn’t list existing packages..."
-	fi
-	PKG=$(echo "${UNOPKG_LIST}" | egrep -m1 "^Name: ${UNONAME}-Linux_x86(_64)?-${PV}" | sed -e "s/Name: //")
-	if [ "${PKG}" != "" ]; then
-		einfo "Removing uno package ${PKG}..."
-		if "${UNOPKG}" remove --shared ${PKG} &>/dev/null
-		then
-			einfo "${PN} package (${PKG}) unregistered succesfully"
-		else
-			die "Couldn’t uninstall existing ${PN} packages"
-		fi
-	else
-		ewarn "Couldn’t find existing ${PN} packages."
-		ewarn "You may need to \`unopkg remove\` them manually."
-	fi
-}
-
diff --git a/trunk/app-office/openoffice-voikko/openoffice-voikko-2.0.ebuild b/trunk/app-office/openoffice-voikko/openoffice-voikko-2.0.ebuild
deleted file mode 100644
index e7ebaa8..0000000
--- a/trunk/app-office/openoffice-voikko/openoffice-voikko-2.0.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit eutils versionator multilib
-
-MY_P="${P/office-voikko/office.org-voikko}"
-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"
-SLOT="0"
-KEYWORDS="~x86"
-
-#DEPEND="|| ( >=app-office/openoffice-2 (
-#		>=app-office/openoffice-bin-2 app-office/openoffice-sdk
-#		)
-#	)
-DEPEND="|| ( >=app-office/openoffice-2 >=app-office/openoffice-bin-2 )
-	app-office/openoffice-sdk
-	app-text/voikko
-	sys-apps/grep
-	sys-apps/sed
-	sys-apps/sysvinit
-	!app-office/oo2-voikko"
-RDEPEND="|| ( >=app-office/openoffice-2 >=app-office/openoffice-bin-2 )
-	app-text/voikko"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	# This check originates from soikko times I think...
-	# Also, pidof belongs to sysvinit, dep?
-	if pidof soffice.bin >/dev/null; then
-		die "${PN} can’t be installed while OpenOffice.org is running."
-	fi
-	# We need OpenOffice SDK initialisation sh script executable
-	if [[ ! -x "${ROOT}/usr/lib/openoffice/program/setsdkenv_unix.sh" ]] ; then
-		die "Couldn’t find open office SDK settings from \
-			${ROOT}/usr/lib/openoffice/program/setsdkenv_unix.sh"
-	else
-		export SDKENV="${ROOT}/usr/lib/openoffice/program/setsdkenv_unix.sh"
-	fi
-	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"
-	fi
-
-	# Open Office must be installed with SDK
-	if has_version app-office/openoffice ; then
-		if ! built_with_use app-office/openoffice odk ; then
-			ewarn "OpenOffice should be built with USE flag “odk”"
-			ewarn "for building uno package from source to work"
-		fi
-	fi
-}
-
-src_compile() {
-	einfo "Searching OpenOffice.org SDK environment..."
-	source "${SDKENV}"
-	einfo "SDK set to: OO_SDK_HOME=${OO_SDK_HOME}"
-	emake || die "make uno package failed"
-}
-
-src_install() {
-	dodoc impl/doc/Linux_*/ASENNUS.txt
-	insinto /usr/lib/openoffice/share/
-	newins linux-installer ${PN}-installer
-	dodir /usr/lib/${P}
-	insinto /usr/lib/${P}
-	doins build/${MY_PN}-Linux*-${PV}.uno.pkg
-}
-
-# FIXME: installation of an unopkg is troublesome, move to src_install when
-# OO.o supports it somehow sanely
-pkg_postinst() {
-	# N.B.: uno packages meddle with $HOME, let's fool it
-	HOME="${S}"
-	cd "${S}"
-	# Yay, OO.o package installation requires .ooo-2.0 directory from once
-	# started instance of the program. How fun!
-	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
-	PKG=$(basename "${COMPONENT}")
-
-	# Global scope in install-oo2-voikko
-	if [[ -e "${HOME}/.openoffice.org2/.lock" ]] ;
-	then
-		die "lockfile from previous failed installation attempt found in \
-			${HOME}/.openoffice.org2/.lock, please clean and retry"
-	fi
-	# register()
-	if [[ "${COMPONENT}" == "" ]] ;
-	then
-		die "UNO component not found"
-	fi
-	einfo "Trying to register uno package ${COMPONENT}..."
-	HOME=${HOME} "${UNOPKG}" add --shared "${COMPONENT}"
-	if [[ $? == 0 ]] ;
-	then
-		einfo "Voikko package (${PKG}) registered succesfully"
-	else
-		die "Couldn’t register ${PN} package (${PKG})"
-	fi
-	elog "Please note that ${PN} is very dependent on ABI compatible "
-	elog "version of OpenOffice.org to exist on system when removing voikko!"
-	elog "Before incompatible update or removal of OpenOffice you must"
-	elog "unmerge ${PN}!"
-}
-
-pkg_prerm() {
-	#unregister()
-	UNOPKG_LIST="$(${UNOPKG} list --shared 2> /dev/null)"
-	if [[ $? != 0 ]] ; then
-		ewarn "Couldn’t list existing packages..."
-	fi
-	PKG=$(echo "${UNOPKG_LIST}" | egrep -m1 "^Name: ${UNONAME}-Linux_x86(_64)?-${PV}" | sed -e "s/Name: //")
-	if [ "${PKG}" != "" ]; then
-		einfo "Removing uno package ${PKG}..."
-		if "${UNOPKG}" remove --shared ${PKG} &>/dev/null
-		then
-			einfo "${PN} package (${PKG}) unregistered succesfully"
-		else
-			die "Couldn’t uninstall existing ${PN} packages"
-		fi
-	else
-		ewarn "Couldn’t find existing ${PN} packages."
-		ewarn "You may need to \`unopkg remove\` them manually."
-	fi
-}
-
diff --git a/trunk/app-office/openoffice-voikko/openoffice-voikko-2.1.ebuild b/trunk/app-office/openoffice-voikko/openoffice-voikko-2.1.ebuild
deleted file mode 100644
index aa6dbec..0000000
--- a/trunk/app-office/openoffice-voikko/openoffice-voikko-2.1.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit eutils versionator multilib
-
-MY_P="${P/office-voikko/office.org-voikko}"
-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="GPL-2"
-SLOT="0"
-KEYWORDS="-x86" # This’s broken till SDK is fixed and whatnot
-
-#DEPEND="|| ( >=app-office/openoffice-2 (
-#		>=app-office/openoffice-bin-2 app-office/openoffice-sdk
-#		)
-#	)
-DEPEND="|| ( >=app-office/openoffice-2 >=app-office/openoffice-bin-2 )
-	app-office/openoffice-sdk
-	app-text/voikko
-	sys-apps/grep
-	sys-apps/sed
-	sys-apps/sysvinit
-	!app-office/oo2-voikko"
-RDEPEND="|| ( >=app-office/openoffice-2 >=app-office/openoffice-bin-2 )
-	app-text/voikko"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	# This check originates from soikko times I think...
-	# Also, pidof belongs to sysvinit, dep?
-	if pidof soffice.bin >/dev/null; then
-		die "${PN} can’t be installed while OpenOffice.org is running."
-	fi
-	# We need OpenOffice SDK initialisation sh script executable
-	# If we could trust openoffice use +odk work, this was unnecessary:
-	if [[ ! -x "${ROOT}/usr/lib/openoffice/program/setsdkenv_unix.sh" ]] ; then
-		die "Couldn’t find open office SDK settings from \
-			${ROOT}/usr/lib/openoffice/program/setsdkenv_unix.sh"
-	else
-		export SDKENV="${ROOT}/usr/lib/openoffice/program/setsdkenv_unix.sh"
-	fi
-	if [[ ! -x "${ROOT}/usr/$(get_libdir)/openoffice/program/unopkg"  ]] ; then
-		die "Couldn’t find unopkg binary"
-	else
-		export UNOPKG="${ROOT}/usr/$(get_libdir)/openoffice/program/unopkg"
-	fi
-
-	# Open Office must be installed with SDK
-	if has_version app-office/openoffice ; then
-		if ! built_with_use app-office/openoffice odk ; then
-			ewarn "OpenOffice should be built with USE flag “odk”"
-			ewarn "for building uno package from source to work"
-		fi
-	fi
-	einfo "Searching OpenOffice.org SDK environment..."
-	source "${SDKENV}"
-	einfo "SDK set to: OO_SDK_HOME=${OO_SDK_HOME}"
-}
-
-src_install() {
-	dodoc README ChangeLog || die "docs missing"
-	dodir /usr/lib/${P}
-	insinto /usr/lib/${P}
-	doins build/voikko.oxt
-}
-
-# FIXME: installation of an unopkg is troublesome, move to src_install when
-# OO.o supports it somehow sanely
-pkg_postinst() {
-	
-	# N.B.: uno packages meddle with $HOME, let’s fool it
-	HOME="${S}"
-	cd "${S}"
-	# Yay, OO.o package installation requires .ooo-2.0 directory from once
-	# started instance of the program. How fun!
-	tar jxf "${FILESDIR}/ooo-2.0-home.tar.bz2"
-
-	# select component
-	COMPONENT="${ROOT}/usr/lib/${P}/voikko.oxt"
-	PKG=$(basename "${COMPONENT}")
-
-	# Global scope in install-oo2-voikko
-	if [[ -e "${HOME}/.openoffice.org2/.lock" ]] ;
-	then
-		die "lockfile from previous failed installation attempt found in \
-			${HOME}/.openoffice.org2/.lock, please clean and retry"
-	fi
-	# register()
-	if [[ "${COMPONENT}" == "" ]] ;
-	then
-		die "UNO component not found"
-	fi
-	einfo "Trying to register uno package ${COMPONENT}..."
-	HOME=${HOME} "${UNOPKG}" add --shared "${COMPONENT}"
-	if [[ $? == 0 ]] ;
-	then
-		einfo "Voikko package (${PKG}) registered succesfully"
-	else
-		die "Couldn’t register ${PN} package (${PKG})"
-	fi
-	elog "Please note that ${PN} is very dependent on ABI compatible "
-	elog "version of OpenOffice.org to exist on system when removing voikko!"
-	elog "Before incompatible update or removal of OpenOffice you must"
-	elog "unmerge ${PN}!"
-	
-}
-
-pkg_prerm() {
-	#unregister()
-	UNOPKG_LIST="$(${UNOPKG} list --shared 2> /dev/null)"
-	if [[ $? != 0 ]] ; then
-		ewarn "Couldn’t list existing packages..."
-	fi
-	PKG=$(echo ${UNOPKG_LIST} | egrep -m1 "^Identifier: (org.puimula.ooovoikko|org.openoffice.legacy.openoffice.org-voikko.*.uno.pkg)" | sed -ne "s/^Identifier: \\(.*\\)/\\1/p")
-	if [ "${PKG}" != "" ]; then
-		einfo "Removing uno package ${PKG}..."
-		if "${UNOPKG}" remove --shared ${PKG} &>/dev/null
-		then
-			einfo "${PN} package (${PKG}) unregistered succesfully"
-		else
-			die "Couldn’t uninstall existing ${PN} packages"
-		fi
-	else
-		ewarn "Couldn’t find existing ${PN} packages."
-		ewarn "You may need to \`unopkg remove\` them manually."
-	fi
-}
-
diff --git a/trunk/app-office/openoffice-voikko/openoffice-voikko-2.2.ebuild b/trunk/app-office/openoffice-voikko/openoffice-voikko-2.2.ebuild
deleted file mode 100644
index 8c1de45..0000000
--- a/trunk/app-office/openoffice-voikko/openoffice-voikko-2.2.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit eutils versionator multilib
-
-MY_P="${P/office-voikko/office.org-voikko}"
-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="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64" # This’s broken till SDK is fixed and whatnot
-
-#DEPEND="|| ( >=app-office/openoffice-2 (
-#		>=app-office/openoffice-bin-2 app-office/openoffice-sdk
-#		)
-#	)
-DEPEND="|| ( >=app-office/openoffice-2 >=app-office/openoffice-bin-2 )
-	app-text/voikko
-	sys-apps/grep
-	sys-apps/sed
-	sys-apps/sysvinit
-	!app-office/oo2-voikko"
-RDEPEND="|| ( >=app-office/openoffice-2 >=app-office/openoffice-bin-2 )
-	app-text/voikko"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	# Also, pidof belongs to sysvinit, dep?
-	if pidof soffice.bin >/dev/null; then
-		die "${PN} can’t be installed while OpenOffice.org is running."
-	fi
-	# We need OpenOffice SDK initialisation sh script executable
-	# If we could trust openoffice use +odk work, this was unnecessary:
-	
-	if [[ -f "${ROOT}/usr/lib/openoffice/program/setsdkenv_unix.sh" ]] ; then
-		export SDKENV="${ROOT}/usr/lib/openoffice/program/setsdkenv_unix.sh"
-	elif [[ -x "${ROOT}/usr/lib/openoffice/program/setsdkenv_unix" ]] ; then
-		eerror "setsdkenv_unix found without non-interactive .sh, running..."
-		export SDKENV="${ROOT}/usr/lib/openoffice/program/setsdkenv_unix"
-	else
-		die "Couldn’t find open office SDK settings from \
-			${ROOT}/usr/lib/openoffice/program/setsdkenv_unix.sh \
-			see bug #194053 and forums for further info"
-	fi
-	if [[ ! -x "${ROOT}/usr/$(get_libdir)/openoffice/program/unopkg"  ]] ; then
-		die "Couldn’t find unopkg binary"
-	else
-		export UNOPKG="${ROOT}/usr/$(get_libdir)/openoffice/program/unopkg"
-	fi
-
-	# Open Office must be installed with SDK
-	if has_version app-office/openoffice ; then
-		if ! built_with_use app-office/openoffice odk ; then
-			ewarn "OpenOffice should be built with USE flag “odk”"
-			ewarn "for building uno package from source to work"
-		fi
-	fi
-	einfo "Searching OpenOffice.org SDK environment..."
-	source "${SDKENV}"
-	einfo "SDK set to: OO_SDK_HOME=${OO_SDK_HOME}"
-}
-
-src_compile() {
-	emake oxt || die "make failed"
-}
-
-src_install() {
-	dodoc README ChangeLog || die "docs missing"
-	emake DESTDIR="${D}/usr/$(get_libdir)/${P}" install-unpacked
-	insinto /usr/$(get_libdir)/${P}
-	doins build/voikko.oxt
-
-}
-
-# FIXME: installation of an unopkg is troublesome, move to src_install when
-# OO.o supports it somehow sanely
-pkg_postinst() {
-	# N.B.: uno packages meddle with $HOME, let’s fool it
-	HOME="${S}"
-	cd "${S}"
-	# Yay, OO.o package installation requires .ooo-2.0 directory from once
-	# started instance of the program. How fun!
-	tar jxf "${FILESDIR}/ooo-2.0-home.tar.bz2"
-
-	# select component
-	COMPONENT="${ROOT}/usr/$(get_libdir)/${P}/voikko.oxt"
-	PKG=$(basename "${COMPONENT}")
-
-	# Global scope in install-oo2-voikko
-	if [[ -e "${HOME}/.openoffice.org2/.lock" ]] ;
-	then
-		die "lockfile from previous failed installation attempt found in \
-			${HOME}/.openoffice.org2/.lock, please clean and retry"
-	fi
-	# register()
-	if [[ "${COMPONENT}" == "" ]] ;
-	then
-		die "UNO component not found"
-	fi
-	einfo "Trying to register uno package ${COMPONENT}..."
-	HOME=${HOME} "${UNOPKG}" add --shared "${COMPONENT}"
-	if [[ $? == 0 ]] ;
-	then
-		einfo "Voikko package (${PKG}) registered succesfully"
-	else
-		die "Couldn’t register ${PN} package (${PKG})"
-	fi
-	elog "Please note that ${PN} is very dependent on ABI compatible "
-	elog "version of OpenOffice.org to exist on system when removing voikko!"
-	elog "Before incompatible update or removal of OpenOffice you must"
-	elog "unmerge ${PN}!"
-}
-
-pkg_prerm() {
-	#unregister()
-	UNOPKG_LIST="$(${UNOPKG} list --shared 2> /dev/null)"
-	if [[ $? != 0 ]] ; then
-		ewarn "Couldn’t list existing packages..."
-	fi
-	PKG=$(echo ${UNOPKG_LIST} | egrep -m1 "^Identifier: (org.puimula.ooovoikko|org.openoffice.legacy.openoffice.org-voikko.*.uno.pkg)" | sed -ne "s/^Identifier: \\(.*\\)/\\1/p")
-	if [ "${PKG}" != "" ]; then
-		einfo "Removing uno package ${PKG}..."
-		if "${UNOPKG}" remove --shared ${PKG} &>/dev/null
-		then
-			einfo "${PN} package (${PKG}) unregistered succesfully"
-		else
-			die "Couldn’t uninstall existing ${PN} packages"
-		fi
-	else
-		ewarn "Couldn’t find existing ${PN} packages."
-		ewarn "You may need to \`unopkg remove\` them manually."
-	fi
-}
-
diff --git a/trunk/app-office/openoffice-voikko/openoffice-voikko-3.1.ebuild b/trunk/app-office/openoffice-voikko/openoffice-voikko-3.1.ebuild
new file mode 100644
index 0000000..e080f40
--- /dev/null
+++ b/trunk/app-office/openoffice-voikko/openoffice-voikko-3.1.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=2
+
+inherit eutils versionator multilib
+
+MY_P="${P/office-voikko/office.org-voikko}"
+MY_PN="${PN/office-voikko/office.org-voikko}"
+
+DESCRIPTION="Free Finnish spell checking and hyphenation for OpenOffice"
+IUSE=""
+HOMEPAGE="http://voikko.sf.net/"
+SRC_URI="mirror://sourceforge/voikko/${MY_P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86"
+
+DEPEND="=app-office/openoffice-3.1*[odk]
+	app-text/voikko
+	sys-apps/grep
+	sys-apps/sed
+	sys-apps/sysvinit
+	!app-office/oo2-voikko"
+RDEPEND="=app-office/openoffice-3.1*
+	app-text/voikko"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	if pidof soffice.bin >/dev/null; then
+		ewarn "${PN} may not be installed while OpenOffice.org is running."
+	fi
+	einfo "Setting SDK environment from "
+	einfo "	${ROOT}/usr/lib/openoffice/basis-link/sdk/setsdkenv_unix.sh"
+	source "${ROOT}"/usr/lib/openoffice/basis-link/sdk/setsdkenv_unix.sh
+	export UNOPKG="${ROOT}"/usr/bin/unopkg
+}
+
+src_compile() {
+	emake oxt || die "make failed"
+}
+
+src_install() {
+	dodoc README ChangeLog || die "docs missing"
+	emake DESTDIR="${D}/usr/$(get_libdir)/${P}" install-unpacked
+	insinto /usr/$(get_libdir)/openoffice/share/extension/install/
+	doins build/voikko.oxt
+}
+
+# FIXME: installation of an unopkg is troublesome, move to src_install when
+# OO.o supports it somehow sanely
+pkg_postinst() {
+	# N.B.: uno packages meddle with $HOME, let’s fool it
+	HOME="${S}"
+	cd "${S}"
+
+	# select component
+	COMPONENT="${ROOT}/usr/$(get_libdir)/openoffice/share/extension/install/voikko.oxt"
+
+	einfo "Trying to register ${COMPONENT}..."
+	HOME=${HOME} "${UNOPKG}" add --shared "${COMPONENT}"
+	if [[ $? == 0 ]] ;
+	then
+		einfo "${PN} package registered succesfully"
+	else
+		eerror "Couldn’t register ${PN} package "
+	fi
+	elog "Please note that ${PN} is very dependent on ABI compatible "
+	elog "version of OpenOffice to exist on system when removing ${PN}!"
+	elog "Before any incompatible update or removal of OpenOffice you must"
+	elog "unmerge ${PN}!"
+}
+
+pkg_prerm() {
+	#unregister()
+	UNOPKG_LIST="$(${UNOPKG} list --shared 2> /dev/null)"
+	if [[ $? != 0 ]] ; then
+		ewarn "Couldn’t list existing packages..."
+	fi
+	PKG=$(echo ${UNOPKG_LIST} | egrep -m1 "^Identifier: (org.puimula.ooovoikko|org.openoffice.legacy.openoffice.org-voikko.*.uno.pkg)" | sed -ne "s/^Identifier: \\(.*\\)/\\1/p")
+	if [ "${PKG}" != "" ]; then
+		einfo "Removing uno package ${PKG}..."
+		if "${UNOPKG}" remove --shared ${PKG} &>/dev/null
+		then
+			einfo "${PN} package (${PKG}) unregistered succesfully"
+		else
+			die "Couldn’t uninstall existing ${PN} packages"
+		fi
+	else
+		ewarn "Couldn’t find existing ${PN} packages."
+		ewarn "You may need to \`unopkg remove\` them manually."
+	fi
+}
+