Change qt dep to >=4.3 wrt #207743.

(Portage version: 2.1.4)

6 files changed, 8 insertions, 172 deletions

diff --git a/media-video/avidemux/ChangeLog b/media-video/avidemux/ChangeLog
index 5f835a42db39..8e073ca469ea 100644
--- a/media-video/avidemux/ChangeLog
+++ b/media-video/avidemux/ChangeLog
@@ -1,6 +1,9 @@
 # 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.121 2007/12/28 18:53:57 drac Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/ChangeLog,v 1.122 2008/01/28 12:02:23 drac Exp $
+
+  28 Jan 2008; Samuli Suominen <drac@gentoo.org> avidemux-2.4.ebuild:
+  Change qt dep to >=4.3 wrt #207743.
 
 *avidemux-2.4 (28 Dec 2007)
 
diff --git a/media-video/avidemux/avidemux-2.4.ebuild b/media-video/avidemux/avidemux-2.4.ebuild
index d4d44090a87b..102cb061d9b0 100644
--- a/media-video/avidemux/avidemux-2.4.ebuild
+++ b/media-video/avidemux/avidemux-2.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 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 $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-2.4.ebuild,v 1.2 2008/01/28 12:02:23 drac Exp $
 
 inherit cmake-utils eutils
 
@@ -37,7 +37,7 @@ RDEPEND="dev-libs/libxml2
 	truetype? ( media-libs/freetype )
 	gtk? ( >=x11-libs/gtk+-2
 		x11-libs/libX11 )
-	qt4? ( >=x11-libs/qt-4
+	qt4? ( >=x11-libs/qt-4.3
 		x11-libs/libX11 )
 	encode? (
 		aac? ( media-libs/faac )
diff --git a/media-video/avidemux/avidemux-2.4_pre3.ebuild b/media-video/avidemux/avidemux-2.4_pre3.ebuild
deleted file mode 100644
index 3afb63b67b96..000000000000
--- a/media-video/avidemux/avidemux-2.4_pre3.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# 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_pre3.ebuild,v 1.5 2007/12/01 18:08:15 drac Exp $
-
-inherit cmake-utils eutils
-
-MY_P=${PN}_${PV/pre/preview}
-
-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}"
-	epatch "${FILESDIR}"/${P}-libdca.patch
-	epatch "${FILESDIR}"/${P}-i18n.patch
-}
-
-src_compile() {
-	# Commented options are breaking the build. -drac
-
-	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_pre3-i18n.patch b/media-video/avidemux/files/avidemux-2.4_pre3-i18n.patch
deleted file mode 100644
index e65e414242b6..000000000000
--- a/media-video/avidemux/files/avidemux-2.4_pre3-i18n.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -ur avidemux_2.4_preview3.orig/avidemux/ADM_userInterfaces/ADM_QT4/ui_support.cpp avidemux_2.4_preview3/avidemux/ADM_userInterfaces/ADM_QT4/ui_support.cpp
---- avidemux_2.4_preview3.orig/avidemux/ADM_userInterfaces/ADM_QT4/ui_support.cpp	2007-10-16 21:23:21.000000000 +0300
-+++ avidemux_2.4_preview3/avidemux/ADM_userInterfaces/ADM_QT4/ui_support.cpp	2007-11-30 23:25:31.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_preview3.orig/cmake/Ts.cmake avidemux_2.4_preview3/cmake/Ts.cmake
---- avidemux_2.4_preview3.orig/cmake/Ts.cmake	2007-10-14 14:58:28.000000000 +0300
-+++ avidemux_2.4_preview3/cmake/Ts.cmake	2007-11-30 23:26:38.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_pre3-libdca.patch b/media-video/avidemux/files/avidemux-2.4_pre3-libdca.patch
deleted file mode 100644
index 98767e93c83b..000000000000
--- a/media-video/avidemux/files/avidemux-2.4_pre3-libdca.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -ur avidemux_2.4_preview3.orig/ConfigureChecks.cmake avidemux_2.4_preview3/ConfigureChecks.cmake
---- avidemux_2.4_preview3.orig/ConfigureChecks.cmake	2007-11-10 15:44:58.000000000 +0200
-+++ avidemux_2.4_preview3/ConfigureChecks.cmake	2007-11-30 22:28:27.000000000 +0200
-@@ -405,7 +405,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 -ur avidemux_2.4_preview3.orig/avidemux/CMakeLists.txt avidemux_2.4_preview3/avidemux/CMakeLists.txt
---- avidemux_2.4_preview3.orig/avidemux/CMakeLists.txt	2007-11-09 18:34:00.000000000 +0200
-+++ avidemux_2.4_preview3/avidemux/CMakeLists.txt	2007-11-30 22:17:20.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 --git a/media-video/avidemux/files/digest-avidemux-2.4_pre3 b/media-video/avidemux/files/digest-avidemux-2.4_pre3
deleted file mode 100644
index 47241747a3a6..000000000000
--- a/media-video/avidemux/files/digest-avidemux-2.4_pre3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 f7a073abfe1c93a3d1d5a324c0a21b93 avidemux_2.4_preview3.tar.gz 5715054
-RMD160 034386aabeec3530bc38b3d0e3e31f324d923fb5 avidemux_2.4_preview3.tar.gz 5715054
-SHA256 9f96a266dbb3dc8ca44545f1778616e436f879053904c9f751a271ae7b95d09f avidemux_2.4_preview3.tar.gz 5715054