gentoo resync : 01.12.2017

6 files changed, 6 insertions, 100 deletions

diff --git a/media-libs/qimageblitz/Manifest b/media-libs/qimageblitz/Manifest
index 6b1bb2145f0a..23c0cfeaff69 100644
--- a/media-libs/qimageblitz/Manifest
+++ b/media-libs/qimageblitz/Manifest
@@ -1,9 +1,4 @@
-AUX qimageblitz-0.0.6-cmake.patch 422 BLAKE2B 5a8c0ea0998ca3d343d46a0c1d4f6ebfc50441f0fd7d08f1fc44f70da3c72afb9eb7d9e3989263acdb092f012a09e770b460ff07a7384db1da7520b6519e8ddf SHA512 ca05b91e5c7b40b425cab5a4e2b33b11dc6d2cfde0c142d1985e700de8bc558e4bb4a8d81fb2d727e7700e314965f5451cc6983abeab9f4214473a5659933f49
-AUX qimageblitz-0.0.6-exec-stack.patch 319 BLAKE2B 3092faef9489bc35dba5d57342d746156382ddd8e447a31c1ea53b42e9c9ccc359151581392411ae459f3d8b0408a89c1189b20a352c5c10988bc58a9ed94b3b SHA512 51d61c9ae203216b932eaf80f4668b3d172d9f2133f76c8814d6d5de2c4660479d6d80efcd60f5dad2e2d526fb3f7fc39223399eacf400e4c3f7e197a79d43fb
-AUX qimageblitz-0.0.6-gcc.patch 670 BLAKE2B ad38646bdff9a7a3e2d84f0a6bbeff7f140d8ecafb5298a3c199659cf374ce69afed54c27c06474d17e03c99192e59d463f68f5d73a1fcaf3f00916f0a3f3119 SHA512 7158c4680c76e176c193e0b8c67066689d06939456636c5699772180af6508398d2a33bd56d43f20c94da16748f64311f06bddc6faa1e51cbfd13c22096dd89f
 AUX qimageblitz-0.0.6_p20131029-gcc.patch 693 BLAKE2B 73f99f9160db49fb9946c409c5e05b1559f391ad264b219b87a3efebc1edd3995ca8f8edd31d9d52bd3391ffc40c8d22964d6b76a152fe0364b472b5ddcec0ee SHA512 a189c0e44d09fb0b0fbd4c46e7fd4fb98a2af485174af2a8bbd176ccd4d4abd55f364236b6113b6ef32681d30131ff4c698b098f3c13fcac2544ef1a123f641e
-DIST qimageblitz-0.0.6.tar.bz2 57617 SHA256 9f102269dec50641440e23a449df215a0db9efef9a3969939d618c5e78a5010f SHA512 dbd506c01622824efdec69640eb95e737d7848fa15d33351084a6499ca2321d7bc08e080d1e443f8ab9015cd2967c10d9b5aa2f3c6eaa7558153821c46133af9 WHIRLPOOL e13f5c11e2094296af558de4e9054d3c5a162be5e40a0418c5a505e222fe749c8dac319defc25bc2a2b6a5238e5d1fefb966fd64198d43b6b8af99d608362b45
 DIST qimageblitz-0.0.6_p20131029.tar.xz 43428 SHA256 256e7b4d7cfb6f061c6957ebdc6066e3a7fbf1d62b9ced35dc9c5467e5551622 SHA512 2a32105aed52ea33fbd46702a2b7cdd9671efef9bb52209ede534abc95ac40dd9ae2bd22cf09b30a309337653c4a754c50ef3fe4ad0aad7d4ffd0b5994a85981 WHIRLPOOL fd1593c7f77a334be4189bc6c3bdf365dd54363023318f3e25b0dd1aa53231b8d915582352ca29da35dd8a0d30958d120dd67cd4aaf2c81af79eb0e8388776cd
