Version bump and cleanup

svn path=/; revision=41

3 files changed, 15 insertions, 93 deletions

diff --git a/trunk/app-text/tmispell/Manifest b/trunk/app-text/tmispell/Manifest
index 4bacc56..6f3faef 100644
--- a/trunk/app-text/tmispell/Manifest
+++ b/trunk/app-text/tmispell/Manifest
@@ -3,12 +3,11 @@ AUX tmispell-svn-autoconf-autopoint.patch 267 RMD160 ea881a2d4e5854550877f383258
 AUX tmispell-svn-autogen.sh-automake.patch 512 RMD160 8a4dd3183414349608f9139f2d98e944b9dfcbc9 SHA1 81083b93e807eb7f2786764158388d9c53480e93 SHA256 64e66f30fba2a9268f9dd4b92316cc03d1f4f6231fad91cd2aa48f36af6df52d
 AUX tmispell-svn-autogen.sh-undoc.patch 466 RMD160 aa8d46597be18ac9f4c346d5ed41ba5f42e7df7e SHA1 851299f4b4549fc5b26bfdbe857cf72d7aec5415 SHA256 73299a75cd63eae7f909d6465ce9c29d8d4f358fe24a3e7a95b4b5e1a39b25a2
 AUX tmispell.conf.gentoo 2001 RMD160 90f913b2e0ad48a63171c62fb07d99c1e5724ec6 SHA1 4c8a940252584c8a9316689751ded0e70159f1b4 SHA256 3f2e4c0775216fa25087d1fddbefa82c8dd6ce5d8a72766510f274f566d3b9e0
-DIST tmispell-voikko-0.6.1.tar.gz 440365 RMD160 057f4b9b1c7cd939aeaf666f5e1b319b33e7b7d9 SHA1 522a47af5c618efdb204fe9eea51e32ecfced096 SHA256 06b8e1ce093a3582488254e5af6759beebf1d02baafa7ea133aa04544c67ffbc
 DIST tmispell-voikko-0.6.2.tar.gz 440775 RMD160 9687b9091f6c10fc0626ab28362dc45a1f8840d2 SHA1 05638712ec3e698f84cbcc4507c50c8c2eabfedf SHA256 3371dca5ff1e8886dc0165746ce86b2a4ffc21bb93b8e1c64f98c16e8cf338b6
 DIST tmispell-voikko-0.6.3.tar.gz 443292 RMD160 6d9f4a4c3bff4883810bdc808bec224c6bb5c794 SHA1 095b3712e6714186899ed40b8bf3a8dcd0bec1be SHA256 6215f26de48ca65be414784766e251aa9b002d2867422ac489830dbbd9b232b8
-EBUILD tmispell-0.6.1.ebuild 1967 RMD160 84a77e21e5656355ca94bacd901b432afc7ae014 SHA1 50074636201d1bd99d8719370507cdb307baf785 SHA256 b2e87c733741decc1d00f03757cd9965ed3c1ff17517615407697f1c32a22f35
+DIST tmispell-voikko-0.7.tar.gz 426748 RMD160 d288ddcb9a2c73e96d61f3b1cc45a20aa6c56aef SHA1 ee434f2b5ef044d2b272c1fe794b0804ce329378 SHA256 c0aba886d3b06372e2b66f99f2a54c6046bfb2f1fca6f4fbde76fa2b000b2417
 EBUILD tmispell-0.6.2-r1.ebuild 1663 RMD160 5beea96f495dd32a25a689e5a0b84c975118a7f8 SHA1 12158acbfa3d71945a08c2f3f82c036ae7cea047 SHA256 bb9a1ccb96bf7b0e3167a1f0dc19e406fb7a9effa33c45d9b5d8c6f781c35e35
