Fix compilation errors when built against openobex-1.4 (#250210)

Package-Manager: portage-2.1.4.5

5 files changed, 33 insertions, 88 deletions

diff --git a/app-mobilephone/obexftp/ChangeLog b/app-mobilephone/obexftp/ChangeLog
index 493c4a3af8ce..0e1b289be2a4 100644
--- a/app-mobilephone/obexftp/ChangeLog
+++ b/app-mobilephone/obexftp/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-mobilephone/obexftp
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/obexftp/ChangeLog,v 1.43 2008/11/30 18:52:53 bluebird Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/obexftp/ChangeLog,v 1.44 2008/12/11 20:25:53 mrness Exp $
+
+  11 Dec 2008; Alin Năstac <mrness@gentoo.org>
+  +files/obexftp-0.22-bluetooth.patch, -obexftp-0.22_rc9.ebuild,
+  obexftp-0.22.ebuild:
+  Fix compilation errors when built against openobex-1.4 (#250210).
 
   30 Nov 2008; Friedrich Oslage <bluebird@gentoo.org> obexftp-0.22.ebuild:
   Stable on sparc, bug #245455
diff --git a/app-mobilephone/obexftp/Manifest b/app-mobilephone/obexftp/Manifest
index 3c6b73cabcdb..d5d86f321c96 100644
--- a/app-mobilephone/obexftp/Manifest
+++ b/app-mobilephone/obexftp/Manifest
@@ -1,13 +1,22 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX obexftp-0.21-as-needed.patch 1099 RMD160 c27152ca025f46be0ae80ab7e3e0c0d3887ba292 SHA1 dbdacd90962b37f211bd3ea7d08a43d46ad3bfeb SHA256 6a1a897b0b95955719482ba4fb885cafe5d697f6256d4e0199323cf6718420dd
 AUX obexftp-0.21-cobex_write.patch 2292 RMD160 0589e7699bc4ff514f954e4d515465fded71b7ef SHA1 e48bfe29127ad74b199dfc9af103b6e91b0c58f5 SHA256 fd310fe90cf2b4211e394caeacae8d962c08a3233fa0da066b83f6a29144d6d9
 AUX obexftp-0.21-no_iconv.patch 301 RMD160 9b4b20649f2ef5b82f6e3f7e5f30befd490f3465 SHA1 bd81421f199cbfadc1e95268e19eb47976f0cd2c SHA256 cbf9079b3f1877bb19d67e5a4c534a423d6ac90ba640f41f981a7034b0b5093a
 AUX obexftp-0.21-sdp-detection.patch 1014 RMD160 b6271790593b20880eb20ebb1189f5ab7518fffc SHA1 bc78234d3bbf6de325b5c0fe32012b231a889834 SHA256 3026521a51d1fd6d58ca1e0dcabed609f4d69c6c38454cc90152c4397487d5f4
+AUX obexftp-0.22-bluetooth.patch 358 RMD160 ced7b37b03ec8892de48d3e4985140d9ccb851ea SHA1 58bb7121fc70ab43d254462a8499f50e9b3085e7 SHA256 61c11e74b0cbd3f1479e30624428cf5752ddf7d9b7edb90e29fb8ffd59371f80
 AUX obexftp-0.22-ruby-libpath.patch 732 RMD160 eb21a92493018ee1018adcd78856963063146ef4 SHA1 d4d7a15605e878d1b3d08646480e1cc7340e0e89 SHA256 b2aa592666ba882dbd2c389df13a8bb84823c84e4f02dbbfd917e59ab7272c90
 DIST obexftp-0.21.tar.bz2 353862 RMD160 e9e404b62cc340a55690316f502dc17d5b3334cf SHA1 8a7ba3d982f3e7e80fb2964f69c9dea76e42090f SHA256 bd542c5ccfe4f70c19f4b8a8a16c635b7cf707ed2ba0cc01e2340f81145df259
-DIST obexftp-0.22-rc9.tar.bz2 400616 RMD160 41c0089361f5d2cc589a55a2ed3bad3bb11fc4d2 SHA1 5e05fc5e8b577c36520cc53d2323905ad1182884 SHA256 0c22898285fbe40d36df47bfcc71fe054a478476616835c7ebb2ba39c1545b46
 DIST obexftp-0.22.tar.bz2 402570 RMD160 a3960fd15cd75cfb7066c565ee9fa90dc7a7c11f SHA1 8753ae1053653b01eb0deee3b7d31c02aca4974d SHA256 09687012d5e016277fa638f22b8c784aea6803056c70d14614e3b75158aae877
 EBUILD obexftp-0.21.ebuild 1689 RMD160 3201f91b7b6be9ed250dc94aef106f13669f9aaf SHA1 aab5d9c006d2ee5947c8f922645e02c015c398a9 SHA256 ba0fd86b9b2ff4c67621775e64e925f1d9bced4786c1bb47fc0c806386ee70cf
-EBUILD obexftp-0.22.ebuild 2154 RMD160 780bb75924f4afdbd787e2001f0bf439851f78d2 SHA1 65e7d73f9cf4e6eb418a1ed9e1a91b55813433da SHA256 1aa50956c3cd248c598b5487b47dc983a88c404dafcd6690a84368bf1c09f07c
-EBUILD obexftp-0.22_rc9.ebuild 2053 RMD160 14c7c5d8b00947d7ced45214f7b08861cf8a3f0f SHA1 dc3a3f534f85ec58c803054852fd6e94ce89f26b SHA256 17986a15d868cc8da3d98e91f5c6ef55fe27edb653f36839a80ab7f852aebb13
-MISC ChangeLog 10173 RMD160 90071cd3da91a1568beef1ef59226eb2a137934f SHA1 1feaa1fa69db8340100a4b366f169fd85a761d9e SHA256 c36bb678cb918fba0047a7dd4576b37141236f8059397348b04d9b42162ca8a0
+EBUILD obexftp-0.22.ebuild 2195 RMD160 a51367786a3cb07eb6b4f422de97df208c7f8e36 SHA1 2fe85bd35710b7de4f0f5d2397996356728181d6 SHA256 220bff9d54eea176721ae8b66a450a969506e65b83840cb3729d617625016801
+MISC ChangeLog 10376 RMD160 0e476ca102fda603f96efac64388aed42cd39a15 SHA1 4fa30a2a8784d798d344cea228bae1b2edeead14 SHA256 3b6afef841124004f83f0e40fad8bab68ac14a06792c02ba0e540af4e700aeb0
 MISC metadata.xml 428 RMD160 31e70db3d3d4146f97a6dc88f4f791e2bc056221 SHA1 886a0d425a24cca372bd033f776a5c02c47a830c SHA256 c312e7ae5043005d9a54796f062acfe40148799bd55640faee7e07d34839e38e
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAklBd2IACgkQPrHvTlXvhtt+PACeL1/X988SY5IZ9f8CNquzxacx
+sO0AmgIdVMNjeSk5FeqLDBxLteg5aePJ
+=ZjFi
+-----END PGP SIGNATURE-----
diff --git a/app-mobilephone/obexftp/files/obexftp-0.22-bluetooth.patch b/app-mobilephone/obexftp/files/obexftp-0.22-bluetooth.patch
new file mode 100644
index 000000000000..cfb7730c5ea7
--- /dev/null
+++ b/app-mobilephone/obexftp/files/obexftp-0.22-bluetooth.patch
@@ -0,0 +1,12 @@
+--- obexftp-0.22.orig/apps/obexftpd.c	2008-06-15 22:18:58.000000000 +0300
++++ obexftp-0.22/apps/obexftpd.c	2008-12-09 00:01:20.000000000 +0200
+@@ -58,6 +58,9 @@
+ #include <netinet/in.h>
+ #include <arpa/inet.h>
+ #include <netdb.h>
++#ifdef HAVE_BLUETOOTH
++#include <bluetooth/bluetooth.h>
++#endif
+ #endif
+ 
+ /* just until there is a server layer in obexftp */
diff --git a/app-mobilephone/obexftp/obexftp-0.22.ebuild b/app-mobilephone/obexftp/obexftp-0.22.ebuild
index d00bee189fd0..9fa7a75eeeb7 100644
--- a/app-mobilephone/obexftp/obexftp-0.22.ebuild
+++ b/app-mobilephone/obexftp/obexftp-0.22.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/obexftp/obexftp-0.22.ebuild,v 1.7 2008/11/30 18:52:53 bluebird Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/obexftp/obexftp-0.22.ebuild,v 1.8 2008/12/11 20:25:53 mrness Exp $
 
 inherit eutils perl-module flag-o-matic python
 
@@ -27,6 +27,7 @@ src_unpack() {
 	unpack ${A}
 
 	epatch "${FILESDIR}"/${P}-ruby-libpath.patch
+	epatch "${FILESDIR}"/${P}-bluetooth.patch
 }
 
 src_compile() {
diff --git a/app-mobilephone/obexftp/obexftp-0.22_rc9.ebuild b/app-mobilephone/obexftp/obexftp-0.22_rc9.ebuild
deleted file mode 100644
index 2819fbefcf5a..000000000000
--- a/app-mobilephone/obexftp/obexftp-0.22_rc9.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/obexftp/obexftp-0.22_rc9.ebuild,v 1.3 2008/06/01 10:33:52 mrness Exp $
-
-inherit eutils perl-module flag-o-matic python
-
-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 perl python ruby swig tcl"
-
-RDEPEND="dev-libs/openobex
-	bluetooth? ( net-wireless/bluez-libs )
-	perl? ( dev-lang/perl )
-	python? ( >=dev-lang/python-2.4.4 )
-	ruby? ( dev-lang/ruby )
-	tcl? ( dev-lang/tcl )"
-DEPEND="${RDEPEND}
-	swig? ( dev-lang/swig )
-	dev-util/pkgconfig"
-
-S="${WORKDIR}"/${P%_*}
-
-src_compile() {
-	# do not byte-compile python module
-	if use python; then
-		sed -i \
-			-e 's/\(setup.py install\)/\1 --no-compile/' \
-			swig/python/Makefile.in || die "sed failed"
-	fi
-
-	if use debug ; then
-		strip-flags
-		append-flags "-g -DOBEXFTP_DEBUG=5"
-	fi
-	if use ruby && ! use bluetooth ; then
-		sed -i -e "s/^\(.*bluetooth.*\)$/#\1/" swig/ruby/extconf.rb
-	fi
-
-	econf \
-		$(use_enable bluetooth) \
-		$(use_enable swig) \
-		$(use_enable perl) \
-		$(use_enable python) \
-		$(use_enable tcl) \
-		$(use_enable ruby) || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	dodoc AUTHORS ChangeLog NEWS README* THANKS TODO
-	dohtml doc/*.html
-
-	# Install examples
-	insinto /usr/share/doc/${PF}/examples
-	doins examples/*.c
-	use perl && doins examples/*.pl
-	use python && doins examples/*.py
-	use ruby && doins examples/*.rb
-	use tcl && doins examples/*.tcl
-
-	use perl && fixlocalpod
-}
-
-pkg_postrm() {
-	use perl && perl-module_pkg_postrm
-	use python && python_mod_cleanup
-}
-
-pkg_postinst() {
-	use perl && perl-module_pkg_postinst
-	use python && {
-		python_version
-		python_mod_optimize /usr/$(get_libdir)/python${PYVER}/site-packages/${PN}
-	}
-}