Version bump to 2.6.7, fixes bug #493730.

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

4 files changed, 148 insertions, 13 deletions

diff --git a/media-video/avidemux/ChangeLog b/media-video/avidemux/ChangeLog
index a003d4b70139..bf522d711a00 100644
--- a/media-video/avidemux/ChangeLog
+++ b/media-video/avidemux/ChangeLog
@@ -1,6 +1,12 @@
 # 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.226 2013/09/01 18:54:38 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/ChangeLog,v 1.227 2013/12/17 23:26:58 tomwij Exp $
+
+*avidemux-2.6.7 (17 Dec 2013)
+
+  17 Dec 2013; Tom Wijsman <TomWij@gentoo.org> +avidemux-2.6.7.ebuild,
+  avidemux-9999.ebuild:
+  Version bump to 2.6.7, fixes bug #493730.
 
 *avidemux-2.6.5-r1 (01 Sep 2013)
 
diff --git a/media-video/avidemux/Manifest b/media-video/avidemux/Manifest
index 4ffcc1ddeca7..b51ff35e32be 100644
--- a/media-video/avidemux/Manifest
+++ b/media-video/avidemux/Manifest
@@ -8,23 +8,25 @@ DIST avidemux_2.6.2.tar.gz 17009420 SHA256 67c5676692152094033fbab490fbea24af27d
 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
+DIST avidemux_2.6.7.tar.gz 17337193 SHA256 d28202273d23be85c748c12d6e4df5e013bb861ea52b9bac7e0f90ba3d23249f SHA512 deea9811a0b6f618fab2ecf63c675b37dac12ea0ab09136a6b251e13601cd62cdc1c97d032762ea54f38e07275380106026541243bc87e230ce302fb821f2e5c WHIRLPOOL a41c338fc51e14d2c900dcef86a3887f94164548e8b904945d47915a78db907d152fda4ae53e5c37bf368348ff9912b529005a271f85d993776f042b5b997553
 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-r1.ebuild 4093 SHA256 f8675df5de77096be9d86d0aef90922d0b3a3f070602df049a525707f3fd4dab SHA512 c57b3c0cdb5ef8655e847545a268f369685f33c0840dd908924b72ab13f3a31f315f984dc503e3d60d0acde45a8de22f68046094535d038ee353960db56ea708 WHIRLPOOL 28ef3bd0456fa881b2e9179c5ab329217c8ef91abc91fd90a30592a5d5e33707e661aae6067b585046bec49be9740862c06e65410f4bb5e520f2b59821d8afb7
 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 42281 SHA256 dc4f671d1a3154231da41233f3af2384b3a3cf4b6571e2a7ba65313a773f9264 SHA512 656247465729cf30425ce40c5b082673be4dff9e9d1be200f7d46375179f5adf7411178da5ef76d35c00e9485f4539d9231aa536f298c15612dd678c48106c41 WHIRLPOOL b484cdbebffe04bb7d6df94a623431aebda167c04872aa1cfc1c6639101dec74c1dedfb23564b0ac0843cde2580086d97af459d78932abe5a0141c883868a555
