gentoo resync : 07.01.2018

8 files changed, 7 insertions, 125 deletions

diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index d7832d91e342..346dca6cd509 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/dvgrab/Manifest b/media-video/dvgrab/Manifest
index 22d15f29b902..43e4be21f9a8 100644
--- a/media-video/dvgrab/Manifest
+++ b/media-video/dvgrab/Manifest
@@ -1,5 +1,4 @@
 AUX dvgrab-3.5-gcc6.patch 993 BLAKE2B 30242bea0152f7d5adff59a5b2e2965dafd21d37835b625321ace52b2aa06a6789eb2101ac06f35a2f548a26253a396446f8e0c961abbbeb7ac3aa1b1f5dbbe8 SHA512 db155702d050c58b7833c609e5e1a38f91256b5bf5b8c6c8619648e12851924fb0177ad7930f4dd77671bd6515abfd6059ed5ab5611aef9b6ba4e3c8260b88b0
 DIST dvgrab-3.5.tar.gz 205268 BLAKE2B c92cfbe3257b71fe0cd8b3e403080c5bd37a10d675ea0b3feafcf01f825229d102338cc7ff1084a5c3abee8b8299276737923177229629b4418aafff020cb5eb SHA512 7d9cae1661d27dbef1d0dcdf18966a0ab386d936803ff7d071a18e0303fca45631c9b27187a413adfa4391c395e5909e3b8dc5c543d529e7805550f1a3ee6735
-EBUILD dvgrab-3.5-r1.ebuild 703 BLAKE2B f90e5092fcd841ba80c2b48288e920fab267a08b9c78fa302969ff594779fae1e678fddaf91ebda56cae9a5e5296e95232ee7e6361fd313a2a4702e4ed2f498c SHA512 7b69a494b15e3983ad2b4bfc701f49e7b327befee32168d57ee8789b608f45a366229f20d4b4e9c3ed31caa4c007a214f3a6e0fb0c29937116fc43babf1a8ec3
-EBUILD dvgrab-3.5.ebuild 787 BLAKE2B c779f8b3c51b57cbd6f6640ceae2efb25ee6a6ab7d27360874acc2b60999f1e1ec7f99683882e38c54cd762afc0f6b88357c23ff7d1ea5ee1f6ff9b91a05ea52 SHA512 6c9a164a8837d2279710ef04744313edc2d210574615903ae079219b69f8036394df9d11eac390b7c44be77f7c1e23678058fca61347fd2c58edb9084b045590
+EBUILD dvgrab-3.5-r1.ebuild 715 BLAKE2B e7353533f14a1b291e258352d6c8bccc8500f97c0d98695b1aafcaf69f93be4a68386f16acf15c084f7d10669407ba30351a1b11bed2cba3760645e78a8e9b1b SHA512 9f1e98cb8bcc8e93bee1fa2a50e53928455ffe6cd9c8d5b0b577063562740f070bcde2fe46b9c40adaa1866be1ee5bc1f4e3fe59e4c07a97e9c713dc298444df
 MISC metadata.xml 305 BLAKE2B 3d3abfc411049dbe9748c1483c791a03abb9ee4a52d1c4ea5a86aae2873144bcd7c14b7c093a7aad13f51bc4851ea3bedfcc8bb971439bb1173f85ed2ad7026d SHA512 957b950aea4b4ee25ebd490de7176fc07213a64237b20ccd17eb34e37246f133d86f9f726f64d71d4ebdd27b088e2259d6ffec85ea1221108becf559283b07ec
diff --git a/media-video/dvgrab/dvgrab-3.5-r1.ebuild b/media-video/dvgrab/dvgrab-3.5-r1.ebuild
index b47cedd70929..4729214c762c 100644
--- a/media-video/dvgrab/dvgrab-3.5-r1.ebuild
+++ b/media-video/dvgrab/dvgrab-3.5-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 DESCRIPTION="Digital Video (DV) grabber for GNU/Linux"
-HOMEPAGE="http://www.kinodv.org/"
+HOMEPAGE="https://github.com/ddennedy/dvgrab"
 SRC_URI="mirror://sourceforge/kino/${P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/media-video/dvgrab/dvgrab-3.5.ebuild b/media-video/dvgrab/dvgrab-3.5.ebuild
