Restrict ruby dependency atom to slot 1.8 (#261736).

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

9 files changed, 26 insertions, 238 deletions

diff --git a/app-mobilephone/obexftp/ChangeLog b/app-mobilephone/obexftp/ChangeLog
index 5d745f06fd00..2471511ebca1 100644
--- a/app-mobilephone/obexftp/ChangeLog
+++ b/app-mobilephone/obexftp/ChangeLog
@@ -1,6 +1,13 @@
 # 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.47 2009/03/22 16:52:59 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/obexftp/ChangeLog,v 1.48 2009/04/25 10:53:48 mrness Exp $
+
+  25 Apr 2009; Alin Năstac <mrness@gentoo.org>
+  -files/obexftp-0.21-as-needed.patch,
+  -files/obexftp-0.21-cobex_write.patch, -files/obexftp-0.21-no_iconv.patch,
+  -files/obexftp-0.21-sdp-detection.patch, -obexftp-0.21.ebuild,
+  obexftp-0.22.ebuild, obexftp-0.23.ebuild:
+  Restrict ruby dependency atom to slot 1.8 (#261736).
 
   22 Mar 2009; Alin Năstac <mrness@gentoo.org>
   +files/obexftp-0.23-gentoo.patch, obexftp-0.23.ebuild:
diff --git a/app-mobilephone/obexftp/Manifest b/app-mobilephone/obexftp/Manifest
index 10769a6720f6..1b9a614fb748 100644
--- a/app-mobilephone/obexftp/Manifest
+++ b/app-mobilephone/obexftp/Manifest
@@ -1,25 +1,19 @@
 -----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
 AUX obexftp-0.23-gentoo.patch 1465 RMD160 1fbb3344e78f648f21f33db4262dad259953465b SHA1 2d8504462ce348bf00465c29bf29efaf38b3e744 SHA256 02aceefe77c3c0caa2b9078ef918de3c42d4ffc756a07c8525d0b69fd2a92781
-DIST obexftp-0.21.tar.bz2 353862 RMD160 e9e404b62cc340a55690316f502dc17d5b3334cf SHA1 8a7ba3d982f3e7e80fb2964f69c9dea76e42090f SHA256 bd542c5ccfe4f70c19f4b8a8a16c635b7cf707ed2ba0cc01e2340f81145df259
 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.21.ebuild 1689 RMD160 3201f91b7b6be9ed250dc94aef106f13669f9aaf SHA1 aab5d9c006d2ee5947c8f922645e02c015c398a9 SHA256 ba0fd86b9b2ff4c67621775e64e925f1d9bced4786c1bb47fc0c806386ee70cf
-EBUILD obexftp-0.22.ebuild 2191 RMD160 5ed6477147a33e4cf2661fc20d12c34da8b59e85 SHA1 b1e4dbb27622ad3bc26fe3b0cf49e4bf90528548 SHA256 233b8949196e1403760fee04eebcfa90767e6fd6f7647de57adb48a452bfc80d
-EBUILD obexftp-0.23.ebuild 2114 RMD160 001bfb18b813d3ef7bb64465408d86c5841ad50a SHA1 046e7ba62d553a5482b40d6932ebdea989c45dc1 SHA256 e27175de2adb07fa4d022db997be7c8bacf16701ce016828c7d18ae61d1c34a5
-MISC ChangeLog 10794 RMD160 c6f5d59875ff77d5ae2320e8b31162f0745779b5 SHA1 8875214b95eaab6d412903abaeb160dd18aeecf0 SHA256 df5fa8eeaf2966a5248237fc4a285b580ff63a2dce1da6f2ab08f4f182f737d3
+EBUILD obexftp-0.22.ebuild 2194 RMD160 d65f086bcf100863f17307d516641b8bf5d68542 SHA1 8ad67dfd2f1ae15657f543c644cd2be279f4e014 SHA256 af6f52a5cf9ef7fffa1b49434d258efb773e32a153b7f9d1cf5fcaa733de4b64
+EBUILD obexftp-0.23.ebuild 2143 RMD160 d22903508d15c06e12544dd82f41a02f623330ea SHA1 c2b189e4794ddfef0b83dde94e1f2ad316436ae7 SHA256 00bf6c4386161b22601ead56d3857fc052afc0b3b60691789f4ba5195d78dfe9
+MISC ChangeLog 11123 RMD160 2c04424b347200a2229014fdb4d66baab5419f1f SHA1 e2f7f280684e531cd55ebeff36ea8e074e31327e SHA256 5c0cc0648dc90b23bd5238c727365a8cd11cb113caa275a4579f8f65e57ed6f3
 MISC metadata.xml 428 RMD160 31e70db3d3d4146f97a6dc88f4f791e2bc056221 SHA1 886a0d425a24cca372bd033f776a5c02c47a830c SHA256 c312e7ae5043005d9a54796f062acfe40148799bd55640faee7e07d34839e38e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.10 (GNU/Linux)
 
-iEYEARECAAYFAknGbPUACgkQts85UDFmaOVYawCdHx6A6R8ysI/ycT9YRHKcfPfO
-J+wAnRnQXaYoJxxEN+wDsFyiFjJ0bk9w
-=Qfia
+iEYEARECAAYFAkny68cACgkQts85UDFmaOWF3ACeKiAkFJEC37oWEVw2VI1f8DCd
+W4IAnileO3mpuQ132JGe9slNYWfmRh9e
+=TUWL
 -----END PGP SIGNATURE-----
diff --git a/app-mobilephone/obexftp/files/obexftp-0.21-as-needed.patch b/app-mobilephone/obexftp/files/obexftp-0.21-as-needed.patch
deleted file mode 100644
index 15595782e0ed..000000000000
--- a/app-mobilephone/obexftp/files/obexftp-0.21-as-needed.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff -Nru obexftp-0.21.orig/multicobex/Makefile.am obexftp-0.21/multicobex/Makefile.am
---- obexftp-0.21.orig/multicobex/Makefile.am	2007-04-28 20:13:54.000000000 +0200
-+++ obexftp-0.21/multicobex/Makefile.am	2007-04-30 13:39:36.000000000 +0200
-@@ -4,7 +4,7 @@
- 				-I$(top_srcdir) \
- 				-I$(top_srcdir)/includes
- 
--LDADD =				@OPENOBEX_LIBS@ \
-+libmulticobex_la_LIBADD =	@OPENOBEX_LIBS@ \
- 				../bfb/libbfb.la
- 
- multicobexincludedir =		$(includedir)/multicobex
-diff -Nru obexftp-0.21.orig/obexftp/Makefile.am obexftp-0.21/obexftp/Makefile.am
---- obexftp-0.21.orig/obexftp/Makefile.am	2007-04-28 20:13:54.000000000 +0200
-+++ obexftp-0.21/obexftp/Makefile.am	2007-04-30 14:04:22.000000000 +0200
-@@ -4,11 +4,10 @@
- 				-I$(top_srcdir) \
- 				-I$(top_srcdir)/includes
- 
--LDADD =                         @OPENOBEX_LIBS@
--#				@BLUETOOTH_LIBS@ \
--#				@USB_LIBS@ \
--#				../multicobex/libmulticobex.la \
--#				../bfb/libbfb.la
-+libobexftp_la_LIBADD =		@OPENOBEX_LIBS@ \
-+				@BLUETOOTH_LIBS@ \
-+				../multicobex/libmulticobex.la \
-+				../bfb/libbfb.la
- 
- obexftpincludedir =		$(includedir)/obexftp
- 
diff --git a/app-mobilephone/obexftp/files/obexftp-0.21-cobex_write.patch b/app-mobilephone/obexftp/files/obexftp-0.21-cobex_write.patch
deleted file mode 100644
index db80309a5d8a..000000000000
--- a/app-mobilephone/obexftp/files/obexftp-0.21-cobex_write.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-diff -Nru obexftp-0.21.orig/multicobex/multi_cobex.c obexftp-0.21/multicobex/multi_cobex.c
---- obexftp-0.21.orig/multicobex/multi_cobex.c	2005-11-24 16:55:11.000000000 +0200
-+++ obexftp-0.21/multicobex/multi_cobex.c	2006-06-02 21:53:07.483151000 +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.21-no_iconv.patch b/app-mobilephone/obexftp/files/obexftp-0.21-no_iconv.patch
deleted file mode 100644
index c6d57d11ae47..000000000000
--- a/app-mobilephone/obexftp/files/obexftp-0.21-no_iconv.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- obexftp-0.21.orig/configure.in	2006-09-22 09:23:30 +0000
-+++ obexftp-0.21/configure.in	2006-09-22 09:23:47 +0000
-@@ -24,7 +24,7 @@
- # Checks for libraries.
- PKG_CHECK_MODULES(OPENOBEX,openobex)
- 
--AM_ICONV
-+dnl AM_ICONV
- dnl IRDA_CHECK
- BLUETOOTH_CHECK
- if test $am_cv_bluetooth_found = yes; then
diff --git a/app-mobilephone/obexftp/files/obexftp-0.21-sdp-detection.patch b/app-mobilephone/obexftp/files/obexftp-0.21-sdp-detection.patch
deleted file mode 100644
index c1cb7f183feb..000000000000
--- a/app-mobilephone/obexftp/files/obexftp-0.21-sdp-detection.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-diff -Nru obexftp-0.21.orig/apps/obexftp_sdp.c obexftp-0.21/apps/obexftp_sdp.c
---- obexftp-0.21.orig/apps/obexftp_sdp.c	2006-06-03 20:02:27.529609000 +0300
-+++ obexftp-0.21/apps/obexftp_sdp.c	2006-06-03 20:03:26.753310250 +0300
-@@ -34,6 +34,8 @@
- #include <sys/types.h>
- #include <sys/socket.h>
- 
-+#ifdef HAVE_SDPLIB
-+
- #include <bluetooth/bluetooth.h>
- #include <bluetooth/sdp.h>
- #include <bluetooth/sdp_lib.h>
-@@ -173,3 +175,17 @@
- 	return 0;
- }
- */
-+
-+#else
-+
-+void obexftp_sdp_unregister(void)
-+{
-+}
-+
-+int obexftp_sdp_register(void)
-+{
-+	syslog(LOG_ERR, "SDP not supported.");
-+	return -1;
-+}
-+
-+#endif // HAVE_SDPLIB
-diff -Nru obexftp-0.21.orig/configure.in obexftp-0.21/configure.in
---- obexftp-0.21.orig/configure.in	2006-06-03 20:02:27.529609000 +0300
-+++ obexftp-0.21/configure.in	2006-06-03 20:00:45.000000000 +0300
-@@ -27,7 +27,9 @@
- AM_ICONV
- dnl IRDA_CHECK
- BLUETOOTH_CHECK
--SDPLIB_CHECK
-+if test $am_cv_bluetooth_found = yes; then
-+	SDPLIB_CHECK
-+fi
- USB_CHECK
- 
- # check for optional swig rebuild
diff --git a/app-mobilephone/obexftp/obexftp-0.21.ebuild b/app-mobilephone/obexftp/obexftp-0.21.ebuild
deleted file mode 100644
index c9a0ff8566ef..000000000000
--- a/app-mobilephone/obexftp/obexftp-0.21.ebuild
+++ /dev/null
@@ -1,68 +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.21.ebuild,v 1.18 2008/08/25 17:28:39 nixnut Exp $
-
-WANT_AUTOMAKE="1.9"
-
-inherit eutils perl-module flag-o-matic autotools
-
-DESCRIPTION="File transfer over OBEX for mobile phones"
-SRC_URI="http://triq.net/obexftp/${P}.tar.bz2"
-HOMEPAGE="http://triq.net/obex"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 hppa ppc sparc x86"
-IUSE="bluetooth debug nls perl python swig tcl"
-
-RDEPEND="dev-libs/openobex
-	bluetooth? ( net-wireless/bluez-libs )
-	perl? ( dev-lang/perl )
-	python? ( >=dev-lang/python-2.4.2 )
-	tcl? ( dev-lang/tcl )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	swig? ( dev-lang/swig )
-	nls? ( sys-devel/gettext )"
-
-src_unpack() {
-	unpack ${A}
-
-	epatch "${FILESDIR}/${P}-cobex_write.patch"
-	epatch "${FILESDIR}/${P}-sdp-detection.patch"
-	epatch "${FILESDIR}/${P}-as-needed.patch"
-	use nls || epatch "${FILESDIR}/${P}-no_iconv.patch"
-
-	cd "${S}"
-	eautoreconf
-}
-
-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
-}
diff --git a/app-mobilephone/obexftp/obexftp-0.22.ebuild b/app-mobilephone/obexftp/obexftp-0.22.ebuild
index 8e01972c957d..1fb3321a976c 100644
--- a/app-mobilephone/obexftp/obexftp-0.22.ebuild
+++ b/app-mobilephone/obexftp/obexftp-0.22.ebuild
@@ -1,6 +1,8 @@
 # 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.22.ebuild,v 1.9 2009/03/06 03:08:16 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/obexftp/obexftp-0.22.ebuild,v 1.10 2009/04/25 10:53:48 mrness Exp $
