Split the broken part of the -gentoo patch out so that 0.23 is still source-identical; add a 0.23-r1 that fixes the Ruby bindings to actually do something useful, as per bug #273736.

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

6 files changed, 124 insertions, 32 deletions

diff --git a/app-mobilephone/obexftp/ChangeLog b/app-mobilephone/obexftp/ChangeLog
index ee094e244dea..132a8bc3c84b 100644
--- a/app-mobilephone/obexftp/ChangeLog
+++ b/app-mobilephone/obexftp/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-mobilephone/obexftp
-# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/obexftp/ChangeLog,v 1.49 2009/05/02 08:12:42 mrness Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/obexftp/ChangeLog,v 1.50 2009/06/11 16:06:30 flameeyes Exp $
+
+*obexftp-0.23-r1 (11 Jun 2009)
+
+  11 Jun 2009; Diego E. Pettenò <flameeyes@gentoo.org> obexftp-0.23.ebuild,
+  +obexftp-0.23-r1.ebuild, +files/obexftp-0.23-fixruby.patch,
+  files/obexftp-0.23-gentoo.patch:
+  Split the broken part of the -gentoo patch out so that 0.23 is still
+  source-identical; add a 0.23-r1 that fixes the Ruby bindings to actually
+  do something useful, as per bug #273736.
 
   02 May 2009; Alin Năstac <mrness@gentoo.org> obexftp-0.22.ebuild,
   obexftp-0.23.ebuild:
diff --git a/app-mobilephone/obexftp/Manifest b/app-mobilephone/obexftp/Manifest
index 1fadc20a6650..682b6b05365f 100644
--- a/app-mobilephone/obexftp/Manifest
+++ b/app-mobilephone/obexftp/Manifest
@@ -3,17 +3,19 @@ Hash: SHA1
 
 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
-AUX obexftp-0.23-gentoo.patch 1465 RMD160 1fbb3344e78f648f21f33db4262dad259953465b SHA1 2d8504462ce348bf00465c29bf29efaf38b3e744 SHA256 02aceefe77c3c0caa2b9078ef918de3c42d4ffc756a07c8525d0b69fd2a92781
+AUX obexftp-0.23-fixruby.patch 654 RMD160 7796074f131a9838e1291a776bc7badd6cfb7577 SHA1 7faf9c6f4abfdf177a0207ca919cf62b0d2835f6 SHA256 b36fe2c6bbee131a617e53cac72d29fdf8db7b0901551ce96229cc571ab902b4
+AUX obexftp-0.23-gentoo.patch 732 RMD160 69db6d5f13b4b954fdd364ecc489ab04a236f639 SHA1 41dd00590b41883205673806cda5f8c0a566af4c SHA256 5811e1cce6947f9b609be8b1290b63fa42e096be85f4f5478b074e71f3254e22
 DIST obexftp-0.22.tar.bz2 402570 RMD160 a3960fd15cd75cfb7066c565ee9fa90dc7a7c11f SHA1 8753ae1053653b01eb0deee3b7d31c02aca4974d SHA256 09687012d5e016277fa638f22b8c784aea6803056c70d14614e3b75158aae877
 DIST obexftp-0.23.tar.bz2 402552 RMD160 b91e3815524b1a8042435f2f27fdd19b2b2aec26 SHA1 59a1489bedfc9430c4f4e974762fb78de2b048d5 SHA256 44a74ff288d38c0f75354d6bc2efe7d6dec10112eaff2e7b10e292b0d2105b36
 EBUILD obexftp-0.22.ebuild 2241 RMD160 f84bef9876b77422aaa3c5fa5dbebbbad28a64bd SHA1 2d02f81047eb454b3131d72dd710959fc0d935f0 SHA256 e3d6b6b842b2528198f2e84ffc947535ccac48a86f4200c6b098aa56c36190dd
