Version bump to 2.6.5.

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

3 files changed, 143 insertions, 9 deletions

diff --git a/media-video/avidemux/ChangeLog b/media-video/avidemux/ChangeLog
index a62d0dbf9712..cf9f958051e9 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.224 2013/09/01 11:24:28 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/ChangeLog,v 1.225 2013/09/01 11:53:13 tomwij Exp $
+
+*avidemux-2.6.5 (01 Sep 2013)
+
+  01 Sep 2013; Tom Wijsman <TomWij@gentoo.org> +avidemux-2.6.5.ebuild:
+  Version bump to 2.6.5.
 
   01 Sep 2013; Tom Wijsman <TomWij@gentoo.org> avidemux-9999.ebuild:
   Preparation for 2.6.5, removed "Build Option" dialog because it doesn't
diff --git a/media-video/avidemux/Manifest b/media-video/avidemux/Manifest
index 410fd7ad333a..1aae429dd8e0 100644
--- a/media-video/avidemux/Manifest
+++ b/media-video/avidemux/Manifest
@@ -7,21 +7,23 @@ DIST avidemux_2.5.6.tar.gz 14914123 SHA256 d6da7f2c4304368bd9c367a74a464b47d42fe
 DIST avidemux_2.6.2.tar.gz 17009420 SHA256 67c5676692152094033fbab490fbea24af27d8744496578d1c77957ab103fdb6 SHA512 1ba6f1c751732eec9fdceb2b0728122005ceab4c74ac09d213ebeff4c2af2a0b6ce8737d88e7c43970d1b9ca80cb36ad925efc9e4a487c4f463f1435aee328b3 WHIRLPOOL 0c95e87293251fffb773c8a1996ac015ba0d6f9d36d4f5ae01313c0532d2cf020a3ba0704d0f607347bbf0444e10857d7508fcbd968d62e889d7b62b36b85df7
 DIST avidemux_2.6.3.tar.gz 17025710 SHA256 78972b46c6ef1eb52fc012cafdeb2b6275913b968a49053016fb91ef0e9e5137 SHA512 a51e3cd95695a8500f1355c7a76b8313ae3fe68855b8eb9351038c00cd3d05bbf3ada3b75bf9d817fcddf1786a55c1c09cdbc4fe774974c5e4484c12ccd0a8fc WHIRLPOOL 899c5135e92cd3a830c84b1701ac6bfaf73d7417fa869ab26dd16b3754e5b71c5e667b30d747c5f19b902e1a8d53679447e86f9c6403f32a31554e551929e2bf
 DIST avidemux_2.6.4.tar.gz 17109929 SHA256 2937c6c09248445942ac7e71b100ff8f7e272c4ad9c38e7d8c519ce4a11cec44 SHA512 1b80f65ac5a1da844b521a82bab8976d01c81923460004dc76ed0f6994f95da0ad9a836c90ffa1595ad060f0d6f27ce30add0204ca9d5295084a62e79dd484c9 WHIRLPOOL a1cbfcfeafa163ed24881edb085126a69eca3e0e8eaee50091ceadb993105a0cb43068b7725fa54871bc04b20ca5b51650ac536688b1d1f8d5b0a2d7356459ef
+DIST avidemux_2.6.5.tar.gz 17322253 SHA256 428e1f6d99e2d854ccdcb68f2260d853c47c809eee6bd92f151cb298d98b1861 SHA512 e7f8be29812ca787a1ec2cfddb1c611e1032ed94f24f41c0684f106970085bb6d219c822f3e713c472508a3f7b306540d2cabeb665bdbac061a49bccf8c23a80 WHIRLPOOL 192ce60afe4634319567cd7a1440ba212d83e02c054d6625ad738955fde02d0e722eba948c60932f520bb5e76c46ebbab0001230c1da50d893fb99a18f1da76f
 EBUILD avidemux-2.5.6-r2.ebuild 4404 SHA256 1c98dbcbea05878eb4e82624fff39e60740025ef491e6b8a4a03fc4fcc3f1c3d SHA512 2aa3c5fcb2810ce3ed9509aba9612db6d0a3a86befa271f83d4742a0eca780baa9b39fe030835ae658e6bf3ba195b44c554ac95ec313d3520d7a1c1e4a509fb5 WHIRLPOOL 4251e70b36728c0e554078b83ae7edc76a609a92e8b65b4d38856dee177714f59ccb2ca8c22d9f7b511aee0a557ff597d3c0cf132c9339dc5f5d3b54d08bcbf2
 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-2.6.5.ebuild 3818 SHA256 741463b9b7a3fd2dcc8f77952b278f4dda712afc07b2a1b7e502f0b5fdcc815d SHA512 72534e586d7e4ec1e112baf27e80b6a2a0d692ae393a74db3f89660a9e67935173e427ef7a7d625410c99b37f567f638e07f641ac9ace4d9c79eabce4d4ab74b WHIRLPOOL 1864196cfa0ef3bcf8af73e57c652f46233c94b244854ff774ee032c608c473b08b0b6fbed84b82b1c60fa7ece76d52dd00af9c584b93076f300822c0266020b
 EBUILD avidemux-9999.ebuild 3817 SHA256 7bb83f4d0b6d4cc47f64d9e91c99f1bad58afde345851a03277dd3c2dee782a5 SHA512 8eabae7f40b809e1242e9c08217623b618a8867548392db9fe362f9e5752b978fd6a88085c19b4d8055dacd16ca571bcb6b58e9543060d21b3709b018d1c2d19 WHIRLPOOL 963a209724c9e87390fe4e30d714ad0228c64c91d1afc3808e31f4a33817908cfbca6ec2e35f3049acf4ac6d3d930ba54221293756c543c496001db2ee5ef8ed