+EBUILD avidemux-2.6.7.ebuild 3824 SHA256 5402f35ceb41d1fa740137c3a03e6db2225e42d91f144b6e39d9c448c1a68989 SHA512 281b937a92263fe3784252ce1dc5c472a995fa46a694f4a12e2c4bd15ebff024c66b9ed52a5c0f4efb440c907fae0ba0684141f050fab0cb5588ef3a9189cea5 WHIRLPOOL 5b5febe39e59ce9a7e4ad1e128cca68ec1c58cebaa8623eec96d706a35d6da8758a4eada0976065a747f030c3b30b37a155ff8b6b60ff3796e91ae04ff2606ef
+EBUILD avidemux-9999.ebuild 3823 SHA256 ddf926ed6d29644bd3e25aee9aa4a870ff658db0f13b048d2f6983b36ede333c SHA512 4b2d80bb30aeae69da0a94d02289ba028982eaa13bd34ffda56712acc68aba9a9396d5a82144a40b4b6b80c5e12af4980925e7b7f7631e6ac16121b1393c3028 WHIRLPOOL 34bec2a9556edced468a3c2e842aee4f58bfb32badcf5084de93d2eae1d901ce10c959dd8da38429d8041ae13a408043b3bd585f436bfe68ca8500e4a4a5085e
+MISC ChangeLog 42452 SHA256 e15b73618b294e914b8f9c95935c20c598c8822ab8fafec674b40cf4e264f461 SHA512 29aa0b3c3cae6ac54c4d777c6844cf019311028b6d36ad374479becc295fdc1191c0eb3d3f1b730537934ae0d16dc86232ac519bef926a4d64d46fc03ae77678 WHIRLPOOL 757dfd6bcb44e793224e5a5533f1d71c37db7f6ccd2782e6f49d00e9feda0cd9fb1a78d6b296dc62f8a87441c3cfd6d0cd5c98d79281af12262c32ab7157db70
 MISC metadata.xml 634 SHA256 fef58b86001e86d77d04f7eb322ad41ecbff8ae509d8792248bc5cb745f53ab0 SHA512 92a54687f81eeb1043edc49d2119966d09e301623ef36199c2464a02e70891abd620a15615728e0d2def20ccb9914d13b83bb063fed6f34af72e13a0dd26c12d WHIRLPOOL 838c3413336a9edd431bdb6e6863fb061ecda0495f3fb4e0bd2a7bd92b36064df7e08b1686c55907c46b62ec0f2746f206ecef11a30ceeaa59d9c131cdd6fc75
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.21 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJSI41zAAoJEJWyH81tNOV9z/QIALgrOjo2cU1K9sA0XOMMbMQw
-lNvZ0RHi2LmdCjGZ9ckJjFQkW9eLu+RBa55w+sm2YBrtxkkGOGYALXR5iLRu3LQv
-jZNuyccwLxN5e/w5XAwKrpQmObhAADywhES6tUU8Lske24Xhsbyakuly2oNUDgYb
-LRtmf6QreoCfUxb2FGpyJ8z4E17OxV7WXK36IJ6Kl2K4DneOvC5fOnKJ6399MIBk
-IbrXP5IYM6nVlDX51MXOztp9LvwiaF51pUWOe6IYzBnK25ET+iUaU8cv2/zcIpMj
-190XIBhdKZIZJRXmsCeqXsexdx5br7LSI872cjZB3Z01v0xNK1tg4HT7bI+Cqus=
-=b6jV
+iQEcBAEBCAAGBQJSsN3IAAoJEJWyH81tNOV96/8IALWuvCeB1LNa/oNcJRsGlSnt
+tBG23PQ76KSv2Fl62O2TNGDZ96q9FjAZc0nc9WZsVc5FPLZEdynIJeemCCJkyvSV
+386uHo3cVU8iSuupjh62XByqpyx9tD+FUgmSZKMkPUXXaIgbZpkEQWBw/7ifNJ+x
+4W7+2cTzQHJ78RChV5FUogHHz78JXd08gVJ3IQaVvCCTCY+DbVVREzCfVd2H7YWp
+6N4dcHyUjrDRyebQgExfdRwUvjYUJYIEMFXWpvlDPbv3OFCQxbLRaOf7D4ZIfAeS
+Md9FRg1k7oDTDJ57pfqeC3JawkPv+dOKaTBw36RfODkCZBT9Gc+jUo0kuMV6gsc=
+=1ogx
 -----END PGP SIGNATURE-----
diff --git a/media-video/avidemux/avidemux-2.6.7.ebuild b/media-video/avidemux/avidemux-2.6.7.ebuild
new file mode 100644
index 000000000000..80822e685f0c
--- /dev/null
+++ b/media-video/avidemux/avidemux-2.6.7.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.7.ebuild,v 1.1 2013/12/17 23:26:58 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}/${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
+}
diff --git a/media-video/avidemux/avidemux-9999.ebuild b/media-video/avidemux/avidemux-9999.ebuild
index c7a63f73abf1..635c89141d29 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.3 2013/09/01 11:24:28 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-9999.ebuild,v 1.4 2013/12/17 23:26:58 tomwij Exp $
 
 EAPI="5"
 
@@ -25,7 +25,7 @@ if [[ ${PV} == *9999* ]] ; then
 	inherit git-2
 else
 	MY_P="${PN}_${PV}"
-	SRC_URI="mirror://sourceforge/${PN}/${PV}/${MY_P}.tar.gz"
+	SRC_URI="mirror://sourceforge/${PN}/${PN}/${PV}/${MY_P}.tar.gz"
 fi
 
 DEPEND="