Drop old versions. Use sane looping for the aspell dicts if new pop up by chance, use default function for install.

Package-Manager: portage-2.2.0_alpha100/cvs/Linux x86_64

6 files changed, 34 insertions, 467 deletions

diff --git a/app-text/aspell/Manifest b/app-text/aspell/Manifest
index 1c2743444396..f5c76b528c07 100644
--- a/app-text/aspell/Manifest
+++ b/app-text/aspell/Manifest
@@ -10,25 +10,25 @@ AUX aspell-0.60.6-darwin-bundles.patch 963 RMD160 0b63bfe121246ee7b2a19be5694def
 AUX aspell-0.60.6-replace-fix.patch 1291 RMD160 e026dce5878339d2e83c7a99e5129b481f643dd9 SHA1 619d8fea8cd98d460165f3c0917a2a3a3a8fb7c3 SHA256 f31fe0844d3883c13d6588e08d78433eb9d7ce31d5b2e1cf60ced5c1f23218af
 AUX aspell-quotechar-fix.patch 473 RMD160 200f38438108555bfdc67c68008bced0c3a6b779 SHA1 3602ab6c07818ac0187613d6c54731b65004f741 SHA256 3b5bc1a87613b396b080fb5a13003ac58b9fb443a8d2dc4eb2e03851ddad3a6d
 DIST aspell-0.50.5.tar.gz 1016586 RMD160 6bfb0070e572ffdedf86ea87f50f4958bb418b12 SHA1 0b17272e1773ef133775d5e6be9fbccc8689ff58 SHA256 e385d747d7423846760170476f16f12719cf2846a99e1b5acea13eeb948c1f4d
-DIST aspell-0.60.5.tar.gz 1754865 RMD160 1efc56988a01e60d1fcff0143e910f5cb6618a76 SHA1 170ff906bd909dba32144c972d322cfc8fbff41b SHA256 ee9e81d2e3e66b01ad91da736e48568ed8acd6dfb6b664d904066ecc5ea4e84b
 DIST aspell-0.60.6.1.tar.gz 1878163 RMD160 6d4e29228e5c47cd4dbd780a73dbc1d2222e8266 SHA1 ff1190db8de279f950c242c6f4c5d5cdc2cbdc49 SHA256 f52583a83a63633701c5f71db3dc40aab87b7f76b29723aeb27941eff42df6e1
-DIST aspell-0.60.6.tar.gz 1777930 RMD160 315638cc7cc4ce9d3dc09c7e15faf637855d504e SHA1 335bcb560e00f59d89ec9e4c4114c325fb0e65f4 SHA256 4f5b1520e26cf6bbb1b5ca8a2f9f22948c3ca38ac4c2dd9e02df042fee7c0e36
 EBUILD aspell-0.50.5-r4.ebuild 1916 RMD160 3b83318ce4209668bebfde1e8c2736e57a8b64d7 SHA1 957d185ea1d134829dd64328017ef619de906d9c SHA256 7395c7df9424eff516d7e6717b78110ed1ae937edf451ba2dacb2a6479d878f8
