gentoo resync : 05.04.2018

6 files changed, 66 insertions, 146 deletions

diff --git a/x11-misc/spacefm/Manifest b/x11-misc/spacefm/Manifest
index 366d40f6d047..e8eee702e2f6 100644
--- a/x11-misc/spacefm/Manifest
+++ b/x11-misc/spacefm/Manifest
@@ -1,8 +1,8 @@
+AUX spacefm-9999-include-sysmacros.patch 192 BLAKE2B 6d5d99c7a49310833ff07f1c0ea93b3399e67e791241a1f56d2a4e1d796b79c3fdb2b38a11f06b508512ed0e565c43d20f988e31e333291d8942bb1d698984cd SHA512 9bc689f5d9e97ef6515ba6d475571ede0d4acd85bbe9c000e393eaf2caffa99807bd6172bb1e085b761bddad17417cef1e0530f289fb05152a6790307f8e1428
 AUX spacefm-include-sysmacros.patch 449 BLAKE2B 29258b6d1a23291e51a5c4be6e579bca5d965b222a32caa7ffe52509d1ede342772db9b4defbd639f992ecef0bfed33d6818e59a4c0e992126898e60aa073318 SHA512 276ff68ed7c08d02224d73089a895e044510accfc160e06abcd7c55b8dae4b9443f67ad5ba36c07d51db37afd64b5a2da8085e7ebad6e46dfb60459b10f3a99f
-DIST spacefm-1.0.4.tar.gz 3487476 BLAKE2B d32732207ae0bf77f918d7bf59dda563a2a504ea36727dbd5f791de15275d5787fd0514794faf7ddca53bb6abdcb46345082b535580f756538cd7a6319d0e3c0 SHA512 bbb3d3048c62b0223799468e24abd8614a75d9118ad9d8493e7118882072fb3401f086239dc05a4a742b39b40520771de5bc9fe6735a2c5853ffb5aa961e6112
 DIST spacefm-1.0.5.tar.gz 3491483 BLAKE2B c00ff3d92e01095b854ee4948ee8827ab32f454d4fd19e496f3d4a70dad2d8a98b67f6cca53d2026d15eddca23b1b6ac5f0394a66097a4efdd0f42beeabd4ffb SHA512 f32a59eac773df1bd9d36ba26cf7397bd205a2a8918e01f978c42ffb6aa2238a6f4dc871503a43f130c3b10d80f43364f54965d441f602ac895d0483fc073498
-EBUILD spacefm-1.0.4-r1.ebuild 2553 BLAKE2B 57ee3b44e4cacd1bdec69dc226aa3ed1b46fb80137739755cb9695df7866687fe1c3e5969872b9d32e542480a22007aff8030c847b4f2fca7376b296d4b8da08 SHA512 385140f2087c8b559d4588779e19c83b78f13f6962dfeeffefacf7a4983fdf5325c89f9ece641b3de29903e2a23246ed34b405dd58afb20416935f4bcf61f80e
-EBUILD spacefm-1.0.4.ebuild 2456 BLAKE2B e7a80963463f101034ab888302cd718bbedc4a5eb9b712a00e8105d9c354226831ef4651df7cee3173dd976ef6f762a2ec5f528167310e138671a7aacb0e84f9 SHA512 b6466744c58725327cfb47e317d809851bb5fa34e82eb9fe7ec472a7f9a9084f68f612f85e5a0dab2e60c3f7837692416c4728d36234cb7976ece256286fd27a
-EBUILD spacefm-1.0.5-r2.ebuild 2520 BLAKE2B 79c173dac5cb6b3579ecf6ca7566629c5074a64b93c13842d2642a3c8b4e178b5239a58ee9de002177d2860beebd20a616c41bad54b8be33cbea03323a0e7043 SHA512 e7c076c181bb3ac05d096e77d88cbedc2c803b714abdab52461ce195aa8e9441adf7f7b8a3986fb8db025e38e24b0b63813b2668236775829610311a55c6f423
-EBUILD spacefm-9999.ebuild 2454 BLAKE2B fad9f063f5adf173dfc72f7d507d9e8745d43e646e2a08df931a2cc67398b121bd8de0922655c17e0704c1910befd8cb885ec95ff6f9cc82c902035903358375 SHA512 5da5de98185ba9fc9e6eb74ae37c56c6442b5a25483de205563b285dd36c2c6b3dd6407b891a95d6b4d348883522f4936880c5bed7327845a887e864c25f58ae
+DIST spacefm-1.0.6.tar.gz 3498587 BLAKE2B fc4753ff370fa940ef5737bc7826558847dfbbbec43c1a150d887ed38655f9e45255a737f61a024318c9f37e86a15989da66c83d4dcf5a811603950009b20547 SHA512 37fc0dd31f02158502f592415b4c375ee49560af6f03d75b035d7c6c45bdc47064bba1ae8987b4cc8be2e02b3dfcdc17ec760411975e7b5f74343a2293fb2c8c
+EBUILD spacefm-1.0.5-r2.ebuild 2467 BLAKE2B 4da4b06f00fd300d98589abe6ae1314cf32aeedb8240a7bf0bc50b75fe2a92125f8c6ead158bc1a680db52154363ecab4e696da619c17248b6572f96568f997e SHA512 a3201aad465c716325eb234fee9f9fb295c9e145456ef2fdab51bd72508b9b6fc1ef147cdf62de181cfccb0c42b4d4d143aec7e53bb371a62b33fd170ac32e2e
+EBUILD spacefm-1.0.6.ebuild 2610 BLAKE2B 1bef8cbf50717d344dd6215087832e5016c3eca4b3779a9fa942f79fc9b6ba73eb28373bcd95a51e896c58cfc078f3a61a82fead06fb0369c988584cc609f4ba SHA512 b9d99e0b28fee5a2406b70012210cc0658bd8a066d2681068072dc0e6ac77f778c4ce909d4e50309f20f8342f5f9e884f6a0a764b1dfa1f83486229c6379ce16
+EBUILD spacefm-9999.ebuild 2610 BLAKE2B 1bef8cbf50717d344dd6215087832e5016c3eca4b3779a9fa942f79fc9b6ba73eb28373bcd95a51e896c58cfc078f3a61a82fead06fb0369c988584cc609f4ba SHA512 b9d99e0b28fee5a2406b70012210cc0658bd8a066d2681068072dc0e6ac77f778c4ce909d4e50309f20f8342f5f9e884f6a0a764b1dfa1f83486229c6379ce16
 MISC metadata.xml 1201 BLAKE2B 139db734d4255de23a02e7458adfd425682ef2241c6fc890ba6ad7d7ed79b7ea75d71a64ff0d40141dbd2429e59d580c873ded77e3e8cbd4efad0a1e80086126 SHA512 62587e98d0e230afee44fae4c33c985d8f1d5841579465c2dfca33d7f373700e10c964bb7ef89c640e35d49e7e29b7fd7b8b2a1961940959cef0a52266c0831d
