Major cleanup of old and missing packages.

svn path=/; revision=14
author: Flammie Pirinen <flammie@gentoo.org> 2007-05-15 02:26:34 +0000
committer: Flammie Pirinen <flammie@gentoo.org> 2007-05-15 02:26:34 +0000
commit: fb47f725ba1d8f3b91a4cbd9c3bbf67e91444d64 (patch)
tree: d0bdf4c5d6f8bc586f7c4d9387c88d9ac6332ea9 /trunk
parent: Suomi-malaga updated and cleaned (diff)
download: finnish-fb47f725ba1d8f3b91a4cbd9c3bbf67e91444d64.tar.gz
finnish-fb47f725ba1d8f3b91a4cbd9c3bbf67e91444d64.tar.bz2
finnish-fb47f725ba1d8f3b91a4cbd9c3bbf67e91444d64.zip
51 files changed, 265 insertions, 1181 deletions
diff --git a/trunk/app-accessibility/suopuhe/Manifest b/trunk/app-accessibility/suopuhe/Manifest
index 2906091..742f7c9 100644
--- a/trunk/app-accessibility/suopuhe/Manifest
+++ b/trunk/app-accessibility/suopuhe/Manifest
@@ -1,18 +1,10 @@
 DIST hy_fi_mv_diphone-20041119.tgz 3670516 RMD160 0a0d9c8e9600e5a431c3b11bb812038c81f47292 SHA1 8df7993693a054f4ed72223b236c9f32265f1c67 SHA256 6d1e93cdf6c40fe15615e0d31edbe21198cf8e5c8f1cd734a09719843e80b988
 DIST lavennin-20041119.tgz 172438 RMD160 e7381c6c07e77c056589a5051dcf1c5e84a8c62f SHA1 56739f9a51bb6996f6c4598d156fe0662ee89f14 SHA256 db47f99c85f3c46ca4598365b6e0885b6f1407460d4e7e355d3b09f865ba451f
 DIST suo_fi_lj-1.0g-20051204.tgz 5928158 RMD160 61fd8ffa82644f815300c25affd1a408083040dd SHA1 3939c1d9b9f015e0d7a8d40ac5a29f2658c46653 SHA256 d9c4dbbb8f1701dc5a0ef99b4aa1317266873e49b6b97163590abade952f8588
-EBUILD suopuhe-20041119.ebuild 1271 RMD160 2c36f2dcee1e9d64491758f98606125dafa2c07c SHA1 8365adf718304376590bb36d484eecb2bc9a620b SHA256 501d7180ed0e1257237d477c78a71792012c3eccdcc9e30b9e69931ae2accc78
-MD5 9128aee8c2cea4555af478ed359bada9 suopuhe-20041119.ebuild 1271
-RMD160 2c36f2dcee1e9d64491758f98606125dafa2c07c suopuhe-20041119.ebuild 1271
-SHA256 501d7180ed0e1257237d477c78a71792012c3eccdcc9e30b9e69931ae2accc78 suopuhe-20041119.ebuild 1271
-MISC .suopuhe-20041119.ebuild.swo 12288 RMD160 542a0a333ec50387d0cc79932eb5f6f01f37165f SHA1 efb434f347789710c0278aba86bd41c3de84f8f6 SHA256 44cba438efe441cb0bd255ba0de6c3b6538f01f1fc9b5a9c74ddab8a591cdb90
-MD5 f30768a2e0e6910a757025b7fa03ef3a .suopuhe-20041119.ebuild.swo 12288
-RMD160 542a0a333ec50387d0cc79932eb5f6f01f37165f .suopuhe-20041119.ebuild.swo 12288
-SHA256 44cba438efe441cb0bd255ba0de6c3b6538f01f1fc9b5a9c74ddab8a591cdb90 .suopuhe-20041119.ebuild.swo 12288
-MISC .suopuhe-20041119.ebuild.swp 12288 RMD160 de0f3179c6685ec5495d9fe032773fbe50d9a4a8 SHA1 ab3a183b93d3af67fca9131fed855948102251eb SHA256 69597b588b629fd104155accb6d248ee6a343d2f5d1cdea6e3fcf550a7374e0a
-MD5 1287e853d90a8f837bef0f95a32e05e4 .suopuhe-20041119.ebuild.swp 12288
-RMD160 de0f3179c6685ec5495d9fe032773fbe50d9a4a8 .suopuhe-20041119.ebuild.swp 12288
-SHA256 69597b588b629fd104155accb6d248ee6a343d2f5d1cdea6e3fcf550a7374e0a .suopuhe-20041119.ebuild.swp 12288
+EBUILD suopuhe-20041119.ebuild 1269 RMD160 06a9dcab80ca9afbf5f8801d2c26cb2b2751fe5d SHA1 8656f0d5badc2cb9f03f4cacb0a970850b0c0973 SHA256 0513196bfa3246140fb4629d526ec490feb97306f749043aaafd1b82e1c6093c
+MD5 3e60c9a2a30d257b25ecbf92393c47d4 suopuhe-20041119.ebuild 1269
+RMD160 06a9dcab80ca9afbf5f8801d2c26cb2b2751fe5d suopuhe-20041119.ebuild 1269
+SHA256 0513196bfa3246140fb4629d526ec490feb97306f749043aaafd1b82e1c6093c suopuhe-20041119.ebuild 1269
 MD5 2749f3a782e527aa0ea074b45f61f5ba files/digest-suopuhe-20041119 780
 RMD160 88e6528beefe395044a423a5bbe845704496b2b8 files/digest-suopuhe-20041119 780
 SHA256 3c7032a47fbd26027658ffc76dd9b60db6c0a276e87cdebb5b94859fbe0ad835 files/digest-suopuhe-20041119 780
diff --git a/trunk/app-accessibility/suopuhe/suopuhe-20041119.ebuild b/trunk/app-accessibility/suopuhe/suopuhe-20041119.ebuild
index 2d91b4d..87e6ac3 100644
--- a/trunk/app-accessibility/suopuhe/suopuhe-20041119.ebuild
+++ b/trunk/app-accessibility/suopuhe/suopuhe-20041119.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.ling.helsinki.fi/suopuhe/download/hy_fi_mv_diphone-${PV}.tgz
 	http://phon.joensuu.fi/suopuhe/tulosaineisto/suo_fi_lj-1.0g-20051204.tgz
 	http://www.ling.helsinki.fi/suopuhe/download/lavennin-${PV}.tgz"
 
-LICENSE="GPL-2.0 LGPL-2"
+LICENSE="GPL-2 LGPL-2"
 SLOT="0"
 KEYWORDS="~x86"
 IUSE=""
