gentoo resync : 19.04.2018

11 files changed, 36 insertions, 79 deletions

diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index bdaf42968913..7389bf8e7767 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/kmplayer/Manifest b/media-video/kmplayer/Manifest
index 91b3e3670a4a..5046cf21e102 100644
--- a/media-video/kmplayer/Manifest
+++ b/media-video/kmplayer/Manifest
@@ -2,8 +2,9 @@ AUX kmplayer-0.12.0b-cmake.patch 1494 BLAKE2B 51ce1dd8118e36f864588a02107868493c
 AUX kmplayer-0.12.0b-desktop.patch 1629 BLAKE2B 09640d28334f91753a01b9f799ad3929f578f0127cf2012b0fea96f342d389661ac06719ef78d8ca12386658e051433ba6a8a1b0b2ea20c82901e454cb240a6d SHA512 bf85ab238afae771ba99299d719bf398444efacdf3092ff93c0472b831a4996b11762573d9cd9ecba88e882cb7bb801780afe87652a1657afe7903d639d1678e
 AUX kmplayer-0.12.0b-devpixelratio.patch 1290 BLAKE2B 1b076e616f6a8bc645b4505101f95b0c30422f83ffd01c01277196eef9f69f2be5f73880dddf55700f3b94aec7fadc45582b42b93dd68b419c883274980a3220 SHA512 4090efd279df4f106e197886eaacce73a24b60edf6eebdd1811f84ff3eb4798505278d397327b1b07c3423774a45fe6de02455a8f0ba20548c074840c89ac0fa
 AUX kmplayer-0.12.0b-qfile.patch 1387 BLAKE2B 6c04f0dc3eeed0635397a22fe5dc5b6fe5215c16a03f6c1f05a77353daac5c6b1f77d277e746b5283feaf5ba50eab68947c16cee9b6ac6f0642ba3051323c85f SHA512 3cee584d1560e4b9cf7ba621c907e3e521f0e778f728728f476cee98babb49122428605468d65d366fd382ee79746dffb5002cd6a9205f1eff3c827b77152753
+AUX kmplayer-0.12.0b-qt-5.11b3.patch 943 BLAKE2B db0b5bbf4e36859693645cde5aa67b90e2b5ab5a2658a2ef5b944ffa2973be9ab2674506260cca9d6b63bc3b7dd6c4c48469539cea0530d922cf3b7bd5514b07 SHA512 74f7e835e918d5e44147bb23ce7ac2f03385825ef049557ef983c028602a04cabb59988f2a594ccc88147d24db2c9fb3cf85b31f4fd25a67801daccddb97844c
 AUX kmplayer-0.12.0b-qt-5.9.patch 1097 BLAKE2B 093961b12c4482303c43b603ad30c5fb49a97550da77641c4cb306eded8849df76eac0dcc441c2febf5523eb07abd1a494eee2335e02bd9d1bceacc87ccdf826 SHA512 137733705a879e87c59d26b1cb609aa9246d4543f758a0987fb1dee013d47ea469cdf7a19fa8aebe01a4643c5d7ed8b5e5f9057e9f80eaa3d3f5504fccaa48e9
 AUX kmplayer-0.12.0b-schedulerepaint.patch 2085 BLAKE2B a8c51d503de212b375cf77c41cf1c581c80decfdfe30cdd98ac0ff3f4b8a7bc335e921762808994c298db47e6327bb768838c00b41e8d20e6bb211a2c62ef6ff SHA512 e3c874ca5886d3a16eab0f10169009317214c8c196d9ce70b797f97f1ed2ed9143fb31e7f99d711a2c9ede26cb957f767fabbeb3c6670d430b1d4061a02982f1
 DIST kmplayer-0.12.0b.tar.bz2 599496 BLAKE2B c27b54cf05c52ffbb78c8f623b7cab066901f647c14364da1de2fcedd96329439521ad329fc15be58491b570de17fd151c95f266738e049501a5a22ba8dd9c93 SHA512 d34c496d0c24c6d5c1bb675b83fac60da5c9672e4076aed72bac2e9b333e88d031076e7e386ec7b61ae8ece88870f6187c61f483f425aa78edd1e443c7f2e882
