Replace nls useflag with iconv and use eautoreconf instead eautoconf (#191322).

Package-Manager: portage-2.1.2.12

5 files changed, 66 insertions, 37 deletions

diff --git a/app-mobilephone/obexftp/ChangeLog b/app-mobilephone/obexftp/ChangeLog
index 597ec436d8e1..eb62c16f57df 100644
--- a/app-mobilephone/obexftp/ChangeLog
+++ b/app-mobilephone/obexftp/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-mobilephone/obexftp
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/obexftp/ChangeLog,v 1.28 2007/09/04 14:45:33 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/obexftp/ChangeLog,v 1.29 2007/09/05 08:18:40 mrness Exp $
+
+  05 Sep 2007; Alin Năstac <mrness@gentoo.org>
+  -files/obexftp-0.22-no_iconv.patch, +files/obexftp-0.22_rc6-iconv.patch,
+  obexftp-0.22_rc6.ebuild:
+  Replace nls useflag with iconv and use eautoreconf instead eautoconf (#191322).
 
 *obexftp-0.22_rc6 (04 Sep 2007)
 
diff --git a/app-mobilephone/obexftp/Manifest b/app-mobilephone/obexftp/Manifest
index 0bd8db7b74c3..0ab2603134d3 100644
--- a/app-mobilephone/obexftp/Manifest
+++ b/app-mobilephone/obexftp/Manifest
@@ -17,24 +17,24 @@ AUX obexftp-0.21-sdp-detection.patch 1014 RMD160 b6271790593b20880eb20ebb1189f5a
 MD5 e2616e4310097497d957a6655bab7cbf files/obexftp-0.21-sdp-detection.patch 1014
 RMD160 b6271790593b20880eb20ebb1189f5ab7518fffc files/obexftp-0.21-sdp-detection.patch 1014
 SHA256 3026521a51d1fd6d58ca1e0dcabed609f4d69c6c38454cc90152c4397487d5f4 files/obexftp-0.21-sdp-detection.patch 1014
-AUX obexftp-0.22-no_iconv.patch 384 RMD160 4115297d80a14100d3530bddab7bd807bdc4313c SHA1 dda81e22cc6c78767b3506a393ff4c4a39a839d2 SHA256 0351356aa3ba505f61d22ac20b0b66c9bfdfbb0045833be4a064d97f7b279592
-MD5 8d057e2583f66113f11d0d17ddc449f2 files/obexftp-0.22-no_iconv.patch 384
-RMD160 4115297d80a14100d3530bddab7bd807bdc4313c files/obexftp-0.22-no_iconv.patch 384
-SHA256 0351356aa3ba505f61d22ac20b0b66c9bfdfbb0045833be4a064d97f7b279592 files/obexftp-0.22-no_iconv.patch 384
+AUX obexftp-0.22_rc6-iconv.patch 1169 RMD160 14da917c1d596f05ecfa38552d11b33be76b81d1 SHA1 1cba0889541f2ad883ed81b820012a9d4b373866 SHA256 3935cbad7f0dc77fad3890a1c8417e1e79b2a5ce195d841e21616dd44f87ff0d
+MD5 08125d5d846109d265257e49139f0a95 files/obexftp-0.22_rc6-iconv.patch 1169
+RMD160 14da917c1d596f05ecfa38552d11b33be76b81d1 files/obexftp-0.22_rc6-iconv.patch 1169
+SHA256 3935cbad7f0dc77fad3890a1c8417e1e79b2a5ce195d841e21616dd44f87ff0d files/obexftp-0.22_rc6-iconv.patch 1169
 DIST obexftp-0.21.tar.bz2 353862 RMD160 e9e404b62cc340a55690316f502dc17d5b3334cf SHA1 8a7ba3d982f3e7e80fb2964f69c9dea76e42090f SHA256 bd542c5ccfe4f70c19f4b8a8a16c635b7cf707ed2ba0cc01e2340f81145df259
 DIST obexftp-0.22-rc6.tar.bz2 397821 RMD160 4b8659ab8ba62a039a587dd378fe02c776033462 SHA1 f4e86c2b7247212005ba6124096714b8f113d734 SHA256 a1674a1ce42fe7c9fa83c19d46b1b228805ecd7b7c484321d8b43e5bbd677d9b
 EBUILD obexftp-0.21.ebuild 1728 RMD160 5fe22e68a96dc8c19d84c63f4d928441dd528667 SHA1 b7179d183b1bcdb38e9281b844effe4196adc6de SHA256 0d2d48cce4419030634e4ed753328663528c4be0c7a06e02181f87da1b2d63e1
 MD5 98f37ae9c5e14adf63154c3e397cb258 obexftp-0.21.ebuild 1728
 RMD160 5fe22e68a96dc8c19d84c63f4d928441dd528667 obexftp-0.21.ebuild 1728
 SHA256 0d2d48cce4419030634e4ed753328663528c4be0c7a06e02181f87da1b2d63e1 obexftp-0.21.ebuild 1728
-EBUILD obexftp-0.22_rc6.ebuild 1676 RMD160 59d5b6bf9585704b6191e8053c4ce8f6da8ba5f2 SHA1 b2ffe6d6cb8fd944542edb95408f464d347a67d7 SHA256 9ec468e6961b62e252ccef040e5c2cd8db7e17153772636ad496d4ae67b0ec06
-MD5 f66d44820ebca09fa3ba146954b99f66 obexftp-0.22_rc6.ebuild 1676
-RMD160 59d5b6bf9585704b6191e8053c4ce8f6da8ba5f2 obexftp-0.22_rc6.ebuild 1676
-SHA256 9ec468e6961b62e252ccef040e5c2cd8db7e17153772636ad496d4ae67b0ec06 obexftp-0.22_rc6.ebuild 1676
-MISC ChangeLog 7920 RMD160 114a07b1d00c836f1c20bd0f947ccc3d333a2773 SHA1 8247b01fd27a425f4516822cd2df2f8b30263fd0 SHA256 2a60e77166ab6c7985f4d259876daa5e685f56cf4416725cf9e5c33ccb42df9e
-MD5 f4446bb28506f272f292a3f7563e109a ChangeLog 7920
-RMD160 114a07b1d00c836f1c20bd0f947ccc3d333a2773 ChangeLog 7920
-SHA256 2a60e77166ab6c7985f4d259876daa5e685f56cf4416725cf9e5c33ccb42df9e ChangeLog 7920
+EBUILD obexftp-0.22_rc6.ebuild 1671 RMD160 b12909ed5ab5ff63052e97a74971d9c7260bfa9e SHA1 c382cf35aa2daf20e03ad26fc66ae184a960ee70 SHA256 497a9c40b264c6e433d533a98bf65de6e221719eb991a93c1275d611f01b5719
+MD5 f0f95efc78b762bfc97d8b6789c2d6a4 obexftp-0.22_rc6.ebuild 1671
+RMD160 b12909ed5ab5ff63052e97a74971d9c7260bfa9e obexftp-0.22_rc6.ebuild 1671
+SHA256 497a9c40b264c6e433d533a98bf65de6e221719eb991a93c1275d611f01b5719 obexftp-0.22_rc6.ebuild 1671
+MISC ChangeLog 8153 RMD160 f9ac045dc8b18f431dc8b89cbc2f6f4b06522915 SHA1 4862e72cf2458608f1c15509c99f80a30fb3f13b SHA256 7ccb09bc955ec63075b71763587f7f952fa23008eeb5a5bb0d4a51cbaa0afcf4
+MD5 9f5deb7f8a2e0a5ee6927eb5a7f0dae6 ChangeLog 8153
+RMD160 f9ac045dc8b18f431dc8b89cbc2f6f4b06522915 ChangeLog 8153
+SHA256 7ccb09bc955ec63075b71763587f7f952fa23008eeb5a5bb0d4a51cbaa0afcf4 ChangeLog 8153
 MISC metadata.xml 336 RMD160 80dacb93f1327adc8cb3578a6ffacea1fc817236 SHA1 2826721776ac855b8539336dbcad0750c1399171 SHA256 ac612b65bbad310c1953486d1ce87c081502ec1c90e3d348ae697dc8d3847aff
 MD5 1a820f941ddbd683086de6d92efbdf5c metadata.xml 336
 RMD160 80dacb93f1327adc8cb3578a6ffacea1fc817236 metadata.xml 336
@@ -48,7 +48,7 @@ SHA256 b8c6b7a3876c56b9b5655b948ce1ed3f4090deffcec6b249fc5db4fe4cae819f files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.5 (GNU/Linux)
 
-iD4DBQFG3W+cVSA5X31g7/gRAopQAKCHYbzCcJ2M5Bhqff/D9+yJ2IyndgCWKi+Q
-t6uNyz/DNVZHSp9Ecn/3gw==
-=uqzv
+iD8DBQFG3mZrVSA5X31g7/gRAu1YAKCThQpmvhYiYwF7VJmoQCvPrUVXIQCdGS3u
+YSrETXfNF0Yth++fejsM0AU=
+=ML+n
 -----END PGP SIGNATURE-----
diff --git a/app-mobilephone/obexftp/files/obexftp-0.22-no_iconv.patch b/app-mobilephone/obexftp/files/obexftp-0.22-no_iconv.patch
deleted file mode 100644
index a9aff1d7d70b..000000000000
--- a/app-mobilephone/obexftp/files/obexftp-0.22-no_iconv.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nru obexftp-0.22/configure.in obexftp-0.22.orig/configure.in
---- obexftp-0.22/configure.in	2007-09-04 17:08:07.000000000 +0300
-+++ obexftp-0.22.orig/configure.in	2007-07-11 22:22:30.000000000 +0300
-@@ -29,7 +29,7 @@
- # Checks for libraries.
- PKG_CHECK_MODULES(OPENOBEX,openobex)
- 
--AM_ICONV
-+dnl AM_ICONV
- dnl IRDA_CHECK
- BLUETOOTH_CHECK
- if test "${bluez_found}" = "yes"; then
diff --git a/app-mobilephone/obexftp/files/obexftp-0.22_rc6-iconv.patch b/app-mobilephone/obexftp/files/obexftp-0.22_rc6-iconv.patch
new file mode 100644
index 000000000000..9a89463109c1
--- /dev/null
+++ b/app-mobilephone/obexftp/files/obexftp-0.22_rc6-iconv.patch
@@ -0,0 +1,37 @@
+diff -Nru obexftp-0.22.orig/config.h.in obexftp-0.22/config.h.in
+--- obexftp-0.22.orig/config.h.in	2007-09-05 10:54:58.000000000 +0300
++++ obexftp-0.22/config.h.in	2007-09-05 11:06:20.000000000 +0300
+@@ -34,6 +34,9 @@
+ /* Define to 1 if you have the <netinet/in.h> header file. */
+ #undef HAVE_NETINET_IN_H
+ 
++/* Define if system has iconv library */
++#undef HAVE_ICONV
++
+ /* Define if system supports Bluetooth SDP */
+ #undef HAVE_SDPLIB
+ 
+diff -Nru obexftp-0.22.orig/configure.in obexftp-0.22/configure.in
+--- obexftp-0.22.orig/configure.in	2007-09-05 10:57:41.000000000 +0300
++++ obexftp-0.22/configure.in	2007-09-05 11:05:10.000000000 +0300
+@@ -29,7 +29,19 @@
+ # Checks for libraries.
+ PKG_CHECK_MODULES(OPENOBEX,openobex)
+ 
+-AM_ICONV
++AC_ARG_ENABLE([iconv],
++              [AC_HELP_STRING([--disable-iconv],
++                              [Disables usage of iconv conversion library])],
++              [ac_iconv_enabled=$enableval], [ac_iconv_enabled=yes])
++if test "$ac_iconv_enabled" = yes; then
++	AM_ICONV
++else
++	LIBICONV=
++	LTLIBICONV=
++	AC_SUBST(LIBICONV)
++	AC_SUBST(LTLIBICONV)
++fi
++
+ dnl IRDA_CHECK
+ BLUETOOTH_CHECK
+ if test "${bluez_found}" = "yes"; then
diff --git a/app-mobilephone/obexftp/obexftp-0.22_rc6.ebuild b/app-mobilephone/obexftp/obexftp-0.22_rc6.ebuild
index 703677368934..c5304bb93432 100644
--- a/app-mobilephone/obexftp/obexftp-0.22_rc6.ebuild
+++ b/app-mobilephone/obexftp/obexftp-0.22_rc6.ebuild
@@ -1,8 +1,8 @@
 # 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.22_rc6.ebuild,v 1.1 2007/09/04 14:45:33 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/obexftp/obexftp-0.22_rc6.ebuild,v 1.2 2007/09/05 08:18:40 mrness Exp $
 
-WANT_AUTOMAKE="none"
+WANT_AUTOMAKE="1.9"
 
 inherit eutils perl-module flag-o-matic autotools
 
@@ -13,7 +13,7 @@ SRC_URI="http://triq.net/obexftp/${P/_/-}.tar.bz2"
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
-IUSE="bluetooth debug nls perl python swig tcl"
+IUSE="bluetooth debug iconv perl python swig tcl"
 
 RDEPEND=">=dev-libs/openobex-1.3
 	bluetooth? ( >=net-wireless/bluez-libs-2.25 )
@@ -23,18 +23,16 @@ RDEPEND=">=dev-libs/openobex-1.3
 	swig? ( >=dev-lang/swig-1.3.31 )"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
-	nls? ( sys-devel/gettext )"
+	iconv? ( sys-devel/gettext )"
 
 S="${WORKDIR}"/${P%_*}
 
 src_unpack() {
 	unpack ${A}
 
-	if ! use nls ; then
-		cd "${S}"
-		epatch "${FILESDIR}/${P%_*}-no_iconv.patch"
-		eautoconf
-	fi
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-iconv.patch"
+	eautoreconf
 }
 
 src_compile() {
@@ -48,6 +46,7 @@ src_compile() {
 	fi
 
 	econf \
+		$(use_enable iconv) \
 		$(use_enable bluetooth) \
 		$(use_enable swig) \
 		$(use_enable perl) \