gentoo resync : 12.01.2019

8 files changed, 10 insertions, 39 deletions

diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index 73b1475d0fd1..911e46460778 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/dvdbackup/Manifest b/media-video/dvdbackup/Manifest
index 8ffeae5b36f1..8267bba491cd 100644
--- a/media-video/dvdbackup/Manifest
+++ b/media-video/dvdbackup/Manifest
@@ -1,5 +1,3 @@
-DIST dvdbackup-0.4.1.tar.bz2 188496 BLAKE2B 4a77b7e2a31616996aa5a5a78c19fb746f84dddf223a61d43aeb3d7db8ede481991d269afd9b73e1cb34077c8d8f83fe55b84c750e05541c35ad0fff2dfd52f1 SHA512 4f6fcb06f3bc9c0066e9cb51582707accc9629c8239f15d84a05a877927292449dda515796bd91069b1280ceb99dab50213cf6f3fbc79e6f56242923d9e2ae86
 DIST dvdbackup-0.4.2.tar.xz 178660 BLAKE2B 1403bd66861713803a2da00712318a6cb399d5c7640cadd27f55fb1cee4e0013364f17a2dc3c78dab819d4fdb8405d36e781d0f2abd1bfb49873b0992d5f2dcc SHA512 df9abb2ca0b8a7cd7855ddff94dae249b06b2ec0ee42f3e9c53aa46aebd9885bdf26dacecbd4a20ff5f642ea10c0c64b811d25c23802c8a2b1489281900fbe0d
-EBUILD dvdbackup-0.4.1.ebuild 648 BLAKE2B 30d98e8bfc71595373a1fd4cb719b545b382bed264ca38abe8b9307cae099ad931e51bc8af0fee62b66ea92575909521a803f4d2c0c3eb2e09269126829ca659 SHA512 698474016f08a7b3bc7eb3fa708266b4a6c009fdeb517c114d33e1cbc8532ce7c997b17b92bac8f8a4cd41e1a7393f04e1df6cfdc802354a9948840515a80c0e
-EBUILD dvdbackup-0.4.2.ebuild 647 BLAKE2B 7867aee74f641883e3f0b8afa08a8f921cc11f69514a09e94d0803a156a660824afd9f71efe69000fc22b652b2783bfe004b6f6f10d0d2cdbdd4a15d4c2e9522 SHA512 d2b9d265b8059bb4cfd8dff120e042faf47fe49e15d112e521428b08285f89384c03cd4289bd4c17a651aa2443e125f672c1f332a69a4da8afb762fccc0f824b
+EBUILD dvdbackup-0.4.2.ebuild 604 BLAKE2B cf68a21e6f1fa0a61bb38c2b0ce0c239a99c8ae3f10d9b18a9db9085eb577a49f59dc296cdf262ad10364ec5f820f1b6df91e99eba255c8ec3274b1d316e573e SHA512 d2eb3aca44d18613515037cef0ea9a268db5e637b950b70ee5e99ba7e77057aad5feeb06e192dc0c98e33aa66793a6322e7431f7f2231838b1219757cb18b014
 MISC metadata.xml 302 BLAKE2B 7d62d6d1c62ddc1245f787ac6faf77c317ce298033e48c17433c09ea2ff92acd05af2ffa44071df281a8da4bacaf6b3c35633475f0496af3a1515e038b1ec79c SHA512 85850b8f0f8de515d846da33fced47ff85195616dc93562edbc62f11bb1108a101cdcd0db7c54be28c17f56f8cea15af9839cfe34fe2b207ba002f770e9e205f