-EBUILD kmplayer-0.12.0b-r1.ebuild 2411 BLAKE2B 8dbbdffc72deaddc831fd7c3ed2965befd532fc25206ff0a37ca3075d5e8ff5db25963eccbb82adba0cd5a7b602220035143273931c3a83613939d7b62a00b6d SHA512 acc899ef9080136d6ff976c37fd5676cd3b7c3ea04c4e1776e7c3408bcb951b49420b633d8622761f3c570694e79615ba92a96382890ee88dbdc2ce522abf56a
+EBUILD kmplayer-0.12.0b-r1.ebuild 2447 BLAKE2B 8919ccdc4a38f0d288f641e305c3bf32b3d1b60d433786024dfa5f4aec5b70dcbef057dfeedc74482738eac66720a1c8b626ebadfac7ee521b6a53cce2e25655 SHA512 2e4ac7e2089bc09762f140033c2ac38562f94e56cf4c07e08d14a3aea2a265fc587099cf01e444e19d21a2114132a42c08556f7351daf86e50796c52de1f074e
 MISC metadata.xml 475 BLAKE2B 3c086dc3f1ddb849cf673de7aa73a3d68bc7f24537af193dca8e4f65fe28147f85b05bb8c88d591df95fb1f001ae2fe8b5f414eaf10cc314363c91185b4eb0da SHA512 0f45fbd4596c4e885093addcf323d7c53a5d550f91bd9bf0bcf5bc18cd9a808caac52dee949ad5437a1e6827b1b6bbd42a81a563eb648ebad64a6a7a6c34e37f
