Add ~x86-fbsd keyword after fixing linking with libintl. Add nls useflag to allow enabling/disabling nls support (with proper dependencies).

Package-Manager: portage-2.1_pre7-r4

4 files changed, 62 insertions, 14 deletions

diff --git a/app-text/aspell/ChangeLog b/app-text/aspell/ChangeLog
index b1e7aa73004e..fe009ff8b726 100644
--- a/app-text/aspell/ChangeLog
+++ b/app-text/aspell/ChangeLog
@@ -1,6 +1,11 @@
 # 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.78 2006/03/20 20:35:50 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/aspell/ChangeLog,v 1.79 2006/04/07 17:15:12 flameeyes Exp $
+
+  07 Apr 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +files/aspell-0.60.4-nls.patch, aspell-0.60.4.ebuild:
+  Add ~x86-fbsd keyword after fixing linking with libintl. Add nls useflag to
+  allow enabling/disabling nls support (with proper dependencies).
 
   20 Mar 2006; Fabian Groffen <grobian@gentoo.org> aspell-0.60.4.ebuild:
   Removed ~ppc-macos for 0.60.4, it has undefined symbols during the linking
diff --git a/app-text/aspell/Manifest b/app-text/aspell/Manifest
index c637da8bad8f..ad744e141d6b 100644
--- a/app-text/aspell/Manifest
+++ b/app-text/aspell/Manifest
@@ -1,15 +1,18 @@
-MD5 98f1e323a8233723afa086e016e591f1 ChangeLog 12310
-RMD160 098b7c0e69713f06df3a7e3905930097d3a73996 ChangeLog 12310
-SHA256 dfee953c49632c82cdb45d29d0a9e68af7492b36d3d6dabc099d47414e2ad103 ChangeLog 12310
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 3abbc1c6527fa98952eb44e9aa738ed5 ChangeLog 12567
+RMD160 a5c74da2b206fb30b4167711fd5d955ca525c86a ChangeLog 12567
+SHA256 a2a49bc9f7411c78c10892f05b5094435a968b9f4de2d6fe5f9b13cdb32f976d ChangeLog 12567
 MD5 363b7bd06a8f3dead95475a7cb50fae2 aspell-0.50.5-r4.ebuild 1955
 RMD160 6ccd12b48527aa3fe5cddcd80a07ffd0cd1289aa aspell-0.50.5-r4.ebuild 1955
 SHA256 78ef20fadab4354dfcf697612279ac2738f3b1db24315854f8eff796c4cfb13c aspell-0.50.5-r4.ebuild 1955
 MD5 e67f599d5793e4b71209409651b42464 aspell-0.60.3.ebuild 1835
 RMD160 ab543eea853ee615b89e73fbf52f1751b4ee68b8 aspell-0.60.3.ebuild 1835
 SHA256 0af7133bf797ea755653cfdfa08ba767929d56a2bd90f7426c0a4448a3e45e96 aspell-0.60.3.ebuild 1835
-MD5 d92e506868ea6f01251e42e89d284439 aspell-0.60.4.ebuild 1880
-RMD160 8277b1f25d8e56975f43cc7ce2ed51f11b86c6c2 aspell-0.60.4.ebuild 1880
-SHA256 1e4bb6b5403cfb127308c31df2fd816d8ebe63dd5933ae8cc68ec311ce36a318 aspell-0.60.4.ebuild 1880
+MD5 c0fd92fe541e2faf4a1fdba3e9285306 aspell-0.60.4.ebuild 2053
+RMD160 737fcc6302ebf9b4499b487f90bffcacc7a9719d aspell-0.60.4.ebuild 2053
+SHA256 a759134cd22604434aa29ce7c2e93e3c62de610ac136ba345990e7a2824d5da7 aspell-0.60.4.ebuild 2053
 MD5 4fa550930c5e5fb38177ac9f77619891 files/01-gcc3.3-assert.patch 309
 RMD160 0e0ed6a1a644301454f900fd3607ceec190fd0c4 files/01-gcc3.3-assert.patch 309
 SHA256 77f3186d542410c0cd6ee6de465ed70ab5a1802ea24fd872610c637b067c9d24 files/01-gcc3.3-assert.patch 309
@@ -25,6 +28,9 @@ SHA256 71ec6d58f4e5e629d82869bc7c8c3eb63663aedf1be3c38f87ab872835f90f2a files/as
 MD5 1330ba856f163b4140b57109f0b763d8 files/aspell-0.60.4-gcc-4.1-fix.patch 429
 RMD160 9796c521c88d9ce9c93fa6df08bf2107725507ac files/aspell-0.60.4-gcc-4.1-fix.patch 429
 SHA256 8ab4c87ba3f4bf54767f1d4b685690bbb7b8e2252101ff1bf1b836ac4a62b834 files/aspell-0.60.4-gcc-4.1-fix.patch 429
