1 |
scarabeus 11/04/28 20:58:08 |
2 |
|
3 |
Modified: bluez-4.91.ebuild ChangeLog |
4 |
Log: |
5 |
Order the dependencies alphabetically. Sort old-daemons elog informations. Drop info about them being disabled (no bluez3 around for long time already). Drop elog check for gnome/kde gui as both desktop environments handle bluetooth properly themselves. |
6 |
|
7 |
(Portage version: 2.2.0_alpha30/cvs/Linux x86_64) |
8 |
|
9 |
Revision Changes Path |
10 |
1.2 net-wireless/bluez/bluez-4.91.ebuild |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-wireless/bluez/bluez-4.91.ebuild?rev=1.2&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-wireless/bluez/bluez-4.91.ebuild?rev=1.2&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-wireless/bluez/bluez-4.91.ebuild?r1=1.1&r2=1.2 |
15 |
|
16 |
Index: bluez-4.91.ebuild |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/net-wireless/bluez/bluez-4.91.ebuild,v |
19 |
retrieving revision 1.1 |
20 |
retrieving revision 1.2 |
21 |
diff -u -r1.1 -r1.2 |
22 |
--- bluez-4.91.ebuild 30 Mar 2011 09:49:26 -0000 1.1 |
23 |
+++ bluez-4.91.ebuild 28 Apr 2011 20:58:08 -0000 1.2 |
24 |
@@ -1,6 +1,6 @@ |
25 |
# Copyright 1999-2011 Gentoo Foundation |
26 |
# Distributed under the terms of the GNU General Public License v2 |
27 |
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/bluez-4.91.ebuild,v 1.1 2011/03/30 09:49:26 pacho Exp $ |
28 |
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/bluez-4.91.ebuild,v 1.2 2011/04/28 20:58:08 scarabeus Exp $ |
29 |
|
30 |
EAPI="4" |
31 |
|
32 |
@@ -12,7 +12,7 @@ |
33 |
# Because of oui.txt changing from time to time without noticement, we need to supply it |
34 |
# ourselves instead of using http://standards.ieee.org/regauth/oui/oui.txt directly. |
35 |
# See bugs #345263 and #349473 for reference. |
36 |
-OUIDATE="20110330" # Needed because of bug #345263 |
37 |
+OUIDATE="20110330" |
38 |
SRC_URI="mirror://kernel/linux/bluetooth/${P}.tar.gz |
39 |
http://dev.gentoo.org/~pacho/bluez/oui-${OUIDATE}.txt" |
40 |
LICENSE="GPL-2 LGPL-2.1" |
41 |
@@ -21,29 +21,37 @@ |
42 |
|
43 |
IUSE="alsa attrib caps +consolekit cups debug gstreamer maemo6 health old-daemons pcmcia pnat test-programs usb" |
44 |
|
45 |
-CDEPEND="alsa? ( |
46 |
+CDEPEND=" |
47 |
+ >=dev-libs/glib-2.14:2 |
48 |
+ media-libs/libsndfile |
49 |
+ sys-apps/dbus |
50 |
+ >=sys-fs/udev-146[extras] |
51 |
+ alsa? ( |
52 |
media-libs/alsa-lib[alsa_pcm_plugins_extplug,alsa_pcm_plugins_ioplug] |
53 |
) |
54 |
caps? ( >=sys-libs/libcap-ng-0.6.2 ) |
55 |
+ cups? ( net-print/cups ) |
56 |
gstreamer? ( |
57 |
>=media-libs/gstreamer-0.10:0.10 |
58 |
- >=media-libs/gst-plugins-base-0.10:0.10 ) |
59 |
+ >=media-libs/gst-plugins-base-0.10:0.10 |
60 |
+ ) |
61 |
usb? ( dev-libs/libusb:1 ) |
62 |
- cups? ( net-print/cups ) |
63 |
- >=sys-fs/udev-146[extras] |
64 |
- >=dev-libs/glib-2.14:2 |
65 |
- sys-apps/dbus |
66 |
- media-libs/libsndfile |
67 |
- !net-wireless/bluez-libs |
68 |
- !net-wireless/bluez-utils" |
69 |
-DEPEND="sys-devel/flex |
70 |
+" |
71 |
+DEPEND="${CDEPEND} |
72 |
>=dev-util/pkgconfig-0.20 |
73 |
- ${CDEPEND}" |
74 |
+ sys-devel/flex |
75 |
+" |
76 |
RDEPEND="${CDEPEND} |
77 |
+ !net-wireless/bluez-libs |
78 |
+ !net-wireless/bluez-utils |
79 |
consolekit? ( sys-auth/consolekit ) |
80 |
test-programs? ( |
81 |
dev-python/dbus-python |
82 |
- dev-python/pygobject:2 )" |
83 |
+ dev-python/pygobject:2 |
84 |
+ ) |
85 |
+" |
86 |
+ |
87 |
+DOCS=( AUTHORS ChangeLog README ) |
88 |
|
89 |
pkg_setup() { |
90 |
if ! use consolekit; then |
91 |
@@ -58,7 +66,8 @@ |
92 |
fi |
93 |
|
94 |
if use cups; then |
95 |
- sed -i -e "s:cupsdir = \$(libdir)/cups:cupsdir = `cups-config --serverbin`:" \ |
96 |
+ sed -i \ |
97 |
+ -e "s:cupsdir = \$(libdir)/cups:cupsdir = `cups-config --serverbin`:" \ |
98 |
Makefile.tools Makefile.in || die |
99 |
fi |
100 |
} |
101 |
@@ -95,8 +104,7 @@ |
102 |
} |
103 |
|
104 |
src_install() { |
105 |
- emake DESTDIR="${D}" install |
106 |
- dodoc AUTHORS ChangeLog README |
107 |
+ default |
108 |
|
109 |
if use test-programs ; then |
110 |
cd "${S}/test" |
111 |
@@ -138,49 +146,31 @@ |
112 |
insinto /var/lib/misc |
113 |
newins "${DISTDIR}/oui-${OUIDATE}.txt" oui.txt |
114 |
|
115 |
- find "${ED}" -name "*.la" -delete || die "remove of la files failed" |
116 |
+ find "${ED}" -name "*.la" -delete |
117 |
} |
118 |
|
119 |
pkg_postinst() { |
120 |
udevadm control --reload-rules && udevadm trigger --subsystem-match=bluetooth |
121 |
|
122 |
if ! has_version "net-dialup/ppp"; then |
123 |
- elog |
124 |
elog "To use dial up networking you must install net-dialup/ppp." |
125 |
fi |
126 |
|
127 |
- if ! has_version "net-wireless/gnome-bluetooth" && ! has_version "net-wireless/kbluetooth"; then |
128 |
- elog |
129 |
- elog "For desktop integration you can try net-wireless/gnome-bluetooth" |
130 |
- elog "for gnome and net-wireless/kbluetooth for kde." |
131 |
- fi |
132 |
- |
133 |
- if ! use old-daemons; then |
134 |
- elog |
135 |
- elog "Use the old-daemons use flag to get the old daemons like hidd or pand" |
136 |
- elog "installed. Please note that 'bluetooth' init script doesn't stop the old" |
137 |
- elog "daemons after you update it, so it's recommended to stop all of them using" |
138 |
- elog "their own init scripts or manually killing them." |
139 |
+ if use old-daemons; then |
140 |
+ elog "dund and hidd init scripts were installed because you have the old-daemons" |
141 |
+ elog "use flag on. They are not started by default via udev so please add them" |
142 |
+ elog "to the required runlevels using rc-update <runlevel> add <dund/hidd>. If" |
143 |
+ elog "you need init scripts for the other daemons, please file requests" |
144 |
+ elog "to https://bugs.gentoo.org." |
145 |
fi |
146 |
|
147 |
if use consolekit; then |
148 |
- elog |
149 |
elog "If you want to use rfcomm as a normal user, you need to add the user" |
150 |
elog "to the uucp group." |
151 |
else |
152 |
- elog |
153 |
elog "Since you have the consolekit use flag disabled, you will only be able to run" |
154 |
elog "bluetooth clients as root. If you want to be able to run bluetooth clientes as " |
155 |
elog "a regular user, you need to enable the consolekit use flag for this package or" |
156 |
elog "to add the user to the plugdev group." |
157 |
fi |
158 |
- |
159 |
- if use old-daemons; then |
160 |
- elog |
161 |
- elog "dund and hidd init scripts were installed because you have the old-daemons" |
162 |
- elog "use flag on. They are not started by default via udev so please add them" |
163 |
- elog "to the required runlevels using rc-update <runlevel> add <dund/hidd>. If" |
164 |
- elog "you need init scripts for the other daemons, please file requests" |
165 |
- elog "to https://bugs.gentoo.org." |
166 |
- fi |
167 |
} |
168 |
|
169 |
|
170 |
|
171 |
1.83 net-wireless/bluez/ChangeLog |
172 |
|
173 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-wireless/bluez/ChangeLog?rev=1.83&view=markup |
174 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-wireless/bluez/ChangeLog?rev=1.83&content-type=text/plain |
175 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-wireless/bluez/ChangeLog?r1=1.82&r2=1.83 |
176 |
|
177 |
Index: ChangeLog |
178 |
=================================================================== |
179 |
RCS file: /var/cvsroot/gentoo-x86/net-wireless/bluez/ChangeLog,v |
180 |
retrieving revision 1.82 |
181 |
retrieving revision 1.83 |
182 |
diff -u -r1.82 -r1.83 |
183 |
--- ChangeLog 30 Mar 2011 09:49:26 -0000 1.82 |
184 |
+++ ChangeLog 28 Apr 2011 20:58:08 -0000 1.83 |
185 |
@@ -1,6 +1,12 @@ |
186 |
# ChangeLog for net-wireless/bluez |
187 |
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
188 |
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/ChangeLog,v 1.82 2011/03/30 09:49:26 pacho Exp $ |
189 |
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/ChangeLog,v 1.83 2011/04/28 20:58:08 scarabeus Exp $ |
190 |
+ |
191 |
+ 28 Apr 2011; Tomáš Chvátal <scarabeus@g.o> bluez-4.91.ebuild: |
192 |
+ Order the dependencies alphabetically. Sort old-daemons elog informations. |
193 |
+ Drop info about them being disabled (no bluez3 around for long time already). |
194 |
+ Drop elog check for gnome/kde gui as both desktop environments handle |
195 |
+ bluetooth properly themselves. |
196 |
|
197 |
*bluez-4.91 (30 Mar 2011) |