[gentoo-commits] proj/qt:master commit in: media-video/avidemux/

["Markos Chandras" <hwoarang@gentoo.org>]

commit:     d7f0312ebba0000f062c90b972f6aafe6a94291c
Author:     Markos Chandras <hwoarang <AT> gentoo <DOT> org>
AuthorDate: Sun Oct  7 20:23:22 2012 +0000
Commit:     Markos Chandras <hwoarang <AT> gentoo <DOT> org>
CommitDate: Sun Oct  7 20:23:22 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=d7f0312e

media-video/avidemux-2.6: Fix desktop files

They use avidemux2 (which is for avidemux-2.5) and not avidemux3.
So if avidemux-2.5 is installed, then it will launch that one.
Lets fix that!

---
 media-video/avidemux/avidemux-2.6.0.ebuild |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/media-video/avidemux/avidemux-2.6.0.ebuild b/media-video/avidemux/avidemux-2.6.0.ebuild
index c86edfb..5515781 100644
--- a/media-video/avidemux/avidemux-2.6.0.ebuild
+++ b/media-video/avidemux/avidemux-2.6.0.ebuild
@@ -117,12 +117,17 @@ src_prepare() {
 
 	# Fix icon name -> avidemux-2.6.png
 	sed -i -e "/^Icon/ s:${PN}:${PN}-2.6:" ${PN}2.desktop || die
+	# 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
 	# Now rename to not collide with 2.5
 	mv ${PN}2.desktop ${PN}-2.6.desktop
 	# fix major issues in desktop files wrt bugs #291453, #316599, #430500
 	# duplicate desktop file
 	cp ${PN}-2.6.desktop ${PN}-2.6-gtk.desktop || die
-	sed -i -re '/^Exec/ s:(avidemux2_)gtk:\1qt4:' ${PN}-2.6.desktop || die
+	# 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
 }
 
 src_configure() {