Bump to EAPI=3, add prefix keywords, patches

(Portage version: -svn/cvs/Linux i686)

4 files changed, 81 insertions, 19 deletions

diff --git a/app-text/aspell/ChangeLog b/app-text/aspell/ChangeLog
index 8fe9990a4174..a96c12d46971 100644
--- a/app-text/aspell/ChangeLog
+++ b/app-text/aspell/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-text/aspell
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/aspell/ChangeLog,v 1.120 2010/04/05 21:03:44 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/aspell/ChangeLog,v 1.121 2010/04/06 16:09:36 abcd Exp $
+
+  06 Apr 2010; Jonathan Callen <abcd@gentoo.org>
+  +files/aspell-0.60.5-solaris.patch, aspell-0.60.6-r1.ebuild,
+  +files/aspell-0.60.6-darwin-bundles.patch:
+  Bump to EAPI=3, add prefix keywords, patches
 
   05 Apr 2010; Markus Meier <maekke@gentoo.org> aspell-0.60.6-r1.ebuild:
   amd64/arm/x86 stable, bug #310015
diff --git a/app-text/aspell/aspell-0.60.6-r1.ebuild b/app-text/aspell/aspell-0.60.6-r1.ebuild
index a78bc7f37fba..0328c0e8ef89 100644
--- a/app-text/aspell/aspell-0.60.6-r1.ebuild
+++ b/app-text/aspell/aspell-0.60.6-r1.ebuild
@@ -1,6 +1,8 @@
 # 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.9 2010/04/05 21:03:44 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/aspell/aspell-0.60.6-r1.ebuild,v 1.10 2010/04/06 16:09:36 abcd Exp $
+
+EAPI="3"
 
 # N.B. This is before inherit of autotools, as autotools.eclass adds the
 # relevant dependencies to DEPEND.
@@ -14,7 +16,7 @@ SRC_URI="mirror://gnu/aspell/${P}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~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
 
@@ -39,26 +41,28 @@ done
 PDEPEND="${PDEPEND}
 ${def}"
 
-RDEPEND=">=sys-libs/ncurses-5.2
-	nls? ( virtual/libintl )
-	!=app-dicts/aspell-en-0.5*"
-# English dictionary 0.5 is incompatible with aspell-0.6
+COMMON_DEPEND=">=sys-libs/ncurses-5.2
+	nls? ( virtual/libintl )"
 
-DEPEND="${RDEPEND}
+DEPEND="${COMMON_DEPEND}
 	nls? ( sys-devel/gettext )"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/aspell-0.60.3-templateinstantiations.patch"
+# 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_compile() {
+src_configure() {
 	filter-flags -fno-rtti
 	filter-flags -fvisibility=hidden #77109
 	filter-flags -maltivec -mabi=altivec
@@ -72,18 +76,16 @@ src_compile() {
 	LIBS="${mylibs}" econf \
 		$(use_enable nls) \
 		--disable-static \
-		--sysconfdir=/etc/aspell \
-		--enable-docdir=/usr/share/doc/${PF}
-
-	emake || die "compilation failed"
+		--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 "${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
+	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
diff --git a/app-text/aspell/files/aspell-0.60.5-solaris.patch b/app-text/aspell/files/aspell-0.60.5-solaris.patch
new file mode 100644
index 000000000000..fc1920a4f57a
--- /dev/null
+++ b/app-text/aspell/files/aspell-0.60.5-solaris.patch
@@ -0,0 +1,27 @@
+* grobian@gentoo.org: on Solaris 10 _XOPEN_SOURCE_EXTENDED may not be
+  defined when including wchar.h with g++
+
+--- prog/check_funs.cpp
++++ prog/check_funs.cpp
+@@ -18,10 +18,6 @@
+ 
+ #include "settings.h"
+ 
+-#ifdef DEFINE_XOPEN_SOURCE_EXTENDED
+-#  define _XOPEN_SOURCE_EXTENDED 1
+-#endif
+-
+ #ifdef CURSES_NON_POSIX
+ #define CURSES_ONLY 1
+ #endif
+@@ -35,6 +31,10 @@
+ 
+ #include "gettext.h"
+ 
++#ifdef DEFINE_XOPEN_SOURCE_EXTENDED
++#  define _XOPEN_SOURCE_EXTENDED 1
++#endif
++
+ using namespace acommon;
+ 
+ StackPtr<CheckerString> state;
diff --git a/app-text/aspell/files/aspell-0.60.6-darwin-bundles.patch b/app-text/aspell/files/aspell-0.60.6-darwin-bundles.patch
new file mode 100644
index 000000000000..20d18b2f96c2
--- /dev/null
+++ b/app-text/aspell/files/aspell-0.60.6-darwin-bundles.patch
@@ -0,0 +1,28 @@
+--- lib/new_filter.cpp
++++ lib/new_filter.cpp
+@@ -458,11 +458,23 @@
+       module->file.assign(option_file.str(), slash + 1 - option_file.str());
+       //module->file += "lib";
+       module->file += filter_name;
+-      module->file += "-filter.so";
++      module->file += "-filter."
++#ifdef __APPLE_CC__
++		  "bundle"
++#else
++		  "so"
++#endif
++		  ;
+     } else {
+       if (module->file[0] != '/')
+         module->file.insert(0, option_file.str(), slash + 1 - option_file.str());
+-      module->file += ".so";
++      module->file += "."
++#ifdef __APPLE_CC__
++		  "bundle"
++#else
++		  "so"
++#endif
++		  ;
+     }
+ 
+     return module.release();