Version bump to 2.6.3. Reworked USE flags to be more specific to each avidemux package, the way its meant to be; introduced additional support for some libraries through USE flags as a conseuence.

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

4 files changed, 148 insertions, 6 deletions

diff --git a/media-video/avidemux/ChangeLog b/media-video/avidemux/ChangeLog
index 93f584fe36bb..4fce7a180fef 100644
--- a/media-video/avidemux/ChangeLog
+++ b/media-video/avidemux/ChangeLog
@@ -1,6 +1,14 @@
 # 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.213 2013/03/24 11:11:12 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/ChangeLog,v 1.214 2013/03/29 15:10:33 tomwij Exp $
+
+*avidemux-2.6.3 (29 Mar 2013)
+
+  29 Mar 2013; Tom Wijsman <TomWij@gentoo.org> +avidemux-2.6.3.ebuild,
+  metadata.xml:
+  Version bump to 2.6.3. Reworked USE flags to be more specific to each avidemux
+  package, the way its meant to be; introduced additional support for some
+  libraries through USE flags as a conseuence.
 
   24 Mar 2013; Tom Wijsman <TomWij@gentoo.org> avidemux-2.6.2-r1.ebuild:
   Revision bump. Now that the package is revised, the install target for
diff --git a/media-video/avidemux/Manifest b/media-video/avidemux/Manifest
index 205a880b9a21..51963b7e09ae 100644
--- a/media-video/avidemux/Manifest
+++ b/media-video/avidemux/Manifest
@@ -1,8 +1,24 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX avidemux-2.5.4-build-plugins-fix.patch 497 SHA256 a470bfa50d86082f4e9ad31c5be630efe9a237f8dd504058278968770635ecef SHA512 f6023e1252463abeee7495c4fb034077ccd21f731c32b0cbb57cadb4880fd68d46a81220fb6553d1bf5af3eae4874adfb13ac17b06c5344144c04bffcf6791ee WHIRLPOOL 86d36e2e9f80623f314352639868d25d19899625424c7a09192a6639877a9acf666c5e9a04b690f5e7b784ba70a580a76988d5a2fd605df375b7bbf096310489
 AUX avidemux-2.5.6-ffmpeg-symbol-visibility.patch 869 SHA256 0ed5a1296fbe20f001657ed63dcbf758cf88aafb75a451c37513b825864956c0 SHA512 57db2ffaad2b4ffc46fac8f46810b1cf028013045392d1633f6e25fc65be6401fd0b5fc0991d09403d6dac39b8aacdf06f966aae70d97a53653ddc1aaa95a9bf WHIRLPOOL 093eec35dd59cb4165527bde0d2335e1ec8a88d1f8ef5cb4e51e88f6ba25204cdf645123b55204f1a8c15a3d066c5eb95f4c4ee24a6af22693a9f8e4b9378c2f
 DIST avidemux_2.5.6.tar.gz 14914123 SHA256 d6da7f2c4304368bd9c367a74a464b47d42fee9cada2960e70053d61c1ef9b8b SHA512 8a9dcfc61a396fc4f9f0a213269bcb574de0baa442d3165cfab0fe8e86309e7b0dd2ffe3e2d7ff8a8e6e3fd15da28699e8000367d92da0782fec6d5a38c1d77c WHIRLPOOL fecca87889b19a321a9fe13e734ca11a883c88152e5d59926ecd423b178bb26ef611ee00d8b2897f8a4a36a5c159d6c9f32733bc98fccced08532b8f060bd6ac
 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
 EBUILD avidemux-2.5.6-r2.ebuild 4393 SHA256 95fd317399d57acf75cf0baf73fb487c5143b3dd3af4b0aa1537a9b4c4994776 SHA512 bfc5e96966c46bb52d0f9da586b3c5ccb693561c5008c0d06d7921f649fee0a8fe13eca61947793d272e4e661d42c029e57779e4f7630c7db539fd39610b1c11 WHIRLPOOL 591f6ac35e8e83e0454e3545d9a70d76d27d9de3fee4ecdd6adf3cb4488637eaed8091771c193f3fc893e7094c6c659c5fef25985473171a95e54ac3064b7e16
 EBUILD avidemux-2.6.2-r1.ebuild 3995 SHA256 f04cce46c23a330f1e5b71dcc1688098d19c4395f9d9afd2c298bce6d0fd5e59 SHA512 afec443dffb22bf641344e7862290082860524c8d850aeaff31b28d260cfa7fbbcbeff03b27e6376efd53d4893e72d65d37b52a5c16530c8605f22a4d46c36f8 WHIRLPOOL 530c0d94419d0f2cfa7f036695e7ab9a3cf6b04599d3573a207e2ade48cfaf53efc9f661452291306ef081cd0a927cbddb083473f9dcfa50189d244b989be6da
