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

(Portage version: 2.2.0_alpha100/cvs/Linux x86_64)

5 files changed, 19 insertions, 452 deletions

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"
-}