Version bump.

svn path=/; revision=67

3 files changed, 105 insertions, 2 deletions

diff --git a/trunk/app-office/openoffice-voikko/ChangeLog b/trunk/app-office/openoffice-voikko/ChangeLog
index e6b1513..26e6d98 100644
--- a/trunk/app-office/openoffice-voikko/ChangeLog
+++ b/trunk/app-office/openoffice-voikko/ChangeLog
@@ -1,7 +1,12 @@
 # ChangeLog for app-office/openoffice-voikko
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*openoffice-voikko-3.1.2 (17 Aug 2010)
+
+  17 Aug 2010; <flammie@gentoo.org> +openoffice-voikko-3.1.2.ebuild:
+  Version bump
+
 *openoffice-voikko-3.1 (15 Dec 2009)
 
   15 Dec 2009; <flammie@gentoo.org> -openoffice-voikko-1.2.ebuild,
diff --git a/trunk/app-office/openoffice-voikko/Manifest b/trunk/app-office/openoffice-voikko/Manifest
index c6e642c..8156486 100644
--- a/trunk/app-office/openoffice-voikko/Manifest
+++ b/trunk/app-office/openoffice-voikko/Manifest
@@ -1,6 +1,8 @@
 AUX ooo-2.0-home.tar.bz2 9966 RMD160 75e687e207d60291d32f6accaa526c74984b073c SHA1 d1495be0eaa1ce1394417d21f3b9db526d17b89e SHA256 f5c716bf2bd2b31be84dcdcd2f7d05ca4df560dbbe7f1a4f1ceab645d69600a7
+DIST openoffice.org-voikko-3.1.2.tar.gz 42825 RMD160 3a783af0ba0c257cb49cf02bbdb5749fd7a1f622 SHA1 754d59e75d62dc19eef0053fd76bfbf2514b36ca SHA256 315cef29ab2187b934a9dffd8419b1f1ddaf417fce799caae7dd2cf15020a1cd
 DIST openoffice.org-voikko-3.1.tar.gz 36406 RMD160 68f6b525dc5050147837ba35ffe35d7690c05739 SHA1 461119169e20fba8fc02ea60e1b459e116ac63b9 SHA256 526386e2295da5a269caad991cb5012475a4bb0e344760c0017919e1f53c0b25
+EBUILD openoffice-voikko-3.1.2.ebuild 2783 RMD160 54b6ee01e14a482b053fc8fff19cd4e822a595a3 SHA1 5cc08ebfb1fe8e5db3a124e22b66dd7c2cbb4f63 SHA256 7656aed69c46c1b9964dde17eff261bbb8ef34a7568a609190e1b2159f956def
 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 1520 RMD160 9a2c47a9482cc8fe18e312aeb8b0a59744ff6cbd SHA1 96d52bdd5476c733457f5184989547eda246adac SHA256 add269f809e1d2fb26a49d9b92d26a8387c69ec790257f46d76d7ffb360d7f6e
+MISC ChangeLog 1645 RMD160 e75950f2ffe0f9f378a6d3a4d5b7f6a5e38ddfa8 SHA1 0207b37f98c1713de2a7607dbe375c0b16a3eaed SHA256 000b5552130596fd0bb5635f7311bc0cbc32de6f079732ca8e71335a5c61fd43
 MISC metadata.xml 552 RMD160 a39aa046181a48e77ca9ae1f914a74d2bec768c9 SHA1 d5d46e1c182a3c731901e1e5a8601033e88d4429 SHA256 ab2a0ccd8470c822a5814172c1ce08c3e02fede695f1afe37a0f38c2f9981c0f
diff --git a/trunk/app-office/openoffice-voikko/openoffice-voikko-3.1.2.ebuild b/trunk/app-office/openoffice-voikko/openoffice-voikko-3.1.2.ebuild
new file mode 100644
index 0000000..9c3bb05
--- /dev/null
+++ b/trunk/app-office/openoffice-voikko/openoffice-voikko-3.1.2.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2010 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
+}
+