Update to voikko-1.4.1, openoffice-voikko-2.0.1 and suomi-malaga-0.7.5

svn path=/; revision=17

11 files changed, 140 insertions, 83 deletions

diff --git a/trunk/app-office/openoffice-voikko/Manifest b/trunk/app-office/openoffice-voikko/Manifest
index 70461cb..c92e8b8 100644
--- a/trunk/app-office/openoffice-voikko/Manifest
+++ b/trunk/app-office/openoffice-voikko/Manifest
@@ -2,21 +2,17 @@ AUX ooo-2.0-home.tar.bz2 9966 RMD160 75e687e207d60291d32f6accaa526c74984b073c SH
 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
-AUX openoffice-voikko-1.1-r1-stlport.patch 400 RMD160 03f7cf433424fd600c84ffc9bc5b1095757abaae SHA1 87b3ce7065150c5749c940dd34fa353f0b2b3f38 SHA256 e460eb62e259737848df90e19b9a7242fe84b692b1dd7513abb95a750b44b481
-MD5 b535ac6b02726b8fe919c02e0b039bb7 files/openoffice-voikko-1.1-r1-stlport.patch 400
-RMD160 03f7cf433424fd600c84ffc9bc5b1095757abaae files/openoffice-voikko-1.1-r1-stlport.patch 400
-SHA256 e460eb62e259737848df90e19b9a7242fe84b692b1dd7513abb95a750b44b481 files/openoffice-voikko-1.1-r1-stlport.patch 400
-DIST oo2-voikko-1.1.tar.gz 52682 RMD160 e5138b4143ff451fa69a69275bc280155169553f SHA1 0b538cc9cc75a052e890b0e883194a29528f6575 SHA256 2b70c1099615c67010b0705fb729e1dce506ec624032e9cd45bbecffb679f12b
 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
-EBUILD openoffice-voikko-1.1-r1.ebuild 4718 RMD160 d8ae56ae4ca640e5dcf42a700041f7c1c81f0e28 SHA1 c58f639c10f5f22a79449cbb5532cde62ff6e343 SHA256 d5bc9d84e900f89fe00cc1d17eb0f8a277617287ab29edc7cb338c69399b5801
-MD5 35c1bb5afe3e7d4774c259d3cc6f4080 openoffice-voikko-1.1-r1.ebuild 4718
-RMD160 d8ae56ae4ca640e5dcf42a700041f7c1c81f0e28 openoffice-voikko-1.1-r1.ebuild 4718
-SHA256 d5bc9d84e900f89fe00cc1d17eb0f8a277617287ab29edc7cb338c69399b5801 openoffice-voikko-1.1-r1.ebuild 4718
 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 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.ebuild 4325 RMD160 9b2d3a073390d7118f9ec2f7c0bebfbd08a16f9a SHA1 6b8abc8c5cf2c375d24cfcbeeafd3e255a0d50db SHA256 4dd8089a0a7826ae38939516aba694702c9feacc57416aa1213572b289618d39
 MD5 95d3db8f800288a57244beba2a205c58 openoffice-voikko-2.0.ebuild 4325
 RMD160 9b2d3a073390d7118f9ec2f7c0bebfbd08a16f9a openoffice-voikko-2.0.ebuild 4325
@@ -29,15 +25,15 @@ MISC metadata.xml 552 RMD160 a39aa046181a48e77ca9ae1f914a74d2bec768c9 SHA1 d5d46
 MD5 33bf7682ef9f1953d1446fe391eb0cb7 metadata.xml 552
 RMD160 a39aa046181a48e77ca9ae1f914a74d2bec768c9 metadata.xml 552
 SHA256 ab2a0ccd8470c822a5814172c1ce08c3e02fede695f1afe37a0f38c2f9981c0f metadata.xml 552