-EBUILD tmispell-0.6.2.ebuild 2007 RMD160 1353f0d4fdacab6951b650d7f34c6f7ea3e7e4ed SHA1 7d4e1d25a9548fca87f58395fcf99cc1c32d99c8 SHA256 bef04c3f058b9b4b140546da3c03c68ab0d493c1f73553fcf612d8462eb1aca6
 EBUILD tmispell-0.6.3.ebuild 1663 RMD160 6ab5ec5d8fdbcaf8f6e3a0835719319e261a5fb0 SHA1 bf6ce76b66730c3b849b8b0176727596312c7471 SHA256 c81251c5db52b2d983d08f9b6857c333818b2c086c22e843e9fadfebc46522da
+EBUILD tmispell-0.7.ebuild 1663 RMD160 e4377ccec95f9e57b18cde96f155f662c3fc3c12 SHA1 e1361e0d6bb91359af4175cb6a269d2b3e4a2688 SHA256 f0ed3aad4750b00e8c4e252f478a1495ea9fb62294808d72977ec54fc221335a
 MISC ChangeLog 1069 RMD160 69a7e72677ad897dfec39a2cd32845803d2d2d11 SHA1 25749d7cf46e96ec324a55f00de43838feeae55e SHA256 b0cca94bde481cec28682ef3f6ea513a8cf909ffecd7e9c87dfc021c7e109813
 MISC metadata.xml 523 RMD160 f4f148f7616776a780f1da73a8a882c569883e70 SHA1 13e1474c99fd1eb8db2b3a8c5c5e189a227f80e2 SHA256 d55fe97efbb0ae522d2eaacde4041c47846883fc6e10c2ff9006c459ab0f33da
diff --git a/trunk/app-text/tmispell/tmispell-0.6.1.ebuild b/trunk/app-text/tmispell/tmispell-0.6.1.ebuild
deleted file mode 100644
index fb4196e..0000000
--- a/trunk/app-text/tmispell/tmispell-0.6.1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit eutils
-
-MY_P=${PN}-voikko-${PV}
-
-DESCRIPTION="Tmispell is interface between ispell OO.o Finnish spellcheckers."
-SRC_URI="mirror://sourceforge/voikko/${MY_P}.tar.gz"
-HOMEPAGE="http://www.hut.fi/~ptvirtan/programs/tmispell.html"
-IUSE="enchant nls"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~amd64"
-
-DEPEND=">=app-text/ispell-3.2.06-r7
-	!app-dicts/ispell-fi
-	app-text/voikko
-	>=dev-libs/glib-2.0.0
-	nls? ( sys-devel/gettext )
-	sys-apps/coreutils
-	sys-apps/sed
-	sys-devel/bison
-	sys-apps/miscfiles
-	>=sys-libs/ncurses-5.2"
-RDEPEND=">=app-text/ispell-3.2.06-r7
-	app-text/voikko
-	>=dev-libs/glib-2.0.0
-	nls? ( sys-devel/gettext )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_compile() {
-	econf $(use_enable enchant ) || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "install failed"
-	dodoc AUTHORS ChangeLog LUEMINUT NEWS README tmispell.conf.example
-	if [[ -d "${ROOT}/usr/lib/ispell" ]] ; then
-		dodir /usr/lib/ispell
-		touch "${D}/usr/lib/ispell/suomi.hash" "${D}/usr/lib/ispell/suomi.aff"
-		touch "${D}/usr/lib/ispell/finnish.hash" "${D}/usr/lib/ispell/finnish.aff"
-	elif [[ -d "${ROOT}/usr/share/ispell" ]] ; then
-		dodir /usr/share/ispell
-		touch "${D}/usr/share/ispell/suomi.hash" "${D}/usr/share/ispell/suomi.aff"
-		touch "${D}/usr/share/ispell/finnish.hash" "${D}/usr/share/ispell/suomi.aff"
-	fi
-	insinto /etc/
-	newins "${FILESDIR}/tmispell.conf.gentoo" tmispell.conf
-	sed -i "s:/usr/bin:${ROOT}/usr/bin:g" "${D}/etc/tmispell.conf"
-	dosym /usr/bin/tmispell /usr/bin/ispell
-}
-
-pkg_postrm() {
-	# FIXME: a bit bogus, because it warns on upgrades and whatnot
-	if has_version app-text/ispell ; then
-		elog "If you are removing tmispell AND leaving ispell you must"
-		elog "remerge ispell or do:"
-		elog "	ln -s ${ROOT}/usr/bin/ispell.real ${ROOT}/usr/bin/ispell "
-		elog "for ispell to work"
-	fi
-}
diff --git a/trunk/app-text/tmispell/tmispell-0.6.2.ebuild b/trunk/app-text/tmispell/tmispell-0.7.ebuild
index 0287e74..54d0a28 100644
--- a/trunk/app-text/tmispell/tmispell-0.6.2.ebuild
+++ b/trunk/app-text/tmispell/tmispell-0.7.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
 inherit eutils
 
