Depend on virtual/ffmpeg, remove old.

Package-Manager: portage-2.2.0_alpha27/cvs/Linux x86_64

5 files changed, 10 insertions, 141 deletions

diff --git a/net-im/qutecom/ChangeLog b/net-im/qutecom/ChangeLog
index 4b57e28b3369..7c997c3ec9b9 100644
--- a/net-im/qutecom/ChangeLog
+++ b/net-im/qutecom/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-im/qutecom
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/qutecom/ChangeLog,v 1.5 2011/02/13 15:19:23 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/qutecom/ChangeLog,v 1.6 2011/03/28 13:46:44 chithanh Exp $
+
+  28 Mar 2011; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  -qutecom-2.2_p20100309.ebuild, -qutecom-2.2_p20100620.ebuild,
+  qutecom-2.2_p20110210.ebuild:
+  Depend on virtual/ffmpeg, remove old.
 
 *qutecom-2.2_p20110210 (13 Feb 2011)
 
diff --git a/net-im/qutecom/Manifest b/net-im/qutecom/Manifest
index c4b2d68fd570..6a7cd513852b 100644
--- a/net-im/qutecom/Manifest
+++ b/net-im/qutecom/Manifest
@@ -1,8 +1,4 @@
-DIST qutecom-2.2_p20100309.tar.xz 34683024 RMD160 1966ec94afef4950eee5256702197121f205998a SHA1 a860034bf0349953450e82c5df807d4a7cfe1f03 SHA256 596199a112d479086b369fe033c202bfa4c4b51f9b049b80773d14b3ed7aadaf
-DIST qutecom-2.2_p20100620.tar.xz 39444932 RMD160 f1e2e2e3c8cd87b7ee951809250c639478fb8c62 SHA1 a7510019e0c7e9010231b7d1cb720d4b93d144b4 SHA256 0449e5c434afea50bdf869450e53d4b7bf44338edaa08cb0896e392e58f48599
 DIST qutecom-2.2_p20110210.tar.xz 39408892 RMD160 f26e618d11b9fa767f19d58fedd1b202b2dca841 SHA1 1ec9418f519b5a8fa1f7d24872a80d552a2915bd SHA256 76cdfc2cee5a71c264bcc255b9657ebcd3f70fac0be37772fd47bf3c97f2677e
-EBUILD qutecom-2.2_p20100309.ebuild 1915 RMD160 d7170a737de047adbf5dcb018ac0fe86578e08fd SHA1 151ad971a8c61968bd055476893ce3177a685ca5 SHA256 e40d4c97893d9a1d36047f6cab534c2c47d38fcce3bce1523984619f29752fa2
-EBUILD qutecom-2.2_p20100620.ebuild 1915 RMD160 23abcfe81676e2def71d1f765070f1b52e14b89a SHA1 b2e32e64d88c1b60c45fe8ed01b89050d83480fd SHA256 3d6bcd17eb5302e860e0ca8a9d300c75ec39625774bd4bbea63fc2ee41e1ac6b
-EBUILD qutecom-2.2_p20110210.ebuild 1905 RMD160 16d2a8f89eaa4d226acc54b734396c8d8bbd54f6 SHA1 cbd9eb0bea0ba8306d68e6a680feda9689b9b303 SHA256 c781afcfe75edf6e6d6b8c179c803c6a54d26d4f14a17d3e2ce4106dfa9fa59f
-MISC ChangeLog 1037 RMD160 661ac603d720122f5b3dac43f2ad82565a8d792a SHA1 78893e4a0e5e36ed9b2282f7ac9268404c726ea9 SHA256 2e67b71bf00af85114c9cfc5d39cb9182a881ef6769a69316e8b4d2e97f037f6
+EBUILD qutecom-2.2_p20110210.ebuild 1901 RMD160 cd8cd2a6d4e7e748392934bbfbfa45750049afce SHA1 f8e0bf9d3d1ab6517e2ac487765ed7c4d992695e SHA256 6d869dfa77982dcac8ea1329227aa2dc67eaf60f2ca7de2b7226b109822706e6
+MISC ChangeLog 1243 RMD160 da9cae09c98dfe53500076c1115c2880d92de099 SHA1 fcc1977ed2c8cceb2fd5c0e1d6f3d4497df8cfa3 SHA256 f32f22698f4c2a030d878f7309398978041609366b2f31d49cc43f2e4e0c6e87
 MISC metadata.xml 272 RMD160 4a80062ca381c4d74a4efabc38d29fb1b0c6b592 SHA1 28f9d9426442ff315737006285ca0b90b4ef833f SHA256 55558c7efd245be98e0b3a5be45c4e855ecb6f2f4d651edf3d5442d6edbd9298
