gentoo resync : 01.12.2017

4 files changed, 2 insertions, 57 deletions

diff --git a/kde-apps/ksudoku/Manifest b/kde-apps/ksudoku/Manifest
index 5f71cab955ab..ca6c13a87b36 100644
--- a/kde-apps/ksudoku/Manifest
+++ b/kde-apps/ksudoku/Manifest
@@ -1,6 +1,3 @@
-AUX ksudoku-17.04.3-desktop.patch 704 BLAKE2B 8cce79f37a81c75c240b1b72c29b403bf9e759b75290488cbf021b8c8ee6806b2e833a0e1674feb23f21f3db4a334153ee85efed88ae20ed1c66d3c39f01f706 SHA512 cfc1352e443a6d304f8d0541c6b31f5709a88adab3561b209ae9830004177d629da65700af2c750db54579817134a91d2d4e61ccf557c0e8662e7d9931a68887
-DIST ksudoku-17.04.3.tar.xz 1434536 SHA256 1162839b75f7508bd4007fc586c3466565527c3519069bbba636802f7f95a474 SHA512 644365171346a90d818ddc406271f38fd09ea7ec1178455c3523cdc631213017eec6500c8be18a3af8d7dfc5245c1a71207b7b4e9aad4c9cd8933342e90a8874 WHIRLPOOL 07c7306902004305a9ebfb581239574b081f065abb0e8d54320a646fb92d33d72a442c96088a413df8c147f89294766b9fc85d1ed2767b973756d7d04ff19db5
 DIST ksudoku-17.08.3.tar.xz 1634212 SHA256 023734611da98de9c970a3ececbd50c6d8dc8a3eef8703d73efa7c7184d6b8b6 SHA512 e948cf7ec5b51f83b3604ef7b97575543d4ee9a2fa17237954511e74ebbcf6b4a7781132a6e2c49ed70c6d7df653015140dff230275826f0fc12900f63c139ea WHIRLPOOL 34cd6ea69c807c2344803612fe11ae18f4a04702e6e8caff5c9ed9bd45f0c24629b722101dcde6d6f53a50f89f6639ff0d04d7d112a0405f11f5b1d213c51a1e
-EBUILD ksudoku-17.04.3-r1.ebuild 591 BLAKE2B df4cb5cd07b7e2217464d46434a91b9b30daeefbdf02aa1e622bff2cecc1580965b0848da6fed594c54b34c3ffbbfc39cd24aceae4818819c88002cd78d6b583 SHA512 090a1857087ed69b1942146bd7e25cee8916b04aadd032f5096964d652f9bbeaa3315d20075e0044239afc6ae6cd162a97372ae4b845a6ac028e83e65a2f3ac0
-EBUILD ksudoku-17.08.3.ebuild 1136 BLAKE2B 24fa41e4e7c484f0bc5b9096e7a42260c5776304124c670c1bff7026489c689c99432d3277ef4eccb9e4e012137707d28fa4a6fcd132b5838e28bc7bc4f76c55 SHA512 908063f1920a81575587c321cc41b8d47ae4371f18f2249641abba4ab3e693bc2737236df35ab924403e113db166b80c4ed2cf704893ef5aca5791128a99dbc0
+EBUILD ksudoku-17.08.3.ebuild 1134 BLAKE2B f821d1bd3f38d460729280d448af594d7710973b4795a0d18314321cb7139c9607001fa9c7eecb3f6e14bd76f2fab57c0997584d6e1ecbed33dec0b194b00882 SHA512 47698a1e808602a63093e72feebcc94538f16ec1a2dcfd111d475d708120be136aa240c409840ec0574bf6b5e0fb213b8ae7fadca845917e4d029c7152439271
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ksudoku/files/ksudoku-17.04.3-desktop.patch b/kde-apps/ksudoku/files/ksudoku-17.04.3-desktop.patch
deleted file mode 100644
index 22e23f5a1c4a..000000000000
--- a/kde-apps/ksudoku/files/ksudoku-17.04.3-desktop.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-commit 7fffa653aa5d0bcff834b2abddf4c4da0357397a
-Author: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date:   Fri Jul 14 00:45:32 2017 +0200
-
-    Revert "Fix .desktop: Qt5 apps accept qwindowtitle, not caption"
-    
-    This reverts commit 672b4e39f22f840034a8e66e1311175639bff3e3.
-
-diff --git a/src/gui/org.kde.ksudoku.desktop b/src/gui/org.kde.ksudoku.desktop
-index 858688a..626ec59 100755
---- a/src/gui/org.kde.ksudoku.desktop
-+++ b/src/gui/org.kde.ksudoku.desktop
-@@ -50,7 +50,7 @@ Name[wa]=KSudoku
- Name[x-test]=xxKSudokuxx
- Name[zh_CN]=KSudoku
- Name[zh_TW]=KSudoku
--Exec=ksudoku %i -qwindowtitle %c
-+Exec=ksudoku %i -caption %c
- Icon=ksudoku
- Type=Application
- X-DocPath=ksudoku/index.html
diff --git a/kde-apps/ksudoku/ksudoku-17.04.3-r1.ebuild b/kde-apps/ksudoku/ksudoku-17.04.3-r1.ebuild
deleted file mode 100644
index 59923d0db9cc..000000000000
--- a/kde-apps/ksudoku/ksudoku-17.04.3-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="optional"
-OPENGL_REQUIRED="optional"
-inherit kde4-base
-
-DESCRIPTION="Sudoku by KDE"
-HOMEPAGE="
-	https://www.kde.org/applications/games/ksudoku/
-	https://games.kde.org/game.php?game=ksudoku
-"
-KEYWORDS="amd64 x86"
-IUSE="debug"
-
-DEPEND="
-	$(add_kdeapps_dep libkdegames)
-	opengl? ( virtual/glu )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/${P}-desktop.patch" )
-
-src_configure() {
-	local mycmakeargs=(
-		-DWITH_OpenGL=$(usex opengl)
-	)
-	kde4-base_src_configure
-}
diff --git a/kde-apps/ksudoku/ksudoku-17.08.3.ebuild b/kde-apps/ksudoku/ksudoku-17.08.3.ebuild
index c00f7abb2b1a..1027fc9a3444 100644
--- a/kde-apps/ksudoku/ksudoku-17.08.3.ebuild
+++ b/kde-apps/ksudoku/ksudoku-17.08.3.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="
 	https://www.kde.org/applications/games/ksudoku/
 	https://games.kde.org/game.php?game=ksudoku
 "
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="opengl"
 
 DEPEND="