gentoo resync : 02.03.2018

4 files changed, 40 insertions, 66 deletions

diff --git a/media-video/tsmuxer/Manifest b/media-video/tsmuxer/Manifest
index e3010067dd43..4b0ee516c843 100644
--- a/media-video/tsmuxer/Manifest
+++ b/media-video/tsmuxer/Manifest
@@ -1,4 +1,3 @@
 DIST tsmuxer-2.6.11.tar.gz 538798 BLAKE2B 18f5f9002e356664ae84343afbadcddd447743404bcdcca709ba039ebb2ab05e5fba7eda0f30c86c29e18040d646004d1aec7dec34ed008ddbdb15228c63f09d SHA512 25b552153b76231ac1b88858d2178564d22edd18c6b08dc872765ac214ca6fd1ff6df5c5fff0f24647ea35f3f990e364bfb8adff5dd79c69cc12875fafb4f137
-DIST tsmuxer-icon.png 1634 BLAKE2B 400a1101ae382264d66a07e389157f055a7346c80065be159ffda6ce8c28450c1ff954b50fd1ce6df05384fdb892eeab7319bc42f154878c2fccfb5638b90a3d SHA512 4af3b1bd0e1a2c8379773e16121aa1c0ae749a3a9b9fdef0622991ea4ea632f51fbd91af0f6b5a415c28b375bd71adde2e9aacfb8b495242168cc97e1c8bf4ff
-EBUILD tsmuxer-2.6.11.ebuild 1579 BLAKE2B 4ac8a08e0051002674b3e76983ca73423c941a7d2be5eeb8b0128f3cb5906799afdd014c5bc74861fcc6c91c2b8d58a7da05e91ed86a1dc49f0e64244c659535 SHA512 8c381c1db6dfa56dd668a9963bd6dde4b8221382f8455a99f49fa7db91f3fe3bcaffefb0eb6ea59461d8fb97ebd185968fad446ee43a919a23302c1b1bd733a3
-MISC metadata.xml 645 BLAKE2B 8361c4d4af9715af8709b464ca2ce53b3a826f448538f4ed9c631ad8be42cb67abe2dd39ef1dee8e3fc072634f3c186cdde51b5e7acf88097f4b60d4cfa25ad7 SHA512 66d7f11ae0acb6082f91b40fc3c5990f0f957a82d722bee2958b9cc3ea0bcd2e094f4be0e1984397c6664267328ef5212a2131a1fb20d191b3a81b6cf9d524a1
+EBUILD tsmuxer-2.6.11-r1.ebuild 794 BLAKE2B 600bcb9ff330fefb35a5b3dd26f91525416384420716d6433ab5c2681369754d1fa97b21068d1e787b3d9972466d02c37058472fefdb2f07ce352bf6dfe61052 SHA512 eebbbb239bac63e99cd797a6bc89f2c470021a271fcb2b44089c71d40dea17fe64e992f722b5493e0a0b171039c1f3db61fcd92fc940edd744491f27c2de846a
+MISC metadata.xml 572 BLAKE2B 244e20f96b8fc9ae813458ea873fb6dc9fb2f35208bda79a560bf9d014de331643f38c7734b507a7b41b6e59c5f73a0919f6467f03545e25f151de06435fbdce SHA512 8527c0daedfcbf7798518d8731fb6c2995b551b83f17d476a949d3b34e8df8a96cf5f85d78d01c6f5b621d8e5f243ceadde6af763b50f84aa24ec406b41a2714
diff --git a/media-video/tsmuxer/metadata.xml b/media-video/tsmuxer/metadata.xml
index fde90f475508..e55b2b581105 100644
--- a/media-video/tsmuxer/metadata.xml
+++ b/media-video/tsmuxer/metadata.xml
@@ -11,7 +11,4 @@
 		Dune HD Ultra, Sony Playstation3 and others). tsMuxeR is a part of
 		SmartCONTENT, content preparation solution.
 	</longdescription>
-	<use>
-		<flag name="qt4">Installs tsMuxerGUI (needs Qt4)</flag>
-	</use>
 </pkgmetadata>