-MD5 67926811dffb31efd8c84c6c20408a90 files/digest-openoffice-voikko-1.1-r1 241
-RMD160 d523826df957ee33a09ce13dc1f41beea8a827d1 files/digest-openoffice-voikko-1.1-r1 241
-SHA256 079e95f5d837133bbd8f23217e37a2bebdcddd32e3ef5d76437b192520865a68 files/digest-openoffice-voikko-1.1-r1 241
 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 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-1.1-r1 b/trunk/app-office/openoffice-voikko/files/digest-openoffice-voikko-1.1-r1
deleted file mode 100644
index e0f5918..0000000
--- a/trunk/app-office/openoffice-voikko/files/digest-openoffice-voikko-1.1-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 3da94ad217ddc2bc33ae93595479c401 oo2-voikko-1.1.tar.gz 52682
-RMD160 e5138b4143ff451fa69a69275bc280155169553f oo2-voikko-1.1.tar.gz 52682
-SHA256 2b70c1099615c67010b0705fb729e1dce506ec624032e9cd45bbecffb679f12b oo2-voikko-1.1.tar.gz 52682
diff --git a/trunk/app-office/openoffice-voikko/files/digest-openoffice-voikko-2.0.1 b/trunk/app-office/openoffice-voikko/files/digest-openoffice-voikko-2.0.1
new file mode 100644
index 0000000..225e9e2
--- /dev/null
+++ b/trunk/app-office/openoffice-voikko/files/digest-openoffice-voikko-2.0.1
@@ -0,0 +1,3 @@
+MD5 e1ae94b38df69b325856d3073b015410 openoffice.org-voikko-2.0.1.tar.gz 17255
+RMD160 d5f8220e57078042dede0df5b3452a0ea8f6a1b9 openoffice.org-voikko-2.0.1.tar.gz 17255
+SHA256 f7d5789aaa79c67a14060c28b663bfe004128c3b470fd9f7eb8d284c54f841b4 openoffice.org-voikko-2.0.1.tar.gz 17255
diff --git a/trunk/app-office/openoffice-voikko/files/openoffice-voikko-1.1-r1-stlport.patch b/trunk/app-office/openoffice-voikko/files/openoffice-voikko-1.1-r1-stlport.patch
deleted file mode 100644
index 7e09091..0000000
--- a/trunk/app-office/openoffice-voikko/files/openoffice-voikko-1.1-r1-stlport.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- trunk/unopkg/Makefile       (revision 483)
-+++ trunk/unopkg/Makefile       (working copy)
-@@ -142,7 +142,7 @@
- $(LF_SLO) : $(LF_SLOFILES)
-        -$(MKDIR) $(subst /,$(PS),$(@D))
-        $(LINK) $(COMP_LINK_FLAGS) $(LINK_LIBS) -o $@ $^ \
--        $(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) $(STLPORTLIB)
-+        $(CPPUHELPERLIB) $(CPPULIB) $(SALLIB)
- endif
-
- $(LF_OUTDIR)/pkg/META-INF/manifest.xml :
diff --git a/trunk/app-office/openoffice-voikko/openoffice-voikko-1.1-r1.ebuild b/trunk/app-office/openoffice-voikko/openoffice-voikko-2.0.1.ebuild
index d490b33..e7ebaa8 100644
--- a/trunk/app-office/openoffice-voikko/openoffice-voikko-1.1-r1.ebuild
+++ b/trunk/app-office/openoffice-voikko/openoffice-voikko-2.0.1.ebuild
@@ -2,40 +2,54 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-inherit eutils versionator
+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://www.lemi.fi/voikko/"
-#SRC_URI="http://www.hunspell-fi.org/files/${P}.tar.gz"
-SRC_URI="http://www.hunspell-fi.org/files/oo2-voikko-1.1.tar.gz"
-LICENSE="LGPL-2.1"
+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
-	app-office/openoffice-sdk
+	sys-apps/sysvinit
 	!app-office/oo2-voikko"
