Gentoo Archives: gentoo-commits

From: "Tiziano Mueller (dev-zero)" <dev-zero@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in net-wireless/blueman: blueman-1.23-r2.ebuild blueman-1.23-r1.ebuild ChangeLog
Date: Wed, 20 Jun 2012 06:12:53
Message-Id: 20120620061244.1F1352004B@flycatcher.gentoo.org
1 dev-zero 12/06/20 06:12:44
2
3 Modified: blueman-1.23-r1.ebuild ChangeLog
4 Added: blueman-1.23-r2.ebuild
5 Log:
6 Convert shebangs to make sure python2.7 is used and set dependency to python-2.7 since it does not work with python-2.6 (bug #421631).
7
8 (Portage version: 2.1.10.65/cvs/Linux x86_64)
9
10 Revision Changes Path
11 1.2 net-wireless/blueman/blueman-1.23-r1.ebuild
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-wireless/blueman/blueman-1.23-r1.ebuild?rev=1.2&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-wireless/blueman/blueman-1.23-r1.ebuild?rev=1.2&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-wireless/blueman/blueman-1.23-r1.ebuild?r1=1.1&r2=1.2
16
17 Index: blueman-1.23-r1.ebuild
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/net-wireless/blueman/blueman-1.23-r1.ebuild,v
20 retrieving revision 1.1
21 retrieving revision 1.2
22 diff -u -r1.1 -r1.2
23 --- blueman-1.23-r1.ebuild 19 Jun 2012 06:10:22 -0000 1.1
24 +++ blueman-1.23-r1.ebuild 20 Jun 2012 06:12:44 -0000 1.2
25 @@ -1,10 +1,10 @@
26 # Copyright 1999-2012 Gentoo Foundation
27 # Distributed under the terms of the GNU General Public License v2
28 -# $Header: /var/cvsroot/gentoo-x86/net-wireless/blueman/blueman-1.23-r1.ebuild,v 1.1 2012/06/19 06:10:22 dev-zero Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/net-wireless/blueman/blueman-1.23-r1.ebuild,v 1.2 2012/06/20 06:12:44 dev-zero Exp $
30
31 EAPI="4"
32
33 -PYTHON_DEPEND="2"
34 +PYTHON_DEPEND="2:2.7"
35
36 inherit eutils python gnome2-utils
37
38
39
40
41 1.15 net-wireless/blueman/ChangeLog
42
43 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-wireless/blueman/ChangeLog?rev=1.15&view=markup
44 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-wireless/blueman/ChangeLog?rev=1.15&content-type=text/plain
45 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-wireless/blueman/ChangeLog?r1=1.14&r2=1.15
46
47 Index: ChangeLog
48 ===================================================================
49 RCS file: /var/cvsroot/gentoo-x86/net-wireless/blueman/ChangeLog,v
50 retrieving revision 1.14
51 retrieving revision 1.15
52 diff -u -r1.14 -r1.15
53 --- ChangeLog 19 Jun 2012 06:10:22 -0000 1.14
54 +++ ChangeLog 20 Jun 2012 06:12:44 -0000 1.15
55 @@ -1,6 +1,13 @@
56 # ChangeLog for net-wireless/blueman
57 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
58 -# $Header: /var/cvsroot/gentoo-x86/net-wireless/blueman/ChangeLog,v 1.14 2012/06/19 06:10:22 dev-zero Exp $
59 +# $Header: /var/cvsroot/gentoo-x86/net-wireless/blueman/ChangeLog,v 1.15 2012/06/20 06:12:44 dev-zero Exp $
60 +
61 +*blueman-1.23-r2 (20 Jun 2012)
62 +
63 + 20 Jun 2012; Tiziano Müller <dev-zero@g.o> +blueman-1.23-r2.ebuild,
64 + blueman-1.23-r1.ebuild:
65 + Convert shebangs to make sure python2.7 is used and set dependency to
66 + python-2.7 since it does not work with python-2.6 (bug #421631).
67
68 *blueman-1.23-r1 (19 Jun 2012)
69
70
71
72
73 1.1 net-wireless/blueman/blueman-1.23-r2.ebuild
74
75 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-wireless/blueman/blueman-1.23-r2.ebuild?rev=1.1&view=markup
76 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-wireless/blueman/blueman-1.23-r2.ebuild?rev=1.1&content-type=text/plain
77
78 Index: blueman-1.23-r2.ebuild
79 ===================================================================
80 # Copyright 1999-2012 Gentoo Foundation
81 # Distributed under the terms of the GNU General Public License v2
82 # $Header: /var/cvsroot/gentoo-x86/net-wireless/blueman/blueman-1.23-r2.ebuild,v 1.1 2012/06/20 06:12:44 dev-zero Exp $
83
84 EAPI="4"
85
86 PYTHON_DEPEND="2:2.7"
87
88 inherit eutils python gnome2-utils
89
90 DESCRIPTION="GTK+ Bluetooth Manager, designed to be simple and intuitive for everyday bluetooth tasks."
91 HOMEPAGE="http://blueman-project.org/"
92 SRC_URI="http://download.tuxfamily.org/${PN}/${P}.tar.gz"
93
94 LICENSE="GPL-3"
95 SLOT="0"
96 KEYWORDS="~amd64 ~ppc ~x86"
97 IUSE="gconf sendto network nls policykit pulseaudio"
98
99 CDEPEND="dev-libs/glib:2
100 >=x11-libs/gtk+-2.12:2
101 x11-libs/startup-notification
102 dev-python/pygobject:2
103 >=net-wireless/bluez-4.21"
104 DEPEND="${CDEPEND}
105 nls? ( dev-util/intltool sys-devel/gettext )
106 virtual/pkgconfig
107 >=dev-python/pyrex-0.9.8"
108 RDEPEND="${CDEPEND}
109 >=app-mobilephone/obex-data-server-0.4.4
110 sys-apps/dbus
111 dev-python/pygtk
112 dev-python/notify-python
113 dev-python/dbus-python
114 x11-themes/hicolor-icon-theme
115 gconf? ( dev-python/gconf-python )
116 sendto? ( gnome-base/nautilus )
117 network? ( || ( net-dns/dnsmasq
118 =net-misc/dhcp-3*
119 >=net-misc/networkmanager-0.8 ) )
120 policykit? ( sys-auth/polkit )
121 pulseaudio? ( media-sound/pulseaudio )"
122
123 pkg_setup() {
124 python_set_active_version 2.7
125 python_pkg_setup
126 }
127
128 src_prepare() {
129 # disable pyc compiling
130 ln -sf $(type -P true) py-compile
131
132 sed -i \
133 -e '/^Encoding/d' \
134 data/blueman-manager.desktop.in || die "sed failed"
135
136 epatch \
137 "${FILESDIR}/${P}-plugins-conf-file.patch" \
138 "${FILESDIR}/${P}-fix-broken-status-icon.patch" \
139 "${FILESDIR}/${P}-set-codeset-for-gettext-to-UTF-8-always.patch"
140 }
141
142 src_configure() {
143 econf \
144 --disable-static \
145 $(use_enable policykit polkit) \
146 $(use_enable sendto) \
147 --disable-hal \
148 $(use_enable nls)
149 }
150
151 src_install() {
152 default
153
154 python_convert_shebangs 2.7 "${D}"/usr/bin/blueman-* "${D}/usr/libexec/blueman-mechanism"
155
156 rm "${D}"/$(python_get_sitedir)/*.la
157 use sendto && rm "${D}"/usr/lib*/nautilus-sendto/plugins/*.la
158
159 use gconf || rm "${D}"/$(python_get_sitedir)/${PN}/plugins/config/Gconf.py
160 use policykit || rm -rf "${D}"/usr/share/polkit-1
161 use pulseaudio || rm "${D}"/$(python_get_sitedir)/${PN}/{main/Pulse*.py,plugins/applet/Pulse*.py}
162
163 python_need_rebuild
164 }
165
166 pkg_preinst() {
167 gnome2_icon_savelist
168 }
169
170 pkg_postinst() {
171 python_mod_optimize ${PN}
172 gnome2_icon_cache_update
173 }
174
175 pkg_postrm() {
176 python_mod_cleanup ${PN}
177 gnome2_icon_cache_update
178 }