New svn snapshot, update live ebuild to use system ffmpeg

(Portage version: 2.1.1_pre3-r1)
 (Unsigned Manifest commit)

3 files changed, 20 insertions, 88 deletions

diff --git a/net-im/wengophone/Manifest b/net-im/wengophone/Manifest
index 696626471fd3..f25ec481ac9b 100644
--- a/net-im/wengophone/Manifest
+++ b/net-im/wengophone/Manifest
@@ -2,24 +2,28 @@ AUX debian.patch 9954 RMD160 52f23a49b720413908edf34172343364f9d17e28 SHA1 81305
 MD5 419ff578d45aa5347505b874522111ce files/debian.patch 9954
 RMD160 52f23a49b720413908edf34172343364f9d17e28 files/debian.patch 9954
 SHA256 30273fad323d75f83c97fc6a1cacc651ae153d8dc0eae3337c2241b310d404a3 files/debian.patch 9954
+AUX ffmpeg-system.scons 305 RMD160 d11a20d397a30b86ebaa0deae47231a56ff152f4 SHA1 e8d5b986ed91a9d83defdd19575372290d39f75d SHA256 a7e98eef72e68c394dba120f67b11f235edcdaad83e16400b1a4e20ae0804707
+MD5 6b4b6d97e19b66993cfa0245db87d292 files/ffmpeg-system.scons 305
+RMD160 d11a20d397a30b86ebaa0deae47231a56ff152f4 files/ffmpeg-system.scons 305
+SHA256 a7e98eef72e68c394dba120f67b11f235edcdaad83e16400b1a4e20ae0804707 files/ffmpeg-system.scons 305
 DIST wengophone-1.0_pre20060408.tar.bz2 6361592 RMD160 f6b36b424c73a0c868d43f73a05f8e96336b33ab SHA256 d53e3489884cfc0e6573b6669239e692a85ebff78f4e039807ef4f77a3603920
-DIST wengophone-2.0_pre20060524.tar.bz2 15604190 RMD160 7fe3efe43da4b7ff1e736ceea4e8b100c9ab6a37 SHA1 12a6e08d985e972bf862fcf39b25b4e078fbfcd3 SHA256 688b0fc37521aa40fc87a00e405503d957e79d5291921f1f8459cff0b825cc8e
+DIST wengophone-2.0_pre20060719.tar.bz2 8856319 RMD160 c19cb1f49915c0162db4eb2ad31ec0e8d5c8dc06 SHA1 a4777a439cee676099a6719da778d39235781d2e SHA256 29ec01cba5639626e90dc63557d312205b4c2602e5eabdc7a2509bae9dd5665b
 EBUILD wengophone-1.0_pre20060408.ebuild 1601 RMD160 0fe7d4f130b5cb2deee5eb61058d8ea6bc6782a0 SHA1 b7d08465e31664d1a342d84934800b7a853f2474 SHA256 eef501f42d81f2ad2f3d003da0db19733631704969d3cd75021f675a5bc1f496
 MD5 75732f30b4427a4f82d3d2d78574ffdd wengophone-1.0_pre20060408.ebuild 1601
 RMD160 0fe7d4f130b5cb2deee5eb61058d8ea6bc6782a0 wengophone-1.0_pre20060408.ebuild 1601
 SHA256 eef501f42d81f2ad2f3d003da0db19733631704969d3cd75021f675a5bc1f496 wengophone-1.0_pre20060408.ebuild 1601
