Gentoo Archives: gentoo-commits

From: "Alin Nastac (mrness)" <mrness@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in app-mobilephone/obexftp: obexftp-0.22.ebuild ChangeLog obexftp-0.23.ebuild obexftp-0.21.ebuild
Date: Sat, 25 Apr 2009 10:53:51
Message-Id: E1LxfW1-0003et-0p@stork.gentoo.org
1 mrness 09/04/25 10:53:49
2
3 Modified: obexftp-0.22.ebuild ChangeLog obexftp-0.23.ebuild
4 Removed: obexftp-0.21.ebuild
5 Log:
6 Restrict ruby dependency atom to slot 1.8 (#261736).
7 (Portage version: 2.1.6.7/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.10 app-mobilephone/obexftp/obexftp-0.22.ebuild
11
12 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-mobilephone/obexftp/obexftp-0.22.ebuild?rev=1.10&view=markup
13 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-mobilephone/obexftp/obexftp-0.22.ebuild?rev=1.10&content-type=text/plain
14 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-mobilephone/obexftp/obexftp-0.22.ebuild?r1=1.9&r2=1.10
15
16 Index: obexftp-0.22.ebuild
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/app-mobilephone/obexftp/obexftp-0.22.ebuild,v
19 retrieving revision 1.9
20 retrieving revision 1.10
21 diff -u -r1.9 -r1.10
22 --- obexftp-0.22.ebuild 6 Mar 2009 03:08:16 -0000 1.9
23 +++ obexftp-0.22.ebuild 25 Apr 2009 10:53:48 -0000 1.10
24 @@ -1,6 +1,8 @@
25 # Copyright 1999-2009 Gentoo Foundation
26 # Distributed under the terms of the GNU General Public License v2
27 -# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/obexftp/obexftp-0.22.ebuild,v 1.9 2009/03/06 03:08:16 jer Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/obexftp/obexftp-0.22.ebuild,v 1.10 2009/04/25 10:53:48 mrness Exp $
29 +
30 +EAPI="2"
31
32 inherit eutils perl-module flag-o-matic python
33
34 @@ -17,20 +19,18 @@
35 bluetooth? ( net-wireless/bluez-libs )
36 perl? ( dev-lang/perl )
37 python? ( >=dev-lang/python-2.4.4 )
38 - ruby? ( dev-lang/ruby )
39 + ruby? ( dev-lang/ruby:1.8 )
40 tcl? ( dev-lang/tcl )"
41 DEPEND="${RDEPEND}
42 swig? ( dev-lang/swig )
43 dev-util/pkgconfig"
44
45 -src_unpack() {
46 - unpack ${A}
47 -
48 +src_prepare() {
49 epatch "${FILESDIR}"/${P}-ruby-libpath.patch
50 epatch "${FILESDIR}"/${P}-bluetooth.patch
51 }
52
53 -src_compile() {
54 +src_configure() {
55 # do not byte-compile python module
56 if use python; then
57 sed -i \
58 @@ -49,8 +49,8 @@
59 $(use_enable perl) \
60 $(use_enable python) \
61 $(use_enable tcl) \
62 - $(use_enable ruby) || die "econf failed"
63 - emake || die "emake failed"
64 + $(use_enable ruby) \
65 + RUBY=/usr/bin/ruby18 || die "econf failed"
66 }
67
68 src_install() {
69
70
71
72 1.48 app-mobilephone/obexftp/ChangeLog
73
74 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-mobilephone/obexftp/ChangeLog?rev=1.48&view=markup
75 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-mobilephone/obexftp/ChangeLog?rev=1.48&content-type=text/plain
76 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-mobilephone/obexftp/ChangeLog?r1=1.47&r2=1.48
77
78 Index: ChangeLog
79 ===================================================================
80 RCS file: /var/cvsroot/gentoo-x86/app-mobilephone/obexftp/ChangeLog,v
81 retrieving revision 1.47
82 retrieving revision 1.48
83 diff -u -r1.47 -r1.48
84 --- ChangeLog 22 Mar 2009 16:52:59 -0000 1.47
85 +++ ChangeLog 25 Apr 2009 10:53:48 -0000 1.48
86 @@ -1,6 +1,13 @@
87 # ChangeLog for app-mobilephone/obexftp
88 # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
89 -# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/obexftp/ChangeLog,v 1.47 2009/03/22 16:52:59 mrness Exp $
90 +# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/obexftp/ChangeLog,v 1.48 2009/04/25 10:53:48 mrness Exp $
91 +
92 + 25 Apr 2009; Alin Năstac <mrness@g.o>
93 + -files/obexftp-0.21-as-needed.patch,
94 + -files/obexftp-0.21-cobex_write.patch, -files/obexftp-0.21-no_iconv.patch,
95 + -files/obexftp-0.21-sdp-detection.patch, -obexftp-0.21.ebuild,
96 + obexftp-0.22.ebuild, obexftp-0.23.ebuild:
97 + Restrict ruby dependency atom to slot 1.8 (#261736).
98
99 22 Mar 2009; Alin Năstac <mrness@g.o>
100 +files/obexftp-0.23-gentoo.patch, obexftp-0.23.ebuild:
101
102
103
104 1.3 app-mobilephone/obexftp/obexftp-0.23.ebuild
105
106 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-mobilephone/obexftp/obexftp-0.23.ebuild?rev=1.3&view=markup
107 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-mobilephone/obexftp/obexftp-0.23.ebuild?rev=1.3&content-type=text/plain
108 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-mobilephone/obexftp/obexftp-0.23.ebuild?r1=1.2&r2=1.3
109
110 Index: obexftp-0.23.ebuild
111 ===================================================================
112 RCS file: /var/cvsroot/gentoo-x86/app-mobilephone/obexftp/obexftp-0.23.ebuild,v
113 retrieving revision 1.2
114 retrieving revision 1.3
115 diff -u -r1.2 -r1.3
116 --- obexftp-0.23.ebuild 22 Mar 2009 16:52:59 -0000 1.2
117 +++ obexftp-0.23.ebuild 25 Apr 2009 10:53:48 -0000 1.3
118 @@ -1,6 +1,6 @@
119 # Copyright 1999-2009 Gentoo Foundation
120 # Distributed under the terms of the GNU General Public License v2
121 -# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/obexftp/obexftp-0.23.ebuild,v 1.2 2009/03/22 16:52:59 mrness Exp $
122 +# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/obexftp/obexftp-0.23.ebuild,v 1.3 2009/04/25 10:53:48 mrness Exp $
123
124 EAPI="2"
125
126 @@ -18,7 +18,7 @@
127 bluetooth? ( net-wireless/bluez )
128 perl? ( dev-lang/perl )
129 python? ( >=dev-lang/python-2.4.4 )
130 - ruby? ( dev-lang/ruby )
131 + ruby? ( dev-lang/ruby:1.8 )
132 tcl? ( dev-lang/tcl )"
133 DEPEND="${RDEPEND}
134 swig? ( dev-lang/swig )
135 @@ -47,7 +47,8 @@
136 $(use_enable perl) \
137 $(use_enable python) \
138 $(use_enable tcl) \
139 - $(use_enable ruby) || die "econf failed"
140 + $(use_enable ruby) \
141 + RUBY=/usr/bin/ruby18 || die "econf failed"
142 }
143
144 src_install() {