gentoo resync : 25.08.2020

3 files changed, 36 insertions, 61 deletions

diff --git a/media-video/avidemux/Manifest b/media-video/avidemux/Manifest
index 999fca69c939..ec3ba6fb2a4a 100644
--- a/media-video/avidemux/Manifest
+++ b/media-video/avidemux/Manifest
@@ -1,7 +1,7 @@
-AUX avidemux-2.7.3-desktop.patch 678 BLAKE2B f903203996fddbe798f990b3092f4a0c578407933df153e05da19aa0a6bbfaa1bbd96f25b61787514c4272f94a0525e5fc5c0171744c2f87b04effc1a2907974 SHA512 68e6a0d3272ecf00aec63f513f50d39b7702eb59ecd85190483a93b03e7461964e9533656f2279bc00312c95418f415d159e15646790a1b0b9eb2ebd7f520b4f
 AUX avidemux-2.7.4-qt-5.15.patch 523 BLAKE2B 3fdbf41edb47f2827a2bb25d553b6adc9cc872c032762754ce182d75496f705be2e33b210587f436b7d30e1ff3db88fd1596bb5b85b011924244b9fe806816d1 SHA512 c651d4bf4f60d85c068ed1c7733481ea57f9528656bea50193e80006d8102100cb881737553a93dd9d1bfcf8216abb08463f494bebef5fec3fb217099c1c91fb
-DIST avidemux-2.7.3.tar.gz 23772654 BLAKE2B f946c267140bc8aebda2ce027ed8cb7c84a98a401255d3e0cdaf7498680e8bd9c78a33c122cb177d397ed2dd6bc3c29d7508578028c2964c2897279bf860b62d SHA512 d7761de1c40de1b824efbcf24173ea738a2e0ba7fa41cefa09e7bac3ec97f3af4b04201e36f9de50ade2b09e394aa99ed1d4907f90bb132f9896e8f1b5e82d7a
 DIST avidemux-2.7.4.tar.gz 23815808 BLAKE2B 3a7206f04f568f28dd4d5116c580dd780b057a59e94dd61a2abe5dadfa557291a0c50f917ad1926f9f9a82d01af065c06138f954320e2d9c174fda7583a6b265 SHA512 36d857837cd6a74039a414df16367cd8cbf615173bcc531e57dc0dbfc2e002b1c0c4a80cef73a0d8f25d305deca809af0b5cbcdbad8c311324fa2e64381fd10b
-EBUILD avidemux-2.7.3.ebuild 3830 BLAKE2B afde6461c3fbc56adc755c281070cfea51c21a93670675da2fcc7e21901370d2cfb666a38b2e592bd8746514de882286cb5f76e3736942b62670c30dfaee67ee SHA512 87670a0162268554bbe029d772c0a2a546a6db5765c1cec98bc4c70e78e17bedb8c8e855ba15eb2e733e9fd45112d3b045749cfc35c025a748eda98050549f93
+DIST avidemux-2.7.6.tar.gz 21963753 BLAKE2B 6ca343f90c37844ebfd61123badccefb7327cbf500723c031257cf26500a5b6d98955568c2a9c0d182af68f162e878459a51e6049485937f9b01b4439b32e5e0 SHA512 bc60c733168d40d5b39cc7dd1f74b3f1315e9727302478ef1621e18748bad3400bcfd4d5199862c3093ad9df51385b6b2a96f0f8fedf9bf1c00060327545fb0f
+DIST avidemux-i18n-2.7.6.tar.gz 2268693 BLAKE2B dedf6d015e6bbd58f432e05e72c4d8d175ce4f5567331b5e51e7a14d2a8180e92211efc172a4d7001a2947f46c2e910a485d42970b99df05c1ba12002974cfbf SHA512 26ada29c4b7c23739ddcc4ca1dc9819bbc64fa2b6472fd7ff5706905dbd9b382e7a7d69ba78f72afa6f3db55cf3c5373a5e2d244f1cf189aeb187984dd1f4187
 EBUILD avidemux-2.7.4-r1.ebuild 3649 BLAKE2B 7fafaf9d9a09be73cc6ad399522be034e8b208d1036e8b1c8c4b673d9bfa0ccec64b119ed7bf0823c81861cbad5e415c9b23394d2800e75cdb4feb7b1d0f6880 SHA512 b01a8cde8608f3c94af74673d1b1c8fb9b7233b1e77afd7b7631701b5ae8145435aa116a01c69cbd6addb005c25e62bc5e8421b8bdb4b757c71e3d30f4b0ce85