-EBUILD wengophone-2.0_pre20060524.ebuild 2354 RMD160 6cd957e6f73e28f7ec330bffe354343c5c68199b SHA1 3744663980082508a021eddba0fd37d29f54d073 SHA256 18ff64ee1ad260ee305fdf02afb6504f87ebbd43dcc33be3cb5acba94a28c05d
-MD5 e306915b964b4987fc9d7bb87ab43e11 wengophone-2.0_pre20060524.ebuild 2354
-RMD160 6cd957e6f73e28f7ec330bffe354343c5c68199b wengophone-2.0_pre20060524.ebuild 2354
-SHA256 18ff64ee1ad260ee305fdf02afb6504f87ebbd43dcc33be3cb5acba94a28c05d wengophone-2.0_pre20060524.ebuild 2354
-EBUILD wengophone-2.0_pre20099999.ebuild 1952 RMD160 fbe79c3f13b469404cd0ab638431ddb328aa5ea0 SHA1 0221e5c546663a9c69a3c546e40a28fe62695369 SHA256 fa60cb6bdc70148c17c5a675a5ab98b561ac23f20ab80d31a4ccabcf4687512a
-MD5 a9214f0e1d63fe8d5baa187763b08168 wengophone-2.0_pre20099999.ebuild 1952
-RMD160 fbe79c3f13b469404cd0ab638431ddb328aa5ea0 wengophone-2.0_pre20099999.ebuild 1952
-SHA256 fa60cb6bdc70148c17c5a675a5ab98b561ac23f20ab80d31a4ccabcf4687512a wengophone-2.0_pre20099999.ebuild 1952
-MISC ChangeLog 1792 RMD160 096d4afc4b91be35998ee3cd9eeedde9af53f065 SHA1 2b333cd407bf9b267f75c56f99e948de1d5527af SHA256 210de3ffb23b62539137d610ba165da9fa76817c2ea4b14b8cfef34924183a80
-MD5 6f3c152e90353ad3b1f74beea07afdc5 ChangeLog 1792
-RMD160 096d4afc4b91be35998ee3cd9eeedde9af53f065 ChangeLog 1792
-SHA256 210de3ffb23b62539137d610ba165da9fa76817c2ea4b14b8cfef34924183a80 ChangeLog 1792
+EBUILD wengophone-2.0_pre20060719.ebuild 2021 RMD160 bcf2c0d90727e2a1142c6a85c25e689970969df5 SHA1 b71a179fb69a515a4b0770caf9da48f555831fba SHA256 7357df17730ec7f8977364c728d55ff39d0532b3cde6bd36ec247798635062a6
+MD5 dbe1ced0325d8946e4a13c99654ca4ce wengophone-2.0_pre20060719.ebuild 2021
+RMD160 bcf2c0d90727e2a1142c6a85c25e689970969df5 wengophone-2.0_pre20060719.ebuild 2021
+SHA256 7357df17730ec7f8977364c728d55ff39d0532b3cde6bd36ec247798635062a6 wengophone-2.0_pre20060719.ebuild 2021
+EBUILD wengophone-2.0_pre20099999.ebuild 2697 RMD160 54fcc283f359aa15ef4e0f5e0517be856c3c254c SHA1 a1a604b041023424d93d559c27fdf4f2b3a53f6b SHA256 24c75f961b52ea59f43f17dac4c1023ccc075be52ab128504712d7b9f20fbb44
+MD5 133a2734e0830dcf036e13fcf36f1e52 wengophone-2.0_pre20099999.ebuild 2697
+RMD160 54fcc283f359aa15ef4e0f5e0517be856c3c254c wengophone-2.0_pre20099999.ebuild 2697
+SHA256 24c75f961b52ea59f43f17dac4c1023ccc075be52ab128504712d7b9f20fbb44 wengophone-2.0_pre20099999.ebuild 2697
+MISC ChangeLog 2088 RMD160 1b9d40f81fb9f15ccacc6a97301eef7d93e9e0a1 SHA1 752fd45869f4d8f9c81a00d9d693fee24a3aec53 SHA256 37c5d913c9375605bbe3cacd4def790fa73f9bd3e090dcbe4051a246de83489a
+MD5 b22ab8180f64d705878d282345d401d6 ChangeLog 2088
+RMD160 1b9d40f81fb9f15ccacc6a97301eef7d93e9e0a1 ChangeLog 2088
+SHA256 37c5d913c9375605bbe3cacd4def790fa73f9bd3e090dcbe4051a246de83489a ChangeLog 2088
 MISC metadata.xml 216 RMD160 6ecd7230ae71a2f9cb8c8ba6daa9cd8aac279a71 SHA1 50a040631277adac9286b0d9aedcd7324191e00c SHA256 1f6db7cf7937735fab1694d86efb74d629465e9af9d2295479af4d8835a0c59d
 MD5 6a062824f62adbd459fb0045419ef3d8 metadata.xml 216
 RMD160 6ecd7230ae71a2f9cb8c8ba6daa9cd8aac279a71 metadata.xml 216
@@ -27,9 +31,9 @@ SHA256 1f6db7cf7937735fab1694d86efb74d629465e9af9d2295479af4d8835a0c59d metadata
 MD5 68c8b5230e8051bc2e17073abb579364 files/digest-wengophone-1.0_pre20060408 286
 RMD160 532214a55b8719365dec61a015741d80c6d96ed8 files/digest-wengophone-1.0_pre20060408 286
 SHA256 450eb0fc7add7dab07e423c3a9887fa7bbd2e5ae9d875716b4502485dd2d1ba9 files/digest-wengophone-1.0_pre20060408 286
