summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlin Năstac <mrness@gentoo.org>2007-09-06 06:23:28 +0000
committerAlin Năstac <mrness@gentoo.org>2007-09-06 06:23:28 +0000
commit007643e79be3dd3e9a4981a7f7918840747bbf8f (patch)
treeaf00617d24b0cfe3db67e781779c8cc678940a9a /app-mobilephone/obexftp
parentstable x86, bug 190643 (diff)
downloadhistorical-007643e79be3dd3e9a4981a7f7918840747bbf8f.tar.gz
historical-007643e79be3dd3e9a4981a7f7918840747bbf8f.tar.bz2
historical-007643e79be3dd3e9a4981a7f7918840747bbf8f.zip
Fix compile error when USE="ruby -bluetooth" (#174507).
Package-Manager: portage-2.1.2.12
Diffstat (limited to 'app-mobilephone/obexftp')
-rw-r--r--app-mobilephone/obexftp/ChangeLog5
-rw-r--r--app-mobilephone/obexftp/Manifest24
-rw-r--r--app-mobilephone/obexftp/obexftp-0.22_rc7.ebuild5
3 files changed, 20 insertions, 14 deletions
diff --git a/app-mobilephone/obexftp/ChangeLog b/app-mobilephone/obexftp/ChangeLog
index 95dab96b8b1b..90e6d2081fa4 100644
--- a/app-mobilephone/obexftp/ChangeLog
+++ b/app-mobilephone/obexftp/ChangeLog
@@ -1,6 +1,9 @@
# 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.30 2007/09/05 13:56:13 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/obexftp/ChangeLog,v 1.31 2007/09/06 06:23:28 mrness Exp $
+
+ 06 Sep 2007; Alin Năstac <mrness@gentoo.org> obexftp-0.22_rc7.ebuild:
+ Fix compile error when USE="ruby -bluetooth" (#174507).
*obexftp-0.22_rc7 (05 Sep 2007)
diff --git a/app-mobilephone/obexftp/Manifest b/app-mobilephone/obexftp/Manifest
index 4c1e429159d9..2df1acdf798c 100644
--- a/app-mobilephone/obexftp/Manifest
+++ b/app-mobilephone/obexftp/Manifest
@@ -23,14 +23,14 @@ EBUILD obexftp-0.21.ebuild 1728 RMD160 5fe22e68a96dc8c19d84c63f4d928441dd528667
MD5 98f37ae9c5e14adf63154c3e397cb258 obexftp-0.21.ebuild 1728
RMD160 5fe22e68a96dc8c19d84c63f4d928441dd528667 obexftp-0.21.ebuild 1728
SHA256 0d2d48cce4419030634e4ed753328663528c4be0c7a06e02181f87da1b2d63e1 obexftp-0.21.ebuild 1728
-EBUILD obexftp-0.22_rc7.ebuild 1527 RMD160 fe9c6d0777427f9bc17a521df1a2cc73c1592156 SHA1 86f0ddbe11d2c0caa481309656f5bce55395b473 SHA256 af0adc5b9cfdea04e714605a31774332a181e0b90393b8afd3b3940f09abe647
-MD5 0d8ee7772ec8e5047299f6653a96f1ca obexftp-0.22_rc7.ebuild 1527
-RMD160 fe9c6d0777427f9bc17a521df1a2cc73c1592156 obexftp-0.22_rc7.ebuild 1527
-SHA256 af0adc5b9cfdea04e714605a31774332a181e0b90393b8afd3b3940f09abe647 obexftp-0.22_rc7.ebuild 1527
-MISC ChangeLog 8413 RMD160 c2e6af0837fae0e0d75e44666fe304d579b956fa SHA1 69dbd1b11576fc99cc0436fc0aa805e75b59891c SHA256 107fdb2e76be1c5bf1b1a32e2298cd2fa19dc4bbddd7b6f74d66fe8c2eb19338
-MD5 2d9303b4658c5fdb018522069cc4e1f2 ChangeLog 8413
-RMD160 c2e6af0837fae0e0d75e44666fe304d579b956fa ChangeLog 8413
-SHA256 107fdb2e76be1c5bf1b1a32e2298cd2fa19dc4bbddd7b6f74d66fe8c2eb19338 ChangeLog 8413
+EBUILD obexftp-0.22_rc7.ebuild 1632 RMD160 a31fe9040fa58c9b90d03afba7b24e08da464868 SHA1 6ea010d8fde78fb2b854a3a60e86af6ecd671114 SHA256 caedbdf831195baa45dc591c7957fe2066713286a88bddbedac002bc9f7a3a5f
+MD5 5bc43893084913afc38189d99f29d64d obexftp-0.22_rc7.ebuild 1632
+RMD160 a31fe9040fa58c9b90d03afba7b24e08da464868 obexftp-0.22_rc7.ebuild 1632
+SHA256 caedbdf831195baa45dc591c7957fe2066713286a88bddbedac002bc9f7a3a5f obexftp-0.22_rc7.ebuild 1632
+MISC ChangeLog 8545 RMD160 630a943d055e8281f74a96343216d68a21011500 SHA1 9c8065b6849d43867086fdbaed999352cbbe843f SHA256 602866aea6e52d7b200e10eb1483d150dcd4988d06a601d94db6fd27afeb388d
+MD5 ccef6c3c361384c93cea070c71a316cd ChangeLog 8545
+RMD160 630a943d055e8281f74a96343216d68a21011500 ChangeLog 8545
+SHA256 602866aea6e52d7b200e10eb1483d150dcd4988d06a601d94db6fd27afeb388d ChangeLog 8545
MISC metadata.xml 336 RMD160 80dacb93f1327adc8cb3578a6ffacea1fc817236 SHA1 2826721776ac855b8539336dbcad0750c1399171 SHA256 ac612b65bbad310c1953486d1ce87c081502ec1c90e3d348ae697dc8d3847aff
MD5 1a820f941ddbd683086de6d92efbdf5c metadata.xml 336
RMD160 80dacb93f1327adc8cb3578a6ffacea1fc817236 metadata.xml 336
@@ -42,9 +42,9 @@ MD5 bab7a05be90d88b31725dc749f41127a files/digest-obexftp-0.22_rc7 253
RMD160 f68c24450de21b90164c4e114cbb3a5a9b3db365 files/digest-obexftp-0.22_rc7 253
SHA256 b3433c9ee17eab39f925f6a970f3d69a657e38bf05936a2a9cbf3fc7fd981bec files/digest-obexftp-0.22_rc7 253
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.5 (GNU/Linux)
+Version: GnuPG v2.0.6 (GNU/Linux)
-iD8DBQFG3rWJVSA5X31g7/gRAkE+AJ4zx9beShHynFZlmjRDW9o6KwUsNgCeJ4lw
-Ndc1fUOkwSAzsY3sjFqQezk=
-=fqp0
+iD8DBQFG35zrVSA5X31g7/gRAicKAKCmTHnK09imT+I9otiHWU5YsxJtwgCgpO6b
+9DRAA1YU1TsTpE17cEh2+8I=
+=OJ1I
-----END PGP SIGNATURE-----
diff --git a/app-mobilephone/obexftp/obexftp-0.22_rc7.ebuild b/app-mobilephone/obexftp/obexftp-0.22_rc7.ebuild
index d6bc515328b1..7c1277699079 100644
--- a/app-mobilephone/obexftp/obexftp-0.22_rc7.ebuild
+++ b/app-mobilephone/obexftp/obexftp-0.22_rc7.ebuild
@@ -1,6 +1,6 @@
# 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_rc7.ebuild,v 1.1 2007/09/05 13:56:13 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/obexftp/obexftp-0.22_rc7.ebuild,v 1.2 2007/09/06 06:23:28 mrness Exp $
inherit eutils perl-module flag-o-matic
@@ -34,6 +34,9 @@ src_compile() {
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) \