diff --git a/x11-misc/spacefm/files/spacefm-9999-include-sysmacros.patch b/x11-misc/spacefm/files/spacefm-9999-include-sysmacros.patch
new file mode 100644
index 000000000000..3a586bba4395
--- /dev/null
+++ b/x11-misc/spacefm/files/spacefm-9999-include-sysmacros.patch
@@ -0,0 +1,11 @@
+--- a/src/main.c
++++ b/src/main.c
+@@ -30,6 +30,8 @@
+ 
+ #include <locale.h>
+ 
++#include <sys/sysmacros.h> /* for major/minor, dev_t */
++
+ #include "main-window.h"
+ 
+ #include "vfs-file-info.h"
diff --git a/x11-misc/spacefm/spacefm-1.0.4.ebuild b/x11-misc/spacefm/spacefm-1.0.4.ebuild
deleted file mode 100644
index a737494cf829..000000000000
--- a/x11-misc/spacefm/spacefm-1.0.4.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit fdo-mime gnome2-utils linux-info
-
-DESCRIPTION="A multi-panel tabbed file manager"
-HOMEPAGE="https://ignorantguru.github.com/spacefm/"
-SRC_URI="https://github.com/ignorantguru/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="gtk2 +gtk3 +startup-notification +video-thumbnails"
-REQUIRED_USE="gtk2? ( !gtk3 )"
-
-RDEPEND="dev-libs/glib:2
-	dev-util/desktop-file-utils
-	>=virtual/udev-143
-	virtual/freedesktop-icon-theme
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf
-	gtk2? ( x11-libs/gtk+:2 )
-	!gtk2? ( x11-libs/gtk+:3 )
-	x11-libs/pango
-	x11-libs/libX11
-	x11-misc/shared-mime-info
-	video-thumbnails? ( media-video/ffmpegthumbnailer )
-	startup-notification? ( x11-libs/startup-notification )"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	virtual/pkgconfig
-	sys-devel/gettext"
-
-src_configure() {
-	econf \
-		--htmldir=/usr/share/doc/${PF}/html \
-		$(use_enable startup-notification) \
-		$(use_enable video-thumbnails) \
-		--disable-hal \
-		--enable-inotify \
-		--disable-pixmaps \
-		$(use_with gtk3 gtk3 "yes")
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-	gnome2_icon_cache_update
-
-	einfo
-	elog "To mount as non-root user you need one of the following:"
-	elog "  sys-apps/udevil (recommended, see below)"
-	elog "  sys-apps/pmount"
-	elog "  sys-fs/udisks:0"
-	elog "  sys-fs/udisks:2"
-	elog "To support ftp/nfs/smb/ssh URLs in the path bar you need:"
-	elog "  sys-apps/udevil"
-	elog "To perform as root functionality you need one of the following:"
-	elog "  x11-misc/ktsuss"
-	elog "  kde-plasma/kde-cli-tools[kdesu]"
-	elog "Other optional dependencies:"
-	elog "  sys-apps/dbus"
-	elog "  sys-process/lsof (device processes)"
-	elog "  virtual/eject (eject media)"
-	einfo
-	if ! has_version 'sys-fs/udisks' ; then
-		elog "When using SpaceFM without udisks, and without the udisks-daemon running,"
-		elog "you may need to enable kernel polling for device media changes to be detected."
-		elog "See /usr/share/doc/${PF}/html/spacefm-manual-en.html#devices-kernpoll"
-		has_version '<virtual/udev-173' && ewarn "You need at least udev-173"
-		kernel_is lt 2 6 38 && ewarn "You need at least kernel 2.6.38"
-		einfo
-	fi
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-	gnome2_icon_cache_update
-}
diff --git a/x11-misc/spacefm/spacefm-1.0.5-r2.ebuild b/x11-misc/spacefm/spacefm-1.0.5-r2.ebuild
index 75f58c0e831d..bcf8d506218b 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/"
@@ -32,9 +32,7 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	sys-devel/gettext"
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-include-sysmacros.patch
-)
+PATCHES=( "${FILESDIR}"/${PN}-include-sysmacros.patch )
 
 src_configure() {
 	econf \
@@ -47,13 +45,9 @@ src_configure() {
 		$(use_with gtk3 gtk3 "yes")
 }
 
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
 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 +77,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-1.0.4-r1.ebuild b/x11-misc/spacefm/spacefm-1.0.6.ebuild
index cbea0f7944a5..d7f32ee9c498 100644
--- a/x11-misc/spacefm/spacefm-1.0.4-r1.ebuild
+++ b/x11-misc/spacefm/spacefm-1.0.6.ebuild
@@ -1,19 +1,24 @@
-# 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/"
-SRC_URI="https://github.com/ignorantguru/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+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="~amd64 ~x86"
 IUSE="gtk2 +gtk3 +startup-notification +video-thumbnails"
-REQUIRED_USE="gtk2? ( !gtk3 )"
 
 RDEPEND="dev-libs/glib:2
 	dev-util/desktop-file-utils
@@ -21,21 +26,19 @@ RDEPEND="dev-libs/glib:2
 	virtual/freedesktop-icon-theme
 	x11-libs/cairo
 	x11-libs/gdk-pixbuf
-	gtk2? ( gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) )
-	!gtk2? ( x11-libs/gtk+:3 )
 	x11-libs/pango
 	x11-libs/libX11
 	x11-misc/shared-mime-info
