Gentoo Archives: gentoo-commits

From: Pacho Ramos <pacho@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-wireless/blueman/
Date: Tue, 27 Oct 2015 19:13:00
Message-Id: 1445973157.50cc925c7fef24dbe5ac315fc3d55214ccee396b.pacho@gentoo
1 commit: 50cc925c7fef24dbe5ac315fc3d55214ccee396b
2 Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
3 AuthorDate: Tue Oct 27 19:12:37 2015 +0000
4 Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
5 CommitDate: Tue Oct 27 19:12:37 2015 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=50cc925c
7
8 net-wireless/blueman: Drop old, bug #564264
9
10 Package-Manager: portage-2.2.23
11
12 net-wireless/blueman/Manifest | 1 -
13 net-wireless/blueman/blueman-1.23-r2.ebuild | 100 ------------------------
14 net-wireless/blueman/blueman-2.0.ebuild | 116 ----------------------------
15 net-wireless/blueman/metadata.xml | 2 -
16 4 files changed, 219 deletions(-)
17
18 diff --git a/net-wireless/blueman/Manifest b/net-wireless/blueman/Manifest
19 index 4d54215..ff84641 100644
20 --- a/net-wireless/blueman/Manifest
21 +++ b/net-wireless/blueman/Manifest
22 @@ -1,2 +1 @@
23 -DIST blueman-1.23.tar.gz 1223094 SHA256 50b261bcdc2e99e176c7c194825da1259500aaacaccb92714d97af0209a4f011 SHA512 529a43dace73bf362baac69404a9e87d14f5bcb7b07b18194434c7a6c1dbc22f8fecdb4923c92a77b65656405a492b9e147e77cb7a161df4a93e8b78a003eba7 WHIRLPOOL 4070b4d86cbe743278730e4ee3022bcfdea590b5b76e545cc67912a3498de993ed0c62cb67ac2cd3ad3b8e3c17c5d5a8b1f8fa6e214234a64a784146c6d6d542
24 DIST blueman-2.0.tar.xz 1941332 SHA256 81a5ca95124f12bfb62d2d2d0d265af70cdae1d43b0c6e4fc6d2bad8f82958f1 SHA512 44d3967d031f7482e7700674970eff08fee53d8cbeb96e46b2f97e2a2fb6b5790f663ed73129eab241545ebaa6c5748dc6cf6b90a2c4795b27e90b5399d71f80 WHIRLPOOL 394bac3e0b457fdbb79c69fe9181abafde3f9b1138ff71c4dc23bc78424b76284e3ad9cf02dc168848fa461541f86fa2bba5aee0f014e460f0852e1bfa163dae
25
26 diff --git a/net-wireless/blueman/blueman-1.23-r2.ebuild b/net-wireless/blueman/blueman-1.23-r2.ebuild
27 deleted file mode 100644
28 index ae5de7c..0000000
29 --- a/net-wireless/blueman/blueman-1.23-r2.ebuild
30 +++ /dev/null
31 @@ -1,100 +0,0 @@
32 -# Copyright 1999-2015 Gentoo Foundation
33 -# Distributed under the terms of the GNU General Public License v2
34 -# $Id$
35 -
36 -EAPI="4"
37 -
38 -PYTHON_DEPEND="2:2.7"
39 -
40 -inherit eutils python gnome2-utils
41 -
42 -DESCRIPTION="GTK+ Bluetooth Manager, designed to be simple and intuitive for everyday bluetooth tasks"
43 -HOMEPAGE="https://github.com/blueman-project/blueman"
44 -SRC_URI="http://download.tuxfamily.org/${PN}/${P}.tar.gz"
45 -
46 -LICENSE="GPL-3"
47 -SLOT="0"
48 -KEYWORDS="~amd64 ~ppc ~x86"
49 -IUSE="gconf sendto network nls policykit pulseaudio"
50 -
51 -CDEPEND="dev-libs/glib:2
52 - >=x11-libs/gtk+-2.12:2
53 - x11-libs/startup-notification
54 - dev-python/pygobject:2
55 - <net-wireless/bluez-5
56 - >=net-wireless/bluez-4.21"
57 -DEPEND="${CDEPEND}
58 - nls? ( dev-util/intltool sys-devel/gettext )
59 - virtual/pkgconfig
60 - >=dev-python/pyrex-0.9.8"
61 -RDEPEND="${CDEPEND}
62 - >=app-mobilephone/obex-data-server-0.4.4
63 - sys-apps/dbus
64 - dev-python/pygtk
65 - dev-python/notify-python
66 - dev-python/dbus-python
67 - x11-themes/hicolor-icon-theme
68 - gconf? ( dev-python/gconf-python )
69 - sendto? ( gnome-base/nautilus )
70 - network? ( || ( net-dns/dnsmasq
71 - net-misc/dhcp
72 - >=net-misc/networkmanager-0.8 ) )
73 - policykit? ( sys-auth/polkit )
74 - pulseaudio? ( media-sound/pulseaudio )"
75 -
76 -pkg_setup() {
77 - python_set_active_version 2.7
78 - python_pkg_setup
79 -}
80 -
81 -src_prepare() {
82 - # disable pyc compiling
83 - ln -sf $(type -P true) py-compile
84 -
85 - sed -i \
86 - -e '/^Encoding/d' \
87 - data/blueman-manager.desktop.in || die "sed failed"
88 -
89 - epatch \
90 - "${FILESDIR}/${P}-plugins-conf-file.patch" \
91 - "${FILESDIR}/${P}-fix-broken-status-icon.patch" \
92 - "${FILESDIR}/${P}-set-codeset-for-gettext-to-UTF-8-always.patch"
93 -}
94 -
95 -src_configure() {
96 - econf \
97 - --disable-static \
98 - $(use_enable policykit polkit) \
99 - $(use_enable sendto) \
100 - --disable-hal \
101 - $(use_enable nls)
102 -}
103 -
104 -src_install() {
105 - default
106 -
107 - python_convert_shebangs 2.7 "${D}"/usr/bin/blueman-* "${D}/usr/libexec/blueman-mechanism"
108 -
109 - rm "${D}"/$(python_get_sitedir)/*.la
110 - use sendto && rm "${D}"/usr/lib*/nautilus-sendto/plugins/*.la
111 -
112 - use gconf || rm "${D}"/$(python_get_sitedir)/${PN}/plugins/config/Gconf.py
113 - use policykit || rm -rf "${D}"/usr/share/polkit-1
114 - use pulseaudio || rm "${D}"/$(python_get_sitedir)/${PN}/{main/Pulse*.py,plugins/applet/Pulse*.py}
115 -
116 - python_need_rebuild
117 -}
118 -
119 -pkg_preinst() {
120 - gnome2_icon_savelist
121 -}
122 -
123 -pkg_postinst() {
124 - python_mod_optimize ${PN}
125 - gnome2_icon_cache_update
126 -}
127 -
128 -pkg_postrm() {
129 - python_mod_cleanup ${PN}
130 - gnome2_icon_cache_update
131 -}
132
133 diff --git a/net-wireless/blueman/blueman-2.0.ebuild b/net-wireless/blueman/blueman-2.0.ebuild
134 deleted file mode 100644
135 index 4737156..0000000
136 --- a/net-wireless/blueman/blueman-2.0.ebuild
137 +++ /dev/null
138 @@ -1,116 +0,0 @@
139 -# Copyright 1999-2015 Gentoo Foundation
140 -# Distributed under the terms of the GNU General Public License v2
141 -# $Id$
142 -
143 -EAPI="5"
144 -
145 -PYTHON_COMPAT=( python2_7 )
146 -inherit eutils gnome2-utils linux-info python-single-r1
147 -
148 -DESCRIPTION="GTK+ Bluetooth Manager, designed to be simple and intuitive for everyday bluetooth tasks"
149 -HOMEPAGE="https://github.com/blueman-project/blueman"
150 -
151 -if [[ ${PV} == "9999" ]] ; then
152 - inherit autotools git-r3
153 - EGIT_REPO_URI="https://github.com/blueman-project/blueman.git"
154 - KEYWORDS=""
155 -else
156 - SRC_URI="https://github.com/blueman-project/${PN}/releases/download/${PV}/${P}.tar.xz"
157 - KEYWORDS="~amd64 ~x86"
158 -fi
159 -
160 -LICENSE="GPL-3"
161 -SLOT="0"
162 -IUSE="appindicator network nls policykit pulseaudio thunar"
163 -
164 -COMMON_DEPEND="
165 - dev-python/pygobject:3
166 - >=net-wireless/bluez-4.61:=
167 - ${PYTHON_DEPS}"
168 -DEPEND="${COMMON_DEPEND}
169 - dev-python/cython[${PYTHON_USEDEP}]
170 - virtual/pkgconfig
171 - nls? ( dev-util/intltool sys-devel/gettext )"
172 -RDEPEND="${COMMON_DEPEND}
173 - dev-python/dbus-python[${PYTHON_USEDEP}]
174 - dev-python/pycairo[${PYTHON_USEDEP}]
175 - sys-apps/dbus
176 - x11-libs/gtk+:3[introspection]
177 - x11-libs/libnotify[introspection]
178 - || (
179 - x11-themes/faenza-icon-theme
180 - x11-themes/gnome-icon-theme
181 - x11-themes/mate-icon-theme
182 - )
183 - appindicator? ( dev-libs/libappindicator:3[introspection] )
184 - network? (
185 - net-dns/avahi[autoipd]
186 - net-firewall/iptables
187 - sys-apps/net-tools
188 - || (
189 - net-dns/dnsmasq
190 - net-misc/dhcp
191 - >=net-misc/networkmanager-0.8
192 - )
193 - )
194 - policykit? ( sys-auth/polkit )
195 - pulseaudio? ( media-sound/pulseaudio[bluetooth] )
196 - thunar? ( xfce-base/thunar )
197 - !net-wireless/gnome-bluetooth
198 -"
199 -
200 -REQUIRED_USE="${PYTHON_REQUIRED_USE}"
201 -
202 -pkg_pretend() {
203 - if use network; then
204 - local CONFIG_CHECK="~BRIDGE ~IP_NF_IPTABLES
205 - ~IP_NF_NAT ~IP_NF_TARGET_MASQUERADE"
206 - linux-info_pkg_setup
207 - fi
208 -}
209 -
210 -pkg_setup() {
211 - pkg_pretend
212 - python-single-r1_pkg_setup
213 -}
214 -
215 -src_prepare() {
216 - epatch \
217 - "${FILESDIR}/${P}-set-codeset-for-gettext-to-UTF-8-always.patch"
218 - [[ ${PV} == 9999 ]] && eautoreconf
219 -}
220 -
221 -src_configure() {
222 - econf \
223 - --docdir=/usr/share/doc/${PF} \
224 - --disable-runtime-deps-check \
225 - --disable-static \
226 - $(use_enable policykit polkit) \
227 - $(use_enable nls) \
228 - $(use_enable thunar thunar-sendto)
229 -}
230 -
231 -src_install() {
232 - default
233 -
234 - python_fix_shebang "${D}"
235 - rm "${D}"/$(python_get_sitedir)/*.la || die
236 -
237 - use appindicator || { rm "${D}"/$(python_get_sitedir)/${PN}/plugins/applet/AppIndicator.py* || die; }
238 - use pulseaudio || { rm "${D}"/$(python_get_sitedir)/${PN}/{main/Pulse*.py*,plugins/manager/Pulse*.py*} || die; }
239 -}
240 -
241 -pkg_preinst() {
242 - gnome2_icon_savelist
243 - gnome2_schemas_savelist
244 -}
245 -
246 -pkg_postinst() {
247 - gnome2_icon_cache_update
248 - gnome2_schemas_update
249 -}
250 -
251 -pkg_postrm() {
252 - gnome2_icon_cache_update
253 - gnome2_schemas_update
254 -}
255
256 diff --git a/net-wireless/blueman/metadata.xml b/net-wireless/blueman/metadata.xml
257 index e028100..65cf63c 100644
258 --- a/net-wireless/blueman/metadata.xml
259 +++ b/net-wireless/blueman/metadata.xml
260 @@ -10,9 +10,7 @@
261 </maintainer>
262 <use>
263 <flag name="appindicator">Enable usage of <pkg>dev-libs/libappindicator</pkg> to export menu options</flag>
264 - <flag name="gconf">Enable the GConf configuration backend</flag>
265 <flag name="network">Add functionality to setup (host) PAN connections using either <pkg>net-dns/dnsmasq</pkg> or <pkg>net-misc/dhcp</pkg></flag>
266 - <flag name="sendto">Install the sendto-plugin for <pkg>gnome-base/nautilus</pkg></flag>
267 <flag name="thunar">Install the sendto-plugin for <pkg>xfce-base/thunar</pkg></flag>
268 </use>
269 <upstream>