Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-libs/libfm/
Date: Wed, 17 Oct 2018 14:41:30
Message-Id: 1539787250.f23ca231bff9e89899514886242274c0f7367ad1.asturm@gentoo
1 commit: f23ca231bff9e89899514886242274c0f7367ad1
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Tue Oct 16 13:13:13 2018 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Wed Oct 17 14:40:50 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f23ca231
7
8 x11-libs/libfm: Drop 1.2.3, 1.2.4
9
10 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
11 Package-Manager: Portage-2.3.51, Repoman-2.3.11
12
13 x11-libs/libfm/Manifest | 2 -
14 x11-libs/libfm/libfm-1.2.3-r1.ebuild | 124 ---------------------------------
15 x11-libs/libfm/libfm-1.2.4.ebuild | 129 -----------------------------------
16 3 files changed, 255 deletions(-)
17
18 diff --git a/x11-libs/libfm/Manifest b/x11-libs/libfm/Manifest
19 index dcd9a9df723..7be34662612 100644
20 --- a/x11-libs/libfm/Manifest
21 +++ b/x11-libs/libfm/Manifest
22 @@ -1,3 +1 @@
23 -DIST libfm-1.2.3.tar.xz 898256 BLAKE2B 96a384cf2ebba7a833a97825dd1c3ba499bec1099d321eb6e400b7e09116d28f7835228be7a98eb46630e9fed286ef12e58c1a5f06d7efc75ba4ecfafdd80eae SHA512 f4c214daffc47f05ba31c65203ab0542a03f5a246ea4bb62b6b365ac3fa120a1a51e37b00f8a43afe56875eb69f9be327ac724dafb6fc2de13aa77deea23f443
24 -DIST libfm-1.2.4.tar.gz 1259686 BLAKE2B 4c81e93c1d7f46d805167a3873ac3dfc6ff481df43258a0ea8d28614ba271496490ad02720cdf316fc563cfb273e38afb482a6aa44256f40f10cda3546565db3 SHA512 7196ae4af99ef41d77e1113dea62e35244b0be57c8cd7fcef2e0559daa5564ddfb163293225708c1697068e6a41d9842f96991145c34c41a7f510f38345d2f9c
25 DIST libfm-1.2.5.tar.gz 1261152 BLAKE2B 30da6771ad4ab31be675a3af2ce7c9dd04e80be9f33b25300bf386f45f9fd652654e211c312d1e283a63cdbde4f5c8e3673a36fc0075e3b1981d9f5995683057 SHA512 0bc7910081cadc4c8c4648f3483fb5791e9480700400ded452dd5985e7fb0d8524f2c676f0171a5cd283422a13f240f40cfe5ccc8d10dce02dd784d62250b7cc
26
27 diff --git a/x11-libs/libfm/libfm-1.2.3-r1.ebuild b/x11-libs/libfm/libfm-1.2.3-r1.ebuild
28 deleted file mode 100644
29 index c9bde1ffe20..00000000000
30 --- a/x11-libs/libfm/libfm-1.2.3-r1.ebuild
31 +++ /dev/null
32 @@ -1,124 +0,0 @@
33 -# Copyright 1999-2018 Gentoo Foundation
34 -# Distributed under the terms of the GNU General Public License v2
35 -
36 -EAPI=5
37 -
38 -inherit autotools multilib vala xdg-utils
39 -
40 -MY_PV=${PV/_/}
41 -MY_P="${PN}-${MY_PV}"
42 -DESCRIPTION="A library for file management"
43 -HOMEPAGE="http://pcmanfm.sourceforge.net/"
44 -SRC_URI="https://dev.gentoo.org/~hwoarang/distfiles/${MY_P}.tar.xz"
45 -
46 -KEYWORDS="~alpha amd64 arm ~arm64 ~mips ppc x86 ~amd64-linux ~x86-linux"
47 -LICENSE="GPL-2"
48 -SLOT="0/4.3.0" #copy ABI_VERSION because it seems upstream change it randomly
49 -IUSE="+automount debug doc examples exif gtk udisks vala"
50 -
51 -COMMON_DEPEND=">=dev-libs/glib-2.18:2
52 - gtk? ( >=x11-libs/gtk+-2.16:2 )
53 - >=lxde-base/menu-cache-0.3.2:=
54 - ~x11-libs/libfm-extra-${PV}"
55 -RDEPEND="${COMMON_DEPEND}
56 - !lxde-base/lxshortcut
57 - x11-misc/shared-mime-info
58 - automount? (
59 - udisks? ( gnome-base/gvfs[udev,udisks] )
60 - !udisks? ( gnome-base/gvfs[udev] )
61 - )
62 - exif? ( media-libs/libexif )"
63 -DEPEND="${COMMON_DEPEND}
64 - vala? ( $(vala_depend) )
65 - doc? (
66 - dev-util/gtk-doc
67 - )
68 - app-arch/xz-utils
69 - >=dev-util/intltool-0.40
70 - virtual/pkgconfig
71 - sys-devel/gettext"
72 -
73 -S="${WORKDIR}"/${MY_P}
74 -
75 -REQUIRED_USE="udisks? ( automount ) doc? ( gtk )"
76 -
77 -src_prepare() {
78 - if ! use doc; then
79 - sed -ie '/^SUBDIR.*=/s#docs##' "${S}"/Makefile.am || die "sed failed"
80 - sed -ie '/^[[:space:]]*docs/d' configure.ac || die "sed failed"
81 - fi
82 - sed -i -e "s:-O0::" -e "/-DG_ENABLE_DEBUG/s: -g::" \
83 - configure.ac || die "sed failed"
84 -
85 - #disable unused translations. Bug #356029
86 - for trans in app-chooser ask-rename exec-file file-prop preferred-apps \
87 - progress;do
88 - echo "data/ui/"${trans}.ui >> po/POTFILES.in
89 - done
90 - #Remove -Werror for automake-1.12. Bug #421101
91 - sed -i "s:-Werror::" configure.ac || die
92 -
93 - # subslot sanity check
94 - local sub_slot=${SLOT#*/}
95 - local libfm_major_abi=$(sed -rne '/ABI_VERSION/s:.*=::p' src/Makefile.am | tr ':' '.')
96 -
97 - if [[ ${sub_slot} != ${libfm_major_abi} ]]; then
98 - eerror "Ebuild sub-slot (${sub_slot}) does not match ABI_VERSION(${libfm_major_abi})"
99 - eerror "Please update SLOT variable as follows:"
100 - eerror " SLOT=\"${SLOT%%/*}/${libfm_major_abi}\""
101 - eerror
102 - die "sub-slot sanity check failed"
103 - fi
104 -
105 - eautoreconf
106 - rm -r autom4te.cache || die
107 - use vala && export VALAC="$(type -p valac-$(vala_best_api_version))"
108 -}
109 -
110 -src_configure() {
111 - econf \
112 - --sysconfdir="${EPREFIX}/etc" \
113 - --disable-dependency-tracking \
114 - --disable-static \
115 - $(use_enable examples demo) \
116 - $(use_enable exif) \
117 - $(use_enable debug) \
118 - $(use_enable udisks) \
119 - $(use_enable vala actions) \
120 - $(use_with gtk) \
121 - $(use_enable doc gtk-doc) \
122 - --with-html-dir=/usr/share/doc/${PF}/html
123 -}
124 -
125 -src_install() {
126 - default
127 - find "${D}" -name '*.la' -exec rm -f '{}' +
128 - # Sometimes a directory is created instead of a symlink. No idea why...
129 - # It is wrong anyway. We expect a libfm-1.0 directory and then a libfm
130 - # symlink to it.
131 - if [[ -h ${D}/usr/include/${PN} || -d ${D}/usr/include/${PN} ]]; then
132 - rm -r "${D}"/usr/include/${PN}
133 - fi
134 - # Remove files installed by split-off libfm-extra package
135 - rm "${D}"/usr/include/libfm-1.0/fm-{extra,version,xml-file}.h
136 - rm "${D}"/usr/$(get_libdir)/libfm-extra*
137 - rm "${D}"/usr/$(get_libdir)/pkgconfig/libfm-extra.pc
138 -}
139 -
140 -pkg_preinst() {
141 - # Resolve the symlink mess. Bug #439570
142 - [[ -d "${ROOT}"/usr/include/${PN} ]] && \
143 - rm -rf "${ROOT}"/usr/include/${PN}
144 - if [[ -d "${D}"/usr/include/${PN}-1.0 ]]; then
145 - cd "${D}"/usr/include
146 - ln -s --force ${PN}-1.0 ${PN}
147 - fi
148 -}
149 -
150 -pkg_postinst() {
151 - xdg_mimeinfo_database_update
152 -}
153 -
154 -pkg_postrm() {
155 - xdg_mimeinfo_database_update
156 -}
157
158 diff --git a/x11-libs/libfm/libfm-1.2.4.ebuild b/x11-libs/libfm/libfm-1.2.4.ebuild
159 deleted file mode 100644
160 index 12d09617ea7..00000000000
161 --- a/x11-libs/libfm/libfm-1.2.4.ebuild
162 +++ /dev/null
163 @@ -1,129 +0,0 @@
164 -# Copyright 1999-2018 Gentoo Foundation
165 -# Distributed under the terms of the GNU General Public License v2
166 -
167 -EAPI=5
168 -
169 -inherit autotools multilib vala xdg-utils
170 -
171 -MY_PV=${PV/_/}
172 -MY_P="${PN}-${MY_PV}"
173 -DESCRIPTION="A library for file management"
174 -HOMEPAGE="http://pcmanfm.sourceforge.net/"
175 -SRC_URI="https://github.com/lxde/libfm/archive/1.2.4.tar.gz -> ${MY_P}.tar.gz"
176 -
177 -KEYWORDS="~alpha amd64 arm ~arm64 ~mips ppc x86 ~amd64-linux ~x86-linux"
178 -LICENSE="GPL-2"
179 -SLOT="0/4.4.0" #copy ABI_VERSION because it seems upstream change it randomly
180 -IUSE="+automount debug doc examples exif gtk udisks vala"
181 -
182 -COMMON_DEPEND=">=dev-libs/glib-2.18:2
183 - gtk? ( >=x11-libs/gtk+-2.16:2 )
184 - >=lxde-base/menu-cache-0.3.2:=
185 - ~x11-libs/libfm-extra-${PV}
186 - udisks? ( dev-libs/dbus-glib )"
187 -RDEPEND="${COMMON_DEPEND}
188 - !lxde-base/lxshortcut
189 - x11-misc/shared-mime-info
190 - automount? (
191 - udisks? ( gnome-base/gvfs[udev,udisks] )
192 - !udisks? ( gnome-base/gvfs[udev] )
193 - )
194 - exif? ( media-libs/libexif )"
195 -DEPEND="${COMMON_DEPEND}
196 - vala? ( $(vala_depend) )
197 - doc? (
198 - dev-util/gtk-doc
199 - )
200 - app-arch/xz-utils
201 - >=dev-util/intltool-0.40
202 - virtual/pkgconfig
203 - sys-devel/gettext"
204 -
205 -S="${WORKDIR}"/${MY_P}
206 -
207 -REQUIRED_USE="udisks? ( automount ) doc? ( gtk )"
208 -
209 -src_prepare() {
210 - # Fix use after free bug, see
211 - # https://github.com/lxde/libfm/pull/11/commits/9e3a809c6a8a5079f05e04edac9457d317822321
212 - epatch "${FILESDIR}"/libfm-fix-use-after-free.diff
213 -
214 - if ! use doc; then
215 - sed -ie '/^SUBDIR.*=/s#docs##' "${S}"/Makefile.am || die "sed failed"
216 - sed -ie '/^[[:space:]]*docs/d' configure.ac || die "sed failed"
217 - fi
218 - sed -i -e "s:-O0::" -e "/-DG_ENABLE_DEBUG/s: -g::" \
219 - configure.ac || die "sed failed"
220 -
221 - #disable unused translations. Bug #356029
222 - for trans in app-chooser ask-rename exec-file file-prop preferred-apps \
223 - progress;do
224 - echo "data/ui/"${trans}.ui >> po/POTFILES.in
225 - done
226 - #Remove -Werror for automake-1.12. Bug #421101
227 - sed -i "s:-Werror::" configure.ac || die
228 -
229 - # subslot sanity check
230 - local sub_slot=${SLOT#*/}
231 - local libfm_major_abi=$(sed -rne '/ABI_VERSION/s:.*=::p' src/Makefile.am | tr ':' '.')
232 -
233 - if [[ ${sub_slot} != ${libfm_major_abi} ]]; then
234 - eerror "Ebuild sub-slot (${sub_slot}) does not match ABI_VERSION(${libfm_major_abi})"
235 - eerror "Please update SLOT variable as follows:"
236 - eerror " SLOT=\"${SLOT%%/*}/${libfm_major_abi}\""
237 - eerror
238 - die "sub-slot sanity check failed"
239 - fi
240 -
241 - eautoreconf
242 - rm -r autom4te.cache || die
243 - use vala && export VALAC="$(type -p valac-$(vala_best_api_version))"
244 -}
245 -
246 -src_configure() {
247 - econf \
248 - --sysconfdir="${EPREFIX}/etc" \
249 - --disable-dependency-tracking \
250 - --disable-static \
251 - $(use_enable examples demo) \
252 - $(use_enable exif) \
253 - $(use_enable debug) \
254 - $(use_enable udisks) \
255 - $(use_enable vala actions) \
256 - $(use_with gtk) \
257 - $(use_enable doc gtk-doc) \
258 - --with-html-dir=/usr/share/doc/${PF}/html
259 -}
260 -
261 -src_install() {
262 - default
263 - find "${D}" -name '*.la' -exec rm -f '{}' +
264 - # Sometimes a directory is created instead of a symlink. No idea why...
265 - # It is wrong anyway. We expect a libfm-1.0 directory and then a libfm
266 - # symlink to it.
267 - if [[ -h ${D}/usr/include/${PN} || -d ${D}/usr/include/${PN} ]]; then
268 - rm -r "${D}"/usr/include/${PN}
269 - fi
270 - # Remove files installed by split-off libfm-extra package
271 - rm "${D}"/usr/include/libfm-1.0/fm-{extra,version,xml-file}.h
272 - rm "${D}"/usr/$(get_libdir)/libfm-extra*
273 - rm "${D}"/usr/$(get_libdir)/pkgconfig/libfm-extra.pc
274 -}
275 -
276 -pkg_preinst() {
277 - # Resolve the symlink mess. Bug #439570
278 - [[ -d "${ROOT}"/usr/include/${PN} ]] && \
279 - rm -rf "${ROOT}"/usr/include/${PN}
280 - if [[ -d "${D}"/usr/include/${PN}-1.0 ]]; then
281 - cd "${D}"/usr/include
282 - ln -s --force ${PN}-1.0 ${PN}
283 - fi
284 -}
285 -
286 -pkg_postinst() {
287 - xdg_mimeinfo_database_update
288 -}
289 -
290 -pkg_postrm() {
291 - xdg_mimeinfo_database_update
292 -}