From 51673f0ba9cfbc9656f2d5ad15c7a34e598312aa Mon Sep 17 00:00:00 2001 From: layman Date: Mon, 18 Dec 2017 13:27:18 +0100 Subject: [PATCH] Removed qt4 use flag from avidemux --- media-video/avidemux/Manifest | 2 +- media-video/avidemux/avidemux-2.6.20.ebuild | 13 ++++--------- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/media-video/avidemux/Manifest b/media-video/avidemux/Manifest index 0eca5c8..da3c3b7 100644 --- a/media-video/avidemux/Manifest +++ b/media-video/avidemux/Manifest @@ -1,3 +1,3 @@ DIST avidemux_2.6.20.tar.gz 20172362 SHA256 03c6cb7fc9eb74688b4fcd5eb654ed7b9c4ffc717a72cc09b08a2d10cdc7ef9f SHA512 d01d0fc24a3004770bd3923c2debc4fa2752eb71df08cfe423746b9c44a2562ca01d82965ed2563b99572a4bed8034b79487199ce330208b51a3b7f87ccf7103 WHIRLPOOL 2e2dc21bed49eeb0cdfefe75fe51f6a84226e7e8e80b063bc0b3d8711a6b91db710611dc0ec06575be69ec8e24f2f9e5b5eb363b9c095267729e85e162a4ce38 -EBUILD avidemux-2.6.20.ebuild 4452 SHA256 0d8762a20a7f79bb926556042130350cc2d346b06a8571e65d2f53df9c19a08e SHA512 0a85398998910f7a25ce222080744c42e12a9abb546b443bffc303fd10eb113064b04d34fffd904e7e35d09d761214bd7ebf9acb0ab7f54d8f221f3e90fb3cac WHIRLPOOL 36e9fd67dbc183f4c9fad9a7a929b7b1fc66ad21136d68d63242efae9d41a37f81a99ffeaa0202cbdcb5dd22d40cc984fb6ea73f9b7d094c6c9e7cf80f85086d +EBUILD avidemux-2.6.20.ebuild 4302 SHA256 eadbf3c1cfd61253f077f6d8b307b186aa32a59729d672a0115e66c1fe9e32db SHA512 8bc9a716c6d60cf1ed994b9ae220900772943c5cc0982ef8a3156642c1db868bf640e1b37690236f4208f7a3e468e4e2b4f1376ad68f089185fd80425a7ed14f WHIRLPOOL 74b195d47b1b19c15745e6f2b7672dd30ad820ad36bb063262291569b62f5379a837964abde919498e4c9adb102f5e6e29f2ab67f963b1c9212627202dcdeed7 MISC metadata.xml 489 SHA256 cea0a7554482097ce99fec34fb6abb767c09620acf42d23842285d4efb4ae9f3 SHA512 7a1b885e05a9bb6684583dcaefc5853903330bbcfc6b1e07b76cde7405894d94e0f095fcfe18bc33bc24c1bbf260814c9ebb8219397e0e861a2fb5977361bc4d WHIRLPOOL f00dfaf7eeaaa1302955b696309f4d3b75ea64b483b0bca62098cb36a1edd4b49fa40043df1968bc6ca2100a085819e105b183e375575bc7a2c73b57170f68a5 diff --git a/media-video/avidemux/avidemux-2.6.20.ebuild b/media-video/avidemux/avidemux-2.6.20.ebuild index 1cf760b..2b98a6e 100644 --- a/media-video/avidemux/avidemux-2.6.20.ebuild +++ b/media-video/avidemux/avidemux-2.6.20.ebuild @@ -13,7 +13,7 @@ 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 qt4 qt5 sdl vaapi vdpau xv" +IUSE="debug opengl nls nvenc qt5 sdl vaapi vdpau xv" if [[ ${PV} == *9999* ]] ; then MY_P="${P}" @@ -29,7 +29,6 @@ fi DEPEND=" ~media-libs/avidemux-core-${PV}:${SLOT}[nls?,sdl?,vaapi?,vdpau?,xv?,nvenc?] opengl? ( virtual/opengl:0 ) - qt4? ( >=dev-qt/qtgui-4.8.3:4 ) qt5? ( dev-qt/qtgui:5 ) vaapi? ( x11-libs/libva:0 ) nvenc? ( amd64? ( media-video/nvidia_video_sdk:0 ) ) @@ -38,7 +37,7 @@ RDEPEND=" $DEPEND nls? ( virtual/libintl:0 ) " -PDEPEND="~media-libs/avidemux-plugins-${PV}:${SLOT}[opengl?,qt4?,qt5?]" +PDEPEND="~media-libs/avidemux-plugins-${PV}:${SLOT}[opengl?,qt5?]" S="${WORKDIR}/${MY_P}" @@ -46,7 +45,7 @@ src_prepare() { default processes="buildCli:avidemux/cli" - if use qt4 || use qt5 ; then + if use use qt5 ; then processes+=" buildQt4:avidemux/qt4" fi @@ -140,10 +139,6 @@ src_install() { cd "${S}" || die "Can't enter source folder." newicon ${PN}_icon.png ${PN}-2.6.png - if [[ -f "${ED}"/usr/bin/avidemux3_qt4 ]] ; then - fperms +x /usr/bin/avidemux3_qt4 - fi - if [[ -f "${ED}"/usr/bin/avidemux3_qt5 ]] ; then fperms +x /usr/bin/avidemux3_qt5 fi @@ -152,7 +147,7 @@ src_install() { fperms +x /usr/bin/avidemux3_jobs_qt5 fi - if use qt4 || use qt5 ; then + if use qt5 ; then domenu ${PN}-2.6.desktop fi }