1 |
tetromino 12/05/10 00:47:12 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: gvfs-1.12.2-r1.ebuild |
5 |
Removed: gvfs-1.12.1.ebuild |
6 |
Log: |
7 |
Fix failure with USE=afp and glib-2.32.2 (bug #414787, thanks to Randy Tupas). Drop old. |
8 |
|
9 |
(Portage version: 2.2.0_alpha101/cvs/Linux x86_64) |
10 |
|
11 |
Revision Changes Path |
12 |
1.179 gnome-base/gvfs/ChangeLog |
13 |
|
14 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gvfs/ChangeLog?rev=1.179&view=markup |
15 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gvfs/ChangeLog?rev=1.179&content-type=text/plain |
16 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gvfs/ChangeLog?r1=1.178&r2=1.179 |
17 |
|
18 |
Index: ChangeLog |
19 |
=================================================================== |
20 |
RCS file: /var/cvsroot/gentoo-x86/gnome-base/gvfs/ChangeLog,v |
21 |
retrieving revision 1.178 |
22 |
retrieving revision 1.179 |
23 |
diff -u -r1.178 -r1.179 |
24 |
--- ChangeLog 8 May 2012 16:47:35 -0000 1.178 |
25 |
+++ ChangeLog 10 May 2012 00:47:12 -0000 1.179 |
26 |
@@ -1,6 +1,13 @@ |
27 |
# ChangeLog for gnome-base/gvfs |
28 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
29 |
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/ChangeLog,v 1.178 2012/05/08 16:47:35 darkside Exp $ |
30 |
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/ChangeLog,v 1.179 2012/05/10 00:47:12 tetromino Exp $ |
31 |
+ |
32 |
+*gvfs-1.12.2-r1 (10 May 2012) |
33 |
+ |
34 |
+ 10 May 2012; Alexandre Rostovtsev <tetromino@g.o> -gvfs-1.12.1.ebuild, |
35 |
+ +gvfs-1.12.2-r1.ebuild, +files/gvfs-1.12.2-afp-g_clear_object.patch: |
36 |
+ Fix failure with USE=afp and glib-2.32.2 (bug #414787, thanks to Randy |
37 |
+ Tupas). Drop old. |
38 |
|
39 |
08 May 2012; Jeremy Olexa <darkside@g.o> gvfs-1.12.2.ebuild: |
40 |
Add prefix keywords and specify dbus-service-dir, no changes for Gentoo Linux |
41 |
|
42 |
|
43 |
|
44 |
1.1 gnome-base/gvfs/gvfs-1.12.2-r1.ebuild |
45 |
|
46 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gvfs/gvfs-1.12.2-r1.ebuild?rev=1.1&view=markup |
47 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gvfs/gvfs-1.12.2-r1.ebuild?rev=1.1&content-type=text/plain |
48 |
|
49 |
Index: gvfs-1.12.2-r1.ebuild |
50 |
=================================================================== |
51 |
# Copyright 1999-2012 Gentoo Foundation |
52 |
# Distributed under the terms of the GNU General Public License v2 |
53 |
# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/gvfs-1.12.2-r1.ebuild,v 1.1 2012/05/10 00:47:12 tetromino Exp $ |
54 |
|
55 |
EAPI=4 |
56 |
GCONF_DEBUG=no |
57 |
GNOME2_LA_PUNT=yes |
58 |
|
59 |
inherit autotools bash-completion-r1 eutils gnome2 |
60 |
|
61 |
[[ ${PV} = 9999 ]] && inherit gnome2-live |
62 |
|
63 |
DESCRIPTION="GNOME Virtual Filesystem Layer" |
64 |
HOMEPAGE="http://www.gnome.org" |
65 |
|
66 |
LICENSE="LGPL-2" |
67 |
SLOT="0" |
68 |
|
69 |
if [[ ${PV} = 9999 ]]; then |
70 |
KEYWORDS="" |
71 |
DOCS="" |
72 |
else |
73 |
KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris" |
74 |
DOCS="AUTHORS ChangeLog NEWS MAINTAINERS README TODO" # ChangeLog.pre-1.2 README.commits |
75 |
fi |
76 |
|
77 |
SRC_URI="${SRC_URI} |
78 |
http://dev.gentoo.org/~tetromino/distfiles/aclocal/libgcrypt.m4.bz2" |
79 |
|
80 |
IUSE="afp archive avahi bluetooth bluray cdda doc fuse gdu gnome-keyring gphoto2 +http ios samba +udev udisks" |
81 |
|
82 |
RDEPEND=">=dev-libs/glib-2.31.0:2 |
83 |
sys-apps/dbus |
84 |
dev-libs/libxml2 |
85 |
net-misc/openssh |
86 |
afp? ( >=dev-libs/libgcrypt-1.2.2 ) |
87 |
archive? ( app-arch/libarchive ) |
88 |
avahi? ( >=net-dns/avahi-0.6 ) |
89 |
bluetooth? ( |
90 |
>=app-mobilephone/obex-data-server-0.4.5 |
91 |
dev-libs/dbus-glib |
92 |
net-wireless/bluez |
93 |
dev-libs/expat ) |
94 |
bluray? ( media-libs/libbluray ) |
95 |
fuse? ( >=sys-fs/fuse-2.8.0 ) |
96 |
gdu? ( || ( |
97 |
>=gnome-base/libgdu-3.0.2 |
98 |
=sys-apps/gnome-disk-utility-3.0.2-r300 |
99 |
=sys-apps/gnome-disk-utility-3.0.2-r200 ) ) |
100 |
gnome-keyring? ( >=gnome-base/gnome-keyring-1.0 ) |
101 |
gphoto2? ( >=media-libs/libgphoto2-2.4.7 ) |
102 |
ios? ( |
103 |
>=app-pda/libimobiledevice-1.1.0 |
104 |
>=app-pda/libplist-1 ) |
105 |
udev? ( |
106 |
cdda? ( >=dev-libs/libcdio-0.78.2[-minimal] ) |
107 |
|| ( >=sys-fs/udev-171[gudev] >=sys-fs/udev-164-r2[extras] ) ) |
108 |
udisks? ( >=sys-fs/udisks-1.90:2 ) |
109 |
http? ( >=net-libs/libsoup-gnome-2.26.0 ) |
110 |
samba? ( >=net-fs/samba-3.4.6[smbclient] )" |
111 |
DEPEND="${RDEPEND} |
112 |
>=dev-util/intltool-0.40 |
113 |
virtual/pkgconfig |
114 |
dev-util/gtk-doc-am |
115 |
doc? ( >=dev-util/gtk-doc-1 )" |
116 |
|
117 |
REQUIRED_USE="cdda? ( udev )" |
118 |
|
119 |
pkg_setup() { |
120 |
G2CONF="${G2CONF} |
121 |
--disable-bash-completion |
122 |
--disable-hal |
123 |
--disable-schemas-compile |
124 |
--with-dbus-service-dir="${EPREFIX}"/usr/share/dbus-1/services |
125 |
$(use_enable afp) |
126 |
$(use_enable archive) |
127 |
$(use_enable avahi) |
128 |
$(use_enable bluetooth obexftp) |
129 |
$(use_enable bluray) |
130 |
$(use_enable cdda) |
131 |
$(use_enable fuse) |
132 |
$(use_enable gdu) |
133 |
$(use_enable gphoto2) |
134 |
$(use_enable ios afc) |
135 |
$(use_enable udev) |
136 |
$(use_enable udev gudev) |
137 |
$(use_enable http) |
138 |
$(use_enable gnome-keyring keyring) |
139 |
$(use_enable samba) |
140 |
$(use_enable udisks udisks2)" |
141 |
} |
142 |
|
143 |
src_prepare() { |
144 |
# bug #414787; in next release |
145 |
epatch "${FILESDIR}/${P}-afp-g_clear_object.patch" |
146 |
|
147 |
# Conditional patching purely to avoid eautoreconf |
148 |
use gphoto2 && epatch "${FILESDIR}"/${PN}-1.2.2-gphoto2-stricter-checks.patch |
149 |
|
150 |
if use archive; then |
151 |
epatch "${FILESDIR}"/${PN}-1.2.2-expose-archive-backend.patch |
152 |
echo mount-archive.desktop.in >> po/POTFILES.in |
153 |
echo mount-archive.desktop.in.in >> po/POTFILES.in |
154 |
fi |
155 |
|
156 |
if ! use udev; then |
157 |
sed -i -e 's/gvfsd-burn/ /' daemon/Makefile.am || die |
158 |
sed -i -e 's/burn.mount.in/ /' daemon/Makefile.am || die |
159 |
sed -i -e 's/burn.mount/ /' daemon/Makefile.am || die |
160 |
fi |
161 |
|
162 |
if use gphoto2 || use archive || ! use udev; then |
163 |
# libgcrypt.m4 needed for eautoreconf, bug #399043 |
164 |
mv "${WORKDIR}/libgcrypt.m4" "${S}"/ || die |
165 |
|
166 |
AT_M4DIR=. eautoreconf |
167 |
fi |
168 |
|
169 |
gnome2_src_prepare |
170 |
} |
171 |
|
172 |
src_install() { |
173 |
gnome2_src_install |
174 |
newbashcomp programs/gvfs-bash-completion.sh ${PN} |
175 |
} |