gentoo resync : 22.10.2018

3 files changed, 13 insertions, 45 deletions

diff --git a/media-gfx/qimgv/Manifest b/media-gfx/qimgv/Manifest
index ab77a2471b93..c7cf16e75aeb 100644
--- a/media-gfx/qimgv/Manifest
+++ b/media-gfx/qimgv/Manifest
@@ -1,6 +1,4 @@
-DIST qimgv-0.6.3.tar.gz 238521 BLAKE2B 55da7c0e7b18547e7c2e2ab76f0a535c655c898707641c896469a07040e8f7f1a6e80580143016e24cdc0a7d9e2287c0d081ca8d262337faeea5d02168796a8e SHA512 c18ed0678bc094fedb339cfa227a5ddace6728b724f7640e4b018e52aa49dfb80d18879b372ab25bbf9e8c38497999471ba35a9bea5cd6b18d5ccbf1e55f3301
-DIST qimgv-0.7.tar.gz 273405 BLAKE2B c4f497eb132eeefa161e328f1ce246ff0a369e21b895cf85b68a69aaf446289ae0fc1170be9c424c32fc8659c196d1c7542938813edef30ea30f4e8509f22cfe SHA512 35fb8fbba75e08dad945fcbc679f449894c6eafc01ab0166b1929956dca636ccd25ba261c22c58a4d283aafa0690ca2c1f672092fc40c5b532f41944e4b0a9e3
-EBUILD qimgv-0.6.3.ebuild 725 BLAKE2B a8e13551c1f0105a584ca932c720b22ec84d8877b36af8a3bafb33ebf85f713760ab9461a26f5be0684d1b6f3d2a171d406853d5502b7261739d368aa98a9c10 SHA512 026c66f462c52b63af2273e8b09711d8a27827fc3ef74192ec5d8816798b45e3abaf10304b65816c31103f181914e32aeeb85b675598a4780778871d335dacb0
-EBUILD qimgv-0.7.ebuild 943 BLAKE2B 7d57f7a600040c8924f549eacd6aee23c2709034322a4c108dda1e757d511573f729f7adb101eab31bed570158b69bc555b0fc1c8b5b0725c06d97e5c91b2d37 SHA512 846fc84fb4a00dd929763c33579575b1b3fe55aaa5b9d5c6112ed02a0291f53d1a9fe057bfc5e8748f2bb5d585f916b6153279d6e8551ae099a5aa6d57a1b982
+DIST qimgv-0.7.1.tar.gz 273529 BLAKE2B 60f1f87c3347333f76224046776ca4303a03286593191feb18791dd7065ba714db387a1f8cbf6f16f04cab7190645edee4aba11f13d1ce6c0cb52d9b79042f18 SHA512 dd142377aca7248d00ac51d0732de94106e7471973de45d66e8905c476e5eb5f3543e98b1322390dc54946e7c518c1a8711bcde46fb67c376808e4049b22a630
+EBUILD qimgv-0.7.1.ebuild 1097 BLAKE2B 81a8236b34f9eb6c8d310a198f702f499b7749638797ddba906b114f49785bd19c141a7e4f4bf1e2e1f0485e2231f2e0b90ef4e55b441dbaa82c11198a2ed70c SHA512 d2305d48f4f8985ef5a35c34e3847b24aa82d6b8b3eb85fc7df431cef2216551d5c55b7e06065b2a2ba2578c383670186b9350df0d77d0d63ff963b7093295bf
 EBUILD qimgv-9999.ebuild 696 BLAKE2B 4341560b05ddf294b877cd659b3647e5409e55bb39b34161106bec650c451ae46a2398a0a0d78580b1db0f27582b409162e1c199023891df764d77c123809586 SHA512 cb1d5e0eaff96f45f4cb63d50f75033a035ea0687fc801f921b0ca0c63a6812331c3efa17fd957fd07564f8d2a340530bfd4114851dab827b94830dfd09f6670
 MISC metadata.xml 454 BLAKE2B bb9012bfbeff8b79f1f3a4de8b7e24bbb664d0137a92c8bde3189612e99ce7f94f4d135b5fcda3a935b8d3b8181e9ca882b073cbe26a6f7ace7d52ac0a57804f SHA512 3f2ec50c29ac720c91d61a5ede051eb62a58771974e8c9591ee9b3a98a8a8d0af2071b29c8e7abb842999559ab330f63b39d7de87c8a1d6fd560002e9bf7d107
diff --git a/media-gfx/qimgv/qimgv-0.6.3.ebuild b/media-gfx/qimgv/qimgv-0.6.3.ebuild
deleted file mode 100644
index 9226ed2e10a9..000000000000
--- a/media-gfx/qimgv/qimgv-0.6.3.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils gnome2-utils xdg-utils
-
-DESCRIPTION="A cross-platform image viewer with webm support. Written in qt5"
-HOMEPAGE="https://github.com/easymodo/qimgv"
-SRC_URI="https://github.com/easymodo/qimgv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	media-video/mpv[libmpv]
-"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-"
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/media-gfx/qimgv/qimgv-0.7.ebuild b/media-gfx/qimgv/qimgv-0.7.1.ebuild
index 7af9daad7bfc..dc7afe79d53d 100644
--- a/media-gfx/qimgv/qimgv-0.7.ebuild
+++ b/media-gfx/qimgv/qimgv-0.7.1.ebuild
@@ -15,10 +15,10 @@ KEYWORDS="~amd64 ~x86"
 IUSE="kde video"
 
 RDEPEND="
-	>=dev-qt/qtconcurrent-5.10.0
-	>=dev-qt/qtcore-5.10.0
-	>=dev-qt/qtgui-5.10.0
-	>=dev-qt/qtwidgets-5.10.0
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
 	kde? ( kde-frameworks/kwindowsystem:5 )
 	video? ( media-video/mpv[libmpv] )
 "
@@ -27,6 +27,13 @@ DEPEND="
 	virtual/pkgconfig
 "
 
+src_prepare() {
+	eapply_user
+	# respect make.conf CXXFLAGS
+	sed -i -e '/set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -O3")/d' CMakeLists.txt || die
+	cmake-utils_src_prepare
+}
+
 src_configure() {
 	local mycmakeargs=(
 		-DKDE_BLUR=$(usex kde)