+EBUILD avidemux-2.7.6-r1.ebuild 3862 BLAKE2B e554f0a09e676032dc2e3a3bfcaba3fd8f35a87c66ae943a9f755159ae4ed7842388206b0b6119bb04b1ad2ce4b0d679457b4fb93da6549330fe5a0b7b74b01a SHA512 62c54beb01094d20fc739dcaa8811cb739c4baa2f0f1bc6766e466358305a6036e91a305fe4609ef0a71155a6051c7f8824cc4452e111124c40bba7ca6df3740
 MISC metadata.xml 489 BLAKE2B 51c28e4d932facf14fe99d0d18e736f16c754961e8fde468505f03c989e8ec3cb9afab9c916752468a5f9f0a07ad8d25da01e64cb987cfed1db835f657512b1e SHA512 7a1b885e05a9bb6684583dcaefc5853903330bbcfc6b1e07b76cde7405894d94e0f095fcfe18bc33bc24c1bbf260814c9ebb8219397e0e861a2fb5977361bc4d
diff --git a/media-video/avidemux/avidemux-2.7.3.ebuild b/media-video/avidemux/avidemux-2.7.6-r1.ebuild
index 5b4a9629c09b..33583b343b9e 100644
--- a/media-video/avidemux/avidemux-2.7.3.ebuild
+++ b/media-video/avidemux/avidemux-2.7.6-r1.ebuild
@@ -1,15 +1,15 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 CMAKE_MAKEFILE_GENERATOR="emake"
-
 inherit cmake desktop qmake-utils xdg
 
 DESCRIPTION="Video editor designed for simple cutting, filtering and encoding tasks"
 HOMEPAGE="http://fixounet.free.fr/avidemux"
-SRC_URI="https://github.com/mean00/avidemux2/archive/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/mean00/avidemux2/archive/${PV}.tar.gz -> ${P}.tar.gz
+	https://github.com/mean00/avidemux2_i18n/archive/${PV}.tar.gz -> ${PN}-i18n-${PV}.tar.gz"
 
 # Multiple licenses because of all the bundled stuff.
 LICENSE="GPL-1 GPL-2 MIT PSF-2 public-domain"
@@ -17,7 +17,9 @@ SLOT="2.7"
 KEYWORDS="~amd64 ~x86"
 IUSE="debug nls nvenc opengl qt5 sdl vaapi vdpau xv"
 
-COMMON_DEPEND="
+BDEPEND="dev-lang/yasm
+	qt5? ( dev-qt/linguist-tools:5 )"
+DEPEND="
 	~media-libs/avidemux-core-${PV}:${SLOT}[nls?,sdl?,vaapi?,vdpau?,xv?,nvenc?]
 	nvenc? ( amd64? ( media-video/nvidia_video_sdk:0 ) )
 	opengl? ( virtual/opengl:0 )
@@ -30,10 +32,7 @@ COMMON_DEPEND="
 	)
 	vaapi? ( x11-libs/libva:0= )
 "
-DEPEND="${COMMON_DEPEND}
-	qt5? ( dev-qt/linguist-tools:5 )
-"
-RDEPEND="${COMMON_DEPEND}
+RDEPEND="${DEPEND}
 	nls? ( virtual/libintl:0 )
 	!<media-video/avidemux-${PV}
 "
@@ -41,37 +40,37 @@ PDEPEND="~media-libs/avidemux-plugins-${PV}:${SLOT}[opengl?,qt5?]"
 
 S="${WORKDIR}/avidemux2-${PV}"
 