-	video-thumbnails? ( media-video/ffmpegthumbnailer )
-	startup-notification? ( x11-libs/startup-notification )"
+	gtk2? ( gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) )
+	!gtk2? ( x11-libs/gtk+:3 )
+	startup-notification? ( x11-libs/startup-notification )
+	video-thumbnails? ( media-video/ffmpegthumbnailer )"
 DEPEND="${RDEPEND}
 	dev-util/intltool
-	virtual/pkgconfig
-	sys-devel/gettext"
+	sys-devel/gettext
+	virtual/pkgconfig"
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-include-sysmacros.patch
-)
+PATCHES=( "${FILESDIR}"/${PN}-9999-include-sysmacros.patch )
 
 src_configure() {
 	econf \
@@ -48,13 +51,9 @@ src_configure() {
 		$(use_with gtk3 gtk3 "yes")
 }
 
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
 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
@@ -84,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..d7f32ee9c498 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
@@ -22,17 +26,19 @@ RDEPEND="dev-libs/glib:2
 	virtual/freedesktop-icon-theme
 	x11-libs/cairo
 	x11-libs/gdk-pixbuf
-	gtk2? ( gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) )
-	!gtk2? ( x11-libs/gtk+:3 )
 	x11-libs/pango
 	x11-libs/libX11
 	x11-misc/shared-mime-info
-	video-thumbnails? ( media-video/ffmpegthumbnailer )
-	startup-notification? ( x11-libs/startup-notification )"
+	gtk2? ( gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) )
+	!gtk2? ( x11-libs/gtk+:3 )
+	startup-notification? ( x11-libs/startup-notification )
+	video-thumbnails? ( media-video/ffmpegthumbnailer )"
 DEPEND="${RDEPEND}
 	dev-util/intltool
-	virtual/pkgconfig
-	sys-devel/gettext"
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}"/${PN}-9999-include-sysmacros.patch )
 
 src_configure() {
 	econf \
@@ -45,13 +51,9 @@ src_configure() {
 		$(use_with gtk3 gtk3 "yes")
 }
 
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
 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 +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
 }