NMU: Update ebuild to work with ruby 1.9 only. Fixes bug #483096.

Package-Manager: portage-2.2.7/cvs/Linux x86_64

4 files changed, 153 insertions, 14 deletions

diff --git a/app-mobilephone/obexftp/ChangeLog b/app-mobilephone/obexftp/ChangeLog
index 2de7845a2cb0..238a371d59ef 100644
--- a/app-mobilephone/obexftp/ChangeLog
+++ b/app-mobilephone/obexftp/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-mobilephone/obexftp
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/obexftp/ChangeLog,v 1.64 2013/08/21 19:34:38 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/obexftp/ChangeLog,v 1.65 2013/11/05 00:15:54 mrueg Exp $
+
+*obexftp-0.23-r2 (05 Nov 2013)
+
+  05 Nov 2013; Manuel Rüger <mrueg@gentoo.org>
+  +files/obexftp-0.23-fix-ruby19.patch, +obexftp-0.23-r2.ebuild:
+  NMU: Update ebuild to work with ruby 1.9 only. Fixes bug #483096.
 
   21 Aug 2013; Chris Reffett <creffett@gentoo.org> obexftp-0.23-r1.ebuild:
   Update to distutils-r1. Fix bugs 312725 and 398113.
diff --git a/app-mobilephone/obexftp/Manifest b/app-mobilephone/obexftp/Manifest
index b40801564f6f..b28f7ab1b02a 100644
--- a/app-mobilephone/obexftp/Manifest
+++ b/app-mobilephone/obexftp/Manifest
@@ -1,18 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
+AUX obexftp-0.23-fix-ruby19.patch 1024 SHA256 638ffabd27a1506543144bc7ec3d69ab747912b3f669b01d7ccdee730aa5f59f SHA512 651bdc2db9f10477332ae126a690ee988b2e9df4734b966c5ba796707088d35e2811ff54e662d289badc79e5c0587d5109b0c45fc97143598b54048eff84b835 WHIRLPOOL b9700431efa348604c57ed5fdf7d80bcec28109a8311834d75b5c220a5cf35284ae614d1efb727d1daf8df30ae82949d0a1dc4b672031e1653270a4c913c5df6
 AUX obexftp-0.23-fixruby.patch 654 SHA256 b36fe2c6bbee131a617e53cac72d29fdf8db7b0901551ce96229cc571ab902b4 SHA512 634c95b802cf4f6fd1ceac7d0bc6d76ff4a325ac224673d7c7334f81e8a03f71caffece42cbaa208853e31e3cda0087f3f6006234110f56f807e073e5002623e WHIRLPOOL 7ff1cd91952d6ac6b05cfa48b0d7433f07998592af2219d6ed9fb95222c8f1256b95ccc70353b255c3fe9d0b3bff669349f8b1b74f03a5d7c3385656f1f124d9
 AUX obexftp-0.23-gentoo.patch 732 SHA256 5811e1cce6947f9b609be8b1290b63fa42e096be85f4f5478b074e71f3254e22 SHA512 b94af6a833837fb44a751b336281fd8e0dc24c7b7ec5415faf52040ebcda66e9714a2978b97143ddf1ea0db07f3e8ddae6b29ca69268cabf088959d721866e46 WHIRLPOOL 45789851bdc4aaa98814aa19a92b5f59271675e76e71f28df1f6cd7a57996facb70403f1ffdebde0724167c9053b1af2212984d81fe98d4167f4b8f2557f2436
 DIST obexftp-0.23.tar.bz2 402552 SHA256 44a74ff288d38c0f75354d6bc2efe7d6dec10112eaff2e7b10e292b0d2105b36 SHA512 026a2a641fa46dc41ff131b78e87c2aa5fce126d36aa2d8b1783c7fe134a786bbf9908f660018fe459e5d729c36303f5efb2f5b2af64001a2344dce8c322e513 WHIRLPOOL d8386862c25c420ffae7089bb33b517406a6a4eecac52ad6376f3d2c5b034549e8cf86651b4ad3231b21822049b02d01863dae8776b957eb8d538c426ba4431f
 EBUILD obexftp-0.23-r1.ebuild 2355 SHA256 282fa01cb0a611aa161e547b2981f2e41ecb6a6c67e129ba60f46083e97ab08e SHA512 03458b48d36687451b856090957440c98177a5fc0688e59fe2b630cd95353862f853e5af07103b337f1e975886ec85d392999f07e9f296a444b61e81303df1f4 WHIRLPOOL 239a4845f3f9e249162c681c11102435a79fb1d8815e462db368017a8d087c58628b7f32c986ca11a173289fe7885f1e8bdadf176581c596a2e422371c11451c
