From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id D440C138330 for ; Tue, 9 Jan 2018 17:33:18 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EB184E0B48; Tue, 9 Jan 2018 17:33:14 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B76E8E0B48 for ; Tue, 9 Jan 2018 17:33:14 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0DB0B335C50 for ; Tue, 9 Jan 2018 17:33:12 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1C5241B1 for ; Tue, 9 Jan 2018 17:33:09 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1515518888.e6408e70b2daa530fdb49e3d9f62a00eb4a94891.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-video/avidemux/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-video/avidemux/avidemux-9999.ebuild X-VCS-Directories: media-video/avidemux/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: e6408e70b2daa530fdb49e3d9f62a00eb4a94891 X-VCS-Branch: master Date: Tue, 9 Jan 2018 17:33:09 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: a78aacaf-af1f-4f3d-a92d-e4da302e1c50 X-Archives-Hash: 044b43a7e0251b794eac1e206108383e commit: e6408e70b2daa530fdb49e3d9f62a00eb4a94891 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Jan 7 23:08:47 2018 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Jan 9 17:28:08 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e6408e70 media-video/avidemux: Sorting, line breaks Package-Manager: Portage-2.3.19, Repoman-2.3.6 media-video/avidemux/avidemux-9999.ebuild | 42 ++++++++++++++++++------------- 1 file changed, 24 insertions(+), 18 deletions(-) diff --git a/media-video/avidemux/avidemux-9999.ebuild b/media-video/avidemux/avidemux-9999.ebuild index 2e985fe5726..6b3b95e51a5 100644 --- a/media-video/avidemux/avidemux-9999.ebuild +++ b/media-video/avidemux/avidemux-9999.ebuild @@ -3,26 +3,24 @@ EAPI=6 -inherit cmake-utils qmake-utils xdg-utils - -DESCRIPTION="Video editor designed for simple cutting, filtering and encoding tasks" -HOMEPAGE="http://fixounet.free.fr/${PN}" - -# Multiple licenses because of all the bundled stuff. -LICENSE="GPL-1 GPL-2 MIT PSF-2 public-domain" -SLOT="2.6" -IUSE="debug opengl nls nvenc qt5 sdl vaapi vdpau xv" - if [[ ${PV} == *9999* ]] ; then MY_P="${P}" EGIT_REPO_URI="https://github.com/mean00/avidemux2.git" - inherit git-r3 else MY_P="${PN}_${PV}" SRC_URI="mirror://sourceforge/${PN}/${PN}/${PV}/${MY_P}.tar.gz" KEYWORDS="~amd64 ~x86" fi +inherit cmake-utils qmake-utils xdg-utils + +DESCRIPTION="Video editor designed for simple cutting, filtering and encoding tasks" +HOMEPAGE="http://fixounet.free.fr/avidemux" + +# Multiple licenses because of all the bundled stuff. +LICENSE="GPL-1 GPL-2 MIT PSF-2 public-domain" +SLOT="2.6" +IUSE="debug nls nvenc opengl qt5 sdl vaapi vdpau xv" COMMON_DEPEND=" ~media-libs/avidemux-core-${PV}:${SLOT}[nls?,sdl?,vaapi?,vdpau?,xv?,nvenc?] @@ -54,21 +52,29 @@ src_prepare() { done # Fix icon name -> avidemux-2.6.png - sed -i -e "/^Icon/ s:${PN}:${PN}-2.6:" ${PN}2.desktop || die "Icon name fix failed." + sed -i -e "/^Icon/ s:${PN}:${PN}-2.6:" ${PN}2.desktop || \ + die "Icon name fix failed." # The desktop file is broken. It uses avidemux2 instead of avidemux3 # so it will actually launch avidemux-2.5 if it is installed. - sed -i -e "/^Exec/ s:${PN}2:${PN}3:" ${PN}2.desktop || die "Desktop file fix failed." - sed -i -re '/^Exec/ s:(avidemux3_)gtk:\1qt'$(usex qt5 5 4)':' ${PN}2.desktop || die "Desktop file fix failed." + sed -i -e "/^Exec/ s:${PN}2:${PN}3:" ${PN}2.desktop || \ + die "Desktop file fix failed." + if use qt5; then + sed -i -re '/^Exec/ s:(avidemux3_)gtk:\1qt5:' ${PN}2.desktop || \ + die "Desktop file fix failed." + fi - # Fix QA warnings that complain a trailing ; is missing and Application is deprecated. - sed -i -e 's/Application;AudioVideo/AudioVideo;/g' ${PN}2.desktop || die "Desktop file fix failed." + # QA warnings: missing trailing ';' and 'Application' is deprecated. + sed -i -e 's/Application;AudioVideo/AudioVideo;/g' ${PN}2.desktop || \ + die "Desktop file fix failed." # Now rename the desktop file to not collide with 2.5. mv ${PN}2.desktop ${PN}-2.6.desktop || die "Collision rename failed." - # Remove "Build Option" dialog because it doesn't reflect what the GUI can or has been built with. (Bug #463628) - sed -i -e '/Build Option/d' avidemux/common/ADM_commonUI/myOwnMenu.h || die "Couldn't remove \"Build Option\" dialog." + # Remove "Build Option" dialog because it doesn't reflect + # what the GUI can or has been built with. (Bug #463628) + sed -i -e '/Build Option/d' avidemux/common/ADM_commonUI/myOwnMenu.h || \ + die "Couldn't remove \"Build Option\" dialog." } src_configure() {