diff --git a/media-video/dvdbackup/dvdbackup-0.4.1.ebuild b/media-video/dvdbackup/dvdbackup-0.4.1.ebuild
deleted file mode 100644
index 4dc011b5d3a1..000000000000
--- a/media-video/dvdbackup/dvdbackup-0.4.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-DESCRIPTION="Backup content from DVD to hard disk"
-HOMEPAGE="http://dvdbackup.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-IUSE="nls"
-
-RDEPEND=">=media-libs/libdvdread-4.2.0_pre
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-
-DOCS=( AUTHORS ChangeLog NEWS README )
-
-src_configure() {
-	econf \
-		$(use_enable nls) \
-		--disable-rpath \
-		--docdir=/usr/share/doc/${PF}
-}
diff --git a/media-video/dvdbackup/dvdbackup-0.4.2.ebuild b/media-video/dvdbackup/dvdbackup-0.4.2.ebuild
index 6dadc6d95997..5580d11d6dff 100644
--- a/media-video/dvdbackup/dvdbackup-0.4.2.ebuild
+++ b/media-video/dvdbackup/dvdbackup-0.4.2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
 DESCRIPTION="Backup content from DVD to hard disk"
 HOMEPAGE="http://dvdbackup.sourceforge.net/"
@@ -17,8 +17,6 @@ RDEPEND=">=media-libs/libdvdread-4.2.0_pre
 DEPEND="${RDEPEND}
 	nls? ( sys-devel/gettext )"
 
