Preparation for 2.6.5, removed "Build Option" dialog because it doesn't reflect what the GUI can or has been built with, for bug #463628. Did some small cleanup.

Package-Manager: portage-2.2.1/cvs/Linux x86_64
Manifest-Sign-Key: 0x6D34E57D

3 files changed, 25 insertions, 20 deletions

diff --git a/media-video/avidemux/ChangeLog b/media-video/avidemux/ChangeLog
index 0881de54481d..a62d0dbf9712 100644
--- a/media-video/avidemux/ChangeLog
+++ b/media-video/avidemux/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/avidemux
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/ChangeLog,v 1.223 2013/08/31 11:01:26 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/ChangeLog,v 1.224 2013/09/01 11:24:28 tomwij Exp $
+
+  01 Sep 2013; Tom Wijsman <TomWij@gentoo.org> avidemux-9999.ebuild:
+  Preparation for 2.6.5, removed "Build Option" dialog because it doesn't
+  reflect what the GUI can or has been built with, for bug #463628. Did some
+  small cleanup.
 
   31 Aug 2013; Tom Wijsman <TomWij@gentoo.org> avidemux-9999.ebuild,
   metadata.xml:
diff --git a/media-video/avidemux/Manifest b/media-video/avidemux/Manifest
index 170187eb85b9..410fd7ad333a 100644
--- a/media-video/avidemux/Manifest
+++ b/media-video/avidemux/Manifest
@@ -11,17 +11,17 @@ EBUILD avidemux-2.5.6-r2.ebuild 4404 SHA256 1c98dbcbea05878eb4e82624fff39e607400
 EBUILD avidemux-2.6.2-r1.ebuild 4004 SHA256 a0c5a17895cbffcce82b01299f9961222a56efb1fa2f7e5c7906457297975c8a SHA512 1a140de1fe6514dca6695a95f9857c4a7397b83a3df75ce612d796db741010fe4397cee4fede23bb14ef3b40293638404d85728cb4b4d24f9a8b78be18ef35ae WHIRLPOOL fc8c7d58ddc74f64ea9557a94f40d36899f4a4085d112b9b38d676693ba8d3c0752ccd46be0aab3ec956f047eaa2cf1c7b9a6e2415be176d83802361cc02fb10
 EBUILD avidemux-2.6.3.ebuild 3457 SHA256 b4145eab3f0418753b34fbbb547f60578caa989eef1a1dd5c0524eea31073f58 SHA512 0957ebf23709ee13a87da59fad5122a2c796cafaf40de6911c8bf640bc33b351682fbdd3de84be2e23d0b85ada3d55be78502852da932ac738b399781e3b7cdb WHIRLPOOL 8f0882cc5640d2fae2528d9d64289cb5fb9a94ddce8dbe4efbdda8ccec55b4bf69ffaf0d8ac2f5860a54e4e6e37ea7b9c335962be19ee457b27916851a286a5d
 EBUILD avidemux-2.6.4.ebuild 3436 SHA256 372bdd216abdab5bc79a4aa36c4ec4d925e067dac8633f4e2396e4efb3efdba6 SHA512 d523f789bb652c8bd08a73ba5970c9ef00dfc6f5ebf1775c2bd8e9923f13d1775449e8d79d05c1a6eb136c5edee3890bffd8595e43e652dc811bb9ef624ebc5b WHIRLPOOL 89dda0fbd70e0b9ababdb27868bd6dd20d85f7f24cb99de4144d56c62f3ab49b6f88c66ec4c6a4a8ca33611ac6c5f6faa14628edfd6d898f1fd658df8d387858
-EBUILD avidemux-9999.ebuild 3676 SHA256 60239302d5f0e95c77d37ca45e013d5e37da43fef2a323ebe4aed780fe464101 SHA512 f3f1ee0c905160244e377513b4cc98d43e8f70a8ad78af609455cc50cb77f47e6a4e32fa618f78dc02a23be3eb63c64ea7ab943fbb84f49025c0558dfdfc840b WHIRLPOOL c0c62a5db4f1c52099575cc5811033a712488554abcd09cb3d740f79f246d919c4dfe218883ceb44c27f11ba3c38de5019dc7d1c0f61d702f3808da039ee2579
-MISC ChangeLog 41405 SHA256 da31fe0e81122f2ac401fb848b1c305ad773188d3b791fcd1c1b1b8d152e4d58 SHA512 ab69a2c1a787ba1227ce70fd266eddad9b559d5afbc1e9eba0248fbfb72740acfbe7063e968edbfbf25b7fbfb1fc52673aaf13a074e8445990fa2594d671542c WHIRLPOOL 2bac41039c38b64cf8ef8d09f456e72c35c4d57b24785c6f0493c9e41c61b6283363d2ae7026d95a153ce72b678563359d4a7f2528d01115ceef848b18d396cd
+EBUILD avidemux-9999.ebuild 3817 SHA256 7bb83f4d0b6d4cc47f64d9e91c99f1bad58afde345851a03277dd3c2dee782a5 SHA512 8eabae7f40b809e1242e9c08217623b618a8867548392db9fe362f9e5752b978fd6a88085c19b4d8055dacd16ca571bcb6b58e9543060d21b3709b018d1c2d19 WHIRLPOOL 963a209724c9e87390fe4e30d714ad0228c64c91d1afc3808e31f4a33817908cfbca6ec2e35f3049acf4ac6d3d930ba54221293756c543c496001db2ee5ef8ed
+MISC ChangeLog 41643 SHA256 3dbf34dee46b601305bb09144fd5da3f982e8f0189971ff580da18d127597e10 SHA512 ab37567fa9764730a7d7e9d4c1a94702e1c1441bf3661ff3dac3d175d5d58b1743d54d78a1d46adb5b37ccbdeea2009ea8f5a13625e24deea1b983dcb7df38b6 WHIRLPOOL b25655ffa52d2331cc6774fbb808ce5b6f841a210a5a86c6d5a0bd30e94797110828e8e36ddd0c510db42f125d70be8839ba5d092cde4d3671da76ab501d7638
 MISC metadata.xml 634 SHA256 fef58b86001e86d77d04f7eb322ad41ecbff8ae509d8792248bc5cb745f53ab0 SHA512 92a54687f81eeb1043edc49d2119966d09e301623ef36199c2464a02e70891abd620a15615728e0d2def20ccb9914d13b83bb063fed6f34af72e13a0dd26c12d WHIRLPOOL 838c3413336a9edd431bdb6e6863fb061ecda0495f3fb4e0bd2a7bd92b36064df7e08b1686c55907c46b62ec0f2746f206ecef11a30ceeaa59d9c131cdd6fc75
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.21 (GNU/Linux)
 
