Gentoo Archives: gentoo-commits

From: Jan Psota <jasiupsota@×××××.com>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/user/bleeding-edge:master commit in: x11-libs/libfm/, x11-misc/pcmanfm/
Date: Mon, 30 Apr 2018 09:14:37
Message-Id: 1525079618.703deb0aabe58afc5ac1875b5e2d2243c8e514ae.jasiupsota@gentoo
1 commit: 703deb0aabe58afc5ac1875b5e2d2243c8e514ae
2 Author: Jan Psota <jasiupsota <AT> gmail <DOT> com>
3 AuthorDate: Mon Apr 30 09:11:37 2018 +0000
4 Commit: Jan Psota <jasiupsota <AT> gmail <DOT> com>
5 CommitDate: Mon Apr 30 09:13:38 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/user/bleeding-edge.git/commit/?id=703deb0a
7
8 pcmanfm / libfm abi slot update + use xdg-utils instead of deprecated fdo-mime
9
10 x11-libs/libfm/libfm-9999.ebuild | 10 +++++-----
11 x11-misc/pcmanfm/pcmanfm-9999.ebuild | 12 ++++++------
12 2 files changed, 11 insertions(+), 11 deletions(-)
13
14 diff --git a/x11-libs/libfm/libfm-9999.ebuild b/x11-libs/libfm/libfm-9999.ebuild
15 index 8c0f8e3..741d715 100644
16 --- a/x11-libs/libfm/libfm-9999.ebuild
17 +++ b/x11-libs/libfm/libfm-9999.ebuild
18 @@ -1,16 +1,16 @@
19 -# Copyright 1999-2017 Gentoo Foundation
20 +# Copyright 1999-2018 Gentoo Foundation
21 # Distributed under the terms of the GNU General Public License v2
22
23 EAPI=6
24
25 -inherit autotools fdo-mime git-r3 vala
26 +inherit autotools git-r3 vala xdg-utils
27
28 DESCRIPTION="A library for file management"
29 HOMEPAGE="http://pcmanfm.sourceforge.net/"
30 EGIT_REPO_URI="https://github.com/lxde/${PN}"
31
32 LICENSE="GPL-2"
33 -SLOT="0/4.4.0" #copy ABI_VERSION because it seems upstream change it randomly
34 +SLOT="0/5.1.1" #copy ABI_VERSION because it seems upstream change it randomly
35 KEYWORDS=""
36 IUSE="+automount debug doc examples exif +gtk +gtk3 udisks vala"
37
38 @@ -119,9 +119,9 @@ pkg_preinst() {
39 }
40
41 pkg_postinst() {
42 - fdo-mime_mime_database_update
43 + xdg_mimeinfo_database_update
44 }
45
46 pkg_postrm() {
47 - fdo-mime_mime_database_update
48 + xdg_mimeinfo_database_update
49 }
50
51 diff --git a/x11-misc/pcmanfm/pcmanfm-9999.ebuild b/x11-misc/pcmanfm/pcmanfm-9999.ebuild
52 index 5bf38cc..5cb6fb1 100644
53 --- a/x11-misc/pcmanfm/pcmanfm-9999.ebuild
54 +++ b/x11-misc/pcmanfm/pcmanfm-9999.ebuild
55 @@ -1,4 +1,4 @@
56 -# Copyright 1999-2017 Gentoo Foundation
57 +# Copyright 1999-2018 Gentoo Foundation
58 # Distributed under the terms of the GNU General Public License v2
59
60 EAPI=6
61 @@ -8,7 +8,7 @@ is it ja kk km ko lg lt lv ms nl pa pl pt pt_BR ro ru si sk sl sr sr@latin sv
62 te th tr tt_RU ug uk vi zh_CN zh_TW"
63 PLOCALE_BACKUP="en_GB"
64
65 -inherit autotools eutils fdo-mime l10n readme.gentoo-r1
66 +inherit autotools eutils xdg-utils l10n readme.gentoo-r1
67
68 if [[ ${PV} == *9999* ]]; then
69 EGIT_REPO_URI="git://git.lxde.org/git/lxde/${PN}"
70 @@ -71,12 +71,12 @@ src_install() {
71 }
72
73 pkg_postinst() {
74 - fdo-mime_desktop_database_update
75 - fdo-mime_mime_database_update
76 + xdg_desktop_database_update
77 + xdg_mimeinfo_database_update
78 readme.gentoo_print_elog
79 }
80
81 pkg_postrm() {
82 - fdo-mime_desktop_database_update
83 - fdo-mime_mime_database_update
84 + xdg_desktop_database_update
85 + xdg_mimeinfo_database_update
86 }