gentoo resync : 16.01.2018

5 files changed, 59 insertions, 47 deletions

diff --git a/media-gfx/kuickshow/Manifest b/media-gfx/kuickshow/Manifest
index 0da9481db7db..5baf5cec3967 100644
--- a/media-gfx/kuickshow/Manifest
+++ b/media-gfx/kuickshow/Manifest
@@ -1,4 +1,4 @@
-AUX kuickshow-0.9.1-gcc6-compile-fix.patch 408 BLAKE2B ef6450d7f9b0feebed096c04bcf409a1a93c5fc1189c917fee14dd691d9ca421e547f7197f676bb23a1bb21b8e0abba3db474ddaa033de9408ab65deed35502b SHA512 0b64ebefab7aed4b9a42457f3782a7f36ab61fee96d281ee1d42c6315e25a1afd97a92d9d847862eaa2a5cee5fe3190ddd74c3cfcaa92ca5e1718390c48104f1
-DIST kuickshow-0.9.1-kde4.4.0.tar.bz2 915108 BLAKE2B d6ba91bd737ced19c4dbd8320da553b0212a60b6f98aa2188d1d8068856182b2b61a186ed02d29bf88649fc6bd7a6db16fb825c3711b26ac4ac37b7eee0e1071 SHA512 394b95c6b7c3b655a96729559271cd837ff5995aefc7e229f3bc7905f7e64f3fb05d34a67c9a9ba584c1cdbc459b7349d0e134a16afe9e0505b5a494e85ab87e
-EBUILD kuickshow-0.9.1-r3.ebuild 599 BLAKE2B 5dbd0e2403140574560650c0ea844a3eba21aae1e5a62947225d2e1670b6ebfea19a92131b83846c73391b164840a9a1ebc1879e96e4c4a7dd2aa710bb1f1744 SHA512 6fcf79f99ff3ba88be85cafacb363973860b70623bff265d9256fd0f84c4a505d32c373d3ae10b4b9d7033ebaf931a2942c42925fae93a1f9f07f5d722f3322f
+AUX kuickshow-0.10.0-desktop-fix.patch 397 BLAKE2B 60260af0d7b9b060a0b52cbe9371419faac84c807757eb70c55b5f824c9ef6bee1a2e949b82dace5fcd32e5ad07e3bb4baaa88724045bbad5a2248a6a8d7ed7f SHA512 09747c0457225ab2d885b7c7af00d2844323edb8dcba37424316b88abad039b698c68d1304a78a9ecbba5edfa3cb68c1bc305ba5e0a8e7e0083740569835af1e
+DIST kuickshow-0.10.0.tar.xz 1038552 BLAKE2B 435a2ea3e944514c3ea9cd42428281517dd91bdcb0d288cfd95d7b4e59f4b063ca4cfdf1aed19d3ccdd96ce492edad60fe76ece26ae7be7fec67d3a51d70ff99 SHA512 3c12bcca649b4b7d75709432e77b0b8d7ba9bd98ddd75592421f2035bfd43724d25dd066ff1aeffb1f2200df618ba153a0d855e037a48517f3aea177aa3fdec0
+EBUILD kuickshow-0.10.0.ebuild 1135 BLAKE2B a6a05b53c2a4d551f94f7a7fe0891414cf41f2ca24b045f648238facbe341d57262b437ee435dfe05c9a19124551de38bf202543c0b4022add5a3a54e515257e SHA512 84a596199d3b83f387a7a5c2105f1fa7a62cceefd8a3eab403e7d8eefda737ad71bd724d0b31c99b6c830a403e1397a53a602571533ac6e124cfc6f5d8218092
 MISC metadata.xml 368 BLAKE2B 2e35a817f35b6cd1371efcbc8c9f178d378d9951a7f72068020fb27e5aeb7de5e903e20c65355780ab66ba08c0655b16fdbf48aa8f02cba8a66cf706c813b730 SHA512 9396698295f746c83f4fe1cc56396093feedb617a0a8cd1fa750b9f3099d9db014329d021af1021b0a22e73a3a8190b10ba5b80c0e753ea526094382e7495d20