diff --git a/media-video/tsmuxer/tsmuxer-2.6.11-r1.ebuild b/media-video/tsmuxer/tsmuxer-2.6.11-r1.ebuild
new file mode 100644
index 000000000000..8f2338996d71
--- /dev/null
+++ b/media-video/tsmuxer/tsmuxer-2.6.11-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Utility to create and demux TS and M2TS files"
+HOMEPAGE="http://forum.doom9.org/showthread.php?t=168539"
+SRC_URI="https://drive.google.com/uc?export=download&id=0B0VmPcEZTp8NekJxLUVJRWMwejQ -> ${P}.tar.gz"
+
+LICENSE="SmartLabs"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+QA_FLAGS_IGNORED="opt/${PN}/bin/tsMuxeR opt/${PN}/bin/tsMuxerGUI"
+
+DEPEND="|| (
+	>=app-arch/upx-ucl-3.01[lzma]
+	>=app-arch/upx-bin-3.01
+)"
+RDEPEND="
+	>=media-libs/freetype-2.5.0.1:2[abi_x86_32(-)]
+"
+
+S="${WORKDIR}"
+
+src_prepare() {
+	default
+	upx -d tsMuxeR tsMuxerGUI || die
+}
+
+src_install() {
+	dodir /opt/bin
+	exeinto /opt/${PN}/bin
+
+	doexe tsMuxeR
+	dosym ../${PN}/bin/tsMuxeR /opt/bin/tsMuxeR
+}
diff --git a/media-video/tsmuxer/tsmuxer-2.6.11.ebuild b/media-video/tsmuxer/tsmuxer-2.6.11.ebuild
deleted file mode 100644
index 65f1d359bc6e..000000000000
--- a/media-video/tsmuxer/tsmuxer-2.6.11.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils qt4-r2
-
-DESCRIPTION="Utility to create and demux TS and M2TS files"
-HOMEPAGE="http://forum.doom9.org/showthread.php?t=168539"
-SRC_URI="https://drive.google.com/uc?export=download&id=0B0VmPcEZTp8NekJxLUVJRWMwejQ -> ${P}.tar.gz
-	http://gentoo.sbriesen.de/distfiles/tsmuxer-icon.png"
-LICENSE="SmartLabs"
-SLOT="0"
-
-KEYWORDS="~amd64 ~x86"
-IUSE="qt4"
-
-QA_FLAGS_IGNORED="opt/${PN}/bin/tsMuxeR opt/${PN}/bin/tsMuxerGUI"
-
-DEPEND="|| (
-	>=app-arch/upx-ucl-3.01[lzma]
-	>=app-arch/upx-bin-3.01
-)"
-RDEPEND="
-	>=media-libs/freetype-2.5.0.1:2[abi_x86_32(-)]
-	qt4? (
-		>=dev-libs/glib-2.34.3:2[abi_x86_32(-)]
-		>=dev-qt/qtcore-4.8.5-r1:4[abi_x86_32(-)]
-		>=dev-qt/qtgui-4.8.5-r2:4[abi_x86_32(-)]
-		>=media-libs/fontconfig-2.10.92[abi_x86_32(-)]
-		>=media-libs/libpng-1.2.51:1.2[abi_x86_32(-)]
-		>=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)]
-		>=x11-libs/libICE-1.0.8-r1[abi_x86_32(-)]
-		>=x11-libs/libSM-1.2.1-r1[abi_x86_32(-)]
-		>=x11-libs/libX11-1.6.2[abi_x86_32(-)]
-		>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
-		>=x11-libs/libXrender-0.9.8[abi_x86_32(-)]
-	)
-"
-
-S="${WORKDIR}"
-
-src_prepare() {
-	upx -d tsMuxeR tsMuxerGUI || die
-}
-
-src_install() {
-	dodir /opt/bin
-	exeinto /opt/${PN}/bin
-
-	doexe tsMuxeR
-	dosym ../${PN}/bin/tsMuxeR /opt/bin/tsMuxeR
-
-	if use qt4; then
-		doexe tsMuxerGUI
-		dosym ../${PN}/bin/tsMuxerGUI /opt/bin/tsMuxerGUI
-		newicon "${DISTDIR}/${PN}-icon.png" "${PN}.png"
-		make_desktop_entry tsMuxerGUI "tsMuxeR GUI" "${PN}" "Qt;AudioVideo;Video"
-	fi
-}