-MISC ChangeLog 39922 SHA256 2d60b4725a45181b1adca17e3a162758ac45bd33e22feabf20b71f150feb27d4 SHA512 19a16f932f0c3ad83b0c167f1db53fe9e1efee2d42377bf2d289b76bcb7d7d980f59aac97b760fdcbda6d8e2abdcc7a2ecfde89b48f975cfca3974eb8eaad64d WHIRLPOOL 6f39ed48674292d66396a241f53409057dc2442cb941fb054393c109dd958ead6c6eb79acc29ac9ac25e2b88f4951ed6e2d44122e17f3e2c3a78d7ad82e1d510
-MISC metadata.xml 540 SHA256 f1410337c0d9a5ac6defbaa4a30c00711a2698bbd7f741db3153e9d055f3166b SHA512 964848c238bf50ce85bf58d794bb6c7b44b7607f7ecac873622f1cad830f30a7f727f7a103a8e05b2547a2961ca6e1a4db0471d151c3502b124fc583758ca49f WHIRLPOOL a3b194c507357fdf4fc7380d020f1f0306f37e19c5de35b9398a3d468208aab52fa7f41e484bce0728a4592cd3c11ce069a75cacfaf1f760215298b424322e53
+EBUILD avidemux-2.6.3.ebuild 3448 SHA256 a1ee7c4e4804c259509ebefd4a820cd86ec817c745c63b7b47918ef381983c4d SHA512 3d7b53d40e6d0158e71f8f7e6e5236c2bb55d7167214bad1cc87acc66d8830a081207d0ebe5fa700f1e07b75b572fbe1c1cc22593b8f8257f22f547640c01fc0 WHIRLPOOL 716bb05990de8e57157b3a350593f6e4f11f7fc570048dc6b7042cf2df699334ec86f2d97e920f2ccfe18eac716b58db4c5a618839cb95c530ecba8d0b812f0b
+MISC ChangeLog 40244 SHA256 2a5528832c88af3c46696b881db6a115ac8892bf239a5fe6a88e701b1deeb488 SHA512 83ec0c1a0ef3cbb3008893ca3ce0362e5d32af971773758b3aa5d8a19386614884bf86751a76e24cb81359b6a71e2a2e1bfa19d3684d9d5b41c2413d01f19460 WHIRLPOOL 2a43d687d8d8bc0d5e6433465a2c2821f8360969766adc75d5a2782d5f4b54311cda36a77f62302e8e4bc1203024a097b8fac878be30d6542c5b868033735dbc
+MISC metadata.xml 543 SHA256 3725b23e8cf87b3bfd7539de98eacd624163f392c51655382d1b92c4bb09507d SHA512 16b3515b92d74a68b8db832e905f341b11100bcfd248a5bff148f1d407edf387609f07e468a5feb38d66b8866ea30e957f337a30c1090c2819dc12e0d0b58787 WHIRLPOOL 64fb8ff1e670253be50f817320d858e54d12bf1d9f558f0a5f229e1832fec11566aafafc3678ee3d2cdf967d14887c69177d4bbf8ac081c12853daac760d826a
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBCAAGBQJRVa7HAAoJEJWyH81tNOV9DIoIAIbZvN+43ujZ3KWUDbRlBf1m
+f/NWXlb9NiBBoWlbin+3YrEyXtT02QZ4njlAuQ02hlsXoXADwnyI1VwCSl10gqag
+KsD7vUgLzqjrNvQ/hNmsb5iVLQHRFH3+OAgCclNL7MoM8OkkzqFYTq5z1fGIUb3n
+J/iXEsni3efAdNGIGuoJbg8klxHi//KnehBcG5LvVGzoY8iKJ6SqwFiWRxdue4q3
+88JjD4It6qrAKi1kWEYNg8JT0cgod8ZXw+InIJA8tnwpjUzRrLRwlT08Fr6k0U5y
+MzWh2ykJTKLZFDlEfvZc+arTDgch/8+jApRXl+fwTzEsaWIKmAVyJF1nWnwHBBM=
+=9a0m
+-----END PGP SIGNATURE-----
diff --git a/media-video/avidemux/avidemux-2.6.3.ebuild b/media-video/avidemux/avidemux-2.6.3.ebuild
new file mode 100644
index 000000000000..95166746c592
--- /dev/null
+++ b/media-video/avidemux/avidemux-2.6.3.ebuild
@@ -0,0 +1,118 @@
+# 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.3.ebuild,v 1.1 2013/03/29 15:10:33 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 toolchain-funcs
+
+SLOT="2.6"
+MY_P="${PN}_${PV}"
+
+DESCRIPTION="Video editor designed for simple cutting, filtering and encoding tasks."
+HOMEPAGE="http://fixounet.free.fr/${PN}"
+SRC_URI="mirror://sourceforge/${PN}/${PV}/${MY_P}.tar.gz"
+
+# Multiple licenses because of all the bundled stuff.
+LICENSE="GPL-1 GPL-2 MIT PSF-2 public-domain"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug opengl nls qt4 sdl vdpau xv"
+
+DEPEND="=media-libs/avidemux-core-${PV}[nls?,sdl?,vdpau?,xv?]
+	opengl? ( virtual/opengl )
+	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() {
+	base_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 x mycmakeargs
+
+	mycmakeargs="
+		$(cmake-utils_use nls GETTEXT)
+		$(cmake-utils_use sdl SDL)
+		$(cmake-utils_use vdpau VDPAU)
+		$(cmake-utils_use xv XVIDEO)
+	"
+	use debug && POSTFIX="_debug" && mycmakeargs+="-DVERBOSE=1 -DCMAKE_BUILD_TYPE=Debug"
+
+	for PROCESS in ${PROCESSES} ; do
+		SOURCE="${PROCESS%%:*}"
+		DEST="${PROCESS#*:}"
+
+		mkdir "${S}"/${SOURCE} || die "Can't create build folder."
+		cd "${S}"/${SOURCE} || die "Can't enter build folder."
+
+		cmake -DCMAKE_INSTALL_PREFIX="/usr" \
+			${mycmakeargs} -G "Unix Makefiles" ../"${DEST}${POSTFIX}/" || die "cmake failed."
+	done
+}
+
+src_compile() {
+	# 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
+
+	for PROCESS in ${PROCESSES} ; do
+		SOURCE="${PROCESS%%:*}"
+
+		cd "${S}/${SOURCE}" || die "Can't enter build folder."
+		emake CC="$(tc-getCC)" CXX="$(tc-getCXX)"
+	done
+}
+
+src_install() {
+	for PROCESS in ${PROCESSES} ; do
+		SOURCE="${PROCESS%%:*}"
+
+		cd "${S}/${SOURCE}" || die "Can't enter build folder."
+		emake DESTDIR="${ED}" install
+	done
+
+	cd "${S}" || die "Can't enter source folder."
+
+	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
+	use qt4 && fperms +x /usr/bin/avidemux3_qt4
+
+	newicon ${PN}_icon.png ${PN}-2.6.png
+	use qt4 && domenu ${PN}-2.6.desktop
+
+	dodoc AUTHORS README
+}
diff --git a/media-video/avidemux/metadata.xml b/media-video/avidemux/metadata.xml
index f4aa850387b7..16bd0c9004a7 100644
--- a/media-video/avidemux/metadata.xml
+++ b/media-video/avidemux/metadata.xml
@@ -7,8 +7,8 @@
   </maintainer>
   <herd>video</herd>
   <use>
-    <flag name="aften">Enable A/52 (AC-3) audio encoder support</flag>
-    <flag name="amr">Enable Adaptive Multi-Rate format support via <pkg>media-libs/opencore-amr</pkg></flag>
-    <flag name="vpx">Enable VP8 codec support via <pkg>media-libs/libvpx</pkg></flag>
+    <flag name="aften">Enable A/52 (AC-3) audio encoder support.</flag>
+    <flag name="amr">Enable Adaptive Multi-Rate format support via <pkg>media-libs/opencore-amr</pkg>.</flag>
+    <flag name="vpx">Enable VP8 codec support via <pkg>media-libs/libvpx</pkg>.</flag>
   </use>
 </pkgmetadata>