-EBUILD obexftp-0.23.ebuild 2190 RMD160 f1523cb36eb762325c8ccb0d64861be4d6884b9d SHA1 81ae0f5716a65cfeb7785991b784a8d15f07ba64 SHA256 0e06ba9a9de5cb68304f5ae570a8ec695fdc28daf56e6ff46c90a28e0bd3f299
-MISC ChangeLog 11277 RMD160 94fe9b2301461aecb2c47cbc0fb95470a2759bcc SHA1 25113d66e7a6f271ade039661568001f9f1bece4 SHA256 ae1fdf05dceaa2717b8eba974c59f388544908e66defcad1f263b0861a53cf3d
+EBUILD obexftp-0.23-r1.ebuild 2237 RMD160 681112945c5932c630f857c1ca0d95177db2e2f8 SHA1 123f659961bbd5fdfc858a52d2fb4bebe14bb755 SHA256 f6482a30c1a7c06216863fd29ce607fb7e251124c6ca287e1d7bcdfee1d5e7fc
+EBUILD obexftp-0.23.ebuild 2245 RMD160 2437a66cd4887fa79dad29a036adfa75d97a138a SHA1 1dc292455c3a7a29d394e6901bf0a2e6e48c3a72 SHA256 a1f6e282b9e0d51a368fd35ab38267a48129d3b006fe7465c6d6ba840420e5a0
+MISC ChangeLog 11676 RMD160 4027e52a3d24fe052e5944ee6e37bffae10b4d28 SHA1 af55bf92dbf12b27ef5849fe8c77d3533f7b7b79 SHA256 4b8ba7907828f52b73476d2023d16cb647a5859ca55cd2356c98a436ca16b5de
 MISC metadata.xml 428 RMD160 31e70db3d3d4146f97a6dc88f4f791e2bc056221 SHA1 886a0d425a24cca372bd033f776a5c02c47a830c SHA256 c312e7ae5043005d9a54796f062acfe40148799bd55640faee7e07d34839e38e
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.10 (GNU/Linux)
+Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkn8AIgACgkQts85UDFmaOVUUQCfRqaLFunN/d0Y0VbKvwYPD4IF
-quwAmgKQ2pAxzuPjFuacifRh5Sd2RzFS
-=cl/x
+iEYEARECAAYFAkoxK5MACgkQAiZjviIA2XhbdwCgtOLXNyCHhyauz1XbgMxHFbxT
+sAAAoIBrmQUyzBW9ebCtbnOx8KijcfDy
+=R7FF
 -----END PGP SIGNATURE-----
diff --git a/app-mobilephone/obexftp/files/obexftp-0.23-fixruby.patch b/app-mobilephone/obexftp/files/obexftp-0.23-fixruby.patch
new file mode 100644
index 000000000000..473fb248cf1c
--- /dev/null
+++ b/app-mobilephone/obexftp/files/obexftp-0.23-fixruby.patch
@@ -0,0 +1,13 @@
+Index: obexftp-0.23/swig/ruby/Makefile.am
+===================================================================
+--- obexftp-0.23.orig/swig/ruby/Makefile.am
++++ obexftp-0.23/swig/ruby/Makefile.am
+@@ -12,7 +12,7 @@ Makefile.ruby: extconf.rb
+ 	PREFIX=$(prefix) $(RUBY) $< --with-obexftp-include=$(top_srcdir)
+ 
+ obexftp.so: ruby_wrap.c Makefile.ruby
+-	$(MAKE) -fMakefile.ruby
++	$(MAKE) -fMakefile.ruby LIBPATH="-Wl,-rpath-link,../../bfb/.libs -Wl,-rpath-link,../../multicobex/.libs -Wl,-rpath-link,../../obexftp/.libs -L../../bfb/.libs -L../../multicobex/.libs -L../../obexftp/.libs"
+ 
+ install-data-local: Makefile.ruby
+ 	$(MAKE) -j1 -fMakefile.ruby install
diff --git a/app-mobilephone/obexftp/files/obexftp-0.23-gentoo.patch b/app-mobilephone/obexftp/files/obexftp-0.23-gentoo.patch
index a9a70f79168d..b805bc6250f0 100644
--- a/app-mobilephone/obexftp/files/obexftp-0.23-gentoo.patch
+++ b/app-mobilephone/obexftp/files/obexftp-0.23-gentoo.patch
@@ -22,25 +22,3 @@ diff -Nru obexftp-0.23.orig/apps/obexftp.c obexftp-0.23/apps/obexftp.c
  #ifdef HAVE_SYS_TIMES_H
  #include <sys/times.h>
  #endif
