gentoo resync : 14.05.2020

3 files changed, 3 insertions, 63 deletions

diff --git a/media-video/videotrans/Manifest b/media-video/videotrans/Manifest
index 8cb1c6dab1f8..d7f65d59e1c7 100644
--- a/media-video/videotrans/Manifest
+++ b/media-video/videotrans/Manifest
@@ -1,4 +1,3 @@
-AUX videotrans-1.6.1-libav.patch 2171 BLAKE2B 998906434b8c7da81646ae8565015871d90927e18999c7e4b9204d1dfd7c88e3d5ba4205b25f3bafcdd249be49ea77149f47f68c9f35e8fdd82408fc00262beb SHA512 0e51b01f0ed54dc9f2d7952c8d0cd2574ce7122bafc1baf7288d7a57f7dd6999fae9aa1ca85dc3d6a20969d79aaf9c22a6e3dbfa6314b377ea6fd29cfd630626
 DIST videotrans-1.6.1.tar.bz2 98091 BLAKE2B 47adcceb81889979a3af14deb214369fac792fd340e47383b8296082071db9d5b53f389869b478f4ea0faaf14744a99f9538750f6267e60e0683fc6156b701d9 SHA512 8d2ab30316d099d7bf37e712eab04089bcc24d2f8b59cb1fd464970a66ca1c480e4b9bb67b0a3e26b509c7711e92ea346713e3ec5d2fd3e8d4ff0a4372e2787a
-EBUILD videotrans-1.6.1-r2.ebuild 871 BLAKE2B 185a3c0d957b1ef6e765732cfe615606fbea5683b7fd6563355ba61f0081cf5ae59945ccb53e97e6b5a98024d6daece0c5274323bdbc7aad28ad5093cbd78532 SHA512 bd71a23229b503d6d6c7f1d0e774d6f3df4a4a325604347e3a2812fe3aef6195d4b30b86a6c27ebfef40c4e47ae9039c1c6571e3e20ab2fa956f78864de2fc7d
+EBUILD videotrans-1.6.1-r2.ebuild 698 BLAKE2B e3da74c005c63245ab6bcdc27ff74402d0e677915949d4ece86708d1af00c94a199becfbaf72c800d39074c70c8ab637ec3d5a1a5f80c86d7ba503e5cb05d410 SHA512 16f393be9e235780d29e0edf6e53cbe1e50fc327b937bb13452deddd327563039e8f9a69667b0d59b8082c03f615baf49789995b2dcf5cf4438c37b15f62b57f
 MISC metadata.xml 626 BLAKE2B 499cc48b705cf9924da80a3a4739a86e5eddcabd27606de27b0da8e27cafff80fd685338c71e61a764626f1bff137a95018b6ed6fa82c250605223984276209a SHA512 f5ffbd260504fbd9c4594b42494b809c9341ec93786958ce06e6e866b83c6f23645e3a8a69d4739bf4d43b224100a48381b45e172f453202972b1a71a76e31f0
