Version bump. To a masked release candidate.

svn path=/; revision=22

4 files changed, 161 insertions, 4 deletions

diff --git a/trunk/app-office/openoffice-voikko/ChangeLog b/trunk/app-office/openoffice-voikko/ChangeLog
index 824ee97..f26f6d9 100644
--- a/trunk/app-office/openoffice-voikko/ChangeLog
+++ b/trunk/app-office/openoffice-voikko/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*openoffice-voikko-2.1_rc1 (23 Aug 2007)
+
+  23 Aug 2007; Flammie Pirinen <flammie@gentoo.org>
+  +openoffice-2.1_rc1.ebuild:
+  Version bump. Masked release candidate, proceed with caution!
+
 *openoffice-voikko-2.0.1 (15 May 2007)
 
   22 May 2007; Flammie Pirinen <flammie@gentoo.org>
diff --git a/trunk/app-office/openoffice-voikko/Manifest b/trunk/app-office/openoffice-voikko/Manifest
index 0715704..1f4566c 100644
--- a/trunk/app-office/openoffice-voikko/Manifest
+++ b/trunk/app-office/openoffice-voikko/Manifest
@@ -5,6 +5,7 @@ SHA256 f5c716bf2bd2b31be84dcdcd2f7d05ca4df560dbbe7f1a4f1ceab645d69600a7 files/oo
 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.1rc1.tar.gz 26459 RMD160 fe44ea41408e5270447fe5f8774c2dfc06b92765 SHA1 6ca5610ee9f268e93fd890c55c3e696deea04c51 SHA256 9d02639cc8f17626d7f7f4fd7d2d3bf95ec1d9919ab26fa5077428a0829b6352
 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
@@ -17,14 +18,18 @@ EBUILD openoffice-voikko-2.0.ebuild 4325 RMD160 9b2d3a073390d7118f9ec2f7c0bebfbd
 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_rc1.ebuild 4537 RMD160 581fe8de58f49cc0046fd08ff9876c4f9e615ce2 SHA1 518f5e7ed70ed5fb814948973a5abd09f9493c21 SHA256 b7de0701a75336a27d3ea475d3188aff50828a08ad2f91da4aca3276898f3f23
+MD5 52afd97a3c518ed5f2856b86fd6c946c openoffice-voikko-2.1_rc1.ebuild 4537
+RMD160 581fe8de58f49cc0046fd08ff9876c4f9e615ce2 openoffice-voikko-2.1_rc1.ebuild 4537
+SHA256 b7de0701a75336a27d3ea475d3188aff50828a08ad2f91da4aca3276898f3f23 openoffice-voikko-2.1_rc1.ebuild 4537
 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 603 RMD160 cf3279d8c1d575c5d8cc0125ff06f316a20d9d45 SHA1 0be4e04f233eb9bd1c5e3634eaed2986c56d722b SHA256 07329742310fc71555d5936ff750b2a4498cf7d7bb07000fc4c42b63693bf67e
-MD5 94fbbea697614a3f97a520adc58c8d01 ChangeLog 603
-RMD160 cf3279d8c1d575c5d8cc0125ff06f316a20d9d45 ChangeLog 603
-SHA256 07329742310fc71555d5936ff750b2a4498cf7d7bb07000fc4c42b63693bf67e ChangeLog 603
+MISC ChangeLog 792 RMD160 3a933698cfa1a18bd53d41a8fe823d15d9c4a289 SHA1 b992273e84f194cc200fd1503fd2faa9f4e47006 SHA256 136e89c30cdcf3271dc075a7b328a06fa5821eb09146aac56474530d81002f1d
+MD5 d16b58f78e6de76e7387ba1f4aebb323 ChangeLog 792
+RMD160 3a933698cfa1a18bd53d41a8fe823d15d9c4a289 ChangeLog 792
+SHA256 136e89c30cdcf3271dc075a7b328a06fa5821eb09146aac56474530d81002f1d ChangeLog 792
 MISC metadata.xml 552 RMD160 a39aa046181a48e77ca9ae1f914a74d2bec768c9 SHA1 d5d46e1c182a3c731901e1e5a8601033e88d4429 SHA256 ab2a0ccd8470c822a5814172c1ce08c3e02fede695f1afe37a0f38c2f9981c0f
 MD5 33bf7682ef9f1953d1446fe391eb0cb7 metadata.xml 552
 RMD160 a39aa046181a48e77ca9ae1f914a74d2bec768c9 metadata.xml 552
@@ -38,6 +43,9 @@ SHA256 32b9e311e74d7881aab62b500cccb94468c531fca582d8b59559e4b32156e83e files/di
 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 98bea0ceafcc8cbf2010edd9f15259dd files/digest-openoffice-voikko-2.1_rc1 283
+RMD160 e805ae95053429abecdbf9157d8fdf555c3f1ef9 files/digest-openoffice-voikko-2.1_rc1 283
+SHA256 9bd7528459e5155185a6e2063c45ffb515ac143d532aaaddf4357ccd640f28be files/digest-openoffice-voikko-2.1_rc1 283
 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/files/digest-openoffice-voikko-2.1_rc1 b/trunk/app-office/openoffice-voikko/files/digest-openoffice-voikko-2.1_rc1
new file mode 100644
index 0000000..f46ec3d
--- /dev/null
+++ b/trunk/app-office/openoffice-voikko/files/digest-openoffice-voikko-2.1_rc1
@@ -0,0 +1,3 @@
+MD5 f88a8cde8aea12c42fbdb63a85a284f0 openoffice.org-voikko-2.1rc1.tar.gz 26459
+RMD160 fe44ea41408e5270447fe5f8774c2dfc06b92765 openoffice.org-voikko-2.1rc1.tar.gz 26459
+SHA256 9d02639cc8f17626d7f7f4fd7d2d3bf95ec1d9919ab26fa5077428a0829b6352 openoffice.org-voikko-2.1rc1.tar.gz 26459
diff --git a/trunk/app-office/openoffice-voikko/openoffice-voikko-2.1_rc1.ebuild b/trunk/app-office/openoffice-voikko/openoffice-voikko-2.1_rc1.ebuild
new file mode 100644
index 0000000..356226c
--- /dev/null
+++ b/trunk/app-office/openoffice-voikko/openoffice-voikko-2.1_rc1.ebuild
@@ -0,0 +1,140 @@
+# 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_P="${MY_P/_rc1/}"
+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"
+SRC_URI="http://www.puimula.org/htp/testing/openoffice.org-voikko-2.1rc1.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="-x86" # Release Candidate for expert testers!!!
+
+#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() {
+	ewarn "This is a temporary release candidate package, no support!"
+	ewarn "Will break as soon as final version is released!"
+	ebeep
+	epause
+	
+	# 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}!"
+	
+	ewarn "This is a temporary release candidate"
+}
+
+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
+}
+