Version bump, still masked, still not working.

svn path=/; revision=40

2 files changed, 132 insertions, 39 deletions

diff --git a/trunk/app-office/openoffice-voikko/Manifest b/trunk/app-office/openoffice-voikko/Manifest
index ebbc096..cf85eab 100644
--- a/trunk/app-office/openoffice-voikko/Manifest
+++ b/trunk/app-office/openoffice-voikko/Manifest
@@ -1,51 +1,14 @@
 AUX ooo-2.0-home.tar.bz2 9966 RMD160 75e687e207d60291d32f6accaa526c74984b073c SHA1 d1495be0eaa1ce1394417d21f3b9db526d17b89e SHA256 f5c716bf2bd2b31be84dcdcd2f7d05ca4df560dbbe7f1a4f1ceab645d69600a7
-MD5 5f0a3f813a9ab90831a938fdfbf0875d files/ooo-2.0-home.tar.bz2 9966
-RMD160 75e687e207d60291d32f6accaa526c74984b073c files/ooo-2.0-home.tar.bz2 9966
-SHA256 f5c716bf2bd2b31be84dcdcd2f7d05ca4df560dbbe7f1a4f1ceab645d69600a7 files/ooo-2.0-home.tar.bz2 9966
 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
-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 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
-SHA256 4dd8089a0a7826ae38939516aba694702c9feacc57416aa1213572b289618d39 openoffice-voikko-2.0.ebuild 4325
 EBUILD openoffice-voikko-2.1.ebuild 4252 RMD160 f2408cacf43048c4c7e5ac1cd690c819d9c028c7 SHA1 cc3e795762972d5b1d43041fb917b060ea408c8a SHA256 4cb9fec1b4a7ad2a03485b25ee3d2b5eef314f7a5073f903947ebdbf7419b6e6
-MD5 892a0f5bb785582a2aee59cdf32c3d43 openoffice-voikko-2.1.ebuild 4252
-RMD160 f2408cacf43048c4c7e5ac1cd690c819d9c028c7 openoffice-voikko-2.1.ebuild 4252
-SHA256 4cb9fec1b4a7ad2a03485b25ee3d2b5eef314f7a5073f903947ebdbf7419b6e6 openoffice-voikko-2.1.ebuild 4252
+EBUILD openoffice-voikko-2.2.ebuild 4220 RMD160 1703b5205b846788f17ee98dfe2a1e910f5107b9 SHA1 a185a8d8adeb070880322d0c0c883adfeec03222 SHA256 0916730d6a2e411a9164012445b4ff67d7ec3609ffcbef2c8b919bfb50aed233
 EBUILD openoffice-voikko-9999.ebuild 4666 RMD160 25615225c2bb4d24f596f3014d965fb204b0a76f SHA1 0faec1eef70651d28ad7c6ef57d7100ea7b5f216 SHA256 720fb105aeaf80289d58884854e7b91eb77592a81c8910d875a1dd092e501ab6
-MD5 b3e2f74dfb8a9fc595318754c54a5b8d openoffice-voikko-9999.ebuild 4666
-RMD160 25615225c2bb4d24f596f3014d965fb204b0a76f openoffice-voikko-9999.ebuild 4666
-SHA256 720fb105aeaf80289d58884854e7b91eb77592a81c8910d875a1dd092e501ab6 openoffice-voikko-9999.ebuild 4666
 MISC ChangeLog 1007 RMD160 9782b48e68d86d79c21adbcba867864b0529e406 SHA1 a673c39d126c0fa75c6cb31e72e5d9460100e0dd SHA256 673f9b4b4194c419b7ae9cbd158f3b5432d87494ed16f93af3392fdd513f1679
-MD5 03cf4e0e205ecc448111206e4a191061 ChangeLog 1007
-RMD160 9782b48e68d86d79c21adbcba867864b0529e406 ChangeLog 1007
-SHA256 673f9b4b4194c419b7ae9cbd158f3b5432d87494ed16f93af3392fdd513f1679 ChangeLog 1007
 MISC metadata.xml 552 RMD160 a39aa046181a48e77ca9ae1f914a74d2bec768c9 SHA1 d5d46e1c182a3c731901e1e5a8601033e88d4429 SHA256 ab2a0ccd8470c822a5814172c1ce08c3e02fede695f1afe37a0f38c2f9981c0f
-MD5 33bf7682ef9f1953d1446fe391eb0cb7 metadata.xml 552
-RMD160 a39aa046181a48e77ca9ae1f914a74d2bec768c9 metadata.xml 552
-SHA256 ab2a0ccd8470c822a5814172c1ce08c3e02fede695f1afe37a0f38c2f9981c0f metadata.xml 552
-MD5 cb14a32dd8fec164c1f1fc20b911fc2a files/digest-openoffice-voikko-1.2 274
-RMD160 6fd637df0b25786e6d6f180be7a2d99016f0f917 files/digest-openoffice-voikko-1.2 274
-SHA256 00bdba7ead53314543d801675f2199e91bd1fc8ade696588064a491b8ce7d3f2 files/digest-openoffice-voikko-1.2 274
-MD5 3cb05fd36cd1d5cade042c2da6710937 files/digest-openoffice-voikko-2.0 274
-RMD160 1ab4b1d86a46c260da09f73a5903463a06252ac7 files/digest-openoffice-voikko-2.0 274
-SHA256 32b9e311e74d7881aab62b500cccb94468c531fca582d8b59559e4b32156e83e files/digest-openoffice-voikko-2.0 274
-MD5 d40de01e3f1f4223fd98529a47c6cda6 files/digest-openoffice-voikko-2.0.1 280
-RMD160 72d111e15ef1c589610d3ea69d43f56a0f900a89 files/digest-openoffice-voikko-2.0.1 280
-SHA256 d7000b527a81c667a89f079adc294f084caffd76f62781017d37e3d72f10a648 files/digest-openoffice-voikko-2.0.1 280
-MD5 6489d9a4321b286430a69452aad03c78 files/digest-openoffice-voikko-2.1 274
-RMD160 4ba09e2f6cc6341bdf5fcb4d90b358a589fdc144 files/digest-openoffice-voikko-2.1 274
-SHA256 219f66b9d85a7065f1d71c4cd16b9d19f32578971b3e94074542273cd3e1b4c6 files/digest-openoffice-voikko-2.1 274
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-openoffice-voikko-9999 0
-RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-openoffice-voikko-9999 0
-SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-openoffice-voikko-9999 0
diff --git a/trunk/app-office/openoffice-voikko/openoffice-voikko-2.2.ebuild b/trunk/app-office/openoffice-voikko/openoffice-voikko-2.2.ebuild
new file mode 100644
index 0000000..2c63284
--- /dev/null
+++ b/trunk/app-office/openoffice-voikko/openoffice-voikko-2.2.ebuild
@@ -0,0 +1,130 @@
+# 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 [[ ! -x "${ROOT}/usr/lib/openoffice/program/setsdkenv_unix" ]] ; then
+		die "Couldn’t find open office SDK settings from \
+			${ROOT}/usr/lib/openoffice/program/setsdkenv_unix \
+			see bug #194053 and forums for further info"
+	else
+		export SDKENV="${ROOT}/usr/lib/openoffice/program/setsdkenv_unix"
+	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/share/${P}
+	insinto /usr/share/${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/share/${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
+}
+