Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Markos Chandras (hwoarang)" <hwoarang@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in x11-libs/libfm: libfm-9999.ebuild metadata.xml ChangeLog libfm-1.1.4.ebuild
Date: Fri, 07 Feb 2014 22:43:25
Message-Id: 20140207224319.B9D792004C@flycatcher.gentoo.org
1 hwoarang 14/02/07 22:43:19
2
3 Modified: libfm-9999.ebuild metadata.xml ChangeLog
4 libfm-1.1.4.ebuild
5 Log:
6 yet another fix for bug #438700
7
8 (Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key C2BA7F3C!)
9
10 Revision Changes Path
11 1.38 x11-libs/libfm/libfm-9999.ebuild
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/libfm/libfm-9999.ebuild?rev=1.38&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/libfm/libfm-9999.ebuild?rev=1.38&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/libfm/libfm-9999.ebuild?r1=1.37&r2=1.38
16
17 Index: libfm-9999.ebuild
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/x11-libs/libfm/libfm-9999.ebuild,v
20 retrieving revision 1.37
21 retrieving revision 1.38
22 diff -u -r1.37 -r1.38
23 --- libfm-9999.ebuild 30 Dec 2013 10:35:40 -0000 1.37
24 +++ libfm-9999.ebuild 7 Feb 2014 22:43:19 -0000 1.38
25 @@ -1,6 +1,6 @@
26 -# Copyright 1999-2013 Gentoo Foundation
27 +# Copyright 1999-2014 Gentoo Foundation
28 # Distributed under the terms of the GNU General Public License v2
29 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/libfm/libfm-9999.ebuild,v 1.37 2013/12/30 10:35:40 hwoarang Exp $
30 +# $Header: /var/cvsroot/gentoo-x86/x11-libs/libfm/libfm-9999.ebuild,v 1.38 2014/02/07 22:43:19 hwoarang Exp $
31
32 EAPI=5
33
34 @@ -14,7 +14,7 @@
35
36 LICENSE="GPL-2"
37 SLOT="0/4.7.1" #copy ABI_VERSION because it seems upstream change it randomly
38 -IUSE="debug doc examples udisks vala"
39 +IUSE="+automount debug doc examples udisks vala"
40 KEYWORDS=""
41
42 COMMON_DEPEND=">=dev-libs/glib-2.18:2
43 @@ -22,8 +22,13 @@
44 >=lxde-base/menu-cache-0.3.2:="
45 RDEPEND="${COMMON_DEPEND}
46 x11-misc/shared-mime-info
47 - udisks? ( || ( gnome-base/gvfs[udev,udisks] gnome-base/gvfs[udev,gdu] ) )
48 - !udisks? ( gnome-base/gvfs[udev] )"
49 + automount? (
50 + udisks? ( || (
51 + gnome-base/gvfs[udev,udisks]
52 + gnome-base/gvfs[udev,gdu]
53 + ) )
54 + !udisks? ( gnome-base/gvfs[udev] )
55 + )"
56 DEPEND="${COMMON_DEPEND}
57 vala? ( $(vala_depend) )
58 doc? (
59 @@ -35,6 +40,8 @@
60
61 DOCS=( AUTHORS TODO )
62
63 +REQUIRED_USE="udisks? ( automount )"
64 +
65 src_prepare() {
66 if ! use doc; then
67 sed -ie '/SUBDIRS=/s#docs##' "${S}"/Makefile.am || die "sed failed"
68
69
70
71 1.9 x11-libs/libfm/metadata.xml
72
73 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/libfm/metadata.xml?rev=1.9&view=markup
74 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/libfm/metadata.xml?rev=1.9&content-type=text/plain
75 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/libfm/metadata.xml?r1=1.8&r2=1.9
76
77 Index: metadata.xml
78 ===================================================================
79 RCS file: /var/cvsroot/gentoo-x86/x11-libs/libfm/metadata.xml,v
80 retrieving revision 1.8
81 retrieving revision 1.9
82 diff -u -r1.8 -r1.9
83 --- metadata.xml 30 Dec 2013 10:35:40 -0000 1.8
84 +++ metadata.xml 7 Feb 2014 22:43:19 -0000 1.9
85 @@ -9,5 +9,6 @@
86 <use>
87 <flag name='vala'>Support custom actions in menus</flag>
88 <flag name='udisks'>Use libfm's udisks-based volume monitor implementation instead of using the one from gvfs</flag>
89 + <flag name='automount'>Use <pkg>gnome-base/gvfs</pkg> for automounting</flag>
90 </use>
91 </pkgmetadata>
92
93
94
95 1.93 x11-libs/libfm/ChangeLog
96
97 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/libfm/ChangeLog?rev=1.93&view=markup
98 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/libfm/ChangeLog?rev=1.93&content-type=text/plain
99 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/libfm/ChangeLog?r1=1.92&r2=1.93
100
101 Index: ChangeLog
102 ===================================================================
103 RCS file: /var/cvsroot/gentoo-x86/x11-libs/libfm/ChangeLog,v
104 retrieving revision 1.92
105 retrieving revision 1.93
106 diff -u -r1.92 -r1.93
107 --- ChangeLog 30 Dec 2013 10:35:40 -0000 1.92
108 +++ ChangeLog 7 Feb 2014 22:43:19 -0000 1.93
109 @@ -1,6 +1,13 @@
110 # ChangeLog for x11-libs/libfm
111 -# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
112 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/libfm/ChangeLog,v 1.92 2013/12/30 10:35:40 hwoarang Exp $
113 +# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
114 +# $Header: /var/cvsroot/gentoo-x86/x11-libs/libfm/ChangeLog,v 1.93 2014/02/07 22:43:19 hwoarang Exp $
115 +
116 + 07 Feb 2014; Markos Chandras <hwoarang@g.o> libfm-1.1.4.ebuild,
117 + libfm-9999.ebuild, metadata.xml:
118 + Trying to fix bug #438700 again by introducing an "automount" useflag to
119 + indicate whether automount is desired in pcmanfm or the user will use an
120 + external application to handle this outside of libfm/pcmanfm. Initial patch
121 + by Dustin C. Hatch <admiralnemo@×××××.com>
122
123 30 Dec 2013; Markos Chandras <hwoarang@g.o> libfm-1.1.4.ebuild,
124 libfm-9999.ebuild, metadata.xml:
125
126
127
128 1.4 x11-libs/libfm/libfm-1.1.4.ebuild
129
130 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/libfm/libfm-1.1.4.ebuild?rev=1.4&view=markup
131 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/libfm/libfm-1.1.4.ebuild?rev=1.4&content-type=text/plain
132 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/libfm/libfm-1.1.4.ebuild?r1=1.3&r2=1.4
133
134 Index: libfm-1.1.4.ebuild
135 ===================================================================
136 RCS file: /var/cvsroot/gentoo-x86/x11-libs/libfm/libfm-1.1.4.ebuild,v
137 retrieving revision 1.3
138 retrieving revision 1.4
139 diff -u -r1.3 -r1.4
140 --- libfm-1.1.4.ebuild 30 Dec 2013 10:35:40 -0000 1.3
141 +++ libfm-1.1.4.ebuild 7 Feb 2014 22:43:19 -0000 1.4
142 @@ -1,6 +1,6 @@
143 -# Copyright 1999-2013 Gentoo Foundation
144 +# Copyright 1999-2014 Gentoo Foundation
145 # Distributed under the terms of the GNU General Public License v2
146 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/libfm/libfm-1.1.4.ebuild,v 1.3 2013/12/30 10:35:40 hwoarang Exp $
147 +# $Header: /var/cvsroot/gentoo-x86/x11-libs/libfm/libfm-1.1.4.ebuild,v 1.4 2014/02/07 22:43:19 hwoarang Exp $
148
149 EAPI=5
150
151 @@ -15,15 +15,20 @@
152 KEYWORDS="~alpha ~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux"
153 LICENSE="GPL-2"
154 SLOT="0/4.7.1" #copy ABI_VERSION because it seems upstream change it randomly
155 -IUSE="debug doc examples udisks vala"
156 +IUSE="+automount debug doc examples udisks vala"
157
158 COMMON_DEPEND=">=dev-libs/glib-2.18:2
159 >=x11-libs/gtk+-2.16:2
160 >=lxde-base/menu-cache-0.3.2:="
161 RDEPEND="${COMMON_DEPEND}
162 x11-misc/shared-mime-info
163 - udisks? ( || ( gnome-base/gvfs[udev,udisks] gnome-base/gvfs[udev,gdu] ) )
164 - !udisks? ( gnome-base/gvfs[udev] )"
165 + automount? (
166 + udisks? ( || (
167 + gnome-base/gvfs[udev,udisks]
168 + gnome-base/gvfs[udev,gdu]
169 + ) )
170 + !udisks? ( gnome-base/gvfs[udev] )
171 + )"
172 DEPEND="${COMMON_DEPEND}
173 vala? ( $(vala_depend) )
174 doc? (
175 @@ -36,6 +41,8 @@
176
177 S="${WORKDIR}"/${MY_P}
178
179 +REQUIRED_USE="udisks? ( automount )"
180 +
181 src_prepare() {
182 if ! use doc; then
183 sed -ie '/SUBDIRS=/s#docs##' "${S}"/Makefile.am || die "sed failed"
Report Message
Find on MARC Find on Google Groups