-MISC ChangeLog 13545 SHA256 f11ffb0cf9dd15a9087cd3f4c990d984e7649d9839165e48434c1c6d0f2ff450 SHA512 7482b3f2b1c6367dc92123dc25b7d34c1f0c0ef9f8257d426d6018c665446b4f30e4694b304800203cf51c6eb65bc81f37de26de65095f520bc48efe96d29531 WHIRLPOOL 5498a236eb5e927abe8727f67950b8daba24cbf65456fc53d35881aba7d539922f1094d06be8062c40fe841f1cde4216edd2323829454cf0388fac6e2e97acca
+EBUILD obexftp-0.23-r2.ebuild 2360 SHA256 801169713e93fc6db31d375e085943475e0e4a399cce33d19a4f67dc1bcafb1c SHA512 0fadfcb66eb2ca8dcd771a7f29ffcf80fff3d1411ed5ec846ab3a656960b0521ac00293019085375e2072871f82f4eb16f681c4171e9993faf1a08a1163366d0 WHIRLPOOL 414f454819ccafc8b220a056e37a85b4ae4f01f7e2945892ebc1f28e73678dfa62b84f23386d26350070becffceafbf08acf789e9b87beca88f816abfdd08d34
+MISC ChangeLog 13756 SHA256 eee95d5c750d142dd515131a5ca4933e3b9a2a1e56052cdfb1f5e466618f0553 SHA512 aa32da671c94635a9d097143391ac7cf574710dcfbe473371e8579041696106ba548bd20c6fce4620be871e3b277df9713ae5a8d23443ac23c01b3645a0a58ea WHIRLPOOL 5ce3dc04e18576c900f62effed4a0e0ce40e1814e1e6f22bba311ea4b97c4d4173e5f2b693a54fdeffd2426d5c24443e8e9775b562221b2296648df271d65e33
 MISC metadata.xml 243 SHA256 2e039dccdf61e14defb54270c959814b3e1a383d855bb4fd5fc82158f45c48fb SHA512 d6ec32cd147b7f0d5ba5a6467937b06ff5e1915e53cb03aeb35d9430e54d05b2d2044d1afcc46966b7dc00ae452e7029c1575858ccd394eeecf148f4f46b21b4 WHIRLPOOL 7fff40e8dce1b278da238f5066768ce49dbc28798c5c63267bd3cab24909b44a4a20451807a89bfb2fe24e862f4d0a2e89ffe3167090aaa451aaf23c4b147d28
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
-
-iKYEAREIAGYFAlIVFkpfFIAAAAAALgAoaXNzdWVyLWZwckBub3RhdGlvbnMub3Bl
-bnBncC5maWZ0aGhvcnNlbWFuLm5ldEM2NzU5RjUyMDczREJDQkVDQTBDRkE1NERC
-Nzk1QThBNDI2MTgzNTQACgkQ23laikJhg1Qa5wCeLpLCL4GdciOyOR2LWN2blrOS
-DrcAn1Bd1MX+DE8ArJgWSSMB31fHceg2
-=YZ9W
------END PGP SIGNATURE-----
diff --git a/app-mobilephone/obexftp/files/obexftp-0.23-fix-ruby19.patch b/app-mobilephone/obexftp/files/obexftp-0.23-fix-ruby19.patch
new file mode 100644
index 000000000000..a2ed681125cd
--- /dev/null
+++ b/app-mobilephone/obexftp/files/obexftp-0.23-fix-ruby19.patch
@@ -0,0 +1,37 @@
+Replace functions removed with ruby 1.9
+See also http://dev.zuckschwerdt.org/openobex/ticket/49
+
+
+diff --git a/swig/charmap.i b/swig/charmap.i
+index e1f1fc1..b8e17de 100644
+--- a/swig/charmap.i
++++ b/swig/charmap.i
+@@ -89,8 +89,8 @@
+ 	$2 = PyString_Size($input);
+ #elif defined SWIGRUBY
+ /* VALUE str = StringValue($input); // perhaps better? */
+-	$1 = STR2CSTR($input);
+-	$2 = (int) RSTRING($input)->len;
++	$1 = StringValuePtr($input);
++	$2 = (int) RSTRING_LEN($input);
+ #elif defined SWIGTCL
+ 	$1 = Tcl_GetStringFromObj($input,&$2);
+ #else
+diff --git a/swig/ruby/ruby_wrap.c b/swig/ruby/ruby_wrap.c
+index 57e40bf..31b1a9d 100644
+--- a/swig/ruby/ruby_wrap.c
++++ b/swig/ruby/ruby_wrap.c
+@@ -2579,8 +2579,8 @@ _wrap_Client_put_data(int argc, VALUE *argv, VALUE self) {
+     
+     
+     /* VALUE str = StringValue(argv[0]); // perhaps better? */
+-    arg2 = STR2CSTR(argv[0]);
+-    arg3 = (int) RSTRING(argv[0])->len;
++    arg2 = StringValuePtr(argv[0]);
++    arg3 = (int) RSTRING_LEN(argv[0]);
+     
+     
+     
+-- 
+1.8.4.2
+
diff --git a/app-mobilephone/obexftp/obexftp-0.23-r2.ebuild b/app-mobilephone/obexftp/obexftp-0.23-r2.ebuild
new file mode 100644
index 000000000000..1efa5c1b908f
--- /dev/null
+++ b/app-mobilephone/obexftp/obexftp-0.23-r2.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/obexftp/obexftp-0.23-r2.ebuild,v 1.1 2013/11/05 00:15:54 mrueg Exp $
+
+EAPI="5"
+
+PYTHON_COMPAT=( python{2_6,2_7} )
+GENTOO_DEPEND_ON_PERL=no
+
+inherit distutils-r1 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="mirror://sourceforge/openobex/${P}.tar.bz2"
+SLOT="0"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
+IUSE="bluetooth debug perl python ruby tcl"
+
+RDEPEND="dev-libs/openobex
+	bluetooth? ( net-wireless/bluez )
+	perl? ( dev-lang/perl )
+	ruby? ( dev-lang/ruby:1.9 )
+	tcl? ( dev-lang/tcl )
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-fixruby.patch \
+		"${FILESDIR}"/${P}-gentoo.patch \
+		"${FILESDIR}"/${P}-fix-ruby19.patch
+	# Python bindings are built/installed manually.
+	sed -e "/MAYBE_PYTHON_ = python/d" -i swig/Makefile.am || die "sed failed"
+
+	eautoreconf
+}
+
+src_configure() {
+	if use debug ; then
+		strip-flags
+		append-flags "-g -DOBEXFTP_DEBUG=5"
+	fi
+
+	local MYRUBY
+	use ruby && MYRUBY="RUBY=/usr/bin/ruby19"
+
+	econf \
+		$(use_enable bluetooth) \
+		$(use_enable perl) \
+		$(use_enable python) \
+		$(use_enable tcl) \
+		$(use_enable ruby) \
+		${MYRUBY}
+}
+
+src_compile() {
+	default
+
+	if use python; then
+		pushd swig/python/
+		distutils-r1_src_compile
+		popd
+	fi
+}
+
+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}" INSTALLDIRS=vendor install
+
+	if use python; then
+		pushd swig/python/
+		distutils-r1_src_install
+		popd
+	fi
+
+	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
+
+	if use perl ; then
+		perl_delete_localpod
+		perl_delete_packlist
+	fi
+}
+
+pkg_postinst() {
+	use perl && perl-module_pkg_postinst
+	use python && distutils-r1_pkg_postinst
+}
+
+pkg_postrm() {
+	use perl && perl-module_pkg_postrm
+	use python && distutils-r1_pkg_postrm
+}