-DOCS=( AUTHORS ChangeLog NEWS README )
-
 src_configure() {
 	econf \
 		$(use_enable nls) \
diff --git a/media-video/guvcview/Manifest b/media-video/guvcview/Manifest
index d79d764a3d33..4f1050eb44e2 100644
--- a/media-video/guvcview/Manifest
+++ b/media-video/guvcview/Manifest
@@ -2,5 +2,5 @@ AUX ffmpeg4.patch 7046 BLAKE2B 570d5a582bd76a11be2fa444cdce9c178590235eb7f1b7658
 DIST guvcview-src-2.0.5.tar.gz 1134237 BLAKE2B 6165349005a07e3e9ea555a7b4aa731ec218f8073dfce8ac5036dd3ccbe4228aeb3b29491c8ad545d5b5ab193045704a60bfcd48459bfc56ad923b583c08f5be SHA512 b4a1216ab2effbd0022d5ba0ce266ac06a781e453d3dbedfe29b654864d3a26fe1e8b68245d76eff854281d42f1871a8a82b06f783b5115e94ec1c111aac05eb
 DIST guvcview-src-2.0.6.tar.gz 1131013 BLAKE2B ec8d7a82344e26890fe184d0edf77d0e415aa708bdf3cf55f96c555aaef479b1b7441a0425db035d10a6dc31f90282c169afff2d13684599ab1c005a5ea50ab1 SHA512 f73ba0a013f5afadb45c9bf60f723058ee31e99e204c951c49335a8ef9902a2caa752d6d51f6dd20ae960217cc25155e70efe4c49299a95e6780aaf8034078ec
 EBUILD guvcview-2.0.5.ebuild 1402 BLAKE2B 8601540bb8d20e7090138ffc2111d541858c9bfad0faad5d4df3e20ab86aff0e47df73d6dc4157c117051d15148511634f840b5312ba951ddfa8610e744e782b SHA512 a27b9958971f22e5f7c27fefd8c79e7446885a63e270fdad40ca199f1ac399964cc2c12f9ef20c420582dbfb8b237a4b9cda09c90c2a8a6dea43d58d7bc68616
-EBUILD guvcview-2.0.6.ebuild 1579 BLAKE2B 47e4635f1281666660f7a9c2f92b8ef80f08e663f09fc869006949790c117779b9cf42da81b1f0d117518147bdc48b3b685b2cbe24d7e7f210dc335fe518bb68 SHA512 a40bbc2033404fd765d67bce17fe8c61a50625d79745e6c0173727e2cd2edfaeecc9d4a52428cf76001f85effd183a8a5b50ca67df1b24d2aa349abd3ad0bb49
+EBUILD guvcview-2.0.6.ebuild 1658 BLAKE2B d265675c9cf22564d886ce510117092536c892f13673ab6d050d0f2c11f01be707ef5be0937e3c16657cd25cf4a76428181eb03836cd163a254751384fb6dcc2 SHA512 b5b4da68ae318a698de2c9860d0799bf5a706c34ce45efe781a0cc0dc5a30b2ac97380a7b6826ab4dea7cea5be857f96517dda9b38b39abcd5d43cb6ab72fd5b
 MISC metadata.xml 380 BLAKE2B 0059009c82869365d8ad9bd1266dbd048b97c3e24bad5d47e9598ae1f90a348395089faa27ae52982525dbd02a6ad3c48961c8b66eba9077a09ffde6f1a8eaf9 SHA512 6eb897ab0df42c6ecb1b5559eea22eccaca63cfa72f350361634b424baa1d7405175968930e57151164d2999e2d2db28e2606576994895259c065ae07d623f1d
diff --git a/media-video/guvcview/guvcview-2.0.6.ebuild b/media-video/guvcview/guvcview-2.0.6.ebuild
index bf243272b545..8f62edffa655 100644
--- a/media-video/guvcview/guvcview-2.0.6.ebuild
+++ b/media-video/guvcview/guvcview-2.0.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="gsl libav pulseaudio qt5"
 
 RDEPEND="
@@ -51,6 +51,7 @@ S="${WORKDIR}/${MY_P}"
 src_prepare() {
 	default
 	sed -i '/^docdir/,/^$/d' Makefile.am || die
+	echo "guvcview/gui_qt5_audioctrls.cpp" >> po/POTFILES.skip || die # bug 630984
 	eautoreconf
 }
 
diff --git a/media-video/vcdimager/Manifest b/media-video/vcdimager/Manifest
index 0da6906d1586..c3a4b59885a8 100644
--- a/media-video/vcdimager/Manifest
+++ b/media-video/vcdimager/Manifest
@@ -2,6 +2,6 @@ AUX vcdimager-0.7.24-libcdio-1.0.0.patch 7545 BLAKE2B 58426bd919e0c0cbe9703a33fc
 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
+EBUILD vcdimager-0.7.24.ebuild 1514 BLAKE2B 02c041f82bda11b33d20d7f1a422fc123d21266a396df8bf987158c032466f5115d81827f603fe664f9a806561fcd129755a0f51ec3d17a38bd0a0e8dbd2ff7a SHA512 28a15cb2d396ff3f4a16d7356c96f39ee75c9cbdcb5827408f3e2089bc88ca169a6ba0d0b9a5a69f1245441a6a225d7fd65ce7a60881f46f933df86707639f5f
 EBUILD vcdimager-2.0.1.ebuild 1400 BLAKE2B b9d1d864856f025c57536f6ebc3135bb8ca01fd61c072a18647166187772289354a243ac9876c5a52d85e7e2e0f9bc31f60bea9d0486350b0d3f415ee7544cd6 SHA512 d898fa4c3ad5ad1ad10cf6d66f98786c5f3ebd7ae5a83e04e7c13754f5a561450a8a62b266687bfef533e11613dea8855a424fd3cde59a1709d9400b81d56ba4
 MISC metadata.xml 223 BLAKE2B 1a772bb5add75cb4343b09bb2456adcd5e46896daaab4091ab64b667c5fa1a4adab0940015a3e755df3d6540b456694dc67ef9581d02d40c63b89290f8f83e43 SHA512 27b688917e0b1c4a75ea34c97d2d67d309573941492ab04124de11034f3b2796480f02408d86e2eba77ca2000722ea6606fe12a49622c04f9e2c1fa27b6fc8db
diff --git a/media-video/vcdimager/vcdimager-0.7.24.ebuild b/media-video/vcdimager/vcdimager-0.7.24.ebuild
index 7b2ce51b663b..5eece94aa347 100644
--- a/media-video/vcdimager/vcdimager-0.7.24.ebuild
+++ b/media-video/vcdimager/vcdimager-0.7.24.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,6 +16,7 @@ IUSE="+xml static-libs"
 
 RDEPEND="
 	>=dev-libs/libcdio-0.90-r1:0=[-minimal,${MULTILIB_USEDEP}]
+	<dev-libs/libcdio-1.0
 	dev-libs/popt
 	xml? ( dev-libs/libxml2:2 )
 "