-EBUILD qimageblitz-0.0.6-r2.ebuild 1126 BLAKE2B d22b3c0d587e323fa717e99eeb8b96705fca9154d7a9c54c321fc26d364b2b123a73519bef753abe777464545599aa59deaa2babcfde103261cd01134fdf2707 SHA512 20d0ff8efa5e3880956b56d3cf535fffb15e5a3584faf60d4e68c85cd159b288da323b325cc176e275e9e54e55c130684469a32875a6f0c50ef665dd47e88965
-EBUILD qimageblitz-0.0.6_p20131029.ebuild 1078 BLAKE2B 3a626505196b7ce3919063f5736aefaad6743e464c3186ddd09843cdaa370dd29813ac2c37d3b4931d370d5ab851b41945a39fe1329b76637bf5ac82e01170fd SHA512 99c3f2c70e4ff5ca60cfa33233b13d3fe8e935b115d14aa4d949cbed87b7cb79d60a2e502ee6846be81c7a200d0e2d69989f50b35b3067f5cdab5f1f91e1673c
+EBUILD qimageblitz-0.0.6_p20131029.ebuild 1004 BLAKE2B 28718632f4d1bb357536b84ec936ac3c1146ec979cf178a672a2441edd0690142e789fbe269c4ee6e7f21856511f58457a98899aec8422ba72eedf6ad5386912 SHA512 50da125c7ec8bb2a7ddd103dc985df29e07870888724a6f3d0839fd0a55b0c0ac99acc726975cc3a85a3ff19538e0d7746c34bb2bdf6c324a4c8cbfd334d8438
 MISC metadata.xml 245 BLAKE2B 7d8aa6c42d332c65c417fb557b95907322f61713c6ee71b25af3944be1f2c693e2110598f877c28fe2bbef4a9fd064fe97c24a92092599d1c2df69e3e3676a60 SHA512 90bcfe500baf163912aaffc9958c9724c4a97cfca294cae6c2eea938f4ca7668c84b132b6dce55767efa47a28b9e87bb75e79634b59079ab8ef3eff3ea95968e
