gentoo resync : 15.12.2019

6 files changed, 7 insertions, 147 deletions

diff --git a/x11-misc/qtfm/Manifest b/x11-misc/qtfm/Manifest
index 91865893a66b..0dd1a7cf8114 100644
--- a/x11-misc/qtfm/Manifest
+++ b/x11-misc/qtfm/Manifest
@@ -1,9 +1,5 @@
-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
+AUX qtfm-99999-cmake.patch 323 BLAKE2B 023794991cc9a91792388e8d56d54542f50cf42ebe0d3a4bbf534d59acb869ada9465ab216b0e2a7978dd60d7ab9a15198f3e272707400d5d6f14b823ef1ac6b SHA512 74ee9c0e39bd826bc73aedfb79208e18bfc1348a49e7c0290d7a96375f3c56ec5d074d463bcf8256cb6ee5155b2d88f7c4c20544193c574db30356260c74bc52
 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 1065 BLAKE2B 995db393d18c4b3d4c914da2c0f447e2010ebd988cb7f58f985534c56718375614523ded5e2c892aea02205bf397f8062691689cdde3402f9f3efef66f613416 SHA512 f40f47446a8c16faf7bb67ac56b159e3f7daa747080e87737641d9448ec2b0f302ade8d3318e904a3a36021c6e0cd5deac653b44be5b856784cd09e07c329f1a
-EBUILD qtfm-99999.ebuild 1030 BLAKE2B 34b38de342c95c52f8aec35b9124ce13d06444f4a8a4ca31815e7cd6b931f2a8c301e4411cb5d4a578d171636dc32854f5fc5c3d99cf3db2f6aa0ffa648f41ca SHA512 18826a59a8698f7d07cd40a60fae10c8692301b3dfd993f908e1c8ade01f49f965390d2f87a9f2173aab4f49ec8b7e4a03a08348fe52d25c1b040aee133ba3b5
+EBUILD qtfm-6.2.0.ebuild 1063 BLAKE2B 11a90f7c2a39a1d13376d0dd811476c74e612c3465ad377c324c486d333b5d4454ad98f99d1c90099e27f509acf054832662adee2a878b14a88995b3a9dc1cec SHA512 cae5d0cc10fb49a56cc60fc256daaf332c5b114472eabf9a9d59368711d06fd550904bcef6115627c2d076928de28dc2d80ff87685fa6929b23d951cea1236c9
+EBUILD qtfm-99999.ebuild 1029 BLAKE2B 954d8340cd54e00502ea6d53a178d398aa897cac6bce74e4ab3361850c07dffc9a864b21462ea7c699b2c3ec34d65a801b6c95d58159fd87d449a9a35d979751 SHA512 711343c211d1e4892baa76c6a441aa12fb383e3ccd8d07c49879d4f03a54690f27ce925e2abf411c178d0411bf1ec659309b48d4449273285d8f7e96d66b5007
 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
index a89d090510df..815453760fe2 100644
--- a/x11-misc/qtfm/files/qtfm-99999-cmake.patch
+++ b/x11-misc/qtfm/files/qtfm-99999-cmake.patch
@@ -1,47 +1,10 @@
 --- 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 @@
+@@ -121,7 +121,6 @@ set_target_properties(
      ${PROJECT_VERSION_MAJOR}
  )
- if(ENABLE_MAGICK OR ENABLE_MAGICK7)
+ if(ENABLE_MAGICK)
 -    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/qtfm-6.1.5.ebuild b/x11-misc/qtfm/qtfm-6.1.5.ebuild
deleted file mode 100644
index 88902e6b9aaf..000000000000
--- a/x11-misc/qtfm/qtfm-6.1.5.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit xdg-utils gnome2-utils qmake-utils
-
-DESCRIPTION="A small, lightweight file manager for desktops based on pure Qt"
-HOMEPAGE="https://qtfm.eu/"
-SRC_URI="https://github.com/rodlie/qtfm/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-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
-"
-DEPEND="
-	${RDEPEND}
-	app-arch/unzip
-	dev-qt/linguist-tools:5
-"
-
-src_prepare() {
-	sed -i -e '/^docs.path/ s:$${TARGET}-$${VERSION}:'"${PF}"':g' fm/fm.pro || die
-	default
-}
-
-src_configure() {
-	eqmake5 PREFIX=/usr XDGDIR=/etc/xdg
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-	einstalldocs
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/x11-misc/qtfm/qtfm-6.1.9.ebuild b/x11-misc/qtfm/qtfm-6.1.9.ebuild
deleted file mode 100644
index e80647d017f5..000000000000
--- a/x11-misc/qtfm/qtfm-6.1.9.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit xdg-utils qmake-utils
-
-DESCRIPTION="A small, lightweight file manager for desktops based on pure Qt"
-HOMEPAGE="https://qtfm.eu/"
-SRC_URI="https://github.com/rodlie/qtfm/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-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
-"
-DEPEND="
-	${RDEPEND}
-	app-arch/unzip
-	dev-qt/linguist-tools:5
-"
-
-src_configure() {
-	eqmake5 PREFIX=/usr XDGDIR=/etc/xdg
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-	einstalldocs
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
diff --git a/x11-misc/qtfm/qtfm-6.2.0.ebuild b/x11-misc/qtfm/qtfm-6.2.0.ebuild
index e330a1bea393..8ec496a5bd70 100644
--- a/x11-misc/qtfm/qtfm-6.2.0.ebuild
+++ b/x11-misc/qtfm/qtfm-6.2.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/rodlie/qtfm/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+dbus shared"
 
 RDEPEND="
diff --git a/x11-misc/qtfm/qtfm-99999.ebuild b/x11-misc/qtfm/qtfm-99999.ebuild
index 012984f236ab..61cdeb65e860 100644
--- a/x11-misc/qtfm/qtfm-99999.ebuild
+++ b/x11-misc/qtfm/qtfm-99999.ebuild
@@ -37,7 +37,7 @@ src_configure() {
 	mycmakeargs=(
 		-DENABLE_DBUS="$(usex dbus)"
 		-DENABLE_FFMPEG="$(usex ffmpeg)"
-		-DENABLE_MAGICK7="$(usex imagemagick)"
+		-DENABLE_MAGICK="$(usex imagemagick)"
 	)
 	cmake-utils_src_configure
 }