Made 9999 ebuild that uses upstream's git, applied various cmake related ebuild fixes to simplify maintenance; thanks to Nikoli for the suggestion.

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

4 files changed, 142 insertions, 13 deletions

diff --git a/media-video/avidemux/ChangeLog b/media-video/avidemux/ChangeLog
index e9902bb8fffb..d1c126b3a1f5 100644
--- a/media-video/avidemux/ChangeLog
+++ b/media-video/avidemux/ChangeLog
@@ -1,6 +1,13 @@
 # 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.220 2013/07/12 22:58:34 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/ChangeLog,v 1.221 2013/07/17 00:31:34 tomwij Exp $
+
+*avidemux-9999 (17 Jul 2013)
+
+  17 Jul 2013; Tom Wijsman <TomWij@gentoo.org> +avidemux-9999.ebuild,
+  avidemux-2.6.4.ebuild:
+  Made 9999 ebuild that uses upstream's git, applied various cmake related
+  ebuild fixes to simplify maintenance; thanks to Nikoli for the suggestion.
 
   12 Jul 2013; Tom Wijsman <TomWij@gentoo.org> avidemux-2.6.4.ebuild:
   Cleaned up ebuild to make it shorter, use the eclass more and lowercase
diff --git a/media-video/avidemux/Manifest b/media-video/avidemux/Manifest
index f226dbbdd3e0..9808cf25ff82 100644
--- a/media-video/avidemux/Manifest
+++ b/media-video/avidemux/Manifest
@@ -10,17 +10,18 @@ DIST avidemux_2.6.4.tar.gz 17109929 SHA256 2937c6c09248445942ac7e71b100ff8f7e272
 EBUILD avidemux-2.5.6-r2.ebuild 4395 SHA256 41c38e73d2eba01cf4f85602e357d241826f196aad5c78adaa3ae39b2024de5f SHA512 c22a1f33e137107391546bdb5c90754b59d8acf5b7fbafe93febf902bd499f8989faf830d552325e6b3c30be3ef26d90c16e4df3043eb57545229726588871f2 WHIRLPOOL bc911e406ebdc113a9fb03d2f45194feb24277b065e84ab56ac7a50d28ef8c0ad8bff06e286c4feb8fcbbd747d739208c99c686f5db44a7409208bba3513bfdc
 EBUILD avidemux-2.6.2-r1.ebuild 3995 SHA256 f04cce46c23a330f1e5b71dcc1688098d19c4395f9d9afd2c298bce6d0fd5e59 SHA512 afec443dffb22bf641344e7862290082860524c8d850aeaff31b28d260cfa7fbbcbeff03b27e6376efd53d4893e72d65d37b52a5c16530c8605f22a4d46c36f8 WHIRLPOOL 530c0d94419d0f2cfa7f036695e7ab9a3cf6b04599d3573a207e2ade48cfaf53efc9f661452291306ef081cd0a927cbddb083473f9dcfa50189d244b989be6da
 EBUILD avidemux-2.6.3.ebuild 3448 SHA256 a1ee7c4e4804c259509ebefd4a820cd86ec817c745c63b7b47918ef381983c4d SHA512 3d7b53d40e6d0158e71f8f7e6e5236c2bb55d7167214bad1cc87acc66d8830a081207d0ebe5fa700f1e07b75b572fbe1c1cc22593b8f8257f22f547640c01fc0 WHIRLPOOL 716bb05990de8e57157b3a350593f6e4f11f7fc570048dc6b7042cf2df699334ec86f2d97e920f2ccfe18eac716b58db4c5a618839cb95c530ecba8d0b812f0b