diff --git a/media-gfx/kuickshow/files/kuickshow-0.10.0-desktop-fix.patch b/media-gfx/kuickshow/files/kuickshow-0.10.0-desktop-fix.patch
new file mode 100644
index 000000000000..3b914e6e36a3
--- /dev/null
+++ b/media-gfx/kuickshow/files/kuickshow-0.10.0-desktop-fix.patch
@@ -0,0 +1,11 @@
+--- a/src/kuickshow.desktop	2018-01-11 23:33:22.000000000 +0100
++++ b/src/kuickshow.desktop	2018-01-13 18:26:36.622067345 +0100
+@@ -54,7 +54,7 @@
+ Name[x-test]=xxKuickshowxx
+ Name[zh_CN]=Kuickshow
+ Name[zh_TW]=Kuickshow
+-Exec=kuickshow -caption %c %U
++Exec=kuickshow -qwindowtitle %c %U
+ Icon=kuickshow
+ Type=Application
+ # TODO: What is image/x-eim? Register it to freedesktop.org if you need it
diff --git a/media-gfx/kuickshow/files/kuickshow-0.9.1-gcc6-compile-fix.patch b/media-gfx/kuickshow/files/kuickshow-0.9.1-gcc6-compile-fix.patch
deleted file mode 100644
index 82bf2eafd270..000000000000
--- a/media-gfx/kuickshow/files/kuickshow-0.9.1-gcc6-compile-fix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Fixed wrong type of 2nd parameter which wouldn't compile with GCC 6.
-
-https://bugs.gentoo.org/614304
-
---- a/src/kuickshow.cpp
-+++ b/src/kuickshow.cpp
-@@ -661,7 +661,7 @@ void KuickShow::performDeleteCurrentImage(QWidget *parent)
-     }
- 
-     tryShowNextImage();
--    fileWidget->del(list, false, false);
-+    fileWidget->del(list, 0L, false);
- }
- 
- void KuickShow::performTrashCurrentImage(QWidget *parent)
diff --git a/media-gfx/kuickshow/kuickshow-0.10.0.ebuild b/media-gfx/kuickshow/kuickshow-0.10.0.ebuild
new file mode 100644
index 000000000000..ee42d53b1071
--- /dev/null
+++ b/media-gfx/kuickshow/kuickshow-0.10.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_PO_DIRS="po doc-translations"
+inherit kde5
+
+DESCRIPTION="Image viewer based on KDE Frameworks"
+HOMEPAGE="https://userbase.kde.org/KuickShow"
+SRC_URI="https://dev.gentoo.org/~asturm/distfiles/${P}.tar.xz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+DOCS=( AUTHORS BUGS ChangeLog README TODO )
+
+DEPEND="
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kinit)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtx11extras)
+	media-libs/imlib
+	x11-libs/libX11
+"
+RDEPEND="${DEPEND}
+	!media-gfx/kuickshow:4
+"
+
+PATCHES=( "${FILESDIR}/${P}-desktop-fix.patch" )
diff --git a/media-gfx/kuickshow/kuickshow-0.9.1-r3.ebuild b/media-gfx/kuickshow/kuickshow-0.9.1-r3.ebuild
deleted file mode 100644
index 16158579a72e..000000000000
--- a/media-gfx/kuickshow/kuickshow-0.9.1-r3.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_DOC_DIRS="doc doc-translations/%lingua_${PN}"
-inherit kde4-base
-
-MY_P=${P}-kde4.4.0
-
-DESCRIPTION="KDE program to view images"
-HOMEPAGE="https://userbase.kde.org/KuickShow"
-SRC_URI="mirror://kde/Attic/4.4.0/src/extragear/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="4"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug +handbook"
-
-DEPEND="media-libs/imlib"
-RDEPEND="${DEPEND}"
-
-DOCS=( AUTHORS BUGS ChangeLog README TODO )
-
-PATCHES=(
-	"${FILESDIR}/${P}-gcc6-compile-fix.patch"
-)
-
-S=${WORKDIR}/${MY_P}