-EBUILD aspell-0.60.5.ebuild 3021 RMD160 67a20a7ac45425e28a43fa3f827264b8fbb08d64 SHA1 de8e3bea94dd51e44a037ce0b60714400ffdc2b5 SHA256 523648346e8e66f9040588468695573422800f5c189f04dda3d01ac291bd9127
-EBUILD aspell-0.60.6-r1.ebuild 3714 RMD160 39bc4c9d85fa2086cc8a70500a3700c92c13d299 SHA1 80c91af1590334ed8f4e8f3db2c6ef767468e786 SHA256 4f178b9d89f5e741cc731e2400c97302139a2f4339b4da9cfb2019fc6a6adba3
-EBUILD aspell-0.60.6-r2.ebuild 3762 RMD160 365de5e84b9a12167bee3ecd7088a0a3ac96d93b SHA1 541fd3fac7adef82364da5f82566e0bc00aca625 SHA256 b221f55f4466c97349eb73fd1ccff42c36e57427f60524aa8808cf60182765d8
-EBUILD aspell-0.60.6.1.ebuild 2811 RMD160 a222c74524e1fa8e5e43bc2221714d4bc6cc93a8 SHA1 69254cbef4b8bf65c441868cd4a6473dd1399f66 SHA256 0da62c6c15d0a6c8bf0cdefec3d4b94c5639e8f3b46caef494db718f3f7eb8f3
-EBUILD aspell-0.60.6.ebuild 3030 RMD160 c868f25e2ef0538c88fd208bf1734f9764f03adc SHA1 031c6bfeff851491c6e55cce1349ae986433226d SHA256 8233594391bfd549ab1d04ae0260e9299e1f6133be99c892375d7fe639ebde4b
+EBUILD aspell-0.60.6.1.ebuild 2520 RMD160 5f4842ed80ed9e6fade6a0574cb9433ac6ef350c SHA1 9330eb378d2c90872098e073972617e185320435 SHA256 1f9ec9f47d7c88366e0abe8b7b9c8008e50f234ea3d0afc6920d585a5d6050fe
 MISC ChangeLog 21135 RMD160 98b7c371ff884d606f05927cdf311f6c5eabd9e3 SHA1 dee9f192e3d6ac9a3a260dd9f1b1fc26dbcff0ad SHA256 4838e45e7023e1d1e181ed820879c5853b63c4ca33c8ce826316d94b53edeca0
 MISC metadata.xml 162 RMD160 853d3c463af1132de9d434e4bdca16fd81a21eb0 SHA1 0d9e341c4b61e23adc1f3806989a0236b83257a0 SHA256 9629e7723cb4708c1910c25510cd14da2729d34eed4ebfc1563df4a1ed5e1b22
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQEbBAEBAgAGBQJPKA0iAAoJEEdUh39IaPFNmtwH90jxe15S4cvM8wdpU48Q4aCf
-3h7jjgHVr9kRIy+4m4f7FczlPB3xuDkbjZU2CKvl5YncxZwPs/neeNLrUgLJQrEJ
-WJgEnL9GbHSA0GolaxWTSgks7avcE0flC0NJoWL6YkFdvLku4IApGiFeMerYXIy1
-T1fMd+EOqcvqtlr6S9+b1u3EhEK1r25ro99GfL86T7XfqaDuaeJGR2nDEsJTMiMU
-R6k9dK7eyLhWl6mQ+I6jvHbOKm47nAH5mImcXnt9d/yzyo2GSiTFarFLf4s6Xi1Z
-v+ff+XTjQYzFAHMqWpG3PT8d9M8XQhip9J+FL3FxpG7SWdtnD9YGEWuS60NkNg==
-=1bVq
+iQIcBAEBAgAGBQJPjuJ+AAoJEOSiRoyO7jvoVdoQAKpDRiZrd8bBYyi3+4kQszUq
+8WdPArdh/jwF+20LP+aaM3Yvc9PUQIvO+O2oMh3FLxNQkQJYVHHk+qkRHTHFp6LP
+aJI3dBbJHG2emRdWLYK74jez3+13nS58Mia9mxULg1Zy8SGt5+PO9ZrAiFvCgss6
+aDciNfzr82Iob6jsrR6OtHQoLr1bPEqYFPtr0qIAxdNatBXsp+rmM72ge3A0hNQF
+V12Fvh5Ps4YvrvPhUD+dx8SfNcvi+xPVq5Kxd7VQ5JuNaN4a+nlG4qFUYz+c53WH
+3uPA0k2oFh4+Fjz+J7n5KFW9Fy7jSmjGL9Apb45CZEDckFukopj5902d7tyvdV1k
+k7XNUBR7WjCAWv6PfUPL+ev6nx4+OAlmSe8XrRIoroz5FkHR8P+54XAhy7F+oeQy
+cprjocvLM/bQI+WEAz0e8P8KQ0r0yAt4vWlWH3H4C/2fUihl5vlaBGQ2Vaq7hfRA
+rJU7pxFGIi/0x8W6a2fhZoOyMW65f2Tf7HB3ErpFJ+gjypQ886YwxtoMFKNKwYZ6
+2PtVqRgvsaBrPp3AWGr31oaWChOmVJrQnu5/ES+QGxhF8W8Uf48vTS5UmPjGJZMU
+gbfUyOtm36nB2fzIxffW4sz1y7dxSSrNpw7/Nz0b0TXf+4RQ67czRpYenfXSvrK+
+hnFG8fq6MnRcYWDvJjOr
+=jcaE
 -----END PGP SIGNATURE-----