-EBUILD avidemux-2.6.4.ebuild 3438 SHA256 ac170f5bf2234cee34fbb74b08fb889f9c27167d3cb719bb421968986855167b SHA512 b49a99e9d58007968b071102ff076c932a5d59bb327d0bd899a2bcea678c8a2c02cda75b4aecb8d58c7909b7760df5d3563c127452760fe340c791e09678f504 WHIRLPOOL 78ded30f4001cc17c029a0a5ecacf3bb30493d066258b4d603d6a1ec566a442d3f800607b6d49c59ab9c3e98beb619b8fda11f87e73934d3b04a154a5aeb6349
-MISC ChangeLog 40791 SHA256 b9d43d70963cc3821d5980f0f4044de5f6086731354e8214c9fd89a3ed4e23be SHA512 23b766bfb2651fe0d74cb5d0b508b0310b91cbce24c32b25cc266562808635858b7543e67ec0138069e6f8d53f846de56162a111540c49e018313f00b4e18f26 WHIRLPOOL d4eb19bc35bb1e8e4c4b218643fdfb435c0d2826b3d91e9ba26e343dc0410bf620c81ede9490c1e40c40c62827ff9f94935598e40a75884fd4da9ed3d055a3b5
+EBUILD avidemux-2.6.4.ebuild 3436 SHA256 372bdd216abdab5bc79a4aa36c4ec4d925e067dac8633f4e2396e4efb3efdba6 SHA512 d523f789bb652c8bd08a73ba5970c9ef00dfc6f5ebf1775c2bd8e9923f13d1775449e8d79d05c1a6eb136c5edee3890bffd8595e43e652dc811bb9ef624ebc5b WHIRLPOOL 89dda0fbd70e0b9ababdb27868bd6dd20d85f7f24cb99de4144d56c62f3ab49b6f88c66ec4c6a4a8ca33611ac6c5f6faa14628edfd6d898f1fd658df8d387858
+EBUILD avidemux-9999.ebuild 3471 SHA256 c866fd8780a4e36de19a6e51f92b81c8c85a24bf943b3349ccc101ddd1cf1421 SHA512 cdc62fb1671cc98aa520a42c9f7cdd9cef8ddac6892fcf3a245603790a05ad9fb4d01d129bdebfb5e81dfd235c314de00bb475bd6deb0bd2b2cd7760f7639cb4 WHIRLPOOL 4c3f98e5cd9e9793890534e20dd4c1ee6125f95ba36123406101074a179cf08bece86089ed978a6126e6c2cc6b4c88df53bdb454c4052bed371baf0a23eb1b5c
+MISC ChangeLog 41069 SHA256 907395cc3597ef97754760f4a64a1e46d02307ec6102ca8880985aaea8524d10 SHA512 5d02496081a186bc61c80e75b824acd89296e32db884f767978aef29c5da49b615f2cd481358e499d71606b8df77155807429956439b3cd42d87a6e41358bc9b WHIRLPOOL ff10bb7d5ac69b399e26a01c3d927afd74cc39b908bbb8742d3c2ed64e6136468df9ad974ad7178125a817472ff1efdb8d4b8d13f359c12cf93552c17772ac94
 MISC metadata.xml 543 SHA256 3725b23e8cf87b3bfd7539de98eacd624163f392c51655382d1b92c4bb09507d SHA512 16b3515b92d74a68b8db832e905f341b11100bcfd248a5bff148f1d407edf387609f07e468a5feb38d66b8866ea30e957f337a30c1090c2819dc12e0d0b58787 WHIRLPOOL 64fb8ff1e670253be50f817320d858e54d12bf1d9f558f0a5f229e1832fec11566aafafc3678ee3d2cdf967d14887c69177d4bbf8ac081c12853daac760d826a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQEcBAEBCAAGBQJR4IlaAAoJEJWyH81tNOV9VRUH/0weJO09VdzZNSKRc2t4r+Jz
-/kt45JcBkbWMOoHpIIrEUK5bf8eXIEpy5qbgXqncHQoE2dzXa+FWtHLeDwqguQ/I
-1b28B/KDELM+r2h2+D1TD/jzfuyQ6BWvbaseMv1FvUCgHL01qSHwHaOvkHbDaoCV
-mJri8vrmTvpbn6dClNeElxXTk/Aqlp1yLbOFqP5AcEwI8Ular2DQ/zAPjrQmkOoG
-kl+p6L5Rt/QN64B9qN29dbzYSW/hBdNqN0RnNQ9nQOVwi2jsq6fwHfmFa/wQ1iaB
-OH5DvWwTjw4JKsnQ/WbRwkndSwvU56qwzK0/hOiqmqysWu2tZ2amectUQDNfPDo=
-=FzHW
+iQEcBAEBCAAGBQJR5eUjAAoJEJWyH81tNOV9AbIH/RFdUk5sNdXfFPzdoSnut6fh
+jYHG6reJkPl622ICsO0/3AD5b/qwYEnRSB8x2pkxOiFg774plwQ8EtHaGI5fyQ9T
+4YgEuPd4RyF19Qod33s1y8f9s4OJgoo70miSTco73h2UosC1LFJztiNZdgjCjWyt
+ZZZkzy3//4q9X6DDDF51MktZwe3846Je/1VmCYgvF+yIHMHA+6OiZsF/Srt5CAzg
+4r+/3xns8aQ+M8vR+2xqVey19fFd51SSgQkXXEYrsddLQEeteWEyb60VlfJ8cjnA
+eBpeOuKeFt8qdI9xM+Ldhls+yGV4i53SmktJfPUg+zXaz+MsC23Zs46FJAbMOtE=
+=4uyt
 -----END PGP SIGNATURE-----
