Bump to EAPI=3, add prefix keywords, patches

Package-Manager: portage--svn/cvs/Linux i686

5 files changed, 88 insertions, 24 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/Manifest b/app-text/aspell/Manifest
index 39e919cf72d1..8ff8ba517a02 100644
--- a/app-text/aspell/Manifest
+++ b/app-text/aspell/Manifest
@@ -5,20 +5,22 @@ AUX aspell-0.50.5-charcount.patch 2264 RMD160 75e80538b3007e9d10d69a682e62990fd2
 AUX aspell-0.60.3-templateinstantiations.patch 274 RMD160 e84029e2b8c63e75421aecfc15fd30ec5d893419 SHA1 7e37c000d420ee52323f7660336e01447330a5a6 SHA256 71ec6d58f4e5e629d82869bc7c8c3eb63663aedf1be3c38f87ab872835f90f2a
 AUX aspell-0.60.5-gcc-4.3.patch 5460 RMD160 2b90f62f32994154034fc49baf71947f95279e01 SHA1 18ddce494afeff4fe97d1d531e4bd1f78b9d8465 SHA256 349f092bb2cc2f18d3cd8fb3039774f7157bf44179a704c968dcf425b40ed08e
 AUX aspell-0.60.5-nls.patch 443 RMD160 c5d89ec5ca398c990a7bb6598d5283471e43b92a SHA1 d502ebb74c97662af8ea365eb1cfffd222681859 SHA256 9c8a619f97ffcbb6a90bb5d5f0531d0890ca0033dcfae5b0fc70cb635df7b39c
+AUX aspell-0.60.5-solaris.patch 534 RMD160 cf7d1b11b771e916db83058c3f451b6d4b4218f7 SHA1 47f3dccf0a9bc19f8b55a78cd0f2162d1e07913d SHA256 e0d4f52e7cdfcf0ae727dbfd1fa967b9e6b7ad41bb56926108c2bff16ea232ad
+AUX aspell-0.60.6-darwin-bundles.patch 647 RMD160 4839f36d4283a0dd77656eee6905901403cb2dd8 SHA1 c27f1985c61c98c66c4d919d46f53dc4526046b9 SHA256 9e37613a35fa3b77ffad9330e026ad640de2666c1aa9cf930e2195136fb93785
 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.tar.gz 1777930 RMD160 315638cc7cc4ce9d3dc09c7e15faf637855d504e SHA1 335bcb560e00f59d89ec9e4c4114c325fb0e65f4 SHA256 4f5b1520e26cf6bbb1b5ca8a2f9f22948c3ca38ac4c2dd9e02df042fee7c0e36
 EBUILD aspell-0.50.5-r4.ebuild 1918 RMD160 c44f0875467fa48ca1b786bbbd5245f7ba68a2be SHA1 1807881c0b777e1a57d66e60b8b580e31601d593 SHA256 0cb69f5a88638ac387a12f39f21aa7133e2e2246c86a9023549d340bf199ef4c
 EBUILD aspell-0.60.5.ebuild 2997 RMD160 186aa4147a325b0546637dfdcaa0f6a47e27ea5f SHA1 2773248d455e724dfb21ad592965e7a5b7594350 SHA256 444cb843941a60d03706e2a015e5e53109240a6090d0e5052d2378fc8579f104
-EBUILD aspell-0.60.6-r1.ebuild 3514 RMD160 3590edc5e551d4b0c065b9c4b44a7876373fa264 SHA1 90e99fd235d86e3bf797599748f5b2b12c0afcdd SHA256 575b47f239312275447c323deda87f570075188451661c377ecfe56f97ab7e1b
+EBUILD aspell-0.60.6-r1.ebuild 3711 RMD160 74d91d7bca89d653d16384ae270c2531e267a923 SHA1 12b29eb92acf24ef8c4115ea2bafc49acfeac5cd SHA256 efa48dc05db40cb24e408e9d21b09e55c0e450cda41fecceebdda7017425bb9d
 EBUILD aspell-0.60.6.ebuild 3030 RMD160 c868f25e2ef0538c88fd208bf1734f9764f03adc SHA1 031c6bfeff851491c6e55cce1349ae986433226d SHA256 8233594391bfd549ab1d04ae0260e9299e1f6133be99c892375d7fe639ebde4b
-MISC ChangeLog 18557 RMD160 869733cb4bf1e72c689a426bf77970e5bff1d248 SHA1 160f7502795864b754fdd47a6aeaaf645c572347 SHA256 aaf97a93f1c530cbc6e0ba3f015b20f04ac03deb5e3aa6e38d8cf046b159a490
+MISC ChangeLog 18760 RMD160 0104a2e4f34045d373cf3bcfc2e1c23c5d66c9f6 SHA1 9bbc76daa45c643a1c0647e2332845d5fbbf5f7b SHA256 8974c17fcebb6ff1919610a5b930a9f852d21bfd2db3d7b62734dc78b68ccb72
 MISC metadata.xml 162 RMD160 853d3c463af1132de9d434e4bdca16fd81a21eb0 SHA1 0d9e341c4b61e23adc1f3806989a0236b83257a0 SHA256 9629e7723cb4708c1910c25510cd14da2729d34eed4ebfc1563df4a1ed5e1b22
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAku6T/AACgkQkKaRLQcq0GKaUQCaAi8vzB+pTsAfdQJLAxengYW4
-QIMAn1ldS8UHOcnSL7K+cKVX5qeQtY1f
-=tRs/
+iEYEARECAAYFAku7XMkACgkQOypDUo0oQOo0jwCfQ7VwaWPs8cLKm+TamW5MUy5s
+5RUAoIEAC0KCg4oKnvZ8IXFGsFGvMH41
+=dvS7
 -----END PGP SIGNATURE-----
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();