Version bump

Package-Manager: portage-2.1.11.37/cvs/Linux x86_64
Manifest-Sign-Key: 0xB4AFF2C2

3 files changed, 214 insertions, 15 deletions

diff --git a/media-video/avidemux/ChangeLog b/media-video/avidemux/ChangeLog
index 65ad70fbee66..2c0e0062306e 100644
--- a/media-video/avidemux/ChangeLog
+++ b/media-video/avidemux/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/avidemux
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/ChangeLog,v 1.200 2012/11/04 11:08:13 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/ChangeLog,v 1.201 2012/12/22 10:56:32 hwoarang Exp $
+
+*avidemux-2.6.1 (22 Dec 2012)
+
+  22 Dec 2012; Markos Chandras <hwoarang@gentoo.org> +avidemux-2.6.1.ebuild:
+  Version bump
 
 *avidemux-2.6.0 (04 Nov 2012)
 
diff --git a/media-video/avidemux/Manifest b/media-video/avidemux/Manifest
index 8329a7d09493..2e182e77a149 100644
--- a/media-video/avidemux/Manifest
+++ b/media-video/avidemux/Manifest
@@ -5,24 +5,26 @@ AUX avidemux-2.5.4-build-plugins-fix.patch 497 SHA256 a470bfa50d86082f4e9ad31c5b
 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.0.tar.gz 16145705 SHA256 5ee2d898794141b47bc288e9b0fb770eff831125a586e7e7046f0e2506ea4580 SHA512 a2d6d440eb0168bd40b51f7ae5980621e5dbddc9c1a3dbd56a4158f7f4e6c3d951caf2fe091fa37a0bb3d4b40ec385fec904611b415cb37fe9df0c66906bcb9d WHIRLPOOL 09746c3217320ea26cb020eb0efdc7f0c376b2af49a293db26a2c44d2c2f01d4bdbabbccc4366980d61a9d80d87b3bf36d62df8c2629aee4b400e4bebf6374da
+DIST avidemux_2.6.1.tar.gz 16537020 SHA256 17ad853a306e6cfed9166ee36b014748ea7b24a62e035b489ed97fbd8d91afc2 SHA512 3a4e1ca21abe014c944549dbb51e1b8588fdd71b147191f01ee47a402ef45a35e8cf5cbf08924f7e1581f961a3ec3eaec570f9c8c3081abffa9752b11008c26f WHIRLPOOL addd80555f423253a46c02a75980e2b70bf03631a378daae86fc66efca4420ae1a2e07b04ba5c00e4e5a7ab7c522344540b3f6c36209233ce1a8d7cde09c1309
 EBUILD avidemux-2.5.6-r2.ebuild 4395 SHA256 bc3e9b41f1dfed694b312cc07514f8448bffe128f64f21340e1d83abaac0de27 SHA512 d0e6cbb39055e2487b5d34d2bda9d391e911a4e58ecf84321cde8d58b8e965a0072bf6197b66c56aa2af11aa11980fb2a2e3026551bebd245d91cc4055ebe9ed WHIRLPOOL 24f6b8961eba7df2b61657179a45d8d8fd9598414fd9bb005ebf1b502ece5a2f608efaaf0ae0617fbb21f701db8e3d31f1b0f6362202e83671cca8762d82cbc0
 EBUILD avidemux-2.6.0.ebuild 5954 SHA256 5d1d88ccba8663bbad99ff69c5fb1df1b97f5d6792ad70c3c73520472d94be1e SHA512 ab0a21517164609f7f22dd167aa41fecde6f5ec387b2a7d6956e670875a64a782c6c7c16e9703ed7c52dc3c86c1f436aa57b12fdced2e251e57e38f40ef354b2 WHIRLPOOL 05f9443d6ead7cd77568cce0e7db18ab55b2f1221ed03f225957d4b63f0a1d21e7eb19bc0db6db756440ed57f83effc32a681f68714567cd94395affb23c68c4