+MD5 d972bf6551d78c500dd0467b4765c6d6 files/aspell-0.60.4-nls.patch 739
+RMD160 8afcf18555993fd3b40dfc8dca441035aeee61c6 files/aspell-0.60.4-nls.patch 739
+SHA256 d073f4145e9b6ffe3c40b208405376903304f8013a6cca2b2bcfc6b80d543a54 files/aspell-0.60.4-nls.patch 739
 MD5 02560c627d075d243720f1067bf45bcf files/aspell-buffer-fix.patch 1556
 RMD160 2760cfd2c1884e2448c5557a705c92d3bdb99815 files/aspell-buffer-fix.patch 1556
 SHA256 ede54c28a1591be645288bb7c5d31539ba20e8628841745c8eeafd9ea185f7a7 files/aspell-buffer-fix.patch 1556
@@ -43,3 +49,10 @@ SHA256 0222993b12f226559c09ef722ec79db18ba949895656e1e7f0cd481ee1b62796 files/di
 MD5 eb03775ece62e57725480e782cd84ee8 metadata.xml 162
 RMD160 853d3c463af1132de9d434e4bdca16fd81a21eb0 metadata.xml 162
 SHA256 9629e7723cb4708c1910c25510cd14da2729d34eed4ebfc1563df4a1ed5e1b22 metadata.xml 162
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2.2 (GNU/Linux)
+
+iD8DBQFENp44AiZjviIA2XgRAnC0AJoDediSQ9hHUM+9/DRAA3Fy+/OwqACgmesP
+s3BJ9o3R0v26uaQPBwQVWFE=
+=Aj2V
+-----END PGP SIGNATURE-----
diff --git a/app-text/aspell/aspell-0.60.4.ebuild b/app-text/aspell/aspell-0.60.4.ebuild
index 9e0a62106f23..7140937fc313 100644
--- a/app-text/aspell/aspell-0.60.4.ebuild
+++ b/app-text/aspell/aspell-0.60.4.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/aspell/aspell-0.60.4.ebuild,v 1.5 2006/03/20 20:35:51 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/aspell/aspell-0.60.4.ebuild,v 1.6 2006/04/07 17:15:12 flameeyes Exp $
 
-inherit libtool eutils flag-o-matic
+inherit libtool eutils flag-o-matic autotools
 
 DESCRIPTION="A spell checker replacement for ispell"
 HOMEPAGE="http://aspell.net/"
@@ -10,17 +10,25 @@ SRC_URI="mirror://gnu/aspell/${P}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~s390 ~sh ~sparc ~x86"
-IUSE="gpm"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="gpm nls"
 
-DEPEND=">=sys-libs/ncurses-5.2
-	gpm? ( sys-libs/gpm )"
+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}"/aspell-0.60.4-gcc-4.1-fix.patch
+	epatch "${FILESDIR}/${P}-nls.patch"
+
+	eautomake
+	elibtoolize --reverse-deps
 }
 
 src_compile() {
@@ -28,9 +36,9 @@ src_compile() {
 	filter-flags -fno-rtti
 	filter-flags -fvisibility=hidden #77109
 	filter-flags -maltivec -mabi=altivec
-	elibtoolize --reverse-deps
 
 	econf \
+		$(use_enable nls) \
 		--disable-static \
 		--sysconfdir=/etc/aspell \
 		--enable-docdir=/usr/share/doc/${PF} || die
diff --git a/app-text/aspell/files/aspell-0.60.4-nls.patch b/app-text/aspell/files/aspell-0.60.4-nls.patch
new file mode 100644
index 000000000000..4041d49a98a8
--- /dev/null
+++ b/app-text/aspell/files/aspell-0.60.4-nls.patch
@@ -0,0 +1,22 @@
+Index: aspell-0.60.4/Makefile.am
+===================================================================
+--- aspell-0.60.4.orig/Makefile.am
++++ aspell-0.60.4/Makefile.am
+@@ -91,7 +91,7 @@ libaspell_la_SOURCES =\
+   lib/string_pair_enumeration-c.cpp\
+   lib/new_checker.cpp
+ 
+-libaspell_la_LIBADD =  $(LIBINTL) $(PTHREAD_LIB)
++libaspell_la_LIBADD =  $(LTLIBINTL) $(PTHREAD_LIB)
+ 
+ if INCREMENTED_SONAME
+ libaspell_la_LDFLAGS = -version-info 16:4:0 -no-undefined
+@@ -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
+