diff --git a/media-libs/qimageblitz/files/qimageblitz-0.0.6-cmake.patch b/media-libs/qimageblitz/files/qimageblitz-0.0.6-cmake.patch
deleted file mode 100644
index adb183de8f75..000000000000
--- a/media-libs/qimageblitz/files/qimageblitz-0.0.6-cmake.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: CMakeLists.txt
-===================================================================
---- a/CMakeLists.txt	(revision 1209280)
-+++ b/CMakeLists.txt	(revision 1209281)
-@@ -1,5 +1,7 @@
- project(blitz)
- 
-+cmake_minimum_required(VERSION 2.6.4)
-+
- set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules )
- find_package(Qt4 REQUIRED)
- # properly set up compile flags (QT_DEBUG/QT_NO_DEBUG, ...)
diff --git a/media-libs/qimageblitz/files/qimageblitz-0.0.6-exec-stack.patch b/media-libs/qimageblitz/files/qimageblitz-0.0.6-exec-stack.patch
deleted file mode 100644
index 170bd709aa11..000000000000
--- a/media-libs/qimageblitz/files/qimageblitz-0.0.6-exec-stack.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-Index: blitz/asm_scale.S
-===================================================================
---- a/blitz/asm_scale.S	(revision 1204247)
-+++ b/blitz/asm_scale.S	(revision 1204248)
-@@ -1,3 +1,4 @@
-+.section .note.GNU-stack,"",%progbits
- 
- #if defined(__EMX__)
- /* Due to strange behaviour of as.exe we use this macros */
diff --git a/media-libs/qimageblitz/files/qimageblitz-0.0.6-gcc.patch b/media-libs/qimageblitz/files/qimageblitz-0.0.6-gcc.patch
deleted file mode 100644
index b956d2dfd595..000000000000
--- a/media-libs/qimageblitz/files/qimageblitz-0.0.6-gcc.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- a/blitz/CMakeLists.txt
-+++ b/blitz/CMakeLists.txt
-@@ -31,12 +31,8 @@
- 
- if(HAVE_MMX)
-     if(NOT APPLE AND NOT WIN32)
-+	enable_language(ASM)
-         set( blitz_LIB_SRCS ${blitz_LIB_SRCS} asm_scale.S )
--        add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/asm_scale.o
--            COMMAND gcc -c ${CMAKE_CURRENT_SOURCE_DIR}/asm_scale.S
--            DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/asm_scale.S )
--        set( blitz_LIB_EXTRA_SRCS ${CMAKE_CURRENT_BINARY_DIR}/asm_scale.o )
--        set(HAVE_EXTERNAL_ASM TRUE)
-     endif(NOT APPLE AND NOT WIN32)
- endif(HAVE_MMX)
- configure_file (config-processor.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-processor.h )
diff --git a/media-libs/qimageblitz/qimageblitz-0.0.6-r2.ebuild b/media-libs/qimageblitz/qimageblitz-0.0.6-r2.ebuild
deleted file mode 100644
index 6351794a4d11..000000000000
--- a/media-libs/qimageblitz/qimageblitz-0.0.6-r2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="Graphical effect and filter library by KDE"
-HOMEPAGE="https://websvn.kde.org/trunk/kdesupport/qimageblitz/"
-SRC_URI="mirror://kde/stable/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2"
-KEYWORDS="amd64 ~arm ~hppa ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
-SLOT="0"
-IUSE="cpu_flags_x86_3dnow altivec debug cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2"
-
-DEPEND="
-	dev-qt/qtcore:4
-	dev-qt/qtgui:4
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${P}-exec-stack.patch"
-	"${FILESDIR}/${P}-gcc.patch"
-	"${FILESDIR}/${P}-cmake.patch"
-)
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# bug 581824: use system find module for Qt4
-	rm -f cmake/modules/FindQt4.cmake || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DHAVE_ALTIVEC=$(usex altivec)
-		-DHAVE_3DNOW=$(usex cpu_flags_x86_3dnow)
-		-DHAVE_MMX=$(usex cpu_flags_x86_mmx)
-		-DHAVE_SSE=$(usex cpu_flags_x86_sse)
-		-DHAVE_SSE2=$(usex cpu_flags_x86_sse2)
-	)
-
-	cmake-utils_src_configure
-}
diff --git a/media-libs/qimageblitz/qimageblitz-0.0.6_p20131029.ebuild b/media-libs/qimageblitz/qimageblitz-0.0.6_p20131029.ebuild
index 77f2455adfc0..90763d078ddc 100644
--- a/media-libs/qimageblitz/qimageblitz-0.0.6_p20131029.ebuild
+++ b/media-libs/qimageblitz/qimageblitz-0.0.6_p20131029.ebuild
@@ -12,18 +12,12 @@ SRC_URI="https://dev.gentoo.org/~asturm/distfiles/${P}.tar.xz"
 LICENSE="GPL-2 LGPL-2"
 KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
 SLOT="0"
-IUSE="altivec cpu_flags_x86_3dnow cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 debug qt5"
+IUSE="altivec cpu_flags_x86_3dnow cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 debug"
 
 DEPEND="
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-	)
-	!qt5? (
-		dev-qt/qtcore:4
-		dev-qt/qtgui:4
-	)
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
 "
 RDEPEND="${DEPEND}"
 
@@ -31,7 +25,7 @@ PATCHES=( "${FILESDIR}/${P}-gcc.patch" )
 
 src_configure() {
 	local mycmakeargs=(
-		-DQT4_BUILD=$(usex !qt5)
+		-DQT4_BUILD=OFF
 		-DHAVE_3DNOW=$(usex cpu_flags_x86_3dnow)
 		-DHAVE_MMX=$(usex cpu_flags_x86_mmx)
 		-DHAVE_SSE=$(usex cpu_flags_x86_sse)