-MY_P=${PN}-voikko-${PV}
+MY_PV=${PV/_rc/rc}
+MY_P=${PN}-voikko-${MY_PV}
 
 DESCRIPTION="Tmispell is interface between ispell OO.o Finnish spellcheckers."
 SRC_URI="mirror://sourceforge/voikko/${MY_P}.tar.gz"
@@ -13,9 +14,9 @@ IUSE="enchant nls"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~x86"
 
-DEPEND=">=app-text/ispell-3.2.06-r7
+DEPEND=">=app-text/ispell-3.3.02-r90
 	!app-dicts/ispell-fi
 	>=app-text/voikko-1.0
 	>=dev-libs/glib-2.0.0
@@ -23,15 +24,15 @@ DEPEND=">=app-text/ispell-3.2.06-r7
 	sys-apps/coreutils
 	sys-devel/bison
 	sys-apps/miscfiles
-	>=sys-libs/ncurses-5.2
-	dev-util/pkgconfig"
+	dev-util/pkgconfig
+	app-admin/eselect-ispell"
 RDEPEND=">=app-text/ispell-3.2.06-r7
 	>=app-text/voikko-1.0
 	>=dev-libs/glib-2.0.0
 	enchant? ( >=app-text/enchant-1.1.6 )
 	nls? ( sys-devel/gettext )"
 
-S="${WORKDIR}/${MY_P}"
+S="${WORKDIR}/${MY_P/rc?/}"
 
 pkg_setup() {
 	if [[ -d "${ROOT}/usr/lib/ispell" ]] ; then
@@ -50,28 +51,16 @@ src_compile() {
 
 src_install() {
 	emake DESTDIR="${D}" install || die "install failed"
-	dodoc AUTHORS ChangeLog LUEMINUT NEWS README tmispell.conf.example
+	dodoc AUTHORS ChangeLog README.fi NEWS README tmispell.conf.example ||\
+		die "docs missing"
 	insinto /etc/
 	newins "${FILESDIR}/tmispell.conf.gentoo" tmispell.conf
-	dosym /usr/bin/tmispell /usr/bin/ispell
 	dodir ${ISPELL_DIR}
 	touch "${D}/${ISPELL_DIR}/"{suomi,finnish}.{hash,aff}
 }
 
 pkg_postinst() {
-	if [[ ${ROOT} != "/" ]] ; then
-		einfo "If you need to use ispell from different path than "
-		einfo " /usr/bin/ispell"
-		einfo "you must modify ${ROOT}/etc/tmispell.conf accordingly"
-	fi
-}
-
-pkg_postrm() {
-	# FIXME: a bit bogus, because it warns on upgrades and whatnot
-	if has_version app-text/ispell ; then
-		elog "If you are removing tmispell AND leaving ispell you must"
-		elog "remerge ispell or do:"
-		elog "	ln -s ${ROOT}/usr/bin/ispell.real ${ROOT}/usr/bin/ispell "
-		elog "for ispell to work"
-	fi
+	elog "Use “eselect ispell set tmispell” to get legacy applications"
+	elog "which want ispell working with tmispell"
+	eselect ispell update --if-unset
 }