+
+EAPI="2"
 
 inherit eutils perl-module flag-o-matic python
 
@@ -17,20 +19,18 @@ RDEPEND="dev-libs/openobex
 	bluetooth? ( net-wireless/bluez-libs )
 	perl? ( dev-lang/perl )
 	python? ( >=dev-lang/python-2.4.4 )
-	ruby? ( dev-lang/ruby )
+	ruby? ( dev-lang/ruby:1.8 )
 	tcl? ( dev-lang/tcl )"
 DEPEND="${RDEPEND}
 	swig? ( dev-lang/swig )
 	dev-util/pkgconfig"
 
-src_unpack() {
-	unpack ${A}
-
+src_prepare() {
 	epatch "${FILESDIR}"/${P}-ruby-libpath.patch
 	epatch "${FILESDIR}"/${P}-bluetooth.patch
 }
 
-src_compile() {
+src_configure() {
 	# do not byte-compile python module
 	if use python; then
 		sed -i \
@@ -49,8 +49,8 @@ src_compile() {
 		$(use_enable perl) \
 		$(use_enable python) \
 		$(use_enable tcl) \
-		$(use_enable ruby) || die "econf failed"
-	emake || die "emake failed"
+		$(use_enable ruby) \
+		RUBY=/usr/bin/ruby18 || die "econf failed"
 }
 
 src_install() {
diff --git a/app-mobilephone/obexftp/obexftp-0.23.ebuild b/app-mobilephone/obexftp/obexftp-0.23.ebuild
index 7c2d54f38638..a469490750e8 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.2 2009/03/22 16:52:59 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/obexftp/obexftp-0.23.ebuild,v 1.3 2009/04/25 10:53:48 mrness Exp $
 
 EAPI="2"
 
@@ -18,7 +18,7 @@ RDEPEND="dev-libs/openobex
 	bluetooth? ( net-wireless/bluez )
 	perl? ( dev-lang/perl )
 	python? ( >=dev-lang/python-2.4.4 )
-	ruby? ( dev-lang/ruby )
+	ruby? ( dev-lang/ruby:1.8 )
 	tcl? ( dev-lang/tcl )"
 DEPEND="${RDEPEND}
 	swig? ( dev-lang/swig )
@@ -47,7 +47,8 @@ src_configure() {
 		$(use_enable perl) \
 		$(use_enable python) \
 		$(use_enable tcl) \
-		$(use_enable ruby) || die "econf failed"
+		$(use_enable ruby) \
+		RUBY=/usr/bin/ruby18 || die "econf failed"
 }
 
 src_install() {