diff --git a/app-text/aspell/aspell-0.60.5.ebuild b/app-text/aspell/aspell-0.60.5.ebuild
deleted file mode 100644
index f793b5333b18..000000000000
--- a/app-text/aspell/aspell-0.60.5.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/aspell/aspell-0.60.5.ebuild,v 1.20 2011/02/06 05:34:40 leio Exp $
-
-# N.B. This is before inherit of autotools, as autotools.eclass adds the
-# relevant dependencies to DEPEND.
-WANT_AUTOMAKE="1.10"
-
-inherit libtool eutils flag-o-matic autotools
-
-DESCRIPTION="A spell checker replacement for ispell"
-HOMEPAGE="http://aspell.net/"
-SRC_URI="mirror://gnu/aspell/${P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="gpm nls examples"
-# Note; app-text/aspell-0.6 and app-dicts/aspell-en-0.6 must go stable together
-
-# Build PDEPEND from list of language codes provided in the tree.
-# The PDEPEND string is static - this code just makes it easier to maintain.
-def="app-dicts/aspell-en"
-for l in \
-	"af" "be" "bg" "br" "ca" "cs" "cy" "da" "de" "el" \
-	"en" "eo" "es" "et" "fi" "fo" "fr" "ga" "gl" "he" \
-	"hr" "is" "it" "nl" "no" "pl" "pt" "ro" "ru" "sk" \
-	"sl" "sr" "sv" "uk" "vi"; do
-	dep="linguas_${l}? ( app-dicts/aspell-${l} )"
-	[[ -z ${PDEPEND} ]] &&
-		PDEPEND="${dep}" ||
-		PDEPEND="${PDEPEND}
-${dep}"
-	def="!linguas_${l}? ( ${def} )"
-	IUSE="${IUSE} linguas_${l}"
-done
-PDEPEND="${PDEPEND}
-${def}"
-
-RDEPEND=">=sys-libs/ncurses-5.2
-	gpm? ( sys-libs/gpm )
-	nls? ( virtual/libintl )
-	!=app-dicts/aspell-en-0.5*"
-# English dictionary 0.5 is incompatible with aspell-0.6
-
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/aspell-0.60.3-templateinstantiations.patch
-	epatch "${FILESDIR}/${P}-nls.patch"
-	epatch "${FILESDIR}/${P}-gcc-4.3.patch"
-
-	eautomake
-	elibtoolize --reverse-deps
-}
-
-src_compile() {
-	use gpm && append-ldflags -lgpm
-	filter-flags -fno-rtti
-	filter-flags -fvisibility=hidden #77109
-	filter-flags -maltivec -mabi=altivec
-	use ppc && append-flags -mno-altivec
-
-	econf \
-		$(use_enable nls) \
-		--disable-static \
-		--sysconfdir=/etc/aspell \
-		--enable-docdir=/usr/share/doc/${PF} || die
-
-	emake || die
-}
-
-src_install() {
-	dodoc README* TODO
-
-	make DESTDIR="${D}" install || die
-	mv "${D}"/usr/share/doc/${PF}/man-html "${D}"/usr/share/doc/${PF}/html
-	mv "${D}"/usr/share/doc/${PF}/man-text "${D}"/usr/share/doc/${PF}/text
-
-	# install ispell/aspell compatibility scripts
-	exeinto /usr/bin
-	newexe scripts/ispell ispell-aspell
-	newexe scripts/spell spell-aspell
-
-	if use examples ; then
-		cd examples
-		make clean || die
-		docinto examples
-		dodoc "${S}"/examples/*
-	fi
-}
-
-pkg_postinst() {
-	elog "You will need to install a dictionary now.  Please choose an"
-	elog "aspell-<LANG> dictionary from the app-dicts category"
-	elog "After installing an aspell dictionary for your language(s),"
-	elog "You may use the aspell-import utility to import your personal"
-	elog "dictionaries from ispell, pspell and the older aspell"
-
-	ewarn ""
-	ewarn "Please re-emerge ALL your aspell-LANG dictionaries"
-	ewarn ""
-	ebeep 5
-}
diff --git a/app-text/aspell/aspell-0.60.6-r1.ebuild b/app-text/aspell/aspell-0.60.6-r1.ebuild
deleted file mode 100644
index 72b474dfd064..000000000000
--- a/app-text/aspell/aspell-0.60.6-r1.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/aspell/aspell-0.60.6-r1.ebuild,v 1.12 2010/06/05 15:45:24 armin76 Exp $
-
-EAPI="3"
-
-# N.B. This is before inherit of autotools, as autotools.eclass adds the
-# relevant dependencies to DEPEND.
-WANT_AUTOMAKE="1.10"
-
-inherit libtool eutils flag-o-matic autotools
-
-DESCRIPTION="A spell checker replacement for ispell"
-HOMEPAGE="http://aspell.net/"
-SRC_URI="mirror://gnu/aspell/${P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="nls examples"
-# Note; app-text/aspell-0.6 and app-dicts/aspell-en-0.6 must go stable together
-
-# Build PDEPEND from list of language codes provided in the tree.
-# The PDEPEND string is static - this code just makes it easier to maintain.
-def="app-dicts/aspell-en"
-for l in \
-	"af" "be" "bg" "br" "ca" "cs" "cy" "da" "de" "el" \
-	"en" "eo" "es" "et" "fi" "fo" "fr" "ga" "gl" "he" \
-	"hr" "is" "it" "la" "lt" "nl" "no" "pl" "pt" "pt_BR" \
-	"ro" "ru" "sk" "sl" "sr" "sv" "uk" "vi" ; do
-	dep="linguas_${l}? ( app-dicts/aspell-${l/pt_BR/pt-br} )"
-	[[ ${l} = "de" ]] &&
-		dep="linguas_de? ( || ( app-dicts/aspell-de app-dicts/aspell-de-alt ) )"
-	[[ -z ${PDEPEND} ]] &&
-		PDEPEND="${dep}" ||
-		PDEPEND="${PDEPEND}
-${dep}"
-	def="!linguas_${l}? ( ${def} )"
-	IUSE="${IUSE} linguas_${l}"
-done
-PDEPEND="${PDEPEND}
-${def}"
-
-COMMON_DEPEND=">=sys-libs/ncurses-5.2
-	nls? ( virtual/libintl )"
-
-DEPEND="${COMMON_DEPEND}
-	nls? ( sys-devel/gettext )"
-
-# English dictionary 0.5 is incompatible with aspell-0.6
-RDEPEND="${COMMON_DEPEND}
-	!=app-dicts/aspell-en-0.5*"
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-0.60.3-templateinstantiations.patch"
-	epatch "${FILESDIR}/${PN}-0.60.5-nls.patch"
-	epatch "${FILESDIR}/${PN}-0.60.5-solaris.patch"
-	epatch "${FILESDIR}/${P}-darwin-bundles.patch"
-
-	rm m4/lt* m4/libtool.m4
-	eautoreconf
-	elibtoolize --reverse-deps
-}
-
-src_configure() {
-	filter-flags -fno-rtti
-	filter-flags -fvisibility=hidden #77109
-	filter-flags -maltivec -mabi=altivec
-	use ppc && append-flags -mno-altivec
-
-	# Was bug #46432. Ncurses changed linking with gpm, from NEWS:
-	# "20041009 change GPM initialization, using dl library to load it dynamically
-	# at runtime (Debian #110586)"
-	# and as a side effect it looks like we don't need add gpm library. (20090302)
-	#built_with_use sys-libs/ncurses gpm && mylibs="-lgpm"
-	LIBS="${mylibs}" econf \
-		$(use_enable nls) \
-		--disable-static \
-		--sysconfdir="${EPREFIX}"/etc/aspell \
-		--enable-docdir="${EPREFIX}"/usr/share/doc/${PF}
-}
-
-src_install() {
-	dodoc README* TODO || die "installing docs failed"
-
-	emake DESTDIR="${D}" install || die "installation failed"
-	mv "${ED}"usr/share/doc/${PF}/man-html "${ED}"usr/share/doc/${PF}/html
-	mv "${ED}"usr/share/doc/${PF}/man-text "${ED}"usr/share/doc/${PF}/text
-
-	# install ispell/aspell compatibility scripts
-	exeinto /usr/bin
-	newexe scripts/ispell ispell-aspell
-	newexe scripts/spell spell-aspell
-
-	if use examples ; then
-		cd examples
-		make clean || die
-		docinto examples
-		dodoc "${S}"/examples/* || die "installing examples failed"
-	fi
-}
-
-pkg_postinst() {
-	elog "In case LINGUAS was not set correctly you may need to install"
-	elog "dictionaries now. Please choose an aspell-<LANG> dictionary or"
-	elog "set LINGUAS correctly and let aspell pull in required packages."
-	elog "After installing an aspell dictionary for your language(s),"
-	elog "You may use the aspell-import utility to import your personal"
-	elog "dictionaries from ispell, pspell and the older aspell"
-}
diff --git a/app-text/aspell/aspell-0.60.6-r2.ebuild b/app-text/aspell/aspell-0.60.6-r2.ebuild
deleted file mode 100644
index f53bce8f73ae..000000000000
--- a/app-text/aspell/aspell-0.60.6-r2.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/aspell/aspell-0.60.6-r2.ebuild,v 1.8 2011/01/13 17:26:20 jer Exp $
-
-EAPI="3"
-
-# N.B. This is before inherit of autotools, as autotools.eclass adds the
-# relevant dependencies to DEPEND.
-WANT_AUTOMAKE="1.10"
-
-inherit libtool eutils flag-o-matic autotools
-
-DESCRIPTION="A spell checker replacement for ispell"
-HOMEPAGE="http://aspell.net/"
-SRC_URI="mirror://gnu/aspell/${P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="nls examples"
-# Note; app-text/aspell-0.6 and app-dicts/aspell-en-0.6 must go stable together
-
-# Build PDEPEND from list of language codes provided in the tree.
-# The PDEPEND string is static - this code just makes it easier to maintain.
-def="app-dicts/aspell-en"
-for l in \
-	"af" "be" "bg" "br" "ca" "cs" "cy" "da" "de" "el" \
-	"en" "eo" "es" "et" "fi" "fo" "fr" "ga" "gl" "he" \
-	"hr" "is" "it" "la" "lt" "nl" "no" "pl" "pt" "pt_BR" \
-	"ro" "ru" "sk" "sl" "sr" "sv" "uk" "vi" ; do
-	dep="linguas_${l}? ( app-dicts/aspell-${l/pt_BR/pt-br} )"
-	[[ ${l} = "de" ]] &&
-		dep="linguas_de? ( || ( app-dicts/aspell-de app-dicts/aspell-de-alt ) )"
-	[[ -z ${PDEPEND} ]] &&
-		PDEPEND="${dep}" ||
-		PDEPEND="${PDEPEND}
-${dep}"
-	def="!linguas_${l}? ( ${def} )"
-	IUSE="${IUSE} linguas_${l}"
-done
-PDEPEND="${PDEPEND}
-${def}"
-
-COMMON_DEPEND=">=sys-libs/ncurses-5.2
-	nls? ( virtual/libintl )"
-
-DEPEND="${COMMON_DEPEND}
-	nls? ( sys-devel/gettext )"
-
-# English dictionary 0.5 is incompatible with aspell-0.6
-RDEPEND="${COMMON_DEPEND}
-	!=app-dicts/aspell-en-0.5*"
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-0.60.3-templateinstantiations.patch"
-	epatch "${FILESDIR}/${PN}-0.60.5-nls.patch"
-	epatch "${FILESDIR}/${PN}-0.60.5-solaris.patch"
-	epatch "${FILESDIR}/${P}-darwin-bundles.patch"
-	epatch "${FILESDIR}/${P}-replace-fix.patch" #327405
-
-	rm m4/lt* m4/libtool.m4
-	eautoreconf
-	elibtoolize --reverse-deps
-}
-
-src_configure() {
-	filter-flags -fno-rtti
-	filter-flags -fvisibility=hidden #77109
-	filter-flags -maltivec -mabi=altivec
-	use ppc && append-flags -mno-altivec
-
-	# Was bug #46432. Ncurses changed linking with gpm, from NEWS:
-	# "20041009 change GPM initialization, using dl library to load it dynamically
-	# at runtime (Debian #110586)"
-	# and as a side effect it looks like we don't need add gpm library. (20090302)
-	#built_with_use sys-libs/ncurses gpm && mylibs="-lgpm"
-	LIBS="${mylibs}" econf \
-		$(use_enable nls) \
-		--disable-static \
-		--sysconfdir="${EPREFIX}"/etc/aspell \
-		--enable-docdir="${EPREFIX}"/usr/share/doc/${PF}
-}
-
-src_install() {
-	dodoc README* TODO || die "installing docs failed"
-
-	emake DESTDIR="${D}" install || die "installation failed"
-	mv "${ED}"usr/share/doc/${PF}/man-html "${ED}"usr/share/doc/${PF}/html
-	mv "${ED}"usr/share/doc/${PF}/man-text "${ED}"usr/share/doc/${PF}/text
-
-	# install ispell/aspell compatibility scripts
-	exeinto /usr/bin
-	newexe scripts/ispell ispell-aspell
-	newexe scripts/spell spell-aspell
-
-	if use examples ; then
-		cd examples
-		make clean || die
-		docinto examples
-		dodoc "${S}"/examples/* || die "installing examples failed"
-	fi
-}
-
-pkg_postinst() {
-	elog "In case LINGUAS was not set correctly you may need to install"
-	elog "dictionaries now. Please choose an aspell-<LANG> dictionary or"
-	elog "set LINGUAS correctly and let aspell pull in required packages."
-	elog "After installing an aspell dictionary for your language(s),"
-	elog "You may use the aspell-import utility to import your personal"
-	elog "dictionaries from ispell, pspell and the older aspell"
-}
diff --git a/app-text/aspell/aspell-0.60.6.1.ebuild b/app-text/aspell/aspell-0.60.6.1.ebuild
index aae0996eaada..4658324a204f 100644
--- a/app-text/aspell/aspell-0.60.6.1.ebuild
+++ b/app-text/aspell/aspell-0.60.6.1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/aspell/aspell-0.60.6.1.ebuild,v 1.7 2012/01/31 15:50:17 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/aspell/aspell-0.60.6.1.ebuild,v 1.8 2012/04/18 15:49:12 scarabeus Exp $
 
-EAPI="4"
+EAPI=4
 
 inherit libtool eutils flag-o-matic autotools
 
@@ -15,26 +15,23 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="nls"
 
-# Build PDEPEND from list of language codes provided in the tree.
-# The PDEPEND string is static - this code just makes it easier to maintain.
-def="app-dicts/aspell-en"
-for l in \
-	"af" "be" "bg" "br" "ca" "cs" "cy" "da" "de" "el" \
-	"en" "eo" "es" "et" "fi" "fo" "fr" "ga" "gl" "he" \
-	"hr" "is" "it" "la" "lt" "nl" "no" "pl" "pt" "pt_BR" \
-	"ro" "ru" "sk" "sl" "sr" "sv" "uk" "vi" ; do
-	dep="linguas_${l}? ( app-dicts/aspell-${l/pt_BR/pt-br} )"
-	[[ ${l} = "de" ]] &&
-		dep="linguas_de? ( || ( app-dicts/aspell-de app-dicts/aspell-de-alt ) )"
-	[[ -z ${PDEPEND} ]] &&
-		PDEPEND="${dep}" ||
-		PDEPEND="${PDEPEND}
-${dep}"
-	def="!linguas_${l}? ( ${def} )"
-	IUSE="${IUSE} linguas_${l}"
+PDEPEND="app-dicts/aspell-en"
+LANGS="af be bg br ca cs cy da de el en eo es et fi fo fr ga gl he hr is it la
+lt nl no pl pt pt_BR ro ru sk sl sr sv uk vi"
+for lang in ${LANGS}; do
+	dep="linguas_${lang}? ( app-dicts/aspell-${lang/pt_BR/pt-br} )"
+	if [[ ${lang} == de ]] ; then
+		dep="linguas_${lang}? (
+			|| (
+				app-dicts/aspell-${lang}
+				app-dicts/aspell-${lang}-alt
+			)
+		)"
+	fi
+	PDEPEND+=" ${dep}"
+	IUSE+=" linguas_${lang}"
 done
-PDEPEND="${PDEPEND}
-${def}"
+unset dep
 
 COMMON_DEPEND=">=sys-libs/ncurses-5.2
 	nls? ( virtual/libintl )"
@@ -66,7 +63,7 @@ src_configure() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install
+	default
 
 	dodoc README* TODO
 	dohtml -r manual/aspell{,-dev}.html
diff --git a/app-text/aspell/aspell-0.60.6.ebuild b/app-text/aspell/aspell-0.60.6.ebuild
deleted file mode 100644
index a097aec8f6d3..000000000000
--- a/app-text/aspell/aspell-0.60.6.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/aspell/aspell-0.60.6.ebuild,v 1.12 2009/12/26 20:36:02 pva Exp $
-
-# N.B. This is before inherit of autotools, as autotools.eclass adds the
-# relevant dependencies to DEPEND.
-WANT_AUTOMAKE="1.10"
-
-inherit libtool eutils flag-o-matic autotools
-
-DESCRIPTION="A spell checker replacement for ispell"
-HOMEPAGE="http://aspell.net/"
-SRC_URI="mirror://gnu/aspell/${P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
-IUSE="gpm nls examples"
-# Note; app-text/aspell-0.6 and app-dicts/aspell-en-0.6 must go stable together
-
-# Build PDEPEND from list of language codes provided in the tree.
-# The PDEPEND string is static - this code just makes it easier to maintain.
-def="app-dicts/aspell-en"
-for l in \
-	"af" "be" "bg" "br" "ca" "cs" "cy" "da" "de" "el" \
-	"en" "eo" "es" "et" "fi" "fo" "fr" "ga" "gl" "he" \
-	"hr" "is" "it" "nl" "no" "pl" "pt" "ro" \
-	"ru" "sk" "sl" "sr" "sv" "uk" "vi"; do
-	dep="linguas_${l}? ( app-dicts/aspell-${l} )"
-	[[ -z ${PDEPEND} ]] &&
-		PDEPEND="${dep}" ||
-		PDEPEND="${PDEPEND}
-${dep}"
-	def="!linguas_${l}? ( ${def} )"
-	IUSE="${IUSE} linguas_${l}"
-done
-PDEPEND="${PDEPEND}
-${def}"
-
-RDEPEND=">=sys-libs/ncurses-5.2
-	gpm? ( sys-libs/gpm )
-	nls? ( virtual/libintl )
-	!=app-dicts/aspell-en-0.5*"
-# English dictionary 0.5 is incompatible with aspell-0.6
-
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/aspell-0.60.3-templateinstantiations.patch"
-	epatch "${FILESDIR}/${PN}-0.60.5-nls.patch"
-
-	rm m4/lt* m4/libtool.m4
-	eautoreconf
-	elibtoolize --reverse-deps
-}
-
-src_compile() {
-	use gpm && append-ldflags -lgpm
-	filter-flags -fno-rtti
-	filter-flags -fvisibility=hidden #77109
-	filter-flags -maltivec -mabi=altivec
-	use ppc && append-flags -mno-altivec
-
-	econf \
-		$(use_enable nls) \
-		--disable-static \
-		--sysconfdir=/etc/aspell \
-		--enable-docdir=/usr/share/doc/${PF}
-
-	emake || die "compilation failed"
-}
-
-src_install() {
-	dodoc README* TODO || die "installing docs failed"
-
-	emake DESTDIR="${D}" install || die "installation failed"
-	mv "${D}"/usr/share/doc/${PF}/man-html "${D}"/usr/share/doc/${PF}/html
-	mv "${D}"/usr/share/doc/${PF}/man-text "${D}"/usr/share/doc/${PF}/text
-
-	# install ispell/aspell compatibility scripts
-	exeinto /usr/bin
-	newexe scripts/ispell ispell-aspell
-	newexe scripts/spell spell-aspell
-
-	if use examples ; then
-		cd examples
-		make clean || die
-		docinto examples
-		dodoc "${S}"/examples/* || die "installing examples failed"
-	fi
-}
-
-pkg_postinst() {
-	elog "You will need to install a dictionary now.  Please choose an"
-	elog "aspell-<LANG> dictionary from the app-dicts category"
-	elog "After installing an aspell dictionary for your language(s),"
-	elog "You may use the aspell-import utility to import your personal"
-	elog "dictionaries from ispell, pspell and the older aspell"
-}