-MISC ChangeLog 41643 SHA256 3dbf34dee46b601305bb09144fd5da3f982e8f0189971ff580da18d127597e10 SHA512 ab37567fa9764730a7d7e9d4c1a94702e1c1441bf3661ff3dac3d175d5d58b1743d54d78a1d46adb5b37ccbdeea2009ea8f5a13625e24deea1b983dcb7df38b6 WHIRLPOOL b25655ffa52d2331cc6774fbb808ce5b6f841a210a5a86c6d5a0bd30e94797110828e8e36ddd0c510db42f125d70be8839ba5d092cde4d3671da76ab501d7638
+MISC ChangeLog 41771 SHA256 d06b94d7ebf61fb411bb8f2b00b133075bd92aef0c9cf901bd117f6e4239ef38 SHA512 3ab70bf78e22e92df6b7c52dce62bda9a651afe73d0af09cad2a2637710b42eb25af012e1a54cf6a1dfd85e331c514ca6798ca16b458f77be1f66e6f3b347f6b WHIRLPOOL fcb4e4cd157bd85201c651cf28c258d926cda40df9e9a34339e303feb8e3f6101a02e7e7dbda9f2328882329ad134e9d0a6a8918d121e515bf09b3924497a4f5
 MISC metadata.xml 634 SHA256 fef58b86001e86d77d04f7eb322ad41ecbff8ae509d8792248bc5cb745f53ab0 SHA512 92a54687f81eeb1043edc49d2119966d09e301623ef36199c2464a02e70891abd620a15615728e0d2def20ccb9914d13b83bb063fed6f34af72e13a0dd26c12d WHIRLPOOL 838c3413336a9edd431bdb6e6863fb061ecda0495f3fb4e0bd2a7bd92b36064df7e08b1686c55907c46b62ec0f2746f206ecef11a30ceeaa59d9c131cdd6fc75
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.21 (GNU/Linux)
 
-iQEcBAEBCAAGBQJSIyPxAAoJEJWyH81tNOV9neYH/1ivTdSdFQkdPXgIwxaRgf2X
-Hw2Psfivdz5k5TtV7B9/O0WlnvYoQddQqczorNI8db/4Z3tHlcdXByzylYHLTnrW
-OK+g4arOQiKciWtQ3Uv8yKiiKaDRFboupz/zQFfhl2+F9ai2CPZ/i2vADCViD9bM
-jOAaXPICWoHPm43qSVAAJT2H/5UjtLWsVzpZghphj5Cng0iunzWfGJ6hk7Sx/Smp
-CQEYwsSvpLFEoEeOziTO5Z8gZDgvqdED2WnnEs3WxweoIOuik+MyCHdr7nqkD8vv
-iR/VjqaUuUd8SMjrFGXI6MAekZmsPnGGKR2+e9oyOXaplriPljaZ78ksa2gpZPw=
-=+HZR
+iQEcBAEBCAAGBQJSIyqzAAoJEJWyH81tNOV9h7gIAKSPTmkB5xjGbHZ+4T/93TfJ
+vAdXrJbGSGs4FvBCBxpDkljPcmOnUMxyPdmXh8QHjqUIBpuy/M+X3hJRAdcaDz+Z
++uta0eIsea1rV0LwwZ+pEzsOCsMmaNtERNo+v6WI4/lm2XmdWz8RZyuK1HeqsVuR
+24fSZxXuy9XiqRbhatJCR+W3KndhftNwiYTzqAEAZ98r0bXPrBH4a7Dz7OVt5Orx
+3+I2K8zE+IjKZVie6uW27a115mdfODnOktWB91eJZraY7say4TRlypgdp2d91wij
+bzJSkibvuzbitIl3EpPuBxjKIw0gTR7GURBTk8H51BjhrpmIBlakERKVj+RYYg8=
+=bUEP
 -----END PGP SIGNATURE-----
diff --git a/media-video/avidemux/avidemux-2.6.5.ebuild b/media-video/avidemux/avidemux-2.6.5.ebuild
new file mode 100644
index 000000000000..0ccd9d064d2c
--- /dev/null
+++ b/media-video/avidemux/avidemux-2.6.5.ebuild
@@ -0,0 +1,127 @@
+# 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.5.ebuild,v 1.1 2013/09/01 11:53:13 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 vaapi vdpau video_cards_fglrx 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?,vaapi?,vdpau?,video_cards_fglrx?,xv?]
+	opengl? ( virtual/opengl:0 )
+	qt4? ( >=dev-qt/qtgui-4.8.3:4 )
+	vaapi? ( x11-libs/libva:0 )
+	video_cards_fglrx? ( x11-libs/xvba-video:0 )
+"
+RDEPEND="$DEPEND"
+PDEPEND="~media-libs/avidemux-plugins-${PV}:${SLOT}[opengl?,qt4?]"
+
+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."
+	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."
+
+	# 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)
+		$(cmake-utils_use vaapi LIBVA)
+		$(cmake-utils_use vdpau)
+		$(cmake-utils_use video_cards_fglrx XVBA)
+		$(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
+}