Bump to 0.60.5 - bug #167461

(Portage version: 2.1.2-r10)

7 files changed, 114 insertions, 8 deletions

diff --git a/app-text/aspell/ChangeLog b/app-text/aspell/ChangeLog
index 767b836b2667..09a2c992ca69 100644
--- a/app-text/aspell/ChangeLog
+++ b/app-text/aspell/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-text/aspell
-# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/aspell/ChangeLog,v 1.81 2006/11/30 20:16:51 kevquinn Exp $
+# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/aspell/ChangeLog,v 1.82 2007/03/03 11:32:12 kevquinn Exp $
+
+*aspell-0.60.5 (03 Mar 2007)
+
+  03 Mar 2007; Kevin F. Quinn <kevquinn@gentoo.org>
+  +files/aspell-0.60.5-nls.patch, +aspell-0.60.5.ebuild:
+  Bump to 0.60.5 - bug #167461
+  Also fix incorrect copyright headers in other ebuilds that had changed in
+  2007 (naughty genstef ;)).
 
 *aspell-0.60.4-r1 (30 Nov 2006)
 *aspell-0.60.3-r1 (30 Nov 2006)
diff --git a/app-text/aspell/aspell-0.50.5-r4.ebuild b/app-text/aspell/aspell-0.50.5-r4.ebuild
index 699d47f8ea54..4ea3fabd31a1 100644
--- a/app-text/aspell/aspell-0.50.5-r4.ebuild
+++ b/app-text/aspell/aspell-0.50.5-r4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/aspell/aspell-0.50.5-r4.ebuild,v 1.16 2007/02/28 22:00:21 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/aspell/aspell-0.50.5-r4.ebuild,v 1.17 2007/03/03 11:32:12 kevquinn Exp $
 
 inherit libtool eutils flag-o-matic
 
diff --git a/app-text/aspell/aspell-0.60.3-r1.ebuild b/app-text/aspell/aspell-0.60.3-r1.ebuild
index a04b97d0393f..3769816a635e 100644
--- a/app-text/aspell/aspell-0.60.3-r1.ebuild
+++ b/app-text/aspell/aspell-0.60.3-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/aspell/aspell-0.60.3-r1.ebuild,v 1.2 2007/02/28 22:00:21 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/aspell/aspell-0.60.3-r1.ebuild,v 1.3 2007/03/03 11:32:12 kevquinn Exp $
 
 inherit libtool eutils flag-o-matic
 
diff --git a/app-text/aspell/aspell-0.60.3.ebuild b/app-text/aspell/aspell-0.60.3.ebuild
index 05e9b57517f8..ead871000d20 100644
--- a/app-text/aspell/aspell-0.60.3.ebuild
+++ b/app-text/aspell/aspell-0.60.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/aspell/aspell-0.60.3.ebuild,v 1.4 2007/02/28 22:00:21 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/aspell/aspell-0.60.3.ebuild,v 1.5 2007/03/03 11:32:12 kevquinn Exp $
 
 inherit libtool eutils flag-o-matic
 
diff --git a/app-text/aspell/aspell-0.60.5.ebuild b/app-text/aspell/aspell-0.60.5.ebuild
new file mode 100644
index 000000000000..8affe237d166
--- /dev/null
+++ b/app-text/aspell/aspell-0.60.5.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2007 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.1 2007/03/03 11:32:12 kevquinn Exp $
+
+# N.B. This is before inherit of autotools, as autotools.eclass adds the
+# relevant dependencies to DEPEND.
+WANT_AUTOMAKE="1.9"
+
+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="~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="gpm nls"
+
+RDEPEND=">=sys-libs/ncurses-5.2
+	gpm? ( sys-libs/gpm )
+	nls? ( virtual/libintl )"
+
+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"
+
+	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
+
+	cd examples
+	make clean || die
+	docinto examples
+	dodoc ${S}/examples/*
+}
+
+pkg_postinst() {
+	einfo "You will need to install a dictionary now.  Please choose an"
+	einfo "aspell-<LANG> dictionary from the app-dicts category"
+	einfo "After installing an aspell dictionary for your language(s),"
+	einfo "You may use the aspell-import utility to import your personal"
+	einfo "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/files/aspell-0.60.5-nls.patch b/app-text/aspell/files/aspell-0.60.5-nls.patch
new file mode 100644
index 000000000000..3ea7c7c3f4ec
--- /dev/null
+++ b/app-text/aspell/files/aspell-0.60.5-nls.patch
@@ -0,0 +1,13 @@
+Index: aspell-0.60.5/Makefile.am
+===================================================================
+--- aspell-0.60.5/Makefile.am
++++ aspell-0.60.5/Makefile.am
+@@ -129,7 +129,7 @@ word_list_compress_SOURCES = prog/compre
+ 
+ aspell_SOURCES = prog/aspell.cpp prog/check_funs.cpp prog/checker_string.cpp
+ 
+-aspell_LDADD = libaspell.la $(CURSES_LIB)
++aspell_LDADD = libaspell.la $(CURSES_LIB) $(LTLIBINTL)
+ 
+ prezip_bin_SOURCES = prog/prezip.c
+ 
diff --git a/app-text/aspell/files/digest-aspell-0.60.5 b/app-text/aspell/files/digest-aspell-0.60.5
new file mode 100644
index 000000000000..82b171c1aa31
--- /dev/null
+++ b/app-text/aspell/files/digest-aspell-0.60.5
@@ -0,0 +1,3 @@
+MD5 17fd8acac6293336bcef44391b71e337 aspell-0.60.5.tar.gz 1754865
+RMD160 1efc56988a01e60d1fcff0143e910f5cb6618a76 aspell-0.60.5.tar.gz 1754865
+SHA256 ee9e81d2e3e66b01ad91da736e48568ed8acd6dfb6b664d904066ecc5ea4e84b aspell-0.60.5.tar.gz 1754865