Version bump (#190751) and homepage update.

Package-Manager: portage-2.1.2.12

8 files changed, 117 insertions, 133 deletions

diff --git a/app-mobilephone/obexftp/ChangeLog b/app-mobilephone/obexftp/ChangeLog
index 0caf731c3875..597ec436d8e1 100644
--- a/app-mobilephone/obexftp/ChangeLog
+++ b/app-mobilephone/obexftp/ChangeLog
@@ -1,6 +1,13 @@
 # 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.27 2007/07/28 18:21:45 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/obexftp/ChangeLog,v 1.28 2007/09/04 14:45:33 mrness Exp $
+
+*obexftp-0.22_rc6 (04 Sep 2007)
+
+  04 Sep 2007; Alin Năstac <mrness@gentoo.org>
+  -files/obexftp-0.19-cobex_write.patch, +files/obexftp-0.22-no_iconv.patch,
+  -obexftp-0.19-r1.ebuild, +obexftp-0.22_rc6.ebuild:
+  Version bump (#190751) and homepage update.
 
   28 Jul 2007; Guy Martin <gmsoft@gentoo.org> obexftp-0.21.ebuild:
   Stable on hppa
diff --git a/app-mobilephone/obexftp/Manifest b/app-mobilephone/obexftp/Manifest
index d042cfe91bac..0bd8db7b74c3 100644
--- a/app-mobilephone/obexftp/Manifest
+++ b/app-mobilephone/obexftp/Manifest
@@ -1,7 +1,6 @@
-AUX obexftp-0.19-cobex_write.patch 2292 RMD160 0ec6be346020f3f883c96c2764116276f89fecf4 SHA1 ff0516a7507d45e160d865cf1b66aac6b6e1407b SHA256 ba3fbfbc3cd40d9635429ee965e9a81f18d577597f2fcade5a706ef1b0c42392
-MD5 6a6fe66463cf754e0bffe6c432546d25 files/obexftp-0.19-cobex_write.patch 2292
-RMD160 0ec6be346020f3f883c96c2764116276f89fecf4 files/obexftp-0.19-cobex_write.patch 2292
-SHA256 ba3fbfbc3cd40d9635429ee965e9a81f18d577597f2fcade5a706ef1b0c42392 files/obexftp-0.19-cobex_write.patch 2292
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX obexftp-0.21-as-needed.patch 1099 RMD160 c27152ca025f46be0ae80ab7e3e0c0d3887ba292 SHA1 dbdacd90962b37f211bd3ea7d08a43d46ad3bfeb SHA256 6a1a897b0b95955719482ba4fb885cafe5d697f6256d4e0199323cf6718420dd
 MD5 baa74cd551c7df30bbe47a795a0a6aef files/obexftp-0.21-as-needed.patch 1099
 RMD160 c27152ca025f46be0ae80ab7e3e0c0d3887ba292 files/obexftp-0.21-as-needed.patch 1099
@@ -18,27 +17,38 @@ 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
-DIST obexftp-0.19.tar.gz 460515 RMD160 f138815169814ff0e6fdcfff06a0f4ce67e872e0 SHA1 9ad4b1961b7f73dffbc9c951f62997f4806d77fb SHA256 31bb37aa5ab0d4c4dda9cdd908876adc8e3d2606924f9d350d10eac5ea5bdb1b
+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
 DIST obexftp-0.21.tar.bz2 353862 RMD160 e9e404b62cc340a55690316f502dc17d5b3334cf SHA1 8a7ba3d982f3e7e80fb2964f69c9dea76e42090f SHA256 bd542c5ccfe4f70c19f4b8a8a16c635b7cf707ed2ba0cc01e2340f81145df259
-EBUILD obexftp-0.19-r1.ebuild 1325 RMD160 9b88d8f81ec8bfb5927476b9c368759bce0592dc SHA1 2ceaab069ae08c43176fa37d8280cb7442651a7f SHA256 9aeb49c286856f3a19377c07af3ae661475a460e22385a4a816be06928690f4c
-MD5 05c51575b425f64154f79698d17ac1a9 obexftp-0.19-r1.ebuild 1325
-RMD160 9b88d8f81ec8bfb5927476b9c368759bce0592dc obexftp-0.19-r1.ebuild 1325
-SHA256 9aeb49c286856f3a19377c07af3ae661475a460e22385a4a816be06928690f4c obexftp-0.19-r1.ebuild 1325
+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
-MISC ChangeLog 7662 RMD160 287602755b634e0132c4bacb7477a2a23d9c9f54 SHA1 8e7c821241704ec36090421dd7f0429c22ed3bca SHA256 48db0d4956990cd85a816f3f7502d24edf9c5d552f11cc25455a1ace04c3fb4b
-MD5 4abebae396d55534ab142eb2b7a0c8c0 ChangeLog 7662
-RMD160 287602755b634e0132c4bacb7477a2a23d9c9f54 ChangeLog 7662
-SHA256 48db0d4956990cd85a816f3f7502d24edf9c5d552f11cc25455a1ace04c3fb4b ChangeLog 7662
+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
 MISC metadata.xml 336 RMD160 80dacb93f1327adc8cb3578a6ffacea1fc817236 SHA1 2826721776ac855b8539336dbcad0750c1399171 SHA256 ac612b65bbad310c1953486d1ce87c081502ec1c90e3d348ae697dc8d3847aff
 MD5 1a820f941ddbd683086de6d92efbdf5c metadata.xml 336
 RMD160 80dacb93f1327adc8cb3578a6ffacea1fc817236 metadata.xml 336
 SHA256 ac612b65bbad310c1953486d1ce87c081502ec1c90e3d348ae697dc8d3847aff metadata.xml 336
-MD5 877bce89edb701ed9fb5021de3812e98 files/digest-obexftp-0.19-r1 238
-RMD160 ed8afc3a26bb7bab4c3d5ca5c62976573136d62c files/digest-obexftp-0.19-r1 238
-SHA256 3e3a9e97b91b45e544b89fc3e57d6f0f0551371472d60b869d0f689c0589125b files/digest-obexftp-0.19-r1 238
 MD5 6e9d37752e552868c4233c03c3324d71 files/digest-obexftp-0.21 241
 RMD160 23fa1ace9deaf052e75bc9a8396f6e68d4d53d51 files/digest-obexftp-0.21 241
 SHA256 dd7640ca20ce53410403c1fb5dac6d33a4b75fccebb9cfa96ddff446012239e6 files/digest-obexftp-0.21 241
+MD5 0d2c02b765a6be1ea3c97ee8655cd1b0 files/digest-obexftp-0.22_rc6 253
+RMD160 212be4ae46f09efca4fdad706867f441c5c4d54b files/digest-obexftp-0.22_rc6 253
+SHA256 b8c6b7a3876c56b9b5655b948ce1ed3f4090deffcec6b249fc5db4fe4cae819f files/digest-obexftp-0.22_rc6 253
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.5 (GNU/Linux)
+
+iD4DBQFG3W+cVSA5X31g7/gRAopQAKCHYbzCcJ2M5Bhqff/D9+yJ2IyndgCWKi+Q
+t6uNyz/DNVZHSp9Ecn/3gw==
+=uqzv
+-----END PGP SIGNATURE-----
diff --git a/app-mobilephone/obexftp/files/digest-obexftp-0.19-r1 b/app-mobilephone/obexftp/files/digest-obexftp-0.19-r1
deleted file mode 100644
index 65160f785076..000000000000
--- a/app-mobilephone/obexftp/files/digest-obexftp-0.19-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 895212816ca94a8b56090d8671dc18fa obexftp-0.19.tar.gz 460515
-RMD160 f138815169814ff0e6fdcfff06a0f4ce67e872e0 obexftp-0.19.tar.gz 460515
-SHA256 31bb37aa5ab0d4c4dda9cdd908876adc8e3d2606924f9d350d10eac5ea5bdb1b obexftp-0.19.tar.gz 460515
diff --git a/app-mobilephone/obexftp/files/digest-obexftp-0.22_rc6 b/app-mobilephone/obexftp/files/digest-obexftp-0.22_rc6
new file mode 100644
index 000000000000..95896fcddc8a
--- /dev/null
+++ b/app-mobilephone/obexftp/files/digest-obexftp-0.22_rc6
@@ -0,0 +1,3 @@
+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/obexftp-0.19-cobex_write.patch b/app-mobilephone/obexftp/files/obexftp-0.19-cobex_write.patch
deleted file mode 100644
index becd250cde75..000000000000
--- a/app-mobilephone/obexftp/files/obexftp-0.19-cobex_write.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-diff -Nru obexftp-0.19.orig/multicobex/multi_cobex.c obexftp-0.19/multicobex/multi_cobex.c
---- obexftp-0.19.orig/multicobex/multi_cobex.c	2005-11-24 16:55:11.000000000 +0200
-+++ obexftp-0.19/multicobex/multi_cobex.c	2006-04-29 21:13:47.955525000 +0300
-@@ -126,7 +126,7 @@
- /* Called from OBEX-lib when data needs to be written */
- int cobex_write(obex_t *self, void *data, uint8_t *buffer, int length)
- {
--	int actual;
-+	int written;
- 	cobex_t *c;
-         return_val_if_fail (self != NULL, -1);
-         return_val_if_fail (data != NULL, -1);
-@@ -137,24 +137,37 @@
- 	DEBUG(3, "%s() Data %d bytes\n", __func__, length);
- 
- 	if (c->type == CT_ERICSSON || c->type == CT_SIEMENS) {
--		actual = write(c->fd, buffer, length);
--		if (actual < length)	{
--			DEBUG(1, "Error writing to port (%d expected %d)\n", actual, length);
--			return actual; /* or -1? */
-+		int retries=0, chunk, fails=0;
-+		written = 0;
-+		for (retries = 0; written < length; retries++) {
-+			chunk = write(c->fd, buffer+written, length-written);
-+			if (chunk <= 0) {
-+				if ( ++fails >= 10 ) { // to avoid infinite looping if something is really wrong
-+					DEBUG(1, "%s() Error writing to port (written %d bytes out of %d, in %d retries)\n", __func__, written, length, retries);
-+					return written;
-+				}
-+				usleep(1); // This mysteriously avoids a resource not available error on write()
-+			} else {
-+				written += chunk;
-+				fails = 0; // Reset error counter on successful write op
-+			}
- 		}
--		return actual;
-+		
-+		if (retries > 0)
-+			DEBUG(2, "%s() Wrote %d bytes in %d retries\n", __func__, written, retries);
-+		return written;
- 	}
- 
- 	if (c->seq == 0){
--		actual = bfb_send_first(c->fd, buffer, length);
--		DEBUG(2, "%s() Wrote %d first packets (%d bytes)\n", __func__, actual, length);
-+		written = bfb_send_first(c->fd, buffer, length);
-+		DEBUG(2, "%s() Wrote %d first packets (%d bytes)\n", __func__, written, length);
- 	} else {
--		actual = bfb_send_next(c->fd, buffer, length, c->seq);
--		DEBUG(2, "%s() Wrote %d packets (%d bytes)\n", __func__, actual, length);
-+		written = bfb_send_next(c->fd, buffer, length, c->seq);
-+		DEBUG(2, "%s() Wrote %d packets (%d bytes)\n", __func__, written, length);
- 	}
- 	c->seq++;
- 
--	return actual;
-+	return written;
- }
- 
- /* Called when input data is needed */
diff --git a/app-mobilephone/obexftp/files/obexftp-0.22-no_iconv.patch b/app-mobilephone/obexftp/files/obexftp-0.22-no_iconv.patch
new file mode 100644
index 000000000000..a9aff1d7d70b
--- /dev/null
+++ b/app-mobilephone/obexftp/files/obexftp-0.22-no_iconv.patch
@@ -0,0 +1,12 @@
+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/obexftp-0.19-r1.ebuild b/app-mobilephone/obexftp/obexftp-0.19-r1.ebuild
deleted file mode 100644
index b53a4b3ee0f5..000000000000
--- a/app-mobilephone/obexftp/obexftp-0.19-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/obexftp/obexftp-0.19-r1.ebuild,v 1.4 2006/10/24 07:18:51 mrness Exp $
-
-inherit perl-module flag-o-matic eutils
-
-DESCRIPTION="File transfer over OBEX for mobile phones"
-SRC_URI="http://triq.net/obexftp/${P}.tar.gz"
-HOMEPAGE="http://triq.net/obex"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc x86"
-IUSE="bluetooth debug perl python swig tcl"
-
-RDEPEND=">=dev-libs/openobex-1.1
-	bluetooth? ( >=net-wireless/bluez-libs-2.19 )
-	perl? ( >=dev-lang/perl-5.8.6 )
-	python? ( >=dev-lang/python-2.4.2 )
-	tcl? ( >=dev-lang/tcl-8.4.9 )
-	swig? ( >=dev-lang/swig-1.3.7 )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-src_unpack() {
-	unpack ${A}
-
-	epatch "${FILESDIR}/${P}-cobex_write.patch"
-}
-
-src_compile() {
-	if use debug ; then
-		strip-flags
-		append-flags "-g -DOBEXFTP_DEBUG=5"
-	fi
-
-	econf \
-		$(use_enable bluetooth) \
-		$(use_enable perl) \
-		$(use_enable python) \
-		$(use_enable tcl) || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-
-	dodoc AUTHORS ChangeLog NEWS README* THANKS TODO
-	dohtml doc/*.html
-	insinto /usr/share/doc/${PF}/examples
-	doins -r apps/*_example.*
-	use perl && fixlocalpod
-}
diff --git a/app-mobilephone/obexftp/obexftp-0.22_rc6.ebuild b/app-mobilephone/obexftp/obexftp-0.22_rc6.ebuild
new file mode 100644
index 000000000000..703677368934
--- /dev/null
+++ b/app-mobilephone/obexftp/obexftp-0.22_rc6.ebuild
@@ -0,0 +1,68 @@
+# 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 $
+
+WANT_AUTOMAKE="none"
+
+inherit eutils perl-module flag-o-matic autotools
+
+DESCRIPTION="File transfer over OBEX for mobile phones"
+HOMEPAGE="http://dev.zuckschwerdt.org/openobex/wiki/ObexFtp"
+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"
+
+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 )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+S="${WORKDIR}"/${P%_*}
+
+src_unpack() {
+	unpack ${A}
+
+	if ! use nls ; then
+		cd "${S}"
+		epatch "${FILESDIR}/${P%_*}-no_iconv.patch"
+		eautoconf
+	fi
+}
+
+src_compile() {
+	if use python || use tcl ; then
+		# These wrappers break strict aliasing rules
+		append-flags -fno-strict-aliasing
+	fi
+	if use debug ; then
+		strip-flags
+		append-flags "-g -DOBEXFTP_DEBUG=5"
+	fi
+
+	econf \
+		$(use_enable bluetooth) \
+		$(use_enable swig) \
+		$(use_enable perl) \
+		$(use_enable python) \
+		$(use_enable tcl) \
+		--disable-ruby || die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "make install failed"
+
+	dodoc AUTHORS ChangeLog NEWS README* THANKS TODO
+	dohtml doc/*.html
+	insinto /usr/share/doc/${PF}/examples
+	doins -r apps/*_example.*
+	use perl && fixlocalpod
+}