diff --git a/media-video/avidemux/avidemux-2.6.4.ebuild b/media-video/avidemux/avidemux-2.6.4.ebuild
index 2d0ad4e7a84f..99f84785bfa0 100644
--- a/media-video/avidemux/avidemux-2.6.4.ebuild
+++ b/media-video/avidemux/avidemux-2.6.4.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-2.6.4.ebuild,v 1.3 2013/07/12 22:58:34 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-2.6.4.ebuild,v 1.4 2013/07/17 00:31:34 tomwij Exp $
 
 EAPI="5"
 
@@ -61,8 +61,8 @@ src_configure() {
 		$(cmake-utils_use vdpau VDPAU)
 		$(cmake-utils_use xv XVIDEO)
 	"
-	
-	if use debug ; then 
+
+	if use debug ; then
 		mycmakeargs+=" -DVERBOSE=1 -DCMAKE_BUILD_TYPE=Debug"
 	fi
 
diff --git a/media-video/avidemux/avidemux-9999.ebuild b/media-video/avidemux/avidemux-9999.ebuild
new file mode 100644
index 000000000000..b2ffc7309a5c
--- /dev/null
+++ b/media-video/avidemux/avidemux-9999.ebuild
@@ -0,0 +1,121 @@
+# 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.1 2013/07/17 00:31:34 tomwij Exp $
+
+EAPI="5"
+
+PLOCALES="ca cs de el es fr it ja pt_BR ru sr sr@latin tr"
+
+inherit cmake-utils eutils flag-o-matic l10n
+
+SLOT="2.6"
+
+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"
+IUSE="debug opengl nls qt4 sdl vdpau xv"
+KEYWORDS="~amd64 ~x86"
+
+if [[ ${PV} == *9999* ]] ; then
+	KEYWORDS=""
+	EGIT_REPO_URI="git://gitorious.org/${PN}2-6/${PN}2-6.git https://git.gitorious.org/${PN}2-6/${PN}2-6.git"
+
+	inherit git-2
+else
+	MY_P="${PN}_${PV}"
+	SRC_URI="mirror://sourceforge/${PN}/${PV}/${MY_P}.tar.gz"
+fi
+
+DEPEND="~media-libs/avidemux-core-${PV}:${SLOT}[nls?,sdl?,vdpau?,xv?]
+	opengl? ( virtual/opengl:0 )
+	qt4? ( >=dev-qt/qtgui-4.8.3:4 )"
+RDEPEND="$DEPEND"
+PDEPEND="~media-libs/avidemux-plugins-${PV}"
+
+S="${WORKDIR}/${MY_P}"
+
+processes="buildCli:avidemux/cli"
+use qt4 && processes+=" buildQt4:avidemux/qt4"
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	# Fix icon name -> avidemux-2.6.png
+	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."
+
+	# 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
+}
+
+src_configure() {
+	local mycmakeargs="
+		-DAVIDEMUX_SOURCE_DIR='${S}'
+		$(cmake-utils_use nls GETTEXT)
+		$(cmake-utils_use sdl SDL)
+		$(cmake-utils_use vdpau VDPAU)
+		$(cmake-utils_use xv XVIDEO)
+	"
+
+	if use debug ; then
+		mycmakeargs+=" -DVERBOSE=1 -DCMAKE_BUILD_TYPE=Debug -DADM_DEBUG=1"
+	fi
+
+	for process in ${processes} ; do
+		local build="${process%%:*}"
+
+		mkdir "${S}"/${build} || die "Can't create build folder."
+		cd "${S}"/${build} || die "Can't enter build folder."
+		CMAKE_USE_DIR="${S}"/${process#*:} BUILD_DIR="${S}"/${build} cmake-utils_src_configure
+	done
+
+	# Add lax vector typing for PowerPC.
+	if use ppc || use ppc64 ; then
+		append-cflags -flax-vector-conversions
+	fi
+
+	# See bug 432322.
+	use x86 && replace-flags -O0 -O1
+}
+
+src_compile() {
+	for process in ${processes} ; do
+		BUILD_DIR="${S}/${process%%:*}" cmake-utils_src_compile
+	done
+}
+
+DOCS=( AUTHORS README )
+
+src_install() {
+	for process in ${processes} ; do
+		BUILD_DIR="${S}/${process%%:*}" cmake-utils_src_install
+	done
+
+	if [[ -f "${ED}"/usr/bin/avidemux3_cli ]] ; then
+		fperms +x /usr/bin/avidemux3_cli
+	fi
+
+	if [[ -f "${ED}"/usr/bin/avidemux3_jobs ]] ; then
+		fperms +x /usr/bin/avidemux3_jobs
+	fi
+
+	cd "${S}" || die "Can't enter source folder."
+	newicon ${PN}_icon.png ${PN}-2.6.png
+
+	if use qt4 ; then
+		fperms +x /usr/bin/avidemux3_qt4
+		domenu ${PN}-2.6.desktop
+	fi
+}