Revision bump. Import the install fix I did for avidemux-plugins to bring back avidemux3_cli, as that executable went lost after making more use of the eclass; the cmake-utils.eclass currently doesn't support calling cmake-utils_src_install multiple times with different BUILD_DIR locations, see bug #483294 for more details. Thanks to Nikoli on IRC for reporting the missing executable.

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

3 files changed, 152 insertions, 9 deletions

diff --git a/media-video/avidemux/ChangeLog b/media-video/avidemux/ChangeLog
index cf9f958051e9..a003d4b70139 100644
--- a/media-video/avidemux/ChangeLog
+++ b/media-video/avidemux/ChangeLog
@@ -1,6 +1,16 @@
 # 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.225 2013/09/01 11:53:13 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/ChangeLog,v 1.226 2013/09/01 18:54:38 tomwij Exp $
+
+*avidemux-2.6.5-r1 (01 Sep 2013)
+
+  01 Sep 2013; Tom Wijsman <TomWij@gentoo.org> +avidemux-2.6.5-r1.ebuild:
+  Revision bump. Import the install fix I did for avidemux-plugins to bring back
+  avidemux3_cli, as that executable went lost after making more use of the
+  eclass; the cmake-utils.eclass currently doesn't support calling cmake-
+  utils_src_install multiple times with different BUILD_DIR locations, see bug
+  #483294 for more details. Thanks to Nikoli on IRC for reporting the missing
+  executable.
 
 *avidemux-2.6.5 (01 Sep 2013)
 
diff --git a/media-video/avidemux/Manifest b/media-video/avidemux/Manifest
index 1aae429dd8e0..4ffcc1ddeca7 100644
--- a/media-video/avidemux/Manifest
+++ b/media-video/avidemux/Manifest
@@ -12,18 +12,19 @@ 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-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 41771 SHA256 d06b94d7ebf61fb411bb8f2b00b133075bd92aef0c9cf901bd117f6e4239ef38 SHA512 3ab70bf78e22e92df6b7c52dce62bda9a651afe73d0af09cad2a2637710b42eb25af012e1a54cf6a1dfd85e331c514ca6798ca16b458f77be1f66e6f3b347f6b WHIRLPOOL fcb4e4cd157bd85201c651cf28c258d926cda40df9e9a34339e303feb8e3f6101a02e7e7dbda9f2328882329ad134e9d0a6a8918d121e515bf09b3924497a4f5
+MISC ChangeLog 42281 SHA256 dc4f671d1a3154231da41233f3af2384b3a3cf4b6571e2a7ba65313a773f9264 SHA512 656247465729cf30425ce40c5b082673be4dff9e9d1be200f7d46375179f5adf7411178da5ef76d35c00e9485f4539d9231aa536f298c15612dd678c48106c41 WHIRLPOOL b484cdbebffe04bb7d6df94a623431aebda167c04872aa1cfc1c6639101dec74c1dedfb23564b0ac0843cde2580086d97af459d78932abe5a0141c883868a555
 MISC metadata.xml 634 SHA256 fef58b86001e86d77d04f7eb322ad41ecbff8ae509d8792248bc5cb745f53ab0 SHA512 92a54687f81eeb1043edc49d2119966d09e301623ef36199c2464a02e70891abd620a15615728e0d2def20ccb9914d13b83bb063fed6f34af72e13a0dd26c12d WHIRLPOOL 838c3413336a9edd431bdb6e6863fb061ecda0495f3fb4e0bd2a7bd92b36064df7e08b1686c55907c46b62ec0f2746f206ecef11a30ceeaa59d9c131cdd6fc75
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.21 (GNU/Linux)
 
-iQEcBAEBCAAGBQJSIyqzAAoJEJWyH81tNOV9h7gIAKSPTmkB5xjGbHZ+4T/93TfJ
-vAdXrJbGSGs4FvBCBxpDkljPcmOnUMxyPdmXh8QHjqUIBpuy/M+X3hJRAdcaDz+Z
-+uta0eIsea1rV0LwwZ+pEzsOCsMmaNtERNo+v6WI4/lm2XmdWz8RZyuK1HeqsVuR
-24fSZxXuy9XiqRbhatJCR+W3KndhftNwiYTzqAEAZ98r0bXPrBH4a7Dz7OVt5Orx
-3+I2K8zE+IjKZVie6uW27a115mdfODnOktWB91eJZraY7say4TRlypgdp2d91wij
-bzJSkibvuzbitIl3EpPuBxjKIw0gTR7GURBTk8H51BjhrpmIBlakERKVj+RYYg8=
-=bUEP
+iQEcBAEBCAAGBQJSI41zAAoJEJWyH81tNOV9z/QIALgrOjo2cU1K9sA0XOMMbMQw
+lNvZ0RHi2LmdCjGZ9ckJjFQkW9eLu+RBa55w+sm2YBrtxkkGOGYALXR5iLRu3LQv
+jZNuyccwLxN5e/w5XAwKrpQmObhAADywhES6tUU8Lske24Xhsbyakuly2oNUDgYb
+LRtmf6QreoCfUxb2FGpyJ8z4E17OxV7WXK36IJ6Kl2K4DneOvC5fOnKJ6399MIBk
+IbrXP5IYM6nVlDX51MXOztp9LvwiaF51pUWOe6IYzBnK25ET+iUaU8cv2/zcIpMj
+190XIBhdKZIZJRXmsCeqXsexdx5br7LSI872cjZB3Z01v0xNK1tg4HT7bI+Cqus=
+=b6jV
 -----END PGP SIGNATURE-----
diff --git a/media-video/avidemux/avidemux-2.6.5-r1.ebuild b/media-video/avidemux/avidemux-2.6.5-r1.ebuild
new file mode 100644
index 000000000000..16d2dfba721e
--- /dev/null
+++ b/media-video/avidemux/avidemux-2.6.5-r1.ebuild
@@ -0,0 +1,132 @@
+# 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-r1.ebuild,v 1.1 2013/09/01 18:54:38 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
+		# cmake-utils_src_install doesn't respect BUILD_DIR
+		# and there sometimes is a preinstall phase present.
+		pushd "${S}/${process%%:*}" > /dev/null || die
+			grep '^preinstall/fast' Makefile && emake DESTDIR="${D}" preinstall/fast
+			grep '^install/fast' Makefile && emake DESTDIR="${D}" install/fast
+		popd > /dev/null || die
+	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
+}