deleted file mode 100644
index 789b98b6698c..000000000000
--- a/media-video/dvgrab/dvgrab-3.5.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-DESCRIPTION="Digital Video (DV) grabber for GNU/Linux"
-HOMEPAGE="http://www.kinodv.org/"
-SRC_URI="mirror://sourceforge/kino/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 x86"
-IUSE="jpeg quicktime"
-
-RDEPEND=">=sys-libs/libraw1394-1.1
-	>=media-libs/libdv-0.103
-	>=media-libs/libiec61883-1
-	>=sys-libs/libavc1394-0.5.1
-	jpeg? ( virtual/jpeg )
-	quicktime? ( media-libs/libquicktime )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_compile() {
-	econf $(use_with quicktime libquicktime) $(use_with jpeg libjpeg)
-	emake || die "emake failed."
-}
-
-src_install () {
-	emake DESTDIR="${D}" install || die "emake install failed."
-	dodoc AUTHORS ChangeLog NEWS README TODO
-}
diff --git a/media-video/kmplayer/Manifest b/media-video/kmplayer/Manifest
index f5972756fded..91b3e3670a4a 100644
--- a/media-video/kmplayer/Manifest
+++ b/media-video/kmplayer/Manifest
@@ -6,5 +6,4 @@ AUX kmplayer-0.12.0b-qt-5.9.patch 1097 BLAKE2B 093961b12c4482303c43b603ad30c5fb4
 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.ebuild 2103 BLAKE2B a60e24e72562d7cc85741bfd6c384bb626790714221ee0f670e3221a80923c87bbbedbabd0622cefbfc657c5be3b3fc4e6e03f5cef03cdf926f1287109ecfb34 SHA512 3e64bf1ecca26da93c2e6417a811a9610d7cd5ba4b5216bb53891bc47b4215dbe845bb0d68ea9532f0ac12e9f398f17727382468e6b4e67e05e7afe7cb80933f
 MISC metadata.xml 475 BLAKE2B 3c086dc3f1ddb849cf673de7aa73a3d68bc7f24537af193dca8e4f65fe28147f85b05bb8c88d591df95fb1f001ae2fe8b5f414eaf10cc314363c91185b4eb0da SHA512 0f45fbd4596c4e885093addcf323d7c53a5d550f91bd9bf0bcf5bc18cd9a808caac52dee949ad5437a1e6827b1b6bbd42a81a563eb648ebad64a6a7a6c34e37f
diff --git a/media-video/kmplayer/kmplayer-0.12.0b.ebuild b/media-video/kmplayer/kmplayer-0.12.0b.ebuild
deleted file mode 100644
index 91517704d76a..000000000000
--- a/media-video/kmplayer/kmplayer-0.12.0b.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="true"
-inherit kde5
-
-DESCRIPTION="Video player plugin for Konqueror and basic MPlayer frontend"
-HOMEPAGE="https://kmplayer.kde.org"
-SRC_URI="mirror://kde/stable/${PN}/${EGIT_BRANCH}/${P}.tar.bz2"
-
-LICENSE="GPL-2 FDL-1.2 LGPL-2.1"
-KEYWORDS="amd64 x86"
-IUSE="cairo npp"
-
-CDEPEND="
-	$(add_frameworks_dep kbookmarks)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdelibs4support)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kmediaplayer)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtx11extras)
-	$(add_qt_dep qtxml)
-	media-libs/phonon[qt5(+)]
-	x11-libs/libX11
-	x11-libs/libxcb
-	cairo? ( x11-libs/cairo[xcb] )
-	npp? (
-		dev-libs/dbus-glib
-		dev-libs/glib:2
-		www-plugins/adobe-flash:*
-		>=x11-libs/gtk+-2.10.14:2
-	)
-"
-DEPEND="${CDEPEND}
-	sys-devel/gettext
-"
-RDEPEND="${CDEPEND}
-	media-video/mplayer
-	!media-video/kmplayer:4
-"
-
-PATCHES=( "${FILESDIR}/${P}-qt-5.9.patch" )
-
-src_prepare() {
-	kde5_src_prepare
-
-	if use npp; then
-		sed -i src/kmplayer_part.desktop \
-		-e ":^MimeType: s:=:=application/x-shockwave-flash;:" || die
-	fi
-}
-
-src_configure() {
-	# 0.12: expat build broken, check in later releases
-	local mycmakeargs=(
-		-DKMPLAYER_BUILT_WITH_EXPAT=OFF
-		-DKMPLAYER_BUILT_WITH_CAIRO=$(usex cairo)
-		-DKMPLAYER_BUILT_WITH_NPP=$(usex npp)
-	)
-
-	kde5_src_configure
-}
-
-src_install() {
-	kde5_src_install
-
-	if use npp; then
-		kwriteconfig5 --file "${ED}/usr/share/config/kmplayerrc" --group "application/x-shockwave-flash" --key player npp
-		kwriteconfig5 --file "${ED}/usr/share/config/kmplayerrc" --group "application/x-shockwave-flash" --key plugin /usr/lib/nsbrowser/plugins/libflashplayer.so
-	fi
-}
diff --git a/media-video/tsmuxer/Manifest b/media-video/tsmuxer/Manifest
index 984c6bd7dbd1..28c052ae6604 100644
--- a/media-video/tsmuxer/Manifest
+++ b/media-video/tsmuxer/Manifest
@@ -1,6 +1,6 @@
 DIST tsMuxeR_shared_1.10.6.tar.gz 640010 BLAKE2B aa60341e372d7537ea881ac481f7052af3cc0db5d2eb61687bc23ebdaefcaa8b04f9a4e02075489911c885563f172ec64fd3f54779d130f404ac96378d839ecc SHA512 64d5214a84ae1d2fdbaad214ff9586007ed1d88e7d0e18d866dfe4e75cf371de52e4c05eb1d67d0b9c7c2f9cd5ca87b4dbb2b113e81361ba658aa1fecca115d6
 DIST tsmuxer-2.6.11.tar.gz 538798 BLAKE2B 18f5f9002e356664ae84343afbadcddd447743404bcdcca709ba039ebb2ab05e5fba7eda0f30c86c29e18040d646004d1aec7dec34ed008ddbdb15228c63f09d SHA512 25b552153b76231ac1b88858d2178564d22edd18c6b08dc872765ac214ca6fd1ff6df5c5fff0f24647ea35f3f990e364bfb8adff5dd79c69cc12875fafb4f137
 DIST tsmuxer-icon.png 1634 BLAKE2B 400a1101ae382264d66a07e389157f055a7346c80065be159ffda6ce8c28450c1ff954b50fd1ce6df05384fdb892eeab7319bc42f154878c2fccfb5638b90a3d SHA512 4af3b1bd0e1a2c8379773e16121aa1c0ae749a3a9b9fdef0622991ea4ea632f51fbd91af0f6b5a415c28b375bd71adde2e9aacfb8b495242168cc97e1c8bf4ff