+src_unpack() {
+	default
+	mv -f -T avidemux2_i18n-${PV} "${S}"/avidemux/qt4/i18n >/dev/null || die
+}
+
 src_prepare() {
-	eapply "${FILESDIR}"/${P}-desktop.patch
+	eapply "${FILESDIR}"/${PN}-2.7.4-qt-5.15.patch
 
 	processes="buildCli:avidemux/cli"
-	if use qt5 ; then
-		processes+=" buildQt4:avidemux/qt4"
-	fi
+	use qt5 && processes+=" buildQt4:avidemux/qt4"
 
 	for process in ${processes} ; do
 		CMAKE_USE_DIR="${S}"/${process#*:} cmake_src_prepare
 	done
 
-	# Fix icon name -> avidemux-2.7
-	sed -i -e "/^Icon/ s:${PN}\.png:${PN}-${SLOT}:" appImage/${PN}.desktop || \
-		die "Icon name fix failed."
-
-	# The desktop file is broken. It uses avidemux2 instead of avidemux3
-	# so it will actually launch avidemux-2.7 if it is installed.
-	sed -i -e "/^Exec/ s:${PN}2:${PN}3:" appImage/${PN}.desktop || \
-		die "Desktop file fix failed."
 	if use qt5; then
-		sed -i -re '/^Exec/ s:(avidemux3_)gtk:\1qt5:' appImage/${PN}.desktop || \
+		# Fix icon name -> avidemux-2.7
+		sed -i -e "/^Icon/ s:${PN}\.png:${PN}-${SLOT}:" appImage/${PN}.desktop || \
+			die "Icon name fix failed."
+
+		# The desktop file is broken. It uses avidemux3_portable instead of avidemux3_qt5
+		sed -i -re '/^Exec/ s:(avidemux3_)portable:\1qt5:' appImage/${PN}.desktop || \
 			die "Desktop file fix failed."
-	fi
 
-	# QA warnings: missing trailing ';' and 'Application' is deprecated.
-	sed -i -e 's/Application;AudioVideo/AudioVideo;/g' appImage/${PN}.desktop || \
-		die "Desktop file fix failed."
+		# QA warnings: missing trailing ';' and 'Application' is deprecated.
+		sed -i -e 's/Application;AudioVideo/AudioVideo;/g' appImage/${PN}.desktop || \
+			die "Desktop file fix failed."
 
-	# Now rename the desktop file to not collide with 2.6.
-	mv appImage/${PN}.desktop ${PN}-${SLOT}.desktop || die "Collision rename failed."
+		# Now rename the desktop file to not collide with 2.6.
+		mv appImage/${PN}.desktop ${PN}-${SLOT}.desktop || die "Collision rename failed."
+	fi
 
 	# Remove "Build Option" dialog because it doesn't reflect
 	# what the GUI can or has been built with. (Bug #463628)
@@ -91,20 +90,17 @@ src_configure() {
 		-DGETTEXT="$(usex nls)"
 		-DSDL="$(usex sdl)"
 		-DLibVA="$(usex vaapi)"
+		-DOPENGL="$(usex opengl)"
 		-DVDPAU="$(usex vdpau)"
 		-DXVIDEO="$(usex xv)"
 	)
 
-	if use qt5 ; then
-		mycmakeargs+=(
+	use qt5 && mycmakeargs+=(
 			-DENABLE_QT5="$(usex qt5)"
 			-DLRELEASE_EXECUTABLE="$(qt5_get_bindir)/lrelease"
-		)
-	fi
+	)
 
-	if use debug ; then
-		mycmakeargs+=( -DVERBOSE=1 -DADM_DEBUG=1 )
-	fi
+	use debug && mycmakeargs+=( -DVERBOSE=1 -DADM_DEBUG=1 )
 
 	for process in ${processes} ; do
 		local build="${WORKDIR}/${P}_build/${process%%:*}"
@@ -132,10 +128,9 @@ src_install() {
 		BUILD_DIR="${build}" cmake_src_install
 	done
 
-	cd "${S}" || die "Can't enter source folder."
-	newicon ${PN}_icon.png ${PN}-${SLOT}.png
-
-	if use qt5 ; then
+	if use qt5; then
+		cd "${S}" || die "Can't enter source folder"
+		newicon ${PN}_icon.png ${PN}-${SLOT}.png
 		domenu ${PN}-${SLOT}.desktop
 	fi
 }
diff --git a/media-video/avidemux/files/avidemux-2.7.3-desktop.patch b/media-video/avidemux/files/avidemux-2.7.3-desktop.patch
deleted file mode 100644
index 51416d27495b..000000000000
--- a/media-video/avidemux/files/avidemux-2.7.3-desktop.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From 4ea6b2e4199eddef7748de4fd58c1f4d8bfbedd2 Mon Sep 17 00:00:00 2001
-From: eumagga0x2a <eumagga0x2a@users.noreply.github.com>
-Date: Sun, 4 Aug 2019 15:34:19 +0800
-Subject: [PATCH] [appImage] Add missing Type entry to the .desktop file
-
-Upstream-Status: Accepted
-[https://github.com/mean00/avidemux2/commit/4ea6b2e4199eddef7748de4fd58c1f4d8bfbedd2]
----
- appImage/avidemux.desktop | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/appImage/avidemux.desktop b/appImage/avidemux.desktop
-index 3006e4335..d017ff309 100644
---- a/appImage/avidemux.desktop
-+++ b/appImage/avidemux.desktop
-@@ -2,3 +2,4 @@
- Name=AVIDEMUX
- Exec=avidemux3_portable
- Icon=avidemux.png
-+Type=Application