Version bump wrt #203164, thanks to Joe for reporting.

Package-Manager: portage-2.1.4_rc11

6 files changed, 199 insertions, 15 deletions

diff --git a/media-video/avidemux/ChangeLog b/media-video/avidemux/ChangeLog
index 11a4d0c23143..5f835a42db39 100644
--- a/media-video/avidemux/ChangeLog
+++ b/media-video/avidemux/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-video/avidemux
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/ChangeLog,v 1.120 2007/12/25 17:21:08 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/ChangeLog,v 1.121 2007/12/28 18:53:57 drac Exp $
+
+*avidemux-2.4 (28 Dec 2007)
+
+  28 Dec 2007; Samuli Suominen <drac@gentoo.org>
+  +files/avidemux-2.4-i18n.patch, +files/avidemux-2.4-libdca.patch,
+  +avidemux-2.4.ebuild:
+  Version bump wrt #203164, thanks to Joe for reporting.
 
   25 Dec 2007; Christian Heim <phreak@gentoo.org> metadata.xml:
   Removing zypher from metadata.xml as per #26909.
diff --git a/media-video/avidemux/Manifest b/media-video/avidemux/Manifest
index a0e030c2f126..0a09472ca9e4 100644
--- a/media-video/avidemux/Manifest
+++ b/media-video/avidemux/Manifest
@@ -1,6 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX avidemux-2.4-i18n.patch 1676 RMD160 5cc06702f8a4d96a12630d4f543035baa5ccac0f SHA1 32557519caeed3b236f48b40d5ee8953b2d03197 SHA256 ab978ed96a2689af2e01ad8b9a08ed9bd4b2f8e4c6721d9598964f1fd8a5e6d2
+MD5 c76ab4a1434689b5be2084c4af66298c files/avidemux-2.4-i18n.patch 1676
+RMD160 5cc06702f8a4d96a12630d4f543035baa5ccac0f files/avidemux-2.4-i18n.patch 1676
+SHA256 ab978ed96a2689af2e01ad8b9a08ed9bd4b2f8e4c6721d9598964f1fd8a5e6d2 files/avidemux-2.4-i18n.patch 1676
+AUX avidemux-2.4-libdca.patch 949 RMD160 53ec97b26441f2617566dbb949496be72ecbc07c SHA1 91ff55452ed9bdaabd76fa41add4c405bf6b8405 SHA256 95f49dbe69a4621ef8f33795898623156222e16d0774a6c454e2e303c6290c3e
+MD5 693fb436f9a0a784dc9f3285868dd528 files/avidemux-2.4-libdca.patch 949
+RMD160 53ec97b26441f2617566dbb949496be72ecbc07c files/avidemux-2.4-libdca.patch 949
+SHA256 95f49dbe69a4621ef8f33795898623156222e16d0774a6c454e2e303c6290c3e files/avidemux-2.4-libdca.patch 949
 AUX avidemux-2.4_pre3-i18n.patch 1748 RMD160 e5ef386c325091268d2222be9606284d4d63de0f SHA1 122ccad94d82648c7f01aabe8d2dc5ac2ef27d66 SHA256 4f5ce419edc37f9d7ee0d6d55376eed55e4662775db3fdf9ab0885dfe1a064e3
 MD5 7d95abd45babe5a8eca7e9202c4f1261 files/avidemux-2.4_pre3-i18n.patch 1748
 RMD160 e5ef386c325091268d2222be9606284d4d63de0f files/avidemux-2.4_pre3-i18n.patch 1748
@@ -9,26 +14,27 @@ AUX avidemux-2.4_pre3-libdca.patch 1029 RMD160 5b792477656c2864711d16574e4134c85
 MD5 2abe84b084d8eb2ee4166e86bafae7d8 files/avidemux-2.4_pre3-libdca.patch 1029
 RMD160 5b792477656c2864711d16574e4134c8573daec0 files/avidemux-2.4_pre3-libdca.patch 1029
 SHA256 81a460a306c469771ab4ae9b3a2c5f97dc61cb738aad19e1a71a93d952b55e1a files/avidemux-2.4_pre3-libdca.patch 1029
