Add nls USE flag (#148618).

Package-Manager: portage-2.1.1-r2

4 files changed, 39 insertions, 18 deletions

diff --git a/app-mobilephone/obexftp/ChangeLog b/app-mobilephone/obexftp/ChangeLog
index 5198c222867a..206b9ac35b5e 100644
--- a/app-mobilephone/obexftp/ChangeLog
+++ b/app-mobilephone/obexftp/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-mobilephone/obexftp
-# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/obexftp/ChangeLog,v 1.19 2006/11/26 09:16:12 mrness Exp $
+# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/obexftp/ChangeLog,v 1.20 2007/01/25 07:57:04 mrness Exp $
+
+  25 Jan 2007; Alin Nastac <mrness@gentoo.org>
+  +files/obexftp-0.21-no_iconv.patch, obexftp-0.21.ebuild:
+  Add nls USE flag (#148618).
 
   26 Nov 2006; Alin Nastac <mrness@gentoo.org> obexftp-0.21.ebuild:
   Add ruby USE flag (#156041).
diff --git a/app-mobilephone/obexftp/Manifest b/app-mobilephone/obexftp/Manifest
index 1ab0d1967793..cf8516f8c532 100644
--- a/app-mobilephone/obexftp/Manifest
+++ b/app-mobilephone/obexftp/Manifest
@@ -9,6 +9,10 @@ AUX obexftp-0.21-cobex_write.patch 2292 RMD160 0589e7699bc4ff514f954e4d515465fde
 MD5 22ff2b0139e04ee668962537a486e8ab files/obexftp-0.21-cobex_write.patch 2292
 RMD160 0589e7699bc4ff514f954e4d515465fded71b7ef files/obexftp-0.21-cobex_write.patch 2292
 SHA256 fd310fe90cf2b4211e394caeacae8d962c08a3233fa0da066b83f6a29144d6d9 files/obexftp-0.21-cobex_write.patch 2292
+AUX obexftp-0.21-no_iconv.patch 301 RMD160 9b4b20649f2ef5b82f6e3f7e5f30befd490f3465 SHA1 bd81421f199cbfadc1e95268e19eb47976f0cd2c SHA256 cbf9079b3f1877bb19d67e5a4c534a423d6ac90ba640f41f981a7034b0b5093a
+MD5 83e3e551b8e64cfa21615abfd35c3d0c files/obexftp-0.21-no_iconv.patch 301
+RMD160 9b4b20649f2ef5b82f6e3f7e5f30befd490f3465 files/obexftp-0.21-no_iconv.patch 301
+SHA256 cbf9079b3f1877bb19d67e5a4c534a423d6ac90ba640f41f981a7034b0b5093a files/obexftp-0.21-no_iconv.patch 301
 AUX obexftp-0.21-sdp-detection.patch 1014 RMD160 b6271790593b20880eb20ebb1189f5ab7518fffc SHA1 bc78234d3bbf6de325b5c0fe32012b231a889834 SHA256 3026521a51d1fd6d58ca1e0dcabed609f4d69c6c38454cc90152c4397487d5f4
 MD5 e2616e4310097497d957a6655bab7cbf files/obexftp-0.21-sdp-detection.patch 1014
 RMD160 b6271790593b20880eb20ebb1189f5ab7518fffc files/obexftp-0.21-sdp-detection.patch 1014
@@ -19,14 +23,14 @@ EBUILD obexftp-0.19-r1.ebuild 1325 RMD160 9b88d8f81ec8bfb5927476b9c368759bce0592
 MD5 05c51575b425f64154f79698d17ac1a9 obexftp-0.19-r1.ebuild 1325
 RMD160 9b88d8f81ec8bfb5927476b9c368759bce0592dc obexftp-0.19-r1.ebuild 1325
 SHA256 9aeb49c286856f3a19377c07af3ae661475a460e22385a4a816be06928690f4c obexftp-0.19-r1.ebuild 1325
-EBUILD obexftp-0.21.ebuild 1464 RMD160 8cd752ef98cd3a9e1c132160177d88ffa2aaae85 SHA1 1e1e25ccf19cc787b7bfc9d926f7897211626beb SHA256 64bfc10d6c2c5ce0ad89cf73d88471c18eb490caa1bff0f579e80e43322f9777
-MD5 ba49e510d16523011d19d9b5e526641e obexftp-0.21.ebuild 1464
-RMD160 8cd752ef98cd3a9e1c132160177d88ffa2aaae85 obexftp-0.21.ebuild 1464
-SHA256 64bfc10d6c2c5ce0ad89cf73d88471c18eb490caa1bff0f579e80e43322f9777 obexftp-0.21.ebuild 1464
-MISC ChangeLog 6674 RMD160 62dde9491a10b0a79e9d14ffd76ac958d3ec23ba SHA1 2c94cc507163044f7af525757e1678e35c887224 SHA256 6dd294b54e1ae424cab98ceab9f6606a2a337be6bc6429d1d84b5c8914a87600
-MD5 a1b94fef7a1213390a04a2b7c9d0eaf5 ChangeLog 6674
-RMD160 62dde9491a10b0a79e9d14ffd76ac958d3ec23ba ChangeLog 6674
-SHA256 6dd294b54e1ae424cab98ceab9f6606a2a337be6bc6429d1d84b5c8914a87600 ChangeLog 6674
+EBUILD obexftp-0.21.ebuild 1549 RMD160 ae97a319b87d519f7875203ca66467b0290f7cc5 SHA1 b2eb10f6b76061d25d2604a8f46f9e39912cefa0 SHA256 511ff4fc025fc253f5dc8a4e06410f1c999144530a23e7cf9ab989461ad622c5
+MD5 7a0c5b3193e718c3085d30f687d23b1d obexftp-0.21.ebuild 1549
+RMD160 ae97a319b87d519f7875203ca66467b0290f7cc5 obexftp-0.21.ebuild 1549
+SHA256 511ff4fc025fc253f5dc8a4e06410f1c999144530a23e7cf9ab989461ad622c5 obexftp-0.21.ebuild 1549
+MISC ChangeLog 6811 RMD160 7a116076efd9c48949090fcb52dcf635d8d1a1bb SHA1 4ed4ba3dab4027b55210190fa5d32f2b6f806ce4 SHA256 fae9d929a632c4c7c19e5ccb6eac5a9c042ebd5a003b030a1caa79d29b219266
+MD5 642424e3942efebda46facfcb62cda45 ChangeLog 6811
+RMD160 7a116076efd9c48949090fcb52dcf635d8d1a1bb ChangeLog 6811
+SHA256 fae9d929a632c4c7c19e5ccb6eac5a9c042ebd5a003b030a1caa79d29b219266 ChangeLog 6811
 MISC metadata.xml 336 RMD160 80dacb93f1327adc8cb3578a6ffacea1fc817236 SHA1 2826721776ac855b8539336dbcad0750c1399171 SHA256 ac612b65bbad310c1953486d1ce87c081502ec1c90e3d348ae697dc8d3847aff
 MD5 1a820f941ddbd683086de6d92efbdf5c metadata.xml 336
 RMD160 80dacb93f1327adc8cb3578a6ffacea1fc817236 metadata.xml 336
@@ -38,9 +42,9 @@ MD5 6e9d37752e552868c4233c03c3324d71 files/digest-obexftp-0.21 241
 RMD160 23fa1ace9deaf052e75bc9a8396f6e68d4d53d51 files/digest-obexftp-0.21 241
 SHA256 dd7640ca20ce53410403c1fb5dac6d33a4b75fccebb9cfa96ddff446012239e6 files/digest-obexftp-0.21 241
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
+Version: GnuPG v2.0.1 (GNU/Linux)
 
-iD4DBQFFaVuJ3sf9c6kjmR8RArYlAKCZ83PdflZUhH6TXcgA0nycC02HHwCYrLgN
-z3vLmCTc9QWsMqdsKLH3iA==
-=OlV3
+iD8DBQFFuGM3JnxX6mF440QRAvTWAKC1JANvKUxlr/dMPeLrxyjHTBdNwwCg4Wbf
+goSOhazf20x+cNBtx8LmtjQ=
+=Ecf1
 -----END PGP SIGNATURE-----
diff --git a/app-mobilephone/obexftp/files/obexftp-0.21-no_iconv.patch b/app-mobilephone/obexftp/files/obexftp-0.21-no_iconv.patch
new file mode 100644
index 000000000000..c6d57d11ae47
--- /dev/null
+++ b/app-mobilephone/obexftp/files/obexftp-0.21-no_iconv.patch
@@ -0,0 +1,11 @@
+--- obexftp-0.21.orig/configure.in	2006-09-22 09:23:30 +0000
++++ obexftp-0.21/configure.in	2006-09-22 09:23:47 +0000
+@@ -24,7 +24,7 @@
+ # Checks for libraries.
+ PKG_CHECK_MODULES(OPENOBEX,openobex)
+ 
+-AM_ICONV
++dnl AM_ICONV
+ dnl IRDA_CHECK
+ BLUETOOTH_CHECK
+ if test $am_cv_bluetooth_found = yes; then
diff --git a/app-mobilephone/obexftp/obexftp-0.21.ebuild b/app-mobilephone/obexftp/obexftp-0.21.ebuild
index 02d13fcf57f4..5e625481152e 100644
--- a/app-mobilephone/obexftp/obexftp-0.21.ebuild
+++ b/app-mobilephone/obexftp/obexftp-0.21.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-mobilephone/obexftp/obexftp-0.21.ebuild,v 1.7 2006/11/26 09:16:12 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/obexftp/obexftp-0.21.ebuild,v 1.8 2007/01/25 07:57:04 mrness Exp $
 
 inherit eutils perl-module flag-o-matic autotools
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://triq.net/obex"
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~amd64 ~ppc x86"
-IUSE="bluetooth debug perl python ruby swig tcl"
+IUSE="bluetooth debug nls perl python ruby swig tcl"
 
 RDEPEND=">=dev-libs/openobex-1.1
 	bluetooth? ( >=net-wireless/bluez-libs-2.19 )
@@ -21,13 +21,15 @@ RDEPEND=">=dev-libs/openobex-1.1
 	ruby? ( >=dev-lang/ruby-1.8.5 )
 	swig? ( >=dev-lang/swig-1.3.7 )"
 DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
+	dev-util/pkgconfig
+	nls? ( sys-devel/gettext )"
 
 src_unpack() {
 	unpack ${A}
 
 	epatch "${FILESDIR}/${P}-cobex_write.patch"
 	epatch "${FILESDIR}/${P}-sdp-detection.patch"
+	use nls || epatch "${FILESDIR}/${P}-no_iconv.patch"
 
 	cd "${S}"
 	eautoconf