-#  ! app-office/oo2-soikko"
 RDEPEND="|| ( >=app-office/openoffice-2 >=app-office/openoffice-bin-2 )
 	app-text/voikko"
 
-#UNONAME=${PN/office-voikko/office.org-voikko}
-UNONAME=oo2-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 "Voikko can’t be installed while OpenOffice.org is running."
-		# Or use the force
-		#killall soffice.bin || killall -9 soffice.bin
+		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”"
@@ -45,50 +59,23 @@ pkg_setup() {
 }
 
 src_compile() {
-	source ${ROOT}/usr/lib/openoffice/program/setsdkenv_unix.sh
-	echo "OO_SDK_HOME=${OO_SDK_HOME}"
-	cd "${WORKDIR}/unopkg"
-	sed -i s/\\\$\(STLPORTLIB\)//g Makefile
-		# Variables needed to "export" are used in the *.mk files included
-#		OO_SDK_HOME=${OO_SDK_HOME} OFFICE_HOME=${OFFICE_HOME} \
-#			OO_SDK_NAME=${OO_SDK_NAME} \
-#			OO_SDK_MAKE_HOME=${OO_SDK_MAKE_HOME} \
-#			OO_SDK_ZIP_HOME=${OO_SDK_ZIP_HOME} \
-#			OO_SDK_CPP_HOME=${OO_SDK_CPP_HOME} \
-#			OO_SDK_JAVA_HOME=${OO_SDK_JAVA_HOME} \
-#			OO_SDK_OUTPUT_DIR=${OO_SDK_OUTPUT_DIR} \
-#			SDK_AUTO_DEPLOYMENT=${SDK_AUTO_DEPLOYMENT} \
-#			LD_LIBRARY_PATH=${LD_LIBRARY_PATH} 	PATH=${PATH} \
-#			OFFICE_PROGRAM_PATH=${OFFICE_PROGRAM_PATH} \
-#			SDK_GXX_INCLUDE_PATH=${SDK_GXX_INCLUDE_PATH} \
-			emake || die "make uno package failed"
-	mkdir "${S}"
-	cp build/${UNONAME}-*uno.pkg impl/doc/Linux_*/ASENNUS.txt \
-		linux-installer "${S}"
+	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() {
-	cd "${S}"
-	dodoc ASENNUS.txt
+	dodoc impl/doc/Linux_*/ASENNUS.txt
 	insinto /usr/lib/openoffice/share/
-	doins linux-installer
+	newins linux-installer ${PN}-installer
 	dodir /usr/lib/${P}
 	insinto /usr/lib/${P}
-	doins oo2-voikko-Linux*-${PV}.uno.pkg
-}
-
-find_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
+	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}"
@@ -97,13 +84,11 @@ pkg_postinst() {
 	# 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}/${UNONAME}-Linux_x86_64-${PV}.uno.pkg"
+		COMPONENT="${ROOT}/usr/lib/${P}/${MY_PN}-Linux_x86_64-${PV}.uno.pkg"
 	else
-		COMPONENT="${ROOT}/usr/lib/${P}/${UNONAME}-Linux_x86-${PV}.uno.pkg"
+		COMPONENT="${ROOT}/usr/lib/${P}/${MY_PN}-Linux_x86-${PV}.uno.pkg"
 	fi
 	PKG=$(basename "${COMPONENT}")
 
@@ -124,7 +109,7 @@ pkg_postinst() {
 	then
 		einfo "Voikko package (${PKG}) registered succesfully"
 	else
-		die "Couldn't register ${PN} package (${PKG})"
+		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!"
@@ -133,11 +118,10 @@ pkg_postinst() {
 }
 
 pkg_prerm() {
-	find_unopkg
 	#unregister()
 	UNOPKG_LIST="$(${UNOPKG} list --shared 2> /dev/null)"
 	if [[ $? != 0 ]] ; then
-		ewarn "Couldn't list existing packages..."
+		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
@@ -146,10 +130,10 @@ pkg_prerm() {
 		then
 			einfo "${PN} package (${PKG}) unregistered succesfully"
 		else
-			die "Couldn't uninstall existing ${PN} packages"
+			die "Couldn’t uninstall existing ${PN} packages"
 		fi
 	else
-		ewarn "Couldn't find existing ${PN} packages."
+		ewarn "Couldn’t find existing ${PN} packages."
 		ewarn "You may need to \`unopkg remove\` them manually."
 	fi
 }
diff --git a/trunk/app-text/voikko/Manifest b/trunk/app-text/voikko/Manifest
index f6bdc36..8af764c 100644
--- a/trunk/app-text/voikko/Manifest
+++ b/trunk/app-text/voikko/Manifest
@@ -1,10 +1,15 @@
 DIST libvoikko-1.3.1.tar.gz 357497 RMD160 ec00dc5cc27cefdc600b9c4eba925f44de443bba SHA1 0bcea56c450ef8437943b7a3902b4e8b799d2c29 SHA256 970a7af255078d265858416a6909a11313d870709c4c0f4d757e23c9c2ea326d
+DIST libvoikko-1.4.1.tar.gz 359402 RMD160 90f09cd5064a68ea2c810c58a46630388f02043a SHA1 23c69e9405f32f4e128b97fb3f725aabe3452e85 SHA256 b43e282fc93a47c2b0879d69dee2d7885f3f3ea31391dc3a69df427373b485d1
 DIST libvoikko-1.4.tar.gz 359159 RMD160 61f28678129ff619bcbddc600d9d4fd42f87efe0 SHA1 5d6d87f91aa4ef9ddb28d04a5a0a09238265ab62 SHA256 8e62c2b07f4f9d01ba859a19fbff2c7136fad963237379f08777ef293c86e55d
 DIST libvoikko-20060901.tar.gz 352576 RMD160 eabc06ba0f75512222deb671948c7bc3acd30f13 SHA1 21c764bb533b7b218f3242f61e7164a0f4371129 SHA256 6eaa9b6fb1008db7d4098ddb9e98bfb902d16b515f79bb4ee03efc2762874989
 EBUILD voikko-1.3.1.ebuild 762 RMD160 6085b3d3b056393ab2849d12b58823ac62f72c4d SHA1 99272b76afb6c6f07cfb448b53bc309fbde4595a SHA256 227504a91f59602684a0286bbe834070ceb9061d0cce11d843ad8f0d85ab68d0
 MD5 0ccd41b36948db795efae8e6678ffcd0 voikko-1.3.1.ebuild 762
 RMD160 6085b3d3b056393ab2849d12b58823ac62f72c4d voikko-1.3.1.ebuild 762
 SHA256 227504a91f59602684a0286bbe834070ceb9061d0cce11d843ad8f0d85ab68d0 voikko-1.3.1.ebuild 762
+EBUILD voikko-1.4.1.ebuild 754 RMD160 5b3e571bb001f84f1731dd7b248efa241bba9d40 SHA1 42417abfc41fac317599681b4f293e1a17ecb754 SHA256 5ae9f3a70fdad1e82f6d6517ab570d1a2b7a98b3a763e23186266ce3b20243a6
+MD5 59e2f6d1de4b4c85d2c694df8a1ddbd0 voikko-1.4.1.ebuild 754
+RMD160 5b3e571bb001f84f1731dd7b248efa241bba9d40 voikko-1.4.1.ebuild 754
+SHA256 5ae9f3a70fdad1e82f6d6517ab570d1a2b7a98b3a763e23186266ce3b20243a6 voikko-1.4.1.ebuild 754
 EBUILD voikko-1.4.ebuild 754 RMD160 5b3e571bb001f84f1731dd7b248efa241bba9d40 SHA1 42417abfc41fac317599681b4f293e1a17ecb754 SHA256 5ae9f3a70fdad1e82f6d6517ab570d1a2b7a98b3a763e23186266ce3b20243a6
 MD5 59e2f6d1de4b4c85d2c694df8a1ddbd0 voikko-1.4.ebuild 754
 RMD160 5b3e571bb001f84f1731dd7b248efa241bba9d40 voikko-1.4.ebuild 754
@@ -27,6 +32,9 @@ SHA256 a38c070d5433f06b571db06759aa3f5f873dbe6805d79b862f0a4e189346b326 files/di
 MD5 035509342c63a32d2cb8221c1b005048 files/digest-voikko-1.4 241
 RMD160 8b8efbc38e44a4aaf1f54dab23b94c317dabfea8 files/digest-voikko-1.4 241
 SHA256 44bd8a74c7a93824bd5b787bcadbddf0da3e6e6ae6a7c5d64cc850f918d0e267 files/digest-voikko-1.4 241
+MD5 17cee0924c3701db12fd154d1c28d5a1 files/digest-voikko-1.4.1 247
+RMD160 4ca8e7f2adf5192c031e6577f8fb673a0f1dffd7 files/digest-voikko-1.4.1 247
+SHA256 854ce5d8be3b0c346be2ff3c19232139d62fa9931a6fcac034d7d49489c8bc76 files/digest-voikko-1.4.1 247
 MD5 ea9bb0dae4d289c33ed0969e4002e927 files/digest-voikko-99.20060901 256
 RMD160 2d1d648ebbc0f3972f4ddc60560576dd46cae3ae files/digest-voikko-99.20060901 256
 SHA256 3ddd3312755cbf42d422ef39aad39e95f1ca3fe6bc7044618c7a1fc132946149 files/digest-voikko-99.20060901 256
diff --git a/trunk/app-text/voikko/files/digest-voikko-1.4.1 b/trunk/app-text/voikko/files/digest-voikko-1.4.1
new file mode 100644
index 0000000..421e7a7
--- /dev/null
+++ b/trunk/app-text/voikko/files/digest-voikko-1.4.1
@@ -0,0 +1,3 @@
+MD5 3cfedac343b62130d678fd4e3fc8b93f libvoikko-1.4.1.tar.gz 359402
+RMD160 90f09cd5064a68ea2c810c58a46630388f02043a libvoikko-1.4.1.tar.gz 359402
+SHA256 b43e282fc93a47c2b0879d69dee2d7885f3f3ea31391dc3a69df427373b485d1 libvoikko-1.4.1.tar.gz 359402
diff --git a/trunk/app-text/voikko/voikko-1.4.1.ebuild b/trunk/app-text/voikko/voikko-1.4.1.ebuild
new file mode 100644
index 0000000..b019a9c
--- /dev/null
+++ b/trunk/app-text/voikko/voikko-1.4.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+MY_PN="lib${P}"
+DESCRIPTION="Free Finnish spellchecking and hyphenation library"
+HOMEPAGE="http://www.lemi.fi/voikko/"
+SRC_URI="mirror://sourceforge/voikko/${MY_PN}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE=""
+
+DEPEND="sci-misc/malaga
+	|| ( =sci-misc/suomi-malaga-1.0* =sci-misc/suomi-malaga-0.7*
+		=sci-misc/suomi-malaga-9999 )
+	virtual/libiconv"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/lib${P}"
+
+src_compile() {
+	econf --with-dictionary-path="/usr/lib/suomi-malaga/" \
+		|| die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "install failed"
+	dodoc README TODO
+}
diff --git a/trunk/sci-misc/suomi-malaga/Manifest b/trunk/sci-misc/suomi-malaga/Manifest
index a0a9b8a..775dd9d 100644
--- a/trunk/sci-misc/suomi-malaga/Manifest
+++ b/trunk/sci-misc/suomi-malaga/Manifest
@@ -8,6 +8,7 @@ RMD160 9235fdcd41322a10a1264d553798075fe81aca8c files/malaga-7.8-pruning.patch 7
 SHA256 440bc4071057660874d3622542c61c7c2331aff40774f2bf8afdf9eb3dc39a34 files/malaga-7.8-pruning.patch 745
 DIST suomi-malaga-0.7.3.tar.gz 412616 RMD160 bef99df9c5043777214fc0aced0c9892382becea SHA1 401fe01874de9733c85b863ecccdf48882c10378 SHA256 db085df2e6a7b2ffa8620bf0b8cd1c8ce1808fd8770f1c27cfc9e9086df50e8f
 DIST suomi-malaga-0.7.4.tar.gz 501334 RMD160 e6b3f964d60b4e43031e452652cedc976a3274dc SHA1 5a8201ec869487c129ba225af7f3e0a623cf837b SHA256 fda68c0308f0e0f34286b33fe4f9c25385bfd14aa6b11673b8a59c3e511af770
+DIST suomi-malaga-0.7.5.tar.gz 717578 RMD160 01b0cc9858764f2aadead3dbbc96ddf0b688d66b SHA1 cb3ee63acb4f7150d6fd0314c3bc5ca922200b9e SHA256 be616a79b222496c271a0d6c018f755543ae32e48e4cb302fb845de30bfcc6b4
 DIST suomi-malaga-0.9.7.tar.bz2 475822 RMD160 84c7fee1befa8c5a5692651a4a59003c0fb1f146 SHA1 2e54fdfc53baaa45491bfb595b52ee6fd15af924 SHA256 db53e0f41096bc3220b68aafd672f2c2d735bc15f55bd72a0890f069ed3d9310
 DIST suomi-malaga-voikko-20060901.tar.gz 391725 RMD160 c5dedda96890f391456612544d878df7220331b8 SHA1 363338d87d2f6056655cc171d2f99b5bf5eae62d SHA256 cc78ceed2b875ed8d7d95e3ef2f9b6577c8e5f2d89f04a12265c02e22efcfa96
 EBUILD suomi-malaga-0.7.3.ebuild 924 RMD160 2bb12d2db17c2808c4983be648bbd4c68448317e SHA1 e88d1c3639aff32f3109e005be0b01ea7d0f1bf2 SHA256 0e6ba754eb7d95015ce5fbf6028d9bb612fff829647d305c3c5fcd4f7dc7f86a
@@ -18,6 +19,10 @@ EBUILD suomi-malaga-0.7.4.ebuild 960 RMD160 3ac90b2e642514daafdd48df86e10ae68de1
 MD5 e6b75b96f85cfa83e55f71f5ad1233cc suomi-malaga-0.7.4.ebuild 960
 RMD160 3ac90b2e642514daafdd48df86e10ae68de15bf2 suomi-malaga-0.7.4.ebuild 960
 SHA256 be34d9442f3bd69701321daba632ab43594a779cde27c9f8bd3772c4773395b7 suomi-malaga-0.7.4.ebuild 960
+EBUILD suomi-malaga-0.7.5.ebuild 775 RMD160 4930343be8f73ff35b078ed8f3f208d022963b78 SHA1 63776580ef9671aceefc545eebfe80cce907990b SHA256 51cefca7e0e2390ab4112d5a37dffb0a96215f90fd341df800221f1081539d0f
+MD5 45ffbfc39f7b054c2e8e6e3b6bca5987 suomi-malaga-0.7.5.ebuild 775
+RMD160 4930343be8f73ff35b078ed8f3f208d022963b78 suomi-malaga-0.7.5.ebuild 775
+SHA256 51cefca7e0e2390ab4112d5a37dffb0a96215f90fd341df800221f1081539d0f suomi-malaga-0.7.5.ebuild 775
 EBUILD suomi-malaga-0.9.7.ebuild 929 RMD160 45d4a30813085c7d272ef49d303904c4d09739f3 SHA1 2adc8e92cb67ac51dc1a4676fed4de4e675e19b0 SHA256 cc96874a63383ea3c915f4bda72bb3ddb9ceb77fa9228e12102478de05a3249e
 MD5 e71070607f4c02074dca99287e2f8f96 suomi-malaga-0.9.7.ebuild 929
 RMD160 45d4a30813085c7d272ef49d303904c4d09739f3 suomi-malaga-0.9.7.ebuild 929
@@ -40,6 +45,9 @@ SHA256 0d217defa06755dc76a91018e797b6c71709468d30e6967789f90001182048d9 files/di
 MD5 90b6dc95e7b8d6eb8e51bbcb45ac70b5 files/digest-suomi-malaga-0.7.4 256
 RMD160 11cccf794a588f7527a3558e2787b7051b7b3278 files/digest-suomi-malaga-0.7.4 256
 SHA256 ba1539c6ab9fd04a5b569654a6d21c8d0b08256d61c197277d57ba797b396cc8 files/digest-suomi-malaga-0.7.4 256
+MD5 6e84911c9047c6ac3a014297de8c018a files/digest-suomi-malaga-0.7.5 256
+RMD160 3db6f34c861eaaea7722b60e8ddd648c920167e1 files/digest-suomi-malaga-0.7.5 256
+SHA256 fbb7730d1f51fd388bea3d461b6cbce1090cf6e7d432002b96a52a9ea8926acb files/digest-suomi-malaga-0.7.5 256
 MD5 53753f44acc50340dd8661264e0838eb files/digest-suomi-malaga-0.9.7 259
 RMD160 daf88485b0d59cd43e776a3ea07bcba986526cfb files/digest-suomi-malaga-0.9.7 259
 SHA256 89433d3db5e18eb5202aafd2d93825cb1eac6ea6e93998a8d1002f14e085aa4a files/digest-suomi-malaga-0.9.7 259
diff --git a/trunk/sci-misc/suomi-malaga/files/digest-suomi-malaga-0.7.5 b/trunk/sci-misc/suomi-malaga/files/digest-suomi-malaga-0.7.5
new file mode 100644
index 0000000..8ab3936
--- /dev/null
+++ b/trunk/sci-misc/suomi-malaga/files/digest-suomi-malaga-0.7.5
@@ -0,0 +1,3 @@
+MD5 11517dc59a373e286bfbebc34ebb11a7 suomi-malaga-0.7.5.tar.gz 717578
+RMD160 01b0cc9858764f2aadead3dbbc96ddf0b688d66b suomi-malaga-0.7.5.tar.gz 717578
+SHA256 be616a79b222496c271a0d6c018f755543ae32e48e4cb302fb845de30bfcc6b4 suomi-malaga-0.7.5.tar.gz 717578
diff --git a/trunk/sci-misc/suomi-malaga/suomi-malaga-0.7.5.ebuild b/trunk/sci-misc/suomi-malaga/suomi-malaga-0.7.5.ebuild
new file mode 100644
index 0000000..ee87903
--- /dev/null
+++ b/trunk/sci-misc/suomi-malaga/suomi-malaga-0.7.5.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+inherit eutils
+
+DESCRIPTION="Finnish wordform patterns for malaga"
+HOMEPAGE="http://joyds1.joensuu.fi/sukija/sukija.html"
+SRC_URI="mirror://sourceforge/voikko/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64" # a test version
+IUSE="doc"
+
+DEPEND=">=sci-misc/malaga-7.8
+	doc? ( dev-tex/hevea )
+	sys-apps/grep
+	sys-apps/sed
+	!app-text/sukija"
+RDEPEND="sci-misc/malaga
+	!app-text/sukija"
+
+src_compile() {
+	einfo "Making only voikko, sukija is broken for gentoo in ${PV}"
+	emake voikko || die "emake failed"
+}
+
+
+src_install() {
+	emake DESTDIR="${D}"/usr/lib/suomi-malaga voikko-install || die "install failed"
+	dodoc ChangeLog LUE.MINUT README
+}
+