Version bump. Remove iconv useflag (not needed anymore) and re-add ruby support.

(Portage version: 2.1.2.12)

5 files changed, 20 insertions, 60 deletions

diff --git a/app-mobilephone/obexftp/ChangeLog b/app-mobilephone/obexftp/ChangeLog
index eb62c16f57df..95dab96b8b1b 100644
--- a/app-mobilephone/obexftp/ChangeLog
+++ b/app-mobilephone/obexftp/ChangeLog
@@ -1,6 +1,14 @@
 # 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.29 2007/09/05 08:18:40 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/obexftp/ChangeLog,v 1.30 2007/09/05 13:56:13 mrness Exp $
+
+*obexftp-0.22_rc7 (05 Sep 2007)
+
+  05 Sep 2007; Alin Năstac <mrness@gentoo.org>
+  -files/obexftp-0.22_rc6-iconv.patch, -obexftp-0.22_rc6.ebuild,
+  +obexftp-0.22_rc7.ebuild:
+  Version bump. Remove iconv useflag (not needed anymore) and re-add ruby
+  support.
 
   05 Sep 2007; Alin Năstac <mrness@gentoo.org>
   -files/obexftp-0.22-no_iconv.patch, +files/obexftp-0.22_rc6-iconv.patch,
diff --git a/app-mobilephone/obexftp/files/digest-obexftp-0.22_rc6 b/app-mobilephone/obexftp/files/digest-obexftp-0.22_rc6
deleted file mode 100644
index 95896fcddc8a..000000000000
--- a/app-mobilephone/obexftp/files/digest-obexftp-0.22_rc6
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 79c50f564bdeeba662fd0fa384bfa183 obexftp-0.22-rc6.tar.bz2 397821
-RMD160 4b8659ab8ba62a039a587dd378fe02c776033462 obexftp-0.22-rc6.tar.bz2 397821
-SHA256 a1674a1ce42fe7c9fa83c19d46b1b228805ecd7b7c484321d8b43e5bbd677d9b obexftp-0.22-rc6.tar.bz2 397821
diff --git a/app-mobilephone/obexftp/files/digest-obexftp-0.22_rc7 b/app-mobilephone/obexftp/files/digest-obexftp-0.22_rc7
new file mode 100644
index 000000000000..d8897f720832
--- /dev/null
+++ b/app-mobilephone/obexftp/files/digest-obexftp-0.22_rc7
@@ -0,0 +1,3 @@
+MD5 3c2a9807288fd6c6f564d10fbc2bc8c0 obexftp-0.22-rc7.tar.bz2 400792
+RMD160 1bda5b46b2936552125bdb0d72b991d5203a57e3 obexftp-0.22-rc7.tar.bz2 400792
+SHA256 ba58d82a6652d48429692314454ec3e671230bd57603a0b4e1c2a7da75defc89 obexftp-0.22-rc7.tar.bz2 400792
diff --git a/app-mobilephone/obexftp/files/obexftp-0.22_rc6-iconv.patch b/app-mobilephone/obexftp/files/obexftp-0.22_rc6-iconv.patch
deleted file mode 100644
index 9a89463109c1..000000000000
--- a/app-mobilephone/obexftp/files/obexftp-0.22_rc6-iconv.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-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_rc7.ebuild
index c5304bb93432..d6bc515328b1 100644
--- a/app-mobilephone/obexftp/obexftp-0.22_rc6.ebuild
+++ b/app-mobilephone/obexftp/obexftp-0.22_rc7.ebuild
@@ -1,10 +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.2 2007/09/05 08:18:40 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/obexftp/obexftp-0.22_rc7.ebuild,v 1.1 2007/09/05 13:56:13 mrness Exp $
 
-WANT_AUTOMAKE="1.9"
-
-inherit eutils perl-module flag-o-matic autotools
+inherit eutils perl-module flag-o-matic
 
 DESCRIPTION="File transfer over OBEX for mobile phones"
 HOMEPAGE="http://dev.zuckschwerdt.org/openobex/wiki/ObexFtp"
@@ -13,28 +11,20 @@ SRC_URI="http://triq.net/obexftp/${P/_/-}.tar.bz2"
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
-IUSE="bluetooth debug iconv perl python swig tcl"
+IUSE="bluetooth debug perl python ruby swig tcl"
 
 RDEPEND=">=dev-libs/openobex-1.3
 	bluetooth? ( >=net-wireless/bluez-libs-2.25 )
 	perl? ( >=dev-lang/perl-5.8.8 )
 	python? ( >=dev-lang/python-2.4.4 )
-	tcl? ( >=dev-lang/tcl-8.4.14 )
-	swig? ( >=dev-lang/swig-1.3.31 )"
+	ruby? ( >=dev-lang/ruby-1.8.5 )
+	tcl? ( >=dev-lang/tcl-8.4.14 )"
 DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	iconv? ( sys-devel/gettext )"
+	swig? ( >=dev-lang/swig-1.3.31 )
+	dev-util/pkgconfig"
 
 S="${WORKDIR}"/${P%_*}
 
-src_unpack() {
-	unpack ${A}
-
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-iconv.patch"
-	eautoreconf
-}
-
 src_compile() {
 	if use python || use tcl ; then
 		# These wrappers break strict aliasing rules
@@ -46,13 +36,12 @@ src_compile() {
 	fi
 
 	econf \
-		$(use_enable iconv) \
 		$(use_enable bluetooth) \
 		$(use_enable swig) \
 		$(use_enable perl) \
 		$(use_enable python) \
 		$(use_enable tcl) \
-		--disable-ruby || die "econf failed"
+		$(use_enable ruby) || die "econf failed"
 	emake || die "emake failed"
 }