-diff -Nru obexftp-0.23.orig/swig/ruby/extconf.rb obexftp-0.23/swig/ruby/extconf.rb
---- obexftp-0.23.orig/swig/ruby/extconf.rb	2009-02-17 18:27:48.000000000 +0000
-+++ obexftp-0.23/swig/ruby/extconf.rb	2009-03-22 16:19:56.000000000 +0000
-@@ -21,10 +21,6 @@
- end
- 
- dir_config('obexftp')
--if have_library('openobex', 'OBEX_Init') and
--   find_library('bfb', 'bfb_io_open', '../../bfb/.libs') and
--   find_library('multicobex', 'cobex_ctrans', '../../multicobex/.libs') and
--   find_library('obexftp', 'obexftp_open', '../../obexftp/.libs')
-   create_makefile('obexftp')
- 
-   # hack 2: strip all rpath references
-@@ -33,7 +29,3 @@
-       out.puts line.gsub(/-Wl,-R'[^']*'/, '')
-     end
-   end
--else
--  puts 'obex libs not found'
--end
--
diff --git a/app-mobilephone/obexftp/obexftp-0.23-r1.ebuild b/app-mobilephone/obexftp/obexftp-0.23-r1.ebuild
new file mode 100644
index 000000000000..1f49ad1d22d8
--- /dev/null
+++ b/app-mobilephone/obexftp/obexftp-0.23-r1.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/obexftp/obexftp-0.23-r1.ebuild,v 1.1 2009/06/11 16:06:30 flameeyes Exp $
+
+EAPI="2"
+
+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="mirror://sourceforge/openobex/${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 )
+	perl? ( dev-lang/perl )
+	python? ( >=dev-lang/python-2.4.4 )
+	ruby? ( dev-lang/ruby:1.8 )
+	tcl? ( dev-lang/tcl )"
+DEPEND="${RDEPEND}
+	swig? ( dev-lang/swig )
+	dev-util/pkgconfig"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-fixruby.patch
+	epatch "${FILESDIR}/${P}-gentoo.patch"
+}
+
+src_configure() {
+	# 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
+
+	local MYRUBY
+	use ruby && MYRUBY="RUBY=/usr/bin/ruby18"
+
+	econf \
+		$(use_enable bluetooth) \
+		$(use_enable swig) \
+		$(use_enable perl) \
+		$(use_enable python) \
+		$(use_enable tcl) \
+		$(use_enable ruby) \
+		${MYRUBY} || die "econf failed"
+}
+
+src_install() {
+	# -j1 because "make -fMakefile.ruby install" fails
+	# upstream added -j1 to that command so it should be removed
+	# from here in the next version bump
+	emake -j1 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}
+	}
+}
diff --git a/app-mobilephone/obexftp/obexftp-0.23.ebuild b/app-mobilephone/obexftp/obexftp-0.23.ebuild
index 0bb2e7b67d2a..ef7498e648a5 100644
--- a/app-mobilephone/obexftp/obexftp-0.23.ebuild
+++ b/app-mobilephone/obexftp/obexftp-0.23.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/obexftp/obexftp-0.23.ebuild,v 1.4 2009/05/02 08:12:42 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/obexftp/obexftp-0.23.ebuild,v 1.5 2009/06/11 16:06:30 flameeyes Exp $
 
 EAPI="2"
 
@@ -25,6 +25,7 @@ DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
 src_prepare() {
+	epatch "${FILESDIR}"/${PN}-0.22-ruby-libpath.patch
 	epatch "${FILESDIR}/${P}-gentoo.patch"
 }