diff --git a/media-video/kmplayer/files/kmplayer-0.12.0b-qt-5.11b3.patch b/media-video/kmplayer/files/kmplayer-0.12.0b-qt-5.11b3.patch
new file mode 100644
index 000000000000..8c91fa6c2ff3
--- /dev/null
+++ b/media-video/kmplayer/files/kmplayer-0.12.0b-qt-5.11b3.patch
@@ -0,0 +1,29 @@
+From 66b262c344deb6ac4924966a584e8aeb3d899180 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Tue, 17 Apr 2018 12:07:04 +0200
+Subject: [PATCH] Fix build with Qt 5.11_beta3 (dropping qt5_use_modules)
+
+---
+ src/CMakeLists.txt | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index f675d9a..57af1ed 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -161,9 +161,9 @@ qt5_add_dbus_adaptor(kphononplayer_SRCS org.kde.kmplayer.streamslave.xml
+ 
+ add_executable(kphononplayer ${kphononplayer_SRCS})
+ 
+-qt5_use_modules(kphononplayer Core DBus Widgets X11Extras)
+-
+-target_link_libraries(kphononplayer Phonon::phonon4qt5 ${XCB_LIBRARIES})
++target_link_libraries(kphononplayer Phonon::phonon4qt5 ${XCB_LIBRARIES}
++    Qt5::Core Qt5::DBus Qt5::Widgets Qt5::X11Extras
++)
+ 
+ install(TARGETS kphononplayer ${INSTALL_TARGETS_DEFAULT_ARGS})
+ 
+-- 
+2.17.0
+
diff --git a/media-video/kmplayer/kmplayer-0.12.0b-r1.ebuild b/media-video/kmplayer/kmplayer-0.12.0b-r1.ebuild
index 3c55fbb65624..bb6d4b92d3e4 100644
--- a/media-video/kmplayer/kmplayer-0.12.0b-r1.ebuild
+++ b/media-video/kmplayer/kmplayer-0.12.0b-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -61,6 +61,7 @@ PATCHES=(
 	"${FILESDIR}"/${P}-cmake.patch
 	"${FILESDIR}"/${P}-desktop.patch
 	"${FILESDIR}"/${P}-qt-5.9.patch
+	"${FILESDIR}"/${P}-qt-5.11b3.patch
 )
 
 src_prepare() {
diff --git a/media-video/vcdimager/Manifest b/media-video/vcdimager/Manifest
index 8511c0d27f17..533f65fa875f 100644
--- a/media-video/vcdimager/Manifest
+++ b/media-video/vcdimager/Manifest
@@ -1,5 +1,5 @@
 AUX vcdimager-0.7.24-libcdio-1.0.0.patch 7545 BLAKE2B 58426bd919e0c0cbe9703a33fc99f9aaaac6b4fa5130d8b39fab505d309741e7c301b2ace213e927a4399cb5b215b1a38b761c3d6ac9a25ddb32cfc7626844b4 SHA512 b49e8742627b6e0d56efd455230f78cb49a3337a376da39d9b77869835c1d34b8f4a826ae0f888fe0f81ce011a3f0e6dcf52479c34813594129fb2916c782c57
-AUX vcdimager-2.0.1-pkg-config.patch 345 BLAKE2B b81d2647903b6037d81b90c4eacd22bd8608c14f5728ef8e24dddcc5cc34a91bc950dba55acc3897d37d01dd326f8fa2b045c9720f918329cdfbadeb390e1a38 SHA512 03e7fe7460e701e3c44bd5950b6bde70c2a8ae102746d1a66ab544012c71989c4df5a639d7e49801cca3b3dd0f14ba53daf839658fe59be5080e57ff72eb1292
+AUX vcdimager-2.0.1-pkg-config.patch 347 BLAKE2B 082ac47630ce7289967a3dfb17c601ba90c01d15e87bedb61a78a44573a38ac0c0d8790bf2acca540c2dbe91f6a099b57032644dbb32d202c05709dddc17ffbe SHA512 e43827527b656e8813c41266e30a9f9e86a3a7dd67ff01de08088d78a775481914d7a6f1d472b80d53e93f09573e0b922006652626415fd5d7f6a9c3ca534468
 DIST vcdimager-0.7.24.tar.gz 1066815 BLAKE2B b58648a4ab54b3151448c2aa17306105ada45d9708375c7461c7f9087b851339f8288855c0d38d1521317b303c79b432b5e99b39ca7b8f59da8ae7aff7238582 SHA512 162f361d3c871c85887f0b25e70c207c511dcf597f337633be3ce925e8c589a8ba26275b8378d1002b8c5eb56995eda017f5f1cf52e52a38e9ff900acba7a214
 DIST vcdimager-2.0.1.tar.gz 1115207 BLAKE2B edf70212e81a89924e64115cae9eab77619f7e639e5529b85cc6a80c6ef4f4028c8a207bec86c41283b9768f6a0f56ef56adfad18c7bba20c315b1e5554a83a9 SHA512 55a9d235149a35fe26576703c623a2c9a3f7deedd2e42e01271fdf1e1fdf14c51ee040ee3b5d15fe1b5860fbd4cbeb437362b1a1f40187c8d4d691b6b89a2230
 EBUILD vcdimager-0.7.24.ebuild 1494 BLAKE2B d6d71aa03fef4ee2af9c7f160a8218448b4b2eb2f84b64726e5d38ac1a4a0a5f36ca5c69d896354ced7f2cf11b73324c9157ce917413d519b9dd96599c2bb781 SHA512 5800c746da2facc0537f54b40d3a66ed1b9065ae4e2e05cd6713712f366d435c3fe7c5b180642948d97eabd3950b4045ce1652891f69e26fe5a5f8223e72b072
diff --git a/media-video/vcdimager/files/vcdimager-2.0.1-pkg-config.patch b/media-video/vcdimager/files/vcdimager-2.0.1-pkg-config.patch
index 9d603b918697..a62ed7a256aa 100644
--- a/media-video/vcdimager/files/vcdimager-2.0.1-pkg-config.patch
+++ b/media-video/vcdimager/files/vcdimager-2.0.1-pkg-config.patch
@@ -1,5 +1,5 @@
---- /configure.ac
-+++ /configure.ac
+--- a/configure.ac
++++ b/configure.ac
 @@ -171,6 +171,8 @@
  dnl For vcdimager and vcdxbuild to be able to set creation time of VCD
  AC_CHECK_FUNCS(getdate strptime, , )
diff --git a/media-video/videocut/Manifest b/media-video/videocut/Manifest
deleted file mode 100644
index 8cccce4107d9..000000000000
--- a/media-video/videocut/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX 01-fix-hardened-ftbfs.diff 430 BLAKE2B faa5a68c83ed762fbff2ce5ed9271ae9afe10e11e65284e677870ff1006c61298dbe59ef875759dcce51fc01af57ad950f4a9b0ac6e516414a085d2641947576 SHA512 d3f08e83e07ff0c4aa1adffd693c27bf1d3fe5657852c20c06a4148e684adfde125d3be8add5cb9e1c9a2edbd794c43dfbbe32a53870261fdd6188cc055183e5
-AUX videocut 60 BLAKE2B c22c47c262abbc296a7fcc5a8bc231e693c04879b0eeadac41bb88d4a677736f089ed45e17a154344f897177786969bb052732f1d6b83f9e504549f873973132 SHA512 3dbf593688ae8516a896a33b7f9611af2ea859b87d43e99ebb97cd8e2041f1ba859dd7c40310fe0b837ecf637b27b97ce2445577ec6a38da8b120867a5e4942b
-DIST videocut_0.2.0.tar.gz 146915 BLAKE2B bf51cefc979fa35b85347e32bdc37e1b2e951cf4633ab36938d3247b54b7b44ea9656cd3e29a07fcbcebcbb8342168eeeb26aff69453eda0d67937f8f7f6c348 SHA512 878f42a8ffe19cd5d9e3f9380eb549ea7eeb6fc378b00a883c98760b7d6bba36bcd31477a21799c92c288b421538e17e42d641593f691f528f24b209eab21478
-EBUILD videocut-0.2.0.ebuild 823 BLAKE2B 71a429aea4ce849ee77a31c2d8933b9c6ee096e8e7684c9bbe030ffae640c621fbda2441aa65bfac7ddf2689a837c68c0feae97371ac95fb462016cb9f73b8a0 SHA512 0cb51cea17fac95119512a0b3838423f1fcb501643a86ca6a7e6e4b528b4dbe35e8d52f318c5ef60f90802ef2f42d96944252cb084c509b7d61c80a446beeeb4
-MISC metadata.xml 301 BLAKE2B 428736898b2be1d14d241eb99316ba945b44a41e0c5c504ceb72a997a2af78f91438830e513ffda913f50cd328c16cc1ec33527546d54fb6294060332a1d6c05 SHA512 08d8d487403d8f7f5c85c499faf72ea758f79412e93ae980ef061ca7ffc96b13f5033191d52a725c16388eefea6400a5f3abbb94f1251f0110427903666b7f8f
diff --git a/media-video/videocut/files/01-fix-hardened-ftbfs.diff b/media-video/videocut/files/01-fix-hardened-ftbfs.diff
deleted file mode 100644
index 47fe7f97842c..000000000000
--- a/media-video/videocut/files/01-fix-hardened-ftbfs.diff
+++ /dev/null
@@ -1,16 +0,0 @@
-# Fix FTBFS with enabled hardened flags and gcc-4.6 failure
-# https://bugs.gentoo.org/show_bug.cgi?id=380439
-
---- a/src/TPreviewPanel/TPreviewPanel.cpp
-+++ b/src/TPreviewPanel/TPreviewPanel.cpp
-@@ -167,7 +167,9 @@
- 
- void TPreviewPanel::adjustItems()
- {
--	backgroundRect->setSize(&QRectF(0, 0, 1, 1));
-+	QRectF myRect(0, 0, 1, 1);
-+	backgroundRect->setSize(&myRect);
-+
- 	logo->setSize(QRect(0, 0, 1, 1));
- 	
- 	// adjust meta text
diff --git a/media-video/videocut/files/videocut b/media-video/videocut/files/videocut
deleted file mode 100644
index 5a33c7232fcb..000000000000
--- a/media-video/videocut/files/videocut
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-cd /usr/share/videocut
-exec /usr/libexec/videocut
diff --git a/media-video/videocut/metadata.xml b/media-video/videocut/metadata.xml
deleted file mode 100644
index 4f5dd18f15c1..000000000000
--- a/media-video/videocut/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>media-video@gentoo.org</email>
-	</maintainer>
-	<upstream>
-		<remote-id type="google-code">videocut</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/media-video/videocut/videocut-0.2.0.ebuild b/media-video/videocut/videocut-0.2.0.ebuild
deleted file mode 100644
index 4e980534dda8..000000000000
--- a/media-video/videocut/videocut-0.2.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-
-inherit eutils qt4-r2
-
-DESCRIPTION="A program to create compositions from video files"
-HOMEPAGE="https://code.google.com/p/videocut/"
-SRC_URI="https://${PN}.googlecode.com/files/${PN}_${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-qt/qtgui:4
-	dev-qt/qtsvg:4
-	media-libs/xine-lib"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${P}.orig
-
-PATCHES=( "${FILESDIR}"/01-fix-hardened-ftbfs.diff )
-
-src_compile() {
-	emake || die
-	lrelease i18n/*.ts
-}
-
-src_install() {
-	exeinto /usr/libexec
-	doexe build/result/${PN} || die
-	dobin "${FILESDIR}"/${PN} || die
-	insinto /usr/share/${PN}/i18n
-	doins -r i18n/*.qm || die
-	domenu ${PN}.desktop
-	doicon videocut.svg
-	dodoc ABOUT AUTHORS THANKSTO
-}