diff --git a/net-im/qutecom/qutecom-2.2_p20100309.ebuild b/net-im/qutecom/qutecom-2.2_p20100309.ebuild
deleted file mode 100644
index 40791b0d7dc4..000000000000
--- a/net-im/qutecom/qutecom-2.2_p20100309.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/qutecom/qutecom-2.2_p20100309.ebuild,v 1.3 2010/08/14 16:45:31 chithanh Exp $
-
-EAPI="3"
-
-inherit cmake-utils eutils flag-o-matic
-
-DESCRIPTION="Multi-protocol instant messenger and VoIP client"
-HOMEPAGE="http://www.qutecom.org/"
-SRC_URI="mirror://gentoo/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="alsa debug oss portaudio xv"
-
-RDEPEND="dev-libs/boost
-	dev-libs/glib
-	dev-libs/openssl
-	alsa? ( media-libs/alsa-lib )
-	media-libs/libsamplerate
-	media-libs/libsndfile
-	portaudio? ( media-libs/portaudio )
-	media-libs/speex
-	media-video/ffmpeg
-	net-im/pidgin[gnutls]
-	net-libs/gnutls
-	>=net-libs/libosip-3
-	>=net-libs/libeXosip-3
-	net-misc/curl
-	x11-libs/libX11
-	x11-libs/qt-gui
-	x11-libs/qt-svg
-	x11-libs/qt-webkit
-	xv? ( x11-libs/libXv )"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils"
-
-pkg_setup() {
-	if has_version "<dev-libs/boost-1.41" && has_version ">=dev-libs/boost-1.41"; then
-		ewarn "QuteCom build system may mix up headers and libraries if versions of"
-		ewarn "dev-libs/boost both before and after 1.41 are installed. If the build"
-		ewarn "fails due to undefined boost symbols, remove older boost."
-	fi
-	# fails to find its libraries with --as-needed, bug #315045
-	append-ldflags $(no-as-needed)
-}
-src_configure() {
-	local mycmakeargs="$(cmake-utils_use_enable portaudio PORTAUDIO_SUPPORT)
-		$(cmake-utils_use_enable alsa PHAPI_AUDIO_ALSA_SUPPORT)
-		$(cmake-utils_use_enable oss PHAPI_AUDIO_OSS_SUPPORT)
-		$(cmake-utils_use_enable xv WENGOPHONE_XV_SUPPORT)
-		-DLIBPURPLE_INTERNAL=OFF
-		-DPORTAUDIO_INTERNAL=OFF
-		-DCMAKE_VERBOSE_MAKEFILE=ON "
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	domenu wengophone/res/${PN}.desktop || die "domenu failed"
-	doicon wengophone/res/${PN}_64x64.png || die "doicon failed"
-
-}
diff --git a/net-im/qutecom/qutecom-2.2_p20100620.ebuild b/net-im/qutecom/qutecom-2.2_p20100620.ebuild
deleted file mode 100644
index 9b373a4c4f85..000000000000
--- a/net-im/qutecom/qutecom-2.2_p20100620.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/qutecom/qutecom-2.2_p20100620.ebuild,v 1.2 2010/08/14 16:45:31 chithanh Exp $
-
-EAPI="3"
-
-inherit cmake-utils eutils flag-o-matic
-
-DESCRIPTION="Multi-protocol instant messenger and VoIP client"
-HOMEPAGE="http://www.qutecom.org/"
-SRC_URI="mirror://gentoo/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="alsa debug oss portaudio xv"
-
-RDEPEND="dev-libs/boost
-	dev-libs/glib
-	dev-libs/openssl
-	alsa? ( media-libs/alsa-lib )
-	media-libs/libsamplerate
-	media-libs/libsndfile
-	portaudio? ( media-libs/portaudio )
-	media-libs/speex
-	media-video/ffmpeg
-	net-im/pidgin[gnutls]
-	net-libs/gnutls
-	>=net-libs/libosip-3
-	>=net-libs/libeXosip-3
-	net-misc/curl
-	x11-libs/libX11
-	x11-libs/qt-gui
-	x11-libs/qt-svg
-	x11-libs/qt-webkit
-	xv? ( x11-libs/libXv )"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils"
-
-pkg_setup() {
-	if has_version "<dev-libs/boost-1.41" && has_version ">=dev-libs/boost-1.41"; then
-		ewarn "QuteCom build system may mix up headers and libraries if versions of"
-		ewarn "dev-libs/boost both before and after 1.41 are installed. If the build"
-		ewarn "fails due to undefined boost symbols, remove older boost."
-	fi
-	# fails to find its libraries with --as-needed, bug #315045
-	append-ldflags $(no-as-needed)
-}
-src_configure() {
-	local mycmakeargs="$(cmake-utils_use_enable portaudio PORTAUDIO_SUPPORT)
-		$(cmake-utils_use_enable alsa PHAPI_AUDIO_ALSA_SUPPORT)
-		$(cmake-utils_use_enable oss PHAPI_AUDIO_OSS_SUPPORT)
-		$(cmake-utils_use_enable xv WENGOPHONE_XV_SUPPORT)
-		-DLIBPURPLE_INTERNAL=OFF
-		-DPORTAUDIO_INTERNAL=OFF
-		-DCMAKE_VERBOSE_MAKEFILE=ON "
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	domenu wengophone/res/${PN}.desktop || die "domenu failed"
-	doicon wengophone/res/${PN}_64x64.png || die "doicon failed"
-
-}
diff --git a/net-im/qutecom/qutecom-2.2_p20110210.ebuild b/net-im/qutecom/qutecom-2.2_p20110210.ebuild
index 2d19121733e8..70ad816a1d5c 100644
--- a/net-im/qutecom/qutecom-2.2_p20110210.ebuild
+++ b/net-im/qutecom/qutecom-2.2_p20110210.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/qutecom/qutecom-2.2_p20110210.ebuild,v 1.1 2011/02/13 15:19:23 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/qutecom/qutecom-2.2_p20110210.ebuild,v 1.2 2011/03/28 13:46:44 chithanh Exp $
 
 EAPI="3"
 
@@ -23,12 +23,12 @@ RDEPEND="dev-libs/boost
 	media-libs/libsndfile
 	portaudio? ( media-libs/portaudio )
 	media-libs/speex
-	media-video/ffmpeg
 	net-im/pidgin[gnutls]
 	net-libs/gnutls
 	>=net-libs/libosip-3
 	>=net-libs/libeXosip-3
 	net-misc/curl
+	virtual/ffmpeg
 	x11-libs/libX11
 	x11-libs/qt-gui
 	x11-libs/qt-svg