+DIST avidemux_2.4.tar.gz 5728629 RMD160 2e02e2acc6f87cd8ecf781e3c4a37f03d9365640 SHA1 4a055580d65adbefcd52a159da9059f376a56cc6 SHA256 7ec094464637a8e4ba81021bcae15f04edbd3239d210fe6f9d2ef795c7febf11
 DIST avidemux_2.4_preview3.tar.gz 5715054 RMD160 034386aabeec3530bc38b3d0e3e31f324d923fb5 SHA1 c780cedfc3e7fe45860780cc57c7f29b5245ba24 SHA256 9f96a266dbb3dc8ca44545f1778616e436f879053904c9f751a271ae7b95d09f
+EBUILD avidemux-2.4.ebuild 3566 RMD160 1b9386d91a4d159aa2bb7b81f6bdfb20e076152e SHA1 f87cdc54186494bd0ffb938d722a94d8d303688d SHA256 9e2fbe07f7ab4a4f5d4b6c4e8cd87402ba6cb935d268cc0da1b2341829ee4612
+MD5 86e2ae63105ae486c403c59bc6165bea avidemux-2.4.ebuild 3566
+RMD160 1b9386d91a4d159aa2bb7b81f6bdfb20e076152e avidemux-2.4.ebuild 3566
+SHA256 9e2fbe07f7ab4a4f5d4b6c4e8cd87402ba6cb935d268cc0da1b2341829ee4612 avidemux-2.4.ebuild 3566
 EBUILD avidemux-2.4_pre3.ebuild 3394 RMD160 961ffba3a148682a25d8bf09d61e40a67b50eb8e SHA1 a3775ed216a85778f79623e1816f4a3625287430 SHA256 48ac71a984def772e5d21bddf18180ccd10782fe616d3614183dbd558c2449a9
 MD5 e695080c605e3b7172e1fed7bc58095c avidemux-2.4_pre3.ebuild 3394
 RMD160 961ffba3a148682a25d8bf09d61e40a67b50eb8e avidemux-2.4_pre3.ebuild 3394
 SHA256 48ac71a984def772e5d21bddf18180ccd10782fe616d3614183dbd558c2449a9 avidemux-2.4_pre3.ebuild 3394
-MISC ChangeLog 21632 RMD160 25969f9fb6b703553ff348f02335e5932aa9c1c6 SHA1 69f7aae9539c968bc85c9176dfc38b97a9814529 SHA256 e314696102705f4d9c72c34a09dd21d0b2628239a7ba5af30b15b2d675f18f63
-MD5 b36620266527e2b120d454a61ee606c2 ChangeLog 21632
-RMD160 25969f9fb6b703553ff348f02335e5932aa9c1c6 ChangeLog 21632
-SHA256 e314696102705f4d9c72c34a09dd21d0b2628239a7ba5af30b15b2d675f18f63 ChangeLog 21632
+MISC ChangeLog 21858 RMD160 bbbc6066916ecd361f7fd44aecb0d3fdc47b759c SHA1 1b1451dbcd4fa9587a735e9b22813aa3d15bf0d5 SHA256 4654122a73f560a9644356e11544314e1ba4d1cb201dbd82309b2e88bfb8ba90
+MD5 bd5601d181661862d4ce21a00315e369 ChangeLog 21858
+RMD160 bbbc6066916ecd361f7fd44aecb0d3fdc47b759c ChangeLog 21858
+SHA256 4654122a73f560a9644356e11544314e1ba4d1cb201dbd82309b2e88bfb8ba90 ChangeLog 21858
 MISC metadata.xml 159 RMD160 21717801992314b5fc85dfeb6da77bf71fc54c7e SHA1 26b6ea95dc60c40d9b482830ce7e7c54233a7698 SHA256 38df217d3a650829cd34e6c74bd2710a01751ccd5511b5be296e3f48dd4d81cb
 MD5 dc09902c6f418a17f6b695df093e36c6 metadata.xml 159
 RMD160 21717801992314b5fc85dfeb6da77bf71fc54c7e metadata.xml 159
 SHA256 38df217d3a650829cd34e6c74bd2710a01751ccd5511b5be296e3f48dd4d81cb metadata.xml 159