-MISC ChangeLog 36777 SHA256 3bb382948ab824e829b8735237ef1eb3b1a5951dbe1c8c65b91c45c0c7b1f1bc SHA512 75f9ccf0452dd18b802dda90d756da96f4fb32179a6d337e4d1c5835b07d6637b12a86948473c1982248ec6839ce073db1fffc8b8ee66110d0d4a2fbd94c7d05 WHIRLPOOL 72bcfe95738e8d3dce4de63180a55389e390c300856a37edf56ea8269e8cc290a669c04afdcfc5b77b9c149eeafb017ae97cefa49f61ef08bc9e46ddc575059b
+EBUILD avidemux-2.6.1.ebuild 5954 SHA256 c1f4b705929e6d7e630c88bdb3db1939a6acb940771bd02ff56ab337fbc75fd0 SHA512 d7281321bf1fc5661754c4af1be610e8ed1556cbaa3bced5d7c9b489d6f871347f9f705a61df4b81ede7ffb1cb3cc453f4d18eda0dd4c27b7ccd2cf56d947165 WHIRLPOOL 1f3a56399568256fbc2e81ecf4033084d51f1057db2fca049e0b9e3cd95f9f53f88453a160f2b9f789f103cd13c2cf6821abd13712c7d776b4f137f363faa7c9
+MISC ChangeLog 36901 SHA256 43cbb4a886c68f5723962d929102036e4ccec3b2fe3217748adf76211f4d309d SHA512 8f049baba4aea8eb58a27179b1d4c85baff6f29354d4d706caa54caa9daa85d6e8cc762d46925a7b0bb895b23ddf2b485d5db3da15161d41c29ba53b292192b9 WHIRLPOOL bb50a96f2c0daee76989159f74ed157acfbf4d0eafa3cefbb122a04ac97dd0815f866060d1c68a920462a0caf1560a45cbbc853c13ffef61684a233f8205cddc
 MISC metadata.xml 444 SHA256 719b91b997e45ef5fe8bf787fcaff8bc8316a5339e7beebf1e1233a3ec7dd23a SHA512 d1e5eb78efeac9e49a5d94f38ada0d204e1900bf862423a812da68eda51578a5b08b63fe8b0160942da44e3c724559a23a169d04cdd294f2bf0a40c966ed0bce WHIRLPOOL d113bd03288122394627962a7565eeb079d4a0176453505d56480df11135a39beb4b945774c49b96a61a9d702423d0219f1babed1c077e9a540315579f40360d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQlkydAAoJEPqDWhW0r/LCQcgP+waHzGEIEjAWBW5P+rtDMO6W
-qtAgE0KA2mu1/739kAEnz64y/cYSjq0wXtTNUk940/lulaIfKU76AixfpG0u4BWc
-E3UeWxoH5n5ILE9eOmCWzBsuTtAOs0h0GgtKXLZKuXIbHAjyjVOQyENeC/9fIiBj
-gLa8cbPyjojbDeagLcUn1BOsILTP5B65LCh/m1el45Cjr4B4ckfSvsaIBsrq/ZA7
-LJOW9HABXjbCum6r3remOGZC8gd39kinmoh1H+Dp6NFjEAHHTe0v6W4+1U4Ibhx0
-eLKZgmWsPpDjQPWtHBd6XaSXKBd7XUDvkgi4wnVL2CQ7KnINEk1bgODyRMI9CT0y
-J/WGz5osKWPo0o7fldpoURDx4BtKS+wUjN/F56FIGf71N+VILRuJzGhzERycfXOp
-LAsW3qHjxr5B6U7megL0ng4hKfJ7jc2DAzwp8P/722U1bV0Gy0oenfbg24fvlbPo
-GmQZC3ERrVfMnyMBQNJCeO1MpNj/pQP5+Z22iBZSlpg3H/HnxEjtKixiuBihHl3M
-MIPS7dlyuxtpAjyH8XJbu0CIh5HRUY2Z1ivDpoZteo3WZ8gMPWP2TycbRLxlwmoH
-awu6+e1xJuNE/96wdvrD6WlmH12vplZLHQoeBsWlAUHIbsMStaYHRlGRVuAIUmbm
-zS4BNUCHqPOpi9XHecOu
-=4ojU
+iQIcBAEBCAAGBQJQ1ZHZAAoJEPqDWhW0r/LCFYgP/AijXrhRr/UWrETQZI2IwpNj
+r0KoCpXeKThN4mr/ssxFvoqPbdubNjkCYrFcwy/rI/4AVUQlYj8lxVTQnC/Le/vF
+Q4YddJhJrjt08QtFnPyvz0LREb8yogpcS+XcJDf64/ZC+381JBZ5Hz8WPcpbWBGW
+TMF5i4EUBLNonh6twpMidIoxiO0NW4qQhY9BKcLgkn/xYu5d4MtQAY9T43hSXqkF
+aoj43TsKghrJQ8dmPv6cfyehQqEfExLyfHNpqtacpaWmcZPr5vkP10SSFZ97qIbC
+cPztHVId1+EU7XtCIIMUdb2V9cMoi7fvjuRliNZ2ND9HEKOifFuYbKPfJd4kEVwL
+mYSA+W8ZK3B+G9kV8e/BhgoLMTq58IuPWD1+Tve6qFbv2uK1eFkSBMz755HqQT0z
+HyeV8ZNgJHu7oy7so4Q3clBU4H2rwgJbXX/IlvhKGrsaQGci/T3CuncXaWfON4cO
+XPsfgVAf20QEogxR7+tBG13iRg8THhkgvT0LQjGS0OaPFRCuV0M723V6WakpegoY
+XBfJb3HFflA5Yb0SvsHEsj280JDtEGLjWwxz1K4fCMfpOx5u1EH9GoKxtmDAVFNc
+OcxeP4UO0+tMza/KlGxJoAkMFR29Iiz3O5wU2wBIlX0oIvme8nNH89XVqd9xuVzD
+quL0Pqlp4k1ASk7WG8tX
+=ynd3
 -----END PGP SIGNATURE-----