diff --git a/media-video/videotrans/files/videotrans-1.6.1-libav.patch b/media-video/videotrans/files/videotrans-1.6.1-libav.patch
deleted file mode 100644
index 2b4cd0a15b8e..000000000000
--- a/media-video/videotrans/files/videotrans-1.6.1-libav.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-Description: Migrate from ffmpeg to avconv.
-Author: Alessio Treglia <alessio@debian.org>
----
- data/library.sh.in  |    8 ++++----
- src/movie-title.in  |    2 +-
- src/movie-to-dvd.in |    2 +-
- 3 files changed, 6 insertions(+), 6 deletions(-)
-
---- videotrans.orig/data/library.sh.in
-+++ videotrans/data/library.sh.in
-@@ -250,15 +250,15 @@ audio_params()
- 	then
- 		if [ "${force_or_auto}" = "ac3" ]
- 		then
--			msg="${msg}Converting the audio from WAV to AC3 with ${new_ch} channels using ffmpeg. "
-+			msg="${msg}Converting the audio from WAV to AC3 with ${new_ch} channels using avconv. "
- 			if [ "${audio_bitrate_override}" != "auto" -a "${audio_bitrate_override}" != "" ]
- 			then
--				audio_encode="ffmpeg -y -v 0 -f wav -i /dev/stdin -ab ${audio_bitrate_override}k -ar 48000 -ac ${new_ch} `shellescape "${output}.ac3"`"
-+				audio_encode="avconv -y -v 0 -f wav -i /dev/stdin -b:a ${audio_bitrate_override}k -ar 48000 -ac ${new_ch} `shellescape "${output}.ac3"`"
- 			elif [ "${new_ch}" = "2" ]
- 			then
--				audio_encode="ffmpeg -y -v 0 -f wav -i /dev/stdin -ab 192k -ar 48000 -ac ${new_ch} `shellescape "${output}.ac3"`"
-+				audio_encode="avconv -y -v 0 -f wav -i /dev/stdin -b:a 192k -ar 48000 -ac ${new_ch} `shellescape "${output}.ac3"`"
- 			else
--				audio_encode="ffmpeg -y -v 0 -f wav -i /dev/stdin -ab 448k -ar 48000 -ac ${new_ch} `shellescape "${output}.ac3"`"
-+				audio_encode="avconv -y -v 0 -f wav -i /dev/stdin -b:a 448k -ar 48000 -ac ${new_ch} `shellescape "${output}.ac3"`"
- 			fi
- 			audio_ext="ac3"
- 		else
---- videotrans.orig/src/movie-title.in
-+++ videotrans/src/movie-title.in
-@@ -961,7 +961,7 @@ else
- 			\> "${TEMP}.mplayer" 2\>\&1 \< /dev/null \&
- 		mplayer_pid="$!"
- 
--		# Start mp2enc or ffmpeg to encode the audio
-+		# Start mp2enc or avconv to encode the audio
- 
- 		{
- 			< "${TEMP}.wav" $audio_filter_cmd | eval ${audio_encode}
---- videotrans.orig/src/movie-to-dvd.in
-+++ videotrans/src/movie-to-dvd.in
-@@ -698,7 +698,7 @@ do
- 	} > "${TEMP}.video" 2>&1 &
- 	video_enc_pid="$!"
- 
--	# Start mp2enc or ffmpeg to encode the audio
-+	# Start mp2enc or avconv to encode the audio
- 
- 	{
- 		< "${TEMP}.wav" $audio_filter_cmd | eval ${audio_encode}
diff --git a/media-video/videotrans/videotrans-1.6.1-r2.ebuild b/media-video/videotrans/videotrans-1.6.1-r2.ebuild
index 969d72bc3b7f..ea33b07bb2a6 100644
--- a/media-video/videotrans/videotrans-1.6.1-r2.ebuild
+++ b/media-video/videotrans/videotrans-1.6.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,17 +11,12 @@ SRC_URI="mirror://sourceforge/videotrans/${P}.tar.bz2"
 LICENSE="BSD"
 SLOT="0"
 
-KEYWORDS="~amd64 ~ppc ~x86"
-
-IUSE="libav"
-
 DEPEND="
 	media-video/mplayer
 	media-video/mjpegtools[png]
 	media-video/dvdauthor
 	virtual/imagemagick-tools
-	libav? ( media-video/libav )
-	!libav? ( media-video/ffmpeg:0 )
+	media-video/ffmpeg:0
 "
 
 RDEPEND="${DEPEND}
@@ -36,6 +31,4 @@ src_prepare() {
 	# fixing LDFLAGS usage
 	sed -i -e 's|^\(LDFLAGS.*=\).*\( @LIBS@.*\)|\1\2 @LDFLAGS@|' src/Makefile.in
 
-	# Debian patch to support libav
-	use libav && epatch "${FILESDIR}"/${P}-libav.patch
 }