-iQEcBAEBCAAGBQJSIc0LAAoJEJWyH81tNOV9T4sIAJ8BRJXir1RusAv7pw7eLHIS
-EbJqQLWGWxRv9YTloJ1ZtcZl+/scUm4GL1HRerOrjsmNjkR2iuKGP+S+H5snZjJx
-NAr3p5sdYUKPdiA8spNC4Sb/6/GbjX8lf2WUGxGFl+GlDCEHjPao8QwCe6wswldQ
-UxOIt+vT5Ki9hxCLDvKRpKDUJn0iCGxP83VCF09KsmxwZYNincbO6aFAcdIw61Q7
-kJw8NDIzkDVYh9w/rgHcFkzuHqypcclpHVVdcY5qAfX8qFFjZMLbt9E0dv8/hcQk
-Vv+W6m4XLQi0qPbrTahZNvh58yXxkS41pdF8U/QyDpEcuWRclGVFbQ5NV6Urm38=
-=ghUg
+iQEcBAEBCAAGBQJSIyPxAAoJEJWyH81tNOV9neYH/1ivTdSdFQkdPXgIwxaRgf2X
+Hw2Psfivdz5k5TtV7B9/O0WlnvYoQddQqczorNI8db/4Z3tHlcdXByzylYHLTnrW
+OK+g4arOQiKciWtQ3Uv8yKiiKaDRFboupz/zQFfhl2+F9ai2CPZ/i2vADCViD9bM
+jOAaXPICWoHPm43qSVAAJT2H/5UjtLWsVzpZghphj5Cng0iunzWfGJ6hk7Sx/Smp
+CQEYwsSvpLFEoEeOziTO5Z8gZDgvqdED2WnnEs3WxweoIOuik+MyCHdr7nqkD8vv
+iR/VjqaUuUd8SMjrFGXI6MAekZmsPnGGKR2+e9oyOXaplriPljaZ78ksa2gpZPw=
+=+HZR
 -----END PGP SIGNATURE-----
diff --git a/media-video/avidemux/avidemux-9999.ebuild b/media-video/avidemux/avidemux-9999.ebuild
index ee0cd9ce182e..c7a63f73abf1 100644
--- a/media-video/avidemux/avidemux-9999.ebuild
+++ b/media-video/avidemux/avidemux-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-9999.ebuild,v 1.2 2013/08/31 11:01:26 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-9999.ebuild,v 1.3 2013/09/01 11:24:28 tomwij Exp $
 
 EAPI="5"
 
@@ -36,7 +36,7 @@ DEPEND="
 	video_cards_fglrx? ( x11-libs/xvba-video:0 )
 "
 RDEPEND="$DEPEND"
-PDEPEND="~media-libs/avidemux-plugins-${PV}"
+PDEPEND="~media-libs/avidemux-plugins-${PV}:${SLOT}[opengl?,qt4?]"
 
 S="${WORKDIR}/${MY_P}"
 
@@ -52,25 +52,25 @@ src_prepare() {
 	# 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:\1qt4:' ${PN}2.desktop || die "Desktop file fix failed."
+
+	# 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."
 
 	# Now rename the desktop file to not collide with 2.5.
 	mv ${PN}2.desktop ${PN}-2.6.desktop || die "Collision rename 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 -re '/^Exec/ s:(avidemux3_)gtk:\1qt4:' ${PN}-2.6.desktop || die "Desktop file fix failed."
-
-	# Fix QA warnings that complain a trailing ; is missing and Application is deprecated.
-	sed -i -e 's/Application;AudioVideo/AudioVideo;/g' ${PN}-2.6.desktop
+	# 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() {
 	local mycmakeargs="
 		-DAVIDEMUX_SOURCE_DIR='${S}'
 		$(cmake-utils_use nls GETTEXT)
-		$(cmake-utils_use sdl SDL)
+		$(cmake-utils_use sdl)
 		$(cmake-utils_use vaapi LIBVA)
-		$(cmake-utils_use vdpau VDPAU)
+		$(cmake-utils_use vdpau)
 		$(cmake-utils_use video_cards_fglrx XVBA)
 		$(cmake-utils_use xv XVIDEO)
 	"