+MD5 7cb5bffd7e401cab59cc5a9d6d54bf5d files/digest-avidemux-2.4 241
+RMD160 e3241f90b0583605c4639be0fadde81f755fc0de files/digest-avidemux-2.4 241
+SHA256 92fcb4404401fd995b91eac8eff171e3e5306dc2f9bd7a2747b7457d62a9c16d files/digest-avidemux-2.4 241
 MD5 591e880ea2e489006a61135717fc4e49 files/digest-avidemux-2.4_pre3 268
 RMD160 3800c9dcba4847b9833235d8c914492a8a5ebcf1 files/digest-avidemux-2.4_pre3 268
 SHA256 3f70e0f6247bef733d54a6a888ea36449e642777efad8b88b9d2c075bb521179 files/digest-avidemux-2.4_pre3 268
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
-
-iD8DBQFHcTwJyuNVb5qfaOYRAutIAJ4sc+R1ZBiERpMa+xfkKlEeGmErNwCfW6Vk
-7K2E4kfMropjy/RiWeI43eI=
-=1iTy
------END PGP SIGNATURE-----
diff --git a/media-video/avidemux/avidemux-2.4.ebuild b/media-video/avidemux/avidemux-2.4.ebuild
new file mode 100644
index 000000000000..d4d44090a87b
--- /dev/null
+++ b/media-video/avidemux/avidemux-2.4.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-2.4.ebuild,v 1.1 2007/12/28 18:53:57 drac Exp $
+
+inherit cmake-utils eutils
+
+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}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="2"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="aac aften alsa amrnb arts dts encode esd fontconfig jack libsamplerate
+x264 xv xvid vorbis truetype gtk qt4"
+
+RDEPEND="dev-libs/libxml2
+	media-libs/libpng
+	media-libs/libsdl
+	>=dev-libs/glib-2
+	alsa? ( media-libs/alsa-lib )
+	fontconfig? ( media-libs/fontconfig )
+	xv? ( x11-libs/libXv )
+	esd? ( media-sound/esound )
+	jack? ( media-sound/jack-audio-connection-kit )
+	aften? ( media-libs/aften )
+	libsamplerate? ( media-libs/libsamplerate )
+	xvid? ( media-libs/xvid )
+	amrnb? ( media-libs/amrnb )
+	dts? ( media-libs/libdca )
+	x264? ( media-libs/x264-svn )
+	aac? ( media-libs/faad2 )
+	vorbis? ( media-libs/libvorbis )
+	arts? ( kde-base/arts )
+	truetype? ( media-libs/freetype )
+	gtk? ( >=x11-libs/gtk+-2
+		x11-libs/libX11 )
+	qt4? ( >=x11-libs/qt-4
+		x11-libs/libX11 )
+	encode? (
+		aac? ( media-libs/faac )
+		media-sound/lame )"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	dev-util/pkgconfig
+	>=dev-util/cmake-2.4.4"
+
+S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	# TODO. Needs to be reported upstream.
+	epatch "${FILESDIR}"/${P}-libdca.patch
+	epatch "${FILESDIR}"/${P}-i18n.patch
+}
+
+src_compile() {
+	# Commented out options cause compilation errors, some
+	# might need -Wl,--as-needed in LDFLAGS and all USE
+	# flags disabled for reproducing. -drac
+	# TODO. Needs to be fixed, or reported upstream.
+
+	local mycmakeargs
+
+	# ConfigureChecks.cmake
+	use alsa || mycmakeargs="${mycmakeargs} -DNO_ALSA=1"
+	#use oss || mycmakeargs="${mycmakeargs} -DNO_OSS=1"
+	#use nls || mycmakeargs="${mycmakeargs} -DNO_NLS=1"
+	#use sdl || mycmakeargs="${mycmakeargs} -DNO_SDL=1"
+
+	# ConfigureChecks.cmake -> ADM_CHECK_HL -> cmake/adm_checkHeaderLib.cmake
+	use fontconfig || mycmakeargs="${mycmakeargs} -DNO_FontConfig=1"
+	use xv || mycmakeargs="${mycmakeargs} -DNO_Xvideo=1"
+	use esd || mycmakeargs="${mycmakeargs} -DNO_Esd=1"
+	use jack || mycmakeargs="${mycmakeargs} -DNO_Jack=1"
+	use aften || mycmakeargs="${mycmakeargs} -DNO_Aften=1"
+	use libsamplerate || mycmakeargs="${mycmakeargs} -DNO_libsamplerate=1"
+	use encode || mycmakeargs="${mycmakeargs} -DNO_Lame=1 -DNO_FAAC=1"
+	use xvid || mycmakeargs="${mycmakeargs} -DNO_Xvid=1"
+	use amrnb || mycmakeargs="${mycmakeargs} -DNO_AMRNB=1"
+	use dts || mycmakeargs="${mycmakeargs} -DNO_libdca=1"
+	use x264 || mycmakeargs="${mycmakeargs} -DNO_x264=1"
+	use aac || mycmakeargs="${mycmakeargs} -DNO_FAAD=1 -DNO_NeAAC=1"
+	use vorbis || mycmakeargs="${mycmakeargs} -DNO_Vorbis=1"
+	#use png || mycmakeargs="${mycmakeargs} -DNO_libPNG=1"
+
+	# ConfigureChecks.cmake -> cmake/FindArts.cmake
+	use arts || mycmakeargs="${mycmakeargs} -DNO_ARTS=1"
+
+	# CMakeLists.txt
+	use truetype || mycmakeargs="${mycmakeargs} -DNO_FREETYPE=1"
+	use gtk || mycmakeargs="${mycmakeargs} -DNO_GTK=1"
+	use qt4 || mycmakeargs="${mycmakeargs} -DNO_QT4=1"
+
+	cmake-utils_src_compile
+}
+
+src_install() {
+	cmake-utils_src_install
+	dodoc AUTHORS
+
+	doicon avidemux_icon.png
+
+	use gtk && make_desktop_entry avidemux2_gtk "Avidemux GTK" \
+		avidemux_icon "AudioVideo;GTK;"
+	use qt4 && make_desktop_entry avidemux2_qt4 "Avidemux Qt" \
+		avidemux_icon "AudioVideo;Qt;"
+}
diff --git a/media-video/avidemux/files/avidemux-2.4-i18n.patch b/media-video/avidemux/files/avidemux-2.4-i18n.patch
new file mode 100644
index 000000000000..06a789338e04
--- /dev/null
+++ b/media-video/avidemux/files/avidemux-2.4-i18n.patch
@@ -0,0 +1,33 @@
+diff -ur avidemux_2.4.orig/avidemux/ADM_userInterfaces/ADM_QT4/ui_support.cpp avidemux_2.4/avidemux/ADM_userInterfaces/ADM_QT4/ui_support.cpp
+--- avidemux_2.4.orig/avidemux/ADM_userInterfaces/ADM_QT4/ui_support.cpp	2007-10-16 21:23:21.000000000 +0300
++++ avidemux_2.4/avidemux/ADM_userInterfaces/ADM_QT4/ui_support.cpp	2007-12-28 20:35:30.000000000 +0200
+@@ -53,7 +53,7 @@
+ {

+ 	printf("\n[Locale] Locale: %s\n", QLocale::system().name().toUtf8().constData());

+ 

+-	QString appdir = QCoreApplication::applicationDirPath() + "/i18n/";

++	QString appdir = "/usr/share/avidemux/i18n/";

+ 

+ 	loadTranslation(&qtTranslator, appdir + "qt_" + QLocale::system().name());

+ 	loadTranslation(&avidemuxTranslator, appdir + "avidemux_" + QLocale::system().name());

+diff -ur avidemux_2.4.orig/cmake/Ts.cmake avidemux_2.4/cmake/Ts.cmake
+--- avidemux_2.4.orig/cmake/Ts.cmake	2007-10-14 14:58:28.000000000 +0300
++++ avidemux_2.4/cmake/Ts.cmake	2007-12-28 20:36:05.000000000 +0200
+@@ -63,7 +63,7 @@
+                 

+             SET(qm_files ${qm_files} ${_outXml} ${_out})

+ 

+-			INSTALL(FILES ${_out} DESTINATION "${CMAKE_INSTALL_PREFIX}/bin/i18n")

++			INSTALL(FILES ${_out} DESTINATION "${CMAKE_INSTALL_PREFIX}/share/avidemux/i18n")

+         ENDFOREACH(ts_input ${ts_files})

+ 

+         SET(${_sources} ${${_sources}} ${qm_files})

+@@ -94,7 +94,7 @@
+                 

+             SET(qm_files ${qm_files} ${_out})

+ 

+-			INSTALL(FILES ${_out} DESTINATION "${CMAKE_INSTALL_PREFIX}/bin/i18n")

++			INSTALL(FILES ${_out} DESTINATION "${CMAKE_INSTALL_PREFIX}/share/avidemux/i18n")

+         ENDFOREACH(ts_input ${ts_files})

+ 

+         SET(${_sources} ${${_sources}} ${qm_files})

diff --git a/media-video/avidemux/files/avidemux-2.4-libdca.patch b/media-video/avidemux/files/avidemux-2.4-libdca.patch
new file mode 100644
index 000000000000..e48a0b881c36
--- /dev/null
+++ b/media-video/avidemux/files/avidemux-2.4-libdca.patch
@@ -0,0 +1,24 @@
+diff -ur avidemux_2.4.orig/avidemux/CMakeLists.txt avidemux_2.4/avidemux/CMakeLists.txt
+--- avidemux_2.4.orig/avidemux/CMakeLists.txt	2007-12-07 18:52:14.000000000 +0200
++++ avidemux_2.4/avidemux/CMakeLists.txt	2007-12-28 20:33:07.000000000 +0200
+@@ -326,7 +326,7 @@
+ 

+ #libdts

+ if(USE_LIBDCA AND NOT USE_LATE_BINDING)

+-	add_libs_all_targets(dts)

++	add_libs_all_targets(dca)

+ endif(USE_LIBDCA AND NOT USE_LATE_BINDING)

+ 

+ # Lame

+diff -ur avidemux_2.4.orig/ConfigureChecks.cmake avidemux_2.4/ConfigureChecks.cmake
+--- avidemux_2.4.orig/ConfigureChecks.cmake	2007-12-04 15:52:16.000000000 +0200
++++ avidemux_2.4/ConfigureChecks.cmake	2007-12-28 20:32:20.000000000 +0200
+@@ -441,7 +441,7 @@
+ IF (USE_LATE_BINDING)
+ 	CHECK_INCLUDE_FILES(dts.h USE_LIBDCA)
+ ELSE (USE_LATE_BINDING)
+-	ADM_CHECK_HL(libdca dts.h dts dts_init USE_LIBDCA)
++	ADM_CHECK_HL(libdca dts.h dca dca_init USE_LIBDCA)
+ ENDIF (USE_LATE_BINDING)
+ 
+ SET(CMAKE_REQUIRED_LIBRARIES)
diff --git a/media-video/avidemux/files/digest-avidemux-2.4 b/media-video/avidemux/files/digest-avidemux-2.4
new file mode 100644
index 000000000000..6cb7803871f4
--- /dev/null
+++ b/media-video/avidemux/files/digest-avidemux-2.4
@@ -0,0 +1,3 @@
+MD5 2a752b9f6bab4123566894a6a21b353b avidemux_2.4.tar.gz 5728629
+RMD160 2e02e2acc6f87cd8ecf781e3c4a37f03d9365640 avidemux_2.4.tar.gz 5728629
+SHA256 7ec094464637a8e4ba81021bcae15f04edbd3239d210fe6f9d2ef795c7febf11 avidemux_2.4.tar.gz 5728629