-EBUILD tsmuxer-1.10.6-r1.ebuild 1847 BLAKE2B 7316652ccfc87a0fa8a6295aae100e4d9860c704c26faaef12818cad47f04a1f972771e14f7aaa6883b59dbbe7ea9e6d3e22f7f094c2af377499d7be43909ac1 SHA512 c83969d2f7d050010b8ac2d78b2a231140955f854e09a58feb8b7be299fd7affcee4f4ea38b899b6d8538f56562822d61fec717ec96ba5f0b671af1c14f991e6
+EBUILD tsmuxer-1.10.6-r1.ebuild 1841 BLAKE2B 88dd2d6a43c2772787b7a2be1d07c54e0e03ac9df095118570eda6ac26e8ef5c6b92b24c70c6d245a7d73b9132e695f72ca0e86dd71cec85dcb384e4fbe93202 SHA512 7dc81a67b021580d395caec24a067646a77569a493f5a0f3568f70a14ca4b776b5be398c7da6958c643967f2ec129113d253d6cc4834a74e099d15b5d23e5878
 EBUILD tsmuxer-2.6.11.ebuild 1579 BLAKE2B 4ac8a08e0051002674b3e76983ca73423c941a7d2be5eeb8b0128f3cb5906799afdd014c5bc74861fcc6c91c2b8d58a7da05e91ed86a1dc49f0e64244c659535 SHA512 8c381c1db6dfa56dd668a9963bd6dde4b8221382f8455a99f49fa7db91f3fe3bcaffefb0eb6ea59461d8fb97ebd185968fad446ee43a919a23302c1b1bd733a3
 MISC metadata.xml 645 BLAKE2B 8361c4d4af9715af8709b464ca2ce53b3a826f448538f4ed9c631ad8be42cb67abe2dd39ef1dee8e3fc072634f3c186cdde51b5e7acf88097f4b60d4cfa25ad7 SHA512 66d7f11ae0acb6082f91b40fc3c5990f0f957a82d722bee2958b9cc3ea0bcd2e094f4be0e1984397c6664267328ef5212a2131a1fb20d191b3a81b6cf9d524a1
diff --git a/media-video/tsmuxer/tsmuxer-1.10.6-r1.ebuild b/media-video/tsmuxer/tsmuxer-1.10.6-r1.ebuild
index f01350190c79..5734f9720e38 100644
--- a/media-video/tsmuxer/tsmuxer-1.10.6-r1.ebuild
+++ b/media-video/tsmuxer/tsmuxer-1.10.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,7 +13,7 @@ LICENSE="SmartLabs"
 SLOT="0"
 
 KEYWORDS="~amd64 ~x86"
-IUSE="qt4 linguas_ru"
+IUSE="qt4 l10n_ru"
 
 QA_FLAGS_IGNORED="opt/${PN}/bin/tsMuxeR opt/${PN}/bin/tsMuxerGUI"
 
@@ -73,5 +73,5 @@ src_install() {
 		make_desktop_entry tsMuxerGUI "tsMuxeR GUI" "${PN}" "Qt;AudioVideo;Video"
 	fi
 
-	use linguas_ru && dodoc readme.rus.txt
+	use l10n_ru && dodoc readme.rus.txt
 }