-MD5 89ea3bda6d3e3531bb23ba39c1c5c0ce files/digest-wengophone-2.0_pre20060524 289
-RMD160 6998fda1f291b5e5e4a817144d9dca98f8c0b1e6 files/digest-wengophone-2.0_pre20060524 289
-SHA256 9bc878645d6a3e421bf16e4a74ce9fd5a153c746d4bf1ccb0c1cad6720db43d8 files/digest-wengophone-2.0_pre20060524 289
+MD5 2ee32350207dd5b4b2619a19798ef48e files/digest-wengophone-2.0_pre20060719 286
+RMD160 dbae319686d75e2bfdb5a489c3d4af9a72e71d12 files/digest-wengophone-2.0_pre20060719 286
+SHA256 dcd061ee75ceee97db52deb5566fd9642ce2d7485adee91df26e78d1ae9f60ae files/digest-wengophone-2.0_pre20060719 286
 MD5 68b329da9893e34099c7d8ad5cb9c940 files/digest-wengophone-2.0_pre20099999 1
 RMD160 c0da025038ed83c687ddc430da9846ecb97f3998 files/digest-wengophone-2.0_pre20099999 1
 SHA256 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b files/digest-wengophone-2.0_pre20099999 1
diff --git a/net-im/wengophone/files/digest-wengophone-2.0_pre20060524 b/net-im/wengophone/files/digest-wengophone-2.0_pre20060524
deleted file mode 100644
index 9e4536ea31c2..000000000000
--- a/net-im/wengophone/files/digest-wengophone-2.0_pre20060524
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 0fab17688ffcf436b8e8384a53bdfd8d wengophone-2.0_pre20060524.tar.bz2 15604190
-RMD160 7fe3efe43da4b7ff1e736ceea4e8b100c9ab6a37 wengophone-2.0_pre20060524.tar.bz2 15604190
-SHA256 688b0fc37521aa40fc87a00e405503d957e79d5291921f1f8459cff0b825cc8e wengophone-2.0_pre20060524.tar.bz2 15604190
diff --git a/net-im/wengophone/wengophone-2.0_pre20060524.ebuild b/net-im/wengophone/wengophone-2.0_pre20060524.ebuild
deleted file mode 100644
index 6b7b0f4cf481..000000000000
--- a/net-im/wengophone/wengophone-2.0_pre20060524.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/wengophone/wengophone-2.0_pre20060524.ebuild,v 1.2 2006/05/24 18:20:43 genstef Exp $
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Wengophone NG is a VoIP client featuring the SIP protcol"
-HOMEPAGE="http://dev.openwengo.com"
-SRC_URI="mirror://gentoo/${P}.tar.bz2
-	http://dev.gentoo.org/~genstef/files/dist/${P}.tar.bz2"
-#ESVN_REPO_URI="http://dev.openwengo.com/svn/openwengo/wengophone-ng/trunk"
-#ESVN_OPTIONS="--username guest --password guest"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-
-RDEPEND="dev-libs/boost
-	dev-libs/glib
-	dev-libs/openssl
-	media-libs/alsa-lib
-	net-libs/gnutls
-	|| ( x11-libs/libX11 virtual/x11 )
-	>=x11-libs/qt-4.1"
-
-DEPEND="${RDEPEND}
-	media-libs/speex
-	dev-util/scons"
-
-pkg_setup() {
-	if ! built_with_use dev-libs/boost threads; then
-		eerror "This package requires dev-libs/boost compiled with threads support."
-		eerror "Please reemerge dev-libs/boost with USE=\"threads\"."
-		die "Please reemerge dev-libs/boost with USE=\"threads\"."
-	fi
-
-	if test $(gcc-major-version) -ge 4 \
-		&& test $(gcc-minor-version) -ge 1; then
-		eerror "This does not yet build with >=gcc-4.1, see bug #133837"
-		die "Please switch to gcc-4.0 for compiling"
-	fi
-	#if ! grep visit_each.hpp /usr/include/boost/bind.hpp >/dev/null 2>&1 \
-	#	eerror "You need to add #include <boost/visit_each.hpp> in"
-	#	eerror "/usr/include/boost/bind.hpp to build with gcc-4.1"
-	#	die "Please fix your includes"
-}
-
-src_compile() {
-	sed -i -e "s/File:://" libs/util/util/include/util/File.h
-	# This breaks runtime, and we have no idea how to fix it properly
-	#sed -i -e "s:c = connect(slot);://\0:" libs/util/util/include/util/Event.h
-
-	QTLIBDIR=/usr/lib/qt4 QTDIR=/usr QTINCLUDEDIR=/usr/include/qt4 \
-		scons qtwengophone \
-		mode=release || die "scons failed"
-}
-
-src_install() {
-	cd release-symbols
-	insinto /usr/share/wengophone
-	doins -r emoticons pics sounds
-	exeinto /usr/lib/wengophone
-	doexe wengophone/src/presentation/qt/qtwengophone \
-		wifo/phapi/libphapi.so libs/curl/libowcurl.so
-	make_wrapper wengophone /usr/lib/wengophone/qtwengophone /usr/share/wengophone /usr/lib/wengophone
-	newicon ${S}/wengophone/src/presentation/qt/pics/contact/wengo.png wengophone.png
-	make_desktop_entry wengophone
-}