summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarty E. Plummer <hanetzer@startmail.com>2018-04-03 20:27:09 -0500
committerAndreas Sturmlechner <asturm@gentoo.org>2018-04-05 01:02:59 +0200
commite8891559421c03bef36ac5c9bd84fc57958562f2 (patch)
treef09cd578a437e6803822356c0c94c5246db781b7 /x11-misc/spacefm
parentmedia-gfx/fotoxx: Drop 15.04.1 (diff)
downloadgentoo-e8891559421c03bef36ac5c9bd84fc57958562f2.tar.gz
gentoo-e8891559421c03bef36ac5c9bd84fc57958562f2.tar.bz2
gentoo-e8891559421c03bef36ac5c9bd84fc57958562f2.zip
x11-misc/spacefm: fdo-mime -> xdg-utils
Also adjusted spacefm-9999 to be able to be cp'd to a new version with unstable keywords for ease of updating. Package-Manager: Portage-2.3.27, Repoman-2.3.9 Closes: https://github.com/gentoo/gentoo/pull/7796
Diffstat (limited to 'x11-misc/spacefm')
-rw-r--r--x11-misc/spacefm/spacefm-1.0.5-r2.ebuild12
-rw-r--r--x11-misc/spacefm/spacefm-9999.ebuild24
2 files changed, 20 insertions, 16 deletions
diff --git a/x11-misc/spacefm/spacefm-1.0.5-r2.ebuild b/x11-misc/spacefm/spacefm-1.0.5-r2.ebuild
index 75f58c0e831d..75d9c6230b10 100644
--- a/x11-misc/spacefm/spacefm-1.0.5-r2.ebuild
+++ b/x11-misc/spacefm/spacefm-1.0.5-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
-inherit fdo-mime gnome2-utils linux-info
+inherit gnome2-utils linux-info xdg-utils
DESCRIPTION="A multi-panel tabbed file manager"
HOMEPAGE="https://ignorantguru.github.com/spacefm/"
@@ -52,8 +52,8 @@ pkg_preinst() {
}
pkg_postinst() {
- fdo-mime_desktop_database_update
- fdo-mime_mime_database_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
gnome2_icon_cache_update
einfo
@@ -83,7 +83,7 @@ pkg_postinst() {
}
pkg_postrm() {
- fdo-mime_desktop_database_update
- fdo-mime_mime_database_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
gnome2_icon_cache_update
}
diff --git a/x11-misc/spacefm/spacefm-9999.ebuild b/x11-misc/spacefm/spacefm-9999.ebuild
index 25aedc589950..4bc9c19d81a0 100644
--- a/x11-misc/spacefm/spacefm-9999.ebuild
+++ b/x11-misc/spacefm/spacefm-9999.ebuild
@@ -1,19 +1,23 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
-EGIT_REPO_URI="https://github.com/IgnorantGuru/${PN}.git"
-EGIT_BRANCH="next"
-
-inherit fdo-mime git-r3 gnome2-utils linux-info
+inherit gnome2-utils linux-info xdg-utils
DESCRIPTION="A multi-panel tabbed file manager"
HOMEPAGE="https://ignorantguru.github.com/spacefm/"
+if [[ ${PV} == *9999* ]]; then
+ EGIT_REPO_URI="https://github.com/IgnorantGuru/${PN}.git"
+ EGIT_BRANCH="next"
+ inherit git-r3
+else
+ KEYWORDS="~amd64 ~x86"
+ SRC_URI="https://github.com/IgnorantGuru/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+fi
LICENSE="GPL-2 LGPL-2.1"
SLOT="0"
-KEYWORDS=""
IUSE="gtk2 +gtk3 +startup-notification +video-thumbnails"
RDEPEND="dev-libs/glib:2
@@ -50,8 +54,8 @@ pkg_preinst() {
}
pkg_postinst() {
- fdo-mime_desktop_database_update
- fdo-mime_mime_database_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
gnome2_icon_cache_update
einfo
@@ -81,7 +85,7 @@ pkg_postinst() {
}
pkg_postrm() {
- fdo-mime_desktop_database_update
- fdo-mime_mime_database_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
gnome2_icon_cache_update
}