diff --git a/trunk/app-office/oo2-voikko/Manifest b/trunk/app-office/oo2-voikko/Manifest
deleted file mode 100644
index 2fdcde8..0000000
--- a/trunk/app-office/oo2-voikko/Manifest
+++ /dev/null
@@ -1,35 +0,0 @@
-AUX ooo-2.0-homedir.tar.bz2 9966 RMD160 75e687e207d60291d32f6accaa526c74984b073c SHA1 d1495be0eaa1ce1394417d21f3b9db526d17b89e SHA256 f5c716bf2bd2b31be84dcdcd2f7d05ca4df560dbbe7f1a4f1ceab645d69600a7
-MD5 5f0a3f813a9ab90831a938fdfbf0875d files/ooo-2.0-homedir.tar.bz2 9966
-RMD160 75e687e207d60291d32f6accaa526c74984b073c files/ooo-2.0-homedir.tar.bz2 9966
-SHA256 f5c716bf2bd2b31be84dcdcd2f7d05ca4df560dbbe7f1a4f1ceab645d69600a7 files/ooo-2.0-homedir.tar.bz2 9966
-AUX ooo-bootstrap-decoy.tar.bz2 9966 RMD160 75e687e207d60291d32f6accaa526c74984b073c SHA1 d1495be0eaa1ce1394417d21f3b9db526d17b89e SHA256 f5c716bf2bd2b31be84dcdcd2f7d05ca4df560dbbe7f1a4f1ceab645d69600a7
-MD5 5f0a3f813a9ab90831a938fdfbf0875d files/ooo-bootstrap-decoy.tar.bz2 9966
-RMD160 75e687e207d60291d32f6accaa526c74984b073c files/ooo-bootstrap-decoy.tar.bz2 9966
-SHA256 f5c716bf2bd2b31be84dcdcd2f7d05ca4df560dbbe7f1a4f1ceab645d69600a7 files/ooo-bootstrap-decoy.tar.bz2 9966
-DIST OOo_2.0.3_LinuxIntel_sdk.sh 39845497 RMD160 fec7a01c81540394928036cdd88cba3d0d8ba96b SHA1 9a3b70fcd8b4574b0e586f26be86ea320801fe7f SHA256 b6848815c674ac65b58b49a65a487c801d8ed763dd1f2d82b27f52995b103a13
-DIST oo2-voikko-1.0-bin.tar.bz2 48218 RMD160 b63361dc4475e7e63f265674ac3d4606c515491a SHA1 2735260cb6e4ba4c56a38c65f88e491a72be13e0 SHA256 80c6fa34aafc157a73c7c34f48fdaaea246ba4cac49917e44eaf0f5e4349db14
-DIST oo2-voikko-1.0.tar.gz 53606 RMD160 8ff217f60753b32aff5bd38eb9a9350a1b018926 SHA1 f0a0325314a2027f9759898503904516b88e505d SHA256 c7de5adc6f3f1acebf4e569c6fab81f215cd8ca60121975ba192a050e3f2e5dc
-DIST oo2-voikko-1.1.tar.gz 52682 RMD160 e5138b4143ff451fa69a69275bc280155169553f SHA1 0b538cc9cc75a052e890b0e883194a29528f6575 SHA256 2b70c1099615c67010b0705fb729e1dce506ec624032e9cd45bbecffb679f12b
-DIST oo2-voikko-Linux_x86-0.4.tar.gz 59897 RMD160 1bca11c65c3b5e30b1f62630f1ed6873d6a83cff SHA256 8ee89e263fbe21ddb00c5b955403f6f8d8a0d08081e4336a3acf7ffe0cce6525
-DIST oo2-voikko-Linux_x86_64-0.4.tar.gz 62432 RMD160 bc67e4d92edd82500d715dfb9f087b9aa48f1acf SHA256 57af03db9102e0dde973c7365a781d795b91b703b80dc7325f3332a96703d2c3
-EBUILD oo2-voikko-0.4.ebuild 3137 RMD160 ffb3fff38e8e057462161cbfe4893f655e059e7d SHA1 e2768b988e781b68e30b15751586d43b6c82b1b1 SHA256 70a92503d65b50a4634a6304c86168e55547d92940b1b1a6b817721402adb865
-MD5 09f66abc7c1b12dba687f20e4ef5b268 oo2-voikko-0.4.ebuild 3137
-RMD160 ffb3fff38e8e057462161cbfe4893f655e059e7d oo2-voikko-0.4.ebuild 3137
-SHA256 70a92503d65b50a4634a6304c86168e55547d92940b1b1a6b817721402adb865 oo2-voikko-0.4.ebuild 3137
-EBUILD oo2-voikko-1.0.ebuild 6975 RMD160 cf09802042a2e8a4b21de79596474ebb2e58c6f5 SHA1 617ff0b19795de711b69290e332faf877d6bcc7e SHA256 3336729137fa056e2a88a61efdbd982897eb0ed73168b20e1b388280165b48f2
-MD5 8582dd8799fc14eba7b14ebc0c19e8e7 oo2-voikko-1.0.ebuild 6975
-RMD160 cf09802042a2e8a4b21de79596474ebb2e58c6f5 oo2-voikko-1.0.ebuild 6975
-SHA256 3336729137fa056e2a88a61efdbd982897eb0ed73168b20e1b388280165b48f2 oo2-voikko-1.0.ebuild 6975
-EBUILD oo2-voikko-1.1.ebuild 4676 RMD160 f4b35d2d5971ccdfa8450e4cf86f26d8e8e4b02f SHA1 65a412e03027161fd94675083f1e0201ef1b82c7 SHA256 9b56203c02a69395579f5d1b193a687c15d4a294360d9fea71139ecd0e91e6a5
-MD5 6bd57a180ebeb81ff78d9a8c5a2e8555 oo2-voikko-1.1.ebuild 4676
-RMD160 f4b35d2d5971ccdfa8450e4cf86f26d8e8e4b02f oo2-voikko-1.1.ebuild 4676
-SHA256 9b56203c02a69395579f5d1b193a687c15d4a294360d9fea71139ecd0e91e6a5 oo2-voikko-1.1.ebuild 4676
-MD5 78ba08fe0ea43575ff29545795d326bd files/digest-oo2-voikko-0.4 551
-RMD160 ef5cf72c2446a0ff3f9119818d413eb2e8a1ae7c files/digest-oo2-voikko-0.4 551
-SHA256 0f1ff54301ce4479fe80c87c0bba5495efcaca9582784962fb4d4f0a7d8b7a83 files/digest-oo2-voikko-0.4 551
-MD5 d1285b0bc88949a62e2dadb037174abc files/digest-oo2-voikko-1.0 765
-RMD160 8f6acab60c7b1bb3e30a4a008a26150ff34e94cf files/digest-oo2-voikko-1.0 765
-SHA256 5d3b8c2c9661b0972a81399a206da06e6334491ff1b8db0eecaac926230fe33c files/digest-oo2-voikko-1.0 765
-MD5 67926811dffb31efd8c84c6c20408a90 files/digest-oo2-voikko-1.1 241
-RMD160 d523826df957ee33a09ce13dc1f41beea8a827d1 files/digest-oo2-voikko-1.1 241
-SHA256 079e95f5d837133bbd8f23217e37a2bebdcddd32e3ef5d76437b192520865a68 files/digest-oo2-voikko-1.1 241
diff --git a/trunk/app-office/oo2-voikko/files/digest-oo2-voikko-0.4 b/trunk/app-office/oo2-voikko/files/digest-oo2-voikko-0.4
deleted file mode 100644
index 1bdfe28..0000000
--- a/trunk/app-office/oo2-voikko/files/digest-oo2-voikko-0.4
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 9a037936fcdd80d6c08e5837aa649cab oo2-voikko-Linux_x86-0.4.tar.gz 59897
-RMD160 1bca11c65c3b5e30b1f62630f1ed6873d6a83cff oo2-voikko-Linux_x86-0.4.tar.gz 59897
-SHA256 8ee89e263fbe21ddb00c5b955403f6f8d8a0d08081e4336a3acf7ffe0cce6525 oo2-voikko-Linux_x86-0.4.tar.gz 59897
-MD5 a98928fe4a299662f17a25532c1e97a0 oo2-voikko-Linux_x86_64-0.4.tar.gz 62432
-RMD160 bc67e4d92edd82500d715dfb9f087b9aa48f1acf oo2-voikko-Linux_x86_64-0.4.tar.gz 62432
-SHA256 57af03db9102e0dde973c7365a781d795b91b703b80dc7325f3332a96703d2c3 oo2-voikko-Linux_x86_64-0.4.tar.gz 62432
diff --git a/trunk/app-office/oo2-voikko/files/digest-oo2-voikko-1.0 b/trunk/app-office/oo2-voikko/files/digest-oo2-voikko-1.0
deleted file mode 100644
index 0eb8eb7..0000000
--- a/trunk/app-office/oo2-voikko/files/digest-oo2-voikko-1.0
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 f35f397dac358a054cd425b2348f258c OOo_2.0.3_LinuxIntel_sdk.sh 39845497
-RMD160 fec7a01c81540394928036cdd88cba3d0d8ba96b OOo_2.0.3_LinuxIntel_sdk.sh 39845497
-SHA256 b6848815c674ac65b58b49a65a487c801d8ed763dd1f2d82b27f52995b103a13 OOo_2.0.3_LinuxIntel_sdk.sh 39845497
-MD5 66e09b62868c2114324e52b52b391b10 oo2-voikko-1.0-bin.tar.bz2 48218
-RMD160 b63361dc4475e7e63f265674ac3d4606c515491a oo2-voikko-1.0-bin.tar.bz2 48218
-SHA256 80c6fa34aafc157a73c7c34f48fdaaea246ba4cac49917e44eaf0f5e4349db14 oo2-voikko-1.0-bin.tar.bz2 48218
-MD5 4b98fdfa46f7df7a26498cd8f0800249 oo2-voikko-1.0.tar.gz 53606
-RMD160 8ff217f60753b32aff5bd38eb9a9350a1b018926 oo2-voikko-1.0.tar.gz 53606
-SHA256 c7de5adc6f3f1acebf4e569c6fab81f215cd8ca60121975ba192a050e3f2e5dc oo2-voikko-1.0.tar.gz 53606
diff --git a/trunk/app-office/oo2-voikko/files/digest-oo2-voikko-1.1 b/trunk/app-office/oo2-voikko/files/digest-oo2-voikko-1.1
deleted file mode 100644
index e0f5918..0000000
--- a/trunk/app-office/oo2-voikko/files/digest-oo2-voikko-1.1
+++ /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/oo2-voikko/files/ooo-2.0-homedir.tar.bz2 b/trunk/app-office/oo2-voikko/files/ooo-2.0-homedir.tar.bz2
deleted file mode 100644
index 5ca0d5d..0000000
--- a/trunk/app-office/oo2-voikko/files/ooo-2.0-homedir.tar.bz2
+++ /dev/null
diff --git a/trunk/app-office/oo2-voikko/files/ooo-bootstrap-decoy.tar.bz2 b/trunk/app-office/oo2-voikko/files/ooo-bootstrap-decoy.tar.bz2
deleted file mode 100644
index 5ca0d5d..0000000
--- a/trunk/app-office/oo2-voikko/files/ooo-bootstrap-decoy.tar.bz2
+++ /dev/null
diff --git a/trunk/app-office/oo2-voikko/oo2-voikko-0.4.ebuild b/trunk/app-office/oo2-voikko/oo2-voikko-0.4.ebuild
deleted file mode 100644
index 79cae10..0000000
--- a/trunk/app-office/oo2-voikko/oo2-voikko-0.4.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# copied from oo2-voikko.ebuild in
-# http://bugs.gentoo.org/attachment.cgi?id=73027
-# Original ebuild script wasn’t marked GPL?
-
-DESCRIPTION="Voikko—Free Finnish spell checking and hyphenation for OpenOffice"
-HOMEPAGE="http://www.hunspell-fi.org/"
-SRC_URI="
-x86? ( http://www.hunspell-fi.org/files/${PN}-Linux_x86-${PV}.tar.gz )
-amd64? ( http://www.hunspell-fi.org/files/${PN}-Linux_x86_64-${PV}.tar.gz )
-"
-#http://www.hunspell-fi.org/files/${P}.tgz
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~x86"
-
-DEPEND="|| ( >=app-office/openoffice-bin-2.0 >=app-office/openoffice-2.0 )
-	app-text/voikko
-	sys-apps/grep
-	sys-apps/sed"
-#  ! app-office/oo2-soikko
-RDEPEND="|| ( >=app-office/openoffice-bin-2.0 >=app-office/openoffice-2.0 )
-	app-text/voikko"
-# FIXME:
-if use amd64; then
-	S="${WORKDIR}/${PN}-Linux_x86_64-${PV}"
-else
-	S="${WORKDIR}/${PN}-Linux_x86-${PV}"
-fi
-									
-
-pkg_setup() {
-	if pidof soffice.bin >/dev/null; then
-		die "Soikko can't be installed while OpenOffice.org is running."
-		# Or use the force
-		#killall soffice.bin || killall -9 soffice.bin
-	fi
-	if use amd64; then
-		S="${WORKDIR}/${PN}-Linux_x86_64-${PV}"
-	else
-		S="${WORKDIR}/${PN}-Linux_x86-${PV}"
-	fi
-}
-
-src_install() {
-	dodoc ASENNUS.txt
-	insinto /usr/lib/openoffice/share/
-	doins install-oo2-voikko
-}
-
-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
-}
-
-pkg_postinst() {
-	find_unopkg
-
-	# select component
-	if use amd64; then
-		COMPONENT="${S}/oo2-voikko-Linux_x86_64-${PV}.uno.pkg"
-	else
-		COMPONENT="${S}/oo2-voikko-Linux_x86-${PV}.uno.pkg"
-	fi
-	PKG=$(basename "${COMPONENT}")
-
-	# verify binary interface
-	if grep -U -q CXXABI_1.3 "$UNOPKG".bin && echo "$COMPONENT" | grep -q gcc3.3
-	then
-		die "g++ ABI mismatch or such"
-	fi
-	
-	# 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
-	# use normal binary
-	# register()
-	if [[ "${COMPONENT}" == "" ]] ;
-	then
-		die "UNO component not found"
-	fi
-	einfo "Trying to register uno package ${COMPONENT}..."
-	if "${UNOPKG}" add --shared "${COMPONENT}" &>/dev/null ;
-	then
-		einfo "Voikko package (${PKG}) registered succesfully"
-	else
-		die "Couldn't register Voikko package (${PKG})"
-	fi
-
-}
-
-pkg_prerm() {
-	find_unopkg
-	#unregister()
-	UNOPKG_LIST="$(${UNOPKG} list --shared 2> /dev/null)"
-	if [[ $? != 0 ]] ; then
-		die "Couldn't list existing packages"
-	fi
-	PKG=$(echo "${UNOPKG_LIST}" | egrep -m1 "^Name: oo2-voikko-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 "Voikko package (${PKG}) unregistered succesfully"
-		else
-			die "Couldn't uninstall existing Voikko packages"
-		fi
-	else
-		ewarn "Couldn't find existing Voikko packages."
-		ewarn "You may need to unopkg remove them manually."
-	fi
-
-}
diff --git a/trunk/app-office/oo2-voikko/oo2-voikko-1.0.ebuild b/trunk/app-office/oo2-voikko/oo2-voikko-1.0.ebuild
deleted file mode 100644
index 7e5bfee..0000000
--- a/trunk/app-office/oo2-voikko/oo2-voikko-1.0.ebuild
+++ /dev/null
@@ -1,212 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit eutils
-
-OO_PATCHLEVEL="OOC680"
-OO_SRC="OOO_2_0_3"
-DESCRIPTION="Voikko—Free Finnish spell checking and hyphenation for OpenOffice"
-HOMEPAGE="http://www.lemi.fi/voikko/"
-IUSE="unobuild"
-SRC_URI="!unobuild? ( http://dev.gentoo.org/~flammie/${P}-bin.tar.bz2 )
-	unobuild? ( http://www.hunspell-fi.org/files/${P}.tar.gz
-	http://mirrors.dotsrc.org/openoffice/stable/2.0.3_sdk/OOo_2.0.3_LinuxIntel_sdk.sh )"
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~x86"
-
-DEPEND="|| ( >=app-office/openoffice-2 >=app-office/openoffice-bin-2 )
-	app-text/voikko
-	sys-apps/grep
-	sys-apps/sed
-	unobuild? ( app-arch/zip
-		|| ( app-arch/rpm2targz ) )"
-#  ! app-office/oo2-soikko"
-RDEPEND="|| ( >=app-office/openoffice-2 >=app-office/openoffice-bin-2 )
-	app-text/voikko"
-
-pkg_setup() {
-	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
-	fi
-#	if use unobuild ; 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_unpack() {
-	if use unobuild ; then
-		mkdir "${WORKDIR}/${OO_SRC}-SDK"
-		# From OOo...sdk.sh:
-		tail --lines=+88 "${DISTDIR}/OOo_2.0.3_LinuxIntel_sdk.sh" | \
-			(cd "${WORKDIR}/${OO_SRC}-SDK";	tar xf -)
-		assert
-		cd "${WORKDIR}/${OO_SRC}-SDK/RPMS"
-		rpm2targz openoffice.org-sdk-2.0.3-?.i586.rpm || \
-			die "Unable to unrpm SDK"
-		tar zxpf openoffice.org-sdk-2.0.3-?.i586.tar.gz || \
-			die "Unable to untar SDK"
-		cd "${WORKDIR}"
-		unpack ${P}.tar.gz
-	else
-		unpack ${P}-bin.tar.bz2
-	fi
-}
-
-src_compile() {
-	if use unobuild ; then
-		# From setsdkenvunix.sh:
-		OO_SDK_NAME=odk
-		OO_SDK_HOME="${WORKDIR}/${OO_SRC}-SDK/RPMS/opt/openoffice.org2.0_sdk/"
-		OFFICE_HOME="${ROOT}/usr/lib/openoffice/"
-		OO_SDK_URE_HOME="${ROOT}/usr/lib/openoffice/"
-		OO_SDK_MAKE_HOME="${ROOT}/usr/bin"
-		OO_SDK_ZIP_HOME="${ROOT}/usr/bin"
-		OO_SDK_CPP_HOME="${ROOT}/usr/bin"
-		# OO_SDK_JAVA_HOME="${ROOT}/opt/sun-jdk..."
-		OO_SDK_OUTPUT_DIR=`pwd`
-		SDK_AUTO_DEPLOYMENT=YES
-		OFFICE_PROGRAM_PATH=${OFFICE_HOME}/program
-		UNO_PATH=${OFFICE_PROGRAM_PATH}
-		OO_SDK_URE_BIN_DIR=${OFFICE_PROGRAM_PATH}
-	    OO_SDK_URE_LIB_DIR=${OFFICE_PROGRAM_PATH}
-	    OO_SDK_URE_JAVA_DIR=${OFFICE_PROGRAM_PATH}/classes
-		OO_EXAMPLE_OUT=$OO_SDK_OUTPUT_DIR/$OO_SDK_HOME
-		sd_platform=`${OO_SDK_HOME}/config.guess | cut -d"-" -f3,4`
-		#case $sd_platform in
-		# linux-gnu)
-		SDK_GXX_INCLUDE_PATH=`echo "#include <cstring>" | $OO_SDK_CPP_HOME/g++ -E -xc++ - | sed -n '/.*1*"\(.*\)\/cstring".*/s//\1/p' | head -n 1`
-		directoryname=linux
-	    comid=gcc3
-	    pltfrm=gcc
-	    soext=so
-	    exampleout=LINUXexample.out
-	    platform=Linux
-	    LD_LIBRARY_PATH=$OO_SDK_HOME/$directoryname/lib:$OO_EXAMPLE_OUT/$exampleout/lib:${OO_SDK_URE_LIB_DIR}:.:$LD_LIBRARY_PATH
-		# esac
-		PATH=$OO_SDK_HOME/$directoryname/bin:$OO_EXAMPLE_OUT/$exampleout/bin:${OO_SDK_URE_BIN_DIR}:.:$PATH
-		CLASSPATH=${OO_SDK_URE_JAVA_DIR}/juh.jar:${OO_SDK_URE_JAVA_DIR}/jurt.jar:${OO_SDK_URE_JAVA_DIR}/ridl.jar:${OO_SDK_URE_JAVA_DIR}/unoloader.jar${OFFICE_PROGRAM_PATH+:${OFFICE_PROGRAM_PATH}/classes/unoil.jar}${CLASSPATH+:${CLASSPATH}}
-		PATH=$OO_SDK_MAKE_HOME:$PATH
-		PATH=$OO_SDK_ZIP_HOME:$PATH
-		PATH=$OO_SDK_CPP_HOME:$PATH
-		PATH=$OO_SDK_JAVA_HOME/bin:$PATH
-		echo " * SDK environment is prepared for ${platform}"      
-		echo " *"                                                  
-		echo " * SDK = $OO_SDK_HOME"
-		echo " * Office = $OFFICE_HOME"
-		echo " * URE = $OO_SDK_URE_HOME"
-		echo " * Make = $OO_SDK_MAKE_HOME"
-		echo " * Zip = $OO_SDK_ZIP_HOME"
-		echo " * C++ Compiler = $OO_SDK_CPP_HOME"
-		echo " * Java = $OO_SDK_JAVA_HOME"
-		echo " * Special Output directory = $OO_SDK_OUTPUT_DIR"
-		echo " * Auto deployment = $SDK_AUTO_DEPLOYMENT"
-		cd "${WORKDIR}/unopkg"
-		# 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_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 "${WORKDIR}/${P}"
-		cp build/oo2-voikko-*uno.pkg impl/doc/Linux_*/ASENNUS.txt \
-			linux-installer "${WORKDIR}/${P}"
-	fi
-}
-
-src_install() {
-	dodoc ASENNUS.txt
-	insinto /usr/lib/openoffice/share/
-	doins linux-installer
-	dodir /usr/lib/${P}
-	insinto /usr/lib/${P}
-	if use amd64 ; then
-		doins oo2-voikko-Linux_x86_64-${PV}.uno.pkg	
-	else
-		doins oo2-voikko-Linux_x86-${PV}.uno.pkg
-	fi
-}
-
-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
-}
-
-pkg_postinst() {
-	# N.B.: uno packages meddle with $HOME, let's fool it
-	HOME="${S}"
-	find_unopkg
-
-	# select component
-	if use amd64; then
-		COMPONENT="${ROOT}/usr/lib/${P}/oo2-voikko-Linux_x86_64-${PV}.uno.pkg"
-	else
-		COMPONENT="${ROOT}/usr/lib/${P}/oo2-voikko-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}..."
-	"${UNOPKG}" add --shared "${COMPONENT}"
-	if [[ $? == 0 ]] ; 
-	then
-		einfo "Voikko package (${PKG}) registered succesfully"
-	else
-		die "Couldn't register Voikko package (${PKG})"
-	fi
-	elog "Please note that oo2-voikko 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 oo2-voikko!"
-}
-
-pkg_prerm() {
-	find_unopkg
-	#unregister()
-	UNOPKG_LIST="$(${UNOPKG} list --shared 2> /dev/null)"
-	if [[ $? != 0 ]] ; then
-		die "Couldn't list existing packages"
-	fi
-	PKG=$(echo "${UNOPKG_LIST}" | egrep -m1 "^Name: oo2-voikko-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 "Voikko package (${PKG}) unregistered succesfully"
-		else
-			die "Couldn't uninstall existing Voikko packages"
-		fi
-	else
-		ewarn "Couldn't find existing Voikko packages."
-		ewarn "You may need to unopkg remove them manually."
-	fi
-}
diff --git a/trunk/app-office/oo2-voikko/oo2-voikko-1.1.ebuild b/trunk/app-office/oo2-voikko/oo2-voikko-1.1.ebuild
deleted file mode 100644
index 28ee72a..0000000
--- a/trunk/app-office/oo2-voikko/oo2-voikko-1.1.ebuild
+++ /dev/null
@@ -1,153 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit eutils versionator
-
-OO_PATCHLEVEL="OOC680"
-OO_SRC="OOO_2_0_3"
-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"
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~x86"
-
-DEPEND="|| ( >=app-office/openoffice-2 >=app-office/openoffice-bin-2 )
-	app-text/voikko
-	sys-apps/grep
-	sys-apps/sed
-	app-office/openoffice-sdk
-	!app-office/openoffice-voikko"
-#  ! app-office/oo2-soikko"
-RDEPEND="|| ( >=app-office/openoffice-2 >=app-office/openoffice-bin-2 )
-	app-text/voikko"
-
-pkg_setup() {
-	ewarn "oo2-voikko is deprecated in favor of openoffice-voikko"
-	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
-	fi
-	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
-
-	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() {
-	source ${ROOT}/usr/lib/openoffice/program/setsdkenv_unix.sh
-	echo "OO_SDK_HOME=${OO_SDK_HOME}"
-	cd "${WORKDIR}/unopkg"
-		# 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/oo2-voikko-*uno.pkg impl/doc/Linux_*/ASENNUS.txt \
-		linux-installer "${S}"
-}
-
-src_install() {
-	cd "${S}"
-	dodoc ASENNUS.txt
-	insinto /usr/lib/openoffice/share/
-	doins linux-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
-}
-
-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-bootstrap-decoy.tar.bz2" 
-
-	find_unopkg
-
-	# select component
-	if use amd64; then
-		COMPONENT="${ROOT}/usr/lib/${P}/oo2-voikko-Linux_x86_64-${PV}.uno.pkg"
-	else
-		COMPONENT="${ROOT}/usr/lib/${P}/oo2-voikko-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 Voikko package (${PKG})"
-	fi
-	elog "Please note that oo2-voikko 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 oo2-voikko!"
-}
-
-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: oo2-voikko-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 "Voikko package (${PKG}) unregistered succesfully"
-		else
-			die "Couldn't uninstall existing Voikko packages"
-		fi
-	else
-		ewarn "Couldn't find existing Voikko packages."
-		ewarn "You may need to unopkg remove them manually."
-	fi
-}
diff --git a/trunk/app-office/openoffice-sdk/Manifest b/trunk/app-office/openoffice-sdk/Manifest
index e70342e..518026e 100644
--- a/trunk/app-office/openoffice-sdk/Manifest
+++ b/trunk/app-office/openoffice-sdk/Manifest
@@ -6,23 +6,12 @@ AUX setsdkenv_unix.sh.gentoo 9221 RMD160 c4950444f0a8d4fd681bf8086b2d1ca9b83ebfd
 MD5 7eb1daa44a793066d81dc539a82f0335 files/setsdkenv_unix.sh.gentoo 9221
 RMD160 c4950444f0a8d4fd681bf8086b2d1ca9b83ebfd5 files/setsdkenv_unix.sh.gentoo 9221
 SHA256 8f8db808429c6a628c46c2d46c504176b4500bd630233b8f41679be685aefab2 files/setsdkenv_unix.sh.gentoo 9221
-DIST OOo-SDK_2.0_linux_install_en-US.sh 40101497 RMD160 0d7a8480d0c377ee79fd91b650eeef36bd1659b8 SHA1 67b409e16b525aa34f8111bca267791e54dac92c SHA256 e1037ceebccad2ba28c3c7354e1f84da441caad7dca75400c0050b9d8bbf4752
 DIST OOo-SDK_2.2.0_LinuxIntel_install.sh 39067264 RMD160 63428dcc33497b147033113d21844e7f62659d94 SHA1 2f34c8322bb6fd95b3521cde34f63bb13d5ff937 SHA256 8e043e408307a146ea7c9fa8047f22c36ed2be36065224705dc1e6beab49d8e4
-EBUILD openoffice-sdk-2.1.0.ebuild 2796 RMD160 cfd3cfd9c58e6727869edd541823225144081669 SHA1 ee194259369fa216681e91ff3eb97306ce5a8556 SHA256 74873ddf409cd7bfff706d71bd5db453b6c2669878e268b9182c27b70ca23fb6
-MD5 b3e97be32ab032579a3abe37632db6dc openoffice-sdk-2.1.0.ebuild 2796
-RMD160 cfd3cfd9c58e6727869edd541823225144081669 openoffice-sdk-2.1.0.ebuild 2796
-SHA256 74873ddf409cd7bfff706d71bd5db453b6c2669878e268b9182c27b70ca23fb6 openoffice-sdk-2.1.0.ebuild 2796
-EBUILD openoffice-sdk-2.2.0.ebuild 2793 RMD160 036cdc05e7b7c6099dd4f58979259f681e9184d0 SHA1 3a57bc4c115a4c63f13fb71152a62bbde97cadfd SHA256 4c43162cc745a8bba833431fe5304493083e4c438e1dcaa60f94c126a3f2d86a
-MD5 525cae60403c43e909915a1d0c8e18a8 openoffice-sdk-2.2.0.ebuild 2793
-RMD160 036cdc05e7b7c6099dd4f58979259f681e9184d0 openoffice-sdk-2.2.0.ebuild 2793
-SHA256 4c43162cc745a8bba833431fe5304493083e4c438e1dcaa60f94c126a3f2d86a openoffice-sdk-2.2.0.ebuild 2793
-MISC .openoffice-sdk-2.2.0.ebuild.swp 12288 RMD160 7f4568f13bdd6a1e4945c993e960b84621c188be SHA1 0be882d9df89988a4fe4d7404308ecaf9e987885 SHA256 8b4d2ed628de6edba2f72a337a5fc77100c4ee7fdf0007a1bea5ffcfc0a90679
-MD5 fc818919ea0b7919bc79e1a1703ad81e .openoffice-sdk-2.2.0.ebuild.swp 12288
-RMD160 7f4568f13bdd6a1e4945c993e960b84621c188be .openoffice-sdk-2.2.0.ebuild.swp 12288
-SHA256 8b4d2ed628de6edba2f72a337a5fc77100c4ee7fdf0007a1bea5ffcfc0a90679 .openoffice-sdk-2.2.0.ebuild.swp 12288
-MD5 69f107677b4b2deecdbbb0c46adc17d4 files/digest-openoffice-sdk-2.1.0 289
-RMD160 ce89f6da3d9a3df35e91512439439e9f9d93ade7 files/digest-openoffice-sdk-2.1.0 289
-SHA256 4fb7efa55d28a9344da4d363af460548fe3ca5849271516659fb970d234c5d44 files/digest-openoffice-sdk-2.1.0 289
-MD5 a3583a06f22a8c61c04237dbab4b634f files/digest-openoffice-sdk-2.2.0 292
-RMD160 6e413de24154f90edf8bc3ccd2692643063bfdde files/digest-openoffice-sdk-2.2.0 292
-SHA256 d94bb04797daae00882da7d320205d9112e2fb824e37cb37d3b8bdc98ec74f33 files/digest-openoffice-sdk-2.2.0 292
+DIST openoffice.org-core-2.2.0-14.6.i386.rpm 77436780 RMD160 7931f26b903d0a8cf21ab6ccf2c83c0a305eb217 SHA1 c6b84b00b6b2edad65f75b0300f9c48df6516598 SHA256 24b5635397999bed84817d9df3924a680840a885980aecda86d518370fd79a59
+EBUILD openoffice-sdk-2.2.0.ebuild 3873 RMD160 3dd82512f8ac0abb9c0a6f85083448247bc58be9 SHA1 38bf434354dcb0001096fe3f31bc99757cc74f84 SHA256 f3375947c0df0a3fd4ceb29cebb6ba75e5580f3359940e1f44d65d2efe6d7a49
+MD5 656b4e3ef14196320bd112912130da7e openoffice-sdk-2.2.0.ebuild 3873
+RMD160 3dd82512f8ac0abb9c0a6f85083448247bc58be9 openoffice-sdk-2.2.0.ebuild 3873
+SHA256 f3375947c0df0a3fd4ceb29cebb6ba75e5580f3359940e1f44d65d2efe6d7a49 openoffice-sdk-2.2.0.ebuild 3873
+MD5 9e0078a1172acdf3833a7d95c38b748a files/digest-openoffice-sdk-2.2.0 596
+RMD160 724ac310f9c644885056167c53844cfb27963996 files/digest-openoffice-sdk-2.2.0 596
+SHA256 3a7e8a15f606844e469536ff13ca6e0cfb674e34155055b9292890e17cee73d0 files/digest-openoffice-sdk-2.2.0 596
diff --git a/trunk/app-office/openoffice-sdk/files/digest-openoffice-sdk-2.1.0 b/trunk/app-office/openoffice-sdk/files/digest-openoffice-sdk-2.1.0
deleted file mode 100644
index ae80502..0000000
--- a/trunk/app-office/openoffice-sdk/files/digest-openoffice-sdk-2.1.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 ab1e16c666e7063a2c94c430320c7b2a OOo-SDK_2.0_linux_install_en-US.sh 40101497
-RMD160 0d7a8480d0c377ee79fd91b650eeef36bd1659b8 OOo-SDK_2.0_linux_install_en-US.sh 40101497
-SHA256 e1037ceebccad2ba28c3c7354e1f84da441caad7dca75400c0050b9d8bbf4752 OOo-SDK_2.0_linux_install_en-US.sh 40101497
diff --git a/trunk/app-office/openoffice-sdk/files/digest-openoffice-sdk-2.2.0 b/trunk/app-office/openoffice-sdk/files/digest-openoffice-sdk-2.2.0
index ea1fc23..4064b89 100644
--- a/trunk/app-office/openoffice-sdk/files/digest-openoffice-sdk-2.2.0
+++ b/trunk/app-office/openoffice-sdk/files/digest-openoffice-sdk-2.2.0
@@ -1,3 +1,6 @@
 MD5 f0ea9de588f1b7c9f7a5f9e3f9b51a99 OOo-SDK_2.2.0_LinuxIntel_install.sh 39067264
 RMD160 63428dcc33497b147033113d21844e7f62659d94 OOo-SDK_2.2.0_LinuxIntel_install.sh 39067264
 SHA256 8e043e408307a146ea7c9fa8047f22c36ed2be36065224705dc1e6beab49d8e4 OOo-SDK_2.2.0_LinuxIntel_install.sh 39067264
+MD5 31bb3a880bdc95856a4abece95fd02ae openoffice.org-core-2.2.0-14.6.i386.rpm 77436780
+RMD160 7931f26b903d0a8cf21ab6ccf2c83c0a305eb217 openoffice.org-core-2.2.0-14.6.i386.rpm 77436780
+SHA256 24b5635397999bed84817d9df3924a680840a885980aecda86d518370fd79a59 openoffice.org-core-2.2.0-14.6.i386.rpm 77436780
diff --git a/trunk/app-office/openoffice-sdk/openoffice-sdk-2.1.0.ebuild b/trunk/app-office/openoffice-sdk/openoffice-sdk-2.1.0.ebuild
deleted file mode 100644
index 7ee83f6..0000000
--- a/trunk/app-office/openoffice-sdk/openoffice-sdk-2.1.0.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit java-pkg-opt-2
-
-OOI_SCRIPT="OOo-SDK_2.0_linux_install_en-US.sh"
-DESCRIPTION="Software Development Kit addition to OpenOffice.Org"
-HOMEPAGE="http://download.openoffice.org/2.0.3/sdk.html"
-SRC_URI="http://mirrors.dotsrc.org/openoffice/stable/${PV}_sdk/${OOI_SCRIPT}"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~x86"
-
-DEPEND="|| ( >app-office/openoffice-2 >app-office/openoffice-bin-2 )
-	sys-apps/sed
-	>app-arch/zip-2.3
-	|| ( app-arch/rpm2targz )
-	"
-RDEPEND="|| ( >app-office/openoffice-2 >app-office/openoffice-bin-2 )
-	>app-arch/zip-2.3
-	"
-
-src_unpack() {
-	mkdir "${S}"
-	cd "${S}"
-	# check line number from sh on update
-	tail --lines=+88 "${DISTDIR}/${OOI_SCRIPT}" | tar xf -
-	assert
-	cd RPMS
-	rpm2targz openoffice.org-sdk-${PV}-?.i586.rpm || \
-		die "Unable to unrpm"
-	tar zxpf openoffice.org-sdk-${PV}-?.i586.tar.gz || \
-		die "Unable to untar"
-	cd opt/openoffice.org2.0_sdk
-	sed	-e "s:@OO_SDK_HOME@:${ROOT}/usr/lib/openoffice:g" \
-		-e "s:@OFFICE_HOME@:${ROOT}/usr/lib/openoffice:g" \
-		-e "s:@OO_SDK_ZIP_HOME@:${ROOT}/usr/bin:g" \
-		-e "s:@OO_SDK_CPP_HOME@:${ROOT}/usr/bin:g" \
-		-e "s:@OO_SDK_MAKE_HOME@:${ROOT}/usr/bin:g" \
-		-e "s:@OO_SDK_JAVA_HOME@:${JAVA_HOME}:g" \
-		-e "s:/usr/share/automake:${ROOT}/usr/share/automake:g" \
-		"${FILESDIR}/setsdkenv_unix.sh.gentoo" > setsdkenv_unix.sh
-	sed -e "s:@OO_SDK_HOME@:${ROOT}/usr/lib/openoffice:g" \
-		-e "s:@OFFICE_HOME@:${ROOT}/usr/lib/openoffice:g" \
-		-e "s:@OO_SDK_ZIP_HOME@:${ROOT}/usr/bin:g" \
-		-e "s:@OO_SDK_CPP_HOME@:${ROOT}/usr/bin:g" \
-		-e "s:@OO_SDK_MAKE_HOME@:${ROOT}/usr/bin:g" \
-		-e "s:@OO_SDK_JAVA_HOME@:${JAVA_HOME}:g" \
-		-e "s:/usr/share/automake:${ROOT}/usr/share/automake:g" \
-		"${FILESDIR}/setsdkenv_unix.csh.gentoo" > setsdkenv_unix.csh
-}
-
-src_install() {
-	# tools, examples & api docs
-	dodir /usr/lib/openoffice
-	insinto /usr/lib/openoffice
-	cd "${S}/RPMS/opt/openoffice.org2.0_sdk/"
-	doins -r classes examples idl linux settings xml include
-	doins config.*
-	for f in config.* linux/bin/* ; do
-		fperms a+x /usr/lib/openoffice/${f} || die "fperms failed"
-	done
-
-	# docs 
-	dodoc index.html README{,.html}
-	dodir /usr/share/doc/${PF}
-	insinto /usr/share/doc/${PF}
-	doins -r docs
-
-	# SDK env.
-	insinto /usr/lib/openoffice/program/
-	doins setsdkenv_unix* configure.pl
-	for f in setsdkenv_unix{,.sh,.csh} ; do
-		fperms a+x /usr/lib/openoffice/program/${f} || die "fperms failed"
-	done
-}
-
-pkg_postinst() {
-	elog "SDK environment variable setup scripts were installed in: "
-	elog "	${ROOT}/usr/lib/openoffice/program"
-	elog "Please note that this ugly kludge of package is only used until "
-	elog "	http://bugs.gentoo.org/show_bug.cgi?id=151798"
-	elog "has been resolved by kind openoffice team"
-}
diff --git a/trunk/app-office/openoffice-sdk/openoffice-sdk-2.2.0.ebuild b/trunk/app-office/openoffice-sdk/openoffice-sdk-2.2.0.ebuild
index c19493d..c627ac2 100644
--- a/trunk/app-office/openoffice-sdk/openoffice-sdk-2.2.0.ebuild
+++ b/trunk/app-office/openoffice-sdk/openoffice-sdk-2.2.0.ebuild
@@ -5,20 +5,37 @@
 inherit java-pkg-opt-2
 
 OOI_SCRIPT="OOo-SDK_2.2.0_LinuxIntel_install.sh"
-DESCRIPTION="Software Development Kit addition to OpenOffice.Org"
+DESCRIPTION="OO.o SDK and other binaries missing from Gentoo’s OO.o"
 HOMEPAGE="http://download.openoffice.org/2.2.0/sdk.html"
-SRC_URI="http://mirrors.dotsrc.org/openoffice/stable/${PV}/${OOI_SCRIPT}"
+SRC_URI="http://mirrors.dotsrc.org/openoffice/stable/${PV}/${OOI_SCRIPT}
+ftp://rpmfind.net/linux/fedora/core/development/i386/os/Fedora/openoffice.org-core-${PV}-14.6.i386.rpm
+"
 
-LICENSE="LGPL-2.1"
+LICENSE="LGPL-2"
 SLOT="0"
 KEYWORDS="~x86"
 
-DEPEND="|| ( >app-office/openoffice-2 >app-office/openoffice-bin-2 )
+QA_EXECSTACK="usr/lib/openoffice/linux/bin/idlcpp
+usr/lib/openoffice/linux/bin/regcomp.bin
+usr/lib/openoffice/linux/bin/cppumaker
+usr/lib/openoffice/linux/bin/idlc
+usr/lib/openoffice/linux/bin/regcompare
+usr/lib/openoffice/linux/bin/regview
+usr/lib/openoffice/linux/bin/uno-skeletonmaker
+usr/lib/openoffice/linux/bin/rdbmaker
+usr/lib/openoffice/linux/bin/javamaker
+usr/lib/openoffice/linux/bin/xml2cmp
+usr/lib/openoffice/linux/bin/sp2bv
+usr/lib/openoffice/linux/bin/unoapploader
+usr/lib/openoffice/linux/bin/regmerge
+usr/lib/openoffice/linux/bin/autodoc" #dodgybinarieswithexecstacks,meh
+
+DEPEND="|| ( =app-office/openoffice-2.2* =app-office/openoffice-bin-2.2* )
 	sys-apps/sed
 	>app-arch/zip-2.3
 	|| ( app-arch/rpm2targz )
 	"
-RDEPEND="|| ( >app-office/openoffice-2 >app-office/openoffice-bin-2 )
+RDEPEND="|| ( =app-office/openoffice-2.2* =app-office/openoffice-bin-2.2* )
 	>app-arch/zip-2.3
 	"
 
@@ -50,6 +67,10 @@ src_unpack() {
 		-e "s:@OO_SDK_JAVA_HOME@:${JAVA_HOME}:g" \
 		-e "s:/usr/share/automake:${ROOT}/usr/share/automake:g" \
 		"${FILESDIR}/setsdkenv_unix.csh.gentoo" > setsdkenv_unix.csh
+	cd "${S}"
+	rpm2targz "${DISTDIR}/openoffice.org-core*rpm" || \
+		die "unable to unrpm"
+	tar zxpf openoffice.org-cor*tar.gz || die "unable to untar"
 }
 
 src_install() {
@@ -75,6 +96,10 @@ src_install() {
 	for f in setsdkenv_unix{,.sh,.csh} ; do
 		fperms a+x /usr/lib/openoffice/program/${f} || die "fperms failed"
 	done
+	# Patching missing libstlport_gcc
+	cd "${S}"
+	doins usr/lib/openoffice.org/program/libstlport_gcc.so || die \
+		"installing libstrlport_gcc.so failed"
 }
 
 pkg_postinst() {
@@ -83,5 +108,6 @@ pkg_postinst() {
 	elog "Please note that this ugly kludge of package is only used until "
 	elog "	http://bugs.gentoo.org/show_bug.cgi?id=151798"
 	elog "has been resolved by kind openoffice team"
+	ewarn "The binaries here only work every once in a blue moon, sorry!"
 }
 
diff --git a/trunk/app-office/openoffice-voikko/Manifest b/trunk/app-office/openoffice-voikko/Manifest
index 007036c..96109c6 100644
--- a/trunk/app-office/openoffice-voikko/Manifest
+++ b/trunk/app-office/openoffice-voikko/Manifest
@@ -8,6 +8,7 @@ RMD160 03f7cf433424fd600c84ffc9bc5b1095757abaae files/openoffice-voikko-1.1-r1-s
 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.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
@@ -16,6 +17,10 @@ EBUILD openoffice-voikko-1.2.ebuild 4504 RMD160 fd940e2b82c87702d1f7cb35481b4751
 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.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-9999.ebuild 4666 RMD160 25615225c2bb4d24f596f3014d965fb204b0a76f SHA1 0faec1eef70651d28ad7c6ef57d7100ea7b5f216 SHA256 720fb105aeaf80289d58884854e7b91eb77592a81c8910d875a1dd092e501ab6
 MD5 b3e2f74dfb8a9fc595318754c54a5b8d openoffice-voikko-9999.ebuild 4666
 RMD160 25615225c2bb4d24f596f3014d965fb204b0a76f openoffice-voikko-9999.ebuild 4666
@@ -26,6 +31,9 @@ SHA256 079e95f5d837133bbd8f23217e37a2bebdcddd32e3ef5d76437b192520865a68 files/di
 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 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.0 b/trunk/app-office/openoffice-voikko/files/digest-openoffice-voikko-2.0
new file mode 100644
index 0000000..5593cde
--- /dev/null
+++ b/trunk/app-office/openoffice-voikko/files/digest-openoffice-voikko-2.0
@@ -0,0 +1,3 @@
+MD5 9ed5bb6bbfe5a984ec9c81e0bf20e115 openoffice.org-voikko-2.0.tar.gz 17181
+RMD160 25bc54b95caf8fbb8c087027d5a498331f451023 openoffice.org-voikko-2.0.tar.gz 17181
+SHA256 f2cfc72bad3de02e1c7df0542cf7cfb139a75dd95c929e4ac0f5a69bea125951 openoffice.org-voikko-2.0.tar.gz 17181
diff --git a/trunk/app-office/openoffice-voikko/openoffice-voikko-2.0.ebuild b/trunk/app-office/openoffice-voikko/openoffice-voikko-2.0.ebuild
new file mode 100644
index 0000000..e7ebaa8
--- /dev/null
+++ b/trunk/app-office/openoffice-voikko/openoffice-voikko-2.0.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_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-text/ispell/Manifest b/trunk/app-text/ispell/Manifest
index a3974e2..f6abef6 100644
--- a/trunk/app-text/ispell/Manifest
+++ b/trunk/app-text/ispell/Manifest
@@ -8,14 +8,10 @@ RMD160 9953b4d51e71d52378528960d4677ff9054bff13 files/local.h.gentoo 6015
 SHA256 f919ac4220a7f7859e89141eb62eb7c4eca092a9be0f55a660ba61f697a8770d files/local.h.gentoo 6015
 DIST ispell-3.2.06-r6-gentoo-0.1.diff.bz2 8787 RMD160 d821b99da52ed9d326d653d0bf01b277c30c18ab SHA1 46472cdb0d59efea3dc438fd098d6de7345ce9b5 SHA256 e577e996cb465222ae3c12f53e0a712d97a1c5f3786eaab51d28769f3a9af114
 DIST ispell-3.2.06.tar.gz 580742 RMD160 3f6a3840540ebc753146c427da8ce2d54317b46e SHA1 35f496322cda172d56610417e4e1c7b962f734d7 SHA256 34a27fc4a2089bd5074aacf69323731770e5b605a2fc9a053d389f45b01c7966
-EBUILD ispell-3.2.06-r7.ebuild 2940 RMD160 66d5ca89054ee85e653aab1e901813d14b8de8b8 SHA1 796be0ebcc57b92c5867c802bd22250de210f6af SHA256 8eea1f5851b8befaa234bcca2594d9863526f9733d5f4e3bcd2311f2c5032172
-MD5 2c54413f8f793a3586b012e1d02210df ispell-3.2.06-r7.ebuild 2940
-RMD160 66d5ca89054ee85e653aab1e901813d14b8de8b8 ispell-3.2.06-r7.ebuild 2940
-SHA256 8eea1f5851b8befaa234bcca2594d9863526f9733d5f4e3bcd2311f2c5032172 ispell-3.2.06-r7.ebuild 2940
-MISC .ispell-3.2.06-r7.ebuild.swp 12288 RMD160 f22523e5b3819ed8a7341a67fbfedfd85b117f5e SHA1 71050730e06dbb70e931ff4e4d8e7b482c82b435 SHA256 cee8e6f4435aff3770fec6bb38cc46d0794fdde3f8be6b89954a715603bd0a2a
-MD5 846b6a74b2a153a7c824a5428e884d30 .ispell-3.2.06-r7.ebuild.swp 12288
-RMD160 f22523e5b3819ed8a7341a67fbfedfd85b117f5e .ispell-3.2.06-r7.ebuild.swp 12288
-SHA256 cee8e6f4435aff3770fec6bb38cc46d0794fdde3f8be6b89954a715603bd0a2a .ispell-3.2.06-r7.ebuild.swp 12288
+EBUILD ispell-3.2.06-r7.ebuild 2937 RMD160 7040d04c3c2288034eb482fe24a4a9bd36388f88 SHA1 6874bfcada2762793abf9db69cc76fbf7da4530b SHA256 bf233d1323683952f27f3b6fdb021e82181bc5a26c10c0a019e5b1fe03162035
+MD5 24b32597e0370f4fe9be9706f25d3cb0 ispell-3.2.06-r7.ebuild 2937
+RMD160 7040d04c3c2288034eb482fe24a4a9bd36388f88 ispell-3.2.06-r7.ebuild 2937
+SHA256 bf233d1323683952f27f3b6fdb021e82181bc5a26c10c0a019e5b1fe03162035 ispell-3.2.06-r7.ebuild 2937
 MD5 1807d88fc35553dcc67ef87a044d744c files/digest-ispell-3.2.06-r7 524
 RMD160 ad71651e16693b5f28d9269f00fd0777388f32c3 files/digest-ispell-3.2.06-r7 524
 SHA256 a40a394c389a994a40614f782c25212556308adfb2450bcf97184b6818a1b13b files/digest-ispell-3.2.06-r7 524
diff --git a/trunk/app-text/ispell/ispell-3.2.06-r7.ebuild b/trunk/app-text/ispell/ispell-3.2.06-r7.ebuild
index 1d95e8c..e58b24d 100644
--- a/trunk/app-text/ispell/ispell-3.2.06-r7.ebuild
+++ b/trunk/app-text/ispell/ispell-3.2.06-r7.ebuild
@@ -15,7 +15,7 @@ LICENSE="as-is"
 #KEYWORDS="alpha amd64 hppa mips ppc ppc-macos sparc x86"
 KEYWORDS="~x86 ~amd64"
 IUSE="tmispell"
-LINGUAS="bg cs da de es et fi fr ga hu it lt nl no pl pt pt-BR ru sl sv"
+LINGUAS="bg cs da de es et fi fr ga hu it lt nl no pl pt pt_BR ru sl sv"
 for X in ${LINGUAS} ; do # is this correct?
 	IUSE="${IUSE} linguas_${X}"
 done
@@ -31,9 +31,9 @@ PDEPEND="linguas_bg? ( app-dicts/ispell-bg )
 	linguas_de? ( app-dicts/ispell-de )
 	linguas_es? ( app-dicts/ispell-es )
 	linguas_et? ( app-dicts/ispell-et )
-	linguas_fi? (  
+	linguas_fi? (
 		!tmispell? ( app-dicts/ispell-fi )
-		tmispell? ( app-text/tmispell ) 
+		tmispell? ( app-text/tmispell )
 	)
 	linguas_fr? ( app-dicts/ispell-fr )
 	linguas_ga? ( app-dicts/ispell-ga )
diff --git a/trunk/app-text/sukija/Manifest b/trunk/app-text/sukija/Manifest
index 7479374..879a21f 100644
--- a/trunk/app-text/sukija/Manifest
+++ b/trunk/app-text/sukija/Manifest
@@ -1,8 +1,16 @@
 DIST sukija-0.9.1.tar.bz2 477416 RMD160 a51ec42483cbf79e196d29d07d0912ce2b146314 SHA1 bda4a92b87d7ccc4fed886d1a26f613e3577461b SHA256 e2e75f2ddbb959b28e3757df54cc131b7397c087621b11ea3c1b4087266474ef
+DIST sukija-0.9.3.tar.bz2 345232 RMD160 3c432d0cf972e118704b2559d0ea9daeb5c46129 SHA1 804c70ac61153ff6c35623d10a9d0bfa2d16db2d SHA256 b0e383de18ffd9abeb8194b62a51dbdc6e3b046499fc0d719ebec331fe308813
 EBUILD sukija-0.9.1.ebuild 547 RMD160 896df32f4e9c2f8db4db3eaffb4dce1a562988de SHA1 024af61338584a7c3f6ee105e90767cee5db578c SHA256 4659570f11329eae474a74e9de6c38c636308d98e74c45470537449789dfdb3a
 MD5 061291b9f9e14760a0ab2d345e060f5c sukija-0.9.1.ebuild 547
 RMD160 896df32f4e9c2f8db4db3eaffb4dce1a562988de sukija-0.9.1.ebuild 547
 SHA256 4659570f11329eae474a74e9de6c38c636308d98e74c45470537449789dfdb3a sukija-0.9.1.ebuild 547
+EBUILD sukija-0.9.3.ebuild 547 RMD160 896df32f4e9c2f8db4db3eaffb4dce1a562988de SHA1 024af61338584a7c3f6ee105e90767cee5db578c SHA256 4659570f11329eae474a74e9de6c38c636308d98e74c45470537449789dfdb3a
+MD5 061291b9f9e14760a0ab2d345e060f5c sukija-0.9.3.ebuild 547
+RMD160 896df32f4e9c2f8db4db3eaffb4dce1a562988de sukija-0.9.3.ebuild 547
+SHA256 4659570f11329eae474a74e9de6c38c636308d98e74c45470537449789dfdb3a sukija-0.9.3.ebuild 547
 MD5 a04faf6f85a3ddf7491567094f99c8f8 files/digest-sukija-0.9.1 241
 RMD160 612f266198017c888279fa165c1c2f3f2f29569c files/digest-sukija-0.9.1 241
 SHA256 c00b1a8d9783e5db917c0f0da1ebc5fac9beec0e0348c509da61dca1694c0bd8 files/digest-sukija-0.9.1 241
+MD5 c6b606f0ca30398f2330e50e0f17e56b files/digest-sukija-0.9.3 241
+RMD160 513a28b38097c9fdf8061bda9e58ddc34bd96bf2 files/digest-sukija-0.9.3 241
+SHA256 3d8037039c2034bb79180963bda7facfc705c797d9bb3a171db6264ca519e106 files/digest-sukija-0.9.3 241
diff --git a/trunk/app-text/sukija/files/digest-sukija-0.9.3 b/trunk/app-text/sukija/files/digest-sukija-0.9.3
new file mode 100644
index 0000000..7daa660
--- /dev/null
+++ b/trunk/app-text/sukija/files/digest-sukija-0.9.3
@@ -0,0 +1,3 @@
+MD5 afc62bd88ef2135b0c045d4ea3f07811 sukija-0.9.3.tar.bz2 345232
+RMD160 3c432d0cf972e118704b2559d0ea9daeb5c46129 sukija-0.9.3.tar.bz2 345232
+SHA256 b0e383de18ffd9abeb8194b62a51dbdc6e3b046499fc0d719ebec331fe308813 sukija-0.9.3.tar.bz2 345232
diff --git a/trunk/app-text/tmispell/Manifest b/trunk/app-text/tmispell/Manifest
index 6419a08..aa9cc59 100644
--- a/trunk/app-text/tmispell/Manifest
+++ b/trunk/app-text/tmispell/Manifest
@@ -27,10 +27,6 @@ EBUILD tmispell-9999.ebuild 2091 RMD160 d5f2549cc954ef0d05780bb209696d5a85fa51be
 MD5 7e5f283333480b0119525c6baffa015d tmispell-9999.ebuild 2091
 RMD160 d5f2549cc954ef0d05780bb209696d5a85fa51be tmispell-9999.ebuild 2091
 SHA256 34023d79cc639c87ecda9e6fba00eb9e3e3f7ad9682d457bee929027952c568d tmispell-9999.ebuild 2091
-MISC .tmispell-0.6.1.ebuild.swp 12288 RMD160 bbba8788a5c667d6ecf99a61f7bce8db3ccde98a SHA1 b14a9733bb1225b13831ccbc22a68797ee1556ac SHA256 a55a43fef3d76c2f8dcf28ad988d5853885fe7ca07f2f2f91285336500abe550
-MD5 6b717d9922f9577e5f62de02ed98266c .tmispell-0.6.1.ebuild.swp 12288
-RMD160 bbba8788a5c667d6ecf99a61f7bce8db3ccde98a .tmispell-0.6.1.ebuild.swp 12288
-SHA256 a55a43fef3d76c2f8dcf28ad988d5853885fe7ca07f2f2f91285336500abe550 .tmispell-0.6.1.ebuild.swp 12288
 MD5 08f519ae393cf703e3d1b45eaec37ddd files/digest-tmispell-0.6.1 265
 RMD160 7bbb2060f88393c648e8dd3436daf7050adc2b63 files/digest-tmispell-0.6.1 265
 SHA256 12aa120b7a958741308d563cae536afb6aa7015db73034ff6e69aca5418f2812 files/digest-tmispell-0.6.1 265
diff --git a/trunk/app-text/tmispell/files/digest-tmispell-0.4.3 b/trunk/app-text/tmispell/files/digest-tmispell-0.4.3
deleted file mode 100644
index 8e8c9e2..0000000
--- a/trunk/app-text/tmispell/files/digest-tmispell-0.4.3
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 65a80f2542e0680409035fb0fac44f8e ispell-3.2.06-r6-gentoo-0.1.diff.bz2 8787
-RMD160 d821b99da52ed9d326d653d0bf01b277c30c18ab ispell-3.2.06-r6-gentoo-0.1.diff.bz2 8787
-SHA256 e577e996cb465222ae3c12f53e0a712d97a1c5f3786eaab51d28769f3a9af114 ispell-3.2.06-r6-gentoo-0.1.diff.bz2 8787
-MD5 d434e1aef1a815294d5012c60c4c414a ispell-3.2.06.tar.gz 580742
-RMD160 3f6a3840540ebc753146c427da8ce2d54317b46e ispell-3.2.06.tar.gz 580742
-SHA256 34a27fc4a2089bd5074aacf69323731770e5b605a2fc9a053d389f45b01c7966 ispell-3.2.06.tar.gz 580742
-MD5 30a955cc813f8962c4e4b8abde6bc258 tmispell-voikko-0.4.3.tar.gz 447162
-RMD160 67b946f135c9cec509d576e023644bb7b49df53e tmispell-voikko-0.4.3.tar.gz 447162
-SHA256 9b05b8fce809e383ca4fb1fb8533ef2af658004495413664dc88c4f79d0dadcc tmispell-voikko-0.4.3.tar.gz 447162
diff --git a/trunk/app-text/tmispell/files/digest-tmispell-0.5.0 b/trunk/app-text/tmispell/files/digest-tmispell-0.5.0
deleted file mode 100644
index 9acb281..0000000
--- a/trunk/app-text/tmispell/files/digest-tmispell-0.5.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 782c4e5d00bdfa7ca125662829a49024 tmispell-voikko-0.5.0.tar.gz 423157
-RMD160 fe642a0c97197907c555acfdcf834da8ab15826b tmispell-voikko-0.5.0.tar.gz 423157
-SHA256 6368efad9585b53caf3ee2aa8e454ee4cacdbf22d65efde69da0a50859cc146d tmispell-voikko-0.5.0.tar.gz 423157
diff --git a/trunk/app-text/tmispell/files/digest-tmispell-0.6 b/trunk/app-text/tmispell/files/digest-tmispell-0.6
deleted file mode 100644
index 819f96d..0000000
--- a/trunk/app-text/tmispell/files/digest-tmispell-0.6
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 67d992e8e9d7e38f02c1ccd63193d82c tmispell-voikko-0.6.tar.gz 440563
-RMD160 88c5b26399d29bee6dbbeae4bc6dd2d4593fa77b tmispell-voikko-0.6.tar.gz 440563
-SHA256 29c8a6d3365ad843b7e59d8d89b8eb014de44f8f817cd3d470dd904ccc1b36aa tmispell-voikko-0.6.tar.gz 440563
diff --git a/trunk/app-text/voikko/Manifest b/trunk/app-text/voikko/Manifest
index 1147ef1..a9bb80d 100644
--- a/trunk/app-text/voikko/Manifest
+++ b/trunk/app-text/voikko/Manifest
@@ -1,34 +1,14 @@
-DIST libvoikko-0.9.tar.gz 345484 RMD160 fa93eab3e9a0b24e21acdc6721bd444cd23d6088 SHA1 c8486f500cdda0b34d73854e05ed813ee267450f SHA256 880ff66385dd367827d98d4e770fc94afc5c3d772ade2b71fadf81b85bcb923f
-DIST libvoikko-1.0.tar.gz 347429 RMD160 d9852847063e009f4eb21ac46f8b388ebe097afa SHA1 10f54b41a754765a6ee824418288efb6b7ce3656 SHA256 e73f518d4641d8ab24e823125e7511ecc165e4dd1afbd9532e507e19f445fec6
-DIST libvoikko-1.1.tar.gz 352569 RMD160 5964d89c5cf9890ba4da9db088ef5cfd31885f5e SHA1 af8532d7f69c4fe751830adcf4b29f20b50ea9ad SHA256 2eb2db6691c0ff75db213835a2b17b8c7b9d080dad04704ddc39cbc6fe9e7b40
-DIST libvoikko-1.2.tar.gz 353402 RMD160 f5ec4cd906b514083ac68e090ed8baca3afb659c SHA1 91d16e10e475daaf4e0e7c900d7fa1b85be6688e SHA256 36733a63497d62d4a008ed509d731a5439cbc9af25c63ba1521b65695d1adbd0
 DIST libvoikko-1.3.1.tar.gz 357497 RMD160 ec00dc5cc27cefdc600b9c4eba925f44de443bba SHA1 0bcea56c450ef8437943b7a3902b4e8b799d2c29 SHA256 970a7af255078d265858416a6909a11313d870709c4c0f4d757e23c9c2ea326d
+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
-DIST libvoikko_1.4~rc1.orig.tar.gz 359082 RMD160 3cbe674fa9ec62f7e9ad5ac43f59969c16dadbd0 SHA1 9392f5de1a7a21816d9212189cc1a7136226e968 SHA256 4373572bb6c9cade825bc1fa2a7b4d6b8bb6ee1f4cbfc979ab6bd491d9ee2173
-EBUILD voikko-0.9.ebuild 723 RMD160 ef015d9f30e01436368b0ae3718b597dfe41e530 SHA1 53a3ece52bac71af735bc2668d4b10f56dc5b563 SHA256 316a98a57d6fbf01d78fe9dfab3ffc38c445345b465e4a228b8b3d4a6464d62e
-MD5 ed1cf782959413cc325f208c31f236be voikko-0.9.ebuild 723
-RMD160 ef015d9f30e01436368b0ae3718b597dfe41e530 voikko-0.9.ebuild 723
-SHA256 316a98a57d6fbf01d78fe9dfab3ffc38c445345b465e4a228b8b3d4a6464d62e voikko-0.9.ebuild 723
-EBUILD voikko-1.0.ebuild 722 RMD160 7f50ca459d1e69a0c8fdd4759322801e41d944b7 SHA1 d70f9ec55fcc25b362ca102959f42b76944cb176 SHA256 552edd090fb6b1987e571043df437ecca1cb576931bb6d03ad4bcafc3dd3887e
-MD5 556c0ffbed841c5dd04fbfff6cabc21e voikko-1.0.ebuild 722
-RMD160 7f50ca459d1e69a0c8fdd4759322801e41d944b7 voikko-1.0.ebuild 722
-SHA256 552edd090fb6b1987e571043df437ecca1cb576931bb6d03ad4bcafc3dd3887e voikko-1.0.ebuild 722
-EBUILD voikko-1.1.ebuild 729 RMD160 1dc80122d1e34380b02fe62ac0f92a1dd1c1c041 SHA1 7daa15495ce1c0b9f950abfa9ffc13f4a27fdd5b SHA256 7ebf23f0067fd96209cccf9b293e6c385d7523d3277d46382cb8cc1db070e086
-MD5 62c51a22fc19f220cb0b543279d42276 voikko-1.1.ebuild 729
-RMD160 1dc80122d1e34380b02fe62ac0f92a1dd1c1c041 voikko-1.1.ebuild 729
-SHA256 7ebf23f0067fd96209cccf9b293e6c385d7523d3277d46382cb8cc1db070e086 voikko-1.1.ebuild 729
-EBUILD voikko-1.2.ebuild 693 RMD160 dee6b2f0d2b210df10adef01c8fe012972b305d2 SHA1 83f656ab7c32e6e145b6a0395297afa2948d4928 SHA256 ccf23c1ba640278861a34d48c559da03875ef2327e725102a4824c4e6303390a
-MD5 8f637d26531bd5c2e96001515d38b12e voikko-1.2.ebuild 693
-RMD160 dee6b2f0d2b210df10adef01c8fe012972b305d2 voikko-1.2.ebuild 693
-SHA256 ccf23c1ba640278861a34d48c559da03875ef2327e725102a4824c4e6303390a voikko-1.2.ebuild 693
 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_rc1.ebuild 970 RMD160 8ce4af5ba33651ef18c07baf06f8d762acab6e49 SHA1 dd7680c403127f37f51159a338858bae22a4d45a SHA256 6923d0bfa0e96827013b88eb46ed58c1df083e5f6390022077213c88015a865a
-MD5 d1bcbdffb98fcc7334d3e80da7bec55d voikko-1.4_rc1.ebuild 970
-RMD160 8ce4af5ba33651ef18c07baf06f8d762acab6e49 voikko-1.4_rc1.ebuild 970
-SHA256 6923d0bfa0e96827013b88eb46ed58c1df083e5f6390022077213c88015a865a voikko-1.4_rc1.ebuild 970
+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
+SHA256 5ae9f3a70fdad1e82f6d6517ab570d1a2b7a98b3a763e23186266ce3b20243a6 voikko-1.4.ebuild 754
 EBUILD voikko-99.20060901.ebuild 742 RMD160 27481028c2bca4be2994a834144d526f1ed9e560 SHA1 30f444a4bdef30072f056e63348f32e56b7c9b23 SHA256 1d1f76694df4a50e4efa4aa8dbbeea1964071502367167835369890d6ffb42bc
 MD5 8faf533770fc905b6c871e4b52f74777 voikko-99.20060901.ebuild 742
 RMD160 27481028c2bca4be2994a834144d526f1ed9e560 voikko-99.20060901.ebuild 742
@@ -37,28 +17,12 @@ EBUILD voikko-9999.ebuild 913 RMD160 c46d05368a6c62253479752e6ac44834952c7061 SH
 MD5 d8038154ab5e278883421a2fad2cdcd9 voikko-9999.ebuild 913
 RMD160 c46d05368a6c62253479752e6ac44834952c7061 voikko-9999.ebuild 913
 SHA256 f285bba36c20ce9ab5ab73f32d819ccc1a6f0d55ae3cd0cf1f596bd93b78615e voikko-9999.ebuild 913
-MISC .voikko-1.4_rc1.ebuild.swp 12288 RMD160 9447d103082e4285310d93333482b82e62c89346 SHA1 981ea22f255521b48a8cb63f6c62bcac90871cb4 SHA256 67038af313d134ab65e33fa100c47110f5f267fa62a86cdac8dff812946653de
-MD5 e6726c4de2427c2622777f519fcfc868 .voikko-1.4_rc1.ebuild.swp 12288
-RMD160 9447d103082e4285310d93333482b82e62c89346 .voikko-1.4_rc1.ebuild.swp 12288
-SHA256 67038af313d134ab65e33fa100c47110f5f267fa62a86cdac8dff812946653de .voikko-1.4_rc1.ebuild.swp 12288
-MD5 dd3ca91e05c4748295c2d97a1d8ae876 files/digest-voikko-0.9 241
-RMD160 dd1cf037bd14f1e16f1a479d1800e91b66a6e17c files/digest-voikko-0.9 241
-SHA256 54402b188d56d5da5a6475300e0307f8882e99a0c454914f7238b092cda12f3f files/digest-voikko-0.9 241
-MD5 b119cb9118c1ed5150fc7588d73ac76f files/digest-voikko-1.0 241
-RMD160 65a8c830e35cf33fdedcac3970bb8f9e68d0c653 files/digest-voikko-1.0 241
-SHA256 dd74999e290a07da838927823c00e4f9c9343cdfc2f6f0fe3f6ef06745c0fc07 files/digest-voikko-1.0 241
-MD5 743464e054de6464c1cde473c55c5f5b files/digest-voikko-1.1 241
-RMD160 cdb92ce5e37c1123a948b34ac08b5d318c6a1413 files/digest-voikko-1.1 241
-SHA256 1ce3f2ec2b3ee3b3b05c5fdc50b12caf6090a6dc8ce5f2fb53d8ee6d97f85d30 files/digest-voikko-1.1 241
-MD5 a22c80b3dbfff1c9b11cf9ce5b5e76ab files/digest-voikko-1.2 241
-RMD160 7fb3121bcf3297c54044a9a9cae6b2f392ff64c0 files/digest-voikko-1.2 241
-SHA256 9590e489eb5ddae0ea3a9c680a5c0bcb1640c0211f4e2a7c096ffdecfcfeb90a files/digest-voikko-1.2 241
 MD5 7b43b5c45dff0bdf5a51a52921c1166a files/digest-voikko-1.3.1 247
 RMD160 06901c1e9a08e5db50cdc6d0e6d8a8656336d1ff files/digest-voikko-1.3.1 247
 SHA256 a38c070d5433f06b571db06759aa3f5f873dbe6805d79b862f0a4e189346b326 files/digest-voikko-1.3.1 247
-MD5 ae25038c6e81f0a64ff54889d45fb616 files/digest-voikko-1.4_rc1 268
-RMD160 66680f73028af57e3241950438bae0de8037f789 files/digest-voikko-1.4_rc1 268
-SHA256 daed433fbccaae976846d384266d8167dbca7dbfbe3c1151e47501db13aa961d files/digest-voikko-1.4_rc1 268
+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 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-0.9 b/trunk/app-text/voikko/files/digest-voikko-0.9
deleted file mode 100644
index 6d837d7..0000000
--- a/trunk/app-text/voikko/files/digest-voikko-0.9
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 880e4a2dd8be893c500cb80719974cea libvoikko-0.9.tar.gz 345484
-RMD160 fa93eab3e9a0b24e21acdc6721bd444cd23d6088 libvoikko-0.9.tar.gz 345484
-SHA256 880ff66385dd367827d98d4e770fc94afc5c3d772ade2b71fadf81b85bcb923f libvoikko-0.9.tar.gz 345484
diff --git a/trunk/app-text/voikko/files/digest-voikko-1.0 b/trunk/app-text/voikko/files/digest-voikko-1.0
deleted file mode 100644
index a21c912..0000000
--- a/trunk/app-text/voikko/files/digest-voikko-1.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 9f69cfb20366dd96db10e7bb1bca4ae4 libvoikko-1.0.tar.gz 347429
-RMD160 d9852847063e009f4eb21ac46f8b388ebe097afa libvoikko-1.0.tar.gz 347429
-SHA256 e73f518d4641d8ab24e823125e7511ecc165e4dd1afbd9532e507e19f445fec6 libvoikko-1.0.tar.gz 347429
diff --git a/trunk/app-text/voikko/files/digest-voikko-1.1 b/trunk/app-text/voikko/files/digest-voikko-1.1
deleted file mode 100644
index 1a15791..0000000
--- a/trunk/app-text/voikko/files/digest-voikko-1.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 85729e8f4cbc12066b4fe9e16cb9bfb4 libvoikko-1.1.tar.gz 352569
-RMD160 5964d89c5cf9890ba4da9db088ef5cfd31885f5e libvoikko-1.1.tar.gz 352569
-SHA256 2eb2db6691c0ff75db213835a2b17b8c7b9d080dad04704ddc39cbc6fe9e7b40 libvoikko-1.1.tar.gz 352569
diff --git a/trunk/app-text/voikko/files/digest-voikko-1.2 b/trunk/app-text/voikko/files/digest-voikko-1.2
deleted file mode 100644
index 8129d92..0000000
--- a/trunk/app-text/voikko/files/digest-voikko-1.2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 6013d7b0957169b44cf2760c34fb58c2 libvoikko-1.2.tar.gz 353402
-RMD160 f5ec4cd906b514083ac68e090ed8baca3afb659c libvoikko-1.2.tar.gz 353402
-SHA256 36733a63497d62d4a008ed509d731a5439cbc9af25c63ba1521b65695d1adbd0 libvoikko-1.2.tar.gz 353402
diff --git a/trunk/app-text/voikko/files/digest-voikko-1.4 b/trunk/app-text/voikko/files/digest-voikko-1.4
new file mode 100644
index 0000000..9fe178c
--- /dev/null
+++ b/trunk/app-text/voikko/files/digest-voikko-1.4
@@ -0,0 +1,3 @@
+MD5 6cc566803b324e14c67746fc7348dc4e libvoikko-1.4.tar.gz 359159
+RMD160 61f28678129ff619bcbddc600d9d4fd42f87efe0 libvoikko-1.4.tar.gz 359159
+SHA256 8e62c2b07f4f9d01ba859a19fbff2c7136fad963237379f08777ef293c86e55d libvoikko-1.4.tar.gz 359159
diff --git a/trunk/app-text/voikko/files/digest-voikko-1.4_rc1 b/trunk/app-text/voikko/files/digest-voikko-1.4_rc1
deleted file mode 100644
index cc38147..0000000
--- a/trunk/app-text/voikko/files/digest-voikko-1.4_rc1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 da559376c73fb3b3d21a9eacc0dd07c0 libvoikko_1.4~rc1.orig.tar.gz 359082
-RMD160 3cbe674fa9ec62f7e9ad5ac43f59969c16dadbd0 libvoikko_1.4~rc1.orig.tar.gz 359082
-SHA256 4373572bb6c9cade825bc1fa2a7b4d6b8bb6ee1f4cbfc979ab6bd491d9ee2173 libvoikko_1.4~rc1.orig.tar.gz 359082
diff --git a/trunk/app-text/voikko/voikko-0.9.ebuild b/trunk/app-text/voikko/voikko-0.9.ebuild
deleted file mode 100644
index 5b59b9f..0000000
--- a/trunk/app-text/voikko/voikko-0.9.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-MY_PN="lib${P}"
-DESCRIPTION="Free Finnish spellchecking and huphenation library"
-HOMEPAGE="http://www.hunspell-fi.org/"
-SRC_URI="http://www.hunspell-fi.org/files/${MY_PN}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-
-DEPEND="sci-misc/malaga
-	sci-misc/suomi-malaga
-	virtual/libiconv"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}"/${MY_PN}
-src_compile() {
-	econf --with-malaga-path=${ROOT}/usr/ \
-		--with-dictionary-path=${ROOT}/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/app-text/voikko/voikko-1.0.ebuild b/trunk/app-text/voikko/voikko-1.0.ebuild
deleted file mode 100644
index 6d3dd73..0000000
--- a/trunk/app-text/voikko/voikko-1.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2006 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="http://www.hunspell-fi.org/files/${MY_PN}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-
-DEPEND="sci-misc/malaga
-	sci-misc/suomi-malaga
-	virtual/libiconv"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}"/${MY_PN}
-src_compile() {
-	econf --with-malaga-path=${ROOT}/usr/ \
-		--with-dictionary-path=${ROOT}/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/app-text/voikko/voikko-1.2.ebuild b/trunk/app-text/voikko/voikko-1.2.ebuild
deleted file mode 100644
index f11a48b..0000000
--- a/trunk/app-text/voikko/voikko-1.2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2006 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="http://www.hunspell-fi.org/files/${MY_PN}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE=""
-
-DEPEND="sci-misc/malaga
-	sci-misc/suomi-malaga
-	virtual/libiconv"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}"/${MY_PN}
-src_compile() {
-	econf --with-dictionary-path=${ROOT}/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/app-text/voikko/voikko-1.1.ebuild b/trunk/app-text/voikko/voikko-1.4.ebuild
index 38d41d9..b019a9c 100644
--- a/trunk/app-text/voikko/voikko-1.1.ebuild
+++ b/trunk/app-text/voikko/voikko-1.4.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2006 Gentoo Foundation
+# 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="http://www.hunspell-fi.org/files/${MY_PN}.tar.gz"
+SRC_URI="mirror://sourceforge/voikko/${MY_PN}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -13,14 +13,15 @@ KEYWORDS="~x86 ~amd64"
 IUSE=""
 
 DEPEND="sci-misc/malaga
-	sci-misc/suomi-malaga
+	|| ( =sci-misc/suomi-malaga-1.0* =sci-misc/suomi-malaga-0.7*
+		=sci-misc/suomi-malaga-9999 )
 	virtual/libiconv"
 RDEPEND="${DEPEND}"
 
-S="${WORKDIR}"/${MY_PN}
+S="${WORKDIR}/lib${P}"
+
 src_compile() {
-	econf --with-malaga-path=${ROOT}/usr/ \
-		--with-dictionary-path=${ROOT}/usr/lib/suomi-malaga/ \
+	econf --with-dictionary-path="/usr/lib/suomi-malaga/" \
 		|| die "econf failed"
 	emake || die "emake failed"
 }
diff --git a/trunk/app-text/voikko/voikko-1.4_rc1.ebuild b/trunk/app-text/voikko/voikko-1.4_rc1.ebuild
deleted file mode 100644
index 8324458..0000000
--- a/trunk/app-text/voikko/voikko-1.4_rc1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# 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"
-SRC_URI="http://www.hunspell-fi.org/debian/unstable/libvoikko_1.4~rc1.orig.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}"/${MY_PN/_rc1/}
-
-src_compile() {
-	econf --with-dictionary-path="${ROOT}/usr/lib/suomi-malaga/" \
-		|| die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "install failed"
-	dodoc README TODO
-}
-
-pkg_postinst() {
-	ewarn "This is a release candidate for early testers:"
-	ewarn "only report bugs with solutions."
-}
diff --git a/trunk/sci-misc/malaga/Manifest b/trunk/sci-misc/malaga/Manifest
index 322413f..e3e943c 100644
--- a/trunk/sci-misc/malaga/Manifest
+++ b/trunk/sci-misc/malaga/Manifest
@@ -1,36 +1,16 @@
-AUX malaga-7.5-makefile-destdir-debian-readline-libs.patch 3612 RMD160 0b509b418b2973baa7d8a1d687498446693b45db SHA1 a79fd7c45e9d5df5fa71dfe68e46da2746290e9e SHA256 bb081cf4be0bd4c59b8f9f713e132d4e4812f6f389b9a0ea0ffecafb51846c60
-MD5 dfb730e2ca74b44d99a5f42bc3c533e0 files/malaga-7.5-makefile-destdir-debian-readline-libs.patch 3612
-RMD160 0b509b418b2973baa7d8a1d687498446693b45db files/malaga-7.5-makefile-destdir-debian-readline-libs.patch 3612
-SHA256 bb081cf4be0bd4c59b8f9f713e132d4e4812f6f389b9a0ea0ffecafb51846c60 files/malaga-7.5-makefile-destdir-debian-readline-libs.patch 3612
-DIST malaga-7.5.tgz 495080 RMD160 d7cb057d617fa8dd04de340f84597115b596c3e6 SHA1 d91f35b78dc761052f4bf20a35e5b86e8ada6858 SHA256 919ae450548b48d1db9cd0b9d3ef73b271c144f193878cf26e4d262fc63e4ec4
-DIST malaga-7.6.tgz 522501 RMD160 415f8f44c85eb9cb73b96d53e3eb93d2c3379fcb SHA1 084567564bc4e6a50e88b093bcf08cec6c8075ca SHA256 b036ccc5c0da7d08299723ca18ea7d03776257ce97624172af51d0a2bff739fe
-DIST malaga-7.7.tgz 564935 RMD160 b28e7a718cac5d5e92d26daccc2d2d470d6b8d74 SHA1 b23d8dff41503ce2a792fc51421ed202eb6d5c4f SHA256 89aa5e00b239acdabf1183b85d6164948695e4b97ea5a5f703b86be95c962149
 DIST malaga-7.8.tgz 565494 RMD160 c426c257f3d5bbc5e949f09aa6a56e81f7c1a10e SHA1 12b6c6090817875430b45b61e18af6eca8b6781f SHA256 8b9e834d7df9a4c025aa527a20716d87fc44b6e19f31e2a0841a4b593d0619e0
-EBUILD malaga-7.5.ebuild 1267 RMD160 370249dafc3643c7a50b27b49753400f9e95fbca SHA1 9a68a57ceda567b3acbb442806ab2dcfff1bafdb SHA256 eb719df3efb614a0bbfda159843064dc731247b0348a71e01fac8db6da6f5a2d
-MD5 0401e1f4389ff4c130426de48ed03ccf malaga-7.5.ebuild 1267
-RMD160 370249dafc3643c7a50b27b49753400f9e95fbca malaga-7.5.ebuild 1267
-SHA256 eb719df3efb614a0bbfda159843064dc731247b0348a71e01fac8db6da6f5a2d malaga-7.5.ebuild 1267
-EBUILD malaga-7.6.ebuild 1094 RMD160 0b659e7df32b0fca646fcd153f9eddf4fac8aaed SHA1 990265fe7febc90a6e436b28120b06b0c450fabd SHA256 2543e09ca581d199b1c1baf7cba0611de0a21ff0d09e8542265b56827d8292cc
-MD5 360dadb15097fe8d6857a8e7d86524ad malaga-7.6.ebuild 1094
-RMD160 0b659e7df32b0fca646fcd153f9eddf4fac8aaed malaga-7.6.ebuild 1094
-SHA256 2543e09ca581d199b1c1baf7cba0611de0a21ff0d09e8542265b56827d8292cc malaga-7.6.ebuild 1094
-EBUILD malaga-7.7.ebuild 1094 RMD160 0b659e7df32b0fca646fcd153f9eddf4fac8aaed SHA1 990265fe7febc90a6e436b28120b06b0c450fabd SHA256 2543e09ca581d199b1c1baf7cba0611de0a21ff0d09e8542265b56827d8292cc
-MD5 360dadb15097fe8d6857a8e7d86524ad malaga-7.7.ebuild 1094
-RMD160 0b659e7df32b0fca646fcd153f9eddf4fac8aaed malaga-7.7.ebuild 1094
-SHA256 2543e09ca581d199b1c1baf7cba0611de0a21ff0d09e8542265b56827d8292cc malaga-7.7.ebuild 1094
+DIST malaga-7.9.tgz 523884 RMD160 88accd0dfb2bed371b71b25384583191600e9167 SHA1 b9f1a670019cb5434b6063b7efe3cbea063966b6 SHA256 409c0c93af99440e2da7f1c25931aff9e4eab499fa7daee2f91e787188fcb278
 EBUILD malaga-7.8.ebuild 1083 RMD160 394133d2e8b1f671c3a68a5c687d2b37f78018df SHA1 abf79c87d56439453a385be167d50e0c5e6db8b7 SHA256 6ce6baeecfabc4b1582510b4b54d4509eb3e6614c316ec231e49c1baf5f5e5af
 MD5 0e225c356d3d26ed73b603d655738536 malaga-7.8.ebuild 1083
 RMD160 394133d2e8b1f671c3a68a5c687d2b37f78018df malaga-7.8.ebuild 1083
 SHA256 6ce6baeecfabc4b1582510b4b54d4509eb3e6614c316ec231e49c1baf5f5e5af malaga-7.8.ebuild 1083
-MD5 65cc7c364959d85ea415057b90851cca files/digest-malaga-7.5 223
-RMD160 d52805d79e383e6d1f4e41d1797f278cee1ee635 files/digest-malaga-7.5 223
-SHA256 427822faa23c669a76d61832bd91e4eb48674de0a02c5227620aa9f327a2801a files/digest-malaga-7.5 223
-MD5 f937ddc241ecc1649c53f66db1e73259 files/digest-malaga-7.6 223
-RMD160 3a5621f7d5e54cff784fc673b412185c96b0c39f files/digest-malaga-7.6 223
-SHA256 6020a5f9264d67d00c5ee4991529d84daccebd5284be7f302e2451b50d173257 files/digest-malaga-7.6 223
-MD5 0a861bf902fdc00c11106fe06d074078 files/digest-malaga-7.7 223
-RMD160 e5d5863e03436080d76d95b006a00c19ae3269d8 files/digest-malaga-7.7 223
-SHA256 5b540ab05a4f3f192d90645a7cfd4e5f0e3808106d42f17bc5888f3e3642f3a7 files/digest-malaga-7.7 223
+EBUILD malaga-7.9.ebuild 1083 RMD160 394133d2e8b1f671c3a68a5c687d2b37f78018df SHA1 abf79c87d56439453a385be167d50e0c5e6db8b7 SHA256 6ce6baeecfabc4b1582510b4b54d4509eb3e6614c316ec231e49c1baf5f5e5af
+MD5 0e225c356d3d26ed73b603d655738536 malaga-7.9.ebuild 1083
+RMD160 394133d2e8b1f671c3a68a5c687d2b37f78018df malaga-7.9.ebuild 1083
+SHA256 6ce6baeecfabc4b1582510b4b54d4509eb3e6614c316ec231e49c1baf5f5e5af malaga-7.9.ebuild 1083
 MD5 ea764b2a5a84fb44778a1c53d4f32ab9 files/digest-malaga-7.8 223
 RMD160 a1cf9606ed763e63d40623ddc941c6c141208587 files/digest-malaga-7.8 223
 SHA256 8857ffdb2df5f0794689d8af4b43a8b9de52f990df9e72bd159cef7fe2721f9a files/digest-malaga-7.8 223
+MD5 be005146ba1ef98b060c9f4e2639d661 files/digest-malaga-7.9 223
+RMD160 fb35f8a6cdc6b2ead96a518f3b56cbedfaa343de files/digest-malaga-7.9 223
+SHA256 8ef03bc545e366956e83018cc18d70bac3545f1ce7851bee3170c1484a8b1e0f files/digest-malaga-7.9 223
diff --git a/trunk/sci-misc/malaga/files/digest-malaga-7.5 b/trunk/sci-misc/malaga/files/digest-malaga-7.5
deleted file mode 100644
index b16efae..0000000
--- a/trunk/sci-misc/malaga/files/digest-malaga-7.5
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 1ab3bb1ad2aafb4509cebdac7358172b malaga-7.5.tgz 495080
-RMD160 d7cb057d617fa8dd04de340f84597115b596c3e6 malaga-7.5.tgz 495080
-SHA256 919ae450548b48d1db9cd0b9d3ef73b271c144f193878cf26e4d262fc63e4ec4 malaga-7.5.tgz 495080
diff --git a/trunk/sci-misc/malaga/files/digest-malaga-7.6 b/trunk/sci-misc/malaga/files/digest-malaga-7.6
deleted file mode 100644
index b7ecf40..0000000
--- a/trunk/sci-misc/malaga/files/digest-malaga-7.6
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 e8b8ddb6853577db09a62b751fcfde32 malaga-7.6.tgz 522501
-RMD160 415f8f44c85eb9cb73b96d53e3eb93d2c3379fcb malaga-7.6.tgz 522501
-SHA256 b036ccc5c0da7d08299723ca18ea7d03776257ce97624172af51d0a2bff739fe malaga-7.6.tgz 522501
diff --git a/trunk/sci-misc/malaga/files/digest-malaga-7.7 b/trunk/sci-misc/malaga/files/digest-malaga-7.7
deleted file mode 100644
index 4df6880..0000000
--- a/trunk/sci-misc/malaga/files/digest-malaga-7.7
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 117bb2b26c82068bbedc45c05c5ed593 malaga-7.7.tgz 564935
-RMD160 b28e7a718cac5d5e92d26daccc2d2d470d6b8d74 malaga-7.7.tgz 564935
-SHA256 89aa5e00b239acdabf1183b85d6164948695e4b97ea5a5f703b86be95c962149 malaga-7.7.tgz 564935
diff --git a/trunk/sci-misc/malaga/files/digest-malaga-7.9 b/trunk/sci-misc/malaga/files/digest-malaga-7.9
new file mode 100644
index 0000000..7a08581
--- /dev/null
+++ b/trunk/sci-misc/malaga/files/digest-malaga-7.9
@@ -0,0 +1,3 @@
+MD5 5637f83fb99b7a01ad82bd2e5c3913ba malaga-7.9.tgz 523884
+RMD160 88accd0dfb2bed371b71b25384583191600e9167 malaga-7.9.tgz 523884
+SHA256 409c0c93af99440e2da7f1c25931aff9e4eab499fa7daee2f91e787188fcb278 malaga-7.9.tgz 523884
diff --git a/trunk/sci-misc/malaga/files/malaga-7.5-makefile-destdir-debian-readline-libs.patch b/trunk/sci-misc/malaga/files/malaga-7.5-makefile-destdir-debian-readline-libs.patch
deleted file mode 100644
index 59a3fdc..0000000
--- a/trunk/sci-misc/malaga/files/malaga-7.5-makefile-destdir-debian-readline-libs.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-diff -ru malaga-7.5/Makefile.in malaga-7.5-fixed/Makefile.in
---- malaga-7.5/Makefile.in	2006-07-01 14:36:02.000000000 +0300
-+++ malaga-7.5-fixed/Makefile.in	2006-08-25 10:30:11.000000000 +0300
-@@ -92,36 +92,36 @@
- info: malaga.info
- 
- install: all info
--	$(INSTALL_DIR) $(bindir)
--	$(INSTALL_PROGRAM) -s malaga $(bindir)/malaga
--	$(INSTALL_PROGRAM) -s mallex $(bindir)/mallex
--	$(INSTALL_PROGRAM) -s malmake $(bindir)/malmake
--	$(INSTALL_PROGRAM) -s malrul $(bindir)/malrul
-+	$(INSTALL_DIR) ${DESTDIR}$(bindir)
-+	$(INSTALL_PROGRAM) -s malaga ${DESTDIR}$(bindir)/malaga
-+	$(INSTALL_PROGRAM) -s mallex ${DESTDIR}$(bindir)/mallex
-+	$(INSTALL_PROGRAM) -s malmake ${DESTDIR}$(bindir)/malmake
-+	$(INSTALL_PROGRAM) -s malrul ${DESTDIR}$(bindir)/malrul
- 	if test -n "$(MALSHOW)" ;\
--          then $(INSTALL_PROGRAM) -s malshow $(bindir)/malshow; fi
--	$(INSTALL_PROGRAM) -s malsym $(bindir)/malsym
--	$(INSTALL_DIR) $(includedir)
--	$(INSTALL_DATA) $(srcdir)/malaga.h $(includedir)/malaga.h
--	$(INSTALL_DIR) $(libdir)
--	$(LIBTOOL) $(INSTALL_DATA) -s libmalaga.la $(libdir)/libmalaga.la
--	$(INSTALL_DIR) $(datadir)/malaga
--	$(INSTALL_DATA) $(srcdir)/malaga.el $(datadir)/malaga/malaga.el
--	$(INSTALL_DIR) $(infodir)
--	for f in malaga.info*; do $(INSTALL_DATA) $$f $(infodir)/$$f; done
--	$(INSTALL_INFO) --info-dir=$(infodir) malaga.info 
-+	   then $(INSTALL_PROGRAM) -s malshow ${DESTDIR}$(bindir)/malshow; fi
-+	$(INSTALL_PROGRAM) -s malsym ${DESTDIR}$(bindir)/malsym
-+	$(INSTALL_DIR) ${DESTDIR}$(includedir)
-+	$(INSTALL_DATA) $(srcdir)/malaga.h ${DESTDIR}$(includedir)/malaga.h
-+	$(INSTALL_DIR) ${DESTDIR}$(libdir)
-+	$(LIBTOOL) --mode=install $(INSTALL_DATA) -s libmalaga.la ${DESTDIR}$(libdir)/libmalaga.la
-+	$(INSTALL_DIR) ${DESTDIR}$(datadir)/malaga
-+	$(INSTALL_DATA) $(srcdir)/malaga.el ${DESTDIR}$(datadir)/malaga/malaga.el
-+	$(INSTALL_DIR) ${DESTDIR}$(infodir)
-+	for f in malaga.info*; do $(INSTALL_DATA) $$f ${DESTDIR}$(infodir)/$$f; done
-+	$(INSTALL_INFO) --info-dir=${DESTDIR}$(infodir) malaga.info
- 
- uninstall:
--	rm -f $(bindir)/malaga 
--	rm -f $(bindir)/mallex 
--	rm -f $(bindir)/malmake
--	rm -f $(bindir)/malrul
--	rm -f $(bindir)/malshow
--	rm -f $(bindir)/malsym
--	rm -f $(includedir)/malaga.h
--	rm -Rf $(datadir)/malaga
--	$(LIBTOOL) rm -f $(libdir)/libmalaga.la
--	$(INSTALL_INFO) --remove --info-dir=$(infodir) malaga.info 
--	rm -f $(infodir)/malaga.info*
-+	rm -f ${DESTDIR}$(bindir)/malaga
-+	rm -f ${DESTDIR}$(bindir)/mallex
-+	rm -f ${DESTDIR}$(bindir)/malmake
-+	rm -f ${DESTDIR}$(bindir)/malrul
-+	rm -f ${DESTDIR}$(bindir)/malshow
-+	rm -f ${DESTDIR}$(bindir)/malsym
-+	rm -f ${DESTDIR}$(includedir)/malaga.h
-+	rm -Rf ${DESTDIR}$(datadir)/malaga
-+	$(LIBTOOL) --mode=uninstall rm -f ${DESTDIR}$(libdir)/libmalaga.la
-+	$(INSTALL_INFO) --remove --info-dir=${DESTDIR}$(infodir) malaga.info
-+	rm -f ${DESTDIR}$(infodir)/malaga.info*
- 
- # Private goals for the maintainer. -------------------------------------------
- 
-@@ -204,12 +204,12 @@
- LIBMALAGA_OBJS = $(COMMON_OBJS) libmalaga.o
- 
- $(LIBMALAGA_OBJS):
--	$(LIBTOOL) $(COMPILE) $(GLIB_CFLAGS) $(READLINE_CFLAGS) $(srcdir)/$*.c
-+	$(LIBTOOL) --mode=compile $(COMPILE) $(GLIB_CFLAGS) $(READLINE_CFLAGS) $(srcdir)/$*.c
- 
- libmalaga.la: $(LIBMALAGA_OBJS)
--	$(LIBTOOL) $(LINK) $(LIBMALAGA_OBJS:.o=.lo) \
--	$(GLIB_LIBS) $(READLINE_LIBS) -lm -o libmalaga.la \
--	-version-info $(LIBMALAGA_VERSION) -rpath $(libdir)
-+	$(LIBTOOL) --mode=link $(LINK) $(LIBMALAGA_OBJS:.o=.lo) $(GLIB_LIBS) \
-+		$(READLINE_LIBS) -lm \
-+	-o libmalaga.la -version-info $(LIBMALAGA_VERSION) -rpath $(libdir)
- 
- # malaga ----------------------------------------------------------------------
- 
diff --git a/trunk/sci-misc/malaga/malaga-7.5.ebuild b/trunk/sci-misc/malaga/malaga-7.5.ebuild
deleted file mode 100644
index 4a97e12..0000000
--- a/trunk/sci-misc/malaga/malaga-7.5.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit eutils
-
-DESCRIPTION="Linguistic morphological programming language and toolset"
-HOMEPAGE="http://home.arcor.de/bjoern-beutel/malaga/"
-SRC_URI="http://home.arcor.de/bjoern-beutel/malaga/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE="gtk doc readline emacs"
-
-DEPEND=">=dev-libs/glib-2.0
-	gtk? ( >=x11-libs/gtk+-2.0 )
-	doc? ( >=sys-apps/texinfo-4.0 )
-	readline? ( sys-libs/readline )"
-RDEPEND="${DEPEND}"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	rm -f config.sub config.guess missing ltmain.sh
-	epatch ${FILESDIR}/${P}-makefile-destdir-debian-readline-libs.patch
-	autoreconf -i
-}
-
-src_compile() {
-	econf $(use_with readline ) || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "install failed"
-	dodoc CHANGES.txt INSTALL.txt README.txt
-}
-
-pkg_postinst() {
-	einfo "If you are using Emacs, add the line"
-	einfo "	(require 'malaga \".../malaga-7.5/malaga.el\")"
-	einfo "to the file \".emacs\" in your home directory, "
-	einfo "so the Malaga extensions will be loaded automatically "
-	einfo "if you are starting Emacs."
-	einfo "	(Use the absolute path for \".../malaga-7.5\".)"
-}
diff --git a/trunk/sci-misc/malaga/malaga-7.6.ebuild b/trunk/sci-misc/malaga/malaga-7.6.ebuild
deleted file mode 100644
index b5985da..0000000
--- a/trunk/sci-misc/malaga/malaga-7.6.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit eutils
-
-DESCRIPTION="Linguistic morphological programming language and toolset"
-HOMEPAGE="http://home.arcor.de/bjoern-beutel/malaga/"
-SRC_URI="http://home.arcor.de/bjoern-beutel/malaga/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE="gtk doc readline emacs"
-
-DEPEND=">=dev-libs/glib-2.0
-	gtk? ( >=x11-libs/gtk+-2.0 )
-	doc? ( >=sys-apps/texinfo-4.0 )
-	readline? ( sys-libs/readline )"
-RDEPEND="${DEPEND}"
-
-src_compile() {
-	econf $(use_with readline ) || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "install failed"
-	dodoc CHANGES.txt INSTALL.txt README.txt
-}
-
-pkg_postinst() {
-	einfo "If you are using Emacs, add the line"
-	einfo "	(require 'malaga \".../malaga-7.5/malaga.el\")"
-	einfo "to the file \".emacs\" in your home directory, "
-	einfo "so the Malaga extensions will be loaded automatically "
-	einfo "if you are starting Emacs."
-	einfo "	(Use the absolute path for \".../malaga-7.5\".)"
-}
diff --git a/trunk/sci-misc/malaga/malaga-7.7.ebuild b/trunk/sci-misc/malaga/malaga-7.9.ebuild
index b5985da..a97c277 100644
--- a/trunk/sci-misc/malaga/malaga-7.7.ebuild
+++ b/trunk/sci-misc/malaga/malaga-7.9.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://home.arcor.de/bjoern-beutel/malaga/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~x86 ~amd64"
 IUSE="gtk doc readline emacs"
 
 DEPEND=">=dev-libs/glib-2.0
@@ -30,10 +30,11 @@ src_install() {
 }
 
 pkg_postinst() {
-	einfo "If you are using Emacs, add the line"
-	einfo "	(require 'malaga \".../malaga-7.5/malaga.el\")"
-	einfo "to the file \".emacs\" in your home directory, "
-	einfo "so the Malaga extensions will be loaded automatically "
-	einfo "if you are starting Emacs."
-	einfo "	(Use the absolute path for \".../malaga-7.5\".)"
+	if use emacs ; then
+		einfo "If you are using Emacs, add the line"
+		einfo "	(require 'malaga \"${ROOT}/usr/share/malaga/malaga.el\")"
+		einfo "to the file \".emacs\" in your home directory, "
+		einfo "so the Malaga extensions will be loaded automatically "
+		einfo "if you are starting Emacs."
+	fi
 }
diff --git a/trunk/sci-misc/suomi-malaga/Manifest b/trunk/sci-misc/suomi-malaga/Manifest
index ef0d48d..025b187 100644
--- a/trunk/sci-misc/suomi-malaga/Manifest
+++ b/trunk/sci-misc/suomi-malaga/Manifest
@@ -6,29 +6,10 @@ AUX malaga-7.8-pruning.patch 745 RMD160 9235fdcd41322a10a1264d553798075fe81aca8c
 MD5 c7d45ddb5d43853d2a684fbfb402ad98 files/malaga-7.8-pruning.patch 745
 RMD160 9235fdcd41322a10a1264d553798075fe81aca8c files/malaga-7.8-pruning.patch 745
 SHA256 440bc4071057660874d3622542c61c7c2331aff40774f2bf8afdf9eb3dc39a34 files/malaga-7.8-pruning.patch 745
-DIST suomi-malaga-0.7.1.tar.gz 391480 RMD160 74fb0292a753eb97ce1e1fdc3b120f8dc52c118e SHA1 744db12581b87f93fdc3d0d2fc9ca0972d6b3b42 SHA256 1188805252c3af445cdec196c503942feff5eda40e8797ba900754bf3829eea7
-DIST suomi-malaga-0.7.2.tar.gz 391645 RMD160 e118f5644bbc4064176a5282a78d2b73dc344579 SHA1 afe37c27a2782d9a6da3a5b386cd0008413f9623 SHA256 3ad46af998b5de93833f27e7bf348054c48498817ecd5fb3b030a483ebb1f442
 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.tar.bz2 305395 RMD160 748f2dba1993a67fefee09b2defbdac10e9b3627 SHA1 922adc25fef8d7b2a0893567c206b0b7365bcdb6 SHA256 23bb9edb50fbb45666f1be560074cb2ba7ab45da4cf2beb35d2a3d6994d6a61e
-DIST suomi-malaga-0.9.0.tar.bz2 387792 RMD160 955ee20ebb3a6c2dde2df8e453938cb5278e9d56 SHA1 ddfc680c0daea0d1cbd24007bc212796b5459cb6 SHA256 43f77f60ab9d62ef0665e9b73bc009788831700f5cc7541ee3dd02346b87df17
-DIST suomi-malaga-0.9.3.tar.bz2 686393 RMD160 078ca239d9830f5b474494252da2f0c04393ee71 SHA1 7d0f2da502977e848f61e27567213bf7225c013a SHA256 f61a4a2baa948f7ad066451b8dce5a2f1657f0c4b65387e1a55709384fb07dc4
-DIST suomi-malaga-0.9.4.tar.bz2 668396 RMD160 819d0aa06cf337f18abe75b89eb334cc522bf4c8 SHA1 baf5bd90e0208853e4b6aa261225f1d2e43690a2 SHA256 86c41f0e505f684523a9677663fee10e872b296ac3289ec20e8f8e7824f7d46e
-DIST suomi-malaga-0.9.5.tar.bz2 653935 RMD160 a1ce4c694e8e228941345d6e829b43dcbf57588f SHA1 82aea6bad775442ef0cd52a74abbd1fc5ab3e7fc SHA256 e753a2e5d78a3b903b9db3665925c2788566c8cf862c2e24a1d05f762ed29e27
 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.1.ebuild 666 RMD160 3dfbe2a4e93bdc9a5ed7fa0116ea87ea0923d133 SHA1 8ae6cd347b41cc3e266580d5977ecc7505416f38 SHA256 be360b1c2d5fcded54220f8fbac927c4f5d3df08dda7c76138923ac67c45e8ec
-MD5 bea07543bf7dcbc041fbfb36be7b686d suomi-malaga-0.7.1.ebuild 666
-RMD160 3dfbe2a4e93bdc9a5ed7fa0116ea87ea0923d133 suomi-malaga-0.7.1.ebuild 666
-SHA256 be360b1c2d5fcded54220f8fbac927c4f5d3df08dda7c76138923ac67c45e8ec suomi-malaga-0.7.1.ebuild 666
-EBUILD suomi-malaga-0.7.2.ebuild 815 RMD160 77d486b826c9145c5de2cc1c9763f1289c750225 SHA1 5045017700a3765581bb21cd256bec8da989ff8c SHA256 9a76efdc6713697ead9cf30ba5e45af6af593144567cbb5334714263d01768b4
-MD5 896af4cfb7c81f3cc6a96d1359b4b13e suomi-malaga-0.7.2.ebuild 815
-RMD160 77d486b826c9145c5de2cc1c9763f1289c750225 suomi-malaga-0.7.2.ebuild 815
-SHA256 9a76efdc6713697ead9cf30ba5e45af6af593144567cbb5334714263d01768b4 suomi-malaga-0.7.2.ebuild 815
-EBUILD suomi-malaga-0.7.2_p1.ebuild 993 RMD160 2c4f8ea3b3960849af91a9482819e661a3e9ca53 SHA1 aea17008bbf6d1b7dd7ec438f23518d2d0c9aa80 SHA256 ea085d82dd3aa4b1db0b88e11f1c5a5367bf61988c3539f99ed40c9c0908e03c
-MD5 78d1b8f38dd649112cd05d18af2212b4 suomi-malaga-0.7.2_p1.ebuild 993
-RMD160 2c4f8ea3b3960849af91a9482819e661a3e9ca53 suomi-malaga-0.7.2_p1.ebuild 993
-SHA256 ea085d82dd3aa4b1db0b88e11f1c5a5367bf61988c3539f99ed40c9c0908e03c suomi-malaga-0.7.2_p1.ebuild 993
 EBUILD suomi-malaga-0.7.3.ebuild 924 RMD160 2bb12d2db17c2808c4983be648bbd4c68448317e SHA1 e88d1c3639aff32f3109e005be0b01ea7d0f1bf2 SHA256 0e6ba754eb7d95015ce5fbf6028d9bb612fff829647d305c3c5fcd4f7dc7f86a
 MD5 996d9d89e83227ba590ceecc08fbfd30 suomi-malaga-0.7.3.ebuild 924
 RMD160 2bb12d2db17c2808c4983be648bbd4c68448317e suomi-malaga-0.7.3.ebuild 924
@@ -37,26 +18,6 @@ EBUILD suomi-malaga-0.7.4.ebuild 924 RMD160 2bb12d2db17c2808c4983be648bbd4c68448
 MD5 996d9d89e83227ba590ceecc08fbfd30 suomi-malaga-0.7.4.ebuild 924
 RMD160 2bb12d2db17c2808c4983be648bbd4c68448317e suomi-malaga-0.7.4.ebuild 924
 SHA256 0e6ba754eb7d95015ce5fbf6028d9bb612fff829647d305c3c5fcd4f7dc7f86a suomi-malaga-0.7.4.ebuild 924
-EBUILD suomi-malaga-0.7.ebuild 666 RMD160 7f3a0a3ecd2cc447998ff2e1507e68c39d22d6e6 SHA1 1f980802683b2ba35b9571319e7333bd06a3bfd8 SHA256 6c155858a8bf86c6668757121c48a11c3f4efa4f6438da41285bd70751c03ddd
-MD5 c3b8e3f5d0104a8fb934bb85bb374701 suomi-malaga-0.7.ebuild 666
-RMD160 7f3a0a3ecd2cc447998ff2e1507e68c39d22d6e6 suomi-malaga-0.7.ebuild 666
-SHA256 6c155858a8bf86c6668757121c48a11c3f4efa4f6438da41285bd70751c03ddd suomi-malaga-0.7.ebuild 666
-EBUILD suomi-malaga-0.9.0.ebuild 930 RMD160 bfa453539f488a0ff0e2d77b5c906e82e3cc7ead SHA1 8b60ae6053b2d579382de7047d0d4fb117503834 SHA256 7c994ffc1d23e8292d7c96978d172db6b401f8a3b4c431544381d2f03812d549
-MD5 1d4261c7bd325560740f803cc283162c suomi-malaga-0.9.0.ebuild 930
-RMD160 bfa453539f488a0ff0e2d77b5c906e82e3cc7ead suomi-malaga-0.9.0.ebuild 930
-SHA256 7c994ffc1d23e8292d7c96978d172db6b401f8a3b4c431544381d2f03812d549 suomi-malaga-0.9.0.ebuild 930
-EBUILD suomi-malaga-0.9.3.ebuild 893 RMD160 89079d1a1932f7c917f56cac663e65a600a31122 SHA1 8f90dc3a37e952d144d8d578d0fe8dc5eb349eab SHA256 da45b27372d74b484bb6aa6c0b604505eaee18750440c759131585a4e1ceb534
-MD5 251909a6c00994ef7739089a7367c737 suomi-malaga-0.9.3.ebuild 893
-RMD160 89079d1a1932f7c917f56cac663e65a600a31122 suomi-malaga-0.9.3.ebuild 893
-SHA256 da45b27372d74b484bb6aa6c0b604505eaee18750440c759131585a4e1ceb534 suomi-malaga-0.9.3.ebuild 893
-EBUILD suomi-malaga-0.9.4.ebuild 893 RMD160 89079d1a1932f7c917f56cac663e65a600a31122 SHA1 8f90dc3a37e952d144d8d578d0fe8dc5eb349eab SHA256 da45b27372d74b484bb6aa6c0b604505eaee18750440c759131585a4e1ceb534
-MD5 251909a6c00994ef7739089a7367c737 suomi-malaga-0.9.4.ebuild 893
-RMD160 89079d1a1932f7c917f56cac663e65a600a31122 suomi-malaga-0.9.4.ebuild 893
-SHA256 da45b27372d74b484bb6aa6c0b604505eaee18750440c759131585a4e1ceb534 suomi-malaga-0.9.4.ebuild 893
-EBUILD suomi-malaga-0.9.5.ebuild 893 RMD160 89079d1a1932f7c917f56cac663e65a600a31122 SHA1 8f90dc3a37e952d144d8d578d0fe8dc5eb349eab SHA256 da45b27372d74b484bb6aa6c0b604505eaee18750440c759131585a4e1ceb534
-MD5 251909a6c00994ef7739089a7367c737 suomi-malaga-0.9.5.ebuild 893
-RMD160 89079d1a1932f7c917f56cac663e65a600a31122 suomi-malaga-0.9.5.ebuild 893
-SHA256 da45b27372d74b484bb6aa6c0b604505eaee18750440c759131585a4e1ceb534 suomi-malaga-0.9.5.ebuild 893
 EBUILD suomi-malaga-0.9.7.ebuild 893 RMD160 1039e29ee34baf5dc79a4b4dd58bfe3bb3ded500 SHA1 58df867862db108c239b6cef273fb52603609dc6 SHA256 be25d3546cf8c16dbee7391aab1e9f349f00ade4e06ed1ebfd7986348d9a1717
 MD5 d0f050178e0e7126b2d712fe9e32ee99 suomi-malaga-0.9.7.ebuild 893
 RMD160 1039e29ee34baf5dc79a4b4dd58bfe3bb3ded500 suomi-malaga-0.9.7.ebuild 893
@@ -69,36 +30,12 @@ EBUILD suomi-malaga-9999.ebuild 942 RMD160 9003e39f01f6921fb8ce547bd9c11c9f7b48b
 MD5 11de09522984e37f001b08a931448ec6 suomi-malaga-9999.ebuild 942
 RMD160 9003e39f01f6921fb8ce547bd9c11c9f7b48b6ee suomi-malaga-9999.ebuild 942
 SHA256 faf68a21e6d8acead51969f4c89cb60c0efbda2a67e466bd4dacc2645178634c suomi-malaga-9999.ebuild 942
-MD5 c5ed06a5b54ebe479c520d4a0540a125 files/digest-suomi-malaga-0.7 253
-RMD160 398da816e0557bd31f59fc1584e5602b8198ee6a files/digest-suomi-malaga-0.7 253
-SHA256 a059ffe1a0e6d5523984b0860325d370bfb0da134d5ba0fc01e26c85f2ca683b files/digest-suomi-malaga-0.7 253
-MD5 18730279a84c3e45ef66ac596dc9702c files/digest-suomi-malaga-0.7.1 256
-RMD160 52612ffaaccd66fd0afe8246947d797c1a01c849 files/digest-suomi-malaga-0.7.1 256
-SHA256 3470a55077f0b9577f5dedb72c6cad757b96d0faefaf7799834f66b67cb78ba0 files/digest-suomi-malaga-0.7.1 256
-MD5 d0558774a859ff0f7922256ce71f56ed files/digest-suomi-malaga-0.7.2 256
-RMD160 40a36c458729322cfe576271e70501fabfd4b227 files/digest-suomi-malaga-0.7.2 256
-SHA256 8fd47bd3c875cc422a6549c516188513eec860e73ba47a36835455dc556e9840 files/digest-suomi-malaga-0.7.2 256
-MD5 d0558774a859ff0f7922256ce71f56ed files/digest-suomi-malaga-0.7.2_p1 256
-RMD160 40a36c458729322cfe576271e70501fabfd4b227 files/digest-suomi-malaga-0.7.2_p1 256
-SHA256 8fd47bd3c875cc422a6549c516188513eec860e73ba47a36835455dc556e9840 files/digest-suomi-malaga-0.7.2_p1 256
 MD5 6af48856e6bd97a0b31d7a18d767a347 files/digest-suomi-malaga-0.7.3 256
 RMD160 ae4d826bdced9e00e60d55bedf6626e6bcbfaaba files/digest-suomi-malaga-0.7.3 256
 SHA256 0d217defa06755dc76a91018e797b6c71709468d30e6967789f90001182048d9 files/digest-suomi-malaga-0.7.3 256
 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 278be9b9276eb065ba4135be6091081a files/digest-suomi-malaga-0.9.0 259
-RMD160 5f5371f2d2f1e5b17a145d3562e618761c788e33 files/digest-suomi-malaga-0.9.0 259
-SHA256 1cfe99f78b49affd089bb0ddc5a2dd5c31770aea31243d39f0ab3b49a758a184 files/digest-suomi-malaga-0.9.0 259
-MD5 66fa32c400229fe7568399f1ee73122c files/digest-suomi-malaga-0.9.3 259
-RMD160 97066c7e4418baea07ae9cbe4319679205034030 files/digest-suomi-malaga-0.9.3 259
-SHA256 8484c4f6780fb76ce22992f268d4cfb27e35cf7c24ac1a5cd468f63bdc91c42e files/digest-suomi-malaga-0.9.3 259
-MD5 ade4eb58740a9c6ccb4b04cc53a97255 files/digest-suomi-malaga-0.9.4 259
-RMD160 d634923cdbcdedd4d7dfac2896f711e0fa047ad9 files/digest-suomi-malaga-0.9.4 259
-SHA256 9134cd0d5c1ddf99dcc8bffb40e9c86cab76dc4838c677eeea24e4a5c27e371c files/digest-suomi-malaga-0.9.4 259
-MD5 0ecb2f50ccd710c41e4043415dd1428c files/digest-suomi-malaga-0.9.5 259
-RMD160 997c06bcd69b5a1b0ca93de67490ae398fd09ffe files/digest-suomi-malaga-0.9.5 259
-SHA256 adfe26446e40399758e9196b0be9f74a803c0e7c75bce04b62bcee67f486ff52 files/digest-suomi-malaga-0.9.5 259
 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.9.5 b/trunk/sci-misc/suomi-malaga/files/digest-suomi-malaga-0.9.5
deleted file mode 100644
index acf0ba5..0000000
--- a/trunk/sci-misc/suomi-malaga/files/digest-suomi-malaga-0.9.5
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 db550c6129859a42838524565f6389bd suomi-malaga-0.9.5.tar.bz2 653935
-RMD160 a1ce4c694e8e228941345d6e829b43dcbf57588f suomi-malaga-0.9.5.tar.bz2 653935
-SHA256 e753a2e5d78a3b903b9db3665925c2788566c8cf862c2e24a1d05f762ed29e27 suomi-malaga-0.9.5.tar.bz2 653935
diff --git a/trunk/sci-misc/suomi-malaga/suomi-malaga-0.9.5.ebuild b/trunk/sci-misc/suomi-malaga/suomi-malaga-0.7.4.ebuild
index a3f40fe..32987e7 100644
--- a/trunk/sci-misc/suomi-malaga/suomi-malaga-0.9.5.ebuild
+++ b/trunk/sci-misc/suomi-malaga/suomi-malaga-0.7.4.ebuild
@@ -1,26 +1,32 @@
-# Copyright 1999-2006 Gentoo Foundation
+# 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/suomi-malaga/suomi.html"
-SRC_URI="http://joyds1.joensuu.fi/${PN}/${P}.tar.bz2"
+HOMEPAGE="http://joyds1.joensuu.fi/sukija/sukija.html"
+SRC_URI="mirror://sourceforge/voikko/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64" # This is not a voikko version
+KEYWORDS="~x86 ~amd64" # a test version
 IUSE="doc"
 
-DEPEND="sci-misc/malaga
+DEPEND=">=sci-misc/malaga-7.8
 	doc? ( dev-tex/hevea )
 	sys-apps/grep
 	sys-apps/sed"
 RDEPEND="sci-misc/malaga"
 
+S="${WORKDIR}/suomimalaga-${PV}"
+
 src_compile() {
-	emake all || die "emake failed"
+	einfo "Making only voikko, sukija is broken for gentoo in ${PV}"
+	emake voikko || die "emake failed"
 }
 
+
 src_install() {
 	dodir /usr/lib/suomi-malaga
 	insinto /usr/lib/suomi-malaga
@@ -30,6 +36,3 @@ src_install() {
 	dodoc ChangeLog LUE.MINUT README
 }
 
-pkg_postinst() {
-	einfo "This is not voikko version of suomi-malaga."
-}
author	Flammie Pirinen <flammie@gentoo.org>	2007-05-15 02:26:34 +0000
committer	Flammie Pirinen <flammie@gentoo.org>	2007-05-15 02:26:34 +0000
commit	fb47f725ba1d8f3b91a4cbd9c3bbf67e91444d64 (patch)
tree	d0bdf4c5d6f8bc586f7c4d9387c88d9ac6332ea9 /trunk
parent	Suomi-malaga updated and cleaned (diff)
download	finnish-fb47f725ba1d8f3b91a4cbd9c3bbf67e91444d64.tar.gz finnish-fb47f725ba1d8f3b91a4cbd9c3bbf67e91444d64.tar.bz2 finnish-fb47f725ba1d8f3b91a4cbd9c3bbf67e91444d64.zip