gentoo resync : 16.06.2019

5 files changed, 109 insertions, 5 deletions

diff --git a/x11-misc/qtfm/Manifest b/x11-misc/qtfm/Manifest
index b8a8b124c07f..91865893a66b 100644
--- a/x11-misc/qtfm/Manifest
+++ b/x11-misc/qtfm/Manifest
@@ -1,7 +1,9 @@
+AUX qtfm-99999-cmake.patch 1480 BLAKE2B 47b7ece97e9d7851d425042b287a0b2f67ac816e1df92eb3f90b830303a672c71707abe7ee855a45630184da2fd1f58cec8a3319b520d7113ae9180646acb8a2 SHA512 c03941d097f70696b113500893abdab87f58de139da13c83a90355b6760908d7e78434190f86d2105d9978f03d7a931a851fbcf25e87b131d1aca5ee508770af
 DIST qtfm-6.1.5.tar.gz 217207 BLAKE2B 3a818458e6f3d1dfe91860681eb77b809a455d16eef7810aa06e73b9600e6d032c178624c1dbde6d609353eb79ad43e65205f3c3ba84f21b854b8ef93b65be72 SHA512 10a0e1fc8f8948b0564a9b78967403c4a10639c10194879b48bbe086110af0d611a310ab185a2351043df879dbba1e7849a03dde54b6554b74004cbcc27f3788
 DIST qtfm-6.1.9.tar.gz 248313 BLAKE2B 4c9970754925de3210cc688f8f9ad8caea753b78e8e8377ee8a0a6dec014ab3c4459f20882b00c6d16c7bc36878cf8f483b38af0e9102d097679b12a6a6e0db9 SHA512 44765e219f4774f30e43027056fde04d23579e8c91b72215432ff4718fc702f85ddb9752b166eef8aa1aa89ab7bcc6a14585fce05f447c264087ee8274d4bfea
 DIST qtfm-6.2.0.tar.gz 411064 BLAKE2B dce16b79753de31c58b36aa51b2f5555a12e19778ce81ca980bb5775f694d5315df97f4ac7b060653748a3ec2bc69b0f88599bca44696ce8b6a8026b30abbf9f SHA512 44bcef3d9e4111388aa93fd8c51d65a5210e969071d79336a4451a78ec7503867d8c667325eeafa5f85ee922dd787746e6ac94e17a61c07914c12364cfa8951d
 EBUILD qtfm-6.1.5.ebuild 974 BLAKE2B 3d7249409b2be57539da80d0f8f704b02421d6899acad39a5d872cd51ea8c8bac02e1798236e365cf42ff8533698d6f505ab07aff0687faaecf3f9871ee45fad SHA512 b89233b56aa90bceab362084d284e224760b3c127ea34388d5e5717fd7cf42a9f1957fffded546fa02a3330801567aeaa39214875065c54528343dfb0f621233
 EBUILD qtfm-6.1.9.ebuild 849 BLAKE2B 046fa2ff66eeaccf6d6196bdd0b18bc63d70b39c69e830b6dab9dd89d220231938f8f96d4c0b8b6bce843b59160f9b5e54c25a2168c721fb760c1a05f3b9daf7 SHA512 e81f70437fbecde940af03f50be928fb231c4bfafec22abf21d27da5b77b1ee2fd764745a147f497074930cbafb530628c7c8eb4bc1b293f0b678f0a3f3f0ce8