diff --git a/media-video/avidemux/avidemux-2.6.1.ebuild b/media-video/avidemux/avidemux-2.6.1.ebuild
new file mode 100644
index 000000000000..99aa98242a77
--- /dev/null
+++ b/media-video/avidemux/avidemux-2.6.1.ebuild
@@ -0,0 +1,192 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-2.6.1.ebuild,v 1.1 2012/12/22 10:56:32 hwoarang Exp $
+
+EAPI=4
+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
+
+MY_P=${PN}_${PV}
+
+DESCRIPTION="Video editor designed for simple cutting, filtering and encoding tasks"
+HOMEPAGE="http://fixounet.free.fr/avidemux"
+SRC_URI="mirror://sourceforge/${PN}/${PV}/${MY_P}.tar.gz"
+
+# Multiple licenses because of all the bundled stuff
+LICENSE="GPL-2 MIT GPL-1 public-domain PSF-2"
+SLOT="2.6"
+KEYWORDS="~amd64 ~x86"
+IUSE="aften a52 alsa amr debug dts fontconfig gtk jack
+	lame libsamplerate mmx nls qt4 sdl vorbis truetype xvid xv oss x264"
+
+RDEPEND="
+	virtual/libiconv
+	dev-libs/libxml2
+	media-libs/libpng
+	>=dev-lang/spidermonkey-1.5-r2
+	gtk? ( >=x11-libs/gtk+-2.6.0:2 )
+	qt4? ( >=x11-libs/qt-gui-4.8.3:4 )
+	x264? ( media-libs/x264 )
+	xvid? ( media-libs/xvid )
+	aften? ( media-libs/aften )
+	amr? ( media-libs/opencore-amr )
+	lame? ( media-sound/lame )
+	dts? ( media-libs/libdca )
+	vorbis? ( media-libs/libvorbis )
+	alsa? ( >=media-libs/alsa-lib-1.0.3b-r2 )
+	jack? (
+		media-sound/jack-audio-connection-kit
+		libsamplerate? ( media-libs/libsamplerate )
+	)
+	truetype? ( >=media-libs/freetype-2.1.5 )
+	fontconfig? ( media-libs/fontconfig )
+	sdl? ( media-libs/libsdl )
+	xv? ( x11-libs/libXv )
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXrender
+"
+DEPEND="
+	$RDEPEND
+	oss? ( virtual/os-headers )
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+"
+S=${WORKDIR}/${MY_P}
+BUILD_S=${WORKDIR}/${P}_build
+
+avidemux_build_process() {
+	local BUILDDIR="${1}"
+	local SOURCEDIR="${2}"
+	local mycmakeargs="${3}"
+	EXTRA="${mycmakeargs}"
+	BUILDER="Unix Makefiles"
+	FAKEROOT_DIR="${S}"/gentoo-install
+	SOURCEDIR="${2}"
+	mkdir ${BUILDDIR} && cd "${BUILDDIR}"
+	einfo "Configuring: ${BUILDDIR}"
+	cmake -DFAKEROOT="${FAKEROOT_DIR}" -DAVIDEMUX_SOURCE_DIR="${S}" \
+		-DCMAKE_INSTALL_PREFIX="/usr" \
+		${EXTRA} -G "${BUILDER}" ../"${SOURCEDIR}/"
+	# for some reason, core needs -j1. That's what they do in their
+	# script as well
+	if [[ ${BUILDDIR} == "buildCore" ]]; then
+		extra_opts="-j1"
+	else
+		unset extra_opts
+	fi
+	einfo "Building: ${BUILDDIR}"
+	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" ${extra_opts}
+
+	einfo "Fake install: ${BUILDDIR}"
+	# pretend that you installed it somewhere
+	emake DESTDIR="${FAKEROOT_DIR}" ${extra_opts} install
+
+	cd ..
+}
+
+src_prepare() {
+	base_src_prepare
+
+	# TODO: convert to l10n.eclass usage
+	local lingua= po_files= qt_ts_files= avidemux_ts_files=
+	for lingua in ${LINGUAS}; do
+		if has ${lingua} ${AVIDEMUX_LANGS}; then
+			if [[ -e ${S}/po/${lingua}.po ]]; then
+				po_files+=" \${po_subdir}/${lingua}.po"
+			fi
+			if [[ -e ${S}/po/qt_${lingua}.ts ]]; then
+				qt_ts_files+=" \${ts_subdir}/qt_${lingua}.ts"
+			fi
+			if [[ -e ${S}/po/${PN}_${lingua}.ts ]]; then
+				avidemux_ts_files+=" \${ts_subdir}/${PN}_${lingua}.ts"
+			fi
+		fi
+	done
+
+	sed -i -e "s!FILE(GLOB po_files .*)!SET(po_files ${po_files})!" \
+		"${S}/cmake/Po.cmake" || die "sed failed"
+	sed -i -e "s!FILE(GLOB.*qt.*)!SET(ts_files ${qt_ts_files})!" \
+	    -e "s!FILE(GLOB.*avidemux.*)!SET(ts_files ${avidemux_ts_files})!" \
+		"${S}/cmake/Ts.cmake" || die "sed failed"
+
+	# Fix icon name -> avidemux-2.6.png
+	sed -i -e "/^Icon/ s:${PN}:${PN}-2.6:" ${PN}2.desktop || die
+	# 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
+	# Now rename to not collide with 2.5
+	mv ${PN}2.desktop ${PN}-2.6.desktop
+	# fix major issues in desktop files wrt bugs #291453, #316599, #430500
+	# duplicate desktop file
+	cp ${PN}-2.6.desktop ${PN}-2.6-gtk.desktop || die
+	# 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
+}
+
+src_configure() {
+	true;
+}
+
+src_compile() {
+	# add lax vector typing for PowerPC
+	if use ppc || use ppc64; then
+		append-cflags -flax-vector-conversions
+	fi
+	# bug 432322
+	use x86 && replace-flags -O0 -O1
+
+	local x mycmakeargs
+	# default args
+	use debug \
+		&& POSTFIX="_debug" \
+		&& mycmakeargs+="-DVERBOSE=1 -DCMAKE_BUILD_TYPE=Debug"
+
+	mycmakeargs="
+		$(for x in ${IUSE}; do cmake-utils_use $x; done)
+		$(cmake-utils_use dts LIBDCA)
+		$(cmake-utils_use truetype FREETYPE2)
+		$(cmake-utils_use nls GETTEXT)
+		$(cmake-utils_use xv XVIDEO)
+		$(cmake-utils_use amr OPENCORE_AMRWB)
+		$(cmake-utils_use amr OPENCORE_AMRNB)
+	"
+
+	# Lets try to do all the s**t that bootStrap.bash is
+	# trying to do
+	use qt4 && with_qt4=1
+	use gtk && with_gtk=1
+
+	avidemux_build_process buildCore avidemux_core${POSTFIX} "${mycmakeargs}"
+	avidemux_build_process buildCli avidemux/cli${POSTFIX} "${mycmakeargs}"
+	mycmakeargs+="-DPLUGIN_UI=COMMON "
+	avidemux_build_process buildPluginsCommon avidemux_plugins${POSTFIX} "${mycmakeargs}"
+	mycmakeargs+="-DPLUGIN_UI=CLI "
+	avidemux_build_process buildPluginsCLI avidemux_plugins${POSTFIX} "${mycmakeargs}"
+
+	if use qt4; then
+		avidemux_build_process buildQt4 avidemux/qt4${POSTFIX} "${mycmakeargs}"
+		mycmakeargs+="-DPLUGIN_UI=QT4 "
+		avidemux_build_process buildPluginsQt4 avidemux_plugins${POSTFIX} "${mycmakeargs}"
+	fi
+	if use gtk; then
+		avidemux_build_process buildGtk avidemux/gtk${POSTFIX} "${mycmakeargs}"
+		mycmakeargs+="-DPLUGIN_UI=GTK "
+		avidemux_build_process buildPluginsGtk avidemux_plugins${POSTFIX} "${mycmakeargs}"
+	fi
+}
+
+src_install() {
+	# everything is installed(?) in ${S}/gentoo-install.
+	# Move it to ${D}.
+	insinto /
+	doins -r "${S}"/gentoo-install/*
+	# Mark executables with +x
+	find "${ED}"/usr/bin -exec chmod a+x {} \;
+
+	newicon ${PN}_icon.png ${PN}-2.6.png
+	use gtk && domenu ${PN}-2.6-gtk.desktop
+	use qt4 && domenu ${PN}-2.6.desktop
+	dodoc AUTHORS README
+}