-EBUILD qtfm-6.2.0.ebuild 1004 BLAKE2B 70d82537fb67e5891dc8091169332e454b47becb72124f8c948ff8cb0192e979ef1d2f8d2f3ee66877e31683522dc0649b2b0b013dfba33b5e41613ec32e86d8 SHA512 d7a6be3cb9b67cce16734f2a9aa245972f458f6269283356d28c715a44ff3dfa2874e77cf9a4d935048666e1fc3e92d0f9a87290ffc54ad1b2afeed75baf8e79
-MISC metadata.xml 463 BLAKE2B a44c41a05360291bb3be4933267cb36d2135e513aea6f6b2b1f564130f2946dc150f972fc6300db9f50961a0461151e6bdce8269189e71dcecd0e6da827f2de0 SHA512 69e6f714837cbac98d318ac9b0e8f50804d5522f38a52785e2afe90125dbcae9082fc863cbe62f1e3b7ada3b66b41aac4b9471433836de0b7fbd1a1f4117ef78
+EBUILD qtfm-6.2.0.ebuild 1065 BLAKE2B 995db393d18c4b3d4c914da2c0f447e2010ebd988cb7f58f985534c56718375614523ded5e2c892aea02205bf397f8062691689cdde3402f9f3efef66f613416 SHA512 f40f47446a8c16faf7bb67ac56b159e3f7daa747080e87737641d9448ec2b0f302ade8d3318e904a3a36021c6e0cd5deac653b44be5b856784cd09e07c329f1a
+EBUILD qtfm-99999.ebuild 1030 BLAKE2B 34b38de342c95c52f8aec35b9124ce13d06444f4a8a4ca31815e7cd6b931f2a8c301e4411cb5d4a578d171636dc32854f5fc5c3d99cf3db2f6aa0ffa648f41ca SHA512 18826a59a8698f7d07cd40a60fae10c8692301b3dfd993f908e1c8ade01f49f965390d2f87a9f2173aab4f49ec8b7e4a03a08348fe52d25c1b040aee133ba3b5
+MISC metadata.xml 535 BLAKE2B aecaf2f611f0c47f5ec04b5fab8d45d7d0cf4c3b029a4605f2dadcf11237fd3fce56d10e8fab1611e716c70f303ca93deba25c3f884aeb7c798b9e411be7a024 SHA512 28844f26bfd8c62e896340bbe7f8466903eecf97e8eba6f5003c407258692ac76fc2799836c7a27643b1c4f9a5ba7033366414acc8f60b4f72b352e740026a7b
diff --git a/x11-misc/qtfm/files/qtfm-99999-cmake.patch b/x11-misc/qtfm/files/qtfm-99999-cmake.patch
new file mode 100644
index 000000000000..a89d090510df
--- /dev/null
+++ b/x11-misc/qtfm/files/qtfm-99999-cmake.patch
@@ -0,0 +1,47 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -36,7 +36,7 @@
+         add_definitions(-DMAGICK7)
+     endif()
+     find_package(PkgConfig REQUIRED)
+-    pkg_check_modules(MAGICK REQUIRED ImageMagick++)
++    pkg_check_modules(MAGICK REQUIRED Magick++)
+     # ffmpeg
+     if(ENABLE_FFMPEG)
+         pkg_check_modules(AVDEVICE REQUIRED libavdevice)
+@@ -66,7 +66,7 @@
+ find_package(Qt5Concurrent REQUIRED)
+ 
+ # inotify
+-if("${CMAKE_SYSTEM}" NOT MATCHES "Linux")
++if(NOT "${CMAKE_SYSTEM_NAME}" MATCHES "Linux")
+     find_package(PkgConfig REQUIRED)
+     pkg_check_modules(NOTIFY REQUIRED libinotify)
+ endif()
+@@ -123,7 +123,7 @@
+     ${PROJECT_VERSION_MAJOR}
+ )
+ if(ENABLE_MAGICK OR ENABLE_MAGICK7)
+-    target_compile_definitions(QtFM PRIVATE ${MAGICK_CFLAGS_OTHER})
++    target_compile_options(QtFM PRIVATE ${MAGICK_CFLAGS_OTHER})
+     target_link_libraries(QtFM ${MAGICK_LIBRARIES})
+     if(ENABLE_FFMPEG)
+         target_include_directories(QtFM
+@@ -161,7 +161,7 @@
+ if(ENABLE_DBUS)
+     target_link_libraries(QtFM Qt5::DBus QtFMBus)
+ endif()
+-if("${CMAKE_SYSTEM}" NOT MATCHES "Linux")
++if(NOT "${CMAKE_SYSTEM_NAME}" MATCHES "Linux")
+     target_link_libraries(QtFM ${NOTIFY_LIBRARIES})
+ endif()
+ if(APPLE)
+@@ -192,7 +192,7 @@
+ if(ENABLE_DBUS)
+     target_link_libraries(${PROJECT_NAME} Qt5::DBus)
+ endif()
+-if("${CMAKE_SYSTEM}" NOT MATCHES "Linux")
++if(NOT "${CMAKE_SYSTEM_NAME}" MATCHES "Linux")
+     target_link_libraries(${PROJECT_NAME} ${NOTIFY_LIBRARIES})
+ endif()
+ if(APPLE)
diff --git a/x11-misc/qtfm/metadata.xml b/x11-misc/qtfm/metadata.xml
index 9c25f5fe1917..004b55d08e68 100644
--- a/x11-misc/qtfm/metadata.xml
+++ b/x11-misc/qtfm/metadata.xml
@@ -10,6 +10,7 @@
 	<name>Gentoo Desktop Miscellaneous Project</name>
 </maintainer>
 <use>
+<flag name='dbus'>Install the qtfm-tray removable device manager</flag>
 <flag name='shared'>Install the libQtFM shared library and headers</flag>
 </use>
 </pkgmetadata>
diff --git a/x11-misc/qtfm/qtfm-6.2.0.ebuild b/x11-misc/qtfm/qtfm-6.2.0.ebuild
index 866fd51c7eca..e330a1bea393 100644
--- a/x11-misc/qtfm/qtfm-6.2.0.ebuild
+++ b/x11-misc/qtfm/qtfm-6.2.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit multilib xdg-utils qmake-utils
+inherit xdg-utils qmake-utils
 
 DESCRIPTION="A small, lightweight file manager for desktops based on pure Qt"
 HOMEPAGE="https://qtfm.eu/"
@@ -11,16 +11,16 @@ SRC_URI="https://github.com/rodlie/qtfm/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="shared"
+IUSE="+dbus shared"
 
 RDEPEND="
 	dev-qt/qtconcurrent:5
 	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
 	dev-qt/qtgui:5
 	dev-qt/qtnetwork:5
 	dev-qt/qtwidgets:5
 	sys-apps/file
+	dbus? ( dev-qt/qtdbus:5 )
 "
 DEPEND="
 	${RDEPEND}
@@ -30,6 +30,7 @@ DEPEND="
 
 src_configure() {
 	eqmake5 \
+		$(usex dbus '' 'CONFIG+=no_dbus CONFIG+=no_tray') \
 		$(usex shared 'CONFIG+=sharedlib' '') \
 		$(usex shared 'CONFIG+=with_includes' '') \
 		LIBDIR="/usr/$(get_libdir)" \
diff --git a/x11-misc/qtfm/qtfm-99999.ebuild b/x11-misc/qtfm/qtfm-99999.ebuild
new file mode 100644
index 000000000000..012984f236ab
--- /dev/null
+++ b/x11-misc/qtfm/qtfm-99999.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit git-r3 xdg-utils cmake-utils
+
+DESCRIPTION="A small, lightweight file manager for desktops based on pure Qt"
+HOMEPAGE="https://qtfm.eu/"
+EGIT_REPO_URI="https://github.com/rodlie/qtfm/"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS=""
+IUSE="+dbus ffmpeg imagemagick"
+
+RDEPEND="
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+	sys-apps/file
+	dbus? ( dev-qt/qtdbus:5 )
+	ffmpeg? ( virtual/ffmpeg )
+	imagemagick? ( >=media-gfx/imagemagick-7:= )
+"
+DEPEND="
+	${RDEPEND}
+	app-arch/unzip
+	dev-qt/linguist-tools:5
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-99999-cmake.patch
+)
+
+src_configure() {
+	mycmakeargs=(
+		-DENABLE_DBUS="$(usex dbus)"
+		-DENABLE_FFMPEG="$(usex ffmpeg)"
+		-DENABLE_MAGICK7="$(usex imagemagick)"
+	)
+	cmake-utils_src_configure
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}